diff --git a/.buildkite/README.md b/.buildkite/README.md
new file mode 100644
index 0000000000000..6b9be00898d24
--- /dev/null
+++ b/.buildkite/README.md
@@ -0,0 +1,10 @@
+# Kibana / Buildkite
+
+## Directory Structure
+
+- `hooks` - special directory used by Buildkite agents for [hooks](https://buildkite.com/docs/agent/v3/hooks)
+- `pipelines` - contains pipeline definitions
+- `scripts/common` - scripts that get `source`d by other scripts to set environment variables or import shared functions
+- `scripts/lifecycle` - general scripts for tasks that run before or after individual steps or the entire build
+- `scripts/steps` - scripts that define something that will run for a step defined in a pipeline
+- `scripts/*` - all other scripts are building blocks that make up the tasks in pipelines. They may be run by other scripts, but should not be `source`d
diff --git a/.buildkite/agents.json b/.buildkite/agents.json
new file mode 100644
index 0000000000000..797b7e71f2be6
--- /dev/null
+++ b/.buildkite/agents.json
@@ -0,0 +1,79 @@
+{
+  "gcp": {
+    "project": "elastic-kibana-ci",
+    "zones": ["us-central1-a", "us-central1-b", "us-central1-c", "us-central1-f"],
+    "serviceAccount": "elastic-buildkite-agent@elastic-kibana-ci.iam.gserviceaccount.com",
+    "imageFamily": "kb-ubuntu",
+    "subnetwork": "buildkite",
+    "disableExternalIp": true,
+    "diskType": "pd-ssd",
+    "diskSizeGb": 75,
+    "overprovision": 0,
+    "minimumAgents": 0,
+    "maximumAgents": 50,
+    "gracefulStopAfterMins": 360,
+    "hardStopAfterMins": 540,
+    "idleTimeoutMins": 10,
+    "exitAfterOneJob": false,
+
+    "agents": [
+      {
+        "queue": "default",
+        "name": "kb-default",
+        "minimumAgents": 1,
+        "maximumAgents": 100,
+        "idleTimeoutMins": 60,
+        "machineType": "e2-small"
+      },
+      {
+        "queue": "c2-8",
+        "name": "kb-c2-8",
+        "machineType": "c2-standard-8",
+        "localSsds": 1
+      },
+      {
+        "queue": "c2-4",
+        "name": "kb-c2-4",
+        "machineType": "c2-standard-4",
+        "localSsds": 1
+      },
+      {
+        "queue": "jest",
+        "name": "kb-jest",
+        "machineType": "n2-standard-2",
+        "diskSizeGb": 128
+      },
+      {
+        "queue": "ci-group",
+        "name": "kb-cigroup",
+        "machineType": "n2-standard-8",
+        "diskSizeGb": 256
+      },
+      {
+        "queue": "ci-group-4",
+        "name": "kb-cigroup-4",
+        "machineType": "n2-standard-4",
+        "diskSizeGb": 128
+      },
+      {
+        "queue": "ci-group-4d",
+        "name": "kb-cigroup-4d",
+        "machineType": "n2d-standard-4",
+        "diskSizeGb": 128
+      },
+      {
+        "queue": "ci-group-6",
+        "name": "kb-cigroup-6",
+        "machineType": "n2-custom-6-16384",
+        "diskSizeGb": 128
+      },
+      {
+        "queue": "packer",
+        "name": "kb-packer",
+        "serviceAccount": "buildkite-packer-agent@elastic-kibana-ci.iam.gserviceaccount.com",
+        "maximumAgents": 10,
+        "machineType": "e2-small"
+      }
+    ]
+  }
+}
diff --git a/.buildkite/hooks/post-command b/.buildkite/hooks/post-command
new file mode 100644
index 0000000000000..21a4326498fc9
--- /dev/null
+++ b/.buildkite/hooks/post-command
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source .buildkite/scripts/lifecycle/post_command.sh
diff --git a/.buildkite/hooks/pre-command b/.buildkite/hooks/pre-command
new file mode 100644
index 0000000000000..58a2c5f0b499d
--- /dev/null
+++ b/.buildkite/hooks/pre-command
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+source .buildkite/scripts/lifecycle/pre_command.sh
diff --git a/.buildkite/pipelines/on_merge.yml b/.buildkite/pipelines/on_merge.yml
new file mode 100644
index 0000000000000..bceb1796479a2
--- /dev/null
+++ b/.buildkite/pipelines/on_merge.yml
@@ -0,0 +1,24 @@
+env:
+  GITHUB_COMMIT_STATUS_ENABLED: 'true'
+  GITHUB_COMMIT_STATUS_CONTEXT: 'buildkite/on-merge'
+steps:
+  - command: .buildkite/scripts/lifecycle/pre_build.sh
+    label: Pre-Build
+
+  - wait
+
+  - command: .buildkite/scripts/steps/on_merge_build_and_metrics.sh
+    label: Default Build and Metrics
+    agents:
+      queue: c2-8
+
+  - command: .buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh
+    label: Build TS Refs and Check Public API Docs
+    agents:
+      queue: c2-4
+
+  - wait: ~
+    continue_on_failure: true
+
+  - command: .buildkite/scripts/lifecycle/post_build.sh
+    label: Post-Build
diff --git a/.buildkite/scripts/bootstrap.sh b/.buildkite/scripts/bootstrap.sh
new file mode 100755
index 0000000000000..7ae925b262b9f
--- /dev/null
+++ b/.buildkite/scripts/bootstrap.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/util.sh
+
+echo "--- yarn install and bootstrap"
+yarn kbn bootstrap --verbose
+
+###
+### upload ts-refs-cache artifacts as quickly as possible so they are available for download
+###
+if [[ "${BUILD_TS_REFS_CACHE_CAPTURE:-}" == "true" ]]; then
+  echo "--- Upload ts-refs-cache"
+  cd "$KIBANA_DIR/target/ts_refs_cache"
+  gsutil cp "*.zip" 'gs://kibana-ci-ts-refs-cache/'
+  cd "$KIBANA_DIR"
+fi
+
+if [[ "$DISABLE_BOOTSTRAP_VALIDATION" != "true" ]]; then
+  verify_no_git_changes 'yarn kbn bootstrap'
+fi
diff --git a/.buildkite/scripts/build_kibana.sh b/.buildkite/scripts/build_kibana.sh
new file mode 100755
index 0000000000000..19dbbcb025fb9
--- /dev/null
+++ b/.buildkite/scripts/build_kibana.sh
@@ -0,0 +1,16 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+export KBN_NP_PLUGINS_BUILT=true
+
+echo "--- Build Kibana Distribution"
+node scripts/build --debug --no-oss
+
+echo "--- Archive Kibana Distribution"
+linuxBuild="$(find "$KIBANA_DIR/target" -name 'kibana-*-linux-x86_64.tar.gz')"
+installDir="$KIBANA_DIR/install/kibana"
+mkdir -p "$installDir"
+tar -xzf "$linuxBuild" -C "$installDir" --strip=1
+mkdir -p "$KIBANA_BUILD_LOCATION"
+cp -pR install/kibana/. "$KIBANA_BUILD_LOCATION/"
diff --git a/.buildkite/scripts/build_kibana_plugins.sh b/.buildkite/scripts/build_kibana_plugins.sh
new file mode 100644
index 0000000000000..f4d82699ef92d
--- /dev/null
+++ b/.buildkite/scripts/build_kibana_plugins.sh
@@ -0,0 +1,32 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+echo "--- Build Platform Plugins"
+node scripts/build_kibana_platform_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 "$KIBANA_DIR/test/plugin_functional/plugins" \
+  --scan-dir "$KIBANA_DIR/test/common/fixtures/plugins" \
+  --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" \
+  --verbose
+
+echo "--- Archive built plugins"
+shopt -s globstar
+tar -zcf \
+  target/kibana-default-plugins.tar.gz \
+  x-pack/plugins/**/target/public \
+  x-pack/test/**/target/public \
+  examples/**/target/public \
+  x-pack/examples/**/target/public \
+  test/**/target/public
diff --git a/.buildkite/scripts/common/env.sh b/.buildkite/scripts/common/env.sh
new file mode 100755
index 0000000000000..ff09126f60b08
--- /dev/null
+++ b/.buildkite/scripts/common/env.sh
@@ -0,0 +1,72 @@
+#!/usr/bin/env bash
+
+export CI=true
+
+KIBANA_DIR=$(pwd)
+export KIBANA_DIR
+export XPACK_DIR="$KIBANA_DIR/x-pack"
+
+export CACHE_DIR="$HOME/.kibana"
+PARENT_DIR="$(cd "$KIBANA_DIR/.."; pwd)"
+export PARENT_DIR
+export WORKSPACE="${WORKSPACE:-$PARENT_DIR}"
+
+KIBANA_PKG_BRANCH="$(jq -r .branch "$KIBANA_DIR/package.json")"
+export KIBANA_PKG_BRANCH
+export KIBANA_BASE_BRANCH="$KIBANA_PKG_BRANCH"
+
+export GECKODRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
+export CHROMEDRIVER_CDNURL="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
+export RE2_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache"
+export CYPRESS_DOWNLOAD_MIRROR="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/cypress"
+
+export NODE_OPTIONS="--max-old-space-size=4096"
+
+export FORCE_COLOR=1
+export TEST_BROWSER_HEADLESS=1
+
+export ELASTIC_APM_ENVIRONMENT=ci
+export ELASTIC_APM_TRANSACTION_SAMPLE_RATE=0.1
+
+CI_REPORTING_ENABLED=false # TODO enable when ready, only controls checks reporter and APM
+
+if is_pr; then
+  export ELASTIC_APM_ACTIVE=false
+  export CHECKS_REPORTER_ACTIVE="${CI_REPORTING_ENABLED-}"
+
+  # These can be removed once we're not supporting Jenkins and Buildkite at the same time
+  # These are primarily used by github checks reporter and can be configured via /github_checks_api.json
+  export ghprbGhRepository="elastic/kibana"
+  export ghprbActualCommit="$BUILDKITE_COMMIT"
+  export BUILD_URL="$BUILDKITE_BUILD_URL"
+
+  # set_git_merge_base # TODO for PRs
+else
+  export ELASTIC_APM_ACTIVE="${CI_REPORTING_ENABLED-}"
+  export CHECKS_REPORTER_ACTIVE=false
+fi
+
+export FLEET_PACKAGE_REGISTRY_PORT=6104
+export TEST_CORS_SERVER_PORT=6105
+
+export DETECT_CHROMEDRIVER_VERSION=true
+export CHROMEDRIVER_FORCE_DOWNLOAD=true
+
+export GCS_UPLOAD_PREFIX=FAKE_UPLOAD_PREFIX # TODO remove the need for this
+
+export KIBANA_BUILD_LOCATION="$WORKSPACE/kibana-build-xpack"
+
+if [[ "${BUILD_TS_REFS_CACHE_ENABLE:-}" != "true" ]]; then
+  export BUILD_TS_REFS_CACHE_ENABLE=false
+fi
+
+export BUILD_TS_REFS_DISABLE=true
+export DISABLE_BOOTSTRAP_VALIDATION=true
+
+export TEST_KIBANA_HOST=localhost
+export TEST_KIBANA_PORT=6101
+export TEST_KIBANA_URL="http://elastic:changeme@localhost:6101"
+export TEST_ES_URL="http://elastic:changeme@localhost:6102"
+export TEST_ES_TRANSPORT_PORT=6103
+export TEST_CORS_SERVER_PORT=6106
+export ALERTING_PROXY_PORT=6105
diff --git a/.buildkite/scripts/common/setup_bazel.sh b/.buildkite/scripts/common/setup_bazel.sh
new file mode 100644
index 0000000000000..16ea9a3900353
--- /dev/null
+++ b/.buildkite/scripts/common/setup_bazel.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+KIBANA_BUILDBUDDY_CI_API_KEY=$(vault read -field=value secret/kibana-issues/dev/kibana-buildbuddy-ci-api-key)
+export KIBANA_BUILDBUDDY_CI_API_KEY
+
+cp "$KIBANA_DIR/src/dev/ci_setup/.bazelrc-ci" "$HOME/.bazelrc"
+
+###
+### append auth token to buildbuddy into "$HOME/.bazelrc";
+###
+echo "# Appended by .buildkite/scripts/setup_bazel.sh" >> "$HOME/.bazelrc"
+echo "build --remote_header=x-buildbuddy-api-key=$KIBANA_BUILDBUDDY_CI_API_KEY" >> "$HOME/.bazelrc"
+
+###
+### remove write permissions on buildbuddy remote cache for prs
+###
+if [[ "${BUILDKITE_PULL_REQUEST:-}" && "$BUILDKITE_PULL_REQUEST" != "false" ]] ; then
+  {
+    echo "# Uploads logs & artifacts without writing to cache"
+    echo "build --noremote_upload_local_results"
+  } >> "$HOME/.bazelrc"
+fi
diff --git a/.buildkite/scripts/common/setup_node.sh b/.buildkite/scripts/common/setup_node.sh
new file mode 100755
index 0000000000000..6a81862f2b097
--- /dev/null
+++ b/.buildkite/scripts/common/setup_node.sh
@@ -0,0 +1,46 @@
+#!/usr/bin/env bash
+
+echo "--- Setup Node"
+
+NODE_VERSION="$(cat "$KIBANA_DIR/.node-version")"
+export NODE_VERSION
+export NODE_DIR="$CACHE_DIR/node/$NODE_VERSION"
+export NODE_BIN_DIR="$NODE_DIR/bin"
+export YARN_OFFLINE_CACHE="$CACHE_DIR/yarn-offline-cache"
+
+if [[ ! -d "$NODE_DIR" ]]; then
+  hostArch="$(command uname -m)"
+  case "${hostArch}" in
+    x86_64 | amd64) nodeArch="x64" ;;
+    aarch64) nodeArch="arm64" ;;
+    *) nodeArch="${hostArch}" ;;
+  esac
+
+  nodeUrl="https://us-central1-elastic-kibana-184716.cloudfunctions.net/kibana-ci-proxy-cache/dist/v$NODE_VERSION/node-v$NODE_VERSION-linux-$nodeArch.tar.gz"
+
+  echo "node.js v$NODE_VERSION not found at $NODE_DIR, downloading from $nodeUrl"
+
+  mkdir -p "$NODE_DIR"
+  curl --silent -L "$nodeUrl" | tar -xz -C "$NODE_DIR" --strip-components=1
+else
+  echo "node.js v$NODE_VERSION already installed to $NODE_DIR, re-using"
+  ls -alh "$NODE_BIN_DIR"
+fi
+
+export PATH="$NODE_BIN_DIR:$PATH"
+
+
+echo "--- Setup Yarn"
+
+YARN_VERSION=$(node -e "console.log(String(require('./package.json').engines.yarn || '').replace(/^[^\d]+/,''))")
+export YARN_VERSION
+
+if [[ ! $(which yarn) || $(yarn --version) != "$YARN_VERSION" ]]; then
+  npm install -g "yarn@^${YARN_VERSION}"
+fi
+
+yarn config set yarn-offline-mirror "$YARN_OFFLINE_CACHE"
+
+YARN_GLOBAL_BIN=$(yarn global bin)
+export YARN_GLOBAL_BIN
+export PATH="$PATH:$YARN_GLOBAL_BIN"
diff --git a/.buildkite/scripts/common/util.sh b/.buildkite/scripts/common/util.sh
new file mode 100755
index 0000000000000..653b0c4e9cdbb
--- /dev/null
+++ b/.buildkite/scripts/common/util.sh
@@ -0,0 +1,51 @@
+#!/usr/bin/env bash
+
+checks-reporter-with-killswitch() {
+  if [ "$CHECKS_REPORTER_ACTIVE" == "true" ] ; then
+    yarn run github-checks-reporter "$@"
+  else
+    arguments=("$@");
+    "${arguments[@]:1}";
+  fi
+}
+
+is_pr() {
+  [[ "${GITHUB_PR_NUMBER-}" ]] && return
+  false
+}
+
+verify_no_git_changes() {
+  RED='\033[0;31m'
+  C_RESET='\033[0m' # Reset color
+
+  GIT_CHANGES="$(git ls-files --modified)"
+  if [ "$GIT_CHANGES" ]; then
+    echo -e "\n${RED}ERROR: '$1' caused changes to the following files:${C_RESET}\n"
+    echo -e "$GIT_CHANGES\n"
+    exit 1
+  fi
+}
+
+# docker_run can be used in place of `docker run`
+# it automatically passes along all of Buildkite's tracked environment variables, and mounts the buildkite-agent in the running container
+docker_run() {
+  args=()
+
+  if [[ -n "${BUILDKITE_ENV_FILE:-}" ]] ; then
+    # Read in the env file and convert to --env params for docker
+    # This is because --env-file doesn't support newlines or quotes per https://docs.docker.com/compose/env-file/#syntax-rules
+    while read -r var; do
+      args+=( --env "${var%%=*}" )
+    done < "$BUILDKITE_ENV_FILE"
+  fi
+
+  BUILDKITE_AGENT_BINARY_PATH=$(command -v buildkite-agent)
+  args+=(
+    "--env" "BUILDKITE_JOB_ID"
+    "--env" "BUILDKITE_BUILD_ID"
+    "--env" "BUILDKITE_AGENT_ACCESS_TOKEN"
+    "--volume" "$BUILDKITE_AGENT_BINARY_PATH:/usr/bin/buildkite-agent"
+  )
+
+  docker run "${args[@]}" "$@"
+}
diff --git a/.buildkite/scripts/download_build_artifacts.sh b/.buildkite/scripts/download_build_artifacts.sh
new file mode 100755
index 0000000000000..6a6b7246753f6
--- /dev/null
+++ b/.buildkite/scripts/download_build_artifacts.sh
@@ -0,0 +1,19 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ ! -d "$KIBANA_BUILD_LOCATION/bin" ]]; then
+  echo '--- Downloading Distribution and Plugin artifacts'
+
+  cd "$WORKSPACE"
+
+  buildkite-agent artifact download kibana-default.tar.gz .
+  buildkite-agent artifact download kibana-default-plugins.tar.gz .
+
+  mkdir -p "$KIBANA_BUILD_LOCATION"
+  tar -xzf kibana-default.tar.gz -C "$KIBANA_BUILD_LOCATION" --strip=1
+
+  cd "$KIBANA_DIR"
+
+  tar -xzf ../kibana-default-plugins.tar.gz
+fi
diff --git a/.buildkite/scripts/lifecycle/ci_stats.js b/.buildkite/scripts/lifecycle/ci_stats.js
new file mode 100644
index 0000000000000..1e7aec3079ee3
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/ci_stats.js
@@ -0,0 +1,59 @@
+const https = require('https');
+const token = process.env.CI_STATS_TOKEN;
+const host = process.env.CI_STATS_HOST;
+
+const request = (url, options, data = null) => {
+  const httpOptions = {
+    ...options,
+    headers: {
+      ...(options.headers || {}),
+      Authorization: `token ${token}`,
+    },
+  };
+
+  return new Promise((resolve, reject) => {
+    console.log(`Calling https://${host}${url}`);
+
+    const req = https.request(`https://${host}${url}`, httpOptions, (res) => {
+      if (res.statusCode < 200 || res.statusCode >= 300) {
+        return reject(new Error(`Status Code: ${res.statusCode}`));
+      }
+
+      const data = [];
+      res.on('data', (d) => {
+        data.push(d);
+      });
+
+      res.on('end', () => {
+        try {
+          let resp = Buffer.concat(data).toString();
+
+          try {
+            if (resp.trim()) {
+              resp = JSON.parse(resp);
+            }
+          } catch (ex) {
+            console.error(ex);
+          }
+
+          resolve(resp);
+        } catch (ex) {
+          reject(ex);
+        }
+      });
+    });
+
+    req.on('error', reject);
+
+    if (data) {
+      req.write(JSON.stringify(data));
+    }
+
+    req.end();
+  });
+};
+
+module.exports = {
+  get: (url) => request(url, { method: 'GET' }),
+  post: (url, data) => request(url, { method: 'POST' }, data),
+};
diff --git a/.buildkite/scripts/lifecycle/ci_stats_complete.js b/.buildkite/scripts/lifecycle/ci_stats_complete.js
new file mode 100644
index 0000000000000..46aa72aed2024
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/ci_stats_complete.js
@@ -0,0 +1,17 @@
+const ciStats = require('./ci_stats');
+
+// TODO - this is okay for now but should really be replaced with an API call, especially once retries are enabled
+const BUILD_STATUS = process.env.BUILD_FAILED === 'true' ? 'FAILURE' : 'SUCCESS';
+
+(async () => {
+  try {
+    if (process.env.CI_STATS_BUILD_ID) {
+      await ciStats.post(`/v1/build/_complete?id=${process.env.CI_STATS_BUILD_ID}`, {
+        result: BUILD_STATUS,
+      });
+    }
+  } catch (ex) {
+    console.error(ex);
+    process.exit(1);
+  }
+})();
diff --git a/.buildkite/scripts/lifecycle/ci_stats_start.js b/.buildkite/scripts/lifecycle/ci_stats_start.js
new file mode 100644
index 0000000000000..35a1e7030af5f
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/ci_stats_start.js
@@ -0,0 +1,30 @@
+const { execSync } = require('child_process');
+const ciStats = require('./ci_stats');
+
+(async () => {
+  try {
+    const build = await ciStats.post('/v1/build', {
+      jenkinsJobName: process.env.BUILDKITE_PIPELINE_NAME,
+      jenkinsJobId: process.env.BUILDKITE_BUILD_ID,
+      jenkinsUrl: process.env.BUILDKITE_BUILD_URL,
+      prId: process.env.GITHUB_PR_NUMBER || null,
+    });
+
+    execSync(`buildkite-agent meta-data set ci_stats_build_id "${build.id}"`);
+
+    // TODO Will need to set MERGE_BASE for PRs
+
+    await ciStats.post(`/v1/git_info?buildId=${build.id}`, {
+      branch: process.env.BUILDKITE_BRANCH.replace(/^(refs\/heads\/|origin\/)/, ''),
+      commit: process.env.BUILDKITE_COMMIT,
+      targetBranch:
+        process.env.GITHUB_PR_TARGET_BRANCH ||
+        process.env.BUILDKITE_PULL_REQUEST_BASE_BRANCH ||
+        null,
+      mergeBase: process.env.GITHUB_PR_MERGE_BASE || null, // TODO confirm GITHUB_PR_MERGE_BASE or switch to final var
+    });
+  } catch (ex) {
+    console.error(ex);
+    process.exit(1);
+  }
+})();
diff --git a/.buildkite/scripts/lifecycle/commit_status_complete.sh b/.buildkite/scripts/lifecycle/commit_status_complete.sh
new file mode 100755
index 0000000000000..1766404719632
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/commit_status_complete.sh
@@ -0,0 +1,14 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ "${GITHUB_COMMIT_STATUS_ENABLED:-}" == "true" ]]; then
+  COMMIT_STATUS=success
+  if [[ "${BUILD_FAILED:-}"  == "true" ]]; then
+    COMMIT_STATUS=failure
+  fi
+
+  GITHUB_COMMIT_STATUS_CONTEXT=${GITHUB_COMMIT_STATUS_CONTEXT:-"buildkite/$BUILDKITE_PIPELINE_NAME"}
+
+  gh api "repos/elastic/kibana/statuses/$BUILDKITE_COMMIT" -f state="$COMMIT_STATUS" -f target_url="$BUILDKITE_BUILD_URL" -f context="$GITHUB_COMMIT_STATUS_CONTEXT" --silent
+fi
diff --git a/.buildkite/scripts/lifecycle/commit_status_start.sh b/.buildkite/scripts/lifecycle/commit_status_start.sh
new file mode 100755
index 0000000000000..d7e91dd7e0de5
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/commit_status_start.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ "${GITHUB_COMMIT_STATUS_ENABLED:-}" == "true" ]]; then
+  GITHUB_COMMIT_STATUS_CONTEXT=${GITHUB_COMMIT_STATUS_CONTEXT:-"buildkite/$BUILDKITE_PIPELINE_NAME"}
+
+  gh api "repos/elastic/kibana/statuses/$BUILDKITE_COMMIT" -f state=pending -f target_url="$BUILDKITE_BUILD_URL" -f context="$GITHUB_COMMIT_STATUS_CONTEXT" --silent
+fi
diff --git a/.buildkite/scripts/lifecycle/post_build.sh b/.buildkite/scripts/lifecycle/post_build.sh
new file mode 100755
index 0000000000000..06b51d78a836a
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/post_build.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+BUILD_FAILED=$(buildkite-agent meta-data get build_failed --default "false")
+export BUILD_FAILED
+
+"$(dirname "${0}")/commit_status_complete.sh"
+
+node "$(dirname "${0}")/ci_stats_complete.js"
diff --git a/.buildkite/scripts/lifecycle/post_command.sh b/.buildkite/scripts/lifecycle/post_command.sh
new file mode 100755
index 0000000000000..89630a874bbd7
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/post_command.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ "$BUILDKITE_COMMAND_EXIT_STATUS" != "0" ]]; then
+  buildkite-agent meta-data set build_failed true
+fi
diff --git a/.buildkite/scripts/lifecycle/pre_build.sh b/.buildkite/scripts/lifecycle/pre_build.sh
new file mode 100755
index 0000000000000..2ddf9a73d0622
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/pre_build.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+"$(dirname "${0}")/commit_status_start.sh"
+
+export CI_STATS_TOKEN="$(vault read -field=api_token secret/kibana-issues/dev/kibana_ci_stats)"
+export CI_STATS_HOST="$(vault read -field=api_host secret/kibana-issues/dev/kibana_ci_stats)"
+
+node "$(dirname "${0}")/ci_stats_start.js"
diff --git a/.buildkite/scripts/lifecycle/pre_command.sh b/.buildkite/scripts/lifecycle/pre_command.sh
new file mode 100755
index 0000000000000..d9e79d2d3252b
--- /dev/null
+++ b/.buildkite/scripts/lifecycle/pre_command.sh
@@ -0,0 +1,67 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+# Set up a custom ES Snapshot Manifest if one has been specified for this build
+{
+  ES_SNAPSHOT_MANIFEST=${ES_SNAPSHOT_MANIFEST:-$(buildkite-agent meta-data get ES_SNAPSHOT_MANIFEST --default '')}
+  export ES_SNAPSHOT_MANIFEST
+
+  if [[ "${ES_SNAPSHOT_MANIFEST:-}" ]]; then
+  cat << EOF | buildkite-agent annotate --style "info" --context es-snapshot-manifest
+  This build is running using a custom Elasticsearch snapshot.
+
+  ES Snapshot Manifest: $ES_SNAPSHOT_MANIFEST
+
+  To use this locally, simply prefix your commands with:
+
+  \`\`\`
+  ES_SNAPSHOT_MANIFEST="$ES_SNAPSHOT_MANIFEST"
+  \`\`\`
+
+  e.g.
+
+  \`\`\`
+  ES_SNAPSHOT_MANIFEST="$ES_SNAPSHOT_MANIFEST" node scripts/functional_tests_server.js
+  \`\`\`
+EOF
+  fi
+}
+
+# Setup CI Stats
+{
+  CI_STATS_BUILD_ID="$(buildkite-agent meta-data get ci_stats_build_id --default '')"
+  export CI_STATS_BUILD_ID
+
+  if [[ "$CI_STATS_BUILD_ID" ]]; then
+    echo "CI Stats Build ID: $CI_STATS_BUILD_ID"
+
+    CI_STATS_TOKEN="$(vault read -field=api_token secret/kibana-issues/dev/kibana_ci_stats)"
+    export CI_STATS_TOKEN
+
+    CI_STATS_HOST="$(vault read -field=api_host secret/kibana-issues/dev/kibana_ci_stats)"
+    export CI_STATS_HOST
+
+    KIBANA_CI_STATS_CONFIG=$(jq -n \
+      --arg buildId "$CI_STATS_BUILD_ID" \
+      --arg apiUrl "https://$CI_STATS_HOST" \
+      --arg apiToken "$CI_STATS_TOKEN" \
+      '{buildId: $buildId, apiUrl: $apiUrl, apiToken: $apiToken}' \
+    )
+    export KIBANA_CI_STATS_CONFIG
+  fi
+}
+
+GITHUB_TOKEN=$(vault read -field=github_token secret/kibana-issues/dev/kibanamachine)
+export GITHUB_TOKEN
+
+# By default, all steps should set up these things to get a full environment before running
+# It can be skipped for pipeline upload steps though, to make job start time a little faster
+if [[ "${SKIP_CI_SETUP:-}" != "true" ]]; then
+  if [[ -d .buildkite/scripts && "${BUILDKITE_COMMAND:-}" != "buildkite-agent pipeline upload"* ]]; then
+    source .buildkite/scripts/common/util.sh
+    source .buildkite/scripts/common/env.sh
+    source .buildkite/scripts/common/setup_node.sh
+    source .buildkite/scripts/common/setup_bazel.sh
+  fi
+fi
diff --git a/.buildkite/scripts/packer_cache.sh b/.buildkite/scripts/packer_cache.sh
new file mode 100755
index 0000000000000..45d3dc439ff4d
--- /dev/null
+++ b/.buildkite/scripts/packer_cache.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/env.sh
+source .buildkite/scripts/common/setup_node.sh
+
+yarn kbn bootstrap
diff --git a/.buildkite/scripts/post_build_kibana.sh b/.buildkite/scripts/post_build_kibana.sh
new file mode 100755
index 0000000000000..a4f8d71b77105
--- /dev/null
+++ b/.buildkite/scripts/post_build_kibana.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+if [[ ! "${DISABLE_CI_STATS_SHIPPING:-}" ]]; then
+  echo "--- Ship Kibana Distribution Metrics to CI Stats"
+  node scripts/ship_ci_stats \
+    --metrics target/optimizer_bundle_metrics.json \
+    --metrics packages/kbn-ui-shared-deps/target/metrics.json
+fi
+
+echo "--- Upload Build Artifacts"
+# Moving to `target/` first will keep `buildkite-agent` from including directories in the artifact name
+cd "$KIBANA_DIR/target"
+mv kibana-*-linux-x86_64.tar.gz kibana-default.tar.gz
+buildkite-agent artifact upload kibana-default.tar.gz
+buildkite-agent artifact upload kibana-default-plugins.tar.gz
+cd -
diff --git a/.buildkite/scripts/saved_object_field_metrics.sh b/.buildkite/scripts/saved_object_field_metrics.sh
new file mode 100755
index 0000000000000..3b6c63eeff3b0
--- /dev/null
+++ b/.buildkite/scripts/saved_object_field_metrics.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+source .buildkite/scripts/common/util.sh
+
+echo '--- Default Saved Object Field Metrics'
+cd "$XPACK_DIR"
+checks-reporter-with-killswitch "Capture Kibana Saved Objects field count metrics" \
+  node scripts/functional_tests \
+      --debug --bail \
+      --kibana-install-dir "$KIBANA_BUILD_LOCATION" \
+      --config test/saved_objects_field_count/config.ts
diff --git a/.buildkite/scripts/steps/on_merge_build_and_metrics.sh b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
new file mode 100755
index 0000000000000..fdf06981ab568
--- /dev/null
+++ b/.buildkite/scripts/steps/on_merge_build_and_metrics.sh
@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+export DISABLE_BOOTSTRAP_VALIDATION=true
+export BUILD_TS_REFS_DISABLE=true
+
+.buildkite/scripts/bootstrap.sh
+.buildkite/scripts/build_kibana.sh
+.buildkite/scripts/post_build_kibana.sh
+.buildkite/scripts/saved_object_field_metrics.sh
diff --git a/.buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh b/.buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh
new file mode 100755
index 0000000000000..35bc137ee4a02
--- /dev/null
+++ b/.buildkite/scripts/steps/on_merge_ts_refs_api_docs.sh
@@ -0,0 +1,13 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+export BUILD_TS_REFS_CACHE_ENABLE=true
+export BUILD_TS_REFS_CACHE_CAPTURE=true
+export DISABLE_BOOTSTRAP_VALIDATION=true
+export BUILD_TS_REFS_DISABLE=false
+
+.buildkite/scripts/bootstrap.sh
+
+echo "--- Build API Docs"
+node scripts/build_api_docs
diff --git a/.ci/Jenkinsfile_baseline_capture b/.ci/Jenkinsfile_baseline_capture
index d074da1cb1926..9d662f4b39fb9 100644
--- a/.ci/Jenkinsfile_baseline_capture
+++ b/.ci/Jenkinsfile_baseline_capture
@@ -37,7 +37,7 @@ kibanaPipeline(timeoutMinutes: 210) {
                   tasks([
                     kibanaPipeline.functionalTestProcess('oss-baseline', './test/scripts/jenkins_baseline.sh'),
                     kibanaPipeline.functionalTestProcess('xpack-baseline', './test/scripts/jenkins_xpack_baseline.sh'),
-                    kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/plugin_public_api_docs.sh'),
+                    kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/baseline_plugin_public_api_docs.sh'),
                   ])
                 }
               }
diff --git a/.eslintrc.js b/.eslintrc.js
index a4ce657d523d9..22d0270a5b066 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -1370,7 +1370,7 @@ module.exports = {
     {
       // Source files only - allow `any` in test/mock files
       files: ['x-pack/plugins/enterprise_search/**/*.{ts,tsx}'],
-      excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock}.{ts,tsx}'],
+      excludedFiles: ['x-pack/plugins/enterprise_search/**/*.{test,mock,test_helper}.{ts,tsx}'],
       rules: {
         '@typescript-eslint/no-explicit-any': 'error',
       },
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9c9200ce33e7a..a017c79309a56 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -24,6 +24,7 @@
 /src/plugins/vis_type_vega/ @elastic/kibana-app
 /src/plugins/vis_type_vislib/ @elastic/kibana-app
 /src/plugins/vis_type_xy/ @elastic/kibana-app
+/src/plugins/vis_type_pie/ @elastic/kibana-app
 /src/plugins/visualize/ @elastic/kibana-app
 /src/plugins/visualizations/ @elastic/kibana-app
 /packages/kbn-tinymath/ @elastic/kibana-app
@@ -54,6 +55,7 @@
 /src/plugins/share/ @elastic/kibana-app-services
 /src/plugins/ui_actions/ @elastic/kibana-app-services
 /src/plugins/index_pattern_field_editor @elastic/kibana-app-services
+/src/plugins/screenshot_mode @elastic/kibana-app-services
 /x-pack/examples/ui_actions_enhanced_examples/ @elastic/kibana-app-services
 /x-pack/plugins/data_enhanced/ @elastic/kibana-app-services
 /x-pack/plugins/embeddable_enhanced/ @elastic/kibana-app-services
@@ -87,7 +89,7 @@
 # Client Side Monitoring / Uptime (lives in APM directories but owned by Uptime)
 /x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm @elastic/uptime
 /x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature @elastic/uptime
-/x-pack/plugins/apm/public/application/csmApp.tsx @elastic/uptime
+/x-pack/plugins/apm/public/application/uxApp.tsx @elastic/uptime
 /x-pack/plugins/apm/public/components/app/RumDashboard @elastic/uptime
 /x-pack/plugins/apm/server/lib/rum_client @elastic/uptime
 /x-pack/plugins/apm/server/routes/rum_client.ts @elastic/uptime
@@ -126,8 +128,10 @@
 /x-pack/test/functional_basic/apps/ml/ @elastic/ml-ui
 /x-pack/test/functional_with_es_ssl/apps/ml/ @elastic/ml-ui
 
-# ML team owns and maintains the transform plugin despite it living in the Elasticsearch management section.
+# ML team owns and maintains the transform plugin despite it living in the Data management section.
 /x-pack/plugins/transform/  @elastic/ml-ui
+/x-pack/plugins/data_visualizer/ @elastic/ml-ui
+/x-pack/plugins/file_upload/ @elastic/ml-ui
 /x-pack/test/accessibility/apps/transform.ts  @elastic/ml-ui
 /x-pack/test/api_integration/apis/transform/ @elastic/ml-ui
 /x-pack/test/api_integration_basic/apis/transform/ @elastic/ml-ui
@@ -174,6 +178,7 @@
 /.bazelversion @elastic/kibana-operations
 /WORKSPACE.bazel @elastic/kibana-operations
 #CC# /packages/kbn-expect/ @elastic/kibana-operations
+/.buildkite/ @elastic/kibana-operations
 
 # Quality Assurance
 /src/dev/code_coverage @elastic/kibana-qa
@@ -302,29 +307,29 @@
 /x-pack/plugins/enterprise_search/server/collectors/workplace_search/ @elastic/workplace-search-frontend
 /x-pack/plugins/enterprise_search/server/saved_objects/workplace_search/ @elastic/workplace-search-frontend
 
-# Elasticsearch UI
-/src/plugins/dev_tools/ @elastic/es-ui
-/src/plugins/console/  @elastic/es-ui
-/src/plugins/es_ui_shared/  @elastic/es-ui
-/x-pack/plugins/cross_cluster_replication/  @elastic/es-ui
-/x-pack/plugins/index_lifecycle_management/  @elastic/es-ui
-/x-pack/plugins/console_extensions/  @elastic/es-ui
-/x-pack/plugins/grokdebugger/  @elastic/es-ui
-/x-pack/plugins/index_management/  @elastic/es-ui
-/x-pack/plugins/license_api_guard/  @elastic/es-ui
-/x-pack/plugins/license_management/  @elastic/es-ui
-/x-pack/plugins/painless_lab/  @elastic/es-ui
-/x-pack/plugins/remote_clusters/  @elastic/es-ui
-/x-pack/plugins/rollup/  @elastic/es-ui
-/x-pack/plugins/searchprofiler/  @elastic/es-ui
-/x-pack/plugins/snapshot_restore/  @elastic/es-ui
-/x-pack/plugins/upgrade_assistant/  @elastic/es-ui
-/x-pack/plugins/watcher/  @elastic/es-ui
-/x-pack/plugins/ingest_pipelines/  @elastic/es-ui
-/packages/kbn-ace/ @elastic/es-ui
-/packages/kbn-monaco/ @elastic/es-ui
-#CC# /x-pack/plugins/console_extensions/ @elastic/es-ui
-#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/es-ui
+# Stack Management
+/src/plugins/dev_tools/ @elastic/kibana-stack-management
+/src/plugins/console/  @elastic/kibana-stack-management
+/src/plugins/es_ui_shared/  @elastic/kibana-stack-management
+/x-pack/plugins/cross_cluster_replication/  @elastic/kibana-stack-management
+/x-pack/plugins/index_lifecycle_management/  @elastic/kibana-stack-management
+/x-pack/plugins/console_extensions/  @elastic/kibana-stack-management
+/x-pack/plugins/grokdebugger/  @elastic/kibana-stack-management
+/x-pack/plugins/index_management/  @elastic/kibana-stack-management
+/x-pack/plugins/license_api_guard/  @elastic/kibana-stack-management
+/x-pack/plugins/license_management/  @elastic/kibana-stack-management
+/x-pack/plugins/painless_lab/  @elastic/kibana-stack-management
+/x-pack/plugins/remote_clusters/  @elastic/kibana-stack-management
+/x-pack/plugins/rollup/  @elastic/kibana-stack-management
+/x-pack/plugins/searchprofiler/  @elastic/kibana-stack-management
+/x-pack/plugins/snapshot_restore/  @elastic/kibana-stack-management
+/x-pack/plugins/upgrade_assistant/  @elastic/kibana-stack-management
+/x-pack/plugins/watcher/  @elastic/kibana-stack-management
+/x-pack/plugins/ingest_pipelines/  @elastic/kibana-stack-management
+/packages/kbn-ace/ @elastic/kibana-stack-management
+/packages/kbn-monaco/ @elastic/kibana-stack-management
+#CC# /x-pack/plugins/console_extensions/ @elastic/kibana-stack-management
+#CC# /x-pack/plugins/cross_cluster_replication/ @elastic/kibana-stack-management
 
 # Security Solution
 /x-pack/test/endpoint_api_integration_no_ingest/ @elastic/security-solution
@@ -339,7 +344,7 @@
 #CC# /x-pack/plugins/security_solution/ @elastic/security-solution
 
 # Security Solution sub teams
-/x-pack/plugins/case @elastic/security-threat-hunting
+/x-pack/plugins/cases @elastic/security-threat-hunting
 /x-pack/plugins/timelines @elastic/security-threat-hunting
 /x-pack/test/case_api_integration @elastic/security-threat-hunting
 /x-pack/plugins/lists @elastic/security-detections-response
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 2a5fc914662b6..726e4257a5aac 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,6 +2,7 @@
 
 Summarize your PR. If it involves visual changes include a screenshot or gif.
 
+
 ### Checklist
 
 Delete any items that are not applicable to this PR.
@@ -15,6 +16,23 @@ Delete any items that are not applicable to this PR.
 - [ ] This renders correctly on smaller devices using a responsive layout. (You can test this [in your browser](https://www.browserstack.com/guide/responsive-testing-on-local-server))
 - [ ] This was checked for [cross-browser compatibility](https://www.elastic.co/support/matrix#matrix_browsers)
 
+
+### Risk Matrix
+
+Delete this section if it is not applicable to this PR.
+
+Before closing this PR, invite QA, stakeholders, and other developers to identify risks that should be tested prior to the change/feature release.
+
+When forming the risk matrix, consider some of the following examples and how they may potentially impact the change:
+
+| Risk                      | Probability | Severity | Mitigation/Notes        |
+|---------------------------|-------------|----------|-------------------------|
+| Multiple Spaces&mdash;unexpected behavior in non-default Kibana Space. | Low | High | Integration tests will verify that all features are still supported in non-default Kibana Space and when user switches between spaces. |
+| Multiple nodes&mdash;Elasticsearch polling might have race conditions when multiple Kibana nodes are polling for the same tasks. | High | Low | Tasks are idempotent, so executing them multiple times will not result in logical error, but will degrade performance. To test for this case we add plenty of unit tests around this logic and document manual testing procedure. |
+| Code should gracefully handle cases when feature X or plugin Y are disabled. | Medium | High | Unit tests will verify that any feature flag or plugin combination still results in our service operational. |
+| [See more potential risk examples](https://github.com/elastic/kibana/blob/master/RISK_MATRIX.mdx) |
+
+
 ### For maintainers
 
 - [ ] This was checked for breaking API changes and was [labeled appropriately](https://www.elastic.co/guide/en/kibana/master/contributing.html#kibana-release-notes-process)
diff --git a/.gitignore b/.gitignore
index f9855520cb110..d5a5104954078 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,7 @@ npm-debug.log*
 .vagrant
 
 ## @cypress/snapshot from apm plugin
-snapshots.js
+/snapshots.js
 
 # release notes script output
 report.csv
diff --git a/.i18nrc.json b/.i18nrc.json
index dc01a10b6a686..ad91042a2172d 100644
--- a/.i18nrc.json
+++ b/.i18nrc.json
@@ -3,6 +3,7 @@
     "console": "src/plugins/console",
     "core": "src/core",
     "discover": "src/plugins/discover",
+    "bfetch": "src/plugins/bfetch",
     "dashboard": "src/plugins/dashboard",
     "data": "src/plugins/data",
     "embeddableApi": "src/plugins/embeddable",
@@ -55,6 +56,7 @@
     "visTypeVega": "src/plugins/vis_type_vega",
     "visTypeVislib": "src/plugins/vis_type_vislib",
     "visTypeXy": "src/plugins/vis_type_xy",
+    "visTypePie": "src/plugins/vis_type_pie",
     "visualizations": "src/plugins/visualizations",
     "visualize": "src/plugins/visualize",
     "apmOss": "src/plugins/apm_oss",
diff --git a/RISK_MATRIX.mdx b/RISK_MATRIX.mdx
new file mode 100644
index 0000000000000..71b0198489934
--- /dev/null
+++ b/RISK_MATRIX.mdx
@@ -0,0 +1,63 @@
+# Risk consideration
+
+When merging a new feature of considerable size or modifying an existing one,
+consider adding a *Risk Matrix* section to your PR in collaboration with other
+developers on your team and the QA team.
+
+Below are some general themes to consider for the *Risk Matrix*. (Feel free to
+add to this list.)
+
+
+## General risks
+
+- What happens when your feature is used in a non-default space or a custom
+  space?
+- What happens when there are multiple Kibana nodes using the same Elasticsearch
+  cluster?
+- What happens when a plugin you depend on is disabled?
+- What happens when a feature you depend on is disabled?
+- Is your change working correctly regardless of `kibana.yml` configuration or
+  UI Setting configuration? (For example, does it support both
+  `state:storeInSessionStorage` UI setting states?)
+- What happens when a third party integration you depend on is not responding?
+- How is authentication handled with third party services?
+- Does the feature work in Elastic Cloud?
+- Does the feature create a setting that needs to be exposed, or configured
+  differently than the default, on the Elastic Cloud?
+- Is there a significant performance impact that may affect Cloud Kibana
+  instances?
+- Does your feature need to be aware of running in a container?
+- Does the feature Work with security disabled, or fails gracefully?
+- Are there performance risks associated with your feature? Does it potentially
+  access or create: (1) many fields; (2) many indices; (3) lots of data;
+  (4) lots of saved objects; (5) large saved objects.
+- Could this cause memory to leak in either the browser or server?
+- Will your feature still work if Kibana is run behind a reverse proxy?
+- Does your feature affect other plugins?
+- If you write to the file system, what happens if Kibana node goes down? What
+  happens if there are multiple Kibana nodes?
+- Are migrations handled gracefully? Does the feature affect old indices or
+  saved objects?
+- Are you using any technologies, protocols, techniques, conventions, libraries,
+  NPM modules, etc. that may be new or unprecedented in Kibana?
+
+
+## Security risks
+
+Check to ensure that best practices are used to mitigate common vulnerabilities:
+
+- Cross-site scripting (XSS)
+- Cross-site request forgery (CSRF)
+- Remote-code execution (RCE)
+- Server-side request forgery (SSRF)
+- Prototype pollution
+- Information disclosure
+- Tabnabbing
+
+In addition to these risks, in general, server-side input validation should be
+implemented as strictly as possible. Extra care should be taken when user input
+is used to construct URLs or data structures; this is a common source of
+injection attacks and other vulnerabilities. For more information on all of
+these topics, see [Security best practices][security-best-practices].
+
+[security-best-practices]: https://www.elastic.co/guide/en/kibana/master/security-best-practices.html
diff --git a/WORKSPACE.bazel b/WORKSPACE.bazel
index d80ad948cbb55..acb62043a15ca 100644
--- a/WORKSPACE.bazel
+++ b/WORKSPACE.bazel
@@ -10,15 +10,15 @@ load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
 # Fetch Node.js rules
 http_archive(
   name = "build_bazel_rules_nodejs",
-  sha256 = "10f534e1c80f795cffe1f2822becd4897754d18564612510c59b3c73544ae7c6",
-  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.5.0/rules_nodejs-3.5.0.tar.gz"],
+  sha256 = "4a5d654a4ccd4a4c24eca5d319d85a88a650edf119601550c95bf400c8cc897e",
+  urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.5.1/rules_nodejs-3.5.1.tar.gz"],
 )
 
 # Now that we have the rules let's import from them to complete the work
 load("@build_bazel_rules_nodejs//:index.bzl", "check_rules_nodejs_version", "node_repositories", "yarn_install")
 
 # Assure we have at least a given rules_nodejs version
-check_rules_nodejs_version(minimum_version_string = "3.5.0")
+check_rules_nodejs_version(minimum_version_string = "3.5.1")
 
 # Setup the Node.js toolchain for the architectures we want to support
 #
diff --git a/api_docs/actions.json b/api_docs/actions.json
index 8bd644be376d7..d7c5e63434c07 100644
--- a/api_docs/actions.json
+++ b/api_docs/actions.json
@@ -1054,7 +1054,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts",
-          "lineNumber": 121
+          "lineNumber": 129
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/apm.json b/api_docs/apm.json
index 7eee0349fa349..84f5a87f404ae 100644
--- a/api_docs/apm.json
+++ b/api_docs/apm.json
@@ -78,7 +78,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/apm/public/plugin.ts",
-        "lineNumber": 45
+        "lineNumber": 47
       },
       "deprecated": false,
       "lifecycle": "setup",
@@ -96,7 +96,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/apm/public/plugin.ts",
-        "lineNumber": 47
+        "lineNumber": 49
       },
       "deprecated": false,
       "lifecycle": "start",
@@ -144,7 +144,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/apm/server/plugin.ts",
-          "lineNumber": 55
+          "lineNumber": 54
         },
         "deprecated": false,
         "children": [
@@ -160,7 +160,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/apm/server/plugin.ts",
-              "lineNumber": 65
+              "lineNumber": 64
             },
             "deprecated": false,
             "children": [
@@ -183,7 +183,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/apm/server/plugin.ts",
-                  "lineNumber": 65
+                  "lineNumber": 64
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -237,7 +237,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/apm/server/plugin.ts",
-              "lineNumber": 69
+              "lineNumber": 68
             },
             "deprecated": false,
             "children": [
@@ -262,7 +262,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/apm/server/plugin.ts",
-                  "lineNumber": 70
+                  "lineNumber": 69
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -281,7 +281,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/apm/server/plugin.ts",
-                  "lineNumber": 71
+                  "lineNumber": 70
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -309,7 +309,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/apm/server/plugin.ts",
-              "lineNumber": 269
+              "lineNumber": 260
             },
             "deprecated": false,
             "children": [
@@ -331,7 +331,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/apm/server/plugin.ts",
-                  "lineNumber": 269
+                  "lineNumber": 260
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -351,7 +351,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/apm/server/plugin.ts",
-              "lineNumber": 288
+              "lineNumber": 279
             },
             "deprecated": false,
             "children": [],
diff --git a/api_docs/apm_oss.json b/api_docs/apm_oss.json
index 75cb60610335b..c09f772ea0a55 100644
--- a/api_docs/apm_oss.json
+++ b/api_docs/apm_oss.json
@@ -5,606 +5,15 @@
     "functions": [],
     "interfaces": [],
     "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-public.APM_STATIC_INDEX_PATTERN_ID",
-        "type": "string",
-        "tags": [],
-        "label": "APM_STATIC_INDEX_PATTERN_ID",
-        "description": [],
-        "signature": [
-          "\"apm_static_index_pattern_id\""
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/common/index_pattern_constants.ts",
-          "lineNumber": 9
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      }
-    ],
-    "objects": [],
-    "setup": {
-      "parentPluginId": "apmOss",
-      "id": "def-public.ApmOssPluginSetup",
-      "type": "Interface",
-      "tags": [],
-      "label": "ApmOssPluginSetup",
-      "description": [],
-      "source": {
-        "path": "src/plugins/apm_oss/public/types.ts",
-        "lineNumber": 10
-      },
-      "deprecated": false,
-      "children": [],
-      "lifecycle": "setup",
-      "initialIsOpen": true
-    },
-    "start": {
-      "parentPluginId": "apmOss",
-      "id": "def-public.ApmOssPluginStart",
-      "type": "Interface",
-      "tags": [],
-      "label": "ApmOssPluginStart",
-      "description": [],
-      "source": {
-        "path": "src/plugins/apm_oss/public/types.ts",
-        "lineNumber": 13
-      },
-      "deprecated": false,
-      "children": [],
-      "lifecycle": "start",
-      "initialIsOpen": true
-    }
+    "misc": [],
+    "objects": []
   },
   "server": {
     "classes": [],
-    "functions": [
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createDjangoAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createDjangoAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands: string[]; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 88
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createDjangoAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 88
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createDjangoAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 88
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createDotNetAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createDotNetAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands?: undefined; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; } | { title: string; commands: string[]; textPost: string; textPre?: undefined; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 631
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createDotNetAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 631
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createDotNetAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 631
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createFlaskAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createFlaskAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands: string[]; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 173
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createFlaskAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 173
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createFlaskAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 173
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createGoAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createGoAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands: string[]; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 492
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createGoAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 492
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createGoAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 492
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createJavaAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createJavaAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands?: undefined; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 585
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createJavaAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 585
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createJavaAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 585
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createJsAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createJsAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string) => ({ title: string; textPre: string; commands?: undefined; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; } | { title: string; textPre: string; commands: string[]; textPost?: undefined; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 393
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createJsAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 393
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createNodeAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createNodeAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands: string[]; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 11
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createNodeAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 11
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createNodeAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 11
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createPhpAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createPhpAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands?: undefined; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 705
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createPhpAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 705
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createPhpAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 705
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createRackAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createRackAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands: string[]; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 298
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createRackAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 298
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createRackAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 298
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.createRailsAgentInstructions",
-        "type": "Function",
-        "tags": [],
-        "label": "createRailsAgentInstructions",
-        "description": [],
-        "signature": [
-          "(apmServerUrl?: string, secretToken?: string) => ({ title: string; textPre: string; commands: string[]; textPost?: undefined; } | { title: string; textPre: string; commands: string[]; textPost: string; })[]"
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-          "lineNumber": 255
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createRailsAgentInstructions.$1",
-            "type": "string",
-            "tags": [],
-            "label": "apmServerUrl",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 255
-            },
-            "deprecated": false,
-            "isRequired": true
-          },
-          {
-            "parentPluginId": "apmOss",
-            "id": "def-server.createRailsAgentInstructions.$2",
-            "type": "string",
-            "tags": [],
-            "label": "secretToken",
-            "description": [],
-            "signature": [
-              "string"
-            ],
-            "source": {
-              "path": "src/plugins/apm_oss/server/tutorial/instructions/apm_agent_instructions.ts",
-              "lineNumber": 255
-            },
-            "deprecated": false,
-            "isRequired": true
-          }
-        ],
-        "returnComment": [],
-        "initialIsOpen": false
-      }
-    ],
+    "functions": [],
     "interfaces": [],
     "enums": [],
     "misc": [
-      {
-        "parentPluginId": "apmOss",
-        "id": "def-server.APM_STATIC_INDEX_PATTERN_ID",
-        "type": "string",
-        "tags": [],
-        "label": "APM_STATIC_INDEX_PATTERN_ID",
-        "description": [],
-        "signature": [
-          "\"apm_static_index_pattern_id\""
-        ],
-        "source": {
-          "path": "src/plugins/apm_oss/common/index_pattern_constants.ts",
-          "lineNumber": 9
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "apmOss",
         "id": "def-server.APMOSSConfig",
@@ -617,7 +26,7 @@
         ],
         "source": {
           "path": "src/plugins/apm_oss/server/index.ts",
-          "lineNumber": 32
+          "lineNumber": 31
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -633,7 +42,7 @@
       "description": [],
       "source": {
         "path": "src/plugins/apm_oss/server/plugin.ts",
-        "lineNumber": 47
+        "lineNumber": 27
       },
       "deprecated": false,
       "children": [
@@ -649,7 +58,7 @@
           ],
           "source": {
             "path": "src/plugins/apm_oss/server/plugin.ts",
-            "lineNumber": 48
+            "lineNumber": 28
           },
           "deprecated": false
         },
@@ -666,34 +75,9 @@
           ],
           "source": {
             "path": "src/plugins/apm_oss/server/plugin.ts",
-            "lineNumber": 49
+            "lineNumber": 29
           },
           "deprecated": false
-        },
-        {
-          "parentPluginId": "apmOss",
-          "id": "def-server.APMOSSPluginSetup.getRegisteredTutorialProvider",
-          "type": "Function",
-          "tags": [],
-          "label": "getRegisteredTutorialProvider",
-          "description": [],
-          "signature": [
-            "() => ",
-            {
-              "pluginId": "home",
-              "scope": "server",
-              "docId": "kibHomePluginApi",
-              "section": "def-server.TutorialProvider",
-              "text": "TutorialProvider"
-            }
-          ],
-          "source": {
-            "path": "src/plugins/apm_oss/server/plugin.ts",
-            "lineNumber": 50
-          },
-          "deprecated": false,
-          "children": [],
-          "returnComment": []
         }
       ],
       "lifecycle": "setup",
diff --git a/api_docs/apm_oss.mdx b/api_docs/apm_oss.mdx
index c4facc4e390b6..7370704001378 100644
--- a/api_docs/apm_oss.mdx
+++ b/api_docs/apm_oss.mdx
@@ -11,25 +11,11 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 import apmOssObj from './apm_oss.json';
 
-## Client
-
-### Setup
-<DocDefinitionList data={[apmOssObj.client.setup]}/>
-
-### Start
-<DocDefinitionList data={[apmOssObj.client.start]}/>
-
-### Consts, variables and types
-<DocDefinitionList data={apmOssObj.client.misc}/>
-
 ## Server
 
 ### Setup
 <DocDefinitionList data={[apmOssObj.server.setup]}/>
 
-### Functions
-<DocDefinitionList data={apmOssObj.server.functions}/>
-
 ### Consts, variables and types
 <DocDefinitionList data={apmOssObj.server.misc}/>
 
diff --git a/api_docs/bfetch.json b/api_docs/bfetch.json
index 76b2118282b2e..ce294077f9499 100644
--- a/api_docs/bfetch.json
+++ b/api_docs/bfetch.json
@@ -78,7 +78,7 @@
       "description": [],
       "source": {
         "path": "src/plugins/bfetch/public/plugin.ts",
-        "lineNumber": 24
+        "lineNumber": 23
       },
       "deprecated": false,
       "children": [
@@ -98,7 +98,7 @@
           ],
           "source": {
             "path": "src/plugins/bfetch/public/plugin.ts",
-            "lineNumber": 25
+            "lineNumber": 24
           },
           "deprecated": false,
           "returnComment": [],
@@ -115,7 +115,7 @@
               ],
               "source": {
                 "path": "src/plugins/bfetch/public/plugin.ts",
-                "lineNumber": 25
+                "lineNumber": 24
               },
               "deprecated": false
             }
@@ -143,7 +143,7 @@
           ],
           "source": {
             "path": "src/plugins/bfetch/public/plugin.ts",
-            "lineNumber": 26
+            "lineNumber": 25
           },
           "deprecated": false,
           "returnComment": [],
@@ -161,7 +161,7 @@
               ],
               "source": {
                 "path": "src/plugins/bfetch/public/plugin.ts",
-                "lineNumber": 27
+                "lineNumber": 26
               },
               "deprecated": false
             }
@@ -195,7 +195,7 @@
         ],
         "source": {
           "path": "src/plugins/bfetch/server/plugin.ts",
-          "lineNumber": 39
+          "lineNumber": 41
         },
         "deprecated": false,
         "children": [
@@ -211,7 +211,7 @@
             ],
             "source": {
               "path": "src/plugins/bfetch/server/plugin.ts",
-              "lineNumber": 40
+              "lineNumber": 42
             },
             "deprecated": false,
             "returnComment": [],
@@ -228,7 +228,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/bfetch/server/plugin.ts",
-                  "lineNumber": 40
+                  "lineNumber": 42
                 },
                 "deprecated": false
               }
@@ -290,7 +290,7 @@
       "description": [],
       "source": {
         "path": "src/plugins/bfetch/server/plugin.ts",
-        "lineNumber": 44
+        "lineNumber": 46
       },
       "deprecated": false,
       "children": [
@@ -322,7 +322,7 @@
           ],
           "source": {
             "path": "src/plugins/bfetch/server/plugin.ts",
-            "lineNumber": 45
+            "lineNumber": 47
           },
           "deprecated": false,
           "returnComment": [],
@@ -336,7 +336,7 @@
               "description": [],
               "source": {
                 "path": "src/plugins/bfetch/server/plugin.ts",
-                "lineNumber": 46
+                "lineNumber": 48
               },
               "deprecated": false
             },
@@ -368,7 +368,7 @@
               ],
               "source": {
                 "path": "src/plugins/bfetch/server/plugin.ts",
-                "lineNumber": 47
+                "lineNumber": 49
               },
               "deprecated": false
             }
@@ -402,7 +402,7 @@
           ],
           "source": {
             "path": "src/plugins/bfetch/server/plugin.ts",
-            "lineNumber": 49
+            "lineNumber": 51
           },
           "deprecated": false,
           "returnComment": [],
@@ -416,7 +416,7 @@
               "description": [],
               "source": {
                 "path": "src/plugins/bfetch/server/plugin.ts",
-                "lineNumber": 50
+                "lineNumber": 52
               },
               "deprecated": false
             },
@@ -448,7 +448,7 @@
               ],
               "source": {
                 "path": "src/plugins/bfetch/server/plugin.ts",
-                "lineNumber": 51
+                "lineNumber": 53
               },
               "deprecated": false
             }
@@ -682,7 +682,7 @@
           ],
           "source": {
             "path": "src/plugins/bfetch/server/plugin.ts",
-            "lineNumber": 81
+            "lineNumber": 83
           },
           "deprecated": false,
           "returnComment": [],
@@ -719,7 +719,7 @@
               ],
               "source": {
                 "path": "src/plugins/bfetch/server/plugin.ts",
-                "lineNumber": 89
+                "lineNumber": 91
               },
               "deprecated": false
             }
@@ -738,7 +738,7 @@
       "description": [],
       "source": {
         "path": "src/plugins/bfetch/server/plugin.ts",
-        "lineNumber": 94
+        "lineNumber": 96
       },
       "deprecated": false,
       "children": [],
@@ -1343,6 +1343,48 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "bfetch",
+        "id": "def-common.BatchItemWrapper",
+        "type": "Interface",
+        "tags": [],
+        "label": "BatchItemWrapper",
+        "description": [],
+        "source": {
+          "path": "src/plugins/bfetch/common/batch.ts",
+          "lineNumber": 23
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "bfetch",
+            "id": "def-common.BatchItemWrapper.compressed",
+            "type": "boolean",
+            "tags": [],
+            "label": "compressed",
+            "description": [],
+            "source": {
+              "path": "src/plugins/bfetch/common/batch.ts",
+              "lineNumber": 24
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "bfetch",
+            "id": "def-common.BatchItemWrapper.payload",
+            "type": "string",
+            "tags": [],
+            "label": "payload",
+            "description": [],
+            "source": {
+              "path": "src/plugins/bfetch/common/batch.ts",
+              "lineNumber": 25
+            },
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "bfetch",
         "id": "def-common.BatchRequestData",
@@ -1684,7 +1726,25 @@
       }
     ],
     "enums": [],
-    "misc": [],
+    "misc": [
+      {
+        "parentPluginId": "bfetch",
+        "id": "def-common.DISABLE_BFETCH_COMPRESSION",
+        "type": "string",
+        "tags": [],
+        "label": "DISABLE_BFETCH_COMPRESSION",
+        "description": [],
+        "signature": [
+          "\"bfetch:disableCompression\""
+        ],
+        "source": {
+          "path": "src/plugins/bfetch/common/constants.ts",
+          "lineNumber": 9
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      }
+    ],
     "objects": []
   }
 }
\ No newline at end of file
diff --git a/api_docs/bfetch.mdx b/api_docs/bfetch.mdx
index 0e9a9e79dbea6..faf3d7eefc7f9 100644
--- a/api_docs/bfetch.mdx
+++ b/api_docs/bfetch.mdx
@@ -47,3 +47,6 @@ import bfetchObj from './bfetch.json';
 ### Interfaces
 <DocDefinitionList data={bfetchObj.common.interfaces}/>
 
+### Consts, variables and types
+<DocDefinitionList data={bfetchObj.common.misc}/>
+
diff --git a/api_docs/cases.json b/api_docs/cases.json
index 3d77ada0c336b..bc92995dff6e9 100644
--- a/api_docs/cases.json
+++ b/api_docs/cases.json
@@ -294,6 +294,38 @@
     ],
     "functions": [],
     "interfaces": [
+      {
+        "parentPluginId": "cases",
+        "id": "def-public.Owner",
+        "type": "Interface",
+        "tags": [],
+        "label": "Owner",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/cases/public/types.ts",
+          "lineNumber": 42
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "cases",
+            "id": "def-public.Owner.owner",
+            "type": "Array",
+            "tags": [],
+            "label": "owner",
+            "description": [],
+            "signature": [
+              "string[]"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/public/types.ts",
+              "lineNumber": 43
+            },
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "cases",
         "id": "def-public.SetupPlugins",
@@ -315,17 +347,13 @@
             "label": "security",
             "description": [],
             "signature": [
-              "{ authc: ",
-              "AuthenticationServiceSetup",
-              "; sessionTimeout: ",
-              "SessionTimeout",
-              "; license: Readonly<{ isLicenseAvailable: () => boolean; isEnabled: () => boolean; getType: () => \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; getFeatures: () => ",
-              "SecurityLicenseFeatures",
-              "; features$: ",
-              "Observable",
-              "<",
-              "SecurityLicenseFeatures",
-              ">; }>; __legacyCompat: { logoutUrl: string; tenant: string; }; }"
+              {
+                "pluginId": "security",
+                "scope": "public",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-public.SecurityPluginSetup",
+                "text": "SecurityPluginSetup"
+              }
             ],
             "source": {
               "path": "x-pack/plugins/cases/public/types.ts",
@@ -424,17 +452,15 @@
             "section": "def-public.StartPlugins",
             "text": "StartPlugins"
           },
-          " & { security: { authc: ",
-          "AuthenticationServiceSetup",
-          "; sessionTimeout: ",
-          "SessionTimeout",
-          "; license: Readonly<{ isLicenseAvailable: () => boolean; isEnabled: () => boolean; getType: () => \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; getFeatures: () => ",
-          "SecurityLicenseFeatures",
-          "; features$: ",
-          "Observable",
-          "<",
-          "SecurityLicenseFeatures",
-          ">; }>; __legacyCompat: { logoutUrl: string; tenant: string; }; }; }"
+          " & { security: ",
+          {
+            "pluginId": "security",
+            "scope": "public",
+            "docId": "kibSecurityPluginApi",
+            "section": "def-public.SecurityPluginSetup",
+            "text": "SecurityPluginSetup"
+          },
+          "; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/public/types.ts",
@@ -454,7 +480,7 @@
       "description": [],
       "source": {
         "path": "x-pack/plugins/cases/public/types.ts",
-        "lineNumber": 42
+        "lineNumber": 46
       },
       "deprecated": false,
       "children": [
@@ -474,7 +500,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/cases/public/types.ts",
-            "lineNumber": 43
+            "lineNumber": 47
           },
           "deprecated": false,
           "returnComment": [],
@@ -491,7 +517,7 @@
               ],
               "source": {
                 "path": "x-pack/plugins/cases/public/types.ts",
-                "lineNumber": 43
+                "lineNumber": 47
               },
               "deprecated": false
             }
@@ -513,7 +539,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/cases/public/types.ts",
-            "lineNumber": 44
+            "lineNumber": 48
           },
           "deprecated": false,
           "returnComment": [],
@@ -530,7 +556,7 @@
               ],
               "source": {
                 "path": "x-pack/plugins/cases/public/types.ts",
-                "lineNumber": 45
+                "lineNumber": 49
               },
               "deprecated": false
             }
@@ -552,7 +578,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/cases/public/types.ts",
-            "lineNumber": 47
+            "lineNumber": 51
           },
           "deprecated": false,
           "returnComment": [],
@@ -569,7 +595,7 @@
               ],
               "source": {
                 "path": "x-pack/plugins/cases/public/types.ts",
-                "lineNumber": 47
+                "lineNumber": 51
               },
               "deprecated": false
             }
@@ -591,7 +617,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/cases/public/types.ts",
-            "lineNumber": 48
+            "lineNumber": 52
           },
           "deprecated": false,
           "returnComment": [],
@@ -608,7 +634,7 @@
               ],
               "source": {
                 "path": "x-pack/plugins/cases/public/types.ts",
-                "lineNumber": 48
+                "lineNumber": 52
               },
               "deprecated": false
             }
@@ -630,7 +656,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/cases/public/types.ts",
-            "lineNumber": 49
+            "lineNumber": 53
           },
           "deprecated": false,
           "returnComment": [],
@@ -647,7 +673,7 @@
               ],
               "source": {
                 "path": "x-pack/plugins/cases/public/types.ts",
-                "lineNumber": 49
+                "lineNumber": 53
               },
               "deprecated": false
             }
@@ -669,7 +695,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/cases/public/types.ts",
-            "lineNumber": 50
+            "lineNumber": 54
           },
           "deprecated": false,
           "returnComment": [],
@@ -686,7 +712,7 @@
               ],
               "source": {
                 "path": "x-pack/plugins/cases/public/types.ts",
-                "lineNumber": 50
+                "lineNumber": 54
               },
               "deprecated": false
             }
@@ -698,7 +724,170 @@
     }
   },
   "server": {
-    "classes": [],
+    "classes": [
+      {
+        "parentPluginId": "cases",
+        "id": "def-server.CasesClient",
+        "type": "Class",
+        "tags": [],
+        "label": "CasesClient",
+        "description": [
+          "\nClient wrapper that contains accessor methods for individual entities within the cases system."
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/server/client/client.ts",
+          "lineNumber": 21
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "cases",
+            "id": "def-server.CasesClient.Unnamed",
+            "type": "Function",
+            "tags": [],
+            "label": "Constructor",
+            "description": [],
+            "signature": [
+              "any"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/client/client.ts",
+              "lineNumber": 30
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "cases",
+                "id": "def-server.CasesClient.Unnamed.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "args",
+                "description": [],
+                "signature": [
+                  "CasesClientArgs"
+                ],
+                "source": {
+                  "path": "x-pack/plugins/cases/server/client/client.ts",
+                  "lineNumber": 30
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "cases",
+            "id": "def-server.CasesClient.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [
+              "\nRetrieves an interface for interacting with cases entities."
+            ],
+            "signature": [
+              "CasesSubClient"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/client/client.ts",
+              "lineNumber": 43
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "cases",
+            "id": "def-server.CasesClient.attachments",
+            "type": "Object",
+            "tags": [],
+            "label": "attachments",
+            "description": [
+              "\nRetrieves an interface for interacting with attachments (comments) entities."
+            ],
+            "signature": [
+              "AttachmentsSubClient"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/client/client.ts",
+              "lineNumber": 50
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "cases",
+            "id": "def-server.CasesClient.userActions",
+            "type": "Object",
+            "tags": [],
+            "label": "userActions",
+            "description": [
+              "\nRetrieves an interface for interacting with the user actions associated with the plugin entities."
+            ],
+            "signature": [
+              "UserActionsSubClient"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/client/client.ts",
+              "lineNumber": 57
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "cases",
+            "id": "def-server.CasesClient.subCases",
+            "type": "Object",
+            "tags": [],
+            "label": "subCases",
+            "description": [
+              "\nRetrieves an interface for interacting with the case as a connector entities.\n\nCurrently this functionality is disabled and will throw an error if this function is called."
+            ],
+            "signature": [
+              "SubCasesClient"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/client/client.ts",
+              "lineNumber": 66
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "cases",
+            "id": "def-server.CasesClient.configure",
+            "type": "Object",
+            "tags": [],
+            "label": "configure",
+            "description": [
+              "\nRetrieves an interface for interacting with the configuration of external connectors for the plugin entities."
+            ],
+            "signature": [
+              "ConfigureSubClient"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/client/client.ts",
+              "lineNumber": 76
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "cases",
+            "id": "def-server.CasesClient.stats",
+            "type": "Object",
+            "tags": [],
+            "label": "stats",
+            "description": [
+              "\nRetrieves an interface for retrieving statistics related to the cases entities."
+            ],
+            "signature": [
+              "StatsSubClient"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/client/client.ts",
+              "lineNumber": 83
+            },
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
     "functions": [],
     "interfaces": [
       {
@@ -710,7 +899,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/server/types.ts",
-          "lineNumber": 12
+          "lineNumber": 18
         },
         "deprecated": false,
         "children": [
@@ -722,18 +911,19 @@
             "label": "getCasesClient",
             "description": [],
             "signature": [
-              "() => ",
+              "() => Promise<",
               {
                 "pluginId": "cases",
                 "scope": "server",
                 "docId": "kibCasesPluginApi",
                 "section": "def-server.CasesClient",
                 "text": "CasesClient"
-              }
+              },
+              ">"
             ],
             "source": {
               "path": "x-pack/plugins/cases/server/types.ts",
-              "lineNumber": 13
+              "lineNumber": 19
             },
             "deprecated": false,
             "returnComment": [],
@@ -744,1448 +934,62 @@
       },
       {
         "parentPluginId": "cases",
-        "id": "def-server.CasesClient",
+        "id": "def-server.PluginStartContract",
         "type": "Interface",
         "tags": [],
-        "label": "CasesClient",
+        "label": "PluginStartContract",
         "description": [
-          "\nThis represents the interface that other plugins can access."
+          "\nCases server exposed contract for interacting with cases entities."
         ],
         "source": {
-          "path": "x-pack/plugins/cases/server/client/types.ts",
-          "lineNumber": 102
+          "path": "x-pack/plugins/cases/server/plugin.ts",
+          "lineNumber": 55
         },
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "cases",
-            "id": "def-server.CasesClient.addComment",
+            "id": "def-server.PluginStartContract.getCasesClientWithRequest",
             "type": "Function",
             "tags": [],
-            "label": "addComment",
-            "description": [],
+            "label": "getCasesClientWithRequest",
+            "description": [
+              "\nReturns a client which can be used to interact with the cases backend entities.\n"
+            ],
             "signature": [
-              "(args: ",
-              "CasesClientAddComment",
-              ") => Promise<{ description: string; status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; tags: string[]; title: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseType",
-                "text": "CaseType"
-              },
-              "; connector: ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
+              "(request: ",
               {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreHttpPluginApi",
+                "section": "def-server.KibanaRequest",
+                "text": "KibanaRequest"
               },
-              "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
+              "<unknown, unknown, unknown, any>) => Promise<",
               {
                 "pluginId": "cases",
-                "scope": "common",
+                "scope": "server",
                 "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 103
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.addComment.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "CasesClientAddComment"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 103
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.create",
-            "type": "Function",
-            "tags": [],
-            "label": "create",
-            "description": [],
-            "signature": [
-              "(theCase: { type?: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseType",
-                "text": "CaseType"
-              },
-              " | undefined; } & { description: string; tags: string[]; title: string; connector: ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".none; fields: null; }); settings: { syncAlerts: boolean; }; }) => Promise<{ description: string; status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; tags: string[]; title: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseType",
-                "text": "CaseType"
-              },
-              "; connector: ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 104
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.create.$1",
-                "type": "CompoundType",
-                "tags": [],
-                "label": "theCase",
-                "description": [],
-                "signature": [
-                  "{ type?: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.CaseType",
-                    "text": "CaseType"
-                  },
-                  " | undefined; } & { description: string; tags: string[]; title: string; connector: ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".none; fields: null; }); settings: { syncAlerts: boolean; }; }"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 104
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.get",
-            "type": "Function",
-            "tags": [],
-            "label": "get",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "CasesClientGet",
-              ") => Promise<{ description: string; status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; tags: string[]; title: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseType",
-                "text": "CaseType"
-              },
-              "; connector: ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 105
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.get.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "CasesClientGet"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 105
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.getAlerts",
-            "type": "Function",
-            "tags": [],
-            "label": "getAlerts",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "CasesClientGetAlerts",
-              ") => Promise<",
-              "CasesClientGetAlertsResponse",
-              ">"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 106
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.getAlerts.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "CasesClientGetAlerts"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 106
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.getFields",
-            "type": "Function",
-            "tags": [],
-            "label": "getFields",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "ConfigureFields",
-              ") => Promise<{ defaultMappings: { action_type: \"append\" | \"overwrite\" | \"nothing\"; source: \"description\" | \"title\" | \"comments\"; target: string; }[]; fields: { id: string; name: string; required: boolean; type: \"text\" | \"textarea\"; }[]; }>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 107
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.getFields.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "ConfigureFields"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 107
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.getMappings",
-            "type": "Function",
-            "tags": [],
-            "label": "getMappings",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "MappingsClient",
-              ") => Promise<{ action_type: \"append\" | \"overwrite\" | \"nothing\"; source: \"description\" | \"title\" | \"comments\"; target: string; }[]>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 108
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.getMappings.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "MappingsClient"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 108
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.getUserActions",
-            "type": "Function",
-            "tags": [],
-            "label": "getUserActions",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "CasesClientGetUserActions",
-              ") => Promise<({ action_field: (\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; } & { action_id: string; case_id: string; comment_id: string | null; } & { sub_case_id?: string | undefined; })[]>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 109
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.getUserActions.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "CasesClientGetUserActions"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 109
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.push",
-            "type": "Function",
-            "tags": [],
-            "label": "push",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "CasesClientPush",
-              ") => Promise<{ description: string; status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; tags: string[]; title: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseType",
-                "text": "CaseType"
-              },
-              "; connector: ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 110
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.push.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "CasesClientPush"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 110
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.update",
-            "type": "Function",
-            "tags": [],
-            "label": "update",
-            "description": [],
-            "signature": [
-              "(args: { cases: ({ description?: string | undefined; status?: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              " | undefined; tags?: string[] | undefined; title?: string | undefined; type?: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseType",
-                "text": "CaseType"
-              },
-              " | undefined; connector?: ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; } & { id: string; version: string; })[]; }) => Promise<({ description: string; status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; tags: string[]; title: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseType",
-                "text": "CaseType"
-              },
-              "; connector: ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.ConnectorTypes",
-                "text": "ConnectorTypes"
-              },
-              ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CaseStatuses",
-                "text": "CaseStatuses"
-              },
-              "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".user; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".alert | ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.CommentType",
-                "text": "CommentType"
-              },
-              ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
-              {
-                "pluginId": "cases",
-                "scope": "common",
-                "docId": "kibCasesPluginApi",
-                "section": "def-common.AssociationType",
-                "text": "AssociationType"
-              },
-              "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 111
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.update.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "{ cases: ({ description?: string | undefined; status?: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.CaseStatuses",
-                    "text": "CaseStatuses"
-                  },
-                  " | undefined; tags?: string[] | undefined; title?: string | undefined; type?: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.CaseType",
-                    "text": "CaseType"
-                  },
-                  " | undefined; connector?: ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
-                  {
-                    "pluginId": "cases",
-                    "scope": "common",
-                    "docId": "kibCasesPluginApi",
-                    "section": "def-common.ConnectorTypes",
-                    "text": "ConnectorTypes"
-                  },
-                  ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; } & { id: string; version: string; })[]; }"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 111
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.updateAlertsStatus",
-            "type": "Function",
-            "tags": [],
-            "label": "updateAlertsStatus",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "CasesClientUpdateAlertsStatus",
-              ") => Promise<void>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 112
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.updateAlertsStatus.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "CasesClientUpdateAlertsStatus"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 112
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.CasesClient.getCaseIdsByAlertId",
-            "type": "Function",
-            "tags": [],
-            "label": "getCaseIdsByAlertId",
-            "description": [],
-            "signature": [
-              "(args: ",
-              "CasesClientGetCasesByAlert",
-              ") => Promise<string[]>"
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/client/types.ts",
-              "lineNumber": 113
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.CasesClient.getCaseIdsByAlertId.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "args",
-                "description": [],
-                "signature": [
-                  "CasesClientGetCasesByAlert"
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/client/types.ts",
-                  "lineNumber": 113
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "cases",
-        "id": "def-server.PluginStartContract",
-        "type": "Interface",
-        "tags": [],
-        "label": "PluginStartContract",
-        "description": [],
-        "source": {
-          "path": "x-pack/plugins/cases/server/index.ts",
-          "lineNumber": 29
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "cases",
-            "id": "def-server.PluginStartContract.getCasesClientWithRequestAndContext",
-            "type": "Function",
-            "tags": [],
-            "label": "getCasesClientWithRequestAndContext",
-            "description": [],
-            "signature": [
-              "(context: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCorePluginApi",
-                "section": "def-server.RequestHandlerContext",
-                "text": "RequestHandlerContext"
-              },
-              ", request: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreHttpPluginApi",
-                "section": "def-server.KibanaRequest",
-                "text": "KibanaRequest"
-              },
-              "<unknown, unknown, unknown, any>) => ",
-              {
-                "pluginId": "cases",
-                "scope": "server",
-                "docId": "kibCasesPluginApi",
-                "section": "def-server.CasesClient",
-                "text": "CasesClient"
-              }
-            ],
-            "source": {
-              "path": "x-pack/plugins/cases/server/index.ts",
-              "lineNumber": 30
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "cases",
-                "id": "def-server.PluginStartContract.getCasesClientWithRequestAndContext.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "context",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "core",
-                    "scope": "server",
-                    "docId": "kibCorePluginApi",
-                    "section": "def-server.RequestHandlerContext",
-                    "text": "RequestHandlerContext"
-                  }
-                ],
-                "source": {
-                  "path": "x-pack/plugins/cases/server/index.ts",
-                  "lineNumber": 31
-                },
-                "deprecated": false,
-                "isRequired": true
+                "section": "def-server.CasesClient",
+                "text": "CasesClient"
               },
+              ">"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/server/plugin.ts",
+              "lineNumber": 62
+            },
+            "deprecated": false,
+            "children": [
               {
                 "parentPluginId": "cases",
-                "id": "def-server.PluginStartContract.getCasesClientWithRequestAndContext.$2",
+                "id": "def-server.PluginStartContract.getCasesClientWithRequest.$1",
                 "type": "Object",
                 "tags": [],
                 "label": "request",
-                "description": [],
+                "description": [
+                  "a KibanaRequest"
+                ],
                 "signature": [
                   {
                     "pluginId": "core",
@@ -2197,14 +1001,16 @@
                   "<unknown, unknown, unknown, any>"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/cases/server/index.ts",
-                  "lineNumber": 32
+                  "path": "x-pack/plugins/cases/server/plugin.ts",
+                  "lineNumber": 62
                 },
                 "deprecated": false,
                 "isRequired": true
               }
             ],
-            "returnComment": []
+            "returnComment": [
+              "a {@link CasesClient}"
+            ]
           }
         ],
         "initialIsOpen": false
@@ -2339,7 +1145,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/runtime_types.ts",
-              "lineNumber": 71
+              "lineNumber": 72
             },
             "deprecated": false,
             "isRequired": true
@@ -2402,7 +1208,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 36
+          "lineNumber": 37
         },
         "deprecated": false,
         "children": [
@@ -2418,7 +1224,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 36
+              "lineNumber": 37
             },
             "deprecated": false,
             "isRequired": true
@@ -2435,7 +1241,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 36
+              "lineNumber": 37
             },
             "deprecated": false,
             "isRequired": true
@@ -2456,7 +1262,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 32
+          "lineNumber": 33
         },
         "deprecated": false,
         "children": [
@@ -2472,7 +1278,44 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 32
+              "lineNumber": 33
+            },
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.getCaseConfigurationDetailsUrl",
+        "type": "Function",
+        "tags": [],
+        "label": "getCaseConfigurationDetailsUrl",
+        "description": [],
+        "signature": [
+          "(configureID: string) => string"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/helpers.ts",
+          "lineNumber": 53
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "cases",
+            "id": "def-common.getCaseConfigurationDetailsUrl.$1",
+            "type": "string",
+            "tags": [],
+            "label": "configureID",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "source": {
+              "path": "x-pack/plugins/cases/common/api/helpers.ts",
+              "lineNumber": 53
             },
             "deprecated": false,
             "isRequired": true
@@ -2493,7 +1336,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 20
+          "lineNumber": 21
         },
         "deprecated": false,
         "children": [
@@ -2509,7 +1352,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 20
+              "lineNumber": 21
             },
             "deprecated": false,
             "isRequired": true
@@ -2530,7 +1373,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 48
+          "lineNumber": 49
         },
         "deprecated": false,
         "children": [
@@ -2546,7 +1389,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 48
+              "lineNumber": 49
             },
             "deprecated": false,
             "isRequired": true
@@ -2563,7 +1406,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 48
+              "lineNumber": 49
             },
             "deprecated": false,
             "isRequired": true
@@ -2584,7 +1427,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 52
+          "lineNumber": 57
         },
         "deprecated": false,
         "children": [
@@ -2600,7 +1443,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 52
+              "lineNumber": 57
             },
             "deprecated": false,
             "isRequired": true
@@ -2621,7 +1464,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 40
+          "lineNumber": 41
         },
         "deprecated": false,
         "children": [
@@ -2637,7 +1480,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 40
+              "lineNumber": 41
             },
             "deprecated": false,
             "isRequired": true
@@ -2658,7 +1501,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 28
+          "lineNumber": 29
         },
         "deprecated": false,
         "children": [
@@ -2674,7 +1517,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 28
+              "lineNumber": 29
             },
             "deprecated": false,
             "isRequired": true
@@ -2691,7 +1534,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 28
+              "lineNumber": 29
             },
             "deprecated": false,
             "isRequired": true
@@ -2712,7 +1555,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 24
+          "lineNumber": 25
         },
         "deprecated": false,
         "children": [
@@ -2728,7 +1571,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 24
+              "lineNumber": 25
             },
             "deprecated": false,
             "isRequired": true
@@ -2749,7 +1592,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/helpers.ts",
-          "lineNumber": 44
+          "lineNumber": 45
         },
         "deprecated": false,
         "children": [
@@ -2765,7 +1608,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 44
+              "lineNumber": 45
             },
             "deprecated": false,
             "isRequired": true
@@ -2782,7 +1625,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/api/helpers.ts",
-              "lineNumber": 44
+              "lineNumber": 45
             },
             "deprecated": false,
             "isRequired": true
@@ -2841,7 +1684,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 144
+          "lineNumber": 145
         },
         "deprecated": false,
         "children": [
@@ -2854,7 +1697,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 145
+              "lineNumber": 146
             },
             "deprecated": false
           },
@@ -2867,7 +1710,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 146
+              "lineNumber": 147
             },
             "deprecated": false
           },
@@ -2880,7 +1723,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 147
+              "lineNumber": 148
             },
             "deprecated": false
           },
@@ -2893,7 +1736,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 148
+              "lineNumber": 149
             },
             "deprecated": false
           },
@@ -2906,7 +1749,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 149
+              "lineNumber": 150
             },
             "deprecated": false
           }
@@ -2939,7 +1782,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 112
+          "lineNumber": 113
         },
         "deprecated": false,
         "children": [
@@ -2962,7 +1805,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 113
+              "lineNumber": 114
             },
             "deprecated": false
           },
@@ -2975,7 +1818,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 114
+              "lineNumber": 115
             },
             "deprecated": false
           },
@@ -2988,7 +1831,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 115
+              "lineNumber": 116
             },
             "deprecated": false
           },
@@ -3001,7 +1844,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 116
+              "lineNumber": 117
             },
             "deprecated": false
           }
@@ -3017,7 +1860,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 135
+          "lineNumber": 136
         },
         "deprecated": false,
         "children": [
@@ -3033,7 +1876,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 136
+              "lineNumber": 137
             },
             "deprecated": false
           }
@@ -3049,7 +1892,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 139
+          "lineNumber": 140
         },
         "deprecated": false,
         "children": [
@@ -3062,7 +1905,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 140
+              "lineNumber": 141
             },
             "deprecated": false
           },
@@ -3075,7 +1918,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 141
+              "lineNumber": 142
             },
             "deprecated": false
           },
@@ -3088,7 +1931,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 142
+              "lineNumber": 143
             },
             "deprecated": false
           }
@@ -3114,7 +1957,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 80
+          "lineNumber": 81
         },
         "deprecated": false,
         "children": [
@@ -3170,7 +2013,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 81
+              "lineNumber": 82
             },
             "deprecated": false
           },
@@ -3183,7 +2026,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 82
+              "lineNumber": 83
             },
             "deprecated": false
           },
@@ -3206,7 +2049,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 83
+              "lineNumber": 84
             },
             "deprecated": false
           },
@@ -3229,7 +2072,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 84
+              "lineNumber": 85
             },
             "deprecated": false
           },
@@ -3245,7 +2088,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 85
+              "lineNumber": 86
             },
             "deprecated": false
           },
@@ -3261,7 +2104,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 86
+              "lineNumber": 87
             },
             "deprecated": false
           },
@@ -3277,7 +2120,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 87
+              "lineNumber": 88
             },
             "deprecated": false
           },
@@ -3299,7 +2142,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 88
+              "lineNumber": 89
             },
             "deprecated": false
           }
@@ -3431,7 +2274,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 106
+          "lineNumber": 107
         },
         "deprecated": false,
         "children": [
@@ -3447,7 +2290,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 107
+              "lineNumber": 108
             },
             "deprecated": false
           },
@@ -3463,7 +2306,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 108
+              "lineNumber": 109
             },
             "deprecated": false
           },
@@ -3479,7 +2322,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 109
+              "lineNumber": 110
             },
             "deprecated": false
           }
@@ -3520,7 +2363,7 @@
             "label": "actionField",
             "description": [],
             "signature": [
-              "(\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"connector\" | \"pushed\" | \"sub_case\")[]"
+              "(\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]"
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
@@ -3652,7 +2495,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 152
+          "lineNumber": 153
         },
         "deprecated": false,
         "children": [
@@ -3665,7 +2508,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 153
+              "lineNumber": 154
             },
             "deprecated": false
           },
@@ -3688,7 +2531,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 154
+              "lineNumber": 155
             },
             "deprecated": false
           },
@@ -3704,7 +2547,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 155
+              "lineNumber": 156
             },
             "deprecated": false
           }
@@ -3720,7 +2563,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 225
+          "lineNumber": 226
         },
         "deprecated": false,
         "children": [
@@ -3733,7 +2576,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 226
+              "lineNumber": 227
             },
             "deprecated": false
           },
@@ -3749,7 +2592,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 227
+              "lineNumber": 228
             },
             "deprecated": false
           },
@@ -3772,7 +2615,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 228
+              "lineNumber": 229
             },
             "deprecated": false
           }
@@ -3788,7 +2631,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 124
+          "lineNumber": 125
         },
         "deprecated": false,
         "children": [
@@ -3804,7 +2647,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 125
+              "lineNumber": 126
             },
             "deprecated": false
           },
@@ -3820,7 +2663,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 126
+              "lineNumber": 127
             },
             "deprecated": false
           },
@@ -3836,7 +2679,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 127
+              "lineNumber": 128
             },
             "deprecated": false
           }
@@ -3956,7 +2799,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 130
+          "lineNumber": 131
         },
         "deprecated": false,
         "children": [
@@ -3979,18 +2822,19 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 131
+              "lineNumber": 132
             },
             "deprecated": false
           },
           {
             "parentPluginId": "cases",
             "id": "def-common.FetchCasesProps.filterOptions",
-            "type": "Object",
+            "type": "CompoundType",
             "tags": [],
             "label": "filterOptions",
             "description": [],
             "signature": [
+              "(",
               {
                 "pluginId": "cases",
                 "scope": "common",
@@ -3998,11 +2842,11 @@
                 "section": "def-common.FilterOptions",
                 "text": "FilterOptions"
               },
-              " | undefined"
+              " & { owner: string[]; }) | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 132
+              "lineNumber": 133
             },
             "deprecated": false
           }
@@ -4018,7 +2862,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 158
+          "lineNumber": 159
         },
         "deprecated": false,
         "children": [
@@ -4031,7 +2875,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 159
+              "lineNumber": 160
             },
             "deprecated": false
           },
@@ -4047,7 +2891,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 160
+              "lineNumber": 161
             },
             "deprecated": false
           }
@@ -4063,7 +2907,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 98
+          "lineNumber": 99
         },
         "deprecated": false,
         "children": [
@@ -4076,7 +2920,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 99
+              "lineNumber": 100
             },
             "deprecated": false
           },
@@ -4099,7 +2943,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 100
+              "lineNumber": 101
             },
             "deprecated": false
           },
@@ -4115,7 +2959,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 101
+              "lineNumber": 102
             },
             "deprecated": false
           },
@@ -4131,7 +2975,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 102
+              "lineNumber": 103
             },
             "deprecated": false
           },
@@ -4147,7 +2991,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 103
+              "lineNumber": 104
             },
             "deprecated": false
           }
@@ -4163,7 +3007,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 91
+          "lineNumber": 92
         },
         "deprecated": false,
         "children": [
@@ -4176,7 +3020,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 92
+              "lineNumber": 93
             },
             "deprecated": false
           },
@@ -4189,7 +3033,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 93
+              "lineNumber": 94
             },
             "deprecated": false
           },
@@ -4211,7 +3055,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 94
+              "lineNumber": 95
             },
             "deprecated": false
           },
@@ -4227,7 +3071,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 95
+              "lineNumber": 96
             },
             "deprecated": false
           }
@@ -4243,7 +3087,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 178
+          "lineNumber": 179
         },
         "deprecated": false,
         "children": [
@@ -4259,7 +3103,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 179
+              "lineNumber": 180
             },
             "deprecated": false
           },
@@ -4275,7 +3119,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 180
+              "lineNumber": 181
             },
             "deprecated": false
           },
@@ -4291,7 +3135,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 181
+              "lineNumber": 182
             },
             "deprecated": false
           },
@@ -4307,7 +3151,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 182
+              "lineNumber": 183
             },
             "deprecated": false
           },
@@ -4323,7 +3167,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 183
+              "lineNumber": 184
             },
             "deprecated": false
           },
@@ -4339,7 +3183,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 184
+              "lineNumber": 185
             },
             "deprecated": false
           },
@@ -4355,7 +3199,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 185
+              "lineNumber": 186
             },
             "deprecated": false
           },
@@ -4371,7 +3215,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 186
+              "lineNumber": 187
             },
             "deprecated": false
           },
@@ -4387,7 +3231,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 187
+              "lineNumber": 188
             },
             "deprecated": false
           },
@@ -4403,7 +3247,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 188
+              "lineNumber": 189
             },
             "deprecated": false
           },
@@ -4419,7 +3263,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 189
+              "lineNumber": 190
             },
             "deprecated": false
           },
@@ -4435,7 +3279,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 190
+              "lineNumber": 191
             },
             "deprecated": false
           },
@@ -4451,7 +3295,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 191
+              "lineNumber": 192
             },
             "deprecated": false
           },
@@ -4467,7 +3311,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 192
+              "lineNumber": 193
             },
             "deprecated": false
           },
@@ -4483,7 +3327,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 193
+              "lineNumber": 194
             },
             "deprecated": false
           },
@@ -4499,7 +3343,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 194
+              "lineNumber": 195
             },
             "deprecated": false
           },
@@ -4515,7 +3359,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 195
+              "lineNumber": 196
             },
             "deprecated": false
           },
@@ -4531,7 +3375,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 196
+              "lineNumber": 197
             },
             "deprecated": false
           },
@@ -4547,7 +3391,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 197
+              "lineNumber": 198
             },
             "deprecated": false
           },
@@ -4563,7 +3407,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 198
+              "lineNumber": 199
             },
             "deprecated": false
           },
@@ -4579,7 +3423,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 199
+              "lineNumber": 200
             },
             "deprecated": false
           },
@@ -4595,7 +3439,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 200
+              "lineNumber": 201
             },
             "deprecated": false
           },
@@ -4611,7 +3455,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 201
+              "lineNumber": 202
             },
             "deprecated": false
           },
@@ -4627,7 +3471,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 202
+              "lineNumber": 203
             },
             "deprecated": false
           },
@@ -4643,7 +3487,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 203
+              "lineNumber": 204
             },
             "deprecated": false
           },
@@ -4659,7 +3503,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 204
+              "lineNumber": 205
             },
             "deprecated": false
           },
@@ -4675,7 +3519,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 205
+              "lineNumber": 206
             },
             "deprecated": false
           },
@@ -4691,7 +3535,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 206
+              "lineNumber": 207
             },
             "deprecated": false
           },
@@ -4707,7 +3551,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 207
+              "lineNumber": 208
             },
             "deprecated": false
           },
@@ -4723,7 +3567,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 208
+              "lineNumber": 209
             },
             "deprecated": false
           },
@@ -4739,7 +3583,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 209
+              "lineNumber": 210
             },
             "deprecated": false
           },
@@ -4755,7 +3599,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 210
+              "lineNumber": 211
             },
             "deprecated": false
           },
@@ -4771,7 +3615,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 211
+              "lineNumber": 212
             },
             "deprecated": false
           },
@@ -4787,7 +3631,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 212
+              "lineNumber": 213
             },
             "deprecated": false
           }
@@ -4803,7 +3647,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 215
+          "lineNumber": 216
         },
         "deprecated": false,
         "children": [
@@ -4826,7 +3670,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 216
+              "lineNumber": 217
             },
             "deprecated": false
           },
@@ -4842,7 +3686,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 217
+              "lineNumber": 218
             },
             "deprecated": false
           },
@@ -4858,7 +3702,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 218
+              "lineNumber": 219
             },
             "deprecated": false
           },
@@ -4874,7 +3718,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 219
+              "lineNumber": 220
             },
             "deprecated": false
           },
@@ -4890,7 +3734,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 222
+              "lineNumber": 223
             },
             "deprecated": false
           }
@@ -4916,7 +3760,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 75
+          "lineNumber": 76
         },
         "deprecated": false,
         "children": [
@@ -4938,7 +3782,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 76
+              "lineNumber": 77
             },
             "deprecated": false
           },
@@ -4951,7 +3795,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 77
+              "lineNumber": 78
             },
             "deprecated": false
           }
@@ -4967,7 +3811,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 168
+          "lineNumber": 169
         },
         "deprecated": false,
         "children": [
@@ -4983,7 +3827,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 169
+              "lineNumber": 170
             },
             "deprecated": false
           },
@@ -5039,7 +3883,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 170
+              "lineNumber": 171
             },
             "deprecated": false
           },
@@ -5055,7 +3899,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 171
+              "lineNumber": 172
             },
             "deprecated": false
           },
@@ -5079,7 +3923,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 172
+              "lineNumber": 173
             },
             "deprecated": false
           },
@@ -5101,7 +3945,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 173
+              "lineNumber": 174
             },
             "deprecated": false
           },
@@ -5117,7 +3961,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 174
+              "lineNumber": 175
             },
             "deprecated": false
           },
@@ -5133,7 +3977,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/cases/common/ui/types.ts",
-              "lineNumber": 175
+              "lineNumber": 176
             },
             "deprecated": false
           }
@@ -5153,7 +3997,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 33
+          "lineNumber": 34
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5195,7 +4039,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 51
+          "lineNumber": 53
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5223,7 +4067,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 119
+          "lineNumber": 120
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5242,7 +4086,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 41
+          "lineNumber": 60
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5261,7 +4105,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 40
+          "lineNumber": 59
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5345,7 +4189,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -5353,7 +4197,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -5369,7 +4213,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -5377,11 +4221,45 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[]"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[]"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 135
+          "lineNumber": 149
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.AllReportersFindRequest",
+        "type": "Type",
+        "tags": [],
+        "label": "AllReportersFindRequest",
+        "description": [],
+        "signature": [
+          "{ owner?: string | string[] | undefined; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 313
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.AllTagsFindRequest",
+        "type": "Type",
+        "tags": [],
+        "label": "AllTagsFindRequest",
+        "description": [],
+        "signature": [
+          "{ owner?: string | string[] | undefined; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 312
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5427,7 +4305,40 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.AssociationType",
+            "text": "AssociationType"
+          },
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
+          "lineNumber": 143
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.AttributesTypeUser",
+        "type": "Type",
+        "tags": [],
+        "label": "AttributesTypeUser",
+        "description": [],
+        "signature": [
+          "{ comment: string; type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -5435,39 +4346,56 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 130
+          "lineNumber": 144
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CASE_ALERTS_URL",
+        "type": "string",
+        "tags": [],
+        "label": "CASE_ALERTS_URL",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 53
         },
         "deprecated": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.CASE_ALERTS_URL",
+        "id": "def-common.CASE_COMMENT_DETAILS_URL",
         "type": "string",
         "tags": [],
-        "label": "CASE_ALERTS_URL",
+        "label": "CASE_COMMENT_DETAILS_URL",
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 34
+          "lineNumber": 46
         },
         "deprecated": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.CASE_COMMENT_DETAILS_URL",
+        "id": "def-common.CASE_COMMENT_SAVED_OBJECT",
         "type": "string",
         "tags": [],
-        "label": "CASE_COMMENT_DETAILS_URL",
+        "label": "CASE_COMMENT_SAVED_OBJECT",
         "description": [],
+        "signature": [
+          "\"cases-comments\""
+        ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 27
+          "lineNumber": 16
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5481,7 +4409,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 26
+          "lineNumber": 45
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5495,7 +4423,38 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 19
+          "lineNumber": 38
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CASE_CONFIGURE_DETAILS_URL",
+        "type": "string",
+        "tags": [],
+        "label": "CASE_CONFIGURE_DETAILS_URL",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 37
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CASE_CONFIGURE_SAVED_OBJECT",
+        "type": "string",
+        "tags": [],
+        "label": "CASE_CONFIGURE_SAVED_OBJECT",
+        "description": [],
+        "signature": [
+          "\"cases-configure\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 17
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5509,7 +4468,24 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 18
+          "lineNumber": 36
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT",
+        "type": "string",
+        "tags": [],
+        "label": "CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT",
+        "description": [],
+        "signature": [
+          "\"cases-connector-mappings\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 13
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5523,7 +4499,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 17
+          "lineNumber": 35
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5537,7 +4513,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 28
+          "lineNumber": 47
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5551,7 +4527,24 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 29
+          "lineNumber": 48
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CASE_SAVED_OBJECT",
+        "type": "string",
+        "tags": [],
+        "label": "CASE_SAVED_OBJECT",
+        "description": [],
+        "signature": [
+          "\"cases\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 12
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5565,7 +4558,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 30
+          "lineNumber": 49
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5579,7 +4572,24 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 31
+          "lineNumber": 50
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CASE_USER_ACTION_SAVED_OBJECT",
+        "type": "string",
+        "tags": [],
+        "label": "CASE_USER_ACTION_SAVED_OBJECT",
+        "description": [],
+        "signature": [
+          "\"cases-user-actions\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 15
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5593,7 +4603,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 32
+          "lineNumber": 51
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5662,11 +4672,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
+          ".none; fields: null; }); settings: { syncAlerts: boolean; }; owner: string; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 175
+          "lineNumber": 288
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5757,7 +4767,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 189
+          "lineNumber": 303
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5826,11 +4836,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; } & { id: string; version: string; }"
+          ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; owner?: string | undefined; } & { id: string; version: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 187
+          "lineNumber": 301
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5891,11 +4901,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); settings: { syncAlerts: boolean; }; }"
+          ".none; fields: null; }); settings: { syncAlerts: boolean; }; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 182
+          "lineNumber": 295
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -5964,7 +4974,7 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
+          ".none; fields: null; }); settings: { syncAlerts: boolean; }; owner: string; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -5972,7 +4982,7 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
+          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; owner: string; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -5980,7 +4990,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -5988,7 +4998,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6004,7 +5014,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6012,7 +5022,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6020,7 +5030,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6028,7 +5038,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6044,7 +5054,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6052,11 +5062,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 183
+          "lineNumber": 296
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6075,7 +5085,24 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 16
+          "lineNumber": 34
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CasesByAlertIDRequest",
+        "type": "Type",
+        "tags": [],
+        "label": "CasesByAlertIDRequest",
+        "description": [],
+        "signature": [
+          "{ owner?: string | string[] | undefined; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 299
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6138,11 +5165,68 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); settings: { syncAlerts: boolean; }; }"
+          ".none; fields: null; }); settings: { syncAlerts: boolean; }; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 181
+          "lineNumber": 294
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CasesConfigurationsResponse",
+        "type": "Type",
+        "tags": [],
+        "label": "CasesConfigurationsResponse",
+        "description": [],
+        "signature": [
+          "({ connector: ({ id: string; name: string; } & { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
+          },
+          ".jira; fields: { issueType: string | null; priority: string | null; parent: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
+          },
+          ".resilient; fields: { incidentTypes: string[] | null; severityCode: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
+          },
+          ".serviceNowITSM; fields: { impact: string | null; severity: string | null; urgency: string | null; category: string | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
+          },
+          ".serviceNowSIR; fields: { category: string | null; destIp: boolean | null; malwareHash: boolean | null; malwareUrl: boolean | null; priority: string | null; sourceIp: boolean | null; subcategory: string | null; } | null; }) | ({ id: string; name: string; } & { type: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
+          },
+          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { owner: string; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { mappings: { action_type: \"append\" | \"overwrite\" | \"nothing\"; source: \"description\" | \"title\" | \"comments\"; target: string; }[]; owner: string; } & { id: string; version: string; error: string | null; owner: string; })[]"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
+          "lineNumber": 84
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6195,11 +5279,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; }"
+          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 47
+          "lineNumber": 79
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6252,11 +5336,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
+          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { owner: string; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 50
+          "lineNumber": 82
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6313,7 +5397,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 49
+          "lineNumber": 81
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6366,11 +5450,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; }"
+          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 48
+          "lineNumber": 80
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6423,11 +5507,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { mappings: { action_type: \"append\" | \"overwrite\" | \"nothing\"; source: \"description\" | \"title\" | \"comments\"; target: string; }[]; } & { version: string; error: string | null; }"
+          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { owner: string; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { mappings: { action_type: \"append\" | \"overwrite\" | \"nothing\"; source: \"description\" | \"title\" | \"comments\"; target: string; }[]; owner: string; } & { id: string; version: string; error: string | null; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 51
+          "lineNumber": 83
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6444,7 +5528,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 190
+          "lineNumber": 304
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6473,11 +5557,11 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          " | undefined; reporters?: string | string[] | undefined; defaultSearchOperator?: \"AND\" | \"OR\" | undefined; fields?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; search?: string | undefined; searchFields?: string[] | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; }"
+          " | undefined; reporters?: string | string[] | undefined; defaultSearchOperator?: \"AND\" | \"OR\" | undefined; fields?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; search?: string | undefined; searchFields?: string | string[] | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; owner?: string | string[] | undefined; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 185
+          "lineNumber": 298
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6546,7 +5630,7 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
+          ".none; fields: null; }); settings: { syncAlerts: boolean; }; owner: string; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6554,7 +5638,7 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
+          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; owner: string; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6562,7 +5646,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6570,7 +5654,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6586,7 +5670,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6594,7 +5678,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6602,7 +5686,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6610,7 +5694,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6626,7 +5710,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6634,11 +5718,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]; page: number; per_page: number; total: number; } & { count_open_cases: number; count_in_progress_cases: number; count_closed_cases: number; }"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]; page: number; per_page: number; total: number; } & { count_open_cases: number; count_in_progress_cases: number; count_closed_cases: number; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 186
+          "lineNumber": 300
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6707,11 +5791,11 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; } & { id: string; version: string; })[]; }"
+          ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; owner?: string | undefined; } & { id: string; version: string; })[]; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 188
+          "lineNumber": 302
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6780,7 +5864,7 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
+          ".none; fields: null; }); settings: { syncAlerts: boolean; }; owner: string; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { subCaseIds?: string[] | undefined; subCases?: ({ status: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6788,7 +5872,7 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
+          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; owner: string; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6796,7 +5880,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6804,7 +5888,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6820,7 +5904,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6828,7 +5912,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[] | undefined; comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6836,7 +5920,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6844,7 +5928,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6860,7 +5944,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -6868,11 +5952,28 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 184
+          "lineNumber": 297
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CasesStatusRequest",
+        "type": "Type",
+        "tags": [],
+        "label": "CasesStatusRequest",
+        "description": [],
+        "signature": [
+          "{ owner?: string | string[] | undefined; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/status.ts",
+          "lineNumber": 39
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6889,7 +5990,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/status.ts",
-          "lineNumber": 30
+          "lineNumber": 38
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6969,11 +6070,28 @@
         "label": "CaseUserActionAttributes",
         "description": [],
         "signature": [
-          "{ action_field: (\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; }"
+          "{ action_field: (\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
-          "lineNumber": 59
+          "lineNumber": 62
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CaseUserActionResponse",
+        "type": "Type",
+        "tags": [],
+        "label": "CaseUserActionResponse",
+        "description": [],
+        "signature": [
+          "{ action_field: (\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; } & { action_id: string; case_id: string; comment_id: string | null; } & { sub_case_id?: string | undefined; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
+          "lineNumber": 64
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -6986,11 +6104,11 @@
         "label": "CaseUserActionsResponse",
         "description": [],
         "signature": [
-          "({ action_field: (\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; } & { action_id: string; case_id: string; comment_id: string | null; } & { sub_case_id?: string | undefined; })[]"
+          "({ action_field: (\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]; action: \"add\" | \"delete\" | \"create\" | \"update\" | \"push-to-service\"; action_at: string; action_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; new_value: string | null; old_value: string | null; owner: string; } & { action_id: string; case_id: string; comment_id: string | null; } & { sub_case_id?: string | undefined; })[]"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
-          "lineNumber": 60
+          "lineNumber": 63
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7007,7 +6125,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 46
+          "lineNumber": 78
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7028,7 +6146,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7068,7 +6186,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7117,7 +6235,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7125,7 +6243,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7141,7 +6259,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7149,11 +6267,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; })"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; })"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 131
+          "lineNumber": 145
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7174,7 +6292,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          " | undefined; created_at?: string | undefined; created_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | undefined; pushed_at?: string | null | undefined; pushed_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; updated_at?: string | null | undefined; updated_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; } | ({ type?: ",
+          " | undefined; created_at?: string | undefined; created_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | undefined; owner?: string | undefined; pushed_at?: string | null | undefined; pushed_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; updated_at?: string | null | undefined; updated_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; } | ({ type?: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7190,7 +6308,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert | undefined; alertId?: string | string[] | undefined; index?: string | string[] | undefined; rule?: { id: string | null; name: string | null; } | undefined; } & { associationType?: ",
+          ".generatedAlert | undefined; alertId?: string | string[] | undefined; index?: string | string[] | undefined; rule?: { id: string | null; name: string | null; } | undefined; owner?: string | undefined; } & { associationType?: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7198,11 +6316,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          " | undefined; created_at?: string | undefined; created_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | undefined; pushed_at?: string | null | undefined; pushed_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; updated_at?: string | null | undefined; updated_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; })"
+          " | undefined; created_at?: string | undefined; created_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | undefined; owner?: string | undefined; pushed_at?: string | null | undefined; pushed_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; updated_at?: string | null | undefined; updated_by?: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null | undefined; })"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 138
+          "lineNumber": 152
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7223,7 +6341,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { id: string; version: string; }) | ({ type: ",
+          ".user; owner: string; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7239,11 +6357,11 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { id: string; version: string; })"
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { id: string; version: string; })"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 137
+          "lineNumber": 151
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7264,7 +6382,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } | { type: ",
+          ".user; owner: string; } | { type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7280,11 +6398,11 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; }"
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 132
+          "lineNumber": 146
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7313,11 +6431,11 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; }"
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 140
+          "lineNumber": 154
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7338,11 +6456,11 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; }"
+          ".user; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 139
+          "lineNumber": 153
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7363,7 +6481,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7371,7 +6489,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7387,7 +6505,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7395,11 +6513,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; })"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; })"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 133
+          "lineNumber": 147
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7428,7 +6546,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7436,11 +6554,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 134
+          "lineNumber": 148
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7461,7 +6579,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7469,7 +6587,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7485,7 +6603,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7493,11 +6611,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[]; page: number; per_page: number; total: number; }"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[]; page: number; per_page: number; total: number; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 136
+          "lineNumber": 150
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7514,7 +6632,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/connectors/mappings.ts",
-          "lineNumber": 48
+          "lineNumber": 49
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7569,11 +6687,11 @@
         "label": "ConnectorMappings",
         "description": [],
         "signature": [
-          "{ mappings: { action_type: \"append\" | \"overwrite\" | \"nothing\"; source: \"description\" | \"title\" | \"comments\"; target: string; }[]; }"
+          "{ mappings: { action_type: \"append\" | \"overwrite\" | \"nothing\"; source: \"description\" | \"title\" | \"comments\"; target: string; }[]; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/connectors/mappings.ts",
-          "lineNumber": 37
+          "lineNumber": 38
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7590,7 +6708,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/connectors/mappings.ts",
-          "lineNumber": 36
+          "lineNumber": 37
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7775,7 +6893,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 63
+          "lineNumber": 90
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7844,7 +6962,7 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); settings: { syncAlerts: boolean; }; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }, \"type\" | \"status\" | \"description\" | \"title\" | \"updated_at\" | \"tags\" | \"settings\" | \"created_at\" | \"created_by\" | \"updated_by\" | \"closed_at\" | \"closed_by\" | \"external_service\"> & { connector: ",
+          ".none; fields: null; }); settings: { syncAlerts: boolean; }; owner: string; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; external_service: ({ connector_id: string; connector_name: string; external_id: string; external_title: string; external_url: string; } & { pushed_at: string; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; }) | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }, \"type\" | \"status\" | \"description\" | \"title\" | \"updated_at\" | \"tags\" | \"settings\" | \"owner\" | \"created_at\" | \"created_by\" | \"updated_by\" | \"closed_at\" | \"closed_by\" | \"external_service\"> & { connector: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7856,7 +6974,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 193
+          "lineNumber": 307
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -7948,7 +7066,7 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; } & { id: string; version: string; }, \"type\" | \"status\" | \"description\" | \"title\" | \"id\" | \"version\" | \"tags\" | \"settings\"> & { connector?: ",
+          ".none; fields: null; }) | undefined; settings?: { syncAlerts: boolean; } | undefined; owner?: string | undefined; } & { id: string; version: string; }, \"type\" | \"status\" | \"description\" | \"title\" | \"id\" | \"version\" | \"tags\" | \"settings\" | \"owner\"> & { connector?: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -7960,7 +7078,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 194
+          "lineNumber": 308
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8013,7 +7131,7 @@
             "section": "def-common.ConnectorTypes",
             "text": "ConnectorTypes"
           },
-          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }, \"updated_at\" | \"created_at\" | \"created_by\" | \"updated_by\" | \"closure_type\"> & { connector: ",
+          ".none; fields: null; }); closure_type: \"close-by-user\" | \"close-by-pushing\"; } & { owner: string; } & { created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }, \"updated_at\" | \"owner\" | \"created_at\" | \"created_by\" | \"updated_by\" | \"closure_type\"> & { connector: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8024,59 +7142,93 @@
           "; }"
         ],
         "source": {
-          "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 53
+          "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
+          "lineNumber": 86
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.ESConnectorFields",
+        "type": "Type",
+        "tags": [],
+        "label": "ESConnectorFields",
+        "description": [],
+        "signature": [
+          "{ key: string; value: unknown; }[]"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/connectors/index.ts",
+          "lineNumber": 94
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.ExternalServiceResponse",
+        "type": "Type",
+        "tags": [],
+        "label": "ExternalServiceResponse",
+        "description": [],
+        "signature": [
+          "{ title: string; id: string; pushedDate: string; url: string; } & { comments?: ({ commentId: string; pushedDate: string; } & { externalCommentId?: string | undefined; })[] | undefined; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 305
         },
         "deprecated": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.ESConnectorFields",
+        "id": "def-common.FindQueryParams",
         "type": "Type",
         "tags": [],
-        "label": "ESConnectorFields",
+        "label": "FindQueryParams",
         "description": [],
         "signature": [
-          "{ key: string; value: unknown; }[]"
+          "{ subCaseId?: string | undefined; defaultSearchOperator?: \"AND\" | \"OR\" | undefined; hasReferenceOperator?: \"AND\" | \"OR\" | undefined; hasReference?: { id: string; type: string; } | { id: string; type: string; }[] | undefined; fields?: string[] | undefined; filter?: string | undefined; page?: number | undefined; perPage?: number | undefined; search?: string | undefined; searchFields?: string[] | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; }"
         ],
         "source": {
-          "path": "x-pack/plugins/cases/common/api/connectors/index.ts",
-          "lineNumber": 94
+          "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
+          "lineNumber": 142
         },
         "deprecated": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.ExternalServiceResponse",
+        "id": "def-common.GetCaseIdsByAlertIdAggs",
         "type": "Type",
         "tags": [],
-        "label": "ExternalServiceResponse",
+        "label": "GetCaseIdsByAlertIdAggs",
         "description": [],
         "signature": [
-          "{ title: string; id: string; pushedDate: string; url: string; } & { comments?: ({ commentId: string; pushedDate: string; } & { externalCommentId?: string | undefined; })[] | undefined; }"
+          "{ references: { doc_count: number; caseIds: { buckets: { key: string; }[]; }; }; }"
         ],
         "source": {
-          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 191
+          "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
+          "lineNumber": 155
         },
         "deprecated": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.GetCaseIdsByAlertIdAggs",
+        "id": "def-common.GetConfigureFindRequest",
         "type": "Type",
         "tags": [],
-        "label": "GetCaseIdsByAlertIdAggs",
+        "label": "GetConfigureFindRequest",
         "description": [],
         "signature": [
-          "{ references: { doc_count: number; caseIds: { buckets: { key: string; }[]; }; }; }"
+          "{ owner?: string | string[] | undefined; }"
         ],
         "source": {
-          "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 141
+          "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
+          "lineNumber": 90
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8093,7 +7245,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/connectors/mappings.ts",
-          "lineNumber": 55
+          "lineNumber": 56
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8110,7 +7262,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 44
+          "lineNumber": 63
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8146,7 +7298,41 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 57
+          "lineNumber": 76
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.MAX_CONCURRENT_SEARCHES",
+        "type": "number",
+        "tags": [],
+        "label": "MAX_CONCURRENT_SEARCHES",
+        "description": [],
+        "signature": [
+          "10"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 97
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.MAX_DOCS_PER_PAGE",
+        "type": "number",
+        "tags": [],
+        "label": "MAX_DOCS_PER_PAGE",
+        "description": [],
+        "signature": [
+          "10000"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 96
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8163,7 +7349,26 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 58
+          "lineNumber": 77
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.OWNER_FIELD",
+        "type": "string",
+        "tags": [],
+        "label": "OWNER_FIELD",
+        "description": [
+          "\nThis field is used for authorization of the entities within the cases plugin. Each entity within Cases will have the owner field\nset to a string that represents the plugin that \"owns\" (i.e. the plugin that originally issued the POST request to\ncreate the entity) the entity.\n\nThe Authorization class constructs a string composed of the operation being performed (createCase, getComment, etc),\nand the owner of the entity being acted upon or created. This string is then given to the Security plugin which\nchecks to see if the user making the request has that particular string stored within it's privileges. If it does,\nthen the operation succeeds, otherwise the operation fails.\n\nAPIs that create/update an entity require that the owner field be passed in the body of the request.\nAPIs that search for entities typically require that the owner be passed as a query parameter.\nAPIs that specify an ID of an entity directly generally don't need to specify the owner field.\n\nFor APIs that create/update an entity, the RBAC implementation checks to see if the user making the request has the\ncorrect privileges for performing that action (a create/update) for the specified owner.\nThis check is done through the Security plugin's API.\n\nFor APIs that search for entities, the RBAC implementation creates a filter for the saved objects query that limits\nthe search to only owners that the user has access to. We also check that the objects returned by the saved objects\nAPI have the limited owner scope. If we find one that the user does not have permissions for, we throw a 403 error.\nThe owner field that is passed in as a query parameter can be used to further limit the results. If a user attempts\nto pass an owner that they do not have access to, the owner is ignored.\n\nFor APIs that retrieve/delete entities directly using their ID, the RBAC implementation requests the object first,\nand then checks to see if the user making the request has access to that operation and owner. If the user does, the\noperation continues, otherwise we throw a 403."
+        ],
+        "signature": [
+          "\"owner\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/constants.ts",
+          "lineNumber": 36
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8180,7 +7385,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 45
+          "lineNumber": 64
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8202,6 +7407,25 @@
         "deprecated": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.SAVED_OBJECT_TYPES",
+        "type": "Array",
+        "tags": [],
+        "label": "SAVED_OBJECT_TYPES",
+        "description": [
+          "\nIf more values are added here please also add them here: x-pack/test/case_api_integration/common/fixtures/plugins"
+        ],
+        "signature": [
+          "string[]"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 22
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "cases",
         "id": "def-common.SavedObjectFindOptions",
@@ -8214,7 +7438,26 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/saved_object.ts",
-          "lineNumber": 39
+          "lineNumber": 72
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.SECURITY_SOLUTION_OWNER",
+        "type": "string",
+        "tags": [],
+        "label": "SECURITY_SOLUTION_OWNER",
+        "description": [
+          "\nThis must be the same value that the security solution plugin uses to define the case kind when it registers the\nfeature for the 7.13 migration only.\n\nThis variable is being also used by test files and mocks."
+        ],
+        "signature": [
+          "\"securitySolution\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 85
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8231,7 +7474,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 42
+          "lineNumber": 61
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8248,7 +7491,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 43
+          "lineNumber": 62
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8330,7 +7573,24 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 23
+          "lineNumber": 42
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.SUB_CASE_SAVED_OBJECT",
+        "type": "string",
+        "tags": [],
+        "label": "SUB_CASE_SAVED_OBJECT",
+        "description": [],
+        "signature": [
+          "\"cases-sub-case\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/constants.ts",
+          "lineNumber": 14
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8344,7 +7604,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 24
+          "lineNumber": 43
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8358,7 +7618,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 21
+          "lineNumber": 40
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8372,7 +7632,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 22
+          "lineNumber": 41
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8393,11 +7653,11 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; }"
+          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; owner: string; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 75
+          "lineNumber": 107
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8422,7 +7682,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 79
+          "lineNumber": 111
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8443,7 +7703,7 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
+          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; owner: string; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8451,7 +7711,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8459,7 +7719,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8475,7 +7735,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8483,11 +7743,36 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 76
+          "lineNumber": 108
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.SubCasesFindRequest",
+        "type": "Type",
+        "tags": [],
+        "label": "SubCasesFindRequest",
+        "description": [],
+        "signature": [
+          "{ status?: ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CaseStatuses",
+            "text": "CaseStatuses"
+          },
+          " | undefined; defaultSearchOperator?: \"AND\" | \"OR\" | undefined; fields?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; search?: string | undefined; searchFields?: string[] | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | undefined; owner?: string | undefined; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
+          "lineNumber": 113
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8508,7 +7793,7 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
+          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; owner: string; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8516,7 +7801,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8524,7 +7809,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8540,7 +7825,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8548,11 +7833,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]; page: number; per_page: number; total: number; } & { count_open_cases: number; count_in_progress_cases: number; count_closed_cases: number; }"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]; page: number; per_page: number; total: number; } & { count_open_cases: number; count_in_progress_cases: number; count_closed_cases: number; }"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 78
+          "lineNumber": 110
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8577,7 +7862,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 80
+          "lineNumber": 112
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8598,7 +7883,7 @@
             "section": "def-common.CaseStatuses",
             "text": "CaseStatuses"
           },
-          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
+          "; } & { closed_at: string | null; closed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; owner: string; } & { id: string; totalComment: number; totalAlerts: number; version: string; } & { comments?: (({ comment: string; type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8606,7 +7891,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user; } & { associationType: ",
+          ".user; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8614,7 +7899,7 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }) | ({ type: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8630,7 +7915,7 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; } & { associationType: ",
+          ".generatedAlert; alertId: string | string[]; index: string | string[]; rule: { id: string | null; name: string | null; }; owner: string; } & { associationType: ",
           {
             "pluginId": "cases",
             "scope": "common",
@@ -8638,11 +7923,11 @@
             "section": "def-common.AssociationType",
             "text": "AssociationType"
           },
-          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]"
+          "; created_at: string; created_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; }; owner: string; pushed_at: string | null; pushed_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; updated_at: string | null; updated_by: { email: string | null | undefined; full_name: string | null | undefined; username: string | null | undefined; } | null; } & { id: string; version: string; }))[] | undefined; })[]"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 77
+          "lineNumber": 109
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8659,7 +7944,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/constants.ts",
-          "lineNumber": 47
+          "lineNumber": 66
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8693,7 +7978,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/ui/types.ts",
-          "lineNumber": 163
+          "lineNumber": 164
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8727,7 +8012,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
-          "lineNumber": 62
+          "lineNumber": 66
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8740,11 +8025,11 @@
         "label": "UserActionField",
         "description": [],
         "signature": [
-          "(\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"connector\" | \"pushed\" | \"sub_case\")[]"
+          "(\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\")[]"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
-          "lineNumber": 63
+          "lineNumber": 67
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8757,11 +8042,11 @@
         "label": "UserActionFieldType",
         "description": [],
         "signature": [
-          "\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"connector\" | \"pushed\" | \"sub_case\""
+          "\"status\" | \"description\" | \"title\" | \"comment\" | \"tags\" | \"settings\" | \"owner\" | \"connector\" | \"pushed\" | \"sub_case\""
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
-          "lineNumber": 64
+          "lineNumber": 68
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8822,30 +8107,388 @@
           "<{ id: ",
           "UnionC",
           "<[",
-          "StringC",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; name: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
+          "lineNumber": 70
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.AllCommentsResponseRt",
+        "type": "Object",
+        "tags": [],
+        "label": "AllCommentsResponseRt",
+        "description": [],
+        "signature": [
+          "ArrayC",
+          "<",
+          "IntersectionC",
+          "<[",
+          "UnionC",
+          "<[",
+          "IntersectionC",
+          "<[",
+          "TypeC",
+          "<{ comment: ",
+          "StringC",
+          "; type: ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
+          "TypeC",
+          "<{ associationType: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.AssociationType",
+            "text": "AssociationType"
+          },
+          ".case>, ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.AssociationType",
+            "text": "AssociationType"
+          },
+          ".subCase>]>; created_at: ",
+          "StringC",
+          "; created_by: ",
+          "TypeC",
+          "<{ email: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; full_name: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; username: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; pushed_by: ",
+          "UnionC",
+          "<[",
+          "TypeC",
+          "<{ email: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; full_name: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; username: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; }>, ",
+          "NullC",
+          "]>; updated_at: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; updated_by: ",
+          "UnionC",
+          "<[",
+          "TypeC",
+          "<{ email: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; full_name: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; username: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; }>, ",
+          "NullC",
+          "]>; }>]>, ",
+          "IntersectionC",
+          "<[",
+          "TypeC",
+          "<{ type: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".generatedAlert>, ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CommentType",
+            "text": "CommentType"
+          },
+          ".alert>]>; alertId: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; index: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; rule: ",
+          "TypeC",
+          "<{ id: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; name: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
+          "TypeC",
+          "<{ associationType: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.AssociationType",
+            "text": "AssociationType"
+          },
+          ".case>, ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.AssociationType",
+            "text": "AssociationType"
+          },
+          ".subCase>]>; created_at: ",
+          "StringC",
+          "; created_by: ",
+          "TypeC",
+          "<{ email: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; full_name: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; username: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; pushed_by: ",
+          "UnionC",
+          "<[",
+          "TypeC",
+          "<{ email: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; full_name: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; username: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; }>, ",
+          "NullC",
+          "]>; updated_at: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; updated_by: ",
+          "UnionC",
+          "<[",
+          "TypeC",
+          "<{ email: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; full_name: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
+          ", ",
+          "NullC",
+          ", ",
+          "StringC",
+          "]>; username: ",
+          "UnionC",
+          "<[",
+          "UndefinedC",
           ", ",
           "NullC",
-          "]>; name: ",
-          "UnionC",
-          "<[",
-          "StringC",
           ", ",
+          "StringC",
+          "]>; }>, ",
           "NullC",
-          "]>; }>; }>"
+          "]>; }>]>]>, ",
+          "TypeC",
+          "<{ id: ",
+          "StringC",
+          "; version: ",
+          "StringC",
+          "; }>]>>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 67
+          "lineNumber": 132
         },
         "deprecated": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.AllCommentsResponseRt",
+        "id": "def-common.AllCommentsResponseRT",
         "type": "Object",
         "tags": [],
-        "label": "AllCommentsResponseRt",
+        "label": "AllCommentsResponseRT",
         "description": [],
         "signature": [
           "ArrayC",
@@ -8869,7 +8512,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -8921,7 +8566,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -9049,7 +8696,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -9101,7 +8750,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -9183,135 +8834,351 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 128
+          "lineNumber": 103
         },
         "deprecated": false,
         "initialIsOpen": false
       },
       {
         "parentPluginId": "cases",
-        "id": "def-common.AllCommentsResponseRT",
+        "id": "def-common.AllReportersFindRequestRt",
         "type": "Object",
         "tags": [],
-        "label": "AllCommentsResponseRT",
+        "label": "AllReportersFindRequestRt",
+        "description": [],
+        "signature": [
+          "PartialC",
+          "<{ owner: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 286
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.AllTagsFindRequestRt",
+        "type": "Object",
+        "tags": [],
+        "label": "AllTagsFindRequestRt",
         "description": [],
         "signature": [
+          "PartialC",
+          "<{ owner: ",
+          "UnionC",
+          "<[",
           "ArrayC",
           "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 278
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CaseAttributesRt",
+        "type": "Object",
+        "tags": [],
+        "label": "CaseAttributesRt",
+        "description": [],
+        "signature": [
           "IntersectionC",
           "<[",
+          "TypeC",
+          "<{ description: ",
+          "StringC",
+          "; status: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CaseStatuses",
+            "text": "CaseStatuses"
+          },
+          ".open>, ",
+          "LiteralC",
+          "<typeof ",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CaseStatuses",
+            "text": "CaseStatuses"
+          },
+          "[\"in-progress\"]>, ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CaseStatuses",
+            "text": "CaseStatuses"
+          },
+          ".closed>]>; tags: ",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">; title: ",
+          "StringC",
+          "; type: ",
           "UnionC",
           "<[",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CaseType",
+            "text": "CaseType"
+          },
+          ".collection>, ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.CaseType",
+            "text": "CaseType"
+          },
+          ".individual>]>; connector: ",
           "IntersectionC",
           "<[",
           "TypeC",
-          "<{ comment: ",
+          "<{ id: ",
           "StringC",
-          "; type: ",
+          "; name: ",
+          "StringC",
+          "; }>, ",
+          "UnionC",
+          "<[",
+          "TypeC",
+          "<{ type: ",
           "LiteralC",
           "<",
           {
             "pluginId": "cases",
             "scope": "common",
             "docId": "kibCasesPluginApi",
-            "section": "def-common.CommentType",
-            "text": "CommentType"
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
           },
-          ".user>; }>, ",
+          ".jira>; fields: ",
+          "UnionC",
+          "<[",
           "TypeC",
-          "<{ associationType: ",
+          "<{ issueType: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; priority: ",
           "UnionC",
           "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; parent: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; }>, ",
+          "NullC",
+          "]>; }>, ",
+          "TypeC",
+          "<{ type: ",
           "LiteralC",
           "<",
           {
             "pluginId": "cases",
             "scope": "common",
             "docId": "kibCasesPluginApi",
-            "section": "def-common.AssociationType",
-            "text": "AssociationType"
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
           },
-          ".case>, ",
+          ".resilient>; fields: ",
+          "UnionC",
+          "<[",
+          "TypeC",
+          "<{ incidentTypes: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "NullC",
+          "]>; severityCode: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; }>, ",
+          "NullC",
+          "]>; }>, ",
+          "TypeC",
+          "<{ type: ",
           "LiteralC",
           "<",
           {
             "pluginId": "cases",
             "scope": "common",
             "docId": "kibCasesPluginApi",
-            "section": "def-common.AssociationType",
-            "text": "AssociationType"
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
           },
-          ".subCase>]>; created_at: ",
+          ".serviceNowITSM>; fields: ",
+          "UnionC",
+          "<[",
+          "TypeC",
+          "<{ impact: ",
+          "UnionC",
+          "<[",
           "StringC",
-          "; created_by: ",
+          ", ",
+          "NullC",
+          "]>; severity: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; urgency: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; category: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; subcategory: ",
+          "UnionC",
+          "<[",
+          "StringC",
+          ", ",
+          "NullC",
+          "]>; }>, ",
+          "NullC",
+          "]>; }>, ",
+          "TypeC",
+          "<{ type: ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
+          },
+          ".serviceNowSIR>; fields: ",
+          "UnionC",
+          "<[",
           "TypeC",
-          "<{ email: ",
+          "<{ category: ",
           "UnionC",
           "<[",
-          "UndefinedC",
+          "StringC",
           ", ",
           "NullC",
-          ", ",
-          "StringC",
-          "]>; full_name: ",
+          "]>; destIp: ",
           "UnionC",
           "<[",
-          "UndefinedC",
+          "BooleanC",
           ", ",
           "NullC",
-          ", ",
-          "StringC",
-          "]>; username: ",
+          "]>; malwareHash: ",
           "UnionC",
           "<[",
-          "UndefinedC",
+          "BooleanC",
           ", ",
           "NullC",
-          ", ",
-          "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; malwareUrl: ",
           "UnionC",
           "<[",
-          "StringC",
+          "BooleanC",
           ", ",
           "NullC",
-          "]>; pushed_by: ",
-          "UnionC",
-          "<[",
-          "TypeC",
-          "<{ email: ",
+          "]>; priority: ",
           "UnionC",
           "<[",
-          "UndefinedC",
+          "StringC",
           ", ",
           "NullC",
-          ", ",
-          "StringC",
-          "]>; full_name: ",
+          "]>; sourceIp: ",
           "UnionC",
           "<[",
-          "UndefinedC",
+          "BooleanC",
           ", ",
           "NullC",
-          ", ",
-          "StringC",
-          "]>; username: ",
+          "]>; subcategory: ",
           "UnionC",
           "<[",
-          "UndefinedC",
+          "StringC",
           ", ",
           "NullC",
-          ", ",
-          "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; updated_at: ",
+          "]>; }>, ",
+          "TypeC",
+          "<{ type: ",
+          "LiteralC",
+          "<",
+          {
+            "pluginId": "cases",
+            "scope": "common",
+            "docId": "kibCasesPluginApi",
+            "section": "def-common.ConnectorTypes",
+            "text": "ConnectorTypes"
+          },
+          ".none>; fields: ",
+          "NullC",
+          "; }>]>]>; settings: ",
+          "TypeC",
+          "<{ syncAlerts: ",
+          "BooleanC",
+          "; }>; owner: ",
+          "StringC",
+          "; }>, ",
+          "TypeC",
+          "<{ closed_at: ",
           "UnionC",
           "<[",
           "StringC",
           ", ",
           "NullC",
-          "]>; updated_by: ",
+          "]>; closed_by: ",
           "UnionC",
           "<[",
           "TypeC",
@@ -9341,87 +9208,7 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>, ",
-          "IntersectionC",
-          "<[",
-          "TypeC",
-          "<{ type: ",
-          "UnionC",
-          "<[",
-          "LiteralC",
-          "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.CommentType",
-            "text": "CommentType"
-          },
-          ".generatedAlert>, ",
-          "LiteralC",
-          "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.CommentType",
-            "text": "CommentType"
-          },
-          ".alert>]>; alertId: ",
-          "UnionC",
-          "<[",
-          "ArrayC",
-          "<",
-          "StringC",
-          ">, ",
-          "StringC",
-          "]>; index: ",
-          "UnionC",
-          "<[",
-          "ArrayC",
-          "<",
-          "StringC",
-          ">, ",
-          "StringC",
-          "]>; rule: ",
-          "TypeC",
-          "<{ id: ",
-          "UnionC",
-          "<[",
-          "StringC",
-          ", ",
-          "NullC",
-          "]>; name: ",
-          "UnionC",
-          "<[",
-          "StringC",
-          ", ",
-          "NullC",
-          "]>; }>; }>, ",
-          "TypeC",
-          "<{ associationType: ",
-          "UnionC",
-          "<[",
-          "LiteralC",
-          "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.AssociationType",
-            "text": "AssociationType"
-          },
-          ".case>, ",
-          "LiteralC",
-          "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.AssociationType",
-            "text": "AssociationType"
-          },
-          ".subCase>]>; created_at: ",
+          "]>; created_at: ",
           "StringC",
           "; created_by: ",
           "TypeC",
@@ -9449,16 +9236,28 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; external_service: ",
           "UnionC",
           "<[",
-          "StringC",
-          ", ",
-          "NullC",
-          "]>; pushed_by: ",
-          "UnionC",
+          "IntersectionC",
           "<[",
           "TypeC",
+          "<{ connector_id: ",
+          "StringC",
+          "; connector_name: ",
+          "StringC",
+          "; external_id: ",
+          "StringC",
+          "; external_title: ",
+          "StringC",
+          "; external_url: ",
+          "StringC",
+          "; }>, ",
+          "TypeC",
+          "<{ pushed_at: ",
+          "StringC",
+          "; pushed_by: ",
+          "TypeC",
           "<{ email: ",
           "UnionC",
           "<[",
@@ -9483,7 +9282,7 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>, ",
+          "]>; }>; }>]>, ",
           "NullC",
           "]>; updated_at: ",
           "UnionC",
@@ -9521,95 +9320,33 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>]>, ",
-          "TypeC",
-          "<{ id: ",
-          "StringC",
-          "; version: ",
-          "StringC",
-          "; }>]>>"
+          "]>; }>]>"
         ],
-        "source": {
-          "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 99
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "cases",
-        "id": "def-common.CaseAttributesRt",
-        "type": "Object",
-        "tags": [],
-        "label": "CaseAttributesRt",
-        "description": [],
-        "signature": [
-          "IntersectionC",
-          "<[",
-          "TypeC",
-          "<{ description: ",
-          "StringC",
-          "; status: ",
-          "UnionC",
-          "<[",
-          "LiteralC",
-          "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.CaseStatuses",
-            "text": "CaseStatuses"
-          },
-          ".open>, ",
-          "LiteralC",
-          "<typeof ",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.CaseStatuses",
-            "text": "CaseStatuses"
-          },
-          "[\"in-progress\"]>, ",
-          "LiteralC",
-          "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.CaseStatuses",
-            "text": "CaseStatuses"
-          },
-          ".closed>]>; tags: ",
-          "ArrayC",
-          "<",
-          "StringC",
-          ">; title: ",
-          "StringC",
-          "; type: ",
-          "UnionC",
-          "<[",
-          "LiteralC",
-          "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.CaseType",
-            "text": "CaseType"
-          },
-          ".collection>, ",
-          "LiteralC",
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 87
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CaseConfigurationsResponseRt",
+        "type": "Object",
+        "tags": [],
+        "label": "CaseConfigurationsResponseRt",
+        "description": [],
+        "signature": [
+          "ArrayC",
           "<",
-          {
-            "pluginId": "cases",
-            "scope": "common",
-            "docId": "kibCasesPluginApi",
-            "section": "def-common.CaseType",
-            "text": "CaseType"
-          },
-          ".individual>]>; connector: ",
+          "IntersectionC",
+          "<[",
+          "IntersectionC",
+          "<[",
+          "IntersectionC",
+          "<[",
+          "TypeC",
+          "<{ connector: ",
           "IntersectionC",
           "<[",
           "TypeC",
@@ -9809,21 +9546,21 @@
           },
           ".none>; fields: ",
           "NullC",
-          "; }>]>]>; settings: ",
-          "TypeC",
-          "<{ syncAlerts: ",
-          "BooleanC",
-          "; }>; }>, ",
-          "TypeC",
-          "<{ closed_at: ",
+          "; }>]>]>; closure_type: ",
           "UnionC",
           "<[",
+          "LiteralC",
+          "<\"close-by-user\">, ",
+          "LiteralC",
+          "<\"close-by-pushing\">]>; }>, ",
+          "TypeC",
+          "<{ owner: ",
           "StringC",
-          ", ",
-          "NullC",
-          "]>; closed_by: ",
-          "UnionC",
-          "<[",
+          "; }>]>, ",
+          "TypeC",
+          "<{ created_at: ",
+          "StringC",
+          "; created_by: ",
           "TypeC",
           "<{ email: ",
           "UnionC",
@@ -9849,57 +9586,15 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>, ",
-          "NullC",
-          "]>; created_at: ",
-          "StringC",
-          "; created_by: ",
-          "TypeC",
-          "<{ email: ",
-          "UnionC",
-          "<[",
-          "UndefinedC",
-          ", ",
-          "NullC",
-          ", ",
-          "StringC",
-          "]>; full_name: ",
+          "]>; }>; updated_at: ",
           "UnionC",
           "<[",
-          "UndefinedC",
-          ", ",
-          "NullC",
-          ", ",
           "StringC",
-          "]>; username: ",
-          "UnionC",
-          "<[",
-          "UndefinedC",
           ", ",
           "NullC",
-          ", ",
-          "StringC",
-          "]>; }>; external_service: ",
+          "]>; updated_by: ",
           "UnionC",
           "<[",
-          "IntersectionC",
-          "<[",
-          "TypeC",
-          "<{ connector_id: ",
-          "StringC",
-          "; connector_name: ",
-          "StringC",
-          "; external_id: ",
-          "StringC",
-          "; external_title: ",
-          "StringC",
-          "; external_url: ",
-          "StringC",
-          "; }>, ",
-          "TypeC",
-          "<{ pushed_at: ",
-          "StringC",
-          "; pushed_by: ",
           "TypeC",
           "<{ email: ",
           "UnionC",
@@ -9925,49 +9620,57 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; }>]>, ",
+          "]>; }>, ",
           "NullC",
-          "]>; updated_at: ",
+          "]>; }>]>, ",
+          "TypeC",
+          "<{ mappings: ",
+          "ArrayC",
+          "<",
+          "TypeC",
+          "<{ action_type: ",
           "UnionC",
           "<[",
-          "StringC",
-          ", ",
-          "NullC",
-          "]>; updated_by: ",
+          "LiteralC",
+          "<\"append\">, ",
+          "LiteralC",
+          "<\"nothing\">, ",
+          "LiteralC",
+          "<\"overwrite\">]>; source: ",
           "UnionC",
           "<[",
-          "TypeC",
-          "<{ email: ",
+          "LiteralC",
+          "<\"title\">, ",
+          "LiteralC",
+          "<\"description\">, ",
+          "LiteralC",
+          "<\"comments\">]>; target: ",
           "UnionC",
           "<[",
-          "UndefinedC",
-          ", ",
-          "NullC",
-          ", ",
           "StringC",
-          "]>; full_name: ",
-          "UnionC",
-          "<[",
-          "UndefinedC",
-          ", ",
-          "NullC",
           ", ",
+          "LiteralC",
+          "<\"not_mapped\">]>; }>>; owner: ",
           "StringC",
-          "]>; username: ",
+          "; }>, ",
+          "TypeC",
+          "<{ id: ",
+          "StringC",
+          "; version: ",
+          "StringC",
+          "; error: ",
           "UnionC",
           "<[",
-          "UndefinedC",
+          "StringC",
           ", ",
           "NullC",
-          ", ",
+          "]>; owner: ",
           "StringC",
-          "]>; }>, ",
-          "NullC",
-          "]>; }>]>"
+          "; }>]>>"
         ],
         "source": {
-          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 62
+          "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
+          "lineNumber": 76
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -9980,6 +9683,8 @@
         "label": "CaseConfigureAttributesRt",
         "description": [],
         "signature": [
+          "IntersectionC",
+          "<[",
           "IntersectionC",
           "<[",
           "TypeC",
@@ -10191,6 +9896,10 @@
           "LiteralC",
           "<\"close-by-pushing\">]>; }>, ",
           "TypeC",
+          "<{ owner: ",
+          "StringC",
+          "; }>]>, ",
+          "TypeC",
           "<{ created_at: ",
           "StringC",
           "; created_by: ",
@@ -10259,7 +9968,27 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 27
+          "lineNumber": 43
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CaseConfigureRequestParamsRt",
+        "type": "Object",
+        "tags": [],
+        "label": "CaseConfigureRequestParamsRt",
+        "description": [],
+        "signature": [
+          "TypeC",
+          "<{ configuration_id: ",
+          "StringC",
+          "; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
+          "lineNumber": 72
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -10276,6 +10005,8 @@
           "<[",
           "IntersectionC",
           "<[",
+          "IntersectionC",
+          "<[",
           "TypeC",
           "<{ connector: ",
           "IntersectionC",
@@ -10485,6 +10216,10 @@
           "LiteralC",
           "<\"close-by-pushing\">]>; }>, ",
           "TypeC",
+          "<{ owner: ",
+          "StringC",
+          "; }>]>, ",
+          "TypeC",
           "<{ created_at: ",
           "StringC",
           "; created_by: ",
@@ -10577,9 +10312,13 @@
           "StringC",
           ", ",
           "LiteralC",
-          "<\"not_mapped\">]>; }>>; }>, ",
+          "<\"not_mapped\">]>; }>>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
-          "<{ version: ",
+          "<{ id: ",
+          "StringC",
+          "; version: ",
           "StringC",
           "; error: ",
           "UnionC",
@@ -10587,11 +10326,13 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>]>"
+          "]>; owner: ",
+          "StringC",
+          "; }>]>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 37
+          "lineNumber": 53
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -11089,7 +10830,9 @@
           "TypeC",
           "<{ syncAlerts: ",
           "BooleanC",
-          "; }>; }>, ",
+          "; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -11099,7 +10842,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 142
+          "lineNumber": 242
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -11353,11 +11096,13 @@
           "TypeC",
           "<{ syncAlerts: ",
           "BooleanC",
-          "; }>; }>]>"
+          "; }>; owner: ",
+          "StringC",
+          "; }>]>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 97
+          "lineNumber": 142
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -11379,7 +11124,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 150
+          "lineNumber": 253
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -11663,7 +11408,9 @@
           "TypeC",
           "<{ syncAlerts: ",
           "BooleanC",
-          "; }>; }>, ",
+          "; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ closed_at: ",
           "UnionC",
@@ -11975,7 +11722,9 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>, ",
+          "]>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -12009,7 +11758,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -12061,7 +11812,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -12189,7 +11942,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -12241,7 +11996,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -12341,7 +12098,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -12393,7 +12152,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -12521,7 +12282,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -12573,7 +12336,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -12655,7 +12420,33 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 117
+          "lineNumber": 217
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CasesByAlertIDRequestRt",
+        "type": "Object",
+        "tags": [],
+        "label": "CasesByAlertIDRequestRt",
+        "description": [],
+        "signature": [
+          "PartialC",
+          "<{ owner: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/case.ts",
+          "lineNumber": 209
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -12905,11 +12696,13 @@
           "TypeC",
           "<{ syncAlerts: ",
           "BooleanC",
-          "; }>; }>"
+          "; }>; owner: ",
+          "StringC",
+          "; }>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 86
+          "lineNumber": 131
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -13139,7 +12932,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 22
+          "lineNumber": 38
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -13152,6 +12945,8 @@
         "label": "CasesConfigureRequestRt",
         "description": [],
         "signature": [
+          "IntersectionC",
+          "<[",
           "TypeC",
           "<{ connector: ",
           "IntersectionC",
@@ -13359,11 +13154,15 @@
           "LiteralC",
           "<\"close-by-user\">, ",
           "LiteralC",
-          "<\"close-by-pushing\">]>; }>"
+          "<\"close-by-pushing\">]>; }>, ",
+          "TypeC",
+          "<{ owner: ",
+          "StringC",
+          "; }>]>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
-          "lineNumber": 21
+          "lineNumber": 37
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -13464,10 +13263,14 @@
           "<number, string, unknown>; search: ",
           "StringC",
           "; searchFields: ",
+          "UnionC",
+          "<[",
           "ArrayC",
           "<",
           "StringC",
-          ">; sortField: ",
+          ">, ",
+          "StringC",
+          "]>; sortField: ",
           "StringC",
           "; sortOrder: ",
           "UnionC",
@@ -13475,11 +13278,19 @@
           "LiteralC",
           "<\"desc\">, ",
           "LiteralC",
-          "<\"asc\">]>; }>"
+          "<\"asc\">]>; owner: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; }>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 102
+          "lineNumber": 150
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -13769,7 +13580,9 @@
           "TypeC",
           "<{ syncAlerts: ",
           "BooleanC",
-          "; }>; }>, ",
+          "; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ closed_at: ",
           "UnionC",
@@ -14081,7 +13894,9 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>, ",
+          "]>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -14115,7 +13930,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -14167,7 +13984,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -14295,7 +14114,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -14347,7 +14168,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -14447,7 +14270,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -14499,7 +14324,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -14627,7 +14454,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -14679,7 +14508,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -14775,7 +14606,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 132
+          "lineNumber": 232
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -15061,7 +14892,9 @@
           "TypeC",
           "<{ syncAlerts: ",
           "BooleanC",
-          "; }>; }>, ",
+          "; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -15071,7 +14904,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 147
+          "lineNumber": 250
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -15357,7 +15190,9 @@
           "TypeC",
           "<{ syncAlerts: ",
           "BooleanC",
-          "; }>; }>, ",
+          "; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ closed_at: ",
           "UnionC",
@@ -15669,7 +15504,9 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>, ",
+          "]>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -15703,7 +15540,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -15755,7 +15594,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -15883,7 +15724,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -15935,7 +15778,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -16035,7 +15880,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -16087,7 +15934,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -16215,7 +16064,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -16267,7 +16118,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -16349,7 +16202,33 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 148
+          "lineNumber": 251
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.CasesStatusRequestRt",
+        "type": "Object",
+        "tags": [],
+        "label": "CasesStatusRequestRt",
+        "description": [],
+        "signature": [
+          "PartialC",
+          "<{ owner: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/status.ts",
+          "lineNumber": 30
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -16457,7 +16336,9 @@
           "LiteralC",
           "<\"settings\">, ",
           "LiteralC",
-          "<\"sub_case\">]>>; action: ",
+          "<\"sub_case\">, ",
+          "LiteralC",
+          "<\"owner\">]>>; action: ",
           "UnionC",
           "<[",
           "LiteralC",
@@ -16509,11 +16390,13 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>"
+          "]>; owner: ",
+          "StringC",
+          "; }>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
-          "lineNumber": 55
+          "lineNumber": 58
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -16553,7 +16436,9 @@
           "LiteralC",
           "<\"settings\">, ",
           "LiteralC",
-          "<\"sub_case\">]>>; action: ",
+          "<\"sub_case\">, ",
+          "LiteralC",
+          "<\"owner\">]>>; action: ",
           "UnionC",
           "<[",
           "LiteralC",
@@ -16605,7 +16490,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>, ",
+          "]>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ action_id: ",
           "StringC",
@@ -16625,7 +16512,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/user_actions.ts",
-          "lineNumber": 57
+          "lineNumber": 60
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -16689,7 +16576,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -16765,7 +16654,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 38
+          "lineNumber": 39
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -16835,7 +16724,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -16961,7 +16852,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>]>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "PartialC",
           "<{ associationType: ",
           "UnionC",
@@ -17013,7 +16906,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -17089,7 +16984,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 116
+          "lineNumber": 120
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -17119,7 +17014,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ type: ",
           "UnionC",
@@ -17173,7 +17070,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>]>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -17183,7 +17082,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 101
+          "lineNumber": 105
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -17211,7 +17110,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ type: ",
           "UnionC",
@@ -17265,11 +17166,13 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>]>"
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>]>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 81
+          "lineNumber": 85
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -17301,7 +17204,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -17353,7 +17258,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -17481,7 +17388,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -17533,7 +17442,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -17615,7 +17526,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 83
+          "lineNumber": 87
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -17685,7 +17596,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -17737,7 +17650,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -17819,7 +17734,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 91
+          "lineNumber": 95
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -17855,7 +17770,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -17907,7 +17824,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -18035,7 +17954,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -18087,7 +18008,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -18175,7 +18098,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 121
+          "lineNumber": 125
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -18387,7 +18310,9 @@
           "StringC",
           ", ",
           "LiteralC",
-          "<\"not_mapped\">]>; }>>; }>"
+          "<\"not_mapped\">]>; }>>; owner: ",
+          "StringC",
+          "; }>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/connectors/mappings.ts",
@@ -18625,11 +18550,13 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>"
+          ".user>; owner: ",
+          "StringC",
+          "; }>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 57
+          "lineNumber": 59
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -18673,7 +18600,79 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/case.ts",
-          "lineNumber": 155
+          "lineNumber": 258
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.FindQueryParamsRt",
+        "type": "Object",
+        "tags": [],
+        "label": "FindQueryParamsRt",
+        "description": [],
+        "signature": [
+          "PartialC",
+          "<{ subCaseId: ",
+          "StringC",
+          "; defaultSearchOperator: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<\"AND\">, ",
+          "LiteralC",
+          "<\"OR\">]>; hasReferenceOperator: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<\"AND\">, ",
+          "LiteralC",
+          "<\"OR\">]>; hasReference: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "TypeC",
+          "<{ id: ",
+          "StringC",
+          "; type: ",
+          "StringC",
+          "; }>>, ",
+          "TypeC",
+          "<{ id: ",
+          "StringC",
+          "; type: ",
+          "StringC",
+          "; }>]>; fields: ",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">; filter: ",
+          "StringC",
+          "; page: ",
+          "Type",
+          "<number, string, unknown>; perPage: ",
+          "Type",
+          "<number, string, unknown>; search: ",
+          "StringC",
+          "; searchFields: ",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">; sortField: ",
+          "StringC",
+          "; sortOrder: ",
+          "UnionC",
+          "<[",
+          "LiteralC",
+          "<\"desc\">, ",
+          "LiteralC",
+          "<\"asc\">]>; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
+          "lineNumber": 134
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -18703,7 +18702,33 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/comment.ts",
-          "lineNumber": 18
+          "lineNumber": 19
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "cases",
+        "id": "def-common.GetConfigureFindRequestRt",
+        "type": "Object",
+        "tags": [],
+        "label": "GetConfigureFindRequestRt",
+        "description": [],
+        "signature": [
+          "PartialC",
+          "<{ owner: ",
+          "UnionC",
+          "<[",
+          "ArrayC",
+          "<",
+          "StringC",
+          ">, ",
+          "StringC",
+          "]>; }>"
+        ],
+        "source": {
+          "path": "x-pack/plugins/cases/common/api/cases/configure.ts",
+          "lineNumber": 64
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -19121,11 +19146,13 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>"
+          "]>; owner: ",
+          "StringC",
+          "; }>]>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 20
+          "lineNumber": 23
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -19183,7 +19210,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 67
+          "lineNumber": 99
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -19339,7 +19366,9 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>, ",
+          "]>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -19373,7 +19402,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -19425,7 +19456,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -19553,7 +19586,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -19605,7 +19640,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -19687,7 +19724,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 44
+          "lineNumber": 76
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -19761,11 +19798,13 @@
           "LiteralC",
           "<\"desc\">, ",
           "LiteralC",
-          "<\"asc\">]>; }>"
+          "<\"asc\">]>; owner: ",
+          "StringC",
+          "; }>"
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 32
+          "lineNumber": 36
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -19927,7 +19966,9 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>, ",
+          "]>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -19961,7 +20002,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -20013,7 +20056,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -20141,7 +20186,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -20193,7 +20240,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -20289,7 +20338,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 57
+          "lineNumber": 89
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -20351,7 +20400,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 72
+          "lineNumber": 104
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -20509,7 +20558,9 @@
           "StringC",
           "]>; }>, ",
           "NullC",
-          "]>; }>]>, ",
+          "]>; owner: ",
+          "StringC",
+          "; }>]>, ",
           "TypeC",
           "<{ id: ",
           "StringC",
@@ -20543,7 +20594,9 @@
             "section": "def-common.CommentType",
             "text": "CommentType"
           },
-          ".user>; }>, ",
+          ".user>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -20595,7 +20648,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -20723,7 +20778,9 @@
           "StringC",
           ", ",
           "NullC",
-          "]>; }>; }>, ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; }>, ",
           "TypeC",
           "<{ associationType: ",
           "UnionC",
@@ -20775,7 +20832,9 @@
           "NullC",
           ", ",
           "StringC",
-          "]>; }>; pushed_at: ",
+          "]>; }>; owner: ",
+          "StringC",
+          "; pushed_at: ",
           "UnionC",
           "<[",
           "StringC",
@@ -20857,7 +20916,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/cases/common/api/cases/sub_case.ts",
-          "lineNumber": 73
+          "lineNumber": 105
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/cases.mdx b/api_docs/cases.mdx
index 892e3e02e7522..20d371cbcdc6e 100644
--- a/api_docs/cases.mdx
+++ b/api_docs/cases.mdx
@@ -27,6 +27,9 @@ import casesObj from './cases.json';
 
 ## Server
 
+### Classes
+<DocDefinitionList data={casesObj.server.classes}/>
+
 ### Interfaces
 <DocDefinitionList data={casesObj.server.interfaces}/>
 
diff --git a/api_docs/charts.json b/api_docs/charts.json
index 29c1c163d19a0..f42832e5d1e95 100644
--- a/api_docs/charts.json
+++ b/api_docs/charts.json
@@ -11,11 +11,11 @@
         "label": "ColorPicker",
         "description": [],
         "signature": [
-          "({ onChange, color: selectedColor, label, useLegacyColors, colorIsOverwritten, onKeyDown, }: ColorPickerProps) => JSX.Element"
+          "({ onChange, color: selectedColor, label, useLegacyColors, colorIsOverwritten, onKeyDown, maxDepth, layerIndex, }: ColorPickerProps) => JSX.Element"
         ],
         "source": {
           "path": "src/plugins/charts/public/static/components/color_picker.tsx",
-          "lineNumber": 111
+          "lineNumber": 119
         },
         "deprecated": false,
         "children": [
@@ -24,14 +24,14 @@
             "id": "def-public.ColorPicker.$1",
             "type": "Object",
             "tags": [],
-            "label": "{\n  onChange,\n  color: selectedColor,\n  label,\n  useLegacyColors = true,\n  colorIsOverwritten = true,\n  onKeyDown,\n}",
+            "label": "{\n  onChange,\n  color: selectedColor,\n  label,\n  useLegacyColors = true,\n  colorIsOverwritten = true,\n  onKeyDown,\n  maxDepth,\n  layerIndex,\n}",
             "description": [],
             "signature": [
               "ColorPickerProps"
             ],
             "source": {
               "path": "src/plugins/charts/public/static/components/color_picker.tsx",
-              "lineNumber": 111
+              "lineNumber": 119
             },
             "deprecated": false,
             "isRequired": true
@@ -630,6 +630,77 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "charts",
+        "id": "def-public.lightenColor",
+        "type": "Function",
+        "tags": [],
+        "label": "lightenColor",
+        "description": [],
+        "signature": [
+          "(baseColor: string, step: number, totalSteps: number) => string"
+        ],
+        "source": {
+          "path": "src/plugins/charts/public/services/palettes/lighten_color.ts",
+          "lineNumber": 14
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.lightenColor.$1",
+            "type": "string",
+            "tags": [],
+            "label": "baseColor",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "source": {
+              "path": "src/plugins/charts/public/services/palettes/lighten_color.ts",
+              "lineNumber": 14
+            },
+            "deprecated": false,
+            "isRequired": true
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.lightenColor.$2",
+            "type": "number",
+            "tags": [],
+            "label": "step",
+            "description": [],
+            "signature": [
+              "number"
+            ],
+            "source": {
+              "path": "src/plugins/charts/public/services/palettes/lighten_color.ts",
+              "lineNumber": 14
+            },
+            "deprecated": false,
+            "isRequired": true
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.lightenColor.$3",
+            "type": "number",
+            "tags": [],
+            "label": "totalSteps",
+            "description": [],
+            "signature": [
+              "number"
+            ],
+            "source": {
+              "path": "src/plugins/charts/public/services/palettes/lighten_color.ts",
+              "lineNumber": 14
+            },
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "charts",
         "id": "def-public.renderEndzoneTooltip",
@@ -1132,6 +1203,86 @@
               "lineNumber": 16
             },
             "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteArguments.stop",
+            "type": "Array",
+            "tags": [],
+            "label": "stop",
+            "description": [],
+            "signature": [
+              "number[] | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 17
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteArguments.range",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "range",
+            "description": [],
+            "signature": [
+              "\"number\" | \"percent\" | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 18
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteArguments.rangeMin",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMin",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 19
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteArguments.rangeMax",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMax",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 20
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteArguments.continuity",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "continuity",
+            "description": [],
+            "signature": [
+              "\"above\" | \"below\" | \"all\" | \"none\" | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 21
+            },
+            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -1145,7 +1296,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 19
+          "lineNumber": 24
         },
         "deprecated": false,
         "children": [
@@ -1161,7 +1312,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 20
+              "lineNumber": 25
             },
             "deprecated": false
           },
@@ -1174,7 +1325,81 @@
             "description": [],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 21
+              "lineNumber": 26
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteState.stops",
+            "type": "Array",
+            "tags": [],
+            "label": "stops",
+            "description": [],
+            "signature": [
+              "number[]"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 27
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteState.range",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "range",
+            "description": [],
+            "signature": [
+              "\"number\" | \"percent\""
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 28
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteState.rangeMin",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMin",
+            "description": [],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 29
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteState.rangeMax",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMax",
+            "description": [],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 30
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.CustomPaletteState.continuity",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "continuity",
+            "description": [],
+            "signature": [
+              "\"above\" | \"below\" | \"all\" | \"none\" | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 31
             },
             "deprecated": false
           }
@@ -1408,28 +1633,10 @@
           },
           {
             "parentPluginId": "charts",
-            "id": "def-public.PaletteDefinition.renderEditor",
+            "id": "def-public.PaletteDefinition.getCategoricalColor",
             "type": "Function",
             "tags": [],
-            "label": "renderEditor",
-            "description": [
-              "\nRenders the UI for editing the internal state of the palette.\nNot each palette has to feature an internal state, so this is an optional property."
-            ],
-            "signature": [
-              "((domElement: Element, props: { state?: T | undefined; setState: (updater: (oldState: T) => T) => void; }) => void) | undefined"
-            ],
-            "source": {
-              "path": "src/plugins/charts/public/services/palettes/types.ts",
-              "lineNumber": 88
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "charts",
-            "id": "def-public.PaletteDefinition.getColor",
-            "type": "Function",
-            "tags": [],
-            "label": "getColor",
+            "label": "getCategoricalColor",
             "description": [
               "\nColor a series according to the internal rules of the palette."
             ],
@@ -1454,7 +1661,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/public/services/palettes/types.ts",
-              "lineNumber": 97
+              "lineNumber": 87
             },
             "deprecated": false,
             "returnComment": [],
@@ -1480,7 +1687,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/charts/public/services/palettes/types.ts",
-                  "lineNumber": 98
+                  "lineNumber": 88
                 },
                 "deprecated": false
               },
@@ -1503,7 +1710,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/charts/public/services/palettes/types.ts",
-                  "lineNumber": 99
+                  "lineNumber": 89
                 },
                 "deprecated": false
               },
@@ -1521,7 +1728,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/charts/public/services/palettes/types.ts",
-                  "lineNumber": 100
+                  "lineNumber": 90
                 },
                 "deprecated": false
               }
@@ -1529,10 +1736,10 @@
           },
           {
             "parentPluginId": "charts",
-            "id": "def-public.PaletteDefinition.getColors",
+            "id": "def-public.PaletteDefinition.getCategoricalColors",
             "type": "Function",
             "tags": [],
-            "label": "getColors",
+            "label": "getCategoricalColors",
             "description": [
               "\nGet a spectrum of colors of the current palette.\nThis can be used if the chart wants to control color assignment locally."
             ],
@@ -1541,7 +1748,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/public/services/palettes/types.ts",
-              "lineNumber": 106
+              "lineNumber": 96
             },
             "deprecated": false,
             "returnComment": [],
@@ -1555,7 +1762,7 @@
                 "description": [],
                 "source": {
                   "path": "src/plugins/charts/public/services/palettes/types.ts",
-                  "lineNumber": 106
+                  "lineNumber": 96
                 },
                 "deprecated": false
               },
@@ -1571,11 +1778,47 @@
                 ],
                 "source": {
                   "path": "src/plugins/charts/public/services/palettes/types.ts",
-                  "lineNumber": 106
+                  "lineNumber": 96
                 },
                 "deprecated": false
               }
             ]
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.PaletteDefinition.canDynamicColoring",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "canDynamicColoring",
+            "description": [
+              "\nDefine whether a palette supports dynamic coloring (i.e. gradient colors mapped to number values)"
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/public/services/palettes/types.ts",
+              "lineNumber": 100
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-public.PaletteDefinition.getColorForValue",
+            "type": "Function",
+            "tags": [],
+            "label": "getColorForValue",
+            "description": [
+              "\nGet the assigned color for the given value based on its data domain and state settings.\nThis can be used for dynamic coloring based on uniform color distribution or custom stops."
+            ],
+            "signature": [
+              "((value: number | undefined, state: T, { min, max }: { min: number; max: number; }) => string | undefined) | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/public/services/palettes/types.ts",
+              "lineNumber": 105
+            },
+            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -1599,7 +1842,7 @@
         ],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 28
+          "lineNumber": 38
         },
         "deprecated": false,
         "children": [
@@ -1615,7 +1858,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 29
+              "lineNumber": 39
             },
             "deprecated": false
           },
@@ -1628,7 +1871,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 30
+              "lineNumber": 40
             },
             "deprecated": false
           },
@@ -1644,7 +1887,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 31
+              "lineNumber": 41
             },
             "deprecated": false
           }
@@ -1660,7 +1903,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/charts/public/services/palettes/types.ts",
-          "lineNumber": 109
+          "lineNumber": 112
         },
         "deprecated": false,
         "children": [
@@ -1684,7 +1927,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/public/services/palettes/types.ts",
-              "lineNumber": 110
+              "lineNumber": 113
             },
             "deprecated": false,
             "returnComment": [],
@@ -1698,7 +1941,7 @@
                 "description": [],
                 "source": {
                   "path": "src/plugins/charts/public/services/palettes/types.ts",
-                  "lineNumber": 110
+                  "lineNumber": 113
                 },
                 "deprecated": false
               }
@@ -1724,7 +1967,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/public/services/palettes/types.ts",
-              "lineNumber": 111
+              "lineNumber": 114
             },
             "deprecated": false,
             "returnComment": [],
@@ -1953,7 +2196,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 24
+          "lineNumber": 34
         },
         "deprecated": false,
         "children": [
@@ -1966,7 +2209,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 25
+              "lineNumber": 35
             },
             "deprecated": false
           }
@@ -2693,7 +2936,7 @@
         ],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 53
+          "lineNumber": 63
         },
         "deprecated": false,
         "children": [],
@@ -2754,7 +2997,7 @@
         ],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 119
+          "lineNumber": 175
         },
         "deprecated": false,
         "children": [],
@@ -2820,6 +3063,86 @@
               "lineNumber": 16
             },
             "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteArguments.stop",
+            "type": "Array",
+            "tags": [],
+            "label": "stop",
+            "description": [],
+            "signature": [
+              "number[] | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 17
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteArguments.range",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "range",
+            "description": [],
+            "signature": [
+              "\"number\" | \"percent\" | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 18
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteArguments.rangeMin",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMin",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 19
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteArguments.rangeMax",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMax",
+            "description": [],
+            "signature": [
+              "number | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 20
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteArguments.continuity",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "continuity",
+            "description": [],
+            "signature": [
+              "\"above\" | \"below\" | \"all\" | \"none\" | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 21
+            },
+            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -2833,7 +3156,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 19
+          "lineNumber": 24
         },
         "deprecated": false,
         "children": [
@@ -2849,7 +3172,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 20
+              "lineNumber": 25
             },
             "deprecated": false
           },
@@ -2862,7 +3185,81 @@
             "description": [],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 21
+              "lineNumber": 26
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteState.stops",
+            "type": "Array",
+            "tags": [],
+            "label": "stops",
+            "description": [],
+            "signature": [
+              "number[]"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 27
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteState.range",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "range",
+            "description": [],
+            "signature": [
+              "\"number\" | \"percent\""
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 28
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteState.rangeMin",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMin",
+            "description": [],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 29
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteState.rangeMax",
+            "type": "number",
+            "tags": [],
+            "label": "rangeMax",
+            "description": [],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 30
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "charts",
+            "id": "def-common.CustomPaletteState.continuity",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "continuity",
+            "description": [],
+            "signature": [
+              "\"above\" | \"below\" | \"all\" | \"none\" | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/charts/common/palette.ts",
+              "lineNumber": 31
             },
             "deprecated": false
           }
@@ -2888,7 +3285,7 @@
         ],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 28
+          "lineNumber": 38
         },
         "deprecated": false,
         "children": [
@@ -2904,7 +3301,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 29
+              "lineNumber": 39
             },
             "deprecated": false
           },
@@ -2917,7 +3314,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 30
+              "lineNumber": 40
             },
             "deprecated": false
           },
@@ -2933,7 +3330,7 @@
             ],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 31
+              "lineNumber": 41
             },
             "deprecated": false
           }
@@ -2949,7 +3346,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 24
+          "lineNumber": 34
         },
         "deprecated": false,
         "children": [
@@ -2962,7 +3359,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/charts/common/palette.ts",
-              "lineNumber": 25
+              "lineNumber": 35
             },
             "deprecated": false
           }
@@ -3001,7 +3398,7 @@
         ],
         "source": {
           "path": "src/plugins/charts/common/palette.ts",
-          "lineNumber": 33
+          "lineNumber": 43
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/core.json b/api_docs/core.json
index 4fedef842a1c4..a5466960dbd36 100644
--- a/api_docs/core.json
+++ b/api_docs/core.json
@@ -1112,7 +1112,7 @@
         ],
         "source": {
           "path": "src/core/public/index.ts",
-          "lineNumber": 203
+          "lineNumber": 204
         },
         "deprecated": false,
         "children": [
@@ -1136,7 +1136,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 205
+              "lineNumber": 206
             },
             "deprecated": false
           },
@@ -1160,7 +1160,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 207
+              "lineNumber": 208
             },
             "deprecated": false
           },
@@ -1184,7 +1184,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 209
+              "lineNumber": 210
             },
             "deprecated": false
           },
@@ -1208,7 +1208,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 211
+              "lineNumber": 212
             },
             "deprecated": false
           },
@@ -1232,7 +1232,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 213
+              "lineNumber": 214
             },
             "deprecated": false
           },
@@ -1252,7 +1252,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 220
+              "lineNumber": 221
             },
             "deprecated": true,
             "references": []
@@ -1279,7 +1279,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 224
+              "lineNumber": 225
             },
             "deprecated": false,
             "returnComment": [],
@@ -1299,7 +1299,7 @@
         ],
         "source": {
           "path": "src/core/public/index.ts",
-          "lineNumber": 248
+          "lineNumber": 249
         },
         "deprecated": false,
         "children": [
@@ -1323,7 +1323,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 250
+              "lineNumber": 251
             },
             "deprecated": false
           },
@@ -1347,7 +1347,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 252
+              "lineNumber": 253
             },
             "deprecated": false
           },
@@ -1371,7 +1371,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 254
+              "lineNumber": 255
             },
             "deprecated": false
           },
@@ -1395,7 +1395,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 256
+              "lineNumber": 257
             },
             "deprecated": false
           },
@@ -1419,7 +1419,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 258
+              "lineNumber": 259
             },
             "deprecated": false
           },
@@ -1443,7 +1443,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 260
+              "lineNumber": 261
             },
             "deprecated": false
           },
@@ -1467,7 +1467,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 262
+              "lineNumber": 263
             },
             "deprecated": false
           },
@@ -1491,7 +1491,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 264
+              "lineNumber": 265
             },
             "deprecated": false
           },
@@ -1515,7 +1515,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 266
+              "lineNumber": 267
             },
             "deprecated": false
           },
@@ -1539,7 +1539,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 268
+              "lineNumber": 269
             },
             "deprecated": false
           },
@@ -1563,7 +1563,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 270
+              "lineNumber": 271
             },
             "deprecated": false
           },
@@ -1583,7 +1583,7 @@
             ],
             "source": {
               "path": "src/core/public/index.ts",
-              "lineNumber": 277
+              "lineNumber": 278
             },
             "deprecated": true,
             "references": [
@@ -5501,7 +5501,7 @@
             ],
             "signature": [
               "Record<string, ",
-              "AggregationContainer",
+              "AggregationsAggregationContainer",
               "> | undefined"
             ],
             "source": {
@@ -7427,7 +7427,7 @@
         ],
         "source": {
           "path": "src/core/public/index.ts",
-          "lineNumber": 234
+          "lineNumber": 235
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -8058,7 +8058,7 @@
         ],
         "source": {
           "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-          "lineNumber": 188
+          "lineNumber": 210
         },
         "deprecated": false,
         "children": [
@@ -8076,7 +8076,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 192
+              "lineNumber": 214
             },
             "deprecated": false
           },
@@ -8091,7 +8091,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 197
+              "lineNumber": 219
             },
             "deprecated": false
           },
@@ -8106,7 +8106,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 202
+              "lineNumber": 224
             },
             "deprecated": false
           },
@@ -8124,7 +8124,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 208
+              "lineNumber": 230
             },
             "deprecated": false
           },
@@ -8142,7 +8142,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 215
+              "lineNumber": 237
             },
             "deprecated": false
           },
@@ -8160,7 +8160,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 220
+              "lineNumber": 242
             },
             "deprecated": false
           },
@@ -8178,7 +8178,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 225
+              "lineNumber": 247
             },
             "deprecated": false
           },
@@ -8196,7 +8196,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 230
+              "lineNumber": 252
             },
             "deprecated": false
           },
@@ -8211,7 +8211,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 236
+              "lineNumber": 258
             },
             "deprecated": false
           },
@@ -8229,7 +8229,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 242
+              "lineNumber": 264
             },
             "deprecated": false
           },
@@ -8244,7 +8244,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 248
+              "lineNumber": 270
             },
             "deprecated": false
           },
@@ -8262,7 +8262,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 254
+              "lineNumber": 276
             },
             "deprecated": false
           },
@@ -8280,7 +8280,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 260
+              "lineNumber": 282
             },
             "deprecated": false
           },
@@ -8298,7 +8298,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 267
+              "lineNumber": 289
             },
             "deprecated": false
           },
@@ -8316,7 +8316,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 277
+              "lineNumber": 299
             },
             "deprecated": false
           },
@@ -8332,7 +8332,7 @@
             ],
             "source": {
               "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-              "lineNumber": 279
+              "lineNumber": 301
             },
             "deprecated": false,
             "children": [
@@ -8348,7 +8348,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/elasticsearch/elasticsearch_config.ts",
-                  "lineNumber": 279
+                  "lineNumber": 301
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9095,7 +9095,7 @@
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/server/types.ts",
-              "lineNumber": 40
+              "lineNumber": 39
             }
           },
           {
@@ -9109,7 +9109,7 @@
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/target/types/server/types.d.ts",
-              "lineNumber": 25
+              "lineNumber": 24
             }
           }
         ],
@@ -9383,7 +9383,7 @@
                 "plugin": "data",
                 "link": {
                   "path": "src/plugins/data/server/autocomplete/value_suggestions_route.ts",
-                  "lineNumber": 67
+                  "lineNumber": 65
                 }
               },
               {
@@ -9439,7 +9439,7 @@
                 "plugin": "indexManagement",
                 "link": {
                   "path": "x-pack/plugins/index_management/server/routes/api/indices/register_list_route.ts",
-                  "lineNumber": 18
+                  "lineNumber": 16
                 }
               },
               {
@@ -9460,7 +9460,7 @@
                 "plugin": "indexManagement",
                 "link": {
                   "path": "x-pack/plugins/index_management/server/routes/api/indices/register_reload_route.ts",
-                  "lineNumber": 33
+                  "lineNumber": 28
                 }
               },
               {
@@ -9488,14 +9488,14 @@
                 "plugin": "indexManagement",
                 "link": {
                   "path": "x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts",
-                  "lineNumber": 24
+                  "lineNumber": 22
                 }
               },
               {
                 "plugin": "indexManagement",
                 "link": {
                   "path": "x-pack/plugins/index_management/server/routes/api/templates/register_get_routes.ts",
-                  "lineNumber": 65
+                  "lineNumber": 62
                 }
               },
               {
@@ -9572,14 +9572,14 @@
                 "plugin": "indexManagement",
                 "link": {
                   "path": "x-pack/plugins/index_management/server/routes/api/component_templates/create.ts",
-                  "lineNumber": 28
+                  "lineNumber": 24
                 }
               },
               {
                 "plugin": "indexManagement",
                 "link": {
                   "path": "x-pack/plugins/index_management/server/routes/api/component_templates/update.ts",
-                  "lineNumber": 32
+                  "lineNumber": 28
                 }
               },
               {
@@ -9596,181 +9596,6 @@
                   "lineNumber": 48
                 }
               },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.ts",
-                  "lineNumber": 45
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_create_route.ts",
-                  "lineNumber": 64
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_delete_route.ts",
-                  "lineNumber": 50
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_fetch_route.ts",
-                  "lineNumber": 27
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_get_route.ts",
-                  "lineNumber": 37
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_pause_route.ts",
-                  "lineNumber": 49
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_resume_route.ts",
-                  "lineNumber": 49
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/auto_follow_pattern/register_update_route.ts",
-                  "lineNumber": 47
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_create_route.ts",
-                  "lineNumber": 52
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.ts",
-                  "lineNumber": 29
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_fetch_route.ts",
-                  "lineNumber": 35
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.ts",
-                  "lineNumber": 38
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_get_route.ts",
-                  "lineNumber": 58
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_pause_route.ts",
-                  "lineNumber": 47
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_resume_route.ts",
-                  "lineNumber": 47
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts",
-                  "lineNumber": 50
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts",
-                  "lineNumber": 59
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts",
-                  "lineNumber": 64
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_unfollow_route.ts",
-                  "lineNumber": 72
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.ts",
-                  "lineNumber": 53
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.ts",
-                  "lineNumber": 66
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.ts",
-                  "lineNumber": 80
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_permissions_route.ts",
-                  "lineNumber": 40
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/routes/api/cross_cluster_replication/register_stats_route.ts",
-                  "lineNumber": 29
-                }
-              },
-              {
-                "plugin": "infra",
-                "link": {
-                  "path": "x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts",
-                  "lineNumber": 420
-                }
-              },
               {
                 "plugin": "lists",
                 "link": {
@@ -9803,7 +9628,7 @@
                 "plugin": "monitoring",
                 "link": {
                   "path": "x-pack/plugins/monitoring/server/plugin.ts",
-                  "lineNumber": 356
+                  "lineNumber": 361
                 }
               },
               {
@@ -9817,7 +9642,7 @@
                 "plugin": "securitySolution",
                 "link": {
                   "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/query_signals_route.ts",
-                  "lineNumber": 52
+                  "lineNumber": 60
                 }
               },
               {
@@ -10303,7 +10128,7 @@
             "plugin": "fleet",
             "link": {
               "path": "x-pack/plugins/fleet/server/plugin.ts",
-              "lineNumber": 189
+              "lineNumber": 190
             }
           },
           {
@@ -11156,7 +10981,7 @@
         ],
         "source": {
           "path": "src/core/server/index.ts",
-          "lineNumber": 472
+          "lineNumber": 470
         },
         "deprecated": false,
         "children": [
@@ -11180,7 +11005,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 474
+              "lineNumber": 472
             },
             "deprecated": false
           },
@@ -11204,7 +11029,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 476
+              "lineNumber": 474
             },
             "deprecated": false
           },
@@ -11228,7 +11053,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 478
+              "lineNumber": 476
             },
             "deprecated": false
           },
@@ -11261,7 +11086,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 480
+              "lineNumber": 478
             },
             "deprecated": false
           },
@@ -11285,7 +11110,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 485
+              "lineNumber": 483
             },
             "deprecated": false
           },
@@ -11309,7 +11134,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 487
+              "lineNumber": 485
             },
             "deprecated": false
           },
@@ -11333,7 +11158,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 489
+              "lineNumber": 487
             },
             "deprecated": false
           },
@@ -11357,7 +11182,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 491
+              "lineNumber": 489
             },
             "deprecated": false
           },
@@ -11381,7 +11206,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 493
+              "lineNumber": 491
             },
             "deprecated": false
           },
@@ -11405,7 +11230,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 495
+              "lineNumber": 493
             },
             "deprecated": false
           },
@@ -11429,7 +11254,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 497
+              "lineNumber": 495
             },
             "deprecated": false
           },
@@ -11455,7 +11280,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 499
+              "lineNumber": 497
             },
             "deprecated": false,
             "returnComment": [],
@@ -11475,7 +11300,7 @@
         ],
         "source": {
           "path": "src/core/server/index.ts",
-          "lineNumber": 520
+          "lineNumber": 518
         },
         "deprecated": false,
         "children": [
@@ -11499,7 +11324,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 522
+              "lineNumber": 520
             },
             "deprecated": false
           },
@@ -11523,7 +11348,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 524
+              "lineNumber": 522
             },
             "deprecated": false
           },
@@ -11547,7 +11372,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 526
+              "lineNumber": 524
             },
             "deprecated": false
           },
@@ -11571,7 +11396,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 528
+              "lineNumber": 526
             },
             "deprecated": false
           },
@@ -11595,7 +11420,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 530
+              "lineNumber": 528
             },
             "deprecated": false
           },
@@ -11619,7 +11444,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 532
+              "lineNumber": 530
             },
             "deprecated": false
           }
@@ -12169,6 +11994,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "core",
+            "id": "def-server.DeprecationsDetails.deprecationType",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "deprecationType",
+            "description": [
+              "\n(optional) Used to identify between different deprecation types.\nExample use case: in Upgrade Assistant, we may want to allow the user to sort by\ndeprecation type or show each type in a separate tab.\n\nFeel free to add new types if necessary.\nPredefined types are necessary to reduce having similar definitions with different keywords\nacross kibana deprecations."
+            ],
+            "signature": [
+              "\"config\" | \"feature\" | undefined"
+            ],
+            "source": {
+              "path": "src/core/server/deprecations/types.ts",
+              "lineNumber": 37
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "core",
             "id": "def-server.DeprecationsDetails.documentationUrl",
@@ -12181,7 +12024,7 @@
             ],
             "source": {
               "path": "src/core/server/deprecations/types.ts",
-              "lineNumber": 29
+              "lineNumber": 39
             },
             "deprecated": false
           },
@@ -12193,11 +12036,11 @@
             "label": "correctiveActions",
             "description": [],
             "signature": [
-              "{ api?: { path: string; method: \"PUT\" | \"POST\"; body?: { [key: string]: any; } | undefined; } | undefined; manualSteps?: string[] | undefined; }"
+              "{ api?: { path: string; method: \"PUT\" | \"POST\"; body?: { [key: string]: any; } | undefined; } | undefined; manualSteps: string[]; }"
             ],
             "source": {
               "path": "src/core/server/deprecations/types.ts",
-              "lineNumber": 31
+              "lineNumber": 41
             },
             "deprecated": false
           }
@@ -12265,7 +12108,7 @@
         ],
         "source": {
           "path": "src/core/server/deprecations/deprecations_service.ts",
-          "lineNumber": 103
+          "lineNumber": 101
         },
         "deprecated": false,
         "children": [
@@ -12289,7 +12132,7 @@
             ],
             "source": {
               "path": "src/core/server/deprecations/deprecations_service.ts",
-              "lineNumber": 104
+              "lineNumber": 102
             },
             "deprecated": false,
             "returnComment": [],
@@ -12312,7 +12155,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/deprecations/deprecations_service.ts",
-                  "lineNumber": 104
+                  "lineNumber": 102
                 },
                 "deprecated": false
               }
@@ -12708,14 +12551,7 @@
                 "plugin": "indexManagement",
                 "link": {
                   "path": "x-pack/plugins/index_management/server/plugin.ts",
-                  "lineNumber": 34
-                }
-              },
-              {
-                "plugin": "crossClusterReplication",
-                "link": {
-                  "path": "x-pack/plugins/cross_cluster_replication/server/plugin.ts",
-                  "lineNumber": 33
+                  "lineNumber": 32
                 }
               },
               {
@@ -12949,7 +12785,7 @@
         "description": [],
         "source": {
           "path": "src/core/server/deprecations/types.ts",
-          "lineNumber": 60
+          "lineNumber": 70
         },
         "deprecated": false,
         "children": [
@@ -12971,7 +12807,7 @@
             ],
             "source": {
               "path": "src/core/server/deprecations/types.ts",
-              "lineNumber": 61
+              "lineNumber": 71
             },
             "deprecated": false
           },
@@ -13287,7 +13123,7 @@
             ],
             "source": {
               "path": "src/core/server/deprecations/types.ts",
-              "lineNumber": 62
+              "lineNumber": 72
             },
             "deprecated": false
           }
@@ -14316,7 +14152,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
@@ -15520,7 +15356,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
@@ -15548,7 +15384,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
@@ -15957,14 +15793,14 @@
             "plugin": "crossClusterReplication",
             "link": {
               "path": "x-pack/plugins/cross_cluster_replication/server/plugin.ts",
-              "lineNumber": 17
+              "lineNumber": 16
             }
           },
           {
             "plugin": "crossClusterReplication",
             "link": {
               "path": "x-pack/plugins/cross_cluster_replication/server/plugin.ts",
-              "lineNumber": 36
+              "lineNumber": 27
             }
           },
           {
@@ -16223,14 +16059,14 @@
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts",
-              "lineNumber": 447
+              "lineNumber": 457
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/server/lib/telemetry/sender.ts",
-              "lineNumber": 466
+              "lineNumber": 476
             }
           },
           {
@@ -20314,13 +20150,13 @@
             "signature": [
               "{ legacy: { globalConfig$: ",
               "Observable",
-              "<Readonly<{ kibana: Readonly<{ readonly index: string; readonly autocompleteTerminateAfter: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly autocompleteTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
+              "<Readonly<{ kibana: Readonly<{ readonly index: string; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
               "ByteSizeValue",
               ") => boolean; isLessThan: (other: ",
               "ByteSizeValue",
               ") => boolean; isEqualTo: (other: ",
               "ByteSizeValue",
-              ") => boolean; getValueInBytes: () => number; toString: (returnUnit?: \"b\" | \"kb\" | \"mb\" | \"gb\" | undefined) => string; }>; }>; }>>; get: () => Readonly<{ kibana: Readonly<{ readonly index: string; readonly autocompleteTerminateAfter: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly autocompleteTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
+              ") => boolean; getValueInBytes: () => number; toString: (returnUnit?: \"b\" | \"kb\" | \"mb\" | \"gb\" | undefined) => string; }>; }>; }>>; get: () => Readonly<{ kibana: Readonly<{ readonly index: string; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
               "ByteSizeValue",
               ") => boolean; isLessThan: (other: ",
               "ByteSizeValue",
@@ -20552,7 +20388,7 @@
         "description": [],
         "source": {
           "path": "src/core/server/deprecations/types.ts",
-          "lineNumber": 56
+          "lineNumber": 66
         },
         "deprecated": false,
         "children": [
@@ -20584,7 +20420,7 @@
             ],
             "source": {
               "path": "src/core/server/deprecations/types.ts",
-              "lineNumber": 57
+              "lineNumber": 67
             },
             "deprecated": false,
             "returnComment": [],
@@ -20607,7 +20443,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/deprecations/types.ts",
-                  "lineNumber": 57
+                  "lineNumber": 67
                 },
                 "deprecated": false
               }
@@ -20627,7 +20463,7 @@
         ],
         "source": {
           "path": "src/core/server/index.ts",
-          "lineNumber": 439
+          "lineNumber": 437
         },
         "deprecated": false,
         "children": [
@@ -20731,7 +20567,7 @@
             ],
             "source": {
               "path": "src/core/server/index.ts",
-              "lineNumber": 440
+              "lineNumber": 438
             },
             "deprecated": false
           }
@@ -22507,7 +22343,7 @@
         "signature": [
           "Pick<",
           "KibanaClient",
-          ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+          ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
           "TransportRequestParams",
           ", options?: ",
           "TransportRequestOptions",
@@ -23394,28 +23230,14 @@
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/server/plugin.ts",
-              "lineNumber": 14
+              "lineNumber": 12
             }
           },
           {
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/server/plugin.ts",
-              "lineNumber": 42
-            }
-          },
-          {
-            "plugin": "crossClusterReplication",
-            "link": {
-              "path": "x-pack/plugins/cross_cluster_replication/server/plugin.ts",
-              "lineNumber": 13
-            }
-          },
-          {
-            "plugin": "crossClusterReplication",
-            "link": {
-              "path": "x-pack/plugins/cross_cluster_replication/server/plugin.ts",
-              "lineNumber": 69
+              "lineNumber": 38
             }
           },
           {
@@ -23499,7 +23321,7 @@
             "plugin": "monitoring",
             "link": {
               "path": "x-pack/plugins/monitoring/server/plugin.ts",
-              "lineNumber": 279
+              "lineNumber": 284
             }
           },
           {
@@ -23672,28 +23494,14 @@
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/server/types.ts",
-              "lineNumber": 43
+              "lineNumber": 42
             }
           },
           {
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/server/types.ts",
-              "lineNumber": 50
-            }
-          },
-          {
-            "plugin": "crossClusterReplication",
-            "link": {
-              "path": "x-pack/plugins/cross_cluster_replication/server/types.ts",
-              "lineNumber": 8
-            }
-          },
-          {
-            "plugin": "crossClusterReplication",
-            "link": {
-              "path": "x-pack/plugins/cross_cluster_replication/server/types.ts",
-              "lineNumber": 41
+              "lineNumber": 49
             }
           },
           {
@@ -23710,41 +23518,6 @@
               "lineNumber": 73
             }
           },
-          {
-            "plugin": "infra",
-            "link": {
-              "path": "x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts",
-              "lineNumber": 9
-            }
-          },
-          {
-            "plugin": "infra",
-            "link": {
-              "path": "x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts",
-              "lineNumber": 139
-            }
-          },
-          {
-            "plugin": "infra",
-            "link": {
-              "path": "x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts",
-              "lineNumber": 405
-            }
-          },
-          {
-            "plugin": "crossClusterReplication",
-            "link": {
-              "path": "x-pack/plugins/cross_cluster_replication/target/types/server/types.d.ts",
-              "lineNumber": 1
-            }
-          },
-          {
-            "plugin": "crossClusterReplication",
-            "link": {
-              "path": "x-pack/plugins/cross_cluster_replication/target/types/server/types.d.ts",
-              "lineNumber": 30
-            }
-          },
           {
             "plugin": "globalSearch",
             "link": {
@@ -23770,28 +23543,14 @@
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/target/types/server/types.d.ts",
-              "lineNumber": 27
+              "lineNumber": 26
             }
           },
           {
             "plugin": "indexManagement",
             "link": {
               "path": "x-pack/plugins/index_management/target/types/server/types.d.ts",
-              "lineNumber": 33
-            }
-          },
-          {
-            "plugin": "infra",
-            "link": {
-              "path": "x-pack/plugins/infra/target/types/server/lib/log_analysis/log_entry_categories_analysis.d.ts",
-              "lineNumber": 1
-            }
-          },
-          {
-            "plugin": "infra",
-            "link": {
-              "path": "x-pack/plugins/infra/target/types/server/lib/log_analysis/log_entry_categories_analysis.d.ts",
-              "lineNumber": 58
+              "lineNumber": 32
             }
           }
         ],
@@ -24260,7 +24019,7 @@
         "label": "SharedGlobalConfig",
         "description": [],
         "signature": [
-          "{ readonly kibana: Readonly<{ readonly index: string; readonly autocompleteTerminateAfter: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly autocompleteTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; readonly elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; readonly path: Readonly<{ readonly data: string; }>; readonly savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
+          "{ readonly kibana: Readonly<{ readonly index: string; }>; readonly elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; readonly path: Readonly<{ readonly data: string; }>; readonly savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
           "ByteSizeValue",
           ") => boolean; isLessThan: (other: ",
           "ByteSizeValue",
@@ -24297,7 +24056,7 @@
         ],
         "source": {
           "path": "src/core/server/index.ts",
-          "lineNumber": 510
+          "lineNumber": 508
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/core_application.json b/api_docs/core_application.json
index e890b6f92a2ad..ab5fbe560172b 100644
--- a/api_docs/core_application.json
+++ b/api_docs/core_application.json
@@ -572,11 +572,18 @@
             "section": "def-public.App",
             "text": "App"
           },
-          "<HistoryLocationState>"
+          "<HistoryLocationState> extends ",
+          {
+            "pluginId": "core",
+            "scope": "public",
+            "docId": "kibCoreApplicationPluginApi",
+            "section": "def-public.AppNavOptions",
+            "text": "AppNavOptions"
+          }
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 79
+          "lineNumber": 107
         },
         "deprecated": false,
         "children": [
@@ -591,7 +598,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 83
+              "lineNumber": 111
             },
             "deprecated": false
           },
@@ -606,7 +613,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 88
+              "lineNumber": 116
             },
             "deprecated": false
           },
@@ -625,7 +632,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 95
+              "lineNumber": 123
             },
             "deprecated": false
           },
@@ -650,7 +657,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 101
+              "lineNumber": 129
             },
             "deprecated": false
           },
@@ -675,7 +682,25 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 108
+              "lineNumber": 136
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "core",
+            "id": "def-public.App.searchable",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "searchable",
+            "description": [
+              "\nThe initial flag to determine if the application is searchable in the global search.\nDefaulting to `true` if `navLinkStatus` is `visible` or omitted."
+            ],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "source": {
+              "path": "src/core/public/application/types.ts",
+              "lineNumber": 142
             },
             "deprecated": false
           },
@@ -693,7 +718,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 115
+              "lineNumber": 149
             },
             "deprecated": false
           },
@@ -720,79 +745,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 149
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-public.App.order",
-            "type": "number",
-            "tags": [],
-            "label": "order",
-            "description": [
-              "\nAn ordinal used to sort nav links relative to one another for display."
-            ],
-            "signature": [
-              "number | undefined"
-            ],
-            "source": {
-              "path": "src/core/public/application/types.ts",
-              "lineNumber": 154
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-public.App.tooltip",
-            "type": "string",
-            "tags": [],
-            "label": "tooltip",
-            "description": [
-              "\nA tooltip shown when hovering over app link."
-            ],
-            "signature": [
-              "string | undefined"
-            ],
-            "source": {
-              "path": "src/core/public/application/types.ts",
-              "lineNumber": 159
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-public.App.euiIconType",
-            "type": "string",
-            "tags": [],
-            "label": "euiIconType",
-            "description": [
-              "\nA EUI iconType that will be used for the app's icon. This icon\ntakes precendence over the `icon` property."
-            ],
-            "signature": [
-              "string | undefined"
-            ],
-            "source": {
-              "path": "src/core/public/application/types.ts",
-              "lineNumber": 165
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-public.App.icon",
-            "type": "string",
-            "tags": [],
-            "label": "icon",
-            "description": [
-              "\nA URL to an image file used as an icon. Used as a fallback\nif `euiIconType` is not provided."
-            ],
-            "signature": [
-              "string | undefined"
-            ],
-            "source": {
-              "path": "src/core/public/application/types.ts",
-              "lineNumber": 171
+              "lineNumber": 183
             },
             "deprecated": false
           },
@@ -812,7 +765,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 176
+              "lineNumber": 188
             },
             "deprecated": false
           },
@@ -830,7 +783,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 182
+              "lineNumber": 194
             },
             "deprecated": false
           },
@@ -872,7 +825,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 187
+              "lineNumber": 199
             },
             "deprecated": false,
             "returnComment": [],
@@ -896,7 +849,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 326
+                  "lineNumber": 346
                 },
                 "deprecated": false
               }
@@ -916,7 +869,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 194
+              "lineNumber": 206
             },
             "deprecated": false
           },
@@ -934,7 +887,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 212
+              "lineNumber": 224
             },
             "deprecated": false
           },
@@ -952,7 +905,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 215
+              "lineNumber": 227
             },
             "deprecated": false
           },
@@ -977,7 +930,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 254
+              "lineNumber": 266
             },
             "deprecated": false
           }
@@ -995,7 +948,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 552
+          "lineNumber": 572
         },
         "deprecated": false,
         "children": [
@@ -1018,7 +971,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 553
+              "lineNumber": 573
             },
             "deprecated": false
           },
@@ -1031,7 +984,7 @@
             "description": [],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 554
+              "lineNumber": 574
             },
             "deprecated": false
           },
@@ -1047,7 +1000,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 555
+              "lineNumber": 575
             },
             "deprecated": false
           },
@@ -1063,7 +1016,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 556
+              "lineNumber": 576
             },
             "deprecated": false
           }
@@ -1081,7 +1034,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 540
+          "lineNumber": 560
         },
         "deprecated": false,
         "children": [
@@ -1104,7 +1057,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 541
+              "lineNumber": 561
             },
             "deprecated": false
           }
@@ -1120,7 +1073,7 @@
         "description": [],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 607
+          "lineNumber": 628
         },
         "deprecated": false,
         "children": [
@@ -1146,7 +1099,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 613
+              "lineNumber": 634
             },
             "deprecated": false,
             "children": [
@@ -1171,7 +1124,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 613
+                  "lineNumber": 634
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1203,7 +1156,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 642
+              "lineNumber": 663
             },
             "deprecated": false,
             "children": [
@@ -1228,7 +1181,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 642
+                  "lineNumber": 663
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1248,7 +1201,7 @@
         "description": [],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 683
+          "lineNumber": 710
         },
         "deprecated": false,
         "children": [
@@ -1266,7 +1219,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 687
+              "lineNumber": 714
             },
             "deprecated": false
           },
@@ -1293,7 +1246,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 696
+              "lineNumber": 723
             },
             "deprecated": false
           },
@@ -1319,7 +1272,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 704
+              "lineNumber": 731
             },
             "deprecated": false,
             "children": [
@@ -1335,7 +1288,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 704
+                  "lineNumber": 731
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1361,7 +1314,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 704
+                  "lineNumber": 731
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -1383,7 +1336,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 742
+              "lineNumber": 769
             },
             "deprecated": false,
             "children": [
@@ -1401,7 +1354,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 742
+                  "lineNumber": 769
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1423,7 +1376,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 756
+              "lineNumber": 783
             },
             "deprecated": false,
             "children": [
@@ -1439,7 +1392,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 756
+                  "lineNumber": 783
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1453,7 +1406,7 @@
                 "description": [],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 756
+                  "lineNumber": 783
                 },
                 "deprecated": false,
                 "children": [
@@ -1469,7 +1422,7 @@
                     ],
                     "source": {
                       "path": "src/core/public/application/types.ts",
-                      "lineNumber": 756
+                      "lineNumber": 783
                     },
                     "deprecated": false
                   },
@@ -1485,7 +1438,7 @@
                     ],
                     "source": {
                       "path": "src/core/public/application/types.ts",
-                      "lineNumber": 756
+                      "lineNumber": 783
                     },
                     "deprecated": false
                   }
@@ -1509,7 +1462,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 761
+              "lineNumber": 788
             },
             "deprecated": false
           }
@@ -1535,7 +1488,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 336
+          "lineNumber": 356
         },
         "deprecated": false,
         "children": [
@@ -1553,7 +1506,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 340
+              "lineNumber": 360
             },
             "deprecated": false
           },
@@ -1578,7 +1531,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 386
+              "lineNumber": 406
             },
             "deprecated": false
           },
@@ -1595,7 +1548,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 436
+              "lineNumber": 456
             },
             "deprecated": true,
             "references": [
@@ -1606,6 +1559,13 @@
                   "lineNumber": 16
                 }
               },
+              {
+                "plugin": "fleet",
+                "link": {
+                  "path": "x-pack/plugins/fleet/public/applications/integrations/index.tsx",
+                  "lineNumber": 67
+                }
+              },
               {
                 "plugin": "fleet",
                 "link": {
@@ -1661,6 +1621,13 @@
                   "path": "x-pack/plugins/fleet/target/types/public/applications/fleet/index.d.ts",
                   "lineNumber": 11
                 }
+              },
+              {
+                "plugin": "fleet",
+                "link": {
+                  "path": "x-pack/plugins/fleet/target/types/public/applications/integrations/index.d.ts",
+                  "lineNumber": 11
+                }
               }
             ]
           },
@@ -1688,29 +1655,29 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 471
+              "lineNumber": 491
             },
             "deprecated": true,
             "references": [
               {
                 "plugin": "dashboard",
                 "link": {
-                  "path": "src/plugins/dashboard/public/application/types.ts",
-                  "lineNumber": 82
+                  "path": "src/plugins/dashboard/public/types.ts",
+                  "lineNumber": 194
                 }
               },
               {
                 "plugin": "dashboard",
                 "link": {
                   "path": "src/plugins/dashboard/public/application/dashboard_router.tsx",
-                  "lineNumber": 56
+                  "lineNumber": 57
                 }
               },
               {
                 "plugin": "dashboard",
                 "link": {
                   "path": "src/plugins/dashboard/public/plugin.tsx",
-                  "lineNumber": 298
+                  "lineNumber": 299
                 }
               },
               {
@@ -1724,7 +1691,7 @@
                 "plugin": "maps",
                 "link": {
                   "path": "x-pack/plugins/maps/public/routes/map_page/map_app/map_app.tsx",
-                  "lineNumber": 59
+                  "lineNumber": 67
                 }
               },
               {
@@ -1738,14 +1705,21 @@
                 "plugin": "lens",
                 "link": {
                   "path": "x-pack/plugins/lens/public/app_plugin/types.ts",
-                  "lineNumber": 71
+                  "lineNumber": 44
+                }
+              },
+              {
+                "plugin": "lens",
+                "link": {
+                  "path": "x-pack/plugins/lens/public/app_plugin/types.ts",
+                  "lineNumber": 72
                 }
               },
               {
                 "plugin": "lens",
                 "link": {
                   "path": "x-pack/plugins/lens/public/app_plugin/mounter.tsx",
-                  "lineNumber": 171
+                  "lineNumber": 219
                 }
               },
               {
@@ -1822,7 +1796,7 @@
                 "plugin": "maps",
                 "link": {
                   "path": "x-pack/plugins/maps/target/types/public/routes/map_page/map_app/map_app.d.ts",
-                  "lineNumber": 13
+                  "lineNumber": 17
                 }
               }
             ],
@@ -1849,7 +1823,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 471
+                  "lineNumber": 491
                 },
                 "deprecated": false
               }
@@ -1877,7 +1851,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 502
+              "lineNumber": 522
             },
             "deprecated": false,
             "returnComment": [],
@@ -1901,7 +1875,7 @@
                 ],
                 "source": {
                   "path": "src/core/public/application/types.ts",
-                  "lineNumber": 502
+                  "lineNumber": 522
                 },
                 "deprecated": false
               }
@@ -1910,6 +1884,96 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "core",
+        "id": "def-public.AppNavOptions",
+        "type": "Interface",
+        "tags": [],
+        "label": "AppNavOptions",
+        "description": [
+          "\nApp navigation menu options"
+        ],
+        "source": {
+          "path": "src/core/public/application/types.ts",
+          "lineNumber": 73
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "core",
+            "id": "def-public.AppNavOptions.order",
+            "type": "number",
+            "tags": [],
+            "label": "order",
+            "description": [
+              "\nAn ordinal used to sort nav links relative to one another for display."
+            ],
+            "signature": [
+              "number | undefined"
+            ],
+            "source": {
+              "path": "src/core/public/application/types.ts",
+              "lineNumber": 77
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "core",
+            "id": "def-public.AppNavOptions.tooltip",
+            "type": "string",
+            "tags": [],
+            "label": "tooltip",
+            "description": [
+              "\nA tooltip shown when hovering over app link."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "source": {
+              "path": "src/core/public/application/types.ts",
+              "lineNumber": 82
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "core",
+            "id": "def-public.AppNavOptions.euiIconType",
+            "type": "string",
+            "tags": [],
+            "label": "euiIconType",
+            "description": [
+              "\nA EUI iconType that will be used for the app's icon. This icon\ntakes precendence over the `icon` property."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "source": {
+              "path": "src/core/public/application/types.ts",
+              "lineNumber": 88
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "core",
+            "id": "def-public.AppNavOptions.icon",
+            "type": "string",
+            "tags": [],
+            "label": "icon",
+            "description": [
+              "\nA URL to an image file used as an icon. Used as a fallback\nif `euiIconType` is not provided."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "source": {
+              "path": "src/core/public/application/types.ts",
+              "lineNumber": 94
+            },
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "core",
         "id": "def-public.NavigateToAppOptions",
@@ -1921,10 +1985,28 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 661
+          "lineNumber": 683
         },
         "deprecated": false,
         "children": [
+          {
+            "parentPluginId": "core",
+            "id": "def-public.NavigateToAppOptions.deepLinkId",
+            "type": "string",
+            "tags": [],
+            "label": "deepLinkId",
+            "description": [
+              "\noptional {@link App.deepLinks | deep link} id inside the application to navigate to.\nIf an additional {@link NavigateToAppOptions.path | path} is defined it will be appended to the deep link path."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "source": {
+              "path": "src/core/public/application/types.ts",
+              "lineNumber": 688
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "core",
             "id": "def-public.NavigateToAppOptions.path",
@@ -1932,14 +2014,14 @@
             "tags": [],
             "label": "path",
             "description": [
-              "\noptional path inside application to deep link to.\nIf undefined, will use {@link App.defaultPath | the app's default path}` as default."
+              "\noptional path inside application to deep link to.\nIf undefined, will use {@link App.defaultPath | the app's default path} as default."
             ],
             "signature": [
               "string | undefined"
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 666
+              "lineNumber": 693
             },
             "deprecated": false
           },
@@ -1957,7 +2039,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 670
+              "lineNumber": 697
             },
             "deprecated": false
           },
@@ -1975,7 +2057,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 674
+              "lineNumber": 701
             },
             "deprecated": false
           },
@@ -1993,7 +2075,7 @@
             ],
             "source": {
               "path": "src/core/public/application/types.ts",
-              "lineNumber": 679
+              "lineNumber": 706
             },
             "deprecated": false
           }
@@ -2013,7 +2095,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 527
+          "lineNumber": 547
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2070,7 +2152,15 @@
             "section": "def-public.AppNavLinkStatus",
             "text": "AppNavLinkStatus"
           },
-          " | undefined; } & { path: string; deepLinks?: ",
+          " | undefined; searchable?: boolean | undefined; } & ",
+          {
+            "pluginId": "core",
+            "scope": "public",
+            "docId": "kibCoreApplicationPluginApi",
+            "section": "def-public.AppNavOptions",
+            "text": "AppNavOptions"
+          },
+          " & { path: string; deepLinks?: ",
           {
             "pluginId": "core",
             "scope": "public",
@@ -2086,7 +2176,15 @@
             "section": "def-public.AppNavLinkStatus",
             "text": "AppNavLinkStatus"
           },
-          " | undefined; } & { path?: string | undefined; deepLinks: ",
+          " | undefined; searchable?: boolean | undefined; } & ",
+          {
+            "pluginId": "core",
+            "scope": "public",
+            "docId": "kibCoreApplicationPluginApi",
+            "section": "def-public.AppNavOptions",
+            "text": "AppNavOptions"
+          },
+          " & { path?: string | undefined; deepLinks: ",
           {
             "pluginId": "core",
             "scope": "public",
@@ -2098,7 +2196,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 279
+          "lineNumber": 292
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2131,7 +2229,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 566
+          "lineNumber": 586
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2161,7 +2259,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 517
+          "lineNumber": 537
         },
         "deprecated": true,
         "references": [
@@ -2269,7 +2367,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 325
+          "lineNumber": 345
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2288,7 +2386,7 @@
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 333
+          "lineNumber": 353
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2319,7 +2417,7 @@
             "section": "def-public.AppDeepLink",
             "text": "AppDeepLink"
           },
-          "[] | undefined; navLinkStatus?: ",
+          "[] | undefined; searchable?: boolean | undefined; navLinkStatus?: ",
           {
             "pluginId": "core",
             "scope": "public",
@@ -2362,11 +2460,11 @@
             "section": "def-public.App",
             "text": "App"
           },
-          "<unknown>, \"status\" | \"deepLinks\" | \"navLinkStatus\" | \"defaultPath\" | \"tooltip\">> | undefined"
+          "<unknown>, \"status\" | \"deepLinks\" | \"searchable\" | \"navLinkStatus\" | \"defaultPath\" | \"tooltip\">> | undefined"
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 74
+          "lineNumber": 102
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2389,7 +2487,7 @@
             "section": "def-public.AppDeepLink",
             "text": "AppDeepLink"
           },
-          ", \"title\" | \"id\" | \"path\"> & { deepLinks: ",
+          ", \"title\" | \"id\" | \"order\" | \"path\" | \"tooltip\" | \"euiIconType\" | \"icon\"> & { deepLinks: ",
           {
             "pluginId": "core",
             "scope": "public",
@@ -2405,11 +2503,11 @@
             "section": "def-public.AppNavLinkStatus",
             "text": "AppNavLinkStatus"
           },
-          "; }"
+          "; searchable: boolean; }"
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 262
+          "lineNumber": 274
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2432,7 +2530,7 @@
             "section": "def-public.App",
             "text": "App"
           },
-          "<unknown>, \"status\" | \"title\" | \"id\" | \"order\" | \"category\" | \"navLinkStatus\" | \"defaultPath\" | \"tooltip\" | \"euiIconType\" | \"icon\" | \"capabilities\" | \"chromeless\" | \"appRoute\" | \"exactRoute\"> & { status: ",
+          "<unknown>, \"status\" | \"title\" | \"id\" | \"order\" | \"category\" | \"navLinkStatus\" | \"defaultPath\" | \"capabilities\" | \"chromeless\" | \"appRoute\" | \"exactRoute\" | \"tooltip\" | \"euiIconType\" | \"icon\"> & { status: ",
           {
             "pluginId": "core",
             "scope": "public",
@@ -2456,11 +2554,11 @@
             "section": "def-public.PublicAppDeepLinkInfo",
             "text": "PublicAppDeepLinkInfo"
           },
-          "[]; }"
+          "[]; searchable: boolean; }"
         ],
         "source": {
           "path": "src/core/public/application/types.ts",
-          "lineNumber": 308
+          "lineNumber": 324
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/core_chrome.json b/api_docs/core_chrome.json
index fae65ff62c971..c84b06c235b48 100644
--- a/api_docs/core_chrome.json
+++ b/api_docs/core_chrome.json
@@ -965,14 +965,11 @@
             "tags": [],
             "label": "url",
             "description": [
-              "\nThe route used to open the {@link AppBase.defaultPath | default path } of an application.\nIf unset, `baseUrl` will be used instead."
-            ],
-            "signature": [
-              "string | undefined"
+              "\nThe route used to open the default path and the deep links of an application."
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 39
+              "lineNumber": 38
             },
             "deprecated": false
           },
@@ -990,7 +987,7 @@
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 44
+              "lineNumber": 43
             },
             "deprecated": false
           },
@@ -1008,7 +1005,7 @@
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 49
+              "lineNumber": 48
             },
             "deprecated": false
           },
@@ -1026,7 +1023,7 @@
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 55
+              "lineNumber": 54
             },
             "deprecated": false
           },
@@ -1044,7 +1041,7 @@
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 61
+              "lineNumber": 60
             },
             "deprecated": false
           },
@@ -1059,7 +1056,7 @@
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 66
+              "lineNumber": 65
             },
             "deprecated": false
           },
@@ -1077,7 +1074,7 @@
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 75
+              "lineNumber": 74
             },
             "deprecated": false
           },
@@ -1095,7 +1092,7 @@
             ],
             "source": {
               "path": "src/core/public/chrome/nav_links/nav_link.ts",
-              "lineNumber": 80
+              "lineNumber": 79
             },
             "deprecated": false
           }
diff --git a/api_docs/core_saved_objects.json b/api_docs/core_saved_objects.json
index adf0612a28faf..bd7a9cb1ccb08 100644
--- a/api_docs/core_saved_objects.json
+++ b/api_docs/core_saved_objects.json
@@ -4759,7 +4759,7 @@
         "description": [],
         "source": {
           "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-          "lineNumber": 36
+          "lineNumber": 35
         },
         "deprecated": false,
         "children": [
@@ -5075,7 +5075,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-              "lineNumber": 37
+              "lineNumber": 36
             },
             "deprecated": false
           },
@@ -5099,7 +5099,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-              "lineNumber": 38
+              "lineNumber": 37
             },
             "deprecated": false
           },
@@ -5112,7 +5112,7 @@
             "description": [],
             "source": {
               "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-              "lineNumber": 39
+              "lineNumber": 38
             },
             "deprecated": false
           },
@@ -5128,7 +5128,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-              "lineNumber": 40
+              "lineNumber": 39
             },
             "deprecated": false
           },
@@ -5144,7 +5144,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-              "lineNumber": 42
+              "lineNumber": 41
             },
             "deprecated": false,
             "children": [
@@ -5157,7 +5157,7 @@
                 "description": [],
                 "source": {
                   "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-                  "lineNumber": 47
+                  "lineNumber": 46
                 },
                 "deprecated": false,
                 "children": [
@@ -5473,7 +5473,7 @@
                     ],
                     "source": {
                       "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-                      "lineNumber": 48
+                      "lineNumber": 47
                     },
                     "deprecated": false
                   },
@@ -5521,7 +5521,7 @@
                     ],
                     "source": {
                       "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-                      "lineNumber": 49
+                      "lineNumber": 48
                     },
                     "deprecated": false
                   },
@@ -5534,7 +5534,7 @@
                     "description": [],
                     "source": {
                       "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-                      "lineNumber": 50
+                      "lineNumber": 49
                     },
                     "deprecated": false
                   },
@@ -5550,7 +5550,7 @@
                     ],
                     "source": {
                       "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-                      "lineNumber": 51
+                      "lineNumber": 50
                     },
                     "deprecated": false
                   }
@@ -5585,7 +5585,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-              "lineNumber": 74
+              "lineNumber": 73
             },
             "deprecated": false,
             "children": [
@@ -5607,7 +5607,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-                  "lineNumber": 74
+                  "lineNumber": 73
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5641,7 +5641,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-              "lineNumber": 93
+              "lineNumber": 92
             },
             "deprecated": false,
             "children": [
@@ -5663,7 +5663,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-                  "lineNumber": 93
+                  "lineNumber": 92
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7575,7 +7575,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 697
+              "lineNumber": 696
             },
             "deprecated": false,
             "children": [
@@ -7591,7 +7591,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 698
+                  "lineNumber": 697
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7614,7 +7614,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 699
+                  "lineNumber": 698
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7667,7 +7667,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 759
+              "lineNumber": 758
             },
             "deprecated": false,
             "children": [
@@ -7689,7 +7689,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 760
+                  "lineNumber": 759
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7739,7 +7739,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 926
+              "lineNumber": 925
             },
             "deprecated": false,
             "children": [
@@ -7764,7 +7764,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 927
+                  "lineNumber": 926
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7787,7 +7787,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 928
+                  "lineNumber": 927
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7823,7 +7823,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1013
+              "lineNumber": 1012
             },
             "deprecated": false,
             "children": [
@@ -7839,7 +7839,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1014
+                  "lineNumber": 1013
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7856,7 +7856,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1015
+                  "lineNumber": 1014
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7879,7 +7879,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1016
+                  "lineNumber": 1015
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7921,7 +7921,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1055
+              "lineNumber": 1054
             },
             "deprecated": false,
             "children": [
@@ -7937,7 +7937,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1056
+                  "lineNumber": 1055
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7954,7 +7954,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1057
+                  "lineNumber": 1056
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7977,7 +7977,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1058
+                  "lineNumber": 1057
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8021,7 +8021,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1185
+              "lineNumber": 1184
             },
             "deprecated": false,
             "children": [
@@ -8037,7 +8037,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1186
+                  "lineNumber": 1185
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8054,7 +8054,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1187
+                  "lineNumber": 1186
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8071,7 +8071,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1188
+                  "lineNumber": 1187
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8095,7 +8095,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1189
+                  "lineNumber": 1188
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8141,7 +8141,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1283
+              "lineNumber": 1282
             },
             "deprecated": false,
             "children": [
@@ -8166,7 +8166,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1284
+                  "lineNumber": 1283
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8190,7 +8190,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1285
+                  "lineNumber": 1284
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -8236,7 +8236,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1307
+              "lineNumber": 1306
             },
             "deprecated": false,
             "children": [
@@ -8259,7 +8259,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1308
+                  "lineNumber": 1307
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8276,7 +8276,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1309
+                  "lineNumber": 1308
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8293,7 +8293,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1310
+                  "lineNumber": 1309
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8317,7 +8317,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1311
+                  "lineNumber": 1310
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -8366,7 +8366,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1334
+              "lineNumber": 1333
             },
             "deprecated": false,
             "children": [
@@ -8391,7 +8391,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1335
+                  "lineNumber": 1334
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8414,7 +8414,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1336
+                  "lineNumber": 1335
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8454,7 +8454,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1551
+              "lineNumber": 1550
             },
             "deprecated": false,
             "children": [
@@ -8470,7 +8470,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1552
+                  "lineNumber": 1551
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8487,7 +8487,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1553
+                  "lineNumber": 1552
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8510,7 +8510,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1554
+                  "lineNumber": 1553
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8550,7 +8550,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1662
+              "lineNumber": 1661
             },
             "deprecated": false,
             "children": [
@@ -8568,7 +8568,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1663
+                  "lineNumber": 1662
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8587,7 +8587,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1664
+                  "lineNumber": 1663
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8614,7 +8614,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1665
+                  "lineNumber": 1664
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8640,7 +8640,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1666
+                  "lineNumber": 1665
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8683,7 +8683,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1822
+              "lineNumber": 1821
             },
             "deprecated": false,
             "children": [
@@ -8699,7 +8699,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1823
+                  "lineNumber": 1822
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8722,7 +8722,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1824
+                  "lineNumber": 1823
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8762,7 +8762,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1895
+              "lineNumber": 1890
             },
             "deprecated": false,
             "children": [
@@ -8778,7 +8778,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1896
+                  "lineNumber": 1891
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8804,7 +8804,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1897
+                  "lineNumber": 1892
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -8852,7 +8852,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/service/lib/repository.ts",
-              "lineNumber": 1951
+              "lineNumber": 1946
             },
             "deprecated": false,
             "children": [
@@ -8876,7 +8876,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1952
+                  "lineNumber": 1947
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8900,7 +8900,7 @@
                 ],
                 "source": {
                   "path": "src/core/server/saved_objects/service/lib/repository.ts",
-                  "lineNumber": 1953
+                  "lineNumber": 1948
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -11724,207 +11724,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "core",
-        "id": "def-server.SavedObjectsComplexFieldMapping",
-        "type": "Interface",
-        "tags": [],
-        "label": "SavedObjectsComplexFieldMapping",
-        "description": [
-          "\nSee {@link SavedObjectsFieldMapping} for documentation.\n"
-        ],
-        "source": {
-          "path": "src/core/server/saved_objects/mappings/types.ts",
-          "lineNumber": 141
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsComplexFieldMapping.dynamic",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "dynamic",
-            "description": [
-              "\nThe dynamic property of the mapping, either `false` or `'strict'`. If\nunspecified `dynamic: 'strict'` will be inherited from the top-level\nindex mappings.\n\nNote: To limit the number of mapping fields Saved Object types should\n*never* use `dynamic: true`."
-            ],
-            "signature": [
-              "false | \"strict\" | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 150
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsComplexFieldMapping.enabled",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "enabled",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 151
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsComplexFieldMapping.doc_values",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "doc_values",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 152
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsComplexFieldMapping.type",
-            "type": "string",
-            "tags": [],
-            "label": "type",
-            "description": [],
-            "signature": [
-              "string | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 153
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsComplexFieldMapping.properties",
-            "type": "Object",
-            "tags": [],
-            "label": "properties",
-            "description": [],
-            "signature": [
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreSavedObjectsPluginApi",
-                "section": "def-server.SavedObjectsMappingProperties",
-                "text": "SavedObjectsMappingProperties"
-              }
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 154
-            },
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "core",
-        "id": "def-server.SavedObjectsCoreFieldMapping",
-        "type": "Interface",
-        "tags": [],
-        "label": "SavedObjectsCoreFieldMapping",
-        "description": [
-          "\nSee {@link SavedObjectsFieldMapping} for documentation.\n"
-        ],
-        "source": {
-          "path": "src/core/server/saved_objects/mappings/types.ts",
-          "lineNumber": 123
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsCoreFieldMapping.type",
-            "type": "string",
-            "tags": [],
-            "label": "type",
-            "description": [],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 124
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsCoreFieldMapping.null_value",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "null_value",
-            "description": [],
-            "signature": [
-              "string | number | boolean | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 125
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsCoreFieldMapping.index",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "index",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 126
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsCoreFieldMapping.doc_values",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "doc_values",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 127
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "core",
-            "id": "def-server.SavedObjectsCoreFieldMapping.fields",
-            "type": "Object",
-            "tags": [],
-            "label": "fields",
-            "description": [],
-            "signature": [
-              "{ [subfield: string]: { type: string; ignore_above?: number | undefined; }; } | undefined"
-            ],
-            "source": {
-              "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 128
-            },
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "core",
         "id": "def-server.SavedObjectsCreateOptions",
@@ -12867,7 +12666,7 @@
             ],
             "signature": [
               "Record<string, ",
-              "AggregationContainer",
+              "AggregationsAggregationContainer",
               "> | undefined"
             ],
             "source": {
@@ -14372,7 +14171,7 @@
         ],
         "source": {
           "path": "src/core/server/saved_objects/mappings/types.ts",
-          "lineNumber": 87
+          "lineNumber": 88
         },
         "deprecated": false,
         "children": [
@@ -14388,7 +14187,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 88
+              "lineNumber": 89
             },
             "deprecated": false
           }
@@ -14507,15 +14306,15 @@
               {
                 "plugin": "lens",
                 "link": {
-                  "path": "x-pack/plugins/lens/server/migrations.ts",
-                  "lineNumber": 245
+                  "path": "x-pack/plugins/lens/server/migrations/saved_object_migrations.ts",
+                  "lineNumber": 167
                 }
               },
               {
                 "plugin": "lens",
                 "link": {
-                  "path": "x-pack/plugins/lens/server/migrations.ts",
-                  "lineNumber": 312
+                  "path": "x-pack/plugins/lens/server/migrations/saved_object_migrations.ts",
+                  "lineNumber": 234
                 }
               }
             ],
@@ -16944,7 +16743,7 @@
         ],
         "source": {
           "path": "src/core/server/saved_objects/mappings/types.ts",
-          "lineNumber": 36
+          "lineNumber": 37
         },
         "deprecated": false,
         "children": [
@@ -16962,7 +16761,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 40
+              "lineNumber": 41
             },
             "deprecated": false
           },
@@ -16986,7 +16785,7 @@
             ],
             "source": {
               "path": "src/core/server/saved_objects/mappings/types.ts",
-              "lineNumber": 42
+              "lineNumber": 43
             },
             "deprecated": false
           }
@@ -17426,7 +17225,7 @@
         ],
         "source": {
           "path": "src/core/server/saved_objects/export/saved_objects_exporter.ts",
-          "lineNumber": 31
+          "lineNumber": 30
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -18404,7 +18203,7 @@
         "description": [],
         "signature": [
           "{ type: string | string[]; filter?: any; aggs?: Record<string, ",
-          "AggregationContainer",
+          "AggregationsAggregationContainer",
           "> | undefined; fields?: string[] | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | \"_doc\" | undefined; search?: string | undefined; searchFields?: string[] | undefined; rootSearchFields?: string[] | undefined; hasReference?: ",
           {
             "pluginId": "core",
@@ -18473,25 +18272,81 @@
           "\nDescribe a {@link SavedObjectsTypeMappingDefinition | saved object type mapping} field.\n\nPlease refer to {@link https://www.elastic.co/guide/en/elasticsearch/reference/current/mapping-types.html | elasticsearch documentation}\nFor the mapping documentation\n"
         ],
         "signature": [
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCoreSavedObjectsPluginApi",
-            "section": "def-server.SavedObjectsComplexFieldMapping",
-            "text": "SavedObjectsComplexFieldMapping"
-          },
-          " | ",
-          {
-            "pluginId": "core",
-            "scope": "server",
-            "docId": "kibCoreSavedObjectsPluginApi",
-            "section": "def-server.SavedObjectsCoreFieldMapping",
-            "text": "SavedObjectsCoreFieldMapping"
-          }
+          "(",
+          "MappingFlattenedProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingJoinProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingPercolatorProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingRankFeatureProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingRankFeaturesProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingConstantKeywordProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingFieldAliasProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingHistogramProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingObjectProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingNestedProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingSearchAsYouTypeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingTextProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingBinaryProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingBooleanProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingDateProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingDateNanosProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingKeywordProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingNumberProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingLongRangeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingIpRangeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingIntegerRangeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingFloatRangeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingDoubleRangeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingDateRangeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingGeoPointProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingGeoShapeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingCompletionProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingGenericProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingIpProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingMurmur3HashProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingShapeProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingTokenCountProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingVersionProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingWildcardProperty",
+          " & { dynamic?: false | \"strict\" | undefined; }) | (",
+          "MappingPointProperty",
+          " & { dynamic?: false | \"strict\" | undefined; })"
         ],
         "source": {
           "path": "src/core/server/saved_objects/mappings/types.ts",
-          "lineNumber": 99
+          "lineNumber": 100
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/dashboard.json b/api_docs/dashboard.json
index 9c3dccb95bc07..821d298ea1309 100644
--- a/api_docs/dashboard.json
+++ b/api_docs/dashboard.json
@@ -47,7 +47,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-          "lineNumber": 105
+          "lineNumber": 87
         },
         "deprecated": false,
         "children": [
@@ -63,31 +63,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 106
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "dashboard",
-            "id": "def-public.DashboardContainer.switchViewMode",
-            "type": "Function",
-            "tags": [],
-            "label": "switchViewMode",
-            "description": [],
-            "signature": [
-              "((newViewMode: ",
-              {
-                "pluginId": "embeddable",
-                "scope": "common",
-                "docId": "kibEmbeddablePluginApi",
-                "section": "def-common.ViewMode",
-                "text": "ViewMode"
-              },
-              ") => void) | undefined"
-            ],
-            "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 107
+              "lineNumber": 88
             },
             "deprecated": false
           },
@@ -103,7 +79,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 109
+              "lineNumber": 90
             },
             "deprecated": false,
             "children": [],
@@ -121,7 +97,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 113
+              "lineNumber": 94
             },
             "deprecated": false,
             "children": [
@@ -143,7 +119,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 114
+                  "lineNumber": 95
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -160,7 +136,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 115
+                  "lineNumber": 96
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -200,7 +176,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 116
+                  "lineNumber": 97
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -248,7 +224,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 129
+              "lineNumber": 110
             },
             "deprecated": false,
             "children": [
@@ -273,7 +249,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 133
+                  "lineNumber": 114
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -290,7 +266,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 134
+                  "lineNumber": 115
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -322,7 +298,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 140
+              "lineNumber": 122
             },
             "deprecated": false,
             "children": [
@@ -346,7 +322,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 141
+                  "lineNumber": 123
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -364,7 +340,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 142
+                  "lineNumber": 124
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -381,7 +357,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 143
+                  "lineNumber": 125
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -419,7 +395,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 181
+              "lineNumber": 164
             },
             "deprecated": false,
             "children": [
@@ -444,7 +420,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 182
+                  "lineNumber": 165
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -469,7 +445,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 183
+                  "lineNumber": 166
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -486,7 +462,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 184
+                  "lineNumber": 167
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -562,7 +538,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 228
+              "lineNumber": 211
             },
             "deprecated": false,
             "children": [
@@ -578,7 +554,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 232
+                  "lineNumber": 215
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -595,7 +571,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 232
+                  "lineNumber": 215
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -612,7 +588,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 232
+                  "lineNumber": 215
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -632,7 +608,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 246
+              "lineNumber": 229
             },
             "deprecated": false,
             "children": [
@@ -648,7 +624,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 246
+                  "lineNumber": 229
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -669,7 +645,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 259
+              "lineNumber": 242
             },
             "deprecated": false,
             "children": [
@@ -685,7 +661,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-                  "lineNumber": 259
+                  "lineNumber": 242
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -749,7 +725,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-          "lineNumber": 34
+          "lineNumber": 32
         },
         "deprecated": false,
         "children": [
@@ -765,7 +741,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 37
+              "lineNumber": 35
             },
             "deprecated": false
           },
@@ -781,7 +757,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 38
+              "lineNumber": 36
             },
             "deprecated": false
           },
@@ -797,7 +773,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 40
+              "lineNumber": 38
             },
             "deprecated": false,
             "children": [
@@ -815,7 +791,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-                  "lineNumber": 41
+                  "lineNumber": 39
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -838,7 +814,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-                  "lineNumber": 42
+                  "lineNumber": 40
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -858,7 +834,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 45
+              "lineNumber": 43
             },
             "deprecated": false,
             "children": [],
@@ -876,7 +852,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 50
+              "lineNumber": 48
             },
             "deprecated": false,
             "children": [],
@@ -902,7 +878,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 56
+              "lineNumber": 54
             },
             "deprecated": false,
             "children": [],
@@ -968,7 +944,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 66
+              "lineNumber": 64
             },
             "deprecated": false,
             "children": [
@@ -990,7 +966,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-                  "lineNumber": 67
+                  "lineNumber": 65
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1030,7 +1006,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-                  "lineNumber": 68
+                  "lineNumber": 66
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -1067,7 +1043,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 74
+              "lineNumber": 72
             },
             "deprecated": false,
             "returnComment": [],
@@ -1137,7 +1113,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx",
-              "lineNumber": 76
+              "lineNumber": 74
             },
             "deprecated": false,
             "returnComment": [],
@@ -1177,7 +1153,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/public/dashboard_constants.ts",
-          "lineNumber": 22
+          "lineNumber": 24
         },
         "deprecated": false,
         "children": [
@@ -1193,7 +1169,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/dashboard_constants.ts",
-              "lineNumber": 22
+              "lineNumber": 24
             },
             "deprecated": false,
             "isRequired": false
@@ -1210,7 +1186,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/dashboard_constants.ts",
-              "lineNumber": 22
+              "lineNumber": 24
             },
             "deprecated": false,
             "isRequired": false
@@ -1308,8 +1284,8 @@
           "<{}>"
         ],
         "source": {
-          "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-          "lineNumber": 43
+          "path": "src/plugins/dashboard/public/types.ts",
+          "lineNumber": 72
         },
         "deprecated": false,
         "children": [
@@ -1321,12 +1297,12 @@
             "label": "dashboardCapabilities",
             "description": [],
             "signature": [
-              "DashboardCapabilities",
+              "DashboardAppCapabilities",
               " | undefined"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 44
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 73
             },
             "deprecated": false
           },
@@ -1348,8 +1324,8 @@
               " | undefined"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 45
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 74
             },
             "deprecated": false
           },
@@ -1364,8 +1340,8 @@
               "boolean | undefined"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 46
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 75
             },
             "deprecated": false
           },
@@ -1377,8 +1353,8 @@
             "label": "isFullScreenMode",
             "description": [],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 47
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 76
             },
             "deprecated": false
           },
@@ -1393,8 +1369,8 @@
               "string | undefined"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 48
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 77
             },
             "deprecated": false
           },
@@ -1409,8 +1385,8 @@
               "{ from: string; to: string; mode?: \"absolute\" | \"relative\" | undefined; }"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 49
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 78
             },
             "deprecated": false
           },
@@ -1425,8 +1401,8 @@
               "string | undefined"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 50
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 79
             },
             "deprecated": false
           },
@@ -1438,8 +1414,8 @@
             "label": "useMargins",
             "description": [],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 51
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 80
             },
             "deprecated": false
           },
@@ -1454,8 +1430,8 @@
               "boolean | undefined"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 52
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 81
             },
             "deprecated": false
           },
@@ -1476,8 +1452,8 @@
               }
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 53
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 82
             },
             "deprecated": false
           },
@@ -1499,8 +1475,8 @@
               "[]"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 54
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 83
             },
             "deprecated": false
           },
@@ -1512,8 +1488,8 @@
             "label": "title",
             "description": [],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 55
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 84
             },
             "deprecated": false
           },
@@ -1528,8 +1504,8 @@
               "{ query: string | { [key: string]: any; }; language: string; }"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 56
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 85
             },
             "deprecated": false
           },
@@ -1554,8 +1530,8 @@
               " & { [k: string]: unknown; }>; }"
             ],
             "source": {
-              "path": "src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx",
-              "lineNumber": 57
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 86
             },
             "deprecated": false
           }
@@ -1571,7 +1547,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/dashboard/public/plugin.tsx",
-          "lineNumber": 91
+          "lineNumber": 92
         },
         "deprecated": false,
         "children": [
@@ -1584,7 +1560,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/dashboard/public/plugin.tsx",
-              "lineNumber": 92
+              "lineNumber": 93
             },
             "deprecated": false
           }
@@ -1617,7 +1593,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-          "lineNumber": 18
+          "lineNumber": 19
         },
         "deprecated": false,
         "children": [
@@ -1633,7 +1609,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 19
+              "lineNumber": 20
             },
             "deprecated": false
           },
@@ -1646,7 +1622,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 20
+              "lineNumber": 21
             },
             "deprecated": false
           },
@@ -1662,7 +1638,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 21
+              "lineNumber": 22
             },
             "deprecated": false
           },
@@ -1678,7 +1654,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 22
+              "lineNumber": 23
             },
             "deprecated": false
           },
@@ -1694,7 +1670,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 23
+              "lineNumber": 24
             },
             "deprecated": false
           },
@@ -1707,7 +1683,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 24
+              "lineNumber": 25
             },
             "deprecated": false
           },
@@ -1723,7 +1699,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 25
+              "lineNumber": 26
             },
             "deprecated": false
           },
@@ -1739,7 +1715,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 27
+              "lineNumber": 28
             },
             "deprecated": false
           },
@@ -1752,7 +1728,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 28
+              "lineNumber": 29
             },
             "deprecated": false
           },
@@ -1775,7 +1751,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 29
+              "lineNumber": 30
             },
             "deprecated": false
           },
@@ -1967,7 +1943,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 30
+              "lineNumber": 31
             },
             "deprecated": false
           },
@@ -1990,7 +1966,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 31
+              "lineNumber": 32
             },
             "deprecated": false,
             "children": [],
@@ -2016,7 +1992,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 32
+              "lineNumber": 33
             },
             "deprecated": false,
             "children": [],
@@ -2034,7 +2010,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 33
+              "lineNumber": 34
             },
             "deprecated": false,
             "returnComment": [],
@@ -2051,7 +2027,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-                  "lineNumber": 33
+                  "lineNumber": 34
                 },
                 "deprecated": false
               }
@@ -2372,7 +2348,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/public/plugin.tsx",
-          "lineNumber": 89
+          "lineNumber": 90
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2399,7 +2375,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 38
+          "lineNumber": 46
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2522,6 +2498,32 @@
               "lineNumber": 19
             },
             "deprecated": false
+          },
+          {
+            "parentPluginId": "dashboard",
+            "id": "def-public.DashboardConstants.CHANGE_CHECK_DEBOUNCE",
+            "type": "number",
+            "tags": [],
+            "label": "CHANGE_CHECK_DEBOUNCE",
+            "description": [],
+            "source": {
+              "path": "src/plugins/dashboard/public/dashboard_constants.ts",
+              "lineNumber": 20
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "dashboard",
+            "id": "def-public.DashboardConstants.CHANGE_APPLY_DEBOUNCE",
+            "type": "number",
+            "tags": [],
+            "label": "CHANGE_APPLY_DEBOUNCE",
+            "description": [],
+            "source": {
+              "path": "src/plugins/dashboard/public/dashboard_constants.ts",
+              "lineNumber": 21
+            },
+            "deprecated": false
           }
         ],
         "initialIsOpen": false
@@ -2539,7 +2541,7 @@
       ],
       "source": {
         "path": "src/plugins/dashboard/public/plugin.tsx",
-        "lineNumber": 123
+        "lineNumber": 124
       },
       "deprecated": false,
       "lifecycle": "setup",
@@ -2554,7 +2556,7 @@
       "description": [],
       "source": {
         "path": "src/plugins/dashboard/public/plugin.tsx",
-        "lineNumber": 125
+        "lineNumber": 126
       },
       "deprecated": false,
       "children": [
@@ -2577,7 +2579,7 @@
           ],
           "source": {
             "path": "src/plugins/dashboard/public/plugin.tsx",
-            "lineNumber": 126
+            "lineNumber": 127
           },
           "deprecated": false,
           "returnComment": [],
@@ -2595,7 +2597,7 @@
           ],
           "source": {
             "path": "src/plugins/dashboard/public/plugin.tsx",
-            "lineNumber": 127
+            "lineNumber": 128
           },
           "deprecated": false,
           "returnComment": [],
@@ -2620,7 +2622,7 @@
           ],
           "source": {
             "path": "src/plugins/dashboard/public/plugin.tsx",
-            "lineNumber": 130
+            "lineNumber": 131
           },
           "deprecated": false
         },
@@ -2642,7 +2644,7 @@
           ],
           "source": {
             "path": "src/plugins/dashboard/public/plugin.tsx",
-            "lineNumber": 131
+            "lineNumber": 132
           },
           "deprecated": false
         }
@@ -2983,7 +2985,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 91
+          "lineNumber": 99
         },
         "deprecated": false,
         "children": [
@@ -3009,7 +3011,7 @@
             ],
             "source": {
               "path": "src/plugins/dashboard/common/types.ts",
-              "lineNumber": 92
+              "lineNumber": 100
             },
             "deprecated": false
           }
@@ -3184,7 +3186,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 64
+          "lineNumber": 72
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -3203,7 +3205,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 56
+          "lineNumber": 64
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -3222,7 +3224,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 48
+          "lineNumber": 56
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -3241,7 +3243,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 40
+          "lineNumber": 48
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -3266,7 +3268,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 81
+          "lineNumber": 89
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -3285,7 +3287,7 @@
         ],
         "source": {
           "path": "src/plugins/dashboard/common/types.ts",
-          "lineNumber": 72
+          "lineNumber": 80
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/dashboard_enhanced.json b/api_docs/dashboard_enhanced.json
index 30daac1b26395..b1ce19250a597 100644
--- a/api_docs/dashboard_enhanced.json
+++ b/api_docs/dashboard_enhanced.json
@@ -684,6 +684,8 @@
               },
               ") => void; } & { urlGenerators: ",
               "UrlGeneratorsSetup",
+              "; url: ",
+              "UrlService",
               "; }"
             ],
             "source": {
@@ -792,6 +794,8 @@
               },
               ") => void; } & { urlGenerators: ",
               "UrlGeneratorsStart",
+              "; url: ",
+              "UrlService",
               "; }"
             ],
             "source": {
diff --git a/api_docs/data.json b/api_docs/data.json
index 1ba62ea994654..2f9e74584603f 100644
--- a/api_docs/data.json
+++ b/api_docs/data.json
@@ -11,7 +11,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 55
+          "lineNumber": 57
         },
         "deprecated": false,
         "children": [
@@ -31,7 +31,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 63
+              "lineNumber": 65
             },
             "deprecated": false,
             "children": [
@@ -49,7 +49,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 63
+                  "lineNumber": 65
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -83,7 +83,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 83
+              "lineNumber": 85
             },
             "deprecated": false,
             "children": [
@@ -106,7 +106,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 83
+                  "lineNumber": 85
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -134,7 +134,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 92
+              "lineNumber": 94
             },
             "deprecated": false
           },
@@ -147,7 +147,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 93
+              "lineNumber": 95
             },
             "deprecated": false
           },
@@ -160,7 +160,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 94
+              "lineNumber": 96
             },
             "deprecated": false
           },
@@ -176,7 +176,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 95
+              "lineNumber": 97
             },
             "deprecated": false
           },
@@ -199,7 +199,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 96
+              "lineNumber": 98
             },
             "deprecated": false
           },
@@ -215,7 +215,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 97
+              "lineNumber": 99
             },
             "deprecated": false
           },
@@ -231,7 +231,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 98
+              "lineNumber": 100
             },
             "deprecated": false
           },
@@ -247,7 +247,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 104
+              "lineNumber": 106
             },
             "deprecated": false,
             "children": [
@@ -269,7 +269,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 104
+                  "lineNumber": 106
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -304,7 +304,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 104
+                  "lineNumber": 106
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -328,7 +328,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 134
+              "lineNumber": 136
             },
             "deprecated": false,
             "children": [
@@ -346,7 +346,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 134
+                  "lineNumber": 136
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -366,7 +366,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 171
+              "lineNumber": 173
             },
             "deprecated": false,
             "children": [
@@ -382,7 +382,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 171
+                  "lineNumber": 173
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -390,6 +390,42 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfig.hasTimeShift",
+            "type": "Function",
+            "tags": [],
+            "label": "hasTimeShift",
+            "description": [],
+            "signature": [
+              "() => boolean"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_config.ts",
+              "lineNumber": 177
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfig.getTimeShift",
+            "type": "Function",
+            "tags": [],
+            "label": "getTimeShift",
+            "description": [],
+            "signature": [
+              "() => moment.Duration | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_config.ts",
+              "lineNumber": 181
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-public.AggConfig.write",
@@ -410,7 +446,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 175
+              "lineNumber": 202
             },
             "deprecated": false,
             "children": [
@@ -433,7 +469,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 175
+                  "lineNumber": 202
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -453,7 +489,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 179
+              "lineNumber": 206
             },
             "deprecated": false,
             "children": [],
@@ -471,7 +507,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 183
+              "lineNumber": 210
             },
             "deprecated": false,
             "children": [
@@ -487,7 +523,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 183
+                  "lineNumber": 210
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -504,7 +540,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 183
+                  "lineNumber": 210
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -544,7 +580,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 209
+              "lineNumber": 236
             },
             "deprecated": false,
             "children": [
@@ -568,7 +604,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 209
+                  "lineNumber": 236
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -592,7 +628,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 209
+                  "lineNumber": 236
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -624,7 +660,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 230
+              "lineNumber": 257
             },
             "deprecated": false,
             "children": [
@@ -649,7 +685,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 230
+                  "lineNumber": 257
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -673,7 +709,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 265
+              "lineNumber": 292
             },
             "deprecated": false,
             "children": [],
@@ -697,7 +733,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 296
+              "lineNumber": 323
             },
             "deprecated": true,
             "references": [
@@ -726,7 +762,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 307
+              "lineNumber": 334
             },
             "deprecated": false,
             "children": [],
@@ -752,7 +788,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 316
+              "lineNumber": 343
             },
             "deprecated": false,
             "children": [],
@@ -788,7 +824,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 371
+              "lineNumber": 398
             },
             "deprecated": false,
             "children": [],
@@ -814,7 +850,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 375
+              "lineNumber": 402
             },
             "deprecated": false,
             "children": [],
@@ -840,7 +876,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 379
+              "lineNumber": 406
             },
             "deprecated": false,
             "children": [],
@@ -858,7 +894,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 383
+              "lineNumber": 410
             },
             "deprecated": false,
             "children": [
@@ -874,7 +910,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 383
+                  "lineNumber": 410
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -894,7 +930,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 387
+              "lineNumber": 414
             },
             "deprecated": false,
             "children": [
@@ -910,7 +946,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 387
+                  "lineNumber": 414
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -927,7 +963,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 387
+                  "lineNumber": 414
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -947,7 +983,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 395
+              "lineNumber": 422
             },
             "deprecated": false,
             "children": [],
@@ -965,7 +1001,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 401
+              "lineNumber": 428
             },
             "deprecated": false,
             "children": [],
@@ -985,7 +1021,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 410
+              "lineNumber": 437
             },
             "deprecated": false,
             "children": [],
@@ -1003,7 +1039,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 414
+              "lineNumber": 441
             },
             "deprecated": false,
             "children": [
@@ -1019,7 +1055,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 414
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1046,7 +1082,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 428
+              "lineNumber": 455
             },
             "deprecated": false,
             "children": [],
@@ -1072,7 +1108,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 432
+              "lineNumber": 459
             },
             "deprecated": false,
             "children": [],
@@ -1090,7 +1126,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 436
+              "lineNumber": 463
             },
             "deprecated": false,
             "children": [],
@@ -1108,7 +1144,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 441
+              "lineNumber": 468
             },
             "deprecated": false,
             "children": [],
@@ -1157,7 +1193,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 452
+              "lineNumber": 479
             },
             "deprecated": false
           },
@@ -1204,7 +1240,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 456
+              "lineNumber": 483
             },
             "deprecated": false
           },
@@ -1228,7 +1264,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 486
+              "lineNumber": 513
             },
             "deprecated": false,
             "children": [
@@ -1250,7 +1286,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 486
+                  "lineNumber": 513
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1270,7 +1306,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-          "lineNumber": 65
+          "lineNumber": 78
         },
         "deprecated": false,
         "children": [
@@ -1292,7 +1328,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 66
+              "lineNumber": 79
             },
             "deprecated": false
           },
@@ -1315,7 +1351,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 67
+              "lineNumber": 80
             },
             "deprecated": false
           },
@@ -1331,7 +1367,23 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 68
+              "lineNumber": 81
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfigs.forceNow",
+            "type": "Object",
+            "tags": [],
+            "label": "forceNow",
+            "description": [],
+            "signature": [
+              "Date | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 82
             },
             "deprecated": false
           },
@@ -1347,7 +1399,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 69
+              "lineNumber": 83
             },
             "deprecated": false
           },
@@ -1370,7 +1422,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 73
+              "lineNumber": 87
             },
             "deprecated": false
           },
@@ -1386,7 +1438,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 75
+              "lineNumber": 89
             },
             "deprecated": false,
             "children": [
@@ -1408,7 +1460,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 76
+                  "lineNumber": 90
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1443,7 +1495,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 77
+                  "lineNumber": 91
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1466,7 +1518,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 78
+                  "lineNumber": 92
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1486,7 +1538,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 91
+              "lineNumber": 105
             },
             "deprecated": false,
             "children": [
@@ -1502,7 +1554,43 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 91
+                  "lineNumber": 105
+                },
+                "deprecated": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfigs.setForceNow",
+            "type": "Function",
+            "tags": [],
+            "label": "setForceNow",
+            "description": [],
+            "signature": [
+              "(now: Date | undefined) => void"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 109
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-public.AggConfigs.setForceNow.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "now",
+                "description": [],
+                "signature": [
+                  "Date | undefined"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+                  "lineNumber": 109
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -1530,7 +1618,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 95
+              "lineNumber": 113
             },
             "deprecated": false,
             "children": [
@@ -1552,7 +1640,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 95
+                  "lineNumber": 113
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1579,7 +1667,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 113
+              "lineNumber": 131
             },
             "deprecated": false,
             "children": [
@@ -1595,7 +1683,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 113
+                  "lineNumber": 131
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1649,7 +1737,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 126
+              "lineNumber": 144
             },
             "deprecated": false,
             "children": [
@@ -1683,7 +1771,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 127
+                  "lineNumber": 145
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1700,7 +1788,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 128
+                  "lineNumber": 146
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1730,7 +1818,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 169
+              "lineNumber": 187
             },
             "deprecated": false,
             "children": [
@@ -1755,7 +1843,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 169
+                  "lineNumber": 187
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1775,7 +1863,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 181
+              "lineNumber": 199
             },
             "deprecated": false,
             "children": [],
@@ -1801,7 +1889,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 250
+              "lineNumber": 289
             },
             "deprecated": false,
             "children": [],
@@ -1826,7 +1914,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 254
+              "lineNumber": 293
             },
             "deprecated": false,
             "children": [
@@ -1842,7 +1930,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 254
+                  "lineNumber": 293
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1870,7 +1958,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 258
+              "lineNumber": 297
             },
             "deprecated": false,
             "children": [
@@ -1886,7 +1974,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 258
+                  "lineNumber": 297
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1914,7 +2002,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 262
+              "lineNumber": 301
             },
             "deprecated": false,
             "children": [
@@ -1930,7 +2018,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 262
+                  "lineNumber": 301
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1958,7 +2046,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 266
+              "lineNumber": 305
             },
             "deprecated": false,
             "children": [
@@ -1974,7 +2062,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 266
+                  "lineNumber": 305
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2002,7 +2090,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 270
+              "lineNumber": 309
             },
             "deprecated": false,
             "children": [
@@ -2018,7 +2106,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 270
+                  "lineNumber": 309
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2046,7 +2134,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 274
+              "lineNumber": 313
             },
             "deprecated": false,
             "children": [
@@ -2062,7 +2150,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 274
+                  "lineNumber": 313
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2090,12 +2178,169 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 278
+              "lineNumber": 317
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfigs.getTimeShifts",
+            "type": "Function",
+            "tags": [],
+            "label": "getTimeShifts",
+            "description": [],
+            "signature": [
+              "() => Record<string, moment.Duration>"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 331
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfigs.getTimeShiftInterval",
+            "type": "Function",
+            "tags": [],
+            "label": "getTimeShiftInterval",
+            "description": [],
+            "signature": [
+              "() => moment.Duration | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 346
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfigs.hasTimeShifts",
+            "type": "Function",
+            "tags": [],
+            "label": "hasTimeShifts",
+            "description": [],
+            "signature": [
+              "() => boolean"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 353
             },
             "deprecated": false,
             "children": [],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfigs.getSearchSourceTimeFilter",
+            "type": "Function",
+            "tags": [],
+            "label": "getSearchSourceTimeFilter",
+            "description": [],
+            "signature": [
+              "(forceNow?: Date | undefined) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataPluginApi",
+                "section": "def-common.RangeFilter",
+                "text": "RangeFilter"
+              },
+              "[] | { meta: { index: string | undefined; params: {}; alias: string; disabled: boolean; negate: boolean; }; query: { bool: { should: { bool: { filter: { range: { [x: string]: { gte: string; lte: string; }; }; }[]; }; }[]; minimum_should_match: number; }; }; }[]"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 357
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-public.AggConfigs.getSearchSourceTimeFilter.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "forceNow",
+                "description": [],
+                "signature": [
+                  "Date | undefined"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+                  "lineNumber": 357
+                },
+                "deprecated": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-public.AggConfigs.postFlightTransform",
+            "type": "Function",
+            "tags": [],
+            "label": "postFlightTransform",
+            "description": [],
+            "signature": [
+              "(response: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.IEsSearchResponse",
+                "text": "IEsSearchResponse"
+              },
+              "<any>) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.IEsSearchResponse",
+                "text": "IEsSearchResponse"
+              },
+              "<any>"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 410
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-public.AggConfigs.postFlightTransform.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "response",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "data",
+                    "scope": "common",
+                    "docId": "kibDataSearchPluginApi",
+                    "section": "def-common.IEsSearchResponse",
+                    "text": "IEsSearchResponse"
+                  },
+                  "<any>"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+                  "lineNumber": 410
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-public.AggConfigs.getRequestAggById",
@@ -2116,7 +2361,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 292
+              "lineNumber": 429
             },
             "deprecated": false,
             "children": [
@@ -2132,7 +2377,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 292
+                  "lineNumber": 429
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2164,7 +2409,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 307
+              "lineNumber": 444
             },
             "deprecated": false,
             "children": [],
@@ -2194,7 +2439,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 321
+              "lineNumber": 458
             },
             "deprecated": false,
             "children": [
@@ -2212,7 +2457,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 321
+                  "lineNumber": 458
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2248,7 +2493,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 330
+              "lineNumber": 467
             },
             "deprecated": false,
             "children": [
@@ -2272,7 +2517,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 330
+                  "lineNumber": 467
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2296,7 +2541,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 330
+                  "lineNumber": 467
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -2530,7 +2775,7 @@
                     "section": "def-public.PluginInitializerContext",
                     "text": "PluginInitializerContext"
                   },
-                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { enabled: boolean; }>; }>; }>>"
+                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { enabled: boolean; timeout: moment.Duration; terminateAfter: moment.Duration; }>; }>; }>>"
                 ],
                 "source": {
                   "path": "src/plugins/data/public/plugin.ts",
@@ -4008,7 +4253,9 @@
             "parentPluginId": "data",
             "id": "def-public.IndexPattern.addScriptedField",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "addScriptedField",
             "description": [
               "\nAdd scripted field to field list\n"
@@ -4018,9 +4265,10 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 244
+              "lineNumber": 245
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [],
             "children": [
               {
                 "parentPluginId": "data",
@@ -4036,7 +4284,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4055,7 +4303,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4072,7 +4320,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4084,7 +4332,9 @@
             "parentPluginId": "data",
             "id": "def-public.IndexPattern.removeScriptedField",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "removeScriptedField",
             "description": [
               "\nRemove scripted field from field list"
@@ -4094,9 +4344,25 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 270
+              "lineNumber": 272
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx",
+                  "lineNumber": 117
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx",
+                  "lineNumber": 778
+                }
+              }
+            ],
             "children": [
               {
                 "parentPluginId": "data",
@@ -4110,7 +4376,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 270
+                  "lineNumber": 272
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4122,9 +4388,13 @@
             "parentPluginId": "data",
             "id": "def-public.IndexPattern.getNonScriptedFields",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "getNonScriptedFields",
-            "description": [],
+            "description": [
+              "\n"
+            ],
             "signature": [
               "() => ",
               {
@@ -4138,9 +4408,74 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 277
+              "lineNumber": 283
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx",
+                  "lineNumber": 152
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 66
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 74
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 204
+                }
+              },
+              {
+                "plugin": "visTypeTimeseries",
+                "link": {
+                  "path": "src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts",
+                  "lineNumber": 65
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts",
+                  "lineNumber": 106
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/state_management/datasource.test.ts",
+                  "lineNumber": 29
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.test.ts",
+                  "lineNumber": 122
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.test.ts",
+                  "lineNumber": 244
+                }
+              }
+            ],
             "children": [],
             "returnComment": []
           },
@@ -4148,9 +4483,13 @@
             "parentPluginId": "data",
             "id": "def-public.IndexPattern.getScriptedFields",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "getScriptedFields",
-            "description": [],
+            "description": [
+              "\n"
+            ],
             "signature": [
               "() => ",
               {
@@ -4164,9 +4503,18 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 281
+              "lineNumber": 291
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx",
+                  "lineNumber": 61
+                }
+              }
+            ],
             "children": [],
             "returnComment": []
           },
@@ -4182,7 +4530,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 285
+              "lineNumber": 295
             },
             "deprecated": false,
             "children": [],
@@ -4200,7 +4548,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 289
+              "lineNumber": 299
             },
             "deprecated": false,
             "children": [],
@@ -4226,7 +4574,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 294
+              "lineNumber": 304
             },
             "deprecated": false,
             "children": [],
@@ -4252,7 +4600,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 299
+              "lineNumber": 309
             },
             "deprecated": false,
             "children": [
@@ -4268,7 +4616,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 299
+                  "lineNumber": 309
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4288,7 +4636,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 304
+              "lineNumber": 314
             },
             "deprecated": false,
             "children": [],
@@ -4304,11 +4652,18 @@
               "\nReturns index pattern as saved object body for saving"
             ],
             "signature": [
-              "() => { fieldAttrs: string | undefined; title: string; timeFieldName: string | undefined; intervalName: string | undefined; sourceFilters: string | undefined; fields: string | undefined; fieldFormatMap: string | undefined; type: string | undefined; typeMeta: string | undefined; allowNoIndex: true | undefined; runtimeFieldMap: string | undefined; }"
+              "() => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataIndexPatternsPluginApi",
+                "section": "def-common.IndexPatternAttributes",
+                "text": "IndexPatternAttributes"
+              }
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 311
+              "lineNumber": 321
             },
             "deprecated": false,
             "children": [],
@@ -4359,7 +4714,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 339
+              "lineNumber": 347
             },
             "deprecated": false,
             "children": [
@@ -4397,7 +4752,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 340
+                  "lineNumber": 348
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4427,7 +4782,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 360
+              "lineNumber": 368
             },
             "deprecated": false,
             "children": [
@@ -4445,7 +4800,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 360
+                  "lineNumber": 368
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4470,7 +4825,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 360
+                  "lineNumber": 368
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4492,7 +4847,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 384
+              "lineNumber": 392
             },
             "deprecated": false,
             "children": [
@@ -4510,7 +4865,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 384
+                  "lineNumber": 392
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4540,7 +4895,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 404
+              "lineNumber": 412
             },
             "deprecated": false,
             "children": [
@@ -4556,7 +4911,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 404
+                  "lineNumber": 412
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4584,7 +4939,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 411
+              "lineNumber": 419
             },
             "deprecated": false,
             "children": [
@@ -4600,7 +4955,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 412
+                  "lineNumber": 420
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4617,7 +4972,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 413
+                  "lineNumber": 421
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4641,7 +4996,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 414
+                  "lineNumber": 422
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4661,7 +5016,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 422
+              "lineNumber": 430
             },
             "deprecated": false,
             "children": [
@@ -4677,7 +5032,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 422
+                  "lineNumber": 430
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4694,7 +5049,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 422
+                  "lineNumber": 430
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -4714,7 +5069,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 433
+              "lineNumber": 441
             },
             "deprecated": false,
             "children": [
@@ -4730,7 +5085,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 433
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4747,7 +5102,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 433
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -4775,7 +5130,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 446
+              "lineNumber": 454
             },
             "deprecated": false,
             "children": [
@@ -4791,7 +5146,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 446
+                  "lineNumber": 454
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4815,7 +5170,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 446
+                  "lineNumber": 454
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4835,7 +5190,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 450
+              "lineNumber": 458
             },
             "deprecated": false,
             "children": [
@@ -4851,7 +5206,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 450
+                  "lineNumber": 458
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5067,14 +5422,14 @@
           {
             "parentPluginId": "data",
             "id": "def-public.IndexPatternField.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [
               "\nScript field language"
             ],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/fields/index_pattern_field.ts",
@@ -5085,12 +5440,12 @@
           {
             "parentPluginId": "data",
             "id": "def-public.IndexPatternField.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/fields/index_pattern_field.ts",
@@ -5377,7 +5732,7 @@
             "label": "toJSON",
             "description": [],
             "signature": [
-              "() => { count: number; script: string | undefined; lang: string | undefined; conflictDescriptions: Record<string, string[]> | undefined; name: string; type: string; esTypes: string[] | undefined; scripted: boolean; searchable: boolean; aggregatable: boolean; readFromDocValues: boolean; subType: ",
+              "() => { count: number; script: string | undefined; lang: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; conflictDescriptions: Record<string, string[]> | undefined; name: string; type: string; esTypes: string[] | undefined; scripted: boolean; searchable: boolean; aggregatable: boolean; readFromDocValues: boolean; subType: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -6331,7 +6686,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 473
+              "lineNumber": 480
             },
             "deprecated": false,
             "children": [
@@ -6347,7 +6702,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 473
+                  "lineNumber": 480
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6385,7 +6740,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 492
+              "lineNumber": 499
             },
             "deprecated": false,
             "children": [
@@ -6407,7 +6762,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6424,7 +6779,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6464,7 +6819,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 517
+              "lineNumber": 524
             },
             "deprecated": false,
             "children": [
@@ -6486,7 +6841,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6505,7 +6860,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6524,7 +6879,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6562,7 +6917,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 530
+              "lineNumber": 537
             },
             "deprecated": false,
             "children": [
@@ -6584,7 +6939,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6603,7 +6958,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6633,7 +6988,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 558
+              "lineNumber": 570
             },
             "deprecated": false,
             "children": [
@@ -6655,7 +7010,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 559
+                  "lineNumber": 571
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6672,7 +7027,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 560
+                  "lineNumber": 572
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6689,7 +7044,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 561
+                  "lineNumber": 573
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6711,7 +7066,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 644
+              "lineNumber": 656
             },
             "deprecated": false,
             "children": [
@@ -6729,7 +7084,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 644
+                  "lineNumber": 656
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6850,7 +7205,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/common/search/search_source/search_source.ts",
-          "lineNumber": 121
+          "lineNumber": 127
         },
         "deprecated": false,
         "children": [
@@ -6866,7 +7221,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 129
+              "lineNumber": 135
             },
             "deprecated": false
           },
@@ -6882,7 +7237,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 133
+              "lineNumber": 139
             },
             "deprecated": false,
             "children": [
@@ -6904,7 +7259,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 133
+                  "lineNumber": 139
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6927,7 +7282,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 133
+                  "lineNumber": 139
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6949,7 +7304,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 151
+              "lineNumber": 157
             },
             "deprecated": false,
             "children": [
@@ -6965,7 +7320,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 151
+                  "lineNumber": 157
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6995,7 +7350,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 160
+              "lineNumber": 166
             },
             "deprecated": false,
             "children": [
@@ -7013,7 +7368,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 160
+                  "lineNumber": 166
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7039,7 +7394,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 160
+                  "lineNumber": 166
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7061,7 +7416,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 172
+              "lineNumber": 178
             },
             "deprecated": false,
             "children": [
@@ -7079,7 +7434,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 172
+                  "lineNumber": 178
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7111,7 +7466,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 183
+              "lineNumber": 189
             },
             "deprecated": false,
             "children": [
@@ -7135,7 +7490,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 183
+                  "lineNumber": 189
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7157,7 +7512,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 191
+              "lineNumber": 197
             },
             "deprecated": false,
             "children": [],
@@ -7184,7 +7539,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 198
+              "lineNumber": 204
             },
             "deprecated": false,
             "children": [],
@@ -7212,7 +7567,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 205
+              "lineNumber": 211
             },
             "deprecated": false,
             "children": [
@@ -7228,7 +7583,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 205
+                  "lineNumber": 211
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7245,7 +7600,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 205
+                  "lineNumber": 211
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7275,7 +7630,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 216
+              "lineNumber": 222
             },
             "deprecated": false,
             "children": [
@@ -7291,7 +7646,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 216
+                  "lineNumber": 222
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7320,7 +7675,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 223
+              "lineNumber": 229
             },
             "deprecated": true,
             "references": [
@@ -7328,14 +7683,14 @@
                 "plugin": "discover",
                 "link": {
                   "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-                  "lineNumber": 206
+                  "lineNumber": 207
                 }
               },
               {
                 "plugin": "discover",
                 "link": {
                   "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-                  "lineNumber": 212
+                  "lineNumber": 213
                 }
               }
             ],
@@ -7363,7 +7718,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 230
+              "lineNumber": 236
             },
             "deprecated": false,
             "children": [],
@@ -7390,7 +7745,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 244
+              "lineNumber": 250
             },
             "deprecated": false,
             "children": [
@@ -7406,7 +7761,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 244
+                  "lineNumber": 250
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7446,7 +7801,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 256
+              "lineNumber": 262
             },
             "deprecated": false,
             "children": [
@@ -7472,7 +7827,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 256
+                  "lineNumber": 262
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -7497,7 +7852,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 256
+                  "lineNumber": 262
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7531,7 +7886,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 266
+              "lineNumber": 272
             },
             "deprecated": false,
             "children": [],
@@ -7571,7 +7926,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 274
+              "lineNumber": 280
             },
             "deprecated": false,
             "children": [
@@ -7593,7 +7948,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 275
+                  "lineNumber": 281
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7627,7 +7982,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 312
+              "lineNumber": 318
             },
             "deprecated": true,
             "references": [
@@ -7638,13 +7993,6 @@
                   "lineNumber": 77
                 }
               },
-              {
-                "plugin": "discover",
-                "link": {
-                  "path": "src/plugins/discover/public/application/angular/context/api/anchor.ts",
-                  "lineNumber": 57
-                }
-              },
               {
                 "plugin": "maps",
                 "link": {
@@ -7686,7 +8034,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 312
+                  "lineNumber": 318
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7726,7 +8074,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 325
+              "lineNumber": 331
             },
             "deprecated": false,
             "children": [
@@ -7758,7 +8106,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 326
+                  "lineNumber": 332
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7780,7 +8128,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 334
+              "lineNumber": 340
             },
             "deprecated": false,
             "children": [],
@@ -7802,7 +8150,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 342
+              "lineNumber": 348
             },
             "deprecated": false,
             "children": [],
@@ -7829,7 +8177,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 831
+              "lineNumber": 848
             },
             "deprecated": false,
             "children": [
@@ -7845,7 +8193,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 831
+                  "lineNumber": 848
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -7869,7 +8217,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 860
+              "lineNumber": 877
             },
             "deprecated": false,
             "children": [],
@@ -8816,7 +9164,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/types.ts",
-          "lineNumber": 195
+          "lineNumber": 196
         },
         "deprecated": false,
         "children": [
@@ -8845,7 +9193,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTER>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"geo_bounding_box\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"filter\">, \"enabled\" | \"id\" | \"filter\" | \"customLabel\" | \"schema\" | \"geo_bounding_box\" | \"json\">, ",
+              ".FILTER>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"geo_bounding_box\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"filter\">, \"enabled\" | \"id\" | \"filter\" | \"customLabel\" | \"schema\" | \"geo_bounding_box\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -8869,7 +9217,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 196
+              "lineNumber": 197
             },
             "deprecated": false
           },
@@ -8898,7 +9246,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\"> & Pick<{ filters?: string | undefined; }, \"filters\"> & Pick<{ filters?: string | undefined; }, never>, \"enabled\" | \"filters\" | \"id\" | \"schema\" | \"json\">, ",
+              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ filters?: string | undefined; }, \"filters\"> & Pick<{ filters?: string | undefined; }, never>, \"enabled\" | \"filters\" | \"id\" | \"schema\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -8922,7 +9270,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 197
+              "lineNumber": 198
             },
             "deprecated": false
           },
@@ -8975,7 +9323,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 198
+              "lineNumber": 199
             },
             "deprecated": false
           },
@@ -9004,7 +9352,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".IP_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, \"ipRangeType\" | \"ranges\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
+              ".IP_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, \"ipRangeType\" | \"ranges\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9028,7 +9376,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 199
+              "lineNumber": 200
             },
             "deprecated": false
           },
@@ -9057,7 +9405,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ranges\" | \"time_zone\">, ",
+              ".DATE_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ranges\" | \"time_zone\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9081,7 +9429,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 200
+              "lineNumber": 201
             },
             "deprecated": false
           },
@@ -9110,7 +9458,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ranges\">, ",
+              ".RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9134,7 +9482,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 201
+              "lineNumber": 202
             },
             "deprecated": false
           },
@@ -9187,7 +9535,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 202
+              "lineNumber": 203
             },
             "deprecated": false
           },
@@ -9216,7 +9564,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: string | undefined; }, \"boundingBox\"> & Pick<{ boundingBox?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
+              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: string | undefined; }, \"boundingBox\"> & Pick<{ boundingBox?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9240,7 +9588,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 203
+              "lineNumber": 204
             },
             "deprecated": false
           },
@@ -9269,7 +9617,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, \"extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
+              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, \"extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9293,7 +9641,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 204
+              "lineNumber": 205
             },
             "deprecated": false
           },
@@ -9322,7 +9670,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, \"timeRange\" | \"extended_bounds\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"timeRange\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
+              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, \"timeRange\" | \"extended_bounds\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"timeRange\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9346,7 +9694,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 205
+              "lineNumber": 206
             },
             "deprecated": false
           },
@@ -9375,11 +9723,11 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
+              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
               " | undefined; }, \"orderAgg\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9403,7 +9751,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 206
+              "lineNumber": 207
             },
             "deprecated": false
           },
@@ -9456,7 +9804,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 207
+              "lineNumber": 208
             },
             "deprecated": false
           },
@@ -9485,7 +9833,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -9493,7 +9841,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9517,7 +9865,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 208
+              "lineNumber": 209
             },
             "deprecated": false
           },
@@ -9546,7 +9894,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -9554,7 +9902,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9578,7 +9926,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 209
+              "lineNumber": 210
             },
             "deprecated": false
           },
@@ -9607,7 +9955,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -9615,7 +9963,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9639,7 +9987,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 210
+              "lineNumber": 211
             },
             "deprecated": false
           },
@@ -9668,7 +10016,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -9676,7 +10024,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9700,7 +10048,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 211
+              "lineNumber": 212
             },
             "deprecated": false
           },
@@ -9729,7 +10077,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -9737,7 +10085,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9761,7 +10109,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 212
+              "lineNumber": 213
             },
             "deprecated": false
           },
@@ -9814,7 +10162,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 213
+              "lineNumber": 214
             },
             "deprecated": false
           },
@@ -9867,7 +10215,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 214
+              "lineNumber": 215
             },
             "deprecated": false
           },
@@ -9896,11 +10244,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9924,7 +10272,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 215
+              "lineNumber": 216
             },
             "deprecated": false
           },
@@ -9953,11 +10301,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".DERIVATIVE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".DERIVATIVE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -9981,7 +10329,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 216
+              "lineNumber": 217
             },
             "deprecated": false
           },
@@ -10034,7 +10382,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 217
+              "lineNumber": 218
             },
             "deprecated": false
           },
@@ -10087,7 +10435,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 218
+              "lineNumber": 219
             },
             "deprecated": false
           },
@@ -10140,7 +10488,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 219
+              "lineNumber": 220
             },
             "deprecated": false
           },
@@ -10193,7 +10541,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 220
+              "lineNumber": 221
             },
             "deprecated": false
           },
@@ -10246,7 +10594,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 221
+              "lineNumber": 222
             },
             "deprecated": false
           },
@@ -10299,7 +10647,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 222
+              "lineNumber": 223
             },
             "deprecated": false
           },
@@ -10328,11 +10676,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MOVING_FN>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
+              ".MOVING_FN>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10356,7 +10704,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 223
+              "lineNumber": 224
             },
             "deprecated": false
           },
@@ -10409,7 +10757,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 224
+              "lineNumber": 225
             },
             "deprecated": false
           },
@@ -10462,7 +10810,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 225
+              "lineNumber": 226
             },
             "deprecated": false
           },
@@ -10491,11 +10839,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -10519,7 +10867,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 226
+              "lineNumber": 227
             },
             "deprecated": false
           },
@@ -10572,7 +10920,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 227
+              "lineNumber": 228
             },
             "deprecated": false
           },
@@ -10625,7 +10973,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 228
+              "lineNumber": 229
             },
             "deprecated": false
           },
@@ -10678,7 +11026,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 229
+              "lineNumber": 230
             },
             "deprecated": false
           }
@@ -11531,7 +11879,7 @@
             "plugin": "discover",
             "link": {
               "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-              "lineNumber": 58
+              "lineNumber": 59
             }
           },
           {
@@ -12882,28 +13230,28 @@
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 139
+              "lineNumber": 141
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 248
+              "lineNumber": 250
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 287
+              "lineNumber": 290
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 329
+              "lineNumber": 332
             }
           },
           {
@@ -13807,12 +14155,12 @@
           {
             "parentPluginId": "data",
             "id": "def-public.IFieldType.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/fields/types.ts",
@@ -14340,6 +14688,20 @@
               "lineNumber": 85
             }
           },
+          {
+            "plugin": "lens",
+            "link": {
+              "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx",
+              "lineNumber": 25
+            }
+          },
+          {
+            "plugin": "lens",
+            "link": {
+              "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx",
+              "lineNumber": 102
+            }
+          },
           {
             "plugin": "lens",
             "link": {
@@ -14445,20 +14807,6 @@
               "lineNumber": 30
             }
           },
-          {
-            "plugin": "apm",
-            "link": {
-              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
-              "lineNumber": 14
-            }
-          },
-          {
-            "plugin": "apm",
-            "link": {
-              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
-              "lineNumber": 31
-            }
-          },
           {
             "plugin": "infra",
             "link": {
@@ -14627,6 +14975,20 @@
               "lineNumber": 23
             }
           },
+          {
+            "plugin": "apm",
+            "link": {
+              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
+              "lineNumber": 14
+            }
+          },
+          {
+            "plugin": "apm",
+            "link": {
+              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
+              "lineNumber": 31
+            }
+          },
           {
             "plugin": "lists",
             "link": {
@@ -14659,21 +15021,21 @@
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts",
-              "lineNumber": 21
+              "lineNumber": 22
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts",
-              "lineNumber": 66
+              "lineNumber": 72
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts",
-              "lineNumber": 19
+              "lineNumber": 20
             }
           },
           {
@@ -14932,21 +15294,21 @@
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts",
-              "lineNumber": 44
+              "lineNumber": 48
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts",
-              "lineNumber": 60
+              "lineNumber": 64
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts",
-              "lineNumber": 65
+              "lineNumber": 69
             }
           },
           {
@@ -15733,6 +16095,20 @@
               "lineNumber": 30
             }
           },
+          {
+            "plugin": "securitySolution",
+            "link": {
+              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts",
+              "lineNumber": 13
+            }
+          },
+          {
+            "plugin": "securitySolution",
+            "link": {
+              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts",
+              "lineNumber": 52
+            }
+          },
           {
             "plugin": "stackAlerts",
             "link": {
@@ -15936,20 +16312,6 @@
               "lineNumber": 1352
             }
           },
-          {
-            "plugin": "discover",
-            "link": {
-              "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx",
-              "lineNumber": 17
-            }
-          },
-          {
-            "plugin": "discover",
-            "link": {
-              "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx",
-              "lineNumber": 26
-            }
-          },
           {
             "plugin": "maps",
             "link": {
@@ -15961,7 +16323,7 @@
             "plugin": "maps",
             "link": {
               "path": "x-pack/plugins/maps/public/embeddable/types.ts",
-              "lineNumber": 45
+              "lineNumber": 44
             }
           },
           {
@@ -16066,14 +16428,14 @@
             "plugin": "observability",
             "link": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 18
+              "lineNumber": 19
             }
           },
           {
             "plugin": "observability",
             "link": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 95
+              "lineNumber": 104
             }
           },
           {
@@ -16115,7 +16477,7 @@
             "plugin": "observability",
             "link": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts",
-              "lineNumber": 24
+              "lineNumber": 25
             }
           },
           {
@@ -16283,14 +16645,14 @@
             "plugin": "transform",
             "link": {
               "path": "x-pack/plugins/transform/server/routes/api/transforms.ts",
-              "lineNumber": 62
+              "lineNumber": 63
             }
           },
           {
             "plugin": "transform",
             "link": {
               "path": "x-pack/plugins/transform/server/routes/api/transforms.ts",
-              "lineNumber": 404
+              "lineNumber": 405
             }
           },
           {
@@ -19028,7 +19390,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 43
+          "lineNumber": 45
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -19041,7 +19403,7 @@
         "label": "AggGroupName",
         "description": [],
         "signature": [
-          "\"buckets\" | \"metrics\" | \"none\""
+          "\"none\" | \"buckets\" | \"metrics\""
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_groups.ts",
@@ -19773,7 +20135,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 53
+          "lineNumber": 55
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -20132,7 +20494,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-          "lineNumber": 35
+          "lineNumber": 36
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -20359,7 +20721,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-          "lineNumber": 650
+          "lineNumber": 662
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -20716,7 +21078,7 @@
             "section": "def-common.PhraseFilterMeta",
             "text": "PhraseFilterMeta"
           },
-          "; script?: { script: { source?: any; lang?: string | undefined; params: any; }; } | undefined; }"
+          "; script?: { script: { source?: any; lang?: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; params: any; }; } | undefined; }"
         ],
         "source": {
           "path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
@@ -20805,7 +21167,9 @@
             "section": "def-common.RangeFilterMeta",
             "text": "RangeFilterMeta"
           },
-          "; script?: { script: { params: any; lang: string; source: any; }; } | undefined; match_all?: any; }"
+          "; script?: { script: { params: any; lang: ",
+          "ScriptLanguage",
+          "; source: any; }; } | undefined; match_all?: any; }"
         ],
         "source": {
           "path": "src/plugins/data/common/es_query/filters/range_filter.ts",
@@ -22149,7 +22513,7 @@
                     "section": "def-common.PhraseFilterMeta",
                     "text": "PhraseFilterMeta"
                   },
-                  "; script?: { script: { source?: any; lang?: string | undefined; params: any; }; } | undefined; }"
+                  "; script?: { script: { source?: any; lang?: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; params: any; }; } | undefined; }"
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
@@ -22207,7 +22571,7 @@
                     "section": "def-common.PhraseFilterMeta",
                     "text": "PhraseFilterMeta"
                   },
-                  "; script?: { script: { source?: any; lang?: string | undefined; params: any; }; } | undefined; }"
+                  "; script?: { script: { source?: any; lang?: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; params: any; }; } | undefined; }"
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
@@ -22887,7 +23251,9 @@
                     "section": "def-common.RangeFilterMeta",
                     "text": "RangeFilterMeta"
                   },
-                  "; script?: { script: { params: any; lang: string; source: any; }; } | undefined; match_all?: any; }"
+                  "; script?: { script: { params: any; lang: ",
+                  "ScriptLanguage",
+                  "; source: any; }; } | undefined; match_all?: any; }"
                 ],
                 "source": {
                   "path": "src/plugins/data/public/query/timefilter/lib/change_time_filter.ts",
@@ -22960,7 +23326,9 @@
                     "section": "def-common.RangeFilterMeta",
                     "text": "RangeFilterMeta"
                   },
-                  "; script?: { script: { params: any; lang: string; source: any; }; } | undefined; match_all?: any; }"
+                  "; script?: { script: { params: any; lang: ",
+                  "ScriptLanguage",
+                  "; source: any; }; } | undefined; match_all?: any; }"
                 ],
                 "source": {
                   "path": "src/plugins/data/public/query/timefilter/lib/change_time_filter.ts",
@@ -23530,7 +23898,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 33
+                  "lineNumber": 39
                 },
                 "deprecated": false
               },
@@ -23561,7 +23929,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 34
+                  "lineNumber": 40
                 },
                 "deprecated": false
               },
@@ -23592,7 +23960,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 35
+                  "lineNumber": 41
                 },
                 "deprecated": false
               },
@@ -23614,7 +23982,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 36
+                  "lineNumber": 42
                 },
                 "deprecated": false
               }
@@ -25922,7 +26290,7 @@
               "section": "def-public.QuerySuggestionGetFn",
               "text": "QuerySuggestionGetFn"
             },
-            "; }"
+            "; getAutocompleteSettings: () => { terminateAfter: number; timeout: number; }; }"
           ],
           "source": {
             "path": "src/plugins/data/public/types.ts",
@@ -26699,7 +27067,7 @@
                     "section": "def-server.PluginInitializerContext",
                     "text": "PluginInitializerContext"
                   },
-                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { enabled: boolean; }>; }>; }>>"
+                  "<Readonly<{} & { search: Readonly<{} & { aggs: Readonly<{} & { shardDelay: Readonly<{} & { enabled: boolean; }>; }>; }>; autocomplete: Readonly<{} & { querySuggestions: Readonly<{} & { enabled: boolean; }>; valueSuggestions: Readonly<{} & { enabled: boolean; timeout: moment.Duration; terminateAfter: moment.Duration; }>; }>; }>>"
                 ],
                 "source": {
                   "path": "src/plugins/data/server/plugin.ts",
@@ -27533,7 +27901,9 @@
             "parentPluginId": "data",
             "id": "def-server.IndexPattern.addScriptedField",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "addScriptedField",
             "description": [
               "\nAdd scripted field to field list\n"
@@ -27543,9 +27913,10 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 244
+              "lineNumber": 245
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [],
             "children": [
               {
                 "parentPluginId": "data",
@@ -27561,7 +27932,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -27580,7 +27951,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -27597,7 +27968,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -27609,7 +27980,9 @@
             "parentPluginId": "data",
             "id": "def-server.IndexPattern.removeScriptedField",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "removeScriptedField",
             "description": [
               "\nRemove scripted field from field list"
@@ -27619,9 +27992,25 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 270
+              "lineNumber": 272
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx",
+                  "lineNumber": 117
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx",
+                  "lineNumber": 778
+                }
+              }
+            ],
             "children": [
               {
                 "parentPluginId": "data",
@@ -27635,7 +28024,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 270
+                  "lineNumber": 272
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -27647,9 +28036,13 @@
             "parentPluginId": "data",
             "id": "def-server.IndexPattern.getNonScriptedFields",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "getNonScriptedFields",
-            "description": [],
+            "description": [
+              "\n"
+            ],
             "signature": [
               "() => ",
               {
@@ -27663,9 +28056,74 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 277
+              "lineNumber": 283
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx",
+                  "lineNumber": 152
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 66
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 74
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 204
+                }
+              },
+              {
+                "plugin": "visTypeTimeseries",
+                "link": {
+                  "path": "src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts",
+                  "lineNumber": 65
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts",
+                  "lineNumber": 106
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/state_management/datasource.test.ts",
+                  "lineNumber": 29
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.test.ts",
+                  "lineNumber": 122
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.test.ts",
+                  "lineNumber": 244
+                }
+              }
+            ],
             "children": [],
             "returnComment": []
           },
@@ -27673,9 +28131,13 @@
             "parentPluginId": "data",
             "id": "def-server.IndexPattern.getScriptedFields",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "getScriptedFields",
-            "description": [],
+            "description": [
+              "\n"
+            ],
             "signature": [
               "() => ",
               {
@@ -27689,9 +28151,18 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 281
+              "lineNumber": 291
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx",
+                  "lineNumber": 61
+                }
+              }
+            ],
             "children": [],
             "returnComment": []
           },
@@ -27707,7 +28178,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 285
+              "lineNumber": 295
             },
             "deprecated": false,
             "children": [],
@@ -27725,7 +28196,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 289
+              "lineNumber": 299
             },
             "deprecated": false,
             "children": [],
@@ -27751,7 +28222,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 294
+              "lineNumber": 304
             },
             "deprecated": false,
             "children": [],
@@ -27777,7 +28248,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 299
+              "lineNumber": 309
             },
             "deprecated": false,
             "children": [
@@ -27793,7 +28264,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 299
+                  "lineNumber": 309
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -27813,7 +28284,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 304
+              "lineNumber": 314
             },
             "deprecated": false,
             "children": [],
@@ -27829,11 +28300,18 @@
               "\nReturns index pattern as saved object body for saving"
             ],
             "signature": [
-              "() => { fieldAttrs: string | undefined; title: string; timeFieldName: string | undefined; intervalName: string | undefined; sourceFilters: string | undefined; fields: string | undefined; fieldFormatMap: string | undefined; type: string | undefined; typeMeta: string | undefined; allowNoIndex: true | undefined; runtimeFieldMap: string | undefined; }"
+              "() => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataIndexPatternsPluginApi",
+                "section": "def-common.IndexPatternAttributes",
+                "text": "IndexPatternAttributes"
+              }
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 311
+              "lineNumber": 321
             },
             "deprecated": false,
             "children": [],
@@ -27884,7 +28362,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 339
+              "lineNumber": 347
             },
             "deprecated": false,
             "children": [
@@ -27922,7 +28400,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 340
+                  "lineNumber": 348
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -27952,7 +28430,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 360
+              "lineNumber": 368
             },
             "deprecated": false,
             "children": [
@@ -27970,7 +28448,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 360
+                  "lineNumber": 368
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -27995,7 +28473,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 360
+                  "lineNumber": 368
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28017,7 +28495,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 384
+              "lineNumber": 392
             },
             "deprecated": false,
             "children": [
@@ -28035,7 +28513,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 384
+                  "lineNumber": 392
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28065,7 +28543,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 404
+              "lineNumber": 412
             },
             "deprecated": false,
             "children": [
@@ -28081,7 +28559,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 404
+                  "lineNumber": 412
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28109,7 +28587,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 411
+              "lineNumber": 419
             },
             "deprecated": false,
             "children": [
@@ -28125,7 +28603,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 412
+                  "lineNumber": 420
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28142,7 +28620,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 413
+                  "lineNumber": 421
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28166,7 +28644,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 414
+                  "lineNumber": 422
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28186,7 +28664,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 422
+              "lineNumber": 430
             },
             "deprecated": false,
             "children": [
@@ -28202,7 +28680,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 422
+                  "lineNumber": 430
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28219,7 +28697,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 422
+                  "lineNumber": 430
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -28239,7 +28717,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 433
+              "lineNumber": 441
             },
             "deprecated": false,
             "children": [
@@ -28255,7 +28733,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 433
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28272,7 +28750,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 433
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -28300,7 +28778,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 446
+              "lineNumber": 454
             },
             "deprecated": false,
             "children": [
@@ -28316,7 +28794,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 446
+                  "lineNumber": 454
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28340,7 +28818,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 446
+                  "lineNumber": 454
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -28360,7 +28838,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 450
+              "lineNumber": 458
             },
             "deprecated": false,
             "children": [
@@ -28376,7 +28854,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 450
+                  "lineNumber": 458
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29199,7 +29677,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 473
+              "lineNumber": 480
             },
             "deprecated": false,
             "children": [
@@ -29215,7 +29693,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 473
+                  "lineNumber": 480
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29253,7 +29731,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 492
+              "lineNumber": 499
             },
             "deprecated": false,
             "children": [
@@ -29275,7 +29753,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29292,7 +29770,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29332,7 +29810,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 517
+              "lineNumber": 524
             },
             "deprecated": false,
             "children": [
@@ -29354,7 +29832,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29373,7 +29851,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29392,7 +29870,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29430,7 +29908,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 530
+              "lineNumber": 537
             },
             "deprecated": false,
             "children": [
@@ -29452,7 +29930,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29471,7 +29949,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29501,7 +29979,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 558
+              "lineNumber": 570
             },
             "deprecated": false,
             "children": [
@@ -29523,7 +30001,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 559
+                  "lineNumber": 571
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29540,7 +30018,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 560
+                  "lineNumber": 572
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29557,7 +30035,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 561
+                  "lineNumber": 573
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -29579,7 +30057,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 644
+              "lineNumber": 656
             },
             "deprecated": false,
             "children": [
@@ -29597,7 +30075,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 644
+                  "lineNumber": 656
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30420,7 +30898,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 473
+              "lineNumber": 480
             },
             "deprecated": false,
             "children": [
@@ -30436,7 +30914,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 473
+                  "lineNumber": 480
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30474,7 +30952,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 492
+              "lineNumber": 499
             },
             "deprecated": false,
             "children": [
@@ -30496,7 +30974,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30513,7 +30991,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30553,7 +31031,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 517
+              "lineNumber": 524
             },
             "deprecated": false,
             "children": [
@@ -30575,7 +31053,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30594,7 +31072,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30613,7 +31091,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30651,7 +31129,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 530
+              "lineNumber": 537
             },
             "deprecated": false,
             "children": [
@@ -30673,7 +31151,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30692,7 +31170,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30722,7 +31200,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 558
+              "lineNumber": 570
             },
             "deprecated": false,
             "children": [
@@ -30744,7 +31222,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 559
+                  "lineNumber": 571
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30761,7 +31239,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 560
+                  "lineNumber": 572
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30778,7 +31256,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 561
+                  "lineNumber": 573
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -30800,7 +31278,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 644
+              "lineNumber": 656
             },
             "deprecated": false,
             "children": [
@@ -30818,7 +31296,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 644
+                  "lineNumber": 656
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -31168,7 +31646,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/types.ts",
-          "lineNumber": 195
+          "lineNumber": 196
         },
         "deprecated": false,
         "children": [
@@ -31197,7 +31675,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTER>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"geo_bounding_box\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"filter\">, \"enabled\" | \"id\" | \"filter\" | \"customLabel\" | \"schema\" | \"geo_bounding_box\" | \"json\">, ",
+              ".FILTER>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"geo_bounding_box\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"filter\">, \"enabled\" | \"id\" | \"filter\" | \"customLabel\" | \"schema\" | \"geo_bounding_box\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31221,7 +31699,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 196
+              "lineNumber": 197
             },
             "deprecated": false
           },
@@ -31250,7 +31728,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\"> & Pick<{ filters?: string | undefined; }, \"filters\"> & Pick<{ filters?: string | undefined; }, never>, \"enabled\" | \"filters\" | \"id\" | \"schema\" | \"json\">, ",
+              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ filters?: string | undefined; }, \"filters\"> & Pick<{ filters?: string | undefined; }, never>, \"enabled\" | \"filters\" | \"id\" | \"schema\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31274,7 +31752,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 197
+              "lineNumber": 198
             },
             "deprecated": false
           },
@@ -31327,7 +31805,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 198
+              "lineNumber": 199
             },
             "deprecated": false
           },
@@ -31356,7 +31834,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".IP_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, \"ipRangeType\" | \"ranges\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
+              ".IP_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, \"ipRangeType\" | \"ranges\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31380,7 +31858,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 199
+              "lineNumber": 200
             },
             "deprecated": false
           },
@@ -31409,7 +31887,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ranges\" | \"time_zone\">, ",
+              ".DATE_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ranges\" | \"time_zone\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31433,7 +31911,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 200
+              "lineNumber": 201
             },
             "deprecated": false
           },
@@ -31462,7 +31940,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ranges\">, ",
+              ".RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31486,7 +31964,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 201
+              "lineNumber": 202
             },
             "deprecated": false
           },
@@ -31539,7 +32017,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 202
+              "lineNumber": 203
             },
             "deprecated": false
           },
@@ -31568,7 +32046,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: string | undefined; }, \"boundingBox\"> & Pick<{ boundingBox?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
+              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: string | undefined; }, \"boundingBox\"> & Pick<{ boundingBox?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31592,7 +32070,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 203
+              "lineNumber": 204
             },
             "deprecated": false
           },
@@ -31621,7 +32099,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, \"extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
+              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, \"extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31645,7 +32123,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 204
+              "lineNumber": 205
             },
             "deprecated": false
           },
@@ -31674,7 +32152,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, \"timeRange\" | \"extended_bounds\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"timeRange\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
+              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, \"timeRange\" | \"extended_bounds\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"timeRange\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31698,7 +32176,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 205
+              "lineNumber": 206
             },
             "deprecated": false
           },
@@ -31727,11 +32205,11 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
+              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
               " | undefined; }, \"orderAgg\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31755,7 +32233,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 206
+              "lineNumber": 207
             },
             "deprecated": false
           },
@@ -31808,7 +32286,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 207
+              "lineNumber": 208
             },
             "deprecated": false
           },
@@ -31837,7 +32315,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -31845,7 +32323,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31869,7 +32347,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 208
+              "lineNumber": 209
             },
             "deprecated": false
           },
@@ -31898,7 +32376,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -31906,7 +32384,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31930,7 +32408,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 209
+              "lineNumber": 210
             },
             "deprecated": false
           },
@@ -31959,7 +32437,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -31967,7 +32445,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -31991,7 +32469,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 210
+              "lineNumber": 211
             },
             "deprecated": false
           },
@@ -32020,7 +32498,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -32028,7 +32506,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -32052,7 +32530,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 211
+              "lineNumber": 212
             },
             "deprecated": false
           },
@@ -32081,7 +32559,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -32089,7 +32567,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -32113,7 +32591,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 212
+              "lineNumber": 213
             },
             "deprecated": false
           },
@@ -32166,7 +32644,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 213
+              "lineNumber": 214
             },
             "deprecated": false
           },
@@ -32219,7 +32697,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 214
+              "lineNumber": 215
             },
             "deprecated": false
           },
@@ -32248,11 +32726,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -32276,7 +32754,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 215
+              "lineNumber": 216
             },
             "deprecated": false
           },
@@ -32305,11 +32783,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".DERIVATIVE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".DERIVATIVE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -32333,7 +32811,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 216
+              "lineNumber": 217
             },
             "deprecated": false
           },
@@ -32386,7 +32864,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 217
+              "lineNumber": 218
             },
             "deprecated": false
           },
@@ -32439,7 +32917,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 218
+              "lineNumber": 219
             },
             "deprecated": false
           },
@@ -32492,7 +32970,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 219
+              "lineNumber": 220
             },
             "deprecated": false
           },
@@ -32545,7 +33023,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 220
+              "lineNumber": 221
             },
             "deprecated": false
           },
@@ -32598,7 +33076,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 221
+              "lineNumber": 222
             },
             "deprecated": false
           },
@@ -32651,7 +33129,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 222
+              "lineNumber": 223
             },
             "deprecated": false
           },
@@ -32680,11 +33158,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MOVING_FN>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
+              ".MOVING_FN>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -32708,7 +33186,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 223
+              "lineNumber": 224
             },
             "deprecated": false
           },
@@ -32761,7 +33239,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 224
+              "lineNumber": 225
             },
             "deprecated": false
           },
@@ -32814,7 +33292,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 225
+              "lineNumber": 226
             },
             "deprecated": false
           },
@@ -32843,11 +33321,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -32871,7 +33349,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 226
+              "lineNumber": 227
             },
             "deprecated": false
           },
@@ -32924,7 +33402,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 227
+              "lineNumber": 228
             },
             "deprecated": false
           },
@@ -32977,7 +33455,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 228
+              "lineNumber": 229
             },
             "deprecated": false
           },
@@ -33030,7 +33508,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 229
+              "lineNumber": 230
             },
             "deprecated": false
           }
@@ -33403,7 +33881,7 @@
             "plugin": "discover",
             "link": {
               "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-              "lineNumber": 58
+              "lineNumber": 59
             }
           },
           {
@@ -34754,28 +35232,28 @@
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 139
+              "lineNumber": 141
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 248
+              "lineNumber": 250
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 287
+              "lineNumber": 290
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 329
+              "lineNumber": 332
             }
           },
           {
@@ -35679,12 +36157,12 @@
           {
             "parentPluginId": "data",
             "id": "def-server.IFieldType.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/fields/types.ts",
@@ -36603,7 +37081,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 43
+          "lineNumber": 45
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -36616,7 +37094,7 @@
         "label": "AggGroupName",
         "description": [],
         "signature": [
-          "\"buckets\" | \"metrics\" | \"none\""
+          "\"none\" | \"buckets\" | \"metrics\""
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_groups.ts",
@@ -36988,7 +37466,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 53
+          "lineNumber": 55
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -37324,7 +37802,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-          "lineNumber": 35
+          "lineNumber": 36
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -38964,7 +39442,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 33
+                  "lineNumber": 39
                 },
                 "deprecated": false
               },
@@ -38995,7 +39473,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 34
+                  "lineNumber": 40
                 },
                 "deprecated": false
               },
@@ -39026,7 +39504,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 35
+                  "lineNumber": 41
                 },
                 "deprecated": false
               },
@@ -39048,7 +39526,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-                  "lineNumber": 36
+                  "lineNumber": 42
                 },
                 "deprecated": false
               }
@@ -39658,7 +40136,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/server/index.ts",
-          "lineNumber": 243
+          "lineNumber": 244
         },
         "deprecated": false,
         "children": [
@@ -39671,7 +40149,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/server/index.ts",
-              "lineNumber": 244
+              "lineNumber": 245
             },
             "deprecated": false,
             "children": [
@@ -39694,7 +40172,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 245
+                  "lineNumber": 246
                 },
                 "deprecated": false
               },
@@ -39710,7 +40188,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 246
+                  "lineNumber": 247
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -39750,7 +40228,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 247
+                  "lineNumber": 248
                 },
                 "deprecated": false
               },
@@ -39773,7 +40251,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 248
+                  "lineNumber": 249
                 },
                 "deprecated": false
               },
@@ -39796,7 +40274,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 249
+                  "lineNumber": 250
                 },
                 "deprecated": false
               },
@@ -39819,7 +40297,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 250
+                  "lineNumber": 251
                 },
                 "deprecated": false
               },
@@ -39843,7 +40321,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 251
+                  "lineNumber": 252
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -39892,7 +40370,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 252
+                  "lineNumber": 253
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -39941,7 +40419,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 253
+                  "lineNumber": 254
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -39976,7 +40454,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 254
+                  "lineNumber": 255
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -40008,7 +40486,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 255
+                  "lineNumber": 256
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -40053,7 +40531,7 @@
                 "description": [],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 256
+                  "lineNumber": 257
                 },
                 "deprecated": false
               },
@@ -40071,7 +40549,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 257
+                  "lineNumber": 258
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -40103,7 +40581,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 258
+                  "lineNumber": 259
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -40135,7 +40613,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 259
+                  "lineNumber": 260
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -40167,7 +40645,7 @@
                 "description": [],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 260
+                  "lineNumber": 261
                 },
                 "deprecated": false
               },
@@ -40183,7 +40661,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 261
+                  "lineNumber": 262
                 },
                 "deprecated": false
               },
@@ -40207,7 +40685,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 262
+                  "lineNumber": 263
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -40242,7 +40720,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/server/index.ts",
-                  "lineNumber": 263
+                  "lineNumber": 264
                 },
                 "deprecated": false,
                 "returnComment": [],
@@ -40306,7 +40784,7 @@
             ],
             "source": {
               "path": "src/plugins/data/server/index.ts",
-              "lineNumber": 265
+              "lineNumber": 266
             },
             "deprecated": false,
             "returnComment": [],
@@ -40391,7 +40869,7 @@
             ],
             "source": {
               "path": "src/plugins/data/server/index.ts",
-              "lineNumber": 266
+              "lineNumber": 267
             },
             "deprecated": false,
             "returnComment": [],
@@ -41124,7 +41602,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-          "lineNumber": 32
+          "lineNumber": 38
         },
         "deprecated": false,
         "children": [
@@ -41147,7 +41625,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-              "lineNumber": 33
+              "lineNumber": 39
             },
             "deprecated": false,
             "isRequired": false
@@ -41181,7 +41659,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-              "lineNumber": 34
+              "lineNumber": 40
             },
             "deprecated": false,
             "isRequired": true
@@ -41215,7 +41693,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-              "lineNumber": 35
+              "lineNumber": 41
             },
             "deprecated": false,
             "isRequired": true
@@ -41240,7 +41718,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/es_query/es_query/build_es_query.ts",
-              "lineNumber": 36
+              "lineNumber": 42
             },
             "deprecated": false,
             "isRequired": true
@@ -43386,7 +43864,7 @@
             "section": "def-common.IFieldType",
             "text": "IFieldType"
           },
-          ", value: string) => { script: { source: string; lang: string | undefined; params: { value: any; }; }; }"
+          ", value: string) => { script: { source: string; lang: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; params: { value: any; }; }; }"
         ],
         "source": {
           "path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
@@ -43564,7 +44042,7 @@
             "section": "def-common.RangeFilterParams",
             "text": "RangeFilterParams"
           },
-          ") => { script: { source: string; params: { from?: string | number | undefined; to?: string | number | undefined; gt?: string | number | undefined; lt?: string | number | undefined; gte?: string | number | undefined; lte?: string | number | undefined; format?: string | number | undefined; }; lang: string | undefined; }; }"
+          ") => { script: { source: string; params: { from?: string | number | undefined; to?: string | number | undefined; gt?: string | number | undefined; lt?: string | number | undefined; gte?: string | number | undefined; lte?: string | number | undefined; format?: string | number | undefined; }; lang: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; }; }"
         ],
         "source": {
           "path": "src/plugins/data/common/es_query/filters/range_filter.ts",
@@ -46324,7 +46802,7 @@
             "section": "def-common.PhraseFilterMeta",
             "text": "PhraseFilterMeta"
           },
-          "; script?: { script: { source?: any; lang?: string | undefined; params: any; }; } | undefined; }"
+          "; script?: { script: { source?: any; lang?: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; params: any; }; } | undefined; }"
         ],
         "source": {
           "path": "src/plugins/data/common/es_query/filters/phrase_filter.ts",
@@ -46493,7 +46971,9 @@
             "section": "def-common.RangeFilterMeta",
             "text": "RangeFilterMeta"
           },
-          "; script?: { script: { params: any; lang: string; source: any; }; } | undefined; match_all?: any; }"
+          "; script?: { script: { params: any; lang: ",
+          "ScriptLanguage",
+          "; source: any; }; } | undefined; match_all?: any; }"
         ],
         "source": {
           "path": "src/plugins/data/common/es_query/filters/range_filter.ts",
diff --git a/api_docs/data_autocomplete.json b/api_docs/data_autocomplete.json
index 38e27d4df6e2d..25bda08157358 100644
--- a/api_docs/data_autocomplete.json
+++ b/api_docs/data_autocomplete.json
@@ -370,7 +370,7 @@
         ],
         "source": {
           "path": "src/plugins/data/public/autocomplete/autocomplete_service.ts",
-          "lineNumber": 96
+          "lineNumber": 103
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/data_field_formats.json b/api_docs/data_field_formats.json
index 1807c32a18389..a5fba87c20169 100644
--- a/api_docs/data_field_formats.json
+++ b/api_docs/data_field_formats.json
@@ -513,7 +513,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-          "lineNumber": 157
+          "lineNumber": 211
         },
         "deprecated": false,
         "children": [
@@ -535,7 +535,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 158
+              "lineNumber": 212
             },
             "deprecated": false
           },
@@ -548,7 +548,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 159
+              "lineNumber": 213
             },
             "deprecated": false
           },
@@ -570,7 +570,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 162
+              "lineNumber": 216
             },
             "deprecated": false
           },
@@ -586,7 +586,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 163
+              "lineNumber": 217
             },
             "deprecated": false
           },
@@ -598,11 +598,11 @@
             "label": "outputFormats",
             "description": [],
             "signature": [
-              "{ text: string; method: string; }[]"
+              "({ text: string; method: string; shortText?: undefined; } | { text: string; shortText: string; method: string; })[]"
             ],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 164
+              "lineNumber": 218
             },
             "deprecated": false
           },
@@ -615,7 +615,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 165
+              "lineNumber": 219
             },
             "deprecated": false
           },
@@ -631,7 +631,25 @@
             ],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 167
+              "lineNumber": 221
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.DurationFormat.isHumanPrecise",
+            "type": "Function",
+            "tags": [],
+            "label": "isHumanPrecise",
+            "description": [],
+            "signature": [
+              "() => boolean"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/field_formats/converters/duration.ts",
+              "lineNumber": 225
             },
             "deprecated": false,
             "children": [],
@@ -645,11 +663,11 @@
             "label": "getParamDefaults",
             "description": [],
             "signature": [
-              "() => { inputFormat: string; outputFormat: string; outputPrecision: number; }"
+              "() => { inputFormat: string; outputFormat: string; outputPrecision: number; includeSpaceWithSuffix: boolean; }"
             ],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 170
+              "lineNumber": 229
             },
             "deprecated": false,
             "children": [],
@@ -663,11 +681,11 @@
             "label": "textConvert",
             "description": [],
             "signature": [
-              "(val: any) => string"
+              "(val: any) => any"
             ],
             "source": {
               "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-              "lineNumber": 178
+              "lineNumber": 238
             },
             "deprecated": false,
             "children": [
@@ -683,7 +701,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/field_formats/converters/duration.ts",
-                  "lineNumber": 178
+                  "lineNumber": 238
                 },
                 "deprecated": false,
                 "isRequired": true
diff --git a/api_docs/data_index_patterns.json b/api_docs/data_index_patterns.json
index 676ded76cb331..af5ddec480976 100644
--- a/api_docs/data_index_patterns.json
+++ b/api_docs/data_index_patterns.json
@@ -1689,7 +1689,9 @@
             "parentPluginId": "data",
             "id": "def-common.IndexPattern.addScriptedField",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "addScriptedField",
             "description": [
               "\nAdd scripted field to field list\n"
@@ -1699,9 +1701,10 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 244
+              "lineNumber": 245
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [],
             "children": [
               {
                 "parentPluginId": "data",
@@ -1717,7 +1720,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1736,7 +1739,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1753,7 +1756,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 244
+                  "lineNumber": 245
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1765,7 +1768,9 @@
             "parentPluginId": "data",
             "id": "def-common.IndexPattern.removeScriptedField",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "removeScriptedField",
             "description": [
               "\nRemove scripted field from field list"
@@ -1775,9 +1780,25 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 270
+              "lineNumber": 272
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx",
+                  "lineNumber": 117
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx",
+                  "lineNumber": 778
+                }
+              }
+            ],
             "children": [
               {
                 "parentPluginId": "data",
@@ -1791,7 +1812,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 270
+                  "lineNumber": 272
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1803,9 +1824,13 @@
             "parentPluginId": "data",
             "id": "def-common.IndexPattern.getNonScriptedFields",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "getNonScriptedFields",
-            "description": [],
+            "description": [
+              "\n"
+            ],
             "signature": [
               "() => ",
               {
@@ -1819,9 +1844,74 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 277
+              "lineNumber": 283
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/source_filters_table/components/table/table.tsx",
+                  "lineNumber": 152
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 66
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 74
+                }
+              },
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/edit_index_pattern.tsx",
+                  "lineNumber": 204
+                }
+              },
+              {
+                "plugin": "visTypeTimeseries",
+                "link": {
+                  "path": "src/plugins/vis_type_timeseries/server/lib/search_strategies/strategies/abstract_search_strategy.ts",
+                  "lineNumber": 65
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.ts",
+                  "lineNumber": 106
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/state_management/datasource.test.ts",
+                  "lineNumber": 29
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.test.ts",
+                  "lineNumber": 122
+                }
+              },
+              {
+                "plugin": "graph",
+                "link": {
+                  "path": "x-pack/plugins/graph/public/services/persistence/deserialize.test.ts",
+                  "lineNumber": 244
+                }
+              }
+            ],
             "children": [],
             "returnComment": []
           },
@@ -1829,9 +1919,13 @@
             "parentPluginId": "data",
             "id": "def-common.IndexPattern.getScriptedFields",
             "type": "Function",
-            "tags": [],
+            "tags": [
+              "deprecated"
+            ],
             "label": "getScriptedFields",
-            "description": [],
+            "description": [
+              "\n"
+            ],
             "signature": [
               "() => ",
               {
@@ -1845,9 +1939,18 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 281
+              "lineNumber": 291
             },
-            "deprecated": false,
+            "deprecated": true,
+            "references": [
+              {
+                "plugin": "indexPatternManagement",
+                "link": {
+                  "path": "src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx",
+                  "lineNumber": 61
+                }
+              }
+            ],
             "children": [],
             "returnComment": []
           },
@@ -1863,7 +1966,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 285
+              "lineNumber": 295
             },
             "deprecated": false,
             "children": [],
@@ -1881,7 +1984,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 289
+              "lineNumber": 299
             },
             "deprecated": false,
             "children": [],
@@ -1907,7 +2010,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 294
+              "lineNumber": 304
             },
             "deprecated": false,
             "children": [],
@@ -1933,7 +2036,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 299
+              "lineNumber": 309
             },
             "deprecated": false,
             "children": [
@@ -1949,7 +2052,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 299
+                  "lineNumber": 309
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1969,7 +2072,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 304
+              "lineNumber": 314
             },
             "deprecated": false,
             "children": [],
@@ -1985,11 +2088,18 @@
               "\nReturns index pattern as saved object body for saving"
             ],
             "signature": [
-              "() => { fieldAttrs: string | undefined; title: string; timeFieldName: string | undefined; intervalName: string | undefined; sourceFilters: string | undefined; fields: string | undefined; fieldFormatMap: string | undefined; type: string | undefined; typeMeta: string | undefined; allowNoIndex: true | undefined; runtimeFieldMap: string | undefined; }"
+              "() => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataIndexPatternsPluginApi",
+                "section": "def-common.IndexPatternAttributes",
+                "text": "IndexPatternAttributes"
+              }
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 311
+              "lineNumber": 321
             },
             "deprecated": false,
             "children": [],
@@ -2040,7 +2150,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 339
+              "lineNumber": 347
             },
             "deprecated": false,
             "children": [
@@ -2078,7 +2188,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 340
+                  "lineNumber": 348
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2108,7 +2218,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 360
+              "lineNumber": 368
             },
             "deprecated": false,
             "children": [
@@ -2126,7 +2236,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 360
+                  "lineNumber": 368
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2151,7 +2261,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 360
+                  "lineNumber": 368
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2173,7 +2283,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 384
+              "lineNumber": 392
             },
             "deprecated": false,
             "children": [
@@ -2191,7 +2301,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 384
+                  "lineNumber": 392
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2221,7 +2331,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 404
+              "lineNumber": 412
             },
             "deprecated": false,
             "children": [
@@ -2237,7 +2347,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 404
+                  "lineNumber": 412
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2265,7 +2375,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 411
+              "lineNumber": 419
             },
             "deprecated": false,
             "children": [
@@ -2281,7 +2391,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 412
+                  "lineNumber": 420
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2298,7 +2408,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 413
+                  "lineNumber": 421
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2322,7 +2432,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 414
+                  "lineNumber": 422
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2342,7 +2452,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 422
+              "lineNumber": 430
             },
             "deprecated": false,
             "children": [
@@ -2358,7 +2468,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 422
+                  "lineNumber": 430
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2375,7 +2485,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 422
+                  "lineNumber": 430
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -2395,7 +2505,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 433
+              "lineNumber": 441
             },
             "deprecated": false,
             "children": [
@@ -2411,7 +2521,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 433
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2428,7 +2538,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 433
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -2456,7 +2566,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 446
+              "lineNumber": 454
             },
             "deprecated": false,
             "children": [
@@ -2472,7 +2582,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 446
+                  "lineNumber": 454
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2496,7 +2606,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 446
+                  "lineNumber": 454
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2516,7 +2626,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-              "lineNumber": 450
+              "lineNumber": 458
             },
             "deprecated": false,
             "children": [
@@ -2532,7 +2642,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts",
-                  "lineNumber": 450
+                  "lineNumber": 458
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2748,14 +2858,14 @@
           {
             "parentPluginId": "data",
             "id": "def-common.IndexPatternField.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [
               "\nScript field language"
             ],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/fields/index_pattern_field.ts",
@@ -2766,12 +2876,12 @@
           {
             "parentPluginId": "data",
             "id": "def-common.IndexPatternField.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/fields/index_pattern_field.ts",
@@ -3058,7 +3168,7 @@
             "label": "toJSON",
             "description": [],
             "signature": [
-              "() => { count: number; script: string | undefined; lang: string | undefined; conflictDescriptions: Record<string, string[]> | undefined; name: string; type: string; esTypes: string[] | undefined; scripted: boolean; searchable: boolean; aggregatable: boolean; readFromDocValues: boolean; subType: ",
+              "() => { count: number; script: string | undefined; lang: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; conflictDescriptions: Record<string, string[]> | undefined; name: string; type: string; esTypes: string[] | undefined; scripted: boolean; searchable: boolean; aggregatable: boolean; readFromDocValues: boolean; subType: ",
               {
                 "pluginId": "data",
                 "scope": "common",
@@ -4012,7 +4122,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 473
+              "lineNumber": 480
             },
             "deprecated": false,
             "children": [
@@ -4028,7 +4138,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 473
+                  "lineNumber": 480
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4066,7 +4176,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 492
+              "lineNumber": 499
             },
             "deprecated": false,
             "children": [
@@ -4088,7 +4198,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4105,7 +4215,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 492
+                  "lineNumber": 499
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4145,7 +4255,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 517
+              "lineNumber": 524
             },
             "deprecated": false,
             "children": [
@@ -4167,7 +4277,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4186,7 +4296,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4205,7 +4315,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 517
+                  "lineNumber": 524
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4243,7 +4353,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 530
+              "lineNumber": 537
             },
             "deprecated": false,
             "children": [
@@ -4265,7 +4375,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4284,7 +4394,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 530
+                  "lineNumber": 537
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4314,7 +4424,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 558
+              "lineNumber": 570
             },
             "deprecated": false,
             "children": [
@@ -4336,7 +4446,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 559
+                  "lineNumber": 571
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4353,7 +4463,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 560
+                  "lineNumber": 572
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4370,7 +4480,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 561
+                  "lineNumber": 573
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4392,7 +4502,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-              "lineNumber": 644
+              "lineNumber": 656
             },
             "deprecated": false,
             "children": [
@@ -4410,7 +4520,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-                  "lineNumber": 644
+                  "lineNumber": 656
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4766,14 +4876,14 @@
           {
             "parentPluginId": "data",
             "id": "def-common.FieldSpec.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [
               "\nScripted field langauge\nPainless is the only valid scripted field language"
             ],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/types.ts",
@@ -5081,12 +5191,12 @@
           {
             "parentPluginId": "data",
             "id": "def-common.FieldSpecExportFmt.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/types.ts",
@@ -5542,7 +5652,7 @@
             "plugin": "discover",
             "link": {
               "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-              "lineNumber": 58
+              "lineNumber": 59
             }
           },
           {
@@ -6893,28 +7003,28 @@
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 139
+              "lineNumber": 141
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 248
+              "lineNumber": 250
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 287
+              "lineNumber": 290
             }
           },
           {
             "plugin": "lens",
             "link": {
               "path": "x-pack/plugins/lens/server/routes/field_stats.ts",
-              "lineNumber": 329
+              "lineNumber": 332
             }
           },
           {
@@ -7818,12 +7928,12 @@
           {
             "parentPluginId": "data",
             "id": "def-common.IFieldType.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/index_patterns/fields/types.ts",
@@ -8351,6 +8461,20 @@
               "lineNumber": 85
             }
           },
+          {
+            "plugin": "lens",
+            "link": {
+              "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx",
+              "lineNumber": 25
+            }
+          },
+          {
+            "plugin": "lens",
+            "link": {
+              "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx",
+              "lineNumber": 102
+            }
+          },
           {
             "plugin": "lens",
             "link": {
@@ -8456,20 +8580,6 @@
               "lineNumber": 30
             }
           },
-          {
-            "plugin": "apm",
-            "link": {
-              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
-              "lineNumber": 14
-            }
-          },
-          {
-            "plugin": "apm",
-            "link": {
-              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
-              "lineNumber": 31
-            }
-          },
           {
             "plugin": "infra",
             "link": {
@@ -8638,6 +8748,20 @@
               "lineNumber": 23
             }
           },
+          {
+            "plugin": "apm",
+            "link": {
+              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
+              "lineNumber": 14
+            }
+          },
+          {
+            "plugin": "apm",
+            "link": {
+              "path": "x-pack/plugins/apm/public/components/shared/KueryBar/index.tsx",
+              "lineNumber": 31
+            }
+          },
           {
             "plugin": "lists",
             "link": {
@@ -8670,21 +8794,21 @@
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts",
-              "lineNumber": 21
+              "lineNumber": 22
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts",
-              "lineNumber": 66
+              "lineNumber": 72
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts",
-              "lineNumber": 19
+              "lineNumber": 20
             }
           },
           {
@@ -8943,21 +9067,21 @@
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts",
-              "lineNumber": 44
+              "lineNumber": 48
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts",
-              "lineNumber": 60
+              "lineNumber": 64
             }
           },
           {
             "plugin": "securitySolution",
             "link": {
               "path": "x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts",
-              "lineNumber": 65
+              "lineNumber": 69
             }
           },
           {
@@ -9744,6 +9868,20 @@
               "lineNumber": 30
             }
           },
+          {
+            "plugin": "securitySolution",
+            "link": {
+              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts",
+              "lineNumber": 13
+            }
+          },
+          {
+            "plugin": "securitySolution",
+            "link": {
+              "path": "x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts",
+              "lineNumber": 52
+            }
+          },
           {
             "plugin": "stackAlerts",
             "link": {
@@ -9947,20 +10085,6 @@
               "lineNumber": 1352
             }
           },
-          {
-            "plugin": "discover",
-            "link": {
-              "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx",
-              "lineNumber": 17
-            }
-          },
-          {
-            "plugin": "discover",
-            "link": {
-              "path": "src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx",
-              "lineNumber": 26
-            }
-          },
           {
             "plugin": "maps",
             "link": {
@@ -9972,7 +10096,7 @@
             "plugin": "maps",
             "link": {
               "path": "x-pack/plugins/maps/public/embeddable/types.ts",
-              "lineNumber": 45
+              "lineNumber": 44
             }
           },
           {
@@ -10077,14 +10201,14 @@
             "plugin": "observability",
             "link": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 18
+              "lineNumber": 19
             }
           },
           {
             "plugin": "observability",
             "link": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 95
+              "lineNumber": 104
             }
           },
           {
@@ -10126,7 +10250,7 @@
             "plugin": "observability",
             "link": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts",
-              "lineNumber": 24
+              "lineNumber": 25
             }
           },
           {
@@ -10294,14 +10418,14 @@
             "plugin": "transform",
             "link": {
               "path": "x-pack/plugins/transform/server/routes/api/transforms.ts",
-              "lineNumber": 62
+              "lineNumber": 63
             }
           },
           {
             "plugin": "transform",
             "link": {
               "path": "x-pack/plugins/transform/server/routes/api/transforms.ts",
-              "lineNumber": 404
+              "lineNumber": 405
             }
           },
           {
@@ -12657,7 +12781,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts",
-          "lineNumber": 650
+          "lineNumber": 662
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/data_search.json b/api_docs/data_search.json
index d72ae79e79bd8..99c04298c27cb 100644
--- a/api_docs/data_search.json
+++ b/api_docs/data_search.json
@@ -1447,12 +1447,12 @@
           {
             "parentPluginId": "data",
             "id": "def-public.Reason.lang",
-            "type": "string",
+            "type": "CompoundType",
             "tags": [],
             "label": "lang",
             "description": [],
             "signature": [
-              "string | undefined"
+              "\"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined"
             ],
             "source": {
               "path": "src/plugins/data/public/search/errors/types.ts",
@@ -2272,7 +2272,7 @@
         "label": "getShardTimeout",
         "description": [],
         "signature": [
-          "(config: Readonly<{ kibana: Readonly<{ readonly index: string; readonly autocompleteTerminateAfter: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly autocompleteTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
+          "(config: Readonly<{ kibana: Readonly<{ readonly index: string; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
           "ByteSizeValue",
           ") => boolean; isLessThan: (other: ",
           "ByteSizeValue",
@@ -2298,7 +2298,7 @@
             "label": "config",
             "description": [],
             "signature": [
-              "Readonly<{ kibana: Readonly<{ readonly index: string; readonly autocompleteTerminateAfter: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly autocompleteTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
+              "Readonly<{ kibana: Readonly<{ readonly index: string; }>; elasticsearch: Readonly<{ readonly shardTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly requestTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; readonly pingTimeout: Readonly<{ clone: () => moment.Duration; humanize: { (argWithSuffix?: boolean | undefined, argThresholds?: moment.argThresholdOpts | undefined): string; (argThresholds?: moment.argThresholdOpts | undefined): string; }; abs: () => moment.Duration; as: (units: moment.unitOfTime.Base) => number; get: (units: moment.unitOfTime.Base) => number; milliseconds: () => number; asMilliseconds: () => number; seconds: () => number; asSeconds: () => number; minutes: () => number; asMinutes: () => number; hours: () => number; asHours: () => number; days: () => number; asDays: () => number; weeks: () => number; asWeeks: () => number; months: () => number; asMonths: () => number; years: () => number; asYears: () => number; add: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; subtract: (inp?: moment.DurationInputArg1, unit?: \"year\" | \"years\" | \"y\" | \"month\" | \"months\" | \"M\" | \"week\" | \"weeks\" | \"w\" | \"day\" | \"days\" | \"d\" | \"hour\" | \"hours\" | \"h\" | \"minute\" | \"minutes\" | \"m\" | \"second\" | \"seconds\" | \"s\" | \"millisecond\" | \"milliseconds\" | \"ms\" | \"quarter\" | \"quarters\" | \"Q\" | undefined) => moment.Duration; locale: { (): string; (locale: moment.LocaleSpecifier): moment.Duration; }; localeData: () => moment.Locale; toISOString: () => string; toJSON: () => string; isValid: () => boolean; lang: { (locale: moment.LocaleSpecifier): moment.Moment; (): moment.Locale; }; toIsoString: () => string; }>; }>; path: Readonly<{ readonly data: string; }>; savedObjects: Readonly<{ readonly maxImportPayloadBytes: Readonly<{ isGreaterThan: (other: ",
               "ByteSizeValue",
               ") => boolean; isLessThan: (other: ",
               "ByteSizeValue",
@@ -2820,7 +2820,7 @@
                 "description": [],
                 "signature": [
                   "{ filter?: any; aggs?: Record<string, ",
-                  "AggregationContainer",
+                  "AggregationsAggregationContainer",
                   "> | undefined; fields?: string[] | undefined; searchAfter?: string[] | undefined; page?: number | undefined; perPage?: number | undefined; sortField?: string | undefined; sortOrder?: \"asc\" | \"desc\" | \"_doc\" | undefined; search?: string | undefined; searchFields?: string[] | undefined; rootSearchFields?: string[] | undefined; hasReference?: ",
                   {
                     "pluginId": "core",
@@ -4164,7 +4164,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 55
+          "lineNumber": 57
         },
         "deprecated": false,
         "children": [
@@ -4184,7 +4184,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 63
+              "lineNumber": 65
             },
             "deprecated": false,
             "children": [
@@ -4202,7 +4202,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 63
+                  "lineNumber": 65
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4236,7 +4236,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 83
+              "lineNumber": 85
             },
             "deprecated": false,
             "children": [
@@ -4259,7 +4259,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 83
+                  "lineNumber": 85
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4287,7 +4287,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 92
+              "lineNumber": 94
             },
             "deprecated": false
           },
@@ -4300,7 +4300,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 93
+              "lineNumber": 95
             },
             "deprecated": false
           },
@@ -4313,7 +4313,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 94
+              "lineNumber": 96
             },
             "deprecated": false
           },
@@ -4329,7 +4329,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 95
+              "lineNumber": 97
             },
             "deprecated": false
           },
@@ -4352,7 +4352,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 96
+              "lineNumber": 98
             },
             "deprecated": false
           },
@@ -4368,7 +4368,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 97
+              "lineNumber": 99
             },
             "deprecated": false
           },
@@ -4384,7 +4384,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 98
+              "lineNumber": 100
             },
             "deprecated": false
           },
@@ -4400,7 +4400,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 104
+              "lineNumber": 106
             },
             "deprecated": false,
             "children": [
@@ -4422,7 +4422,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 104
+                  "lineNumber": 106
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4457,7 +4457,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 104
+                  "lineNumber": 106
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4481,7 +4481,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 134
+              "lineNumber": 136
             },
             "deprecated": false,
             "children": [
@@ -4499,7 +4499,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 134
+                  "lineNumber": 136
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4519,7 +4519,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 171
+              "lineNumber": 173
             },
             "deprecated": false,
             "children": [
@@ -4535,7 +4535,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 171
+                  "lineNumber": 173
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4543,6 +4543,42 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfig.hasTimeShift",
+            "type": "Function",
+            "tags": [],
+            "label": "hasTimeShift",
+            "description": [],
+            "signature": [
+              "() => boolean"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_config.ts",
+              "lineNumber": 177
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfig.getTimeShift",
+            "type": "Function",
+            "tags": [],
+            "label": "getTimeShift",
+            "description": [],
+            "signature": [
+              "() => moment.Duration | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_config.ts",
+              "lineNumber": 181
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-common.AggConfig.write",
@@ -4563,7 +4599,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 175
+              "lineNumber": 202
             },
             "deprecated": false,
             "children": [
@@ -4586,7 +4622,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 175
+                  "lineNumber": 202
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -4606,7 +4642,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 179
+              "lineNumber": 206
             },
             "deprecated": false,
             "children": [],
@@ -4624,7 +4660,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 183
+              "lineNumber": 210
             },
             "deprecated": false,
             "children": [
@@ -4640,7 +4676,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 183
+                  "lineNumber": 210
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4657,7 +4693,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 183
+                  "lineNumber": 210
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4697,7 +4733,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 209
+              "lineNumber": 236
             },
             "deprecated": false,
             "children": [
@@ -4721,7 +4757,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 209
+                  "lineNumber": 236
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -4745,7 +4781,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 209
+                  "lineNumber": 236
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -4777,7 +4813,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 230
+              "lineNumber": 257
             },
             "deprecated": false,
             "children": [
@@ -4802,7 +4838,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 230
+                  "lineNumber": 257
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -4826,7 +4862,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 265
+              "lineNumber": 292
             },
             "deprecated": false,
             "children": [],
@@ -4850,7 +4886,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 296
+              "lineNumber": 323
             },
             "deprecated": true,
             "references": [
@@ -4879,7 +4915,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 307
+              "lineNumber": 334
             },
             "deprecated": false,
             "children": [],
@@ -4905,7 +4941,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 316
+              "lineNumber": 343
             },
             "deprecated": false,
             "children": [],
@@ -4941,7 +4977,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 371
+              "lineNumber": 398
             },
             "deprecated": false,
             "children": [],
@@ -4967,7 +5003,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 375
+              "lineNumber": 402
             },
             "deprecated": false,
             "children": [],
@@ -4993,7 +5029,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 379
+              "lineNumber": 406
             },
             "deprecated": false,
             "children": [],
@@ -5011,7 +5047,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 383
+              "lineNumber": 410
             },
             "deprecated": false,
             "children": [
@@ -5027,7 +5063,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 383
+                  "lineNumber": 410
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5047,7 +5083,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 387
+              "lineNumber": 414
             },
             "deprecated": false,
             "children": [
@@ -5063,7 +5099,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 387
+                  "lineNumber": 414
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5080,7 +5116,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 387
+                  "lineNumber": 414
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -5100,7 +5136,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 395
+              "lineNumber": 422
             },
             "deprecated": false,
             "children": [],
@@ -5118,7 +5154,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 401
+              "lineNumber": 428
             },
             "deprecated": false,
             "children": [],
@@ -5138,7 +5174,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 410
+              "lineNumber": 437
             },
             "deprecated": false,
             "children": [],
@@ -5156,7 +5192,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 414
+              "lineNumber": 441
             },
             "deprecated": false,
             "children": [
@@ -5172,7 +5208,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 414
+                  "lineNumber": 441
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5199,7 +5235,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 428
+              "lineNumber": 455
             },
             "deprecated": false,
             "children": [],
@@ -5225,7 +5261,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 432
+              "lineNumber": 459
             },
             "deprecated": false,
             "children": [],
@@ -5243,7 +5279,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 436
+              "lineNumber": 463
             },
             "deprecated": false,
             "children": [],
@@ -5261,7 +5297,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 441
+              "lineNumber": 468
             },
             "deprecated": false,
             "children": [],
@@ -5310,7 +5346,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 452
+              "lineNumber": 479
             },
             "deprecated": false
           },
@@ -5357,7 +5393,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 456
+              "lineNumber": 483
             },
             "deprecated": false
           },
@@ -5381,7 +5417,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-              "lineNumber": 486
+              "lineNumber": 513
             },
             "deprecated": false,
             "children": [
@@ -5403,7 +5439,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-                  "lineNumber": 486
+                  "lineNumber": 513
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5423,7 +5459,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-          "lineNumber": 65
+          "lineNumber": 78
         },
         "deprecated": false,
         "children": [
@@ -5445,7 +5481,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 66
+              "lineNumber": 79
             },
             "deprecated": false
           },
@@ -5468,7 +5504,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 67
+              "lineNumber": 80
             },
             "deprecated": false
           },
@@ -5484,7 +5520,23 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 68
+              "lineNumber": 81
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfigs.forceNow",
+            "type": "Object",
+            "tags": [],
+            "label": "forceNow",
+            "description": [],
+            "signature": [
+              "Date | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 82
             },
             "deprecated": false
           },
@@ -5500,7 +5552,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 69
+              "lineNumber": 83
             },
             "deprecated": false
           },
@@ -5523,7 +5575,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 73
+              "lineNumber": 87
             },
             "deprecated": false
           },
@@ -5539,7 +5591,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 75
+              "lineNumber": 89
             },
             "deprecated": false,
             "children": [
@@ -5561,7 +5613,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 76
+                  "lineNumber": 90
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5596,7 +5648,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 77
+                  "lineNumber": 91
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5619,7 +5671,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 78
+                  "lineNumber": 92
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5639,7 +5691,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 91
+              "lineNumber": 105
             },
             "deprecated": false,
             "children": [
@@ -5655,7 +5707,43 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 91
+                  "lineNumber": 105
+                },
+                "deprecated": false,
+                "isRequired": false
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfigs.setForceNow",
+            "type": "Function",
+            "tags": [],
+            "label": "setForceNow",
+            "description": [],
+            "signature": [
+              "(now: Date | undefined) => void"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 109
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.AggConfigs.setForceNow.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "now",
+                "description": [],
+                "signature": [
+                  "Date | undefined"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+                  "lineNumber": 109
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -5683,7 +5771,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 95
+              "lineNumber": 113
             },
             "deprecated": false,
             "children": [
@@ -5705,7 +5793,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 95
+                  "lineNumber": 113
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5732,7 +5820,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 113
+              "lineNumber": 131
             },
             "deprecated": false,
             "children": [
@@ -5748,7 +5836,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 113
+                  "lineNumber": 131
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5802,7 +5890,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 126
+              "lineNumber": 144
             },
             "deprecated": false,
             "children": [
@@ -5836,7 +5924,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 127
+                  "lineNumber": 145
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5853,7 +5941,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 128
+                  "lineNumber": 146
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5883,7 +5971,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 169
+              "lineNumber": 187
             },
             "deprecated": false,
             "children": [
@@ -5908,7 +5996,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 169
+                  "lineNumber": 187
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -5928,7 +6016,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 181
+              "lineNumber": 199
             },
             "deprecated": false,
             "children": [],
@@ -5954,7 +6042,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 250
+              "lineNumber": 289
             },
             "deprecated": false,
             "children": [],
@@ -5979,7 +6067,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 254
+              "lineNumber": 293
             },
             "deprecated": false,
             "children": [
@@ -5995,7 +6083,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 254
+                  "lineNumber": 293
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6023,7 +6111,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 258
+              "lineNumber": 297
             },
             "deprecated": false,
             "children": [
@@ -6039,7 +6127,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 258
+                  "lineNumber": 297
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6067,7 +6155,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 262
+              "lineNumber": 301
             },
             "deprecated": false,
             "children": [
@@ -6083,7 +6171,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 262
+                  "lineNumber": 301
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6111,7 +6199,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 266
+              "lineNumber": 305
             },
             "deprecated": false,
             "children": [
@@ -6127,7 +6215,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 266
+                  "lineNumber": 305
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6155,7 +6243,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 270
+              "lineNumber": 309
             },
             "deprecated": false,
             "children": [
@@ -6171,7 +6259,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 270
+                  "lineNumber": 309
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6199,7 +6287,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 274
+              "lineNumber": 313
             },
             "deprecated": false,
             "children": [
@@ -6215,7 +6303,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 274
+                  "lineNumber": 313
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6243,7 +6331,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 278
+              "lineNumber": 317
             },
             "deprecated": false,
             "children": [],
@@ -6251,73 +6339,35 @@
           },
           {
             "parentPluginId": "data",
-            "id": "def-common.AggConfigs.getRequestAggById",
+            "id": "def-common.AggConfigs.getTimeShifts",
             "type": "Function",
             "tags": [],
-            "label": "getRequestAggById",
+            "label": "getTimeShifts",
             "description": [],
             "signature": [
-              "(id: string) => ",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataSearchPluginApi",
-                "section": "def-common.AggConfig",
-                "text": "AggConfig"
-              },
-              " | undefined"
+              "() => Record<string, moment.Duration>"
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 292
+              "lineNumber": 331
             },
             "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "data",
-                "id": "def-common.AggConfigs.getRequestAggById.$1",
-                "type": "string",
-                "tags": [],
-                "label": "id",
-                "description": [],
-                "signature": [
-                  "string"
-                ],
-                "source": {
-                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 292
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
+            "children": [],
             "returnComment": []
           },
           {
             "parentPluginId": "data",
-            "id": "def-common.AggConfigs.getResponseAggs",
+            "id": "def-common.AggConfigs.getTimeShiftInterval",
             "type": "Function",
-            "tags": [
-              "return"
-            ],
-            "label": "getResponseAggs",
-            "description": [
-              "\nGets the AggConfigs (and possibly ResponseAggConfigs) that\nrepresent the values that will be produced when all aggs\nare run.\n\nWith multi-value metric aggs it is possible for a single agg\nrequest to result in multiple agg values, which is why the length\nof a vis' responseValuesAggs may be different than the vis' aggs\n"
-            ],
+            "tags": [],
+            "label": "getTimeShiftInterval",
+            "description": [],
             "signature": [
-              "() => ",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataSearchPluginApi",
-                "section": "def-common.AggConfig",
-                "text": "AggConfig"
-              },
-              "[]"
+              "() => moment.Duration | undefined"
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 307
+              "lineNumber": 346
             },
             "deprecated": false,
             "children": [],
@@ -6325,83 +6375,278 @@
           },
           {
             "parentPluginId": "data",
-            "id": "def-common.AggConfigs.getResponseAggById",
+            "id": "def-common.AggConfigs.hasTimeShifts",
             "type": "Function",
-            "tags": [
-              "return"
-            ],
-            "label": "getResponseAggById",
-            "description": [
-              "\nFind a response agg by it's id. This may be an agg in the aggConfigs, or one\ncreated specifically for a response value\n"
+            "tags": [],
+            "label": "hasTimeShifts",
+            "description": [],
+            "signature": [
+              "() => boolean"
             ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 353
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfigs.getSearchSourceTimeFilter",
+            "type": "Function",
+            "tags": [],
+            "label": "getSearchSourceTimeFilter",
+            "description": [],
             "signature": [
-              "(id: string) => ",
+              "(forceNow?: Date | undefined) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
-                "docId": "kibDataSearchPluginApi",
-                "section": "def-common.AggConfig",
-                "text": "AggConfig"
+                "docId": "kibDataPluginApi",
+                "section": "def-common.RangeFilter",
+                "text": "RangeFilter"
               },
-              " | undefined"
+              "[] | { meta: { index: string | undefined; params: {}; alias: string; disabled: boolean; negate: boolean; }; query: { bool: { should: { bool: { filter: { range: { [x: string]: { gte: string; lte: string; }; }; }[]; }; }[]; minimum_should_match: number; }; }; }[]"
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 321
+              "lineNumber": 357
             },
             "deprecated": false,
             "children": [
               {
                 "parentPluginId": "data",
-                "id": "def-common.AggConfigs.getResponseAggById.$1",
-                "type": "string",
+                "id": "def-common.AggConfigs.getSearchSourceTimeFilter.$1",
+                "type": "Object",
                 "tags": [],
-                "label": "id",
-                "description": [
-                  "- the id of the agg to find"
-                ],
+                "label": "forceNow",
+                "description": [],
                 "signature": [
-                  "string"
+                  "Date | undefined"
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 321
+                  "lineNumber": 357
                 },
                 "deprecated": false,
-                "isRequired": true
+                "isRequired": false
               }
             ],
             "returnComment": []
           },
           {
             "parentPluginId": "data",
-            "id": "def-common.AggConfigs.onSearchRequestStart",
+            "id": "def-common.AggConfigs.postFlightTransform",
             "type": "Function",
             "tags": [],
-            "label": "onSearchRequestStart",
+            "label": "postFlightTransform",
             "description": [],
             "signature": [
-              "(searchSource: Pick<",
+              "(response: ",
               {
                 "pluginId": "data",
                 "scope": "common",
                 "docId": "kibDataSearchPluginApi",
-                "section": "def-common.SearchSource",
-                "text": "SearchSource"
+                "section": "def-common.IEsSearchResponse",
+                "text": "IEsSearchResponse"
               },
-              ", \"create\" | \"history\" | \"setPreferredSearchStrategyId\" | \"setField\" | \"removeField\" | \"setFields\" | \"getId\" | \"getFields\" | \"getField\" | \"getOwnField\" | \"createCopy\" | \"createChild\" | \"setParent\" | \"getParent\" | \"fetch$\" | \"fetch\" | \"onRequestStart\" | \"getSearchRequestBody\" | \"destroy\" | \"getSerializedFields\" | \"serialize\">, options?: ",
+              "<any>) => ",
               {
                 "pluginId": "data",
                 "scope": "common",
                 "docId": "kibDataSearchPluginApi",
-                "section": "def-common.ISearchOptions",
-                "text": "ISearchOptions"
+                "section": "def-common.IEsSearchResponse",
+                "text": "IEsSearchResponse"
               },
-              " | undefined) => Promise<[unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown]>"
+              "<any>"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 410
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.AggConfigs.postFlightTransform.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "response",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "data",
+                    "scope": "common",
+                    "docId": "kibDataSearchPluginApi",
+                    "section": "def-common.IEsSearchResponse",
+                    "text": "IEsSearchResponse"
+                  },
+                  "<any>"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+                  "lineNumber": 410
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfigs.getRequestAggById",
+            "type": "Function",
+            "tags": [],
+            "label": "getRequestAggById",
+            "description": [],
+            "signature": [
+              "(id: string) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.AggConfig",
+                "text": "AggConfig"
+              },
+              " | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 429
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.AggConfigs.getRequestAggById.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+                  "lineNumber": 429
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfigs.getResponseAggs",
+            "type": "Function",
+            "tags": [
+              "return"
+            ],
+            "label": "getResponseAggs",
+            "description": [
+              "\nGets the AggConfigs (and possibly ResponseAggConfigs) that\nrepresent the values that will be produced when all aggs\nare run.\n\nWith multi-value metric aggs it is possible for a single agg\nrequest to result in multiple agg values, which is why the length\nof a vis' responseValuesAggs may be different than the vis' aggs\n"
+            ],
+            "signature": [
+              "() => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.AggConfig",
+                "text": "AggConfig"
+              },
+              "[]"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 444
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfigs.getResponseAggById",
+            "type": "Function",
+            "tags": [
+              "return"
+            ],
+            "label": "getResponseAggById",
+            "description": [
+              "\nFind a response agg by it's id. This may be an agg in the aggConfigs, or one\ncreated specifically for a response value\n"
+            ],
+            "signature": [
+              "(id: string) => ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.AggConfig",
+                "text": "AggConfig"
+              },
+              " | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+              "lineNumber": 458
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.AggConfigs.getResponseAggById.$1",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [
+                  "- the id of the agg to find"
+                ],
+                "signature": [
+                  "string"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+                  "lineNumber": 458
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggConfigs.onSearchRequestStart",
+            "type": "Function",
+            "tags": [],
+            "label": "onSearchRequestStart",
+            "description": [],
+            "signature": [
+              "(searchSource: Pick<",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.SearchSource",
+                "text": "SearchSource"
+              },
+              ", \"create\" | \"history\" | \"setPreferredSearchStrategyId\" | \"setField\" | \"removeField\" | \"setFields\" | \"getId\" | \"getFields\" | \"getField\" | \"getOwnField\" | \"createCopy\" | \"createChild\" | \"setParent\" | \"getParent\" | \"fetch$\" | \"fetch\" | \"onRequestStart\" | \"getSearchRequestBody\" | \"destroy\" | \"getSerializedFields\" | \"serialize\">, options?: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.ISearchOptions",
+                "text": "ISearchOptions"
+              },
+              " | undefined) => Promise<[unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown]>"
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 330
+              "lineNumber": 467
             },
             "deprecated": false,
             "children": [
@@ -6425,7 +6670,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 330
+                  "lineNumber": 467
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -6449,7 +6694,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-                  "lineNumber": 330
+                  "lineNumber": 467
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -7629,6 +7874,73 @@
             ],
             "returnComment": []
           },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.AggType.splitForTimeShift",
+            "type": "Function",
+            "tags": [],
+            "label": "splitForTimeShift",
+            "description": [],
+            "signature": [
+              "(agg: TAggConfig, aggs: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.AggConfigs",
+                "text": "AggConfigs"
+              },
+              ") => boolean"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/agg_type.ts",
+              "lineNumber": 218
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.AggType.splitForTimeShift.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "agg",
+                "description": [],
+                "signature": [
+                  "TAggConfig"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_type.ts",
+                  "lineNumber": 218
+                },
+                "deprecated": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.AggType.splitForTimeShift.$2",
+                "type": "Object",
+                "tags": [],
+                "label": "aggs",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "data",
+                    "scope": "common",
+                    "docId": "kibDataSearchPluginApi",
+                    "section": "def-common.AggConfigs",
+                    "text": "AggConfigs"
+                  }
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/agg_type.ts",
+                  "lineNumber": 218
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
           {
             "parentPluginId": "data",
             "id": "def-common.AggType.Unnamed",
@@ -7646,7 +7958,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_type.ts",
-              "lineNumber": 227
+              "lineNumber": 231
             },
             "deprecated": false,
             "children": [
@@ -7679,7 +7991,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/agg_type.ts",
-                  "lineNumber": 227
+                  "lineNumber": 231
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -8296,7 +8608,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-          "lineNumber": 31
+          "lineNumber": 40
         },
         "deprecated": false,
         "children": [
@@ -8312,7 +8624,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-              "lineNumber": 35
+              "lineNumber": 44
             },
             "deprecated": false,
             "returnComment": [],
@@ -8329,7 +8641,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-                  "lineNumber": 35
+                  "lineNumber": 44
                 },
                 "deprecated": false
               },
@@ -8345,40 +8657,244 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-                  "lineNumber": 35
+                  "lineNumber": 44
+                },
+                "deprecated": false
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.agg",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "agg",
+                "description": [],
+                "signature": [
+                  "TBucketAggConfig"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+                  "lineNumber": 44
                 },
                 "deprecated": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.BucketAggType.type",
+            "type": "string",
+            "tags": [],
+            "label": "type",
+            "description": [],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+              "lineNumber": 45
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.BucketAggType.getShiftedKey",
+            "type": "Function",
+            "tags": [],
+            "label": "getShiftedKey",
+            "description": [],
+            "signature": [
+              "(agg: TBucketAggConfig, key: React.ReactText, timeShift: moment.Duration) => React.ReactText"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+              "lineNumber": 47
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.BucketAggType.getShiftedKey.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "agg",
+                "description": [],
+                "signature": [
+                  "TBucketAggConfig"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+                  "lineNumber": 48
+                },
+                "deprecated": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.BucketAggType.getShiftedKey.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "key",
+                "description": [],
+                "signature": [
+                  "React.ReactText"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+                  "lineNumber": 49
+                },
+                "deprecated": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.BucketAggType.getShiftedKey.$3",
+                "type": "Object",
+                "tags": [],
+                "label": "timeShift",
+                "description": [],
+                "signature": [
+                  "moment.Duration"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+                  "lineNumber": 50
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.BucketAggType.getTimeShiftInterval",
+            "type": "Function",
+            "tags": [],
+            "label": "getTimeShiftInterval",
+            "description": [],
+            "signature": [
+              "(agg: TBucketAggConfig) => moment.Duration | undefined"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+              "lineNumber": 55
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.BucketAggType.getTimeShiftInterval.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "agg",
+                "description": [],
+                "signature": [
+                  "TBucketAggConfig"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+                  "lineNumber": 55
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "data",
+            "id": "def-common.BucketAggType.orderBuckets",
+            "type": "Function",
+            "tags": [],
+            "label": "orderBuckets",
+            "description": [],
+            "signature": [
+              "(agg: TBucketAggConfig, a: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.GenericBucket",
+                "text": "GenericBucket"
+              },
+              ", b: ",
+              {
+                "pluginId": "data",
+                "scope": "common",
+                "docId": "kibDataSearchPluginApi",
+                "section": "def-common.GenericBucket",
+                "text": "GenericBucket"
+              },
+              ") => number"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+              "lineNumber": 59
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "data",
+                "id": "def-common.BucketAggType.orderBuckets.$1",
+                "type": "Uncategorized",
+                "tags": [],
+                "label": "agg",
+                "description": [],
+                "signature": [
+                  "TBucketAggConfig"
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+                  "lineNumber": 59
+                },
+                "deprecated": false,
+                "isRequired": true
+              },
+              {
+                "parentPluginId": "data",
+                "id": "def-common.BucketAggType.orderBuckets.$2",
+                "type": "CompoundType",
+                "tags": [],
+                "label": "a",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "data",
+                    "scope": "common",
+                    "docId": "kibDataSearchPluginApi",
+                    "section": "def-common.GenericBucket",
+                    "text": "GenericBucket"
+                  }
+                ],
+                "source": {
+                  "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
+                  "lineNumber": 59
+                },
+                "deprecated": false,
+                "isRequired": true
               },
               {
                 "parentPluginId": "data",
-                "id": "def-common.agg",
-                "type": "Uncategorized",
+                "id": "def-common.BucketAggType.orderBuckets.$3",
+                "type": "CompoundType",
                 "tags": [],
-                "label": "agg",
+                "label": "b",
                 "description": [],
                 "signature": [
-                  "TBucketAggConfig"
+                  {
+                    "pluginId": "data",
+                    "scope": "common",
+                    "docId": "kibDataSearchPluginApi",
+                    "section": "def-common.GenericBucket",
+                    "text": "GenericBucket"
+                  }
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-                  "lineNumber": 35
+                  "lineNumber": 59
                 },
-                "deprecated": false
+                "deprecated": false,
+                "isRequired": true
               }
-            ]
-          },
-          {
-            "parentPluginId": "data",
-            "id": "def-common.BucketAggType.type",
-            "type": "string",
-            "tags": [],
-            "label": "type",
-            "description": [],
-            "source": {
-              "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-              "lineNumber": 36
-            },
-            "deprecated": false
+            ],
+            "returnComment": []
           },
           {
             "parentPluginId": "data",
@@ -8392,7 +8908,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-              "lineNumber": 38
+              "lineNumber": 63
             },
             "deprecated": false,
             "children": [
@@ -8408,7 +8924,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-                  "lineNumber": 38
+                  "lineNumber": 63
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9091,7 +9607,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-          "lineNumber": 37
+          "lineNumber": 38
         },
         "deprecated": false,
         "children": [
@@ -9104,7 +9620,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 41
+              "lineNumber": 42
             },
             "deprecated": false
           },
@@ -9120,7 +9636,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 42
+              "lineNumber": 43
             },
             "deprecated": false,
             "returnComment": [],
@@ -9135,7 +9651,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 43
+              "lineNumber": 44
             },
             "deprecated": false
           },
@@ -9151,7 +9667,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 45
+              "lineNumber": 46
             },
             "deprecated": false,
             "children": [],
@@ -9169,7 +9685,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 47
+              "lineNumber": 48
             },
             "deprecated": false,
             "children": [
@@ -9185,7 +9701,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-                  "lineNumber": 47
+                  "lineNumber": 48
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9431,7 +9947,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/common/search/search_source/search_source.ts",
-          "lineNumber": 121
+          "lineNumber": 127
         },
         "deprecated": false,
         "children": [
@@ -9447,7 +9963,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 129
+              "lineNumber": 135
             },
             "deprecated": false
           },
@@ -9463,7 +9979,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 133
+              "lineNumber": 139
             },
             "deprecated": false,
             "children": [
@@ -9485,7 +10001,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 133
+                  "lineNumber": 139
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9508,7 +10024,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 133
+                  "lineNumber": 139
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9530,7 +10046,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 151
+              "lineNumber": 157
             },
             "deprecated": false,
             "children": [
@@ -9546,7 +10062,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 151
+                  "lineNumber": 157
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9576,7 +10092,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 160
+              "lineNumber": 166
             },
             "deprecated": false,
             "children": [
@@ -9594,7 +10110,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 160
+                  "lineNumber": 166
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9620,7 +10136,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 160
+                  "lineNumber": 166
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9642,7 +10158,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 172
+              "lineNumber": 178
             },
             "deprecated": false,
             "children": [
@@ -9660,7 +10176,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 172
+                  "lineNumber": 178
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9692,7 +10208,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 183
+              "lineNumber": 189
             },
             "deprecated": false,
             "children": [
@@ -9716,7 +10232,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 183
+                  "lineNumber": 189
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9738,7 +10254,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 191
+              "lineNumber": 197
             },
             "deprecated": false,
             "children": [],
@@ -9765,7 +10281,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 198
+              "lineNumber": 204
             },
             "deprecated": false,
             "children": [],
@@ -9793,7 +10309,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 205
+              "lineNumber": 211
             },
             "deprecated": false,
             "children": [
@@ -9809,7 +10325,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 205
+                  "lineNumber": 211
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9826,7 +10342,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 205
+                  "lineNumber": 211
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9856,7 +10372,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 216
+              "lineNumber": 222
             },
             "deprecated": false,
             "children": [
@@ -9872,7 +10388,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 216
+                  "lineNumber": 222
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -9901,7 +10417,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 223
+              "lineNumber": 229
             },
             "deprecated": true,
             "references": [
@@ -9909,14 +10425,14 @@
                 "plugin": "discover",
                 "link": {
                   "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-                  "lineNumber": 206
+                  "lineNumber": 207
                 }
               },
               {
                 "plugin": "discover",
                 "link": {
                   "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-                  "lineNumber": 212
+                  "lineNumber": 213
                 }
               }
             ],
@@ -9944,7 +10460,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 230
+              "lineNumber": 236
             },
             "deprecated": false,
             "children": [],
@@ -9971,7 +10487,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 244
+              "lineNumber": 250
             },
             "deprecated": false,
             "children": [
@@ -9987,7 +10503,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 244
+                  "lineNumber": 250
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -10027,7 +10543,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 256
+              "lineNumber": 262
             },
             "deprecated": false,
             "children": [
@@ -10053,7 +10569,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 256
+                  "lineNumber": 262
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -10078,7 +10594,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 256
+                  "lineNumber": 262
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -10112,7 +10628,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 266
+              "lineNumber": 272
             },
             "deprecated": false,
             "children": [],
@@ -10152,7 +10668,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 274
+              "lineNumber": 280
             },
             "deprecated": false,
             "children": [
@@ -10174,7 +10690,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 275
+                  "lineNumber": 281
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -10208,7 +10724,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 312
+              "lineNumber": 318
             },
             "deprecated": true,
             "references": [
@@ -10219,13 +10735,6 @@
                   "lineNumber": 77
                 }
               },
-              {
-                "plugin": "discover",
-                "link": {
-                  "path": "src/plugins/discover/public/application/angular/context/api/anchor.ts",
-                  "lineNumber": 57
-                }
-              },
               {
                 "plugin": "maps",
                 "link": {
@@ -10267,7 +10776,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 312
+                  "lineNumber": 318
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -10307,7 +10816,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 325
+              "lineNumber": 331
             },
             "deprecated": false,
             "children": [
@@ -10339,7 +10848,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 326
+                  "lineNumber": 332
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -10361,7 +10870,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 334
+              "lineNumber": 340
             },
             "deprecated": false,
             "children": [],
@@ -10383,7 +10892,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 342
+              "lineNumber": 348
             },
             "deprecated": false,
             "children": [],
@@ -10410,7 +10919,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 831
+              "lineNumber": 848
             },
             "deprecated": false,
             "children": [
@@ -10426,7 +10935,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/data/common/search/search_source/search_source.ts",
-                  "lineNumber": 831
+                  "lineNumber": 848
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -10450,7 +10959,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 860
+              "lineNumber": 877
             },
             "deprecated": false,
             "children": [],
@@ -13926,7 +14435,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-          "lineNumber": 63
+          "lineNumber": 64
         },
         "deprecated": false,
         "children": [],
@@ -13982,7 +14491,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/expressions/esaggs/request_handler.ts",
-          "lineNumber": 43
+          "lineNumber": 35
         },
         "deprecated": false,
         "children": [
@@ -13998,7 +14507,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/expressions/esaggs/request_handler.ts",
-              "lineNumber": 43
+              "lineNumber": 35
             },
             "deprecated": false,
             "isRequired": true
@@ -14251,7 +14760,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-          "lineNumber": 49
+          "lineNumber": 90
         },
         "deprecated": false,
         "children": [
@@ -14267,7 +14776,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-              "lineNumber": 49
+              "lineNumber": 90
             },
             "deprecated": false,
             "isRequired": true
@@ -14433,7 +14942,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-          "lineNumber": 75
+          "lineNumber": 92
         },
         "deprecated": false,
         "children": [
@@ -14449,7 +14958,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 75
+              "lineNumber": 92
             },
             "deprecated": false,
             "isRequired": true
@@ -14926,6 +15435,45 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "data",
+        "id": "def-common.parseTimeShift",
+        "type": "Function",
+        "tags": [],
+        "label": "parseTimeShift",
+        "description": [
+          "\nThis method parses a string into a time shift duration.\nIf parsing fails, 'invalid' is returned.\nAllowed values are the string 'previous' and an integer followed by the units s,m,h,d,w,M,y"
+        ],
+        "signature": [
+          "(val: string) => moment.Duration | \"previous\" | \"invalid\""
+        ],
+        "source": {
+          "path": "src/plugins/data/common/search/aggs/utils/parse_time_shift.ts",
+          "lineNumber": 18
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "data",
+            "id": "def-common.parseTimeShift.$1",
+            "type": "string",
+            "tags": [],
+            "label": "val",
+            "description": [],
+            "signature": [
+              "string"
+            ],
+            "source": {
+              "path": "src/plugins/data/common/search/aggs/utils/parse_time_shift.ts",
+              "lineNumber": 18
+            },
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "data",
         "id": "def-common.pollSearch",
@@ -15561,7 +16109,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-          "lineNumber": 44
+          "lineNumber": 53
         },
         "deprecated": false,
         "children": [
@@ -15577,7 +16125,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 45
+              "lineNumber": 54
             },
             "deprecated": false
           },
@@ -15593,7 +16141,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-              "lineNumber": 46
+              "lineNumber": 55
             },
             "deprecated": false
           }
@@ -15611,7 +16159,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/types.ts",
-          "lineNumber": 195
+          "lineNumber": 196
         },
         "deprecated": false,
         "children": [
@@ -15640,7 +16188,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTER>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"geo_bounding_box\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"filter\">, \"enabled\" | \"id\" | \"filter\" | \"customLabel\" | \"schema\" | \"geo_bounding_box\" | \"json\">, ",
+              ".FILTER>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"geo_bounding_box\"> & Pick<{ geo_bounding_box?: string | undefined; filter?: string | undefined; }, \"filter\">, \"enabled\" | \"id\" | \"filter\" | \"customLabel\" | \"schema\" | \"geo_bounding_box\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -15664,7 +16212,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 196
+              "lineNumber": 197
             },
             "deprecated": false
           },
@@ -15693,7 +16241,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\"> & Pick<{ filters?: string | undefined; }, \"filters\"> & Pick<{ filters?: string | undefined; }, never>, \"enabled\" | \"filters\" | \"id\" | \"schema\" | \"json\">, ",
+              ".FILTERS>, \"enabled\" | \"id\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ filters?: string | undefined; }, \"filters\"> & Pick<{ filters?: string | undefined; }, never>, \"enabled\" | \"filters\" | \"id\" | \"schema\" | \"json\" | \"timeShift\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -15717,7 +16265,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 197
+              "lineNumber": 198
             },
             "deprecated": false
           },
@@ -15770,7 +16318,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 198
+              "lineNumber": 199
             },
             "deprecated": false
           },
@@ -15799,7 +16347,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".IP_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, \"ipRangeType\" | \"ranges\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
+              ".IP_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, \"ipRangeType\" | \"ranges\"> & Pick<{ ranges?: string | undefined; ipRangeType?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ipRangeType\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -15823,7 +16371,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 199
+              "lineNumber": 200
             },
             "deprecated": false
           },
@@ -15852,7 +16400,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ranges\" | \"time_zone\">, ",
+              ".DATE_RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ranges\" | \"time_zone\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -15876,7 +16424,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 200
+              "lineNumber": 201
             },
             "deprecated": false
           },
@@ -15905,7 +16453,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"ranges\">, ",
+              ".RANGE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\"> & Pick<{ ranges?: string | undefined; }, \"ranges\"> & Pick<{ ranges?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"ranges\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -15929,7 +16477,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 201
+              "lineNumber": 202
             },
             "deprecated": false
           },
@@ -15982,7 +16530,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 202
+              "lineNumber": 203
             },
             "deprecated": false
           },
@@ -16011,7 +16559,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: string | undefined; }, \"boundingBox\"> & Pick<{ boundingBox?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
+              ".GEOHASH_GRID>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\"> & Pick<{ boundingBox?: string | undefined; }, \"boundingBox\"> & Pick<{ boundingBox?: string | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"autoPrecision\" | \"precision\" | \"useGeocentroid\" | \"isFilteredByCollar\" | \"boundingBox\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16035,7 +16583,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 203
+              "lineNumber": 204
             },
             "deprecated": false
           },
@@ -16064,7 +16612,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, \"extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
+              ".HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, \"extended_bounds\"> & Pick<{ extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"used_interval\" | \"maxBars\" | \"intervalBase\" | \"min_doc_count\" | \"has_extended_bounds\" | \"extended_bounds\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16088,7 +16636,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 204
+              "lineNumber": 205
             },
             "deprecated": false
           },
@@ -16117,7 +16665,7 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, \"timeRange\" | \"extended_bounds\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"timeRange\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
+              ".DATE_HISTOGRAM>, \"enabled\" | \"interval\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, \"timeRange\" | \"extended_bounds\"> & Pick<{ timeRange?: string | undefined; extended_bounds?: string | undefined; }, never>, \"enabled\" | \"interval\" | \"timeRange\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"time_zone\" | \"used_interval\" | \"min_doc_count\" | \"extended_bounds\" | \"useNormalizedEsInterval\" | \"scaleMetricValues\" | \"used_time_zone\" | \"drop_partials\" | \"format\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16141,7 +16689,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 205
+              "lineNumber": 206
             },
             "deprecated": false
           },
@@ -16170,11 +16718,11 @@
                 "section": "def-common.BUCKET_TYPES",
                 "text": "BUCKET_TYPES"
               },
-              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
+              ".TERMS>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"orderBy\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
               " | undefined; }, \"orderAgg\"> & Pick<{ orderAgg?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"size\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"field\" | \"orderBy\" | \"orderAgg\" | \"order\" | \"missingBucket\" | \"missingBucketLabel\" | \"otherBucket\" | \"otherBucketLabel\" | \"exclude\" | \"include\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16198,7 +16746,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 206
+              "lineNumber": 207
             },
             "deprecated": false
           },
@@ -16251,7 +16799,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 207
+              "lineNumber": 208
             },
             "deprecated": false
           },
@@ -16280,7 +16828,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".AVG_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -16288,7 +16836,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16312,7 +16860,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 208
+              "lineNumber": 209
             },
             "deprecated": false
           },
@@ -16341,7 +16889,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".MAX_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -16349,7 +16897,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16373,7 +16921,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 209
+              "lineNumber": 210
             },
             "deprecated": false
           },
@@ -16402,7 +16950,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".MIN_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -16410,7 +16958,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16434,7 +16982,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 210
+              "lineNumber": 211
             },
             "deprecated": false
           },
@@ -16463,7 +17011,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".SUM_BUCKET>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -16471,7 +17019,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16495,7 +17043,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 211
+              "lineNumber": 212
             },
             "deprecated": false
           },
@@ -16524,7 +17072,7 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\"> & Pick<{ customBucket?: ",
+              ".FILTERED_METRIC>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\"> & Pick<{ customBucket?: ",
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
@@ -16532,7 +17080,7 @@
               "AggExpressionType",
               " | undefined; customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"customBucket\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"customBucket\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16556,7 +17104,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 212
+              "lineNumber": 213
             },
             "deprecated": false
           },
@@ -16609,7 +17157,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 213
+              "lineNumber": 214
             },
             "deprecated": false
           },
@@ -16662,7 +17210,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 214
+              "lineNumber": 215
             },
             "deprecated": false
           },
@@ -16691,11 +17239,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".CUMULATIVE_SUM>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16719,7 +17267,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 215
+              "lineNumber": 216
             },
             "deprecated": false
           },
@@ -16748,11 +17296,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".DERIVATIVE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".DERIVATIVE>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -16776,7 +17324,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 216
+              "lineNumber": 217
             },
             "deprecated": false
           },
@@ -16829,7 +17377,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 217
+              "lineNumber": 218
             },
             "deprecated": false
           },
@@ -16882,7 +17430,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 218
+              "lineNumber": 219
             },
             "deprecated": false
           },
@@ -16935,7 +17483,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 219
+              "lineNumber": 220
             },
             "deprecated": false
           },
@@ -16988,7 +17536,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 220
+              "lineNumber": 221
             },
             "deprecated": false
           },
@@ -17041,7 +17589,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 221
+              "lineNumber": 222
             },
             "deprecated": false
           },
@@ -17094,7 +17642,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 222
+              "lineNumber": 223
             },
             "deprecated": false
           },
@@ -17123,11 +17671,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".MOVING_FN>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
+              ".MOVING_FN>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\" | \"window\" | \"script\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -17151,7 +17699,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 223
+              "lineNumber": 224
             },
             "deprecated": false
           },
@@ -17204,7 +17752,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 224
+              "lineNumber": 225
             },
             "deprecated": false
           },
@@ -17257,7 +17805,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 225
+              "lineNumber": 226
             },
             "deprecated": false
           },
@@ -17286,11 +17834,11 @@
                 "section": "def-common.METRIC_TYPES",
                 "text": "METRIC_TYPES"
               },
-              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
+              ".SERIAL_DIFF>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"buckets_path\" | \"metricAgg\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
               " | undefined; }, \"customMetric\"> & Pick<{ customMetric?: ",
               "AggExpressionType",
-              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
+              " | undefined; }, never>, \"enabled\" | \"id\" | \"customLabel\" | \"schema\" | \"json\" | \"timeShift\" | \"customMetric\" | \"buckets_path\" | \"metricAgg\">, ",
               "AggExpressionType",
               ", ",
               {
@@ -17314,7 +17862,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 226
+              "lineNumber": 227
             },
             "deprecated": false
           },
@@ -17367,7 +17915,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 227
+              "lineNumber": 228
             },
             "deprecated": false
           },
@@ -17420,7 +17968,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 228
+              "lineNumber": 229
             },
             "deprecated": false
           },
@@ -17473,7 +18021,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/types.ts",
-              "lineNumber": 229
+              "lineNumber": 230
             },
             "deprecated": false
           }
@@ -18498,7 +19046,7 @@
           },
           " extends Pick<",
           "BaseAggParams",
-          ", \"json\">"
+          ", \"json\" | \"timeShift\">"
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/filters.ts",
@@ -19768,7 +20316,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-          "lineNumber": 48
+          "lineNumber": 49
         },
         "deprecated": false,
         "children": [
@@ -19781,7 +20329,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 49
+              "lineNumber": 50
             },
             "deprecated": false
           },
@@ -19794,7 +20342,7 @@
             "description": [],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 50
+              "lineNumber": 51
             },
             "deprecated": false
           },
@@ -19812,7 +20360,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 51
+              "lineNumber": 52
             },
             "deprecated": false
           },
@@ -19828,7 +20376,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 52
+              "lineNumber": 53
             },
             "deprecated": false
           },
@@ -19844,7 +20392,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 53
+              "lineNumber": 54
             },
             "deprecated": false
           },
@@ -19860,7 +20408,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 54
+              "lineNumber": 55
             },
             "deprecated": false
           },
@@ -19876,7 +20424,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 55
+              "lineNumber": 56
             },
             "deprecated": false
           },
@@ -19892,7 +20440,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 56
+              "lineNumber": 57
             },
             "deprecated": false
           },
@@ -19908,7 +20456,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 57
+              "lineNumber": 58
             },
             "deprecated": false
           },
@@ -19924,7 +20472,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 59
+              "lineNumber": 60
             },
             "deprecated": false
           },
@@ -19940,7 +20488,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-              "lineNumber": 60
+              "lineNumber": 61
             },
             "deprecated": false
           }
@@ -20497,7 +21045,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-          "lineNumber": 18
+          "lineNumber": 19
         },
         "deprecated": false,
         "children": [
@@ -20513,7 +21061,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-              "lineNumber": 20
+              "lineNumber": 21
             },
             "deprecated": false
           },
@@ -20544,7 +21092,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-              "lineNumber": 21
+              "lineNumber": 22
             },
             "deprecated": false
           }
@@ -21283,7 +21831,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-          "lineNumber": 14
+          "lineNumber": 15
         },
         "deprecated": false,
         "children": [
@@ -21314,7 +21862,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/buckets/bucket_agg_type.ts",
-              "lineNumber": 15
+              "lineNumber": 16
             },
             "deprecated": false
           }
@@ -21839,7 +22387,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-          "lineNumber": 16
+          "lineNumber": 17
         },
         "deprecated": false,
         "children": [
@@ -21870,7 +22418,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 17
+              "lineNumber": 18
             },
             "deprecated": false
           }
@@ -22536,7 +23084,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-          "lineNumber": 20
+          "lineNumber": 21
         },
         "deprecated": false,
         "children": [
@@ -22567,7 +23115,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 22
+              "lineNumber": 23
             },
             "deprecated": false
           },
@@ -22583,7 +23131,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-              "lineNumber": 23
+              "lineNumber": 24
             },
             "deprecated": false
           }
@@ -23650,7 +24198,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/search_source/search_source.ts",
-          "lineNumber": 116
+          "lineNumber": 122
         },
         "deprecated": false,
         "children": [
@@ -23708,7 +24256,7 @@
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/search_source.ts",
-              "lineNumber": 117
+              "lineNumber": 123
             },
             "deprecated": false,
             "returnComment": [],
@@ -24312,7 +24860,7 @@
             "label": "reason",
             "description": [],
             "signature": [
-              "{ caused_by: { reason: string; type: string; }; reason: string; lang?: string | undefined; script?: string | undefined; script_stack?: string[] | undefined; type: string; }"
+              "{ caused_by: { reason: string; type: string; }; reason: string; lang?: \"painless\" | \"expression\" | \"mustache\" | \"java\" | undefined; script?: string | undefined; script_stack?: string[] | undefined; type: string; }"
             ],
             "source": {
               "path": "src/plugins/data/common/search/search_source/types.ts",
@@ -24786,7 +25334,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 43
+          "lineNumber": 45
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -25003,7 +25551,7 @@
         "label": "AggGroupName",
         "description": [],
         "signature": [
-          "\"buckets\" | \"metrics\" | \"none\""
+          "\"none\" | \"buckets\" | \"metrics\""
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_groups.ts",
@@ -25512,7 +26060,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
-          "lineNumber": 49
+          "lineNumber": 58
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -26549,6 +27097,87 @@
         "deprecated": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "data",
+        "id": "def-common.GenericBucket",
+        "type": "Type",
+        "tags": [],
+        "label": "GenericBucket",
+        "description": [],
+        "signature": [
+          "(",
+          "AggregationsCompositeBucketKeys",
+          " & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | (",
+          "AggregationsDateHistogramBucketKeys",
+          " & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | (",
+          "AggregationsFiltersBucketItemKeys",
+          " & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | (",
+          "AggregationsIpRangeBucketKeys",
+          " & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | (",
+          "AggregationsRangeBucketKeys",
+          " & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | (",
+          "AggregationsRareTermsBucketKeys",
+          "<any> & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | (",
+          "AggregationsSignificantTermsBucketKeys",
+          "<any> & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | ({ [property: string]: ",
+          "AggregationsAggregate",
+          "; } & { [property: string]: ",
+          "AggregationsAggregate",
+          "; }) | (",
+          "AggregationsKeyedBucketKeys",
+          "<any> & { [property: string]: ",
+          "AggregationsAggregate",
+          "; })"
+        ],
+        "source": {
+          "path": "src/plugins/data/common/search/aggs/agg_configs.ts",
+          "lineNumber": 60
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "data",
         "id": "def-common.IAggConfig",
@@ -26570,7 +27199,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/agg_config.ts",
-          "lineNumber": 53
+          "lineNumber": 55
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -26699,7 +27328,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts",
-          "lineNumber": 35
+          "lineNumber": 36
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -27399,7 +28028,7 @@
         ],
         "source": {
           "path": "src/plugins/data/common/search/aggs/buckets/terms.ts",
-          "lineNumber": 30
+          "lineNumber": 31
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -30613,7 +31242,7 @@
                     "label": "types",
                     "description": [],
                     "signature": [
-                      "(\"string\" | \"number\")[]"
+                      "(\"number\" | \"string\")[]"
                     ],
                     "source": {
                       "path": "src/plugins/data/common/search/expressions/range.ts",
@@ -30657,7 +31286,7 @@
                     "label": "types",
                     "description": [],
                     "signature": [
-                      "(\"string\" | \"number\")[]"
+                      "(\"number\" | \"string\")[]"
                     ],
                     "source": {
                       "path": "src/plugins/data/common/search/expressions/range.ts",
@@ -30701,7 +31330,7 @@
                     "label": "types",
                     "description": [],
                     "signature": [
-                      "(\"string\" | \"number\")[]"
+                      "(\"number\" | \"string\")[]"
                     ],
                     "source": {
                       "path": "src/plugins/data/common/search/expressions/range.ts",
@@ -30745,7 +31374,7 @@
                     "label": "types",
                     "description": [],
                     "signature": [
-                      "(\"string\" | \"number\")[]"
+                      "(\"number\" | \"string\")[]"
                     ],
                     "source": {
                       "path": "src/plugins/data/common/search/expressions/range.ts",
diff --git a/api_docs/data_ui.json b/api_docs/data_ui.json
index 5b4f11ee0cd9f..4a532af99a115 100644
--- a/api_docs/data_ui.json
+++ b/api_docs/data_ui.json
@@ -510,9 +510,9 @@
         "signature": [
           "Pick<Pick<",
           "EuiComboBoxProps",
-          "<any>, \"children\" | \"onClick\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"data-test-subj\" | \"isClearable\" | \"async\" | \"compressed\" | \"fullWidth\" | \"singleSelection\" | \"prepend\" | \"append\" | \"sortMatchesBy\" | \"customOptionText\" | \"onCreateOption\" | \"renderOption\" | \"inputRef\" | \"isDisabled\" | \"isInvalid\" | \"noSuggestions\" | \"rowHeight\" | \"delimiter\">, \"children\" | \"onClick\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"data-test-subj\" | \"isClearable\" | \"async\" | \"compressed\" | \"fullWidth\" | \"singleSelection\" | \"prepend\" | \"append\" | \"sortMatchesBy\" | \"customOptionText\" | \"onCreateOption\" | \"renderOption\" | \"inputRef\" | \"isDisabled\" | \"isInvalid\" | \"noSuggestions\" | \"rowHeight\" | \"delimiter\"> & Required<Pick<Pick<",
+          "<any>, \"children\" | \"onClick\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"data-test-subj\" | \"isClearable\" | \"async\" | \"compressed\" | \"fullWidth\" | \"singleSelection\" | \"prepend\" | \"append\" | \"sortMatchesBy\" | \"autoFocus\" | \"customOptionText\" | \"onCreateOption\" | \"renderOption\" | \"inputRef\" | \"isDisabled\" | \"isInvalid\" | \"noSuggestions\" | \"rowHeight\" | \"delimiter\">, \"children\" | \"onClick\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"data-test-subj\" | \"isClearable\" | \"async\" | \"compressed\" | \"fullWidth\" | \"singleSelection\" | \"prepend\" | \"append\" | \"sortMatchesBy\" | \"autoFocus\" | \"customOptionText\" | \"onCreateOption\" | \"renderOption\" | \"inputRef\" | \"isDisabled\" | \"isInvalid\" | \"noSuggestions\" | \"rowHeight\" | \"delimiter\"> & Required<Pick<Pick<",
           "EuiComboBoxProps",
-          "<any>, \"children\" | \"onClick\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"data-test-subj\" | \"isClearable\" | \"async\" | \"compressed\" | \"fullWidth\" | \"singleSelection\" | \"prepend\" | \"append\" | \"sortMatchesBy\" | \"customOptionText\" | \"onCreateOption\" | \"renderOption\" | \"inputRef\" | \"isDisabled\" | \"isInvalid\" | \"noSuggestions\" | \"rowHeight\" | \"delimiter\">, \"placeholder\">> & { onChange: (indexPatternId?: string | undefined) => void; indexPatternId: string; onNoIndexPatterns?: (() => void) | undefined; }"
+          "<any>, \"children\" | \"onClick\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"data-test-subj\" | \"isClearable\" | \"async\" | \"compressed\" | \"fullWidth\" | \"singleSelection\" | \"prepend\" | \"append\" | \"sortMatchesBy\" | \"autoFocus\" | \"customOptionText\" | \"onCreateOption\" | \"renderOption\" | \"inputRef\" | \"isDisabled\" | \"isInvalid\" | \"noSuggestions\" | \"rowHeight\" | \"delimiter\">, \"placeholder\">> & { onChange: (indexPatternId?: string | undefined) => void; indexPatternId: string; onNoIndexPatterns?: (() => void) | undefined; }"
         ],
         "source": {
           "path": "src/plugins/data/public/ui/index_pattern_select/index_pattern_select.tsx",
diff --git a/api_docs/data_visualizer.json b/api_docs/data_visualizer.json
new file mode 100644
index 0000000000000..b4544a0381790
--- /dev/null
+++ b/api_docs/data_visualizer.json
@@ -0,0 +1,328 @@
+{
+  "id": "dataVisualizer",
+  "client": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": [],
+    "start": {
+      "parentPluginId": "dataVisualizer",
+      "id": "def-public.DataVisualizerPluginStart",
+      "type": "Type",
+      "tags": [],
+      "label": "DataVisualizerPluginStart",
+      "description": [],
+      "signature": [
+        "{ getFileDataVisualizerComponent: () => Promise<React.FC<{}>>; getMaxBytesFormatted: () => string; }"
+      ],
+      "source": {
+        "path": "x-pack/plugins/data_visualizer/public/plugin.ts",
+        "lineNumber": 33
+      },
+      "deprecated": false,
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "server": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [],
+    "enums": [],
+    "misc": [],
+    "objects": []
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.DataVisualizerTableState",
+        "type": "Interface",
+        "tags": [],
+        "label": "DataVisualizerTableState",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/types.ts",
+          "lineNumber": 14
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "dataVisualizer",
+            "id": "def-common.DataVisualizerTableState.pageSize",
+            "type": "number",
+            "tags": [],
+            "label": "pageSize",
+            "description": [],
+            "source": {
+              "path": "x-pack/plugins/data_visualizer/common/types.ts",
+              "lineNumber": 15
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "dataVisualizer",
+            "id": "def-common.DataVisualizerTableState.pageIndex",
+            "type": "number",
+            "tags": [],
+            "label": "pageIndex",
+            "description": [],
+            "source": {
+              "path": "x-pack/plugins/data_visualizer/common/types.ts",
+              "lineNumber": 16
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "dataVisualizer",
+            "id": "def-common.DataVisualizerTableState.sortField",
+            "type": "string",
+            "tags": [],
+            "label": "sortField",
+            "description": [],
+            "source": {
+              "path": "x-pack/plugins/data_visualizer/common/types.ts",
+              "lineNumber": 17
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "dataVisualizer",
+            "id": "def-common.DataVisualizerTableState.sortDirection",
+            "type": "string",
+            "tags": [],
+            "label": "sortDirection",
+            "description": [],
+            "source": {
+              "path": "x-pack/plugins/data_visualizer/common/types.ts",
+              "lineNumber": 18
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "dataVisualizer",
+            "id": "def-common.DataVisualizerTableState.visibleFieldTypes",
+            "type": "Array",
+            "tags": [],
+            "label": "visibleFieldTypes",
+            "description": [],
+            "signature": [
+              "string[]"
+            ],
+            "source": {
+              "path": "x-pack/plugins/data_visualizer/common/types.ts",
+              "lineNumber": 19
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "dataVisualizer",
+            "id": "def-common.DataVisualizerTableState.visibleFieldNames",
+            "type": "Array",
+            "tags": [],
+            "label": "visibleFieldNames",
+            "description": [],
+            "signature": [
+              "string[]"
+            ],
+            "source": {
+              "path": "x-pack/plugins/data_visualizer/common/types.ts",
+              "lineNumber": 20
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "dataVisualizer",
+            "id": "def-common.DataVisualizerTableState.showDistributions",
+            "type": "boolean",
+            "tags": [],
+            "label": "showDistributions",
+            "description": [],
+            "source": {
+              "path": "x-pack/plugins/data_visualizer/common/types.ts",
+              "lineNumber": 21
+            },
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.ABSOLUTE_MAX_FILE_SIZE_BYTES",
+        "type": "number",
+        "tags": [],
+        "label": "ABSOLUTE_MAX_FILE_SIZE_BYTES",
+        "description": [],
+        "signature": [
+          "1073741274"
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 14
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.FILE_SIZE_DISPLAY_FORMAT",
+        "type": "string",
+        "tags": [],
+        "label": "FILE_SIZE_DISPLAY_FORMAT",
+        "description": [],
+        "signature": [
+          "\"0,0.[0] b\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 15
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.INDEX_META_DATA_CREATED_BY",
+        "type": "string",
+        "tags": [],
+        "label": "INDEX_META_DATA_CREATED_BY",
+        "description": [],
+        "signature": [
+          "\"file-data-visualizer\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 19
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.InputData",
+        "type": "Type",
+        "tags": [],
+        "label": "InputData",
+        "description": [],
+        "signature": [
+          "any[]"
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/types.ts",
+          "lineNumber": 10
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.JobFieldType",
+        "type": "Type",
+        "tags": [],
+        "label": "JobFieldType",
+        "description": [],
+        "signature": [
+          "\"number\" | \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"ip\" | \"geo_point\" | \"geo_shape\" | \"unknown\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/types.ts",
+          "lineNumber": 12
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.MAX_FILE_SIZE",
+        "type": "string",
+        "tags": [],
+        "label": "MAX_FILE_SIZE",
+        "description": [],
+        "signature": [
+          "\"100MB\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 11
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.MAX_FILE_SIZE_BYTES",
+        "type": "number",
+        "tags": [],
+        "label": "MAX_FILE_SIZE_BYTES",
+        "description": [],
+        "signature": [
+          "104857600"
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 12
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.MB",
+        "type": "number",
+        "tags": [],
+        "label": "MB",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 10
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.UI_SETTING_MAX_FILE_SIZE",
+        "type": "string",
+        "tags": [],
+        "label": "UI_SETTING_MAX_FILE_SIZE",
+        "description": [],
+        "signature": [
+          "\"fileUpload:maxFileSize\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 8
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": [
+      {
+        "parentPluginId": "dataVisualizer",
+        "id": "def-common.JOB_FIELD_TYPES",
+        "type": "Object",
+        "tags": [],
+        "label": "JOB_FIELD_TYPES",
+        "description": [],
+        "signature": [
+          "{ readonly BOOLEAN: \"boolean\"; readonly DATE: \"date\"; readonly GEO_POINT: \"geo_point\"; readonly GEO_SHAPE: \"geo_shape\"; readonly IP: \"ip\"; readonly KEYWORD: \"keyword\"; readonly NUMBER: \"number\"; readonly TEXT: \"text\"; readonly UNKNOWN: \"unknown\"; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/data_visualizer/common/constants.ts",
+          "lineNumber": 21
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      }
+    ]
+  }
+}
diff --git a/api_docs/file_data_visualizer.mdx b/api_docs/data_visualizer.mdx
similarity index 100%
rename from api_docs/file_data_visualizer.mdx
rename to api_docs/data_visualizer.mdx
diff --git a/api_docs/deprecations.mdx b/api_docs/deprecations.mdx
index 99edad62075bc..b5fe8d1e31da0 100644
--- a/api_docs/deprecations.mdx
+++ b/api_docs/deprecations.mdx
@@ -82,14 +82,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/plugin.ts#L13) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L69](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/plugin.ts#L69) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/types.ts#L8) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.ts#L41](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/types.ts#L41) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/target/types/server/types.d.ts#L1) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.d.ts#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/target/types/server/types.d.ts#L30) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [plugin.ts#L17](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/plugin.ts#L17) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [plugin.ts#L36](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/plugin.ts#L36) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [plugin.ts#L16](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/plugin.ts#L16) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [plugin.ts#L27](https://github.com/elastic/kibana/tree/master/x-pack/plugins/cross_cluster_replication/server/plugin.ts#L27) | 7.16 |
 
 
 
@@ -103,20 +97,20 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_objects.ts#L13](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/services/saved_objects.ts#L13) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_dashboards.ts#L12](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts#L12) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_dashboards.ts#L31](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboards.ts#L31) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [types.ts#L25](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/types.ts#L25) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [types.ts#L74](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/types.ts#L74) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [types.ts#L33](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#L33) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [types.ts#L186](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/types.ts#L186) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [plugin.tsx#L42](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/plugin.tsx#L42) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [plugin.tsx#L126](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/plugin.tsx#L126) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [plugin.tsx#L127](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/plugin.tsx#L127) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [url_generator.ts#L19](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/url_generator.ts#L19) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [url_generator.ts#L95](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/url_generator.ts#L95) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [saved_objects.ts#L11](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/services/saved_objects.ts#L11) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [saved_dashboard.ts#L10](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#L10) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [saved_dashboard.ts#L18](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#L18) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [saved_dashboard.ts#L19](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts#L19) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [dashboard_tagging.ts#L10](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#L10) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [dashboard_tagging.ts#L15](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts#L15) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [clone_panel_action.tsx#L14](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#L14) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [clone_panel_action.tsx#L98](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#L98) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [clone_panel_action.tsx#L126](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/actions/clone_panel_action.tsx#L126) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [use_dashboard_state_manager.ts#L23](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/hooks/use_dashboard_state_manager.ts#L23) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObject" text="SavedObject"/> | [use_dashboard_state_manager.ts#L35](https://github.com/elastic/kibana/tree/master/src/plugins/dashboard/public/application/hooks/use_dashboard_state_manager.ts#L35) | - |
 
 
 
@@ -129,26 +123,22 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [create_doc_table_react.tsx#L25](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx#L25) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L16](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#L16) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L30](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#L30) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [context_app_legacy.tsx#L17](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx#L17) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [context_app_legacy.tsx#L26](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx#L26) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [kibana_services.ts#L104](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/kibana_services.ts#L104) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L23](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L23) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L58](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L58) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L59](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L59) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [kibana_services.ts#L104](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/kibana_services.ts#L104) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L23](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L23) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L58](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L58) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L59](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L59) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [kibana_services.ts#L101](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/kibana_services.ts#L101) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [create_doc_table_react.tsx#L15](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx#L15) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [create_doc_table_react.tsx#L25](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx#L25) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L16](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#L16) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L30](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/types.ts#L30) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [context_app_legacy.tsx#L17](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx#L17) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [context_app_legacy.tsx#L26](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx#L26) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [kibana_services.ts#L104](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/kibana_services.ts#L104) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L23](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L23) | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L58](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L58) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [on_save_search.tsx#L11](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/top_nav/on_save_search.tsx#L11) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [on_save_search.tsx#L133](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/components/top_nav/on_save_search.tsx#L133) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [search_embeddable.ts#L59](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/embeddable/search_embeddable.ts#L59) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [on_save_search.tsx#L11](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx#L11) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [on_save_search.tsx#L133](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx#L133) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_searches.ts#L10](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/saved_searches.ts#L10) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [saved_searches.ts#L20](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/saved_searches/saved_searches.ts#L20) | - |
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectLoader" text="SavedObjectLoader"/> | [plugin.tsx#L33](https://github.com/elastic/kibana/tree/master/src/plugins/discover/public/plugin.tsx#L33) | - |
@@ -163,7 +153,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | Deprecated API | Reference location | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [attribute_service.tsx#L13](https://github.com/elastic/kibana/tree/master/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#L13) | - |
-| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [attribute_service.tsx#L167](https://github.com/elastic/kibana/tree/master/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#L167) | - |
+| <DocLink id="kibSavedObjectsPluginApi" section="def-public.SavedObjectSaveModal" text="SavedObjectSaveModal"/> | [attribute_service.tsx#L165](https://github.com/elastic/kibana/tree/master/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx#L165) | - |
 
 
 
@@ -199,7 +189,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [query_bar.tsx#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx#L30) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [query_bar.tsx#L38](https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/components/agent_logs/query_bar.tsx#L38) | - |
 | <DocLink id="kibCorePluginApi" section="def-server.AsyncPlugin" text="AsyncPlugin"/> | [plugin.ts#L14](https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet/server/plugin.ts#L14) | - |
-| <DocLink id="kibCorePluginApi" section="def-server.AsyncPlugin" text="AsyncPlugin"/> | [plugin.ts#L189](https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet/server/plugin.ts#L189) | - |
+| <DocLink id="kibCorePluginApi" section="def-server.AsyncPlugin" text="AsyncPlugin"/> | [plugin.ts#L190](https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet/server/plugin.ts#L190) | - |
 | <DocLink id="kibCorePluginApi" section="def-server.AsyncPlugin" text="AsyncPlugin"/> | [plugin.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet/target/types/server/plugin.d.ts#L2) | - |
 | <DocLink id="kibCorePluginApi" section="def-server.AsyncPlugin" text="AsyncPlugin"/> | [plugin.d.ts#L84](https://github.com/elastic/kibana/tree/master/x-pack/plugins/fleet/target/types/server/plugin.d.ts#L84) | - |
 
@@ -238,18 +228,18 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L14](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/plugin.ts#L14) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L42](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/plugin.ts#L42) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/plugin.ts#L12) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L38](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/plugin.ts#L38) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.LegacyScopedClusterClient" text="LegacyScopedClusterClient"/> | [types.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L9) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.LegacyScopedClusterClient" text="LegacyScopedClusterClient"/> | [types.ts#L40](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L40) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.LegacyScopedClusterClient" text="LegacyScopedClusterClient"/> | [types.ts#L39](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L39) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.LegacyScopedClusterClient" text="LegacyScopedClusterClient"/> | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L1) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.LegacyScopedClusterClient" text="LegacyScopedClusterClient"/> | [types.d.ts#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L25) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.LegacyScopedClusterClient" text="LegacyScopedClusterClient"/> | [types.d.ts#L24](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L24) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L10) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.ts#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L43) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.ts#L50](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L50) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.ts#L42](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L42) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.ts#L49](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/server/types.ts#L49) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L1) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.d.ts#L27](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L27) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.d.ts#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L33) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.d.ts#L26](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L26) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [types.d.ts#L32](https://github.com/elastic/kibana/tree/master/x-pack/plugins/index_management/target/types/server/types.d.ts#L32) | 7.16 |
 
 
 
@@ -588,11 +578,6 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [custom_metric_form.d.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/public/pages/metrics/inventory_view/components/waffle/metric_control/custom_metric_form.d.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [index.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/public/pages/metrics/inventory_view/components/waffle/metric_control/index.d.ts#L1) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [index.d.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/public/pages/metrics/inventory_view/components/waffle/metric_control/index.d.ts#L9) | - |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [log_entry_categories_analysis.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts#L9) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [log_entry_categories_analysis.ts#L139](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts#L139) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [log_entry_categories_analysis.ts#L405](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/server/lib/log_analysis/log_entry_categories_analysis.ts#L405) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [log_entry_categories_analysis.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/server/lib/log_analysis/log_entry_categories_analysis.d.ts#L1) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyScopedClusterClient" text="ILegacyScopedClusterClient"/> | [log_entry_categories_analysis.d.ts#L58](https://github.com/elastic/kibana/tree/master/x-pack/plugins/infra/target/types/server/lib/log_analysis/log_entry_categories_analysis.d.ts#L58) | 7.16 |
 
 
 
@@ -602,6 +587,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | ---------------|-----------|-----------|
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [embeddable.tsx#L14](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx#L14) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [embeddable.tsx#L85](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx#L85) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx#L25) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L102](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx#L102) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [field_item.tsx#L47](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#L47) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [field_item.tsx#L172](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#L172) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [datapanel.tsx#L42](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx#L42) | - |
@@ -616,10 +603,10 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [types.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/types.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [types.ts#L57](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/types.ts#L57) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L11) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L139](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L139) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L248](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L248) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L287](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L287) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L329](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L329) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L141](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L141) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L250](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L250) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L290](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L290) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.ts#L332](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L332) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts#L1) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [types.d.ts#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts#L22) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [field_stats.d.ts#L3](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#L3) | - |
@@ -631,10 +618,10 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [types.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/types.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [types.ts#L57](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/types.ts#L57) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L11) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L139](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L139) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L248](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L248) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L287](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L287) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L329](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L329) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L141](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L141) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L250](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L250) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L290](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L290) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.ts#L332](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L332) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts#L1) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [types.d.ts#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts#L22) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.d.ts#L3](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#L3) | - |
@@ -643,6 +630,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [field_stats.d.ts#L9](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#L9) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [embeddable.tsx#L14](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx#L14) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [embeddable.tsx#L85](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx#L85) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx#L25) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L102](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx#L102) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [field_item.tsx#L47](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#L47) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [field_item.tsx#L172](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/field_item.tsx#L172) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [datapanel.tsx#L42](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/datapanel.tsx#L42) | - |
@@ -657,10 +646,10 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [types.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/types.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [types.ts#L57](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/public/indexpattern_datasource/types.ts#L57) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L11](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L11) | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L139](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L139) | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L248](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L248) | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L287](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L287) | - |
-| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L329](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L329) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L141](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L141) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L250](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L250) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L290](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L290) | - |
+| <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.ts#L332](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/server/routes/field_stats.ts#L332) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [types.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts#L1) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [types.d.ts#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/public/indexpattern_datasource/types.d.ts#L22) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [field_stats.d.ts#L3](https://github.com/elastic/kibana/tree/master/x-pack/plugins/lens/target/types/server/routes/field_stats.d.ts#L3) | - |
@@ -946,7 +935,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | Deprecated API | Reference location | Remove By |
 | ---------------|-----------|-----------|
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/embeddable/types.ts#L8) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L45](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/embeddable/types.ts#L45) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L44](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/embeddable/types.ts#L44) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [es_doc_field.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [es_doc_field.ts#L45](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts#L45) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IFieldType" text="IFieldType"/> | [es_source.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts#L10) | - |
@@ -1136,7 +1125,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [get_docvalue_source_fields.test.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/sources/es_search_source/get_docvalue_source_fields.test.ts#L10) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [get_docvalue_source_fields.test.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/sources/es_search_source/get_docvalue_source_fields.test.ts#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/embeddable/types.ts#L8) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L45](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/embeddable/types.ts#L45) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L44](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/embeddable/types.ts#L44) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [es_doc_field.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [es_doc_field.ts#L45](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/fields/es_doc_field.ts#L45) | - |
 | <DocLink id="kibDataPluginApi" section="def-server.IFieldType" text="IFieldType"/> | [es_source.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/maps/public/classes/sources/es_source/es_source.ts#L10) | - |
@@ -1393,7 +1382,7 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [static_globals.ts#L43](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/server/static_globals.ts#L43) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L18](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/server/plugin.ts#L18) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L74](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/server/plugin.ts#L74) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L279](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/server/plugin.ts#L279) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.ts#L284](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/server/plugin.ts#L284) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [types.d.ts#L2](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/target/types/server/types.d.ts#L2) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [types.d.ts#L47](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/target/types/server/types.d.ts#L47) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.ILegacyCustomClusterClient" text="ILegacyCustomClusterClient"/> | [plugin.d.ts#L1](https://github.com/elastic/kibana/tree/master/x-pack/plugins/monitoring/target/types/server/plugin.d.ts#L1) | 7.16 |
@@ -1482,22 +1471,22 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L18](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L18) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L95](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L95) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L19) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L104](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L104) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L10) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L53](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L53) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L61](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L61) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L69](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L69) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [default_configs.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts#L19) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [default_configs.ts#L24](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts#L24) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L18](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L18) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L95](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L95) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [default_configs.ts#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts#L25) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L19) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L104](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts#L104) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L10) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L53](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L53) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L61](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L61) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [utils.ts#L69](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/utils.ts#L69) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [default_configs.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts#L19) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [default_configs.ts#L24](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts#L24) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [default_configs.ts#L25](https://github.com/elastic/kibana/tree/master/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/default_configs.ts#L25) | - |
 
 
 
@@ -1573,9 +1562,9 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 | Deprecated API | Reference location | Remove By |
 | ---------------|-----------|-----------|
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L21) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L66](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L66) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [action.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L19) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L22) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L72](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L72) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [action.ts#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L20) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [action.ts#L100](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L100) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.ts#L86](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L86) | - |
@@ -1612,9 +1601,9 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L41](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/details/types.ts#L41) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L34](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L34) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L44](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L44) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L60](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L60) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L65](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L65) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L48](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L48) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L64](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L64) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L69](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L69) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [types.ts#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L28) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L15](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx#L15) | - |
@@ -1669,6 +1658,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [use_field_value_autocomplete.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts#L31) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [field_value_match.tsx#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L19) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [field_value_match.tsx#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L30) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [query.ts#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts#L13) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [query.ts#L52](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts#L52) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [model.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [model.ts#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L30) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L33) | - |
@@ -1785,9 +1776,9 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [index.tsx#L242](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/risk_score_mapping/index.tsx#L242) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IFieldType" text="IFieldType"/> | [index.tsx#L35](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/autocomplete_field/index.tsx#L35) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L21](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L21) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L66](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L66) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [action.ts#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L19) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L22) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L72](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/types.ts#L72) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [action.ts#L20](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L20) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [action.ts#L100](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts#L100) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.ts#L86](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/common/search_strategy/index_fields/index.ts#L86) | - |
@@ -1824,9 +1815,9 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L41](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/pages/details/types.ts#L41) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L34](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.tsx#L34) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L44](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L44) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L60](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L60) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L65](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L65) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L48](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L48) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L64](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L64) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [middleware.ts#L69](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/middleware.ts#L69) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L12](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L12) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [types.ts#L28](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/types.ts#L28) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L15](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/description_step/index.tsx#L15) | - |
@@ -1881,6 +1872,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [use_field_value_autocomplete.ts#L31](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/hooks/use_field_value_autocomplete.ts#L31) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [field_value_match.tsx#L19](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L19) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [field_value_match.tsx#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/components/autocomplete/field_value_match.tsx#L30) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [query.ts#L13](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts#L13) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [query.ts#L52](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts#L52) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [model.ts#L8](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L8) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [model.ts#L30](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/common/store/sourcerer/model.ts#L30) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [index.tsx#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/detections/components/rules/severity_mapping/index.tsx#L33) | - |
@@ -1955,8 +1948,8 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | <DocLink id="kibCorePluginApi" section="def-public.AppLeaveHandler" text="AppLeaveHandler"/> | [app.tsx#L33](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/app/app.tsx#L33) | - |
 | <DocLink id="kibCorePluginApi" section="def-public.AppLeaveHandler" text="AppLeaveHandler"/> | [app.tsx#L73](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/public/app/app.tsx#L73) | - |
 | <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [sender.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts#L10) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [sender.ts#L447](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts#L447) | 7.16 |
-| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [sender.ts#L466](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts#L466) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [sender.ts#L457](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts#L457) | 7.16 |
+| <DocLink id="kibCorePluginApi" section="def-server.LegacyAPICaller" text="LegacyAPICaller"/> | [sender.ts#L476](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts#L476) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.LegacyCallAPIOptions" text="LegacyCallAPIOptions"/> | [types.ts#L55](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts#L55) | 7.16 |
 | <DocLink id="kibCorePluginApi" section="def-server.LegacyCallAPIOptions" text="LegacyCallAPIOptions"/> | [types.ts#L111](https://github.com/elastic/kibana/tree/master/x-pack/plugins/security_solution/server/lib/detection_engine/types.ts#L111) | 7.16 |
 
@@ -2076,12 +2069,12 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 | ---------------|-----------|-----------|
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [es_index_service.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/public/app/services/es_index_service.ts#L10) | - |
 | <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [es_index_service.ts#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/public/app/services/es_index_service.ts#L22) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L62](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L62) | - |
-| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L404](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L404) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L63](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L63) | - |
+| <DocLink id="kibDataPluginApi" section="def-public.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L405](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L405) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [es_index_service.ts#L10](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/public/app/services/es_index_service.ts#L10) | - |
 | <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [es_index_service.ts#L22](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/public/app/services/es_index_service.ts#L22) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L62](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L62) | - |
-| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L404](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L404) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L63](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L63) | - |
+| <DocLink id="kibDataPluginApi" section="def-common.IIndexPattern" text="IIndexPattern"/> | [transforms.ts#L405](https://github.com/elastic/kibana/tree/master/x-pack/plugins/transform/server/routes/api/transforms.ts#L405) | - |
 
 
 
diff --git a/api_docs/discover.json b/api_docs/discover.json
index 1824b5a3e3d5d..48ed4d51abc67 100644
--- a/api_docs/discover.json
+++ b/api_docs/discover.json
@@ -56,7 +56,7 @@
         "description": [],
         "signature": [
           "() => Promise<typeof ",
-          "src/plugins/discover/public/application/helpers/get_sharing_data",
+          "src/plugins/discover/public/application/apps/main/utils/get_sharing_data",
           ">"
         ],
         "source": {
@@ -79,7 +79,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/discover/public/url_generator.ts",
-          "lineNumber": 22
+          "lineNumber": 16
         },
         "deprecated": false,
         "children": [
@@ -97,7 +97,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 26
+              "lineNumber": 20
             },
             "deprecated": false
           },
@@ -115,7 +115,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 31
+              "lineNumber": 25
             },
             "deprecated": false
           },
@@ -140,7 +140,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 36
+              "lineNumber": 30
             },
             "deprecated": false
           },
@@ -165,7 +165,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 41
+              "lineNumber": 35
             },
             "deprecated": false
           },
@@ -190,7 +190,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 46
+              "lineNumber": 40
             },
             "deprecated": false
           },
@@ -215,7 +215,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 52
+              "lineNumber": 46
             },
             "deprecated": false
           },
@@ -233,7 +233,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 58
+              "lineNumber": 52
             },
             "deprecated": false
           },
@@ -251,7 +251,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 63
+              "lineNumber": 57
             },
             "deprecated": false
           },
@@ -269,7 +269,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 68
+              "lineNumber": 62
             },
             "deprecated": false
           },
@@ -287,7 +287,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 73
+              "lineNumber": 67
             },
             "deprecated": false
           },
@@ -305,7 +305,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 77
+              "lineNumber": 72
             },
             "deprecated": false
           },
@@ -323,7 +323,7 @@
             ],
             "source": {
               "path": "src/plugins/discover/public/url_generator.ts",
-              "lineNumber": 81
+              "lineNumber": 77
             },
             "deprecated": false
           }
@@ -890,7 +890,7 @@
         ],
         "source": {
           "path": "src/plugins/discover/public/url_generator.ts",
-          "lineNumber": 20
+          "lineNumber": 14
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/enterprise_search.json b/api_docs/enterprise_search.json
index 6ea7bfe1c50f1..e2b6184c9d36f 100644
--- a/api_docs/enterprise_search.json
+++ b/api_docs/enterprise_search.json
@@ -22,11 +22,11 @@
         "label": "ConfigType",
         "description": [],
         "signature": [
-          "{ readonly host?: string | undefined; readonly enabled: boolean; readonly accessCheckTimeout: number; readonly accessCheckTimeoutWarning: number; }"
+          "{ readonly host?: string | undefined; readonly enabled: boolean; readonly ssl: Readonly<{ certificateAuthorities?: string | string[] | undefined; } & { verificationMode: \"none\" | \"certificate\" | \"full\"; }>; readonly accessCheckTimeout: number; readonly accessCheckTimeoutWarning: number; }"
         ],
         "source": {
           "path": "x-pack/plugins/enterprise_search/server/index.ts",
-          "lineNumber": 24
+          "lineNumber": 33
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -50,7 +50,13 @@
           "Type",
           "<number>; accessCheckTimeoutWarning: ",
           "Type",
-          "<number>; }>"
+          "<number>; ssl: ",
+          "ObjectType",
+          "<{ certificateAuthorities: ",
+          "Type",
+          "<string | string[] | undefined>; verificationMode: ",
+          "Type",
+          "<\"none\" | \"certificate\" | \"full\">; }>; }>"
         ],
         "source": {
           "path": "x-pack/plugins/enterprise_search/server/index.ts",
diff --git a/api_docs/event_log.json b/api_docs/event_log.json
index 1eb19bf6310de..1d5605105c7c1 100644
--- a/api_docs/event_log.json
+++ b/api_docs/event_log.json
@@ -687,7 +687,7 @@
             "label": "logEvent",
             "description": [],
             "signature": [
-              "(properties: DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
+              "(properties: DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
             ],
             "source": {
               "path": "x-pack/plugins/event_log/server/types.ts",
@@ -703,7 +703,7 @@
                 "label": "properties",
                 "description": [],
                 "signature": [
-                  "DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                  "DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
                 ],
                 "source": {
                   "path": "x-pack/plugins/event_log/server/types.ts",
@@ -723,7 +723,7 @@
             "label": "startTiming",
             "description": [],
             "signature": [
-              "(event: DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
+              "(event: DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
             ],
             "source": {
               "path": "x-pack/plugins/event_log/server/types.ts",
@@ -739,7 +739,7 @@
                 "label": "event",
                 "description": [],
                 "signature": [
-                  "DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                  "DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
                 ],
                 "source": {
                   "path": "x-pack/plugins/event_log/server/types.ts",
@@ -759,7 +759,7 @@
             "label": "stopTiming",
             "description": [],
             "signature": [
-              "(event: DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
+              "(event: DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => void"
             ],
             "source": {
               "path": "x-pack/plugins/event_log/server/types.ts",
@@ -775,7 +775,7 @@
                 "label": "event",
                 "description": [],
                 "signature": [
-                  "DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                  "DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
                 ],
                 "source": {
                   "path": "x-pack/plugins/event_log/server/types.ts",
@@ -850,7 +850,7 @@
             "label": "data",
             "description": [],
             "signature": [
-              "(Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
+              "(Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined)[]"
             ],
             "source": {
               "path": "x-pack/plugins/event_log/server/es/cluster_client_adapter.ts",
@@ -872,7 +872,7 @@
         "label": "IEvent",
         "description": [],
         "signature": [
-          "DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+          "DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
         ],
         "source": {
           "path": "x-pack/plugins/event_log/generated/schemas.ts",
@@ -889,7 +889,7 @@
         "label": "IValidatedEvent",
         "description": [],
         "signature": [
-          "Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined"
+          "Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}> | undefined"
         ],
         "source": {
           "path": "x-pack/plugins/event_log/generated/schemas.ts",
@@ -1171,7 +1171,7 @@
           "label": "getLogger",
           "description": [],
           "signature": [
-            "(properties: DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => ",
+            "(properties: DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined) => ",
             {
               "pluginId": "eventLog",
               "scope": "server",
@@ -1194,7 +1194,7 @@
               "label": "properties",
               "description": [],
               "signature": [
-                "DeepPartial<DeepWriteable<Readonly<{ '@timestamp'?: string | undefined; kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
+                "DeepPartial<DeepWriteable<Readonly<{ kibana?: Readonly<{ saved_objects?: Readonly<{ type?: string | undefined; id?: string | undefined; rel?: string | undefined; namespace?: string | undefined; type_id?: string | undefined; } & {}>[] | undefined; alerting?: Readonly<{ status?: string | undefined; instance_id?: string | undefined; action_group_id?: string | undefined; action_subgroup?: string | undefined; } & {}> | undefined; server_uuid?: string | undefined; } & {}> | undefined; user?: Readonly<{ name?: string | undefined; } & {}> | undefined; error?: Readonly<{ type?: string | undefined; id?: string | undefined; message?: string | undefined; code?: string | undefined; stack_trace?: string | undefined; } & {}> | undefined; message?: string | undefined; tags?: string[] | undefined; event?: Readonly<{ start?: string | undefined; type?: string[] | undefined; id?: string | undefined; url?: string | undefined; end?: string | undefined; category?: string[] | undefined; code?: string | undefined; action?: string | undefined; kind?: string | undefined; original?: string | undefined; severity?: number | undefined; created?: string | undefined; dataset?: string | undefined; duration?: number | undefined; hash?: string | undefined; ingested?: string | undefined; module?: string | undefined; outcome?: string | undefined; provider?: string | undefined; reason?: string | undefined; reference?: string | undefined; risk_score?: number | undefined; risk_score_norm?: number | undefined; sequence?: number | undefined; timezone?: string | undefined; } & {}> | undefined; rule?: Readonly<{ description?: string | undefined; id?: string | undefined; name?: string | undefined; version?: string | undefined; license?: string | undefined; category?: string | undefined; reference?: string | undefined; author?: string[] | undefined; ruleset?: string | undefined; uuid?: string | undefined; } & {}> | undefined; '@timestamp'?: string | undefined; log?: Readonly<{ logger?: string | undefined; level?: string | undefined; } & {}> | undefined; ecs?: Readonly<{ version?: string | undefined; } & {}> | undefined; } & {}>>> | undefined"
               ],
               "source": {
                 "path": "x-pack/plugins/event_log/server/types.ts",
diff --git a/api_docs/expressions.json b/api_docs/expressions.json
index e981414fe7bda..79a9d016df071 100644
--- a/api_docs/expressions.json
+++ b/api_docs/expressions.json
@@ -39151,7 +39151,7 @@
                     "label": "types",
                     "description": [],
                     "signature": [
-                      "(\"boolean\" | \"string\" | \"number\" | \"null\")[]"
+                      "(\"number\" | \"boolean\" | \"string\" | \"null\")[]"
                     ],
                     "source": {
                       "path": "src/plugins/expressions/common/expression_functions/specs/map_column.ts",
diff --git a/api_docs/features.json b/api_docs/features.json
index 63c3ebe3a92de..7392fcf6a17f7 100644
--- a/api_docs/features.json
+++ b/api_docs/features.json
@@ -11,7 +11,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/features/common/kibana_feature.ts",
-          "lineNumber": 137
+          "lineNumber": 142
         },
         "deprecated": false,
         "children": [
@@ -34,7 +34,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 138
+              "lineNumber": 143
             },
             "deprecated": false
           },
@@ -50,7 +50,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 140
+              "lineNumber": 145
             },
             "deprecated": false,
             "children": [
@@ -62,7 +62,7 @@
                 "label": "config",
                 "description": [],
                 "signature": [
-                  "Readonly<{ id: string; name: string; category: Readonly<{ id: string; label: string; ariaLabel?: string | undefined; order?: number | undefined; euiIconType?: string | undefined; }>; order?: number | undefined; excludeFromBasePrivileges?: boolean | undefined; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; app: readonly string[]; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: readonly string[] | undefined; privileges: Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null; subFeatures?: readonly Readonly<{ name: string; privilegeGroups: readonly Readonly<{ groupType: ",
+                  "Readonly<{ id: string; name: string; category: Readonly<{ id: string; label: string; ariaLabel?: string | undefined; order?: number | undefined; euiIconType?: string | undefined; }>; order?: number | undefined; excludeFromBasePrivileges?: boolean | undefined; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; app: readonly string[]; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: readonly string[] | undefined; cases?: readonly string[] | undefined; privileges: Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null; subFeatures?: readonly Readonly<{ name: string; privilegeGroups: readonly Readonly<{ groupType: ",
                   {
                     "pluginId": "features",
                     "scope": "common",
@@ -70,11 +70,11 @@
                     "section": "def-common.SubFeaturePrivilegeGroupType",
                     "text": "SubFeaturePrivilegeGroupType"
                   },
-                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"none\" | \"all\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; ui: readonly string[]; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>[] | undefined; privilegesTooltip?: string | undefined; reserved?: Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined; }>"
+                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"all\" | \"none\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; ui: readonly string[]; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>[] | undefined; privilegesTooltip?: string | undefined; reserved?: Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined; }>"
                 ],
                 "source": {
                   "path": "x-pack/plugins/features/common/kibana_feature.ts",
-                  "lineNumber": 140
+                  "lineNumber": 145
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -91,7 +91,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 146
+              "lineNumber": 151
             },
             "deprecated": false
           },
@@ -104,7 +104,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 150
+              "lineNumber": 155
             },
             "deprecated": false
           },
@@ -120,7 +120,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 154
+              "lineNumber": 159
             },
             "deprecated": false
           },
@@ -136,7 +136,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 158
+              "lineNumber": 163
             },
             "deprecated": false
           },
@@ -152,7 +152,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 162
+              "lineNumber": 167
             },
             "deprecated": false
           },
@@ -168,7 +168,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 166
+              "lineNumber": 171
             },
             "deprecated": false
           },
@@ -184,7 +184,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 170
+              "lineNumber": 175
             },
             "deprecated": false
           },
@@ -200,7 +200,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 174
+              "lineNumber": 179
             },
             "deprecated": false
           },
@@ -212,11 +212,11 @@
             "label": "privileges",
             "description": [],
             "signature": [
-              "Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null"
+              "Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 178
+              "lineNumber": 183
             },
             "deprecated": false
           },
@@ -232,7 +232,23 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 182
+              "lineNumber": 187
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "features",
+            "id": "def-public.KibanaFeature.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/kibana_feature.ts",
+              "lineNumber": 191
             },
             "deprecated": false
           },
@@ -245,7 +261,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 186
+              "lineNumber": 195
             },
             "deprecated": false
           },
@@ -257,11 +273,11 @@
             "label": "reserved",
             "description": [],
             "signature": [
-              "Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined"
+              "Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 190
+              "lineNumber": 199
             },
             "deprecated": false
           },
@@ -284,7 +300,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 194
+              "lineNumber": 203
             },
             "deprecated": false,
             "children": [],
@@ -411,7 +427,7 @@
               "\nIf your feature requires access to specific Alert Types, then specify your access needs here.\nInclude both Alert Types registered by the feature and external Alert Types such as built-in\nAlert Types and Alert Types provided by other features to which you wish to grant access."
             ],
             "signature": [
-              "{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined"
+              "{ rule?: { all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined; alert?: { all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined; } | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
@@ -419,6 +435,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "features",
+            "id": "def-public.FeatureKibanaPrivileges.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [
+              "\nIf your feature requires access to specific owners of cases (aka plugins that have created cases), then specify your access needs here. The values here should\nbe unique identifiers for the owners of cases you want access to."
+            ],
+            "signature": [
+              "{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
+              "lineNumber": 135
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "features",
             "id": "def-public.FeatureKibanaPrivileges.savedObject",
@@ -433,7 +467,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
-              "lineNumber": 110
+              "lineNumber": 161
             },
             "deprecated": false
           },
@@ -453,7 +487,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
-              "lineNumber": 153
+              "lineNumber": 204
             },
             "deprecated": false
           }
@@ -651,6 +685,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "features",
+            "id": "def-public.KibanaFeatureConfig.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [
+              "\nIf your feature grants access to specific case types, you can specify them here to control visibility based on the current space."
+            ],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/kibana_feature.ts",
+              "lineNumber": 104
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "features",
             "id": "def-public.KibanaFeatureConfig.privileges",
@@ -683,7 +735,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 113
+              "lineNumber": 118
             },
             "deprecated": false
           },
@@ -709,7 +761,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 121
+              "lineNumber": 126
             },
             "deprecated": false
           },
@@ -727,7 +779,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 126
+              "lineNumber": 131
             },
             "deprecated": false
           },
@@ -747,7 +799,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 131
+              "lineNumber": 136
             },
             "deprecated": false
           }
@@ -838,7 +890,7 @@
             "section": "def-common.FeatureKibanaPrivileges",
             "text": "FeatureKibanaPrivileges"
           },
-          ", \"management\" | \"catalogue\" | \"alerting\" | \"ui\" | \"app\" | \"api\" | \"savedObject\">"
+          ", \"management\" | \"catalogue\" | \"alerting\" | \"ui\" | \"cases\" | \"app\" | \"api\" | \"savedObject\">"
         ],
         "source": {
           "path": "x-pack/plugins/features/common/sub_feature.ts",
@@ -886,7 +938,7 @@
               "\nDenotes which Primary Feature Privilege this sub-feature privilege should be included in.\n`read` is also included in `all` automatically."
             ],
             "signature": [
-              "\"none\" | \"all\" | \"read\""
+              "\"all\" | \"none\" | \"read\""
             ],
             "source": {
               "path": "x-pack/plugins/features/common/sub_feature.ts",
@@ -1139,7 +1191,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/features/common/kibana_feature.ts",
-          "lineNumber": 137
+          "lineNumber": 142
         },
         "deprecated": false,
         "children": [
@@ -1162,7 +1214,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 138
+              "lineNumber": 143
             },
             "deprecated": false
           },
@@ -1178,7 +1230,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 140
+              "lineNumber": 145
             },
             "deprecated": false,
             "children": [
@@ -1190,7 +1242,7 @@
                 "label": "config",
                 "description": [],
                 "signature": [
-                  "Readonly<{ id: string; name: string; category: Readonly<{ id: string; label: string; ariaLabel?: string | undefined; order?: number | undefined; euiIconType?: string | undefined; }>; order?: number | undefined; excludeFromBasePrivileges?: boolean | undefined; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; app: readonly string[]; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: readonly string[] | undefined; privileges: Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null; subFeatures?: readonly Readonly<{ name: string; privilegeGroups: readonly Readonly<{ groupType: ",
+                  "Readonly<{ id: string; name: string; category: Readonly<{ id: string; label: string; ariaLabel?: string | undefined; order?: number | undefined; euiIconType?: string | undefined; }>; order?: number | undefined; excludeFromBasePrivileges?: boolean | undefined; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; app: readonly string[]; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: readonly string[] | undefined; cases?: readonly string[] | undefined; privileges: Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null; subFeatures?: readonly Readonly<{ name: string; privilegeGroups: readonly Readonly<{ groupType: ",
                   {
                     "pluginId": "features",
                     "scope": "common",
@@ -1198,11 +1250,11 @@
                     "section": "def-common.SubFeaturePrivilegeGroupType",
                     "text": "SubFeaturePrivilegeGroupType"
                   },
-                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"none\" | \"all\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; ui: readonly string[]; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>[] | undefined; privilegesTooltip?: string | undefined; reserved?: Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined; }>"
+                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"all\" | \"none\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; ui: readonly string[]; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>[] | undefined; privilegesTooltip?: string | undefined; reserved?: Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined; }>"
                 ],
                 "source": {
                   "path": "x-pack/plugins/features/common/kibana_feature.ts",
-                  "lineNumber": 140
+                  "lineNumber": 145
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1219,7 +1271,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 146
+              "lineNumber": 151
             },
             "deprecated": false
           },
@@ -1232,7 +1284,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 150
+              "lineNumber": 155
             },
             "deprecated": false
           },
@@ -1248,7 +1300,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 154
+              "lineNumber": 159
             },
             "deprecated": false
           },
@@ -1264,7 +1316,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 158
+              "lineNumber": 163
             },
             "deprecated": false
           },
@@ -1280,7 +1332,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 162
+              "lineNumber": 167
             },
             "deprecated": false
           },
@@ -1296,7 +1348,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 166
+              "lineNumber": 171
             },
             "deprecated": false
           },
@@ -1312,7 +1364,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 170
+              "lineNumber": 175
             },
             "deprecated": false
           },
@@ -1328,7 +1380,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 174
+              "lineNumber": 179
             },
             "deprecated": false
           },
@@ -1340,11 +1392,11 @@
             "label": "privileges",
             "description": [],
             "signature": [
-              "Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null"
+              "Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 178
+              "lineNumber": 183
             },
             "deprecated": false
           },
@@ -1360,7 +1412,23 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 182
+              "lineNumber": 187
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "features",
+            "id": "def-server.KibanaFeature.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/kibana_feature.ts",
+              "lineNumber": 191
             },
             "deprecated": false
           },
@@ -1373,7 +1441,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 186
+              "lineNumber": 195
             },
             "deprecated": false
           },
@@ -1385,11 +1453,11 @@
             "label": "reserved",
             "description": [],
             "signature": [
-              "Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined"
+              "Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 190
+              "lineNumber": 199
             },
             "deprecated": false
           },
@@ -1412,7 +1480,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 194
+              "lineNumber": 203
             },
             "deprecated": false,
             "children": [],
@@ -1740,7 +1808,7 @@
               "\nIf your feature requires access to specific Alert Types, then specify your access needs here.\nInclude both Alert Types registered by the feature and external Alert Types such as built-in\nAlert Types and Alert Types provided by other features to which you wish to grant access."
             ],
             "signature": [
-              "{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined"
+              "{ rule?: { all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined; alert?: { all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined; } | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
@@ -1748,6 +1816,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "features",
+            "id": "def-server.FeatureKibanaPrivileges.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [
+              "\nIf your feature requires access to specific owners of cases (aka plugins that have created cases), then specify your access needs here. The values here should\nbe unique identifiers for the owners of cases you want access to."
+            ],
+            "signature": [
+              "{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
+              "lineNumber": 135
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "features",
             "id": "def-server.FeatureKibanaPrivileges.savedObject",
@@ -1762,7 +1848,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
-              "lineNumber": 110
+              "lineNumber": 161
             },
             "deprecated": false
           },
@@ -1782,7 +1868,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
-              "lineNumber": 153
+              "lineNumber": 204
             },
             "deprecated": false
           }
@@ -1980,6 +2066,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "features",
+            "id": "def-server.KibanaFeatureConfig.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [
+              "\nIf your feature grants access to specific case types, you can specify them here to control visibility based on the current space."
+            ],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/kibana_feature.ts",
+              "lineNumber": 104
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "features",
             "id": "def-server.KibanaFeatureConfig.privileges",
@@ -2012,7 +2116,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 113
+              "lineNumber": 118
             },
             "deprecated": false
           },
@@ -2038,7 +2142,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 121
+              "lineNumber": 126
             },
             "deprecated": false
           },
@@ -2056,7 +2160,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 126
+              "lineNumber": 131
             },
             "deprecated": false
           },
@@ -2076,7 +2180,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 131
+              "lineNumber": 136
             },
             "deprecated": false
           }
@@ -2708,7 +2812,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/features/common/kibana_feature.ts",
-          "lineNumber": 137
+          "lineNumber": 142
         },
         "deprecated": false,
         "children": [
@@ -2731,7 +2835,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 138
+              "lineNumber": 143
             },
             "deprecated": false
           },
@@ -2747,7 +2851,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 140
+              "lineNumber": 145
             },
             "deprecated": false,
             "children": [
@@ -2759,7 +2863,7 @@
                 "label": "config",
                 "description": [],
                 "signature": [
-                  "Readonly<{ id: string; name: string; category: Readonly<{ id: string; label: string; ariaLabel?: string | undefined; order?: number | undefined; euiIconType?: string | undefined; }>; order?: number | undefined; excludeFromBasePrivileges?: boolean | undefined; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; app: readonly string[]; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: readonly string[] | undefined; privileges: Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null; subFeatures?: readonly Readonly<{ name: string; privilegeGroups: readonly Readonly<{ groupType: ",
+                  "Readonly<{ id: string; name: string; category: Readonly<{ id: string; label: string; ariaLabel?: string | undefined; order?: number | undefined; euiIconType?: string | undefined; }>; order?: number | undefined; excludeFromBasePrivileges?: boolean | undefined; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; app: readonly string[]; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: readonly string[] | undefined; cases?: readonly string[] | undefined; privileges: Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null; subFeatures?: readonly Readonly<{ name: string; privilegeGroups: readonly Readonly<{ groupType: ",
                   {
                     "pluginId": "features",
                     "scope": "common",
@@ -2767,11 +2871,11 @@
                     "section": "def-common.SubFeaturePrivilegeGroupType",
                     "text": "SubFeaturePrivilegeGroupType"
                   },
-                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"none\" | \"all\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; ui: readonly string[]; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>[] | undefined; privilegesTooltip?: string | undefined; reserved?: Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined; }>"
+                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"all\" | \"none\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; ui: readonly string[]; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>[] | undefined; privilegesTooltip?: string | undefined; reserved?: Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined; }>"
                 ],
                 "source": {
                   "path": "x-pack/plugins/features/common/kibana_feature.ts",
-                  "lineNumber": 140
+                  "lineNumber": 145
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2788,7 +2892,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 146
+              "lineNumber": 151
             },
             "deprecated": false
           },
@@ -2801,7 +2905,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 150
+              "lineNumber": 155
             },
             "deprecated": false
           },
@@ -2817,7 +2921,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 154
+              "lineNumber": 159
             },
             "deprecated": false
           },
@@ -2833,7 +2937,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 158
+              "lineNumber": 163
             },
             "deprecated": false
           },
@@ -2849,7 +2953,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 162
+              "lineNumber": 167
             },
             "deprecated": false
           },
@@ -2865,7 +2969,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 166
+              "lineNumber": 171
             },
             "deprecated": false
           },
@@ -2881,7 +2985,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 170
+              "lineNumber": 175
             },
             "deprecated": false
           },
@@ -2897,7 +3001,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 174
+              "lineNumber": 179
             },
             "deprecated": false
           },
@@ -2909,11 +3013,11 @@
             "label": "privileges",
             "description": [],
             "signature": [
-              "Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null"
+              "Readonly<{ all: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; read: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }> | null"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 178
+              "lineNumber": 183
             },
             "deprecated": false
           },
@@ -2929,7 +3033,23 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 182
+              "lineNumber": 187
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "features",
+            "id": "def-common.KibanaFeature.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/kibana_feature.ts",
+              "lineNumber": 191
             },
             "deprecated": false
           },
@@ -2942,7 +3062,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 186
+              "lineNumber": 195
             },
             "deprecated": false
           },
@@ -2954,11 +3074,11 @@
             "label": "reserved",
             "description": [],
             "signature": [
-              "Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined"
+              "Readonly<{ description: string; privileges: readonly Readonly<{ id: string; privilege: Readonly<{ excludeFromBasePrivileges?: boolean | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; api?: readonly string[] | undefined; app?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; ui: readonly string[]; }>; }>[]; }> | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 190
+              "lineNumber": 199
             },
             "deprecated": false
           },
@@ -2981,7 +3101,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 194
+              "lineNumber": 203
             },
             "deprecated": false,
             "children": [],
@@ -3035,7 +3155,7 @@
                     "section": "def-common.SubFeaturePrivilegeGroupType",
                     "text": "SubFeaturePrivilegeGroupType"
                   },
-                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"none\" | \"all\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; ui: readonly string[]; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>"
+                  "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"all\" | \"none\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; ui: readonly string[]; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }>"
                 ],
                 "source": {
                   "path": "x-pack/plugins/features/common/sub_feature.ts",
@@ -3076,7 +3196,7 @@
                 "section": "def-common.SubFeaturePrivilegeGroupType",
                 "text": "SubFeaturePrivilegeGroupType"
               },
-              "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"none\" | \"all\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; ui: readonly string[]; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]"
+              "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"all\" | \"none\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; ui: readonly string[]; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/sub_feature.ts",
@@ -3100,7 +3220,7 @@
                 "section": "def-common.SubFeaturePrivilegeGroupType",
                 "text": "SubFeaturePrivilegeGroupType"
               },
-              "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"none\" | \"all\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; ui: readonly string[]; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }"
+              "; privileges: readonly Readonly<{ id: string; name: string; includeIn: \"all\" | \"none\" | \"read\"; minimumLicense?: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; management?: Readonly<{ [x: string]: readonly string[]; }> | undefined; catalogue?: readonly string[] | undefined; alerting?: Readonly<{ rule?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; alert?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; }> | undefined; ui: readonly string[]; cases?: Readonly<{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; }> | undefined; app?: readonly string[] | undefined; api?: readonly string[] | undefined; savedObject: Readonly<{ all: readonly string[]; read: readonly string[]; }>; }>[]; }>[]; }"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/sub_feature.ts",
@@ -3432,7 +3552,7 @@
               "\nIf your feature requires access to specific Alert Types, then specify your access needs here.\nInclude both Alert Types registered by the feature and external Alert Types such as built-in\nAlert Types and Alert Types provided by other features to which you wish to grant access."
             ],
             "signature": [
-              "{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined"
+              "{ rule?: { all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined; alert?: { all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined; } | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
@@ -3440,6 +3560,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "features",
+            "id": "def-common.FeatureKibanaPrivileges.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [
+              "\nIf your feature requires access to specific owners of cases (aka plugins that have created cases), then specify your access needs here. The values here should\nbe unique identifiers for the owners of cases you want access to."
+            ],
+            "signature": [
+              "{ all?: readonly string[] | undefined; read?: readonly string[] | undefined; } | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
+              "lineNumber": 135
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "features",
             "id": "def-common.FeatureKibanaPrivileges.savedObject",
@@ -3454,7 +3592,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
-              "lineNumber": 110
+              "lineNumber": 161
             },
             "deprecated": false
           },
@@ -3474,7 +3612,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/feature_kibana_privileges.ts",
-              "lineNumber": 153
+              "lineNumber": 204
             },
             "deprecated": false
           }
@@ -3672,6 +3810,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "features",
+            "id": "def-common.KibanaFeatureConfig.cases",
+            "type": "Object",
+            "tags": [],
+            "label": "cases",
+            "description": [
+              "\nIf your feature grants access to specific case types, you can specify them here to control visibility based on the current space."
+            ],
+            "signature": [
+              "readonly string[] | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/features/common/kibana_feature.ts",
+              "lineNumber": 104
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "features",
             "id": "def-common.KibanaFeatureConfig.privileges",
@@ -3704,7 +3860,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 113
+              "lineNumber": 118
             },
             "deprecated": false
           },
@@ -3730,7 +3886,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 121
+              "lineNumber": 126
             },
             "deprecated": false
           },
@@ -3748,7 +3904,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 126
+              "lineNumber": 131
             },
             "deprecated": false
           },
@@ -3768,7 +3924,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/features/common/kibana_feature.ts",
-              "lineNumber": 131
+              "lineNumber": 136
             },
             "deprecated": false
           }
@@ -3859,7 +4015,7 @@
             "section": "def-common.FeatureKibanaPrivileges",
             "text": "FeatureKibanaPrivileges"
           },
-          ", \"management\" | \"catalogue\" | \"alerting\" | \"ui\" | \"app\" | \"api\" | \"savedObject\">"
+          ", \"management\" | \"catalogue\" | \"alerting\" | \"ui\" | \"cases\" | \"app\" | \"api\" | \"savedObject\">"
         ],
         "source": {
           "path": "x-pack/plugins/features/common/sub_feature.ts",
@@ -3907,7 +4063,7 @@
               "\nDenotes which Primary Feature Privilege this sub-feature privilege should be included in.\n`read` is also included in `all` automatically."
             ],
             "signature": [
-              "\"none\" | \"all\" | \"read\""
+              "\"all\" | \"none\" | \"read\""
             ],
             "source": {
               "path": "x-pack/plugins/features/common/sub_feature.ts",
diff --git a/api_docs/file_data_visualizer.json b/api_docs/file_data_visualizer.json
deleted file mode 100644
index c536acd5f4997..0000000000000
--- a/api_docs/file_data_visualizer.json
+++ /dev/null
@@ -1,328 +0,0 @@
-{
-  "id": "fileDataVisualizer",
-  "client": {
-    "classes": [],
-    "functions": [],
-    "interfaces": [],
-    "enums": [],
-    "misc": [],
-    "objects": [],
-    "start": {
-      "parentPluginId": "fileDataVisualizer",
-      "id": "def-public.FileDataVisualizerPluginStart",
-      "type": "Type",
-      "tags": [],
-      "label": "FileDataVisualizerPluginStart",
-      "description": [],
-      "signature": [
-        "{ getFileDataVisualizerComponent: () => Promise<React.FC<{}>>; getMaxBytesFormatted: () => string; }"
-      ],
-      "source": {
-        "path": "x-pack/plugins/file_data_visualizer/public/plugin.ts",
-        "lineNumber": 33
-      },
-      "deprecated": false,
-      "lifecycle": "start",
-      "initialIsOpen": true
-    }
-  },
-  "server": {
-    "classes": [],
-    "functions": [],
-    "interfaces": [],
-    "enums": [],
-    "misc": [],
-    "objects": []
-  },
-  "common": {
-    "classes": [],
-    "functions": [],
-    "interfaces": [
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.DataVisualizerTableState",
-        "type": "Interface",
-        "tags": [],
-        "label": "DataVisualizerTableState",
-        "description": [],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-          "lineNumber": 14
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "fileDataVisualizer",
-            "id": "def-common.DataVisualizerTableState.pageSize",
-            "type": "number",
-            "tags": [],
-            "label": "pageSize",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-              "lineNumber": 15
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "fileDataVisualizer",
-            "id": "def-common.DataVisualizerTableState.pageIndex",
-            "type": "number",
-            "tags": [],
-            "label": "pageIndex",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-              "lineNumber": 16
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "fileDataVisualizer",
-            "id": "def-common.DataVisualizerTableState.sortField",
-            "type": "string",
-            "tags": [],
-            "label": "sortField",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-              "lineNumber": 17
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "fileDataVisualizer",
-            "id": "def-common.DataVisualizerTableState.sortDirection",
-            "type": "string",
-            "tags": [],
-            "label": "sortDirection",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-              "lineNumber": 18
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "fileDataVisualizer",
-            "id": "def-common.DataVisualizerTableState.visibleFieldTypes",
-            "type": "Array",
-            "tags": [],
-            "label": "visibleFieldTypes",
-            "description": [],
-            "signature": [
-              "string[]"
-            ],
-            "source": {
-              "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-              "lineNumber": 19
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "fileDataVisualizer",
-            "id": "def-common.DataVisualizerTableState.visibleFieldNames",
-            "type": "Array",
-            "tags": [],
-            "label": "visibleFieldNames",
-            "description": [],
-            "signature": [
-              "string[]"
-            ],
-            "source": {
-              "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-              "lineNumber": 20
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "fileDataVisualizer",
-            "id": "def-common.DataVisualizerTableState.showDistributions",
-            "type": "boolean",
-            "tags": [],
-            "label": "showDistributions",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-              "lineNumber": 21
-            },
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      }
-    ],
-    "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.ABSOLUTE_MAX_FILE_SIZE_BYTES",
-        "type": "number",
-        "tags": [],
-        "label": "ABSOLUTE_MAX_FILE_SIZE_BYTES",
-        "description": [],
-        "signature": [
-          "1073741274"
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 14
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.FILE_SIZE_DISPLAY_FORMAT",
-        "type": "string",
-        "tags": [],
-        "label": "FILE_SIZE_DISPLAY_FORMAT",
-        "description": [],
-        "signature": [
-          "\"0,0.[0] b\""
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 15
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.INDEX_META_DATA_CREATED_BY",
-        "type": "string",
-        "tags": [],
-        "label": "INDEX_META_DATA_CREATED_BY",
-        "description": [],
-        "signature": [
-          "\"file-data-visualizer\""
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 19
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.InputData",
-        "type": "Type",
-        "tags": [],
-        "label": "InputData",
-        "description": [],
-        "signature": [
-          "any[]"
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-          "lineNumber": 10
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.JobFieldType",
-        "type": "Type",
-        "tags": [],
-        "label": "JobFieldType",
-        "description": [],
-        "signature": [
-          "\"number\" | \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"ip\" | \"geo_point\" | \"geo_shape\" | \"unknown\""
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/types.ts",
-          "lineNumber": 12
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.MAX_FILE_SIZE",
-        "type": "string",
-        "tags": [],
-        "label": "MAX_FILE_SIZE",
-        "description": [],
-        "signature": [
-          "\"100MB\""
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 11
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.MAX_FILE_SIZE_BYTES",
-        "type": "number",
-        "tags": [],
-        "label": "MAX_FILE_SIZE_BYTES",
-        "description": [],
-        "signature": [
-          "104857600"
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 12
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.MB",
-        "type": "number",
-        "tags": [],
-        "label": "MB",
-        "description": [],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 10
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.UI_SETTING_MAX_FILE_SIZE",
-        "type": "string",
-        "tags": [],
-        "label": "UI_SETTING_MAX_FILE_SIZE",
-        "description": [],
-        "signature": [
-          "\"fileUpload:maxFileSize\""
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 8
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      }
-    ],
-    "objects": [
-      {
-        "parentPluginId": "fileDataVisualizer",
-        "id": "def-common.JOB_FIELD_TYPES",
-        "type": "Object",
-        "tags": [],
-        "label": "JOB_FIELD_TYPES",
-        "description": [],
-        "signature": [
-          "{ readonly BOOLEAN: \"boolean\"; readonly DATE: \"date\"; readonly GEO_POINT: \"geo_point\"; readonly GEO_SHAPE: \"geo_shape\"; readonly IP: \"ip\"; readonly KEYWORD: \"keyword\"; readonly NUMBER: \"number\"; readonly TEXT: \"text\"; readonly UNKNOWN: \"unknown\"; }"
-        ],
-        "source": {
-          "path": "x-pack/plugins/file_data_visualizer/common/constants.ts",
-          "lineNumber": 21
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      }
-    ]
-  }
-}
\ No newline at end of file
diff --git a/api_docs/fleet.json b/api_docs/fleet.json
index 043dfcd16c2a7..bb7e899062640 100644
--- a/api_docs/fleet.json
+++ b/api_docs/fleet.json
@@ -14,7 +14,7 @@
           "<T extends { name: string; version: string; }>(packageInfo: T) => string"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/services/pkg_key_from_package_info.ts",
+          "path": "x-pack/plugins/fleet/public/services/pkg_key_from_package_info.ts",
           "lineNumber": 8
         },
         "deprecated": false,
@@ -30,7 +30,7 @@
               "T"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/services/pkg_key_from_package_info.ts",
+              "path": "x-pack/plugins/fleet/public/services/pkg_key_from_package_info.ts",
               "lineNumber": 9
             },
             "deprecated": false,
@@ -52,7 +52,7 @@
           "\nSupported routing state for the agent policy details page routes with deploy agents action"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+          "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
           "lineNumber": 37
         },
         "deprecated": false,
@@ -78,7 +78,7 @@
               " | undefined] | undefined"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+              "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
               "lineNumber": 39
             },
             "deprecated": false
@@ -96,7 +96,7 @@
           "\nSupported routing state for the agent policy details page routes with deploy agents action"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+          "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
           "lineNumber": 29
         },
         "deprecated": false,
@@ -122,7 +122,7 @@
               " | undefined] | undefined"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+              "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
               "lineNumber": 31
             },
             "deprecated": false
@@ -140,7 +140,7 @@
           "\nSupported routing state for the create package policy page routes"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+          "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
           "lineNumber": 15
         },
         "deprecated": false,
@@ -182,7 +182,7 @@
               " | undefined]) | undefined"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+              "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
               "lineNumber": 17
             },
             "deprecated": false
@@ -208,7 +208,7 @@
               " | undefined] | undefined"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+              "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
               "lineNumber": 21
             },
             "deprecated": false
@@ -226,7 +226,7 @@
               "string | undefined"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+              "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
               "lineNumber": 23
             },
             "deprecated": false
@@ -411,7 +411,7 @@
           "Extension point registration contract for Integration details Custom view"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 94
         },
         "deprecated": false,
@@ -424,7 +424,7 @@
             "label": "package",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 95
             },
             "deprecated": false
@@ -440,7 +440,7 @@
               "\"package-detail-custom\""
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 96
             },
             "deprecated": false
@@ -488,7 +488,7 @@
               ">; }"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 97
             },
             "deprecated": false,
@@ -523,7 +523,7 @@
         "label": "PackageCustomExtensionComponentProps",
         "description": [],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 87
         },
         "deprecated": false,
@@ -538,7 +538,7 @@
               "The package key value that should be used used for URLs"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 89
             },
             "deprecated": false
@@ -649,7 +649,7 @@
               ">>"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 90
             },
             "deprecated": false
@@ -667,7 +667,7 @@
           "Extension point registration contract for Integration Policy Create views"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 76
         },
         "deprecated": false,
@@ -680,7 +680,7 @@
             "label": "package",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 77
             },
             "deprecated": false
@@ -696,7 +696,7 @@
               "\"package-policy-create\""
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 78
             },
             "deprecated": false
@@ -744,7 +744,7 @@
               ">; }"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 79
             },
             "deprecated": false,
@@ -779,7 +779,7 @@
         "label": "PackagePolicyCreateExtensionComponentProps",
         "description": [],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 60
         },
         "deprecated": false,
@@ -803,7 +803,7 @@
               }
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 62
             },
             "deprecated": false
@@ -829,7 +829,7 @@
               "; }) => void"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 67
             },
             "deprecated": false,
@@ -854,7 +854,7 @@
                   "; }"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+                  "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
                   "lineNumber": 67
                 },
                 "deprecated": false
@@ -874,7 +874,7 @@
           "Extension point registration contract for Integration Policy Edit views"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 48
         },
         "deprecated": false,
@@ -887,7 +887,7 @@
             "label": "package",
             "description": [],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 49
             },
             "deprecated": false
@@ -903,7 +903,7 @@
               "\"package-policy-edit\""
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 50
             },
             "deprecated": false
@@ -951,7 +951,7 @@
               ">; }"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 51
             },
             "deprecated": false,
@@ -986,7 +986,7 @@
         "label": "PackagePolicyEditExtensionComponentProps",
         "description": [],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 26
         },
         "deprecated": false,
@@ -1010,7 +1010,7 @@
               }
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 28
             },
             "deprecated": false
@@ -1034,7 +1034,7 @@
               }
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 30
             },
             "deprecated": false
@@ -1060,7 +1060,7 @@
               ">; }) => void"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 39
             },
             "deprecated": false,
@@ -1085,7 +1085,7 @@
                   ">; }"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+                  "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
                   "lineNumber": 39
                 },
                 "deprecated": false
@@ -1105,7 +1105,7 @@
           "Internal storage for registered UI Extension Points"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 16
         },
         "deprecated": false,
@@ -1121,7 +1121,7 @@
               "any"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+              "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
               "lineNumber": 17
             },
             "deprecated": false
@@ -1167,7 +1167,7 @@
           }
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts",
+          "path": "x-pack/plugins/fleet/public/types/intra_app_route_state.ts",
           "lineNumber": 45
         },
         "deprecated": false,
@@ -1202,7 +1202,7 @@
           ">"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 85
         },
         "deprecated": false,
@@ -1237,7 +1237,7 @@
           ">"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 58
         },
         "deprecated": false,
@@ -1272,7 +1272,7 @@
           ">"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 24
         },
         "deprecated": false,
@@ -1313,7 +1313,7 @@
           }
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 101
         },
         "deprecated": false,
@@ -1340,7 +1340,7 @@
           ") => void"
         ],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+          "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
           "lineNumber": 13
         },
         "deprecated": false,
@@ -1356,8 +1356,8 @@
         "label": "pagePathGetters",
         "description": [],
         "source": {
-          "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-          "lineNumber": 69
+          "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+          "lineNumber": 73
         },
         "deprecated": false,
         "children": [
@@ -1369,11 +1369,11 @@
             "label": "base",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 75
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 79
             },
             "deprecated": false,
             "children": [],
@@ -1387,11 +1387,11 @@
             "label": "overview",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 76
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 80
             },
             "deprecated": false,
             "children": [],
@@ -1405,11 +1405,11 @@
             "label": "integrations",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 77
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 81
             },
             "deprecated": false,
             "children": [],
@@ -1423,11 +1423,11 @@
             "label": "integrations_all",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 78
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 82
             },
             "deprecated": false,
             "children": [],
@@ -1441,11 +1441,11 @@
             "label": "integrations_installed",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 79
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 83
             },
             "deprecated": false,
             "children": [],
@@ -1461,11 +1461,11 @@
             "signature": [
               "({ pkgkey, integration }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 80
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 84
             },
             "deprecated": false,
             "children": [
@@ -1480,8 +1480,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 80
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 84
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1499,11 +1499,11 @@
             "signature": [
               "({ pkgkey, integration }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 82
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 88
             },
             "deprecated": false,
             "children": [
@@ -1518,8 +1518,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 82
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 88
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1537,11 +1537,11 @@
             "signature": [
               "({ pkgkey, integration }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 84
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 92
             },
             "deprecated": false,
             "children": [
@@ -1556,8 +1556,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 84
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 92
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1575,11 +1575,11 @@
             "signature": [
               "({ pkgkey, integration }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 86
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 96
             },
             "deprecated": false,
             "children": [
@@ -1594,8 +1594,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 86
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 96
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1613,11 +1613,11 @@
             "signature": [
               "({ packagePolicyId }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 88
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 100
             },
             "deprecated": false,
             "children": [
@@ -1632,8 +1632,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 88
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 100
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1649,11 +1649,11 @@
             "label": "policies",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 90
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 104
             },
             "deprecated": false,
             "children": [],
@@ -1667,11 +1667,11 @@
             "label": "policies_list",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 91
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 105
             },
             "deprecated": false,
             "children": [],
@@ -1687,11 +1687,11 @@
             "signature": [
               "({ policyId, tabId }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 92
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 106
             },
             "deprecated": false,
             "children": [
@@ -1706,8 +1706,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 92
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 106
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1725,11 +1725,11 @@
             "signature": [
               "({ policyId }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 93
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 110
             },
             "deprecated": false,
             "children": [
@@ -1744,8 +1744,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 93
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 110
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1763,11 +1763,11 @@
             "signature": [
               "({ pkgkey, integration }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 94
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 114
             },
             "deprecated": false,
             "children": [
@@ -1782,8 +1782,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 94
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 114
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1801,11 +1801,11 @@
             "signature": [
               "({ policyId, packagePolicyId }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 96
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 118
             },
             "deprecated": false,
             "children": [
@@ -1820,8 +1820,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 96
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 118
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1837,11 +1837,11 @@
             "label": "fleet",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 98
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 122
             },
             "deprecated": false,
             "children": [],
@@ -1857,11 +1857,11 @@
             "signature": [
               "({ kuery }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 99
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 123
             },
             "deprecated": false,
             "children": [
@@ -1876,8 +1876,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 99
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 123
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1895,11 +1895,11 @@
             "signature": [
               "({ agentId, tabId, logQuery }: ",
               "DynamicPagePathValues",
-              ") => string"
+              ") => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 100
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 127
             },
             "deprecated": false,
             "children": [
@@ -1914,8 +1914,8 @@
                   "DynamicPagePathValues"
                 ],
                 "source": {
-                  "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-                  "lineNumber": 100
+                  "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+                  "lineNumber": 127
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1931,11 +1931,11 @@
             "label": "fleet_enrollment_tokens",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 102
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 131
             },
             "deprecated": false,
             "children": [],
@@ -1949,11 +1949,11 @@
             "label": "data_streams",
             "description": [],
             "signature": [
-              "() => string"
+              "() => [string, string]"
             ],
             "source": {
-              "path": "x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts",
-              "lineNumber": 103
+              "path": "x-pack/plugins/fleet/public/constants/page_paths.ts",
+              "lineNumber": 132
             },
             "deprecated": false,
             "children": [],
@@ -1972,7 +1972,7 @@
       "description": [],
       "source": {
         "path": "x-pack/plugins/fleet/public/plugin.ts",
-        "lineNumber": 51
+        "lineNumber": 48
       },
       "deprecated": false,
       "children": [],
@@ -1990,7 +1990,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/fleet/public/plugin.ts",
-        "lineNumber": 56
+        "lineNumber": 53
       },
       "deprecated": false,
       "children": [
@@ -2014,7 +2014,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/public/plugin.ts",
-            "lineNumber": 57
+            "lineNumber": 54
           },
           "deprecated": false,
           "returnComment": [],
@@ -2052,7 +2052,7 @@
                 }
               ],
               "source": {
-                "path": "x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts",
+                "path": "x-pack/plugins/fleet/public/types/ui_extensions.ts",
                 "lineNumber": 13
               },
               "deprecated": false
@@ -2071,7 +2071,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/public/plugin.ts",
-            "lineNumber": 58
+            "lineNumber": 55
           },
           "deprecated": false,
           "returnComment": [],
@@ -3721,7 +3721,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
@@ -3966,7 +3966,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
@@ -4448,7 +4448,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/fleet/server/plugin.ts",
-          "lineNumber": 90
+          "lineNumber": 91
         },
         "deprecated": false,
         "children": [
@@ -4470,7 +4470,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/fleet/server/plugin.ts",
-              "lineNumber": 91
+              "lineNumber": 92
             },
             "deprecated": false
           },
@@ -4493,7 +4493,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/fleet/server/plugin.ts",
-              "lineNumber": 92
+              "lineNumber": 93
             },
             "deprecated": false
           },
@@ -4516,7 +4516,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/fleet/server/plugin.ts",
-              "lineNumber": 93
+              "lineNumber": 94
             },
             "deprecated": false
           },
@@ -4538,7 +4538,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/fleet/server/plugin.ts",
-              "lineNumber": 94
+              "lineNumber": 95
             },
             "deprecated": false
           },
@@ -4561,7 +4561,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/fleet/server/plugin.ts",
-              "lineNumber": 95
+              "lineNumber": 96
             },
             "deprecated": false
           },
@@ -4584,7 +4584,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/fleet/server/plugin.ts",
-              "lineNumber": 96
+              "lineNumber": 97
             },
             "deprecated": false
           }
@@ -4767,7 +4767,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/fleet/server/plugin.ts",
-          "lineNumber": 137
+          "lineNumber": 138
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -4784,7 +4784,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/fleet/server/index.ts",
-          "lineNumber": 66
+          "lineNumber": 83
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -4801,7 +4801,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/fleet/server/services/package_policy.ts",
-          "lineNumber": 655
+          "lineNumber": 656
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -4838,7 +4838,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/fleet/server/plugin.ts",
-        "lineNumber": 122
+        "lineNumber": 123
       },
       "deprecated": false,
       "lifecycle": "setup",
@@ -4855,7 +4855,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/fleet/server/plugin.ts",
-        "lineNumber": 160
+        "lineNumber": 161
       },
       "deprecated": false,
       "children": [
@@ -4873,7 +4873,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 166
+            "lineNumber": 167
           },
           "deprecated": false,
           "returnComment": [],
@@ -4897,7 +4897,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 167
+            "lineNumber": 168
           },
           "deprecated": false
         },
@@ -4919,7 +4919,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 168
+            "lineNumber": 169
           },
           "deprecated": false
         },
@@ -4941,7 +4941,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 169
+            "lineNumber": 170
           },
           "deprecated": false
         },
@@ -4959,7 +4959,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 173
+            "lineNumber": 174
           },
           "deprecated": false
         },
@@ -4981,7 +4981,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 174
+            "lineNumber": 175
           },
           "deprecated": false
         },
@@ -5007,7 +5007,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 179
+            "lineNumber": 180
           },
           "deprecated": false,
           "returnComment": [],
@@ -5088,7 +5088,7 @@
               ],
               "source": {
                 "path": "x-pack/plugins/fleet/server/plugin.ts",
-                "lineNumber": 179
+                "lineNumber": 180
               },
               "deprecated": false
             }
@@ -5109,7 +5109,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/fleet/server/plugin.ts",
-            "lineNumber": 185
+            "lineNumber": 186
           },
           "deprecated": false,
           "returnComment": [],
@@ -5123,7 +5123,7 @@
               "description": [],
               "source": {
                 "path": "x-pack/plugins/fleet/server/plugin.ts",
-                "lineNumber": 185
+                "lineNumber": 186
               },
               "deprecated": false
             }
@@ -8203,7 +8203,7 @@
             "label": "agents",
             "description": [],
             "signature": [
-              "{ enabled: boolean; elasticsearch: { host?: string | undefined; ca_sha256?: string | undefined; }; fleet_server?: { hosts?: string[] | undefined; } | undefined; }"
+              "{ enabled: boolean; elasticsearch: { hosts?: string[] | undefined; ca_sha256?: string | undefined; }; fleet_server?: { hosts?: string[] | undefined; } | undefined; }"
             ],
             "source": {
               "path": "x-pack/plugins/fleet/common/types/index.ts",
@@ -17304,6 +17304,23 @@
         "deprecated": false,
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "fleet",
+        "id": "def-common.INTEGRATIONS_PLUGIN_ID",
+        "type": "string",
+        "tags": [],
+        "label": "INTEGRATIONS_PLUGIN_ID",
+        "description": [],
+        "signature": [
+          "\"integrations\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/fleet/common/constants/plugin.ts",
+          "lineNumber": 9
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "fleet",
         "id": "def-common.KibanaAssetParts",
diff --git a/api_docs/home.json b/api_docs/home.json
index a1039beb8d3a2..c11d02dfed9de 100644
--- a/api_docs/home.json
+++ b/api_docs/home.json
@@ -501,7 +501,7 @@
         ],
         "source": {
           "path": "src/plugins/home/public/plugin.ts",
-          "lineNumber": 161
+          "lineNumber": 166
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -534,7 +534,7 @@
         ],
         "source": {
           "path": "src/plugins/home/public/plugin.ts",
-          "lineNumber": 158
+          "lineNumber": 163
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -602,7 +602,7 @@
         ],
         "source": {
           "path": "src/plugins/home/public/plugin.ts",
-          "lineNumber": 164
+          "lineNumber": 169
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -873,7 +873,7 @@
       "description": [],
       "source": {
         "path": "src/plugins/home/public/plugin.ts",
-        "lineNumber": 167
+        "lineNumber": 175
       },
       "deprecated": false,
       "children": [
@@ -889,7 +889,25 @@
           ],
           "source": {
             "path": "src/plugins/home/public/plugin.ts",
-            "lineNumber": 168
+            "lineNumber": 176
+          },
+          "deprecated": false
+        },
+        {
+          "parentPluginId": "home",
+          "id": "def-public.HomePublicPluginSetup.addData",
+          "type": "Object",
+          "tags": [],
+          "label": "addData",
+          "description": [],
+          "signature": [
+            "{ registerAddDataTab: (tab: ",
+            "AddDataTab",
+            ") => void; }"
+          ],
+          "source": {
+            "path": "src/plugins/home/public/plugin.ts",
+            "lineNumber": 177
           },
           "deprecated": false
         },
@@ -921,7 +939,7 @@
           ],
           "source": {
             "path": "src/plugins/home/public/plugin.ts",
-            "lineNumber": 169
+            "lineNumber": 178
           },
           "deprecated": false
         },
@@ -949,7 +967,7 @@
           ],
           "source": {
             "path": "src/plugins/home/public/plugin.ts",
-            "lineNumber": 176
+            "lineNumber": 185
           },
           "deprecated": true,
           "references": [
@@ -964,7 +982,7 @@
               "plugin": "apm",
               "link": {
                 "path": "x-pack/plugins/apm/public/plugin.ts",
-                "lineNumber": 82
+                "lineNumber": 85
               }
             },
             {
@@ -989,7 +1007,7 @@
       "description": [],
       "source": {
         "path": "src/plugins/home/public/plugin.ts",
-        "lineNumber": 178
+        "lineNumber": 187
       },
       "deprecated": false,
       "children": [
@@ -1005,7 +1023,7 @@
           ],
           "source": {
             "path": "src/plugins/home/public/plugin.ts",
-            "lineNumber": 179
+            "lineNumber": 188
           },
           "deprecated": false
         }
diff --git a/api_docs/index_management.json b/api_docs/index_management.json
index 9d4edf199ca27..9dc02a51148bc 100644
--- a/api_docs/index_management.json
+++ b/api_docs/index_management.json
@@ -722,7 +722,7 @@
       "description": [],
       "source": {
         "path": "x-pack/plugins/index_management/server/plugin.ts",
-        "lineNumber": 25
+        "lineNumber": 23
       },
       "deprecated": false,
       "children": [
@@ -740,7 +740,7 @@
           ],
           "source": {
             "path": "x-pack/plugins/index_management/server/plugin.ts",
-            "lineNumber": 26
+            "lineNumber": 24
           },
           "deprecated": false
         }
diff --git a/api_docs/kibana_react.json b/api_docs/kibana_react.json
index 98537d71d7b01..a477de7c6512c 100644
--- a/api_docs/kibana_react.json
+++ b/api_docs/kibana_react.json
@@ -3952,11 +3952,11 @@
           "CommonProps",
           " & React.HTMLAttributes<HTMLElement> & ",
           "DisambiguateSet",
-          "<{ position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }, { position: \"static\" | \"sticky\"; }> & { position: \"static\" | \"sticky\"; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | (",
+          "<{ position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }, { position: \"static\" | \"sticky\"; }> & { position: \"static\" | \"sticky\"; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | (",
           "CommonProps",
           " & React.HTMLAttributes<HTMLElement> & ",
           "DisambiguateSet",
-          "<{ position: \"static\" | \"sticky\"; }, { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }> & { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | undefined; }, { template: \"default\" | \"empty\" | \"centeredBody\" | \"centeredContent\"; }> & { template: \"default\" | \"empty\" | \"centeredBody\" | \"centeredContent\"; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; pageSideBar?: React.ReactNode; pageSideBarProps?: ",
+          "<{ position: \"static\" | \"sticky\"; }, { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }> & { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | undefined; }, { template: \"default\" | \"empty\" | \"centeredBody\" | \"centeredContent\"; }> & { template: \"default\" | \"empty\" | \"centeredBody\" | \"centeredContent\"; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; pageSideBar?: React.ReactNode; pageSideBarProps?: ",
           "EuiPageSideBarProps",
           " | undefined; pageHeader?: ",
           "EuiPageHeaderProps",
@@ -3976,19 +3976,19 @@
           "CommonProps",
           " & React.HTMLAttributes<HTMLElement> & ",
           "DisambiguateSet",
-          "<{ position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }, { position: \"static\" | \"sticky\"; }> & { position: \"static\" | \"sticky\"; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | (",
+          "<{ position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }, { position: \"static\" | \"sticky\"; }> & { position: \"static\" | \"sticky\"; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | (",
           "CommonProps",
           " & React.HTMLAttributes<HTMLElement> & ",
           "DisambiguateSet",
-          "<{ position: \"static\" | \"sticky\"; }, { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }> & { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | undefined; }> & { template?: \"default\" | undefined; bottomBar?: React.ReactNode; bottomBarProps?: (",
+          "<{ position: \"static\" | \"sticky\"; }, { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }> & { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | undefined; }> & { template?: \"default\" | undefined; bottomBar?: React.ReactNode; bottomBarProps?: (",
           "CommonProps",
           " & React.HTMLAttributes<HTMLElement> & ",
           "DisambiguateSet",
-          "<{ position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }, { position: \"static\" | \"sticky\"; }> & { position: \"static\" | \"sticky\"; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | (",
+          "<{ position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }, { position: \"static\" | \"sticky\"; }> & { position: \"static\" | \"sticky\"; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | (",
           "CommonProps",
           " & React.HTMLAttributes<HTMLElement> & ",
           "DisambiguateSet",
-          "<{ position: \"static\" | \"sticky\"; }, { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }> & { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | undefined; } & { paddingSize?: \"m\" | \"s\" | \"none\" | \"l\" | undefined; pageSideBar?: React.ReactNode; pageSideBarProps?: ",
+          "<{ position: \"static\" | \"sticky\"; }, { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; }> & { position?: \"fixed\" | undefined; usePortal?: boolean | undefined; affordForDisplacement?: boolean | undefined; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; bodyClassName?: string | undefined; landmarkHeading?: string | undefined; top?: string | number | undefined; right?: string | number | undefined; bottom?: string | number | undefined; left?: string | number | undefined; }) | undefined; } & { paddingSize?: \"none\" | \"m\" | \"s\" | \"l\" | undefined; pageSideBar?: React.ReactNode; pageSideBarProps?: ",
           "EuiPageSideBarProps",
           " | undefined; pageHeader?: ",
           "EuiPageHeaderProps",
@@ -4122,7 +4122,7 @@
         "label": "POSITIONS",
         "description": [],
         "signature": [
-          "(\"left\" | \"right\" | \"none\" | \"center\")[]"
+          "(\"none\" | \"left\" | \"right\" | \"center\")[]"
         ],
         "source": {
           "path": "src/plugins/kibana_react/public/toolbar_button/toolbar_button.tsx",
@@ -4185,7 +4185,7 @@
           "EuiButtonProps",
           ", { buttonRef?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined; }>> & ",
           "EuiButtonProps",
-          " & { onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void) | undefined; } & React.ButtonHTMLAttributes<HTMLButtonElement> & { buttonRef?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined; } & { fontWeight?: \"bold\" | \"normal\" | undefined; size?: \"m\" | \"s\" | undefined; hasArrow?: boolean | undefined; groupPosition?: \"left\" | \"right\" | \"none\" | \"center\" | undefined; dataTestSubj?: string | undefined; }) | (",
+          " & { onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void) | undefined; } & React.ButtonHTMLAttributes<HTMLButtonElement> & { buttonRef?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined; } & { fontWeight?: \"bold\" | \"normal\" | undefined; size?: \"m\" | \"s\" | undefined; hasArrow?: boolean | undefined; groupPosition?: \"none\" | \"left\" | \"right\" | \"center\" | undefined; dataTestSubj?: string | undefined; }) | (",
           "DisambiguateSet",
           "<",
           "PropsForButton",
@@ -4197,7 +4197,7 @@
           "EuiButtonProps",
           ", { buttonRef?: ((instance: HTMLAnchorElement | null) => void) | React.RefObject<HTMLAnchorElement> | null | undefined; }>> & ",
           "EuiButtonProps",
-          " & { href?: string | undefined; onClick?: ((event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void) | undefined; } & React.AnchorHTMLAttributes<HTMLAnchorElement> & { buttonRef?: ((instance: HTMLAnchorElement | null) => void) | React.RefObject<HTMLAnchorElement> | null | undefined; } & { fontWeight?: \"bold\" | \"normal\" | undefined; size?: \"m\" | \"s\" | undefined; hasArrow?: boolean | undefined; groupPosition?: \"left\" | \"right\" | \"none\" | \"center\" | undefined; dataTestSubj?: string | undefined; })"
+          " & { href?: string | undefined; onClick?: ((event: React.MouseEvent<HTMLAnchorElement, MouseEvent>) => void) | undefined; } & React.AnchorHTMLAttributes<HTMLAnchorElement> & { buttonRef?: ((instance: HTMLAnchorElement | null) => void) | React.RefObject<HTMLAnchorElement> | null | undefined; } & { fontWeight?: \"bold\" | \"normal\" | undefined; size?: \"m\" | \"s\" | undefined; hasArrow?: boolean | undefined; groupPosition?: \"none\" | \"left\" | \"right\" | \"center\" | undefined; dataTestSubj?: string | undefined; })"
         ],
         "source": {
           "path": "src/plugins/kibana_react/public/toolbar_button/toolbar_button.tsx",
@@ -5003,7 +5003,7 @@
             "label": "eui",
             "description": [],
             "signature": [
-              "{ paddingSizes: { xs: string; s: string; m: string; l: string; xl: string; }; avatarSizing: { s: { size: string; 'font-size': string; }; m: { size: string; 'font-size': string; }; l: { size: string; 'font-size': string; }; xl: { size: string; 'font-size': string; }; }; euiBadgeGroupGutterTypes: { gutterExtraSmall: string; gutterSmall: string; }; euiBreadcrumbSpacing: string; euiBreadcrumbTruncateWidth: string; euiButtonEmptyTypes: { primary: string; danger: string; disabled: string; ghost: string; text: string; success: string; warning: string; }; euiButtonIconTypes: { accent: string; danger: string; ghost: string; primary: string; subdued: string; success: string; text: string; warning: string; }; euiCallOutTypes: { primary: string; success: string; warning: string; danger: string; }; euiCardSpacing: string; euiCardBottomNodeHeight: string; euiCardSelectButtonBorders: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardSelectButtonBackgrounds: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiCheckableCardPadding: string; euiCollapsibleNavWidth: string; euiCollapsibleNavGroupLightBackgroundColor: string; euiCollapsibleNavGroupDarkBackgroundColor: string; euiCollapsibleNavGroupDarkHighContrastColor: string; euiColorPickerValueRange0: string; euiColorPickerValueRange1: string; euiColorPickerSaturationRange0: string; euiColorPickerSaturationRange1: string; euiColorPickerIndicatorSize: string; euiColorPickerWidth: string; euiColorPaletteDisplaySizes: { sizeExtraSmall: string; sizeSmall: string; sizeMedium: string; }; euiContextMenuWidth: string; euiControlBarBackground: string; euiControlBarText: string; euiControlBarBorderColor: string; euiControlBarInitialHeight: string; euiControlBarMaxHeight: string; euiControlBarHeights: { s: string; m: string; l: string; }; euiDataGridPrefix: string; euiDataGridStyles: string; euiDataGridColumnResizerWidth: string; euiDataGridPopoverMaxHeight: string; euiDataGridCellPaddingS: string; euiDataGridCellPaddingM: string; euiDataGridCellPaddingL: string; euiDataGridVerticalBorder: string; euiDatePickerCalendarWidth: string; euiSuperDatePickerWidth: string; euiSuperDatePickerButtonWidth: string; euiDragAndDropSpacing: { s: string; m: string; l: string; }; euiExpressionColors: { subdued: string; primary: string; secondary: string; warning: string; danger: string; accent: string; }; euiFacetGutterSizes: { gutterNone: number; gutterSmall: string; gutterMedium: string; gutterLarge: string; }; gutterTypes: { gutterExtraSmall: string; gutterSmall: string; gutterMedium: string; gutterLarge: string; gutterExtraLarge: string; }; fractions: { fourths: { percentage: string; count: number; }; thirds: { percentage: string; count: number; }; halves: { percentage: string; count: number; }; single: { percentage: string; count: number; }; }; flyoutSizes: { small: { min: string; width: string; max: string; }; medium: { min: string; width: string; max: string; }; large: { min: string; width: string; max: string; }; }; euiFlyoutBorder: string; euiFlyoutPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiFilePickerTallHeight: string; euiRangeLevelColors: { primary: string; success: string; warning: string; danger: string; }; textareaResizing: { vertical: string; horizontal: string; both: string; none: string; }; euiHeaderLinksGutterSizes: { gutterXS: string; gutterS: string; gutterM: string; gutterL: string; }; ruleMargins: { marginXSmall: string; marginSmall: string; marginMedium: string; marginLarge: string; marginXLarge: string; marginXXLarge: string; }; euiIconLoadingOpacity: number; euiIconColors: { accent: string; danger: string; ghost: string; primary: string; secondary: string; success: string; subdued: string; text: string; warning: string; }; euiIconSizes: { small: string; medium: string; large: string; xLarge: string; xxLarge: string; }; euiKeyPadMenuSize: string; euiKeyPadMenuItemBetaBadgeSize: string; euiLinkColors: { subdued: string; primary: string; secondary: string; accent: string; warning: string; danger: string; text: string; ghost: string; }; euiListGroupItemHoverBackground: string; euiListGroupItemHoverBackgroundGhost: string; euiListGroupGutterTypes: { gutterSmall: string; gutterMedium: string; }; euiListGroupItemColorTypes: { primary: string; text: string; subdued: string; ghost: string; }; euiListGroupItemSizeTypes: { xSmall: string; small: string; medium: string; large: string; }; euiGradientStartStop: string; euiGradientMiddle: string; browserDefaultFontSize: string; euiMarkdownEditorMinHeight: string; euiPopoverArrowSize: string; euiPopoverTranslateDistance: string; euiProgressSizes: { xs: string; s: string; m: string; l: string; }; euiProgressColors: { primary: string; secondary: string; success: string; warning: string; danger: string; accent: string; subdued: string; vis0: string; vis1: string; vis2: string; vis3: string; vis4: string; vis5: string; vis6: string; vis7: string; vis8: string; vis9: string; customColor: string; }; euiResizableButtonTransitionSpeed: string; euiResizableButtonSize: string; euiSelectableListItemBorder: string; euiSelectableListItemPadding: string; euiSelectableTemplateSitewideTypes: { application: { color: string; 'font-weight': number; }; deployment: { color: string; 'font-weight': number; }; article: { color: string; 'font-weight': number; }; case: { color: string; 'font-weight': number; }; platform: { color: string; 'font-weight': number; }; }; euiSideNavEmphasizedBackgroundColor: string; euiSideNavRootTextcolor: string; euiSideNavBranchTextcolor: string; euiSideNavSelectedTextcolor: string; spacerSizes: { xs: string; s: string; m: string; l: string; xl: string; xxl: string; }; euiStepNumberSize: string; euiStepNumberSmallSize: string; euiStepNumberMargin: string; euiStepStatusColorsToFade: { warning: string; danger: string; disabled: string; incomplete: string; }; euiSuggestItemColors: { tint0: string; tint1: string; tint2: string; tint3: string; tint4: string; tint5: string; tint6: string; tint7: string; tint8: string; tint9: string; tint10: string; }; euiTableCellContentPadding: string; euiTableCellContentPaddingCompressed: string; euiTableCellCheckboxWidth: string; euiTableActionsAreaWidth: string; euiTableHoverColor: string; euiTableSelectedColor: string; euiTableHoverSelectedColor: string; euiTableActionsBorderColor: string; euiTableHoverClickableColor: string; euiTableFocusClickableColor: string; euiTabFontSize: string; euiTabFontSizeS: string; euiTabFontSizeL: string; euiTextColors: { default: string; subdued: string; secondary: string; accent: string; warning: string; danger: string; ghost: string; }; euiTextConstrainedMaxWidth: string; euiToastWidth: string; euiToastTypes: { primary: string; success: string; warning: string; danger: string; }; euiTokenGrayColor: string; euiTokenTypes: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; gray: { graphic: string; behindText: string; }; }; euiTokenTypeKeys: string; euiAnimSlightBounce: string; euiAnimSlightResistance: string; euiAnimSpeedExtraFast: string; euiAnimSpeedFast: string; euiAnimSpeedNormal: string; euiAnimSpeedSlow: string; euiAnimSpeedExtraSlow: string; euiBorderWidthThin: string; euiBorderWidthThick: string; euiBorderColor: string; euiBorderRadius: string; euiBorderRadiusSmall: string; euiBorderThick: string; euiBorderThin: string; euiBorderEditable: string; euiButtonHeight: string; euiButtonHeightSmall: string; euiButtonHeightXSmall: string; euiButtonColorDisabled: string; euiButtonColorDisabledText: string; euiButtonColorGhostDisabled: string; euiButtonTypes: { primary: string; secondary: string; warning: string; danger: string; ghost: string; text: string; }; euiColorGhost: string; euiColorInk: string; euiColorPrimary: string; euiColorSecondary: string; euiColorAccent: string; euiColorSuccess: string; euiColorWarning: string; euiColorDanger: string; euiColorEmptyShade: string; euiColorLightestShade: string; euiColorLightShade: string; euiColorMediumShade: string; euiColorDarkShade: string; euiColorDarkestShade: string; euiColorFullShade: string; euiPageBackgroundColor: string; euiColorHighlight: string; euiTextColor: string; euiTitleColor: string; euiTextSubduedColor: string; euiColorDisabled: string; euiColorPrimaryText: string; euiColorSecondaryText: string; euiColorAccentText: string; euiColorWarningText: string; euiColorDangerText: string; euiColorDisabledText: string; euiColorSuccessText: string; euiLinkColor: string; euiPaletteColorBlind: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; }; euiPaletteColorBlindKeys: string; euiColorVis0: string; euiColorVis1: string; euiColorVis2: string; euiColorVis3: string; euiColorVis4: string; euiColorVis5: string; euiColorVis6: string; euiColorVis7: string; euiColorVis8: string; euiColorVis9: string; euiColorVis0_behindText: string; euiColorVis1_behindText: string; euiColorVis2_behindText: string; euiColorVis3_behindText: string; euiColorVis4_behindText: string; euiColorVis5_behindText: string; euiColorVis6_behindText: string; euiColorVis7_behindText: string; euiColorVis8_behindText: string; euiColorVis9_behindText: string; euiColorChartLines: string; euiColorChartBand: string; euiCodeBlockBackgroundColor: string; euiCodeBlockColor: string; euiCodeBlockSelectedBackgroundColor: string; euiCodeBlockCommentColor: string; euiCodeBlockSelectorTagColor: string; euiCodeBlockStringColor: string; euiCodeBlockTagColor: string; euiCodeBlockNameColor: string; euiCodeBlockNumberColor: string; euiCodeBlockKeywordColor: string; euiCodeBlockFunctionTitleColor: string; euiCodeBlockTypeColor: string; euiCodeBlockAttributeColor: string; euiCodeBlockSymbolColor: string; euiCodeBlockParamsColor: string; euiCodeBlockMetaColor: string; euiCodeBlockTitleColor: string; euiCodeBlockSectionColor: string; euiCodeBlockAdditionColor: string; euiCodeBlockDeletionColor: string; euiCodeBlockSelectorClassColor: string; euiCodeBlockSelectorIdColor: string; euiFormMaxWidth: string; euiFormControlHeight: string; euiFormControlCompressedHeight: string; euiFormControlPadding: string; euiFormControlCompressedPadding: string; euiFormControlBorderRadius: number; euiFormControlCompressedBorderRadius: string; euiRadioSize: string; euiCheckBoxSize: string; euiCheckboxBorderRadius: string; euiSwitchHeight: string; euiSwitchWidth: string; euiSwitchThumbSize: string; euiSwitchIconHeight: string; euiSwitchHeightCompressed: string; euiSwitchWidthCompressed: string; euiSwitchThumbSizeCompressed: string; euiSwitchHeightMini: string; euiSwitchWidthMini: string; euiSwitchThumbSizeMini: string; euiFormBackgroundColor: string; euiFormBackgroundDisabledColor: string; euiFormBackgroundReadOnlyColor: string; euiFormBorderOpaqueColor: string; euiFormBorderColor: string; euiFormBorderDisabledColor: string; euiFormCustomControlDisabledIconColor: string; euiFormCustomControlBorderColor: string; euiFormControlDisabledColor: string; euiFormControlBoxShadow: string; euiFormInputGroupLabelBackground: string; euiFormInputGroupBorder: string; euiSwitchOffColor: string; euiFormControlLayoutGroupInputHeight: string; euiFormControlLayoutGroupInputCompressedHeight: string; euiFormControlLayoutGroupInputCompressedBorderRadius: string; euiRangeTrackColor: string; euiRangeThumbRadius: string; euiRangeThumbHeight: string; euiRangeThumbWidth: string; euiRangeThumbBorderColor: string; euiRangeTrackWidth: string; euiRangeTrackHeight: string; euiRangeTrackBorderWidth: number; euiRangeTrackBorderColor: string; euiRangeTrackRadius: string; euiRangeDisabledOpacity: number; euiRangeHighlightHeight: string; euiHeaderBackgroundColor: string; euiHeaderDarkBackgroundColor: string; euiHeaderBorderColor: string; euiHeaderBreadcrumbColor: string; euiHeaderHeight: string; euiHeaderChildSize: string; euiHeaderHeightCompensation: string; euiPageDefaultMaxWidth: string; euiPageSidebarMinWidth: string; euiPanelPaddingModifiers: { paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiPanelBorderRadiusModifiers: { borderRadiusNone: number; borderRadiusMedium: string; }; euiPanelBackgroundColorModifiers: { transparent: string; plain: string; subdued: string; accent: string; primary: string; success: string; warning: string; danger: string; }; euiBreakpoints: { xs: number; s: string; m: string; l: string; xl: string; }; euiBreakpointKeys: string; euiShadowColor: string; euiShadowColorLarge: string; euiSize: string; euiSizeXS: string; euiSizeS: string; euiSizeM: string; euiSizeL: string; euiSizeXL: string; euiSizeXXL: string; euiButtonMinWidth: string; euiScrollBar: string; euiScrollBarCorner: string; euiFocusRingColor: string; euiFocusRingAnimStartColor: string; euiFocusRingAnimStartSize: string; euiFocusRingAnimStartSizeLarge: string; euiFocusRingSizeLarge: string; euiFocusRingSize: string; euiFocusTransparency: number; euiFocusBackgroundColor: string; euiTooltipBackgroundColor: string; euiTooltipAnimations: { top: string; left: string; bottom: string; right: string; }; euiFontFamily: string; euiCodeFontFamily: string; euiFontFeatureSettings: string; euiTextScale: string; euiFontSize: string; euiFontSizeXS: string; euiFontSizeS: string; euiFontSizeM: string; euiFontSizeL: string; euiFontSizeXL: string; euiFontSizeXXL: string; euiLineHeight: number; euiBodyLineHeight: number; euiFontWeightLight: number; euiFontWeightRegular: number; euiFontWeightMedium: number; euiFontWeightSemiBold: number; euiFontWeightBold: number; euiCodeFontWeightRegular: number; euiCodeFontWeightBold: number; euiTitles: { xxxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xs: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; s: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; m: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; l: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; }; euiZLevel0: number; euiZLevel1: number; euiZLevel2: number; euiZLevel3: number; euiZLevel4: number; euiZLevel5: number; euiZLevel6: number; euiZLevel7: number; euiZLevel8: number; euiZLevel9: number; euiZContent: number; euiZHeader: number; euiZContentMenu: number; euiZFlyout: number; euiZNavigation: number; euiZMask: number; euiZModal: number; euiZToastList: number; } | { paddingSizes: { xs: string; s: string; m: string; l: string; xl: string; }; avatarSizing: { s: { size: string; 'font-size': string; }; m: { size: string; 'font-size': string; }; l: { size: string; 'font-size': string; }; xl: { size: string; 'font-size': string; }; }; euiBadgeGroupGutterTypes: { gutterExtraSmall: string; gutterSmall: string; }; euiBreadcrumbSpacing: string; euiBreadcrumbTruncateWidth: string; euiButtonEmptyTypes: { primary: string; danger: string; disabled: string; ghost: string; text: string; success: string; warning: string; }; euiButtonIconTypes: { accent: string; danger: string; ghost: string; primary: string; subdued: string; success: string; text: string; warning: string; }; euiCallOutTypes: { primary: string; success: string; warning: string; danger: string; }; euiCardSpacing: string; euiCardBottomNodeHeight: string; euiCardSelectButtonBorders: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardSelectButtonBackgrounds: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiCheckableCardPadding: string; euiCollapsibleNavWidth: string; euiCollapsibleNavGroupLightBackgroundColor: string; euiCollapsibleNavGroupDarkBackgroundColor: string; euiCollapsibleNavGroupDarkHighContrastColor: string; euiColorPickerValueRange0: string; euiColorPickerValueRange1: string; euiColorPickerSaturationRange0: string; euiColorPickerSaturationRange1: string; euiColorPickerIndicatorSize: string; euiColorPickerWidth: string; euiColorPaletteDisplaySizes: { sizeExtraSmall: string; sizeSmall: string; sizeMedium: string; }; euiContextMenuWidth: string; euiControlBarBackground: string; euiControlBarText: string; euiControlBarBorderColor: string; euiControlBarInitialHeight: string; euiControlBarMaxHeight: string; euiControlBarHeights: { s: string; m: string; l: string; }; euiDataGridPrefix: string; euiDataGridStyles: string; euiDataGridColumnResizerWidth: string; euiDataGridPopoverMaxHeight: string; euiDataGridCellPaddingS: string; euiDataGridCellPaddingM: string; euiDataGridCellPaddingL: string; euiDataGridVerticalBorder: string; euiDatePickerCalendarWidth: string; euiSuperDatePickerWidth: string; euiSuperDatePickerButtonWidth: string; euiDragAndDropSpacing: { s: string; m: string; l: string; }; euiExpressionColors: { subdued: string; primary: string; secondary: string; warning: string; danger: string; accent: string; }; euiFacetGutterSizes: { gutterNone: number; gutterSmall: string; gutterMedium: string; gutterLarge: string; }; gutterTypes: { gutterExtraSmall: string; gutterSmall: string; gutterMedium: string; gutterLarge: string; gutterExtraLarge: string; }; fractions: { fourths: { percentage: string; count: number; }; thirds: { percentage: string; count: number; }; halves: { percentage: string; count: number; }; single: { percentage: string; count: number; }; }; flyoutSizes: { small: { min: string; width: string; max: string; }; medium: { min: string; width: string; max: string; }; large: { min: string; width: string; max: string; }; }; euiFlyoutBorder: string; euiFlyoutPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiFilePickerTallHeight: string; euiRangeLevelColors: { primary: string; success: string; warning: string; danger: string; }; textareaResizing: { vertical: string; horizontal: string; both: string; none: string; }; euiHeaderLinksGutterSizes: { gutterXS: string; gutterS: string; gutterM: string; gutterL: string; }; ruleMargins: { marginXSmall: string; marginSmall: string; marginMedium: string; marginLarge: string; marginXLarge: string; marginXXLarge: string; }; euiIconLoadingOpacity: number; euiIconColors: { accent: string; danger: string; ghost: string; primary: string; secondary: string; success: string; subdued: string; text: string; warning: string; }; euiIconSizes: { small: string; medium: string; large: string; xLarge: string; xxLarge: string; }; euiKeyPadMenuSize: string; euiKeyPadMenuItemBetaBadgeSize: string; euiLinkColors: { subdued: string; primary: string; secondary: string; accent: string; warning: string; danger: string; text: string; ghost: string; }; euiListGroupItemHoverBackground: string; euiListGroupItemHoverBackgroundGhost: string; euiListGroupGutterTypes: { gutterSmall: string; gutterMedium: string; }; euiListGroupItemColorTypes: { primary: string; text: string; subdued: string; ghost: string; }; euiListGroupItemSizeTypes: { xSmall: string; small: string; medium: string; large: string; }; euiGradientStartStop: string; euiGradientMiddle: string; browserDefaultFontSize: string; euiMarkdownEditorMinHeight: string; euiPopoverArrowSize: string; euiPopoverTranslateDistance: string; euiProgressSizes: { xs: string; s: string; m: string; l: string; }; euiProgressColors: { primary: string; secondary: string; success: string; warning: string; danger: string; accent: string; subdued: string; vis0: string; vis1: string; vis2: string; vis3: string; vis4: string; vis5: string; vis6: string; vis7: string; vis8: string; vis9: string; customColor: string; }; euiResizableButtonTransitionSpeed: string; euiResizableButtonSize: string; euiSelectableListItemBorder: string; euiSelectableListItemPadding: string; euiSelectableTemplateSitewideTypes: { application: { color: string; 'font-weight': number; }; deployment: { color: string; 'font-weight': number; }; article: { color: string; 'font-weight': number; }; case: { color: string; 'font-weight': number; }; platform: { color: string; 'font-weight': number; }; }; euiSideNavEmphasizedBackgroundColor: string; euiSideNavRootTextcolor: string; euiSideNavBranchTextcolor: string; euiSideNavSelectedTextcolor: string; spacerSizes: { xs: string; s: string; m: string; l: string; xl: string; xxl: string; }; euiStepNumberSize: string; euiStepNumberSmallSize: string; euiStepNumberMargin: string; euiStepStatusColorsToFade: { warning: string; danger: string; disabled: string; incomplete: string; }; euiSuggestItemColors: { tint0: string; tint1: string; tint2: string; tint3: string; tint4: string; tint5: string; tint6: string; tint7: string; tint8: string; tint9: string; tint10: string; }; euiTableCellContentPadding: string; euiTableCellContentPaddingCompressed: string; euiTableCellCheckboxWidth: string; euiTableActionsAreaWidth: string; euiTableHoverColor: string; euiTableSelectedColor: string; euiTableHoverSelectedColor: string; euiTableActionsBorderColor: string; euiTableHoverClickableColor: string; euiTableFocusClickableColor: string; euiTabFontSize: string; euiTabFontSizeS: string; euiTabFontSizeL: string; euiTextColors: { default: string; subdued: string; secondary: string; accent: string; warning: string; danger: string; ghost: string; }; euiTextConstrainedMaxWidth: string; euiToastWidth: string; euiToastTypes: { primary: string; success: string; warning: string; danger: string; }; euiTokenGrayColor: string; euiTokenTypes: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; gray: { graphic: string; behindText: string; }; }; euiTokenTypeKeys: string; euiAnimSlightBounce: string; euiAnimSlightResistance: string; euiAnimSpeedExtraFast: string; euiAnimSpeedFast: string; euiAnimSpeedNormal: string; euiAnimSpeedSlow: string; euiAnimSpeedExtraSlow: string; euiBorderWidthThin: string; euiBorderWidthThick: string; euiBorderColor: string; euiBorderRadius: string; euiBorderRadiusSmall: string; euiBorderThick: string; euiBorderThin: string; euiBorderEditable: string; euiButtonHeight: string; euiButtonHeightSmall: string; euiButtonHeightXSmall: string; euiButtonColorDisabled: string; euiButtonColorDisabledText: string; euiButtonColorGhostDisabled: string; euiButtonTypes: { primary: string; secondary: string; warning: string; danger: string; ghost: string; text: string; }; euiColorGhost: string; euiColorInk: string; euiColorPrimary: string; euiColorSecondary: string; euiColorAccent: string; euiColorSuccess: string; euiColorWarning: string; euiColorDanger: string; euiColorEmptyShade: string; euiColorLightestShade: string; euiColorLightShade: string; euiColorMediumShade: string; euiColorDarkShade: string; euiColorDarkestShade: string; euiColorFullShade: string; euiPageBackgroundColor: string; euiColorHighlight: string; euiTextColor: string; euiTitleColor: string; euiTextSubduedColor: string; euiColorDisabled: string; euiColorPrimaryText: string; euiColorSecondaryText: string; euiColorAccentText: string; euiColorWarningText: string; euiColorDangerText: string; euiColorDisabledText: string; euiColorSuccessText: string; euiLinkColor: string; euiPaletteColorBlind: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; }; euiPaletteColorBlindKeys: string; euiColorVis0: string; euiColorVis1: string; euiColorVis2: string; euiColorVis3: string; euiColorVis4: string; euiColorVis5: string; euiColorVis6: string; euiColorVis7: string; euiColorVis8: string; euiColorVis9: string; euiColorVis0_behindText: string; euiColorVis1_behindText: string; euiColorVis2_behindText: string; euiColorVis3_behindText: string; euiColorVis4_behindText: string; euiColorVis5_behindText: string; euiColorVis6_behindText: string; euiColorVis7_behindText: string; euiColorVis8_behindText: string; euiColorVis9_behindText: string; euiColorChartLines: string; euiColorChartBand: string; euiCodeBlockBackgroundColor: string; euiCodeBlockColor: string; euiCodeBlockSelectedBackgroundColor: string; euiCodeBlockCommentColor: string; euiCodeBlockSelectorTagColor: string; euiCodeBlockStringColor: string; euiCodeBlockTagColor: string; euiCodeBlockNameColor: string; euiCodeBlockNumberColor: string; euiCodeBlockKeywordColor: string; euiCodeBlockFunctionTitleColor: string; euiCodeBlockTypeColor: string; euiCodeBlockAttributeColor: string; euiCodeBlockSymbolColor: string; euiCodeBlockParamsColor: string; euiCodeBlockMetaColor: string; euiCodeBlockTitleColor: string; euiCodeBlockSectionColor: string; euiCodeBlockAdditionColor: string; euiCodeBlockDeletionColor: string; euiCodeBlockSelectorClassColor: string; euiCodeBlockSelectorIdColor: string; euiFormMaxWidth: string; euiFormControlHeight: string; euiFormControlCompressedHeight: string; euiFormControlPadding: string; euiFormControlCompressedPadding: string; euiFormControlBorderRadius: number; euiFormControlCompressedBorderRadius: string; euiRadioSize: string; euiCheckBoxSize: string; euiCheckboxBorderRadius: string; euiSwitchHeight: string; euiSwitchWidth: string; euiSwitchThumbSize: string; euiSwitchIconHeight: string; euiSwitchHeightCompressed: string; euiSwitchWidthCompressed: string; euiSwitchThumbSizeCompressed: string; euiSwitchHeightMini: string; euiSwitchWidthMini: string; euiSwitchThumbSizeMini: string; euiFormBackgroundColor: string; euiFormBackgroundDisabledColor: string; euiFormBackgroundReadOnlyColor: string; euiFormBorderOpaqueColor: string; euiFormBorderColor: string; euiFormBorderDisabledColor: string; euiFormCustomControlDisabledIconColor: string; euiFormCustomControlBorderColor: string; euiFormControlDisabledColor: string; euiFormControlBoxShadow: string; euiFormInputGroupLabelBackground: string; euiFormInputGroupBorder: string; euiSwitchOffColor: string; euiFormControlLayoutGroupInputHeight: string; euiFormControlLayoutGroupInputCompressedHeight: string; euiFormControlLayoutGroupInputCompressedBorderRadius: string; euiRangeTrackColor: string; euiRangeThumbRadius: string; euiRangeThumbHeight: string; euiRangeThumbWidth: string; euiRangeThumbBorderColor: string; euiRangeTrackWidth: string; euiRangeTrackHeight: string; euiRangeTrackBorderWidth: number; euiRangeTrackBorderColor: string; euiRangeTrackRadius: string; euiRangeDisabledOpacity: number; euiRangeHighlightHeight: string; euiHeaderBackgroundColor: string; euiHeaderDarkBackgroundColor: string; euiHeaderBorderColor: string; euiHeaderBreadcrumbColor: string; euiHeaderHeight: string; euiHeaderChildSize: string; euiHeaderHeightCompensation: string; euiPageDefaultMaxWidth: string; euiPageSidebarMinWidth: string; euiPanelPaddingModifiers: { paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiPanelBorderRadiusModifiers: { borderRadiusNone: number; borderRadiusMedium: string; }; euiPanelBackgroundColorModifiers: { transparent: string; plain: string; subdued: string; accent: string; primary: string; success: string; warning: string; danger: string; }; euiBreakpoints: { xs: number; s: string; m: string; l: string; xl: string; }; euiBreakpointKeys: string; euiShadowColor: string; euiShadowColorLarge: string; euiSize: string; euiSizeXS: string; euiSizeS: string; euiSizeM: string; euiSizeL: string; euiSizeXL: string; euiSizeXXL: string; euiButtonMinWidth: string; euiScrollBar: string; euiScrollBarCorner: string; euiFocusRingColor: string; euiFocusRingAnimStartColor: string; euiFocusRingAnimStartSize: string; euiFocusRingAnimStartSizeLarge: string; euiFocusRingSizeLarge: string; euiFocusRingSize: string; euiFocusTransparency: number; euiFocusBackgroundColor: string; euiTooltipBackgroundColor: string; euiTooltipAnimations: { top: string; left: string; bottom: string; right: string; }; euiFontFamily: string; euiCodeFontFamily: string; euiFontFeatureSettings: string; euiTextScale: string; euiFontSize: string; euiFontSizeXS: string; euiFontSizeS: string; euiFontSizeM: string; euiFontSizeL: string; euiFontSizeXL: string; euiFontSizeXXL: string; euiLineHeight: number; euiBodyLineHeight: number; euiFontWeightLight: number; euiFontWeightRegular: number; euiFontWeightMedium: number; euiFontWeightSemiBold: number; euiFontWeightBold: number; euiCodeFontWeightRegular: number; euiCodeFontWeightBold: number; euiTitles: { xxxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xs: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; s: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; m: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; l: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; }; euiZLevel0: number; euiZLevel1: number; euiZLevel2: number; euiZLevel3: number; euiZLevel4: number; euiZLevel5: number; euiZLevel6: number; euiZLevel7: number; euiZLevel8: number; euiZLevel9: number; euiZContent: number; euiZHeader: number; euiZContentMenu: number; euiZFlyout: number; euiZNavigation: number; euiZMask: number; euiZModal: number; euiZToastList: number; }"
+              "{ paddingSizes: { xs: string; s: string; m: string; l: string; xl: string; }; avatarSizing: { s: { size: string; 'font-size': string; }; m: { size: string; 'font-size': string; }; l: { size: string; 'font-size': string; }; xl: { size: string; 'font-size': string; }; }; euiBadgeGroupGutterTypes: { gutterExtraSmall: string; gutterSmall: string; }; euiBreadcrumbSpacing: string; euiBreadcrumbTruncateWidth: string; euiButtonEmptyTypes: { primary: string; danger: string; disabled: string; ghost: string; text: string; success: string; warning: string; }; euiButtonIconTypes: { accent: string; danger: string; ghost: string; primary: string; subdued: string; success: string; text: string; warning: string; }; euiCallOutTypes: { primary: string; success: string; warning: string; danger: string; }; euiCardSpacing: string; euiCardBottomNodeHeight: string; euiCardSelectButtonBorders: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardSelectButtonBackgrounds: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiCheckableCardPadding: string; euiCollapsibleNavWidth: string; euiCollapsibleNavGroupLightBackgroundColor: string; euiCollapsibleNavGroupDarkBackgroundColor: string; euiCollapsibleNavGroupDarkHighContrastColor: string; euiColorPickerValueRange0: string; euiColorPickerValueRange1: string; euiColorPickerSaturationRange0: string; euiColorPickerSaturationRange1: string; euiColorPickerIndicatorSize: string; euiColorPickerWidth: string; euiColorPaletteDisplaySizes: { sizeExtraSmall: string; sizeSmall: string; sizeMedium: string; }; euiContextMenuWidth: string; euiControlBarBackground: string; euiControlBarText: string; euiControlBarBorderColor: string; euiControlBarInitialHeight: string; euiControlBarMaxHeight: string; euiControlBarHeights: { s: string; m: string; l: string; }; euiDataGridPrefix: string; euiDataGridStyles: string; euiDataGridColumnResizerWidth: string; euiDataGridPopoverMaxHeight: string; euiDataGridCellPaddingS: string; euiDataGridCellPaddingM: string; euiDataGridCellPaddingL: string; euiDataGridVerticalBorder: string; euiDatePickerCalendarWidth: string; euiSuperDatePickerWidth: string; euiSuperDatePickerButtonWidth: string; euiDragAndDropSpacing: { s: string; m: string; l: string; }; euiExpressionColors: { subdued: string; primary: string; secondary: string; warning: string; danger: string; accent: string; }; euiFacetGutterSizes: { gutterNone: number; gutterSmall: string; gutterMedium: string; gutterLarge: string; }; gutterTypes: { gutterExtraSmall: string; gutterSmall: string; gutterMedium: string; gutterLarge: string; gutterExtraLarge: string; }; fractions: { fourths: { percentage: string; count: number; }; thirds: { percentage: string; count: number; }; halves: { percentage: string; count: number; }; single: { percentage: string; count: number; }; }; flyoutSizes: { small: { min: string; width: string; max: string; }; medium: { min: string; width: string; max: string; }; large: { min: string; width: string; max: string; }; }; euiFlyoutBorder: string; euiFlyoutPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiFilePickerTallHeight: string; euiRangeLevelColors: { primary: string; success: string; warning: string; danger: string; }; textareaResizing: { vertical: string; horizontal: string; both: string; none: string; }; euiHeaderLinksGutterSizes: { gutterXS: string; gutterS: string; gutterM: string; gutterL: string; }; ruleMargins: { marginXSmall: string; marginSmall: string; marginMedium: string; marginLarge: string; marginXLarge: string; marginXXLarge: string; }; euiIconLoadingOpacity: number; euiIconColors: { accent: string; danger: string; ghost: string; primary: string; secondary: string; success: string; subdued: string; text: string; warning: string; inherit: string; }; euiIconSizes: { small: string; medium: string; large: string; xLarge: string; xxLarge: string; }; euiKeyPadMenuSize: string; euiKeyPadMenuItemBetaBadgeSize: string; euiLinkColors: { subdued: string; primary: string; secondary: string; accent: string; warning: string; danger: string; text: string; ghost: string; }; euiListGroupItemHoverBackground: string; euiListGroupItemHoverBackgroundGhost: string; euiListGroupGutterTypes: { gutterSmall: string; gutterMedium: string; }; euiListGroupItemColorTypes: { primary: string; text: string; subdued: string; ghost: string; }; euiListGroupItemSizeTypes: { xSmall: string; small: string; medium: string; large: string; }; euiGradientStartStop: string; euiGradientMiddle: string; browserDefaultFontSize: string; euiMarkdownEditorMinHeight: string; euiPopoverArrowSize: string; euiPopoverTranslateDistance: string; euiProgressSizes: { xs: string; s: string; m: string; l: string; }; euiProgressColors: { primary: string; secondary: string; success: string; warning: string; danger: string; accent: string; subdued: string; vis0: string; vis1: string; vis2: string; vis3: string; vis4: string; vis5: string; vis6: string; vis7: string; vis8: string; vis9: string; customColor: string; }; euiResizableButtonTransitionSpeed: string; euiResizableButtonSize: string; euiSelectableListItemBorder: string; euiSelectableListItemPadding: string; euiSelectableTemplateSitewideTypes: { application: { color: string; 'font-weight': number; }; deployment: { color: string; 'font-weight': number; }; article: { color: string; 'font-weight': number; }; case: { color: string; 'font-weight': number; }; platform: { color: string; 'font-weight': number; }; }; euiSideNavEmphasizedBackgroundColor: string; euiSideNavRootTextcolor: string; euiSideNavBranchTextcolor: string; euiSideNavSelectedTextcolor: string; spacerSizes: { xs: string; s: string; m: string; l: string; xl: string; xxl: string; }; euiStepNumberSize: string; euiStepNumberSmallSize: string; euiStepNumberMargin: string; euiStepStatusColorsToFade: { warning: string; danger: string; disabled: string; incomplete: string; }; euiSuggestItemColors: { tint0: string; tint1: string; tint2: string; tint3: string; tint4: string; tint5: string; tint6: string; tint7: string; tint8: string; tint9: string; tint10: string; }; euiTableCellContentPadding: string; euiTableCellContentPaddingCompressed: string; euiTableCellCheckboxWidth: string; euiTableActionsAreaWidth: string; euiTableHoverColor: string; euiTableSelectedColor: string; euiTableHoverSelectedColor: string; euiTableActionsBorderColor: string; euiTableHoverClickableColor: string; euiTableFocusClickableColor: string; euiTabFontSize: string; euiTabFontSizeS: string; euiTabFontSizeL: string; euiTextColors: { default: string; subdued: string; secondary: string; accent: string; warning: string; danger: string; ghost: string; }; euiTextConstrainedMaxWidth: string; euiToastWidth: string; euiToastTypes: { primary: string; success: string; warning: string; danger: string; }; euiTokenGrayColor: string; euiTokenTypes: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; gray: { graphic: string; behindText: string; }; }; euiTokenTypeKeys: string; euiAnimSlightBounce: string; euiAnimSlightResistance: string; euiAnimSpeedExtraFast: string; euiAnimSpeedFast: string; euiAnimSpeedNormal: string; euiAnimSpeedSlow: string; euiAnimSpeedExtraSlow: string; euiBorderWidthThin: string; euiBorderWidthThick: string; euiBorderColor: string; euiBorderRadius: string; euiBorderRadiusSmall: string; euiBorderThick: string; euiBorderThin: string; euiBorderEditable: string; euiButtonHeight: string; euiButtonHeightSmall: string; euiButtonHeightXSmall: string; euiButtonColorDisabled: string; euiButtonColorDisabledText: string; euiButtonColorGhostDisabled: string; euiButtonTypes: { primary: string; secondary: string; warning: string; danger: string; ghost: string; text: string; }; euiColorGhost: string; euiColorInk: string; euiColorPrimary: string; euiColorSecondary: string; euiColorAccent: string; euiColorSuccess: string; euiColorWarning: string; euiColorDanger: string; euiColorEmptyShade: string; euiColorLightestShade: string; euiColorLightShade: string; euiColorMediumShade: string; euiColorDarkShade: string; euiColorDarkestShade: string; euiColorFullShade: string; euiPageBackgroundColor: string; euiColorHighlight: string; euiTextColor: string; euiTitleColor: string; euiTextSubduedColor: string; euiColorDisabled: string; euiColorPrimaryText: string; euiColorSecondaryText: string; euiColorAccentText: string; euiColorWarningText: string; euiColorDangerText: string; euiColorDisabledText: string; euiColorSuccessText: string; euiLinkColor: string; euiPaletteColorBlind: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; }; euiPaletteColorBlindKeys: string; euiColorVis0: string; euiColorVis1: string; euiColorVis2: string; euiColorVis3: string; euiColorVis4: string; euiColorVis5: string; euiColorVis6: string; euiColorVis7: string; euiColorVis8: string; euiColorVis9: string; euiColorVis0_behindText: string; euiColorVis1_behindText: string; euiColorVis2_behindText: string; euiColorVis3_behindText: string; euiColorVis4_behindText: string; euiColorVis5_behindText: string; euiColorVis6_behindText: string; euiColorVis7_behindText: string; euiColorVis8_behindText: string; euiColorVis9_behindText: string; euiColorChartLines: string; euiColorChartBand: string; euiCodeBlockBackgroundColor: string; euiCodeBlockColor: string; euiCodeBlockSelectedBackgroundColor: string; euiCodeBlockCommentColor: string; euiCodeBlockSelectorTagColor: string; euiCodeBlockStringColor: string; euiCodeBlockTagColor: string; euiCodeBlockNameColor: string; euiCodeBlockNumberColor: string; euiCodeBlockKeywordColor: string; euiCodeBlockFunctionTitleColor: string; euiCodeBlockTypeColor: string; euiCodeBlockAttributeColor: string; euiCodeBlockSymbolColor: string; euiCodeBlockParamsColor: string; euiCodeBlockMetaColor: string; euiCodeBlockTitleColor: string; euiCodeBlockSectionColor: string; euiCodeBlockAdditionColor: string; euiCodeBlockDeletionColor: string; euiCodeBlockSelectorClassColor: string; euiCodeBlockSelectorIdColor: string; euiFormMaxWidth: string; euiFormControlHeight: string; euiFormControlCompressedHeight: string; euiFormControlPadding: string; euiFormControlCompressedPadding: string; euiFormControlBorderRadius: number; euiFormControlCompressedBorderRadius: string; euiRadioSize: string; euiCheckBoxSize: string; euiCheckboxBorderRadius: string; euiSwitchHeight: string; euiSwitchWidth: string; euiSwitchThumbSize: string; euiSwitchIconHeight: string; euiSwitchHeightCompressed: string; euiSwitchWidthCompressed: string; euiSwitchThumbSizeCompressed: string; euiSwitchHeightMini: string; euiSwitchWidthMini: string; euiSwitchThumbSizeMini: string; euiFormBackgroundColor: string; euiFormBackgroundDisabledColor: string; euiFormBackgroundReadOnlyColor: string; euiFormBorderOpaqueColor: string; euiFormBorderColor: string; euiFormBorderDisabledColor: string; euiFormCustomControlDisabledIconColor: string; euiFormCustomControlBorderColor: string; euiFormControlDisabledColor: string; euiFormControlBoxShadow: string; euiFormControlPlaceholderText: string; euiFormInputGroupLabelBackground: string; euiFormInputGroupBorder: string; euiSwitchOffColor: string; euiFormControlLayoutGroupInputHeight: string; euiFormControlLayoutGroupInputCompressedHeight: string; euiFormControlLayoutGroupInputCompressedBorderRadius: string; euiRangeTrackColor: string; euiRangeThumbRadius: string; euiRangeThumbHeight: string; euiRangeThumbWidth: string; euiRangeThumbBorderColor: string; euiRangeTrackWidth: string; euiRangeTrackHeight: string; euiRangeTrackBorderWidth: number; euiRangeTrackBorderColor: string; euiRangeTrackRadius: string; euiRangeDisabledOpacity: number; euiRangeHighlightHeight: string; euiHeaderBackgroundColor: string; euiHeaderDarkBackgroundColor: string; euiHeaderBorderColor: string; euiHeaderBreadcrumbColor: string; euiHeaderHeight: string; euiHeaderChildSize: string; euiHeaderHeightCompensation: string; euiPageDefaultMaxWidth: string; euiPageSidebarMinWidth: string; euiPanelPaddingModifiers: { paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiPanelBorderRadiusModifiers: { borderRadiusNone: number; borderRadiusMedium: string; }; euiPanelBackgroundColorModifiers: { transparent: string; plain: string; subdued: string; accent: string; primary: string; success: string; warning: string; danger: string; }; euiBreakpoints: { xs: number; s: string; m: string; l: string; xl: string; }; euiBreakpointKeys: string; euiShadowColor: string; euiShadowColorLarge: string; euiSize: string; euiSizeXS: string; euiSizeS: string; euiSizeM: string; euiSizeL: string; euiSizeXL: string; euiSizeXXL: string; euiButtonMinWidth: string; euiScrollBar: string; euiScrollBarCorner: string; euiFocusRingColor: string; euiFocusRingAnimStartColor: string; euiFocusRingAnimStartSize: string; euiFocusRingAnimStartSizeLarge: string; euiFocusRingSizeLarge: string; euiFocusRingSize: string; euiFocusTransparency: number; euiFocusBackgroundColor: string; euiTooltipBackgroundColor: string; euiTooltipAnimations: { top: string; left: string; bottom: string; right: string; }; euiFontFamily: string; euiCodeFontFamily: string; euiFontFeatureSettings: string; euiTextScale: string; euiFontSize: string; euiFontSizeXS: string; euiFontSizeS: string; euiFontSizeM: string; euiFontSizeL: string; euiFontSizeXL: string; euiFontSizeXXL: string; euiLineHeight: number; euiBodyLineHeight: number; euiFontWeightLight: number; euiFontWeightRegular: number; euiFontWeightMedium: number; euiFontWeightSemiBold: number; euiFontWeightBold: number; euiCodeFontWeightRegular: number; euiCodeFontWeightBold: number; euiTitles: { xxxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xs: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; s: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; m: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; l: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; }; euiZLevel0: number; euiZLevel1: number; euiZLevel2: number; euiZLevel3: number; euiZLevel4: number; euiZLevel5: number; euiZLevel6: number; euiZLevel7: number; euiZLevel8: number; euiZLevel9: number; euiZContent: number; euiZHeader: number; euiZContentMenu: number; euiZFlyout: number; euiZNavigation: number; euiZMask: number; euiZModal: number; euiZToastList: number; } | { paddingSizes: { xs: string; s: string; m: string; l: string; xl: string; }; avatarSizing: { s: { size: string; 'font-size': string; }; m: { size: string; 'font-size': string; }; l: { size: string; 'font-size': string; }; xl: { size: string; 'font-size': string; }; }; euiBadgeGroupGutterTypes: { gutterExtraSmall: string; gutterSmall: string; }; euiBreadcrumbSpacing: string; euiBreadcrumbTruncateWidth: string; euiButtonEmptyTypes: { primary: string; danger: string; disabled: string; ghost: string; text: string; success: string; warning: string; }; euiButtonIconTypes: { accent: string; danger: string; ghost: string; primary: string; subdued: string; success: string; text: string; warning: string; }; euiCallOutTypes: { primary: string; success: string; warning: string; danger: string; }; euiCardSpacing: string; euiCardBottomNodeHeight: string; euiCardSelectButtonBorders: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardSelectButtonBackgrounds: { text: string; primary: string; success: string; danger: string; ghost: string; }; euiCardPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiCheckableCardPadding: string; euiCollapsibleNavWidth: string; euiCollapsibleNavGroupLightBackgroundColor: string; euiCollapsibleNavGroupDarkBackgroundColor: string; euiCollapsibleNavGroupDarkHighContrastColor: string; euiColorPickerValueRange0: string; euiColorPickerValueRange1: string; euiColorPickerSaturationRange0: string; euiColorPickerSaturationRange1: string; euiColorPickerIndicatorSize: string; euiColorPickerWidth: string; euiColorPaletteDisplaySizes: { sizeExtraSmall: string; sizeSmall: string; sizeMedium: string; }; euiContextMenuWidth: string; euiControlBarBackground: string; euiControlBarText: string; euiControlBarBorderColor: string; euiControlBarInitialHeight: string; euiControlBarMaxHeight: string; euiControlBarHeights: { s: string; m: string; l: string; }; euiDataGridPrefix: string; euiDataGridStyles: string; euiDataGridColumnResizerWidth: string; euiDataGridPopoverMaxHeight: string; euiDataGridCellPaddingS: string; euiDataGridCellPaddingM: string; euiDataGridCellPaddingL: string; euiDataGridVerticalBorder: string; euiDatePickerCalendarWidth: string; euiSuperDatePickerWidth: string; euiSuperDatePickerButtonWidth: string; euiDragAndDropSpacing: { s: string; m: string; l: string; }; euiExpressionColors: { subdued: string; primary: string; secondary: string; warning: string; danger: string; accent: string; }; euiFacetGutterSizes: { gutterNone: number; gutterSmall: string; gutterMedium: string; gutterLarge: string; }; gutterTypes: { gutterExtraSmall: string; gutterSmall: string; gutterMedium: string; gutterLarge: string; gutterExtraLarge: string; }; fractions: { fourths: { percentage: string; count: number; }; thirds: { percentage: string; count: number; }; halves: { percentage: string; count: number; }; single: { percentage: string; count: number; }; }; flyoutSizes: { small: { min: string; width: string; max: string; }; medium: { min: string; width: string; max: string; }; large: { min: string; width: string; max: string; }; }; euiFlyoutBorder: string; euiFlyoutPaddingModifiers: { paddingNone: number; paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiFilePickerTallHeight: string; euiRangeLevelColors: { primary: string; success: string; warning: string; danger: string; }; textareaResizing: { vertical: string; horizontal: string; both: string; none: string; }; euiHeaderLinksGutterSizes: { gutterXS: string; gutterS: string; gutterM: string; gutterL: string; }; ruleMargins: { marginXSmall: string; marginSmall: string; marginMedium: string; marginLarge: string; marginXLarge: string; marginXXLarge: string; }; euiIconLoadingOpacity: number; euiIconColors: { accent: string; danger: string; ghost: string; primary: string; secondary: string; success: string; subdued: string; text: string; warning: string; inherit: string; }; euiIconSizes: { small: string; medium: string; large: string; xLarge: string; xxLarge: string; }; euiKeyPadMenuSize: string; euiKeyPadMenuItemBetaBadgeSize: string; euiLinkColors: { subdued: string; primary: string; secondary: string; accent: string; warning: string; danger: string; text: string; ghost: string; }; euiListGroupItemHoverBackground: string; euiListGroupItemHoverBackgroundGhost: string; euiListGroupGutterTypes: { gutterSmall: string; gutterMedium: string; }; euiListGroupItemColorTypes: { primary: string; text: string; subdued: string; ghost: string; }; euiListGroupItemSizeTypes: { xSmall: string; small: string; medium: string; large: string; }; euiGradientStartStop: string; euiGradientMiddle: string; browserDefaultFontSize: string; euiMarkdownEditorMinHeight: string; euiPopoverArrowSize: string; euiPopoverTranslateDistance: string; euiProgressSizes: { xs: string; s: string; m: string; l: string; }; euiProgressColors: { primary: string; secondary: string; success: string; warning: string; danger: string; accent: string; subdued: string; vis0: string; vis1: string; vis2: string; vis3: string; vis4: string; vis5: string; vis6: string; vis7: string; vis8: string; vis9: string; customColor: string; }; euiResizableButtonTransitionSpeed: string; euiResizableButtonSize: string; euiSelectableListItemBorder: string; euiSelectableListItemPadding: string; euiSelectableTemplateSitewideTypes: { application: { color: string; 'font-weight': number; }; deployment: { color: string; 'font-weight': number; }; article: { color: string; 'font-weight': number; }; case: { color: string; 'font-weight': number; }; platform: { color: string; 'font-weight': number; }; }; euiSideNavEmphasizedBackgroundColor: string; euiSideNavRootTextcolor: string; euiSideNavBranchTextcolor: string; euiSideNavSelectedTextcolor: string; spacerSizes: { xs: string; s: string; m: string; l: string; xl: string; xxl: string; }; euiStepNumberSize: string; euiStepNumberSmallSize: string; euiStepNumberMargin: string; euiStepStatusColorsToFade: { warning: string; danger: string; disabled: string; incomplete: string; }; euiSuggestItemColors: { tint0: string; tint1: string; tint2: string; tint3: string; tint4: string; tint5: string; tint6: string; tint7: string; tint8: string; tint9: string; tint10: string; }; euiTableCellContentPadding: string; euiTableCellContentPaddingCompressed: string; euiTableCellCheckboxWidth: string; euiTableActionsAreaWidth: string; euiTableHoverColor: string; euiTableSelectedColor: string; euiTableHoverSelectedColor: string; euiTableActionsBorderColor: string; euiTableHoverClickableColor: string; euiTableFocusClickableColor: string; euiTabFontSize: string; euiTabFontSizeS: string; euiTabFontSizeL: string; euiTextColors: { default: string; subdued: string; secondary: string; accent: string; warning: string; danger: string; ghost: string; }; euiTextConstrainedMaxWidth: string; euiToastWidth: string; euiToastTypes: { primary: string; success: string; warning: string; danger: string; }; euiTokenGrayColor: string; euiTokenTypes: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; gray: { graphic: string; behindText: string; }; }; euiTokenTypeKeys: string; euiAnimSlightBounce: string; euiAnimSlightResistance: string; euiAnimSpeedExtraFast: string; euiAnimSpeedFast: string; euiAnimSpeedNormal: string; euiAnimSpeedSlow: string; euiAnimSpeedExtraSlow: string; euiBorderWidthThin: string; euiBorderWidthThick: string; euiBorderColor: string; euiBorderRadius: string; euiBorderRadiusSmall: string; euiBorderThick: string; euiBorderThin: string; euiBorderEditable: string; euiButtonHeight: string; euiButtonHeightSmall: string; euiButtonHeightXSmall: string; euiButtonColorDisabled: string; euiButtonColorDisabledText: string; euiButtonColorGhostDisabled: string; euiButtonTypes: { primary: string; secondary: string; warning: string; danger: string; ghost: string; text: string; }; euiColorGhost: string; euiColorInk: string; euiColorPrimary: string; euiColorSecondary: string; euiColorAccent: string; euiColorSuccess: string; euiColorWarning: string; euiColorDanger: string; euiColorEmptyShade: string; euiColorLightestShade: string; euiColorLightShade: string; euiColorMediumShade: string; euiColorDarkShade: string; euiColorDarkestShade: string; euiColorFullShade: string; euiPageBackgroundColor: string; euiColorHighlight: string; euiTextColor: string; euiTitleColor: string; euiTextSubduedColor: string; euiColorDisabled: string; euiColorPrimaryText: string; euiColorSecondaryText: string; euiColorAccentText: string; euiColorWarningText: string; euiColorDangerText: string; euiColorDisabledText: string; euiColorSuccessText: string; euiLinkColor: string; euiPaletteColorBlind: { euiColorVis0: { graphic: string; behindText: string; }; euiColorVis1: { graphic: string; behindText: string; }; euiColorVis2: { graphic: string; behindText: string; }; euiColorVis3: { graphic: string; behindText: string; }; euiColorVis4: { graphic: string; behindText: string; }; euiColorVis5: { graphic: string; behindText: string; }; euiColorVis6: { graphic: string; behindText: string; }; euiColorVis7: { graphic: string; behindText: string; }; euiColorVis8: { graphic: string; behindText: string; }; euiColorVis9: { graphic: string; behindText: string; }; }; euiPaletteColorBlindKeys: string; euiColorVis0: string; euiColorVis1: string; euiColorVis2: string; euiColorVis3: string; euiColorVis4: string; euiColorVis5: string; euiColorVis6: string; euiColorVis7: string; euiColorVis8: string; euiColorVis9: string; euiColorVis0_behindText: string; euiColorVis1_behindText: string; euiColorVis2_behindText: string; euiColorVis3_behindText: string; euiColorVis4_behindText: string; euiColorVis5_behindText: string; euiColorVis6_behindText: string; euiColorVis7_behindText: string; euiColorVis8_behindText: string; euiColorVis9_behindText: string; euiColorChartLines: string; euiColorChartBand: string; euiCodeBlockBackgroundColor: string; euiCodeBlockColor: string; euiCodeBlockSelectedBackgroundColor: string; euiCodeBlockCommentColor: string; euiCodeBlockSelectorTagColor: string; euiCodeBlockStringColor: string; euiCodeBlockTagColor: string; euiCodeBlockNameColor: string; euiCodeBlockNumberColor: string; euiCodeBlockKeywordColor: string; euiCodeBlockFunctionTitleColor: string; euiCodeBlockTypeColor: string; euiCodeBlockAttributeColor: string; euiCodeBlockSymbolColor: string; euiCodeBlockParamsColor: string; euiCodeBlockMetaColor: string; euiCodeBlockTitleColor: string; euiCodeBlockSectionColor: string; euiCodeBlockAdditionColor: string; euiCodeBlockDeletionColor: string; euiCodeBlockSelectorClassColor: string; euiCodeBlockSelectorIdColor: string; euiFormMaxWidth: string; euiFormControlHeight: string; euiFormControlCompressedHeight: string; euiFormControlPadding: string; euiFormControlCompressedPadding: string; euiFormControlBorderRadius: number; euiFormControlCompressedBorderRadius: string; euiRadioSize: string; euiCheckBoxSize: string; euiCheckboxBorderRadius: string; euiSwitchHeight: string; euiSwitchWidth: string; euiSwitchThumbSize: string; euiSwitchIconHeight: string; euiSwitchHeightCompressed: string; euiSwitchWidthCompressed: string; euiSwitchThumbSizeCompressed: string; euiSwitchHeightMini: string; euiSwitchWidthMini: string; euiSwitchThumbSizeMini: string; euiFormBackgroundColor: string; euiFormBackgroundDisabledColor: string; euiFormBackgroundReadOnlyColor: string; euiFormBorderOpaqueColor: string; euiFormBorderColor: string; euiFormBorderDisabledColor: string; euiFormCustomControlDisabledIconColor: string; euiFormCustomControlBorderColor: string; euiFormControlDisabledColor: string; euiFormControlBoxShadow: string; euiFormControlPlaceholderText: string; euiFormInputGroupLabelBackground: string; euiFormInputGroupBorder: string; euiSwitchOffColor: string; euiFormControlLayoutGroupInputHeight: string; euiFormControlLayoutGroupInputCompressedHeight: string; euiFormControlLayoutGroupInputCompressedBorderRadius: string; euiRangeTrackColor: string; euiRangeThumbRadius: string; euiRangeThumbHeight: string; euiRangeThumbWidth: string; euiRangeThumbBorderColor: string; euiRangeTrackWidth: string; euiRangeTrackHeight: string; euiRangeTrackBorderWidth: number; euiRangeTrackBorderColor: string; euiRangeTrackRadius: string; euiRangeDisabledOpacity: number; euiRangeHighlightHeight: string; euiHeaderBackgroundColor: string; euiHeaderDarkBackgroundColor: string; euiHeaderBorderColor: string; euiHeaderBreadcrumbColor: string; euiHeaderHeight: string; euiHeaderChildSize: string; euiHeaderHeightCompensation: string; euiPageDefaultMaxWidth: string; euiPageSidebarMinWidth: string; euiPanelPaddingModifiers: { paddingSmall: string; paddingMedium: string; paddingLarge: string; }; euiPanelBorderRadiusModifiers: { borderRadiusNone: number; borderRadiusMedium: string; }; euiPanelBackgroundColorModifiers: { transparent: string; plain: string; subdued: string; accent: string; primary: string; success: string; warning: string; danger: string; }; euiBreakpoints: { xs: number; s: string; m: string; l: string; xl: string; }; euiBreakpointKeys: string; euiShadowColor: string; euiShadowColorLarge: string; euiSize: string; euiSizeXS: string; euiSizeS: string; euiSizeM: string; euiSizeL: string; euiSizeXL: string; euiSizeXXL: string; euiButtonMinWidth: string; euiScrollBar: string; euiScrollBarCorner: string; euiFocusRingColor: string; euiFocusRingAnimStartColor: string; euiFocusRingAnimStartSize: string; euiFocusRingAnimStartSizeLarge: string; euiFocusRingSizeLarge: string; euiFocusRingSize: string; euiFocusTransparency: number; euiFocusBackgroundColor: string; euiTooltipBackgroundColor: string; euiTooltipAnimations: { top: string; left: string; bottom: string; right: string; }; euiFontFamily: string; euiCodeFontFamily: string; euiFontFeatureSettings: string; euiTextScale: string; euiFontSize: string; euiFontSizeXS: string; euiFontSizeS: string; euiFontSizeM: string; euiFontSizeL: string; euiFontSizeXL: string; euiFontSizeXXL: string; euiLineHeight: number; euiBodyLineHeight: number; euiFontWeightLight: number; euiFontWeightRegular: number; euiFontWeightMedium: number; euiFontWeightSemiBold: number; euiFontWeightBold: number; euiCodeFontWeightRegular: number; euiCodeFontWeightBold: number; euiTitles: { xxxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xxs: { 'font-size': string; 'line-height': string; 'font-weight': number; }; xs: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; s: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; m: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; l: { 'font-size': string; 'line-height': string; 'font-weight': number; 'letter-spacing': string; }; }; euiZLevel0: number; euiZLevel1: number; euiZLevel2: number; euiZLevel3: number; euiZLevel4: number; euiZLevel5: number; euiZLevel6: number; euiZLevel7: number; euiZLevel8: number; euiZLevel9: number; euiZContent: number; euiZHeader: number; euiZContentMenu: number; euiZFlyout: number; euiZNavigation: number; euiZMask: number; euiZModal: number; euiZToastList: number; }"
             ],
             "source": {
               "path": "src/plugins/kibana_react/common/eui_styled_components.tsx",
diff --git a/api_docs/kibana_utils.json b/api_docs/kibana_utils.json
index 66eefa9097bfb..99296f3235f0f 100644
--- a/api_docs/kibana_utils.json
+++ b/api_docs/kibana_utils.json
@@ -3805,7 +3805,7 @@
                     "description": [],
                     "source": {
                       "path": "src/core/public/application/types.ts",
-                      "lineNumber": 704
+                      "lineNumber": 731
                     },
                     "deprecated": false
                   },
@@ -3828,7 +3828,7 @@
                     ],
                     "source": {
                       "path": "src/core/public/application/types.ts",
-                      "lineNumber": 704
+                      "lineNumber": 731
                     },
                     "deprecated": false
                   }
diff --git a/api_docs/lens.json b/api_docs/lens.json
index 196361f65682b..782d060f398cb 100644
--- a/api_docs/lens.json
+++ b/api_docs/lens.json
@@ -87,7 +87,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx",
-          "lineNumber": 45
+          "lineNumber": 52
         },
         "deprecated": false,
         "children": [
@@ -103,7 +103,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/cardinality.tsx",
-              "lineNumber": 48
+              "lineNumber": 55
             },
             "deprecated": false
           }
@@ -119,7 +119,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lens/public/datatable_visualization/visualization.tsx",
-          "lineNumber": 42
+          "lineNumber": 48
         },
         "deprecated": false,
         "children": [
@@ -136,7 +136,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/datatable_visualization/visualization.tsx",
-              "lineNumber": 43
+              "lineNumber": 49
             },
             "deprecated": false
           },
@@ -149,7 +149,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/lens/public/datatable_visualization/visualization.tsx",
-              "lineNumber": 44
+              "lineNumber": 50
             },
             "deprecated": false
           },
@@ -166,7 +166,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/datatable_visualization/visualization.tsx",
-              "lineNumber": 45
+              "lineNumber": 51
             },
             "deprecated": false
           }
@@ -199,7 +199,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx",
-          "lineNumber": 43
+          "lineNumber": 44
         },
         "deprecated": false,
         "children": [
@@ -215,7 +215,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx",
-              "lineNumber": 44
+              "lineNumber": 45
             },
             "deprecated": false
           },
@@ -231,7 +231,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/date_histogram.tsx",
-              "lineNumber": 45
+              "lineNumber": 46
             },
             "deprecated": false
           }
@@ -308,7 +308,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts",
-          "lineNumber": 45
+          "lineNumber": 46
         },
         "deprecated": false,
         "children": [
@@ -324,7 +324,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts",
-              "lineNumber": 46
+              "lineNumber": 47
             },
             "deprecated": false
           },
@@ -340,7 +340,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/column_types.ts",
-              "lineNumber": 47
+              "lineNumber": 48
             },
             "deprecated": false
           }
@@ -407,7 +407,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx",
-          "lineNumber": 80
+          "lineNumber": 87
         },
         "deprecated": false,
         "children": [
@@ -423,7 +423,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx",
-              "lineNumber": 81
+              "lineNumber": 88
             },
             "deprecated": false
           },
@@ -439,7 +439,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/last_value.tsx",
-              "lineNumber": 82
+              "lineNumber": 89
             },
             "deprecated": false
           }
@@ -522,7 +522,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lens/public/plugin.ts",
-          "lineNumber": 83
+          "lineNumber": 84
         },
         "deprecated": false,
         "children": [
@@ -558,7 +558,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/plugin.ts",
-              "lineNumber": 92
+              "lineNumber": 93
             },
             "deprecated": false
           },
@@ -580,7 +580,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/plugin.ts",
-              "lineNumber": 101
+              "lineNumber": 102
             },
             "deprecated": false,
             "returnComment": [],
@@ -599,7 +599,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lens/public/plugin.ts",
-                  "lineNumber": 101
+                  "lineNumber": 102
                 },
                 "deprecated": false
               },
@@ -615,7 +615,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lens/public/plugin.ts",
-                  "lineNumber": 101
+                  "lineNumber": 102
                 },
                 "deprecated": false
               }
@@ -635,7 +635,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/plugin.ts",
-              "lineNumber": 105
+              "lineNumber": 106
             },
             "deprecated": false,
             "returnComment": [],
@@ -657,7 +657,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/plugin.ts",
-              "lineNumber": 110
+              "lineNumber": 111
             },
             "deprecated": false,
             "returnComment": [],
@@ -720,7 +720,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lens/public/types.ts",
-          "lineNumber": 363
+          "lineNumber": 362
         },
         "deprecated": false,
         "children": [
@@ -736,7 +736,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/types.ts",
-              "lineNumber": 365
+              "lineNumber": 364
             },
             "deprecated": false
           },
@@ -749,7 +749,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/lens/public/types.ts",
-              "lineNumber": 368
+              "lineNumber": 367
             },
             "deprecated": false
           },
@@ -767,7 +767,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/types.ts",
-              "lineNumber": 374
+              "lineNumber": 373
             },
             "deprecated": false
           }
@@ -800,7 +800,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx",
-          "lineNumber": 24
+          "lineNumber": 25
         },
         "deprecated": false,
         "children": [
@@ -816,7 +816,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx",
-              "lineNumber": 25
+              "lineNumber": 26
             },
             "deprecated": false
           },
@@ -832,7 +832,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/percentile.tsx",
-              "lineNumber": 26
+              "lineNumber": 27
             },
             "deprecated": false
           }
@@ -1039,7 +1039,7 @@
             "label": "numberDisplay",
             "description": [],
             "signature": [
-              "\"hidden\" | \"value\" | \"percent\""
+              "\"percent\" | \"hidden\" | \"value\""
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/pie_visualization/types.ts",
@@ -1156,7 +1156,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx",
-          "lineNumber": 56
+          "lineNumber": 161
         },
         "deprecated": false,
         "children": [
@@ -1172,7 +1172,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx",
-              "lineNumber": 57
+              "lineNumber": 162
             },
             "deprecated": false
           },
@@ -1188,7 +1188,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/terms/index.tsx",
-              "lineNumber": 58
+              "lineNumber": 163
             },
             "deprecated": false
           }
@@ -1277,7 +1277,13 @@
             "label": "yConfig",
             "description": [],
             "signature": [
-              "YConfig",
+              {
+                "pluginId": "lens",
+                "scope": "public",
+                "docId": "kibLensPluginApi",
+                "section": "def-public.YConfig",
+                "text": "YConfig"
+              },
               "[] | undefined"
             ],
             "source": {
@@ -1353,7 +1359,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-          "lineNumber": 474
+          "lineNumber": 475
         },
         "deprecated": false,
         "children": [
@@ -1369,7 +1375,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 475
+              "lineNumber": 476
             },
             "deprecated": false
           },
@@ -1391,7 +1397,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 476
+              "lineNumber": 477
             },
             "deprecated": false
           },
@@ -1407,7 +1413,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 477
+              "lineNumber": 478
             },
             "deprecated": false
           },
@@ -1423,7 +1429,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 478
+              "lineNumber": 479
             },
             "deprecated": false
           },
@@ -1440,7 +1446,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 479
+              "lineNumber": 480
             },
             "deprecated": false
           },
@@ -1457,7 +1463,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 480
+              "lineNumber": 481
             },
             "deprecated": false
           },
@@ -1480,7 +1486,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 481
+              "lineNumber": 482
             },
             "deprecated": false
           },
@@ -1496,7 +1502,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 482
+              "lineNumber": 483
             },
             "deprecated": false
           },
@@ -1512,7 +1518,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 483
+              "lineNumber": 484
             },
             "deprecated": false
           },
@@ -1528,7 +1534,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 484
+              "lineNumber": 485
             },
             "deprecated": false
           },
@@ -1551,7 +1557,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 485
+              "lineNumber": 486
             },
             "deprecated": false
           },
@@ -1574,7 +1580,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 486
+              "lineNumber": 487
             },
             "deprecated": false
           },
@@ -1597,7 +1603,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 487
+              "lineNumber": 488
             },
             "deprecated": false
           },
@@ -1613,7 +1619,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 488
+              "lineNumber": 489
             },
             "deprecated": false
           },
@@ -1629,7 +1635,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 489
+              "lineNumber": 490
             },
             "deprecated": false
           },
@@ -1645,7 +1651,84 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-              "lineNumber": 490
+              "lineNumber": 491
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.XYState.valuesInLegend",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "valuesInLegend",
+            "description": [],
+            "signature": [
+              "boolean | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
+              "lineNumber": 492
+            },
+            "deprecated": false
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "lens",
+        "id": "def-public.YConfig",
+        "type": "Interface",
+        "tags": [],
+        "label": "YConfig",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
+          "lineNumber": 418
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.YConfig.forAccessor",
+            "type": "string",
+            "tags": [],
+            "label": "forAccessor",
+            "description": [],
+            "source": {
+              "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
+              "lineNumber": 419
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.YConfig.axisMode",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "axisMode",
+            "description": [],
+            "signature": [
+              "\"left\" | \"right\" | \"auto\" | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
+              "lineNumber": 420
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-public.YConfig.color",
+            "type": "string",
+            "tags": [],
+            "label": "color",
+            "description": [],
+            "signature": [
+              "string | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
+              "lineNumber": 421
             },
             "deprecated": false
           }
@@ -1676,7 +1759,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx",
-          "lineNumber": 132
+          "lineNumber": 139
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -1742,7 +1825,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/cumulative_sum.tsx",
-          "lineNumber": 33
+          "lineNumber": 34
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -1759,7 +1842,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/types.ts",
-          "lineNumber": 352
+          "lineNumber": 351
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -1875,7 +1958,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts",
-          "lineNumber": 79
+          "lineNumber": 80
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -1992,7 +2075,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts",
-          "lineNumber": 58
+          "lineNumber": 59
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2018,7 +2101,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx",
-          "lineNumber": 134
+          "lineNumber": 141
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2044,7 +2127,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx",
-          "lineNumber": 135
+          "lineNumber": 142
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2070,7 +2153,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx",
-          "lineNumber": 133
+          "lineNumber": 140
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2090,7 +2173,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/moving_average.tsx",
-          "lineNumber": 47
+          "lineNumber": 43
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2109,7 +2192,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/index.ts",
-          "lineNumber": 498
+          "lineNumber": 533
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2209,7 +2292,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/metrics.tsx",
-          "lineNumber": 131
+          "lineNumber": 138
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2296,7 +2379,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/public/xy_visualization/types.ts",
-          "lineNumber": 471
+          "lineNumber": 472
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -2350,7 +2433,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/lens/server/plugin.tsx",
-          "lineNumber": 31
+          "lineNumber": 34
         },
         "deprecated": false,
         "children": [
@@ -2366,7 +2449,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 35
+              "lineNumber": 38
             },
             "deprecated": false,
             "children": [
@@ -2389,7 +2472,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lens/server/plugin.tsx",
-                  "lineNumber": 35
+                  "lineNumber": 38
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2433,7 +2516,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 39
+              "lineNumber": 42
             },
             "deprecated": false,
             "children": [
@@ -2464,7 +2547,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lens/server/plugin.tsx",
-                  "lineNumber": 39
+                  "lineNumber": 42
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2487,7 +2570,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lens/server/plugin.tsx",
-                  "lineNumber": 39
+                  "lineNumber": 42
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2523,7 +2606,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 59
+              "lineNumber": 63
             },
             "deprecated": false,
             "children": [
@@ -2545,7 +2628,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lens/server/plugin.tsx",
-                  "lineNumber": 59
+                  "lineNumber": 63
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2568,7 +2651,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lens/server/plugin.tsx",
-                  "lineNumber": 59
+                  "lineNumber": 63
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -2588,7 +2671,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 66
+              "lineNumber": 70
             },
             "deprecated": false,
             "children": [],
@@ -2609,7 +2692,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lens/server/plugin.tsx",
-          "lineNumber": 21
+          "lineNumber": 23
         },
         "deprecated": false,
         "children": [
@@ -2632,7 +2715,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 22
+              "lineNumber": 24
             },
             "deprecated": false
           },
@@ -2655,7 +2738,29 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 23
+              "lineNumber": 25
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "lens",
+            "id": "def-server.PluginSetupContract.embeddable",
+            "type": "Object",
+            "tags": [],
+            "label": "embeddable",
+            "description": [],
+            "signature": [
+              {
+                "pluginId": "embeddable",
+                "scope": "server",
+                "docId": "kibEmbeddablePluginApi",
+                "section": "def-server.EmbeddableSetup",
+                "text": "EmbeddableSetup"
+              }
+            ],
+            "source": {
+              "path": "x-pack/plugins/lens/server/plugin.tsx",
+              "lineNumber": 26
             },
             "deprecated": false
           }
@@ -2671,7 +2776,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lens/server/plugin.tsx",
-          "lineNumber": 26
+          "lineNumber": 29
         },
         "deprecated": false,
         "children": [
@@ -2694,7 +2799,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 27
+              "lineNumber": 30
             },
             "deprecated": false
           },
@@ -2716,7 +2821,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lens/server/plugin.tsx",
-              "lineNumber": 28
+              "lineNumber": 31
             },
             "deprecated": false
           }
diff --git a/api_docs/licensing.json b/api_docs/licensing.json
index 1451cff869f47..862a00e65215f 100644
--- a/api_docs/licensing.json
+++ b/api_docs/licensing.json
@@ -45,7 +45,7 @@
               "\nThe validity status of the license."
             ],
             "signature": [
-              "\"active\" | \"invalid\" | \"expired\" | undefined"
+              "\"invalid\" | \"active\" | \"expired\" | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/licensing/common/types.ts",
@@ -381,7 +381,7 @@
               "\nThe state of checking the results of a license type meeting the license minimum."
             ],
             "signature": [
-              "\"valid\" | \"invalid\" | \"expired\" | \"unavailable\""
+              "\"valid\" | \"invalid\" | \"unavailable\" | \"expired\""
             ],
             "source": {
               "path": "x-pack/plugins/licensing/common/types.ts",
@@ -492,7 +492,7 @@
               "\nThe validity status of the license."
             ],
             "signature": [
-              "\"active\" | \"invalid\" | \"expired\""
+              "\"invalid\" | \"active\" | \"expired\""
             ],
             "source": {
               "path": "x-pack/plugins/licensing/common/types.ts",
@@ -839,7 +839,7 @@
         "label": "LicenseCheckState",
         "description": [],
         "signature": [
-          "\"valid\" | \"invalid\" | \"expired\" | \"unavailable\""
+          "\"valid\" | \"invalid\" | \"unavailable\" | \"expired\""
         ],
         "source": {
           "path": "x-pack/plugins/licensing/common/types.ts",
@@ -856,7 +856,7 @@
         "label": "LicenseStatus",
         "description": [],
         "signature": [
-          "\"active\" | \"invalid\" | \"expired\""
+          "\"invalid\" | \"active\" | \"expired\""
         ],
         "source": {
           "path": "x-pack/plugins/licensing/common/types.ts",
@@ -987,7 +987,7 @@
               "plugin": "security",
               "link": {
                 "path": "x-pack/plugins/security/public/plugin.tsx",
-                "lineNumber": 82
+                "lineNumber": 84
               }
             },
             {
@@ -1001,7 +1001,7 @@
               "plugin": "ml",
               "link": {
                 "path": "x-pack/plugins/ml/public/plugin.ts",
-                "lineNumber": 136
+                "lineNumber": 141
               }
             },
             {
@@ -1022,7 +1022,7 @@
               "plugin": "fleet",
               "link": {
                 "path": "x-pack/plugins/fleet/public/plugin.ts",
-                "lineNumber": 97
+                "lineNumber": 94
               }
             },
             {
@@ -2078,7 +2078,7 @@
               "\nThe validity status of the license."
             ],
             "signature": [
-              "\"active\" | \"invalid\" | \"expired\" | undefined"
+              "\"invalid\" | \"active\" | \"expired\" | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/licensing/common/types.ts",
@@ -2414,7 +2414,7 @@
               "\nThe state of checking the results of a license type meeting the license minimum."
             ],
             "signature": [
-              "\"valid\" | \"invalid\" | \"expired\" | \"unavailable\""
+              "\"valid\" | \"invalid\" | \"unavailable\" | \"expired\""
             ],
             "source": {
               "path": "x-pack/plugins/licensing/common/types.ts",
@@ -2581,7 +2581,7 @@
               "\nThe validity status of the license."
             ],
             "signature": [
-              "\"active\" | \"invalid\" | \"expired\""
+              "\"invalid\" | \"active\" | \"expired\""
             ],
             "source": {
               "path": "x-pack/plugins/licensing/common/types.ts",
@@ -2947,7 +2947,7 @@
         "label": "LicenseCheckState",
         "description": [],
         "signature": [
-          "\"valid\" | \"invalid\" | \"expired\" | \"unavailable\""
+          "\"valid\" | \"invalid\" | \"unavailable\" | \"expired\""
         ],
         "source": {
           "path": "x-pack/plugins/licensing/common/types.ts",
@@ -2964,7 +2964,7 @@
         "label": "LicenseStatus",
         "description": [],
         "signature": [
-          "\"active\" | \"invalid\" | \"expired\""
+          "\"invalid\" | \"active\" | \"expired\""
         ],
         "source": {
           "path": "x-pack/plugins/licensing/common/types.ts",
@@ -3074,7 +3074,7 @@
               "plugin": "security",
               "link": {
                 "path": "x-pack/plugins/security/server/plugin.ts",
-                "lineNumber": 225
+                "lineNumber": 229
               }
             },
             {
@@ -3119,13 +3119,6 @@
                 "lineNumber": 139
               }
             },
-            {
-              "plugin": "indexManagement",
-              "link": {
-                "path": "x-pack/plugins/index_management/server/services/license.ts",
-                "lineNumber": 36
-              }
-            },
             {
               "plugin": "remoteClusters",
               "link": {
@@ -3137,7 +3130,7 @@
               "plugin": "fleet",
               "link": {
                 "path": "x-pack/plugins/fleet/server/plugin.ts",
-                "lineNumber": 213
+                "lineNumber": 214
               }
             },
             {
@@ -3154,18 +3147,11 @@
                 "lineNumber": 41
               }
             },
-            {
-              "plugin": "ingestPipelines",
-              "link": {
-                "path": "x-pack/plugins/ingest_pipelines/server/services/license.ts",
-                "lineNumber": 40
-              }
-            },
             {
               "plugin": "maps",
               "link": {
                 "path": "x-pack/plugins/maps/server/plugin.ts",
-                "lineNumber": 164
+                "lineNumber": 167
               }
             },
             {
diff --git a/api_docs/lists.json b/api_docs/lists.json
index 90f5cd726287b..061227499d67f 100644
--- a/api_docs/lists.json
+++ b/api_docs/lists.json
@@ -341,7 +341,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-          "lineNumber": 56
+          "lineNumber": 59
         },
         "deprecated": false,
         "children": [
@@ -357,7 +357,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 61
+              "lineNumber": 64
             },
             "deprecated": false,
             "children": [
@@ -373,7 +373,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 61
+                  "lineNumber": 64
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -395,7 +395,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 66
+              "lineNumber": 69
             },
             "deprecated": false,
             "children": [
@@ -411,7 +411,45 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 66
+                  "lineNumber": 69
+                },
+                "deprecated": false,
+                "isRequired": true
+              }
+            ],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "lists",
+            "id": "def-server.ExceptionListClient.getExceptionListSummary",
+            "type": "Function",
+            "tags": [],
+            "label": "getExceptionListSummary",
+            "description": [],
+            "signature": [
+              "({ listId, id, namespaceType, }: ",
+              "GetExceptionListSummaryOptions",
+              ") => Promise<{ windows: number; linux: number; macos: number; total: number; } | null>"
+            ],
+            "source": {
+              "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
+              "lineNumber": 78
+            },
+            "deprecated": false,
+            "children": [
+              {
+                "parentPluginId": "lists",
+                "id": "def-server.ExceptionListClient.getExceptionListSummary.$1",
+                "type": "Object",
+                "tags": [],
+                "label": "{\n    listId,\n    id,\n    namespaceType,\n  }",
+                "description": [],
+                "signature": [
+                  "GetExceptionListSummaryOptions"
+                ],
+                "source": {
+                  "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
+                  "lineNumber": 78
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -429,11 +467,11 @@
             "signature": [
               "({ itemId, id, namespaceType, }: ",
               "GetExceptionListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 75
+              "lineNumber": 87
             },
             "deprecated": false,
             "children": [
@@ -449,7 +487,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 75
+                  "lineNumber": 87
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -471,7 +509,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 90
+              "lineNumber": 102
             },
             "deprecated": false,
             "children": [],
@@ -493,7 +531,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 102
+              "lineNumber": 114
             },
             "deprecated": false,
             "children": [],
@@ -513,7 +551,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 114
+              "lineNumber": 126
             },
             "deprecated": false,
             "children": [],
@@ -531,11 +569,11 @@
             "signature": [
               "({ comments, description, entries, itemId, meta, name, osTypes, tags, type, }: ",
               "CreateEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 128
+              "lineNumber": 140
             },
             "deprecated": false,
             "children": [
@@ -551,7 +589,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 128
+                  "lineNumber": 140
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -571,11 +609,11 @@
             "signature": [
               "({ _version, comments, description, entries, id, itemId, meta, name, osTypes, tags, type, }: ",
               "UpdateEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 164
+              "lineNumber": 176
             },
             "deprecated": false,
             "children": [
@@ -591,7 +629,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 164
+                  "lineNumber": 176
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -611,11 +649,11 @@
             "signature": [
               "({ itemId, id, }: ",
               "GetEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 200
+              "lineNumber": 212
             },
             "deprecated": false,
             "children": [
@@ -631,7 +669,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 200
+                  "lineNumber": 212
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -653,7 +691,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 208
+              "lineNumber": 220
             },
             "deprecated": false,
             "children": [
@@ -669,7 +707,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 208
+                  "lineNumber": 220
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -691,7 +729,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 235
+              "lineNumber": 247
             },
             "deprecated": false,
             "children": [
@@ -707,7 +745,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 235
+                  "lineNumber": 247
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -729,7 +767,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 266
+              "lineNumber": 278
             },
             "deprecated": false,
             "children": [
@@ -745,7 +783,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 266
+                  "lineNumber": 278
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -769,11 +807,11 @@
                 "section": "def-server.CreateExceptionListItemOptions",
                 "text": "CreateExceptionListItemOptions"
               },
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 280
+              "lineNumber": 292
             },
             "deprecated": false,
             "children": [
@@ -795,7 +833,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 280
+                  "lineNumber": 292
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -819,11 +857,11 @@
                 "section": "def-server.UpdateExceptionListItemOptions",
                 "text": "UpdateExceptionListItemOptions"
               },
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 311
+              "lineNumber": 323
             },
             "deprecated": false,
             "children": [
@@ -845,7 +883,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 311
+                  "lineNumber": 323
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -863,11 +901,11 @@
             "signature": [
               "({ id, itemId, namespaceType, }: ",
               "DeleteExceptionListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 344
+              "lineNumber": 356
             },
             "deprecated": false,
             "children": [
@@ -883,7 +921,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 344
+                  "lineNumber": 356
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -905,7 +943,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 358
+              "lineNumber": 370
             },
             "deprecated": false,
             "children": [
@@ -921,7 +959,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 358
+                  "lineNumber": 370
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -941,11 +979,11 @@
             "signature": [
               "({ id, itemId, }: ",
               "DeleteEndpointListItemOptions",
-              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
+              ") => Promise<{ _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 373
+              "lineNumber": 385
             },
             "deprecated": false,
             "children": [
@@ -961,7 +999,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 373
+                  "lineNumber": 385
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -979,11 +1017,11 @@
             "signature": [
               "({ listId, filter, perPage, page, sortField, sortOrder, namespaceType, }: ",
               "FindExceptionListItemOptions",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 386
+              "lineNumber": 398
             },
             "deprecated": false,
             "children": [
@@ -999,7 +1037,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 386
+                  "lineNumber": 398
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1017,11 +1055,11 @@
             "signature": [
               "({ listId, filter, perPage, page, sortField, sortOrder, namespaceType, }: ",
               "FindExceptionListsItemOptions",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 408
+              "lineNumber": 420
             },
             "deprecated": false,
             "children": [
@@ -1037,7 +1075,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 408
+                  "lineNumber": 420
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1055,11 +1093,11 @@
             "signature": [
               "({ perPage, page, sortField, sortOrder, valueListId, }: ",
               "FindValueListExceptionListsItems",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 430
+              "lineNumber": 442
             },
             "deprecated": false,
             "children": [
@@ -1075,7 +1113,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 430
+                  "lineNumber": 442
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1097,7 +1135,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 448
+              "lineNumber": 460
             },
             "deprecated": false,
             "children": [
@@ -1113,7 +1151,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 448
+                  "lineNumber": 460
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1133,11 +1171,11 @@
             "signature": [
               "({ filter, perPage, page, sortField, sortOrder, }: ",
               "FindEndpointListItemOptions",
-              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ data: { _version: string | undefined; comments: ({ comment: string; created_at: string; created_by: string; id: string; } & { updated_at?: string | undefined; updated_by?: string | undefined; })[]; created_at: string; created_by: string; description: string; entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]; id: string; item_id: string; list_id: string; meta: object | undefined; name: string; namespace_type: \"single\" | \"agnostic\"; os_types: (\"windows\" | \"linux\" | \"macos\")[]; tags: string[]; tie_breaker_id: string; type: \"simple\"; updated_at: string; updated_by: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-              "lineNumber": 476
+              "lineNumber": 488
             },
             "deprecated": false,
             "children": [
@@ -1153,7 +1191,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client.ts",
-                  "lineNumber": 476
+                  "lineNumber": 488
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -1259,7 +1297,7 @@
             "signature": [
               "({ id }: ",
               "GetListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1297,7 +1335,7 @@
             "signature": [
               "({ id, deserializer, immutable, serializer, name, description, type, meta, version, }: ",
               "CreateListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1335,7 +1373,7 @@
             "signature": [
               "({ id, deserializer, serializer, name, description, immutable, type, meta, version, }: ",
               "CreateListIfItDoesNotExistOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1733,7 +1771,7 @@
             "signature": [
               "({ id }: ",
               "DeleteListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1771,7 +1809,7 @@
             "signature": [
               "({ listId, value, type, }: ",
               "DeleteListItemByValueOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1809,7 +1847,7 @@
             "signature": [
               "({ id }: ",
               "DeleteListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1885,7 +1923,7 @@
             "signature": [
               "({ deserializer, serializer, type, listId, stream, meta, version, }: ",
               "ImportListItemsToStreamOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1923,7 +1961,7 @@
             "signature": [
               "({ listId, value, type, }: ",
               "GetListItemByValueOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1961,7 +1999,7 @@
             "signature": [
               "({ id, deserializer, serializer, listId, value, type, meta, }: ",
               "CreateListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -1999,7 +2037,7 @@
             "signature": [
               "({ _version, id, value, meta, }: ",
               "UpdateListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -2037,7 +2075,7 @@
             "signature": [
               "({ _version, id, name, description, meta, version, }: ",
               "UpdateListOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -2075,7 +2113,7 @@
             "signature": [
               "({ id }: ",
               "GetListItemOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -2113,7 +2151,7 @@
             "signature": [
               "({ type, listId, value, }: ",
               "GetListItemsByValueOptions",
-              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
+              ") => Promise<{ _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -2151,7 +2189,7 @@
             "signature": [
               "({ type, listId, value, }: ",
               "SearchListItemByValuesOptions",
-              ") => Promise<{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }[]>"
+              ") => Promise<{ items: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; value: unknown; }[]>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -2189,7 +2227,7 @@
             "signature": [
               "({ filter, currentIndexPosition, perPage, page, sortField, sortOrder, searchAfter, }: ",
               "FindListOptions",
-              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
+              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; description: string; deserializer: string | undefined; id: string; immutable: boolean; meta: object | undefined; name: string; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; version: number; }[]; page: number; per_page: number; total: number; }>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -2227,7 +2265,7 @@
             "signature": [
               "({ listId, filter, currentIndexPosition, perPage, page, sortField, sortOrder, searchAfter, }: ",
               "FindListItemOptions",
-              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; page: number; per_page: number; total: number; } | null>"
+              ") => Promise<{ cursor: string; data: { _version: string | undefined; created_at: string; created_by: string; deserializer: string | undefined; id: string; list_id: string; meta: object | undefined; serializer: string | undefined; tie_breaker_id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; updated_at: string; updated_by: string; value: string; }[]; page: number; per_page: number; total: number; } | null>"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/lists/list_client.ts",
@@ -2270,7 +2308,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-          "lineNumber": 118
+          "lineNumber": 124
         },
         "deprecated": false,
         "children": [
@@ -2286,7 +2324,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 119
+              "lineNumber": 125
             },
             "deprecated": false
           },
@@ -2298,11 +2336,11 @@
             "label": "entries",
             "description": [],
             "signature": [
-              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
+              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 120
+              "lineNumber": 126
             },
             "deprecated": false
           },
@@ -2315,7 +2353,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 121
+              "lineNumber": 127
             },
             "deprecated": false
           },
@@ -2328,7 +2366,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 122
+              "lineNumber": 128
             },
             "deprecated": false
           },
@@ -2344,7 +2382,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 123
+              "lineNumber": 129
             },
             "deprecated": false
           },
@@ -2357,7 +2395,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 124
+              "lineNumber": 130
             },
             "deprecated": false
           },
@@ -2373,7 +2411,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 125
+              "lineNumber": 131
             },
             "deprecated": false
           },
@@ -2386,7 +2424,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 126
+              "lineNumber": 132
             },
             "deprecated": false
           },
@@ -2402,7 +2440,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 127
+              "lineNumber": 133
             },
             "deprecated": false
           },
@@ -2418,7 +2456,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 128
+              "lineNumber": 134
             },
             "deprecated": false
           },
@@ -2434,7 +2472,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 129
+              "lineNumber": 135
             },
             "deprecated": false
           }
@@ -2859,7 +2897,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
@@ -2981,7 +3019,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-          "lineNumber": 144
+          "lineNumber": 150
         },
         "deprecated": false,
         "children": [
@@ -2997,7 +3035,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 145
+              "lineNumber": 151
             },
             "deprecated": false
           },
@@ -3013,7 +3051,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 146
+              "lineNumber": 152
             },
             "deprecated": false
           },
@@ -3025,11 +3063,11 @@
             "label": "entries",
             "description": [],
             "signature": [
-              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"integer\" | \"byte\" | \"float\" | \"half_float\" | \"integer_range\" | \"float_range\" | \"long_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
+              "({ field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; } | { field: string; list: { id: string; type: \"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"ip\" | \"date_nanos\" | \"geo_point\" | \"geo_shape\" | \"binary\" | \"short\" | \"date_range\" | \"ip_range\" | \"shape\" | \"float\" | \"half_float\" | \"integer\" | \"byte\" | \"long_range\" | \"integer_range\" | \"float_range\" | \"double_range\"; }; operator: \"excluded\" | \"included\"; type: \"list\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { entries: ({ field: string; operator: \"excluded\" | \"included\"; type: \"exists\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match\"; value: string; } | { field: string; operator: \"excluded\" | \"included\"; type: \"match_any\"; value: string[]; })[]; field: string; type: \"nested\"; } | { field: string; operator: \"excluded\" | \"included\"; type: \"wildcard\"; value: string; })[]"
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 147
+              "lineNumber": 153
             },
             "deprecated": false
           },
@@ -3045,7 +3083,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 148
+              "lineNumber": 154
             },
             "deprecated": false
           },
@@ -3061,7 +3099,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 149
+              "lineNumber": 155
             },
             "deprecated": false
           },
@@ -3077,7 +3115,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 150
+              "lineNumber": 156
             },
             "deprecated": false
           },
@@ -3093,7 +3131,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 151
+              "lineNumber": 157
             },
             "deprecated": false
           },
@@ -3109,7 +3147,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 152
+              "lineNumber": 158
             },
             "deprecated": false
           },
@@ -3125,7 +3163,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 153
+              "lineNumber": 159
             },
             "deprecated": false
           },
@@ -3141,7 +3179,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 154
+              "lineNumber": 160
             },
             "deprecated": false
           },
@@ -3157,7 +3195,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 155
+              "lineNumber": 161
             },
             "deprecated": false
           },
@@ -3173,7 +3211,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/lists/server/services/exception_lists/exception_list_client_types.ts",
-              "lineNumber": 156
+              "lineNumber": 162
             },
             "deprecated": false
           }
diff --git a/api_docs/maps.json b/api_docs/maps.json
index d418518dcb0d2..9c1c7243a41bc 100644
--- a/api_docs/maps.json
+++ b/api_docs/maps.json
@@ -57,7 +57,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-          "lineNumber": 95
+          "lineNumber": 93
         },
         "deprecated": false,
         "children": [
@@ -70,7 +70,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 98
+              "lineNumber": 96
             },
             "deprecated": false
           },
@@ -86,7 +86,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 118
+              "lineNumber": 115
             },
             "deprecated": false,
             "children": [
@@ -102,7 +102,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 118
+                  "lineNumber": 115
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -125,7 +125,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 118
+                  "lineNumber": 115
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -165,7 +165,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 118
+                  "lineNumber": 115
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -194,7 +194,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 200
+              "lineNumber": 194
             },
             "deprecated": false,
             "children": [
@@ -216,7 +216,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 201
+                  "lineNumber": 195
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -238,7 +238,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 206
+              "lineNumber": 200
             },
             "deprecated": false,
             "children": [],
@@ -258,7 +258,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 214
+              "lineNumber": 208
             },
             "deprecated": false,
             "children": [],
@@ -276,7 +276,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 219
+              "lineNumber": 213
             },
             "deprecated": false,
             "children": [],
@@ -294,7 +294,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 223
+              "lineNumber": 217
             },
             "deprecated": false,
             "children": [],
@@ -314,7 +314,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 227
+              "lineNumber": 221
             },
             "deprecated": false,
             "children": [
@@ -330,7 +330,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 227
+                  "lineNumber": 221
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -352,7 +352,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 231
+              "lineNumber": 225
             },
             "deprecated": false,
             "children": [
@@ -368,7 +368,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 231
+                  "lineNumber": 225
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -395,7 +395,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 235
+              "lineNumber": 229
             },
             "deprecated": false,
             "children": [],
@@ -413,7 +413,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 239
+              "lineNumber": 233
             },
             "deprecated": false,
             "children": [],
@@ -439,7 +439,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 283
+              "lineNumber": 273
             },
             "deprecated": false,
             "children": [],
@@ -457,7 +457,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 291
+              "lineNumber": 281
             },
             "deprecated": false,
             "children": [],
@@ -475,7 +475,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 301
+              "lineNumber": 291
             },
             "deprecated": false,
             "children": [
@@ -488,7 +488,7 @@
                 "description": [],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 301
+                  "lineNumber": 291
                 },
                 "deprecated": false,
                 "children": [
@@ -501,7 +501,7 @@
                     "description": [],
                     "source": {
                       "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                      "lineNumber": 301
+                      "lineNumber": 291
                     },
                     "deprecated": false
                   }
@@ -510,56 +510,6 @@
             ],
             "returnComment": []
           },
-          {
-            "parentPluginId": "maps",
-            "id": "def-public.MapEmbeddable._dispatchSetRefreshConfig",
-            "type": "Function",
-            "tags": [],
-            "label": "_dispatchSetRefreshConfig",
-            "description": [],
-            "signature": [
-              "(refreshConfig: ",
-              {
-                "pluginId": "data",
-                "scope": "common",
-                "docId": "kibDataQueryPluginApi",
-                "section": "def-common.RefreshInterval",
-                "text": "RefreshInterval"
-              },
-              ") => void"
-            ],
-            "source": {
-              "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 321
-            },
-            "deprecated": false,
-            "children": [
-              {
-                "parentPluginId": "maps",
-                "id": "def-public.MapEmbeddable._dispatchSetRefreshConfig.$1",
-                "type": "Object",
-                "tags": [],
-                "label": "refreshConfig",
-                "description": [],
-                "signature": [
-                  {
-                    "pluginId": "data",
-                    "scope": "common",
-                    "docId": "kibDataQueryPluginApi",
-                    "section": "def-common.RefreshInterval",
-                    "text": "RefreshInterval"
-                  }
-                ],
-                "source": {
-                  "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 321
-                },
-                "deprecated": false,
-                "isRequired": true
-              }
-            ],
-            "returnComment": []
-          },
           {
             "parentPluginId": "maps",
             "id": "def-public.MapEmbeddable._dispatchSetChartsPaletteServiceGetColor",
@@ -572,7 +522,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 331
+              "lineNumber": 311
             },
             "deprecated": false,
             "children": [
@@ -588,7 +538,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 331
+                  "lineNumber": 311
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -610,7 +560,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 349
+              "lineNumber": 329
             },
             "deprecated": false,
             "children": [
@@ -626,7 +576,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 349
+                  "lineNumber": 329
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -648,7 +598,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 375
+              "lineNumber": 355
             },
             "deprecated": false,
             "children": [
@@ -665,7 +615,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 375
+                  "lineNumber": 355
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -693,7 +643,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 392
+              "lineNumber": 372
             },
             "deprecated": false,
             "children": [
@@ -709,7 +659,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 392
+                  "lineNumber": 372
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -726,7 +676,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 392
+                  "lineNumber": 372
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -749,7 +699,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 392
+                  "lineNumber": 372
                 },
                 "deprecated": false,
                 "isRequired": false
@@ -777,7 +727,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 406
+              "lineNumber": 386
             },
             "deprecated": false,
             "children": [
@@ -800,7 +750,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 406
+                  "lineNumber": 386
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -817,7 +767,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-                  "lineNumber": 406
+                  "lineNumber": 386
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -845,7 +795,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 418
+              "lineNumber": 398
             },
             "deprecated": false,
             "children": [],
@@ -871,7 +821,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 439
+              "lineNumber": 419
             },
             "deprecated": false,
             "children": [],
@@ -889,7 +839,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 450
+              "lineNumber": 430
             },
             "deprecated": false,
             "children": [],
@@ -907,7 +857,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 487
+              "lineNumber": 466
             },
             "deprecated": false,
             "children": [],
@@ -925,7 +875,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 501
+              "lineNumber": 480
             },
             "deprecated": false,
             "children": [],
@@ -943,7 +893,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 517
+              "lineNumber": 496
             },
             "deprecated": false,
             "children": [],
@@ -961,7 +911,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/maps/public/embeddable/map_embeddable.tsx",
-              "lineNumber": 523
+              "lineNumber": 502
             },
             "deprecated": false,
             "children": [],
@@ -1377,7 +1327,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/maps/public/embeddable/types.ts",
-          "lineNumber": 42
+          "lineNumber": 41
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -1409,7 +1359,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/maps/public/embeddable/types.ts",
-          "lineNumber": 44
+          "lineNumber": 43
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/metrics_entities.json b/api_docs/metrics_entities.json
index 3e67e8e750007..b78278a84162a 100644
--- a/api_docs/metrics_entities.json
+++ b/api_docs/metrics_entities.json
@@ -64,7 +64,7 @@
               "signature": [
                 "Pick<",
                 "KibanaClient",
-                ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                 "TransportRequestParams",
                 ", options?: ",
                 "TransportRequestOptions",
diff --git a/api_docs/ml.json b/api_docs/ml.json
index dee66858b9be9..2e0e6364993d5 100644
--- a/api_docs/ml.json
+++ b/api_docs/ml.json
@@ -868,7 +868,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/ml/common/types/capabilities.ts",
-          "lineNumber": 153
+          "lineNumber": 161
         },
         "deprecated": false,
         "children": [
@@ -884,7 +884,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/ml/common/types/capabilities.ts",
-              "lineNumber": 154
+              "lineNumber": 162
             },
             "deprecated": false
           },
@@ -897,7 +897,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/ml/common/types/capabilities.ts",
-              "lineNumber": 155
+              "lineNumber": 163
             },
             "deprecated": false
           },
@@ -910,7 +910,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/ml/common/types/capabilities.ts",
-              "lineNumber": 156
+              "lineNumber": 164
             },
             "deprecated": false
           },
@@ -923,7 +923,7 @@
             "description": [],
             "source": {
               "path": "x-pack/plugins/ml/common/types/capabilities.ts",
-              "lineNumber": 157
+              "lineNumber": 165
             },
             "deprecated": false
           }
@@ -1513,14 +1513,14 @@
         "description": [],
         "signature": [
           "{ GTE: ",
-          "TotalHitsRelation",
+          "SearchTotalHitsRelation",
           "; EQ: ",
-          "TotalHitsRelation",
+          "SearchTotalHitsRelation",
           "; }"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/es_client.ts",
-          "lineNumber": 20
+          "lineNumber": 22
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -1563,7 +1563,7 @@
       ],
       "source": {
         "path": "x-pack/plugins/ml/public/plugin.ts",
-        "lineNumber": 213
+        "lineNumber": 212
       },
       "deprecated": false,
       "lifecycle": "start",
@@ -1779,7 +1779,7 @@
           ", indexPatternTitle: string, query: any, fields: ",
           "HistogramField",
           "[], samplerShardSize: number, runtimeMappings?: Record<string, ",
-          "RuntimeField",
+          "MappingRuntimeField",
           "> | undefined) => Promise<ChartData[]>"
         ],
         "source": {
@@ -1889,7 +1889,7 @@
             "description": [],
             "signature": [
               "Record<string, ",
-              "RuntimeField",
+              "MappingRuntimeField",
               "> | undefined"
             ],
             "source": {
@@ -2852,7 +2852,7 @@
         "signature": [
           "CombinedJob",
           " extends ",
-          "Job"
+          "MlJob"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts",
@@ -2884,7 +2884,7 @@
             "label": "datafeed_config",
             "description": [],
             "signature": [
-              "Datafeed"
+              "MlDatafeed"
             ],
             "source": {
               "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts",
@@ -2937,9 +2937,9 @@
             "label": "datafeed_config",
             "description": [],
             "signature": [
-              "Datafeed",
+              "MlDatafeed",
               " & ",
-              "DatafeedStats"
+              "MlDatafeedStats"
             ],
             "source": {
               "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts",
@@ -2950,72 +2950,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "ml",
-        "id": "def-server.IndicesOptions",
-        "type": "Interface",
-        "tags": [],
-        "label": "IndicesOptions",
-        "description": [],
-        "source": {
-          "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts",
-          "lineNumber": 19
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.IndicesOptions.allow_no_indices",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "allow_no_indices",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts",
-              "lineNumber": 20
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.IndicesOptions.expand_wildcards",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "expand_wildcards",
-            "description": [],
-            "signature": [
-              "string | ",
-              "ExpandWildcardOptions",
-              "[] | undefined"
-            ],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts",
-              "lineNumber": 21
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.IndicesOptions.ignore_unavailable",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "ignore_unavailable",
-            "description": [],
-            "signature": [
-              "boolean | undefined"
-            ],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts",
-              "lineNumber": 22
-            },
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "ml",
         "id": "def-server.Influencer",
@@ -3516,156 +3450,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "ml",
-        "id": "def-server.ModelSnapshot",
-        "type": "Interface",
-        "tags": [],
-        "label": "ModelSnapshot",
-        "description": [],
-        "source": {
-          "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-          "lineNumber": 11
-        },
-        "deprecated": false,
-        "children": [
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.job_id",
-            "type": "string",
-            "tags": [],
-            "label": "job_id",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 12
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.min_version",
-            "type": "string",
-            "tags": [],
-            "label": "min_version",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 13
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.timestamp",
-            "type": "number",
-            "tags": [],
-            "label": "timestamp",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 14
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.description",
-            "type": "string",
-            "tags": [],
-            "label": "description",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 15
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.snapshot_id",
-            "type": "string",
-            "tags": [],
-            "label": "snapshot_id",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 16
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.snapshot_doc_count",
-            "type": "number",
-            "tags": [],
-            "label": "snapshot_doc_count",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 17
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.model_size_stats",
-            "type": "CompoundType",
-            "tags": [],
-            "label": "model_size_stats",
-            "description": [],
-            "signature": [
-              "ModelSizeStats",
-              " & { model_bytes_exceeded: number; model_bytes_memory_limit: number; peak_model_bytes?: number | undefined; }"
-            ],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 18
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.latest_record_time_stamp",
-            "type": "number",
-            "tags": [],
-            "label": "latest_record_time_stamp",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 19
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.latest_result_time_stamp",
-            "type": "number",
-            "tags": [],
-            "label": "latest_result_time_stamp",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 20
-            },
-            "deprecated": false
-          },
-          {
-            "parentPluginId": "ml",
-            "id": "def-server.ModelSnapshot.retain",
-            "type": "boolean",
-            "tags": [],
-            "label": "retain",
-            "description": [],
-            "source": {
-              "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
-              "lineNumber": 21
-            },
-            "deprecated": false
-          }
-        ],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "ml",
         "id": "def-server.PerPartitionCategorization",
@@ -3726,7 +3510,7 @@
         "description": [],
         "signature": [
           "{ [x: string]: ",
-          "AggregationContainer",
+          "AggregationsAggregationContainer",
           "; }"
         ],
         "source": {
@@ -3744,7 +3528,7 @@
         "label": "AnalysisConfig",
         "description": [],
         "signature": [
-          "AnalysisConfig"
+          "MlAnalysisConfig"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -3761,7 +3545,7 @@
         "label": "AnalysisLimits",
         "description": [],
         "signature": [
-          "AnalysisLimits"
+          "MlAnalysisLimits"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -3812,7 +3596,7 @@
         "label": "ChunkingConfig",
         "description": [],
         "signature": [
-          "ChunkingConfig"
+          "MlChunkingConfig"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts",
@@ -3829,7 +3613,7 @@
         "label": "CustomRule",
         "description": [],
         "signature": [
-          "DetectionRule"
+          "MlDetectionRule"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -3846,7 +3630,7 @@
         "label": "CustomSettings",
         "description": [],
         "signature": [
-          "CustomSettings"
+          "MlCustomSettings"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -3863,11 +3647,11 @@
         "label": "DataCounts",
         "description": [],
         "signature": [
-          "DataCounts"
+          "MlDataCounts"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts",
-          "lineNumber": 15
+          "lineNumber": 12
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -3880,7 +3664,7 @@
         "label": "DataDescription",
         "description": [],
         "signature": [
-          "DataDescription"
+          "MlDataDescription"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -3897,7 +3681,7 @@
         "label": "Datafeed",
         "description": [],
         "signature": [
-          "Datafeed"
+          "MlDatafeed"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts",
@@ -3931,7 +3715,7 @@
         "label": "DatafeedStats",
         "description": [],
         "signature": [
-          "DatafeedStats"
+          "MlDatafeedStats"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts",
@@ -3948,9 +3732,9 @@
         "label": "DatafeedWithStats",
         "description": [],
         "signature": [
-          "Datafeed",
+          "MlDatafeed",
           " & ",
-          "DatafeedStats"
+          "MlDatafeedStats"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/combined_job.ts",
@@ -3967,7 +3751,7 @@
         "label": "Detector",
         "description": [],
         "signature": [
-          "Detector"
+          "MlDetector"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -4001,11 +3785,28 @@
         "label": "ForecastsStats",
         "description": [],
         "signature": [
-          "JobForecastStatistics"
+          "MlJobForecastStatistics"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts",
-          "lineNumber": 27
+          "lineNumber": 18
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "ml",
+        "id": "def-server.IndicesOptions",
+        "type": "Type",
+        "tags": [],
+        "label": "IndicesOptions",
+        "description": [],
+        "signature": [
+          "MlDatafeedIndicesOptions"
+        ],
+        "source": {
+          "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts",
+          "lineNumber": 18
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -4018,7 +3819,7 @@
         "label": "Job",
         "description": [],
         "signature": [
-          "Job"
+          "MlJob"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -4052,12 +3853,7 @@
         "label": "JobStats",
         "description": [],
         "signature": [
-          "JobStats",
-          " & { model_size_stats: ",
-          "ModelSizeStats",
-          "; timing_stats: ",
-          "TimingStats",
-          "; }"
+          "MlJobStats"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts",
@@ -4074,14 +3870,10 @@
         "label": "JobWithStats",
         "description": [],
         "signature": [
-          "Job",
+          "MlJob",
+          " & ",
+          "MlJobStats",
           " & ",
-          "JobStats",
-          " & { model_size_stats: ",
-          "ModelSizeStats",
-          "; timing_stats: ",
-          "TimingStats",
-          "; } & ",
           "JobAlertingRuleStats"
         ],
         "source": {
@@ -4117,7 +3909,7 @@
         "label": "ModelPlotConfig",
         "description": [],
         "signature": [
-          "ModelPlotConfig"
+          "MlModelPlotConfig"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts",
@@ -4134,12 +3926,28 @@
         "label": "ModelSizeStats",
         "description": [],
         "signature": [
-          "ModelSizeStats",
-          " & { model_bytes_exceeded: number; model_bytes_memory_limit: number; peak_model_bytes?: number | undefined; }"
+          "MlModelSizeStats"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts",
-          "lineNumber": 17
+          "lineNumber": 14
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "ml",
+        "id": "def-server.ModelSnapshot",
+        "type": "Type",
+        "tags": [],
+        "label": "ModelSnapshot",
+        "description": [],
+        "signature": [
+          "MlModelSnapshot"
+        ],
+        "source": {
+          "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts",
+          "lineNumber": 10
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -4169,11 +3977,11 @@
         "label": "Node",
         "description": [],
         "signature": [
-          "DiscoveryNode"
+          "MlDiscoveryNode"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts",
-          "lineNumber": 29
+          "lineNumber": 20
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -4203,12 +4011,11 @@
         "label": "TimingStats",
         "description": [],
         "signature": [
-          "TimingStats",
-          " & { total_bucket_processing_time_ms: number; }"
+          "MlTimingStats"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts",
-          "lineNumber": 23
+          "lineNumber": 16
         },
         "deprecated": false,
         "initialIsOpen": false
@@ -4671,7 +4478,7 @@
         "description": [],
         "signature": [
           "{ [x: string]: ",
-          "RuntimeField",
+          "MappingRuntimeField",
           "; }"
         ],
         "source": {
@@ -4692,14 +4499,14 @@
         "description": [],
         "signature": [
           "{ GTE: ",
-          "TotalHitsRelation",
+          "SearchTotalHitsRelation",
           "; EQ: ",
-          "TotalHitsRelation",
+          "SearchTotalHitsRelation",
           "; }"
         ],
         "source": {
           "path": "x-pack/plugins/ml/common/types/es_client.ts",
-          "lineNumber": 20
+          "lineNumber": 22
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/monitoring.json b/api_docs/monitoring.json
index 188e3f7b32100..2569619f007d7 100644
--- a/api_docs/monitoring.json
+++ b/api_docs/monitoring.json
@@ -96,7 +96,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
diff --git a/api_docs/newsfeed.json b/api_docs/newsfeed.json
index 45ec0de037851..eec5a9c5642e5 100644
--- a/api_docs/newsfeed.json
+++ b/api_docs/newsfeed.json
@@ -228,7 +228,7 @@
         "description": [],
         "source": {
           "path": "src/plugins/newsfeed/public/lib/api.ts",
-          "lineNumber": 25
+          "lineNumber": 16
         },
         "deprecated": false,
         "initialIsOpen": false
diff --git a/api_docs/observability.json b/api_docs/observability.json
index fc645dd7e2e6b..f59cf6407de75 100644
--- a/api_docs/observability.json
+++ b/api_docs/observability.json
@@ -145,7 +145,11 @@
             "section": "def-public.AlertTypeModel",
             "text": "AlertTypeModel"
           },
-          "<any> & { format: Formatter; }) => void; getFormatter: (typeId: string) => Formatter | undefined; } & { registerFormatter: () => void; }"
+          "<any> & { format: ",
+          "Formatter",
+          "; }) => void; getFormatter: (typeId: string) => ",
+          "Formatter",
+          " | undefined; } & { registerFormatter: () => void; }"
         ],
         "source": {
           "path": "x-pack/plugins/observability/public/rules/observability_rule_type_registry_mock.ts",
@@ -417,7 +421,7 @@
         "signature": [
           "({ children, ...props }: { children?: React.ReactNode; } & ",
           "CommonProps",
-          " & Pick<React.HTMLAttributes<HTMLUListElement>, \"children\" | \"onClick\" | \"onChange\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\"> & { bordered?: boolean | undefined; flush?: boolean | undefined; gutterSize?: \"m\" | \"s\" | \"none\" | undefined; listItems?: ",
+          " & Pick<React.HTMLAttributes<HTMLUListElement>, \"children\" | \"onClick\" | \"onChange\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\"> & { bordered?: boolean | undefined; flush?: boolean | undefined; gutterSize?: \"none\" | \"m\" | \"s\" | undefined; listItems?: ",
           "EuiListGroupItemProps",
           "[] | undefined; color?: \"text\" | \"primary\" | \"inherit\" | \"ghost\" | \"subdued\" | undefined; size?: \"m\" | \"s\" | \"l\" | \"xs\" | undefined; maxWidth?: string | number | boolean | undefined; showToolTips?: boolean | undefined; wrapText?: boolean | undefined; ariaLabelledby?: string | undefined; }) => JSX.Element"
         ],
@@ -437,7 +441,7 @@
             "signature": [
               "{ children?: React.ReactNode; } & ",
               "CommonProps",
-              " & Pick<React.HTMLAttributes<HTMLUListElement>, \"children\" | \"onClick\" | \"onChange\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\"> & { bordered?: boolean | undefined; flush?: boolean | undefined; gutterSize?: \"m\" | \"s\" | \"none\" | undefined; listItems?: ",
+              " & Pick<React.HTMLAttributes<HTMLUListElement>, \"children\" | \"onClick\" | \"onChange\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\"> & { bordered?: boolean | undefined; flush?: boolean | undefined; gutterSize?: \"none\" | \"m\" | \"s\" | undefined; listItems?: ",
               "EuiListGroupItemProps",
               "[] | undefined; color?: \"text\" | \"primary\" | \"inherit\" | \"ghost\" | \"subdued\" | undefined; size?: \"m\" | \"s\" | \"l\" | \"xs\" | undefined; maxWidth?: string | number | boolean | undefined; showToolTips?: boolean | undefined; wrapText?: boolean | undefined; ariaLabelledby?: string | undefined; }"
             ],
@@ -573,6 +577,46 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "observability",
+        "id": "def-public.useBreadcrumbs",
+        "type": "Function",
+        "tags": [],
+        "label": "useBreadcrumbs",
+        "description": [],
+        "signature": [
+          "(extraCrumbs: ",
+          "EuiBreadcrumb",
+          "[]) => void"
+        ],
+        "source": {
+          "path": "x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts",
+          "lineNumber": 43
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "observability",
+            "id": "def-public.useBreadcrumbs.$1",
+            "type": "Array",
+            "tags": [],
+            "label": "extraCrumbs",
+            "description": [],
+            "signature": [
+              "EuiBreadcrumb",
+              "[]"
+            ],
+            "source": {
+              "path": "x-pack/plugins/observability/public/hooks/use_breadcrumbs.ts",
+              "lineNumber": 43
+            },
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "observability",
         "id": "def-public.useChartTheme",
@@ -887,7 +931,7 @@
         "label": "useUiTracker",
         "description": [],
         "signature": [
-          "({\n  app: defaultApp,\n}: { app?: \"apm\" | \"fleet\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"synthetics\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined; }) => ({ app, metric, metricType }: ",
+          "({\n  app: defaultApp,\n}: { app?: \"fleet\" | \"apm\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"synthetics\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined; }) => ({ app, metric, metricType }: ",
           {
             "pluginId": "observability",
             "scope": "public",
@@ -924,7 +968,7 @@
                 "label": "app",
                 "description": [],
                 "signature": [
-                  "\"apm\" | \"fleet\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"synthetics\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined"
+                  "\"fleet\" | \"apm\" | \"infra_metrics\" | \"infra_logs\" | \"uptime\" | \"synthetics\" | \"observability-overview\" | \"stack_monitoring\" | \"ux\" | undefined"
                 ],
                 "source": {
                   "path": "x-pack/plugins/observability/public/hooks/use_track_metric.tsx",
@@ -2267,7 +2311,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-          "lineNumber": 73
+          "lineNumber": 82
         },
         "deprecated": false,
         "children": [
@@ -2283,7 +2327,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 74
+              "lineNumber": 83
             },
             "deprecated": false
           },
@@ -2299,7 +2343,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 78
+              "lineNumber": 87
             },
             "deprecated": false
           },
@@ -2316,7 +2360,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 79
+              "lineNumber": 88
             },
             "deprecated": false
           },
@@ -2332,7 +2376,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 80
+              "lineNumber": 89
             },
             "deprecated": false
           },
@@ -2344,11 +2388,11 @@
             "label": "reportType",
             "description": [],
             "signature": [
-              "\"logs\" | \"cpu\" | \"pld\" | \"kpi\" | \"upd\" | \"upp\" | \"svl\" | \"tpt\" | \"mem\" | \"nwk\""
+              "\"logs\" | \"cpu\" | \"pld\" | \"kpi\" | \"cwv\" | \"upd\" | \"upp\" | \"svl\" | \"tpt\" | \"mem\" | \"nwk\""
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 81
+              "lineNumber": 90
             },
             "deprecated": false
           },
@@ -2364,7 +2408,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 82
+              "lineNumber": 91
             },
             "deprecated": false
           },
@@ -2380,7 +2424,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 83
+              "lineNumber": 92
             },
             "deprecated": false
           },
@@ -2396,7 +2440,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/public/components/shared/exploratory_view/types.ts",
-              "lineNumber": 84
+              "lineNumber": 93
             },
             "deprecated": false
           }
@@ -3006,7 +3050,11 @@
             "section": "def-public.AlertTypeModel",
             "text": "AlertTypeModel"
           },
-          "<any> & { format: Formatter; }) => void; getFormatter: (typeId: string) => Formatter | undefined; }"
+          "<any> & { format: ",
+          "Formatter",
+          "; }) => void; getFormatter: (typeId: string) => ",
+          "Formatter",
+          " | undefined; }"
         ],
         "source": {
           "path": "x-pack/plugins/observability/public/rules/create_observability_rule_type_registry.ts",
@@ -3046,7 +3094,9 @@
           "DisambiguateSet",
           "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"download\" | \"media\" | \"target\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>)> & ",
           "DisambiguateSet",
-          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"download\" | \"media\" | \"target\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>), \"children\" | \"type\" | \"onChange\" | \"onKeyDown\" | \"title\" | \"id\" | \"name\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"download\" | \"autoFocus\" | \"disabled\" | \"form\" | \"formAction\" | \"formEncType\" | \"formMethod\" | \"formNoValidate\" | \"formTarget\" | \"value\" | \"media\" | \"ping\" | \"hrefLang\" | \"referrerPolicy\"> & { size?: \"m\" | \"s\" | \"l\" | \"xs\" | undefined; color?: \"text\" | \"primary\" | \"inherit\" | \"ghost\" | \"subdued\" | undefined; label: React.ReactNode; isActive?: boolean | undefined; isDisabled?: boolean | undefined; href?: string | undefined; target?: string | undefined; rel?: string | undefined; iconType?: string | React.ComponentClass<{}, any> | React.FunctionComponent<{}> | undefined; icon?: React.ReactElement<any, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined; showToolTip?: boolean | undefined; extraAction?: ({ type?: \"reset\" | \"button\" | \"submit\" | undefined; } & ",
+          "<Pick<React.AnchorHTMLAttributes<HTMLAnchorElement>, \"children\" | \"type\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"title\" | \"id\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"download\" | \"media\" | \"target\" | \"ping\" | \"hrefLang\" | \"rel\" | \"referrerPolicy\">, React.ButtonHTMLAttributes<HTMLButtonElement>> & React.ButtonHTMLAttributes<HTMLButtonElement>), \"children\" | \"type\" | \"onChange\" | \"onKeyDown\" | \"title\" | \"id\" | \"name\" | \"defaultChecked\" | \"defaultValue\" | \"suppressContentEditableWarning\" | \"suppressHydrationWarning\" | \"accessKey\" | \"className\" | \"contentEditable\" | \"contextMenu\" | \"dir\" | \"draggable\" | \"hidden\" | \"lang\" | \"placeholder\" | \"slot\" | \"spellCheck\" | \"style\" | \"tabIndex\" | \"translate\" | \"radioGroup\" | \"role\" | \"about\" | \"datatype\" | \"inlist\" | \"prefix\" | \"property\" | \"resource\" | \"typeof\" | \"vocab\" | \"autoCapitalize\" | \"autoCorrect\" | \"autoSave\" | \"itemProp\" | \"itemScope\" | \"itemType\" | \"itemID\" | \"itemRef\" | \"results\" | \"security\" | \"unselectable\" | \"inputMode\" | \"is\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"download\" | \"autoFocus\" | \"disabled\" | \"form\" | \"formAction\" | \"formEncType\" | \"formMethod\" | \"formNoValidate\" | \"formTarget\" | \"value\" | \"media\" | \"ping\" | \"hrefLang\" | \"referrerPolicy\"> & { size?: \"m\" | \"s\" | \"l\" | \"xs\" | undefined; color?: \"text\" | \"primary\" | \"inherit\" | \"ghost\" | \"subdued\" | undefined; label: React.ReactNode; isActive?: boolean | undefined; isDisabled?: boolean | undefined; href?: string | undefined; target?: string | undefined; rel?: string | undefined; iconType?: string | React.ComponentClass<{}, any> | React.FunctionComponent<{}> | undefined; iconProps?: Pick<",
+          "EuiIconProps",
+          ", \"string\" | \"children\" | \"from\" | \"origin\" | \"onClick\" | \"onChange\" | \"color\" | \"onKeyDown\" | \"y\" | \"d\" | \"x\" | \"title\" | \"id\" | \"operator\" | \"name\" | \"version\" | \"filter\" | \"size\" | \"format\" | \"order\" | \"className\" | \"lang\" | \"style\" | \"tabIndex\" | \"role\" | \"aria-activedescendant\" | \"aria-atomic\" | \"aria-autocomplete\" | \"aria-busy\" | \"aria-checked\" | \"aria-colcount\" | \"aria-colindex\" | \"aria-colspan\" | \"aria-controls\" | \"aria-current\" | \"aria-describedby\" | \"aria-details\" | \"aria-disabled\" | \"aria-dropeffect\" | \"aria-errormessage\" | \"aria-expanded\" | \"aria-flowto\" | \"aria-grabbed\" | \"aria-haspopup\" | \"aria-hidden\" | \"aria-invalid\" | \"aria-keyshortcuts\" | \"aria-label\" | \"aria-labelledby\" | \"aria-level\" | \"aria-live\" | \"aria-modal\" | \"aria-multiline\" | \"aria-multiselectable\" | \"aria-orientation\" | \"aria-owns\" | \"aria-placeholder\" | \"aria-posinset\" | \"aria-pressed\" | \"aria-readonly\" | \"aria-relevant\" | \"aria-required\" | \"aria-roledescription\" | \"aria-rowcount\" | \"aria-rowindex\" | \"aria-rowspan\" | \"aria-selected\" | \"aria-setsize\" | \"aria-sort\" | \"aria-valuemax\" | \"aria-valuemin\" | \"aria-valuenow\" | \"aria-valuetext\" | \"dangerouslySetInnerHTML\" | \"onCopy\" | \"onCopyCapture\" | \"onCut\" | \"onCutCapture\" | \"onPaste\" | \"onPasteCapture\" | \"onCompositionEnd\" | \"onCompositionEndCapture\" | \"onCompositionStart\" | \"onCompositionStartCapture\" | \"onCompositionUpdate\" | \"onCompositionUpdateCapture\" | \"onFocus\" | \"onFocusCapture\" | \"onBlur\" | \"onBlurCapture\" | \"onChangeCapture\" | \"onBeforeInput\" | \"onBeforeInputCapture\" | \"onInput\" | \"onInputCapture\" | \"onReset\" | \"onResetCapture\" | \"onSubmit\" | \"onSubmitCapture\" | \"onInvalid\" | \"onInvalidCapture\" | \"onLoad\" | \"onLoadCapture\" | \"onError\" | \"onErrorCapture\" | \"onKeyDownCapture\" | \"onKeyPress\" | \"onKeyPressCapture\" | \"onKeyUp\" | \"onKeyUpCapture\" | \"onAbort\" | \"onAbortCapture\" | \"onCanPlay\" | \"onCanPlayCapture\" | \"onCanPlayThrough\" | \"onCanPlayThroughCapture\" | \"onDurationChange\" | \"onDurationChangeCapture\" | \"onEmptied\" | \"onEmptiedCapture\" | \"onEncrypted\" | \"onEncryptedCapture\" | \"onEnded\" | \"onEndedCapture\" | \"onLoadedData\" | \"onLoadedDataCapture\" | \"onLoadedMetadata\" | \"onLoadedMetadataCapture\" | \"onLoadStart\" | \"onLoadStartCapture\" | \"onPause\" | \"onPauseCapture\" | \"onPlay\" | \"onPlayCapture\" | \"onPlaying\" | \"onPlayingCapture\" | \"onProgress\" | \"onProgressCapture\" | \"onRateChange\" | \"onRateChangeCapture\" | \"onSeeked\" | \"onSeekedCapture\" | \"onSeeking\" | \"onSeekingCapture\" | \"onStalled\" | \"onStalledCapture\" | \"onSuspend\" | \"onSuspendCapture\" | \"onTimeUpdate\" | \"onTimeUpdateCapture\" | \"onVolumeChange\" | \"onVolumeChangeCapture\" | \"onWaiting\" | \"onWaitingCapture\" | \"onAuxClick\" | \"onAuxClickCapture\" | \"onClickCapture\" | \"onContextMenu\" | \"onContextMenuCapture\" | \"onDoubleClick\" | \"onDoubleClickCapture\" | \"onDrag\" | \"onDragCapture\" | \"onDragEnd\" | \"onDragEndCapture\" | \"onDragEnter\" | \"onDragEnterCapture\" | \"onDragExit\" | \"onDragExitCapture\" | \"onDragLeave\" | \"onDragLeaveCapture\" | \"onDragOver\" | \"onDragOverCapture\" | \"onDragStart\" | \"onDragStartCapture\" | \"onDrop\" | \"onDropCapture\" | \"onMouseDown\" | \"onMouseDownCapture\" | \"onMouseEnter\" | \"onMouseLeave\" | \"onMouseMove\" | \"onMouseMoveCapture\" | \"onMouseOut\" | \"onMouseOutCapture\" | \"onMouseOver\" | \"onMouseOverCapture\" | \"onMouseUp\" | \"onMouseUpCapture\" | \"onSelect\" | \"onSelectCapture\" | \"onTouchCancel\" | \"onTouchCancelCapture\" | \"onTouchEnd\" | \"onTouchEndCapture\" | \"onTouchMove\" | \"onTouchMoveCapture\" | \"onTouchStart\" | \"onTouchStartCapture\" | \"onPointerDown\" | \"onPointerDownCapture\" | \"onPointerMove\" | \"onPointerMoveCapture\" | \"onPointerUp\" | \"onPointerUpCapture\" | \"onPointerCancel\" | \"onPointerCancelCapture\" | \"onPointerEnter\" | \"onPointerEnterCapture\" | \"onPointerLeave\" | \"onPointerLeaveCapture\" | \"onPointerOver\" | \"onPointerOverCapture\" | \"onPointerOut\" | \"onPointerOutCapture\" | \"onGotPointerCapture\" | \"onGotPointerCaptureCapture\" | \"onLostPointerCapture\" | \"onLostPointerCaptureCapture\" | \"onScroll\" | \"onScrollCapture\" | \"onWheel\" | \"onWheelCapture\" | \"onAnimationStart\" | \"onAnimationStartCapture\" | \"onAnimationEnd\" | \"onAnimationEndCapture\" | \"onAnimationIteration\" | \"onAnimationIterationCapture\" | \"onTransitionEnd\" | \"onTransitionEndCapture\" | \"css\" | \"data-test-subj\" | \"scale\" | \"height\" | \"max\" | \"media\" | \"method\" | \"min\" | \"target\" | \"width\" | \"crossOrigin\" | \"accentHeight\" | \"accumulate\" | \"additive\" | \"alignmentBaseline\" | \"allowReorder\" | \"alphabetic\" | \"amplitude\" | \"arabicForm\" | \"ascent\" | \"attributeName\" | \"attributeType\" | \"autoReverse\" | \"azimuth\" | \"baseFrequency\" | \"baselineShift\" | \"baseProfile\" | \"bbox\" | \"begin\" | \"bias\" | \"by\" | \"calcMode\" | \"capHeight\" | \"clip\" | \"clipPath\" | \"clipPathUnits\" | \"clipRule\" | \"colorInterpolation\" | \"colorInterpolationFilters\" | \"colorProfile\" | \"colorRendering\" | \"contentScriptType\" | \"contentStyleType\" | \"cursor\" | \"cx\" | \"cy\" | \"decelerate\" | \"descent\" | \"diffuseConstant\" | \"direction\" | \"display\" | \"divisor\" | \"dominantBaseline\" | \"dur\" | \"dx\" | \"dy\" | \"edgeMode\" | \"elevation\" | \"enableBackground\" | \"end\" | \"exponent\" | \"externalResourcesRequired\" | \"fill\" | \"fillOpacity\" | \"fillRule\" | \"filterRes\" | \"filterUnits\" | \"floodColor\" | \"floodOpacity\" | \"focusable\" | \"fontFamily\" | \"fontSize\" | \"fontSizeAdjust\" | \"fontStretch\" | \"fontStyle\" | \"fontVariant\" | \"fontWeight\" | \"fx\" | \"fy\" | \"g1\" | \"g2\" | \"glyphName\" | \"glyphOrientationHorizontal\" | \"glyphOrientationVertical\" | \"glyphRef\" | \"gradientTransform\" | \"gradientUnits\" | \"hanging\" | \"horizAdvX\" | \"horizOriginX\" | \"href\" | \"ideographic\" | \"imageRendering\" | \"in2\" | \"in\" | \"intercept\" | \"k1\" | \"k2\" | \"k3\" | \"k4\" | \"k\" | \"kernelMatrix\" | \"kernelUnitLength\" | \"kerning\" | \"keyPoints\" | \"keySplines\" | \"keyTimes\" | \"lengthAdjust\" | \"letterSpacing\" | \"lightingColor\" | \"limitingConeAngle\" | \"local\" | \"markerEnd\" | \"markerHeight\" | \"markerMid\" | \"markerStart\" | \"markerUnits\" | \"markerWidth\" | \"mask\" | \"maskContentUnits\" | \"maskUnits\" | \"mathematical\" | \"mode\" | \"numOctaves\" | \"offset\" | \"opacity\" | \"orient\" | \"orientation\" | \"overflow\" | \"overlinePosition\" | \"overlineThickness\" | \"paintOrder\" | \"panose1\" | \"path\" | \"pathLength\" | \"patternContentUnits\" | \"patternTransform\" | \"patternUnits\" | \"pointerEvents\" | \"points\" | \"pointsAtX\" | \"pointsAtY\" | \"pointsAtZ\" | \"preserveAlpha\" | \"preserveAspectRatio\" | \"primitiveUnits\" | \"r\" | \"radius\" | \"refX\" | \"refY\" | \"renderingIntent\" | \"repeatCount\" | \"repeatDur\" | \"requiredExtensions\" | \"requiredFeatures\" | \"restart\" | \"result\" | \"rotate\" | \"rx\" | \"ry\" | \"seed\" | \"shapeRendering\" | \"slope\" | \"spacing\" | \"specularConstant\" | \"specularExponent\" | \"speed\" | \"spreadMethod\" | \"startOffset\" | \"stdDeviation\" | \"stemh\" | \"stemv\" | \"stitchTiles\" | \"stopColor\" | \"stopOpacity\" | \"strikethroughPosition\" | \"strikethroughThickness\" | \"stroke\" | \"strokeDasharray\" | \"strokeDashoffset\" | \"strokeLinecap\" | \"strokeLinejoin\" | \"strokeMiterlimit\" | \"strokeOpacity\" | \"strokeWidth\" | \"surfaceScale\" | \"systemLanguage\" | \"tableValues\" | \"targetX\" | \"targetY\" | \"textAnchor\" | \"textDecoration\" | \"textLength\" | \"textRendering\" | \"to\" | \"transform\" | \"u1\" | \"u2\" | \"underlinePosition\" | \"underlineThickness\" | \"unicode\" | \"unicodeBidi\" | \"unicodeRange\" | \"unitsPerEm\" | \"vAlphabetic\" | \"values\" | \"vectorEffect\" | \"vertAdvY\" | \"vertOriginX\" | \"vertOriginY\" | \"vHanging\" | \"vIdeographic\" | \"viewBox\" | \"viewTarget\" | \"visibility\" | \"vMathematical\" | \"widths\" | \"wordSpacing\" | \"writingMode\" | \"x1\" | \"x2\" | \"xChannelSelector\" | \"xHeight\" | \"xlinkActuate\" | \"xlinkArcrole\" | \"xlinkHref\" | \"xlinkRole\" | \"xlinkShow\" | \"xlinkTitle\" | \"xlinkType\" | \"xmlBase\" | \"xmlLang\" | \"xmlns\" | \"xmlnsXlink\" | \"xmlSpace\" | \"y1\" | \"y2\" | \"yChannelSelector\" | \"z\" | \"zoomAndPan\" | \"titleId\" | \"onIconLoad\"> | undefined; icon?: React.ReactElement<any, string | ((props: any) => React.ReactElement<any, string | any | (new (props: any) => React.Component<any, any, any>)> | null) | (new (props: any) => React.Component<any, any, any>)> | undefined; showToolTip?: boolean | undefined; extraAction?: ({ type?: \"reset\" | \"button\" | \"submit\" | undefined; } & ",
           "EuiButtonIconProps",
           " & { onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void) | undefined; } & React.ButtonHTMLAttributes<HTMLButtonElement> & { buttonRef?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined; } & { alwaysShow?: boolean | undefined; }) | undefined; onClick?: ((event: React.MouseEvent<HTMLButtonElement, MouseEvent>) => void) | undefined; wrapText?: boolean | undefined; buttonRef?: ((instance: HTMLButtonElement | null) => void) | React.RefObject<HTMLButtonElement> | null | undefined; }"
         ],
@@ -3142,7 +3192,11 @@
           "section": "def-public.AlertTypeModel",
           "text": "AlertTypeModel"
         },
-        "<any> & { format: Formatter; }) => void; getFormatter: (typeId: string) => Formatter | undefined; }; isAlertingExperienceEnabled: () => boolean; navigation: { registerSections: (sections$: ",
+        "<any> & { format: ",
+        "Formatter",
+        "; }) => void; getFormatter: (typeId: string) => ",
+        "Formatter",
+        " | undefined; }; isAlertingExperienceEnabled: () => boolean; navigation: { registerSections: (sections$: ",
         "Observable",
         "<",
         "NavigationSection",
@@ -3328,46 +3382,50 @@
                 "description": [],
                 "signature": [
                   "(",
-                  "TypeMapping",
+                  "MappingTypeMapping",
                   " & { all_field?: ",
-                  "AllField",
-                  " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
-                  "DynamicTemplate",
+                  "MappingAllField",
+                  " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"true\" | \"false\" | \"runtime\" | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
+                  "MappingDynamicTemplate",
                   "> | Record<string, ",
-                  "DynamicTemplate",
+                  "MappingDynamicTemplate",
                   ">[] | undefined; field_names_field?: ",
-                  "FieldNamesField",
+                  "MappingFieldNamesField",
                   " | undefined; index_field?: ",
-                  "IndexField",
+                  "MappingIndexField",
                   " | undefined; meta?: Record<string, any> | undefined; numeric_detection?: boolean | undefined; properties?: Record<string, ",
-                  "PropertyBase",
+                  "MappingProperty",
                   "> | undefined; routing_field?: ",
-                  "RoutingField",
+                  "MappingRoutingField",
                   " | undefined; size_field?: ",
-                  "SizeField",
+                  "MappingSizeField",
                   " | undefined; source_field?: ",
-                  "SourceField",
-                  " | undefined; }) | (Record<string, ",
-                  "TypeMapping",
+                  "MappingSourceField",
+                  " | undefined; runtime?: Record<string, ",
+                  "MappingRuntimeField",
+                  "> | undefined; }) | (Record<string, ",
+                  "MappingTypeMapping",
                   "> & { all_field?: ",
-                  "AllField",
-                  " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
-                  "DynamicTemplate",
+                  "MappingAllField",
+                  " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"true\" | \"false\" | \"runtime\" | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
+                  "MappingDynamicTemplate",
                   "> | Record<string, ",
-                  "DynamicTemplate",
+                  "MappingDynamicTemplate",
                   ">[] | undefined; field_names_field?: ",
-                  "FieldNamesField",
+                  "MappingFieldNamesField",
                   " | undefined; index_field?: ",
-                  "IndexField",
+                  "MappingIndexField",
                   " | undefined; meta?: Record<string, any> | undefined; numeric_detection?: boolean | undefined; properties?: Record<string, ",
-                  "PropertyBase",
+                  "MappingProperty",
                   "> | undefined; routing_field?: ",
-                  "RoutingField",
+                  "MappingRoutingField",
                   " | undefined; size_field?: ",
-                  "SizeField",
+                  "MappingSizeField",
                   " | undefined; source_field?: ",
-                  "SourceField",
-                  " | undefined; })"
+                  "MappingSourceField",
+                  " | undefined; runtime?: Record<string, ",
+                  "MappingRuntimeField",
+                  "> | undefined; })"
                 ],
                 "source": {
                   "path": "x-pack/plugins/observability/server/utils/create_or_update_index.ts",
@@ -3385,7 +3443,7 @@
                 "signature": [
                   "Pick<",
                   "KibanaClient",
-                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+                  ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
                   "TransportRequestParams",
                   ", options?: ",
                   "TransportRequestOptions",
@@ -3432,12 +3490,12 @@
         "description": [],
         "signature": [
           "(kql: string | undefined) => ",
-          "QueryContainer",
+          "QueryDslQueryContainer",
           "[]"
         ],
         "source": {
           "path": "x-pack/plugins/observability/server/utils/queries.ts",
-          "lineNumber": 35
+          "lineNumber": 39
         },
         "deprecated": false,
         "children": [
@@ -3453,7 +3511,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/server/utils/queries.ts",
-              "lineNumber": 35
+              "lineNumber": 39
             },
             "deprecated": false,
             "isRequired": false
@@ -3471,7 +3529,7 @@
         "description": [],
         "signature": [
           "(start: number | undefined, end: number | undefined, field: string) => ",
-          "QueryContainer",
+          "QueryDslQueryContainer",
           "[]"
         ],
         "source": {
@@ -3492,7 +3550,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/server/utils/queries.ts",
-              "lineNumber": 21
+              "lineNumber": 22
             },
             "deprecated": false,
             "isRequired": false
@@ -3509,7 +3567,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/server/utils/queries.ts",
-              "lineNumber": 21
+              "lineNumber": 23
             },
             "deprecated": false,
             "isRequired": false
@@ -3526,7 +3584,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/observability/server/utils/queries.ts",
-              "lineNumber": 21
+              "lineNumber": 24
             },
             "deprecated": false,
             "isRequired": true
@@ -3799,46 +3857,50 @@
         "description": [],
         "signature": [
           "(",
-          "TypeMapping",
+          "MappingTypeMapping",
           " & { all_field?: ",
-          "AllField",
-          " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
-          "DynamicTemplate",
+          "MappingAllField",
+          " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"true\" | \"false\" | \"runtime\" | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
+          "MappingDynamicTemplate",
           "> | Record<string, ",
-          "DynamicTemplate",
+          "MappingDynamicTemplate",
           ">[] | undefined; field_names_field?: ",
-          "FieldNamesField",
+          "MappingFieldNamesField",
           " | undefined; index_field?: ",
-          "IndexField",
+          "MappingIndexField",
           " | undefined; meta?: Record<string, any> | undefined; numeric_detection?: boolean | undefined; properties?: Record<string, ",
-          "PropertyBase",
+          "MappingProperty",
           "> | undefined; routing_field?: ",
-          "RoutingField",
+          "MappingRoutingField",
           " | undefined; size_field?: ",
-          "SizeField",
+          "MappingSizeField",
           " | undefined; source_field?: ",
-          "SourceField",
-          " | undefined; }) | (Record<string, ",
-          "TypeMapping",
+          "MappingSourceField",
+          " | undefined; runtime?: Record<string, ",
+          "MappingRuntimeField",
+          "> | undefined; }) | (Record<string, ",
+          "MappingTypeMapping",
           "> & { all_field?: ",
-          "AllField",
-          " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
-          "DynamicTemplate",
+          "MappingAllField",
+          " | undefined; date_detection?: boolean | undefined; dynamic?: boolean | \"true\" | \"false\" | \"runtime\" | \"strict\" | undefined; dynamic_date_formats?: string[] | undefined; dynamic_templates?: Record<string, ",
+          "MappingDynamicTemplate",
           "> | Record<string, ",
-          "DynamicTemplate",
+          "MappingDynamicTemplate",
           ">[] | undefined; field_names_field?: ",
-          "FieldNamesField",
+          "MappingFieldNamesField",
           " | undefined; index_field?: ",
-          "IndexField",
+          "MappingIndexField",
           " | undefined; meta?: Record<string, any> | undefined; numeric_detection?: boolean | undefined; properties?: Record<string, ",
-          "PropertyBase",
+          "MappingProperty",
           "> | undefined; routing_field?: ",
-          "RoutingField",
+          "MappingRoutingField",
           " | undefined; size_field?: ",
-          "SizeField",
+          "MappingSizeField",
           " | undefined; source_field?: ",
-          "SourceField",
-          " | undefined; })"
+          "MappingSourceField",
+          " | undefined; runtime?: Record<string, ",
+          "MappingRuntimeField",
+          "> | undefined; })"
         ],
         "source": {
           "path": "x-pack/plugins/observability/server/utils/create_or_update_index.ts",
diff --git a/api_docs/rule_registry.json b/api_docs/rule_registry.json
index cd1f4994c1da6..f114f1bf22751 100644
--- a/api_docs/rule_registry.json
+++ b/api_docs/rule_registry.json
@@ -342,6 +342,115 @@
         "returnComment": [],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "ruleRegistry",
+        "id": "def-server.createPersistenceRuleTypeFactory",
+        "type": "Function",
+        "tags": [],
+        "label": "createPersistenceRuleTypeFactory",
+        "description": [],
+        "signature": [
+          "({ logger, ruleDataClient, }: { ruleDataClient: ",
+          {
+            "pluginId": "ruleRegistry",
+            "scope": "server",
+            "docId": "kibRuleRegistryPluginApi",
+            "section": "def-server.RuleDataClient",
+            "text": "RuleDataClient"
+          },
+          "; logger: ",
+          "Logger",
+          "; }) => <TParams extends Record<string, unknown>, TAlertInstanceContext extends { [x: string]: unknown; }, TServices extends { alertWithPersistence: PersistenceAlertService<TAlertInstanceContext>; findAlerts: PersistenceAlertQueryService; }>(type: ",
+          "AlertTypeWithExecutor",
+          "<TParams, TAlertInstanceContext, TServices>) => { executor: (options: ",
+          {
+            "pluginId": "alerting",
+            "scope": "server",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-server.AlertExecutorOptions",
+            "text": "AlertExecutorOptions"
+          },
+          "<TParams, Record<string, unknown>, { [x: string]: unknown; }, TAlertInstanceContext, never> & { services: any; }) => Promise<any>; id: string; name: string; validate?: { params?: ",
+          "AlertTypeParamsValidator",
+          "<TParams> | undefined; } | undefined; actionGroups: ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.ActionGroup",
+            "text": "ActionGroup"
+          },
+          "<string>[]; defaultActionGroupId: string; recoveryActionGroup?: ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.ActionGroup",
+            "text": "ActionGroup"
+          },
+          "<string> | undefined; producer: string; actionVariables?: { context?: ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.ActionVariable",
+            "text": "ActionVariable"
+          },
+          "[] | undefined; state?: ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.ActionVariable",
+            "text": "ActionVariable"
+          },
+          "[] | undefined; params?: ",
+          {
+            "pluginId": "alerting",
+            "scope": "common",
+            "docId": "kibAlertingPluginApi",
+            "section": "def-common.ActionVariable",
+            "text": "ActionVariable"
+          },
+          "[] | undefined; } | undefined; minimumLicenseRequired: \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\"; }"
+        ],
+        "source": {
+          "path": "x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_factory.ts",
+          "lineNumber": 42
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "ruleRegistry",
+            "id": "def-server.createPersistenceRuleTypeFactory.$1",
+            "type": "Object",
+            "tags": [],
+            "label": "{\n  logger,\n  ruleDataClient,\n}",
+            "description": [],
+            "signature": [
+              "{ ruleDataClient: ",
+              {
+                "pluginId": "ruleRegistry",
+                "scope": "server",
+                "docId": "kibRuleRegistryPluginApi",
+                "section": "def-server.RuleDataClient",
+                "text": "RuleDataClient"
+              },
+              "; logger: ",
+              "Logger",
+              "; }"
+            ],
+            "source": {
+              "path": "x-pack/plugins/rule_registry/server/utils/create_persistence_rule_type_factory.ts",
+              "lineNumber": 42
+            },
+            "deprecated": false,
+            "isRequired": true
+          }
+        ],
+        "returnComment": [],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "ruleRegistry",
         "id": "def-server.getRuleExecutorData",
@@ -784,7 +893,7 @@
         "signature": [
           "(input: unknown) => OutputOf<",
           "Optional",
-          "<{ readonly \"kibana.rac.alert.producer\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.uuid\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.id\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.start\": { readonly type: \"date\"; }; readonly \"kibana.rac.alert.end\": { readonly type: \"date\"; }; readonly \"kibana.rac.alert.duration.us\": { readonly type: \"long\"; }; readonly \"kibana.rac.alert.severity.level\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.severity.value\": { readonly type: \"long\"; }; readonly \"kibana.rac.alert.status\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; }; readonly \"kibana.rac.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; }; readonly '@timestamp': { readonly type: \"date\"; readonly array: false; readonly required: true; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly 'event.kind': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'event.action': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.uuid': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.id': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.name': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.category': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; }, \"tags\" | \"kibana.rac.alert.uuid\" | \"event.kind\" | \"event.action\" | \"rule.uuid\" | \"rule.id\" | \"rule.name\" | \"rule.category\" | \"kibana.rac.alert.producer\" | \"kibana.rac.alert.id\" | \"kibana.rac.alert.start\" | \"kibana.rac.alert.end\" | \"kibana.rac.alert.duration.us\" | \"kibana.rac.alert.severity.level\" | \"kibana.rac.alert.severity.value\" | \"kibana.rac.alert.status\" | \"kibana.rac.alert.evaluation.threshold\" | \"kibana.rac.alert.evaluation.value\">>"
+          "<{ readonly \"kibana.rac.alert.producer\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.uuid\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.id\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.start\": { readonly type: \"date\"; }; readonly \"kibana.rac.alert.end\": { readonly type: \"date\"; }; readonly \"kibana.rac.alert.duration.us\": { readonly type: \"long\"; }; readonly \"kibana.rac.alert.severity.level\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.severity.value\": { readonly type: \"long\"; }; readonly \"kibana.rac.alert.status\": { readonly type: \"keyword\"; }; readonly \"kibana.rac.alert.evaluation.threshold\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; }; readonly \"kibana.rac.alert.evaluation.value\": { readonly type: \"scaled_float\"; readonly scaling_factor: 100; }; readonly tags: { readonly type: \"keyword\"; readonly array: true; readonly required: false; }; readonly '@timestamp': { readonly type: \"date\"; readonly array: false; readonly required: true; }; readonly 'event.kind': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'event.action': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.uuid': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.id': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.name': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; readonly 'rule.category': { readonly type: \"keyword\"; readonly array: false; readonly required: false; }; }, \"tags\" | \"kibana.rac.alert.uuid\" | \"event.kind\" | \"event.action\" | \"rule.uuid\" | \"rule.id\" | \"rule.name\" | \"rule.category\" | \"kibana.rac.alert.producer\" | \"kibana.rac.alert.id\" | \"kibana.rac.alert.start\" | \"kibana.rac.alert.end\" | \"kibana.rac.alert.duration.us\" | \"kibana.rac.alert.severity.level\" | \"kibana.rac.alert.severity.value\" | \"kibana.rac.alert.status\" | \"kibana.rac.alert.evaluation.threshold\" | \"kibana.rac.alert.evaluation.value\">>"
         ],
         "source": {
           "path": "x-pack/plugins/rule_registry/common/parse_technical_fields.ts",
diff --git a/api_docs/saved_objects.json b/api_docs/saved_objects.json
index 48579ca8e589e..6af18c749db67 100644
--- a/api_docs/saved_objects.json
+++ b/api_docs/saved_objects.json
@@ -781,15 +781,15 @@
           {
             "plugin": "dashboard",
             "link": {
-              "path": "src/plugins/dashboard/public/application/types.ts",
-              "lineNumber": 25
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 33
             }
           },
           {
             "plugin": "dashboard",
             "link": {
-              "path": "src/plugins/dashboard/public/application/types.ts",
-              "lineNumber": 74
+              "path": "src/plugins/dashboard/public/types.ts",
+              "lineNumber": 186
             }
           },
           {
@@ -803,7 +803,7 @@
             "plugin": "dashboard",
             "link": {
               "path": "src/plugins/dashboard/public/plugin.tsx",
-              "lineNumber": 126
+              "lineNumber": 127
             }
           },
           {
@@ -1383,20 +1383,20 @@
             "plugin": "embeddable",
             "link": {
               "path": "src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx",
-              "lineNumber": 167
+              "lineNumber": 165
             }
           },
           {
             "plugin": "discover",
             "link": {
-              "path": "src/plugins/discover/public/application/components/top_nav/on_save_search.tsx",
+              "path": "src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx",
               "lineNumber": 11
             }
           },
           {
             "plugin": "discover",
             "link": {
-              "path": "src/plugins/discover/public/application/components/top_nav/on_save_search.tsx",
+              "path": "src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx",
               "lineNumber": 133
             }
           },
@@ -2670,42 +2670,42 @@
             "plugin": "dashboard",
             "link": {
               "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-              "lineNumber": 18
+              "lineNumber": 19
             }
           },
           {
             "plugin": "dashboard",
             "link": {
-              "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx",
-              "lineNumber": 14
+              "path": "src/plugins/dashboard/public/application/lib/dashboard_tagging.ts",
+              "lineNumber": 10
             }
           },
           {
             "plugin": "dashboard",
             "link": {
-              "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx",
-              "lineNumber": 98
+              "path": "src/plugins/dashboard/public/application/lib/dashboard_tagging.ts",
+              "lineNumber": 15
             }
           },
           {
             "plugin": "dashboard",
             "link": {
               "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx",
-              "lineNumber": 126
+              "lineNumber": 14
             }
           },
           {
             "plugin": "dashboard",
             "link": {
-              "path": "src/plugins/dashboard/public/application/hooks/use_dashboard_state_manager.ts",
-              "lineNumber": 23
+              "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx",
+              "lineNumber": 98
             }
           },
           {
             "plugin": "dashboard",
             "link": {
-              "path": "src/plugins/dashboard/public/application/hooks/use_dashboard_state_manager.ts",
-              "lineNumber": 35
+              "path": "src/plugins/dashboard/public/application/actions/clone_panel_action.tsx",
+              "lineNumber": 126
             }
           },
           {
@@ -4337,7 +4337,7 @@
               "plugin": "dashboard",
               "link": {
                 "path": "src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts",
-                "lineNumber": 41
+                "lineNumber": 42
               }
             }
           ]
@@ -4364,14 +4364,14 @@
               "plugin": "dashboard",
               "link": {
                 "path": "src/plugins/dashboard/public/application/listing/dashboard_listing.tsx",
-                "lineNumber": 87
+                "lineNumber": 92
               }
             },
             {
               "plugin": "dashboard",
               "link": {
                 "path": "src/plugins/dashboard/public/application/listing/dashboard_listing.tsx",
-                "lineNumber": 172
+                "lineNumber": 177
               }
             },
             {
diff --git a/api_docs/saved_objects_management.json b/api_docs/saved_objects_management.json
index 5d95b713715fa..8e8e7850261a3 100644
--- a/api_docs/saved_objects_management.json
+++ b/api_docs/saved_objects_management.json
@@ -987,7 +987,7 @@
             "label": "euiColumn",
             "description": [],
             "signature": [
-              "{ children?: React.ReactNode; headers?: string | undefined; onClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onChange?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; color?: string | undefined; onKeyDown?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; description?: string | undefined; title?: string | undefined; id?: string | undefined; name: React.ReactNode; field: string; defaultChecked?: boolean | undefined; defaultValue?: string | number | string[] | undefined; suppressContentEditableWarning?: boolean | undefined; suppressHydrationWarning?: boolean | undefined; accessKey?: string | undefined; className?: string | undefined; contentEditable?: boolean | \"true\" | \"false\" | \"inherit\" | undefined; contextMenu?: string | undefined; dir?: string | undefined; draggable?: boolean | \"true\" | \"false\" | undefined; hidden?: boolean | undefined; lang?: string | undefined; placeholder?: string | undefined; slot?: string | undefined; spellCheck?: boolean | \"true\" | \"false\" | undefined; style?: React.CSSProperties | undefined; tabIndex?: number | undefined; translate?: \"yes\" | \"no\" | undefined; radioGroup?: string | undefined; role?: string | undefined; about?: string | undefined; datatype?: string | undefined; inlist?: any; prefix?: string | undefined; property?: string | undefined; resource?: string | undefined; typeof?: string | undefined; vocab?: string | undefined; autoCapitalize?: string | undefined; autoCorrect?: string | undefined; autoSave?: string | undefined; itemProp?: string | undefined; itemScope?: boolean | undefined; itemType?: string | undefined; itemID?: string | undefined; itemRef?: string | undefined; results?: number | undefined; security?: string | undefined; unselectable?: \"on\" | \"off\" | undefined; inputMode?: \"text\" | \"none\" | \"search\" | \"email\" | \"tel\" | \"url\" | \"numeric\" | \"decimal\" | undefined; is?: string | undefined; 'aria-activedescendant'?: string | undefined; 'aria-atomic'?: boolean | \"true\" | \"false\" | undefined; 'aria-autocomplete'?: \"none\" | \"list\" | \"inline\" | \"both\" | undefined; 'aria-busy'?: boolean | \"true\" | \"false\" | undefined; 'aria-checked'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-colcount'?: number | undefined; 'aria-colindex'?: number | undefined; 'aria-colspan'?: number | undefined; 'aria-controls'?: string | undefined; 'aria-current'?: boolean | \"date\" | \"location\" | \"page\" | \"true\" | \"false\" | \"step\" | \"time\" | undefined; 'aria-describedby'?: string | undefined; 'aria-details'?: string | undefined; 'aria-disabled'?: boolean | \"true\" | \"false\" | undefined; 'aria-dropeffect'?: \"none\" | \"copy\" | \"link\" | \"execute\" | \"move\" | \"popup\" | undefined; 'aria-errormessage'?: string | undefined; 'aria-expanded'?: boolean | \"true\" | \"false\" | undefined; 'aria-flowto'?: string | undefined; 'aria-grabbed'?: boolean | \"true\" | \"false\" | undefined; 'aria-haspopup'?: boolean | \"grid\" | \"menu\" | \"true\" | \"false\" | \"listbox\" | \"tree\" | \"dialog\" | undefined; 'aria-hidden'?: boolean | \"true\" | \"false\" | undefined; 'aria-invalid'?: boolean | \"true\" | \"false\" | \"grammar\" | \"spelling\" | undefined; 'aria-keyshortcuts'?: string | undefined; 'aria-label'?: string | undefined; 'aria-labelledby'?: string | undefined; 'aria-level'?: number | undefined; 'aria-live'?: \"off\" | \"assertive\" | \"polite\" | undefined; 'aria-modal'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiline'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiselectable'?: boolean | \"true\" | \"false\" | undefined; 'aria-orientation'?: \"horizontal\" | \"vertical\" | undefined; 'aria-owns'?: string | undefined; 'aria-placeholder'?: string | undefined; 'aria-posinset'?: number | undefined; 'aria-pressed'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-readonly'?: boolean | \"true\" | \"false\" | undefined; 'aria-relevant'?: \"text\" | \"additions\" | \"additions text\" | \"all\" | \"removals\" | undefined; 'aria-required'?: boolean | \"true\" | \"false\" | undefined; 'aria-roledescription'?: string | undefined; 'aria-rowcount'?: number | undefined; 'aria-rowindex'?: number | undefined; 'aria-rowspan'?: number | undefined; 'aria-selected'?: boolean | \"true\" | \"false\" | undefined; 'aria-setsize'?: number | undefined; 'aria-sort'?: \"none\" | \"ascending\" | \"descending\" | \"other\" | undefined; 'aria-valuemax'?: number | undefined; 'aria-valuemin'?: number | undefined; 'aria-valuenow'?: number | undefined; 'aria-valuetext'?: string | undefined; dangerouslySetInnerHTML?: { __html: string; } | undefined; onCopy?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCopyCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCut?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCutCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPaste?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPasteCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEnd?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEndCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStart?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStartCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdate?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdateCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onFocus?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onFocusCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlur?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlurCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onChangeCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onReset?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onResetCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmit?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmitCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalid?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalidCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onLoad?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onError?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onErrorCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onKeyDownCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPress?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPressCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUp?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUpCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onAbort?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAbortCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThrough?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThroughCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptied?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptiedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncrypted?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncryptedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEnded?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEndedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedData?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedDataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadata?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStart?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStartCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPause?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPauseCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlaying?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgress?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgressCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeked?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeking?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalled?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalledCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspend?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspendCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdate?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdateCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaiting?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaitingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAuxClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onAuxClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenu?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenuCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDrag?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnd?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEndCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnter?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnterCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExit?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExitCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeave?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeaveCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOver?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOverCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStart?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStartCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDrop?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDropCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onMouseDown?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseDownCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseEnter?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseLeave?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMove?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMoveCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOut?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOutCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOver?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOverCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUp?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUpCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onSelect?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSelectCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTouchCancel?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchCancelCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEnd?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEndCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMove?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMoveCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStart?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStartCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDown?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDownCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMove?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMoveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUp?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUpCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancel?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancelCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnter?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnterCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeave?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeaveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOver?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOverCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOut?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOutCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onScroll?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onScrollCapture?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onWheel?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onWheelCapture?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStart?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStartCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEnd?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEndCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIteration?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIterationCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEnd?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEndCapture?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; css?: ",
+              "{ children?: React.ReactNode; headers?: string | undefined; onClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onChange?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; color?: string | undefined; onKeyDown?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; description?: string | undefined; title?: string | undefined; id?: string | undefined; name: React.ReactNode; field: string; defaultChecked?: boolean | undefined; defaultValue?: string | number | string[] | undefined; suppressContentEditableWarning?: boolean | undefined; suppressHydrationWarning?: boolean | undefined; accessKey?: string | undefined; className?: string | undefined; contentEditable?: boolean | \"true\" | \"false\" | \"inherit\" | undefined; contextMenu?: string | undefined; dir?: string | undefined; draggable?: boolean | \"true\" | \"false\" | undefined; hidden?: boolean | undefined; lang?: string | undefined; placeholder?: string | undefined; slot?: string | undefined; spellCheck?: boolean | \"true\" | \"false\" | undefined; style?: React.CSSProperties | undefined; tabIndex?: number | undefined; translate?: \"yes\" | \"no\" | undefined; radioGroup?: string | undefined; role?: string | undefined; about?: string | undefined; datatype?: string | undefined; inlist?: any; prefix?: string | undefined; property?: string | undefined; resource?: string | undefined; typeof?: string | undefined; vocab?: string | undefined; autoCapitalize?: string | undefined; autoCorrect?: string | undefined; autoSave?: string | undefined; itemProp?: string | undefined; itemScope?: boolean | undefined; itemType?: string | undefined; itemID?: string | undefined; itemRef?: string | undefined; results?: number | undefined; security?: string | undefined; unselectable?: \"on\" | \"off\" | undefined; inputMode?: \"none\" | \"text\" | \"search\" | \"email\" | \"tel\" | \"url\" | \"numeric\" | \"decimal\" | undefined; is?: string | undefined; 'aria-activedescendant'?: string | undefined; 'aria-atomic'?: boolean | \"true\" | \"false\" | undefined; 'aria-autocomplete'?: \"none\" | \"list\" | \"inline\" | \"both\" | undefined; 'aria-busy'?: boolean | \"true\" | \"false\" | undefined; 'aria-checked'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-colcount'?: number | undefined; 'aria-colindex'?: number | undefined; 'aria-colspan'?: number | undefined; 'aria-controls'?: string | undefined; 'aria-current'?: boolean | \"date\" | \"location\" | \"page\" | \"true\" | \"false\" | \"step\" | \"time\" | undefined; 'aria-describedby'?: string | undefined; 'aria-details'?: string | undefined; 'aria-disabled'?: boolean | \"true\" | \"false\" | undefined; 'aria-dropeffect'?: \"none\" | \"copy\" | \"link\" | \"execute\" | \"move\" | \"popup\" | undefined; 'aria-errormessage'?: string | undefined; 'aria-expanded'?: boolean | \"true\" | \"false\" | undefined; 'aria-flowto'?: string | undefined; 'aria-grabbed'?: boolean | \"true\" | \"false\" | undefined; 'aria-haspopup'?: boolean | \"grid\" | \"menu\" | \"true\" | \"false\" | \"listbox\" | \"tree\" | \"dialog\" | undefined; 'aria-hidden'?: boolean | \"true\" | \"false\" | undefined; 'aria-invalid'?: boolean | \"true\" | \"false\" | \"grammar\" | \"spelling\" | undefined; 'aria-keyshortcuts'?: string | undefined; 'aria-label'?: string | undefined; 'aria-labelledby'?: string | undefined; 'aria-level'?: number | undefined; 'aria-live'?: \"off\" | \"assertive\" | \"polite\" | undefined; 'aria-modal'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiline'?: boolean | \"true\" | \"false\" | undefined; 'aria-multiselectable'?: boolean | \"true\" | \"false\" | undefined; 'aria-orientation'?: \"horizontal\" | \"vertical\" | undefined; 'aria-owns'?: string | undefined; 'aria-placeholder'?: string | undefined; 'aria-posinset'?: number | undefined; 'aria-pressed'?: boolean | \"mixed\" | \"true\" | \"false\" | undefined; 'aria-readonly'?: boolean | \"true\" | \"false\" | undefined; 'aria-relevant'?: \"all\" | \"text\" | \"additions\" | \"additions text\" | \"removals\" | undefined; 'aria-required'?: boolean | \"true\" | \"false\" | undefined; 'aria-roledescription'?: string | undefined; 'aria-rowcount'?: number | undefined; 'aria-rowindex'?: number | undefined; 'aria-rowspan'?: number | undefined; 'aria-selected'?: boolean | \"true\" | \"false\" | undefined; 'aria-setsize'?: number | undefined; 'aria-sort'?: \"none\" | \"ascending\" | \"descending\" | \"other\" | undefined; 'aria-valuemax'?: number | undefined; 'aria-valuemin'?: number | undefined; 'aria-valuenow'?: number | undefined; 'aria-valuetext'?: string | undefined; dangerouslySetInnerHTML?: { __html: string; } | undefined; onCopy?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCopyCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCut?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCutCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPaste?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onPasteCapture?: ((event: React.ClipboardEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEnd?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionEndCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStart?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionStartCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdate?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onCompositionUpdateCapture?: ((event: React.CompositionEvent<HTMLTableDataCellElement>) => void) | undefined; onFocus?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onFocusCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlur?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onBlurCapture?: ((event: React.FocusEvent<HTMLTableDataCellElement>) => void) | undefined; onChangeCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onBeforeInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInput?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInputCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onReset?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onResetCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmit?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onSubmitCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalid?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onInvalidCapture?: ((event: React.FormEvent<HTMLTableDataCellElement>) => void) | undefined; onLoad?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onError?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onErrorCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onKeyDownCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPress?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyPressCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUp?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onKeyUpCapture?: ((event: React.KeyboardEvent<HTMLTableDataCellElement>) => void) | undefined; onAbort?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAbortCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThrough?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onCanPlayThroughCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onDurationChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptied?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEmptiedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncrypted?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEncryptedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEnded?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onEndedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedData?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedDataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadata?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadedMetadataCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStart?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onLoadStartCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPause?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPauseCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlay?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlaying?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onPlayingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgress?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onProgressCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onRateChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeked?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekedCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeeking?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSeekingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalled?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onStalledCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspend?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSuspendCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdate?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTimeUpdateCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChange?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onVolumeChangeCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaiting?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onWaitingCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onAuxClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onAuxClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenu?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onContextMenuCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClick?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDoubleClickCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onDrag?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnd?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEndCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnter?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragEnterCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExit?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragExitCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeave?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragLeaveCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOver?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragOverCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStart?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDragStartCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDrop?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onDropCapture?: ((event: React.DragEvent<HTMLTableDataCellElement>) => void) | undefined; onMouseDown?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseDownCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseEnter?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseLeave?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMove?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseMoveCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOut?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOutCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOver?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseOverCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUp?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onMouseUpCapture?: ((event: React.MouseEvent<HTMLTableDataCellElement, MouseEvent>) => void) | undefined; onSelect?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onSelectCapture?: ((event: React.SyntheticEvent<HTMLTableDataCellElement, Event>) => void) | undefined; onTouchCancel?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchCancelCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEnd?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchEndCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMove?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchMoveCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStart?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onTouchStartCapture?: ((event: React.TouchEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDown?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerDownCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMove?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerMoveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUp?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerUpCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancel?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerCancelCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnter?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerEnterCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeave?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerLeaveCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOver?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOverCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOut?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onPointerOutCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onGotPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onLostPointerCaptureCapture?: ((event: React.PointerEvent<HTMLTableDataCellElement>) => void) | undefined; onScroll?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onScrollCapture?: ((event: React.UIEvent<HTMLTableDataCellElement, UIEvent>) => void) | undefined; onWheel?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onWheelCapture?: ((event: React.WheelEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStart?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationStartCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEnd?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationEndCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIteration?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onAnimationIterationCapture?: ((event: React.AnimationEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEnd?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; onTransitionEndCapture?: ((event: React.TransitionEvent<HTMLTableDataCellElement>) => void) | undefined; css?: ",
               "InterpolationWithTheme",
               "<any>; 'data-test-subj'?: string | undefined; width?: string | undefined; render?: ((value: any, record: ",
               {
@@ -1320,7 +1320,7 @@
             "section": "def-public.SavedObjectsManagementServiceRegistryEntry",
             "text": "SavedObjectsManagementServiceRegistryEntry"
           },
-          " | undefined; register: (entry: ",
+          " | undefined; all: () => ",
           {
             "pluginId": "savedObjectsManagement",
             "scope": "public",
@@ -1328,7 +1328,7 @@
             "section": "def-public.SavedObjectsManagementServiceRegistryEntry",
             "text": "SavedObjectsManagementServiceRegistryEntry"
           },
-          ") => void; all: () => ",
+          "[]; register: (entry: ",
           {
             "pluginId": "savedObjectsManagement",
             "scope": "public",
@@ -1336,7 +1336,7 @@
             "section": "def-public.SavedObjectsManagementServiceRegistryEntry",
             "text": "SavedObjectsManagementServiceRegistryEntry"
           },
-          "[]; }"
+          ") => void; }"
         ],
         "source": {
           "path": "src/plugins/saved_objects_management/public/services/service_registry.ts",
@@ -1448,7 +1448,7 @@
               "section": "def-public.SavedObjectsManagementServiceRegistryEntry",
               "text": "SavedObjectsManagementServiceRegistryEntry"
             },
-            " | undefined; register: (entry: ",
+            " | undefined; all: () => ",
             {
               "pluginId": "savedObjectsManagement",
               "scope": "public",
@@ -1456,7 +1456,7 @@
               "section": "def-public.SavedObjectsManagementServiceRegistryEntry",
               "text": "SavedObjectsManagementServiceRegistryEntry"
             },
-            ") => void; all: () => ",
+            "[]; register: (entry: ",
             {
               "pluginId": "savedObjectsManagement",
               "scope": "public",
@@ -1464,7 +1464,7 @@
               "section": "def-public.SavedObjectsManagementServiceRegistryEntry",
               "text": "SavedObjectsManagementServiceRegistryEntry"
             },
-            "[]; }"
+            ") => void; }"
           ],
           "source": {
             "path": "src/plugins/saved_objects_management/public/plugin.ts",
diff --git a/api_docs/screenshot_mode.json b/api_docs/screenshot_mode.json
index b7d680b6e93b1..22b613bf0b04b 100644
--- a/api_docs/screenshot_mode.json
+++ b/api_docs/screenshot_mode.json
@@ -2,11 +2,83 @@
   "id": "screenshotMode",
   "client": {
     "classes": [],
-    "functions": [],
+    "functions": [
+      {
+        "parentPluginId": "screenshotMode",
+        "id": "def-public.setScreenshotModeEnabled",
+        "type": "Function",
+        "tags": [],
+        "label": "setScreenshotModeEnabled",
+        "description": [
+          "\nUse this function to set the current browser to screenshot mode.\n\nThis function should be called as early as possible to ensure that screenshot mode is\ncorrectly detected for the first page load. It is not suitable for use inside any plugin\ncode unless the plugin code is guaranteed to, somehow, load before any other code.\n\nAdditionally, we don't know what environment this code will run in so we remove as many external\nreferences as possible to make it portable. For instance, running inside puppeteer."
+        ],
+        "signature": [
+          "() => void"
+        ],
+        "source": {
+          "path": "src/plugins/screenshot_mode/common/get_set_browser_screenshot_mode.ts",
+          "lineNumber": 39
+        },
+        "deprecated": false,
+        "children": [],
+        "returnComment": [],
+        "initialIsOpen": false
+      }
+    ],
     "interfaces": [],
     "enums": [],
-    "misc": [],
-    "objects": []
+    "misc": [
+      {
+        "parentPluginId": "screenshotMode",
+        "id": "def-public.KBN_SCREENSHOT_MODE_ENABLED_KEY",
+        "type": "string",
+        "tags": [],
+        "label": "KBN_SCREENSHOT_MODE_ENABLED_KEY",
+        "description": [],
+        "signature": [
+          "\"__KBN_SCREENSHOT_MODE_ENABLED_KEY__\""
+        ],
+        "source": {
+          "path": "src/plugins/screenshot_mode/common/get_set_browser_screenshot_mode.ts",
+          "lineNumber": 13
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "screenshotMode",
+        "id": "def-public.KBN_SCREENSHOT_MODE_HEADER",
+        "type": "string",
+        "tags": [],
+        "label": "KBN_SCREENSHOT_MODE_HEADER",
+        "description": [],
+        "source": {
+          "path": "src/plugins/screenshot_mode/common/constants.ts",
+          "lineNumber": 9
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "screenshotMode",
+      "id": "def-public.ScreenshotModePluginSetup",
+      "type": "Type",
+      "tags": [],
+      "label": "ScreenshotModePluginSetup",
+      "description": [],
+      "signature": [
+        "IScreenshotModeService"
+      ],
+      "source": {
+        "path": "src/plugins/screenshot_mode/public/types.ts",
+        "lineNumber": 17
+      },
+      "deprecated": false,
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    }
   },
   "server": {
     "classes": [],
@@ -86,6 +158,23 @@
     ],
     "enums": [],
     "misc": [
+      {
+        "parentPluginId": "screenshotMode",
+        "id": "def-server.KBN_SCREENSHOT_MODE_ENABLED_KEY",
+        "type": "string",
+        "tags": [],
+        "label": "KBN_SCREENSHOT_MODE_ENABLED_KEY",
+        "description": [],
+        "signature": [
+          "\"__KBN_SCREENSHOT_MODE_ENABLED_KEY__\""
+        ],
+        "source": {
+          "path": "src/plugins/screenshot_mode/common/get_set_browser_screenshot_mode.ts",
+          "lineNumber": 13
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "screenshotMode",
         "id": "def-server.KBN_SCREENSHOT_MODE_HEADER",
@@ -325,6 +414,23 @@
     "interfaces": [],
     "enums": [],
     "misc": [
+      {
+        "parentPluginId": "screenshotMode",
+        "id": "def-common.KBN_SCREENSHOT_MODE_ENABLED_KEY",
+        "type": "string",
+        "tags": [],
+        "label": "KBN_SCREENSHOT_MODE_ENABLED_KEY",
+        "description": [],
+        "signature": [
+          "\"__KBN_SCREENSHOT_MODE_ENABLED_KEY__\""
+        ],
+        "source": {
+          "path": "src/plugins/screenshot_mode/common/get_set_browser_screenshot_mode.ts",
+          "lineNumber": 13
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "screenshotMode",
         "id": "def-common.KBN_SCREENSHOT_MODE_HEADER",
diff --git a/api_docs/screenshot_mode.mdx b/api_docs/screenshot_mode.mdx
index 115a348cbe2e6..cdb70b22b0837 100644
--- a/api_docs/screenshot_mode.mdx
+++ b/api_docs/screenshot_mode.mdx
@@ -11,6 +11,17 @@ warning: This document is auto-generated and is meant to be viewed inside our ex
 
 import screenshotModeObj from './screenshot_mode.json';
 
+## Client
+
+### Setup
+<DocDefinitionList data={[screenshotModeObj.client.setup]}/>
+
+### Functions
+<DocDefinitionList data={screenshotModeObj.client.functions}/>
+
+### Consts, variables and types
+<DocDefinitionList data={screenshotModeObj.client.misc}/>
+
 ## Server
 
 ### Setup
diff --git a/api_docs/security.json b/api_docs/security.json
index 7e28ad2a222bb..f7547221cec66 100644
--- a/api_docs/security.json
+++ b/api_docs/security.json
@@ -14,7 +14,13 @@
           "\nRepresents the currently authenticated user."
         ],
         "signature": [
-          "AuthenticatedUser",
+          {
+            "pluginId": "security",
+            "scope": "common",
+            "docId": "kibSecurityPluginApi",
+            "section": "def-common.AuthenticatedUser",
+            "text": "AuthenticatedUser"
+          },
           " extends ",
           "User"
         ],
@@ -96,6 +102,70 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "security",
+        "id": "def-public.AuthenticationServiceSetup",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuthenticationServiceSetup",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/security/public/authentication/authentication_service.ts",
+          "lineNumber": 33
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-public.AuthenticationServiceSetup.getCurrentUser",
+            "type": "Function",
+            "tags": [],
+            "label": "getCurrentUser",
+            "description": [
+              "\nReturns currently authenticated user and throws if current user isn't authenticated."
+            ],
+            "signature": [
+              "() => Promise<",
+              {
+                "pluginId": "security",
+                "scope": "common",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-common.AuthenticatedUser",
+                "text": "AuthenticatedUser"
+              },
+              ">"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/public/authentication/authentication_service.ts",
+              "lineNumber": 37
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": []
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-public.AuthenticationServiceSetup.areAPIKeysEnabled",
+            "type": "Function",
+            "tags": [],
+            "label": "areAPIKeysEnabled",
+            "description": [
+              "\nDetermines if API Keys are currently enabled."
+            ],
+            "signature": [
+              "() => Promise<boolean>"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/public/authentication/authentication_service.ts",
+              "lineNumber": 42
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": []
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "security",
         "id": "def-public.SecurityLicense",
@@ -408,6 +478,104 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "security",
+        "id": "def-public.SecurityNavControlServiceStart",
+        "type": "Interface",
+        "tags": [],
+        "label": "SecurityNavControlServiceStart",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx",
+          "lineNumber": 32
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-public.SecurityNavControlServiceStart.getUserMenuLinks$",
+            "type": "Function",
+            "tags": [],
+            "label": "getUserMenuLinks$",
+            "description": [
+              "\nReturns an Observable of the array of user menu links (the links that show up under the user's Avatar in the UI) registered by other plugins"
+            ],
+            "signature": [
+              "() => ",
+              "Observable",
+              "<",
+              {
+                "pluginId": "security",
+                "scope": "public",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-public.UserMenuLink",
+                "text": "UserMenuLink"
+              },
+              "[]>"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx",
+              "lineNumber": 36
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": []
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-public.SecurityNavControlServiceStart.addUserMenuLinks",
+            "type": "Function",
+            "tags": [],
+            "label": "addUserMenuLinks",
+            "description": [
+              "\nRegisters the provided user menu links to be displayed in the user menu (the links that show up under the user's Avatar in the UI)."
+            ],
+            "signature": [
+              "(newUserMenuLink: ",
+              {
+                "pluginId": "security",
+                "scope": "public",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-public.UserMenuLink",
+                "text": "UserMenuLink"
+              },
+              "[]) => void"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx",
+              "lineNumber": 41
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "security",
+                "id": "def-public.newUserMenuLink",
+                "type": "Array",
+                "tags": [],
+                "label": "newUserMenuLink",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "security",
+                    "scope": "public",
+                    "docId": "kibSecurityPluginApi",
+                    "section": "def-public.UserMenuLink",
+                    "text": "UserMenuLink"
+                  },
+                  "[]"
+                ],
+                "source": {
+                  "path": "x-pack/plugins/security/public/nav_control/nav_control_service.tsx",
+                  "lineNumber": 41
+                },
+                "deprecated": false
+              }
+            ]
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "security",
         "id": "def-public.UserMenuLink",
@@ -500,55 +668,161 @@
       }
     ],
     "enums": [],
-    "misc": [],
+    "misc": [
+      {
+        "parentPluginId": "security",
+        "id": "def-public.AuthenticationServiceStart",
+        "type": "Type",
+        "tags": [],
+        "label": "AuthenticationServiceStart",
+        "description": [
+          "\nStart has the same contract as Setup for now."
+        ],
+        "signature": [
+          {
+            "pluginId": "security",
+            "scope": "public",
+            "docId": "kibSecurityPluginApi",
+            "section": "def-public.AuthenticationServiceSetup",
+            "text": "AuthenticationServiceSetup"
+          }
+        ],
+        "source": {
+          "path": "x-pack/plugins/security/public/authentication/authentication_service.ts",
+          "lineNumber": 48
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      }
+    ],
     "objects": [],
     "setup": {
       "parentPluginId": "security",
       "id": "def-public.SecurityPluginSetup",
-      "type": "Type",
+      "type": "Interface",
       "tags": [],
       "label": "SecurityPluginSetup",
       "description": [],
-      "signature": [
-        "{ authc: ",
-        "AuthenticationServiceSetup",
-        "; sessionTimeout: ",
-        "SessionTimeout",
-        "; license: Readonly<{ isLicenseAvailable: () => boolean; isEnabled: () => boolean; getType: () => \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined; getFeatures: () => ",
-        "SecurityLicenseFeatures",
-        "; features$: ",
-        "Observable",
-        "<",
-        "SecurityLicenseFeatures",
-        ">; }>; __legacyCompat: { logoutUrl: string; tenant: string; }; }"
-      ],
       "source": {
         "path": "x-pack/plugins/security/public/plugin.tsx",
-        "lineNumber": 164
+        "lineNumber": 167
       },
       "deprecated": false,
+      "children": [
+        {
+          "parentPluginId": "security",
+          "id": "def-public.SecurityPluginSetup.authc",
+          "type": "Object",
+          "tags": [],
+          "label": "authc",
+          "description": [
+            "\nExposes authentication information about the currently logged in user."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "public",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-public.AuthenticationServiceSetup",
+              "text": "AuthenticationServiceSetup"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/public/plugin.tsx",
+            "lineNumber": 171
+          },
+          "deprecated": false
+        },
+        {
+          "parentPluginId": "security",
+          "id": "def-public.SecurityPluginSetup.license",
+          "type": "Object",
+          "tags": [],
+          "label": "license",
+          "description": [
+            "\nExposes information about the available security features under the current license."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "common",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-common.SecurityLicense",
+              "text": "SecurityLicense"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/public/plugin.tsx",
+            "lineNumber": 175
+          },
+          "deprecated": false
+        }
+      ],
       "lifecycle": "setup",
       "initialIsOpen": true
     },
     "start": {
       "parentPluginId": "security",
       "id": "def-public.SecurityPluginStart",
-      "type": "Type",
+      "type": "Interface",
       "tags": [],
       "label": "SecurityPluginStart",
       "description": [],
-      "signature": [
-        "{ navControlService: ",
-        "SecurityNavControlServiceStart",
-        "; authc: ",
-        "AuthenticationServiceSetup",
-        "; }"
-      ],
       "source": {
         "path": "x-pack/plugins/security/public/plugin.tsx",
-        "lineNumber": 165
+        "lineNumber": 178
       },
       "deprecated": false,
+      "children": [
+        {
+          "parentPluginId": "security",
+          "id": "def-public.SecurityPluginStart.navControlService",
+          "type": "Object",
+          "tags": [],
+          "label": "navControlService",
+          "description": [
+            "\nExposes the ability to add custom links to the dropdown menu in the top right, where the user's Avatar is."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "public",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-public.SecurityNavControlServiceStart",
+              "text": "SecurityNavControlServiceStart"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/public/plugin.tsx",
+            "lineNumber": 182
+          },
+          "deprecated": false
+        },
+        {
+          "parentPluginId": "security",
+          "id": "def-public.SecurityPluginStart.authc",
+          "type": "Object",
+          "tags": [],
+          "label": "authc",
+          "description": [
+            "\nExposes authentication information about the currently logged in user."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "public",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-public.AuthenticationServiceSetup",
+              "text": "AuthenticationServiceSetup"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/public/plugin.tsx",
+            "lineNumber": 186
+          },
+          "deprecated": false
+        }
+      ],
       "lifecycle": "start",
       "initialIsOpen": true
     }
@@ -681,6 +955,121 @@
         ],
         "initialIsOpen": false
       },
+      {
+        "parentPluginId": "security",
+        "id": "def-server.AuditServiceSetup",
+        "type": "Interface",
+        "tags": [],
+        "label": "AuditServiceSetup",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/security/server/audit/audit_service.ts",
+          "lineNumber": 40
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-server.AuditServiceSetup.asScoped",
+            "type": "Function",
+            "tags": [],
+            "label": "asScoped",
+            "description": [],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreHttpPluginApi",
+                "section": "def-server.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>) => ",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.AuditLogger",
+                "text": "AuditLogger"
+              }
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/server/audit/audit_service.ts",
+              "lineNumber": 41
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "security",
+                "id": "def-server.request",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreHttpPluginApi",
+                    "section": "def-server.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "source": {
+                  "path": "x-pack/plugins/security/server/audit/audit_service.ts",
+                  "lineNumber": 41
+                },
+                "deprecated": false
+              }
+            ]
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.AuditServiceSetup.getLogger",
+            "type": "Function",
+            "tags": [],
+            "label": "getLogger",
+            "description": [],
+            "signature": [
+              "(id?: string | undefined) => ",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.LegacyAuditLogger",
+                "text": "LegacyAuditLogger"
+              }
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/server/audit/audit_service.ts",
+              "lineNumber": 42
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "security",
+                "id": "def-server.id",
+                "type": "string",
+                "tags": [],
+                "label": "id",
+                "description": [],
+                "signature": [
+                  "string | undefined"
+                ],
+                "source": {
+                  "path": "x-pack/plugins/security/server/audit/audit_service.ts",
+                  "lineNumber": 42
+                },
+                "deprecated": false
+              }
+            ]
+          }
+        ],
+        "initialIsOpen": false
+      },
       {
         "parentPluginId": "security",
         "id": "def-server.AuthenticatedUser",
@@ -691,7 +1080,13 @@
           "\nRepresents the currently authenticated user."
         ],
         "signature": [
-          "AuthenticatedUser",
+          {
+            "pluginId": "security",
+            "scope": "common",
+            "docId": "kibSecurityPluginApi",
+            "section": "def-common.AuthenticatedUser",
+            "text": "AuthenticatedUser"
+          },
           " extends ",
           "User"
         ],
@@ -775,26 +1170,194 @@
       },
       {
         "parentPluginId": "security",
-        "id": "def-server.CheckPrivilegesPayload",
+        "id": "def-server.AuthenticationServiceStart",
         "type": "Interface",
         "tags": [],
-        "label": "CheckPrivilegesPayload",
-        "description": [],
+        "label": "AuthenticationServiceStart",
+        "description": [
+          "\nAuthentication services available on the security plugin's start contract."
+        ],
         "source": {
-          "path": "x-pack/plugins/security/server/authorization/types.ts",
-          "lineNumber": 70
+          "path": "x-pack/plugins/security/server/authentication/authentication_service.ts",
+          "lineNumber": 72
         },
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "security",
-            "id": "def-server.CheckPrivilegesPayload.kibana",
-            "type": "CompoundType",
+            "id": "def-server.AuthenticationServiceStart.apiKeys",
+            "type": "Object",
             "tags": [],
-            "label": "kibana",
+            "label": "apiKeys",
             "description": [],
             "signature": [
-              "string | string[] | undefined"
+              "{ create: (request: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreHttpPluginApi",
+                "section": "def-server.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, params: ",
+              "CreateAPIKeyParams",
+              ") => Promise<",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.CreateAPIKeyResult",
+                "text": "CreateAPIKeyResult"
+              },
+              " | null>; areAPIKeysEnabled: () => Promise<boolean>; invalidate: (request: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreHttpPluginApi",
+                "section": "def-server.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, params: ",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.InvalidateAPIKeysParams",
+                "text": "InvalidateAPIKeysParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.InvalidateAPIKeyResult",
+                "text": "InvalidateAPIKeyResult"
+              },
+              " | null>; grantAsInternalUser: (request: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreHttpPluginApi",
+                "section": "def-server.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>, createParams: ",
+              "CreateAPIKeyParams",
+              ") => Promise<",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.GrantAPIKeyResult",
+                "text": "GrantAPIKeyResult"
+              },
+              " | null>; invalidateAsInternalUser: (params: ",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.InvalidateAPIKeysParams",
+                "text": "InvalidateAPIKeysParams"
+              },
+              ") => Promise<",
+              {
+                "pluginId": "security",
+                "scope": "server",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-server.InvalidateAPIKeyResult",
+                "text": "InvalidateAPIKeyResult"
+              },
+              " | null>; }"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/server/authentication/authentication_service.ts",
+              "lineNumber": 73
+            },
+            "deprecated": false
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-server.AuthenticationServiceStart.getCurrentUser",
+            "type": "Function",
+            "tags": [],
+            "label": "getCurrentUser",
+            "description": [],
+            "signature": [
+              "(request: ",
+              {
+                "pluginId": "core",
+                "scope": "server",
+                "docId": "kibCoreHttpPluginApi",
+                "section": "def-server.KibanaRequest",
+                "text": "KibanaRequest"
+              },
+              "<unknown, unknown, unknown, any>) => ",
+              {
+                "pluginId": "security",
+                "scope": "common",
+                "docId": "kibSecurityPluginApi",
+                "section": "def-common.AuthenticatedUser",
+                "text": "AuthenticatedUser"
+              },
+              " | null"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/server/authentication/authentication_service.ts",
+              "lineNumber": 81
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": [
+              {
+                "parentPluginId": "security",
+                "id": "def-server.request",
+                "type": "Object",
+                "tags": [],
+                "label": "request",
+                "description": [],
+                "signature": [
+                  {
+                    "pluginId": "core",
+                    "scope": "server",
+                    "docId": "kibCoreHttpPluginApi",
+                    "section": "def-server.KibanaRequest",
+                    "text": "KibanaRequest"
+                  },
+                  "<unknown, unknown, unknown, any>"
+                ],
+                "source": {
+                  "path": "x-pack/plugins/security/server/authentication/authentication_service.ts",
+                  "lineNumber": 81
+                },
+                "deprecated": false
+              }
+            ]
+          }
+        ],
+        "initialIsOpen": false
+      },
+      {
+        "parentPluginId": "security",
+        "id": "def-server.CheckPrivilegesPayload",
+        "type": "Interface",
+        "tags": [],
+        "label": "CheckPrivilegesPayload",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/security/server/authorization/types.ts",
+          "lineNumber": 70
+        },
+        "deprecated": false,
+        "children": [
+          {
+            "parentPluginId": "security",
+            "id": "def-server.CheckPrivilegesPayload.kibana",
+            "type": "CompoundType",
+            "tags": [],
+            "label": "kibana",
+            "description": [],
+            "signature": [
+              "string | string[] | undefined"
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authorization/types.ts",
@@ -832,7 +1395,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-          "lineNumber": 56
+          "lineNumber": 62
         },
         "deprecated": false,
         "children": [
@@ -847,7 +1410,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 60
+              "lineNumber": 66
             },
             "deprecated": false
           },
@@ -862,7 +1425,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 64
+              "lineNumber": 70
             },
             "deprecated": false
           },
@@ -880,7 +1443,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 68
+              "lineNumber": 74
             },
             "deprecated": false
           },
@@ -895,7 +1458,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 72
+              "lineNumber": 78
             },
             "deprecated": false
           }
@@ -911,7 +1474,7 @@
         "description": [],
         "source": {
           "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-          "lineNumber": 75
+          "lineNumber": 81
         },
         "deprecated": false,
         "children": [
@@ -926,7 +1489,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 79
+              "lineNumber": 85
             },
             "deprecated": false
           },
@@ -941,7 +1504,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 83
+              "lineNumber": 89
             },
             "deprecated": false
           },
@@ -956,7 +1519,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 87
+              "lineNumber": 93
             },
             "deprecated": false
           }
@@ -974,7 +1537,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-          "lineNumber": 93
+          "lineNumber": 99
         },
         "deprecated": false,
         "children": [
@@ -992,7 +1555,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 97
+              "lineNumber": 103
             },
             "deprecated": false
           },
@@ -1010,7 +1573,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 101
+              "lineNumber": 107
             },
             "deprecated": false
           },
@@ -1025,7 +1588,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 105
+              "lineNumber": 111
             },
             "deprecated": false
           },
@@ -1043,7 +1606,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 109
+              "lineNumber": 115
             },
             "deprecated": false
           }
@@ -1061,7 +1624,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-          "lineNumber": 46
+          "lineNumber": 52
         },
         "deprecated": false,
         "children": [
@@ -1077,7 +1640,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security/server/authentication/api_keys/api_keys.ts",
-              "lineNumber": 47
+              "lineNumber": 53
             },
             "deprecated": false
           }
@@ -1234,256 +1797,478 @@
           }
         ],
         "initialIsOpen": false
+      }
+    ],
+    "enums": [],
+    "misc": [
+      {
+        "parentPluginId": "security",
+        "id": "def-server.AuthorizationServiceSetup",
+        "type": "Type",
+        "tags": [],
+        "label": "AuthorizationServiceSetup",
+        "description": [],
+        "source": {
+          "path": "x-pack/plugins/security/server/index.ts",
+          "lineNumber": 31
+        },
+        "deprecated": false,
+        "initialIsOpen": false
       },
       {
         "parentPluginId": "security",
-        "id": "def-server.SecurityPluginSetup",
+        "id": "def-server.ROUTE_TAG_CAN_REDIRECT",
+        "type": "string",
+        "tags": [],
+        "label": "ROUTE_TAG_CAN_REDIRECT",
+        "description": [
+          "\nIf the route is marked with this tag Security can safely assume that the calling party that sends\nrequest to this route can handle redirect responses. It's particularly important if we want the\nspecific route to be able to initiate or participate in the authentication handshake that may\ninvolve redirects and will eventually redirect authenticated user to this route."
+        ],
+        "signature": [
+          "\"security:canRedirect\""
+        ],
+        "source": {
+          "path": "x-pack/plugins/security/server/routes/tags.ts",
+          "lineNumber": 21
+        },
+        "deprecated": false,
+        "initialIsOpen": false
+      }
+    ],
+    "objects": [],
+    "setup": {
+      "parentPluginId": "security",
+      "id": "def-server.SecurityPluginSetup",
+      "type": "Interface",
+      "tags": [],
+      "label": "SecurityPluginSetup",
+      "description": [
+        "\nDescribes public Security plugin contract returned at the `setup` stage."
+      ],
+      "source": {
+        "path": "x-pack/plugins/security/server/plugin.ts",
+        "lineNumber": 72
+      },
+      "deprecated": false,
+      "children": [
+        {
+          "parentPluginId": "security",
+          "id": "def-server.SecurityPluginSetup.authc",
+          "type": "Object",
+          "tags": [
+            "deprecated"
+          ],
+          "label": "authc",
+          "description": [],
+          "signature": [
+            "{ getCurrentUser: (request: ",
+            {
+              "pluginId": "core",
+              "scope": "server",
+              "docId": "kibCoreHttpPluginApi",
+              "section": "def-server.KibanaRequest",
+              "text": "KibanaRequest"
+            },
+            "<unknown, unknown, unknown, any>) => ",
+            {
+              "pluginId": "security",
+              "scope": "common",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-common.AuthenticatedUser",
+              "text": "AuthenticatedUser"
+            },
+            " | null; }"
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/server/plugin.ts",
+            "lineNumber": 76
+          },
+          "deprecated": true,
+          "references": [
+            {
+              "plugin": "reporting",
+              "link": {
+                "path": "x-pack/plugins/reporting/server/routes/lib/get_user.ts",
+                "lineNumber": 13
+              }
+            },
+            {
+              "plugin": "encryptedSavedObjects",
+              "link": {
+                "path": "x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts",
+                "lineNumber": 107
+              }
+            },
+            {
+              "plugin": "encryptedSavedObjects",
+              "link": {
+                "path": "x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts",
+                "lineNumber": 67
+              }
+            },
+            {
+              "plugin": "actions",
+              "link": {
+                "path": "x-pack/plugins/actions/server/plugin.ts",
+                "lineNumber": 444
+              }
+            },
+            {
+              "plugin": "ml",
+              "link": {
+                "path": "x-pack/plugins/ml/server/routes/annotations.ts",
+                "lineNumber": 105
+              }
+            },
+            {
+              "plugin": "dashboardMode",
+              "link": {
+                "path": "x-pack/plugins/dashboard_mode/server/interceptors/dashboard_mode_request_interceptor.ts",
+                "lineNumber": 33
+              }
+            },
+            {
+              "plugin": "dataEnhanced",
+              "link": {
+                "path": "x-pack/plugins/data_enhanced/server/search/session/session_service.ts",
+                "lineNumber": 448
+              }
+            },
+            {
+              "plugin": "logstash",
+              "link": {
+                "path": "x-pack/plugins/logstash/server/routes/pipeline/save.ts",
+                "lineNumber": 41
+              }
+            },
+            {
+              "plugin": "securitySolution",
+              "link": {
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts",
+                "lineNumber": 48
+              }
+            },
+            {
+              "plugin": "securitySolution",
+              "link": {
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts",
+                "lineNumber": 45
+              }
+            },
+            {
+              "plugin": "securitySolution",
+              "link": {
+                "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts",
+                "lineNumber": 45
+              }
+            },
+            {
+              "plugin": "securitySolution",
+              "link": {
+                "path": "x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts",
+                "lineNumber": 28
+              }
+            }
+          ]
+        },
+        {
+          "parentPluginId": "security",
+          "id": "def-server.SecurityPluginSetup.authz",
+          "type": "Object",
+          "tags": [
+            "deprecated"
+          ],
+          "label": "authz",
+          "description": [],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "server",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-server.AuthorizationServiceSetup",
+              "text": "AuthorizationServiceSetup"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/server/plugin.ts",
+            "lineNumber": 80
+          },
+          "deprecated": true,
+          "references": [
+            {
+              "plugin": "actions",
+              "link": {
+                "path": "x-pack/plugins/actions/server/plugin.ts",
+                "lineNumber": 443
+              }
+            },
+            {
+              "plugin": "ml",
+              "link": {
+                "path": "x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts",
+                "lineNumber": 54
+              }
+            },
+            {
+              "plugin": "ml",
+              "link": {
+                "path": "x-pack/plugins/ml/server/plugin.ts",
+                "lineNumber": 153
+              }
+            },
+            {
+              "plugin": "ml",
+              "link": {
+                "path": "x-pack/plugins/ml/server/plugin.ts",
+                "lineNumber": 203
+              }
+            },
+            {
+              "plugin": "enterpriseSearch",
+              "link": {
+                "path": "x-pack/plugins/enterprise_search/server/lib/check_access.ts",
+                "lineNumber": 46
+              }
+            },
+            {
+              "plugin": "enterpriseSearch",
+              "link": {
+                "path": "x-pack/plugins/enterprise_search/server/lib/check_access.ts",
+                "lineNumber": 86
+              }
+            },
+            {
+              "plugin": "enterpriseSearch",
+              "link": {
+                "path": "x-pack/plugins/enterprise_search/server/lib/check_access.ts",
+                "lineNumber": 88
+              }
+            },
+            {
+              "plugin": "savedObjectsTagging",
+              "link": {
+                "path": "x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts",
+                "lineNumber": 37
+              }
+            }
+          ]
+        },
+        {
+          "parentPluginId": "security",
+          "id": "def-server.SecurityPluginSetup.license",
+          "type": "Object",
+          "tags": [],
+          "label": "license",
+          "description": [
+            "\nExposes information about the available security features under the current license."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "common",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-common.SecurityLicense",
+              "text": "SecurityLicense"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/server/plugin.ts",
+            "lineNumber": 84
+          },
+          "deprecated": false
+        },
+        {
+          "parentPluginId": "security",
+          "id": "def-server.SecurityPluginSetup.audit",
+          "type": "Object",
+          "tags": [],
+          "label": "audit",
+          "description": [
+            "\nExposes services for audit logging."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "server",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-server.AuditServiceSetup",
+              "text": "AuditServiceSetup"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/server/plugin.ts",
+            "lineNumber": 88
+          },
+          "deprecated": false
+        }
+      ],
+      "lifecycle": "setup",
+      "initialIsOpen": true
+    },
+    "start": {
+      "parentPluginId": "security",
+      "id": "def-server.SecurityPluginStart",
+      "type": "Interface",
+      "tags": [],
+      "label": "SecurityPluginStart",
+      "description": [
+        "\nDescribes public Security plugin contract returned at the `start` stage."
+      ],
+      "source": {
+        "path": "x-pack/plugins/security/server/plugin.ts",
+        "lineNumber": 94
+      },
+      "deprecated": false,
+      "children": [
+        {
+          "parentPluginId": "security",
+          "id": "def-server.SecurityPluginStart.authc",
+          "type": "Object",
+          "tags": [],
+          "label": "authc",
+          "description": [
+            "\nAuthentication services to confirm the user is who they say they are."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "server",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-server.AuthenticationServiceStart",
+              "text": "AuthenticationServiceStart"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/server/plugin.ts",
+            "lineNumber": 98
+          },
+          "deprecated": false
+        },
+        {
+          "parentPluginId": "security",
+          "id": "def-server.SecurityPluginStart.authz",
+          "type": "Object",
+          "tags": [],
+          "label": "authz",
+          "description": [
+            "\nAuthorization services to manage and access the permissions a particular user has."
+          ],
+          "signature": [
+            {
+              "pluginId": "security",
+              "scope": "server",
+              "docId": "kibSecurityPluginApi",
+              "section": "def-server.AuthorizationServiceSetup",
+              "text": "AuthorizationServiceSetup"
+            }
+          ],
+          "source": {
+            "path": "x-pack/plugins/security/server/plugin.ts",
+            "lineNumber": 102
+          },
+          "deprecated": false
+        }
+      ],
+      "lifecycle": "start",
+      "initialIsOpen": true
+    }
+  },
+  "common": {
+    "classes": [],
+    "functions": [],
+    "interfaces": [
+      {
+        "parentPluginId": "security",
+        "id": "def-common.AuthenticatedUser",
         "type": "Interface",
         "tags": [],
-        "label": "SecurityPluginSetup",
+        "label": "AuthenticatedUser",
         "description": [
-          "\nDescribes public Security plugin contract returned at the `setup` stage."
+          "\nRepresents the currently authenticated user."
+        ],
+        "signature": [
+          {
+            "pluginId": "security",
+            "scope": "common",
+            "docId": "kibSecurityPluginApi",
+            "section": "def-common.AuthenticatedUser",
+            "text": "AuthenticatedUser"
+          },
+          " extends ",
+          "User"
         ],
         "source": {
-          "path": "x-pack/plugins/security/server/plugin.ts",
-          "lineNumber": 69
+          "path": "x-pack/plugins/security/common/model/authenticated_user.ts",
+          "lineNumber": 21
         },
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "security",
-            "id": "def-server.SecurityPluginSetup.authc",
+            "id": "def-common.AuthenticatedUser.authentication_realm",
             "type": "Object",
-            "tags": [
-              "deprecated"
+            "tags": [],
+            "label": "authentication_realm",
+            "description": [
+              "\nThe name and type of the Realm that has authenticated the user."
             ],
-            "label": "authc",
-            "description": [],
             "signature": [
-              "{ getCurrentUser: (request: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreHttpPluginApi",
-                "section": "def-server.KibanaRequest",
-                "text": "KibanaRequest"
-              },
-              "<unknown, unknown, unknown, any>) => ",
-              "AuthenticatedUser",
-              " | null; }"
+              "UserRealm"
             ],
             "source": {
-              "path": "x-pack/plugins/security/server/plugin.ts",
-              "lineNumber": 73
+              "path": "x-pack/plugins/security/common/model/authenticated_user.ts",
+              "lineNumber": 25
             },
-            "deprecated": true,
-            "references": [
-              {
-                "plugin": "reporting",
-                "link": {
-                  "path": "x-pack/plugins/reporting/server/routes/lib/get_user.ts",
-                  "lineNumber": 13
-                }
-              },
-              {
-                "plugin": "encryptedSavedObjects",
-                "link": {
-                  "path": "x-pack/plugins/encrypted_saved_objects/server/crypto/encryption_key_rotation_service.ts",
-                  "lineNumber": 107
-                }
-              },
-              {
-                "plugin": "encryptedSavedObjects",
-                "link": {
-                  "path": "x-pack/plugins/encrypted_saved_objects/server/saved_objects/index.ts",
-                  "lineNumber": 67
-                }
-              },
-              {
-                "plugin": "actions",
-                "link": {
-                  "path": "x-pack/plugins/actions/server/plugin.ts",
-                  "lineNumber": 444
-                }
-              },
-              {
-                "plugin": "ml",
-                "link": {
-                  "path": "x-pack/plugins/ml/server/routes/annotations.ts",
-                  "lineNumber": 105
-                }
-              },
-              {
-                "plugin": "cases",
-                "link": {
-                  "path": "x-pack/plugins/cases/server/plugin.ts",
-                  "lineNumber": 89
-                }
-              },
-              {
-                "plugin": "dashboardMode",
-                "link": {
-                  "path": "x-pack/plugins/dashboard_mode/server/interceptors/dashboard_mode_request_interceptor.ts",
-                  "lineNumber": 33
-                }
-              },
-              {
-                "plugin": "dataEnhanced",
-                "link": {
-                  "path": "x-pack/plugins/data_enhanced/server/search/session/session_service.ts",
-                  "lineNumber": 448
-                }
-              },
-              {
-                "plugin": "logstash",
-                "link": {
-                  "path": "x-pack/plugins/logstash/server/routes/pipeline/save.ts",
-                  "lineNumber": 41
-                }
-              },
-              {
-                "plugin": "securitySolution",
-                "link": {
-                  "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/create_signals_migration_route.ts",
-                  "lineNumber": 48
-                }
-              },
-              {
-                "plugin": "securitySolution",
-                "link": {
-                  "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/delete_signals_migration_route.ts",
-                  "lineNumber": 45
-                }
-              },
-              {
-                "plugin": "securitySolution",
-                "link": {
-                  "path": "x-pack/plugins/security_solution/server/lib/detection_engine/routes/signals/finalize_signals_migration_route.ts",
-                  "lineNumber": 45
-                }
-              },
-              {
-                "plugin": "securitySolution",
-                "link": {
-                  "path": "x-pack/plugins/security_solution/server/lib/timeline/utils/common.ts",
-                  "lineNumber": 28
-                }
-              }
-            ]
+            "deprecated": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.SecurityPluginSetup.authz",
+            "id": "def-common.AuthenticatedUser.lookup_realm",
             "type": "Object",
-            "tags": [
-              "deprecated"
+            "tags": [],
+            "label": "lookup_realm",
+            "description": [
+              "\nThe name and type of the Realm where the user information were retrieved from."
             ],
-            "label": "authz",
-            "description": [],
             "signature": [
-              "{ mode: ",
-              "AuthorizationMode",
-              "; actions: ",
-              "Actions",
-              "; checkPrivilegesDynamicallyWithRequest: ",
-              "CheckPrivilegesDynamicallyWithRequest",
-              "; checkPrivilegesWithRequest: ",
-              "CheckPrivilegesWithRequest",
-              "; }"
+              "UserRealm"
             ],
             "source": {
-              "path": "x-pack/plugins/security/server/plugin.ts",
-              "lineNumber": 77
+              "path": "x-pack/plugins/security/common/model/authenticated_user.ts",
+              "lineNumber": 30
             },
-            "deprecated": true,
-            "references": [
-              {
-                "plugin": "actions",
-                "link": {
-                  "path": "x-pack/plugins/actions/server/plugin.ts",
-                  "lineNumber": 443
-                }
-              },
-              {
-                "plugin": "ml",
-                "link": {
-                  "path": "x-pack/plugins/ml/server/saved_objects/initialization/initialization.ts",
-                  "lineNumber": 54
-                }
-              },
-              {
-                "plugin": "ml",
-                "link": {
-                  "path": "x-pack/plugins/ml/server/plugin.ts",
-                  "lineNumber": 153
-                }
-              },
-              {
-                "plugin": "ml",
-                "link": {
-                  "path": "x-pack/plugins/ml/server/plugin.ts",
-                  "lineNumber": 203
-                }
-              },
-              {
-                "plugin": "enterpriseSearch",
-                "link": {
-                  "path": "x-pack/plugins/enterprise_search/server/lib/check_access.ts",
-                  "lineNumber": 46
-                }
-              },
-              {
-                "plugin": "enterpriseSearch",
-                "link": {
-                  "path": "x-pack/plugins/enterprise_search/server/lib/check_access.ts",
-                  "lineNumber": 86
-                }
-              },
-              {
-                "plugin": "enterpriseSearch",
-                "link": {
-                  "path": "x-pack/plugins/enterprise_search/server/lib/check_access.ts",
-                  "lineNumber": 88
-                }
-              },
-              {
-                "plugin": "savedObjectsTagging",
-                "link": {
-                  "path": "x-pack/plugins/saved_objects_tagging/server/request_handler_context.ts",
-                  "lineNumber": 37
-                }
-              }
-            ]
+            "deprecated": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.SecurityPluginSetup.license",
+            "id": "def-common.AuthenticatedUser.authentication_provider",
             "type": "Object",
             "tags": [],
-            "label": "license",
-            "description": [],
+            "label": "authentication_provider",
+            "description": [
+              "\nThe authentication provider that used to authenticate user."
+            ],
             "signature": [
-              "SecurityLicense"
+              "AuthenticationProvider"
             ],
             "source": {
-              "path": "x-pack/plugins/security/server/plugin.ts",
-              "lineNumber": 81
+              "path": "x-pack/plugins/security/common/model/authenticated_user.ts",
+              "lineNumber": 35
             },
             "deprecated": false
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.SecurityPluginSetup.audit",
-            "type": "Object",
+            "id": "def-common.AuthenticatedUser.authentication_type",
+            "type": "string",
             "tags": [],
-            "label": "audit",
-            "description": [],
-            "signature": [
-              "AuditServiceSetup"
+            "label": "authentication_type",
+            "description": [
+              "\nThe AuthenticationType used by ES to authenticate the user.\n"
             ],
             "source": {
-              "path": "x-pack/plugins/security/server/plugin.ts",
-              "lineNumber": 82
+              "path": "x-pack/plugins/security/common/model/authenticated_user.ts",
+              "lineNumber": 42
             },
             "deprecated": false
           }
@@ -1492,68 +2277,106 @@
       },
       {
         "parentPluginId": "security",
-        "id": "def-server.SecurityPluginStart",
+        "id": "def-common.SecurityLicense",
         "type": "Interface",
         "tags": [],
-        "label": "SecurityPluginStart",
-        "description": [
-          "\nDescribes public Security plugin contract returned at the `start` stage."
-        ],
+        "label": "SecurityLicense",
+        "description": [],
         "source": {
-          "path": "x-pack/plugins/security/server/plugin.ts",
-          "lineNumber": 88
+          "path": "x-pack/plugins/security/common/licensing/license_service.ts",
+          "lineNumber": 14
         },
         "deprecated": false,
         "children": [
           {
             "parentPluginId": "security",
-            "id": "def-server.SecurityPluginStart.authc",
-            "type": "Object",
+            "id": "def-common.SecurityLicense.isLicenseAvailable",
+            "type": "Function",
             "tags": [],
-            "label": "authc",
+            "label": "isLicenseAvailable",
             "description": [],
             "signature": [
-              "{ getCurrentUser: (request: ",
-              {
-                "pluginId": "core",
-                "scope": "server",
-                "docId": "kibCoreHttpPluginApi",
-                "section": "def-server.KibanaRequest",
-                "text": "KibanaRequest"
-              },
-              "<unknown, unknown, unknown, any>) => ",
-              "AuthenticatedUser",
-              " | null; apiKeys: Pick<",
-              "APIKeys",
-              ", \"create\" | \"areAPIKeysEnabled\" | \"invalidate\" | \"grantAsInternalUser\" | \"invalidateAsInternalUser\">; }"
+              "() => boolean"
             ],
             "source": {
-              "path": "x-pack/plugins/security/server/plugin.ts",
-              "lineNumber": 89
+              "path": "x-pack/plugins/security/common/licensing/license_service.ts",
+              "lineNumber": 15
             },
-            "deprecated": false
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
           },
           {
             "parentPluginId": "security",
-            "id": "def-server.SecurityPluginStart.authz",
+            "id": "def-common.SecurityLicense.isEnabled",
+            "type": "Function",
+            "tags": [],
+            "label": "isEnabled",
+            "description": [],
+            "signature": [
+              "() => boolean"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/common/licensing/license_service.ts",
+              "lineNumber": 16
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-common.SecurityLicense.getType",
+            "type": "Function",
+            "tags": [],
+            "label": "getType",
+            "description": [],
+            "signature": [
+              "() => \"basic\" | \"standard\" | \"gold\" | \"platinum\" | \"enterprise\" | \"trial\" | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/common/licensing/license_service.ts",
+              "lineNumber": 17
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-common.SecurityLicense.getFeatures",
+            "type": "Function",
+            "tags": [],
+            "label": "getFeatures",
+            "description": [],
+            "signature": [
+              "() => ",
+              "SecurityLicenseFeatures"
+            ],
+            "source": {
+              "path": "x-pack/plugins/security/common/licensing/license_service.ts",
+              "lineNumber": 18
+            },
+            "deprecated": false,
+            "children": [],
+            "returnComment": []
+          },
+          {
+            "parentPluginId": "security",
+            "id": "def-common.SecurityLicense.features$",
             "type": "Object",
             "tags": [],
-            "label": "authz",
+            "label": "features$",
             "description": [],
             "signature": [
-              "{ mode: ",
-              "AuthorizationMode",
-              "; actions: ",
-              "Actions",
-              "; checkPrivilegesDynamicallyWithRequest: ",
-              "CheckPrivilegesDynamicallyWithRequest",
-              "; checkPrivilegesWithRequest: ",
-              "CheckPrivilegesWithRequest",
-              "; }"
+              "Observable",
+              "<",
+              "SecurityLicenseFeatures",
+              ">"
             ],
             "source": {
-              "path": "x-pack/plugins/security/server/plugin.ts",
-              "lineNumber": 90
+              "path": "x-pack/plugins/security/common/licensing/license_service.ts",
+              "lineNumber": 19
             },
             "deprecated": false
           }
@@ -1562,59 +2385,6 @@
       }
     ],
     "enums": [],
-    "misc": [
-      {
-        "parentPluginId": "security",
-        "id": "def-server.AuthorizationServiceSetup",
-        "type": "Type",
-        "tags": [],
-        "label": "AuthorizationServiceSetup",
-        "description": [],
-        "signature": [
-          "{ mode: ",
-          "AuthorizationMode",
-          "; actions: ",
-          "Actions",
-          "; checkPrivilegesDynamicallyWithRequest: ",
-          "CheckPrivilegesDynamicallyWithRequest",
-          "; checkPrivilegesWithRequest: ",
-          "CheckPrivilegesWithRequest",
-          "; }"
-        ],
-        "source": {
-          "path": "x-pack/plugins/security/server/index.ts",
-          "lineNumber": 30
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "security",
-        "id": "def-server.ROUTE_TAG_CAN_REDIRECT",
-        "type": "string",
-        "tags": [],
-        "label": "ROUTE_TAG_CAN_REDIRECT",
-        "description": [
-          "\nIf the route is marked with this tag Security can safely assume that the calling party that sends\nrequest to this route can handle redirect responses. It's particularly important if we want the\nspecific route to be able to initiate or participate in the authentication handshake that may\ninvolve redirects and will eventually redirect authenticated user to this route."
-        ],
-        "signature": [
-          "\"security:canRedirect\""
-        ],
-        "source": {
-          "path": "x-pack/plugins/security/server/routes/tags.ts",
-          "lineNumber": 21
-        },
-        "deprecated": false,
-        "initialIsOpen": false
-      }
-    ],
-    "objects": []
-  },
-  "common": {
-    "classes": [],
-    "functions": [],
-    "interfaces": [],
-    "enums": [],
     "misc": [],
     "objects": []
   }
diff --git a/api_docs/security.mdx b/api_docs/security.mdx
index 4d2afe42cb151..250ceff429207 100644
--- a/api_docs/security.mdx
+++ b/api_docs/security.mdx
@@ -22,11 +22,25 @@ import securityObj from './security.json';
 ### Interfaces
 <DocDefinitionList data={securityObj.client.interfaces}/>
 
+### Consts, variables and types
+<DocDefinitionList data={securityObj.client.misc}/>
+
 ## Server
 
+### Setup
+<DocDefinitionList data={[securityObj.server.setup]}/>
+
+### Start
+<DocDefinitionList data={[securityObj.server.start]}/>
+
 ### Interfaces
 <DocDefinitionList data={securityObj.server.interfaces}/>
 
 ### Consts, variables and types
 <DocDefinitionList data={securityObj.server.misc}/>
 
+## Common
+
+### Interfaces
+<DocDefinitionList data={securityObj.common.interfaces}/>
+
diff --git a/api_docs/security_solution.json b/api_docs/security_solution.json
index a265ea7fdc7ac..747ef4b4b715b 100644
--- a/api_docs/security_solution.json
+++ b/api_docs/security_solution.json
@@ -43,7 +43,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-          "lineNumber": 74
+          "lineNumber": 75
         },
         "deprecated": false,
         "children": [
@@ -59,7 +59,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-              "lineNumber": 78
+              "lineNumber": 79
             },
             "deprecated": false,
             "children": [
@@ -82,7 +82,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-                  "lineNumber": 78
+                  "lineNumber": 79
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -123,7 +123,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-              "lineNumber": 102
+              "lineNumber": 103
             },
             "deprecated": false,
             "children": [
@@ -150,7 +150,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-                  "lineNumber": 102
+                  "lineNumber": 103
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -167,7 +167,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-                  "lineNumber": 102
+                  "lineNumber": 103
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -197,7 +197,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-              "lineNumber": 343
+              "lineNumber": 344
             },
             "deprecated": false,
             "children": [
@@ -219,7 +219,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-                  "lineNumber": 343
+                  "lineNumber": 344
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -236,7 +236,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-                  "lineNumber": 343
+                  "lineNumber": 344
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -256,7 +256,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/public/plugin.tsx",
-              "lineNumber": 388
+              "lineNumber": 389
             },
             "deprecated": false,
             "children": [],
@@ -445,7 +445,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/security_solution/server/plugin.ts",
-          "lineNumber": 133
+          "lineNumber": 143
         },
         "deprecated": false,
         "children": [
@@ -461,7 +461,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/server/plugin.ts",
-              "lineNumber": 148
+              "lineNumber": 159
             },
             "deprecated": false,
             "children": [
@@ -484,7 +484,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/server/plugin.ts",
-                  "lineNumber": 148
+                  "lineNumber": 159
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -524,7 +524,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/server/plugin.ts",
-              "lineNumber": 160
+              "lineNumber": 171
             },
             "deprecated": false,
             "children": [
@@ -557,7 +557,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/server/plugin.ts",
-                  "lineNumber": 160
+                  "lineNumber": 171
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -574,7 +574,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/server/plugin.ts",
-                  "lineNumber": 160
+                  "lineNumber": 171
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -604,7 +604,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/server/plugin.ts",
-              "lineNumber": 345
+              "lineNumber": 471
             },
             "deprecated": false,
             "children": [
@@ -626,7 +626,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/server/plugin.ts",
-                  "lineNumber": 345
+                  "lineNumber": 471
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -643,7 +643,7 @@
                 ],
                 "source": {
                   "path": "x-pack/plugins/security_solution/server/plugin.ts",
-                  "lineNumber": 345
+                  "lineNumber": 471
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -663,7 +663,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/security_solution/server/plugin.ts",
-              "lineNumber": 420
+              "lineNumber": 546
             },
             "deprecated": false,
             "children": [],
@@ -747,7 +747,7 @@
       "description": [],
       "source": {
         "path": "x-pack/plugins/security_solution/server/plugin.ts",
-        "lineNumber": 109
+        "lineNumber": 127
       },
       "deprecated": false,
       "children": [],
@@ -763,7 +763,7 @@
       "description": [],
       "source": {
         "path": "x-pack/plugins/security_solution/server/plugin.ts",
-        "lineNumber": 112
+        "lineNumber": 130
       },
       "deprecated": false,
       "children": [],
diff --git a/api_docs/share.json b/api_docs/share.json
index 82f5b8697b72d..41b7ecc38e1f0 100644
--- a/api_docs/share.json
+++ b/api_docs/share.json
@@ -124,7 +124,7 @@
         ],
         "source": {
           "path": "src/plugins/share/public/url_generators/url_generator_service.ts",
-          "lineNumber": 25
+          "lineNumber": 35
         },
         "deprecated": false,
         "children": [
@@ -140,7 +140,7 @@
             ],
             "source": {
               "path": "src/plugins/share/public/url_generators/url_generator_service.ts",
-              "lineNumber": 30
+              "lineNumber": 40
             },
             "deprecated": false,
             "children": [],
@@ -167,7 +167,7 @@
             ],
             "source": {
               "path": "src/plugins/share/public/url_generators/url_generator_service.ts",
-              "lineNumber": 32
+              "lineNumber": 42
             },
             "deprecated": false,
             "children": [
@@ -190,7 +190,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/share/public/url_generators/url_generator_service.ts",
-                  "lineNumber": 32
+                  "lineNumber": 42
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -219,7 +219,7 @@
             ],
             "source": {
               "path": "src/plugins/share/public/url_generators/url_generator_service.ts",
-              "lineNumber": 45
+              "lineNumber": 55
             },
             "deprecated": false,
             "children": [
@@ -241,7 +241,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/share/public/url_generators/url_generator_service.ts",
-                  "lineNumber": 45
+                  "lineNumber": 55
                 },
                 "deprecated": false,
                 "isRequired": true
@@ -261,7 +261,7 @@
             ],
             "source": {
               "path": "src/plugins/share/public/url_generators/url_generator_service.ts",
-              "lineNumber": 52
+              "lineNumber": 62
             },
             "deprecated": false,
             "children": [],
@@ -1316,11 +1316,13 @@
         },
         ") => void; } & { urlGenerators: ",
         "UrlGeneratorsSetup",
+        "; url: ",
+        "UrlService",
         "; }"
       ],
       "source": {
         "path": "src/plugins/share/public/plugin.ts",
-        "lineNumber": 56
+        "lineNumber": 32
       },
       "deprecated": false,
       "lifecycle": "setup",
@@ -1344,11 +1346,13 @@
         },
         ") => void; } & { urlGenerators: ",
         "UrlGeneratorsStart",
+        "; url: ",
+        "UrlService",
         "; }"
       ],
       "source": {
         "path": "src/plugins/share/public/plugin.ts",
-        "lineNumber": 61
+        "lineNumber": 47
       },
       "deprecated": false,
       "lifecycle": "start",
diff --git a/api_docs/spaces.json b/api_docs/spaces.json
index 2f2d79c2379d5..002145f3b48db 100644
--- a/api_docs/spaces.json
+++ b/api_docs/spaces.json
@@ -1203,7 +1203,7 @@
                 "plugin": "security",
                 "link": {
                   "path": "x-pack/plugins/security/server/plugin.ts",
-                  "lineNumber": 263
+                  "lineNumber": 267
                 }
               },
               {
@@ -1245,7 +1245,7 @@
                 "plugin": "securitySolution",
                 "link": {
                   "path": "x-pack/plugins/security_solution/server/plugin.ts",
-                  "lineNumber": 194
+                  "lineNumber": 206
                 }
               },
               {
@@ -2002,28 +2002,28 @@
               "plugin": "security",
               "link": {
                 "path": "x-pack/plugins/security/server/plugin.ts",
-                "lineNumber": 57
+                "lineNumber": 60
               }
             },
             {
               "plugin": "security",
               "link": {
                 "path": "x-pack/plugins/security/server/plugin.ts",
-                "lineNumber": 263
+                "lineNumber": 267
               }
             },
             {
               "plugin": "security",
               "link": {
                 "path": "x-pack/plugins/security/server/plugin.ts",
-                "lineNumber": 281
+                "lineNumber": 285
               }
             },
             {
               "plugin": "security",
               "link": {
                 "path": "x-pack/plugins/security/server/plugin.ts",
-                "lineNumber": 297
+                "lineNumber": 301
               }
             },
             {
@@ -2086,7 +2086,7 @@
               "plugin": "securitySolution",
               "link": {
                 "path": "x-pack/plugins/security_solution/server/plugin.ts",
-                "lineNumber": 194
+                "lineNumber": 206
               }
             }
           ]
diff --git a/api_docs/task_manager.json b/api_docs/task_manager.json
index 61e37fa5acc0c..34f16e8ad309b 100644
--- a/api_docs/task_manager.json
+++ b/api_docs/task_manager.json
@@ -364,7 +364,7 @@
         ],
         "source": {
           "path": "x-pack/plugins/task_manager/server/task.ts",
-          "lineNumber": 297
+          "lineNumber": 302
         },
         "deprecated": false,
         "children": [
@@ -379,7 +379,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 302
+              "lineNumber": 307
             },
             "deprecated": false
           },
@@ -397,7 +397,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 307
+              "lineNumber": 312
             },
             "deprecated": false
           },
@@ -415,7 +415,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 313
+              "lineNumber": 318
             },
             "deprecated": false
           },
@@ -430,7 +430,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 319
+              "lineNumber": 324
             },
             "deprecated": false
           },
@@ -454,7 +454,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 324
+              "lineNumber": 329
             },
             "deprecated": false
           },
@@ -472,7 +472,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 330
+              "lineNumber": 335
             },
             "deprecated": false
           },
@@ -490,7 +490,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 337
+              "lineNumber": 342
             },
             "deprecated": false
           },
@@ -508,7 +508,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 343
+              "lineNumber": 348
             },
             "deprecated": false
           },
@@ -526,7 +526,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 353
+              "lineNumber": 358
             },
             "deprecated": false
           },
@@ -544,7 +544,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 358
+              "lineNumber": 363
             },
             "deprecated": false
           }
@@ -766,6 +766,24 @@
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "taskManager",
+            "id": "def-server.TaskInstance.traceparent",
+            "type": "string",
+            "tags": [],
+            "label": "traceparent",
+            "description": [
+              "\nThe serialized traceparent string of the current APM transaction or span."
+            ],
+            "signature": [
+              "string | undefined"
+            ],
+            "source": {
+              "path": "x-pack/plugins/task_manager/server/task.ts",
+              "lineNumber": 263
+            },
+            "deprecated": false
+          },
           {
             "parentPluginId": "taskManager",
             "id": "def-server.TaskInstance.user",
@@ -780,7 +798,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 263
+              "lineNumber": 268
             },
             "deprecated": false
           },
@@ -798,7 +816,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 269
+              "lineNumber": 274
             },
             "deprecated": false
           },
@@ -816,7 +834,7 @@
             ],
             "source": {
               "path": "x-pack/plugins/task_manager/server/task.ts",
-              "lineNumber": 274
+              "lineNumber": 279
             },
             "deprecated": false
           }
diff --git a/api_docs/telemetry.json b/api_docs/telemetry.json
index 5a4d029dc0938..30c80119d62e2 100644
--- a/api_docs/telemetry.json
+++ b/api_docs/telemetry.json
@@ -15,7 +15,7 @@
         ],
         "source": {
           "path": "src/plugins/telemetry/public/plugin.ts",
-          "lineNumber": 82
+          "lineNumber": 90
         },
         "deprecated": false,
         "children": [
@@ -30,7 +30,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 84
+              "lineNumber": 92
             },
             "deprecated": false
           },
@@ -45,7 +45,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 86
+              "lineNumber": 94
             },
             "deprecated": false
           },
@@ -60,7 +60,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 88
+              "lineNumber": 96
             },
             "deprecated": false
           },
@@ -75,7 +75,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 90
+              "lineNumber": 98
             },
             "deprecated": false
           },
@@ -93,7 +93,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 92
+              "lineNumber": 100
             },
             "deprecated": false
           },
@@ -108,7 +108,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 94
+              "lineNumber": 102
             },
             "deprecated": false
           },
@@ -126,7 +126,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 96
+              "lineNumber": 104
             },
             "deprecated": false
           },
@@ -144,7 +144,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 98
+              "lineNumber": 106
             },
             "deprecated": false
           },
@@ -162,7 +162,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 100
+              "lineNumber": 108
             },
             "deprecated": false
           }
@@ -180,7 +180,7 @@
         ],
         "source": {
           "path": "src/plugins/telemetry/public/plugin.ts",
-          "lineNumber": 36
+          "lineNumber": 38
         },
         "deprecated": false,
         "children": [
@@ -198,7 +198,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 38
+              "lineNumber": 40
             },
             "deprecated": false,
             "returnComment": [],
@@ -215,10 +215,30 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 40
+              "lineNumber": 42
             },
             "deprecated": false
           },
+          {
+            "parentPluginId": "telemetry",
+            "id": "def-public.TelemetryServicePublicApis.canSendTelemetry",
+            "type": "Function",
+            "tags": [],
+            "label": "canSendTelemetry",
+            "description": [
+              "Can phone-home telemetry calls be made? This depends on whether we have opted-in or if we are rendering a report"
+            ],
+            "signature": [
+              "() => boolean"
+            ],
+            "source": {
+              "path": "src/plugins/telemetry/public/plugin.ts",
+              "lineNumber": 44
+            },
+            "deprecated": false,
+            "returnComment": [],
+            "children": []
+          },
           {
             "parentPluginId": "telemetry",
             "id": "def-public.TelemetryServicePublicApis.getCanChangeOptInStatus",
@@ -233,7 +253,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 42
+              "lineNumber": 46
             },
             "deprecated": false,
             "returnComment": [],
@@ -253,7 +273,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 44
+              "lineNumber": 48
             },
             "deprecated": false,
             "returnComment": [],
@@ -273,7 +293,7 @@
             ],
             "source": {
               "path": "src/plugins/telemetry/public/plugin.ts",
-              "lineNumber": 50
+              "lineNumber": 54
             },
             "deprecated": false,
             "returnComment": [],
@@ -289,7 +309,7 @@
                 ],
                 "source": {
                   "path": "src/plugins/telemetry/public/plugin.ts",
-                  "lineNumber": 50
+                  "lineNumber": 54
                 },
                 "deprecated": false
               }
@@ -313,7 +333,7 @@
       ],
       "source": {
         "path": "src/plugins/telemetry/public/plugin.ts",
-        "lineNumber": 64
+        "lineNumber": 68
       },
       "deprecated": false,
       "children": [
@@ -337,7 +357,7 @@
           ],
           "source": {
             "path": "src/plugins/telemetry/public/plugin.ts",
-            "lineNumber": 66
+            "lineNumber": 70
           },
           "deprecated": false
         },
@@ -355,7 +375,7 @@
           ],
           "source": {
             "path": "src/plugins/telemetry/public/plugin.ts",
-            "lineNumber": 68
+            "lineNumber": 72
           },
           "deprecated": false
         },
@@ -373,7 +393,7 @@
           ],
           "source": {
             "path": "src/plugins/telemetry/public/plugin.ts",
-            "lineNumber": 73
+            "lineNumber": 77
           },
           "deprecated": false
         }
@@ -392,7 +412,7 @@
       ],
       "source": {
         "path": "src/plugins/telemetry/public/plugin.ts",
-        "lineNumber": 56
+        "lineNumber": 60
       },
       "deprecated": false,
       "children": [
@@ -416,7 +436,7 @@
           ],
           "source": {
             "path": "src/plugins/telemetry/public/plugin.ts",
-            "lineNumber": 58
+            "lineNumber": 62
           },
           "deprecated": false
         }
@@ -641,7 +661,7 @@
             "text": "NodeUsage"
           },
           " extends ",
-          "NodeUsageInformation"
+          "NodesUsageNodeUsage"
         ],
         "source": {
           "path": "src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts",
diff --git a/api_docs/telemetry_collection_manager.json b/api_docs/telemetry_collection_manager.json
index d30ff36b56093..681e10bd3ffaa 100644
--- a/api_docs/telemetry_collection_manager.json
+++ b/api_docs/telemetry_collection_manager.json
@@ -86,7 +86,7 @@
             "signature": [
               "Pick<",
               "KibanaClient",
-              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
+              ", \"get\" | \"delete\" | \"create\" | \"index\" | \"update\" | \"closePointInTime\" | \"helpers\" | \"count\" | \"search\" | \"security\" | \"eql\" | \"on\" | \"off\" | \"transform\" | \"emit\" | \"once\" | \"asyncSearch\" | \"autoscaling\" | \"bulk\" | \"cat\" | \"ccr\" | \"clearScroll\" | \"cluster\" | \"danglingIndices\" | \"dataFrameTransformDeprecated\" | \"deleteByQuery\" | \"deleteByQueryRethrottle\" | \"deleteScript\" | \"enrich\" | \"exists\" | \"existsSource\" | \"explain\" | \"features\" | \"fieldCaps\" | \"fleet\" | \"getScript\" | \"getScriptContext\" | \"getScriptLanguages\" | \"getSource\" | \"graph\" | \"ilm\" | \"indices\" | \"info\" | \"ingest\" | \"license\" | \"logstash\" | \"mget\" | \"migration\" | \"ml\" | \"monitoring\" | \"msearch\" | \"msearchTemplate\" | \"mtermvectors\" | \"nodes\" | \"openPointInTime\" | \"ping\" | \"putScript\" | \"rankEval\" | \"reindex\" | \"reindexRethrottle\" | \"renderSearchTemplate\" | \"rollup\" | \"scriptsPainlessExecute\" | \"scroll\" | \"searchShards\" | \"searchTemplate\" | \"searchableSnapshots\" | \"shutdown\" | \"slm\" | \"snapshot\" | \"sql\" | \"ssl\" | \"tasks\" | \"termsEnum\" | \"termvectors\" | \"textStructure\" | \"updateByQuery\" | \"updateByQueryRethrottle\" | \"watcher\" | \"xpack\"> & { transport: { request(params: ",
               "TransportRequestParams",
               ", options?: ",
               "TransportRequestOptions",
diff --git a/api_docs/telemetry_collection_xpack.json b/api_docs/telemetry_collection_xpack.json
index a97647773c7f1..1dd45d1d619f1 100644
--- a/api_docs/telemetry_collection_xpack.json
+++ b/api_docs/telemetry_collection_xpack.json
@@ -22,7 +22,7 @@
         "label": "ESLicense",
         "description": [],
         "signature": [
-          "LicenseInformation"
+          "LicenseGetLicenseInformation"
         ],
         "source": {
           "path": "x-pack/plugins/telemetry_collection_xpack/server/telemetry_collection/get_license.ts",
diff --git a/api_docs/triggers_actions_ui.json b/api_docs/triggers_actions_ui.json
index de7a13b3080fe..bccb50d96759a 100644
--- a/api_docs/triggers_actions_ui.json
+++ b/api_docs/triggers_actions_ui.json
@@ -422,60 +422,6 @@
         ],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "triggersActionsUi",
-        "id": "def-public.getActionType",
-        "type": "Function",
-        "tags": [],
-        "label": "getActionType",
-        "description": [],
-        "signature": [
-          "() => ",
-          "ActionTypeModel",
-          "<",
-          "JiraConfig",
-          ", ",
-          "JiraSecrets",
-          ", ",
-          "JiraActionParams",
-          ">"
-        ],
-        "source": {
-          "path": "x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx",
-          "lineNumber": 62
-        },
-        "deprecated": false,
-        "children": [],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "triggersActionsUi",
-        "id": "def-public.getActionType",
-        "type": "Function",
-        "tags": [],
-        "label": "getActionType",
-        "description": [],
-        "signature": [
-          "() => ",
-          "ActionTypeModel",
-          "<",
-          "ResilientConfig",
-          ", ",
-          "ResilientSecrets",
-          ", ",
-          "ResilientActionParams",
-          ">"
-        ],
-        "source": {
-          "path": "x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx",
-          "lineNumber": 67
-        },
-        "deprecated": false,
-        "children": [],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "triggersActionsUi",
         "id": "def-public.getFields",
@@ -656,60 +602,6 @@
         "returnComment": [],
         "initialIsOpen": false
       },
-      {
-        "parentPluginId": "triggersActionsUi",
-        "id": "def-public.getServiceNowITSMActionType",
-        "type": "Function",
-        "tags": [],
-        "label": "getServiceNowITSMActionType",
-        "description": [],
-        "signature": [
-          "() => ",
-          "ActionTypeModel",
-          "<",
-          "ServiceNowConfig",
-          ", ",
-          "ServiceNowSecrets",
-          ", ",
-          "ServiceNowITSMActionParams",
-          ">"
-        ],
-        "source": {
-          "path": "x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx",
-          "lineNumber": 63
-        },
-        "deprecated": false,
-        "children": [],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
-      {
-        "parentPluginId": "triggersActionsUi",
-        "id": "def-public.getServiceNowSIRActionType",
-        "type": "Function",
-        "tags": [],
-        "label": "getServiceNowSIRActionType",
-        "description": [],
-        "signature": [
-          "() => ",
-          "ActionTypeModel",
-          "<",
-          "ServiceNowConfig",
-          ", ",
-          "ServiceNowSecrets",
-          ", ",
-          "ServiceNowSIRActionParams",
-          ">"
-        ],
-        "source": {
-          "path": "x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx",
-          "lineNumber": 98
-        },
-        "deprecated": false,
-        "children": [],
-        "returnComment": [],
-        "initialIsOpen": false
-      },
       {
         "parentPluginId": "triggersActionsUi",
         "id": "def-public.getTimeFieldOptions",
diff --git a/api_docs/ui_actions.json b/api_docs/ui_actions.json
index b623984736ee1..cb35cacedf7ba 100644
--- a/api_docs/ui_actions.json
+++ b/api_docs/ui_actions.json
@@ -775,7 +775,7 @@
                 "plugin": "discover",
                 "link": {
                   "path": "src/plugins/discover/public/application/embeddable/search_embeddable.ts",
-                  "lineNumber": 114
+                  "lineNumber": 115
                 }
               },
               {
diff --git a/api_docs/usage_collection.json b/api_docs/usage_collection.json
index ab02b8b567fb8..e0912fe6bed40 100644
--- a/api_docs/usage_collection.json
+++ b/api_docs/usage_collection.json
@@ -777,7 +777,7 @@
           "\nPossible type values in the schema"
         ],
         "signature": [
-          "\"boolean\" | \"date\" | \"text\" | \"keyword\" | \"long\" | \"double\" | \"short\" | \"integer\" | \"byte\" | \"float\""
+          "\"boolean\" | \"date\" | \"keyword\" | \"text\" | \"long\" | \"double\" | \"short\" | \"float\" | \"integer\" | \"byte\""
         ],
         "source": {
           "path": "src/plugins/usage_collection/server/collector/types.ts",
diff --git a/api_docs/visualizations.json b/api_docs/visualizations.json
index 0df428a158a3d..83f9436420dcd 100644
--- a/api_docs/visualizations.json
+++ b/api_docs/visualizations.json
@@ -1888,7 +1888,7 @@
             "label": "group",
             "description": [],
             "signature": [
-              "\"buckets\" | \"metrics\" | \"none\""
+              "\"none\" | \"buckets\" | \"metrics\""
             ],
             "source": {
               "path": "src/plugins/visualizations/public/vis_types/types.ts",
diff --git a/dev_docs/tutorials/expressions.mdx b/dev_docs/tutorials/expressions.mdx
new file mode 100644
index 0000000000000..4688da98b7b01
--- /dev/null
+++ b/dev_docs/tutorials/expressions.mdx
@@ -0,0 +1,132 @@
+---
+id: kibDevTutorialExpressions
+slug: /kibana-dev-docs/tutorials/expressions
+title: Kibana Expressions Service
+summary: Kibana Expressions Service
+date: 2021-06-01
+tags: ['kibana', 'onboarding', 'dev', 'architecture']
+---
+
+## Expressions service
+
+Expression service exposes a registry of reusable functions primary used for fetching and transposing data and a registry of renderer functions that can render data into a DOM element.
+Adding functions is easy and so is reusing them.
+ 
+An expression is a chain of functions with provided arguments, which given a single input translates to a single output.
+Each expression is representable by a human friendly string which a user can type.
+
+### Creating expressions
+
+Here is a very simple expression string:
+
+```
+essql 'select column1, column2 from myindex' | mapColumn name=column3 fn='{ column1 + 3 }' | table
+```
+
+It consists of 3 functions:
+
+ - `essql` which runs given sql query against elasticsearch and returns the results
+ - `mapColumn`, which computes a new column from existing ones;
+ - `table`, which prepares the data for rendering in a tabular format.
+
+The same expression could also be constructed in the code:
+
+```ts
+import { buildExpression, buildExpressionFunction } from 'src/plugins/expressions';
+
+const expression = buildExpression([
+  buildExpressionFunction<ExpressionFunctionEssql>('essql', [ q: 'select column1, column2 from myindex' ]),
+  buildExpressionFunction<ExpressionFunctionMapColumn>('mapColumn', [ name: 'column3', expression: 'column1 + 3' ]),
+  buildExpressionFunction<ExpressionFunctionTable>('table'),
+]
+```
+
+Note: Consumers need to be aware which plugin registers specific functions with expressions function registry and import correct type definitions from there.
+
+<DocCallOut>
+  The `expressions` service is available on both server and client, with similar APIs.
+</DocCallOut>
+
+### Running expressions
+
+Expression service exposes `execute` method which allows you to execute an expression:
+
+```ts
+const executionContract = expressions.execute(expression, input);
+const result = await executionContract.getData();
+```
+
+<DocCallOut>
+  Check the full spec of execute function [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.execution.md)
+</DocCallOut>
+
+In addition, on the browser side, there are two additional ways to run expressions and render the results.
+
+#### React expression renderer component
+
+This is the easiest way to get expressions rendered inside your application.
+
+```ts
+<ReactExpressionRenderer expression={expression} />
+```
+
+<DocCallOut>
+  Check the full spec of ReactExpressionRenderer component props [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.reactexpressionrendererprops.md)
+</DocCallOut>
+
+#### Expression loader
+
+If you are not using React, you can use the loader expression service provides to achieve the same:
+
+```ts
+const handler = loader(domElement, expression, params);
+```
+
+<DocCallOut>
+  Check the full spec of expression loader params [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.iexpressionloaderparams.md)
+</DocCallOut>
+
+### Creating new expression functions
+
+Creating a new expression function is easy, just call `registerFunction` method on expressions service setup contract with your function definition:
+
+```ts
+const functionDefinition = {
+   name: 'clog',
+   args: {},
+   help: 'Outputs the context to the console',
+   fn: (input: unknown) => {
+     // eslint-disable-next-line no-console
+     console.log(input);
+     return input;
+   },
+};
+
+expressions.registerFunction(functionDefinition);
+```
+
+<DocCallOut>
+  Check the full interface of ExpressionFuntionDefinition [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionfunctiondefinition.md)
+</DocCallOut>
+
+### Creating new expression renderers
+
+Adding new renderers is just as easy as adding functions:
+
+```ts
+const rendererDefinition = {
+   name: 'debug',
+   help: 'Outputs the context to the dom element',
+   render: (domElement, input, handlers) => {
+     // eslint-disable-next-line no-console
+     domElement.innerText = JSON.strinfigy(input);
+     handlers.done();
+   },
+};
+
+expressions.registerRenderer(rendererDefinition);
+```
+
+<DocCallOut>
+  Check the full interface of ExpressionRendererDefinition [here](https://github.com/elastic/kibana/blob/master/docs/development/plugins/expressions/public/kibana-plugin-plugins-expressions-public.expressionrenderdefinition.md)
+</DocCallOut>
diff --git a/docs/api/index-patterns.asciidoc b/docs/api/index-patterns.asciidoc
index 79d2f164fb8c3..b343d80b4fc15 100644
--- a/docs/api/index-patterns.asciidoc
+++ b/docs/api/index-patterns.asciidoc
@@ -20,6 +20,12 @@ The following index patterns APIs are available:
     ** <<index-patterns-api-default-set, Set default index pattern API>> to set a default index pattern
 * Fields
     ** <<index-patterns-fields-api-update, Update index pattern field>> to change field metadata, such as `count`, `customLabel` and `format`
+* Runtime fields
+    ** <<index-patterns-runtime-field-api-get, Get runtime field API>> to retrieve a runtime field
+    ** <<index-patterns-runtime-field-api-create, Create runtime field API>> to create a runtime field
+    ** <<index-patterns-runtime-field-api-upsert, Upsert runtime field API>> to create or update a runtime field
+    ** <<index-patterns-runtime-field-api-update, Update runtime field API>> to partially update an existing runtime field
+    ** <<index-patterns-runtime-field-api-delete, Delete runtime field API>> to delete a runtime field
 
 include::index-patterns/get.asciidoc[]
 include::index-patterns/create.asciidoc[]
@@ -28,3 +34,9 @@ include::index-patterns/delete.asciidoc[]
 include::index-patterns/default-get.asciidoc[]
 include::index-patterns/default-set.asciidoc[]
 include::index-patterns/update-fields.asciidoc[]
+include::index-patterns/runtime-fields/get.asciidoc[]
+include::index-patterns/runtime-fields/create.asciidoc[]
+include::index-patterns/runtime-fields/upsert.asciidoc[]
+include::index-patterns/runtime-fields/update.asciidoc[]
+include::index-patterns/runtime-fields/delete.asciidoc[]
+
diff --git a/docs/api/index-patterns/create.asciidoc b/docs/api/index-patterns/create.asciidoc
index 771292d6f934d..521e25931ad49 100644
--- a/docs/api/index-patterns/create.asciidoc
+++ b/docs/api/index-patterns/create.asciidoc
@@ -84,6 +84,7 @@ $ curl -X POST api/index_patterns/index_pattern
       "typeMeta": {},
       "fieldFormats": {},
       "fieldAttrs": {},
+      "runtimeFieldMap": {}
       "allowNoIndex": "..."
     }
 }
diff --git a/docs/api/index-patterns/get.asciidoc b/docs/api/index-patterns/get.asciidoc
index 3f53bf0726bf1..64588e63f62ae 100644
--- a/docs/api/index-patterns/get.asciidoc
+++ b/docs/api/index-patterns/get.asciidoc
@@ -58,6 +58,7 @@ The API returns an index pattern object:
         "typeMeta": {},
         "fieldFormats": {},
         "fieldAttrs": {},
+        "runtimeFieldMap" {},
         "allowNoIndex: "..."
     }
 }
diff --git a/docs/api/index-patterns/runtime-fields/create.asciidoc b/docs/api/index-patterns/runtime-fields/create.asciidoc
new file mode 100644
index 0000000000000..b0773c29e5309
--- /dev/null
+++ b/docs/api/index-patterns/runtime-fields/create.asciidoc
@@ -0,0 +1,61 @@
+[[index-patterns-runtime-field-api-create]]
+=== Create runtime field API
+++++
+<titleabbrev>Create runtime field</titleabbrev>
+++++
+
+experimental[] Create a runtime field
+
+[[index-patterns-runtime-field-create-request]]
+==== Request
+
+`POST <kibana host>:<port>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field`
+
+`POST <kibana host>:<port>/s/<space_id>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field`
+
+[[index-patterns-runtime-field-create-params]]
+==== Path parameters
+
+`space_id`::
+(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
+
+`index_pattern_id`::
+(Required, string) The ID of the index pattern.
+
+[[index-patterns-runtime-field-create-body]]
+==== Request body
+
+`name`:: (Required, string) The name for a runtime field.
+
+`runtimeField`:: (Required, object) The runtime field definition object.
+
+
+[[index-patterns-runtime-field-create-example]]
+==== Examples
+
+Create a runtime field on an index pattern:
+
+[source,sh]
+--------------------------------------------------
+$ curl -X POST api/index_patterns/index_pattern/<index_pattern_id>/runtime_field
+{
+  "name": "runtimeFoo",
+  "runtimeField": {
+     "type": "long",
+     "script": {
+        "source": "emit(doc["foo"].value)"
+      }
+  }
+}
+--------------------------------------------------
+// KIBANA
+
+The API returns created runtime field object and update index pattern object:
+
+[source,sh]
+--------------------------------------------------
+{
+    "index_pattern": {...},
+    "field": {...}
+}
+--------------------------------------------------
diff --git a/docs/api/index-patterns/runtime-fields/delete.asciidoc b/docs/api/index-patterns/runtime-fields/delete.asciidoc
new file mode 100644
index 0000000000000..840789fe1ec23
--- /dev/null
+++ b/docs/api/index-patterns/runtime-fields/delete.asciidoc
@@ -0,0 +1,37 @@
+[[index-patterns-runtime-field-api-delete]]
+=== Delete runtime field API
+++++
+<titleabbrev>Delete runtime field</titleabbrev>
+++++
+
+experimental[] Delete a runtime field from an index pattern.
+
+[[index-patterns-runtime-field-api-delete-request]]
+==== Request
+
+`DELETE <kibana host>:<port>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field/<name>`
+
+`DELETE <kibana host>:<port>/s/<space_id>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field/<name>`
+
+[[index-patterns-runtime-field-api-delete-path-params]]
+==== Path parameters
+
+`space_id`::
+(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
+
+`index_pattern_id`::
+(Required, string) The ID of the index pattern your want to delete a runtime field from.
+
+`name`::
+(Required, string) The name of the runtime field you want to delete.
+
+
+==== Example
+
+Delete a runtime field from an index pattern:
+
+[source,sh]
+--------------------------------------------------
+$ curl -X DELETE api/index_patterns/index_pattern/<my-pattern>/runtime_field/<runtime-field-name>
+--------------------------------------------------
+// KIBANA
diff --git a/docs/api/index-patterns/runtime-fields/get.asciidoc b/docs/api/index-patterns/runtime-fields/get.asciidoc
new file mode 100644
index 0000000000000..42bd209c708bc
--- /dev/null
+++ b/docs/api/index-patterns/runtime-fields/get.asciidoc
@@ -0,0 +1,52 @@
+[[index-patterns-runtime-field-api-get]]
+=== Get runtime field API
+++++
+<titleabbrev>Get runtime field</titleabbrev>
+++++
+
+experimental[] Get a runtime field
+
+[[index-patterns-runtime-field-get-request]]
+==== Request
+
+`GET <kibana host>:<port>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field/<name>`
+
+`GET <kibana host>:<port>/s/<space_id>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field/<name>`
+
+[[index-patterns-runtime-field-get-params]]
+==== Path parameters
+
+`space_id`::
+(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
+
+`index_pattern_id`::
+(Required, string) The ID of the index pattern.
+
+`name`::
+(Required, string) The name of the runtime field you want to retrieve.
+
+
+[[index-patterns-runtime-field-get-example]]
+==== Example
+
+Retrieve a runtime field named `foo` of index pattern with the `my-pattern` ID:
+
+[source,sh]
+--------------------------------------------------
+$ curl -X GET api/index_patterns/index_pattern/my-pattern/runtime_field/foo
+--------------------------------------------------
+// KIBANA
+
+The API returns a runtime `field` object, and a `runtimeField` definition object:
+
+[source,sh]
+--------------------------------------------------
+{
+    "field": {
+        ...
+    },
+    "runtimeField": {
+        ...
+    }
+}
+--------------------------------------------------
diff --git a/docs/api/index-patterns/runtime-fields/update.asciidoc b/docs/api/index-patterns/runtime-fields/update.asciidoc
new file mode 100644
index 0000000000000..f34460896f7bc
--- /dev/null
+++ b/docs/api/index-patterns/runtime-fields/update.asciidoc
@@ -0,0 +1,66 @@
+[[index-patterns-runtime-field-api-update]]
+=== Update runtime field API
+++++
+<titleabbrev>Update runtime field</titleabbrev>
+++++
+
+experimental[] Update an existing runtime field
+
+[[index-patterns-runtime-field-update-request]]
+==== Request
+
+`POST <kibana host>:<port>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field/<name>`
+
+`POST <kibana host>:<port>/s/<space_id>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field/<name>`
+
+[[index-patterns-runtime-field-update-params]]
+==== Path parameters
+
+`space_id`::
+(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
+
+`index_pattern_id`::
+(Required, string) The ID of the index pattern.
+
+`name`::
+(Required, string) The name of the runtime field you want to update.
+
+[[index-patterns-runtime-field-update-body]]
+==== Request body
+
+`runtimeField`:: (Required, object) The runtime field definition object.
+
+You can update following fields:
+
+* `type`
+* `script`
+
+
+
+[[index-patterns-runtime-field-update-example]]
+==== Examples
+
+Update an existing runtime field on an index pattern:
+
+[source,sh]
+--------------------------------------------------
+$ curl -X POST api/index_patterns/index_pattern/<index_pattern_id>/runtime_field/<runtime_field_name>
+{
+  "runtimeField": {
+     "script": {
+        "source": "emit(doc["bar"].value)"
+      }
+  }
+}
+--------------------------------------------------
+// KIBANA
+
+The API returns updated runtime field object and updated index pattern object:
+
+[source,sh]
+--------------------------------------------------
+{
+    "index_pattern": {...},
+    "field": {...}
+}
+--------------------------------------------------
diff --git a/docs/api/index-patterns/runtime-fields/upsert.asciidoc b/docs/api/index-patterns/runtime-fields/upsert.asciidoc
new file mode 100644
index 0000000000000..1b436db19c62e
--- /dev/null
+++ b/docs/api/index-patterns/runtime-fields/upsert.asciidoc
@@ -0,0 +1,61 @@
+[[index-patterns-runtime-field-api-upsert]]
+=== Upsert runtime field API
+++++
+<titleabbrev>Upsert runtime field</titleabbrev>
+++++
+
+experimental[] Create or update an existing runtime field
+
+[[index-patterns-runtime-field-upsert-request]]
+==== Request
+
+`PUT <kibana host>:<port>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field`
+
+`PUT <kibana host>:<port>/s/<space_id>/api/index_patterns/index_pattern/<index_pattern_id>/runtime_field`
+
+[[index-patterns-runtime-field-upsert-params]]
+==== Path parameters
+
+`space_id`::
+(Optional, string) An identifier for the space. If `space_id` is not provided in the URL, the default space is used.
+
+`index_pattern_id`::
+(Required, string) The ID of the index pattern.
+
+[[index-patterns-runtime-field-upsert-body]]
+==== Request body
+
+`name`:: (Required, string) The name for a new runtime field or a name of an existing runtime field.
+
+`runtimeField`:: (Required, object) The runtime field definition object.
+
+
+[[index-patterns-runtime-field-upsert-example]]
+==== Examples
+
+Create or update an existing runtime field on an index pattern:
+
+[source,sh]
+--------------------------------------------------
+$ curl -X PUT api/index_patterns/index_pattern/<index_pattern_id>/runtime_field
+{
+  "name": "runtimeFoo",
+  "runtimeField": {
+     "type": "long",
+     "script": {
+        "source": "emit(doc["foo"].value)"
+      }
+  }
+}
+--------------------------------------------------
+// KIBANA
+
+The API returns created or updated runtime field object and updated index pattern object:
+
+[source,sh]
+--------------------------------------------------
+{
+    "index_pattern": {...},
+    "field": {...}
+}
+--------------------------------------------------
diff --git a/docs/api/index-patterns/update.asciidoc b/docs/api/index-patterns/update.asciidoc
index 8ed0ff89fb928..2d5fe882d448d 100644
--- a/docs/api/index-patterns/update.asciidoc
+++ b/docs/api/index-patterns/update.asciidoc
@@ -93,7 +93,8 @@ $ curl -X POST api/saved_objects/index-pattern/my-pattern
     "fieldFormats": {},
     "type": "...",
     "typeMeta": {},
-    "fields": {}
+    "fields": {},
+    "runtimeFieldMap": {}
   }
 }
 --------------------------------------------------
diff --git a/docs/developer/contributing/development-functional-tests.asciidoc b/docs/developer/contributing/development-functional-tests.asciidoc
index f0041b85c14eb..6f5c05f526bd6 100644
--- a/docs/developer/contributing/development-functional-tests.asciidoc
+++ b/docs/developer/contributing/development-functional-tests.asciidoc
@@ -229,9 +229,9 @@ export default function ({ getService, getPageObject }) {
     before(async () => {
       await Promise.all([
         // start with an empty .kibana index
-        esArchiver.load('empty_kibana'),
+        esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana'),
         // load some basic log data only if the index doesn't exist
-        esArchiver.loadIfNeeded('makelogs')
+        esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/makelogs')
       ]);
       // go to the page described by `apps.visualize` in the config
       await PageObjects.common.navigateTo('visualize');
@@ -243,7 +243,7 @@ export default function ({ getService, getPageObject }) {
       // we unload the empty_kibana archive but not the makelogs
       // archive because we don't make any changes to it, and subsequent
       // suites could use it if they call `.loadIfNeeded()`.
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/empty_kibana');
     });
 
     // This series of tests illustrate how tests generally verify
@@ -370,9 +370,9 @@ await testSubjects.click(‘containerButton’);
 * Source: {blob}test/common/services/es_archiver.ts[test/common/services/es_archiver.ts]
 * Load/unload archives created with the `esArchiver`
 * Popular methods:
-** `esArchiver.load(name)`
-** `esArchiver.loadIfNeeded(name)`
-** `esArchiver.unload(name)`
+** `esArchiver.load(path)`
+** `esArchiver.loadIfNeeded(path)`
+** `esArchiver.unload(path)`
 
 Full list of services that are used in functional tests can be found here: {blob}test/functional/services[test/functional/services]
 
diff --git a/docs/developer/getting-started/index.asciidoc b/docs/developer/getting-started/index.asciidoc
index 5ab0581201959..a28a95605bc6a 100644
--- a/docs/developer/getting-started/index.asciidoc
+++ b/docs/developer/getting-started/index.asciidoc
@@ -14,9 +14,14 @@ In order to support Windows development we currently require you to use one of t
 
 As well as installing https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015].
 
+In addition we also require you to do the following:
+
+- Install https://www.microsoft.com/en-us/download/details.aspx?id=48145[Visual C++ Redistributable for Visual Studio 2015]
+- Enable the https://docs.microsoft.com/en-us/windows/apps/get-started/enable-your-device-for-development[Windows Developer Mode]
+- Enable https://docs.microsoft.com/en-us/windows-server/administration/windows-commands/fsutil-8dot3name[8.3 filename support] by running the following command in a windows command prompt with admin rights `fsutil 8dot3name set 0`
+
 Before running the steps listed below, please make sure you have installed everything 
-that we require and listed above and that you are running the mentioned commands 
-through Git bash or WSL.
+that we require and listed above and that you are running all the commands from now on through Git bash or WSL.
 
 [discrete]
 [[get-kibana-code]]
@@ -92,6 +97,10 @@ may need to run:
 yarn kbn clean
 ----
 
+NOTE: Running this command is only necessary in rare circumstance where you need to recover
+a consistent state when problems arise. If you need to run this command often, complete
+this form to provide feedback: https://ela.st/yarn-kbn-clean
+
 If you have failures during `yarn kbn bootstrap` you may have some
 corrupted packages in your yarn cache which you can clean with:
 
diff --git a/docs/developer/getting-started/monorepo-packages.asciidoc b/docs/developer/getting-started/monorepo-packages.asciidoc
index dbfbe90ec9263..029ee9ea4faf6 100644
--- a/docs/developer/getting-started/monorepo-packages.asciidoc
+++ b/docs/developer/getting-started/monorepo-packages.asciidoc
@@ -85,6 +85,7 @@ yarn kbn watch-bazel
 - @kbn/logging
 - @kbn/mapbox-gl
 - @kbn/monaco
+- @kbn/rule-data-utils
 - @kbn/securitysolution-es-utils
 - @kbn/securitysolution-io-ts-alerting-types
 - @kbn/securitysolution-io-ts-list-types
diff --git a/docs/developer/plugin-list.asciidoc b/docs/developer/plugin-list.asciidoc
index 087626240ff33..6675a8dd283c9 100644
--- a/docs/developer/plugin-list.asciidoc
+++ b/docs/developer/plugin-list.asciidoc
@@ -265,6 +265,10 @@ The plugin exposes the static DefaultEditorController class to consume.
 |Contains the metric visualization.
 
 
+|{kib-repo}blob/{branch}/src/plugins/vis_type_pie/README.md[visTypePie]
+|Contains the pie chart implementation using the elastic-charts library. The goal is to eventually deprecate the old implementation and keep only this. Until then, the library used is defined by the Legacy charts library advanced setting.
+
+
 |{kib-repo}blob/{branch}/src/plugins/vis_type_table/README.md[visTypeTable]
 |Contains the data table visualization, that allows presenting data in a simple table format.
 
@@ -365,6 +369,10 @@ The client-side plugin configures following values:
 |The data_enhanced plugin is the x-pack counterpart to the src/plguins/data plugin.
 
 
+|{kib-repo}blob/{branch}/x-pack/plugins/data_visualizer/README.md[dataVisualizer]
+|The data_visualizer plugin enables you to explore the fields in your data.
+
+
 |{kib-repo}blob/{branch}/x-pack/plugins/discover_enhanced/README.md[discoverEnhanced]
 |Contains the enhancements to the OSS discover app.
 
@@ -392,10 +400,6 @@ actitivies.
 |The features plugin enhance Kibana with a per-feature privilege system.
 
 
-|{kib-repo}blob/{branch}/x-pack/plugins/file_data_visualizer[fileDataVisualizer]
-|WARNING: Missing README.
-
-
 |{kib-repo}blob/{branch}/x-pack/plugins/file_upload[fileUpload]
 |WARNING: Missing README.
 
diff --git a/docs/developer/plugin/external-plugin-functional-tests.asciidoc b/docs/developer/plugin/external-plugin-functional-tests.asciidoc
index b39d576d85268..55b311794f9dc 100644
--- a/docs/developer/plugin/external-plugin-functional-tests.asciidoc
+++ b/docs/developer/plugin/external-plugin-functional-tests.asciidoc
@@ -58,11 +58,6 @@ export default async function ({ readConfigFile }) {
       }
     },
 
-    // choose where esArchiver should load archives from
-    esArchiver: {
-      directory: resolve(__dirname, './es_archives'),
-    },
-
     // choose where screenshots should be saved
     screenshots: {
       directory: resolve(__dirname, './tmp/screenshots'),
diff --git a/docs/development/core/public/kibana-plugin-core-public.app.euiicontype.md b/docs/development/core/public/kibana-plugin-core-public.app.euiicontype.md
deleted file mode 100644
index ff79d832f92e2..0000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.app.euiicontype.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [euiIconType](./kibana-plugin-core-public.app.euiicontype.md)
-
-## App.euiIconType property
-
-A EUI iconType that will be used for the app's icon. This icon takes precendence over the `icon` property.
-
-<b>Signature:</b>
-
-```typescript
-euiIconType?: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.app.icon.md b/docs/development/core/public/kibana-plugin-core-public.app.icon.md
deleted file mode 100644
index 98260da5d2021..0000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.app.icon.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [icon](./kibana-plugin-core-public.app.icon.md)
-
-## App.icon property
-
-A URL to an image file used as an icon. Used as a fallback if `euiIconType` is not provided.
-
-<b>Signature:</b>
-
-```typescript
-icon?: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.app.md b/docs/development/core/public/kibana-plugin-core-public.app.md
index 721d9a2f121c7..d79a12a83367d 100644
--- a/docs/development/core/public/kibana-plugin-core-public.app.md
+++ b/docs/development/core/public/kibana-plugin-core-public.app.md
@@ -8,7 +8,7 @@
 <b>Signature:</b>
 
 ```typescript
-export interface App<HistoryLocationState = unknown> 
+export interface App<HistoryLocationState = unknown> extends AppNavOptions 
 ```
 
 ## Properties
@@ -21,16 +21,13 @@ export interface App<HistoryLocationState = unknown>
 |  [chromeless](./kibana-plugin-core-public.app.chromeless.md) | <code>boolean</code> | Hide the UI chrome when the application is mounted. Defaults to <code>false</code>. Takes precedence over chrome service visibility settings. |
 |  [deepLinks](./kibana-plugin-core-public.app.deeplinks.md) | <code>AppDeepLink[]</code> | Input type for registering secondary in-app locations for an application.<!-- -->Deep links must include at least one of <code>path</code> or <code>deepLinks</code>. A deep link that does not have a <code>path</code> represents a topological level in the application's hierarchy, but does not have a destination URL that is user-accessible. |
 |  [defaultPath](./kibana-plugin-core-public.app.defaultpath.md) | <code>string</code> | Allow to define the default path a user should be directed to when navigating to the app. When defined, this value will be used as a default for the <code>path</code> option when calling [navigateToApp](./kibana-plugin-core-public.applicationstart.navigatetoapp.md)<!-- -->\`<!-- -->, and will also be appended to the [application navLink](./kibana-plugin-core-public.chromenavlink.md) in the navigation bar. |
-|  [euiIconType](./kibana-plugin-core-public.app.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
 |  [exactRoute](./kibana-plugin-core-public.app.exactroute.md) | <code>boolean</code> | If set to true, the application's route will only be checked against an exact match. Defaults to <code>false</code>. |
-|  [icon](./kibana-plugin-core-public.app.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
 |  [id](./kibana-plugin-core-public.app.id.md) | <code>string</code> | The unique identifier of the application |
 |  [keywords](./kibana-plugin-core-public.app.keywords.md) | <code>string[]</code> | Optional keywords to match with in deep links search. Omit if this part of the hierarchy does not have a page URL. |
 |  [mount](./kibana-plugin-core-public.app.mount.md) | <code>AppMount&lt;HistoryLocationState&gt;</code> | A mount function called when the user navigates to this app's route. |
 |  [navLinkStatus](./kibana-plugin-core-public.app.navlinkstatus.md) | <code>AppNavLinkStatus</code> | The initial status of the application's navLink. Defaulting to <code>visible</code> if <code>status</code> is <code>accessible</code> and <code>hidden</code> if status is <code>inaccessible</code> See [AppNavLinkStatus](./kibana-plugin-core-public.appnavlinkstatus.md) |
-|  [order](./kibana-plugin-core-public.app.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
+|  [searchable](./kibana-plugin-core-public.app.searchable.md) | <code>boolean</code> | The initial flag to determine if the application is searchable in the global search. Defaulting to <code>true</code> if <code>navLinkStatus</code> is <code>visible</code> or omitted. |
 |  [status](./kibana-plugin-core-public.app.status.md) | <code>AppStatus</code> | The initial status of the application. Defaulting to <code>accessible</code> |
 |  [title](./kibana-plugin-core-public.app.title.md) | <code>string</code> | The title of the application. |
-|  [tooltip](./kibana-plugin-core-public.app.tooltip.md) | <code>string</code> | A tooltip shown when hovering over app link. |
 |  [updater$](./kibana-plugin-core-public.app.updater_.md) | <code>Observable&lt;AppUpdater&gt;</code> | An [AppUpdater](./kibana-plugin-core-public.appupdater.md) observable that can be used to update the application [AppUpdatableFields](./kibana-plugin-core-public.appupdatablefields.md) at runtime. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.app.order.md b/docs/development/core/public/kibana-plugin-core-public.app.order.md
deleted file mode 100644
index bb6be116b6b58..0000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.app.order.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [order](./kibana-plugin-core-public.app.order.md)
-
-## App.order property
-
-An ordinal used to sort nav links relative to one another for display.
-
-<b>Signature:</b>
-
-```typescript
-order?: number;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.app.searchable.md b/docs/development/core/public/kibana-plugin-core-public.app.searchable.md
new file mode 100644
index 0000000000000..ab1b559a7f6a1
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.app.searchable.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; [App](./kibana-plugin-core-public.app.md) &gt; [searchable](./kibana-plugin-core-public.app.searchable.md)
+
+## App.searchable property
+
+The initial flag to determine if the application is searchable in the global search. Defaulting to `true` if `navLinkStatus` is `visible` or omitted.
+
+<b>Signature:</b>
+
+```typescript
+searchable?: boolean;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.app.tooltip.md b/docs/development/core/public/kibana-plugin-core-public.app.tooltip.md
deleted file mode 100644
index e901de0fdccc9..0000000000000
--- a/docs/development/core/public/kibana-plugin-core-public.app.tooltip.md
+++ /dev/null
@@ -1,13 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-public](./kibana-plugin-core-public.md) &gt; [App](./kibana-plugin-core-public.app.md) &gt; [tooltip](./kibana-plugin-core-public.app.tooltip.md)
-
-## App.tooltip property
-
-A tooltip shown when hovering over app link.
-
-<b>Signature:</b>
-
-```typescript
-tooltip?: string;
-```
diff --git a/docs/development/core/public/kibana-plugin-core-public.appdeeplink.md b/docs/development/core/public/kibana-plugin-core-public.appdeeplink.md
index 5aa951cffdcb5..30fd3085a4341 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appdeeplink.md
+++ b/docs/development/core/public/kibana-plugin-core-public.appdeeplink.md
@@ -16,7 +16,8 @@ export declare type AppDeepLink = {
     title: string;
     keywords?: string[];
     navLinkStatus?: AppNavLinkStatus;
-} & ({
+    searchable?: boolean;
+} & AppNavOptions & ({
     path: string;
     deepLinks?: AppDeepLink[];
 } | {
diff --git a/docs/development/core/public/kibana-plugin-core-public.appnavoptions.euiicontype.md b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.euiicontype.md
new file mode 100644
index 0000000000000..069eccf63a235
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.euiicontype.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; [AppNavOptions](./kibana-plugin-core-public.appnavoptions.md) &gt; [euiIconType](./kibana-plugin-core-public.appnavoptions.euiicontype.md)
+
+## AppNavOptions.euiIconType property
+
+A EUI iconType that will be used for the app's icon. This icon takes precendence over the `icon` property.
+
+<b>Signature:</b>
+
+```typescript
+euiIconType?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.appnavoptions.icon.md b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.icon.md
new file mode 100644
index 0000000000000..3b809fc4aec39
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.icon.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; [AppNavOptions](./kibana-plugin-core-public.appnavoptions.md) &gt; [icon](./kibana-plugin-core-public.appnavoptions.icon.md)
+
+## AppNavOptions.icon property
+
+A URL to an image file used as an icon. Used as a fallback if `euiIconType` is not provided.
+
+<b>Signature:</b>
+
+```typescript
+icon?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.appnavoptions.md b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.md
new file mode 100644
index 0000000000000..52c28c861dc70
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.md
@@ -0,0 +1,23 @@
+<!-- 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; [AppNavOptions](./kibana-plugin-core-public.appnavoptions.md)
+
+## AppNavOptions interface
+
+App navigation menu options
+
+<b>Signature:</b>
+
+```typescript
+export interface AppNavOptions 
+```
+
+## Properties
+
+|  Property | Type | Description |
+|  --- | --- | --- |
+|  [euiIconType](./kibana-plugin-core-public.appnavoptions.euiicontype.md) | <code>string</code> | A EUI iconType that will be used for the app's icon. This icon takes precendence over the <code>icon</code> property. |
+|  [icon](./kibana-plugin-core-public.appnavoptions.icon.md) | <code>string</code> | A URL to an image file used as an icon. Used as a fallback if <code>euiIconType</code> is not provided. |
+|  [order](./kibana-plugin-core-public.appnavoptions.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
+|  [tooltip](./kibana-plugin-core-public.appnavoptions.tooltip.md) | <code>string</code> | A tooltip shown when hovering over app link. |
+
diff --git a/docs/development/core/public/kibana-plugin-core-public.appnavoptions.order.md b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.order.md
new file mode 100644
index 0000000000000..ca7ae482a04ad
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.order.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; [AppNavOptions](./kibana-plugin-core-public.appnavoptions.md) &gt; [order](./kibana-plugin-core-public.appnavoptions.order.md)
+
+## AppNavOptions.order property
+
+An ordinal used to sort nav links relative to one another for display.
+
+<b>Signature:</b>
+
+```typescript
+order?: number;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.appnavoptions.tooltip.md b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.tooltip.md
new file mode 100644
index 0000000000000..97c18c2e56a1e
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.appnavoptions.tooltip.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; [AppNavOptions](./kibana-plugin-core-public.appnavoptions.md) &gt; [tooltip](./kibana-plugin-core-public.appnavoptions.tooltip.md)
+
+## AppNavOptions.tooltip property
+
+A tooltip shown when hovering over app link.
+
+<b>Signature:</b>
+
+```typescript
+tooltip?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md b/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md
index d7b12d4b70701..c24da05abe7ec 100644
--- a/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md
+++ b/docs/development/core/public/kibana-plugin-core-public.appupdatablefields.md
@@ -9,5 +9,5 @@ Defines the list of fields that can be updated via an [AppUpdater](./kibana-plug
 <b>Signature:</b>
 
 ```typescript
-export declare type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath' | 'deepLinks'>;
+export declare type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'searchable' | 'tooltip' | 'defaultPath' | 'deepLinks'>;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md
index dfe8f119505aa..c7dd461617e34 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.md
@@ -26,5 +26,5 @@ export interface ChromeNavLink
 |  [order](./kibana-plugin-core-public.chromenavlink.order.md) | <code>number</code> | An ordinal used to sort nav links relative to one another for display. |
 |  [title](./kibana-plugin-core-public.chromenavlink.title.md) | <code>string</code> | The title of the application. |
 |  [tooltip](./kibana-plugin-core-public.chromenavlink.tooltip.md) | <code>string</code> | A tooltip shown when hovering over an app link. |
-|  [url](./kibana-plugin-core-public.chromenavlink.url.md) | <code>string</code> | The route used to open the  of an application. If unset, <code>baseUrl</code> will be used instead. |
+|  [url](./kibana-plugin-core-public.chromenavlink.url.md) | <code>string</code> | The route used to open the default path and the deep links of an application. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md
index 833930c494786..b9d12e450df50 100644
--- a/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md
+++ b/docs/development/core/public/kibana-plugin-core-public.chromenavlink.url.md
@@ -4,10 +4,10 @@
 
 ## ChromeNavLink.url property
 
-The route used to open the  of an application. If unset, `baseUrl` will be used instead.
+The route used to open the default path and the deep links of an application.
 
 <b>Signature:</b>
 
 ```typescript
-readonly url?: string;
+readonly url: string;
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.md b/docs/development/core/public/kibana-plugin-core-public.md
index 6239279f275d1..f341a7cd9315f 100644
--- a/docs/development/core/public/kibana-plugin-core-public.md
+++ b/docs/development/core/public/kibana-plugin-core-public.md
@@ -38,6 +38,7 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [ApplicationSetup](./kibana-plugin-core-public.applicationsetup.md) |  |
 |  [ApplicationStart](./kibana-plugin-core-public.applicationstart.md) |  |
 |  [AppMountParameters](./kibana-plugin-core-public.appmountparameters.md) |  |
+|  [AppNavOptions](./kibana-plugin-core-public.appnavoptions.md) | App navigation menu options |
 |  [AsyncPlugin](./kibana-plugin-core-public.asyncplugin.md) | A plugin with asynchronous lifecycle methods. |
 |  [Capabilities](./kibana-plugin-core-public.capabilities.md) | The read-only set of capabilities available for the current UI session. Capabilities are simple key-value pairs of (string, boolean), where the string denotes the capability ID, and the boolean is a flag indicating if the capability is enabled or disabled. |
 |  [ChromeBadge](./kibana-plugin-core-public.chromebadge.md) |  |
diff --git a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.deeplinkid.md b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.deeplinkid.md
new file mode 100644
index 0000000000000..4039e1338fc1c
--- /dev/null
+++ b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.deeplinkid.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; [NavigateToAppOptions](./kibana-plugin-core-public.navigatetoappoptions.md) &gt; [deepLinkId](./kibana-plugin-core-public.navigatetoappoptions.deeplinkid.md)
+
+## NavigateToAppOptions.deepLinkId property
+
+optional [deep link](./kibana-plugin-core-public.app.deeplinks.md) id inside the application to navigate to. If an additional [path](./kibana-plugin-core-public.navigatetoappoptions.path.md) is defined it will be appended to the deep link path.
+
+<b>Signature:</b>
+
+```typescript
+deepLinkId?: string;
+```
diff --git a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md
index 79b59a19508e7..7b01bab056d84 100644
--- a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md
+++ b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.md
@@ -16,8 +16,9 @@ export interface NavigateToAppOptions
 
 |  Property | Type | Description |
 |  --- | --- | --- |
+|  [deepLinkId](./kibana-plugin-core-public.navigatetoappoptions.deeplinkid.md) | <code>string</code> | optional [deep link](./kibana-plugin-core-public.app.deeplinks.md) id inside the application to navigate to. If an additional [path](./kibana-plugin-core-public.navigatetoappoptions.path.md) is defined it will be appended to the deep link path. |
 |  [openInNewTab](./kibana-plugin-core-public.navigatetoappoptions.openinnewtab.md) | <code>boolean</code> | if true, will open the app in new tab, will share session information via window.open if base |
-|  [path](./kibana-plugin-core-public.navigatetoappoptions.path.md) | <code>string</code> | optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.app.defaultpath.md)<!-- -->\` as default. |
+|  [path](./kibana-plugin-core-public.navigatetoappoptions.path.md) | <code>string</code> | optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.app.defaultpath.md) as default. |
 |  [replace](./kibana-plugin-core-public.navigatetoappoptions.replace.md) | <code>boolean</code> | if true, will not create a new history entry when navigating (using <code>replace</code> instead of <code>push</code>) |
 |  [state](./kibana-plugin-core-public.navigatetoappoptions.state.md) | <code>unknown</code> | optional state to forward to the application |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md
index 095553d05778c..b39fc8c324ad9 100644
--- a/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md
+++ b/docs/development/core/public/kibana-plugin-core-public.navigatetoappoptions.path.md
@@ -4,7 +4,7 @@
 
 ## NavigateToAppOptions.path property
 
-optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.app.defaultpath.md)<!-- -->\` as default.
+optional path inside application to deep link to. If undefined, will use [the app's default path](./kibana-plugin-core-public.app.defaultpath.md) as default.
 
 <b>Signature:</b>
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.publicappdeeplinkinfo.md b/docs/development/core/public/kibana-plugin-core-public.publicappdeeplinkinfo.md
index d3a6a4de905fd..40fd98687c619 100644
--- a/docs/development/core/public/kibana-plugin-core-public.publicappdeeplinkinfo.md
+++ b/docs/development/core/public/kibana-plugin-core-public.publicappdeeplinkinfo.md
@@ -9,9 +9,10 @@ Public information about a registered app's [deepLinks](./kibana-plugin-core-pub
 <b>Signature:</b>
 
 ```typescript
-export declare type PublicAppDeepLinkInfo = Omit<AppDeepLink, 'deepLinks' | 'keywords' | 'navLinkStatus'> & {
+export declare type PublicAppDeepLinkInfo = Omit<AppDeepLink, 'deepLinks' | 'keywords' | 'navLinkStatus' | 'searchable'> & {
     deepLinks: PublicAppDeepLinkInfo[];
     keywords: string[];
     navLinkStatus: AppNavLinkStatus;
+    searchable: boolean;
 };
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md b/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
index a5563eae83563..01d23ae47a0d9 100644
--- a/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
+++ b/docs/development/core/public/kibana-plugin-core-public.publicappinfo.md
@@ -9,11 +9,12 @@ Public information about a registered [application](./kibana-plugin-core-public.
 <b>Signature:</b>
 
 ```typescript
-export declare type PublicAppInfo = Omit<App, 'mount' | 'updater$' | 'keywords' | 'deepLinks'> & {
+export declare type PublicAppInfo = Omit<App, 'mount' | 'updater$' | 'keywords' | 'deepLinks' | 'searchable'> & {
     status: AppStatus;
     navLinkStatus: AppNavLinkStatus;
     appRoute: string;
     keywords: string[];
     deepLinks: PublicAppDeepLinkInfo[];
+    searchable: boolean;
 };
 ```
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
index 7be45c6c173b4..706408f81f02a 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.md
@@ -30,7 +30,7 @@ export interface SavedObjectsFindOptions
 |  [searchAfter](./kibana-plugin-core-public.savedobjectsfindoptions.searchafter.md) | <code>estypes.Id[]</code> | Use the sort values from the previous page to retrieve the next page of results. |
 |  [searchFields](./kibana-plugin-core-public.savedobjectsfindoptions.searchfields.md) | <code>string[]</code> | The fields to perform the parsed query against. See Elasticsearch Simple Query String <code>fields</code> argument for more information |
 |  [sortField](./kibana-plugin-core-public.savedobjectsfindoptions.sortfield.md) | <code>string</code> |  |
-|  [sortOrder](./kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md) | <code>estypes.SortOrder</code> |  |
+|  [sortOrder](./kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md) | <code>estypes.SearchSortOrder</code> |  |
 |  [type](./kibana-plugin-core-public.savedobjectsfindoptions.type.md) | <code>string &#124; string[]</code> |  |
 |  [typeToNamespacesMap](./kibana-plugin-core-public.savedobjectsfindoptions.typetonamespacesmap.md) | <code>Map&lt;string, string[] &#124; undefined&gt;</code> | This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the <code>type</code> and <code>namespaces</code> fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
 
diff --git a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md
index 36f99e51ea8c6..506fb9041e353 100644
--- a/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md
+++ b/docs/development/core/public/kibana-plugin-core-public.savedobjectsfindoptions.sortorder.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-sortOrder?: estypes.SortOrder;
+sortOrder?: estypes.SearchSortOrder;
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.correctiveactions.md b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.correctiveactions.md
index e362bc4e0329c..447823a5c3491 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.correctiveactions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.correctiveactions.md
@@ -15,6 +15,6 @@ correctiveActions: {
                 [key: string]: any;
             };
         };
-        manualSteps?: string[];
+        manualSteps: string[];
     };
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.deprecationtype.md b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.deprecationtype.md
new file mode 100644
index 0000000000000..3a76bc60ee630
--- /dev/null
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.deprecationtype.md
@@ -0,0 +1,15 @@
+<!-- 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; [DeprecationsDetails](./kibana-plugin-core-server.deprecationsdetails.md) &gt; [deprecationType](./kibana-plugin-core-server.deprecationsdetails.deprecationtype.md)
+
+## DeprecationsDetails.deprecationType property
+
+(optional) Used to identify between different deprecation types. Example use case: in Upgrade Assistant, we may want to allow the user to sort by deprecation type or show each type in a separate tab.
+
+Feel free to add new types if necessary. Predefined types are necessary to reduce having similar definitions with different keywords across kibana deprecations.
+
+<b>Signature:</b>
+
+```typescript
+deprecationType?: 'config' | 'feature';
+```
diff --git a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md
index bb77e4247711f..7592b8486d950 100644
--- a/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md
+++ b/docs/development/core/server/kibana-plugin-core-server.deprecationsdetails.md
@@ -14,7 +14,8 @@ export interface DeprecationsDetails
 
 |  Property | Type | Description |
 |  --- | --- | --- |
-|  [correctiveActions](./kibana-plugin-core-server.deprecationsdetails.correctiveactions.md) | <code>{</code><br/><code>        api?: {</code><br/><code>            path: string;</code><br/><code>            method: 'POST' &#124; 'PUT';</code><br/><code>            body?: {</code><br/><code>                [key: string]: any;</code><br/><code>            };</code><br/><code>        };</code><br/><code>        manualSteps?: string[];</code><br/><code>    }</code> |  |
+|  [correctiveActions](./kibana-plugin-core-server.deprecationsdetails.correctiveactions.md) | <code>{</code><br/><code>        api?: {</code><br/><code>            path: string;</code><br/><code>            method: 'POST' &#124; 'PUT';</code><br/><code>            body?: {</code><br/><code>                [key: string]: any;</code><br/><code>            };</code><br/><code>        };</code><br/><code>        manualSteps: string[];</code><br/><code>    }</code> |  |
+|  [deprecationType](./kibana-plugin-core-server.deprecationsdetails.deprecationtype.md) | <code>'config' &#124; 'feature'</code> | (optional) Used to identify between different deprecation types. Example use case: in Upgrade Assistant, we may want to allow the user to sort by deprecation type or show each type in a separate tab.<!-- -->Feel free to add new types if necessary. Predefined types are necessary to reduce having similar definitions with different keywords across kibana deprecations. |
 |  [documentationUrl](./kibana-plugin-core-server.deprecationsdetails.documentationurl.md) | <code>string</code> |  |
 |  [level](./kibana-plugin-core-server.deprecationsdetails.level.md) | <code>'warning' &#124; 'critical' &#124; 'fetch_error'</code> | levels: - warning: will not break deployment upon upgrade - critical: needs to be addressed before upgrade. - fetch\_error: Deprecations service failed to grab the deprecation details for the domain. |
 |  [message](./kibana-plugin-core-server.deprecationsdetails.message.md) | <code>string</code> |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.md b/docs/development/core/server/kibana-plugin-core-server.md
index 32a2f3312708c..604cdea1a7fbe 100644
--- a/docs/development/core/server/kibana-plugin-core-server.md
+++ b/docs/development/core/server/kibana-plugin-core-server.md
@@ -159,8 +159,6 @@ The plugin integrates with the core system via lifecycle events: `setup`<!-- -->
 |  [SavedObjectsCollectMultiNamespaceReferencesObject](./kibana-plugin-core-server.savedobjectscollectmultinamespacereferencesobject.md) | An object to collect references for. It must be a multi-namespace type (in other words, the object type must be registered with the <code>namespaceType: 'multiple'</code> or <code>namespaceType: 'multiple-isolated'</code> option).<!-- -->Note: if options.purpose is 'updateObjectsSpaces', it must be a shareable type (in other words, the object type must be registered with the <code>namespaceType: 'multiple'</code>). |
 |  [SavedObjectsCollectMultiNamespaceReferencesOptions](./kibana-plugin-core-server.savedobjectscollectmultinamespacereferencesoptions.md) | Options for collecting references. |
 |  [SavedObjectsCollectMultiNamespaceReferencesResponse](./kibana-plugin-core-server.savedobjectscollectmultinamespacereferencesresponse.md) | The response when object references are collected. |
-|  [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
-|  [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) | See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation. |
 |  [SavedObjectsCreateOptions](./kibana-plugin-core-server.savedobjectscreateoptions.md) |  |
 |  [SavedObjectsCreatePointInTimeFinderDependencies](./kibana-plugin-core-server.savedobjectscreatepointintimefinderdependencies.md) |  |
 |  [SavedObjectsDeleteByNamespaceOptions](./kibana-plugin-core-server.savedobjectsdeletebynamespaceoptions.md) |  |
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md
deleted file mode 100644
index 3f2d81cc97c7c..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) &gt; [doc\_values](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md)
-
-## SavedObjectsComplexFieldMapping.doc\_values property
-
-<b>Signature:</b>
-
-```typescript
-doc_values?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md
deleted file mode 100644
index b01da3c62fda6..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md
+++ /dev/null
@@ -1,15 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) &gt; [dynamic](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md)
-
-## SavedObjectsComplexFieldMapping.dynamic property
-
-The dynamic property of the mapping, either `false` or `'strict'`<!-- -->. If unspecified `dynamic: 'strict'` will be inherited from the top-level index mappings.
-
-Note: To limit the number of mapping fields Saved Object types should \*never\* use `dynamic: true`<!-- -->.
-
-<b>Signature:</b>
-
-```typescript
-dynamic?: false | 'strict';
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md
deleted file mode 100644
index 08513aa2a849b..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) &gt; [enabled](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md)
-
-## SavedObjectsComplexFieldMapping.enabled property
-
-<b>Signature:</b>
-
-```typescript
-enabled?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md
deleted file mode 100644
index fc262cad54f18..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md)
-
-## SavedObjectsComplexFieldMapping interface
-
-See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.
-
-<b>Signature:</b>
-
-```typescript
-export interface SavedObjectsComplexFieldMapping 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [doc\_values](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.doc_values.md) | <code>boolean</code> |  |
-|  [dynamic](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.dynamic.md) | <code>false &#124; 'strict'</code> | The dynamic property of the mapping, either <code>false</code> or <code>'strict'</code>. If unspecified <code>dynamic: 'strict'</code> will be inherited from the top-level index mappings.<!-- -->Note: To limit the number of mapping fields Saved Object types should \*never\* use <code>dynamic: true</code>. |
-|  [enabled](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.enabled.md) | <code>boolean</code> |  |
-|  [properties](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md) | <code>SavedObjectsMappingProperties</code> |  |
-|  [type](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md) | <code>string</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md
deleted file mode 100644
index 613a36a09ba1e..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) &gt; [properties](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.properties.md)
-
-## SavedObjectsComplexFieldMapping.properties property
-
-<b>Signature:</b>
-
-```typescript
-properties: SavedObjectsMappingProperties;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md
deleted file mode 100644
index 8aaa524dad43a..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsComplexFieldMapping](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.md) &gt; [type](./kibana-plugin-core-server.savedobjectscomplexfieldmapping.type.md)
-
-## SavedObjectsComplexFieldMapping.type property
-
-<b>Signature:</b>
-
-```typescript
-type?: string;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md
deleted file mode 100644
index 2a79eafd85a6c..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) &gt; [doc\_values](./kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md)
-
-## SavedObjectsCoreFieldMapping.doc\_values property
-
-<b>Signature:</b>
-
-```typescript
-doc_values?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md
deleted file mode 100644
index 4f88b635ca2f7..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md
+++ /dev/null
@@ -1,16 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) &gt; [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md)
-
-## SavedObjectsCoreFieldMapping.fields property
-
-<b>Signature:</b>
-
-```typescript
-fields?: {
-        [subfield: string]: {
-            type: string;
-            ignore_above?: number;
-        };
-    };
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.index.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.index.md
deleted file mode 100644
index e3cf685e310d2..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.index.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) &gt; [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md)
-
-## SavedObjectsCoreFieldMapping.index property
-
-<b>Signature:</b>
-
-```typescript
-index?: boolean;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
deleted file mode 100644
index e9b9c2bcf51b5..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.md
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md)
-
-## SavedObjectsCoreFieldMapping interface
-
-See [SavedObjectsFieldMapping](./kibana-plugin-core-server.savedobjectsfieldmapping.md) for documentation.
-
-<b>Signature:</b>
-
-```typescript
-export interface SavedObjectsCoreFieldMapping 
-```
-
-## Properties
-
-|  Property | Type | Description |
-|  --- | --- | --- |
-|  [doc\_values](./kibana-plugin-core-server.savedobjectscorefieldmapping.doc_values.md) | <code>boolean</code> |  |
-|  [fields](./kibana-plugin-core-server.savedobjectscorefieldmapping.fields.md) | <code>{</code><br/><code>        [subfield: string]: {</code><br/><code>            type: string;</code><br/><code>            ignore_above?: number;</code><br/><code>        };</code><br/><code>    }</code> |  |
-|  [index](./kibana-plugin-core-server.savedobjectscorefieldmapping.index.md) | <code>boolean</code> |  |
-|  [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md) | <code>number &#124; boolean &#124; string</code> |  |
-|  [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md) | <code>string</code> |  |
-
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
deleted file mode 100644
index 627ea3695383a..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) &gt; [null\_value](./kibana-plugin-core-server.savedobjectscorefieldmapping.null_value.md)
-
-## SavedObjectsCoreFieldMapping.null\_value property
-
-<b>Signature:</b>
-
-```typescript
-null_value?: number | boolean | string;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.type.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.type.md
deleted file mode 100644
index 94d395d7983e5..0000000000000
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectscorefieldmapping.type.md
+++ /dev/null
@@ -1,11 +0,0 @@
-<!-- Do not edit this file. It is automatically generated by API Documenter. -->
-
-[Home](./index.md) &gt; [kibana-plugin-core-server](./kibana-plugin-core-server.md) &gt; [SavedObjectsCoreFieldMapping](./kibana-plugin-core-server.savedobjectscorefieldmapping.md) &gt; [type](./kibana-plugin-core-server.savedobjectscorefieldmapping.type.md)
-
-## SavedObjectsCoreFieldMapping.type property
-
-<b>Signature:</b>
-
-```typescript
-type: string;
-```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md
index 925ca4be92e66..85b52bacafa25 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfieldmapping.md
@@ -11,5 +11,7 @@ Please refer to [elasticsearch documentation](https://www.elastic.co/guide/en/el
 <b>Signature:</b>
 
 ```typescript
-export declare type SavedObjectsFieldMapping = SavedObjectsCoreFieldMapping | SavedObjectsComplexFieldMapping;
+export declare type SavedObjectsFieldMapping = estypes.MappingProperty & {
+    dynamic?: false | 'strict';
+};
 ```
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
index a92b1f48d08eb..d3696ee71049a 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.md
@@ -30,7 +30,7 @@ export interface SavedObjectsFindOptions
 |  [searchAfter](./kibana-plugin-core-server.savedobjectsfindoptions.searchafter.md) | <code>estypes.Id[]</code> | Use the sort values from the previous page to retrieve the next page of results. |
 |  [searchFields](./kibana-plugin-core-server.savedobjectsfindoptions.searchfields.md) | <code>string[]</code> | The fields to perform the parsed query against. See Elasticsearch Simple Query String <code>fields</code> argument for more information |
 |  [sortField](./kibana-plugin-core-server.savedobjectsfindoptions.sortfield.md) | <code>string</code> |  |
-|  [sortOrder](./kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md) | <code>estypes.SortOrder</code> |  |
+|  [sortOrder](./kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md) | <code>estypes.SearchSortOrder</code> |  |
 |  [type](./kibana-plugin-core-server.savedobjectsfindoptions.type.md) | <code>string &#124; string[]</code> |  |
 |  [typeToNamespacesMap](./kibana-plugin-core-server.savedobjectsfindoptions.typetonamespacesmap.md) | <code>Map&lt;string, string[] &#124; undefined&gt;</code> | This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved object client wrapper. If this is defined, it supersedes the <code>type</code> and <code>namespaces</code> fields when building the Elasticsearch query. Any types that are not included in this map will be excluded entirely. If a type is included but its value is undefined, the operation will search for that type in the Default namespace. |
 
diff --git a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md
index e1c657e3a5171..dca5a7d8c7583 100644
--- a/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md
+++ b/docs/development/core/server/kibana-plugin-core-server.savedobjectsfindoptions.sortorder.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-sortOrder?: estypes.SortOrder;
+sortOrder?: estypes.SearchSortOrder;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.gettimeshift.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.gettimeshift.md
new file mode 100644
index 0000000000000..de0d41286c0bb
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.gettimeshift.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfig](./kibana-plugin-plugins-data-public.aggconfig.md) &gt; [getTimeShift](./kibana-plugin-plugins-data-public.aggconfig.gettimeshift.md)
+
+## AggConfig.getTimeShift() method
+
+<b>Signature:</b>
+
+```typescript
+getTimeShift(): undefined | moment.Duration;
+```
+<b>Returns:</b>
+
+`undefined | moment.Duration`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.hastimeshift.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.hastimeshift.md
new file mode 100644
index 0000000000000..024b0766ffd7b
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.hastimeshift.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfig](./kibana-plugin-plugins-data-public.aggconfig.md) &gt; [hasTimeShift](./kibana-plugin-plugins-data-public.aggconfig.hastimeshift.md)
+
+## AggConfig.hasTimeShift() method
+
+<b>Signature:</b>
+
+```typescript
+hasTimeShift(): boolean;
+```
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.md
index d4a8eddf51cfc..a96626d1a485d 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfig.md
@@ -46,8 +46,10 @@ export declare class AggConfig
 |  [getRequestAggs()](./kibana-plugin-plugins-data-public.aggconfig.getrequestaggs.md) |  |  |
 |  [getResponseAggs()](./kibana-plugin-plugins-data-public.aggconfig.getresponseaggs.md) |  |  |
 |  [getTimeRange()](./kibana-plugin-plugins-data-public.aggconfig.gettimerange.md) |  |  |
+|  [getTimeShift()](./kibana-plugin-plugins-data-public.aggconfig.gettimeshift.md) |  |  |
 |  [getValue(bucket)](./kibana-plugin-plugins-data-public.aggconfig.getvalue.md) |  |  |
 |  [getValueBucketPath()](./kibana-plugin-plugins-data-public.aggconfig.getvaluebucketpath.md) |  | Returns the bucket path containing the main value the agg will produce (e.g. for sum of bytes it will point to the sum, for median it will point to the 50 percentile in the percentile multi value bucket) |
+|  [hasTimeShift()](./kibana-plugin-plugins-data-public.aggconfig.hastimeshift.md) |  |  |
 |  [isFilterable()](./kibana-plugin-plugins-data-public.aggconfig.isfilterable.md) |  |  |
 |  [makeLabel(percentageMode)](./kibana-plugin-plugins-data-public.aggconfig.makelabel.md) |  |  |
 |  [nextId(list)](./kibana-plugin-plugins-data-public.aggconfig.nextid.md) | <code>static</code> | Calculate the next id based on the ids in this list {<!-- -->array<!-- -->} list - a list of objects with id properties |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.forcenow.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.forcenow.md
new file mode 100644
index 0000000000000..8040c2939e2e4
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.forcenow.md
@@ -0,0 +1,11 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [forceNow](./kibana-plugin-plugins-data-public.aggconfigs.forcenow.md)
+
+## AggConfigs.forceNow property
+
+<b>Signature:</b>
+
+```typescript
+forceNow?: Date;
+```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.getsearchsourcetimefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.getsearchsourcetimefilter.md
new file mode 100644
index 0000000000000..1f8bc1300a0a8
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.getsearchsourcetimefilter.md
@@ -0,0 +1,72 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [getSearchSourceTimeFilter](./kibana-plugin-plugins-data-public.aggconfigs.getsearchsourcetimefilter.md)
+
+## AggConfigs.getSearchSourceTimeFilter() method
+
+<b>Signature:</b>
+
+```typescript
+getSearchSourceTimeFilter(forceNow?: Date): RangeFilter[] | {
+        meta: {
+            index: string | undefined;
+            params: {};
+            alias: string;
+            disabled: boolean;
+            negate: boolean;
+        };
+        query: {
+            bool: {
+                should: {
+                    bool: {
+                        filter: {
+                            range: {
+                                [x: string]: {
+                                    gte: string;
+                                    lte: string;
+                                };
+                            };
+                        }[];
+                    };
+                }[];
+                minimum_should_match: number;
+            };
+        };
+    }[];
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  forceNow | <code>Date</code> |  |
+
+<b>Returns:</b>
+
+`RangeFilter[] | {
+        meta: {
+            index: string | undefined;
+            params: {};
+            alias: string;
+            disabled: boolean;
+            negate: boolean;
+        };
+        query: {
+            bool: {
+                should: {
+                    bool: {
+                        filter: {
+                            range: {
+                                [x: string]: {
+                                    gte: string;
+                                    lte: string;
+                                };
+                            };
+                        }[];
+                    };
+                }[];
+                minimum_should_match: number;
+            };
+        };
+    }[]`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.gettimeshiftinterval.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.gettimeshiftinterval.md
new file mode 100644
index 0000000000000..d15ccbc5dc0a1
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.gettimeshiftinterval.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [getTimeShiftInterval](./kibana-plugin-plugins-data-public.aggconfigs.gettimeshiftinterval.md)
+
+## AggConfigs.getTimeShiftInterval() method
+
+<b>Signature:</b>
+
+```typescript
+getTimeShiftInterval(): moment.Duration | undefined;
+```
+<b>Returns:</b>
+
+`moment.Duration | undefined`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.gettimeshifts.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.gettimeshifts.md
new file mode 100644
index 0000000000000..44ab25cf30eb2
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.gettimeshifts.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [getTimeShifts](./kibana-plugin-plugins-data-public.aggconfigs.gettimeshifts.md)
+
+## AggConfigs.getTimeShifts() method
+
+<b>Signature:</b>
+
+```typescript
+getTimeShifts(): Record<string, moment.Duration>;
+```
+<b>Returns:</b>
+
+`Record<string, moment.Duration>`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.hastimeshifts.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.hastimeshifts.md
new file mode 100644
index 0000000000000..db31e549666b4
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.hastimeshifts.md
@@ -0,0 +1,15 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [hasTimeShifts](./kibana-plugin-plugins-data-public.aggconfigs.hastimeshifts.md)
+
+## AggConfigs.hasTimeShifts() method
+
+<b>Signature:</b>
+
+```typescript
+hasTimeShifts(): boolean;
+```
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.md
index 02e9a63d95ba3..45333b6767cac 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.md
@@ -22,6 +22,7 @@ export declare class AggConfigs
 |  --- | --- | --- | --- |
 |  [aggs](./kibana-plugin-plugins-data-public.aggconfigs.aggs.md) |  | <code>IAggConfig[]</code> |  |
 |  [createAggConfig](./kibana-plugin-plugins-data-public.aggconfigs.createaggconfig.md) |  | <code>&lt;T extends AggConfig = AggConfig&gt;(params: CreateAggConfigParams, { addToAggConfigs }?: {</code><br/><code>        addToAggConfigs?: boolean &#124; undefined;</code><br/><code>    }) =&gt; T</code> |  |
+|  [forceNow](./kibana-plugin-plugins-data-public.aggconfigs.forcenow.md) |  | <code>Date</code> |  |
 |  [hierarchical](./kibana-plugin-plugins-data-public.aggconfigs.hierarchical.md) |  | <code>boolean</code> |  |
 |  [indexPattern](./kibana-plugin-plugins-data-public.aggconfigs.indexpattern.md) |  | <code>IndexPattern</code> |  |
 |  [timeFields](./kibana-plugin-plugins-data-public.aggconfigs.timefields.md) |  | <code>string[]</code> |  |
@@ -43,8 +44,14 @@ export declare class AggConfigs
 |  [getRequestAggs()](./kibana-plugin-plugins-data-public.aggconfigs.getrequestaggs.md) |  |  |
 |  [getResponseAggById(id)](./kibana-plugin-plugins-data-public.aggconfigs.getresponseaggbyid.md) |  | Find a response agg by it's id. This may be an agg in the aggConfigs, or one created specifically for a response value |
 |  [getResponseAggs()](./kibana-plugin-plugins-data-public.aggconfigs.getresponseaggs.md) |  | Gets the AggConfigs (and possibly ResponseAggConfigs) that represent the values that will be produced when all aggs are run.<!-- -->With multi-value metric aggs it is possible for a single agg request to result in multiple agg values, which is why the length of a vis' responseValuesAggs may be different than the vis' aggs {<!-- -->array\[AggConfig\]<!-- -->} |
+|  [getSearchSourceTimeFilter(forceNow)](./kibana-plugin-plugins-data-public.aggconfigs.getsearchsourcetimefilter.md) |  |  |
+|  [getTimeShiftInterval()](./kibana-plugin-plugins-data-public.aggconfigs.gettimeshiftinterval.md) |  |  |
+|  [getTimeShifts()](./kibana-plugin-plugins-data-public.aggconfigs.gettimeshifts.md) |  |  |
+|  [hasTimeShifts()](./kibana-plugin-plugins-data-public.aggconfigs.hastimeshifts.md) |  |  |
 |  [jsonDataEquals(aggConfigs)](./kibana-plugin-plugins-data-public.aggconfigs.jsondataequals.md) |  | Data-by-data comparison of this Aggregation Ignores the non-array indexes |
 |  [onSearchRequestStart(searchSource, options)](./kibana-plugin-plugins-data-public.aggconfigs.onsearchrequeststart.md) |  |  |
+|  [postFlightTransform(response)](./kibana-plugin-plugins-data-public.aggconfigs.postflighttransform.md) |  |  |
+|  [setForceNow(now)](./kibana-plugin-plugins-data-public.aggconfigs.setforcenow.md) |  |  |
 |  [setTimeFields(timeFields)](./kibana-plugin-plugins-data-public.aggconfigs.settimefields.md) |  |  |
 |  [setTimeRange(timeRange)](./kibana-plugin-plugins-data-public.aggconfigs.settimerange.md) |  |  |
 |  [toDsl()](./kibana-plugin-plugins-data-public.aggconfigs.todsl.md) |  |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.postflighttransform.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.postflighttransform.md
new file mode 100644
index 0000000000000..b34fda40a3089
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.postflighttransform.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [postFlightTransform](./kibana-plugin-plugins-data-public.aggconfigs.postflighttransform.md)
+
+## AggConfigs.postFlightTransform() method
+
+<b>Signature:</b>
+
+```typescript
+postFlightTransform(response: IEsSearchResponse<any>): IEsSearchResponse<any>;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  response | <code>IEsSearchResponse&lt;any&gt;</code> |  |
+
+<b>Returns:</b>
+
+`IEsSearchResponse<any>`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.setforcenow.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.setforcenow.md
new file mode 100644
index 0000000000000..60a1bfe0872fa
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.aggconfigs.setforcenow.md
@@ -0,0 +1,22 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [AggConfigs](./kibana-plugin-plugins-data-public.aggconfigs.md) &gt; [setForceNow](./kibana-plugin-plugins-data-public.aggconfigs.setforcenow.md)
+
+## AggConfigs.setForceNow() method
+
+<b>Signature:</b>
+
+```typescript
+setForceNow(now: Date | undefined): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  now | <code>Date &#124; undefined</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md
index a994fc458cfb6..f99e7ba8b967e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.lang.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-lang?: string;
+lang?: estypes.ScriptLanguage;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
index 4e3dea5549b56..29377ff8fd392 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.ifieldtype.md
@@ -26,7 +26,7 @@ export interface IFieldType
 |  [esTypes](./kibana-plugin-plugins-data-public.ifieldtype.estypes.md) | <code>string[]</code> |  |
 |  [filterable](./kibana-plugin-plugins-data-public.ifieldtype.filterable.md) | <code>boolean</code> |  |
 |  [format](./kibana-plugin-plugins-data-public.ifieldtype.format.md) | <code>any</code> |  |
-|  [lang](./kibana-plugin-plugins-data-public.ifieldtype.lang.md) | <code>string</code> |  |
+|  [lang](./kibana-plugin-plugins-data-public.ifieldtype.lang.md) | <code>estypes.ScriptLanguage</code> |  |
 |  [name](./kibana-plugin-plugins-data-public.ifieldtype.name.md) | <code>string</code> |  |
 |  [readFromDocValues](./kibana-plugin-plugins-data-public.ifieldtype.readfromdocvalues.md) | <code>boolean</code> |  |
 |  [script](./kibana-plugin-plugins-data-public.ifieldtype.script.md) | <code>string</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md
index 99d2fc00a6b7b..e0ee1f0ec15a4 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.addscriptedfield.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.addScriptedField() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 Add scripted field to field list
 
 <b>Signature:</b>
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
index 48d94b84497bd..cc40ab8bb1173 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getassavedobjectbody.md
@@ -9,33 +9,9 @@ Returns index pattern as saved object body for saving
 <b>Signature:</b>
 
 ```typescript
-getAsSavedObjectBody(): {
-        fieldAttrs: string | undefined;
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-        allowNoIndex: true | undefined;
-        runtimeFieldMap: string | undefined;
-    };
+getAsSavedObjectBody(): IndexPatternAttributes;
 ```
 <b>Returns:</b>
 
-`{
-        fieldAttrs: string | undefined;
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-        allowNoIndex: true | undefined;
-        runtimeFieldMap: string | undefined;
-    }`
+`IndexPatternAttributes`
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md
index 77ce6f6f23a67..94adbefe535dd 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.getNonScriptedFields() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getruntimefield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getruntimefield.md
new file mode 100644
index 0000000000000..c0aca53255b8f
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getruntimefield.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [getRuntimeField](./kibana-plugin-plugins-data-public.indexpattern.getruntimefield.md)
+
+## IndexPattern.getRuntimeField() method
+
+Returns runtime field if exists
+
+<b>Signature:</b>
+
+```typescript
+getRuntimeField(name: string): RuntimeField | null;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  name | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`RuntimeField | null`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md
index 055f07367c96e..57e1b5f49371b 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.getScriptedFields() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.hasruntimefield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.hasruntimefield.md
new file mode 100644
index 0000000000000..96dbe13a7f197
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.hasruntimefield.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [hasRuntimeField](./kibana-plugin-plugins-data-public.indexpattern.hasruntimefield.md)
+
+## IndexPattern.hasRuntimeField() method
+
+Checks if runtime field exists
+
+<b>Signature:</b>
+
+```typescript
+hasRuntimeField(name: string): boolean;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  name | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
index 53d173d39f50d..51ca42fdce70a 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.md
@@ -54,13 +54,16 @@ export declare class IndexPattern implements IIndexPattern
 |  [getFormatterForField(field)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfield.md) |  | Provide a field, get its formatter |
 |  [getFormatterForFieldNoDefault(fieldname)](./kibana-plugin-plugins-data-public.indexpattern.getformatterforfieldnodefault.md) |  | Get formatter for a given field name. Return undefined if none exists |
 |  [getNonScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getnonscriptedfields.md) |  |  |
+|  [getRuntimeField(name)](./kibana-plugin-plugins-data-public.indexpattern.getruntimefield.md) |  | Returns runtime field if exists |
 |  [getScriptedFields()](./kibana-plugin-plugins-data-public.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-public.indexpattern.getsourcefiltering.md) |  | Get the source filtering configuration for that index. |
 |  [getTimeField()](./kibana-plugin-plugins-data-public.indexpattern.gettimefield.md) |  |  |
+|  [hasRuntimeField(name)](./kibana-plugin-plugins-data-public.indexpattern.hasruntimefield.md) |  | Checks if runtime field exists |
 |  [isTimeBased()](./kibana-plugin-plugins-data-public.indexpattern.istimebased.md) |  |  |
 |  [isTimeNanosBased()](./kibana-plugin-plugins-data-public.indexpattern.istimenanosbased.md) |  |  |
-|  [removeRuntimeField(name)](./kibana-plugin-plugins-data-public.indexpattern.removeruntimefield.md) |  | Remove a runtime field - removed from mapped field or removed unmapped field as appropriate |
+|  [removeRuntimeField(name)](./kibana-plugin-plugins-data-public.indexpattern.removeruntimefield.md) |  | Remove a runtime field - removed from mapped field or removed unmapped field as appropriate. Doesn't clear associated field attributes. |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md) |  | Remove scripted field from field list |
+|  [replaceAllRuntimeFields(newFields)](./kibana-plugin-plugins-data-public.indexpattern.replaceallruntimefields.md) |  | Replaces all existing runtime fields with new fields |
 |  [setFieldAttrs(fieldName, attrName, value)](./kibana-plugin-plugins-data-public.indexpattern.setfieldattrs.md) |  |  |
 |  [setFieldCount(fieldName, count)](./kibana-plugin-plugins-data-public.indexpattern.setfieldcount.md) |  |  |
 |  [setFieldCustomLabel(fieldName, customLabel)](./kibana-plugin-plugins-data-public.indexpattern.setfieldcustomlabel.md) |  |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removeruntimefield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removeruntimefield.md
index 7a5228fece782..f2774924fc73c 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removeruntimefield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removeruntimefield.md
@@ -4,7 +4,7 @@
 
 ## IndexPattern.removeRuntimeField() method
 
-Remove a runtime field - removed from mapped field or removed unmapped field as appropriate
+Remove a runtime field - removed from mapped field or removed unmapped field as appropriate. Doesn't clear associated field attributes.
 
 <b>Signature:</b>
 
@@ -16,7 +16,7 @@ removeRuntimeField(name: string): void;
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  name | <code>string</code> |  |
+|  name | <code>string</code> | Field name to remove |
 
 <b>Returns:</b>
 
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md
index aaaebdaccca5d..d3e1b26810fd7 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.removescriptedfield.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.removeScriptedField() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 Remove scripted field from field list
 
 <b>Signature:</b>
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.replaceallruntimefields.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.replaceallruntimefields.md
new file mode 100644
index 0000000000000..076b2b38cf474
--- /dev/null
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpattern.replaceallruntimefields.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-public](./kibana-plugin-plugins-data-public.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-public.indexpattern.md) &gt; [replaceAllRuntimeFields](./kibana-plugin-plugins-data-public.indexpattern.replaceallruntimefields.md)
+
+## IndexPattern.replaceAllRuntimeFields() method
+
+Replaces all existing runtime fields with new fields
+
+<b>Signature:</b>
+
+```typescript
+replaceAllRuntimeFields(newFields: Record<string, RuntimeField>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  newFields | <code>Record&lt;string, RuntimeField&gt;</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
index b81218eb08886..3666e503e2722 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.lang.md
@@ -9,7 +9,7 @@ Script field language
 <b>Signature:</b>
 
 ```typescript
-get lang(): string | undefined;
+get lang(): "painless" | "expression" | "mustache" | "java" | undefined;
 
-set lang(lang: string | undefined);
+set lang(lang: "painless" | "expression" | "mustache" | "java" | undefined);
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
index 05c807b1cd845..8cd1a476cf32f 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.md
@@ -28,7 +28,7 @@ export declare class IndexPatternField implements IFieldType
 |  [esTypes](./kibana-plugin-plugins-data-public.indexpatternfield.estypes.md) |  | <code>string[] &#124; undefined</code> |  |
 |  [filterable](./kibana-plugin-plugins-data-public.indexpatternfield.filterable.md) |  | <code>boolean</code> |  |
 |  [isMapped](./kibana-plugin-plugins-data-public.indexpatternfield.ismapped.md) |  | <code>boolean &#124; undefined</code> | Is the field part of the index mapping? |
-|  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>string &#124; undefined</code> | Script field language |
+|  [lang](./kibana-plugin-plugins-data-public.indexpatternfield.lang.md) |  | <code>&quot;painless&quot; &#124; &quot;expression&quot; &#124; &quot;mustache&quot; &#124; &quot;java&quot; &#124; undefined</code> | Script field language |
 |  [name](./kibana-plugin-plugins-data-public.indexpatternfield.name.md) |  | <code>string</code> |  |
 |  [readFromDocValues](./kibana-plugin-plugins-data-public.indexpatternfield.readfromdocvalues.md) |  | <code>boolean</code> |  |
 |  [runtimeField](./kibana-plugin-plugins-data-public.indexpatternfield.runtimefield.md) |  | <code>RuntimeField &#124; undefined</code> |  |
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
index f0600dd20658a..8882fa05ce0c2 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.indexpatternfield.tojson.md
@@ -10,7 +10,7 @@
 toJSON(): {
         count: number;
         script: string | undefined;
-        lang: string | undefined;
+        lang: "painless" | "expression" | "mustache" | "java" | undefined;
         conflictDescriptions: Record<string, string[]> | undefined;
         name: string;
         type: string;
@@ -28,7 +28,7 @@ toJSON(): {
 `{
         count: number;
         script: string | undefined;
-        lang: string | undefined;
+        lang: "painless" | "expression" | "mustache" | "java" | undefined;
         conflictDescriptions: Record<string, string[]> | undefined;
         name: string;
         type: string;
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md
index 090b78a7078cc..8d0447d58634c 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.phrasefilter.md
@@ -12,7 +12,7 @@ export declare type PhraseFilter = Filter & {
     script?: {
         script: {
             source?: any;
-            lang?: string;
+            lang?: estypes.ScriptLanguage;
             params: any;
         };
     };
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md
index fbe04f5e0a2a9..1cb627ec3a8f9 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.rangefilter.md
@@ -12,7 +12,7 @@ export declare type RangeFilter = Filter & EsRangeFilter & {
     script?: {
         script: {
             params: any;
-            lang: string;
+            lang: estypes.ScriptLanguage;
             source: any;
         };
     };
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md
index 095142cf0f05b..757d8f34a0c3a 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.lang.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-lang?: string;
+lang?: estypes.ScriptLanguage;
 ```
diff --git a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md
index a1a76f2d2a295..fb39333cf245e 100644
--- a/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md
+++ b/docs/development/plugins/data/public/kibana-plugin-plugins-data-public.reason.md
@@ -15,7 +15,7 @@ export interface Reason
 |  Property | Type | Description |
 |  --- | --- | --- |
 |  [caused\_by](./kibana-plugin-plugins-data-public.reason.caused_by.md) | <code>{</code><br/><code>        type: string;</code><br/><code>        reason: string;</code><br/><code>    }</code> |  |
-|  [lang](./kibana-plugin-plugins-data-public.reason.lang.md) | <code>string</code> |  |
+|  [lang](./kibana-plugin-plugins-data-public.reason.lang.md) | <code>estypes.ScriptLanguage</code> |  |
 |  [position](./kibana-plugin-plugins-data-public.reason.position.md) | <code>{</code><br/><code>        offset: number;</code><br/><code>        start: number;</code><br/><code>        end: number;</code><br/><code>    }</code> |  |
 |  [reason](./kibana-plugin-plugins-data-public.reason.reason.md) | <code>string</code> |  |
 |  [script\_stack](./kibana-plugin-plugins-data-public.reason.script_stack.md) | <code>string[]</code> |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md
index d033804cb6fcb..3d5a757cb8f18 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.lang.md
@@ -7,5 +7,5 @@
 <b>Signature:</b>
 
 ```typescript
-lang?: string;
+lang?: estypes.ScriptLanguage;
 ```
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
index 5ac48d26a85d6..bbc4cc2135d40 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.ifieldtype.md
@@ -26,7 +26,7 @@ export interface IFieldType
 |  [esTypes](./kibana-plugin-plugins-data-server.ifieldtype.estypes.md) | <code>string[]</code> |  |
 |  [filterable](./kibana-plugin-plugins-data-server.ifieldtype.filterable.md) | <code>boolean</code> |  |
 |  [format](./kibana-plugin-plugins-data-server.ifieldtype.format.md) | <code>any</code> |  |
-|  [lang](./kibana-plugin-plugins-data-server.ifieldtype.lang.md) | <code>string</code> |  |
+|  [lang](./kibana-plugin-plugins-data-server.ifieldtype.lang.md) | <code>estypes.ScriptLanguage</code> |  |
 |  [name](./kibana-plugin-plugins-data-server.ifieldtype.name.md) | <code>string</code> |  |
 |  [readFromDocValues](./kibana-plugin-plugins-data-server.ifieldtype.readfromdocvalues.md) | <code>boolean</code> |  |
 |  [script](./kibana-plugin-plugins-data-server.ifieldtype.script.md) | <code>string</code> |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md
index a86fea3106225..33f1ac5e31660 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.addscriptedfield.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.addScriptedField() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 Add scripted field to field list
 
 <b>Signature:</b>
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md
index 668d563ff04c0..f5e87638e2f1c 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getassavedobjectbody.md
@@ -9,33 +9,9 @@ Returns index pattern as saved object body for saving
 <b>Signature:</b>
 
 ```typescript
-getAsSavedObjectBody(): {
-        fieldAttrs: string | undefined;
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-        allowNoIndex: true | undefined;
-        runtimeFieldMap: string | undefined;
-    };
+getAsSavedObjectBody(): IndexPatternAttributes;
 ```
 <b>Returns:</b>
 
-`{
-        fieldAttrs: string | undefined;
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-        allowNoIndex: true | undefined;
-        runtimeFieldMap: string | undefined;
-    }`
+`IndexPatternAttributes`
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md
index 89d79d9b750fa..e791dfc7c3738 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.getNonScriptedFields() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getruntimefield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getruntimefield.md
new file mode 100644
index 0000000000000..d5dc8f966316b
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getruntimefield.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-server.indexpattern.md) &gt; [getRuntimeField](./kibana-plugin-plugins-data-server.indexpattern.getruntimefield.md)
+
+## IndexPattern.getRuntimeField() method
+
+Returns runtime field if exists
+
+<b>Signature:</b>
+
+```typescript
+getRuntimeField(name: string): RuntimeField | null;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  name | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`RuntimeField | null`
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md
index edfff8ec5efac..95f9f31309674 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.getScriptedFields() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 <b>Signature:</b>
 
 ```typescript
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.hasruntimefield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.hasruntimefield.md
new file mode 100644
index 0000000000000..5000d5e645cbb
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.hasruntimefield.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-server.indexpattern.md) &gt; [hasRuntimeField](./kibana-plugin-plugins-data-server.indexpattern.hasruntimefield.md)
+
+## IndexPattern.hasRuntimeField() method
+
+Checks if runtime field exists
+
+<b>Signature:</b>
+
+```typescript
+hasRuntimeField(name: string): boolean;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  name | <code>string</code> |  |
+
+<b>Returns:</b>
+
+`boolean`
+
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md
index 97d1cd9115262..27b8a31a2582b 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.md
@@ -54,13 +54,16 @@ export declare class IndexPattern implements IIndexPattern
 |  [getFormatterForField(field)](./kibana-plugin-plugins-data-server.indexpattern.getformatterforfield.md) |  | Provide a field, get its formatter |
 |  [getFormatterForFieldNoDefault(fieldname)](./kibana-plugin-plugins-data-server.indexpattern.getformatterforfieldnodefault.md) |  | Get formatter for a given field name. Return undefined if none exists |
 |  [getNonScriptedFields()](./kibana-plugin-plugins-data-server.indexpattern.getnonscriptedfields.md) |  |  |
+|  [getRuntimeField(name)](./kibana-plugin-plugins-data-server.indexpattern.getruntimefield.md) |  | Returns runtime field if exists |
 |  [getScriptedFields()](./kibana-plugin-plugins-data-server.indexpattern.getscriptedfields.md) |  |  |
 |  [getSourceFiltering()](./kibana-plugin-plugins-data-server.indexpattern.getsourcefiltering.md) |  | Get the source filtering configuration for that index. |
 |  [getTimeField()](./kibana-plugin-plugins-data-server.indexpattern.gettimefield.md) |  |  |
+|  [hasRuntimeField(name)](./kibana-plugin-plugins-data-server.indexpattern.hasruntimefield.md) |  | Checks if runtime field exists |
 |  [isTimeBased()](./kibana-plugin-plugins-data-server.indexpattern.istimebased.md) |  |  |
 |  [isTimeNanosBased()](./kibana-plugin-plugins-data-server.indexpattern.istimenanosbased.md) |  |  |
-|  [removeRuntimeField(name)](./kibana-plugin-plugins-data-server.indexpattern.removeruntimefield.md) |  | Remove a runtime field - removed from mapped field or removed unmapped field as appropriate |
+|  [removeRuntimeField(name)](./kibana-plugin-plugins-data-server.indexpattern.removeruntimefield.md) |  | Remove a runtime field - removed from mapped field or removed unmapped field as appropriate. Doesn't clear associated field attributes. |
 |  [removeScriptedField(fieldName)](./kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md) |  | Remove scripted field from field list |
+|  [replaceAllRuntimeFields(newFields)](./kibana-plugin-plugins-data-server.indexpattern.replaceallruntimefields.md) |  | Replaces all existing runtime fields with new fields |
 |  [setFieldAttrs(fieldName, attrName, value)](./kibana-plugin-plugins-data-server.indexpattern.setfieldattrs.md) |  |  |
 |  [setFieldCount(fieldName, count)](./kibana-plugin-plugins-data-server.indexpattern.setfieldcount.md) |  |  |
 |  [setFieldCustomLabel(fieldName, customLabel)](./kibana-plugin-plugins-data-server.indexpattern.setfieldcustomlabel.md) |  |  |
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removeruntimefield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removeruntimefield.md
index da8e7e40a7fac..ef32b80ba8502 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removeruntimefield.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removeruntimefield.md
@@ -4,7 +4,7 @@
 
 ## IndexPattern.removeRuntimeField() method
 
-Remove a runtime field - removed from mapped field or removed unmapped field as appropriate
+Remove a runtime field - removed from mapped field or removed unmapped field as appropriate. Doesn't clear associated field attributes.
 
 <b>Signature:</b>
 
@@ -16,7 +16,7 @@ removeRuntimeField(name: string): void;
 
 |  Parameter | Type | Description |
 |  --- | --- | --- |
-|  name | <code>string</code> |  |
+|  name | <code>string</code> | Field name to remove |
 
 <b>Returns:</b>
 
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md
index 3162a7f42dd12..b351eba2ace4f 100644
--- a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.removescriptedfield.md
@@ -4,6 +4,11 @@
 
 ## IndexPattern.removeScriptedField() method
 
+> Warning: This API is now obsolete.
+> 
+> use runtime field instead
+> 
+
 Remove scripted field from field list
 
 <b>Signature:</b>
diff --git a/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.replaceallruntimefields.md b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.replaceallruntimefields.md
new file mode 100644
index 0000000000000..35df871763f8a
--- /dev/null
+++ b/docs/development/plugins/data/server/kibana-plugin-plugins-data-server.indexpattern.replaceallruntimefields.md
@@ -0,0 +1,24 @@
+<!-- Do not edit this file. It is automatically generated by API Documenter. -->
+
+[Home](./index.md) &gt; [kibana-plugin-plugins-data-server](./kibana-plugin-plugins-data-server.md) &gt; [IndexPattern](./kibana-plugin-plugins-data-server.indexpattern.md) &gt; [replaceAllRuntimeFields](./kibana-plugin-plugins-data-server.indexpattern.replaceallruntimefields.md)
+
+## IndexPattern.replaceAllRuntimeFields() method
+
+Replaces all existing runtime fields with new fields
+
+<b>Signature:</b>
+
+```typescript
+replaceAllRuntimeFields(newFields: Record<string, RuntimeField>): void;
+```
+
+## Parameters
+
+|  Parameter | Type | Description |
+|  --- | --- | --- |
+|  newFields | <code>Record&lt;string, RuntimeField&gt;</code> |  |
+
+<b>Returns:</b>
+
+`void`
+
diff --git a/docs/discover/images/add-field-to-pattern.png b/docs/discover/images/add-field-to-pattern.png
index 84dfcb0745c69..04f564ab89857 100644
Binary files a/docs/discover/images/add-field-to-pattern.png and b/docs/discover/images/add-field-to-pattern.png differ
diff --git a/docs/discover/images/customer.png b/docs/discover/images/customer.png
new file mode 100644
index 0000000000000..f2042080f0a37
Binary files /dev/null and b/docs/discover/images/customer.png differ
diff --git a/docs/discover/images/discover-from-visualize.png b/docs/discover/images/discover-from-visualize.png
index cbf64dff18b15..07d34b8b49018 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 4d59ad186ded4..e42ed2416f79e 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-visualize.png b/docs/discover/images/discover-visualize.png
index f4bcaf8aca028..242aa16709a9f 100644
Binary files a/docs/discover/images/discover-visualize.png and b/docs/discover/images/discover-visualize.png differ
diff --git a/docs/discover/images/document-table-expanded.png b/docs/discover/images/document-table-expanded.png
index 87c8e2047a0cb..38ea0987b120a 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.png b/docs/discover/images/document-table.png
index f47ca5353124e..097feb4dc9034 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/double-arrow.png b/docs/discover/images/double-arrow.png
new file mode 100644
index 0000000000000..ba4ee11ebf738
Binary files /dev/null and b/docs/discover/images/double-arrow.png differ
diff --git a/docs/discover/images/downward-arrow.png b/docs/discover/images/downward-arrow.png
new file mode 100644
index 0000000000000..47b03cfe82b34
Binary files /dev/null and b/docs/discover/images/downward-arrow.png differ
diff --git a/docs/discover/images/hello-field.png b/docs/discover/images/hello-field.png
index 07d97e054d7ec..fe4cfbb41fdc2 100644
Binary files a/docs/discover/images/hello-field.png and b/docs/discover/images/hello-field.png differ
diff --git a/docs/discover/search-for-relevance.asciidoc b/docs/discover/search-for-relevance.asciidoc
index 0232c02b6e061..f3cf1c3a7f52c 100644
--- a/docs/discover/search-for-relevance.asciidoc
+++ b/docs/discover/search-for-relevance.asciidoc
@@ -1,24 +1,36 @@
 [[discover-search-for-relevance]]
 == Search for relevance
-Sometimes you might be unsure which documents best match your question. 
+Sometimes you might be unsure which documents best match your search.
 {es} assigns a relevancy, or score to each document, so you can
 can narrow your search to the documents with the most relevant results.
 The higher the score, the better it matches your query.
 
-For example, suppose you have the <<gs-get-data-into-kibana, sample flights data set>>, and you're a searching for
-a flight that arrived or departed from `Warsaw` or `Venice` when the weather was clear.
+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 index pattern dropdown, and select `kibana_sample_data_flight`.
-.  In the query bar, click  *KQL*, and switch to the <<lucene-query, Lucene query syntax>>.
-. Search for `Warsaw OR Venice OR Clear`.
-.  If you don't see any results, open the time filter and select a time range that contains data.
-.  From the list of *Available fields*, add `_score` to the document table.
-. In the document table, click the header for the `_score` column, and then sort the column by descending scores.
+.  In *Discover*, open the index pattern dropdown, and select that data you want to work with.
 +
-The results are currently sorted by first `Time`, and then by `_score`.
-. To sort only by `_score`, remove the `Time` field.
+For the sample flights data, set the index pattern to *kibana_sample_data_flights*.
+.  In the query bar, click  *KQL*, and then turn it off.
 +
-Your table now shows documents with the best matches, from most to least relevant.
+You're now using the <<lucene-query, Lucene query syntax>>.
+.  Run your search.  For the sample data, try:
++
+```ts
+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 then click twice on
+the arrow icon
+image:images/double-arrow.png[Double arrow icon to indicate sorting] so it changes 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 then click the down arrow.
++
+Your table now sorts documents from most to least relevant.
 +
 [role="screenshot"]
 image::images/discover-search-for-relevance.png["Example of a search for relevance"]
diff --git a/docs/index-extra-title-page.html b/docs/index-extra-title-page.html
new file mode 100644
index 0000000000000..7bcbc9f075124
--- /dev/null
+++ b/docs/index-extra-title-page.html
@@ -0,0 +1,37 @@
+<div class="legalnotice">
+  <p>From creating beautiful visualizations to managing the Elastic Stack, learn how Kibana helps you get the most of your data.</p>
+  <p><a href="https://www.elastic.co/videos/training-how-to-stack">Watch our videos</a></p>
+  <table style="width:100%">
+  <tr>
+    <th><h3>New to Kibana?</h3></th>
+    <th><h3>Popular topics</h3></th>
+  </tr>
+  <tr>
+    <td>
+      <div class="itemizedlist">
+        <ul class="itemizedlist" type="disc">
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/introduction.html">What is Kibana?</a></li>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/get-started.html">Quick start</a>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/connect-to-elasticsearch.html">Add data</a></li>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/dashboard.html">Create a dashboard</a></li>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/discover.html">Search your data</a>
+          </li>
+        </ul>
+      </div>
+    </td>
+    <td>
+      <div class="itemizedlist">
+        <ul class="itemizedlist" type="disc">
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/install.html">Install Kibana</a></li>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/settings.html">Configure settings</a></li>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/kuery-query.html">Kibana Query Language (KQL)</a>
+          </li>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/index-patterns.html">Create an index pattern</a>
+          </li>
+          <li class="listitem"><a href="https://www.elastic.co/guide/en/kibana/current/alerting-getting-started.html">Create an alert</a>
+        </ul>
+      </div></td>
+  </tr>
+</table>
+<h3>All topics</h3>
+</div>
diff --git a/docs/maps/index.asciidoc b/docs/maps/index.asciidoc
index 45d24bfb5a7e4..20320c5a938c9 100644
--- a/docs/maps/index.asciidoc
+++ b/docs/maps/index.asciidoc
@@ -24,8 +24,8 @@ Create beautiful maps from your geographical data. With **Maps**, you can:
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/BYzRDtH4u7RSD8wKhuEW1b.jpg"
-data-uuid="BYzRDtH4u7RSD8wKhuEW1b"
+src="https://play.vidyard.com/mBuWenQ2uSLY9YjEkPtzJC.jpg"
+data-uuid="mBuWenQ2uSLY9YjEkPtzJC"
 data-v="4"
 data-type="inline"
 />
diff --git a/docs/settings/fleet-settings.asciidoc b/docs/settings/fleet-settings.asciidoc
index 9c054fbc00222..134d9de3f49d8 100644
--- a/docs/settings/fleet-settings.asciidoc
+++ b/docs/settings/fleet-settings.asciidoc
@@ -39,8 +39,8 @@ See the {fleet-guide}/index.html[{fleet}] docs for more information.
 |===
 | `xpack.fleet.agents.fleet_server.hosts`
   | Hostnames used by {agent} for accessing {fleet-server}.
-| `xpack.fleet.agents.elasticsearch.host`
-  | The hostname used by {agent} for accessing {es}.
+| `xpack.fleet.agents.elasticsearch.hosts`
+  | Hostnames used by {agent} for accessing {es}.
 |===
 
 [NOTE]
diff --git a/docs/setup/install/brew.asciidoc b/docs/setup/install/brew.asciidoc
index e3085f6e225aa..eeba869a259d4 100644
--- a/docs/setup/install/brew.asciidoc
+++ b/docs/setup/install/brew.asciidoc
@@ -14,15 +14,13 @@ brew tap elastic/tap
 -------------------------
 
 Once you've tapped the Elastic Homebrew repo, you can use `brew install` to
-install the default distribution of {kib}:
+install the **latest version** of {kib}:
 
 [source,sh]
 -------------------------
 brew install elastic/tap/kibana-full
 -------------------------
 
-This installs the most recently released distribution of {kib}.
-
 [[brew-layout]]
 ==== Directory layout for Homebrew installs
 
diff --git a/docs/setup/settings.asciidoc b/docs/setup/settings.asciidoc
index bac2b0ebdf15f..ddb906f390a2d 100644
--- a/docs/setup/settings.asciidoc
+++ b/docs/setup/settings.asciidoc
@@ -262,11 +262,11 @@ on the {kib} index at startup. {kib} users still need to authenticate with
  {es} {ref}/indices-create-index.html[index name limitations].
  *Default: `".kibana"`*
 
-| `kibana.autocompleteTimeout:` {ess-icon}
+| `data.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"`*
 
-| `kibana.autocompleteTerminateAfter:` {ess-icon}
+| `data.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"`*
@@ -596,6 +596,10 @@ inactive socket. *Default: `"120000"`*
  | Paths to a PEM-encoded X.509 server certificate and its corresponding private key. These
 are used by {kib} to establish trust when receiving inbound SSL/TLS connections from users.
 
+|[[server-uuid]] `server.uuid:`
+ | The unique identifier for this {kib} instance.
+
+
 |===
 
 [NOTE]
diff --git a/docs/user/dashboard/lens.asciidoc b/docs/user/dashboard/lens.asciidoc
index c5718b2a089bf..3b3a7a9ee527d 100644
--- a/docs/user/dashboard/lens.asciidoc
+++ b/docs/user/dashboard/lens.asciidoc
@@ -10,8 +10,8 @@ src="https://play.vidyard.com/embed/v4.js"></script>
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/G6RNjq6U9odYRCYUxY2vfq.jpg"
-data-uuid="G6RNjq6U9odYRCYUxY2vfq"
+src="https://play.vidyard.com/vVJ69WCgUwGNJSDqjPZbaV.jpg"
+data-uuid="vVJ69WCgUwGNJSDqjPZbaV"
 data-v="4"
 data-type="inline"
 />
diff --git a/docs/user/dashboard/timelion.asciidoc b/docs/user/dashboard/timelion.asciidoc
index 675fd03df3648..ec9e8b56f9342 100644
--- a/docs/user/dashboard/timelion.asciidoc
+++ b/docs/user/dashboard/timelion.asciidoc
@@ -4,7 +4,7 @@
 To use *Timelion*, you define a graph by chaining functions together, using the *Timelion*-specific syntax. 
 The syntax enables some features that classical point series charts don't offer, such as pulling data from different indices or data sources into one graph.
 
-deprecated::[7.0.0,"*Timelion* is still supported. The *Timelion app* is deprecated in 7.0, replaced by dashboard features. In the last 7.x minor version and later, the *Timelion app* is removed from {kib}. To prepare for the removal of *Timelion app*, you must migrate *Timelion app* worksheets to a dashboard. For information on how to migrate *Timelion app* worksheets, refer to the link:https://www.elastic.co/guide/en/kibana/7.10/release-notes-7.10.0.html#deprecation-v7.10.0[7.10.0 Release Notes]."]
+deprecated::[7.0.0,"*Timelion* is still supported. The *Timelion app* is deprecated in 7.0, replaced by dashboard features. In 7.16 and later, the *Timelion app* is removed from {kib}. To prepare for the removal of *Timelion app*, you must migrate *Timelion app* worksheets to a dashboard. For information on how to migrate *Timelion app* worksheets, refer to the link:https://www.elastic.co/guide/en/kibana/7.10/release-notes-7.10.0.html#deprecation-v7.10.0[7.10.0 Release Notes]."]
 
 [float]
 ==== Timelion expressions
diff --git a/docs/user/discover.asciidoc b/docs/user/discover.asciidoc
index ea413747a2aad..82a7dd300f028 100644
--- a/docs/user/discover.asciidoc
+++ b/docs/user/discover.asciidoc
@@ -101,22 +101,24 @@ 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 `day of week` field and add it to your document table. Your table should look like this:
+. Find the `customer_first_name` and `customer_last_name` last name fields and add
+them to your document table. Your table should look similar to this:
 +
 [role="screenshot"]
-image:images/document-table.png[Document table with fields for manufacturer, geo.country_iso_code, and day_of_week]
-
+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 and sort controls.
+column header, and then use the move controls.
+
+. To view more of the document table, click *Hide chart*.
 
 [float]
 [[add-field-in-discover]]
-=== Add a field
+=== Add a field to your index pattern
 
 What happens if you forgot to define an important value as a separate field? Or, what if you
-want to combine two fields and treat them as one?
-You can add a field to your index pattern from inside of **Discover**,
+want to combine two fields and treat them as one? This is where {ref}/runtime.html[runtime fields] come into play.
+You can add a runtime field to your index pattern from inside of **Discover**,
 and then use that field for analysis and visualizations,
 the same way you do with other fields.
 
@@ -129,7 +131,7 @@ image:images/add-field-to-pattern.png[Dropdown menu located next to index patter
 
 . Turn on *Set value*.
 
-. Use the Painless scripting language to define the field:
+. Define the script using the Painless scripting language.  Runtime fields require an `emit()`.
 +
 ```ts
 emit("Hello World!");
@@ -137,15 +139,25 @@ emit("Hello World!");
 
 . Click *Save*.
 
-. In the fields list, search for the *hello* field, and then click it.
-+
-You'll see the top values for the field.  The pop-up also includes actions for filtering,
-editing, and deleting the field.
+. In the fields list, search for the *hello* field, and then add it to the table to view it's value.
 +
 [role="screenshot"]
-image:images/hello-field.png[Top values for the hello field, width=50%]
+image:images/hello-field.png[hello field in the document table]
 
-For more information on adding fields and Painless scripting language examples, refer to <<runtime-fields, Explore your data with runtime fields>>.
+. Create a second field named `customer` that combines customer last name and first initial.
++
+```ts
+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.
++
+[role="screenshot"]
+image:images/customer.png[Customer last name, first initial in the document table]
++
+For more information on adding fields and Painless scripting language examples,
+refer to <<runtime-fields, Explore your data with runtime fields>>.
 
 
 [float]
@@ -202,7 +214,7 @@ 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. To view more of the document table, click *Hide chart*.
+. In the document table, expand any document.
 +
 [role="screenshot"]
 image:images/document-table-expanded.png[Table view with document expanded]
@@ -238,7 +250,7 @@ image:images/discover-save-saved-search.png[Save saved search in Discover, width
 If a field can be {ref}/search-aggregations.html[aggregated], you can quickly
 visualize it from **Discover**.
 
-. From the **Selected fields** list, click  `day_of_week`, and then click **Visualize**.
+. From the **Available fields** list, click  `day_of_week`, and then click **Visualize**.
 +
 [role="screenshot"]
 image:images/discover-visualize.png[Discover sidebar field popover with visualize button, width=75%]
diff --git a/docs/user/introduction.asciidoc b/docs/user/introduction.asciidoc
index 38435708aaf99..25780d303eec4 100644
--- a/docs/user/introduction.asciidoc
+++ b/docs/user/introduction.asciidoc
@@ -26,8 +26,8 @@ which features.
 <img
 style="width: 100%; margin: auto; display: block;"
 class="vidyard-player-embed"
-src="https://play.vidyard.com/jW5wP2dmegbs5ThRZ451Gj.jpg"
-data-uuid="jW5wP2dmegbs5ThRZ451Gj"
+src="https://play.vidyard.com/iyqMwJcvi8r4YfjeoPMjyH.jpg"
+data-uuid="iyqMwJcvi8r4YfjeoPMjyH"
 data-v="4"
 data-type="inline"
 />
diff --git a/docs/user/production-considerations/production.asciidoc b/docs/user/production-considerations/production.asciidoc
index 726747d5d69d0..1ffca4b6ae6ab 100644
--- a/docs/user/production-considerations/production.asciidoc
+++ b/docs/user/production-considerations/production.asciidoc
@@ -8,7 +8,6 @@
 * <<configuring-kibana-shield>>
 * <<csp-strict-mode>>
 * <<enabling-ssl>>
-* <<load-balancing-es>>
 * <<load-balancing-kibana>>
 * <<accessing-load-balanced-kibana>>
 * <<high-availability>>
@@ -22,9 +21,8 @@ Kibana instances that are all connected to the same Elasticsearch instance.
 
 While Kibana isn't terribly resource intensive, we still recommend running Kibana
 separate from  your Elasticsearch data or master nodes. To distribute Kibana
-traffic across the nodes in your Elasticsearch cluster, you can run Kibana
-and an Elasticsearch client node on the same machine. For more information, see
-<<load-balancing-es, Load balancing across multiple Elasticsearch nodes>>.
+traffic across the nodes in your Elasticsearch cluster,
+you can configure Kibana to use a list of Elasticsearch hosts.
 
 [float]
 [[configuring-kibana-shield]]
@@ -69,58 +67,6 @@ csp.strict: true
 
 See <<configuring-tls>>.
 
-[float]
-[[load-balancing-es]]
-=== Load Balancing across multiple {es} nodes
-If you have multiple nodes in your Elasticsearch cluster, the easiest way to distribute Kibana requests
-across the nodes is to run an Elasticsearch _Coordinating only_ node on the same machine as Kibana.
-Elasticsearch Coordinating only nodes are essentially smart load balancers that are part of the cluster. They
-process incoming HTTP requests, redirect operations to the other nodes in the cluster as needed, and
-gather and return the results. For more information, see
-{ref}/modules-node.html[Node] in the Elasticsearch reference.
-
-To use a local client node to load balance Kibana requests:
-
-. Install Elasticsearch on the same machine as Kibana.
-. Configure the node as a Coordinating only node. In `elasticsearch.yml`, set `node.data`, `node.master` and `node.ingest` to `false`:
-+
-[source,js]
---------
-# 3. You want this node to be neither master nor data node nor ingest node, but
-#    to act as a "search load balancer" (fetching data from nodes,
-#    aggregating results, etc.)
-#
-node.master: false
-node.data: false
-node.ingest: false
---------
-. Configure the client node to join your Elasticsearch cluster. In `elasticsearch.yml`, set the `cluster.name` to the
-name of your cluster.
-+
-[source,js]
---------
-cluster.name: "my_cluster"
---------
-. Check your transport and HTTP host configs in `elasticsearch.yml` under `network.host` and `transport.host`. The `transport.host` needs to be on the network reachable to the cluster members, the `network.host` is the network for the HTTP connection for Kibana (localhost:9200 by default).
-+
-[source,js]
---------
-network.host: localhost
-http.port: 9200
-
-# by default transport.host refers to network.host
-transport.host: <external ip>
-transport.tcp.port: 9300 - 9400
---------
-. Make sure Kibana is configured to point to your local client node. In `kibana.yml`, the `elasticsearch.hosts` setting should be set to
-`["localhost:9200"]`.
-+
-[source,js]
---------
-# The Elasticsearch instance to use for all your queries.
-elasticsearch.hosts: ["http://localhost:9200"]
---------
-
 [float]
 [[load-balancing-kibana]]
 === Load balancing across multiple Kibana instances
diff --git a/docs/user/production-considerations/task-manager-health-monitoring.asciidoc b/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
index f64c120f61298..d6b90a4f19e11 100644
--- a/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
+++ b/docs/user/production-considerations/task-manager-health-monitoring.asciidoc
@@ -6,6 +6,8 @@
 <titleabbrev>Health monitoring</titleabbrev>
 ++++
 
+experimental[]
+
 The Task Manager has an internal monitoring mechanism to keep track of a variety of metrics, which can be consumed with either the health monitoring API or the {kib} server log.
 
 The health monitoring API provides a reliable endpoint that can be monitored.
diff --git a/docs/user/production-considerations/task-manager-troubleshooting.asciidoc b/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
index 5e75aef0d9570..c6a7b7f3d53fd 100644
--- a/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
+++ b/docs/user/production-considerations/task-manager-troubleshooting.asciidoc
@@ -60,6 +60,8 @@ For details on scaling Task Manager, see <<task-manager-scaling-guidance>>.
 [[task-manager-diagnosing-root-cause]]
 ==== Diagnose a root cause for drift
 
+experimental[]
+
 The following guide helps you identify a root cause for _drift_ by making sense of the output from the <<task-manager-health-monitoring>> endpoint.
 
 By analyzing the different sections of the output, you can evaluate different theories that explain the drift in a deployment.
diff --git a/docs/user/security/api-keys/images/create-api-key.png b/docs/user/security/api-keys/images/create-api-key.png
index c763dcbfa53f8..b0041f69b05b6 100644
Binary files a/docs/user/security/api-keys/images/create-api-key.png and b/docs/user/security/api-keys/images/create-api-key.png differ
diff --git a/docs/user/security/securing-communications/elasticsearch-mutual-tls.asciidoc b/docs/user/security/securing-communications/elasticsearch-mutual-tls.asciidoc
index f5192f4641d4d..63fd2799c90cf 100644
--- a/docs/user/security/securing-communications/elasticsearch-mutual-tls.asciidoc
+++ b/docs/user/security/securing-communications/elasticsearch-mutual-tls.asciidoc
@@ -39,7 +39,7 @@ This entails generating a "server certificate" for {es} to use on the HTTP layer
 . Obtain a client certificate and private key for {kib}.
 +
 --
-{kib} must this "client certificate" and corresponding private key when connecting to {es}.
+{kib} uses the client certificate and corresponding private key when connecting to {es}.
 
 NOTE: This is not the same as the <<configuring-tls-browser-kib,server certificate>> that {kib} will present to web browsers.
 
diff --git a/examples/search_examples/public/search_sessions/app.tsx b/examples/search_examples/public/search_sessions/app.tsx
index a768600db24ee..7fdf91537c977 100644
--- a/examples/search_examples/public/search_sessions/app.tsx
+++ b/examples/search_examples/public/search_sessions/app.tsx
@@ -702,7 +702,7 @@ function doSearch(
   const startTs = performance.now();
 
   // Submit the search request using the `data.search` service.
-  // @ts-expect-error request.params is incompatible. Filter is not assignable to QueryContainer
+  // @ts-expect-error request.params is incompatible. Filter is not assignable to QueryDslQueryContainer
   return data.search
     .search(req, { sessionId })
     .pipe(
diff --git a/package.json b/package.json
index f41c85c4c7b80..6f5994a8679d6 100644
--- a/package.json
+++ b/package.json
@@ -86,6 +86,7 @@
     "**/prismjs": "1.23.0",
     "**/react-syntax-highlighter": "^15.3.1",
     "**/react-syntax-highlighter/**/highlight.js": "^10.4.1",
+    "**/refractor": "^3.3.1",
     "**/request": "^2.88.2",
     "**/trim": "1.0.1",
     "**/typescript": "4.1.3",
@@ -98,11 +99,11 @@
   "dependencies": {
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/apm-rum-react": "^1.2.5",
-    "@elastic/charts": "29.2.0",
-    "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath/npm_module",
-    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.4",
+    "@elastic/charts": "30.0.0",
+    "@elastic/datemath": "link:bazel-bin/packages/elastic-datemath",
+    "@elastic/elasticsearch": "npm:@elastic/elasticsearch-canary@^8.0.0-canary.13",
     "@elastic/ems-client": "7.13.0",
-    "@elastic/eui": "32.1.0",
+    "@elastic/eui": "33.0.0",
     "@elastic/filesaver": "1.1.2",
     "@elastic/good": "^9.0.1-kibana3",
     "@elastic/maki": "6.3.0",
@@ -110,51 +111,52 @@
     "@elastic/numeral": "^2.5.1",
     "@elastic/react-search-ui": "^1.5.1",
     "@elastic/request-crypto": "1.1.4",
-    "@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set/npm_module",
+    "@elastic/safer-lodash-set": "link:bazel-bin/packages/elastic-safer-lodash-set",
     "@elastic/search-ui-app-search-connector": "^1.5.0",
     "@elastic/ui-ace": "0.2.3",
     "@hapi/accept": "^5.0.2",
     "@hapi/boom": "^9.1.1",
     "@hapi/cookie": "^11.0.2",
     "@hapi/good-squeeze": "6.0.0",
-    "@hapi/h2o2": "^9.0.2",
+    "@hapi/h2o2": "^9.1.0",
     "@hapi/hapi": "^20.0.3",
     "@hapi/hoek": "^9.1.1",
     "@hapi/inert": "^6.0.3",
     "@hapi/podium": "^4.1.1",
     "@hapi/wreck": "^17.1.0",
-    "@kbn/ace": "link:bazel-bin/packages/kbn-ace/npm_module",
-    "@kbn/analytics": "link:bazel-bin/packages/kbn-analytics/npm_module",
-    "@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader/npm_module",
-    "@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils/npm_module",
-    "@kbn/config": "link:bazel-bin/packages/kbn-config/npm_module",
-    "@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema/npm_module",
-    "@kbn/crypto": "link:bazel-bin/packages/kbn-crypto/npm_module",
-    "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl/npm_module",
-    "@kbn/i18n": "link:bazel-bin/packages/kbn-i18n/npm_module",
+    "@kbn/ace": "link:bazel-bin/packages/kbn-ace",
+    "@kbn/analytics": "link:bazel-bin/packages/kbn-analytics",
+    "@kbn/apm-config-loader": "link:bazel-bin/packages/kbn-apm-config-loader",
+    "@kbn/apm-utils": "link:bazel-bin/packages/kbn-apm-utils",
+    "@kbn/config": "link:bazel-bin/packages/kbn-config",
+    "@kbn/config-schema": "link:bazel-bin/packages/kbn-config-schema",
+    "@kbn/crypto": "link:bazel-bin/packages/kbn-crypto",
+    "@kbn/mapbox-gl": "link:bazel-bin/packages/kbn-mapbox-gl",
+    "@kbn/i18n": "link:bazel-bin/packages/kbn-i18n",
     "@kbn/interpreter": "link:packages/kbn-interpreter",
-    "@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils/npm_module",
-    "@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging/npm_module",
-    "@kbn/logging": "link:bazel-bin/packages/kbn-logging/npm_module",
-    "@kbn/monaco": "link:bazel-bin/packages/kbn-monaco/npm_module",
-    "@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants/npm_module",
-    "@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils/npm_module",
-    "@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types/npm_module",
-    "@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types/npm_module",
-    "@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types/npm_module",
-    "@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils/npm_module",
-    "@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api/npm_module",
-    "@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks/npm_module",
-    "@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils/npm_module",
-    "@kbn/securitysolution-utils": "link:bazel-bin/packages/kbn-securitysolution-utils/npm_module",
-    "@kbn/server-http-tools": "link:bazel-bin/packages/kbn-server-http-tools/npm_module",
+    "@kbn/io-ts-utils": "link:bazel-bin/packages/kbn-io-ts-utils",
+    "@kbn/legacy-logging": "link:bazel-bin/packages/kbn-legacy-logging",
+    "@kbn/logging": "link:bazel-bin/packages/kbn-logging",
+    "@kbn/monaco": "link:bazel-bin/packages/kbn-monaco",
+    "@kbn/rule-data-utils": "link:bazel-bin/packages/kbn-rule-data-utils",
+    "@kbn/securitysolution-list-constants": "link:bazel-bin/packages/kbn-securitysolution-list-constants",
+    "@kbn/securitysolution-es-utils": "link:bazel-bin/packages/kbn-securitysolution-es-utils",
+    "@kbn/securitysolution-io-ts-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-types",
+    "@kbn/securitysolution-io-ts-alerting-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types",
+    "@kbn/securitysolution-io-ts-list-types": "link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types",
+    "@kbn/securitysolution-io-ts-utils": "link:bazel-bin/packages/kbn-securitysolution-io-ts-utils",
+    "@kbn/securitysolution-list-api": "link:bazel-bin/packages/kbn-securitysolution-list-api",
+    "@kbn/securitysolution-list-hooks": "link:bazel-bin/packages/kbn-securitysolution-list-hooks",
+    "@kbn/securitysolution-list-utils": "link:bazel-bin/packages/kbn-securitysolution-list-utils",
+    "@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:packages/kbn-server-route-repository",
-    "@kbn/std": "link:bazel-bin/packages/kbn-std/npm_module",
-    "@kbn/tinymath": "link:bazel-bin/packages/kbn-tinymath/npm_module",
+    "@kbn/std": "link:bazel-bin/packages/kbn-std",
+    "@kbn/tinymath": "link:bazel-bin/packages/kbn-tinymath",
     "@kbn/ui-framework": "link:packages/kbn-ui-framework",
     "@kbn/ui-shared-deps": "link:packages/kbn-ui-shared-deps",
-    "@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types/npm_module",
-    "@kbn/utils": "link:bazel-bin/packages/kbn-utils/npm_module",
+    "@kbn/utility-types": "link:bazel-bin/packages/kbn-utility-types",
+    "@kbn/utils": "link:bazel-bin/packages/kbn-utils",
     "@loaders.gl/core": "^2.3.1",
     "@loaders.gl/json": "^2.3.1",
     "@mapbox/geojson-rewind": "^0.5.0",
@@ -162,7 +164,6 @@
     "@mapbox/mapbox-gl-rtl-text": "0.2.3",
     "@mapbox/vector-tile": "1.3.1",
     "@reduxjs/toolkit": "^1.5.1",
-    "@scant/router": "^0.1.1",
     "@slack/webhook": "^5.0.4",
     "@turf/along": "6.0.1",
     "@turf/area": "6.0.1",
@@ -197,7 +198,7 @@
     "broadcast-channel": "^3.0.3",
     "chalk": "^4.1.0",
     "check-disk-space": "^2.1.0",
-    "cheerio": "0.22.0",
+    "cheerio": "^1.0.0-rc.9",
     "chokidar": "^3.4.3",
     "chroma-js": "^1.4.1",
     "classnames": "2.2.6",
@@ -229,6 +230,7 @@
     "expiry-js": "0.1.7",
     "extract-zip": "^2.0.1",
     "fast-deep-equal": "^3.1.1",
+    "fflate": "^0.6.9",
     "file-saver": "^1.3.8",
     "file-type": "^10.9.0",
     "focus-trap-react": "^3.1.1",
@@ -239,7 +241,6 @@
     "get-port": "^5.0.0",
     "getopts": "^2.2.5",
     "getos": "^3.1.0",
-    "git-url-parse": "11.1.2",
     "github-markdown-css": "^2.10.0",
     "glob": "^7.1.2",
     "glob-all": "^3.2.1",
@@ -274,7 +275,6 @@
     "json-stringify-safe": "5.0.1",
     "jsonwebtoken": "^8.5.1",
     "jsts": "^1.6.2",
-    "@kbn/rule-data-utils": "link:packages/kbn-rule-data-utils",
     "kea": "^2.4.2",
     "leaflet": "1.5.1",
     "leaflet-draw": "0.4.14",
@@ -293,7 +293,7 @@
     "memoize-one": "^5.0.0",
     "mime": "^2.4.4",
     "mime-types": "^2.1.27",
-    "mini-css-extract-plugin": "0.8.0",
+    "mini-css-extract-plugin": "1.1.0",
     "minimatch": "^3.0.4",
     "moment": "^2.24.0",
     "moment-duration-format": "^2.3.2",
@@ -441,33 +441,33 @@
     "@babel/traverse": "^7.12.12",
     "@babel/types": "^7.12.12",
     "@bazel/ibazel": "^0.15.10",
-    "@bazel/typescript": "^3.5.0",
+    "@bazel/typescript": "^3.5.1",
     "@cypress/snapshot": "^2.1.7",
     "@cypress/webpack-preprocessor": "^5.6.0",
     "@elastic/apm-rum": "^5.6.1",
     "@elastic/apm-rum-react": "^1.2.5",
-    "@elastic/eslint-config-kibana": "link:bazel-bin/packages/elastic-eslint-config-kibana/npm_module",
+    "@elastic/eslint-config-kibana": "link:bazel-bin/packages/elastic-eslint-config-kibana",
     "@elastic/eslint-plugin-eui": "0.0.2",
     "@elastic/github-checks-reporter": "0.0.20b3",
     "@elastic/makelogs": "^6.0.0",
     "@istanbuljs/schema": "^0.1.2",
     "@jest/reporters": "^26.6.2",
-    "@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser/npm_module",
-    "@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset/npm_module",
+    "@kbn/babel-code-parser": "link:bazel-bin/packages/kbn-babel-code-parser",
+    "@kbn/babel-preset": "link:bazel-bin/packages/kbn-babel-preset",
     "@kbn/cli-dev-mode": "link:packages/kbn-cli-dev-mode",
-    "@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils/npm_module",
-    "@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils/npm_module",
-    "@kbn/es": "link:bazel-bin/packages/kbn-es/npm_module",
+    "@kbn/dev-utils": "link:bazel-bin/packages/kbn-dev-utils",
+    "@kbn/docs-utils": "link:bazel-bin/packages/kbn-docs-utils",
+    "@kbn/es": "link:bazel-bin/packages/kbn-es",
     "@kbn/es-archiver": "link:packages/kbn-es-archiver",
-    "@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana/npm_module",
-    "@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint/npm_module",
-    "@kbn/expect": "link:bazel-bin/packages/kbn-expect/npm_module",
+    "@kbn/eslint-import-resolver-kibana": "link:bazel-bin/packages/kbn-eslint-import-resolver-kibana",
+    "@kbn/eslint-plugin-eslint": "link:bazel-bin/packages/kbn-eslint-plugin-eslint",
+    "@kbn/expect": "link:bazel-bin/packages/kbn-expect",
     "@kbn/optimizer": "link:packages/kbn-optimizer",
-    "@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator/npm_module",
+    "@kbn/plugin-generator": "link:bazel-bin/packages/kbn-plugin-generator",
     "@kbn/plugin-helpers": "link:packages/kbn-plugin-helpers",
     "@kbn/pm": "link:packages/kbn-pm",
     "@kbn/storybook": "link:packages/kbn-storybook",
-    "@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools/npm_module",
+    "@kbn/telemetry-tools": "link:bazel-bin/packages/kbn-telemetry-tools",
     "@kbn/test": "link:packages/kbn-test",
     "@kbn/test-subj-selector": "link:packages/kbn-test-subj-selector",
     "@loaders.gl/polyfills": "^2.3.5",
@@ -501,7 +501,6 @@
     "@types/base64-js": "^1.2.5",
     "@types/bluebird": "^3.1.1",
     "@types/chance": "^1.0.0",
-    "@types/cheerio": "^0.22.28",
     "@types/chroma-js": "^1.4.2",
     "@types/chromedriver": "^81.0.0",
     "@types/classnames": "^2.2.9",
@@ -532,7 +531,6 @@
     "@types/geojson": "7946.0.7",
     "@types/getopts": "^2.0.1",
     "@types/getos": "^3.0.0",
-    "@types/git-url-parse": "^9.0.0",
     "@types/glob": "^7.1.2",
     "@types/gulp": "^4.0.6",
     "@types/gulp-zip": "^4.0.1",
@@ -749,6 +747,7 @@
     "jest-cli": "^26.6.3",
     "jest-diff": "^26.6.2",
     "jest-environment-jsdom": "^26.6.2",
+    "jest-environment-jsdom-thirteen": "^1.0.1",
     "jest-raw-loader": "^1.0.1",
     "jest-silent-reporter": "^0.5.0",
     "jest-snapshot": "^26.6.2",
diff --git a/packages/BUILD.bazel b/packages/BUILD.bazel
index de3498da1a697..083ae90a031f5 100644
--- a/packages/BUILD.bazel
+++ b/packages/BUILD.bazel
@@ -28,6 +28,7 @@ filegroup(
       "//packages/kbn-mapbox-gl:build",
       "//packages/kbn-monaco:build",
       "//packages/kbn-plugin-generator:build",
+      "//packages/kbn-rule-data-utils:build",
       "//packages/kbn-securitysolution-list-constants:build",
       "//packages/kbn-securitysolution-io-ts-types:build",
       "//packages/kbn-securitysolution-io-ts-alerting-types:build",
diff --git a/packages/kbn-apm-utils/src/index.ts b/packages/kbn-apm-utils/src/index.ts
index f2f537138dad0..384b6683199e5 100644
--- a/packages/kbn-apm-utils/src/index.ts
+++ b/packages/kbn-apm-utils/src/index.ts
@@ -16,6 +16,8 @@ export interface SpanOptions {
   labels?: Record<string, string>;
 }
 
+type Span = Exclude<typeof agent.currentSpan, undefined | null>;
+
 export function parseSpanOptions(optionsOrName: SpanOptions | string) {
   const options = typeof optionsOrName === 'string' ? { name: optionsOrName } : optionsOrName;
 
@@ -30,7 +32,7 @@ const runInNewContext = <T extends (...args: any[]) => any>(cb: T): ReturnType<T
 
 export async function withSpan<T>(
   optionsOrName: SpanOptions | string,
-  cb: () => Promise<T>
+  cb: (span?: Span) => Promise<T>
 ): Promise<T> {
   const options = parseSpanOptions(optionsOrName);
 
@@ -71,13 +73,17 @@ export async function withSpan<T>(
       span.addLabels(labels);
     }
 
-    return cb()
+    return cb(span)
       .then((res) => {
-        span.outcome = 'success';
+        if (!span.outcome || span.outcome === 'unknown') {
+          span.outcome = 'success';
+        }
         return res;
       })
       .catch((err) => {
-        span.outcome = 'failure';
+        if (!span.outcome || span.outcome === 'unknown') {
+          span.outcome = 'failure';
+        }
         throw err;
       })
       .finally(() => {
diff --git a/packages/kbn-babel-code-parser/BUILD.bazel b/packages/kbn-babel-code-parser/BUILD.bazel
index c1576ce59aa5c..dcdc042d7b802 100644
--- a/packages/kbn-babel-code-parser/BUILD.bazel
+++ b/packages/kbn-babel-code-parser/BUILD.bazel
@@ -34,10 +34,10 @@ DEPS = [
 
 babel(
   name = "target",
-  data = [
+  data = DEPS + [
       ":srcs",
       ".babelrc",
-  ] + DEPS,
+  ],
   output_dir = True,
   # the following arg paths includes $(execpath) as babel runs on the sandbox root
   args = [
diff --git a/packages/kbn-cli-dev-mode/src/base_path_proxy_server.test.ts b/packages/kbn-cli-dev-mode/src/base_path_proxy_server.test.ts
index a0afbe3a9b8c9..34c6be02847a7 100644
--- a/packages/kbn-cli-dev-mode/src/base_path_proxy_server.test.ts
+++ b/packages/kbn-cli-dev-mode/src/base_path_proxy_server.test.ts
@@ -185,6 +185,45 @@ describe('BasePathProxyServer', () => {
       });
   });
 
+  test('forwards request cancellation', async () => {
+    let propagated = false;
+
+    let notifyRequestReceived: () => void;
+    const requestReceived = new Promise<void>((resolve) => {
+      notifyRequestReceived = resolve;
+    });
+
+    let notifyRequestAborted: () => void;
+    const requestAborted = new Promise<void>((resolve) => {
+      notifyRequestAborted = resolve;
+    });
+
+    server.route({
+      method: 'GET',
+      path: `${basePath}/foo/{test}`,
+      handler: async (request, h) => {
+        notifyRequestReceived();
+
+        request.raw.req.once('aborted', () => {
+          notifyRequestAborted();
+          propagated = true;
+        });
+        return await new Promise((resolve) => undefined);
+      },
+    });
+    await server.start();
+
+    const request = proxySupertest.get(`${basePath}/foo/some-string`).end();
+
+    await requestReceived;
+
+    request.abort();
+
+    await requestAborted;
+
+    expect(propagated).toEqual(true);
+  });
+
   test('handles putting', async () => {
     server.route({
       method: 'PUT',
diff --git a/packages/kbn-config/src/config_service.test.ts b/packages/kbn-config/src/config_service.test.ts
index c2d4f15b6d915..b1b622381abb1 100644
--- a/packages/kbn-config/src/config_service.test.ts
+++ b/packages/kbn-config/src/config_service.test.ts
@@ -418,8 +418,14 @@ test('logs deprecation warning during validation', async () => {
   const configService = new ConfigService(rawConfig, defaultEnv, logger);
   mockApplyDeprecations.mockImplementationOnce((config, deprecations, createAddDeprecation) => {
     const addDeprecation = createAddDeprecation!('');
-    addDeprecation({ message: 'some deprecation message' });
-    addDeprecation({ message: 'another deprecation message' });
+    addDeprecation({
+      message: 'some deprecation message',
+      correctiveActions: { manualSteps: ['do X'] },
+    });
+    addDeprecation({
+      message: 'another deprecation message',
+      correctiveActions: { manualSteps: ['do Y'] },
+    });
     return { config, changedPaths: mockedChangedPaths };
   });
 
@@ -444,13 +450,24 @@ test('does not log warnings for silent deprecations during validation', async ()
   mockApplyDeprecations
     .mockImplementationOnce((config, deprecations, createAddDeprecation) => {
       const addDeprecation = createAddDeprecation!('');
-      addDeprecation({ message: 'some deprecation message', silent: true });
-      addDeprecation({ message: 'another deprecation message' });
+      addDeprecation({
+        message: 'some deprecation message',
+        correctiveActions: { manualSteps: ['do X'] },
+        silent: true,
+      });
+      addDeprecation({
+        message: 'another deprecation message',
+        correctiveActions: { manualSteps: ['do Y'] },
+      });
       return { config, changedPaths: mockedChangedPaths };
     })
     .mockImplementationOnce((config, deprecations, createAddDeprecation) => {
       const addDeprecation = createAddDeprecation!('');
-      addDeprecation({ message: 'I am silent', silent: true });
+      addDeprecation({
+        message: 'I am silent',
+        silent: true,
+        correctiveActions: { manualSteps: ['do Z'] },
+      });
       return { config, changedPaths: mockedChangedPaths };
     });
 
@@ -519,7 +536,11 @@ describe('getHandledDeprecatedConfigs', () => {
     mockApplyDeprecations.mockImplementationOnce((config, deprecations, createAddDeprecation) => {
       deprecations.forEach((deprecation) => {
         const addDeprecation = createAddDeprecation!(deprecation.path);
-        addDeprecation({ message: `some deprecation message`, documentationUrl: 'some-url' });
+        addDeprecation({
+          message: `some deprecation message`,
+          documentationUrl: 'some-url',
+          correctiveActions: { manualSteps: ['do X'] },
+        });
       });
       return { config, changedPaths: mockedChangedPaths };
     });
@@ -532,6 +553,11 @@ describe('getHandledDeprecatedConfigs', () => {
           "base",
           Array [
             Object {
+              "correctiveActions": Object {
+                "manualSteps": Array [
+                  "do X",
+                ],
+              },
               "documentationUrl": "some-url",
               "message": "some deprecation message",
             },
diff --git a/packages/kbn-config/src/deprecation/types.ts b/packages/kbn-config/src/deprecation/types.ts
index 0522365ad76c1..1791dac060e2b 100644
--- a/packages/kbn-config/src/deprecation/types.ts
+++ b/packages/kbn-config/src/deprecation/types.ts
@@ -25,8 +25,8 @@ export interface DeprecatedConfigDetails {
   silent?: boolean;
   /* (optional) link to the documentation for more details on the deprecation. */
   documentationUrl?: string;
-  /* (optional) corrective action needed to fix this deprecation. */
-  correctiveActions?: {
+  /* corrective action needed to fix this deprecation. */
+  correctiveActions: {
     /**
      * Specify a list of manual steps our users need to follow
      * to fix the deprecation before upgrade.
diff --git a/packages/kbn-crypto/BUILD.bazel b/packages/kbn-crypto/BUILD.bazel
index b1723e4120e79..20793e27de629 100644
--- a/packages/kbn-crypto/BUILD.bazel
+++ b/packages/kbn-crypto/BUILD.bazel
@@ -38,6 +38,7 @@ TYPES_DEPS = [
   "@npm//@types/node",
   "@npm//@types/node-forge",
   "@npm//@types/testing-library__jest-dom",
+  "@npm//resize-observer-polyfill"
 ]
 
 DEPS = SRC_DEPS + TYPES_DEPS
diff --git a/packages/kbn-docs-utils/src/api_docs/tests/snapshots/plugin_a.json b/packages/kbn-docs-utils/src/api_docs/tests/snapshots/plugin_a.json
index 7d8a90c3aad77..0c3f65bc1b205 100644
--- a/packages/kbn-docs-utils/src/api_docs/tests/snapshots/plugin_a.json
+++ b/packages/kbn-docs-utils/src/api_docs/tests/snapshots/plugin_a.json
@@ -598,7 +598,7 @@
             "section": "def-public.ImAType",
             "text": "ImAType"
           },
-          ", e?: string | undefined) => ",
+          ", e: string | undefined) => ",
           {
             "pluginId": "pluginA",
             "scope": "public",
diff --git a/packages/kbn-es-archiver/src/actions/edit.ts b/packages/kbn-es-archiver/src/actions/edit.ts
index eb28985f71437..7a97bf08f3675 100644
--- a/packages/kbn-es-archiver/src/actions/edit.ts
+++ b/packages/kbn-es-archiver/src/actions/edit.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { resolve, relative } from 'path';
+import { relative } from 'path';
 import Fs from 'fs';
-import { createGunzip, createGzip, Z_BEST_COMPRESSION } from 'zlib';
+import { createGunzip, createGzip, constants } from 'zlib';
 import { promisify } from 'util';
 import globby from 'globby';
 import { ToolingLog } from '@kbn/dev-utils';
@@ -17,24 +17,22 @@ import { createPromiseFromStreams } from '@kbn/utils';
 const unlinkAsync = promisify(Fs.unlink);
 
 export async function editAction({
-  prefix,
-  dataDir,
+  path,
   log,
   handler,
 }: {
-  prefix: string;
-  dataDir: string;
+  path: string;
   log: ToolingLog;
   handler: () => Promise<any>;
 }) {
   const archives = (
     await globby('**/*.gz', {
-      cwd: prefix ? resolve(dataDir, prefix) : dataDir,
+      cwd: path,
       absolute: true,
     })
-  ).map((path) => ({
-    path,
-    rawPath: path.slice(0, -3),
+  ).map((found) => ({
+    path: found,
+    rawPath: found.slice(0, -3),
   }));
 
   await Promise.all(
@@ -61,7 +59,7 @@ export async function editAction({
     archives.map(async (archive) => {
       await createPromiseFromStreams([
         Fs.createReadStream(archive.rawPath),
-        createGzip({ level: Z_BEST_COMPRESSION }),
+        createGzip({ level: constants.Z_BEST_COMPRESSION }),
         Fs.createWriteStream(archive.path),
       ]);
 
diff --git a/packages/kbn-es-archiver/src/actions/load.ts b/packages/kbn-es-archiver/src/actions/load.ts
index 248c4a65cb20a..673fa7e7d96c8 100644
--- a/packages/kbn-es-archiver/src/actions/load.ts
+++ b/packages/kbn-es-archiver/src/actions/load.ts
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { resolve } from 'path';
+import { resolve, relative } from 'path';
 import { createReadStream } from 'fs';
 import { Readable } from 'stream';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
 import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
 import { createPromiseFromStreams, concatStreamProviders } from '@kbn/utils';
@@ -37,23 +37,21 @@ const pipeline = (...streams: Readable[]) =>
   );
 
 export async function loadAction({
-  name,
+  inputDir,
   skipExisting,
   useCreate,
   client,
-  dataDir,
   log,
   kbnClient,
 }: {
-  name: string;
+  inputDir: string;
   skipExisting: boolean;
   useCreate: boolean;
   client: KibanaClient;
-  dataDir: string;
   log: ToolingLog;
   kbnClient: KbnClient;
 }) {
-  const inputDir = resolve(dataDir, name);
+  const name = relative(REPO_ROOT, inputDir);
   const stats = createStats(name, log);
   const files = prioritizeMappings(await readDirectory(inputDir));
   const kibanaPluginIds = await kbnClient.plugins.getEnabledIds();
diff --git a/packages/kbn-es-archiver/src/actions/rebuild_all.ts b/packages/kbn-es-archiver/src/actions/rebuild_all.ts
index 1581ff41b95fc..f286f9719bdf1 100644
--- a/packages/kbn-es-archiver/src/actions/rebuild_all.ts
+++ b/packages/kbn-es-archiver/src/actions/rebuild_all.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { resolve, dirname, relative } from 'path';
+import { resolve, relative } from 'path';
 import { stat, Stats, rename, createReadStream, createWriteStream } from 'fs';
 import { Readable, Writable } from 'stream';
 import { fromNode } from 'bluebird';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { createPromiseFromStreams } from '@kbn/utils';
 import {
   prioritizeMappings,
@@ -25,15 +25,7 @@ async function isDirectory(path: string): Promise<boolean> {
   return stats.isDirectory();
 }
 
-export async function rebuildAllAction({
-  dataDir,
-  log,
-  rootDir = dataDir,
-}: {
-  dataDir: string;
-  log: ToolingLog;
-  rootDir?: string;
-}) {
+export async function rebuildAllAction({ dataDir, log }: { dataDir: string; log: ToolingLog }) {
   const childNames = prioritizeMappings(await readDirectory(dataDir));
   for (const childName of childNames) {
     const childPath = resolve(dataDir, childName);
@@ -42,13 +34,12 @@ export async function rebuildAllAction({
       await rebuildAllAction({
         dataDir: childPath,
         log,
-        rootDir,
       });
       continue;
     }
 
-    const archiveName = dirname(relative(rootDir, childPath));
-    log.info(`${archiveName} Rebuilding ${childName}`);
+    const archiveName = relative(REPO_ROOT, childPath);
+    log.info('[%s] Rebuilding %j', archiveName, childName);
     const gzip = isGzip(childPath);
     const tempFile = childPath + (gzip ? '.rebuilding.gz' : '.rebuilding');
 
@@ -60,6 +51,6 @@ export async function rebuildAllAction({
     ] as [Readable, ...Writable[]]);
 
     await fromNode((cb) => rename(tempFile, childPath, cb));
-    log.info(`${archiveName} Rebuilt ${childName}`);
+    log.info('[%s] Rebuilt %j', archiveName, childName);
   }
 }
diff --git a/packages/kbn-es-archiver/src/actions/save.ts b/packages/kbn-es-archiver/src/actions/save.ts
index c90f241a1c639..da0966920de24 100644
--- a/packages/kbn-es-archiver/src/actions/save.ts
+++ b/packages/kbn-es-archiver/src/actions/save.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { resolve } from 'path';
+import { resolve, relative } from 'path';
 import { createWriteStream, mkdirSync } from 'fs';
 import { Readable, Writable } from 'stream';
 import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { createListStream, createPromiseFromStreams } from '@kbn/utils';
 
 import {
@@ -22,23 +22,21 @@ import {
 } from '../lib';
 
 export async function saveAction({
-  name,
+  outputDir,
   indices,
   client,
-  dataDir,
   log,
   raw,
   query,
 }: {
-  name: string;
+  outputDir: string;
   indices: string | string[];
   client: KibanaClient;
-  dataDir: string;
   log: ToolingLog;
   raw: boolean;
   query?: Record<string, any>;
 }) {
-  const outputDir = resolve(dataDir, name);
+  const name = relative(REPO_ROOT, outputDir);
   const stats = createStats(name, log);
 
   log.info('[%s] Creating archive of %j', name, indices);
diff --git a/packages/kbn-es-archiver/src/actions/unload.ts b/packages/kbn-es-archiver/src/actions/unload.ts
index f4e37871a5337..d8bc013b40991 100644
--- a/packages/kbn-es-archiver/src/actions/unload.ts
+++ b/packages/kbn-es-archiver/src/actions/unload.ts
@@ -6,11 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { resolve } from 'path';
+import { resolve, relative } from 'path';
 import { createReadStream } from 'fs';
 import { Readable, Writable } from 'stream';
 import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
 import { createPromiseFromStreams } from '@kbn/utils';
 
@@ -25,19 +25,17 @@ import {
 } from '../lib';
 
 export async function unloadAction({
-  name,
+  inputDir,
   client,
-  dataDir,
   log,
   kbnClient,
 }: {
-  name: string;
+  inputDir: string;
   client: KibanaClient;
-  dataDir: string;
   log: ToolingLog;
   kbnClient: KbnClient;
 }) {
-  const inputDir = resolve(dataDir, name);
+  const name = relative(REPO_ROOT, inputDir);
   const stats = createStats(name, log);
   const kibanaPluginIds = await kbnClient.plugins.getEnabledIds();
 
diff --git a/packages/kbn-es-archiver/src/cli.ts b/packages/kbn-es-archiver/src/cli.ts
index 9617457d4573e..9268f5fa7bbb5 100644
--- a/packages/kbn-es-archiver/src/cli.ts
+++ b/packages/kbn-es-archiver/src/cli.ts
@@ -30,13 +30,12 @@ export function runCli() {
   new RunWithCommands({
     description: 'CLI to manage archiving/restoring data in elasticsearch',
     globalFlags: {
-      string: ['es-url', 'kibana-url', 'dir', 'config', 'es-ca', 'kibana-ca'],
+      string: ['es-url', 'kibana-url', 'config', 'es-ca', 'kibana-ca'],
       help: `
-        --config           path to an FTR config file that sets --es-url, --kibana-url, and --dir
+        --config           path to an FTR config file that sets --es-url and --kibana-url
                              default: ${defaultConfigPath}
         --es-url           url for Elasticsearch, prefer the --config flag
         --kibana-url       url for Kibana, prefer the --config flag
-        --dir              where arechives are stored, prefer the --config flag
         --kibana-ca        if Kibana url points to https://localhost we default to the CA from @kbn/dev-utils, customize the CA with this flag
         --es-ca            if Elasticsearch url points to https://localhost we default to the CA from @kbn/dev-utils, customize the CA with this flag
       `,
@@ -104,17 +103,6 @@ export function runCli() {
         }
       }
 
-      let dir = flags.dir;
-      if (dir && typeof dir !== 'string') {
-        throw createFlagError('--dir must be a string');
-      }
-      if (!dir && config) {
-        dir = Path.resolve(config.get('esArchiver.directory'));
-      }
-      if (!dir) {
-        throw createFlagError('--dir or --config must be defined');
-      }
-
       const client = new Client({
         node: esUrl,
         ssl: esCa ? { ca: esCa } : undefined,
@@ -130,7 +118,7 @@ export function runCli() {
       const esArchiver = new EsArchiver({
         log,
         client,
-        dataDir: dir,
+        baseDir: process.cwd(),
         kbnClient,
       });
 
@@ -141,16 +129,16 @@ export function runCli() {
   })
     .command({
       name: 'save',
-      usage: 'save [name] [...indices]',
+      usage: 'save [path] [...indices]',
       description: `
-        archive the [indices ...] into the --dir with [name]
+        archive the [indices ...] into a directory at [path]
 
         Example:
-          Save all [logstash-*] indices from http://localhost:9200 to [snapshots/my_test_data] directory
+          Save all [logstash-*] indices from http://localhost:9200 to the [test/functional/es_archives/my_test_data] directory
 
-          WARNING: If the [my_test_data] snapshot exists it will be deleted!
+          WARNING: If the [test/functional/es_archives/my_test_data] snapshot exists it will be deleted!
 
-          $ node scripts/es_archiver save my_test_data logstash-* --dir snapshots
+          $ node scripts/es_archiver save test/functional/es_archives/my_test_data logstash-*
       `,
       flags: {
         boolean: ['raw'],
@@ -161,9 +149,9 @@ export function runCli() {
         `,
       },
       async run({ flags, esArchiver }) {
-        const [name, ...indices] = flags._;
-        if (!name) {
-          throw createFlagError('missing [name] argument');
+        const [path, ...indices] = flags._;
+        if (!path) {
+          throw createFlagError('missing [path] argument');
         }
         if (!indices.length) {
           throw createFlagError('missing [...indices] arguments');
@@ -184,22 +172,22 @@ export function runCli() {
           }
         }
 
-        await esArchiver.save(name, indices, { raw, query: parsedQuery });
+        await esArchiver.save(path, indices, { raw, query: parsedQuery });
       },
     })
     .command({
       name: 'load',
-      usage: 'load [name]',
+      usage: 'load [path]',
       description: `
-        load the archive in --dir with [name]
+        load the archive stored at [path]
 
         Example:
-          Load the [my_test_data] snapshot from the archive directory and elasticsearch instance defined
-          in the [test/functional/config.js] config file
+          Load the [my_test_data] snapshot from the local directory and elasticsearch instance defined
+          in the [../config.js] config file
 
           WARNING: If the indices exist already they will be deleted!
 
-          $ node scripts/es_archiver load my_test_data --config test/functional/config.js
+          $ node scripts/es_archiver load my_test_data --config ../config.js
       `,
       flags: {
         boolean: ['use-create'],
@@ -208,9 +196,9 @@ export function runCli() {
         `,
       },
       async run({ flags, esArchiver }) {
-        const [name] = flags._;
-        if (!name) {
-          throw createFlagError('missing [name] argument');
+        const [path] = flags._;
+        if (!path) {
+          throw createFlagError('missing [path] argument');
         }
         if (flags._.length > 1) {
           throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`);
@@ -221,40 +209,40 @@ export function runCli() {
           throw createFlagError('--use-create does not take a value');
         }
 
-        await esArchiver.load(name, { useCreate });
+        await esArchiver.load(path, { useCreate });
       },
     })
     .command({
       name: 'unload',
-      usage: 'unload [name]',
-      description: 'remove indices created by the archive in --dir with [name]',
+      usage: 'unload [path]',
+      description: 'remove indices created by the archive at [path]',
       async run({ flags, esArchiver }) {
-        const [name] = flags._;
-        if (!name) {
-          throw createFlagError('missing [name] argument');
+        const [path] = flags._;
+        if (!path) {
+          throw createFlagError('missing [path] argument');
         }
         if (flags._.length > 1) {
           throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`);
         }
 
-        await esArchiver.unload(name);
+        await esArchiver.unload(path);
       },
     })
     .command({
       name: 'edit',
-      usage: 'edit [prefix]',
+      usage: 'edit [path]',
       description:
-        'extract the archives under the prefix, wait for edits to be completed, and then recompress the archives',
+        'extract the archives within or at [path], wait for edits to be completed, and then recompress the archives',
       async run({ flags, esArchiver }) {
-        const [prefix] = flags._;
-        if (!prefix) {
-          throw createFlagError('missing [prefix] argument');
+        const [path] = flags._;
+        if (!path) {
+          throw createFlagError('missing [path] argument');
         }
         if (flags._.length > 1) {
           throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`);
         }
 
-        await esArchiver.edit(prefix, async () => {
+        await esArchiver.edit(path, async () => {
           const rl = readline.createInterface({
             input: process.stdin,
             output: process.stdout,
@@ -278,10 +266,19 @@ export function runCli() {
       },
     })
     .command({
-      name: 'rebuild-all',
-      description: '[internal] read and write all archives in --dir to remove any inconsistencies',
-      async run({ esArchiver }) {
-        await esArchiver.rebuildAll();
+      name: 'rebuild-all [dir]',
+      description:
+        '[internal] read and write all archives within [dir] to remove any inconsistencies',
+      async run({ flags, esArchiver }) {
+        const [dir] = flags._;
+        if (!dir) {
+          throw createFlagError('missing [dir] argument');
+        }
+        if (flags._.length > 1) {
+          throw createFlagError(`unknown extra arguments: [${flags._.slice(1).join(', ')}]`);
+        }
+
+        await esArchiver.rebuildAll(dir);
       },
     })
     .execute();
diff --git a/packages/kbn-es-archiver/src/es_archiver.ts b/packages/kbn-es-archiver/src/es_archiver.ts
index 93ce97efd4c84..06a56b79e3012 100644
--- a/packages/kbn-es-archiver/src/es_archiver.ts
+++ b/packages/kbn-es-archiver/src/es_archiver.ts
@@ -6,8 +6,11 @@
  * Side Public License, v 1.
  */
 
+import Fs from 'fs';
+import Path from 'path';
+
 import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
-import { ToolingLog } from '@kbn/dev-utils';
+import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
 
 import {
@@ -21,139 +24,128 @@ import {
 
 interface Options {
   client: KibanaClient;
-  dataDir: string;
+  baseDir?: string;
   log: ToolingLog;
   kbnClient: KbnClient;
 }
 
 export class EsArchiver {
   private readonly client: KibanaClient;
-  private readonly dataDir: string;
+  private readonly baseDir: string;
   private readonly log: ToolingLog;
   private readonly kbnClient: KbnClient;
 
   constructor(options: Options) {
     this.client = options.client;
-    this.dataDir = options.dataDir;
+    this.baseDir = options.baseDir ?? REPO_ROOT;
     this.log = options.log;
     this.kbnClient = options.kbnClient;
   }
 
   /**
-   *  Extract data and mappings from an elasticsearch index and store
-   *  it in the dataDir so it can be used later to recreate the index.
+   * Extract data and mappings from an elasticsearch index and store
+   * it in the baseDir so it can be used later to recreate the index.
    *
-   *  @param {String} name - the name of this archive, used to determine filename
-   *  @param {String|Array<String>} indices - the indices to archive
-   *  @param {Object} options
-   *  @property {Boolean} options.raw - should the archive be raw (unzipped) or not
-   *  @return Promise<Stats>
+   * @param {String} path - relative path to the archive, resolved relative to this.baseDir which defaults to REPO_ROOT
+   * @param {String|Array<String>} indices - the indices to archive
+   * @param {Object} options
+   * @property {Boolean} options.raw - should the archive be raw (unzipped) or not
    */
   async save(
-    name: string,
+    path: string,
     indices: string | string[],
     { raw = false, query }: { raw?: boolean; query?: Record<string, any> } = {}
   ) {
     return await saveAction({
-      name,
+      outputDir: Path.resolve(this.baseDir, path),
       indices,
       raw,
       client: this.client,
-      dataDir: this.dataDir,
       log: this.log,
       query,
     });
   }
 
   /**
-   *  Load an index from an archive
+   * Load an index from an archive
    *
-   *  @param {String} name - the name of the archive to load
-   *  @param {Object} options
-   *  @property {Boolean} options.skipExisting - should existing indices
+   * @param {String} path - relative path to the archive to load, resolved relative to this.baseDir which defaults to REPO_ROOT
+   * @param {Object} options
+   * @property {Boolean} options.skipExisting - should existing indices
    *                                           be ignored or overwritten
-   *  @property {Boolean} options.useCreate - use a create operation instead of index for documents
-   *  @return Promise<Stats>
+   * @property {Boolean} options.useCreate - use a create operation instead of index for documents
    */
   async load(
-    name: string,
+    path: string,
     {
       skipExisting = false,
       useCreate = false,
     }: { skipExisting?: boolean; useCreate?: boolean } = {}
   ) {
     return await loadAction({
-      name,
+      inputDir: this.findArchive(path),
       skipExisting: !!skipExisting,
       useCreate: !!useCreate,
       client: this.client,
-      dataDir: this.dataDir,
       log: this.log,
       kbnClient: this.kbnClient,
     });
   }
 
   /**
-   *  Remove the indexes in elasticsearch that have data in an archive.
+   * Remove the indexes in elasticsearch that have data in an archive.
    *
-   *  @param {String} name
-   *  @return Promise<Stats>
+   * @param {String} path - relative path to the archive to unload, resolved relative to this.baseDir which defaults to REPO_ROOT
    */
-  async unload(name: string) {
+  async unload(path: string) {
     return await unloadAction({
-      name,
+      inputDir: this.findArchive(path),
       client: this.client,
-      dataDir: this.dataDir,
       log: this.log,
       kbnClient: this.kbnClient,
     });
   }
 
   /**
-   *  Parse and reformat all of the archives. This is primarily helpful
-   *  for working on the esArchiver.
+   * Parse and reformat all of the archives. This is primarily helpful
+   * for working on the esArchiver.
    *
-   *  @return Promise<Stats>
+   * @param {String} dir - relative path to a directory which contains archives, resolved relative to this.baseDir which defaults to REPO_ROOT
    */
-  async rebuildAll() {
+  async rebuildAll(dir: string) {
     return await rebuildAllAction({
-      dataDir: this.dataDir,
+      dataDir: Path.resolve(this.baseDir, dir),
       log: this.log,
     });
   }
 
   /**
-   *  Extract the gzipped files in an archive, then call the handler. When it
-   *  resolves re-archive the gzipped files.
+   * Extract the gzipped files in an archive, then call the handler. When it
+   * resolves re-archive the gzipped files.
    *
-   *  @param {String} prefix optional prefix to limit archives that are extracted
-   *  @param {() => Promise<any>} handler
-   *  @return Promise<void>
+   * @param {String} path optional prefix to limit archives that are extracted
+   * @param {() => Promise<any>} handler
    */
-  async edit(prefix: string, handler: () => Promise<void>) {
+  async edit(path: string, handler: () => Promise<void>) {
     return await editAction({
-      prefix,
+      path: Path.resolve(this.baseDir, path),
       log: this.log,
-      dataDir: this.dataDir,
       handler,
     });
   }
 
   /**
-   *  Just like load, but skips any existing index
+   * Just like load, but skips any existing index
    *
-   *  @param {String} name
-   *  @return Promise<Stats>
+   * @param name
    */
   async loadIfNeeded(name: string) {
     return await this.load(name, { skipExisting: true });
   }
 
   /**
-   *  Delete any Kibana indices, and initialize the Kibana index as Kibana would do
-   *  on startup.
-   *
-   *  @return Promise
+   * Delete any Kibana indices, and initialize the Kibana index as Kibana would do
+   * on startup.
    */
   async emptyKibanaIndex() {
     return await emptyKibanaIndexAction({
@@ -162,4 +154,33 @@ export class EsArchiver {
       kbnClient: this.kbnClient,
     });
   }
+
+  /**
+   * Resolve a path relative to the baseDir
+   *
+   * @param relativePath
+   */
+  private findArchive(relativePath: string) {
+    const path = Path.resolve(this.baseDir, relativePath);
+    let stats;
+    try {
+      stats = Fs.statSync(path);
+    } catch (error) {
+      if (error.code === 'ENOENT') {
+        throw new Error(
+          `Attempt to reference an esArchive with relative path [${relativePath}] could not be resolved. This path was resolved relative to [${this.baseDir}].`
+        );
+      }
+
+      throw error;
+    }
+
+    if (stats.isDirectory()) {
+      return path;
+    }
+
+    throw new Error(
+      `Attempt to reference an esArchive with relative path [${relativePath}] resolved to a file instead of a directory containing data/mapping files. This path was resolved relative to [${this.baseDir}].`
+    );
+  }
 }
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 b45a8b18a5776..fba3df24e896f 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
@@ -19,7 +19,7 @@ import { deleteIndex } from './delete_index';
 import { ES_CLIENT_HEADERS } from '../../client_headers';
 
 interface DocRecord {
-  value: estypes.IndexState & {
+  value: estypes.IndicesIndexState & {
     index: string;
     type: string;
   };
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 2a42d52e2ca80..d3d6f85d7a360 100644
--- a/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/delete_index.ts
@@ -126,7 +126,7 @@ export async function waitForSnapshotCompletion(
   const { body: repositoryMap } = await client.snapshot.getRepository({} as any);
   for (const repository of Object.keys(repositoryMap)) {
     const allInProgress = await getInProgressSnapshots(repository);
-    const found = allInProgress.find((s: any) => s.indices.includes(index));
+    const found = allInProgress?.find((s: any) => s.indices.includes(index));
 
     if (!found) {
       continue;
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 51d4f28d20f2e..0712d2789a91a 100644
--- a/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
+++ b/packages/kbn-es-archiver/src/lib/indices/kibana_index.ts
@@ -35,7 +35,7 @@ export async function deleteKibanaIndices({
   await client.indices.putSettings(
     {
       index: indexNames,
-      body: { index: { blocks: { read_only: false } } },
+      body: { settings: { blocks: { read_only: false } } },
     },
     {
       headers: ES_CLIENT_HEADERS,
diff --git a/packages/kbn-es/BUILD.bazel b/packages/kbn-es/BUILD.bazel
index 6c845996ce5e5..48f0fb58e983f 100644
--- a/packages/kbn-es/BUILD.bazel
+++ b/packages/kbn-es/BUILD.bazel
@@ -47,10 +47,10 @@ DEPS = [
 
 babel(
   name = "target",
-  data = [
+  data = DEPS + [
       ":srcs",
       ".babelrc",
-  ] + DEPS,
+  ],
   output_dir = True,
   # the following arg paths includes $(execpath) as babel runs on the sandbox root
   args = [
diff --git a/packages/kbn-expect/BUILD.bazel b/packages/kbn-expect/BUILD.bazel
index 82e6200e9688a..b7eb91a451b9a 100644
--- a/packages/kbn-expect/BUILD.bazel
+++ b/packages/kbn-expect/BUILD.bazel
@@ -5,7 +5,7 @@ PKG_REQUIRE_NAME = "@kbn/expect"
 
 SOURCE_FILES = glob([
   "expect.js",
-  "expect.js.d.ts",
+  "expect.d.ts",
 ])
 
 SRCS = SOURCE_FILES
diff --git a/packages/kbn-expect/expect.js.d.ts b/packages/kbn-expect/expect.d.ts
similarity index 100%
rename from packages/kbn-expect/expect.js.d.ts
rename to packages/kbn-expect/expect.d.ts
diff --git a/packages/kbn-expect/package.json b/packages/kbn-expect/package.json
index 8ca37c7c88673..2040683c539e2 100644
--- a/packages/kbn-expect/package.json
+++ b/packages/kbn-expect/package.json
@@ -1,6 +1,7 @@
 {
   "name": "@kbn/expect",
   "main": "./expect.js",
+  "typings": "./expect.d.ts",
   "version": "1.0.0",
   "license": "MIT",
   "private": true,
diff --git a/packages/kbn-expect/tsconfig.json b/packages/kbn-expect/tsconfig.json
index 7baae093bc3a9..8c0d9f1e34bd0 100644
--- a/packages/kbn-expect/tsconfig.json
+++ b/packages/kbn-expect/tsconfig.json
@@ -4,6 +4,6 @@
     "incremental": false,
   },
   "include": [
-    "expect.js.d.ts"
+    "expect.d.ts"
   ]
 }
diff --git a/packages/kbn-legacy-logging/BUILD.bazel b/packages/kbn-legacy-logging/BUILD.bazel
index 21cb8c338f89f..1fd04604dbd24 100644
--- a/packages/kbn-legacy-logging/BUILD.bazel
+++ b/packages/kbn-legacy-logging/BUILD.bazel
@@ -25,6 +25,7 @@ NPM_MODULE_EXTRA_FILES = [
 
 SRC_DEPS = [
   "//packages/kbn-config-schema",
+  "//packages/kbn-utils",
   "@npm//@elastic/numeral",
   "@npm//@hapi/hapi",
   "@npm//chokidar",
diff --git a/packages/kbn-monaco/BUILD.bazel b/packages/kbn-monaco/BUILD.bazel
index 3a25568dfd811..325187cdebc3a 100644
--- a/packages/kbn-monaco/BUILD.bazel
+++ b/packages/kbn-monaco/BUILD.bazel
@@ -48,7 +48,7 @@ webpack(
   name = "target_web",
   data = DEPS + [
     ":src",
-    ":webpack.config.js",
+    "webpack.config.js",
   ],
   output_dir = True,
   args = [
@@ -87,7 +87,7 @@ ts_project(
 js_library(
   name = PKG_BASE_NAME,
   srcs = NPM_MODULE_EXTRA_FILES,
-  deps = DEPS + [":target_web", ":tsc"],
+  deps = DEPS + [":tsc", ":target_web"],
   package_name = PKG_REQUIRE_NAME,
   visibility = ["//visibility:public"],
 )
diff --git a/packages/kbn-monaco/webpack.config.js b/packages/kbn-monaco/webpack.config.js
index d035134565463..ef482cd55159b 100644
--- a/packages/kbn-monaco/webpack.config.js
+++ b/packages/kbn-monaco/webpack.config.js
@@ -22,7 +22,6 @@ const createLangWorkerConfig = (lang) => {
       filename: `${lang}.editor.worker.js`,
     },
     resolve: {
-      modules: ['node_modules'],
       extensions: ['.js', '.ts', '.tsx'],
     },
     stats: 'errors-only',
diff --git a/packages/kbn-optimizer/limits.yml b/packages/kbn-optimizer/limits.yml
index c28fd83591960..9b4199c812864 100644
--- a/packages/kbn-optimizer/limits.yml
+++ b/packages/kbn-optimizer/limits.yml
@@ -3,7 +3,7 @@ pageLoadAssetSize:
   alerting: 106936
   apm: 64385
   apmOss: 18996
-  bfetch: 41874
+  bfetch: 51874
   canvas: 1066647
   charts: 195358
   cloud: 21076
@@ -34,7 +34,7 @@ pageLoadAssetSize:
   indexManagement: 140608
   indexPatternManagement: 28222
   infra: 184320
-  fleet: 415829
+  fleet: 450005
   ingestPipelines: 58003
   inputControlVis: 172675
   inspector: 148711
@@ -104,9 +104,10 @@ pageLoadAssetSize:
   indexPatternFieldEditor: 90489
   osquery: 107090
   fileUpload: 25664
-  fileDataVisualizer: 27530
+  dataVisualizer: 27530
   banners: 17946
   mapsEms: 26072
   timelines: 28613
   cases: 162385
   screenshotMode: 17856
+  visTypePie: 35583
diff --git a/packages/kbn-optimizer/src/optimizer/cache_keys.ts b/packages/kbn-optimizer/src/optimizer/cache_keys.ts
index 9275cab1fdff0..e622b3b8f593e 100644
--- a/packages/kbn-optimizer/src/optimizer/cache_keys.ts
+++ b/packages/kbn-optimizer/src/optimizer/cache_keys.ts
@@ -121,6 +121,10 @@ export interface OptimizerCacheKey {
 }
 
 async function getLastCommit() {
+  if (!Fs.existsSync(Path.join(REPO_ROOT, '.git'))) {
+    return undefined;
+  }
+
   const { stdout } = await execa(
     'git',
     ['log', '-n', '1', '--pretty=format:%H', '--', RELATIVE_DIR],
diff --git a/packages/kbn-optimizer/src/optimizer/get_changes.test.ts b/packages/kbn-optimizer/src/optimizer/get_changes.test.ts
index 4d4a902bb186a..d8be1917c101b 100644
--- a/packages/kbn-optimizer/src/optimizer/get_changes.test.ts
+++ b/packages/kbn-optimizer/src/optimizer/get_changes.test.ts
@@ -7,6 +7,7 @@
  */
 
 jest.mock('execa');
+jest.mock('fs');
 
 import { getChanges } from './get_changes';
 
@@ -15,6 +16,8 @@ const execa: jest.Mock = jest.requireMock('execa');
 it('parses git ls-files output', async () => {
   expect.assertions(4);
 
+  jest.requireMock('fs').existsSync.mockImplementation(() => true);
+
   execa.mockImplementation((cmd, args, options) => {
     expect(cmd).toBe('git');
     expect(args).toEqual(['ls-files', '-dmt', '--', '/foo/bar/x']);
diff --git a/packages/kbn-optimizer/src/optimizer/get_changes.ts b/packages/kbn-optimizer/src/optimizer/get_changes.ts
index e5574d9b1a2e4..73fa5e9d931e7 100644
--- a/packages/kbn-optimizer/src/optimizer/get_changes.ts
+++ b/packages/kbn-optimizer/src/optimizer/get_changes.ts
@@ -9,6 +9,7 @@
 import Path from 'path';
 
 import execa from 'execa';
+import fs from 'fs';
 
 export type Changes = Map<string, 'modified' | 'deleted'>;
 
@@ -16,11 +17,16 @@ export type Changes = Map<string, 'modified' | 'deleted'>;
  * get the changes in all the context directories (plugin public paths)
  */
 export async function getChanges(dir: string) {
+  const changes: Changes = new Map();
+
+  if (!fs.existsSync(Path.join(dir, '.git'))) {
+    return changes;
+  }
+
   const { stdout } = await execa('git', ['ls-files', '-dmt', '--', dir], {
     cwd: dir,
   });
 
-  const changes: Changes = new Map();
   const output = stdout.trim();
 
   if (output) {
diff --git a/packages/kbn-pm/dist/index.js b/packages/kbn-pm/dist/index.js
index 29c0457c316f0..e455f487d1384 100644
--- a/packages/kbn-pm/dist/index.js
+++ b/packages/kbn-pm/dist/index.js
@@ -650,6 +650,7 @@ __webpack_require__.r(__webpack_exports__);
 /* 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; });
@@ -683,6 +684,8 @@ var extendStatics = function(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 __());
@@ -805,19 +808,27 @@ function __read(o, n) {
     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) {
+    for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
+        to[j] = from[i];
+    return to;
+}
 
 function __await(v) {
     return this instanceof __await ? (this.v = v, this) : new __await(v);
@@ -872,19 +883,17 @@ function __importDefault(mod) {
     return (mod && mod.__esModule) ? mod : { default: mod };
 }
 
-function __classPrivateFieldGet(receiver, privateMap) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to get private field on non-instance");
-    }
-    return privateMap.get(receiver);
+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, privateMap, value) {
-    if (!privateMap.has(receiver)) {
-        throw new TypeError("attempted to set private field on non-instance");
-    }
-    privateMap.set(receiver, value);
-    return value;
+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;
 }
 
 
@@ -23045,7 +23054,7 @@ class Project {
 
   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)}/npm_module`));
+    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
@@ -23234,7 +23243,7 @@ function transformDependencies(dependencies = {}) {
     }
 
     if (isBazelPackageDependency(depVersion)) {
-      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:').replace('/npm_module', '');
+      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
       continue;
     }
 
@@ -48471,7 +48480,7 @@ async function runBazelCommandWithRunner(bazelCommandRunner, bazelArgs, offline
   });
 
   if (offline) {
-    bazelArgs.push('--config=offline');
+    bazelArgs = [...bazelArgs, '--config=offline'];
   }
 
   const bazelProc = Object(_child_process__WEBPACK_IMPORTED_MODULE_4__["spawn"])(bazelCommandRunner, bazelArgs, bazelOpts);
diff --git a/packages/kbn-pm/src/utils/bazel/run.ts b/packages/kbn-pm/src/utils/bazel/run.ts
index 7b20ea43982e6..c030081e53daa 100644
--- a/packages/kbn-pm/src/utils/bazel/run.ts
+++ b/packages/kbn-pm/src/utils/bazel/run.ts
@@ -30,7 +30,7 @@ async function runBazelCommandWithRunner(
   };
 
   if (offline) {
-    bazelArgs.push('--config=offline');
+    bazelArgs = [...bazelArgs, '--config=offline'];
   }
 
   const bazelProc = spawn(bazelCommandRunner, bazelArgs, bazelOpts);
diff --git a/packages/kbn-pm/src/utils/package_json.ts b/packages/kbn-pm/src/utils/package_json.ts
index e635c2566e65a..a50d8994b5720 100644
--- a/packages/kbn-pm/src/utils/package_json.ts
+++ b/packages/kbn-pm/src/utils/package_json.ts
@@ -61,7 +61,7 @@ export function transformDependencies(dependencies: IPackageDependencies = {}) {
     }
 
     if (isBazelPackageDependency(depVersion)) {
-      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:').replace('/npm_module', '');
+      newDeps[name] = depVersion.replace('link:bazel-bin/', 'file:');
       continue;
     }
 
diff --git a/packages/kbn-pm/src/utils/project.ts b/packages/kbn-pm/src/utils/project.ts
index 5d2a0547b2577..8e86b111c6a18 100644
--- a/packages/kbn-pm/src/utils/project.ts
+++ b/packages/kbn-pm/src/utils/project.ts
@@ -94,7 +94,7 @@ export class Project {
     const relativePathToProjectIfBazelPkg = normalizePath(
       Path.relative(
         this.path,
-        `${__dirname}/../../../bazel-bin/packages/${Path.basename(project.path)}/npm_module`
+        `${__dirname}/../../../bazel-bin/packages/${Path.basename(project.path)}`
       )
     );
 
diff --git a/packages/kbn-rule-data-utils/BUILD.bazel b/packages/kbn-rule-data-utils/BUILD.bazel
new file mode 100644
index 0000000000000..ccd1793feb161
--- /dev/null
+++ b/packages/kbn-rule-data-utils/BUILD.bazel
@@ -0,0 +1,79 @@
+load("@npm//@bazel/typescript:index.bzl", "ts_config", "ts_project")
+load("@build_bazel_rules_nodejs//:index.bzl", "js_library", "pkg_npm")
+
+PKG_BASE_NAME = "kbn-rule-data-utils"
+PKG_REQUIRE_NAME = "@kbn/rule-data-utils"
+
+SOURCE_FILES = glob(
+  [
+    "src/**/*.ts",
+  ],
+)
+
+SRCS = SOURCE_FILES
+
+filegroup(
+  name = "srcs",
+  srcs = SRCS,
+)
+
+NPM_MODULE_EXTRA_FILES = [
+  "package.json",
+]
+
+SRC_DEPS = [
+  "@npm//tslib",
+  "@npm//utility-types",
+]
+
+TYPES_DEPS = [
+  "@npm//@types/jest",
+  "@npm//@types/node",
+]
+
+DEPS = SRC_DEPS + TYPES_DEPS
+
+ts_config(
+  name = "tsconfig",
+  src = "tsconfig.json",
+  deps = [
+    "//:tsconfig.base.json",
+  ],
+)
+
+ts_project(
+  name = "tsc",
+  args = ['--pretty'],
+  srcs = SRCS,
+  deps = DEPS,
+  declaration = True,
+  declaration_map = True,
+  incremental = True,
+  out_dir = "target",
+  source_map = True,
+  root_dir = "src",
+  tsconfig = ":tsconfig",
+)
+
+js_library(
+  name = PKG_BASE_NAME,
+  srcs = NPM_MODULE_EXTRA_FILES,
+  deps = DEPS + [":tsc"],
+  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-rule-data-utils/tsconfig.json b/packages/kbn-rule-data-utils/tsconfig.json
index 4b1262d11f3af..852393f01e594 100644
--- a/packages/kbn-rule-data-utils/tsconfig.json
+++ b/packages/kbn-rule-data-utils/tsconfig.json
@@ -1,11 +1,12 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    "incremental": false,
+    "incremental": true,
     "outDir": "./target",
     "stripInternal": false,
     "declaration": true,
     "declarationMap": true,
+    "rootDir": "./src",
     "sourceMap": true,
     "sourceRoot": "../../../../packages/kbn-rule-data-utils/src",
     "types": [
diff --git a/packages/kbn-securitysolution-io-ts-list-types/BUILD.bazel b/packages/kbn-securitysolution-io-ts-list-types/BUILD.bazel
index 91e4667c16b4e..99df07c3d8ea8 100644
--- a/packages/kbn-securitysolution-io-ts-list-types/BUILD.bazel
+++ b/packages/kbn-securitysolution-io-ts-list-types/BUILD.bazel
@@ -27,9 +27,10 @@ NPM_MODULE_EXTRA_FILES = [
 ]
 
 SRC_DEPS = [
+  "//packages/elastic-datemath",
   "//packages/kbn-securitysolution-io-ts-types",
   "//packages/kbn-securitysolution-io-ts-utils",
-  "//packages/elastic-datemath",
+  "//packages/kbn-securitysolution-list-constants",
   "@npm//fp-ts",
   "@npm//io-ts",
   "@npm//lodash",
diff --git a/packages/kbn-telemetry-tools/BUILD.bazel b/packages/kbn-telemetry-tools/BUILD.bazel
index 9a6b4a10bd190..d394b0c93d45f 100644
--- a/packages/kbn-telemetry-tools/BUILD.bazel
+++ b/packages/kbn-telemetry-tools/BUILD.bazel
@@ -47,6 +47,7 @@ TYPES_DEPS = [
   "@npm//@types/node",
   "@npm//@types/normalize-path",
   "@npm//@types/testing-library__jest-dom",
+  "@npm//resize-observer-polyfill"
 ]
 
 DEPS = SRC_DEPS + TYPES_DEPS
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 b5d379d3426e7..0a2dba60742ad 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
@@ -5,6 +5,7 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import { relative } from 'path';
 
 import { ToolingLog } from '@kbn/dev-utils';
 
@@ -120,6 +121,9 @@ export class FunctionalTestRunner {
         throw new Error('No tests defined.');
       }
 
+      // eslint-disable-next-line
+      console.log(`--- Running ${relative(process.cwd(), this.configFile)}`);
+
       const dockerServers = new DockerServersService(
         config.get('dockerServers'),
         this.log,
diff --git a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
index e5d0fdc122a1a..6a8f384208fd8 100644
--- a/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
+++ b/packages/kbn-test/src/functional_test_runner/lib/config/schema.ts
@@ -209,13 +209,6 @@ export const schema = Joi.object()
     // definition of apps that work with `common.navigateToApp()`
     apps: Joi.object().pattern(ID_PATTERN, appUrlPartsSchema()).default(),
 
-    // settings for the esArchiver module
-    esArchiver: Joi.object()
-      .keys({
-        directory: Joi.string().default(defaultRelativeToConfigPath('fixtures/es_archiver')),
-      })
-      .default(),
-
     // settings for the saved objects svc
     kbnArchiver: Joi.object()
       .keys({
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 4a30744c09b51..d94f61e23b8b8 100644
--- a/packages/kbn-test/src/functional_test_runner/public_types.ts
+++ b/packages/kbn-test/src/functional_test_runner/public_types.ts
@@ -74,6 +74,12 @@ export interface GenericFtrProviderContext<
   getService(serviceName: 'failureMetadata'): FailureMetadata;
   getService<T extends keyof ServiceMap>(serviceName: T): ServiceMap[T];
 
+  /**
+   * Get the instance of a page object
+   * @param pageObjectName
+   */
+  getPageObject<K extends keyof PageObjectMap>(pageObjectName: K): PageObjectMap[K];
+
   /**
    * Get a map of PageObjects
    * @param pageObjects
diff --git a/packages/kbn-test/src/functional_tests/tasks.js b/packages/kbn-test/src/functional_tests/tasks.js
index 02c55b6af91dc..122a5a23842d6 100644
--- a/packages/kbn-test/src/functional_tests/tasks.js
+++ b/packages/kbn-test/src/functional_tests/tasks.js
@@ -88,6 +88,8 @@ export async function runTests(options) {
       continue;
     }
 
+    console.log(`--- Running ${relative(process.cwd(), configPath)}`);
+
     await withProcRunner(log, async (procs) => {
       const config = await readConfigFile(log, configPath);
 
diff --git a/packages/kbn-test/src/jest/utils/testbed/types.ts b/packages/kbn-test/src/jest/utils/testbed/types.ts
index 520a78d03d701..fdc000215c4f1 100644
--- a/packages/kbn-test/src/jest/utils/testbed/types.ts
+++ b/packages/kbn-test/src/jest/utils/testbed/types.ts
@@ -121,7 +121,7 @@ export interface TestBed<T = string> {
      *
      * @param switchTestSubject The test subject of the EuiSwitch (can be a nested path. e.g. "myForm.mySwitch").
      */
-    toggleEuiSwitch: (switchTestSubject: T, isChecked?: boolean) => void;
+    toggleEuiSwitch: (switchTestSubject: T) => void;
     /**
      * The EUI ComboBox is a special input as it needs the ENTER key to be pressed
      * in order to register the value set. This helpers automatically does that.
diff --git a/packages/kbn-test/src/kbn_client/kbn_client.ts b/packages/kbn-test/src/kbn_client/kbn_client.ts
index 3fa74412c1a8b..ac14a399918cb 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client.ts
@@ -8,13 +8,14 @@
 
 import { ToolingLog } from '@kbn/dev-utils';
 
-import { KbnClientRequester, ReqOptions } from './kbn_client_requester';
-import { KbnClientStatus } from './kbn_client_status';
+import { KbnClientImportExport } from './kbn_client_import_export';
 import { KbnClientPlugins } from './kbn_client_plugins';
-import { KbnClientVersion } from './kbn_client_version';
+import { KbnClientRequester, ReqOptions } from './kbn_client_requester';
 import { KbnClientSavedObjects } from './kbn_client_saved_objects';
+import { KbnClientSpaces } from './kbn_client_spaces';
+import { KbnClientStatus } from './kbn_client_status';
 import { KbnClientUiSettings, UiSettingValues } from './kbn_client_ui_settings';
-import { KbnClientImportExport } from './kbn_client_import_export';
+import { KbnClientVersion } from './kbn_client_version';
 
 export interface KbnClientOptions {
   url: string;
@@ -29,6 +30,7 @@ export class KbnClient {
   readonly plugins: KbnClientPlugins;
   readonly version: KbnClientVersion;
   readonly savedObjects: KbnClientSavedObjects;
+  readonly spaces: KbnClientSpaces;
   readonly uiSettings: KbnClientUiSettings;
   readonly importExport: KbnClientImportExport;
 
@@ -59,6 +61,7 @@ export class KbnClient {
     this.plugins = new KbnClientPlugins(this.status);
     this.version = new KbnClientVersion(this.status);
     this.savedObjects = new KbnClientSavedObjects(this.log, this.requester);
+    this.spaces = new KbnClientSpaces(this.requester);
     this.uiSettings = new KbnClientUiSettings(this.log, this.requester, this.uiSettingDefaults);
     this.importExport = new KbnClientImportExport(
       this.log,
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 af75137d148e9..a194b593b3863 100644
--- a/packages/kbn-test/src/kbn_client/kbn_client_requester.ts
+++ b/packages/kbn-test/src/kbn_client/kbn_client_requester.ts
@@ -121,6 +121,8 @@ export class KbnClientRequester {
           responseType: options.responseType,
           // work around https://github.com/axios/axios/issues/2791
           transformResponse: options.responseType === 'text' ? [(x) => x] : undefined,
+          maxContentLength: 30000000,
+          maxBodyLength: 30000000,
           paramsSerializer: (params) => Qs.stringify(params),
         });
 
diff --git a/packages/kbn-test/src/kbn_client/kbn_client_spaces.ts b/packages/kbn-test/src/kbn_client/kbn_client_spaces.ts
new file mode 100644
index 0000000000000..e88531606e917
--- /dev/null
+++ b/packages/kbn-test/src/kbn_client/kbn_client_spaces.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 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 { KbnClientRequester, uriencode } from './kbn_client_requester';
+
+interface UpdateBody {
+  name: string;
+  description?: string;
+  disabledFeatures?: string | string[];
+  initials?: string;
+  color?: string;
+  imageUrl?: string;
+}
+
+interface CreateBody extends UpdateBody {
+  id: string;
+}
+
+export class KbnClientSpaces {
+  constructor(private readonly requester: KbnClientRequester) {}
+
+  async create(body: CreateBody) {
+    await this.requester.request({
+      method: 'POST',
+      path: '/api/spaces/space',
+      body,
+    });
+  }
+
+  async update(id: string, body: UpdateBody) {
+    await this.requester.request({
+      method: 'PUT',
+      path: uriencode`/api/spaces/space/${id}`,
+      body,
+    });
+  }
+
+  async get(id: string) {
+    const { data } = await this.requester.request({
+      method: 'GET',
+      path: uriencode`/api/spaces/space/${id}`,
+    });
+
+    return data;
+  }
+
+  async list() {
+    const { data } = await this.requester.request({
+      method: 'GET',
+      path: '/api/spaces/space',
+    });
+
+    return data;
+  }
+
+  async delete(id: string) {
+    await this.requester.request({
+      method: 'DELETE',
+      path: uriencode`/api/spaces/space/${id}`,
+    });
+  }
+}
diff --git a/packages/kbn-test/src/report_path.ts b/packages/kbn-test/src/report_path.ts
index 9f41fdd41c061..dcda0f5eb2d3c 100644
--- a/packages/kbn-test/src/report_path.ts
+++ b/packages/kbn-test/src/report_path.ts
@@ -16,11 +16,17 @@ export function getUniqueJunitReportPath(
   reportName: string,
   counter?: number
 ): string {
+  const BUILDKITE_ID_SUFFIX = process.env.BUILDKITE_JOB_ID
+    ? `-${process.env.BUILDKITE_JOB_ID}`
+    : '';
+
   const path = Path.resolve(
     rootDirectory,
     'target/junit',
     process.env.JOB || '.',
-    `TEST-${CI_PARALLEL_PROCESS_PREFIX}${reportName}${counter ? `-${counter}` : ''}.xml`
+    `TEST-${CI_PARALLEL_PROCESS_PREFIX}${reportName}${
+      counter ? `-${counter}` : ''
+    }${BUILDKITE_ID_SUFFIX}.xml`
   );
 
   return Fs.existsSync(path)
diff --git a/packages/kbn-ui-shared-deps/entry.js b/packages/kbn-ui-shared-deps/entry.js
index 4029ce28faf5b..b8d21a473c65f 100644
--- a/packages/kbn-ui-shared-deps/entry.js
+++ b/packages/kbn-ui-shared-deps/entry.js
@@ -44,6 +44,9 @@ export const Theme = require('./theme.ts');
 export const Lodash = require('lodash');
 export const LodashFp = require('lodash/fp');
 
+import { unzlibSync, strFromU8 } from 'fflate';
+export const Fflate = { unzlibSync, strFromU8 };
+
 // runtime deps which don't need to be copied across all bundles
 export const TsLib = require('tslib');
 export const KbnAnalytics = require('@kbn/analytics');
diff --git a/packages/kbn-ui-shared-deps/index.js b/packages/kbn-ui-shared-deps/index.js
index 62ddb09d25add..877bf3df6c039 100644
--- a/packages/kbn-ui-shared-deps/index.js
+++ b/packages/kbn-ui-shared-deps/index.js
@@ -52,6 +52,7 @@ exports.externals = {
   '@elastic/eui/dist/eui_theme_dark.json': '__kbnSharedDeps__.Theme.euiDarkVars',
   lodash: '__kbnSharedDeps__.Lodash',
   'lodash/fp': '__kbnSharedDeps__.LodashFp',
+  fflate: '__kbnSharedDeps__.Fflate',
 
   /**
    * runtime deps which don't need to be copied across all bundles
diff --git a/src/core/TESTING.md b/src/core/TESTING.md
index ef6db57c1a993..10ead1ea8cfe2 100644
--- a/src/core/TESTING.md
+++ b/src/core/TESTING.md
@@ -792,8 +792,8 @@ To do that we'll write a Jest integration test using `TestUtils` to start
 Kibana and esArchiver to load fixture data into Elasticsearch.
 
 1. Create the fixtures data you need in Elasticsearch
-2. Create a fixtures archive with `node scripts/es_archiver save <name> [index patterns...]`
-3. Load the fixtures in your test using esArchiver `esArchiver.load('name')`;
+2. Create a fixtures archive with `node scripts/es_archiver save <path> [index patterns...]`
+3. Load the fixtures in your test using esArchiver `esArchiver.load('path from root of repo')`;
 
 _todo: fully worked out example_
 
diff --git a/src/core/public/application/application_service.test.ts b/src/core/public/application/application_service.test.ts
index 2e2f1cad49f19..5658d3f626077 100644
--- a/src/core/public/application/application_service.test.ts
+++ b/src/core/public/application/application_service.test.ts
@@ -107,6 +107,7 @@ describe('#setup()', () => {
         status: AppStatus.inaccessible,
         tooltip: 'App inaccessible due to reason',
         defaultPath: 'foo/bar',
+        deepLinks: [{ id: 'subapp2', title: 'Subapp 2', path: '/subapp2' }],
       }));
 
       applications = await applications$.pipe(take(1)).toPromise();
@@ -118,6 +119,9 @@ describe('#setup()', () => {
           status: AppStatus.inaccessible,
           defaultPath: 'foo/bar',
           tooltip: 'App inaccessible due to reason',
+          deepLinks: [
+            expect.objectContaining({ id: 'subapp2', title: 'Subapp 2', path: '/subapp2' }),
+          ],
         })
       );
       expect(applications.get('app2')).toEqual(
@@ -814,6 +818,128 @@ describe('#start()', () => {
         expect(MockHistory.replace).not.toHaveBeenCalled();
       });
     });
+
+    describe('deepLinkId option', () => {
+      beforeEach(() => {
+        MockHistory.push.mockClear();
+      });
+
+      it('preserves trailing slash when path contains a hash', async () => {
+        const { register } = service.setup(setupDeps);
+
+        register(
+          Symbol(),
+          createApp({
+            id: 'app1',
+            appRoute: '/custom/app-path',
+            deepLinks: [{ id: 'dl1', title: 'deep link 1', path: '/deep-link' }],
+          })
+        );
+
+        const { navigateToApp } = await service.start(startDeps);
+        await navigateToApp('app1', { deepLinkId: 'dl1', path: '#/' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/custom/app-path/deep-link#/',
+          undefined
+        );
+
+        await navigateToApp('app1', { deepLinkId: 'dl1', path: '#/foo/bar/' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/custom/app-path/deep-link#/foo/bar/',
+          undefined
+        );
+
+        await navigateToApp('app1', { deepLinkId: 'dl1', path: '/path#/' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/custom/app-path/deep-link/path#/',
+          undefined
+        );
+
+        await navigateToApp('app1', { deepLinkId: 'dl1', path: '/path#/hash/' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/custom/app-path/deep-link/path#/hash/',
+          undefined
+        );
+
+        await navigateToApp('app1', { deepLinkId: 'dl1', path: '/path/' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/custom/app-path/deep-link/path',
+          undefined
+        );
+      });
+
+      it('omits the defaultPath when the deepLinkId parameter is specified', async () => {
+        const { register } = service.setup(setupDeps);
+
+        register(
+          Symbol(),
+          createApp({
+            id: 'app1',
+            defaultPath: 'default/path',
+            deepLinks: [{ id: 'dl1', title: 'deep link 1', path: '/deep-link' }],
+          })
+        );
+        register(
+          Symbol(),
+          createApp({
+            id: 'app2',
+            appRoute: '/custom-app-path',
+            defaultPath: '/my-default',
+            deepLinks: [{ id: 'dl2', title: 'deep link 2', path: '/deep-link-2' }],
+          })
+        );
+
+        const { navigateToApp } = await service.start(startDeps);
+
+        await navigateToApp('app1', {});
+        expect(MockHistory.push).toHaveBeenLastCalledWith('/app/app1/default/path', undefined);
+
+        await navigateToApp('app1', { deepLinkId: 'dl1' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith('/app/app1/deep-link', undefined);
+
+        await navigateToApp('app1', { deepLinkId: 'dl1', path: 'some-other-path' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/app/app1/deep-link/some-other-path',
+          undefined
+        );
+
+        await navigateToApp('app2', {});
+        expect(MockHistory.push).toHaveBeenLastCalledWith('/custom-app-path/my-default', undefined);
+
+        await navigateToApp('app2', { deepLinkId: 'dl2' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/custom-app-path/deep-link-2',
+          undefined
+        );
+
+        await navigateToApp('app2', { deepLinkId: 'dl2', path: 'some-other-path' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith(
+          '/custom-app-path/deep-link-2/some-other-path',
+          undefined
+        );
+      });
+
+      it('ignores the deepLinkId parameter if it is unknown', async () => {
+        const { register } = service.setup(setupDeps);
+
+        register(
+          Symbol(),
+          createApp({
+            id: 'app1',
+            defaultPath: 'default/path',
+            deepLinks: [{ id: 'dl1', title: 'deep link 1', path: '/deep-link' }],
+          })
+        );
+
+        const { navigateToApp } = await service.start(startDeps);
+
+        await navigateToApp('app1', { deepLinkId: 'dl-unknown' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith('/app/app1/default/path', undefined);
+
+        await navigateToApp('app1', { deepLinkId: 'dl-unknown', path: 'some-other-path' });
+        expect(MockHistory.push).toHaveBeenLastCalledWith('/app/app1/some-other-path', undefined);
+      });
+    });
   });
 
   describe('navigateToUrl', () => {
diff --git a/src/core/public/application/application_service.tsx b/src/core/public/application/application_service.tsx
index bbfea61220b51..32d45b32c32ff 100644
--- a/src/core/public/application/application_service.tsx
+++ b/src/core/public/application/application_service.tsx
@@ -64,6 +64,10 @@ const getAppUrl = (mounters: Map<string, Mounter>, appId: string, path: string =
   return appendAppPath(appBasePath, path);
 };
 
+const getAppDeepLinkPath = (mounters: Map<string, Mounter>, appId: string, deepLinkId: string) => {
+  return mounters.get(appId)?.deepLinkPaths[deepLinkId];
+};
+
 const allApplicationsFilter = '__ALL__';
 
 interface AppUpdaterWrapper {
@@ -175,6 +179,7 @@ export class ApplicationService {
         this.mounters.set(app.id, {
           appRoute: app.appRoute!,
           appBasePath: basePath.prepend(app.appRoute!),
+          deepLinkPaths: toDeepLinkPaths(app.deepLinks),
           exactRoute: app.exactRoute ?? false,
           mount: wrapMount(plugin, app),
           unmountBeforeMounting: false,
@@ -226,7 +231,7 @@ export class ApplicationService {
 
     const navigateToApp: InternalApplicationStart['navigateToApp'] = async (
       appId,
-      { path, state, replace = false, openInNewTab = false }: NavigateToAppOptions = {}
+      { deepLinkId, path, state, replace = false, openInNewTab = false }: NavigateToAppOptions = {}
     ) => {
       const currentAppId = this.currentAppId$.value;
       const navigatingToSameApp = currentAppId === appId;
@@ -235,6 +240,12 @@ export class ApplicationService {
         : await this.shouldNavigate(overlays, appId);
 
       if (shouldNavigate) {
+        if (deepLinkId) {
+          const deepLinkPath = getAppDeepLinkPath(availableMounters, appId, deepLinkId);
+          if (deepLinkPath) {
+            path = appendAppPath(deepLinkPath, path);
+          }
+        }
         if (path === undefined) {
           path = applications$.value.get(appId)?.defaultPath;
         }
@@ -384,8 +395,18 @@ const updateStatus = (app: App, statusUpdaters: AppUpdaterWrapper[]): App => {
         ...fields,
         // status and navLinkStatus enums are ordered by reversed priority
         // if multiple updaters wants to change these fields, we will always follow the priority order.
-        status: Math.max(changes.status ?? 0, fields.status ?? 0),
-        navLinkStatus: Math.max(changes.navLinkStatus ?? 0, fields.navLinkStatus ?? 0),
+        status: Math.max(
+          changes.status ?? AppStatus.accessible,
+          fields.status ?? AppStatus.accessible
+        ),
+        navLinkStatus: Math.max(
+          changes.navLinkStatus ?? AppNavLinkStatus.default,
+          fields.navLinkStatus ?? AppNavLinkStatus.default
+        ),
+        // deepLinks take the last defined update
+        deepLinks: fields.deepLinks
+          ? populateDeepLinkDefaults(fields.deepLinks)
+          : changes.deepLinks,
       };
     }
   });
@@ -396,10 +417,22 @@ const updateStatus = (app: App, statusUpdaters: AppUpdaterWrapper[]): App => {
 };
 
 const populateDeepLinkDefaults = (deepLinks?: AppDeepLink[]): AppDeepLink[] => {
-  if (!deepLinks) return [];
+  if (!deepLinks) {
+    return [];
+  }
   return deepLinks.map((deepLink) => ({
     ...deepLink,
     navLinkStatus: deepLink.navLinkStatus ?? AppNavLinkStatus.default,
     deepLinks: populateDeepLinkDefaults(deepLink.deepLinks),
   }));
 };
+
+const toDeepLinkPaths = (deepLinks?: AppDeepLink[]): Mounter['deepLinkPaths'] => {
+  if (!deepLinks) {
+    return {};
+  }
+  return deepLinks.reduce((deepLinkPaths: Mounter['deepLinkPaths'], deepLink) => {
+    if (deepLink.path) deepLinkPaths[deepLink.id] = deepLink.path;
+    return { ...deepLinkPaths, ...toDeepLinkPaths(deepLink.deepLinks) };
+  }, {});
+};
diff --git a/src/core/public/application/index.ts b/src/core/public/application/index.ts
index 68e1991646afb..882555fcd60e0 100644
--- a/src/core/public/application/index.ts
+++ b/src/core/public/application/index.ts
@@ -17,6 +17,7 @@ export type {
   AppUnmount,
   AppMountParameters,
   AppUpdatableFields,
+  AppNavOptions,
   AppUpdater,
   AppDeepLink,
   ApplicationSetup,
diff --git a/src/core/public/application/integration_tests/utils.tsx b/src/core/public/application/integration_tests/utils.tsx
index 40f8f3b795719..dcf071719c11a 100644
--- a/src/core/public/application/integration_tests/utils.tsx
+++ b/src/core/public/application/integration_tests/utils.tsx
@@ -35,12 +35,14 @@ export const createAppMounter = ({
   appId,
   html = `<div>App ${appId}</div>`,
   appRoute = `/app/${appId}`,
+  deepLinkPaths = {},
   exactRoute = false,
   extraMountHook,
 }: {
   appId: string;
   html?: string;
   appRoute?: string;
+  deepLinkPaths?: Record<string, string>;
   exactRoute?: boolean;
   extraMountHook?: (params: AppMountParameters) => void;
 }): MockedMounterTuple => {
@@ -51,6 +53,7 @@ export const createAppMounter = ({
       mounter: {
         appRoute,
         appBasePath: appRoute,
+        deepLinkPaths,
         exactRoute,
         mount: jest.fn(async (params: AppMountParameters) => {
           const { appBasePath: basename, element } = params;
diff --git a/src/core/public/application/types.ts b/src/core/public/application/types.ts
index ffc41955360bd..60b0dbf158dd9 100644
--- a/src/core/public/application/types.ts
+++ b/src/core/public/application/types.ts
@@ -63,9 +63,37 @@ export enum AppNavLinkStatus {
  */
 export type AppUpdatableFields = Pick<
   App,
-  'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath' | 'deepLinks'
+  'status' | 'navLinkStatus' | 'searchable' | 'tooltip' | 'defaultPath' | 'deepLinks'
 >;
 
+/**
+ * App navigation menu options
+ * @public
+ */
+export interface AppNavOptions {
+  /**
+   * An ordinal used to sort nav links relative to one another for display.
+   */
+  order?: number;
+
+  /**
+   * A tooltip shown when hovering over app link.
+   */
+  tooltip?: string;
+
+  /**
+   * A EUI iconType that will be used for the app's icon. This icon
+   * takes precendence over the `icon` property.
+   */
+  euiIconType?: string;
+
+  /**
+   * A URL to an image file used as an icon. Used as a fallback
+   * if `euiIconType` is not provided.
+   */
+  icon?: string;
+}
+
 /**
  * Updater for applications.
  * see {@link ApplicationSetup}
@@ -76,7 +104,7 @@ export type AppUpdater = (app: App) => Partial<AppUpdatableFields> | undefined;
 /**
  * @public
  */
-export interface App<HistoryLocationState = unknown> {
+export interface App<HistoryLocationState = unknown> extends AppNavOptions {
   /**
    * The unique identifier of the application
    */
@@ -107,6 +135,12 @@ export interface App<HistoryLocationState = unknown> {
    */
   navLinkStatus?: AppNavLinkStatus;
 
+  /**
+   * The initial flag to determine if the application is searchable in the global search.
+   * Defaulting to `true` if `navLinkStatus` is `visible` or omitted.
+   */
+  searchable?: boolean;
+
   /**
    * Allow to define the default path a user should be directed to when navigating to the app.
    * When defined, this value will be used as a default for the `path` option when calling {@link ApplicationStart.navigateToApp | navigateToApp}`,
@@ -148,28 +182,6 @@ export interface App<HistoryLocationState = unknown> {
    */
   updater$?: Observable<AppUpdater>;
 
-  /**
-   * An ordinal used to sort nav links relative to one another for display.
-   */
-  order?: number;
-
-  /**
-   * A tooltip shown when hovering over app link.
-   */
-  tooltip?: string;
-
-  /**
-   * A EUI iconType that will be used for the app's icon. This icon
-   * takes precendence over the `icon` property.
-   */
-  euiIconType?: string;
-
-  /**
-   * A URL to an image file used as an icon. Used as a fallback
-   * if `euiIconType` is not provided.
-   */
-  icon?: string;
-
   /**
    * Custom capabilities defined by the app.
    */
@@ -261,11 +273,12 @@ export interface App<HistoryLocationState = unknown> {
  */
 export type PublicAppDeepLinkInfo = Omit<
   AppDeepLink,
-  'deepLinks' | 'keywords' | 'navLinkStatus'
+  'deepLinks' | 'keywords' | 'navLinkStatus' | 'searchable'
 > & {
   deepLinks: PublicAppDeepLinkInfo[];
   keywords: string[];
   navLinkStatus: AppNavLinkStatus;
+  searchable: boolean;
 };
 
 /**
@@ -285,33 +298,40 @@ export type AppDeepLink = {
   keywords?: string[];
   /** Optional status of the chrome navigation, defaults to `hidden` */
   navLinkStatus?: AppNavLinkStatus;
-} & (
-  | {
-      /** URL path to access this link, relative to the application's appRoute. */
-      path: string;
-      /** Optional array of links that are 'underneath' this section in the hierarchy */
-      deepLinks?: AppDeepLink[];
-    }
-  | {
-      /** Optional path to access this section. Omit if this part of the hierarchy does not have a page URL. */
-      path?: string;
-      /** Array links that are 'underneath' this section in this hierarchy. */
-      deepLinks: AppDeepLink[];
-    }
-);
+  /** Optional flag to determine if the link is searchable in the global search. Defaulting to `true` if `navLinkStatus` is `visible` or omitted */
+  searchable?: boolean;
+} & AppNavOptions &
+  (
+    | {
+        /** URL path to access this link, relative to the application's appRoute. */
+        path: string;
+        /** Optional array of links that are 'underneath' this section in the hierarchy */
+        deepLinks?: AppDeepLink[];
+      }
+    | {
+        /** Optional path to access this section. Omit if this part of the hierarchy does not have a page URL. */
+        path?: string;
+        /** Array links that are 'underneath' this section in this hierarchy. */
+        deepLinks: AppDeepLink[];
+      }
+  );
 
 /**
  * Public information about a registered {@link App | application}
  *
  * @public
  */
-export type PublicAppInfo = Omit<App, 'mount' | 'updater$' | 'keywords' | 'deepLinks'> & {
+export type PublicAppInfo = Omit<
+  App,
+  'mount' | 'updater$' | 'keywords' | 'deepLinks' | 'searchable'
+> & {
   // remove optional on fields populated with default values
   status: AppStatus;
   navLinkStatus: AppNavLinkStatus;
   appRoute: string;
   keywords: string[];
   deepLinks: PublicAppDeepLinkInfo[];
+  searchable: boolean;
 };
 
 /**
@@ -592,6 +612,7 @@ export interface AppLeaveActionFactory {
 export interface Mounter {
   appRoute: string;
   appBasePath: string;
+  deepLinkPaths: Record<string, string>;
   mount: AppMount;
   exactRoute: boolean;
   unmountBeforeMounting?: boolean;
@@ -657,11 +678,17 @@ export interface InternalApplicationSetup extends Pick<ApplicationSetup, 'regist
 
 /**
  * Options for the {@link ApplicationStart.navigateToApp | navigateToApp API}
+ * @public
  */
 export interface NavigateToAppOptions {
+  /**
+   * optional {@link App.deepLinks | deep link} id inside the application to navigate to.
+   * If an additional {@link NavigateToAppOptions.path | path} is defined it will be appended to the deep link path.
+   */
+  deepLinkId?: string;
   /**
    * optional path inside application to deep link to.
-   * If undefined, will use {@link App.defaultPath | the app's default path}` as default.
+   * If undefined, will use {@link App.defaultPath | the app's default path} as default.
    */
   path?: string;
   /**
diff --git a/src/core/public/application/ui/app_container.test.tsx b/src/core/public/application/ui/app_container.test.tsx
index e085cfd15d9b4..86cb9198e0699 100644
--- a/src/core/public/application/ui/app_container.test.tsx
+++ b/src/core/public/application/ui/app_container.test.tsx
@@ -45,6 +45,7 @@ describe('AppContainer', () => {
     appRoute: '/some-route',
     unmountBeforeMounting: false,
     exactRoute: false,
+    deepLinkPaths: {},
     mount: async ({ element }: AppMountParameters) => {
       await promise;
       const container = document.createElement('div');
@@ -133,6 +134,7 @@ describe('AppContainer', () => {
     const mounter = {
       appBasePath: '/base-path/some-route',
       appRoute: '/some-route',
+      deepLinkPaths: {},
       unmountBeforeMounting: false,
       exactRoute: false,
       mount: async ({ element }: AppMountParameters) => {
diff --git a/src/core/public/application/utils/get_app_info.test.ts b/src/core/public/application/utils/get_app_info.test.ts
index ef4a06707d666..fa1e2dd9a4537 100644
--- a/src/core/public/application/utils/get_app_info.test.ts
+++ b/src/core/public/application/utils/get_app_info.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { of } from 'rxjs';
-import { App, AppNavLinkStatus, AppStatus } from '../types';
+import { App, AppDeepLink, AppNavLinkStatus, AppStatus } from '../types';
 import { getAppInfo } from './get_app_info';
 
 describe('getAppInfo', () => {
@@ -18,10 +18,22 @@ describe('getAppInfo', () => {
     title: 'some-title',
     status: AppStatus.accessible,
     navLinkStatus: AppNavLinkStatus.default,
+    searchable: true,
     appRoute: `/app/some-id`,
     ...props,
   });
 
+  const createDeepLink = (props: Partial<AppDeepLink> = {}): AppDeepLink => ({
+    id: 'some-deep-link-id',
+    title: 'my deep link',
+    path: '/my-deep-link',
+    navLinkStatus: AppNavLinkStatus.default,
+    searchable: true,
+    deepLinks: [],
+    keywords: [],
+    ...props,
+  });
+
   it('converts an application and remove sensitive properties', () => {
     const app = createApp();
     const info = getAppInfo(app);
@@ -31,6 +43,7 @@ describe('getAppInfo', () => {
       title: 'some-title',
       status: AppStatus.accessible,
       navLinkStatus: AppNavLinkStatus.visible,
+      searchable: true,
       appRoute: `/app/some-id`,
       keywords: [],
       deepLinks: [],
@@ -54,12 +67,15 @@ describe('getAppInfo', () => {
       title: 'some-title',
       status: AppStatus.accessible,
       navLinkStatus: AppNavLinkStatus.visible,
+      searchable: true,
       appRoute: `/app/some-id`,
       keywords: [],
       deepLinks: [
         {
           id: 'sub-id',
           title: 'sub-title',
+          navLinkStatus: AppNavLinkStatus.hidden,
+          searchable: true,
           keywords: [],
           deepLinks: [
             {
@@ -67,6 +83,8 @@ describe('getAppInfo', () => {
               title: 'sub-sub-title',
               path: '/sub-sub',
               keywords: [],
+              navLinkStatus: AppNavLinkStatus.hidden,
+              searchable: true,
               deepLinks: [], // default empty array added
             },
           ],
@@ -102,7 +120,70 @@ describe('getAppInfo', () => {
     );
   });
 
-  it('adds default meta fields to sublinks when needed', () => {
+  it('computes the searchable flag depending on the navLinkStatus when needed', () => {
+    expect(
+      getAppInfo(
+        createApp({
+          navLinkStatus: AppNavLinkStatus.default,
+          searchable: undefined,
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        searchable: true,
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          navLinkStatus: AppNavLinkStatus.visible,
+          searchable: undefined,
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        searchable: true,
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          navLinkStatus: AppNavLinkStatus.disabled,
+          searchable: undefined,
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        searchable: false,
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          navLinkStatus: AppNavLinkStatus.hidden,
+          searchable: undefined,
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        searchable: false,
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          navLinkStatus: AppNavLinkStatus.hidden,
+          searchable: true,
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        searchable: true,
+      })
+    );
+  });
+
+  it('adds default deepLinks when needed', () => {
     const app = createApp({
       deepLinks: [
         {
@@ -126,17 +207,22 @@ describe('getAppInfo', () => {
       title: 'some-title',
       status: AppStatus.accessible,
       navLinkStatus: AppNavLinkStatus.visible,
+      searchable: true,
       appRoute: `/app/some-id`,
       keywords: [],
       deepLinks: [
         {
           id: 'sub-id',
           title: 'sub-title',
-          keywords: [], // default empty array
+          navLinkStatus: AppNavLinkStatus.hidden,
+          searchable: true,
+          keywords: [],
           deepLinks: [
             {
               id: 'sub-sub-id',
               title: 'sub-sub-title',
+              navLinkStatus: AppNavLinkStatus.hidden,
+              searchable: true,
               path: '/sub-sub',
               keywords: ['sub sub'],
               deepLinks: [],
@@ -146,4 +232,127 @@ describe('getAppInfo', () => {
       ],
     });
   });
+
+  it('computes the deepLinks navLinkStatus when needed', () => {
+    expect(
+      getAppInfo(
+        createApp({
+          deepLinks: [
+            createDeepLink({
+              navLinkStatus: AppNavLinkStatus.visible,
+            }),
+          ],
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        deepLinks: [
+          expect.objectContaining({
+            navLinkStatus: AppNavLinkStatus.visible,
+          }),
+        ],
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          deepLinks: [
+            createDeepLink({
+              navLinkStatus: AppNavLinkStatus.default,
+            }),
+          ],
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        deepLinks: [
+          expect.objectContaining({
+            navLinkStatus: AppNavLinkStatus.hidden,
+          }),
+        ],
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          deepLinks: [
+            createDeepLink({
+              navLinkStatus: undefined,
+            }),
+          ],
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        deepLinks: [
+          expect.objectContaining({
+            navLinkStatus: AppNavLinkStatus.hidden,
+          }),
+        ],
+      })
+    );
+  });
+
+  it('computes the deepLinks searchable depending on the navLinkStatus when needed', () => {
+    expect(
+      getAppInfo(
+        createApp({
+          deepLinks: [
+            createDeepLink({
+              navLinkStatus: AppNavLinkStatus.default,
+              searchable: undefined,
+            }),
+          ],
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        deepLinks: [
+          expect.objectContaining({
+            searchable: true,
+          }),
+        ],
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          deepLinks: [
+            createDeepLink({
+              navLinkStatus: AppNavLinkStatus.hidden,
+              searchable: undefined,
+            }),
+          ],
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        deepLinks: [
+          expect.objectContaining({
+            searchable: false,
+          }),
+        ],
+      })
+    );
+    expect(
+      getAppInfo(
+        createApp({
+          deepLinks: [
+            createDeepLink({
+              navLinkStatus: AppNavLinkStatus.hidden,
+              searchable: true,
+            }),
+          ],
+        })
+      )
+    ).toEqual(
+      expect.objectContaining({
+        deepLinks: [
+          expect.objectContaining({
+            searchable: true,
+          }),
+        ],
+      })
+    );
+  });
 });
diff --git a/src/core/public/application/utils/get_app_info.ts b/src/core/public/application/utils/get_app_info.ts
index 4c94e24f501bc..6c753b7a71a0f 100644
--- a/src/core/public/application/utils/get_app_info.ts
+++ b/src/core/public/application/utils/get_app_info.ts
@@ -16,17 +16,19 @@ import {
 } from '../types';
 
 export function getAppInfo(app: App): PublicAppInfo {
-  const navLinkStatus =
-    app.navLinkStatus === AppNavLinkStatus.default
-      ? app.status === AppStatus.inaccessible
-        ? AppNavLinkStatus.hidden
-        : AppNavLinkStatus.visible
-      : app.navLinkStatus!;
-  const { updater$, mount, ...infos } = app;
+  const { updater$, mount, navLinkStatus = AppNavLinkStatus.default, ...infos } = app;
   return {
     ...infos,
     status: app.status!,
-    navLinkStatus,
+    navLinkStatus:
+      navLinkStatus === AppNavLinkStatus.default
+        ? app.status === AppStatus.inaccessible
+          ? AppNavLinkStatus.hidden
+          : AppNavLinkStatus.visible
+        : navLinkStatus,
+    searchable:
+      app.searchable ??
+      (navLinkStatus === AppNavLinkStatus.default || navLinkStatus === AppNavLinkStatus.visible),
     appRoute: app.appRoute!,
     keywords: app.keywords ?? [],
     deepLinks: getDeepLinkInfos(app.deepLinks),
@@ -37,17 +39,18 @@ function getDeepLinkInfos(deepLinks?: AppDeepLink[]): PublicAppDeepLinkInfo[] {
   if (!deepLinks) return [];
 
   return deepLinks.map(
-    (rawDeepLink): PublicAppDeepLinkInfo => {
-      const navLinkStatus =
-        rawDeepLink.navLinkStatus === AppNavLinkStatus.default
-          ? AppNavLinkStatus.hidden
-          : rawDeepLink.navLinkStatus!;
+    ({ navLinkStatus = AppNavLinkStatus.default, ...rawDeepLink }): PublicAppDeepLinkInfo => {
       return {
         id: rawDeepLink.id,
         title: rawDeepLink.title,
         path: rawDeepLink.path,
         keywords: rawDeepLink.keywords ?? [],
-        navLinkStatus,
+        navLinkStatus:
+          navLinkStatus === AppNavLinkStatus.default ? AppNavLinkStatus.hidden : navLinkStatus,
+        searchable:
+          rawDeepLink.searchable ??
+          (navLinkStatus === AppNavLinkStatus.default ||
+            navLinkStatus === AppNavLinkStatus.visible),
         deepLinks: getDeepLinkInfos(rawDeepLink.deepLinks),
       };
     }
diff --git a/src/core/public/chrome/nav_links/nav_link.ts b/src/core/public/chrome/nav_links/nav_link.ts
index 87175ea465b7f..4e9158cac5cd4 100644
--- a/src/core/public/chrome/nav_links/nav_link.ts
+++ b/src/core/public/chrome/nav_links/nav_link.ts
@@ -33,10 +33,9 @@ export interface ChromeNavLink {
   readonly baseUrl: string;
 
   /**
-   * The route used to open the {@link AppBase.defaultPath | default path } of an application.
-   * If unset, `baseUrl` will be used instead.
+   * The route used to open the default path and the deep links of an application.
    */
-  readonly url?: string;
+  readonly url: string;
 
   /**
    * An ordinal used to sort nav links relative to one another for display.
diff --git a/src/core/public/chrome/nav_links/nav_links_service.test.ts b/src/core/public/chrome/nav_links/nav_links_service.test.ts
index afb902fd6bd83..e1d537da6959b 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.test.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.test.ts
@@ -20,6 +20,22 @@ const availableApps = new Map([
       order: -10,
       title: 'App 2',
       euiIconType: 'canvasApp',
+      deepLinks: [
+        {
+          id: 'deepApp1',
+          order: 50,
+          title: 'Deep App 1',
+          path: '/deepapp1',
+          deepLinks: [
+            {
+              id: 'deepApp2',
+              order: 40,
+              title: 'Deep App 2',
+              path: '/deepapp2',
+            },
+          ],
+        },
+      ],
     },
   ],
   ['chromelessApp', { id: 'chromelessApp', order: 20, title: 'Chromless App', chromeless: true }],
@@ -66,7 +82,7 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['app2', 'app1']);
+      ).toEqual(['app2', 'app1', 'app2:deepApp2', 'app2:deepApp1']);
     });
 
     it('emits multiple values', async () => {
@@ -76,7 +92,7 @@ describe('NavLinksService', () => {
       start.showOnly('app1');
 
       service.stop();
-      expect(emittedLinks).toEqual([['app2', 'app1'], ['app1']]);
+      expect(emittedLinks).toEqual([['app2', 'app1', 'app2:deepApp2', 'app2:deepApp1'], ['app1']]);
     });
 
     it('completes when service is stopped', async () => {
@@ -98,7 +114,12 @@ describe('NavLinksService', () => {
 
   describe('#getAll()', () => {
     it('returns a sorted array of navlinks', () => {
-      expect(start.getAll().map((l) => l.id)).toEqual(['app2', 'app1']);
+      expect(start.getAll().map((l) => l.id)).toEqual([
+        'app2',
+        'app1',
+        'app2:deepApp2',
+        'app2:deepApp1',
+      ]);
     });
   });
 
@@ -123,7 +144,7 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['app2', 'app1']);
+      ).toEqual(['app2', 'app1', 'app2:deepApp2', 'app2:deepApp1']);
     });
 
     it('does nothing on chromeless applications', async () => {
@@ -136,7 +157,7 @@ describe('NavLinksService', () => {
             map((links) => links.map((l) => l.id))
           )
           .toPromise()
-      ).toEqual(['app2', 'app1']);
+      ).toEqual(['app2', 'app1', 'app2:deepApp2', 'app2:deepApp1']);
     });
 
     it('removes all other links', async () => {
@@ -152,6 +173,19 @@ describe('NavLinksService', () => {
       ).toEqual(['app2']);
     });
 
+    it('show only deep link', async () => {
+      start.showOnly('app2:deepApp1');
+      expect(
+        await start
+          .getNavLinks$()
+          .pipe(
+            take(1),
+            map((links) => links.map((l) => l.id))
+          )
+          .toPromise()
+      ).toEqual(['app2:deepApp1']);
+    });
+
     it('still removes all other links when availableApps are re-emitted', async () => {
       start.showOnly('app2');
       mockAppService.applications$.next(mockAppService.applications$.value);
diff --git a/src/core/public/chrome/nav_links/nav_links_service.ts b/src/core/public/chrome/nav_links/nav_links_service.ts
index d41d8ae964d62..af961987a6309 100644
--- a/src/core/public/chrome/nav_links/nav_links_service.ts
+++ b/src/core/public/chrome/nav_links/nav_links_service.ts
@@ -10,8 +10,8 @@ import { sortBy } from 'lodash';
 import { BehaviorSubject, combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { map, takeUntil } from 'rxjs/operators';
 
-import { InternalApplicationStart } from '../../application';
-import { HttpStart } from '../../http';
+import { InternalApplicationStart, PublicAppDeepLinkInfo, PublicAppInfo } from '../../application';
+import { HttpStart, IBasePath } from '../../http';
 import { ChromeNavLink, NavLinkWrapper } from './nav_link';
 import { toNavLink } from './to_nav_link';
 
@@ -89,7 +89,13 @@ export class NavLinksService {
         return new Map(
           [...apps]
             .filter(([, app]) => !app.chromeless)
-            .map(([appId, app]) => [appId, toNavLink(app, http.basePath)])
+            .reduce((navLinks: Array<[string, NavLinkWrapper]>, [appId, app]) => {
+              navLinks.push(
+                [appId, toNavLink(app, http.basePath)],
+                ...toNavDeepLinks(app, app.deepLinks, http.basePath)
+              );
+              return navLinks;
+            }, [])
         );
       })
     );
@@ -163,3 +169,21 @@ function sortNavLinks(navLinks: ReadonlyMap<string, NavLinkWrapper>) {
     'order'
   );
 }
+
+function toNavDeepLinks(
+  app: PublicAppInfo,
+  deepLinks: PublicAppDeepLinkInfo[],
+  basePath: IBasePath
+): Array<[string, NavLinkWrapper]> {
+  if (!deepLinks) {
+    return [];
+  }
+  return deepLinks.reduce((navDeepLinks: Array<[string, NavLinkWrapper]>, deepLink) => {
+    const id = `${app.id}:${deepLink.id}`;
+    if (deepLink.path) {
+      navDeepLinks.push([id, toNavLink(app, basePath, { ...deepLink, id })]);
+    }
+    navDeepLinks.push(...toNavDeepLinks(app, deepLink.deepLinks, basePath));
+    return navDeepLinks;
+  }, []);
+}
diff --git a/src/core/public/chrome/nav_links/to_nav_link.test.ts b/src/core/public/chrome/nav_links/to_nav_link.test.ts
index db783d0028f07..9791f1bd1354b 100644
--- a/src/core/public/chrome/nav_links/to_nav_link.test.ts
+++ b/src/core/public/chrome/nav_links/to_nav_link.test.ts
@@ -6,7 +6,12 @@
  * Side Public License, v 1.
  */
 
-import { PublicAppInfo, AppNavLinkStatus, AppStatus } from '../../application';
+import {
+  PublicAppInfo,
+  AppNavLinkStatus,
+  AppStatus,
+  PublicAppDeepLinkInfo,
+} from '../../application';
 import { toNavLink } from './to_nav_link';
 
 import { httpServiceMock } from '../../mocks';
@@ -16,12 +21,24 @@ const app = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
   title: 'some-title',
   status: AppStatus.accessible,
   navLinkStatus: AppNavLinkStatus.default,
+  searchable: true,
   appRoute: `/app/some-id`,
   keywords: [],
   deepLinks: [],
   ...props,
 });
 
+const deepLink = (props: Partial<PublicAppDeepLinkInfo> = {}): PublicAppDeepLinkInfo => ({
+  id: 'some-deep-link-id',
+  title: 'my deep link',
+  path: '/my-deep-link',
+  navLinkStatus: AppNavLinkStatus.default,
+  searchable: true,
+  deepLinks: [],
+  keywords: [],
+  ...props,
+});
+
 describe('toNavLink', () => {
   const basePath = httpServiceMock.createSetupContract({ basePath: '/base-path' }).basePath;
 
@@ -64,7 +81,7 @@ describe('toNavLink', () => {
       }),
       basePath
     );
-    expect(link.properties.url).toEqual('http://localhost/base-path/my-route/my-path');
+    expect(link.properties.url).toEqual('/base-path/my-route/my-path');
 
     link = toNavLink(
       app({
@@ -73,9 +90,7 @@ describe('toNavLink', () => {
       }),
       basePath
     );
-    expect(link.properties.url).toEqual(
-      'http://localhost/base-path/my-route/my-path/some/default/path'
-    );
+    expect(link.properties.url).toEqual('/base-path/my-route/my-path/some/default/path');
   });
 
   it('uses the application status when the navLinkStatus is set to default', () => {
@@ -153,4 +168,90 @@ describe('toNavLink', () => {
       })
     );
   });
+
+  describe('deepLink parameter', () => {
+    it('should be hidden and not disabled by default', () => {
+      expect(toNavLink(app(), basePath, deepLink()).properties).toEqual(
+        expect.objectContaining({
+          disabled: false,
+          hidden: true,
+        })
+      );
+    });
+
+    it('should not be hidden when navLinkStatus is visible', () => {
+      expect(
+        toNavLink(
+          app(),
+          basePath,
+          deepLink({
+            navLinkStatus: AppNavLinkStatus.visible,
+          })
+        ).properties
+      ).toEqual(
+        expect.objectContaining({
+          disabled: false,
+          hidden: false,
+        })
+      );
+    });
+
+    it('should be disabled when navLinkStatus is disabled', () => {
+      expect(
+        toNavLink(
+          app(),
+          basePath,
+          deepLink({
+            navLinkStatus: AppNavLinkStatus.disabled,
+          })
+        ).properties
+      ).toEqual(
+        expect.objectContaining({
+          disabled: true,
+          hidden: false,
+        })
+      );
+    });
+
+    it('should have href, baseUrl and url containing the path', () => {
+      const testApp = app({
+        appRoute: '/app/app-id',
+        defaultPath: '/default-path',
+      });
+
+      expect(toNavLink(testApp, basePath).properties).toEqual(
+        expect.objectContaining({
+          baseUrl: 'http://localhost/base-path/app/app-id',
+          url: '/base-path/app/app-id/default-path',
+          href: 'http://localhost/base-path/app/app-id/default-path',
+        })
+      );
+
+      expect(
+        toNavLink(
+          testApp,
+          basePath,
+          deepLink({
+            id: 'deep-link-id',
+            path: '/my-deep-link',
+          })
+        ).properties
+      ).toEqual(
+        expect.objectContaining({
+          baseUrl: 'http://localhost/base-path/app/app-id',
+          url: '/base-path/app/app-id/my-deep-link',
+          href: 'http://localhost/base-path/app/app-id/my-deep-link',
+        })
+      );
+    });
+
+    it('should use the main app category', () => {
+      expect(toNavLink(app(), basePath, deepLink()).properties.category).toBeUndefined();
+
+      const category = { id: 'some-category', label: 'some category' };
+      expect(toNavLink(app({ category }), basePath, deepLink()).properties.category).toEqual(
+        category
+      );
+    });
+  });
 });
diff --git a/src/core/public/chrome/nav_links/to_nav_link.ts b/src/core/public/chrome/nav_links/to_nav_link.ts
index f56d496f42d8f..6acf37d40f089 100644
--- a/src/core/public/chrome/nav_links/to_nav_link.ts
+++ b/src/core/public/chrome/nav_links/to_nav_link.ts
@@ -6,29 +6,50 @@
  * Side Public License, v 1.
  */
 
-import { PublicAppInfo, AppNavLinkStatus, AppStatus } from '../../application';
+import {
+  PublicAppInfo,
+  AppNavLinkStatus,
+  AppStatus,
+  PublicAppDeepLinkInfo,
+} from '../../application';
 import { IBasePath } from '../../http';
 import { NavLinkWrapper } from './nav_link';
 import { appendAppPath } from '../../application/utils';
 
-export function toNavLink(app: PublicAppInfo, basePath: IBasePath): NavLinkWrapper {
-  const useAppStatus = app.navLinkStatus === AppNavLinkStatus.default;
+export function toNavLink(
+  app: PublicAppInfo,
+  basePath: IBasePath,
+  deepLink?: PublicAppDeepLinkInfo
+): NavLinkWrapper {
   const relativeBaseUrl = basePath.prepend(app.appRoute!);
-  const url = relativeToAbsolute(appendAppPath(relativeBaseUrl, app.defaultPath));
+  const url = appendAppPath(relativeBaseUrl, deepLink?.path || app.defaultPath);
+  const href = relativeToAbsolute(url);
   const baseUrl = relativeToAbsolute(relativeBaseUrl);
 
   return new NavLinkWrapper({
-    ...app,
-    hidden: useAppStatus
-      ? app.status === AppStatus.inaccessible
-      : app.navLinkStatus === AppNavLinkStatus.hidden,
-    disabled: useAppStatus ? false : app.navLinkStatus === AppNavLinkStatus.disabled,
+    ...(deepLink || app),
+    ...(app.category ? { category: app.category } : {}), // deepLinks use the main app category
+    hidden: deepLink ? isDeepNavLinkHidden(deepLink) : isAppNavLinkHidden(app),
+    disabled: (deepLink?.navLinkStatus ?? app.navLinkStatus) === AppNavLinkStatus.disabled,
     baseUrl,
-    href: url,
+    href,
     url,
   });
 }
 
+function isAppNavLinkHidden(app: PublicAppInfo) {
+  return app.navLinkStatus === AppNavLinkStatus.default
+    ? app.status === AppStatus.inaccessible
+    : app.navLinkStatus === AppNavLinkStatus.hidden;
+}
+
+function isDeepNavLinkHidden(deepLink: PublicAppDeepLinkInfo) {
+  return (
+    deepLink.navLinkStatus === AppNavLinkStatus.default ||
+    deepLink.navLinkStatus === AppNavLinkStatus.hidden
+  );
+}
+
 /**
  * @param {string} url - a relative or root relative url.  If a relative path is given then the
  * absolute url returned will depend on the current page where this function is called from. For example
diff --git a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
index 575a247ffeccb..3668829a6888c 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/collapsible_nav.test.tsx.snap
@@ -73,6 +73,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
         "id": "Custom link",
         "isActive": true,
         "title": "Custom link",
+        "url": "/",
       },
       "closed": false,
       "hasError": false,
@@ -140,6 +141,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "discover",
           "isActive": true,
           "title": "discover",
+          "url": "/",
         },
         Object {
           "baseUrl": "/",
@@ -154,6 +156,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "siem",
           "isActive": true,
           "title": "siem",
+          "url": "/",
         },
         Object {
           "baseUrl": "/",
@@ -168,6 +171,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "metrics",
           "isActive": true,
           "title": "metrics",
+          "url": "/",
         },
         Object {
           "baseUrl": "/",
@@ -182,6 +186,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "monitoring",
           "isActive": true,
           "title": "monitoring",
+          "url": "/",
         },
         Object {
           "baseUrl": "/",
@@ -196,6 +201,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "visualize",
           "isActive": true,
           "title": "visualize",
+          "url": "/",
         },
         Object {
           "baseUrl": "/",
@@ -210,6 +216,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "dashboard",
           "isActive": true,
           "title": "dashboard",
+          "url": "/",
         },
         Object {
           "baseUrl": "/",
@@ -219,6 +226,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "canvas",
           "isActive": true,
           "title": "canvas",
+          "url": "/",
         },
         Object {
           "baseUrl": "/",
@@ -233,6 +241,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
           "id": "logs",
           "isActive": true,
           "title": "logs",
+          "url": "/",
         },
       ],
       "closed": false,
@@ -351,6 +360,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
       "values": Array [],
     }
   }
+  url="/"
 >
   <EuiCollapsibleNav
     aria-label="Primary"
@@ -587,10 +597,12 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                             >
                               <EuiIcon
                                 className="euiListGroupItem__icon"
+                                color="inherit"
                                 type="home"
                               >
                                 <span
                                   className="euiListGroupItem__icon"
+                                  color="inherit"
                                   data-euiicon-type="home"
                                 />
                               </EuiIcon>
@@ -1921,6 +1933,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                                 >
                                   <span
                                     class="euiListGroupItem__icon"
+                                    color="inherit"
                                     data-euiicon-type="lockOpen"
                                   />
                                   <span
@@ -1952,10 +1965,12 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                               >
                                 <EuiIcon
                                   className="euiListGroupItem__icon"
+                                  color="inherit"
                                   type="lockOpen"
                                 >
                                   <span
                                     className="euiListGroupItem__icon"
+                                    color="inherit"
                                     data-euiicon-type="lockOpen"
                                   />
                                 </EuiIcon>
@@ -1999,6 +2014,7 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                 <EuiButtonContent
                   className="euiButtonEmpty__content"
                   iconSide="left"
+                  iconSize="s"
                   iconType="cross"
                   textProps={
                     Object {
@@ -2011,13 +2027,15 @@ exports[`CollapsibleNav renders links grouped by category 1`] = `
                   >
                     <EuiIcon
                       className="euiButtonContent__icon"
-                      size="m"
+                      color="inherit"
+                      size="s"
                       type="cross"
                     >
                       <span
                         className="euiButtonContent__icon"
+                        color="inherit"
                         data-euiicon-type="cross"
-                        size="m"
+                        size="s"
                       />
                     </EuiIcon>
                     <span
@@ -2266,6 +2284,7 @@ exports[`CollapsibleNav renders the default nav 1`] = `
       "values": Array [],
     }
   }
+  url="/"
 >
   <EuiCollapsibleNav
     aria-label="Primary"
@@ -2503,6 +2522,7 @@ exports[`CollapsibleNav renders the default nav 2`] = `
       "values": Array [],
     }
   }
+  url="/"
 >
   <EuiCollapsibleNav
     aria-label="Primary"
@@ -2740,6 +2760,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
       "values": Array [],
     }
   }
+  url="/"
 >
   <EuiCollapsibleNav
     aria-label="Primary"
@@ -2854,10 +2875,12 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                             >
                               <EuiIcon
                                 className="euiListGroupItem__icon"
+                                color="inherit"
                                 type="home"
                               >
                                 <span
                                   className="euiListGroupItem__icon"
+                                  color="inherit"
                                   data-euiicon-type="home"
                                 />
                               </EuiIcon>
@@ -3084,6 +3107,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                                 >
                                   <span
                                     class="euiListGroupItem__icon"
+                                    color="inherit"
                                     data-euiicon-type="lock"
                                   />
                                   <span
@@ -3115,10 +3139,12 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                               >
                                 <EuiIcon
                                   className="euiListGroupItem__icon"
+                                  color="inherit"
                                   type="lock"
                                 >
                                   <span
                                     className="euiListGroupItem__icon"
+                                    color="inherit"
                                     data-euiicon-type="lock"
                                   />
                                 </EuiIcon>
@@ -3162,6 +3188,7 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                 <EuiButtonContent
                   className="euiButtonEmpty__content"
                   iconSide="left"
+                  iconSize="s"
                   iconType="cross"
                   textProps={
                     Object {
@@ -3174,13 +3201,15 @@ exports[`CollapsibleNav renders the default nav 3`] = `
                   >
                     <EuiIcon
                       className="euiButtonContent__icon"
-                      size="m"
+                      color="inherit"
+                      size="s"
                       type="cross"
                     >
                       <span
                         className="euiButtonContent__icon"
+                        color="inherit"
                         data-euiicon-type="cross"
-                        size="m"
+                        size="s"
                       />
                     </EuiIcon>
                     <span
diff --git a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
index 29407c54e2834..6ad1e2d3a1cc6 100644
--- a/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
+++ b/src/core/public/chrome/ui/header/__snapshots__/header.test.tsx.snap
@@ -357,6 +357,7 @@ exports[`Header renders 1`] = `
         "href": "",
         "id": "cloud-deployment-link",
         "title": "Manage cloud deployment",
+        "url": "",
       },
       "closed": false,
       "hasError": false,
@@ -1607,6 +1608,7 @@ exports[`Header renders 1`] = `
           "href": "",
           "id": "kibana",
           "title": "kibana",
+          "url": "",
         },
       ],
       "closed": false,
@@ -1924,6 +1926,7 @@ exports[`Header renders 1`] = `
                           "href": "",
                           "id": "kibana",
                           "title": "kibana",
+                          "url": "",
                         },
                       ],
                       "closed": false,
@@ -3027,6 +3030,7 @@ exports[`Header renders 1`] = `
                             "href": "",
                             "id": "kibana",
                             "title": "kibana",
+                            "url": "",
                           },
                         ],
                         "closed": false,
@@ -4115,6 +4119,7 @@ exports[`Header renders 1`] = `
                                 <EuiButtonContent
                                   className="euiButtonEmpty__content"
                                   iconSide="left"
+                                  iconSize="m"
                                   textProps={
                                     Object {
                                       "className": "euiButtonEmpty__text",
@@ -4297,6 +4302,7 @@ exports[`Header renders 1`] = `
                         <EuiButtonContent
                           className="euiButtonEmpty__content"
                           iconSide="left"
+                          iconSize="m"
                           textProps={
                             Object {
                               "className": "euiButtonEmpty__text",
@@ -4729,6 +4735,7 @@ exports[`Header renders 1`] = `
             "href": "",
             "id": "cloud-deployment-link",
             "title": "Manage cloud deployment",
+            "url": "",
           },
           "closed": false,
           "hasError": false,
@@ -4788,6 +4795,7 @@ exports[`Header renders 1`] = `
               "href": "",
               "id": "kibana",
               "title": "kibana",
+              "url": "",
             },
           ],
           "closed": false,
@@ -5154,10 +5162,12 @@ exports[`Header renders 1`] = `
                                 >
                                   <EuiIcon
                                     className="euiListGroupItem__icon"
+                                    color="inherit"
                                     type="home"
                                   >
                                     <span
                                       className="euiListGroupItem__icon"
+                                      color="inherit"
                                       data-euiicon-type="home"
                                     />
                                   </EuiIcon>
@@ -5469,6 +5479,7 @@ exports[`Header renders 1`] = `
                                     >
                                       <span
                                         class="euiListGroupItem__icon"
+                                        color="inherit"
                                         data-euiicon-type="lock"
                                       />
                                       <span
@@ -5500,10 +5511,12 @@ exports[`Header renders 1`] = `
                                   >
                                     <EuiIcon
                                       className="euiListGroupItem__icon"
+                                      color="inherit"
                                       type="lock"
                                     >
                                       <span
                                         className="euiListGroupItem__icon"
+                                        color="inherit"
                                         data-euiicon-type="lock"
                                       />
                                     </EuiIcon>
@@ -5547,6 +5560,7 @@ exports[`Header renders 1`] = `
                     <EuiButtonContent
                       className="euiButtonEmpty__content"
                       iconSide="left"
+                      iconSize="s"
                       iconType="cross"
                       textProps={
                         Object {
@@ -5559,13 +5573,15 @@ exports[`Header renders 1`] = `
                       >
                         <EuiIcon
                           className="euiButtonContent__icon"
-                          size="m"
+                          color="inherit"
+                          size="s"
                           type="cross"
                         >
                           <span
                             className="euiButtonContent__icon"
+                            color="inherit"
                             data-euiicon-type="cross"
-                            size="m"
+                            size="s"
                           />
                         </EuiIcon>
                         <span
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
index a0d3c0a90fcbb..7f338a859e7b4 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.test.tsx
@@ -29,6 +29,7 @@ function mockLink({ title = 'discover', category }: Partial<ChromeNavLink>) {
     id: title,
     href: title,
     baseUrl: '/',
+    url: '/',
     isActive: true,
     'data-test-subj': title,
   };
@@ -50,6 +51,7 @@ function mockProps() {
     isLocked: false,
     isNavOpen: false,
     homeHref: '/',
+    url: '/',
     navLinks$: new BehaviorSubject([]),
     recentlyAccessed$: new BehaviorSubject([]),
     storage: new StubBrowserStorage(),
diff --git a/src/core/public/chrome/ui/header/collapsible_nav.tsx b/src/core/public/chrome/ui/header/collapsible_nav.tsx
index b5b2919b659bd..0e85dbea237cb 100644
--- a/src/core/public/chrome/ui/header/collapsible_nav.tsx
+++ b/src/core/public/chrome/ui/header/collapsible_nav.tsx
@@ -107,7 +107,7 @@ export function CollapsibleNav({
       link,
       appId,
       dataTestSubj: 'collapsibleNavAppLink',
-      navigateToApp,
+      navigateToUrl,
       onClick: closeNav,
       ...(needsIcon && { basePath }),
     });
@@ -137,7 +137,7 @@ export function CollapsibleNav({
                   createEuiListItem({
                     link: customNavLink,
                     basePath,
-                    navigateToApp,
+                    navigateToUrl,
                     dataTestSubj: 'collapsibleNavCustomNavLink',
                     onClick: closeNav,
                     externalLink: true,
diff --git a/src/core/public/chrome/ui/header/header.test.tsx b/src/core/public/chrome/ui/header/header.test.tsx
index e0f10fe66c9f0..fdbdde8556eeb 100644
--- a/src/core/public/chrome/ui/header/header.test.tsx
+++ b/src/core/public/chrome/ui/header/header.test.tsx
@@ -61,13 +61,14 @@ describe('Header', () => {
     const breadcrumbs$ = new BehaviorSubject([{ text: 'test' }]);
     const isLocked$ = new BehaviorSubject(false);
     const navLinks$ = new BehaviorSubject([
-      { id: 'kibana', title: 'kibana', baseUrl: '', href: '' },
+      { id: 'kibana', title: 'kibana', baseUrl: '', href: '', url: '' },
     ]);
     const headerBanner$ = new BehaviorSubject(undefined);
     const customNavLink$ = new BehaviorSubject({
       id: 'cloud-deployment-link',
       title: 'Manage cloud deployment',
       baseUrl: '',
+      url: '',
       href: '',
     });
     const recentlyAccessed$ = new BehaviorSubject([
diff --git a/src/core/public/chrome/ui/header/nav_link.tsx b/src/core/public/chrome/ui/header/nav_link.tsx
index 84f758e2c737e..b0ebf7cc5f8e5 100644
--- a/src/core/public/chrome/ui/header/nav_link.tsx
+++ b/src/core/public/chrome/ui/header/nav_link.tsx
@@ -23,7 +23,7 @@ interface Props {
   basePath?: HttpStart['basePath'];
   dataTestSubj: string;
   onClick?: Function;
-  navigateToApp: CoreStart['application']['navigateToApp'];
+  navigateToUrl: CoreStart['application']['navigateToUrl'];
   externalLink?: boolean;
 }
 
@@ -36,11 +36,11 @@ export function createEuiListItem({
   appId,
   basePath,
   onClick = () => {},
-  navigateToApp,
+  navigateToUrl,
   dataTestSubj,
   externalLink = false,
 }: Props) {
-  const { href, id, title, disabled, euiIconType, icon, tooltip } = link;
+  const { href, id, title, disabled, euiIconType, icon, tooltip, url } = link;
 
   return {
     label: tooltip ?? title,
@@ -57,7 +57,7 @@ export function createEuiListItem({
         !isModifiedOrPrevented(event)
       ) {
         event.preventDefault();
-        navigateToApp(id);
+        navigateToUrl(url);
       }
     },
     isActive: appId === id,
diff --git a/src/core/public/deprecations/deprecations_client.test.ts b/src/core/public/deprecations/deprecations_client.test.ts
index 2f52f7b4af195..a998a03772cca 100644
--- a/src/core/public/deprecations/deprecations_client.test.ts
+++ b/src/core/public/deprecations/deprecations_client.test.ts
@@ -90,6 +90,7 @@ describe('DeprecationsClient', () => {
             path: 'some-path',
             method: 'POST',
           },
+          manualSteps: ['manual-step'],
         },
       };
 
@@ -104,7 +105,9 @@ describe('DeprecationsClient', () => {
         domainId: 'testPluginId-1',
         message: 'some-message',
         level: 'warning',
-        correctiveActions: {},
+        correctiveActions: {
+          manualSteps: ['manual-step'],
+        },
       };
 
       const isResolvable = deprecationsClient.isDeprecationResolvable(mockDeprecationDetails);
@@ -120,7 +123,9 @@ describe('DeprecationsClient', () => {
         domainId: 'testPluginId-1',
         message: 'some-message',
         level: 'warning',
-        correctiveActions: {},
+        correctiveActions: {
+          manualSteps: ['manual-step'],
+        },
       };
       const result = await deprecationsClient.resolveDeprecation(mockDeprecationDetails);
 
@@ -144,6 +149,7 @@ describe('DeprecationsClient', () => {
               extra_param: 123,
             },
           },
+          manualSteps: ['manual-step'],
         },
       };
       const result = await deprecationsClient.resolveDeprecation(mockDeprecationDetails);
@@ -176,6 +182,7 @@ describe('DeprecationsClient', () => {
               extra_param: 123,
             },
           },
+          manualSteps: ['manual-step'],
         },
       };
       http.fetch.mockRejectedValue({ body: { message: mockResponse } });
diff --git a/src/core/public/doc_links/doc_links_service.ts b/src/core/public/doc_links/doc_links_service.ts
index 36d613ec82f9e..d4ab8f624f711 100644
--- a/src/core/public/doc_links/doc_links_service.ts
+++ b/src/core/public/doc_links/doc_links_service.ts
@@ -32,14 +32,14 @@ export class DocLinksService {
           guide: `${KIBANA_DOCS}canvas.html`,
         },
         dashboard: {
-          guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html`,
-          drilldowns: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/drilldowns.html`,
-          drilldownsTriggerPicker: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/drilldowns.html#url-drilldowns`,
-          urlDrilldownTemplateSyntax: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/url_templating-language.html`,
-          urlDrilldownVariables: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/url_templating-language.html#url-template-variables`,
+          guide: `${KIBANA_DOCS}dashboard.html`,
+          drilldowns: `${KIBANA_DOCS}drilldowns.html`,
+          drilldownsTriggerPicker: `${KIBANA_DOCS}drilldowns.html#url-drilldowns`,
+          urlDrilldownTemplateSyntax: `${KIBANA_DOCS}url_templating-language.html`,
+          urlDrilldownVariables: `${KIBANA_DOCS}url_templating-language.html#url-template-variables`,
         },
         discover: {
-          guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/discover.html`,
+          guide: `${KIBANA_DOCS}discover.html`,
         },
         filebeat: {
           base: `${ELASTIC_WEBSITE_URL}guide/en/beats/filebeat/${DOC_LINK_VERSION}`,
@@ -128,14 +128,14 @@ export class DocLinksService {
           luceneExpressions: `${ELASTICSEARCH_DOCS}modules-scripting-expression.html`,
         },
         indexPatterns: {
-          introduction: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index-patterns.html`,
-          fieldFormattersNumber: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/numeral.html`,
-          fieldFormattersString: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/field-formatters-string.html`,
+          introduction: `${KIBANA_DOCS}index-patterns.html`,
+          fieldFormattersNumber: `${KIBANA_DOCS}numeral.html`,
+          fieldFormattersString: `${KIBANA_DOCS}field-formatters-string.html`,
           runtimeFields: `${KIBANA_DOCS}managing-index-patterns.html#runtime-fields`,
         },
-        addData: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/connect-to-elasticsearch.html`,
-        kibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index.html`,
-        upgradeAssistant: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/upgrade-assistant.html`,
+        addData: `${KIBANA_DOCS}connect-to-elasticsearch.html`,
+        kibana: `${KIBANA_DOCS}index.html`,
+        upgradeAssistant: `${KIBANA_DOCS}upgrade-assistant.html`,
         elasticsearch: {
           docsBase: `${ELASTICSEARCH_DOCS}`,
           asyncSearch: `${ELASTICSEARCH_DOCS}async-search-intro.html`,
@@ -195,23 +195,23 @@ export class DocLinksService {
         },
         query: {
           eql: `${ELASTICSEARCH_DOCS}eql.html`,
-          kueryQuerySyntax: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kuery-query.html`,
+          kueryQuerySyntax: `${KIBANA_DOCS}kuery-query.html`,
           luceneQuerySyntax: `${ELASTICSEARCH_DOCS}query-dsl-query-string-query.html#query-string-syntax`,
           percolate: `${ELASTICSEARCH_DOCS}query-dsl-percolate-query.html`,
           queryDsl: `${ELASTICSEARCH_DOCS}query-dsl.html`,
         },
         search: {
-          sessions: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/search-sessions.html`,
+          sessions: `${KIBANA_DOCS}search-sessions.html`,
         },
         date: {
           dateMath: `${ELASTICSEARCH_DOCS}common-options.html#date-math`,
           dateMathIndexNames: `${ELASTICSEARCH_DOCS}date-math-index-names.html`,
         },
         management: {
-          dashboardSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-dashboard-settings`,
+          dashboardSettings: `${KIBANA_DOCS}advanced-options.html#kibana-dashboard-settings`,
           indexManagement: `${ELASTICSEARCH_DOCS}index-mgmt.html`,
-          kibanaSearchSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-search-settings`,
-          visualizationSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/advanced-options.html#kibana-visualization-settings`,
+          kibanaSearchSettings: `${KIBANA_DOCS}advanced-options.html#kibana-search-settings`,
+          visualizationSettings: `${KIBANA_DOCS}advanced-options.html#kibana-visualization-settings`,
         },
         ml: {
           guide: `${ELASTIC_WEBSITE_URL}guide/en/machine-learning/${DOC_LINK_VERSION}/index.html`,
@@ -242,52 +242,52 @@ export class DocLinksService {
           guide: `${ELASTICSEARCH_DOCS}transforms.html`,
         },
         visualize: {
-          guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/dashboard.html`,
-          timelionDeprecation: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/timelion.html`,
+          guide: `${KIBANA_DOCS}dashboard.html`,
+          timelionDeprecation: `${KIBANA_DOCS}timelion.html`,
           lens: `${ELASTIC_WEBSITE_URL}what-is/kibana-lens`,
-          lensPanels: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/lens.html`,
+          lensPanels: `${KIBANA_DOCS}lens.html`,
           maps: `${ELASTIC_WEBSITE_URL}maps`,
-          vega: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/vega.html`,
+          vega: `${KIBANA_DOCS}vega.html`,
         },
         observability: {
           guide: `${ELASTIC_WEBSITE_URL}guide/en/observability/${DOC_LINK_VERSION}/index.html`,
         },
         alerting: {
-          guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/alert-management.html`,
-          actionTypes: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/action-types.html`,
-          emailAction: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/email-action-type.html`,
-          emailActionConfig: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/email-action-type.html`,
-          generalSettings: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/alert-action-settings-kb.html#general-alert-action-settings`,
-          indexAction: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index-action-type.html`,
-          esQuery: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/rule-type-es-query.html`,
-          indexThreshold: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/rule-type-index-threshold.html`,
-          pagerDutyAction: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/pagerduty-action-type.html`,
-          preconfiguredConnectors: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/pre-configured-connectors.html`,
-          preconfiguredAlertHistoryConnector: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/index-action-type.html#preconfigured-connector-alert-history`,
-          serviceNowAction: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/servicenow-action-type.html#configuring-servicenow`,
-          setupPrerequisites: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/alerting-getting-started.html#alerting-setup-prerequisites`,
-          slackAction: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/slack-action-type.html#configuring-slack`,
-          teamsAction: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/teams-action-type.html#configuring-teams`,
+          guide: `${KIBANA_DOCS}alert-management.html`,
+          actionTypes: `${KIBANA_DOCS}action-types.html`,
+          emailAction: `${KIBANA_DOCS}email-action-type.html`,
+          emailActionConfig: `${KIBANA_DOCS}email-action-type.html`,
+          generalSettings: `${KIBANA_DOCS}alert-action-settings-kb.html#general-alert-action-settings`,
+          indexAction: `${KIBANA_DOCS}index-action-type.html`,
+          esQuery: `${KIBANA_DOCS}rule-type-es-query.html`,
+          indexThreshold: `${KIBANA_DOCS}rule-type-index-threshold.html`,
+          pagerDutyAction: `${KIBANA_DOCS}pagerduty-action-type.html`,
+          preconfiguredConnectors: `${KIBANA_DOCS}pre-configured-connectors.html`,
+          preconfiguredAlertHistoryConnector: `${KIBANA_DOCS}index-action-type.html#preconfigured-connector-alert-history`,
+          serviceNowAction: `${KIBANA_DOCS}servicenow-action-type.html#configuring-servicenow`,
+          setupPrerequisites: `${KIBANA_DOCS}alerting-getting-started.html#alerting-setup-prerequisites`,
+          slackAction: `${KIBANA_DOCS}slack-action-type.html#configuring-slack`,
+          teamsAction: `${KIBANA_DOCS}teams-action-type.html#configuring-teams`,
         },
         maps: {
-          guide: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/maps.html`,
-          importGeospatialPrivileges: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/import-geospatial-data.html#import-geospatial-privileges`,
+          guide: `${KIBANA_DOCS}maps.html`,
+          importGeospatialPrivileges: `${KIBANA_DOCS}import-geospatial-data.html#import-geospatial-privileges`,
         },
         monitoring: {
-          alertsKibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html`,
-          alertsKibanaCpuThreshold: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-cpu-threshold`,
-          alertsKibanaDiskThreshold: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-disk-usage-threshold`,
-          alertsKibanaJvmThreshold: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-jvm-memory-threshold`,
-          alertsKibanaMissingData: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-missing-monitoring-data`,
-          alertsKibanaThreadpoolRejections: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-thread-pool-rejections`,
-          alertsKibanaCCRReadExceptions: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-ccr-read-exceptions`,
-          alertsKibanaLargeShardSize: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-large-shard-size`,
-          alertsKibanaClusterAlerts: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-alerts.html#kibana-alerts-cluster-alerts`,
+          alertsKibana: `${KIBANA_DOCS}kibana-alerts.html`,
+          alertsKibanaCpuThreshold: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-cpu-threshold`,
+          alertsKibanaDiskThreshold: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-disk-usage-threshold`,
+          alertsKibanaJvmThreshold: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-jvm-memory-threshold`,
+          alertsKibanaMissingData: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-missing-monitoring-data`,
+          alertsKibanaThreadpoolRejections: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-thread-pool-rejections`,
+          alertsKibanaCCRReadExceptions: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-ccr-read-exceptions`,
+          alertsKibanaLargeShardSize: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-large-shard-size`,
+          alertsKibanaClusterAlerts: `${KIBANA_DOCS}kibana-alerts.html#kibana-alerts-cluster-alerts`,
           metricbeatBlog: `${ELASTIC_WEBSITE_URL}blog/external-collection-for-elastic-stack-monitoring-is-now-available-via-metricbeat`,
           monitorElasticsearch: `${ELASTICSEARCH_DOCS}configuring-metricbeat.html`,
-          monitorKibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/monitoring-metricbeat.html`,
+          monitorKibana: `${KIBANA_DOCS}monitoring-metricbeat.html`,
           monitorLogstash: `${ELASTIC_WEBSITE_URL}guide/en/logstash/${DOC_LINK_VERSION}/monitoring-with-metricbeat.html`,
-          troubleshootKibana: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/monitor-troubleshooting.html`,
+          troubleshootKibana: `${KIBANA_DOCS}monitor-troubleshooting.html`,
         },
         security: {
           apiKeyServiceSettings: `${ELASTICSEARCH_DOCS}security-settings.html#api-key-service-settings`,
@@ -295,8 +295,8 @@ export class DocLinksService {
           elasticsearchSettings: `${ELASTICSEARCH_DOCS}security-settings.html`,
           elasticsearchEnableSecurity: `${ELASTICSEARCH_DOCS}configuring-stack-security.html`,
           indicesPrivileges: `${ELASTICSEARCH_DOCS}security-privileges.html#privileges-list-indices`,
-          kibanaTLS: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/configuring-tls.html`,
-          kibanaPrivileges: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/kibana-privileges.html`,
+          kibanaTLS: `${KIBANA_DOCS}configuring-tls.html`,
+          kibanaPrivileges: `${KIBANA_DOCS}kibana-privileges.html`,
           mappingRoles: `${ELASTICSEARCH_DOCS}mapping-roles.html`,
           mappingRolesFieldRules: `${ELASTICSEARCH_DOCS}role-mapping-resources.html#mapping-roles-rule-field`,
           runAsPrivilege: `${ELASTICSEARCH_DOCS}security-privileges.html#_run_as_privilege`,
@@ -305,7 +305,7 @@ export class DocLinksService {
           jiraAction: `${ELASTICSEARCH_DOCS}actions-jira.html`,
           pagerDutyAction: `${ELASTICSEARCH_DOCS}actions-pagerduty.html`,
           slackAction: `${ELASTICSEARCH_DOCS}actions-slack.html`,
-          ui: `${ELASTIC_WEBSITE_URL}guide/en/kibana/${DOC_LINK_VERSION}/watcher-ui.html`,
+          ui: `${KIBANA_DOCS}watcher-ui.html`,
         },
         ccs: {
           guide: `${ELASTICSEARCH_DOCS}modules-cross-cluster-search.html`,
diff --git a/src/core/public/index.ts b/src/core/public/index.ts
index 24b48683cdd93..32737ff427ef3 100644
--- a/src/core/public/index.ts
+++ b/src/core/public/index.ts
@@ -91,6 +91,7 @@ export type {
   AppLeaveConfirmAction,
   AppUpdatableFields,
   AppUpdater,
+  AppNavOptions,
   AppDeepLink,
   PublicAppInfo,
   PublicAppDeepLinkInfo,
diff --git a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
index 0d10ac47d0b75..f5a1c51ccbe15 100644
--- a/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
+++ b/src/core/public/overlays/flyout/__snapshots__/flyout_service.test.tsx.snap
@@ -26,7 +26,7 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium euiFlyout--paddingLarge\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div>"`;
+exports[`FlyoutService openFlyout() renders a flyout to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium euiFlyout--paddingLarge\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content</span></div></div></div>"`;
 
 exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 1`] = `
 Array [
@@ -59,4 +59,4 @@ Array [
 ]
 `;
 
-exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium euiFlyout--paddingLarge\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div>"`;
+exports[`FlyoutService openFlyout() with a currently active flyout replaces the current flyout with a new one 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div role=\\"dialog\\" class=\\"euiFlyout euiFlyout--medium euiFlyout--paddingLarge\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiFlyout__closeButton\\" type=\\"button\\" aria-label=\\"Close this dialog\\" data-test-subj=\\"euiFlyoutCloseButton\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button><div class=\\"kbnOverlayMountWrapper\\"><span>Flyout content 2</span></div></div></div>"`;
diff --git a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
index 19ebb5a9113c3..9c39776fcea5c 100644
--- a/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
+++ b/src/core/public/overlays/modal/__snapshots__/modal_service.test.tsx.snap
@@ -29,7 +29,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
+exports[`ModalService openConfirm() renders a mountpoint confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
 
 exports[`ModalService openConfirm() renders a string confirm message 1`] = `
 Array [
@@ -49,7 +49,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openConfirm() renders a string confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><p>Some message</p></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
+exports[`ModalService openConfirm() renders a string confirm message 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default euiModal--confirmation\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"euiModalBody\\"><div class=\\"euiModalBody__overflow\\"><div class=\\"euiText euiText--medium\\" data-test-subj=\\"confirmModalBodyText\\"><p>Some message</p></div></div></div><div class=\\"euiModalFooter\\"><button class=\\"euiButtonEmpty euiButtonEmpty--primary\\" type=\\"button\\" data-test-subj=\\"confirmModalCancelButton\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\">Cancel</span></span></button><button class=\\"euiButton euiButton--primary euiButton--fill\\" type=\\"button\\" data-test-subj=\\"confirmModalConfirmButton\\"><span class=\\"euiButtonContent euiButton__content\\"><span class=\\"euiButton__text\\">Confirm</span></span></button></div></div></div></div>"`;
 
 exports[`ModalService openConfirm() with a currently active confirm replaces the current confirm with the new one 1`] = `
 Array [
@@ -131,7 +131,7 @@ Array [
 ]
 `;
 
-exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div>"`;
+exports[`ModalService openModal() renders a modal to the DOM 2`] = `"<div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiModal euiModal--maxWidth-default\\" tabindex=\\"0\\"><button class=\\"euiButtonIcon euiButtonIcon--text euiButtonIcon--empty euiButtonIcon--xSmall euiModal__closeIcon\\" type=\\"button\\" aria-label=\\"Closes this modal window\\"><span data-euiicon-type=\\"cross\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button><div class=\\"euiModal__flex\\"><div class=\\"kbnOverlayMountWrapper\\"><span>Modal content</span></div></div></div></div>"`;
 
 exports[`ModalService openModal() with a currently active confirm replaces the current confirm with the new one 1`] = `
 Array [
diff --git a/src/core/public/public.api.md b/src/core/public/public.api.md
index 667863d29623e..235110aeb4633 100644
--- a/src/core/public/public.api.md
+++ b/src/core/public/public.api.md
@@ -53,24 +53,21 @@ import { UserProvidedValues as UserProvidedValues_2 } from 'src/core/server/type
 export function __kbnBootstrap__(): Promise<void>;
 
 // @public (undocumented)
-export interface App<HistoryLocationState = unknown> {
+export interface App<HistoryLocationState = unknown> extends AppNavOptions {
     appRoute?: string;
     capabilities?: Partial<Capabilities>;
     category?: AppCategory;
     chromeless?: boolean;
     deepLinks?: AppDeepLink[];
     defaultPath?: string;
-    euiIconType?: string;
     exactRoute?: boolean;
-    icon?: string;
     id: string;
     keywords?: string[];
     mount: AppMount<HistoryLocationState>;
     navLinkStatus?: AppNavLinkStatus;
-    order?: number;
+    searchable?: boolean;
     status?: AppStatus;
     title: string;
-    tooltip?: string;
     updater$?: Observable<AppUpdater>;
 }
 
@@ -92,7 +89,8 @@ export type AppDeepLink = {
     title: string;
     keywords?: string[];
     navLinkStatus?: AppNavLinkStatus;
-} & ({
+    searchable?: boolean;
+} & AppNavOptions & ({
     path: string;
     deepLinks?: AppDeepLink[];
 } | {
@@ -179,6 +177,14 @@ export enum AppNavLinkStatus {
     visible = 1
 }
 
+// @public
+export interface AppNavOptions {
+    euiIconType?: string;
+    icon?: string;
+    order?: number;
+    tooltip?: string;
+}
+
 // @public
 export enum AppStatus {
     accessible = 0,
@@ -189,7 +195,7 @@ export enum AppStatus {
 export type AppUnmount = () => void;
 
 // @public
-export type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'tooltip' | 'defaultPath' | 'deepLinks'>;
+export type AppUpdatableFields = Pick<App, 'status' | 'navLinkStatus' | 'searchable' | 'tooltip' | 'defaultPath' | 'deepLinks'>;
 
 // @public
 export type AppUpdater = (app: App) => Partial<AppUpdatableFields> | undefined;
@@ -314,8 +320,7 @@ export interface ChromeNavLink {
     readonly order?: number;
     readonly title: string;
     readonly tooltip?: string;
-    // Warning: (ae-unresolved-link) The @link reference could not be resolved: The package "kibana" does not have an export "AppBase"
-    readonly url?: string;
+    readonly url: string;
 }
 
 // @public
@@ -916,10 +921,9 @@ export interface IUiSettingsClient {
 // @public
 export type MountPoint<T extends HTMLElement = HTMLElement> = (element: T) => UnmountCallback;
 
-// Warning: (ae-missing-release-tag) "NavigateToAppOptions" is exported by the package, but it is missing a release tag (@alpha, @beta, @public, or @internal)
-//
 // @public
 export interface NavigateToAppOptions {
+    deepLinkId?: string;
     openInNewTab?: boolean;
     path?: string;
     replace?: boolean;
@@ -1067,19 +1071,21 @@ export interface PluginInitializerContext<ConfigSchema extends object = object>
 export type PluginOpaqueId = symbol;
 
 // @public
-export type PublicAppDeepLinkInfo = Omit<AppDeepLink, 'deepLinks' | 'keywords' | 'navLinkStatus'> & {
+export type PublicAppDeepLinkInfo = Omit<AppDeepLink, 'deepLinks' | 'keywords' | 'navLinkStatus' | 'searchable'> & {
     deepLinks: PublicAppDeepLinkInfo[];
     keywords: string[];
     navLinkStatus: AppNavLinkStatus;
+    searchable: boolean;
 };
 
 // @public
-export type PublicAppInfo = Omit<App, 'mount' | 'updater$' | 'keywords' | 'deepLinks'> & {
+export type PublicAppInfo = Omit<App, 'mount' | 'updater$' | 'keywords' | 'deepLinks' | 'searchable'> & {
     status: AppStatus;
     navLinkStatus: AppNavLinkStatus;
     appRoute: string;
     keywords: string[];
     deepLinks: PublicAppDeepLinkInfo[];
+    searchable: boolean;
 };
 
 // @public
@@ -1249,7 +1255,7 @@ export interface SavedObjectsCreateOptions {
 // @public (undocumented)
 export interface SavedObjectsFindOptions {
     // @alpha
-    aggs?: Record<string, estypes.AggregationContainer>;
+    aggs?: Record<string, estypes.AggregationsAggregationContainer>;
     defaultSearchOperator?: 'AND' | 'OR';
     fields?: string[];
     // Warning: (ae-forgotten-export) The symbol "KueryNode" needs to be exported by the entry point index.d.ts
@@ -1275,7 +1281,7 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     sortField?: string;
     // (undocumented)
-    sortOrder?: estypes.SortOrder;
+    sortOrder?: estypes.SearchSortOrder;
     // (undocumented)
     type: string | string[];
     typeToNamespacesMap?: Map<string, string[] | undefined>;
diff --git a/src/core/public/styles/_base.scss b/src/core/public/styles/_base.scss
index 46f46b469783b..3386fa73f328a 100644
--- a/src/core/public/styles/_base.scss
+++ b/src/core/public/styles/_base.scss
@@ -28,3 +28,9 @@
 .euiBody--collapsibleNavIsDocked .euiBottomBar {
   margin-left: $euiCollapsibleNavWidth;
 }
+
+// Temporary fix for EuiPageHeader with a bottom border but no tabs or padding
+// Will fix in EUI -- @cchaos
+.euiPageHeader--bottomBorder:not(.euiPageHeader--tabsAtBottom):not([class*='euiPageHeader--padding']) {
+  padding-bottom: $euiSizeL;
+}
diff --git a/src/core/server/config/deprecation/core_deprecations.test.ts b/src/core/server/config/deprecation/core_deprecations.test.ts
index a8063c317b3c5..06c7116c8bebb 100644
--- a/src/core/server/config/deprecation/core_deprecations.test.ts
+++ b/src/core/server/config/deprecation/core_deprecations.test.ts
@@ -24,7 +24,7 @@ describe('core deprecations', () => {
       const { messages } = applyCoreDeprecations();
       expect(messages).toMatchInlineSnapshot(`
         Array [
-          "Environment variable CONFIG_PATH is deprecated. It has been replaced with KBN_PATH_CONF pointing to a config folder",
+          "Environment variable \\"CONFIG_PATH\\" is deprecated. It has been replaced with \\"KBN_PATH_CONF\\" pointing to a config folder",
         ]
       `);
     });
@@ -405,7 +405,7 @@ describe('core deprecations', () => {
       });
       expect(messages).toMatchInlineSnapshot(`
         Array [
-          "\\"logging.events.log\\" has been deprecated and will be removed in 8.0. Moving forward, log levels can be customized on a per-logger basis using the new logging configuration. ",
+          "\\"logging.events.log\\" has been deprecated and will be removed in 8.0. Moving forward, log levels can be customized on a per-logger basis using the new logging configuration.",
         ]
       `);
     });
@@ -418,7 +418,7 @@ describe('core deprecations', () => {
       });
       expect(messages).toMatchInlineSnapshot(`
         Array [
-          "\\"logging.events.error\\" has been deprecated and will be removed in 8.0. Moving forward, you can use \\"logging.root.level: error\\" in your logging configuration. ",
+          "\\"logging.events.error\\" has been deprecated and will be removed in 8.0. Moving forward, you can use \\"logging.root.level: error\\" in your logging configuration.",
         ]
       `);
     });
diff --git a/src/core/server/config/deprecation/core_deprecations.ts b/src/core/server/config/deprecation/core_deprecations.ts
index 0722bbe0a71ad..222f92321d917 100644
--- a/src/core/server/config/deprecation/core_deprecations.ts
+++ b/src/core/server/config/deprecation/core_deprecations.ts
@@ -11,7 +11,10 @@ import { ConfigDeprecationProvider, ConfigDeprecation } from '@kbn/config';
 const configPathDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecation) => {
   if (process.env?.CONFIG_PATH) {
     addDeprecation({
-      message: `Environment variable CONFIG_PATH is deprecated. It has been replaced with KBN_PATH_CONF pointing to a config folder`,
+      message: `Environment variable "CONFIG_PATH" is deprecated. It has been replaced with "KBN_PATH_CONF" pointing to a config folder`,
+      correctiveActions: {
+        manualSteps: ['Use "KBN_PATH_CONF" instead of "CONFIG_PATH" to point to a config folder.'],
+      },
     });
   }
 };
@@ -20,6 +23,11 @@ const dataPathDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecati
   if (process.env?.DATA_PATH) {
     addDeprecation({
       message: `Environment variable "DATA_PATH" will be removed.  It has been replaced with kibana.yml setting "path.data"`,
+      correctiveActions: {
+        manualSteps: [
+          `Set 'path.data' in the config file or CLI flag with the value of the environment variable "DATA_PATH".`,
+        ],
+      },
     });
   }
 };
@@ -32,6 +40,12 @@ const rewriteBasePathDeprecation: ConfigDeprecation = (settings, fromPath, addDe
         'will expect that all requests start with server.basePath rather than expecting you to rewrite ' +
         'the requests in your reverse proxy. Set server.rewriteBasePath to false to preserve the ' +
         'current behavior and silence this warning.',
+      correctiveActions: {
+        manualSteps: [
+          `Set 'server.rewriteBasePath' in the config file, CLI flag, or environment variable (in Docker only).`,
+          `Set to false to preserve the current behavior and silence this warning.`,
+        ],
+      },
     });
   }
 };
@@ -41,6 +55,11 @@ const rewriteCorsSettings: ConfigDeprecation = (settings, fromPath, addDeprecati
   if (typeof corsSettings === 'boolean') {
     addDeprecation({
       message: '"server.cors" is deprecated and has been replaced by "server.cors.enabled"',
+      correctiveActions: {
+        manualSteps: [
+          `Replace "server.cors: ${corsSettings}" with "server.cors.enabled: ${corsSettings}"`,
+        ],
+      },
     });
 
     return {
@@ -72,6 +91,9 @@ const cspRulesDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecati
             if (sourceList.find((source) => source.includes(NONCE_STRING))) {
               addDeprecation({
                 message: `csp.rules no longer supports the {nonce} syntax. Replacing with 'self' in ${policy}`,
+                correctiveActions: {
+                  manualSteps: [`Replace {nonce} syntax with 'self' in ${policy}`],
+                },
               });
               sourceList = sourceList.filter((source) => !source.includes(NONCE_STRING));
 
@@ -87,6 +109,9 @@ const cspRulesDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecati
             ) {
               addDeprecation({
                 message: `csp.rules must contain the 'self' source. Automatically adding to ${policy}.`,
+                correctiveActions: {
+                  manualSteps: [`Add 'self' source to ${policy}.`],
+                },
               });
               sourceList.push(SELF_STRING);
             }
@@ -111,6 +136,12 @@ const mapManifestServiceUrlDeprecation: ConfigDeprecation = (
         'of the Elastic Maps Service settings. These settings have moved to the "map.emsTileApiUrl" and ' +
         '"map.emsFileApiUrl" settings instead. These settings are for development use only and should not be ' +
         'modified for use in production environments.',
+      correctiveActions: {
+        manualSteps: [
+          `Use "map.emsTileApiUrl" and "map.emsFileApiUrl" config instead of "map.manifestServiceUrl".`,
+          `These settings are for development use only and should not be modified for use in production environments.`,
+        ],
+      },
     });
   }
 };
@@ -125,12 +156,28 @@ const opsLoggingEventDeprecation: ConfigDeprecation = (settings, fromPath, addDe
         'in 8.0. To access ops data moving forward, please enable debug logs for the ' +
         '"metrics.ops" context in your logging configuration. For more details, see ' +
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.events.ops" from your kibana settings.`,
+          `Enable debug logs for the "metrics.ops" context in your logging configuration`,
+        ],
+      },
     });
   }
 };
 
 const requestLoggingEventDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecation) => {
   if (settings.logging?.events?.request || settings.logging?.events?.response) {
+    const removeConfigsSteps = [];
+
+    if (settings.logging?.events?.request) {
+      removeConfigsSteps.push(`Remove "logging.events.request" from your kibana configs.`);
+    }
+
+    if (settings.logging?.events?.response) {
+      removeConfigsSteps.push(`Remove "logging.events.response" from your kibana configs.`);
+    }
+
     addDeprecation({
       documentationUrl:
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx#loggingevents',
@@ -139,6 +186,12 @@ const requestLoggingEventDeprecation: ConfigDeprecation = (settings, fromPath, a
         'in 8.0. To access request and/or response data moving forward, please enable debug logs for the ' +
         '"http.server.response" context in your logging configuration. For more details, see ' +
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx',
+      correctiveActions: {
+        manualSteps: [
+          ...removeConfigsSteps,
+          `enable debug logs for the "http.server.response" context in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -153,6 +206,12 @@ const timezoneLoggingDeprecation: ConfigDeprecation = (settings, fromPath, addDe
         'in 8.0. To set the timezone moving forward, please add a timezone date modifier to the log pattern ' +
         'in your logging configuration. For more details, see ' +
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.timezone" from your kibana configs.`,
+          `To set the timezone add a timezone date modifier to the log pattern in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -167,6 +226,12 @@ const destLoggingDeprecation: ConfigDeprecation = (settings, fromPath, addDeprec
         'in 8.0. To set the destination moving forward, you can use the "console" appender ' +
         'in your logging configuration or define a custom one. For more details, see ' +
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.dest" from your kibana configs.`,
+          `To set the destination use the "console" appender in your logging configuration or define a custom one.`,
+        ],
+      },
     });
   }
 };
@@ -179,6 +244,12 @@ const quietLoggingDeprecation: ConfigDeprecation = (settings, fromPath, addDepre
       message:
         '"logging.quiet" has been deprecated and will be removed ' +
         'in 8.0. Moving forward, you can use "logging.root.level:error" in your logging configuration. ',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.quiet" from your kibana configs.`,
+          `Use "logging.root.level:error" in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -191,6 +262,12 @@ const silentLoggingDeprecation: ConfigDeprecation = (settings, fromPath, addDepr
       message:
         '"logging.silent" has been deprecated and will be removed ' +
         'in 8.0. Moving forward, you can use "logging.root.level:off" in your logging configuration. ',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.silent" from your kibana configs.`,
+          `Use "logging.root.level:off" in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -203,6 +280,12 @@ const verboseLoggingDeprecation: ConfigDeprecation = (settings, fromPath, addDep
       message:
         '"logging.verbose" has been deprecated and will be removed ' +
         'in 8.0. Moving forward, you can use "logging.root.level:all" in your logging configuration. ',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.verbose" from your kibana configs.`,
+          `Use "logging.root.level:all" in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -223,6 +306,12 @@ const jsonLoggingDeprecation: ConfigDeprecation = (settings, fromPath, addDeprec
         'There is currently no default layout for custom appenders and each one must be declared explicitly. ' +
         'For more details, see ' +
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.json" from your kibana configs.`,
+          `Configure the "appender.layout" property for every custom appender in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -237,6 +326,12 @@ const logRotateDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecat
         'Moving forward, you can enable log rotation using the "rolling-file" appender for a logger ' +
         'in your logging configuration. For more details, see ' +
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx#rolling-file-appender',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.rotate" from your kibana configs.`,
+          `Enable log rotation using the "rolling-file" appender for a logger in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -248,7 +343,13 @@ const logEventsLogDeprecation: ConfigDeprecation = (settings, fromPath, addDepre
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx#loggingevents',
       message:
         '"logging.events.log" has been deprecated and will be removed ' +
-        'in 8.0. Moving forward, log levels can be customized on a per-logger basis using the new logging configuration. ',
+        'in 8.0. Moving forward, log levels can be customized on a per-logger basis using the new logging configuration.',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.events.log" from your kibana configs.`,
+          `Customize log levels can be per-logger using the new logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -260,7 +361,13 @@ const logEventsErrorDeprecation: ConfigDeprecation = (settings, fromPath, addDep
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx#loggingevents',
       message:
         '"logging.events.error" has been deprecated and will be removed ' +
-        'in 8.0. Moving forward, you can use "logging.root.level: error" in your logging configuration. ',
+        'in 8.0. Moving forward, you can use "logging.root.level: error" in your logging configuration.',
+      correctiveActions: {
+        manualSteps: [
+          `Remove "logging.events.error" from your kibana configs.`,
+          `Use "logging.root.level: error" in your logging configuration.`,
+        ],
+      },
     });
   }
 };
@@ -271,6 +378,9 @@ const logFilterDeprecation: ConfigDeprecation = (settings, fromPath, addDeprecat
       documentationUrl:
         'https://github.com/elastic/kibana/blob/master/src/core/server/logging/README.mdx#loggingfilter',
       message: '"logging.filter" has been deprecated and will be removed in 8.0.',
+      correctiveActions: {
+        manualSteps: [`Remove "logging.filter" from your kibana configs.`],
+      },
     });
   }
 };
diff --git a/src/core/server/deprecations/deprecations_factory.mock.ts b/src/core/server/deprecations/deprecations_factory.mock.ts
new file mode 100644
index 0000000000000..91ae4e6fa9af9
--- /dev/null
+++ b/src/core/server/deprecations/deprecations_factory.mock.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 { PublicMethodsOf } from '@kbn/utility-types';
+import type { DeprecationsFactory } from './deprecations_factory';
+type DeprecationsFactoryContract = PublicMethodsOf<DeprecationsFactory>;
+
+const createDeprecationsFactoryMock = () => {
+  const mocked: jest.Mocked<DeprecationsFactoryContract> = {
+    getRegistry: jest.fn(),
+    getDeprecations: jest.fn(),
+    getAllDeprecations: jest.fn(),
+  };
+
+  mocked.getDeprecations.mockResolvedValue([]);
+  mocked.getAllDeprecations.mockResolvedValue([]);
+  return mocked as jest.Mocked<DeprecationsFactory>;
+};
+
+export const mockDeprecationsFactory = {
+  create: createDeprecationsFactoryMock,
+};
diff --git a/src/core/server/deprecations/deprecations_factory.test.ts b/src/core/server/deprecations/deprecations_factory.test.ts
index 469451b0020c0..187f3880f9998 100644
--- a/src/core/server/deprecations/deprecations_factory.test.ts
+++ b/src/core/server/deprecations/deprecations_factory.test.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { GetDeprecationsContext } from './types';
+import type { GetDeprecationsContext } from './types';
 import { DeprecationsFactory } from './deprecations_factory';
 import { loggerMock } from '../logging/logger.mock';
 
diff --git a/src/core/server/deprecations/deprecations_registry.mock.ts b/src/core/server/deprecations/deprecations_registry.mock.ts
new file mode 100644
index 0000000000000..bb178c3935cdc
--- /dev/null
+++ b/src/core/server/deprecations/deprecations_registry.mock.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 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 { PublicMethodsOf } from '@kbn/utility-types';
+import type { DeprecationsRegistry } from './deprecations_registry';
+import type { GetDeprecationsContext } from './types';
+import { elasticsearchClientMock } from '../elasticsearch/client/mocks';
+import { savedObjectsClientMock } from '../saved_objects/service/saved_objects_client.mock';
+type DeprecationsRegistryContract = PublicMethodsOf<DeprecationsRegistry>;
+
+const createDeprecationsRegistryMock = () => {
+  const mocked: jest.Mocked<DeprecationsRegistryContract> = {
+    registerDeprecations: jest.fn(),
+    getDeprecations: jest.fn(),
+  };
+
+  return mocked as jest.Mocked<DeprecationsRegistry>;
+};
+
+const createGetDeprecationsContextMock = () => {
+  const mocked: jest.Mocked<GetDeprecationsContext> = {
+    esClient: elasticsearchClientMock.createScopedClusterClient(),
+    savedObjectsClient: savedObjectsClientMock.create(),
+  };
+
+  return mocked;
+};
+
+export const mockDeprecationsRegistry = {
+  create: createDeprecationsRegistryMock,
+  createGetDeprecationsContext: createGetDeprecationsContextMock,
+};
diff --git a/src/core/server/deprecations/deprecations_registry.test.ts b/src/core/server/deprecations/deprecations_registry.test.ts
index 507677a531861..82b09beaa5123 100644
--- a/src/core/server/deprecations/deprecations_registry.test.ts
+++ b/src/core/server/deprecations/deprecations_registry.test.ts
@@ -7,7 +7,7 @@
  */
 
 /* eslint-disable dot-notation */
-import { RegisterDeprecationsConfig, GetDeprecationsContext } from './types';
+import type { RegisterDeprecationsConfig, GetDeprecationsContext } from './types';
 import { DeprecationsRegistry } from './deprecations_registry';
 
 describe('DeprecationsRegistry', () => {
diff --git a/src/core/server/deprecations/deprecations_registry.ts b/src/core/server/deprecations/deprecations_registry.ts
index f92d807514b82..cc05473923ac8 100644
--- a/src/core/server/deprecations/deprecations_registry.ts
+++ b/src/core/server/deprecations/deprecations_registry.ts
@@ -6,7 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { DeprecationsDetails, RegisterDeprecationsConfig, GetDeprecationsContext } from './types';
+import type {
+  DeprecationsDetails,
+  RegisterDeprecationsConfig,
+  GetDeprecationsContext,
+} from './types';
 
 export class DeprecationsRegistry {
   private readonly deprecationContexts: RegisterDeprecationsConfig[] = [];
diff --git a/src/core/server/deprecations/deprecations_service.test.ts b/src/core/server/deprecations/deprecations_service.test.ts
new file mode 100644
index 0000000000000..d1ed7a83402cb
--- /dev/null
+++ b/src/core/server/deprecations/deprecations_service.test.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 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.
+ */
+
+/* eslint-disable dot-notation */
+import { DeprecationsService } from './deprecations_service';
+import { httpServiceMock } from '../http/http_service.mock';
+import { mockRouter } from '../http/router/router.mock';
+import { mockCoreContext } from '../core_context.mock';
+import { mockDeprecationsFactory } from './deprecations_factory.mock';
+import { mockDeprecationsRegistry } from './deprecations_registry.mock';
+
+describe('DeprecationsService', () => {
+  const coreContext = mockCoreContext.create();
+  beforeEach(() => jest.clearAllMocks());
+
+  describe('#setup', () => {
+    const http = httpServiceMock.createInternalSetupContract();
+    const router = mockRouter.create();
+    http.createRouter.mockReturnValue(router);
+    const deprecationsCoreSetupDeps = { http };
+
+    it('registers routes', () => {
+      const deprecationsService = new DeprecationsService(coreContext);
+      deprecationsService.setup(deprecationsCoreSetupDeps);
+      // Registers correct base api path
+      expect(http.createRouter).toBeCalledWith('/api/deprecations');
+      // registers get route '/'
+      expect(router.get).toHaveBeenCalledTimes(1);
+      expect(router.get).toHaveBeenCalledWith({ path: '/', validate: false }, expect.any(Function));
+    });
+
+    it('calls registerConfigDeprecationsInfo', () => {
+      const deprecationsService = new DeprecationsService(coreContext);
+      const mockRegisterConfigDeprecationsInfo = jest.fn();
+      deprecationsService['registerConfigDeprecationsInfo'] = mockRegisterConfigDeprecationsInfo;
+      deprecationsService.setup(deprecationsCoreSetupDeps);
+      expect(mockRegisterConfigDeprecationsInfo).toBeCalledTimes(1);
+    });
+  });
+
+  describe('#registerConfigDeprecationsInfo', () => {
+    const deprecationsFactory = mockDeprecationsFactory.create();
+    const deprecationsRegistry = mockDeprecationsRegistry.create();
+    const getDeprecationsContext = mockDeprecationsRegistry.createGetDeprecationsContext();
+
+    it('registers config deprecations', () => {
+      const deprecationsService = new DeprecationsService(coreContext);
+      coreContext.configService.getHandledDeprecatedConfigs.mockReturnValue([
+        [
+          'testDomain',
+          [
+            {
+              message: 'testMessage',
+              documentationUrl: 'testDocUrl',
+              correctiveActions: {
+                manualSteps: [
+                  'Using Kibana user management, change all users using the kibana_user role to the kibana_admin role.',
+                  'Using Kibana role-mapping management, change all role-mappings which assing the kibana_user role to the kibana_admin role.',
+                ],
+              },
+            },
+          ],
+        ],
+      ]);
+
+      deprecationsFactory.getRegistry.mockReturnValue(deprecationsRegistry);
+      deprecationsService['registerConfigDeprecationsInfo'](deprecationsFactory);
+
+      expect(coreContext.configService.getHandledDeprecatedConfigs).toBeCalledTimes(1);
+      expect(deprecationsFactory.getRegistry).toBeCalledTimes(1);
+      expect(deprecationsFactory.getRegistry).toBeCalledWith('testDomain');
+      expect(deprecationsRegistry.registerDeprecations).toBeCalledTimes(1);
+      const configDeprecations = deprecationsRegistry.registerDeprecations.mock.calls[0][0].getDeprecations(
+        getDeprecationsContext
+      );
+      expect(configDeprecations).toMatchInlineSnapshot(`
+        Array [
+          Object {
+            "correctiveActions": Object {
+              "manualSteps": Array [
+                "Using Kibana user management, change all users using the kibana_user role to the kibana_admin role.",
+                "Using Kibana role-mapping management, change all role-mappings which assing the kibana_user role to the kibana_admin role.",
+              ],
+            },
+            "deprecationType": "config",
+            "documentationUrl": "testDocUrl",
+            "level": "critical",
+            "message": "testMessage",
+          },
+        ]
+      `);
+    });
+  });
+});
diff --git a/src/core/server/deprecations/deprecations_service.ts b/src/core/server/deprecations/deprecations_service.ts
index 8eca1ba5790c5..ede7f859ffd0d 100644
--- a/src/core/server/deprecations/deprecations_service.ts
+++ b/src/core/server/deprecations/deprecations_service.ts
@@ -11,8 +11,6 @@ import { RegisterDeprecationsConfig } from './types';
 import { registerRoutes } from './routes';
 
 import { CoreContext } from '../core_context';
-import { CoreUsageDataSetup } from '../core_usage_data';
-import { InternalElasticsearchServiceSetup } from '../elasticsearch';
 import { CoreService } from '../../types';
 import { InternalHttpServiceSetup } from '../http';
 import { Logger } from '../logging';
@@ -112,15 +110,13 @@ export interface InternalDeprecationsServiceSetup {
 /** @internal */
 export interface DeprecationsSetupDeps {
   http: InternalHttpServiceSetup;
-  elasticsearch: InternalElasticsearchServiceSetup;
-  coreUsageData: CoreUsageDataSetup;
 }
 
 /** @internal */
 export class DeprecationsService implements CoreService<InternalDeprecationsServiceSetup> {
   private readonly logger: Logger;
 
-  constructor(private readonly coreContext: CoreContext) {
+  constructor(private readonly coreContext: Pick<CoreContext, 'logger' | 'configService'>) {
     this.logger = coreContext.logger.get('deprecations-service');
   }
 
@@ -156,8 +152,9 @@ export class DeprecationsService implements CoreService<InternalDeprecationsServ
           return deprecationsContexts.map(({ message, correctiveActions, documentationUrl }) => {
             return {
               level: 'critical',
+              deprecationType: 'config',
               message,
-              correctiveActions: correctiveActions ?? {},
+              correctiveActions,
               documentationUrl,
             };
           });
diff --git a/src/core/server/deprecations/types.ts b/src/core/server/deprecations/types.ts
index 31734b51b46bd..4c4f84f313102 100644
--- a/src/core/server/deprecations/types.ts
+++ b/src/core/server/deprecations/types.ts
@@ -25,6 +25,16 @@ export interface DeprecationsDetails {
    * - fetch_error: Deprecations service failed to grab the deprecation details for the domain.
    */
   level: 'warning' | 'critical' | 'fetch_error';
+  /**
+   * (optional) Used to identify between different deprecation types.
+   * Example use case: in Upgrade Assistant, we may want to allow the user to sort by
+   * deprecation type or show each type in a separate tab.
+   *
+   * Feel free to add new types if necessary.
+   * Predefined types are necessary to reduce having similar definitions with different keywords
+   * across kibana deprecations.
+   */
+  deprecationType?: 'config' | 'feature';
   /* (optional) link to the documentation for more details on the deprecation. */
   documentationUrl?: string;
   /* corrective action needed to fix this deprecation. */
@@ -45,11 +55,11 @@ export interface DeprecationsDetails {
       };
     };
     /**
-     * (optional) If this deprecation cannot be automtically fixed
-     * via an API corrective action. Specify a list of manual steps
-     * users need to follow to fix the deprecation before upgrade.
+     * Specify a list of manual steps users need to follow to
+     * fix the deprecation before upgrade. Required even if an API
+     * corrective action is set in case the API fails.
      */
-    manualSteps?: string[];
+    manualSteps: string[];
   };
 }
 
diff --git a/src/core/server/elasticsearch/elasticsearch_config.ts b/src/core/server/elasticsearch/elasticsearch_config.ts
index b5ea0ec8c3456..b2b25cda3ac2a 100644
--- a/src/core/server/elasticsearch/elasticsearch_config.ts
+++ b/src/core/server/elasticsearch/elasticsearch_config.ts
@@ -152,23 +152,45 @@ const deprecations: ConfigDeprecationProvider = () => [
     if (es.username === 'elastic') {
       addDeprecation({
         message: `Setting [${fromPath}.username] to "elastic" is deprecated. You should use the "kibana_system" user instead.`,
+        correctiveActions: {
+          manualSteps: [`Replace [${fromPath}.username] from "elastic" to "kibana_system".`],
+        },
       });
     } else if (es.username === 'kibana') {
       addDeprecation({
         message: `Setting [${fromPath}.username] to "kibana" is deprecated. You should use the "kibana_system" user instead.`,
+        correctiveActions: {
+          manualSteps: [`Replace [${fromPath}.username] from "kibana" to "kibana_system".`],
+        },
       });
     }
     if (es.ssl?.key !== undefined && es.ssl?.certificate === undefined) {
       addDeprecation({
         message: `Setting [${fromPath}.ssl.key] without [${fromPath}.ssl.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+        correctiveActions: {
+          manualSteps: [
+            `Set [${fromPath}.ssl.certificate] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+          ],
+        },
       });
     } else if (es.ssl?.certificate !== undefined && es.ssl?.key === undefined) {
       addDeprecation({
         message: `Setting [${fromPath}.ssl.certificate] without [${fromPath}.ssl.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+        correctiveActions: {
+          manualSteps: [
+            `Set [${fromPath}.ssl.key] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+          ],
+        },
       });
     } else if (es.logQueries === true) {
       addDeprecation({
         message: `Setting [${fromPath}.logQueries] is deprecated and no longer used. You should set the log level to "debug" for the "elasticsearch.queries" context in "logging.loggers" or use "logging.verbose: true".`,
+        correctiveActions: {
+          manualSteps: [
+            `Remove Setting [${fromPath}.logQueries] from your kibana configs`,
+            `Set the log level to "debug" for the "elasticsearch.queries" context in "logging.loggers".`,
+          ],
+        },
       });
     }
     return;
diff --git a/src/core/server/elasticsearch/version_check/ensure_es_version.ts b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
index 43cd52f1b5721..e1f18f8ad836a 100644
--- a/src/core/server/elasticsearch/version_check/ensure_es_version.ts
+++ b/src/core/server/elasticsearch/version_check/ensure_es_version.ts
@@ -31,7 +31,7 @@ export interface PollEsNodesVersionOptions {
 interface NodeInfo {
   version: string;
   ip: string;
-  http: {
+  http?: {
     publish_address: string;
   };
   name: string;
diff --git a/src/core/server/http/integration_tests/core_services.test.ts b/src/core/server/http/integration_tests/core_services.test.ts
index 5433f0d3c3e31..99b63fc73687a 100644
--- a/src/core/server/http/integration_tests/core_services.test.ts
+++ b/src/core/server/http/integration_tests/core_services.test.ts
@@ -405,7 +405,7 @@ describe('http service', () => {
 
       const { body } = await kbnTestServer.request.get(root, '/new-platform/').expect(400);
 
-      expect(body.message).toEqual('[error_type]: error_reason');
+      expect(body.message).toMatch('[error_type]: error_reason');
     });
   });
 });
diff --git a/src/core/server/index.ts b/src/core/server/index.ts
index 2e495657d3410..ef1ee69ff529b 100644
--- a/src/core/server/index.ts
+++ b/src/core/server/index.ts
@@ -339,8 +339,6 @@ export type {
   SavedObjectsDeleteByNamespaceOptions,
   SavedObjectsIncrementCounterOptions,
   SavedObjectsIncrementCounterField,
-  SavedObjectsComplexFieldMapping,
-  SavedObjectsCoreFieldMapping,
   SavedObjectsFieldMapping,
   SavedObjectsTypeMappingDefinition,
   SavedObjectsMappingProperties,
diff --git a/src/core/server/kibana_config.test.ts b/src/core/server/kibana_config.test.ts
index 47bb6cf2a064c..72ddb3b65081b 100644
--- a/src/core/server/kibana_config.test.ts
+++ b/src/core/server/kibana_config.test.ts
@@ -22,8 +22,6 @@ it('set correct defaults ', () => {
   const configValue = config.schema.validate({});
   expect(configValue).toMatchInlineSnapshot(`
     Object {
-      "autocompleteTerminateAfter": "PT1M40S",
-      "autocompleteTimeout": "PT1S",
       "enabled": true,
       "index": ".kibana",
     }
diff --git a/src/core/server/kibana_config.ts b/src/core/server/kibana_config.ts
index 848c51dcb69f3..77ee3197b988d 100644
--- a/src/core/server/kibana_config.ts
+++ b/src/core/server/kibana_config.ts
@@ -18,6 +18,12 @@ const deprecations: ConfigDeprecationProvider = () => [
       addDeprecation({
         message: `"kibana.index" is deprecated. Multitenancy by changing "kibana.index" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`,
         documentationUrl: 'https://ela.st/kbn-remove-legacy-multitenancy',
+        correctiveActions: {
+          manualSteps: [
+            `If you rely on this setting to achieve multitenancy you should use Spaces, cross-cluster replication, or cross-cluster search instead.`,
+            `To migrate to Spaces, we encourage using saved object management to export your saved objects from a tenant into the default tenant in a space.`,
+          ],
+        },
       });
     }
     return settings;
@@ -29,12 +35,6 @@ export const config = {
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
     index: schema.string({ defaultValue: '.kibana' }),
-    autocompleteTerminateAfter: schema.duration({ defaultValue: 100000 }),
-    autocompleteTimeout: schema.duration({ defaultValue: 1000 }),
   }),
   deprecations,
-  exposeToUsage: {
-    autocompleteTerminateAfter: true,
-    autocompleteTimeout: true,
-  },
 };
diff --git a/src/core/server/mocks.ts b/src/core/server/mocks.ts
index 6f1b9dc5bf820..0d52ff64499c1 100644
--- a/src/core/server/mocks.ts
+++ b/src/core/server/mocks.ts
@@ -58,8 +58,6 @@ export function pluginInitializerContextConfigMock<T>(config: T) {
   const globalConfig: SharedGlobalConfig = {
     kibana: {
       index: '.kibana-tests',
-      autocompleteTerminateAfter: duration(100000),
-      autocompleteTimeout: duration(1000),
     },
     elasticsearch: {
       shardTimeout: duration('30s'),
diff --git a/src/core/server/plugins/legacy_config.test.ts b/src/core/server/plugins/legacy_config.test.ts
index 0ea26f2e0333e..2a980e38a4e19 100644
--- a/src/core/server/plugins/legacy_config.test.ts
+++ b/src/core/server/plugins/legacy_config.test.ts
@@ -43,8 +43,6 @@ describe('Legacy config', () => {
       expect(legacyConfig).toStrictEqual({
         kibana: {
           index: '.kibana',
-          autocompleteTerminateAfter: duration(100000),
-          autocompleteTimeout: duration(1000),
         },
         elasticsearch: {
           shardTimeout: duration(30, 's'),
@@ -66,8 +64,6 @@ describe('Legacy config', () => {
       expect(legacyConfig).toStrictEqual({
         kibana: {
           index: '.kibana',
-          autocompleteTerminateAfter: duration(100000),
-          autocompleteTimeout: duration(1000),
         },
         elasticsearch: {
           shardTimeout: duration(30, 's'),
diff --git a/src/core/server/plugins/plugin_context.test.ts b/src/core/server/plugins/plugin_context.test.ts
index e37d985d42321..4ba34ccb2149f 100644
--- a/src/core/server/plugins/plugin_context.test.ts
+++ b/src/core/server/plugins/plugin_context.test.ts
@@ -115,8 +115,6 @@ describe('createPluginInitializerContext', () => {
       expect(configObject).toStrictEqual({
         kibana: {
           index: '.kibana',
-          autocompleteTerminateAfter: duration(100000),
-          autocompleteTimeout: duration(1000),
         },
         elasticsearch: {
           shardTimeout: duration(30, 's'),
diff --git a/src/core/server/plugins/types.ts b/src/core/server/plugins/types.ts
index 2b5acd8ed5e94..6b50b5e820665 100644
--- a/src/core/server/plugins/types.ts
+++ b/src/core/server/plugins/types.ts
@@ -313,7 +313,7 @@ export interface AsyncPlugin<
 
 export const SharedGlobalConfigKeys = {
   // We can add more if really needed
-  kibana: ['index', 'autocompleteTerminateAfter', 'autocompleteTimeout'] as const,
+  kibana: ['index'] as const,
   elasticsearch: ['shardTimeout', 'requestTimeout', 'pingTimeout'] as const,
   path: ['data'] as const,
   savedObjects: ['maxImportPayloadBytes'] as const,
diff --git a/src/core/server/saved_objects/export/collect_exported_objects.test.mocks.ts b/src/core/server/saved_objects/export/collect_exported_objects.test.mocks.ts
new file mode 100644
index 0000000000000..1f61788e55650
--- /dev/null
+++ b/src/core/server/saved_objects/export/collect_exported_objects.test.mocks.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 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 applyExportTransformsMock = jest.fn();
+jest.doMock('./apply_export_transforms', () => ({
+  applyExportTransforms: applyExportTransformsMock,
+}));
diff --git a/src/core/server/saved_objects/export/collect_exported_objects.test.ts b/src/core/server/saved_objects/export/collect_exported_objects.test.ts
new file mode 100644
index 0000000000000..0929ff0d40910
--- /dev/null
+++ b/src/core/server/saved_objects/export/collect_exported_objects.test.ts
@@ -0,0 +1,528 @@
+/*
+ * Copyright 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 { applyExportTransformsMock } from './collect_exported_objects.test.mocks';
+import { savedObjectsClientMock } from '../../mocks';
+import { httpServerMock } from '../../http/http_server.mocks';
+import { SavedObject, SavedObjectError } from '../../../types';
+import type { SavedObjectsExportTransform } from './types';
+import { collectExportedObjects } from './collect_exported_objects';
+
+const createObject = (parts: Partial<SavedObject>): SavedObject => ({
+  id: 'id',
+  type: 'type',
+  references: [],
+  attributes: {},
+  ...parts,
+});
+
+const createError = (parts: Partial<SavedObjectError> = {}): SavedObjectError => ({
+  error: 'error',
+  message: 'message',
+  statusCode: 404,
+  ...parts,
+});
+
+const toIdTuple = (obj: SavedObject) => ({ type: obj.type, id: obj.id });
+
+describe('collectExportedObjects', () => {
+  let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
+  let request: ReturnType<typeof httpServerMock.createKibanaRequest>;
+
+  beforeEach(() => {
+    savedObjectsClient = savedObjectsClientMock.create();
+    request = httpServerMock.createKibanaRequest();
+    applyExportTransformsMock.mockImplementation(({ objects }) => objects);
+    savedObjectsClient.bulkGet.mockResolvedValue({ saved_objects: [] });
+  });
+
+  afterEach(() => {
+    applyExportTransformsMock.mockReset();
+    savedObjectsClient.bulkGet.mockReset();
+  });
+
+  describe('when `includeReferences` is `true`', () => {
+    it('calls `applyExportTransforms` with the correct parameters', async () => {
+      const obj1 = createObject({
+        type: 'foo',
+        id: '1',
+      });
+      const obj2 = createObject({
+        type: 'foo',
+        id: '2',
+      });
+
+      const fooTransform: SavedObjectsExportTransform = jest.fn();
+
+      await collectExportedObjects({
+        objects: [obj1, obj2],
+        savedObjectsClient,
+        request,
+        exportTransforms: { foo: fooTransform },
+        includeReferences: true,
+      });
+
+      expect(applyExportTransformsMock).toHaveBeenCalledTimes(1);
+      expect(applyExportTransformsMock).toHaveBeenCalledWith({
+        objects: [obj1, obj2],
+        transforms: { foo: fooTransform },
+        request,
+      });
+    });
+
+    it('returns the collected objects', async () => {
+      const foo1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            type: 'bar',
+            id: '2',
+            name: 'bar-2',
+          },
+        ],
+      });
+      const bar2 = createObject({
+        type: 'bar',
+        id: '2',
+      });
+      const dolly3 = createObject({
+        type: 'dolly',
+        id: '3',
+      });
+
+      applyExportTransformsMock.mockImplementationOnce(({ objects }) => [...objects, dolly3]);
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [bar2],
+      });
+
+      const { objects, missingRefs } = await collectExportedObjects({
+        objects: [foo1],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(missingRefs).toHaveLength(0);
+      expect(objects.map(toIdTuple)).toEqual([foo1, dolly3, bar2].map(toIdTuple));
+    });
+
+    it('returns the missing references', async () => {
+      const foo1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            type: 'bar',
+            id: '2',
+            name: 'bar-2',
+          },
+          {
+            type: 'missing',
+            id: '1',
+            name: 'missing-1',
+          },
+        ],
+      });
+      const bar2 = createObject({
+        type: 'bar',
+        id: '2',
+        references: [
+          {
+            type: 'missing',
+            id: '2',
+            name: 'missing-2',
+          },
+        ],
+      });
+      const missing1 = createObject({
+        type: 'missing',
+        id: '1',
+        error: createError(),
+      });
+      const missing2 = createObject({
+        type: 'missing',
+        id: '2',
+        error: createError(),
+      });
+
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [bar2, missing1],
+      });
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [missing2],
+      });
+
+      const { objects, missingRefs } = await collectExportedObjects({
+        objects: [foo1],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(missingRefs).toEqual([missing1, missing2].map(toIdTuple));
+      expect(objects.map(toIdTuple)).toEqual([foo1, bar2].map(toIdTuple));
+    });
+
+    it('does not call `client.bulkGet` when no objects have references', async () => {
+      const obj1 = createObject({
+        type: 'foo',
+        id: '1',
+      });
+      const obj2 = createObject({
+        type: 'foo',
+        id: '2',
+      });
+
+      const { objects, missingRefs } = await collectExportedObjects({
+        objects: [obj1, obj2],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(missingRefs).toHaveLength(0);
+      expect(objects.map(toIdTuple)).toEqual([
+        {
+          type: 'foo',
+          id: '1',
+        },
+        {
+          type: 'foo',
+          id: '2',
+        },
+      ]);
+
+      expect(savedObjectsClient.bulkGet).not.toHaveBeenCalled();
+    });
+
+    it('calls `applyExportTransforms` for each iteration', async () => {
+      const foo1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            type: 'bar',
+            id: '2',
+            name: 'bar-2',
+          },
+        ],
+      });
+      const bar2 = createObject({
+        type: 'bar',
+        id: '2',
+      });
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [bar2],
+      });
+
+      await collectExportedObjects({
+        objects: [foo1],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith(
+        [toIdTuple(bar2)],
+        expect.any(Object)
+      );
+
+      expect(applyExportTransformsMock).toHaveBeenCalledTimes(2);
+      expect(applyExportTransformsMock).toHaveBeenCalledWith({
+        objects: [foo1],
+        transforms: {},
+        request,
+      });
+      expect(applyExportTransformsMock).toHaveBeenCalledWith({
+        objects: [bar2],
+        transforms: {},
+        request,
+      });
+    });
+
+    it('ignores references that are already included in the export', async () => {
+      const foo1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            type: 'bar',
+            id: '2',
+            name: 'bar-2',
+          },
+        ],
+      });
+      const bar2 = createObject({
+        type: 'bar',
+        id: '2',
+        references: [
+          {
+            type: 'foo',
+            id: '1',
+            name: 'foo-1',
+          },
+          {
+            type: 'dolly',
+            id: '3',
+            name: 'dolly-3',
+          },
+        ],
+      });
+      const dolly3 = createObject({
+        type: 'dolly',
+        id: '3',
+        references: [
+          {
+            type: 'foo',
+            id: '1',
+            name: 'foo-1',
+          },
+        ],
+      });
+
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [bar2],
+      });
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [foo1, dolly3],
+      });
+
+      const { objects } = await collectExportedObjects({
+        objects: [foo1],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(2);
+      expect(savedObjectsClient.bulkGet).toHaveBeenNthCalledWith(
+        1,
+        [toIdTuple(bar2)],
+        expect.any(Object)
+      );
+      expect(savedObjectsClient.bulkGet).toHaveBeenNthCalledWith(
+        2,
+        [toIdTuple(dolly3)],
+        expect.any(Object)
+      );
+
+      expect(objects.map(toIdTuple)).toEqual([foo1, bar2, dolly3].map(toIdTuple));
+    });
+
+    it('does not fetch duplicates of references', async () => {
+      const foo1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            type: 'dolly',
+            id: '3',
+            name: 'dolly-3',
+          },
+          {
+            type: 'baz',
+            id: '4',
+            name: 'baz-4',
+          },
+        ],
+      });
+      const bar2 = createObject({
+        type: 'bar',
+        id: '2',
+        references: [
+          {
+            type: 'dolly',
+            id: '3',
+            name: 'dolly-3',
+          },
+        ],
+      });
+      const dolly3 = createObject({
+        type: 'dolly',
+        id: '3',
+      });
+      const baz4 = createObject({
+        type: 'baz',
+        id: '4',
+      });
+
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [dolly3, baz4],
+      });
+
+      await collectExportedObjects({
+        objects: [foo1, bar2],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith(
+        [dolly3, baz4].map(toIdTuple),
+        expect.any(Object)
+      );
+    });
+
+    it('fetch references for additional objects returned by the export transform', async () => {
+      const foo1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            type: 'baz',
+            id: '4',
+            name: 'baz-4',
+          },
+        ],
+      });
+      const bar2 = createObject({
+        type: 'bar',
+        id: '2',
+        references: [
+          {
+            type: 'dolly',
+            id: '3',
+            name: 'dolly-3',
+          },
+        ],
+      });
+
+      applyExportTransformsMock.mockImplementationOnce(({ objects }) => [...objects, bar2]);
+
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [],
+      });
+
+      await collectExportedObjects({
+        objects: [foo1],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(1);
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledWith(
+        [
+          { type: 'baz', id: '4' },
+          { type: 'dolly', id: '3' },
+        ],
+        expect.any(Object)
+      );
+    });
+
+    it('fetch references for additional objects returned by the export transform of nested references', async () => {
+      const foo1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            type: 'bar',
+            id: '2',
+            name: 'bar-2',
+          },
+        ],
+      });
+      const bar2 = createObject({
+        type: 'bar',
+        id: '2',
+        references: [],
+      });
+      const dolly3 = createObject({
+        type: 'dolly',
+        id: '3',
+        references: [
+          {
+            type: 'baz',
+            id: '4',
+            name: 'baz-4',
+          },
+        ],
+      });
+      const baz4 = createObject({
+        type: 'baz',
+        id: '4',
+      });
+
+      // first call for foo-1
+      applyExportTransformsMock.mockImplementationOnce(({ objects }) => [...objects]);
+      // second call for bar-2
+      applyExportTransformsMock.mockImplementationOnce(({ objects }) => [...objects, dolly3]);
+
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [bar2],
+      });
+      savedObjectsClient.bulkGet.mockResolvedValueOnce({
+        saved_objects: [baz4],
+      });
+
+      await collectExportedObjects({
+        objects: [foo1],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: true,
+      });
+
+      expect(savedObjectsClient.bulkGet).toHaveBeenCalledTimes(2);
+      expect(savedObjectsClient.bulkGet).toHaveBeenNthCalledWith(
+        1,
+        [toIdTuple(bar2)],
+        expect.any(Object)
+      );
+      expect(savedObjectsClient.bulkGet).toHaveBeenNthCalledWith(
+        2,
+        [toIdTuple(baz4)],
+        expect.any(Object)
+      );
+    });
+  });
+
+  describe('when `includeReferences` is `false`', () => {
+    it('does not fetch the object references', async () => {
+      const obj1 = createObject({
+        type: 'foo',
+        id: '1',
+        references: [
+          {
+            id: '2',
+            type: 'bar',
+            name: 'bar-2',
+          },
+        ],
+      });
+
+      const { objects, missingRefs } = await collectExportedObjects({
+        objects: [obj1],
+        savedObjectsClient,
+        request,
+        exportTransforms: {},
+        includeReferences: false,
+      });
+
+      expect(missingRefs).toHaveLength(0);
+      expect(objects.map(toIdTuple)).toEqual([
+        {
+          type: 'foo',
+          id: '1',
+        },
+      ]);
+
+      expect(savedObjectsClient.bulkGet).not.toHaveBeenCalled();
+    });
+  });
+});
diff --git a/src/core/server/saved_objects/export/collect_exported_objects.ts b/src/core/server/saved_objects/export/collect_exported_objects.ts
new file mode 100644
index 0000000000000..d45782a83c284
--- /dev/null
+++ b/src/core/server/saved_objects/export/collect_exported_objects.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { SavedObject } from '../../../types';
+import type { KibanaRequest } from '../../http';
+import { SavedObjectsClientContract } from '../types';
+import type { SavedObjectsExportTransform } from './types';
+import { applyExportTransforms } from './apply_export_transforms';
+
+interface CollectExportedObjectOptions {
+  savedObjectsClient: SavedObjectsClientContract;
+  objects: SavedObject[];
+  /** flag to also include all related saved objects in the export stream. */
+  includeReferences?: boolean;
+  /** optional namespace to override the namespace used by the savedObjectsClient. */
+  namespace?: string;
+  /** The http request initiating the export. */
+  request: KibanaRequest;
+  /** export transform per type */
+  exportTransforms: Record<string, SavedObjectsExportTransform>;
+}
+
+interface CollectExportedObjectResult {
+  objects: SavedObject[];
+  missingRefs: CollectedReference[];
+}
+
+export const collectExportedObjects = async ({
+  objects,
+  includeReferences = true,
+  namespace,
+  request,
+  exportTransforms,
+  savedObjectsClient,
+}: CollectExportedObjectOptions): Promise<CollectExportedObjectResult> => {
+  const collectedObjects: SavedObject[] = [];
+  const collectedMissingRefs: CollectedReference[] = [];
+  const alreadyProcessed: Set<string> = new Set();
+
+  let currentObjects = objects;
+  do {
+    const transformed = (
+      await applyExportTransforms({
+        request,
+        objects: currentObjects,
+        transforms: exportTransforms,
+      })
+    ).filter((object) => !alreadyProcessed.has(objKey(object)));
+
+    transformed.forEach((obj) => alreadyProcessed.add(objKey(obj)));
+    collectedObjects.push(...transformed);
+
+    if (includeReferences) {
+      const references = collectReferences(transformed, alreadyProcessed);
+      if (references.length) {
+        const { objects: fetchedObjects, missingRefs } = await fetchReferences({
+          references,
+          namespace,
+          client: savedObjectsClient,
+        });
+        collectedMissingRefs.push(...missingRefs);
+        currentObjects = fetchedObjects;
+      } else {
+        currentObjects = [];
+      }
+    } else {
+      currentObjects = [];
+    }
+  } while (includeReferences && currentObjects.length);
+
+  return {
+    objects: collectedObjects,
+    missingRefs: collectedMissingRefs,
+  };
+};
+
+const objKey = (obj: { type: string; id: string }) => `${obj.type}:${obj.id}`;
+
+type ObjectKey = string;
+
+interface CollectedReference {
+  id: string;
+  type: string;
+}
+
+const collectReferences = (
+  objects: SavedObject[],
+  alreadyProcessed: Set<ObjectKey>
+): CollectedReference[] => {
+  const references: Map<string, CollectedReference> = new Map();
+  objects.forEach((obj) => {
+    obj.references?.forEach((ref) => {
+      const refKey = objKey(ref);
+      if (!alreadyProcessed.has(refKey)) {
+        references.set(refKey, { type: ref.type, id: ref.id });
+      }
+    });
+  });
+  return [...references.values()];
+};
+
+interface FetchReferencesResult {
+  objects: SavedObject[];
+  missingRefs: CollectedReference[];
+}
+
+const fetchReferences = async ({
+  references,
+  client,
+  namespace,
+}: {
+  references: CollectedReference[];
+  client: SavedObjectsClientContract;
+  namespace?: string;
+}): Promise<FetchReferencesResult> => {
+  const { saved_objects: savedObjects } = await client.bulkGet(references, { namespace });
+  return {
+    objects: savedObjects.filter((obj) => !obj.error),
+    missingRefs: savedObjects
+      .filter((obj) => obj.error)
+      .map((obj) => ({ type: obj.type, id: obj.id })),
+  };
+};
diff --git a/src/core/server/saved_objects/export/fetch_nested_dependencies.test.ts b/src/core/server/saved_objects/export/fetch_nested_dependencies.test.ts
deleted file mode 100644
index a47c629f9066b..0000000000000
--- a/src/core/server/saved_objects/export/fetch_nested_dependencies.test.ts
+++ /dev/null
@@ -1,606 +0,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 { SavedObject } from '../types';
-import { savedObjectsClientMock } from '../../mocks';
-import { getObjectReferencesToFetch, fetchNestedDependencies } from './fetch_nested_dependencies';
-import { SavedObjectsErrorHelpers } from '..';
-
-describe('getObjectReferencesToFetch()', () => {
-  test('works with no saved objects', () => {
-    const map = new Map<string, SavedObject>();
-    const result = getObjectReferencesToFetch(map);
-    expect(result).toEqual([]);
-  });
-
-  test('excludes already fetched objects', () => {
-    const map = new Map<string, SavedObject>();
-    map.set('index-pattern:1', {
-      id: '1',
-      type: 'index-pattern',
-      attributes: {},
-      references: [],
-    });
-    map.set('visualization:2', {
-      id: '2',
-      type: 'visualization',
-      attributes: {},
-      references: [
-        {
-          name: 'ref_0',
-          type: 'index-pattern',
-          id: '1',
-        },
-      ],
-    });
-    const result = getObjectReferencesToFetch(map);
-    expect(result).toEqual([]);
-  });
-
-  test('returns objects that are missing', () => {
-    const map = new Map<string, SavedObject>();
-    map.set('visualization:2', {
-      id: '2',
-      type: 'visualization',
-      attributes: {},
-      references: [
-        {
-          name: 'ref_0',
-          type: 'index-pattern',
-          id: '1',
-        },
-      ],
-    });
-    const result = getObjectReferencesToFetch(map);
-    expect(result).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "id": "1",
-          "type": "index-pattern",
-        },
-      ]
-    `);
-  });
-
-  test('does not fail on circular dependencies', () => {
-    const map = new Map<string, SavedObject>();
-    map.set('index-pattern:1', {
-      id: '1',
-      type: 'index-pattern',
-      attributes: {},
-      references: [
-        {
-          name: 'ref_0',
-          type: 'visualization',
-          id: '2',
-        },
-      ],
-    });
-    map.set('visualization:2', {
-      id: '2',
-      type: 'visualization',
-      attributes: {},
-      references: [
-        {
-          name: 'ref_0',
-          type: 'index-pattern',
-          id: '1',
-        },
-      ],
-    });
-    const result = getObjectReferencesToFetch(map);
-    expect(result).toEqual([]);
-  });
-});
-
-describe('injectNestedDependencies', () => {
-  const savedObjectsClient = savedObjectsClientMock.create();
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
-  test(`doesn't fetch when no dependencies are missing`, async () => {
-    const savedObjects = [
-      {
-        id: '1',
-        type: 'index-pattern',
-        attributes: {},
-        references: [],
-      },
-    ];
-    const result = await fetchNestedDependencies(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "missingRefs": Array [],
-        "objects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [],
-            "type": "index-pattern",
-          },
-        ],
-      }
-    `);
-  });
-
-  test(`doesn't fetch references that are already fetched`, async () => {
-    const savedObjects = [
-      {
-        id: '1',
-        type: 'index-pattern',
-        attributes: {},
-        references: [],
-      },
-      {
-        id: '2',
-        type: 'search',
-        attributes: {},
-        references: [
-          {
-            name: 'ref_0',
-            type: 'index-pattern',
-            id: '1',
-          },
-        ],
-      },
-    ];
-    const result = await fetchNestedDependencies(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "missingRefs": Array [],
-        "objects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [],
-            "type": "index-pattern",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "2",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "search",
-          },
-        ],
-      }
-    `);
-  });
-
-  test('fetches dependencies at least one level deep', async () => {
-    const savedObjects = [
-      {
-        id: '2',
-        type: 'search',
-        attributes: {},
-        references: [
-          {
-            name: 'ref_0',
-            type: 'index-pattern',
-            id: '1',
-          },
-        ],
-      },
-    ];
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          id: '1',
-          type: 'index-pattern',
-          attributes: {},
-          references: [],
-        },
-      ],
-    });
-    const result = await fetchNestedDependencies(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "missingRefs": Array [],
-        "objects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "2",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "search",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [],
-            "type": "index-pattern",
-          },
-        ],
-      }
-    `);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "id": "1",
-                "type": "index-pattern",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
-
-  test('fetches dependencies multiple levels deep', async () => {
-    const savedObjects = [
-      {
-        id: '5',
-        type: 'dashboard',
-        attributes: {},
-        references: [
-          {
-            name: 'panel_0',
-            type: 'visualization',
-            id: '4',
-          },
-          {
-            name: 'panel_1',
-            type: 'visualization',
-            id: '3',
-          },
-        ],
-      },
-    ];
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          id: '4',
-          type: 'visualization',
-          attributes: {},
-          references: [
-            {
-              name: 'ref_0',
-              type: 'search',
-              id: '2',
-            },
-          ],
-        },
-        {
-          id: '3',
-          type: 'visualization',
-          attributes: {},
-          references: [
-            {
-              name: 'ref_0',
-              type: 'index-pattern',
-              id: '1',
-            },
-          ],
-        },
-      ],
-    });
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          id: '2',
-          type: 'search',
-          attributes: {},
-          references: [
-            {
-              name: 'ref_0',
-              type: 'index-pattern',
-              id: '1',
-            },
-          ],
-        },
-        {
-          id: '1',
-          type: 'index-pattern',
-          attributes: {},
-          references: [],
-        },
-      ],
-    });
-    const result = await fetchNestedDependencies(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "missingRefs": Array [],
-        "objects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "5",
-            "references": Array [
-              Object {
-                "id": "4",
-                "name": "panel_0",
-                "type": "visualization",
-              },
-              Object {
-                "id": "3",
-                "name": "panel_1",
-                "type": "visualization",
-              },
-            ],
-            "type": "dashboard",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "4",
-            "references": Array [
-              Object {
-                "id": "2",
-                "name": "ref_0",
-                "type": "search",
-              },
-            ],
-            "type": "visualization",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "3",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "visualization",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "2",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "search",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [],
-            "type": "index-pattern",
-          },
-        ],
-      }
-    `);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "id": "4",
-                "type": "visualization",
-              },
-              Object {
-                "id": "3",
-                "type": "visualization",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-          Array [
-            Array [
-              Object {
-                "id": "2",
-                "type": "search",
-              },
-              Object {
-                "id": "1",
-                "type": "index-pattern",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
-
-  test('returns list of missing references', async () => {
-    const savedObjects = [
-      {
-        id: '1',
-        type: 'search',
-        attributes: {},
-        references: [
-          {
-            name: 'ref_0',
-            type: 'index-pattern',
-            id: '1',
-          },
-          {
-            name: 'ref_1',
-            type: 'index-pattern',
-            id: '2',
-          },
-        ],
-      },
-    ];
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          id: '1',
-          type: 'index-pattern',
-          error: SavedObjectsErrorHelpers.createGenericNotFoundError('index-pattern', '1').output
-            .payload,
-          attributes: {},
-          references: [],
-        },
-        {
-          id: '2',
-          type: 'index-pattern',
-          attributes: {},
-          references: [],
-        },
-      ],
-    });
-    const result = await fetchNestedDependencies(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "missingRefs": Array [
-          Object {
-            "id": "1",
-            "type": "index-pattern",
-          },
-        ],
-        "objects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-              Object {
-                "id": "2",
-                "name": "ref_1",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "search",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "2",
-            "references": Array [],
-            "type": "index-pattern",
-          },
-        ],
-      }
-    `);
-  });
-
-  test('does not fail on circular dependencies', async () => {
-    const savedObjects = [
-      {
-        id: '2',
-        type: 'search',
-        attributes: {},
-        references: [
-          {
-            name: 'ref_0',
-            type: 'index-pattern',
-            id: '1',
-          },
-        ],
-      },
-    ];
-    savedObjectsClient.bulkGet.mockResolvedValueOnce({
-      saved_objects: [
-        {
-          id: '1',
-          type: 'index-pattern',
-          attributes: {},
-          references: [
-            {
-              name: 'ref_0',
-              type: 'search',
-              id: '2',
-            },
-          ],
-        },
-      ],
-    });
-    const result = await fetchNestedDependencies(savedObjects, savedObjectsClient);
-    expect(result).toMatchInlineSnapshot(`
-      Object {
-        "missingRefs": Array [],
-        "objects": Array [
-          Object {
-            "attributes": Object {},
-            "id": "2",
-            "references": Array [
-              Object {
-                "id": "1",
-                "name": "ref_0",
-                "type": "index-pattern",
-              },
-            ],
-            "type": "search",
-          },
-          Object {
-            "attributes": Object {},
-            "id": "1",
-            "references": Array [
-              Object {
-                "id": "2",
-                "name": "ref_0",
-                "type": "search",
-              },
-            ],
-            "type": "index-pattern",
-          },
-        ],
-      }
-    `);
-    expect(savedObjectsClient.bulkGet).toMatchInlineSnapshot(`
-      [MockFunction] {
-        "calls": Array [
-          Array [
-            Array [
-              Object {
-                "id": "1",
-                "type": "index-pattern",
-              },
-            ],
-            Object {
-              "namespace": undefined,
-            },
-          ],
-        ],
-        "results": Array [
-          Object {
-            "type": "return",
-            "value": Promise {},
-          },
-        ],
-      }
-    `);
-  });
-});
diff --git a/src/core/server/saved_objects/export/fetch_nested_dependencies.ts b/src/core/server/saved_objects/export/fetch_nested_dependencies.ts
deleted file mode 100644
index 778c01804b893..0000000000000
--- a/src/core/server/saved_objects/export/fetch_nested_dependencies.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { SavedObject, SavedObjectsClientContract } from '../types';
-
-export function getObjectReferencesToFetch(savedObjectsMap: Map<string, SavedObject>) {
-  const objectsToFetch = new Map<string, { type: string; id: string }>();
-  for (const savedObject of savedObjectsMap.values()) {
-    for (const ref of savedObject.references || []) {
-      if (!savedObjectsMap.has(objKey(ref))) {
-        objectsToFetch.set(objKey(ref), { type: ref.type, id: ref.id });
-      }
-    }
-  }
-  return [...objectsToFetch.values()];
-}
-
-export async function fetchNestedDependencies(
-  savedObjects: SavedObject[],
-  savedObjectsClient: SavedObjectsClientContract,
-  namespace?: string
-) {
-  const savedObjectsMap = new Map<string, SavedObject>();
-  for (const savedObject of savedObjects) {
-    savedObjectsMap.set(objKey(savedObject), savedObject);
-  }
-  let objectsToFetch = getObjectReferencesToFetch(savedObjectsMap);
-  while (objectsToFetch.length > 0) {
-    const bulkGetResponse = await savedObjectsClient.bulkGet(objectsToFetch, { namespace });
-    // Push to array result
-    for (const savedObject of bulkGetResponse.saved_objects) {
-      savedObjectsMap.set(objKey(savedObject), savedObject);
-    }
-    objectsToFetch = getObjectReferencesToFetch(savedObjectsMap);
-  }
-  const allObjects = [...savedObjectsMap.values()];
-  return {
-    objects: allObjects.filter((obj) => !obj.error),
-    missingRefs: allObjects
-      .filter((obj) => !!obj.error)
-      .map((obj) => ({ type: obj.type, id: obj.id })),
-  };
-}
-
-const objKey = (obj: { type: string; id: string }) => `${obj.type}:${obj.id}`;
diff --git a/src/core/server/saved_objects/export/saved_objects_exporter.ts b/src/core/server/saved_objects/export/saved_objects_exporter.ts
index 8cd6934bf1af9..9d56bb4872a6d 100644
--- a/src/core/server/saved_objects/export/saved_objects_exporter.ts
+++ b/src/core/server/saved_objects/export/saved_objects_exporter.ts
@@ -12,7 +12,6 @@ import { Logger } from '../../logging';
 import { SavedObject, SavedObjectsClientContract } from '../types';
 import { SavedObjectsFindResult } from '../service';
 import { ISavedObjectTypeRegistry } from '../saved_objects_type_registry';
-import { fetchNestedDependencies } from './fetch_nested_dependencies';
 import { sortObjects } from './sort_objects';
 import {
   SavedObjectsExportResultDetails,
@@ -22,7 +21,7 @@ import {
   SavedObjectsExportTransform,
 } from './types';
 import { SavedObjectsExportError } from './errors';
-import { applyExportTransforms } from './apply_export_transforms';
+import { collectExportedObjects } from './collect_exported_objects';
 import { byIdAscComparator, getPreservedOrderComparator, SavedObjectComparator } from './utils';
 
 /**
@@ -118,28 +117,21 @@ export class SavedObjectsExporter {
     }: SavedObjectExportBaseOptions
   ) {
     this.#log.debug(`Processing [${savedObjects.length}] saved objects.`);
-    let exportedObjects: Array<SavedObject<unknown>>;
-    let missingReferences: SavedObjectsExportResultDetails['missingReferences'] = [];
 
-    savedObjects = await applyExportTransforms({
-      request,
+    const {
+      objects: collectedObjects,
+      missingRefs: missingReferences,
+    } = await collectExportedObjects({
       objects: savedObjects,
-      transforms: this.#exportTransforms,
-      sortFunction,
+      includeReferences: includeReferencesDeep,
+      namespace,
+      request,
+      exportTransforms: this.#exportTransforms,
+      savedObjectsClient: this.#savedObjectsClient,
     });
 
-    if (includeReferencesDeep) {
-      this.#log.debug(`Fetching saved objects references.`);
-      const fetchResult = await fetchNestedDependencies(
-        savedObjects,
-        this.#savedObjectsClient,
-        namespace
-      );
-      exportedObjects = sortObjects(fetchResult.objects);
-      missingReferences = fetchResult.missingRefs;
-    } else {
-      exportedObjects = sortObjects(savedObjects);
-    }
+    // sort with the provided sort function then with the default export sorting
+    const exportedObjects = sortObjects(collectedObjects.sort(sortFunction));
 
     // redact attributes that should not be exported
     const redactedObjects = includeNamespaces
diff --git a/src/core/server/saved_objects/index.ts b/src/core/server/saved_objects/index.ts
index 2af25e0cdef3f..b1b1584d7de88 100644
--- a/src/core/server/saved_objects/index.ts
+++ b/src/core/server/saved_objects/index.ts
@@ -72,8 +72,6 @@ export type {
 } from './service/lib/repository';
 
 export type {
-  SavedObjectsCoreFieldMapping,
-  SavedObjectsComplexFieldMapping,
   SavedObjectsFieldMapping,
   SavedObjectsMappingProperties,
   SavedObjectsTypeMappingDefinition,
diff --git a/src/core/server/saved_objects/mappings/index.ts b/src/core/server/saved_objects/mappings/index.ts
index bf1029e9f3b81..5da185ace79c6 100644
--- a/src/core/server/saved_objects/mappings/index.ts
+++ b/src/core/server/saved_objects/mappings/index.ts
@@ -8,8 +8,6 @@
 
 export { getTypes, getProperty, getRootProperties, getRootPropertiesObjects } from './lib';
 export type {
-  SavedObjectsComplexFieldMapping,
-  SavedObjectsCoreFieldMapping,
   SavedObjectsTypeMappingDefinition,
   SavedObjectsTypeMappingDefinitions,
   SavedObjectsMappingProperties,
diff --git a/src/core/server/saved_objects/mappings/lib/get_property.test.ts b/src/core/server/saved_objects/mappings/lib/get_property.test.ts
index dab712bbb87ad..8732b5e07d3fa 100644
--- a/src/core/server/saved_objects/mappings/lib/get_property.test.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_property.test.ts
@@ -34,7 +34,7 @@ const MAPPINGS = {
       },
     },
   },
-};
+} as const;
 
 function runTest(key: string | string[], mapping: IndexMapping | SavedObjectsFieldMapping) {
   expect(typeof key === 'string' || Array.isArray(key)).toBeTruthy();
diff --git a/src/core/server/saved_objects/mappings/lib/get_property.ts b/src/core/server/saved_objects/mappings/lib/get_property.ts
index c2daa1e70a898..2a9993bc175ca 100644
--- a/src/core/server/saved_objects/mappings/lib/get_property.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_property.ts
@@ -7,7 +7,7 @@
  */
 
 import { toPath } from 'lodash';
-import { SavedObjectsCoreFieldMapping, SavedObjectsFieldMapping, IndexMapping } from '../types';
+import { SavedObjectsFieldMapping, IndexMapping } from '../types';
 
 function getPropertyMappingFromObjectMapping(
   mapping: IndexMapping | SavedObjectsFieldMapping,
@@ -15,7 +15,7 @@ function getPropertyMappingFromObjectMapping(
 ): SavedObjectsFieldMapping | undefined {
   const props =
     (mapping && (mapping as IndexMapping).properties) ||
-    (mapping && (mapping as SavedObjectsCoreFieldMapping).fields);
+    (mapping && (mapping as SavedObjectsFieldMapping).fields);
 
   if (!props) {
     return undefined;
diff --git a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts
index 2daca3a1fdd83..cbc6808418bc0 100644
--- a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.test.ts
@@ -15,7 +15,7 @@ test(`returns single object with properties`, () => {
         properties: {},
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -32,7 +32,7 @@ test(`returns single object with type === 'object'`, () => {
         type: 'object',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -75,7 +75,7 @@ test(`returns two objects with type === 'object'`, () => {
         type: 'object',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -95,7 +95,7 @@ test(`excludes objects without properties and type of keyword`, () => {
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({});
@@ -111,7 +111,7 @@ test(`excludes two objects without properties and type of keyword`, () => {
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({});
@@ -127,7 +127,7 @@ test(`includes one object with properties and excludes one object without proper
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -147,7 +147,7 @@ test(`includes one object with type === 'object' and excludes one object without
         type: 'keyword',
       },
     },
-  };
+  } as const;
 
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
@@ -170,7 +170,7 @@ test('excludes references and migrationVersion which are part of the blacklist',
         type: 'object',
       },
     },
-  };
+  } as const;
   const result = getRootPropertiesObjects(mappings);
   expect(result).toEqual({
     foo: {
diff --git a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts
index 3a25865c03b26..54ea4eafc186f 100644
--- a/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts
+++ b/src/core/server/saved_objects/mappings/lib/get_root_properties_objects.ts
@@ -6,11 +6,7 @@
  * Side Public License, v 1.
  */
 
-import {
-  SavedObjectsComplexFieldMapping,
-  IndexMapping,
-  SavedObjectsMappingProperties,
-} from '../types';
+import { SavedObjectsFieldMapping, IndexMapping, SavedObjectsMappingProperties } from '../types';
 import { getRootProperties } from './get_root_properties';
 
 /**
@@ -36,7 +32,7 @@ export function getRootPropertiesObjects(mappings: IndexMapping) {
     // we consider the existence of the properties or type of object to designate that this is an object datatype
     if (
       !omittedRootProps.includes(key) &&
-      ((value as SavedObjectsComplexFieldMapping).properties || value.type === 'object')
+      ((value as SavedObjectsFieldMapping).properties || value.type === 'object')
     ) {
       acc[key] = value;
     }
diff --git a/src/core/server/saved_objects/mappings/types.ts b/src/core/server/saved_objects/mappings/types.ts
index 25fb61de93518..e2ad2a91fd000 100644
--- a/src/core/server/saved_objects/mappings/types.ts
+++ b/src/core/server/saved_objects/mappings/types.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { estypes } from '@elastic/elasticsearch';
 /**
  * Describe a saved object type mapping.
  *
@@ -96,9 +97,17 @@ export interface SavedObjectsMappingProperties {
  *
  * @public
  */
-export type SavedObjectsFieldMapping =
-  | SavedObjectsCoreFieldMapping
-  | SavedObjectsComplexFieldMapping;
+export type SavedObjectsFieldMapping = estypes.MappingProperty & {
+  /**
+   * The dynamic property of the mapping, either `false` or `'strict'`. If
+   * unspecified `dynamic: 'strict'` will be inherited from the top-level
+   * index mappings.
+   *
+   * Note: To limit the number of mapping fields Saved Object types should
+   * *never* use `dynamic: true`.
+   */
+  dynamic?: false | 'strict';
+};
 
 /** @internal */
 export interface IndexMapping {
@@ -114,42 +123,3 @@ export interface IndexMappingMeta {
   // the md5 hash of that mapping's value when the index was created.
   migrationMappingPropertyHashes?: { [k: string]: string };
 }
-
-/**
- * See {@link SavedObjectsFieldMapping} for documentation.
- *
- * @public
- */
-export interface SavedObjectsCoreFieldMapping {
-  type: string;
-  null_value?: number | boolean | string;
-  index?: boolean;
-  doc_values?: boolean;
-  fields?: {
-    [subfield: string]: {
-      type: string;
-      ignore_above?: number;
-    };
-  };
-}
-
-/**
- * See {@link SavedObjectsFieldMapping} for documentation.
- *
- * @public
- */
-export interface SavedObjectsComplexFieldMapping {
-  /**
-   * The dynamic property of the mapping, either `false` or `'strict'`. If
-   * unspecified `dynamic: 'strict'` will be inherited from the top-level
-   * index mappings.
-   *
-   * Note: To limit the number of mapping fields Saved Object types should
-   * *never* use `dynamic: true`.
-   */
-  dynamic?: false | 'strict';
-  enabled?: boolean;
-  doc_values?: boolean;
-  type?: string;
-  properties: SavedObjectsMappingProperties;
-}
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 5465da2f620ad..a39fff20abbe7 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
@@ -19,19 +19,19 @@ describe('buildActiveMappings', () => {
     const properties = {
       aaa: { type: 'text' },
       bbb: { type: 'long' },
-    };
+    } as const;
 
     expect(buildActiveMappings(properties)).toMatchSnapshot();
   });
 
   test('disallows duplicate mappings', () => {
-    const properties = { type: { type: 'long' } };
+    const properties = { type: { type: 'long' } } as const;
 
     expect(() => buildActiveMappings(properties)).toThrow(/Cannot redefine core mapping \"type\"/);
   });
 
   test('disallows mappings with leading underscore', () => {
-    const properties = { _hm: { type: 'keyword' } };
+    const properties = { _hm: { type: 'keyword' } } as const;
 
     expect(() => buildActiveMappings(properties)).toThrow(
       /Invalid mapping \"_hm\"\. Mappings cannot start with _/
@@ -60,7 +60,7 @@ describe('buildActiveMappings', () => {
       aaa: { type: 'keyword', fields: { a: { type: 'keyword' }, b: { type: 'text' } } },
       bbb: { fields: { b: { type: 'text' }, a: { type: 'keyword' } }, type: 'keyword' },
       ccc: { fields: { b: { type: 'text' }, a: { type: 'text' } }, type: 'keyword' },
-    };
+    } as const;
 
     const mappings = buildActiveMappings(properties);
     const hashes = mappings._meta!.migrationMappingPropertyHashes!;
diff --git a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
index c7a3251e33ab1..731b7f8c029c2 100644
--- a/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
+++ b/src/core/server/saved_objects/migrations/core/build_index_map.test.ts
@@ -36,7 +36,7 @@ test('mappings without index pattern goes to default index', () => {
       type1: {
         properties: {
           field1: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
@@ -48,7 +48,7 @@ test('mappings without index pattern goes to default index', () => {
         type1: {
           properties: {
             field1: {
-              type: 'string',
+              type: 'text',
             },
           },
         },
@@ -69,7 +69,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
       type1: {
         properties: {
           field1: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
@@ -81,7 +81,7 @@ test(`mappings with custom index pattern doesn't go to default index`, () => {
         type1: {
           properties: {
             field1: {
-              type: 'string',
+              type: 'text',
             },
           },
         },
@@ -103,7 +103,7 @@ test('creating a script gets added to the index pattern', () => {
       type1: {
         properties: {
           field1: {
-            type: 'string',
+            type: 'text',
           },
         },
       },
@@ -116,7 +116,7 @@ test('creating a script gets added to the index pattern', () => {
         type1: {
           properties: {
             field1: {
-              type: 'string',
+              type: 'text',
             },
           },
         },
@@ -144,18 +144,18 @@ test('throws when two scripts are defined for an index pattern', () => {
     type1: {
       properties: {
         field1: {
-          type: 'string',
+          type: 'text',
         },
       },
     },
     type2: {
       properties: {
         field1: {
-          type: 'string',
+          type: 'text',
         },
       },
     },
-  };
+  } as const;
   expect(() =>
     createIndexMap({
       kibanaIndexName: defaultIndex,
diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
index 1d2ec6abc0dd1..c9c24cc85a452 100644
--- a/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
+++ b/src/core/server/saved_objects/migrations/core/elastic_index.test.ts
@@ -40,10 +40,10 @@ describe('ElasticIndex', () => {
         return elasticsearchClientMock.createSuccessTransportRequestPromise({
           [index]: {
             aliases: { foo: index },
-            mappings: { dynamic: 'strict', properties: { a: 'b' } },
+            mappings: { dynamic: 'strict', properties: { a: 'b' } as any },
             settings: {},
           },
-        } as estypes.GetIndexResponse);
+        } as estypes.IndicesGetResponse);
       });
 
       const info = await Index.fetchInfo(client, '.baz');
@@ -164,7 +164,7 @@ describe('ElasticIndex', () => {
       client.tasks.get.mockResolvedValue(
         elasticsearchClientMock.createSuccessTransportRequestPromise({
           completed: true,
-        } as estypes.GetTaskResponse)
+        } as estypes.TaskGetResponse)
       );
 
       const info = {
@@ -175,7 +175,7 @@ describe('ElasticIndex', () => {
           dynamic: 'strict' as const,
           properties: { foo: { type: 'keyword' } },
         },
-      };
+      } as const;
 
       await Index.convertToAlias(
         client,
@@ -248,7 +248,7 @@ describe('ElasticIndex', () => {
             reason: 'all shards failed',
             failed_shards: [],
           },
-        } as estypes.GetTaskResponse)
+        } as estypes.TaskGetResponse)
       );
 
       const info = {
diff --git a/src/core/server/saved_objects/migrations/core/elastic_index.ts b/src/core/server/saved_objects/migrations/core/elastic_index.ts
index 76fdd5e73d804..296a4cee07c11 100644
--- a/src/core/server/saved_objects/migrations/core/elastic_index.ts
+++ b/src/core/server/saved_objects/migrations/core/elastic_index.ts
@@ -32,7 +32,7 @@ export interface FullIndexInfo {
 // saved objects which are no longer used. These saved objects will still be
 // kept in the outdated index for backup purposes, but won't be available in
 // the upgraded index.
-export const excludeUnusedTypesQuery: estypes.QueryContainer = {
+export const excludeUnusedTypesQuery: estypes.QueryDslQueryContainer = {
   bool: {
     must_not: [
       // https://github.com/elastic/kibana/issues/91869
@@ -401,7 +401,6 @@ async function reindex(
       task_id: String(task),
     });
 
-    // @ts-expect-error @elastic/elasticsearch GetTaskResponse doesn't contain `error` property
     const e = body.error;
     if (e) {
       throw new Error(`Re-index failed [${e.type}] ${e.reason} :: ${JSON.stringify(e)}`);
diff --git a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
index fcc03f363139b..64d4fa3609e90 100644
--- a/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/core/index_migrator.test.ts
@@ -450,7 +450,7 @@ function withIndex(
   client.tasks.get.mockReturnValue(
     elasticsearchClientMock.createSuccessTransportRequestPromise({
       completed: true,
-    } as estypes.GetTaskResponse)
+    } as estypes.TaskGetResponse)
   );
   client.search.mockReturnValue(
     elasticsearchClientMock.createSuccessTransportRequestPromise(searchResult(0) as any)
diff --git a/src/core/server/saved_objects/migrations/core/migration_context.test.ts b/src/core/server/saved_objects/migrations/core/migration_context.test.ts
index 5f2e8a37ec427..240b41266abb6 100644
--- a/src/core/server/saved_objects/migrations/core/migration_context.test.ts
+++ b/src/core/server/saved_objects/migrations/core/migration_context.test.ts
@@ -31,7 +31,7 @@ describe('disableUnknownTypeMappingFields', () => {
         },
       },
     },
-  };
+  } as const;
   const activeMappings = {
     _meta: {
       migrationMappingPropertyHashes: {
@@ -46,7 +46,7 @@ describe('disableUnknownTypeMappingFields', () => {
         },
       },
     },
-  };
+  } as const;
   const targetMappings = disableUnknownTypeMappingFields(activeMappings, sourceMappings);
 
   it('disables complex field mappings from unknown types in the source mappings', () => {
diff --git a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
index 37cea5d2de3d2..d0cc52f2dd9bd 100644
--- a/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
+++ b/src/core/server/saved_objects/migrations/kibana/kibana_migrator.test.ts
@@ -320,7 +320,11 @@ const mockV2MigrationOptions = () => {
     )
   );
   options.client.indices.addBlock.mockReturnValue(
-    elasticsearchClientMock.createSuccessTransportRequestPromise({ acknowledged: true })
+    elasticsearchClientMock.createSuccessTransportRequestPromise({
+      acknowledged: true,
+      shards_acknowledged: true,
+      indices: [],
+    })
   );
   options.client.reindex.mockReturnValue(
     elasticsearchClientMock.createSuccessTransportRequestPromise({
@@ -333,7 +337,7 @@ const mockV2MigrationOptions = () => {
       error: undefined,
       failures: [],
       task: { description: 'task description' } as any,
-    } as estypes.GetTaskResponse)
+    } as estypes.TaskGetResponse)
   );
 
   options.client.search = jest
diff --git a/src/core/server/saved_objects/migrationsv2/actions/bulk_overwrite_transformed_documents.test.ts b/src/core/server/saved_objects/migrationsv2/actions/bulk_overwrite_transformed_documents.test.ts
new file mode 100644
index 0000000000000..8ff9591798fd4
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/bulk_overwrite_transformed_documents.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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { bulkOverwriteTransformedDocuments } from './bulk_overwrite_transformed_documents';
+
+describe('bulkOverwriteTransformedDocuments', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = bulkOverwriteTransformedDocuments({
+      client,
+      index: 'new_index',
+      transformedDocs: [],
+      refresh: 'wait_for',
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/bulk_overwrite_transformed_documents.ts b/src/core/server/saved_objects/migrationsv2/actions/bulk_overwrite_transformed_documents.ts
new file mode 100644
index 0000000000000..830a8efccc7eb
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/bulk_overwrite_transformed_documents.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 * as Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import type { estypes } from '@elastic/elasticsearch';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import type { SavedObjectsRawDoc } from '../../serialization';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import { WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE } from './constants';
+
+/** @internal */
+export interface BulkOverwriteTransformedDocumentsParams {
+  client: ElasticsearchClient;
+  index: string;
+  transformedDocs: SavedObjectsRawDoc[];
+  refresh?: estypes.Refresh;
+}
+/**
+ * Write the up-to-date transformed documents to the index, overwriting any
+ * documents that are still on their outdated version.
+ */
+export const bulkOverwriteTransformedDocuments = ({
+  client,
+  index,
+  transformedDocs,
+  refresh = false,
+}: BulkOverwriteTransformedDocumentsParams): TaskEither.TaskEither<
+  RetryableEsClientError,
+  'bulk_index_succeeded'
+> => () => {
+  return client
+    .bulk({
+      // Because we only add aliases in the MARK_VERSION_INDEX_READY step we
+      // can't bulkIndex to an alias with require_alias=true. This means if
+      // users tamper during this operation (delete indices or restore a
+      // snapshot), we could end up auto-creating an index without the correct
+      // mappings. Such tampering could lead to many other problems and is
+      // probably unlikely so for now we'll accept this risk and wait till
+      // system indices puts in place a hard control.
+      require_alias: false,
+      wait_for_active_shards: WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
+      refresh,
+      filter_path: ['items.*.error'],
+      body: transformedDocs.flatMap((doc) => {
+        return [
+          {
+            index: {
+              _index: index,
+              _id: doc._id,
+              // overwrite existing documents
+              op_type: 'index',
+              // use optimistic concurrency control to ensure that outdated
+              // documents are only overwritten once with the latest version
+              if_seq_no: doc._seq_no,
+              if_primary_term: doc._primary_term,
+            },
+          },
+          doc._source,
+        ];
+      }),
+    })
+    .then((res) => {
+      // Filter out version_conflict_engine_exception since these just mean
+      // that another instance already updated these documents
+      const errors = (res.body.items ?? []).filter(
+        (item) => item.index?.error?.type !== 'version_conflict_engine_exception'
+      );
+      if (errors.length === 0) {
+        return Either.right('bulk_index_succeeded' as const);
+      } else {
+        throw new Error(JSON.stringify(errors));
+      }
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/clone_index.test.ts b/src/core/server/saved_objects/migrationsv2/actions/clone_index.test.ts
new file mode 100644
index 0000000000000..84b4b00bc7e7f
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/clone_index.test.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { errors as EsErrors } from '@elastic/elasticsearch';
+import { cloneIndex } from './clone_index';
+import { setWriteBlock } from './set_write_block';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+jest.mock('./catch_retryable_es_client_errors');
+
+describe('cloneIndex', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  const nonRetryableError = new Error('crash');
+  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
+  );
+
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = cloneIndex({
+      client,
+      source: 'my_source_index',
+      target: 'my_target_index',
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+
+  it('re-throws non retry-able errors', async () => {
+    const task = setWriteBlock({
+      client: clientWithNonRetryableError,
+      index: 'my_index',
+    });
+    await task();
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/clone_index.ts b/src/core/server/saved_objects/migrationsv2/actions/clone_index.ts
new file mode 100644
index 0000000000000..5674535c80328
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/clone_index.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import type { IndexNotFound, AcknowledgeResponse } from './';
+import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
+import {
+  DEFAULT_TIMEOUT,
+  INDEX_AUTO_EXPAND_REPLICAS,
+  INDEX_NUMBER_OF_SHARDS,
+  WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
+} from './constants';
+export type CloneIndexResponse = AcknowledgeResponse;
+
+/** @internal */
+export interface CloneIndexParams {
+  client: ElasticsearchClient;
+  source: string;
+  target: string;
+  /** only used for testing */
+  timeout?: string;
+}
+/**
+ * Makes a clone of the source index into the target.
+ *
+ * @remarks
+ * This method adds some additional logic to the ES clone index API:
+ *  - it is idempotent, if it gets called multiple times subsequent calls will
+ *    wait for the first clone operation to complete (up to 60s)
+ *  - the first call will wait up to 120s for the cluster state and all shards
+ *    to be updated.
+ */
+export const cloneIndex = ({
+  client,
+  source,
+  target,
+  timeout = DEFAULT_TIMEOUT,
+}: CloneIndexParams): TaskEither.TaskEither<
+  RetryableEsClientError | IndexNotFound,
+  CloneIndexResponse
+> => {
+  const cloneTask: TaskEither.TaskEither<
+    RetryableEsClientError | IndexNotFound,
+    AcknowledgeResponse
+  > = () => {
+    return client.indices
+      .clone(
+        {
+          index: source,
+          target,
+          wait_for_active_shards: WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
+          body: {
+            settings: {
+              index: {
+                // The source we're cloning from will have a write block set, so
+                // we need to remove it to allow writes to our newly cloned index
+                'blocks.write': false,
+                number_of_shards: INDEX_NUMBER_OF_SHARDS,
+                auto_expand_replicas: INDEX_AUTO_EXPAND_REPLICAS,
+                // Set an explicit refresh interval so that we don't inherit the
+                // value from incorrectly configured index templates (not required
+                // after we adopt system indices)
+                refresh_interval: '1s',
+                // Bump priority so that recovery happens before newer indices
+                priority: 10,
+              },
+            },
+          },
+          timeout,
+        },
+        { maxRetries: 0 /** handle retry ourselves for now */ }
+      )
+      .then((res) => {
+        /**
+         * - acknowledged=false, we timed out before the cluster state was
+         *   updated with the newly created index, but it probably will be
+         *   created sometime soon.
+         * - shards_acknowledged=false, we timed out before all shards were
+         *   started
+         * - acknowledged=true, shards_acknowledged=true, cloning complete
+         */
+        return Either.right({
+          acknowledged: res.body.acknowledged,
+          shardsAcknowledged: res.body.shards_acknowledged,
+        });
+      })
+      .catch((error: EsErrors.ResponseError) => {
+        if (error?.body?.error?.type === 'index_not_found_exception') {
+          return Either.left({
+            type: 'index_not_found_exception' as const,
+            index: error.body.error.index,
+          });
+        } else if (error?.body?.error?.type === 'resource_already_exists_exception') {
+          /**
+           * If the target index already exists it means a previous clone
+           * operation had already been started. However, we can't be sure
+           * that all shards were started so return shardsAcknowledged: false
+           */
+          return Either.right({
+            acknowledged: true,
+            shardsAcknowledged: false,
+          });
+        } else {
+          throw error;
+        }
+      })
+      .catch(catchRetryableEsClientErrors);
+  };
+
+  return pipe(
+    cloneTask,
+    TaskEither.chain((res) => {
+      if (res.acknowledged && res.shardsAcknowledged) {
+        // If the cluster state was updated and all shards ackd we're done
+        return TaskEither.right(res);
+      } else {
+        // Otherwise, wait until the target index has a 'green' status.
+        return pipe(
+          waitForIndexStatusYellow({ client, index: target, timeout }),
+          TaskEither.map((value) => {
+            /** When the index status is 'green' we know that all shards were started */
+            return { acknowledged: true, shardsAcknowledged: true };
+          })
+        );
+      }
+    })
+  );
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/close_pit.test.ts b/src/core/server/saved_objects/migrationsv2/actions/close_pit.test.ts
new file mode 100644
index 0000000000000..5d9696239a61e
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/close_pit.test.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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+jest.mock('./catch_retryable_es_client_errors');
+import { errors as EsErrors } from '@elastic/elasticsearch';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { closePit } from './close_pit';
+
+describe('closePit', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = closePit({ client, pitId: 'pitId' });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/close_pit.ts b/src/core/server/saved_objects/migrationsv2/actions/close_pit.ts
new file mode 100644
index 0000000000000..d421950c839e2
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/close_pit.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 * as Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+
+/** @internal */
+export interface ClosePitParams {
+  client: ElasticsearchClient;
+  pitId: string;
+}
+/*
+ * Closes PIT.
+ * See https://www.elastic.co/guide/en/elasticsearch/reference/current/point-in-time-api.html
+ * */
+export const closePit = ({
+  client,
+  pitId,
+}: ClosePitParams): TaskEither.TaskEither<RetryableEsClientError, {}> => () => {
+  return client
+    .closePointInTime({
+      body: { id: pitId },
+    })
+    .then((response) => {
+      if (!response.body.succeeded) {
+        throw new Error(`Failed to close PointInTime with id: ${pitId}`);
+      }
+      return Either.right({});
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/constants.ts b/src/core/server/saved_objects/migrationsv2/actions/constants.ts
new file mode 100644
index 0000000000000..5d0d2ffe5d695
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/constants.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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.
+ */
+
+/**
+ * Batch size for updateByQuery and reindex operations.
+ * Uses the default value of 1000 for Elasticsearch reindex operation.
+ */
+export const BATCH_SIZE = 1_000;
+export const DEFAULT_TIMEOUT = '60s';
+/** Allocate 1 replica if there are enough data nodes, otherwise continue with 0 */
+export const INDEX_AUTO_EXPAND_REPLICAS = '0-1';
+/** ES rule of thumb: shards should be several GB to 10's of GB, so Kibana is unlikely to cross that limit */
+export const INDEX_NUMBER_OF_SHARDS = 1;
+/** Wait for all shards to be active before starting an operation */
+export const WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE = 'all';
diff --git a/src/core/server/saved_objects/migrationsv2/actions/create_index.test.ts b/src/core/server/saved_objects/migrationsv2/actions/create_index.test.ts
new file mode 100644
index 0000000000000..d5d906898943c
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/create_index.test.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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { createIndex } from './create_index';
+import { setWriteBlock } from './set_write_block';
+
+describe('createIndex', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  const nonRetryableError = new Error('crash');
+  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = createIndex({
+      client,
+      indexName: 'new_index',
+      mappings: { properties: {} },
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+  it('re-throws non retry-able errors', async () => {
+    const task = setWriteBlock({
+      client: clientWithNonRetryableError,
+      index: 'my_index',
+    });
+    await task();
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/create_index.ts b/src/core/server/saved_objects/migrationsv2/actions/create_index.ts
new file mode 100644
index 0000000000000..8e5042a5ff8fe
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/create_index.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 * as Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { pipe } from 'fp-ts/lib/pipeable';
+import type { estypes } from '@elastic/elasticsearch';
+import { AcknowledgeResponse } from './index';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import { IndexMapping } from '../../mappings';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import {
+  DEFAULT_TIMEOUT,
+  INDEX_AUTO_EXPAND_REPLICAS,
+  WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
+} from './constants';
+import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
+
+function aliasArrayToRecord(aliases: string[]): Record<string, estypes.IndicesAlias> {
+  const result: Record<string, estypes.IndicesAlias> = {};
+  for (const alias of aliases) {
+    result[alias] = {};
+  }
+  return result;
+}
+
+/** @internal */
+export interface CreateIndexParams {
+  client: ElasticsearchClient;
+  indexName: string;
+  mappings: IndexMapping;
+  aliases?: string[];
+}
+/**
+ * Creates an index with the given mappings
+ *
+ * @remarks
+ * This method adds some additional logic to the ES create index API:
+ *  - it is idempotent, if it gets called multiple times subsequent calls will
+ *    wait for the first create operation to complete (up to 60s)
+ *  - the first call will wait up to 120s for the cluster state and all shards
+ *    to be updated.
+ */
+export const createIndex = ({
+  client,
+  indexName,
+  mappings,
+  aliases = [],
+}: CreateIndexParams): TaskEither.TaskEither<RetryableEsClientError, 'create_index_succeeded'> => {
+  const createIndexTask: TaskEither.TaskEither<
+    RetryableEsClientError,
+    AcknowledgeResponse
+  > = () => {
+    const aliasesObject = aliasArrayToRecord(aliases);
+
+    return client.indices
+      .create(
+        {
+          index: indexName,
+          // wait until all shards are available before creating the index
+          // (since number_of_shards=1 this does not have any effect atm)
+          wait_for_active_shards: WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
+          // Wait up to 60s for the cluster state to update and all shards to be
+          // started
+          timeout: DEFAULT_TIMEOUT,
+          body: {
+            mappings,
+            aliases: aliasesObject,
+            settings: {
+              index: {
+                // ES rule of thumb: shards should be several GB to 10's of GB, so
+                // Kibana is unlikely to cross that limit.
+                number_of_shards: 1,
+                auto_expand_replicas: INDEX_AUTO_EXPAND_REPLICAS,
+                // Set an explicit refresh interval so that we don't inherit the
+                // value from incorrectly configured index templates (not required
+                // after we adopt system indices)
+                refresh_interval: '1s',
+                // Bump priority so that recovery happens before newer indices
+                priority: 10,
+              },
+            },
+          },
+        },
+        { maxRetries: 0 /** handle retry ourselves for now */ }
+      )
+      .then((res) => {
+        /**
+         * - acknowledged=false, we timed out before the cluster state was
+         *   updated on all nodes with the newly created index, but it
+         *   probably will be created sometime soon.
+         * - shards_acknowledged=false, we timed out before all shards were
+         *   started
+         * - acknowledged=true, shards_acknowledged=true, index creation complete
+         */
+        return Either.right({
+          acknowledged: res.body.acknowledged,
+          shardsAcknowledged: res.body.shards_acknowledged,
+        });
+      })
+      .catch((error) => {
+        if (error?.body?.error?.type === 'resource_already_exists_exception') {
+          /**
+           * If the target index already exists it means a previous create
+           * operation had already been started. However, we can't be sure
+           * that all shards were started so return shardsAcknowledged: false
+           */
+          return Either.right({
+            acknowledged: true,
+            shardsAcknowledged: false,
+          });
+        } else {
+          throw error;
+        }
+      })
+      .catch(catchRetryableEsClientErrors);
+  };
+
+  return pipe(
+    createIndexTask,
+    TaskEither.chain((res) => {
+      if (res.acknowledged && res.shardsAcknowledged) {
+        // If the cluster state was updated and all shards ackd we're done
+        return TaskEither.right('create_index_succeeded');
+      } else {
+        // Otherwise, wait until the target index has a 'yellow' status.
+        return pipe(
+          waitForIndexStatusYellow({ client, index: indexName, timeout: DEFAULT_TIMEOUT }),
+          TaskEither.map(() => {
+            /** When the index status is 'yellow' we know that all shards were started */
+            return 'create_index_succeeded';
+          })
+        );
+      }
+    })
+  );
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/fetch_indices.test.ts b/src/core/server/saved_objects/migrationsv2/actions/fetch_indices.test.ts
new file mode 100644
index 0000000000000..0dab1728b6ef2
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/fetch_indices.test.ts
@@ -0,0 +1,37 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { fetchIndices } from './fetch_indices';
+
+describe('fetchIndices', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = fetchIndices({ client, indices: ['my_index'] });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/fetch_indices.ts b/src/core/server/saved_objects/migrationsv2/actions/fetch_indices.ts
new file mode 100644
index 0000000000000..3847252eb6db1
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/fetch_indices.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 TaskEither from 'fp-ts/lib/TaskEither';
+import * as Either from 'fp-ts/lib/Either';
+import { IndexMapping } from '../../mappings';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+export type FetchIndexResponse = Record<
+  string,
+  { aliases: Record<string, unknown>; mappings: IndexMapping; settings: unknown }
+>;
+
+/** @internal */
+export interface FetchIndicesParams {
+  client: ElasticsearchClient;
+  indices: string[];
+}
+
+/**
+ * Fetches information about the given indices including aliases, mappings and
+ * settings.
+ */
+export const fetchIndices = ({
+  client,
+  indices,
+}: FetchIndicesParams): TaskEither.TaskEither<RetryableEsClientError, FetchIndexResponse> =>
+  // @ts-expect-error @elastic/elasticsearch IndexState.alias and IndexState.mappings should be required
+  () => {
+    return client.indices
+      .get(
+        {
+          index: indices,
+          ignore_unavailable: true, // Don't return an error for missing indices. Note this *will* include closed indices, the docs are misleading https://github.com/elastic/elasticsearch/issues/63607
+        },
+        { ignore: [404], maxRetries: 0 }
+      )
+      .then(({ body }) => {
+        return Either.right(body);
+      })
+      .catch(catchRetryableEsClientErrors);
+  };
diff --git a/src/core/server/saved_objects/migrationsv2/actions/index.test.ts b/src/core/server/saved_objects/migrationsv2/actions/index.test.ts
deleted file mode 100644
index df74a4e1282e4..0000000000000
--- a/src/core/server/saved_objects/migrationsv2/actions/index.test.ts
+++ /dev/null
@@ -1,302 +0,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 Actions from './';
-import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
-import { errors as EsErrors } from '@elastic/elasticsearch';
-jest.mock('./catch_retryable_es_client_errors');
-import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
-import * as Option from 'fp-ts/lib/Option';
-
-describe('actions', () => {
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
-  // Create a mock client that rejects all methods with a 503 status code
-  // response.
-  const retryableError = new EsErrors.ResponseError(
-    elasticsearchClientMock.createApiResponse({
-      statusCode: 503,
-      body: { error: { type: 'es_type', reason: 'es_reason' } },
-    })
-  );
-  const client = elasticsearchClientMock.createInternalClient(
-    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
-  );
-
-  const nonRetryableError = new Error('crash');
-  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
-    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
-  );
-
-  describe('fetchIndices', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.fetchIndices(client, ['my_index']);
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('setWriteBlock', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.setWriteBlock(client, 'my_index');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-    it('re-throws non retry-able errors', async () => {
-      const task = Actions.setWriteBlock(clientWithNonRetryableError, 'my_index');
-      await task();
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
-    });
-  });
-
-  describe('cloneIndex', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.cloneIndex(client, 'my_source_index', 'my_target_index');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-    it('re-throws non retry-able errors', async () => {
-      const task = Actions.setWriteBlock(clientWithNonRetryableError, 'my_index');
-      await task();
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
-    });
-  });
-
-  describe('pickupUpdatedMappings', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.pickupUpdatedMappings(client, 'my_index');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('openPit', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.openPit(client, 'my_index');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('readWithPit', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.readWithPit(client, 'pitId', { match_all: {} }, 10_000);
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('closePit', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.closePit(client, 'pitId');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('reindex', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.reindex(
-        client,
-        'my_source_index',
-        'my_target_index',
-        Option.none,
-        false,
-        {}
-      );
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('waitForReindexTask', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.waitForReindexTask(client, 'my task id', '60s');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-    it('re-throws non retry-able errors', async () => {
-      const task = Actions.setWriteBlock(clientWithNonRetryableError, 'my_index');
-      await task();
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
-    });
-  });
-
-  describe('waitForPickupUpdatedMappingsTask', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.waitForPickupUpdatedMappingsTask(client, 'my task id', '60s');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-    it('re-throws non retry-able errors', async () => {
-      const task = Actions.setWriteBlock(clientWithNonRetryableError, 'my_index');
-      await task();
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
-    });
-  });
-
-  describe('updateAliases', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.updateAliases(client, []);
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-    it('re-throws non retry-able errors', async () => {
-      const task = Actions.setWriteBlock(clientWithNonRetryableError, 'my_index');
-      await task();
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
-    });
-  });
-
-  describe('createIndex', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.createIndex(client, 'new_index', { properties: {} });
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-    it('re-throws non retry-able errors', async () => {
-      const task = Actions.setWriteBlock(clientWithNonRetryableError, 'my_index');
-      await task();
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
-    });
-  });
-
-  describe('updateAndPickupMappings', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.updateAndPickupMappings(client, 'new_index', { properties: {} });
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('searchForOutdatedDocuments', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'new_index',
-        outdatedDocumentsQuery: {},
-      });
-
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-
-    it('configures request according to given parameters', async () => {
-      const esClient = elasticsearchClientMock.createInternalClient();
-      const query = {};
-      const targetIndex = 'new_index';
-      const batchSize = 1000;
-      const task = Actions.searchForOutdatedDocuments(esClient, {
-        batchSize,
-        targetIndex,
-        outdatedDocumentsQuery: query,
-      });
-
-      await task();
-
-      expect(esClient.search).toHaveBeenCalledTimes(1);
-      expect(esClient.search).toHaveBeenCalledWith(
-        expect.objectContaining({
-          index: targetIndex,
-          size: batchSize,
-          body: expect.objectContaining({ query }),
-        })
-      );
-    });
-  });
-
-  describe('bulkOverwriteTransformedDocuments', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.bulkOverwriteTransformedDocuments(client, 'new_index', [], 'wait_for');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-
-  describe('refreshIndex', () => {
-    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
-      const task = Actions.refreshIndex(client, 'target_index');
-      try {
-        await task();
-      } catch (e) {
-        /** ignore */
-      }
-
-      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
-    });
-  });
-});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/index.ts b/src/core/server/saved_objects/migrationsv2/actions/index.ts
index c2e0476960c3b..98d7167ffc31a 100644
--- a/src/core/server/saved_objects/migrationsv2/actions/index.ts
+++ b/src/core/server/saved_objects/migrationsv2/actions/index.ts
@@ -6,1105 +6,126 @@
  * Side Public License, v 1.
  */
 
-import * as Either from 'fp-ts/lib/Either';
-import * as TaskEither from 'fp-ts/lib/TaskEither';
-import * as Option from 'fp-ts/lib/Option';
-import type { estypes } from '@elastic/elasticsearch';
-import { errors as EsErrors } from '@elastic/elasticsearch';
-import type { ElasticsearchClientError, ResponseError } from '@elastic/elasticsearch/lib/errors';
-import { pipe } from 'fp-ts/lib/pipeable';
-import { flow } from 'fp-ts/lib/function';
-import { ElasticsearchClient } from '../../../elasticsearch';
-import { IndexMapping } from '../../mappings';
-import type { SavedObjectsRawDoc, SavedObjectsRawDocSource } from '../../serialization';
-import type { TransformRawDocs } from '../types';
-import {
-  catchRetryableEsClientErrors,
-  RetryableEsClientError,
-} from './catch_retryable_es_client_errors';
-import {
-  DocumentsTransformFailed,
-  DocumentsTransformSuccess,
-} from '../../migrations/core/migrate_raw_docs';
-export type { RetryableEsClientError };
+import { RetryableEsClientError } from './catch_retryable_es_client_errors';
+import { DocumentsTransformFailed } from '../../migrations/core/migrate_raw_docs';
 
-/**
- * Batch size for updateByQuery and reindex operations.
- * Uses the default value of 1000 for Elasticsearch reindex operation.
- */
-const BATCH_SIZE = 1_000;
-const DEFAULT_TIMEOUT = '60s';
-/** Allocate 1 replica if there are enough data nodes, otherwise continue with 0 */
-const INDEX_AUTO_EXPAND_REPLICAS = '0-1';
-/** ES rule of thumb: shards should be several GB to 10's of GB, so Kibana is unlikely to cross that limit */
-const INDEX_NUMBER_OF_SHARDS = 1;
-/** Wait for all shards to be active before starting an operation */
-const WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE = 'all';
+export {
+  BATCH_SIZE,
+  DEFAULT_TIMEOUT,
+  INDEX_AUTO_EXPAND_REPLICAS,
+  INDEX_NUMBER_OF_SHARDS,
+  WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
+} from './constants';
 
-// Map of left response 'type' string -> response interface
-export interface ActionErrorTypeMap {
-  wait_for_task_completion_timeout: WaitForTaskCompletionTimeout;
-  retryable_es_client_error: RetryableEsClientError;
-  index_not_found_exception: IndexNotFound;
-  target_index_had_write_block: TargetIndexHadWriteBlock;
-  incompatible_mapping_exception: IncompatibleMappingException;
-  alias_not_found_exception: AliasNotFound;
-  remove_index_not_a_concrete_index: RemoveIndexNotAConcreteIndex;
-  documents_transform_failed: DocumentsTransformFailed;
-}
+export type { RetryableEsClientError };
 
-/**
- * Type guard for narrowing the type of a left
- */
-export function isLeftTypeof<T extends keyof ActionErrorTypeMap>(
-  res: any,
-  typeString: T
-): res is ActionErrorTypeMap[T] {
-  return res.type === typeString;
-}
+// actions/* imports
+export type { FetchIndexResponse, FetchIndicesParams } from './fetch_indices';
+export { fetchIndices } from './fetch_indices';
 
-export type FetchIndexResponse = Record<
-  string,
-  { aliases: Record<string, unknown>; mappings: IndexMapping; settings: unknown }
->;
+export type { SetWriteBlockParams } from './set_write_block';
+export { setWriteBlock } from './set_write_block';
 
-/**
- * Fetches information about the given indices including aliases, mappings and
- * settings.
- */
-export const fetchIndices = (
-  client: ElasticsearchClient,
-  indicesToFetch: string[]
-): TaskEither.TaskEither<RetryableEsClientError, FetchIndexResponse> =>
-  // @ts-expect-error @elastic/elasticsearch IndexState.alias and IndexState.mappings should be required
-  () => {
-    return client.indices
-      .get(
-        {
-          index: indicesToFetch,
-          ignore_unavailable: true, // Don't return an error for missing indices. Note this *will* include closed indices, the docs are misleading https://github.com/elastic/elasticsearch/issues/63607
-        },
-        { ignore: [404], maxRetries: 0 }
-      )
-      .then(({ body }) => {
-        return Either.right(body);
-      })
-      .catch(catchRetryableEsClientErrors);
-  };
+export type { RemoveWriteBlockParams } from './remove_write_block';
+export { removeWriteBlock } from './remove_write_block';
 
-export interface IndexNotFound {
-  type: 'index_not_found_exception';
-  index: string;
-}
-/**
- * Sets a write block in place for the given index. If the response includes
- * `acknowledged: true` all in-progress writes have drained and no further
- * writes to this index will be possible.
- *
- * The first time the write block is added to an index the response will
- * include `shards_acknowledged: true` but once the block is in place,
- * subsequent calls return `shards_acknowledged: false`
- */
-export const setWriteBlock = (
-  client: ElasticsearchClient,
-  index: string
-): TaskEither.TaskEither<
-  IndexNotFound | RetryableEsClientError,
-  'set_write_block_succeeded'
-> => () => {
-  return (
-    client.indices
-      .addBlock<{
-        acknowledged: boolean;
-        shards_acknowledged: boolean;
-      }>(
-        {
-          index,
-          block: 'write',
-        },
-        { maxRetries: 0 /** handle retry ourselves for now */ }
-      )
-      // not typed yet
-      .then((res: any) => {
-        return res.body.acknowledged === true
-          ? Either.right('set_write_block_succeeded' as const)
-          : Either.left({
-              type: 'retryable_es_client_error' as const,
-              message: 'set_write_block_failed',
-            });
-      })
-      .catch((e: ElasticsearchClientError) => {
-        if (e instanceof EsErrors.ResponseError) {
-          if (e.body?.error?.type === 'index_not_found_exception') {
-            return Either.left({ type: 'index_not_found_exception' as const, index });
-          }
-        }
-        throw e;
-      })
-      .catch(catchRetryableEsClientErrors)
-  );
-};
+export type { CloneIndexResponse, CloneIndexParams } from './clone_index';
+export { cloneIndex } from './clone_index';
 
-/**
- * Removes a write block from an index
- */
-export const removeWriteBlock = (
-  client: ElasticsearchClient,
-  index: string
-): TaskEither.TaskEither<RetryableEsClientError, 'remove_write_block_succeeded'> => () => {
-  return client.indices
-    .putSettings<{
-      acknowledged: boolean;
-      shards_acknowledged: boolean;
-    }>(
-      {
-        index,
-        // Don't change any existing settings
-        preserve_existing: true,
-        body: {
-          index: {
-            blocks: {
-              write: false,
-            },
-          },
-        },
-      },
-      { maxRetries: 0 /** handle retry ourselves for now */ }
-    )
-    .then((res) => {
-      return res.body.acknowledged === true
-        ? Either.right('remove_write_block_succeeded' as const)
-        : Either.left({
-            type: 'retryable_es_client_error' as const,
-            message: 'remove_write_block_failed',
-          });
-    })
-    .catch(catchRetryableEsClientErrors);
-};
+export type { WaitForIndexStatusYellowParams } from './wait_for_index_status_yellow';
+import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
 
-/**
- * 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
- * allocate the replicas. When migrations proceed with a yellow index it means
- * we don't have as much data-redundancy as we could have, but waiting for
- * replicas would mean that v2 migrations fail where v1 migrations would have
- * succeeded. It doesn't feel like it's Kibana's job to force users to keep
- * their clusters green and even if it's green when we migrate it can turn
- * yellow at any point in the future. So ultimately data-redundancy is up to
- * users to maintain.
- */
-export const waitForIndexStatusYellow = (
-  client: ElasticsearchClient,
-  index: string,
-  timeout = DEFAULT_TIMEOUT
-): TaskEither.TaskEither<RetryableEsClientError, {}> => () => {
-  return client.cluster
-    .health({ index, wait_for_status: 'yellow', timeout })
-    .then(() => {
-      return Either.right({});
-    })
-    .catch(catchRetryableEsClientErrors);
-};
+export type { WaitForTaskResponse, WaitForTaskCompletionTimeout } from './wait_for_task';
+import { waitForTask, WaitForTaskCompletionTimeout } from './wait_for_task';
 
-export type CloneIndexResponse = AcknowledgeResponse;
+export type { UpdateByQueryResponse } from './pickup_updated_mappings';
+import { pickupUpdatedMappings } from './pickup_updated_mappings';
 
-/**
- * Makes a clone of the source index into the target.
- *
- * @remarks
- * This method adds some additional logic to the ES clone index API:
- *  - it is idempotent, if it gets called multiple times subsequent calls will
- *    wait for the first clone operation to complete (up to 60s)
- *  - the first call will wait up to 120s for the cluster state and all shards
- *    to be updated.
- */
-export const cloneIndex = (
-  client: ElasticsearchClient,
-  source: string,
-  target: string,
-  /** only used for testing */
-  timeout = DEFAULT_TIMEOUT
-): TaskEither.TaskEither<RetryableEsClientError | IndexNotFound, CloneIndexResponse> => {
-  const cloneTask: TaskEither.TaskEither<
-    RetryableEsClientError | IndexNotFound,
-    AcknowledgeResponse
-  > = () => {
-    return client.indices
-      .clone(
-        {
-          index: source,
-          target,
-          wait_for_active_shards: WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
-          body: {
-            settings: {
-              index: {
-                // The source we're cloning from will have a write block set, so
-                // we need to remove it to allow writes to our newly cloned index
-                'blocks.write': false,
-                number_of_shards: INDEX_NUMBER_OF_SHARDS,
-                auto_expand_replicas: INDEX_AUTO_EXPAND_REPLICAS,
-                // Set an explicit refresh interval so that we don't inherit the
-                // value from incorrectly configured index templates (not required
-                // after we adopt system indices)
-                refresh_interval: '1s',
-                // Bump priority so that recovery happens before newer indices
-                priority: 10,
-              },
-            },
-          },
-          timeout,
-        },
-        { maxRetries: 0 /** handle retry ourselves for now */ }
-      )
-      .then((res) => {
-        /**
-         * - acknowledged=false, we timed out before the cluster state was
-         *   updated with the newly created index, but it probably will be
-         *   created sometime soon.
-         * - shards_acknowledged=false, we timed out before all shards were
-         *   started
-         * - acknowledged=true, shards_acknowledged=true, cloning complete
-         */
-        return Either.right({
-          acknowledged: res.body.acknowledged,
-          shardsAcknowledged: res.body.shards_acknowledged,
-        });
-      })
-      .catch((error: EsErrors.ResponseError) => {
-        if (error?.body?.error?.type === 'index_not_found_exception') {
-          return Either.left({
-            type: 'index_not_found_exception' as const,
-            index: error.body.error.index,
-          });
-        } else if (error?.body?.error?.type === 'resource_already_exists_exception') {
-          /**
-           * If the target index already exists it means a previous clone
-           * operation had already been started. However, we can't be sure
-           * that all shards were started so return shardsAcknowledged: false
-           */
-          return Either.right({
-            acknowledged: true,
-            shardsAcknowledged: false,
-          });
-        } else {
-          throw error;
-        }
-      })
-      .catch(catchRetryableEsClientErrors);
-  };
+export type { OpenPitResponse, OpenPitParams } from './open_pit';
+export { openPit, pitKeepAlive } from './open_pit';
 
-  return pipe(
-    cloneTask,
-    TaskEither.chain((res) => {
-      if (res.acknowledged && res.shardsAcknowledged) {
-        // If the cluster state was updated and all shards ackd we're done
-        return TaskEither.right(res);
-      } else {
-        // Otherwise, wait until the target index has a 'green' status.
-        return pipe(
-          waitForIndexStatusYellow(client, target, timeout),
-          TaskEither.map((value) => {
-            /** When the index status is 'green' we know that all shards were started */
-            return { acknowledged: true, shardsAcknowledged: true };
-          })
-        );
-      }
-    })
-  );
-};
+export type { ReadWithPit, ReadWithPitParams } from './read_with_pit';
+export { readWithPit } from './read_with_pit';
 
-interface WaitForTaskResponse {
-  error: Option.Option<{ type: string; reason: string; index: string }>;
-  completed: boolean;
-  failures: Option.Option<any[]>;
-  description?: string;
-}
+export type { ClosePitParams } from './close_pit';
+export { closePit } from './close_pit';
 
-/**
- * After waiting for the specificed timeout, the task has not yet completed.
- *
- * When querying the tasks API we use `wait_for_completion=true` to block the
- * request until the task completes. If after the `timeout`, the task still has
- * not completed we return this error. This does not mean that the task itelf
- * has reached a timeout, Elasticsearch will continue to run the task.
- */
-export interface WaitForTaskCompletionTimeout {
-  /** After waiting for the specificed timeout, the task has not yet completed. */
-  readonly type: 'wait_for_task_completion_timeout';
-  readonly message: string;
-  readonly error?: Error;
-}
+export type { TransformDocsParams } from './transform_docs';
+export { transformDocs } from './transform_docs';
 
-const catchWaitForTaskCompletionTimeout = (
-  e: ResponseError
-): Either.Either<WaitForTaskCompletionTimeout, never> => {
-  if (
-    e.body?.error?.type === 'timeout_exception' ||
-    e.body?.error?.type === 'receive_timeout_transport_exception'
-  ) {
-    return Either.left({
-      type: 'wait_for_task_completion_timeout' as const,
-      message: `[${e.body.error.type}] ${e.body.error.reason}`,
-      error: e,
-    });
-  } else {
-    throw e;
-  }
-};
+export type { RefreshIndexParams } from './refresh_index';
+export { refreshIndex } from './refresh_index';
 
-/**
- * Blocks for up to 60s or until a task completes.
- *
- * TODO: delete completed tasks
- */
-const waitForTask = (
-  client: ElasticsearchClient,
-  taskId: string,
-  timeout: string
-): TaskEither.TaskEither<
-  RetryableEsClientError | WaitForTaskCompletionTimeout,
-  WaitForTaskResponse
-> => () => {
-  return client.tasks
-    .get({
-      task_id: taskId,
-      wait_for_completion: true,
-      timeout,
-    })
-    .then((res) => {
-      const body = res.body;
-      const failures = body.response?.failures ?? [];
-      return Either.right({
-        completed: body.completed,
-        // @ts-expect-error @elastic/elasticsearch GetTaskResponse doesn't declare `error` property
-        error: Option.fromNullable(body.error),
-        failures: failures.length > 0 ? Option.some(failures) : Option.none,
-        description: body.task.description,
-      });
-    })
-    .catch(catchWaitForTaskCompletionTimeout)
-    .catch(catchRetryableEsClientErrors);
-};
-
-export interface UpdateByQueryResponse {
-  taskId: string;
-}
+export type { ReindexResponse, ReindexParams } from './reindex';
+export { reindex } from './reindex';
 
-/**
- * Pickup updated mappings by performing an update by query operation on all
- * documents in the index. Returns a task ID which can be
- * tracked for progress.
- *
- * @remarks When mappings are updated to add a field which previously wasn't
- * mapped Elasticsearch won't automatically add existing documents to it's
- * internal search indices. So search results on this field won't return any
- * existing documents. By running an update by query we essentially refresh
- * these the internal search indices for all existing documents.
- * This action uses `conflicts: 'proceed'` allowing several Kibana instances
- * to run this in parallel.
- */
-export const pickupUpdatedMappings = (
-  client: ElasticsearchClient,
-  index: string
-): TaskEither.TaskEither<RetryableEsClientError, UpdateByQueryResponse> => () => {
-  return client
-    .updateByQuery({
-      // Ignore version conflicts that can occur from parallel update by query operations
-      conflicts: 'proceed',
-      // Return an error when targeting missing or closed indices
-      allow_no_indices: false,
-      index,
-      // How many documents to update per batch
-      scroll_size: BATCH_SIZE,
-      // force a refresh so that we can query the updated index immediately
-      // after the operation completes
-      refresh: true,
-      // Create a task and return task id instead of blocking until complete
-      wait_for_completion: false,
-    })
-    .then(({ body: { task: taskId } }) => {
-      return Either.right({ taskId: String(taskId!) });
-    })
-    .catch(catchRetryableEsClientErrors);
-};
+import type { IncompatibleMappingException } from './wait_for_reindex_task';
+export { waitForReindexTask } from './wait_for_reindex_task';
 
-/** @internal */
-export interface OpenPitResponse {
-  pitId: string;
-}
+export type { VerifyReindexParams } from './verify_reindex';
+export { verifyReindex } from './verify_reindex';
 
-// how long ES should keep PIT alive
-const pitKeepAlive = '10m';
-/*
- * Creates a lightweight view of data when the request has been initiated.
- * See https://www.elastic.co/guide/en/elasticsearch/reference/current/point-in-time-api.html
- * */
-export const openPit = (
-  client: ElasticsearchClient,
-  index: string
-): TaskEither.TaskEither<RetryableEsClientError, OpenPitResponse> => () => {
-  return client
-    .openPointInTime({
-      index,
-      keep_alive: pitKeepAlive,
-    })
-    .then((response) => Either.right({ pitId: response.body.id }))
-    .catch(catchRetryableEsClientErrors);
-};
+import type { AliasNotFound, RemoveIndexNotAConcreteIndex } from './update_aliases';
+export type { AliasAction, UpdateAliasesParams } from './update_aliases';
+export { updateAliases } from './update_aliases';
 
-/** @internal */
-export interface ReadWithPit {
-  outdatedDocuments: SavedObjectsRawDoc[];
-  readonly lastHitSortValue: number[] | undefined;
-  readonly totalHits: number | undefined;
-}
+export type { CreateIndexParams } from './create_index';
+export { createIndex } from './create_index';
 
-/*
- * Requests documents from the index using PIT mechanism.
- * */
-export const readWithPit = (
-  client: ElasticsearchClient,
-  pitId: string,
-  query: estypes.QueryContainer,
-  batchSize: number,
-  searchAfter?: number[],
-  seqNoPrimaryTerm?: boolean
-): TaskEither.TaskEither<RetryableEsClientError, ReadWithPit> => () => {
-  return client
-    .search<SavedObjectsRawDoc>({
-      seq_no_primary_term: seqNoPrimaryTerm,
-      body: {
-        // Sort fields are required to use searchAfter
-        sort: {
-          // the most efficient option as order is not important for the migration
-          _shard_doc: { order: 'asc' },
-        },
-        pit: { id: pitId, keep_alive: pitKeepAlive },
-        size: batchSize,
-        search_after: searchAfter,
-        /**
-         * We want to know how many documents we need to process so we can log the progress.
-         * But we also want to increase the performance of these requests,
-         * so we ask ES to report the total count only on the first request (when searchAfter does not exist)
-         */
-        track_total_hits: typeof searchAfter === 'undefined',
-        query,
-      },
-    })
-    .then((response) => {
-      const totalHits =
-        typeof response.body.hits.total === 'number'
-          ? response.body.hits.total // This format is to be removed in 8.0
-          : response.body.hits.total?.value;
-      const hits = response.body.hits.hits;
+export type {
+  UpdateAndPickupMappingsResponse,
+  UpdateAndPickupMappingsParams,
+} from './update_and_pickup_mappings';
+export { updateAndPickupMappings } from './update_and_pickup_mappings';
 
-      if (hits.length > 0) {
-        return Either.right({
-          // @ts-expect-error @elastic/elasticsearch _source is optional
-          outdatedDocuments: hits as SavedObjectsRawDoc[],
-          lastHitSortValue: hits[hits.length - 1].sort as number[],
-          totalHits,
-        });
-      }
+export { waitForPickupUpdatedMappingsTask } from './wait_for_pickup_updated_mappings_task';
 
-      return Either.right({
-        outdatedDocuments: [],
-        lastHitSortValue: undefined,
-        totalHits,
-      });
-    })
-    .catch(catchRetryableEsClientErrors);
-};
+export type {
+  SearchResponse,
+  SearchForOutdatedDocumentsOptions,
+} from './search_for_outdated_documents';
+export { searchForOutdatedDocuments } from './search_for_outdated_documents';
 
-/*
- * Closes PIT.
- * See https://www.elastic.co/guide/en/elasticsearch/reference/current/point-in-time-api.html
- * */
-export const closePit = (
-  client: ElasticsearchClient,
-  pitId: string
-): TaskEither.TaskEither<RetryableEsClientError, {}> => () => {
-  return client
-    .closePointInTime({
-      body: { id: pitId },
-    })
-    .then((response) => {
-      if (!response.body.succeeded) {
-        throw new Error(`Failed to close PointInTime with id: ${pitId}`);
-      }
-      return Either.right({});
-    })
-    .catch(catchRetryableEsClientErrors);
-};
+export type { BulkOverwriteTransformedDocumentsParams } from './bulk_overwrite_transformed_documents';
+export { bulkOverwriteTransformedDocuments } from './bulk_overwrite_transformed_documents';
 
-/*
- * Transform outdated docs
- * */
-export const transformDocs = (
-  transformRawDocs: TransformRawDocs,
-  outdatedDocuments: SavedObjectsRawDoc[]
-): TaskEither.TaskEither<DocumentsTransformFailed, DocumentsTransformSuccess> =>
-  transformRawDocs(outdatedDocuments);
+export { pickupUpdatedMappings, waitForTask, waitForIndexStatusYellow };
+export type { AliasNotFound, RemoveIndexNotAConcreteIndex };
 
-/** @internal */
-export interface ReindexResponse {
-  taskId: string;
+export interface IndexNotFound {
+  type: 'index_not_found_exception';
+  index: string;
 }
-
-/**
- * Wait for Elasticsearch to reindex all the changes.
- */
-export const refreshIndex = (
-  client: ElasticsearchClient,
-  targetIndex: string
-): TaskEither.TaskEither<RetryableEsClientError, { refreshed: boolean }> => () => {
-  return client.indices
-    .refresh({
-      index: targetIndex,
-    })
-    .then(() => {
-      return Either.right({ refreshed: true });
-    })
-    .catch(catchRetryableEsClientErrors);
-};
-/**
- * Reindex documents from the `sourceIndex` into the `targetIndex`. Returns a
- * task ID which can be tracked for progress.
- *
- * @remarks This action is idempotent allowing several Kibana instances to run
- * this in parallel. By using `op_type: 'create', conflicts: 'proceed'` there
- * will be only one write per reindexed document.
- */
-export const reindex = (
-  client: ElasticsearchClient,
-  sourceIndex: string,
-  targetIndex: string,
-  reindexScript: Option.Option<string>,
-  requireAlias: boolean,
-  /* When reindexing we use a source query to exclude saved objects types which
-   * are no longer used. These saved objects will still be kept in the outdated
-   * index for backup purposes, but won't be available in the upgraded index.
-   */
-  unusedTypesQuery: estypes.QueryContainer
-): TaskEither.TaskEither<RetryableEsClientError, ReindexResponse> => () => {
-  return client
-    .reindex({
-      // Require targetIndex to be an alias. Prevents a new index from being
-      // created if targetIndex doesn't exist.
-      require_alias: requireAlias,
-      body: {
-        // Ignore version conflicts from existing documents
-        conflicts: 'proceed',
-        source: {
-          index: sourceIndex,
-          // Set reindex batch size
-          size: BATCH_SIZE,
-          // Exclude saved object types
-          query: unusedTypesQuery,
-        },
-        dest: {
-          index: targetIndex,
-          // Don't override existing documents, only create if missing
-          op_type: 'create',
-        },
-        script: Option.fold<string, undefined | { source: string; lang: 'painless' }>(
-          () => undefined,
-          (script) => ({
-            source: script,
-            lang: 'painless',
-          })
-        )(reindexScript),
-      },
-      // force a refresh so that we can query the target index
-      refresh: true,
-      // Create a task and return task id instead of blocking until complete
-      wait_for_completion: false,
-    })
-    .then(({ body: { task: taskId } }) => {
-      return Either.right({ taskId: String(taskId) });
-    })
-    .catch(catchRetryableEsClientErrors);
-};
-
-interface WaitForReindexTaskFailure {
+export interface WaitForReindexTaskFailure {
   readonly cause: { type: string; reason: string };
 }
-
-/** @internal */
 export interface TargetIndexHadWriteBlock {
   type: 'target_index_had_write_block';
 }
 
-/** @internal */
-export interface IncompatibleMappingException {
-  type: 'incompatible_mapping_exception';
-}
-
-export const waitForReindexTask = flow(
-  waitForTask,
-  TaskEither.chain(
-    (
-      res
-    ): TaskEither.TaskEither<
-      | IndexNotFound
-      | TargetIndexHadWriteBlock
-      | IncompatibleMappingException
-      | RetryableEsClientError
-      | WaitForTaskCompletionTimeout,
-      'reindex_succeeded'
-    > => {
-      const failureIsAWriteBlock = ({ cause: { type, reason } }: WaitForReindexTaskFailure) =>
-        type === 'cluster_block_exception' &&
-        reason.match(/index \[.+] blocked by: \[FORBIDDEN\/8\/index write \(api\)\]/);
-
-      const failureIsIncompatibleMappingException = ({
-        cause: { type, reason },
-      }: WaitForReindexTaskFailure) =>
-        type === 'strict_dynamic_mapping_exception' || type === 'mapper_parsing_exception';
-
-      if (Option.isSome(res.error)) {
-        if (res.error.value.type === 'index_not_found_exception') {
-          return TaskEither.left({
-            type: 'index_not_found_exception' as const,
-            index: res.error.value.index,
-          });
-        } else {
-          throw new Error('Reindex failed with the following error:\n' + JSON.stringify(res.error));
-        }
-      } else if (Option.isSome(res.failures)) {
-        if (res.failures.value.every(failureIsAWriteBlock)) {
-          return TaskEither.left({ type: 'target_index_had_write_block' as const });
-        } else if (res.failures.value.every(failureIsIncompatibleMappingException)) {
-          return TaskEither.left({ type: 'incompatible_mapping_exception' as const });
-        } else {
-          throw new Error(
-            'Reindex failed with the following failures:\n' + JSON.stringify(res.failures.value)
-          );
-        }
-      } else {
-        return TaskEither.right('reindex_succeeded' as const);
-      }
-    }
-  )
-);
-
-export const verifyReindex = (
-  client: ElasticsearchClient,
-  sourceIndex: string,
-  targetIndex: string
-): TaskEither.TaskEither<
-  RetryableEsClientError | { type: 'verify_reindex_failed' },
-  'verify_reindex_succeeded'
-> => () => {
-  const count = (index: string) =>
-    client
-      .count<{ count: number }>({
-        index,
-        // Return an error when targeting missing or closed indices
-        allow_no_indices: false,
-      })
-      .then((res) => {
-        return res.body.count;
-      });
-
-  return Promise.all([count(sourceIndex), count(targetIndex)])
-    .then(([sourceCount, targetCount]) => {
-      if (targetCount >= sourceCount) {
-        return Either.right('verify_reindex_succeeded' as const);
-      } else {
-        return Either.left({ type: 'verify_reindex_failed' as const });
-      }
-    })
-    .catch(catchRetryableEsClientErrors);
-};
-
-export const waitForPickupUpdatedMappingsTask = flow(
-  waitForTask,
-  TaskEither.chain(
-    (
-      res
-    ): TaskEither.TaskEither<
-      RetryableEsClientError | WaitForTaskCompletionTimeout,
-      'pickup_updated_mappings_succeeded'
-    > => {
-      // We don't catch or type failures/errors because they should never
-      // occur in our migration algorithm and we don't have any business logic
-      // for dealing with it. If something happens we'll just crash and try
-      // again.
-      if (Option.isSome(res.failures)) {
-        throw new Error(
-          'pickupUpdatedMappings task failed with the following failures:\n' +
-            JSON.stringify(res.failures.value)
-        );
-      } else if (Option.isSome(res.error)) {
-        throw new Error(
-          'pickupUpdatedMappings task failed with the following error:\n' +
-            JSON.stringify(res.error.value)
-        );
-      } else {
-        return TaskEither.right('pickup_updated_mappings_succeeded' as const);
-      }
-    }
-  )
-);
-export interface AliasNotFound {
-  type: 'alias_not_found_exception';
-}
-
-/** @internal */
-export interface RemoveIndexNotAConcreteIndex {
-  type: 'remove_index_not_a_concrete_index';
-}
-
-/** @internal */
-export type AliasAction =
-  | { remove_index: { index: string } }
-  | { remove: { index: string; alias: string; must_exist: boolean } }
-  | { add: { index: string; alias: string } };
-
-/**
- * Calls the Update index alias API `_alias` with the provided alias actions.
- */
-export const updateAliases = (
-  client: ElasticsearchClient,
-  aliasActions: AliasAction[]
-): TaskEither.TaskEither<
-  IndexNotFound | AliasNotFound | RemoveIndexNotAConcreteIndex | RetryableEsClientError,
-  'update_aliases_succeeded'
-> => () => {
-  return client.indices
-    .updateAliases(
-      {
-        body: {
-          actions: aliasActions,
-        },
-      },
-      { maxRetries: 0 }
-    )
-    .then(() => {
-      // Ignore `acknowledged: false`. When the coordinating node accepts
-      // the new cluster state update but not all nodes have applied the
-      // update within the timeout `acknowledged` will be false. However,
-      // retrying this update will always immediately result in `acknowledged:
-      // true` even if there are still nodes which are falling behind with
-      // cluster state updates.
-      // The only impact for using `updateAliases` to mark the version index
-      // as ready is that it could take longer for other Kibana instances to
-      // see that the version index is ready so they are more likely to
-      // perform unecessary duplicate work.
-      return Either.right('update_aliases_succeeded' as const);
-    })
-    .catch((err: EsErrors.ElasticsearchClientError) => {
-      if (err instanceof EsErrors.ResponseError) {
-        if (err?.body?.error?.type === 'index_not_found_exception') {
-          return Either.left({
-            type: 'index_not_found_exception' as const,
-            index: err.body.error.index,
-          });
-        } else if (
-          err?.body?.error?.type === 'illegal_argument_exception' &&
-          err?.body?.error?.reason?.match(
-            /The provided expression \[.+\] matches an alias, specify the corresponding concrete indices instead./
-          )
-        ) {
-          return Either.left({ type: 'remove_index_not_a_concrete_index' as const });
-        } else if (
-          err?.body?.error?.type === 'aliases_not_found_exception' ||
-          (err?.body?.error?.type === 'resource_not_found_exception' &&
-            err?.body?.error?.reason?.match(/required alias \[.+\] does not exist/))
-        ) {
-          return Either.left({
-            type: 'alias_not_found_exception' as const,
-          });
-        }
-      }
-      throw err;
-    })
-    .catch(catchRetryableEsClientErrors);
-};
-
 /** @internal */
 export interface AcknowledgeResponse {
   acknowledged: boolean;
   shardsAcknowledged: boolean;
 }
-
-function aliasArrayToRecord(aliases: string[]): Record<string, estypes.Alias> {
-  const result: Record<string, estypes.Alias> = {};
-  for (const alias of aliases) {
-    result[alias] = {};
-  }
-  return result;
-}
-/**
- * Creates an index with the given mappings
- *
- * @remarks
- * This method adds some additional logic to the ES create index API:
- *  - it is idempotent, if it gets called multiple times subsequent calls will
- *    wait for the first create operation to complete (up to 60s)
- *  - the first call will wait up to 120s for the cluster state and all shards
- *    to be updated.
- */
-export const createIndex = (
-  client: ElasticsearchClient,
-  indexName: string,
-  mappings: IndexMapping,
-  aliases: string[] = []
-): TaskEither.TaskEither<RetryableEsClientError, 'create_index_succeeded'> => {
-  const createIndexTask: TaskEither.TaskEither<
-    RetryableEsClientError,
-    AcknowledgeResponse
-  > = () => {
-    const aliasesObject = aliasArrayToRecord(aliases);
-
-    return client.indices
-      .create(
-        {
-          index: indexName,
-          // wait until all shards are available before creating the index
-          // (since number_of_shards=1 this does not have any effect atm)
-          wait_for_active_shards: WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
-          // Wait up to 60s for the cluster state to update and all shards to be
-          // started
-          timeout: DEFAULT_TIMEOUT,
-          body: {
-            mappings,
-            aliases: aliasesObject,
-            settings: {
-              index: {
-                // ES rule of thumb: shards should be several GB to 10's of GB, so
-                // Kibana is unlikely to cross that limit.
-                number_of_shards: 1,
-                auto_expand_replicas: INDEX_AUTO_EXPAND_REPLICAS,
-                // Set an explicit refresh interval so that we don't inherit the
-                // value from incorrectly configured index templates (not required
-                // after we adopt system indices)
-                refresh_interval: '1s',
-                // Bump priority so that recovery happens before newer indices
-                priority: 10,
-              },
-            },
-          },
-        },
-        { maxRetries: 0 /** handle retry ourselves for now */ }
-      )
-      .then((res) => {
-        /**
-         * - acknowledged=false, we timed out before the cluster state was
-         *   updated on all nodes with the newly created index, but it
-         *   probably will be created sometime soon.
-         * - shards_acknowledged=false, we timed out before all shards were
-         *   started
-         * - acknowledged=true, shards_acknowledged=true, index creation complete
-         */
-        return Either.right({
-          acknowledged: res.body.acknowledged,
-          shardsAcknowledged: res.body.shards_acknowledged,
-        });
-      })
-      .catch((error) => {
-        if (error?.body?.error?.type === 'resource_already_exists_exception') {
-          /**
-           * If the target index already exists it means a previous create
-           * operation had already been started. However, we can't be sure
-           * that all shards were started so return shardsAcknowledged: false
-           */
-          return Either.right({
-            acknowledged: true,
-            shardsAcknowledged: false,
-          });
-        } else {
-          throw error;
-        }
-      })
-      .catch(catchRetryableEsClientErrors);
-  };
-
-  return pipe(
-    createIndexTask,
-    TaskEither.chain((res) => {
-      if (res.acknowledged && res.shardsAcknowledged) {
-        // If the cluster state was updated and all shards ackd we're done
-        return TaskEither.right('create_index_succeeded');
-      } else {
-        // Otherwise, wait until the target index has a 'yellow' status.
-        return pipe(
-          waitForIndexStatusYellow(client, indexName, DEFAULT_TIMEOUT),
-          TaskEither.map(() => {
-            /** When the index status is 'yellow' we know that all shards were started */
-            return 'create_index_succeeded';
-          })
-        );
-      }
-    })
-  );
-};
-
-/** @internal */
-export interface UpdateAndPickupMappingsResponse {
-  taskId: string;
+// Map of left response 'type' string -> response interface
+export interface ActionErrorTypeMap {
+  wait_for_task_completion_timeout: WaitForTaskCompletionTimeout;
+  retryable_es_client_error: RetryableEsClientError;
+  index_not_found_exception: IndexNotFound;
+  target_index_had_write_block: TargetIndexHadWriteBlock;
+  incompatible_mapping_exception: IncompatibleMappingException;
+  alias_not_found_exception: AliasNotFound;
+  remove_index_not_a_concrete_index: RemoveIndexNotAConcreteIndex;
+  documents_transform_failed: DocumentsTransformFailed;
 }
 
 /**
- * Updates an index's mappings and runs an pickupUpdatedMappings task so that the mapping
- * changes are "picked up". Returns a taskId to track progress.
+ * Type guard for narrowing the type of a left
  */
-export const updateAndPickupMappings = (
-  client: ElasticsearchClient,
-  index: string,
-  mappings: IndexMapping
-): TaskEither.TaskEither<RetryableEsClientError, UpdateAndPickupMappingsResponse> => {
-  const putMappingTask: TaskEither.TaskEither<
-    RetryableEsClientError,
-    'update_mappings_succeeded'
-  > = () => {
-    return client.indices
-      .putMapping({
-        index,
-        timeout: DEFAULT_TIMEOUT,
-        body: mappings,
-      })
-      .then((res) => {
-        // Ignore `acknowledged: false`. When the coordinating node accepts
-        // the new cluster state update but not all nodes have applied the
-        // update within the timeout `acknowledged` will be false. However,
-        // retrying this update will always immediately result in `acknowledged:
-        // true` even if there are still nodes which are falling behind with
-        // cluster state updates.
-        // For updateAndPickupMappings this means that there is the potential
-        // that some existing document's fields won't be picked up if the node
-        // on which the Kibana shard is running has fallen behind with cluster
-        // state updates and the mapping update wasn't applied before we run
-        // `pickupUpdatedMappings`. ES tries to limit this risk by blocking
-        // index operations (including update_by_query used by
-        // updateAndPickupMappings) if there are pending mappings changes. But
-        // not all mapping changes will prevent this.
-        return Either.right('update_mappings_succeeded' as const);
-      })
-      .catch(catchRetryableEsClientErrors);
-  };
-
-  return pipe(
-    putMappingTask,
-    TaskEither.chain((res) => {
-      return pickupUpdatedMappings(client, index);
-    })
-  );
-};
-
-/** @internal */
-export interface SearchResponse {
-  outdatedDocuments: SavedObjectsRawDoc[];
-}
-
-interface SearchForOutdatedDocumentsOptions {
-  batchSize: number;
-  targetIndex: string;
-  outdatedDocumentsQuery?: estypes.QueryContainer;
+export function isLeftTypeof<T extends keyof ActionErrorTypeMap>(
+  res: any,
+  typeString: T
+): res is ActionErrorTypeMap[T] {
+  return res.type === typeString;
 }
-
-/**
- * Search for outdated saved object documents with the provided query. Will
- * return one batch of documents. Searching should be repeated until no more
- * outdated documents can be found.
- *
- * Used for testing only
- */
-export const searchForOutdatedDocuments = (
-  client: ElasticsearchClient,
-  options: SearchForOutdatedDocumentsOptions
-): TaskEither.TaskEither<RetryableEsClientError, SearchResponse> => () => {
-  return client
-    .search<SavedObjectsRawDocSource>({
-      index: options.targetIndex,
-      // Return the _seq_no and _primary_term so we can use optimistic
-      // concurrency control for updates
-      seq_no_primary_term: true,
-      size: options.batchSize,
-      body: {
-        query: options.outdatedDocumentsQuery,
-        // Optimize search performance by sorting by the "natural" index order
-        sort: ['_doc'],
-      },
-      // Return an error when targeting missing or closed indices
-      allow_no_indices: false,
-      // Don't return partial results if timeouts or shard failures are
-      // encountered. This is important because 0 search hits is interpreted as
-      // there being no more outdated documents left that require
-      // transformation. Although the default is `false`, we set this
-      // explicitly to avoid users overriding the
-      // search.default_allow_partial_results cluster setting to true.
-      allow_partial_search_results: false,
-      // Improve performance by not calculating the total number of hits
-      // matching the query.
-      track_total_hits: false,
-      // Reduce the response payload size by only returning the data we care about
-      filter_path: [
-        'hits.hits._id',
-        'hits.hits._source',
-        'hits.hits._seq_no',
-        'hits.hits._primary_term',
-      ],
-    })
-    .then((res) =>
-      Either.right({ outdatedDocuments: (res.body.hits?.hits as SavedObjectsRawDoc[]) ?? [] })
-    )
-    .catch(catchRetryableEsClientErrors);
-};
-
-/**
- * Write the up-to-date transformed documents to the index, overwriting any
- * documents that are still on their outdated version.
- */
-export const bulkOverwriteTransformedDocuments = (
-  client: ElasticsearchClient,
-  index: string,
-  transformedDocs: SavedObjectsRawDoc[],
-  refresh: estypes.Refresh
-): TaskEither.TaskEither<RetryableEsClientError, 'bulk_index_succeeded'> => () => {
-  return client
-    .bulk({
-      // Because we only add aliases in the MARK_VERSION_INDEX_READY step we
-      // can't bulkIndex to an alias with require_alias=true. This means if
-      // users tamper during this operation (delete indices or restore a
-      // snapshot), we could end up auto-creating an index without the correct
-      // mappings. Such tampering could lead to many other problems and is
-      // probably unlikely so for now we'll accept this risk and wait till
-      // system indices puts in place a hard control.
-      require_alias: false,
-      wait_for_active_shards: WAIT_FOR_ALL_SHARDS_TO_BE_ACTIVE,
-      refresh,
-      filter_path: ['items.*.error'],
-      body: transformedDocs.flatMap((doc) => {
-        return [
-          {
-            index: {
-              _index: index,
-              _id: doc._id,
-              // overwrite existing documents
-              op_type: 'index',
-              // use optimistic concurrency control to ensure that outdated
-              // documents are only overwritten once with the latest version
-              if_seq_no: doc._seq_no,
-              if_primary_term: doc._primary_term,
-            },
-          },
-          doc._source,
-        ];
-      }),
-    })
-    .then((res) => {
-      // Filter out version_conflict_engine_exception since these just mean
-      // that another instance already updated these documents
-      const errors = (res.body.items ?? []).filter(
-        (item) => item.index?.error?.type !== 'version_conflict_engine_exception'
-      );
-      if (errors.length === 0) {
-        return Either.right('bulk_index_succeeded' as const);
-      } else {
-        throw new Error(JSON.stringify(errors));
-      }
-    })
-    .catch(catchRetryableEsClientErrors);
-};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts b/src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts
new file mode 100644
index 0000000000000..3fa4d59e383bf
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/integration_tests/actions.test.ts
@@ -0,0 +1,1515 @@
+/*
+ * Copyright 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 { ElasticsearchClient } from '../../../../';
+import { InternalCoreStart } from '../../../../internal_types';
+import * as kbnTestServer from '../../../../../test_helpers/kbn_server';
+import { Root } from '../../../../root';
+import { SavedObjectsRawDoc } from '../../../serialization';
+import {
+  bulkOverwriteTransformedDocuments,
+  cloneIndex,
+  closePit,
+  createIndex,
+  fetchIndices,
+  openPit,
+  OpenPitResponse,
+  reindex,
+  readWithPit,
+  ReadWithPit,
+  searchForOutdatedDocuments,
+  SearchResponse,
+  setWriteBlock,
+  updateAliases,
+  waitForReindexTask,
+  ReindexResponse,
+  waitForPickupUpdatedMappingsTask,
+  pickupUpdatedMappings,
+  UpdateByQueryResponse,
+  updateAndPickupMappings,
+  UpdateAndPickupMappingsResponse,
+  verifyReindex,
+  removeWriteBlock,
+  transformDocs,
+  waitForIndexStatusYellow,
+} from '../../actions';
+import * as Either from 'fp-ts/lib/Either';
+import * as Option from 'fp-ts/lib/Option';
+import { ResponseError } from '@elastic/elasticsearch/lib/errors';
+import { DocumentsTransformFailed, DocumentsTransformSuccess } from '../../../migrations/core';
+import { TaskEither } from 'fp-ts/lib/TaskEither';
+
+const { startES } = kbnTestServer.createTestServers({
+  adjustTimeout: (t: number) => jest.setTimeout(t),
+});
+let esServer: kbnTestServer.TestElasticsearchUtils;
+
+describe('migration actions', () => {
+  let root: Root;
+  let start: InternalCoreStart;
+  let client: ElasticsearchClient;
+
+  beforeAll(async () => {
+    esServer = await startES();
+    root = kbnTestServer.createRootWithCorePlugins({
+      server: {
+        basePath: '/hello',
+      },
+    });
+
+    await root.setup();
+    start = await root.start();
+    client = start.elasticsearch.client.asInternalUser;
+
+    // Create test fixture data:
+    await createIndex({
+      client,
+      indexName: 'existing_index_with_docs',
+      mappings: {
+        dynamic: true,
+        properties: {},
+      },
+    })();
+    const sourceDocs = ([
+      { _source: { title: 'doc 1' } },
+      { _source: { title: 'doc 2' } },
+      { _source: { title: 'doc 3' } },
+      { _source: { title: 'saved object 4', type: 'another_unused_type' } },
+      { _source: { title: 'f-agent-event 5', type: 'f_agent_event' } },
+    ] as unknown) as SavedObjectsRawDoc[];
+    await bulkOverwriteTransformedDocuments({
+      client,
+      index: 'existing_index_with_docs',
+      transformedDocs: sourceDocs,
+      refresh: 'wait_for',
+    })();
+
+    await createIndex({ client, indexName: 'existing_index_2', mappings: { properties: {} } })();
+    await createIndex({
+      client,
+      indexName: 'existing_index_with_write_block',
+      mappings: { properties: {} },
+    })();
+    await bulkOverwriteTransformedDocuments({
+      client,
+      index: 'existing_index_with_write_block',
+      transformedDocs: sourceDocs,
+      refresh: 'wait_for',
+    })();
+    await setWriteBlock({ client, index: 'existing_index_with_write_block' })();
+    await updateAliases({
+      client,
+      aliasActions: [{ add: { index: 'existing_index_2', alias: 'existing_index_2_alias' } }],
+    })();
+  });
+
+  afterAll(async () => {
+    await esServer.stop();
+    await root.shutdown();
+  });
+
+  describe('fetchIndices', () => {
+    it('resolves right empty record if no indices were found', async () => {
+      expect.assertions(1);
+      const task = fetchIndices({ client, indices: ['no_such_index'] });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": Object {},
+                }
+              `);
+    });
+    it('resolves right record with found indices', async () => {
+      expect.assertions(1);
+      const res = (await fetchIndices({
+        client,
+        indices: ['no_such_index', 'existing_index_with_docs'],
+      })()) as Either.Right<unknown>;
+
+      expect(res.right).toEqual(
+        expect.objectContaining({
+          existing_index_with_docs: {
+            aliases: {},
+            mappings: expect.anything(),
+            settings: expect.anything(),
+          },
+        })
+      );
+    });
+  });
+
+  describe('setWriteBlock', () => {
+    beforeAll(async () => {
+      await createIndex({
+        client,
+        indexName: 'new_index_without_write_block',
+        mappings: { properties: {} },
+      })();
+    });
+    it('resolves right when setting the write block succeeds', async () => {
+      expect.assertions(1);
+      const task = setWriteBlock({ client, index: 'new_index_without_write_block' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "set_write_block_succeeded",
+                }
+              `);
+    });
+    it('resolves right when setting a write block on an index that already has one', async () => {
+      expect.assertions(1);
+      const task = setWriteBlock({ client, index: 'existing_index_with_write_block' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "set_write_block_succeeded",
+                }
+              `);
+    });
+    it('once resolved, prevents further writes to the index', async () => {
+      expect.assertions(1);
+      const task = setWriteBlock({ client, index: 'new_index_without_write_block' });
+      await task();
+      const sourceDocs = ([
+        { _source: { title: 'doc 1' } },
+        { _source: { title: 'doc 2' } },
+        { _source: { title: 'doc 3' } },
+        { _source: { title: 'doc 4' } },
+      ] as unknown) as SavedObjectsRawDoc[];
+      await expect(
+        bulkOverwriteTransformedDocuments({
+          client,
+          index: 'new_index_without_write_block',
+          transformedDocs: sourceDocs,
+          refresh: 'wait_for',
+        })()
+      ).rejects.toMatchObject(expect.anything());
+    });
+    it('resolves left index_not_found_exception when the index does not exist', async () => {
+      expect.assertions(1);
+      const task = setWriteBlock({ client, index: 'no_such_index' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Left",
+                  "left": Object {
+                    "index": "no_such_index",
+                    "type": "index_not_found_exception",
+                  },
+                }
+              `);
+    });
+  });
+
+  describe('removeWriteBlock', () => {
+    beforeAll(async () => {
+      await createIndex({
+        client,
+        indexName: 'existing_index_without_write_block_2',
+        mappings: { properties: {} },
+      })();
+      await createIndex({
+        client,
+        indexName: 'existing_index_with_write_block_2',
+        mappings: { properties: {} },
+      })();
+      await setWriteBlock({ client, index: 'existing_index_with_write_block_2' })();
+    });
+    it('resolves right if successful when an index already has a write block', async () => {
+      expect.assertions(1);
+      const task = removeWriteBlock({ client, index: 'existing_index_with_write_block_2' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "remove_write_block_succeeded",
+                }
+              `);
+    });
+    it('resolves right if successful when an index does not have a write block', async () => {
+      expect.assertions(1);
+      const task = removeWriteBlock({ client, index: 'existing_index_without_write_block_2' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "remove_write_block_succeeded",
+                }
+              `);
+    });
+    it('rejects if there is a non-retryable error', async () => {
+      expect.assertions(1);
+      const task = removeWriteBlock({ client, index: 'no_such_index' });
+      await expect(task()).rejects.toThrow('index_not_found_exception');
+    });
+  });
+
+  describe('waitForIndexStatusYellow', () => {
+    afterAll(async () => {
+      await client.indices.delete({ index: 'red_then_yellow_index' });
+    });
+    it('resolves right after waiting for an index status to be yellow if the index already existed', async () => {
+      // Create a red index
+      await client.indices.create(
+        {
+          index: 'red_then_yellow_index',
+          timeout: '5s',
+          body: {
+            mappings: { properties: {} },
+            settings: {
+              // Allocate 1 replica so that this index stays yellow
+              number_of_replicas: '1',
+              // Disable all shard allocation so that the index status is red
+              routing: { allocation: { enable: 'none' } },
+            },
+          },
+        },
+        { maxRetries: 0 /** handle retry ourselves for now */ }
+      );
+
+      // Start tracking the index status
+      const indexStatusPromise = waitForIndexStatusYellow({
+        client,
+        index: 'red_then_yellow_index',
+      })();
+
+      const redStatusResponse = await client.cluster.health({ index: 'red_then_yellow_index' });
+      expect(redStatusResponse.body.status).toBe('red');
+
+      client.indices.putSettings({
+        index: 'red_then_yellow_index',
+        body: {
+          // Enable all shard allocation so that the index status turns yellow
+          settings: { routing: { allocation: { enable: 'all' } } },
+        },
+      });
+
+      await indexStatusPromise;
+      // Assert that the promise didn't resolve before the index became yellow
+
+      const yellowStatusResponse = await client.cluster.health({ index: 'red_then_yellow_index' });
+      expect(yellowStatusResponse.body.status).toBe('yellow');
+    });
+  });
+
+  describe('cloneIndex', () => {
+    afterAll(async () => {
+      try {
+        await client.indices.delete({ index: 'clone_*' });
+      } catch (e) {
+        /** ignore */
+      }
+    });
+    it('resolves right if cloning into a new target index', async () => {
+      const task = cloneIndex({
+        client,
+        source: 'existing_index_with_write_block',
+        target: 'clone_target_1',
+      });
+      expect.assertions(1);
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                      Object {
+                        "_tag": "Right",
+                        "right": Object {
+                          "acknowledged": true,
+                          "shardsAcknowledged": true,
+                        },
+                      }
+                  `);
+    });
+    it('resolves right after waiting for index status to be yellow if clone target already existed', async () => {
+      expect.assertions(2);
+
+      // Create a yellow index
+      await client.indices
+        .create({
+          index: 'clone_red_then_yellow_index',
+          timeout: '5s',
+          body: {
+            mappings: { properties: {} },
+            settings: {
+              // Allocate 1 replica so that this index stays yellow
+              number_of_replicas: '1',
+              // Disable all shard allocation so that the index status is red
+              'index.routing.allocation.enable': 'none',
+            },
+          },
+        })
+        .catch((e) => {});
+
+      // Call clone even though the index already exists
+      const cloneIndexPromise = cloneIndex({
+        client,
+        source: 'existing_index_with_write_block',
+        target: 'clone_red_then_yellow_index',
+      })();
+
+      let indexYellow = false;
+      setTimeout(() => {
+        client.indices.putSettings({
+          index: 'clone_red_then_yellow_index',
+          body: {
+            // Enable all shard allocation so that the index status goes yellow
+            settings: { routing: { allocation: { enable: 'all' } } },
+          },
+        });
+        indexYellow = true;
+      }, 10);
+
+      await cloneIndexPromise.then((res) => {
+        // Assert that the promise didn't resolve before the index became green
+        expect(indexYellow).toBe(true);
+        expect(res).toMatchInlineSnapshot(`
+          Object {
+            "_tag": "Right",
+            "right": Object {
+              "acknowledged": true,
+              "shardsAcknowledged": true,
+            },
+          }
+        `);
+      });
+    });
+    it('resolves left index_not_found_exception if the source index does not exist', async () => {
+      expect.assertions(1);
+      const task = cloneIndex({ client, source: 'no_such_index', target: 'clone_target_3' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                      Object {
+                        "_tag": "Left",
+                        "left": Object {
+                          "index": "no_such_index",
+                          "type": "index_not_found_exception",
+                        },
+                      }
+                  `);
+    });
+    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 () => {
+      // Create a red index
+      await client.indices
+        .create({
+          index: 'clone_red_index',
+          timeout: '5s',
+          body: {
+            mappings: { properties: {} },
+            settings: {
+              // Allocate 1 replica so that this index stays yellow
+              number_of_replicas: '1',
+              // Disable all shard allocation so that the index status is red
+              'index.routing.allocation.enable': 'none',
+            },
+          },
+        })
+        .catch((e) => {});
+
+      // Call clone even though the index already exists
+      const cloneIndexPromise = cloneIndex({
+        client,
+        source: 'existing_index_with_write_block',
+        target: 'clone_red_index',
+        timeout: '0s',
+      })();
+
+      await cloneIndexPromise.then((res) => {
+        expect(res).toMatchInlineSnapshot(`
+          Object {
+            "_tag": "Left",
+            "left": Object {
+              "error": [ResponseError: Response Error],
+              "message": "Response Error",
+              "type": "retryable_es_client_error",
+            },
+          }
+        `);
+      });
+    });
+  });
+
+  // Reindex doesn't return any errors on it's own, so we have to test
+  // together with waitForReindexTask
+  describe('reindex & waitForReindexTask', () => {
+    it('resolves right when reindex succeeds without reindex script', async () => {
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "reindex_succeeded",
+                }
+              `);
+
+      const results = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'reindex_target',
+        outdatedDocumentsQuery: undefined,
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
+        Array [
+          "doc 1",
+          "doc 2",
+          "doc 3",
+          "f-agent-event 5",
+          "saved object 4",
+        ]
+      `);
+    });
+    it('resolves right and excludes all documents not matching the unusedTypesQuery', async () => {
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_excluded_docs',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: {
+          bool: {
+            must_not: ['f_agent_event', 'another_unused_type'].map((type) => ({
+              term: { type },
+            })),
+          },
+        },
+      })()) as Either.Right<ReindexResponse>;
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                      Object {
+                        "_tag": "Right",
+                        "right": "reindex_succeeded",
+                      }
+                  `);
+
+      const results = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'reindex_target_excluded_docs',
+        outdatedDocumentsQuery: undefined,
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
+        Array [
+          "doc 1",
+          "doc 2",
+          "doc 3",
+        ]
+      `);
+    });
+    it('resolves right when reindex succeeds with reindex script', async () => {
+      expect.assertions(2);
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_2',
+        reindexScript: Option.some(`ctx._source.title = ctx._source.title + '_updated'`),
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "reindex_succeeded",
+                }
+              `);
+      const results = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'reindex_target_2',
+        outdatedDocumentsQuery: undefined,
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
+        Array [
+          "doc 1_updated",
+          "doc 2_updated",
+          "doc 3_updated",
+          "f-agent-event 5_updated",
+          "saved object 4_updated",
+        ]
+      `);
+    });
+    it('resolves right, ignores version conflicts and does not update existing docs when reindex multiple times', async () => {
+      expect.assertions(3);
+      // Reindex with a script
+      let res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_3',
+        reindexScript: Option.some(`ctx._source.title = ctx._source.title + '_updated'`),
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      let task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                      Object {
+                        "_tag": "Right",
+                        "right": "reindex_succeeded",
+                      }
+                  `);
+
+      // reindex without a script
+      res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_3',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                      Object {
+                        "_tag": "Right",
+                        "right": "reindex_succeeded",
+                      }
+                  `);
+
+      // Assert that documents weren't overridden by the second, unscripted reindex
+      const results = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'reindex_target_3',
+        outdatedDocumentsQuery: undefined,
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
+        Array [
+          "doc 1_updated",
+          "doc 2_updated",
+          "doc 3_updated",
+          "f-agent-event 5_updated",
+          "saved object 4_updated",
+        ]
+      `);
+    });
+    it('resolves right and proceeds to add missing documents if there are some existing docs conflicts', async () => {
+      expect.assertions(2);
+      // Simulate a reindex that only adds some of the documents from the
+      // source index into the target index
+      await createIndex({ client, indexName: 'reindex_target_4', mappings: { properties: {} } })();
+      const sourceDocs = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'existing_index_with_docs',
+        outdatedDocumentsQuery: undefined,
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments
+        .slice(0, 2)
+        .map(({ _id, _source }) => ({
+          _id,
+          _source,
+        }));
+      await bulkOverwriteTransformedDocuments({
+        client,
+        index: 'reindex_target_4',
+        transformedDocs: sourceDocs,
+        refresh: 'wait_for',
+      })();
+
+      // Now do a real reindex
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_4',
+        reindexScript: Option.some(`ctx._source.title = ctx._source.title + '_updated'`),
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                        Object {
+                          "_tag": "Right",
+                          "right": "reindex_succeeded",
+                        }
+                  `);
+      // Assert that existing documents weren't overridden, but that missing
+      // documents were added by the reindex
+      const results = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'reindex_target_4',
+        outdatedDocumentsQuery: undefined,
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
+        Array [
+          "doc 1",
+          "doc 2",
+          "doc 3_updated",
+          "f-agent-event 5_updated",
+          "saved object 4_updated",
+        ]
+      `);
+    });
+    it('resolves left incompatible_mapping_exception if all reindex failures are due to a strict_dynamic_mapping_exception', async () => {
+      expect.assertions(1);
+      // Simulates one instance having completed the UPDATE_TARGET_MAPPINGS
+      // step which makes the mappings incompatible with outdated documents.
+      // If another instance then tries a reindex it will get a
+      // strict_dynamic_mapping_exception even if the documents already exist
+      // and should ignore this error.
+
+      // Create an index with incompatible mappings
+      await createIndex({
+        client,
+        indexName: 'reindex_target_5',
+        mappings: {
+          dynamic: 'strict',
+          properties: {
+            /** no title field */
+          },
+        },
+      })();
+
+      const {
+        right: { taskId: reindexTaskId },
+      } = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_5',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      const task = waitForReindexTask({ client, taskId: reindexTaskId, timeout: '10s' });
+
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                      Object {
+                        "_tag": "Left",
+                        "left": Object {
+                          "type": "incompatible_mapping_exception",
+                        },
+                      }
+                  `);
+    });
+    it('resolves left incompatible_mapping_exception if all reindex failures are due to a mapper_parsing_exception', async () => {
+      expect.assertions(1);
+      // Simulates one instance having completed the UPDATE_TARGET_MAPPINGS
+      // step which makes the mappings incompatible with outdated documents.
+      // If another instance then tries a reindex it will get a
+      // strict_dynamic_mapping_exception even if the documents already exist
+      // and should ignore this error.
+
+      // Create an index with incompatible mappings
+      await createIndex({
+        client,
+        indexName: 'reindex_target_6',
+        mappings: {
+          dynamic: false,
+          properties: { title: { type: 'integer' } }, // integer is incompatible with string title
+        },
+      })();
+
+      const {
+        right: { taskId: reindexTaskId },
+      } = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_6',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      const task = waitForReindexTask({ client, taskId: reindexTaskId, timeout: '10s' });
+
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                        Object {
+                          "_tag": "Left",
+                          "left": Object {
+                            "type": "incompatible_mapping_exception",
+                          },
+                        }
+                  `);
+    });
+    it('resolves left index_not_found_exception if source index does not exist', async () => {
+      expect.assertions(1);
+      const res = (await reindex({
+        client,
+        sourceIndex: 'no_such_index',
+        targetIndex: 'reindex_target',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: {
+          match_all: {},
+        },
+      })()) as Either.Right<ReindexResponse>;
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                            Object {
+                              "_tag": "Left",
+                              "left": Object {
+                                "index": "no_such_index",
+                                "type": "index_not_found_exception",
+                              },
+                            }
+                    `);
+    });
+    it('resolves left target_index_had_write_block if all failures are due to a write block', async () => {
+      expect.assertions(1);
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'existing_index_with_write_block',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                          Object {
+                            "_tag": "Left",
+                            "left": Object {
+                              "type": "target_index_had_write_block",
+                            },
+                          }
+                    `);
+    });
+    it('resolves left if requireAlias=true and the target is not an alias', async () => {
+      expect.assertions(1);
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'existing_index_with_write_block',
+        reindexScript: Option.none,
+        requireAlias: true,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' });
+
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Left",
+                  "left": Object {
+                    "index": "existing_index_with_write_block",
+                    "type": "index_not_found_exception",
+                  },
+                }
+              `);
+    });
+    it('resolves left wait_for_task_completion_timeout when the task does not finish within the timeout', async () => {
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+
+      const task = waitForReindexTask({ client, taskId: res.right.taskId, timeout: '0s' });
+
+      await expect(task()).resolves.toMatchObject({
+        _tag: 'Left',
+        left: {
+          error: expect.any(ResponseError),
+          message: expect.stringMatching(
+            /\[timeout_exception\] Timed out waiting for completion of \[org.elasticsearch.index.reindex.BulkByScrollTask/
+          ),
+          type: 'wait_for_task_completion_timeout',
+        },
+      });
+    });
+  });
+
+  describe('verifyReindex', () => {
+    it('resolves right if source and target indices have the same amount of documents', async () => {
+      expect.assertions(1);
+      const res = (await reindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_7',
+        reindexScript: Option.none,
+        requireAlias: false,
+        unusedTypesQuery: { match_all: {} },
+      })()) as Either.Right<ReindexResponse>;
+      await waitForReindexTask({ client, taskId: res.right.taskId, timeout: '10s' })();
+
+      const task = verifyReindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'reindex_target_7',
+      });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+              Object {
+                "_tag": "Right",
+                "right": "verify_reindex_succeeded",
+              }
+            `);
+    });
+    it('resolves left if source and target indices have different amount of documents', async () => {
+      expect.assertions(1);
+      const task = verifyReindex({
+        client,
+        sourceIndex: 'existing_index_with_docs',
+        targetIndex: 'existing_index_2',
+      });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Left",
+                  "left": Object {
+                    "type": "verify_reindex_failed",
+                  },
+                }
+              `);
+    });
+    it('rejects if source or target index does not exist', async () => {
+      expect.assertions(2);
+      let task = verifyReindex({
+        client,
+        sourceIndex: 'no_such_index',
+        targetIndex: 'existing_index_2',
+      });
+      await expect(task()).rejects.toThrow('index_not_found_exception');
+
+      task = verifyReindex({
+        client,
+        sourceIndex: 'existing_index_2',
+        targetIndex: 'no_such_index',
+      });
+      await expect(task()).rejects.toThrow('index_not_found_exception');
+    });
+  });
+
+  describe('openPit', () => {
+    it('opens PointInTime for an index', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      expect(pitResponse.right.pitId).toEqual(expect.any(String));
+
+      const searchResponse = await client.search({
+        body: {
+          pit: { id: pitResponse.right.pitId },
+        },
+      });
+
+      await expect(searchResponse.body.hits.hits.length).toBeGreaterThan(0);
+    });
+    it('rejects if index does not exist', async () => {
+      const openPitTask = openPit({ client, index: 'no_such_index' });
+      await expect(openPitTask()).rejects.toThrow('index_not_found_exception');
+    });
+  });
+
+  describe('readWithPit', () => {
+    it('requests documents from an index using given PIT', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      const readWithPitTask = readWithPit({
+        client,
+        pitId: pitResponse.right.pitId,
+        query: { match_all: {} },
+        batchSize: 1000,
+        searchAfter: undefined,
+      });
+      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
+
+      await expect(docsResponse.right.outdatedDocuments.length).toBe(5);
+    });
+
+    it('requests the batchSize of documents from an index', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      const readWithPitTask = readWithPit({
+        client,
+        pitId: pitResponse.right.pitId,
+        query: { match_all: {} },
+        batchSize: 3,
+        searchAfter: undefined,
+      });
+      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
+
+      await expect(docsResponse.right.outdatedDocuments.length).toBe(3);
+    });
+
+    it('it excludes documents not matching the provided "query"', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      const readWithPitTask = readWithPit({
+        client,
+        pitId: pitResponse.right.pitId,
+        query: {
+          bool: {
+            must_not: [
+              {
+                term: {
+                  type: 'f_agent_event',
+                },
+              },
+              {
+                term: {
+                  type: 'another_unused_type',
+                },
+              },
+            ],
+          },
+        },
+        batchSize: 1000,
+        searchAfter: undefined,
+      });
+
+      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
+
+      expect(docsResponse.right.outdatedDocuments.map((doc) => doc._source.title).sort())
+        .toMatchInlineSnapshot(`
+        Array [
+          "doc 1",
+          "doc 2",
+          "doc 3",
+        ]
+      `);
+    });
+
+    it('only returns documents that match the provided "query"', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      const readWithPitTask = readWithPit({
+        client,
+        pitId: pitResponse.right.pitId,
+        query: {
+          match: { title: { query: 'doc' } },
+        },
+        batchSize: 1000,
+        searchAfter: undefined,
+      });
+
+      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
+
+      expect(docsResponse.right.outdatedDocuments.map((doc) => doc._source.title).sort())
+        .toMatchInlineSnapshot(`
+        Array [
+          "doc 1",
+          "doc 2",
+          "doc 3",
+        ]
+      `);
+    });
+
+    it('returns docs with _seq_no and _primary_term when specified', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      const readWithPitTask = readWithPit({
+        client,
+        pitId: pitResponse.right.pitId,
+        query: {
+          match: { title: { query: 'doc' } },
+        },
+        batchSize: 1000,
+        searchAfter: undefined,
+        seqNoPrimaryTerm: true,
+      });
+
+      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
+
+      expect(docsResponse.right.outdatedDocuments).toEqual(
+        expect.arrayContaining([
+          expect.objectContaining({
+            _seq_no: expect.any(Number),
+            _primary_term: expect.any(Number),
+          }),
+        ])
+      );
+    });
+
+    it('does not return docs with _seq_no and _primary_term if not specified', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      const readWithPitTask = readWithPit({
+        client,
+        pitId: pitResponse.right.pitId,
+        query: {
+          match: { title: { query: 'doc' } },
+        },
+        batchSize: 1000,
+        searchAfter: undefined,
+      });
+
+      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
+
+      expect(docsResponse.right.outdatedDocuments).toEqual(
+        expect.arrayContaining([
+          expect.not.objectContaining({
+            _seq_no: expect.any(Number),
+            _primary_term: expect.any(Number),
+          }),
+        ])
+      );
+    });
+
+    it('rejects if PIT does not exist', async () => {
+      const readWithPitTask = readWithPit({
+        client,
+        pitId: 'no_such_pit',
+        query: { match_all: {} },
+        batchSize: 1000,
+        searchAfter: undefined,
+      });
+      await expect(readWithPitTask()).rejects.toThrow('illegal_argument_exception');
+    });
+  });
+
+  describe('closePit', () => {
+    it('closes PointInTime', async () => {
+      const openPitTask = openPit({ client, index: 'existing_index_with_docs' });
+      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
+
+      const pitId = pitResponse.right.pitId;
+      await closePit({ client, pitId })();
+
+      const searchTask = client.search({
+        body: {
+          pit: { id: pitId },
+        },
+      });
+
+      await expect(searchTask).rejects.toThrow('search_phase_execution_exception');
+    });
+
+    it('rejects if PIT does not exist', async () => {
+      const closePitTask = closePit({ client, pitId: 'no_such_pit' });
+      await expect(closePitTask()).rejects.toThrow('illegal_argument_exception');
+    });
+  });
+
+  describe('transformDocs', () => {
+    it('applies "transformRawDocs" and returns the transformed documents', async () => {
+      const originalDocs = [
+        { _id: 'foo:1', _source: { type: 'dashboard', value: 1 } },
+        { _id: 'foo:2', _source: { type: 'dashboard', value: 2 } },
+      ];
+
+      function innerTransformRawDocs(
+        docs: SavedObjectsRawDoc[]
+      ): TaskEither<DocumentsTransformFailed, DocumentsTransformSuccess> {
+        return async () => {
+          const processedDocs: SavedObjectsRawDoc[] = [];
+          for (const doc of docs) {
+            doc._source.value += 1;
+            processedDocs.push(doc);
+          }
+          return Either.right({ processedDocs });
+        };
+      }
+      const transformTask = transformDocs({
+        transformRawDocs: innerTransformRawDocs,
+        outdatedDocuments: originalDocs,
+      });
+
+      const resultsWithProcessDocs = ((await transformTask()) as Either.Right<DocumentsTransformSuccess>)
+        .right.processedDocs;
+      expect(resultsWithProcessDocs.length).toEqual(2);
+      const foo2 = resultsWithProcessDocs.find((h) => h._id === 'foo:2');
+      expect(foo2?._source?.value).toBe(3);
+    });
+  });
+
+  describe('waitForPickupUpdatedMappingsTask', () => {
+    it('rejects if there are failures', async () => {
+      const res = (await pickupUpdatedMappings(
+        client,
+        'existing_index_with_write_block'
+      )()) as Either.Right<UpdateByQueryResponse>;
+
+      const task = waitForPickupUpdatedMappingsTask({
+        client,
+        taskId: res.right.taskId,
+        timeout: '10s',
+      });
+
+      // We can't do a snapshot match because the response includes an index
+      // id which ES assigns dynamically
+      await expect(task()).rejects.toMatchObject({
+        message: /pickupUpdatedMappings task failed with the following failures:\n\[\{\"index\":\"existing_index_with_write_block\"/,
+      });
+    });
+    it('rejects if there is an error', async () => {
+      const res = (await pickupUpdatedMappings(
+        client,
+        'no_such_index'
+      )()) as Either.Right<UpdateByQueryResponse>;
+
+      const task = waitForPickupUpdatedMappingsTask({
+        client,
+        taskId: res.right.taskId,
+        timeout: '10s',
+      });
+
+      await expect(task()).rejects.toThrow('index_not_found_exception');
+    });
+    it('resolves left wait_for_task_completion_timeout when the task does not complete within the timeout', async () => {
+      const res = (await pickupUpdatedMappings(
+        client,
+        'existing_index_with_docs'
+      )()) as Either.Right<UpdateByQueryResponse>;
+
+      const task = waitForPickupUpdatedMappingsTask({
+        client,
+        taskId: res.right.taskId,
+        timeout: '0s',
+      });
+
+      await expect(task()).resolves.toMatchObject({
+        _tag: 'Left',
+        left: {
+          error: expect.any(ResponseError),
+          message: expect.stringMatching(
+            /\[timeout_exception\] Timed out waiting for completion of \[org.elasticsearch.index.reindex.BulkByScrollTask/
+          ),
+          type: 'wait_for_task_completion_timeout',
+        },
+      });
+    });
+    it('resolves right when successful', async () => {
+      const res = (await pickupUpdatedMappings(
+        client,
+        'existing_index_with_docs'
+      )()) as Either.Right<UpdateByQueryResponse>;
+
+      const task = waitForPickupUpdatedMappingsTask({
+        client,
+        taskId: res.right.taskId,
+        timeout: '10s',
+      });
+
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                        Object {
+                          "_tag": "Right",
+                          "right": "pickup_updated_mappings_succeeded",
+                        }
+                    `);
+    });
+  });
+
+  describe('updateAndPickupMappings', () => {
+    it('resolves right when mappings were updated and picked up', async () => {
+      // Create an index without any mappings and insert documents into it
+      await createIndex({
+        client,
+        indexName: 'existing_index_without_mappings',
+        mappings: {
+          dynamic: false,
+          properties: {},
+        },
+      })();
+      const sourceDocs = ([
+        { _source: { title: 'doc 1' } },
+        { _source: { title: 'doc 2' } },
+        { _source: { title: 'doc 3' } },
+        { _source: { title: 'doc 4' } },
+      ] as unknown) as SavedObjectsRawDoc[];
+      await bulkOverwriteTransformedDocuments({
+        client,
+        index: 'existing_index_without_mappings',
+        transformedDocs: sourceDocs,
+        refresh: 'wait_for',
+      })();
+
+      // Assert that we can't search over the unmapped fields of the document
+      const originalSearchResults = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'existing_index_without_mappings',
+        outdatedDocumentsQuery: {
+          match: { title: { query: 'doc' } },
+        },
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+      expect(originalSearchResults.length).toBe(0);
+
+      // Update and pickup mappings so that the title field is searchable
+      const res = await updateAndPickupMappings({
+        client,
+        index: 'existing_index_without_mappings',
+        mappings: {
+          properties: {
+            title: { type: 'text' },
+          },
+        },
+      })();
+      expect(Either.isRight(res)).toBe(true);
+      const taskId = (res as Either.Right<UpdateAndPickupMappingsResponse>).right.taskId;
+      await waitForPickupUpdatedMappingsTask({ client, taskId, timeout: '60s' })();
+
+      // Repeat the search expecting to be able to find the existing documents
+      const pickedUpSearchResults = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'existing_index_without_mappings',
+        outdatedDocumentsQuery: {
+          match: { title: { query: 'doc' } },
+        },
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+      expect(pickedUpSearchResults.length).toBe(4);
+    });
+  });
+
+  describe('updateAliases', () => {
+    describe('remove', () => {
+      it('resolves left index_not_found_exception when the index does not exist', async () => {
+        const task = updateAliases({
+          client,
+          aliasActions: [
+            {
+              remove: {
+                alias: 'no_such_alias',
+                index: 'no_such_index',
+                must_exist: false,
+              },
+            },
+          ],
+        });
+        await expect(task()).resolves.toMatchInlineSnapshot(`
+                  Object {
+                    "_tag": "Left",
+                    "left": Object {
+                      "index": "no_such_index",
+                      "type": "index_not_found_exception",
+                    },
+                  }
+                `);
+      });
+      describe('with must_exist=false', () => {
+        it('resolves left alias_not_found_exception when alias does not exist', async () => {
+          const task = updateAliases({
+            client,
+            aliasActions: [
+              {
+                remove: {
+                  alias: 'no_such_alias',
+                  index: 'existing_index_with_docs',
+                  must_exist: false,
+                },
+              },
+            ],
+          });
+          await expect(task()).resolves.toMatchInlineSnapshot(`
+                    Object {
+                      "_tag": "Left",
+                      "left": Object {
+                        "type": "alias_not_found_exception",
+                      },
+                    }
+                  `);
+        });
+      });
+      describe('with must_exist=true', () => {
+        it('resolves left alias_not_found_exception when alias does not exist on specified index', async () => {
+          const task = updateAliases({
+            client,
+            aliasActions: [
+              {
+                remove: {
+                  alias: 'existing_index_2_alias',
+                  index: 'existing_index_with_docs',
+                  must_exist: true,
+                },
+              },
+            ],
+          });
+          await expect(task()).resolves.toMatchInlineSnapshot(`
+                    Object {
+                      "_tag": "Left",
+                      "left": Object {
+                        "type": "alias_not_found_exception",
+                      },
+                    }
+                  `);
+        });
+        it('resolves left alias_not_found_exception when alias does not exist', async () => {
+          const task = updateAliases({
+            client,
+            aliasActions: [
+              {
+                remove: {
+                  alias: 'no_such_alias',
+                  index: 'existing_index_with_docs',
+                  must_exist: true,
+                },
+              },
+            ],
+          });
+          await expect(task()).resolves.toMatchInlineSnapshot(`
+                    Object {
+                      "_tag": "Left",
+                      "left": Object {
+                        "type": "alias_not_found_exception",
+                      },
+                    }
+                  `);
+        });
+      });
+    });
+    describe('remove_index', () => {
+      it('left index_not_found_exception if index does not exist', async () => {
+        const task = updateAliases({
+          client,
+          aliasActions: [
+            {
+              remove_index: {
+                index: 'no_such_index',
+              },
+            },
+          ],
+        });
+        await expect(task()).resolves.toMatchInlineSnapshot(`
+                  Object {
+                    "_tag": "Left",
+                    "left": Object {
+                      "index": "no_such_index",
+                      "type": "index_not_found_exception",
+                    },
+                  }
+                `);
+      });
+      it('left remove_index_not_a_concrete_index when remove_index targets an alias', async () => {
+        const task = updateAliases({
+          client,
+          aliasActions: [
+            {
+              remove_index: {
+                index: 'existing_index_2_alias',
+              },
+            },
+          ],
+        });
+        await expect(task()).resolves.toMatchInlineSnapshot(`
+                  Object {
+                    "_tag": "Left",
+                    "left": Object {
+                      "type": "remove_index_not_a_concrete_index",
+                    },
+                  }
+                `);
+      });
+    });
+  });
+
+  describe('createIndex', () => {
+    afterAll(async () => {
+      await client.indices.delete({ index: 'red_then_yellow_index' });
+    });
+    it('resolves right after waiting for an index status to be yellow if the index already existed', async () => {
+      expect.assertions(2);
+      // Create a red index
+      await client.indices
+        .create(
+          {
+            index: 'red_then_yellow_index',
+            timeout: '5s',
+            body: {
+              mappings: { properties: {} },
+              settings: {
+                // Allocate 1 replica so that this index stays yellow
+                number_of_replicas: '1',
+                // Disable all shard allocation so that the index status is red
+                'index.routing.allocation.enable': 'none',
+              },
+            },
+          },
+          { maxRetries: 0 /** handle retry ourselves for now */ }
+        )
+        .catch((e) => {
+          /** ignore */
+        });
+
+      // Call createIndex even though the index already exists
+      const createIndexPromise = createIndex({
+        client,
+        indexName: 'red_then_yellow_index',
+        mappings: undefined as any,
+      })();
+      let indexYellow = false;
+
+      setTimeout(() => {
+        client.indices.putSettings({
+          index: 'red_then_yellow_index',
+          body: {
+            // Disable all shard allocation so that the index status is red
+            settings: { routing: { allocation: { enable: 'all' } } },
+          },
+        });
+        indexYellow = true;
+      }, 10);
+
+      await createIndexPromise.then((res) => {
+        // Assert that the promise didn't resolve before the index became green
+        expect(indexYellow).toBe(true);
+        expect(res).toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "create_index_succeeded",
+                }
+              `);
+      });
+    });
+    it('rejects when there is an unexpected error creating the index', async () => {
+      // Creating an index with the same name as an existing alias to induce
+      // failure
+      await expect(
+        createIndex({ client, indexName: 'existing_index_2_alias', mappings: undefined as any })()
+      ).rejects.toThrow('invalid_index_name_exception');
+    });
+  });
+
+  describe('bulkOverwriteTransformedDocuments', () => {
+    it('resolves right when documents do not yet exist in the index', async () => {
+      const newDocs = ([
+        { _source: { title: 'doc 5' } },
+        { _source: { title: 'doc 6' } },
+        { _source: { title: 'doc 7' } },
+      ] as unknown) as SavedObjectsRawDoc[];
+      const task = bulkOverwriteTransformedDocuments({
+        client,
+        index: 'existing_index_with_docs',
+        transformedDocs: newDocs,
+        refresh: 'wait_for',
+      });
+
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "bulk_index_succeeded",
+                }
+              `);
+    });
+    it('resolves right even if there were some version_conflict_engine_exception', async () => {
+      const existingDocs = ((await searchForOutdatedDocuments(client, {
+        batchSize: 1000,
+        targetIndex: 'existing_index_with_docs',
+        outdatedDocumentsQuery: undefined,
+      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
+
+      const task = bulkOverwriteTransformedDocuments({
+        client,
+        index: 'existing_index_with_docs',
+        transformedDocs: [
+          ...existingDocs,
+          ({ _source: { title: 'doc 8' } } as unknown) as SavedObjectsRawDoc,
+        ],
+        refresh: 'wait_for',
+      });
+      await expect(task()).resolves.toMatchInlineSnapshot(`
+                Object {
+                  "_tag": "Right",
+                  "right": "bulk_index_succeeded",
+                }
+              `);
+    });
+    it('rejects if there are errors', async () => {
+      const newDocs = ([
+        { _source: { title: 'doc 5' } },
+        { _source: { title: 'doc 6' } },
+        { _source: { title: 'doc 7' } },
+      ] as unknown) as SavedObjectsRawDoc[];
+      await expect(
+        bulkOverwriteTransformedDocuments({
+          client,
+          index: 'existing_index_with_write_block',
+          transformedDocs: newDocs,
+          refresh: 'wait_for',
+        })()
+      ).rejects.toMatchObject(expect.anything());
+    });
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/open_pit.test.ts b/src/core/server/saved_objects/migrationsv2/actions/open_pit.test.ts
new file mode 100644
index 0000000000000..c8fc29d06f42f
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/open_pit.test.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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { openPit } from './open_pit';
+
+describe('openPit', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = openPit({ client, index: 'my_index' });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/open_pit.ts b/src/core/server/saved_objects/migrationsv2/actions/open_pit.ts
new file mode 100644
index 0000000000000..e740dc00ac27e
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/open_pit.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 * as Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+/** @internal */
+export interface OpenPitResponse {
+  pitId: string;
+}
+
+/** @internal */
+export interface OpenPitParams {
+  client: ElasticsearchClient;
+  index: string;
+}
+// how long ES should keep PIT alive
+export const pitKeepAlive = '10m';
+/*
+ * Creates a lightweight view of data when the request has been initiated.
+ * See https://www.elastic.co/guide/en/elasticsearch/reference/current/point-in-time-api.html
+ * */
+export const openPit = ({
+  client,
+  index,
+}: OpenPitParams): TaskEither.TaskEither<RetryableEsClientError, OpenPitResponse> => () => {
+  return client
+    .openPointInTime({
+      index,
+      keep_alive: pitKeepAlive,
+    })
+    .then((response) => Either.right({ pitId: response.body.id }))
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/pickup_updated_mappings.test.ts b/src/core/server/saved_objects/migrationsv2/actions/pickup_updated_mappings.test.ts
new file mode 100644
index 0000000000000..e319d4149dd1a
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/pickup_updated_mappings.test.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { errors as EsErrors } from '@elastic/elasticsearch';
+import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { pickupUpdatedMappings } from './pickup_updated_mappings';
+
+describe('pickupUpdatedMappings', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = pickupUpdatedMappings(client, 'my_index');
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/pickup_updated_mappings.ts b/src/core/server/saved_objects/migrationsv2/actions/pickup_updated_mappings.ts
new file mode 100644
index 0000000000000..8cc609e5277bc
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/pickup_updated_mappings.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 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import { BATCH_SIZE } from './constants';
+export interface UpdateByQueryResponse {
+  taskId: string;
+}
+
+/**
+ * Pickup updated mappings by performing an update by query operation on all
+ * documents in the index. Returns a task ID which can be
+ * tracked for progress.
+ *
+ * @remarks When mappings are updated to add a field which previously wasn't
+ * mapped Elasticsearch won't automatically add existing documents to it's
+ * internal search indices. So search results on this field won't return any
+ * existing documents. By running an update by query we essentially refresh
+ * these the internal search indices for all existing documents.
+ * This action uses `conflicts: 'proceed'` allowing several Kibana instances
+ * to run this in parallel.
+ */
+export const pickupUpdatedMappings = (
+  client: ElasticsearchClient,
+  index: string
+): TaskEither.TaskEither<RetryableEsClientError, UpdateByQueryResponse> => () => {
+  return client
+    .updateByQuery({
+      // Ignore version conflicts that can occur from parallel update by query operations
+      conflicts: 'proceed',
+      // Return an error when targeting missing or closed indices
+      allow_no_indices: false,
+      index,
+      // How many documents to update per batch
+      scroll_size: BATCH_SIZE,
+      // force a refresh so that we can query the updated index immediately
+      // after the operation completes
+      refresh: true,
+      // Create a task and return task id instead of blocking until complete
+      wait_for_completion: false,
+    })
+    .then(({ body: { task: taskId } }) => {
+      return Either.right({ taskId: String(taskId!) });
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.test.ts b/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.test.ts
new file mode 100644
index 0000000000000..0d8d76b45a57b
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.test.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 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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { readWithPit } from './read_with_pit';
+
+describe('readWithPit', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = readWithPit({
+      client,
+      pitId: 'pitId',
+      query: { match_all: {} },
+      batchSize: 10_000,
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.ts b/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.ts
new file mode 100644
index 0000000000000..b101e7db0141c
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/read_with_pit.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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import type { estypes } from '@elastic/elasticsearch';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import type { SavedObjectsRawDoc } from '../../serialization';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import { pitKeepAlive } from './open_pit';
+
+/** @internal */
+export interface ReadWithPit {
+  outdatedDocuments: SavedObjectsRawDoc[];
+  readonly lastHitSortValue: number[] | undefined;
+  readonly totalHits: number | undefined;
+}
+
+/** @internal */
+export interface ReadWithPitParams {
+  client: ElasticsearchClient;
+  pitId: string;
+  query: estypes.QueryDslQueryContainer;
+  batchSize: number;
+  searchAfter?: number[];
+  seqNoPrimaryTerm?: boolean;
+}
+
+/*
+ * Requests documents from the index using PIT mechanism.
+ * */
+export const readWithPit = ({
+  client,
+  pitId,
+  query,
+  batchSize,
+  searchAfter,
+  seqNoPrimaryTerm,
+}: ReadWithPitParams): TaskEither.TaskEither<RetryableEsClientError, ReadWithPit> => () => {
+  return client
+    .search<SavedObjectsRawDoc>({
+      seq_no_primary_term: seqNoPrimaryTerm,
+      body: {
+        // Sort fields are required to use searchAfter
+        sort: {
+          // the most efficient option as order is not important for the migration
+          _shard_doc: { order: 'asc' },
+        },
+        pit: { id: pitId, keep_alive: pitKeepAlive },
+        size: batchSize,
+        search_after: searchAfter,
+        /**
+         * We want to know how many documents we need to process so we can log the progress.
+         * But we also want to increase the performance of these requests,
+         * so we ask ES to report the total count only on the first request (when searchAfter does not exist)
+         */
+        track_total_hits: typeof searchAfter === 'undefined',
+        query,
+      },
+    })
+    .then((response) => {
+      const totalHits =
+        typeof response.body.hits.total === 'number'
+          ? response.body.hits.total // This format is to be removed in 8.0
+          : response.body.hits.total?.value;
+      const hits = response.body.hits.hits;
+
+      if (hits.length > 0) {
+        return Either.right({
+          // @ts-expect-error @elastic/elasticsearch _source is optional
+          outdatedDocuments: hits as SavedObjectsRawDoc[],
+          lastHitSortValue: hits[hits.length - 1].sort as number[],
+          totalHits,
+        });
+      }
+
+      return Either.right({
+        outdatedDocuments: [],
+        lastHitSortValue: undefined,
+        totalHits,
+      });
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/refresh_index.test.ts b/src/core/server/saved_objects/migrationsv2/actions/refresh_index.test.ts
new file mode 100644
index 0000000000000..0ebdb2b2b1851
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/refresh_index.test.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 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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { refreshIndex } from './refresh_index';
+
+describe('refreshIndex', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = refreshIndex({ client, targetIndex: 'target_index' });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/refresh_index.ts b/src/core/server/saved_objects/migrationsv2/actions/refresh_index.ts
new file mode 100644
index 0000000000000..e7bcbfb7d2d53
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/refresh_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 * as Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { ElasticsearchClient } from '../../../elasticsearch';
+
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+
+/** @internal */
+export interface RefreshIndexParams {
+  client: ElasticsearchClient;
+  targetIndex: string;
+}
+/**
+ * Wait for Elasticsearch to reindex all the changes.
+ */
+export const refreshIndex = ({
+  client,
+  targetIndex,
+}: RefreshIndexParams): TaskEither.TaskEither<
+  RetryableEsClientError,
+  { refreshed: boolean }
+> => () => {
+  return client.indices
+    .refresh({
+      index: targetIndex,
+    })
+    .then(() => {
+      return Either.right({ refreshed: true });
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/reindex.test.ts b/src/core/server/saved_objects/migrationsv2/actions/reindex.test.ts
new file mode 100644
index 0000000000000..f53368bd9321b
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/reindex.test.ts
@@ -0,0 +1,48 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 Option from 'fp-ts/lib/Option';
+import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { reindex } from './reindex';
+
+describe('reindex', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = reindex({
+      client,
+      sourceIndex: 'my_source_index',
+      targetIndex: 'my_target_index',
+      reindexScript: Option.none,
+      requireAlias: false,
+      unusedTypesQuery: {},
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/reindex.ts b/src/core/server/saved_objects/migrationsv2/actions/reindex.ts
new file mode 100644
index 0000000000000..e9cfb4b61dace
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/reindex.ts
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import * as Option from 'fp-ts/lib/Option';
+import type { estypes } from '@elastic/elasticsearch';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import { BATCH_SIZE } from './constants';
+
+/** @internal */
+export interface ReindexResponse {
+  taskId: string;
+}
+/** @internal */
+export interface ReindexParams {
+  client: ElasticsearchClient;
+  sourceIndex: string;
+  targetIndex: string;
+  reindexScript: Option.Option<string>;
+  requireAlias: boolean;
+  /* When reindexing we use a source query to exclude saved objects types which
+   * are no longer used. These saved objects will still be kept in the outdated
+   * index for backup purposes, but won't be available in the upgraded index.
+   */
+  unusedTypesQuery: estypes.QueryDslQueryContainer;
+}
+/**
+ * Reindex documents from the `sourceIndex` into the `targetIndex`. Returns a
+ * task ID which can be tracked for progress.
+ *
+ * @remarks This action is idempotent allowing several Kibana instances to run
+ * this in parallel. By using `op_type: 'create', conflicts: 'proceed'` there
+ * will be only one write per reindexed document.
+ */
+export const reindex = ({
+  client,
+  sourceIndex,
+  targetIndex,
+  reindexScript,
+  requireAlias,
+  unusedTypesQuery,
+}: ReindexParams): TaskEither.TaskEither<RetryableEsClientError, ReindexResponse> => () => {
+  return client
+    .reindex({
+      // Require targetIndex to be an alias. Prevents a new index from being
+      // created if targetIndex doesn't exist.
+      require_alias: requireAlias,
+      body: {
+        // Ignore version conflicts from existing documents
+        conflicts: 'proceed',
+        source: {
+          index: sourceIndex,
+          // Set reindex batch size
+          size: BATCH_SIZE,
+          // Exclude saved object types
+          query: unusedTypesQuery,
+        },
+        dest: {
+          index: targetIndex,
+          // Don't override existing documents, only create if missing
+          op_type: 'create',
+        },
+        script: Option.fold<string, undefined | { source: string; lang: 'painless' }>(
+          () => undefined,
+          (script) => ({
+            source: script,
+            lang: 'painless',
+          })
+        )(reindexScript),
+      },
+      // force a refresh so that we can query the target index
+      refresh: true,
+      // Create a task and return task id instead of blocking until complete
+      wait_for_completion: false,
+    })
+    .then(({ body: { task: taskId } }) => {
+      return Either.right({ taskId: String(taskId) });
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.test.ts b/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.test.ts
new file mode 100644
index 0000000000000..497211cb693ab
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.test.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { removeWriteBlock } from './remove_write_block';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+
+describe('removeWriteBlock', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  const nonRetryableError = new Error('crash');
+  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = removeWriteBlock({ client, index: 'my_index' });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+  it('re-throws non retry-able errors', async () => {
+    const task = removeWriteBlock({
+      client: clientWithNonRetryableError,
+      index: 'my_index',
+    });
+    await task();
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.ts b/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.ts
new file mode 100644
index 0000000000000..b5bf64d5c29f7
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/remove_write_block.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+
+/** @internal */
+export interface RemoveWriteBlockParams {
+  client: ElasticsearchClient;
+  index: string;
+}
+/**
+ * Removes a write block from an index
+ */
+export const removeWriteBlock = ({
+  client,
+  index,
+}: RemoveWriteBlockParams): TaskEither.TaskEither<
+  RetryableEsClientError,
+  'remove_write_block_succeeded'
+> => () => {
+  return client.indices
+    .putSettings<{
+      acknowledged: boolean;
+      shards_acknowledged: boolean;
+    }>(
+      {
+        index,
+        // Don't change any existing settings
+        preserve_existing: true,
+        body: {
+          settings: {
+            blocks: {
+              write: false,
+            },
+          },
+        },
+      },
+      { maxRetries: 0 /** handle retry ourselves for now */ }
+    )
+    .then((res) => {
+      return res.body.acknowledged === true
+        ? Either.right('remove_write_block_succeeded' as const)
+        : Either.left({
+            type: 'retryable_es_client_error' as const,
+            message: 'remove_write_block_failed',
+          });
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.test.ts b/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.test.ts
new file mode 100644
index 0000000000000..ab133e9a564be
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.test.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 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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { searchForOutdatedDocuments } from './search_for_outdated_documents';
+
+describe('searchForOutdatedDocuments', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = searchForOutdatedDocuments(client, {
+      batchSize: 1000,
+      targetIndex: 'new_index',
+      outdatedDocumentsQuery: {},
+    });
+
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+
+  it('configures request according to given parameters', async () => {
+    const esClient = elasticsearchClientMock.createInternalClient();
+    const query = {};
+    const targetIndex = 'new_index';
+    const batchSize = 1000;
+    const task = searchForOutdatedDocuments(esClient, {
+      batchSize,
+      targetIndex,
+      outdatedDocumentsQuery: query,
+    });
+
+    await task();
+
+    expect(esClient.search).toHaveBeenCalledTimes(1);
+    expect(esClient.search).toHaveBeenCalledWith(
+      expect.objectContaining({
+        index: targetIndex,
+        size: batchSize,
+        body: expect.objectContaining({ query }),
+      })
+    );
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.ts b/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.ts
new file mode 100644
index 0000000000000..c27170a78245b
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/search_for_outdated_documents.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 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import type { estypes } from '@elastic/elasticsearch';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import type { SavedObjectsRawDoc, SavedObjectsRawDocSource } from '../../serialization';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+
+/** @internal */
+export interface SearchResponse {
+  outdatedDocuments: SavedObjectsRawDoc[];
+}
+
+export interface SearchForOutdatedDocumentsOptions {
+  batchSize: number;
+  targetIndex: string;
+  outdatedDocumentsQuery?: estypes.QueryDslQueryContainer;
+}
+
+/**
+ * Search for outdated saved object documents with the provided query. Will
+ * return one batch of documents. Searching should be repeated until no more
+ * outdated documents can be found.
+ *
+ * Used for testing only
+ */
+export const searchForOutdatedDocuments = (
+  client: ElasticsearchClient,
+  options: SearchForOutdatedDocumentsOptions
+): TaskEither.TaskEither<RetryableEsClientError, SearchResponse> => () => {
+  return client
+    .search<SavedObjectsRawDocSource>({
+      index: options.targetIndex,
+      // Return the _seq_no and _primary_term so we can use optimistic
+      // concurrency control for updates
+      seq_no_primary_term: true,
+      size: options.batchSize,
+      body: {
+        query: options.outdatedDocumentsQuery,
+        // Optimize search performance by sorting by the "natural" index order
+        sort: ['_doc'],
+      },
+      // Return an error when targeting missing or closed indices
+      allow_no_indices: false,
+      // Don't return partial results if timeouts or shard failures are
+      // encountered. This is important because 0 search hits is interpreted as
+      // there being no more outdated documents left that require
+      // transformation. Although the default is `false`, we set this
+      // explicitly to avoid users overriding the
+      // search.default_allow_partial_results cluster setting to true.
+      allow_partial_search_results: false,
+      // Improve performance by not calculating the total number of hits
+      // matching the query.
+      track_total_hits: false,
+      // Reduce the response payload size by only returning the data we care about
+      filter_path: [
+        'hits.hits._id',
+        'hits.hits._source',
+        'hits.hits._seq_no',
+        'hits.hits._primary_term',
+      ],
+    })
+    .then((res) =>
+      Either.right({ outdatedDocuments: (res.body.hits?.hits as SavedObjectsRawDoc[]) ?? [] })
+    )
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/set_write_block.test.ts b/src/core/server/saved_objects/migrationsv2/actions/set_write_block.test.ts
new file mode 100644
index 0000000000000..cf7b3091f38ff
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/set_write_block.test.ts
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { setWriteBlock } from './set_write_block';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+
+describe('setWriteBlock', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  const nonRetryableError = new Error('crash');
+  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = setWriteBlock({ client, index: 'my_index' });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+  it('re-throws non retry-able errors', async () => {
+    const task = setWriteBlock({
+      client: clientWithNonRetryableError,
+      index: 'my_index',
+    });
+    await task();
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/set_write_block.ts b/src/core/server/saved_objects/migrationsv2/actions/set_write_block.ts
new file mode 100644
index 0000000000000..5aed316306cf9
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/set_write_block.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 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 { ElasticsearchClientError } from '@elastic/elasticsearch/lib/errors';
+import * as Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import type { IndexNotFound } from './';
+
+/** @internal */
+export interface SetWriteBlockParams {
+  client: ElasticsearchClient;
+  index: string;
+}
+/**
+ * Sets a write block in place for the given index. If the response includes
+ * `acknowledged: true` all in-progress writes have drained and no further
+ * writes to this index will be possible.
+ *
+ * The first time the write block is added to an index the response will
+ * include `shards_acknowledged: true` but once the block is in place,
+ * subsequent calls return `shards_acknowledged: false`
+ */
+export const setWriteBlock = ({
+  client,
+  index,
+}: SetWriteBlockParams): TaskEither.TaskEither<
+  IndexNotFound | RetryableEsClientError,
+  'set_write_block_succeeded'
+> => () => {
+  return (
+    client.indices
+      .addBlock<{
+        acknowledged: boolean;
+        shards_acknowledged: boolean;
+      }>(
+        {
+          index,
+          block: 'write',
+        },
+        { maxRetries: 0 /** handle retry ourselves for now */ }
+      )
+      // not typed yet
+      .then((res: any) => {
+        return res.body.acknowledged === true
+          ? Either.right('set_write_block_succeeded' as const)
+          : Either.left({
+              type: 'retryable_es_client_error' as const,
+              message: 'set_write_block_failed',
+            });
+      })
+      .catch((e: ElasticsearchClientError) => {
+        if (e instanceof EsErrors.ResponseError) {
+          if (e.body?.error?.type === 'index_not_found_exception') {
+            return Either.left({ type: 'index_not_found_exception' as const, index });
+          }
+        }
+        throw e;
+      })
+      .catch(catchRetryableEsClientErrors)
+  );
+};
+//
diff --git a/src/core/server/saved_objects/migrationsv2/actions/transform_docs.ts b/src/core/server/saved_objects/migrationsv2/actions/transform_docs.ts
new file mode 100644
index 0000000000000..4c712afcff3a4
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/transform_docs.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 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';
+
+/** @internal */
+export interface TransformDocsParams {
+  transformRawDocs: TransformRawDocs;
+  outdatedDocuments: SavedObjectsRawDoc[];
+}
+/*
+ * Transform outdated docs
+ * */
+export const transformDocs = ({
+  transformRawDocs,
+  outdatedDocuments,
+}: TransformDocsParams): TaskEither.TaskEither<
+  DocumentsTransformFailed,
+  DocumentsTransformSuccess
+> => transformRawDocs(outdatedDocuments);
diff --git a/src/core/server/saved_objects/migrationsv2/actions/update_aliases.test.ts b/src/core/server/saved_objects/migrationsv2/actions/update_aliases.test.ts
new file mode 100644
index 0000000000000..e2ea07d40281b
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/update_aliases.test.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { updateAliases } from './update_aliases';
+import { setWriteBlock } from './set_write_block';
+
+describe('updateAliases', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  const nonRetryableError = new Error('crash');
+  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = updateAliases({ client, aliasActions: [] });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+  it('re-throws non retry-able errors', async () => {
+    const task = setWriteBlock({
+      client: clientWithNonRetryableError,
+      index: 'my_index',
+    });
+    await task();
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/update_aliases.ts b/src/core/server/saved_objects/migrationsv2/actions/update_aliases.ts
new file mode 100644
index 0000000000000..ffb8002f09212
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/update_aliases.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import { IndexNotFound } from './index';
+
+export interface AliasNotFound {
+  type: 'alias_not_found_exception';
+}
+
+/** @internal */
+export interface RemoveIndexNotAConcreteIndex {
+  type: 'remove_index_not_a_concrete_index';
+}
+
+/** @internal */
+export type AliasAction =
+  | { remove_index: { index: string } }
+  | { remove: { index: string; alias: string; must_exist: boolean } }
+  | { add: { index: string; alias: string } };
+
+/** @internal */
+export interface UpdateAliasesParams {
+  client: ElasticsearchClient;
+  aliasActions: AliasAction[];
+}
+/**
+ * Calls the Update index alias API `_alias` with the provided alias actions.
+ */
+export const updateAliases = ({
+  client,
+  aliasActions,
+}: UpdateAliasesParams): TaskEither.TaskEither<
+  IndexNotFound | AliasNotFound | RemoveIndexNotAConcreteIndex | RetryableEsClientError,
+  'update_aliases_succeeded'
+> => () => {
+  return client.indices
+    .updateAliases(
+      {
+        body: {
+          actions: aliasActions,
+        },
+      },
+      { maxRetries: 0 }
+    )
+    .then(() => {
+      // Ignore `acknowledged: false`. When the coordinating node accepts
+      // the new cluster state update but not all nodes have applied the
+      // update within the timeout `acknowledged` will be false. However,
+      // retrying this update will always immediately result in `acknowledged:
+      // true` even if there are still nodes which are falling behind with
+      // cluster state updates.
+      // The only impact for using `updateAliases` to mark the version index
+      // as ready is that it could take longer for other Kibana instances to
+      // see that the version index is ready so they are more likely to
+      // perform unecessary duplicate work.
+      return Either.right('update_aliases_succeeded' as const);
+    })
+    .catch((err: EsErrors.ElasticsearchClientError) => {
+      if (err instanceof EsErrors.ResponseError) {
+        if (err?.body?.error?.type === 'index_not_found_exception') {
+          return Either.left({
+            type: 'index_not_found_exception' as const,
+            index: err.body.error.index,
+          });
+        } else if (
+          err?.body?.error?.type === 'illegal_argument_exception' &&
+          err?.body?.error?.reason?.match(
+            /The provided expression \[.+\] matches an alias, specify the corresponding concrete indices instead./
+          )
+        ) {
+          return Either.left({ type: 'remove_index_not_a_concrete_index' as const });
+        } else if (
+          err?.body?.error?.type === 'aliases_not_found_exception' ||
+          (err?.body?.error?.type === 'resource_not_found_exception' &&
+            err?.body?.error?.reason?.match(/required alias \[.+\] does not exist/))
+        ) {
+          return Either.left({
+            type: 'alias_not_found_exception' as const,
+          });
+        }
+      }
+      throw err;
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/update_and_pickup_mappings.test.ts b/src/core/server/saved_objects/migrationsv2/actions/update_and_pickup_mappings.test.ts
new file mode 100644
index 0000000000000..3ecb990cd9e82
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/update_and_pickup_mappings.test.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 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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { updateAndPickupMappings } from './update_and_pickup_mappings';
+
+describe('updateAndPickupMappings', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = updateAndPickupMappings({
+      client,
+      index: 'new_index',
+      mappings: { properties: {} },
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/update_and_pickup_mappings.ts b/src/core/server/saved_objects/migrationsv2/actions/update_and_pickup_mappings.ts
new file mode 100644
index 0000000000000..8c742005a01ce
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/update_and_pickup_mappings.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 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { pipe } from 'fp-ts/lib/pipeable';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import { IndexMapping } from '../../mappings';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import { pickupUpdatedMappings } from './pickup_updated_mappings';
+import { DEFAULT_TIMEOUT } from './constants';
+
+/** @internal */
+export interface UpdateAndPickupMappingsResponse {
+  taskId: string;
+}
+
+/** @internal */
+export interface UpdateAndPickupMappingsParams {
+  client: ElasticsearchClient;
+  index: string;
+  mappings: IndexMapping;
+}
+/**
+ * Updates an index's mappings and runs an pickupUpdatedMappings task so that the mapping
+ * changes are "picked up". Returns a taskId to track progress.
+ */
+export const updateAndPickupMappings = ({
+  client,
+  index,
+  mappings,
+}: UpdateAndPickupMappingsParams): TaskEither.TaskEither<
+  RetryableEsClientError,
+  UpdateAndPickupMappingsResponse
+> => {
+  const putMappingTask: TaskEither.TaskEither<
+    RetryableEsClientError,
+    'update_mappings_succeeded'
+  > = () => {
+    return client.indices
+      .putMapping({
+        index,
+        timeout: DEFAULT_TIMEOUT,
+        body: mappings,
+      })
+      .then((res) => {
+        // Ignore `acknowledged: false`. When the coordinating node accepts
+        // the new cluster state update but not all nodes have applied the
+        // update within the timeout `acknowledged` will be false. However,
+        // retrying this update will always immediately result in `acknowledged:
+        // true` even if there are still nodes which are falling behind with
+        // cluster state updates.
+        // For updateAndPickupMappings this means that there is the potential
+        // that some existing document's fields won't be picked up if the node
+        // on which the Kibana shard is running has fallen behind with cluster
+        // state updates and the mapping update wasn't applied before we run
+        // `pickupUpdatedMappings`. ES tries to limit this risk by blocking
+        // index operations (including update_by_query used by
+        // updateAndPickupMappings) if there are pending mappings changes. But
+        // not all mapping changes will prevent this.
+        return Either.right('update_mappings_succeeded' as const);
+      })
+      .catch(catchRetryableEsClientErrors);
+  };
+
+  return pipe(
+    putMappingTask,
+    TaskEither.chain((res) => {
+      return pickupUpdatedMappings(client, index);
+    })
+  );
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/verify_reindex.ts b/src/core/server/saved_objects/migrationsv2/actions/verify_reindex.ts
new file mode 100644
index 0000000000000..4db599d8fbadf
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/verify_reindex.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 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+
+/** @internal */
+export interface VerifyReindexParams {
+  client: ElasticsearchClient;
+  sourceIndex: string;
+  targetIndex: string;
+}
+
+export const verifyReindex = ({
+  client,
+  sourceIndex,
+  targetIndex,
+}: VerifyReindexParams): TaskEither.TaskEither<
+  RetryableEsClientError | { type: 'verify_reindex_failed' },
+  'verify_reindex_succeeded'
+> => () => {
+  const count = (index: string) =>
+    client
+      .count<{ count: number }>({
+        index,
+        // Return an error when targeting missing or closed indices
+        allow_no_indices: false,
+      })
+      .then((res) => {
+        return res.body.count;
+      });
+
+  return Promise.all([count(sourceIndex), count(targetIndex)])
+    .then(([sourceCount, targetCount]) => {
+      if (targetCount >= sourceCount) {
+        return Either.right('verify_reindex_succeeded' as const);
+      } else {
+        return Either.left({ type: 'verify_reindex_failed' as const });
+      }
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.test.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.test.ts
new file mode 100644
index 0000000000000..8cea34b80ffad
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.test.ts
@@ -0,0 +1,44 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { errors as EsErrors } from '@elastic/elasticsearch';
+import { waitForIndexStatusYellow } from './wait_for_index_status_yellow';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+jest.mock('./catch_retryable_es_client_errors');
+
+describe('waitForIndexStatusYellow', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = waitForIndexStatusYellow({
+      client,
+      index: 'my_index',
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.ts
new file mode 100644
index 0000000000000..307c77ee5b89c
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_index_status_yellow.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 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+import { DEFAULT_TIMEOUT } from './constants';
+
+/** @internal */
+export interface WaitForIndexStatusYellowParams {
+  client: ElasticsearchClient;
+  index: string;
+  timeout?: 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
+ * allocate the replicas. When migrations proceed with a yellow index it means
+ * we don't have as much data-redundancy as we could have, but waiting for
+ * replicas would mean that v2 migrations fail where v1 migrations would have
+ * succeeded. It doesn't feel like it's Kibana's job to force users to keep
+ * their clusters green and even if it's green when we migrate it can turn
+ * yellow at any point in the future. So ultimately data-redundancy is up to
+ * users to maintain.
+ */
+export const waitForIndexStatusYellow = ({
+  client,
+  index,
+  timeout = DEFAULT_TIMEOUT,
+}: WaitForIndexStatusYellowParams): TaskEither.TaskEither<RetryableEsClientError, {}> => () => {
+  return client.cluster
+    .health({ index, wait_for_status: 'yellow', timeout })
+    .then(() => {
+      return Either.right({});
+    })
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_pickup_updated_mappings_task.test.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_pickup_updated_mappings_task.test.ts
new file mode 100644
index 0000000000000..f7c380be9427c
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_pickup_updated_mappings_task.test.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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { waitForPickupUpdatedMappingsTask } from './wait_for_pickup_updated_mappings_task';
+import { setWriteBlock } from './set_write_block';
+
+describe('waitForPickupUpdatedMappingsTask', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  const nonRetryableError = new Error('crash');
+  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
+  );
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = waitForPickupUpdatedMappingsTask({
+      client,
+      taskId: 'my task id',
+      timeout: '60s',
+    });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+  it('re-throws non retry-able errors', async () => {
+    const task = setWriteBlock({
+      client: clientWithNonRetryableError,
+      index: 'my_index',
+    });
+    await task();
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_pickup_updated_mappings_task.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_pickup_updated_mappings_task.ts
new file mode 100644
index 0000000000000..02f7c3455cec9
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_pickup_updated_mappings_task.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 * as TaskEither from 'fp-ts/lib/TaskEither';
+import * as Option from 'fp-ts/lib/Option';
+import { flow } from 'fp-ts/lib/function';
+import { waitForTask, WaitForTaskCompletionTimeout } from './wait_for_task';
+import { RetryableEsClientError } from './catch_retryable_es_client_errors';
+
+export const waitForPickupUpdatedMappingsTask = flow(
+  waitForTask,
+  TaskEither.chain(
+    (
+      res
+    ): TaskEither.TaskEither<
+      RetryableEsClientError | WaitForTaskCompletionTimeout,
+      'pickup_updated_mappings_succeeded'
+    > => {
+      // We don't catch or type failures/errors because they should never
+      // occur in our migration algorithm and we don't have any business logic
+      // for dealing with it. If something happens we'll just crash and try
+      // again.
+      if (Option.isSome(res.failures)) {
+        throw new Error(
+          'pickupUpdatedMappings task failed with the following failures:\n' +
+            JSON.stringify(res.failures.value)
+        );
+      } else if (Option.isSome(res.error)) {
+        throw new Error(
+          'pickupUpdatedMappings task failed with the following error:\n' +
+            JSON.stringify(res.error.value)
+        );
+      } else {
+        return TaskEither.right('pickup_updated_mappings_succeeded' as const);
+      }
+    }
+  )
+);
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.test.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.test.ts
new file mode 100644
index 0000000000000..f6a236aab5c85
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.test.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+jest.mock('./catch_retryable_es_client_errors');
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { waitForReindexTask } from './wait_for_reindex_task';
+import { setWriteBlock } from './set_write_block';
+
+describe('waitForReindexTask', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  const nonRetryableError = new Error('crash');
+  const clientWithNonRetryableError = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(nonRetryableError)
+  );
+
+  it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+    const task = waitForReindexTask({ client, taskId: 'my task id', timeout: '60s' });
+    try {
+      await task();
+    } catch (e) {
+      /** ignore */
+    }
+
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+  });
+  it('re-throws non retry-able errors', async () => {
+    const task = setWriteBlock({
+      client: clientWithNonRetryableError,
+      index: 'my_index',
+    });
+    await task();
+    expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(nonRetryableError);
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.ts
new file mode 100644
index 0000000000000..18cf3350292b5
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_reindex_task.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 * 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, WaitForReindexTaskFailure, TargetIndexHadWriteBlock } from './index';
+import { waitForTask, WaitForTaskCompletionTimeout } from './wait_for_task';
+
+export interface IncompatibleMappingException {
+  type: 'incompatible_mapping_exception';
+}
+export const waitForReindexTask = flow(
+  waitForTask,
+  TaskEither.chain(
+    (
+      res
+    ): TaskEither.TaskEither<
+      | IndexNotFound
+      | TargetIndexHadWriteBlock
+      | IncompatibleMappingException
+      | RetryableEsClientError
+      | WaitForTaskCompletionTimeout,
+      'reindex_succeeded'
+    > => {
+      const failureIsAWriteBlock = ({ cause: { type, reason } }: WaitForReindexTaskFailure) =>
+        type === 'cluster_block_exception' &&
+        reason.match(/index \[.+] blocked by: \[FORBIDDEN\/8\/index write \(api\)\]/);
+
+      const failureIsIncompatibleMappingException = ({
+        cause: { type, reason },
+      }: WaitForReindexTaskFailure) =>
+        type === 'strict_dynamic_mapping_exception' || type === 'mapper_parsing_exception';
+
+      if (Option.isSome(res.error)) {
+        if (res.error.value.type === 'index_not_found_exception') {
+          return TaskEither.left({
+            type: 'index_not_found_exception' as const,
+            index: res.error.value.index!,
+          });
+        } else {
+          throw new Error('Reindex failed with the following error:\n' + JSON.stringify(res.error));
+        }
+      } else if (Option.isSome(res.failures)) {
+        if (res.failures.value.every(failureIsAWriteBlock)) {
+          return TaskEither.left({ type: 'target_index_had_write_block' as const });
+        } else if (res.failures.value.every(failureIsIncompatibleMappingException)) {
+          return TaskEither.left({ type: 'incompatible_mapping_exception' as const });
+        } else {
+          throw new Error(
+            'Reindex failed with the following failures:\n' + JSON.stringify(res.failures.value)
+          );
+        }
+      } else {
+        return TaskEither.right('reindex_succeeded' as const);
+      }
+    }
+  )
+);
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.test.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.test.ts
new file mode 100644
index 0000000000000..c7ca9bf36a2c6
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.test.ts
@@ -0,0 +1,47 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { errors as EsErrors } from '@elastic/elasticsearch';
+import { waitForTask } from './wait_for_task';
+import { elasticsearchClientMock } from '../../../elasticsearch/client/mocks';
+import { catchRetryableEsClientErrors } from './catch_retryable_es_client_errors';
+jest.mock('./catch_retryable_es_client_errors');
+
+describe('waitForTask', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  // Create a mock client that rejects all methods with a 503 status code
+  // response.
+  const retryableError = new EsErrors.ResponseError(
+    elasticsearchClientMock.createApiResponse({
+      statusCode: 503,
+      body: { error: { type: 'es_type', reason: 'es_reason' } },
+    })
+  );
+  const client = elasticsearchClientMock.createInternalClient(
+    elasticsearchClientMock.createErrorTransportRequestPromise(retryableError)
+  );
+
+  describe('waitForPickupUpdatedMappingsTask', () => {
+    it('calls catchRetryableEsClientErrors when the promise rejects', async () => {
+      const task = waitForTask({
+        client,
+        taskId: 'my task id',
+        timeout: '60s',
+      });
+      try {
+        await task();
+      } catch (e) {
+        /** ignore */
+      }
+
+      expect(catchRetryableEsClientErrors).toHaveBeenCalledWith(retryableError);
+    });
+  });
+});
diff --git a/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.ts b/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.ts
new file mode 100644
index 0000000000000..0cdaa88c535ab
--- /dev/null
+++ b/src/core/server/saved_objects/migrationsv2/actions/wait_for_task.ts
@@ -0,0 +1,94 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 Either from 'fp-ts/lib/Either';
+import * as TaskEither from 'fp-ts/lib/TaskEither';
+import * as Option from 'fp-ts/lib/Option';
+import { errors as EsErrors } from '@elastic/elasticsearch';
+import { ElasticsearchClient } from '../../../elasticsearch';
+import {
+  catchRetryableEsClientErrors,
+  RetryableEsClientError,
+} from './catch_retryable_es_client_errors';
+/** @internal */
+export interface WaitForTaskResponse {
+  error: Option.Option<{ type: string; reason: string; index?: string }>;
+  completed: boolean;
+  failures: Option.Option<any[]>;
+  description?: string;
+}
+
+/**
+ * After waiting for the specificed timeout, the task has not yet completed.
+ *
+ * When querying the tasks API we use `wait_for_completion=true` to block the
+ * request until the task completes. If after the `timeout`, the task still has
+ * not completed we return this error. This does not mean that the task itelf
+ * has reached a timeout, Elasticsearch will continue to run the task.
+ */
+export interface WaitForTaskCompletionTimeout {
+  /** After waiting for the specificed timeout, the task has not yet completed. */
+  readonly type: 'wait_for_task_completion_timeout';
+  readonly message: string;
+  readonly error?: Error;
+}
+
+const catchWaitForTaskCompletionTimeout = (
+  e: EsErrors.ResponseError
+): Either.Either<WaitForTaskCompletionTimeout, never> => {
+  if (
+    e.body?.error?.type === 'timeout_exception' ||
+    e.body?.error?.type === 'receive_timeout_transport_exception'
+  ) {
+    return Either.left({
+      type: 'wait_for_task_completion_timeout' as const,
+      message: `[${e.body.error.type}] ${e.body.error.reason}`,
+      error: e,
+    });
+  } else {
+    throw e;
+  }
+};
+
+/** @internal */
+export interface WaitForTaskParams {
+  client: ElasticsearchClient;
+  taskId: string;
+  timeout: string;
+}
+/**
+ * Blocks for up to 60s or until a task completes.
+ *
+ * TODO: delete completed tasks
+ */
+export const waitForTask = ({
+  client,
+  taskId,
+  timeout,
+}: WaitForTaskParams): TaskEither.TaskEither<
+  RetryableEsClientError | WaitForTaskCompletionTimeout,
+  WaitForTaskResponse
+> => () => {
+  return client.tasks
+    .get({
+      task_id: taskId,
+      wait_for_completion: true,
+      timeout,
+    })
+    .then((res) => {
+      const body = res.body;
+      const failures = body.response?.failures ?? [];
+      return Either.right({
+        completed: body.completed,
+        error: Option.fromNullable(body.error),
+        failures: failures.length > 0 ? Option.some(failures) : Option.none,
+        description: body.task.description,
+      });
+    })
+    .catch(catchWaitForTaskCompletionTimeout)
+    .catch(catchRetryableEsClientErrors);
+};
diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts
deleted file mode 100644
index d0158a4c68f24..0000000000000
--- a/src/core/server/saved_objects/migrationsv2/integration_tests/actions.test.ts
+++ /dev/null
@@ -1,1406 +0,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 { ElasticsearchClient } from '../../../';
-import { InternalCoreStart } from '../../../internal_types';
-import * as kbnTestServer from '../../../../test_helpers/kbn_server';
-import { Root } from '../../../root';
-import { SavedObjectsRawDoc } from '../../serialization';
-import {
-  bulkOverwriteTransformedDocuments,
-  cloneIndex,
-  closePit,
-  createIndex,
-  fetchIndices,
-  openPit,
-  OpenPitResponse,
-  reindex,
-  readWithPit,
-  ReadWithPit,
-  searchForOutdatedDocuments,
-  SearchResponse,
-  setWriteBlock,
-  updateAliases,
-  waitForReindexTask,
-  ReindexResponse,
-  waitForPickupUpdatedMappingsTask,
-  pickupUpdatedMappings,
-  UpdateByQueryResponse,
-  updateAndPickupMappings,
-  UpdateAndPickupMappingsResponse,
-  verifyReindex,
-  removeWriteBlock,
-  transformDocs,
-  waitForIndexStatusYellow,
-} from '../actions';
-import * as Either from 'fp-ts/lib/Either';
-import * as Option from 'fp-ts/lib/Option';
-import { ResponseError } from '@elastic/elasticsearch/lib/errors';
-import { DocumentsTransformFailed, DocumentsTransformSuccess } from '../../migrations/core';
-import { TaskEither } from 'fp-ts/lib/TaskEither';
-
-const { startES } = kbnTestServer.createTestServers({
-  adjustTimeout: (t: number) => jest.setTimeout(t),
-});
-let esServer: kbnTestServer.TestElasticsearchUtils;
-
-describe('migration actions', () => {
-  let root: Root;
-  let start: InternalCoreStart;
-  let client: ElasticsearchClient;
-
-  beforeAll(async () => {
-    esServer = await startES();
-    root = kbnTestServer.createRootWithCorePlugins({
-      server: {
-        basePath: '/hello',
-      },
-    });
-
-    await root.setup();
-    start = await root.start();
-    client = start.elasticsearch.client.asInternalUser;
-
-    // Create test fixture data:
-    await createIndex(client, 'existing_index_with_docs', {
-      dynamic: true,
-      properties: {},
-    })();
-    const sourceDocs = ([
-      { _source: { title: 'doc 1' } },
-      { _source: { title: 'doc 2' } },
-      { _source: { title: 'doc 3' } },
-      { _source: { title: 'saved object 4', type: 'another_unused_type' } },
-      { _source: { title: 'f-agent-event 5', type: 'f_agent_event' } },
-    ] as unknown) as SavedObjectsRawDoc[];
-    await bulkOverwriteTransformedDocuments(
-      client,
-      'existing_index_with_docs',
-      sourceDocs,
-      'wait_for'
-    )();
-
-    await createIndex(client, 'existing_index_2', { properties: {} })();
-    await createIndex(client, 'existing_index_with_write_block', { properties: {} })();
-    await bulkOverwriteTransformedDocuments(
-      client,
-      'existing_index_with_write_block',
-      sourceDocs,
-      'wait_for'
-    )();
-    await setWriteBlock(client, 'existing_index_with_write_block')();
-    await updateAliases(client, [
-      { add: { index: 'existing_index_2', alias: 'existing_index_2_alias' } },
-    ])();
-  });
-
-  afterAll(async () => {
-    await esServer.stop();
-    await root.shutdown();
-  });
-
-  describe('fetchIndices', () => {
-    it('resolves right empty record if no indices were found', async () => {
-      expect.assertions(1);
-      const task = fetchIndices(client, ['no_such_index']);
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": Object {},
-                }
-              `);
-    });
-    it('resolves right record with found indices', async () => {
-      expect.assertions(1);
-      const res = (await fetchIndices(client, [
-        'no_such_index',
-        'existing_index_with_docs',
-      ])()) as Either.Right<unknown>;
-
-      expect(res.right).toEqual(
-        expect.objectContaining({
-          existing_index_with_docs: {
-            aliases: {},
-            mappings: expect.anything(),
-            settings: expect.anything(),
-          },
-        })
-      );
-    });
-  });
-
-  describe('setWriteBlock', () => {
-    beforeAll(async () => {
-      await createIndex(client, 'new_index_without_write_block', { properties: {} })();
-    });
-    it('resolves right when setting the write block succeeds', async () => {
-      expect.assertions(1);
-      const task = setWriteBlock(client, 'new_index_without_write_block');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "set_write_block_succeeded",
-                }
-              `);
-    });
-    it('resolves right when setting a write block on an index that already has one', async () => {
-      expect.assertions(1);
-      const task = setWriteBlock(client, 'existing_index_with_write_block');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "set_write_block_succeeded",
-                }
-              `);
-    });
-    it('once resolved, prevents further writes to the index', async () => {
-      expect.assertions(1);
-      const task = setWriteBlock(client, 'new_index_without_write_block');
-      await task();
-      const sourceDocs = ([
-        { _source: { title: 'doc 1' } },
-        { _source: { title: 'doc 2' } },
-        { _source: { title: 'doc 3' } },
-        { _source: { title: 'doc 4' } },
-      ] as unknown) as SavedObjectsRawDoc[];
-      await expect(
-        bulkOverwriteTransformedDocuments(
-          client,
-          'new_index_without_write_block',
-          sourceDocs,
-          'wait_for'
-        )()
-      ).rejects.toMatchObject(expect.anything());
-    });
-    it('resolves left index_not_found_exception when the index does not exist', async () => {
-      expect.assertions(1);
-      const task = setWriteBlock(client, 'no_such_index');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Left",
-                  "left": Object {
-                    "index": "no_such_index",
-                    "type": "index_not_found_exception",
-                  },
-                }
-              `);
-    });
-  });
-
-  describe('removeWriteBlock', () => {
-    beforeAll(async () => {
-      await createIndex(client, 'existing_index_without_write_block_2', { properties: {} })();
-      await createIndex(client, 'existing_index_with_write_block_2', { properties: {} })();
-      await setWriteBlock(client, 'existing_index_with_write_block_2')();
-    });
-    it('resolves right if successful when an index already has a write block', async () => {
-      expect.assertions(1);
-      const task = removeWriteBlock(client, 'existing_index_with_write_block_2');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "remove_write_block_succeeded",
-                }
-              `);
-    });
-    it('resolves right if successful when an index does not have a write block', async () => {
-      expect.assertions(1);
-      const task = removeWriteBlock(client, 'existing_index_without_write_block_2');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "remove_write_block_succeeded",
-                }
-              `);
-    });
-    it('rejects if there is a non-retryable error', async () => {
-      expect.assertions(1);
-      const task = removeWriteBlock(client, 'no_such_index');
-      await expect(task()).rejects.toMatchInlineSnapshot(
-        `[ResponseError: index_not_found_exception]`
-      );
-    });
-  });
-
-  describe('waitForIndexStatusYellow', () => {
-    afterAll(async () => {
-      await client.indices.delete({ index: 'red_then_yellow_index' });
-    });
-    it('resolves right after waiting for an index status to be yellow if the index already existed', async () => {
-      // Create a red index
-      await client.indices.create(
-        {
-          index: 'red_then_yellow_index',
-          timeout: '5s',
-          body: {
-            mappings: { properties: {} },
-            settings: {
-              // Allocate 1 replica so that this index stays yellow
-              number_of_replicas: '1',
-              // Disable all shard allocation so that the index status is red
-              index: { routing: { allocation: { enable: 'none' } } },
-            },
-          },
-        },
-        { maxRetries: 0 /** handle retry ourselves for now */ }
-      );
-
-      // Start tracking the index status
-      const indexStatusPromise = waitForIndexStatusYellow(client, 'red_then_yellow_index')();
-
-      const redStatusResponse = await client.cluster.health({ index: 'red_then_yellow_index' });
-      expect(redStatusResponse.body.status).toBe('red');
-
-      client.indices.putSettings({
-        index: 'red_then_yellow_index',
-        body: {
-          // Enable all shard allocation so that the index status turns yellow
-          index: { routing: { allocation: { enable: 'all' } } },
-        },
-      });
-
-      await indexStatusPromise;
-      // Assert that the promise didn't resolve before the index became yellow
-
-      const yellowStatusResponse = await client.cluster.health({ index: 'red_then_yellow_index' });
-      expect(yellowStatusResponse.body.status).toBe('yellow');
-    });
-  });
-
-  describe('cloneIndex', () => {
-    afterAll(async () => {
-      try {
-        await client.indices.delete({ index: 'clone_*' });
-      } catch (e) {
-        /** ignore */
-      }
-    });
-    it('resolves right if cloning into a new target index', async () => {
-      const task = cloneIndex(client, 'existing_index_with_write_block', 'clone_target_1');
-      expect.assertions(1);
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                      Object {
-                        "_tag": "Right",
-                        "right": Object {
-                          "acknowledged": true,
-                          "shardsAcknowledged": true,
-                        },
-                      }
-                  `);
-    });
-    it('resolves right after waiting for index status to be yellow if clone target already existed', async () => {
-      expect.assertions(2);
-
-      // Create a yellow index
-      await client.indices
-        .create({
-          index: 'clone_red_then_yellow_index',
-          timeout: '5s',
-          body: {
-            mappings: { properties: {} },
-            settings: {
-              // Allocate 1 replica so that this index stays yellow
-              number_of_replicas: '1',
-              // Disable all shard allocation so that the index status is red
-              'index.routing.allocation.enable': 'none',
-            },
-          },
-        })
-        .catch((e) => {});
-
-      // Call clone even though the index already exists
-      const cloneIndexPromise = cloneIndex(
-        client,
-        'existing_index_with_write_block',
-        'clone_red_then_yellow_index'
-      )();
-
-      let indexYellow = false;
-      setTimeout(() => {
-        client.indices.putSettings({
-          index: 'clone_red_then_yellow_index',
-          body: {
-            // Enable all shard allocation so that the index status goes yellow
-            index: { routing: { allocation: { enable: 'all' } } },
-          },
-        });
-        indexYellow = true;
-      }, 10);
-
-      await cloneIndexPromise.then((res) => {
-        // Assert that the promise didn't resolve before the index became green
-        expect(indexYellow).toBe(true);
-        expect(res).toMatchInlineSnapshot(`
-          Object {
-            "_tag": "Right",
-            "right": Object {
-              "acknowledged": true,
-              "shardsAcknowledged": true,
-            },
-          }
-        `);
-      });
-    });
-    it('resolves left index_not_found_exception if the source index does not exist', async () => {
-      expect.assertions(1);
-      const task = cloneIndex(client, 'no_such_index', 'clone_target_3');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                      Object {
-                        "_tag": "Left",
-                        "left": Object {
-                          "index": "no_such_index",
-                          "type": "index_not_found_exception",
-                        },
-                      }
-                  `);
-    });
-    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 () => {
-      // Create a red index
-      await client.indices
-        .create({
-          index: 'clone_red_index',
-          timeout: '5s',
-          body: {
-            mappings: { properties: {} },
-            settings: {
-              // Allocate 1 replica so that this index stays yellow
-              number_of_replicas: '1',
-              // Disable all shard allocation so that the index status is red
-              'index.routing.allocation.enable': 'none',
-            },
-          },
-        })
-        .catch((e) => {});
-
-      // Call clone even though the index already exists
-      const cloneIndexPromise = cloneIndex(
-        client,
-        'existing_index_with_write_block',
-        'clone_red_index',
-        '0s'
-      )();
-
-      await cloneIndexPromise.then((res) => {
-        expect(res).toMatchInlineSnapshot(`
-          Object {
-            "_tag": "Left",
-            "left": Object {
-              "error": [ResponseError: Response Error],
-              "message": "Response Error",
-              "type": "retryable_es_client_error",
-            },
-          }
-        `);
-      });
-    });
-  });
-
-  // Reindex doesn't return any errors on it's own, so we have to test
-  // together with waitForReindexTask
-  describe('reindex & waitForReindexTask', () => {
-    it('resolves right when reindex succeeds without reindex script', async () => {
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target',
-        Option.none,
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      const task = waitForReindexTask(client, res.right.taskId, '10s');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "reindex_succeeded",
-                }
-              `);
-
-      const results = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'reindex_target',
-        outdatedDocumentsQuery: undefined,
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
-        Array [
-          "doc 1",
-          "doc 2",
-          "doc 3",
-          "f-agent-event 5",
-          "saved object 4",
-        ]
-      `);
-    });
-    it('resolves right and excludes all documents not matching the unusedTypesQuery', async () => {
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_excluded_docs',
-        Option.none,
-        false,
-        {
-          bool: {
-            must_not: ['f_agent_event', 'another_unused_type'].map((type) => ({
-              term: { type },
-            })),
-          },
-        }
-      )()) as Either.Right<ReindexResponse>;
-      const task = waitForReindexTask(client, res.right.taskId, '10s');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                      Object {
-                        "_tag": "Right",
-                        "right": "reindex_succeeded",
-                      }
-                  `);
-
-      const results = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'reindex_target_excluded_docs',
-        outdatedDocumentsQuery: undefined,
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
-        Array [
-          "doc 1",
-          "doc 2",
-          "doc 3",
-        ]
-      `);
-    });
-    it('resolves right when reindex succeeds with reindex script', async () => {
-      expect.assertions(2);
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_2',
-        Option.some(`ctx._source.title = ctx._source.title + '_updated'`),
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      const task = waitForReindexTask(client, res.right.taskId, '10s');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "reindex_succeeded",
-                }
-              `);
-      const results = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'reindex_target_2',
-        outdatedDocumentsQuery: undefined,
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
-        Array [
-          "doc 1_updated",
-          "doc 2_updated",
-          "doc 3_updated",
-          "f-agent-event 5_updated",
-          "saved object 4_updated",
-        ]
-      `);
-    });
-    it('resolves right, ignores version conflicts and does not update existing docs when reindex multiple times', async () => {
-      expect.assertions(3);
-      // Reindex with a script
-      let res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_3',
-        Option.some(`ctx._source.title = ctx._source.title + '_updated'`),
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      let task = waitForReindexTask(client, res.right.taskId, '10s');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                      Object {
-                        "_tag": "Right",
-                        "right": "reindex_succeeded",
-                      }
-                  `);
-
-      // reindex without a script
-      res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_3',
-        Option.none,
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      task = waitForReindexTask(client, res.right.taskId, '10s');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                      Object {
-                        "_tag": "Right",
-                        "right": "reindex_succeeded",
-                      }
-                  `);
-
-      // Assert that documents weren't overridden by the second, unscripted reindex
-      const results = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'reindex_target_3',
-        outdatedDocumentsQuery: undefined,
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
-        Array [
-          "doc 1_updated",
-          "doc 2_updated",
-          "doc 3_updated",
-          "f-agent-event 5_updated",
-          "saved object 4_updated",
-        ]
-      `);
-    });
-    it('resolves right and proceeds to add missing documents if there are some existing docs conflicts', async () => {
-      expect.assertions(2);
-      // Simulate a reindex that only adds some of the documents from the
-      // source index into the target index
-      await createIndex(client, 'reindex_target_4', { properties: {} })();
-      const sourceDocs = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'existing_index_with_docs',
-        outdatedDocumentsQuery: undefined,
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments
-        .slice(0, 2)
-        .map(({ _id, _source }) => ({
-          _id,
-          _source,
-        }));
-      await bulkOverwriteTransformedDocuments(client, 'reindex_target_4', sourceDocs, 'wait_for')();
-
-      // Now do a real reindex
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_4',
-        Option.some(`ctx._source.title = ctx._source.title + '_updated'`),
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      const task = waitForReindexTask(client, res.right.taskId, '10s');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                        Object {
-                          "_tag": "Right",
-                          "right": "reindex_succeeded",
-                        }
-                  `);
-      // Assert that existing documents weren't overridden, but that missing
-      // documents were added by the reindex
-      const results = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'reindex_target_4',
-        outdatedDocumentsQuery: undefined,
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-      expect(results.map((doc) => doc._source.title).sort()).toMatchInlineSnapshot(`
-        Array [
-          "doc 1",
-          "doc 2",
-          "doc 3_updated",
-          "f-agent-event 5_updated",
-          "saved object 4_updated",
-        ]
-      `);
-    });
-    it('resolves left incompatible_mapping_exception if all reindex failures are due to a strict_dynamic_mapping_exception', async () => {
-      expect.assertions(1);
-      // Simulates one instance having completed the UPDATE_TARGET_MAPPINGS
-      // step which makes the mappings incompatible with outdated documents.
-      // If another instance then tries a reindex it will get a
-      // strict_dynamic_mapping_exception even if the documents already exist
-      // and should ignore this error.
-
-      // Create an index with incompatible mappings
-      await createIndex(client, 'reindex_target_5', {
-        dynamic: 'strict',
-        properties: {
-          /** no title field */
-        },
-      })();
-
-      const {
-        right: { taskId: reindexTaskId },
-      } = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_5',
-        Option.none,
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      const task = waitForReindexTask(client, reindexTaskId, '10s');
-
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                      Object {
-                        "_tag": "Left",
-                        "left": Object {
-                          "type": "incompatible_mapping_exception",
-                        },
-                      }
-                  `);
-    });
-    it('resolves left incompatible_mapping_exception if all reindex failures are due to a mapper_parsing_exception', async () => {
-      expect.assertions(1);
-      // Simulates one instance having completed the UPDATE_TARGET_MAPPINGS
-      // step which makes the mappings incompatible with outdated documents.
-      // If another instance then tries a reindex it will get a
-      // strict_dynamic_mapping_exception even if the documents already exist
-      // and should ignore this error.
-
-      // Create an index with incompatible mappings
-      await createIndex(client, 'reindex_target_6', {
-        dynamic: false,
-        properties: { title: { type: 'integer' } }, // integer is incompatible with string title
-      })();
-
-      const {
-        right: { taskId: reindexTaskId },
-      } = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_6',
-        Option.none,
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      const task = waitForReindexTask(client, reindexTaskId, '10s');
-
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                        Object {
-                          "_tag": "Left",
-                          "left": Object {
-                            "type": "incompatible_mapping_exception",
-                          },
-                        }
-                  `);
-    });
-    it('resolves left index_not_found_exception if source index does not exist', async () => {
-      expect.assertions(1);
-      const res = (await reindex(client, 'no_such_index', 'reindex_target', Option.none, false, {
-        match_all: {},
-      })()) as Either.Right<ReindexResponse>;
-      const task = waitForReindexTask(client, res.right.taskId, '10s');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                            Object {
-                              "_tag": "Left",
-                              "left": Object {
-                                "index": "no_such_index",
-                                "type": "index_not_found_exception",
-                              },
-                            }
-                    `);
-    });
-    it('resolves left target_index_had_write_block if all failures are due to a write block', async () => {
-      expect.assertions(1);
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'existing_index_with_write_block',
-        Option.none,
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-
-      const task = waitForReindexTask(client, res.right.taskId, '10s');
-
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                          Object {
-                            "_tag": "Left",
-                            "left": Object {
-                              "type": "target_index_had_write_block",
-                            },
-                          }
-                    `);
-    });
-    it('resolves left if requireAlias=true and the target is not an alias', async () => {
-      expect.assertions(1);
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'existing_index_with_write_block',
-        Option.none,
-        true,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-
-      const task = waitForReindexTask(client, res.right.taskId, '10s');
-
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Left",
-                  "left": Object {
-                    "index": "existing_index_with_write_block",
-                    "type": "index_not_found_exception",
-                  },
-                }
-              `);
-    });
-    it('resolves left wait_for_task_completion_timeout when the task does not finish within the timeout', async () => {
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target',
-        Option.none,
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-
-      const task = waitForReindexTask(client, res.right.taskId, '0s');
-
-      await expect(task()).resolves.toMatchObject({
-        _tag: 'Left',
-        left: {
-          error: expect.any(ResponseError),
-          message: expect.stringMatching(
-            /\[timeout_exception\] Timed out waiting for completion of \[org.elasticsearch.index.reindex.BulkByScrollTask/
-          ),
-          type: 'wait_for_task_completion_timeout',
-        },
-      });
-    });
-  });
-
-  describe('verifyReindex', () => {
-    it('resolves right if source and target indices have the same amount of documents', async () => {
-      expect.assertions(1);
-      const res = (await reindex(
-        client,
-        'existing_index_with_docs',
-        'reindex_target_7',
-        Option.none,
-        false,
-        { match_all: {} }
-      )()) as Either.Right<ReindexResponse>;
-      await waitForReindexTask(client, res.right.taskId, '10s')();
-
-      const task = verifyReindex(client, 'existing_index_with_docs', 'reindex_target_7');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-              Object {
-                "_tag": "Right",
-                "right": "verify_reindex_succeeded",
-              }
-            `);
-    });
-    it('resolves left if source and target indices have different amount of documents', async () => {
-      expect.assertions(1);
-      const task = verifyReindex(client, 'existing_index_with_docs', 'existing_index_2');
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Left",
-                  "left": Object {
-                    "type": "verify_reindex_failed",
-                  },
-                }
-              `);
-    });
-    it('rejects if source or target index does not exist', async () => {
-      expect.assertions(2);
-      let task = verifyReindex(client, 'no_such_index', 'existing_index_2');
-      await expect(task()).rejects.toMatchInlineSnapshot(
-        `[ResponseError: index_not_found_exception]`
-      );
-
-      task = verifyReindex(client, 'existing_index_2', 'no_such_index');
-      await expect(task()).rejects.toThrow('index_not_found_exception');
-    });
-  });
-
-  describe('openPit', () => {
-    it('opens PointInTime for an index', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      expect(pitResponse.right.pitId).toEqual(expect.any(String));
-
-      const searchResponse = await client.search({
-        body: {
-          pit: { id: pitResponse.right.pitId },
-        },
-      });
-
-      await expect(searchResponse.body.hits.hits.length).toBeGreaterThan(0);
-    });
-    it('rejects if index does not exist', async () => {
-      const openPitTask = openPit(client, 'no_such_index');
-      await expect(openPitTask()).rejects.toThrow('index_not_found_exception');
-    });
-  });
-
-  describe('readWithPit', () => {
-    it('requests documents from an index using given PIT', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      const readWithPitTask = readWithPit(
-        client,
-        pitResponse.right.pitId,
-        { match_all: {} },
-        1000,
-        undefined
-      );
-      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
-
-      await expect(docsResponse.right.outdatedDocuments.length).toBe(5);
-    });
-
-    it('requests the batchSize of documents from an index', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      const readWithPitTask = readWithPit(
-        client,
-        pitResponse.right.pitId,
-        { match_all: {} },
-        3,
-        undefined
-      );
-      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
-
-      await expect(docsResponse.right.outdatedDocuments.length).toBe(3);
-    });
-
-    it('it excludes documents not matching the provided "query"', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      const readWithPitTask = readWithPit(
-        client,
-        pitResponse.right.pitId,
-        {
-          bool: {
-            must_not: [
-              {
-                term: {
-                  type: 'f_agent_event',
-                },
-              },
-              {
-                term: {
-                  type: 'another_unused_type',
-                },
-              },
-            ],
-          },
-        },
-        1000,
-        undefined
-      );
-
-      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
-
-      expect(docsResponse.right.outdatedDocuments.map((doc) => doc._source.title).sort())
-        .toMatchInlineSnapshot(`
-        Array [
-          "doc 1",
-          "doc 2",
-          "doc 3",
-        ]
-      `);
-    });
-
-    it('only returns documents that match the provided "query"', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      const readWithPitTask = readWithPit(
-        client,
-        pitResponse.right.pitId,
-        {
-          match: { title: { query: 'doc' } },
-        },
-        1000,
-        undefined
-      );
-
-      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
-
-      expect(docsResponse.right.outdatedDocuments.map((doc) => doc._source.title).sort())
-        .toMatchInlineSnapshot(`
-        Array [
-          "doc 1",
-          "doc 2",
-          "doc 3",
-        ]
-      `);
-    });
-
-    it('returns docs with _seq_no and _primary_term when specified', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      const readWithPitTask = readWithPit(
-        client,
-        pitResponse.right.pitId,
-        {
-          match: { title: { query: 'doc' } },
-        },
-        1000,
-        undefined,
-        true
-      );
-
-      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
-
-      expect(docsResponse.right.outdatedDocuments).toEqual(
-        expect.arrayContaining([
-          expect.objectContaining({
-            _seq_no: expect.any(Number),
-            _primary_term: expect.any(Number),
-          }),
-        ])
-      );
-    });
-
-    it('does not return docs with _seq_no and _primary_term if not specified', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      const readWithPitTask = readWithPit(
-        client,
-        pitResponse.right.pitId,
-        {
-          match: { title: { query: 'doc' } },
-        },
-        1000,
-        undefined
-      );
-
-      const docsResponse = (await readWithPitTask()) as Either.Right<ReadWithPit>;
-
-      expect(docsResponse.right.outdatedDocuments).toEqual(
-        expect.arrayContaining([
-          expect.not.objectContaining({
-            _seq_no: expect.any(Number),
-            _primary_term: expect.any(Number),
-          }),
-        ])
-      );
-    });
-
-    it('rejects if PIT does not exist', async () => {
-      const readWithPitTask = readWithPit(
-        client,
-        'no_such_pit',
-        { match_all: {} },
-        1000,
-        undefined
-      );
-      await expect(readWithPitTask()).rejects.toThrow('illegal_argument_exception');
-    });
-  });
-
-  describe('closePit', () => {
-    it('closes PointInTime', async () => {
-      const openPitTask = openPit(client, 'existing_index_with_docs');
-      const pitResponse = (await openPitTask()) as Either.Right<OpenPitResponse>;
-
-      const pitId = pitResponse.right.pitId;
-      await closePit(client, pitId)();
-
-      const searchTask = client.search({
-        body: {
-          pit: { id: pitId },
-        },
-      });
-
-      await expect(searchTask).rejects.toThrow('search_phase_execution_exception');
-    });
-
-    it('rejects if PIT does not exist', async () => {
-      const closePitTask = closePit(client, 'no_such_pit');
-      await expect(closePitTask()).rejects.toThrow('illegal_argument_exception');
-    });
-  });
-
-  describe('transformDocs', () => {
-    it('applies "transformRawDocs" and returns the transformed documents', async () => {
-      const originalDocs = [
-        { _id: 'foo:1', _source: { type: 'dashboard', value: 1 } },
-        { _id: 'foo:2', _source: { type: 'dashboard', value: 2 } },
-      ];
-
-      function innerTransformRawDocs(
-        docs: SavedObjectsRawDoc[]
-      ): TaskEither<DocumentsTransformFailed, DocumentsTransformSuccess> {
-        return async () => {
-          const processedDocs: SavedObjectsRawDoc[] = [];
-          for (const doc of docs) {
-            doc._source.value += 1;
-            processedDocs.push(doc);
-          }
-          return Either.right({ processedDocs });
-        };
-      }
-      const transformTask = transformDocs(innerTransformRawDocs, originalDocs);
-
-      const resultsWithProcessDocs = ((await transformTask()) as Either.Right<DocumentsTransformSuccess>)
-        .right.processedDocs;
-      expect(resultsWithProcessDocs.length).toEqual(2);
-      const foo2 = resultsWithProcessDocs.find((h) => h._id === 'foo:2');
-      expect(foo2?._source?.value).toBe(3);
-    });
-  });
-
-  describe('waitForPickupUpdatedMappingsTask', () => {
-    it('rejects if there are failures', async () => {
-      const res = (await pickupUpdatedMappings(
-        client,
-        'existing_index_with_write_block'
-      )()) as Either.Right<UpdateByQueryResponse>;
-
-      const task = waitForPickupUpdatedMappingsTask(client, res.right.taskId, '10s');
-
-      // We can't do a snapshot match because the response includes an index
-      // id which ES assigns dynamically
-      await expect(task()).rejects.toMatchObject({
-        message: /pickupUpdatedMappings task failed with the following failures:\n\[\{\"index\":\"existing_index_with_write_block\"/,
-      });
-    });
-    it('rejects if there is an error', async () => {
-      const res = (await pickupUpdatedMappings(
-        client,
-        'no_such_index'
-      )()) as Either.Right<UpdateByQueryResponse>;
-
-      const task = waitForPickupUpdatedMappingsTask(client, res.right.taskId, '10s');
-
-      await expect(task()).rejects.toMatchInlineSnapshot(`
-                        [Error: pickupUpdatedMappings task failed with the following error:
-                        {"type":"index_not_found_exception","reason":"no such index [no_such_index]","resource.type":"index_or_alias","resource.id":"no_such_index","index_uuid":"_na_","index":"no_such_index"}]
-                    `);
-    });
-    it('resolves left wait_for_task_completion_timeout when the task does not complete within the timeout', async () => {
-      const res = (await pickupUpdatedMappings(
-        client,
-        'existing_index_with_docs'
-      )()) as Either.Right<UpdateByQueryResponse>;
-
-      const task = waitForPickupUpdatedMappingsTask(client, res.right.taskId, '0s');
-
-      await expect(task()).resolves.toMatchObject({
-        _tag: 'Left',
-        left: {
-          error: expect.any(ResponseError),
-          message: expect.stringMatching(
-            /\[timeout_exception\] Timed out waiting for completion of \[org.elasticsearch.index.reindex.BulkByScrollTask/
-          ),
-          type: 'wait_for_task_completion_timeout',
-        },
-      });
-    });
-    it('resolves right when successful', async () => {
-      const res = (await pickupUpdatedMappings(
-        client,
-        'existing_index_with_docs'
-      )()) as Either.Right<UpdateByQueryResponse>;
-
-      const task = waitForPickupUpdatedMappingsTask(client, res.right.taskId, '10s');
-
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                        Object {
-                          "_tag": "Right",
-                          "right": "pickup_updated_mappings_succeeded",
-                        }
-                    `);
-    });
-  });
-
-  describe('updateAndPickupMappings', () => {
-    it('resolves right when mappings were updated and picked up', async () => {
-      // Create an index without any mappings and insert documents into it
-      await createIndex(client, 'existing_index_without_mappings', {
-        dynamic: false,
-        properties: {},
-      })();
-      const sourceDocs = ([
-        { _source: { title: 'doc 1' } },
-        { _source: { title: 'doc 2' } },
-        { _source: { title: 'doc 3' } },
-        { _source: { title: 'doc 4' } },
-      ] as unknown) as SavedObjectsRawDoc[];
-      await bulkOverwriteTransformedDocuments(
-        client,
-        'existing_index_without_mappings',
-        sourceDocs,
-        'wait_for'
-      )();
-
-      // Assert that we can't search over the unmapped fields of the document
-      const originalSearchResults = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'existing_index_without_mappings',
-        outdatedDocumentsQuery: {
-          match: { title: { query: 'doc' } },
-        },
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-      expect(originalSearchResults.length).toBe(0);
-
-      // Update and pickup mappings so that the title field is searchable
-      const res = await updateAndPickupMappings(client, 'existing_index_without_mappings', {
-        properties: {
-          title: { type: 'text' },
-        },
-      })();
-      expect(Either.isRight(res)).toBe(true);
-      const taskId = (res as Either.Right<UpdateAndPickupMappingsResponse>).right.taskId;
-      await waitForPickupUpdatedMappingsTask(client, taskId, '60s')();
-
-      // Repeat the search expecting to be able to find the existing documents
-      const pickedUpSearchResults = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'existing_index_without_mappings',
-        outdatedDocumentsQuery: {
-          match: { title: { query: 'doc' } },
-        },
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-      expect(pickedUpSearchResults.length).toBe(4);
-    });
-  });
-
-  describe('updateAliases', () => {
-    describe('remove', () => {
-      it('resolves left index_not_found_exception when the index does not exist', async () => {
-        const task = updateAliases(client, [
-          {
-            remove: {
-              alias: 'no_such_alias',
-              index: 'no_such_index',
-              must_exist: false,
-            },
-          },
-        ]);
-        await expect(task()).resolves.toMatchInlineSnapshot(`
-                  Object {
-                    "_tag": "Left",
-                    "left": Object {
-                      "index": "no_such_index",
-                      "type": "index_not_found_exception",
-                    },
-                  }
-                `);
-      });
-      describe('with must_exist=false', () => {
-        it('resolves left alias_not_found_exception when alias does not exist', async () => {
-          const task = updateAliases(client, [
-            {
-              remove: {
-                alias: 'no_such_alias',
-                index: 'existing_index_with_docs',
-                must_exist: false,
-              },
-            },
-          ]);
-          await expect(task()).resolves.toMatchInlineSnapshot(`
-                    Object {
-                      "_tag": "Left",
-                      "left": Object {
-                        "type": "alias_not_found_exception",
-                      },
-                    }
-                  `);
-        });
-      });
-      describe('with must_exist=true', () => {
-        it('resolves left alias_not_found_exception when alias does not exist on specified index', async () => {
-          const task = updateAliases(client, [
-            {
-              remove: {
-                alias: 'existing_index_2_alias',
-                index: 'existing_index_with_docs',
-                must_exist: true,
-              },
-            },
-          ]);
-          await expect(task()).resolves.toMatchInlineSnapshot(`
-                    Object {
-                      "_tag": "Left",
-                      "left": Object {
-                        "type": "alias_not_found_exception",
-                      },
-                    }
-                  `);
-        });
-        it('resolves left alias_not_found_exception when alias does not exist', async () => {
-          const task = updateAliases(client, [
-            {
-              remove: {
-                alias: 'no_such_alias',
-                index: 'existing_index_with_docs',
-                must_exist: true,
-              },
-            },
-          ]);
-          await expect(task()).resolves.toMatchInlineSnapshot(`
-                    Object {
-                      "_tag": "Left",
-                      "left": Object {
-                        "type": "alias_not_found_exception",
-                      },
-                    }
-                  `);
-        });
-      });
-    });
-    describe('remove_index', () => {
-      it('left index_not_found_exception if index does not exist', async () => {
-        const task = updateAliases(client, [
-          {
-            remove_index: {
-              index: 'no_such_index',
-            },
-          },
-        ]);
-        await expect(task()).resolves.toMatchInlineSnapshot(`
-                  Object {
-                    "_tag": "Left",
-                    "left": Object {
-                      "index": "no_such_index",
-                      "type": "index_not_found_exception",
-                    },
-                  }
-                `);
-      });
-      it('left remove_index_not_a_concrete_index when remove_index targets an alias', async () => {
-        const task = updateAliases(client, [
-          {
-            remove_index: {
-              index: 'existing_index_2_alias',
-            },
-          },
-        ]);
-        await expect(task()).resolves.toMatchInlineSnapshot(`
-                  Object {
-                    "_tag": "Left",
-                    "left": Object {
-                      "type": "remove_index_not_a_concrete_index",
-                    },
-                  }
-                `);
-      });
-    });
-  });
-
-  describe('createIndex', () => {
-    afterAll(async () => {
-      await client.indices.delete({ index: 'red_then_yellow_index' });
-    });
-    it('resolves right after waiting for an index status to be yellow if the index already existed', async () => {
-      expect.assertions(2);
-      // Create a red index
-      await client.indices
-        .create(
-          {
-            index: 'red_then_yellow_index',
-            timeout: '5s',
-            body: {
-              mappings: { properties: {} },
-              settings: {
-                // Allocate 1 replica so that this index stays yellow
-                number_of_replicas: '1',
-                // Disable all shard allocation so that the index status is red
-                'index.routing.allocation.enable': 'none',
-              },
-            },
-          },
-          { maxRetries: 0 /** handle retry ourselves for now */ }
-        )
-        .catch((e) => {
-          /** ignore */
-        });
-
-      // Call createIndex even though the index already exists
-      const createIndexPromise = createIndex(client, 'red_then_yellow_index', undefined as any)();
-      let indexYellow = false;
-
-      setTimeout(() => {
-        client.indices.putSettings({
-          index: 'red_then_yellow_index',
-          body: {
-            // Disable all shard allocation so that the index status is red
-            index: { routing: { allocation: { enable: 'all' } } },
-          },
-        });
-        indexYellow = true;
-      }, 10);
-
-      await createIndexPromise.then((res) => {
-        // Assert that the promise didn't resolve before the index became green
-        expect(indexYellow).toBe(true);
-        expect(res).toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "create_index_succeeded",
-                }
-              `);
-      });
-    });
-    it('rejects when there is an unexpected error creating the index', async () => {
-      // Creating an index with the same name as an existing alias to induce
-      // failure
-      await expect(
-        createIndex(client, 'existing_index_2_alias', undefined as any)()
-      ).rejects.toMatchInlineSnapshot(`[ResponseError: invalid_index_name_exception]`);
-    });
-  });
-
-  describe('bulkOverwriteTransformedDocuments', () => {
-    it('resolves right when documents do not yet exist in the index', async () => {
-      const newDocs = ([
-        { _source: { title: 'doc 5' } },
-        { _source: { title: 'doc 6' } },
-        { _source: { title: 'doc 7' } },
-      ] as unknown) as SavedObjectsRawDoc[];
-      const task = bulkOverwriteTransformedDocuments(
-        client,
-        'existing_index_with_docs',
-        newDocs,
-        'wait_for'
-      );
-
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "bulk_index_succeeded",
-                }
-              `);
-    });
-    it('resolves right even if there were some version_conflict_engine_exception', async () => {
-      const existingDocs = ((await searchForOutdatedDocuments(client, {
-        batchSize: 1000,
-        targetIndex: 'existing_index_with_docs',
-        outdatedDocumentsQuery: undefined,
-      })()) as Either.Right<SearchResponse>).right.outdatedDocuments;
-
-      const task = bulkOverwriteTransformedDocuments(
-        client,
-        'existing_index_with_docs',
-        [...existingDocs, ({ _source: { title: 'doc 8' } } as unknown) as SavedObjectsRawDoc],
-        'wait_for'
-      );
-      await expect(task()).resolves.toMatchInlineSnapshot(`
-                Object {
-                  "_tag": "Right",
-                  "right": "bulk_index_succeeded",
-                }
-              `);
-    });
-    it('rejects if there are errors', async () => {
-      const newDocs = ([
-        { _source: { title: 'doc 5' } },
-        { _source: { title: 'doc 6' } },
-        { _source: { title: 'doc 7' } },
-      ] as unknown) as SavedObjectsRawDoc[];
-      await expect(
-        bulkOverwriteTransformedDocuments(
-          client,
-          'existing_index_with_write_block',
-          newDocs,
-          'wait_for'
-        )()
-      ).rejects.toMatchObject(expect.anything());
-    });
-  });
-});
diff --git a/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts b/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
index 5e4b8feefbd95..f9d8e7cc4fbaa 100644
--- a/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/integration_tests/migration.test.ts
@@ -157,7 +157,10 @@ describe('migration v2', () => {
       const response = body[migratedIndex];
 
       expect(response).toBeDefined();
-      expect(Object.keys(response.aliases).sort()).toEqual(['.kibana', `.kibana_${kibanaVersion}`]);
+      expect(Object.keys(response.aliases!).sort()).toEqual([
+        '.kibana',
+        `.kibana_${kibanaVersion}`,
+      ]);
     });
 
     it('copies all the document of the previous index to the new one', async () => {
@@ -216,7 +219,10 @@ describe('migration v2', () => {
       const response = body[migratedIndex];
 
       expect(response).toBeDefined();
-      expect(Object.keys(response.aliases).sort()).toEqual(['.kibana', `.kibana_${kibanaVersion}`]);
+      expect(Object.keys(response.aliases!).sort()).toEqual([
+        '.kibana',
+        `.kibana_${kibanaVersion}`,
+      ]);
     });
 
     it('copies all the document of the previous index to the new one', async () => {
diff --git a/src/core/server/saved_objects/migrationsv2/migrations_state_machine_cleanup.ts b/src/core/server/saved_objects/migrationsv2/migrations_state_machine_cleanup.ts
index 1881f9a712c29..e9cb33c0aa54a 100644
--- a/src/core/server/saved_objects/migrationsv2/migrations_state_machine_cleanup.ts
+++ b/src/core/server/saved_objects/migrationsv2/migrations_state_machine_cleanup.ts
@@ -19,7 +19,7 @@ export async function cleanup(
   if (!state) return;
   if ('sourceIndexPitId' in state) {
     try {
-      await Actions.closePit(client, state.sourceIndexPitId)();
+      await Actions.closePit({ client, pitId: state.sourceIndexPitId })();
     } catch (e) {
       executionLog.push({
         type: 'cleanup',
diff --git a/src/core/server/saved_objects/migrationsv2/model.test.ts b/src/core/server/saved_objects/migrationsv2/model.test.ts
index 186cb24b4a34a..86dc590aabdad 100644
--- a/src/core/server/saved_objects/migrationsv2/model.test.ts
+++ b/src/core/server/saved_objects/migrationsv2/model.test.ts
@@ -244,7 +244,7 @@ describe('migrations v2 model', () => {
             disabled_saved_object_type: '7997cf5a56cc02bdc9c93361bde732b0',
           },
         },
-      };
+      } as const;
 
       test('INIT -> OUTDATED_DOCUMENTS_SEARCH_OPEN_PIT if .kibana is already pointing to the target index', () => {
         const res: ResponseType<'INIT'> = Either.right({
@@ -683,7 +683,7 @@ describe('migrations v2 model', () => {
             disabled_saved_object_type: '7997cf5a56cc02bdc9c93361bde732b0',
           },
         },
-      };
+      } as const;
 
       const waitForYellowSourceState: WaitForYellowSourceState = {
         ...baseState,
diff --git a/src/core/server/saved_objects/migrationsv2/next.ts b/src/core/server/saved_objects/migrationsv2/next.ts
index 07ebf80271d48..3c3e3c46a8d68 100644
--- a/src/core/server/saved_objects/migrationsv2/next.ts
+++ b/src/core/server/saved_objects/migrationsv2/next.ts
@@ -58,38 +58,46 @@ export type ResponseType<ControlState extends AllActionStates> = UnwrapPromise<
 export const nextActionMap = (client: ElasticsearchClient, transformRawDocs: TransformRawDocs) => {
   return {
     INIT: (state: InitState) =>
-      Actions.fetchIndices(client, [state.currentAlias, state.versionAlias]),
+      Actions.fetchIndices({ client, indices: [state.currentAlias, state.versionAlias] }),
     WAIT_FOR_YELLOW_SOURCE: (state: WaitForYellowSourceState) =>
-      Actions.waitForIndexStatusYellow(client, state.sourceIndex.value),
+      Actions.waitForIndexStatusYellow({ client, index: state.sourceIndex.value }),
     SET_SOURCE_WRITE_BLOCK: (state: SetSourceWriteBlockState) =>
-      Actions.setWriteBlock(client, state.sourceIndex.value),
+      Actions.setWriteBlock({ client, index: state.sourceIndex.value }),
     CREATE_NEW_TARGET: (state: CreateNewTargetState) =>
-      Actions.createIndex(client, state.targetIndex, state.targetIndexMappings),
+      Actions.createIndex({
+        client,
+        indexName: state.targetIndex,
+        mappings: state.targetIndexMappings,
+      }),
     CREATE_REINDEX_TEMP: (state: CreateReindexTempState) =>
-      Actions.createIndex(client, state.tempIndex, state.tempIndexMappings),
+      Actions.createIndex({
+        client,
+        indexName: state.tempIndex,
+        mappings: state.tempIndexMappings,
+      }),
     REINDEX_SOURCE_TO_TEMP_OPEN_PIT: (state: ReindexSourceToTempOpenPit) =>
-      Actions.openPit(client, state.sourceIndex.value),
+      Actions.openPit({ client, index: state.sourceIndex.value }),
     REINDEX_SOURCE_TO_TEMP_READ: (state: ReindexSourceToTempRead) =>
-      Actions.readWithPit(
+      Actions.readWithPit({
         client,
-        state.sourceIndexPitId,
+        pitId: state.sourceIndexPitId,
         /* When reading we use a source query to exclude saved objects types which
          * are no longer used. These saved objects will still be kept in the outdated
          * index for backup purposes, but won't be available in the upgraded index.
          */
-        state.unusedTypesQuery,
-        state.batchSize,
-        state.lastHitSortValue
-      ),
+        query: state.unusedTypesQuery,
+        batchSize: state.batchSize,
+        searchAfter: state.lastHitSortValue,
+      }),
     REINDEX_SOURCE_TO_TEMP_CLOSE_PIT: (state: ReindexSourceToTempClosePit) =>
-      Actions.closePit(client, state.sourceIndexPitId),
+      Actions.closePit({ client, pitId: state.sourceIndexPitId }),
     REINDEX_SOURCE_TO_TEMP_INDEX: (state: ReindexSourceToTempIndex) =>
-      Actions.transformDocs(transformRawDocs, state.outdatedDocuments),
+      Actions.transformDocs({ transformRawDocs, outdatedDocuments: state.outdatedDocuments }),
     REINDEX_SOURCE_TO_TEMP_INDEX_BULK: (state: ReindexSourceToTempIndexBulk) =>
-      Actions.bulkOverwriteTransformedDocuments(
+      Actions.bulkOverwriteTransformedDocuments({
         client,
-        state.tempIndex,
-        state.transformedDocs,
+        index: state.tempIndex,
+        transformedDocs: state.transformedDocs,
         /**
          * Since we don't run a search against the target index, we disable "refresh" to speed up
          * the migration process.
@@ -97,39 +105,48 @@ export const nextActionMap = (client: ElasticsearchClient, transformRawDocs: Tra
          * before we reach out to the OUTDATED_DOCUMENTS_SEARCH_OPEN_PIT step.
          * Right now, it's performed during REFRESH_TARGET step.
          */
-        false
-      ),
+        refresh: false,
+      }),
     SET_TEMP_WRITE_BLOCK: (state: SetTempWriteBlock) =>
-      Actions.setWriteBlock(client, state.tempIndex),
+      Actions.setWriteBlock({ client, index: state.tempIndex }),
     CLONE_TEMP_TO_TARGET: (state: CloneTempToSource) =>
-      Actions.cloneIndex(client, state.tempIndex, state.targetIndex),
-    REFRESH_TARGET: (state: RefreshTarget) => Actions.refreshIndex(client, state.targetIndex),
+      Actions.cloneIndex({ client, source: state.tempIndex, target: state.targetIndex }),
+    REFRESH_TARGET: (state: RefreshTarget) =>
+      Actions.refreshIndex({ client, targetIndex: state.targetIndex }),
     UPDATE_TARGET_MAPPINGS: (state: UpdateTargetMappingsState) =>
-      Actions.updateAndPickupMappings(client, state.targetIndex, state.targetIndexMappings),
+      Actions.updateAndPickupMappings({
+        client,
+        index: state.targetIndex,
+        mappings: state.targetIndexMappings,
+      }),
     UPDATE_TARGET_MAPPINGS_WAIT_FOR_TASK: (state: UpdateTargetMappingsWaitForTaskState) =>
-      Actions.waitForPickupUpdatedMappingsTask(client, state.updateTargetMappingsTaskId, '60s'),
+      Actions.waitForPickupUpdatedMappingsTask({
+        client,
+        taskId: state.updateTargetMappingsTaskId,
+        timeout: '60s',
+      }),
     OUTDATED_DOCUMENTS_SEARCH_OPEN_PIT: (state: OutdatedDocumentsSearchOpenPit) =>
-      Actions.openPit(client, state.targetIndex),
+      Actions.openPit({ client, index: state.targetIndex }),
     OUTDATED_DOCUMENTS_SEARCH_READ: (state: OutdatedDocumentsSearchRead) =>
-      Actions.readWithPit(
+      Actions.readWithPit({
         client,
-        state.pitId,
+        pitId: state.pitId,
         // search for outdated documents only
-        state.outdatedDocumentsQuery,
-        state.batchSize,
-        state.lastHitSortValue
-      ),
+        query: state.outdatedDocumentsQuery,
+        batchSize: state.batchSize,
+        searchAfter: state.lastHitSortValue,
+      }),
     OUTDATED_DOCUMENTS_SEARCH_CLOSE_PIT: (state: OutdatedDocumentsSearchClosePit) =>
-      Actions.closePit(client, state.pitId),
+      Actions.closePit({ client, pitId: state.pitId }),
     OUTDATED_DOCUMENTS_REFRESH: (state: OutdatedDocumentsRefresh) =>
-      Actions.refreshIndex(client, state.targetIndex),
+      Actions.refreshIndex({ client, targetIndex: state.targetIndex }),
     OUTDATED_DOCUMENTS_TRANSFORM: (state: OutdatedDocumentsTransform) =>
-      Actions.transformDocs(transformRawDocs, state.outdatedDocuments),
+      Actions.transformDocs({ transformRawDocs, outdatedDocuments: state.outdatedDocuments }),
     TRANSFORMED_DOCUMENTS_BULK_INDEX: (state: TransformedDocumentsBulkIndex) =>
-      Actions.bulkOverwriteTransformedDocuments(
+      Actions.bulkOverwriteTransformedDocuments({
         client,
-        state.targetIndex,
-        state.transformedDocs,
+        index: state.targetIndex,
+        transformedDocs: state.transformedDocs,
         /**
          * Since we don't run a search against the target index, we disable "refresh" to speed up
          * the migration process.
@@ -137,29 +154,32 @@ export const nextActionMap = (client: ElasticsearchClient, transformRawDocs: Tra
          * before we reach out to the MARK_VERSION_INDEX_READY step.
          * Right now, it's performed during OUTDATED_DOCUMENTS_REFRESH step.
          */
-        false
-      ),
+      }),
     MARK_VERSION_INDEX_READY: (state: MarkVersionIndexReady) =>
-      Actions.updateAliases(client, state.versionIndexReadyActions.value),
+      Actions.updateAliases({ client, aliasActions: state.versionIndexReadyActions.value }),
     MARK_VERSION_INDEX_READY_CONFLICT: (state: MarkVersionIndexReadyConflict) =>
-      Actions.fetchIndices(client, [state.currentAlias, state.versionAlias]),
+      Actions.fetchIndices({ client, indices: [state.currentAlias, state.versionAlias] }),
     LEGACY_SET_WRITE_BLOCK: (state: LegacySetWriteBlockState) =>
-      Actions.setWriteBlock(client, state.legacyIndex),
+      Actions.setWriteBlock({ client, index: state.legacyIndex }),
     LEGACY_CREATE_REINDEX_TARGET: (state: LegacyCreateReindexTargetState) =>
-      Actions.createIndex(client, state.sourceIndex.value, state.legacyReindexTargetMappings),
+      Actions.createIndex({
+        client,
+        indexName: state.sourceIndex.value,
+        mappings: state.legacyReindexTargetMappings,
+      }),
     LEGACY_REINDEX: (state: LegacyReindexState) =>
-      Actions.reindex(
+      Actions.reindex({
         client,
-        state.legacyIndex,
-        state.sourceIndex.value,
-        state.preMigrationScript,
-        false,
-        state.unusedTypesQuery
-      ),
+        sourceIndex: state.legacyIndex,
+        targetIndex: state.sourceIndex.value,
+        reindexScript: state.preMigrationScript,
+        requireAlias: false,
+        unusedTypesQuery: state.unusedTypesQuery,
+      }),
     LEGACY_REINDEX_WAIT_FOR_TASK: (state: LegacyReindexWaitForTaskState) =>
-      Actions.waitForReindexTask(client, state.legacyReindexTaskId, '60s'),
+      Actions.waitForReindexTask({ client, taskId: state.legacyReindexTaskId, timeout: '60s' }),
     LEGACY_DELETE: (state: LegacyDeleteState) =>
-      Actions.updateAliases(client, state.legacyPreMigrationDoneActions),
+      Actions.updateAliases({ client, aliasActions: state.legacyPreMigrationDoneActions }),
   };
 };
 
diff --git a/src/core/server/saved_objects/migrationsv2/types.ts b/src/core/server/saved_objects/migrationsv2/types.ts
index adcd2ad32fd24..1151e8337d3d5 100644
--- a/src/core/server/saved_objects/migrationsv2/types.ts
+++ b/src/core/server/saved_objects/migrationsv2/types.ts
@@ -53,7 +53,7 @@ export interface BaseState extends ControlState {
   readonly tempIndexMappings: IndexMapping;
   /** Script to apply to a legacy index before it can be used as a migration source */
   readonly preMigrationScript: Option.Option<string>;
-  readonly outdatedDocumentsQuery: estypes.QueryContainer;
+  readonly outdatedDocumentsQuery: estypes.QueryDslQueryContainer;
   readonly retryCount: number;
   readonly retryDelay: number;
   /**
@@ -112,7 +112,7 @@ export interface BaseState extends ControlState {
    * are no longer used. These saved objects will still be kept in the outdated
    * index for backup purposes, but won't be available in the upgraded index.
    */
-  readonly unusedTypesQuery: estypes.QueryContainer;
+  readonly unusedTypesQuery: estypes.QueryDslQueryContainer;
 }
 
 export interface InitState extends BaseState {
@@ -132,7 +132,7 @@ export interface PostInitState extends BaseState {
   /** The target index is the index to which the migration writes */
   readonly targetIndex: string;
   readonly versionIndexReadyActions: Option.Option<AliasAction[]>;
-  readonly outdatedDocumentsQuery: estypes.QueryContainer;
+  readonly outdatedDocumentsQuery: estypes.QueryDslQueryContainer;
 }
 
 export interface DoneState extends PostInitState {
diff --git a/src/core/server/saved_objects/saved_objects_config.ts b/src/core/server/saved_objects/saved_objects_config.ts
index 7182df74c597f..c62d322f0bf8d 100644
--- a/src/core/server/saved_objects/saved_objects_config.ts
+++ b/src/core/server/saved_objects/saved_objects_config.ts
@@ -29,6 +29,9 @@ const migrationDeprecations: ConfigDeprecationProvider = () => [
         message:
           '"migrations.enableV2" is deprecated and will be removed in an upcoming release without any further notice.',
         documentationUrl: 'https://ela.st/kbn-so-migration-v2',
+        correctiveActions: {
+          manualSteps: [`Remove "migrations.enableV2" from your kibana configs.`],
+        },
       });
     }
     return settings;
diff --git a/src/core/server/saved_objects/saved_objects_type_registry.ts b/src/core/server/saved_objects/saved_objects_type_registry.ts
index a63837132b652..ba5960c59239d 100644
--- a/src/core/server/saved_objects/saved_objects_type_registry.ts
+++ b/src/core/server/saved_objects/saved_objects_type_registry.ts
@@ -33,7 +33,7 @@ export class SavedObjectTypeRegistry {
       throw new Error(`Type '${type.name}' is already registered`);
     }
     validateType(type);
-    this.types.set(type.name, deepFreeze(type));
+    this.types.set(type.name, deepFreeze(type) as SavedObjectsType);
   }
 
   /**
diff --git a/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts b/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts
index 57421db76f5b6..53f1b5c9d78c5 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/validation.test.ts
@@ -9,7 +9,7 @@
 import type { estypes } from '@elastic/elasticsearch';
 import { validateAndConvertAggregations } from './validation';
 
-type AggsMap = Record<string, estypes.AggregationContainer>;
+type AggsMap = Record<string, estypes.AggregationsAggregationContainer>;
 
 const mockMappings = {
   properties: {
@@ -19,7 +19,9 @@ const mockMappings = {
     references: {
       type: 'nested',
       properties: {
-        id: 'keyword',
+        id: {
+          type: 'keyword',
+        },
       },
     },
     foo: {
@@ -31,7 +33,7 @@ const mockMappings = {
           type: 'text',
         },
         bytes: {
-          type: 'number',
+          type: 'integer',
         },
       },
     },
@@ -73,7 +75,7 @@ const mockMappings = {
       },
     },
   },
-};
+} as const;
 
 describe('validateAndConvertAggregations', () => {
   it('validates a simple aggregations', () => {
diff --git a/src/core/server/saved_objects/service/lib/aggregations/validation.ts b/src/core/server/saved_objects/service/lib/aggregations/validation.ts
index cd41a23f4a28b..5ef89f297a796 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/validation.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/validation.ts
@@ -37,9 +37,9 @@ interface ValidationContext {
  */
 export const validateAndConvertAggregations = (
   allowedTypes: string[],
-  aggs: Record<string, estypes.AggregationContainer>,
+  aggs: Record<string, estypes.AggregationsAggregationContainer>,
   indexMapping: IndexMapping
-): Record<string, estypes.AggregationContainer> => {
+): Record<string, estypes.AggregationsAggregationContainer> => {
   return validateAggregations(aggs, {
     allowedTypes,
     indexMapping,
@@ -53,16 +53,15 @@ export const validateAndConvertAggregations = (
  * Or a nested record of aggregation (`SearchRequest.body.aggs.myAggregation.aggs`)
  */
 const validateAggregations = (
-  aggregations: Record<string, estypes.AggregationContainer>,
+  aggregations: Record<string, estypes.AggregationsAggregationContainer>,
   context: ValidationContext
 ) => {
-  return Object.entries(aggregations).reduce<Record<string, estypes.AggregationContainer>>(
-    (memo, [aggrName, aggrContainer]) => {
-      memo[aggrName] = validateAggregation(aggrContainer, childContext(context, aggrName));
-      return memo;
-    },
-    {}
-  );
+  return Object.entries(aggregations).reduce<
+    Record<string, estypes.AggregationsAggregationContainer>
+  >((memo, [aggrName, aggrContainer]) => {
+    memo[aggrName] = validateAggregation(aggrContainer, childContext(context, aggrName));
+    return memo;
+  }, {});
 };
 
 /**
@@ -70,7 +69,7 @@ const validateAggregations = (
  * from a nested aggregation record, including its potential nested aggregations.
  */
 const validateAggregation = (
-  aggregation: estypes.AggregationContainer,
+  aggregation: estypes.AggregationsAggregationContainer,
   context: ValidationContext
 ) => {
   const container = validateAggregationContainer(aggregation, context);
@@ -93,10 +92,10 @@ const validateAggregation = (
  * (ignoring its nested aggregations)
  */
 const validateAggregationContainer = (
-  container: estypes.AggregationContainer,
+  container: estypes.AggregationsAggregationContainer,
   context: ValidationContext
 ) => {
-  return Object.entries(container).reduce<estypes.AggregationContainer>(
+  return Object.entries(container).reduce<estypes.AggregationsAggregationContainer>(
     (memo, [aggName, aggregation]) => {
       if (aggregationKeys.includes(aggName)) {
         return memo;
diff --git a/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts b/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts
index 25c3aea474ece..0425e46b4477e 100644
--- a/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts
+++ b/src/core/server/saved_objects/service/lib/aggregations/validation_utils.test.ts
@@ -6,7 +6,6 @@
  * Side Public License, v 1.
  */
 
-import { IndexMapping } from '../../../mappings';
 import {
   isRootLevelAttribute,
   rewriteRootLevelAttribute,
@@ -14,7 +13,7 @@ import {
   rewriteObjectTypeAttribute,
 } from './validation_utils';
 
-const mockMappings: IndexMapping = {
+const mockMappings = {
   properties: {
     updated_at: {
       type: 'date',
@@ -28,7 +27,7 @@ const mockMappings: IndexMapping = {
           type: 'text',
         },
         bytes: {
-          type: 'number',
+          type: 'integer',
         },
       },
     },
@@ -70,7 +69,7 @@ const mockMappings: IndexMapping = {
       },
     },
   },
-};
+} as const;
 
 describe('isRootLevelAttribute', () => {
   it('returns true when referring to a path to a valid root level field', () => {
diff --git a/src/core/server/saved_objects/service/lib/filter_utils.test.ts b/src/core/server/saved_objects/service/lib/filter_utils.test.ts
index 2ef5219ccfff1..e6934398862dc 100644
--- a/src/core/server/saved_objects/service/lib/filter_utils.test.ts
+++ b/src/core/server/saved_objects/service/lib/filter_utils.test.ts
@@ -31,7 +31,7 @@ const mockMappings = {
           type: 'text',
         },
         bytes: {
-          type: 'number',
+          type: 'integer',
         },
       },
     },
@@ -90,7 +90,7 @@ const mockMappings = {
       },
     },
   },
-};
+} as const;
 
 describe('Filter Utils', () => {
   describe('#validateConvertFilterToKueryNode', () => {
diff --git a/src/core/server/saved_objects/service/lib/repository.ts b/src/core/server/saved_objects/service/lib/repository.ts
index c626a2b2acfb5..6b51bd57248a1 100644
--- a/src/core/server/saved_objects/service/lib/repository.ts
+++ b/src/core/server/saved_objects/service/lib/repository.ts
@@ -672,7 +672,6 @@ export class SavedObjectsRepository {
     }
 
     const deleteDocNotFound = body.result === 'not_found';
-    // @ts-expect-error 'error' does not exist on type 'DeleteResponse'
     const deleteIndexNotFound = body.error && body.error.type === 'index_not_found_exception';
     if (deleteDocNotFound || deleteIndexNotFound) {
       // see "404s from missing index" above
@@ -897,7 +896,7 @@ export class SavedObjectsRepository {
       per_page: perPage,
       total: body.hits.total,
       saved_objects: body.hits.hits.map(
-        (hit: estypes.Hit<SavedObjectsRawDocSource>): SavedObjectsFindResult => ({
+        (hit: estypes.SearchHit<SavedObjectsRawDocSource>): SavedObjectsFindResult => ({
           // @ts-expect-error @elastic/elasticsearch declared Id as string | number
           ...this._rawToSavedObject(hit),
           score: hit._score!,
@@ -1835,13 +1834,9 @@ export class SavedObjectsRepository {
       ...(preference ? { preference } : {}),
     };
 
-    const { body, statusCode } = await this.client.openPointInTime(
-      // @ts-expect-error @elastic/elasticsearch OpenPointInTimeRequest.index expected to accept string[]
-      esOptions,
-      {
-        ignore: [404],
-      }
-    );
+    const { body, statusCode } = await this.client.openPointInTime(esOptions, {
+      ignore: [404],
+    });
     if (statusCode === 404) {
       throw SavedObjectsErrorHelpers.createGenericNotFoundError();
     }
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
index 64b3dd428fb8b..3196a59ca39ee 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/search_dsl.ts
@@ -26,7 +26,7 @@ interface GetSearchDslOptions {
   rootSearchFields?: string[];
   searchAfter?: estypes.Id[];
   sortField?: string;
-  sortOrder?: estypes.SortOrder;
+  sortOrder?: estypes.SearchSortOrder;
   namespaces?: string[];
   pit?: SavedObjectsPitParams;
   typeToNamespacesMap?: Map<string, string[] | undefined>;
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
index 1376f0d50a9da..e2a21cc03ce3b 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.test.ts
@@ -50,7 +50,7 @@ const MAPPINGS = {
       },
     },
   },
-};
+} as const;
 
 describe('searchDsl/getSortParams', () => {
   describe('type, no sortField', () => {
diff --git a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
index 64849c308f3f0..592110a5413ec 100644
--- a/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
+++ b/src/core/server/saved_objects/service/lib/search_dsl/sorting_params.ts
@@ -16,8 +16,8 @@ export function getSortingParams(
   mappings: IndexMapping,
   type: string | string[],
   sortField?: string,
-  sortOrder?: estypes.SortOrder
-): { sort?: estypes.SortContainer[] } {
+  sortOrder?: estypes.SearchSortOrder
+): { sort?: estypes.SearchSortContainer[] } {
   if (!sortField) {
     return {};
   }
diff --git a/src/core/server/saved_objects/service/lib/update_objects_spaces.ts b/src/core/server/saved_objects/service/lib/update_objects_spaces.ts
index 079549265385c..3131d0240f96b 100644
--- a/src/core/server/saved_objects/service/lib/update_objects_spaces.ts
+++ b/src/core/server/saved_objects/service/lib/update_objects_spaces.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import type { BulkOperationContainer, MultiGetOperation } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import intersection from 'lodash/intersection';
 
 import type { ISavedObjectTypeRegistry } from '../../saved_objects_type_registry';
@@ -173,7 +173,7 @@ export async function updateObjectsSpaces({
     };
   });
 
-  const bulkGetDocs = expectedBulkGetResults.reduce<MultiGetOperation[]>((acc, x) => {
+  const bulkGetDocs = expectedBulkGetResults.reduce<estypes.MgetOperation[]>((acc, x) => {
     if (isRight(x) && x.value.esRequestIndex !== undefined) {
       acc.push({
         _id: serializer.generateRawId(undefined, x.value.type, x.value.id),
@@ -192,7 +192,7 @@ export async function updateObjectsSpaces({
 
   const time = new Date().toISOString();
   let bulkOperationRequestIndexCounter = 0;
-  const bulkOperationParams: BulkOperationContainer[] = [];
+  const bulkOperationParams: estypes.BulkOperationContainer[] = [];
   const expectedBulkOperationResults: Either[] = expectedBulkGetResults.map(
     (expectedBulkGetResult) => {
       if (isLeft(expectedBulkGetResult)) {
diff --git a/src/core/server/saved_objects/types.ts b/src/core/server/saved_objects/types.ts
index d3bfdcc6923dc..964ba671b5964 100644
--- a/src/core/server/saved_objects/types.ts
+++ b/src/core/server/saved_objects/types.ts
@@ -80,7 +80,7 @@ export interface SavedObjectsFindOptions {
   page?: number;
   perPage?: number;
   sortField?: string;
-  sortOrder?: estypes.SortOrder;
+  sortOrder?: estypes.SearchSortOrder;
   /**
    * An array of fields to include in the results
    * @example
@@ -137,7 +137,7 @@ export interface SavedObjectsFindOptions {
    *
    * @alpha
    */
-  aggs?: Record<string, estypes.AggregationContainer>;
+  aggs?: Record<string, estypes.AggregationsAggregationContainer>;
   namespaces?: string[];
   /**
    * This map defines each type to search for, and the namespace(s) to search for the type in; this is only intended to be used by a saved
diff --git a/src/core/server/server.api.md b/src/core/server/server.api.md
index 7f108dbeb0086..acec03902bf6a 100644
--- a/src/core/server/server.api.md
+++ b/src/core/server/server.api.md
@@ -872,8 +872,9 @@ export interface DeprecationsDetails {
                 [key: string]: any;
             };
         };
-        manualSteps?: string[];
+        manualSteps: string[];
     };
+    deprecationType?: 'config' | 'feature';
     // (undocumented)
     documentationUrl?: string;
     level: 'warning' | 'critical' | 'fetch_error';
@@ -2360,38 +2361,6 @@ export interface SavedObjectsCollectMultiNamespaceReferencesResponse {
     objects: SavedObjectReferenceWithContext[];
 }
 
-// @public
-export interface SavedObjectsComplexFieldMapping {
-    // (undocumented)
-    doc_values?: boolean;
-    dynamic?: false | 'strict';
-    // (undocumented)
-    enabled?: boolean;
-    // (undocumented)
-    properties: SavedObjectsMappingProperties;
-    // (undocumented)
-    type?: string;
-}
-
-// @public
-export interface SavedObjectsCoreFieldMapping {
-    // (undocumented)
-    doc_values?: boolean;
-    // (undocumented)
-    fields?: {
-        [subfield: string]: {
-            type: string;
-            ignore_above?: number;
-        };
-    };
-    // (undocumented)
-    index?: boolean;
-    // (undocumented)
-    null_value?: number | boolean | string;
-    // (undocumented)
-    type: string;
-}
-
 // @public (undocumented)
 export interface SavedObjectsCreateOptions extends SavedObjectsBaseOptions {
     coreMigrationVersion?: string;
@@ -2553,12 +2522,14 @@ export interface SavedObjectsExportTransformContext {
 }
 
 // @public
-export type SavedObjectsFieldMapping = SavedObjectsCoreFieldMapping | SavedObjectsComplexFieldMapping;
+export type SavedObjectsFieldMapping = estypes.MappingProperty & {
+    dynamic?: false | 'strict';
+};
 
 // @public (undocumented)
 export interface SavedObjectsFindOptions {
     // @alpha
-    aggs?: Record<string, estypes.AggregationContainer>;
+    aggs?: Record<string, estypes.AggregationsAggregationContainer>;
     defaultSearchOperator?: 'AND' | 'OR';
     fields?: string[];
     // Warning: (ae-forgotten-export) The symbol "KueryNode" needs to be exported by the entry point index.d.ts
@@ -2582,7 +2553,7 @@ export interface SavedObjectsFindOptions {
     // (undocumented)
     sortField?: string;
     // (undocumented)
-    sortOrder?: estypes.SortOrder;
+    sortOrder?: estypes.SearchSortOrder;
     // (undocumented)
     type: string | string[];
     typeToNamespacesMap?: Map<string, string[] | undefined>;
diff --git a/src/core/server/server.ts b/src/core/server/server.ts
index 4d99368f9bf70..a31b9a061ac5d 100644
--- a/src/core/server/server.ts
+++ b/src/core/server/server.ts
@@ -193,8 +193,6 @@ export class Server {
 
     const deprecationsSetup = this.deprecations.setup({
       http: httpSetup,
-      elasticsearch: elasticsearchServiceSetup,
-      coreUsageData: coreUsageDataSetup,
     });
 
     const coreSetup: InternalCoreSetup = {
diff --git a/src/dev/build/lib/version_info.ts b/src/dev/build/lib/version_info.ts
index 01066cdeffc4c..9ad20b4a6935b 100644
--- a/src/dev/build/lib/version_info.ts
+++ b/src/dev/build/lib/version_info.ts
@@ -7,6 +7,9 @@
  */
 
 import execa from 'execa';
+import fs from 'fs';
+import { join } from 'path';
+import { REPO_ROOT } from '@kbn/utils';
 import { getBuildNumber } from './get_build_number';
 
 interface Options {
@@ -27,8 +30,12 @@ export async function getVersionInfo({ isRelease, versionQualifier, pkg }: Optio
     isRelease ? '' : '-SNAPSHOT'
   );
 
+  const buildSha = fs.existsSync(join(REPO_ROOT, '.git'))
+    ? (await execa('git', ['rev-parse', 'HEAD'], { cwd: REPO_ROOT })).stdout
+    : process.env.GIT_COMMIT || process.env.BUILDKITE_COMMIT || '';
+
   return {
-    buildSha: (await execa('git', ['rev-parse', 'HEAD'])).stdout,
+    buildSha,
     buildVersion,
     buildNumber: await getBuildNumber(),
   };
diff --git a/src/dev/precommit_hook/casing_check_config.js b/src/dev/precommit_hook/casing_check_config.js
index d523f78a9f589..ba18c085b649d 100644
--- a/src/dev/precommit_hook/casing_check_config.js
+++ b/src/dev/precommit_hook/casing_check_config.js
@@ -41,6 +41,7 @@ export const IGNORE_FILE_GLOBS = [
   '.ci/pipeline-library/**/*',
   'packages/kbn-test/jest-preset.js',
   'test/package/Vagrantfile',
+  '**/test/**/fixtures/**/*',
 
   // filename must match language code which requires capital letters
   '**/translations/*.json',
@@ -61,12 +62,13 @@ export const IGNORE_FILE_GLOBS = [
   'x-pack/plugins/apm/e2e/**/*',
 
   'x-pack/plugins/maps/server/fonts/**/*',
-  // packages for the ingest manager's api integration tests could be valid semver which has dashes
-  'x-pack/test/fleet_api_integration/apis/fixtures/test_packages/**/*',
 
   // Bazel default files
   '**/WORKSPACE.bazel',
   '**/BUILD.bazel',
+
+  // Buildkite
+  '.buildkite/hooks/*',
 ];
 
 /**
@@ -95,7 +97,6 @@ export const IGNORE_DIRECTORY_GLOBS = [
   ...KEBAB_CASE_DIRECTORY_GLOBS,
   'src/babel-*',
   'packages/*',
-  'test/functional/fixtures/es_archiver/visualize_source-filters',
   'packages/kbn-pm/src/utils/__fixtures__/*',
   'x-pack/dev-tools',
   'packages/kbn-optimizer/src/__fixtures__/mock_repo/x-pack',
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 c7a8c0a6135c7..1391312df5231 100644
--- a/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
+++ b/src/plugins/advanced_settings/public/management_app/advanced_settings.tsx
@@ -269,6 +269,7 @@ export class AdvancedSettings extends Component<AdvancedSettingsProps, AdvancedS
           dockLinks={this.props.dockLinks}
           toasts={this.props.toasts}
           trackUiMetric={this.props.trackUiMetric}
+          queryText={query.text}
         />
         <PageFooter
           toasts={this.props.toasts}
diff --git a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
index ebebf49c5213f..8e3aafa849ad1 100644
--- a/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
+++ b/src/plugins/advanced_settings/public/management_app/components/form/__snapshots__/form.test.tsx.snap
@@ -3,52 +3,53 @@
 exports[`Form should not render no settings message when instructed not to 1`] = `
 <Fragment>
   <div>
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 General
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": -1,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": -1,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -129,31 +130,32 @@ exports[`Form should not render no settings message when instructed not to 1`] =
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 Dashboard
               </h2>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+            </EuiTitle>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -180,57 +182,58 @@ exports[`Form should not render no settings message when instructed not to 1`] =
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 X-pack
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": 9,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": 9,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -257,8 +260,8 @@ exports[`Form should not render no settings message when instructed not to 1`] =
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
@@ -269,52 +272,53 @@ exports[`Form should not render no settings message when instructed not to 1`] =
 exports[`Form should render no settings message when there are no settings 1`] = `
 <Fragment>
   <div>
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 General
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": -1,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": -1,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -395,31 +399,32 @@ exports[`Form should render no settings message when there are no settings 1`] =
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 Dashboard
               </h2>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+            </EuiTitle>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -446,57 +451,58 @@ exports[`Form should render no settings message when there are no settings 1`] =
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 X-pack
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": 9,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": 9,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -523,8 +529,8 @@ exports[`Form should render no settings message when there are no settings 1`] =
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
@@ -535,52 +541,53 @@ exports[`Form should render no settings message when there are no settings 1`] =
 exports[`Form should render normally 1`] = `
 <Fragment>
   <div>
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 General
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": -1,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": -1,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -661,31 +668,32 @@ exports[`Form should render normally 1`] = `
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 Dashboard
               </h2>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+            </EuiTitle>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -712,57 +720,58 @@ exports[`Form should render normally 1`] = `
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 X-pack
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": 9,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": 9,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -789,8 +798,8 @@ exports[`Form should render normally 1`] = `
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
@@ -801,52 +810,53 @@ exports[`Form should render normally 1`] = `
 exports[`Form should render read-only when saving is disabled 1`] = `
 <Fragment>
   <div>
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 General
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": -1,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": -1,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -927,31 +937,32 @@ exports[`Form should render read-only when saving is disabled 1`] = `
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 Dashboard
               </h2>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+            </EuiTitle>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -978,57 +989,58 @@ exports[`Form should render read-only when saving is disabled 1`] = `
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
-    <EuiPanel
-      paddingSize="l"
+    <_EuiSplitPanelOuter
+      hasBorder={true}
     >
-      <EuiForm>
-        <EuiText>
-          <EuiFlexGroup
-            alignItems="baseline"
+      <_EuiSplitPanelInner
+        color="subdued"
+      >
+        <EuiFlexGroup
+          alignItems="baseline"
+        >
+          <EuiFlexItem
+            grow={false}
           >
-            <EuiFlexItem
-              grow={false}
-            >
+            <EuiTitle>
               <h2>
                 X-pack
               </h2>
-            </EuiFlexItem>
-            <EuiFlexItem
-              grow={false}
-            >
-              <em>
-                <FormattedMessage
-                  defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
-                  id="advancedSettings.form.searchResultText"
-                  values={
-                    Object {
-                      "clearSearch": <EuiLink
-                        onClick={[Function]}
-                      >
-                        <em>
-                          <FormattedMessage
-                            defaultMessage="(clear search)"
-                            id="advancedSettings.form.clearSearchResultText"
-                            values={Object {}}
-                          />
-                        </em>
-                      </EuiLink>,
-                      "settingsCount": 9,
-                    }
+            </EuiTitle>
+          </EuiFlexItem>
+          <EuiFlexItem
+            grow={false}
+          >
+            <em>
+              <FormattedMessage
+                defaultMessage="Search terms are hiding {settingsCount} settings {clearSearch}"
+                id="advancedSettings.form.searchResultText"
+                values={
+                  Object {
+                    "clearSearch": <EuiLink
+                      onClick={[Function]}
+                    >
+                      <em>
+                        <FormattedMessage
+                          defaultMessage="(clear search)"
+                          id="advancedSettings.form.clearSearchResultText"
+                          values={Object {}}
+                        />
+                      </em>
+                    </EuiLink>,
+                    "settingsCount": 9,
                   }
-                />
-              </em>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiText>
-        <EuiSpacer
-          size="m"
-        />
+                }
+              />
+            </em>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </_EuiSplitPanelInner>
+      <_EuiSplitPanelInner>
         <Field
           clearChange={[Function]}
           dockLinks={Object {}}
@@ -1055,8 +1067,8 @@ exports[`Form should render read-only when saving is disabled 1`] = `
           }
           toasts={Object {}}
         />
-      </EuiForm>
-    </EuiPanel>
+      </_EuiSplitPanelInner>
+    </_EuiSplitPanelOuter>
     <EuiSpacer
       size="l"
     />
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 d953bb8f6a6f6..0b08a317e87c9 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
@@ -11,16 +11,16 @@ import React, { PureComponent, Fragment } from 'react';
 import {
   EuiFlexGroup,
   EuiFlexItem,
-  EuiForm,
+  EuiSplitPanel,
   EuiLink,
-  EuiPanel,
+  EuiCallOut,
   EuiSpacer,
-  EuiText,
   EuiTextColor,
   EuiBottomBar,
   EuiButton,
   EuiToolTip,
   EuiButtonEmpty,
+  EuiTitle,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { isEmpty } from 'lodash';
@@ -47,6 +47,7 @@ interface FormProps {
   dockLinks: DocLinksStart['links'];
   toasts: ToastsStart;
   trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
+  queryText?: string;
 }
 
 interface FormState {
@@ -241,17 +242,18 @@ export class Form extends PureComponent<FormProps> {
   renderCategory(category: Category, settings: FieldSetting[], totalSettings: number) {
     return (
       <Fragment key={category}>
-        <EuiPanel paddingSize="l">
-          <EuiForm>
-            <EuiText>
-              <EuiFlexGroup alignItems="baseline">
-                <EuiFlexItem grow={false}>
+        <EuiSplitPanel.Outer hasBorder>
+          <EuiSplitPanel.Inner color="subdued">
+            <EuiFlexGroup alignItems="baseline">
+              <EuiFlexItem grow={false}>
+                <EuiTitle>
                   <h2>{getCategoryName(category)}</h2>
-                </EuiFlexItem>
-                {this.renderClearQueryLink(totalSettings, settings.length)}
-              </EuiFlexGroup>
-            </EuiText>
-            <EuiSpacer size="m" />
+                </EuiTitle>
+              </EuiFlexItem>
+              {this.renderClearQueryLink(totalSettings, settings.length)}
+            </EuiFlexGroup>
+          </EuiSplitPanel.Inner>
+          <EuiSplitPanel.Inner>
             {settings.map((setting) => {
               return (
                 <Field
@@ -266,8 +268,8 @@ export class Form extends PureComponent<FormProps> {
                 />
               );
             })}
-          </EuiForm>
-        </EuiPanel>
+          </EuiSplitPanel.Inner>
+        </EuiSplitPanel.Outer>
         <EuiSpacer size="l" />
       </Fragment>
     );
@@ -276,22 +278,28 @@ export class Form extends PureComponent<FormProps> {
   maybeRenderNoSettings(clearQuery: FormProps['clearQuery']) {
     if (this.props.showNoResultsMessage) {
       return (
-        <EuiPanel paddingSize="l">
-          <FormattedMessage
-            id="advancedSettings.form.noSearchResultText"
-            defaultMessage="No settings found {clearSearch}"
-            values={{
-              clearSearch: (
-                <EuiLink onClick={clearQuery}>
-                  <FormattedMessage
-                    id="advancedSettings.form.clearNoSearchResultText"
-                    defaultMessage="(clear search)"
-                  />
-                </EuiLink>
-              ),
-            }}
-          />
-        </EuiPanel>
+        <EuiCallOut
+          color="danger"
+          title={
+            <>
+              <FormattedMessage
+                id="advancedSettings.form.noSearchResultText"
+                defaultMessage="No settings found for {queryText} {clearSearch}"
+                values={{
+                  clearSearch: (
+                    <EuiLink onClick={clearQuery}>
+                      <FormattedMessage
+                        id="advancedSettings.form.clearNoSearchResultText"
+                        defaultMessage="(clear search)"
+                      />
+                    </EuiLink>
+                  ),
+                  queryText: <strong>{this.props.queryText}</strong>,
+                }}
+              />
+            </>
+          }
+        />
       );
     }
     return null;
diff --git a/src/plugins/bfetch/common/batch.ts b/src/plugins/bfetch/common/batch.ts
index a84d94b541ae5..59b012751c66d 100644
--- a/src/plugins/bfetch/common/batch.ts
+++ b/src/plugins/bfetch/common/batch.ts
@@ -19,3 +19,8 @@ export interface BatchResponseItem<Result extends object, Error extends ErrorLik
   result?: Result;
   error?: Error;
 }
+
+export interface BatchItemWrapper {
+  compressed: boolean;
+  payload: string;
+}
diff --git a/src/plugins/bfetch/common/constants.ts b/src/plugins/bfetch/common/constants.ts
new file mode 100644
index 0000000000000..bc72ad244d9be
--- /dev/null
+++ b/src/plugins/bfetch/common/constants.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 const DISABLE_BFETCH_COMPRESSION = 'bfetch:disableCompression';
diff --git a/src/plugins/bfetch/common/index.ts b/src/plugins/bfetch/common/index.ts
index deca56989722a..9bf326eb4b6e5 100644
--- a/src/plugins/bfetch/common/index.ts
+++ b/src/plugins/bfetch/common/index.ts
@@ -10,3 +10,4 @@ export * from './util';
 export * from './streaming';
 export * from './buffer';
 export * from './batch';
+export * from './constants';
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 1c7c44d7c9aa5..719bddc4080d0 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
@@ -9,7 +9,9 @@
 import { createStreamingBatchedFunction } from './create_streaming_batched_function';
 import { fetchStreaming as fetchStreamingReal } from '../streaming/fetch_streaming';
 import { AbortError, defer, of } from '../../../kibana_utils/public';
-import { Subject } from 'rxjs';
+import { Subject, of as rxof } from 'rxjs';
+
+const flushPromises = () => new Promise((resolve) => setImmediate(resolve));
 
 const getPromiseState = (promise: Promise<unknown>): Promise<'resolved' | 'rejected' | 'pending'> =>
   Promise.race<'resolved' | 'rejected' | 'pending'>([
@@ -47,11 +49,19 @@ const setup = () => {
 };
 
 describe('createStreamingBatchedFunction()', () => {
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
   test('returns a function', () => {
     const { fetchStreaming } = setup();
     const fn = createStreamingBatchedFunction({
       url: '/test',
       fetchStreaming,
+      compressionDisabled$: rxof(true),
     });
     expect(typeof fn).toBe('function');
   });
@@ -61,6 +71,7 @@ describe('createStreamingBatchedFunction()', () => {
     const fn = createStreamingBatchedFunction({
       url: '/test',
       fetchStreaming,
+      compressionDisabled$: rxof(true),
     });
     const res = fn({});
     expect(typeof res.then).toBe('function');
@@ -74,6 +85,7 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       expect(fetchStreaming).toHaveBeenCalledTimes(0);
@@ -81,8 +93,8 @@ describe('createStreamingBatchedFunction()', () => {
       expect(fetchStreaming).toHaveBeenCalledTimes(0);
       fn({ baz: 'quix' });
       expect(fetchStreaming).toHaveBeenCalledTimes(0);
+      jest.advanceTimersByTime(6);
 
-      await new Promise((r) => setTimeout(r, 6));
       expect(fetchStreaming).toHaveBeenCalledTimes(1);
     });
 
@@ -93,10 +105,11 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       expect(fetchStreaming).toHaveBeenCalledTimes(0);
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
       expect(fetchStreaming).toHaveBeenCalledTimes(0);
     });
 
@@ -107,10 +120,11 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       fn({ foo: 'bar' });
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       expect(fetchStreaming.mock.calls[0][0]).toMatchObject({
         url: '/test',
@@ -125,12 +139,13 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       fn({ foo: 'bar' });
       fn({ baz: 'quix' });
 
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
       const { body } = fetchStreaming.mock.calls[0][0];
       expect(JSON.parse(body)).toEqual({
         batch: [{ foo: 'bar' }, { baz: 'quix' }],
@@ -146,6 +161,7 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       expect(fetchStreaming).toHaveBeenCalledTimes(0);
@@ -164,6 +180,7 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       const abortController = new AbortController();
@@ -172,7 +189,7 @@ describe('createStreamingBatchedFunction()', () => {
       of(fn({ foo: 'bar' }, abortController.signal));
       fn({ baz: 'quix' });
 
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
       const { body } = fetchStreaming.mock.calls[0][0];
       expect(JSON.parse(body)).toEqual({
         batch: [{ baz: 'quix' }],
@@ -186,6 +203,7 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       fn({ a: '1' });
@@ -209,6 +227,7 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       fn({ a: '1' });
@@ -216,7 +235,7 @@ describe('createStreamingBatchedFunction()', () => {
       fn({ c: '3' });
       expect(fetchStreaming).toHaveBeenCalledTimes(1);
       fn({ d: '4' });
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
       expect(fetchStreaming).toHaveBeenCalledTimes(2);
     });
   });
@@ -229,11 +248,12 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       const promise1 = fn({ a: '1' });
       const promise2 = fn({ b: '2' });
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       expect(await isPending(promise1)).toBe(true);
       expect(await isPending(promise2)).toBe(true);
@@ -246,12 +266,15 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
+      await flushPromises();
+
       const promise1 = fn({ a: '1' });
       const promise2 = fn({ b: '2' });
       const promise3 = fn({ c: '3' });
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       expect(await isPending(promise1)).toBe(true);
       expect(await isPending(promise2)).toBe(true);
@@ -287,12 +310,13 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       const promise1 = fn({ a: '1' });
       const promise2 = fn({ b: '2' });
       const promise3 = fn({ c: '3' });
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       stream.next(
         JSON.stringify({
@@ -314,6 +338,20 @@ describe('createStreamingBatchedFunction()', () => {
       expect(await promise3).toEqual({ foo: 'bar 2' });
     });
 
+    test('compression is false by default', async () => {
+      const { fetchStreaming } = setup();
+      const fn = createStreamingBatchedFunction({
+        url: '/test',
+        flushOnMaxItems: 1,
+        fetchStreaming,
+      });
+
+      fn({ a: '1' });
+
+      const dontCompress = await fetchStreaming.mock.calls[0][0].compressionDisabled$.toPromise();
+      expect(dontCompress).toBe(false);
+    });
+
     test('resolves falsy results', async () => {
       const { fetchStreaming, stream } = setup();
       const fn = createStreamingBatchedFunction({
@@ -321,12 +359,13 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       const promise1 = fn({ a: '1' });
       const promise2 = fn({ b: '2' });
       const promise3 = fn({ c: '3' });
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       stream.next(
         JSON.stringify({
@@ -362,10 +401,11 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       const promise = fn({ a: '1' });
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       expect(await isPending(promise)).toBe(true);
 
@@ -390,13 +430,14 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
 
       const promise1 = of(fn({ a: '1' }));
       const promise2 = of(fn({ a: '2' }));
       const promise3 = of(fn({ a: '3' }));
 
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       stream.next(
         JSON.stringify({
@@ -405,7 +446,7 @@ describe('createStreamingBatchedFunction()', () => {
         }) + '\n'
       );
 
-      await new Promise((r) => setTimeout(r, 1));
+      jest.advanceTimersByTime(1);
 
       stream.next(
         JSON.stringify({
@@ -414,7 +455,7 @@ describe('createStreamingBatchedFunction()', () => {
         }) + '\n'
       );
 
-      await new Promise((r) => setTimeout(r, 1));
+      jest.advanceTimersByTime(1);
 
       stream.next(
         JSON.stringify({
@@ -423,7 +464,7 @@ describe('createStreamingBatchedFunction()', () => {
         }) + '\n'
       );
 
-      await new Promise((r) => setTimeout(r, 1));
+      jest.advanceTimersByTime(1);
 
       const [result1] = await promise1;
       const [, error2] = await promise2;
@@ -442,18 +483,20 @@ describe('createStreamingBatchedFunction()', () => {
           fetchStreaming,
           maxItemAge: 5,
           flushOnMaxItems: 3,
+          compressionDisabled$: rxof(true),
         });
 
         const abortController = new AbortController();
         const promise = fn({ a: '1' }, abortController.signal);
         const promise2 = fn({ a: '2' }, abortController.signal);
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
 
         expect(await isPending(promise)).toBe(true);
         expect(await isPending(promise2)).toBe(true);
 
         abortController.abort();
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
+        await flushPromises();
 
         expect(await isPending(promise)).toBe(false);
         expect(await isPending(promise2)).toBe(false);
@@ -471,17 +514,19 @@ describe('createStreamingBatchedFunction()', () => {
           fetchStreaming,
           maxItemAge: 5,
           flushOnMaxItems: 3,
+          compressionDisabled$: rxof(true),
         });
 
         const abortController = new AbortController();
         const promise = fn({ a: '1' }, abortController.signal);
         const promise2 = fn({ a: '2' });
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
 
         expect(await isPending(promise)).toBe(true);
 
         abortController.abort();
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
+        await flushPromises();
 
         expect(await isPending(promise)).toBe(false);
         const [, error] = await of(promise);
@@ -494,7 +539,7 @@ describe('createStreamingBatchedFunction()', () => {
           }) + '\n'
         );
 
-        await new Promise((r) => setTimeout(r, 1));
+        jest.advanceTimersByTime(1);
 
         const [result2] = await of(promise2);
         expect(result2).toEqual({ b: '2' });
@@ -509,16 +554,17 @@ describe('createStreamingBatchedFunction()', () => {
           fetchStreaming,
           maxItemAge: 5,
           flushOnMaxItems: 3,
+          compressionDisabled$: rxof(true),
         });
 
         const promise1 = of(fn({ a: '1' }));
         const promise2 = of(fn({ a: '2' }));
 
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
 
         stream.complete();
 
-        await new Promise((r) => setTimeout(r, 1));
+        jest.advanceTimersByTime(1);
 
         const [, error1] = await promise1;
         const [, error2] = await promise2;
@@ -539,12 +585,13 @@ describe('createStreamingBatchedFunction()', () => {
           fetchStreaming,
           maxItemAge: 5,
           flushOnMaxItems: 3,
+          compressionDisabled$: rxof(true),
         });
 
         const promise1 = of(fn({ a: '1' }));
         const promise2 = of(fn({ a: '2' }));
 
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
 
         stream.next(
           JSON.stringify({
@@ -554,7 +601,7 @@ describe('createStreamingBatchedFunction()', () => {
         );
         stream.complete();
 
-        await new Promise((r) => setTimeout(r, 1));
+        jest.advanceTimersByTime(1);
 
         const [, error1] = await promise1;
         const [result1] = await promise2;
@@ -576,18 +623,19 @@ describe('createStreamingBatchedFunction()', () => {
           fetchStreaming,
           maxItemAge: 5,
           flushOnMaxItems: 3,
+          compressionDisabled$: rxof(true),
         });
 
         const promise1 = of(fn({ a: '1' }));
         const promise2 = of(fn({ a: '2' }));
 
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
 
         stream.error({
           message: 'something went wrong',
         });
 
-        await new Promise((r) => setTimeout(r, 1));
+        jest.advanceTimersByTime(1);
 
         const [, error1] = await promise1;
         const [, error2] = await promise2;
@@ -608,12 +656,13 @@ describe('createStreamingBatchedFunction()', () => {
           fetchStreaming,
           maxItemAge: 5,
           flushOnMaxItems: 3,
+          compressionDisabled$: rxof(true),
         });
 
         const promise1 = of(fn({ a: '1' }));
         const promise2 = of(fn({ a: '2' }));
 
-        await new Promise((r) => setTimeout(r, 6));
+        jest.advanceTimersByTime(6);
 
         stream.next(
           JSON.stringify({
@@ -623,7 +672,7 @@ describe('createStreamingBatchedFunction()', () => {
         );
         stream.error('oops');
 
-        await new Promise((r) => setTimeout(r, 1));
+        jest.advanceTimersByTime(1);
 
         const [, error1] = await promise1;
         const [result1] = await promise2;
@@ -644,12 +693,14 @@ describe('createStreamingBatchedFunction()', () => {
         fetchStreaming,
         maxItemAge: 5,
         flushOnMaxItems: 3,
+        compressionDisabled$: rxof(true),
       });
+      await flushPromises();
 
       const promise1 = of(fn({ a: '1' }));
       const promise2 = of(fn({ a: '2' }));
 
-      await new Promise((r) => setTimeout(r, 6));
+      jest.advanceTimersByTime(6);
 
       stream.next(
         JSON.stringify({
@@ -660,7 +711,7 @@ describe('createStreamingBatchedFunction()', () => {
 
       stream.next('Not a JSON\n');
 
-      await new Promise((r) => setTimeout(r, 1));
+      jest.advanceTimersByTime(1);
 
       const [, error1] = await promise1;
       const [result1] = await promise2;
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 2d81331f10a88..d5f955f517d13 100644
--- a/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
+++ b/src/plugins/bfetch/public/batching/create_streaming_batched_function.ts
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
+import { Observable, of } from 'rxjs';
 import { AbortError, abortSignalToPromise, defer } from '../../../kibana_utils/public';
 import {
   ItemBufferParams,
   TimedItemBufferParams,
   createBatchedFunction,
-  BatchResponseItem,
   ErrorLike,
+  normalizeError,
 } from '../../common';
-import { fetchStreaming, split } from '../streaming';
-import { normalizeError } from '../../common';
+import { fetchStreaming } from '../streaming';
 import { BatchedFunc, BatchItem } from './types';
 
 export interface BatchedFunctionProtocolError extends ErrorLike {
@@ -47,6 +47,11 @@ export interface StreamingBatchedFunctionParams<Payload, Result> {
    * before sending the batch request.
    */
   maxItemAge?: TimedItemBufferParams<any>['maxItemAge'];
+
+  /**
+   * Disabled zlib compression of response chunks.
+   */
+  compressionDisabled$?: Observable<boolean>;
 }
 
 /**
@@ -64,6 +69,7 @@ export const createStreamingBatchedFunction = <Payload, Result extends object>(
     fetchStreaming: fetchStreamingInjected = fetchStreaming,
     flushOnMaxItems = 25,
     maxItemAge = 10,
+    compressionDisabled$ = of(false),
   } = params;
   const [fn] = createBatchedFunction({
     onCall: (payload: Payload, signal?: AbortSignal) => {
@@ -119,6 +125,7 @@ export const createStreamingBatchedFunction = <Payload, Result extends object>(
           body: JSON.stringify({ batch }),
           method: 'POST',
           signal: abortController.signal,
+          compressionDisabled$,
         });
 
         const handleStreamError = (error: any) => {
@@ -127,10 +134,10 @@ export const createStreamingBatchedFunction = <Payload, Result extends object>(
           for (const { future } of items) future.reject(normalizedError);
         };
 
-        stream.pipe(split('\n')).subscribe({
+        stream.subscribe({
           next: (json: string) => {
             try {
-              const response = JSON.parse(json) as BatchResponseItem<Result, ErrorLike>;
+              const response = JSON.parse(json);
               if (response.error) {
                 items[response.id].future.reject(response.error);
               } else if (response.result !== undefined) {
diff --git a/src/plugins/bfetch/public/batching/index.ts b/src/plugins/bfetch/public/batching/index.ts
new file mode 100644
index 0000000000000..115fd84cbe979
--- /dev/null
+++ b/src/plugins/bfetch/public/batching/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 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 {
+  createStreamingBatchedFunction,
+  StreamingBatchedFunctionParams,
+} from './create_streaming_batched_function';
diff --git a/src/plugins/bfetch/public/plugin.ts b/src/plugins/bfetch/public/plugin.ts
index ed97d468eec0b..f97a91a0e70d3 100644
--- a/src/plugins/bfetch/public/plugin.ts
+++ b/src/plugins/bfetch/public/plugin.ts
@@ -7,12 +7,11 @@
  */
 
 import { CoreStart, PluginInitializerContext, CoreSetup, Plugin } from 'src/core/public';
+import { from, Observable, of } from 'rxjs';
+import { switchMap } from 'rxjs/operators';
 import { fetchStreaming as fetchStreamingStatic, FetchStreamingParams } from './streaming';
-import { removeLeadingSlash } from '../common';
-import {
-  createStreamingBatchedFunction,
-  StreamingBatchedFunctionParams,
-} from './batching/create_streaming_batched_function';
+import { DISABLE_BFETCH_COMPRESSION, removeLeadingSlash } from '../common';
+import { createStreamingBatchedFunction, StreamingBatchedFunctionParams } from './batching';
 import { BatchedFunc } from './batching/types';
 
 // eslint-disable-next-line
@@ -43,12 +42,23 @@ export class BfetchPublicPlugin
 
   constructor(private readonly initializerContext: PluginInitializerContext) {}
 
-  public setup(core: CoreSetup, plugins: BfetchPublicSetupDependencies): BfetchPublicSetup {
+  public setup(
+    core: CoreSetup<any, any>,
+    plugins: BfetchPublicSetupDependencies
+  ): BfetchPublicSetup {
     const { version } = this.initializerContext.env.packageInfo;
     const basePath = core.http.basePath.get();
 
-    const fetchStreaming = this.fetchStreaming(version, basePath);
-    const batchedFunction = this.batchedFunction(fetchStreaming);
+    const compressionDisabled$ = from(core.getStartServices()).pipe(
+      switchMap((deps) => {
+        return of(deps[0]);
+      }),
+      switchMap((coreStart) => {
+        return coreStart.uiSettings.get$<boolean>(DISABLE_BFETCH_COMPRESSION);
+      })
+    );
+    const fetchStreaming = this.fetchStreaming(version, basePath, compressionDisabled$);
+    const batchedFunction = this.batchedFunction(fetchStreaming, compressionDisabled$);
 
     this.contract = {
       fetchStreaming,
@@ -66,7 +76,8 @@ export class BfetchPublicPlugin
 
   private fetchStreaming = (
     version: string,
-    basePath: string
+    basePath: string,
+    compressionDisabled$: Observable<boolean>
   ): BfetchPublicSetup['fetchStreaming'] => (params) =>
     fetchStreamingStatic({
       ...params,
@@ -76,13 +87,16 @@ export class BfetchPublicPlugin
         'kbn-version': version,
         ...(params.headers || {}),
       },
+      compressionDisabled$,
     });
 
   private batchedFunction = (
-    fetchStreaming: BfetchPublicContract['fetchStreaming']
+    fetchStreaming: BfetchPublicContract['fetchStreaming'],
+    compressionDisabled$: Observable<boolean>
   ): BfetchPublicContract['batchedFunction'] => (params) =>
     createStreamingBatchedFunction({
       ...params,
+      compressionDisabled$,
       fetchStreaming: params.fetchStreaming || fetchStreaming,
     });
 }
diff --git a/src/plugins/bfetch/public/streaming/fetch_streaming.test.ts b/src/plugins/bfetch/public/streaming/fetch_streaming.test.ts
index e804b3ea94227..a5d066f6d9a24 100644
--- a/src/plugins/bfetch/public/streaming/fetch_streaming.test.ts
+++ b/src/plugins/bfetch/public/streaming/fetch_streaming.test.ts
@@ -8,6 +8,15 @@
 
 import { fetchStreaming } from './fetch_streaming';
 import { mockXMLHttpRequest } from '../test_helpers/xhr';
+import { of } from 'rxjs';
+import { promisify } from 'util';
+import { deflate } from 'zlib';
+const pDeflate = promisify(deflate);
+
+const compressResponse = async (resp: any) => {
+  const gzipped = await pDeflate(JSON.stringify(resp));
+  return gzipped.toString('base64');
+};
 
 const tick = () => new Promise((resolve) => setTimeout(resolve, 1));
 
@@ -21,6 +30,7 @@ test('returns XHR request', () => {
   setup();
   const { xhr } = fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
   expect(typeof xhr.readyState).toBe('number');
 });
@@ -29,6 +39,7 @@ test('returns stream', () => {
   setup();
   const { stream } = fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
   expect(typeof stream.subscribe).toBe('function');
 });
@@ -37,6 +48,7 @@ test('promise resolves when request completes', async () => {
   const env = setup();
   const { stream } = fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
 
   let resolved = false;
@@ -65,10 +77,90 @@ test('promise resolves when request completes', async () => {
   expect(resolved).toBe(true);
 });
 
-test('streams incoming text as it comes through', async () => {
+test('promise resolves when compressed request completes', async () => {
+  const env = setup();
+  const { stream } = fetchStreaming({
+    url: 'http://example.com',
+    compressionDisabled$: of(false),
+  });
+
+  let resolved = false;
+  let result;
+  stream.toPromise().then((r) => {
+    resolved = true;
+    result = r;
+  });
+
+  await tick();
+  expect(resolved).toBe(false);
+
+  const msg = { foo: 'bar' };
+
+  // Whole message in a response
+  (env.xhr as any).responseText = `${await compressResponse(msg)}\n`;
+  env.xhr.onprogress!({} as any);
+
+  await tick();
+  expect(resolved).toBe(false);
+
+  (env.xhr as any).readyState = 4;
+  (env.xhr as any).status = 200;
+  env.xhr.onreadystatechange!({} as any);
+
+  await tick();
+  expect(resolved).toBe(true);
+  expect(result).toStrictEqual(JSON.stringify(msg));
+});
+
+test('promise resolves when compressed chunked request completes', async () => {
   const env = setup();
   const { stream } = fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(false),
+  });
+
+  let resolved = false;
+  let result;
+  stream.toPromise().then((r) => {
+    resolved = true;
+    result = r;
+  });
+
+  await tick();
+  expect(resolved).toBe(false);
+
+  const msg = { veg: 'tomato' };
+  const msgToCut = await compressResponse(msg);
+  const part1 = msgToCut.substr(0, 3);
+
+  // Message and a half in a response
+  (env.xhr as any).responseText = part1;
+  env.xhr.onprogress!({} as any);
+
+  await tick();
+  expect(resolved).toBe(false);
+
+  // Half a message in a response
+  (env.xhr as any).responseText = `${msgToCut}\n`;
+  env.xhr.onprogress!({} as any);
+
+  await tick();
+  expect(resolved).toBe(false);
+
+  (env.xhr as any).readyState = 4;
+  (env.xhr as any).status = 200;
+  env.xhr.onreadystatechange!({} as any);
+
+  await tick();
+  expect(resolved).toBe(true);
+  expect(result).toStrictEqual(JSON.stringify(msg));
+});
+
+test('streams incoming text as it comes through, according to separators', async () => {
+  const env = setup();
+  const { stream } = fetchStreaming({
+    url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
 
   const spy = jest.fn();
@@ -80,16 +172,22 @@ test('streams incoming text as it comes through', async () => {
   (env.xhr as any).responseText = 'foo';
   env.xhr.onprogress!({} as any);
 
+  await tick();
+  expect(spy).toHaveBeenCalledTimes(0);
+
+  (env.xhr as any).responseText = 'foo\nbar';
+  env.xhr.onprogress!({} as any);
+
   await tick();
   expect(spy).toHaveBeenCalledTimes(1);
   expect(spy).toHaveBeenCalledWith('foo');
 
-  (env.xhr as any).responseText = 'foo\nbar';
+  (env.xhr as any).responseText = 'foo\nbar\n';
   env.xhr.onprogress!({} as any);
 
   await tick();
   expect(spy).toHaveBeenCalledTimes(2);
-  expect(spy).toHaveBeenCalledWith('\nbar');
+  expect(spy).toHaveBeenCalledWith('bar');
 
   (env.xhr as any).readyState = 4;
   (env.xhr as any).status = 200;
@@ -103,6 +201,7 @@ test('completes stream observable when request finishes', async () => {
   const env = setup();
   const { stream } = fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
 
   const spy = jest.fn();
@@ -127,6 +226,7 @@ test('completes stream observable when aborted', async () => {
   const { stream } = fetchStreaming({
     url: 'http://example.com',
     signal: abort.signal,
+    compressionDisabled$: of(true),
   });
 
   const spy = jest.fn();
@@ -152,6 +252,7 @@ test('promise throws when request errors', async () => {
   const env = setup();
   const { stream } = fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
 
   const spy = jest.fn();
@@ -178,6 +279,7 @@ test('stream observable errors when request errors', async () => {
   const env = setup();
   const { stream } = fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
 
   const spy = jest.fn();
@@ -210,6 +312,7 @@ test('sets custom headers', async () => {
       'Content-Type': 'text/plain',
       Authorization: 'Bearer 123',
     },
+    compressionDisabled$: of(true),
   });
 
   expect(env.xhr.setRequestHeader).toHaveBeenCalledWith('Content-Type', 'text/plain');
@@ -223,6 +326,7 @@ test('uses credentials', async () => {
 
   fetchStreaming({
     url: 'http://example.com',
+    compressionDisabled$: of(true),
   });
 
   expect(env.xhr.withCredentials).toBe(true);
@@ -238,6 +342,7 @@ test('opens XHR request and sends specified body', async () => {
     url: 'http://elastic.co',
     method: 'GET',
     body: 'foobar',
+    compressionDisabled$: of(true),
   });
 
   expect(env.xhr.open).toHaveBeenCalledTimes(1);
@@ -250,6 +355,7 @@ test('uses POST request method by default', async () => {
   const env = setup();
   fetchStreaming({
     url: 'http://elastic.co',
+    compressionDisabled$: of(true),
   });
   expect(env.xhr.open).toHaveBeenCalledWith('POST', 'http://elastic.co');
 });
diff --git a/src/plugins/bfetch/public/streaming/fetch_streaming.ts b/src/plugins/bfetch/public/streaming/fetch_streaming.ts
index d68e4d01b44f5..1af35ef68fb85 100644
--- a/src/plugins/bfetch/public/streaming/fetch_streaming.ts
+++ b/src/plugins/bfetch/public/streaming/fetch_streaming.ts
@@ -6,7 +6,11 @@
  * Side Public License, v 1.
  */
 
+import { Observable, of } from 'rxjs';
+import { map, share, switchMap } from 'rxjs/operators';
+import { inflateResponse } from '.';
 import { fromStreamingXhr } from './from_streaming_xhr';
+import { split } from './split';
 
 export interface FetchStreamingParams {
   url: string;
@@ -14,6 +18,7 @@ export interface FetchStreamingParams {
   method?: 'GET' | 'POST';
   body?: string;
   signal?: AbortSignal;
+  compressionDisabled$?: Observable<boolean>;
 }
 
 /**
@@ -26,23 +31,49 @@ export function fetchStreaming({
   method = 'POST',
   body = '',
   signal,
+  compressionDisabled$ = of(false),
 }: FetchStreamingParams) {
   const xhr = new window.XMLHttpRequest();
 
-  // Begin the request
-  xhr.open(method, url);
-  xhr.withCredentials = true;
+  const msgStream = compressionDisabled$.pipe(
+    switchMap((compressionDisabled) => {
+      // Begin the request
+      xhr.open(method, url);
+      xhr.withCredentials = true;
 
-  // Set the HTTP headers
-  Object.entries(headers).forEach(([k, v]) => xhr.setRequestHeader(k, v));
+      if (!compressionDisabled) {
+        headers['X-Chunk-Encoding'] = 'deflate';
+      }
 
-  const stream = fromStreamingXhr(xhr, signal);
+      // Set the HTTP headers
+      Object.entries(headers).forEach(([k, v]) => xhr.setRequestHeader(k, v));
 
-  // Send the payload to the server
-  xhr.send(body);
+      const stream = fromStreamingXhr(xhr, signal);
+
+      // Send the payload to the server
+      xhr.send(body);
+
+      // Return a stream of chunked decompressed messages
+      return stream.pipe(
+        split('\n'),
+        map((msg) => {
+          return compressionDisabled ? msg : inflateResponse(msg);
+        })
+      );
+    }),
+    share()
+  );
+
+  // start execution
+  const msgStreamSub = msgStream.subscribe({
+    error: (e) => {},
+    complete: () => {
+      msgStreamSub.unsubscribe();
+    },
+  });
 
   return {
     xhr,
-    stream,
+    stream: msgStream,
   };
 }
diff --git a/src/plugins/bfetch/public/streaming/index.ts b/src/plugins/bfetch/public/streaming/index.ts
index afb442feffb29..545cae87aa3d6 100644
--- a/src/plugins/bfetch/public/streaming/index.ts
+++ b/src/plugins/bfetch/public/streaming/index.ts
@@ -9,3 +9,4 @@
 export * from './split';
 export * from './from_streaming_xhr';
 export * from './fetch_streaming';
+export { inflateResponse } from './inflate_response';
diff --git a/src/plugins/bfetch/public/streaming/inflate_response.ts b/src/plugins/bfetch/public/streaming/inflate_response.ts
new file mode 100644
index 0000000000000..73cb52285987c
--- /dev/null
+++ b/src/plugins/bfetch/public/streaming/inflate_response.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 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 { unzlibSync, strFromU8 } from 'fflate';
+
+export function inflateResponse<Result extends object>(response: string) {
+  const buff = Buffer.from(response, 'base64');
+  const unzip = unzlibSync(buff);
+  return strFromU8(unzip);
+}
diff --git a/src/plugins/bfetch/server/plugin.ts b/src/plugins/bfetch/server/plugin.ts
index 18f0813260f03..7fd46e2f6cc44 100644
--- a/src/plugins/bfetch/server/plugin.ts
+++ b/src/plugins/bfetch/server/plugin.ts
@@ -16,6 +16,7 @@ import type {
   RouteMethod,
   RequestHandler,
   RequestHandlerContext,
+  StartServicesAccessor,
 } from 'src/core/server';
 import { schema } from '@kbn/config-schema';
 import { Subject } from 'rxjs';
@@ -28,7 +29,8 @@ import {
   normalizeError,
 } from '../common';
 import { StreamingRequestHandler } from './types';
-import { createNDJSONStream } from './streaming';
+import { createStream } from './streaming';
+import { getUiSettings } from './ui_settings';
 
 // eslint-disable-next-line
 export interface BfetchServerSetupDependencies {}
@@ -112,9 +114,19 @@ export class BfetchServerPlugin
   public setup(core: CoreSetup, plugins: BfetchServerSetupDependencies): BfetchServerSetup {
     const logger = this.initializerContext.logger.get();
     const router = core.http.createRouter();
-    const addStreamingResponseRoute = this.addStreamingResponseRoute({ router, logger });
+
+    core.uiSettings.register(getUiSettings());
+
+    const addStreamingResponseRoute = this.addStreamingResponseRoute({
+      getStartServices: core.getStartServices,
+      router,
+      logger,
+    });
     const addBatchProcessingRoute = this.addBatchProcessingRoute(addStreamingResponseRoute);
-    const createStreamingRequestHandler = this.createStreamingRequestHandler({ logger });
+    const createStreamingRequestHandler = this.createStreamingRequestHandler({
+      getStartServices: core.getStartServices,
+      logger,
+    });
 
     return {
       addBatchProcessingRoute,
@@ -129,10 +141,16 @@ export class BfetchServerPlugin
 
   public stop() {}
 
+  private getCompressionDisabled(request: KibanaRequest) {
+    return request.headers['x-chunk-encoding'] !== 'deflate';
+  }
+
   private addStreamingResponseRoute = ({
+    getStartServices,
     router,
     logger,
   }: {
+    getStartServices: StartServicesAccessor;
     router: ReturnType<CoreSetup['http']['createRouter']>;
     logger: Logger;
   }): BfetchServerSetup['addStreamingResponseRoute'] => (path, handler) => {
@@ -146,9 +164,10 @@ export class BfetchServerPlugin
       async (context, request, response) => {
         const handlerInstance = handler(request);
         const data = request.body;
+        const compressionDisabled = this.getCompressionDisabled(request);
         return response.ok({
           headers: streamingHeaders,
-          body: createNDJSONStream(handlerInstance.getResponseStream(data), logger),
+          body: createStream(handlerInstance.getResponseStream(data), logger, compressionDisabled),
         });
       }
     );
@@ -156,17 +175,20 @@ export class BfetchServerPlugin
 
   private createStreamingRequestHandler = ({
     logger,
+    getStartServices,
   }: {
     logger: Logger;
+    getStartServices: StartServicesAccessor;
   }): BfetchServerSetup['createStreamingRequestHandler'] => (streamHandler) => async (
     context,
     request,
     response
   ) => {
     const response$ = await streamHandler(context, request);
+    const compressionDisabled = this.getCompressionDisabled(request);
     return response.ok({
       headers: streamingHeaders,
-      body: createNDJSONStream(response$, logger),
+      body: createStream(response$, logger, compressionDisabled),
     });
   };
 
diff --git a/src/plugins/bfetch/server/streaming/create_compressed_stream.ts b/src/plugins/bfetch/server/streaming/create_compressed_stream.ts
new file mode 100644
index 0000000000000..6814ed1dd7955
--- /dev/null
+++ b/src/plugins/bfetch/server/streaming/create_compressed_stream.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 { promisify } from 'util';
+import { Observable } from 'rxjs';
+import { catchError, concatMap, finalize } from 'rxjs/operators';
+import { Logger } from 'src/core/server';
+import { Stream, PassThrough } from 'stream';
+import { constants, deflate } from 'zlib';
+
+const delimiter = '\n';
+const pDeflate = promisify(deflate);
+
+async function zipMessageToStream(output: PassThrough, message: string) {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const gzipped = await pDeflate(message, {
+        flush: constants.Z_SYNC_FLUSH,
+      });
+      output.write(gzipped.toString('base64'));
+      output.write(delimiter);
+      resolve(undefined);
+    } catch (err) {
+      reject(err);
+    }
+  });
+}
+
+export const createCompressedStream = <Response>(
+  results: Observable<Response>,
+  logger: Logger
+): Stream => {
+  const output = new PassThrough();
+
+  const sub = results
+    .pipe(
+      concatMap((message: Response) => {
+        const strMessage = JSON.stringify(message);
+        return zipMessageToStream(output, strMessage);
+      }),
+      catchError((e) => {
+        logger.error('Could not serialize or stream a message.');
+        logger.error(e);
+        throw e;
+      }),
+      finalize(() => {
+        output.end();
+        sub.unsubscribe();
+      })
+    )
+    .subscribe();
+
+  return output;
+};
diff --git a/src/plugins/bfetch/server/streaming/create_stream.ts b/src/plugins/bfetch/server/streaming/create_stream.ts
new file mode 100644
index 0000000000000..7d6981294341b
--- /dev/null
+++ b/src/plugins/bfetch/server/streaming/create_stream.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 { Logger } from 'kibana/server';
+import { Stream } from 'stream';
+import { Observable } from 'rxjs';
+import { createCompressedStream } from './create_compressed_stream';
+import { createNDJSONStream } from './create_ndjson_stream';
+
+export function createStream<Payload, Response>(
+  response$: Observable<Response>,
+  logger: Logger,
+  compressionDisabled: boolean
+): Stream {
+  return compressionDisabled
+    ? createNDJSONStream(response$, logger)
+    : createCompressedStream(response$, logger);
+}
diff --git a/src/plugins/bfetch/server/streaming/index.ts b/src/plugins/bfetch/server/streaming/index.ts
index 2c31cc329295d..dfd472b5034a1 100644
--- a/src/plugins/bfetch/server/streaming/index.ts
+++ b/src/plugins/bfetch/server/streaming/index.ts
@@ -7,3 +7,5 @@
  */
 
 export * from './create_ndjson_stream';
+export * from './create_compressed_stream';
+export * from './create_stream';
diff --git a/src/plugins/bfetch/server/ui_settings.ts b/src/plugins/bfetch/server/ui_settings.ts
new file mode 100644
index 0000000000000..cf7b13a9af182
--- /dev/null
+++ b/src/plugins/bfetch/server/ui_settings.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 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 { UiSettingsParams } from 'src/core/server';
+import { schema } from '@kbn/config-schema';
+import { DISABLE_BFETCH_COMPRESSION } from '../common';
+
+export function getUiSettings(): Record<string, UiSettingsParams<unknown>> {
+  return {
+    [DISABLE_BFETCH_COMPRESSION]: {
+      name: i18n.translate('bfetch.disableBfetchCompression', {
+        defaultMessage: 'Disable Batch Compression',
+      }),
+      value: false,
+      description: i18n.translate('bfetch.disableBfetchCompressionDesc', {
+        defaultMessage:
+          'Disable batch compression. This allows you to debug individual requests, but increases response size.',
+      }),
+      schema: schema.boolean(),
+      category: [],
+    },
+  };
+}
diff --git a/src/plugins/charts/public/index.ts b/src/plugins/charts/public/index.ts
index b42407bb10365..cc1a54c2e25b0 100644
--- a/src/plugins/charts/public/index.ts
+++ b/src/plugins/charts/public/index.ts
@@ -14,6 +14,7 @@ export { ChartsPluginSetup, ChartsPluginStart } from './plugin';
 
 export * from './static';
 export * from './services/palettes/types';
+export { lightenColor } from './services/palettes/lighten_color';
 export {
   PaletteOutput,
   CustomPaletteArguments,
diff --git a/src/plugins/charts/public/static/components/color_picker.tsx b/src/plugins/charts/public/static/components/color_picker.tsx
index 4974400a3767a..813748accd8fd 100644
--- a/src/plugins/charts/public/static/components/color_picker.tsx
+++ b/src/plugins/charts/public/static/components/color_picker.tsx
@@ -18,7 +18,7 @@ import {
   EuiFlexGroup,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-
+import { lightenColor } from '../../services/palettes/lighten_color';
 import './color_picker.scss';
 
 export const legacyColors: string[] = [
@@ -105,6 +105,14 @@ interface ColorPickerProps {
    * Callback for onKeyPress event
    */
   onKeyDown?: (e: React.KeyboardEvent<HTMLElement>) => void;
+  /**
+   * Optional define the series maxDepth
+   */
+  maxDepth?: number;
+  /**
+   * Optional define the layer index
+   */
+  layerIndex?: number;
 }
 const euiColors = euiPaletteColorBlind({ rotations: 4, order: 'group' });
 
@@ -115,6 +123,8 @@ export const ColorPicker = ({
   useLegacyColors = true,
   colorIsOverwritten = true,
   onKeyDown,
+  maxDepth,
+  layerIndex,
 }: ColorPickerProps) => {
   const legendColors = useLegacyColors ? legacyColors : euiColors;
 
@@ -159,13 +169,18 @@ export const ColorPicker = ({
           ))}
         </EuiFlexGroup>
       </fieldset>
-      {legendColors.some((c) => c === selectedColor) && colorIsOverwritten && (
-        <EuiFlexItem grow={false}>
-          <EuiButtonEmpty size="s" onClick={(e: any) => onChange(null, e)}>
-            <FormattedMessage id="charts.colorPicker.clearColor" defaultMessage="Reset color" />
-          </EuiButtonEmpty>
-        </EuiFlexItem>
-      )}
+      {legendColors.some(
+        (c) =>
+          c === selectedColor ||
+          (layerIndex && maxDepth && lightenColor(c, layerIndex, maxDepth) === selectedColor)
+      ) &&
+        colorIsOverwritten && (
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty size="s" onClick={(e: any) => onChange(null, e)}>
+              <FormattedMessage id="charts.colorPicker.clearColor" defaultMessage="Reset color" />
+            </EuiButtonEmpty>
+          </EuiFlexItem>
+        )}
     </div>
   );
 };
diff --git a/src/plugins/dashboard/common/types.ts b/src/plugins/dashboard/common/types.ts
index 9a6d185ef2ac1..5851ffa045bc7 100644
--- a/src/plugins/dashboard/common/types.ts
+++ b/src/plugins/dashboard/common/types.ts
@@ -32,6 +32,14 @@ export interface DashboardPanelState<
   panelRefName?: string;
 }
 
+export interface DashboardCapabilities {
+  showWriteControls: boolean;
+  saveQuery: boolean;
+  createNew: boolean;
+  show: boolean;
+  [key: string]: boolean;
+}
+
 /**
  * This should always represent the latest dashboard panel shape, after all possible migrations.
  */
diff --git a/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx b/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx
index f90a0cef95bb8..98f7bbbee3d7c 100644
--- a/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx
+++ b/src/plugins/dashboard/public/application/actions/expand_panel_action.tsx
@@ -6,14 +6,11 @@
  * Side Public License, v 1.
  */
 
-import { dashboardExpandPanelAction } from '../../dashboard_strings';
+import { DashboardContainerInput } from '../..';
 import { IEmbeddable } from '../../services/embeddable';
+import { dashboardExpandPanelAction } from '../../dashboard_strings';
 import { Action, IncompatibleActionError } from '../../services/ui_actions';
-import {
-  DASHBOARD_CONTAINER_TYPE,
-  DashboardContainer,
-  DashboardContainerInput,
-} from '../embeddable';
+import { DASHBOARD_CONTAINER_TYPE, DashboardContainer } from '../embeddable';
 
 export const ACTION_EXPAND_PANEL = 'togglePanel';
 
diff --git a/src/plugins/dashboard/public/application/dashboard_app.tsx b/src/plugins/dashboard/public/application/dashboard_app.tsx
index 93310bb821361..8db6a0e8a8c7f 100644
--- a/src/plugins/dashboard/public/application/dashboard_app.tsx
+++ b/src/plugins/dashboard/public/application/dashboard_app.tsx
@@ -7,35 +7,20 @@
  */
 
 import { History } from 'history';
-import { merge, Subject, Subscription } from 'rxjs';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useMemo } from 'react';
 
-import { debounceTime, finalize, switchMap, tap } from 'rxjs/operators';
+import { useDashboardSelector } from './state';
+import { useDashboardAppState } from './hooks';
 import { useKibana } from '../../../kibana_react/public';
-import { DashboardConstants } from '../dashboard_constants';
-import { DashboardTopNav } from './top_nav/dashboard_top_nav';
-import { DashboardAppServices, DashboardEmbedSettings, DashboardRedirect } from './types';
 import {
-  getChangesFromAppStateForContainerState,
-  getDashboardContainerInput,
-  getFiltersSubscription,
-  getInputSubscription,
-  getOutputSubscription,
-  getSearchSessionIdFromURL,
-} from './dashboard_app_functions';
-import {
-  useDashboardBreadcrumbs,
-  useDashboardContainer,
-  useDashboardStateManager,
-  useSavedDashboard,
-} from './hooks';
-
-import { IndexPattern, waitUntilNextSessionCompletes$ } from '../services/data';
+  getDashboardBreadcrumb,
+  getDashboardTitle,
+  leaveConfirmStrings,
+} from '../dashboard_strings';
 import { EmbeddableRenderer } from '../services/embeddable';
-import { DashboardContainerInput } from '.';
-import { leaveConfirmStrings } from '../dashboard_strings';
-import { createQueryParamObservable, replaceUrlHashQuery } from '../../../kibana_utils/public';
-
+import { DashboardTopNav, isCompleteDashboardAppState } from './top_nav/dashboard_top_nav';
+import { DashboardAppServices, DashboardEmbedSettings, DashboardRedirect } from '../types';
+import { createKbnUrlStateStorage, withNotifyOnErrors } from '../services/kibana_utils';
 export interface DashboardAppProps {
   history: History;
   savedDashboardId?: string;
@@ -50,236 +35,37 @@ export function DashboardApp({
   history,
 }: DashboardAppProps) {
   const {
-    data,
     core,
+    chrome,
+    embeddable,
     onAppLeave,
     uiSettings,
-    embeddable,
-    dashboardCapabilities,
-    indexPatterns: indexPatternService,
   } = useKibana<DashboardAppServices>().services;
 
-  const triggerRefresh$ = useMemo(() => new Subject<{ force?: boolean }>(), []);
-  const [indexPatterns, setIndexPatterns] = useState<IndexPattern[]>([]);
-
-  const savedDashboard = useSavedDashboard(savedDashboardId, history);
-
-  const getIncomingEmbeddable = useCallback(
-    (removeAfterFetch?: boolean) => {
-      return embeddable
-        .getStateTransfer()
-        .getIncomingEmbeddablePackage(DashboardConstants.DASHBOARDS_ID, removeAfterFetch);
-    },
-    [embeddable]
+  const kbnUrlStateStorage = useMemo(
+    () =>
+      createKbnUrlStateStorage({
+        history,
+        useHash: uiSettings.get('state:storeInSessionStorage'),
+        ...withNotifyOnErrors(core.notifications.toasts),
+      }),
+    [core.notifications.toasts, history, uiSettings]
   );
 
-  const { dashboardStateManager, viewMode, setViewMode } = useDashboardStateManager(
-    savedDashboard,
-    history,
-    getIncomingEmbeddable
-  );
-  const [unsavedChanges, setUnsavedChanges] = useState(false);
-  const dashboardContainer = useDashboardContainer({
-    timeFilter: data.query.timefilter.timefilter,
-    dashboardStateManager,
-    getIncomingEmbeddable,
-    setUnsavedChanges,
+  const dashboardState = useDashboardSelector((state) => state.dashboardStateReducer);
+  const dashboardAppState = useDashboardAppState({
     history,
+    redirectTo,
+    savedDashboardId,
+    kbnUrlStateStorage,
+    isEmbeddedExternally: Boolean(embedSettings),
   });
-  const searchSessionIdQuery$ = useMemo(
-    () => createQueryParamObservable(history, DashboardConstants.SEARCH_SESSION_ID),
-    [history]
-  );
-
-  const refreshDashboardContainer = useCallback(
-    (force?: boolean) => {
-      if (!dashboardContainer || !dashboardStateManager) {
-        return;
-      }
-
-      const changes = getChangesFromAppStateForContainerState({
-        dashboardContainer,
-        appStateDashboardInput: getDashboardContainerInput({
-          isEmbeddedExternally: Boolean(embedSettings),
-          dashboardStateManager,
-          lastReloadRequestTime: force ? Date.now() : undefined,
-          dashboardCapabilities,
-          query: data.query,
-        }),
-      });
-
-      if (changes) {
-        // state keys change in which likely won't need a data fetch
-        const noRefetchKeys: Array<keyof DashboardContainerInput> = [
-          'viewMode',
-          'title',
-          'description',
-          'expandedPanelId',
-          'useMargins',
-          'isEmbeddedExternally',
-          'isFullScreenMode',
-        ];
-        const shouldRefetch = Object.keys(changes).some(
-          (changeKey) => !noRefetchKeys.includes(changeKey as keyof DashboardContainerInput)
-        );
-
-        const newSearchSessionId: string | undefined = (() => {
-          // do not update session id if this is irrelevant state change to prevent excessive searches
-          if (!shouldRefetch) return;
-
-          let searchSessionIdFromURL = getSearchSessionIdFromURL(history);
-          if (searchSessionIdFromURL) {
-            if (
-              data.search.session.isRestore() &&
-              data.search.session.isCurrentSession(searchSessionIdFromURL)
-            ) {
-              // navigating away from a restored session
-              dashboardStateManager.kbnUrlStateStorage.kbnUrlControls.updateAsync((nextUrl) => {
-                if (nextUrl.includes(DashboardConstants.SEARCH_SESSION_ID)) {
-                  return replaceUrlHashQuery(nextUrl, (query) => {
-                    delete query[DashboardConstants.SEARCH_SESSION_ID];
-                    return query;
-                  });
-                }
-                return nextUrl;
-              });
-              searchSessionIdFromURL = undefined;
-            } else {
-              data.search.session.restore(searchSessionIdFromURL);
-            }
-          }
-
-          return searchSessionIdFromURL ?? data.search.session.start();
-        })();
-
-        if (changes.viewMode) {
-          setViewMode(changes.viewMode);
-        }
 
-        dashboardContainer.updateInput({
-          ...changes,
-          ...(newSearchSessionId && { searchSessionId: newSearchSessionId }),
-        });
-      }
-    },
-    [
-      history,
-      data.query,
-      setViewMode,
-      embedSettings,
-      dashboardContainer,
-      data.search.session,
-      dashboardCapabilities,
-      dashboardStateManager,
-    ]
-  );
-
-  // Manage dashboard container subscriptions
-  useEffect(() => {
-    if (!dashboardStateManager || !dashboardContainer) {
-      return;
-    }
-    const timeFilter = data.query.timefilter.timefilter;
-    const subscriptions = new Subscription();
-
-    subscriptions.add(
-      getInputSubscription({
-        dashboardContainer,
-        dashboardStateManager,
-        filterManager: data.query.filterManager,
-      })
-    );
-    subscriptions.add(
-      getOutputSubscription({
-        dashboardContainer,
-        indexPatterns: indexPatternService,
-        onUpdateIndexPatterns: (newIndexPatterns) => setIndexPatterns(newIndexPatterns),
-      })
-    );
-    subscriptions.add(
-      getFiltersSubscription({
-        query: data.query,
-        dashboardStateManager,
-      })
-    );
-    subscriptions.add(
-      merge(
-        ...[timeFilter.getRefreshIntervalUpdate$(), timeFilter.getTimeUpdate$()]
-      ).subscribe(() => triggerRefresh$.next())
-    );
-
-    subscriptions.add(
-      searchSessionIdQuery$.subscribe(() => {
-        triggerRefresh$.next({ force: true });
-      })
-    );
-
-    subscriptions.add(
-      data.query.timefilter.timefilter
-        .getAutoRefreshFetch$()
-        .pipe(
-          tap(() => {
-            triggerRefresh$.next({ force: true });
-          }),
-          switchMap((done) =>
-            // best way on a dashboard to estimate that panels are updated is to rely on search session service state
-            waitUntilNextSessionCompletes$(data.search.session).pipe(finalize(done))
-          )
-        )
-        .subscribe()
-    );
-
-    dashboardStateManager.registerChangeListener(() => {
-      setUnsavedChanges(dashboardStateManager.getIsDirty(data.query.timefilter.timefilter));
-      // we aren't checking dirty state because there are changes the container needs to know about
-      // that won't make the dashboard "dirty" - like a view mode change.
-      triggerRefresh$.next();
-    });
-
-    // debounce `refreshDashboardContainer()`
-    // use `forceRefresh=true` in case at least one debounced trigger asked for it
-    let forceRefresh: boolean = false;
-    subscriptions.add(
-      triggerRefresh$
-        .pipe(
-          tap((trigger) => {
-            forceRefresh = forceRefresh || (trigger?.force ?? false);
-          }),
-          debounceTime(50)
-        )
-        .subscribe(() => {
-          refreshDashboardContainer(forceRefresh);
-          forceRefresh = false;
-        })
-    );
-
-    return () => {
-      subscriptions.unsubscribe();
-    };
-  }, [
-    core.http,
-    uiSettings,
-    data.query,
-    dashboardContainer,
-    data.search.session,
-    indexPatternService,
-    dashboardStateManager,
-    searchSessionIdQuery$,
-    triggerRefresh$,
-    refreshDashboardContainer,
-  ]);
-
-  // Sync breadcrumbs when Dashboard State Manager changes
-  useDashboardBreadcrumbs(dashboardStateManager, redirectTo);
-
-  // Build onAppLeave when Dashboard State Manager changes
+  // Build app leave handler whenever hasUnsavedChanges changes
   useEffect(() => {
-    if (!dashboardStateManager || !dashboardContainer) {
-      return;
-    }
     onAppLeave((actions) => {
       if (
-        dashboardStateManager?.getIsDirty() &&
+        dashboardAppState.hasUnsavedChanges &&
         !embeddable.getStateTransfer().isTransferInProgress
       ) {
         return actions.confirm(
@@ -293,37 +79,36 @@ export function DashboardApp({
       // reset on app leave handler so leaving from the listing page doesn't trigger a confirmation
       onAppLeave((actions) => actions.default());
     };
-  }, [dashboardStateManager, dashboardContainer, onAppLeave, embeddable]);
+  }, [onAppLeave, embeddable, dashboardAppState.hasUnsavedChanges]);
+
+  // Set breadcrumbs when dashboard's title or view mode changes
+  useEffect(() => {
+    if (!dashboardState.title && savedDashboardId) return;
+    chrome.setBreadcrumbs([
+      {
+        text: getDashboardBreadcrumb(),
+        'data-test-subj': 'dashboardListingBreadcrumb',
+        onClick: () => {
+          redirectTo({ destination: 'listing' });
+        },
+      },
+      {
+        text: getDashboardTitle(dashboardState.title, dashboardState.viewMode, !savedDashboardId),
+      },
+    ]);
+  }, [chrome, dashboardState.title, dashboardState.viewMode, redirectTo, savedDashboardId]);
 
   return (
     <>
-      {savedDashboard && dashboardStateManager && dashboardContainer && viewMode && (
+      {isCompleteDashboardAppState(dashboardAppState) && (
         <>
           <DashboardTopNav
-            {...{
-              redirectTo,
-              embedSettings,
-              indexPatterns,
-              savedDashboard,
-              unsavedChanges,
-              dashboardContainer,
-              dashboardStateManager,
-            }}
-            viewMode={viewMode}
-            lastDashboardId={savedDashboardId}
-            clearUnsavedChanges={() => setUnsavedChanges(false)}
-            timefilter={data.query.timefilter.timefilter}
-            onQuerySubmit={(_payload, isUpdate) => {
-              if (isUpdate === false) {
-                // The user can still request a reload in the query bar, even if the
-                // query is the same, and in that case, we have to explicitly ask for
-                // a reload, since no state changes will cause it.
-                triggerRefresh$.next({ force: true });
-              }
-            }}
+            redirectTo={redirectTo}
+            embedSettings={embedSettings}
+            dashboardAppState={dashboardAppState}
           />
           <div className="dashboardViewport">
-            <EmbeddableRenderer embeddable={dashboardContainer} />
+            <EmbeddableRenderer embeddable={dashboardAppState.dashboardContainer} />
           </div>
         </>
       )}
diff --git a/src/plugins/dashboard/public/application/dashboard_app_functions.ts b/src/plugins/dashboard/public/application/dashboard_app_functions.ts
deleted file mode 100644
index 6d51422d4bd23..0000000000000
--- a/src/plugins/dashboard/public/application/dashboard_app_functions.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 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 { History } from 'history';
-
-import _, { uniqBy } from 'lodash';
-import deepEqual from 'fast-deep-equal';
-import { merge, Observable, pipe } from 'rxjs';
-import {
-  debounceTime,
-  distinctUntilChanged,
-  filter,
-  map,
-  mapTo,
-  startWith,
-  switchMap,
-} from 'rxjs/operators';
-
-import { DashboardCapabilities } from './types';
-import { DashboardConstants } from '../dashboard_constants';
-import { DashboardStateManager } from './dashboard_state_manager';
-import { convertSavedDashboardPanelToPanelState } from '../../common/embeddable/embeddable_saved_object_converters';
-import {
-  DashboardPanelState,
-  DashboardContainer,
-  DashboardContainerInput,
-  SavedDashboardPanel,
-} from '.';
-
-import { getQueryParams } from '../services/kibana_utils';
-import { EmbeddablePackageState, isErrorEmbeddable } from '../services/embeddable';
-import {
-  esFilters,
-  FilterManager,
-  IndexPattern,
-  IndexPatternsContract,
-  QueryStart,
-} from '../services/data';
-
-export const getChangesFromAppStateForContainerState = ({
-  dashboardContainer,
-  appStateDashboardInput,
-}: {
-  dashboardContainer: DashboardContainer;
-  appStateDashboardInput: DashboardContainerInput;
-}) => {
-  if (!dashboardContainer || isErrorEmbeddable(dashboardContainer)) {
-    return appStateDashboardInput;
-  }
-  const containerInput = dashboardContainer.getInput();
-  const differences: Partial<DashboardContainerInput> = {};
-
-  // Filters shouldn't  be compared using regular isEqual
-  if (
-    !esFilters.compareFilters(
-      containerInput.filters,
-      appStateDashboardInput.filters,
-      esFilters.COMPARE_ALL_OPTIONS
-    )
-  ) {
-    differences.filters = appStateDashboardInput.filters;
-  }
-
-  Object.keys(
-    _.omit(containerInput, [
-      'filters',
-      'searchSessionId',
-      'lastReloadRequestTime',
-      'switchViewMode',
-    ])
-  ).forEach((key) => {
-    const containerValue = (containerInput as { [key: string]: unknown })[key];
-    const appStateValue = ((appStateDashboardInput as unknown) as { [key: string]: unknown })[key];
-    if (!_.isEqual(containerValue, appStateValue)) {
-      (differences as { [key: string]: unknown })[key] = appStateValue;
-    }
-  });
-
-  // last reload request time can be undefined without causing a refresh
-  if (
-    appStateDashboardInput.lastReloadRequestTime &&
-    containerInput.lastReloadRequestTime !== appStateDashboardInput.lastReloadRequestTime
-  ) {
-    differences.lastReloadRequestTime = appStateDashboardInput.lastReloadRequestTime;
-  }
-
-  // cloneDeep hack is needed, as there are multiple places, where container's input mutated,
-  // but values from appStateValue are deeply frozen, as they can't be mutated directly
-  return Object.values(differences).length === 0 ? undefined : _.cloneDeep(differences);
-};
-
-export const getDashboardContainerInput = ({
-  query,
-  searchSessionId,
-  incomingEmbeddable,
-  isEmbeddedExternally,
-  lastReloadRequestTime,
-  dashboardStateManager,
-  dashboardCapabilities,
-}: {
-  dashboardCapabilities: DashboardCapabilities;
-  dashboardStateManager: DashboardStateManager;
-  incomingEmbeddable?: EmbeddablePackageState;
-  lastReloadRequestTime?: number;
-  isEmbeddedExternally: boolean;
-  searchSessionId?: string;
-  query: QueryStart;
-}): DashboardContainerInput => {
-  const embeddablesMap: {
-    [key: string]: DashboardPanelState;
-  } = {};
-  dashboardStateManager.getPanels().forEach((panel: SavedDashboardPanel) => {
-    embeddablesMap[panel.panelIndex] = convertSavedDashboardPanelToPanelState(panel);
-  });
-
-  // If the incoming embeddable state's id already exists in the embeddables map, replace the input, retaining the existing gridData for that panel.
-  if (incomingEmbeddable?.embeddableId && embeddablesMap[incomingEmbeddable.embeddableId]) {
-    const originalPanelState = embeddablesMap[incomingEmbeddable.embeddableId];
-    embeddablesMap[incomingEmbeddable.embeddableId] = {
-      gridData: originalPanelState.gridData,
-      type: incomingEmbeddable.type,
-      explicitInput: {
-        ...originalPanelState.explicitInput,
-        ...incomingEmbeddable.input,
-        id: incomingEmbeddable.embeddableId,
-      },
-    };
-  }
-
-  return {
-    refreshConfig: query.timefilter.timefilter.getRefreshInterval(),
-    hidePanelTitles: dashboardStateManager.getHidePanelTitles(),
-    isFullScreenMode: dashboardStateManager.getFullScreenMode(),
-    expandedPanelId: dashboardStateManager.getExpandedPanelId(),
-    description: dashboardStateManager.getDescription(),
-    id: dashboardStateManager.savedDashboard.id || '',
-    useMargins: dashboardStateManager.getUseMargins(),
-    syncColors: dashboardStateManager.getSyncColors(),
-    viewMode: dashboardStateManager.getViewMode(),
-    filters: query.filterManager.getFilters(),
-    query: dashboardStateManager.getQuery(),
-    title: dashboardStateManager.getTitle(),
-    panels: embeddablesMap,
-    lastReloadRequestTime,
-    dashboardCapabilities,
-    isEmbeddedExternally,
-    searchSessionId,
-    timeRange: {
-      ..._.cloneDeep(query.timefilter.timefilter.getTime()),
-    },
-  };
-};
-
-export const getInputSubscription = ({
-  dashboardContainer,
-  dashboardStateManager,
-  filterManager,
-}: {
-  dashboardContainer: DashboardContainer;
-  dashboardStateManager: DashboardStateManager;
-  filterManager: FilterManager;
-}) =>
-  dashboardContainer.getInput$().subscribe(() => {
-    // This has to be first because handleDashboardContainerChanges causes
-    // appState.save which will cause refreshDashboardContainer to be called.
-
-    if (
-      !esFilters.compareFilters(
-        dashboardContainer.getInput().filters,
-        filterManager.getFilters(),
-        esFilters.COMPARE_ALL_OPTIONS
-      )
-    ) {
-      // Add filters modifies the object passed to it, hence the clone deep.
-      filterManager.addFilters(_.cloneDeep(dashboardContainer.getInput().filters));
-
-      dashboardStateManager.applyFilters(
-        dashboardStateManager.getQuery(),
-        dashboardContainer.getInput().filters
-      );
-    }
-
-    dashboardStateManager.handleDashboardContainerChanges(dashboardContainer);
-  });
-
-export const getOutputSubscription = ({
-  dashboardContainer,
-  indexPatterns,
-  onUpdateIndexPatterns,
-}: {
-  dashboardContainer: DashboardContainer;
-  indexPatterns: IndexPatternsContract;
-  onUpdateIndexPatterns: (newIndexPatterns: IndexPattern[]) => void;
-}) => {
-  const updateIndexPatternsOperator = pipe(
-    filter((container: DashboardContainer) => !!container && !isErrorEmbeddable(container)),
-    map((container: DashboardContainer): IndexPattern[] => {
-      let panelIndexPatterns: IndexPattern[] = [];
-      Object.values(container.getChildIds()).forEach((id) => {
-        const embeddableInstance = container.getChild(id);
-        if (isErrorEmbeddable(embeddableInstance)) return;
-        const embeddableIndexPatterns = (embeddableInstance.getOutput() as any).indexPatterns;
-        if (!embeddableIndexPatterns) return;
-        panelIndexPatterns.push(...embeddableIndexPatterns);
-      });
-      panelIndexPatterns = uniqBy(panelIndexPatterns, 'id');
-      return panelIndexPatterns;
-    }),
-    distinctUntilChanged((a, b) =>
-      deepEqual(
-        a.map((ip) => ip && ip.id),
-        b.map((ip) => ip && ip.id)
-      )
-    ),
-    // using switchMap for previous task cancellation
-    switchMap((panelIndexPatterns: IndexPattern[]) => {
-      return new Observable((observer) => {
-        if (panelIndexPatterns && panelIndexPatterns.length > 0) {
-          if (observer.closed) return;
-          onUpdateIndexPatterns(panelIndexPatterns);
-          observer.complete();
-        } else {
-          indexPatterns.getDefault().then((defaultIndexPattern) => {
-            if (observer.closed) return;
-            onUpdateIndexPatterns([defaultIndexPattern as IndexPattern]);
-            observer.complete();
-          });
-        }
-      });
-    })
-  );
-
-  return merge(
-    // output of dashboard container itself
-    dashboardContainer.getOutput$(),
-    // plus output of dashboard container children,
-    // children may change, so make sure we subscribe/unsubscribe with switchMap
-    dashboardContainer.getOutput$().pipe(
-      map(() => dashboardContainer!.getChildIds()),
-      distinctUntilChanged(deepEqual),
-      switchMap((newChildIds: string[]) =>
-        merge(...newChildIds.map((childId) => dashboardContainer!.getChild(childId).getOutput$()))
-      )
-    )
-  )
-    .pipe(
-      mapTo(dashboardContainer),
-      startWith(dashboardContainer), // to trigger initial index pattern update
-      updateIndexPatternsOperator
-    )
-    .subscribe();
-};
-
-export const getFiltersSubscription = ({
-  query,
-  dashboardStateManager,
-}: {
-  query: QueryStart;
-  dashboardStateManager: DashboardStateManager;
-}) => {
-  return merge(query.filterManager.getUpdates$(), query.queryString.getUpdates$())
-    .pipe(debounceTime(100))
-    .subscribe(() => {
-      dashboardStateManager.applyFilters(
-        query.queryString.getQuery(),
-        query.filterManager.getFilters()
-      );
-    });
-};
-
-export const getSearchSessionIdFromURL = (history: History): string | undefined =>
-  getQueryParams(history.location)[DashboardConstants.SEARCH_SESSION_ID] as string | undefined;
diff --git a/src/plugins/dashboard/public/application/dashboard_router.tsx b/src/plugins/dashboard/public/application/dashboard_router.tsx
index be279ed98492e..e77353000ced4 100644
--- a/src/plugins/dashboard/public/application/dashboard_router.tsx
+++ b/src/plugins/dashboard/public/application/dashboard_router.tsx
@@ -8,36 +8,37 @@
 
 import './index.scss';
 import React from 'react';
+import { History } from 'history';
+import { Provider } from 'react-redux';
+import { first } from 'rxjs/operators';
 import { I18nProvider } from '@kbn/i18n/react';
 import { parse, ParsedQuery } from 'query-string';
 import { render, unmountComponentAtNode } from 'react-dom';
 import { Switch, Route, RouteComponentProps, HashRouter, Redirect } from 'react-router-dom';
 
-import { first } from 'rxjs/operators';
 import { DashboardListing } from './listing';
+import { dashboardStateStore } from './state';
 import { DashboardApp } from './dashboard_app';
-import { addHelpMenuToAppChrome, DashboardPanelStorage } from './lib';
+import { DashboardNoMatch } from './listing/dashboard_no_match';
+import { KibanaContextProvider } from '../services/kibana_react';
+import { addHelpMenuToAppChrome, DashboardSessionStorage } from './lib';
 import { createDashboardListingFilterUrl } from '../dashboard_constants';
-import { getDashboardPageTitle, dashboardReadonlyBadge } from '../dashboard_strings';
 import { createDashboardEditUrl, DashboardConstants } from '../dashboard_constants';
-import { DashboardAppServices, DashboardEmbedSettings, RedirectToProps } from './types';
+import { getDashboardPageTitle, dashboardReadonlyBadge } from '../dashboard_strings';
+import { createKbnUrlStateStorage, withNotifyOnErrors } from '../services/kibana_utils';
+import { DashboardAppServices, DashboardEmbedSettings, RedirectToProps } from '../types';
 import {
   DashboardFeatureFlagConfig,
   DashboardSetupDependencies,
   DashboardStart,
   DashboardStartDependencies,
 } from '../plugin';
-
-import { createKbnUrlStateStorage, withNotifyOnErrors } from '../services/kibana_utils';
-import { KibanaContextProvider } from '../services/kibana_react';
-
 import {
   AppMountParameters,
   CoreSetup,
   PluginInitializerContext,
   ScopedHistory,
 } from '../services/core';
-import { DashboardNoMatch } from './listing/dashboard_no_match';
 
 export const dashboardUrlParams = {
   showTopMenu: 'show-top-menu',
@@ -89,12 +90,14 @@ export async function mountApp({
   const activeSpaceId =
     spacesApi && (await spacesApi.getActiveSpace$().pipe(first()).toPromise())?.id;
   let globalEmbedSettings: DashboardEmbedSettings | undefined;
+  let routerHistory: History;
 
   const dashboardServices: DashboardAppServices = {
     navigation,
     onAppLeave,
     savedObjects,
     urlForwarding,
+    visualizations,
     usageCollection,
     core: coreStart,
     data: dataStart,
@@ -109,10 +112,6 @@ export async function mountApp({
     indexPatterns: dataStart.indexPatterns,
     savedQueryService: dataStart.query.savedQueries,
     savedObjectsClient: coreStart.savedObjects.client,
-    dashboardPanelStorage: new DashboardPanelStorage(
-      core.notifications.toasts,
-      activeSpaceId || 'default'
-    ),
     savedDashboards: dashboardStart.getSavedDashboardLoader(),
     savedObjectsTagging: savedObjectsTaggingOss?.getTaggingApi(),
     allowByValueEmbeddables: initializerContext.config.get<DashboardFeatureFlagConfig>()
@@ -127,7 +126,10 @@ export async function mountApp({
       visualizeCapabilities: { save: Boolean(coreStart.application.capabilities.visualize?.save) },
       storeSearchSession: Boolean(coreStart.application.capabilities.dashboard.storeSearchSession),
     },
-    visualizations,
+    dashboardSessionStorage: new DashboardSessionStorage(
+      core.notifications.toasts,
+      activeSpaceId || 'default'
+    ),
   };
 
   const getUrlStateStorage = (history: RouteComponentProps['history']) =>
@@ -137,10 +139,9 @@ export async function mountApp({
       ...withNotifyOnErrors(core.notifications.toasts),
     });
 
-  const redirect = (routeProps: RouteComponentProps, redirectTo: RedirectToProps) => {
-    const historyFunction = redirectTo.useReplace
-      ? routeProps.history.replace
-      : routeProps.history.push;
+  const redirect = (redirectTo: RedirectToProps) => {
+    if (!routerHistory) return;
+    const historyFunction = redirectTo.useReplace ? routerHistory.replace : routerHistory.push;
     let destination;
     if (redirectTo.destination === 'dashboard') {
       destination = redirectTo.id
@@ -168,12 +169,15 @@ export async function mountApp({
     if (routeParams.embed && !globalEmbedSettings) {
       globalEmbedSettings = getDashboardEmbedSettings(routeParams);
     }
+    if (!routerHistory) {
+      routerHistory = routeProps.history;
+    }
     return (
       <DashboardApp
         history={routeProps.history}
         embedSettings={globalEmbedSettings}
         savedDashboardId={routeProps.match.params.id}
-        redirectTo={(props: RedirectToProps) => redirect(routeProps, props)}
+        redirectTo={redirect}
       />
     );
   };
@@ -183,13 +187,15 @@ export async function mountApp({
     const routeParams = parse(routeProps.history.location.search);
     const title = (routeParams.title as string) || undefined;
     const filter = (routeParams.filter as string) || undefined;
-
+    if (!routerHistory) {
+      routerHistory = routeProps.history;
+    }
     return (
       <DashboardListing
         initialFilter={filter}
         title={title}
         kbnUrlStateStorage={getUrlStateStorage(routeProps.history)}
-        redirectTo={(props: RedirectToProps) => redirect(routeProps, props)}
+        redirectTo={redirect}
       />
     );
   };
@@ -215,26 +221,32 @@ export async function mountApp({
 
   const app = (
     <I18nProvider>
-      <KibanaContextProvider services={dashboardServices}>
-        <presentationUtil.ContextProvider>
-          <HashRouter>
-            <Switch>
-              <Route
-                path={[
-                  DashboardConstants.CREATE_NEW_DASHBOARD_URL,
-                  `${DashboardConstants.VIEW_DASHBOARD_URL}/:id`,
-                ]}
-                render={renderDashboard}
-              />
-              <Route exact path={DashboardConstants.LANDING_PAGE_PATH} render={renderListingPage} />
-              <Route exact path="/">
-                <Redirect to={DashboardConstants.LANDING_PAGE_PATH} />
-              </Route>
-              <Route render={renderNoMatch} />
-            </Switch>
-          </HashRouter>
-        </presentationUtil.ContextProvider>
-      </KibanaContextProvider>
+      <Provider store={dashboardStateStore}>
+        <KibanaContextProvider services={dashboardServices}>
+          <presentationUtil.ContextProvider>
+            <HashRouter>
+              <Switch>
+                <Route
+                  path={[
+                    DashboardConstants.CREATE_NEW_DASHBOARD_URL,
+                    `${DashboardConstants.VIEW_DASHBOARD_URL}/:id`,
+                  ]}
+                  render={renderDashboard}
+                />
+                <Route
+                  exact
+                  path={DashboardConstants.LANDING_PAGE_PATH}
+                  render={renderListingPage}
+                />
+                <Route exact path="/">
+                  <Redirect to={DashboardConstants.LANDING_PAGE_PATH} />
+                </Route>
+                <Route render={renderNoMatch} />
+              </Switch>
+            </HashRouter>
+          </presentationUtil.ContextProvider>
+        </KibanaContextProvider>
+      </Provider>
     </I18nProvider>
   );
 
diff --git a/src/plugins/dashboard/public/application/dashboard_state.test.ts b/src/plugins/dashboard/public/application/dashboard_state.test.ts
deleted file mode 100644
index ffe5c80febe02..0000000000000
--- a/src/plugins/dashboard/public/application/dashboard_state.test.ts
+++ /dev/null
@@ -1,272 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { createBrowserHistory } from 'history';
-import { getSavedDashboardMock } from './test_helpers';
-import { DashboardContainer, DashboardContainerInput, DashboardPanelState } from '.';
-import { DashboardStateManager } from './dashboard_state_manager';
-import { DashboardContainerServices } from './embeddable/dashboard_container';
-
-import { EmbeddableInput, ViewMode } from '../services/embeddable';
-import { createKbnUrlStateStorage } from '../services/kibana_utils';
-import { InputTimeRange, TimefilterContract, TimeRange } from '../services/data';
-
-import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
-import { coreMock } from '../../../../core/public/mocks';
-
-describe('DashboardState', function () {
-  let dashboardState: DashboardStateManager;
-  const savedDashboard = getSavedDashboardMock();
-
-  let mockTime: TimeRange = { to: 'now', from: 'now-15m' };
-  const mockTimefilter = {
-    getTime: () => {
-      return mockTime;
-    },
-    setTime: (time: InputTimeRange) => {
-      mockTime = time as TimeRange;
-    },
-  } as TimefilterContract;
-
-  // TS is *very* picky with type guards / predicates. can't just use jest.fn()
-  function mockHasTaggingCapabilities(obj: any): obj is any {
-    return false;
-  }
-
-  function initDashboardState() {
-    dashboardState = new DashboardStateManager({
-      savedDashboard,
-      hideWriteControls: false,
-      allowByValueEmbeddables: false,
-      hasPendingEmbeddable: () => false,
-      kibanaVersion: '7.0.0',
-      kbnUrlStateStorage: createKbnUrlStateStorage(),
-      history: createBrowserHistory(),
-      toasts: coreMock.createStart().notifications.toasts,
-      hasTaggingCapabilities: mockHasTaggingCapabilities,
-    });
-  }
-
-  function initDashboardContainer(initialInput?: Partial<DashboardContainerInput>) {
-    const { doStart } = embeddablePluginMock.createInstance();
-    const defaultInput: DashboardContainerInput = {
-      id: '123',
-      viewMode: ViewMode.EDIT,
-      filters: [] as DashboardContainerInput['filters'],
-      query: {} as DashboardContainerInput['query'],
-      timeRange: {} as DashboardContainerInput['timeRange'],
-      useMargins: true,
-      syncColors: false,
-      title: 'ultra awesome test dashboard',
-      isFullScreenMode: false,
-      panels: {} as DashboardContainerInput['panels'],
-    };
-    const input = { ...defaultInput, ...(initialInput ?? {}) };
-    return new DashboardContainer(input, { embeddable: doStart() } as DashboardContainerServices);
-  }
-
-  describe('syncTimefilterWithDashboard', function () {
-    test('syncs quick time', function () {
-      savedDashboard.timeRestore = true;
-      savedDashboard.timeFrom = 'now/w';
-      savedDashboard.timeTo = 'now/w';
-
-      mockTime.from = '2015-09-19 06:31:44.000';
-      mockTime.to = '2015-09-29 06:31:44.000';
-
-      initDashboardState();
-      dashboardState.syncTimefilterWithDashboardTime(mockTimefilter);
-
-      expect(mockTime.to).toBe('now/w');
-      expect(mockTime.from).toBe('now/w');
-    });
-
-    test('syncs relative time', function () {
-      savedDashboard.timeRestore = true;
-      savedDashboard.timeFrom = 'now-13d';
-      savedDashboard.timeTo = 'now';
-
-      mockTime.from = '2015-09-19 06:31:44.000';
-      mockTime.to = '2015-09-29 06:31:44.000';
-
-      initDashboardState();
-      dashboardState.syncTimefilterWithDashboardTime(mockTimefilter);
-
-      expect(mockTime.to).toBe('now');
-      expect(mockTime.from).toBe('now-13d');
-    });
-
-    test('syncs absolute time', function () {
-      savedDashboard.timeRestore = true;
-      savedDashboard.timeFrom = '2015-09-19 06:31:44.000';
-      savedDashboard.timeTo = '2015-09-29 06:31:44.000';
-
-      mockTime.from = 'now/w';
-      mockTime.to = 'now/w';
-
-      initDashboardState();
-      dashboardState.syncTimefilterWithDashboardTime(mockTimefilter);
-
-      expect(mockTime.to).toBe(savedDashboard.timeTo);
-      expect(mockTime.from).toBe(savedDashboard.timeFrom);
-    });
-  });
-
-  describe('Dashboard Container Changes', () => {
-    beforeEach(() => {
-      initDashboardState();
-    });
-
-    test('expanedPanelId in container input casues state update', () => {
-      dashboardState.setExpandedPanelId = jest.fn();
-
-      const dashboardContainer = initDashboardContainer({
-        expandedPanelId: 'theCoolestPanelOnThisDashboard',
-        panels: {
-          theCoolestPanelOnThisDashboard: {
-            explicitInput: { id: 'theCoolestPanelOnThisDashboard' },
-          } as DashboardPanelState<EmbeddableInput>,
-        },
-      });
-
-      dashboardState.handleDashboardContainerChanges(dashboardContainer);
-      expect(dashboardState.setExpandedPanelId).toHaveBeenCalledWith(
-        'theCoolestPanelOnThisDashboard'
-      );
-    });
-
-    test('expanedPanelId is not updated when it is the same', () => {
-      dashboardState.setExpandedPanelId = jest
-        .fn()
-        .mockImplementation(dashboardState.setExpandedPanelId);
-
-      const dashboardContainer = initDashboardContainer({
-        expandedPanelId: 'theCoolestPanelOnThisDashboard',
-        panels: {
-          theCoolestPanelOnThisDashboard: {
-            explicitInput: { id: 'theCoolestPanelOnThisDashboard' },
-          } as DashboardPanelState<EmbeddableInput>,
-        },
-      });
-
-      dashboardState.handleDashboardContainerChanges(dashboardContainer);
-      dashboardState.handleDashboardContainerChanges(dashboardContainer);
-      expect(dashboardState.setExpandedPanelId).toHaveBeenCalledTimes(1);
-    });
-
-    test('expandedPanelId is set to undefined if panel does not exist in input', () => {
-      dashboardState.setExpandedPanelId = jest
-        .fn()
-        .mockImplementation(dashboardState.setExpandedPanelId);
-      const dashboardContainer = initDashboardContainer({
-        expandedPanelId: 'theCoolestPanelOnThisDashboard',
-        panels: {
-          theCoolestPanelOnThisDashboard: {
-            explicitInput: { id: 'theCoolestPanelOnThisDashboard' },
-          } as DashboardPanelState<EmbeddableInput>,
-        },
-      });
-
-      dashboardState.handleDashboardContainerChanges(dashboardContainer);
-      expect(dashboardState.setExpandedPanelId).toHaveBeenCalledWith(
-        'theCoolestPanelOnThisDashboard'
-      );
-
-      dashboardContainer.updateInput({ expandedPanelId: 'theLeastCoolPanelOnThisDashboard' });
-      dashboardState.handleDashboardContainerChanges(dashboardContainer);
-      expect(dashboardState.setExpandedPanelId).toHaveBeenCalledWith(undefined);
-    });
-  });
-
-  describe('isDirty', function () {
-    beforeAll(() => {
-      initDashboardState();
-    });
-
-    test('getIsDirty is true if isDirty is true and editing', () => {
-      dashboardState.switchViewMode(ViewMode.EDIT);
-      dashboardState.isDirty = true;
-      expect(dashboardState.getIsDirty()).toBeTruthy();
-    });
-
-    test('getIsDirty is false if isDirty is true and editing', () => {
-      dashboardState.switchViewMode(ViewMode.VIEW);
-      dashboardState.isDirty = true;
-      expect(dashboardState.getIsDirty()).toBeFalsy();
-    });
-  });
-
-  describe('initial view mode', () => {
-    test('initial view mode set to view when hideWriteControls is true', () => {
-      const initialViewModeDashboardState = new DashboardStateManager({
-        savedDashboard,
-        hideWriteControls: true,
-        allowByValueEmbeddables: false,
-        hasPendingEmbeddable: () => false,
-        kibanaVersion: '7.0.0',
-        kbnUrlStateStorage: createKbnUrlStateStorage(),
-        history: createBrowserHistory(),
-        toasts: coreMock.createStart().notifications.toasts,
-        hasTaggingCapabilities: mockHasTaggingCapabilities,
-      });
-      expect(initialViewModeDashboardState.getViewMode()).toBe(ViewMode.VIEW);
-    });
-
-    test('initial view mode set to edit if edit mode specified in URL', () => {
-      const kbnUrlStateStorage = createKbnUrlStateStorage();
-      kbnUrlStateStorage.set('_a', { viewMode: ViewMode.EDIT });
-
-      const initialViewModeDashboardState = new DashboardStateManager({
-        savedDashboard,
-        kbnUrlStateStorage,
-        kibanaVersion: '7.0.0',
-        hideWriteControls: false,
-        allowByValueEmbeddables: false,
-        history: createBrowserHistory(),
-        hasPendingEmbeddable: () => false,
-        toasts: coreMock.createStart().notifications.toasts,
-        hasTaggingCapabilities: mockHasTaggingCapabilities,
-      });
-      expect(initialViewModeDashboardState.getViewMode()).toBe(ViewMode.EDIT);
-    });
-
-    test('initial view mode set to edit if the dashboard is new', () => {
-      const newDashboard = getSavedDashboardMock();
-      newDashboard.id = undefined;
-      const initialViewModeDashboardState = new DashboardStateManager({
-        savedDashboard: newDashboard,
-        kibanaVersion: '7.0.0',
-        hideWriteControls: false,
-        allowByValueEmbeddables: false,
-        history: createBrowserHistory(),
-        hasPendingEmbeddable: () => false,
-        kbnUrlStateStorage: createKbnUrlStateStorage(),
-        toasts: coreMock.createStart().notifications.toasts,
-        hasTaggingCapabilities: mockHasTaggingCapabilities,
-      });
-      expect(initialViewModeDashboardState.getViewMode()).toBe(ViewMode.EDIT);
-    });
-
-    test('initial view mode set to edit if there is a pending embeddable', () => {
-      const newDashboard = getSavedDashboardMock();
-      newDashboard.id = undefined;
-      const initialViewModeDashboardState = new DashboardStateManager({
-        savedDashboard: newDashboard,
-        kibanaVersion: '7.0.0',
-        hideWriteControls: false,
-        allowByValueEmbeddables: false,
-        history: createBrowserHistory(),
-        hasPendingEmbeddable: () => true,
-        kbnUrlStateStorage: createKbnUrlStateStorage(),
-        toasts: coreMock.createStart().notifications.toasts,
-        hasTaggingCapabilities: mockHasTaggingCapabilities,
-      });
-      expect(initialViewModeDashboardState.getViewMode()).toBe(ViewMode.EDIT);
-    });
-  });
-});
diff --git a/src/plugins/dashboard/public/application/dashboard_state_manager.ts b/src/plugins/dashboard/public/application/dashboard_state_manager.ts
deleted file mode 100644
index 58b413f4303e6..0000000000000
--- a/src/plugins/dashboard/public/application/dashboard_state_manager.ts
+++ /dev/null
@@ -1,771 +0,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 _ from 'lodash';
-import { Moment } from 'moment';
-import { i18n } from '@kbn/i18n';
-import { History } from 'history';
-import { Observable, Subscription } from 'rxjs';
-
-import { FilterUtils } from './lib/filter_utils';
-import { DashboardContainer } from './embeddable';
-import { DashboardSavedObject } from '../saved_dashboards';
-import { migrateLegacyQuery } from './lib/migrate_legacy_query';
-import {
-  getAppStateDefaults,
-  migrateAppState,
-  getDashboardIdFromUrl,
-  DashboardPanelStorage,
-} from './lib';
-import { convertPanelStateToSavedDashboardPanel } from '../../common/embeddable/embeddable_saved_object_converters';
-import {
-  DashboardAppState,
-  DashboardAppStateDefaults,
-  DashboardAppStateInUrl,
-  DashboardAppStateTransitions,
-  SavedDashboardPanel,
-} from '../types';
-
-import { ViewMode } from '../services/embeddable';
-import { UsageCollectionSetup } from '../services/usage_collection';
-import { Filter, Query, TimefilterContract as Timefilter } from '../services/data';
-import type { SavedObjectTagDecoratorTypeGuard } from '../services/saved_objects_tagging_oss';
-import {
-  createStateContainer,
-  IKbnUrlStateStorage,
-  ISyncStateRef,
-  ReduxLikeStateContainer,
-  syncState,
-} from '../services/kibana_utils';
-import { STATE_STORAGE_KEY } from '../url_generator';
-import { NotificationsStart } from '../services/core';
-import { getMigratedToastText } from '../dashboard_strings';
-
-/**
- * Dashboard state manager handles connecting angular and redux state between the angular and react portions of the
- * app. There are two "sources of truth" that need to stay in sync - AppState (aka the `_a` portion of the url) and
- * the Store. They aren't complete duplicates of each other as AppState has state that the Store doesn't, and vice
- * versa. They should be as decoupled as possible so updating the store won't affect bwc of urls.
- */
-export class DashboardStateManager {
-  public savedDashboard: DashboardSavedObject;
-  public lastSavedDashboardFilters: {
-    timeTo?: string | Moment;
-    timeFrom?: string | Moment;
-    filterBars: Filter[];
-    query: Query;
-  };
-  private stateDefaults: DashboardAppStateDefaults;
-  private toasts: NotificationsStart['toasts'];
-  private hideWriteControls: boolean;
-  private kibanaVersion: string;
-  public isDirty: boolean;
-  private changeListeners: Array<(status: { dirty: boolean }) => void>;
-  private hasShownMigrationToast = false;
-
-  public get appState(): DashboardAppState {
-    return this.stateContainer.get();
-  }
-
-  public get appState$(): Observable<DashboardAppState> {
-    return this.stateContainer.state$;
-  }
-
-  private readonly stateContainer: ReduxLikeStateContainer<
-    DashboardAppState,
-    DashboardAppStateTransitions
-  >;
-  private readonly stateContainerChangeSub: Subscription;
-  private readonly dashboardPanelStorage?: DashboardPanelStorage;
-  public readonly kbnUrlStateStorage: IKbnUrlStateStorage;
-  private readonly stateSyncRef: ISyncStateRef;
-  private readonly allowByValueEmbeddables: boolean;
-
-  private readonly usageCollection: UsageCollectionSetup | undefined;
-  public readonly hasTaggingCapabilities: SavedObjectTagDecoratorTypeGuard;
-  private hasPendingEmbeddable: () => boolean;
-
-  /**
-   *
-   * @param savedDashboard
-   * @param hideWriteControls true if write controls should be hidden.
-   * @param kibanaVersion current kibanaVersion
-   * @param
-   */
-  constructor({
-    toasts,
-    history,
-    kibanaVersion,
-    savedDashboard,
-    usageCollection,
-    hideWriteControls,
-    kbnUrlStateStorage,
-    hasPendingEmbeddable,
-    dashboardPanelStorage,
-    hasTaggingCapabilities,
-    allowByValueEmbeddables,
-  }: {
-    history: History;
-    kibanaVersion: string;
-    hideWriteControls: boolean;
-    hasPendingEmbeddable: () => boolean;
-    allowByValueEmbeddables: boolean;
-    savedDashboard: DashboardSavedObject;
-    toasts: NotificationsStart['toasts'];
-    usageCollection?: UsageCollectionSetup;
-    kbnUrlStateStorage: IKbnUrlStateStorage;
-    dashboardPanelStorage?: DashboardPanelStorage;
-    hasTaggingCapabilities: SavedObjectTagDecoratorTypeGuard;
-  }) {
-    this.toasts = toasts;
-    this.kibanaVersion = kibanaVersion;
-    this.savedDashboard = savedDashboard;
-    this.hideWriteControls = hideWriteControls;
-    this.usageCollection = usageCollection;
-    this.hasTaggingCapabilities = hasTaggingCapabilities;
-    this.allowByValueEmbeddables = allowByValueEmbeddables;
-    this.hasPendingEmbeddable = hasPendingEmbeddable;
-    this.dashboardPanelStorage = dashboardPanelStorage;
-    this.kbnUrlStateStorage = kbnUrlStateStorage;
-
-    // get state defaults from saved dashboard, make sure it is migrated
-    const viewMode = this.getInitialViewMode();
-    this.stateDefaults = migrateAppState(
-      getAppStateDefaults(viewMode, this.savedDashboard, this.hasTaggingCapabilities),
-      kibanaVersion,
-      usageCollection
-    );
-
-    // setup initial state by merging defaults with state from url & panels storage
-    // also run migration, as state in url could be of older version
-    const initialUrlState = this.kbnUrlStateStorage.get<DashboardAppState>(STATE_STORAGE_KEY);
-
-    const initialState = migrateAppState(
-      {
-        ...this.stateDefaults,
-        ...this.getUnsavedPanelState(),
-        ...initialUrlState,
-      },
-      kibanaVersion,
-      usageCollection
-    );
-
-    this.isDirty = false;
-
-    if (initialUrlState?.panels && !_.isEqual(initialUrlState.panels, this.stateDefaults.panels)) {
-      this.isDirty = true;
-      this.setUnsavedPanels(initialState.panels);
-    }
-
-    // setup state container using initial state both from defaults and from url
-    this.stateContainer = createStateContainer<DashboardAppState, DashboardAppStateTransitions>(
-      initialState,
-      {
-        set: (state) => (prop, value) => ({ ...state, [prop]: value }),
-        setOption: (state) => (option, value) => ({
-          ...state,
-          options: {
-            ...state.options,
-            [option]: value,
-          },
-        }),
-      }
-    );
-
-    // We can't compare the filters stored on this.appState to this.savedDashboard because in order to apply
-    // the filters to the visualizations, we need to save it on the dashboard. We keep track of the original
-    // filter state in order to let the user know if their filters changed and provide this specific information
-    // in the 'lose changes' warning message.
-    this.lastSavedDashboardFilters = this.getFilterState();
-
-    this.changeListeners = [];
-
-    this.stateContainerChangeSub = this.stateContainer.state$.subscribe(() => {
-      this.isDirty = this.checkIsDirty();
-      this.changeListeners.forEach((listener) => listener({ dirty: this.isDirty }));
-    });
-
-    // setup state syncing utils. state container will be synced with url into `STATE_STORAGE_KEY` query param
-    this.stateSyncRef = syncState<DashboardAppStateInUrl>({
-      storageKey: STATE_STORAGE_KEY,
-      stateContainer: {
-        ...this.stateContainer,
-        get: () => this.toUrlState(this.stateContainer.get()),
-        set: (stateFromUrl: DashboardAppStateInUrl | null) => {
-          // sync state required state container to be able to handle null
-          // overriding set() so it could handle null coming from url
-          if (stateFromUrl) {
-            // Skip this update if current dashboardId in the url is different from what we have in the current instance of state manager
-            // As dashboard is driven by angular at the moment, the destroy cycle happens async,
-            // If the dashboardId has changed it means this instance
-            // is going to be destroyed soon and we shouldn't sync state anymore,
-            // as it could potentially trigger further url updates
-            const currentDashboardIdInUrl = getDashboardIdFromUrl(history.location.pathname);
-            if (currentDashboardIdInUrl !== this.savedDashboard.id) return;
-
-            // set View mode before the rest of the state so unsaved panels can be added correctly.
-            if (this.appState.viewMode !== stateFromUrl.viewMode) {
-              this.switchViewMode(stateFromUrl.viewMode);
-            }
-
-            this.stateContainer.set({
-              ...this.stateDefaults,
-              ...this.getUnsavedPanelState(),
-              ...stateFromUrl,
-            });
-          } else {
-            // Do nothing in case when state from url is empty,
-            // this fixes: https://github.com/elastic/kibana/issues/57789
-            // There are not much cases when state in url could become empty:
-            // 1. User manually removed `_a` from the url
-            // 2. Browser is navigating away from the page and most likely there is no `_a` in the url.
-            //    In this case we don't want to do any state updates
-            //    and just allow $scope.$on('destroy') fire later and clean up everything
-          }
-        },
-      },
-      stateStorage: this.kbnUrlStateStorage,
-    });
-  }
-
-  public startStateSyncing() {
-    this.saveState({ replace: true });
-    this.stateSyncRef.start();
-  }
-
-  public registerChangeListener(callback: (status: { dirty: boolean }) => void) {
-    this.changeListeners.push(callback);
-  }
-
-  public handleDashboardContainerChanges(dashboardContainer: DashboardContainer) {
-    let dirty = false;
-    let dirtyBecauseOfInitialStateMigration = false;
-
-    const savedDashboardPanelMap: { [key: string]: SavedDashboardPanel } = {};
-
-    const input = dashboardContainer.getInput();
-
-    this.getPanels().forEach((savedDashboardPanel) => {
-      if (input.panels[savedDashboardPanel.panelIndex] !== undefined) {
-        savedDashboardPanelMap[savedDashboardPanel.panelIndex] = savedDashboardPanel;
-      } else {
-        // A panel was deleted.
-        dirty = true;
-      }
-    });
-
-    const convertedPanelStateMap: { [key: string]: SavedDashboardPanel } = {};
-
-    let expandedPanelValid = false;
-    Object.values(input.panels).forEach((panelState) => {
-      if (savedDashboardPanelMap[panelState.explicitInput.id] === undefined) {
-        dirty = true;
-      }
-
-      if (panelState.explicitInput.id === input.expandedPanelId) {
-        expandedPanelValid = true;
-      }
-
-      convertedPanelStateMap[panelState.explicitInput.id] = convertPanelStateToSavedDashboardPanel(
-        panelState,
-        this.kibanaVersion
-      );
-
-      if (
-        !_.isEqual(
-          convertedPanelStateMap[panelState.explicitInput.id],
-          savedDashboardPanelMap[panelState.explicitInput.id]
-        )
-      ) {
-        // A panel was changed
-        dirty = true;
-
-        const oldVersion = savedDashboardPanelMap[panelState.explicitInput.id]?.version;
-        const newVersion = convertedPanelStateMap[panelState.explicitInput.id]?.version;
-        if (oldVersion && newVersion && oldVersion !== newVersion) {
-          dirtyBecauseOfInitialStateMigration = true;
-        }
-      }
-    });
-
-    if (dirty) {
-      this.stateContainer.transitions.set('panels', Object.values(convertedPanelStateMap));
-      if (dirtyBecauseOfInitialStateMigration) {
-        if (this.getIsEditMode() && !this.hasShownMigrationToast) {
-          this.toasts.addSuccess(getMigratedToastText());
-          this.hasShownMigrationToast = true;
-        }
-        this.saveState({ replace: true });
-      }
-
-      // If a panel has been changed, and the state is now equal to the state in the saved object, remove the unsaved panels
-      if (!this.isDirty && this.getIsEditMode()) {
-        this.clearUnsavedPanels();
-      } else {
-        this.setUnsavedPanels(this.getPanels());
-      }
-    }
-
-    if (input.isFullScreenMode !== this.getFullScreenMode()) {
-      this.setFullScreenMode(input.isFullScreenMode);
-    }
-
-    if (expandedPanelValid && input.expandedPanelId !== this.getExpandedPanelId()) {
-      this.setExpandedPanelId(input.expandedPanelId);
-    } else if (!expandedPanelValid && this.getExpandedPanelId()) {
-      this.setExpandedPanelId(undefined);
-    }
-
-    if (!_.isEqual(input.query, this.getQuery())) {
-      this.setQuery(input.query);
-    }
-
-    this.changeListeners.forEach((listener) => listener({ dirty }));
-  }
-
-  public getFullScreenMode() {
-    return this.appState.fullScreenMode;
-  }
-
-  public setFullScreenMode(fullScreenMode: boolean) {
-    this.stateContainer.transitions.set('fullScreenMode', fullScreenMode);
-  }
-
-  public getExpandedPanelId() {
-    return this.appState.expandedPanelId;
-  }
-
-  public setExpandedPanelId(expandedPanelId?: string) {
-    this.stateContainer.transitions.set('expandedPanelId', expandedPanelId);
-  }
-
-  public setFilters(filters: Filter[]) {
-    this.stateContainer.transitions.set('filters', filters);
-  }
-
-  /**
-   * Resets the state back to the last saved version of the dashboard.
-   */
-  public resetState() {
-    // In order to show the correct warning, we have to store the unsaved
-    // title on the dashboard object. We should fix this at some point, but this is how all the other object
-    // save panels work at the moment.
-    this.savedDashboard.title = this.savedDashboard.lastSavedTitle;
-
-    // appState.reset uses the internal defaults to reset the state, but some of the default settings (e.g. the panels
-    // array) point to the same object that is stored on appState and is getting modified.
-    // The right way to fix this might be to ensure the defaults object stored on state is a deep
-    // clone, but given how much code uses the state object, I determined that to be too risky of a change for
-    // now.  TODO: revisit this!
-    const currentViewMode = this.stateContainer.get().viewMode;
-    this.stateDefaults = migrateAppState(
-      getAppStateDefaults(currentViewMode, this.savedDashboard, this.hasTaggingCapabilities),
-      this.kibanaVersion,
-      this.usageCollection
-    );
-    // The original query won't be restored by the above because the query on this.savedDashboard is applied
-    // in place in order for it to affect the visualizations.
-    this.stateDefaults.query = this.lastSavedDashboardFilters.query;
-    // Need to make a copy to ensure they are not overwritten.
-    this.stateDefaults.filters = [...this.getLastSavedFilterBars()];
-    this.isDirty = false;
-
-    this.stateContainer.set(this.stateDefaults);
-  }
-
-  /**
-   * Returns an object which contains the current filter state of this.savedDashboard.
-   */
-  public getFilterState() {
-    return {
-      timeTo: this.savedDashboard.timeTo,
-      timeFrom: this.savedDashboard.timeFrom,
-      filterBars: this.savedDashboard.getFilters(),
-      query: this.savedDashboard.getQuery(),
-    };
-  }
-
-  public getTitle() {
-    return this.appState.title;
-  }
-
-  public isSaved() {
-    return !!this.savedDashboard.id;
-  }
-
-  public isNew() {
-    return !this.isSaved();
-  }
-
-  public getDescription() {
-    return this.appState.description;
-  }
-
-  public getTags() {
-    return this.appState.tags;
-  }
-
-  public setDescription(description: string) {
-    this.stateContainer.transitions.set('description', description);
-  }
-
-  public setTitle(title: string) {
-    this.savedDashboard.title = title;
-    this.stateContainer.transitions.set('title', title);
-  }
-
-  public setTags(tags: string[]) {
-    this.stateContainer.transitions.set('tags', tags);
-  }
-
-  public getAppState() {
-    return this.stateContainer.get();
-  }
-
-  public getQuery(): Query {
-    return migrateLegacyQuery(this.stateContainer.get().query);
-  }
-
-  public getSavedQueryId() {
-    return this.stateContainer.get().savedQuery;
-  }
-
-  public setSavedQueryId(id?: string) {
-    this.stateContainer.transitions.set('savedQuery', id);
-  }
-
-  public getUseMargins() {
-    // Existing dashboards that don't define this should default to false.
-    return this.appState.options.useMargins === undefined
-      ? false
-      : this.appState.options.useMargins;
-  }
-
-  public setUseMargins(useMargins: boolean) {
-    this.stateContainer.transitions.setOption('useMargins', useMargins);
-  }
-
-  public getSyncColors() {
-    // Existing dashboards that don't define this should default to true.
-    return this.appState.options.syncColors === undefined ? true : this.appState.options.syncColors;
-  }
-
-  public setSyncColors(syncColors: boolean) {
-    this.stateContainer.transitions.setOption('syncColors', syncColors);
-  }
-
-  public getHidePanelTitles() {
-    return this.appState.options.hidePanelTitles;
-  }
-
-  public setHidePanelTitles(hidePanelTitles: boolean) {
-    this.stateContainer.transitions.setOption('hidePanelTitles', hidePanelTitles);
-  }
-
-  public getTimeRestore() {
-    return this.appState.timeRestore;
-  }
-
-  public setTimeRestore(timeRestore: boolean) {
-    this.stateContainer.transitions.set('timeRestore', timeRestore);
-  }
-
-  public getIsTimeSavedWithDashboard() {
-    return this.savedDashboard.timeRestore;
-  }
-
-  public getLastSavedFilterBars(): Filter[] {
-    return this.lastSavedDashboardFilters.filterBars;
-  }
-
-  public getLastSavedQuery() {
-    return this.lastSavedDashboardFilters.query;
-  }
-
-  /**
-   * @returns True if the query changed since the last time the dashboard was saved, or if it's a
-   * new dashboard, if the query differs from the default.
-   */
-  public getQueryChanged() {
-    const currentQuery = this.appState.query;
-    const lastSavedQuery = this.getLastSavedQuery();
-
-    const query = migrateLegacyQuery(currentQuery);
-
-    const isLegacyStringQuery =
-      _.isString(lastSavedQuery) && _.isPlainObject(currentQuery) && _.has(currentQuery, 'query');
-    if (isLegacyStringQuery) {
-      return lastSavedQuery !== query.query;
-    }
-
-    return !_.isEqual(currentQuery, lastSavedQuery);
-  }
-
-  /**
-   * @returns True if the filter bar state has changed since the last time the dashboard was saved,
-   * or if it's a new dashboard, if the query differs from the default.
-   */
-  public getFilterBarChanged() {
-    return !_.isEqual(
-      FilterUtils.cleanFiltersForComparison(this.appState.filters),
-      FilterUtils.cleanFiltersForComparison(this.getLastSavedFilterBars())
-    );
-  }
-
-  /**
-   * @param timeFilter
-   * @returns True if the time state has changed since the time saved with the dashboard.
-   */
-  public getTimeChanged(timeFilter: Timefilter) {
-    return (
-      !FilterUtils.areTimesEqual(
-        this.lastSavedDashboardFilters.timeFrom,
-        timeFilter.getTime().from
-      ) ||
-      !FilterUtils.areTimesEqual(this.lastSavedDashboardFilters.timeTo, timeFilter.getTime().to)
-    );
-  }
-
-  public getViewMode() {
-    if (this.hideWriteControls) {
-      return ViewMode.VIEW;
-    }
-    if (this.stateContainer) {
-      return this.appState.viewMode;
-    }
-    // get viewMode should work properly even before the state container is created
-    return this.getInitialViewMode();
-  }
-
-  public getIsViewMode() {
-    return this.getViewMode() === ViewMode.VIEW;
-  }
-
-  public getIsEditMode() {
-    return this.getViewMode() === ViewMode.EDIT;
-  }
-
-  /**
-   *
-   * @returns True if the dashboard has changed since the last save (or, is new).
-   */
-  public getIsDirty(timeFilter?: Timefilter) {
-    // Filter bar comparison is done manually (see cleanFiltersForComparison for the reason) and time picker
-    // changes are not tracked by the state monitor.
-    const hasTimeFilterChanged = timeFilter ? this.getFiltersChanged(timeFilter) : false;
-    return (
-      this.hasUnsavedPanelState() ||
-      (this.getIsEditMode() && (this.isDirty || hasTimeFilterChanged))
-    );
-  }
-
-  public getPanels(): SavedDashboardPanel[] {
-    return this.appState.panels;
-  }
-
-  public updatePanel(panelIndex: string, panelAttributes: any) {
-    const foundPanel = this.getPanels().find(
-      (panel: SavedDashboardPanel) => panel.panelIndex === panelIndex
-    );
-    Object.assign(foundPanel, panelAttributes);
-    return foundPanel;
-  }
-
-  /**
-   * @param timeFilter
-   * @returns An array of user friendly strings indicating the filter types that have changed.
-   */
-  public getChangedFilterTypes(timeFilter: Timefilter) {
-    const changedFilters = [];
-    if (this.getFilterBarChanged()) {
-      changedFilters.push('filter');
-    }
-    if (this.getQueryChanged()) {
-      changedFilters.push('query');
-    }
-    if (this.savedDashboard.timeRestore && this.getTimeChanged(timeFilter)) {
-      changedFilters.push('time range');
-    }
-    return changedFilters;
-  }
-
-  /**
-   * @returns True if filters (query, filter bar filters, and time picker if time is stored
-   * with the dashboard) have changed since the last saved state (or if the dashboard hasn't been saved,
-   * the default state).
-   */
-  public getFiltersChanged(timeFilter: Timefilter) {
-    return this.getChangedFilterTypes(timeFilter).length > 0;
-  }
-
-  /**
-   * Updates timeFilter to match the time saved with the dashboard.
-   * @param timeFilter
-   * @param timeFilter.setTime
-   * @param timeFilter.setRefreshInterval
-   */
-  public syncTimefilterWithDashboardTime(timeFilter: Timefilter) {
-    if (!this.getIsTimeSavedWithDashboard()) {
-      throw new Error(
-        i18n.translate('dashboard.stateManager.timeNotSavedWithDashboardErrorMessage', {
-          defaultMessage: 'The time is not saved with this dashboard so should not be synced.',
-        })
-      );
-    }
-
-    if (this.savedDashboard.timeFrom && this.savedDashboard.timeTo) {
-      timeFilter.setTime({
-        from: this.savedDashboard.timeFrom,
-        to: this.savedDashboard.timeTo,
-      });
-    }
-  }
-
-  /**
-   * Updates timeFilter to match the refreshInterval saved with the dashboard.
-   * @param timeFilter
-   */
-  public syncTimefilterWithDashboardRefreshInterval(timeFilter: Timefilter) {
-    if (!this.getIsTimeSavedWithDashboard()) {
-      throw new Error(
-        i18n.translate('dashboard.stateManager.timeNotSavedWithDashboardErrorMessage', {
-          defaultMessage: 'The time is not saved with this dashboard so should not be synced.',
-        })
-      );
-    }
-
-    if (this.savedDashboard.refreshInterval) {
-      timeFilter.setRefreshInterval(this.savedDashboard.refreshInterval);
-    }
-  }
-
-  /**
-   * Synchronously writes current state to url
-   * returned boolean indicates whether the update happened and if history was updated
-   */
-  private saveState({ replace }: { replace: boolean }): boolean {
-    // schedules setting current state to url
-    this.kbnUrlStateStorage.set<DashboardAppStateInUrl>(
-      STATE_STORAGE_KEY,
-      this.toUrlState(this.stateContainer.get())
-    );
-    // immediately forces scheduled updates and changes location
-    return !!this.kbnUrlStateStorage.kbnUrlControls.flush(replace);
-  }
-
-  public setQuery(query: Query) {
-    this.stateContainer.transitions.set('query', query);
-  }
-
-  /**
-   * Applies the current filter state to the dashboard.
-   * @param filter An array of filter bar filters.
-   */
-  public applyFilters(query: Query, filters: Filter[]) {
-    this.savedDashboard.searchSource.setField('query', query);
-    this.savedDashboard.searchSource.setField('filter', filters);
-    this.stateContainer.transitions.set('query', query);
-  }
-
-  public switchViewMode(newMode: ViewMode) {
-    this.stateContainer.transitions.set('viewMode', newMode);
-    this.restorePanels();
-  }
-
-  /**
-   * Destroys and cleans up this object when it's no longer used.
-   */
-  public destroy() {
-    this.stateContainerChangeSub.unsubscribe();
-    this.savedDashboard.destroy();
-    if (this.stateSyncRef) {
-      this.stateSyncRef.stop();
-    }
-  }
-
-  public restorePanels() {
-    const unsavedState = this.getUnsavedPanelState();
-    if (!unsavedState || unsavedState.panels?.length === 0) {
-      return;
-    }
-    this.stateContainer.set(
-      migrateAppState(
-        {
-          ...this.stateDefaults,
-          ...unsavedState,
-          ...this.kbnUrlStateStorage.get<DashboardAppState>(STATE_STORAGE_KEY),
-          viewMode: this.getViewMode(),
-        },
-        this.kibanaVersion,
-        this.usageCollection
-      )
-    );
-  }
-
-  public clearUnsavedPanels() {
-    if (!this.allowByValueEmbeddables || !this.dashboardPanelStorage) {
-      return;
-    }
-    this.dashboardPanelStorage.clearPanels(this.savedDashboard?.id);
-  }
-
-  public hasUnsavedPanelState(): boolean {
-    const panels = this.dashboardPanelStorage?.getPanels(this.savedDashboard?.id);
-    return panels !== undefined && panels.length > 0;
-  }
-
-  private getUnsavedPanelState(): { panels?: SavedDashboardPanel[] } {
-    if (!this.allowByValueEmbeddables || this.getIsViewMode() || !this.dashboardPanelStorage) {
-      return {};
-    }
-    const panels = this.dashboardPanelStorage.getPanels(this.savedDashboard?.id);
-    return panels ? { panels } : {};
-  }
-
-  private setUnsavedPanels(newPanels: SavedDashboardPanel[]) {
-    if (
-      !this.allowByValueEmbeddables ||
-      this.getIsViewMode() ||
-      !this.getIsDirty() ||
-      !this.dashboardPanelStorage
-    ) {
-      return;
-    }
-    this.dashboardPanelStorage.setPanels(this.savedDashboard?.id, newPanels);
-  }
-
-  private toUrlState(state: DashboardAppState): DashboardAppStateInUrl {
-    if (this.getIsEditMode() && !this.allowByValueEmbeddables) {
-      return state;
-    }
-    const { panels, ...stateWithoutPanels } = state;
-    return stateWithoutPanels;
-  }
-
-  private getInitialViewMode() {
-    if (this.hideWriteControls) {
-      return ViewMode.VIEW;
-    }
-    const viewModeFromUrl = this.kbnUrlStateStorage.get<DashboardAppState>(STATE_STORAGE_KEY)
-      ?.viewMode;
-    if (viewModeFromUrl) {
-      return viewModeFromUrl;
-    }
-    return !this.savedDashboard.id || this.hasPendingEmbeddable() ? ViewMode.EDIT : ViewMode.VIEW;
-  }
-
-  private checkIsDirty() {
-    // Filters need to be compared manually because they sometimes have a $$hashkey stored on the object.
-    // Query needs to be compared manually because saved legacy queries get migrated in app state automatically
-    const propsToIgnore: Array<keyof DashboardAppState> = ['viewMode', 'filters', 'query'];
-
-    const initial = _.omit(this.stateDefaults, propsToIgnore);
-    const current = _.omit(this.stateContainer.get(), propsToIgnore);
-    return !_.isEqual(initial, current);
-  }
-}
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
index 92b0727d2458c..b6e2a7c4b8f02 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container.tsx
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import _ from 'lodash';
 import React from 'react';
 import ReactDOM from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
@@ -20,7 +21,6 @@ import {
   Container,
   PanelState,
   IEmbeddable,
-  ContainerInput,
   EmbeddableInput,
   EmbeddableStart,
   EmbeddableOutput,
@@ -36,30 +36,13 @@ import {
   KibanaReactContextValue,
 } from '../../services/kibana_react';
 import { PLACEHOLDER_EMBEDDABLE } from './placeholder';
-import { PanelPlacementMethod, IPanelPlacementArgs } from './panel/dashboard_panel_placement';
-import { DashboardCapabilities } from '../types';
+import { DashboardAppCapabilities, DashboardContainerInput } from '../../types';
 import { PresentationUtilPluginStart } from '../../services/presentation_util';
+import { PanelPlacementMethod, IPanelPlacementArgs } from './panel/dashboard_panel_placement';
 
-export interface DashboardContainerInput extends ContainerInput {
-  dashboardCapabilities?: DashboardCapabilities;
-  refreshConfig?: RefreshInterval;
-  isEmbeddedExternally?: boolean;
-  isFullScreenMode: boolean;
-  expandedPanelId?: string;
-  timeRange: TimeRange;
-  description?: string;
-  useMargins: boolean;
-  syncColors?: boolean;
-  viewMode: ViewMode;
-  filters: Filter[];
-  title: string;
-  query: Query;
-  panels: {
-    [panelId: string]: DashboardPanelState<EmbeddableInput & { [k: string]: unknown }>;
-  };
-}
 export interface DashboardContainerServices {
   ExitFullScreenButton: React.ComponentType<any>;
+  presentationUtil: PresentationUtilPluginStart;
   SavedObjectFinder: React.ComponentType<any>;
   notifications: CoreStart['notifications'];
   application: CoreStart['application'];
@@ -69,7 +52,6 @@ export interface DashboardContainerServices {
   embeddable: EmbeddableStart;
   uiActions: UiActionsStart;
   http: CoreStart['http'];
-  presentationUtil: PresentationUtilPluginStart;
 }
 
 interface IndexSignature {
@@ -91,7 +73,7 @@ export interface InheritedChildInput extends IndexSignature {
 export type DashboardReactContextValue = KibanaReactContextValue<DashboardContainerServices>;
 export type DashboardReactContext = KibanaReactContext<DashboardContainerServices>;
 
-const defaultCapabilities: DashboardCapabilities = {
+const defaultCapabilities: DashboardAppCapabilities = {
   show: false,
   createNew: false,
   saveQuery: false,
@@ -104,7 +86,6 @@ const defaultCapabilities: DashboardCapabilities = {
 
 export class DashboardContainer extends Container<InheritedChildInput, DashboardContainerInput> {
   public readonly type = DASHBOARD_CONTAINER_TYPE;
-  public switchViewMode?: (newViewMode: ViewMode) => void;
 
   public getPanelCount = () => {
     return Object.keys(this.getInput().panels).length;
@@ -134,7 +115,8 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
     partial: Partial<TEmbeddableInput> = {}
   ): DashboardPanelState<TEmbeddableInput> {
     const panelState = super.createNewPanelState(factory, partial);
-    return createPanelState(panelState, this.input.panels);
+    const { newPanel } = createPanelState(panelState, this.input.panels);
+    return newPanel;
   }
 
   public showPlaceholderUntil<TPlacementMethodArgs extends IPanelPlacementArgs>(
@@ -155,7 +137,8 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
         ],
       },
     } as PanelState<EmbeddableInput>;
-    const placeholderPanelState = createPanelState(
+
+    const { otherPanels, newPanel: placeholderPanelState } = createPanelState(
       originalPanelState,
       this.input.panels,
       placementMethod,
@@ -164,7 +147,7 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
 
     this.updateInput({
       panels: {
-        ...this.input.panels,
+        ...otherPanels,
         [placeholderPanelState.explicitInput.id]: placeholderPanelState,
       },
     });
@@ -248,7 +231,7 @@ export class DashboardContainer extends Container<InheritedChildInput, Dashboard
       <I18nProvider>
         <KibanaContextProvider services={this.services}>
           <this.services.presentationUtil.ContextProvider>
-            <DashboardViewport container={this} switchViewMode={this.switchViewMode} />
+            <DashboardViewport container={this} />
           </this.services.presentationUtil.ContextProvider>
         </KibanaContextProvider>
       </I18nProvider>,
diff --git a/src/plugins/dashboard/public/application/embeddable/dashboard_container_by_value_renderer.tsx b/src/plugins/dashboard/public/application/embeddable/dashboard_container_by_value_renderer.tsx
index 05e1e7eb9ec35..a4d96b557ac97 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container_by_value_renderer.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container_by_value_renderer.tsx
@@ -7,7 +7,7 @@
  */
 
 import * as React from 'react';
-import { DashboardContainerInput } from './dashboard_container';
+import { DashboardContainerInput } from '../..';
 import { DashboardContainerFactory } from './dashboard_container_factory';
 import { EmbeddableRenderer } from '../../services/embeddable';
 
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 ff592742488f5..2e984ccfa5ba9 100644
--- a/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/dashboard_container_factory.tsx
@@ -8,6 +8,10 @@
 
 import { i18n } from '@kbn/i18n';
 import { EmbeddablePersistableStateService } from 'src/plugins/embeddable/common';
+
+import { DashboardContainerInput } from '../..';
+import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
+import { DashboardContainer, DashboardContainerServices } from './dashboard_container';
 import {
   Container,
   ErrorEmbeddable,
@@ -15,12 +19,6 @@ import {
   EmbeddableFactory,
   EmbeddableFactoryDefinition,
 } from '../../services/embeddable';
-import {
-  DashboardContainer,
-  DashboardContainerInput,
-  DashboardContainerServices,
-} from './dashboard_container';
-import { DASHBOARD_CONTAINER_TYPE } from './dashboard_constants';
 import {
   createExtract,
   createInject,
diff --git a/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap b/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap
index 44beed5e4a89b..9f56740fdac22 100644
--- a/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap
+++ b/src/plugins/dashboard/public/application/embeddable/empty_screen/__snapshots__/dashboard_empty_screen.test.tsx.snap
@@ -590,10 +590,12 @@ exports[`DashboardEmptyScreen renders correctly with readonly mode 1`] = `
       <PseudoLocaleWrapper>
         <EuiPage
           className="dshStartScreen"
+          data-test-subj="dashboardEmptyReadOnly"
           restrictWidth="500px"
         >
           <div
             className="euiPage euiPage--paddingMedium euiPage--grow euiPage--restrictWidth-custom dshStartScreen"
+            data-test-subj="dashboardEmptyReadOnly"
             style={
               Object {
                 "maxWidth": "500px",
@@ -935,10 +937,12 @@ exports[`DashboardEmptyScreen renders correctly with view mode 1`] = `
       <PseudoLocaleWrapper>
         <EuiPage
           className="dshStartScreen"
+          data-test-subj="dashboardEmptyReadWrite"
           restrictWidth="500px"
         >
           <div
             className="euiPage euiPage--paddingMedium euiPage--grow euiPage--restrictWidth-custom dshStartScreen"
+            data-test-subj="dashboardEmptyReadWrite"
             style={
               Object {
                 "maxWidth": "500px",
@@ -1021,30 +1025,7 @@ exports[`DashboardEmptyScreen renders correctly with view mode 1`] = `
                                 className="euiTextColor euiTextColor--subdued"
                               >
                                 <p>
-                                  Click
-                                  <span>
-                                     
-                                  </span>
-                                  <EuiLink
-                                    aria-label="Edit dashboard"
-                                    data-test-subj=""
-                                    onClick={[MockFunction]}
-                                  >
-                                    <button
-                                      aria-label="Edit dashboard"
-                                      className="euiLink euiLink--primary"
-                                      data-test-subj=""
-                                      disabled={false}
-                                      onClick={[MockFunction]}
-                                      type="button"
-                                    >
-                                      Edit
-                                    </button>
-                                  </EuiLink>
-                                  <span>
-                                     
-                                  </span>
-                                  in the menu bar above to start adding panels.
+                                  Click edit in the menu bar above to start adding panels.
                                 </p>
                               </div>
                             </EuiTextColor>
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 10fd2eea7dad5..b2f1302c65c9c 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
@@ -10,7 +10,6 @@ import React from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
 import {
   EuiIcon,
-  EuiLink,
   EuiSpacer,
   EuiPageContent,
   EuiPageBody,
@@ -24,7 +23,6 @@ import { emptyScreenStrings } from '../../../dashboard_strings';
 
 export interface DashboardEmptyScreenProps {
   isEditMode?: boolean;
-  onLinkClick: () => void;
   uiSettings: IUiSettingsClient;
   http: HttpStart;
   isReadonlyMode?: boolean;
@@ -32,7 +30,6 @@ export interface DashboardEmptyScreenProps {
 
 export function DashboardEmptyScreen({
   isEditMode,
-  onLinkClick,
   uiSettings,
   http,
   isReadonlyMode,
@@ -41,36 +38,14 @@ export function DashboardEmptyScreen({
   const emptyStateGraphicURL = IS_DARK_THEME
     ? '/plugins/home/assets/welcome_graphic_dark_2x.png'
     : '/plugins/home/assets/welcome_graphic_light_2x.png';
-  const paragraph = (
-    description1: string | null,
-    description2: string,
-    linkText: string,
-    ariaLabel: string,
-    dataTestSubj?: string
-  ) => {
-    return (
-      <EuiText size="m" color="subdued">
-        <p>
-          {description1}
-          {description1 && <span>&nbsp;</span>}
-          <EuiLink onClick={onLinkClick} aria-label={ariaLabel} data-test-subj={dataTestSubj || ''}>
-            {linkText}
-          </EuiLink>
-          <span>&nbsp;</span>
-          {description2}
-        </p>
-      </EuiText>
-    );
-  };
-  const enterEditModeParagraph = paragraph(
-    emptyScreenStrings.getHowToStartWorkingOnNewDashboardDescription1(),
-    emptyScreenStrings.getHowToStartWorkingOnNewDashboardDescription2(),
-    emptyScreenStrings.getHowToStartWorkingOnNewDashboardEditLinkText(),
-    emptyScreenStrings.getHowToStartWorkingOnNewDashboardEditLinkAriaLabel()
-  );
+
   const page = (mainText: string, showAdditionalParagraph?: boolean, additionalText?: string) => {
     return (
-      <EuiPage className="dshStartScreen" restrictWidth="500px">
+      <EuiPage
+        data-test-subj={isReadonlyMode ? 'dashboardEmptyReadOnly' : 'dashboardEmptyReadWrite'}
+        className="dshStartScreen"
+        restrictWidth="500px"
+      >
         <EuiPageBody>
           <EuiPageContent
             verticalPosition="center"
@@ -90,7 +65,11 @@ export function DashboardEmptyScreen({
             {showAdditionalParagraph ? (
               <React.Fragment>
                 <EuiSpacer size="m" />
-                <div className="dshStartScreen__panelDesc">{enterEditModeParagraph}</div>
+                <div className="dshStartScreen__panelDesc">
+                  <EuiText size="m" color="subdued">
+                    <p>{emptyScreenStrings.getHowToStartWorkingOnNewDashboardDescription()}</p>
+                  </EuiText>
+                </div>
               </React.Fragment>
             ) : null}
           </EuiPageContent>
diff --git a/src/plugins/dashboard/public/application/embeddable/index.ts b/src/plugins/dashboard/public/application/embeddable/index.ts
index 24b5362359d25..a678dbea16a55 100644
--- a/src/plugins/dashboard/public/application/embeddable/index.ts
+++ b/src/plugins/dashboard/public/application/embeddable/index.ts
@@ -10,7 +10,7 @@ export {
   DashboardContainerFactoryDefinition,
   DashboardContainerFactory,
 } from './dashboard_container_factory';
-export { DashboardContainer, DashboardContainerInput } from './dashboard_container';
+export { DashboardContainer } from './dashboard_container';
 export { createPanelState } from './panel';
 
 export * from './types';
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 7563d07154d6e..97e078246aca6 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
@@ -18,7 +18,7 @@ interface TestInput extends EmbeddableInput {
 const panels: { [key: string]: DashboardPanelState } = {};
 
 test('createPanelState adds a new panel state in 0,0 position', () => {
-  const panelState = createPanelState<TestInput>(
+  const { newPanel: panelState } = createPanelState<TestInput>(
     {
       type: CONTACT_CARD_EMBEDDABLE,
       explicitInput: { test: 'hi', id: '123' },
@@ -37,7 +37,7 @@ test('createPanelState adds a new panel state in 0,0 position', () => {
 });
 
 test('createPanelState adds a second new panel state', () => {
-  const panelState = createPanelState<TestInput>(
+  const { newPanel: panelState } = createPanelState<TestInput>(
     { type: CONTACT_CARD_EMBEDDABLE, explicitInput: { test: 'bye', id: '456' } },
     panels
   );
@@ -51,7 +51,7 @@ test('createPanelState adds a second new panel state', () => {
 });
 
 test('createPanelState adds a third new panel state', () => {
-  const panelState = createPanelState<TestInput>(
+  const { newPanel: panelState } = createPanelState<TestInput>(
     {
       type: CONTACT_CARD_EMBEDDABLE,
       explicitInput: { test: 'bye', id: '789' },
@@ -68,7 +68,7 @@ test('createPanelState adds a third new panel state', () => {
 
 test('createPanelState adds a new panel state in the top most position', () => {
   delete panels['456'];
-  const panelState = createPanelState<TestInput>(
+  const { newPanel: panelState } = createPanelState<TestInput>(
     {
       type: CONTACT_CARD_EMBEDDABLE,
       explicitInput: { test: 'bye', id: '987' },
diff --git a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts
index 775ac7d7078ad..46a75ca06bdb5 100644
--- a/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts
+++ b/src/plugins/dashboard/public/application/embeddable/panel/create_panel_state.ts
@@ -26,7 +26,10 @@ export function createPanelState<
   currentPanels: { [key: string]: DashboardPanelState },
   placementMethod?: PanelPlacementMethod<TPlacementMethodArgs>,
   placementArgs?: TPlacementMethodArgs
-): DashboardPanelState<TEmbeddableInput> {
+): {
+  newPanel: DashboardPanelState<TEmbeddableInput>;
+  otherPanels: { [key: string]: DashboardPanelState };
+} {
   const defaultPlacementArgs = {
     width: DEFAULT_PANEL_WIDTH,
     height: DEFAULT_PANEL_HEIGHT,
@@ -39,15 +42,18 @@ export function createPanelState<
       }
     : defaultPlacementArgs;
 
-  const gridDataLocation = placementMethod
+  const { newPanelPlacement, otherPanels } = placementMethod
     ? placementMethod(finalPlacementArgs as TPlacementMethodArgs)
     : findTopLeftMostOpenSpace(defaultPlacementArgs);
 
   return {
-    gridData: {
-      ...gridDataLocation,
-      i: panelState.explicitInput.id,
+    newPanel: {
+      gridData: {
+        ...newPanelPlacement,
+        i: panelState.explicitInput.id,
+      },
+      ...panelState,
     },
-    ...panelState,
+    otherPanels,
   };
 }
diff --git a/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts
index c8e5fcbe4240b..64b398200db1d 100644
--- a/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts
+++ b/src/plugins/dashboard/public/application/embeddable/panel/dashboard_panel_placement.ts
@@ -13,7 +13,12 @@ import { DashboardPanelState, DASHBOARD_GRID_COLUMN_COUNT } from '..';
 
 export type PanelPlacementMethod<PlacementArgs extends IPanelPlacementArgs> = (
   args: PlacementArgs
-) => Omit<GridData, 'i'>;
+) => PanelPlacementMethodReturn;
+
+interface PanelPlacementMethodReturn {
+  newPanelPlacement: Omit<GridData, 'i'>;
+  otherPanels: { [key: string]: DashboardPanelState };
+}
 
 export interface IPanelPlacementArgs {
   width: number;
@@ -30,7 +35,7 @@ export function findTopLeftMostOpenSpace({
   width,
   height,
   currentPanels,
-}: IPanelPlacementArgs): Omit<GridData, 'i'> {
+}: IPanelPlacementArgs): PanelPlacementMethodReturn {
   let maxY = -1;
 
   const currentPanelsArray = Object.values(currentPanels);
@@ -40,7 +45,7 @@ export function findTopLeftMostOpenSpace({
 
   // Handle case of empty grid.
   if (maxY < 0) {
-    return { x: 0, y: 0, w: width, h: height };
+    return { newPanelPlacement: { x: 0, y: 0, w: width, h: height }, otherPanels: currentPanels };
   }
 
   const grid = new Array(maxY);
@@ -80,7 +85,10 @@ export function findTopLeftMostOpenSpace({
 
             if (spaceIsEmpty && fitsPanelWidth && fitsPanelHeight) {
               // Found space
-              return { x, y, w: width, h: height };
+              return {
+                newPanelPlacement: { x, y, w: width, h: height },
+                otherPanels: currentPanels,
+              };
             } else if (grid[h][w] === 1) {
               // x, y spot doesn't work, break.
               break;
@@ -90,7 +98,7 @@ export function findTopLeftMostOpenSpace({
       }
     }
   }
-  return { x: 0, y: maxY, w: width, h: height };
+  return { newPanelPlacement: { x: 0, y: maxY, w: width, h: height }, otherPanels: currentPanels };
 }
 
 interface IplacementDirection {
@@ -123,15 +131,15 @@ export function placePanelBeside({
   height,
   currentPanels,
   placeBesideId,
-}: IPanelPlacementBesideArgs): Omit<GridData, 'i'> {
+}: IPanelPlacementBesideArgs): PanelPlacementMethodReturn {
   const panelToPlaceBeside = currentPanels[placeBesideId];
   if (!panelToPlaceBeside) {
     throw new PanelNotFoundError();
   }
   const beside = panelToPlaceBeside.gridData;
-  const otherPanels: GridData[] = [];
+  const otherPanelGridData: GridData[] = [];
   _.forOwn(currentPanels, (panel: DashboardPanelState, key: string | undefined) => {
-    otherPanels.push(panel.gridData);
+    otherPanelGridData.push(panel.gridData);
   });
 
   const possiblePlacementDirections: IplacementDirection[] = [
@@ -147,7 +155,7 @@ export function placePanelBeside({
       direction.grid.x + direction.grid.w <= DASHBOARD_GRID_COLUMN_COUNT &&
       direction.grid.y >= 0
     ) {
-      const intersection = otherPanels.some((currentPanelGrid: GridData) => {
+      const intersection = otherPanelGridData.some((currentPanelGrid: GridData) => {
         return (
           direction.grid.x + direction.grid.w > currentPanelGrid.x &&
           direction.grid.x < currentPanelGrid.x + currentPanelGrid.w &&
@@ -156,7 +164,7 @@ export function placePanelBeside({
         );
       });
       if (!intersection) {
-        return direction.grid;
+        return { newPanelPlacement: direction.grid, otherPanels: currentPanels };
       }
     } else {
       direction.fits = false;
@@ -168,7 +176,8 @@ export function placePanelBeside({
    * 2. place the cloned panel to the bottom
    * 3. reposition the panels after the cloned panel in the grid
    */
-  const grid = otherPanels.sort(comparePanels);
+  const otherPanels = { ...currentPanels };
+  const grid = otherPanelGridData.sort(comparePanels);
 
   let position = 0;
   for (position; position < grid.length; position++) {
@@ -182,13 +191,13 @@ export function placePanelBeside({
   const diff =
     bottomPlacement.grid.y +
     bottomPlacement.grid.h -
-    currentPanels[originalPositionInTheGrid].gridData.y;
+    otherPanels[originalPositionInTheGrid].gridData.y;
 
   for (let j = position + 1; j < grid.length; j++) {
     originalPositionInTheGrid = grid[j].i;
-    const movedPanel = _.cloneDeep(currentPanels[originalPositionInTheGrid]);
+    const movedPanel = _.cloneDeep(otherPanels[originalPositionInTheGrid]);
     movedPanel.gridData.y = movedPanel.gridData.y + diff;
-    currentPanels[originalPositionInTheGrid] = movedPanel;
+    otherPanels[originalPositionInTheGrid] = movedPanel;
   }
-  return bottomPlacement.grid;
+  return { newPanelPlacement: bottomPlacement.grid, otherPanels };
 }
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 442bae8dd1dff..cbe10438e578a 100644
--- a/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
+++ b/src/plugins/dashboard/public/application/embeddable/viewport/dashboard_viewport.tsx
@@ -15,7 +15,6 @@ import { context } from '../../../services/kibana_react';
 import { DashboardEmptyScreen } from '../empty_screen/dashboard_empty_screen';
 
 export interface DashboardViewportProps {
-  switchViewMode?: (newViewMode: ViewMode) => void;
   container: DashboardContainer;
 }
 
@@ -120,7 +119,6 @@ export class DashboardViewport extends React.Component<DashboardViewportProps, S
                 isReadonlyMode={
                   this.props.container.getInput().dashboardCapabilities?.hideWriteControls
                 }
-                onLinkClick={() => this.props.switchViewMode?.(ViewMode.EDIT)}
                 isEditMode={isEditMode}
                 uiSettings={this.context.services.uiSettings}
                 http={this.context.services.http}
diff --git a/src/plugins/dashboard/public/application/hooks/index.ts b/src/plugins/dashboard/public/application/hooks/index.ts
index 09b7aea9c6a6d..d9c3cd231c3c3 100644
--- a/src/plugins/dashboard/public/application/hooks/index.ts
+++ b/src/plugins/dashboard/public/application/hooks/index.ts
@@ -6,7 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { useSavedDashboard } from './use_saved_dashboard';
-export { useDashboardContainer } from './use_dashboard_container';
-export { useDashboardBreadcrumbs } from './use_dashboard_breadcrumbs';
-export { useDashboardStateManager } from './use_dashboard_state_manager';
+export { useDashboardAppState } from './use_dashboard_app_state';
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
new file mode 100644
index 0000000000000..0e15c65574967
--- /dev/null
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.test.tsx
@@ -0,0 +1,337 @@
+/*
+ * Copyright 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 { of } from 'rxjs';
+import { Provider } from 'react-redux';
+import { createBrowserHistory } from 'history';
+import { renderHook, act, RenderHookResult } from '@testing-library/react-hooks';
+
+import { DashboardContainer } from '..';
+import { DashboardSessionStorage } from '../lib';
+import { coreMock } from '../../../../../core/public/mocks';
+import { DashboardConstants } from '../../dashboard_constants';
+import { dataPluginMock } from '../../../../data/public/mocks';
+import { SavedObjectLoader } from '../../services/saved_objects';
+import { DashboardAppServices, DashboardAppState } from '../../types';
+import { KibanaContextProvider } from '../../../../kibana_react/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 { Filter, IIndexPattern, IndexPatternsContract } from '../../services/data';
+import { useDashboardAppState, UseDashboardStateProps } from './use_dashboard_app_state';
+import {
+  getSampleDashboardInput,
+  getSavedDashboardMock,
+  makeDefaultServices,
+} from '../test_helpers';
+
+interface SetupEmbeddableFactoryReturn {
+  finalizeEmbeddableCreation: () => void;
+  dashboardContainer: DashboardContainer;
+  dashboardDestroySpy: jest.SpyInstance<unknown>;
+}
+
+interface RenderDashboardStateHookReturn {
+  embeddableFactoryResult: SetupEmbeddableFactoryReturn;
+  renderHookResult: RenderHookResult<Partial<UseDashboardStateProps>, DashboardAppState>;
+  services: DashboardAppServices;
+  props: UseDashboardStateProps;
+}
+
+const originalDashboardEmbeddableId = 'originalDashboardEmbeddableId';
+
+const createDashboardAppStateProps = (): UseDashboardStateProps => ({
+  kbnUrlStateStorage: createKbnUrlStateStorage(),
+  savedDashboardId: 'testDashboardId',
+  history: createBrowserHistory(),
+  isEmbeddedExternally: false,
+  redirectTo: jest.fn(),
+});
+
+const createDashboardAppStateServices = () => {
+  const defaults = makeDefaultServices();
+  const indexPatterns = {} as IndexPatternsContract;
+  const defaultIndexPattern = { id: 'foo', fields: [{ name: 'bar' }] } as IIndexPattern;
+  indexPatterns.ensureDefaultIndexPattern = jest
+    .fn()
+    .mockImplementation(() => Promise.resolve(true));
+  indexPatterns.getDefault = jest
+    .fn()
+    .mockImplementation(() => Promise.resolve(defaultIndexPattern));
+
+  const data = dataPluginMock.createStartContract();
+  data.query.filterManager.getUpdates$ = jest.fn().mockImplementation(() => of(void 0));
+  data.query.queryString.getUpdates$ = jest.fn().mockImplementation(() => of({}));
+  data.query.timefilter.timefilter.getTimeUpdate$ = jest.fn().mockImplementation(() => of(void 0));
+  data.query.timefilter.timefilter.getRefreshIntervalUpdate$ = jest
+    .fn()
+    .mockImplementation(() => of(void 0));
+
+  return { ...defaults, indexPatterns, data };
+};
+
+const setupEmbeddableFactory = (
+  services: DashboardAppServices,
+  id: string
+): SetupEmbeddableFactoryReturn => {
+  const coreStart = coreMock.createStart();
+  const containerOptions = ({
+    notifications: services.core.notifications,
+    savedObjectMetaData: {} as unknown,
+    ExitFullScreenButton: () => null,
+    embeddable: services.embeddable,
+    uiSettings: services.uiSettings,
+    SavedObjectFinder: () => null,
+    overlays: coreStart.overlays,
+    application: {} as unknown,
+    inspector: {} as unknown,
+    uiActions: {} as unknown,
+    http: coreStart.http,
+  } as unknown) as DashboardContainerServices;
+
+  const dashboardContainer = new DashboardContainer(
+    { ...getSampleDashboardInput(), id },
+    containerOptions
+  );
+  const deferEmbeddableCreate = defer();
+  services.embeddable.getEmbeddableFactory = jest.fn().mockImplementation(
+    () =>
+      (({
+        create: () => deferEmbeddableCreate.promise,
+      } as unknown) as EmbeddableFactory)
+  );
+  const dashboardDestroySpy = jest.spyOn(dashboardContainer, 'destroy');
+
+  return {
+    dashboardContainer,
+    dashboardDestroySpy,
+    finalizeEmbeddableCreation: () => {
+      act(() => {
+        deferEmbeddableCreate.resolve(dashboardContainer);
+      });
+    },
+  };
+};
+
+const renderDashboardAppStateHook = ({
+  partialProps,
+  partialServices,
+}: {
+  partialProps?: Partial<UseDashboardStateProps>;
+  partialServices?: Partial<DashboardAppServices>;
+}): RenderDashboardStateHookReturn => {
+  const props = { ...createDashboardAppStateProps(), ...(partialProps ?? {}) };
+  const services = { ...createDashboardAppStateServices(), ...(partialServices ?? {}) };
+  const embeddableFactoryResult = setupEmbeddableFactory(services, originalDashboardEmbeddableId);
+  const renderHookResult = renderHook(
+    (replaceProps: Partial<UseDashboardStateProps>) =>
+      useDashboardAppState({ ...props, ...replaceProps }),
+    {
+      wrapper: ({ children }) => (
+        <Provider store={dashboardStateStore}>
+          <KibanaContextProvider services={services}>{children}</KibanaContextProvider>
+        </Provider>
+      ),
+    }
+  );
+  return { embeddableFactoryResult, renderHookResult, services, props };
+};
+
+describe('Dashboard container lifecycle', () => {
+  test('Dashboard container is destroyed on unmount', async () => {
+    const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({});
+    embeddableFactoryResult.finalizeEmbeddableCreation();
+    await renderHookResult.waitForNextUpdate();
+
+    expect(embeddableFactoryResult.dashboardContainer).toBe(
+      renderHookResult.result.current.dashboardContainer
+    );
+    expect(embeddableFactoryResult.dashboardDestroySpy).not.toBeCalled();
+    renderHookResult.unmount();
+    expect(embeddableFactoryResult.dashboardDestroySpy).toBeCalled();
+  });
+
+  test('Old dashboard container is destroyed when new dashboardId is given', async () => {
+    const { renderHookResult, embeddableFactoryResult, services } = renderDashboardAppStateHook({});
+    const getResult = () => renderHookResult.result.current;
+
+    // on initial render dashboard container is undefined
+    expect(getResult().dashboardContainer).toBeUndefined();
+    embeddableFactoryResult.finalizeEmbeddableCreation();
+
+    await renderHookResult.waitForNextUpdate();
+    expect(embeddableFactoryResult.dashboardContainer).toBe(getResult().dashboardContainer);
+    expect(embeddableFactoryResult.dashboardDestroySpy).not.toBeCalled();
+
+    const newDashboardId = 'wow_a_new_dashboard_id';
+    const embeddableFactoryNew = setupEmbeddableFactory(services, newDashboardId);
+    renderHookResult.rerender({ savedDashboardId: newDashboardId });
+
+    embeddableFactoryNew.finalizeEmbeddableCreation();
+    await renderHookResult.waitForNextUpdate();
+
+    expect(embeddableFactoryNew.dashboardContainer).toEqual(getResult().dashboardContainer);
+    expect(embeddableFactoryNew.dashboardDestroySpy).not.toBeCalled();
+    expect(embeddableFactoryResult.dashboardDestroySpy).toBeCalled();
+  });
+
+  test('Dashboard container is destroyed if dashboard id is changed before container is resolved', async () => {
+    const { renderHookResult, embeddableFactoryResult, services } = renderDashboardAppStateHook({});
+    const getResult = () => renderHookResult.result.current;
+
+    // on initial render dashboard container is undefined
+    expect(getResult().dashboardContainer).toBeUndefined();
+    await act(() => Promise.resolve()); // wait for the original savedDashboard to be loaded...
+
+    const newDashboardId = 'wow_a_new_dashboard_id';
+    const embeddableFactoryNew = setupEmbeddableFactory(services, newDashboardId);
+
+    renderHookResult.rerender({ savedDashboardId: newDashboardId });
+    await act(() => Promise.resolve()); // wait for the new savedDashboard to be loaded...
+    embeddableFactoryNew.finalizeEmbeddableCreation();
+    await renderHookResult.waitForNextUpdate();
+    expect(embeddableFactoryNew.dashboardContainer).toBe(getResult().dashboardContainer);
+    expect(embeddableFactoryNew.dashboardDestroySpy).not.toBeCalled();
+
+    embeddableFactoryResult.finalizeEmbeddableCreation();
+    await act(() => Promise.resolve()); // Can't use waitFor from hooks, because there is no hook update
+    expect(embeddableFactoryNew.dashboardContainer).toBe(getResult().dashboardContainer);
+    expect(embeddableFactoryNew.dashboardDestroySpy).not.toBeCalled();
+    expect(embeddableFactoryResult.dashboardDestroySpy).toBeCalled();
+  });
+});
+
+describe('Dashboard initial state', () => {
+  it('Extracts state from Dashboard Saved Object', async () => {
+    const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({});
+    const getResult = () => renderHookResult.result.current;
+
+    // saved dashboard isn't applied until after the dashboard embeddable has been created.
+    expect(getResult().savedDashboard).toBeUndefined();
+
+    embeddableFactoryResult.finalizeEmbeddableCreation();
+    await renderHookResult.waitForNextUpdate();
+
+    expect(getResult().savedDashboard).toBeDefined();
+    expect(getResult().savedDashboard?.title).toEqual(
+      getResult().getLatestDashboardState?.().title
+    );
+  });
+
+  it('Sets initial time range and filters from saved dashboard', async () => {
+    const savedDashboards = {} as SavedObjectLoader;
+    savedDashboards.get = jest.fn().mockImplementation((id?: string) =>
+      Promise.resolve(
+        getSavedDashboardMock({
+          getFilters: () => [({ meta: { test: 'filterMeTimbers' } } as unknown) as Filter],
+          timeRestore: true,
+          timeFrom: 'now-13d',
+          timeTo: 'now',
+          id,
+        })
+      )
+    );
+    const partialServices: Partial<DashboardAppServices> = { savedDashboards };
+    const { renderHookResult, embeddableFactoryResult, services } = renderDashboardAppStateHook({
+      partialServices,
+    });
+    const getResult = () => renderHookResult.result.current;
+
+    embeddableFactoryResult.finalizeEmbeddableCreation();
+    await renderHookResult.waitForNextUpdate();
+
+    expect(getResult().getLatestDashboardState?.().timeRestore).toEqual(true);
+    expect(services.data.query.timefilter.timefilter.setTime).toHaveBeenCalledWith({
+      from: 'now-13d',
+      to: 'now',
+    });
+    expect(services.data.query.filterManager.setAppFilters).toHaveBeenCalledWith([
+      ({ meta: { test: 'filterMeTimbers' } } as unknown) as Filter,
+    ]);
+  });
+
+  it('Combines session state and URL state into initial state', async () => {
+    const dashboardSessionStorage = ({
+      getState: jest
+        .fn()
+        .mockReturnValue({ viewMode: ViewMode.EDIT, description: 'this should be overwritten' }),
+    } as unknown) as DashboardSessionStorage;
+    const kbnUrlStateStorage = createKbnUrlStateStorage();
+    kbnUrlStateStorage.set('_a', { description: 'with this' });
+    const { renderHookResult, embeddableFactoryResult } = renderDashboardAppStateHook({
+      partialProps: { kbnUrlStateStorage },
+      partialServices: { dashboardSessionStorage },
+    });
+    const getResult = () => renderHookResult.result.current;
+
+    embeddableFactoryResult.finalizeEmbeddableCreation();
+    await renderHookResult.waitForNextUpdate();
+    expect(getResult().getLatestDashboardState?.().description).toEqual('with this');
+    expect(getResult().getLatestDashboardState?.().viewMode).toEqual(ViewMode.EDIT);
+  });
+});
+
+describe('Dashboard state sync', () => {
+  let defaultDashboardAppStateHookResult: RenderDashboardStateHookReturn;
+  const getResult = () => defaultDashboardAppStateHookResult.renderHookResult.result.current;
+
+  beforeEach(async () => {
+    DashboardConstants.CHANGE_APPLY_DEBOUNCE = 0;
+    DashboardConstants.CHANGE_CHECK_DEBOUNCE = 0;
+    defaultDashboardAppStateHookResult = renderDashboardAppStateHook({});
+    defaultDashboardAppStateHookResult.embeddableFactoryResult.finalizeEmbeddableCreation();
+    await defaultDashboardAppStateHookResult.renderHookResult.waitForNextUpdate();
+  });
+
+  it('Updates Dashboard container input when state changes', async () => {
+    const { embeddableFactoryResult } = defaultDashboardAppStateHookResult;
+    embeddableFactoryResult.dashboardContainer.updateInput = jest.fn();
+    act(() => {
+      dashboardStateStore.dispatch(setDescription('Well hello there new description'));
+    });
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 3)); // So that $triggerDashboardRefresh.next is called
+    });
+    expect(embeddableFactoryResult.dashboardContainer.updateInput).toHaveBeenCalledWith(
+      expect.objectContaining({ description: 'Well hello there new description' })
+    );
+  });
+
+  it('Updates state when dashboard container input changes', async () => {
+    const { embeddableFactoryResult } = defaultDashboardAppStateHookResult;
+    expect(getResult().getLatestDashboardState?.().fullScreenMode).toBe(false);
+    act(() => {
+      embeddableFactoryResult.dashboardContainer.updateInput({
+        isFullScreenMode: true,
+      });
+    });
+    await act(() => Promise.resolve());
+    expect(getResult().getLatestDashboardState?.().fullScreenMode).toBe(true);
+  });
+
+  it('pushes unsaved changes to the session storage', async () => {
+    const { services } = defaultDashboardAppStateHookResult;
+    expect(getResult().getLatestDashboardState?.().fullScreenMode).toBe(false);
+    act(() => {
+      dashboardStateStore.dispatch(setViewMode(ViewMode.EDIT)); // session storage is only populated in edit mode
+      dashboardStateStore.dispatch(setDescription('Wow an even cooler description.'));
+    });
+    await act(async () => {
+      await new Promise((resolve) => setTimeout(resolve, 3));
+    });
+    expect(services.dashboardSessionStorage.setState).toHaveBeenCalledWith(
+      'testDashboardId',
+      expect.objectContaining({
+        description: 'Wow an even cooler description.',
+        viewMode: ViewMode.EDIT,
+      })
+    );
+  });
+});
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
new file mode 100644
index 0000000000000..e9a5275300ffe
--- /dev/null
+++ b/src/plugins/dashboard/public/application/hooks/use_dashboard_app_state.ts
@@ -0,0 +1,351 @@
+/*
+ * Copyright 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 _ from 'lodash';
+import { History } from 'history';
+import { debounceTime } from 'rxjs/operators';
+import { useCallback, useEffect, useMemo, useState } from 'react';
+import { BehaviorSubject, combineLatest, Subject } from 'rxjs';
+
+import { DashboardConstants } from '../..';
+import { ViewMode } from '../../services/embeddable';
+import { useKibana } from '../../services/kibana_react';
+import { getNewDashboardTitle } from '../../dashboard_strings';
+import { IKbnUrlStateStorage } from '../../services/kibana_utils';
+import { setDashboardState, useDashboardDispatch, useDashboardSelector } from '../state';
+import {
+  DashboardBuildContext,
+  DashboardAppServices,
+  DashboardAppState,
+  DashboardRedirect,
+  DashboardState,
+} from '../../types';
+import {
+  tryDestroyDashboardContainer,
+  syncDashboardContainerInput,
+  savedObjectToDashboardState,
+  syncDashboardIndexPatterns,
+  syncDashboardFilterState,
+  loadSavedDashboardState,
+  buildDashboardContainer,
+  loadDashboardUrlState,
+  diffDashboardState,
+  areTimeRangesEqual,
+} from '../lib';
+
+export interface UseDashboardStateProps {
+  history: History;
+  savedDashboardId?: string;
+  redirectTo: DashboardRedirect;
+  isEmbeddedExternally: boolean;
+  kbnUrlStateStorage: IKbnUrlStateStorage;
+}
+
+export const useDashboardAppState = ({
+  history,
+  redirectTo,
+  savedDashboardId,
+  kbnUrlStateStorage,
+  isEmbeddedExternally,
+}: UseDashboardStateProps) => {
+  const dispatchDashboardStateChange = useDashboardDispatch();
+  const dashboardState = useDashboardSelector((state) => state.dashboardStateReducer);
+
+  /**
+   *  Dashboard app state is the return value for this hook and contains interaction points that the rest of the app can use
+   * to read or manipulate dashboard state.
+   */
+  const [dashboardAppState, setDashboardAppState] = useState<DashboardAppState>(() => ({
+    $onDashboardStateChange: new BehaviorSubject({} as DashboardState),
+    $triggerDashboardRefresh: new Subject<{ force?: boolean }>(),
+  }));
+
+  /**
+   *  Last saved state is diffed against the current dashboard state any time either changes. This is used to set the
+   * unsaved changes portion of the dashboardAppState.
+   */
+  const [lastSavedState, setLastSavedState] = useState<DashboardState>();
+  const $onLastSavedStateChange = useMemo(() => new Subject<DashboardState>(), []);
+
+  /**
+   * Unpack services
+   */
+  const services = useKibana<DashboardAppServices>().services;
+  const {
+    data,
+    core,
+    chrome,
+    embeddable,
+    indexPatterns,
+    usageCollection,
+    savedDashboards,
+    initializerContext,
+    savedObjectsTagging,
+    dashboardCapabilities,
+    dashboardSessionStorage,
+  } = services;
+  const { docTitle } = chrome;
+  const { notifications } = core;
+  const { query, search } = data;
+  const { getStateTransfer } = embeddable;
+  const { version: kibanaVersion } = initializerContext.env.packageInfo;
+
+  /**
+   * This useEffect triggers when the dashboard ID changes, and is in charge of loading the saved dashboard,
+   * fetching the initial state, building the Dashboard Container embeddable, and setting up all state syncing.
+   */
+  useEffect(() => {
+    // fetch incoming embeddable from state transfer service.
+    const incomingEmbeddable = getStateTransfer().getIncomingEmbeddablePackage(
+      DashboardConstants.DASHBOARDS_ID,
+      true
+    );
+
+    let canceled = false;
+    let onDestroy: () => void;
+
+    /**
+     * The dashboard build context is a collection of all of the services and props required in subsequent steps to build the dashboard
+     * from the dashboardId. This build context doesn't contain any extrenuous services.
+     */
+    const dashboardBuildContext: DashboardBuildContext = {
+      query,
+      search,
+      history,
+      embeddable,
+      indexPatterns,
+      notifications,
+      kibanaVersion,
+      savedDashboards,
+      kbnUrlStateStorage,
+      initializerContext,
+      isEmbeddedExternally,
+      dashboardCapabilities,
+      dispatchDashboardStateChange,
+      $checkForUnsavedChanges: new Subject(),
+      $onDashboardStateChange: dashboardAppState.$onDashboardStateChange,
+      $triggerDashboardRefresh: dashboardAppState.$triggerDashboardRefresh,
+      getLatestDashboardState: () => dashboardAppState.$onDashboardStateChange.value,
+    };
+
+    (async () => {
+      /**
+       * Load and unpack state from dashboard saved object.
+       */
+      const loadSavedDashboardResult = await loadSavedDashboardState({
+        ...dashboardBuildContext,
+        savedDashboardId,
+      });
+      if (canceled || !loadSavedDashboardResult) return;
+      const { savedDashboard, savedDashboardState } = loadSavedDashboardResult;
+
+      /**
+       * Combine initial state from the saved object, session storage, and URL, then dispatch it to Redux.
+       */
+      const dashboardSessionStorageState = dashboardSessionStorage.getState(savedDashboardId) || {};
+      const dashboardURLState = loadDashboardUrlState(dashboardBuildContext);
+      const initialDashboardState = {
+        ...savedDashboardState,
+        ...dashboardSessionStorageState,
+        ...dashboardURLState,
+
+        // if there is an incoming embeddable, dashboard always needs to be in edit mode to receive it.
+        ...(incomingEmbeddable ? { viewMode: ViewMode.EDIT } : {}),
+      };
+      dispatchDashboardStateChange(setDashboardState(initialDashboardState));
+
+      /**
+       * Start syncing dashboard state with the Query, Filters and Timepicker from the Query Service.
+       */
+      const { applyFilters, stopSyncingDashboardFilterState } = syncDashboardFilterState({
+        ...dashboardBuildContext,
+        initialDashboardState,
+        savedDashboard,
+      });
+
+      /**
+       * Build the dashboard container embeddable, and apply the incoming embeddable if it exists.
+       */
+      const dashboardContainer = await buildDashboardContainer({
+        ...dashboardBuildContext,
+        initialDashboardState,
+        incomingEmbeddable,
+        savedDashboard,
+        data,
+      });
+      if (canceled || !dashboardContainer) {
+        tryDestroyDashboardContainer(dashboardContainer);
+        return;
+      }
+
+      /**
+       * Start syncing index patterns between the Query Service and the Dashboard Container.
+       */
+      const indexPatternsSubscription = syncDashboardIndexPatterns({
+        dashboardContainer,
+        indexPatterns: dashboardBuildContext.indexPatterns,
+        onUpdateIndexPatterns: (newIndexPatterns) =>
+          setDashboardAppState((s) => ({ ...s, indexPatterns: newIndexPatterns })),
+      });
+
+      /**
+       * Set up the two way syncing between the Dashboard Container and the Redux Store.
+       */
+      const stopSyncingContainerInput = syncDashboardContainerInput({
+        ...dashboardBuildContext,
+        dashboardContainer,
+        savedDashboard,
+        applyFilters,
+      });
+
+      /**
+       * Any time the redux state, or the last saved state changes, compare them, set the unsaved
+       * changes state, and and push the unsaved changes to session storage.
+       */
+      const { timefilter } = dashboardBuildContext.query.timefilter;
+      const lastSavedSubscription = combineLatest([
+        $onLastSavedStateChange,
+        dashboardAppState.$onDashboardStateChange,
+        dashboardBuildContext.$checkForUnsavedChanges,
+      ])
+        .pipe(debounceTime(DashboardConstants.CHANGE_CHECK_DEBOUNCE))
+        .subscribe((states) => {
+          const [lastSaved, current] = states;
+          const unsavedChanges =
+            current.viewMode === ViewMode.EDIT ? diffDashboardState(lastSaved, current) : {};
+
+          if (current.viewMode === ViewMode.EDIT) {
+            const savedTimeChanged =
+              lastSaved.timeRestore &&
+              !areTimeRangesEqual(
+                {
+                  from: savedDashboard?.timeFrom,
+                  to: savedDashboard?.timeTo,
+                },
+                timefilter.getTime()
+              );
+            const hasUnsavedChanges = Object.keys(unsavedChanges).length > 0 || savedTimeChanged;
+            setDashboardAppState((s) => ({ ...s, hasUnsavedChanges }));
+          }
+
+          unsavedChanges.viewMode = current.viewMode; // always push view mode into session store.
+          dashboardSessionStorage.setState(savedDashboardId, unsavedChanges);
+        });
+
+      /**
+       * initialize the last saved state, and build a callback which can be used to update
+       * the last saved state on save.
+       */
+      setLastSavedState(savedDashboardState);
+      dashboardBuildContext.$checkForUnsavedChanges.next();
+      const updateLastSavedState = () => {
+        setLastSavedState(
+          savedObjectToDashboardState({
+            hideWriteControls: dashboardBuildContext.dashboardCapabilities.hideWriteControls,
+            version: dashboardBuildContext.kibanaVersion,
+            savedObjectsTagging,
+            usageCollection,
+            savedDashboard,
+          })
+        );
+      };
+
+      /**
+       * Apply changes to the dashboard app state, and set the document title
+       */
+      docTitle.change(savedDashboardState.title || getNewDashboardTitle());
+      setDashboardAppState((s) => ({
+        ...s,
+        applyFilters,
+        savedDashboard,
+        dashboardContainer,
+        updateLastSavedState,
+        getLatestDashboardState: dashboardBuildContext.getLatestDashboardState,
+      }));
+
+      onDestroy = () => {
+        stopSyncingContainerInput();
+        stopSyncingDashboardFilterState();
+        lastSavedSubscription.unsubscribe();
+        indexPatternsSubscription.unsubscribe();
+        tryDestroyDashboardContainer(dashboardContainer);
+        setDashboardAppState((state) => ({
+          ...state,
+          dashboardContainer: undefined,
+        }));
+      };
+    })();
+    return () => {
+      canceled = true;
+      onDestroy?.();
+    };
+  }, [
+    dashboardAppState.$triggerDashboardRefresh,
+    dashboardAppState.$onDashboardStateChange,
+    dispatchDashboardStateChange,
+    $onLastSavedStateChange,
+    dashboardSessionStorage,
+    dashboardCapabilities,
+    isEmbeddedExternally,
+    kbnUrlStateStorage,
+    savedObjectsTagging,
+    initializerContext,
+    savedDashboardId,
+    getStateTransfer,
+    savedDashboards,
+    usageCollection,
+    notifications,
+    indexPatterns,
+    kibanaVersion,
+    embeddable,
+    docTitle,
+    history,
+    search,
+    query,
+    data,
+  ]);
+
+  /**
+   *  rebuild reset to last saved state callback whenever last saved state changes
+   */
+  const resetToLastSavedState = useCallback(() => {
+    if (
+      !lastSavedState ||
+      !dashboardAppState.savedDashboard ||
+      !dashboardAppState.getLatestDashboardState
+    ) {
+      return;
+    }
+
+    if (dashboardAppState.getLatestDashboardState().timeRestore) {
+      const { timefilter } = data.query.timefilter;
+      const { timeFrom: from, timeTo: to, refreshInterval } = dashboardAppState.savedDashboard;
+      if (from && to) timefilter.setTime({ from, to });
+      if (refreshInterval) timefilter.setRefreshInterval(refreshInterval);
+    }
+    dispatchDashboardStateChange(setDashboardState(lastSavedState));
+  }, [lastSavedState, dashboardAppState, data.query.timefilter, dispatchDashboardStateChange]);
+
+  /**
+   *  publish state to the state change observable when redux state changes
+   */
+  useEffect(() => {
+    if (!dashboardState || Object.keys(dashboardState).length === 0) return;
+    dashboardAppState.$onDashboardStateChange.next(dashboardState);
+  }, [dashboardAppState.$onDashboardStateChange, dashboardState]);
+
+  /**
+   * push last saved state to the state change observable when last saved state changes
+   */
+  useEffect(() => {
+    if (!lastSavedState) return;
+    $onLastSavedStateChange.next(lastSavedState);
+  }, [$onLastSavedStateChange, lastSavedState]);
+
+  return { ...dashboardAppState, resetToLastSavedState };
+};
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_breadcrumbs.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_breadcrumbs.ts
deleted file mode 100644
index 50465cc4ab58b..0000000000000
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_breadcrumbs.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 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 { useEffect } from 'react';
-import _ from 'lodash';
-
-import { useKibana } from '../../services/kibana_react';
-
-import { DashboardStateManager } from '../dashboard_state_manager';
-import { getDashboardBreadcrumb, getDashboardTitle } from '../../dashboard_strings';
-import { DashboardAppServices, DashboardRedirect } from '../types';
-
-export const useDashboardBreadcrumbs = (
-  dashboardStateManager: DashboardStateManager | null,
-  redirectTo: DashboardRedirect
-) => {
-  const { data, core, chrome } = useKibana<DashboardAppServices>().services;
-
-  // Destructure and rename services; makes the Effect hook more specific, makes later
-  // abstraction of service dependencies easier.
-  const { setBreadcrumbs } = chrome;
-  const { timefilter } = data.query.timefilter;
-  const { openConfirm } = core.overlays;
-
-  // Sync breadcrumbs when Dashboard State Manager changes
-  useEffect(() => {
-    if (!dashboardStateManager) {
-      return;
-    }
-
-    setBreadcrumbs([
-      {
-        text: getDashboardBreadcrumb(),
-        'data-test-subj': 'dashboardListingBreadcrumb',
-        onClick: () => {
-          redirectTo({ destination: 'listing' });
-        },
-      },
-      {
-        text: getDashboardTitle(
-          dashboardStateManager.getTitle(),
-          dashboardStateManager.getViewMode(),
-          dashboardStateManager.isNew()
-        ),
-      },
-    ]);
-  }, [dashboardStateManager, timefilter, openConfirm, redirectTo, setBreadcrumbs]);
-};
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_container.test.tsx b/src/plugins/dashboard/public/application/hooks/use_dashboard_container.test.tsx
deleted file mode 100644
index b2fc7c917d285..0000000000000
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_container.test.tsx
+++ /dev/null
@@ -1,199 +0,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 { useDashboardContainer } from './use_dashboard_container';
-import { renderHook, act } from '@testing-library/react-hooks';
-import { KibanaContextProvider } from '../../../../kibana_react/public';
-import React from 'react';
-import { DashboardStateManager } from '../dashboard_state_manager';
-import { getSavedDashboardMock } from '../test_helpers';
-import { createKbnUrlStateStorage, defer } from '../../../../kibana_utils/public';
-import { createBrowserHistory } from 'history';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
-import { DashboardCapabilities } from '../types';
-import { EmbeddableFactory } from '../../../../embeddable/public';
-import { HelloWorldEmbeddable } from '../../../../embeddable/public/tests/fixtures';
-import { DashboardContainer } from '../embeddable';
-import { coreMock } from 'src/core/public/mocks';
-
-const savedDashboard = getSavedDashboardMock();
-
-// TS is *very* picky with type guards / predicates. can't just use jest.fn()
-function mockHasTaggingCapabilities(obj: any): obj is any {
-  return false;
-}
-
-const history = createBrowserHistory();
-const createDashboardState = () =>
-  new DashboardStateManager({
-    savedDashboard,
-    kibanaVersion: '7.0.0',
-    hideWriteControls: false,
-    allowByValueEmbeddables: false,
-    history: createBrowserHistory(),
-    hasPendingEmbeddable: () => false,
-    kbnUrlStateStorage: createKbnUrlStateStorage(),
-    hasTaggingCapabilities: mockHasTaggingCapabilities,
-    toasts: coreMock.createStart().notifications.toasts,
-  });
-
-const defaultCapabilities: DashboardCapabilities = {
-  show: false,
-  createNew: false,
-  saveQuery: false,
-  createShortUrl: false,
-  hideWriteControls: true,
-  mapsCapabilities: { save: false },
-  visualizeCapabilities: { save: false },
-  storeSearchSession: true,
-};
-
-const getIncomingEmbeddable = () => undefined;
-
-const services = {
-  dashboardCapabilities: defaultCapabilities,
-  data: dataPluginMock.createStartContract(),
-  embeddable: embeddablePluginMock.createStartContract(),
-  scopedHistory: history,
-};
-
-const setupEmbeddableFactory = () => {
-  const embeddable = new HelloWorldEmbeddable({ id: 'id' });
-  const deferEmbeddableCreate = defer();
-  services.embeddable.getEmbeddableFactory.mockImplementation(
-    () =>
-      (({
-        create: () => deferEmbeddableCreate.promise,
-      } as unknown) as EmbeddableFactory)
-  );
-  const destroySpy = jest.spyOn(embeddable, 'destroy');
-
-  return {
-    destroySpy,
-    embeddable,
-    createEmbeddable: () => {
-      act(() => {
-        deferEmbeddableCreate.resolve(embeddable);
-      });
-    },
-  };
-};
-
-test('container is destroyed on unmount', async () => {
-  const { createEmbeddable, destroySpy, embeddable } = setupEmbeddableFactory();
-
-  const dashboardStateManager = createDashboardState();
-  const { result, unmount, waitForNextUpdate } = renderHook(
-    () =>
-      useDashboardContainer({
-        getIncomingEmbeddable,
-        dashboardStateManager,
-        history,
-      }),
-    {
-      wrapper: ({ children }) => (
-        <KibanaContextProvider services={services}>{children}</KibanaContextProvider>
-      ),
-    }
-  );
-
-  expect(result.current).toBeNull(); // null on initial render
-
-  createEmbeddable();
-
-  await waitForNextUpdate();
-
-  expect(embeddable).toBe(result.current);
-  expect(destroySpy).not.toBeCalled();
-
-  unmount();
-
-  expect(destroySpy).toBeCalled();
-});
-
-test('old container is destroyed on new dashboardStateManager', async () => {
-  const embeddableFactoryOld = setupEmbeddableFactory();
-
-  const { result, waitForNextUpdate, rerender } = renderHook<
-    DashboardStateManager,
-    DashboardContainer | null
-  >(
-    (dashboardStateManager) =>
-      useDashboardContainer({
-        getIncomingEmbeddable,
-        dashboardStateManager,
-        history,
-      }),
-    {
-      wrapper: ({ children }) => (
-        <KibanaContextProvider services={services}>{children}</KibanaContextProvider>
-      ),
-      initialProps: createDashboardState(),
-    }
-  );
-
-  expect(result.current).toBeNull(); // null on initial render
-
-  embeddableFactoryOld.createEmbeddable();
-
-  await waitForNextUpdate();
-
-  expect(embeddableFactoryOld.embeddable).toBe(result.current);
-  expect(embeddableFactoryOld.destroySpy).not.toBeCalled();
-
-  const embeddableFactoryNew = setupEmbeddableFactory();
-  rerender(createDashboardState());
-
-  embeddableFactoryNew.createEmbeddable();
-
-  await waitForNextUpdate();
-
-  expect(embeddableFactoryNew.embeddable).toBe(result.current);
-
-  expect(embeddableFactoryNew.destroySpy).not.toBeCalled();
-  expect(embeddableFactoryOld.destroySpy).toBeCalled();
-});
-
-test('destroyed if rerendered before resolved', async () => {
-  const embeddableFactoryOld = setupEmbeddableFactory();
-
-  const { result, waitForNextUpdate, rerender } = renderHook<
-    DashboardStateManager,
-    DashboardContainer | null
-  >(
-    (dashboardStateManager) =>
-      useDashboardContainer({
-        getIncomingEmbeddable,
-        dashboardStateManager,
-        history,
-      }),
-    {
-      wrapper: ({ children }) => (
-        <KibanaContextProvider services={services}>{children}</KibanaContextProvider>
-      ),
-      initialProps: createDashboardState(),
-    }
-  );
-
-  expect(result.current).toBeNull(); // null on initial render
-
-  const embeddableFactoryNew = setupEmbeddableFactory();
-  rerender(createDashboardState());
-  embeddableFactoryNew.createEmbeddable();
-  await waitForNextUpdate();
-  expect(embeddableFactoryNew.embeddable).toBe(result.current);
-  expect(embeddableFactoryNew.destroySpy).not.toBeCalled();
-
-  embeddableFactoryOld.createEmbeddable();
-
-  await act(() => Promise.resolve()); // Can't use waitFor from hooks, because there is no hook update
-  expect(embeddableFactoryNew.embeddable).toBe(result.current);
-  expect(embeddableFactoryNew.destroySpy).not.toBeCalled();
-  expect(embeddableFactoryOld.destroySpy).toBeCalled();
-});
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts
deleted file mode 100644
index d715fb70ec91a..0000000000000
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_container.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { useEffect, useState } from 'react';
-import { History } from 'history';
-
-import { useKibana } from '../../services/kibana_react';
-import {
-  ContainerOutput,
-  EmbeddableFactoryNotFoundError,
-  EmbeddableInput,
-  EmbeddablePackageState,
-  ErrorEmbeddable,
-  isErrorEmbeddable,
-  ViewMode,
-} from '../../services/embeddable';
-
-import { DashboardStateManager } from '../dashboard_state_manager';
-import { getDashboardContainerInput, getSearchSessionIdFromURL } from '../dashboard_app_functions';
-import { DashboardContainer, DashboardContainerInput } from '../..';
-import { DashboardAppServices } from '../types';
-import { DASHBOARD_CONTAINER_TYPE } from '..';
-import { TimefilterContract } from '../../services/data';
-
-export const useDashboardContainer = ({
-  history,
-  timeFilter,
-  setUnsavedChanges,
-  getIncomingEmbeddable,
-  dashboardStateManager,
-  isEmbeddedExternally,
-}: {
-  history: History;
-  isEmbeddedExternally?: boolean;
-  timeFilter?: TimefilterContract;
-  setUnsavedChanges?: (dirty: boolean) => void;
-  dashboardStateManager: DashboardStateManager | null;
-  getIncomingEmbeddable: (removeAfterFetch?: boolean) => EmbeddablePackageState | undefined;
-}) => {
-  const {
-    dashboardCapabilities,
-    data,
-    embeddable,
-    scopedHistory,
-  } = useKibana<DashboardAppServices>().services;
-
-  // Destructure and rename services; makes the Effect hook more specific, makes later
-  // abstraction of service dependencies easier.
-  const { query } = data;
-  const { session: searchSession } = data.search;
-
-  const [dashboardContainer, setDashboardContainer] = useState<DashboardContainer | null>(null);
-
-  useEffect(() => {
-    if (!dashboardStateManager) {
-      return;
-    }
-
-    // Load dashboard container
-    const dashboardFactory = embeddable.getEmbeddableFactory<
-      DashboardContainerInput,
-      ContainerOutput,
-      DashboardContainer
-    >(DASHBOARD_CONTAINER_TYPE);
-
-    if (!dashboardFactory) {
-      throw new EmbeddableFactoryNotFoundError(
-        'dashboard app requires dashboard embeddable factory'
-      );
-    }
-
-    const searchSessionIdFromURL = getSearchSessionIdFromURL(history);
-
-    if (searchSessionIdFromURL) {
-      searchSession.restore(searchSessionIdFromURL);
-    }
-
-    const incomingEmbeddable = getIncomingEmbeddable(true);
-
-    let canceled = false;
-    let pendingContainer: DashboardContainer | ErrorEmbeddable | null | undefined;
-    (async function createContainer() {
-      const existingSession = searchSession.getSessionId();
-      pendingContainer = await dashboardFactory.create(
-        getDashboardContainerInput({
-          isEmbeddedExternally: Boolean(isEmbeddedExternally),
-          dashboardCapabilities,
-          dashboardStateManager,
-          incomingEmbeddable,
-          query,
-          searchSessionId:
-            searchSessionIdFromURL ??
-            (existingSession && incomingEmbeddable ? existingSession : searchSession.start()),
-        })
-      );
-
-      // already new container is being created
-      // no longer interested in the pending one
-      if (canceled) {
-        try {
-          pendingContainer?.destroy();
-          pendingContainer = null;
-        } catch (e) {
-          // destroy could throw if something has already destroyed the container
-          // eslint-disable-next-line no-console
-          console.warn(e);
-        }
-
-        return;
-      }
-
-      if (!pendingContainer || isErrorEmbeddable(pendingContainer)) {
-        return;
-      }
-
-      // inject switch view mode callback for the empty screen to use
-      pendingContainer.switchViewMode = (newViewMode: ViewMode) =>
-        dashboardStateManager.switchViewMode(newViewMode);
-
-      // If the incoming embeddable is newly created, or doesn't exist in the current panels list,
-      // add it with `addNewEmbeddable`
-      if (
-        incomingEmbeddable &&
-        (!incomingEmbeddable?.embeddableId ||
-          (incomingEmbeddable.embeddableId &&
-            !pendingContainer.getInput().panels[incomingEmbeddable.embeddableId]))
-      ) {
-        pendingContainer.addNewEmbeddable<EmbeddableInput>(
-          incomingEmbeddable.type,
-          incomingEmbeddable.input
-        );
-      }
-      setDashboardContainer(pendingContainer);
-      setUnsavedChanges?.(dashboardStateManager.getIsDirty(data.query.timefilter.timefilter));
-    })();
-    return () => {
-      canceled = true;
-      try {
-        pendingContainer?.destroy();
-      } catch (e) {
-        // destroy could throw if something has already destroyed the container
-        // eslint-disable-next-line no-console
-        console.warn(e);
-      }
-
-      setDashboardContainer(null);
-    };
-  }, [
-    data.query.timefilter.timefilter,
-    dashboardCapabilities,
-    dashboardStateManager,
-    getIncomingEmbeddable,
-    isEmbeddedExternally,
-    setUnsavedChanges,
-    searchSession,
-    scopedHistory,
-    timeFilter,
-    embeddable,
-    history,
-    query,
-  ]);
-
-  return dashboardContainer;
-};
diff --git a/src/plugins/dashboard/public/application/hooks/use_dashboard_state_manager.ts b/src/plugins/dashboard/public/application/hooks/use_dashboard_state_manager.ts
deleted file mode 100644
index 72b43723f07fb..0000000000000
--- a/src/plugins/dashboard/public/application/hooks/use_dashboard_state_manager.ts
+++ /dev/null
@@ -1,220 +0,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 { useEffect, useState } from 'react';
-import { History } from 'history';
-import _ from 'lodash';
-import { map } from 'rxjs/operators';
-
-import { createKbnUrlStateStorage, withNotifyOnErrors } from '../../services/kibana_utils';
-import { useKibana } from '../../services/kibana_react';
-import {
-  connectToQueryState,
-  esFilters,
-  noSearchSessionStorageCapabilityMessage,
-  QueryState,
-  syncQueryStateWithUrl,
-} from '../../services/data';
-import { SavedObject } from '../../services/saved_objects';
-import type { TagDecoratedSavedObject } from '../../services/saved_objects_tagging_oss';
-
-import { DashboardSavedObject } from '../../saved_dashboards';
-import { migrateLegacyQuery } from '../lib/migrate_legacy_query';
-import { createSessionRestorationDataProvider } from '../lib/session_restoration';
-import { DashboardStateManager } from '../dashboard_state_manager';
-import { getDashboardTitle } from '../../dashboard_strings';
-import { DashboardAppServices } from '../types';
-import { EmbeddablePackageState, ViewMode } from '../../services/embeddable';
-
-// TS is picky with type guards, we can't just inline `() => false`
-function defaultTaggingGuard(_obj: SavedObject): _obj is TagDecoratedSavedObject {
-  return false;
-}
-
-interface DashboardStateManagerReturn {
-  dashboardStateManager: DashboardStateManager | null;
-  viewMode: ViewMode | null;
-  setViewMode: (value: ViewMode) => void;
-}
-
-export const useDashboardStateManager = (
-  savedDashboard: DashboardSavedObject | null,
-  history: History,
-  getIncomingEmbeddable: () => EmbeddablePackageState | undefined
-): DashboardStateManagerReturn => {
-  const {
-    data: dataPlugin,
-    core,
-    uiSettings,
-    usageCollection,
-    initializerContext,
-    savedObjectsTagging,
-    dashboardCapabilities,
-    dashboardPanelStorage,
-    allowByValueEmbeddables,
-  } = useKibana<DashboardAppServices>().services;
-
-  // Destructure and rename services; makes the Effect hook more specific, makes later
-  // abstraction of service dependencies easier.
-  const { query: queryService } = dataPlugin;
-  const { session: searchSession } = dataPlugin.search;
-  const { filterManager, queryString: queryStringManager } = queryService;
-  const { timefilter } = queryService.timefilter;
-  const { toasts } = core.notifications;
-  const { hideWriteControls } = dashboardCapabilities;
-  const { version: kibanaVersion } = initializerContext.env.packageInfo;
-
-  const [dashboardStateManager, setDashboardStateManager] = useState<DashboardStateManager | null>(
-    null
-  );
-  const [viewMode, setViewMode] = useState<ViewMode | null>(null);
-
-  const hasTaggingCapabilities = savedObjectsTagging?.ui.hasTagDecoration || defaultTaggingGuard;
-
-  useEffect(() => {
-    if (!savedDashboard) {
-      return;
-    }
-
-    const kbnUrlStateStorage = createKbnUrlStateStorage({
-      history,
-      useHash: uiSettings.get('state:storeInSessionStorage'),
-      ...withNotifyOnErrors(toasts),
-    });
-
-    const stateManager = new DashboardStateManager({
-      hasPendingEmbeddable: () => Boolean(getIncomingEmbeddable()),
-      toasts: core.notifications.toasts,
-      hasTaggingCapabilities,
-      dashboardPanelStorage,
-      hideWriteControls,
-      history,
-      kbnUrlStateStorage,
-      kibanaVersion,
-      savedDashboard,
-      usageCollection,
-      allowByValueEmbeddables,
-    });
-
-    // sync initial app filters from state to filterManager
-    // if there is an existing similar global filter, then leave it as global
-    filterManager.setAppFilters(_.cloneDeep(stateManager.appState.filters));
-    queryStringManager.setQuery(migrateLegacyQuery(stateManager.appState.query));
-
-    // setup syncing of app filters between appState and filterManager
-    const stopSyncingAppFilters = connectToQueryState(
-      queryService,
-      {
-        set: ({ filters, query }) => {
-          stateManager.setFilters(filters || []);
-          stateManager.setQuery(query || queryStringManager.getDefaultQuery());
-        },
-        get: () => ({
-          filters: stateManager.appState.filters,
-          query: stateManager.getQuery(),
-        }),
-        state$: stateManager.appState$.pipe(
-          map((appState) => ({
-            filters: appState.filters,
-            query: queryStringManager.formatQuery(appState.query),
-          }))
-        ),
-      },
-      {
-        filters: esFilters.FilterStateStore.APP_STATE,
-        query: true,
-      }
-    );
-
-    // Apply initial filters to Dashboard State Manager
-    stateManager.applyFilters(
-      stateManager.getQuery() || queryStringManager.getDefaultQuery(),
-      filterManager.getFilters()
-    );
-
-    // The hash check is so we only update the time filter on dashboard open, not during
-    // normal cross app navigation.
-    if (stateManager.getIsTimeSavedWithDashboard()) {
-      const initialGlobalStateInUrl = kbnUrlStateStorage.get<QueryState>('_g');
-      if (!initialGlobalStateInUrl?.time) {
-        stateManager.syncTimefilterWithDashboardTime(timefilter);
-      }
-      if (!initialGlobalStateInUrl?.refreshInterval) {
-        stateManager.syncTimefilterWithDashboardRefreshInterval(timefilter);
-      }
-    }
-
-    // starts syncing `_g` portion of url with query services
-    // it is important to start this syncing after `dashboardStateManager.syncTimefilterWithDashboard(timefilter);` above is run,
-    // otherwise it will case redundant browser history records
-    const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl(
-      queryService,
-      kbnUrlStateStorage
-    );
-
-    // starts syncing `_a` portion of url
-    stateManager.startStateSyncing();
-
-    const dashboardTitle = getDashboardTitle(
-      stateManager.getTitle(),
-      stateManager.getViewMode(),
-      stateManager.isNew()
-    );
-
-    searchSession.enableStorage(
-      createSessionRestorationDataProvider({
-        data: dataPlugin,
-        getDashboardTitle: () => dashboardTitle,
-        getDashboardId: () => savedDashboard?.id || '',
-        getAppState: () => stateManager.getAppState(),
-      }),
-      {
-        isDisabled: () =>
-          dashboardCapabilities.storeSearchSession
-            ? { disabled: false }
-            : {
-                disabled: true,
-                reasonText: noSearchSessionStorageCapabilityMessage,
-              },
-      }
-    );
-
-    setDashboardStateManager(stateManager);
-    setViewMode(stateManager.getViewMode());
-
-    return () => {
-      stateManager?.destroy();
-      setDashboardStateManager(null);
-      stopSyncingAppFilters();
-      stopSyncingQueryServiceStateWithUrl();
-    };
-  }, [
-    dataPlugin,
-    filterManager,
-    hasTaggingCapabilities,
-    initializerContext.config,
-    dashboardPanelStorage,
-    getIncomingEmbeddable,
-    hideWriteControls,
-    history,
-    kibanaVersion,
-    queryService,
-    queryStringManager,
-    savedDashboard,
-    searchSession,
-    timefilter,
-    toasts,
-    uiSettings,
-    usageCollection,
-    allowByValueEmbeddables,
-    core.notifications.toasts,
-    dashboardCapabilities.storeSearchSession,
-  ]);
-
-  return { dashboardStateManager, viewMode, setViewMode };
-};
diff --git a/src/plugins/dashboard/public/application/hooks/use_saved_dashboard.ts b/src/plugins/dashboard/public/application/hooks/use_saved_dashboard.ts
deleted file mode 100644
index 639bc830803a4..0000000000000
--- a/src/plugins/dashboard/public/application/hooks/use_saved_dashboard.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { useEffect, useState } from 'react';
-import { History } from 'history';
-import _ from 'lodash';
-
-import { useKibana } from '../../services/kibana_react';
-
-import { DashboardConstants } from '../..';
-import { DashboardSavedObject } from '../../saved_dashboards';
-import { getDashboard60Warning, getNewDashboardTitle } from '../../dashboard_strings';
-import { DashboardAppServices } from '../types';
-
-export const useSavedDashboard = (savedDashboardId: string | undefined, history: History) => {
-  const { data, core, chrome, savedDashboards } = useKibana<DashboardAppServices>().services;
-  const [savedDashboard, setSavedDashboard] = useState<DashboardSavedObject | null>(null);
-
-  // Destructure and rename services; makes the Effect hook more specific, makes later
-  // abstraction of service dependencies easier.
-  const { indexPatterns } = data;
-  const { recentlyAccessed: recentlyAccessedPaths, docTitle } = chrome;
-  const { toasts } = core.notifications;
-
-  useEffect(() => {
-    (async function loadSavedDashboard() {
-      if (savedDashboardId === 'create') {
-        history.replace({
-          ...history.location, // preserve query,
-          pathname: DashboardConstants.CREATE_NEW_DASHBOARD_URL,
-        });
-
-        toasts.addWarning(getDashboard60Warning());
-        return;
-      }
-
-      await indexPatterns.ensureDefaultIndexPattern();
-
-      try {
-        const dashboard = (await savedDashboards.get(savedDashboardId)) as DashboardSavedObject;
-        docTitle.change(dashboard.title || getNewDashboardTitle());
-        setSavedDashboard(dashboard);
-      } catch (error) {
-        // E.g. a corrupt or deleted dashboard
-        toasts.addDanger(error.message);
-        history.push(DashboardConstants.LANDING_PAGE_PATH);
-      }
-    })();
-    return () => setSavedDashboard(null);
-  }, [
-    toasts,
-    docTitle,
-    history,
-    indexPatterns,
-    recentlyAccessedPaths,
-    savedDashboardId,
-    savedDashboards,
-  ]);
-
-  return savedDashboard;
-};
diff --git a/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
new file mode 100644
index 0000000000000..cb8c5ac5745e4
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/build_dashboard_container.ts
@@ -0,0 +1,160 @@
+/*
+ * Copyright 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 _ from 'lodash';
+import { DashboardSavedObject } from '../../saved_dashboards';
+import { DashboardContainer, DASHBOARD_CONTAINER_TYPE } from '../embeddable';
+import {
+  DashboardBuildContext,
+  DashboardState,
+  DashboardContainerInput,
+  DashboardAppServices,
+} from '../../types';
+import {
+  enableDashboardSearchSessions,
+  getSearchSessionIdFromURL,
+  stateToDashboardContainerInput,
+} from '.';
+import {
+  ContainerOutput,
+  EmbeddableFactoryNotFoundError,
+  EmbeddableInput,
+  EmbeddablePackageState,
+  ErrorEmbeddable,
+  isErrorEmbeddable,
+} from '../../services/embeddable';
+
+type BuildDashboardContainerProps = DashboardBuildContext & {
+  data: DashboardAppServices['data']; // the whole data service is required here because it is required by getUrlGeneratorState
+  savedDashboard: DashboardSavedObject;
+  initialDashboardState: DashboardState;
+  incomingEmbeddable?: EmbeddablePackageState;
+};
+
+/**
+ * Builds the dashboard container and manages initial search session
+ */
+export const buildDashboardContainer = async ({
+  getLatestDashboardState,
+  initialDashboardState,
+  isEmbeddedExternally,
+  dashboardCapabilities,
+  incomingEmbeddable,
+  savedDashboard,
+  kibanaVersion,
+  embeddable,
+  history,
+  data,
+}: BuildDashboardContainerProps) => {
+  const {
+    search: { session },
+  } = data;
+
+  // set up search session
+  enableDashboardSearchSessions({
+    data,
+    kibanaVersion,
+    savedDashboard,
+    initialDashboardState,
+    getLatestDashboardState,
+    canStoreSearchSession: dashboardCapabilities.storeSearchSession,
+  });
+  const searchSessionIdFromURL = getSearchSessionIdFromURL(history);
+  if (searchSessionIdFromURL) {
+    session.restore(searchSessionIdFromURL);
+  }
+
+  const dashboardFactory = embeddable.getEmbeddableFactory<
+    DashboardContainerInput,
+    ContainerOutput,
+    DashboardContainer
+  >(DASHBOARD_CONTAINER_TYPE);
+
+  if (!dashboardFactory) {
+    throw new EmbeddableFactoryNotFoundError('dashboard app requires dashboard embeddable factory');
+  }
+
+  /**
+   * Use an existing session instead of starting a new one if there is a session already, and dashboard is being created with an incoming
+   * embeddable.
+   */
+  const existingSession = session.getSessionId();
+  const searchSessionId =
+    searchSessionIdFromURL ??
+    (existingSession && incomingEmbeddable ? existingSession : session.start());
+
+  // Build the initial input for the dashboard container based on the dashboard state.
+  const initialInput = stateToDashboardContainerInput({
+    isEmbeddedExternally: Boolean(isEmbeddedExternally),
+    dashboardState: initialDashboardState,
+    dashboardCapabilities,
+    incomingEmbeddable,
+    query: data.query,
+    searchSessionId,
+    savedDashboard,
+  });
+
+  /**
+   * Handle the Incoming Embeddable Part 1:
+   * If the incoming embeddable already exists e.g. if it has been edited by value, the incoming state for that panel needs to replace the
+   * state for the matching panel already in the dashboard. This needs to happen BEFORE the dashboard container is built, so that the panel
+   * retains the same placement.
+   */
+  if (incomingEmbeddable?.embeddableId && initialInput.panels[incomingEmbeddable.embeddableId]) {
+    const originalPanelState = initialInput.panels[incomingEmbeddable.embeddableId];
+    initialInput.panels = {
+      ...initialInput.panels,
+      [incomingEmbeddable.embeddableId]: {
+        gridData: originalPanelState.gridData,
+        type: incomingEmbeddable.type,
+        explicitInput: {
+          ...originalPanelState.explicitInput,
+          ...incomingEmbeddable.input,
+          id: incomingEmbeddable.embeddableId,
+        },
+      },
+    };
+  }
+
+  const dashboardContainer = await dashboardFactory.create(initialInput);
+  if (!dashboardContainer || isErrorEmbeddable(dashboardContainer)) {
+    tryDestroyDashboardContainer(dashboardContainer);
+    return;
+  }
+
+  /**
+   * Handle the Incoming Embeddable Part 2:
+   * If the incoming embeddable is new, we can add it to the container using `addNewEmbeddable` after the container is created
+   * this lets the container handle the placement of it (using the default placement algorithm "top left most open space")
+   */
+  if (
+    incomingEmbeddable &&
+    (!incomingEmbeddable?.embeddableId ||
+      (incomingEmbeddable.embeddableId &&
+        !dashboardContainer.getInput().panels[incomingEmbeddable.embeddableId]))
+  ) {
+    dashboardContainer.addNewEmbeddable<EmbeddableInput>(
+      incomingEmbeddable.type,
+      incomingEmbeddable.input
+    );
+  }
+
+  return dashboardContainer;
+};
+
+export const tryDestroyDashboardContainer = (
+  container: DashboardContainer | ErrorEmbeddable | undefined
+) => {
+  try {
+    container?.destroy();
+  } catch (e) {
+    // destroy could throw if something has already destroyed the container
+    // eslint-disable-next-line no-console
+    console.warn(e);
+  }
+};
diff --git a/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
new file mode 100644
index 0000000000000..ee2ec2bb14fe4
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/convert_dashboard_state.ts
@@ -0,0 +1,143 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 _ from 'lodash';
+import { DashboardSavedObject } from '../../saved_dashboards';
+import { getTagsFromSavedDashboard, migrateAppState } from '.';
+import { EmbeddablePackageState, ViewMode } from '../../services/embeddable';
+import {
+  convertPanelStateToSavedDashboardPanel,
+  convertSavedDashboardPanelToPanelState,
+} from '../../../common/embeddable/embeddable_saved_object_converters';
+import {
+  DashboardState,
+  RawDashboardState,
+  DashboardPanelMap,
+  SavedDashboardPanel,
+  DashboardAppServices,
+  DashboardContainerInput,
+  DashboardBuildContext,
+} from '../../types';
+
+interface SavedObjectToDashboardStateProps {
+  version: string;
+  hideWriteControls: boolean;
+  savedDashboard: DashboardSavedObject;
+  usageCollection: DashboardAppServices['usageCollection'];
+  savedObjectsTagging: DashboardAppServices['savedObjectsTagging'];
+}
+
+interface StateToDashboardContainerInputProps {
+  searchSessionId?: string;
+  isEmbeddedExternally?: boolean;
+  dashboardState: DashboardState;
+  savedDashboard: DashboardSavedObject;
+  query: DashboardBuildContext['query'];
+  incomingEmbeddable?: EmbeddablePackageState;
+  dashboardCapabilities: DashboardBuildContext['dashboardCapabilities'];
+}
+
+interface StateToRawDashboardStateProps {
+  version: string;
+  state: DashboardState;
+}
+/**
+ * Converts a dashboard saved object to a dashboard state by extracting raw state from the given Dashboard
+ * Saved Object migrating the panel states to the latest version, then converting each panel from a saved
+ * dashboard panel to a panel state.
+ */
+export const savedObjectToDashboardState = ({
+  version,
+  hideWriteControls,
+  savedDashboard,
+  usageCollection,
+  savedObjectsTagging,
+}: SavedObjectToDashboardStateProps): DashboardState => {
+  const rawState = migrateAppState(
+    {
+      fullScreenMode: false,
+      title: savedDashboard.title,
+      query: savedDashboard.getQuery(),
+      filters: savedDashboard.getFilters(),
+      timeRestore: savedDashboard.timeRestore,
+      description: savedDashboard.description || '',
+      tags: getTagsFromSavedDashboard(savedDashboard, savedObjectsTagging),
+      panels: savedDashboard.panelsJSON ? JSON.parse(savedDashboard.panelsJSON) : [],
+      viewMode: savedDashboard.id || hideWriteControls ? ViewMode.VIEW : ViewMode.EDIT,
+      options: savedDashboard.optionsJSON ? JSON.parse(savedDashboard.optionsJSON) : {},
+    },
+    version,
+    usageCollection
+  );
+
+  const panels: DashboardPanelMap = {};
+  rawState.panels?.forEach((panel: SavedDashboardPanel) => {
+    panels[panel.panelIndex] = convertSavedDashboardPanelToPanelState(panel);
+  });
+  return { ...rawState, panels };
+};
+
+/**
+ * Converts a dashboard state object to dashboard container input
+ */
+export const stateToDashboardContainerInput = ({
+  dashboardCapabilities,
+  isEmbeddedExternally,
+  query: queryService,
+  searchSessionId,
+  savedDashboard,
+  dashboardState,
+}: StateToDashboardContainerInputProps): DashboardContainerInput => {
+  const { filterManager, timefilter: timefilterService } = queryService;
+  const { timefilter } = timefilterService;
+
+  const {
+    expandedPanelId,
+    fullScreenMode,
+    description,
+    options,
+    viewMode,
+    panels,
+    query,
+    title,
+  } = dashboardState;
+
+  return {
+    refreshConfig: timefilter.getRefreshInterval(),
+    filters: filterManager.getFilters(),
+    isFullScreenMode: fullScreenMode,
+    id: savedDashboard.id || '',
+    dashboardCapabilities,
+    isEmbeddedExternally,
+    ...(options || {}),
+    searchSessionId,
+    expandedPanelId,
+    description,
+    viewMode,
+    panels,
+    query,
+    title,
+    timeRange: {
+      ..._.cloneDeep(timefilter.getTime()),
+    },
+  };
+};
+
+/**
+ * Converts a given dashboard state object to raw dashboard state. This is useful for sharing, and session restoration, as
+ * they require panels to be formatted as an array.
+ */
+export const stateToRawDashboardState = ({
+  version,
+  state,
+}: StateToRawDashboardStateProps): RawDashboardState => {
+  const savedDashboardPanels = Object.values(state.panels).map((panel) =>
+    convertPanelStateToSavedDashboardPanel(panel, version)
+  );
+  return { ..._.omit(state, 'panels'), panels: savedDashboardPanels };
+};
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_panel_storage.ts b/src/plugins/dashboard/public/application/lib/dashboard_panel_storage.ts
deleted file mode 100644
index 02890f6aaa790..0000000000000
--- a/src/plugins/dashboard/public/application/lib/dashboard_panel_storage.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 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 '@elastic/safer-lodash-set';
-import { Storage } from '../../services/kibana_utils';
-import { NotificationsStart } from '../../services/core';
-import { panelStorageErrorStrings } from '../../dashboard_strings';
-import { SavedDashboardPanel } from '..';
-
-export const DASHBOARD_PANELS_UNSAVED_ID = 'unsavedDashboard';
-const DASHBOARD_PANELS_SESSION_KEY = 'dashboardStateManagerPanels';
-
-export class DashboardPanelStorage {
-  private sessionStorage: Storage;
-
-  constructor(private toasts: NotificationsStart['toasts'], private activeSpaceId: string) {
-    this.sessionStorage = new Storage(sessionStorage);
-  }
-
-  public clearPanels(id = DASHBOARD_PANELS_UNSAVED_ID) {
-    try {
-      const sessionStorage = this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY);
-      const sessionStorageForSpace = sessionStorage?.[this.activeSpaceId] || {};
-      if (sessionStorageForSpace[id]) {
-        delete sessionStorageForSpace[id];
-        this.sessionStorage.set(DASHBOARD_PANELS_SESSION_KEY, sessionStorage);
-      }
-    } catch (e) {
-      this.toasts.addDanger({
-        title: panelStorageErrorStrings.getPanelsClearError(e.message),
-        'data-test-subj': 'dashboardPanelsClearFailure',
-      });
-    }
-  }
-
-  public getPanels(id = DASHBOARD_PANELS_UNSAVED_ID): SavedDashboardPanel[] | undefined {
-    try {
-      return this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY)?.[this.activeSpaceId]?.[id];
-    } catch (e) {
-      this.toasts.addDanger({
-        title: panelStorageErrorStrings.getPanelsGetError(e.message),
-        'data-test-subj': 'dashboardPanelsGetFailure',
-      });
-    }
-  }
-
-  public setPanels(id = DASHBOARD_PANELS_UNSAVED_ID, newPanels: SavedDashboardPanel[]) {
-    try {
-      const sessionStoragePanels = this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY) || {};
-      set(sessionStoragePanels, [this.activeSpaceId, id], newPanels);
-      this.sessionStorage.set(DASHBOARD_PANELS_SESSION_KEY, sessionStoragePanels);
-    } catch (e) {
-      this.toasts.addDanger({
-        title: panelStorageErrorStrings.getPanelsSetError(e.message),
-        'data-test-subj': 'dashboardPanelsSetFailure',
-      });
-    }
-  }
-
-  public getDashboardIdsWithUnsavedChanges() {
-    try {
-      return Object.keys(
-        this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY)?.[this.activeSpaceId] || {}
-      );
-    } catch (e) {
-      this.toasts.addDanger({
-        title: panelStorageErrorStrings.getPanelsGetError(e.message),
-        'data-test-subj': 'dashboardPanelsGetFailure',
-      });
-      return [];
-    }
-  }
-
-  public dashboardHasUnsavedEdits(id = DASHBOARD_PANELS_UNSAVED_ID) {
-    return this.getDashboardIdsWithUnsavedChanges().indexOf(id) !== -1;
-  }
-}
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
new file mode 100644
index 0000000000000..7dd2b53a58155
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/dashboard_session_restoration.ts
@@ -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 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 { History } from 'history';
+import { 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 { DASHBOARD_APP_URL_GENERATOR, DashboardUrlGeneratorState } from '../../url_generator';
+import {
+  DataPublicPluginStart,
+  noSearchSessionStorageCapabilityMessage,
+} from '../../services/data';
+import { stateToRawDashboardState } from './convert_dashboard_state';
+
+export const getSearchSessionIdFromURL = (history: History): string | undefined =>
+  getQueryParams(history.location)[DashboardConstants.SEARCH_SESSION_ID] as string | undefined;
+
+export const getSessionURLObservable = (history: History) =>
+  createQueryParamObservable<string>(history, DashboardConstants.SEARCH_SESSION_ID);
+
+export function createSessionRestorationDataProvider(deps: {
+  kibanaVersion: string;
+  data: DataPublicPluginStart;
+  getAppState: () => DashboardState;
+  getDashboardTitle: () => string;
+  getDashboardId: () => string;
+}) {
+  return {
+    getName: async () => deps.getDashboardTitle(),
+    getUrlGeneratorData: async () => {
+      return {
+        urlGeneratorId: DASHBOARD_APP_URL_GENERATOR,
+        initialState: getUrlGeneratorState({ ...deps, shouldRestoreSearchSession: false }),
+        restoreState: getUrlGeneratorState({ ...deps, shouldRestoreSearchSession: true }),
+      };
+    },
+  };
+}
+
+/**
+ * Enables dashboard search sessions.
+ */
+export function enableDashboardSearchSessions({
+  canStoreSearchSession,
+  initialDashboardState,
+  getLatestDashboardState,
+  savedDashboard,
+  kibanaVersion,
+  data,
+}: {
+  kibanaVersion: string;
+  data: DataPublicPluginStart;
+  canStoreSearchSession: boolean;
+  savedDashboard: DashboardSavedObject;
+  initialDashboardState: DashboardState;
+  getLatestDashboardState: () => DashboardState;
+}) {
+  const dashboardTitle = getDashboardTitle(
+    initialDashboardState.title,
+    initialDashboardState.viewMode,
+    !savedDashboard.id
+  );
+
+  data.search.session.enableStorage(
+    createSessionRestorationDataProvider({
+      data,
+      kibanaVersion,
+      getDashboardTitle: () => dashboardTitle,
+      getDashboardId: () => savedDashboard?.id || '',
+      getAppState: getLatestDashboardState,
+    }),
+    {
+      isDisabled: () =>
+        canStoreSearchSession
+          ? { disabled: false }
+          : {
+              disabled: true,
+              reasonText: noSearchSessionStorageCapabilityMessage,
+            },
+    }
+  );
+}
+
+/**
+ * Fetches the state to store when a session is saved so that this dashboard can be recreated exactly
+ * as it was.
+ */
+function getUrlGeneratorState({
+  data,
+  getAppState,
+  kibanaVersion,
+  getDashboardId,
+  shouldRestoreSearchSession,
+}: {
+  kibanaVersion: string;
+  data: DataPublicPluginStart;
+  getAppState: () => DashboardState;
+  getDashboardId: () => string;
+  shouldRestoreSearchSession: boolean;
+}): DashboardUrlGeneratorState {
+  const appState = stateToRawDashboardState({ state: getAppState(), version: kibanaVersion });
+  const { filterManager, queryString } = data.query;
+  const { timefilter } = data.query.timefilter;
+
+  return {
+    timeRange: shouldRestoreSearchSession ? timefilter.getAbsoluteTime() : timefilter.getTime(),
+    searchSessionId: shouldRestoreSearchSession ? data.search.session.getSessionId() : undefined,
+    panels: getDashboardId() ? undefined : appState.panels,
+    query: queryString.formatQuery(appState.query),
+    filters: filterManager.getFilters(),
+    savedQuery: appState.savedQuery,
+    dashboardId: getDashboardId(),
+    preserveSavedFilters: false,
+    viewMode: appState.viewMode,
+    useHash: false,
+    refreshInterval: shouldRestoreSearchSession
+      ? {
+          pause: true, // force pause refresh interval when restoring a session
+          value: 0,
+        }
+      : undefined,
+  };
+}
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_session_storage.ts b/src/plugins/dashboard/public/application/lib/dashboard_session_storage.ts
new file mode 100644
index 0000000000000..7d0e60c0609a8
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/dashboard_session_storage.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '@elastic/safer-lodash-set';
+import { Storage } from '../../services/kibana_utils';
+import { NotificationsStart } from '../../services/core';
+import { panelStorageErrorStrings } from '../../dashboard_strings';
+import { DashboardState } from '../../types';
+
+export const DASHBOARD_PANELS_UNSAVED_ID = 'unsavedDashboard';
+const DASHBOARD_PANELS_SESSION_KEY = 'dashboardStateManagerPanels';
+
+export class DashboardSessionStorage {
+  private sessionStorage: Storage;
+
+  constructor(private toasts: NotificationsStart['toasts'], private activeSpaceId: string) {
+    this.sessionStorage = new Storage(sessionStorage);
+  }
+
+  public clearState(id = DASHBOARD_PANELS_UNSAVED_ID) {
+    try {
+      const sessionStorage = this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY);
+      const sessionStorageForSpace = sessionStorage?.[this.activeSpaceId] || {};
+      if (sessionStorageForSpace[id]) {
+        delete sessionStorageForSpace[id];
+        this.sessionStorage.set(DASHBOARD_PANELS_SESSION_KEY, sessionStorage);
+      }
+    } catch (e) {
+      this.toasts.addDanger({
+        title: panelStorageErrorStrings.getPanelsClearError(e.message),
+        'data-test-subj': 'dashboardPanelsClearFailure',
+      });
+    }
+  }
+
+  public getState(id = DASHBOARD_PANELS_UNSAVED_ID): Partial<DashboardState> | undefined {
+    try {
+      return this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY)?.[this.activeSpaceId]?.[id];
+    } catch (e) {
+      this.toasts.addDanger({
+        title: panelStorageErrorStrings.getPanelsGetError(e.message),
+        'data-test-subj': 'dashboardPanelsGetFailure',
+      });
+    }
+  }
+
+  public setState(id = DASHBOARD_PANELS_UNSAVED_ID, newState: Partial<DashboardState>) {
+    try {
+      const sessionStateStorage = this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY) || {};
+      set(sessionStateStorage, [this.activeSpaceId, id], newState);
+      this.sessionStorage.set(DASHBOARD_PANELS_SESSION_KEY, sessionStateStorage);
+    } catch (e) {
+      this.toasts.addDanger({
+        title: panelStorageErrorStrings.getPanelsSetError(e.message),
+        'data-test-subj': 'dashboardPanelsSetFailure',
+      });
+    }
+  }
+
+  public getDashboardIdsWithUnsavedChanges() {
+    try {
+      const dashboardStatesInSpace =
+        this.sessionStorage.get(DASHBOARD_PANELS_SESSION_KEY)?.[this.activeSpaceId] || {};
+      const dashboardsWithUnsavedChanges: string[] = [];
+      Object.keys(dashboardStatesInSpace).map((dashboardId) => {
+        if (
+          Object.keys(dashboardStatesInSpace[dashboardId]).some(
+            (stateKey) => stateKey !== 'viewMode'
+          )
+        )
+          dashboardsWithUnsavedChanges.push(dashboardId);
+      });
+      return dashboardsWithUnsavedChanges;
+    } catch (e) {
+      this.toasts.addDanger({
+        title: panelStorageErrorStrings.getPanelsGetError(e.message),
+        'data-test-subj': 'dashboardPanelsGetFailure',
+      });
+      return [];
+    }
+  }
+
+  public dashboardHasUnsavedEdits(id = DASHBOARD_PANELS_UNSAVED_ID) {
+    return this.getDashboardIdsWithUnsavedChanges().indexOf(id) !== -1;
+  }
+}
diff --git a/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts b/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts
new file mode 100644
index 0000000000000..df2521044d1a3
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/dashboard_tagging.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { DashboardSavedObject } from '../..';
+import { SavedObject } from '../../services/saved_objects';
+import { SavedObjectsTaggingApi } from '../../services/saved_objects_tagging_oss';
+import type { TagDecoratedSavedObject } from '../../services/saved_objects_tagging_oss';
+
+// TS is picky with type guards, we can't just inline `() => false`
+function defaultTaggingGuard(_obj: SavedObject): _obj is TagDecoratedSavedObject {
+  return false;
+}
+
+export const getTagsFromSavedDashboard = (
+  savedDashboard: DashboardSavedObject,
+  api?: SavedObjectsTaggingApi
+) => {
+  const hasTaggingCapabilities = getHasTaggingCapabilitiesGuard(api);
+  return hasTaggingCapabilities(savedDashboard) ? savedDashboard.getTags() : [];
+};
+
+export const getHasTaggingCapabilitiesGuard = (api?: SavedObjectsTaggingApi) =>
+  api?.ui.hasTagDecoration || defaultTaggingGuard;
diff --git a/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/diff_dashboard_state.ts
new file mode 100644
index 0000000000000..b1abba44891fc
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/diff_dashboard_state.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 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 _ from 'lodash';
+import { DashboardPanelState } from '..';
+import { esFilters, Filter } from '../../services/data';
+import {
+  DashboardContainerInput,
+  DashboardOptions,
+  DashboardPanelMap,
+  DashboardState,
+} from '../../types';
+
+interface DashboardDiffCommon {
+  [key: string]: unknown;
+}
+
+type DashboardDiffCommonFilters = DashboardDiffCommon & { filters: Filter[] };
+
+export const diffDashboardContainerInput = (
+  originalInput: DashboardContainerInput,
+  newInput: DashboardContainerInput
+) => {
+  return commonDiffFilters<DashboardContainerInput>(
+    (originalInput as unknown) as DashboardDiffCommonFilters,
+    (newInput as unknown) as DashboardDiffCommonFilters,
+    ['searchSessionId', 'lastReloadRequestTime']
+  );
+};
+
+export const diffDashboardState = (
+  original: DashboardState,
+  newState: DashboardState
+): Partial<DashboardState> => {
+  const common = commonDiffFilters<DashboardState>(
+    (original as unknown) as DashboardDiffCommonFilters,
+    (newState as unknown) as DashboardDiffCommonFilters,
+    ['viewMode', 'panels', 'options', 'savedQuery', 'expandedPanelId'],
+    true
+  );
+
+  return {
+    ...common,
+    ...(panelsAreEqual(original.panels, newState.panels) ? {} : { panels: newState.panels }),
+    ...(optionsAreEqual(original.options, newState.options) ? {} : { options: newState.options }),
+  };
+};
+
+const optionsAreEqual = (optionsA: DashboardOptions, optionsB: DashboardOptions): boolean => {
+  const optionKeys = [...Object.keys(optionsA), ...Object.keys(optionsB)];
+  for (const key of optionKeys) {
+    if (
+      Boolean(((optionsA as unknown) as { [key: string]: boolean })[key]) !==
+      Boolean(((optionsB as unknown) as { [key: string]: boolean })[key])
+    ) {
+      return false;
+    }
+  }
+  return true;
+};
+
+const panelsAreEqual = (panelsA: DashboardPanelMap, panelsB: DashboardPanelMap): boolean => {
+  const embeddableIdsA = Object.keys(panelsA);
+  const embeddableIdsB = Object.keys(panelsB);
+  if (
+    embeddableIdsA.length !== embeddableIdsB.length ||
+    _.xor(embeddableIdsA, embeddableIdsB).length > 0
+  ) {
+    return false;
+  }
+  // embeddable ids are equal so let's compare individual panels.
+  for (const id of embeddableIdsA) {
+    if (
+      Object.keys(
+        commonDiff<DashboardPanelState>(
+          (panelsA[id] as unknown) as DashboardDiffCommon,
+          (panelsB[id] as unknown) as DashboardDiffCommon,
+          ['panelRefName']
+        )
+      ).length > 0
+    ) {
+      return false;
+    }
+  }
+
+  return true;
+};
+
+const commonDiffFilters = <T extends { filters: Filter[] }>(
+  originalObj: DashboardDiffCommonFilters,
+  newObj: DashboardDiffCommonFilters,
+  omitKeys: string[],
+  ignorePinned?: boolean
+): Partial<T> => {
+  const filtersAreDifferent = () =>
+    !esFilters.compareFilters(
+      originalObj.filters,
+      ignorePinned ? newObj.filters.filter((f) => !esFilters.isFilterPinned(f)) : newObj.filters,
+      esFilters.COMPARE_ALL_OPTIONS
+    );
+  const otherDifferences = commonDiff<T>(originalObj, newObj, [...omitKeys, 'filters']);
+  return _.cloneDeep({
+    ...otherDifferences,
+    ...(filtersAreDifferent() ? { filters: newObj.filters } : {}),
+  });
+};
+
+const commonDiff = <T>(
+  originalObj: DashboardDiffCommon,
+  newObj: DashboardDiffCommon,
+  omitKeys: string[]
+) => {
+  const differences: Partial<T> = {};
+  const keys = [...Object.keys(originalObj), ...Object.keys(newObj)].filter(
+    (key) => !omitKeys.includes(key)
+  );
+  keys.forEach((key) => {
+    if (key === undefined) return;
+    if (!_.isEqual(originalObj[key], newObj[key])) {
+      (differences as { [key: string]: unknown })[key] = newObj[key];
+    }
+  });
+  return differences;
+};
diff --git a/src/plugins/dashboard/public/application/lib/filter_utils.ts b/src/plugins/dashboard/public/application/lib/filter_utils.ts
index 83dd036285a51..51acc4676c543 100644
--- a/src/plugins/dashboard/public/application/lib/filter_utils.ts
+++ b/src/plugins/dashboard/public/application/lib/filter_utils.ts
@@ -8,59 +8,68 @@
 
 import _ from 'lodash';
 import moment, { Moment } from 'moment';
-import { Filter } from '../../services/data';
+import { Optional } from '@kbn/utility-types';
+
+import { Filter, TimeRange } from '../../services/data';
+
+type TimeRangeCompare = Optional<TimeRange>;
 
 /**
- * @typedef {Object} QueryFilter
- * @property query_string {Object}
- * @property query_string.query {String}
+ * Converts the time to a utc formatted string. If the time is not valid (e.g. it might be in a relative format like
+ * 'now-15m', then it just returns what it was passed).
+ * @param time {string|Moment}
+ * @returns the time represented in utc format, or if the time range was not able to be parsed into a moment
+ * object, it returns the same object it was given.
  */
-
-export class FilterUtils {
-  /**
-   * Converts the time to a utc formatted string. If the time is not valid (e.g. it might be in a relative format like
-   * 'now-15m', then it just returns what it was passed).
-   * @param time {string|Moment}
-   * @returns the time represented in utc format, or if the time range was not able to be parsed into a moment
-   * object, it returns the same object it was given.
-   */
-  public static convertTimeToUTCString(time?: string | Moment): undefined | string {
-    if (moment(time).isValid()) {
-      return moment(time).utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
-    } else {
-      // If it's not a valid moment date, then it should be a string representing a relative time
-      // like 'now' or 'now-15m'.
-      return time as string;
-    }
+export const convertTimeToUTCString = (time?: string | Moment): undefined | string => {
+  if (moment(time).isValid()) {
+    return moment(time).utc().format('YYYY-MM-DDTHH:mm:ss.SSS[Z]');
+  } else {
+    // If it's not a valid moment date, then it should be a string representing a relative time
+    // like 'now' or 'now-15m'.
+    return time as string;
   }
+};
 
-  /**
-   * Compares the two times, making sure they are in both compared in string format. Absolute times
-   * are sometimes stored as moment objects, but converted to strings when reloaded. Relative times are
-   * strings that are not convertible to moment objects.
-   * @param timeA {string|Moment}
-   * @param timeB {string|Moment}
-   * @returns {boolean}
-   */
-  public static areTimesEqual(timeA?: string | Moment, timeB?: string | Moment) {
-    return this.convertTimeToUTCString(timeA) === this.convertTimeToUTCString(timeB);
-  }
+export const areTimeRangesEqual = (rangeA: TimeRangeCompare, rangeB: TimeRangeCompare): boolean => {
+  return areTimesEqual(rangeA.from, rangeB.from) && areTimesEqual(rangeA.to, rangeB.to);
+};
 
-  /**
-   * Depending on how a dashboard is loaded, the filter object may contain a $$hashKey and $state that will throw
-   * off a filter comparison. This removes those variables.
-   * @param filters {Array.<Object>}
-   * @returns {Array.<Object>}
-   */
-  public static cleanFiltersForComparison(filters: Filter[]) {
-    return _.map(filters, (filter) => {
-      const f: Partial<Filter> = _.omit(filter, ['$$hashKey', '$state']);
-      if (f.meta) {
-        // f.meta.value is the value displayed in the filter bar.
-        // It may also be loaded differently and shouldn't be used in this comparison.
-        return _.omit(f.meta, ['value']);
-      }
-      return f;
-    });
-  }
-}
+/**
+ * Compares the two times, making sure they are in both compared in string format. Absolute times
+ * are sometimes stored as moment objects, but converted to strings when reloaded. Relative times are
+ * strings that are not convertible to moment objects.
+ * @param timeA {string|Moment}
+ * @param timeB {string|Moment}
+ * @returns {boolean}
+ */
+export const areTimesEqual = (timeA?: string | Moment, timeB?: string | Moment) => {
+  return convertTimeToUTCString(timeA) === convertTimeToUTCString(timeB);
+};
+
+/**
+ * Depending on how a dashboard is loaded, the filter object may contain a $$hashKey and $state that will throw
+ * off a filter comparison. This removes those variables.
+ * @param filters {Array.<Object>}
+ * @returns {Array.<Object>}
+ */
+export const cleanFiltersForComparison = (filters: Filter[]) => {
+  return _.map(filters, (filter) => {
+    const f: Partial<Filter> = _.omit(filter, ['$$hashKey', '$state']);
+    if (f.meta) {
+      // f.meta.value is the value displayed in the filter bar.
+      // It may also be loaded differently and shouldn't be used in this comparison.
+      return _.omit(f.meta, ['value']);
+    }
+    return f;
+  });
+};
+
+export const cleanFiltersForSerialize = (filters: Filter[]): Filter[] => {
+  return filters.map((filter) => {
+    if (filter.meta.value) {
+      delete filter.meta.value;
+    }
+    return filter;
+  });
+};
diff --git a/src/plugins/dashboard/public/application/lib/get_app_state_defaults.ts b/src/plugins/dashboard/public/application/lib/get_app_state_defaults.ts
deleted file mode 100644
index d8d335317c2b2..0000000000000
--- a/src/plugins/dashboard/public/application/lib/get_app_state_defaults.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 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 { SavedObjectTagDecoratorTypeGuard } from '../../services/saved_objects_tagging_oss';
-import { ViewMode } from '../../services/embeddable';
-import { DashboardSavedObject } from '../../saved_dashboards';
-import { DashboardAppStateDefaults } from '../../types';
-
-export function getAppStateDefaults(
-  viewMode: ViewMode,
-  savedDashboard: DashboardSavedObject,
-  hasTaggingCapabilities: SavedObjectTagDecoratorTypeGuard
-): DashboardAppStateDefaults {
-  return {
-    fullScreenMode: false,
-    title: savedDashboard.title,
-    description: savedDashboard.description || '',
-    tags: hasTaggingCapabilities(savedDashboard) ? savedDashboard.getTags() : [],
-    timeRestore: savedDashboard.timeRestore,
-    panels: savedDashboard.panelsJSON ? JSON.parse(savedDashboard.panelsJSON) : [],
-    options: savedDashboard.optionsJSON ? JSON.parse(savedDashboard.optionsJSON) : {},
-    query: savedDashboard.getQuery(),
-    filters: savedDashboard.getFilters(),
-    viewMode,
-  };
-}
diff --git a/src/plugins/dashboard/public/application/lib/index.ts b/src/plugins/dashboard/public/application/lib/index.ts
index f457589c7588e..937c1d2a77c06 100644
--- a/src/plugins/dashboard/public/application/lib/index.ts
+++ b/src/plugins/dashboard/public/application/lib/index.ts
@@ -6,11 +6,28 @@
  * Side Public License, v 1.
  */
 
+export * from './filter_utils';
+export { getDashboardIdFromUrl } from './url';
 export { saveDashboard } from './save_dashboard';
-export { getAppStateDefaults } from './get_app_state_defaults';
 export { migrateAppState } from './migrate_app_state';
-export { getDashboardIdFromUrl } from './url';
-export { createSessionRestorationDataProvider } from './session_restoration';
 export { addHelpMenuToAppChrome } from './help_menu_util';
+export { getTagsFromSavedDashboard } from './dashboard_tagging';
+export { loadDashboardUrlState } from './load_dashboard_url_state';
+export { DashboardSessionStorage } from './dashboard_session_storage';
+export { loadSavedDashboardState } from './load_saved_dashboard_state';
 export { attemptLoadDashboardByTitle } from './load_dashboard_by_title';
-export { DashboardPanelStorage } from './dashboard_panel_storage';
+export { syncDashboardFilterState } from './sync_dashboard_filter_state';
+export { syncDashboardIndexPatterns } from './sync_dashboard_index_patterns';
+export { syncDashboardContainerInput } from './sync_dashboard_container_input';
+export { diffDashboardContainerInput, diffDashboardState } from './diff_dashboard_state';
+export { buildDashboardContainer, tryDestroyDashboardContainer } from './build_dashboard_container';
+export {
+  stateToDashboardContainerInput,
+  savedObjectToDashboardState,
+} from './convert_dashboard_state';
+export {
+  createSessionRestorationDataProvider,
+  enableDashboardSearchSessions,
+  getSearchSessionIdFromURL,
+  getSessionURLObservable,
+} from './dashboard_session_restoration';
diff --git a/src/plugins/dashboard/public/application/lib/load_dashboard_url_state.ts b/src/plugins/dashboard/public/application/lib/load_dashboard_url_state.ts
new file mode 100644
index 0000000000000..efff2ba6bc087
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/load_dashboard_url_state.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 _ from 'lodash';
+
+import { migrateAppState } from '.';
+import { replaceUrlHashQuery } from '../../../../kibana_utils/public';
+import { DASHBOARD_STATE_STORAGE_KEY } from '../../dashboard_constants';
+import { convertSavedDashboardPanelToPanelState } from '../../../common/embeddable/embeddable_saved_object_converters';
+import {
+  DashboardBuildContext,
+  DashboardPanelMap,
+  DashboardState,
+  RawDashboardState,
+  SavedDashboardPanel,
+} from '../../types';
+import { migrateLegacyQuery } from './migrate_legacy_query';
+
+/**
+ * Loads any dashboard state from the URL, and removes the state from the URL.
+ */
+export const loadDashboardUrlState = ({
+  kibanaVersion,
+  usageCollection,
+  kbnUrlStateStorage,
+}: DashboardBuildContext): Partial<DashboardState> => {
+  const rawAppStateInUrl = kbnUrlStateStorage.get<RawDashboardState>(DASHBOARD_STATE_STORAGE_KEY);
+  if (!rawAppStateInUrl) return {};
+
+  const panelsMap: DashboardPanelMap = {};
+  if (rawAppStateInUrl.panels && rawAppStateInUrl.panels.length > 0) {
+    const rawState = migrateAppState(rawAppStateInUrl, kibanaVersion, usageCollection);
+    rawState.panels?.forEach((panel: SavedDashboardPanel) => {
+      panelsMap[panel.panelIndex] = convertSavedDashboardPanelToPanelState(panel);
+    });
+  }
+
+  const migratedQuery = rawAppStateInUrl.query
+    ? migrateLegacyQuery(rawAppStateInUrl.query)
+    : undefined;
+
+  // remove state from URL
+  kbnUrlStateStorage.kbnUrlControls.updateAsync((nextUrl) => {
+    if (nextUrl.includes(DASHBOARD_STATE_STORAGE_KEY)) {
+      return replaceUrlHashQuery(nextUrl, (query) => {
+        delete query[DASHBOARD_STATE_STORAGE_KEY];
+        return query;
+      });
+    }
+    return nextUrl;
+  }, true);
+
+  return {
+    ..._.omit(rawAppStateInUrl, ['panels', 'query']),
+    ...(migratedQuery ? { query: migratedQuery } : {}),
+    ...(rawAppStateInUrl.panels ? { panels: panelsMap } : {}),
+  };
+};
diff --git a/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts b/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.ts
new file mode 100644
index 0000000000000..9069173c15e8f
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/load_saved_dashboard_state.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 _ from 'lodash';
+
+import { savedObjectToDashboardState } from './convert_dashboard_state';
+import { DashboardState, DashboardBuildContext } from '../../types';
+import { DashboardConstants, DashboardSavedObject } from '../..';
+import { getDashboard60Warning } from '../../dashboard_strings';
+import { migrateLegacyQuery } from './migrate_legacy_query';
+import { cleanFiltersForSerialize } from './filter_utils';
+import { ViewMode } from '../../services/embeddable';
+
+interface LoadSavedDashboardStateReturn {
+  savedDashboardState: DashboardState;
+  savedDashboard: DashboardSavedObject;
+}
+
+/**
+ * Loads, migrates, and returns state from a dashboard saved object.
+ */
+export const loadSavedDashboardState = async ({
+  query,
+  history,
+  notifications,
+  indexPatterns,
+  savedDashboards,
+  usageCollection,
+  savedDashboardId,
+  initializerContext,
+  savedObjectsTagging,
+  dashboardCapabilities,
+}: DashboardBuildContext & { savedDashboardId?: string }): Promise<
+  LoadSavedDashboardStateReturn | undefined
+> => {
+  const { hideWriteControls } = dashboardCapabilities;
+  const { queryString } = query;
+
+  // BWC - remove for 8.0
+  if (savedDashboardId === 'create') {
+    history.replace({
+      ...history.location, // preserve query,
+      pathname: DashboardConstants.CREATE_NEW_DASHBOARD_URL,
+    });
+
+    notifications.toasts.addWarning(getDashboard60Warning());
+    return;
+  }
+  await indexPatterns.ensureDefaultIndexPattern();
+  let savedDashboard: DashboardSavedObject | undefined;
+  try {
+    savedDashboard = (await savedDashboards.get(savedDashboardId)) as DashboardSavedObject;
+  } catch (error) {
+    // E.g. a corrupt or deleted dashboard
+    notifications.toasts.addDanger(error.message);
+    history.push(DashboardConstants.LANDING_PAGE_PATH);
+    return;
+  }
+  if (!savedDashboard) return;
+
+  const savedDashboardState = savedObjectToDashboardState({
+    savedDashboard,
+    usageCollection,
+    hideWriteControls,
+    savedObjectsTagging,
+    version: initializerContext.env.packageInfo.version,
+  });
+
+  const isViewMode = hideWriteControls || Boolean(savedDashboard.id);
+  savedDashboardState.viewMode = isViewMode ? ViewMode.VIEW : ViewMode.EDIT;
+  savedDashboardState.filters = cleanFiltersForSerialize(savedDashboardState.filters);
+  savedDashboardState.query = migrateLegacyQuery(
+    savedDashboardState.query || queryString.getDefaultQuery()
+  );
+
+  return { savedDashboardState, savedDashboard };
+};
diff --git a/src/plugins/dashboard/public/application/lib/migrate_app_state.ts b/src/plugins/dashboard/public/application/lib/migrate_app_state.ts
index 9f60b3b539e26..fb8ef1b9ba2da 100644
--- a/src/plugins/dashboard/public/application/lib/migrate_app_state.ts
+++ b/src/plugins/dashboard/public/application/lib/migrate_app_state.ts
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { METRIC_TYPE } from '@kbn/analytics';
 
 import { UsageCollectionSetup } from '../../services/usage_collection';
-import { DashboardAppState, SavedDashboardPanel } from '../../types';
+import { RawDashboardState, SavedDashboardPanel } from '../../types';
 import {
   migratePanelsTo730,
   SavedDashboardPanelTo60,
@@ -28,10 +28,10 @@ import {
  * Once we hit a major version, we can remove support for older style URLs and get rid of this logic.
  */
 export function migrateAppState(
-  appState: { [key: string]: any } & DashboardAppState,
+  appState: { [key: string]: any } & RawDashboardState,
   kibanaVersion: string,
   usageCollection?: UsageCollectionSetup
-): DashboardAppState {
+): RawDashboardState {
   if (!appState.panels) {
     throw new Error(
       i18n.translate('dashboard.panel.invalidData', {
diff --git a/src/plugins/dashboard/public/application/lib/save_dashboard.ts b/src/plugins/dashboard/public/application/lib/save_dashboard.ts
index 684d8b4c5e8d8..960d7d9cc8687 100644
--- a/src/plugins/dashboard/public/application/lib/save_dashboard.ts
+++ b/src/plugins/dashboard/public/application/lib/save_dashboard.ts
@@ -6,40 +6,110 @@
  * Side Public License, v 1.
  */
 
-import { TimefilterContract } from '../../services/data';
+import _ from 'lodash';
+
+import { convertTimeToUTCString } from '.';
+import { NotificationsStart } from '../../services/core';
+import { DashboardSavedObject } from '../../saved_dashboards';
+import { DashboardRedirect, DashboardState } from '../../types';
 import { SavedObjectSaveOpts } from '../../services/saved_objects';
-import { updateSavedDashboard } from './update_saved_dashboard';
-import { DashboardStateManager } from '../dashboard_state_manager';
+import { dashboardSaveToastStrings } from '../../dashboard_strings';
+import { getHasTaggingCapabilitiesGuard } from './dashboard_tagging';
+import { SavedObjectsTaggingApi } from '../../services/saved_objects_tagging_oss';
+import { RefreshInterval, TimefilterContract, esFilters } from '../../services/data';
+import { convertPanelStateToSavedDashboardPanel } from '../../../common/embeddable/embeddable_saved_object_converters';
+import { DashboardSessionStorage } from './dashboard_session_storage';
 
 export type SavedDashboardSaveOpts = SavedObjectSaveOpts & { stayInEditMode?: boolean };
 
-/**
- * Saves the dashboard.
- * @param toJson A custom toJson function. Used because the previous code used
- * the angularized toJson version, and it was unclear whether there was a reason not to use
- * JSON.stringify
- * @returns A promise that if resolved, will contain the id of the newly saved
- * dashboard.
- */
-export function saveDashboard(
-  toJson: (obj: any) => string,
-  timeFilter: TimefilterContract,
-  dashboardStateManager: DashboardStateManager,
-  saveOptions: SavedDashboardSaveOpts
-): Promise<string> {
-  const savedDashboard = dashboardStateManager.savedDashboard;
-  const appState = dashboardStateManager.appState;
-  const hasTaggingCapabilities = dashboardStateManager.hasTaggingCapabilities;
-
-  updateSavedDashboard(savedDashboard, appState, timeFilter, hasTaggingCapabilities, toJson);
-
-  return savedDashboard.save(saveOptions).then((id: string) => {
-    if (id) {
-      // reset state only when save() was successful
-      // e.g. save() could be interrupted if title is duplicated and not confirmed
-      dashboardStateManager.lastSavedDashboardFilters = dashboardStateManager.getFilterState();
-    }
-
-    return id;
-  });
+interface SaveDashboardProps {
+  version: string;
+  redirectTo: DashboardRedirect;
+  currentState: DashboardState;
+  timefilter: TimefilterContract;
+  saveOptions: SavedDashboardSaveOpts;
+  toasts: NotificationsStart['toasts'];
+  savedDashboard: DashboardSavedObject;
+  savedObjectsTagging?: SavedObjectsTaggingApi;
+  dashboardSessionStorage: DashboardSessionStorage;
 }
+
+export const saveDashboard = async ({
+  toasts,
+  version,
+  redirectTo,
+  timefilter,
+  saveOptions,
+  currentState,
+  savedDashboard,
+  savedObjectsTagging,
+  dashboardSessionStorage,
+}: SaveDashboardProps): Promise<{ id?: string; redirected?: boolean; error?: any }> => {
+  const lastDashboardId = savedDashboard.id;
+  const hasTaggingCapabilities = getHasTaggingCapabilitiesGuard(savedObjectsTagging);
+
+  const { panels, title, tags, description, timeRestore, options } = currentState;
+
+  const savedDashboardPanels = Object.values(panels).map((panel) =>
+    convertPanelStateToSavedDashboardPanel(panel, version)
+  );
+
+  savedDashboard.title = title;
+  savedDashboard.description = description;
+  savedDashboard.timeRestore = timeRestore;
+  savedDashboard.optionsJSON = JSON.stringify(options);
+  savedDashboard.panelsJSON = JSON.stringify(savedDashboardPanels);
+
+  if (hasTaggingCapabilities(savedDashboard)) {
+    savedDashboard.setTags(tags);
+  }
+
+  const { from, to } = timefilter.getTime();
+  savedDashboard.timeFrom = savedDashboard.timeRestore ? convertTimeToUTCString(from) : undefined;
+  savedDashboard.timeTo = savedDashboard.timeRestore ? convertTimeToUTCString(to) : undefined;
+
+  const timeRestoreObj: RefreshInterval = _.pick(timefilter.getRefreshInterval(), [
+    'display',
+    'pause',
+    'section',
+    'value',
+  ]) as RefreshInterval;
+  savedDashboard.refreshInterval = savedDashboard.timeRestore ? timeRestoreObj : undefined;
+
+  // only save unpinned filters
+  const unpinnedFilters = savedDashboard
+    .getFilters()
+    .filter((filter) => !esFilters.isFilterPinned(filter));
+  savedDashboard.searchSource.setField('filter', unpinnedFilters);
+
+  try {
+    const newId = await savedDashboard.save(saveOptions);
+    if (newId) {
+      toasts.addSuccess({
+        title: dashboardSaveToastStrings.getSuccessString(currentState.title),
+        'data-test-subj': 'saveDashboardSuccess',
+      });
+
+      /**
+       * If the dashboard id has been changed, redirect to the new ID to keep the url param in sync.
+       */
+      if (newId !== lastDashboardId) {
+        dashboardSessionStorage.clearState(lastDashboardId);
+        redirectTo({
+          id: newId,
+          editMode: true,
+          useReplace: true,
+          destination: 'dashboard',
+        });
+        return { redirected: true, id: newId };
+      }
+    }
+    return { id: newId };
+  } catch (error) {
+    toasts.addDanger({
+      title: dashboardSaveToastStrings.getFailureString(currentState.title, error.message),
+      'data-test-subj': 'saveDashboardFailure',
+    });
+    return { error };
+  }
+};
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 a6740d8647825..c836638747145 100644
--- a/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
+++ b/src/plugins/dashboard/public/application/lib/session_restoration.test.ts
@@ -6,23 +6,24 @@
  * Side Public License, v 1.
  */
 
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { createSessionRestorationDataProvider } from './session_restoration';
-import { getAppStateDefaults } from './get_app_state_defaults';
 import { getSavedDashboardMock } from '../test_helpers';
-import { SavedObjectTagDecoratorTypeGuard } from '../../../../saved_objects_tagging_oss/public';
-import { ViewMode } from '../../services/embeddable';
+import { dataPluginMock } from '../../../../data/public/mocks';
+import { createSessionRestorationDataProvider, savedObjectToDashboardState } from '.';
 
 describe('createSessionRestorationDataProvider', () => {
   const mockDataPlugin = dataPluginMock.createStartContract();
+  const version = '8.0.0';
   const searchSessionInfoProvider = createSessionRestorationDataProvider({
+    kibanaVersion: version,
     data: mockDataPlugin,
     getAppState: () =>
-      getAppStateDefaults(
-        ViewMode.VIEW,
-        getSavedDashboardMock(),
-        ((() => false) as unknown) as SavedObjectTagDecoratorTypeGuard
-      ),
+      savedObjectToDashboardState({
+        version,
+        hideWriteControls: false,
+        usageCollection: undefined,
+        savedObjectsTagging: undefined,
+        savedDashboard: getSavedDashboardMock(),
+      }),
     getDashboardTitle: () => 'Dashboard',
     getDashboardId: () => 'Id',
   });
diff --git a/src/plugins/dashboard/public/application/lib/session_restoration.ts b/src/plugins/dashboard/public/application/lib/session_restoration.ts
deleted file mode 100644
index 231119eef8d2c..0000000000000
--- a/src/plugins/dashboard/public/application/lib/session_restoration.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { DASHBOARD_APP_URL_GENERATOR, DashboardUrlGeneratorState } from '../../url_generator';
-import { DataPublicPluginStart } from '../../services/data';
-import { DashboardAppState } from '../../types';
-
-export function createSessionRestorationDataProvider(deps: {
-  data: DataPublicPluginStart;
-  getAppState: () => DashboardAppState;
-  getDashboardTitle: () => string;
-  getDashboardId: () => string;
-}) {
-  return {
-    getName: async () => deps.getDashboardTitle(),
-    getUrlGeneratorData: async () => {
-      return {
-        urlGeneratorId: DASHBOARD_APP_URL_GENERATOR,
-        initialState: getUrlGeneratorState({ ...deps, shouldRestoreSearchSession: false }),
-        restoreState: getUrlGeneratorState({ ...deps, shouldRestoreSearchSession: true }),
-      };
-    },
-  };
-}
-
-function getUrlGeneratorState({
-  data,
-  getAppState,
-  getDashboardId,
-  shouldRestoreSearchSession,
-}: {
-  data: DataPublicPluginStart;
-  getAppState: () => DashboardAppState;
-  getDashboardId: () => string;
-  shouldRestoreSearchSession: boolean;
-}): DashboardUrlGeneratorState {
-  const appState = getAppState();
-  return {
-    dashboardId: getDashboardId(),
-    timeRange: shouldRestoreSearchSession
-      ? data.query.timefilter.timefilter.getAbsoluteTime()
-      : data.query.timefilter.timefilter.getTime(),
-    filters: data.query.filterManager.getFilters(),
-    query: data.query.queryString.formatQuery(appState.query),
-    savedQuery: appState.savedQuery,
-    useHash: false,
-    preserveSavedFilters: false,
-    viewMode: appState.viewMode,
-    panels: getDashboardId() ? undefined : appState.panels,
-    searchSessionId: shouldRestoreSearchSession ? data.search.session.getSessionId() : undefined,
-    refreshInterval: shouldRestoreSearchSession
-      ? {
-          pause: true, // force pause refresh interval when restoring a session
-          value: 0,
-        }
-      : undefined,
-  };
-}
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
new file mode 100644
index 0000000000000..21010158dc46d
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_container_input.ts
@@ -0,0 +1,201 @@
+/*
+ * Copyright 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 _ from 'lodash';
+import { Subscription } from 'rxjs';
+import { debounceTime, tap } from 'rxjs/operators';
+
+import { DashboardContainer } from '../embeddable';
+import { esFilters, Filter, Query } from '../../services/data';
+import { DashboardConstants, DashboardSavedObject } from '../..';
+import { setExpandedPanelId, setFullScreenMode, setPanels, setQuery } from '../state';
+import { diffDashboardContainerInput } from './diff_dashboard_state';
+import { replaceUrlHashQuery } from '../../../../kibana_utils/public';
+import { DashboardBuildContext, DashboardContainerInput } from '../../types';
+import {
+  getSearchSessionIdFromURL,
+  getSessionURLObservable,
+  stateToDashboardContainerInput,
+} from '.';
+
+type SyncDashboardContainerCommon = DashboardBuildContext & {
+  dashboardContainer: DashboardContainer;
+  savedDashboard: DashboardSavedObject;
+};
+
+type ApplyStateChangesToContainerProps = SyncDashboardContainerCommon & {
+  force: boolean;
+};
+
+type ApplyContainerChangesToStateProps = SyncDashboardContainerCommon & {
+  applyFilters: (query: Query, filters: Filter[]) => void;
+};
+
+type SyncDashboardContainerProps = SyncDashboardContainerCommon & ApplyContainerChangesToStateProps;
+
+/**
+ * Sets up two way binding between dashboard container and redux state.
+ */
+export const syncDashboardContainerInput = (
+  syncDashboardContainerProps: SyncDashboardContainerProps
+) => {
+  const {
+    history,
+    dashboardContainer,
+    $onDashboardStateChange,
+    $triggerDashboardRefresh,
+  } = syncDashboardContainerProps;
+  const subscriptions = new Subscription();
+  subscriptions.add(
+    dashboardContainer
+      .getInput$()
+      .subscribe(() => applyContainerChangesToState(syncDashboardContainerProps))
+  );
+  subscriptions.add($onDashboardStateChange.subscribe(() => $triggerDashboardRefresh.next()));
+  subscriptions.add(
+    getSessionURLObservable(history).subscribe(() => {
+      $triggerDashboardRefresh.next({ force: true });
+    })
+  );
+
+  let forceRefresh: boolean = false;
+  subscriptions.add(
+    $triggerDashboardRefresh
+      .pipe(
+        tap((trigger) => {
+          forceRefresh = forceRefresh || (trigger?.force ?? false);
+        }),
+        debounceTime(DashboardConstants.CHANGE_APPLY_DEBOUNCE)
+      )
+      .subscribe(() => {
+        applyStateChangesToContainer({ ...syncDashboardContainerProps, force: forceRefresh });
+        forceRefresh = false;
+      })
+  );
+
+  return () => subscriptions.unsubscribe();
+};
+
+export const applyContainerChangesToState = ({
+  query,
+  applyFilters,
+  dashboardContainer,
+  getLatestDashboardState,
+  dispatchDashboardStateChange,
+}: ApplyContainerChangesToStateProps) => {
+  const input = dashboardContainer.getInput();
+  const latestState = getLatestDashboardState();
+  if (Object.keys(latestState).length === 0) {
+    return;
+  }
+  const { filterManager } = query;
+  if (
+    !esFilters.compareFilters(
+      input.filters,
+      filterManager.getFilters(),
+      esFilters.COMPARE_ALL_OPTIONS
+    )
+  ) {
+    // Add filters modifies the object passed to it, hence the clone deep.
+    filterManager.addFilters(_.cloneDeep(input.filters));
+    applyFilters(latestState.query, input.filters);
+  }
+
+  if (!_.isEqual(input.panels, latestState.panels)) {
+    dispatchDashboardStateChange(setPanels(input.panels));
+  }
+
+  if (!_.isEqual(input.query, latestState.query)) {
+    dispatchDashboardStateChange(setQuery(input.query));
+  }
+
+  if (!_.isEqual(input.expandedPanelId, latestState.expandedPanelId)) {
+    dispatchDashboardStateChange(setExpandedPanelId(input.expandedPanelId));
+  }
+  dispatchDashboardStateChange(setFullScreenMode(input.isFullScreenMode));
+};
+
+export const applyStateChangesToContainer = ({
+  force,
+  search,
+  history,
+  savedDashboard,
+  dashboardContainer,
+  kbnUrlStateStorage,
+  query: queryService,
+  isEmbeddedExternally,
+  dashboardCapabilities,
+  getLatestDashboardState,
+}: ApplyStateChangesToContainerProps) => {
+  const latestState = getLatestDashboardState();
+  if (Object.keys(latestState).length === 0) {
+    return;
+  }
+  const currentDashboardStateAsInput = stateToDashboardContainerInput({
+    dashboardState: latestState,
+    isEmbeddedExternally,
+    dashboardCapabilities,
+    query: queryService,
+    savedDashboard,
+  });
+  const differences = diffDashboardContainerInput(
+    dashboardContainer.getInput(),
+    currentDashboardStateAsInput
+  );
+  if (force) {
+    differences.lastReloadRequestTime = Date.now();
+  }
+
+  if (Object.keys(differences).length !== 0) {
+    const shouldRefetch = Object.keys(differences).some(
+      (changeKey) => !noRefetchKeys.includes(changeKey as keyof DashboardContainerInput)
+    );
+
+    const newSearchSessionId: string | undefined = (() => {
+      // do not update session id if this is irrelevant state change to prevent excessive searches
+      if (!shouldRefetch) return;
+
+      const sessionApi = search.session;
+      let searchSessionIdFromURL = getSearchSessionIdFromURL(history);
+      if (searchSessionIdFromURL) {
+        if (sessionApi.isRestore() && sessionApi.isCurrentSession(searchSessionIdFromURL)) {
+          // navigating away from a restored session
+          kbnUrlStateStorage.kbnUrlControls.updateAsync((nextUrl) => {
+            if (nextUrl.includes(DashboardConstants.SEARCH_SESSION_ID)) {
+              return replaceUrlHashQuery(nextUrl, (query) => {
+                delete query[DashboardConstants.SEARCH_SESSION_ID];
+                return query;
+              });
+            }
+            return nextUrl;
+          });
+          searchSessionIdFromURL = undefined;
+        } else {
+          sessionApi.restore(searchSessionIdFromURL);
+        }
+      }
+
+      return searchSessionIdFromURL ?? sessionApi.start();
+    })();
+
+    dashboardContainer.updateInput({
+      ...differences,
+      ...(newSearchSessionId && { searchSessionId: newSearchSessionId }),
+    });
+  }
+};
+
+const noRefetchKeys: Readonly<Array<keyof DashboardContainerInput>> = [
+  'title',
+  'viewMode',
+  'useMargins',
+  'description',
+  'expandedPanelId',
+  'isFullScreenMode',
+  'isEmbeddedExternally',
+] as const;
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
new file mode 100644
index 0000000000000..2cfd7da6145ee
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_filter_state.ts
@@ -0,0 +1,157 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 _ from 'lodash';
+import { merge } from 'rxjs';
+import { debounceTime, finalize, map, switchMap, tap } from 'rxjs/operators';
+
+import { setQuery } from '../state';
+import { DashboardBuildContext, DashboardState } from '../../types';
+import { DashboardSavedObject } from '../../saved_dashboards';
+import { setFiltersAndQuery } from '../state/dashboard_state_slice';
+import {
+  syncQueryStateWithUrl,
+  connectToQueryState,
+  Filter,
+  Query,
+  waitUntilNextSessionCompletes$,
+  QueryState,
+} from '../../services/data';
+import { cleanFiltersForSerialize } from '.';
+
+type SyncDashboardFilterStateProps = DashboardBuildContext & {
+  initialDashboardState: DashboardState;
+  savedDashboard: DashboardSavedObject;
+};
+
+/**
+ * Applies initial state to the query service, and the saved dashboard search source, then
+ * Sets up syncing and subscriptions between the filter state from the Data plugin
+ * and the dashboard Redux store.
+ */
+export const syncDashboardFilterState = ({
+  search,
+  savedDashboard,
+  kbnUrlStateStorage,
+  query: queryService,
+  initialDashboardState,
+  $checkForUnsavedChanges,
+  $onDashboardStateChange,
+  $triggerDashboardRefresh,
+  dispatchDashboardStateChange,
+}: SyncDashboardFilterStateProps) => {
+  const { filterManager, queryString, timefilter } = queryService;
+  const { timefilter: timefilterService } = timefilter;
+
+  // apply initial filters to the query service and to the saved dashboard
+  filterManager.setAppFilters(_.cloneDeep(initialDashboardState.filters));
+  savedDashboard.searchSource.setField('filter', initialDashboardState.filters);
+
+  // apply initial query to the query service and to the saved dashboard
+  queryString.setQuery(initialDashboardState.query);
+  savedDashboard.searchSource.setField('query', initialDashboardState.query);
+
+  /**
+   * If a global time range is not set explicitly and the time range was saved with the dashboard, apply
+   * initial time range and refresh interval to the query service.
+   */
+  if (initialDashboardState.timeRestore) {
+    const initialGlobalQueryState = kbnUrlStateStorage.get<QueryState>('_g');
+    if (!initialGlobalQueryState?.time) {
+      if (savedDashboard.timeFrom && savedDashboard.timeTo) {
+        timefilterService.setTime({
+          from: savedDashboard.timeFrom,
+          to: savedDashboard.timeTo,
+        });
+      }
+    }
+    if (!initialGlobalQueryState?.refreshInterval) {
+      if (savedDashboard.refreshInterval) {
+        timefilterService.setRefreshInterval(savedDashboard.refreshInterval);
+      }
+    }
+  }
+
+  // this callback will be used any time new filters and query need to be applied.
+  const applyFilters = (query: Query, filters: Filter[]) => {
+    savedDashboard.searchSource.setField('query', query);
+    savedDashboard.searchSource.setField('filter', filters);
+    dispatchDashboardStateChange(setQuery(query));
+  };
+
+  // starts syncing `_g` portion of url with query services
+  const { stop: stopSyncingQueryServiceStateWithUrl } = syncQueryStateWithUrl(
+    queryService,
+    kbnUrlStateStorage
+  );
+
+  // starts syncing app filters between dashboard state and filterManager
+  const intermediateFilterState: { filters: Filter[]; query: Query } = {
+    query: initialDashboardState.query ?? queryString.getDefaultQuery(),
+    filters: initialDashboardState.filters ?? [],
+  };
+  const stopSyncingAppFilters = connectToQueryState(
+    queryService,
+    {
+      get: () => intermediateFilterState,
+      set: ({ filters, query }) => {
+        intermediateFilterState.filters = cleanFiltersForSerialize(filters ?? []) || [];
+        intermediateFilterState.query = query || queryString.getDefaultQuery();
+        dispatchDashboardStateChange(setFiltersAndQuery(intermediateFilterState));
+      },
+      state$: $onDashboardStateChange.pipe(
+        map((appState) => ({
+          filters: appState.filters,
+          query: appState.query,
+        }))
+      ),
+    },
+    {
+      query: true,
+      filters: true,
+    }
+  );
+
+  // apply filters when the filter manager changes
+  const filterManagerSubscription = merge(filterManager.getUpdates$(), queryString.getUpdates$())
+    .pipe(debounceTime(100))
+    .subscribe(() => applyFilters(queryString.getQuery(), filterManager.getFilters()));
+
+  const timeRefreshSubscription = merge(
+    ...[timefilterService.getRefreshIntervalUpdate$(), timefilterService.getTimeUpdate$()]
+  ).subscribe(() => {
+    $triggerDashboardRefresh.next();
+
+    // manually check for unsaved changes here because the time range is not stored on the dashboardState,
+    // but it could trigger the unsaved changes badge.
+    $checkForUnsavedChanges.next();
+  });
+
+  const forceRefreshSubscription = timefilterService
+    .getAutoRefreshFetch$()
+    .pipe(
+      tap(() => {
+        $triggerDashboardRefresh.next({ force: true });
+      }),
+      switchMap((done) =>
+        // best way on a dashboard to estimate that panels are updated is to rely on search session service state
+        waitUntilNextSessionCompletes$(search.session).pipe(finalize(done))
+      )
+    )
+    .subscribe();
+
+  const stopSyncingDashboardFilterState = () => {
+    filterManagerSubscription.unsubscribe();
+    forceRefreshSubscription.unsubscribe();
+    timeRefreshSubscription.unsubscribe();
+    stopSyncingQueryServiceStateWithUrl();
+    stopSyncingAppFilters();
+  };
+
+  return { applyFilters, stopSyncingDashboardFilterState };
+};
diff --git a/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts b/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts
new file mode 100644
index 0000000000000..b2873febee0d8
--- /dev/null
+++ b/src/plugins/dashboard/public/application/lib/sync_dashboard_index_patterns.ts
@@ -0,0 +1,86 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { uniqBy } from 'lodash';
+import deepEqual from 'fast-deep-equal';
+import { merge, Observable, pipe } from 'rxjs';
+import { distinctUntilChanged, switchMap, startWith, filter, mapTo, map } from 'rxjs/operators';
+
+import { DashboardContainer } from '..';
+import { isErrorEmbeddable } from '../../services/embeddable';
+import { IndexPattern, IndexPatternsContract } from '../../services/data';
+
+interface SyncDashboardIndexPatternsProps {
+  dashboardContainer: DashboardContainer;
+  indexPatterns: IndexPatternsContract;
+  onUpdateIndexPatterns: (newIndexPatterns: IndexPattern[]) => void;
+}
+
+export const syncDashboardIndexPatterns = ({
+  dashboardContainer,
+  indexPatterns,
+  onUpdateIndexPatterns,
+}: SyncDashboardIndexPatternsProps) => {
+  const updateIndexPatternsOperator = pipe(
+    filter((container: DashboardContainer) => !!container && !isErrorEmbeddable(container)),
+    map((container: DashboardContainer): IndexPattern[] => {
+      let panelIndexPatterns: IndexPattern[] = [];
+      Object.values(container.getChildIds()).forEach((id) => {
+        const embeddableInstance = container.getChild(id);
+        if (isErrorEmbeddable(embeddableInstance)) return;
+        const embeddableIndexPatterns = (embeddableInstance.getOutput() as any).indexPatterns;
+        if (!embeddableIndexPatterns) return;
+        panelIndexPatterns.push(...embeddableIndexPatterns);
+      });
+      panelIndexPatterns = uniqBy(panelIndexPatterns, 'id');
+      return panelIndexPatterns;
+    }),
+    distinctUntilChanged((a, b) =>
+      deepEqual(
+        a.map((ip) => ip && ip.id),
+        b.map((ip) => ip && ip.id)
+      )
+    ),
+    // using switchMap for previous task cancellation
+    switchMap((panelIndexPatterns: IndexPattern[]) => {
+      return new Observable((observer) => {
+        if (panelIndexPatterns && panelIndexPatterns.length > 0) {
+          if (observer.closed) return;
+          onUpdateIndexPatterns(panelIndexPatterns);
+          observer.complete();
+        } else {
+          indexPatterns.getDefault().then((defaultIndexPattern) => {
+            if (observer.closed) return;
+            onUpdateIndexPatterns([defaultIndexPattern as IndexPattern]);
+            observer.complete();
+          });
+        }
+      });
+    })
+  );
+
+  return merge(
+    // output of dashboard container itself
+    dashboardContainer.getOutput$(),
+    // plus output of dashboard container children,
+    // children may change, so make sure we subscribe/unsubscribe with switchMap
+    dashboardContainer.getOutput$().pipe(
+      map(() => dashboardContainer!.getChildIds()),
+      distinctUntilChanged(deepEqual),
+      switchMap((newChildIds: string[]) =>
+        merge(...newChildIds.map((childId) => dashboardContainer!.getChild(childId).getOutput$()))
+      )
+    )
+  )
+    .pipe(
+      mapTo(dashboardContainer),
+      startWith(dashboardContainer), // to trigger initial index pattern update
+      updateIndexPatternsOperator
+    )
+    .subscribe();
+};
diff --git a/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts b/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts
deleted file mode 100644
index 286414ed30eac..0000000000000
--- a/src/plugins/dashboard/public/application/lib/update_saved_dashboard.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 _ from 'lodash';
-import type { SavedObjectTagDecoratorTypeGuard } from '../../services/saved_objects_tagging_oss';
-import { RefreshInterval, TimefilterContract, esFilters } from '../../services/data';
-import { FilterUtils } from './filter_utils';
-import { DashboardSavedObject } from '../../saved_dashboards';
-import { DashboardAppState } from '../../types';
-
-export function updateSavedDashboard(
-  savedDashboard: DashboardSavedObject,
-  appState: DashboardAppState,
-  timeFilter: TimefilterContract,
-  hasTaggingCapabilities: SavedObjectTagDecoratorTypeGuard,
-  toJson: <T>(object: T) => string
-) {
-  savedDashboard.title = appState.title;
-  savedDashboard.description = appState.description;
-  savedDashboard.timeRestore = appState.timeRestore;
-  savedDashboard.panelsJSON = toJson(appState.panels);
-  savedDashboard.optionsJSON = toJson(appState.options);
-
-  if (hasTaggingCapabilities(savedDashboard)) {
-    savedDashboard.setTags(appState.tags);
-  }
-
-  savedDashboard.timeFrom = savedDashboard.timeRestore
-    ? FilterUtils.convertTimeToUTCString(timeFilter.getTime().from)
-    : undefined;
-  savedDashboard.timeTo = savedDashboard.timeRestore
-    ? FilterUtils.convertTimeToUTCString(timeFilter.getTime().to)
-    : undefined;
-  const timeRestoreObj: RefreshInterval = _.pick(timeFilter.getRefreshInterval(), [
-    'display',
-    'pause',
-    'section',
-    'value',
-  ]) as RefreshInterval;
-  savedDashboard.refreshInterval = savedDashboard.timeRestore ? timeRestoreObj : undefined;
-
-  // save only unpinned filters
-  const unpinnedFilters = savedDashboard
-    .getFilters()
-    .filter((filter) => !esFilters.isFilterPinned(filter));
-  savedDashboard.searchSource.setField('filter', unpinnedFilters);
-}
diff --git a/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx b/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
index 726d647abe212..e3f7b32ef8223 100644
--- a/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
+++ b/src/plugins/dashboard/public/application/listing/confirm_overlays.tsx
@@ -19,13 +19,10 @@ import {
   EUI_MODAL_CANCEL_BUTTON,
 } from '@elastic/eui';
 import React from 'react';
+
 import { OverlayStart } from '../../../../../core/public';
-import {
-  createConfirmStrings,
-  discardConfirmStrings,
-  leaveEditModeConfirmStrings,
-} from '../../dashboard_strings';
 import { toMountPoint } from '../../services/kibana_react';
+import { createConfirmStrings, discardConfirmStrings } from '../../dashboard_strings';
 
 export type DiscardOrKeepSelection = 'cancel' | 'discard' | 'keep';
 
@@ -44,76 +41,6 @@ export const confirmDiscardUnsavedChanges = (overlays: OverlayStart, discardCall
       }
     });
 
-export const confirmDiscardOrKeepUnsavedChanges = (
-  overlays: OverlayStart
-): Promise<DiscardOrKeepSelection> => {
-  const titleId = 'confirmDiscardOrKeepTitle';
-  const descriptionId = 'confirmDiscardOrKeepDescription';
-
-  return new Promise((resolve) => {
-    const session = overlays.openModal(
-      toMountPoint(
-        <EuiFocusTrap clickOutsideDisables={true} initialFocus={'.discardConfirmKeepButton'}>
-          <EuiOutsideClickDetector onOutsideClick={() => session.close()}>
-            <div
-              role="dialog"
-              aria-modal="true"
-              aria-labelledby={titleId}
-              aria-describedby={descriptionId}
-            >
-              <EuiModalHeader data-test-subj="dashboardDiscardConfirm">
-                <EuiModalHeaderTitle>
-                  <h2 id={titleId}>{leaveEditModeConfirmStrings.getLeaveEditModeTitle()}</h2>
-                </EuiModalHeaderTitle>
-              </EuiModalHeader>
-
-              <EuiModalBody>
-                <EuiText>
-                  <p id={descriptionId}>{leaveEditModeConfirmStrings.getLeaveEditModeSubtitle()}</p>
-                </EuiText>
-              </EuiModalBody>
-
-              <EuiModalFooter>
-                <EuiButtonEmpty
-                  data-test-subj="dashboardDiscardConfirmCancel"
-                  onClick={() => session.close()}
-                >
-                  {leaveEditModeConfirmStrings.getLeaveEditModeCancelButtonText()}
-                </EuiButtonEmpty>
-                <EuiButtonEmpty
-                  color="danger"
-                  data-test-subj="dashboardDiscardConfirmDiscard"
-                  onClick={() => {
-                    session.close();
-                    resolve('discard');
-                  }}
-                >
-                  {leaveEditModeConfirmStrings.getLeaveEditModeDiscardButtonText()}
-                </EuiButtonEmpty>
-                <EuiButton
-                  fill
-                  data-test-subj="dashboardDiscardConfirmKeep"
-                  className="discardConfirmKeepButton"
-                  onClick={() => {
-                    session.close();
-                    resolve('keep');
-                  }}
-                >
-                  {leaveEditModeConfirmStrings.getLeaveEditModeKeepChangesText()}
-                </EuiButton>
-              </EuiModalFooter>
-            </div>
-          </EuiOutsideClickDetector>
-        </EuiFocusTrap>
-      ),
-      {
-        'data-test-subj': 'dashboardDiscardConfirmModal',
-        maxWidth: 550,
-      }
-    );
-  });
-};
-
 export const confirmCreateWithUnsaved = (
   overlays: OverlayStart,
   startBlankCallback: () => void,
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 022c830b180b6..7602b2ed68b62 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.test.tsx
@@ -6,80 +6,16 @@
  * Side Public License, v 1.
  */
 
+import React from 'react';
 import { mount } from 'enzyme';
-import {
-  IUiSettingsClient,
-  PluginInitializerContext,
-  ScopedHistory,
-  SimpleSavedObject,
-} from '../../../../../core/public';
+import { I18nProvider } from '@kbn/i18n/react';
 
-import { SavedObjectLoader, SavedObjectLoaderFindOptions } from '../../services/saved_objects';
-import { IndexPatternsContract, SavedQueryService } from '../../services/data';
-import { NavigationPublicPluginStart } from '../../services/navigation';
+import { DashboardAppServices } from '../../types';
+import { SimpleSavedObject } from '../../../../../core/public';
 import { KibanaContextProvider } from '../../services/kibana_react';
 import { createKbnUrlStateStorage } from '../../services/kibana_utils';
-
-import { savedObjectsPluginMock } from '../../../../saved_objects/public/mocks';
 import { DashboardListing, DashboardListingProps } from './dashboard_listing';
-import { embeddablePluginMock } from '../../../../embeddable/public/mocks';
-import { visualizationsPluginMock } from '../../../../visualizations/public/mocks';
-import { DashboardAppServices, DashboardCapabilities } from '../types';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { chromeServiceMock, coreMock } from '../../../../../core/public/mocks';
-import { I18nProvider } from '@kbn/i18n/react';
-import React from 'react';
-import { UrlForwardingStart } from '../../../../url_forwarding/public';
-import { DashboardPanelStorage } from '../lib';
-
-function makeDefaultServices(): DashboardAppServices {
-  const core = coreMock.createStart();
-  const savedDashboards = {} as SavedObjectLoader;
-  savedDashboards.find = (search: string, sizeOrOptions: number | SavedObjectLoaderFindOptions) => {
-    const size = typeof sizeOrOptions === 'number' ? sizeOrOptions : sizeOrOptions.size ?? 10;
-    const hits = [];
-    for (let i = 0; i < size; i++) {
-      hits.push({
-        id: `dashboard${i}`,
-        title: `dashboard${i} - ${search} - title`,
-        description: `dashboard${i} desc`,
-      });
-    }
-    return Promise.resolve({
-      total: size,
-      hits,
-    });
-  };
-  const dashboardPanelStorage = ({
-    getDashboardIdsWithUnsavedChanges: jest
-      .fn()
-      .mockResolvedValue(['dashboardUnsavedOne', 'dashboardUnsavedTwo']),
-  } as unknown) as DashboardPanelStorage;
-
-  return {
-    savedObjects: savedObjectsPluginMock.createStartContract(),
-    embeddable: embeddablePluginMock.createInstance().doStart(),
-    dashboardCapabilities: {} as DashboardCapabilities,
-    initializerContext: {} as PluginInitializerContext,
-    chrome: chromeServiceMock.createStartContract(),
-    navigation: {} as NavigationPublicPluginStart,
-    savedObjectsClient: core.savedObjects.client,
-    data: dataPluginMock.createStartContract(),
-    indexPatterns: {} as IndexPatternsContract,
-    scopedHistory: () => ({} as ScopedHistory),
-    savedQueryService: {} as SavedQueryService,
-    setHeaderActionMenu: (mountPoint) => {},
-    urlForwarding: {} as UrlForwardingStart,
-    uiSettings: {} as IUiSettingsClient,
-    restorePreviousUrl: () => {},
-    onAppLeave: (handler) => {},
-    allowByValueEmbeddables: true,
-    dashboardPanelStorage,
-    savedDashboards,
-    core,
-    visualizations: visualizationsPluginMock.createStartContract(),
-  };
-}
+import { makeDefaultServices } from '../test_helpers';
 
 function makeDefaultProps(): DashboardListingProps {
   return {
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
index e2c11d614d797..eaa4746566002 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_listing.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiLink, EuiButton, EuiEmptyPrompt } from '@elastic/eui';
 import React, { Fragment, useCallback, useEffect, useMemo, useState } from 'react';
 import { attemptLoadDashboardByTitle } from '../lib';
-import { DashboardAppServices, DashboardRedirect } from '../types';
+import { DashboardAppServices, DashboardRedirect } from '../../types';
 import { getDashboardBreadcrumb, dashboardListingTable } from '../../dashboard_strings';
 import { ApplicationStart, SavedObjectsFindOptionsReference } from '../../../../../core/public';
 import { syncQueryStateWithUrl } from '../../services/data';
@@ -43,13 +43,13 @@ export const DashboardListing = ({
       savedObjectsClient,
       savedObjectsTagging,
       dashboardCapabilities,
-      dashboardPanelStorage,
+      dashboardSessionStorage,
       chrome: { setBreadcrumbs },
     },
   } = useKibana<DashboardAppServices>();
 
   const [unsavedDashboardIds, setUnsavedDashboardIds] = useState<string[]>(
-    dashboardPanelStorage.getDashboardIdsWithUnsavedChanges()
+    dashboardSessionStorage.getDashboardIdsWithUnsavedChanges()
   );
 
   // Set breadcrumbs useEffect
@@ -104,19 +104,19 @@ export const DashboardListing = ({
   );
 
   const createItem = useCallback(() => {
-    if (!dashboardPanelStorage.dashboardHasUnsavedEdits()) {
+    if (!dashboardSessionStorage.dashboardHasUnsavedEdits()) {
       redirectTo({ destination: 'dashboard' });
     } else {
       confirmCreateWithUnsaved(
         core.overlays,
         () => {
-          dashboardPanelStorage.clearPanels();
+          dashboardSessionStorage.clearState();
           redirectTo({ destination: 'dashboard' });
         },
         () => redirectTo({ destination: 'dashboard' })
       );
     }
-  }, [dashboardPanelStorage, redirectTo, core.overlays]);
+  }, [dashboardSessionStorage, redirectTo, core.overlays]);
 
   const emptyPrompt = useMemo(
     () => getNoItemsMessage(hideWriteControls, core.application, createItem),
@@ -145,11 +145,11 @@ export const DashboardListing = ({
 
   const deleteItems = useCallback(
     (dashboards: Array<{ id: string }>) => {
-      dashboards.map((d) => dashboardPanelStorage.clearPanels(d.id));
-      setUnsavedDashboardIds(dashboardPanelStorage.getDashboardIdsWithUnsavedChanges());
+      dashboards.map((d) => dashboardSessionStorage.clearState(d.id));
+      setUnsavedDashboardIds(dashboardSessionStorage.getDashboardIdsWithUnsavedChanges());
       return savedDashboards.delete(dashboards.map((d) => d.id));
     },
-    [savedDashboards, dashboardPanelStorage]
+    [savedDashboards, dashboardSessionStorage]
   );
 
   const editItem = useCallback(
@@ -196,7 +196,7 @@ export const DashboardListing = ({
         redirectTo={redirectTo}
         unsavedDashboardIds={unsavedDashboardIds}
         refreshUnsavedDashboards={() =>
-          setUnsavedDashboardIds(dashboardPanelStorage.getDashboardIdsWithUnsavedChanges())
+          setUnsavedDashboardIds(dashboardSessionStorage.getDashboardIdsWithUnsavedChanges())
         }
       />
     </TableListView>
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_no_match.tsx b/src/plugins/dashboard/public/application/listing/dashboard_no_match.tsx
index a649bf37dfae9..03f7b0e162229 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_no_match.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_no_match.tsx
@@ -6,14 +6,14 @@
  * Side Public License, v 1.
  */
 
-import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
+import React, { useEffect } from 'react';
 import { EuiCallOut } from '@elastic/eui';
-
+import { FormattedMessage } from '@kbn/i18n/react';
 import { RouteComponentProps } from 'react-router-dom';
+
 import { useKibana, toMountPoint } from '../../services/kibana_react';
-import { DashboardAppServices } from '../types';
+import { DashboardAppServices } from '../../types';
 import { DashboardConstants } from '../..';
 
 let bannerId: string | undefined;
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx
index 13688b4061be9..8f53c16749fe6 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.test.tsx
@@ -11,14 +11,14 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 import { waitFor } from '@testing-library/react';
 import { mount } from 'enzyme';
 import React from 'react';
+
 import { DashboardSavedObject } from '../..';
-import { coreMock } from '../../../../../core/public/mocks';
-import { KibanaContextProvider } from '../../services/kibana_react';
+import { DashboardAppServices } from '../../types';
 import { SavedObjectLoader } from '../../services/saved_objects';
-import { DashboardPanelStorage } from '../lib';
-import { DASHBOARD_PANELS_UNSAVED_ID } from '../lib/dashboard_panel_storage';
-import { DashboardAppServices } from '../types';
+import { KibanaContextProvider } from '../../services/kibana_react';
+import { DASHBOARD_PANELS_UNSAVED_ID } from '../lib/dashboard_session_storage';
 import { DashboardUnsavedListing, DashboardUnsavedListingProps } from './dashboard_unsaved_listing';
+import { makeDefaultServices } from '../test_helpers';
 
 const mockedDashboards: { [key: string]: DashboardSavedObject } = {
   dashboardUnsavedOne: {
@@ -35,20 +35,16 @@ const mockedDashboards: { [key: string]: DashboardSavedObject } = {
   } as DashboardSavedObject,
 };
 
-function makeDefaultServices(): DashboardAppServices {
-  const core = coreMock.createStart();
-  core.overlays.openConfirm = jest.fn().mockResolvedValue(true);
+function makeServices(): DashboardAppServices {
+  const services = makeDefaultServices();
   const savedDashboards = {} as SavedObjectLoader;
   savedDashboards.get = jest
     .fn()
     .mockImplementation((id: string) => Promise.resolve(mockedDashboards[id]));
-  const dashboardPanelStorage = {} as DashboardPanelStorage;
-  dashboardPanelStorage.clearPanels = jest.fn();
-  return ({
-    dashboardPanelStorage,
+  return {
+    ...services,
     savedDashboards,
-    core,
-  } as unknown) as DashboardAppServices;
+  };
 }
 
 const makeDefaultProps = (): DashboardUnsavedListingProps => ({
@@ -64,7 +60,7 @@ function mountWith({
   services?: DashboardAppServices;
   props?: DashboardUnsavedListingProps;
 }) {
-  const services = incomingServices ?? makeDefaultServices();
+  const services = incomingServices ?? makeServices();
   const props = incomingProps ?? makeDefaultProps();
   const wrappingComponent: React.FC<{
     children: React.ReactNode;
@@ -140,14 +136,14 @@ describe('Unsaved listing', () => {
     waitFor(() => {
       component.update();
       expect(services.core.overlays.openConfirm).toHaveBeenCalled();
-      expect(services.dashboardPanelStorage.clearPanels).toHaveBeenCalledWith(
+      expect(services.dashboardSessionStorage.clearState).toHaveBeenCalledWith(
         'dashboardUnsavedOne'
       );
     });
   });
 
   it('removes unsaved changes from any dashboard which errors on fetch', async () => {
-    const services = makeDefaultServices();
+    const services = makeServices();
     const props = makeDefaultProps();
     services.savedDashboards.get = jest.fn().mockImplementation((id: string) => {
       if (id === 'failCase1' || id === 'failCase2') {
@@ -166,12 +162,12 @@ describe('Unsaved listing', () => {
     const { component } = mountWith({ services, props });
     waitFor(() => {
       component.update();
-      expect(services.dashboardPanelStorage.clearPanels).toHaveBeenCalledWith('failCase1');
-      expect(services.dashboardPanelStorage.clearPanels).toHaveBeenCalledWith('failCase2');
+      expect(services.dashboardSessionStorage.clearState).toHaveBeenCalledWith('failCase1');
+      expect(services.dashboardSessionStorage.clearState).toHaveBeenCalledWith('failCase2');
 
       // clearing panels from dashboard with errors should cause getDashboardIdsWithUnsavedChanges to be called again.
       expect(
-        services.dashboardPanelStorage.getDashboardIdsWithUnsavedChanges
+        services.dashboardSessionStorage.getDashboardIdsWithUnsavedChanges
       ).toHaveBeenCalledTimes(2);
     });
   });
diff --git a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx
index 66e8b2348490a..acff60d9bac3d 100644
--- a/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx
+++ b/src/plugins/dashboard/public/application/listing/dashboard_unsaved_listing.tsx
@@ -19,8 +19,8 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { DashboardSavedObject } from '../..';
 import { dashboardUnsavedListingStrings, getNewDashboardTitle } from '../../dashboard_strings';
 import { useKibana } from '../../services/kibana_react';
-import { DASHBOARD_PANELS_UNSAVED_ID } from '../lib/dashboard_panel_storage';
-import { DashboardAppServices, DashboardRedirect } from '../types';
+import { DASHBOARD_PANELS_UNSAVED_ID } from '../lib/dashboard_session_storage';
+import { DashboardAppServices, DashboardRedirect } from '../../types';
 import { confirmDiscardUnsavedChanges } from './confirm_overlays';
 
 const DashboardUnsavedItem = ({
@@ -115,7 +115,7 @@ export const DashboardUnsavedListing = ({
 }: DashboardUnsavedListingProps) => {
   const {
     services: {
-      dashboardPanelStorage,
+      dashboardSessionStorage,
       savedDashboards,
       core: { overlays },
     },
@@ -133,11 +133,11 @@ export const DashboardUnsavedListing = ({
   const onDiscard = useCallback(
     (id?: string) => {
       confirmDiscardUnsavedChanges(overlays, () => {
-        dashboardPanelStorage.clearPanels(id);
+        dashboardSessionStorage.clearState(id);
         refreshUnsavedDashboards();
       });
     },
-    [overlays, refreshUnsavedDashboards, dashboardPanelStorage]
+    [overlays, refreshUnsavedDashboards, dashboardSessionStorage]
   );
 
   useEffect(() => {
@@ -161,7 +161,7 @@ export const DashboardUnsavedListing = ({
       const newItems = dashboards.reduce((map, dashboard) => {
         if (typeof dashboard === 'string') {
           hasError = true;
-          dashboardPanelStorage.clearPanels(dashboard);
+          dashboardSessionStorage.clearState(dashboard);
           return map;
         }
         return {
@@ -178,7 +178,7 @@ export const DashboardUnsavedListing = ({
     return () => {
       canceled = true;
     };
-  }, [savedDashboards, dashboardPanelStorage, refreshUnsavedDashboards, unsavedDashboardIds]);
+  }, [savedDashboards, dashboardSessionStorage, refreshUnsavedDashboards, unsavedDashboardIds]);
 
   return unsavedDashboardIds.length === 0 ? null : (
     <>
diff --git a/src/plugins/dashboard/public/application/state/dashboard_state_hooks.ts b/src/plugins/dashboard/public/application/state/dashboard_state_hooks.ts
new file mode 100644
index 0000000000000..abc346d4bbaa3
--- /dev/null
+++ b/src/plugins/dashboard/public/application/state/dashboard_state_hooks.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 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 { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
+import type { DashboardRootState, DashboardDispatch } from './dashboard_state_store';
+
+export const useDashboardDispatch = () => useDispatch<DashboardDispatch>();
+export const useDashboardSelector: TypedUseSelectorHook<DashboardRootState> = useSelector;
diff --git a/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts b/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts
new file mode 100644
index 0000000000000..1acf806ae2f0d
--- /dev/null
+++ b/src/plugins/dashboard/public/application/state/dashboard_state_slice.ts
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { createSlice, PayloadAction } from '@reduxjs/toolkit';
+
+import { Filter, Query } from '../../services/data';
+import { ViewMode } from '../../services/embeddable';
+import { DashboardOptions, DashboardPanelMap, DashboardState } from '../../types';
+
+export const dashboardStateSlice = createSlice({
+  name: 'dashboardState',
+  initialState: {} as DashboardState,
+  reducers: {
+    setDashboardState: (state, action: PayloadAction<DashboardState>) => {
+      return action.payload;
+    },
+    updateState: (state, action: PayloadAction<Partial<DashboardState>>) => {
+      state = { ...state, ...action.payload };
+    },
+    setDashboardOptions: (state, action: PayloadAction<DashboardOptions>) => {
+      state.options = action.payload;
+    },
+    setStateFromSaveModal: (
+      state,
+      action: PayloadAction<{
+        title: string;
+        description: string;
+        tags?: string[];
+        timeRestore: boolean;
+      }>
+    ) => {
+      state.title = action.payload.title;
+      state.description = action.payload.description;
+      state.timeRestore = action.payload.timeRestore;
+      if (action.payload.tags) {
+        state.tags = action.payload.tags;
+      }
+    },
+    setUseMargins: (state, action: PayloadAction<boolean>) => {
+      state.options.useMargins = action.payload;
+    },
+    setSyncColors: (state, action: PayloadAction<boolean>) => {
+      state.options.syncColors = action.payload;
+    },
+    setHidePanelTitles: (state, action: PayloadAction<boolean>) => {
+      state.options.hidePanelTitles = action.payload;
+    },
+    setPanels: (state, action: PayloadAction<DashboardPanelMap>) => {
+      state.panels = action.payload;
+    },
+    setExpandedPanelId: (state, action: PayloadAction<string | undefined>) => {
+      state.expandedPanelId = action.payload;
+    },
+    setFullScreenMode: (state, action: PayloadAction<boolean>) => {
+      state.fullScreenMode = action.payload;
+    },
+    setSavedQueryId: (state, action: PayloadAction<string | undefined>) => {
+      state.savedQuery = action.payload;
+    },
+    setTimeRestore: (state, action: PayloadAction<boolean>) => {
+      state.timeRestore = action.payload;
+    },
+    setDescription: (state, action: PayloadAction<string>) => {
+      state.description = action.payload;
+    },
+    setViewMode: (state, action: PayloadAction<ViewMode>) => {
+      state.viewMode = action.payload;
+    },
+    setFiltersAndQuery: (state, action: PayloadAction<{ filters: Filter[]; query: Query }>) => {
+      state.filters = action.payload.filters;
+      state.query = action.payload.query;
+    },
+    setFilters: (state, action: PayloadAction<Filter[]>) => {
+      state.filters = action.payload;
+    },
+    setTags: (state, action: PayloadAction<string[]>) => {
+      state.tags = action.payload;
+    },
+    setTitle: (state, action: PayloadAction<string>) => {
+      state.description = action.payload;
+    },
+    setQuery: (state, action: PayloadAction<Query>) => {
+      state.query = action.payload;
+    },
+  },
+});
+
+export const {
+  setStateFromSaveModal,
+  setDashboardOptions,
+  setExpandedPanelId,
+  setHidePanelTitles,
+  setFiltersAndQuery,
+  setDashboardState,
+  setFullScreenMode,
+  setSavedQueryId,
+  setDescription,
+  setTimeRestore,
+  setSyncColors,
+  setUseMargins,
+  setViewMode,
+  setFilters,
+  setPanels,
+  setTitle,
+  setQuery,
+  setTags,
+} = dashboardStateSlice.actions;
diff --git a/src/plugins/dashboard/public/application/state/dashboard_state_store.ts b/src/plugins/dashboard/public/application/state/dashboard_state_store.ts
new file mode 100644
index 0000000000000..76bc2c2fb1c77
--- /dev/null
+++ b/src/plugins/dashboard/public/application/state/dashboard_state_store.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { configureStore } from '@reduxjs/toolkit';
+import { dashboardStateSlice } from './dashboard_state_slice';
+
+export const dashboardStateStore = configureStore({
+  reducer: { dashboardStateReducer: dashboardStateSlice.reducer },
+});
+
+export type DashboardRootState = ReturnType<typeof dashboardStateStore.getState>;
+export type DashboardDispatch = typeof dashboardStateStore.dispatch;
diff --git a/src/plugins/dashboard/public/application/state/index.ts b/src/plugins/dashboard/public/application/state/index.ts
new file mode 100644
index 0000000000000..d394876173160
--- /dev/null
+++ b/src/plugins/dashboard/public/application/state/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 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 './dashboard_state_slice';
+
+export { dashboardStateStore } from './dashboard_state_store';
+export { useDashboardDispatch, useDashboardSelector } from './dashboard_state_hooks';
diff --git a/src/plugins/dashboard/public/application/test_helpers/get_sample_dashboard_input.ts b/src/plugins/dashboard/public/application/test_helpers/get_sample_dashboard_input.ts
index fb160568fa4f4..46be5b3b16d84 100644
--- a/src/plugins/dashboard/public/application/test_helpers/get_sample_dashboard_input.ts
+++ b/src/plugins/dashboard/public/application/test_helpers/get_sample_dashboard_input.ts
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+import { DashboardContainerInput } from '../..';
+import { DashboardPanelState } from '../embeddable';
 import { ViewMode, EmbeddableInput } from '../../services/embeddable';
-import { DashboardContainerInput, DashboardPanelState } from '../embeddable';
 
 export function getSampleDashboardInput(
   overrides?: Partial<DashboardContainerInput>
diff --git a/src/plugins/dashboard/public/application/test_helpers/index.ts b/src/plugins/dashboard/public/application/test_helpers/index.ts
index d782fb67d039b..d26eadec8f1c9 100644
--- a/src/plugins/dashboard/public/application/test_helpers/index.ts
+++ b/src/plugins/dashboard/public/application/test_helpers/index.ts
@@ -8,3 +8,4 @@
 
 export { getSampleDashboardInput, getSampleDashboardPanel } from './get_sample_dashboard_input';
 export { getSavedDashboardMock } from './get_saved_dashboard_mock';
+export { makeDefaultServices } from './make_default_services';
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
new file mode 100644
index 0000000000000..41da74dbba778
--- /dev/null
+++ b/src/plugins/dashboard/public/application/test_helpers/make_default_services.ts
@@ -0,0 +1,97 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { 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 { IndexPatternsContract, SavedQueryService } from '../../services/data';
+import { savedObjectsPluginMock } from '../../../../saved_objects/public/mocks';
+import { visualizationsPluginMock } from '../../../../visualizations/public/mocks';
+import { PluginInitializerContext, ScopedHistory } from '../../../../../core/public';
+import { SavedObjectLoader, SavedObjectLoaderFindOptions } from '../../services/saved_objects';
+import {
+  chromeServiceMock,
+  coreMock,
+  uiSettingsServiceMock,
+} from '../../../../../core/public/mocks';
+
+export function makeDefaultServices(): DashboardAppServices {
+  const core = coreMock.createStart();
+  core.overlays.openConfirm = jest.fn().mockResolvedValue(true);
+
+  const savedDashboards = {} as SavedObjectLoader;
+  savedDashboards.find = (search: string, sizeOrOptions: number | SavedObjectLoaderFindOptions) => {
+    const size = typeof sizeOrOptions === 'number' ? sizeOrOptions : sizeOrOptions.size ?? 10;
+    const hits = [];
+    for (let i = 0; i < size; i++) {
+      hits.push({
+        id: `dashboard${i}`,
+        title: `dashboard${i} - ${search} - title`,
+        description: `dashboard${i} desc`,
+      });
+    }
+    return Promise.resolve({
+      total: size,
+      hits,
+    });
+  };
+  savedDashboards.get = jest
+    .fn()
+    .mockImplementation((id?: string) => Promise.resolve(getSavedDashboardMock({ id })));
+
+  const dashboardSessionStorage = ({
+    getDashboardIdsWithUnsavedChanges: jest
+      .fn()
+      .mockResolvedValue(['dashboardUnsavedOne', 'dashboardUnsavedTwo']),
+    getState: jest.fn().mockReturnValue(undefined),
+    setState: jest.fn(),
+  } as unknown) as DashboardSessionStorage;
+  dashboardSessionStorage.clearState = jest.fn();
+
+  const defaultCapabilities: DashboardAppCapabilities = {
+    show: true,
+    createNew: true,
+    saveQuery: true,
+    createShortUrl: true,
+    hideWriteControls: false,
+    storeSearchSession: true,
+    mapsCapabilities: { save: true },
+    visualizeCapabilities: { save: true },
+  };
+  const initializerContext = {
+    env: { packageInfo: { version: '8.0.0' } },
+  } as PluginInitializerContext;
+
+  return {
+    visualizations: visualizationsPluginMock.createStartContract(),
+    savedObjects: savedObjectsPluginMock.createStartContract(),
+    embeddable: embeddablePluginMock.createInstance().doStart(),
+    uiSettings: uiSettingsServiceMock.createStartContract(),
+    chrome: chromeServiceMock.createStartContract(),
+    navigation: {} as NavigationPublicPluginStart,
+    savedObjectsClient: core.savedObjects.client,
+    dashboardCapabilities: defaultCapabilities,
+    data: dataPluginMock.createStartContract(),
+    indexPatterns: {} as IndexPatternsContract,
+    savedQueryService: {} as SavedQueryService,
+    scopedHistory: () => ({} as ScopedHistory),
+    setHeaderActionMenu: (mountPoint) => {},
+    urlForwarding: {} as UrlForwardingStart,
+    allowByValueEmbeddables: true,
+    restorePreviousUrl: () => {},
+    onAppLeave: (handler) => {},
+    dashboardSessionStorage,
+    initializerContext,
+    savedDashboards,
+    core,
+  };
+}
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 e1a62fe980f55..1cfa39d5e0e79 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
@@ -7,92 +7,94 @@
  */
 
 import { METRIC_TYPE } from '@kbn/analytics';
+import { Required } from '@kbn/utility-types';
 import { EuiHorizontalRule } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import angular from 'angular';
+import UseUnmount from 'react-use/lib/useUnmount';
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
 
-import UseUnmount from 'react-use/lib/useUnmount';
+import { saveDashboard } from '../lib';
+import { TopNavIds } from './top_nav_ids';
+import { EditorMenu } from './editor_menu';
 import { UI_SETTINGS } from '../../../common';
+import { SavedQuery } from '../../services/data';
+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';
+import { getSavedObjectFinder, SaveResult, showSaveModal } from '../../services/saved_objects';
+import { getCreateVisualizationButtonTitle, unsavedChangesBadge } from '../../dashboard_strings';
+import {
+  setFullScreenMode,
+  setHidePanelTitles,
+  setSavedQueryId,
+  setStateFromSaveModal,
+  setSyncColors,
+  setUseMargins,
+  setViewMode,
+  useDashboardDispatch,
+  useDashboardSelector,
+} from '../state';
+
 import {
   AddFromLibraryButton,
+  LazyLabsFlyout,
   PrimaryActionButton,
   QuickButtonGroup,
-  SolutionToolbar,
   QuickButtonProps,
+  SolutionToolbar,
+  withSuspense,
 } from '../../../../presentation_util/public';
-import { useKibana } from '../../services/kibana_react';
-import { IndexPattern, SavedQuery, TimefilterContract } from '../../services/data';
-import { isErrorEmbeddable, openAddPanelFlyout, ViewMode } from '../../services/embeddable';
-import {
-  getSavedObjectFinder,
-  SavedObjectSaveOpts,
-  SaveResult,
-  showSaveModal,
-} from '../../services/saved_objects';
-import { LazyLabsFlyout, withSuspense } from '../../../../presentation_util/public';
-
-import { NavAction } from '../../types';
-import { DashboardSavedObject } from '../..';
-import { DashboardStateManager } from '../dashboard_state_manager';
-import { saveDashboard } from '../lib';
-import {
-  DashboardAppServices,
-  DashboardEmbedSettings,
-  DashboardRedirect,
-  DashboardSaveOptions,
-} from '../types';
-import { getTopNavConfig } from './get_top_nav_config';
-import { DashboardSaveModal } from './save_modal';
-import { showCloneModal } from './show_clone_modal';
-import { showOptionsPopover } from './show_options_popover';
-import { TopNavIds } from './top_nav_ids';
-import { ShowShareModal } from './show_share_modal';
-import { confirmDiscardOrKeepUnsavedChanges } from '../listing/confirm_overlays';
-import { OverlayRef } from '../../../../../core/public';
-import { DashboardConstants } from '../../dashboard_constants';
-import { getNewDashboardTitle, unsavedChangesBadge } from '../../dashboard_strings';
-import { DASHBOARD_PANELS_UNSAVED_ID } from '../lib/dashboard_panel_storage';
-import { DashboardContainer } from '..';
-import { EditorMenu } from './editor_menu';
 
 export interface DashboardTopNavState {
   chromeIsVisible: boolean;
   addPanelOverlay?: OverlayRef;
   savedQuery?: SavedQuery;
+  isSaveInProgress?: boolean;
 }
 
+type CompleteDashboardAppState = Required<
+  DashboardAppState,
+  | 'getLatestDashboardState'
+  | 'dashboardContainer'
+  | 'savedDashboard'
+  | 'indexPatterns'
+  | 'applyFilters'
+>;
+
+export const isCompleteDashboardAppState = (
+  state: DashboardAppState
+): state is CompleteDashboardAppState => {
+  return (
+    Boolean(state.getLatestDashboardState) &&
+    Boolean(state.dashboardContainer) &&
+    Boolean(state.savedDashboard) &&
+    Boolean(state.indexPatterns) &&
+    Boolean(state.applyFilters)
+  );
+};
+
 export interface DashboardTopNavProps {
-  onQuerySubmit: (_payload: unknown, isUpdate: boolean | undefined) => void;
-  dashboardStateManager: DashboardStateManager;
-  dashboardContainer: DashboardContainer;
+  dashboardAppState: CompleteDashboardAppState;
   embedSettings?: DashboardEmbedSettings;
-  savedDashboard: DashboardSavedObject;
-  timefilter: TimefilterContract;
-  indexPatterns: IndexPattern[];
   redirectTo: DashboardRedirect;
-  unsavedChanges: boolean;
-  clearUnsavedChanges: () => void;
-  lastDashboardId?: string;
-  viewMode: ViewMode;
 }
 
-const Flyout = withSuspense(LazyLabsFlyout, null);
+const LabsFlyout = withSuspense(LazyLabsFlyout, null);
 
 export function DashboardTopNav({
-  dashboardStateManager,
-  clearUnsavedChanges,
-  dashboardContainer,
-  lastDashboardId,
-  unsavedChanges,
-  savedDashboard,
-  onQuerySubmit,
+  dashboardAppState,
   embedSettings,
-  indexPatterns,
   redirectTo,
-  timefilter,
-  viewMode,
 }: DashboardTopNavProps) {
   const {
     core,
@@ -102,17 +104,24 @@ export function DashboardTopNav({
     embeddable,
     navigation,
     uiSettings,
-    setHeaderActionMenu,
+    visualizations,
+    usageCollection,
+    initializerContext,
     savedObjectsTagging,
+    setHeaderActionMenu,
     dashboardCapabilities,
-    dashboardPanelStorage,
+    dashboardSessionStorage,
     allowByValueEmbeddables,
-    visualizations,
-    usageCollection,
   } = useKibana<DashboardAppServices>().services;
+  const { version: kibanaVersion } = initializerContext.env.packageInfo;
+  const timefilter = data.query.timefilter.timefilter;
+  const toasts = core.notifications.toasts;
+
+  const dispatchDashboardStateChange = useDashboardDispatch();
+  const dashboardState = useDashboardSelector((state) => state.dashboardStateReducer);
 
+  const [mounted, setMounted] = useState(true);
   const [state, setState] = useState<DashboardTopNavState>({ chromeIsVisible: false });
-  const [isSaveInProgress, setIsSaveInProgress] = useState(false);
   const [isLabsShown, setIsLabsShown] = useState(false);
 
   const lensAlias = visualizations.getAliases().find(({ name }) => name === 'lens');
@@ -130,25 +139,25 @@ export function DashboardTopNav({
     const visibleSubscription = chrome.getIsVisible$().subscribe((chromeIsVisible) => {
       setState((s) => ({ ...s, chromeIsVisible }));
     });
-    const { id, title, getFullEditPath } = savedDashboard;
-    if (id || allowByValueEmbeddables) {
+    const { id, title, getFullEditPath } = dashboardAppState.savedDashboard;
+    if (id && title) {
       chrome.recentlyAccessed.add(
-        getFullEditPath(dashboardStateManager.getIsEditMode()),
-        title || getNewDashboardTitle(),
-        id || DASHBOARD_PANELS_UNSAVED_ID
+        getFullEditPath(dashboardState.viewMode === ViewMode.EDIT),
+        title,
+        id
       );
     }
     return () => {
       visibleSubscription.unsubscribe();
     };
-  }, [chrome, allowByValueEmbeddables, dashboardStateManager, savedDashboard]);
+  }, [chrome, allowByValueEmbeddables, dashboardState.viewMode, dashboardAppState.savedDashboard]);
 
   const addFromLibrary = useCallback(() => {
-    if (!isErrorEmbeddable(dashboardContainer)) {
+    if (!isErrorEmbeddable(dashboardAppState.dashboardContainer)) {
       setState((s) => ({
         ...s,
         addPanelOverlay: openAddPanelFlyout({
-          embeddable: dashboardContainer,
+          embeddable: dashboardAppState.dashboardContainer,
           getAllFactories: embeddable.getEmbeddableFactories,
           getFactory: embeddable.getEmbeddableFactory,
           notifications: core.notifications,
@@ -158,9 +167,9 @@ export function DashboardTopNav({
       }));
     }
   }, [
+    dashboardAppState.dashboardContainer,
     embeddable.getEmbeddableFactories,
     embeddable.getEmbeddableFactory,
-    dashboardContainer,
     core.notifications,
     core.savedObjects,
     core.overlays,
@@ -209,291 +218,220 @@ export function DashboardTopNav({
   const onChangeViewMode = useCallback(
     (newMode: ViewMode) => {
       clearAddPanel();
-      const isPageRefresh = newMode === dashboardStateManager.getViewMode();
-      const isLeavingEditMode = !isPageRefresh && newMode === ViewMode.VIEW;
-      const willLoseChanges = isLeavingEditMode && dashboardStateManager.getIsDirty(timefilter);
-
-      function switchViewMode() {
-        dashboardStateManager.switchViewMode(newMode);
-
-        if (savedDashboard?.id && allowByValueEmbeddables) {
-          const { getFullEditPath, title, id } = savedDashboard;
-          chrome.recentlyAccessed.add(getFullEditPath(newMode === ViewMode.EDIT), title, id);
-        }
-      }
+      const willLoseChanges = newMode === ViewMode.VIEW && dashboardAppState.hasUnsavedChanges;
 
       if (!willLoseChanges) {
-        switchViewMode();
+        dispatchDashboardStateChange(setViewMode(newMode));
         return;
       }
 
-      function discardChanges() {
-        dashboardStateManager.resetState();
-        dashboardStateManager.clearUnsavedPanels();
-
-        // We need to do a hard reset of the timepicker. appState will not reload like
-        // it does on 'open' because it's been saved to the url and the getAppState.previouslyStored() check on
-        // reload will cause it not to sync.
-        if (dashboardStateManager.getIsTimeSavedWithDashboard()) {
-          dashboardStateManager.syncTimefilterWithDashboardTime(timefilter);
-          dashboardStateManager.syncTimefilterWithDashboardRefreshInterval(timefilter);
-        }
-        dashboardStateManager.switchViewMode(ViewMode.VIEW);
-      }
-      confirmDiscardOrKeepUnsavedChanges(core.overlays).then((selection) => {
-        if (selection === 'discard') {
-          discardChanges();
-        }
-        if (selection !== 'cancel') {
-          switchViewMode();
-        }
-      });
-    },
-    [
-      timefilter,
-      core.overlays,
-      clearAddPanel,
-      savedDashboard,
-      dashboardStateManager,
-      allowByValueEmbeddables,
-      chrome.recentlyAccessed,
-    ]
-  );
-
-  /**
-   * Saves the dashboard.
-   *
-   * @param {object} [saveOptions={}]
-   * @property {boolean} [saveOptions.confirmOverwrite=false] - If true, attempts to create the source so it
-   * can confirm an overwrite if a document with the id already exists.
-   * @property {boolean} [saveOptions.isTitleDuplicateConfirmed=false] - If true, save allowed with duplicate title
-   * @property {func} [saveOptions.onTitleDuplicate] - function called if duplicate title exists.
-   * When not provided, confirm modal will be displayed asking user to confirm or cancel save.
-   * @return {Promise}
-   * @resolved {String} - The id of the doc
-   */
-  const save = useCallback(
-    async (saveOptions: SavedObjectSaveOpts) => {
-      setIsSaveInProgress(true);
-      return saveDashboard(angular.toJson, timefilter, dashboardStateManager, saveOptions)
-        .then(function (id) {
-          if (id) {
-            core.notifications.toasts.addSuccess({
-              title: i18n.translate('dashboard.dashboardWasSavedSuccessMessage', {
-                defaultMessage: `Dashboard '{dashTitle}' was saved`,
-                values: { dashTitle: dashboardStateManager.savedDashboard.title },
-              }),
-              'data-test-subj': 'saveDashboardSuccess',
-            });
-
-            dashboardPanelStorage.clearPanels(lastDashboardId);
-            if (id !== lastDashboardId) {
-              redirectTo({
-                id,
-                // editMode: true,
-                destination: 'dashboard',
-                useReplace: true,
-              });
-            } else {
-              dashboardStateManager.resetState();
-              chrome.docTitle.change(dashboardStateManager.savedDashboard.lastSavedTitle);
-            }
-          }
-          setIsSaveInProgress(false);
-          return { id };
-        })
-        .catch((error) => {
-          core.notifications?.toasts.addDanger({
-            title: i18n.translate('dashboard.dashboardWasNotSavedDangerMessage', {
-              defaultMessage: `Dashboard '{dashTitle}' was not saved. Error: {errorMessage}`,
-              values: {
-                dashTitle: dashboardStateManager.savedDashboard.title,
-                errorMessage: error.message,
-              },
-            }),
-            'data-test-subj': 'saveDashboardFailure',
-          });
-          return { error };
-        });
+      confirmDiscardUnsavedChanges(core.overlays, () =>
+        dashboardAppState.resetToLastSavedState?.()
+      );
     },
-    [
-      core.notifications.toasts,
-      dashboardStateManager,
-      dashboardPanelStorage,
-      lastDashboardId,
-      chrome.docTitle,
-      redirectTo,
-      timefilter,
-    ]
+    [clearAddPanel, core.overlays, dashboardAppState, dispatchDashboardStateChange]
   );
 
-  const runSave = useCallback(async () => {
-    const currentTitle = dashboardStateManager.getTitle();
-    const currentDescription = dashboardStateManager.getDescription();
-    const currentTimeRestore = dashboardStateManager.getTimeRestore();
-
-    let currentTags: string[] = [];
-    if (savedObjectsTagging) {
-      const dashboard = dashboardStateManager.savedDashboard;
-      if (savedObjectsTagging.ui.hasTagDecoration(dashboard)) {
-        currentTags = dashboard.getTags();
-      }
-    }
-
-    const onSave = ({
+  const runSaveAs = useCallback(async () => {
+    const currentState = dashboardAppState.getLatestDashboardState();
+    const onSave = async ({
+      newTags,
       newTitle,
       newDescription,
       newCopyOnSave,
       newTimeRestore,
       onTitleDuplicate,
       isTitleDuplicateConfirmed,
-      newTags,
     }: DashboardSaveOptions): Promise<SaveResult> => {
-      dashboardStateManager.setTitle(newTitle);
-      dashboardStateManager.setDescription(newDescription);
-      dashboardStateManager.savedDashboard.copyOnSave = newCopyOnSave;
-      dashboardStateManager.setTimeRestore(newTimeRestore);
-      if (savedObjectsTagging && newTags) {
-        dashboardStateManager.setTags(newTags);
-      }
-
       const saveOptions = {
         confirmOverwrite: false,
         isTitleDuplicateConfirmed,
         onTitleDuplicate,
       };
+      const stateFromSaveModal = {
+        title: newTitle,
+        description: newDescription,
+        timeRestore: newTimeRestore,
+        tags: [] as string[],
+      };
+      if (savedObjectsTagging && newTags) {
+        stateFromSaveModal.tags = newTags;
+      }
 
-      return save(saveOptions).then((response: SaveResult) => {
-        // If the save wasn't successful, put the original values back.
-        if (!(response as { id: string }).id) {
-          dashboardStateManager.setTitle(currentTitle);
-          dashboardStateManager.setDescription(currentDescription);
-          dashboardStateManager.setTimeRestore(currentTimeRestore);
-          if (savedObjectsTagging) {
-            dashboardStateManager.setTags(currentTags);
-          }
-        }
-        return response;
+      dashboardAppState.savedDashboard.copyOnSave = newCopyOnSave;
+      const saveResult = await saveDashboard({
+        toasts,
+        timefilter,
+        redirectTo,
+        saveOptions,
+        savedObjectsTagging,
+        version: kibanaVersion,
+        dashboardSessionStorage,
+        savedDashboard: dashboardAppState.savedDashboard,
+        currentState: { ...currentState, ...stateFromSaveModal },
       });
+      if (saveResult.id && !saveResult.redirected) {
+        dispatchDashboardStateChange(setStateFromSaveModal(stateFromSaveModal));
+        dashboardAppState.updateLastSavedState?.();
+        chrome.docTitle.change(stateFromSaveModal.title);
+      }
+      return saveResult.id ? { id: saveResult.id } : { error: saveResult.error };
     };
 
+    const lastDashboardId = dashboardAppState.savedDashboard.id;
+    const currentTags = savedObjectsTagging?.ui.hasTagDecoration(dashboardAppState.savedDashboard)
+      ? dashboardAppState.savedDashboard.getTags()
+      : [];
     const dashboardSaveModal = (
       <DashboardSaveModal
         onSave={onSave}
         onClose={() => {}}
-        title={currentTitle}
-        description={currentDescription}
         tags={currentTags}
+        title={currentState.title}
+        timeRestore={currentState.timeRestore}
+        description={currentState.description}
         savedObjectsTagging={savedObjectsTagging}
-        timeRestore={currentTimeRestore}
         showCopyOnSave={lastDashboardId ? true : false}
       />
     );
     clearAddPanel();
     showSaveModal(dashboardSaveModal, core.i18n.Context);
   }, [
-    save,
-    clearAddPanel,
-    lastDashboardId,
-    core.i18n.Context,
+    dispatchDashboardStateChange,
+    dashboardSessionStorage,
     savedObjectsTagging,
-    dashboardStateManager,
+    dashboardAppState,
+    core.i18n.Context,
+    chrome.docTitle,
+    clearAddPanel,
+    kibanaVersion,
+    timefilter,
+    redirectTo,
+    toasts,
   ]);
 
   const runQuickSave = useCallback(async () => {
-    const currentTitle = dashboardStateManager.getTitle();
-    const currentDescription = dashboardStateManager.getDescription();
-    const currentTimeRestore = dashboardStateManager.getTimeRestore();
-
-    let currentTags: string[] = [];
-    if (savedObjectsTagging) {
-      const dashboard = dashboardStateManager.savedDashboard;
-      if (savedObjectsTagging.ui.hasTagDecoration(dashboard)) {
-        currentTags = dashboard.getTags();
-      }
-    }
-
-    setIsSaveInProgress(true);
-    save({}).then((response: SaveResult) => {
-      // If the save wasn't successful, put the original values back.
-      if (!(response as { id: string }).id) {
-        dashboardStateManager.setTitle(currentTitle);
-        dashboardStateManager.setDescription(currentDescription);
-        dashboardStateManager.setTimeRestore(currentTimeRestore);
-        if (savedObjectsTagging) {
-          dashboardStateManager.setTags(currentTags);
-        }
-      } else {
-        clearUnsavedChanges();
-      }
-      setIsSaveInProgress(false);
-      return response;
+    setState((s) => ({ ...s, isSaveInProgress: true }));
+    const currentState = dashboardAppState.getLatestDashboardState();
+    const saveResult = await saveDashboard({
+      toasts,
+      timefilter,
+      redirectTo,
+      currentState,
+      saveOptions: {},
+      savedObjectsTagging,
+      version: kibanaVersion,
+      dashboardSessionStorage,
+      savedDashboard: dashboardAppState.savedDashboard,
     });
-  }, [save, savedObjectsTagging, dashboardStateManager, clearUnsavedChanges]);
+    if (saveResult.id && !saveResult.redirected) {
+      dashboardAppState.updateLastSavedState?.();
+    }
+    // turn off save in progress after the next change check. This prevents the save button from flashing
+    setTimeout(() => {
+      if (!mounted) return;
+      setState((s) => ({ ...s, isSaveInProgress: false }));
+    }, DashboardConstants.CHANGE_CHECK_DEBOUNCE);
+  }, [
+    dashboardSessionStorage,
+    savedObjectsTagging,
+    dashboardAppState,
+    kibanaVersion,
+    timefilter,
+    redirectTo,
+    mounted,
+    toasts,
+  ]);
 
   const runClone = useCallback(() => {
-    const currentTitle = dashboardStateManager.getTitle();
+    const currentState = dashboardAppState.getLatestDashboardState();
     const onClone = async (
       newTitle: string,
       isTitleDuplicateConfirmed: boolean,
       onTitleDuplicate: () => void
     ) => {
-      dashboardStateManager.savedDashboard.copyOnSave = true;
-      dashboardStateManager.setTitle(newTitle);
+      dashboardAppState.savedDashboard.copyOnSave = true;
       const saveOptions = {
         confirmOverwrite: false,
         isTitleDuplicateConfirmed,
         onTitleDuplicate,
       };
-      return save(saveOptions).then((response: { id?: string } | { error: Error }) => {
-        // If the save wasn't successful, put the original title back.
-        if ((response as { error: Error }).error) {
-          dashboardStateManager.setTitle(currentTitle);
-        }
-        return response;
+      const saveResult = await saveDashboard({
+        toasts,
+        timefilter,
+        redirectTo,
+        saveOptions,
+        savedObjectsTagging,
+        version: kibanaVersion,
+        dashboardSessionStorage,
+        savedDashboard: dashboardAppState.savedDashboard,
+        currentState: { ...currentState, title: newTitle },
       });
+      return saveResult.id ? { id: saveResult.id } : { error: saveResult.error };
     };
+    showCloneModal(onClone, currentState.title);
+  }, [
+    dashboardSessionStorage,
+    savedObjectsTagging,
+    dashboardAppState,
+    kibanaVersion,
+    redirectTo,
+    timefilter,
+    toasts,
+  ]);
 
-    showCloneModal(onClone, currentTitle);
-  }, [dashboardStateManager, save]);
+  const showOptions = useCallback(
+    (anchorElement: HTMLElement) => {
+      const currentState = dashboardAppState.getLatestDashboardState();
+      showOptionsPopover({
+        anchorElement,
+        useMargins: currentState.options.useMargins,
+        onUseMarginsChange: (isChecked: boolean) => {
+          dispatchDashboardStateChange(setUseMargins(isChecked));
+        },
+        syncColors: Boolean(currentState.options.syncColors),
+        onSyncColorsChange: (isChecked: boolean) => {
+          dispatchDashboardStateChange(setSyncColors(isChecked));
+        },
+        hidePanelTitles: currentState.options.hidePanelTitles,
+        onHidePanelTitlesChange: (isChecked: boolean) => {
+          dispatchDashboardStateChange(setHidePanelTitles(isChecked));
+        },
+      });
+    },
+    [dashboardAppState, dispatchDashboardStateChange]
+  );
+
+  const showShare = useCallback(
+    (anchorElement: HTMLElement) => {
+      if (!share) return;
+      const currentState = dashboardAppState.getLatestDashboardState();
+      ShowShareModal({
+        share,
+        kibanaVersion,
+        anchorElement,
+        dashboardCapabilities,
+        currentDashboardState: currentState,
+        savedDashboard: dashboardAppState.savedDashboard,
+        isDirty: Boolean(dashboardAppState.hasUnsavedChanges),
+      });
+    },
+    [dashboardAppState, dashboardCapabilities, share, kibanaVersion]
+  );
 
   const dashboardTopNavActions = useMemo(() => {
     const actions = {
-      [TopNavIds.FULL_SCREEN]: () => {
-        dashboardStateManager.setFullScreenMode(true);
-      },
+      [TopNavIds.FULL_SCREEN]: () => dispatchDashboardStateChange(setFullScreenMode(true)),
       [TopNavIds.EXIT_EDIT_MODE]: () => onChangeViewMode(ViewMode.VIEW),
       [TopNavIds.ENTER_EDIT_MODE]: () => onChangeViewMode(ViewMode.EDIT),
-      [TopNavIds.SAVE]: runSave,
       [TopNavIds.QUICK_SAVE]: runQuickSave,
+      [TopNavIds.OPTIONS]: showOptions,
+      [TopNavIds.SAVE]: runSaveAs,
       [TopNavIds.CLONE]: runClone,
-      [TopNavIds.OPTIONS]: (anchorElement) => {
-        showOptionsPopover({
-          anchorElement,
-          useMargins: dashboardStateManager.getUseMargins(),
-          onUseMarginsChange: (isChecked: boolean) => {
-            dashboardStateManager.setUseMargins(isChecked);
-          },
-          syncColors: dashboardStateManager.getSyncColors(),
-          onSyncColorsChange: (isChecked: boolean) => {
-            dashboardStateManager.setSyncColors(isChecked);
-          },
-          hidePanelTitles: dashboardStateManager.getHidePanelTitles(),
-          onHidePanelTitlesChange: (isChecked: boolean) => {
-            dashboardStateManager.setHidePanelTitles(isChecked);
-          },
-        });
-      },
     } as { [key: string]: NavAction };
+
     if (share) {
-      actions[TopNavIds.SHARE] = (anchorElement) =>
-        ShowShareModal({
-          share,
-          anchorElement,
-          savedDashboard,
-          dashboardStateManager,
-          dashboardCapabilities,
-        });
+      actions[TopNavIds.SHARE] = showShare;
     }
 
     if (isLabsEnabled) {
@@ -503,13 +441,13 @@ export function DashboardTopNav({
     }
     return actions;
   }, [
-    dashboardCapabilities,
-    dashboardStateManager,
+    dispatchDashboardStateChange,
     onChangeViewMode,
-    savedDashboard,
-    runClone,
-    runSave,
     runQuickSave,
+    showOptions,
+    runSaveAs,
+    showShare,
+    runClone,
     share,
     isLabsEnabled,
     isLabsShown,
@@ -517,43 +455,49 @@ export function DashboardTopNav({
 
   UseUnmount(() => {
     clearAddPanel();
+    setMounted(false);
   });
 
-  const getNavBarProps = () => {
+  const getNavBarProps = (): TopNavMenuProps => {
+    const { hasUnsavedChanges, savedDashboard } = dashboardAppState;
     const shouldShowNavBarComponent = (forceShow: boolean): boolean =>
-      (forceShow || state.chromeIsVisible) && !dashboardStateManager.getFullScreenMode();
+      (forceShow || state.chromeIsVisible) && !dashboardState.fullScreenMode;
 
     const shouldShowFilterBar = (forceHide: boolean): boolean =>
       !forceHide &&
-      (data.query.filterManager.getFilters().length > 0 ||
-        !dashboardStateManager.getFullScreenMode());
+      (data.query.filterManager.getFilters().length > 0 || !dashboardState.fullScreenMode);
 
-    const isFullScreenMode = dashboardStateManager.getFullScreenMode();
-    const screenTitle = dashboardStateManager.getTitle();
+    const isFullScreenMode = dashboardState.fullScreenMode;
     const showTopNavMenu = shouldShowNavBarComponent(Boolean(embedSettings?.forceShowTopNavMenu));
     const showQueryInput = shouldShowNavBarComponent(Boolean(embedSettings?.forceShowQueryInput));
     const showDatePicker = shouldShowNavBarComponent(Boolean(embedSettings?.forceShowDatePicker));
-    const showQueryBar = showQueryInput || showDatePicker;
     const showFilterBar = shouldShowFilterBar(Boolean(embedSettings?.forceHideFilterBar));
+    const showQueryBar = showQueryInput || showDatePicker;
     const showSearchBar = showQueryBar || showFilterBar;
+    const screenTitle = dashboardState.title;
+
+    const topNav = getTopNavConfig(
+      dashboardAppState.getLatestDashboardState().viewMode,
+      dashboardTopNavActions,
+      {
+        hideWriteControls: dashboardCapabilities.hideWriteControls,
+        isDirty: Boolean(dashboardAppState.hasUnsavedChanges),
+        isSaveInProgress: state.isSaveInProgress,
+        isNewDashboard: !savedDashboard.id,
+        isLabsEnabled,
+      }
+    );
 
-    const topNav = getTopNavConfig(viewMode, dashboardTopNavActions, {
-      hideWriteControls: dashboardCapabilities.hideWriteControls,
-      isNewDashboard: !savedDashboard.id,
-      isDirty: dashboardStateManager.getIsDirty(timefilter),
-      isSaveInProgress,
-      isLabsEnabled,
-    });
-
-    const badges = unsavedChanges
-      ? [
-          {
-            'data-test-subj': 'dashboardUnsavedChangesBadge',
-            badgeText: unsavedChangesBadge.getUnsavedChangedBadgeText(),
-            color: 'secondary',
-          },
-        ]
-      : undefined;
+    const badges =
+      hasUnsavedChanges && dashboardState.viewMode === ViewMode.EDIT
+        ? [
+            {
+              'data-test-subj': 'dashboardUnsavedChangesBadge',
+              badgeText: unsavedChangesBadge.getUnsavedChangedBadgeText(),
+              color: 'secondary',
+            },
+          ]
+        : undefined;
 
     return {
       badges,
@@ -561,36 +505,25 @@ export function DashboardTopNav({
       config: showTopNavMenu ? topNav : undefined,
       className: isFullScreenMode ? 'kbnTopNavMenu-isFullScreen' : undefined,
       screenTitle,
-      showTopNavMenu,
       showSearchBar,
       showQueryBar,
       showQueryInput,
       showDatePicker,
       showFilterBar,
       setMenuMountPoint: embedSettings ? undefined : setHeaderActionMenu,
-      indexPatterns,
+      indexPatterns: dashboardAppState.indexPatterns,
       showSaveQuery: dashboardCapabilities.saveQuery,
       useDefaultBehaviors: true,
-      onQuerySubmit,
-      onSavedQueryUpdated: (savedQuery: SavedQuery) => {
-        const allFilters = data.query.filterManager.getFilters();
-        data.query.filterManager.setFilters(allFilters);
-        dashboardStateManager.applyFilters(savedQuery.attributes.query, allFilters);
-        if (savedQuery.attributes.timefilter) {
-          timefilter.setTime({
-            from: savedQuery.attributes.timefilter.from,
-            to: savedQuery.attributes.timefilter.to,
-          });
-          if (savedQuery.attributes.timefilter.refreshInterval) {
-            timefilter.setRefreshInterval(savedQuery.attributes.timefilter.refreshInterval);
-          }
+      savedQuery: state.savedQuery,
+      savedQueryId: dashboardState.savedQuery,
+      onQuerySubmit: (_payload, isUpdate) => {
+        if (isUpdate === false) {
+          dashboardAppState.$triggerDashboardRefresh.next({ force: true });
         }
-        setState((s) => ({ ...s, savedQuery }));
       },
-      savedQuery: state.savedQuery,
-      savedQueryId: dashboardStateManager.getSavedQueryId(),
-      onSavedQueryIdChange: (newId: string | undefined) =>
-        dashboardStateManager.setSavedQueryId(newId),
+      onSavedQueryIdChange: (newId: string | undefined) => {
+        dispatchDashboardStateChange(setSavedQueryId(newId));
+      },
     };
   };
 
@@ -636,9 +569,9 @@ export function DashboardTopNav({
     <>
       <TopNavMenu {...getNavBarProps()} />
       {isLabsEnabled && isLabsShown ? (
-        <Flyout solutions={['dashboard']} onClose={() => setIsLabsShown(false)} />
+        <LabsFlyout solutions={['dashboard']} onClose={() => setIsLabsShown(false)} />
       ) : null}
-      {viewMode !== ViewMode.VIEW ? (
+      {dashboardState.viewMode !== ViewMode.VIEW ? (
         <>
           <EuiHorizontalRule margin="none" />
           <SolutionToolbar isDarkModeEnabled={IS_DARK_THEME}>
@@ -646,9 +579,7 @@ export function DashboardTopNav({
               primaryActionButton: (
                 <PrimaryActionButton
                   isDarkModeEnabled={IS_DARK_THEME}
-                  label={i18n.translate('dashboard.solutionToolbar.addPanelButtonLabel', {
-                    defaultMessage: 'Create visualization',
-                  })}
+                  label={getCreateVisualizationButtonTitle()}
                   onClick={createNewVisType(lensAlias)}
                   iconType="lensApp"
                   data-test-subj="dashboardAddNewPanelButton"
@@ -664,7 +595,7 @@ export function DashboardTopNav({
               extraButtons: [
                 <EditorMenu
                   createNewVisType={createNewVisType}
-                  dashboardContainer={dashboardContainer}
+                  dashboardContainer={dashboardAppState.dashboardContainer}
                 />,
               ],
             }}
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 5205f5b294c4f..90cf0fcd571a1 100644
--- a/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/editor_menu.tsx
@@ -18,7 +18,7 @@ import { BaseVisType, VisGroups, VisTypeAlias } from '../../../../visualizations
 import { SolutionToolbarPopover } from '../../../../presentation_util/public';
 import { EmbeddableFactoryDefinition, EmbeddableInput } from '../../services/embeddable';
 import { useKibana } from '../../services/kibana_react';
-import { DashboardAppServices } from '../types';
+import { DashboardAppServices } from '../../types';
 import { DashboardContainer } from '..';
 import { DashboardConstants } from '../../dashboard_constants';
 import { dashboardReplacePanelAction } from '../../dashboard_strings';
diff --git a/src/plugins/dashboard/public/application/top_nav/save_modal.tsx b/src/plugins/dashboard/public/application/top_nav/save_modal.tsx
index 5b1fbe7374dac..79ac3917fb968 100644
--- a/src/plugins/dashboard/public/application/top_nav/save_modal.tsx
+++ b/src/plugins/dashboard/public/application/top_nav/save_modal.tsx
@@ -12,7 +12,7 @@ import { EuiFormRow, EuiTextArea, EuiSwitch } from '@elastic/eui';
 
 import type { SavedObjectsTaggingApi } from '../../services/saved_objects_tagging_oss';
 import { SavedObjectSaveModal } from '../../services/saved_objects';
-import { DashboardSaveOptions } from '../types';
+import { DashboardSaveOptions } from '../../types';
 
 interface Props {
   onSave: ({
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 56823adf6bc14..239d2bf72b9c1 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
@@ -14,34 +14,38 @@ import { DashboardSavedObject } from '../..';
 import { setStateToKbnUrl, unhashUrl } from '../../services/kibana_utils';
 import { SharePluginStart } from '../../services/share';
 import { dashboardUrlParams } from '../dashboard_router';
-import { DashboardStateManager } from '../dashboard_state_manager';
 import { shareModalStrings } from '../../dashboard_strings';
-import { DashboardCapabilities } from '../types';
+import { DashboardAppCapabilities, DashboardState } from '../../types';
+import { stateToRawDashboardState } from '../lib/convert_dashboard_state';
 
 const showFilterBarId = 'showFilterBar';
 
 interface ShowShareModalProps {
+  isDirty: boolean;
+  kibanaVersion: string;
   share: SharePluginStart;
   anchorElement: HTMLElement;
   savedDashboard: DashboardSavedObject;
-  dashboardCapabilities: DashboardCapabilities;
-  dashboardStateManager: DashboardStateManager;
+  currentDashboardState: DashboardState;
+  dashboardCapabilities: DashboardAppCapabilities;
 }
 
 export const showPublicUrlSwitch = (anonymousUserCapabilities: Capabilities) => {
   if (!anonymousUserCapabilities.dashboard) return false;
 
-  const dashboard = (anonymousUserCapabilities.dashboard as unknown) as DashboardCapabilities;
+  const dashboard = (anonymousUserCapabilities.dashboard as unknown) as DashboardAppCapabilities;
 
   return !!dashboard.show;
 };
 
 export function ShowShareModal({
   share,
+  isDirty,
+  kibanaVersion,
   anchorElement,
   savedDashboard,
   dashboardCapabilities,
-  dashboardStateManager,
+  currentDashboardState,
 }: ShowShareModalProps) {
   const EmbedUrlParamExtension = ({
     setParamValue,
@@ -101,12 +105,13 @@ export function ShowShareModal({
   };
 
   share.toggleShareContextMenu({
+    isDirty,
     anchorElement,
     allowEmbed: true,
     allowShortUrl: dashboardCapabilities.createShortUrl,
     shareableUrl: setStateToKbnUrl(
       '_a',
-      dashboardStateManager.getAppState(),
+      stateToRawDashboardState({ state: currentDashboardState, version: kibanaVersion }),
       { useHash: false, storeInHashQuery: true },
       unhashUrl(window.location.href)
     ),
@@ -115,7 +120,6 @@ export function ShowShareModal({
     sharingData: {
       title: savedDashboard.title,
     },
-    isDirty: dashboardStateManager.getIsDirty(),
     embedUrlParamExtensions: [
       {
         paramName: 'embed',
diff --git a/src/plugins/dashboard/public/application/types.ts b/src/plugins/dashboard/public/application/types.ts
deleted file mode 100644
index dd291291ce9d6..0000000000000
--- a/src/plugins/dashboard/public/application/types.ts
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 {
-  AppMountParameters,
-  CoreStart,
-  SavedObjectsClientContract,
-  ScopedHistory,
-  ChromeStart,
-  IUiSettingsClient,
-  PluginInitializerContext,
-} from 'kibana/public';
-
-import { SharePluginStart } from '../services/share';
-import { EmbeddableStart } from '../services/embeddable';
-import { UsageCollectionSetup } from '../services/usage_collection';
-import { NavigationPublicPluginStart } from '../services/navigation';
-import { SavedObjectsTaggingApi } from '../services/saved_objects_tagging_oss';
-import { DataPublicPluginStart, IndexPatternsContract } from '../services/data';
-import { SavedObjectLoader, SavedObjectsStart } from '../services/saved_objects';
-import { DashboardPanelStorage } from './lib';
-import { UrlForwardingStart } from '../../../url_forwarding/public';
-import { VisualizationsStart } from '../../../visualizations/public';
-
-export type DashboardRedirect = (props: RedirectToProps) => void;
-export type RedirectToProps =
-  | { destination: 'dashboard'; id?: string; useReplace?: boolean; editMode?: boolean }
-  | { destination: 'listing'; filter?: string; useReplace?: boolean };
-
-export interface DashboardEmbedSettings {
-  forceShowTopNavMenu?: boolean;
-  forceShowQueryInput?: boolean;
-  forceShowDatePicker?: boolean;
-  forceHideFilterBar?: boolean;
-}
-
-export interface DashboardSaveOptions {
-  newTitle: string;
-  newTags?: string[];
-  newDescription: string;
-  newCopyOnSave: boolean;
-  newTimeRestore: boolean;
-  onTitleDuplicate: () => void;
-  isTitleDuplicateConfirmed: boolean;
-}
-
-export interface DashboardCapabilities {
-  visualizeCapabilities: { save: boolean };
-  mapsCapabilities: { save: boolean };
-  hideWriteControls: boolean;
-  createShortUrl: boolean;
-  saveQuery: boolean;
-  createNew: boolean;
-  show: boolean;
-  storeSearchSession: boolean;
-}
-
-export interface DashboardAppServices {
-  core: CoreStart;
-  chrome: ChromeStart;
-  share?: SharePluginStart;
-  embeddable: EmbeddableStart;
-  data: DataPublicPluginStart;
-  uiSettings: IUiSettingsClient;
-  restorePreviousUrl: () => void;
-  savedObjects: SavedObjectsStart;
-  allowByValueEmbeddables: boolean;
-  urlForwarding: UrlForwardingStart;
-  savedDashboards: SavedObjectLoader;
-  scopedHistory: () => ScopedHistory;
-  indexPatterns: IndexPatternsContract;
-  usageCollection?: UsageCollectionSetup;
-  navigation: NavigationPublicPluginStart;
-  dashboardPanelStorage: DashboardPanelStorage;
-  dashboardCapabilities: DashboardCapabilities;
-  initializerContext: PluginInitializerContext;
-  onAppLeave: AppMountParameters['onAppLeave'];
-  savedObjectsTagging?: SavedObjectsTaggingApi;
-  savedObjectsClient: SavedObjectsClientContract;
-  setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
-  savedQueryService: DataPublicPluginStart['query']['savedQueries'];
-  visualizations: VisualizationsStart;
-}
diff --git a/src/plugins/dashboard/public/dashboard_constants.ts b/src/plugins/dashboard/public/dashboard_constants.ts
index 16cb74209dd79..7d5123ac27cb6 100644
--- a/src/plugins/dashboard/public/dashboard_constants.ts
+++ b/src/plugins/dashboard/public/dashboard_constants.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-const DASHBOARD_STATE_STORAGE_KEY = '_a';
+export const DASHBOARD_STATE_STORAGE_KEY = '_a';
 
 export const DashboardConstants = {
   LANDING_PAGE_PATH: '/list',
@@ -17,6 +17,8 @@ export const DashboardConstants = {
   DASHBOARDS_ID: 'dashboards',
   DASHBOARD_ID: 'dashboard',
   SEARCH_SESSION_ID: 'searchSessionId',
+  CHANGE_CHECK_DEBOUNCE: 100,
+  CHANGE_APPLY_DEBOUNCE: 50,
 };
 
 export function createDashboardEditUrl(id?: string, editMode?: boolean) {
diff --git a/src/plugins/dashboard/public/dashboard_strings.ts b/src/plugins/dashboard/public/dashboard_strings.ts
index 531ff815312cf..ef158a149c377 100644
--- a/src/plugins/dashboard/public/dashboard_strings.ts
+++ b/src/plugins/dashboard/public/dashboard_strings.ts
@@ -215,6 +215,22 @@ export const dashboardReadonlyBadge = {
     }),
 };
 
+export const dashboardSaveToastStrings = {
+  getSuccessString: (dashTitle: string) =>
+    i18n.translate('dashboard.dashboardWasSavedSuccessMessage', {
+      defaultMessage: `Dashboard '{dashTitle}' was saved`,
+      values: { dashTitle },
+    }),
+  getFailureString: (dashTitle: string, errorMessage: string) =>
+    i18n.translate('dashboard.dashboardWasNotSavedDangerMessage', {
+      defaultMessage: `Dashboard '{dashTitle}' was not saved. Error: {errorMessage}`,
+      values: {
+        dashTitle,
+        errorMessage,
+      },
+    }),
+};
+
 /*
   Modals
 */
@@ -359,17 +375,9 @@ export const emptyScreenStrings = {
     i18n.translate('dashboard.fillDashboardTitle', {
       defaultMessage: 'This dashboard is empty. Let\u2019s fill it up!',
     }),
-  getHowToStartWorkingOnNewDashboardDescription1: () =>
-    i18n.translate('dashboard.howToStartWorkingOnNewDashboardDescription1', {
-      defaultMessage: 'Click',
-    }),
-  getHowToStartWorkingOnNewDashboardDescription2: () =>
-    i18n.translate('dashboard.howToStartWorkingOnNewDashboardDescription2', {
-      defaultMessage: 'in the menu bar above to start adding panels.',
-    }),
-  getHowToStartWorkingOnNewDashboardEditLinkText: () =>
-    i18n.translate('dashboard.howToStartWorkingOnNewDashboardEditLinkText', {
-      defaultMessage: 'Edit',
+  getHowToStartWorkingOnNewDashboardDescription: () =>
+    i18n.translate('dashboard.howToStartWorkingOnNewDashboardDescription', {
+      defaultMessage: 'Click edit in the menu bar above to start adding panels.',
     }),
   getHowToStartWorkingOnNewDashboardEditLinkAriaLabel: () =>
     i18n.translate('dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel', {
@@ -442,3 +450,8 @@ export const dashboardUnsavedListingStrings = {
       defaultMessage: 'Discard changes',
     }),
 };
+
+export const getCreateVisualizationButtonTitle = () =>
+  i18n.translate('dashboard.solutionToolbar.addPanelButtonLabel', {
+    defaultMessage: 'Create visualization',
+  });
diff --git a/src/plugins/dashboard/public/index.ts b/src/plugins/dashboard/public/index.ts
index 1acd1995b7290..c584b44286e07 100644
--- a/src/plugins/dashboard/public/index.ts
+++ b/src/plugins/dashboard/public/index.ts
@@ -11,7 +11,6 @@ import { DashboardPlugin } from './plugin';
 
 export {
   DashboardContainer,
-  DashboardContainerInput,
   DashboardContainerFactoryDefinition,
   DASHBOARD_CONTAINER_TYPE,
 } from './application';
@@ -29,7 +28,7 @@ export {
   DashboardUrlGeneratorState,
 } from './url_generator';
 export { DashboardSavedObject } from './saved_dashboards';
-export { SavedDashboardPanel } from './types';
+export { SavedDashboardPanel, DashboardContainerInput } from './types';
 
 export function plugin(initializerContext: PluginInitializerContext) {
   return new DashboardPlugin(initializerContext);
diff --git a/src/plugins/dashboard/public/plugin.tsx b/src/plugins/dashboard/public/plugin.tsx
index 230918399d88f..b73fe5f2ba410 100644
--- a/src/plugins/dashboard/public/plugin.tsx
+++ b/src/plugins/dashboard/public/plugin.tsx
@@ -65,6 +65,7 @@ import {
   AddToLibraryAction,
   LibraryNotificationAction,
   CopyToDashboardAction,
+  DashboardCapabilities,
 } from './application';
 import {
   createDashboardUrlGenerator,
@@ -351,6 +352,9 @@ export class DashboardPlugin
     const { notifications, overlays, application } = core;
     const { uiActions, data, share, presentationUtil, embeddable } = plugins;
 
+    const dashboardCapabilities: Readonly<DashboardCapabilities> = application.capabilities
+      .dashboard as DashboardCapabilities;
+
     const SavedObjectFinder = getSavedObjectFinder(core.savedObjects, core.uiSettings);
 
     const expandPanelAction = new ExpandPanelAction();
@@ -395,8 +399,8 @@ export class DashboardPlugin
         overlays,
         embeddable.getStateTransfer(),
         {
-          canCreateNew: Boolean(application.capabilities.dashboard.createNew),
-          canEditExisting: !Boolean(application.capabilities.dashboard.hideWriteControls),
+          canCreateNew: Boolean(dashboardCapabilities.createNew),
+          canEditExisting: Boolean(dashboardCapabilities.showWriteControls),
         },
         presentationUtil.ContextProvider
       );
diff --git a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
index 1c9125f8a064e..7c056e04c1cd6 100644
--- a/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
+++ b/src/plugins/dashboard/public/saved_dashboards/saved_dashboard.ts
@@ -14,6 +14,7 @@ import { createDashboardEditUrl } from '../dashboard_constants';
 import { extractReferences, injectReferences } from '../../common/saved_dashboard_references';
 
 import { SavedObjectAttributes, SavedObjectReference } from '../../../../core/types';
+import { DashboardOptions } from '../types';
 
 export interface DashboardSavedObject extends SavedObject {
   id?: string;
@@ -97,9 +98,10 @@ export function createSavedDashboardClass(
           panelsJSON: '[]',
           optionsJSON: JSON.stringify({
             // for BWC reasons we can't default dashboards that already exist without this setting to true.
-            useMargins: !id,
+            useMargins: true,
+            syncColors: false,
             hidePanelTitles: false,
-          }),
+          } as DashboardOptions),
           version: 1,
           timeRestore: false,
           timeTo: undefined,
diff --git a/src/plugins/dashboard/public/types.ts b/src/plugins/dashboard/public/types.ts
index 9285944bfe5fe..89c9adb572142 100644
--- a/src/plugins/dashboard/public/types.ts
+++ b/src/plugins/dashboard/public/types.ts
@@ -6,109 +6,195 @@
  * Side Public License, v 1.
  */
 
-import { SavedObject as SavedObjectType, SavedObjectAttributes } from 'src/core/public';
-import { Query, Filter } from './services/data';
-import { ViewMode } from './services/embeddable';
+import {
+  AppMountParameters,
+  CoreStart,
+  SavedObjectsClientContract,
+  ScopedHistory,
+  ChromeStart,
+  IUiSettingsClient,
+  PluginInitializerContext,
+} from 'kibana/public';
 
-import { SavedDashboardPanel } from '../common/types';
-export { SavedDashboardPanel };
+import { History } from 'history';
+import { AnyAction, Dispatch } from 'redux';
+import { BehaviorSubject, Subject } from 'rxjs';
+import { Query, Filter, IndexPattern, RefreshInterval, TimeRange } from './services/data';
+import { ContainerInput, EmbeddableInput, ViewMode } from './services/embeddable';
+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 { DashboardPanelState, SavedDashboardPanel } from '../common/types';
+import { SavedObjectsTaggingApi } from './services/saved_objects_tagging_oss';
+import { DataPublicPluginStart, IndexPatternsContract } from './services/data';
+import { SavedObjectLoader, SavedObjectsStart } from './services/saved_objects';
+import { IKbnUrlStateStorage } from './services/kibana_utils';
+import { DashboardContainer, DashboardSavedObject } from '.';
+import { VisualizationsStart } from '../../visualizations/public';
 
-// TODO: Replace Saved object interfaces by the ones Core will provide when it is ready.
-export type SavedObjectAttribute =
-  | string
-  | number
-  | boolean
-  | null
-  | undefined
-  | SavedObjectAttributes
-  | SavedObjectAttributes[];
-
-export interface SimpleSavedObject<T extends SavedObjectAttributes> {
-  attributes: T;
-  _version?: SavedObjectType<T>['version'];
-  id: SavedObjectType<T>['id'];
-  type: SavedObjectType<T>['type'];
-  migrationVersion: SavedObjectType<T>['migrationVersion'];
-  error: SavedObjectType<T>['error'];
-  references: SavedObjectType<T>['references'];
-  get(key: string): any;
-  set(key: string, value: any): T;
-  has(key: string): boolean;
-  save(): Promise<SimpleSavedObject<T>>;
-  delete(): void;
-}
+export { SavedDashboardPanel };
 
-interface FieldSubType {
-  multi?: { parent: string };
-  nested?: { path: string };
+export type NavAction = (anchorElement?: any) => void;
+export interface SavedDashboardPanelMap {
+  [key: string]: SavedDashboardPanel;
 }
 
-export interface Field {
-  name: string;
-  type: string;
-  // esTypes might be undefined on old index patterns that have not been refreshed since we added
-  // this prop. It is also undefined on scripted fields.
-  esTypes?: string[];
-  aggregatable: boolean;
-  filterable: boolean;
-  searchable: boolean;
-  subType?: FieldSubType;
+export interface DashboardPanelMap {
+  [key: string]: DashboardPanelState;
 }
 
-export type NavAction = (anchorElement?: any) => void;
-
-export interface DashboardAppState {
-  panels: SavedDashboardPanel[];
-  fullScreenMode: boolean;
+/**
+ * DashboardState contains all pieces of tracked state for an individual dashboard
+ */
+export interface DashboardState {
+  query: Query;
   title: string;
-  description: string;
   tags: string[];
-  timeRestore: boolean;
-  options: {
-    hidePanelTitles: boolean;
-    useMargins: boolean;
-    syncColors?: boolean;
-  };
-  query: Query | string;
   filters: Filter[];
   viewMode: ViewMode;
-  expandedPanelId?: string;
+  description: string;
   savedQuery?: string;
+  timeRestore: boolean;
+  fullScreenMode: boolean;
+  expandedPanelId?: string;
+  options: DashboardOptions;
+  panels: DashboardPanelMap;
 }
 
-export type DashboardAppStateDefaults = DashboardAppState & {
+/**
+ * RawDashboardState is the dashboard state as directly loaded from the panelJSON
+ */
+export type RawDashboardState = Omit<DashboardState, 'panels'> & { panels: SavedDashboardPanel[] };
+
+export interface DashboardContainerInput extends ContainerInput {
+  dashboardCapabilities?: DashboardAppCapabilities;
+  refreshConfig?: RefreshInterval;
+  isEmbeddedExternally?: boolean;
+  isFullScreenMode: boolean;
+  expandedPanelId?: string;
+  timeRange: TimeRange;
   description?: string;
-};
+  useMargins: boolean;
+  syncColors?: boolean;
+  viewMode: ViewMode;
+  filters: Filter[];
+  title: string;
+  query: Query;
+  panels: {
+    [panelId: string]: DashboardPanelState<EmbeddableInput & { [k: string]: unknown }>;
+  };
+}
 
 /**
- * Panels are not added to the URL
+ * DashboardAppState contains all the tools the dashboard application uses to track,
+ * update, and view its state.
  */
-export type DashboardAppStateInUrl = Omit<DashboardAppState, 'panels'> & {
-  panels?: SavedDashboardPanel[];
+export interface DashboardAppState {
+  hasUnsavedChanges?: boolean;
+  indexPatterns?: IndexPattern[];
+  updateLastSavedState?: () => void;
+  resetToLastSavedState?: () => void;
+  savedDashboard?: DashboardSavedObject;
+  dashboardContainer?: DashboardContainer;
+  getLatestDashboardState?: () => DashboardState;
+  $triggerDashboardRefresh: Subject<{ force?: boolean }>;
+  $onDashboardStateChange: BehaviorSubject<DashboardState>;
+  applyFilters?: (query: Query, filters: Filter[]) => void;
+}
+
+/**
+ * The shared services and tools used to build a dashboard from a saved object ID.
+ */
+export type DashboardBuildContext = Pick<
+  DashboardAppServices,
+  | 'embeddable'
+  | 'indexPatterns'
+  | 'savedDashboards'
+  | 'usageCollection'
+  | 'initializerContext'
+  | 'savedObjectsTagging'
+  | 'dashboardCapabilities'
+> & {
+  query: DashboardAppServices['data']['query'];
+  search: DashboardAppServices['data']['search'];
+  notifications: DashboardAppServices['core']['notifications'];
+
+  history: History;
+  kibanaVersion: string;
+  isEmbeddedExternally: boolean;
+  kbnUrlStateStorage: IKbnUrlStateStorage;
+  $checkForUnsavedChanges: Subject<unknown>;
+  getLatestDashboardState: () => DashboardState;
+  dispatchDashboardStateChange: Dispatch<AnyAction>;
+  $triggerDashboardRefresh: Subject<{ force?: boolean }>;
+  $onDashboardStateChange: BehaviorSubject<DashboardState>;
 };
 
-export interface DashboardAppStateTransitions {
-  set: (
-    state: DashboardAppState
-  ) => <T extends keyof DashboardAppState>(
-    prop: T,
-    value: DashboardAppState[T]
-  ) => DashboardAppState;
-  setOption: (
-    state: DashboardAppState
-  ) => <T extends keyof DashboardAppState['options']>(
-    prop: T,
-    value: DashboardAppState['options'][T]
-  ) => DashboardAppState;
+export interface DashboardOptions {
+  hidePanelTitles: boolean;
+  useMargins: boolean;
+  syncColors: boolean;
 }
 
-export interface SavedDashboardPanelMap {
-  [key: string]: SavedDashboardPanel;
+export type DashboardRedirect = (props: RedirectToProps) => void;
+export type RedirectToProps =
+  | { destination: 'dashboard'; id?: string; useReplace?: boolean; editMode?: boolean }
+  | { destination: 'listing'; filter?: string; useReplace?: boolean };
+
+export interface DashboardEmbedSettings {
+  forceHideFilterBar?: boolean;
+  forceShowTopNavMenu?: boolean;
+  forceShowQueryInput?: boolean;
+  forceShowDatePicker?: boolean;
+}
+
+export interface DashboardSaveOptions {
+  newTitle: string;
+  newTags?: string[];
+  newDescription: string;
+  newCopyOnSave: boolean;
+  newTimeRestore: boolean;
+  onTitleDuplicate: () => void;
+  isTitleDuplicateConfirmed: boolean;
+}
+
+export interface DashboardAppCapabilities {
+  show: boolean;
+  createNew: boolean;
+  saveQuery: boolean;
+  createShortUrl: boolean;
+  hideWriteControls: boolean;
+  storeSearchSession: boolean;
+  mapsCapabilities: { save: boolean };
+  visualizeCapabilities: { save: boolean };
 }
 
-export interface StagedFilter {
-  field: string;
-  value: string;
-  operator: string;
-  index: string;
+export interface DashboardAppServices {
+  core: CoreStart;
+  chrome: ChromeStart;
+  share?: SharePluginStart;
+  embeddable: EmbeddableStart;
+  data: DataPublicPluginStart;
+  uiSettings: IUiSettingsClient;
+  restorePreviousUrl: () => void;
+  savedObjects: SavedObjectsStart;
+  allowByValueEmbeddables: boolean;
+  urlForwarding: UrlForwardingStart;
+  savedDashboards: SavedObjectLoader;
+  scopedHistory: () => ScopedHistory;
+  visualizations: VisualizationsStart;
+  indexPatterns: IndexPatternsContract;
+  usageCollection?: UsageCollectionSetup;
+  navigation: NavigationPublicPluginStart;
+  dashboardCapabilities: DashboardAppCapabilities;
+  initializerContext: PluginInitializerContext;
+  onAppLeave: AppMountParameters['onAppLeave'];
+  savedObjectsTagging?: SavedObjectsTaggingApi;
+  savedObjectsClient: SavedObjectsClientContract;
+  dashboardSessionStorage: DashboardSessionStorage;
+  setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
+  savedQueryService: DataPublicPluginStart['query']['savedQueries'];
 }
diff --git a/src/plugins/dashboard/server/capabilities_provider.ts b/src/plugins/dashboard/server/capabilities_provider.ts
index 25457c1a487d9..c5b740c581294 100644
--- a/src/plugins/dashboard/server/capabilities_provider.ts
+++ b/src/plugins/dashboard/server/capabilities_provider.ts
@@ -6,7 +6,11 @@
  * Side Public License, v 1.
  */
 
-export const capabilitiesProvider = () => ({
+import { DashboardCapabilities } from '../common/types';
+
+export const capabilitiesProvider = (): {
+  dashboard: DashboardCapabilities;
+} => ({
   dashboard: {
     createNew: true,
     show: true,
diff --git a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
index 02d492de4fe66..912dc04d16d09 100644
--- a/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
+++ b/src/plugins/dashboard/server/usage/dashboard_telemetry.ts
@@ -41,6 +41,9 @@ export interface DashboardCollectorData {
   visualizationByValue: {
     [key: string]: number;
   };
+  embeddable: {
+    [key: string]: number;
+  };
 }
 
 export const getEmptyTelemetryData = (): DashboardCollectorData => ({
@@ -48,6 +51,7 @@ export const getEmptyTelemetryData = (): DashboardCollectorData => ({
   panelsByValue: 0,
   lensByValue: {},
   visualizationByValue: {},
+  embeddable: {},
 });
 
 type DashboardCollectorFunction = (
@@ -115,6 +119,23 @@ export const collectForPanels: DashboardCollectorFunction = (panels, collectorDa
   collectByValueLensInfo(panels, collectorData);
 };
 
+export const collectEmbeddableData = (
+  panels: SavedDashboardPanel730ToLatest[],
+  collectorData: DashboardCollectorData,
+  embeddableService: EmbeddablePersistableStateService
+) => {
+  for (const panel of panels) {
+    collectorData.embeddable = embeddableService.telemetry(
+      {
+        ...panel.embeddableConfig,
+        id: panel.id || '',
+        type: panel.type,
+      },
+      collectorData.embeddable
+    );
+  }
+};
+
 export async function collectDashboardTelemetry(
   savedObjectClient: Pick<ISavedObjectsRepository, 'find'>,
   embeddableService: EmbeddablePersistableStateService
@@ -134,6 +155,7 @@ export async function collectDashboardTelemetry(
     ) as unknown) as SavedDashboardPanel730ToLatest[];
 
     collectForPanels(panels, collectorData);
+    collectEmbeddableData(panels, collectorData, embeddableService);
   }
 
   return collectorData;
diff --git a/src/plugins/dashboard/server/usage/register_collector.ts b/src/plugins/dashboard/server/usage/register_collector.ts
index 780dd716c0f78..a911fc9b81666 100644
--- a/src/plugins/dashboard/server/usage/register_collector.ts
+++ b/src/plugins/dashboard/server/usage/register_collector.ts
@@ -27,11 +27,28 @@ export function registerDashboardUsageCollector(
       lensByValue: {
         DYNAMIC_KEY: {
           type: 'long',
+          _meta: {
+            description:
+              'Collection of telemetry metrics for Lens visualizations, which are added to dashboard by "value".',
+          },
         },
       },
       visualizationByValue: {
         DYNAMIC_KEY: {
           type: 'long',
+          _meta: {
+            description:
+              'Collection of telemetry metrics for visualizations, which are added to dashboard by "value".',
+          },
+        },
+      },
+      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.',
+          },
         },
       },
     },
diff --git a/src/plugins/data/common/es_query/filters/phrase_filter.ts b/src/plugins/data/common/es_query/filters/phrase_filter.ts
index 2a7f2458a27de..85562435e68d0 100644
--- a/src/plugins/data/common/es_query/filters/phrase_filter.ts
+++ b/src/plugins/data/common/es_query/filters/phrase_filter.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 { estypes } from '@elastic/elasticsearch';
 import { get, isPlainObject } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
 import { IIndexPattern, IFieldType } from '../../index_patterns';
@@ -23,7 +23,7 @@ export type PhraseFilter = Filter & {
   script?: {
     script: {
       source?: any;
-      lang?: string;
+      lang?: estypes.ScriptLanguage;
       params: any;
     };
   };
diff --git a/src/plugins/data/common/es_query/filters/range_filter.ts b/src/plugins/data/common/es_query/filters/range_filter.ts
index fb8426655583e..a082b93c0a79a 100644
--- a/src/plugins/data/common/es_query/filters/range_filter.ts
+++ b/src/plugins/data/common/es_query/filters/range_filter.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 { estypes } from '@elastic/elasticsearch';
 import { map, reduce, mapValues, get, keys, pickBy } from 'lodash';
 import { Filter, FilterMeta } from './meta_filter';
 import { IIndexPattern, IFieldType } from '../../index_patterns';
@@ -63,7 +63,7 @@ export type RangeFilter = Filter &
     script?: {
       script: {
         params: any;
-        lang: string;
+        lang: estypes.ScriptLanguage;
         source: any;
       };
     };
diff --git a/src/plugins/data/common/field_formats/converters/duration.test.ts b/src/plugins/data/common/field_formats/converters/duration.test.ts
index fc019720425df..72551f4b7b236 100644
--- a/src/plugins/data/common/field_formats/converters/duration.test.ts
+++ b/src/plugins/data/common/field_formats/converters/duration.test.ts
@@ -139,17 +139,182 @@ describe('Duration Format', () => {
     ],
   });
 
+  testCase({
+    inputFormat: 'nanoseconds',
+    outputFormat: 'humanizePrecise',
+    outputPrecision: 2,
+    showSuffix: true,
+    fixtures: [
+      {
+        input: 1988,
+        output: '0.00 Milliseconds',
+      },
+      {
+        input: 658,
+        output: '0.00 Milliseconds',
+      },
+      {
+        input: 3857,
+        output: '0.00 Milliseconds',
+      },
+    ],
+  });
+
+  testCase({
+    inputFormat: 'microseconds',
+    outputFormat: 'humanizePrecise',
+    outputPrecision: 2,
+    showSuffix: true,
+    fixtures: [
+      {
+        input: 1988,
+        output: '1.99 Milliseconds',
+      },
+      {
+        input: 658,
+        output: '0.66 Milliseconds',
+      },
+      {
+        input: 3857,
+        output: '3.86 Milliseconds',
+      },
+    ],
+  });
+
+  testCase({
+    inputFormat: 'microseconds',
+    outputFormat: 'humanizePrecise',
+    outputPrecision: 1,
+    showSuffix: true,
+    fixtures: [
+      {
+        input: 1988,
+        output: '2.0 Milliseconds',
+      },
+      {
+        input: 0,
+        output: '0.0 Milliseconds',
+      },
+      {
+        input: 658,
+        output: '0.7 Milliseconds',
+      },
+      {
+        input: 3857,
+        output: '3.9 Milliseconds',
+      },
+    ],
+  });
+
+  testCase({
+    inputFormat: 'seconds',
+    outputFormat: 'humanizePrecise',
+    outputPrecision: 0,
+    showSuffix: true,
+    fixtures: [
+      {
+        input: 600,
+        output: '10 Minutes',
+      },
+      {
+        input: 30,
+        output: '30 Seconds',
+      },
+      {
+        input: 3000,
+        output: '50 Minutes',
+      },
+    ],
+  });
+
+  testCase({
+    inputFormat: 'milliseconds',
+    outputFormat: 'humanizePrecise',
+    outputPrecision: 0,
+    showSuffix: true,
+    useShortSuffix: true,
+    fixtures: [
+      {
+        input: -123,
+        output: '-123 ms',
+      },
+      {
+        input: 1,
+        output: '1 ms',
+      },
+      {
+        input: 600,
+        output: '600 ms',
+      },
+      {
+        input: 30,
+        output: '30 ms',
+      },
+      {
+        input: 3000,
+        output: '3 s',
+      },
+      {
+        input: 300000,
+        output: '5 min',
+      },
+      {
+        input: 30000000,
+        output: '8 h',
+      },
+      {
+        input: 90000000,
+        output: '1 d',
+      },
+      {
+        input: 9000000000,
+        output: '3 mon',
+      },
+      {
+        input: 99999999999,
+        output: '3 y',
+      },
+    ],
+  });
+
+  testCase({
+    inputFormat: 'milliseconds',
+    outputFormat: 'humanizePrecise',
+    outputPrecision: 0,
+    showSuffix: true,
+    useShortSuffix: true,
+    includeSpaceWithSuffix: false,
+    fixtures: [
+      {
+        input: -123,
+        output: '-123ms',
+      },
+      {
+        input: 1,
+        output: '1ms',
+      },
+      {
+        input: 600,
+        output: '600ms',
+      },
+    ],
+  });
+
   function testCase({
     inputFormat,
     outputFormat,
     outputPrecision,
     showSuffix,
+    useShortSuffix,
+    includeSpaceWithSuffix,
     fixtures,
   }: {
     inputFormat: string;
     outputFormat: string;
     outputPrecision: number | undefined;
     showSuffix: boolean | undefined;
+    useShortSuffix?: boolean;
+    includeSpaceWithSuffix?: boolean;
     fixtures: any[];
   }) {
     fixtures.forEach((fixture: Record<string, any>) => {
@@ -160,7 +325,14 @@ describe('Duration Format', () => {
         outputPrecision ? `, ${outputPrecision} decimals` : ''
       }`, () => {
         const duration = new DurationFormat(
-          { inputFormat, outputFormat, outputPrecision, showSuffix },
+          {
+            inputFormat,
+            outputFormat,
+            outputPrecision,
+            showSuffix,
+            useShortSuffix,
+            includeSpaceWithSuffix,
+          },
           jest.fn()
         );
         expect(duration.convert(input)).toBe(output);
diff --git a/src/plugins/data/common/field_formats/converters/duration.ts b/src/plugins/data/common/field_formats/converters/duration.ts
index ef8c1df3704a8..c9a7091db8471 100644
--- a/src/plugins/data/common/field_formats/converters/duration.ts
+++ b/src/plugins/data/common/field_formats/converters/duration.ts
@@ -18,6 +18,7 @@ const ratioToSeconds: Record<string, number> = {
   microseconds: 0.000001,
 };
 const HUMAN_FRIENDLY = 'humanize';
+const HUMAN_FRIENDLY_PRECISE = 'humanizePrecise';
 const DEFAULT_OUTPUT_PRECISION = 2;
 const DEFAULT_INPUT_FORMAT = {
   text: i18n.translate('data.fieldFormats.duration.inputFormats.seconds', {
@@ -89,59 +90,89 @@ const inputFormats = [
   },
 ];
 const DEFAULT_OUTPUT_FORMAT = {
-  text: i18n.translate('data.fieldFormats.duration.outputFormats.humanize', {
-    defaultMessage: 'Human Readable',
+  text: i18n.translate('data.fieldFormats.duration.outputFormats.humanize.approximate', {
+    defaultMessage: 'Human-readable (approximate)',
   }),
   method: 'humanize',
 };
 const outputFormats = [
   { ...DEFAULT_OUTPUT_FORMAT },
+  {
+    text: i18n.translate('data.fieldFormats.duration.outputFormats.humanize.precise', {
+      defaultMessage: 'Human-readable (precise)',
+    }),
+    method: 'humanizePrecise',
+  },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asMilliseconds', {
       defaultMessage: 'Milliseconds',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asMilliseconds.short', {
+      defaultMessage: 'ms',
+    }),
     method: 'asMilliseconds',
   },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asSeconds', {
       defaultMessage: 'Seconds',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asSeconds.short', {
+      defaultMessage: 's',
+    }),
     method: 'asSeconds',
   },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asMinutes', {
       defaultMessage: 'Minutes',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asMinutes.short', {
+      defaultMessage: 'min',
+    }),
     method: 'asMinutes',
   },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asHours', {
       defaultMessage: 'Hours',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asHours.short', {
+      defaultMessage: 'h',
+    }),
     method: 'asHours',
   },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asDays', {
       defaultMessage: 'Days',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asDays.short', {
+      defaultMessage: 'd',
+    }),
     method: 'asDays',
   },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asWeeks', {
       defaultMessage: 'Weeks',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asWeeks.short', {
+      defaultMessage: 'w',
+    }),
     method: 'asWeeks',
   },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asMonths', {
       defaultMessage: 'Months',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asMonths.short', {
+      defaultMessage: 'mon',
+    }),
     method: 'asMonths',
   },
   {
     text: i18n.translate('data.fieldFormats.duration.outputFormats.asYears', {
       defaultMessage: 'Years',
     }),
+    shortText: i18n.translate('data.fieldFormats.duration.outputFormats.asYears.short', {
+      defaultMessage: 'y',
+    }),
     method: 'asYears',
   },
 ];
@@ -154,6 +185,29 @@ function parseInputAsDuration(val: number, inputFormat: string) {
   return moment.duration(val * ratio, kind);
 }
 
+function formatInputHumanPrecise(
+  val: number,
+  inputFormat: string,
+  outputPrecision: number,
+  useShortSuffix: boolean,
+  includeSpace: string
+) {
+  const ratio = ratioToSeconds[inputFormat] || 1;
+  const kind = (inputFormat in ratioToSeconds
+    ? 'seconds'
+    : inputFormat) as unitOfTime.DurationConstructor;
+  const valueInDuration = moment.duration(val * ratio, kind);
+
+  return formatDuration(
+    val,
+    valueInDuration,
+    inputFormat,
+    outputPrecision,
+    useShortSuffix,
+    includeSpace
+  );
+}
+
 export class DurationFormat extends FieldFormat {
   static id = FIELD_FORMAT_IDS.DURATION;
   static title = i18n.translate('data.fieldFormats.duration.title', {
@@ -167,11 +221,17 @@ export class DurationFormat extends FieldFormat {
   isHuman() {
     return this.param('outputFormat') === HUMAN_FRIENDLY;
   }
+
+  isHumanPrecise() {
+    return this.param('outputFormat') === HUMAN_FRIENDLY_PRECISE;
+  }
+
   getParamDefaults() {
     return {
       inputFormat: DEFAULT_INPUT_FORMAT.kind,
       outputFormat: DEFAULT_OUTPUT_FORMAT.method,
       outputPrecision: DEFAULT_OUTPUT_PRECISION,
+      includeSpaceWithSuffix: true,
     };
   }
 
@@ -180,19 +240,84 @@ export class DurationFormat extends FieldFormat {
     const outputFormat = this.param('outputFormat') as keyof Duration;
     const outputPrecision = this.param('outputPrecision');
     const showSuffix = Boolean(this.param('showSuffix'));
+    const useShortSuffix = Boolean(this.param('useShortSuffix'));
+    const includeSpaceWithSuffix = this.param('includeSpaceWithSuffix');
+
+    const includeSpace = includeSpaceWithSuffix ? ' ' : '';
+
     const human = this.isHuman();
+    const humanPrecise = this.isHumanPrecise();
+
     const prefix =
       val < 0 && human
         ? i18n.translate('data.fieldFormats.duration.negativeLabel', {
             defaultMessage: 'minus',
           }) + ' '
         : '';
+
     const duration = parseInputAsDuration(val, inputFormat) as Record<keyof Duration, Function>;
-    const formatted = duration[outputFormat]();
-    const precise = human ? formatted : formatted.toFixed(outputPrecision);
+    const formatted = humanPrecise
+      ? formatInputHumanPrecise(val, inputFormat, outputPrecision, useShortSuffix, includeSpace)
+      : duration[outputFormat]();
+
+    const precise = human || humanPrecise ? formatted : formatted.toFixed(outputPrecision);
     const type = outputFormats.find(({ method }) => method === outputFormat);
-    const suffix = showSuffix && type ? ` ${type.text}` : '';
 
-    return prefix + precise + suffix;
+    const unitText = useShortSuffix ? type?.shortText : type?.text;
+
+    const suffix = showSuffix && unitText && !human ? `${includeSpace}${unitText}` : '';
+
+    return humanPrecise ? precise : prefix + precise + suffix;
   };
 }
+
+function formatDuration(
+  val: number,
+  duration: moment.Duration,
+  inputFormat: string,
+  outputPrecision: number,
+  useShortSuffix: boolean,
+  includeSpace: string
+) {
+  // return nothing when the duration is falsy or not correctly parsed (P0D)
+  if (!duration || !duration.isValid()) return;
+  const units = [
+    { unit: duration.years(), nextUnitRate: 12, method: 'asYears' },
+    { unit: duration.months(), nextUnitRate: 4, method: 'asMonths' },
+    { unit: duration.weeks(), nextUnitRate: 7, method: 'asWeeks' },
+    { unit: duration.days(), nextUnitRate: 24, method: 'asDays' },
+    { unit: duration.hours(), nextUnitRate: 60, method: 'asHours' },
+    { unit: duration.minutes(), nextUnitRate: 60, method: 'asMinutes' },
+    { unit: duration.seconds(), nextUnitRate: 1000, method: 'asSeconds' },
+    { unit: duration.milliseconds(), nextUnitRate: 1000, method: 'asMilliseconds' },
+  ];
+
+  const getUnitText = (method: string) => {
+    const type = outputFormats.find(({ method: methodT }) => method === methodT);
+    return useShortSuffix ? type?.shortText : type?.text;
+  };
+
+  for (let i = 0; i < units.length; i++) {
+    const unitValue = units[i].unit;
+    if (unitValue >= 1) {
+      const unitText = getUnitText(units[i].method);
+
+      const value = Math.floor(unitValue);
+      if (units?.[i + 1]) {
+        const decimalPointValue = Math.floor(units[i + 1].unit);
+        return (
+          (value + decimalPointValue / units[i].nextUnitRate).toFixed(outputPrecision) +
+          includeSpace +
+          unitText
+        );
+      } else {
+        return unitValue.toFixed(outputPrecision) + includeSpace + unitText;
+      }
+    }
+  }
+
+  const unitValue = units[units.length - 1].unit;
+  const unitText = getUnitText(units[units.length - 1].method);
+
+  return unitValue.toFixed(outputPrecision) + includeSpace + unitText;
+}
diff --git a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
index 6b1d01e5ba142..681aba41a609c 100644
--- a/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
+++ b/src/plugins/data/common/index_patterns/fields/__snapshots__/index_pattern_field.test.ts.snap
@@ -16,7 +16,7 @@ Object {
   "esTypes": Array [
     "keyword",
   ],
-  "lang": "lang",
+  "lang": "java",
   "name": "name",
   "readFromDocValues": false,
   "script": "script",
@@ -58,7 +58,7 @@ Object {
     },
   },
   "isMapped": undefined,
-  "lang": "lang",
+  "lang": "java",
   "name": "name",
   "readFromDocValues": false,
   "runtimeField": Object {
diff --git a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
index 48342a9e02a2b..73f015ca5517c 100644
--- a/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
+++ b/src/plugins/data/common/index_patterns/fields/index_pattern_field.test.ts
@@ -24,7 +24,7 @@ describe('Field', function () {
     name: 'name',
     type: 'string',
     script: 'script',
-    lang: 'lang',
+    lang: 'java' as const,
     count: 1,
     esTypes: ['text'], // note, this will get replaced by the runtime field type
     aggregatable: true,
diff --git a/src/plugins/data/common/index_patterns/fields/types.ts b/src/plugins/data/common/index_patterns/fields/types.ts
index 565dd6d926948..0fb7a46c2cf73 100644
--- a/src/plugins/data/common/index_patterns/fields/types.ts
+++ b/src/plugins/data/common/index_patterns/fields/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 type { estypes } from '@elastic/elasticsearch';
 import { FieldSpec, IFieldSubType, IndexPattern } from '../..';
 
 /**
@@ -16,7 +16,7 @@ export interface IFieldType {
   name: string;
   type: string;
   script?: string;
-  lang?: string;
+  lang?: estypes.ScriptLanguage;
   count?: number;
   // esTypes might be undefined on old index patterns that have not been refreshed since we added
   // this prop. It is also undefined on scripted fields.
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
index 41ce7ba4bab4a..0c3a9901f8c8c 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_pattern.ts
@@ -7,7 +7,7 @@
  */
 
 import _, { each, reject } from 'lodash';
-import { FieldAttrs, FieldAttrSet } from '../..';
+import { FieldAttrs, FieldAttrSet, IndexPatternAttributes } from '../..';
 import type { RuntimeField } from '../types';
 import { DuplicateField } from '../../../../kibana_utils/common';
 
@@ -240,6 +240,7 @@ export class IndexPattern implements IIndexPattern {
    * @param script script code
    * @param fieldType
    * @param lang
+   * @deprecated use runtime field instead
    */
   async addScriptedField(name: string, script: string, fieldType: string = 'string') {
     const scriptedFields = this.getScriptedFields();
@@ -265,6 +266,7 @@ export class IndexPattern implements IIndexPattern {
   /**
    * Remove scripted field from field list
    * @param fieldName
+   * @deprecated use runtime field instead
    */
 
   removeScriptedField(fieldName: string) {
@@ -274,10 +276,18 @@ export class IndexPattern implements IIndexPattern {
     }
   }
 
+  /**
+   *
+   * @deprecated use runtime field instead
+   */
   getNonScriptedFields() {
     return [...this.fields.getAll().filter((field) => !field.scripted)];
   }
 
+  /**
+   *
+   * @deprecated use runtime field instead
+   */
   getScriptedFields() {
     return [...this.fields.getAll().filter((field) => field.scripted)];
   }
@@ -308,7 +318,7 @@ export class IndexPattern implements IIndexPattern {
   /**
    * Returns index pattern as saved object body for saving
    */
-  getAsSavedObjectBody() {
+  getAsSavedObjectBody(): IndexPatternAttributes {
     const fieldFormatMap = _.isEmpty(this.fieldFormatMap)
       ? undefined
       : JSON.stringify(this.fieldFormatMap);
@@ -321,12 +331,10 @@ export class IndexPattern implements IIndexPattern {
       timeFieldName: this.timeFieldName,
       intervalName: this.intervalName,
       sourceFilters: this.sourceFilters ? JSON.stringify(this.sourceFilters) : undefined,
-      fields: this.fields
-        ? JSON.stringify(this.fields.filter((field) => field.scripted))
-        : undefined,
+      fields: JSON.stringify(this.fields?.filter((field) => field.scripted) ?? []),
       fieldFormatMap,
-      type: this.type,
-      typeMeta: this.typeMeta ? JSON.stringify(this.typeMeta) : undefined,
+      type: this.type!,
+      typeMeta: JSON.stringify(this.typeMeta ?? {}),
       allowNoIndex: this.allowNoIndex ? this.allowNoIndex : undefined,
       runtimeFieldMap: runtimeFieldMap ? JSON.stringify(runtimeFieldMap) : undefined,
     };
@@ -356,7 +364,6 @@ export class IndexPattern implements IIndexPattern {
    * @param name Field name
    * @param runtimeField Runtime field definition
    */
-
   addRuntimeField(name: string, runtimeField: RuntimeField) {
     const existingField = this.getFieldByName(name);
     if (existingField) {
@@ -376,11 +383,41 @@ export class IndexPattern implements IIndexPattern {
   }
 
   /**
-   * Remove a runtime field - removed from mapped field or removed unmapped
-   * field as appropriate
-   * @param name Field name
+   * Checks if runtime field exists
+   * @param name
    */
+  hasRuntimeField(name: string): boolean {
+    return !!this.runtimeFieldMap[name];
+  }
 
+  /**
+   * Returns runtime field if exists
+   * @param name
+   */
+  getRuntimeField(name: string): RuntimeField | null {
+    return this.runtimeFieldMap[name] ?? null;
+  }
+
+  /**
+   * Replaces all existing runtime fields with new fields
+   * @param newFields
+   */
+  replaceAllRuntimeFields(newFields: Record<string, RuntimeField>) {
+    const oldRuntimeFieldNames = Object.keys(this.runtimeFieldMap);
+    oldRuntimeFieldNames.forEach((name) => {
+      this.removeRuntimeField(name);
+    });
+
+    Object.entries(newFields).forEach(([name, field]) => {
+      this.addRuntimeField(name, field);
+    });
+  }
+
+  /**
+   * Remove a runtime field - removed from mapped field or removed unmapped
+   * field as appropriate. Doesn't clear associated field attributes.
+   * @param name - Field name to remove
+   */
   removeRuntimeField(name: string) {
     const existingField = this.getFieldByName(name);
     if (existingField) {
@@ -388,9 +425,6 @@ export class IndexPattern implements IIndexPattern {
         // mapped field, remove runtimeField def
         existingField.runtimeField = undefined;
       } else {
-        // runtimeField only
-        this.setFieldCustomLabel(name, null);
-        this.deleteFieldFormat(name);
         this.fields.remove(existingField);
       }
     }
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
index a4f37334c212e..8715f8feb067a 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.test.ts
@@ -230,7 +230,12 @@ describe('IndexPatterns', () => {
 
   test('createAndSave', async () => {
     const title = 'kibana-*';
-    indexPatterns.createSavedObject = jest.fn();
+
+    indexPatterns.createSavedObject = jest.fn(() =>
+      Promise.resolve(({
+        id: 'id',
+      } as unknown) as IndexPattern)
+    );
     indexPatterns.setDefault = jest.fn();
     await indexPatterns.createAndSave({ title });
     expect(indexPatterns.createSavedObject).toBeCalled();
diff --git a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
index 66e66051a6370..e67e72f295b8e 100644
--- a/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
+++ b/src/plugins/data/common/index_patterns/index_patterns/index_patterns.ts
@@ -403,6 +403,12 @@ export class IndexPatternsService {
       throw new SavedObjectNotFound(savedObjectType, id, 'management/kibana/indexPatterns');
     }
 
+    return this.initFromSavedObject(savedObject);
+  };
+
+  private initFromSavedObject = async (
+    savedObject: SavedObject<IndexPatternAttributes>
+  ): Promise<IndexPattern> => {
     const spec = this.savedObjectToSpec(savedObject);
     const { title, type, typeMeta, runtimeFieldMap } = spec;
     spec.fieldAttrs = savedObject.attributes.fieldAttrs
@@ -412,7 +418,7 @@ export class IndexPatternsService {
     try {
       spec.fields = await this.refreshFieldSpecMap(
         spec.fields || {},
-        id,
+        savedObject.id,
         spec.title as string,
         {
           pattern: title as string,
@@ -423,6 +429,7 @@ export class IndexPatternsService {
         },
         spec.fieldAttrs
       );
+
       // CREATE RUNTIME FIELDS
       for (const [key, value] of Object.entries(runtimeFieldMap || {})) {
         // do not create runtime field if mapped field exists
@@ -450,7 +457,7 @@ export class IndexPatternsService {
         this.onError(err, {
           title: i18n.translate('data.indexPatterns.fetchFieldErrorTitle', {
             defaultMessage: 'Error fetching fields for index pattern {title} (ID: {id})',
-            values: { id, title },
+            values: { id: savedObject.id, title },
           }),
         });
       }
@@ -516,9 +523,9 @@ export class IndexPatternsService {
 
   async createAndSave(spec: IndexPatternSpec, override = false, skipFetchFields = false) {
     const indexPattern = await this.create(spec, skipFetchFields);
-    await this.createSavedObject(indexPattern, override);
-    await this.setDefault(indexPattern.id!);
-    return indexPattern;
+    const createdIndexPattern = await this.createSavedObject(indexPattern, override);
+    await this.setDefault(createdIndexPattern.id!);
+    return createdIndexPattern;
   }
 
   /**
@@ -538,15 +545,20 @@ export class IndexPatternsService {
     }
 
     const body = indexPattern.getAsSavedObjectBody();
-    const response = await this.savedObjectsClient.create(savedObjectType, body, {
-      id: indexPattern.id,
-    });
-    indexPattern.id = response.id;
-    this.indexPatternCache.set(indexPattern.id, Promise.resolve(indexPattern));
+    const response: SavedObject<IndexPatternAttributes> = (await this.savedObjectsClient.create(
+      savedObjectType,
+      body,
+      {
+        id: indexPattern.id,
+      }
+    )) as SavedObject<IndexPatternAttributes>;
+
+    const createdIndexPattern = await this.initFromSavedObject(response);
+    this.indexPatternCache.set(createdIndexPattern.id!, Promise.resolve(createdIndexPattern));
     if (this.savedObjectsCache) {
       this.savedObjectsCache.push(response as SavedObject<IndexPatternSavedObjectAttrs>);
     }
-    return indexPattern;
+    return createdIndexPattern;
   }
 
   /**
diff --git a/src/plugins/data/common/index_patterns/types.ts b/src/plugins/data/common/index_patterns/types.ts
index 0fcdea1a878eb..07aa8967b905e 100644
--- a/src/plugins/data/common/index_patterns/types.ts
+++ b/src/plugins/data/common/index_patterns/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 type { estypes } from '@elastic/elasticsearch';
 import { ToastInputFields, ErrorToastOptions } from 'src/core/public/notifications';
 // eslint-disable-next-line
 import type { SavedObject } from 'src/core/server';
@@ -167,7 +167,7 @@ export type FieldSpecConflictDescriptions = Record<string, string[]>;
 export interface FieldSpecExportFmt {
   count?: number;
   script?: string;
-  lang?: string;
+  lang?: estypes.ScriptLanguage;
   conflictDescriptions?: FieldSpecConflictDescriptions;
   name: string;
   type: KBN_FIELD_TYPES;
@@ -197,7 +197,7 @@ export interface FieldSpec {
    * Scripted field langauge
    * Painless is the only valid scripted field language
    */
-  lang?: string;
+  lang?: estypes.ScriptLanguage;
   conflictDescriptions?: Record<string, string[]>;
   format?: SerializedFieldFormat;
   name: string;
diff --git a/src/plugins/data/common/search/aggs/agg_config.ts b/src/plugins/data/common/search/aggs/agg_config.ts
index 283d276a22904..3c83b5bdf6084 100644
--- a/src/plugins/data/common/search/aggs/agg_config.ts
+++ b/src/plugins/data/common/search/aggs/agg_config.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import moment from 'moment';
 import _ from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign, Ensure } from '@kbn/utility-types';
@@ -20,6 +21,7 @@ import {
 import { IAggType } from './agg_type';
 import { writeParams } from './agg_params';
 import { IAggConfigs } from './agg_configs';
+import { parseTimeShift } from './utils';
 
 type State = string | number | boolean | null | undefined | SerializableState;
 
@@ -172,6 +174,31 @@ export class AggConfig {
     return _.get(this.params, key);
   }
 
+  hasTimeShift(): boolean {
+    return Boolean(this.getParam('timeShift'));
+  }
+
+  getTimeShift(): undefined | moment.Duration {
+    const rawTimeShift = this.getParam('timeShift');
+    if (!rawTimeShift) return undefined;
+    const parsedTimeShift = parseTimeShift(rawTimeShift);
+    if (parsedTimeShift === 'invalid') {
+      throw new Error(`could not parse time shift ${rawTimeShift}`);
+    }
+    if (parsedTimeShift === 'previous') {
+      const timeShiftInterval = this.aggConfigs.getTimeShiftInterval();
+      if (timeShiftInterval) {
+        return timeShiftInterval;
+      } else if (!this.aggConfigs.timeRange) {
+        return;
+      }
+      return moment.duration(
+        moment(this.aggConfigs.timeRange.to).diff(this.aggConfigs.timeRange.from)
+      );
+    }
+    return parsedTimeShift;
+  }
+
   write(aggs?: IAggConfigs) {
     return writeParams<AggConfig>(this.type.params, this, aggs);
   }
diff --git a/src/plugins/data/common/search/aggs/agg_configs.test.ts b/src/plugins/data/common/search/aggs/agg_configs.test.ts
index 28102544ae055..72ea64791fa5b 100644
--- a/src/plugins/data/common/search/aggs/agg_configs.test.ts
+++ b/src/plugins/data/common/search/aggs/agg_configs.test.ts
@@ -14,6 +14,7 @@ import { mockAggTypesRegistry } from './test_helpers';
 import type { IndexPatternField } from '../../index_patterns';
 import { IndexPattern } from '../../index_patterns/index_patterns/index_pattern';
 import { stubIndexPattern, stubIndexPatternWithFields } from '../../../common/stubs';
+import { IEsSearchResponse } from '..';
 
 describe('AggConfigs', () => {
   let indexPattern: IndexPattern;
@@ -332,6 +333,109 @@ describe('AggConfigs', () => {
       });
     });
 
+    it('inserts a time split filters agg if there are multiple time shifts', () => {
+      const configStates = [
+        {
+          enabled: true,
+          type: 'terms',
+          schema: 'segment',
+          params: { field: 'clientip', size: 10 },
+        },
+        { enabled: true, type: 'avg', schema: 'metric', params: { field: 'bytes' } },
+        {
+          enabled: true,
+          type: 'sum',
+          schema: 'metric',
+          params: { field: 'bytes', timeShift: '1d' },
+        },
+      ];
+      indexPattern.fields.push({
+        name: 'timestamp',
+        type: 'date',
+        esTypes: ['date'],
+        aggregatable: true,
+        filterable: true,
+        searchable: true,
+      } as IndexPatternField);
+
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      ac.timeFields = ['timestamp'];
+      ac.timeRange = {
+        from: '2021-05-05T00:00:00.000Z',
+        to: '2021-05-10T00:00:00.000Z',
+      };
+      const dsl = ac.toDsl();
+
+      const terms = ac.byName('terms')[0];
+      const avg = ac.byName('avg')[0];
+      const sum = ac.byName('sum')[0];
+
+      expect(dsl[terms.id].aggs.time_offset_split.filters.filters).toMatchInlineSnapshot(`
+        Object {
+          "0": Object {
+            "range": Object {
+              "timestamp": Object {
+                "gte": "2021-05-05T00:00:00.000Z",
+                "lte": "2021-05-10T00:00:00.000Z",
+              },
+            },
+          },
+          "86400000": Object {
+            "range": Object {
+              "timestamp": Object {
+                "gte": "2021-05-04T00:00:00.000Z",
+                "lte": "2021-05-09T00:00:00.000Z",
+              },
+            },
+          },
+        }
+      `);
+      expect(dsl[terms.id].aggs.time_offset_split.aggs).toHaveProperty(avg.id);
+      expect(dsl[terms.id].aggs.time_offset_split.aggs).toHaveProperty(sum.id);
+    });
+
+    it('does not insert a time split if there is a single time shift', () => {
+      const configStates = [
+        {
+          enabled: true,
+          type: 'terms',
+          schema: 'segment',
+          params: { field: 'clientip', size: 10 },
+        },
+        {
+          enabled: true,
+          type: 'avg',
+          schema: 'metric',
+          params: {
+            field: 'bytes',
+            timeShift: '1d',
+          },
+        },
+        {
+          enabled: true,
+          type: 'sum',
+          schema: 'metric',
+          params: { field: 'bytes', timeShift: '1d' },
+        },
+      ];
+
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      ac.timeFields = ['timestamp'];
+      ac.timeRange = {
+        from: '2021-05-05T00:00:00.000Z',
+        to: '2021-05-10T00:00:00.000Z',
+      };
+      const dsl = ac.toDsl();
+
+      const terms = ac.byName('terms')[0];
+      const avg = ac.byName('avg')[0];
+      const sum = ac.byName('sum')[0];
+
+      expect(dsl[terms.id].aggs).not.toHaveProperty('time_offset_split');
+      expect(dsl[terms.id].aggs).toHaveProperty(avg.id);
+      expect(dsl[terms.id].aggs).toHaveProperty(sum.id);
+    });
+
     it('writes multiple metric aggregations at every level if the vis is hierarchical', () => {
       const configStates = [
         { enabled: true, type: 'terms', schema: 'segment', params: { field: 'bytes', orderBy: 1 } },
@@ -426,4 +530,246 @@ describe('AggConfigs', () => {
       );
     });
   });
+
+  describe('#postFlightTransform', () => {
+    it('merges together splitted responses for multiple shifts', () => {
+      indexPattern = stubIndexPattern as IndexPattern;
+      indexPattern.fields.getByName = (name) => (({ name } as unknown) as IndexPatternField);
+      const configStates = [
+        {
+          enabled: true,
+          type: 'terms',
+          schema: 'segment',
+          params: { field: 'clientip', size: 10 },
+        },
+        {
+          enabled: true,
+          type: 'date_histogram',
+          schema: 'segment',
+          params: { field: '@timestamp', interval: '1d' },
+        },
+        {
+          enabled: true,
+          type: 'avg',
+          schema: 'metric',
+          params: {
+            field: 'bytes',
+            timeShift: '1d',
+          },
+        },
+        {
+          enabled: true,
+          type: 'sum',
+          schema: 'metric',
+          params: { field: 'bytes' },
+        },
+      ];
+
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      ac.timeFields = ['@timestamp'];
+      ac.timeRange = {
+        from: '2021-05-05T00:00:00.000Z',
+        to: '2021-05-10T00:00:00.000Z',
+      };
+      // 1 terms bucket (A), with 2 date buckets (7th and 8th of May)
+      // the bucket keys of the shifted time range will be shifted forward
+      const response = {
+        rawResponse: {
+          aggregations: {
+            '1': {
+              buckets: [
+                {
+                  key: 'A',
+                  time_offset_split: {
+                    buckets: {
+                      '0': {
+                        2: {
+                          buckets: [
+                            {
+                              // 2021-05-07
+                              key: 1620345600000,
+                              3: {
+                                value: 1.1,
+                              },
+                              4: {
+                                value: 2.2,
+                              },
+                            },
+                            {
+                              // 2021-05-08
+                              key: 1620432000000,
+                              doc_count: 26,
+                              3: {
+                                value: 3.3,
+                              },
+                              4: {
+                                value: 4.4,
+                              },
+                            },
+                          ],
+                        },
+                      },
+                      '86400000': {
+                        2: {
+                          buckets: [
+                            {
+                              // 2021-05-07
+                              key: 1620345600000,
+                              doc_count: 13,
+                              3: {
+                                value: 5.5,
+                              },
+                              4: {
+                                value: 6.6,
+                              },
+                            },
+                            {
+                              // 2021-05-08
+                              key: 1620432000000,
+                              3: {
+                                value: 7.7,
+                              },
+                              4: {
+                                value: 8.8,
+                              },
+                            },
+                          ],
+                        },
+                      },
+                    },
+                  },
+                },
+              ],
+            },
+          },
+        },
+      };
+      const mergedResponse = ac.postFlightTransform(
+        (response as unknown) as IEsSearchResponse<any>
+      );
+      expect(mergedResponse.rawResponse).toEqual({
+        aggregations: {
+          '1': {
+            buckets: [
+              {
+                '2': {
+                  buckets: [
+                    {
+                      '4': {
+                        value: 2.2,
+                      },
+                      // 2021-05-07
+                      key: 1620345600000,
+                    },
+                    {
+                      '3': {
+                        value: 5.5,
+                      },
+                      '4': {
+                        value: 4.4,
+                      },
+                      doc_count: 26,
+                      doc_count_86400000: 13,
+                      // 2021-05-08
+                      key: 1620432000000,
+                    },
+                    {
+                      '3': {
+                        value: 7.7,
+                      },
+                      // 2021-05-09
+                      key: 1620518400000,
+                    },
+                  ],
+                },
+                key: 'A',
+              },
+            ],
+          },
+        },
+      });
+    });
+
+    it('shifts date histogram keys and renames doc_count properties for single shift', () => {
+      indexPattern = stubIndexPattern as IndexPattern;
+      indexPattern.fields.getByName = (name) => (({ name } as unknown) as IndexPatternField);
+      const configStates = [
+        {
+          enabled: true,
+          type: 'date_histogram',
+          schema: 'segment',
+          params: { field: '@timestamp', interval: '1d' },
+        },
+        {
+          enabled: true,
+          type: 'avg',
+          schema: 'metric',
+          params: {
+            field: 'bytes',
+            timeShift: '1d',
+          },
+        },
+      ];
+
+      const ac = new AggConfigs(indexPattern, configStates, { typesRegistry });
+      ac.timeFields = ['@timestamp'];
+      ac.timeRange = {
+        from: '2021-05-05T00:00:00.000Z',
+        to: '2021-05-10T00:00:00.000Z',
+      };
+      const response = {
+        rawResponse: {
+          aggregations: {
+            '1': {
+              buckets: [
+                {
+                  // 2021-05-07
+                  key: 1620345600000,
+                  doc_count: 26,
+                  2: {
+                    value: 1.1,
+                  },
+                },
+                {
+                  // 2021-05-08
+                  key: 1620432000000,
+                  doc_count: 27,
+                  2: {
+                    value: 2.2,
+                  },
+                },
+              ],
+            },
+          },
+        },
+      };
+      const mergedResponse = ac.postFlightTransform(
+        (response as unknown) as IEsSearchResponse<any>
+      );
+      expect(mergedResponse.rawResponse).toEqual({
+        aggregations: {
+          '1': {
+            buckets: [
+              {
+                '2': {
+                  value: 1.1,
+                },
+                doc_count_86400000: 26,
+                // 2021-05-08
+                key: 1620432000000,
+              },
+              {
+                '2': {
+                  value: 2.2,
+                },
+                doc_count_86400000: 27,
+                // 2021-05-09
+                key: 1620518400000,
+              },
+            ],
+          },
+        },
+      });
+    });
+  });
 });
diff --git a/src/plugins/data/common/search/aggs/agg_configs.ts b/src/plugins/data/common/search/aggs/agg_configs.ts
index 2932ef7325aed..8593a0b0ed0fa 100644
--- a/src/plugins/data/common/search/aggs/agg_configs.ts
+++ b/src/plugins/data/common/search/aggs/agg_configs.ts
@@ -6,17 +6,26 @@
  * Side Public License, v 1.
  */
 
-import _ from 'lodash';
+import moment from 'moment';
+import _, { cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { Assign } from '@kbn/utility-types';
-
-import { ISearchOptions, ISearchSource } from 'src/plugins/data/public';
+import type { estypes } from '@elastic/elasticsearch';
+
+import {
+  IEsSearchResponse,
+  ISearchOptions,
+  ISearchSource,
+  RangeFilter,
+} from 'src/plugins/data/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 '../../index_patterns/index_patterns/index_pattern';
-import { TimeRange } from '../../../common';
+import { TimeRange, getTime, isRangeFilter } from '../../../common';
+import { IBucketAggConfig } from './buckets';
+import { insertTimeShiftSplit, mergeTimeShifts } from './utils/time_splits';
 
 function removeParentAggs(obj: any) {
   for (const prop in obj) {
@@ -48,6 +57,10 @@ export interface AggConfigsOptions {
 
 export type CreateAggConfigParams = Assign<AggConfigSerialized, { type: string | IAggType }>;
 
+export type GenericBucket = estypes.AggregationsBucket & {
+  [property: string]: estypes.AggregationsAggregate;
+};
+
 /**
  * @name AggConfigs
  *
@@ -66,6 +79,7 @@ export class AggConfigs {
   public indexPattern: IndexPattern;
   public timeRange?: TimeRange;
   public timeFields?: string[];
+  public forceNow?: Date;
   public hierarchical?: boolean = false;
 
   private readonly typesRegistry: AggTypesRegistryStart;
@@ -92,6 +106,10 @@ export class AggConfigs {
     this.timeFields = timeFields;
   }
 
+  setForceNow(now: Date | undefined) {
+    this.forceNow = now;
+  }
+
   setTimeRange(timeRange: TimeRange) {
     this.timeRange = timeRange;
 
@@ -183,7 +201,13 @@ export class AggConfigs {
     let dslLvlCursor: Record<string, any>;
     let nestedMetrics: Array<{ config: AggConfig; dsl: Record<string, any> }> | [];
 
+    const timeShifts = this.getTimeShifts();
+    const hasMultipleTimeShifts = Object.keys(timeShifts).length > 1;
+
     if (this.hierarchical) {
+      if (hasMultipleTimeShifts) {
+        throw new Error('Multiple time shifts not supported for hierarchical metrics');
+      }
       // collect all metrics, and filter out the ones that we won't be copying
       nestedMetrics = this.aggs
         .filter(function (agg) {
@@ -196,52 +220,67 @@ export class AggConfigs {
           };
         });
     }
-    this.getRequestAggs()
-      .filter((config: AggConfig) => !config.type.hasNoDsl)
-      .forEach((config: AggConfig, i: number, list) => {
-        if (!dslLvlCursor) {
-          // start at the top level
-          dslLvlCursor = dslTopLvl;
-        } else {
-          const prevConfig: AggConfig = list[i - 1];
-          const prevDsl = dslLvlCursor[prevConfig.id];
+    const requestAggs = this.getRequestAggs();
+    const aggsWithDsl = requestAggs.filter((agg) => !agg.type.hasNoDsl).length;
+    const timeSplitIndex = this.getAll().findIndex(
+      (config) => 'splitForTimeShift' in config.type && config.type.splitForTimeShift(config, this)
+    );
 
-          // advance the cursor and nest under the previous agg, or
-          // put it on the same level if the previous agg doesn't accept
-          // sub aggs
-          dslLvlCursor = prevDsl?.aggs || dslLvlCursor;
-        }
+    requestAggs.forEach((config: AggConfig, i: number, list) => {
+      if (!dslLvlCursor) {
+        // start at the top level
+        dslLvlCursor = dslTopLvl;
+      } else {
+        const prevConfig: AggConfig = list[i - 1];
+        const prevDsl = dslLvlCursor[prevConfig.id];
+
+        // advance the cursor and nest under the previous agg, or
+        // put it on the same level if the previous agg doesn't accept
+        // sub aggs
+        dslLvlCursor = prevDsl?.aggs || dslLvlCursor;
+      }
+
+      if (hasMultipleTimeShifts) {
+        dslLvlCursor = insertTimeShiftSplit(this, config, timeShifts, dslLvlCursor);
+      }
 
-        const dsl = config.type.hasNoDslParams
-          ? config.toDsl(this)
-          : (dslLvlCursor[config.id] = config.toDsl(this));
-        let subAggs: any;
+      if (config.type.hasNoDsl) {
+        return;
+      }
 
-        parseParentAggs(dslLvlCursor, dsl);
+      const dsl = config.type.hasNoDslParams
+        ? config.toDsl(this)
+        : (dslLvlCursor[config.id] = config.toDsl(this));
+      let subAggs: any;
 
-        if (config.type.type === AggGroupNames.Buckets && i < list.length - 1) {
-          // buckets that are not the last item in the list accept sub-aggs
-          subAggs = dsl.aggs || (dsl.aggs = {});
-        }
+      parseParentAggs(dslLvlCursor, dsl);
 
-        if (subAggs) {
-          _.each(subAggs, (agg) => {
-            parseParentAggs(subAggs, agg);
-          });
-        }
-        if (subAggs && nestedMetrics) {
-          nestedMetrics.forEach((agg: any) => {
-            subAggs[agg.config.id] = agg.dsl;
-            // if a nested metric agg has parent aggs, we have to add them to every level of the tree
-            // to make sure "bucket_path" references in the nested metric agg itself are still working
-            if (agg.dsl.parentAggs) {
-              Object.entries(agg.dsl.parentAggs).forEach(([parentAggId, parentAgg]) => {
-                subAggs[parentAggId] = parentAgg;
-              });
-            }
-          });
-        }
-      });
+      if (
+        config.type.type === AggGroupNames.Buckets &&
+        (i < aggsWithDsl - 1 || timeSplitIndex > i)
+      ) {
+        // buckets that are not the last item in the list of dsl producing aggs or have a time split coming up accept sub-aggs
+        subAggs = dsl.aggs || (dsl.aggs = {});
+      }
+
+      if (subAggs) {
+        _.each(subAggs, (agg) => {
+          parseParentAggs(subAggs, agg);
+        });
+      }
+      if (subAggs && nestedMetrics) {
+        nestedMetrics.forEach((agg: any) => {
+          subAggs[agg.config.id] = agg.dsl;
+          // if a nested metric agg has parent aggs, we have to add them to every level of the tree
+          // to make sure "bucket_path" references in the nested metric agg itself are still working
+          if (agg.dsl.parentAggs) {
+            Object.entries(agg.dsl.parentAggs).forEach(([parentAggId, parentAgg]) => {
+              subAggs[parentAggId] = parentAgg;
+            });
+          }
+        });
+      }
+    });
 
     removeParentAggs(dslTopLvl);
     return dslTopLvl;
@@ -289,6 +328,104 @@ export class AggConfigs {
     );
   }
 
+  getTimeShifts(): Record<string, moment.Duration> {
+    const timeShifts: Record<string, moment.Duration> = {};
+    this.getAll()
+      .filter((agg) => agg.schema === 'metric')
+      .map((agg) => agg.getTimeShift())
+      .forEach((timeShift) => {
+        if (timeShift) {
+          timeShifts[String(timeShift.asMilliseconds())] = timeShift;
+        } else {
+          timeShifts[0] = moment.duration(0);
+        }
+      });
+    return timeShifts;
+  }
+
+  getTimeShiftInterval(): moment.Duration | undefined {
+    const splitAgg = (this.getAll().filter(
+      (agg) => agg.type.type === AggGroupNames.Buckets
+    ) as IBucketAggConfig[]).find((agg) => agg.type.splitForTimeShift(agg, this));
+    return splitAgg?.type.getTimeShiftInterval(splitAgg);
+  }
+
+  hasTimeShifts(): boolean {
+    return this.getAll().some((agg) => agg.hasTimeShift());
+  }
+
+  getSearchSourceTimeFilter(forceNow?: Date) {
+    if (!this.timeFields || !this.timeRange) {
+      return [];
+    }
+    const timeRange = this.timeRange;
+    const timeFields = this.timeFields;
+    const timeShifts = this.getTimeShifts();
+    if (!this.hasTimeShifts()) {
+      return this.timeFields
+        .map((fieldName) => getTime(this.indexPattern, timeRange, { fieldName, forceNow }))
+        .filter(isRangeFilter);
+    }
+    return [
+      {
+        meta: {
+          index: this.indexPattern?.id,
+          params: {},
+          alias: '',
+          disabled: false,
+          negate: false,
+        },
+        query: {
+          bool: {
+            should: Object.entries(timeShifts).map(([, shift]) => {
+              return {
+                bool: {
+                  filter: timeFields
+                    .map(
+                      (fieldName) =>
+                        [
+                          getTime(this.indexPattern, timeRange, { fieldName, forceNow }),
+                          fieldName,
+                        ] as [RangeFilter | undefined, string]
+                    )
+                    .filter(([filter]) => isRangeFilter(filter))
+                    .map(([filter, field]) => ({
+                      range: {
+                        [field]: {
+                          gte: moment(filter?.range[field].gte).subtract(shift).toISOString(),
+                          lte: moment(filter?.range[field].lte).subtract(shift).toISOString(),
+                        },
+                      },
+                    })),
+                },
+              };
+            }),
+            minimum_should_match: 1,
+          },
+        },
+      },
+    ];
+  }
+
+  postFlightTransform(response: IEsSearchResponse<any>) {
+    if (!this.hasTimeShifts()) {
+      return response;
+    }
+    const transformedRawResponse = cloneDeep(response.rawResponse);
+    if (!transformedRawResponse.aggregations) {
+      transformedRawResponse.aggregations = {
+        doc_count: response.rawResponse.hits?.total as estypes.AggregationsAggregate,
+      };
+    }
+    const aggCursor = transformedRawResponse.aggregations!;
+
+    mergeTimeShifts(this, aggCursor);
+    return {
+      ...response,
+      rawResponse: transformedRawResponse,
+    };
+  }
+
   getRequestAggById(id: string) {
     return this.aggs.find((agg: AggConfig) => agg.id === id);
   }
diff --git a/src/plugins/data/common/search/aggs/agg_type.ts b/src/plugins/data/common/search/aggs/agg_type.ts
index f0f3912bf64fe..48ce54bbd61bd 100644
--- a/src/plugins/data/common/search/aggs/agg_type.ts
+++ b/src/plugins/data/common/search/aggs/agg_type.ts
@@ -215,6 +215,10 @@ export class AggType<
     return agg.id;
   };
 
+  splitForTimeShift(agg: TAggConfig, aggs: IAggConfigs) {
+    return false;
+  }
+
   /**
    * Generic AggType Constructor
    *
diff --git a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
index 6230ae897b170..372d487bcf7a3 100644
--- a/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
+++ b/src/plugins/data/common/search/aggs/buckets/_terms_other_bucket_helper.ts
@@ -166,7 +166,7 @@ export const buildOtherBucketAgg = (
     key: string
   ) => {
     // make sure there are actually results for the buckets
-    if (aggregations[aggId].buckets.length < 1) {
+    if (aggregations[aggId]?.buckets.length < 1) {
       noAggBucketResults = true;
       return;
     }
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 e9ed3799b90cf..d44e634a00fe6 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
@@ -6,8 +6,9 @@
  * Side Public License, v 1.
  */
 
+import moment from 'moment';
 import { IAggConfig } from '../agg_config';
-import { KBN_FIELD_TYPES } from '../../../../common';
+import { GenericBucket, IAggConfigs, KBN_FIELD_TYPES } from '../../../../common';
 import { AggType, AggTypeConfig } from '../agg_type';
 import { AggParamType } from '../param_types/agg';
 
@@ -26,6 +27,14 @@ const bucketType = 'buckets';
 interface BucketAggTypeConfig<TBucketAggConfig extends IAggConfig>
   extends AggTypeConfig<TBucketAggConfig, BucketAggParam<TBucketAggConfig>> {
   getKey?: (bucket: any, key: any, agg: IAggConfig) => any;
+  getShiftedKey?: (
+    agg: TBucketAggConfig,
+    key: string | number,
+    timeShift: moment.Duration
+  ) => string | number;
+  orderBuckets?(agg: TBucketAggConfig, a: GenericBucket, b: GenericBucket): number;
+  splitForTimeShift?(agg: TBucketAggConfig, aggs: IAggConfigs): boolean;
+  getTimeShiftInterval?(agg: TBucketAggConfig): undefined | moment.Duration;
 }
 
 export class BucketAggType<TBucketAggConfig extends IAggConfig = IBucketAggConfig> extends AggType<
@@ -35,6 +44,22 @@ export class BucketAggType<TBucketAggConfig extends IAggConfig = IBucketAggConfi
   getKey: (bucket: any, key: any, agg: TBucketAggConfig) => any;
   type = bucketType;
 
+  getShiftedKey(
+    agg: TBucketAggConfig,
+    key: string | number,
+    timeShift: moment.Duration
+  ): string | number {
+    return key;
+  }
+
+  getTimeShiftInterval(agg: TBucketAggConfig): undefined | moment.Duration {
+    return undefined;
+  }
+
+  orderBuckets(agg: TBucketAggConfig, a: GenericBucket, b: GenericBucket): number {
+    return Number(a.key) - Number(b.key);
+  }
+
   constructor(config: BucketAggTypeConfig<TBucketAggConfig>) {
     super(config);
 
@@ -43,6 +68,22 @@ export class BucketAggType<TBucketAggConfig extends IAggConfig = IBucketAggConfi
       ((bucket, key) => {
         return key || bucket.key;
       });
+
+    if (config.getShiftedKey) {
+      this.getShiftedKey = config.getShiftedKey;
+    }
+
+    if (config.orderBuckets) {
+      this.orderBuckets = config.orderBuckets;
+    }
+
+    if (config.getTimeShiftInterval) {
+      this.getTimeShiftInterval = config.getTimeShiftInterval;
+    }
+
+    if (config.splitForTimeShift) {
+      this.splitForTimeShift = config.splitForTimeShift;
+    }
   }
 }
 
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 4a83ae38d34db..4cbf6562487b2 100644
--- a/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
+++ b/src/plugins/data/common/search/aggs/buckets/date_histogram.ts
@@ -135,6 +135,17 @@ export const getDateHistogramBucketAgg = ({
         },
       };
     },
+    getShiftedKey(agg, key, timeShift) {
+      return moment(key).add(timeShift).valueOf();
+    },
+    splitForTimeShift(agg, aggs) {
+      return aggs.hasTimeShifts() && Boolean(aggs.timeFields?.includes(agg.fieldName()));
+    },
+    getTimeShiftInterval(agg) {
+      const { useNormalizedEsInterval } = agg.params;
+      const interval = agg.buckets.getInterval(useNormalizedEsInterval);
+      return interval;
+    },
     params: [
       {
         name: 'field',
diff --git a/src/plugins/data/common/search/aggs/buckets/terms.ts b/src/plugins/data/common/search/aggs/buckets/terms.ts
index 1b876051d009b..b9329bcb25af3 100644
--- a/src/plugins/data/common/search/aggs/buckets/terms.ts
+++ b/src/plugins/data/common/search/aggs/buckets/terms.ts
@@ -9,6 +9,7 @@
 import { noop } from 'lodash';
 import { i18n } from '@kbn/i18n';
 
+import moment from 'moment';
 import { BucketAggType, IBucketAggConfig } from './bucket_agg_type';
 import { BUCKET_TYPES } from './bucket_agg_types';
 import { createFilterTerms } from './create_filter/terms';
@@ -179,6 +180,54 @@ export const getTermsBucketAgg = () =>
             return;
           }
 
+          if (
+            aggs?.hasTimeShifts() &&
+            Object.keys(aggs?.getTimeShifts()).length > 1 &&
+            aggs.timeRange
+          ) {
+            const shift = orderAgg.getTimeShift();
+            orderAgg = aggs.createAggConfig(
+              {
+                type: 'filtered_metric',
+                id: orderAgg.id,
+                params: {
+                  customBucket: aggs
+                    .createAggConfig(
+                      {
+                        type: 'filter',
+                        id: 'shift',
+                        params: {
+                          filter: {
+                            language: 'lucene',
+                            query: {
+                              range: {
+                                [aggs.timeFields![0]]: {
+                                  gte: moment(aggs.timeRange.from)
+                                    .subtract(shift || 0)
+                                    .toISOString(),
+                                  lte: moment(aggs.timeRange.to)
+                                    .subtract(shift || 0)
+                                    .toISOString(),
+                                },
+                              },
+                            },
+                          },
+                        },
+                      },
+                      {
+                        addToAggConfigs: false,
+                      }
+                    )
+                    .serialize(),
+                  customMetric: orderAgg.serialize(),
+                },
+                enabled: false,
+              },
+              {
+                addToAggConfigs: false,
+              }
+            );
+          }
           if (orderAgg.type.name === 'count') {
             order._count = dir;
             return;
diff --git a/src/plugins/data/common/search/aggs/metrics/avg_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/avg_fn.test.ts
index 05a6e9eeff7d7..0b794617fb96e 100644
--- a/src/plugins/data/common/search/aggs/metrics/avg_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/avg_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "avg",
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 253013238d10e..e32de6cd0a83f 100644
--- a/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/avg_fn.ts
@@ -62,6 +62,13 @@ export const aggAvg = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.test.ts
index 33f20b9a40dc2..ac214c1a1591c 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_avg_fn.test.ts
@@ -29,6 +29,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "avg_bucket",
@@ -42,11 +43,13 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "avg_bucket",
           },
           "json": undefined,
+          "timeShift": undefined,
         }
       `);
     });
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 b79e57207ebd8..a980f6ac555a2 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
@@ -77,6 +77,13 @@ export const aggBucketAvg = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.test.ts
index 35b765ec0e075..e6db7665a68dd 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_max_fn.test.ts
@@ -29,6 +29,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "max_bucket",
@@ -42,11 +43,13 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "max_bucket",
           },
           "json": undefined,
+          "timeShift": undefined,
         }
       `);
     });
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 e12a592448334..0d3e8a5e7f878 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
@@ -77,6 +77,13 @@ export const aggBucketMax = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.test.ts
index 49346036ce649..22ec55506fe90 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_min_fn.test.ts
@@ -29,6 +29,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "min_bucket",
@@ -42,11 +43,13 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "min_bucket",
           },
           "json": undefined,
+          "timeShift": undefined,
         }
       `);
     });
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 ece5c07c6e5f8..3b6c32595909a 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
@@ -77,6 +77,13 @@ export const aggBucketMin = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.test.ts
index 0f5c84a477b06..0e3370cec14e5 100644
--- a/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/bucket_sum_fn.test.ts
@@ -29,6 +29,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "sum_bucket",
@@ -42,11 +43,13 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "customMetric": undefined,
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "sum_bucket",
           },
           "json": undefined,
+          "timeShift": undefined,
         }
       `);
     });
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 5fe0ee75bfe38..ae3502bbc2588 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
@@ -77,6 +77,13 @@ export const aggBucketSum = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/cardinality_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/cardinality_fn.test.ts
index 8b235edacb59a..08d64e599d8a9 100644
--- a/src/plugins/data/common/search/aggs/metrics/cardinality_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cardinality_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "cardinality",
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 ee0f72e01e1de..89006761407f7 100644
--- a/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cardinality_fn.ts
@@ -67,6 +67,13 @@ export const aggCardinality = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/count.ts b/src/plugins/data/common/search/aggs/metrics/count.ts
index 8a10d7edb3f83..fac1751290f70 100644
--- a/src/plugins/data/common/search/aggs/metrics/count.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count.ts
@@ -31,7 +31,12 @@ export const getCountMetricAgg = () =>
       };
     },
     getValue(agg, bucket) {
-      return bucket.doc_count;
+      const timeShift = agg.getTimeShift();
+      if (!timeShift) {
+        return bucket.doc_count;
+      } else {
+        return bucket[`doc_count_${timeShift.asMilliseconds()}`];
+      }
     },
     isScalable() {
       return true;
diff --git a/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts
index 047b9bbd8517f..c6736c5b69f7d 100644
--- a/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count_fn.test.ts
@@ -23,6 +23,7 @@ describe('agg_expression_functions', () => {
             "id": undefined,
             "params": Object {
               "customLabel": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "count",
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 40c87db57eedc..a3a4bcc16a391 100644
--- a/src/plugins/data/common/search/aggs/metrics/count_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/count_fn.ts
@@ -54,6 +54,13 @@ export const aggCount = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.test.ts
index 5eb6d2b780442..f311ab35a8d0d 100644
--- a/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/cumulative_sum_fn.test.ts
@@ -29,6 +29,7 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "cumulative_sum",
@@ -54,6 +55,7 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": "sum",
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "cumulative_sum",
@@ -81,12 +83,14 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "cumulative_sum",
           },
           "json": undefined,
           "metricAgg": undefined,
+          "timeShift": undefined,
         }
       `);
     });
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 cba4de1ad11ae..5cdbcfe857585 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
@@ -81,6 +81,13 @@ export const aggCumulativeSum = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/derivative_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/derivative_fn.test.ts
index 1eaca811a2481..3e4fc838dd398 100644
--- a/src/plugins/data/common/search/aggs/metrics/derivative_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/derivative_fn.test.ts
@@ -29,6 +29,7 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "derivative",
@@ -54,6 +55,7 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": "sum",
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "derivative",
@@ -81,12 +83,14 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "derivative",
           },
           "json": undefined,
           "metricAgg": undefined,
+          "timeShift": undefined,
         }
       `);
     });
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 e27179c7209ad..8bfe808aede8e 100644
--- a/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/derivative_fn.ts
@@ -81,6 +81,13 @@ export const aggDerivative = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/filtered_metric.ts b/src/plugins/data/common/search/aggs/metrics/filtered_metric.ts
index aa2417bbf8415..00f47d31b0398 100644
--- a/src/plugins/data/common/search/aggs/metrics/filtered_metric.ts
+++ b/src/plugins/data/common/search/aggs/metrics/filtered_metric.ts
@@ -42,7 +42,7 @@ export const getFilteredMetricAgg = () => {
     getValue(agg, bucket) {
       const customMetric = agg.getParam('customMetric');
       const customBucket = agg.getParam('customBucket');
-      return customMetric.getValue(bucket[customBucket.id]);
+      return bucket && bucket[customBucket.id] && customMetric.getValue(bucket[customBucket.id]);
     },
     getValueBucketPath(agg) {
       const customBucket = agg.getParam('customBucket');
diff --git a/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.test.ts
index 22e97fe18b604..d1ce6ff463903 100644
--- a/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/filtered_metric_fn.test.ts
@@ -28,6 +28,7 @@ describe('agg_expression_functions', () => {
               "customBucket": undefined,
               "customLabel": undefined,
               "customMetric": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "filtered_metric",
@@ -40,10 +41,12 @@ describe('agg_expression_functions', () => {
               "customBucket": undefined,
               "customLabel": undefined,
               "customMetric": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "filtered_metric",
           },
+          "timeShift": undefined,
         }
       `);
     });
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 6a7ff5fa5fd40..0b3d3acd3a603 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
@@ -72,6 +72,13 @@ export const aggFilteredMetric = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.test.ts
index c48233e84404c..50b5f5b60376b 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_bounds_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "geo_bounds",
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 19d2dabc843dd..b2cfad1805b9f 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
@@ -67,6 +67,13 @@ export const aggGeoBounds = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.test.ts
index e984df13527ca..889ed29c63ee1 100644
--- a/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/geo_centroid_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "geo_centroid",
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 1cc11c345e9ba..9215f7afb4c6d 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
@@ -67,6 +67,13 @@ export const aggGeoCentroid = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/max_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/max_fn.test.ts
index d94e01927c851..021c5aac69e10 100644
--- a/src/plugins/data/common/search/aggs/metrics/max_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/max_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "max",
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 7eac992680737..7a1d8ad22fb7e 100644
--- a/src/plugins/data/common/search/aggs/metrics/max_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/max_fn.ts
@@ -62,6 +62,13 @@ export const aggMax = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/median.ts b/src/plugins/data/common/search/aggs/metrics/median.ts
index bad4c7baf173f..4fdb1ce6b7d81 100644
--- a/src/plugins/data/common/search/aggs/metrics/median.ts
+++ b/src/plugins/data/common/search/aggs/metrics/median.ts
@@ -46,7 +46,7 @@ export const getMedianMetricAgg = () => {
       { name: 'percents', default: [50], shouldShow: () => false, serialize: () => undefined },
     ],
     getValue(agg, bucket) {
-      return bucket[agg.id].values['50.0'];
+      return bucket[agg.id]?.values['50.0'];
     },
   });
 };
diff --git a/src/plugins/data/common/search/aggs/metrics/median_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/median_fn.test.ts
index e70520b743e17..7ff7f18cdbc02 100644
--- a/src/plugins/data/common/search/aggs/metrics/median_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/median_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "median",
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 1c0afd81a63c4..a9537e1f99ca4 100644
--- a/src/plugins/data/common/search/aggs/metrics/median_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/median_fn.ts
@@ -67,6 +67,13 @@ export const aggMedian = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts b/src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts
index 3ebb771413665..6ddb0fdd9410d 100644
--- a/src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts
+++ b/src/plugins/data/common/search/aggs/metrics/metric_agg_type.ts
@@ -11,7 +11,8 @@ import { AggType, AggTypeConfig } from '../agg_type';
 import { AggParamType } from '../param_types/agg';
 import { AggConfig } from '../agg_config';
 import { METRIC_TYPES } from './metric_agg_types';
-import { FieldTypes } from '../param_types';
+import { BaseParamType, FieldTypes } from '../param_types';
+import { AggGroupNames } from '../agg_groups';
 
 export interface IMetricAggConfig extends AggConfig {
   type: InstanceType<typeof MetricAggType>;
@@ -47,6 +48,14 @@ export class MetricAggType<TMetricAggConfig extends AggConfig = IMetricAggConfig
   constructor(config: MetricAggTypeConfig<TMetricAggConfig>) {
     super(config);
 
+    this.params.push(
+      new BaseParamType({
+        name: 'timeShift',
+        type: 'string',
+        write: () => {},
+      }) as MetricAggParam<TMetricAggConfig>
+    );
+
     this.getValue =
       config.getValue ||
       ((agg, bucket) => {
@@ -69,6 +78,14 @@ export class MetricAggType<TMetricAggConfig extends AggConfig = IMetricAggConfig
       });
 
     this.isScalable = config.isScalable || (() => false);
+
+    // split at this point if there are time shifts and this is the first metric
+    this.splitForTimeShift = (agg, aggs) =>
+      aggs.hasTimeShifts() &&
+      aggs.byType(AggGroupNames.Metrics)[0] === agg &&
+      !aggs
+        .byType(AggGroupNames.Buckets)
+        .some((bucketAgg) => bucketAgg.type.splitForTimeShift(bucketAgg, aggs));
   }
 }
 
diff --git a/src/plugins/data/common/search/aggs/metrics/min_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/min_fn.test.ts
index ea2d2cd23edae..fee4b28882408 100644
--- a/src/plugins/data/common/search/aggs/metrics/min_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/min_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "min",
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 6dfbac1ecb8b4..a97834f310a49 100644
--- a/src/plugins/data/common/search/aggs/metrics/min_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/min_fn.ts
@@ -62,6 +62,13 @@ export const aggMin = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.test.ts
index bde90c563afc1..645519a668376 100644
--- a/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/moving_avg_fn.test.ts
@@ -30,6 +30,7 @@ describe('agg_expression_functions', () => {
               "json": undefined,
               "metricAgg": undefined,
               "script": undefined,
+              "timeShift": undefined,
               "window": undefined,
             },
             "schema": undefined,
@@ -59,6 +60,7 @@ describe('agg_expression_functions', () => {
               "json": undefined,
               "metricAgg": "sum",
               "script": "test",
+              "timeShift": undefined,
               "window": 10,
             },
             "schema": undefined,
@@ -88,6 +90,7 @@ describe('agg_expression_functions', () => {
               "json": undefined,
               "metricAgg": undefined,
               "script": undefined,
+              "timeShift": undefined,
               "window": undefined,
             },
             "schema": undefined,
@@ -96,6 +99,7 @@ describe('agg_expression_functions', () => {
           "json": undefined,
           "metricAgg": undefined,
           "script": undefined,
+          "timeShift": undefined,
           "window": undefined,
         }
       `);
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 667c585226a52..1637dad561c37 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
@@ -94,6 +94,13 @@ export const aggMovingAvg = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.test.ts
index 9328597b24cfa..873765374c80a 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentile_ranks_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
               "values": undefined,
             },
             "schema": undefined,
@@ -51,6 +52,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
               "values": Array [
                 1,
                 2,
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 7929a01c0b589..60a2882fcec58 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
@@ -74,6 +74,13 @@ export const aggPercentileRanks = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/percentiles_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/percentiles_fn.test.ts
index 0d71df240d122..468da036cea88 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentiles_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentiles_fn.test.ts
@@ -28,6 +28,7 @@ describe('agg_expression_functions', () => {
               "field": "machine.os.keyword",
               "json": undefined,
               "percents": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "percentiles",
@@ -56,6 +57,7 @@ describe('agg_expression_functions', () => {
                 2,
                 3,
               ],
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "percentiles",
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 fa5120dfc3b97..1a746a86cbcd5 100644
--- a/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/percentiles_fn.ts
@@ -74,6 +74,13 @@ export const aggPercentiles = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.test.ts
index 065ef8021cbda..aa73d5c44dd7f 100644
--- a/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/serial_diff_fn.test.ts
@@ -29,6 +29,7 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "serial_diff",
@@ -54,6 +55,7 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": "sum",
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "serial_diff",
@@ -81,12 +83,14 @@ describe('agg_expression_functions', () => {
               "customMetric": undefined,
               "json": undefined,
               "metricAgg": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "serial_diff",
           },
           "json": undefined,
           "metricAgg": undefined,
+          "timeShift": undefined,
         }
       `);
     });
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 925d85774c7ad..8460cb891f1e4 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
@@ -81,6 +81,13 @@ export const aggSerialDiff = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
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 e7ef22c6faeee..edf69031c31ac 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
@@ -74,6 +74,13 @@ export const aggSinglePercentile = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.test.ts
index 9aaf82e65812b..849987695dc7c 100644
--- a/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/std_deviation_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "std_dev",
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 80787a3383c6b..c181065d2416e 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
@@ -67,6 +67,13 @@ export const aggStdDeviation = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/sum_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/sum_fn.test.ts
index e19fc072e1cd9..f4d4fb5451dcd 100644
--- a/src/plugins/data/common/search/aggs/metrics/sum_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/sum_fn.test.ts
@@ -27,6 +27,7 @@ describe('agg_expression_functions', () => {
               "customLabel": undefined,
               "field": "machine.os.keyword",
               "json": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "sum",
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 d0175e0c8fafe..d8e03d28bb12a 100644
--- a/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
+++ b/src/plugins/data/common/search/aggs/metrics/sum_fn.ts
@@ -62,6 +62,13 @@ export const aggSum = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/metrics/top_hit_fn.test.ts b/src/plugins/data/common/search/aggs/metrics/top_hit_fn.test.ts
index e9d6a619a9cd6..2f8ef74b5c2f0 100644
--- a/src/plugins/data/common/search/aggs/metrics/top_hit_fn.test.ts
+++ b/src/plugins/data/common/search/aggs/metrics/top_hit_fn.test.ts
@@ -32,6 +32,7 @@ describe('agg_expression_functions', () => {
               "size": undefined,
               "sortField": undefined,
               "sortOrder": undefined,
+              "timeShift": undefined,
             },
             "schema": undefined,
             "type": "top_hits",
@@ -64,6 +65,7 @@ describe('agg_expression_functions', () => {
             "size": 6,
             "sortField": "_score",
             "sortOrder": "asc",
+            "timeShift": undefined,
           },
           "schema": "whatever",
           "type": "top_hits",
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 85b54f1695493..bc20f19253eec 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
@@ -94,6 +94,13 @@ export const aggTopHit = (): FunctionDefinition => ({
         defaultMessage: 'Represents a custom label for this aggregation',
       }),
     },
+    timeShift: {
+      types: ['string'],
+      help: i18n.translate('data.search.aggs.metrics.timeShift.help', {
+        defaultMessage:
+          'Shift the time range for the metric by a set time, for example 1h or 7d. "previous" will use the closest time range from the date histogram or time range filter.',
+      }),
+    },
   },
   fn: (input, args) => {
     const { id, enabled, schema, ...rest } = args;
diff --git a/src/plugins/data/common/search/aggs/types.ts b/src/plugins/data/common/search/aggs/types.ts
index 675be2323b93e..c0eb0c6c241a9 100644
--- a/src/plugins/data/common/search/aggs/types.ts
+++ b/src/plugins/data/common/search/aggs/types.ts
@@ -132,6 +132,7 @@ export type AggsStart = Assign<AggsCommonStart, { types: AggTypesRegistryStart }
 export interface BaseAggParams {
   json?: string;
   customLabel?: string;
+  timeShift?: string;
 }
 
 /** @internal */
diff --git a/src/plugins/data/common/search/aggs/utils/index.ts b/src/plugins/data/common/search/aggs/utils/index.ts
index f1625070b6f75..2bfdc47d31202 100644
--- a/src/plugins/data/common/search/aggs/utils/index.ts
+++ b/src/plugins/data/common/search/aggs/utils/index.ts
@@ -15,3 +15,4 @@ export * from './ip_address';
 export * from './prop_filter';
 export * from './to_angular_json';
 export * from './infer_time_zone';
+export * from './parse_time_shift';
diff --git a/src/plugins/data/common/search/aggs/utils/parse_time_shift.ts b/src/plugins/data/common/search/aggs/utils/parse_time_shift.ts
new file mode 100644
index 0000000000000..4d8ee0f889173
--- /dev/null
+++ b/src/plugins/data/common/search/aggs/utils/parse_time_shift.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 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';
+
+const allowedUnits = ['s', 'm', 'h', 'd', 'w', 'M', 'y'] as const;
+type AllowedUnit = typeof allowedUnits[number];
+
+/**
+ * This method parses a string into a time shift duration.
+ * If parsing fails, 'invalid' is returned.
+ * Allowed values are the string 'previous' and an integer followed by the units s,m,h,d,w,M,y
+ *  */
+export const parseTimeShift = (val: string): moment.Duration | 'previous' | 'invalid' => {
+  const trimmedVal = val.trim();
+  if (trimmedVal === 'previous') {
+    return 'previous';
+  }
+  const [, amount, unit] = trimmedVal.match(/^(\d+)(\w)$/) || [];
+  const parsedAmount = Number(amount);
+  if (Number.isNaN(parsedAmount) || !allowedUnits.includes(unit as AllowedUnit)) {
+    return 'invalid';
+  }
+  return moment.duration(Number(amount), unit as AllowedUnit);
+};
diff --git a/src/plugins/data/common/search/aggs/utils/time_splits.ts b/src/plugins/data/common/search/aggs/utils/time_splits.ts
new file mode 100644
index 0000000000000..75c1c091e0756
--- /dev/null
+++ b/src/plugins/data/common/search/aggs/utils/time_splits.ts
@@ -0,0 +1,446 @@
+/*
+ * Copyright 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';
+import _, { isArray } from 'lodash';
+import type { estypes } from '@elastic/elasticsearch';
+
+import { AggGroupNames } from '../agg_groups';
+import { GenericBucket, AggConfigs, getTime, AggConfig } from '../../../../common';
+import { IBucketAggConfig } from '../buckets';
+
+/**
+ * This function will transform an ES response containg a time split (using a filters aggregation before the metrics or date histogram aggregation),
+ * merging together all branches for the different time ranges into a single response structure which can be tabified into a single table.
+ *
+ * If there is just a single time shift, there are no separate branches per time range - in this case only the date histogram keys are shifted by the
+ * configured amount of time.
+ *
+ * To do this, the following steps are taken:
+ * * Traverse the response tree, tracking the current agg config
+ * * Once the node which would contain the time split object is found, merge all separate time range buckets into a single layer of buckets of the parent agg
+ * * Recursively repeat this process for all nested sub-buckets
+ *
+ * Example input:
+ * ```
+ * "aggregations" : {
+    "product" : {
+      "buckets" : [
+        {
+          "key" : "Product A",
+          "doc_count" : 512,
+          "first_year" : {
+            "doc_count" : 418,
+            "overall_revenue" : {
+              "value" : 2163634.0
+            }
+          },
+          "time_offset_split" : {
+            "buckets" : {
+              "-1y" : {
+                "doc_count" : 420,
+                "year" : {
+                  "buckets" : [
+                    {
+                      "key_as_string" : "2018",
+                      "doc_count" : 81,
+                      "revenue" : {
+                        "value" : 505124.0
+                      }
+                    },
+                    {
+                      "key_as_string" : "2019",
+                      "doc_count" : 65,
+                      "revenue" : {
+                        "value" : 363058.0
+                      }
+                    }
+                  ]
+                }
+              },
+              "regular" : {
+                "doc_count" : 418,
+                "year" : {
+                  "buckets" : [
+                    {
+                      "key_as_string" : "2019",
+                      "doc_count" : 65,
+                      "revenue" : {
+                        "value" : 363058.0
+                      }
+                    },
+                    {
+                      "key_as_string" : "2020",
+                      "doc_count" : 84,
+                      "revenue" : {
+                        "value" : 392924.0
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        },
+        {
+          "key" : "Product B",
+          "doc_count" : 248,
+          "first_year" : {
+            "doc_count" : 215,
+            "overall_revenue" : {
+              "value" : 1315547.0
+            }
+          },
+          "time_offset_split" : {
+            "buckets" : {
+              "-1y" : {
+                "doc_count" : 211,
+                "year" : {
+                  "buckets" : [
+                    {
+                      "key_as_string" : "2018",
+                      "key" : 1618963200000,
+                      "doc_count" : 28,
+                      "revenue" : {
+                        "value" : 156543.0
+                      }
+                    },
+   // ...
+ * ```
+ *
+ * Example output:
+ * ```
+ * "aggregations" : {
+    "product" : {
+      "buckets" : [
+        {
+          "key" : "Product A",
+          "doc_count" : 512,
+          "first_year" : {
+            "doc_count" : 418,
+            "overall_revenue" : {
+              "value" : 2163634.0
+            }
+          },
+          "year" : {
+            "buckets" : [
+              {
+                "key_as_string" : "2019",
+                "doc_count" : 81,
+                "revenue_regular" : {
+                  "value" : 505124.0
+                },
+                "revenue_-1y" : {
+                  "value" : 302736.0
+                }
+             },
+             {
+               "key_as_string" : "2020",
+               "doc_count" : 78,
+               "revenue_regular" : {
+                 "value" : 392924.0
+               },
+               "revenue_-1y" : {
+                 "value" : 363058.0
+               },
+             }
+   // ...
+ * ```
+ *
+ *
+ * @param aggConfigs The agg configs instance
+ * @param aggCursor The root aggregations object from the response which will be mutated in place
+ */
+export function mergeTimeShifts(
+  aggConfigs: AggConfigs,
+  aggCursor: Record<string, estypes.AggregationsAggregate>
+) {
+  const timeShifts = aggConfigs.getTimeShifts();
+  const hasMultipleTimeShifts = Object.keys(timeShifts).length > 1;
+  const requestAggs = aggConfigs.getRequestAggs();
+  const bucketAggs = aggConfigs.aggs.filter(
+    (agg) => agg.type.type === AggGroupNames.Buckets
+  ) as IBucketAggConfig[];
+  const mergeAggLevel = (
+    target: GenericBucket,
+    source: GenericBucket,
+    shift: moment.Duration,
+    aggIndex: number
+  ) => {
+    Object.entries(source).forEach(([key, val]) => {
+      // copy over doc count into special key
+      if (typeof val === 'number' && key === 'doc_count') {
+        if (shift.asMilliseconds() === 0) {
+          target.doc_count = val;
+        } else {
+          target[`doc_count_${shift.asMilliseconds()}`] = val;
+        }
+      } else if (typeof val !== 'object') {
+        // other meta keys not of interest
+        return;
+      } else {
+        // a sub-agg
+        const agg = requestAggs.find((requestAgg) => key.indexOf(requestAgg.id) === 0);
+        if (agg && agg.type.type === AggGroupNames.Metrics) {
+          const timeShift = agg.getTimeShift();
+          if (
+            (timeShift && timeShift.asMilliseconds() === shift.asMilliseconds()) ||
+            (shift.asMilliseconds() === 0 && !timeShift)
+          ) {
+            // this is a metric from the current time shift, copy it over
+            target[key] = source[key];
+          }
+        } else if (agg && agg === bucketAggs[aggIndex]) {
+          const bucketAgg = agg as IBucketAggConfig;
+          // expected next bucket sub agg
+          const subAggregate = val as estypes.AggregationsAggregate;
+          const buckets = ('buckets' in subAggregate ? subAggregate.buckets : undefined) as
+            | GenericBucket[]
+            | Record<string, GenericBucket>
+            | undefined;
+          if (!target[key]) {
+            // sub aggregate only exists in shifted branch, not in base branch - create dummy aggregate
+            // which will be filled with shifted data
+            target[key] = {
+              buckets: isArray(buckets) ? [] : {},
+            };
+          }
+          const baseSubAggregate = target[key] as estypes.AggregationsAggregate;
+          // only supported bucket formats in agg configs are array of buckets and record of buckets for filters
+          const baseBuckets = ('buckets' in baseSubAggregate
+            ? baseSubAggregate.buckets
+            : undefined) as GenericBucket[] | Record<string, GenericBucket> | undefined;
+          // merge
+          if (isArray(buckets) && isArray(baseBuckets)) {
+            const baseBucketMap: Record<string, GenericBucket> = {};
+            baseBuckets.forEach((bucket) => {
+              baseBucketMap[String(bucket.key)] = bucket;
+            });
+            buckets.forEach((bucket) => {
+              const bucketKey = bucketAgg.type.getShiftedKey(bucketAgg, bucket.key, shift);
+              // if a bucket is missing in the map, create an empty one
+              if (!baseBucketMap[bucketKey]) {
+                baseBucketMap[String(bucketKey)] = {
+                  key: bucketKey,
+                } as GenericBucket;
+              }
+              mergeAggLevel(baseBucketMap[bucketKey], bucket, shift, aggIndex + 1);
+            });
+            (baseSubAggregate as estypes.AggregationsMultiBucketAggregate).buckets = Object.values(
+              baseBucketMap
+            ).sort((a, b) => bucketAgg.type.orderBuckets(bucketAgg, a, b));
+          } else if (baseBuckets && buckets && !isArray(baseBuckets)) {
+            Object.entries(buckets).forEach(([bucketKey, bucket]) => {
+              // if a bucket is missing in the base response, create an empty one
+              if (!baseBuckets[bucketKey]) {
+                baseBuckets[bucketKey] = {} as GenericBucket;
+              }
+              mergeAggLevel(baseBuckets[bucketKey], bucket, shift, aggIndex + 1);
+            });
+          }
+        }
+      }
+    });
+  };
+  const transformTimeShift = (
+    cursor: Record<string, estypes.AggregationsAggregate>,
+    aggIndex: number
+  ): undefined => {
+    const shouldSplit = aggConfigs.aggs[aggIndex].type.splitForTimeShift(
+      aggConfigs.aggs[aggIndex],
+      aggConfigs
+    );
+    if (shouldSplit) {
+      // multiple time shifts caused a filters agg in the tree we have to merge
+      if (hasMultipleTimeShifts && cursor.time_offset_split) {
+        const timeShiftedBuckets = (cursor.time_offset_split as estypes.AggregationsFiltersAggregate)
+          .buckets as Record<string, estypes.AggregationsFiltersBucketItem>;
+        const subTree = {};
+        Object.entries(timeShifts).forEach(([key, shift]) => {
+          mergeAggLevel(
+            subTree as GenericBucket,
+            timeShiftedBuckets[key] as GenericBucket,
+            shift,
+            aggIndex
+          );
+        });
+
+        delete cursor.time_offset_split;
+        Object.assign(cursor, subTree);
+      } else {
+        // otherwise we have to "merge" a single level to shift all keys
+        const [[, shift]] = Object.entries(timeShifts);
+        const subTree = {};
+        mergeAggLevel(subTree, cursor, shift, aggIndex);
+        Object.assign(cursor, subTree);
+      }
+      return;
+    }
+    // recurse deeper into the response object
+    Object.keys(cursor).forEach((subAggId) => {
+      const subAgg = cursor[subAggId];
+      if (typeof subAgg !== 'object' || !('buckets' in subAgg)) {
+        return;
+      }
+      if (isArray(subAgg.buckets)) {
+        subAgg.buckets.forEach((bucket) => transformTimeShift(bucket, aggIndex + 1));
+      } else {
+        Object.values(subAgg.buckets).forEach((bucket) => transformTimeShift(bucket, aggIndex + 1));
+      }
+    });
+  };
+  transformTimeShift(aggCursor, 0);
+}
+
+/**
+ * Inserts a filters aggregation into the aggregation tree which splits buckets to fetch data for all time ranges
+ * configured in metric aggregations.
+ *
+ * The current agg config can implement `splitForTimeShift` to force insertion of the time split filters aggregation
+ * before the dsl of the agg config (date histogram and metrics aggregations do this)
+ *
+ * Example aggregation tree without time split:
+ * ```
+ * "aggs": {
+    "product": {
+      "terms": {
+        "field": "product",
+        "size": 3,
+        "order": { "overall_revenue": "desc" }
+      },
+      "aggs": {
+        "overall_revenue": {
+          "sum": {
+            "field": "sales"
+          }
+        },
+        "year": {
+          "date_histogram": {
+            "field": "timestamp",
+            "interval": "year"
+          },
+          "aggs": {
+            "revenue": {
+              "sum": {
+                  "field": "sales"
+              }
+            }
+          }
+   // ...
+ * ```
+ *
+ * Same aggregation tree with inserted time split:
+ * ```
+ * "aggs": {
+    "product": {
+      "terms": {
+        "field": "product",
+        "size": 3,
+        "order": { "first_year>overall_revenue": "desc" }
+      },
+      "aggs": {
+        "first_year": {
+          "filter": {
+            "range": {
+              "timestamp": {
+                "gte": "2019",
+                "lte": "2020"
+              }
+            }
+          },
+          "aggs": {
+            "overall_revenue": {
+              "sum": {
+                "field": "sales"
+              }
+            }
+          }
+        },
+        "time_offset_split": {
+          "filters": {
+            "filters": {
+              "regular": {
+                "range": {
+                  "timestamp": {
+                    "gte": "2019",
+                    "lte": "2020"
+                  }
+                }
+              },
+              "-1y": {
+                "range": {
+                  "timestamp": {
+                    "gte": "2018",
+                    "lte": "2019"
+                  }
+                }
+              }
+            }
+          },
+          "aggs": {
+            "year": {
+              "date_histogram": {
+                "field": "timestamp",
+                "interval": "year"
+              },
+              "aggs": {
+                "revenue": {
+                  "sum": {
+                      "field": "sales"
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+ * ```
+ */
+export function insertTimeShiftSplit(
+  aggConfigs: AggConfigs,
+  config: AggConfig,
+  timeShifts: Record<string, moment.Duration>,
+  dslLvlCursor: Record<string, any>
+) {
+  if ('splitForTimeShift' in config.type && !config.type.splitForTimeShift(config, aggConfigs)) {
+    return dslLvlCursor;
+  }
+  if (!aggConfigs.timeFields || aggConfigs.timeFields.length < 1) {
+    throw new Error('Time shift can only be used with configured time field');
+  }
+  if (!aggConfigs.timeRange) {
+    throw new Error('Time shift can only be used with configured time range');
+  }
+  const timeRange = aggConfigs.timeRange;
+  const filters: Record<string, unknown> = {};
+  const timeField = aggConfigs.timeFields[0];
+  Object.entries(timeShifts).forEach(([key, shift]) => {
+    const timeFilter = getTime(aggConfigs.indexPattern, timeRange, {
+      fieldName: timeField,
+      forceNow: aggConfigs.forceNow,
+    });
+    if (timeFilter) {
+      filters[key] = {
+        range: {
+          [timeField]: {
+            gte: moment(timeFilter.range[timeField].gte).subtract(shift).toISOString(),
+            lte: moment(timeFilter.range[timeField].lte).subtract(shift).toISOString(),
+          },
+        },
+      };
+    }
+  });
+  dslLvlCursor.time_offset_split = {
+    filters: {
+      filters,
+    },
+    aggs: {},
+  };
+
+  return dslLvlCursor.time_offset_split.aggs;
+}
diff --git a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
index 32775464d055f..4f255cf4c244c 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.test.ts
@@ -42,6 +42,7 @@ describe('esaggs expression function - public', () => {
         toDsl: jest.fn().mockReturnValue({ aggs: {} }),
         onSearchRequestStart: jest.fn(),
         setTimeFields: jest.fn(),
+        setForceNow: jest.fn(),
       } as unknown) as jest.Mocked<IAggConfigs>,
       filters: undefined,
       indexPattern: ({ id: 'logstash-*' } as unknown) as jest.Mocked<IndexPattern>,
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 d152ebf159a8e..61193c52a5e74 100644
--- a/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
+++ b/src/plugins/data/common/search/expressions/esaggs/request_handler.ts
@@ -9,15 +9,7 @@
 import { i18n } from '@kbn/i18n';
 import { Adapters } from 'src/plugins/inspector/common';
 
-import {
-  calculateBounds,
-  Filter,
-  getTime,
-  IndexPattern,
-  isRangeFilter,
-  Query,
-  TimeRange,
-} from '../../../../common';
+import { calculateBounds, Filter, IndexPattern, Query, TimeRange } from '../../../../common';
 
 import { IAggConfigs } from '../../aggs';
 import { ISearchStartSearchSource } from '../../search_source';
@@ -70,8 +62,15 @@ export const handleRequest = async ({
   const timeFilterSearchSource = searchSource.createChild({ callParentStartHandlers: true });
   const requestSearchSource = timeFilterSearchSource.createChild({ callParentStartHandlers: true });
 
+  // If timeFields have been specified, use the specified ones, otherwise use primary time field of index
+  // pattern if it's available.
+  const defaultTimeField = indexPattern?.getTimeField?.();
+  const defaultTimeFields = defaultTimeField ? [defaultTimeField.name] : [];
+  const allTimeFields = timeFields && timeFields.length > 0 ? timeFields : defaultTimeFields;
+
   aggs.setTimeRange(timeRange as TimeRange);
-  aggs.setTimeFields(timeFields);
+  aggs.setForceNow(forceNow);
+  aggs.setTimeFields(allTimeFields);
 
   // For now we need to mirror the history of the passed search source, since
   // the request inspector wouldn't work otherwise.
@@ -90,19 +89,11 @@ export const handleRequest = async ({
     return aggs.onSearchRequestStart(paramSearchSource, options);
   });
 
-  // If timeFields have been specified, use the specified ones, otherwise use primary time field of index
-  // pattern if it's available.
-  const defaultTimeField = indexPattern?.getTimeField?.();
-  const defaultTimeFields = defaultTimeField ? [defaultTimeField.name] : [];
-  const allTimeFields = timeFields && timeFields.length > 0 ? timeFields : defaultTimeFields;
-
   // If a timeRange has been specified and we had at least one timeField available, create range
   // filters for that those time fields
   if (timeRange && allTimeFields.length > 0) {
     timeFilterSearchSource.setField('filter', () => {
-      return allTimeFields
-        .map((fieldName) => getTime(indexPattern, timeRange, { fieldName, forceNow }))
-        .filter(isRangeFilter);
+      return aggs.getSearchSourceTimeFilter(forceNow);
     });
   }
 
diff --git a/src/plugins/data/common/search/search_source/mocks.ts b/src/plugins/data/common/search/search_source/mocks.ts
index 64ed82f36e81b..c8769141a71d6 100644
--- a/src/plugins/data/common/search/search_source/mocks.ts
+++ b/src/plugins/data/common/search/search_source/mocks.ts
@@ -45,6 +45,10 @@ export const searchSourceCommonMock: jest.Mocked<ISearchStartSearchSource> = {
 export const createSearchSourceMock = (fields?: SearchSourceFields) =>
   new SearchSource(fields, {
     getConfig: uiSettingsServiceMock.createStartContract().get,
-    search: jest.fn(),
+    search: jest
+      .fn()
+      .mockReturnValue(
+        of({ rawResponse: { hits: { hits: [], total: 0 } }, isPartial: false, isRunning: false })
+      ),
     onResponse: jest.fn().mockImplementation((req, res) => res),
   });
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 f35d2d47f1bf4..19e80c7a487dc 100644
--- a/src/plugins/data/common/search/search_source/search_source.ts
+++ b/src/plugins/data/common/search/search_source/search_source.ts
@@ -75,7 +75,13 @@ import { estypes } from '@elastic/elasticsearch';
 import { normalizeSortRequest } from './normalize_sort_request';
 import { fieldWildcardFilter } from '../../../../kibana_utils/common';
 import { IIndexPattern, IndexPattern, IndexPatternField } from '../../index_patterns';
-import { AggConfigs, ES_SEARCH_STRATEGY, ISearchGeneric, ISearchOptions } from '../..';
+import {
+  AggConfigs,
+  ES_SEARCH_STRATEGY,
+  IEsSearchResponse,
+  ISearchGeneric,
+  ISearchOptions,
+} from '../..';
 import type {
   ISearchSource,
   SearchFieldValue,
@@ -414,6 +420,15 @@ export class SearchSource {
     }
   }
 
+  private postFlightTransform(response: IEsSearchResponse<any>) {
+    const aggs = this.getField('aggs');
+    if (aggs instanceof AggConfigs) {
+      return aggs.postFlightTransform(response);
+    } else {
+      return response;
+    }
+  }
+
   private async fetchOthers(response: estypes.SearchResponse<any>, options: ISearchOptions) {
     const aggs = this.getField('aggs');
     if (aggs instanceof AggConfigs) {
@@ -451,24 +466,26 @@ export class SearchSource {
           if (isErrorResponse(response)) {
             obs.error(response);
           } else if (isPartialResponse(response)) {
-            obs.next(response);
+            obs.next(this.postFlightTransform(response));
           } else {
             if (!this.hasPostFlightRequests()) {
-              obs.next(response);
+              obs.next(this.postFlightTransform(response));
               obs.complete();
             } else {
               // Treat the complete response as partial, then run the postFlightRequests.
               obs.next({
-                ...response,
+                ...this.postFlightTransform(response),
                 isPartial: true,
                 isRunning: true,
               });
               const sub = from(this.fetchOthers(response.rawResponse, options)).subscribe({
                 next: (responseWithOther) => {
-                  obs.next({
-                    ...response,
-                    rawResponse: responseWithOther,
-                  });
+                  obs.next(
+                    this.postFlightTransform({
+                      ...response,
+                      rawResponse: responseWithOther!,
+                    })
+                  );
                 },
                 error: (e) => {
                   obs.error(e);
@@ -682,7 +699,7 @@ export class SearchSource {
     searchRequest.body = searchRequest.body || {};
     const { body, index, query, filters, highlightAll } = searchRequest;
     searchRequest.indexType = this.getIndexType(index);
-    const metaFields = getConfig(UI_SETTINGS.META_FIELDS);
+    const metaFields = getConfig(UI_SETTINGS.META_FIELDS) ?? [];
 
     // get some special field types from the index pattern
     const { docvalueFields, scriptFields, storedFields, runtimeFields } = index
diff --git a/src/plugins/data/common/search/search_source/types.ts b/src/plugins/data/common/search/search_source/types.ts
index 507fda0dc9e47..40e92f45af143 100644
--- a/src/plugins/data/common/search/search_source/types.ts
+++ b/src/plugins/data/common/search/search_source/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 type { estypes } from '@elastic/elasticsearch';
 import { NameList } from 'elasticsearch';
 import { IAggConfigs } from 'src/plugins/data/public';
 import { Query } from '../..';
@@ -156,7 +156,7 @@ export interface ShardFailure {
       type: string;
     };
     reason: string;
-    lang?: string;
+    lang?: estypes.ScriptLanguage;
     script?: string;
     script_stack?: string[];
     type: string;
diff --git a/src/plugins/data/common/search/tabify/tabify.ts b/src/plugins/data/common/search/tabify/tabify.ts
index 4a8972d4384c2..a4d9551da75d5 100644
--- a/src/plugins/data/common/search/tabify/tabify.ts
+++ b/src/plugins/data/common/search/tabify/tabify.ts
@@ -139,7 +139,7 @@ export function tabifyAggResponse(
   const write = new TabbedAggResponseWriter(aggConfigs, respOpts || {});
   const topLevelBucket: AggResponseBucket = {
     ...esResponse.aggregations,
-    doc_count: esResponse.hits?.total,
+    doc_count: esResponse.aggregations?.doc_count || esResponse.hits?.total,
   };
 
   collectBucket(aggConfigs, write, topLevelBucket, '', 1);
diff --git a/src/plugins/data/config.ts b/src/plugins/data/config.ts
index 72fa547f44a77..9306b64019bbc 100644
--- a/src/plugins/data/config.ts
+++ b/src/plugins/data/config.ts
@@ -15,6 +15,8 @@ export const configSchema = schema.object({
     }),
     valueSuggestions: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
+      terminateAfter: schema.duration({ defaultValue: 100000 }),
+      timeout: schema.duration({ defaultValue: 1000 }),
     }),
   }),
   search: schema.object({
diff --git a/src/plugins/data/public/autocomplete/autocomplete_service.ts b/src/plugins/data/public/autocomplete/autocomplete_service.ts
index eb9d859664c4d..67efbe2af29ce 100644
--- a/src/plugins/data/public/autocomplete/autocomplete_service.ts
+++ b/src/plugins/data/public/autocomplete/autocomplete_service.ts
@@ -7,6 +7,7 @@
  */
 
 import { CoreSetup, PluginInitializerContext } from 'src/core/public';
+import moment from 'moment';
 import { TimefilterSetup } from '../query';
 import { QuerySuggestionGetFn } from './providers/query_suggestion_provider';
 import {
@@ -27,7 +28,7 @@ import { DataPublicPluginStart, DataStartDependencies } from '../types';
 export class AutocompleteService {
   autocompleteConfig: ConfigSchema['autocomplete'];
 
-  constructor(initializerContext: PluginInitializerContext<ConfigSchema>) {
+  constructor(private initializerContext: PluginInitializerContext<ConfigSchema>) {
     const { autocomplete } = initializerContext.config.get<ConfigSchema>();
 
     this.autocompleteConfig = autocomplete;
@@ -55,6 +56,8 @@ export class AutocompleteService {
       usageCollection,
     }: { timefilter: TimefilterSetup; usageCollection?: UsageCollectionSetup }
   ) {
+    const { autocomplete } = this.initializerContext.config.get<ConfigSchema>();
+    const { terminateAfter, timeout } = autocomplete.valueSuggestions;
     const usageCollector = createUsageCollector(core.getStartServices, usageCollection);
 
     this.getValueSuggestions = this.autocompleteConfig.valueSuggestions.enabled
@@ -71,6 +74,10 @@ export class AutocompleteService {
        * please use "getQuerySuggestions" from the start contract
        */
       getQuerySuggestions: this.getQuerySuggestions,
+      getAutocompleteSettings: () => ({
+        terminateAfter: moment.duration(terminateAfter).asMilliseconds(),
+        timeout: moment.duration(timeout).asMilliseconds(),
+      }),
     };
   }
 
diff --git a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
index f1eced06a33ea..84ed4315ee16f 100644
--- a/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
+++ b/src/plugins/data/public/autocomplete/providers/kql_query_suggestion/field.test.ts
@@ -41,6 +41,7 @@ describe('Kuery field suggestions', () => {
       querySuggestionsArgs,
       mockKueryNode({ prefix, suffix })
     );
+    // @ts-expect-error indexPatternResponse is not properly typed json
     const filterableFields = indexPatternResponse.fields.filter(indexPatternsUtils.isFilterable);
 
     expect(suggestions.length).toBe(filterableFields.length);
diff --git a/src/plugins/data/public/mocks.ts b/src/plugins/data/public/mocks.ts
index f5def327b5473..1277e31be2103 100644
--- a/src/plugins/data/public/mocks.ts
+++ b/src/plugins/data/public/mocks.ts
@@ -16,8 +16,9 @@ import { createNowProviderMock } from './now_provider/mocks';
 export type Setup = jest.Mocked<ReturnType<Plugin['setup']>>;
 export type Start = jest.Mocked<ReturnType<Plugin['start']>>;
 
-const automcompleteSetupMock: jest.Mocked<AutocompleteSetup> = {
+const autocompleteSetupMock: jest.Mocked<AutocompleteSetup> = {
   getQuerySuggestions: jest.fn(),
+  getAutocompleteSettings: jest.fn(),
 };
 
 const autocompleteStartMock: jest.Mocked<AutocompleteStart> = {
@@ -29,7 +30,7 @@ const autocompleteStartMock: jest.Mocked<AutocompleteStart> = {
 const createSetupContract = (): Setup => {
   const querySetupMock = queryServiceMock.createSetupContract();
   return {
-    autocomplete: automcompleteSetupMock,
+    autocomplete: autocompleteSetupMock,
     search: searchServiceMock.createSetupContract(),
     fieldFormats: fieldFormatsServiceMock.createSetupContract(),
     query: querySetupMock,
diff --git a/src/plugins/data/public/public.api.md b/src/plugins/data/public/public.api.md
index fde7075d9e760..67534577d99fc 100644
--- a/src/plugins/data/public/public.api.md
+++ b/src/plugins/data/public/public.api.md
@@ -46,6 +46,7 @@ import { Href } from 'history';
 import { HttpSetup } from 'kibana/public';
 import { IAggConfigs as IAggConfigs_2 } from 'src/plugins/data/public';
 import { IconType } from '@elastic/eui';
+import { IEsSearchResponse as IEsSearchResponse_2 } from 'src/plugins/data/public';
 import { IncomingHttpHeaders } from 'http';
 import { InjectedIntl } from '@kbn/i18n/react';
 import { ISearchOptions as ISearchOptions_2 } from 'src/plugins/data/public';
@@ -74,6 +75,7 @@ import * as PropTypes from 'prop-types';
 import { PublicContract } from '@kbn/utility-types';
 import { PublicMethodsOf } from '@kbn/utility-types';
 import { PublicUiSettingsParams } from 'src/core/server/types';
+import { RangeFilter as RangeFilter_2 } from 'src/plugins/data/public';
 import React from 'react';
 import * as React_3 from 'react';
 import { RecursiveReadonly } from '@kbn/utility-types';
@@ -152,9 +154,13 @@ export class AggConfig {
     // (undocumented)
     getTimeRange(): import("../../../public").TimeRange | undefined;
     // (undocumented)
+    getTimeShift(): undefined | moment.Duration;
+    // (undocumented)
     getValue(bucket: any): any;
     getValueBucketPath(): string;
     // (undocumented)
+    hasTimeShift(): boolean;
+    // (undocumented)
     id: string;
     // (undocumented)
     isFilterable(): boolean;
@@ -245,6 +251,8 @@ export class AggConfigs {
         addToAggConfigs?: boolean | undefined;
     }) => T;
     // (undocumented)
+    forceNow?: Date;
+    // (undocumented)
     getAll(): AggConfig[];
     // (undocumented)
     getRequestAggById(id: string): AggConfig | undefined;
@@ -253,6 +261,39 @@ export class AggConfigs {
     getResponseAggById(id: string): AggConfig | undefined;
     getResponseAggs(): AggConfig[];
     // (undocumented)
+    getSearchSourceTimeFilter(forceNow?: Date): RangeFilter_2[] | {
+        meta: {
+            index: string | undefined;
+            params: {};
+            alias: string;
+            disabled: boolean;
+            negate: boolean;
+        };
+        query: {
+            bool: {
+                should: {
+                    bool: {
+                        filter: {
+                            range: {
+                                [x: string]: {
+                                    gte: string;
+                                    lte: string;
+                                };
+                            };
+                        }[];
+                    };
+                }[];
+                minimum_should_match: number;
+            };
+        };
+    }[];
+    // (undocumented)
+    getTimeShiftInterval(): moment.Duration | undefined;
+    // (undocumented)
+    getTimeShifts(): Record<string, moment.Duration>;
+    // (undocumented)
+    hasTimeShifts(): boolean;
+    // (undocumented)
     hierarchical?: boolean;
     // (undocumented)
     indexPattern: IndexPattern;
@@ -260,6 +301,10 @@ export class AggConfigs {
     // (undocumented)
     onSearchRequestStart(searchSource: ISearchSource_2, options?: ISearchOptions_2): Promise<[unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown, unknown]>;
     // (undocumented)
+    postFlightTransform(response: IEsSearchResponse_2<any>): IEsSearchResponse_2<any>;
+    // (undocumented)
+    setForceNow(now: Date | undefined): void;
+    // (undocumented)
     setTimeFields(timeFields: string[] | undefined): void;
     // (undocumented)
     setTimeRange(timeRange: TimeRange): void;
@@ -1198,7 +1243,7 @@ export interface IFieldType {
     // (undocumented)
     format?: any;
     // (undocumented)
-    lang?: string;
+    lang?: estypes.ScriptLanguage;
     // (undocumented)
     name: string;
     // (undocumented)
@@ -1307,6 +1352,7 @@ export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
     constructor({ spec, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
     addRuntimeField(name: string, runtimeField: RuntimeField): void;
+    // @deprecated
     addScriptedField(name: string, script: string, fieldType?: string): Promise<void>;
     readonly allowNoIndex: boolean;
     // (undocumented)
@@ -1335,19 +1381,7 @@ export class IndexPattern implements IIndexPattern {
         delay?: string | undefined;
         time_zone?: string | undefined;
     }>> | undefined;
-    getAsSavedObjectBody(): {
-        fieldAttrs: string | undefined;
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-        allowNoIndex: true | undefined;
-        runtimeFieldMap: string | undefined;
-    };
+    getAsSavedObjectBody(): IndexPatternAttributes;
     // (undocumented)
     getComputedFields(): {
         storedFields: string[];
@@ -1366,7 +1400,7 @@ export class IndexPattern implements IIndexPattern {
     getFieldByName(name: string): IndexPatternField | undefined;
     getFormatterForField(field: IndexPatternField | IndexPatternField['spec'] | IFieldType): FieldFormat;
     getFormatterForFieldNoDefault(fieldname: string): FieldFormat | undefined;
-    // (undocumented)
+    // @deprecated (undocumented)
     getNonScriptedFields(): IndexPatternField[];
     getOriginalSavedObjectBody: () => {
         fieldAttrs?: string | undefined;
@@ -1379,13 +1413,15 @@ export class IndexPattern implements IIndexPattern {
         typeMeta?: string | undefined;
         type?: string | undefined;
     };
-    // (undocumented)
+    getRuntimeField(name: string): RuntimeField | null;
+    // @deprecated (undocumented)
     getScriptedFields(): IndexPatternField[];
     getSourceFiltering(): {
         excludes: any[];
     };
     // (undocumented)
     getTimeField(): IndexPatternField | undefined;
+    hasRuntimeField(name: string): boolean;
     // (undocumented)
     id?: string;
     // @deprecated (undocumented)
@@ -1397,7 +1433,9 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     metaFields: string[];
     removeRuntimeField(name: string): void;
+    // @deprecated
     removeScriptedField(fieldName: string): void;
+    replaceAllRuntimeFields(newFields: Record<string, RuntimeField>): void;
     resetOriginalSavedObjectBody: () => void;
     // (undocumented)
     protected setFieldAttrs<K extends keyof FieldAttrSet>(fieldName: string, attrName: K, value: FieldAttrSet[K]): void;
@@ -1483,8 +1521,8 @@ export class IndexPatternField implements IFieldType {
     // (undocumented)
     get filterable(): boolean;
     get isMapped(): boolean | undefined;
-    get lang(): string | undefined;
-    set lang(lang: string | undefined);
+    get lang(): "painless" | "expression" | "mustache" | "java" | undefined;
+    set lang(lang: "painless" | "expression" | "mustache" | "java" | undefined);
     // (undocumented)
     get name(): string;
     // (undocumented)
@@ -1508,7 +1546,7 @@ export class IndexPatternField implements IFieldType {
     toJSON(): {
         count: number;
         script: string | undefined;
-        lang: string | undefined;
+        lang: "painless" | "expression" | "mustache" | "java" | undefined;
         conflictDescriptions: Record<string, string[]> | undefined;
         name: string;
         type: string;
@@ -1953,7 +1991,7 @@ export type PhraseFilter = Filter & {
     script?: {
         script: {
             source?: any;
-            lang?: string;
+            lang?: estypes.ScriptLanguage;
             params: any;
         };
     };
@@ -2171,7 +2209,7 @@ export type RangeFilter = Filter & EsRangeFilter & {
     script?: {
         script: {
             params: any;
-            lang: string;
+            lang: estypes.ScriptLanguage;
             source: any;
         };
     };
@@ -2217,7 +2255,7 @@ export interface Reason {
         reason: string;
     };
     // (undocumented)
-    lang?: string;
+    lang?: estypes.ScriptLanguage;
     // (undocumented)
     position?: {
         offset: number;
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.test.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.test.ts
index 479cbb140fc70..0ae1513ae5d1b 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.test.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.test.ts
@@ -54,6 +54,61 @@ describe('mapSpatialFilter()', () => {
     expect(result).toHaveProperty('type', FILTERS.SPATIAL_FILTER);
   });
 
+  test('should return the key for matching multi field filter', async () => {
+    const filter = {
+      meta: {
+        alias: 'my spatial filter',
+        isMultiIndex: true,
+        type: FILTERS.SPATIAL_FILTER,
+      } as FilterMeta,
+      query: {
+        bool: {
+          should: [
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'geo.coordinates',
+                    },
+                  },
+                  {
+                    geo_distance: {
+                      distance: '1000km',
+                      'geo.coordinates': [120, 30],
+                    },
+                  },
+                ],
+              },
+            },
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'location',
+                    },
+                  },
+                  {
+                    geo_distance: {
+                      distance: '1000km',
+                      location: [120, 30],
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    } as Filter;
+    const result = mapSpatialFilter(filter);
+
+    expect(result).toHaveProperty('key', 'query');
+    expect(result).toHaveProperty('value', '');
+    expect(result).toHaveProperty('type', FILTERS.SPATIAL_FILTER);
+  });
+
   test('should return undefined for none matching', async (done) => {
     const filter = {
       meta: {
diff --git a/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts b/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts
index 0703bc055a39b..229257c1a7d81 100644
--- a/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts
+++ b/src/plugins/data/public/query/filter_manager/lib/mappers/map_spatial_filter.ts
@@ -22,5 +22,18 @@ export const mapSpatialFilter = (filter: Filter) => {
       value: '',
     };
   }
+
+  if (
+    filter.meta &&
+    filter.meta.type === FILTERS.SPATIAL_FILTER &&
+    filter.meta.isMultiIndex &&
+    filter.query?.bool?.should
+  ) {
+    return {
+      key: 'query',
+      type: filter.meta.type,
+      value: '',
+    };
+  }
   throw filter;
 };
diff --git a/src/plugins/data/public/query/query_string/query_string_manager.mock.ts b/src/plugins/data/public/query/query_string/query_string_manager.mock.ts
index 0038ba0e87e06..976d3ce13e7de 100644
--- a/src/plugins/data/public/query/query_string/query_string_manager.mock.ts
+++ b/src/plugins/data/public/query/query_string/query_string_manager.mock.ts
@@ -7,12 +7,13 @@
  */
 
 import { QueryStringContract } from '.';
+import { Observable } from 'rxjs';
 
 const createSetupContractMock = () => {
   const queryStringManagerMock: jest.Mocked<QueryStringContract> = {
     getQuery: jest.fn(),
     setQuery: jest.fn(),
-    getUpdates$: jest.fn(),
+    getUpdates$: jest.fn(() => new Observable()),
     getDefaultQuery: jest.fn(),
     formatQuery: jest.fn(),
     clearQuery: jest.fn(),
diff --git a/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
index c22f62f45a709..f1f02a010e98c 100644
--- a/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
+++ b/src/plugins/data/public/query/timefilter/timefilter_service.mock.ts
@@ -21,7 +21,7 @@ const createSetupContractMock = () => {
     getTimeUpdate$: jest.fn(),
     getRefreshIntervalUpdate$: jest.fn(),
     getAutoRefreshFetch$: jest.fn(() => new Observable<() => void>()),
-    getFetch$: jest.fn(),
+    getFetch$: jest.fn(() => new Observable<() => void>()),
     getTime: jest.fn(),
     setTime: jest.fn(),
     setRefreshInterval: jest.fn(),
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..833573786594b 100644
--- a/src/plugins/data/public/search/errors/painless_error.test.tsx
+++ b/src/plugins/data/public/search/errors/painless_error.test.tsx
@@ -23,6 +23,7 @@ describe('PainlessError', () => {
     const e = new PainlessError({
       statusCode: 400,
       message: 'search_phase_execution_exception',
+      // @ts-expect-error searchPhaseException is not properly typed json
       attributes: searchPhaseException.error,
     });
     const component = mount(e.getErrorMessage(startMock.application));
diff --git a/src/plugins/data/public/search/errors/types.ts b/src/plugins/data/public/search/errors/types.ts
index 445293fe47ea3..13c5d0c242ed0 100644
--- a/src/plugins/data/public/search/errors/types.ts
+++ b/src/plugins/data/public/search/errors/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 type { estypes } from '@elastic/elasticsearch';
 import { KibanaServerError } from '../../../../kibana_utils/common';
 
 export interface FailedShard {
@@ -24,7 +24,7 @@ export interface Reason {
     start: number;
     end: number;
   };
-  lang?: string;
+  lang?: estypes.ScriptLanguage;
   script?: string;
   caused_by?: {
     type: string;
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 dfbc912453d6e..fe66d4b6e9937 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
@@ -135,6 +135,7 @@ describe('SearchInterceptor', () => {
         new PainlessError({
           statusCode: 400,
           message: 'search_phase_execution_exception',
+          // @ts-expect-error searchPhaseException is not properly typed json
           attributes: searchPhaseException.error,
         })
       );
diff --git a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts
index c34a47dc1c6dd..83e4abf55d525 100644
--- a/src/plugins/data/public/ui/shard_failure_modal/shard_failure_types.ts
+++ b/src/plugins/data/public/ui/shard_failure_modal/shard_failure_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 type { estypes } from '@elastic/elasticsearch';
 export interface ShardFailureRequest {
   docvalue_fields: string[];
   _source: unknown;
@@ -24,7 +24,7 @@ export interface ShardFailure {
       type: string;
     };
     reason: string;
-    lang?: string;
+    lang?: estypes.ScriptLanguage;
     script?: string;
     script_stack?: string[];
     type: string;
diff --git a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
index 9896a6dbdc7b7..a0a7e54d27532 100644
--- a/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
+++ b/src/plugins/data/public/utils/table_inspector_view/components/__snapshots__/data_view.test.tsx.snap
@@ -718,11 +718,13 @@ exports[`Inspector Data View component should render single table without select
                             >
                               <EuiIcon
                                 className="euiButtonContent__icon"
+                                color="inherit"
                                 size="m"
                                 type="arrowDown"
                               >
                                 <span
                                   className="euiButtonContent__icon"
+                                  color="inherit"
                                   data-euiicon-type="arrowDown"
                                   size="m"
                                 />
@@ -996,6 +998,7 @@ exports[`Inspector Data View component should render single table without select
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="right"
+                                          iconSize="s"
                                           iconType="arrowDown"
                                           textProps={
                                             Object {
@@ -1008,13 +1011,15 @@ exports[`Inspector Data View component should render single table without select
                                           >
                                             <EuiIcon
                                               className="euiButtonContent__icon"
-                                              size="m"
+                                              color="inherit"
+                                              size="s"
                                               type="arrowDown"
                                             >
                                               <span
                                                 className="euiButtonContent__icon"
+                                                color="inherit"
                                                 data-euiicon-type="arrowDown"
-                                                size="m"
+                                                size="s"
                                               />
                                             </EuiIcon>
                                             <span
@@ -1066,7 +1071,6 @@ exports[`Inspector Data View component should render single table without select
                       <tr>
                         <EuiTableHeaderCell
                           align="left"
-                          allowNeutralSort={true}
                           data-test-subj="tableHeaderCell_1_0"
                           isSorted={false}
                           key="_data_h_1_0"
@@ -1091,40 +1095,34 @@ exports[`Inspector Data View component should render single table without select
                               onClick={[Function]}
                               type="button"
                             >
-                              <span
+                              <CellContents
                                 className="euiTableCellContent"
+                                isSorted={false}
+                                showSortMsg={true}
                               >
-                                <EuiInnerText>
-                                  <EuiI18n
-                                    default="{innerText}; Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.titleTextWithSort"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "none",
-                                        "innerText": undefined,
-                                      }
-                                    }
-                                  >
-                                    <span
-                                      className="euiTableCellContent__text"
-                                    >
-                                      column1
-                                    </span>
-                                  </EuiI18n>
-                                </EuiInnerText>
-                              </span>
-                              <EuiScreenReaderOnly>
                                 <span
-                                  className="euiScreenReaderOnly"
+                                  className="euiTableCellContent"
                                 >
-                                  <EuiI18n
-                                    default="Click to sort in ascending order"
-                                    token="euiTableHeaderCell.clickForAscending"
-                                  >
-                                    Click to sort in ascending order
-                                  </EuiI18n>
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": undefined,
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                      >
+                                        column1
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
                                 </span>
-                              </EuiScreenReaderOnly>
+                              </CellContents>
                             </button>
                           </th>
                         </EuiTableHeaderCell>
@@ -1322,6 +1320,7 @@ exports[`Inspector Data View component should render single table without select
                                     <EuiButtonContent
                                       className="euiButtonEmpty__content"
                                       iconSide="right"
+                                      iconSize="s"
                                       iconType="arrowDown"
                                       textProps={
                                         Object {
@@ -1334,13 +1333,15 @@ exports[`Inspector Data View component should render single table without select
                                       >
                                         <EuiIcon
                                           className="euiButtonContent__icon"
-                                          size="m"
+                                          color="inherit"
+                                          size="s"
                                           type="arrowDown"
                                         >
                                           <span
                                             className="euiButtonContent__icon"
+                                            color="inherit"
                                             data-euiicon-type="arrowDown"
-                                            size="m"
+                                            size="s"
                                           />
                                         </EuiIcon>
                                         <span
@@ -1411,12 +1412,14 @@ exports[`Inspector Data View component should render single table without select
                                       <EuiIcon
                                         aria-hidden="true"
                                         className="euiButtonIcon__icon"
+                                        color="inherit"
                                         size="m"
                                         type="arrowLeft"
                                       >
                                         <span
                                           aria-hidden="true"
                                           className="euiButtonIcon__icon"
+                                          color="inherit"
                                           data-euiicon-type="arrowLeft"
                                           size="m"
                                         />
@@ -1487,6 +1490,7 @@ exports[`Inspector Data View component should render single table without select
                                               <EuiButtonContent
                                                 className="euiButtonEmpty__content"
                                                 iconSide="left"
+                                                iconSize="m"
                                                 textProps={
                                                   Object {
                                                     "className": "euiButtonEmpty__text",
@@ -1543,12 +1547,14 @@ exports[`Inspector Data View component should render single table without select
                                       <EuiIcon
                                         aria-hidden="true"
                                         className="euiButtonIcon__icon"
+                                        color="inherit"
                                         size="m"
                                         type="arrowRight"
                                       >
                                         <span
                                           aria-hidden="true"
                                           className="euiButtonIcon__icon"
+                                          color="inherit"
                                           data-euiicon-type="arrowRight"
                                           size="m"
                                         />
@@ -2038,6 +2044,7 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                 <EuiButtonContent
                                   className="euiButtonEmpty__content"
                                   iconSide="right"
+                                  iconSize="m"
                                   iconType="arrowDown"
                                   textProps={
                                     Object {
@@ -2050,11 +2057,13 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                   >
                                     <EuiIcon
                                       className="euiButtonContent__icon"
+                                      color="inherit"
                                       size="m"
                                       type="arrowDown"
                                     >
                                       <span
                                         className="euiButtonContent__icon"
+                                        color="inherit"
                                         data-euiicon-type="arrowDown"
                                         size="m"
                                       />
@@ -2247,11 +2256,13 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                             >
                               <EuiIcon
                                 className="euiButtonContent__icon"
+                                color="inherit"
                                 size="m"
                                 type="arrowDown"
                               >
                                 <span
                                   className="euiButtonContent__icon"
+                                  color="inherit"
                                   data-euiicon-type="arrowDown"
                                   size="m"
                                 />
@@ -2549,6 +2560,7 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                         <EuiButtonContent
                                           className="euiButtonEmpty__content"
                                           iconSide="right"
+                                          iconSize="s"
                                           iconType="arrowDown"
                                           textProps={
                                             Object {
@@ -2561,13 +2573,15 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                           >
                                             <EuiIcon
                                               className="euiButtonContent__icon"
-                                              size="m"
+                                              color="inherit"
+                                              size="s"
                                               type="arrowDown"
                                             >
                                               <span
                                                 className="euiButtonContent__icon"
+                                                color="inherit"
                                                 data-euiicon-type="arrowDown"
-                                                size="m"
+                                                size="s"
                                               />
                                             </EuiIcon>
                                             <span
@@ -2619,7 +2633,6 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                       <tr>
                         <EuiTableHeaderCell
                           align="left"
-                          allowNeutralSort={true}
                           data-test-subj="tableHeaderCell_1_0"
                           isSorted={false}
                           key="_data_h_1_0"
@@ -2644,41 +2657,35 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                               onClick={[Function]}
                               type="button"
                             >
-                              <span
+                              <CellContents
                                 className="euiTableCellContent"
+                                isSorted={false}
+                                showSortMsg={true}
                               >
-                                <EuiInnerText>
-                                  <EuiI18n
-                                    default="{innerText}; Sorted in {ariaSortValue} order"
-                                    token="euiTableHeaderCell.titleTextWithSort"
-                                    values={
-                                      Object {
-                                        "ariaSortValue": "none",
-                                        "innerText": "column1",
-                                      }
-                                    }
-                                  >
-                                    <span
-                                      className="euiTableCellContent__text"
-                                      title="column1"
-                                    >
-                                      column1
-                                    </span>
-                                  </EuiI18n>
-                                </EuiInnerText>
-                              </span>
-                              <EuiScreenReaderOnly>
                                 <span
-                                  className="euiScreenReaderOnly"
+                                  className="euiTableCellContent"
                                 >
-                                  <EuiI18n
-                                    default="Click to sort in ascending order"
-                                    token="euiTableHeaderCell.clickForAscending"
-                                  >
-                                    Click to sort in ascending order
-                                  </EuiI18n>
+                                  <EuiInnerText>
+                                    <EuiI18n
+                                      default="{innerText}; {description}"
+                                      token="euiTableHeaderCell.titleTextWithDesc"
+                                      values={
+                                        Object {
+                                          "description": undefined,
+                                          "innerText": "column1",
+                                        }
+                                      }
+                                    >
+                                      <span
+                                        className="euiTableCellContent__text"
+                                        title="column1"
+                                      >
+                                        column1
+                                      </span>
+                                    </EuiI18n>
+                                  </EuiInnerText>
                                 </span>
-                              </EuiScreenReaderOnly>
+                              </CellContents>
                             </button>
                           </th>
                         </EuiTableHeaderCell>
@@ -2876,6 +2883,7 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                     <EuiButtonContent
                                       className="euiButtonEmpty__content"
                                       iconSide="right"
+                                      iconSize="s"
                                       iconType="arrowDown"
                                       textProps={
                                         Object {
@@ -2888,13 +2896,15 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                       >
                                         <EuiIcon
                                           className="euiButtonContent__icon"
-                                          size="m"
+                                          color="inherit"
+                                          size="s"
                                           type="arrowDown"
                                         >
                                           <span
                                             className="euiButtonContent__icon"
+                                            color="inherit"
                                             data-euiicon-type="arrowDown"
-                                            size="m"
+                                            size="s"
                                           />
                                         </EuiIcon>
                                         <span
@@ -2965,12 +2975,14 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                       <EuiIcon
                                         aria-hidden="true"
                                         className="euiButtonIcon__icon"
+                                        color="inherit"
                                         size="m"
                                         type="arrowLeft"
                                       >
                                         <span
                                           aria-hidden="true"
                                           className="euiButtonIcon__icon"
+                                          color="inherit"
                                           data-euiicon-type="arrowLeft"
                                           size="m"
                                         />
@@ -3041,6 +3053,7 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                               <EuiButtonContent
                                                 className="euiButtonEmpty__content"
                                                 iconSide="left"
+                                                iconSize="m"
                                                 textProps={
                                                   Object {
                                                     "className": "euiButtonEmpty__text",
@@ -3097,12 +3110,14 @@ exports[`Inspector Data View component should support multiple datatables 1`] =
                                       <EuiIcon
                                         aria-hidden="true"
                                         className="euiButtonIcon__icon"
+                                        color="inherit"
                                         size="m"
                                         type="arrowRight"
                                       >
                                         <span
                                           aria-hidden="true"
                                           className="euiButtonIcon__icon"
+                                          color="inherit"
                                           data-euiicon-type="arrowRight"
                                           size="m"
                                         />
diff --git a/src/plugins/data/server/autocomplete/autocomplete_service.ts b/src/plugins/data/server/autocomplete/autocomplete_service.ts
index 5633a78ab53fa..ef718af2ab397 100644
--- a/src/plugins/data/server/autocomplete/autocomplete_service.ts
+++ b/src/plugins/data/server/autocomplete/autocomplete_service.ts
@@ -6,23 +6,21 @@
  * Side Public License, v 1.
  */
 
-import { TypeOf } from '@kbn/config-schema';
 import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
 import { registerRoutes } from './routes';
-import { ConfigSchema, configSchema } from '../../config';
+import { ConfigSchema } from '../../config';
 
 export class AutocompleteService implements Plugin<void> {
   private valueSuggestionsEnabled: boolean = true;
 
   constructor(private initializerContext: PluginInitializerContext<ConfigSchema>) {
-    initializerContext.config.create<TypeOf<typeof configSchema>>().subscribe((configUpdate) => {
+    initializerContext.config.create().subscribe((configUpdate) => {
       this.valueSuggestionsEnabled = configUpdate.autocomplete.valueSuggestions.enabled;
     });
   }
 
   public setup(core: CoreSetup) {
-    if (this.valueSuggestionsEnabled)
-      registerRoutes(core, this.initializerContext.config.legacy.globalConfig$);
+    if (this.valueSuggestionsEnabled) registerRoutes(core, this.initializerContext.config.create());
   }
 
   public start() {}
diff --git a/src/plugins/data/server/autocomplete/routes.ts b/src/plugins/data/server/autocomplete/routes.ts
index c453094ff6874..bdefd4df87b59 100644
--- a/src/plugins/data/server/autocomplete/routes.ts
+++ b/src/plugins/data/server/autocomplete/routes.ts
@@ -7,10 +7,11 @@
  */
 
 import { Observable } from 'rxjs';
-import { CoreSetup, SharedGlobalConfig } from 'kibana/server';
+import { CoreSetup } from 'kibana/server';
 import { registerValueSuggestionsRoute } from './value_suggestions_route';
+import { ConfigSchema } from '../../config';
 
-export function registerRoutes({ http }: CoreSetup, config$: Observable<SharedGlobalConfig>): void {
+export function registerRoutes({ http }: CoreSetup, config$: Observable<ConfigSchema>): void {
   const router = http.createRouter();
 
   registerValueSuggestionsRoute(router, config$);
diff --git a/src/plugins/data/server/autocomplete/value_suggestions_route.ts b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
index f0487b93b8ee5..8fa14f8cbbd42 100644
--- a/src/plugins/data/server/autocomplete/value_suggestions_route.ts
+++ b/src/plugins/data/server/autocomplete/value_suggestions_route.ts
@@ -8,7 +8,7 @@
 
 import { get, map } from 'lodash';
 import { schema } from '@kbn/config-schema';
-import { IRouter, SharedGlobalConfig } from 'kibana/server';
+import { IRouter } from 'kibana/server';
 
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
@@ -16,11 +16,9 @@ import type { estypes } from '@elastic/elasticsearch';
 import type { IFieldType } from '../index';
 import { findIndexPatternById, getFieldByName } from '../index_patterns';
 import { getRequestAbortedSignal } from '../lib';
+import { ConfigSchema } from '../../config';
 
-export function registerValueSuggestionsRoute(
-  router: IRouter,
-  config$: Observable<SharedGlobalConfig>
-) {
+export function registerValueSuggestionsRoute(router: IRouter, config$: Observable<ConfigSchema>) {
   router.post(
     {
       path: '/api/kibana/suggestions/values/{index}',
@@ -50,8 +48,8 @@ export function registerValueSuggestionsRoute(
       const signal = getRequestAbortedSignal(request.events.aborted$);
 
       const autocompleteSearchOptions = {
-        timeout: `${config.kibana.autocompleteTimeout.asMilliseconds()}ms`,
-        terminate_after: config.kibana.autocompleteTerminateAfter.asMilliseconds(),
+        timeout: `${config.autocomplete.valueSuggestions.timeout.asMilliseconds()}ms`,
+        terminate_after: config.autocomplete.valueSuggestions.terminateAfter.asMilliseconds(),
       };
 
       let field: IFieldType | undefined = fieldMeta;
@@ -80,7 +78,7 @@ async function getBody(
   { timeout, terminate_after }: Record<string, any>,
   field: IFieldType | string,
   query: string,
-  filters: estypes.QueryContainer[] = []
+  filters: estypes.QueryDslQueryContainer[] = []
 ) {
   const isFieldObject = (f: any): f is IFieldType => Boolean(f && f.name);
 
diff --git a/src/plugins/data/server/config_deprecations.test.ts b/src/plugins/data/server/config_deprecations.test.ts
new file mode 100644
index 0000000000000..28298c654f273
--- /dev/null
+++ b/src/plugins/data/server/config_deprecations.test.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 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 { autocompleteConfigDeprecationProvider } from './config_deprecations';
+
+const applyConfigDeprecations = (settings: Record<string, any> = {}) => {
+  const deprecations = autocompleteConfigDeprecationProvider(configDeprecationFactory);
+  const deprecationMessages: string[] = [];
+  const migrated = applyDeprecations(
+    settings,
+    deprecations.map((deprecation) => ({
+      deprecation,
+      path: '',
+    })),
+    () => ({ message }) => deprecationMessages.push(message)
+  );
+  return {
+    messages: deprecationMessages,
+    migrated: migrated.config,
+  };
+};
+
+describe('Config Deprecations', () => {
+  it('does not report deprecations for default configuration', () => {
+    const defaultConfig = { data: { autocomplete: { valueSuggestions: {} } } };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(defaultConfig));
+    expect(migrated).toEqual(defaultConfig);
+    expect(messages).toHaveLength(0);
+  });
+
+  it('renames kibana.autocompleteTerminateAfter to data.autocomplete.valueSuggestions.terminateAfter', () => {
+    const config = {
+      kibana: {
+        autocompleteTerminateAfter: 123,
+      },
+    };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+    expect(migrated.kibana.autocompleteTerminateAfter).not.toBeDefined();
+    expect(migrated.data.autocomplete.valueSuggestions.terminateAfter).toEqual(123);
+    expect(messages).toMatchInlineSnapshot(`
+      Array [
+        "\\"kibana.autocompleteTerminateAfter\\" is deprecated and has been replaced by \\"data.autocomplete.valueSuggestions.terminateAfter\\"",
+      ]
+    `);
+  });
+
+  it('renames kibana.autocompleteTimeout to data.autocomplete.valueSuggestions.timeout', () => {
+    const config = {
+      kibana: {
+        autocompleteTimeout: 123,
+      },
+    };
+    const { messages, migrated } = applyConfigDeprecations(cloneDeep(config));
+    expect(migrated.kibana.autocompleteTimeout).not.toBeDefined();
+    expect(migrated.data.autocomplete.valueSuggestions.timeout).toEqual(123);
+    expect(messages).toMatchInlineSnapshot(`
+      Array [
+        "\\"kibana.autocompleteTimeout\\" is deprecated and has been replaced by \\"data.autocomplete.valueSuggestions.timeout\\"",
+      ]
+    `);
+  });
+});
diff --git a/src/plugins/data/server/config_deprecations.ts b/src/plugins/data/server/config_deprecations.ts
new file mode 100644
index 0000000000000..47a88217611a3
--- /dev/null
+++ b/src/plugins/data/server/config_deprecations.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 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 'src/core/server';
+
+export const autocompleteConfigDeprecationProvider: ConfigDeprecationProvider = ({
+  renameFromRoot,
+}) => [
+  renameFromRoot(
+    'kibana.autocompleteTerminateAfter',
+    'data.autocomplete.valueSuggestions.terminateAfter'
+  ),
+  renameFromRoot('kibana.autocompleteTimeout', 'data.autocomplete.valueSuggestions.timeout'),
+];
diff --git a/src/plugins/data/server/index.ts b/src/plugins/data/server/index.ts
index e782fc0d4ffea..0764f4f441e42 100644
--- a/src/plugins/data/server/index.ts
+++ b/src/plugins/data/server/index.ts
@@ -181,6 +181,7 @@ import {
   tabifyGetColumns,
   calcAutoIntervalLessThan,
 } from '../common';
+import { autocompleteConfigDeprecationProvider } from './config_deprecations';
 
 export {
   // aggs
@@ -301,6 +302,7 @@ export {
 };
 
 export const config: PluginConfigDescriptor<ConfigSchema> = {
+  deprecations: autocompleteConfigDeprecationProvider,
   exposeToBrowser: {
     autocomplete: true,
     search: true,
diff --git a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
index c4c1ffa3cf9f9..6db9254b81528 100644
--- a/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
+++ b/src/plugins/data/server/index_patterns/fetcher/lib/field_capabilities/field_caps_response.ts
@@ -69,7 +69,7 @@ import { FieldDescriptor } from '../../../fetcher';
  *  @return {Array<FieldDescriptor>}
  */
 export function readFieldCapsResponse(
-  fieldCapsResponse: estypes.FieldCapabilitiesResponse
+  fieldCapsResponse: estypes.FieldCapsResponse
 ): FieldDescriptor[] {
   const capsByNameThenType = fieldCapsResponse.fields;
 
diff --git a/src/plugins/data/server/index_patterns/routes.ts b/src/plugins/data/server/index_patterns/routes.ts
index 9bff590b54f1c..d2d8cb82cf646 100644
--- a/src/plugins/data/server/index_patterns/routes.ts
+++ b/src/plugins/data/server/index_patterns/routes.ts
@@ -21,6 +21,11 @@ import { registerDeleteScriptedFieldRoute } from './routes/scripted_fields/delet
 import { registerUpdateScriptedFieldRoute } from './routes/scripted_fields/update_scripted_field';
 import type { DataPluginStart, DataPluginStartDependencies } from '../plugin';
 import { registerManageDefaultIndexPatternRoutes } from './routes/default_index_pattern';
+import { registerCreateRuntimeFieldRoute } from './routes/runtime_fields/create_runtime_field';
+import { registerGetRuntimeFieldRoute } from './routes/runtime_fields/get_runtime_field';
+import { registerDeleteRuntimeFieldRoute } from './routes/runtime_fields/delete_runtime_field';
+import { registerPutRuntimeFieldRoute } from './routes/runtime_fields/put_runtime_field';
+import { registerUpdateRuntimeFieldRoute } from './routes/runtime_fields/update_runtime_field';
 
 export function registerRoutes(
   http: HttpServiceSetup,
@@ -55,6 +60,13 @@ export function registerRoutes(
   registerDeleteScriptedFieldRoute(router, getStartServices);
   registerUpdateScriptedFieldRoute(router, getStartServices);
 
+  // Runtime Fields API
+  registerCreateRuntimeFieldRoute(router, getStartServices);
+  registerGetRuntimeFieldRoute(router, getStartServices);
+  registerDeleteRuntimeFieldRoute(router, getStartServices);
+  registerPutRuntimeFieldRoute(router, getStartServices);
+  registerUpdateRuntimeFieldRoute(router, getStartServices);
+
   router.get(
     {
       path: '/api/index_patterns/_fields_for_wildcard',
diff --git a/src/plugins/data/server/index_patterns/routes/create_index_pattern.ts b/src/plugins/data/server/index_patterns/routes/create_index_pattern.ts
index 0be300d184459..7049903f84e8c 100644
--- a/src/plugins/data/server/index_patterns/routes/create_index_pattern.ts
+++ b/src/plugins/data/server/index_patterns/routes/create_index_pattern.ts
@@ -9,15 +9,18 @@
 import { schema } from '@kbn/config-schema';
 import { IndexPatternSpec } from 'src/plugins/data/common';
 import { handleErrors } from './util/handle_errors';
-import { fieldSpecSchema, serializedFieldFormatSchema } from './util/schemas';
+import {
+  fieldSpecSchema,
+  runtimeFieldSpecSchema,
+  serializedFieldFormatSchema,
+} from './util/schemas';
 import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 
 const indexPatternSpecSchema = schema.object({
   title: schema.string(),
-
-  id: schema.maybe(schema.string()),
   version: schema.maybe(schema.string()),
+  id: schema.maybe(schema.string()),
   type: schema.maybe(schema.string()),
   timeFieldName: schema.maybe(schema.string()),
   sourceFilters: schema.maybe(
@@ -40,6 +43,7 @@ const indexPatternSpecSchema = schema.object({
     )
   ),
   allowNoIndex: schema.maybe(schema.boolean()),
+  runtimeFieldMap: schema.maybe(schema.recordOf(schema.string(), runtimeFieldSpecSchema)),
 });
 
 export const registerCreateIndexPatternRoute = (
@@ -67,6 +71,7 @@ export const registerCreateIndexPatternRoute = (
           elasticsearchClient
         );
         const body = req.body;
+
         const indexPattern = await indexPatternsService.createAndSave(
           body.index_pattern as IndexPatternSpec,
           body.override,
diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/create_runtime_field.ts b/src/plugins/data/server/index_patterns/routes/runtime_fields/create_runtime_field.ts
new file mode 100644
index 0000000000000..faf6d87b6d10b
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/routes/runtime_fields/create_runtime_field.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.
+ */
+
+import { schema } from '@kbn/config-schema';
+import { handleErrors } from '../util/handle_errors';
+import { runtimeFieldSpecSchema } from '../util/schemas';
+import { IRouter, StartServicesAccessor } from '../../../../../../core/server';
+import type { DataPluginStart, DataPluginStartDependencies } from '../../../plugin';
+
+export const registerCreateRuntimeFieldRoute = (
+  router: IRouter,
+  getStartServices: StartServicesAccessor<DataPluginStartDependencies, DataPluginStart>
+) => {
+  router.post(
+    {
+      path: '/api/index_patterns/index_pattern/{id}/runtime_field',
+      validate: {
+        params: schema.object({
+          id: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+        }),
+        body: schema.object({
+          name: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+          runtimeField: runtimeFieldSpecSchema,
+        }),
+      },
+    },
+
+    handleErrors(async (ctx, req, res) => {
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+      const [, , { indexPatterns }] = await getStartServices();
+      const indexPatternsService = await indexPatterns.indexPatternsServiceFactory(
+        savedObjectsClient,
+        elasticsearchClient
+      );
+      const id = req.params.id;
+      const { name, runtimeField } = req.body;
+
+      const indexPattern = await indexPatternsService.get(id);
+
+      if (indexPattern.fields.getByName(name)) {
+        throw new Error(`Field [name = ${name}] already exists.`);
+      }
+
+      indexPattern.addRuntimeField(name, runtimeField);
+
+      const addedField = indexPattern.fields.getByName(name);
+      if (!addedField) throw new Error(`Could not create a field [name = ${name}].`);
+
+      await indexPatternsService.updateSavedObject(indexPattern);
+
+      const savedField = indexPattern.fields.getByName(name);
+      if (!savedField) throw new Error(`Could not create a field [name = ${name}].`);
+
+      return res.ok({
+        body: {
+          field: savedField.toSpec(),
+          index_pattern: indexPattern.toSpec(),
+        },
+      });
+    })
+  );
+};
diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/delete_runtime_field.ts b/src/plugins/data/server/index_patterns/routes/runtime_fields/delete_runtime_field.ts
new file mode 100644
index 0000000000000..58b8529d7cf5a
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/routes/runtime_fields/delete_runtime_field.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 { schema } from '@kbn/config-schema';
+import { ErrorIndexPatternFieldNotFound } from '../../error';
+import { handleErrors } from '../util/handle_errors';
+import { IRouter, StartServicesAccessor } from '../../../../../../core/server';
+import type { DataPluginStart, DataPluginStartDependencies } from '../../../plugin';
+
+export const registerDeleteRuntimeFieldRoute = (
+  router: IRouter,
+  getStartServices: StartServicesAccessor<DataPluginStartDependencies, DataPluginStart>
+) => {
+  router.delete(
+    {
+      path: '/api/index_patterns/index_pattern/{id}/runtime_field/{name}',
+      validate: {
+        params: schema.object({
+          id: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+          name: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+        }),
+      },
+    },
+    handleErrors(async (ctx, req, res) => {
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+      const [, , { indexPatterns }] = await getStartServices();
+      const indexPatternsService = await indexPatterns.indexPatternsServiceFactory(
+        savedObjectsClient,
+        elasticsearchClient
+      );
+      const id = req.params.id;
+      const name = req.params.name;
+
+      const indexPattern = await indexPatternsService.get(id);
+      const field = indexPattern.fields.getByName(name);
+
+      if (!field) {
+        throw new ErrorIndexPatternFieldNotFound(id, name);
+      }
+
+      if (!field.runtimeField) {
+        throw new Error('Only runtime fields can be deleted.');
+      }
+
+      indexPattern.removeRuntimeField(name);
+
+      await indexPatternsService.updateSavedObject(indexPattern);
+
+      return res.ok();
+    })
+  );
+};
diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/get_runtime_field.ts b/src/plugins/data/server/index_patterns/routes/runtime_fields/get_runtime_field.ts
new file mode 100644
index 0000000000000..6bc2bf396c0b4
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/routes/runtime_fields/get_runtime_field.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 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 { schema } from '@kbn/config-schema';
+import { ErrorIndexPatternFieldNotFound } from '../../error';
+import { handleErrors } from '../util/handle_errors';
+import { IRouter, StartServicesAccessor } from '../../../../../../core/server';
+import type { DataPluginStart, DataPluginStartDependencies } from '../../../plugin';
+
+export const registerGetRuntimeFieldRoute = (
+  router: IRouter,
+  getStartServices: StartServicesAccessor<DataPluginStartDependencies, DataPluginStart>
+) => {
+  router.get(
+    {
+      path: '/api/index_patterns/index_pattern/{id}/runtime_field/{name}',
+      validate: {
+        params: schema.object({
+          id: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+          name: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+        }),
+      },
+    },
+
+    handleErrors(async (ctx, req, res) => {
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+      const [, , { indexPatterns }] = await getStartServices();
+      const indexPatternsService = await indexPatterns.indexPatternsServiceFactory(
+        savedObjectsClient,
+        elasticsearchClient
+      );
+      const id = req.params.id;
+      const name = req.params.name;
+
+      const indexPattern = await indexPatternsService.get(id);
+
+      const field = indexPattern.fields.getByName(name);
+
+      if (!field) {
+        throw new ErrorIndexPatternFieldNotFound(id, name);
+      }
+
+      if (!field.runtimeField) {
+        throw new Error('Only runtime fields can be retrieved.');
+      }
+
+      return res.ok({
+        body: {
+          field: field.toSpec(),
+          runtimeField: indexPattern.getRuntimeField(name),
+        },
+      });
+    })
+  );
+};
diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/put_runtime_field.ts b/src/plugins/data/server/index_patterns/routes/runtime_fields/put_runtime_field.ts
new file mode 100644
index 0000000000000..a5e92fa5a36ec
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/routes/runtime_fields/put_runtime_field.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 { schema } from '@kbn/config-schema';
+import { handleErrors } from '../util/handle_errors';
+import { runtimeFieldSpecSchema } from '../util/schemas';
+import { IRouter, StartServicesAccessor } from '../../../../../../core/server';
+import type { DataPluginStart, DataPluginStartDependencies } from '../../../plugin';
+
+export const registerPutRuntimeFieldRoute = (
+  router: IRouter,
+  getStartServices: StartServicesAccessor<DataPluginStartDependencies, DataPluginStart>
+) => {
+  router.put(
+    {
+      path: '/api/index_patterns/index_pattern/{id}/runtime_field',
+      validate: {
+        params: schema.object({
+          id: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+        }),
+        body: schema.object({
+          name: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+          runtimeField: runtimeFieldSpecSchema,
+        }),
+      },
+    },
+    handleErrors(async (ctx, req, res) => {
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+      const [, , { indexPatterns }] = await getStartServices();
+      const indexPatternsService = await indexPatterns.indexPatternsServiceFactory(
+        savedObjectsClient,
+        elasticsearchClient
+      );
+      const id = req.params.id;
+      const { name, runtimeField } = req.body;
+
+      const indexPattern = await indexPatternsService.get(id);
+
+      const oldFieldObject = indexPattern.fields.getByName(name);
+
+      if (oldFieldObject && !oldFieldObject.runtimeField) {
+        throw new Error('Only runtime fields can be updated');
+      }
+
+      if (oldFieldObject) {
+        indexPattern.removeRuntimeField(name);
+      }
+
+      indexPattern.addRuntimeField(name, runtimeField);
+
+      await indexPatternsService.updateSavedObject(indexPattern);
+
+      const fieldObject = indexPattern.fields.getByName(name);
+      if (!fieldObject) throw new Error(`Could not create a field [name = ${name}].`);
+
+      return res.ok({
+        body: {
+          field: fieldObject.toSpec(),
+          index_pattern: indexPattern.toSpec(),
+        },
+      });
+    })
+  );
+};
diff --git a/src/plugins/data/server/index_patterns/routes/runtime_fields/update_runtime_field.ts b/src/plugins/data/server/index_patterns/routes/runtime_fields/update_runtime_field.ts
new file mode 100644
index 0000000000000..3f3aae46c4388
--- /dev/null
+++ b/src/plugins/data/server/index_patterns/routes/runtime_fields/update_runtime_field.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 { schema } from '@kbn/config-schema';
+import { RuntimeField } from 'src/plugins/data/common';
+import { ErrorIndexPatternFieldNotFound } from '../../error';
+import { handleErrors } from '../util/handle_errors';
+import { runtimeFieldSpec, runtimeFieldSpecTypeSchema } from '../util/schemas';
+import { IRouter, StartServicesAccessor } from '../../../../../../core/server';
+import type { DataPluginStart, DataPluginStartDependencies } from '../../../plugin';
+
+export const registerUpdateRuntimeFieldRoute = (
+  router: IRouter,
+  getStartServices: StartServicesAccessor<DataPluginStartDependencies, DataPluginStart>
+) => {
+  router.post(
+    {
+      path: '/api/index_patterns/index_pattern/{id}/runtime_field/{name}',
+      validate: {
+        params: schema.object({
+          id: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+          name: schema.string({
+            minLength: 1,
+            maxLength: 1_000,
+          }),
+        }),
+        body: schema.object({
+          name: schema.never(),
+          runtimeField: schema.object({
+            ...runtimeFieldSpec,
+            // We need to overwrite the below fields on top of `runtimeFieldSpec`,
+            // because some fields would be optional
+            type: schema.maybe(runtimeFieldSpecTypeSchema),
+          }),
+        }),
+      },
+    },
+    handleErrors(async (ctx, req, res) => {
+      const savedObjectsClient = ctx.core.savedObjects.client;
+      const elasticsearchClient = ctx.core.elasticsearch.client.asCurrentUser;
+      const [, , { indexPatterns }] = await getStartServices();
+      const indexPatternsService = await indexPatterns.indexPatternsServiceFactory(
+        savedObjectsClient,
+        elasticsearchClient
+      );
+      const id = req.params.id;
+      const name = req.params.name;
+      const runtimeField = req.body.runtimeField as Partial<RuntimeField>;
+
+      const indexPattern = await indexPatternsService.get(id);
+      const existingRuntimeField = indexPattern.getRuntimeField(name);
+
+      if (!existingRuntimeField) {
+        throw new ErrorIndexPatternFieldNotFound(id, name);
+      }
+
+      indexPattern.removeRuntimeField(name);
+      indexPattern.addRuntimeField(name, {
+        ...existingRuntimeField,
+        ...runtimeField,
+      });
+
+      await indexPatternsService.updateSavedObject(indexPattern);
+
+      const fieldObject = indexPattern.fields.getByName(name);
+      if (!fieldObject) throw new Error(`Could not create a field [name = ${name}].`);
+
+      return res.ok({
+        body: {
+          field: fieldObject.toSpec(),
+          index_pattern: indexPattern.toSpec(),
+        },
+      });
+    })
+  );
+};
diff --git a/src/plugins/data/server/index_patterns/routes/update_index_pattern.ts b/src/plugins/data/server/index_patterns/routes/update_index_pattern.ts
index c1509b9b848be..1c88550c154c5 100644
--- a/src/plugins/data/server/index_patterns/routes/update_index_pattern.ts
+++ b/src/plugins/data/server/index_patterns/routes/update_index_pattern.ts
@@ -8,7 +8,11 @@
 
 import { schema } from '@kbn/config-schema';
 import { handleErrors } from './util/handle_errors';
-import { fieldSpecSchema, serializedFieldFormatSchema } from './util/schemas';
+import {
+  fieldSpecSchema,
+  runtimeFieldSpecSchema,
+  serializedFieldFormatSchema,
+} from './util/schemas';
 import { IRouter, StartServicesAccessor } from '../../../../../core/server';
 import type { DataPluginStart, DataPluginStartDependencies } from '../../plugin';
 
@@ -28,6 +32,7 @@ const indexPatternUpdateSchema = schema.object({
   fieldFormats: schema.maybe(schema.recordOf(schema.string(), serializedFieldFormatSchema)),
   fields: schema.maybe(schema.recordOf(schema.string(), fieldSpecSchema)),
   allowNoIndex: schema.maybe(schema.boolean()),
+  runtimeFieldMap: schema.maybe(schema.recordOf(schema.string(), runtimeFieldSpecSchema)),
 });
 
 export const registerUpdateIndexPatternRoute = (
@@ -78,6 +83,7 @@ export const registerUpdateIndexPatternRoute = (
             type,
             typeMeta,
             fields,
+            runtimeFieldMap,
           },
         } = req.body;
 
@@ -131,6 +137,11 @@ export const registerUpdateIndexPatternRoute = (
           );
         }
 
+        if (runtimeFieldMap !== undefined) {
+          changeCount++;
+          indexPattern.replaceAllRuntimeFields(runtimeFieldMap);
+        }
+
         if (changeCount < 1) {
           throw new Error('Index pattern change set is empty.');
         }
diff --git a/src/plugins/data/server/index_patterns/routes/util/schemas.ts b/src/plugins/data/server/index_patterns/routes/util/schemas.ts
index d916423c4fc69..79ee1ffa1ab97 100644
--- a/src/plugins/data/server/index_patterns/routes/util/schemas.ts
+++ b/src/plugins/data/server/index_patterns/routes/util/schemas.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { schema } from '@kbn/config-schema';
+import { schema, Type } from '@kbn/config-schema';
+import { RUNTIME_FIELD_TYPES, RuntimeType } from '../../../../common';
 
 export const serializedFieldFormatSchema = schema.object({
   id: schema.maybe(schema.string()),
@@ -52,4 +53,24 @@ export const fieldSpecSchemaFields = {
   shortDotsEnable: schema.maybe(schema.boolean()),
 };
 
-export const fieldSpecSchema = schema.object(fieldSpecSchemaFields);
+export const fieldSpecSchema = schema.object(fieldSpecSchemaFields, {
+  // Allow and ignore unknowns to make fields transient.
+  // Because `fields` have a bunch of calculated fields
+  // this allows to retrieve an index pattern and then to re-create by using the retrieved payload
+  unknowns: 'ignore',
+});
+
+export const runtimeFieldSpecTypeSchema = schema.oneOf(
+  RUNTIME_FIELD_TYPES.map((runtimeFieldType) => schema.literal(runtimeFieldType)) as [
+    Type<RuntimeType>
+  ]
+);
+export const runtimeFieldSpec = {
+  type: runtimeFieldSpecTypeSchema,
+  script: schema.maybe(
+    schema.object({
+      source: schema.string(),
+    })
+  ),
+};
+export const runtimeFieldSpecSchema = schema.object(runtimeFieldSpec);
diff --git a/src/plugins/data/server/search/routes/call_msearch.ts b/src/plugins/data/server/search/routes/call_msearch.ts
index 0c238adf831bd..4a7db9517c688 100644
--- a/src/plugins/data/server/search/routes/call_msearch.ts
+++ b/src/plugins/data/server/search/routes/call_msearch.ts
@@ -8,7 +8,8 @@
 
 import { Observable } from 'rxjs';
 import { first } from 'rxjs/operators';
-import { IUiSettingsClient, IScopedClusterClient, SharedGlobalConfig } from 'src/core/server';
+import type { IUiSettingsClient, IScopedClusterClient, SharedGlobalConfig } from 'src/core/server';
+import type { estypes } from '@elastic/elasticsearch';
 
 import type { MsearchRequestBody, MsearchResponse } from '../../../common/search/search_source';
 import { getKbnServerError } from '../../../../kibana_utils/server';
@@ -78,7 +79,9 @@ export function getCallMsearch(dependencies: CallMsearchDependencies) {
         body: {
           ...response,
           body: {
-            responses: response.body.responses?.map((r) => shimHitsTotal(r)),
+            responses: response.body.responses?.map((r) =>
+              shimHitsTotal(r as estypes.SearchResponse<unknown>)
+            ),
           },
         },
       };
diff --git a/src/plugins/data/server/search/routes/msearch.test.ts b/src/plugins/data/server/search/routes/msearch.test.ts
index 6ae8612cceb1e..303f83582f737 100644
--- a/src/plugins/data/server/search/routes/msearch.test.ts
+++ b/src/plugins/data/server/search/routes/msearch.test.ts
@@ -116,7 +116,7 @@ describe('msearch route', () => {
 
     const error: any = mockResponse.customError.mock.calls[0][0];
     expect(error.statusCode).toBe(400);
-    expect(error.body.message).toBe('json_e_o_f_exception');
+    expect(error.body.message).toMatch(/json_e_o_f_exception/);
     expect(error.body.attributes).toBe(jsonEofException.error);
   });
 
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 0e3acedfe12f6..91de0fca3674c 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
@@ -54,7 +54,8 @@ export const eqlSearchStrategyProvider = (
             };
         const promise = id
           ? client.get({ ...params, id }, request.options)
-          : client.search(params as EqlSearchStrategyRequest['params'], request.options);
+          : // @ts-expect-error EqlRequestParams | undefined is not assignable to EqlRequestParams
+            client.search(params as EqlSearchStrategyRequest['params'], request.options);
         const response = await shimAbortSignal(promise, options.abortSignal);
         return toEqlKibanaSearchResponse(response as ApiResponse<EqlSearchResponse>);
       };
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 216318339622f..56b26a7ebe02c 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
@@ -293,7 +293,7 @@ describe('ES search strategy', () => {
 
       expect(mockGetCaller).toBeCalled();
       const request = mockGetCaller.mock.calls[0][0];
-      expect(request).toEqual({ id, body: { keep_alive: keepAlive } });
+      expect(request).toEqual({ id, keep_alive: keepAlive });
     });
 
     it('throws normalized error on ElasticsearchClientError', async () => {
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 ab6162f756ea8..d6af00ada80fa 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
@@ -177,7 +177,7 @@ export const enhancedEsSearchStrategyProvider = (
         const client = useInternalUser ? esClient.asInternalUser : esClient.asCurrentUser;
         await client.asyncSearch.get({
           id,
-          body: { keep_alive: keepAlive },
+          keep_alive: keepAlive,
         });
       } catch (e) {
         throw getKbnServerError(e);
diff --git a/src/plugins/data/server/server.api.md b/src/plugins/data/server/server.api.md
index 4abf430252164..783bd8d2fcd0e 100644
--- a/src/plugins/data/server/server.api.md
+++ b/src/plugins/data/server/server.api.md
@@ -32,6 +32,7 @@ import { ExpressionsServerSetup } from 'src/plugins/expressions/server';
 import { ExpressionValueBoxed } from 'src/plugins/expressions/common';
 import { FormatFactory as FormatFactory_2 } from 'src/plugins/data/common/field_formats/utils';
 import { IAggConfigs as IAggConfigs_2 } from 'src/plugins/data/public';
+import { IEsSearchResponse as IEsSearchResponse_2 } from 'src/plugins/data/public';
 import { IScopedClusterClient } from 'src/core/server';
 import { ISearchOptions as ISearchOptions_2 } from 'src/plugins/data/public';
 import { ISearchSource } from 'src/plugins/data/public';
@@ -52,6 +53,7 @@ import { Plugin as Plugin_2 } from 'src/core/server';
 import { Plugin as Plugin_3 } from 'kibana/server';
 import { PluginInitializerContext as PluginInitializerContext_2 } from 'src/core/server';
 import { PublicMethodsOf } from '@kbn/utility-types';
+import { RangeFilter } from 'src/plugins/data/public';
 import { RecursiveReadonly } from '@kbn/utility-types';
 import { RequestAdapter } from 'src/plugins/inspector/common';
 import { RequestHandlerContext } from 'src/core/server';
@@ -709,7 +711,7 @@ export interface IFieldType {
     // (undocumented)
     format?: any;
     // (undocumented)
-    lang?: string;
+    lang?: estypes.ScriptLanguage;
     // (undocumented)
     name: string;
     // (undocumented)
@@ -749,6 +751,7 @@ export class IndexPattern implements IIndexPattern {
     // Warning: (ae-forgotten-export) The symbol "IndexPatternDeps" needs to be exported by the entry point index.d.ts
     constructor({ spec, fieldFormats, shortDotsEnable, metaFields, }: IndexPatternDeps);
     addRuntimeField(name: string, runtimeField: RuntimeField): void;
+    // @deprecated
     addScriptedField(name: string, script: string, fieldType?: string): Promise<void>;
     readonly allowNoIndex: boolean;
     // (undocumented)
@@ -779,19 +782,7 @@ export class IndexPattern implements IIndexPattern {
         delay?: string | undefined;
         time_zone?: string | undefined;
     }>> | undefined;
-    getAsSavedObjectBody(): {
-        fieldAttrs: string | undefined;
-        title: string;
-        timeFieldName: string | undefined;
-        intervalName: string | undefined;
-        sourceFilters: string | undefined;
-        fields: string | undefined;
-        fieldFormatMap: string | undefined;
-        type: string | undefined;
-        typeMeta: string | undefined;
-        allowNoIndex: true | undefined;
-        runtimeFieldMap: string | undefined;
-    };
+    getAsSavedObjectBody(): IndexPatternAttributes;
     // (undocumented)
     getComputedFields(): {
         storedFields: string[];
@@ -812,7 +803,7 @@ export class IndexPattern implements IIndexPattern {
     getFormatterForFieldNoDefault(fieldname: string): FieldFormat | undefined;
     // Warning: (ae-forgotten-export) The symbol "IndexPatternField" needs to be exported by the entry point index.d.ts
     //
-    // (undocumented)
+    // @deprecated (undocumented)
     getNonScriptedFields(): IndexPatternField[];
     getOriginalSavedObjectBody: () => {
         fieldAttrs?: string | undefined;
@@ -825,13 +816,15 @@ export class IndexPattern implements IIndexPattern {
         typeMeta?: string | undefined;
         type?: string | undefined;
     };
-    // (undocumented)
+    getRuntimeField(name: string): RuntimeField | null;
+    // @deprecated (undocumented)
     getScriptedFields(): IndexPatternField[];
     getSourceFiltering(): {
         excludes: any[];
     };
     // (undocumented)
     getTimeField(): IndexPatternField | undefined;
+    hasRuntimeField(name: string): boolean;
     // (undocumented)
     id?: string;
     // @deprecated (undocumented)
@@ -843,7 +836,9 @@ export class IndexPattern implements IIndexPattern {
     // (undocumented)
     metaFields: string[];
     removeRuntimeField(name: string): void;
+    // @deprecated
     removeScriptedField(fieldName: string): void;
+    replaceAllRuntimeFields(newFields: Record<string, RuntimeField>): void;
     resetOriginalSavedObjectBody: () => void;
     // (undocumented)
     protected setFieldAttrs<K extends keyof FieldAttrSet>(fieldName: string, attrName: K, value: FieldAttrSet[K]): void;
@@ -1426,22 +1421,22 @@ export const shimAbortSignal: <T>(promise: TransportRequestPromise<T>, signal?:
 export function shimHitsTotal(response: estypes.SearchResponse<unknown>, { legacyHitsTotal }?: ISearchOptions): {
     hits: {
         total: any;
-        hits: estypes.Hit<unknown>[];
+        hits: estypes.SearchHit<unknown>[];
         max_score?: number | undefined;
     };
     took: number;
     timed_out: boolean;
     _shards: estypes.ShardStatistics;
-    aggregations?: Record<string, estypes.Aggregate> | undefined;
+    aggregations?: Record<string, estypes.AggregationsAggregate> | undefined;
     _clusters?: estypes.ClusterStatistics | undefined;
     documents?: unknown[] | undefined;
     fields?: Record<string, any> | undefined;
     max_score?: number | undefined;
     num_reduce_phases?: number | undefined;
-    profile?: estypes.Profile | undefined;
+    profile?: estypes.SearchProfile | undefined;
     pit_id?: string | undefined;
     _scroll_id?: string | undefined;
-    suggest?: Record<string, estypes.Suggest<unknown>[]> | undefined;
+    suggest?: Record<string, estypes.SearchSuggest<unknown>[]> | undefined;
     terminated_early?: boolean | undefined;
 };
 
@@ -1541,18 +1536,18 @@ export function usageProvider(core: CoreSetup_2): SearchUsage;
 // src/plugins/data/server/index.ts:101:26 - (ae-forgotten-export) The symbol "HistogramFormat" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:128:27 - (ae-forgotten-export) The symbol "isFilterable" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/index.ts:128:27 - (ae-forgotten-export) The symbol "isNestedField" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:243:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:245:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:246:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:255:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:256:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:257:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:261:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:262:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:266:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:269:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
-// src/plugins/data/server/index.ts:270:1 - (ae-forgotten-export) The symbol "calcAutoIntervalLessThan" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:244:20 - (ae-forgotten-export) The symbol "tabifyAggResponse" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:244:20 - (ae-forgotten-export) The symbol "tabifyGetColumns" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:246:1 - (ae-forgotten-export) The symbol "CidrMask" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:247:1 - (ae-forgotten-export) The symbol "dateHistogramInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:256:1 - (ae-forgotten-export) The symbol "InvalidEsCalendarIntervalError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:257:1 - (ae-forgotten-export) The symbol "InvalidEsIntervalFormatError" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:258:1 - (ae-forgotten-export) The symbol "IpAddress" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:262:1 - (ae-forgotten-export) The symbol "isValidEsInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:263:1 - (ae-forgotten-export) The symbol "isValidInterval" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:267:1 - (ae-forgotten-export) The symbol "propFilter" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:270:1 - (ae-forgotten-export) The symbol "toAbsoluteDates" needs to be exported by the entry point index.d.ts
+// src/plugins/data/server/index.ts:271:1 - (ae-forgotten-export) The symbol "calcAutoIntervalLessThan" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/plugin.ts:81:74 - (ae-forgotten-export) The symbol "DataEnhancements" needs to be exported by the entry point index.d.ts
 // src/plugins/data/server/search/types.ts:115:5 - (ae-forgotten-export) The symbol "ISearchStartSearchSource" needs to be exported by the entry point index.d.ts
 
diff --git a/src/plugins/discover/public/__mocks__/index_pattern.ts b/src/plugins/discover/public/__mocks__/index_pattern.ts
index 4fbeac80b0972..67aac96889424 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern.ts
@@ -65,6 +65,10 @@ fields.getByName = (name: string) => {
   return fields.find((field) => field.name === name);
 };
 
+fields.getAll = () => {
+  return fields;
+};
+
 const indexPattern = ({
   id: 'the-index-pattern-id',
   title: 'the-index-pattern-title',
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 ad84518af9de3..f1c3c537dd5e1 100644
--- a/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
+++ b/src/plugins/discover/public/__mocks__/index_pattern_with_timefield.ts
@@ -56,6 +56,9 @@ const fields = [
 fields.getByName = (name: string) => {
   return fields.find((field) => field.name === name);
 };
+fields.getAll = () => {
+  return fields;
+};
 
 const indexPattern = ({
   id: 'index-pattern-with-timefield-id',
@@ -72,5 +75,8 @@ const indexPattern = ({
 
 indexPattern.flattenHit = indexPatterns.flattenHitWrapper(indexPattern, indexPattern.metaFields);
 indexPattern.isTimeBased = () => !!indexPattern.timeFieldName;
+indexPattern.formatField = (hit: Record<string, unknown>, fieldName: string) => {
+  return fieldName === '_source' ? hit._source : indexPattern.flattenHit(hit)[fieldName];
+};
 
 export const indexPatternWithTimefieldMock = indexPattern;
diff --git a/src/plugins/discover/public/__mocks__/saved_search.ts b/src/plugins/discover/public/__mocks__/saved_search.ts
index 8f07391571987..6f48c56b0810e 100644
--- a/src/plugins/discover/public/__mocks__/saved_search.ts
+++ b/src/plugins/discover/public/__mocks__/saved_search.ts
@@ -7,6 +7,8 @@
  */
 
 import { SavedSearch } from '../saved_searches';
+import { createSearchSourceMock } from '../../../data/public/mocks';
+import { indexPatternMock } from './index_pattern';
 
 export const savedSearchMock = ({
   id: 'the-saved-search-id',
@@ -27,4 +29,5 @@ export const savedSearchMock = ({
   ],
   migrationVersion: { search: '7.5.0' },
   error: undefined,
+  searchSource: createSearchSourceMock({ index: indexPatternMock }),
 } as unknown) as SavedSearch;
diff --git a/src/plugins/discover/public/__mocks__/search_session.ts b/src/plugins/discover/public/__mocks__/search_session.ts
new file mode 100644
index 0000000000000..a9037217a303a
--- /dev/null
+++ b/src/plugins/discover/public/__mocks__/search_session.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 { createMemoryHistory } from 'history';
+import { dataPluginMock } from '../../../data/public/mocks';
+import { DataPublicPluginStart } from '../../../data/public';
+import { DiscoverSearchSessionManager } from '../application/apps/main/services/discover_search_session';
+
+export function createSearchSessionMock() {
+  const history = createMemoryHistory();
+  const session = dataPluginMock.createStartContract().search.session as jest.Mocked<
+    DataPublicPluginStart['search']['session']
+  >;
+  const searchSessionManager = new DiscoverSearchSessionManager({
+    history,
+    session,
+  });
+  return {
+    history,
+    session,
+    searchSessionManager,
+  };
+}
diff --git a/src/plugins/discover/public/__mocks__/services.ts b/src/plugins/discover/public/__mocks__/services.ts
new file mode 100644
index 0000000000000..8a047625303d2
--- /dev/null
+++ b/src/plugins/discover/public/__mocks__/services.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { DiscoverServices } from '../build_services';
+import { dataPluginMock } from '../../../data/public/mocks';
+import { chromeServiceMock, coreMock, docLinksServiceMock } from '../../../../core/public/mocks';
+import { DEFAULT_COLUMNS_SETTING } from '../../common';
+import { savedSearchMock } from './saved_search';
+import { UI_SETTINGS } from '../../../data/common';
+import { TopNavMenu } from '../../../navigation/public';
+const dataPlugin = dataPluginMock.createStartContract();
+
+export const discoverServiceMock = ({
+  core: coreMock.createStart(),
+  chrome: chromeServiceMock.createStartContract(),
+  history: () => ({
+    location: {
+      search: '',
+    },
+  }),
+  data: dataPlugin,
+  docLinks: docLinksServiceMock.createStartContract(),
+  capabilities: {
+    visualize: {
+      show: true,
+    },
+    discover: {
+      save: false,
+    },
+    advancedSettings: {
+      save: true,
+    },
+  },
+  filterManager: dataPlugin.query.filterManager,
+  uiSettings: {
+    get: (key: string) => {
+      if (key === 'fields:popularLimit') {
+        return 5;
+      } else if (key === DEFAULT_COLUMNS_SETTING) {
+        return [];
+      } else if (key === UI_SETTINGS.META_FIELDS) {
+        return [];
+      }
+    },
+  },
+  indexPatternFieldEditor: {
+    openEditor: jest.fn(),
+    userPermissions: {
+      editIndexPattern: jest.fn(),
+    },
+  },
+  getSavedSearchById: (id?: string) => Promise.resolve(savedSearchMock),
+  navigation: {
+    ui: { TopNavMenu },
+  },
+  metadata: {
+    branch: 'test',
+  },
+} as unknown) as DiscoverServices;
diff --git a/src/plugins/discover/public/__mocks__/ui_settings.ts b/src/plugins/discover/public/__mocks__/ui_settings.ts
index e021a39a568e9..8347ff18edd7d 100644
--- a/src/plugins/discover/public/__mocks__/ui_settings.ts
+++ b/src/plugins/discover/public/__mocks__/ui_settings.ts
@@ -7,7 +7,7 @@
  */
 
 import { IUiSettingsClient } from 'kibana/public';
-import { DEFAULT_COLUMNS_SETTING, SAMPLE_SIZE_SETTING } from '../../common';
+import { DEFAULT_COLUMNS_SETTING, DOC_TABLE_LEGACY, SAMPLE_SIZE_SETTING } from '../../common';
 
 export const uiSettingsMock = ({
   get: (key: string) => {
@@ -15,6 +15,8 @@ export const uiSettingsMock = ({
       return 10;
     } else if (key === DEFAULT_COLUMNS_SETTING) {
       return ['default_column'];
+    } else if (key === DOC_TABLE_LEGACY) {
+      return true;
     }
   },
 } as unknown) as IUiSettingsClient;
diff --git a/src/plugins/discover/public/application/angular/context.html b/src/plugins/discover/public/application/angular/context.html
index 2c8e9a2a5d6f0..adafb3a62275f 100644
--- a/src/plugins/discover/public/application/angular/context.html
+++ b/src/plugins/discover/public/application/angular/context.html
@@ -2,8 +2,9 @@
   anchor-id="contextAppRoute.anchorId"
   columns="contextAppRoute.state.columns"
   index-pattern="contextAppRoute.indexPattern"
+  app-state="contextAppRoute.state"
+  state-container="contextAppRoute.stateContainer"
   filters="contextAppRoute.filters"
   predecessor-count="contextAppRoute.state.predecessorCount"
   successor-count="contextAppRoute.state.successorCount"
-  sort="contextAppRoute.state.sort"
-></context-app>
+  sort="contextAppRoute.state.sort"></context-app>
\ No newline at end of file
diff --git a/src/plugins/discover/public/application/angular/context.js b/src/plugins/discover/public/application/angular/context.js
index 01a28a5c174b6..10c0fe9db1950 100644
--- a/src/plugins/discover/public/application/angular/context.js
+++ b/src/plugins/discover/public/application/angular/context.js
@@ -15,19 +15,12 @@ import { getState } from './context_state';
 import contextAppRouteTemplate from './context.html';
 import { getRootBreadcrumbs } from '../helpers/breadcrumbs';
 
-const k7Breadcrumbs = ($route) => {
-  const { indexPattern } = $route.current.locals;
-  const { id } = $route.current.params;
-
+const k7Breadcrumbs = () => {
   return [
     ...getRootBreadcrumbs(),
     {
       text: i18n.translate('discover.context.breadcrumb', {
-        defaultMessage: 'Context of {indexPatternTitle}#{docId}',
-        values: {
-          indexPatternTitle: indexPattern.title,
-          docId: id,
-        },
+        defaultMessage: 'Surrounding documents',
       }),
     },
   ];
@@ -51,6 +44,14 @@ getAngularModule().config(($routeProvider) => {
 function ContextAppRouteController($routeParams, $scope, $route) {
   const filterManager = getServices().filterManager;
   const indexPattern = $route.current.locals.indexPattern.ip;
+  const stateContainer = getState({
+    defaultStepSize: getServices().uiSettings.get(CONTEXT_DEFAULT_SIZE_SETTING),
+    timeFieldName: indexPattern.timeFieldName,
+    storeInSessionStorage: getServices().uiSettings.get('state:storeInSessionStorage'),
+    history: getServices().history(),
+    toasts: getServices().core.notifications.toasts,
+    uiSettings: getServices().core.uiSettings,
+  });
   const {
     startSync: startStateSync,
     stopSync: stopStateSync,
@@ -59,14 +60,8 @@ function ContextAppRouteController($routeParams, $scope, $route) {
     setFilters,
     setAppState,
     flushToUrl,
-  } = getState({
-    defaultStepSize: getServices().uiSettings.get(CONTEXT_DEFAULT_SIZE_SETTING),
-    timeFieldName: indexPattern.timeFieldName,
-    storeInSessionStorage: getServices().uiSettings.get('state:storeInSessionStorage'),
-    history: getServices().history(),
-    toasts: getServices().core.notifications.toasts,
-    uiSettings: getServices().core.uiSettings,
-  });
+  } = stateContainer;
+  this.stateContainer = stateContainer;
   this.state = { ...appState.getState() };
   this.anchorId = $routeParams.id;
   this.indexPattern = indexPattern;
diff --git a/src/plugins/discover/public/application/angular/context/api/anchor.test.ts b/src/plugins/discover/public/application/angular/context/api/anchor.test.ts
index 62c9a2a5e3b90..4da8ddc798003 100644
--- a/src/plugins/discover/public/application/angular/context/api/anchor.test.ts
+++ b/src/plugins/discover/public/application/angular/context/api/anchor.test.ts
@@ -8,22 +8,21 @@
 
 import { EsQuerySortValue, SortDirection } from '../../../../../../data/public';
 import { createIndexPatternsStub, createSearchSourceStub } from './_stubs';
-import { AnchorHitRecord, fetchAnchorProvider } from './anchor';
+import { fetchAnchorProvider } from './anchor';
+import { EsHitRecord, EsHitRecordList } from './context';
 
 describe('context app', function () {
   let fetchAnchor: (
     indexPatternId: string,
     anchorId: string,
     sort: EsQuerySortValue[]
-  ) => Promise<AnchorHitRecord>;
+  ) => Promise<EsHitRecord>;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   let searchSourceStub: any;
 
   describe('function fetchAnchor', function () {
     beforeEach(() => {
-      searchSourceStub = createSearchSourceStub([
-        { _id: 'hit1', fields: [], sort: [], _source: {} },
-      ]);
+      searchSourceStub = createSearchSourceStub(([{ _id: 'hit1' }] as unknown) as EsHitRecordList);
       fetchAnchor = fetchAnchorProvider(createIndexPatternsStub(), searchSourceStub);
     });
 
@@ -139,16 +138,14 @@ describe('context app', function () {
         { _doc: SortDirection.desc },
       ]).then((anchorDocument) => {
         expect(anchorDocument).toHaveProperty('property1', 'value1');
-        expect(anchorDocument).toHaveProperty('$$_isAnchor', true);
+        expect(anchorDocument).toHaveProperty('isAnchor', true);
       });
     });
   });
 
   describe('useNewFields API', () => {
     beforeEach(() => {
-      searchSourceStub = createSearchSourceStub([
-        { _id: 'hit1', fields: [], sort: [], _source: {} },
-      ]);
+      searchSourceStub = createSearchSourceStub(([{ _id: 'hit1' }] as unknown) as EsHitRecordList);
       fetchAnchor = fetchAnchorProvider(createIndexPatternsStub(), searchSourceStub, true);
     });
 
diff --git a/src/plugins/discover/public/application/angular/context/api/anchor.ts b/src/plugins/discover/public/application/angular/context/api/anchor.ts
index da81ce525331a..f2111d020aade 100644
--- a/src/plugins/discover/public/application/angular/context/api/anchor.ts
+++ b/src/plugins/discover/public/application/angular/context/api/anchor.ts
@@ -16,11 +16,6 @@ import {
 } from '../../../../../../data/public';
 import { EsHitRecord } from './context';
 
-export interface AnchorHitRecord extends EsHitRecord {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  $$_isAnchor: boolean;
-}
-
 export function fetchAnchorProvider(
   indexPatterns: IndexPatternsContract,
   searchSource: ISearchSource,
@@ -30,7 +25,7 @@ export function fetchAnchorProvider(
     indexPatternId: string,
     anchorId: string,
     sort: EsQuerySortValue[]
-  ): Promise<AnchorHitRecord> {
+  ): Promise<EsHitRecord> {
     const indexPattern = await indexPatterns.get(indexPatternId);
     searchSource
       .setParent(undefined)
@@ -66,8 +61,7 @@ export function fetchAnchorProvider(
 
     return {
       ...get(response, ['hits', 'hits', 0]),
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      $$_isAnchor: true,
-    } as AnchorHitRecord;
+      isAnchor: true,
+    } as EsHitRecord;
   };
 }
diff --git a/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.ts b/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.ts
index dc097bc110e20..1acf57411c795 100644
--- a/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.ts
+++ b/src/plugins/discover/public/application/angular/context/api/context.predecessors.test.ts
@@ -11,7 +11,7 @@ import { get, last } from 'lodash';
 import { createIndexPatternsStub, createContextSearchSourceStub } from './_stubs';
 import { EsHitRecordList, fetchContextProvider } from './context';
 import { setServices, SortDirection } from '../../../../kibana_services';
-import { AnchorHitRecord } from './anchor';
+import { EsHitRecord } from './context';
 import { Query } from '../../../../../../data/public';
 import { DiscoverServices } from '../../../../build_services';
 
@@ -75,7 +75,7 @@ describe('context app', function () {
         return fetchContextProvider(createIndexPatternsStub()).fetchSurroundingDocs(
           'predecessors',
           indexPatternId,
-          anchor as AnchorHitRecord,
+          anchor as EsHitRecord,
           timeField,
           tieBreakerField,
           sortDir,
@@ -267,7 +267,7 @@ describe('context app', function () {
         return fetchContextProvider(createIndexPatternsStub(), true).fetchSurroundingDocs(
           'predecessors',
           indexPatternId,
-          anchor as AnchorHitRecord,
+          anchor as EsHitRecord,
           timeField,
           tieBreakerField,
           sortDir,
diff --git a/src/plugins/discover/public/application/angular/context/api/context.successors.test.ts b/src/plugins/discover/public/application/angular/context/api/context.successors.test.ts
index f8fc7eb343206..957a13e8daf09 100644
--- a/src/plugins/discover/public/application/angular/context/api/context.successors.test.ts
+++ b/src/plugins/discover/public/application/angular/context/api/context.successors.test.ts
@@ -13,7 +13,7 @@ import { createIndexPatternsStub, createContextSearchSourceStub } from './_stubs
 import { setServices, SortDirection } from '../../../../kibana_services';
 import { Query } from '../../../../../../data/public';
 import { EsHitRecordList, fetchContextProvider } from './context';
-import { AnchorHitRecord } from './anchor';
+import { EsHitRecord } from './context';
 import { DiscoverServices } from '../../../../build_services';
 
 const MS_PER_DAY = 24 * 60 * 60 * 1000;
@@ -75,7 +75,7 @@ describe('context app', function () {
         return fetchContextProvider(createIndexPatternsStub()).fetchSurroundingDocs(
           'successors',
           indexPatternId,
-          anchor as AnchorHitRecord,
+          anchor as EsHitRecord,
           timeField,
           tieBreakerField,
           sortDir,
@@ -270,7 +270,7 @@ describe('context app', function () {
         return fetchContextProvider(createIndexPatternsStub(), true).fetchSurroundingDocs(
           'successors',
           indexPatternId,
-          anchor as AnchorHitRecord,
+          anchor as EsHitRecord,
           timeField,
           tieBreakerField,
           sortDir,
diff --git a/src/plugins/discover/public/application/angular/context/api/context.ts b/src/plugins/discover/public/application/angular/context/api/context.ts
index 4309b9ca4c391..cd81ca7b216b2 100644
--- a/src/plugins/discover/public/application/angular/context/api/context.ts
+++ b/src/plugins/discover/public/application/angular/context/api/context.ts
@@ -6,6 +6,7 @@
  * Side Public License, v 1.
  */
 
+import type { estypes } from '@elastic/elasticsearch';
 import { Filter, IndexPatternsContract, IndexPattern } from 'src/plugins/data/public';
 import { reverseSortDir, SortDirection } from './utils/sorting';
 import { extractNanos, convertIsoToMillis } from './utils/date_conversion';
@@ -14,17 +15,19 @@ import { generateIntervals } from './utils/generate_intervals';
 import { getEsQuerySearchAfter } from './utils/get_es_query_search_after';
 import { getEsQuerySort } from './utils/get_es_query_sort';
 import { getServices } from '../../../../kibana_services';
-import { AnchorHitRecord } from './anchor';
 
 export type SurrDocType = 'successors' | 'predecessors';
-export interface EsHitRecord {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  fields: Record<string, any>;
-  sort: number[];
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  _source: Record<string, any>;
-  _id: string;
-}
+export type EsHitRecord = Required<
+  Pick<
+    estypes.SearchResponse['hits']['hits'][number],
+    '_id' | 'fields' | 'sort' | '_index' | '_version'
+  >
+> & {
+  _source?: Record<string, unknown>;
+  _score?: number;
+  isAnchor?: boolean;
+};
+
 export type EsHitRecordList = EsHitRecord[];
 
 const DAY_MILLIS = 24 * 60 * 60 * 1000;
@@ -53,7 +56,7 @@ function fetchContextProvider(indexPatterns: IndexPatternsContract, useNewFields
   async function fetchSurroundingDocs(
     type: SurrDocType,
     indexPatternId: string,
-    anchor: AnchorHitRecord,
+    anchor: EsHitRecord,
     timeField: string,
     tieBreakerField: string,
     sortDir: SortDirection,
@@ -71,7 +74,7 @@ function fetchContextProvider(indexPatterns: IndexPatternsContract, useNewFields
     const timeValueMillis =
       nanos !== '' ? convertIsoToMillis(anchor.fields[timeField][0]) : anchor.sort[0];
 
-    const intervals = generateIntervals(LOOKUP_OFFSETS, timeValueMillis, type, sortDir);
+    const intervals = generateIntervals(LOOKUP_OFFSETS, timeValueMillis as number, type, sortDir);
     let documents: EsHitRecordList = [];
 
     for (const interval of intervals) {
diff --git a/src/plugins/discover/public/application/angular/context/api/utils/get_es_query_search_after.ts b/src/plugins/discover/public/application/angular/context/api/utils/get_es_query_search_after.ts
index fb0e58832a202..c703abaf2e523 100644
--- a/src/plugins/discover/public/application/angular/context/api/utils/get_es_query_search_after.ts
+++ b/src/plugins/discover/public/application/angular/context/api/utils/get_es_query_search_after.ts
@@ -28,23 +28,23 @@ export function getEsQuerySearchAfter(
     // already surrounding docs -> first or last record  is used
     const afterTimeRecIdx = type === 'successors' && documents.length ? documents.length - 1 : 0;
     const afterTimeDoc = documents[afterTimeRecIdx];
-    let afterTimeValue: string | number = afterTimeDoc.sort[0];
+    let afterTimeValue = afterTimeDoc.sort[0] as string | number;
     if (nanoSeconds) {
       afterTimeValue = useNewFieldsApi
-        ? (afterTimeDoc.fields[timeFieldName] as Array<string | number>)[0]
-        : (afterTimeDoc._source[timeFieldName] as string | number);
+        ? afterTimeDoc.fields[timeFieldName][0]
+        : afterTimeDoc._source?.[timeFieldName];
     }
-    return [afterTimeValue, afterTimeDoc.sort[1]];
+    return [afterTimeValue, afterTimeDoc.sort[1] as string | number];
   }
   // if data_nanos adapt timestamp value for sorting, since numeric value was rounded by browser
   // ES search_after also works when number is provided as string
   const searchAfter = new Array(2) as EsQuerySearchAfter;
-  searchAfter[0] = anchor.sort[0];
+  searchAfter[0] = anchor.sort[0] as string | number;
   if (nanoSeconds) {
     searchAfter[0] = useNewFieldsApi
-      ? (anchor.fields[timeFieldName] as Array<string | number>)[0]
-      : (anchor._source[timeFieldName] as string | number);
+      ? anchor.fields[timeFieldName][0]
+      : anchor._source?.[timeFieldName];
   }
-  searchAfter[1] = anchor.sort[1];
+  searchAfter[1] = anchor.sort[1] as string | number;
   return searchAfter;
 }
diff --git a/src/plugins/discover/public/application/angular/context/query/actions.tsx b/src/plugins/discover/public/application/angular/context/query/actions.tsx
index 52c56d379d259..f79c28bf6a120 100644
--- a/src/plugins/discover/public/application/angular/context/query/actions.tsx
+++ b/src/plugins/discover/public/application/angular/context/query/actions.tsx
@@ -13,7 +13,7 @@ import { i18n } from '@kbn/i18n';
 import { getServices } from '../../../../kibana_services';
 import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../../common';
 import { MarkdownSimple, toMountPoint } from '../../../../../../kibana_react/public';
-import { AnchorHitRecord, fetchAnchorProvider } from '../api/anchor';
+import { fetchAnchorProvider } from '../api/anchor';
 import { EsHitRecord, EsHitRecordList, fetchContextProvider, SurrDocType } from '../api/context';
 import { getQueryParameterActions } from '../query_parameters';
 import {
@@ -77,11 +77,12 @@ export function QueryActionsProvider(Promise: DiscoverPromise) {
     }
 
     setLoadingStatus(state)('anchor');
+    const [[, sortDir]] = sort;
 
     return Promise.try(() =>
-      fetchAnchor(indexPatternId, anchorId, [fromPairs([sort]), { [tieBreakerField]: sort[1] }])
+      fetchAnchor(indexPatternId, anchorId, [fromPairs(sort), { [tieBreakerField]: sortDir }])
     ).then(
-      (anchorDocument: AnchorHitRecord) => {
+      (anchorDocument: EsHitRecord) => {
         setLoadedStatus(state)('anchor');
         state.rows.anchor = anchorDocument;
         return anchorDocument;
@@ -120,7 +121,7 @@ export function QueryActionsProvider(Promise: DiscoverPromise) {
     }
 
     setLoadingStatus(state)(type);
-    const [sortField, sortDir] = sort;
+    const [[sortField, sortDir]] = sort;
 
     return Promise.try(() =>
       fetchSurroundingDocs(
diff --git a/src/plugins/discover/public/application/angular/context/query_parameters/actions.test.ts b/src/plugins/discover/public/application/angular/context/query_parameters/actions.test.ts
index b54f11e9e6706..fac3e1ea6fad6 100644
--- a/src/plugins/discover/public/application/angular/context/query_parameters/actions.test.ts
+++ b/src/plugins/discover/public/application/angular/context/query_parameters/actions.test.ts
@@ -10,6 +10,7 @@ import { getQueryParameterActions } from './actions';
 import { FilterManager, SortDirection } from '../../../../../../data/public';
 import { coreMock } from '../../../../../../../core/public/mocks';
 import { ContextAppState, LoadingStatus, QueryParameters } from '../../context_app_state';
+import { EsHitRecord } from '../api/context';
 const setupMock = coreMock.createSetup();
 
 let state: ContextAppState;
@@ -29,7 +30,7 @@ beforeEach(() => {
       anchorId: '',
       columns: [],
       filters: [],
-      sort: ['field', SortDirection.asc],
+      sort: [['field', SortDirection.asc]],
       tieBreakerField: '',
     },
     loadingStatus: {
@@ -39,8 +40,7 @@ beforeEach(() => {
     },
     rows: {
       all: [],
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      anchor: { $$_isAnchor: true, fields: [], sort: [], _source: [], _id: '' },
+      anchor: ({ isAnchor: true, fields: [], sort: [], _id: '' } as unknown) as EsHitRecord,
       predecessors: [],
       successors: [],
     },
@@ -129,7 +129,7 @@ describe('context query_parameter actions', function () {
         indexPatternId: 'INDEX_PATTERN',
         predecessorCount: 100,
         successorCount: 100,
-        sort: ['field', SortDirection.asc],
+        sort: [['field', SortDirection.asc]],
         tieBreakerField: '',
       });
 
@@ -142,7 +142,7 @@ describe('context query_parameter actions', function () {
         indexPatternId: 'INDEX_PATTERN',
         predecessorCount: 100,
         successorCount: 100,
-        sort: ['field', SortDirection.asc],
+        sort: [['field', SortDirection.asc]],
         tieBreakerField: '',
       });
     });
diff --git a/src/plugins/discover/public/application/angular/context_app.html b/src/plugins/discover/public/application/angular/context_app.html
index 3d731459ad8d7..21aad2688d2a3 100644
--- a/src/plugins/discover/public/application/angular/context_app.html
+++ b/src/plugins/discover/public/application/angular/context_app.html
@@ -3,11 +3,14 @@
   filter="contextApp.actions.addFilter"
   hits="contextApp.state.rows.all"
   index-pattern="contextApp.indexPattern"
+  app-state="contextApp.appState"
+  state-container="contextApp.stateContainer"
   sorting="contextApp.state.queryParameters.sort"
   columns="contextApp.state.queryParameters.columns"
   minimum-visible-rows="contextApp.state.rows.all.length"
-  status="contextApp.state.loadingStatus.anchor.status"
-  reason="contextApp.state.loadingStatus.anchor.reason"
+  anchor-id="contextApp.anchorId"
+  anchor-status="contextApp.state.loadingStatus.anchor.status"
+  anchor-reason="contextApp.state.loadingStatus.anchor.reason"
   default-step-size="contextApp.state.queryParameters.defaultStepSize"
   predecessor-count="contextApp.state.queryParameters.predecessorCount"
   predecessor-available="contextApp.state.rows.predecessors.length"
@@ -18,5 +21,4 @@
   successor-status="contextApp.state.loadingStatus.successors.status"
   on-change-successor-count="contextApp.actions.fetchGivenSuccessorRows"
   use-new-fields-api="contextApp.state.useNewFieldsApi"
-  top-nav-menu="contextApp.topNavMenu"
-></context-app-legacy>
+  top-nav-menu="contextApp.topNavMenu"></context-app-legacy>
\ No newline at end of file
diff --git a/src/plugins/discover/public/application/angular/context_app.js b/src/plugins/discover/public/application/angular/context_app.js
index a90904fa2ccea..7c9c5f8ce4b42 100644
--- a/src/plugins/discover/public/application/angular/context_app.js
+++ b/src/plugins/discover/public/application/angular/context_app.js
@@ -34,6 +34,8 @@ getAngularModule().directive('contextApp', function ContextApp() {
       anchorId: '=',
       columns: '=',
       indexPattern: '=',
+      appState: '=',
+      stateContainer: '=',
       filters: '=',
       predecessorCount: '=',
       successorCount: '=',
@@ -55,7 +57,6 @@ function ContextAppController($scope, Private) {
   );
   this.state.useNewFieldsApi = useNewFieldsApi;
   this.topNavMenu = navigation.ui.TopNavMenu;
-
   this.actions = _.mapValues(
     {
       ...queryParameterActions,
diff --git a/src/plugins/discover/public/application/angular/context_app_state.ts b/src/plugins/discover/public/application/angular/context_app_state.ts
index 1593b2457019c..0d9d6d6ea5978 100644
--- a/src/plugins/discover/public/application/angular/context_app_state.ts
+++ b/src/plugins/discover/public/application/angular/context_app_state.ts
@@ -7,7 +7,7 @@
  */
 
 import { Filter } from '../../../../data/public';
-import { AnchorHitRecord } from './context/api/anchor';
+import { EsHitRecord } from './context/api/context';
 import { EsHitRecordList } from './context/api/context';
 import { SortDirection } from './context/api/utils/sorting';
 
@@ -48,13 +48,13 @@ export interface QueryParameters {
   indexPatternId: string;
   predecessorCount: number;
   successorCount: number;
-  sort: [string, SortDirection];
+  sort: Array<[string, SortDirection]>;
   tieBreakerField: string;
 }
 
 interface ContextRows {
   all: EsHitRecordList;
-  anchor: AnchorHitRecord;
+  anchor: EsHitRecord;
   predecessors: EsHitRecordList;
   successors: EsHitRecordList;
 }
diff --git a/src/plugins/discover/public/application/angular/context_state.test.ts b/src/plugins/discover/public/application/angular/context_state.test.ts
index ed4a74c70112b..e9294567032c4 100644
--- a/src/plugins/discover/public/application/angular/context_state.test.ts
+++ b/src/plugins/discover/public/application/angular/context_state.test.ts
@@ -45,8 +45,10 @@ describe('Test Discover Context State', () => {
         "filters": Array [],
         "predecessorCount": 4,
         "sort": Array [
-          "time",
-          "desc",
+          Array [
+            "time",
+            "desc",
+          ],
         ],
         "successorCount": 4,
       }
@@ -60,7 +62,7 @@ describe('Test Discover Context State', () => {
     state.setAppState({ predecessorCount: 10 });
     state.flushToUrl();
     expect(getCurrentUrl()).toMatchInlineSnapshot(
-      `"/#?_a=(columns:!(_source),filters:!(),predecessorCount:10,sort:!(time,desc),successorCount:4)"`
+      `"/#?_a=(columns:!(_source),filters:!(),predecessorCount:10,sort:!(!(time,desc)),successorCount:4)"`
     );
   });
   test('getState -> url to appState syncing', async () => {
@@ -183,7 +185,7 @@ describe('Test Discover Context State', () => {
     `);
     state.flushToUrl();
     expect(getCurrentUrl()).toMatchInlineSnapshot(
-      `"/#?_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,index:'logstash-*',key:extension,negate:!f,params:(query:jpg),type:phrase),query:(match:(extension:(query:jpg,type:phrase))))))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'logstash-*',key:extension,negate:!t,params:(query:png),type:phrase),query:(match:(extension:(query:png,type:phrase))))),predecessorCount:4,sort:!(time,desc),successorCount:4)"`
+      `"/#?_g=(filters:!(('$state':(store:globalState),meta:(alias:!n,disabled:!f,index:'logstash-*',key:extension,negate:!f,params:(query:jpg),type:phrase),query:(match:(extension:(query:jpg,type:phrase))))))&_a=(columns:!(_source),filters:!(('$state':(store:appState),meta:(alias:!n,disabled:!f,index:'logstash-*',key:extension,negate:!t,params:(query:png),type:phrase),query:(match:(extension:(query:png,type:phrase))))),predecessorCount:4,sort:!(!(time,desc)),successorCount:4)"`
     );
   });
 });
diff --git a/src/plugins/discover/public/application/angular/context_state.ts b/src/plugins/discover/public/application/angular/context_state.ts
index d60f2e655c4eb..9cfea7f01e4ab 100644
--- a/src/plugins/discover/public/application/angular/context_state.ts
+++ b/src/plugins/discover/public/application/angular/context_state.ts
@@ -35,7 +35,7 @@ export interface AppState {
   /**
    * Sorting of the records to be fetched, assumed to be a legacy parameter
    */
-  sort: string[];
+  sort: string[][];
   /**
    * Number of records to be fetched after the anchor records (older records)
    */
@@ -50,7 +50,7 @@ interface GlobalState {
   filters: Filter[];
 }
 
-interface GetStateParams {
+export interface GetStateParams {
   /**
    * Number of records to be fetched when 'Load' link/button is clicked
    */
@@ -81,7 +81,7 @@ interface GetStateParams {
   uiSettings: IUiSettingsClient;
 }
 
-interface GetStateReturn {
+export interface GetStateReturn {
   /**
    * Global state, the _g part of the URL
    */
@@ -276,7 +276,7 @@ function createInitialAppState(
     columns: ['_source'],
     filters: [],
     predecessorCount: parseInt(defaultSize, 10),
-    sort: [timeFieldName, 'desc'],
+    sort: [[timeFieldName, 'desc']],
     successorCount: parseInt(defaultSize, 10),
   };
   if (typeof urlState !== 'object') {
diff --git a/src/plugins/discover/public/application/angular/create_discover_directive.ts b/src/plugins/discover/public/application/angular/create_discover_directive.ts
new file mode 100644
index 0000000000000..ae0d978322bcd
--- /dev/null
+++ b/src/plugins/discover/public/application/angular/create_discover_directive.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 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 { DiscoverMainApp } from '../apps/main';
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function createDiscoverDirective(reactDirective: any) {
+  return reactDirective(DiscoverMainApp, [
+    ['indexPattern', { watchDepth: 'reference' }],
+    ['opts', { watchDepth: 'reference' }],
+  ]);
+}
diff --git a/src/plugins/discover/public/application/components/create_discover_grid_directive.tsx b/src/plugins/discover/public/application/angular/create_discover_grid_directive.tsx
similarity index 95%
rename from src/plugins/discover/public/application/components/create_discover_grid_directive.tsx
rename to src/plugins/discover/public/application/angular/create_discover_grid_directive.tsx
index 39a9df8926023..1fc8edcb4d065 100644
--- a/src/plugins/discover/public/application/components/create_discover_grid_directive.tsx
+++ b/src/plugins/discover/public/application/angular/create_discover_grid_directive.tsx
@@ -7,7 +7,7 @@
  */
 import React, { useState } from 'react';
 import { I18nProvider } from '@kbn/i18n/react';
-import { DiscoverGrid, DiscoverGridProps } from './discover_grid/discover_grid';
+import { DiscoverGrid, DiscoverGridProps } from '../components/discover_grid/discover_grid';
 import { getServices } from '../../kibana_services';
 import { ElasticSearchHit } from '../doc_views/doc_views_types';
 
diff --git a/src/plugins/discover/public/application/angular/directives/debounce/debounce.js b/src/plugins/discover/public/application/angular/directives/debounce/debounce.js
deleted file mode 100644
index bca1a9c785fd6..0000000000000
--- a/src/plugins/discover/public/application/angular/directives/debounce/debounce.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 _ from 'lodash';
-// Debounce service, angularized version of lodash debounce
-// borrowed heavily from https://github.com/shahata/angular-debounce
-
-export function createDebounceProviderTimeout($timeout) {
-  return function (func, wait, options) {
-    let timeout;
-    let args;
-    let self;
-    let result;
-    options = _.defaults(options || {}, {
-      leading: false,
-      trailing: true,
-      invokeApply: true,
-    });
-
-    function debounce() {
-      self = this;
-      args = arguments;
-
-      const later = function () {
-        timeout = null;
-        if (!options.leading || options.trailing) {
-          result = func.apply(self, args);
-        }
-      };
-
-      const callNow = options.leading && !timeout;
-
-      if (timeout) {
-        $timeout.cancel(timeout);
-      }
-      timeout = $timeout(later, wait, options.invokeApply);
-
-      if (callNow) {
-        result = func.apply(self, args);
-      }
-
-      return result;
-    }
-
-    debounce.cancel = function () {
-      $timeout.cancel(timeout);
-      timeout = null;
-    };
-
-    return debounce;
-  };
-}
diff --git a/src/plugins/discover/public/application/angular/directives/debounce/debounce.test.ts b/src/plugins/discover/public/application/angular/directives/debounce/debounce.test.ts
deleted file mode 100644
index 0c033fd066eab..0000000000000
--- a/src/plugins/discover/public/application/angular/directives/debounce/debounce.test.ts
+++ /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 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 sinon, { SinonSpy } from 'sinon';
-import angular, { auto, ITimeoutService } from 'angular';
-import 'angular-mocks';
-import 'angular-sanitize';
-import 'angular-route';
-
-// @ts-expect-error
-import { createDebounceProviderTimeout } from './debounce';
-import { coreMock } from '../../../../../../../core/public/mocks';
-import { initializeInnerAngularModule } from '../../../../get_inner_angular';
-import { navigationPluginMock } from '../../../../../../navigation/public/mocks';
-import { dataPluginMock } from '../../../../../../data/public/mocks';
-import { initAngularBootstrap } from '../../../../../../kibana_legacy/public';
-
-describe('debounce service', function () {
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  let debounce: (fn: () => void, timeout: number, options?: any) => any;
-  let $timeout: ITimeoutService;
-  let spy: SinonSpy;
-
-  beforeEach(() => {
-    spy = sinon.spy();
-
-    initAngularBootstrap();
-
-    initializeInnerAngularModule(
-      'app/discover',
-      coreMock.createStart(),
-      navigationPluginMock.createStartContract(),
-      dataPluginMock.createStartContract()
-    );
-
-    angular.mock.module('app/discover');
-
-    angular.mock.inject(($injector: auto.IInjectorService, _$timeout_: ITimeoutService) => {
-      $timeout = _$timeout_;
-
-      debounce = createDebounceProviderTimeout($timeout);
-    });
-  });
-
-  it('should have a cancel method', function () {
-    const bouncer = debounce(() => {}, 100);
-
-    expect(bouncer).toHaveProperty('cancel');
-  });
-
-  describe('delayed execution', function () {
-    const sandbox = sinon.createSandbox();
-
-    beforeEach(() => sandbox.useFakeTimers());
-    afterEach(() => sandbox.restore());
-
-    it('should delay execution', function () {
-      const bouncer = debounce(spy, 100);
-
-      bouncer();
-      sinon.assert.notCalled(spy);
-      $timeout.flush();
-      sinon.assert.calledOnce(spy);
-
-      spy.resetHistory();
-    });
-
-    it('should fire on leading edge', function () {
-      const bouncer = debounce(spy, 100, { leading: true });
-
-      bouncer();
-      sinon.assert.calledOnce(spy);
-      $timeout.flush();
-      sinon.assert.calledTwice(spy);
-
-      spy.resetHistory();
-    });
-
-    it('should only fire on leading edge', function () {
-      const bouncer = debounce(spy, 100, { leading: true, trailing: false });
-
-      bouncer();
-      sinon.assert.calledOnce(spy);
-      $timeout.flush();
-      sinon.assert.calledOnce(spy);
-
-      spy.resetHistory();
-    });
-
-    it('should reset delayed execution', function () {
-      const cancelSpy = sinon.spy($timeout, 'cancel');
-      const bouncer = debounce(spy, 100);
-
-      bouncer();
-      sandbox.clock.tick(1);
-
-      bouncer();
-      sinon.assert.notCalled(spy);
-      $timeout.flush();
-      sinon.assert.calledOnce(spy);
-      sinon.assert.calledOnce(cancelSpy);
-
-      spy.resetHistory();
-      cancelSpy.resetHistory();
-    });
-  });
-
-  describe('cancel', function () {
-    it('should cancel the $timeout', function () {
-      const cancelSpy = sinon.spy($timeout, 'cancel');
-      const bouncer = debounce(spy, 100);
-
-      bouncer();
-      bouncer.cancel();
-      sinon.assert.calledOnce(cancelSpy);
-      // throws if pending timeouts
-      $timeout.verifyNoPendingTasks();
-
-      cancelSpy.resetHistory();
-    });
-  });
-});
diff --git a/src/plugins/discover/public/application/angular/directives/debounce/index.js b/src/plugins/discover/public/application/angular/directives/debounce/index.js
deleted file mode 100644
index 774876af70d4c..0000000000000
--- a/src/plugins/discover/public/application/angular/directives/debounce/index.js
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { createDebounceProviderTimeout } from './debounce';
diff --git a/src/plugins/discover/public/application/angular/directives/index.ts b/src/plugins/discover/public/application/angular/directives/index.ts
deleted file mode 100644
index 4478d8bb31979..0000000000000
--- a/src/plugins/discover/public/application/angular/directives/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { DiscoverUninitialized } from './uninitialized';
-export { DiscoverHistogram } from './histogram';
diff --git a/src/plugins/discover/public/application/angular/discover.js b/src/plugins/discover/public/application/angular/discover.js
index c66ca19c96743..aa1344a67fbec 100644
--- a/src/plugins/discover/public/application/angular/discover.js
+++ b/src/plugins/discover/public/application/angular/discover.js
@@ -6,47 +6,17 @@
  * Side Public License, v 1.
  */
 
-import _ from 'lodash';
-import { merge, Subject, Subscription } from 'rxjs';
-import { debounceTime, tap, filter } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { createSearchSessionRestorationDataProvider, getState, splitState } from './discover_state';
-import { RequestAdapter } from '../../../../inspector/public';
-import {
-  connectToQueryState,
-  esFilters,
-  indexPatterns as indexPatternsUtils,
-  noSearchSessionStorageCapabilityMessage,
-  syncQueryStateWithUrl,
-} from '../../../../data/public';
-import { getSortArray } from './doc_table';
+import { getState } from '../apps/main/services/discover_state';
 import indexTemplateLegacy from './discover_legacy.html';
-import { discoverResponseHandler } from './response_handler';
 import {
   getAngularModule,
-  getHeaderActionMenuMounter,
   getServices,
   getUrlTracker,
   redirectWhenMissing,
-  subscribeWithScope,
-  tabifyAggResponse,
 } from '../../kibana_services';
 import { getRootBreadcrumbs, getSavedSearchBreadcrumbs } from '../helpers/breadcrumbs';
-import { getStateDefaults } from '../helpers/get_state_defaults';
-import { getResultState } from '../helpers/get_result_state';
-import { validateTimeRange } from '../helpers/validate_time_range';
-import { addFatalError } from '../../../../kibana_legacy/public';
-import {
-  SAMPLE_SIZE_SETTING,
-  SEARCH_FIELDS_FROM_SOURCE,
-  SEARCH_ON_PAGE_LOAD_SETTING,
-} from '../../../common';
-import { loadIndexPattern, resolveIndexPattern } from '../helpers/resolve_index_pattern';
-import { updateSearchSource } from '../helpers/update_search_source';
-import { calcFieldCounts } from '../helpers/calc_field_counts';
-import { DiscoverSearchSessionManager } from './discover_search_session';
-import { applyAggsToSearchSource, getDimensions } from '../components/histogram';
-import { fetchStatuses } from '../components/constants';
+import { loadIndexPattern, resolveIndexPattern } from '../apps/main/utils/resolve_index_pattern';
 
 const services = getServices();
 
@@ -56,8 +26,6 @@ const {
   chrome,
   data,
   history: getHistory,
-  filterManager,
-  timefilter,
   toastNotifications,
   uiSettings: config,
 } = getServices();
@@ -147,390 +115,29 @@ app.directive('discoverApp', function () {
 });
 
 function discoverController($route, $scope) {
-  const { isDefault: isDefaultType } = indexPatternsUtils;
-  const subscriptions = new Subscription();
-  const refetch$ = new Subject();
-
-  let isChangingIndexPattern = false;
   const savedSearch = $route.current.locals.savedObjects.savedSearch;
-  const persistentSearchSource = savedSearch.searchSource;
   $scope.indexPattern = resolveIndexPattern(
     $route.current.locals.savedObjects.ip,
-    persistentSearchSource,
+    savedSearch.searchSource,
     toastNotifications
   );
-  $scope.useNewFieldsApi = !config.get(SEARCH_FIELDS_FROM_SOURCE);
-
-  //used for functional testing
-  $scope.fetchCounter = 0;
-
-  const getTimeField = () => {
-    return isDefaultType($scope.indexPattern) ? $scope.indexPattern.timeFieldName : undefined;
-  };
 
   const history = getHistory();
-  const searchSessionManager = new DiscoverSearchSessionManager({
-    history,
-    session: data.search.session,
-  });
-
-  const stateContainer = getState({
-    getStateDefaults: () =>
-      getStateDefaults({
-        config,
-        data,
-        indexPattern: $scope.indexPattern,
-        savedSearch,
-        searchSource: persistentSearchSource,
-      }),
-    storeInSessionStorage: config.get('state:storeInSessionStorage'),
-    history,
-    toasts: core.notifications.toasts,
-    uiSettings: config,
-  });
-
-  const {
-    appStateContainer,
-    startSync: startStateSync,
-    stopSync: stopStateSync,
-    setAppState,
-    replaceUrlAppState,
-    kbnUrlStateStorage,
-    getPreviousAppState,
-  } = stateContainer;
-
-  if (appStateContainer.getState().index !== $scope.indexPattern.id) {
-    //used index pattern is different than the given by url/state which is invalid
-    setAppState({ index: $scope.indexPattern.id });
-  }
-  $scope.state = { ...appStateContainer.getState() };
-
-  // syncs `_g` portion of url with query services
-  const { stop: stopSyncingGlobalStateWithUrl } = syncQueryStateWithUrl(
-    data.query,
-    kbnUrlStateStorage
-  );
-
-  // sync initial app filters from state to filterManager
-  filterManager.setAppFilters(_.cloneDeep(appStateContainer.getState().filters));
-  data.query.queryString.setQuery(appStateContainer.getState().query);
-
-  const stopSyncingQueryAppStateWithStateContainer = connectToQueryState(
-    data.query,
-    appStateContainer,
-    {
-      filters: esFilters.FilterStateStore.APP_STATE,
-      query: true,
-    }
-  );
-  const showUnmappedFields = $scope.useNewFieldsApi;
-  const updateSearchSourceHelper = () => {
-    const { indexPattern, useNewFieldsApi } = $scope;
-    const { columns, sort } = $scope.state;
-    updateSearchSource({
-      persistentSearchSource,
-      volatileSearchSource: $scope.volatileSearchSource,
-      indexPattern,
-      services,
-      sort,
-      columns,
-      useNewFieldsApi,
-      showUnmappedFields,
-    });
-  };
-
-  const appStateUnsubscribe = appStateContainer.subscribe(async (newState) => {
-    const { state: newStatePartial } = splitState(newState);
-    const { state: oldStatePartial } = splitState(getPreviousAppState());
-
-    if (!_.isEqual(newStatePartial, oldStatePartial)) {
-      $scope.$evalAsync(async () => {
-        // NOTE: this is also called when navigating from discover app to context app
-        if (newStatePartial.index && oldStatePartial.index !== newStatePartial.index) {
-          //in case of index pattern switch the route has currently to be reloaded, legacy
-          isChangingIndexPattern = true;
-          $route.reload();
-          return;
-        }
-
-        $scope.state = { ...newState };
-
-        // detect changes that should trigger fetching of new data
-        const changes = ['interval', 'sort'].filter(
-          (prop) => !_.isEqual(newStatePartial[prop], oldStatePartial[prop])
-        );
-
-        if (oldStatePartial.hideChart && !newStatePartial.hideChart) {
-          // in case the histogram is hidden, no data is requested
-          // so when changing this state data needs to be fetched
-          changes.push(true);
-        }
-
-        if (changes.length) {
-          refetch$.next();
-        }
-      });
-    }
-  });
-
-  // this listener is waiting for such a path http://localhost:5601/app/discover#/
-  // which could be set through pressing "New" button in top nav or go to "Discover" plugin from the sidebar
-  // to reload the page in a right way
-  const unlistenHistoryBasePath = history.listen(({ pathname, search, hash }) => {
-    if (!search && !hash && pathname === '/') {
-      $route.reload();
-    }
-  });
-
-  data.search.session.enableStorage(
-    createSearchSessionRestorationDataProvider({
-      appStateContainer,
-      data,
-      getSavedSearch: () => savedSearch,
-    }),
-    {
-      isDisabled: () =>
-        capabilities.discover.storeSearchSession
-          ? { disabled: false }
-          : {
-              disabled: true,
-              reasonText: noSearchSessionStorageCapabilityMessage,
-            },
-    }
-  );
 
   $scope.opts = {
-    // number of records to fetch, then paginate through
-    sampleSize: config.get(SAMPLE_SIZE_SETTING),
-    timefield: getTimeField(),
-    savedSearch: savedSearch,
+    savedSearch,
+    history,
     services,
     indexPatternList: $route.current.locals.savedObjects.ip.list,
-    config: config,
-    setHeaderActionMenu: getHeaderActionMenuMounter(),
-    filterManager,
-    setAppState,
-    data,
-    stateContainer,
-    searchSessionManager,
-    refetch$,
-  };
-
-  const inspectorAdapters = ($scope.opts.inspectorAdapters = {
-    requests: new RequestAdapter(),
-  });
-
-  const shouldSearchOnPageLoad = () => {
-    // A saved search is created on every page load, so we check the ID to see if we're loading a
-    // previously saved search or if it is just transient
-    return (
-      config.get(SEARCH_ON_PAGE_LOAD_SETTING) ||
-      savedSearch.id !== undefined ||
-      timefilter.getRefreshInterval().pause === false ||
-      searchSessionManager.hasSearchSessionIdInURL()
-    );
+    navigateTo: (path) => {
+      $scope.$evalAsync(() => {
+        history.push(path);
+      });
+    },
   };
 
-  $scope.fetchStatus = fetchStatuses.UNINITIALIZED;
-  $scope.resultState = shouldSearchOnPageLoad() ? 'loading' : 'uninitialized';
-
-  let abortController;
   $scope.$on('$destroy', () => {
-    if (abortController) abortController.abort();
     savedSearch.destroy();
-    subscriptions.unsubscribe();
-    if (!isChangingIndexPattern) {
-      // HACK:
-      // do not clear session when changing index pattern due to how state management around it is setup
-      // it will be cleared by searchSessionManager on controller reload instead
-      data.search.session.clear();
-    }
-    appStateUnsubscribe();
-    stopStateSync();
-    stopSyncingGlobalStateWithUrl();
-    stopSyncingQueryAppStateWithStateContainer();
-    unlistenHistoryBasePath();
-  });
-
-  $scope.opts.getFieldCounts = async () => {
-    // the field counts aren't set until we have the data back,
-    // so we wait for the fetch to be done before proceeding
-    if ($scope.fetchStatus === fetchStatuses.COMPLETE) {
-      return $scope.fieldCounts;
-    }
-
-    return await new Promise((resolve) => {
-      const unwatch = $scope.$watch('fetchStatus', (newValue) => {
-        if (newValue === fetchStatuses.COMPLETE) {
-          unwatch();
-          resolve($scope.fieldCounts);
-        }
-      });
-    });
-  };
-  $scope.opts.navigateTo = (path) => {
-    $scope.$evalAsync(() => {
-      history.push(path);
-    });
-  };
-
-  persistentSearchSource.setField('index', $scope.indexPattern);
-
-  // searchSource which applies time range
-  const volatileSearchSource = savedSearch.searchSource.create();
-
-  if (isDefaultType($scope.indexPattern)) {
-    volatileSearchSource.setField('filter', () => {
-      return timefilter.createFilter($scope.indexPattern);
-    });
-  }
-
-  volatileSearchSource.setParent(persistentSearchSource);
-  $scope.volatileSearchSource = volatileSearchSource;
-  $scope.state.index = $scope.indexPattern.id;
-  $scope.state.sort = getSortArray($scope.state.sort, $scope.indexPattern);
-
-  $scope.opts.fetch = $scope.fetch = async function () {
-    $scope.fetchCounter++;
-    $scope.fetchError = undefined;
-    if (!validateTimeRange(timefilter.getTime(), toastNotifications)) {
-      $scope.resultState = 'none';
-    }
-
-    // Abort any in-progress requests before fetching again
-    if (abortController) abortController.abort();
-    abortController = new AbortController();
-
-    const searchSessionId = searchSessionManager.getNextSearchSessionId();
-    updateSearchSourceHelper();
-
-    $scope.opts.chartAggConfigs = applyAggsToSearchSource(
-      getTimeField() && !$scope.state.hideChart,
-      volatileSearchSource,
-      $scope.state.interval,
-      $scope.indexPattern,
-      data
-    );
-
-    $scope.fetchStatus = fetchStatuses.LOADING;
-    $scope.resultState = getResultState($scope.fetchStatus, $scope.rows);
-
-    inspectorAdapters.requests.reset();
-    return $scope.volatileSearchSource
-      .fetch$({
-        abortSignal: abortController.signal,
-        sessionId: searchSessionId,
-        inspector: {
-          adapter: inspectorAdapters.requests,
-          title: i18n.translate('discover.inspectorRequestDataTitle', {
-            defaultMessage: 'data',
-          }),
-          description: i18n.translate('discover.inspectorRequestDescription', {
-            defaultMessage: 'This request queries Elasticsearch to fetch the data for the search.',
-          }),
-        },
-      })
-      .toPromise()
-      .then(({ rawResponse }) => onResults(rawResponse))
-      .catch((error) => {
-        // If the request was aborted then no need to surface this error in the UI
-        if (error instanceof Error && error.name === 'AbortError') return;
-
-        $scope.fetchStatus = fetchStatuses.NO_RESULTS;
-        $scope.fetchError = error;
-        data.search.showError(error);
-      })
-      .finally(() => {
-        $scope.resultState = getResultState($scope.fetchStatus, $scope.rows);
-        $scope.$apply();
-      });
-  };
-
-  function onResults(resp) {
-    if (getTimeField() && !$scope.state.hideChart) {
-      const tabifiedData = tabifyAggResponse($scope.opts.chartAggConfigs, resp);
-      $scope.volatileSearchSource.rawResponse = resp;
-      const dimensions = getDimensions($scope.opts.chartAggConfigs, data);
-      if (dimensions) {
-        $scope.histogramData = discoverResponseHandler(tabifiedData, dimensions);
-      }
-    }
-
-    $scope.hits = resp.hits.total;
-    $scope.rows = resp.hits.hits;
-
-    $scope.fieldCounts = calcFieldCounts(
-      $scope.fieldCounts || {},
-      resp.hits.hits,
-      $scope.indexPattern
-    );
-    $scope.fetchStatus = fetchStatuses.COMPLETE;
-  }
-
-  $scope.refreshAppState = async () => {
-    $scope.hits = [];
-    $scope.rows = [];
-    $scope.fieldCounts = {};
-    await refetch$.next();
-  };
-
-  $scope.resetQuery = function () {
-    history.push(
-      $route.current.params.id ? `/view/${encodeURIComponent($route.current.params.id)}` : '/'
-    );
-    $route.reload();
-  };
-
-  $scope.newQuery = function () {
-    history.push('/');
-  };
-
-  $scope.unmappedFieldsConfig = {
-    showUnmappedFields,
-  };
-
-  // handler emitted by `timefilter.getAutoRefreshFetch$()`
-  // to notify when data completed loading and to start a new autorefresh loop
-  let autoRefreshDoneCb;
-  const fetch$ = merge(
-    refetch$,
-    filterManager.getFetches$(),
-    timefilter.getFetch$(),
-    timefilter.getAutoRefreshFetch$().pipe(
-      tap((done) => {
-        autoRefreshDoneCb = done;
-      }),
-      filter(() => $scope.fetchStatus !== fetchStatuses.LOADING)
-    ),
-    data.query.queryString.getUpdates$(),
-    searchSessionManager.newSearchSessionIdFromURL$
-  ).pipe(debounceTime(100));
-
-  subscriptions.add(
-    subscribeWithScope(
-      $scope,
-      fetch$,
-      {
-        next: async () => {
-          try {
-            await $scope.fetch();
-          } finally {
-            // if there is a saved `autoRefreshDoneCb`, notify auto refresh service that
-            // the last fetch is completed so it starts the next auto refresh loop if needed
-            autoRefreshDoneCb?.();
-            autoRefreshDoneCb = undefined;
-          }
-        },
-      },
-      (error) => addFatalError(core.fatalErrors, error)
-    )
-  );
-
-  // Propagate current app state to url, then start syncing and fetching
-  replaceUrlAppState().then(() => {
-    startStateSync();
-    if (shouldSearchOnPageLoad()) {
-      refetch$.next();
-    }
+    data.search.session.clear();
   });
 }
diff --git a/src/plugins/discover/public/application/angular/discover_datagrid.html b/src/plugins/discover/public/application/angular/discover_datagrid.html
index 42218568a838d..fa1181fd0d6cd 100644
--- a/src/plugins/discover/public/application/angular/discover_datagrid.html
+++ b/src/plugins/discover/public/application/angular/discover_datagrid.html
@@ -1,31 +1,11 @@
 <discover-app>
   <discover
-    fetch="fetch"
-    fetch-counter="fetchCounter"
-    fetch-error="fetchError"
-    field-counts="fieldCounts"
-    histogram-data="histogramData"
-    hits="hits"
+    angularRoute="angularRoute"
     index-pattern="indexPattern"
-    on-add-column="addColumn"
-    on-add-filter="filterQuery"
-    on-change-interval="changeInterval"
-    on-remove-column="removeColumn"
-    on-set-columns="setColumns"
-    on-sort="setSortOrder"
     opts="opts"
     reset-query="resetQuery"
-    result-state="resultState"
-    rows="rows"
     search-source="volatileSearchSource"
     set-index-pattern="setIndexPattern"
-    show-save-query="showSaveQuery"
-    state="state"
-    time-filter-update-handler="timefilterUpdateHandler"
-    time-range="timeRange"
-    top-nav-menu="topNavMenu"
-    update-query="updateQuery"
-    update-saved-query-id="updateSavedQueryId"
   >
   </discover>
 </discover-app>
diff --git a/src/plugins/discover/public/application/angular/discover_legacy.html b/src/plugins/discover/public/application/angular/discover_legacy.html
index fadaffde5c5c3..025a4490faf1f 100644
--- a/src/plugins/discover/public/application/angular/discover_legacy.html
+++ b/src/plugins/discover/public/application/angular/discover_legacy.html
@@ -1,22 +1,7 @@
 <discover-app>
   <discover
-    fetch="fetch"
-    fetch-counter="fetchCounter"
-    fetch-error="fetchError"
-    field-counts="fieldCounts"
-    histogram-data="histogramData"
-    hits="hits"
     index-pattern="indexPattern"
     opts="opts"
-    reset-query="resetQuery"
-    result-state="resultState"
-    rows="rows"
-    search-source="volatileSearchSource"
-    state="state"
-    top-nav-menu="topNavMenu"
-    use-new-fields-api="useNewFieldsApi"
-    unmapped-fields-config="unmappedFieldsConfig"
-    refresh-app-state="refreshAppState"
   >
   </discover>
 </discover-app>
diff --git a/src/plugins/discover/public/application/angular/doc_table/actions/columns.test.ts b/src/plugins/discover/public/application/angular/doc_table/actions/columns.test.ts
index 43044d08f6ac0..e1aa96f4625de 100644
--- a/src/plugins/discover/public/application/angular/doc_table/actions/columns.test.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/actions/columns.test.ts
@@ -11,7 +11,7 @@ import { configMock } from '../../../../__mocks__/config';
 import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { indexPatternsMock } from '../../../../__mocks__/index_patterns';
 import { Capabilities } from '../../../../../../../core/types';
-import { AppState } from '../../discover_state';
+import { AppState } from '../../../apps/main/services/discover_state';
 
 function getStateColumnAction(state: {}, setAppState: (state: Partial<AppState>) => void) {
   return getStateColumnActions({
diff --git a/src/plugins/discover/public/application/angular/doc_table/actions/columns.ts b/src/plugins/discover/public/application/angular/doc_table/actions/columns.ts
index 8028aa6c08634..9ef5d45947afb 100644
--- a/src/plugins/discover/public/application/angular/doc_table/actions/columns.ts
+++ b/src/plugins/discover/public/application/angular/doc_table/actions/columns.ts
@@ -8,7 +8,14 @@
 import { Capabilities, IUiSettingsClient } from 'kibana/public';
 import { popularizeField } from '../../../helpers/popularize_field';
 import { IndexPattern, IndexPatternsContract } from '../../../../kibana_services';
-import { AppState } from '../../discover_state';
+import {
+  AppState as DiscoverState,
+  GetStateReturn as DiscoverGetStateReturn,
+} from '../../../apps/main/services/discover_state';
+import {
+  AppState as ContextState,
+  GetStateReturn as ContextGetStateReturn,
+} from '../../context_state';
 import { SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
 
 /**
@@ -67,8 +74,8 @@ export function getStateColumnActions({
   indexPattern: IndexPattern;
   indexPatterns: IndexPatternsContract;
   useNewFieldsApi: boolean;
-  setAppState: (state: Partial<AppState>) => void;
-  state: AppState;
+  setAppState: DiscoverGetStateReturn['setAppState'] | ContextGetStateReturn['setAppState'];
+  state: DiscoverState | ContextState;
 }) {
   function onAddColumn(columnName: string) {
     if (capabilities.discover.save) {
diff --git a/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js b/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js
index 270f366bddbf2..a087ac8697183 100644
--- a/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js
+++ b/src/plugins/discover/public/application/angular/doc_table/components/row_headers.test.js
@@ -19,7 +19,7 @@ import { setScopedHistory, setServices, setDocViewsRegistry } from '../../../../
 import { coreMock } from '../../../../../../../core/public/mocks';
 import { dataPluginMock } from '../../../../../../data/public/mocks';
 import { navigationPluginMock } from '../../../../../../navigation/public/mocks';
-import { getInnerAngularModule } from '../../../../get_inner_angular';
+import { getInnerAngularModule } from '../../get_inner_angular';
 import { createBrowserHistory } from 'history';
 
 const fakeRowVals = {
diff --git a/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx b/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx
index b8e8bf1fe7d6c..681418c1bd7cf 100644
--- a/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx
+++ b/src/plugins/discover/public/application/angular/doc_table/create_doc_table_react.tsx
@@ -13,17 +13,17 @@ import type { estypes } from '@elastic/elasticsearch';
 import { EuiButtonEmpty } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { getServices, IIndexPattern } from '../../../kibana_services';
-import { IndexPatternField } from '../../../../../data/common/index_patterns';
-import { SkipBottomButton } from '../../components/skip_bottom_button';
+import { IndexPatternField } from '../../../../../data/common';
+import { SkipBottomButton } from '../../apps/main/components/skip_bottom_button';
 
 export interface DocTableLegacyProps {
   columns: string[];
   searchDescription?: string;
   searchTitle?: string;
   onFilter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
-  rows: estypes.Hit[];
+  rows: estypes.SearchHit[];
   indexPattern: IIndexPattern;
-  minimumVisibleRows: number;
+  minimumVisibleRows?: number;
   onAddColumn?: (column: string) => void;
   onBackToTop: () => void;
   onSort?: (sort: string[][]) => void;
@@ -119,11 +119,9 @@ export function DocTableLegacy(renderProps: DocTableLegacyProps) {
   }, [setMinimumVisibleRows, renderProps.rows]);
 
   useEffect(() => {
-    if (minimumVisibleRows > 50) {
-      setMinimumVisibleRows(50);
-    }
+    setMinimumVisibleRows(50);
     setRows(renderProps.rows);
-  }, [renderProps.rows, minimumVisibleRows, setMinimumVisibleRows]);
+  }, [renderProps.rows, setMinimumVisibleRows]);
 
   useEffect(() => {
     if (ref && ref.current && !scope.current) {
@@ -133,7 +131,7 @@ export function DocTableLegacy(renderProps: DocTableLegacyProps) {
       });
     } else if (scope && scope.current) {
       scope.current.renderProps = { ...renderProps, rows, minimumVisibleRows };
-      scope.current.$apply();
+      scope.current.$applyAsync();
     }
   }, [renderProps, minimumVisibleRows, rows]);
 
diff --git a/src/plugins/discover/public/application/angular/doc_table/doc_table.html b/src/plugins/discover/public/application/angular/doc_table/doc_table.html
index 4f297643a28f7..ecd7aa8f3dcf4 100644
--- a/src/plugins/discover/public/application/angular/doc_table/doc_table.html
+++ b/src/plugins/discover/public/application/angular/doc_table/doc_table.html
@@ -95,8 +95,8 @@
         index-pattern="indexPattern"
         filter="filter"
         class="kbnDocTable__row"
-        ng-class="{'kbnDocTable__row--highlight': row['$$_isAnchor']}"
-        data-test-subj="docTableRow{{ row['$$_isAnchor'] ? ' docTableAnchorRow' : ''}}"
+        ng-class="{'kbnDocTable__row--highlight': row['isAnchor']}"
+        data-test-subj="docTableRow{{ row['isAnchor'] ? ' docTableAnchorRow' : ''}}"
         on-add-column="onAddColumn"
         on-remove-column="onRemoveColumn"
         use-new-fields-api="useNewFieldsApi"
diff --git a/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js b/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js
index 1765bae07eed7..1db35ddf18089 100644
--- a/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js
+++ b/src/plugins/discover/public/application/angular/doc_table/doc_table.test.js
@@ -18,7 +18,7 @@ import { coreMock } from '../../../../../../core/public/mocks';
 import { dataPluginMock } from '../../../../../data/public/mocks';
 import { navigationPluginMock } from '../../../../../navigation/public/mocks';
 import { setScopedHistory, setServices } from '../../../kibana_services';
-import { getInnerAngularModule } from '../../../get_inner_angular';
+import { getInnerAngularModule } from '../get_inner_angular';
 
 let $parentScope;
 
diff --git a/src/plugins/discover/public/get_inner_angular.ts b/src/plugins/discover/public/application/angular/get_inner_angular.ts
similarity index 78%
rename from src/plugins/discover/public/get_inner_angular.ts
rename to src/plugins/discover/public/application/angular/get_inner_angular.ts
index c36312a87ce9a..26d64d5adc8a3 100644
--- a/src/plugins/discover/public/get_inner_angular.ts
+++ b/src/plugins/discover/public/application/angular/get_inner_angular.ts
@@ -9,29 +9,29 @@
 // inner angular imports
 // these are necessary to bootstrap the local angular.
 // They can stay even after NP cutover
-import './application/index.scss';
+import '../index.scss';
 import angular from 'angular';
 // required for `ngSanitize` angular module
 import 'angular-sanitize';
 import { EuiIcon } from '@elastic/eui';
 import { i18nDirective, i18nFilter, I18nProvider } from '@kbn/i18n/angular';
 import { CoreStart, PluginInitializerContext } from 'kibana/public';
-import { DataPublicPluginStart } from '../../data/public';
-import { Storage } from '../../kibana_utils/public';
-import { NavigationPublicPluginStart as NavigationStart } from '../../navigation/public';
-import { createDocTableDirective } from './application/angular/doc_table';
-import { createTableHeaderDirective } from './application/angular/doc_table/components/table_header';
+import { DataPublicPluginStart } from '../../../../data/public';
+import { Storage } from '../../../../kibana_utils/public';
+import { NavigationPublicPluginStart as NavigationStart } from '../../../../navigation/public';
+import { createDocTableDirective } from './doc_table';
+import { createTableHeaderDirective } from './doc_table/components/table_header';
 import {
   createToolBarPagerButtonsDirective,
   createToolBarPagerTextDirective,
-} from './application/angular/doc_table/components/pager';
-import { createContextAppLegacy } from './application/components/context_app/context_app_legacy_directive';
-import { createTableRowDirective } from './application/angular/doc_table/components/table_row';
-import { createPagerFactory } from './application/angular/doc_table/lib/pager/pager_factory';
-import { createInfiniteScrollDirective } from './application/angular/doc_table/infinite_scroll';
-import { createDocViewerDirective } from './application/angular/doc_viewer';
-import { createDiscoverGridDirective } from './application/components/create_discover_grid_directive';
-import { createRenderCompleteDirective } from './application/angular/directives/render_complete';
+} from './doc_table/components/pager';
+import { createContextAppLegacy } from '../components/context_app/context_app_legacy_directive';
+import { createTableRowDirective } from './doc_table/components/table_row';
+import { createPagerFactory } from './doc_table/lib/pager/pager_factory';
+import { createInfiniteScrollDirective } from './doc_table/infinite_scroll';
+import { createDocViewerDirective } from './doc_viewer';
+import { createDiscoverGridDirective } from './create_discover_grid_directive';
+import { createRenderCompleteDirective } from './directives/render_complete';
 import {
   initAngularBootstrap,
   configureAppAngularModule,
@@ -39,10 +39,10 @@ import {
   PromiseServiceCreator,
   registerListenEventListener,
   watchMultiDecorator,
-} from '../../kibana_legacy/public';
-import { DiscoverStartPlugins } from './plugin';
-import { getScopedHistory } from './kibana_services';
-import { createDiscoverDirective } from './application/components/create_discover_directive';
+} from '../../../../kibana_legacy/public';
+import { DiscoverStartPlugins } from '../../plugin';
+import { getScopedHistory } from '../../kibana_services';
+import { createDiscoverDirective } from './create_discover_directive';
 
 /**
  * returns the main inner angular module, it contains all the parts of Angular Discover
diff --git a/src/plugins/discover/public/application/angular/helpers/index.ts b/src/plugins/discover/public/application/angular/helpers/index.ts
index 1dd194436cdfb..3d2c0b1c63b33 100644
--- a/src/plugins/discover/public/application/angular/helpers/index.ts
+++ b/src/plugins/discover/public/application/angular/helpers/index.ts
@@ -6,6 +6,5 @@
  * Side Public License, v 1.
  */
 
-export { buildPointSeriesData } from './point_series';
 export { formatRow, formatTopLevelObject } from './row_formatter';
 export { handleSourceColumnState } from './state_helpers';
diff --git a/src/plugins/discover/public/application/angular/index.ts b/src/plugins/discover/public/application/angular/index.ts
index b45357439a1ee..e75add7910b74 100644
--- a/src/plugins/discover/public/application/angular/index.ts
+++ b/src/plugins/discover/public/application/angular/index.ts
@@ -16,4 +16,3 @@ import './doc';
 import './context';
 import './doc_viewer';
 import './redirect';
-import './directives';
diff --git a/src/plugins/discover/public/application/angular/response_handler.js b/src/plugins/discover/public/application/angular/response_handler.js
deleted file mode 100644
index 301fd98f1e34c..0000000000000
--- a/src/plugins/discover/public/application/angular/response_handler.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { getServices } from '../../kibana_services';
-import { buildPointSeriesData } from './helpers';
-
-function tableResponseHandler(table, dimensions) {
-  const converted = { tables: [] };
-  const split = dimensions.splitColumn || dimensions.splitRow;
-
-  if (split) {
-    converted.direction = dimensions.splitRow ? 'row' : 'column';
-    const splitColumnIndex = split[0].accessor;
-    const splitColumnFormatter = getServices().data.fieldFormats.deserialize(split[0].format);
-    const splitColumn = table.columns[splitColumnIndex];
-    const splitMap = {};
-    let splitIndex = 0;
-
-    table.rows.forEach((row, rowIndex) => {
-      const splitValue = row[splitColumn.id];
-
-      if (!splitMap.hasOwnProperty(splitValue)) {
-        splitMap[splitValue] = splitIndex++;
-        const tableGroup = {
-          $parent: converted,
-          title: `${splitColumnFormatter.convert(splitValue)}: ${splitColumn.name}`,
-          name: splitColumn.name,
-          key: splitValue,
-          column: splitColumnIndex,
-          row: rowIndex,
-          table,
-          tables: [],
-        };
-        tableGroup.tables.push({
-          $parent: tableGroup,
-          columns: table.columns,
-          rows: [],
-        });
-
-        converted.tables.push(tableGroup);
-      }
-
-      const tableIndex = splitMap[splitValue];
-      converted.tables[tableIndex].tables[0].rows.push(row);
-    });
-  } else {
-    converted.tables.push({
-      columns: table.columns,
-      rows: table.rows,
-    });
-  }
-
-  return converted;
-}
-
-function convertTableGroup(tableGroup, convertTable) {
-  const tables = tableGroup.tables;
-
-  if (!tables.length) return;
-
-  const firstChild = tables[0];
-  if (firstChild.columns) {
-    const chart = convertTable(firstChild);
-    // if chart is within a split, assign group title to its label
-    if (tableGroup.$parent) {
-      chart.label = tableGroup.title;
-    }
-    return chart;
-  }
-
-  const out = {};
-  let outList;
-
-  tables.forEach(function (table) {
-    if (!outList) {
-      const direction = tableGroup.direction === 'row' ? 'rows' : 'columns';
-      outList = out[direction] = [];
-    }
-
-    let output;
-    if ((output = convertTableGroup(table, convertTable))) {
-      outList.push(output);
-    }
-  });
-
-  return out;
-}
-
-export const discoverResponseHandler = (response, dimensions) => {
-  const tableGroup = tableResponseHandler(response, dimensions);
-
-  let converted = convertTableGroup(tableGroup, (table) => {
-    return buildPointSeriesData(table, dimensions);
-  });
-  if (!converted) {
-    // mimic a row of tables that doesn't have any tables
-    // https://github.com/elastic/kibana/blob/7bfb68cd24ed42b1b257682f93c50cd8d73e2520/src/kibana/components/vislib/components/zero_injection/inject_zeros.js#L32
-    converted = { rows: [] };
-  }
-
-  converted.hits = response.rows.length;
-
-  return converted;
-};
diff --git a/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx b/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
new file mode 100644
index 0000000000000..210313aac5366
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/chart/discover_chart.tsx
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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, { useCallback } from 'react';
+import moment from 'moment';
+import { EuiFlexGroup, EuiFlexItem, EuiButtonEmpty, EuiSpacer } from '@elastic/eui';
+import { IUiSettingsClient } from 'kibana/public';
+import { i18n } from '@kbn/i18n';
+import { HitsCounter } from '../hits_counter';
+import { DataPublicPluginStart, IndexPattern, search } from '../../../../../../../data/public';
+import { TimechartHeader } from '../timechart_header';
+import { SavedSearch } from '../../../../../saved_searches';
+import { AppState, GetStateReturn } from '../../services/discover_state';
+import { TimechartBucketInterval } from '../timechart_header/timechart_header';
+import { Chart as IChart } from './point_series';
+import { DiscoverHistogram } from './histogram';
+
+const TimechartHeaderMemoized = React.memo(TimechartHeader);
+const DiscoverHistogramMemoized = React.memo(DiscoverHistogram);
+export function DiscoverChart({
+  config,
+  data,
+  bucketInterval,
+  chartData,
+  hits,
+  isLegacy,
+  resetQuery,
+  savedSearch,
+  state,
+  stateContainer,
+  timefield,
+}: {
+  config: IUiSettingsClient;
+  data: DataPublicPluginStart;
+  bucketInterval?: TimechartBucketInterval;
+  chartData?: IChart;
+  hits?: number;
+  indexPattern: IndexPattern;
+  isLegacy: boolean;
+  resetQuery: () => void;
+  savedSearch: SavedSearch;
+  state: AppState;
+  stateContainer: GetStateReturn;
+  timefield?: string;
+}) {
+  const toggleHideChart = useCallback(() => {
+    stateContainer.setAppState({ hideChart: !state.hideChart });
+  }, [state, stateContainer]);
+
+  const onChangeInterval = useCallback(
+    (interval: string) => {
+      if (interval) {
+        stateContainer.setAppState({ interval });
+      }
+    },
+    [stateContainer]
+  );
+
+  const timefilterUpdateHandler = useCallback(
+    (ranges: { from: number; to: number }) => {
+      data.query.timefilter.timefilter.setTime({
+        from: moment(ranges.from).toISOString(),
+        to: moment(ranges.to).toISOString(),
+        mode: 'absolute',
+      });
+    },
+    [data]
+  );
+
+  return (
+    <EuiFlexGroup direction="column" alignItems="stretch" gutterSize="none" responsive={false}>
+      <EuiFlexItem grow={false} className="dscResultCount">
+        <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
+          <EuiFlexItem
+            grow={false}
+            className="dscResuntCount__title eui-textTruncate eui-textNoWrap"
+          >
+            <HitsCounter
+              hits={hits}
+              showResetButton={!!(savedSearch && savedSearch.id)}
+              onResetQuery={resetQuery}
+            />
+          </EuiFlexItem>
+          {!state.hideChart && (
+            <EuiFlexItem className="dscResultCount__actions">
+              <TimechartHeaderMemoized
+                data={data}
+                dateFormat={config.get('dateFormat')}
+                options={search.aggs.intervalOptions}
+                onChangeInterval={onChangeInterval}
+                stateInterval={state.interval || ''}
+                bucketInterval={bucketInterval}
+              />
+            </EuiFlexItem>
+          )}
+          {timefield && (
+            <EuiFlexItem className="dscResultCount__toggle" grow={false}>
+              <EuiButtonEmpty
+                size="xs"
+                iconType={!state.hideChart ? 'eyeClosed' : 'eye'}
+                onClick={() => {
+                  toggleHideChart();
+                }}
+                data-test-subj="discoverChartToggle"
+              >
+                {!state.hideChart
+                  ? i18n.translate('discover.hideChart', {
+                      defaultMessage: 'Hide chart',
+                    })
+                  : i18n.translate('discover.showChart', {
+                      defaultMessage: 'Show chart',
+                    })}
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+          )}
+        </EuiFlexGroup>
+      </EuiFlexItem>
+      {!state.hideChart && chartData && (
+        <EuiFlexItem grow={false}>
+          <section
+            aria-label={i18n.translate('discover.histogramOfFoundDocumentsAriaLabel', {
+              defaultMessage: 'Histogram of found documents',
+            })}
+            className="dscTimechart"
+          >
+            <div
+              className={isLegacy ? 'dscHistogram' : 'dscHistogramGrid'}
+              data-test-subj="discoverChart"
+            >
+              <DiscoverHistogramMemoized
+                chartData={chartData}
+                timefilterUpdateHandler={timefilterUpdateHandler}
+              />
+            </div>
+          </section>
+          <EuiSpacer size="s" />
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  );
+}
diff --git a/src/plugins/discover/public/application/angular/directives/histogram.tsx b/src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx
similarity index 97%
rename from src/plugins/discover/public/application/angular/directives/histogram.tsx
rename to src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx
index 616a0692dbba4..92b212d5739b5 100644
--- a/src/plugins/discover/public/application/angular/directives/histogram.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/chart/histogram.tsx
@@ -27,14 +27,14 @@ import {
 import { IUiSettingsClient } from 'kibana/public';
 import { EuiChartThemeType } from '@elastic/eui/dist/eui_charts_theme';
 import { Subscription, combineLatest } from 'rxjs';
-import { getServices } from '../../../kibana_services';
-import { Chart as IChart } from '../helpers/point_series';
+import { getServices } from '../../../../../kibana_services';
+import { Chart as IChart } from './point_series';
 import {
   CurrentTime,
   Endzones,
   getAdjustedInterval,
   renderEndzoneTooltip,
-} from '../../../../../charts/public';
+} from '../../../../../../../charts/public';
 
 export interface DiscoverHistogramProps {
   chartData: IChart;
diff --git a/src/plugins/discover/public/application/apps/main/components/chart/index.ts b/src/plugins/discover/public/application/apps/main/components/chart/index.ts
new file mode 100644
index 0000000000000..d5d5a85d1d0f2
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/chart/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 { DiscoverChart } from './discover_chart';
diff --git a/src/plugins/discover/public/application/angular/helpers/point_series.ts b/src/plugins/discover/public/application/apps/main/components/chart/point_series.ts
similarity index 90%
rename from src/plugins/discover/public/application/angular/helpers/point_series.ts
rename to src/plugins/discover/public/application/apps/main/components/chart/point_series.ts
index dae70d9b8e55b..1245b712e6fd7 100644
--- a/src/plugins/discover/public/application/angular/helpers/point_series.ts
+++ b/src/plugins/discover/public/application/apps/main/components/chart/point_series.ts
@@ -9,8 +9,7 @@
 import { uniq } from 'lodash';
 import { Duration, Moment } from 'moment';
 import { Unit } from '@elastic/datemath';
-
-import { SerializedFieldFormat } from '../../../../../expressions/common/types';
+import { SerializedFieldFormat } from '../../../../../../../expressions/common';
 
 export interface Column {
   id: string;
@@ -26,20 +25,23 @@ export interface Table {
   rows: Row[];
 }
 
+export interface HistogramParamsBounds {
+  min: Moment;
+  max: Moment;
+}
+
 interface HistogramParams {
   date: true;
   interval: Duration;
   intervalESValue: number;
   intervalESUnit: Unit;
   format: string;
-  bounds: {
-    min: Moment;
-    max: Moment;
-  };
+  bounds: HistogramParamsBounds;
 }
 export interface Dimension {
   accessor: 0 | 1;
   format: SerializedFieldFormat<{ pattern: string }>;
+  label: string;
 }
 
 export interface Dimensions {
@@ -68,7 +70,7 @@ export interface Chart {
   ordered: Ordered;
 }
 
-export const buildPointSeriesData = (table: Table, dimensions: Dimensions) => {
+export const buildPointSeriesData = (table: Table, dimensions: Dimensions): Chart => {
   const { x, y } = dimensions;
   const xAccessor = table.columns[x.accessor].id;
   const yAccessor = table.columns[y.accessor].id;
diff --git a/src/plugins/discover/public/application/components/hits_counter/hits_counter.scss b/src/plugins/discover/public/application/apps/main/components/hits_counter/hits_counter.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/hits_counter/hits_counter.scss
rename to src/plugins/discover/public/application/apps/main/components/hits_counter/hits_counter.scss
diff --git a/src/plugins/discover/public/application/components/hits_counter/hits_counter.test.tsx b/src/plugins/discover/public/application/apps/main/components/hits_counter/hits_counter.test.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/hits_counter/hits_counter.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/hits_counter/hits_counter.test.tsx
diff --git a/src/plugins/discover/public/application/components/hits_counter/hits_counter.tsx b/src/plugins/discover/public/application/apps/main/components/hits_counter/hits_counter.tsx
similarity index 94%
rename from src/plugins/discover/public/application/components/hits_counter/hits_counter.tsx
rename to src/plugins/discover/public/application/apps/main/components/hits_counter/hits_counter.tsx
index 6ce6129f56b5e..0850a8ff03d96 100644
--- a/src/plugins/discover/public/application/components/hits_counter/hits_counter.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/hits_counter/hits_counter.tsx
@@ -12,13 +12,13 @@ import React from 'react';
 import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
-import { formatNumWithCommas } from '../../helpers';
+import { formatNumWithCommas } from '../../../../helpers';
 
 export interface HitsCounterProps {
   /**
    * the number of query hits
    */
-  hits: number;
+  hits?: number;
   /**
    * displays the reset button
    */
@@ -30,6 +30,9 @@ export interface HitsCounterProps {
 }
 
 export function HitsCounter({ hits, showResetButton, onResetQuery }: HitsCounterProps) {
+  if (typeof hits === 'undefined') {
+    return null;
+  }
   return (
     <I18nProvider>
       <EuiFlexGroup
diff --git a/src/plugins/discover/public/application/components/hits_counter/index.ts b/src/plugins/discover/public/application/apps/main/components/hits_counter/index.ts
similarity index 100%
rename from src/plugins/discover/public/application/components/hits_counter/index.ts
rename to src/plugins/discover/public/application/apps/main/components/hits_counter/index.ts
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.scss b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.scss
new file mode 100644
index 0000000000000..8ca11e9e044e8
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.scss
@@ -0,0 +1,105 @@
+@import 'src/core/public/mixins';
+
+discover-app {
+  flex-grow: 1;
+}
+
+.dscPage {
+  @include euiBreakpoint('m', 'l', 'xl') {
+    @include kibanaFullBodyHeight();
+  }
+
+  flex-direction: column;
+  overflow: hidden;
+  padding: 0;
+
+  .dscPageBody {
+    overflow: hidden;
+  }
+}
+
+.dscPageBody__inner {
+  overflow: hidden;
+  height: 100%;
+}
+
+.dscPageBody__contents {
+  overflow: hidden;
+  padding-top: $euiSizeXS / 2; // A little breathing room for the index pattern button
+}
+
+.dscPageContent__wrapper {
+  padding: 0 $euiSize $euiSize 0;
+  overflow: hidden; // Ensures horizontal scroll of table
+
+  @include euiBreakpoint('xs', 's') {
+    padding: 0 $euiSize $euiSize;
+  }
+}
+
+.dscPageContent {
+  border: $euiBorderThin;
+}
+
+.dscPageContent,
+.dscPageContent__inner {
+  height: 100%;
+}
+
+.dscPageContent--centered {
+  height: auto;
+}
+
+.dscResultCount {
+  padding: $euiSizeS;
+  min-height: $euiSize * 3;
+
+  @include euiBreakpoint('xs', 's') {
+    .dscResultCount__toggle {
+      align-items: flex-end;
+    }
+
+    .dscResuntCount__title,
+    .dscResultCount__actions {
+      margin-bottom: 0 !important;
+    }
+  }
+}
+
+.dscTimechart {
+  display: block;
+  position: relative;
+
+  // SASSTODO: the visualizing component should have an option or a modifier
+  .series > rect {
+    fill-opacity: .5;
+    stroke-width: 1;
+  }
+}
+
+.dscHistogram {
+  display: flex;
+  height: $euiSize * 12.5;
+  padding: $euiSizeS;
+}
+
+// new slimmer layout for data grid
+.dscHistogramGrid {
+  display: flex;
+  height: $euiSize * 8;
+  padding: $euiSizeS $euiSizeS 0 $euiSizeS;
+}
+
+.dscTable {
+  // SASSTODO: add a monospace modifier to the doc-table component
+  .kbnDocTable__row {
+    font-family: $euiCodeFontFamily;
+    font-size: $euiFontSizeXS;
+  }
+}
+
+.dscTable__footer {
+  background-color: $euiColorLightShade;
+  padding: $euiSizeXS $euiSizeS;
+  text-align: center;
+}
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.test.tsx b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.test.tsx
new file mode 100644
index 0000000000000..2fd394d98281b
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.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 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 { Subject, BehaviorSubject } from 'rxjs';
+import { mountWithIntl } from '@kbn/test/jest';
+import { setHeaderActionMenuMounter } from '../../../../../kibana_services';
+import { DiscoverLayout } 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 { IndexPattern, IndexPatternAttributes } from '../../../../../../../data/common';
+import { SavedObject } from '../../../../../../../../core/types';
+import { indexPatternWithTimefieldMock } from '../../../../../__mocks__/index_pattern_with_timefield';
+import { DiscoverSearchSessionManager } from '../../services/discover_search_session';
+import { GetStateReturn } from '../../services/discover_state';
+import { DiscoverLayoutProps } from './types';
+import { SavedSearchDataSubject } from '../../services/use_saved_search';
+import { discoverServiceMock } from '../../../../../__mocks__/services';
+import { FetchStatus } from '../../../../types';
+
+setHeaderActionMenuMounter(jest.fn());
+
+function getProps(indexPattern: IndexPattern): DiscoverLayoutProps {
+  const searchSourceMock = createSearchSourceMock({});
+  const services = discoverServiceMock;
+  services.data.query.timefilter.timefilter.getTime = () => {
+    return { from: '2020-05-14T11:05:13.590', to: '2020-05-14T11:20:13.590' };
+  };
+
+  const indexPatternList = ([indexPattern].map((ip) => {
+    return { ...ip, ...{ attributes: { title: ip.title } } };
+  }) as unknown) as Array<SavedObject<IndexPatternAttributes>>;
+
+  const savedSearch$ = new BehaviorSubject({
+    state: FetchStatus.COMPLETE,
+    rows: esHits,
+    fetchCounter: 1,
+    fieldCounts: {},
+    hits: Number(esHits.length),
+  }) as SavedSearchDataSubject;
+
+  return {
+    indexPattern,
+    indexPatternList,
+    navigateTo: jest.fn(),
+    resetQuery: jest.fn(),
+    savedSearch: savedSearchMock,
+    savedSearchData$: savedSearch$,
+    savedSearchRefetch$: new Subject(),
+    searchSessionManager: {} as DiscoverSearchSessionManager,
+    searchSource: searchSourceMock,
+    services,
+    state: { columns: [] },
+    stateContainer: {} as GetStateReturn,
+  };
+}
+
+describe('Discover component', () => {
+  test('selected index pattern without time field displays no chart toggle', () => {
+    const component = mountWithIntl(<DiscoverLayout {...getProps(indexPatternMock)} />);
+    expect(component.find('[data-test-subj="discoverChartToggle"]').exists()).toBeFalsy();
+  });
+  test('selected index pattern with time field displays chart toggle', () => {
+    const component = mountWithIntl(
+      <DiscoverLayout {...getProps(indexPatternWithTimefieldMock)} />
+    );
+    expect(component.find('[data-test-subj="discoverChartToggle"]').exists()).toBeTruthy();
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
new file mode 100644
index 0000000000000..0430614d413b6
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/layout/discover_layout.tsx
@@ -0,0 +1,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.
+ */
+import './discover_layout.scss';
+import React, { useState, useRef, useMemo, useCallback, useEffect } from 'react';
+import {
+  EuiSpacer,
+  EuiButtonIcon,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiHideFor,
+  EuiHorizontalRule,
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { METRIC_TYPE } from '@kbn/analytics';
+import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
+import classNames from 'classnames';
+import { DiscoverNoResults } from '../no_results';
+import { LoadingSpinner } from '../loading_spinner/loading_spinner';
+import { DocTableLegacy } from '../../../../angular/doc_table/create_doc_table_react';
+import {
+  esFilters,
+  IndexPatternField,
+  indexPatterns as indexPatternsUtils,
+} from '../../../../../../../data/public';
+import { DiscoverSidebarResponsive } from '../sidebar';
+import { DiscoverLayoutProps } from './types';
+import { SortPairArr } from '../../../../angular/doc_table/lib/get_sort';
+import {
+  DOC_HIDE_TIME_COLUMN_SETTING,
+  DOC_TABLE_LEGACY,
+  MODIFY_COLUMNS_ON_SWITCH,
+  SAMPLE_SIZE_SETTING,
+  SEARCH_FIELDS_FROM_SOURCE,
+  SORT_DEFAULT_ORDER_SETTING,
+} from '../../../../../../common';
+import { popularizeField } from '../../../../helpers/popularize_field';
+import { DocViewFilterFn } from '../../../../doc_views/doc_views_types';
+import { DiscoverGrid } from '../../../../components/discover_grid/discover_grid';
+import { DiscoverTopNav } from '../top_nav/discover_topnav';
+import { ElasticSearchHit } from '../../../../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 { SavedSearchDataMessage } from '../../services/use_saved_search';
+import { useDataGridColumns } from '../../../../helpers/use_data_grid_columns';
+import { getSwitchIndexPatternAppState } from '../../utils/get_switch_index_pattern_app_state';
+import { FetchStatus } from '../../../../types';
+
+const DocTableLegacyMemoized = React.memo(DocTableLegacy);
+const SidebarMemoized = React.memo(DiscoverSidebarResponsive);
+const DataGridMemoized = React.memo(DiscoverGrid);
+const TopNavMemoized = React.memo(DiscoverTopNav);
+const DiscoverChartMemoized = React.memo(DiscoverChart);
+
+interface DiscoverLayoutFetchState extends SavedSearchDataMessage {
+  state: FetchStatus;
+  fetchCounter: number;
+  fieldCounts: Record<string, number>;
+  rows: ElasticSearchHit[];
+}
+
+export function DiscoverLayout({
+  indexPattern,
+  indexPatternList,
+  navigateTo,
+  savedSearchRefetch$,
+  resetQuery,
+  savedSearchData$,
+  savedSearch,
+  searchSessionManager,
+  searchSource,
+  services,
+  state,
+  stateContainer,
+}: DiscoverLayoutProps) {
+  const {
+    trackUiMetric,
+    capabilities,
+    indexPatterns,
+    data,
+    uiSettings: config,
+    filterManager,
+  } = services;
+
+  const sampleSize = useMemo(() => config.get(SAMPLE_SIZE_SETTING), [config]);
+  const [expandedDoc, setExpandedDoc] = useState<ElasticSearchHit | undefined>(undefined);
+  const [inspectorSession, setInspectorSession] = useState<InspectorSession | undefined>(undefined);
+  const scrollableDesktop = useRef<HTMLDivElement>(null);
+  const collapseIcon = useRef<HTMLButtonElement>(null);
+
+  const [fetchState, setFetchState] = useState<DiscoverLayoutFetchState>({
+    state: savedSearchData$.getValue().state,
+    fetchCounter: 0,
+    fieldCounts: {},
+    rows: [],
+  });
+  const { state: fetchStatus, fetchCounter, inspectorAdapters, rows } = fetchState;
+
+  useEffect(() => {
+    const subscription = savedSearchData$.subscribe((next) => {
+      if (
+        (next.state && next.state !== fetchState.state) ||
+        (next.fetchCounter && next.fetchCounter !== fetchState.fetchCounter) ||
+        (next.rows && next.rows !== fetchState.rows) ||
+        (next.chartData && next.chartData !== fetchState.chartData)
+      ) {
+        setFetchState({ ...fetchState, ...next });
+      }
+    });
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [savedSearchData$, fetchState]);
+
+  const isMobile = () => {
+    // collapse icon isn't displayed in mobile view, use it to detect which view is displayed
+    return collapseIcon && !collapseIcon.current;
+  };
+  const timeField = useMemo(() => {
+    return indexPatternsUtils.isDefault(indexPattern) ? indexPattern.timeFieldName : undefined;
+  }, [indexPattern]);
+
+  const [isSidebarClosed, setIsSidebarClosed] = useState(false);
+  const isLegacy = useMemo(() => services.uiSettings.get(DOC_TABLE_LEGACY), [services]);
+  const useNewFieldsApi = useMemo(() => !services.uiSettings.get(SEARCH_FIELDS_FROM_SOURCE), [
+    services,
+  ]);
+
+  const unmappedFieldsConfig = useMemo(
+    () => ({
+      showUnmappedFields: useNewFieldsApi,
+    }),
+    [useNewFieldsApi]
+  );
+
+  const resultState = useMemo(() => getResultState(fetchStatus, rows!), [fetchStatus, rows]);
+
+  const updateQuery = useCallback(
+    (_payload, isUpdate?: boolean) => {
+      if (isUpdate === false) {
+        searchSessionManager.removeSearchSessionIdFromURL({ replace: false });
+        savedSearchRefetch$.next();
+      }
+    },
+    [savedSearchRefetch$, searchSessionManager]
+  );
+
+  const { columns, onAddColumn, onRemoveColumn, onMoveColumn, onSetColumns } = useDataGridColumns({
+    capabilities,
+    config,
+    indexPattern,
+    indexPatterns,
+    setAppState: stateContainer.setAppState,
+    state,
+    useNewFieldsApi,
+  });
+
+  const onOpenInspector = useCallback(() => {
+    // prevent overlapping
+    if (inspectorAdapters) {
+      setExpandedDoc(undefined);
+      const session = services.inspector.open(inspectorAdapters, {
+        title: savedSearch.title,
+      });
+      setInspectorSession(session);
+    }
+  }, [setExpandedDoc, inspectorAdapters, savedSearch, services.inspector]);
+
+  useEffect(() => {
+    return () => {
+      if (inspectorSession) {
+        // Close the inspector if this scope is destroyed (e.g. because the user navigates away).
+        inspectorSession.close();
+      }
+    };
+  }, [inspectorSession]);
+
+  const onSort = useCallback(
+    (sort: string[][]) => {
+      stateContainer.setAppState({ sort });
+    },
+    [stateContainer]
+  );
+
+  const onAddFilter = useCallback(
+    (field: IndexPatternField | string, values: string, operation: '+' | '-') => {
+      const fieldName = typeof field === 'string' ? field : field.name;
+      popularizeField(indexPattern, fieldName, indexPatterns);
+      const newFilters = esFilters.generateFilters(
+        filterManager,
+        field,
+        values,
+        operation,
+        String(indexPattern.id)
+      );
+      if (trackUiMetric) {
+        trackUiMetric(METRIC_TYPE.CLICK, 'filter_added');
+      }
+      return filterManager.addFilters(newFilters);
+    },
+    [filterManager, indexPattern, indexPatterns, trackUiMetric]
+  );
+  /**
+   * Legacy function, remove once legacy grid is removed
+   */
+  const onBackToTop = useCallback(() => {
+    if (scrollableDesktop && scrollableDesktop.current) {
+      scrollableDesktop.current.focus();
+    }
+    // Only the desktop one needs to target a specific container
+    if (!isMobile() && scrollableDesktop.current) {
+      scrollableDesktop.current.scrollTo(0, 0);
+    } else if (window) {
+      window.scrollTo(0, 0);
+    }
+  }, [scrollableDesktop]);
+
+  const onResize = useCallback(
+    (colSettings: { columnId: string; width: number }) => {
+      const grid = { ...state.grid } || {};
+      const newColumns = { ...grid.columns } || {};
+      newColumns[colSettings.columnId] = {
+        width: colSettings.width,
+      };
+      const newGrid = { ...grid, columns: newColumns };
+      stateContainer.setAppState({ grid: newGrid });
+    },
+    [stateContainer, state]
+  );
+
+  const onEditRuntimeField = useCallback(() => {
+    savedSearchRefetch$.next('reset');
+  }, [savedSearchRefetch$]);
+
+  const contentCentered = resultState === 'uninitialized';
+  const showTimeCol = useMemo(
+    () => !config.get(DOC_HIDE_TIME_COLUMN_SETTING, false) && !!indexPattern.timeFieldName,
+    [config, indexPattern.timeFieldName]
+  );
+
+  const onChangeIndexPattern = useCallback(
+    async (id: string) => {
+      const nextIndexPattern = await indexPatterns.get(id);
+      if (nextIndexPattern && indexPattern) {
+        /**
+         *  Without resetting the fetch state, e.g. a time column would be displayed when switching
+         *  from a index pattern without to a index pattern with time filter for a brief moment
+         *  That's because appState is updated before savedSearchData$
+         *  The following line of code catches this, but should be improved
+         */
+        savedSearchData$.next({ rows: [], state: FetchStatus.LOADING, fieldCounts: {} });
+
+        const nextAppState = getSwitchIndexPatternAppState(
+          indexPattern,
+          nextIndexPattern,
+          state.columns || [],
+          (state.sort || []) as SortPairArr[],
+          config.get(MODIFY_COLUMNS_ON_SWITCH),
+          config.get(SORT_DEFAULT_ORDER_SETTING)
+        );
+        stateContainer.setAppState(nextAppState);
+      }
+    },
+    [
+      config,
+      indexPattern,
+      indexPatterns,
+      savedSearchData$,
+      state.columns,
+      state.sort,
+      stateContainer,
+    ]
+  );
+
+  return (
+    <I18nProvider>
+      <EuiPage className="dscPage" data-fetch-counter={fetchCounter}>
+        <TopNavMemoized
+          indexPattern={indexPattern}
+          onOpenInspector={onOpenInspector}
+          query={state.query}
+          navigateTo={navigateTo}
+          savedQuery={state.savedQuery}
+          savedSearch={savedSearch}
+          searchSource={searchSource}
+          services={services}
+          stateContainer={stateContainer}
+          updateQuery={updateQuery}
+        />
+        <EuiPageBody className="dscPageBody" aria-describedby="savedSearchTitle">
+          <h1 id="savedSearchTitle" className="euiScreenReaderOnly">
+            {savedSearch.title}
+          </h1>
+          <EuiFlexGroup className="dscPageBody__contents" gutterSize="none">
+            <EuiFlexItem grow={false}>
+              <SidebarMemoized
+                columns={columns}
+                fieldCounts={fetchState.fieldCounts}
+                hits={rows}
+                indexPatternList={indexPatternList}
+                onAddField={onAddColumn}
+                onAddFilter={onAddFilter}
+                onRemoveField={onRemoveColumn}
+                onChangeIndexPattern={onChangeIndexPattern}
+                selectedIndexPattern={indexPattern}
+                services={services}
+                state={state}
+                isClosed={isSidebarClosed}
+                trackUiMetric={trackUiMetric}
+                unmappedFieldsConfig={unmappedFieldsConfig}
+                useNewFieldsApi={useNewFieldsApi}
+                onEditRuntimeField={onEditRuntimeField}
+              />
+            </EuiFlexItem>
+            <EuiHideFor sizes={['xs', 's']}>
+              <EuiFlexItem grow={false}>
+                <div>
+                  <EuiSpacer size="s" />
+                  <EuiButtonIcon
+                    iconType={isSidebarClosed ? 'menuRight' : 'menuLeft'}
+                    iconSize="m"
+                    size="xs"
+                    onClick={() => setIsSidebarClosed(!isSidebarClosed)}
+                    data-test-subj="collapseSideBarButton"
+                    aria-controls="discover-sidebar"
+                    aria-expanded={isSidebarClosed ? 'false' : 'true'}
+                    aria-label={i18n.translate('discover.toggleSidebarAriaLabel', {
+                      defaultMessage: 'Toggle sidebar',
+                    })}
+                    buttonRef={collapseIcon}
+                  />
+                </div>
+              </EuiFlexItem>
+            </EuiHideFor>
+            <EuiFlexItem className="dscPageContent__wrapper">
+              <EuiPageContent
+                verticalPosition={contentCentered ? 'center' : undefined}
+                horizontalPosition={contentCentered ? 'center' : undefined}
+                paddingSize="none"
+                hasShadow={false}
+                className={classNames('dscPageContent', {
+                  'dscPageContent--centered': contentCentered,
+                })}
+              >
+                {resultState === 'none' && (
+                  <DiscoverNoResults
+                    timeFieldName={timeField}
+                    queryLanguage={state.query?.language ?? ''}
+                    data={data}
+                    error={fetchState.fetchError}
+                  />
+                )}
+                {resultState === 'uninitialized' && (
+                  <DiscoverUninitialized onRefresh={() => savedSearchRefetch$.next()} />
+                )}
+                {resultState === 'loading' && <LoadingSpinner />}
+                {resultState === 'ready' && (
+                  <EuiFlexGroup
+                    className="dscPageContent__inner"
+                    direction="column"
+                    alignItems="stretch"
+                    gutterSize="none"
+                    responsive={false}
+                  >
+                    <EuiFlexItem grow={false}>
+                      <DiscoverChartMemoized
+                        config={config}
+                        chartData={fetchState.chartData}
+                        bucketInterval={fetchState.bucketInterval}
+                        data={data}
+                        hits={fetchState.hits}
+                        indexPattern={indexPattern}
+                        isLegacy={isLegacy}
+                        state={state}
+                        resetQuery={resetQuery}
+                        savedSearch={savedSearch}
+                        stateContainer={stateContainer}
+                        timefield={timeField}
+                      />
+                    </EuiFlexItem>
+                    <EuiHorizontalRule margin="none" />
+
+                    <EuiFlexItem className="eui-yScroll">
+                      <section
+                        className="dscTable eui-yScroll eui-xScroll"
+                        aria-labelledby="documentsAriaLabel"
+                        ref={scrollableDesktop}
+                        tabIndex={-1}
+                      >
+                        <h2 className="euiScreenReaderOnly" id="documentsAriaLabel">
+                          <FormattedMessage
+                            id="discover.documentsAriaLabel"
+                            defaultMessage="Documents"
+                          />
+                        </h2>
+                        {isLegacy && rows && rows.length && (
+                          <DocTableLegacyMemoized
+                            columns={columns}
+                            indexPattern={indexPattern}
+                            rows={rows}
+                            sort={state.sort || []}
+                            searchDescription={savedSearch.description}
+                            searchTitle={savedSearch.lastSavedTitle}
+                            onAddColumn={onAddColumn}
+                            onBackToTop={onBackToTop}
+                            onFilter={onAddFilter}
+                            onMoveColumn={onMoveColumn}
+                            onRemoveColumn={onRemoveColumn}
+                            onSort={onSort}
+                            sampleSize={sampleSize}
+                            useNewFieldsApi={useNewFieldsApi}
+                          />
+                        )}
+                        {!isLegacy && rows && rows.length && (
+                          <div className="dscDiscoverGrid">
+                            <DataGridMemoized
+                              ariaLabelledBy="documentsAriaLabel"
+                              columns={columns}
+                              expandedDoc={expandedDoc}
+                              indexPattern={indexPattern}
+                              isLoading={fetchStatus === 'loading'}
+                              rows={rows}
+                              sort={(state.sort as SortPairArr[]) || []}
+                              sampleSize={sampleSize}
+                              searchDescription={savedSearch.description}
+                              searchTitle={savedSearch.lastSavedTitle}
+                              setExpandedDoc={setExpandedDoc}
+                              showTimeCol={showTimeCol}
+                              services={services}
+                              settings={state.grid}
+                              onAddColumn={onAddColumn}
+                              onFilter={onAddFilter as DocViewFilterFn}
+                              onRemoveColumn={onRemoveColumn}
+                              onSetColumns={onSetColumns}
+                              onSort={onSort}
+                              onResize={onResize}
+                              useNewFieldsApi={useNewFieldsApi}
+                            />
+                          </div>
+                        )}
+                      </section>
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                )}
+              </EuiPageContent>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiPageBody>
+      </EuiPage>
+    </I18nProvider>
+  );
+}
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/index.ts b/src/plugins/discover/public/application/apps/main/components/layout/index.ts
new file mode 100644
index 0000000000000..592e893cf8ba8
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/layout/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 { DiscoverLayout } from './discover_layout';
diff --git a/src/plugins/discover/public/application/apps/main/components/layout/types.ts b/src/plugins/discover/public/application/apps/main/components/layout/types.ts
new file mode 100644
index 0000000000000..d8d6338fbe41a
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/layout/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 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 {
+  IndexPattern,
+  IndexPatternAttributes,
+  SavedObject,
+} from '../../../../../../../data/common';
+import { ISearchSource } from '../../../../../../../data/public';
+import { DiscoverSearchSessionManager } from '../../services/discover_search_session';
+import { AppState, GetStateReturn } from '../../services/discover_state';
+import { SavedSearchRefetchSubject, SavedSearchDataSubject } from '../../services/use_saved_search';
+import { DiscoverServices } from '../../../../../build_services';
+import { SavedSearch } from '../../../../../saved_searches';
+
+export interface DiscoverLayoutProps {
+  indexPattern: IndexPattern;
+  indexPatternList: Array<SavedObject<IndexPatternAttributes>>;
+  resetQuery: () => void;
+  navigateTo: (url: string) => void;
+  savedSearch: SavedSearch;
+  savedSearchData$: SavedSearchDataSubject;
+  savedSearchRefetch$: SavedSearchRefetchSubject;
+  searchSessionManager: DiscoverSearchSessionManager;
+  searchSource: ISearchSource;
+  services: DiscoverServices;
+  state: AppState;
+  stateContainer: GetStateReturn;
+}
diff --git a/src/plugins/discover/public/application/components/loading_spinner/loading_spinner.scss b/src/plugins/discover/public/application/apps/main/components/loading_spinner/loading_spinner.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/loading_spinner/loading_spinner.scss
rename to src/plugins/discover/public/application/apps/main/components/loading_spinner/loading_spinner.scss
diff --git a/src/plugins/discover/public/application/components/loading_spinner/loading_spinner.test.tsx b/src/plugins/discover/public/application/apps/main/components/loading_spinner/loading_spinner.test.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/loading_spinner/loading_spinner.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/loading_spinner/loading_spinner.test.tsx
diff --git a/src/plugins/discover/public/application/components/loading_spinner/loading_spinner.tsx b/src/plugins/discover/public/application/apps/main/components/loading_spinner/loading_spinner.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/loading_spinner/loading_spinner.tsx
rename to src/plugins/discover/public/application/apps/main/components/loading_spinner/loading_spinner.tsx
diff --git a/src/plugins/discover/public/application/components/no_results/_no_results.scss b/src/plugins/discover/public/application/apps/main/components/no_results/_no_results.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/no_results/_no_results.scss
rename to src/plugins/discover/public/application/apps/main/components/no_results/_no_results.scss
diff --git a/src/plugins/discover/public/application/components/no_results/index.ts b/src/plugins/discover/public/application/apps/main/components/no_results/index.ts
similarity index 100%
rename from src/plugins/discover/public/application/components/no_results/index.ts
rename to src/plugins/discover/public/application/apps/main/components/no_results/index.ts
diff --git a/src/plugins/discover/public/application/components/no_results/no_results.test.tsx b/src/plugins/discover/public/application/apps/main/components/no_results/no_results.test.tsx
similarity index 98%
rename from src/plugins/discover/public/application/components/no_results/no_results.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/no_results/no_results.test.tsx
index 9a115fb5a66b6..e7af82cf9504c 100644
--- a/src/plugins/discover/public/application/components/no_results/no_results.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/no_results/no_results.test.tsx
@@ -12,7 +12,7 @@ import { findTestSubject } from '@elastic/eui/lib/test';
 
 import { DiscoverNoResults, DiscoverNoResultsProps } from './no_results';
 
-jest.mock('../../../kibana_services', () => {
+jest.mock('../../../../../kibana_services', () => {
   return {
     getServices: () => ({
       docLinks: {
diff --git a/src/plugins/discover/public/application/components/no_results/no_results.tsx b/src/plugins/discover/public/application/apps/main/components/no_results/no_results.tsx
similarity index 94%
rename from src/plugins/discover/public/application/components/no_results/no_results.tsx
rename to src/plugins/discover/public/application/apps/main/components/no_results/no_results.tsx
index c23de80ec9937..07deb45d1fda2 100644
--- a/src/plugins/discover/public/application/components/no_results/no_results.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/no_results/no_results.tsx
@@ -9,8 +9,8 @@
 import React, { Fragment } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton, EuiCallOut, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { getServices } from '../../../kibana_services';
-import { DataPublicPluginStart } from '../../../../../data/public';
+import { getServices } from '../../../../../kibana_services';
+import { DataPublicPluginStart } from '../../../../../../../data/public';
 import { getLuceneQueryMessage, getTimeFieldMessage } from './no_results_helper';
 import './_no_results.scss';
 
diff --git a/src/plugins/discover/public/application/components/no_results/no_results_helper.tsx b/src/plugins/discover/public/application/apps/main/components/no_results/no_results_helper.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/no_results/no_results_helper.tsx
rename to src/plugins/discover/public/application/apps/main/components/no_results/no_results_helper.tsx
diff --git a/src/plugins/discover/public/application/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap b/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap
rename to src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_field_details_footer.test.tsx.snap
diff --git a/src/plugins/discover/public/application/components/sidebar/__snapshots__/discover_index_pattern.test.tsx.snap b/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern.test.tsx.snap
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/__snapshots__/discover_index_pattern.test.tsx.snap
rename to src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern.test.tsx.snap
diff --git a/src/plugins/discover/public/application/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap b/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
similarity index 99%
rename from src/plugins/discover/public/application/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
rename to src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
index f94a73ae05a55..913ecda69f663 100644
--- a/src/plugins/discover/public/application/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/__snapshots__/discover_index_pattern_management.test.tsx.snap
@@ -697,12 +697,14 @@ exports[`Discover IndexPattern Management renders correctly 1`] = `
             <EuiIcon
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               size="m"
               type="boxesHorizontal"
             >
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="boxesHorizontal"
                 size="m"
               />
diff --git a/src/plugins/discover/public/application/components/sidebar/change_indexpattern.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/change_indexpattern.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/change_indexpattern.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/change_indexpattern.tsx
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.scss b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/discover_field.scss
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.scss
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.test.tsx
similarity index 91%
rename from src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.test.tsx
index 2041a8dfdc637..82e37dd2b427c 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.test.tsx
@@ -8,15 +8,16 @@
 
 import React from 'react';
 import { findTestSubject } from '@elastic/eui/lib/test';
-// @ts-expect-error
-import stubbedLogstashFields from '../../../__fixtures__/logstash_fields';
 import { mountWithIntl } from '@kbn/test/jest';
+
+// @ts-expect-error
+import stubbedLogstashFields from '../../../../../__fixtures__/logstash_fields';
 import { DiscoverField } from './discover_field';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { IndexPatternField } from '../../../../../data/public';
-import { getStubIndexPattern } from '../../../../../data/public/test_utils';
+import { coreMock } from '../../../../../../../../core/public/mocks';
+import { IndexPatternField } from '../../../../../../../data/public';
+import { getStubIndexPattern } from '../../../../../../../data/public/test_utils';
 
-jest.mock('../../../kibana_services', () => ({
+jest.mock('../../../../../kibana_services', () => ({
   getServices: () => ({
     history: () => ({
       location: {
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
similarity index 99%
rename from src/plugins/discover/public/application/components/sidebar/discover_field.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
index a53809cfa2c7e..e60dabd1d8d8c 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field.tsx
@@ -23,9 +23,9 @@ import { i18n } from '@kbn/i18n';
 import { UiCounterMetricType } from '@kbn/analytics';
 import classNames from 'classnames';
 import { DiscoverFieldDetails } from './discover_field_details';
-import { FieldIcon, FieldButton } from '../../../../../kibana_react/public';
+import { FieldIcon, FieldButton } from '../../../../../../../kibana_react/public';
 import { FieldDetails } from './types';
-import { IndexPatternField, IndexPattern } from '../../../../../data/public';
+import { IndexPatternField, IndexPattern } from '../../../../../../../data/public';
 import { getFieldTypeName } from './lib/get_field_type_name';
 import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
 
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_bucket.scss b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_bucket.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_bucket.scss
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_bucket.scss
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_bucket.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_bucket.tsx
similarity index 98%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_bucket.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_bucket.tsx
index e433c3419e24a..7dab8cecf28a9 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_bucket.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_bucket.tsx
@@ -11,7 +11,7 @@ import { EuiText, EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@e
 import { i18n } from '@kbn/i18n';
 import { StringFieldProgressBar } from './string_progress_bar';
 import { Bucket } from './types';
-import { IndexPatternField } from '../../../../../data/public';
+import { IndexPatternField } from '../../../../../../../data/public';
 import './discover_field_bucket.scss';
 
 interface Props {
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.scss b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_details.scss
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.scss
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.test.tsx
similarity index 88%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.test.tsx
index f82154af33d1e..a798abb60b833 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.test.tsx
@@ -8,13 +8,13 @@
 
 import React from 'react';
 import { findTestSubject } from '@elastic/eui/lib/test';
-// @ts-expect-error
-import stubbedLogstashFields from '../../../__fixtures__/logstash_fields';
 import { mountWithIntl } from '@kbn/test/jest';
+// @ts-expect-error
+import stubbedLogstashFields from '../../../../../__fixtures__/logstash_fields';
 import { DiscoverFieldDetails } from './discover_field_details';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { IndexPatternField } from '../../../../../data/public';
-import { getStubIndexPattern } from '../../../../../data/public/test_utils';
+import { coreMock } from '../../../../../../../../core/public/mocks';
+import { IndexPatternField } from '../../../../../../../data/public';
+import { getStubIndexPattern } from '../../../../../../../data/public/test_utils';
 
 const indexPattern = getStubIndexPattern(
   'logstash-*',
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.tsx
similarity index 99%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.tsx
index e2ffb79551aab..d7008ba3e310f 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details.tsx
@@ -18,7 +18,7 @@ import {
   getVisualizeHref,
 } from './lib/visualize_trigger_utils';
 import { Bucket, FieldDetails } from './types';
-import { IndexPatternField, IndexPattern } from '../../../../../data/public';
+import { IndexPatternField, IndexPattern } from '../../../../../../../data/public';
 import './discover_field_details.scss';
 import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
 
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.test.tsx
similarity index 87%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.test.tsx
index 73e906cb62f5f..aa93b2a663736 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.test.tsx
@@ -8,12 +8,12 @@
 
 import React from 'react';
 import { findTestSubject } from '@elastic/eui/lib/test';
-// @ts-expect-error
-import stubbedLogstashFields from '../../../__fixtures__/logstash_fields';
 import { mountWithIntl } from '@kbn/test/jest';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { IndexPatternField } from '../../../../../data/public';
-import { getStubIndexPattern } from '../../../../../data/public/test_utils';
+// @ts-expect-error
+import stubbedLogstashFields from '../../../../../__fixtures__/logstash_fields';
+import { coreMock } from '../../../../../../../../core/public/mocks';
+import { IndexPatternField } from '../../../../../../../data/public';
+import { getStubIndexPattern } from '../../../../../../../data/public/test_utils';
 import { DiscoverFieldDetailsFooter } from './discover_field_details_footer';
 
 const indexPattern = getStubIndexPattern(
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.tsx
similarity index 91%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.tsx
index bea302087938a..148dfc67c3e41 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_field_details_footer.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_details_footer.tsx
@@ -9,8 +9,8 @@
 import React from 'react';
 import { EuiLink, EuiPopoverFooter, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { IndexPatternField } from '../../../../../data/common/index_patterns/fields';
-import { IndexPattern } from '../../../../../data/common/index_patterns/index_patterns';
+import { IndexPatternField } from '../../../../../../../data/common/index_patterns/fields';
+import { IndexPattern } from '../../../../../../../data/common/index_patterns/index_patterns';
 import { FieldDetails } from './types';
 
 interface DiscoverFieldDetailsFooterProps {
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_search.scss b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_search.scss
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.scss
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.test.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_search.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.test.tsx
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/discover_field_search.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_field_search.tsx
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.test.tsx
similarity index 89%
rename from src/plugins/discover/public/application/components/sidebar/discover_index_pattern.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.test.tsx
index f6d577de564ad..45d6faa9606e1 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.test.tsx
@@ -15,8 +15,7 @@ import { SavedObject } from 'kibana/server';
 import { DiscoverIndexPattern, DiscoverIndexPatternProps } from './discover_index_pattern';
 import { EuiSelectable } from '@elastic/eui';
 import { IndexPattern, IndexPatternAttributes } from 'src/plugins/data/public';
-import { configMock } from '../../../__mocks__/config';
-import { indexPatternsMock } from '../../../__mocks__/index_patterns';
+import { indexPatternsMock } from '../../../../../__mocks__/index_patterns';
 
 const indexPattern = {
   id: 'the-index-pattern-id-first',
@@ -38,13 +37,11 @@ const indexPattern2 = {
 } as SavedObject<IndexPatternAttributes>;
 
 const defaultProps = {
-  config: configMock,
   indexPatternList: [indexPattern1, indexPattern2],
   selectedIndexPattern: indexPattern,
-  state: {},
-  setAppState: jest.fn(),
   useNewFieldsApi: true,
   indexPatterns: indexPatternsMock,
+  onChangeIndexPattern: jest.fn(),
 };
 
 function getIndexPatternPickerList(instance: ShallowWrapper) {
@@ -72,7 +69,7 @@ describe('DiscoverIndexPattern', () => {
     const props = ({
       indexPatternList: null,
       selectedIndexPattern: null,
-      setIndexPattern: jest.fn(),
+      onChangeIndexPattern: jest.fn(),
     } as unknown) as DiscoverIndexPatternProps;
 
     expect(shallow(<DiscoverIndexPattern {...props} />)).toMatchSnapshot(`""`);
@@ -92,10 +89,6 @@ describe('DiscoverIndexPattern', () => {
     await act(async () => {
       selectIndexPatternPickerOption(instance, 'test2 title');
     });
-    expect(defaultProps.setAppState).toHaveBeenCalledWith({
-      index: 'the-index-pattern-id',
-      columns: [],
-      sort: [],
-    });
+    expect(defaultProps.onChangeIndexPattern).toHaveBeenCalledWith('the-index-pattern-id');
   });
 });
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx
new file mode 100644
index 0000000000000..356c86dded97a
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern.tsx
@@ -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 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, { useState, useEffect } from 'react';
+import { I18nProvider } from '@kbn/i18n/react';
+import { SavedObject } from 'kibana/public';
+import { IndexPattern, IndexPatternAttributes } from 'src/plugins/data/public';
+
+import { IndexPatternRef } from './types';
+import { ChangeIndexPattern } from './change_indexpattern';
+export interface DiscoverIndexPatternProps {
+  /**
+   * list of available index patterns, if length > 1, component offers a "change" link
+   */
+  indexPatternList: Array<SavedObject<IndexPatternAttributes>>;
+  /**
+   * Callback function when changing an index pattern
+   */
+  onChangeIndexPattern: (id: string) => void;
+  /**
+   * currently selected index pattern, due to angular issues it's undefined at first rendering
+   */
+  selectedIndexPattern: IndexPattern;
+}
+
+/**
+ * Component allows you to select an index pattern in discovers side bar
+ */
+export function DiscoverIndexPattern({
+  indexPatternList,
+  onChangeIndexPattern,
+  selectedIndexPattern,
+}: DiscoverIndexPatternProps) {
+  const options: IndexPatternRef[] = (indexPatternList || []).map((entity) => ({
+    id: entity.id,
+    title: entity.attributes!.title,
+  }));
+  const { id: selectedId, title: selectedTitle } = selectedIndexPattern || {};
+
+  const [selected, setSelected] = useState({
+    id: selectedId,
+    title: selectedTitle || '',
+  });
+  useEffect(() => {
+    const { id, title } = selectedIndexPattern;
+    setSelected({ id, title });
+  }, [selectedIndexPattern]);
+  if (!selectedId) {
+    return null;
+  }
+
+  return (
+    <I18nProvider>
+      <ChangeIndexPattern
+        trigger={{
+          label: selected.title,
+          title: selected.title,
+          'data-test-subj': 'indexPattern-switch-link',
+        }}
+        indexPatternId={selected.id}
+        indexPatternRefs={options}
+        onChangeIndexPattern={(id) => {
+          const indexPattern = options.find((pattern) => pattern.id === id);
+          if (indexPattern) {
+            onChangeIndexPattern(id);
+            setSelected(indexPattern);
+          }
+        }}
+      />
+    </I18nProvider>
+  );
+}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern_management.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.test.tsx
similarity index 90%
rename from src/plugins/discover/public/application/components/sidebar/discover_index_pattern_management.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.test.tsx
index 6f9ff63d69782..d81ecb79a4221 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern_management.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.test.tsx
@@ -6,16 +6,16 @@
  * Side Public License, v 1.
  */
 
-import { getStubIndexPattern } from '../../../../../data/public/index_patterns/index_pattern.stub';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { DiscoverServices } from '../../../build_services';
-// @ts-expect-error
-import stubbedLogstashFields from '../../../__fixtures__/logstash_fields';
-import { mountWithIntl } from '@kbn/test/jest';
 import React from 'react';
-import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
+import { mountWithIntl } from '@kbn/test/jest';
 import { EuiContextMenuPanel, EuiPopover, EuiContextMenuItem } from '@elastic/eui';
 import { findTestSubject } from '@kbn/test/jest';
+import { getStubIndexPattern } from '../../../../../../../data/public/index_patterns/index_pattern.stub';
+import { coreMock } from '../../../../../../../../core/public/mocks';
+import { DiscoverServices } from '../../../../../build_services';
+// @ts-expect-error
+import stubbedLogstashFields from '../../../../../__fixtures__/logstash_fields';
+import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
 
 const mockServices = ({
   history: () => ({
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern_management.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.tsx
similarity index 95%
rename from src/plugins/discover/public/application/components/sidebar/discover_index_pattern_management.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.tsx
index 9a9dfd579b96d..125172f47b7c4 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern_management.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_index_pattern_management.tsx
@@ -9,8 +9,8 @@
 import React, { useState } from 'react';
 import { EuiButtonIcon, EuiContextMenuItem, EuiContextMenuPanel, EuiPopover } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { DiscoverServices } from '../../../build_services';
-import { IndexPattern } from '../../../../../data/common/index_patterns/index_patterns';
+import { DiscoverServices } from '../../../../../build_services';
+import { IndexPattern } from '../../../../../../../data/common/index_patterns/index_patterns';
 
 export interface DiscoverIndexPatternManagementProps {
   /**
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/discover_sidebar.scss
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.scss
diff --git a/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.test.tsx
new file mode 100644
index 0000000000000..304ab05516f92
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.test.tsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { each, cloneDeep } from 'lodash';
+import { ReactWrapper } from 'enzyme';
+import { findTestSubject } from '@elastic/eui/lib/test';
+// @ts-expect-error
+import realHits from '../../../../../__fixtures__/real_hits.js';
+// @ts-expect-error
+import stubbedLogstashFields from '../../../../../__fixtures__/logstash_fields';
+import { mountWithIntl } from '@kbn/test/jest';
+import React from 'react';
+import { DiscoverSidebarProps } from './discover_sidebar';
+import { coreMock } from '../../../../../../../../core/public/mocks';
+import { IndexPatternAttributes } from '../../../../../../../data/common';
+import { getStubIndexPattern } from '../../../../../../../data/public/test_utils';
+import { SavedObject } from '../../../../../../../../core/types';
+import { getDefaultFieldFilter } from './lib/field_filter';
+import { DiscoverSidebar } from './discover_sidebar';
+import { ElasticSearchHit } from '../../../../doc_views/doc_views_types';
+import { discoverServiceMock as mockDiscoverServices } from '../../../../../__mocks__/services';
+
+jest.mock('../../../../../kibana_services', () => ({
+  getServices: () => mockDiscoverServices,
+}));
+
+jest.mock('./lib/get_index_pattern_field_list', () => ({
+  getIndexPatternFieldList: jest.fn((indexPattern) => indexPattern.fields),
+}));
+
+function getCompProps(): DiscoverSidebarProps {
+  const indexPattern = getStubIndexPattern(
+    'logstash-*',
+    (cfg: unknown) => cfg,
+    'time',
+    stubbedLogstashFields(),
+    coreMock.createSetup()
+  );
+
+  // @ts-expect-error _.each() is passing additional args to flattenHit
+  const hits = (each(cloneDeep(realHits), indexPattern.flattenHit) as Array<
+    Record<string, unknown>
+  >) as ElasticSearchHit[];
+
+  const indexPatternList = [
+    { id: '0', attributes: { title: 'b' } } as SavedObject<IndexPatternAttributes>,
+    { id: '1', attributes: { title: 'a' } } as SavedObject<IndexPatternAttributes>,
+    { id: '2', attributes: { title: 'c' } } as SavedObject<IndexPatternAttributes>,
+  ];
+
+  const fieldCounts: Record<string, number> = {};
+
+  for (const hit of hits) {
+    for (const key of Object.keys(indexPattern.flattenHit(hit))) {
+      fieldCounts[key] = (fieldCounts[key] || 0) + 1;
+    }
+  }
+  return {
+    columns: ['extension'],
+    fieldCounts,
+    hits,
+    indexPatternList,
+    onChangeIndexPattern: jest.fn(),
+    onAddFilter: jest.fn(),
+    onAddField: jest.fn(),
+    onRemoveField: jest.fn(),
+    selectedIndexPattern: indexPattern,
+    services: mockDiscoverServices,
+    state: {},
+    trackUiMetric: jest.fn(),
+    fieldFilter: getDefaultFieldFilter(),
+    setFieldFilter: jest.fn(),
+    onEditRuntimeField: jest.fn(),
+    editField: jest.fn(),
+  };
+}
+
+describe('discover sidebar', function () {
+  let props: DiscoverSidebarProps;
+  let comp: ReactWrapper<DiscoverSidebarProps>;
+
+  beforeAll(() => {
+    props = getCompProps();
+    comp = mountWithIntl(<DiscoverSidebar {...props} />);
+  });
+
+  it('should have Selected Fields and Available Fields with Popular Fields sections', function () {
+    const popular = findTestSubject(comp, 'fieldList-popular');
+    const selected = findTestSubject(comp, 'fieldList-selected');
+    const unpopular = findTestSubject(comp, 'fieldList-unpopular');
+    expect(popular.children().length).toBe(1);
+    expect(unpopular.children().length).toBe(7);
+    expect(selected.children().length).toBe(1);
+  });
+  it('should allow selecting fields', function () {
+    findTestSubject(comp, 'fieldToggle-bytes').simulate('click');
+    expect(props.onAddField).toHaveBeenCalledWith('bytes');
+  });
+  it('should allow deselecting fields', function () {
+    findTestSubject(comp, 'fieldToggle-extension').simulate('click');
+    expect(props.onRemoveField).toHaveBeenCalledWith('extension');
+  });
+});
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.tsx
similarity index 97%
rename from src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.tsx
index aaaf72f770630..0bebec61657b4 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar.tsx
@@ -27,9 +27,9 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { DiscoverField } from './discover_field';
 import { DiscoverIndexPattern } from './discover_index_pattern';
 import { DiscoverFieldSearch } from './discover_field_search';
-import { FIELDS_LIMIT_SETTING } from '../../../../common';
+import { FIELDS_LIMIT_SETTING } from '../../../../../../common';
 import { groupFields } from './lib/group_fields';
-import { IndexPatternField } from '../../../../../data/public';
+import { IndexPatternField } 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';
@@ -68,30 +68,28 @@ export interface DiscoverSidebarProps extends DiscoverSidebarResponsiveProps {
 export function DiscoverSidebar({
   alwaysShowActionButtons = false,
   columns,
-  config,
   fieldCounts,
   fieldFilter,
   hits,
   indexPatternList,
-  indexPatterns,
   onAddField,
   onAddFilter,
   onRemoveField,
   selectedIndexPattern,
   services,
-  setAppState,
   setFieldFilter,
-  state,
   trackUiMetric,
   useNewFieldsApi = false,
   useFlyout = false,
   unmappedFieldsConfig,
   onEditRuntimeField,
+  onChangeIndexPattern,
   setFieldEditorRef,
   closeFlyout,
   editField,
 }: DiscoverSidebarProps) {
   const [fields, setFields] = useState<IndexPatternField[] | null>(null);
+
   const { indexPatternFieldEditor } = services;
   const indexPatternFieldEditPermission = indexPatternFieldEditor?.userPermissions.editIndexPattern();
   const canEditIndexPatternField = !!indexPatternFieldEditPermission && useNewFieldsApi;
@@ -282,12 +280,9 @@ export function DiscoverSidebar({
         <EuiFlexGroup direction="row" gutterSize="s" alignItems="center" responsive={false}>
           <EuiFlexItem grow={true}>
             <DiscoverIndexPattern
-              config={config}
               selectedIndexPattern={selectedIndexPattern}
               indexPatternList={sortBy(indexPatternList, (o) => o.attributes.title)}
-              indexPatterns={indexPatterns}
-              state={state}
-              setAppState={setAppState}
+              onChangeIndexPattern={onChangeIndexPattern}
             />
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
@@ -323,12 +318,9 @@ export function DiscoverSidebar({
           <EuiFlexGroup direction="row" alignItems="center" gutterSize="s">
             <EuiFlexItem grow={true} className="dscSidebar__indexPatternSwitcher">
               <DiscoverIndexPattern
-                config={config}
                 selectedIndexPattern={selectedIndexPattern}
                 indexPatternList={sortBy(indexPatternList, (o) => o.attributes.title)}
-                indexPatterns={indexPatterns}
-                state={state}
-                setAppState={setAppState}
+                onChangeIndexPattern={onChangeIndexPattern}
               />
             </EuiFlexItem>
             <EuiFlexItem grow={false}>
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.test.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.test.tsx
similarity index 84%
rename from src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.test.tsx
index caa0e436f4091..2ad75806173eb 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.test.tsx
@@ -10,23 +10,21 @@ import { each, cloneDeep } 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.js';
 // @ts-expect-error
-import stubbedLogstashFields from '../../../__fixtures__/logstash_fields';
+import stubbedLogstashFields from '../../../../../__fixtures__/logstash_fields';
 import { mountWithIntl } from '@kbn/test/jest';
 import React from 'react';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { IndexPatternAttributes } from '../../../../../data/common';
-import { getStubIndexPattern } from '../../../../../data/public/test_utils';
-import { SavedObject } from '../../../../../../core/types';
+import { coreMock } from '../../../../../../../../core/public/mocks';
+import { IndexPatternAttributes } from '../../../../../../../data/common';
+import { getStubIndexPattern } from '../../../../../../../data/public/test_utils';
+import { SavedObject } from '../../../../../../../../core/types';
 import {
   DiscoverSidebarResponsive,
   DiscoverSidebarResponsiveProps,
 } from './discover_sidebar_responsive';
-import { DiscoverServices } from '../../../build_services';
-import { ElasticSearchHit } from '../../doc_views/doc_views_types';
-import { configMock } from '../../../__mocks__/config';
-import { indexPatternsMock } from '../../../__mocks__/index_patterns';
+import { DiscoverServices } from '../../../../../build_services';
+import { ElasticSearchHit } from '../../../../doc_views/doc_views_types';
 import { DiscoverSidebar } from './discover_sidebar';
 
 const mockServices = ({
@@ -52,7 +50,7 @@ const mockServices = ({
   },
 } as unknown) as DiscoverServices;
 
-jest.mock('../../../kibana_services', () => ({
+jest.mock('../../../../../kibana_services', () => ({
   getServices: () => mockServices,
 }));
 
@@ -89,17 +87,15 @@ function getCompProps(): DiscoverSidebarResponsiveProps {
   }
   return {
     columns: ['extension'],
-    config: configMock,
     fieldCounts,
     hits,
     indexPatternList,
-    indexPatterns: indexPatternsMock,
+    onChangeIndexPattern: jest.fn(),
     onAddFilter: jest.fn(),
     onAddField: jest.fn(),
     onRemoveField: jest.fn(),
     selectedIndexPattern: indexPattern,
     services: mockServices,
-    setAppState: jest.fn(),
     state: {},
     trackUiMetric: jest.fn(),
     onEditRuntimeField: jest.fn(),
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx
similarity index 91%
rename from src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx
index 6b8918e2d9965..cc33601f77728 100644
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar_responsive.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/discover_sidebar_responsive.tsx
@@ -11,7 +11,6 @@ import { sortBy } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { UiCounterMetricType } from '@kbn/analytics';
-import { IUiSettingsClient } from 'kibana/public';
 import {
   EuiTitle,
   EuiHideFor,
@@ -28,14 +27,14 @@ import {
   EuiFlexItem,
 } from '@elastic/eui';
 import { DiscoverIndexPattern } from './discover_index_pattern';
-import { IndexPatternAttributes, IndexPatternsContract } from '../../../../../data/common';
-import { SavedObject } from '../../../../../../core/types';
-import { IndexPatternField, IndexPattern } from '../../../../../data/public';
+import { IndexPatternAttributes } from '../../../../../../../data/common';
+import { SavedObject } from '../../../../../../../../core/types';
+import { IndexPatternField, IndexPattern } from '../../../../../../../data/public';
 import { getDefaultFieldFilter } from './lib/field_filter';
 import { DiscoverSidebar } from './discover_sidebar';
-import { DiscoverServices } from '../../../build_services';
-import { ElasticSearchHit } from '../../doc_views/doc_views_types';
-import { AppState } from '../../angular/discover_state';
+import { DiscoverServices } from '../../../../../build_services';
+import { ElasticSearchHit } from '../../../../doc_views/doc_views_types';
+import { AppState } from '../../services/discover_state';
 import { DiscoverIndexPatternManagement } from './discover_index_pattern_management';
 
 export interface DiscoverSidebarResponsiveProps {
@@ -47,10 +46,6 @@ export interface DiscoverSidebarResponsiveProps {
    * the selected columns displayed in the doc table in discover
    */
   columns: string[];
-  /**
-   * Client of uiSettings
-   */
-  config: IUiSettingsClient;
   /**
    * a statistics of the distribution of fields in the given hits
    */
@@ -63,10 +58,6 @@ export interface DiscoverSidebarResponsiveProps {
    * List of available index patterns
    */
   indexPatternList: Array<SavedObject<IndexPatternAttributes>>;
-  /**
-   * Index patterns service
-   */
-  indexPatterns: IndexPatternsContract;
   /**
    * Has been toggled closed
    */
@@ -79,6 +70,10 @@ export interface DiscoverSidebarResponsiveProps {
    * Callback function when adding a filter from sidebar
    */
   onAddFilter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
+  /**
+   * Callback function when changing an index pattern
+   */
+  onChangeIndexPattern: (id: string) => void;
   /**
    * Callback function when removing a field
    * @param fieldName
@@ -92,10 +87,6 @@ export interface DiscoverSidebarResponsiveProps {
    * Discover plugin services;
    */
   services: DiscoverServices;
-  /**
-   * Function to set the current state
-   */
-  setAppState: (state: Partial<AppState>) => void;
   /**
    * Discover App state
    */
@@ -114,7 +105,6 @@ export interface DiscoverSidebarResponsiveProps {
    * Read from the Fields API
    */
   useNewFieldsApi?: boolean;
-
   /**
    * an object containing properties for proper handling of unmapped fields
    */
@@ -215,12 +205,9 @@ export function DiscoverSidebarResponsive(props: DiscoverSidebarResponsiveProps)
             <EuiFlexGroup direction="row" gutterSize="s" alignItems="center" responsive={false}>
               <EuiFlexItem grow={true}>
                 <DiscoverIndexPattern
-                  config={props.config}
+                  onChangeIndexPattern={props.onChangeIndexPattern}
                   selectedIndexPattern={props.selectedIndexPattern}
                   indexPatternList={sortBy(props.indexPatternList, (o) => o.attributes.title)}
-                  indexPatterns={props.indexPatterns}
-                  state={props.state}
-                  setAppState={props.setAppState}
                 />
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
diff --git a/src/plugins/discover/public/application/components/sidebar/index.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/index.ts
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/index.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/index.ts
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.js
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/lib/field_calculator.js
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.js
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.test.ts
similarity index 94%
rename from src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.test.ts
index 2cdd99774c2a8..501f18116dc6f 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/field_calculator.test.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_calculator.test.ts
@@ -10,12 +10,12 @@
 
 import _ from 'lodash';
 // @ts-expect-error
-import realHits from '../../../../__fixtures__/real_hits.js';
+import realHits from '../../../../../../__fixtures__/real_hits.js';
 // @ts-expect-error
-import stubbedLogstashFields from '../../../../__fixtures__/logstash_fields';
-import { coreMock } from '../../../../../../../core/public/mocks';
-import { IndexPattern } from '../../../../../../data/public';
-import { getStubIndexPattern } from '../../../../../../data/public/test_utils';
+import stubbedLogstashFields from '../../../../../../__fixtures__/logstash_fields';
+import { coreMock } from '../../../../../../../../../core/public/mocks';
+import { IndexPattern } from '../../../../../../../../data/public';
+import { getStubIndexPattern } from '../../../../../../../../data/public/test_utils';
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
 
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_filter.test.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_filter.test.ts
similarity index 97%
rename from src/plugins/discover/public/application/components/sidebar/lib/field_filter.test.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_filter.test.ts
index 04217c07f6638..8d7c543157ead 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/field_filter.test.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_filter.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getDefaultFieldFilter, setFieldFilterProp, isFieldFiltered } from './field_filter';
-import { IndexPatternField } from '../../../../../../data/public';
+import { IndexPatternField } from '../../../../../../../../data/public';
 
 describe('field_filter', function () {
   it('getDefaultFieldFilter should return default filter state', function () {
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/field_filter.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_filter.ts
similarity index 96%
rename from src/plugins/discover/public/application/components/sidebar/lib/field_filter.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_filter.ts
index 8c7e48f173031..25a8309d3d963 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/field_filter.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/field_filter.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { IndexPatternField } from '../../../../../../data/public';
+import { IndexPatternField } from '../../../../../../../../data/public';
 
 export interface FieldFilterState {
   missing: boolean;
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_details.ts
similarity index 91%
rename from src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_details.ts
index 1e35717d249f8..ab991f2cfb656 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/get_details.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_details.ts
@@ -8,8 +8,8 @@
 
 // @ts-expect-error
 import { fieldCalculator } from './field_calculator';
-import { IndexPattern, IndexPatternField } from '../../../../../../data/public';
-import { ElasticSearchHit } from '../../../doc_views/doc_views_types';
+import { IndexPattern, IndexPatternField } from '../../../../../../../../data/public';
+import { ElasticSearchHit } from '../../../../../doc_views/doc_views_types';
 
 export function getDetails(
   field: IndexPatternField,
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_field_type_name.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_field_type_name.ts
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/lib/get_field_type_name.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_field_type_name.ts
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_index_pattern_field_list.ts
similarity index 95%
rename from src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_index_pattern_field_list.ts
index 1586c2b26eefe..8f2e18c64a5eb 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/get_index_pattern_field_list.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_index_pattern_field_list.ts
@@ -8,7 +8,7 @@
 
 import { difference } from 'lodash';
 import { IndexPattern, IndexPatternField } from 'src/plugins/data/public';
-import { isNestedFieldParent } from '../../../helpers/nested_fields';
+import { isNestedFieldParent } from '../../../utils/nested_fields';
 
 export function getIndexPatternFieldList(
   indexPattern?: IndexPattern,
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/get_warnings.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_warnings.ts
similarity index 92%
rename from src/plugins/discover/public/application/components/sidebar/lib/get_warnings.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_warnings.ts
index 05634973fae8c..60ce5351e2cd3 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/get_warnings.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/get_warnings.ts
@@ -7,7 +7,7 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { IndexPatternField } from '../../../../../../data/public';
+import { IndexPatternField } from '../../../../../../../../data/public';
 
 export function getWarnings(field: IndexPatternField) {
   let warnings = [];
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/group_fields.test.ts
similarity index 98%
rename from src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/group_fields.test.ts
index e8eb07784cf9f..5869720635621 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.test.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/group_fields.test.ts
@@ -8,7 +8,7 @@
 
 import { groupFields } from './group_fields';
 import { getDefaultFieldFilter } from './field_filter';
-import { IndexPatternField } from '../../../../../../data/common/index_patterns/fields';
+import { IndexPatternField } from '../../../../../../../../data/common/index_patterns/fields';
 
 const fields = [
   {
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/group_fields.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/lib/group_fields.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/group_fields.tsx
diff --git a/src/plugins/discover/public/application/components/sidebar/lib/visualize_trigger_utils.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.ts
similarity index 95%
rename from src/plugins/discover/public/application/components/sidebar/lib/visualize_trigger_utils.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.ts
index 1a6cc38a4259b..2fabaa0ddd100 100644
--- a/src/plugins/discover/public/application/components/sidebar/lib/visualize_trigger_utils.ts
+++ b/src/plugins/discover/public/application/apps/main/components/sidebar/lib/visualize_trigger_utils.ts
@@ -11,9 +11,9 @@ import {
   VISUALIZE_GEO_FIELD_TRIGGER,
   visualizeFieldTrigger,
   visualizeGeoFieldTrigger,
-} from '../../../../../../ui_actions/public';
-import { getUiActions } from '../../../../kibana_services';
-import { IndexPatternField, KBN_FIELD_TYPES } from '../../../../../../data/public';
+} from '../../../../../../../../ui_actions/public';
+import { getUiActions } from '../../../../../../kibana_services';
+import { IndexPatternField, 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/components/sidebar/string_progress_bar.tsx b/src/plugins/discover/public/application/apps/main/components/sidebar/string_progress_bar.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/string_progress_bar.tsx
rename to src/plugins/discover/public/application/apps/main/components/sidebar/string_progress_bar.tsx
diff --git a/src/plugins/discover/public/application/components/sidebar/types.ts b/src/plugins/discover/public/application/apps/main/components/sidebar/types.ts
similarity index 100%
rename from src/plugins/discover/public/application/components/sidebar/types.ts
rename to src/plugins/discover/public/application/apps/main/components/sidebar/types.ts
diff --git a/src/plugins/discover/public/application/components/skip_bottom_button/index.ts b/src/plugins/discover/public/application/apps/main/components/skip_bottom_button/index.ts
similarity index 100%
rename from src/plugins/discover/public/application/components/skip_bottom_button/index.ts
rename to src/plugins/discover/public/application/apps/main/components/skip_bottom_button/index.ts
diff --git a/src/plugins/discover/public/application/components/skip_bottom_button/skip_bottom_button.test.tsx b/src/plugins/discover/public/application/apps/main/components/skip_bottom_button/skip_bottom_button.test.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/skip_bottom_button/skip_bottom_button.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/skip_bottom_button/skip_bottom_button.test.tsx
diff --git a/src/plugins/discover/public/application/components/skip_bottom_button/skip_bottom_button.tsx b/src/plugins/discover/public/application/apps/main/components/skip_bottom_button/skip_bottom_button.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/skip_bottom_button/skip_bottom_button.tsx
rename to src/plugins/discover/public/application/apps/main/components/skip_bottom_button/skip_bottom_button.tsx
diff --git a/src/plugins/discover/public/application/components/timechart_header/index.ts b/src/plugins/discover/public/application/apps/main/components/timechart_header/index.ts
similarity index 100%
rename from src/plugins/discover/public/application/components/timechart_header/index.ts
rename to src/plugins/discover/public/application/apps/main/components/timechart_header/index.ts
diff --git a/src/plugins/discover/public/application/components/timechart_header/timechart_header.scss b/src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/timechart_header/timechart_header.scss
rename to src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.scss
diff --git a/src/plugins/discover/public/application/components/timechart_header/timechart_header.test.tsx b/src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.test.tsx
similarity index 97%
rename from src/plugins/discover/public/application/components/timechart_header/timechart_header.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.test.tsx
index 0da1fdd92d2cc..a68dc9a3b3756 100644
--- a/src/plugins/discover/public/application/components/timechart_header/timechart_header.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.test.tsx
@@ -12,7 +12,7 @@ import { ReactWrapper } from 'enzyme';
 import { TimechartHeader, TimechartHeaderProps } from './timechart_header';
 import { EuiIconTip } from '@elastic/eui';
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { DataPublicPluginStart } from '../../../../../data/public';
+import { DataPublicPluginStart } from '../../../../../../../data/public';
 
 describe('timechart header', function () {
   let props: TimechartHeaderProps;
diff --git a/src/plugins/discover/public/application/components/timechart_header/timechart_header.tsx b/src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.tsx
similarity index 95%
rename from src/plugins/discover/public/application/components/timechart_header/timechart_header.tsx
rename to src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.tsx
index a2fc17e05a203..ec94679ece675 100644
--- a/src/plugins/discover/public/application/components/timechart_header/timechart_header.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/timechart_header/timechart_header.tsx
@@ -18,8 +18,14 @@ import {
 import moment from 'moment';
 import { i18n } from '@kbn/i18n';
 import dateMath from '@elastic/datemath';
-import { DataPublicPluginStart } from '../../../../../data/public';
 import './timechart_header.scss';
+import { DataPublicPluginStart } from '../../../../../../../data/public';
+
+export interface TimechartBucketInterval {
+  scaled?: boolean;
+  description?: string;
+  scale?: number;
+}
 
 export interface TimechartHeaderProps {
   /**
@@ -29,11 +35,7 @@ export interface TimechartHeaderProps {
   /**
    * Interval for the buckets of the recent request
    */
-  bucketInterval?: {
-    scaled?: boolean;
-    description?: string;
-    scale?: number;
-  };
+  bucketInterval?: TimechartBucketInterval;
   data: DataPublicPluginStart;
   /**
    * Interval Options
diff --git a/src/plugins/discover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap b/src/plugins/discover/public/application/apps/main/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
similarity index 100%
rename from src/plugins/discover/public/application/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
rename to src/plugins/discover/public/application/apps/main/components/top_nav/__snapshots__/open_search_panel.test.tsx.snap
diff --git a/src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.test.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.test.tsx
new file mode 100644
index 0000000000000..687532cd94f08
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.test.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 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 { shallowWithIntl } from '@kbn/test/jest';
+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/common';
+import { GetStateReturn } from '../../services/discover_state';
+import { setHeaderActionMenuMounter } from '../../../../../kibana_services';
+import { discoverServiceMock } from '../../../../../__mocks__/services';
+
+setHeaderActionMenuMounter(jest.fn());
+
+function getProps(savePermissions = true): DiscoverTopNavProps {
+  discoverServiceMock.capabilities.discover!.save = savePermissions;
+
+  return {
+    stateContainer: {} as GetStateReturn,
+    indexPattern: indexPatternMock,
+    savedSearch: savedSearchMock,
+    navigateTo: jest.fn(),
+    services: discoverServiceMock,
+    query: {} as Query,
+    savedQuery: '',
+    updateQuery: jest.fn(),
+    onOpenInspector: jest.fn(),
+    searchSource: {} as ISearchSource,
+  };
+}
+
+describe('Discover topnav component', () => {
+  test('generated config of TopNavMenu config is correct when discover save permissions are assigned', () => {
+    const props = getProps(true);
+    const component = shallowWithIntl(<DiscoverTopNav {...props} />);
+    const topMenuConfig = component.props().config.map((obj: TopNavMenuData) => obj.id);
+    expect(topMenuConfig).toEqual(['options', 'new', 'save', 'open', 'share', 'inspect']);
+  });
+
+  test('generated config of TopNavMenu config is correct when no discover save permissions are assigned', () => {
+    const props = getProps(false);
+    const component = shallowWithIntl(<DiscoverTopNav {...props} />);
+    const topMenuConfig = component.props().config.map((obj: TopNavMenuData) => obj.id);
+    expect(topMenuConfig).toEqual(['options', 'new', 'open', 'share', 'inspect']);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.tsx
new file mode 100644
index 0000000000000..9afda73401084
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/discover_topnav.tsx
@@ -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 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, { useMemo } from 'react';
+import { DiscoverLayoutProps } from '../layout/types';
+import { getTopNavLinks } from './get_top_nav_links';
+import { Query, TimeRange } from '../../../../../../../data/common/query';
+import { getHeaderActionMenuMounter } from '../../../../../kibana_services';
+import { GetStateReturn } from '../../services/discover_state';
+
+export type DiscoverTopNavProps = Pick<
+  DiscoverLayoutProps,
+  'indexPattern' | 'navigateTo' | 'savedSearch' | 'services' | 'searchSource'
+> & {
+  onOpenInspector: () => void;
+  query?: Query;
+  savedQuery?: string;
+  updateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
+  stateContainer: GetStateReturn;
+};
+
+export const DiscoverTopNav = ({
+  indexPattern,
+  onOpenInspector,
+  query,
+  savedQuery,
+  stateContainer,
+  updateQuery,
+  searchSource,
+  navigateTo,
+  savedSearch,
+  services,
+}: DiscoverTopNavProps) => {
+  const showDatePicker = useMemo(() => indexPattern.isTimeBased(), [indexPattern]);
+  const { TopNavMenu } = services.navigation.ui;
+  const topNavMenu = useMemo(
+    () =>
+      getTopNavLinks({
+        indexPattern,
+        navigateTo,
+        savedSearch,
+        services,
+        state: stateContainer,
+        onOpenInspector,
+        searchSource,
+      }),
+    [indexPattern, navigateTo, onOpenInspector, searchSource, stateContainer, savedSearch, services]
+  );
+
+  const updateSavedQueryId = (newSavedQueryId: string | undefined) => {
+    const { appStateContainer, setAppState } = stateContainer;
+    if (newSavedQueryId) {
+      setAppState({ savedQuery: newSavedQueryId });
+    } else {
+      // remove savedQueryId from state
+      const newState = {
+        ...appStateContainer.getState(),
+      };
+      delete newState.savedQuery;
+      appStateContainer.set(newState);
+    }
+  };
+  const setMenuMountPoint = useMemo(() => {
+    return getHeaderActionMenuMounter();
+  }, []);
+
+  return (
+    <TopNavMenu
+      appName="discover"
+      config={topNavMenu}
+      indexPatterns={[indexPattern]}
+      onQuerySubmit={updateQuery}
+      onSavedQueryIdChange={updateSavedQueryId}
+      query={query}
+      setMenuMountPoint={setMenuMountPoint}
+      savedQueryId={savedQuery}
+      screenTitle={savedSearch.title}
+      showDatePicker={showDatePicker}
+      showSaveQuery={!!services.capabilities.discover.saveQuery}
+      showSearchBar={true}
+      useDefaultBehaviors={true}
+    />
+  );
+};
diff --git a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts b/src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.test.ts
similarity index 87%
rename from src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts
rename to src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.test.ts
index 2c50ce61c8afb..6a6fb8a44a5cf 100644
--- a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.test.ts
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.test.ts
@@ -8,10 +8,10 @@
 
 import { ISearchSource } from 'src/plugins/data/public';
 import { getTopNavLinks } from './get_top_nav_links';
-import { indexPatternMock } from '../../../__mocks__/index_pattern';
-import { savedSearchMock } from '../../../__mocks__/saved_search';
-import { DiscoverServices } from '../../../build_services';
-import { GetStateReturn } from '../../angular/discover_state';
+import { indexPatternMock } from '../../../../../__mocks__/index_pattern';
+import { savedSearchMock } from '../../../../../__mocks__/saved_search';
+import { DiscoverServices } from '../../../../../build_services';
+import { GetStateReturn } from '../../services/discover_state';
 
 const services = ({
   capabilities: {
@@ -28,7 +28,6 @@ const state = ({} as unknown) as GetStateReturn;
 
 test('getTopNavLinks result', () => {
   const topNavLinks = getTopNavLinks({
-    getFieldCounts: jest.fn(),
     indexPattern: indexPatternMock,
     navigateTo: jest.fn(),
     onOpenInspector: jest.fn(),
diff --git a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts b/src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.ts
similarity index 90%
rename from src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts
rename to src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.ts
index 38bc831225c68..f19b30cda5f8a 100644
--- a/src/plugins/discover/public/application/components/top_nav/get_top_nav_links.ts
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/get_top_nav_links.ts
@@ -9,20 +9,19 @@
 import { i18n } from '@kbn/i18n';
 import moment from 'moment';
 import { showOpenSearchPanel } from './show_open_search_panel';
-import { getSharingData, showPublicUrlSwitch } from '../../helpers/get_sharing_data';
-import { unhashUrl } from '../../../../../kibana_utils/public';
-import { DiscoverServices } from '../../../build_services';
-import { SavedSearch } from '../../../saved_searches';
+import { getSharingData, showPublicUrlSwitch } from '../../utils/get_sharing_data';
+import { unhashUrl } from '../../../../../../../kibana_utils/public';
+import { DiscoverServices } from '../../../../../build_services';
+import { SavedSearch } from '../../../../../saved_searches';
 import { onSaveSearch } from './on_save_search';
-import { GetStateReturn } from '../../angular/discover_state';
-import { IndexPattern, ISearchSource } from '../../../kibana_services';
+import { GetStateReturn } from '../../services/discover_state';
+import { IndexPattern, ISearchSource } from '../../../../../kibana_services';
 import { openOptionsPopover } from './open_options_popover';
 
 /**
  * Helper function to build the top nav links
  */
 export const getTopNavLinks = ({
-  getFieldCounts,
   indexPattern,
   navigateTo,
   savedSearch,
@@ -31,7 +30,6 @@ export const getTopNavLinks = ({
   onOpenInspector,
   searchSource,
 }: {
-  getFieldCounts: () => Promise<Record<string, number>>;
   indexPattern: IndexPattern;
   navigateTo: (url: string) => void;
   savedSearch: SavedSearch;
diff --git a/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.test.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.test.tsx
new file mode 100644
index 0000000000000..e5f44a0fbf214
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.test.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 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 { showSaveModal } from '../../../../../../../saved_objects/public';
+jest.mock('../../../../../../../saved_objects/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';
+
+test('onSaveSearch', async () => {
+  const serviceMock = ({
+    core: {
+      i18n: i18nServiceMock.create(),
+    },
+  } as unknown) as DiscoverServices;
+  const stateMock = ({} as unknown) as GetStateReturn;
+
+  await onSaveSearch({
+    indexPattern: indexPatternMock,
+    navigateTo: jest.fn(),
+    savedSearch: savedSearchMock,
+    services: serviceMock,
+    state: stateMock,
+  });
+
+  expect(showSaveModal).toHaveBeenCalled();
+});
diff --git a/src/plugins/discover/public/application/components/top_nav/on_save_search.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
similarity index 89%
rename from src/plugins/discover/public/application/components/top_nav/on_save_search.tsx
rename to src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
index a0271acec22cf..f4b969e977254 100644
--- a/src/plugins/discover/public/application/components/top_nav/on_save_search.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/on_save_search.tsx
@@ -8,13 +8,13 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { SavedObjectSaveModal, showSaveModal } from '../../../../../saved_objects/public';
-import { SavedSearch } from '../../../saved_searches';
-import { IndexPattern } from '../../../../../data/common/index_patterns/index_patterns';
-import { DiscoverServices } from '../../../build_services';
-import { GetStateReturn } from '../../angular/discover_state';
-import { setBreadcrumbsTitle } from '../../helpers/breadcrumbs';
-import { persistSavedSearch } from '../../helpers/persist_saved_search';
+import { SavedObjectSaveModal, showSaveModal } from '../../../../../../../saved_objects/public';
+import { SavedSearch } from '../../../../../saved_searches';
+import { IndexPattern } from '../../../../../../../data/common/index_patterns/index_patterns';
+import { DiscoverServices } from '../../../../../build_services';
+import { GetStateReturn } from '../../services/discover_state';
+import { setBreadcrumbsTitle } from '../../../../helpers/breadcrumbs';
+import { persistSavedSearch } from '../../utils/persist_saved_search';
 
 async function saveDataSource({
   indexPattern,
diff --git a/src/plugins/discover/public/application/components/top_nav/open_options_popover.scss b/src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.scss
similarity index 100%
rename from src/plugins/discover/public/application/components/top_nav/open_options_popover.scss
rename to src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.scss
diff --git a/src/plugins/discover/public/application/components/top_nav/open_options_popover.test.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.test.tsx
similarity index 93%
rename from src/plugins/discover/public/application/components/top_nav/open_options_popover.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.test.tsx
index 5b3d1656d77e7..28e57aed7b660 100644
--- a/src/plugins/discover/public/application/components/top_nav/open_options_popover.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.test.tsx
@@ -9,9 +9,9 @@
 import React from 'react';
 import { mountWithIntl } from '@kbn/test/jest';
 import { findTestSubject } from '@elastic/eui/lib/test';
-import { getServices } from '../../../kibana_services';
+import { getServices } from '../../../../../kibana_services';
 
-jest.mock('../../../kibana_services', () => {
+jest.mock('../../../../../kibana_services', () => {
   const mockUiSettings = new Map();
   return {
     getServices: () => ({
diff --git a/src/plugins/discover/public/application/components/top_nav/open_options_popover.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.tsx
similarity index 77%
rename from src/plugins/discover/public/application/components/top_nav/open_options_popover.tsx
rename to src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.tsx
index 280144d400216..6e90c702c2bfd 100644
--- a/src/plugins/discover/public/application/components/top_nav/open_options_popover.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/open_options_popover.tsx
@@ -11,11 +11,21 @@ import ReactDOM from 'react-dom';
 import { I18nStart } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiSpacer, EuiButton, EuiText, EuiWrappingPopover, EuiCode } from '@elastic/eui';
-import { getServices } from '../../../kibana_services';
+import {
+  EuiSpacer,
+  EuiButton,
+  EuiText,
+  EuiWrappingPopover,
+  EuiCode,
+  EuiHorizontalRule,
+  EuiButtonEmpty,
+  EuiTextAlign,
+} from '@elastic/eui';
 import './open_options_popover.scss';
-import { DOC_TABLE_LEGACY } from '../../../../common';
+import { DOC_TABLE_LEGACY } from '../../../../../../common';
+import { getServices } from '../../../../../kibana_services';
 
+const container = document.createElement('div');
 let isOpen = false;
 
 interface OptionsPopoverProps {
@@ -77,11 +87,29 @@ export function OptionsPopover(props: OptionsPopoverProps) {
             defaultMessage: 'Get started',
           })}
         </EuiButton>
+        <EuiHorizontalRule margin="s" />
+        <EuiTextAlign textAlign="center">
+          <EuiButtonEmpty
+            iconType="gear"
+            size="s"
+            href={addBasePath(`/app/management/kibana/settings?query=category:(discover)`)}
+          >
+            {i18n.translate('discover.openOptionsPopover.gotToAllSettings', {
+              defaultMessage: 'All Discover options',
+            })}
+          </EuiButtonEmpty>
+        </EuiTextAlign>
       </div>
     </EuiWrappingPopover>
   );
 }
 
+function onClose() {
+  ReactDOM.unmountComponentAtNode(container);
+  document.body.removeChild(container);
+  isOpen = false;
+}
+
 export function openOptionsPopover({
   I18nContext,
   anchorElement,
@@ -90,17 +118,11 @@ export function openOptionsPopover({
   anchorElement: HTMLElement;
 }) {
   if (isOpen) {
+    onClose();
     return;
   }
 
   isOpen = true;
-  const container = document.createElement('div');
-  const onClose = () => {
-    ReactDOM.unmountComponentAtNode(container);
-    document.body.removeChild(container);
-    isOpen = false;
-  };
-
   document.body.appendChild(container);
 
   const element = (
diff --git a/src/plugins/discover/public/application/components/top_nav/open_search_panel.test.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.test.tsx
similarity index 93%
rename from src/plugins/discover/public/application/components/top_nav/open_search_panel.test.tsx
rename to src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.test.tsx
index 856d8c5f71236..b34abab728eb1 100644
--- a/src/plugins/discover/public/application/components/top_nav/open_search_panel.test.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.test.tsx
@@ -9,7 +9,7 @@
 import React from 'react';
 import { shallow } from 'enzyme';
 
-jest.mock('../../../kibana_services', () => {
+jest.mock('../../../../../kibana_services', () => {
   return {
     getServices: () => ({
       core: { uiSettings: {}, savedObjects: {} },
diff --git a/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.tsx
similarity index 95%
rename from src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx
rename to src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.tsx
index f6881d1856566..e63f010a8dffc 100644
--- a/src/plugins/discover/public/application/components/top_nav/open_search_panel.tsx
+++ b/src/plugins/discover/public/application/apps/main/components/top_nav/open_search_panel.tsx
@@ -20,8 +20,8 @@ import {
   EuiFlyoutBody,
   EuiTitle,
 } from '@elastic/eui';
-import { SavedObjectFinderUi } from '../../../../../saved_objects/public';
-import { getServices } from '../../../kibana_services';
+import { SavedObjectFinderUi } from '../../../../../../../saved_objects/public';
+import { getServices } from '../../../../../kibana_services';
 
 const SEARCH_OBJECT_TYPE = 'search';
 
diff --git a/src/plugins/discover/public/application/components/top_nav/show_open_search_panel.tsx b/src/plugins/discover/public/application/apps/main/components/top_nav/show_open_search_panel.tsx
similarity index 100%
rename from src/plugins/discover/public/application/components/top_nav/show_open_search_panel.tsx
rename to src/plugins/discover/public/application/apps/main/components/top_nav/show_open_search_panel.tsx
diff --git a/src/plugins/discover/public/application/angular/directives/uninitialized.tsx b/src/plugins/discover/public/application/apps/main/components/uninitialized/uninitialized.tsx
similarity index 100%
rename from src/plugins/discover/public/application/angular/directives/uninitialized.tsx
rename to src/plugins/discover/public/application/apps/main/components/uninitialized/uninitialized.tsx
diff --git a/src/plugins/discover/public/application/apps/main/discover_main_app.test.tsx b/src/plugins/discover/public/application/apps/main/discover_main_app.test.tsx
new file mode 100644
index 0000000000000..0caa5f3f527c6
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/discover_main_app.test.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { mountWithIntl } from '@kbn/test/jest';
+import { indexPatternMock } from '../../../__mocks__/index_pattern';
+import { DiscoverMainApp } from './discover_main_app';
+import { discoverServiceMock } from '../../../__mocks__/services';
+import { savedSearchMock } from '../../../__mocks__/saved_search';
+import { createSearchSessionMock } from '../../../__mocks__/search_session';
+import { SavedObject } from '../../../../../../core/types';
+import { IndexPatternAttributes } from '../../../../../data/common';
+import { setHeaderActionMenuMounter } from '../../../kibana_services';
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+setHeaderActionMenuMounter(jest.fn());
+
+describe('DiscoverMainApp', () => {
+  test('renders', () => {
+    const { history } = createSearchSessionMock();
+    const indexPatternList = ([indexPatternMock].map((ip) => {
+      return { ...ip, ...{ attributes: { title: ip.title } } };
+    }) as unknown) as Array<SavedObject<IndexPatternAttributes>>;
+
+    const component = mountWithIntl(
+      <DiscoverMainApp
+        indexPattern={indexPatternMock}
+        opts={{
+          indexPatternList,
+          services: discoverServiceMock,
+          savedSearch: savedSearchMock,
+          navigateTo: jest.fn(),
+          history,
+        }}
+      />
+    );
+
+    expect(findTestSubject(component, 'indexPattern-switch-link').text()).toBe(
+      indexPatternMock.title
+    );
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/discover_main_app.tsx b/src/plugins/discover/public/application/apps/main/discover_main_app.tsx
new file mode 100644
index 0000000000000..5cc7147b49ff9
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/discover_main_app.tsx
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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, { useMemo, useCallback, useEffect } from 'react';
+import { History } from 'history';
+import { DiscoverLayout } from './components/layout';
+import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../common';
+import { useSavedSearch as useSavedSearchData } from './services/use_saved_search';
+import { setBreadcrumbsTitle } from '../../helpers/breadcrumbs';
+import { addHelpMenuToAppChrome } from '../../components/help_menu/help_menu_util';
+import { useDiscoverState } from './services/use_discover_state';
+import { useSearchSession } from './services/use_search_session';
+import { useUrl } from './services/use_url';
+import { IndexPattern, IndexPatternAttributes, SavedObject } from '../../../../../data/common';
+import { DiscoverServices } from '../../../build_services';
+import { SavedSearch } from '../../../saved_searches';
+
+const DiscoverLayoutMemoized = React.memo(DiscoverLayout);
+
+export interface DiscoverMainProps {
+  /**
+   * Current IndexPattern
+   */
+  indexPattern: IndexPattern;
+
+  opts: {
+    /**
+     * Use angular router for navigation
+     */
+    navigateTo: () => void;
+    /**
+     * Instance of browser history
+     */
+    history: History;
+    /**
+     * List of available index patterns
+     */
+    indexPatternList: Array<SavedObject<IndexPatternAttributes>>;
+    /**
+     * Kibana core services used by discover
+     */
+    services: DiscoverServices;
+    /**
+     * Current instance of SavedSearch
+     */
+    savedSearch: SavedSearch;
+  };
+}
+
+export function DiscoverMainApp(props: DiscoverMainProps) {
+  const { services, history, navigateTo, indexPatternList } = props.opts;
+  const { chrome, docLinks, uiSettings: config, data } = services;
+
+  const useNewFieldsApi = useMemo(() => !config.get(SEARCH_FIELDS_FROM_SOURCE), [config]);
+
+  /**
+   * State related logic
+   */
+  const {
+    stateContainer,
+    state,
+    indexPattern,
+    searchSource,
+    savedSearch,
+    resetSavedSearch,
+  } = useDiscoverState({
+    services,
+    history,
+    initialIndexPattern: props.indexPattern,
+    initialSavedSearch: props.opts.savedSearch,
+  });
+
+  /**
+   * Url / Routing logic
+   */
+  useUrl({ history, resetSavedSearch });
+
+  /**
+   * Search session logic
+   */
+  const searchSessionManager = useSearchSession({ services, history, stateContainer, savedSearch });
+
+  /**
+   * Data fetching logic
+   */
+  const { data$, refetch$ } = useSavedSearchData({
+    indexPattern,
+    savedSearch,
+    searchSessionManager,
+    searchSource,
+    services,
+    state,
+    stateContainer,
+    useNewFieldsApi,
+  });
+
+  /**
+   * SavedSearch depended initializing
+   */
+  useEffect(() => {
+    const pageTitleSuffix = savedSearch.id && savedSearch.title ? `: ${savedSearch.title}` : '';
+    chrome.docTitle.change(`Discover${pageTitleSuffix}`);
+    setBreadcrumbsTitle(savedSearch, chrome);
+    return () => {
+      data.search.session.clear();
+    };
+  }, [savedSearch, chrome, docLinks, refetch$, stateContainer, data, config]);
+
+  /**
+   * Initializing syncing with state and help menu
+   */
+  useEffect(() => {
+    addHelpMenuToAppChrome(chrome, docLinks);
+    stateContainer.replaceUrlAppState({}).then(() => {
+      stateContainer.startSync();
+    });
+
+    return () => stateContainer.stopSync();
+  }, [stateContainer, chrome, docLinks]);
+
+  const resetQuery = useCallback(() => {
+    resetSavedSearch(savedSearch.id);
+  }, [resetSavedSearch, savedSearch]);
+
+  return (
+    <DiscoverLayoutMemoized
+      indexPattern={indexPattern}
+      indexPatternList={indexPatternList}
+      resetQuery={resetQuery}
+      navigateTo={navigateTo}
+      savedSearch={savedSearch}
+      savedSearchData$={data$}
+      savedSearchRefetch$={refetch$}
+      searchSessionManager={searchSessionManager}
+      searchSource={searchSource}
+      services={services}
+      state={state}
+      stateContainer={stateContainer}
+    />
+  );
+}
diff --git a/src/plugins/discover/public/application/apps/main/index.ts b/src/plugins/discover/public/application/apps/main/index.ts
new file mode 100644
index 0000000000000..af30b0c953434
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/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 { DiscoverMainApp } from './discover_main_app';
diff --git a/src/plugins/discover/public/application/angular/discover_search_session.test.ts b/src/plugins/discover/public/application/apps/main/services/discover_search_session.test.ts
similarity index 83%
rename from src/plugins/discover/public/application/angular/discover_search_session.test.ts
rename to src/plugins/discover/public/application/apps/main/services/discover_search_session.test.ts
index 8e6fb11acb963..97c6ada3636d5 100644
--- a/src/plugins/discover/public/application/angular/discover_search_session.test.ts
+++ b/src/plugins/discover/public/application/apps/main/services/discover_search_session.test.ts
@@ -6,20 +6,10 @@
  * Side Public License, v 1.
  */
 
-import { DiscoverSearchSessionManager } from './discover_search_session';
-import { createMemoryHistory } from 'history';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { DataPublicPluginStart } from '../../../../data/public';
+import { createSearchSessionMock } from '../../../../__mocks__/search_session';
 
 describe('DiscoverSearchSessionManager', () => {
-  const history = createMemoryHistory();
-  const session = dataPluginMock.createStartContract().search.session as jest.Mocked<
-    DataPublicPluginStart['search']['session']
-  >;
-  const searchSessionManager = new DiscoverSearchSessionManager({
-    history,
-    session,
-  });
+  const { history, session, searchSessionManager } = createSearchSessionMock();
 
   beforeEach(() => {
     history.push('/');
diff --git a/src/plugins/discover/public/application/angular/discover_search_session.ts b/src/plugins/discover/public/application/apps/main/services/discover_search_session.ts
similarity index 93%
rename from src/plugins/discover/public/application/angular/discover_search_session.ts
rename to src/plugins/discover/public/application/apps/main/services/discover_search_session.ts
index a3cdfa42c40dd..81ab578229d19 100644
--- a/src/plugins/discover/public/application/angular/discover_search_session.ts
+++ b/src/plugins/discover/public/application/apps/main/services/discover_search_session.ts
@@ -8,13 +8,13 @@
 
 import { History } from 'history';
 import { filter } from 'rxjs/operators';
-import { DataPublicPluginStart } from '../../../../data/public';
+import { DataPublicPluginStart } from '../../../../../../data/public';
 import {
   createQueryParamObservable,
   getQueryParams,
   removeQueryParam,
-} from '../../../../kibana_utils/public';
-import { SEARCH_SESSION_ID_QUERY_PARAM } from '../../url_generator';
+} from '../../../../../../kibana_utils/public';
+import { SEARCH_SESSION_ID_QUERY_PARAM } from '../../../../url_generator';
 
 export interface DiscoverSearchSessionManagerDeps {
   history: History;
diff --git a/src/plugins/discover/public/application/angular/discover_state.test.ts b/src/plugins/discover/public/application/apps/main/services/discover_state.test.ts
similarity index 97%
rename from src/plugins/discover/public/application/angular/discover_state.test.ts
rename to src/plugins/discover/public/application/apps/main/services/discover_state.test.ts
index ddb4e874ccc64..11f6954af97b0 100644
--- a/src/plugins/discover/public/application/angular/discover_state.test.ts
+++ b/src/plugins/discover/public/application/apps/main/services/discover_state.test.ts
@@ -13,9 +13,9 @@ import {
   createSearchSessionRestorationDataProvider,
 } from './discover_state';
 import { createBrowserHistory, History } from 'history';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { SavedSearch } from '../../saved_searches';
-import { SEARCH_FIELDS_FROM_SOURCE } from '../../../common';
+import { dataPluginMock } from '../../../../../../data/public/mocks';
+import { SavedSearch } from '../../../../saved_searches';
+import { SEARCH_FIELDS_FROM_SOURCE } from '../../../../../common';
 
 let history: History;
 let state: GetStateReturn;
diff --git a/src/plugins/discover/public/application/angular/discover_state.ts b/src/plugins/discover/public/application/apps/main/services/discover_state.ts
similarity index 95%
rename from src/plugins/discover/public/application/angular/discover_state.ts
rename to src/plugins/discover/public/application/apps/main/services/discover_state.ts
index f71e3ac651f53..e90e62da16ba9 100644
--- a/src/plugins/discover/public/application/angular/discover_state.ts
+++ b/src/plugins/discover/public/application/apps/main/services/discover_state.ts
@@ -18,19 +18,19 @@ import {
   StateContainer,
   syncState,
   withNotifyOnErrors,
-} from '../../../../kibana_utils/public';
+} from '../../../../../../kibana_utils/public';
 import {
   DataPublicPluginStart,
   esFilters,
   Filter,
   Query,
   SearchSessionInfoProvider,
-} from '../../../../data/public';
-import { migrateLegacyQuery } from '../helpers/migrate_legacy_query';
-import { DiscoverGridSettings } from '../components/discover_grid/types';
-import { DISCOVER_APP_URL_GENERATOR, DiscoverUrlGeneratorState } from '../../url_generator';
-import { SavedSearch } from '../../saved_searches';
-import { handleSourceColumnState } from './helpers';
+} from '../../../../../../data/public';
+import { migrateLegacyQuery } from '../../../helpers/migrate_legacy_query';
+import { DiscoverGridSettings } from '../../../components/discover_grid/types';
+import { DISCOVER_APP_URL_GENERATOR, DiscoverUrlGeneratorState } from '../../../../url_generator';
+import { SavedSearch } from '../../../../saved_searches';
+import { handleSourceColumnState } from '../../../angular/helpers';
 
 export interface AppState {
   /**
diff --git a/src/plugins/discover/public/application/apps/main/services/use_discover_state.test.ts b/src/plugins/discover/public/application/apps/main/services/use_discover_state.test.ts
new file mode 100644
index 0000000000000..051a2d2dcd9cc
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_discover_state.test.ts
@@ -0,0 +1,82 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { renderHook, act } from '@testing-library/react-hooks';
+import { createSearchSessionMock } from '../../../../__mocks__/search_session';
+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/common';
+
+describe('test useDiscoverState', () => {
+  test('return is valid', async () => {
+    const { history } = createSearchSessionMock();
+
+    const { result } = renderHook(() => {
+      return useDiscoverState({
+        services: discoverServiceMock,
+        history,
+        initialIndexPattern: indexPatternMock,
+        initialSavedSearch: savedSearchMock,
+      });
+    });
+    expect(result.current.state.index).toBe(indexPatternMock.id);
+    expect(result.current.stateContainer).toBeInstanceOf(Object);
+    expect(result.current.setState).toBeInstanceOf(Function);
+    expect(result.current.savedSearch.id).toBe(savedSearchMock.id);
+    expect(result.current.searchSource).toBeInstanceOf(SearchSource);
+  });
+
+  test('setState', async () => {
+    const { history } = createSearchSessionMock();
+
+    const { result } = renderHook(() => {
+      return useDiscoverState({
+        services: discoverServiceMock,
+        history,
+        initialIndexPattern: indexPatternMock,
+        initialSavedSearch: savedSearchMock,
+      });
+    });
+    await act(async () => {
+      result.current.setState({ columns: ['123'] });
+    });
+    expect(result.current.state.columns).toEqual(['123']);
+  });
+
+  test('resetSavedSearch', async () => {
+    const { history } = createSearchSessionMock();
+
+    const { result, waitForValueToChange } = renderHook(() => {
+      return useDiscoverState({
+        services: discoverServiceMock,
+        history,
+        initialIndexPattern: indexPatternMock,
+        initialSavedSearch: savedSearchMock,
+      });
+    });
+
+    await act(async () => {
+      result.current.stateContainer.startSync();
+    });
+
+    const initialColumns = result.current.state.columns;
+    await act(async () => {
+      result.current.setState({ columns: ['123'] });
+    });
+    expect(result.current.state.columns).toEqual(['123']);
+
+    result.current.resetSavedSearch('the-saved-search-id');
+    await waitForValueToChange(() => {
+      return result.current.state;
+    });
+
+    expect(result.current.state.columns).toEqual(initialColumns);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts b/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
new file mode 100644
index 0000000000000..a3546d54cd493
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_discover_state.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { useMemo, useEffect, useState, useCallback } from 'react';
+import { cloneDeep } from 'lodash';
+import { History } from 'history';
+import { getState } from './discover_state';
+import { getStateDefaults } from '../utils/get_state_defaults';
+import {
+  esFilters,
+  connectToQueryState,
+  syncQueryStateWithUrl,
+  IndexPattern,
+} from '../../../../../../data/public';
+import { DiscoverServices } from '../../../../build_services';
+import { SavedSearch } from '../../../../saved_searches';
+import { loadIndexPattern } from '../utils/resolve_index_pattern';
+
+export function useDiscoverState({
+  services,
+  history,
+  initialIndexPattern,
+  initialSavedSearch,
+}: {
+  services: DiscoverServices;
+  initialSavedSearch: SavedSearch;
+  history: History;
+  initialIndexPattern: IndexPattern;
+}) {
+  const { uiSettings: config, data, filterManager } = services;
+  const [indexPattern, setIndexPattern] = useState(initialIndexPattern);
+  const [savedSearch, setSavedSearch] = useState(initialSavedSearch);
+
+  const searchSource = useMemo(() => {
+    savedSearch.searchSource.setField('index', indexPattern);
+    return savedSearch.searchSource.createChild();
+  }, [savedSearch.searchSource, indexPattern]);
+
+  const stateContainer = useMemo(
+    () =>
+      getState({
+        getStateDefaults: () =>
+          getStateDefaults({
+            config,
+            data,
+            savedSearch,
+          }),
+        storeInSessionStorage: config.get('state:storeInSessionStorage'),
+        history,
+        toasts: services.core.notifications.toasts,
+        uiSettings: config,
+      }),
+    [config, data, history, savedSearch, services.core.notifications.toasts]
+  );
+
+  const { appStateContainer, getPreviousAppState } = stateContainer;
+
+  const [state, setState] = useState(appStateContainer.getState());
+
+  useEffect(() => {
+    if (stateContainer.appStateContainer.getState().index !== indexPattern.id) {
+      // used index pattern is different than the given by url/state which is invalid
+      stateContainer.setAppState({ index: indexPattern.id });
+    }
+    // sync initial app filters from state to filterManager
+    const filters = appStateContainer.getState().filters;
+    if (filters) {
+      filterManager.setAppFilters(cloneDeep(filters));
+    }
+    const query = appStateContainer.getState().query;
+    if (query) {
+      data.query.queryString.setQuery(query);
+    }
+
+    const stopSyncingQueryAppStateWithStateContainer = connectToQueryState(
+      data.query,
+      appStateContainer,
+      {
+        filters: esFilters.FilterStateStore.APP_STATE,
+        query: true,
+      }
+    );
+
+    // syncs `_g` portion of url with query services
+    const { stop: stopSyncingGlobalStateWithUrl } = syncQueryStateWithUrl(
+      data.query,
+      stateContainer.kbnUrlStateStorage
+    );
+    return () => {
+      stopSyncingQueryAppStateWithStateContainer();
+      stopSyncingGlobalStateWithUrl();
+    };
+  }, [
+    appStateContainer,
+    config,
+    data.query,
+    data.search.session,
+    getPreviousAppState,
+    indexPattern.id,
+    filterManager,
+    services.indexPatterns,
+    stateContainer,
+  ]);
+
+  useEffect(() => {
+    const unsubscribe = stateContainer.appStateContainer.subscribe(async (nextState) => {
+      // NOTE: this is also called when navigating from discover app to context app
+      if (nextState.index && state.index !== nextState.index) {
+        const nextIndexPattern = await loadIndexPattern(
+          nextState.index,
+          services.indexPatterns,
+          config
+        );
+
+        if (nextIndexPattern) {
+          setIndexPattern(nextIndexPattern.loaded);
+        }
+      }
+      setState(nextState);
+    });
+    return () => unsubscribe();
+  }, [config, services.indexPatterns, state.index, stateContainer.appStateContainer, setState]);
+
+  const resetSavedSearch = useCallback(
+    async (id?: string) => {
+      const newSavedSearch = await services.getSavedSearchById(id);
+      newSavedSearch.searchSource.setField('index', indexPattern);
+      const newAppState = getStateDefaults({
+        config,
+        data,
+        savedSearch: newSavedSearch,
+      });
+      await stateContainer.replaceUrlAppState(newAppState);
+      setState(newAppState);
+      if (savedSearch.id !== newSavedSearch.id) {
+        setSavedSearch(newSavedSearch);
+      }
+    },
+    [services, indexPattern, config, data, stateContainer, savedSearch.id]
+  );
+
+  return {
+    state,
+    setState,
+    stateContainer,
+    indexPattern,
+    searchSource,
+    savedSearch,
+    resetSavedSearch,
+  };
+}
diff --git a/src/plugins/discover/public/application/apps/main/services/use_saved_search.test.ts b/src/plugins/discover/public/application/apps/main/services/use_saved_search.test.ts
new file mode 100644
index 0000000000000..5976c8fea5ea4
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_saved_search.test.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { Subject } from 'rxjs';
+import { renderHook } from '@testing-library/react-hooks';
+import { createSearchSessionMock } from '../../../../__mocks__/search_session';
+import { discoverServiceMock } from '../../../../__mocks__/services';
+import { savedSearchMock } from '../../../../__mocks__/saved_search';
+import { indexPatternMock } from '../../../../__mocks__/index_pattern';
+import { useSavedSearch } from './use_saved_search';
+import { AppState, getState } from './discover_state';
+import { uiSettingsMock } from '../../../../__mocks__/ui_settings';
+import { useDiscoverState } from './use_discover_state';
+
+describe('test useSavedSearch', () => {
+  test('useSavedSearch return is valid', async () => {
+    const { history, searchSessionManager } = createSearchSessionMock();
+    const stateContainer = getState({
+      getStateDefaults: () => ({ index: 'the-index-pattern-id' }),
+      history,
+      uiSettings: uiSettingsMock,
+    });
+
+    const { result } = renderHook(() => {
+      return useSavedSearch({
+        indexPattern: indexPatternMock,
+        savedSearch: savedSearchMock,
+        searchSessionManager,
+        searchSource: savedSearchMock.searchSource.createCopy(),
+        services: discoverServiceMock,
+        state: {} as AppState,
+        stateContainer,
+        useNewFieldsApi: true,
+      });
+    });
+
+    expect(result.current.refetch$).toBeInstanceOf(Subject);
+    expect(result.current.data$.value).toMatchInlineSnapshot(`
+      Object {
+        "state": "loading",
+      }
+    `);
+  });
+  test('refetch$ triggers a search', async () => {
+    const { history, searchSessionManager } = createSearchSessionMock();
+    const stateContainer = getState({
+      getStateDefaults: () => ({ index: 'the-index-pattern-id' }),
+      history,
+      uiSettings: uiSettingsMock,
+    });
+
+    discoverServiceMock.data.query.timefilter.timefilter.getTime = jest.fn(() => {
+      return { from: '2021-05-01T20:00:00Z', to: '2021-05-02T20:00:00Z' };
+    });
+
+    const { result: resultState } = renderHook(() => {
+      return useDiscoverState({
+        services: discoverServiceMock,
+        history,
+        initialIndexPattern: indexPatternMock,
+        initialSavedSearch: savedSearchMock,
+      });
+    });
+
+    const { result, waitForValueToChange } = renderHook(() => {
+      return useSavedSearch({
+        indexPattern: indexPatternMock,
+        savedSearch: savedSearchMock,
+        searchSessionManager,
+        searchSource: resultState.current.searchSource,
+        services: discoverServiceMock,
+        state: {} as AppState,
+        stateContainer,
+        useNewFieldsApi: true,
+      });
+    });
+
+    result.current.refetch$.next();
+
+    await waitForValueToChange(() => {
+      return result.current.data$.value.state === 'complete';
+    });
+
+    expect(result.current.data$.value.hits).toBe(0);
+    expect(result.current.data$.value.rows).toEqual([]);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/services/use_saved_search.ts b/src/plugins/discover/public/application/apps/main/services/use_saved_search.ts
new file mode 100644
index 0000000000000..2b0d951724869
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_saved_search.ts
@@ -0,0 +1,337 @@
+/*
+ * Copyright 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 { useEffect, useRef, useCallback, useMemo } from 'react';
+import { i18n } from '@kbn/i18n';
+import { merge, Subject, BehaviorSubject } from 'rxjs';
+import { debounceTime, tap, filter } from 'rxjs/operators';
+import { isEqual } from 'lodash';
+import { DiscoverServices } from '../../../../build_services';
+import { DiscoverSearchSessionManager } from './discover_search_session';
+import {
+  IndexPattern,
+  isCompleteResponse,
+  SearchSource,
+  tabifyAggResponse,
+} from '../../../../../../data/common';
+import { SavedSearch } from '../../../../saved_searches';
+import { AppState, GetStateReturn } from './discover_state';
+import { ElasticSearchHit } from '../../../doc_views/doc_views_types';
+import { RequestAdapter } from '../../../../../../inspector/public';
+import { AutoRefreshDoneFn, search } from '../../../../../../data/public';
+import { calcFieldCounts } from '../utils/calc_field_counts';
+import { SEARCH_ON_PAGE_LOAD_SETTING } from '../../../../../common';
+import { validateTimeRange } from '../utils/validate_time_range';
+import { updateSearchSource } from '../utils/update_search_source';
+import { SortOrder } from '../../../../saved_searches/types';
+import { getDimensions, getChartAggConfigs } from '../utils';
+import { buildPointSeriesData, Chart } from '../components/chart/point_series';
+import { TimechartBucketInterval } from '../components/timechart_header/timechart_header';
+import { useSingleton } from '../utils/use_singleton';
+import { FetchStatus } from '../../../types';
+
+export type SavedSearchDataSubject = BehaviorSubject<SavedSearchDataMessage>;
+export type SavedSearchRefetchSubject = Subject<SavedSearchRefetchMsg>;
+
+export interface UseSavedSearch {
+  refetch$: SavedSearchRefetchSubject;
+  data$: SavedSearchDataSubject;
+}
+
+export type SavedSearchRefetchMsg = 'reset' | undefined;
+
+export interface SavedSearchDataMessage {
+  bucketInterval?: TimechartBucketInterval;
+  chartData?: Chart;
+  fetchCounter?: number;
+  fetchError?: Error;
+  fieldCounts?: Record<string, number>;
+  hits?: number;
+  inspectorAdapters?: { requests: RequestAdapter };
+  rows?: ElasticSearchHit[];
+  state: FetchStatus;
+}
+
+/**
+ * This hook return 2 observables, refetch$ allows to trigger data fetching, data$ to subscribe
+ * to the data fetching
+ * @param indexPattern
+ * @param savedSearch
+ * @param searchSessionManager
+ * @param searchSource
+ * @param services
+ * @param state
+ * @param stateContainer
+ * @param useNewFieldsApi
+ */
+export const useSavedSearch = ({
+  indexPattern,
+  savedSearch,
+  searchSessionManager,
+  searchSource,
+  services,
+  state,
+  stateContainer,
+  useNewFieldsApi,
+}: {
+  indexPattern: IndexPattern;
+  savedSearch: SavedSearch;
+  searchSessionManager: DiscoverSearchSessionManager;
+  searchSource: SearchSource;
+  services: DiscoverServices;
+  state: AppState;
+  stateContainer: GetStateReturn;
+  useNewFieldsApi: boolean;
+}): UseSavedSearch => {
+  const { data, filterManager, uiSettings } = services;
+  const timefilter = data.query.timefilter.timefilter;
+
+  const initFetchState: FetchStatus = useMemo(() => {
+    // A saved search is created on every page load, so we check the ID to see if we're loading a
+    // previously saved search or if it is just transient
+    const shouldSearchOnPageLoad =
+      uiSettings.get<boolean>(SEARCH_ON_PAGE_LOAD_SETTING) ||
+      savedSearch.id !== undefined ||
+      timefilter.getRefreshInterval().pause === false ||
+      searchSessionManager.hasSearchSessionIdInURL();
+    return shouldSearchOnPageLoad ? FetchStatus.LOADING : FetchStatus.UNINITIALIZED;
+  }, [uiSettings, savedSearch.id, searchSessionManager, timefilter]);
+
+  /**
+   * The observable the UI (aka React component) subscribes to get notified about
+   * the changes in the data fetching process (high level: fetching started, data was received)
+   */
+  const data$: SavedSearchDataSubject = useSingleton(
+    () =>
+      new BehaviorSubject<SavedSearchDataMessage>({
+        state: initFetchState,
+      })
+  );
+  /**
+   * The observable to trigger data fetching in UI
+   * By refetch$.next('reset') rows and fieldcounts are reset to allow e.g. editing of runtime fields
+   * to be processed correctly
+   */
+  const refetch$ = useSingleton(() => new Subject<SavedSearchRefetchMsg>());
+
+  /**
+   * Values that shouldn't trigger re-rendering when changed
+   */
+  const refs = useRef<{
+    abortController?: AbortController;
+    /**
+     * used to compare a new state against an old one, to evaluate if data needs to be fetched
+     */
+    appState: AppState;
+    /**
+     * handler emitted by `timefilter.getAutoRefreshFetch$()`
+     * to notify when data completed loading and to start a new autorefresh loop
+     */
+    autoRefreshDoneCb?: AutoRefreshDoneFn;
+    fetchCounter: number;
+    /**
+     * needed to right auto refresh behavior, a new auto refresh shouldnt be triggered when
+     * loading is still ongoing
+     */
+    fetchStatus: FetchStatus;
+    /**
+     * needed for merging new with old field counts, high likely legacy, but kept this behavior
+     * because not 100% sure in this case
+     */
+    fieldCounts: Record<string, number>;
+  }>({
+    appState: state,
+    fetchCounter: 0,
+    fieldCounts: {},
+    fetchStatus: initFetchState,
+  });
+
+  const fetchAll = useCallback(
+    (reset = false) => {
+      if (!validateTimeRange(timefilter.getTime(), services.toastNotifications)) {
+        return Promise.reject();
+      }
+      const inspectorAdapters = { requests: new RequestAdapter() };
+
+      if (refs.current.abortController) refs.current.abortController.abort();
+      refs.current.abortController = new AbortController();
+      const sessionId = searchSessionManager.getNextSearchSessionId();
+
+      // Let the UI know, data fetching started
+      const loadingMessage: SavedSearchDataMessage = {
+        state: FetchStatus.LOADING,
+        fetchCounter: ++refs.current.fetchCounter,
+      };
+
+      if (reset) {
+        // when runtime field was added, changed, deleted, index pattern was switched
+        loadingMessage.rows = [];
+        loadingMessage.fieldCounts = {};
+        loadingMessage.chartData = undefined;
+        loadingMessage.bucketInterval = undefined;
+      }
+      data$.next(loadingMessage);
+      refs.current.fetchStatus = loadingMessage.state;
+
+      const { sort } = stateContainer.appStateContainer.getState();
+      updateSearchSource(searchSource, false, {
+        indexPattern,
+        services,
+        sort: sort as SortOrder[],
+        useNewFieldsApi,
+      });
+      const chartAggConfigs =
+        indexPattern.timeFieldName && !state.hideChart && state.interval
+          ? getChartAggConfigs(searchSource, state.interval, data)
+          : undefined;
+
+      if (!chartAggConfigs) {
+        searchSource.removeField('aggs');
+      } else {
+        searchSource.setField('aggs', chartAggConfigs.toDsl());
+      }
+
+      const searchSourceFetch$ = searchSource.fetch$({
+        abortSignal: refs.current.abortController.signal,
+        sessionId,
+        inspector: {
+          adapter: inspectorAdapters.requests,
+          title: i18n.translate('discover.inspectorRequestDataTitle', {
+            defaultMessage: 'data',
+          }),
+          description: i18n.translate('discover.inspectorRequestDescriptionDocument', {
+            defaultMessage: 'This request queries Elasticsearch to fetch the data for the search.',
+          }),
+        },
+      });
+
+      searchSourceFetch$.pipe(filter((res) => isCompleteResponse(res))).subscribe(
+        (res) => {
+          const documents = res.rawResponse.hits.hits;
+
+          const message: SavedSearchDataMessage = {
+            state: FetchStatus.COMPLETE,
+            rows: documents,
+            inspectorAdapters,
+            fieldCounts: calcFieldCounts(
+              reset ? {} : refs.current.fieldCounts,
+              documents,
+              indexPattern
+            ),
+            hits: res.rawResponse.hits.total as number,
+          };
+
+          if (chartAggConfigs) {
+            const bucketAggConfig = chartAggConfigs!.aggs[1];
+            const tabifiedData = tabifyAggResponse(chartAggConfigs, res.rawResponse);
+            const dimensions = getDimensions(chartAggConfigs, data);
+            if (dimensions) {
+              if (bucketAggConfig && search.aggs.isDateHistogramBucketAggConfig(bucketAggConfig)) {
+                message.bucketInterval = bucketAggConfig.buckets?.getInterval();
+              }
+              message.chartData = buildPointSeriesData(tabifiedData, dimensions);
+            }
+          }
+          refs.current.fieldCounts = message.fieldCounts!;
+          refs.current.fetchStatus = message.state;
+          data$.next(message);
+        },
+        (error) => {
+          if (error instanceof Error && error.name === 'AbortError') return;
+          data.search.showError(error);
+          refs.current.fetchStatus = FetchStatus.ERROR;
+          data$.next({
+            state: FetchStatus.ERROR,
+            inspectorAdapters,
+            fetchError: error,
+          });
+        },
+        () => {
+          refs.current.autoRefreshDoneCb?.();
+          refs.current.autoRefreshDoneCb = undefined;
+        }
+      );
+    },
+    [
+      timefilter,
+      services,
+      stateContainer.appStateContainer,
+      searchSource,
+      indexPattern,
+      useNewFieldsApi,
+      state.hideChart,
+      state.interval,
+      data,
+      searchSessionManager,
+      data$,
+    ]
+  );
+
+  /**
+   * This part takes care of triggering the data fetching by creating and subscribing
+   * to an observable of various possible changes in state
+   */
+  useEffect(() => {
+    const fetch$ = merge(
+      refetch$,
+      filterManager.getFetches$(),
+      timefilter.getFetch$(),
+      timefilter.getAutoRefreshFetch$().pipe(
+        tap((done) => {
+          refs.current.autoRefreshDoneCb = done;
+        }),
+        filter(() => refs.current.fetchStatus !== FetchStatus.LOADING)
+      ),
+      data.query.queryString.getUpdates$(),
+      searchSessionManager.newSearchSessionIdFromURL$.pipe(filter((sessionId) => !!sessionId))
+    ).pipe(debounceTime(100));
+
+    const subscription = fetch$.subscribe((val) => {
+      fetchAll(val === 'reset');
+    });
+
+    return () => {
+      subscription.unsubscribe();
+    };
+  }, [
+    data.query.queryString,
+    filterManager,
+    refetch$,
+    searchSessionManager.newSearchSessionIdFromURL$,
+    timefilter,
+    fetchAll,
+  ]);
+
+  /**
+   * Track state changes that should trigger a fetch
+   */
+  useEffect(() => {
+    const prevAppState = refs.current.appState;
+
+    // chart was hidden, now it should be displayed, so data is needed
+    const chartDisplayChanged = state.hideChart !== prevAppState.hideChart && !state.hideChart;
+    const chartIntervalChanged = state.interval !== prevAppState.interval;
+    const docTableSortChanged = !isEqual(state.sort, prevAppState.sort);
+    const indexPatternChanged = !isEqual(state.index, prevAppState.index);
+
+    refs.current.appState = state;
+    if (chartDisplayChanged || chartIntervalChanged || docTableSortChanged || indexPatternChanged) {
+      refetch$.next(indexPatternChanged ? 'reset' : undefined);
+    }
+  }, [refetch$, state.interval, state.sort, state]);
+
+  useEffect(() => {
+    if (initFetchState === FetchStatus.LOADING) {
+      refetch$.next();
+    }
+  }, [initFetchState, refetch$]);
+
+  return {
+    refetch$,
+    data$,
+  };
+};
diff --git a/src/plugins/discover/public/application/apps/main/services/use_search_session.test.ts b/src/plugins/discover/public/application/apps/main/services/use_search_session.test.ts
new file mode 100644
index 0000000000000..8aa6e0764d8ec
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_search_session.test.ts
@@ -0,0 +1,39 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { useSearchSession } from './use_search_session';
+import { renderHook } from '@testing-library/react-hooks';
+import { createSearchSessionMock } from '../../../../__mocks__/search_session';
+import { discoverServiceMock } from '../../../../__mocks__/services';
+import { savedSearchMock } from '../../../../__mocks__/saved_search';
+import { getState } from './discover_state';
+import { uiSettingsMock } from '../../../../__mocks__/ui_settings';
+
+describe('test useSearchSession', () => {
+  test('getting the next session id', async () => {
+    const { history } = createSearchSessionMock();
+    const stateContainer = getState({
+      getStateDefaults: () => ({ index: 'test' }),
+      history,
+      uiSettings: uiSettingsMock,
+    });
+
+    const nextId = 'id';
+    discoverServiceMock.data.search.session.start = jest.fn(() => nextId);
+
+    const { result } = renderHook(() => {
+      return useSearchSession({
+        services: discoverServiceMock,
+        history,
+        stateContainer,
+        savedSearch: savedSearchMock,
+      });
+    });
+    expect(result.current.getNextSearchSessionId()).toBe('id');
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/services/use_search_session.ts b/src/plugins/discover/public/application/apps/main/services/use_search_session.ts
new file mode 100644
index 0000000000000..e37e8f6f33839
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_search_session.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 { useMemo, useEffect } from 'react';
+import { History } from 'history';
+import { DiscoverSearchSessionManager } from './discover_search_session';
+import { createSearchSessionRestorationDataProvider, GetStateReturn } from './discover_state';
+import { noSearchSessionStorageCapabilityMessage } from '../../../../../../data/public';
+import { DiscoverServices } from '../../../../build_services';
+import { SavedSearch } from '../../../../saved_searches';
+
+export function useSearchSession({
+  services,
+  history,
+  stateContainer,
+  savedSearch,
+}: {
+  services: DiscoverServices;
+  stateContainer: GetStateReturn;
+  history: History;
+  savedSearch: SavedSearch;
+}) {
+  const { data, capabilities } = services;
+  /**
+   * Search session logic
+   */
+  const searchSessionManager = useMemo(
+    () =>
+      new DiscoverSearchSessionManager({
+        history,
+        session: data.search.session,
+      }),
+    [data.search.session, history]
+  );
+
+  useEffect(() => {
+    data.search.session.enableStorage(
+      createSearchSessionRestorationDataProvider({
+        appStateContainer: stateContainer.appStateContainer,
+        data,
+        getSavedSearch: () => savedSearch,
+      }),
+      {
+        isDisabled: () =>
+          capabilities.discover.storeSearchSession
+            ? { disabled: false }
+            : {
+                disabled: true,
+                reasonText: noSearchSessionStorageCapabilityMessage,
+              },
+      }
+    );
+  }, [
+    capabilities.discover.storeSearchSession,
+    data,
+    savedSearch,
+    stateContainer.appStateContainer,
+  ]);
+
+  return searchSessionManager;
+}
diff --git a/src/plugins/discover/public/application/apps/main/services/use_url.test.ts b/src/plugins/discover/public/application/apps/main/services/use_url.test.ts
new file mode 100644
index 0000000000000..740ca2bd140d7
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_url.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 { renderHook } from '@testing-library/react-hooks';
+import { createSearchSessionMock } from '../../../../__mocks__/search_session';
+import { useUrl } from './use_url';
+
+describe('test useUrl', () => {
+  test('resetSavedSearch is triggered once path it changed to /', () => {
+    const { history } = createSearchSessionMock();
+    history.push('/view');
+    const props = {
+      history,
+      resetSavedSearch: jest.fn(),
+    };
+    renderHook(() => useUrl(props));
+    history.push('/new');
+    expect(props.resetSavedSearch).toHaveBeenCalledTimes(0);
+
+    history.push('/');
+    expect(props.resetSavedSearch).toHaveBeenCalledTimes(1);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/services/use_url.ts b/src/plugins/discover/public/application/apps/main/services/use_url.ts
new file mode 100644
index 0000000000000..bc5554c35b36f
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/services/use_url.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 { useEffect } from 'react';
+import { History } from 'history';
+export function useUrl({
+  history,
+  resetSavedSearch,
+}: {
+  history: History;
+  resetSavedSearch: (val?: string) => void;
+}) {
+  /**
+   * Url / Routing logic
+   */
+  useEffect(() => {
+    // this listener is waiting for such a path http://localhost:5601/app/discover#/
+    // which could be set through pressing "New" button in top nav or go to "Discover" plugin from the sidebar
+    // to reload the page in a right way
+    const unlistenHistoryBasePath = history.listen(({ pathname, search, hash }) => {
+      if (!search && !hash && pathname === '/') {
+        resetSavedSearch();
+      }
+    });
+    return () => unlistenHistoryBasePath();
+  }, [history, resetSavedSearch]);
+}
diff --git a/src/plugins/discover/public/application/helpers/calc_field_counts.test.ts b/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.test.ts
similarity index 83%
rename from src/plugins/discover/public/application/helpers/calc_field_counts.test.ts
rename to src/plugins/discover/public/application/apps/main/utils/calc_field_counts.test.ts
index cf12b336c5b58..bdea6611d3b7e 100644
--- a/src/plugins/discover/public/application/helpers/calc_field_counts.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.test.ts
@@ -7,14 +7,15 @@
  */
 
 import { calcFieldCounts } from './calc_field_counts';
-import { indexPatternMock } from '../../__mocks__/index_pattern';
+import { indexPatternMock } from '../../../../__mocks__/index_pattern';
+import { ElasticSearchHit } from '../../../doc_views/doc_views_types';
 
 describe('calcFieldCounts', () => {
   test('returns valid field count data', async () => {
-    const rows = [
+    const rows = ([
       { _id: 1, _source: { message: 'test1', bytes: 20 } },
       { _id: 2, _source: { name: 'test2', extension: 'jpg' } },
-    ];
+    ] as unknown) as ElasticSearchHit[];
     const result = calcFieldCounts({}, rows, indexPatternMock);
     expect(result).toMatchInlineSnapshot(`
       Object {
@@ -28,10 +29,10 @@ describe('calcFieldCounts', () => {
     `);
   });
   test('updates field count data', async () => {
-    const rows = [
+    const rows = ([
       { _id: 1, _source: { message: 'test1', bytes: 20 } },
       { _id: 2, _source: { name: 'test2', extension: 'jpg' } },
-    ];
+    ] as unknown) as ElasticSearchHit[];
     const result = calcFieldCounts({ message: 2 }, rows, indexPatternMock);
     expect(result).toMatchInlineSnapshot(`
       Object {
diff --git a/src/plugins/discover/public/application/helpers/calc_field_counts.ts b/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.ts
similarity index 84%
rename from src/plugins/discover/public/application/helpers/calc_field_counts.ts
rename to src/plugins/discover/public/application/apps/main/utils/calc_field_counts.ts
index edeaa0b9bce52..43c9a57a70f22 100644
--- a/src/plugins/discover/public/application/helpers/calc_field_counts.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/calc_field_counts.ts
@@ -6,7 +6,8 @@
  * Side Public License, v 1.
  */
 
-import { IndexPattern } from '../../kibana_services';
+import { IndexPattern } from '../../../../kibana_services';
+import { ElasticSearchHit } from '../../../doc_views/doc_views_types';
 
 /**
  * This function is recording stats of the available fields, for usage in sidebar and sharing
@@ -14,7 +15,7 @@ import { IndexPattern } from '../../kibana_services';
  */
 export function calcFieldCounts(
   counts = {} as Record<string, number>,
-  rows: Array<Record<string, unknown>>,
+  rows: ElasticSearchHit[],
   indexPattern: IndexPattern
 ) {
   for (const hit of rows) {
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_config.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_config.test.ts
new file mode 100644
index 0000000000000..1982050874650
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_config.test.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 { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
+import { SearchSource } from '../../../../../../data/public';
+import { dataPluginMock } from '../../../../../../data/public/mocks';
+import { getChartAggConfigs } from './get_chart_agg_configs';
+
+describe('getChartAggConfigs', () => {
+  test('is working', () => {
+    const indexPattern = indexPatternWithTimefieldMock;
+    const setField = jest.fn();
+    const searchSource = ({
+      setField,
+      getField: (name: string) => {
+        if (name === 'index') {
+          return indexPattern;
+        }
+      },
+      removeField: jest.fn(),
+    } as unknown) as SearchSource;
+
+    const dataMock = dataPluginMock.createStartContract();
+
+    const aggsConfig = getChartAggConfigs(searchSource, 'auto', dataMock);
+
+    expect(aggsConfig!.aggs).toMatchInlineSnapshot(`
+      Array [
+        Object {
+          "enabled": true,
+          "id": "1",
+          "params": Object {},
+          "schema": "metric",
+          "type": "count",
+        },
+        Object {
+          "enabled": true,
+          "id": "2",
+          "params": Object {
+            "drop_partials": false,
+            "extended_bounds": Object {},
+            "field": "timestamp",
+            "interval": "auto",
+            "min_doc_count": 1,
+            "scaleMetricValues": false,
+            "useNormalizedEsInterval": true,
+            "used_interval": "0ms",
+          },
+          "schema": "segment",
+          "type": "date_histogram",
+        },
+      ]
+    `);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_configs.ts b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_configs.ts
new file mode 100644
index 0000000000000..2665254027fd9
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_chart_agg_configs.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 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 { SearchSource } from '../../../../../../data/common';
+import { DataPublicPluginStart } from '../../../../../../data/public';
+
+/**
+ * Helper function to apply or remove aggregations to a given search source used for gaining data
+ * for Discover's histogram vis
+ */
+export function getChartAggConfigs(
+  searchSource: SearchSource,
+  histogramInterval: string,
+  data: DataPublicPluginStart
+) {
+  const indexPattern = searchSource.getField('index')!;
+  const visStateAggs = [
+    {
+      type: 'count',
+      schema: 'metric',
+    },
+    {
+      type: 'date_histogram',
+      schema: 'segment',
+      params: {
+        field: indexPattern.timeFieldName!,
+        interval: histogramInterval,
+        timeRange: data.query.timefilter.timefilter.getTime(),
+      },
+    },
+  ];
+  return data.search.aggs.createAggConfigs(indexPattern, visStateAggs);
+}
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_dimensions.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_dimensions.test.ts
new file mode 100644
index 0000000000000..443fc634ba543
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_dimensions.test.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { dataPluginMock } from '../../../../../../data/public/mocks';
+
+import { getDimensions } from './get_dimensions';
+import { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
+import { SearchSource, calculateBounds } from '../../../../../../data/common';
+import { getChartAggConfigs } from './get_chart_agg_configs';
+
+test('getDimensions', () => {
+  const indexPattern = indexPatternWithTimefieldMock;
+  const setField = jest.fn();
+  const searchSource = ({
+    setField,
+    removeField: jest.fn(),
+    getField: (name: string) => {
+      if (name === 'index') {
+        return indexPattern;
+      }
+    },
+  } as unknown) as SearchSource;
+
+  const dataMock = dataPluginMock.createStartContract();
+  dataMock.query.timefilter.timefilter.getTime = () => {
+    return { from: '1991-03-29T08:04:00.694Z', to: '2021-03-29T07:04:00.695Z' };
+  };
+  dataMock.query.timefilter.timefilter.calculateBounds = (timeRange) => {
+    return calculateBounds(timeRange);
+  };
+
+  const aggsConfig = getChartAggConfigs(searchSource, 'auto', dataMock);
+  const actual = getDimensions(aggsConfig!, dataMock);
+  expect(actual).toMatchInlineSnapshot(`
+    Object {
+      "x": Object {
+        "accessor": 0,
+        "format": Object {
+          "id": "date",
+          "params": Object {
+            "pattern": "HH:mm:ss.SSS",
+          },
+        },
+        "label": "timestamp per 0 milliseconds",
+        "params": Object {
+          "bounds": Object {
+            "max": "2021-03-29T07:04:00.695Z",
+            "min": "1991-03-29T08:04:00.694Z",
+          },
+          "date": true,
+          "format": "HH:mm:ss.SSS",
+          "interval": "P0D",
+          "intervalESUnit": "ms",
+          "intervalESValue": 0,
+        },
+      },
+      "y": Object {
+        "accessor": 1,
+        "format": Object {
+          "id": "number",
+        },
+        "label": "Count",
+      },
+    }
+  `);
+});
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_dimensions.ts b/src/plugins/discover/public/application/apps/main/utils/get_dimensions.ts
new file mode 100644
index 0000000000000..40b378f1c1698
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_dimensions.ts
@@ -0,0 +1,56 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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';
+import dateMath from '@elastic/datemath';
+import { IAggConfigs } from '../../../../../../data/common';
+import { DataPublicPluginStart, search } from '../../../../../../data/public';
+import { Dimensions, HistogramParamsBounds } from '../components/chart/point_series';
+
+export function getDimensions(
+  aggs: IAggConfigs,
+  data: DataPublicPluginStart
+): Dimensions | undefined {
+  const [metric, agg] = aggs.aggs;
+  const { from, to } = data.query.timefilter.timefilter.getTime();
+  agg.params.timeRange = {
+    from: dateMath.parse(from),
+    to: dateMath.parse(to, { roundUp: true }),
+  };
+  const bounds = agg.params.timeRange
+    ? (data.query.timefilter.timefilter.calculateBounds(
+        agg.params.timeRange
+      ) as HistogramParamsBounds)
+    : null;
+  const buckets = search.aggs.isDateHistogramBucketAggConfig(agg) ? agg.buckets : undefined;
+
+  if (!buckets || !bounds) {
+    return;
+  }
+
+  const { esUnit, esValue } = buckets.getInterval();
+  return {
+    x: {
+      accessor: 0,
+      label: agg.makeLabel(),
+      format: agg.toSerializedFieldFormat(),
+      params: {
+        date: true,
+        interval: moment.duration(esValue, esUnit),
+        intervalESValue: esValue,
+        intervalESUnit: esUnit,
+        format: buckets.getScaledDateFormat(),
+        bounds,
+      },
+    },
+    y: {
+      accessor: 1,
+      format: metric.toSerializedFieldFormat(),
+      label: metric.makeLabel(),
+    },
+  };
+}
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_result_state.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_result_state.test.ts
new file mode 100644
index 0000000000000..512bc4240352c
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_result_state.test.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 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 { getResultState, resultStatuses } from './get_result_state';
+import { ElasticSearchHit } from '../../../doc_views/doc_views_types';
+import { FetchStatus } from '../../../types';
+
+describe('getResultState', () => {
+  test('fetching uninitialized', () => {
+    const actual = getResultState(FetchStatus.UNINITIALIZED, []);
+    expect(actual).toBe(resultStatuses.UNINITIALIZED);
+  });
+
+  test('fetching complete with no records', () => {
+    const actual = getResultState(FetchStatus.COMPLETE, []);
+    expect(actual).toBe(resultStatuses.NO_RESULTS);
+  });
+
+  test('fetching ongoing aka loading', () => {
+    const actual = getResultState(FetchStatus.LOADING, []);
+    expect(actual).toBe(resultStatuses.LOADING);
+  });
+
+  test('fetching ready', () => {
+    const record = ({ _id: 123 } as unknown) as ElasticSearchHit;
+    const actual = getResultState(FetchStatus.COMPLETE, [record]);
+    expect(actual).toBe(resultStatuses.READY);
+  });
+
+  test('re-fetching after already data is available', () => {
+    const record = ({ _id: 123 } as unknown) as ElasticSearchHit;
+    const actual = getResultState(FetchStatus.LOADING, [record]);
+    expect(actual).toBe(resultStatuses.READY);
+  });
+
+  test('after a fetch error when data was successfully fetched before ', () => {
+    const record = ({ _id: 123 } as unknown) as ElasticSearchHit;
+    const actual = getResultState(FetchStatus.ERROR, [record]);
+    expect(actual).toBe(resultStatuses.READY);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_result_state.ts b/src/plugins/discover/public/application/apps/main/utils/get_result_state.ts
new file mode 100644
index 0000000000000..80d25566ea578
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_result_state.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 { ElasticSearchHit } from '../../../doc_views/doc_views_types';
+import { FetchStatus } from '../../../types';
+
+export const resultStatuses = {
+  UNINITIALIZED: 'uninitialized',
+  LOADING: 'loading', // initial data load
+  READY: 'ready', // results came back
+  NO_RESULTS: 'none', // no results came back
+};
+
+/**
+ * Returns the current state of the result, depends on fetchStatus and the given fetched rows
+ * Determines what is displayed in Discover main view (loading view, data view, empty data view, ...)
+ */
+export function getResultState(fetchStatus: FetchStatus, rows: ElasticSearchHit[]) {
+  if (fetchStatus === FetchStatus.UNINITIALIZED) {
+    return resultStatuses.UNINITIALIZED;
+  }
+
+  const rowsEmpty = !Array.isArray(rows) || rows.length === 0;
+  if (rowsEmpty && fetchStatus === FetchStatus.LOADING) return resultStatuses.LOADING;
+  else if (!rowsEmpty) return resultStatuses.READY;
+  else return resultStatuses.NO_RESULTS;
+}
diff --git a/src/plugins/discover/public/application/helpers/get_sharing_data.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts
similarity index 96%
rename from src/plugins/discover/public/application/helpers/get_sharing_data.test.ts
rename to src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts
index 6a51c085ebbc9..ffad3d955c1a3 100644
--- a/src/plugins/discover/public/application/helpers/get_sharing_data.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.test.ts
@@ -8,9 +8,9 @@
 
 import { Capabilities, IUiSettingsClient } from 'kibana/public';
 import { IndexPattern } from 'src/plugins/data/public';
-import { createSearchSourceMock } from '../../../../data/common/search/search_source/mocks';
-import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../common';
-import { indexPatternMock } from '../../__mocks__/index_pattern';
+import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
+import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
+import { indexPatternMock } from '../../../../__mocks__/index_pattern';
 import { getSharingData, showPublicUrlSwitch } from './get_sharing_data';
 
 describe('getSharingData', () => {
diff --git a/src/plugins/discover/public/application/helpers/get_sharing_data.ts b/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts
similarity index 87%
rename from src/plugins/discover/public/application/helpers/get_sharing_data.ts
rename to src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts
index 47be4b8037152..00473956c57e3 100644
--- a/src/plugins/discover/public/application/helpers/get_sharing_data.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_sharing_data.ts
@@ -7,11 +7,11 @@
  */
 
 import type { Capabilities, IUiSettingsClient } from 'kibana/public';
-import { ISearchSource } from '../../../../data/common';
-import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../common';
-import type { SavedSearch, SortOrder } from '../../saved_searches/types';
-import { AppState } from '../angular/discover_state';
-import { getSortForSearchSource } from '../angular/doc_table';
+import { ISearchSource } from '../../../../../../data/common';
+import { DOC_HIDE_TIME_COLUMN_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
+import type { SavedSearch, SortOrder } from '../../../../saved_searches/types';
+import { AppState } from '../services/discover_state';
+import { getSortForSearchSource } from '../../../angular/doc_table';
 
 /**
  * Preparing data to share the current state as link or CSV/Report
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.test.ts
new file mode 100644
index 0000000000000..17f1802a47327
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.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 { getStateDefaults } from './get_state_defaults';
+import { createSearchSourceMock, dataPluginMock } from '../../../../../../data/public/mocks';
+import { uiSettingsMock } from '../../../../__mocks__/ui_settings';
+import { indexPatternWithTimefieldMock } from '../../../../__mocks__/index_pattern_with_timefield';
+import { savedSearchMock } from '../../../../__mocks__/saved_search';
+import { indexPatternMock } from '../../../../__mocks__/index_pattern';
+
+describe('getStateDefaults', () => {
+  test('index pattern with timefield', () => {
+    savedSearchMock.searchSource = createSearchSourceMock({ index: indexPatternWithTimefieldMock });
+    const actual = getStateDefaults({
+      config: uiSettingsMock,
+      data: dataPluginMock.createStartContract(),
+      savedSearch: savedSearchMock,
+    });
+    expect(actual).toMatchInlineSnapshot(`
+      Object {
+        "columns": Array [
+          "default_column",
+        ],
+        "filters": undefined,
+        "index": "index-pattern-with-timefield-id",
+        "interval": "auto",
+        "query": undefined,
+        "sort": Array [
+          Array [
+            "timestamp",
+            "desc",
+          ],
+        ],
+      }
+    `);
+  });
+
+  test('index pattern without timefield', () => {
+    savedSearchMock.searchSource = createSearchSourceMock({ index: indexPatternMock });
+
+    const actual = getStateDefaults({
+      config: uiSettingsMock,
+      data: dataPluginMock.createStartContract(),
+      savedSearch: savedSearchMock,
+    });
+    expect(actual).toMatchInlineSnapshot(`
+      Object {
+        "columns": Array [
+          "default_column",
+        ],
+        "filters": undefined,
+        "index": "the-index-pattern-id",
+        "interval": "auto",
+        "query": undefined,
+        "sort": Array [],
+      }
+    `);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.ts
new file mode 100644
index 0000000000000..426272fa8ce1c
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/get_state_defaults.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 { cloneDeep } from 'lodash';
+import { IUiSettingsClient } from 'kibana/public';
+import { DEFAULT_COLUMNS_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
+import { getSortArray } from '../../../angular/doc_table';
+import { getDefaultSort } from '../../../angular/doc_table/lib/get_default_sort';
+import { SavedSearch } from '../../../../saved_searches';
+import { DataPublicPluginStart } from '../../../../../../data/public';
+
+import { AppState } from '../services/discover_state';
+
+function getDefaultColumns(savedSearch: SavedSearch, config: IUiSettingsClient) {
+  if (savedSearch.columns && savedSearch.columns.length > 0) {
+    return [...savedSearch.columns];
+  }
+  return [...config.get(DEFAULT_COLUMNS_SETTING)];
+}
+
+export function getStateDefaults({
+  config,
+  data,
+  savedSearch,
+}: {
+  config: IUiSettingsClient;
+  data: DataPublicPluginStart;
+  savedSearch: SavedSearch;
+}) {
+  const searchSource = savedSearch.searchSource;
+  const indexPattern = savedSearch.searchSource.getField('index');
+  const query = searchSource.getField('query') || data.query.queryString.getDefaultQuery();
+  const sort = getSortArray(savedSearch.sort, indexPattern!);
+  const columns = getDefaultColumns(savedSearch, config);
+
+  const defaultState = {
+    query,
+    sort: !sort.length
+      ? getDefaultSort(indexPattern, config.get(SORT_DEFAULT_ORDER_SETTING, 'desc'))
+      : sort,
+    columns,
+    index: indexPattern!.id,
+    interval: 'auto',
+    filters: cloneDeep(searchSource.getOwnField('filter')),
+  } as AppState;
+  if (savedSearch.grid) {
+    defaultState.grid = savedSearch.grid;
+  }
+  if (savedSearch.hideChart) {
+    defaultState.hideChart = savedSearch.hideChart;
+  }
+
+  return defaultState;
+}
diff --git a/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.test.ts b/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts
similarity index 98%
rename from src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.test.ts
rename to src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts
index 31addd807b78d..9f9071ed403ce 100644
--- a/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.test.ts
@@ -7,7 +7,7 @@
  */
 
 import { getSwitchIndexPatternAppState } from './get_switch_index_pattern_app_state';
-import { IndexPattern } from '../../../../data/common/index_patterns';
+import { IndexPattern } from '../../../../../../data/common/index_patterns';
 
 /**
  * Helper function returning an index pattern
diff --git a/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.ts b/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.ts
similarity index 90%
rename from src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.ts
rename to src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.ts
index 9756fc8fd448b..f7154b26c7ed6 100644
--- a/src/plugins/discover/public/application/helpers/get_switch_index_pattern_app_state.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/get_switch_index_pattern_app_state.ts
@@ -6,9 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { getSortArray } from '../angular/doc_table';
-import { SortPairArr } from '../angular/doc_table/lib/get_sort';
-import { IndexPattern } from '../../kibana_services';
+import { getSortArray } from '../../../angular/doc_table';
+import { SortPairArr } from '../../../angular/doc_table/lib/get_sort';
+import { IndexPattern } from '../../../../kibana_services';
 
 /**
  * Helper function to remove or adapt the currently selected columns/sort to be valid with the next
diff --git a/src/plugins/discover/public/application/apps/main/utils/index.ts b/src/plugins/discover/public/application/apps/main/utils/index.ts
new file mode 100644
index 0000000000000..a79dea526ec55
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/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 { getChartAggConfigs } from './get_chart_agg_configs';
+export { getDimensions } from './get_dimensions';
diff --git a/src/plugins/discover/public/application/helpers/nested_fields.ts b/src/plugins/discover/public/application/apps/main/utils/nested_fields.ts
similarity index 100%
rename from src/plugins/discover/public/application/helpers/nested_fields.ts
rename to src/plugins/discover/public/application/apps/main/utils/nested_fields.ts
diff --git a/src/plugins/discover/public/application/helpers/persist_saved_search.ts b/src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts
similarity index 75%
rename from src/plugins/discover/public/application/helpers/persist_saved_search.ts
rename to src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts
index f44d4650da56a..a5e1e2bb6c2ea 100644
--- a/src/plugins/discover/public/application/helpers/persist_saved_search.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/persist_saved_search.ts
@@ -7,12 +7,12 @@
  */
 
 import { updateSearchSource } from './update_search_source';
-import { IndexPattern } from '../../../../data/public';
-import { SavedSearch } from '../../saved_searches';
-import { AppState } from '../angular/discover_state';
-import { SortOrder } from '../../saved_searches/types';
-import { SavedObjectSaveOpts } from '../../../../saved_objects/public';
-import { DiscoverServices } from '../../build_services';
+import { IndexPattern } from '../../../../../../data/public';
+import { SavedSearch } from '../../../../saved_searches';
+import { AppState } from '../services/discover_state';
+import { SortOrder } from '../../../../saved_searches/types';
+import { SavedObjectSaveOpts } from '../../../../../../saved_objects/public';
+import { DiscoverServices } from '../../../../build_services';
 
 /**
  * Helper function to update and persist the given savedSearch
@@ -35,12 +35,10 @@ export async function persistSavedSearch(
     state: AppState;
   }
 ) {
-  updateSearchSource({
-    persistentSearchSource: savedSearch.searchSource,
+  updateSearchSource(savedSearch.searchSource, true, {
     indexPattern,
     services,
     sort: state.sort as SortOrder[],
-    columns: state.columns || [],
     useNewFieldsApi: false,
   });
 
diff --git a/src/plugins/discover/public/application/helpers/resolve_index_pattern.test.ts b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.test.ts
similarity index 89%
rename from src/plugins/discover/public/application/helpers/resolve_index_pattern.test.ts
rename to src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.test.ts
index 50ff068086b0a..9ebbeafd28e10 100644
--- a/src/plugins/discover/public/application/helpers/resolve_index_pattern.test.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.test.ts
@@ -11,9 +11,9 @@ import {
   getFallbackIndexPatternId,
   IndexPatternSavedObject,
 } from './resolve_index_pattern';
-import { indexPatternsMock } from '../../__mocks__/index_patterns';
-import { indexPatternMock } from '../../__mocks__/index_pattern';
-import { configMock } from '../../__mocks__/config';
+import { indexPatternsMock } from '../../../../__mocks__/index_patterns';
+import { indexPatternMock } from '../../../../__mocks__/index_pattern';
+import { configMock } from '../../../../__mocks__/config';
 
 describe('Resolve index pattern tests', () => {
   test('returns valid data for an existing index pattern', async () => {
diff --git a/src/plugins/discover/public/application/helpers/resolve_index_pattern.ts b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
similarity index 95%
rename from src/plugins/discover/public/application/helpers/resolve_index_pattern.ts
rename to src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
index 3e22917f3f482..a5149ea2b3dd7 100644
--- a/src/plugins/discover/public/application/helpers/resolve_index_pattern.ts
+++ b/src/plugins/discover/public/application/apps/main/utils/resolve_index_pattern.ts
@@ -8,8 +8,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { IUiSettingsClient, SavedObject, ToastsStart } from 'kibana/public';
-import { IndexPattern } from '../../kibana_services';
-import { IndexPatternsService, SearchSource } from '../../../../data/common';
+import { IndexPattern } from '../../../../kibana_services';
+import { IndexPatternsContract, SearchSource } from '../../../../../../data/common';
 
 export type IndexPatternSavedObject = SavedObject & { title: string };
 
@@ -77,7 +77,7 @@ export function getIndexPatternId(
  */
 export async function loadIndexPattern(
   id: string,
-  indexPatterns: IndexPatternsService,
+  indexPatterns: IndexPatternsContract,
   config: IUiSettingsClient
 ): Promise<IndexPatternData> {
   const indexPatternList = ((await indexPatterns.getCache()) as unknown) as IndexPatternSavedObject[];
diff --git a/src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts b/src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts
new file mode 100644
index 0000000000000..9deabf96732b1
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/update_search_source.test.ts
@@ -0,0 +1,141 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { updateSearchSource } from './update_search_source';
+import { createSearchSourceMock } from '../../../../../../data/common/search/search_source/mocks';
+import { indexPatternMock } from '../../../../__mocks__/index_pattern';
+import { IUiSettingsClient } from 'kibana/public';
+import { DiscoverServices } from '../../../../build_services';
+import { dataPluginMock } from '../../../../../../data/public/mocks';
+import { SAMPLE_SIZE_SETTING } from '../../../../../common';
+import { SortOrder } from '../../../../saved_searches/types';
+
+describe('updateSearchSource', () => {
+  test('updates a given search source', async () => {
+    const persistentSearchSourceMock = createSearchSourceMock({});
+    const volatileSearchSourceMock = createSearchSourceMock({});
+    volatileSearchSourceMock.setParent(persistentSearchSourceMock);
+    const sampleSize = 250;
+    updateSearchSource(volatileSearchSourceMock, false, {
+      indexPattern: indexPatternMock,
+      services: ({
+        data: dataPluginMock.createStartContract(),
+        timefilter: {
+          createFilter: jest.fn(),
+        },
+        uiSettings: ({
+          get: (key: string) => {
+            if (key === SAMPLE_SIZE_SETTING) {
+              return sampleSize;
+            }
+            return false;
+          },
+        } as unknown) as IUiSettingsClient,
+      } as unknown) as DiscoverServices,
+      sort: [] as SortOrder[],
+      useNewFieldsApi: false,
+    });
+    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
+    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
+    expect(volatileSearchSourceMock.getField('fields')).toBe(undefined);
+  });
+
+  test('updates a given search source with the usage of the new fields api', async () => {
+    const persistentSearchSourceMock = createSearchSourceMock({});
+    const volatileSearchSourceMock = createSearchSourceMock({});
+    volatileSearchSourceMock.setParent(persistentSearchSourceMock);
+    const sampleSize = 250;
+    updateSearchSource(volatileSearchSourceMock, false, {
+      indexPattern: indexPatternMock,
+      services: ({
+        data: dataPluginMock.createStartContract(),
+        timefilter: {
+          createFilter: jest.fn(),
+        },
+        uiSettings: ({
+          get: (key: string) => {
+            if (key === SAMPLE_SIZE_SETTING) {
+              return sampleSize;
+            }
+            return false;
+          },
+        } as unknown) as IUiSettingsClient,
+      } as unknown) as DiscoverServices,
+      sort: [] as SortOrder[],
+      useNewFieldsApi: true,
+    });
+    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
+    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
+    expect(volatileSearchSourceMock.getField('fields')).toEqual([
+      { field: '*', include_unmapped: 'true' },
+    ]);
+    expect(volatileSearchSourceMock.getField('fieldsFromSource')).toBe(undefined);
+  });
+
+  test('updates a given search source when showUnmappedFields option is set to true', async () => {
+    const persistentSearchSourceMock = createSearchSourceMock({});
+    const volatileSearchSourceMock = createSearchSourceMock({});
+    volatileSearchSourceMock.setParent(persistentSearchSourceMock);
+    const sampleSize = 250;
+    updateSearchSource(volatileSearchSourceMock, false, {
+      indexPattern: indexPatternMock,
+      services: ({
+        data: dataPluginMock.createStartContract(),
+        timefilter: {
+          createFilter: jest.fn(),
+        },
+        uiSettings: ({
+          get: (key: string) => {
+            if (key === SAMPLE_SIZE_SETTING) {
+              return sampleSize;
+            }
+            return false;
+          },
+        } as unknown) as IUiSettingsClient,
+      } as unknown) as DiscoverServices,
+      sort: [] as SortOrder[],
+      useNewFieldsApi: true,
+    });
+    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
+    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
+    expect(volatileSearchSourceMock.getField('fields')).toEqual([
+      { field: '*', include_unmapped: 'true' },
+    ]);
+    expect(volatileSearchSourceMock.getField('fieldsFromSource')).toBe(undefined);
+  });
+
+  test('does not explicitly request fieldsFromSource when not using fields API', async () => {
+    const persistentSearchSourceMock = createSearchSourceMock({});
+    const volatileSearchSourceMock = createSearchSourceMock({});
+    volatileSearchSourceMock.setParent(persistentSearchSourceMock);
+    const sampleSize = 250;
+    updateSearchSource(volatileSearchSourceMock, false, {
+      indexPattern: indexPatternMock,
+      services: ({
+        data: dataPluginMock.createStartContract(),
+        timefilter: {
+          createFilter: jest.fn(),
+        },
+        uiSettings: ({
+          get: (key: string) => {
+            if (key === SAMPLE_SIZE_SETTING) {
+              return sampleSize;
+            }
+            return false;
+          },
+        } as unknown) as IUiSettingsClient,
+      } as unknown) as DiscoverServices,
+      sort: [] as SortOrder[],
+      useNewFieldsApi: false,
+    });
+    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
+    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
+    expect(volatileSearchSourceMock.getField('fields')).toEqual(undefined);
+    expect(volatileSearchSourceMock.getField('fieldsFromSource')).toBe(undefined);
+  });
+});
diff --git a/src/plugins/discover/public/application/apps/main/utils/update_search_source.ts b/src/plugins/discover/public/application/apps/main/utils/update_search_source.ts
new file mode 100644
index 0000000000000..c72e207102e81
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/update_search_source.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.
+ */
+
+import { getSortForSearchSource } from '../../../angular/doc_table';
+import { SAMPLE_SIZE_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../../../common';
+import { IndexPattern, ISearchSource } from '../../../../../../data/common';
+import { SortOrder } from '../../../../saved_searches/types';
+import { DiscoverServices } from '../../../../build_services';
+import { indexPatterns as indexPatternsUtils } from '../../../../../../data/public';
+
+/**
+ * Helper function to update the given searchSource before fetching/sharing/persisting
+ */
+export function updateSearchSource(
+  searchSource: ISearchSource,
+  persist = true,
+  {
+    indexPattern,
+    services,
+    sort,
+    useNewFieldsApi,
+  }: {
+    indexPattern: IndexPattern;
+    services: DiscoverServices;
+    sort: SortOrder[];
+    useNewFieldsApi: boolean;
+  }
+) {
+  const { uiSettings, data } = services;
+  const usedSort = getSortForSearchSource(
+    sort,
+    indexPattern,
+    uiSettings.get(SORT_DEFAULT_ORDER_SETTING)
+  );
+  const usedSearchSource = persist ? searchSource : searchSource.getParent()!;
+
+  usedSearchSource
+    .setField('index', indexPattern)
+    .setField('query', data.query.queryString.getQuery() || null)
+    .setField('filter', data.query.filterManager.getFilters());
+
+  if (!persist) {
+    searchSource
+      .setField('trackTotalHits', true)
+      .setField('size', uiSettings.get(SAMPLE_SIZE_SETTING))
+      .setField('sort', usedSort)
+      .setField('highlightAll', true)
+      .setField('version', true)
+      // Even when searching rollups, we want to use the default strategy so that we get back a
+      // document-like response.
+      .setPreferredSearchStrategyId('default');
+
+    // this is not the default index pattern, it determines that it's not of type rollup
+    if (indexPatternsUtils.isDefault(indexPattern)) {
+      searchSource.setField('filter', data.query.timefilter.timefilter.createFilter(indexPattern));
+    }
+
+    if (useNewFieldsApi) {
+      searchSource.removeField('fieldsFromSource');
+      const fields: Record<string, string> = { field: '*' };
+
+      fields.include_unmapped = 'true';
+
+      searchSource.setField('fields', [fields]);
+    } else {
+      searchSource.removeField('fields');
+    }
+  }
+}
diff --git a/src/plugins/discover/public/application/apps/main/utils/use_singleton.ts b/src/plugins/discover/public/application/apps/main/utils/use_singleton.ts
new file mode 100644
index 0000000000000..bac195896caa3
--- /dev/null
+++ b/src/plugins/discover/public/application/apps/main/utils/use_singleton.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 { useRef } from 'react';
+
+/**
+ * Allows lazy initialization of a singleton
+ * Context: https://reactjs.org/docs/hooks-faq.html#how-to-create-expensive-objects-lazily
+ * Why not using useMemo: We're using the useMemo here also kind of as a guarantee to
+ * only instantiate that subject once. Unfortunately useMemo explicitly does not give
+ * those guarantees:
+ * https://reactjs.org/docs/hooks-reference.html#usememo
+ */
+export function useSingleton<T>(initialize: () => T): T {
+  const ref = useRef<T | null>(null);
+
+  if (ref.current === null) {
+    ref.current = initialize();
+  }
+
+  return ref.current;
+}
diff --git a/src/plugins/discover/public/application/helpers/validate_time_range.test.ts b/src/plugins/discover/public/application/apps/main/utils/validate_time_range.test.ts
similarity index 94%
rename from src/plugins/discover/public/application/helpers/validate_time_range.test.ts
rename to src/plugins/discover/public/application/apps/main/utils/validate_time_range.test.ts
index cd90be434aa5e..8d9d9adc4e8dc 100644
--- a/src/plugins/discover/public/application/helpers/validate_time_range.test.ts
+++ b/src/plugins/discover/public/application/apps/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 '../../../../../../../core/public/mocks';
 
 describe('Discover validateTimeRange', () => {
   test('validates given time ranges correctly', async () => {
diff --git a/src/plugins/discover/public/application/helpers/validate_time_range.ts b/src/plugins/discover/public/application/apps/main/utils/validate_time_range.ts
similarity index 100%
rename from src/plugins/discover/public/application/helpers/validate_time_range.ts
rename to src/plugins/discover/public/application/apps/main/utils/validate_time_range.ts
diff --git a/src/plugins/discover/public/application/components/constants.ts b/src/plugins/discover/public/application/components/constants.ts
deleted file mode 100644
index 42845e83b7435..0000000000000
--- a/src/plugins/discover/public/application/components/constants.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 fetchStatuses = {
-  UNINITIALIZED: 'uninitialized',
-  LOADING: 'loading',
-  COMPLETE: 'complete',
-  ERROR: 'error',
-};
diff --git a/src/plugins/discover/public/application/components/context_app/context_app_legacy.scss b/src/plugins/discover/public/application/components/context_app/context_app_legacy.scss
new file mode 100644
index 0000000000000..9ff36ca452742
--- /dev/null
+++ b/src/plugins/discover/public/application/components/context_app/context_app_legacy.scss
@@ -0,0 +1,24 @@
+@import '../../../../../../core/public/mixins';
+
+.dscDocsPage {
+  @include kibanaFullBodyHeight(54px); // action bar height
+}
+
+.dscDocsContent {
+  display: flex;
+  flex-direction: column;
+  height: 100%;
+}
+
+.dscDocsGrid {
+  flex: 1 1 100%;
+  overflow: auto;
+
+  &__cell--highlight {
+    background-color: tintOrShade($euiColorPrimary, 90%, 70%);
+  }
+
+  .euiDataGridRowCell.euiDataGridRowCell--firstColumn {
+    padding: 0;
+  }
+}
diff --git a/src/plugins/discover/public/application/components/context_app/context_app_legacy.test.tsx b/src/plugins/discover/public/application/components/context_app/context_app_legacy.test.tsx
index 63845ab97b954..7d947d8412be5 100644
--- a/src/plugins/discover/public/application/components/context_app/context_app_legacy.test.tsx
+++ b/src/plugins/discover/public/application/components/context_app/context_app_legacy.test.tsx
@@ -7,14 +7,34 @@
  */
 
 import React from 'react';
-import { ContextAppLegacy } from './context_app_legacy';
-import { IIndexPattern } from '../../../../../data/common/index_patterns';
 import { mountWithIntl } from '@kbn/test/jest';
+import { uiSettingsMock as mockUiSettings } from '../../../__mocks__/ui_settings';
+import { IndexPattern } from '../../../../../data/common/index_patterns';
+import { ContextAppLegacy } from './context_app_legacy';
 import { DocTableLegacy } from '../../angular/doc_table/create_doc_table_react';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { ActionBar } from '../../angular/context/components/action_bar/action_bar';
 import { ContextErrorMessage } from '../context_error_message';
 import { TopNavMenuMock } from './__mocks__/top_nav_menu';
+import { AppState, GetStateReturn } from '../../angular/context_state';
+import { SortDirection } from 'src/plugins/data/common';
+import { EsHitRecordList } from '../../angular/context/api/context';
+
+jest.mock('../../../kibana_services', () => {
+  return {
+    getServices: () => ({
+      metadata: {
+        branch: 'test',
+      },
+      capabilities: {
+        discover: {
+          save: true,
+        },
+      },
+      uiSettings: mockUiSettings,
+    }),
+  };
+});
 
 describe('ContextAppLegacy test', () => {
   const hit = {
@@ -35,16 +55,19 @@ describe('ContextAppLegacy test', () => {
   };
   const indexPattern = {
     id: 'test_index_pattern',
-  } as IIndexPattern;
+  } as IndexPattern;
   const defaultProps = {
     columns: ['_source'],
     filter: () => {},
-    hits: [hit],
-    sorting: ['order_date', 'desc'],
+    hits: ([hit] as unknown) as EsHitRecordList,
+    sorting: [['order_date', 'desc']] as Array<[string, SortDirection]>,
     minimumVisibleRows: 5,
     indexPattern,
-    status: 'loaded',
-    reason: 'no reason',
+    appState: ({} as unknown) as AppState,
+    stateContainer: ({} as unknown) as GetStateReturn,
+    anchorId: 'test_anchor_id',
+    anchorStatus: 'loaded',
+    anchorReason: 'no reason',
     defaultStepSize: 5,
     predecessorCount: 10,
     successorCount: 10,
@@ -55,6 +78,8 @@ describe('ContextAppLegacy test', () => {
     predecessorStatus: 'loaded',
     successorStatus: 'loaded',
     topNavMenu: TopNavMenuMock,
+    useNewFieldsApi: false,
+    isPaginationEnabled: false,
   };
   const topNavProps = {
     appName: 'context',
@@ -80,7 +105,7 @@ describe('ContextAppLegacy test', () => {
 
   it('renders loading indicator', () => {
     const props = { ...defaultProps };
-    props.status = 'loading';
+    props.anchorStatus = 'loading';
     const component = mountWithIntl(<ContextAppLegacy {...props} />);
     expect(component.find(DocTableLegacy).length).toBe(0);
     const loadingIndicator = findTestSubject(component, 'contextApp_loadingIndicator');
@@ -91,8 +116,8 @@ describe('ContextAppLegacy test', () => {
 
   it('renders error message', () => {
     const props = { ...defaultProps };
-    props.status = 'failed';
-    props.reason = 'something went wrong';
+    props.anchorStatus = 'failed';
+    props.anchorReason = 'something went wrong';
     const component = mountWithIntl(<ContextAppLegacy {...props} />);
     expect(component.find(DocTableLegacy).length).toBe(0);
     expect(component.find(TopNavMenuMock).length).toBe(0);
diff --git a/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx b/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx
index 55c2208105f13..1251687805af1 100644
--- a/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx
+++ b/src/plugins/discover/public/application/components/context_app/context_app_legacy.tsx
@@ -6,29 +6,43 @@
  * Side Public License, v 1.
  */
 
-import React from 'react';
+import React, { useState, Fragment } from 'react';
+import classNames from 'classnames';
 import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
-import { EuiHorizontalRule, EuiText, EuiPageContent, EuiPage } from '@elastic/eui';
+import './context_app_legacy.scss';
+import { EuiHorizontalRule, EuiText, EuiPageContent, EuiPage, EuiSpacer } from '@elastic/eui';
+import { DOC_HIDE_TIME_COLUMN_SETTING, DOC_TABLE_LEGACY } from '../../../../common';
 import { ContextErrorMessage } from '../context_error_message';
 import {
   DocTableLegacy,
   DocTableLegacyProps,
 } from '../../angular/doc_table/create_doc_table_react';
-import { IIndexPattern, IndexPatternField } from '../../../../../data/common/index_patterns';
+import { IndexPattern } from '../../../../../data/common/index_patterns';
 import { LoadingStatus } from '../../angular/context_app_state';
 import { ActionBar, ActionBarProps } from '../../angular/context/components/action_bar/action_bar';
 import { TopNavMenuProps } from '../../../../../navigation/public';
+import { DiscoverGrid, DiscoverGridProps } from '../discover_grid/discover_grid';
+import { DocViewFilterFn } from '../../doc_views/doc_views_types';
+import { getServices, SortDirection } from '../../../kibana_services';
+import { GetStateReturn, AppState } from '../../angular/context_state';
+import { useDataGridColumns } from '../../helpers/use_data_grid_columns';
+import { EsHitRecord, EsHitRecordList } from '../../angular/context/api/context';
 
 export interface ContextAppProps {
   topNavMenu: React.ComponentType<TopNavMenuProps>;
   columns: string[];
-  hits: Array<Record<string, unknown>>;
-  indexPattern: IIndexPattern;
-  filter: (field: IndexPatternField | string, value: string, type: '+' | '-') => void;
+  hits: EsHitRecordList;
+  indexPattern: IndexPattern;
+  appState: AppState;
+  stateContainer: GetStateReturn;
+  filter: DocViewFilterFn;
   minimumVisibleRows: number;
-  sorting: string[];
-  status: string;
-  reason: string;
+  sorting: Array<[string, SortDirection]>;
+  anchorId: string;
+  anchorStatus: string;
+  anchorReason: string;
+  predecessorStatus: string;
+  successorStatus: string;
   defaultStepSize: number;
   predecessorCount: number;
   successorCount: number;
@@ -36,11 +50,10 @@ export interface ContextAppProps {
   successorAvailable: number;
   onChangePredecessorCount: (count: number) => void;
   onChangeSuccessorCount: (count: number) => void;
-  predecessorStatus: string;
-  successorStatus: string;
   useNewFieldsApi?: boolean;
 }
 
+const DataGridMemoized = React.memo(DiscoverGrid);
 const PREDECESSOR_TYPE = 'predecessors';
 const SUCCESSOR_TYPE = 'successors';
 
@@ -49,9 +62,36 @@ function isLoading(status: string) {
 }
 
 export function ContextAppLegacy(renderProps: ContextAppProps) {
-  const status = renderProps.status;
-  const isLoaded = status === LoadingStatus.LOADED;
-  const isFailed = status === LoadingStatus.FAILED;
+  const services = getServices();
+  const { uiSettings: config, capabilities, indexPatterns } = services;
+  const {
+    indexPattern,
+    anchorId,
+    anchorStatus,
+    predecessorStatus,
+    successorStatus,
+    appState,
+    stateContainer,
+    hits: rows,
+    sorting,
+    filter,
+    minimumVisibleRows,
+    useNewFieldsApi,
+  } = renderProps;
+  const [expandedDoc, setExpandedDoc] = useState<EsHitRecord | undefined>(undefined);
+  const isAnchorLoaded = anchorStatus === LoadingStatus.LOADED;
+  const isFailed = anchorStatus === LoadingStatus.FAILED;
+  const isLegacy = config.get(DOC_TABLE_LEGACY);
+
+  const { columns, onAddColumn, onRemoveColumn, onSetColumns } = useDataGridColumns({
+    capabilities,
+    config,
+    indexPattern,
+    indexPatterns,
+    setAppState: stateContainer.setAppState,
+    state: appState,
+    useNewFieldsApi: !!useNewFieldsApi,
+  });
 
   const actionBarProps = (type: string) => {
     const {
@@ -60,8 +100,6 @@ export function ContextAppLegacy(renderProps: ContextAppProps) {
       predecessorCount,
       predecessorAvailable,
       successorAvailable,
-      predecessorStatus,
-      successorStatus,
       onChangePredecessorCount,
       onChangeSuccessorCount,
     } = renderProps;
@@ -73,27 +111,44 @@ export function ContextAppLegacy(renderProps: ContextAppProps) {
       onChangeCount: isPredecessorType ? onChangePredecessorCount : onChangeSuccessorCount,
       isLoading: isPredecessorType ? isLoading(predecessorStatus) : isLoading(successorStatus),
       type,
-      isDisabled: !isLoaded,
+      isDisabled: !isAnchorLoaded,
     } as ActionBarProps;
   };
 
   const docTableProps = () => {
-    const {
-      hits,
-      filter,
-      sorting,
+    return {
+      ariaLabelledBy: 'surDocumentsAriaLabel',
       columns,
+      rows,
       indexPattern,
-      minimumVisibleRows,
+      expandedDoc,
+      isLoading: isLoading(anchorStatus),
+      sampleSize: 0,
+      sort: sorting,
+      isSortEnabled: false,
+      showTimeCol: !config.get(DOC_HIDE_TIME_COLUMN_SETTING, false) && !!indexPattern.timeFieldName,
+      services,
       useNewFieldsApi,
-    } = renderProps;
+      isPaginationEnabled: false,
+      controlColumnIds: ['openDetails'],
+      setExpandedDoc,
+      onFilter: filter,
+      onAddColumn,
+      onRemoveColumn,
+      onSetColumns,
+    } as DiscoverGridProps;
+  };
+
+  const legacyDocTableProps = () => {
     // @ts-expect-error doesn't implement full DocTableLegacyProps interface
     return {
       columns,
       indexPattern,
       minimumVisibleRows,
-      rows: hits,
+      rows,
       onFilter: filter,
+      onAddColumn,
+      onRemoveColumn,
       sort: sorting.map((el) => [el]),
       useNewFieldsApi,
     } as DocTableLegacyProps;
@@ -114,7 +169,7 @@ export function ContextAppLegacy(renderProps: ContextAppProps) {
   };
 
   const loadingFeedback = () => {
-    if (status === LoadingStatus.UNINITIALIZED || status === LoadingStatus.LOADING) {
+    if (anchorStatus === LoadingStatus.UNINITIALIZED || anchorStatus === LoadingStatus.LOADING) {
       return (
         <EuiText textAlign="center" data-test-subj="contextApp_loadingIndicator">
           <FormattedMessage id="discover.context.loadingDescription" defaultMessage="Loading..." />
@@ -127,25 +182,42 @@ export function ContextAppLegacy(renderProps: ContextAppProps) {
   return (
     <I18nProvider>
       {isFailed ? (
-        <ContextErrorMessage status={status} reason={renderProps.reason} />
+        <ContextErrorMessage status={anchorStatus} reason={renderProps.anchorReason} />
       ) : (
-        <div>
+        <Fragment>
           <TopNavMenu {...getNavBarProps()} />
-          <EuiPage>
-            <EuiPageContent paddingSize="s" className="dscCxtAppContent">
+          <EuiPage className={classNames({ dscDocsPage: !isLegacy })}>
+            <EuiPageContent paddingSize="s" className="dscDocsContent">
+              <EuiSpacer size="s" />
+              <EuiText>
+                <strong>
+                  <FormattedMessage
+                    id="discover.context.contextOfTitle"
+                    defaultMessage="Documents surrounding #{anchorId}"
+                    values={{ anchorId }}
+                  />
+                </strong>
+              </EuiText>
+              <EuiSpacer size="s" />
               <ActionBar {...actionBarProps(PREDECESSOR_TYPE)} />
-              {loadingFeedback()}
+              {isLegacy && loadingFeedback()}
               <EuiHorizontalRule margin="xs" />
-              {isLoaded ? (
-                <div className="discover-table">
-                  <DocTableLegacy {...docTableProps()} />
+              {isLegacy ? (
+                isAnchorLoaded && (
+                  <div className="discover-table">
+                    <DocTableLegacy {...legacyDocTableProps()} />
+                  </div>
+                )
+              ) : (
+                <div className="dscDocsGrid">
+                  <DataGridMemoized {...docTableProps()} />
                 </div>
-              ) : null}
+              )}
               <EuiHorizontalRule margin="xs" />
               <ActionBar {...actionBarProps(SUCCESSOR_TYPE)} />
             </EuiPageContent>
           </EuiPage>
-        </div>
+        </Fragment>
       )}
     </I18nProvider>
   );
diff --git a/src/plugins/discover/public/application/components/context_app/context_app_legacy_directive.ts b/src/plugins/discover/public/application/components/context_app/context_app_legacy_directive.ts
index fc64abfb51025..767ab8c94d80f 100644
--- a/src/plugins/discover/public/application/components/context_app/context_app_legacy_directive.ts
+++ b/src/plugins/discover/public/application/components/context_app/context_app_legacy_directive.ts
@@ -14,11 +14,14 @@ export function createContextAppLegacy(reactDirective: any) {
     ['filter', { watchDepth: 'reference' }],
     ['hits', { watchDepth: 'reference' }],
     ['indexPattern', { watchDepth: 'reference' }],
+    ['appState', { watchDepth: 'reference' }],
+    ['stateContainer', { watchDepth: 'reference' }],
     ['sorting', { watchDepth: 'reference' }],
     ['columns', { watchDepth: 'collection' }],
     ['minimumVisibleRows', { watchDepth: 'reference' }],
-    ['status', { watchDepth: 'reference' }],
-    ['reason', { watchDepth: 'reference' }],
+    ['anchorId', { watchDepth: 'reference' }],
+    ['anchorStatus', { watchDepth: 'reference' }],
+    ['anchorReason', { watchDepth: 'reference' }],
     ['defaultStepSize', { watchDepth: 'reference' }],
     ['predecessorCount', { watchDepth: 'reference' }],
     ['predecessorAvailable', { watchDepth: 'reference' }],
diff --git a/src/plugins/discover/public/application/components/create_discover_directive.ts b/src/plugins/discover/public/application/components/create_discover_directive.ts
deleted file mode 100644
index f8c74c07457aa..0000000000000
--- a/src/plugins/discover/public/application/components/create_discover_directive.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { Discover } from './discover';
-
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export function createDiscoverDirective(reactDirective: any) {
-  return reactDirective(Discover, [
-    ['fetch', { watchDepth: 'reference' }],
-    ['fetchCounter', { watchDepth: 'reference' }],
-    ['fetchError', { watchDepth: 'reference' }],
-    ['fieldCounts', { watchDepth: 'reference' }],
-    ['histogramData', { watchDepth: 'reference' }],
-    ['hits', { watchDepth: 'reference' }],
-    ['indexPattern', { watchDepth: 'reference' }],
-    ['opts', { watchDepth: 'reference' }],
-    ['resetQuery', { watchDepth: 'reference' }],
-    ['resultState', { watchDepth: 'reference' }],
-    ['rows', { watchDepth: 'reference' }],
-    ['savedSearch', { watchDepth: 'reference' }],
-    ['searchSource', { watchDepth: 'reference' }],
-    ['showSaveQuery', { watchDepth: 'reference' }],
-    ['state', { watchDepth: 'reference' }],
-    ['topNavMenu', { watchDepth: 'reference' }],
-    ['updateQuery', { watchDepth: 'reference' }],
-    ['updateSavedQueryId', { watchDepth: 'reference' }],
-    ['unmappedFieldsConfig', { watchDepth: 'value' }],
-    ['refreshAppState', { watchDepth: 'reference' }],
-  ]);
-}
diff --git a/src/plugins/discover/public/application/components/discover.scss b/src/plugins/discover/public/application/components/discover.scss
deleted file mode 100644
index 02e60700d49d8..0000000000000
--- a/src/plugins/discover/public/application/components/discover.scss
+++ /dev/null
@@ -1,105 +0,0 @@
-@import '../../../../../core/public/mixins';
-
-discover-app {
-  flex-grow: 1;
-}
-
-.dscPage {
-  @include euiBreakpoint('m', 'l', 'xl') {
-    @include kibanaFullBodyHeight();
-  }
-
-  flex-direction: column;
-  overflow: hidden;
-  padding: 0;
-
-  .dscPageBody {
-    overflow: hidden;
-  }
-}
-
-.dscPageBody__inner {
-  overflow: hidden;
-  height: 100%;
-}
-
-.dscPageBody__contents {
-  overflow: hidden;
-  padding-top: $euiSizeXS / 2; // A little breathing room for the index pattern button
-}
-
-.dscPageContent__wrapper {
-  padding: 0 $euiSize $euiSize 0;
-  overflow: hidden; // Ensures horizontal scroll of table
-
-  @include euiBreakpoint('xs', 's') {
-    padding: 0 $euiSize $euiSize;
-  }
-}
-
-.dscPageContent {
-  border: $euiBorderThin;
-}
-
-.dscPageContent,
-.dscPageContent__inner {
-  height: 100%;
-}
-
-.dscPageContent--centered {
-  height: auto;
-}
-
-.dscResultCount {
-  padding: $euiSizeS;
-  min-height: $euiSize * 3;
-
-  @include euiBreakpoint('xs', 's') {
-    .dscResultCount__toggle {
-      align-items: flex-end;
-    }
-
-    .dscResuntCount__title,
-    .dscResultCount__actions {
-      margin-bottom: 0 !important;
-    }
-  }
-}
-
-.dscTimechart {
-  display: block;
-  position: relative;
-
-  // SASSTODO: the visualizing component should have an option or a modifier
-  .series > rect {
-    fill-opacity: .5;
-    stroke-width: 1;
-  }
-}
-
-.dscHistogram {
-  display: flex;
-  height: $euiSize * 12.5;
-  padding: $euiSizeS;
-}
-
-// new slimmer layout for data grid
-.dscHistogramGrid {
-  display: flex;
-  height: $euiSize * 8;
-  padding: $euiSizeS $euiSizeS 0 $euiSizeS;
-}
-
-.dscTable {
-  // SASSTODO: add a monospace modifier to the doc-table component
-  .kbnDocTable__row {
-    font-family: $euiCodeFontFamily;
-    font-size: $euiFontSizeXS;
-  }
-}
-
-.dscTable__footer {
-  background-color: $euiColorLightShade;
-  padding: $euiSizeXS $euiSizeS;
-  text-align: center;
-}
diff --git a/src/plugins/discover/public/application/components/discover.test.tsx b/src/plugins/discover/public/application/components/discover.test.tsx
deleted file mode 100644
index d804d60870421..0000000000000
--- a/src/plugins/discover/public/application/components/discover.test.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { shallowWithIntl } from '@kbn/test/jest';
-import { Discover } from './discover';
-import { esHits } from '../../__mocks__/es_hits';
-import { indexPatternMock } from '../../__mocks__/index_pattern';
-import { DiscoverServices } from '../../build_services';
-import { GetStateReturn } from '../angular/discover_state';
-import { savedSearchMock } from '../../__mocks__/saved_search';
-import { createSearchSourceMock } from '../../../../data/common/search/search_source/mocks';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { createFilterManagerMock } from '../../../../data/public/query/filter_manager/filter_manager.mock';
-import { uiSettingsMock as mockUiSettings } from '../../__mocks__/ui_settings';
-import { IndexPattern, IndexPatternAttributes } from '../../../../data/common/index_patterns';
-import { SavedObject } from '../../../../../core/types';
-import { navigationPluginMock } from '../../../../navigation/public/mocks';
-import { indexPatternWithTimefieldMock } from '../../__mocks__/index_pattern_with_timefield';
-import { calcFieldCounts } from '../helpers/calc_field_counts';
-import { DiscoverProps } from './types';
-import { RequestAdapter } from '../../../../inspector/common';
-import { Subject } from 'rxjs';
-import { DiscoverSearchSessionManager } from '../angular/discover_search_session';
-
-const mockNavigation = navigationPluginMock.createStartContract();
-
-jest.mock('../../kibana_services', () => {
-  return {
-    getServices: () => ({
-      metadata: {
-        branch: 'test',
-      },
-      capabilities: {
-        discover: {
-          save: true,
-        },
-      },
-      navigation: mockNavigation,
-      uiSettings: mockUiSettings,
-    }),
-  };
-});
-
-function getProps(indexPattern: IndexPattern): DiscoverProps {
-  const searchSourceMock = createSearchSourceMock({});
-  const services = ({
-    capabilities: {
-      discover: {
-        save: true,
-      },
-    },
-    uiSettings: mockUiSettings,
-  } as unknown) as DiscoverServices;
-
-  return {
-    fetch: jest.fn(),
-    fetchCounter: 0,
-    fetchError: undefined,
-    fetchStatus: 'loading',
-    fieldCounts: calcFieldCounts({}, esHits, indexPattern),
-    hits: esHits.length,
-    indexPattern,
-    minimumVisibleRows: 10,
-    onSkipBottomButtonClick: jest.fn(),
-    opts: {
-      config: mockUiSettings,
-      data: dataPluginMock.createStartContract(),
-      filterManager: createFilterManagerMock(),
-      getFieldCounts: jest.fn(),
-      indexPatternList: (indexPattern as unknown) as Array<SavedObject<IndexPatternAttributes>>,
-      inspectorAdapters: { requests: {} as RequestAdapter },
-      navigateTo: jest.fn(),
-      refetch$: {} as Subject<undefined>,
-      sampleSize: 10,
-      savedSearch: savedSearchMock,
-      searchSessionManager: {} as DiscoverSearchSessionManager,
-      setHeaderActionMenu: jest.fn(),
-      timefield: indexPattern.timeFieldName || '',
-      setAppState: jest.fn(),
-      services,
-      stateContainer: {} as GetStateReturn,
-    },
-    resetQuery: jest.fn(),
-    resultState: 'ready',
-    rows: esHits,
-    searchSource: searchSourceMock,
-    state: { columns: [] },
-  };
-}
-
-describe('Discover component', () => {
-  test('selected index pattern without time field displays no chart toggle', () => {
-    const component = shallowWithIntl(<Discover {...getProps(indexPatternMock)} />);
-    expect(component.find('[data-test-subj="discoverChartToggle"]').length).toBe(0);
-  });
-  test('selected index pattern with time field displays chart toggle', () => {
-    const component = shallowWithIntl(<Discover {...getProps(indexPatternWithTimefieldMock)} />);
-    expect(component.find('[data-test-subj="discoverChartToggle"]').length).toBe(1);
-  });
-});
diff --git a/src/plugins/discover/public/application/components/discover.tsx b/src/plugins/discover/public/application/components/discover.tsx
deleted file mode 100644
index 90dfd2ef9dce9..0000000000000
--- a/src/plugins/discover/public/application/components/discover.tsx
+++ /dev/null
@@ -1,468 +0,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 './discover.scss';
-import React, { useState, useRef, useMemo, useCallback, useEffect } from 'react';
-import {
-  EuiButtonEmpty,
-  EuiButtonIcon,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiHideFor,
-  EuiHorizontalRule,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContent,
-  EuiSpacer,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import moment from 'moment';
-import { METRIC_TYPE } from '@kbn/analytics';
-import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
-import classNames from 'classnames';
-import { HitsCounter } from './hits_counter';
-import { TimechartHeader } from './timechart_header';
-import { DiscoverHistogram, DiscoverUninitialized } from '../angular/directives';
-import { DiscoverNoResults } from './no_results';
-import { LoadingSpinner } from './loading_spinner/loading_spinner';
-import { DocTableLegacy } from '../angular/doc_table/create_doc_table_react';
-import { esFilters, IndexPatternField, search } from '../../../../data/public';
-import { DiscoverSidebarResponsive } from './sidebar';
-import { DiscoverProps } from './types';
-import { SortPairArr } from '../angular/doc_table/lib/get_sort';
-import { SEARCH_FIELDS_FROM_SOURCE } from '../../../common';
-import { popularizeField } from '../helpers/popularize_field';
-import { getStateColumnActions } from '../angular/doc_table/actions/columns';
-import { DocViewFilterFn } from '../doc_views/doc_views_types';
-import { DiscoverGrid } from './discover_grid/discover_grid';
-import { DiscoverTopNav } from './discover_topnav';
-import { ElasticSearchHit } from '../doc_views/doc_views_types';
-import { setBreadcrumbsTitle } from '../helpers/breadcrumbs';
-import { addHelpMenuToAppChrome } from './help_menu/help_menu_util';
-import { InspectorSession } from '../../../../inspector/public';
-
-const DocTableLegacyMemoized = React.memo(DocTableLegacy);
-const SidebarMemoized = React.memo(DiscoverSidebarResponsive);
-const DataGridMemoized = React.memo(DiscoverGrid);
-const TopNavMemoized = React.memo(DiscoverTopNav);
-const TimechartHeaderMemoized = React.memo(TimechartHeader);
-const DiscoverHistogramMemoized = React.memo(DiscoverHistogram);
-
-export function Discover({
-  fetch,
-  fetchCounter,
-  fetchError,
-  fieldCounts,
-  fetchStatus,
-  histogramData,
-  hits,
-  indexPattern,
-  minimumVisibleRows,
-  opts,
-  resetQuery,
-  resultState,
-  rows,
-  searchSource,
-  state,
-  unmappedFieldsConfig,
-  refreshAppState,
-}: DiscoverProps) {
-  const [expandedDoc, setExpandedDoc] = useState<ElasticSearchHit | undefined>(undefined);
-  const [inspectorSession, setInspectorSession] = useState<InspectorSession | undefined>(undefined);
-  const scrollableDesktop = useRef<HTMLDivElement>(null);
-  const collapseIcon = useRef<HTMLButtonElement>(null);
-  const isMobile = () => {
-    // collapse icon isn't displayed in mobile view, use it to detect which view is displayed
-    return collapseIcon && !collapseIcon.current;
-  };
-  const toggleHideChart = useCallback(() => {
-    const newState = { ...state, hideChart: !state.hideChart };
-    opts.stateContainer.setAppState(newState);
-  }, [state, opts]);
-  const hideChart = useMemo(() => state.hideChart, [state]);
-  const { savedSearch, indexPatternList, config, services, data, setAppState } = opts;
-  const { trackUiMetric, capabilities, indexPatterns, chrome, docLinks } = services;
-
-  const [isSidebarClosed, setIsSidebarClosed] = useState(false);
-  const bucketInterval = useMemo(() => {
-    const bucketAggConfig = opts.chartAggConfigs?.aggs[1];
-    return bucketAggConfig && search.aggs.isDateHistogramBucketAggConfig(bucketAggConfig)
-      ? bucketAggConfig.buckets?.getInterval()
-      : undefined;
-  }, [opts.chartAggConfigs]);
-
-  const contentCentered = resultState === 'uninitialized';
-  const isLegacy = services.uiSettings.get('doc_table:legacy');
-  const useNewFieldsApi = !services.uiSettings.get(SEARCH_FIELDS_FROM_SOURCE);
-  const updateQuery = useCallback(
-    (_payload, isUpdate?: boolean) => {
-      if (isUpdate === false) {
-        opts.searchSessionManager.removeSearchSessionIdFromURL({ replace: false });
-        opts.refetch$.next();
-      }
-    },
-    [opts]
-  );
-
-  useEffect(() => {
-    const pageTitleSuffix = savedSearch.id && savedSearch.title ? `: ${savedSearch.title}` : '';
-    chrome.docTitle.change(`Discover${pageTitleSuffix}`);
-
-    setBreadcrumbsTitle(savedSearch, chrome);
-    addHelpMenuToAppChrome(chrome, docLinks);
-  }, [savedSearch, chrome, docLinks]);
-
-  const { onAddColumn, onRemoveColumn, onMoveColumn, onSetColumns } = useMemo(
-    () =>
-      getStateColumnActions({
-        capabilities,
-        config,
-        indexPattern,
-        indexPatterns,
-        setAppState,
-        state,
-        useNewFieldsApi,
-      }),
-    [capabilities, config, indexPattern, indexPatterns, setAppState, state, useNewFieldsApi]
-  );
-
-  const onOpenInspector = useCallback(() => {
-    // prevent overlapping
-    setExpandedDoc(undefined);
-    const session = services.inspector.open(opts.inspectorAdapters, {
-      title: savedSearch.title,
-    });
-    setInspectorSession(session);
-  }, [setExpandedDoc, opts.inspectorAdapters, savedSearch, services.inspector]);
-
-  useEffect(() => {
-    return () => {
-      if (inspectorSession) {
-        // Close the inspector if this scope is destroyed (e.g. because the user navigates away).
-        inspectorSession.close();
-      }
-    };
-  }, [inspectorSession]);
-
-  const onSort = useCallback(
-    (sort: string[][]) => {
-      setAppState({ sort });
-    },
-    [setAppState]
-  );
-
-  const onAddFilter = useCallback(
-    (field: IndexPatternField | string, values: string, operation: '+' | '-') => {
-      const fieldName = typeof field === 'string' ? field : field.name;
-      popularizeField(indexPattern, fieldName, indexPatterns);
-      const newFilters = esFilters.generateFilters(
-        opts.filterManager,
-        field,
-        values,
-        operation,
-        String(indexPattern.id)
-      );
-      if (trackUiMetric) {
-        trackUiMetric(METRIC_TYPE.CLICK, 'filter_added');
-      }
-      return opts.filterManager.addFilters(newFilters);
-    },
-    [opts, indexPattern, indexPatterns, trackUiMetric]
-  );
-
-  const onChangeInterval = useCallback(
-    (interval: string) => {
-      if (interval) {
-        setAppState({ interval });
-      }
-    },
-    [setAppState]
-  );
-
-  const timefilterUpdateHandler = useCallback(
-    (ranges: { from: number; to: number }) => {
-      data.query.timefilter.timefilter.setTime({
-        from: moment(ranges.from).toISOString(),
-        to: moment(ranges.to).toISOString(),
-        mode: 'absolute',
-      });
-    },
-    [data]
-  );
-
-  const onBackToTop = useCallback(() => {
-    if (scrollableDesktop && scrollableDesktop.current) {
-      scrollableDesktop.current.focus();
-    }
-    // Only the desktop one needs to target a specific container
-    if (!isMobile() && scrollableDesktop.current) {
-      scrollableDesktop.current.scrollTo(0, 0);
-    } else if (window) {
-      window.scrollTo(0, 0);
-    }
-  }, [scrollableDesktop]);
-
-  const onResize = useCallback(
-    (colSettings: { columnId: string; width: number }) => {
-      const grid = { ...state.grid } || {};
-      const newColumns = { ...grid.columns } || {};
-      newColumns[colSettings.columnId] = {
-        width: colSettings.width,
-      };
-      const newGrid = { ...grid, columns: newColumns };
-      opts.setAppState({ grid: newGrid });
-    },
-    [opts, state]
-  );
-
-  const onEditRuntimeField = () => {
-    if (refreshAppState) {
-      refreshAppState();
-    }
-  };
-
-  const columns = useMemo(() => {
-    if (!state.columns) {
-      return [];
-    }
-    return useNewFieldsApi ? state.columns.filter((col) => col !== '_source') : state.columns;
-  }, [state, useNewFieldsApi]);
-  return (
-    <I18nProvider>
-      <EuiPage className="dscPage" data-fetch-counter={fetchCounter}>
-        <TopNavMemoized
-          indexPattern={indexPattern}
-          opts={opts}
-          onOpenInspector={onOpenInspector}
-          query={state.query}
-          savedQuery={state.savedQuery}
-          updateQuery={updateQuery}
-          searchSource={searchSource}
-        />
-        <EuiPageBody className="dscPageBody" aria-describedby="savedSearchTitle">
-          <h1 id="savedSearchTitle" className="euiScreenReaderOnly">
-            {savedSearch.title}
-          </h1>
-          <EuiFlexGroup className="dscPageBody__contents" gutterSize="none">
-            <EuiFlexItem grow={false}>
-              <SidebarMemoized
-                config={config}
-                columns={columns}
-                fieldCounts={fieldCounts}
-                hits={rows}
-                indexPatternList={indexPatternList}
-                indexPatterns={indexPatterns}
-                onAddField={onAddColumn}
-                onAddFilter={onAddFilter}
-                onRemoveField={onRemoveColumn}
-                selectedIndexPattern={searchSource && searchSource.getField('index')}
-                services={services}
-                setAppState={setAppState}
-                state={state}
-                isClosed={isSidebarClosed}
-                trackUiMetric={trackUiMetric}
-                unmappedFieldsConfig={unmappedFieldsConfig}
-                useNewFieldsApi={useNewFieldsApi}
-                onEditRuntimeField={onEditRuntimeField}
-              />
-            </EuiFlexItem>
-            <EuiHideFor sizes={['xs', 's']}>
-              <EuiFlexItem grow={false}>
-                <div>
-                  <EuiSpacer size="s" />
-                  <EuiButtonIcon
-                    iconType={isSidebarClosed ? 'menuRight' : 'menuLeft'}
-                    iconSize="m"
-                    size="xs"
-                    onClick={() => setIsSidebarClosed(!isSidebarClosed)}
-                    data-test-subj="collapseSideBarButton"
-                    aria-controls="discover-sidebar"
-                    aria-expanded={isSidebarClosed ? 'false' : 'true'}
-                    aria-label={i18n.translate('discover.toggleSidebarAriaLabel', {
-                      defaultMessage: 'Toggle sidebar',
-                    })}
-                    buttonRef={collapseIcon}
-                  />
-                </div>
-              </EuiFlexItem>
-            </EuiHideFor>
-            <EuiFlexItem className="dscPageContent__wrapper">
-              <EuiPageContent
-                verticalPosition={contentCentered ? 'center' : undefined}
-                horizontalPosition={contentCentered ? 'center' : undefined}
-                paddingSize="none"
-                className={classNames('dscPageContent', {
-                  'dscPageContent--centered': contentCentered,
-                })}
-              >
-                {resultState === 'none' && (
-                  <DiscoverNoResults
-                    timeFieldName={opts.timefield}
-                    queryLanguage={state.query?.language || ''}
-                    data={opts.data}
-                    error={fetchError}
-                  />
-                )}
-                {resultState === 'uninitialized' && <DiscoverUninitialized onRefresh={fetch} />}
-                {resultState === 'loading' && <LoadingSpinner />}
-                {resultState === 'ready' && (
-                  <EuiFlexGroup
-                    className="dscPageContent__inner"
-                    direction="column"
-                    alignItems="stretch"
-                    gutterSize="none"
-                    responsive={false}
-                  >
-                    <EuiFlexItem grow={false} className="dscResultCount">
-                      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
-                        <EuiFlexItem
-                          grow={false}
-                          className="dscResuntCount__title eui-textTruncate eui-textNoWrap"
-                        >
-                          <HitsCounter
-                            hits={hits > 0 ? hits : 0}
-                            showResetButton={!!(savedSearch && savedSearch.id)}
-                            onResetQuery={resetQuery}
-                          />
-                        </EuiFlexItem>
-                        {!hideChart && (
-                          <EuiFlexItem className="dscResultCount__actions">
-                            <TimechartHeaderMemoized
-                              data={opts.data}
-                              dateFormat={opts.config.get('dateFormat')}
-                              options={search.aggs.intervalOptions}
-                              onChangeInterval={onChangeInterval}
-                              stateInterval={state.interval || ''}
-                              bucketInterval={bucketInterval}
-                            />
-                          </EuiFlexItem>
-                        )}
-                        {opts.timefield && (
-                          <EuiFlexItem className="dscResultCount__toggle" grow={false}>
-                            <EuiButtonEmpty
-                              size="xs"
-                              iconType={!hideChart ? 'eyeClosed' : 'eye'}
-                              onClick={() => {
-                                toggleHideChart();
-                              }}
-                              data-test-subj="discoverChartToggle"
-                            >
-                              {!hideChart
-                                ? i18n.translate('discover.hideChart', {
-                                    defaultMessage: 'Hide chart',
-                                  })
-                                : i18n.translate('discover.showChart', {
-                                    defaultMessage: 'Show chart',
-                                  })}
-                            </EuiButtonEmpty>
-                          </EuiFlexItem>
-                        )}
-                      </EuiFlexGroup>
-                    </EuiFlexItem>
-                    {!hideChart && opts.timefield && (
-                      <EuiFlexItem grow={false}>
-                        <section
-                          aria-label={i18n.translate(
-                            'discover.histogramOfFoundDocumentsAriaLabel',
-                            {
-                              defaultMessage: 'Histogram of found documents',
-                            }
-                          )}
-                          className="dscTimechart"
-                        >
-                          {opts.chartAggConfigs && histogramData && rows.length !== 0 && (
-                            <div
-                              className={isLegacy ? 'dscHistogram' : 'dscHistogramGrid'}
-                              data-test-subj="discoverChart"
-                            >
-                              <DiscoverHistogramMemoized
-                                chartData={histogramData}
-                                timefilterUpdateHandler={timefilterUpdateHandler}
-                              />
-                            </div>
-                          )}
-                        </section>
-                        <EuiSpacer size="s" />
-                      </EuiFlexItem>
-                    )}
-
-                    <EuiHorizontalRule margin="none" />
-
-                    <EuiFlexItem className="eui-yScroll">
-                      <section
-                        className="dscTable eui-yScroll eui-xScroll"
-                        aria-labelledby="documentsAriaLabel"
-                        ref={scrollableDesktop}
-                        tabIndex={-1}
-                      >
-                        <h2 className="euiScreenReaderOnly" id="documentsAriaLabel">
-                          <FormattedMessage
-                            id="discover.documentsAriaLabel"
-                            defaultMessage="Documents"
-                          />
-                        </h2>
-                        {isLegacy && rows && rows.length && (
-                          <DocTableLegacyMemoized
-                            columns={columns}
-                            indexPattern={indexPattern}
-                            minimumVisibleRows={minimumVisibleRows}
-                            rows={rows}
-                            sort={state.sort || []}
-                            searchDescription={opts.savedSearch.description}
-                            searchTitle={opts.savedSearch.lastSavedTitle}
-                            onAddColumn={onAddColumn}
-                            onBackToTop={onBackToTop}
-                            onFilter={onAddFilter}
-                            onMoveColumn={onMoveColumn}
-                            onRemoveColumn={onRemoveColumn}
-                            onSort={onSort}
-                            sampleSize={opts.sampleSize}
-                            useNewFieldsApi={useNewFieldsApi}
-                          />
-                        )}
-                        {!isLegacy && rows && rows.length && (
-                          <div className="dscDiscoverGrid">
-                            <DataGridMemoized
-                              ariaLabelledBy="documentsAriaLabel"
-                              columns={columns}
-                              expandedDoc={expandedDoc}
-                              indexPattern={indexPattern}
-                              isLoading={fetchStatus === 'loading'}
-                              rows={rows}
-                              sort={(state.sort as SortPairArr[]) || []}
-                              sampleSize={opts.sampleSize}
-                              searchDescription={opts.savedSearch.description}
-                              searchTitle={opts.savedSearch.lastSavedTitle}
-                              setExpandedDoc={setExpandedDoc}
-                              showTimeCol={
-                                !config.get('doc_table:hideTimeColumn', false) &&
-                                !!indexPattern.timeFieldName
-                              }
-                              services={services}
-                              settings={state.grid}
-                              onAddColumn={onAddColumn}
-                              onFilter={onAddFilter as DocViewFilterFn}
-                              onRemoveColumn={onRemoveColumn}
-                              onSetColumns={onSetColumns}
-                              onSort={onSort}
-                              onResize={onResize}
-                              useNewFieldsApi={useNewFieldsApi}
-                            />
-                          </div>
-                        )}
-                      </section>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                )}
-              </EuiPageContent>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiPageBody>
-      </EuiPage>
-    </I18nProvider>
-  );
-}
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss b/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss
index cb1b9a8ea191e..48b99458377ad 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid.scss
@@ -47,6 +47,9 @@
 
 // We only truncate if the cell is not a control column.
 .euiDataGridHeader {
+  // This display property is temporary until https://github.com/elastic/eui/issues/4729 is resolved.
+  display: flex;
+
   .euiDataGridHeaderCell__content {
     @include euiTextTruncate;
     overflow: hidden;
@@ -66,6 +69,7 @@
   text-align: right;
 }
 
+.euiDataGrid__loading,
 .euiDataGrid__noResults {
   display: flex;
   flex-direction: column;
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx
index f969eb32f3791..65a6ee80564e9 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid.tsx
@@ -14,11 +14,12 @@ import {
   EuiDataGridStyle,
   EuiDataGridProps,
   EuiDataGrid,
-  EuiIcon,
   EuiScreenReaderOnly,
   EuiSpacer,
   EuiText,
   htmlIdGenerator,
+  EuiLoadingSpinner,
+  EuiIcon,
 } from '@elastic/eui';
 import { IndexPattern } from '../../../kibana_services';
 import { DocViewFilterFn, ElasticSearchHit } from '../../doc_views/doc_views_types';
@@ -88,9 +89,9 @@ export interface DiscoverGridProps {
    */
   onSetColumns: (columns: string[]) => void;
   /**
-   * function to change sorting of the documents
+   * function to change sorting of the documents, skipped when isSortEnabled is set to false
    */
-  onSort: (sort: string[][]) => void;
+  onSort?: (sort: string[][]) => void;
   /**
    * Array of documents provided by Elasticsearch
    */
@@ -123,6 +124,10 @@ export interface DiscoverGridProps {
    * Determines whether the time columns should be displayed (legacy settings)
    */
   showTimeCol: boolean;
+  /**
+   * Manage user sorting control
+   */
+  isSortEnabled?: boolean;
   /**
    * Current sort setting
    */
@@ -131,6 +136,14 @@ export interface DiscoverGridProps {
    * How the data is fetched
    */
   useNewFieldsApi: boolean;
+  /**
+   * Manage pagination control
+   */
+  isPaginationEnabled?: boolean;
+  /**
+   * List of used control columns (available: 'openDetails', 'select')
+   */
+  controlColumnIds?: string[];
 }
 
 export const EuiDataGridMemoized = React.memo((props: EuiDataGridProps) => {
@@ -159,6 +172,9 @@ export const DiscoverGrid = ({
   showTimeCol,
   sort,
   useNewFieldsApi,
+  isSortEnabled = true,
+  isPaginationEnabled = true,
+  controlColumnIds = ['openDetails', 'select'],
 }: DiscoverGridProps) => {
   const [selectedDocs, setSelectedDocs] = useState<string[]>([]);
   const [isFilterActive, setIsFilterActive] = useState(false);
@@ -210,14 +226,16 @@ export const DiscoverGrid = ({
     const onChangePage = (pageIndex: number) =>
       setPagination((paginationData) => ({ ...paginationData, pageIndex }));
 
-    return {
-      onChangeItemsPerPage,
-      onChangePage,
-      pageIndex: pagination.pageIndex > pageCount - 1 ? 0 : pagination.pageIndex,
-      pageSize: pagination.pageSize,
-      pageSizeOptions: pageSizeArr,
-    };
-  }, [pagination, pageCount]);
+    return isPaginationEnabled
+      ? {
+          onChangeItemsPerPage,
+          onChangePage,
+          pageIndex: pagination.pageIndex > pageCount - 1 ? 0 : pagination.pageIndex,
+          pageSize: pagination.pageSize,
+          pageSizeOptions: pageSizeArr,
+        }
+      : undefined;
+  }, [pagination, pageCount, isPaginationEnabled]);
 
   /**
    * Sorting
@@ -226,9 +244,11 @@ export const DiscoverGrid = ({
 
   const onTableSort = useCallback(
     (sortingColumnsData) => {
-      onSort(sortingColumnsData.map(({ id, direction }: SortObj) => [id, direction]));
+      if (isSortEnabled && onSort) {
+        onSort(sortingColumnsData.map(({ id, direction }: SortObj) => [id, direction]));
+      }
     },
-    [onSort]
+    [onSort, isSortEnabled]
   );
 
   /**
@@ -253,8 +273,16 @@ export const DiscoverGrid = ({
   const randomId = useMemo(() => htmlIdGenerator()(), []);
 
   const euiGridColumns = useMemo(
-    () => getEuiGridColumns(displayedColumns, settings, indexPattern, showTimeCol, defaultColumns),
-    [displayedColumns, indexPattern, showTimeCol, settings, defaultColumns]
+    () =>
+      getEuiGridColumns(
+        displayedColumns,
+        settings,
+        indexPattern,
+        showTimeCol,
+        defaultColumns,
+        isSortEnabled
+      ),
+    [displayedColumns, indexPattern, showTimeCol, settings, defaultColumns, isSortEnabled]
   );
   const schemaDetectors = useMemo(() => getSchemaDetectors(), []);
   const columnsVisibility = useMemo(
@@ -266,11 +294,16 @@ export const DiscoverGrid = ({
     }),
     [displayedColumns, indexPattern, showTimeCol, onSetColumns]
   );
-  const sorting = useMemo(() => ({ columns: sortingColumns, onSort: onTableSort }), [
-    sortingColumns,
-    onTableSort,
-  ]);
-  const lead = useMemo(() => getLeadControlColumns(), []);
+  const sorting = useMemo(() => {
+    if (isSortEnabled) {
+      return { columns: sortingColumns, onSort: onTableSort };
+    }
+    return { columns: sortingColumns, onSort: () => {} };
+  }, [sortingColumns, onTableSort, isSortEnabled]);
+  const lead = useMemo(
+    () => getLeadControlColumns().filter(({ id }) => controlColumnIds.includes(id)),
+    [controlColumnIds]
+  );
 
   const additionalControls = useMemo(
     () =>
@@ -286,6 +319,18 @@ export const DiscoverGrid = ({
     [usedSelectedDocs, isFilterActive, rows, setIsFilterActive]
   );
 
+  if (!rowCount && isLoading) {
+    return (
+      <div className="euiDataGrid__loading">
+        <EuiText size="xs" color="subdued">
+          <EuiLoadingSpinner />
+          <EuiSpacer size="s" />
+          <FormattedMessage id="discover.loadingResults" defaultMessage="Loading results" />
+        </EuiText>
+      </div>
+    );
+  }
+
   if (!rowCount) {
     return (
       <div className="euiDataGrid__noResults">
@@ -348,10 +393,12 @@ export const DiscoverGrid = ({
                 ? {
                     ...toolbarVisibility,
                     showColumnSelector: false,
+                    showSortSelector: isSortEnabled,
                     additionalControls,
                   }
                 : {
                     ...toolbarVisibility,
+                    showSortSelector: isSortEnabled,
                     additionalControls,
                   }
             }
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx
index 93b5bf8fde0c1..3cbac90aa39cb 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.test.tsx
@@ -12,7 +12,14 @@ import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_
 
 describe('Discover grid columns ', function () {
   it('returns eui grid columns without time column', async () => {
-    const actual = getEuiGridColumns(['extension', 'message'], {}, indexPatternMock, false, false);
+    const actual = getEuiGridColumns(
+      ['extension', 'message'],
+      {},
+      indexPatternMock,
+      false,
+      false,
+      true
+    );
     expect(actual).toMatchInlineSnapshot(`
       Array [
         Object {
@@ -54,6 +61,7 @@ describe('Discover grid columns ', function () {
       {},
       indexPatternWithTimefieldMock,
       false,
+      true,
       true
     );
     expect(actual).toMatchInlineSnapshot(`
@@ -94,7 +102,8 @@ describe('Discover grid columns ', function () {
       {},
       indexPatternWithTimefieldMock,
       true,
-      false
+      false,
+      true
     );
     expect(actual).toMatchInlineSnapshot(`
       Array [
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
index df7e2285a0754..3a27772662b56 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_columns.tsx
@@ -53,7 +53,8 @@ export function buildEuiGridColumn(
   columnName: string,
   columnWidth: number | undefined = 0,
   indexPattern: IndexPattern,
-  defaultColumns: boolean
+  defaultColumns: boolean,
+  isSortEnabled: boolean
 ) {
   const timeString = i18n.translate('discover.timeLabel', {
     defaultMessage: 'Time',
@@ -62,7 +63,7 @@ export function buildEuiGridColumn(
   const column: EuiDataGridColumn = {
     id: columnName,
     schema: getSchemaByKbnType(indexPatternField?.type),
-    isSortable: indexPatternField?.sortable === true,
+    isSortable: isSortEnabled && indexPatternField?.sortable === true,
     display:
       columnName === '_source'
         ? i18n.translate('discover.grid.documentHeader', {
@@ -100,7 +101,8 @@ export function getEuiGridColumns(
   settings: DiscoverGridSettings | undefined,
   indexPattern: IndexPattern,
   showTimeCol: boolean,
-  defaultColumns: boolean
+  defaultColumns: boolean,
+  isSortEnabled: boolean
 ) {
   const timeFieldName = indexPattern.timeFieldName;
   const getColWidth = (column: string) => settings?.columns?.[column]?.width ?? 0;
@@ -108,12 +110,12 @@ export function getEuiGridColumns(
   if (showTimeCol && indexPattern.timeFieldName && !columns.find((col) => col === timeFieldName)) {
     const usedColumns = [indexPattern.timeFieldName, ...columns];
     return usedColumns.map((column) =>
-      buildEuiGridColumn(column, getColWidth(column), indexPattern, defaultColumns)
+      buildEuiGridColumn(column, getColWidth(column), indexPattern, defaultColumns, isSortEnabled)
     );
   }
 
   return columns.map((column) =>
-    buildEuiGridColumn(column, getColWidth(column), indexPattern, defaultColumns)
+    buildEuiGridColumn(column, getColWidth(column), indexPattern, defaultColumns, isSortEnabled)
   );
 }
 
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx
index 9ebe3ee95f797..41cf3f5a68edb 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.test.tsx
@@ -51,7 +51,14 @@ describe('document selection', () => {
 
       const component = mountWithIntl(
         <DiscoverGridContext.Provider value={contextMock}>
-          <SelectButton rowIndex={0} />
+          <SelectButton
+            rowIndex={0}
+            setCellProps={jest.fn()}
+            columnId="test"
+            isExpanded={false}
+            isDetails={false}
+            isExpandable={false}
+          />
         </DiscoverGridContext.Provider>
       );
 
@@ -73,7 +80,14 @@ describe('document selection', () => {
 
       const component = mountWithIntl(
         <DiscoverGridContext.Provider value={contextMock}>
-          <SelectButton rowIndex={0} />
+          <SelectButton
+            rowIndex={0}
+            setCellProps={jest.fn()}
+            columnId="test"
+            isExpanded={false}
+            isDetails={false}
+            isExpandable={false}
+          />
         </DiscoverGridContext.Provider>
       );
 
@@ -95,7 +109,14 @@ describe('document selection', () => {
 
       const component = mountWithIntl(
         <DiscoverGridContext.Provider value={contextMock}>
-          <SelectButton rowIndex={0} />
+          <SelectButton
+            rowIndex={0}
+            setCellProps={jest.fn()}
+            columnId="test"
+            isExpanded={false}
+            isDetails={false}
+            isExpandable={false}
+          />
         </DiscoverGridContext.Provider>
       );
 
@@ -117,7 +138,14 @@ describe('document selection', () => {
 
       const component = mountWithIntl(
         <DiscoverGridContext.Provider value={contextMock}>
-          <SelectButton rowIndex={0} />
+          <SelectButton
+            rowIndex={0}
+            setCellProps={jest.fn()}
+            columnId="test"
+            isExpanded={false}
+            isDetails={false}
+            isExpandable={false}
+          />
         </DiscoverGridContext.Provider>
       );
 
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.tsx
index a99819fa9e057..03c17c801fa96 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_document_selection.tsx
@@ -5,7 +5,8 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-import React, { useCallback, useState, useContext, useMemo } from 'react';
+import React, { useCallback, useState, useContext, useMemo, useEffect } from 'react';
+import classNames from 'classnames';
 import {
   EuiButtonEmpty,
   EuiContextMenuItem,
@@ -13,9 +14,11 @@ import {
   EuiCopy,
   EuiPopover,
   EuiCheckbox,
+  EuiDataGridCellValueElementProps,
 } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
-import classNames from 'classnames';
+import themeDark from '@elastic/eui/dist/eui_theme_dark.json';
+import themeLight from '@elastic/eui/dist/eui_theme_light.json';
 import { ElasticSearchHit } from '../../doc_views/doc_views_types';
 import { DiscoverGridContext } from './discover_grid_context';
 
@@ -27,11 +30,25 @@ export const getDocId = (doc: ElasticSearchHit & { _routing?: string }) => {
   const routing = doc._routing ? doc._routing : '';
   return [doc._index, doc._id, routing].join('::');
 };
-export const SelectButton = ({ rowIndex }: { rowIndex: number }) => {
-  const ctx = useContext(DiscoverGridContext);
-  const doc = useMemo(() => ctx.rows[rowIndex], [ctx.rows, rowIndex]);
+export const SelectButton = ({ rowIndex, setCellProps }: EuiDataGridCellValueElementProps) => {
+  const { selectedDocs, expanded, rows, isDarkMode, setSelectedDocs } = useContext(
+    DiscoverGridContext
+  );
+  const doc = useMemo(() => rows[rowIndex], [rows, rowIndex]);
   const id = useMemo(() => getDocId(doc), [doc]);
-  const checked = useMemo(() => ctx.selectedDocs.includes(id), [ctx.selectedDocs, id]);
+  const checked = useMemo(() => selectedDocs.includes(id), [selectedDocs, id]);
+
+  useEffect(() => {
+    if (expanded && doc && expanded._id === doc._id) {
+      setCellProps({
+        style: {
+          backgroundColor: isDarkMode ? themeDark.euiColorHighlight : themeLight.euiColorHighlight,
+        },
+      });
+    } else {
+      setCellProps({ style: undefined });
+    }
+  }, [expanded, doc, setCellProps, isDarkMode]);
 
   return (
     <EuiCheckbox
@@ -41,10 +58,10 @@ export const SelectButton = ({ rowIndex }: { rowIndex: number }) => {
       data-test-subj={`dscGridSelectDoc-${id}`}
       onChange={() => {
         if (checked) {
-          const newSelection = ctx.selectedDocs.filter((docId) => docId !== id);
-          ctx.setSelectedDocs(newSelection);
+          const newSelection = selectedDocs.filter((docId) => docId !== id);
+          setSelectedDocs(newSelection);
         } else {
-          ctx.setSelectedDocs([...ctx.selectedDocs, id]);
+          setSelectedDocs([...selectedDocs, id]);
         }
       }}
     />
diff --git a/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.tsx b/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.tsx
index 115acb84b95d8..b11733c159520 100644
--- a/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/discover_grid_expand_button.tsx
@@ -12,6 +12,7 @@ import themeDark from '@elastic/eui/dist/eui_theme_dark.json';
 import themeLight from '@elastic/eui/dist/eui_theme_light.json';
 import { i18n } from '@kbn/i18n';
 import { DiscoverGridContext } from './discover_grid_context';
+import { EsHitRecord } from '../../angular/context/api/context';
 /**
  * Button to expand a given row
  */
@@ -19,7 +20,11 @@ export const ExpandButton = ({ rowIndex, setCellProps }: EuiDataGridCellValueEle
   const { expanded, setExpanded, rows, isDarkMode } = useContext(DiscoverGridContext);
   const current = rows[rowIndex];
   useEffect(() => {
-    if (expanded && current && expanded._id === current._id) {
+    if ((current as EsHitRecord).isAnchor) {
+      setCellProps({
+        className: 'dscDocsGrid__cell--highlight',
+      });
+    } else if (expanded && current && expanded._id === current._id) {
       setCellProps({
         style: {
           backgroundColor: isDarkMode ? themeDark.euiColorHighlight : themeLight.euiColorHighlight,
diff --git a/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx b/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx
index fc3dd499f92e0..b3c205e072508 100644
--- a/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx
+++ b/src/plugins/discover/public/application/components/discover_grid/get_render_cell_value.tsx
@@ -21,6 +21,7 @@ import { ElasticSearchHit } from '../../doc_views/doc_views_types';
 import { DiscoverGridContext } from './discover_grid_context';
 import { JsonCodeEditor } from '../json_code_editor/json_code_editor';
 import { defaultMonacoEditorWidth } from './constants';
+import { EsHitRecord } from '../../angular/context/api/context';
 
 export const getRenderCellValueFn = (
   indexPattern: IndexPattern,
@@ -38,7 +39,11 @@ export const getRenderCellValueFn = (
   const ctx = useContext(DiscoverGridContext);
 
   useEffect(() => {
-    if (ctx.expanded && row && ctx.expanded._id === row._id) {
+    if ((row as EsHitRecord).isAnchor) {
+      setCellProps({
+        className: 'dscDocsGrid__cell--highlight',
+      });
+    } else if (ctx.expanded && row && ctx.expanded._id === row._id) {
       setCellProps({
         style: {
           backgroundColor: ctx.isDarkMode
diff --git a/src/plugins/discover/public/application/components/discover_topnav.test.tsx b/src/plugins/discover/public/application/components/discover_topnav.test.tsx
deleted file mode 100644
index d30e5bda1abe7..0000000000000
--- a/src/plugins/discover/public/application/components/discover_topnav.test.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { mountWithIntl } from '@kbn/test/jest';
-import { indexPatternMock } from '../../__mocks__/index_pattern';
-import { DiscoverServices } from '../../build_services';
-import { GetStateReturn } from '../angular/discover_state';
-import { savedSearchMock } from '../../__mocks__/saved_search';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { createFilterManagerMock } from '../../../../data/public/query/filter_manager/filter_manager.mock';
-import { uiSettingsMock as mockUiSettings } from '../../__mocks__/ui_settings';
-import { IndexPatternAttributes } from '../../../../data/common/index_patterns';
-import { SavedObject } from '../../../../../core/types';
-import { DiscoverTopNav, DiscoverTopNavProps } from './discover_topnav';
-import { RequestAdapter } from '../../../../inspector/common/adapters/request';
-import { TopNavMenu } from '../../../../navigation/public';
-import { ISearchSource, Query } from '../../../../data/common';
-import { DiscoverSearchSessionManager } from '../angular/discover_search_session';
-import { Subject } from 'rxjs';
-
-function getProps(): DiscoverTopNavProps {
-  const services = ({
-    navigation: {
-      ui: { TopNavMenu },
-    },
-    capabilities: {
-      discover: {
-        save: true,
-      },
-      advancedSettings: {
-        save: true,
-      },
-    },
-    uiSettings: mockUiSettings,
-  } as unknown) as DiscoverServices;
-  const indexPattern = indexPatternMock;
-  return {
-    indexPattern: indexPatternMock,
-    opts: {
-      config: mockUiSettings,
-      data: dataPluginMock.createStartContract(),
-      filterManager: createFilterManagerMock(),
-      getFieldCounts: jest.fn(),
-      indexPatternList: (indexPattern as unknown) as Array<SavedObject<IndexPatternAttributes>>,
-      inspectorAdapters: { requests: {} as RequestAdapter },
-      navigateTo: jest.fn(),
-      refetch$: {} as Subject<undefined>,
-      sampleSize: 10,
-      savedSearch: savedSearchMock,
-      searchSessionManager: {} as DiscoverSearchSessionManager,
-      services,
-      setAppState: jest.fn(),
-      setHeaderActionMenu: jest.fn(),
-      stateContainer: {} as GetStateReturn,
-      timefield: indexPattern.timeFieldName || '',
-    },
-    query: {} as Query,
-    savedQuery: '',
-    updateQuery: jest.fn(),
-    onOpenInspector: jest.fn(),
-    searchSource: {} as ISearchSource,
-  };
-}
-
-describe('Discover topnav component', () => {
-  test('setHeaderActionMenu was called', () => {
-    const props = getProps();
-    mountWithIntl(<DiscoverTopNav {...props} />);
-    expect(props.opts.setHeaderActionMenu).toHaveBeenCalled();
-  });
-});
diff --git a/src/plugins/discover/public/application/components/discover_topnav.tsx b/src/plugins/discover/public/application/components/discover_topnav.tsx
deleted file mode 100644
index c5c0df6e6f74a..0000000000000
--- a/src/plugins/discover/public/application/components/discover_topnav.tsx
+++ /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 React, { useMemo } from 'react';
-import { DiscoverProps } from './types';
-import { getTopNavLinks } from './top_nav/get_top_nav_links';
-import { Query, TimeRange } from '../../../../data/common/query';
-
-export type DiscoverTopNavProps = Pick<DiscoverProps, 'indexPattern' | 'opts' | 'searchSource'> & {
-  onOpenInspector: () => void;
-  query?: Query;
-  savedQuery?: string;
-  updateQuery: (payload: { dateRange: TimeRange; query?: Query }, isUpdate?: boolean) => void;
-};
-
-export const DiscoverTopNav = ({
-  indexPattern,
-  opts,
-  onOpenInspector,
-  query,
-  savedQuery,
-  updateQuery,
-  searchSource,
-}: DiscoverTopNavProps) => {
-  const showDatePicker = useMemo(() => indexPattern.isTimeBased(), [indexPattern]);
-  const { TopNavMenu } = opts.services.navigation.ui;
-  const topNavMenu = useMemo(
-    () =>
-      getTopNavLinks({
-        getFieldCounts: opts.getFieldCounts,
-        indexPattern,
-        navigateTo: opts.navigateTo,
-        savedSearch: opts.savedSearch,
-        services: opts.services,
-        state: opts.stateContainer,
-        onOpenInspector,
-        searchSource,
-      }),
-    [indexPattern, opts, onOpenInspector, searchSource]
-  );
-
-  const updateSavedQueryId = (newSavedQueryId: string | undefined) => {
-    const { appStateContainer, setAppState } = opts.stateContainer;
-    if (newSavedQueryId) {
-      setAppState({ savedQuery: newSavedQueryId });
-    } else {
-      // remove savedQueryId from state
-      const newState = {
-        ...appStateContainer.getState(),
-      };
-      delete newState.savedQuery;
-      appStateContainer.set(newState);
-    }
-  };
-  return (
-    <TopNavMenu
-      appName="discover"
-      config={topNavMenu}
-      indexPatterns={[indexPattern]}
-      onQuerySubmit={updateQuery}
-      onSavedQueryIdChange={updateSavedQueryId}
-      query={query}
-      setMenuMountPoint={opts.setHeaderActionMenu}
-      savedQueryId={savedQuery}
-      screenTitle={opts.savedSearch.title}
-      showDatePicker={showDatePicker}
-      showSaveQuery={!!opts.services.capabilities.discover.saveQuery}
-      showSearchBar={true}
-      useDefaultBehaviors={true}
-    />
-  );
-};
diff --git a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
index 6b8e912bbffba..7a3320d43c8b5 100644
--- a/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
+++ b/src/plugins/discover/public/application/components/doc/use_es_doc_search.ts
@@ -33,7 +33,7 @@ export function buildSearchBody(
   useNewFieldsApi: boolean
 ): RequestBody | undefined {
   const computedFields = indexPattern.getComputedFields();
-  const runtimeFields = computedFields.runtimeFields as estypes.RuntimeFields;
+  const runtimeFields = computedFields.runtimeFields as estypes.MappingRuntimeFields;
   const request: RequestBody = {
     body: {
       query: {
diff --git a/src/plugins/discover/public/application/components/histogram/apply_aggs_to_search_source.test.ts b/src/plugins/discover/public/application/components/histogram/apply_aggs_to_search_source.test.ts
deleted file mode 100644
index 5d2be533065e7..0000000000000
--- a/src/plugins/discover/public/application/components/histogram/apply_aggs_to_search_source.test.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
-import { SearchSource } from '../../../../../data/public';
-import { dataPluginMock } from '../../../../../data/public/mocks';
-import { applyAggsToSearchSource } from './apply_aggs_to_search_source';
-
-describe('applyAggsToSearchSource', () => {
-  test('enabled = true', () => {
-    const indexPattern = indexPatternWithTimefieldMock;
-    const setField = jest.fn();
-    const searchSource = ({
-      setField,
-      removeField: jest.fn(),
-    } as unknown) as SearchSource;
-
-    const dataMock = dataPluginMock.createStartContract();
-
-    const aggsConfig = applyAggsToSearchSource(true, searchSource, 'auto', indexPattern, dataMock);
-
-    expect(aggsConfig!.aggs).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "enabled": true,
-          "id": "1",
-          "params": Object {},
-          "schema": "metric",
-          "type": "count",
-        },
-        Object {
-          "enabled": true,
-          "id": "2",
-          "params": Object {
-            "drop_partials": false,
-            "extended_bounds": Object {},
-            "field": "timestamp",
-            "interval": "auto",
-            "min_doc_count": 1,
-            "scaleMetricValues": false,
-            "useNormalizedEsInterval": true,
-            "used_interval": "0ms",
-          },
-          "schema": "segment",
-          "type": "date_histogram",
-        },
-      ]
-    `);
-
-    expect(setField).toHaveBeenCalledWith('aggs', expect.any(Function));
-    const dslFn = setField.mock.calls[0][1];
-    expect(dslFn()).toMatchInlineSnapshot(`
-          Object {
-            "2": Object {
-              "date_histogram": Object {
-                "field": "timestamp",
-                "min_doc_count": 1,
-                "time_zone": "America/New_York",
-              },
-            },
-          }
-      `);
-  });
-
-  test('enabled = false', () => {
-    const indexPattern = indexPatternWithTimefieldMock;
-    const setField = jest.fn();
-    const getField = jest.fn(() => {
-      return true;
-    });
-    const removeField = jest.fn();
-    const searchSource = ({
-      getField,
-      setField,
-      removeField,
-    } as unknown) as SearchSource;
-
-    const dataMock = dataPluginMock.createStartContract();
-
-    const aggsConfig = applyAggsToSearchSource(false, searchSource, 'auto', indexPattern, dataMock);
-    expect(aggsConfig).toBeFalsy();
-    expect(getField).toHaveBeenCalledWith('aggs');
-    expect(removeField).toHaveBeenCalledWith('aggs');
-  });
-});
diff --git a/src/plugins/discover/public/application/components/histogram/apply_aggs_to_search_source.ts b/src/plugins/discover/public/application/components/histogram/apply_aggs_to_search_source.ts
deleted file mode 100644
index c5fb366f81c8c..0000000000000
--- a/src/plugins/discover/public/application/components/histogram/apply_aggs_to_search_source.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { IndexPattern, SearchSource } from '../../../../../data/common';
-import { DataPublicPluginStart } from '../../../../../data/public';
-
-/**
- * Helper function to apply or remove aggregations to a given search source used for gaining data
- * for Discover's histogram vis
- */
-export function applyAggsToSearchSource(
-  enabled: boolean,
-  searchSource: SearchSource,
-  histogramInterval: string,
-  indexPattern: IndexPattern,
-  data: DataPublicPluginStart
-) {
-  if (!enabled) {
-    if (searchSource.getField('aggs')) {
-      // clean up fields in case it was set before
-      searchSource.removeField('aggs');
-    }
-    return;
-  }
-  const visStateAggs = [
-    {
-      type: 'count',
-      schema: 'metric',
-    },
-    {
-      type: 'date_histogram',
-      schema: 'segment',
-      params: {
-        field: indexPattern.timeFieldName!,
-        interval: histogramInterval,
-        timeRange: data.query.timefilter.timefilter.getTime(),
-      },
-    },
-  ];
-  const chartAggConfigs = data.search.aggs.createAggConfigs(indexPattern, visStateAggs);
-
-  searchSource.setField('aggs', function () {
-    return chartAggConfigs.toDsl();
-  });
-  return chartAggConfigs;
-}
diff --git a/src/plugins/discover/public/application/components/histogram/get_dimensions.test.ts b/src/plugins/discover/public/application/components/histogram/get_dimensions.test.ts
deleted file mode 100644
index ad7031f331992..0000000000000
--- a/src/plugins/discover/public/application/components/histogram/get_dimensions.test.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { dataPluginMock } from '../../../../../data/public/mocks';
-
-import { getDimensions } from './get_dimensions';
-import { indexPatternWithTimefieldMock } from '../../../__mocks__/index_pattern_with_timefield';
-import { SearchSource } from '../../../../../data/common/search/search_source';
-import { applyAggsToSearchSource } from './apply_aggs_to_search_source';
-import { calculateBounds } from '../../../../../data/common/query/timefilter';
-
-test('getDimensions', () => {
-  const indexPattern = indexPatternWithTimefieldMock;
-  const setField = jest.fn();
-  const searchSource = ({
-    setField,
-    removeField: jest.fn(),
-  } as unknown) as SearchSource;
-
-  const dataMock = dataPluginMock.createStartContract();
-  dataMock.query.timefilter.timefilter.getTime = () => {
-    return { from: 'now-30y', to: 'now' };
-  };
-  dataMock.query.timefilter.timefilter.calculateBounds = (timeRange) => {
-    return calculateBounds(timeRange);
-  };
-
-  const aggsConfig = applyAggsToSearchSource(true, searchSource, 'auto', indexPattern, dataMock);
-  const actual = getDimensions(aggsConfig!, dataMock);
-  expect(actual).toMatchInlineSnapshot(`
-      Object {
-        "x": Object {
-          "accessor": 0,
-          "format": Object {
-            "id": "date",
-            "params": Object {
-              "pattern": "HH:mm:ss.SSS",
-            },
-          },
-          "label": "timestamp per 0 milliseconds",
-          "params": Object {
-            "bounds": undefined,
-            "date": true,
-            "format": "HH:mm:ss.SSS",
-            "interval": "P365D",
-            "intervalESUnit": "d",
-            "intervalESValue": 365,
-          },
-        },
-        "y": Object {
-          "accessor": 1,
-          "format": Object {
-            "id": "number",
-          },
-          "label": "Count",
-        },
-      }
-    `);
-});
diff --git a/src/plugins/discover/public/application/components/histogram/get_dimensions.ts b/src/plugins/discover/public/application/components/histogram/get_dimensions.ts
deleted file mode 100644
index 6743c1c8431b9..0000000000000
--- a/src/plugins/discover/public/application/components/histogram/get_dimensions.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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';
-import dateMath from '@elastic/datemath';
-import { IAggConfigs, TimeRangeBounds } from '../../../../../data/common';
-import { DataPublicPluginStart, search } from '../../../../../data/public';
-
-export function getDimensions(aggs: IAggConfigs, data: DataPublicPluginStart) {
-  const [metric, agg] = aggs.aggs;
-  const { from, to } = data.query.timefilter.timefilter.getTime();
-  agg.params.timeRange = {
-    from: dateMath.parse(from),
-    to: dateMath.parse(to, { roundUp: true }),
-  };
-  const bounds = agg.params.timeRange
-    ? data.query.timefilter.timefilter.calculateBounds(agg.params.timeRange)
-    : null;
-  const buckets = search.aggs.isDateHistogramBucketAggConfig(agg) ? agg.buckets : undefined;
-
-  if (!buckets) {
-    return;
-  }
-
-  buckets.setBounds(bounds as TimeRangeBounds);
-
-  const { esUnit, esValue } = buckets.getInterval();
-  return {
-    x: {
-      accessor: 0,
-      label: agg.makeLabel(),
-      format: agg.toSerializedFieldFormat(),
-      params: {
-        date: true,
-        interval: moment.duration(esValue, esUnit),
-        intervalESValue: esValue,
-        intervalESUnit: esUnit,
-        format: buckets.getScaledDateFormat(),
-        bounds: buckets.getBounds(),
-      },
-    },
-    y: {
-      accessor: 1,
-      format: metric.toSerializedFieldFormat(),
-      label: metric.makeLabel(),
-    },
-  };
-}
diff --git a/src/plugins/discover/public/application/components/histogram/index.ts b/src/plugins/discover/public/application/components/histogram/index.ts
deleted file mode 100644
index 4af75de0a029d..0000000000000
--- a/src/plugins/discover/public/application/components/histogram/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { applyAggsToSearchSource } from './apply_aggs_to_search_source';
-export { getDimensions } from './get_dimensions';
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern.tsx b/src/plugins/discover/public/application/components/sidebar/discover_index_pattern.tsx
deleted file mode 100644
index 021d5a0252f7c..0000000000000
--- a/src/plugins/discover/public/application/components/sidebar/discover_index_pattern.tsx
+++ /dev/null
@@ -1,118 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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, { useState, useEffect, useCallback } from 'react';
-import { IUiSettingsClient, SavedObject } from 'kibana/public';
-import {
-  IndexPattern,
-  IndexPatternAttributes,
-  IndexPatternsContract,
-} from 'src/plugins/data/public';
-import { I18nProvider } from '@kbn/i18n/react';
-
-import { IndexPatternRef } from './types';
-import { ChangeIndexPattern } from './change_indexpattern';
-import { getSwitchIndexPatternAppState } from '../../helpers/get_switch_index_pattern_app_state';
-import { SortPairArr } from '../../angular/doc_table/lib/get_sort';
-import { MODIFY_COLUMNS_ON_SWITCH, SORT_DEFAULT_ORDER_SETTING } from '../../../../common';
-import { AppState } from '../../angular/discover_state';
-export interface DiscoverIndexPatternProps {
-  /**
-   * Client of uiSettings
-   */
-  config: IUiSettingsClient;
-  /**
-   * list of available index patterns, if length > 1, component offers a "change" link
-   */
-  indexPatternList: Array<SavedObject<IndexPatternAttributes>>;
-  /**
-   * Index patterns service
-   */
-  indexPatterns: IndexPatternsContract;
-  /**
-   * currently selected index pattern, due to angular issues it's undefined at first rendering
-   */
-  selectedIndexPattern: IndexPattern;
-  /**
-   * Function to set the current state
-   */
-  setAppState: (state: Partial<AppState>) => void;
-  /**
-   * Discover App state
-   */
-  state: AppState;
-}
-
-/**
- * Component allows you to select an index pattern in discovers side bar
- */
-export function DiscoverIndexPattern({
-  config,
-  indexPatternList,
-  selectedIndexPattern,
-  indexPatterns,
-  state,
-  setAppState,
-}: DiscoverIndexPatternProps) {
-  const options: IndexPatternRef[] = (indexPatternList || []).map((entity) => ({
-    id: entity.id,
-    title: entity.attributes!.title,
-  }));
-  const { id: selectedId, title: selectedTitle } = selectedIndexPattern || {};
-
-  const setIndexPattern = useCallback(
-    async (id: string) => {
-      const nextIndexPattern = await indexPatterns.get(id);
-      if (nextIndexPattern && selectedIndexPattern) {
-        const nextAppState = getSwitchIndexPatternAppState(
-          selectedIndexPattern,
-          nextIndexPattern,
-          state.columns || [],
-          (state.sort || []) as SortPairArr[],
-          config.get(MODIFY_COLUMNS_ON_SWITCH),
-          config.get(SORT_DEFAULT_ORDER_SETTING)
-        );
-        setAppState(nextAppState);
-      }
-    },
-    [selectedIndexPattern, state, config, indexPatterns, setAppState]
-  );
-
-  const [selected, setSelected] = useState({
-    id: selectedId,
-    title: selectedTitle || '',
-  });
-  useEffect(() => {
-    const { id, title } = selectedIndexPattern;
-    setSelected({ id, title });
-  }, [selectedIndexPattern]);
-  if (!selectedId) {
-    return null;
-  }
-
-  return (
-    <I18nProvider>
-      <ChangeIndexPattern
-        trigger={{
-          label: selected.title,
-          title: selected.title,
-          'data-test-subj': 'indexPattern-switch-link',
-        }}
-        indexPatternId={selected.id}
-        indexPatternRefs={options}
-        onChangeIndexPattern={(id) => {
-          const indexPattern = options.find((pattern) => pattern.id === id);
-          if (indexPattern) {
-            setIndexPattern(id);
-            setSelected(indexPattern);
-          }
-        }}
-      />
-    </I18nProvider>
-  );
-}
diff --git a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.test.tsx b/src/plugins/discover/public/application/components/sidebar/discover_sidebar.test.tsx
deleted file mode 100644
index 35d93095a1da3..0000000000000
--- a/src/plugins/discover/public/application/components/sidebar/discover_sidebar.test.tsx
+++ /dev/null
@@ -1,141 +0,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 { each, cloneDeep } from 'lodash';
-import { ReactWrapper } from 'enzyme';
-import { findTestSubject } from '@elastic/eui/lib/test';
-// @ts-expect-error
-import realHits from '../../../__fixtures__/real_hits.js';
-// @ts-expect-error
-import stubbedLogstashFields from '../../../__fixtures__/logstash_fields';
-import { mountWithIntl } from '@kbn/test/jest';
-import React from 'react';
-import { DiscoverSidebarProps } from './discover_sidebar';
-import { coreMock } from '../../../../../../core/public/mocks';
-import { IndexPatternAttributes } from '../../../../../data/common';
-import { getStubIndexPattern } from '../../../../../data/public/test_utils';
-import { SavedObject } from '../../../../../../core/types';
-import { getDefaultFieldFilter } from './lib/field_filter';
-import { DiscoverSidebar } from './discover_sidebar';
-import { DiscoverServices } from '../../../build_services';
-import { ElasticSearchHit } from '../../doc_views/doc_views_types';
-import { configMock } from '../../../__mocks__/config';
-import { indexPatternsMock } from '../../../__mocks__/index_patterns';
-
-const mockServices = ({
-  history: () => ({
-    location: {
-      search: '',
-    },
-  }),
-  capabilities: {
-    visualize: {
-      show: true,
-    },
-    discover: {
-      save: false,
-    },
-  },
-  uiSettings: {
-    get: (key: string) => {
-      if (key === 'fields:popularLimit') {
-        return 5;
-      }
-    },
-  },
-  indexPatternFieldEditor: {
-    openEditor: jest.fn(),
-    userPermissions: {
-      editIndexPattern: jest.fn(),
-    },
-  },
-} as unknown) as DiscoverServices;
-
-jest.mock('../../../kibana_services', () => ({
-  getServices: () => mockServices,
-}));
-
-jest.mock('./lib/get_index_pattern_field_list', () => ({
-  getIndexPatternFieldList: jest.fn((indexPattern) => indexPattern.fields),
-}));
-
-function getCompProps(): DiscoverSidebarProps {
-  const indexPattern = getStubIndexPattern(
-    'logstash-*',
-    (cfg: unknown) => cfg,
-    'time',
-    stubbedLogstashFields(),
-    coreMock.createSetup()
-  );
-
-  // @ts-expect-error _.each() is passing additional args to flattenHit
-  const hits = (each(cloneDeep(realHits), indexPattern.flattenHit) as Array<
-    Record<string, unknown>
-  >) as ElasticSearchHit[];
-
-  const indexPatternList = [
-    { id: '0', attributes: { title: 'b' } } as SavedObject<IndexPatternAttributes>,
-    { id: '1', attributes: { title: 'a' } } as SavedObject<IndexPatternAttributes>,
-    { id: '2', attributes: { title: 'c' } } as SavedObject<IndexPatternAttributes>,
-  ];
-
-  const fieldCounts: Record<string, number> = {};
-
-  for (const hit of hits) {
-    for (const key of Object.keys(indexPattern.flattenHit(hit))) {
-      fieldCounts[key] = (fieldCounts[key] || 0) + 1;
-    }
-  }
-  return {
-    config: configMock,
-    columns: ['extension'],
-    fieldCounts,
-    hits,
-    indexPatternList,
-    indexPatterns: indexPatternsMock,
-    onAddFilter: jest.fn(),
-    onAddField: jest.fn(),
-    onRemoveField: jest.fn(),
-    selectedIndexPattern: indexPattern,
-    services: mockServices,
-    state: {},
-    trackUiMetric: jest.fn(),
-    fieldFilter: getDefaultFieldFilter(),
-    setFieldFilter: jest.fn(),
-    setAppState: jest.fn(),
-    onEditRuntimeField: jest.fn(),
-    editField: jest.fn(),
-  };
-}
-
-describe('discover sidebar', function () {
-  let props: DiscoverSidebarProps;
-  let comp: ReactWrapper<DiscoverSidebarProps>;
-
-  beforeAll(() => {
-    props = getCompProps();
-    comp = mountWithIntl(<DiscoverSidebar {...props} />);
-  });
-
-  it('should have Selected Fields and Available Fields with Popular Fields sections', function () {
-    const popular = findTestSubject(comp, 'fieldList-popular');
-    const selected = findTestSubject(comp, 'fieldList-selected');
-    const unpopular = findTestSubject(comp, 'fieldList-unpopular');
-    expect(popular.children().length).toBe(1);
-    expect(unpopular.children().length).toBe(7);
-    expect(selected.children().length).toBe(1);
-  });
-  it('should allow selecting fields', function () {
-    findTestSubject(comp, 'fieldToggle-bytes').simulate('click');
-    expect(props.onAddField).toHaveBeenCalledWith('bytes');
-  });
-  it('should allow deselecting fields', function () {
-    findTestSubject(comp, 'fieldToggle-extension').simulate('click');
-    expect(props.onRemoveField).toHaveBeenCalledWith('extension');
-  });
-});
diff --git a/src/plugins/discover/public/application/components/table/table.tsx b/src/plugins/discover/public/application/components/table/table.tsx
index 093b445267241..7a100d24c386e 100644
--- a/src/plugins/discover/public/application/components/table/table.tsx
+++ b/src/plugins/discover/public/application/components/table/table.tsx
@@ -10,7 +10,7 @@ import React, { useState, useEffect, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { DocViewTableRow } from './table_row';
 import { trimAngularSpan } from './table_helper';
-import { isNestedFieldParent } from '../../helpers/nested_fields';
+import { isNestedFieldParent } from '../../apps/main/utils/nested_fields';
 import { DocViewRenderProps } from '../../doc_views/doc_views_types';
 
 const COLLAPSE_LINE_LENGTH = 350;
diff --git a/src/plugins/discover/public/application/components/top_nav/on_save_search.test.tsx b/src/plugins/discover/public/application/components/top_nav/on_save_search.test.tsx
deleted file mode 100644
index ed79d16fd5ff1..0000000000000
--- a/src/plugins/discover/public/application/components/top_nav/on_save_search.test.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { showSaveModal } from '../../../../../saved_objects/public';
-jest.mock('../../../../../saved_objects/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 '../../angular/discover_state';
-import { i18nServiceMock } from '../../../../../../core/public/mocks';
-
-test('onSaveSearch', async () => {
-  const serviceMock = ({
-    core: {
-      i18n: i18nServiceMock.create(),
-    },
-  } as unknown) as DiscoverServices;
-  const stateMock = ({} as unknown) as GetStateReturn;
-
-  await onSaveSearch({
-    indexPattern: indexPatternMock,
-    navigateTo: jest.fn(),
-    savedSearch: savedSearchMock,
-    services: serviceMock,
-    state: stateMock,
-  });
-
-  expect(showSaveModal).toHaveBeenCalled();
-});
diff --git a/src/plugins/discover/public/application/components/types.ts b/src/plugins/discover/public/application/components/types.ts
deleted file mode 100644
index 93620bc1d6bca..0000000000000
--- a/src/plugins/discover/public/application/components/types.ts
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { IUiSettingsClient, MountPoint, SavedObject } from 'kibana/public';
-import { Subject } from 'rxjs';
-import { Chart } from '../angular/helpers/point_series';
-import { IndexPattern } from '../../../../data/common/index_patterns/index_patterns';
-import { ElasticSearchHit } from '../doc_views/doc_views_types';
-import { AggConfigs } from '../../../../data/common/search/aggs';
-
-import {
-  DataPublicPluginStart,
-  FilterManager,
-  IndexPatternAttributes,
-  ISearchSource,
-} from '../../../../data/public';
-import { SavedSearch } from '../../saved_searches';
-import { AppState, GetStateReturn } from '../angular/discover_state';
-import { RequestAdapter } from '../../../../inspector/common';
-import { DiscoverServices } from '../../build_services';
-import { DiscoverSearchSessionManager } from '../angular/discover_search_session';
-
-export interface DiscoverProps {
-  /**
-   * Function to fetch documents from Elasticsearch
-   */
-  fetch: () => void;
-  /**
-   * Counter how often data was fetched (used for testing)
-   */
-  fetchCounter: number;
-  /**
-   * Error in case of a failing document fetch
-   */
-  fetchError?: Error;
-  /**
-   * Statistics by fields calculated using the fetched documents
-   */
-  fieldCounts: Record<string, number>;
-  /**
-   * Current state of data fetching
-   */
-  fetchStatus: string;
-  /**
-   * Histogram aggregation data
-   */
-  histogramData?: Chart;
-  /**
-   * Number of documents found by recent fetch
-   */
-  hits: number;
-  /**
-   * Current IndexPattern
-   */
-  indexPattern: IndexPattern;
-  /**
-   * Value needed for legacy "infinite" loading functionality
-   * Determins how much records are rendered using the legacy table
-   * Increased when scrolling down
-   */
-  minimumVisibleRows: number;
-  /**
-   * Function to scroll down the legacy table to the bottom
-   */
-  onSkipBottomButtonClick: () => void;
-  opts: {
-    /**
-     * Date histogram aggregation config
-     */
-    chartAggConfigs?: AggConfigs;
-    /**
-     * Client of uiSettings
-     */
-    config: IUiSettingsClient;
-    /**
-     * returns field statistics based on the loaded data sample
-     */
-    getFieldCounts: () => Promise<Record<string, number>>;
-    /**
-     * Use angular router for navigation
-     */
-    navigateTo: () => void;
-    /**
-     * Inspect, for analyzing requests and responses
-     */
-    inspectorAdapters: { requests: RequestAdapter };
-    /**
-     * Data plugin
-     */
-    data: DataPublicPluginStart;
-    /**
-     * Data plugin filter manager
-     */
-    filterManager: FilterManager;
-    /**
-     * List of available index patterns
-     */
-    indexPatternList: Array<SavedObject<IndexPatternAttributes>>;
-    /**
-     * Refetch observable
-     */
-    refetch$: Subject<undefined>;
-    /**
-     * Kibana core services used by discover
-     */
-    services: DiscoverServices;
-    /**
-     * Helps with state management of search session
-     */
-    searchSessionManager: DiscoverSearchSessionManager;
-    /**
-     * The number of documents that can be displayed in the table/grid
-     */
-    sampleSize: number;
-    /**
-     * Current instance of SavedSearch
-     */
-    savedSearch: SavedSearch;
-    /**
-     * Function to set the header menu
-     */
-    setHeaderActionMenu: (menuMount: MountPoint | undefined) => void;
-    /**
-     * Timefield of the currently used index pattern
-     */
-    timefield: string;
-    /**
-     * Function to set the current state
-     */
-    setAppState: (state: Partial<AppState>) => void;
-    /**
-     * State container providing globalState, appState and functions
-     */
-    stateContainer: GetStateReturn;
-  };
-  /**
-   * Function to reset the current query
-   */
-  resetQuery: () => void;
-  /**
-   * Current state of the actual query, one of 'uninitialized', 'loading' ,'ready', 'none'
-   */
-  resultState: string;
-  /**
-   * Array of document of the recent successful search request
-   */
-  rows: ElasticSearchHit[];
-  /**
-   * Instance of SearchSource, the high level search API
-   */
-  searchSource: ISearchSource;
-  /**
-   * Current app state of URL
-   */
-  state: AppState;
-  /**
-   * An object containing properties for unmapped fields behavior
-   */
-  unmappedFieldsConfig?: {
-    /**
-     * determines whether to display unmapped fields
-     */
-    showUnmappedFields: boolean;
-  };
-
-  refreshAppState?: () => void;
-}
diff --git a/src/plugins/discover/public/application/embeddable/search_embeddable.ts b/src/plugins/discover/public/application/embeddable/search_embeddable.ts
index 99ecb4c11eef2..1e3c7e77d3615 100644
--- a/src/plugins/discover/public/application/embeddable/search_embeddable.ts
+++ b/src/plugins/discover/public/application/embeddable/search_embeddable.ts
@@ -33,6 +33,7 @@ import { getServices, IndexPattern, ISearchSource } from '../../kibana_services'
 import { SEARCH_EMBEDDABLE_TYPE } from './constants';
 import { SavedSearch } from '../..';
 import {
+  DOC_HIDE_TIME_COLUMN_SETTING,
   SAMPLE_SIZE_SETTING,
   SEARCH_FIELDS_FROM_SOURCE,
   SORT_DEFAULT_ORDER_SETTING,
@@ -256,7 +257,7 @@ export class SearchEmbeddable
     if (this.savedSearch.grid) {
       searchScope.settings = this.savedSearch.grid;
     }
-    searchScope.showTimeCol = !this.services.uiSettings.get('doc_table:hideTimeColumn', false);
+    searchScope.showTimeCol = !this.services.uiSettings.get(DOC_HIDE_TIME_COLUMN_SETTING, false);
 
     searchScope.filter = async (field, value, operator) => {
       let filters = esFilters.generateFilters(
diff --git a/src/plugins/discover/public/application/helpers/columns.test.ts b/src/plugins/discover/public/application/helpers/columns.test.ts
index df3884ab98bcf..6b6125193b5f3 100644
--- a/src/plugins/discover/public/application/helpers/columns.test.ts
+++ b/src/plugins/discover/public/application/helpers/columns.test.ts
@@ -43,4 +43,9 @@ describe('getDisplayedColumns', () => {
       ]
     `);
   });
+  test('returns the same instance of ["_source"] over multiple calls', async () => {
+    const result = getDisplayedColumns([], indexPatternWithTimefieldMock);
+    const result2 = getDisplayedColumns([], indexPatternWithTimefieldMock);
+    expect(result).toBe(result2);
+  });
 });
diff --git a/src/plugins/discover/public/application/helpers/columns.ts b/src/plugins/discover/public/application/helpers/columns.ts
index 426059060f329..6e77717c5cf05 100644
--- a/src/plugins/discover/public/application/helpers/columns.ts
+++ b/src/plugins/discover/public/application/helpers/columns.ts
@@ -8,6 +8,11 @@
 
 import { IndexPattern } from '../../../../data/common';
 
+// 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
+// new columns, and thus performing worse than using the same array over multiple renders.
+const SOURCE_ONLY = ['_source'];
+
 /**
  * Function to provide fallback when
  * 1) no columns are given
@@ -19,5 +24,5 @@ export function getDisplayedColumns(stateColumns: string[] = [], indexPattern: I
     // check if all columns where removed except the configured timeField (this can't be removed)
     !(stateColumns.length === 1 && stateColumns[0] === indexPattern.timeFieldName)
     ? stateColumns
-    : ['_source'];
+    : SOURCE_ONLY;
 }
diff --git a/src/plugins/discover/public/application/helpers/get_result_state.test.ts b/src/plugins/discover/public/application/helpers/get_result_state.test.ts
deleted file mode 100644
index 98e2b854ca5ab..0000000000000
--- a/src/plugins/discover/public/application/helpers/get_result_state.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 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 { getResultState, resultStatuses } from './get_result_state';
-import { fetchStatuses } from '../components/constants';
-import { ElasticSearchHit } from '../doc_views/doc_views_types';
-
-describe('getResultState', () => {
-  test('fetching uninitialized', () => {
-    const actual = getResultState(fetchStatuses.UNINITIALIZED, []);
-    expect(actual).toBe(resultStatuses.UNINITIALIZED);
-  });
-
-  test('fetching complete with no records', () => {
-    const actual = getResultState(fetchStatuses.COMPLETE, []);
-    expect(actual).toBe(resultStatuses.NO_RESULTS);
-  });
-
-  test('fetching ongoing aka loading', () => {
-    const actual = getResultState(fetchStatuses.LOADING, []);
-    expect(actual).toBe(resultStatuses.LOADING);
-  });
-
-  test('fetching ready', () => {
-    const record = ({ _id: 123 } as unknown) as ElasticSearchHit;
-    const actual = getResultState(fetchStatuses.COMPLETE, [record]);
-    expect(actual).toBe(resultStatuses.READY);
-  });
-
-  test('re-fetching after already data is available', () => {
-    const record = ({ _id: 123 } as unknown) as ElasticSearchHit;
-    const actual = getResultState(fetchStatuses.LOADING, [record]);
-    expect(actual).toBe(resultStatuses.READY);
-  });
-
-  test('after a fetch error when data was successfully fetched before ', () => {
-    const record = ({ _id: 123 } as unknown) as ElasticSearchHit;
-    const actual = getResultState(fetchStatuses.ERROR, [record]);
-    expect(actual).toBe(resultStatuses.READY);
-  });
-});
diff --git a/src/plugins/discover/public/application/helpers/get_result_state.ts b/src/plugins/discover/public/application/helpers/get_result_state.ts
deleted file mode 100644
index 6f69832f369fd..0000000000000
--- a/src/plugins/discover/public/application/helpers/get_result_state.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 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 { ElasticSearchHit } from '../doc_views/doc_views_types';
-import { fetchStatuses } from '../components/constants';
-
-export const resultStatuses = {
-  UNINITIALIZED: 'uninitialized',
-  LOADING: 'loading', // initial data load
-  READY: 'ready', // results came back
-  NO_RESULTS: 'none', // no results came back
-};
-
-/**
- * Returns the current state of the result, depends on fetchStatus and the given fetched rows
- * Determines what is displayed in Discover main view (loading view, data view, empty data view, ...)
- */
-export function getResultState(fetchStatus: string, rows: ElasticSearchHit[]) {
-  if (fetchStatus === fetchStatuses.UNINITIALIZED) {
-    return resultStatuses.UNINITIALIZED;
-  }
-
-  const rowsEmpty = !Array.isArray(rows) || rows.length === 0;
-  if (rowsEmpty && fetchStatus === fetchStatuses.LOADING) return resultStatuses.LOADING;
-  else if (!rowsEmpty) return resultStatuses.READY;
-  else return resultStatuses.NO_RESULTS;
-}
diff --git a/src/plugins/discover/public/application/helpers/get_state_defaults.test.ts b/src/plugins/discover/public/application/helpers/get_state_defaults.test.ts
deleted file mode 100644
index 7ce5b9286c775..0000000000000
--- a/src/plugins/discover/public/application/helpers/get_state_defaults.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 { getStateDefaults } from './get_state_defaults';
-import { createSearchSourceMock, dataPluginMock } from '../../../../data/public/mocks';
-import { uiSettingsMock } from '../../__mocks__/ui_settings';
-import { indexPatternWithTimefieldMock } from '../../__mocks__/index_pattern_with_timefield';
-import { savedSearchMock } from '../../__mocks__/saved_search';
-import { indexPatternMock } from '../../__mocks__/index_pattern';
-
-describe('getStateDefaults', () => {
-  test('index pattern with timefield', () => {
-    const actual = getStateDefaults({
-      config: uiSettingsMock,
-      data: dataPluginMock.createStartContract(),
-      indexPattern: indexPatternWithTimefieldMock,
-      savedSearch: savedSearchMock,
-      searchSource: createSearchSourceMock({ index: indexPatternWithTimefieldMock }),
-    });
-    expect(actual).toMatchInlineSnapshot(`
-      Object {
-        "columns": Array [
-          "default_column",
-        ],
-        "filters": undefined,
-        "index": "index-pattern-with-timefield-id",
-        "interval": "auto",
-        "query": undefined,
-        "sort": Array [
-          Array [
-            "timestamp",
-            "desc",
-          ],
-        ],
-      }
-    `);
-  });
-
-  test('index pattern without timefield', () => {
-    const actual = getStateDefaults({
-      config: uiSettingsMock,
-      data: dataPluginMock.createStartContract(),
-      indexPattern: indexPatternMock,
-      savedSearch: savedSearchMock,
-      searchSource: createSearchSourceMock({ index: indexPatternMock }),
-    });
-    expect(actual).toMatchInlineSnapshot(`
-      Object {
-        "columns": Array [
-          "default_column",
-        ],
-        "filters": undefined,
-        "index": "the-index-pattern-id",
-        "interval": "auto",
-        "query": undefined,
-        "sort": Array [],
-      }
-    `);
-  });
-});
diff --git a/src/plugins/discover/public/application/helpers/get_state_defaults.ts b/src/plugins/discover/public/application/helpers/get_state_defaults.ts
deleted file mode 100644
index 3e012a1f85fd6..0000000000000
--- a/src/plugins/discover/public/application/helpers/get_state_defaults.ts
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { IUiSettingsClient } from 'kibana/public';
-import { DEFAULT_COLUMNS_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../common';
-import { getSortArray } from '../angular/doc_table';
-import { getDefaultSort } from '../angular/doc_table/lib/get_default_sort';
-import { SavedSearch } from '../../saved_searches';
-import { SearchSource } from '../../../../data/common/search/search_source';
-import { DataPublicPluginStart, IndexPattern } from '../../../../data/public';
-
-import { AppState } from '../angular/discover_state';
-
-function getDefaultColumns(savedSearch: SavedSearch, config: IUiSettingsClient) {
-  if (savedSearch.columns && savedSearch.columns.length > 0) {
-    return [...savedSearch.columns];
-  }
-  return [...config.get(DEFAULT_COLUMNS_SETTING)];
-}
-
-export function getStateDefaults({
-  config,
-  data,
-  indexPattern,
-  savedSearch,
-  searchSource,
-}: {
-  config: IUiSettingsClient;
-  data: DataPublicPluginStart;
-  indexPattern: IndexPattern;
-  savedSearch: SavedSearch;
-  searchSource: SearchSource;
-}) {
-  const query = searchSource.getField('query') || data.query.queryString.getDefaultQuery();
-  const sort = getSortArray(savedSearch.sort, indexPattern);
-  const columns = getDefaultColumns(savedSearch, config);
-
-  const defaultState = {
-    query,
-    sort: !sort.length
-      ? getDefaultSort(indexPattern, config.get(SORT_DEFAULT_ORDER_SETTING, 'desc'))
-      : sort,
-    columns,
-    index: indexPattern.id,
-    interval: 'auto',
-    filters: cloneDeep(searchSource.getOwnField('filter')),
-  } as AppState;
-  if (savedSearch.grid) {
-    defaultState.grid = savedSearch.grid;
-  }
-  if (savedSearch.hideChart) {
-    defaultState.hideChart = savedSearch.hideChart;
-  }
-
-  return defaultState;
-}
diff --git a/src/plugins/discover/public/application/helpers/update_search_source.test.ts b/src/plugins/discover/public/application/helpers/update_search_source.test.ts
deleted file mode 100644
index d4e52c4e7d4fe..0000000000000
--- a/src/plugins/discover/public/application/helpers/update_search_source.test.ts
+++ /dev/null
@@ -1,169 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { updateSearchSource } from './update_search_source';
-import { createSearchSourceMock } from '../../../../data/common/search/search_source/mocks';
-import { indexPatternMock } from '../../__mocks__/index_pattern';
-import { IUiSettingsClient } from 'kibana/public';
-import { DiscoverServices } from '../../build_services';
-import { dataPluginMock } from '../../../../data/public/mocks';
-import { SAMPLE_SIZE_SETTING } from '../../../common';
-import { SortOrder } from '../../saved_searches/types';
-
-describe('updateSearchSource', () => {
-  test('updates a given search source', async () => {
-    const persistentSearchSourceMock = createSearchSourceMock({});
-    const volatileSearchSourceMock = createSearchSourceMock({});
-    const sampleSize = 250;
-    updateSearchSource({
-      persistentSearchSource: persistentSearchSourceMock,
-      volatileSearchSource: volatileSearchSourceMock,
-      indexPattern: indexPatternMock,
-      services: ({
-        data: dataPluginMock.createStartContract(),
-        uiSettings: ({
-          get: (key: string) => {
-            if (key === SAMPLE_SIZE_SETTING) {
-              return sampleSize;
-            }
-            return false;
-          },
-        } as unknown) as IUiSettingsClient,
-      } as unknown) as DiscoverServices,
-      sort: [] as SortOrder[],
-      columns: [],
-      useNewFieldsApi: false,
-    });
-    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
-    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
-    expect(volatileSearchSourceMock.getField('fields')).toBe(undefined);
-  });
-
-  test('updates a given search source with the usage of the new fields api', async () => {
-    const persistentSearchSourceMock = createSearchSourceMock({});
-    const volatileSearchSourceMock = createSearchSourceMock({});
-    const sampleSize = 250;
-    updateSearchSource({
-      persistentSearchSource: persistentSearchSourceMock,
-      volatileSearchSource: volatileSearchSourceMock,
-      indexPattern: indexPatternMock,
-      services: ({
-        data: dataPluginMock.createStartContract(),
-        uiSettings: ({
-          get: (key: string) => {
-            if (key === SAMPLE_SIZE_SETTING) {
-              return sampleSize;
-            }
-            return false;
-          },
-        } as unknown) as IUiSettingsClient,
-      } as unknown) as DiscoverServices,
-      sort: [] as SortOrder[],
-      columns: [],
-      useNewFieldsApi: true,
-    });
-    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
-    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
-    expect(volatileSearchSourceMock.getField('fields')).toEqual([{ field: '*' }]);
-    expect(volatileSearchSourceMock.getField('fieldsFromSource')).toBe(undefined);
-  });
-
-  test('requests unmapped fields when the flag is provided, using the new fields api', async () => {
-    const persistentSearchSourceMock = createSearchSourceMock({});
-    const volatileSearchSourceMock = createSearchSourceMock({});
-    const sampleSize = 250;
-    updateSearchSource({
-      persistentSearchSource: persistentSearchSourceMock,
-      volatileSearchSource: volatileSearchSourceMock,
-      indexPattern: indexPatternMock,
-      services: ({
-        data: dataPluginMock.createStartContract(),
-        uiSettings: ({
-          get: (key: string) => {
-            if (key === SAMPLE_SIZE_SETTING) {
-              return sampleSize;
-            }
-            return false;
-          },
-        } as unknown) as IUiSettingsClient,
-      } as unknown) as DiscoverServices,
-      sort: [] as SortOrder[],
-      columns: [],
-      useNewFieldsApi: true,
-      showUnmappedFields: true,
-    });
-    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
-    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
-    expect(volatileSearchSourceMock.getField('fields')).toEqual([
-      { field: '*', include_unmapped: 'true' },
-    ]);
-    expect(volatileSearchSourceMock.getField('fieldsFromSource')).toBe(undefined);
-  });
-
-  test('updates a given search source when showUnmappedFields option is set to true', async () => {
-    const persistentSearchSourceMock = createSearchSourceMock({});
-    const volatileSearchSourceMock = createSearchSourceMock({});
-    const sampleSize = 250;
-    updateSearchSource({
-      persistentSearchSource: persistentSearchSourceMock,
-      volatileSearchSource: volatileSearchSourceMock,
-      indexPattern: indexPatternMock,
-      services: ({
-        data: dataPluginMock.createStartContract(),
-        uiSettings: ({
-          get: (key: string) => {
-            if (key === SAMPLE_SIZE_SETTING) {
-              return sampleSize;
-            }
-            return false;
-          },
-        } as unknown) as IUiSettingsClient,
-      } as unknown) as DiscoverServices,
-      sort: [] as SortOrder[],
-      columns: [],
-      useNewFieldsApi: true,
-      showUnmappedFields: true,
-    });
-    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
-    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
-    expect(volatileSearchSourceMock.getField('fields')).toEqual([
-      { field: '*', include_unmapped: 'true' },
-    ]);
-    expect(volatileSearchSourceMock.getField('fieldsFromSource')).toBe(undefined);
-  });
-
-  test('does not explicitly request fieldsFromSource when not using fields API', async () => {
-    const persistentSearchSourceMock = createSearchSourceMock({});
-    const volatileSearchSourceMock = createSearchSourceMock({});
-    const sampleSize = 250;
-    updateSearchSource({
-      persistentSearchSource: persistentSearchSourceMock,
-      volatileSearchSource: volatileSearchSourceMock,
-      indexPattern: indexPatternMock,
-      services: ({
-        data: dataPluginMock.createStartContract(),
-        uiSettings: ({
-          get: (key: string) => {
-            if (key === SAMPLE_SIZE_SETTING) {
-              return sampleSize;
-            }
-            return false;
-          },
-        } as unknown) as IUiSettingsClient,
-      } as unknown) as DiscoverServices,
-      sort: [] as SortOrder[],
-      columns: [],
-      useNewFieldsApi: false,
-      showUnmappedFields: false,
-    });
-    expect(persistentSearchSourceMock.getField('index')).toEqual(indexPatternMock);
-    expect(volatileSearchSourceMock.getField('size')).toEqual(sampleSize);
-    expect(volatileSearchSourceMock.getField('fields')).toEqual(undefined);
-    expect(volatileSearchSourceMock.getField('fieldsFromSource')).toBe(undefined);
-  });
-});
diff --git a/src/plugins/discover/public/application/helpers/update_search_source.ts b/src/plugins/discover/public/application/helpers/update_search_source.ts
deleted file mode 100644
index 07529ac8cb0d6..0000000000000
--- a/src/plugins/discover/public/application/helpers/update_search_source.ts
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { getSortForSearchSource } from '../angular/doc_table';
-import { SAMPLE_SIZE_SETTING, SORT_DEFAULT_ORDER_SETTING } from '../../../common';
-import { IndexPattern, ISearchSource } from '../../../../data/common/';
-import { SortOrder } from '../../saved_searches/types';
-import { DiscoverServices } from '../../build_services';
-
-/**
- * Helper function to update the given searchSource before fetching/sharing/persisting
- */
-export function updateSearchSource({
-  indexPattern,
-  services,
-  sort,
-  columns,
-  useNewFieldsApi,
-  showUnmappedFields,
-  persistentSearchSource,
-  volatileSearchSource,
-}: {
-  indexPattern: IndexPattern;
-  services: DiscoverServices;
-  sort: SortOrder[];
-  columns: string[];
-  useNewFieldsApi: boolean;
-  showUnmappedFields?: boolean;
-  persistentSearchSource: ISearchSource;
-  volatileSearchSource?: ISearchSource;
-}) {
-  const { uiSettings, data } = services;
-  const usedSort = getSortForSearchSource(
-    sort,
-    indexPattern,
-    uiSettings.get(SORT_DEFAULT_ORDER_SETTING)
-  );
-
-  persistentSearchSource
-    .setField('index', indexPattern)
-    .setField('query', data.query.queryString.getQuery() || null)
-    .setField('filter', data.query.filterManager.getFilters());
-
-  if (volatileSearchSource) {
-    volatileSearchSource
-      .setField('size', uiSettings.get(SAMPLE_SIZE_SETTING))
-      .setField('sort', usedSort)
-      .setField('highlightAll', true)
-      .setField('version', true)
-      // Even when searching rollups, we want to use the default strategy so that we get back a
-      // document-like response.
-      .setPreferredSearchStrategyId('default');
-
-    if (useNewFieldsApi) {
-      volatileSearchSource.removeField('fieldsFromSource');
-      const fields: Record<string, string> = { field: '*' };
-      if (showUnmappedFields) {
-        fields.include_unmapped = 'true';
-      }
-      volatileSearchSource.setField('fields', [fields]);
-    } else {
-      volatileSearchSource.removeField('fields');
-    }
-  }
-}
diff --git a/src/plugins/discover/public/application/helpers/use_data_grid_columns.test.tsx b/src/plugins/discover/public/application/helpers/use_data_grid_columns.test.tsx
new file mode 100644
index 0000000000000..c9e1899aff8de
--- /dev/null
+++ b/src/plugins/discover/public/application/helpers/use_data_grid_columns.test.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { renderHook } from '@testing-library/react-hooks';
+import { useDataGridColumns } from './use_data_grid_columns';
+import { indexPatternMock } from '../../__mocks__/index_pattern';
+import { configMock } from '../../__mocks__/config';
+import { indexPatternsMock } from '../../__mocks__/index_patterns';
+import { AppState } from '../angular/context_state';
+import { Capabilities } from '../../../../../core/types';
+
+describe('useDataGridColumns', () => {
+  const defaultProps = {
+    capabilities: ({ discover: { save: true } } as unknown) as Capabilities,
+    config: configMock,
+    indexPattern: indexPatternMock,
+    indexPatterns: indexPatternsMock,
+    setAppState: () => {},
+    state: {
+      columns: ['Time', 'message'],
+    } as AppState,
+    useNewFieldsApi: false,
+  };
+
+  test('should return valid result', () => {
+    const { result } = renderHook(() => {
+      return useDataGridColumns(defaultProps);
+    });
+
+    expect(result.current.columns).toEqual(['Time', 'message']);
+    expect(result.current.onAddColumn).toBeInstanceOf(Function);
+    expect(result.current.onRemoveColumn).toBeInstanceOf(Function);
+    expect(result.current.onMoveColumn).toBeInstanceOf(Function);
+    expect(result.current.onSetColumns).toBeInstanceOf(Function);
+  });
+
+  test('should skip _source column when useNewFieldsApi is set to true', () => {
+    const { result } = renderHook(() => {
+      return useDataGridColumns({
+        ...defaultProps,
+        state: {
+          columns: ['Time', '_source'],
+        },
+        useNewFieldsApi: true,
+      });
+    });
+
+    expect(result.current.columns).toEqual(['Time']);
+  });
+
+  test('should return empty columns array', () => {
+    const { result } = renderHook(() => {
+      return useDataGridColumns({
+        ...defaultProps,
+        state: {
+          columns: [],
+        },
+      });
+    });
+    expect(result.current.columns).toEqual([]);
+  });
+});
diff --git a/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts b/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts
new file mode 100644
index 0000000000000..418cbf6eac9cd
--- /dev/null
+++ b/src/plugins/discover/public/application/helpers/use_data_grid_columns.ts
@@ -0,0 +1,70 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { useMemo } from 'react';
+
+import { Capabilities, IUiSettingsClient } from 'kibana/public';
+import { IndexPattern, IndexPatternsContract } from '../../kibana_services';
+import {
+  AppState as DiscoverState,
+  GetStateReturn as DiscoverGetStateReturn,
+} from '../apps/main/services/discover_state';
+import {
+  AppState as ContextState,
+  GetStateReturn as ContextGetStateReturn,
+} from '../angular/context_state';
+import { getStateColumnActions } from '../angular/doc_table/actions/columns';
+
+interface UseDataGridColumnsProps {
+  capabilities: Capabilities;
+  config: IUiSettingsClient;
+  indexPattern: IndexPattern;
+  indexPatterns: IndexPatternsContract;
+  useNewFieldsApi: boolean;
+  setAppState: DiscoverGetStateReturn['setAppState'] | ContextGetStateReturn['setAppState'];
+  state: DiscoverState | ContextState;
+}
+
+export const useDataGridColumns = ({
+  capabilities,
+  config,
+  indexPattern,
+  indexPatterns,
+  setAppState,
+  state,
+  useNewFieldsApi,
+}: UseDataGridColumnsProps) => {
+  const { onAddColumn, onRemoveColumn, onSetColumns, onMoveColumn } = useMemo(
+    () =>
+      getStateColumnActions({
+        capabilities,
+        config,
+        indexPattern,
+        indexPatterns,
+        setAppState,
+        state,
+        useNewFieldsApi,
+      }),
+    [capabilities, config, indexPattern, indexPatterns, setAppState, state, useNewFieldsApi]
+  );
+
+  const columns = useMemo(() => {
+    if (!state.columns) {
+      return [];
+    }
+    return useNewFieldsApi ? state.columns.filter((col) => col !== '_source') : state.columns;
+  }, [state, useNewFieldsApi]);
+
+  return {
+    columns,
+    onAddColumn,
+    onRemoveColumn,
+    onMoveColumn,
+    onSetColumns,
+  };
+};
diff --git a/src/plugins/discover/public/application/types.ts b/src/plugins/discover/public/application/types.ts
new file mode 100644
index 0000000000000..4d7f47182e98a
--- /dev/null
+++ b/src/plugins/discover/public/application/types.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 enum FetchStatus {
+  UNINITIALIZED = 'uninitialized',
+  LOADING = 'loading',
+  COMPLETE = 'complete',
+  ERROR = 'error',
+}
diff --git a/src/plugins/discover/public/build_services.ts b/src/plugins/discover/public/build_services.ts
index 19ee06aa51798..b42bf6a81742c 100644
--- a/src/plugins/discover/public/build_services.ts
+++ b/src/plugins/discover/public/build_services.ts
@@ -56,7 +56,7 @@ export interface DiscoverServices {
   urlForwarding: UrlForwardingStart;
   timefilter: TimefilterContract;
   toastNotifications: ToastsStart;
-  getSavedSearchById: (id: string) => Promise<SavedSearch>;
+  getSavedSearchById: (id?: string) => Promise<SavedSearch>;
   getSavedSearchUrlById: (id: string) => Promise<string>;
   getEmbeddableInjector: () => Promise<auto.IInjectorService>;
   uiSettings: IUiSettingsClient;
@@ -87,7 +87,7 @@ export async function buildServices(
     theme: plugins.charts.theme,
     filterManager: plugins.data.query.filterManager,
     getEmbeddableInjector,
-    getSavedSearchById: async (id: string) => savedObjectService.get(id),
+    getSavedSearchById: async (id?: string) => savedObjectService.get(id),
     getSavedSearchUrlById: async (id: string) => savedObjectService.urlFor(id),
     history: getHistory,
     indexPatterns: plugins.data.indexPatterns,
diff --git a/src/plugins/discover/public/plugin.tsx b/src/plugins/discover/public/plugin.tsx
index 3f55ab76372bc..139b23d28a1d4 100644
--- a/src/plugins/discover/public/plugin.tsx
+++ b/src/plugins/discover/public/plugin.tsx
@@ -329,7 +329,7 @@ export class DiscoverPlugin
         return;
       }
       // this is used by application mount and tests
-      const { getInnerAngularModule } = await import('./get_inner_angular');
+      const { getInnerAngularModule } = await import('./application/angular/get_inner_angular');
       const module = getInnerAngularModule(
         innerAngularName,
         core,
@@ -400,7 +400,9 @@ export class DiscoverPlugin
       }
       const { core, plugins } = await this.initializeServices();
       getServices().kibanaLegacy.loadFontAwesome();
-      const { getInnerAngularModuleEmbeddable } = await import('./get_inner_angular');
+      const { getInnerAngularModuleEmbeddable } = await import(
+        './application/angular/get_inner_angular'
+      );
       getInnerAngularModuleEmbeddable(embeddableAngularName, core, plugins);
       const mountpoint = document.createElement('div');
       this.embeddableInjector = angular.bootstrap(mountpoint, [embeddableAngularName]);
diff --git a/src/plugins/discover/public/shared/index.ts b/src/plugins/discover/public/shared/index.ts
index b1e4d9d87000e..c82ac074db111 100644
--- a/src/plugins/discover/public/shared/index.ts
+++ b/src/plugins/discover/public/shared/index.ts
@@ -10,5 +10,5 @@
  * Allows the getSharingData function to be lazy loadable
  */
 export async function loadSharingDataHelpers() {
-  return await import('../application/helpers/get_sharing_data');
+  return await import('../application/apps/main/utils/get_sharing_data');
 }
diff --git a/src/plugins/discover/public/url_generator.ts b/src/plugins/discover/public/url_generator.ts
index 21bdbf225d6aa..63dea20fecc0a 100644
--- a/src/plugins/discover/public/url_generator.ts
+++ b/src/plugins/discover/public/url_generator.ts
@@ -6,16 +6,10 @@
  * Side Public License, v 1.
  */
 
-import {
-  TimeRange,
-  Filter,
-  Query,
-  esFilters,
-  QueryState,
-  RefreshInterval,
-} from '../../data/public';
+import type { UrlGeneratorsDefinition } from '../../share/public';
+import type { TimeRange, Filter, Query, QueryState, RefreshInterval } from '../../data/public';
+import { esFilters } from '../../data/public';
 import { setStateToKbnUrl } from '../../kibana_utils/public';
-import { UrlGeneratorsDefinition } from '../../share/public';
 
 export const DISCOVER_APP_URL_GENERATOR = 'DISCOVER_APP_URL_GENERATOR';
 
@@ -71,10 +65,12 @@ export interface DiscoverUrlGeneratorState {
    * Used interval of the histogram
    */
   interval?: string;
+
   /**
    * Array of the used sorting [[field,direction],...]
    */
   sort?: string[][];
+
   /**
    * id of the used saved query
    */
diff --git a/src/plugins/embeddable/common/lib/migrate.ts b/src/plugins/embeddable/common/lib/migrate.ts
index 0a9cd0760eb2c..fb8ea5cf2cd84 100644
--- a/src/plugins/embeddable/common/lib/migrate.ts
+++ b/src/plugins/embeddable/common/lib/migrate.ts
@@ -26,9 +26,11 @@ export const getMigrateFunction = (embeddables: CommonEmbeddableStartContract) =
     updatedInput.enhancements = {};
     Object.keys(enhancements).forEach((key) => {
       if (!enhancements[key]) return;
-      (updatedInput.enhancements! as Record<string, any>)[key] = embeddables
-        .getEnhancement(key)
-        .migrations[version](enhancements[key] as SerializableState);
+      const enhancementDefinition = embeddables.getEnhancement(key);
+      const migratedEnhancement = enhancementDefinition?.migrations?.[version]
+        ? enhancementDefinition.migrations[version](enhancements[key] as SerializableState)
+        : enhancements[key];
+      (updatedInput.enhancements! as Record<string, any>)[key] = migratedEnhancement;
     });
 
     return updatedInput;
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 3e6d28e066469..9eb743a3911c2 100644
--- a/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
+++ b/src/plugins/embeddable/public/lib/attribute_service/attribute_service.tsx
@@ -8,7 +8,7 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { get } from 'lodash';
+import { get, omit } from 'lodash';
 import { I18nStart, NotificationsStart } from 'src/core/public';
 import { SavedObjectSaveModal, OnSaveProps, SaveResult } from '../../../../saved_objects/public';
 import {
@@ -150,12 +150,10 @@ export class AttributeService<
           const wrappedInput = (await this.wrapAttributes(newAttributes, true)) as RefType;
 
           // Remove unneeded attributes from the original input.
-          delete (input as { [ATTRIBUTE_SERVICE_KEY]?: SavedObjectAttributes })[
-            ATTRIBUTE_SERVICE_KEY
-          ];
+          const newInput = omit(input, ATTRIBUTE_SERVICE_KEY);
 
           // Combine input and wrapped input to preserve any passed in explicit Input.
-          resolve({ ...input, ...wrappedInput });
+          resolve({ ...newInput, ...wrappedInput });
           return { id: wrappedInput.savedObjectId };
         } catch (error) {
           reject(error);
diff --git a/src/plugins/embeddable/public/plugin.test.ts b/src/plugins/embeddable/public/plugin.test.ts
index 2e7d8c73cfc6d..53302e8e6870c 100644
--- a/src/plugins/embeddable/public/plugin.test.ts
+++ b/src/plugins/embeddable/public/plugin.test.ts
@@ -184,4 +184,12 @@ describe('embeddable enhancements', () => {
       embeddableState.enhancements.test
     );
   });
+
+  test('doesnt fail if there is no migration function registered for specific version', () => {
+    expect(() => {
+      start.migrate(embeddableState, '7.10.0');
+    }).not.toThrow();
+
+    expect(start.migrate(embeddableState, '7.10.0')).toEqual(embeddableState);
+  });
 });
diff --git a/src/plugins/embeddable/public/plugin.tsx b/src/plugins/embeddable/public/plugin.tsx
index 3e1a19711d0ff..4ddef89727ef1 100644
--- a/src/plugins/embeddable/public/plugin.tsx
+++ b/src/plugins/embeddable/public/plugin.tsx
@@ -236,7 +236,7 @@ export class EmbeddablePublicPlugin implements Plugin<EmbeddableSetup, Embeddabl
     return (
       this.enhancements.get(id) || {
         id: 'unknown',
-        telemetry: () => ({}),
+        telemetry: (state, stats) => stats,
         inject: identity,
         extract: (state: SerializableState) => {
           return { state, references: [] };
diff --git a/src/plugins/embeddable/server/plugin.ts b/src/plugins/embeddable/server/plugin.ts
index f4728bf575a06..788f51adc327b 100644
--- a/src/plugins/embeddable/server/plugin.ts
+++ b/src/plugins/embeddable/server/plugin.ts
@@ -90,7 +90,7 @@ export class EmbeddableServerPlugin implements Plugin<EmbeddableSetup, Embeddabl
     return (
       this.enhancements.get(id) || {
         id: 'unknown',
-        telemetry: () => ({}),
+        telemetry: (state, stats) => stats,
         inject: identity,
         extract: (state: SerializableState) => {
           return { state, references: [] };
@@ -119,7 +119,7 @@ export class EmbeddableServerPlugin implements Plugin<EmbeddableSetup, Embeddabl
     return (
       this.embeddableFactories.get(embeddableFactoryId) || {
         id: 'unknown',
-        telemetry: () => ({}),
+        telemetry: (state, stats) => stats,
         inject: (state: EmbeddableStateWithType) => state,
         extract: (state: EmbeddableStateWithType) => {
           return { state, references: [] };
diff --git a/src/plugins/expressions/common/expression_functions/specs/map_column.ts b/src/plugins/expressions/common/expression_functions/specs/map_column.ts
index c570206670dde..7939441ff0d60 100644
--- a/src/plugins/expressions/common/expression_functions/specs/map_column.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/map_column.ts
@@ -44,7 +44,7 @@ export const mapColumn: ExpressionFunctionDefinition<
       types: ['string', 'null'],
       help: i18n.translate('expressions.functions.mapColumn.args.idHelpText', {
         defaultMessage:
-          'An optional id of the resulting column. When `null` the name/column argument is used as id.',
+          'An optional id of the resulting column. When no id is provided, the id will be looked up from the existing column by the provided name argument. If no column with this name exists yet, a new column with this name and an identical id will be added to the table.',
       }),
       required: false,
       default: null,
@@ -53,7 +53,7 @@ export const mapColumn: ExpressionFunctionDefinition<
       types: ['string'],
       aliases: ['_', 'column'],
       help: i18n.translate('expressions.functions.mapColumn.args.nameHelpText', {
-        defaultMessage: 'The name of the resulting column.',
+        defaultMessage: 'The name of the resulting column. Names are not required to be unique.',
       }),
       required: true,
     },
@@ -86,9 +86,17 @@ export const mapColumn: ExpressionFunctionDefinition<
         .expression?.(...params)
         .pipe(take(1))
         .toPromise() ?? Promise.resolve(null);
-    const columnId = args.id != null ? args.id : args.name;
 
     const columns = [...input.columns];
+    const existingColumnIndex = columns.findIndex(({ id, name }) => {
+      if (args.id) {
+        return id === args.id;
+      }
+      return name === args.name;
+    });
+    const columnId =
+      existingColumnIndex === -1 ? args.id ?? args.name : columns[existingColumnIndex].id;
+
     const rowPromises = input.rows.map((row) => {
       return expression({
         type: 'datatable',
@@ -101,7 +109,6 @@ export const mapColumn: ExpressionFunctionDefinition<
     });
 
     return Promise.all(rowPromises).then((rows) => {
-      const existingColumnIndex = columns.findIndex(({ name }) => name === args.name);
       const type = rows.length ? getType(rows[0][columnId]) : 'null';
       const newColumn = {
         id: columnId,
diff --git a/src/plugins/expressions/common/expression_functions/specs/math.ts b/src/plugins/expressions/common/expression_functions/specs/math.ts
index a70c032769b57..92a10976428a3 100644
--- a/src/plugins/expressions/common/expression_functions/specs/math.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/math.ts
@@ -130,10 +130,11 @@ export const math: ExpressionFunctionDefinition<
       throw errors.emptyExpression();
     }
 
+    // Use unique ID if available, otherwise fall back to names
     const mathContext = isDatatable(input)
       ? pivotObjectArray(
           input.rows,
-          input.columns.map((col) => col.name)
+          input.columns.map((col) => col.id)
         )
       : { value: input };
 
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts
index b2966b010b479..f5c1f3838f66c 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/map_column.test.ts
@@ -35,16 +35,35 @@ describe('mapColumn', () => {
     expect(result.rows[arbitraryRowIndex]).toHaveProperty('pricePlusTwo');
   });
 
-  it('overwrites existing column with the new column if an existing column name is provided', async () => {
-    const result = await runFn(testTable, { name: 'name', expression: pricePlusTwo });
-    const nameColumnIndex = result.columns.findIndex(({ name }) => name === 'name');
+  it('allows the id arg to be optional, looking up by name instead', async () => {
+    const result = await runFn(testTable, { name: 'name label', expression: pricePlusTwo });
+    const nameColumnIndex = result.columns.findIndex(({ name }) => name === 'name label');
     const arbitraryRowIndex = 4;
 
     expect(result.type).toBe('datatable');
     expect(result.columns).toHaveLength(testTable.columns.length);
-    expect(result.columns[nameColumnIndex]).toHaveProperty('name', 'name');
+    expect(result.columns[nameColumnIndex]).toHaveProperty('id', 'name');
+    expect(result.columns[nameColumnIndex]).toHaveProperty('name', 'name label');
     expect(result.columns[nameColumnIndex].meta).toHaveProperty('type', 'number');
     expect(result.rows[arbitraryRowIndex]).toHaveProperty('name', 202);
+    expect(result.rows[arbitraryRowIndex]).not.toHaveProperty('name label');
+  });
+
+  it('allows a duplicate name when the ids are different', async () => {
+    const result = await runFn(testTable, {
+      id: 'new',
+      name: 'name label',
+      expression: pricePlusTwo,
+    });
+    const nameColumnIndex = result.columns.findIndex(({ id }) => id === 'new');
+    const arbitraryRowIndex = 4;
+
+    expect(result.type).toBe('datatable');
+    expect(result.columns).toHaveLength(testTable.columns.length + 1);
+    expect(result.columns[nameColumnIndex]).toHaveProperty('id', 'new');
+    expect(result.columns[nameColumnIndex]).toHaveProperty('name', 'name label');
+    expect(result.columns[nameColumnIndex].meta).toHaveProperty('type', 'number');
+    expect(result.rows[arbitraryRowIndex]).toHaveProperty('new', 202);
   });
 
   it('adds a column to empty tables', async () => {
@@ -66,18 +85,6 @@ describe('mapColumn', () => {
     expect(result.columns[0].meta).toHaveProperty('type', 'null');
   });
 
-  it('should assign specific id, different from name, when id arg is passed for copied column', async () => {
-    const result = await runFn(testTable, { name: 'name', id: 'myid', expression: pricePlusTwo });
-    const nameColumnIndex = result.columns.findIndex(({ name }) => name === 'name');
-
-    expect(result.type).toBe('datatable');
-    expect(result.columns[nameColumnIndex]).toEqual({
-      id: 'myid',
-      name: 'name',
-      meta: { type: 'number' },
-    });
-  });
-
   it('should copy over the meta information from the specified column', async () => {
     const result = await runFn(
       {
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/math.test.ts b/src/plugins/expressions/common/expression_functions/specs/tests/math.test.ts
index 7541852cdbdaf..6da00061244da 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/math.test.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/math.test.ts
@@ -27,7 +27,7 @@ describe('math', () => {
     expect(fn(-103, { expression: 'abs(value)' })).toBe(103);
   });
 
-  it('evaluates math expressions with references to columns in a datatable', () => {
+  it('evaluates math expressions with references to columns by id in a datatable', () => {
     expect(fn(testTable, { expression: 'unique(in_stock)' })).toBe(2);
     expect(fn(testTable, { expression: 'sum(quantity)' })).toBe(2508);
     expect(fn(testTable, { expression: 'mean(price)' })).toBe(320);
@@ -36,6 +36,21 @@ describe('math', () => {
     expect(fn(testTable, { expression: 'max(price)' })).toBe(605);
   });
 
+  it('does not use the name for math', () => {
+    expect(() => fn(testTable, { expression: 'unique("in_stock label")' })).toThrow(
+      'Unknown variable'
+    );
+    expect(() => fn(testTable, { expression: 'sum("quantity label")' })).toThrow(
+      'Unknown variable'
+    );
+    expect(() => fn(testTable, { expression: 'mean("price label")' })).toThrow('Unknown variable');
+    expect(() => fn(testTable, { expression: 'min("price label")' })).toThrow('Unknown variable');
+    expect(() => fn(testTable, { expression: 'median("quantity label")' })).toThrow(
+      'Unknown variable'
+    );
+    expect(() => fn(testTable, { expression: 'max("price label")' })).toThrow('Unknown variable');
+  });
+
   describe('args', () => {
     describe('expression', () => {
       it('sets the math expression to be evaluted', () => {
diff --git a/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts b/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts
index 7369570cf2c4b..60d22d2b8575c 100644
--- a/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts
+++ b/src/plugins/expressions/common/expression_functions/specs/tests/utils.ts
@@ -37,27 +37,27 @@ const testTable: Datatable = {
   columns: [
     {
       id: 'name',
-      name: 'name',
+      name: 'name label',
       meta: { type: 'string' },
     },
     {
       id: 'time',
-      name: 'time',
+      name: 'time label',
       meta: { type: 'date' },
     },
     {
       id: 'price',
-      name: 'price',
+      name: 'price label',
       meta: { type: 'number' },
     },
     {
       id: 'quantity',
-      name: 'quantity',
+      name: 'quantity label',
       meta: { type: 'number' },
     },
     {
       id: 'in_stock',
-      name: 'in_stock',
+      name: 'in_stock label',
       meta: { type: 'boolean' },
     },
   ],
diff --git a/src/plugins/home/public/application/components/tutorial/instruction.js b/src/plugins/home/public/application/components/tutorial/instruction.js
index f96ef3d71c517..88b28ea1bf1a9 100644
--- a/src/plugins/home/public/application/components/tutorial/instruction.js
+++ b/src/plugins/home/public/application/components/tutorial/instruction.js
@@ -73,7 +73,7 @@ export function Instruction({
     commandBlock = (
       <div>
         <EuiSpacer size="m" />
-        <EuiCodeBlock language="sh">{cmdText}</EuiCodeBlock>
+        <EuiCodeBlock language="bash">{cmdText}</EuiCodeBlock>
       </div>
     );
   }
diff --git a/src/plugins/home/public/application/components/tutorial_directory.js b/src/plugins/home/public/application/components/tutorial_directory.js
index 094ac302fcebe..1fda865ebd847 100644
--- a/src/plugins/home/public/application/components/tutorial_directory.js
+++ b/src/plugins/home/public/application/components/tutorial_directory.js
@@ -42,6 +42,8 @@ class TutorialDirectoryUi extends React.Component {
   constructor(props) {
     super(props);
 
+    const extraTabs = getServices().addDataService.getAddDataTabs();
+
     this.tabs = [
       {
         id: ALL_TAB_ID,
@@ -77,7 +79,13 @@ class TutorialDirectoryUi extends React.Component {
           id: 'home.tutorial.tabs.sampleDataTitle',
           defaultMessage: 'Sample data',
         }),
+        content: <SampleDataSetCards addBasePath={this.props.addBasePath} />,
       },
+      ...extraTabs.map(({ id, name, component: Component }) => ({
+        id,
+        name,
+        content: <Component />,
+      })),
     ];
 
     let openTab = ALL_TAB_ID;
@@ -190,8 +198,9 @@ class TutorialDirectoryUi extends React.Component {
   };
 
   renderTabContent = () => {
-    if (this.state.selectedTabId === SAMPLE_DATA_TAB_ID) {
-      return <SampleDataSetCards addBasePath={this.props.addBasePath} />;
+    const tab = this.tabs.find(({ id }) => id === this.state.selectedTabId);
+    if (tab?.content) {
+      return tab.content;
     }
 
     return (
diff --git a/src/plugins/home/public/application/kibana_services.ts b/src/plugins/home/public/application/kibana_services.ts
index 73a8ab41bcfd2..af9f956889547 100644
--- a/src/plugins/home/public/application/kibana_services.ts
+++ b/src/plugins/home/public/application/kibana_services.ts
@@ -20,6 +20,7 @@ import { UiCounterMetricType } from '@kbn/analytics';
 import { TelemetryPluginStart } from '../../../telemetry/public';
 import { UrlForwardingStart } from '../../../url_forwarding/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';
@@ -44,6 +45,7 @@ export interface HomeKibanaServices {
   environmentService: EnvironmentService;
   telemetry?: TelemetryPluginStart;
   tutorialService: TutorialService;
+  addDataService: AddDataService;
 }
 
 let services: HomeKibanaServices | null = null;
diff --git a/src/plugins/home/public/mocks.ts b/src/plugins/home/public/mocks.ts
index 32bec31153ba0..10c186ee3f4e3 100644
--- a/src/plugins/home/public/mocks.ts
+++ b/src/plugins/home/public/mocks.ts
@@ -10,11 +10,13 @@ import { featureCatalogueRegistryMock } from './services/feature_catalogue/featu
 import { environmentServiceMock } from './services/environment/environment.mock';
 import { configSchema } from '../config';
 import { tutorialServiceMock } from './services/tutorials/tutorial_service.mock';
+import { addDataServiceMock } from './services/add_data/add_data_service.mock';
 
 const createSetupContract = () => ({
   featureCatalogue: featureCatalogueRegistryMock.createSetup(),
   environment: environmentServiceMock.createSetup(),
   tutorials: tutorialServiceMock.createSetup(),
+  addData: addDataServiceMock.createSetup(),
   config: configSchema.validate({}),
 });
 
diff --git a/src/plugins/home/public/plugin.test.mocks.ts b/src/plugins/home/public/plugin.test.mocks.ts
index 779ab2e700352..c3e3c50a2fe0f 100644
--- a/src/plugins/home/public/plugin.test.mocks.ts
+++ b/src/plugins/home/public/plugin.test.mocks.ts
@@ -9,12 +9,15 @@
 import { featureCatalogueRegistryMock } from './services/feature_catalogue/feature_catalogue_registry.mock';
 import { environmentServiceMock } from './services/environment/environment.mock';
 import { tutorialServiceMock } from './services/tutorials/tutorial_service.mock';
+import { addDataServiceMock } from './services/add_data/add_data_service.mock';
 
 export const registryMock = featureCatalogueRegistryMock.create();
 export const environmentMock = environmentServiceMock.create();
 export const tutorialMock = tutorialServiceMock.create();
+export const addDataMock = addDataServiceMock.create();
 jest.doMock('./services', () => ({
   FeatureCatalogueRegistry: jest.fn(() => registryMock),
   EnvironmentService: jest.fn(() => environmentMock),
   TutorialService: jest.fn(() => tutorialMock),
+  AddDataService: jest.fn(() => addDataMock),
 }));
diff --git a/src/plugins/home/public/plugin.ts b/src/plugins/home/public/plugin.ts
index 89c7600a1d85d..b3b5ce487b747 100644
--- a/src/plugins/home/public/plugin.ts
+++ b/src/plugins/home/public/plugin.ts
@@ -24,6 +24,8 @@ import {
   FeatureCatalogueRegistrySetup,
   TutorialService,
   TutorialServiceSetup,
+  AddDataService,
+  AddDataServiceSetup,
 } from './services';
 import { ConfigSchema } from '../config';
 import { setServices } from './application/kibana_services';
@@ -56,6 +58,7 @@ export class HomePublicPlugin
   private readonly featuresCatalogueRegistry = new FeatureCatalogueRegistry();
   private readonly environmentService = new EnvironmentService();
   private readonly tutorialService = new TutorialService();
+  private readonly addDataService = new AddDataService();
 
   constructor(private readonly initializerContext: PluginInitializerContext<ConfigSchema>) {}
 
@@ -94,6 +97,7 @@ export class HomePublicPlugin
           urlForwarding: urlForwardingStart,
           homeConfig: this.initializerContext.config.get(),
           tutorialService: this.tutorialService,
+          addDataService: this.addDataService,
           featureCatalogue: this.featuresCatalogueRegistry,
         });
         coreStart.chrome.docTitle.change(
@@ -126,6 +130,7 @@ export class HomePublicPlugin
       featureCatalogue,
       environment: { ...this.environmentService.setup() },
       tutorials: { ...this.tutorialService.setup() },
+      addData: { ...this.addDataService.setup() },
     };
   }
 
@@ -163,9 +168,13 @@ export type EnvironmentSetup = EnvironmentServiceSetup;
 /** @public */
 export type TutorialSetup = TutorialServiceSetup;
 
+/** @public */
+export type AddDataSetup = AddDataServiceSetup;
+
 /** @public */
 export interface HomePublicPluginSetup {
   tutorials: TutorialServiceSetup;
+  addData: AddDataServiceSetup;
   featureCatalogue: FeatureCatalogueSetup;
   /**
    * The environment service is only available for a transition period and will
diff --git a/src/plugins/home/public/services/add_data/add_data_service.mock.ts b/src/plugins/home/public/services/add_data/add_data_service.mock.ts
new file mode 100644
index 0000000000000..e0b4d12909791
--- /dev/null
+++ b/src/plugins/home/public/services/add_data/add_data_service.mock.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 type { PublicMethodsOf } from '@kbn/utility-types';
+import { AddDataService, AddDataServiceSetup } from './add_data_service';
+
+const createSetupMock = (): jest.Mocked<AddDataServiceSetup> => {
+  const setup = {
+    registerAddDataTab: jest.fn(),
+  };
+  return setup;
+};
+
+const createMock = (): jest.Mocked<PublicMethodsOf<AddDataService>> => {
+  const service = {
+    setup: jest.fn(),
+    getAddDataTabs: jest.fn(() => []),
+  };
+  service.setup.mockImplementation(createSetupMock);
+  return service;
+};
+
+export const addDataServiceMock = {
+  createSetup: createSetupMock,
+  create: createMock,
+};
diff --git a/src/plugins/home/public/services/add_data/add_data_service.test.tsx b/src/plugins/home/public/services/add_data/add_data_service.test.tsx
new file mode 100644
index 0000000000000..b04b80ac19eec
--- /dev/null
+++ b/src/plugins/home/public/services/add_data/add_data_service.test.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { AddDataService } from './add_data_service';
+
+describe('AddDataService', () => {
+  describe('setup', () => {
+    test('allows multiple register directory header link calls', () => {
+      const setup = new AddDataService().setup();
+      expect(() => {
+        setup.registerAddDataTab({ id: 'abc', name: 'a b c', component: () => <a>123</a> });
+        setup.registerAddDataTab({ id: 'def', name: 'a b c', component: () => <a>456</a> });
+      }).not.toThrow();
+    });
+
+    test('throws when same directory header link is registered twice', () => {
+      const setup = new AddDataService().setup();
+      expect(() => {
+        setup.registerAddDataTab({ id: 'abc', name: 'a b c', component: () => <a>123</a> });
+        setup.registerAddDataTab({ id: 'abc', name: 'a b c', component: () => <a>456</a> });
+      }).toThrow();
+    });
+  });
+
+  describe('getDirectoryHeaderLinks', () => {
+    test('returns empty array', () => {
+      const service = new AddDataService();
+      expect(service.getAddDataTabs()).toEqual([]);
+    });
+
+    test('returns last state of register calls', () => {
+      const service = new AddDataService();
+      const setup = service.setup();
+      const links = [
+        { id: 'abc', name: 'a b c', component: () => <a>123</a> },
+        { id: 'def', name: 'a b c', component: () => <a>456</a> },
+      ];
+      setup.registerAddDataTab(links[0]);
+      setup.registerAddDataTab(links[1]);
+      expect(service.getAddDataTabs()).toEqual(links);
+    });
+  });
+});
diff --git a/src/plugins/home/public/services/add_data/add_data_service.ts b/src/plugins/home/public/services/add_data/add_data_service.ts
new file mode 100644
index 0000000000000..668c373f8314d
--- /dev/null
+++ b/src/plugins/home/public/services/add_data/add_data_service.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 React from 'react';
+
+/** @public */
+export interface AddDataTab {
+  id: string;
+  name: string;
+  component: React.FC;
+}
+
+export class AddDataService {
+  private addDataTabs: Record<string, AddDataTab> = {};
+
+  public setup() {
+    return {
+      /**
+       * Registers a component that will be rendered as a new tab in the Add data page
+       */
+      registerAddDataTab: (tab: AddDataTab) => {
+        if (this.addDataTabs[tab.id]) {
+          throw new Error(`Tab ${tab.id} already exists`);
+        }
+        this.addDataTabs[tab.id] = tab;
+      },
+    };
+  }
+
+  public getAddDataTabs() {
+    return Object.values(this.addDataTabs);
+  }
+}
+
+export type AddDataServiceSetup = ReturnType<AddDataService['setup']>;
diff --git a/src/plugins/home/public/services/add_data/index.ts b/src/plugins/home/public/services/add_data/index.ts
new file mode 100644
index 0000000000000..f2367ca320e9f
--- /dev/null
+++ b/src/plugins/home/public/services/add_data/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 { AddDataService } from './add_data_service';
+
+export type { AddDataServiceSetup, AddDataTab } from './add_data_service';
diff --git a/src/plugins/home/public/services/index.ts b/src/plugins/home/public/services/index.ts
index 8cd4c8d84e0f7..65913df6310b1 100644
--- a/src/plugins/home/public/services/index.ts
+++ b/src/plugins/home/public/services/index.ts
@@ -26,3 +26,6 @@ export type {
   TutorialDirectoryHeaderLinkComponent,
   TutorialModuleNoticeComponent,
 } from './tutorials';
+
+export { AddDataService } from './add_data';
+export type { AddDataServiceSetup, AddDataTab } from './add_data';
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 dc5831aa00a0b..a12a2ff195211 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
@@ -45,7 +45,7 @@ export const getSavedObjects = (): SavedObject[] => [
         defaultMessage: '[eCommerce] Sales by Gender',
       }),
       visState:
-        '{"title":"[eCommerce] Sales by Gender","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"customer_gender","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+        '{"title":"[eCommerce] Sales by Gender","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100},"palette":{"type":"palette","name":"default"}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"customer_gender","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
       uiStateJSON: '{}',
       description: '',
       version: 1,
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 1fa19189b8c84..05a3d012d707c 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
@@ -100,7 +100,7 @@ export const getSavedObjects = (): SavedObject[] => [
         defaultMessage: '[Flights] Airline Carrier',
       }),
       visState:
-        '{"title":"[Flights] Airline Carrier","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"Carrier","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
+        '{"title":"[Flights] Airline Carrier","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100},"palette":{"type":"palette","name":"default"}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"Carrier","size":5,"order":"desc","orderBy":"1","otherBucket":false,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing"}}]}',
       uiStateJSON: '{"vis":{"legendOpen":false}}',
       description: '',
       version: 1,
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 4a17f96bf89ba..661e6ca0ce50f 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
@@ -234,7 +234,7 @@ export const getSavedObjects = (): SavedObject[] => [
         defaultMessage: '[Logs] Visitors by OS',
       }),
       visState:
-        '{"title":"[Logs] Visitors by OS","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"machine.os.keyword","otherBucket":true,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","size":10,"order":"desc","orderBy":"1"}}]}',
+        '{"title":"[Logs] Visitors by OS","type":"pie","params":{"type":"pie","addTooltip":true,"addLegend":true,"legendPosition":"right","isDonut":true,"labels":{"show":true,"values":true,"last_level":true,"truncate":100},"palette":{"type":"palette","name":"default"}},"aggs":[{"id":"1","enabled":true,"type":"count","schema":"metric","params":{}},{"id":"2","enabled":true,"type":"terms","schema":"segment","params":{"field":"machine.os.keyword","otherBucket":true,"otherBucketLabel":"Other","missingBucket":false,"missingBucketLabel":"Missing","size":10,"order":"desc","orderBy":"1"}}]}',
       uiStateJSON: '{}',
       description: '',
       version: 1,
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap
index cb7949deda64f..d000af4453cd1 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/__snapshots__/duration.test.tsx.snap
@@ -1,5 +1,184 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`DurationFormatEditor should not render show suffix on dynamic output 1`] = `
+<Fragment>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    isInvalid={false}
+    label={
+      <FormattedMessage
+        defaultMessage="Input format"
+        id="indexPatternFieldEditor.duration.inputFormatLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiSelect
+      isInvalid={false}
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "text": "Seconds",
+            "value": "seconds",
+          },
+        ]
+      }
+      value=""
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    isInvalid={false}
+    label={
+      <FormattedMessage
+        defaultMessage="Output format"
+        id="indexPatternFieldEditor.duration.outputFormatLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiSelect
+      isInvalid={false}
+      onChange={[Function]}
+      options={
+        Array [
+          Object {
+            "text": "Human Readable",
+            "value": "humanize",
+          },
+          Object {
+            "text": "Minutes",
+            "value": "asMinutes",
+          },
+        ]
+      }
+      value="dynamic"
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    error={null}
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    isInvalid={false}
+    label={
+      <FormattedMessage
+        defaultMessage="Decimal places"
+        id="indexPatternFieldEditor.duration.decimalPlacesLabel"
+        values={Object {}}
+      />
+    }
+    labelType="label"
+  >
+    <EuiFieldNumber
+      isInvalid={false}
+      max={20}
+      min={0}
+      onChange={[Function]}
+      value={2}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={false}
+      disabled={false}
+      label={
+        <FormattedMessage
+          defaultMessage="Use short suffix"
+          id="indexPatternFieldEditor.duration.showSuffixLabel.short"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      disabled={false}
+      label={
+        <FormattedMessage
+          defaultMessage="Include space between suffix and value"
+          id="indexPatternFieldEditor.duration.includeSpace"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <FormatEditorSamples
+    sampleType="text"
+    samples={
+      Array [
+        Object {
+          "input": -123,
+          "output": "converted duration for -123",
+        },
+        Object {
+          "input": 1,
+          "output": "converted duration for 1",
+        },
+        Object {
+          "input": 12,
+          "output": "converted duration for 12",
+        },
+        Object {
+          "input": 123,
+          "output": "converted duration for 123",
+        },
+        Object {
+          "input": 658,
+          "output": "converted duration for 658",
+        },
+        Object {
+          "input": 1988,
+          "output": "converted duration for 1988",
+        },
+        Object {
+          "input": 3857,
+          "output": "converted duration for 3857",
+        },
+        Object {
+          "input": 123292,
+          "output": "converted duration for 123292",
+        },
+        Object {
+          "input": 923528271,
+          "output": "converted duration for 923528271",
+        },
+      ]
+    }
+  />
+</Fragment>
+`;
+
 exports[`DurationFormatEditor should render human readable output normally 1`] = `
 <Fragment>
   <EuiFormRow
@@ -223,6 +402,48 @@ exports[`DurationFormatEditor should render non-human readable output normally 1
       onChange={[Function]}
     />
   </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={false}
+      disabled={true}
+      label={
+        <FormattedMessage
+          defaultMessage="Use short suffix"
+          id="indexPatternFieldEditor.duration.showSuffixLabel.short"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
+  <EuiFormRow
+    describedByIds={Array []}
+    display="row"
+    fullWidth={false}
+    hasChildLabel={true}
+    hasEmptyLabelSpace={false}
+    labelType="label"
+  >
+    <EuiSwitch
+      checked={true}
+      disabled={true}
+      label={
+        <FormattedMessage
+          defaultMessage="Include space between suffix and value"
+          id="indexPatternFieldEditor.duration.includeSpace"
+          values={Object {}}
+        />
+      }
+      onChange={[Function]}
+    />
+  </EuiFormRow>
   <FormatEditorSamples
     sampleType="text"
     samples={
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
index 26ac65a2a77c9..80a57b9419763 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.test.tsx
@@ -11,6 +11,7 @@ import { shallow } from 'enzyme';
 
 import { DurationFormatEditor } from './duration';
 import { FieldFormat } from 'src/plugins/data/public';
+import { EuiSwitch } from '@elastic/eui';
 
 const fieldType = 'number';
 const format = {
@@ -22,9 +23,11 @@ const format = {
       inputFormat: 'seconds',
       outputFormat: 'humanize',
       outputPrecision: 10,
+      includeSpaceWithSuffix: true,
     };
   }),
   isHuman: () => true,
+  isHumanPrecise: () => false,
   type: {
     inputFormats: [
       {
@@ -78,6 +81,7 @@ describe('DurationFormatEditor', () => {
           inputFormat: 'seconds',
           outputFormat: 'asMinutes',
           outputPrecision: 10,
+          includeSpaceWithSuffix: true,
         };
       }),
       isHuman: () => false,
@@ -91,6 +95,55 @@ describe('DurationFormatEditor', () => {
         onError={onError}
       />
     );
+    const labels = component.find(EuiSwitch);
+    expect(labels.length).toEqual(3);
+    expect(labels.get(0).props.label.props.defaultMessage).toEqual('Show suffix');
+    expect(labels.get(1).props.label.props.defaultMessage).toEqual('Use short suffix');
+    expect(labels.get(2).props.label.props.defaultMessage).toEqual(
+      'Include space between suffix and value'
+    );
+
+    expect(component).toMatchSnapshot();
+  });
+
+  it('should not render show suffix on dynamic output', async () => {
+    const newFormat = {
+      ...format,
+      getParamDefaults: jest.fn().mockImplementation(() => {
+        return {
+          inputFormat: 'seconds',
+          outputFormat: 'dynamic',
+          outputPrecision: 2,
+          includeSpaceWithSuffix: true,
+        };
+      }),
+      isHuman: () => false,
+      isHumanPrecise: () => true,
+    };
+    const component = shallow(
+      <DurationFormatEditor
+        fieldType={fieldType}
+        format={(newFormat as unknown) as FieldFormat}
+        formatParams={{ ...formatParams, outputFormat: 'dynamic' }}
+        onChange={onChange}
+        onError={onError}
+      />
+    );
+
+    const labels = component.find(EuiSwitch);
+    expect(labels.length).toEqual(2);
+    const useShortSuffixSwitch = labels.get(0);
+
+    expect(useShortSuffixSwitch.props.label.props.defaultMessage).toEqual('Use short suffix');
+    expect(useShortSuffixSwitch.props.disabled).toEqual(false);
+
+    const includeSpaceSwitch = labels.get(1);
+
+    expect(includeSpaceSwitch.props.disabled).toEqual(false);
+    expect(includeSpaceSwitch.props.label.props.defaultMessage).toEqual(
+      'Include space between suffix and value'
+    );
+
     expect(component).toMatchSnapshot();
   });
 });
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
index de413d02c5011..d61d14aac3fc7 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/duration/duration.tsx
@@ -41,6 +41,8 @@ interface DurationFormatEditorFormatParams {
   inputFormat: string;
   outputFormat: string;
   showSuffix?: boolean;
+  useShortSuffix?: boolean;
+  includeSpaceWithSuffix?: boolean;
 }
 
 export class DurationFormatEditor extends DefaultFormatEditor<
@@ -83,9 +85,14 @@ export class DurationFormatEditor extends DefaultFormatEditor<
   }
 
   render() {
-    const { format, formatParams } = this.props;
+    const { format } = this.props;
     const { error, samples, hasDecimalError } = this.state;
 
+    const formatParams: DurationFormatEditorFormatParams = {
+      includeSpaceWithSuffix: format.getParamDefaults().includeSpaceWithSuffix,
+      ...this.props.formatParams,
+    };
+
     return (
       <Fragment>
         <EuiFormRow
@@ -159,17 +166,55 @@ export class DurationFormatEditor extends DefaultFormatEditor<
                 isInvalid={!!error}
               />
             </EuiFormRow>
+            {!(format as DurationFormat).isHumanPrecise() && (
+              <EuiFormRow>
+                <EuiSwitch
+                  label={
+                    <FormattedMessage
+                      id="indexPatternFieldEditor.duration.showSuffixLabel"
+                      defaultMessage="Show suffix"
+                    />
+                  }
+                  checked={Boolean(formatParams.showSuffix)}
+                  onChange={(e) => {
+                    this.onChange({
+                      showSuffix: !formatParams.showSuffix,
+                    });
+                  }}
+                />
+              </EuiFormRow>
+            )}
             <EuiFormRow>
               <EuiSwitch
+                disabled={
+                  !Boolean(formatParams.showSuffix) && !(format as DurationFormat).isHumanPrecise()
+                }
+                label={
+                  <FormattedMessage
+                    id="indexPatternFieldEditor.duration.showSuffixLabel.short"
+                    defaultMessage="Use short suffix"
+                  />
+                }
+                checked={Boolean(formatParams.useShortSuffix)}
+                onChange={(e) => {
+                  this.onChange({ useShortSuffix: !formatParams.useShortSuffix });
+                }}
+              />
+            </EuiFormRow>
+            <EuiFormRow>
+              <EuiSwitch
+                disabled={
+                  !Boolean(formatParams.showSuffix) && !(format as DurationFormat).isHumanPrecise()
+                }
                 label={
                   <FormattedMessage
-                    id="indexPatternFieldEditor.duration.showSuffixLabel"
-                    defaultMessage="Show suffix"
+                    id="indexPatternFieldEditor.duration.includeSpace"
+                    defaultMessage="Include space between suffix and value"
                   />
                 }
-                checked={Boolean(formatParams.showSuffix)}
+                checked={Boolean(formatParams.includeSpaceWithSuffix)}
                 onChange={(e) => {
-                  this.onChange({ showSuffix: !formatParams.showSuffix });
+                  this.onChange({ includeSpaceWithSuffix: !formatParams.includeSpaceWithSuffix });
                 }}
               />
             </EuiFormRow>
diff --git a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
index bc5efb8f5eda4..40170c39942e5 100644
--- a/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
+++ b/src/plugins/index_pattern_field_editor/public/components/field_format_editor/editors/url/__snapshots__/url.test.tsx.snap
@@ -306,7 +306,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
                   role="columnheader"
                   scope="col"
                 >
-                  <div
+                  <span
                     class="euiTableCellContent"
                   >
                     <span
@@ -315,7 +315,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
                     >
                       Input
                     </span>
-                  </div>
+                  </span>
                 </th>
                 <th
                   class="euiTableHeaderCell"
@@ -323,7 +323,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
                   role="columnheader"
                   scope="col"
                 >
-                  <div
+                  <span
                     class="euiTableCellContent"
                   >
                     <span
@@ -332,7 +332,7 @@ exports[`UrlFormatEditor should render normally 1`] = `
                     >
                       Output
                     </span>
-                  </div>
+                  </span>
                 </th>
               </tr>
             </thead>
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx
index 96f78a088fff4..bacab18d28509 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/confirmation_modal/confirmation_modal.test.tsx
@@ -15,6 +15,7 @@ describe('DeleteScritpedFieldConfirmationModal', () => {
   test('should render normally', () => {
     const component = shallow(
       <DeleteScritpedFieldConfirmationModal
+        // @ts-expect-error invalid lang
         field={{ name: '', script: '', lang: '' }}
         deleteField={() => {}}
         hideDeleteConfirmationModal={() => {}}
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
index 83ac96f6c1695..5a9f4eb871181 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/components/table/table.test.tsx
@@ -15,6 +15,7 @@ import { IIndexPattern } from 'src/plugins/data/public';
 
 const getIndexPatternMock = (mockedFields: any = {}) => ({ ...mockedFields } as IIndexPattern);
 
+// @ts-expect-error invalid lang type
 const items: ScriptedFieldItem[] = [{ name: '1', lang: 'Elastic', script: '' }];
 
 describe('Table', () => {
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
index 08a5f22723628..e6aa87172ca0b 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_field_table.test.tsx
@@ -155,6 +155,7 @@ describe('ScriptedFieldsTable', () => {
     );
 
     await component.update(); // Fire `componentWillMount()`
+    // @ts-expect-error lang is not valid
     component.instance().startDeleteField({ name: 'ScriptedField', lang: '', script: '' });
     await component.update();
 
@@ -179,6 +180,7 @@ describe('ScriptedFieldsTable', () => {
     );
 
     await component.update(); // Fire `componentWillMount()`
+    // @ts-expect-error lang is not valid
     component.instance().startDeleteField({ name: 'ScriptedField', lang: '', script: '' });
 
     await component.update();
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
index 77ba2f734d3fe..7fd5170b669f7 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/scripted_fields_table.tsx
@@ -65,7 +65,7 @@ export class ScriptedFieldsTable extends Component<
     const supportedLangs = getSupportedScriptingLanguages();
 
     for (const field of fields) {
-      const lang: string = field.lang;
+      const lang = field.lang;
       if (deprecatedLangs.includes(lang) || !supportedLangs.includes(lang)) {
         deprecatedLangsInUse.push(lang);
       }
diff --git a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/types.ts b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/types.ts
index 3348f5eb052eb..5c6adc824d225 100644
--- a/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/types.ts
+++ b/src/plugins/index_pattern_management/public/components/edit_index_pattern/scripted_fields_table/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 { estypes } from '@elastic/elasticsearch';
 /** @internal **/
 export interface ScriptedFieldItem {
   name: string;
-  lang: string;
+  lang: estypes.ScriptLanguage;
   script: string;
 }
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
index 31c01b1c45e25..e74bb671e7f4e 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/field_editor/components/scripting_call_outs/__snapshots__/warning_call_out.test.tsx.snap
@@ -112,12 +112,14 @@ exports[`ScriptingWarningCallOut should render normally 1`] = `
         <EuiIcon
           aria-hidden="true"
           className="euiCallOutHeader__icon"
+          color="inherit"
           size="m"
           type="alert"
         >
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
diff --git a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
index f0da57a5f9b6f..b05ddaed064cd 100644
--- a/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
+++ b/src/plugins/index_pattern_management/public/components/field_editor/field_editor.tsx
@@ -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 { estypes } from '@elastic/elasticsearch';
 import React, { PureComponent, Fragment } from 'react';
 import { intersection, union, get } from 'lodash';
 
@@ -100,7 +100,7 @@ export interface FieldEditorState {
   isReady: boolean;
   isCreating: boolean;
   isDeprecatedLang: boolean;
-  scriptingLangs: string[];
+  scriptingLangs: estypes.ScriptLanguage[];
   fieldTypes: string[];
   fieldTypeFormats: FieldTypeFormat[];
   existingFieldNames: string[];
@@ -131,8 +131,8 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
 
   public readonly context!: IndexPatternManagmentContextValue;
 
-  supportedLangs: string[] = [];
-  deprecatedLangs: string[] = [];
+  supportedLangs: estypes.ScriptLanguage[] = [];
+  deprecatedLangs: estypes.ScriptLanguage[] = [];
   constructor(props: FieldEdiorProps, context: IndexPatternManagmentContextValue) {
     super(props, context);
 
@@ -189,6 +189,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
     this.setState({
       isReady: true,
       isCreating: !indexPattern.fields.getByName(spec.name),
+      // @ts-expect-error '' is not a valid ScriptLanguage
       isDeprecatedLang: this.deprecatedLangs.includes(spec.lang || ''),
       errors: [],
       scriptingLangs,
@@ -224,7 +225,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
     });
   };
 
-  onLangChange = (lang: string) => {
+  onLangChange = (lang: estypes.ScriptLanguage) => {
     const { spec } = this.state;
     const fieldTypes = get(FIELD_TYPES_BY_LANG, lang, DEFAULT_FIELD_TYPES);
     spec.lang = lang;
@@ -373,7 +374,7 @@ export class FieldEditor extends PureComponent<FieldEdiorProps, FieldEditorState
           })}
           data-test-subj="editorFieldLang"
           onChange={(e) => {
-            this.onLangChange(e.target.value);
+            this.onLangChange(e.target.value as estypes.ScriptLanguage);
           }}
         />
       </EuiFormRow>
diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap
index 645694371f905..1310488c65fab 100644
--- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap
+++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/__snapshots__/empty_state.test.tsx.snap
@@ -59,7 +59,6 @@ exports[`EmptyState should render normally 1`] = `
         </EuiFlexItem>
         <EuiFlexItem>
           <EuiCard
-            betaBadgeTooltipContent="This feature requires a Basic license."
             className="inpEmptyState__card"
             description={
               <FormattedMessage
@@ -75,7 +74,6 @@ exports[`EmptyState should render normally 1`] = `
                 type="document"
               />
             }
-            isDisabled={false}
             onClick={[Function]}
             title={
               <FormattedMessage
diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx
index fa300667ff919..ed68d4d4ddd64 100644
--- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx
+++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.test.tsx
@@ -13,7 +13,6 @@ import sinon from 'sinon';
 import { findTestSubject } from '@elastic/eui/lib/test';
 import { mountWithIntl } from '@kbn/test/jest';
 import { docLinksServiceMock } from '../../../../../../core/public/mocks';
-import { MlCardState } from '../../../types';
 
 const docLinks = docLinksServiceMock.createStartContract();
 
@@ -30,7 +29,6 @@ describe('EmptyState', () => {
         docLinks={docLinks}
         onRefresh={() => {}}
         navigateToApp={async () => {}}
-        getMlCardState={() => MlCardState.ENABLED}
         canSave={true}
       />
     );
@@ -48,7 +46,6 @@ describe('EmptyState', () => {
             docLinks={docLinks}
             onRefresh={onRefreshHandler}
             navigateToApp={async () => {}}
-            getMlCardState={() => MlCardState.ENABLED}
             canSave={true}
           />
         );
diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx
index 438eb8a031993..240e732752916 100644
--- a/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx
+++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/empty_state/empty_state.tsx
@@ -8,7 +8,6 @@
 
 import './empty_state.scss';
 import React from 'react';
-import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { DocLinksStart, ApplicationStart } from 'kibana/public';
 import {
@@ -28,60 +27,18 @@ import {
 } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
 import { reactRouterNavigate } from '../../../../../../plugins/kibana_react/public';
-import { MlCardState } from '../../../types';
 
 export const EmptyState = ({
   onRefresh,
   navigateToApp,
   docLinks,
-  getMlCardState,
   canSave,
 }: {
   onRefresh: () => void;
   navigateToApp: ApplicationStart['navigateToApp'];
   docLinks: DocLinksStart;
-  getMlCardState: () => MlCardState;
   canSave: boolean;
 }) => {
-  const mlCard = (
-    <EuiFlexItem>
-      <EuiCard
-        onClick={() => navigateToApp('ml', { path: '#/filedatavisualizer' })}
-        className="inpEmptyState__card"
-        betaBadgeLabel={
-          getMlCardState() === MlCardState.ENABLED
-            ? undefined
-            : i18n.translate(
-                'indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel',
-                {
-                  defaultMessage: 'Basic',
-                }
-              )
-        }
-        betaBadgeTooltipContent={i18n.translate(
-          'indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription',
-          {
-            defaultMessage: 'This feature requires a Basic license.',
-          }
-        )}
-        isDisabled={getMlCardState() === MlCardState.DISABLED}
-        icon={<EuiIcon size="xl" type="document" color="subdued" />}
-        title={
-          <FormattedMessage
-            id="indexPatternManagement.createIndexPattern.emptyState.uploadCardTitle"
-            defaultMessage="Upload a file"
-          />
-        }
-        description={
-          <FormattedMessage
-            id="indexPatternManagement.createIndexPattern.emptyState.uploadCardDescription"
-            defaultMessage="Import a CSV, NDJSON, or log file."
-          />
-        }
-      />
-    </EuiFlexItem>
-  );
-
   const createAnyway = (
     <EuiText color="subdued" textAlign="center" size="xs">
       <FormattedMessage
@@ -143,7 +100,25 @@ export const EmptyState = ({
                 }
               />
             </EuiFlexItem>
-            {getMlCardState() !== MlCardState.HIDDEN ? mlCard : <></>}
+            <EuiFlexItem>
+              <EuiCard
+                onClick={() => navigateToApp('home', { path: '#/tutorial_directory/fileDataViz' })}
+                className="inpEmptyState__card"
+                icon={<EuiIcon size="xl" type="document" color="subdued" />}
+                title={
+                  <FormattedMessage
+                    id="indexPatternManagement.createIndexPattern.emptyState.uploadCardTitle"
+                    defaultMessage="Upload a file"
+                  />
+                }
+                description={
+                  <FormattedMessage
+                    id="indexPatternManagement.createIndexPattern.emptyState.uploadCardDescription"
+                    defaultMessage="Import a CSV, NDJSON, or log file."
+                  />
+                }
+              />
+            </EuiFlexItem>
             <EuiFlexItem>
               <EuiCard
                 className="inpEmptyState__card"
diff --git a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx
index b09246b5af8ad..f018294f27c84 100644
--- a/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx
+++ b/src/plugins/index_pattern_management/public/components/index_pattern_table/index_pattern_table.tsx
@@ -76,7 +76,6 @@ export const IndexPatternTable = ({ canSave, history }: Props) => {
     application,
     http,
     data,
-    getMlCardState,
   } = useKibana<IndexPatternManagmentContext>().services;
   const [indexPatterns, setIndexPatterns] = useState<IndexPatternTableItem[]>([]);
   const [creationOptions, setCreationOptions] = useState<IndexPatternCreationOption[]>([]);
@@ -182,7 +181,6 @@ export const IndexPatternTable = ({ canSave, history }: Props) => {
           onRefresh={loadSources}
           docLinks={docLinks}
           navigateToApp={application.navigateToApp}
-          getMlCardState={getMlCardState}
           canSave={canSave}
         />
       );
diff --git a/src/plugins/index_pattern_management/public/index.ts b/src/plugins/index_pattern_management/public/index.ts
index 94611705a9390..726c055d1b8c3 100644
--- a/src/plugins/index_pattern_management/public/index.ts
+++ b/src/plugins/index_pattern_management/public/index.ts
@@ -30,5 +30,3 @@ export {
   IndexPatternCreationOption,
   IndexPatternListConfig,
 } from './service';
-
-export { MlCardState } from './types';
diff --git a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx
index 355f529fe0f75..ec5b7c74020a5 100644
--- a/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx
+++ b/src/plugins/index_pattern_management/public/management_app/mount_management_section.tsx
@@ -23,7 +23,7 @@ import {
   CreateIndexPatternWizardWithRouter,
 } from '../components';
 import { IndexPatternManagementStartDependencies, IndexPatternManagementStart } from '../plugin';
-import { IndexPatternManagmentContext, MlCardState } from '../types';
+import { IndexPatternManagmentContext } from '../types';
 
 const readOnlyBadge = {
   text: i18n.translate('indexPatternManagement.indexPatterns.badge.readOnly.text', {
@@ -37,8 +37,7 @@ const readOnlyBadge = {
 
 export async function mountManagementSection(
   getStartServices: StartServicesAccessor<IndexPatternManagementStartDependencies>,
-  params: ManagementAppMountParams,
-  getMlCardState: () => MlCardState
+  params: ManagementAppMountParams
 ) {
   const [
     { chrome, application, uiSettings, notifications, overlays, http, docLinks },
@@ -63,7 +62,6 @@ export async function mountManagementSection(
     indexPatternFieldEditor,
     indexPatternManagementStart: indexPatternManagementStart as IndexPatternManagementStart,
     setBreadcrumbs: params.setBreadcrumbs,
-    getMlCardState,
     fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors,
   };
 
diff --git a/src/plugins/index_pattern_management/public/mocks.ts b/src/plugins/index_pattern_management/public/mocks.ts
index 3462131e50463..6c709fb14f08d 100644
--- a/src/plugins/index_pattern_management/public/mocks.ts
+++ b/src/plugins/index_pattern_management/public/mocks.ts
@@ -26,9 +26,6 @@ const createSetupContract = (): IndexPatternManagementSetup => ({
   list: {
     addListConfig: jest.fn(),
   } as any,
-  environment: {
-    update: jest.fn(),
-  },
 });
 
 const createStartContract = (): IndexPatternManagementStart => ({
@@ -93,7 +90,6 @@ const createIndexPatternManagmentContext = (): {
     indexPatternFieldEditor,
     indexPatternManagementStart: createStartContract(),
     setBreadcrumbs: () => {},
-    getMlCardState: () => 2,
     fieldFormatEditors: indexPatternFieldEditor.fieldFormatEditors,
   };
 };
diff --git a/src/plugins/index_pattern_management/public/plugin.ts b/src/plugins/index_pattern_management/public/plugin.ts
index ed92172c8b91c..e3c156927bfac 100644
--- a/src/plugins/index_pattern_management/public/plugin.ts
+++ b/src/plugins/index_pattern_management/public/plugin.ts
@@ -77,9 +77,7 @@ export class IndexPatternManagementPlugin
       mount: async (params) => {
         const { mountManagementSection } = await import('./management_app');
 
-        return mountManagementSection(core.getStartServices, params, () =>
-          this.indexPatternManagementService.environmentService.getEnvironment().ml()
-        );
+        return mountManagementSection(core.getStartServices, params);
       },
     });
 
diff --git a/src/plugins/index_pattern_management/public/scripting_languages/index.ts b/src/plugins/index_pattern_management/public/scripting_languages/index.ts
index c6b2f3c4b6b27..aeb38c8172be0 100644
--- a/src/plugins/index_pattern_management/public/scripting_languages/index.ts
+++ b/src/plugins/index_pattern_management/public/scripting_languages/index.ts
@@ -5,15 +5,15 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
+import type { estypes } from '@elastic/elasticsearch';
 import { i18n } from '@kbn/i18n';
 import { HttpStart, NotificationsStart } from 'src/core/public';
 
-export function getSupportedScriptingLanguages(): string[] {
+export function getSupportedScriptingLanguages(): estypes.ScriptLanguage[] {
   return ['painless'];
 }
 
-export function getDeprecatedScriptingLanguages(): string[] {
+export function getDeprecatedScriptingLanguages(): estypes.ScriptLanguage[] {
   return [];
 }
 
diff --git a/src/plugins/index_pattern_management/public/service/environment/environment.mock.ts b/src/plugins/index_pattern_management/public/service/environment/environment.mock.ts
deleted file mode 100644
index 1eaab2eaccc11..0000000000000
--- a/src/plugins/index_pattern_management/public/service/environment/environment.mock.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { PublicMethodsOf } from '@kbn/utility-types';
-import { EnvironmentService, EnvironmentServiceSetup } from './environment';
-import { MlCardState } from '../../types';
-
-const createSetupMock = (): jest.Mocked<EnvironmentServiceSetup> => {
-  const setup = {
-    update: jest.fn(),
-  };
-  return setup;
-};
-
-const createMock = (): jest.Mocked<PublicMethodsOf<EnvironmentService>> => {
-  const service = {
-    setup: jest.fn(),
-    getEnvironment: jest.fn(() => ({
-      ml: () => MlCardState.ENABLED,
-    })),
-  };
-  service.setup.mockImplementation(createSetupMock);
-  return service;
-};
-
-export const environmentServiceMock = {
-  createSetup: createSetupMock,
-  create: createMock,
-};
diff --git a/src/plugins/index_pattern_management/public/service/environment/environment.test.ts b/src/plugins/index_pattern_management/public/service/environment/environment.test.ts
deleted file mode 100644
index 9e571374b4784..0000000000000
--- a/src/plugins/index_pattern_management/public/service/environment/environment.test.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { EnvironmentService } from './environment';
-import { MlCardState } from '../../types';
-
-describe('EnvironmentService', () => {
-  describe('setup', () => {
-    test('allows multiple update calls', () => {
-      const setup = new EnvironmentService().setup();
-      expect(() => {
-        setup.update({ ml: () => MlCardState.ENABLED });
-      }).not.toThrow();
-    });
-  });
-
-  describe('getEnvironment', () => {
-    test('returns default values', () => {
-      const service = new EnvironmentService();
-      expect(service.getEnvironment().ml()).toEqual(MlCardState.DISABLED);
-    });
-
-    test('returns last state of update calls', () => {
-      let cardState = MlCardState.DISABLED;
-      const service = new EnvironmentService();
-      const setup = service.setup();
-      setup.update({ ml: () => cardState });
-      expect(service.getEnvironment().ml()).toEqual(MlCardState.DISABLED);
-      cardState = MlCardState.ENABLED;
-      expect(service.getEnvironment().ml()).toEqual(MlCardState.ENABLED);
-    });
-  });
-});
diff --git a/src/plugins/index_pattern_management/public/service/environment/environment.ts b/src/plugins/index_pattern_management/public/service/environment/environment.ts
deleted file mode 100644
index 7bf0c1eb52068..0000000000000
--- a/src/plugins/index_pattern_management/public/service/environment/environment.ts
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { MlCardState } from '../../types';
-
-/** @public */
-export interface Environment {
-  /**
-   * Flag whether ml features should be advertised
-   */
-  readonly ml: () => MlCardState;
-}
-
-export class EnvironmentService {
-  private environment = {
-    ml: () => MlCardState.DISABLED,
-  };
-
-  public setup() {
-    return {
-      /**
-       * Update the environment to influence how available features are presented.
-       * @param update
-       */
-      update: (update: Partial<Environment>) => {
-        this.environment = Object.assign({}, this.environment, update);
-      },
-    };
-  }
-
-  public getEnvironment() {
-    return this.environment;
-  }
-}
-
-export type EnvironmentServiceSetup = ReturnType<EnvironmentService['setup']>;
diff --git a/src/plugins/index_pattern_management/public/service/environment/index.ts b/src/plugins/index_pattern_management/public/service/environment/index.ts
deleted file mode 100644
index ab5297ed0e14c..0000000000000
--- a/src/plugins/index_pattern_management/public/service/environment/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { EnvironmentService, Environment, EnvironmentServiceSetup } from './environment';
diff --git a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts
index 15be7f11892e4..f30ccfcb9f3ed 100644
--- a/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts
+++ b/src/plugins/index_pattern_management/public/service/index_pattern_management_service.ts
@@ -9,7 +9,6 @@
 import { HttpSetup } from '../../../../core/public';
 import { IndexPatternCreationManager, IndexPatternCreationConfig } from './creation';
 import { IndexPatternListManager, IndexPatternListConfig } from './list';
-import { EnvironmentService } from './environment';
 interface SetupDependencies {
   httpClient: HttpSetup;
 }
@@ -22,12 +21,10 @@ interface SetupDependencies {
 export class IndexPatternManagementService {
   indexPatternCreationManager: IndexPatternCreationManager;
   indexPatternListConfig: IndexPatternListManager;
-  environmentService: EnvironmentService;
 
   constructor() {
     this.indexPatternCreationManager = new IndexPatternCreationManager();
     this.indexPatternListConfig = new IndexPatternListManager();
-    this.environmentService = new EnvironmentService();
   }
 
   public setup({ httpClient }: SetupDependencies) {
@@ -40,7 +37,6 @@ export class IndexPatternManagementService {
     return {
       creation: creationManagerSetup,
       list: indexPatternListConfigSetup,
-      environment: this.environmentService.setup(),
     };
   }
 
diff --git a/src/plugins/index_pattern_management/public/types.ts b/src/plugins/index_pattern_management/public/types.ts
index 58a138df633fd..a61eeb99b25a5 100644
--- a/src/plugins/index_pattern_management/public/types.ts
+++ b/src/plugins/index_pattern_management/public/types.ts
@@ -33,14 +33,7 @@ export interface IndexPatternManagmentContext {
   indexPatternFieldEditor: IndexPatternFieldEditorStart;
   indexPatternManagementStart: IndexPatternManagementStart;
   setBreadcrumbs: ManagementAppMountParams['setBreadcrumbs'];
-  getMlCardState: () => MlCardState;
   fieldFormatEditors: IndexPatternFieldEditorStart['fieldFormatEditors'];
 }
 
 export type IndexPatternManagmentContextValue = KibanaReactContextValue<IndexPatternManagmentContext>;
-
-export enum MlCardState {
-  HIDDEN,
-  DISABLED,
-  ENABLED,
-}
diff --git a/src/plugins/input_control_vis/kibana.json b/src/plugins/input_control_vis/kibana.json
index 5acb79a8ab038..d05c5072c22e3 100644
--- a/src/plugins/input_control_vis/kibana.json
+++ b/src/plugins/input_control_vis/kibana.json
@@ -2,7 +2,7 @@
   "id": "inputControlVis",
   "version": "8.0.0",
   "kibanaVersion": "kibana",
-  "server": true,
+  "server": false,
   "ui": true,
   "requiredPlugins": [
     "data",
diff --git a/src/plugins/input_control_vis/public/plugin.ts b/src/plugins/input_control_vis/public/plugin.ts
index f4b6706bf8d2a..c086bc7f74d61 100644
--- a/src/plugins/input_control_vis/public/plugin.ts
+++ b/src/plugins/input_control_vis/public/plugin.ts
@@ -44,8 +44,6 @@ export interface InputControlVisPluginStartDependencies {
 
 /** @internal */
 export class InputControlVisPlugin implements Plugin<void, void> {
-  private cachedSettings: InputControlSettings | undefined = undefined;
-
   constructor(public initializerContext: PluginInitializerContext) {}
 
   public setup(
@@ -56,13 +54,8 @@ export class InputControlVisPlugin implements Plugin<void, void> {
       core,
       data,
       getSettings: async () => {
-        if (!this.cachedSettings) {
-          this.cachedSettings = await core.http.get<InputControlSettings>(
-            '/api/input_control_vis/settings'
-          );
-        }
-
-        return this.cachedSettings;
+        const { timeout, terminateAfter } = data.autocomplete.getAutocompleteSettings();
+        return { autocompleteTimeout: timeout, autocompleteTerminateAfter: terminateAfter };
       },
     };
 
diff --git a/src/plugins/input_control_vis/server/index.ts b/src/plugins/input_control_vis/server/index.ts
deleted file mode 100644
index 05145720b88c8..0000000000000
--- a/src/plugins/input_control_vis/server/index.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 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, PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
-import { schema } from '@kbn/config-schema';
-import { first } from 'rxjs/operators';
-
-export const config: PluginConfigDescriptor = {
-  schema: schema.object({ enabled: schema.boolean({ defaultValue: true }) }),
-};
-
-export const plugin = (initializerContext: PluginInitializerContext) => ({
-  setup(core: CoreSetup) {
-    // TODO this is a workaround to pass global config settings to the client
-    // once kibana.autocompleteTerminateAfter and kibana.autocompleteTimeout
-    // are migrated completely and owned by a plugin, this can be done completely
-    // client side and the additional endpoint is not required anymore
-    core.http.createRouter().get(
-      {
-        path: '/api/input_control_vis/settings',
-        validate: false,
-      },
-      async (context, request, response) => {
-        const legacyConfig = await initializerContext.config.legacy.globalConfig$
-          .pipe(first())
-          .toPromise();
-        return response.ok({
-          body: {
-            autocompleteTimeout: legacyConfig.kibana.autocompleteTimeout.asMilliseconds(),
-            autocompleteTerminateAfter: legacyConfig.kibana.autocompleteTerminateAfter.asMilliseconds(),
-          },
-        });
-      }
-    );
-  },
-  start() {},
-});
diff --git a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
index d15afad53f2b6..5ad8205365146 100644
--- a/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
+++ b/src/plugins/inspector/public/ui/__snapshots__/inspector_panel.test.tsx.snap
@@ -268,6 +268,7 @@ exports[`InspectorPanel should render as expected 1`] = `
                             <EuiButtonContent
                               className="euiButtonEmpty__content"
                               iconSide="right"
+                              iconSize="m"
                               iconType="arrowDown"
                               textProps={
                                 Object {
@@ -280,11 +281,13 @@ exports[`InspectorPanel should render as expected 1`] = `
                               >
                                 <EuiIcon
                                   className="euiButtonContent__icon"
+                                  color="inherit"
                                   size="m"
                                   type="arrowDown"
                                 >
                                   <span
                                     className="euiButtonContent__icon"
+                                    color="inherit"
                                     data-euiicon-type="arrowDown"
                                     size="m"
                                   />
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 d9ea8be9f5cdd..744a186a201ca 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
@@ -12,7 +12,7 @@ import useObservable from 'react-use/lib/useObservable';
 import { ApplicationStart } from 'src/core/public';
 import { createNavigateToUrlClickHandler } from './click_handler';
 
-interface RedirectCrossAppLinksProps {
+interface RedirectCrossAppLinksProps extends React.HTMLAttributes<HTMLDivElement> {
   application: ApplicationStart;
   className?: string;
   'data-test-subj'?: string;
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 e033da875080f..1fa7d8e846c9d 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
@@ -142,6 +142,7 @@ export const applicationUsageSchema = {
   metrics: commonSchema,
   infra: commonSchema, // It's a forward app so we'll likely never report it
   fleet: commonSchema,
+  integrations: commonSchema,
   ingestManager: commonSchema,
   lens: commonSchema,
   maps: commonSchema,
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 f1592d5a8cf0b..5f70deccba93c 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/schema.ts
@@ -388,6 +388,10 @@ export const stackManagementSchema: MakeSchemaFrom<UsageStats> = {
     type: 'long',
     _meta: { description: 'Non-default value of setting.' },
   },
+  'bfetch:disableCompression': {
+    type: 'boolean',
+    _meta: { description: 'Non-default value of setting.' },
+  },
   'visualization:visualize:legacyChartsLibrary': {
     type: 'boolean',
     _meta: { description: 'Non-default value of setting.' },
diff --git a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
index 570b52171be28..bf28bb6cc01f5 100644
--- a/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
+++ b/src/plugins/kibana_usage_collection/server/collectors/management/types.ts
@@ -22,6 +22,7 @@ export interface UsageStats {
   /**
    * non-sensitive settings
    */
+  'bfetch:disableCompression': boolean;
   'autocomplete:useTimeRange': boolean;
   'search:timeout': number;
   'visualization:visualize:legacyChartsLibrary': boolean;
diff --git a/src/plugins/management/public/components/landing/landing.tsx b/src/plugins/management/public/components/landing/landing.tsx
index 5e361cfaff87d..4683185a5a783 100644
--- a/src/plugins/management/public/components/landing/landing.tsx
+++ b/src/plugins/management/public/components/landing/landing.tsx
@@ -8,15 +8,7 @@
 
 import React from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
-
-import {
-  EuiHorizontalRule,
-  EuiIcon,
-  EuiPageContent,
-  EuiSpacer,
-  EuiText,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiEmptyPrompt, EuiHorizontalRule, EuiPageContent } from '@elastic/eui';
 
 interface ManagementLandingPageProps {
   version: string;
@@ -27,39 +19,37 @@ export const ManagementLandingPage = ({ version, setBreadcrumbs }: ManagementLan
   setBreadcrumbs();
 
   return (
-    <EuiPageContent horizontalPosition="center" data-test-subj="managementHome">
-      <div>
-        <div className="eui-textCenter">
-          <EuiIcon type="managementApp" size="xxl" />
-          <EuiSpacer />
-          <EuiTitle>
-            <h1>
-              <FormattedMessage
-                id="management.landing.header"
-                defaultMessage="Welcome to Stack Management {version}"
-                values={{ version }}
-              />
-            </h1>
-          </EuiTitle>
-          <EuiText>
+    <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
+      <EuiEmptyPrompt
+        data-test-subj="managementHome"
+        iconType="managementApp"
+        title={
+          <h1>
             <FormattedMessage
-              id="management.landing.subhead"
-              defaultMessage="Manage your indices, index patterns, saved objects, Kibana settings, and more."
+              id="management.landing.header"
+              defaultMessage="Welcome to Stack Management {version}"
+              values={{ version }}
             />
-          </EuiText>
-        </div>
-
-        <EuiHorizontalRule />
-
-        <EuiText color="subdued" size="s" textAlign="center">
-          <p>
-            <FormattedMessage
-              id="management.landing.text"
-              defaultMessage="A complete list of apps is in the menu on the left."
-            />
-          </p>
-        </EuiText>
-      </div>
+          </h1>
+        }
+        body={
+          <>
+            <p>
+              <FormattedMessage
+                id="management.landing.subhead"
+                defaultMessage="Manage your indices, index patterns, saved objects, Kibana settings, and more."
+              />
+            </p>
+            <EuiHorizontalRule />
+            <p>
+              <FormattedMessage
+                id="management.landing.text"
+                defaultMessage="A complete list of apps is in the menu on the left."
+              />
+            </p>
+          </>
+        }
+      />
     </EuiPageContent>
   );
 };
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 350e2f3de0cdf..23d0a29083747 100644
--- a/src/plugins/management/public/components/management_app/management_app.tsx
+++ b/src/plugins/management/public/components/management_app/management_app.tsx
@@ -5,20 +5,23 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
+import './management_app.scss';
 
 import React, { useState, useEffect, useCallback } from 'react';
 import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from 'kibana/public';
 import { I18nProvider } from '@kbn/i18n/react';
-import { EuiPage } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import { ManagementSection, MANAGEMENT_BREADCRUMB } from '../../utils';
 
 import { ManagementRouter } from './management_router';
-import { ManagementSidebarNav } from '../management_sidebar_nav';
-import { reactRouterNavigate } from '../../../../kibana_react/public';
+import { managementSidebarNav } from '../management_sidebar_nav/management_sidebar_nav';
+import {
+  KibanaPageTemplate,
+  KibanaPageTemplateProps,
+  reactRouterNavigate,
+} from '../../../../kibana_react/public';
 import { SectionsServiceStart } from '../../types';
 
-import './management_app.scss';
-
 interface ManagementAppProps {
   appBasePath: string;
   history: AppMountParameters['history'];
@@ -64,10 +67,30 @@ export const ManagementApp = ({ dependencies, history }: ManagementAppProps) =>
     return null;
   }
 
+  const solution: KibanaPageTemplateProps['solutionNav'] = {
+    name: i18n.translate('management.nav.label', {
+      defaultMessage: 'Management',
+    }),
+    icon: 'managementApp',
+    'data-test-subj': 'mgtSideBarNav',
+    items: managementSidebarNav({
+      selectedId,
+      sections,
+      history,
+    }),
+  };
+
   return (
     <I18nProvider>
-      <EuiPage>
-        <ManagementSidebarNav selectedId={selectedId} sections={sections} history={history} />
+      <KibanaPageTemplate
+        restrictWidth={false}
+        // EUI TODO
+        // The different template options need to be manually recreated by the individual pages.
+        // These classes help enforce the layouts.
+        pageContentProps={{ className: 'kbnAppWrapper' }}
+        pageContentBodyProps={{ className: 'kbnAppWrapper' }}
+        solutionNav={solution}
+      >
         <ManagementRouter
           history={history}
           setBreadcrumbs={setBreadcrumbsScoped}
@@ -75,7 +98,7 @@ export const ManagementApp = ({ dependencies, history }: ManagementAppProps) =>
           sections={sections}
           dependencies={dependencies}
         />
-      </EuiPage>
+      </KibanaPageTemplate>
     </I18nProvider>
   );
 };
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 b3f978d5c6cd2..5ec1253ba77ef 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,6 @@
 
 import React, { memo } from 'react';
 import { Route, Router, Switch } from 'react-router-dom';
-import { EuiPageBody } from '@elastic/eui';
 import { AppMountParameters, ChromeBreadcrumb, ScopedHistory } from 'kibana/public';
 import { ManagementAppWrapper } from '../management_app_wrapper';
 import { ManagementLandingPage } from '../landing';
@@ -26,36 +25,34 @@ interface ManagementRouterProps {
 export const ManagementRouter = memo(
   ({ dependencies, history, setBreadcrumbs, onAppMounted, sections }: ManagementRouterProps) => (
     <Router history={history}>
-      <EuiPageBody restrictWidth={false} className="mgtPage__body">
-        <Switch>
-          {sections.map((section) =>
-            section
-              .getAppsEnabled()
-              .map((app) => (
-                <Route
-                  path={`${app.basePath}`}
-                  component={() => (
-                    <ManagementAppWrapper
-                      app={app}
-                      setBreadcrumbs={setBreadcrumbs}
-                      onAppMounted={onAppMounted}
-                      history={history}
-                    />
-                  )}
-                />
-              ))
-          )}
-          <Route
-            path={'/'}
-            component={() => (
-              <ManagementLandingPage
-                version={dependencies.kibanaVersion}
-                setBreadcrumbs={setBreadcrumbs}
+      <Switch>
+        {sections.map((section) =>
+          section
+            .getAppsEnabled()
+            .map((app) => (
+              <Route
+                path={`${app.basePath}`}
+                component={() => (
+                  <ManagementAppWrapper
+                    app={app}
+                    setBreadcrumbs={setBreadcrumbs}
+                    onAppMounted={onAppMounted}
+                    history={history}
+                  />
+                )}
               />
-            )}
-          />
-        </Switch>
-      </EuiPageBody>
+            ))
+        )}
+        <Route
+          path={'/'}
+          component={() => (
+            <ManagementLandingPage
+              version={dependencies.kibanaVersion}
+              setBreadcrumbs={setBreadcrumbs}
+            />
+          )}
+        />
+      </Switch>
     </Router>
   )
 );
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 8e0043937303f..72bfe609c141a 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
@@ -9,8 +9,10 @@
 import React, { createRef, Component } from 'react';
 
 import { ChromeBreadcrumb, AppMountParameters, ScopedHistory } from 'kibana/public';
+import classNames from 'classnames';
 import { ManagementApp } from '../../utils';
 import { Unmount } from '../../types';
+import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
 
 interface ManagementSectionWrapperProps {
   app: ManagementApp;
@@ -53,6 +55,12 @@ export class ManagementAppWrapper extends Component<ManagementSectionWrapperProp
   }
 
   render() {
-    return <div ref={this.mountElementRef} />;
+    return (
+      <div
+        // The following classes are a stop-gap for this element that wraps children of KibanaPageTemplate
+        className={classNames('euiPageContentBody', APP_WRAPPER_CLASS)}
+        ref={this.mountElementRef}
+      />
+    );
   }
 }
diff --git a/src/plugins/management/public/components/management_sidebar_nav/index.ts b/src/plugins/management/public/components/management_sidebar_nav/index.ts
index 5bb80adf3e8ba..9cee992a17948 100644
--- a/src/plugins/management/public/components/management_sidebar_nav/index.ts
+++ b/src/plugins/management/public/components/management_sidebar_nav/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { ManagementSidebarNav } from './management_sidebar_nav';
+export { managementSidebarNav } from './management_sidebar_nav';
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 1b40bfcca3c63..bf1b81061f6a9 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
@@ -6,24 +6,13 @@
  * Side Public License, v 1.
  */
 
-import React, { useState } from 'react';
-import { i18n } from '@kbn/i18n';
+import React from 'react';
 import { sortBy } from 'lodash';
 
-import {
-  EuiIcon,
-  EuiSideNav,
-  EuiScreenReaderOnly,
-  EuiSideNavItemType,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiToolTip,
-} from '@elastic/eui';
+import { EuiIcon, EuiSideNavItemType, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
 import { AppMountParameters } from 'kibana/public';
 import { ManagementApp, ManagementSection } from '../../utils';
 
-import './management_sidebar_nav.scss';
-
 import { ManagementItem } from '../../utils/management_item';
 import { reactRouterNavigate } from '../../../../kibana_react/public';
 
@@ -33,24 +22,12 @@ interface ManagementSidebarNavProps {
   selectedId: string;
 }
 
-const headerLabel = i18n.translate('management.nav.label', {
-  defaultMessage: 'Management',
-});
-
-const navMenuLabel = i18n.translate('management.nav.menu', {
-  defaultMessage: 'Management menu',
-});
-
 /** @internal **/
-export const ManagementSidebarNav = ({
+export const managementSidebarNav = ({
   selectedId,
   sections,
   history,
 }: ManagementSidebarNavProps) => {
-  const HEADER_ID = 'stack-management-nav-header';
-  const [isSideNavOpenOnMobile, setIsSideNavOpenOnMobile] = useState(false);
-  const toggleOpenOnMobile = () => setIsSideNavOpenOnMobile(!isSideNavOpenOnMobile);
-
   const sectionsToNavItems = (managementSections: ManagementSection[]) => {
     const sortedManagementSections = sortBy(managementSections, 'order');
 
@@ -83,11 +60,11 @@ export const ManagementSidebarNav = ({
 
   const TooltipWrapper = ({ text, tip }: TooltipWrapperProps) => (
     <EuiToolTip content={tip} position="right">
-      <EuiFlexGroup alignItems="center" gutterSize="s" responsive={false}>
+      <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
         <EuiFlexItem grow={false}>{text}</EuiFlexItem>
 
         <EuiFlexItem grow={false}>
-          <EuiIcon type="questionInCircle" />
+          <EuiIcon color="subdued" size="s" type="questionInCircle" />
         </EuiFlexItem>
       </EuiFlexGroup>
     </EuiToolTip>
@@ -109,19 +86,5 @@ export const ManagementSidebarNav = ({
     };
   };
 
-  return (
-    <>
-      <EuiScreenReaderOnly>
-        <h2 id={HEADER_ID}>{headerLabel}</h2>
-      </EuiScreenReaderOnly>
-      <EuiSideNav
-        aria-labelledby={HEADER_ID}
-        mobileTitle={navMenuLabel}
-        toggleOpenOnMobile={toggleOpenOnMobile}
-        isOpenOnMobile={isSideNavOpenOnMobile}
-        items={sectionsToNavItems(sections)}
-        className="mgtSideBarNav"
-      />
-    </>
-  );
+  return sectionsToNavItems(sections);
 };
diff --git a/src/plugins/newsfeed/common/constants.ts b/src/plugins/newsfeed/common/constants.ts
index 7ff078e82810b..6ba5e07ea873e 100644
--- a/src/plugins/newsfeed/common/constants.ts
+++ b/src/plugins/newsfeed/common/constants.ts
@@ -7,11 +7,6 @@
  */
 
 export const NEWSFEED_FALLBACK_LANGUAGE = 'en';
-export const NEWSFEED_FALLBACK_FETCH_INTERVAL = 86400000; // 1 day
-export const NEWSFEED_FALLBACK_MAIN_INTERVAL = 120000; // 2 minutes
-export const NEWSFEED_LAST_FETCH_STORAGE_KEY = 'newsfeed.lastfetchtime';
-export const NEWSFEED_HASH_SET_STORAGE_KEY = 'newsfeed.hashes';
-
 export const NEWSFEED_DEFAULT_SERVICE_BASE_URL = 'https://feeds.elastic.co';
 export const NEWSFEED_DEV_SERVICE_BASE_URL = 'https://feeds-staging.elastic.co';
 export const NEWSFEED_DEFAULT_SERVICE_PATH = '/kibana/v{VERSION}.json';
diff --git a/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx b/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx
index 142d4286b363b..7060adcc2a4ec 100644
--- a/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx
+++ b/src/plugins/newsfeed/public/components/newsfeed_header_nav_button.tsx
@@ -6,10 +6,10 @@
  * Side Public License, v 1.
  */
 
-import React, { useState, Fragment, useEffect } from 'react';
-import * as Rx from 'rxjs';
+import React, { useState, useEffect, useMemo, useCallback } from 'react';
 import { EuiHeaderSectionItemButton, EuiIcon } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import type { NewsfeedApi } from '../lib/api';
 import { NewsfeedFlyout } from './flyout_list';
 import { FetchResult } from '../types';
 
@@ -17,46 +17,44 @@ export interface INewsfeedContext {
   setFlyoutVisible: React.Dispatch<React.SetStateAction<boolean>>;
   newsFetchResult: FetchResult | void | null;
 }
-export const NewsfeedContext = React.createContext({} as INewsfeedContext);
 
-export type NewsfeedApiFetchResult = Rx.Observable<void | FetchResult | null>;
+export const NewsfeedContext = React.createContext({} as INewsfeedContext);
 
 export interface Props {
-  apiFetchResult: NewsfeedApiFetchResult;
+  newsfeedApi: NewsfeedApi;
 }
 
-export const NewsfeedNavButton = ({ apiFetchResult }: Props) => {
-  const [showBadge, setShowBadge] = useState<boolean>(false);
+export const NewsfeedNavButton = ({ newsfeedApi }: Props) => {
   const [flyoutVisible, setFlyoutVisible] = useState<boolean>(false);
   const [newsFetchResult, setNewsFetchResult] = useState<FetchResult | null | void>(null);
+  const hasNew = useMemo(() => {
+    return newsFetchResult ? newsFetchResult.hasNew : false;
+  }, [newsFetchResult]);
 
   useEffect(() => {
-    function handleStatusChange(fetchResult: FetchResult | void | null) {
-      if (fetchResult) {
-        setShowBadge(fetchResult.hasNew);
-      }
-      setNewsFetchResult(fetchResult);
-    }
-
-    const subscription = apiFetchResult.subscribe((res) => handleStatusChange(res));
+    const subscription = newsfeedApi.fetchResults$.subscribe((results) => {
+      setNewsFetchResult(results);
+    });
     return () => subscription.unsubscribe();
-  }, [apiFetchResult]);
+  }, [newsfeedApi]);
 
-  function showFlyout() {
-    setShowBadge(false);
+  const showFlyout = useCallback(() => {
+    if (newsFetchResult) {
+      newsfeedApi.markAsRead(newsFetchResult.feedItems.map((item) => item.hash));
+    }
     setFlyoutVisible(!flyoutVisible);
-  }
+  }, [newsfeedApi, newsFetchResult, flyoutVisible]);
 
   return (
     <NewsfeedContext.Provider value={{ setFlyoutVisible, newsFetchResult }}>
-      <Fragment>
+      <>
         <EuiHeaderSectionItemButton
           data-test-subj="newsfeed"
           aria-controls="keyPadMenu"
           aria-expanded={flyoutVisible}
           aria-haspopup="true"
           aria-label={
-            showBadge
+            hasNew
               ? i18n.translate('newsfeed.headerButton.unreadAriaLabel', {
                   defaultMessage: 'Newsfeed menu - unread items available',
                 })
@@ -64,13 +62,13 @@ export const NewsfeedNavButton = ({ apiFetchResult }: Props) => {
                   defaultMessage: 'Newsfeed menu - all items read',
                 })
           }
-          notification={showBadge ? true : null}
+          notification={hasNew ? true : null}
           onClick={showFlyout}
         >
           <EuiIcon type="cheer" size="m" />
         </EuiHeaderSectionItemButton>
         {flyoutVisible ? <NewsfeedFlyout /> : null}
-      </Fragment>
+      </>
     </NewsfeedContext.Provider>
   );
 };
diff --git a/src/plugins/newsfeed/public/lib/api.test.mocks.ts b/src/plugins/newsfeed/public/lib/api.test.mocks.ts
new file mode 100644
index 0000000000000..677bc203cbef3
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/api.test.mocks.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { storageMock } from './storage.mock';
+import { driverMock } from './driver.mock';
+
+export const storageInstanceMock = storageMock.create();
+jest.doMock('./storage', () => ({
+  NewsfeedStorage: jest.fn().mockImplementation(() => storageInstanceMock),
+}));
+
+export const driverInstanceMock = driverMock.create();
+jest.doMock('./driver', () => ({
+  NewsfeedApiDriver: jest.fn().mockImplementation(() => driverInstanceMock),
+}));
diff --git a/src/plugins/newsfeed/public/lib/api.test.ts b/src/plugins/newsfeed/public/lib/api.test.ts
index e142ffb4f6989..a4894573932e6 100644
--- a/src/plugins/newsfeed/public/lib/api.test.ts
+++ b/src/plugins/newsfeed/public/lib/api.test.ts
@@ -6,689 +6,120 @@
  * Side Public License, v 1.
  */
 
-import { take, tap, toArray } from 'rxjs/operators';
-import { interval, race } from 'rxjs';
-import sinon, { stub } from 'sinon';
+import { driverInstanceMock, storageInstanceMock } from './api.test.mocks';
 import moment from 'moment';
-import { HttpSetup } from 'src/core/public';
-import {
-  NEWSFEED_HASH_SET_STORAGE_KEY,
-  NEWSFEED_LAST_FETCH_STORAGE_KEY,
-} from '../../common/constants';
-import { ApiItem, NewsfeedItem, NewsfeedPluginBrowserConfig } from '../types';
-import { NewsfeedApiDriver, getApi } from './api';
+import { getApi } from './api';
+import { TestScheduler } from 'rxjs/testing';
+import { FetchResult, NewsfeedPluginBrowserConfig } from '../types';
+import { take } from 'rxjs/operators';
 
-const localStorageGet = sinon.stub();
-const sessionStoragetGet = sinon.stub();
+const kibanaVersion = '8.0.0';
+const newsfeedId = 'test';
 
-Object.defineProperty(window, 'localStorage', {
-  value: {
-    getItem: localStorageGet,
-    setItem: stub(),
-  },
-  writable: true,
-});
-Object.defineProperty(window, 'sessionStorage', {
-  value: {
-    getItem: sessionStoragetGet,
-    setItem: stub(),
-  },
-  writable: true,
-});
-
-jest.mock('uuid', () => ({
-  v4: () => 'NEW_UUID',
-}));
-
-describe('NewsfeedApiDriver', () => {
-  const kibanaVersion = '99.999.9-test_version'; // It'll remove the `-test_version` bit
-  const userLanguage = 'en';
-  const fetchInterval = 2000;
-  const getDriver = () => new NewsfeedApiDriver(kibanaVersion, userLanguage, fetchInterval);
-
-  afterEach(() => {
-    sinon.reset();
-  });
-
-  describe('shouldFetch', () => {
-    it('defaults to true', () => {
-      const driver = getDriver();
-      expect(driver.shouldFetch()).toBe(true);
-    });
-
-    it('returns true if last fetch time precedes page load time', () => {
-      sessionStoragetGet.throws('Wrong key passed!');
-      sessionStoragetGet
-        .withArgs(`${NEWSFEED_LAST_FETCH_STORAGE_KEY}.NEW_UUID`)
-        .returns(322642800000); // 1980-03-23
-      const driver = getDriver();
-      expect(driver.shouldFetch()).toBe(true);
-    });
-
-    it('returns false if last fetch time is recent enough', () => {
-      sessionStoragetGet.throws('Wrong key passed!');
-      sessionStoragetGet
-        .withArgs(`${NEWSFEED_LAST_FETCH_STORAGE_KEY}.NEW_UUID`)
-        .returns(3005017200000); // 2065-03-23
-      const driver = getDriver();
-      expect(driver.shouldFetch()).toBe(false);
-    });
-  });
-
-  describe('updateHashes', () => {
-    it('returns previous and current storage', () => {
-      const driver = getDriver();
-      const items: NewsfeedItem[] = [
-        {
-          title: 'Good news, everyone!',
-          description: 'good item description',
-          linkText: 'click here',
-          linkUrl: 'about:blank',
-          badge: 'test',
-          publishOn: moment(1572489035150),
-          expireOn: moment(1572489047858),
-          hash: 'hash1oneoneoneone',
-        },
-      ];
-      expect(driver.updateHashes(items)).toMatchInlineSnapshot(`
-        Object {
-          "current": Array [
-            "hash1oneoneoneone",
-          ],
-          "previous": Array [],
-        }
-      `);
-    });
-
-    it('concatenates the previous hashes with the current', () => {
-      localStorageGet.throws('Wrong key passed!');
-      localStorageGet.withArgs(`${NEWSFEED_HASH_SET_STORAGE_KEY}.NEW_UUID`).returns('happyness');
-      const driver = getDriver();
-      const items: NewsfeedItem[] = [
-        {
-          title: 'Better news, everyone!',
-          description: 'better item description',
-          linkText: 'click there',
-          linkUrl: 'about:blank',
-          badge: 'concatentated',
-          publishOn: moment(1572489035150),
-          expireOn: moment(1572489047858),
-          hash: 'three33hash',
-        },
-      ];
-      expect(driver.updateHashes(items)).toMatchInlineSnapshot(`
-        Object {
-          "current": Array [
-            "happyness",
-            "three33hash",
-          ],
-          "previous": Array [
-            "happyness",
-          ],
-        }
-      `);
-    });
-  });
-
-  it('Validates items for required fields', () => {
-    const driver = getDriver();
-    expect(driver.validateItem({})).toBe(false);
-    expect(
-      driver.validateItem({
-        title: 'Gadzooks!',
-        description: 'gadzooks item description',
-        linkText: 'click here',
-        linkUrl: 'about:blank',
-        badge: 'test',
-        publishOn: moment(1572489035150),
-        expireOn: moment(1572489047858),
-        hash: 'hash2twotwotwotwotwo',
-      })
-    ).toBe(true);
-    expect(
-      driver.validateItem({
-        title: 'Gadzooks!',
-        description: 'gadzooks item description',
-        linkText: 'click here',
-        linkUrl: 'about:blank',
-        publishOn: moment(1572489035150),
-        hash: 'hash2twotwotwotwotwo',
-      })
-    ).toBe(true);
-    expect(
-      driver.validateItem({
-        title: 'Gadzooks!',
-        description: 'gadzooks item description',
-        linkText: 'click here',
-        linkUrl: 'about:blank',
-        publishOn: moment(1572489035150),
-        // hash: 'hash2twotwotwotwotwo', // should fail because this is missing
-      })
-    ).toBe(false);
+const getTestScheduler = () =>
+  new TestScheduler((actual, expected) => {
+    expect(actual).toEqual(expected);
   });
 
-  describe('modelItems', () => {
-    it('Models empty set with defaults', () => {
-      const driver = getDriver();
-      const apiItems: ApiItem[] = [];
-      expect(driver.modelItems(apiItems)).toMatchInlineSnapshot(`
-        Object {
-          "error": null,
-          "feedItems": Array [],
-          "hasNew": false,
-          "kibanaVersion": "99.999.9",
-        }
-      `);
-    });
-
-    it('Selects default language', () => {
-      const driver = getDriver();
-      const apiItems: ApiItem[] = [
-        {
-          title: {
-            en: 'speaking English',
-            es: 'habla Espanol',
-          },
-          description: {
-            en: 'language test',
-            es: 'idiomas',
-          },
-          languages: ['en', 'es'],
-          link_text: {
-            en: 'click here',
-            es: 'aqui',
-          },
-          link_url: {
-            en: 'xyzxyzxyz',
-            es: 'abcabc',
-          },
-          badge: {
-            en: 'firefighter',
-            es: 'bombero',
-          },
-          publish_on: new Date('2014-10-31T04:23:47Z'),
-          expire_on: new Date('2049-10-31T04:23:47Z'),
-          hash: 'abcabc1231123123hash',
-        },
-      ];
-      expect(driver.modelItems(apiItems)).toMatchObject({
-        error: null,
-        feedItems: [
-          {
-            badge: 'firefighter',
-            description: 'language test',
-            hash: 'abcabc1231',
-            linkText: 'click here',
-            linkUrl: 'xyzxyzxyz',
-            title: 'speaking English',
-          },
-        ],
-        hasNew: true,
-        kibanaVersion: '99.999.9',
-      });
-    });
-
-    it("Falls back to English when user language isn't present", () => {
-      // Set Language to French
-      const driver = new NewsfeedApiDriver(kibanaVersion, 'fr', fetchInterval);
-      const apiItems: ApiItem[] = [
-        {
-          title: {
-            en: 'speaking English',
-            fr: 'Le Title',
-          },
-          description: {
-            en: 'not French',
-            fr: 'Le Description',
-          },
-          languages: ['en', 'fr'],
-          link_text: {
-            en: 'click here',
-            fr: 'Le Link Text',
-          },
-          link_url: {
-            en: 'xyzxyzxyz',
-            fr: 'le_url',
-          },
-          badge: {
-            en: 'firefighter',
-            fr: 'le_badge',
-          },
-          publish_on: new Date('2014-10-31T04:23:47Z'),
-          expire_on: new Date('2049-10-31T04:23:47Z'),
-          hash: 'frfrfrfr1231123123hash',
-        }, // fallback: no
-        {
-          title: {
-            en: 'speaking English',
-            es: 'habla Espanol',
-          },
-          description: {
-            en: 'not French',
-            es: 'no Espanol',
-          },
-          languages: ['en', 'es'],
-          link_text: {
-            en: 'click here',
-            es: 'aqui',
-          },
-          link_url: {
-            en: 'xyzxyzxyz',
-            es: 'abcabc',
-          },
-          badge: {
-            en: 'firefighter',
-            es: 'bombero',
-          },
-          publish_on: new Date('2014-10-31T04:23:47Z'),
-          expire_on: new Date('2049-10-31T04:23:47Z'),
-          hash: 'enenenen1231123123hash',
-        }, // fallback: yes
-      ];
-      expect(driver.modelItems(apiItems)).toMatchObject({
-        error: null,
-        feedItems: [
-          {
-            badge: 'le_badge',
-            description: 'Le Description',
-            hash: 'frfrfrfr12',
-            linkText: 'Le Link Text',
-            linkUrl: 'le_url',
-            title: 'Le Title',
-          },
-          {
-            badge: 'firefighter',
-            description: 'not French',
-            hash: 'enenenen12',
-            linkText: 'click here',
-            linkUrl: 'xyzxyzxyz',
-            title: 'speaking English',
-          },
-        ],
-        hasNew: true,
-        kibanaVersion: '99.999.9',
-      });
-    });
-
-    it('Models multiple items into an API FetchResult', () => {
-      const driver = getDriver();
-      const apiItems: ApiItem[] = [
-        {
-          title: {
-            en: 'guess what',
-          },
-          description: {
-            en: 'this tests the modelItems function',
-          },
-          link_text: {
-            en: 'click here',
-          },
-          link_url: {
-            en: 'about:blank',
-          },
-          publish_on: new Date('2014-10-31T04:23:47Z'),
-          expire_on: new Date('2049-10-31T04:23:47Z'),
-          hash: 'abcabc1231123123hash',
-        },
-        {
-          title: {
-            en: 'guess when',
-          },
-          description: {
-            en: 'this also tests the modelItems function',
-          },
-          link_text: {
-            en: 'click here',
-          },
-          link_url: {
-            en: 'about:blank',
-          },
-          badge: {
-            en: 'hero',
-          },
-          publish_on: new Date('2014-10-31T04:23:47Z'),
-          expire_on: new Date('2049-10-31T04:23:47Z'),
-          hash: 'defdefdef456456456',
-        },
-      ];
-      expect(driver.modelItems(apiItems)).toMatchObject({
-        error: null,
-        feedItems: [
-          {
-            badge: null,
-            description: 'this tests the modelItems function',
-            hash: 'abcabc1231',
-            linkText: 'click here',
-            linkUrl: 'about:blank',
-            title: 'guess what',
-          },
-          {
-            badge: 'hero',
-            description: 'this also tests the modelItems function',
-            hash: 'defdefdef4',
-            linkText: 'click here',
-            linkUrl: 'about:blank',
-            title: 'guess when',
-          },
-        ],
-        hasNew: true,
-        kibanaVersion: '99.999.9',
-      });
-    });
-
-    it('Filters expired', () => {
-      const driver = getDriver();
-      const apiItems: ApiItem[] = [
-        {
-          title: {
-            en: 'guess what',
-          },
-          description: {
-            en: 'this tests the modelItems function',
-          },
-          link_text: {
-            en: 'click here',
-          },
-          link_url: {
-            en: 'about:blank',
-          },
-          publish_on: new Date('2013-10-31T04:23:47Z'),
-          expire_on: new Date('2014-10-31T04:23:47Z'), // too old
-          hash: 'abcabc1231123123hash',
-        },
-      ];
-      expect(driver.modelItems(apiItems)).toMatchInlineSnapshot(`
-        Object {
-          "error": null,
-          "feedItems": Array [],
-          "hasNew": false,
-          "kibanaVersion": "99.999.9",
-        }
-      `);
-    });
+const createConfig = (mainInternal: number): NewsfeedPluginBrowserConfig => ({
+  mainInterval: moment.duration(mainInternal, 'ms'),
+  fetchInterval: moment.duration(mainInternal, 'ms'),
+  service: {
+    urlRoot: 'urlRoot',
+    pathTemplate: 'pathTemplate',
+  },
+});
 
-    it('Filters pre-published', () => {
-      const driver = getDriver();
-      const apiItems: ApiItem[] = [
-        {
-          title: {
-            en: 'guess what',
-          },
-          description: {
-            en: 'this tests the modelItems function',
-          },
-          link_text: {
-            en: 'click here',
-          },
-          link_url: {
-            en: 'about:blank',
-          },
-          publish_on: new Date('2055-10-31T04:23:47Z'), // too new
-          expire_on: new Date('2056-10-31T04:23:47Z'),
-          hash: 'abcabc1231123123hash',
-        },
-      ];
-      expect(driver.modelItems(apiItems)).toMatchInlineSnapshot(`
-        Object {
-          "error": null,
-          "feedItems": Array [],
-          "hasNew": false,
-          "kibanaVersion": "99.999.9",
-        }
-      `);
-    });
-  });
+const createFetchResult = (parts: Partial<FetchResult>): FetchResult => ({
+  feedItems: [],
+  hasNew: false,
+  error: null,
+  kibanaVersion,
+  ...parts,
 });
 
 describe('getApi', () => {
-  const mockHttpGet = jest.fn();
-  let httpMock = ({
-    fetch: mockHttpGet,
-  } as unknown) as HttpSetup;
-  const getHttpMockWithItems = (mockApiItems: ApiItem[]) => (
-    arg1: string,
-    arg2: { method: string }
-  ) => {
-    if (
-      arg1 === 'http://fakenews.co/kibana-test/v6.8.2.json' &&
-      arg2.method &&
-      arg2.method === 'GET'
-    ) {
-      return Promise.resolve({ items: mockApiItems });
-    }
-    return Promise.reject('wrong args!');
-  };
-  let configMock: NewsfeedPluginBrowserConfig;
-
-  afterEach(() => {
-    jest.resetAllMocks();
-  });
-
   beforeEach(() => {
-    configMock = {
-      service: {
-        urlRoot: 'http://fakenews.co',
-        pathTemplate: '/kibana-test/v{VERSION}.json',
-      },
-      mainInterval: moment.duration(86400000),
-      fetchInterval: moment.duration(86400000),
-    };
-    httpMock = ({
-      fetch: mockHttpGet,
-    } as unknown) as HttpSetup;
+    driverInstanceMock.shouldFetch.mockReturnValue(true);
   });
 
-  it('creates a result', (done) => {
-    mockHttpGet.mockImplementationOnce(() => Promise.resolve({ items: [] }));
-    getApi(httpMock, configMock, '6.8.2').subscribe((result) => {
-      expect(result).toMatchInlineSnapshot(`
-        Object {
-          "error": null,
-          "feedItems": Array [],
-          "hasNew": false,
-          "kibanaVersion": "6.8.2",
-        }
-      `);
-      done();
-    });
+  afterEach(() => {
+    storageInstanceMock.isAnyUnread$.mockReset();
+    driverInstanceMock.fetchNewsfeedItems.mockReset();
   });
 
-  it('hasNew is true when the service returns hashes not in the cache', (done) => {
-    const mockApiItems: ApiItem[] = [
-      {
-        title: {
-          en: 'speaking English',
-          es: 'habla Espanol',
-        },
-        description: {
-          en: 'language test',
-          es: 'idiomas',
-        },
-        languages: ['en', 'es'],
-        link_text: {
-          en: 'click here',
-          es: 'aqui',
-        },
-        link_url: {
-          en: 'xyzxyzxyz',
-          es: 'abcabc',
-        },
-        badge: {
-          en: 'firefighter',
-          es: 'bombero',
-        },
-        publish_on: new Date('2014-10-31T04:23:47Z'),
-        expire_on: new Date('2049-10-31T04:23:47Z'),
-        hash: 'abcabc1231123123hash',
-      },
-    ];
-
-    mockHttpGet.mockImplementationOnce(getHttpMockWithItems(mockApiItems));
-
-    getApi(httpMock, configMock, '6.8.2').subscribe((result) => {
-      expect(result).toMatchInlineSnapshot(`
-        Object {
-          "error": null,
-          "feedItems": Array [
-            Object {
-              "badge": "firefighter",
-              "description": "language test",
-              "expireOn": "2049-10-31T04:23:47.000Z",
-              "hash": "abcabc1231",
-              "linkText": "click here",
-              "linkUrl": "xyzxyzxyz",
-              "publishOn": "2014-10-31T04:23:47.000Z",
-              "title": "speaking English",
-            },
-          ],
-          "hasNew": true,
-          "kibanaVersion": "6.8.2",
-        }
-      `);
-      done();
-    });
-  });
+  it('merges the newsfeed and unread observables', () => {
+    getTestScheduler().run(({ expectObservable, cold }) => {
+      storageInstanceMock.isAnyUnread$.mockImplementation(() => {
+        return cold<boolean>('a|', {
+          a: true,
+        });
+      });
+      driverInstanceMock.fetchNewsfeedItems.mockReturnValue(
+        cold<FetchResult>('a|', {
+          a: createFetchResult({ feedItems: ['item' as any] }),
+        })
+      );
+      const api = getApi(createConfig(1000), kibanaVersion, newsfeedId);
 
-  it('hasNew is false when service returns hashes that are all stored', (done) => {
-    localStorageGet.throws('Wrong key passed!');
-    localStorageGet.withArgs(`${NEWSFEED_HASH_SET_STORAGE_KEY}.NEW_UUID`).returns('happyness');
-    const mockApiItems: ApiItem[] = [
-      {
-        title: { en: 'hasNew test' },
-        description: { en: 'test' },
-        link_text: { en: 'click here' },
-        link_url: { en: 'xyzxyzxyz' },
-        badge: { en: 'firefighter' },
-        publish_on: new Date('2014-10-31T04:23:47Z'),
-        expire_on: new Date('2049-10-31T04:23:47Z'),
-        hash: 'happyness',
-      },
-    ];
-    mockHttpGet.mockImplementationOnce(getHttpMockWithItems(mockApiItems));
-    getApi(httpMock, configMock, '6.8.2').subscribe((result) => {
-      expect(result).toMatchInlineSnapshot(`
-        Object {
-          "error": null,
-          "feedItems": Array [
-            Object {
-              "badge": "firefighter",
-              "description": "test",
-              "expireOn": "2049-10-31T04:23:47.000Z",
-              "hash": "happyness",
-              "linkText": "click here",
-              "linkUrl": "xyzxyzxyz",
-              "publishOn": "2014-10-31T04:23:47.000Z",
-              "title": "hasNew test",
-            },
-          ],
-          "hasNew": false,
-          "kibanaVersion": "6.8.2",
-        }
-      `);
-      done();
+      expectObservable(api.fetchResults$.pipe(take(1))).toBe('(a|)', {
+        a: createFetchResult({
+          feedItems: ['item' as any],
+          hasNew: true,
+        }),
+      });
     });
   });
 
-  it('forwards an error', (done) => {
-    mockHttpGet.mockImplementationOnce((arg1, arg2) => Promise.reject('sorry, try again later!'));
-
-    getApi(httpMock, configMock, '6.8.2').subscribe((result) => {
-      expect(result).toMatchInlineSnapshot(`
-        Object {
-          "error": "sorry, try again later!",
-          "feedItems": Array [],
-          "hasNew": false,
-          "kibanaVersion": "6.8.2",
-        }
-      `);
-      done();
+  it('emits based on the predefined interval', () => {
+    getTestScheduler().run(({ expectObservable, cold }) => {
+      storageInstanceMock.isAnyUnread$.mockImplementation(() => {
+        return cold<boolean>('a|', {
+          a: true,
+        });
+      });
+      driverInstanceMock.fetchNewsfeedItems.mockReturnValue(
+        cold<FetchResult>('a|', {
+          a: createFetchResult({ feedItems: ['item' as any] }),
+        })
+      );
+      const api = getApi(createConfig(2), kibanaVersion, newsfeedId);
+
+      expectObservable(api.fetchResults$.pipe(take(2))).toBe('a-(b|)', {
+        a: createFetchResult({
+          feedItems: ['item' as any],
+          hasNew: true,
+        }),
+        b: createFetchResult({
+          feedItems: ['item' as any],
+          hasNew: true,
+        }),
+      });
     });
   });
 
-  describe('Retry fetching', () => {
-    const successItems: ApiItem[] = [
-      {
-        title: { en: 'hasNew test' },
-        description: { en: 'test' },
-        link_text: { en: 'click here' },
-        link_url: { en: 'xyzxyzxyz' },
-        badge: { en: 'firefighter' },
-        publish_on: new Date('2014-10-31T04:23:47Z'),
-        expire_on: new Date('2049-10-31T04:23:47Z'),
-        hash: 'happyness',
-      },
-    ];
-
-    it("retries until fetch doesn't error", (done) => {
-      configMock.mainInterval = moment.duration(10); // fast retry for testing
-      mockHttpGet
-        .mockImplementationOnce(() => Promise.reject('Sorry, try again later!'))
-        .mockImplementationOnce(() => Promise.reject('Sorry, internal server error!'))
-        .mockImplementationOnce(() => Promise.reject("Sorry, it's too cold to go outside!"))
-        .mockImplementationOnce(getHttpMockWithItems(successItems));
-
-      getApi(httpMock, configMock, '6.8.2')
-        .pipe(take(4), toArray())
-        .subscribe((result) => {
-          expect(result).toMatchInlineSnapshot(`
-            Array [
-              Object {
-                "error": "Sorry, try again later!",
-                "feedItems": Array [],
-                "hasNew": false,
-                "kibanaVersion": "6.8.2",
-              },
-              Object {
-                "error": "Sorry, internal server error!",
-                "feedItems": Array [],
-                "hasNew": false,
-                "kibanaVersion": "6.8.2",
-              },
-              Object {
-                "error": "Sorry, it's too cold to go outside!",
-                "feedItems": Array [],
-                "hasNew": false,
-                "kibanaVersion": "6.8.2",
-              },
-              Object {
-                "error": null,
-                "feedItems": Array [
-                  Object {
-                    "badge": "firefighter",
-                    "description": "test",
-                    "expireOn": "2049-10-31T04:23:47.000Z",
-                    "hash": "happyness",
-                    "linkText": "click here",
-                    "linkUrl": "xyzxyzxyz",
-                    "publishOn": "2014-10-31T04:23:47.000Z",
-                    "title": "hasNew test",
-                  },
-                ],
-                "hasNew": false,
-                "kibanaVersion": "6.8.2",
-              },
-            ]
-          `);
-          done();
+  it('re-emits when the unread status changes', () => {
+    getTestScheduler().run(({ expectObservable, cold }) => {
+      storageInstanceMock.isAnyUnread$.mockImplementation(() => {
+        return cold<boolean>('a--b', {
+          a: true,
+          b: false,
         });
-    });
-
-    it("doesn't retry if fetch succeeds", (done) => {
-      configMock.mainInterval = moment.duration(10); // fast retry for testing
-      mockHttpGet.mockImplementation(getHttpMockWithItems(successItems));
-
-      const timeout$ = interval(1000); // lets us capture some results after a short time
-      let timesFetched = 0;
-
-      const get$ = getApi(httpMock, configMock, '6.8.2').pipe(
-        tap(() => {
-          timesFetched++;
+      });
+      driverInstanceMock.fetchNewsfeedItems.mockReturnValue(
+        cold<FetchResult>('(a|)', {
+          a: createFetchResult({}),
         })
       );
-
-      race(get$, timeout$).subscribe(() => {
-        expect(timesFetched).toBe(1); // first fetch was successful, so there was no retry
-        done();
+      const api = getApi(createConfig(10), kibanaVersion, newsfeedId);
+
+      expectObservable(api.fetchResults$.pipe(take(2))).toBe('a--(b|)', {
+        a: createFetchResult({
+          hasNew: true,
+        }),
+        b: createFetchResult({
+          hasNew: false,
+        }),
       });
     });
   });
diff --git a/src/plugins/newsfeed/public/lib/api.ts b/src/plugins/newsfeed/public/lib/api.ts
index 9b1274a25d486..4fbbd8687b73f 100644
--- a/src/plugins/newsfeed/public/lib/api.ts
+++ b/src/plugins/newsfeed/public/lib/api.ts
@@ -6,21 +6,12 @@
  * Side Public License, v 1.
  */
 
-import * as Rx from 'rxjs';
-import moment from 'moment';
-import uuid from 'uuid';
+import { combineLatest, Observable, timer, of } from 'rxjs';
+import { map, catchError, filter, mergeMap, tap } from 'rxjs/operators';
 import { i18n } from '@kbn/i18n';
-import { catchError, filter, mergeMap, tap } from 'rxjs/operators';
-import { HttpSetup } from 'src/core/public';
-import {
-  NEWSFEED_DEFAULT_SERVICE_BASE_URL,
-  NEWSFEED_FALLBACK_LANGUAGE,
-  NEWSFEED_LAST_FETCH_STORAGE_KEY,
-  NEWSFEED_HASH_SET_STORAGE_KEY,
-} from '../../common/constants';
-import { ApiItem, NewsfeedItem, FetchResult, NewsfeedPluginBrowserConfig } from '../types';
-
-type ApiConfig = NewsfeedPluginBrowserConfig['service'];
+import { FetchResult, NewsfeedPluginBrowserConfig } from '../types';
+import { NewsfeedApiDriver } from './driver';
+import { NewsfeedStorage } from './storage';
 
 export enum NewsfeedApiEndpoint {
   KIBANA = 'kibana',
@@ -29,145 +20,17 @@ export enum NewsfeedApiEndpoint {
   OBSERVABILITY = 'observability',
 }
 
-export class NewsfeedApiDriver {
-  private readonly id = uuid.v4();
-  private readonly kibanaVersion: string;
-  private readonly loadedTime = moment().utc(); // the date is compared to time in UTC format coming from the service
-  private readonly lastFetchStorageKey: string;
-  private readonly hashSetStorageKey: string;
-
-  constructor(
-    kibanaVersion: string,
-    private readonly userLanguage: string,
-    private readonly fetchInterval: number
-  ) {
-    // The API only accepts versions in the format `X.Y.Z`, so we need to drop the `-SNAPSHOT` or any other label after it
-    this.kibanaVersion = kibanaVersion.replace(/^(\d+\.\d+\.\d+).*/, '$1');
-    this.lastFetchStorageKey = `${NEWSFEED_LAST_FETCH_STORAGE_KEY}.${this.id}`;
-    this.hashSetStorageKey = `${NEWSFEED_HASH_SET_STORAGE_KEY}.${this.id}`;
-  }
-
-  shouldFetch(): boolean {
-    const lastFetchUtc: string | null = sessionStorage.getItem(this.lastFetchStorageKey);
-    if (lastFetchUtc == null) {
-      return true;
-    }
-    const last = moment(lastFetchUtc, 'x'); // parse as unix ms timestamp (already is UTC)
-
-    // does the last fetch time precede the time that the page was loaded?
-    if (this.loadedTime.diff(last) > 0) {
-      return true;
-    }
-
-    const now = moment.utc(); // always use UTC to compare timestamps that came from the service
-    const duration = moment.duration(now.diff(last));
-
-    return duration.asMilliseconds() > this.fetchInterval;
-  }
-
-  updateLastFetch() {
-    sessionStorage.setItem(this.lastFetchStorageKey, Date.now().toString());
-  }
-
-  updateHashes(items: NewsfeedItem[]): { previous: string[]; current: string[] } {
-    // replace localStorage hashes with new hashes
-    const stored: string | null = localStorage.getItem(this.hashSetStorageKey);
-    let old: string[] = [];
-    if (stored != null) {
-      old = stored.split(',');
-    }
-
-    const newHashes = items.map((i) => i.hash);
-    const updatedHashes = [...new Set(old.concat(newHashes))];
-    localStorage.setItem(this.hashSetStorageKey, updatedHashes.join(','));
-
-    return { previous: old, current: updatedHashes };
-  }
-
-  fetchNewsfeedItems(http: HttpSetup, config: ApiConfig): Rx.Observable<FetchResult> {
-    const urlPath = config.pathTemplate.replace('{VERSION}', this.kibanaVersion);
-    const fullUrl = (config.urlRoot || NEWSFEED_DEFAULT_SERVICE_BASE_URL) + urlPath;
-
-    return Rx.from(
-      http
-        .fetch(fullUrl, {
-          method: 'GET',
-        })
-        .then(({ items }: { items: ApiItem[] }) => {
-          return this.modelItems(items);
-        })
-    );
-  }
-
-  validateItem(item: Partial<NewsfeedItem>) {
-    const hasMissing = [
-      item.title,
-      item.description,
-      item.linkText,
-      item.linkUrl,
-      item.publishOn,
-      item.hash,
-    ].includes(undefined);
-
-    return !hasMissing;
-  }
-
-  modelItems(items: ApiItem[]): FetchResult {
-    const feedItems: NewsfeedItem[] = items.reduce((accum: NewsfeedItem[], it: ApiItem) => {
-      let chosenLanguage = this.userLanguage;
-      const {
-        expire_on: expireOnUtc,
-        publish_on: publishOnUtc,
-        languages,
-        title,
-        description,
-        link_text: linkText,
-        link_url: linkUrl,
-        badge,
-        hash,
-      } = it;
-
-      if (moment(expireOnUtc).isBefore(Date.now())) {
-        return accum; // ignore item if expired
-      }
-
-      if (moment(publishOnUtc).isAfter(Date.now())) {
-        return accum; // ignore item if publish date hasn't occurred yet (pre-published)
-      }
-
-      if (languages && !languages.includes(chosenLanguage)) {
-        chosenLanguage = NEWSFEED_FALLBACK_LANGUAGE; // don't remove the item: fallback on a language
-      }
-
-      const tempItem: NewsfeedItem = {
-        title: title[chosenLanguage],
-        description: description[chosenLanguage],
-        linkText: linkText != null ? linkText[chosenLanguage] : null,
-        linkUrl: linkUrl[chosenLanguage],
-        badge: badge != null ? badge![chosenLanguage] : null,
-        publishOn: moment(publishOnUtc),
-        expireOn: moment(expireOnUtc),
-        hash: hash.slice(0, 10), // optimize for storage and faster parsing
-      };
-
-      if (!this.validateItem(tempItem)) {
-        return accum; // ignore if title, description, etc is missing
-      }
-
-      return [...accum, tempItem];
-    }, []);
-
-    // calculate hasNew
-    const { previous, current } = this.updateHashes(feedItems);
-    const hasNew = current.length > previous.length;
-
-    return {
-      error: null,
-      kibanaVersion: this.kibanaVersion,
-      hasNew,
-      feedItems,
-    };
-  }
+export interface NewsfeedApi {
+  /**
+   * The current fetch results
+   */
+  fetchResults$: Observable<void | null | FetchResult>;
+
+  /**
+   * Mark the given items as read.
+   * Will refresh the `hasNew` value of the emitted FetchResult accordingly
+   */
+  markAsRead(itemHashes: string[]): void;
 }
 
 /*
@@ -175,22 +38,23 @@ export class NewsfeedApiDriver {
  * Computes hasNew value from new item hashes saved in localStorage
  */
 export function getApi(
-  http: HttpSetup,
   config: NewsfeedPluginBrowserConfig,
-  kibanaVersion: string
-): Rx.Observable<void | FetchResult> {
+  kibanaVersion: string,
+  newsfeedId: string
+): NewsfeedApi {
   const userLanguage = i18n.getLocale();
   const fetchInterval = config.fetchInterval.asMilliseconds();
   const mainInterval = config.mainInterval.asMilliseconds();
-  const driver = new NewsfeedApiDriver(kibanaVersion, userLanguage, fetchInterval);
+  const storage = new NewsfeedStorage(newsfeedId);
+  const driver = new NewsfeedApiDriver(kibanaVersion, userLanguage, fetchInterval, storage);
 
-  return Rx.timer(0, mainInterval).pipe(
+  const results$ = timer(0, mainInterval).pipe(
     filter(() => driver.shouldFetch()),
     mergeMap(() =>
-      driver.fetchNewsfeedItems(http, config.service).pipe(
+      driver.fetchNewsfeedItems(config.service).pipe(
         catchError((err) => {
           window.console.error(err);
-          return Rx.of({
+          return of({
             error: err,
             kibanaVersion,
             hasNew: false,
@@ -199,6 +63,22 @@ export function getApi(
         })
       )
     ),
-    tap(() => driver.updateLastFetch())
+    tap(() => storage.setLastFetchTime(new Date()))
   );
+
+  const merged$ = combineLatest([results$, storage.isAnyUnread$()]).pipe(
+    map(([results, isAnyUnread]) => {
+      return {
+        ...results,
+        hasNew: results.error ? false : isAnyUnread,
+      };
+    })
+  );
+
+  return {
+    fetchResults$: merged$,
+    markAsRead: (itemHashes) => {
+      storage.markItemsAsRead(itemHashes);
+    },
+  };
 }
diff --git a/src/plugins/newsfeed/public/lib/convert_items.test.ts b/src/plugins/newsfeed/public/lib/convert_items.test.ts
new file mode 100644
index 0000000000000..8b599d841935c
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/convert_items.test.ts
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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';
+import { omit } from 'lodash';
+import { validateIntegrity, validatePublishedDate, localizeItem } from './convert_items';
+import type { ApiItem, NewsfeedItem } from '../types';
+
+const createApiItem = (parts: Partial<ApiItem> = {}): ApiItem => ({
+  hash: 'hash',
+  expire_on: new Date(),
+  publish_on: new Date(),
+  title: {},
+  description: {},
+  link_url: {},
+  ...parts,
+});
+
+const createNewsfeedItem = (parts: Partial<NewsfeedItem> = {}): NewsfeedItem => ({
+  title: 'title',
+  description: 'description',
+  linkText: 'linkText',
+  linkUrl: 'linkUrl',
+  badge: 'badge',
+  publishOn: moment(),
+  expireOn: moment(),
+  hash: 'hash',
+  ...parts,
+});
+
+describe('localizeItem', () => {
+  const item = createApiItem({
+    languages: ['en', 'fr'],
+    title: {
+      en: 'en title',
+      fr: 'fr title',
+    },
+    description: {
+      en: 'en desc',
+      fr: 'fr desc',
+    },
+    link_text: {
+      en: 'en link text',
+      fr: 'fr link text',
+    },
+    link_url: {
+      en: 'en link url',
+      fr: 'fr link url',
+    },
+    badge: {
+      en: 'en badge',
+      fr: 'fr badge',
+    },
+    publish_on: new Date('2014-10-31T04:23:47Z'),
+    expire_on: new Date('2049-10-31T04:23:47Z'),
+    hash: 'hash',
+  });
+
+  it('converts api items to newsfeed items using the specified language', () => {
+    expect(localizeItem(item, 'fr')).toMatchObject({
+      title: 'fr title',
+      description: 'fr desc',
+      linkText: 'fr link text',
+      linkUrl: 'fr link url',
+      badge: 'fr badge',
+      hash: 'hash',
+    });
+  });
+
+  it('fallbacks to `en` is the language is not present', () => {
+    expect(localizeItem(item, 'de')).toMatchObject({
+      title: 'en title',
+      description: 'en desc',
+      linkText: 'en link text',
+      linkUrl: 'en link url',
+      badge: 'en badge',
+      hash: 'hash',
+    });
+  });
+});
+
+describe('validatePublishedDate', () => {
+  it('returns false when the publish date is not reached yet', () => {
+    expect(
+      validatePublishedDate(
+        createApiItem({
+          publish_on: new Date('2055-10-31T04:23:47Z'), // too new
+          expire_on: new Date('2056-10-31T04:23:47Z'),
+        })
+      )
+    ).toBe(false);
+  });
+
+  it('returns false when the expire date is already reached', () => {
+    expect(
+      validatePublishedDate(
+        createApiItem({
+          publish_on: new Date('2013-10-31T04:23:47Z'),
+          expire_on: new Date('2014-10-31T04:23:47Z'), // too old
+        })
+      )
+    ).toBe(false);
+  });
+
+  it('returns true when current date is between the publish and expire dates', () => {
+    expect(
+      validatePublishedDate(
+        createApiItem({
+          publish_on: new Date('2014-10-31T04:23:47Z'),
+          expire_on: new Date('2049-10-31T04:23:47Z'),
+        })
+      )
+    ).toBe(true);
+  });
+});
+
+describe('validateIntegrity', () => {
+  it('returns false if `title` is missing', () => {
+    expect(validateIntegrity(omit(createNewsfeedItem(), 'title'))).toBe(false);
+  });
+  it('returns false if `description` is missing', () => {
+    expect(validateIntegrity(omit(createNewsfeedItem(), 'description'))).toBe(false);
+  });
+  it('returns false if `linkText` is missing', () => {
+    expect(validateIntegrity(omit(createNewsfeedItem(), 'linkText'))).toBe(false);
+  });
+  it('returns false if `linkUrl` is missing', () => {
+    expect(validateIntegrity(omit(createNewsfeedItem(), 'linkUrl'))).toBe(false);
+  });
+  it('returns false if `publishOn` is missing', () => {
+    expect(validateIntegrity(omit(createNewsfeedItem(), 'publishOn'))).toBe(false);
+  });
+  it('returns false if `hash` is missing', () => {
+    expect(validateIntegrity(omit(createNewsfeedItem(), 'hash'))).toBe(false);
+  });
+  it('returns true if all mandatory fields are present', () => {
+    expect(validateIntegrity(createNewsfeedItem())).toBe(true);
+  });
+});
diff --git a/src/plugins/newsfeed/public/lib/convert_items.ts b/src/plugins/newsfeed/public/lib/convert_items.ts
new file mode 100644
index 0000000000000..38ea2cc895f3e
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/convert_items.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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';
+import { ApiItem, NewsfeedItem } from '../types';
+import { NEWSFEED_FALLBACK_LANGUAGE } from '../../common/constants';
+
+export const convertItems = (items: ApiItem[], userLanguage: string): NewsfeedItem[] => {
+  return items
+    .filter(validatePublishedDate)
+    .map((item) => localizeItem(item, userLanguage))
+    .filter(validateIntegrity);
+};
+
+export const validatePublishedDate = (item: ApiItem): boolean => {
+  if (moment(item.expire_on).isBefore(Date.now())) {
+    return false; // ignore item if expired
+  }
+
+  if (moment(item.publish_on).isAfter(Date.now())) {
+    return false; // ignore item if publish date hasn't occurred yet (pre-published)
+  }
+  return true;
+};
+
+export const localizeItem = (rawItem: ApiItem, userLanguage: string): NewsfeedItem => {
+  const {
+    expire_on: expireOnUtc,
+    publish_on: publishOnUtc,
+    languages,
+    title,
+    description,
+    link_text: linkText,
+    link_url: linkUrl,
+    badge,
+    hash,
+  } = rawItem;
+
+  let chosenLanguage = userLanguage;
+  if (languages && !languages.includes(chosenLanguage)) {
+    chosenLanguage = NEWSFEED_FALLBACK_LANGUAGE; // don't remove the item: fallback on a language
+  }
+
+  return {
+    title: title[chosenLanguage],
+    description: description[chosenLanguage],
+    linkText: linkText != null ? linkText[chosenLanguage] : null,
+    linkUrl: linkUrl[chosenLanguage],
+    badge: badge != null ? badge![chosenLanguage] : null,
+    publishOn: moment(publishOnUtc),
+    expireOn: moment(expireOnUtc),
+    hash: hash.slice(0, 10), // optimize for storage and faster parsing
+  };
+};
+
+export const validateIntegrity = (item: Partial<NewsfeedItem>): boolean => {
+  const hasMissing = [
+    item.title,
+    item.description,
+    item.linkText,
+    item.linkUrl,
+    item.publishOn,
+    item.hash,
+  ].includes(undefined);
+
+  return !hasMissing;
+};
diff --git a/src/plugins/newsfeed/public/lib/driver.mock.ts b/src/plugins/newsfeed/public/lib/driver.mock.ts
new file mode 100644
index 0000000000000..8ae4ad1a82c4d
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/driver.mock.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.
+ */
+
+import { PublicMethodsOf } from '@kbn/utility-types';
+import type { NewsfeedApiDriver } from './driver';
+
+const createDriverMock = () => {
+  const mock: jest.Mocked<PublicMethodsOf<NewsfeedApiDriver>> = {
+    shouldFetch: jest.fn(),
+    fetchNewsfeedItems: jest.fn(),
+  };
+  return mock as jest.Mocked<NewsfeedApiDriver>;
+};
+
+export const driverMock = {
+  create: createDriverMock,
+};
diff --git a/src/plugins/newsfeed/public/lib/driver.test.mocks.ts b/src/plugins/newsfeed/public/lib/driver.test.mocks.ts
new file mode 100644
index 0000000000000..2d7123ebc2d1f
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/driver.test.mocks.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 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 convertItemsMock = jest.fn();
+jest.doMock('./convert_items', () => ({
+  convertItems: convertItemsMock,
+}));
diff --git a/src/plugins/newsfeed/public/lib/driver.test.ts b/src/plugins/newsfeed/public/lib/driver.test.ts
new file mode 100644
index 0000000000000..38ec90cf20101
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/driver.test.ts
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { convertItemsMock } from './driver.test.mocks';
+// @ts-expect-error
+import fetchMock from 'fetch-mock/es5/client';
+import { take } from 'rxjs/operators';
+import { NewsfeedApiDriver } from './driver';
+import { storageMock } from './storage.mock';
+
+const kibanaVersion = '8.0.0';
+const userLanguage = 'en';
+const fetchInterval = 2000;
+
+describe('NewsfeedApiDriver', () => {
+  let driver: NewsfeedApiDriver;
+  let storage: ReturnType<typeof storageMock.create>;
+
+  beforeEach(() => {
+    storage = storageMock.create();
+    driver = new NewsfeedApiDriver(kibanaVersion, userLanguage, fetchInterval, storage);
+    convertItemsMock.mockReturnValue([]);
+  });
+
+  afterEach(() => {
+    fetchMock.reset();
+    convertItemsMock.mockReset();
+  });
+
+  afterAll(() => {
+    fetchMock.restore();
+  });
+
+  describe('shouldFetch', () => {
+    it('returns true if no value is present in the storage', () => {
+      storage.getLastFetchTime.mockReturnValue(undefined);
+      expect(driver.shouldFetch()).toBe(true);
+      expect(storage.getLastFetchTime).toHaveBeenCalledTimes(1);
+    });
+
+    it('returns true if last fetch time precedes page load time', () => {
+      storage.getLastFetchTime.mockReturnValue(new Date(Date.now() - 456789));
+      expect(driver.shouldFetch()).toBe(true);
+    });
+
+    it('returns false if last fetch time is recent enough', () => {
+      storage.getLastFetchTime.mockReturnValue(new Date(Date.now() + 745678));
+      expect(driver.shouldFetch()).toBe(false);
+    });
+  });
+
+  describe('fetchNewsfeedItems', () => {
+    it('calls `window.fetch` with the correct parameters', async () => {
+      fetchMock.get('*', { items: [] });
+      await driver
+        .fetchNewsfeedItems({
+          urlRoot: 'http://newsfeed.com',
+          pathTemplate: '/{VERSION}/news',
+        })
+        .pipe(take(1))
+        .toPromise();
+
+      expect(fetchMock.lastUrl()).toEqual('http://newsfeed.com/8.0.0/news');
+      expect(fetchMock.lastOptions()).toEqual({
+        method: 'GET',
+      });
+    });
+
+    it('calls `convertItems` with the correct parameters', async () => {
+      fetchMock.get('*', { items: ['foo', 'bar'] });
+
+      await driver
+        .fetchNewsfeedItems({
+          urlRoot: 'http://newsfeed.com',
+          pathTemplate: '/{VERSION}/news',
+        })
+        .pipe(take(1))
+        .toPromise();
+
+      expect(convertItemsMock).toHaveBeenCalledTimes(1);
+      expect(convertItemsMock).toHaveBeenCalledWith(['foo', 'bar'], userLanguage);
+    });
+
+    it('calls `storage.setFetchedItems` with the correct parameters', async () => {
+      fetchMock.get('*', { items: [] });
+      convertItemsMock.mockReturnValue([
+        { id: '1', hash: 'hash1' },
+        { id: '2', hash: 'hash2' },
+      ]);
+
+      await driver
+        .fetchNewsfeedItems({
+          urlRoot: 'http://newsfeed.com',
+          pathTemplate: '/{VERSION}/news',
+        })
+        .pipe(take(1))
+        .toPromise();
+
+      expect(storage.setFetchedItems).toHaveBeenCalledTimes(1);
+      expect(storage.setFetchedItems).toHaveBeenCalledWith(['hash1', 'hash2']);
+    });
+
+    it('returns the expected values', async () => {
+      fetchMock.get('*', { items: [] });
+      const feedItems = [
+        { id: '1', hash: 'hash1' },
+        { id: '2', hash: 'hash2' },
+      ];
+      convertItemsMock.mockReturnValue(feedItems);
+      storage.setFetchedItems.mockReturnValue(true);
+
+      const result = await driver
+        .fetchNewsfeedItems({
+          urlRoot: 'http://newsfeed.com',
+          pathTemplate: '/{VERSION}/news',
+        })
+        .pipe(take(1))
+        .toPromise();
+
+      expect(result).toEqual({
+        error: null,
+        kibanaVersion,
+        hasNew: true,
+        feedItems,
+      });
+    });
+  });
+});
diff --git a/src/plugins/newsfeed/public/lib/driver.ts b/src/plugins/newsfeed/public/lib/driver.ts
new file mode 100644
index 0000000000000..0efa981e8c89d
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/driver.ts
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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';
+import * as Rx from 'rxjs';
+import { NEWSFEED_DEFAULT_SERVICE_BASE_URL } from '../../common/constants';
+import { ApiItem, FetchResult, NewsfeedPluginBrowserConfig } from '../types';
+import { convertItems } from './convert_items';
+import type { NewsfeedStorage } from './storage';
+
+type ApiConfig = NewsfeedPluginBrowserConfig['service'];
+
+interface NewsfeedResponse {
+  items: ApiItem[];
+}
+
+export class NewsfeedApiDriver {
+  private readonly kibanaVersion: string;
+  private readonly loadedTime = moment().utc(); // the date is compared to time in UTC format coming from the service
+
+  constructor(
+    kibanaVersion: string,
+    private readonly userLanguage: string,
+    private readonly fetchInterval: number,
+    private readonly storage: NewsfeedStorage
+  ) {
+    // The API only accepts versions in the format `X.Y.Z`, so we need to drop the `-SNAPSHOT` or any other label after it
+    this.kibanaVersion = kibanaVersion.replace(/^(\d+\.\d+\.\d+).*/, '$1');
+  }
+
+  shouldFetch(): boolean {
+    const lastFetchUtc = this.storage.getLastFetchTime();
+    if (!lastFetchUtc) {
+      return true;
+    }
+    const last = moment(lastFetchUtc);
+
+    // does the last fetch time precede the time that the page was loaded?
+    if (this.loadedTime.diff(last) > 0) {
+      return true;
+    }
+
+    const now = moment.utc(); // always use UTC to compare timestamps that came from the service
+    const duration = moment.duration(now.diff(last));
+    return duration.asMilliseconds() > this.fetchInterval;
+  }
+
+  fetchNewsfeedItems(config: ApiConfig): Rx.Observable<FetchResult> {
+    const urlPath = config.pathTemplate.replace('{VERSION}', this.kibanaVersion);
+    const fullUrl = (config.urlRoot || NEWSFEED_DEFAULT_SERVICE_BASE_URL) + urlPath;
+    const request = new Request(fullUrl, {
+      method: 'GET',
+    });
+
+    return Rx.from(
+      window.fetch(request).then(async (response) => {
+        const { items } = (await response.json()) as NewsfeedResponse;
+        return this.convertResponse(items);
+      })
+    );
+  }
+
+  private convertResponse(items: ApiItem[]): FetchResult {
+    const feedItems = convertItems(items, this.userLanguage);
+    const hasNew = this.storage.setFetchedItems(feedItems.map((item) => item.hash));
+
+    return {
+      error: null,
+      kibanaVersion: this.kibanaVersion,
+      hasNew,
+      feedItems,
+    };
+  }
+}
diff --git a/src/plugins/newsfeed/public/lib/storage.mock.ts b/src/plugins/newsfeed/public/lib/storage.mock.ts
new file mode 100644
index 0000000000000..98681e20b0665
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/storage.mock.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 { PublicMethodsOf } from '@kbn/utility-types';
+import type { NewsfeedStorage } from './storage';
+
+const createStorageMock = () => {
+  const mock: jest.Mocked<PublicMethodsOf<NewsfeedStorage>> = {
+    getLastFetchTime: jest.fn(),
+    setLastFetchTime: jest.fn(),
+    setFetchedItems: jest.fn(),
+    markItemsAsRead: jest.fn(),
+    isAnyUnread: jest.fn(),
+    isAnyUnread$: jest.fn(),
+  };
+  return mock as jest.Mocked<NewsfeedStorage>;
+};
+
+export const storageMock = {
+  create: createStorageMock,
+};
diff --git a/src/plugins/newsfeed/public/lib/storage.test.ts b/src/plugins/newsfeed/public/lib/storage.test.ts
new file mode 100644
index 0000000000000..1c424d8247e86
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/storage.test.ts
@@ -0,0 +1,165 @@
+/*
+ * Copyright 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 { NewsfeedStorage, getStorageKey } from './storage';
+import { take } from 'rxjs/operators';
+
+describe('NewsfeedStorage', () => {
+  const storagePrefix = 'test';
+  let mockStorage: Record<string, any>;
+  let storage: NewsfeedStorage;
+
+  const getKey = (key: string) => getStorageKey(storagePrefix, key);
+
+  beforeAll(() => {
+    Object.defineProperty(window, 'localStorage', {
+      value: {
+        getItem: (key: string) => {
+          return mockStorage[key] || null;
+        },
+        setItem: (key: string, value: string) => {
+          mockStorage[key] = value;
+        },
+      },
+      writable: true,
+    });
+  });
+
+  afterAll(() => {
+    delete (window as any).localStorage;
+  });
+
+  beforeEach(() => {
+    mockStorage = {};
+    storage = new NewsfeedStorage(storagePrefix);
+  });
+
+  describe('getLastFetchTime', () => {
+    it('returns undefined if not set', () => {
+      expect(storage.getLastFetchTime()).toBeUndefined();
+    });
+
+    it('returns the last value that was set', () => {
+      const date = new Date();
+      storage.setLastFetchTime(date);
+      expect(storage.getLastFetchTime()!.getTime()).toEqual(date.getTime());
+    });
+  });
+
+  describe('setFetchedItems', () => {
+    it('updates the value in the storage', () => {
+      storage.setFetchedItems(['a', 'b', 'c']);
+      expect(JSON.parse(localStorage.getItem(getKey('readStatus'))!)).toEqual({
+        a: false,
+        b: false,
+        c: false,
+      });
+    });
+
+    it('preserves the read status if present', () => {
+      const initialValue = { a: true, b: false };
+      window.localStorage.setItem(getKey('readStatus'), JSON.stringify(initialValue));
+      storage.setFetchedItems(['a', 'b', 'c']);
+      expect(JSON.parse(localStorage.getItem(getKey('readStatus'))!)).toEqual({
+        a: true,
+        b: false,
+        c: false,
+      });
+    });
+
+    it('removes the old keys from the storage', () => {
+      const initialValue = { a: true, b: false, old: false };
+      window.localStorage.setItem(getKey('readStatus'), JSON.stringify(initialValue));
+      storage.setFetchedItems(['a', 'b', 'c']);
+      expect(JSON.parse(localStorage.getItem(getKey('readStatus'))!)).toEqual({
+        a: true,
+        b: false,
+        c: false,
+      });
+    });
+  });
+
+  describe('markItemsAsRead', () => {
+    it('flags the entries as read', () => {
+      const initialValue = { a: true, b: false, c: false };
+      window.localStorage.setItem(getKey('readStatus'), JSON.stringify(initialValue));
+      storage.markItemsAsRead(['b']);
+      expect(JSON.parse(localStorage.getItem(getKey('readStatus'))!)).toEqual({
+        a: true,
+        b: true,
+        c: false,
+      });
+    });
+
+    it('add the entries when not present', () => {
+      const initialValue = { a: true, b: false, c: false };
+      window.localStorage.setItem(getKey('readStatus'), JSON.stringify(initialValue));
+      storage.markItemsAsRead(['b', 'new']);
+      expect(JSON.parse(localStorage.getItem(getKey('readStatus'))!)).toEqual({
+        a: true,
+        b: true,
+        c: false,
+        new: true,
+      });
+    });
+  });
+
+  describe('isAnyUnread', () => {
+    it('returns true if any item was not read', () => {
+      storage.setFetchedItems(['a', 'b', 'c']);
+      storage.markItemsAsRead(['a']);
+      expect(storage.isAnyUnread()).toBe(true);
+    });
+
+    it('returns true if all item are unread', () => {
+      storage.setFetchedItems(['a', 'b', 'c']);
+      expect(storage.isAnyUnread()).toBe(true);
+    });
+
+    it('returns false if all item are unread', () => {
+      storage.setFetchedItems(['a', 'b', 'c']);
+      storage.markItemsAsRead(['a', 'b', 'c']);
+      expect(storage.isAnyUnread()).toBe(false);
+    });
+
+    it('loads the value initially present in localStorage', () => {
+      const initialValue = { a: true, b: false };
+      window.localStorage.setItem(getKey('readStatus'), JSON.stringify(initialValue));
+      storage = new NewsfeedStorage(storagePrefix);
+      expect(storage.isAnyUnread()).toBe(true);
+    });
+  });
+
+  describe('isAnyUnread$', () => {
+    it('emits an initial value at subscription', async () => {
+      const initialValue = { a: true, b: false, c: false };
+      window.localStorage.setItem(getKey('readStatus'), JSON.stringify(initialValue));
+      storage = new NewsfeedStorage(storagePrefix);
+
+      expect(await storage.isAnyUnread$().pipe(take(1)).toPromise()).toBe(true);
+    });
+
+    it('emits when `setFetchedItems` is called', () => {
+      const emissions: boolean[] = [];
+      storage.isAnyUnread$().subscribe((unread) => emissions.push(unread));
+
+      storage.setFetchedItems(['a', 'b', 'c']);
+      expect(emissions).toEqual([false, true]);
+    });
+
+    it('emits when `markItemsAsRead` is called', () => {
+      const emissions: boolean[] = [];
+      storage.isAnyUnread$().subscribe((unread) => emissions.push(unread));
+
+      storage.setFetchedItems(['a', 'b', 'c']);
+      storage.markItemsAsRead(['a', 'b']);
+      storage.markItemsAsRead(['c']);
+      expect(emissions).toEqual([false, true, true, false]);
+    });
+  });
+});
diff --git a/src/plugins/newsfeed/public/lib/storage.ts b/src/plugins/newsfeed/public/lib/storage.ts
new file mode 100644
index 0000000000000..f3df242ad9423
--- /dev/null
+++ b/src/plugins/newsfeed/public/lib/storage.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 moment from 'moment';
+import { Observable, BehaviorSubject } from 'rxjs';
+
+/**
+ * Persistence layer for the newsfeed driver
+ */
+export class NewsfeedStorage {
+  private readonly lastFetchStorageKey: string;
+  private readonly readStatusStorageKey: string;
+  private readonly unreadStatus$: BehaviorSubject<boolean>;
+
+  constructor(storagePrefix: string) {
+    this.lastFetchStorageKey = getStorageKey(storagePrefix, 'lastFetch');
+    this.readStatusStorageKey = getStorageKey(storagePrefix, 'readStatus');
+    this.unreadStatus$ = new BehaviorSubject<boolean>(anyUnread(this.getReadStatus()));
+  }
+
+  getLastFetchTime(): Date | undefined {
+    const lastFetchUtc = localStorage.getItem(this.lastFetchStorageKey);
+    if (!lastFetchUtc) {
+      return undefined;
+    }
+
+    return moment(lastFetchUtc, 'x').toDate(); // parse as unix ms timestamp (already is UTC)
+  }
+
+  setLastFetchTime(date: Date) {
+    localStorage.setItem(this.lastFetchStorageKey, JSON.stringify(date.getTime()));
+  }
+
+  setFetchedItems(itemHashes: string[]): boolean {
+    const currentReadStatus = this.getReadStatus();
+
+    const newReadStatus: Record<string, boolean> = {};
+    itemHashes.forEach((hash) => {
+      newReadStatus[hash] = currentReadStatus[hash] ?? false;
+    });
+
+    return this.setReadStatus(newReadStatus);
+  }
+
+  /**
+   * Marks given items as read, and return the overall unread status.
+   */
+  markItemsAsRead(itemHashes: string[]): boolean {
+    const updatedReadStatus = this.getReadStatus();
+    itemHashes.forEach((hash) => {
+      updatedReadStatus[hash] = true;
+    });
+    return this.setReadStatus(updatedReadStatus);
+  }
+
+  isAnyUnread(): boolean {
+    return this.unreadStatus$.value;
+  }
+
+  isAnyUnread$(): Observable<boolean> {
+    return this.unreadStatus$.asObservable();
+  }
+
+  private getReadStatus(): Record<string, boolean> {
+    try {
+      return JSON.parse(localStorage.getItem(this.readStatusStorageKey) || '{}');
+    } catch (e) {
+      return {};
+    }
+  }
+
+  private setReadStatus(status: Record<string, boolean>) {
+    const hasUnread = anyUnread(status);
+    this.unreadStatus$.next(anyUnread(status));
+    localStorage.setItem(this.readStatusStorageKey, JSON.stringify(status));
+    return hasUnread;
+  }
+}
+
+const anyUnread = (status: Record<string, boolean>): boolean =>
+  Object.values(status).some((read) => !read);
+
+/** @internal */
+export const getStorageKey = (prefix: string, key: string) => `newsfeed.${prefix}.${key}`;
diff --git a/src/plugins/newsfeed/public/plugin.tsx b/src/plugins/newsfeed/public/plugin.tsx
index a788b3c4d0b59..fdda0a24b8bd5 100644
--- a/src/plugins/newsfeed/public/plugin.tsx
+++ b/src/plugins/newsfeed/public/plugin.tsx
@@ -7,15 +7,15 @@
  */
 
 import * as Rx from 'rxjs';
-import { catchError, takeUntil, share } from 'rxjs/operators';
+import { catchError, takeUntil } from 'rxjs/operators';
 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 { NewsfeedPluginBrowserConfig, FetchResult } from './types';
-import { NewsfeedNavButton, NewsfeedApiFetchResult } from './components/newsfeed_header_nav_button';
-import { getApi, NewsfeedApiEndpoint } from './lib/api';
+import { NewsfeedPluginBrowserConfig } from './types';
+import { NewsfeedNavButton } from './components/newsfeed_header_nav_button';
+import { getApi, NewsfeedApi, NewsfeedApiEndpoint } from './lib/api';
 
 export type NewsfeedPublicPluginSetup = ReturnType<NewsfeedPublicPlugin['setup']>;
 export type NewsfeedPublicPluginStart = ReturnType<NewsfeedPublicPlugin['start']>;
@@ -42,10 +42,10 @@ export class NewsfeedPublicPlugin
   }
 
   public start(core: CoreStart) {
-    const api$ = this.fetchNewsfeed(core, this.config).pipe(share());
+    const api = this.createNewsfeedApi(this.config, NewsfeedApiEndpoint.KIBANA);
     core.chrome.navControls.registerRight({
       order: 1000,
-      mount: (target) => this.mount(api$, target),
+      mount: (target) => this.mount(api, target),
     });
 
     return {
@@ -56,7 +56,8 @@ export class NewsfeedPublicPlugin
             pathTemplate: `/${endpoint}/v{VERSION}.json`,
           },
         });
-        return this.fetchNewsfeed(core, config);
+        const { fetchResults$ } = this.createNewsfeedApi(config, endpoint);
+        return fetchResults$;
       },
     };
   }
@@ -65,21 +66,24 @@ export class NewsfeedPublicPlugin
     this.stop$.next();
   }
 
-  private fetchNewsfeed(
-    core: CoreStart,
-    config: NewsfeedPluginBrowserConfig
-  ): Rx.Observable<FetchResult | null | void> {
-    const { http } = core;
-    return getApi(http, config, this.kibanaVersion).pipe(
-      takeUntil(this.stop$), // stop the interval when stop method is called
-      catchError(() => Rx.of(null)) // do not throw error
-    );
+  private createNewsfeedApi(
+    config: NewsfeedPluginBrowserConfig,
+    newsfeedId: NewsfeedApiEndpoint
+  ): NewsfeedApi {
+    const api = getApi(config, this.kibanaVersion, newsfeedId);
+    return {
+      markAsRead: api.markAsRead,
+      fetchResults$: api.fetchResults$.pipe(
+        takeUntil(this.stop$), // stop the interval when stop method is called
+        catchError(() => Rx.of(null)) // do not throw error
+      ),
+    };
   }
 
-  private mount(api$: NewsfeedApiFetchResult, targetDomElement: HTMLElement) {
+  private mount(api: NewsfeedApi, targetDomElement: HTMLElement) {
     ReactDOM.render(
       <I18nProvider>
-        <NewsfeedNavButton apiFetchResult={api$} />
+        <NewsfeedNavButton newsfeedApi={api} />
       </I18nProvider>,
       targetDomElement
     );
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
index ecda9b438eae2..81e74038af079 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/header.test.tsx.snap
@@ -95,11 +95,13 @@ exports[`Intro component renders correctly 1`] = `
                           >
                             <EuiIcon
                               className="euiButtonContent__icon"
+                              color="inherit"
                               size="m"
                               type="eye"
                             >
                               <span
                                 className="euiButtonContent__icon"
+                                color="inherit"
                                 data-euiicon-type="eye"
                                 size="m"
                               />
@@ -178,11 +180,13 @@ exports[`Intro component renders correctly 1`] = `
                           >
                             <EuiIcon
                               className="euiButtonContent__icon"
+                              color="inherit"
                               size="m"
                               type="trash"
                             >
                               <span
                                 className="euiButtonContent__icon"
+                                color="inherit"
                                 data-euiicon-type="trash"
                                 size="m"
                               />
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
index 1877769d94af2..5239a92543539 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/intro.test.tsx.snap
@@ -22,12 +22,14 @@ exports[`Intro component renders correctly 1`] = `
         <EuiIcon
           aria-hidden="true"
           className="euiCallOutHeader__icon"
+          color="inherit"
           size="m"
           type="alert"
         >
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
diff --git a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
index 9e738296277cc..bddfe000008d4 100644
--- a/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
+++ b/src/plugins/saved_objects_management/public/management_section/object_view/components/__snapshots__/not_found_errors.test.tsx.snap
@@ -24,12 +24,14 @@ exports[`NotFoundErrors component renders correctly for index-pattern type 1`] =
         <EuiIcon
           aria-hidden="true"
           className="euiCallOutHeader__icon"
+          color="inherit"
           size="m"
           type="alert"
         >
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
@@ -101,12 +103,14 @@ exports[`NotFoundErrors component renders correctly for index-pattern-field type
         <EuiIcon
           aria-hidden="true"
           className="euiCallOutHeader__icon"
+          color="inherit"
           size="m"
           type="alert"
         >
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
@@ -178,12 +182,14 @@ exports[`NotFoundErrors component renders correctly for search type 1`] = `
         <EuiIcon
           aria-hidden="true"
           className="euiCallOutHeader__icon"
+          color="inherit"
           size="m"
           type="alert"
         >
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
@@ -255,12 +261,14 @@ exports[`NotFoundErrors component renders correctly for unknown type 1`] = `
         <EuiIcon
           aria-hidden="true"
           className="euiCallOutHeader__icon"
+          color="inherit"
           size="m"
           type="alert"
         >
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
diff --git a/src/plugins/screenshot_mode/common/index.ts b/src/plugins/screenshot_mode/common/index.ts
index fd9ad6f70feba..9c8c3d24ef289 100644
--- a/src/plugins/screenshot_mode/common/index.ts
+++ b/src/plugins/screenshot_mode/common/index.ts
@@ -10,6 +10,7 @@ export {
   getScreenshotMode,
   setScreenshotModeEnabled,
   setScreenshotModeDisabled,
+  KBN_SCREENSHOT_MODE_ENABLED_KEY,
 } from './get_set_browser_screenshot_mode';
 
 export { KBN_SCREENSHOT_MODE_HEADER } from './constants';
diff --git a/src/plugins/screenshot_mode/public/index.ts b/src/plugins/screenshot_mode/public/index.ts
index 6a46b240d592e..a5ad37dd5b760 100644
--- a/src/plugins/screenshot_mode/public/index.ts
+++ b/src/plugins/screenshot_mode/public/index.ts
@@ -12,6 +12,10 @@ export function plugin() {
   return new ScreenshotModePlugin();
 }
 
-export { KBN_SCREENSHOT_MODE_HEADER, setScreenshotModeEnabled } from '../common';
+export {
+  KBN_SCREENSHOT_MODE_HEADER,
+  setScreenshotModeEnabled,
+  KBN_SCREENSHOT_MODE_ENABLED_KEY,
+} from '../common';
 
 export { ScreenshotModePluginSetup } from './types';
diff --git a/src/plugins/screenshot_mode/server/index.ts b/src/plugins/screenshot_mode/server/index.ts
index 68714e9a21b87..b9f19a474ccbe 100644
--- a/src/plugins/screenshot_mode/server/index.ts
+++ b/src/plugins/screenshot_mode/server/index.ts
@@ -8,7 +8,11 @@
 
 import { ScreenshotModePlugin } from './plugin';
 
-export { setScreenshotModeEnabled, KBN_SCREENSHOT_MODE_HEADER } from '../common';
+export {
+  setScreenshotModeEnabled,
+  KBN_SCREENSHOT_MODE_HEADER,
+  KBN_SCREENSHOT_MODE_ENABLED_KEY,
+} from '../common';
 
 export {
   ScreenshotModeRequestHandlerContext,
diff --git a/src/plugins/share/common/url_service/__tests__/locators.test.ts b/src/plugins/share/common/url_service/__tests__/locators.test.ts
new file mode 100644
index 0000000000000..45d727df7de48
--- /dev/null
+++ b/src/plugins/share/common/url_service/__tests__/locators.test.ts
@@ -0,0 +1,165 @@
+/*
+ * Copyright 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 { of } from 'src/plugins/kibana_utils/common';
+import { testLocator, TestLocatorState, urlServiceTestSetup } from './setup';
+
+describe('locators', () => {
+  test('can start locators service', () => {
+    const {
+      service: { locators },
+    } = urlServiceTestSetup();
+
+    expect(typeof locators).toBe('object');
+    expect(typeof locators.create).toBe('function');
+    expect(typeof locators.get).toBe('function');
+  });
+
+  test('returns "undefined" for unregistered locator', () => {
+    const {
+      service: { locators },
+    } = urlServiceTestSetup();
+
+    expect(locators.get(testLocator.id)).toBe(undefined);
+  });
+
+  test('can register a locator', () => {
+    const {
+      service: { locators },
+    } = urlServiceTestSetup();
+
+    locators.create(testLocator);
+    expect(typeof locators.get(testLocator.id)).toBe('object');
+  });
+
+  test('getLocation() returns KibanaLocation generated by the locator', async () => {
+    const {
+      service: { locators },
+    } = urlServiceTestSetup();
+
+    locators.create(testLocator);
+
+    const locator = locators.get<TestLocatorState>(testLocator.id);
+    const location = await locator?.getLocation({
+      savedObjectId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+      pageNumber: 21,
+      showFlyout: true,
+    });
+
+    expect(location).toEqual({
+      app: 'test_app',
+      route: '/my-object/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx?page=21',
+      state: { isFlyoutOpen: true },
+    });
+  });
+
+  describe('.navigate()', () => {
+    test('throws if navigation method is not implemented', async () => {
+      const {
+        service: { locators },
+      } = urlServiceTestSetup();
+      const locator = locators.create(testLocator);
+      const [, error] = await of(
+        locator.navigate({
+          pageNumber: 1,
+          savedObjectId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+          showFlyout: false,
+        })
+      );
+
+      expect(error).toBeInstanceOf(Error);
+      expect(error.message).toBe('not implemented');
+    });
+
+    test('navigates user when .navigate() method is called', async () => {
+      const {
+        service: { locators },
+        deps,
+      } = urlServiceTestSetup({
+        navigate: jest.fn(async () => {}),
+      });
+      const locator = locators.create(testLocator);
+      const [, error] = await of(
+        locator.navigate({
+          pageNumber: 1,
+          savedObjectId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+          showFlyout: false,
+        })
+      );
+
+      expect(error).toBe(undefined);
+      expect(deps.navigate).toHaveBeenCalledTimes(1);
+      expect(deps.navigate).toHaveBeenCalledWith(
+        {
+          app: 'test_app',
+          route: '/my-object/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx?page=1',
+          state: {
+            isFlyoutOpen: false,
+          },
+        },
+        { replace: false }
+      );
+    });
+
+    test('can specify "replace" navigation parameter', async () => {
+      const {
+        service: { locators },
+        deps,
+      } = urlServiceTestSetup({
+        navigate: jest.fn(async () => {}),
+      });
+      const locator = locators.create(testLocator);
+
+      await locator.navigate(
+        {
+          pageNumber: 1,
+          savedObjectId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+          showFlyout: false,
+        },
+        {
+          replace: false,
+        }
+      );
+
+      expect(deps.navigate).toHaveBeenCalledTimes(1);
+      expect(deps.navigate).toHaveBeenCalledWith(
+        {
+          app: 'test_app',
+          route: '/my-object/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx?page=1',
+          state: {
+            isFlyoutOpen: false,
+          },
+        },
+        { replace: false }
+      );
+
+      await locator.navigate(
+        {
+          pageNumber: 2,
+          savedObjectId: 'xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx',
+          showFlyout: false,
+        },
+        {
+          replace: true,
+        }
+      );
+
+      expect(deps.navigate).toHaveBeenCalledTimes(2);
+      expect(deps.navigate).toHaveBeenCalledWith(
+        {
+          app: 'test_app',
+          route: '/my-object/xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx?page=2',
+          state: {
+            isFlyoutOpen: false,
+          },
+        },
+        { replace: true }
+      );
+    });
+  });
+});
diff --git a/src/plugins/share/common/url_service/__tests__/setup.ts b/src/plugins/share/common/url_service/__tests__/setup.ts
new file mode 100644
index 0000000000000..ad13bb8d8d216
--- /dev/null
+++ b/src/plugins/share/common/url_service/__tests__/setup.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 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 { SerializableState } from 'src/plugins/kibana_utils/common';
+import { LocatorDefinition } from '../locators';
+import { UrlService, UrlServiceDependencies } from '../url_service';
+
+export interface TestLocatorState extends SerializableState {
+  savedObjectId: string;
+  showFlyout: boolean;
+  pageNumber: number;
+}
+
+export const testLocator: LocatorDefinition<TestLocatorState> = {
+  id: 'TEST_LOCATOR',
+  getLocation: async ({ savedObjectId, pageNumber, showFlyout }) => {
+    return {
+      app: 'test_app',
+      route: `/my-object/${savedObjectId}?page=${pageNumber}`,
+      state: {
+        isFlyoutOpen: showFlyout,
+      },
+    };
+  },
+};
+
+export const urlServiceTestSetup = (partialDeps: Partial<UrlServiceDependencies> = {}) => {
+  const deps: UrlServiceDependencies = {
+    navigate: async () => {
+      throw new Error('not implemented');
+    },
+    ...partialDeps,
+  };
+  const service = new UrlService(deps);
+
+  return { service, deps };
+};
diff --git a/src/plugins/share/common/url_service/index.ts b/src/plugins/share/common/url_service/index.ts
new file mode 100644
index 0000000000000..84f74356bcf18
--- /dev/null
+++ b/src/plugins/share/common/url_service/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 * from './url_service';
+export * from './locators';
diff --git a/src/plugins/share/common/url_service/locators/index.ts b/src/plugins/share/common/url_service/locators/index.ts
new file mode 100644
index 0000000000000..f9f87215eb4db
--- /dev/null
+++ b/src/plugins/share/common/url_service/locators/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 './types';
+export * from './locator';
+export * from './locator_client';
diff --git a/src/plugins/share/common/url_service/locators/locator.ts b/src/plugins/share/common/url_service/locators/locator.ts
new file mode 100644
index 0000000000000..68c3b05a7f411
--- /dev/null
+++ b/src/plugins/share/common/url_service/locators/locator.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 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 { SavedObjectReference } from 'kibana/server';
+import type { PersistableState, SerializableState } from 'src/plugins/kibana_utils/common';
+import type {
+  LocatorDefinition,
+  LocatorPublic,
+  KibanaLocation,
+  LocatorNavigationParams,
+} from './types';
+
+export interface LocatorDependencies {
+  navigate: (location: KibanaLocation, params?: LocatorNavigationParams) => Promise<void>;
+}
+
+export class Locator<P extends SerializableState> implements PersistableState<P>, LocatorPublic<P> {
+  public readonly migrations: PersistableState<P>['migrations'];
+
+  constructor(
+    public readonly definition: LocatorDefinition<P>,
+    protected readonly deps: LocatorDependencies
+  ) {
+    this.migrations = definition.migrations || {};
+  }
+
+  // PersistableState<P> -------------------------------------------------------
+
+  public readonly telemetry: PersistableState<P>['telemetry'] = (
+    state: P,
+    stats: Record<string, any>
+  ): Record<string, any> => {
+    return this.definition.telemetry ? this.definition.telemetry(state, stats) : stats;
+  };
+
+  public readonly inject: PersistableState<P>['inject'] = (
+    state: P,
+    references: SavedObjectReference[]
+  ): P => {
+    return this.definition.inject ? this.definition.inject(state, references) : state;
+  };
+
+  public readonly extract: PersistableState<P>['extract'] = (
+    state: P
+  ): { state: P; references: SavedObjectReference[] } => {
+    return this.definition.extract ? this.definition.extract(state) : { state, references: [] };
+  };
+
+  // LocatorPublic<P> ----------------------------------------------------------
+
+  public async getLocation(params: P): Promise<KibanaLocation> {
+    return await this.definition.getLocation(params);
+  }
+
+  public async navigate(
+    params: P,
+    { replace = false }: LocatorNavigationParams = {}
+  ): Promise<void> {
+    const location = await this.getLocation(params);
+    await this.deps.navigate(location, {
+      replace,
+    });
+  }
+}
diff --git a/src/plugins/share/common/url_service/locators/locator_client.ts b/src/plugins/share/common/url_service/locators/locator_client.ts
new file mode 100644
index 0000000000000..168cc02d03ff1
--- /dev/null
+++ b/src/plugins/share/common/url_service/locators/locator_client.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 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 { SerializableState } from 'src/plugins/kibana_utils/common';
+import type { LocatorDependencies } from './locator';
+import type { LocatorDefinition, LocatorPublic, ILocatorClient } from './types';
+import { Locator } from './locator';
+
+export type LocatorClientDependencies = LocatorDependencies;
+
+export class LocatorClient implements ILocatorClient {
+  /**
+   * Collection of registered locators.
+   */
+  protected locators: Map<string, Locator<any>> = new Map();
+
+  constructor(protected readonly deps: LocatorClientDependencies) {}
+
+  /**
+   * Creates and register a URL locator.
+   *
+   * @param definition A definition of URL locator.
+   * @returns A public interface of URL locator.
+   */
+  public create<P extends SerializableState>(definition: LocatorDefinition<P>): LocatorPublic<P> {
+    const locator = new Locator<P>(definition, this.deps);
+
+    this.locators.set(definition.id, locator);
+
+    return locator;
+  }
+
+  /**
+   * Returns a previously registered URL locator.
+   *
+   * @param id ID of a URL locator.
+   * @returns A public interface of a registered URL locator.
+   */
+  public get<P>(id: string): undefined | LocatorPublic<P> {
+    return this.locators.get(id);
+  }
+}
diff --git a/src/plugins/share/common/url_service/locators/types.ts b/src/plugins/share/common/url_service/locators/types.ts
new file mode 100644
index 0000000000000..d811ae0fd4aa2
--- /dev/null
+++ b/src/plugins/share/common/url_service/locators/types.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { PersistableState, SerializableState } from 'src/plugins/kibana_utils/common';
+
+/**
+ * URL locator registry.
+ */
+export interface ILocatorClient {
+  /**
+   * Create and register a new locator.
+   *
+   * @param urlGenerator Definition of the new locator.
+   */
+  create<P extends SerializableState>(locatorDefinition: LocatorDefinition<P>): LocatorPublic<P>;
+
+  /**
+   * Retrieve a previously registered locator.
+   *
+   * @param id Unique ID of the locator.
+   */
+  get<P>(id: string): undefined | LocatorPublic<P>;
+}
+
+/**
+ * A convenience interface used to define and register a locator.
+ */
+export interface LocatorDefinition<P extends SerializableState>
+  extends Partial<PersistableState<P>> {
+  /**
+   * Unique ID of the locator. Should be constant and unique across Kibana.
+   */
+  id: string;
+
+  /**
+   * Returns a deep link, including location state, which can be used for
+   * navigation in Kibana.
+   *
+   * @param params Parameters from which to generate a Kibana location.
+   */
+  getLocation(params: P): Promise<KibanaLocation>;
+}
+
+/**
+ * Public interface of a registered locator.
+ */
+export interface LocatorPublic<P> {
+  /**
+   * Returns a relative URL to the client-side redirect endpoint using this
+   * locator. (This method is necessary for compatibility with URL generators.)
+   */
+  getLocation(params: P): Promise<KibanaLocation>;
+
+  /**
+   * Navigate using the `core.application.navigateToApp()` method to a Kibana
+   * location generated by this locator. This method is available only on the
+   * browser.
+   */
+  navigate(params: P, navigationParams?: LocatorNavigationParams): Promise<void>;
+}
+
+export interface LocatorNavigationParams {
+  replace?: boolean;
+}
+
+/**
+ * This interface represents a location in Kibana to which one can navigate
+ * using the `core.application.navigateToApp()` method.
+ */
+export interface KibanaLocation<S = object> {
+  /**
+   * Kibana application ID.
+   */
+  app: string;
+
+  /**
+   * A URL route within a Kibana application.
+   */
+  route: string;
+
+  /**
+   * A serializable location state object, which the app can use to determine
+   * what should be displayed on the screen.
+   */
+  state: S;
+}
diff --git a/src/plugins/share/common/url_service/url_service.ts b/src/plugins/share/common/url_service/url_service.ts
new file mode 100644
index 0000000000000..0c3a0aabb750b
--- /dev/null
+++ b/src/plugins/share/common/url_service/url_service.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 { LocatorClient, LocatorClientDependencies } from './locators';
+
+export type UrlServiceDependencies = LocatorClientDependencies;
+
+/**
+ * Common URL Service client interface for server-side and client-side.
+ */
+export class UrlService {
+  /**
+   * Client to work with locators.
+   */
+  locators: LocatorClient = new LocatorClient(this.deps);
+
+  constructor(protected readonly deps: UrlServiceDependencies) {}
+}
diff --git a/src/plugins/share/public/plugin.ts b/src/plugins/share/public/plugin.ts
index 14d74e055cbd9..eb7c46cdaef86 100644
--- a/src/plugins/share/public/plugin.ts
+++ b/src/plugins/share/public/plugin.ts
@@ -18,6 +18,7 @@ import {
   UrlGeneratorsSetup,
   UrlGeneratorsStart,
 } from './url_generators/url_generator_service';
+import { UrlService } from '../common/url_service';
 
 export interface ShareSetupDependencies {
   securityOss?: SecurityOssPluginSetup;
@@ -27,16 +28,60 @@ export interface ShareStartDependencies {
   securityOss?: SecurityOssPluginStart;
 }
 
+/** @public */
+export type SharePluginSetup = ShareMenuRegistrySetup & {
+  /**
+   * @deprecated
+   *
+   * URL Generators are deprecated use UrlService instead.
+   */
+  urlGenerators: UrlGeneratorsSetup;
+
+  /**
+   * Utilities to work with URL locators and short URLs.
+   */
+  url: UrlService;
+};
+
+/** @public */
+export type SharePluginStart = ShareMenuManagerStart & {
+  /**
+   * @deprecated
+   *
+   * URL Generators are deprecated use UrlService instead.
+   */
+  urlGenerators: UrlGeneratorsStart;
+
+  /**
+   * Utilities to work with URL locators and short URLs.
+   */
+  url: UrlService;
+};
+
 export class SharePlugin implements Plugin<SharePluginSetup, SharePluginStart> {
   private readonly shareMenuRegistry = new ShareMenuRegistry();
   private readonly shareContextMenu = new ShareMenuManager();
   private readonly urlGeneratorsService = new UrlGeneratorsService();
+  private url?: UrlService;
 
   public setup(core: CoreSetup, plugins: ShareSetupDependencies): SharePluginSetup {
     core.application.register(createShortUrlRedirectApp(core, window.location));
+
+    this.url = new UrlService({
+      navigate: async (location, { replace = false } = {}) => {
+        const [start] = await core.getStartServices();
+        await start.application.navigateToApp(location.app, {
+          path: location.route,
+          state: location.state,
+          replace,
+        });
+      },
+    });
+
     return {
       ...this.shareMenuRegistry.setup(),
       urlGenerators: this.urlGeneratorsService.setup(core),
+      url: this.url,
     };
   }
 
@@ -48,16 +93,7 @@ export class SharePlugin implements Plugin<SharePluginSetup, SharePluginStart> {
         plugins.securityOss?.anonymousAccess
       ),
       urlGenerators: this.urlGeneratorsService.start(core),
+      url: this.url!,
     };
   }
 }
-
-/** @public */
-export type SharePluginSetup = ShareMenuRegistrySetup & {
-  urlGenerators: UrlGeneratorsSetup;
-};
-
-/** @public */
-export type SharePluginStart = ShareMenuManagerStart & {
-  urlGenerators: UrlGeneratorsStart;
-};
diff --git a/src/plugins/share/public/url_generators/README.md b/src/plugins/share/public/url_generators/README.md
index 39ee5f2901e91..f948354aad959 100644
--- a/src/plugins/share/public/url_generators/README.md
+++ b/src/plugins/share/public/url_generators/README.md
@@ -1,3 +1,9 @@
+# URL Generators are deprecated
+
+__Below is documentation of URL Generators, which are now deprecated and will be removed in favor of URL locators in 7.14.__
+
+---
+
 ## URL Generator Services
 
 Developers who maintain pages in Kibana that other developers may want to link to
diff --git a/src/plugins/share/public/url_generators/url_generator_service.ts b/src/plugins/share/public/url_generators/url_generator_service.ts
index 982f0692102df..5a8e7a1b5c17a 100644
--- a/src/plugins/share/public/url_generators/url_generator_service.ts
+++ b/src/plugins/share/public/url_generators/url_generator_service.ts
@@ -13,10 +13,20 @@ import { UrlGeneratorInternal } from './url_generator_internal';
 import { UrlGeneratorContract } from './url_generator_contract';
 
 export interface UrlGeneratorsStart {
+  /**
+   * @deprecated
+   *
+   * URL Generators are deprecated, use URL locators in UrlService instead.
+   */
   getUrlGenerator: <T extends UrlGeneratorId>(urlGeneratorId: T) => UrlGeneratorContract<T>;
 }
 
 export interface UrlGeneratorsSetup {
+  /**
+   * @deprecated
+   *
+   * URL Generators are deprecated, use URL locators in UrlService instead.
+   */
   registerUrlGenerator: <Id extends UrlGeneratorId>(
     generator: UrlGeneratorsDefinition<Id>
   ) => UrlGeneratorContract<Id>;
diff --git a/src/plugins/share/server/plugin.ts b/src/plugins/share/server/plugin.ts
index 744a4148215c3..6e3c68935f77b 100644
--- a/src/plugins/share/server/plugin.ts
+++ b/src/plugins/share/server/plugin.ts
@@ -12,11 +12,30 @@ import { CoreSetup, Plugin, PluginInitializerContext } from 'kibana/server';
 import { createRoutes } from './routes/create_routes';
 import { url } from './saved_objects';
 import { CSV_SEPARATOR_SETTING, CSV_QUOTE_VALUES_SETTING } from '../common/constants';
+import { UrlService } from '../common/url_service';
+
+/** @public */
+export interface SharePluginSetup {
+  url: UrlService;
+}
+
+/** @public */
+export interface SharePluginStart {
+  url: UrlService;
+}
+
+export class SharePlugin implements Plugin<SharePluginSetup, SharePluginStart> {
+  private url?: UrlService;
 
-export class SharePlugin implements Plugin {
   constructor(private readonly initializerContext: PluginInitializerContext) {}
 
   public setup(core: CoreSetup) {
+    this.url = new UrlService({
+      navigate: async () => {
+        throw new Error('Locator .navigate() does not work on server.');
+      },
+    });
+
     createRoutes(core, this.initializerContext.logger.get());
     core.savedObjects.registerType(url);
     core.uiSettings.register({
@@ -41,10 +60,18 @@ export class SharePlugin implements Plugin {
         schema: schema.boolean(),
       },
     });
+
+    return {
+      url: this.url,
+    };
   }
 
   public start() {
     this.initializerContext.logger.get().debug('Starting plugin');
+
+    return {
+      url: this.url!,
+    };
   }
 
   public stop() {
diff --git a/src/plugins/telemetry/kibana.json b/src/plugins/telemetry/kibana.json
index 520ca6076dbbd..a9895ba2e5e9c 100644
--- a/src/plugins/telemetry/kibana.json
+++ b/src/plugins/telemetry/kibana.json
@@ -3,15 +3,7 @@
   "version": "kibana",
   "server": true,
   "ui": true,
-  "requiredPlugins": [
-    "telemetryCollectionManager",
-    "usageCollection"
-  ],
-  "extraPublicDirs": [
-    "common/constants"
-  ],
-  "requiredBundles": [
-    "kibanaUtils",
-    "kibanaReact"
-  ]
+  "requiredPlugins": ["telemetryCollectionManager", "usageCollection", "screenshotMode"],
+  "extraPublicDirs": ["common/constants"],
+  "requiredBundles": ["kibanaUtils", "kibanaReact"]
 }
diff --git a/src/plugins/telemetry/public/mocks.ts b/src/plugins/telemetry/public/mocks.ts
index 34063e6486041..418aeace77c70 100644
--- a/src/plugins/telemetry/public/mocks.ts
+++ b/src/plugins/telemetry/public/mocks.ts
@@ -22,12 +22,14 @@ import { TelemetryPluginStart, TelemetryPluginSetup, TelemetryPluginConfig } fro
 export interface TelemetryServiceMockOptions {
   reportOptInStatusChange?: boolean;
   currentKibanaVersion?: string;
+  isScreenshotMode?: boolean;
   config?: Partial<TelemetryPluginConfig>;
 }
 
 export function mockTelemetryService({
   reportOptInStatusChange,
   currentKibanaVersion = 'mockKibanaVersion',
+  isScreenshotMode = false,
   config: configOverride = {},
 }: TelemetryServiceMockOptions = {}) {
   const config = {
@@ -47,6 +49,7 @@ export function mockTelemetryService({
     config,
     http: httpServiceMock.createStartContract(),
     notifications: notificationServiceMock.createStartContract(),
+    isScreenshotMode,
     currentKibanaVersion,
     reportOptInStatusChange,
   });
diff --git a/src/plugins/telemetry/public/plugin.ts b/src/plugins/telemetry/public/plugin.ts
index 5e85fa7ea2d51..04fabe3d62b17 100644
--- a/src/plugins/telemetry/public/plugin.ts
+++ b/src/plugins/telemetry/public/plugin.ts
@@ -17,6 +17,8 @@ import type {
   ApplicationStart,
 } from 'src/core/public';
 
+import type { ScreenshotModePluginSetup } from 'src/plugins/screenshot_mode/public';
+
 import { TelemetrySender, TelemetryService, TelemetryNotifications } from './services';
 import type {
   TelemetrySavedObjectAttributes,
@@ -38,6 +40,8 @@ export interface TelemetryServicePublicApis {
   getIsOptedIn: () => boolean | null;
   /** Is the user allowed to change the opt-in/out status? **/
   userCanChangeSettings: boolean;
+  /** Can phone-home telemetry calls be made? This depends on whether we have opted-in or if we are rendering a report */
+  canSendTelemetry: () => boolean;
   /** Is the cluster allowed to change the opt-in/out status? **/
   getCanChangeOptInStatus: () => boolean;
   /** Fetches an unencrypted telemetry payload so we can show it to the user **/
@@ -76,6 +80,10 @@ export interface TelemetryPluginStart {
   };
 }
 
+interface TelemetryPluginSetupDependencies {
+  screenshotMode: ScreenshotModePluginSetup;
+}
+
 /**
  * Public-exposed configuration
  */
@@ -113,11 +121,15 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
     this.config = initializerContext.config.get();
   }
 
-  public setup({ http, notifications }: CoreSetup): TelemetryPluginSetup {
+  public setup(
+    { http, notifications }: CoreSetup,
+    { screenshotMode }: TelemetryPluginSetupDependencies
+  ): TelemetryPluginSetup {
     const config = this.config;
     const currentKibanaVersion = this.currentKibanaVersion;
     this.telemetryService = new TelemetryService({
       config,
+      isScreenshotMode: screenshotMode.isScreenshotMode(),
       http,
       notifications,
       currentKibanaVersion,
@@ -181,6 +193,7 @@ export class TelemetryPlugin implements Plugin<TelemetryPluginSetup, TelemetryPl
     return {
       getIsOptedIn: () => telemetryService.getIsOptedIn(),
       setOptIn: (optedIn) => telemetryService.setOptIn(optedIn),
+      canSendTelemetry: () => telemetryService.canSendTelemetry(),
       userCanChangeSettings: telemetryService.userCanChangeSettings,
       getCanChangeOptInStatus: () => telemetryService.getCanChangeOptInStatus(),
       fetchExample: () => telemetryService.fetchExample(),
diff --git a/src/plugins/telemetry/public/services/telemetry_sender.test.ts b/src/plugins/telemetry/public/services/telemetry_sender.test.ts
index 4dd1fe37a7569..6459f15fc60f7 100644
--- a/src/plugins/telemetry/public/services/telemetry_sender.test.ts
+++ b/src/plugins/telemetry/public/services/telemetry_sender.test.ts
@@ -118,6 +118,16 @@ describe('TelemetrySender', () => {
       expect(shouldSendReport).toBe(true);
     });
 
+    it('returns false if we are in screenshot mode', () => {
+      const telemetryService = mockTelemetryService({ isScreenshotMode: true });
+      telemetryService.getIsOptedIn = jest.fn().mockReturnValue(false);
+      const telemetrySender = new TelemetrySender(telemetryService);
+      const shouldSendReport = telemetrySender['shouldSendReport']();
+
+      expect(telemetryService.getIsOptedIn).toBeCalledTimes(0);
+      expect(shouldSendReport).toBe(false);
+    });
+
     describe('sendIfDue', () => {
       let originalFetch: typeof window['fetch'];
       let mockFetch: jest.Mock<typeof window['fetch']>;
@@ -151,6 +161,15 @@ describe('TelemetrySender', () => {
         expect(mockFetch).toBeCalledTimes(0);
       });
 
+      it('does not send if we are in screenshot mode', async () => {
+        const telemetryService = mockTelemetryService({ isScreenshotMode: true });
+        const telemetrySender = new TelemetrySender(telemetryService);
+        telemetrySender['isSending'] = false;
+        await telemetrySender['sendIfDue']();
+
+        expect(mockFetch).toBeCalledTimes(0);
+      });
+
       it('sends report if due', async () => {
         const mockTelemetryUrl = 'telemetry_cluster_url';
         const mockTelemetryPayload = ['hashed_cluster_usage_data1'];
diff --git a/src/plugins/telemetry/public/services/telemetry_sender.ts b/src/plugins/telemetry/public/services/telemetry_sender.ts
index 937416d283872..fa97334495122 100644
--- a/src/plugins/telemetry/public/services/telemetry_sender.ts
+++ b/src/plugins/telemetry/public/services/telemetry_sender.ts
@@ -33,8 +33,7 @@ export class TelemetrySender {
   };
 
   private shouldSendReport = (): boolean => {
-    // check if opt-in for telemetry is enabled
-    if (this.telemetryService.getIsOptedIn()) {
+    if (this.telemetryService.canSendTelemetry()) {
       if (!this.lastReported) {
         return true;
       }
diff --git a/src/plugins/telemetry/public/services/telemetry_service.test.ts b/src/plugins/telemetry/public/services/telemetry_service.test.ts
index c06352208651a..94630c0cb8d80 100644
--- a/src/plugins/telemetry/public/services/telemetry_service.test.ts
+++ b/src/plugins/telemetry/public/services/telemetry_service.test.ts
@@ -256,4 +256,24 @@ describe('TelemetryService', () => {
       expect(mockFetch).toHaveBeenCalledTimes(1);
     });
   });
+
+  describe('canSendTelemetry', () => {
+    it('does not send telemetry if screenshotMode is true', () => {
+      const telemetryService = mockTelemetryService({
+        isScreenshotMode: true,
+        config: { optIn: true },
+      });
+
+      expect(telemetryService.canSendTelemetry()).toBe(false);
+    });
+
+    it('does send telemetry if screenshotMode is false and we are opted in', () => {
+      const telemetryService = mockTelemetryService({
+        isScreenshotMode: false,
+        config: { optIn: true },
+      });
+
+      expect(telemetryService.canSendTelemetry()).toBe(true);
+    });
+  });
 });
diff --git a/src/plugins/telemetry/public/services/telemetry_service.ts b/src/plugins/telemetry/public/services/telemetry_service.ts
index 4ae2956902092..515d2039a4a11 100644
--- a/src/plugins/telemetry/public/services/telemetry_service.ts
+++ b/src/plugins/telemetry/public/services/telemetry_service.ts
@@ -14,6 +14,7 @@ interface TelemetryServiceConstructor {
   config: TelemetryPluginConfig;
   http: CoreStart['http'];
   notifications: CoreStart['notifications'];
+  isScreenshotMode: boolean;
   currentKibanaVersion: string;
   reportOptInStatusChange?: boolean;
 }
@@ -27,6 +28,7 @@ export class TelemetryService {
   private readonly reportOptInStatusChange: boolean;
   private readonly notifications: CoreStart['notifications'];
   private readonly defaultConfig: TelemetryPluginConfig;
+  private readonly isScreenshotMode: boolean;
   private updatedConfig?: TelemetryPluginConfig;
 
   /** Current version of Kibana */
@@ -35,11 +37,13 @@ export class TelemetryService {
   constructor({
     config,
     http,
+    isScreenshotMode,
     notifications,
     currentKibanaVersion,
     reportOptInStatusChange = true,
   }: TelemetryServiceConstructor) {
     this.defaultConfig = config;
+    this.isScreenshotMode = isScreenshotMode;
     this.reportOptInStatusChange = reportOptInStatusChange;
     this.notifications = notifications;
     this.currentKibanaVersion = currentKibanaVersion;
@@ -63,7 +67,7 @@ export class TelemetryService {
 
   /** Is the cluster opted-in to telemetry **/
   public get isOptedIn() {
-    return this.config.optIn;
+    return Boolean(this.config.optIn);
   }
 
   /** Changes the opt-in status **/
@@ -122,10 +126,15 @@ export class TelemetryService {
   }
 
   /** Is the cluster opted-in to telemetry **/
-  public getIsOptedIn = () => {
+  public getIsOptedIn = (): boolean => {
     return this.isOptedIn;
   };
 
+  /** Are there any blockers for sending telemetry */
+  public canSendTelemetry = (): boolean => {
+    return !this.isScreenshotMode && this.getIsOptedIn();
+  };
+
   /** Fetches an unencrypted telemetry payload so we can show it to the user **/
   public fetchExample = async () => {
     return await this.fetchTelemetry({ unencrypted: true });
diff --git a/src/plugins/telemetry/schema/oss_plugins.json b/src/plugins/telemetry/schema/oss_plugins.json
index 693957057f108..7b6c4ba9788f1 100644
--- a/src/plugins/telemetry/schema/oss_plugins.json
+++ b/src/plugins/telemetry/schema/oss_plugins.json
@@ -11,14 +11,30 @@
         "lensByValue": {
           "properties": {
             "DYNAMIC_KEY": {
-              "type": "long"
+              "type": "long",
+              "_meta": {
+                "description": "Collection of telemetry metrics for Lens visualizations, which are added to dashboard by \"value\"."
+              }
             }
           }
         },
         "visualizationByValue": {
           "properties": {
             "DYNAMIC_KEY": {
-              "type": "long"
+              "type": "long",
+              "_meta": {
+                "description": "Collection of telemetry metrics for visualizations, which are added to dashboard by \"value\"."
+              }
+            }
+          }
+        },
+        "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."
+              }
             }
           }
         }
@@ -3168,6 +3184,137 @@
             }
           }
         },
+        "integrations": {
+          "properties": {
+            "appId": {
+              "type": "keyword",
+              "_meta": {
+                "description": "The application being tracked"
+              }
+            },
+            "viewId": {
+              "type": "keyword",
+              "_meta": {
+                "description": "Always `main`"
+              }
+            },
+            "clicks_total": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application since we started counting them"
+              }
+            },
+            "clicks_7_days": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application over the last 7 days"
+              }
+            },
+            "clicks_30_days": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application over the last 30 days"
+              }
+            },
+            "clicks_90_days": {
+              "type": "long",
+              "_meta": {
+                "description": "General number of clicks in the application over the last 90 days"
+              }
+            },
+            "minutes_on_screen_total": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen since we started counting them."
+              }
+            },
+            "minutes_on_screen_7_days": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen over the last 7 days"
+              }
+            },
+            "minutes_on_screen_30_days": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen over the last 30 days"
+              }
+            },
+            "minutes_on_screen_90_days": {
+              "type": "float",
+              "_meta": {
+                "description": "Minutes the application is active and on-screen over the last 90 days"
+              }
+            },
+            "views": {
+              "type": "array",
+              "items": {
+                "properties": {
+                  "appId": {
+                    "type": "keyword",
+                    "_meta": {
+                      "description": "The application being tracked"
+                    }
+                  },
+                  "viewId": {
+                    "type": "keyword",
+                    "_meta": {
+                      "description": "The application view being tracked"
+                    }
+                  },
+                  "clicks_total": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the application sub view since we started counting them"
+                    }
+                  },
+                  "clicks_7_days": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the active application sub view over the last 7 days"
+                    }
+                  },
+                  "clicks_30_days": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the active application sub view over the last 30 days"
+                    }
+                  },
+                  "clicks_90_days": {
+                    "type": "long",
+                    "_meta": {
+                      "description": "General number of clicks in the active application sub view over the last 90 days"
+                    }
+                  },
+                  "minutes_on_screen_total": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application sub view is active and on-screen since we started counting them."
+                    }
+                  },
+                  "minutes_on_screen_7_days": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application is active and on-screen active application sub view over the last 7 days"
+                    }
+                  },
+                  "minutes_on_screen_30_days": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application is active and on-screen active application sub view over the last 30 days"
+                    }
+                  },
+                  "minutes_on_screen_90_days": {
+                    "type": "float",
+                    "_meta": {
+                      "description": "Minutes the application is active and on-screen active application sub view over the last 90 days"
+                    }
+                  }
+                }
+              }
+            }
+          }
+        },
         "ingestManager": {
           "properties": {
             "appId": {
@@ -8217,6 +8364,12 @@
             "description": "Non-default value of setting."
           }
         },
+        "bfetch:disableCompression": {
+          "type": "boolean",
+          "_meta": {
+            "description": "Non-default value of setting."
+          }
+        },
         "visualization:visualize:legacyChartsLibrary": {
           "type": "boolean",
           "_meta": {
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 7fd6ca4080d6a..bacfa5e77107f 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
@@ -188,7 +188,7 @@ describe('get_local_stats', () => {
   describe('handleLocalStats', () => {
     it('returns expected object without xpack or kibana data', () => {
       const result = handleLocalStats(
-        clusterInfo as estypes.RootNodeInfoResponse,
+        clusterInfo as estypes.InfoResponse,
         clusterStatsWithNodesUsage,
         void 0,
         void 0,
@@ -205,7 +205,7 @@ describe('get_local_stats', () => {
 
     it('returns expected object with xpack', () => {
       const result = handleLocalStats(
-        clusterInfo as estypes.RootNodeInfoResponse,
+        clusterInfo as estypes.InfoResponse,
         clusterStatsWithNodesUsage,
         void 0,
         void 0,
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 7fdcb50b704af..7860949e098aa 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_local_stats.ts
@@ -28,7 +28,7 @@ import { getDataTelemetry, DATA_TELEMETRY_ID, DataTelemetryPayload } from './get
  */
 export function handleLocalStats<ClusterStats extends estypes.ClusterStatsResponse>(
   // eslint-disable-next-line @typescript-eslint/naming-convention
-  { cluster_name, cluster_uuid, version }: estypes.RootNodeInfoResponse,
+  { cluster_name, cluster_uuid, version }: estypes.InfoResponse,
   { _nodes, cluster_name: clusterName, ...clusterStats }: ClusterStats,
   kibana: KibanaUsageStats | undefined,
   dataTelemetry: DataTelemetryPayload | undefined,
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 c35b8a3d24498..0d58d80ed5965 100644
--- a/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
+++ b/src/plugins/telemetry/server/telemetry_collection/get_nodes_usage.ts
@@ -14,7 +14,7 @@ import { TIMEOUT } from './constants';
  * Data returned by GET /_nodes/usage, but flattened as an array of {@link estypes.NodeUsageInformation}
  * with the node ID set in the field `node_id`.
  */
-export interface NodeUsage extends estypes.NodeUsageInformation {
+export interface NodeUsage extends estypes.NodesUsageNodeUsage {
   /**
    * The Node ID as reported by ES
    */
diff --git a/src/plugins/telemetry/tsconfig.json b/src/plugins/telemetry/tsconfig.json
index 6629e479906c9..710e209537b8e 100644
--- a/src/plugins/telemetry/tsconfig.json
+++ b/src/plugins/telemetry/tsconfig.json
@@ -12,13 +12,16 @@
     "public/**/**/*",
     "server/**/**/*",
     "common/**/*",
-    "../../../typings/**/*"
+    "../../../typings/**/*",
+    "schema/oss_plugins.json",
+    "schema/oss_root.json",
   ],
   "references": [
     { "path": "../../core/tsconfig.json" },
-    { "path": "../../plugins/usage_collection/tsconfig.json" },
-    { "path": "../../plugins/telemetry_collection_manager/tsconfig.json" },
+    { "path": "../../plugins/kibana_react/tsconfig.json" },
     { "path": "../../plugins/kibana_utils/tsconfig.json" },
-    { "path": "../../plugins/kibana_react/tsconfig.json" }
+    { "path": "../../plugins/screenshot_mode/tsconfig.json" },
+    { "path": "../../plugins/telemetry_collection_manager/tsconfig.json" },
+    { "path": "../../plugins/usage_collection/tsconfig.json" }
   ]
 }
diff --git a/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap b/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap
index e0ba7e7527af7..c4cee25a33b7f 100644
--- a/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap
+++ b/src/plugins/telemetry_management_section/public/components/__snapshots__/telemetry_management_section.test.tsx.snap
@@ -306,6 +306,7 @@ exports[`TelemetryManagementSectionComponent renders null because allowChangingO
   showAppliesSettingMessage={true}
   telemetryService={
     TelemetryService {
+      "canSendTelemetry": [Function],
       "currentKibanaVersion": "mock_kibana_version",
       "defaultConfig": Object {
         "allowChangingOptInStatus": false,
@@ -350,6 +351,7 @@ exports[`TelemetryManagementSectionComponent renders null because allowChangingO
         "post": [MockFunction],
         "put": [MockFunction],
       },
+      "isScreenshotMode": false,
       "notifications": Object {
         "toasts": Object {
           "add": [MockFunction],
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 019dedd793fa2..fe6f8e254142b 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
@@ -32,6 +32,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       currentKibanaVersion: 'mock_kibana_version',
       notifications: coreStart.notifications,
@@ -66,6 +67,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       notifications: coreStart.notifications,
       currentKibanaVersion: 'mock_kibana_version',
@@ -121,6 +123,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       notifications: coreStart.notifications,
       currentKibanaVersion: 'mock_kibana_version',
@@ -169,6 +172,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       notifications: coreStart.notifications,
       currentKibanaVersion: 'mock_kibana_version',
@@ -208,6 +212,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       notifications: coreStart.notifications,
       currentKibanaVersion: 'mock_kibana_version',
@@ -248,6 +253,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       notifications: coreStart.notifications,
       currentKibanaVersion: 'mock_kibana_version',
@@ -288,6 +294,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       currentKibanaVersion: 'mock_kibana_version',
       notifications: coreStart.notifications,
@@ -328,6 +335,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       notifications: coreStart.notifications,
       currentKibanaVersion: 'mock_kibana_version',
@@ -378,6 +386,7 @@ describe('TelemetryManagementSectionComponent', () => {
         optInStatusUrl: '',
         sendUsageFrom: 'browser',
       },
+      isScreenshotMode: false,
       reportOptInStatusChange: false,
       notifications: coreStart.notifications,
       currentKibanaVersion: 'mock_kibana_version',
diff --git a/src/plugins/timelion/public/components/timelion_deprecation.tsx b/src/plugins/timelion/public/components/timelion_deprecation.tsx
index efcef88b3d0a2..117aabed6773c 100644
--- a/src/plugins/timelion/public/components/timelion_deprecation.tsx
+++ b/src/plugins/timelion/public/components/timelion_deprecation.tsx
@@ -19,7 +19,7 @@ export const TimelionDeprecation = ({ links }: DocLinksStart) => {
         title={
           <FormattedMessage
             id="timelion.deprecation.message"
-            defaultMessage="Deprecated since 7.0, the Timelion app will be removed in the last 7.x minor version. To continue using your Timelion worksheets, {timeLionDeprecationLink}."
+            defaultMessage="Deprecated since 7.0, the Timelion app will be removed in 7.16. To continue using your Timelion worksheets, {timeLionDeprecationLink}."
             values={{
               timeLionDeprecationLink: (
                 <EuiLink href={timelionDeprecationLink} target="_blank" external>
diff --git a/src/plugins/timelion/server/deprecations.ts b/src/plugins/timelion/server/deprecations.ts
index e65d72cb460df..3c344e1d4a8d8 100644
--- a/src/plugins/timelion/server/deprecations.ts
+++ b/src/plugins/timelion/server/deprecations.ts
@@ -30,7 +30,7 @@ export const showWarningMessageIfTimelionSheetWasFound = async (
   const count = await getTimelionSheetsCount(savedObjectsClient);
   if (count > 0) {
     logger.warn(
-      'Deprecated since 7.0, the Timelion app will be removed in the last 7.x minor version. To continue using your Timelion worksheets, migrate them to a dashboard. See https://www.elastic.co/guide/en/kibana/current/create-panels-with-timelion.html.'
+      'Deprecated since 7.0, the Timelion app will be removed in 7.16. To continue using your Timelion worksheets, migrate them to a dashboard. See https://www.elastic.co/guide/en/kibana/current/create-panels-with-timelion.html.'
     );
   }
 };
@@ -49,7 +49,7 @@ export async function getDeprecations({
 
   if (count > 0) {
     deprecations.push({
-      message: `You have ${count} Timelion worksheets. The Timelion app will be removed in the last 7.x minor version. To continue using your Timelion worksheets, migrate them to a dashboard.`,
+      message: `You have ${count} Timelion worksheets. The Timelion app will be removed in 7.16. To continue using your Timelion worksheets, migrate them to a dashboard.`,
       documentationUrl:
         'https://www.elastic.co/guide/en/kibana/current/create-panels-with-timelion.html',
       level: 'warning',
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 fcd97de56fc65..55db880a83932 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
@@ -72,6 +72,9 @@ function getAggParamsToRender({
     if (hideCustomLabel && param.name === 'customLabel') {
       return;
     }
+    if (param.name === 'timeShift') {
+      return;
+    }
     // if field param exists, compute allowed fields
     if (param.type === 'field') {
       let availableFields: IndexPatternField[] = (param as IFieldParamType).getAvailableFields(agg);
diff --git a/src/plugins/vis_type_pie/README.md b/src/plugins/vis_type_pie/README.md
new file mode 100644
index 0000000000000..41b8131a5381d
--- /dev/null
+++ b/src/plugins/vis_type_pie/README.md
@@ -0,0 +1 @@
+Contains the pie chart implementation using the elastic-charts library. The goal is to eventually deprecate the old implementation and keep only this. Until then, the library used is defined by the Legacy charts library advanced setting.
\ No newline at end of file
diff --git a/src/plugins/vis_type_pie/common/index.ts b/src/plugins/vis_type_pie/common/index.ts
new file mode 100644
index 0000000000000..1aa1680530b32
--- /dev/null
+++ b/src/plugins/vis_type_pie/common/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 const DEFAULT_PERCENT_DECIMALS = 2;
diff --git a/src/plugins/vis_type_pie/jest.config.js b/src/plugins/vis_type_pie/jest.config.js
new file mode 100644
index 0000000000000..e4900ef4a35c8
--- /dev/null
+++ b/src/plugins/vis_type_pie/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>/src/plugins/vis_type_pie'],
+};
diff --git a/src/plugins/vis_type_pie/kibana.json b/src/plugins/vis_type_pie/kibana.json
new file mode 100644
index 0000000000000..c2d51fba8260d
--- /dev/null
+++ b/src/plugins/vis_type_pie/kibana.json
@@ -0,0 +1,8 @@
+{
+    "id": "visTypePie",
+    "version": "kibana",
+    "ui": true,
+    "requiredPlugins": ["charts", "data", "expressions", "visualizations", "usageCollection"],
+    "requiredBundles": ["visDefaultEditor"]
+  }
+  
\ No newline at end of file
diff --git a/src/plugins/vis_type_pie/public/__snapshots__/pie_fn.test.ts.snap b/src/plugins/vis_type_pie/public/__snapshots__/pie_fn.test.ts.snap
new file mode 100644
index 0000000000000..dc83d9fdf48ac
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/__snapshots__/pie_fn.test.ts.snap
@@ -0,0 +1,73 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`interpreter/functions#pie returns an object with the correct structure 1`] = `
+Object {
+  "as": "pie_vis",
+  "type": "render",
+  "value": Object {
+    "params": Object {
+      "listenOnChange": true,
+    },
+    "syncColors": false,
+    "visConfig": Object {
+      "addLegend": true,
+      "addTooltip": true,
+      "buckets": undefined,
+      "dimensions": Object {
+        "buckets": undefined,
+        "metric": Object {
+          "accessor": 0,
+          "aggType": "count",
+          "format": Object {
+            "id": "number",
+          },
+          "params": Object {},
+        },
+        "splitColumn": undefined,
+        "splitRow": undefined,
+      },
+      "distinctColors": false,
+      "isDonut": true,
+      "labels": Object {
+        "percentDecimals": 2,
+        "position": "default",
+        "show": false,
+        "truncate": 100,
+        "values": true,
+        "valuesFormat": "percent",
+      },
+      "legendPosition": "right",
+      "metric": Object {
+        "accessor": 0,
+        "aggType": "count",
+        "format": Object {
+          "id": "number",
+        },
+        "params": Object {},
+      },
+      "nestedLegend": true,
+      "palette": Object {
+        "name": "kibana_palette",
+        "type": "palette",
+      },
+      "splitColumn": undefined,
+      "splitRow": undefined,
+    },
+    "visData": Object {
+      "columns": Array [
+        Object {
+          "id": "col-0-1",
+          "name": "Count",
+        },
+      ],
+      "rows": Array [
+        Object {
+          "col-0-1": 0,
+        },
+      ],
+      "type": "datatable",
+    },
+    "visType": "pie",
+  },
+}
+`;
diff --git a/src/plugins/vis_type_pie/public/__snapshots__/to_ast.test.ts.snap b/src/plugins/vis_type_pie/public/__snapshots__/to_ast.test.ts.snap
new file mode 100644
index 0000000000000..0c8398a142027
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/__snapshots__/to_ast.test.ts.snap
@@ -0,0 +1,122 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`vis type pie vis toExpressionAst function should match basic snapshot 1`] = `
+Object {
+  "chain": Array [
+    Object {
+      "arguments": Object {
+        "aggs": Array [],
+        "index": Array [
+          Object {
+            "chain": Array [
+              Object {
+                "arguments": Object {
+                  "id": Array [
+                    "123",
+                  ],
+                },
+                "function": "indexPatternLoad",
+                "type": "function",
+              },
+            ],
+            "type": "expression",
+          },
+        ],
+        "metricsAtAllLevels": Array [
+          true,
+        ],
+        "partialRows": Array [
+          false,
+        ],
+      },
+      "function": "esaggs",
+      "type": "function",
+    },
+    Object {
+      "arguments": Object {
+        "addLegend": Array [
+          true,
+        ],
+        "addTooltip": Array [
+          true,
+        ],
+        "buckets": Array [
+          Object {
+            "chain": Array [
+              Object {
+                "arguments": Object {
+                  "accessor": Array [
+                    1,
+                  ],
+                  "format": Array [
+                    "terms",
+                  ],
+                  "formatParams": Array [
+                    "{\\"id\\":\\"string\\",\\"otherBucketLabel\\":\\"Other\\",\\"missingBucketLabel\\":\\"Missing\\",\\"parsedUrl\\":{\\"origin\\":\\"http://localhost:5801\\",\\"pathname\\":\\"/app/visualize\\",\\"basePath\\":\\"\\"}}",
+                  ],
+                },
+                "function": "visdimension",
+                "type": "function",
+              },
+            ],
+            "type": "expression",
+          },
+        ],
+        "isDonut": Array [
+          true,
+        ],
+        "labels": Array [
+          Object {
+            "chain": Array [
+              Object {
+                "arguments": Object {
+                  "lastLevel": Array [
+                    true,
+                  ],
+                  "show": Array [
+                    true,
+                  ],
+                  "truncate": Array [
+                    100,
+                  ],
+                  "values": Array [
+                    true,
+                  ],
+                },
+                "function": "pielabels",
+                "type": "function",
+              },
+            ],
+            "type": "expression",
+          },
+        ],
+        "legendPosition": Array [
+          "right",
+        ],
+        "metric": Array [
+          Object {
+            "chain": Array [
+              Object {
+                "arguments": Object {
+                  "accessor": Array [
+                    0,
+                  ],
+                  "format": Array [
+                    "number",
+                  ],
+                },
+                "function": "visdimension",
+                "type": "function",
+              },
+            ],
+            "type": "expression",
+          },
+        ],
+      },
+      "function": "pie_vis",
+      "type": "function",
+    },
+  ],
+  "type": "expression",
+}
+`;
diff --git a/src/plugins/vis_type_pie/public/chart.scss b/src/plugins/vis_type_pie/public/chart.scss
new file mode 100644
index 0000000000000..8c098b13581f5
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/chart.scss
@@ -0,0 +1,18 @@
+.pieChart__wrapper,
+.pieChart__container {
+  display: flex;
+  flex: 1 1 auto;
+  min-height: 0;
+  min-width: 0;
+}
+
+.pieChart__container {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  padding: $euiSizeS;
+  margin-left: auto;
+  margin-right: auto;
+}
diff --git a/src/plugins/vis_type_pie/public/components/chart_split.tsx b/src/plugins/vis_type_pie/public/components/chart_split.tsx
new file mode 100644
index 0000000000000..46f841113c03d
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/components/chart_split.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { Accessor, AccessorFn, GroupBy, GroupBySort, SmallMultiples } from '@elastic/charts';
+import { DatatableColumn } from '../../../expressions/public';
+import { SplitDimensionParams } from '../types';
+
+interface ChartSplitProps {
+  splitColumnAccessor?: Accessor | AccessorFn;
+  splitRowAccessor?: Accessor | AccessorFn;
+  splitDimension?: DatatableColumn;
+}
+
+const CHART_SPLIT_ID = '__pie_chart_split__';
+export const SMALL_MULTIPLES_ID = '__pie_chart_sm__';
+
+export const ChartSplit = ({
+  splitColumnAccessor,
+  splitRowAccessor,
+  splitDimension,
+}: ChartSplitProps) => {
+  if (!splitColumnAccessor && !splitRowAccessor) return null;
+  let sort: GroupBySort = 'alphaDesc';
+  if (splitDimension?.meta?.params?.id === 'terms') {
+    const params = splitDimension?.meta?.sourceParams?.params as SplitDimensionParams;
+    sort = params?.order === 'asc' ? 'alphaAsc' : 'alphaDesc';
+  }
+
+  return (
+    <>
+      <GroupBy
+        id={CHART_SPLIT_ID}
+        by={(spec, datum) => {
+          const splitTypeAccessor = splitColumnAccessor || splitRowAccessor;
+          if (splitTypeAccessor) {
+            return typeof splitTypeAccessor === 'function'
+              ? splitTypeAccessor(datum)
+              : datum[splitTypeAccessor];
+          }
+          return spec.id;
+        }}
+        sort={sort}
+      />
+      <SmallMultiples
+        id={SMALL_MULTIPLES_ID}
+        splitVertically={splitRowAccessor ? CHART_SPLIT_ID : undefined}
+        splitHorizontally={splitColumnAccessor ? CHART_SPLIT_ID : undefined}
+        style={{
+          verticalPanelPadding: {
+            outer: 0.1,
+            inner: 0.1,
+          },
+          horizontalPanelPadding: {
+            outer: 0.1,
+            inner: 0.1,
+          },
+        }}
+      />
+    </>
+  );
+};
diff --git a/src/plugins/vis_type_pie/public/editor/collections.ts b/src/plugins/vis_type_pie/public/editor/collections.ts
new file mode 100644
index 0000000000000..d65e933a8835c
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/editor/collections.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 { i18n } from '@kbn/i18n';
+import { LabelPositions, ValueFormats } from '../types';
+
+export const getLabelPositions = [
+  {
+    text: i18n.translate('visTypePie.labelPositions.insideText', {
+      defaultMessage: 'Inside',
+    }),
+    value: LabelPositions.INSIDE,
+  },
+  {
+    text: i18n.translate('visTypePie.labelPositions.insideOrOutsideText', {
+      defaultMessage: 'Inside or outside',
+    }),
+    value: LabelPositions.DEFAULT,
+  },
+];
+
+export const getValuesFormats = [
+  {
+    text: i18n.translate('visTypePie.valuesFormats.percent', {
+      defaultMessage: 'Show percent',
+    }),
+    value: ValueFormats.PERCENT,
+  },
+  {
+    text: i18n.translate('visTypePie.valuesFormats.value', {
+      defaultMessage: 'Show value',
+    }),
+    value: ValueFormats.VALUE,
+  },
+];
diff --git a/src/plugins/vis_type_pie/public/editor/components/index.tsx b/src/plugins/vis_type_pie/public/editor/components/index.tsx
new file mode 100644
index 0000000000000..6bc31208fbdb0
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/editor/components/index.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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, { lazy } from 'react';
+import { VisEditorOptionsProps } from '../../../../visualizations/public';
+import { PieVisParams, PieTypeProps } from '../../types';
+
+const PieOptionsLazy = lazy(() => import('./pie'));
+
+export const getPieOptions = ({
+  showElasticChartsOptions,
+  palettes,
+  trackUiMetric,
+}: PieTypeProps) => (props: VisEditorOptionsProps<PieVisParams>) => (
+  <PieOptionsLazy
+    {...props}
+    palettes={palettes}
+    showElasticChartsOptions={showElasticChartsOptions}
+    trackUiMetric={trackUiMetric}
+  />
+);
diff --git a/src/plugins/vis_type_pie/public/editor/components/pie.test.tsx b/src/plugins/vis_type_pie/public/editor/components/pie.test.tsx
new file mode 100644
index 0000000000000..524986524fd7e
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/editor/components/pie.test.tsx
@@ -0,0 +1,124 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { mountWithIntl } from '@kbn/test/jest';
+import { ReactWrapper } from 'enzyme';
+import PieOptions, { PieOptionsProps } from './pie';
+import { chartPluginMock } from '../../../../charts/public/mocks';
+import { findTestSubject } from '@elastic/eui/lib/test';
+import { act } from 'react-dom/test-utils';
+
+describe('PalettePicker', function () {
+  let props: PieOptionsProps;
+  let component: ReactWrapper<PieOptionsProps>;
+
+  beforeAll(() => {
+    props = ({
+      palettes: chartPluginMock.createSetupContract().palettes,
+      showElasticChartsOptions: true,
+      vis: {
+        type: {
+          editorConfig: {
+            collections: {
+              legendPositions: [
+                {
+                  text: 'Top',
+                  value: 'top',
+                },
+                {
+                  text: 'Left',
+                  value: 'left',
+                },
+                {
+                  text: 'Right',
+                  value: 'right',
+                },
+                {
+                  text: 'Bottom',
+                  value: 'bottom',
+                },
+              ],
+            },
+          },
+        },
+      },
+      stateParams: {
+        isDonut: true,
+        legendPosition: 'left',
+        labels: {
+          show: true,
+        },
+      },
+      setValue: jest.fn(),
+    } as unknown) as PieOptionsProps;
+  });
+
+  it('renders the nested legend switch for the elastic charts implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieNestedLegendSwitch').length).toBe(1);
+    });
+  });
+
+  it('not renders the nested legend switch for the vislib implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} showElasticChartsOptions={false} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieNestedLegendSwitch').length).toBe(0);
+    });
+  });
+
+  it('renders the label position dropdown for the elastic charts implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieLabelPositionSelect').length).toBe(1);
+    });
+  });
+
+  it('not renders the label position dropdown for the vislib implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} showElasticChartsOptions={false} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieLabelPositionSelect').length).toBe(0);
+    });
+  });
+
+  it('renders the top level switch for the elastic charts implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieTopLevelSwitch').length).toBe(1);
+    });
+  });
+
+  it('renders the top level switch for the vislib implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} showElasticChartsOptions={false} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieTopLevelSwitch').length).toBe(1);
+    });
+  });
+
+  it('renders the value format dropdown for the elastic charts implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieValueFormatsSelect').length).toBe(1);
+    });
+  });
+
+  it('not renders the value format dropdown for the vislib implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} showElasticChartsOptions={false} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieValueFormatsSelect').length).toBe(0);
+    });
+  });
+
+  it('renders the percent slider for the elastic charts implementation', async () => {
+    component = mountWithIntl(<PieOptions {...props} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'visTypePieValueDecimals').length).toBe(1);
+    });
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/editor/components/pie.tsx b/src/plugins/vis_type_pie/public/editor/components/pie.tsx
new file mode 100644
index 0000000000000..8ce4f4defbaed
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/editor/components/pie.tsx
@@ -0,0 +1,287 @@
+/*
+ * Copyright 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, { useState, useEffect } from 'react';
+import { METRIC_TYPE } from '@kbn/analytics';
+import {
+  EuiPanel,
+  EuiTitle,
+  EuiSpacer,
+  EuiRange,
+  EuiFormRow,
+  EuiIconTip,
+  EuiFlexItem,
+  EuiFlexGroup,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import {
+  BasicOptions,
+  SwitchOption,
+  SelectOption,
+  PalettePicker,
+} from '../../../../vis_default_editor/public';
+import { VisEditorOptionsProps } from '../../../../visualizations/public';
+import { TruncateLabelsOption } from './truncate_labels';
+import { PaletteRegistry } from '../../../../charts/public';
+import { DEFAULT_PERCENT_DECIMALS } from '../../../common';
+import { PieVisParams, LabelPositions, ValueFormats, PieTypeProps } from '../../types';
+import { getLabelPositions, getValuesFormats } from '../collections';
+import { getLegendPositions } from '../positions';
+
+export interface PieOptionsProps extends VisEditorOptionsProps<PieVisParams>, PieTypeProps {}
+
+function DecimalSlider<ParamName extends string>({
+  paramName,
+  value,
+  setValue,
+}: {
+  value: number;
+  paramName: ParamName;
+  setValue: (paramName: ParamName, value: number) => void;
+}) {
+  return (
+    <EuiFormRow
+      fullWidth
+      label={i18n.translate('visTypePie.editors.pie.decimalSliderLabel', {
+        defaultMessage: 'Maximum decimal places for percent',
+      })}
+      data-test-subj="visTypePieValueDecimals"
+    >
+      <EuiRange
+        value={value}
+        min={0}
+        max={4}
+        showInput
+        compressed
+        onChange={(e) => {
+          setValue(paramName, Number(e.currentTarget.value));
+        }}
+      />
+    </EuiFormRow>
+  );
+}
+
+const PieOptions = (props: PieOptionsProps) => {
+  const { stateParams, setValue, aggs } = props;
+  const setLabels = <T extends keyof PieVisParams['labels']>(
+    paramName: T,
+    value: PieVisParams['labels'][T]
+  ) => setValue('labels', { ...stateParams.labels, [paramName]: value });
+  const legendUiStateValue = props.uiState?.get('vis.legendOpen');
+  const [palettesRegistry, setPalettesRegistry] = useState<PaletteRegistry | undefined>(undefined);
+  const [legendVisibility, setLegendVisibility] = useState<boolean>(() => {
+    const bwcLegendStateDefault = stateParams.addLegend == null ? false : stateParams.addLegend;
+    return props.uiState?.get('vis.legendOpen', bwcLegendStateDefault) as boolean;
+  });
+  const hasSplitChart = Boolean(aggs?.aggs?.find((agg) => agg.schema === 'split' && agg.enabled));
+  const segments = aggs?.aggs?.filter((agg) => agg.schema === 'segment' && agg.enabled) ?? [];
+
+  useEffect(() => {
+    setLegendVisibility(legendUiStateValue);
+  }, [legendUiStateValue]);
+
+  useEffect(() => {
+    const fetchPalettes = async () => {
+      const palettes = await props.palettes?.getPalettes();
+      setPalettesRegistry(palettes);
+    };
+    fetchPalettes();
+  }, [props.palettes]);
+
+  return (
+    <>
+      <EuiPanel paddingSize="s">
+        <EuiTitle size="xs">
+          <h3>
+            <FormattedMessage
+              id="visTypePie.editors.pie.pieSettingsTitle"
+              defaultMessage="Pie settings"
+            />
+          </h3>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        <SwitchOption
+          label={i18n.translate('visTypePie.editors.pie.donutLabel', {
+            defaultMessage: 'Donut',
+          })}
+          paramName="isDonut"
+          value={stateParams.isDonut}
+          setValue={setValue}
+        />
+        <BasicOptions {...props} legendPositions={getLegendPositions} />
+        {props.showElasticChartsOptions && (
+          <>
+            <EuiFormRow>
+              <EuiFlexGroup alignItems="center" gutterSize="xs" responsive={false}>
+                <EuiFlexItem grow={false}>
+                  <SwitchOption
+                    label={i18n.translate('visTypePie.editors.pie.distinctColorsLabel', {
+                      defaultMessage: 'Use distinct colors per slice',
+                    })}
+                    paramName="distinctColors"
+                    value={stateParams.distinctColors}
+                    disabled={segments?.length <= 1 && !hasSplitChart}
+                    setValue={setValue}
+                    data-test-subj="visTypePiedistinctColorsSwitch"
+                  />
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiIconTip
+                    content="Use with multi-layer chart or multiple charts."
+                    position="top"
+                    type="iInCircle"
+                    color="subdued"
+                  />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFormRow>
+            <SwitchOption
+              label={i18n.translate('visTypePie.editors.pie.addLegendLabel', {
+                defaultMessage: 'Show legend',
+              })}
+              paramName="addLegend"
+              value={legendVisibility}
+              setValue={(paramName, value) => {
+                setLegendVisibility(value);
+                setValue(paramName, value);
+              }}
+              data-test-subj="visTypePieAddLegendSwitch"
+            />
+            <SwitchOption
+              label={i18n.translate('visTypePie.editors.pie.nestedLegendLabel', {
+                defaultMessage: 'Nest legend',
+              })}
+              paramName="nestedLegend"
+              value={stateParams.nestedLegend}
+              disabled={!stateParams.addLegend}
+              setValue={(paramName, value) => {
+                if (props.trackUiMetric) {
+                  props.trackUiMetric(METRIC_TYPE.CLICK, 'nested_legend_switched');
+                }
+                setValue(paramName, value);
+              }}
+              data-test-subj="visTypePieNestedLegendSwitch"
+            />
+          </>
+        )}
+        {props.showElasticChartsOptions && palettesRegistry && (
+          <PalettePicker
+            palettes={palettesRegistry}
+            activePalette={stateParams.palette}
+            paramName="palette"
+            setPalette={(paramName, value) => {
+              if (props.trackUiMetric) {
+                props.trackUiMetric(METRIC_TYPE.CLICK, 'palette_selected');
+              }
+              setValue(paramName, value);
+            }}
+          />
+        )}
+      </EuiPanel>
+
+      <EuiSpacer size="s" />
+
+      <EuiPanel paddingSize="s">
+        <EuiTitle size="xs">
+          <h3>
+            <FormattedMessage
+              id="visTypePie.editors.pie.labelsSettingsTitle"
+              defaultMessage="Labels settings"
+            />
+          </h3>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        <SwitchOption
+          label={i18n.translate('visTypePie.editors.pie.showLabelsLabel', {
+            defaultMessage: 'Show labels',
+          })}
+          paramName="show"
+          value={stateParams.labels.show}
+          setValue={setLabels}
+        />
+        {props.showElasticChartsOptions && (
+          <SelectOption
+            label={i18n.translate('visTypePie.editors.pie.labelPositionLabel', {
+              defaultMessage: 'Label position',
+            })}
+            disabled={!stateParams.labels.show || hasSplitChart}
+            options={getLabelPositions}
+            paramName="position"
+            value={
+              hasSplitChart
+                ? LabelPositions.INSIDE
+                : stateParams.labels.position || LabelPositions.DEFAULT
+            }
+            setValue={(paramName, value) => {
+              if (props.trackUiMetric) {
+                props.trackUiMetric(METRIC_TYPE.CLICK, 'label_position_selected');
+              }
+              setLabels(paramName, value);
+            }}
+            data-test-subj="visTypePieLabelPositionSelect"
+          />
+        )}
+        <SwitchOption
+          label={i18n.translate('visTypePie.editors.pie.showTopLevelOnlyLabel', {
+            defaultMessage: 'Show top level only',
+          })}
+          disabled={
+            !stateParams.labels.show ||
+            (props.showElasticChartsOptions &&
+              stateParams.labels.position === LabelPositions.INSIDE)
+          }
+          paramName="last_level"
+          value={stateParams.labels.last_level}
+          setValue={setLabels}
+          data-test-subj="visTypePieTopLevelSwitch"
+        />
+        <SwitchOption
+          label={i18n.translate('visTypePie.editors.pie.showValuesLabel', {
+            defaultMessage: 'Show values',
+          })}
+          disabled={!stateParams.labels.show}
+          paramName="values"
+          value={stateParams.labels.values}
+          setValue={setLabels}
+        />
+        {props.showElasticChartsOptions && (
+          <>
+            <SelectOption
+              label={i18n.translate('visTypePie.editors.pie.valueFormatsLabel', {
+                defaultMessage: 'Values',
+              })}
+              disabled={!stateParams.labels.values}
+              options={getValuesFormats}
+              paramName="valuesFormat"
+              value={stateParams.labels.valuesFormat || ValueFormats.PERCENT}
+              setValue={(paramName, value) => {
+                if (props.trackUiMetric) {
+                  props.trackUiMetric(METRIC_TYPE.CLICK, 'values_format_selected');
+                }
+                setLabels(paramName, value);
+              }}
+              data-test-subj="visTypePieValueFormatsSelect"
+            />
+            <DecimalSlider
+              paramName="percentDecimals"
+              value={stateParams.labels.percentDecimals ?? DEFAULT_PERCENT_DECIMALS}
+              setValue={setLabels}
+            />
+          </>
+        )}
+        <TruncateLabelsOption value={stateParams.labels.truncate} setValue={setLabels} />
+      </EuiPanel>
+    </>
+  );
+};
+
+// default export required for React.Lazy
+// eslint-disable-next-line import/no-default-export
+export { PieOptions as default };
diff --git a/src/plugins/vis_type_pie/public/editor/components/truncate_labels.test.tsx b/src/plugins/vis_type_pie/public/editor/components/truncate_labels.test.tsx
new file mode 100644
index 0000000000000..1d4bb238dcb50
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/editor/components/truncate_labels.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 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 { mountWithIntl } from '@kbn/test/jest';
+import { ReactWrapper } from 'enzyme';
+import { TruncateLabelsOption, TruncateLabelsOptionProps } from './truncate_labels';
+import { findTestSubject } from '@elastic/eui/lib/test';
+
+describe('TruncateLabelsOption', function () {
+  let props: TruncateLabelsOptionProps;
+  let component: ReactWrapper<TruncateLabelsOptionProps>;
+
+  beforeAll(() => {
+    props = {
+      disabled: false,
+      value: 20,
+      setValue: jest.fn(),
+    };
+  });
+
+  it('renders an input type number', () => {
+    component = mountWithIntl(<TruncateLabelsOption {...props} />);
+    expect(findTestSubject(component, 'pieLabelTruncateInput').length).toBe(1);
+  });
+
+  it('renders the value on the input number', function () {
+    component = mountWithIntl(<TruncateLabelsOption {...props} />);
+    const input = findTestSubject(component, 'pieLabelTruncateInput');
+    expect(input.props().value).toBe(20);
+  });
+
+  it('disables the input if disabled prop is given', function () {
+    const newProps = { ...props, disabled: true };
+    component = mountWithIntl(<TruncateLabelsOption {...newProps} />);
+    const input = findTestSubject(component, 'pieLabelTruncateInput');
+    expect(input.props().disabled).toBe(true);
+  });
+
+  it('should set the new value', function () {
+    component = mountWithIntl(<TruncateLabelsOption {...props} />);
+    const input = findTestSubject(component, 'pieLabelTruncateInput');
+    input.simulate('change', { target: { value: 100 } });
+    expect(props.setValue).toHaveBeenCalled();
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/editor/components/truncate_labels.tsx b/src/plugins/vis_type_pie/public/editor/components/truncate_labels.tsx
new file mode 100644
index 0000000000000..e6eb56725753c
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/editor/components/truncate_labels.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 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, { ChangeEvent } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiFormRow, EuiFieldNumber } from '@elastic/eui';
+
+export interface TruncateLabelsOptionProps {
+  disabled?: boolean;
+  value?: number | null;
+  setValue: (paramName: 'truncate', value: null | number) => void;
+}
+
+function TruncateLabelsOption({ disabled, value = null, setValue }: TruncateLabelsOptionProps) {
+  const onChange = (ev: ChangeEvent<HTMLInputElement>) =>
+    setValue('truncate', ev.target.value === '' ? null : parseFloat(ev.target.value));
+
+  return (
+    <EuiFormRow
+      label={i18n.translate('visTypePie.controls.truncateLabel', {
+        defaultMessage: 'Truncate',
+      })}
+      fullWidth
+      display="rowCompressed"
+    >
+      <EuiFieldNumber
+        data-test-subj="pieLabelTruncateInput"
+        disabled={disabled}
+        value={value || ''}
+        onChange={onChange}
+        fullWidth
+        compressed
+      />
+    </EuiFormRow>
+  );
+}
+
+export { TruncateLabelsOption };
diff --git a/src/plugins/vis_type_pie/public/editor/positions.ts b/src/plugins/vis_type_pie/public/editor/positions.ts
new file mode 100644
index 0000000000000..ea099a23cf9b4
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/editor/positions.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 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 { Position } from '@elastic/charts';
+
+export const getLegendPositions = [
+  {
+    text: i18n.translate('visTypePie.legendPositions.topText', {
+      defaultMessage: 'Top',
+    }),
+    value: Position.Top,
+  },
+  {
+    text: i18n.translate('visTypePie.legendPositions.leftText', {
+      defaultMessage: 'Left',
+    }),
+    value: Position.Left,
+  },
+  {
+    text: i18n.translate('visTypePie.legendPositions.rightText', {
+      defaultMessage: 'Right',
+    }),
+    value: Position.Right,
+  },
+  {
+    text: i18n.translate('visTypePie.legendPositions.bottomText', {
+      defaultMessage: 'Bottom',
+    }),
+    value: Position.Bottom,
+  },
+];
diff --git a/src/plugins/vis_type_pie/public/expression_functions/pie_labels.ts b/src/plugins/vis_type_pie/public/expression_functions/pie_labels.ts
new file mode 100644
index 0000000000000..269d5d5f779d6
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/expression_functions/pie_labels.ts
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 {
+  ExpressionFunctionDefinition,
+  Datatable,
+  ExpressionValueBoxed,
+} from '../../../expressions/public';
+
+interface Arguments {
+  show: boolean;
+  position: string;
+  values: boolean;
+  truncate: number | null;
+  valuesFormat: string;
+  lastLevel: boolean;
+  percentDecimals: number;
+}
+
+export type ExpressionValuePieLabels = ExpressionValueBoxed<
+  'pie_labels',
+  {
+    show: boolean;
+    position: string;
+    values: boolean;
+    truncate: number | null;
+    valuesFormat: string;
+    last_level: boolean;
+    percentDecimals: number;
+  }
+>;
+
+export const pieLabels = (): ExpressionFunctionDefinition<
+  'pielabels',
+  Datatable | null,
+  Arguments,
+  ExpressionValuePieLabels
+> => ({
+  name: 'pielabels',
+  help: i18n.translate('visTypePie.function.pieLabels.help', {
+    defaultMessage: 'Generates the pie labels object',
+  }),
+  type: 'pie_labels',
+  args: {
+    show: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.pieLabels.show.help', {
+        defaultMessage: 'Displays the pie labels',
+      }),
+      required: true,
+    },
+    position: {
+      types: ['string'],
+      default: 'default',
+      help: i18n.translate('visTypePie.function.pieLabels.position.help', {
+        defaultMessage: 'Defines the label position',
+      }),
+    },
+    values: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.pieLabels.values.help', {
+        defaultMessage: 'Displays the values inside the slices',
+      }),
+      default: true,
+    },
+    percentDecimals: {
+      types: ['number'],
+      help: i18n.translate('visTypePie.function.pieLabels.percentDecimals.help', {
+        defaultMessage: 'Defines the number of decimals that will appear on the values as percent',
+      }),
+      default: 2,
+    },
+    lastLevel: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.pieLabels.lastLevel.help', {
+        defaultMessage: 'Show top level labels only',
+      }),
+      default: true,
+    },
+    truncate: {
+      types: ['number', 'null'],
+      help: i18n.translate('visTypePie.function.pieLabels.truncate.help', {
+        defaultMessage: 'Defines the number of characters that the slice value will display',
+      }),
+      default: null,
+    },
+    valuesFormat: {
+      types: ['string'],
+      default: 'percent',
+      help: i18n.translate('visTypePie.function.pieLabels.valuesFormat.help', {
+        defaultMessage: 'Defines the format of the values',
+      }),
+    },
+  },
+  fn: (context, args) => {
+    return {
+      type: 'pie_labels',
+      show: args.show,
+      position: args.position,
+      percentDecimals: args.percentDecimals,
+      values: args.values,
+      truncate: args.truncate,
+      valuesFormat: args.valuesFormat,
+      last_level: args.lastLevel,
+    };
+  },
+});
diff --git a/src/plugins/vis_type_pie/public/index.ts b/src/plugins/vis_type_pie/public/index.ts
new file mode 100644
index 0000000000000..adf8b2d073f39
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { VisTypePiePlugin } from './plugin';
+
+export { pieVisType } from './vis_type';
+export { Dimensions, Dimension } from './types';
+
+export const plugin = () => new VisTypePiePlugin();
diff --git a/src/plugins/vis_type_pie/public/mocks.ts b/src/plugins/vis_type_pie/public/mocks.ts
new file mode 100644
index 0000000000000..53579422e44eb
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/mocks.ts
@@ -0,0 +1,328 @@
+/*
+ * Copyright 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 { Datatable } from '../../expressions/public';
+import { BucketColumns, PieVisParams, LabelPositions, ValueFormats } from './types';
+
+export const createMockBucketColumns = (): BucketColumns[] => {
+  return [
+    {
+      id: 'col-0-2',
+      name: 'Carrier: Descending',
+      meta: {
+        type: 'string',
+        field: 'Carrier',
+        index: 'kibana_sample_data_flights',
+        params: {
+          id: 'terms',
+          params: {
+            id: 'string',
+            otherBucketLabel: 'Other',
+            missingBucketLabel: 'Missing',
+          },
+        },
+        source: 'esaggs',
+        sourceParams: {
+          indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+          id: '2',
+          enabled: true,
+          type: 'terms',
+          params: {
+            field: 'Carrier',
+            orderBy: '1',
+            order: 'desc',
+            size: 5,
+            otherBucket: false,
+            otherBucketLabel: 'Other',
+            missingBucket: false,
+            missingBucketLabel: 'Missing',
+          },
+          schema: 'segment',
+        },
+      },
+      format: {
+        id: 'terms',
+        params: {
+          id: 'string',
+        },
+      },
+    },
+    {
+      id: 'col-2-3',
+      name: 'Cancelled: Descending',
+      meta: {
+        type: 'boolean',
+        field: 'Cancelled',
+        index: 'kibana_sample_data_flights',
+        params: {
+          id: 'terms',
+          params: {
+            id: 'boolean',
+            otherBucketLabel: 'Other',
+            missingBucketLabel: 'Missing',
+          },
+        },
+        source: 'esaggs',
+        sourceParams: {
+          indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+          id: '3',
+          enabled: true,
+          type: 'terms',
+          params: {
+            field: 'Cancelled',
+            orderBy: '1',
+            order: 'desc',
+            size: 5,
+            otherBucket: false,
+            otherBucketLabel: 'Other',
+            missingBucket: false,
+            missingBucketLabel: 'Missing',
+          },
+          schema: 'segment',
+        },
+      },
+      format: {
+        id: 'terms',
+        params: {
+          id: 'boolean',
+        },
+      },
+    },
+  ];
+};
+
+export const createMockVisData = (): Datatable => {
+  return {
+    type: 'datatable',
+    rows: [
+      {
+        'col-0-2': 'Logstash Airways',
+        'col-2-3': 0,
+        'col-1-1': 797,
+        'col-3-1': 689,
+      },
+      {
+        'col-0-2': 'Logstash Airways',
+        'col-2-3': 1,
+        'col-1-1': 797,
+        'col-3-1': 108,
+      },
+      {
+        'col-0-2': 'JetBeats',
+        'col-2-3': 0,
+        'col-1-1': 766,
+        'col-3-1': 654,
+      },
+      {
+        'col-0-2': 'JetBeats',
+        'col-2-3': 1,
+        'col-1-1': 766,
+        'col-3-1': 112,
+      },
+      {
+        'col-0-2': 'ES-Air',
+        'col-2-3': 0,
+        'col-1-1': 744,
+        'col-3-1': 665,
+      },
+      {
+        'col-0-2': 'ES-Air',
+        'col-2-3': 1,
+        'col-1-1': 744,
+        'col-3-1': 79,
+      },
+      {
+        'col-0-2': 'Kibana Airlines',
+        'col-2-3': 0,
+        'col-1-1': 731,
+        'col-3-1': 655,
+      },
+      {
+        'col-0-2': 'Kibana Airlines',
+        'col-2-3': 1,
+        'col-1-1': 731,
+        'col-3-1': 76,
+      },
+    ],
+    columns: [
+      {
+        id: 'col-0-2',
+        name: 'Carrier: Descending',
+        meta: {
+          type: 'string',
+          field: 'Carrier',
+          index: 'kibana_sample_data_flights',
+          params: {
+            id: 'terms',
+            params: {
+              id: 'string',
+              otherBucketLabel: 'Other',
+              missingBucketLabel: 'Missing',
+            },
+          },
+          source: 'esaggs',
+          sourceParams: {
+            indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+            id: '2',
+            enabled: true,
+            type: 'terms',
+            params: {
+              field: 'Carrier',
+              orderBy: '1',
+              order: 'desc',
+              size: 5,
+              otherBucket: false,
+              otherBucketLabel: 'Other',
+              missingBucket: false,
+              missingBucketLabel: 'Missing',
+            },
+            schema: 'segment',
+          },
+        },
+      },
+      {
+        id: 'col-1-1',
+        name: 'Count',
+        meta: {
+          type: 'number',
+          index: 'kibana_sample_data_flights',
+          params: {
+            id: 'number',
+          },
+          source: 'esaggs',
+          sourceParams: {
+            indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+            id: '1',
+            enabled: true,
+            type: 'count',
+            params: {},
+            schema: 'metric',
+          },
+        },
+      },
+      {
+        id: 'col-2-3',
+        name: 'Cancelled: Descending',
+        meta: {
+          type: 'boolean',
+          field: 'Cancelled',
+          index: 'kibana_sample_data_flights',
+          params: {
+            id: 'terms',
+            params: {
+              id: 'boolean',
+              otherBucketLabel: 'Other',
+              missingBucketLabel: 'Missing',
+            },
+          },
+          source: 'esaggs',
+          sourceParams: {
+            indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+            id: '3',
+            enabled: true,
+            type: 'terms',
+            params: {
+              field: 'Cancelled',
+              orderBy: '1',
+              order: 'desc',
+              size: 5,
+              otherBucket: false,
+              otherBucketLabel: 'Other',
+              missingBucket: false,
+              missingBucketLabel: 'Missing',
+            },
+            schema: 'segment',
+          },
+        },
+      },
+      {
+        id: 'col-3-1',
+        name: 'Count',
+        meta: {
+          type: 'number',
+          index: 'kibana_sample_data_flights',
+          params: {
+            id: 'number',
+          },
+          source: 'esaggs',
+          sourceParams: {
+            indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+            id: '1',
+            enabled: true,
+            type: 'count',
+            params: {},
+            schema: 'metric',
+          },
+        },
+      },
+    ],
+  };
+};
+
+export const createMockPieParams = (): PieVisParams => {
+  return ({
+    addLegend: true,
+    addTooltip: true,
+    isDonut: true,
+    labels: {
+      position: LabelPositions.DEFAULT,
+      show: true,
+      truncate: 100,
+      values: true,
+      valuesFormat: ValueFormats.PERCENT,
+      percentDecimals: 2,
+    },
+    legendPosition: 'right',
+    nestedLegend: false,
+    distinctColors: false,
+    palette: {
+      name: 'default',
+      type: 'palette',
+    },
+    type: 'pie',
+    dimensions: {
+      metric: {
+        accessor: 1,
+        format: {
+          id: 'number',
+        },
+        params: {},
+        label: 'Count',
+        aggType: 'count',
+      },
+      buckets: [
+        {
+          accessor: 0,
+          format: {
+            id: 'terms',
+            params: {
+              id: 'string',
+              otherBucketLabel: 'Other',
+              missingBucketLabel: 'Missing',
+            },
+          },
+          label: 'Carrier: Descending',
+          aggType: 'terms',
+        },
+        {
+          accessor: 2,
+          format: {
+            id: 'terms',
+            params: {
+              id: 'boolean',
+              otherBucketLabel: 'Other',
+              missingBucketLabel: 'Missing',
+            },
+          },
+          label: 'Cancelled: Descending',
+          aggType: 'terms',
+        },
+      ],
+    },
+  } as unknown) as PieVisParams;
+};
diff --git a/src/plugins/vis_type_pie/public/pie_component.test.tsx b/src/plugins/vis_type_pie/public/pie_component.test.tsx
new file mode 100644
index 0000000000000..177396f25adb6
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/pie_component.test.tsx
@@ -0,0 +1,123 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { Settings, TooltipType, SeriesIdentifier } from '@elastic/charts';
+import { chartPluginMock } from '../../charts/public/mocks';
+import { dataPluginMock } from '../../data/public/mocks';
+import { shallow, mount } from 'enzyme';
+import { findTestSubject } from '@elastic/eui/lib/test';
+import { act } from 'react-dom/test-utils';
+import PieComponent, { PieComponentProps } from './pie_component';
+import { createMockPieParams, createMockVisData } from './mocks';
+
+jest.mock('@elastic/charts', () => {
+  const original = jest.requireActual('@elastic/charts');
+
+  return {
+    ...original,
+    getSpecId: jest.fn(() => {}),
+  };
+});
+
+const chartsThemeService = chartPluginMock.createSetupContract().theme;
+const palettesRegistry = chartPluginMock.createPaletteRegistry();
+const visParams = createMockPieParams();
+const visData = createMockVisData();
+
+const mockState = new Map();
+const uiState = {
+  get: jest
+    .fn()
+    .mockImplementation((key, fallback) => (mockState.has(key) ? mockState.get(key) : fallback)),
+  set: jest.fn().mockImplementation((key, value) => mockState.set(key, value)),
+  emit: jest.fn(),
+  setSilent: jest.fn(),
+} as any;
+
+describe('PieComponent', function () {
+  let wrapperProps: PieComponentProps;
+
+  beforeAll(() => {
+    wrapperProps = {
+      chartsThemeService,
+      palettesRegistry,
+      visParams,
+      visData,
+      uiState,
+      syncColors: false,
+      fireEvent: jest.fn(),
+      renderComplete: jest.fn(),
+      services: dataPluginMock.createStartContract(),
+    };
+  });
+
+  it('renders the legend on the correct position', () => {
+    const component = shallow(<PieComponent {...wrapperProps} />);
+    expect(component.find(Settings).prop('legendPosition')).toEqual('right');
+  });
+
+  it('renders the legend toggle component', async () => {
+    const component = mount(<PieComponent {...wrapperProps} />);
+    await act(async () => {
+      expect(findTestSubject(component, 'vislibToggleLegend').length).toBe(1);
+    });
+  });
+
+  it('hides the legend if the legend toggle is clicked', async () => {
+    const component = mount(<PieComponent {...wrapperProps} />);
+    findTestSubject(component, 'vislibToggleLegend').simulate('click');
+    await act(async () => {
+      expect(component.find(Settings).prop('showLegend')).toEqual(false);
+    });
+  });
+
+  it('defaults on showing the legend for the inner cicle', () => {
+    const component = shallow(<PieComponent {...wrapperProps} />);
+    expect(component.find(Settings).prop('legendMaxDepth')).toBe(1);
+  });
+
+  it('shows the nested legend when the user requests it', () => {
+    const newParams = { ...visParams, nestedLegend: true };
+    const newProps = { ...wrapperProps, visParams: newParams };
+    const component = shallow(<PieComponent {...newProps} />);
+    expect(component.find(Settings).prop('legendMaxDepth')).toBeUndefined();
+  });
+
+  it('defaults on displaying the tooltip', () => {
+    const component = shallow(<PieComponent {...wrapperProps} />);
+    expect(component.find(Settings).prop('tooltip')).toStrictEqual({ type: TooltipType.Follow });
+  });
+
+  it('doesnt show the tooltip when the user requests it', () => {
+    const newParams = { ...visParams, addTooltip: false };
+    const newProps = { ...wrapperProps, visParams: newParams };
+    const component = shallow(<PieComponent {...newProps} />);
+    expect(component.find(Settings).prop('tooltip')).toStrictEqual({ type: TooltipType.None });
+  });
+
+  it('calls filter callback', () => {
+    const component = shallow(<PieComponent {...wrapperProps} />);
+    component.find(Settings).first().prop('onElementClick')!([
+      [
+        [
+          {
+            groupByRollup: 6,
+            value: 6,
+            depth: 1,
+            path: [],
+            sortIndex: 1,
+            smAccessorValue: 'Logstash Airways',
+          },
+        ],
+        {} as SeriesIdentifier,
+      ],
+    ]);
+    expect(wrapperProps.fireEvent).toHaveBeenCalled();
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/pie_component.tsx b/src/plugins/vis_type_pie/public/pie_component.tsx
new file mode 100644
index 0000000000000..b79eed2087a16
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/pie_component.tsx
@@ -0,0 +1,355 @@
+/*
+ * Copyright 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, { memo, useCallback, useMemo, useState, useEffect, useRef } from 'react';
+
+import {
+  Chart,
+  Datum,
+  LayerValue,
+  Partition,
+  Position,
+  Settings,
+  RenderChangeListener,
+  TooltipProps,
+  TooltipType,
+  SeriesIdentifier,
+} from '@elastic/charts';
+import {
+  LegendToggle,
+  ClickTriggerEvent,
+  ChartsPluginSetup,
+  PaletteRegistry,
+} from '../../charts/public';
+import { DataPublicPluginStart, FieldFormat } from '../../data/public';
+import type { PersistedState } from '../../visualizations/public';
+import { Datatable, DatatableColumn, IInterpreterRenderHandlers } from '../../expressions/public';
+import { DEFAULT_PERCENT_DECIMALS } from '../common';
+import { PieVisParams, BucketColumns, ValueFormats, PieContainerDimensions } from './types';
+import {
+  getColorPicker,
+  getLayers,
+  getLegendActions,
+  canFilter,
+  getFilterClickData,
+  getFilterEventData,
+  getConfig,
+  getColumns,
+  getSplitDimensionAccessor,
+} from './utils';
+import { ChartSplit, SMALL_MULTIPLES_ID } from './components/chart_split';
+
+import './chart.scss';
+
+declare global {
+  interface Window {
+    /**
+     * Flag used to enable debugState on elastic charts
+     */
+    _echDebugStateFlag?: boolean;
+  }
+}
+
+export interface PieComponentProps {
+  visParams: PieVisParams;
+  visData: Datatable;
+  uiState: PersistedState;
+  fireEvent: IInterpreterRenderHandlers['event'];
+  renderComplete: IInterpreterRenderHandlers['done'];
+  chartsThemeService: ChartsPluginSetup['theme'];
+  palettesRegistry: PaletteRegistry;
+  services: DataPublicPluginStart;
+  syncColors: boolean;
+}
+
+const PieComponent = (props: PieComponentProps) => {
+  const chartTheme = props.chartsThemeService.useChartsTheme();
+  const chartBaseTheme = props.chartsThemeService.useChartsBaseTheme();
+  const [showLegend, setShowLegend] = useState<boolean>(() => {
+    const bwcLegendStateDefault =
+      props.visParams.addLegend == null ? false : props.visParams.addLegend;
+    return props.uiState?.get('vis.legendOpen', bwcLegendStateDefault) as boolean;
+  });
+  const [dimensions, setDimensions] = useState<undefined | PieContainerDimensions>();
+
+  const parentRef = useRef<HTMLDivElement>(null);
+
+  useEffect(() => {
+    if (parentRef && parentRef.current) {
+      const parentHeight = parentRef.current!.getBoundingClientRect().height;
+      const parentWidth = parentRef.current!.getBoundingClientRect().width;
+      setDimensions({ width: parentWidth, height: parentHeight });
+    }
+  }, [parentRef]);
+
+  const onRenderChange = useCallback<RenderChangeListener>(
+    (isRendered) => {
+      if (isRendered) {
+        props.renderComplete();
+      }
+    },
+    [props]
+  );
+
+  // handles slice click event
+  const handleSliceClick = useCallback(
+    (
+      clickedLayers: LayerValue[],
+      bucketColumns: Array<Partial<BucketColumns>>,
+      visData: Datatable,
+      splitChartDimension?: DatatableColumn,
+      splitChartFormatter?: FieldFormat
+    ): void => {
+      const data = getFilterClickData(
+        clickedLayers,
+        bucketColumns,
+        visData,
+        splitChartDimension,
+        splitChartFormatter
+      );
+      const event = {
+        name: 'filterBucket',
+        data: { data },
+      };
+      props.fireEvent(event);
+    },
+    [props]
+  );
+
+  // handles legend action event data
+  const getLegendActionEventData = useCallback(
+    (visData: Datatable) => (series: SeriesIdentifier): ClickTriggerEvent | null => {
+      const data = getFilterEventData(visData, series);
+
+      return {
+        name: 'filterBucket',
+        data: {
+          negate: false,
+          data,
+        },
+      };
+    },
+    []
+  );
+
+  const handleLegendAction = useCallback(
+    (event: ClickTriggerEvent, negate = false) => {
+      props.fireEvent({
+        ...event,
+        data: {
+          ...event.data,
+          negate,
+        },
+      });
+    },
+    [props]
+  );
+
+  const toggleLegend = useCallback(() => {
+    setShowLegend((value) => {
+      const newValue = !value;
+      props.uiState?.set('vis.legendOpen', newValue);
+      return newValue;
+    });
+  }, [props.uiState]);
+
+  useEffect(() => {
+    setShowLegend(props.visParams.addLegend);
+    props.uiState?.set('vis.legendOpen', props.visParams.addLegend);
+  }, [props.uiState, props.visParams.addLegend]);
+
+  const setColor = useCallback(
+    (newColor: string | null, seriesLabel: string | number) => {
+      const colors = props.uiState?.get('vis.colors') || {};
+      if (colors[seriesLabel] === newColor || !newColor) {
+        delete colors[seriesLabel];
+      } else {
+        colors[seriesLabel] = newColor;
+      }
+      props.uiState?.setSilent('vis.colors', null);
+      props.uiState?.set('vis.colors', colors);
+      props.uiState?.emit('reload');
+    },
+    [props.uiState]
+  );
+
+  const { visData, visParams, services, syncColors } = props;
+
+  function getSliceValue(d: Datum, metricColumn: DatatableColumn) {
+    if (typeof d[metricColumn.id] === 'number' && d[metricColumn.id] !== 0) {
+      return d[metricColumn.id];
+    }
+    return Number.EPSILON;
+  }
+
+  // formatters
+  const metricFieldFormatter = services.fieldFormats.deserialize(
+    visParams.dimensions.metric.format
+  );
+  const splitChartFormatter = visParams.dimensions.splitColumn
+    ? services.fieldFormats.deserialize(visParams.dimensions.splitColumn[0].format)
+    : visParams.dimensions.splitRow
+    ? services.fieldFormats.deserialize(visParams.dimensions.splitRow[0].format)
+    : undefined;
+  const percentFormatter = services.fieldFormats.deserialize({
+    id: 'percent',
+    params: {
+      pattern: `0,0.[${'0'.repeat(visParams.labels.percentDecimals ?? DEFAULT_PERCENT_DECIMALS)}]%`,
+    },
+  });
+
+  const { bucketColumns, metricColumn } = useMemo(() => getColumns(visParams, visData), [
+    visData,
+    visParams,
+  ]);
+
+  const layers = useMemo(
+    () =>
+      getLayers(
+        bucketColumns,
+        visParams,
+        props.uiState?.get('vis.colors', {}),
+        visData.rows,
+        props.palettesRegistry,
+        services.fieldFormats,
+        syncColors
+      ),
+    [
+      bucketColumns,
+      visParams,
+      props.uiState,
+      props.palettesRegistry,
+      visData.rows,
+      services.fieldFormats,
+      syncColors,
+    ]
+  );
+  const config = useMemo(() => getConfig(visParams, chartTheme, dimensions), [
+    chartTheme,
+    visParams,
+    dimensions,
+  ]);
+  const tooltip: TooltipProps = {
+    type: visParams.addTooltip ? TooltipType.Follow : TooltipType.None,
+  };
+  const legendPosition = visParams.legendPosition ?? Position.Right;
+
+  const legendColorPicker = useMemo(
+    () =>
+      getColorPicker(
+        legendPosition,
+        setColor,
+        bucketColumns,
+        visParams.palette.name,
+        visData.rows,
+        props.uiState,
+        visParams.distinctColors
+      ),
+    [
+      legendPosition,
+      setColor,
+      bucketColumns,
+      visParams.palette.name,
+      visParams.distinctColors,
+      visData.rows,
+      props.uiState,
+    ]
+  );
+
+  const splitChartColumnAccessor = visParams.dimensions.splitColumn
+    ? getSplitDimensionAccessor(
+        services.fieldFormats,
+        visData.columns
+      )(visParams.dimensions.splitColumn[0])
+    : undefined;
+  const splitChartRowAccessor = visParams.dimensions.splitRow
+    ? getSplitDimensionAccessor(
+        services.fieldFormats,
+        visData.columns
+      )(visParams.dimensions.splitRow[0])
+    : undefined;
+
+  const splitChartDimension = visParams.dimensions.splitColumn
+    ? visData.columns[visParams.dimensions.splitColumn[0].accessor]
+    : visParams.dimensions.splitRow
+    ? visData.columns[visParams.dimensions.splitRow[0].accessor]
+    : undefined;
+
+  return (
+    <div className="pieChart__container" data-test-subj="visTypePieChart">
+      <div className="pieChart__wrapper" ref={parentRef}>
+        <LegendToggle
+          onClick={toggleLegend}
+          showLegend={showLegend}
+          legendPosition={legendPosition}
+        />
+        <Chart size="100%">
+          <ChartSplit
+            splitColumnAccessor={splitChartColumnAccessor}
+            splitRowAccessor={splitChartRowAccessor}
+            splitDimension={splitChartDimension}
+          />
+          <Settings
+            debugState={window._echDebugStateFlag ?? false}
+            showLegend={showLegend}
+            legendPosition={legendPosition}
+            legendMaxDepth={visParams.nestedLegend ? undefined : 1}
+            legendColorPicker={legendColorPicker}
+            flatLegend={Boolean(splitChartDimension)}
+            tooltip={tooltip}
+            onElementClick={(args) => {
+              handleSliceClick(
+                args[0][0] as LayerValue[],
+                bucketColumns,
+                visData,
+                splitChartDimension,
+                splitChartFormatter
+              );
+            }}
+            legendAction={getLegendActions(
+              canFilter,
+              getLegendActionEventData(visData),
+              handleLegendAction,
+              visParams,
+              services.actions,
+              services.fieldFormats
+            )}
+            theme={chartTheme}
+            baseTheme={chartBaseTheme}
+            onRenderChange={onRenderChange}
+          />
+          <Partition
+            id="pie"
+            smallMultiples={SMALL_MULTIPLES_ID}
+            data={visData.rows}
+            valueAccessor={(d: Datum) => getSliceValue(d, metricColumn)}
+            percentFormatter={(d: number) => percentFormatter.convert(d / 100)}
+            valueGetter={
+              !visParams.labels.show ||
+              visParams.labels.valuesFormat === ValueFormats.VALUE ||
+              !visParams.labels.values
+                ? undefined
+                : 'percent'
+            }
+            valueFormatter={(d: number) =>
+              !visParams.labels.show || !visParams.labels.values
+                ? ''
+                : metricFieldFormatter.convert(d)
+            }
+            layers={layers}
+            config={config}
+            topGroove={!visParams.labels.show ? 0 : undefined}
+          />
+        </Chart>
+      </div>
+    </div>
+  );
+};
+
+// eslint-disable-next-line import/no-default-export
+export default memo(PieComponent);
diff --git a/src/plugins/vis_type_pie/public/pie_fn.test.ts b/src/plugins/vis_type_pie/public/pie_fn.test.ts
new file mode 100644
index 0000000000000..d387d4035e8ab
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/pie_fn.test.ts
@@ -0,0 +1,53 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { functionWrapper } from '../../expressions/common/expression_functions/specs/tests/utils';
+import { createPieVisFn } from './pie_fn';
+
+describe('interpreter/functions#pie', () => {
+  const fn = functionWrapper(createPieVisFn());
+  const context = {
+    type: 'datatable',
+    rows: [{ 'col-0-1': 0 }],
+    columns: [{ id: 'col-0-1', name: 'Count' }],
+  };
+  const visConfig = {
+    addTooltip: true,
+    addLegend: true,
+    legendPosition: 'right',
+    isDonut: true,
+    nestedLegend: true,
+    distinctColors: false,
+    palette: 'kibana_palette',
+    labels: {
+      show: false,
+      values: true,
+      position: 'default',
+      valuesFormat: 'percent',
+      percentDecimals: 2,
+      truncate: 100,
+    },
+    metric: {
+      accessor: 0,
+      format: {
+        id: 'number',
+      },
+      params: {},
+      aggType: 'count',
+    },
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('returns an object with the correct structure', async () => {
+    const actual = await fn(context, visConfig);
+    expect(actual).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/pie_fn.ts b/src/plugins/vis_type_pie/public/pie_fn.ts
new file mode 100644
index 0000000000000..1b5b8574f9311
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/pie_fn.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 { i18n } from '@kbn/i18n';
+import { ExpressionFunctionDefinition, Datatable, Render } from '../../expressions/public';
+import { PieVisParams, PieVisConfig } from './types';
+
+export const vislibPieName = 'pie_vis';
+
+export interface RenderValue {
+  visData: Datatable;
+  visType: string;
+  visConfig: PieVisParams;
+  syncColors: boolean;
+}
+
+export type VisTypePieExpressionFunctionDefinition = ExpressionFunctionDefinition<
+  typeof vislibPieName,
+  Datatable,
+  PieVisConfig,
+  Render<RenderValue>
+>;
+
+export const createPieVisFn = (): VisTypePieExpressionFunctionDefinition => ({
+  name: vislibPieName,
+  type: 'render',
+  inputTypes: ['datatable'],
+  help: i18n.translate('visTypePie.functions.help', {
+    defaultMessage: 'Pie visualization',
+  }),
+  args: {
+    metric: {
+      types: ['vis_dimension'],
+      help: i18n.translate('visTypePie.function.args.metricHelpText', {
+        defaultMessage: 'Metric dimensions config',
+      }),
+      required: true,
+    },
+    buckets: {
+      types: ['vis_dimension'],
+      help: i18n.translate('visTypePie.function.args.bucketsHelpText', {
+        defaultMessage: 'Buckets dimensions config',
+      }),
+      multi: true,
+    },
+    splitColumn: {
+      types: ['vis_dimension'],
+      help: i18n.translate('visTypePie.function.args.splitColumnHelpText', {
+        defaultMessage: 'Split by column dimension config',
+      }),
+      multi: true,
+    },
+    splitRow: {
+      types: ['vis_dimension'],
+      help: i18n.translate('visTypePie.function.args.splitRowHelpText', {
+        defaultMessage: 'Split by row dimension config',
+      }),
+      multi: true,
+    },
+    addTooltip: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.args.addTooltipHelpText', {
+        defaultMessage: 'Show tooltip on slice hover',
+      }),
+      default: true,
+    },
+    addLegend: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.args.addLegendHelpText', {
+        defaultMessage: 'Show legend chart legend',
+      }),
+    },
+    legendPosition: {
+      types: ['string'],
+      help: i18n.translate('visTypePie.function.args.legendPositionHelpText', {
+        defaultMessage: 'Position the legend on top, bottom, left, right of the chart',
+      }),
+    },
+    nestedLegend: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.args.nestedLegendHelpText', {
+        defaultMessage: 'Show a more detailed legend',
+      }),
+      default: false,
+    },
+    distinctColors: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.args.distinctColorsHelpText', {
+        defaultMessage:
+          'Maps different color per slice. Slices with the same value have the same color',
+      }),
+      default: false,
+    },
+    isDonut: {
+      types: ['boolean'],
+      help: i18n.translate('visTypePie.function.args.isDonutHelpText', {
+        defaultMessage: 'Displays the pie chart as donut',
+      }),
+      default: false,
+    },
+    palette: {
+      types: ['string'],
+      help: i18n.translate('visTypePie.function.args.paletteHelpText', {
+        defaultMessage: 'Defines the chart palette name',
+      }),
+      default: 'default',
+    },
+    labels: {
+      types: ['pie_labels'],
+      help: i18n.translate('visTypePie.function.args.labelsHelpText', {
+        defaultMessage: 'Pie labels config',
+      }),
+    },
+  },
+  fn(context, args, handlers) {
+    const visConfig = {
+      ...args,
+      palette: {
+        type: 'palette',
+        name: args.palette,
+      },
+      dimensions: {
+        metric: args.metric,
+        buckets: args.buckets,
+        splitColumn: args.splitColumn,
+        splitRow: args.splitRow,
+      },
+    } as PieVisParams;
+
+    if (handlers?.inspectorAdapters?.tables) {
+      handlers.inspectorAdapters.tables.logDatatable('default', context);
+    }
+
+    return {
+      type: 'render',
+      as: vislibPieName,
+      value: {
+        visData: context,
+        visConfig,
+        syncColors: handlers?.isSyncColorsEnabled?.() ?? false,
+        visType: 'pie',
+        params: {
+          listenOnChange: true,
+        },
+      },
+    };
+  },
+});
diff --git a/src/plugins/vis_type_pie/public/pie_renderer.tsx b/src/plugins/vis_type_pie/public/pie_renderer.tsx
new file mode 100644
index 0000000000000..bcd4cad4efa66
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/pie_renderer.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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, { lazy } from 'react';
+import { render, unmountComponentAtNode } from 'react-dom';
+import { I18nProvider } from '@kbn/i18n/react';
+import { ExpressionRenderDefinition } from '../../expressions/public';
+import { VisualizationContainer } from '../../visualizations/public';
+import type { PersistedState } from '../../visualizations/public';
+import { VisTypePieDependencies } from './plugin';
+
+import { RenderValue, vislibPieName } from './pie_fn';
+
+const PieComponent = lazy(() => import('./pie_component'));
+
+function shouldShowNoResultsMessage(visData: any): boolean {
+  const rows: object[] | undefined = visData?.rows;
+  const isZeroHits = visData?.hits === 0 || (rows && !rows.length);
+
+  return Boolean(isZeroHits);
+}
+
+export const getPieVisRenderer: (
+  deps: VisTypePieDependencies
+) => ExpressionRenderDefinition<RenderValue> = ({ theme, palettes, getStartDeps }) => ({
+  name: vislibPieName,
+  displayName: 'Pie visualization',
+  reuseDomNode: true,
+  render: async (domNode, { visConfig, visData, syncColors }, handlers) => {
+    const showNoResult = shouldShowNoResultsMessage(visData);
+
+    handlers.onDestroy(() => {
+      unmountComponentAtNode(domNode);
+    });
+
+    const services = await getStartDeps();
+    const palettesRegistry = await palettes.getPalettes();
+
+    render(
+      <I18nProvider>
+        <VisualizationContainer handlers={handlers} showNoResult={showNoResult}>
+          <PieComponent
+            chartsThemeService={theme}
+            palettesRegistry={palettesRegistry}
+            visParams={visConfig}
+            visData={visData}
+            renderComplete={handlers.done}
+            fireEvent={handlers.event}
+            uiState={handlers.uiState as PersistedState}
+            services={services.data}
+            syncColors={syncColors}
+          />
+        </VisualizationContainer>
+      </I18nProvider>,
+      domNode
+    );
+  },
+});
diff --git a/src/plugins/vis_type_pie/public/plugin.ts b/src/plugins/vis_type_pie/public/plugin.ts
new file mode 100644
index 0000000000000..440a3a75a2eb1
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/plugin.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 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, DocLinksStart } from 'src/core/public';
+import { VisualizationsSetup } from '../../visualizations/public';
+import { Plugin as ExpressionsPublicPlugin } from '../../expressions/public';
+import { ChartsPluginSetup } from '../../charts/public';
+import { UsageCollectionSetup } from '../../usage_collection/public';
+import { DataPublicPluginStart } from '../../data/public';
+import { LEGACY_CHARTS_LIBRARY } from '../../visualizations/common/constants';
+import { pieLabels as pieLabelsExpressionFunction } from './expression_functions/pie_labels';
+import { createPieVisFn } from './pie_fn';
+import { getPieVisRenderer } from './pie_renderer';
+import { pieVisType } from './vis_type';
+
+/** @internal */
+export interface VisTypePieSetupDependencies {
+  visualizations: VisualizationsSetup;
+  expressions: ReturnType<ExpressionsPublicPlugin['setup']>;
+  charts: ChartsPluginSetup;
+  usageCollection: UsageCollectionSetup;
+}
+
+/** @internal */
+export interface VisTypePiePluginStartDependencies {
+  data: DataPublicPluginStart;
+}
+
+/** @internal */
+export interface VisTypePieDependencies {
+  theme: ChartsPluginSetup['theme'];
+  palettes: ChartsPluginSetup['palettes'];
+  getStartDeps: () => Promise<{ data: DataPublicPluginStart; docLinks: DocLinksStart }>;
+}
+
+export class VisTypePiePlugin {
+  setup(
+    core: CoreSetup<VisTypePiePluginStartDependencies>,
+    { expressions, visualizations, charts, usageCollection }: VisTypePieSetupDependencies
+  ) {
+    if (!core.uiSettings.get(LEGACY_CHARTS_LIBRARY, false)) {
+      const getStartDeps = async () => {
+        const [coreStart, deps] = await core.getStartServices();
+        return {
+          data: deps.data,
+          docLinks: coreStart.docLinks,
+        };
+      };
+      const trackUiMetric = usageCollection?.reportUiCounter.bind(usageCollection, 'vis_type_pie');
+
+      expressions.registerFunction(createPieVisFn);
+      expressions.registerRenderer(
+        getPieVisRenderer({ theme: charts.theme, palettes: charts.palettes, getStartDeps })
+      );
+      expressions.registerFunction(pieLabelsExpressionFunction);
+      visualizations.createBaseVisualization(
+        pieVisType({
+          showElasticChartsOptions: true,
+          palettes: charts.palettes,
+          trackUiMetric,
+        })
+      );
+    }
+    return {};
+  }
+
+  start() {}
+}
diff --git a/src/plugins/vis_type_pie/public/sample_vis.test.mocks.ts b/src/plugins/vis_type_pie/public/sample_vis.test.mocks.ts
new file mode 100644
index 0000000000000..3b07743e79f45
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/sample_vis.test.mocks.ts
@@ -0,0 +1,1332 @@
+/*
+ * Copyright 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 samplePieVis = {
+  type: {
+    name: 'pie',
+    title: 'Pie',
+    description: 'Compare parts of a whole',
+    icon: 'visPie',
+    stage: 'production',
+    options: {
+      showTimePicker: true,
+      showQueryBar: true,
+      showFilterBar: true,
+      showIndexSelection: true,
+      hierarchicalData: false,
+    },
+    visConfig: {
+      defaults: {
+        type: 'pie',
+        addTooltip: true,
+        addLegend: true,
+        legendPosition: 'right',
+        isDonut: true,
+        nestedLegend: true,
+        distinctColors: false,
+        palette: 'kibana_palette',
+        labels: {
+          show: false,
+          values: true,
+          last_level: true,
+          valuesFormat: 'percent',
+          percentDecimals: 2,
+          truncate: 100,
+        },
+      },
+    },
+    editorConfig: {
+      collections: {
+        legendPositions: [
+          {
+            text: 'Top',
+            value: 'top',
+          },
+          {
+            text: 'Left',
+            value: 'left',
+          },
+          {
+            text: 'Right',
+            value: 'right',
+          },
+          {
+            text: 'Bottom',
+            value: 'bottom',
+          },
+        ],
+      },
+      schemas: {
+        all: [
+          {
+            group: 'metrics',
+            name: 'metric',
+            title: 'Slice size',
+            min: 1,
+            max: 1,
+            aggFilter: ['sum', 'count', 'cardinality', 'top_hits'],
+            defaults: [
+              {
+                schema: 'metric',
+                type: 'count',
+              },
+            ],
+            editor: false,
+            params: [],
+          },
+          {
+            group: 'buckets',
+            name: 'segment',
+            title: 'Split slices',
+            min: 0,
+            max: null,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
+            editor: false,
+            params: [],
+          },
+          {
+            group: 'buckets',
+            name: 'split',
+            title: 'Split chart',
+            mustBeFirst: true,
+            min: 0,
+            max: 1,
+            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
+            params: [
+              {
+                name: 'row',
+                default: true,
+              },
+            ],
+            editor: false,
+          },
+        ],
+        buckets: [null, null],
+        metrics: [null],
+      },
+    },
+    hidden: false,
+    hierarchicalData: true,
+  },
+  title: '[Flights] Airline Carrier',
+  description: '',
+  params: {
+    type: 'pie',
+    addTooltip: true,
+    addLegend: true,
+    legendPosition: 'right',
+    isDonut: true,
+    labels: {
+      show: true,
+      values: true,
+      last_level: true,
+      truncate: 100,
+    },
+  },
+  data: {
+    indexPattern: { id: '123' },
+    searchSource: {
+      id: 'data_source1',
+      requestStartHandlers: [],
+      inheritOptions: {},
+      history: [],
+      fields: {
+        filter: [],
+        query: {
+          query: '',
+          language: 'kuery',
+        },
+        index: {
+          id: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+          title: 'kibana_sample_data_flights',
+          fieldFormatMap: {
+            AvgTicketPrice: {
+              id: 'number',
+              params: {
+                parsedUrl: {
+                  origin: 'http://localhost:5801',
+                  pathname: '/app/visualize',
+                  basePath: '',
+                },
+                pattern: '$0,0.[00]',
+              },
+            },
+            hour_of_day: {
+              id: 'number',
+              params: {
+                pattern: '00',
+              },
+            },
+          },
+          fields: [
+            {
+              count: 0,
+              name: 'AvgTicketPrice',
+              type: 'number',
+              esTypes: ['float'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'Cancelled',
+              type: 'boolean',
+              esTypes: ['boolean'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'Carrier',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'Dest',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DestAirportID',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DestCityName',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DestCountry',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DestLocation',
+              type: 'geo_point',
+              esTypes: ['geo_point'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DestRegion',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DestWeather',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DistanceKilometers',
+              type: 'number',
+              esTypes: ['float'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'DistanceMiles',
+              type: 'number',
+              esTypes: ['float'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'FlightDelay',
+              type: 'boolean',
+              esTypes: ['boolean'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'FlightDelayMin',
+              type: 'number',
+              esTypes: ['integer'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'FlightDelayType',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'FlightNum',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'FlightTimeHour',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'FlightTimeMin',
+              type: 'number',
+              esTypes: ['float'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'Origin',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'OriginAirportID',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'OriginCityName',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'OriginCountry',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'OriginLocation',
+              type: 'geo_point',
+              esTypes: ['geo_point'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'OriginRegion',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'OriginWeather',
+              type: 'string',
+              esTypes: ['keyword'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: '_id',
+              type: 'string',
+              esTypes: ['_id'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: false,
+            },
+            {
+              count: 0,
+              name: '_index',
+              type: 'string',
+              esTypes: ['_index'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: false,
+            },
+            {
+              count: 0,
+              name: '_score',
+              type: 'number',
+              scripted: false,
+              searchable: false,
+              aggregatable: false,
+              readFromDocValues: false,
+            },
+            {
+              count: 0,
+              name: '_source',
+              type: '_source',
+              esTypes: ['_source'],
+              scripted: false,
+              searchable: false,
+              aggregatable: false,
+              readFromDocValues: false,
+            },
+            {
+              count: 0,
+              name: '_type',
+              type: 'string',
+              esTypes: ['_type'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: false,
+            },
+            {
+              count: 0,
+              name: 'dayOfWeek',
+              type: 'number',
+              esTypes: ['integer'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              name: 'timestamp',
+              type: 'date',
+              esTypes: ['date'],
+              scripted: false,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: true,
+            },
+            {
+              count: 0,
+              script: "doc['timestamp'].value.hourOfDay",
+              lang: 'painless',
+              name: 'hour_of_day',
+              type: 'number',
+              scripted: true,
+              searchable: true,
+              aggregatable: true,
+              readFromDocValues: false,
+            },
+          ],
+          timeFieldName: 'timestamp',
+          metaFields: ['_source', '_id', '_type', '_index', '_score'],
+          version: 'WzM1LDFd',
+          originalSavedObjectBody: {
+            title: 'kibana_sample_data_flights',
+            timeFieldName: 'timestamp',
+            fields:
+              '[{"count":0,"name":"AvgTicketPrice","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Cancelled","type":"boolean","esTypes":["boolean"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Carrier","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Dest","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestAirportID","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestCityName","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestCountry","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestLocation","type":"geo_point","esTypes":["geo_point"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestRegion","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestWeather","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DistanceKilometers","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DistanceMiles","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightDelay","type":"boolean","esTypes":["boolean"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightDelayMin","type":"number","esTypes":["integer"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightDelayType","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightNum","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightTimeHour","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightTimeMin","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Origin","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginAirportID","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginCityName","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginCountry","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginLocation","type":"geo_point","esTypes":["geo_point"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginRegion","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginWeather","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"_id","type":"string","esTypes":["_id"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"count":0,"name":"_index","type":"string","esTypes":["_index"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"count":0,"name":"_score","type":"number","scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"count":0,"name":"_source","type":"_source","esTypes":["_source"],"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"count":0,"name":"_type","type":"string","esTypes":["_type"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"count":0,"name":"dayOfWeek","type":"number","esTypes":["integer"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"timestamp","type":"date","esTypes":["date"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"script":"doc[\'timestamp\'].value.hourOfDay","lang":"painless","name":"hour_of_day","type":"number","scripted":true,"searchable":true,"aggregatable":true,"readFromDocValues":false}]',
+            fieldFormatMap:
+              '{"AvgTicketPrice":{"id":"number","params":{"parsedUrl":{"origin":"http://localhost:5801","pathname":"/app/visualize","basePath":""},"pattern":"$0,0.[00]"}},"hour_of_day":{"id":"number","params":{"parsedUrl":{"origin":"http://localhost:5801","pathname":"/app/visualize","basePath":""},"pattern":"00"}}}',
+          },
+          shortDotsEnable: false,
+          fieldFormats: {
+            fieldFormats: {},
+            defaultMap: {
+              ip: {
+                id: 'ip',
+                params: {},
+              },
+              date: {
+                id: 'date',
+                params: {},
+              },
+              date_nanos: {
+                id: 'date_nanos',
+                params: {},
+                es: true,
+              },
+              number: {
+                id: 'number',
+                params: {},
+              },
+              boolean: {
+                id: 'boolean',
+                params: {},
+              },
+              _source: {
+                id: '_source',
+                params: {},
+              },
+              _default_: {
+                id: 'string',
+                params: {},
+              },
+            },
+            metaParamsOptions: {},
+          },
+        },
+      },
+      dependencies: {
+        legacy: {
+          loadingCount$: {
+            _isScalar: false,
+            observers: [
+              {
+                closed: false,
+                _parentOrParents: {
+                  closed: false,
+                  _parentOrParents: {
+                    closed: false,
+                    _parentOrParents: {
+                      closed: false,
+                      _parentOrParents: {
+                        closed: false,
+                        _parentOrParents: {
+                          closed: false,
+                          _parentOrParents: {
+                            closed: false,
+                            _parentOrParents: {
+                              closed: false,
+                              _parentOrParents: null,
+                              _subscriptions: [null],
+                              syncErrorValue: null,
+                              syncErrorThrown: false,
+                              syncErrorThrowable: true,
+                              isStopped: false,
+                              destination: {
+                                closed: false,
+                                _parentOrParents: null,
+                                _subscriptions: null,
+                                syncErrorValue: null,
+                                syncErrorThrown: false,
+                                syncErrorThrowable: false,
+                                isStopped: false,
+                                destination: {
+                                  closed: true,
+                                },
+                                _context: {},
+                              },
+                            },
+                            _subscriptions: [null],
+                            syncErrorValue: null,
+                            syncErrorThrown: false,
+                            syncErrorThrowable: true,
+                            isStopped: false,
+                            count: 1,
+                          },
+                          _subscriptions: [null],
+                          syncErrorValue: null,
+                          syncErrorThrown: false,
+                          syncErrorThrowable: true,
+                          isStopped: false,
+                          hasPrev: true,
+                          prev: 0,
+                        },
+                        _subscriptions: [null],
+                        syncErrorValue: null,
+                        syncErrorThrown: false,
+                        syncErrorThrowable: false,
+                        isStopped: false,
+                        parent: {
+                          closed: true,
+                          _parentOrParents: null,
+                          _subscriptions: null,
+                          syncErrorValue: null,
+                          syncErrorThrown: false,
+                          syncErrorThrowable: true,
+                          isStopped: true,
+                          concurrent: 1,
+                          hasCompleted: true,
+                          buffer: [],
+                          active: 1,
+                          index: 2,
+                        },
+                      },
+                      _subscriptions: [null],
+                      syncErrorValue: null,
+                      syncErrorThrown: false,
+                      syncErrorThrowable: false,
+                      isStopped: false,
+                      parent: {
+                        closed: true,
+                        _parentOrParents: null,
+                        _subscriptions: null,
+                        syncErrorValue: null,
+                        syncErrorThrown: false,
+                        syncErrorThrowable: false,
+                        isStopped: true,
+                        concurrent: 1,
+                        hasCompleted: true,
+                        buffer: [
+                          {
+                            _isScalar: false,
+                          },
+                        ],
+                        active: 1,
+                        index: 1,
+                      },
+                    },
+                    _subscriptions: [
+                      {
+                        closed: false,
+                        _subscriptions: [
+                          {
+                            closed: false,
+                            _subscriptions: null,
+                            subject: {
+                              _isScalar: false,
+                              observers: [
+                                {
+                                  closed: false,
+                                  _parentOrParents: {
+                                    closed: false,
+                                    _parentOrParents: {
+                                      closed: false,
+                                      _parentOrParents: {
+                                        closed: false,
+                                        _parentOrParents: {
+                                          closed: false,
+                                          _parentOrParents: {
+                                            closed: false,
+                                            _parentOrParents: {
+                                              closed: false,
+                                              _parentOrParents: null,
+                                              _subscriptions: [null],
+                                              syncErrorValue: null,
+                                              syncErrorThrown: false,
+                                              syncErrorThrowable: true,
+                                              isStopped: false,
+                                              destination: {
+                                                closed: false,
+                                                _parentOrParents: null,
+                                                _subscriptions: null,
+                                                syncErrorValue: null,
+                                                syncErrorThrown: false,
+                                                syncErrorThrowable: false,
+                                                isStopped: false,
+                                                _context: {},
+                                              },
+                                            },
+                                            _subscriptions: [null],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: true,
+                                            isStopped: false,
+                                            count: 13,
+                                          },
+                                          _subscriptions: [null],
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: false,
+                                          hasPrev: true,
+                                          prev: 0,
+                                        },
+                                        _subscriptions: [null],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                        parent: {
+                                          closed: true,
+                                          _parentOrParents: null,
+                                          _subscriptions: null,
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: true,
+                                          concurrent: 1,
+                                          hasCompleted: true,
+                                          buffer: [],
+                                          active: 1,
+                                          index: 2,
+                                        },
+                                      },
+                                      _subscriptions: [null],
+                                      syncErrorValue: null,
+                                      syncErrorThrown: false,
+                                      syncErrorThrowable: false,
+                                      isStopped: false,
+                                      parent: {
+                                        closed: true,
+                                        _parentOrParents: null,
+                                        _subscriptions: null,
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: true,
+                                        concurrent: 1,
+                                        hasCompleted: true,
+                                        buffer: [
+                                          {
+                                            _isScalar: false,
+                                          },
+                                        ],
+                                        active: 1,
+                                        index: 1,
+                                      },
+                                    },
+                                    _subscriptions: [
+                                      null,
+                                      {
+                                        closed: false,
+                                        _subscriptions: [
+                                          {
+                                            closed: false,
+                                            _subscriptions: [
+                                              {
+                                                closed: false,
+                                                _subscriptions: null,
+                                                subject: {
+                                                  _isScalar: false,
+                                                  observers: [null],
+                                                  closed: false,
+                                                  isStopped: false,
+                                                  hasError: false,
+                                                  thrownError: null,
+                                                  _value: 0,
+                                                },
+                                              },
+                                            ],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: false,
+                                            isStopped: false,
+                                            hasKey: true,
+                                            key: 0,
+                                          },
+                                        ],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                      },
+                                    ],
+                                    syncErrorValue: null,
+                                    syncErrorThrown: false,
+                                    syncErrorThrowable: false,
+                                    isStopped: false,
+                                    seenValue: false,
+                                  },
+                                  _subscriptions: [
+                                    {
+                                      closed: false,
+                                      _subscriptions: null,
+                                    },
+                                  ],
+                                  syncErrorValue: null,
+                                  syncErrorThrown: false,
+                                  syncErrorThrowable: false,
+                                  isStopped: false,
+                                },
+                                {
+                                  closed: false,
+                                  _parentOrParents: {
+                                    closed: false,
+                                    _parentOrParents: {
+                                      closed: false,
+                                      _parentOrParents: {
+                                        closed: false,
+                                        _parentOrParents: {
+                                          closed: false,
+                                          _parentOrParents: {
+                                            closed: false,
+                                            _parentOrParents: {
+                                              closed: false,
+                                              _parentOrParents: null,
+                                              _subscriptions: [null],
+                                              syncErrorValue: null,
+                                              syncErrorThrown: false,
+                                              syncErrorThrowable: true,
+                                              isStopped: false,
+                                              destination: {
+                                                closed: false,
+                                                _parentOrParents: null,
+                                                _subscriptions: null,
+                                                syncErrorValue: null,
+                                                syncErrorThrown: false,
+                                                syncErrorThrowable: false,
+                                                isStopped: false,
+                                                _context: {},
+                                              },
+                                            },
+                                            _subscriptions: [null],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: true,
+                                            isStopped: false,
+                                            count: 1,
+                                          },
+                                          _subscriptions: [null],
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: false,
+                                          hasPrev: true,
+                                          prev: 0,
+                                        },
+                                        _subscriptions: [null],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                        parent: {
+                                          closed: true,
+                                          _parentOrParents: null,
+                                          _subscriptions: null,
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: true,
+                                          concurrent: 1,
+                                          hasCompleted: true,
+                                          buffer: [],
+                                          active: 1,
+                                          index: 2,
+                                        },
+                                      },
+                                      _subscriptions: [null],
+                                      syncErrorValue: null,
+                                      syncErrorThrown: false,
+                                      syncErrorThrowable: false,
+                                      isStopped: false,
+                                      parent: {
+                                        closed: true,
+                                        _parentOrParents: null,
+                                        _subscriptions: null,
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: true,
+                                        concurrent: 1,
+                                        hasCompleted: true,
+                                        buffer: [
+                                          {
+                                            _isScalar: false,
+                                          },
+                                        ],
+                                        active: 1,
+                                        index: 1,
+                                      },
+                                    },
+                                    _subscriptions: [
+                                      null,
+                                      {
+                                        closed: false,
+                                        _subscriptions: [
+                                          {
+                                            closed: false,
+                                            _subscriptions: [
+                                              {
+                                                closed: false,
+                                                _subscriptions: null,
+                                                subject: {
+                                                  _isScalar: false,
+                                                  observers: [null],
+                                                  closed: false,
+                                                  isStopped: false,
+                                                  hasError: false,
+                                                  thrownError: null,
+                                                  _value: 0,
+                                                },
+                                              },
+                                            ],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: false,
+                                            isStopped: false,
+                                            hasKey: true,
+                                            key: 0,
+                                          },
+                                        ],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                      },
+                                    ],
+                                    syncErrorValue: null,
+                                    syncErrorThrown: false,
+                                    syncErrorThrowable: false,
+                                    isStopped: false,
+                                    seenValue: false,
+                                  },
+                                  _subscriptions: [
+                                    {
+                                      closed: false,
+                                      _subscriptions: null,
+                                    },
+                                  ],
+                                  syncErrorValue: null,
+                                  syncErrorThrown: false,
+                                  syncErrorThrowable: false,
+                                  isStopped: false,
+                                },
+                                {
+                                  closed: false,
+                                  _parentOrParents: {
+                                    closed: false,
+                                    _parentOrParents: {
+                                      closed: false,
+                                      _parentOrParents: {
+                                        closed: false,
+                                        _parentOrParents: {
+                                          closed: false,
+                                          _parentOrParents: {
+                                            closed: false,
+                                            _parentOrParents: {
+                                              closed: false,
+                                              _parentOrParents: null,
+                                              _subscriptions: [null],
+                                              syncErrorValue: null,
+                                              syncErrorThrown: false,
+                                              syncErrorThrowable: true,
+                                              isStopped: false,
+                                              destination: {
+                                                closed: false,
+                                                _parentOrParents: null,
+                                                _subscriptions: null,
+                                                syncErrorValue: null,
+                                                syncErrorThrown: false,
+                                                syncErrorThrowable: false,
+                                                isStopped: false,
+                                                _context: {},
+                                              },
+                                            },
+                                            _subscriptions: [null],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: true,
+                                            isStopped: false,
+                                            count: 1,
+                                          },
+                                          _subscriptions: [null],
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: false,
+                                          hasPrev: true,
+                                          prev: 0,
+                                        },
+                                        _subscriptions: [null],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                        parent: {
+                                          closed: true,
+                                          _parentOrParents: null,
+                                          _subscriptions: null,
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: true,
+                                          concurrent: 1,
+                                          hasCompleted: true,
+                                          buffer: [],
+                                          active: 1,
+                                          index: 2,
+                                        },
+                                      },
+                                      _subscriptions: [null],
+                                      syncErrorValue: null,
+                                      syncErrorThrown: false,
+                                      syncErrorThrowable: false,
+                                      isStopped: false,
+                                      parent: {
+                                        closed: true,
+                                        _parentOrParents: null,
+                                        _subscriptions: null,
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: true,
+                                        concurrent: 1,
+                                        hasCompleted: true,
+                                        buffer: [
+                                          {
+                                            _isScalar: false,
+                                          },
+                                        ],
+                                        active: 1,
+                                        index: 1,
+                                      },
+                                    },
+                                    _subscriptions: [
+                                      null,
+                                      {
+                                        closed: false,
+                                        _subscriptions: [
+                                          {
+                                            closed: false,
+                                            _subscriptions: [
+                                              {
+                                                closed: false,
+                                                _subscriptions: null,
+                                                subject: {
+                                                  _isScalar: false,
+                                                  observers: [null],
+                                                  closed: false,
+                                                  isStopped: false,
+                                                  hasError: false,
+                                                  thrownError: null,
+                                                  _value: 0,
+                                                },
+                                              },
+                                            ],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: false,
+                                            isStopped: false,
+                                            hasKey: true,
+                                            key: 0,
+                                          },
+                                        ],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                      },
+                                    ],
+                                    syncErrorValue: null,
+                                    syncErrorThrown: false,
+                                    syncErrorThrowable: false,
+                                    isStopped: false,
+                                    seenValue: false,
+                                  },
+                                  _subscriptions: [
+                                    {
+                                      closed: false,
+                                      _subscriptions: null,
+                                    },
+                                  ],
+                                  syncErrorValue: null,
+                                  syncErrorThrown: false,
+                                  syncErrorThrowable: false,
+                                  isStopped: false,
+                                },
+                                {
+                                  closed: false,
+                                  _parentOrParents: {
+                                    closed: false,
+                                    _parentOrParents: {
+                                      closed: false,
+                                      _parentOrParents: {
+                                        closed: false,
+                                        _parentOrParents: {
+                                          closed: false,
+                                          _parentOrParents: {
+                                            closed: false,
+                                            _parentOrParents: {
+                                              closed: false,
+                                              _parentOrParents: null,
+                                              _subscriptions: [null],
+                                              syncErrorValue: null,
+                                              syncErrorThrown: false,
+                                              syncErrorThrowable: true,
+                                              isStopped: false,
+                                              destination: {
+                                                closed: false,
+                                                _parentOrParents: null,
+                                                _subscriptions: null,
+                                                syncErrorValue: null,
+                                                syncErrorThrown: false,
+                                                syncErrorThrowable: false,
+                                                isStopped: false,
+                                                _context: {},
+                                              },
+                                            },
+                                            _subscriptions: [null],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: true,
+                                            isStopped: false,
+                                            count: 3,
+                                          },
+                                          _subscriptions: [null],
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: false,
+                                          hasPrev: true,
+                                          prev: 0,
+                                        },
+                                        _subscriptions: [null],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                        parent: {
+                                          closed: true,
+                                          _parentOrParents: null,
+                                          _subscriptions: null,
+                                          syncErrorValue: null,
+                                          syncErrorThrown: false,
+                                          syncErrorThrowable: true,
+                                          isStopped: true,
+                                          concurrent: 1,
+                                          hasCompleted: true,
+                                          buffer: [],
+                                          active: 1,
+                                          index: 2,
+                                        },
+                                      },
+                                      _subscriptions: [null],
+                                      syncErrorValue: null,
+                                      syncErrorThrown: false,
+                                      syncErrorThrowable: false,
+                                      isStopped: false,
+                                      parent: {
+                                        closed: true,
+                                        _parentOrParents: null,
+                                        _subscriptions: null,
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: true,
+                                        concurrent: 1,
+                                        hasCompleted: true,
+                                        buffer: [
+                                          {
+                                            _isScalar: false,
+                                          },
+                                        ],
+                                        active: 1,
+                                        index: 1,
+                                      },
+                                    },
+                                    _subscriptions: [
+                                      null,
+                                      {
+                                        closed: false,
+                                        _subscriptions: [
+                                          {
+                                            closed: false,
+                                            _subscriptions: [
+                                              {
+                                                closed: false,
+                                                _subscriptions: null,
+                                                subject: {
+                                                  _isScalar: false,
+                                                  observers: [null],
+                                                  closed: false,
+                                                  isStopped: false,
+                                                  hasError: false,
+                                                  thrownError: null,
+                                                  _value: 0,
+                                                },
+                                              },
+                                            ],
+                                            syncErrorValue: null,
+                                            syncErrorThrown: false,
+                                            syncErrorThrowable: false,
+                                            isStopped: false,
+                                            hasKey: true,
+                                            key: 0,
+                                          },
+                                        ],
+                                        syncErrorValue: null,
+                                        syncErrorThrown: false,
+                                        syncErrorThrowable: false,
+                                        isStopped: false,
+                                      },
+                                    ],
+                                    syncErrorValue: null,
+                                    syncErrorThrown: false,
+                                    syncErrorThrowable: false,
+                                    isStopped: false,
+                                    seenValue: false,
+                                  },
+                                  _subscriptions: [
+                                    {
+                                      closed: false,
+                                      _subscriptions: null,
+                                    },
+                                  ],
+                                  syncErrorValue: null,
+                                  syncErrorThrown: false,
+                                  syncErrorThrowable: false,
+                                  isStopped: false,
+                                },
+                                null,
+                              ],
+                              closed: false,
+                              isStopped: false,
+                              hasError: false,
+                              thrownError: null,
+                            },
+                          },
+                        ],
+                        syncErrorValue: null,
+                        syncErrorThrown: false,
+                        syncErrorThrowable: false,
+                        isStopped: false,
+                      },
+                      null,
+                    ],
+                    syncErrorValue: null,
+                    syncErrorThrown: false,
+                    syncErrorThrowable: false,
+                    isStopped: false,
+                    seenValue: false,
+                  },
+                  _subscriptions: [null],
+                  syncErrorValue: null,
+                  syncErrorThrown: false,
+                  syncErrorThrowable: false,
+                  isStopped: false,
+                },
+                _subscriptions: [
+                  {
+                    closed: false,
+                    _subscriptions: null,
+                  },
+                ],
+                syncErrorValue: null,
+                syncErrorThrown: false,
+                syncErrorThrowable: false,
+                isStopped: false,
+                hasKey: true,
+                key: 0,
+              },
+            ],
+            closed: false,
+            isStopped: false,
+            hasError: false,
+            thrownError: null,
+            _value: 0,
+          },
+        },
+      },
+    },
+    aggs: {
+      typesRegistry: {},
+      getResponseAggs: () => [
+        {
+          id: '1',
+          enabled: true,
+          type: 'count',
+          params: {},
+          schema: 'metric',
+          toSerializedFieldFormat: () => ({
+            id: 'number',
+          }),
+        },
+        {
+          id: '2',
+          enabled: true,
+          type: 'terms',
+          params: {
+            field: 'Carrier',
+            orderBy: '1',
+            order: 'desc',
+            size: 5,
+            otherBucket: false,
+            otherBucketLabel: 'Other',
+            missingBucket: false,
+            missingBucketLabel: 'Missing',
+          },
+          schema: 'segment',
+          toSerializedFieldFormat: () => ({
+            id: 'terms',
+            params: {
+              id: 'string',
+              otherBucketLabel: 'Other',
+              missingBucketLabel: 'Missing',
+              parsedUrl: {
+                origin: 'http://localhost:5801',
+                pathname: '/app/visualize',
+                basePath: '',
+              },
+            },
+          }),
+        },
+      ],
+      aggs: [],
+    },
+  },
+  isHierarchical: () => true,
+  uiState: {
+    vis: {
+      legendOpen: false,
+    },
+  },
+};
diff --git a/src/plugins/vis_type_pie/public/to_ast.test.ts b/src/plugins/vis_type_pie/public/to_ast.test.ts
new file mode 100644
index 0000000000000..019c6e2176710
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/to_ast.test.ts
@@ -0,0 +1,31 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { Vis } from '../../visualizations/public';
+
+import { PieVisParams } from './types';
+import { samplePieVis } from './sample_vis.test.mocks';
+import { toExpressionAst } from './to_ast';
+
+describe('vis type pie vis toExpressionAst function', () => {
+  let vis: Vis<PieVisParams>;
+  const params = {
+    timefilter: {},
+    timeRange: {},
+    abortSignal: {},
+  } as any;
+
+  beforeEach(() => {
+    vis = samplePieVis as any;
+  });
+
+  it('should match basic snapshot', async () => {
+    const actual = await toExpressionAst(vis, params);
+    expect(actual).toMatchSnapshot();
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/to_ast.ts b/src/plugins/vis_type_pie/public/to_ast.ts
new file mode 100644
index 0000000000000..e8c9f301b4366
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/to_ast.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 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 { getVisSchemas, VisToExpressionAst, SchemaConfig } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import { PieVisParams, LabelsParams } from './types';
+import { vislibPieName, VisTypePieExpressionFunctionDefinition } from './pie_fn';
+import { getEsaggsFn } from './to_ast_esaggs';
+
+const prepareDimension = (params: SchemaConfig) => {
+  const visdimension = buildExpressionFunction('visdimension', { accessor: params.accessor });
+
+  if (params.format) {
+    visdimension.addArgument('format', params.format.id);
+    visdimension.addArgument('formatParams', JSON.stringify(params.format.params));
+  }
+
+  return buildExpression([visdimension]);
+};
+
+const prepareLabels = (params: LabelsParams) => {
+  const pieLabels = buildExpressionFunction('pielabels', {
+    show: params.show,
+    lastLevel: params.last_level,
+    values: params.values,
+    truncate: params.truncate,
+  });
+  if (params.position) {
+    pieLabels.addArgument('position', params.position);
+  }
+  if (params.valuesFormat) {
+    pieLabels.addArgument('valuesFormat', params.valuesFormat);
+  }
+  if (params.percentDecimals != null) {
+    pieLabels.addArgument('percentDecimals', params.percentDecimals);
+  }
+  return buildExpression([pieLabels]);
+};
+
+export const toExpressionAst: VisToExpressionAst<PieVisParams> = async (vis, params) => {
+  const schemas = getVisSchemas(vis, params);
+  const args = {
+    // explicitly pass each param to prevent extra values trapping
+    addTooltip: vis.params.addTooltip,
+    addLegend: vis.params.addLegend,
+    legendPosition: vis.params.legendPosition,
+    nestedLegend: vis.params?.nestedLegend,
+    distinctColors: vis.params?.distinctColors,
+    isDonut: vis.params.isDonut,
+    palette: vis.params?.palette?.name,
+    labels: prepareLabels(vis.params.labels),
+    metric: schemas.metric.map(prepareDimension),
+    buckets: schemas.segment?.map(prepareDimension),
+    splitColumn: schemas.split_column?.map(prepareDimension),
+    splitRow: schemas.split_row?.map(prepareDimension),
+  };
+
+  const visTypePie = buildExpressionFunction<VisTypePieExpressionFunctionDefinition>(
+    vislibPieName,
+    args
+  );
+
+  const ast = buildExpression([getEsaggsFn(vis), visTypePie]);
+
+  return ast.toAst();
+};
diff --git a/src/plugins/vis_type_pie/public/to_ast_esaggs.ts b/src/plugins/vis_type_pie/public/to_ast_esaggs.ts
new file mode 100644
index 0000000000000..9b760bd4bebcc
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/to_ast_esaggs.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 { Vis } from '../../visualizations/public';
+import { buildExpression, buildExpressionFunction } from '../../expressions/public';
+import {
+  EsaggsExpressionFunctionDefinition,
+  IndexPatternLoadExpressionFunctionDefinition,
+} from '../../data/public';
+
+import { PieVisParams } from './types';
+
+/**
+ * Get esaggs expressions function
+ * @param vis
+ */
+export function getEsaggsFn(vis: Vis<PieVisParams>) {
+  return buildExpressionFunction<EsaggsExpressionFunctionDefinition>('esaggs', {
+    index: buildExpression([
+      buildExpressionFunction<IndexPatternLoadExpressionFunctionDefinition>('indexPatternLoad', {
+        id: vis.data.indexPattern!.id!,
+      }),
+    ]),
+    metricsAtAllLevels: vis.isHierarchical(),
+    partialRows: false,
+    aggs: vis.data.aggs!.aggs.map((agg) => buildExpression(agg.toExpressionAst())),
+  });
+}
diff --git a/src/plugins/vis_type_pie/public/types/index.ts b/src/plugins/vis_type_pie/public/types/index.ts
new file mode 100644
index 0000000000000..12594660136d8
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/types/index.ts
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 './types';
diff --git a/src/plugins/vis_type_pie/public/types/types.ts b/src/plugins/vis_type_pie/public/types/types.ts
new file mode 100644
index 0000000000000..4f3365545d062
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/types/types.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 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 { Position } from '@elastic/charts';
+import { UiCounterMetricType } from '@kbn/analytics';
+import { DatatableColumn, SerializedFieldFormat } from '../../../expressions/public';
+import { ExpressionValueVisDimension } from '../../../visualizations/public';
+import { ExpressionValuePieLabels } from '../expression_functions/pie_labels';
+import { PaletteOutput, ChartsPluginSetup } from '../../../charts/public';
+
+export interface Dimension {
+  accessor: number;
+  format: {
+    id?: string;
+    params?: SerializedFieldFormat<object>;
+  };
+}
+
+export interface Dimensions {
+  metric: Dimension;
+  buckets?: Dimension[];
+  splitRow?: Dimension[];
+  splitColumn?: Dimension[];
+}
+
+interface PieCommonParams {
+  addTooltip: boolean;
+  addLegend: boolean;
+  legendPosition: Position;
+  nestedLegend: boolean;
+  distinctColors: boolean;
+  isDonut: boolean;
+}
+
+export interface LabelsParams {
+  show: boolean;
+  last_level: boolean;
+  position: LabelPositions;
+  values: boolean;
+  truncate: number | null;
+  valuesFormat: ValueFormats;
+  percentDecimals: number;
+}
+
+export interface PieVisParams extends PieCommonParams {
+  dimensions: Dimensions;
+  labels: LabelsParams;
+  palette: PaletteOutput;
+}
+
+export interface PieVisConfig extends PieCommonParams {
+  buckets?: ExpressionValueVisDimension[];
+  metric: ExpressionValueVisDimension;
+  splitColumn?: ExpressionValueVisDimension[];
+  splitRow?: ExpressionValueVisDimension[];
+  labels: ExpressionValuePieLabels;
+  palette: string;
+}
+
+export interface BucketColumns extends DatatableColumn {
+  format?: {
+    id?: string;
+    params?: SerializedFieldFormat<object>;
+  };
+}
+
+export enum LabelPositions {
+  INSIDE = 'inside',
+  DEFAULT = 'default',
+}
+
+export enum ValueFormats {
+  PERCENT = 'percent',
+  VALUE = 'value',
+}
+
+export interface PieTypeProps {
+  showElasticChartsOptions?: boolean;
+  palettes?: ChartsPluginSetup['palettes'];
+  trackUiMetric?: (metricType: UiCounterMetricType, eventName: string | string[]) => void;
+}
+
+export interface SplitDimensionParams {
+  order?: string;
+  orderBy?: string;
+}
+
+export interface PieContainerDimensions {
+  width: number;
+  height: number;
+}
diff --git a/src/plugins/vis_type_pie/public/utils/filter_helpers.test.ts b/src/plugins/vis_type_pie/public/utils/filter_helpers.test.ts
new file mode 100644
index 0000000000000..3f532cf4c384f
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/filter_helpers.test.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { DatatableColumn } from '../../../expressions/public';
+import { getFilterClickData, getFilterEventData } from './filter_helpers';
+import { createMockBucketColumns, createMockVisData } from '../mocks';
+
+const bucketColumns = createMockBucketColumns();
+const visData = createMockVisData();
+
+describe('getFilterClickData', () => {
+  it('returns the correct filter data for the specific layer', () => {
+    const clickedLayers = [
+      {
+        groupByRollup: 'Logstash Airways',
+        value: 729,
+        depth: 1,
+        path: [],
+        sortIndex: 1,
+        smAccessorValue: '',
+      },
+    ];
+    const data = getFilterClickData(clickedLayers, bucketColumns, visData);
+    expect(data.length).toEqual(clickedLayers.length);
+    expect(data[0].value).toEqual('Logstash Airways');
+    expect(data[0].row).toEqual(0);
+    expect(data[0].column).toEqual(0);
+  });
+
+  it('changes the filter if the user clicks on another layer', () => {
+    const clickedLayers = [
+      {
+        groupByRollup: 'ES-Air',
+        value: 572,
+        depth: 1,
+        path: [],
+        sortIndex: 1,
+        smAccessorValue: '',
+      },
+    ];
+    const data = getFilterClickData(clickedLayers, bucketColumns, visData);
+    expect(data.length).toEqual(clickedLayers.length);
+    expect(data[0].value).toEqual('ES-Air');
+    expect(data[0].row).toEqual(4);
+    expect(data[0].column).toEqual(0);
+  });
+
+  it('returns the correct filters for small multiples', () => {
+    const clickedLayers = [
+      {
+        groupByRollup: 'ES-Air',
+        value: 572,
+        depth: 1,
+        path: [],
+        sortIndex: 1,
+        smAccessorValue: 1,
+      },
+    ];
+    const splitDimension = {
+      id: 'col-2-3',
+      name: 'Cancelled: Descending',
+    } as DatatableColumn;
+    const data = getFilterClickData(clickedLayers, bucketColumns, visData, splitDimension);
+    expect(data.length).toEqual(2);
+    expect(data[0].value).toEqual('ES-Air');
+    expect(data[0].row).toEqual(5);
+    expect(data[0].column).toEqual(0);
+    expect(data[1].value).toEqual(1);
+  });
+});
+
+describe('getFilterEventData', () => {
+  it('returns the correct filter data for the specific series', () => {
+    const series = {
+      key: 'Kibana Airlines',
+      specId: 'pie',
+    };
+    const data = getFilterEventData(visData, series);
+    expect(data[0].value).toEqual('Kibana Airlines');
+    expect(data[0].row).toEqual(6);
+    expect(data[0].column).toEqual(0);
+  });
+
+  it('changes the filter if the user clicks on another series', () => {
+    const series = {
+      key: 'JetBeats',
+      specId: 'pie',
+    };
+    const data = getFilterEventData(visData, series);
+    expect(data[0].value).toEqual('JetBeats');
+    expect(data[0].row).toEqual(2);
+    expect(data[0].column).toEqual(0);
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/utils/filter_helpers.ts b/src/plugins/vis_type_pie/public/utils/filter_helpers.ts
new file mode 100644
index 0000000000000..251ff8acc698e
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/filter_helpers.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 { LayerValue, SeriesIdentifier } from '@elastic/charts';
+import { Datatable, DatatableColumn } from '../../../expressions/public';
+import { DataPublicPluginStart, FieldFormat } from '../../../data/public';
+import { ClickTriggerEvent } from '../../../charts/public';
+import { ValueClickContext } from '../../../embeddable/public';
+import { BucketColumns } from '../types';
+
+export const canFilter = async (
+  event: ClickTriggerEvent | null,
+  actions: DataPublicPluginStart['actions']
+): Promise<boolean> => {
+  if (!event) {
+    return false;
+  }
+  const filters = await actions.createFiltersFromValueClickAction(event.data);
+  return Boolean(filters.length);
+};
+
+export const getFilterClickData = (
+  clickedLayers: LayerValue[],
+  bucketColumns: Array<Partial<BucketColumns>>,
+  visData: Datatable,
+  splitChartDimension?: DatatableColumn,
+  splitChartFormatter?: FieldFormat
+): ValueClickContext['data']['data'] => {
+  const data: ValueClickContext['data']['data'] = [];
+  const matchingIndex = visData.rows.findIndex((row) =>
+    clickedLayers.every((layer, index) => {
+      const columnId = bucketColumns[index].id;
+      if (!columnId) return;
+      const isCurrentLayer = row[columnId] === layer.groupByRollup;
+      if (!splitChartDimension) {
+        return isCurrentLayer;
+      }
+      const value =
+        splitChartFormatter?.convert(row[splitChartDimension.id]) || row[splitChartDimension.id];
+      return isCurrentLayer && value === layer.smAccessorValue;
+    })
+  );
+
+  data.push(
+    ...clickedLayers.map((clickedLayer, index) => ({
+      column: visData.columns.findIndex((col) => col.id === bucketColumns[index].id),
+      row: matchingIndex,
+      value: clickedLayer.groupByRollup,
+      table: visData,
+    }))
+  );
+
+  // Allows filtering with the small multiples value
+  if (splitChartDimension) {
+    data.push({
+      column: visData.columns.findIndex((col) => col.id === splitChartDimension.id),
+      row: matchingIndex,
+      table: visData,
+      value: clickedLayers[0].smAccessorValue,
+    });
+  }
+
+  return data;
+};
+
+export const getFilterEventData = (
+  visData: Datatable,
+  series: SeriesIdentifier
+): ValueClickContext['data']['data'] => {
+  return visData.columns.reduce<ValueClickContext['data']['data']>((acc, { id }, column) => {
+    const value = series.key;
+    const row = visData.rows.findIndex((r) => r[id] === value);
+    if (row > -1) {
+      acc.push({
+        table: visData,
+        column,
+        row,
+        value,
+      });
+    }
+
+    return acc;
+  }, []);
+};
diff --git a/src/plugins/vis_type_pie/public/utils/get_color_picker.test.tsx b/src/plugins/vis_type_pie/public/utils/get_color_picker.test.tsx
new file mode 100644
index 0000000000000..5e9087947b95e
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_color_picker.test.tsx
@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { LegendColorPickerProps } from '@elastic/charts';
+import { EuiPopover } from '@elastic/eui';
+import { mountWithIntl } from '@kbn/test/jest';
+import { ComponentType, ReactWrapper } from 'enzyme';
+import { getColorPicker } from './get_color_picker';
+import { ColorPicker } from '../../../charts/public';
+import type { PersistedState } from '../../../visualizations/public';
+import { createMockBucketColumns, createMockVisData } from '../mocks';
+
+const bucketColumns = createMockBucketColumns();
+const visData = createMockVisData();
+
+jest.mock('@elastic/charts', () => {
+  const original = jest.requireActual('@elastic/charts');
+
+  return {
+    ...original,
+    getSpecId: jest.fn(() => {}),
+  };
+});
+
+describe('getColorPicker', function () {
+  const mockState = new Map();
+  const uiState = ({
+    get: jest
+      .fn()
+      .mockImplementation((key, fallback) => (mockState.has(key) ? mockState.get(key) : fallback)),
+    set: jest.fn().mockImplementation((key, value) => mockState.set(key, value)),
+    emit: jest.fn(),
+    setSilent: jest.fn(),
+  } as unknown) as PersistedState;
+
+  let wrapperProps: LegendColorPickerProps;
+  const Component: ComponentType<LegendColorPickerProps> = getColorPicker(
+    'left',
+    jest.fn(),
+    bucketColumns,
+    'default',
+    visData.rows,
+    uiState,
+    false
+  );
+  let wrapper: ReactWrapper<LegendColorPickerProps>;
+
+  beforeAll(() => {
+    wrapperProps = {
+      color: 'rgb(109, 204, 177)',
+      onClose: jest.fn(),
+      onChange: jest.fn(),
+      anchor: document.createElement('div'),
+      seriesIdentifiers: [
+        {
+          key: 'Logstash Airways',
+          specId: 'pie',
+        },
+      ],
+    };
+  });
+
+  it('renders the color picker for default palette and inner layer', () => {
+    wrapper = mountWithIntl(<Component {...wrapperProps} />);
+    expect(wrapper.find(ColorPicker).length).toBe(1);
+  });
+
+  it('renders the picker on the correct position', () => {
+    wrapper = mountWithIntl(<Component {...wrapperProps} />);
+    expect(wrapper.find(EuiPopover).prop('anchorPosition')).toEqual('rightCenter');
+  });
+
+  it('converts the color to the right hex and passes it to the color picker', () => {
+    wrapper = mountWithIntl(<Component {...wrapperProps} />);
+    expect(wrapper.find(ColorPicker).prop('color')).toEqual('#6dccb1');
+  });
+
+  it('doesnt render the picker for default palette and not inner layer', () => {
+    const newProps = { ...wrapperProps, seriesIdentifier: { key: '1', specId: 'pie' } };
+    wrapper = mountWithIntl(<Component {...newProps} />);
+    expect(wrapper).toEqual({});
+  });
+
+  it('renders the color picker with the colorIsOverwritten prop set to false if color is not overwritten for the specific series', () => {
+    wrapper = mountWithIntl(<Component {...wrapperProps} />);
+    expect(wrapper.find(ColorPicker).prop('colorIsOverwritten')).toBe(false);
+  });
+
+  it('renders the color picker with the colorIsOverwritten prop set to true if color is overwritten for the specific series', () => {
+    uiState.set('vis.colors', { 'Logstash Airways': '#6092c0' });
+    wrapper = mountWithIntl(<Component {...wrapperProps} />);
+    expect(wrapper.find(ColorPicker).prop('colorIsOverwritten')).toBe(true);
+  });
+
+  it('renders the picker for kibana palette and not distinctColors', () => {
+    const LegacyPaletteComponent: ComponentType<LegendColorPickerProps> = getColorPicker(
+      'left',
+      jest.fn(),
+      bucketColumns,
+      'kibana_palette',
+      visData.rows,
+      uiState,
+      true
+    );
+    const newProps = { ...wrapperProps, seriesIdentifier: { key: '1', specId: 'pie' } };
+    wrapper = mountWithIntl(<LegacyPaletteComponent {...newProps} />);
+    expect(wrapper.find(ColorPicker).length).toBe(1);
+    expect(wrapper.find(ColorPicker).prop('useLegacyColors')).toBe(true);
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/utils/get_color_picker.tsx b/src/plugins/vis_type_pie/public/utils/get_color_picker.tsx
new file mode 100644
index 0000000000000..436ce81d3ce3c
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_color_picker.tsx
@@ -0,0 +1,121 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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, { useCallback } from 'react';
+import Color from 'color';
+import { LegendColorPicker, Position } from '@elastic/charts';
+import { PopoverAnchorPosition, EuiPopover, EuiOutsideClickDetector } from '@elastic/eui';
+import { DatatableRow } from '../../../expressions/public';
+import type { PersistedState } from '../../../visualizations/public';
+import { ColorPicker } from '../../../charts/public';
+import { BucketColumns } from '../types';
+
+const KEY_CODE_ENTER = 13;
+
+function getAnchorPosition(legendPosition: Position): PopoverAnchorPosition {
+  switch (legendPosition) {
+    case Position.Bottom:
+      return 'upCenter';
+    case Position.Top:
+      return 'downCenter';
+    case Position.Left:
+      return 'rightCenter';
+    default:
+      return 'leftCenter';
+  }
+}
+
+function getLayerIndex(
+  seriesKey: string,
+  data: DatatableRow[],
+  layers: Array<Partial<BucketColumns>>
+): number {
+  const row = data.find((d) => Object.keys(d).find((key) => d[key] === seriesKey));
+  const bucketId = row && Object.keys(row).find((key) => row[key] === seriesKey);
+  return layers.findIndex((layer) => layer.id === bucketId) + 1;
+}
+
+function isOnInnerLayer(
+  firstBucket: Partial<BucketColumns>,
+  data: DatatableRow[],
+  seriesKey: string
+): DatatableRow | undefined {
+  return data.find((d) => firstBucket.id && d[firstBucket.id] === seriesKey);
+}
+
+export const getColorPicker = (
+  legendPosition: Position,
+  setColor: (newColor: string | null, seriesKey: string | number) => void,
+  bucketColumns: Array<Partial<BucketColumns>>,
+  palette: string,
+  data: DatatableRow[],
+  uiState: PersistedState,
+  distinctColors: boolean
+): LegendColorPicker => ({
+  anchor,
+  color,
+  onClose,
+  onChange,
+  seriesIdentifiers: [seriesIdentifier],
+}) => {
+  const seriesName = seriesIdentifier.key;
+  const overwriteColors: Record<string, string> = uiState?.get('vis.colors', {}) ?? {};
+  const colorIsOverwritten = Object.keys(overwriteColors).includes(seriesName.toString());
+  let keyDownEventOn = false;
+  const handleChange = (newColor: string | null) => {
+    if (newColor) {
+      onChange(newColor);
+    }
+    setColor(newColor, seriesName);
+    // close the popover if no color is applied or the user has clicked a color
+    if (!newColor || !keyDownEventOn) {
+      onClose();
+    }
+  };
+
+  const onKeyDown = (e: React.KeyboardEvent<HTMLElement>) => {
+    if (e.keyCode === KEY_CODE_ENTER) {
+      onClose?.();
+    }
+    keyDownEventOn = true;
+  };
+
+  const handleOutsideClick = useCallback(() => {
+    onClose?.();
+  }, [onClose]);
+
+  if (!distinctColors) {
+    const enablePicker = isOnInnerLayer(bucketColumns[0], data, seriesName) || !bucketColumns[0].id;
+    if (!enablePicker) return null;
+  }
+  const hexColor = new Color(color).hex();
+  return (
+    <EuiOutsideClickDetector onOutsideClick={handleOutsideClick}>
+      <EuiPopover
+        isOpen
+        ownFocus
+        display="block"
+        button={anchor}
+        anchorPosition={getAnchorPosition(legendPosition)}
+        closePopover={onClose}
+        panelPaddingSize="s"
+      >
+        <ColorPicker
+          color={palette === 'kibana_palette' ? hexColor : hexColor.toLowerCase()}
+          onChange={handleChange}
+          label={seriesName}
+          maxDepth={bucketColumns.length}
+          layerIndex={getLayerIndex(seriesName, data, bucketColumns)}
+          useLegacyColors={palette === 'kibana_palette'}
+          colorIsOverwritten={colorIsOverwritten}
+          onKeyDown={onKeyDown}
+        />
+      </EuiPopover>
+    </EuiOutsideClickDetector>
+  );
+};
diff --git a/src/plugins/vis_type_pie/public/utils/get_columns.test.ts b/src/plugins/vis_type_pie/public/utils/get_columns.test.ts
new file mode 100644
index 0000000000000..3170628ec2e12
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_columns.test.ts
@@ -0,0 +1,222 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { getColumns } from './get_columns';
+import { PieVisParams } from '../types';
+import { createMockPieParams, createMockVisData } from '../mocks';
+
+const visParams = createMockPieParams();
+const visData = createMockVisData();
+
+describe('getColumns', () => {
+  it('should return the correct bucket columns if visParams returns dimensions', () => {
+    const { bucketColumns } = getColumns(visParams, visData);
+    expect(bucketColumns.length).toEqual(visParams.dimensions.buckets?.length);
+    expect(bucketColumns).toEqual([
+      {
+        format: {
+          id: 'terms',
+          params: {
+            id: 'string',
+            missingBucketLabel: 'Missing',
+            otherBucketLabel: 'Other',
+          },
+        },
+        id: 'col-0-2',
+        meta: {
+          field: 'Carrier',
+          index: 'kibana_sample_data_flights',
+          params: {
+            id: 'terms',
+            params: {
+              id: 'string',
+              missingBucketLabel: 'Missing',
+              otherBucketLabel: 'Other',
+            },
+          },
+          source: 'esaggs',
+          sourceParams: {
+            enabled: true,
+            id: '2',
+            indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+            params: {
+              field: 'Carrier',
+              missingBucket: false,
+              missingBucketLabel: 'Missing',
+              order: 'desc',
+              orderBy: '1',
+              otherBucket: false,
+              otherBucketLabel: 'Other',
+              size: 5,
+            },
+            schema: 'segment',
+            type: 'terms',
+          },
+          type: 'string',
+        },
+        name: 'Carrier: Descending',
+      },
+      {
+        format: {
+          id: 'terms',
+          params: {
+            id: 'boolean',
+            missingBucketLabel: 'Missing',
+            otherBucketLabel: 'Other',
+          },
+        },
+        id: 'col-2-3',
+        meta: {
+          field: 'Cancelled',
+          index: 'kibana_sample_data_flights',
+          params: {
+            id: 'terms',
+            params: {
+              id: 'boolean',
+              missingBucketLabel: 'Missing',
+              otherBucketLabel: 'Other',
+            },
+          },
+          source: 'esaggs',
+          sourceParams: {
+            enabled: true,
+            id: '3',
+            indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+            params: {
+              field: 'Cancelled',
+              missingBucket: false,
+              missingBucketLabel: 'Missing',
+              order: 'desc',
+              orderBy: '1',
+              otherBucket: false,
+              otherBucketLabel: 'Other',
+              size: 5,
+            },
+            schema: 'segment',
+            type: 'terms',
+          },
+          type: 'boolean',
+        },
+        name: 'Cancelled: Descending',
+      },
+    ]);
+  });
+
+  it('should return the correct metric column if visParams returns dimensions', () => {
+    const { metricColumn } = getColumns(visParams, visData);
+    expect(metricColumn).toEqual({
+      id: 'col-3-1',
+      meta: {
+        index: 'kibana_sample_data_flights',
+        params: { id: 'number' },
+        source: 'esaggs',
+        sourceParams: {
+          enabled: true,
+          id: '1',
+          indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+          params: {},
+          schema: 'metric',
+          type: 'count',
+        },
+        type: 'number',
+      },
+      name: 'Count',
+    });
+  });
+
+  it('should return the first data column if no buckets specified', () => {
+    const visParamsOnlyMetric = ({
+      addLegend: true,
+      addTooltip: true,
+      isDonut: true,
+      labels: {
+        position: 'default',
+        show: true,
+        truncate: 100,
+        values: true,
+        valuesFormat: 'percent',
+        percentDecimals: 2,
+      },
+      legendPosition: 'right',
+      nestedLegend: false,
+      palette: {
+        name: 'default',
+        type: 'palette',
+      },
+      type: 'pie',
+      dimensions: {
+        metric: {
+          accessor: 1,
+          format: {
+            id: 'number',
+          },
+          params: {},
+          label: 'Count',
+          aggType: 'count',
+        },
+      },
+    } as unknown) as PieVisParams;
+    const { metricColumn } = getColumns(visParamsOnlyMetric, visData);
+    expect(metricColumn).toEqual({
+      id: 'col-1-1',
+      meta: {
+        index: 'kibana_sample_data_flights',
+        params: {
+          id: 'number',
+        },
+        source: 'esaggs',
+        sourceParams: {
+          enabled: true,
+          id: '1',
+          indexPatternId: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
+          params: {},
+          schema: 'metric',
+          type: 'count',
+        },
+        type: 'number',
+      },
+      name: 'Count',
+    });
+  });
+
+  it('should return an object with the name of the metric if no buckets specified', () => {
+    const visParamsOnlyMetric = ({
+      addLegend: true,
+      addTooltip: true,
+      isDonut: true,
+      labels: {
+        position: 'default',
+        show: true,
+        truncate: 100,
+        values: true,
+        valuesFormat: 'percent',
+        percentDecimals: 2,
+      },
+      legendPosition: 'right',
+      nestedLegend: false,
+      palette: {
+        name: 'default',
+        type: 'palette',
+      },
+      type: 'pie',
+      dimensions: {
+        metric: {
+          accessor: 1,
+          format: {
+            id: 'number',
+          },
+          params: {},
+          label: 'Count',
+          aggType: 'count',
+        },
+      },
+    } as unknown) as PieVisParams;
+    const { bucketColumns, metricColumn } = getColumns(visParamsOnlyMetric, visData);
+    expect(bucketColumns).toEqual([{ name: metricColumn.name }]);
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/utils/get_columns.ts b/src/plugins/vis_type_pie/public/utils/get_columns.ts
new file mode 100644
index 0000000000000..4a32466d808da
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_columns.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 { DatatableColumn, Datatable } from '../../../expressions/public';
+import { BucketColumns, PieVisParams } from '../types';
+
+export const getColumns = (
+  visParams: PieVisParams,
+  visData: Datatable
+): {
+  metricColumn: DatatableColumn;
+  bucketColumns: Array<Partial<BucketColumns>>;
+} => {
+  if (visParams.dimensions.buckets && visParams.dimensions.buckets.length > 0) {
+    const bucketColumns: Array<Partial<BucketColumns>> = visParams.dimensions.buckets.map(
+      ({ accessor, format }) => ({
+        ...visData.columns[accessor],
+        format,
+      })
+    );
+    const lastBucketId = bucketColumns[bucketColumns.length - 1].id;
+    const matchingIndex = visData.columns.findIndex((col) => col.id === lastBucketId);
+    return {
+      bucketColumns,
+      metricColumn: visData.columns[matchingIndex + 1],
+    };
+  }
+  const metricAccessor = visParams?.dimensions?.metric.accessor ?? 0;
+  const metricColumn = visData.columns[metricAccessor];
+  return {
+    metricColumn,
+    bucketColumns: [
+      {
+        name: metricColumn.name,
+      },
+    ],
+  };
+};
diff --git a/src/plugins/vis_type_pie/public/utils/get_config.ts b/src/plugins/vis_type_pie/public/utils/get_config.ts
new file mode 100644
index 0000000000000..a8a4edb01cd9c
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_config.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 { PartitionConfig, PartitionLayout, RecursivePartial, Theme } from '@elastic/charts';
+import { LabelPositions, PieVisParams, PieContainerDimensions } from '../types';
+const MAX_SIZE = 1000;
+
+export const getConfig = (
+  visParams: PieVisParams,
+  chartTheme: RecursivePartial<Theme>,
+  dimensions?: PieContainerDimensions
+): RecursivePartial<PartitionConfig> => {
+  // On small multiples we want the labels to only appear inside
+  const isSplitChart = Boolean(visParams.dimensions.splitColumn || visParams.dimensions.splitRow);
+  const usingMargin =
+    dimensions && !isSplitChart
+      ? {
+          margin: {
+            top: (1 - Math.min(1, MAX_SIZE / dimensions?.height)) / 2,
+            bottom: (1 - Math.min(1, MAX_SIZE / dimensions?.height)) / 2,
+            left: (1 - Math.min(1, MAX_SIZE / dimensions?.width)) / 2,
+            right: (1 - Math.min(1, MAX_SIZE / dimensions?.width)) / 2,
+          },
+        }
+      : null;
+
+  const usingOuterSizeRatio =
+    dimensions && !isSplitChart
+      ? {
+          outerSizeRatio: MAX_SIZE / Math.min(dimensions?.width, dimensions?.height),
+        }
+      : null;
+  const config: RecursivePartial<PartitionConfig> = {
+    partitionLayout: PartitionLayout.sunburst,
+    fontFamily: chartTheme.barSeriesStyle?.displayValue?.fontFamily,
+    ...usingOuterSizeRatio,
+    specialFirstInnermostSector: false,
+    minFontSize: 10,
+    maxFontSize: 16,
+    linkLabel: {
+      maxCount: 5,
+      fontSize: 11,
+      textColor: chartTheme.axes?.axisTitle?.fill,
+      maxTextLength: visParams.labels.truncate ?? undefined,
+    },
+    sectorLineStroke: chartTheme.lineSeriesStyle?.point?.fill,
+    sectorLineWidth: 1.5,
+    circlePadding: 4,
+    emptySizeRatio: visParams.isDonut ? 0.3 : 0,
+    ...usingMargin,
+  };
+  if (!visParams.labels.show) {
+    // Force all labels to be linked, then prevent links from showing
+    config.linkLabel = { maxCount: 0, maximumSection: Number.POSITIVE_INFINITY };
+  }
+
+  if (visParams.labels.last_level && visParams.labels.show) {
+    config.linkLabel = {
+      maxCount: Number.POSITIVE_INFINITY,
+      maximumSection: Number.POSITIVE_INFINITY,
+    };
+  }
+
+  if (
+    (visParams.labels.position === LabelPositions.INSIDE || isSplitChart) &&
+    visParams.labels.show
+  ) {
+    config.linkLabel = { maxCount: 0 };
+  }
+  return config;
+};
diff --git a/src/plugins/vis_type_pie/public/utils/get_distinct_series.test.ts b/src/plugins/vis_type_pie/public/utils/get_distinct_series.test.ts
new file mode 100644
index 0000000000000..3d700614a07ed
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_distinct_series.test.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 { getDistinctSeries } from './get_distinct_series';
+import { createMockVisData, createMockBucketColumns } from '../mocks';
+
+const visData = createMockVisData();
+const buckets = createMockBucketColumns();
+
+describe('getDistinctSeries', () => {
+  it('should return the distinct values for all buckets', () => {
+    const { allSeries } = getDistinctSeries(visData.rows, buckets);
+    expect(allSeries).toEqual(['Logstash Airways', 'JetBeats', 'ES-Air', 'Kibana Airlines', 0, 1]);
+  });
+
+  it('should return only the distinct values for the parent bucket', () => {
+    const { parentSeries } = getDistinctSeries(visData.rows, buckets);
+    expect(parentSeries).toEqual(['Logstash Airways', 'JetBeats', 'ES-Air', 'Kibana Airlines']);
+  });
+
+  it('should return empty array for empty buckets', () => {
+    const { parentSeries } = getDistinctSeries(visData.rows, [{ name: 'Count' }]);
+    expect(parentSeries.length).toEqual(0);
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/utils/get_distinct_series.ts b/src/plugins/vis_type_pie/public/utils/get_distinct_series.ts
new file mode 100644
index 0000000000000..ba5042dfc210c
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_distinct_series.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 { DatatableRow } from '../../../expressions/public';
+import { BucketColumns } from '../types';
+
+export const getDistinctSeries = (rows: DatatableRow[], buckets: Array<Partial<BucketColumns>>) => {
+  const parentBucketId = buckets[0].id;
+  const parentSeries: string[] = [];
+  const allSeries: string[] = [];
+  buckets.forEach(({ id }) => {
+    if (!id) return;
+    rows.forEach((row) => {
+      const name = row[id];
+      if (!allSeries.includes(name)) {
+        allSeries.push(name);
+      }
+      if (id === parentBucketId && !parentSeries.includes(row[parentBucketId])) {
+        parentSeries.push(row[parentBucketId]);
+      }
+    });
+  });
+  return {
+    allSeries,
+    parentSeries,
+  };
+};
diff --git a/src/plugins/vis_type_pie/public/utils/get_layers.test.ts b/src/plugins/vis_type_pie/public/utils/get_layers.test.ts
new file mode 100644
index 0000000000000..e0658eaa295f9
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_layers.test.ts
@@ -0,0 +1,114 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { ShapeTreeNode } from '@elastic/charts';
+import { PaletteDefinition, SeriesLayer } from '../../../charts/public';
+import { computeColor } from './get_layers';
+import { createMockVisData, createMockBucketColumns, createMockPieParams } from '../mocks';
+
+const visData = createMockVisData();
+const buckets = createMockBucketColumns();
+const visParams = createMockPieParams();
+const colors = ['color1', 'color2', 'color3', 'color4'];
+export const getPaletteRegistry = () => {
+  const mockPalette1: jest.Mocked<PaletteDefinition> = {
+    id: 'default',
+    title: 'My Palette',
+    getCategoricalColor: jest.fn((layer: SeriesLayer[]) => colors[layer[0].rankAtDepth]),
+    getCategoricalColors: jest.fn((num: number) => colors),
+    toExpression: jest.fn(() => ({
+      type: 'expression',
+      chain: [
+        {
+          type: 'function',
+          function: 'system_palette',
+          arguments: {
+            name: ['default'],
+          },
+        },
+      ],
+    })),
+  };
+
+  return {
+    get: () => mockPalette1,
+    getAll: () => [mockPalette1],
+  };
+};
+
+describe('computeColor', () => {
+  it('should return the correct color based on the parent sortIndex', () => {
+    const d = ({
+      dataName: 'ES-Air',
+      depth: 1,
+      sortIndex: 0,
+      parent: {
+        children: [['ES-Air'], ['Kibana Airlines']],
+        depth: 0,
+        sortIndex: 0,
+      },
+    } as unknown) as ShapeTreeNode;
+    const color = computeColor(
+      d,
+      false,
+      {},
+      buckets,
+      visData.rows,
+      visParams,
+      getPaletteRegistry(),
+      false
+    );
+    expect(color).toEqual(colors[0]);
+  });
+
+  it('slices with the same label should have the same color for small multiples', () => {
+    const d = ({
+      dataName: 'ES-Air',
+      depth: 1,
+      sortIndex: 0,
+      parent: {
+        children: [['ES-Air'], ['Kibana Airlines']],
+        depth: 0,
+        sortIndex: 0,
+      },
+    } as unknown) as ShapeTreeNode;
+    const color = computeColor(
+      d,
+      true,
+      {},
+      buckets,
+      visData.rows,
+      visParams,
+      getPaletteRegistry(),
+      false
+    );
+    expect(color).toEqual('color3');
+  });
+  it('returns the overwriteColor if exists', () => {
+    const d = ({
+      dataName: 'ES-Air',
+      depth: 1,
+      sortIndex: 0,
+      parent: {
+        children: [['ES-Air'], ['Kibana Airlines']],
+        depth: 0,
+        sortIndex: 0,
+      },
+    } as unknown) as ShapeTreeNode;
+    const color = computeColor(
+      d,
+      true,
+      { 'ES-Air': '#000028' },
+      buckets,
+      visData.rows,
+      visParams,
+      getPaletteRegistry(),
+      false
+    );
+    expect(color).toEqual('#000028');
+  });
+});
diff --git a/src/plugins/vis_type_pie/public/utils/get_layers.ts b/src/plugins/vis_type_pie/public/utils/get_layers.ts
new file mode 100644
index 0000000000000..27dcf2d379811
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_layers.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 { i18n } from '@kbn/i18n';
+import {
+  Datum,
+  PartitionFillLabel,
+  PartitionLayer,
+  ShapeTreeNode,
+  ArrayEntry,
+} from '@elastic/charts';
+import { isEqual } from 'lodash';
+import { SeriesLayer, PaletteRegistry, lightenColor } from '../../../charts/public';
+import { DataPublicPluginStart } from '../../../data/public';
+import { DatatableRow } from '../../../expressions/public';
+import { BucketColumns, PieVisParams, SplitDimensionParams } from '../types';
+import { getDistinctSeries } from './get_distinct_series';
+
+const EMPTY_SLICE = Symbol('empty_slice');
+
+export const computeColor = (
+  d: ShapeTreeNode,
+  isSplitChart: boolean,
+  overwriteColors: { [key: string]: string },
+  columns: Array<Partial<BucketColumns>>,
+  rows: DatatableRow[],
+  visParams: PieVisParams,
+  palettes: PaletteRegistry | null,
+  syncColors: boolean
+) => {
+  const { parentSeries, allSeries } = getDistinctSeries(rows, columns);
+
+  if (visParams.distinctColors) {
+    const dataName = d.dataName;
+    if (Object.keys(overwriteColors).includes(dataName.toString())) {
+      return overwriteColors[dataName];
+    }
+
+    const index = allSeries.findIndex((name) => isEqual(name, dataName));
+    const isSplitParentLayer = isSplitChart && parentSeries.includes(dataName);
+    return palettes?.get(visParams.palette.name).getCategoricalColor(
+      [
+        {
+          name: dataName,
+          rankAtDepth: isSplitParentLayer
+            ? parentSeries.findIndex((name) => name === dataName)
+            : index > -1
+            ? index
+            : 0,
+          totalSeriesAtDepth: isSplitParentLayer ? parentSeries.length : allSeries.length || 1,
+        },
+      ],
+      {
+        maxDepth: 1,
+        totalSeries: allSeries.length || 1,
+        behindText: visParams.labels.show,
+        syncColors,
+      }
+    );
+  }
+  const seriesLayers: SeriesLayer[] = [];
+  let tempParent: typeof d | typeof d['parent'] = d;
+  while (tempParent.parent && tempParent.depth > 0) {
+    const seriesName = String(tempParent.parent.children[tempParent.sortIndex][0]);
+    const isSplitParentLayer = isSplitChart && parentSeries.includes(seriesName);
+    seriesLayers.unshift({
+      name: seriesName,
+      rankAtDepth: isSplitParentLayer
+        ? parentSeries.findIndex((name) => name === seriesName)
+        : tempParent.sortIndex,
+      totalSeriesAtDepth: isSplitParentLayer
+        ? parentSeries.length
+        : tempParent.parent.children.length,
+    });
+    tempParent = tempParent.parent;
+  }
+
+  let overwriteColor;
+  seriesLayers.forEach((layer) => {
+    if (Object.keys(overwriteColors).includes(layer.name)) {
+      overwriteColor = overwriteColors[layer.name];
+    }
+  });
+
+  if (overwriteColor) {
+    return lightenColor(overwriteColor, seriesLayers.length, columns.length);
+  }
+  return palettes?.get(visParams.palette.name).getCategoricalColor(seriesLayers, {
+    behindText: visParams.labels.show,
+    maxDepth: columns.length,
+    totalSeries: rows.length,
+    syncColors,
+  });
+};
+
+export const getLayers = (
+  columns: Array<Partial<BucketColumns>>,
+  visParams: PieVisParams,
+  overwriteColors: { [key: string]: string },
+  rows: DatatableRow[],
+  palettes: PaletteRegistry | null,
+  formatter: DataPublicPluginStart['fieldFormats'],
+  syncColors: boolean
+): PartitionLayer[] => {
+  const fillLabel: Partial<PartitionFillLabel> = {
+    textInvertible: true,
+    valueFont: {
+      fontWeight: 700,
+    },
+  };
+
+  if (!visParams.labels.values) {
+    fillLabel.valueFormatter = () => '';
+  }
+  const isSplitChart = Boolean(visParams.dimensions.splitColumn || visParams.dimensions.splitRow);
+  return columns.map((col) => {
+    return {
+      groupByRollup: (d: Datum) => {
+        return col.id ? d[col.id] : col.name;
+      },
+      showAccessor: (d: Datum) => d !== EMPTY_SLICE,
+      nodeLabel: (d: unknown) => {
+        if (d === '') {
+          return i18n.translate('visTypePie.emptyLabelValue', {
+            defaultMessage: '(empty)',
+          });
+        }
+        if (col.format) {
+          const formattedLabel = formatter.deserialize(col.format).convert(d) ?? '';
+          if (visParams.labels.truncate && formattedLabel.length <= visParams.labels.truncate) {
+            return formattedLabel;
+          } else {
+            return `${formattedLabel.slice(0, Number(visParams.labels.truncate))}\u2026`;
+          }
+        }
+        return String(d);
+      },
+      sortPredicate: ([name1, node1]: ArrayEntry, [name2, node2]: ArrayEntry) => {
+        const params = col.meta?.sourceParams?.params as SplitDimensionParams | undefined;
+        const sort: string | undefined = params?.orderBy;
+        // unconditionally put "Other" to the end (as the "Other" slice may be larger than a regular slice, yet should be at the end)
+        if (name1 === '__other__' && name2 !== '__other__') return 1;
+        if (name2 === '__other__' && name1 !== '__other__') return -1;
+        // metric sorting
+        if (sort !== '_key') {
+          if (params?.order === 'desc') {
+            return node2.value - node1.value;
+          } else {
+            return node1.value - node2.value;
+          }
+          // alphabetical sorting
+        } else {
+          if (name1 > name2) {
+            return params?.order === 'desc' ? -1 : 1;
+          }
+          if (name2 > name1) {
+            return params?.order === 'desc' ? 1 : -1;
+          }
+        }
+        return 0;
+      },
+      fillLabel,
+      shape: {
+        fillColor: (d) => {
+          const outputColor = computeColor(
+            d,
+            isSplitChart,
+            overwriteColors,
+            columns,
+            rows,
+            visParams,
+            palettes,
+            syncColors
+          );
+
+          return outputColor || 'rgba(0,0,0,0)';
+        },
+      },
+    };
+  });
+};
diff --git a/src/plugins/vis_type_pie/public/utils/get_legend_actions.tsx b/src/plugins/vis_type_pie/public/utils/get_legend_actions.tsx
new file mode 100644
index 0000000000000..9f1d5e0db4583
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_legend_actions.tsx
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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, { useState, useEffect } from 'react';
+
+import { i18n } from '@kbn/i18n';
+import { EuiContextMenuPanelDescriptor, EuiIcon, EuiPopover, EuiContextMenu } from '@elastic/eui';
+import { LegendAction, SeriesIdentifier } from '@elastic/charts';
+import { DataPublicPluginStart } from '../../../data/public';
+import { PieVisParams } from '../types';
+import { ClickTriggerEvent } from '../../../charts/public';
+
+export const getLegendActions = (
+  canFilter: (
+    data: ClickTriggerEvent | null,
+    actions: DataPublicPluginStart['actions']
+  ) => Promise<boolean>,
+  getFilterEventData: (series: SeriesIdentifier) => ClickTriggerEvent | null,
+  onFilter: (data: ClickTriggerEvent, negate?: any) => void,
+  visParams: PieVisParams,
+  actions: DataPublicPluginStart['actions'],
+  formatter: DataPublicPluginStart['fieldFormats']
+): LegendAction => {
+  return ({ series: [pieSeries] }) => {
+    const [popoverOpen, setPopoverOpen] = useState(false);
+    const [isfilterable, setIsfilterable] = useState(true);
+    const filterData = getFilterEventData(pieSeries);
+
+    useEffect(() => {
+      (async () => setIsfilterable(await canFilter(filterData, actions)))();
+    }, [filterData]);
+
+    if (!isfilterable || !filterData) {
+      return null;
+    }
+
+    let formattedTitle = '';
+    if (visParams.dimensions.buckets) {
+      const column = visParams.dimensions.buckets.find(
+        (bucket) => bucket.accessor === filterData.data.data[0].column
+      );
+      formattedTitle = formatter.deserialize(column?.format).convert(pieSeries.key) ?? '';
+    }
+
+    const title = formattedTitle || pieSeries.key;
+    const panels: EuiContextMenuPanelDescriptor[] = [
+      {
+        id: 'main',
+        title: `${title}`,
+        items: [
+          {
+            name: i18n.translate('visTypePie.legend.filterForValueButtonAriaLabel', {
+              defaultMessage: 'Filter for value',
+            }),
+            'data-test-subj': `legend-${title}-filterIn`,
+            icon: <EuiIcon type="plusInCircle" size="m" />,
+            onClick: () => {
+              setPopoverOpen(false);
+              onFilter(filterData);
+            },
+          },
+          {
+            name: i18n.translate('visTypePie.legend.filterOutValueButtonAriaLabel', {
+              defaultMessage: 'Filter out value',
+            }),
+            'data-test-subj': `legend-${title}-filterOut`,
+            icon: <EuiIcon type="minusInCircle" size="m" />,
+            onClick: () => {
+              setPopoverOpen(false);
+              onFilter(filterData, true);
+            },
+          },
+        ],
+      },
+    ];
+
+    const Button = (
+      <div
+        style={{
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+          height: '100%',
+          marginLeft: 4,
+          marginRight: 4,
+        }}
+        data-test-subj={`legend-${title}`}
+        onKeyPress={() => undefined}
+        onClick={() => setPopoverOpen(!popoverOpen)}
+      >
+        <EuiIcon size="s" type="boxesVertical" />
+      </div>
+    );
+
+    return (
+      <EuiPopover
+        id="contextMenuNormal"
+        button={Button}
+        isOpen={popoverOpen}
+        closePopover={() => setPopoverOpen(false)}
+        panelPaddingSize="none"
+        anchorPosition="upLeft"
+        title={i18n.translate('visTypePie.legend.filterOptionsLegend', {
+          defaultMessage: '{legendDataLabel}, filter options',
+          values: { legendDataLabel: title },
+        })}
+      >
+        <EuiContextMenu initialPanelId="main" panels={panels} />
+      </EuiPopover>
+    );
+  };
+};
diff --git a/src/plugins/vis_type_pie/public/utils/get_split_dimension_accessor.ts b/src/plugins/vis_type_pie/public/utils/get_split_dimension_accessor.ts
new file mode 100644
index 0000000000000..e1029b11a7b75
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/get_split_dimension_accessor.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 { AccessorFn } from '@elastic/charts';
+import { FieldFormatsStart } from '../../../data/public';
+import { DatatableColumn } from '../../../expressions/public';
+import { Dimension } from '../types';
+
+export const getSplitDimensionAccessor = (
+  fieldFormats: FieldFormatsStart,
+  columns: DatatableColumn[]
+) => (splitDimension: Dimension): AccessorFn => {
+  const formatter = fieldFormats.deserialize(splitDimension.format);
+  const splitChartColumn = columns[splitDimension.accessor];
+  const accessor = splitChartColumn.id;
+
+  const fn: AccessorFn = (d) => {
+    const v = d[accessor];
+    if (v === undefined) {
+      return;
+    }
+    const f = formatter.convert(v);
+    return f;
+  };
+
+  return fn;
+};
diff --git a/src/plugins/vis_type_pie/public/utils/index.ts b/src/plugins/vis_type_pie/public/utils/index.ts
new file mode 100644
index 0000000000000..0cf4292ad565a
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/utils/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 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 { getLayers } from './get_layers';
+export { getColorPicker } from './get_color_picker';
+export { getLegendActions } from './get_legend_actions';
+export { canFilter, getFilterClickData, getFilterEventData } from './filter_helpers';
+export { getConfig } from './get_config';
+export { getColumns } from './get_columns';
+export { getSplitDimensionAccessor } from './get_split_dimension_accessor';
+export { getDistinctSeries } from './get_distinct_series';
diff --git a/src/plugins/vis_type_pie/public/vis_type/index.ts b/src/plugins/vis_type_pie/public/vis_type/index.ts
new file mode 100644
index 0000000000000..e02e802028a35
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/vis_type/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { getPieVisTypeDefinition } from './pie';
+import type { PieTypeProps } from '../types';
+
+export const pieVisType = (props: PieTypeProps) => {
+  return getPieVisTypeDefinition(props);
+};
diff --git a/src/plugins/vis_type_pie/public/vis_type/pie.ts b/src/plugins/vis_type_pie/public/vis_type/pie.ts
new file mode 100644
index 0000000000000..9d1556ac33ad7
--- /dev/null
+++ b/src/plugins/vis_type_pie/public/vis_type/pie.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { 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 { PieVisParams, LabelPositions, ValueFormats, PieTypeProps } from '../types';
+import { toExpressionAst } from '../to_ast';
+import { getPieOptions } from '../editor/components';
+
+export const getPieVisTypeDefinition = ({
+  showElasticChartsOptions = false,
+  palettes,
+  trackUiMetric,
+}: PieTypeProps): VisTypeDefinition<PieVisParams> => ({
+  name: 'pie',
+  title: i18n.translate('visTypePie.pie.pieTitle', { defaultMessage: 'Pie' }),
+  icon: 'visPie',
+  description: i18n.translate('visTypePie.pie.pieDescription', {
+    defaultMessage: 'Compare data in proportion to a whole.',
+  }),
+  toExpressionAst,
+  getSupportedTriggers: () => [VIS_EVENT_TO_TRIGGER.filter],
+  visConfig: {
+    defaults: {
+      type: 'pie',
+      addTooltip: true,
+      addLegend: !showElasticChartsOptions,
+      legendPosition: Position.Right,
+      nestedLegend: false,
+      distinctColors: false,
+      isDonut: true,
+      palette: {
+        type: 'palette',
+        name: 'default',
+      },
+      labels: {
+        show: true,
+        last_level: !showElasticChartsOptions,
+        values: true,
+        valuesFormat: ValueFormats.PERCENT,
+        percentDecimals: DEFAULT_PERCENT_DECIMALS,
+        truncate: 100,
+        position: LabelPositions.DEFAULT,
+      },
+    },
+  },
+  editorConfig: {
+    optionsTemplate: getPieOptions({
+      showElasticChartsOptions,
+      palettes,
+      trackUiMetric,
+    }),
+    schemas: [
+      {
+        group: AggGroupNames.Metrics,
+        name: 'metric',
+        title: i18n.translate('visTypePie.pie.metricTitle', {
+          defaultMessage: 'Slice size',
+        }),
+        min: 1,
+        max: 1,
+        aggFilter: ['sum', 'count', 'cardinality', 'top_hits'],
+        defaults: [{ schema: 'metric', type: 'count' }],
+      },
+      {
+        group: AggGroupNames.Buckets,
+        name: 'segment',
+        title: i18n.translate('visTypePie.pie.segmentTitle', {
+          defaultMessage: 'Split slices',
+        }),
+        min: 0,
+        max: Infinity,
+        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
+      },
+      {
+        group: AggGroupNames.Buckets,
+        name: 'split',
+        title: i18n.translate('visTypePie.pie.splitTitle', {
+          defaultMessage: 'Split chart',
+        }),
+        mustBeFirst: true,
+        min: 0,
+        max: 1,
+        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
+      },
+    ],
+  },
+  hierarchicalData: true,
+  requiresSearch: true,
+});
diff --git a/src/plugins/vis_type_pie/tsconfig.json b/src/plugins/vis_type_pie/tsconfig.json
new file mode 100644
index 0000000000000..f12db316f1972
--- /dev/null
+++ b/src/plugins/vis_type_pie/tsconfig.json
@@ -0,0 +1,24 @@
+{
+    "extends": "../../../tsconfig.base.json",
+    "compilerOptions": {
+      "composite": true,
+      "outDir": "./target/types",
+      "emitDeclarationOnly": true,
+      "declaration": true,
+      "declarationMap": true
+    },
+    "include": [
+      "common/**/*",
+      "public/**/*",
+      "server/**/*"
+    ],
+    "references": [
+      { "path": "../../core/tsconfig.json" },
+      { "path": "../charts/tsconfig.json" },
+      { "path": "../data/tsconfig.json" },
+      { "path": "../expressions/tsconfig.json" },
+      { "path": "../visualizations/tsconfig.json" },
+      { "path": "../usage_collection/tsconfig.json" },
+      { "path": "../vis_default_editor/tsconfig.json" },
+    ]
+  }
\ No newline at end of file
diff --git a/src/plugins/vis_type_timeseries/common/fields_utils.test.ts b/src/plugins/vis_type_timeseries/common/fields_utils.test.ts
index 9550697e22851..f056c38b0c0c3 100644
--- a/src/plugins/vis_type_timeseries/common/fields_utils.test.ts
+++ b/src/plugins/vis_type_timeseries/common/fields_utils.test.ts
@@ -12,7 +12,7 @@ import type { FieldSpec } from '../../data/common';
 describe('fields_utils', () => {
   describe('toSanitizedFieldType', () => {
     const mockedField = {
-      lang: 'lang',
+      lang: 'painless',
       conflictDescriptions: {},
       aggregatable: true,
       name: 'name',
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
index 2877373ffba9a..16e7b9d6072cb 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/helpers/bucket_transform.js
@@ -7,11 +7,11 @@
  */
 
 import { getBucketsPath } from './get_buckets_path';
-import { parseInterval } from './parse_interval';
 import { set } from '@elastic/safer-lodash-set';
 import { isEmpty } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { MODEL_SCRIPTS } from './moving_fn_scripts';
+import { convertIntervalToUnit } from './unit_to_seconds';
 
 function checkMetric(metric, fields) {
   fields.forEach((field) => {
@@ -161,19 +161,24 @@ export const bucketTransform = {
     };
   },
 
-  derivative: (bucket, metrics, bucketSize) => {
+  derivative: (bucket, metrics, intervalString) => {
     checkMetric(bucket, ['type', 'field']);
+
     const body = {
       derivative: {
         buckets_path: getBucketsPath(bucket.field, metrics),
         gap_policy: 'skip', // seems sane
-        unit: bucketSize,
+        unit: intervalString,
       },
     };
+
     if (bucket.gap_policy) body.derivative.gap_policy = bucket.gap_policy;
     if (bucket.unit) {
-      body.derivative.unit = /^([\d]+)([shmdwMy]|ms)$/.test(bucket.unit) ? bucket.unit : bucketSize;
+      body.derivative.unit = /^([\d]+)([shmdwMy]|ms)$/.test(bucket.unit)
+        ? bucket.unit
+        : intervalString;
     }
+
     return body;
   },
 
@@ -214,8 +219,10 @@ export const bucketTransform = {
     };
   },
 
-  calculation: (bucket, metrics, bucketSize) => {
+  calculation: (bucket, metrics, intervalString) => {
     checkMetric(bucket, ['variables', 'script']);
+    const inMsInterval = convertIntervalToUnit(intervalString, 'ms');
+
     const body = {
       bucket_script: {
         buckets_path: bucket.variables.reduce((acc, row) => {
@@ -226,7 +233,7 @@ export const bucketTransform = {
           source: bucket.script,
           lang: 'painless',
           params: {
-            _interval: parseInterval(bucketSize).asMilliseconds(),
+            _interval: inMsInterval?.value,
           },
         },
         gap_policy: 'skip', // seems sane
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
index f82f332df19fd..253612c0274ad 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.js
@@ -29,17 +29,20 @@ export function dateHistogram(
     const barTargetUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET);
 
     const { timeField, interval, maxBars } = getIntervalAndTimefield(panel, series, seriesIndex);
-    const { bucketSize, intervalString } = getBucketSize(
-      req,
-      interval,
-      capabilities,
-      maxBars ? Math.min(maxBarsUiSettings, maxBars) : barTargetUiSettings
-    );
+    const { from, to } = offsetTime(req, series.offset_time);
 
-    const getDateHistogramForLastBucketMode = () => {
-      const { from, to } = offsetTime(req, series.offset_time);
+    let bucketInterval;
+
+    const overwriteDateHistogramForLastBucketMode = () => {
       const { timezone } = capabilities;
 
+      const { intervalString } = getBucketSize(
+        req,
+        interval,
+        capabilities,
+        maxBars ? Math.min(maxBarsUiSettings, maxBars) : barTargetUiSettings
+      );
+
       overwrite(doc, `aggs.${series.id}.aggs.timeseries.date_histogram`, {
         field: timeField,
         min_doc_count: 0,
@@ -50,25 +53,29 @@ export function dateHistogram(
         },
         ...dateHistogramInterval(intervalString),
       });
+
+      bucketInterval = intervalString;
     };
 
-    const getDateHistogramForEntireTimerangeMode = () =>
+    const overwriteDateHistogramForEntireTimerangeMode = () => {
       overwrite(doc, `aggs.${series.id}.aggs.timeseries.auto_date_histogram`, {
         field: timeField,
         buckets: 1,
       });
 
+      bucketInterval = `${to.valueOf() - from.valueOf()}ms`;
+    };
+
     isLastValueTimerangeMode(panel, series)
-      ? getDateHistogramForLastBucketMode()
-      : getDateHistogramForEntireTimerangeMode();
+      ? overwriteDateHistogramForLastBucketMode()
+      : overwriteDateHistogramForEntireTimerangeMode();
 
     overwrite(doc, `aggs.${series.id}.meta`, {
       timeField,
-      intervalString,
-      bucketSize,
+      panelId: panel.id,
       seriesId: series.id,
+      intervalString: bucketInterval,
       index: panel.use_kibana_indexes ? seriesIndex.indexPattern?.id : undefined,
-      panelId: panel.id,
     });
 
     return next(doc);
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
index 741eb93267f4c..2cd7a213b273e 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/date_histogram.test.js
@@ -86,7 +86,6 @@ describe('dateHistogram(req, panel, series)', () => {
             },
           },
           meta: {
-            bucketSize: 10,
             intervalString: '10s',
             timeField: '@timestamp',
             seriesId: 'test',
@@ -128,7 +127,6 @@ describe('dateHistogram(req, panel, series)', () => {
             },
           },
           meta: {
-            bucketSize: 10,
             intervalString: '10s',
             timeField: '@timestamp',
             seriesId: 'test',
@@ -173,7 +171,6 @@ describe('dateHistogram(req, panel, series)', () => {
             },
           },
           meta: {
-            bucketSize: 20,
             intervalString: '20s',
             timeField: 'timestamp',
             seriesId: 'test',
@@ -185,8 +182,11 @@ describe('dateHistogram(req, panel, series)', () => {
   });
 
   describe('dateHistogram for entire time range mode', () => {
-    test('should ignore entire range mode for timeseries', async () => {
+    beforeEach(() => {
       panel.time_range_mode = 'entire_time_range';
+    });
+
+    test('should ignore entire range mode for timeseries', async () => {
       panel.type = 'timeseries';
 
       const next = (doc) => doc;
@@ -204,9 +204,36 @@ describe('dateHistogram(req, panel, series)', () => {
       expect(doc.aggs.test.aggs.timeseries.date_histogram).toBeDefined();
     });
 
-    test('should returns valid date histogram for entire range mode', async () => {
-      panel.time_range_mode = 'entire_time_range';
+    test('should set meta values', async () => {
+      // set 15 minutes (=== 900000ms) interval;
+      req.body.timerange = {
+        min: '2021-01-01T00:00:00Z',
+        max: '2021-01-01T00:15:00Z',
+      };
+
+      const next = (doc) => doc;
+      const doc = await dateHistogram(
+        req,
+        panel,
+        series,
+        config,
+        indexPattern,
+        capabilities,
+        uiSettings
+      )(next)({});
 
+      expect(doc.aggs.test.meta).toMatchInlineSnapshot(`
+        Object {
+          "index": undefined,
+          "intervalString": "900000ms",
+          "panelId": "panelId",
+          "seriesId": "test",
+          "timeField": "@timestamp",
+        }
+      `);
+    });
+
+    test('should returns valid date histogram for entire range mode', async () => {
       const next = (doc) => doc;
       const doc = await dateHistogram(
         req,
@@ -232,8 +259,7 @@ describe('dateHistogram(req, panel, series)', () => {
             meta: {
               timeField: '@timestamp',
               seriesId: 'test',
-              bucketSize: 10,
-              intervalString: '10s',
+              intervalString: '3600000ms',
               panelId: 'panelId',
             },
           },
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js
index 29a11bf163e0b..33c6622f73941 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/metric_buckets.js
@@ -7,30 +7,17 @@
  */
 
 import { overwrite } from '../../helpers';
-import { getBucketSize } from '../../helpers/get_bucket_size';
 import { bucketTransform } from '../../helpers/bucket_transform';
-import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
-import { UI_SETTINGS } from '../../../../../../data/common';
+import { get } from 'lodash';
 
-export function metricBuckets(
-  req,
-  panel,
-  series,
-  esQueryConfig,
-  seriesIndex,
-  capabilities,
-  uiSettings
-) {
+export function metricBuckets(req, panel, series) {
   return (next) => async (doc) => {
-    const barTargetUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET);
-
-    const { interval } = getIntervalAndTimefield(panel, series, seriesIndex);
-    const { intervalString } = getBucketSize(req, interval, capabilities, barTargetUiSettings);
-
     series.metrics
       .filter((row) => !/_bucket$/.test(row.type) && !/^series/.test(row.type))
       .forEach((metric) => {
         const fn = bucketTransform[metric.type];
+        const intervalString = get(doc, `aggs.${series.id}.meta.intervalString`);
+
         if (fn) {
           try {
             const bucket = fn(metric, series.metrics, intervalString);
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js
index dbeb3b1393bd5..c3075dd6dcac0 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/series/sibling_buckets.js
@@ -6,39 +6,28 @@
  * Side Public License, v 1.
  */
 
+import { get } from 'lodash';
 import { overwrite } from '../../helpers';
-import { getBucketSize } from '../../helpers/get_bucket_size';
 import { bucketTransform } from '../../helpers/bucket_transform';
-import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
-import { UI_SETTINGS } from '../../../../../../data/common';
 
-export function siblingBuckets(
-  req,
-  panel,
-  series,
-  esQueryConfig,
-  seriesIndex,
-  capabilities,
-  uiSettings
-) {
+export function siblingBuckets(req, panel, series) {
   return (next) => async (doc) => {
-    const barTargetUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET);
-    const { interval } = getIntervalAndTimefield(panel, series, seriesIndex);
-    const { bucketSize } = getBucketSize(req, interval, capabilities, barTargetUiSettings);
-
     series.metrics
       .filter((row) => /_bucket$/.test(row.type))
       .forEach((metric) => {
         const fn = bucketTransform[metric.type];
+        const intervalString = get(doc, `aggs.${series.id}.meta.intervalString`);
+
         if (fn) {
           try {
-            const bucket = fn(metric, series.metrics, bucketSize);
+            const bucket = fn(metric, series.metrics, intervalString);
             overwrite(doc, `aggs.${series.id}.aggs.${metric.id}`, bucket);
           } catch (e) {
             // meh
           }
         }
       });
+
     return next(doc);
   };
 }
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
index 3e883abc9e5e0..92ac4078a3835 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/date_histogram.js
@@ -20,6 +20,7 @@ export function dateHistogram(req, panel, esQueryConfig, seriesIndex, capabiliti
   return (next) => async (doc) => {
     const barTargetUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET);
     const { timeField, interval } = getIntervalAndTimefield(panel, {}, seriesIndex);
+    const { from, to } = getTimerange(req);
 
     const meta = {
       timeField,
@@ -27,14 +28,8 @@ export function dateHistogram(req, panel, esQueryConfig, seriesIndex, capabiliti
       panelId: panel.id,
     };
 
-    const getDateHistogramForLastBucketMode = () => {
-      const { bucketSize, intervalString } = getBucketSize(
-        req,
-        interval,
-        capabilities,
-        barTargetUiSettings
-      );
-      const { from, to } = getTimerange(req);
+    const overwriteDateHistogramForLastBucketMode = () => {
+      const { intervalString } = getBucketSize(req, interval, capabilities, barTargetUiSettings);
       const { timezone } = capabilities;
 
       panel.series.forEach((column) => {
@@ -54,12 +49,13 @@ export function dateHistogram(req, panel, esQueryConfig, seriesIndex, capabiliti
         overwrite(doc, aggRoot.replace(/\.aggs$/, '.meta'), {
           ...meta,
           intervalString,
-          bucketSize,
         });
       });
     };
 
-    const getDateHistogramForEntireTimerangeMode = () => {
+    const overwriteDateHistogramForEntireTimerangeMode = () => {
+      const intervalString = `${to.valueOf() - from.valueOf()}ms`;
+
       panel.series.forEach((column) => {
         const aggRoot = calculateAggRoot(doc, column);
 
@@ -68,13 +64,16 @@ export function dateHistogram(req, panel, esQueryConfig, seriesIndex, capabiliti
           buckets: 1,
         });
 
-        overwrite(doc, aggRoot.replace(/\.aggs$/, '.meta'), meta);
+        overwrite(doc, aggRoot.replace(/\.aggs$/, '.meta'), {
+          ...meta,
+          intervalString,
+        });
       });
     };
 
     isLastValueTimerangeMode(panel)
-      ? getDateHistogramForLastBucketMode()
-      : getDateHistogramForEntireTimerangeMode();
+      ? overwriteDateHistogramForLastBucketMode()
+      : overwriteDateHistogramForEntireTimerangeMode();
 
     return next(doc);
   };
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js
index 421f9d2d75f0c..8e0d0060225ff 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/metric_buckets.js
@@ -6,19 +6,13 @@
  * Side Public License, v 1.
  */
 
+import { get } from 'lodash';
 import { overwrite } from '../../helpers';
-import { getBucketSize } from '../../helpers/get_bucket_size';
 import { bucketTransform } from '../../helpers/bucket_transform';
-import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
 import { calculateAggRoot } from './calculate_agg_root';
-import { UI_SETTINGS } from '../../../../../../data/common';
 
-export function metricBuckets(req, panel, esQueryConfig, seriesIndex, capabilities, uiSettings) {
+export function metricBuckets(req, panel) {
   return (next) => async (doc) => {
-    const barTargetUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET);
-    const { interval } = getIntervalAndTimefield(panel, {}, seriesIndex);
-    const { intervalString } = getBucketSize(req, interval, capabilities, barTargetUiSettings);
-
     panel.series.forEach((column) => {
       const aggRoot = calculateAggRoot(doc, column);
       column.metrics
@@ -27,7 +21,9 @@ export function metricBuckets(req, panel, esQueryConfig, seriesIndex, capabiliti
           const fn = bucketTransform[metric.type];
           if (fn) {
             try {
+              const intervalString = get(doc, aggRoot.replace(/\.aggs$/, '.meta.intervalString'));
               const bucket = fn(metric, column.metrics, intervalString);
+
               overwrite(doc, `${aggRoot}.timeseries.aggs.${metric.id}`, bucket);
             } catch (e) {
               // meh
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js
index 9b4b0f244fc2c..6ce956c490900 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/request_processors/table/sibling_buckets.js
@@ -7,18 +7,12 @@
  */
 
 import { overwrite } from '../../helpers';
-import { getBucketSize } from '../../helpers/get_bucket_size';
 import { bucketTransform } from '../../helpers/bucket_transform';
-import { getIntervalAndTimefield } from '../../get_interval_and_timefield';
 import { calculateAggRoot } from './calculate_agg_root';
-import { UI_SETTINGS } from '../../../../../../data/common';
+import { get } from 'lodash';
 
-export function siblingBuckets(req, panel, esQueryConfig, seriesIndex, capabilities, uiSettings) {
+export function siblingBuckets(req, panel) {
   return (next) => async (doc) => {
-    const barTargetUiSettings = await uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET);
-    const { interval } = getIntervalAndTimefield(panel, {}, seriesIndex);
-    const { bucketSize } = getBucketSize(req, interval, capabilities, barTargetUiSettings);
-
     panel.series.forEach((column) => {
       const aggRoot = calculateAggRoot(doc, column);
       column.metrics
@@ -27,7 +21,9 @@ export function siblingBuckets(req, panel, esQueryConfig, seriesIndex, capabilit
           const fn = bucketTransform[metric.type];
           if (fn) {
             try {
-              const bucket = fn(metric, column.metrics, bucketSize);
+              const intervalString = get(doc, aggRoot.replace(/\.aggs$/, '.meta.intervalString'));
+              const bucket = fn(metric, column.metrics, intervalString);
+
               overwrite(doc, `${aggRoot}.${metric.id}`, bucket);
             } catch (e) {
               // meh
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js
index 403b486cc4d09..d3cff76524ee3 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.js
@@ -6,6 +6,8 @@
  * Side Public License, v 1.
  */
 
+import { convertIntervalToUnit } from '../../helpers/unit_to_seconds';
+
 const percentileValueMatch = /\[([0-9\.]+)\]$/;
 import { startsWith, flatten, values, first, last } from 'lodash';
 import { getDefaultDecoration } from '../../helpers/get_default_decoration';
@@ -82,13 +84,15 @@ export function mathAgg(resp, panel, series, meta, extractFields) {
           if (someNull) return [ts, null];
           try {
             // calculate the result based on the user's script and return the value
+            const inMsInterval = convertIntervalToUnit(split.meta?.intervalString || 0, 'ms');
+
             const result = evaluate(mathMetric.script, {
               params: {
                 ...params,
                 _index: index,
                 _timestamp: ts,
                 _all: all,
-                _interval: split.meta.bucketSize * 1000,
+                _interval: inMsInterval?.value,
               },
             });
             // if the result is an object (usually when the user is working with maps and functions) flatten the results and return the last value.
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.test.js b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.test.js
index 1e30720d6e5b2..7b5eb1e029069 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.test.js
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/response_processors/series/math.test.js
@@ -54,7 +54,7 @@ describe('math(resp, panel, series)', () => {
       aggregations: {
         test: {
           meta: {
-            bucketSize: 5,
+            intervalString: '5s',
           },
           buckets: [
             {
@@ -124,6 +124,25 @@ describe('math(resp, panel, series)', () => {
     );
   });
 
+  test('should works with predefined variables (params._interval)', async () => {
+    const expectedInterval = 5000;
+
+    series.metrics[2].script = 'params._interval';
+
+    const next = await mathAgg(resp, panel, series)((results) => results);
+    const results = await stdMetric(resp, panel, series)(next)([]);
+
+    expect(results).toHaveLength(1);
+    expect(results[0]).toEqual(
+      expect.objectContaining({
+        data: [
+          [1, expectedInterval],
+          [2, expectedInterval],
+        ],
+      })
+    );
+  });
+
   test('throws on actual tinymath expression errors #1', async () => {
     series.metrics[2].script = 'notExistingFn(params.a)';
 
diff --git a/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts
index 5b865d451003a..46acbb27e15e1 100644
--- a/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts
+++ b/src/plugins/vis_type_timeseries/server/lib/vis_data/series/build_request_body.test.ts
@@ -153,7 +153,6 @@ describe('buildRequestBody(req)', () => {
             time_zone: 'UTC',
           },
           meta: {
-            bucketSize: 10,
             intervalString: '10s',
             seriesId: 'c9b5f9c0-e403-11e6-be91-6f7688e9fac7',
             timeField: '@timestamp',
diff --git a/src/plugins/vis_type_vega/public/components/vega_vis_component.tsx b/src/plugins/vis_type_vega/public/components/vega_vis_component.tsx
index 9fc22f7bc2ef3..c9d89abcf265c 100644
--- a/src/plugins/vis_type_vega/public/components/vega_vis_component.tsx
+++ b/src/plugins/vis_type_vega/public/components/vega_vis_component.tsx
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import React, { useEffect, useMemo, useRef } from 'react';
+import React, { useEffect, useCallback, useRef } from 'react';
 import { EuiResizeObserver } from '@elastic/eui';
 import { throttle } from 'lodash';
 
@@ -48,7 +48,7 @@ const VegaVisComponent = ({ visData, fireEvent, renderComplete, deps }: VegaVisC
     }
   }, [visData, renderComplete]);
 
-  const updateChartSize = useMemo(
+  const updateChartSize = useCallback(
     () =>
       throttle(() => {
         if (visController.current) {
diff --git a/src/plugins/vis_type_vega/public/data_model/types.ts b/src/plugins/vis_type_vega/public/data_model/types.ts
index 255bd9774f9df..9e3cf0a5421c1 100644
--- a/src/plugins/vis_type_vega/public/data_model/types.ts
+++ b/src/plugins/vis_type_vega/public/data_model/types.ts
@@ -17,7 +17,7 @@ import { EmsFileParser } from './ems_file_parser';
 import { UrlParser } from './url_parser';
 
 interface Body {
-  aggs?: Record<string, estypes.AggregationContainer>;
+  aggs?: Record<string, estypes.AggregationsAggregationContainer>;
   query?: Query;
   timeout?: string;
 }
diff --git a/src/plugins/vis_type_vislib/kibana.json b/src/plugins/vis_type_vislib/kibana.json
index 175c21f47c182..56dfba0aca59c 100644
--- a/src/plugins/vis_type_vislib/kibana.json
+++ b/src/plugins/vis_type_vislib/kibana.json
@@ -4,5 +4,5 @@
   "server": true,
   "ui": true,
   "requiredPlugins": ["charts", "data", "expressions", "visualizations", "kibanaLegacy"],
-  "requiredBundles": ["kibanaUtils", "visDefaultEditor", "visTypeXy"]
+  "requiredBundles": ["kibanaUtils", "visDefaultEditor", "visTypeXy", "visTypePie"]
 }
diff --git a/src/plugins/vis_type_vislib/public/editor/components/index.tsx b/src/plugins/vis_type_vislib/public/editor/components/index.tsx
index a90aaeab58503..34547dc7115e2 100644
--- a/src/plugins/vis_type_vislib/public/editor/components/index.tsx
+++ b/src/plugins/vis_type_vislib/public/editor/components/index.tsx
@@ -10,21 +10,15 @@ import React, { lazy } from 'react';
 
 import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
 import { GaugeVisParams } from '../../gauge';
-import { PieVisParams } from '../../pie';
 import { HeatmapVisParams } from '../../heatmap';
 
 const GaugeOptionsLazy = lazy(() => import('./gauge'));
-const PieOptionsLazy = lazy(() => import('./pie'));
 const HeatmapOptionsLazy = lazy(() => import('./heatmap'));
 
 export const GaugeOptions = (props: VisEditorOptionsProps<GaugeVisParams>) => (
   <GaugeOptionsLazy {...props} />
 );
 
-export const PieOptions = (props: VisEditorOptionsProps<PieVisParams>) => (
-  <PieOptionsLazy {...props} />
-);
-
 export const HeatmapOptions = (props: VisEditorOptionsProps<HeatmapVisParams>) => (
   <HeatmapOptionsLazy {...props} />
 );
diff --git a/src/plugins/vis_type_vislib/public/editor/components/pie.tsx b/src/plugins/vis_type_vislib/public/editor/components/pie.tsx
deleted file mode 100644
index 6c84bc744676a..0000000000000
--- a/src/plugins/vis_type_vislib/public/editor/components/pie.tsx
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { EuiPanel, EuiTitle, EuiSpacer } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import { VisEditorOptionsProps } from 'src/plugins/visualizations/public';
-import { BasicOptions, SwitchOption } from '../../../../vis_default_editor/public';
-import { TruncateLabelsOption, getPositions } from '../../../../vis_type_xy/public';
-
-import { PieVisParams } from '../../pie';
-
-const legendPositions = getPositions();
-
-function PieOptions(props: VisEditorOptionsProps<PieVisParams>) {
-  const { stateParams, setValue } = props;
-  const setLabels = <T extends keyof PieVisParams['labels']>(
-    paramName: T,
-    value: PieVisParams['labels'][T]
-  ) => setValue('labels', { ...stateParams.labels, [paramName]: value });
-
-  return (
-    <>
-      <EuiPanel paddingSize="s">
-        <EuiTitle size="xs">
-          <h3>
-            <FormattedMessage
-              id="visTypeVislib.editors.pie.pieSettingsTitle"
-              defaultMessage="Pie settings"
-            />
-          </h3>
-        </EuiTitle>
-        <EuiSpacer size="s" />
-        <SwitchOption
-          label={i18n.translate('visTypeVislib.editors.pie.donutLabel', {
-            defaultMessage: 'Donut',
-          })}
-          paramName="isDonut"
-          value={stateParams.isDonut}
-          setValue={setValue}
-        />
-        <BasicOptions {...props} legendPositions={legendPositions} />
-      </EuiPanel>
-
-      <EuiSpacer size="s" />
-
-      <EuiPanel paddingSize="s">
-        <EuiTitle size="xs">
-          <h3>
-            <FormattedMessage
-              id="visTypeVislib.editors.pie.labelsSettingsTitle"
-              defaultMessage="Labels settings"
-            />
-          </h3>
-        </EuiTitle>
-        <EuiSpacer size="s" />
-        <SwitchOption
-          label={i18n.translate('visTypeVislib.editors.pie.showLabelsLabel', {
-            defaultMessage: 'Show labels',
-          })}
-          paramName="show"
-          value={stateParams.labels.show}
-          setValue={setLabels}
-        />
-        <SwitchOption
-          label={i18n.translate('visTypeVislib.editors.pie.showTopLevelOnlyLabel', {
-            defaultMessage: 'Show top level only',
-          })}
-          paramName="last_level"
-          value={stateParams.labels.last_level}
-          setValue={setLabels}
-        />
-        <SwitchOption
-          label={i18n.translate('visTypeVislib.editors.pie.showValuesLabel', {
-            defaultMessage: 'Show values',
-          })}
-          paramName="values"
-          value={stateParams.labels.values}
-          setValue={setLabels}
-        />
-        <TruncateLabelsOption value={stateParams.labels.truncate} setValue={setLabels} />
-      </EuiPanel>
-    </>
-  );
-}
-
-// default export required for React.Lazy
-// eslint-disable-next-line import/no-default-export
-export { PieOptions as default };
diff --git a/src/plugins/vis_type_vislib/public/pie.ts b/src/plugins/vis_type_vislib/public/pie.ts
index d1d8d2a5279fe..4f6eb7e536509 100644
--- a/src/plugins/vis_type_vislib/public/pie.ts
+++ b/src/plugins/vis_type_vislib/public/pie.ts
@@ -6,14 +6,9 @@
  * Side Public License, v 1.
  */
 
-import { i18n } from '@kbn/i18n';
-import { Position } from '@elastic/charts';
-
-import { AggGroupNames } from '../../data/public';
-import { VisTypeDefinition, VIS_EVENT_TO_TRIGGER } from '../../visualizations/public';
-
+import { pieVisType } from '../../vis_type_pie/public';
+import { VisTypeDefinition } from '../../visualizations/public';
 import { CommonVislibParams } from './types';
-import { PieOptions } from './editor';
 import { toExpressionAst } from './to_ast_pie';
 
 export interface PieVisParams extends CommonVislibParams {
@@ -27,67 +22,7 @@ export interface PieVisParams extends CommonVislibParams {
   };
 }
 
-export const pieVisTypeDefinition: VisTypeDefinition<PieVisParams> = {
-  name: 'pie',
-  title: i18n.translate('visTypeVislib.pie.pieTitle', { defaultMessage: 'Pie' }),
-  icon: 'visPie',
-  description: i18n.translate('visTypeVislib.pie.pieDescription', {
-    defaultMessage: 'Compare data in proportion to a whole.',
-  }),
-  getSupportedTriggers: () => [VIS_EVENT_TO_TRIGGER.filter],
+export const pieVisTypeDefinition = {
+  ...pieVisType({}),
   toExpressionAst,
-  visConfig: {
-    defaults: {
-      type: 'pie',
-      addTooltip: true,
-      addLegend: true,
-      legendPosition: Position.Right,
-      isDonut: true,
-      labels: {
-        show: false,
-        values: true,
-        last_level: true,
-        truncate: 100,
-      },
-    },
-  },
-  editorConfig: {
-    optionsTemplate: PieOptions,
-    schemas: [
-      {
-        group: AggGroupNames.Metrics,
-        name: 'metric',
-        title: i18n.translate('visTypeVislib.pie.metricTitle', {
-          defaultMessage: 'Slice size',
-        }),
-        min: 1,
-        max: 1,
-        aggFilter: ['sum', 'count', 'cardinality', 'top_hits'],
-        defaults: [{ schema: 'metric', type: 'count' }],
-      },
-      {
-        group: AggGroupNames.Buckets,
-        name: 'segment',
-        title: i18n.translate('visTypeVislib.pie.segmentTitle', {
-          defaultMessage: 'Split slices',
-        }),
-        min: 0,
-        max: Infinity,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
-      },
-      {
-        group: AggGroupNames.Buckets,
-        name: 'split',
-        title: i18n.translate('visTypeVislib.pie.splitTitle', {
-          defaultMessage: 'Split chart',
-        }),
-        mustBeFirst: true,
-        min: 0,
-        max: 1,
-        aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
-      },
-    ],
-  },
-  hierarchicalData: true,
-  requiresSearch: true,
-};
+} as VisTypeDefinition<PieVisParams>;
diff --git a/src/plugins/vis_type_vislib/public/plugin.ts b/src/plugins/vis_type_vislib/public/plugin.ts
index 9d329c92bede0..52faf8a74778c 100644
--- a/src/plugins/vis_type_vislib/public/plugin.ts
+++ b/src/plugins/vis_type_vislib/public/plugin.ts
@@ -13,7 +13,7 @@ import { VisualizationsSetup } from '../../visualizations/public';
 import { ChartsPluginSetup } from '../../charts/public';
 import { DataPublicPluginStart } from '../../data/public';
 import { KibanaLegacyStart } from '../../kibana_legacy/public';
-import { LEGACY_CHARTS_LIBRARY } from '../../vis_type_xy/public';
+import { LEGACY_CHARTS_LIBRARY } from '../../visualizations/common/constants';
 
 import { createVisTypeVislibVisFn } from './vis_type_vislib_vis_fn';
 import { createPieVisFn } from './pie_fn';
@@ -53,9 +53,8 @@ export class VisTypeVislibPlugin
     if (!core.uiSettings.get(LEGACY_CHARTS_LIBRARY, false)) {
       // Register only non-replaced vis types
       convertedTypeDefinitions.forEach(visualizations.createBaseVisualization);
-      visualizations.createBaseVisualization(pieVisTypeDefinition);
       expressions.registerRenderer(getVislibVisRenderer(core, charts));
-      [createVisTypeVislibVisFn(), createPieVisFn()].forEach(expressions.registerFunction);
+      expressions.registerFunction(createVisTypeVislibVisFn());
     } else {
       // Register all vis types
       visLibVisTypeDefinitions.forEach(visualizations.createBaseVisualization);
diff --git a/src/plugins/vis_type_vislib/public/to_ast_pie.test.ts b/src/plugins/vis_type_vislib/public/to_ast_pie.test.ts
index 3ca52f27e3fa1..3178c23ee8fa0 100644
--- a/src/plugins/vis_type_vislib/public/to_ast_pie.test.ts
+++ b/src/plugins/vis_type_vislib/public/to_ast_pie.test.ts
@@ -10,7 +10,7 @@ import { Vis } from '../../visualizations/public';
 import { buildExpression } from '../../expressions/public';
 
 import { PieVisParams } from './pie';
-import { samplePieVis } from '../../vis_type_xy/public/sample_vis.test.mocks';
+import { samplePieVis } from '../../vis_type_pie/public/sample_vis.test.mocks';
 import { toExpressionAst } from './to_ast_pie';
 
 jest.mock('../../expressions/public', () => ({
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
index cb8a8f72c5172..5e1f0bfbb4464 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.js
@@ -31,6 +31,7 @@ export function pointSeriesTooltipFormatter() {
 
     const details = [];
     const isGauge = config.get('gauge', false);
+    const chartType = config.get('type', undefined);
     const isPercentageMode = config.get(isGauge ? 'gauge.percentageMode' : 'percentageMode', false);
     const isSetColorRange = config.get('setColorRange', false);
 
@@ -44,7 +45,8 @@ export function pointSeriesTooltipFormatter() {
       });
     }
 
-    if (datum.x !== null && datum.x !== undefined) {
+    // For goal and gauge we have only one value for x - '_all'. It doesn't have sense to show it
+    if (datum.x !== null && datum.x !== undefined && !['goal', 'gauge'].includes(chartType)) {
       addDetail(data.xAxisLabel, data.xAxisFormatter(datum.x));
     }
 
diff --git a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js
index 5c0548ea399b7..a207b1f4360b6 100644
--- a/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js
+++ b/src/plugins/vis_type_vislib/public/vislib/components/tooltip/_pointseries_tooltip_formatter.test.js
@@ -96,4 +96,27 @@ describe('tooltipFormatter', function () {
     const $rows = $el.find('tr');
     expect($rows.length).toBe(3);
   });
+
+  it('renders correctly for gauge/goal visualizations', function () {
+    const event = _.cloneDeep(baseEvent);
+    let type = 'gauge';
+    event.config.get = (name) => {
+      const config = {
+        setColorRange: false,
+        gauge: false,
+        percentageMode: false,
+        type,
+      };
+      return config[name];
+    };
+
+    let $el = $(tooltipFormatter(event, uiSettings));
+    let $rows = $el.find('tr');
+    expect($rows.length).toBe(2);
+
+    type = 'goal';
+    $el = $(tooltipFormatter(event, uiSettings));
+    $rows = $el.find('tr');
+    expect($rows.length).toBe(2);
+  });
 });
diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
index 71f692b80b531..de91053b6dc4d 100644
--- a/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.test.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.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 { buildHierarchicalData, Dimensions, Dimension } from './build_hierarchical_data';
+import type { Dimensions, Dimension } from '../../../../../vis_type_pie/public';
+import { buildHierarchicalData } from './build_hierarchical_data';
 import { Table, TableParent } from '../../types';
 
 function tableVisResponseHandler(table: Table, dimensions: Dimensions) {
diff --git a/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
index b235d3936ae0f..da10edf9591fb 100644
--- a/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
+++ b/src/plugins/vis_type_vislib/public/vislib/helpers/hierarchical/build_hierarchical_data.ts
@@ -7,24 +7,9 @@
  */
 
 import { toArray } from 'lodash';
-import { SerializedFieldFormat } from '../../../../../expressions/common/types';
 import { getFormatService } from '../../../services';
 import { Table } from '../../types';
-
-export interface Dimension {
-  accessor: number;
-  format: {
-    id?: string;
-    params?: SerializedFieldFormat<object>;
-  };
-}
-
-export interface Dimensions {
-  metric: Dimension;
-  buckets?: Dimension[];
-  splitRow?: Dimension[];
-  splitColumn?: Dimension[];
-}
+import type { Dimensions } from '../../../../../vis_type_pie/public';
 
 interface Slice {
   name: string;
diff --git a/src/plugins/vis_type_vislib/tsconfig.json b/src/plugins/vis_type_vislib/tsconfig.json
index 74bc1440d9dbc..5bf1af9ba75fe 100644
--- a/src/plugins/vis_type_vislib/tsconfig.json
+++ b/src/plugins/vis_type_vislib/tsconfig.json
@@ -22,5 +22,6 @@
     { "path": "../kibana_utils/tsconfig.json" },
     { "path": "../vis_default_editor/tsconfig.json" },
     { "path": "../vis_type_xy/tsconfig.json" },
+    { "path": "../vis_type_pie/tsconfig.json" },
   ]
 }
diff --git a/src/plugins/vis_type_xy/common/index.ts b/src/plugins/vis_type_xy/common/index.ts
index a80946f7c62fa..f17bc8476d9a6 100644
--- a/src/plugins/vis_type_xy/common/index.ts
+++ b/src/plugins/vis_type_xy/common/index.ts
@@ -19,5 +19,3 @@ export enum ChartType {
  * Type of xy visualizations
  */
 export type XyVisType = ChartType | 'horizontal_bar';
-
-export const LEGACY_CHARTS_LIBRARY = 'visualization:visualize:legacyChartsLibrary';
diff --git a/src/plugins/vis_type_xy/kibana.json b/src/plugins/vis_type_xy/kibana.json
index 619fa8e71c0dd..a32b1e4d1d8b5 100644
--- a/src/plugins/vis_type_xy/kibana.json
+++ b/src/plugins/vis_type_xy/kibana.json
@@ -1,7 +1,6 @@
 {
   "id": "visTypeXy",
   "version": "kibana",
-  "server": true,
   "ui": true,
   "requiredPlugins": ["charts", "data", "expressions", "visualizations", "usageCollection"],
   "requiredBundles": ["kibanaUtils", "visDefaultEditor"]
diff --git a/src/plugins/vis_type_xy/public/config/get_axis.ts b/src/plugins/vis_type_xy/public/config/get_axis.ts
index 91647f02e2a1e..08b17c882eea6 100644
--- a/src/plugins/vis_type_xy/public/config/get_axis.ts
+++ b/src/plugins/vis_type_xy/public/config/get_axis.ts
@@ -169,7 +169,7 @@ function getAxisDomain<S extends XScaleType | YScaleType>(
 
   const { min, max, defaultYExtents, boundsMargin } = scale;
   const fit = defaultYExtents;
-  const padding = boundsMargin;
+  const padding = boundsMargin || undefined;
 
   if (!isNil(min) && !isNil(max)) {
     return { fit, padding, min, max };
diff --git a/src/plugins/vis_type_xy/public/plugin.ts b/src/plugins/vis_type_xy/public/plugin.ts
index 7bdb4f78bc631..e8d53127765b4 100644
--- a/src/plugins/vis_type_xy/public/plugin.ts
+++ b/src/plugins/vis_type_xy/public/plugin.ts
@@ -23,7 +23,7 @@ import {
 } from './services';
 
 import { visTypesDefinitions } from './vis_types';
-import { LEGACY_CHARTS_LIBRARY } from '../common';
+import { LEGACY_CHARTS_LIBRARY } from '../../visualizations/common/constants';
 import { xyVisRenderer } from './vis_renderer';
 
 import * as expressionFunctions from './expression_functions';
diff --git a/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts b/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts
index 39370d941b52a..8fafd4c723055 100644
--- a/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts
+++ b/src/plugins/vis_type_xy/public/sample_vis.test.mocks.ts
@@ -5,1325 +5,6 @@
  * in compliance with, at your election, the Elastic License 2.0 or the Server
  * Side Public License, v 1.
  */
-
-export const samplePieVis = {
-  type: {
-    name: 'pie',
-    title: 'Pie',
-    description: 'Compare parts of a whole',
-    icon: 'visPie',
-    stage: 'production',
-    options: {
-      showTimePicker: true,
-      showQueryBar: true,
-      showFilterBar: true,
-      showIndexSelection: true,
-      hierarchicalData: false,
-    },
-    visConfig: {
-      defaults: {
-        type: 'pie',
-        addTooltip: true,
-        addLegend: true,
-        legendPosition: 'right',
-        isDonut: true,
-        labels: {
-          show: false,
-          values: true,
-          last_level: true,
-          truncate: 100,
-        },
-      },
-    },
-    editorConfig: {
-      collections: {
-        legendPositions: [
-          {
-            text: 'Top',
-            value: 'top',
-          },
-          {
-            text: 'Left',
-            value: 'left',
-          },
-          {
-            text: 'Right',
-            value: 'right',
-          },
-          {
-            text: 'Bottom',
-            value: 'bottom',
-          },
-        ],
-      },
-      schemas: {
-        all: [
-          {
-            group: 'metrics',
-            name: 'metric',
-            title: 'Slice size',
-            min: 1,
-            max: 1,
-            aggFilter: ['sum', 'count', 'cardinality', 'top_hits'],
-            defaults: [
-              {
-                schema: 'metric',
-                type: 'count',
-              },
-            ],
-            editor: false,
-            params: [],
-          },
-          {
-            group: 'buckets',
-            name: 'segment',
-            title: 'Split slices',
-            min: 0,
-            max: null,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
-            editor: false,
-            params: [],
-          },
-          {
-            group: 'buckets',
-            name: 'split',
-            title: 'Split chart',
-            mustBeFirst: true,
-            min: 0,
-            max: 1,
-            aggFilter: ['!geohash_grid', '!geotile_grid', '!filter'],
-            params: [
-              {
-                name: 'row',
-                default: true,
-              },
-            ],
-            editor: false,
-          },
-        ],
-        buckets: [null, null],
-        metrics: [null],
-      },
-    },
-    hidden: false,
-    hierarchicalData: true,
-  },
-  title: '[Flights] Airline Carrier',
-  description: '',
-  params: {
-    type: 'pie',
-    addTooltip: true,
-    addLegend: true,
-    legendPosition: 'right',
-    isDonut: true,
-    labels: {
-      show: true,
-      values: true,
-      last_level: true,
-      truncate: 100,
-    },
-  },
-  data: {
-    searchSource: {
-      id: 'data_source1',
-      requestStartHandlers: [],
-      inheritOptions: {},
-      history: [],
-      fields: {
-        filter: [],
-        query: {
-          query: '',
-          language: 'kuery',
-        },
-        index: {
-          id: 'd3d7af60-4c81-11e8-b3d7-01146121b73d',
-          title: 'kibana_sample_data_flights',
-          fieldFormatMap: {
-            AvgTicketPrice: {
-              id: 'number',
-              params: {
-                parsedUrl: {
-                  origin: 'http://localhost:5801',
-                  pathname: '/app/visualize',
-                  basePath: '',
-                },
-                pattern: '$0,0.[00]',
-              },
-            },
-            hour_of_day: {
-              id: 'number',
-              params: {
-                pattern: '00',
-              },
-            },
-          },
-          fields: [
-            {
-              count: 0,
-              name: 'AvgTicketPrice',
-              type: 'number',
-              esTypes: ['float'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'Cancelled',
-              type: 'boolean',
-              esTypes: ['boolean'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'Carrier',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'Dest',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DestAirportID',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DestCityName',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DestCountry',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DestLocation',
-              type: 'geo_point',
-              esTypes: ['geo_point'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DestRegion',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DestWeather',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DistanceKilometers',
-              type: 'number',
-              esTypes: ['float'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'DistanceMiles',
-              type: 'number',
-              esTypes: ['float'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'FlightDelay',
-              type: 'boolean',
-              esTypes: ['boolean'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'FlightDelayMin',
-              type: 'number',
-              esTypes: ['integer'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'FlightDelayType',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'FlightNum',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'FlightTimeHour',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'FlightTimeMin',
-              type: 'number',
-              esTypes: ['float'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'Origin',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'OriginAirportID',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'OriginCityName',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'OriginCountry',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'OriginLocation',
-              type: 'geo_point',
-              esTypes: ['geo_point'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'OriginRegion',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'OriginWeather',
-              type: 'string',
-              esTypes: ['keyword'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: '_id',
-              type: 'string',
-              esTypes: ['_id'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: false,
-            },
-            {
-              count: 0,
-              name: '_index',
-              type: 'string',
-              esTypes: ['_index'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: false,
-            },
-            {
-              count: 0,
-              name: '_score',
-              type: 'number',
-              scripted: false,
-              searchable: false,
-              aggregatable: false,
-              readFromDocValues: false,
-            },
-            {
-              count: 0,
-              name: '_source',
-              type: '_source',
-              esTypes: ['_source'],
-              scripted: false,
-              searchable: false,
-              aggregatable: false,
-              readFromDocValues: false,
-            },
-            {
-              count: 0,
-              name: '_type',
-              type: 'string',
-              esTypes: ['_type'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: false,
-            },
-            {
-              count: 0,
-              name: 'dayOfWeek',
-              type: 'number',
-              esTypes: ['integer'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              name: 'timestamp',
-              type: 'date',
-              esTypes: ['date'],
-              scripted: false,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: true,
-            },
-            {
-              count: 0,
-              script: "doc['timestamp'].value.hourOfDay",
-              lang: 'painless',
-              name: 'hour_of_day',
-              type: 'number',
-              scripted: true,
-              searchable: true,
-              aggregatable: true,
-              readFromDocValues: false,
-            },
-          ],
-          timeFieldName: 'timestamp',
-          metaFields: ['_source', '_id', '_type', '_index', '_score'],
-          version: 'WzM1LDFd',
-          originalSavedObjectBody: {
-            title: 'kibana_sample_data_flights',
-            timeFieldName: 'timestamp',
-            fields:
-              '[{"count":0,"name":"AvgTicketPrice","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Cancelled","type":"boolean","esTypes":["boolean"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Carrier","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Dest","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestAirportID","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestCityName","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestCountry","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestLocation","type":"geo_point","esTypes":["geo_point"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestRegion","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DestWeather","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DistanceKilometers","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"DistanceMiles","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightDelay","type":"boolean","esTypes":["boolean"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightDelayMin","type":"number","esTypes":["integer"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightDelayType","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightNum","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightTimeHour","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"FlightTimeMin","type":"number","esTypes":["float"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"Origin","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginAirportID","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginCityName","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginCountry","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginLocation","type":"geo_point","esTypes":["geo_point"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginRegion","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"OriginWeather","type":"string","esTypes":["keyword"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"_id","type":"string","esTypes":["_id"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"count":0,"name":"_index","type":"string","esTypes":["_index"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"count":0,"name":"_score","type":"number","scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"count":0,"name":"_source","type":"_source","esTypes":["_source"],"scripted":false,"searchable":false,"aggregatable":false,"readFromDocValues":false},{"count":0,"name":"_type","type":"string","esTypes":["_type"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":false},{"count":0,"name":"dayOfWeek","type":"number","esTypes":["integer"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"name":"timestamp","type":"date","esTypes":["date"],"scripted":false,"searchable":true,"aggregatable":true,"readFromDocValues":true},{"count":0,"script":"doc[\'timestamp\'].value.hourOfDay","lang":"painless","name":"hour_of_day","type":"number","scripted":true,"searchable":true,"aggregatable":true,"readFromDocValues":false}]',
-            fieldFormatMap:
-              '{"AvgTicketPrice":{"id":"number","params":{"parsedUrl":{"origin":"http://localhost:5801","pathname":"/app/visualize","basePath":""},"pattern":"$0,0.[00]"}},"hour_of_day":{"id":"number","params":{"parsedUrl":{"origin":"http://localhost:5801","pathname":"/app/visualize","basePath":""},"pattern":"00"}}}',
-          },
-          shortDotsEnable: false,
-          fieldFormats: {
-            fieldFormats: {},
-            defaultMap: {
-              ip: {
-                id: 'ip',
-                params: {},
-              },
-              date: {
-                id: 'date',
-                params: {},
-              },
-              date_nanos: {
-                id: 'date_nanos',
-                params: {},
-                es: true,
-              },
-              number: {
-                id: 'number',
-                params: {},
-              },
-              boolean: {
-                id: 'boolean',
-                params: {},
-              },
-              _source: {
-                id: '_source',
-                params: {},
-              },
-              _default_: {
-                id: 'string',
-                params: {},
-              },
-            },
-            metaParamsOptions: {},
-          },
-        },
-      },
-      dependencies: {
-        legacy: {
-          loadingCount$: {
-            _isScalar: false,
-            observers: [
-              {
-                closed: false,
-                _parentOrParents: {
-                  closed: false,
-                  _parentOrParents: {
-                    closed: false,
-                    _parentOrParents: {
-                      closed: false,
-                      _parentOrParents: {
-                        closed: false,
-                        _parentOrParents: {
-                          closed: false,
-                          _parentOrParents: {
-                            closed: false,
-                            _parentOrParents: {
-                              closed: false,
-                              _parentOrParents: null,
-                              _subscriptions: [null],
-                              syncErrorValue: null,
-                              syncErrorThrown: false,
-                              syncErrorThrowable: true,
-                              isStopped: false,
-                              destination: {
-                                closed: false,
-                                _parentOrParents: null,
-                                _subscriptions: null,
-                                syncErrorValue: null,
-                                syncErrorThrown: false,
-                                syncErrorThrowable: false,
-                                isStopped: false,
-                                destination: {
-                                  closed: true,
-                                },
-                                _context: {},
-                              },
-                            },
-                            _subscriptions: [null],
-                            syncErrorValue: null,
-                            syncErrorThrown: false,
-                            syncErrorThrowable: true,
-                            isStopped: false,
-                            count: 1,
-                          },
-                          _subscriptions: [null],
-                          syncErrorValue: null,
-                          syncErrorThrown: false,
-                          syncErrorThrowable: true,
-                          isStopped: false,
-                          hasPrev: true,
-                          prev: 0,
-                        },
-                        _subscriptions: [null],
-                        syncErrorValue: null,
-                        syncErrorThrown: false,
-                        syncErrorThrowable: false,
-                        isStopped: false,
-                        parent: {
-                          closed: true,
-                          _parentOrParents: null,
-                          _subscriptions: null,
-                          syncErrorValue: null,
-                          syncErrorThrown: false,
-                          syncErrorThrowable: true,
-                          isStopped: true,
-                          concurrent: 1,
-                          hasCompleted: true,
-                          buffer: [],
-                          active: 1,
-                          index: 2,
-                        },
-                      },
-                      _subscriptions: [null],
-                      syncErrorValue: null,
-                      syncErrorThrown: false,
-                      syncErrorThrowable: false,
-                      isStopped: false,
-                      parent: {
-                        closed: true,
-                        _parentOrParents: null,
-                        _subscriptions: null,
-                        syncErrorValue: null,
-                        syncErrorThrown: false,
-                        syncErrorThrowable: false,
-                        isStopped: true,
-                        concurrent: 1,
-                        hasCompleted: true,
-                        buffer: [
-                          {
-                            _isScalar: false,
-                          },
-                        ],
-                        active: 1,
-                        index: 1,
-                      },
-                    },
-                    _subscriptions: [
-                      {
-                        closed: false,
-                        _subscriptions: [
-                          {
-                            closed: false,
-                            _subscriptions: null,
-                            subject: {
-                              _isScalar: false,
-                              observers: [
-                                {
-                                  closed: false,
-                                  _parentOrParents: {
-                                    closed: false,
-                                    _parentOrParents: {
-                                      closed: false,
-                                      _parentOrParents: {
-                                        closed: false,
-                                        _parentOrParents: {
-                                          closed: false,
-                                          _parentOrParents: {
-                                            closed: false,
-                                            _parentOrParents: {
-                                              closed: false,
-                                              _parentOrParents: null,
-                                              _subscriptions: [null],
-                                              syncErrorValue: null,
-                                              syncErrorThrown: false,
-                                              syncErrorThrowable: true,
-                                              isStopped: false,
-                                              destination: {
-                                                closed: false,
-                                                _parentOrParents: null,
-                                                _subscriptions: null,
-                                                syncErrorValue: null,
-                                                syncErrorThrown: false,
-                                                syncErrorThrowable: false,
-                                                isStopped: false,
-                                                _context: {},
-                                              },
-                                            },
-                                            _subscriptions: [null],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: true,
-                                            isStopped: false,
-                                            count: 13,
-                                          },
-                                          _subscriptions: [null],
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: false,
-                                          hasPrev: true,
-                                          prev: 0,
-                                        },
-                                        _subscriptions: [null],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                        parent: {
-                                          closed: true,
-                                          _parentOrParents: null,
-                                          _subscriptions: null,
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: true,
-                                          concurrent: 1,
-                                          hasCompleted: true,
-                                          buffer: [],
-                                          active: 1,
-                                          index: 2,
-                                        },
-                                      },
-                                      _subscriptions: [null],
-                                      syncErrorValue: null,
-                                      syncErrorThrown: false,
-                                      syncErrorThrowable: false,
-                                      isStopped: false,
-                                      parent: {
-                                        closed: true,
-                                        _parentOrParents: null,
-                                        _subscriptions: null,
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: true,
-                                        concurrent: 1,
-                                        hasCompleted: true,
-                                        buffer: [
-                                          {
-                                            _isScalar: false,
-                                          },
-                                        ],
-                                        active: 1,
-                                        index: 1,
-                                      },
-                                    },
-                                    _subscriptions: [
-                                      null,
-                                      {
-                                        closed: false,
-                                        _subscriptions: [
-                                          {
-                                            closed: false,
-                                            _subscriptions: [
-                                              {
-                                                closed: false,
-                                                _subscriptions: null,
-                                                subject: {
-                                                  _isScalar: false,
-                                                  observers: [null],
-                                                  closed: false,
-                                                  isStopped: false,
-                                                  hasError: false,
-                                                  thrownError: null,
-                                                  _value: 0,
-                                                },
-                                              },
-                                            ],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: false,
-                                            isStopped: false,
-                                            hasKey: true,
-                                            key: 0,
-                                          },
-                                        ],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                      },
-                                    ],
-                                    syncErrorValue: null,
-                                    syncErrorThrown: false,
-                                    syncErrorThrowable: false,
-                                    isStopped: false,
-                                    seenValue: false,
-                                  },
-                                  _subscriptions: [
-                                    {
-                                      closed: false,
-                                      _subscriptions: null,
-                                    },
-                                  ],
-                                  syncErrorValue: null,
-                                  syncErrorThrown: false,
-                                  syncErrorThrowable: false,
-                                  isStopped: false,
-                                },
-                                {
-                                  closed: false,
-                                  _parentOrParents: {
-                                    closed: false,
-                                    _parentOrParents: {
-                                      closed: false,
-                                      _parentOrParents: {
-                                        closed: false,
-                                        _parentOrParents: {
-                                          closed: false,
-                                          _parentOrParents: {
-                                            closed: false,
-                                            _parentOrParents: {
-                                              closed: false,
-                                              _parentOrParents: null,
-                                              _subscriptions: [null],
-                                              syncErrorValue: null,
-                                              syncErrorThrown: false,
-                                              syncErrorThrowable: true,
-                                              isStopped: false,
-                                              destination: {
-                                                closed: false,
-                                                _parentOrParents: null,
-                                                _subscriptions: null,
-                                                syncErrorValue: null,
-                                                syncErrorThrown: false,
-                                                syncErrorThrowable: false,
-                                                isStopped: false,
-                                                _context: {},
-                                              },
-                                            },
-                                            _subscriptions: [null],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: true,
-                                            isStopped: false,
-                                            count: 1,
-                                          },
-                                          _subscriptions: [null],
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: false,
-                                          hasPrev: true,
-                                          prev: 0,
-                                        },
-                                        _subscriptions: [null],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                        parent: {
-                                          closed: true,
-                                          _parentOrParents: null,
-                                          _subscriptions: null,
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: true,
-                                          concurrent: 1,
-                                          hasCompleted: true,
-                                          buffer: [],
-                                          active: 1,
-                                          index: 2,
-                                        },
-                                      },
-                                      _subscriptions: [null],
-                                      syncErrorValue: null,
-                                      syncErrorThrown: false,
-                                      syncErrorThrowable: false,
-                                      isStopped: false,
-                                      parent: {
-                                        closed: true,
-                                        _parentOrParents: null,
-                                        _subscriptions: null,
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: true,
-                                        concurrent: 1,
-                                        hasCompleted: true,
-                                        buffer: [
-                                          {
-                                            _isScalar: false,
-                                          },
-                                        ],
-                                        active: 1,
-                                        index: 1,
-                                      },
-                                    },
-                                    _subscriptions: [
-                                      null,
-                                      {
-                                        closed: false,
-                                        _subscriptions: [
-                                          {
-                                            closed: false,
-                                            _subscriptions: [
-                                              {
-                                                closed: false,
-                                                _subscriptions: null,
-                                                subject: {
-                                                  _isScalar: false,
-                                                  observers: [null],
-                                                  closed: false,
-                                                  isStopped: false,
-                                                  hasError: false,
-                                                  thrownError: null,
-                                                  _value: 0,
-                                                },
-                                              },
-                                            ],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: false,
-                                            isStopped: false,
-                                            hasKey: true,
-                                            key: 0,
-                                          },
-                                        ],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                      },
-                                    ],
-                                    syncErrorValue: null,
-                                    syncErrorThrown: false,
-                                    syncErrorThrowable: false,
-                                    isStopped: false,
-                                    seenValue: false,
-                                  },
-                                  _subscriptions: [
-                                    {
-                                      closed: false,
-                                      _subscriptions: null,
-                                    },
-                                  ],
-                                  syncErrorValue: null,
-                                  syncErrorThrown: false,
-                                  syncErrorThrowable: false,
-                                  isStopped: false,
-                                },
-                                {
-                                  closed: false,
-                                  _parentOrParents: {
-                                    closed: false,
-                                    _parentOrParents: {
-                                      closed: false,
-                                      _parentOrParents: {
-                                        closed: false,
-                                        _parentOrParents: {
-                                          closed: false,
-                                          _parentOrParents: {
-                                            closed: false,
-                                            _parentOrParents: {
-                                              closed: false,
-                                              _parentOrParents: null,
-                                              _subscriptions: [null],
-                                              syncErrorValue: null,
-                                              syncErrorThrown: false,
-                                              syncErrorThrowable: true,
-                                              isStopped: false,
-                                              destination: {
-                                                closed: false,
-                                                _parentOrParents: null,
-                                                _subscriptions: null,
-                                                syncErrorValue: null,
-                                                syncErrorThrown: false,
-                                                syncErrorThrowable: false,
-                                                isStopped: false,
-                                                _context: {},
-                                              },
-                                            },
-                                            _subscriptions: [null],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: true,
-                                            isStopped: false,
-                                            count: 1,
-                                          },
-                                          _subscriptions: [null],
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: false,
-                                          hasPrev: true,
-                                          prev: 0,
-                                        },
-                                        _subscriptions: [null],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                        parent: {
-                                          closed: true,
-                                          _parentOrParents: null,
-                                          _subscriptions: null,
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: true,
-                                          concurrent: 1,
-                                          hasCompleted: true,
-                                          buffer: [],
-                                          active: 1,
-                                          index: 2,
-                                        },
-                                      },
-                                      _subscriptions: [null],
-                                      syncErrorValue: null,
-                                      syncErrorThrown: false,
-                                      syncErrorThrowable: false,
-                                      isStopped: false,
-                                      parent: {
-                                        closed: true,
-                                        _parentOrParents: null,
-                                        _subscriptions: null,
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: true,
-                                        concurrent: 1,
-                                        hasCompleted: true,
-                                        buffer: [
-                                          {
-                                            _isScalar: false,
-                                          },
-                                        ],
-                                        active: 1,
-                                        index: 1,
-                                      },
-                                    },
-                                    _subscriptions: [
-                                      null,
-                                      {
-                                        closed: false,
-                                        _subscriptions: [
-                                          {
-                                            closed: false,
-                                            _subscriptions: [
-                                              {
-                                                closed: false,
-                                                _subscriptions: null,
-                                                subject: {
-                                                  _isScalar: false,
-                                                  observers: [null],
-                                                  closed: false,
-                                                  isStopped: false,
-                                                  hasError: false,
-                                                  thrownError: null,
-                                                  _value: 0,
-                                                },
-                                              },
-                                            ],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: false,
-                                            isStopped: false,
-                                            hasKey: true,
-                                            key: 0,
-                                          },
-                                        ],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                      },
-                                    ],
-                                    syncErrorValue: null,
-                                    syncErrorThrown: false,
-                                    syncErrorThrowable: false,
-                                    isStopped: false,
-                                    seenValue: false,
-                                  },
-                                  _subscriptions: [
-                                    {
-                                      closed: false,
-                                      _subscriptions: null,
-                                    },
-                                  ],
-                                  syncErrorValue: null,
-                                  syncErrorThrown: false,
-                                  syncErrorThrowable: false,
-                                  isStopped: false,
-                                },
-                                {
-                                  closed: false,
-                                  _parentOrParents: {
-                                    closed: false,
-                                    _parentOrParents: {
-                                      closed: false,
-                                      _parentOrParents: {
-                                        closed: false,
-                                        _parentOrParents: {
-                                          closed: false,
-                                          _parentOrParents: {
-                                            closed: false,
-                                            _parentOrParents: {
-                                              closed: false,
-                                              _parentOrParents: null,
-                                              _subscriptions: [null],
-                                              syncErrorValue: null,
-                                              syncErrorThrown: false,
-                                              syncErrorThrowable: true,
-                                              isStopped: false,
-                                              destination: {
-                                                closed: false,
-                                                _parentOrParents: null,
-                                                _subscriptions: null,
-                                                syncErrorValue: null,
-                                                syncErrorThrown: false,
-                                                syncErrorThrowable: false,
-                                                isStopped: false,
-                                                _context: {},
-                                              },
-                                            },
-                                            _subscriptions: [null],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: true,
-                                            isStopped: false,
-                                            count: 3,
-                                          },
-                                          _subscriptions: [null],
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: false,
-                                          hasPrev: true,
-                                          prev: 0,
-                                        },
-                                        _subscriptions: [null],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                        parent: {
-                                          closed: true,
-                                          _parentOrParents: null,
-                                          _subscriptions: null,
-                                          syncErrorValue: null,
-                                          syncErrorThrown: false,
-                                          syncErrorThrowable: true,
-                                          isStopped: true,
-                                          concurrent: 1,
-                                          hasCompleted: true,
-                                          buffer: [],
-                                          active: 1,
-                                          index: 2,
-                                        },
-                                      },
-                                      _subscriptions: [null],
-                                      syncErrorValue: null,
-                                      syncErrorThrown: false,
-                                      syncErrorThrowable: false,
-                                      isStopped: false,
-                                      parent: {
-                                        closed: true,
-                                        _parentOrParents: null,
-                                        _subscriptions: null,
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: true,
-                                        concurrent: 1,
-                                        hasCompleted: true,
-                                        buffer: [
-                                          {
-                                            _isScalar: false,
-                                          },
-                                        ],
-                                        active: 1,
-                                        index: 1,
-                                      },
-                                    },
-                                    _subscriptions: [
-                                      null,
-                                      {
-                                        closed: false,
-                                        _subscriptions: [
-                                          {
-                                            closed: false,
-                                            _subscriptions: [
-                                              {
-                                                closed: false,
-                                                _subscriptions: null,
-                                                subject: {
-                                                  _isScalar: false,
-                                                  observers: [null],
-                                                  closed: false,
-                                                  isStopped: false,
-                                                  hasError: false,
-                                                  thrownError: null,
-                                                  _value: 0,
-                                                },
-                                              },
-                                            ],
-                                            syncErrorValue: null,
-                                            syncErrorThrown: false,
-                                            syncErrorThrowable: false,
-                                            isStopped: false,
-                                            hasKey: true,
-                                            key: 0,
-                                          },
-                                        ],
-                                        syncErrorValue: null,
-                                        syncErrorThrown: false,
-                                        syncErrorThrowable: false,
-                                        isStopped: false,
-                                      },
-                                    ],
-                                    syncErrorValue: null,
-                                    syncErrorThrown: false,
-                                    syncErrorThrowable: false,
-                                    isStopped: false,
-                                    seenValue: false,
-                                  },
-                                  _subscriptions: [
-                                    {
-                                      closed: false,
-                                      _subscriptions: null,
-                                    },
-                                  ],
-                                  syncErrorValue: null,
-                                  syncErrorThrown: false,
-                                  syncErrorThrowable: false,
-                                  isStopped: false,
-                                },
-                                null,
-                              ],
-                              closed: false,
-                              isStopped: false,
-                              hasError: false,
-                              thrownError: null,
-                            },
-                          },
-                        ],
-                        syncErrorValue: null,
-                        syncErrorThrown: false,
-                        syncErrorThrowable: false,
-                        isStopped: false,
-                      },
-                      null,
-                    ],
-                    syncErrorValue: null,
-                    syncErrorThrown: false,
-                    syncErrorThrowable: false,
-                    isStopped: false,
-                    seenValue: false,
-                  },
-                  _subscriptions: [null],
-                  syncErrorValue: null,
-                  syncErrorThrown: false,
-                  syncErrorThrowable: false,
-                  isStopped: false,
-                },
-                _subscriptions: [
-                  {
-                    closed: false,
-                    _subscriptions: null,
-                  },
-                ],
-                syncErrorValue: null,
-                syncErrorThrown: false,
-                syncErrorThrowable: false,
-                isStopped: false,
-                hasKey: true,
-                key: 0,
-              },
-            ],
-            closed: false,
-            isStopped: false,
-            hasError: false,
-            thrownError: null,
-            _value: 0,
-          },
-        },
-      },
-    },
-    aggs: {
-      typesRegistry: {},
-      getResponseAggs: () => [
-        {
-          id: '1',
-          enabled: true,
-          type: 'count',
-          params: {},
-          schema: 'metric',
-          toSerializedFieldFormat: () => ({
-            id: 'number',
-          }),
-        },
-        {
-          id: '2',
-          enabled: true,
-          type: 'terms',
-          params: {
-            field: 'Carrier',
-            orderBy: '1',
-            order: 'desc',
-            size: 5,
-            otherBucket: false,
-            otherBucketLabel: 'Other',
-            missingBucket: false,
-            missingBucketLabel: 'Missing',
-          },
-          schema: 'segment',
-          toSerializedFieldFormat: () => ({
-            id: 'terms',
-            params: {
-              id: 'string',
-              otherBucketLabel: 'Other',
-              missingBucketLabel: 'Missing',
-              parsedUrl: {
-                origin: 'http://localhost:5801',
-                pathname: '/app/visualize',
-                basePath: '',
-              },
-            },
-          }),
-        },
-      ],
-    },
-  },
-  isHierarchical: () => true,
-  uiState: {
-    vis: {
-      legendOpen: false,
-    },
-  },
-};
-
 export const sampleAreaVis = {
   type: {
     name: 'area',
diff --git a/src/plugins/vis_type_xy/server/index.ts b/src/plugins/vis_type_xy/server/index.ts
deleted file mode 100644
index bfd8b7d28a98d..0000000000000
--- a/src/plugins/vis_type_xy/server/index.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { VisTypeXyServerPlugin } from './plugin';
-
-export const plugin = () => new VisTypeXyServerPlugin();
diff --git a/src/plugins/vis_type_xy/server/plugin.ts b/src/plugins/vis_type_xy/server/plugin.ts
deleted file mode 100644
index 08aefdeb836b0..0000000000000
--- a/src/plugins/vis_type_xy/server/plugin.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { schema } from '@kbn/config-schema';
-
-import { CoreSetup, Plugin, UiSettingsParams } from 'kibana/server';
-
-import { LEGACY_CHARTS_LIBRARY } from '../common';
-
-export const getUiSettingsConfig: () => Record<string, UiSettingsParams<boolean>> = () => ({
-  // TODO: Remove this when vis_type_vislib is removed
-  // https://github.com/elastic/kibana/issues/56143
-  [LEGACY_CHARTS_LIBRARY]: {
-    name: i18n.translate('visTypeXy.advancedSettings.visualization.legacyChartsLibrary.name', {
-      defaultMessage: 'Legacy charts library',
-    }),
-    requiresPageReload: true,
-    value: false,
-    description: i18n.translate(
-      'visTypeXy.advancedSettings.visualization.legacyChartsLibrary.description',
-      {
-        defaultMessage: 'Enables legacy charts library for area, line and bar charts in visualize.',
-      }
-    ),
-    category: ['visualization'],
-    schema: schema.boolean(),
-  },
-});
-
-export class VisTypeXyServerPlugin implements Plugin<object, object> {
-  public setup(core: CoreSetup) {
-    core.uiSettings.register(getUiSettingsConfig());
-
-    return {};
-  }
-
-  public start() {
-    return {};
-  }
-}
diff --git a/src/plugins/visualizations/common/constants.ts b/src/plugins/visualizations/common/constants.ts
index a8a0963ac8948..a33e74b498a2c 100644
--- a/src/plugins/visualizations/common/constants.ts
+++ b/src/plugins/visualizations/common/constants.ts
@@ -7,3 +7,4 @@
  */
 
 export const VISUALIZE_ENABLE_LABS_SETTING = 'visualize:enableLabs';
+export const LEGACY_CHARTS_LIBRARY = 'visualization:visualize:legacyChartsLibrary';
diff --git a/src/plugins/visualizations/kibana.json b/src/plugins/visualizations/kibana.json
index 0ced74e2733d3..939b331414166 100644
--- a/src/plugins/visualizations/kibana.json
+++ b/src/plugins/visualizations/kibana.json
@@ -12,5 +12,6 @@
     "savedObjects"
   ],
   "optionalPlugins": ["usageCollection"],
-  "requiredBundles": ["kibanaUtils", "discover"]
+  "requiredBundles": ["kibanaUtils", "discover"],
+  "extraPublicDirs": ["common/constants"]
 }
diff --git a/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.test.ts b/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.test.ts
new file mode 100644
index 0000000000000..fe0f1a766e8ac
--- /dev/null
+++ b/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.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 semverGte from 'semver/functions/gte';
+import { visualizeEmbeddableFactory } from './visualize_embeddable_factory';
+import { visualizationSavedObjectTypeMigrations } from '../migrations/visualization_saved_object_migrations';
+
+describe('saved object migrations and embeddable migrations', () => {
+  test('should have same versions registered (>7.13.0)', () => {
+    const savedObjectMigrationVersions = Object.keys(visualizationSavedObjectTypeMigrations).filter(
+      (version) => {
+        return semverGte(version, '7.13.1');
+      }
+    );
+    const embeddableMigrationVersions = visualizeEmbeddableFactory()?.migrations;
+    if (embeddableMigrationVersions) {
+      expect(savedObjectMigrationVersions.sort()).toEqual(
+        Object.keys(embeddableMigrationVersions).sort()
+      );
+    }
+  });
+});
diff --git a/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.ts b/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.ts
index 212c033a65c26..edfd05b84dfc8 100644
--- a/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.ts
+++ b/src/plugins/visualizations/server/embeddable/visualize_embeddable_factory.ts
@@ -13,6 +13,7 @@ import {
   commonAddSupportOfDualIndexSelectionModeInTSVB,
   commonHideTSVBLastValueIndicator,
   commonRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel,
+  commonMigrateVislibPie,
   commonAddEmptyValueColorRule,
 } from '../migrations/visualization_common_migrations';
 
@@ -44,6 +45,13 @@ const byValueAddEmptyValueColorRule = (state: SerializableState) => {
   };
 };
 
+const byValueMigrateVislibPie = (state: SerializableState) => {
+  return {
+    ...state,
+    savedVis: commonMigrateVislibPie(state.savedVis),
+  };
+};
+
 export const visualizeEmbeddableFactory = (): EmbeddableRegistryDefinition => {
   return {
     id: 'visualization',
@@ -55,7 +63,7 @@ export const visualizeEmbeddableFactory = (): EmbeddableRegistryDefinition => {
           byValueHideTSVBLastValueIndicator,
           byValueRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel
         )(state),
-      '7.14.0': (state) => flow(byValueAddEmptyValueColorRule)(state),
+      '7.14.0': (state) => flow(byValueAddEmptyValueColorRule, byValueMigrateVislibPie)(state),
     },
   };
 };
diff --git a/src/plugins/visualizations/server/migrations/visualization_common_migrations.ts b/src/plugins/visualizations/server/migrations/visualization_common_migrations.ts
index 13b8d8c4a0f98..f5afeee0ff35e 100644
--- a/src/plugins/visualizations/server/migrations/visualization_common_migrations.ts
+++ b/src/plugins/visualizations/server/migrations/visualization_common_migrations.ts
@@ -91,3 +91,26 @@ export const commonAddEmptyValueColorRule = (visState: any) => {
 
   return visState;
 };
+
+export const commonMigrateVislibPie = (visState: any) => {
+  if (visState && visState.type === 'pie') {
+    const { params } = visState;
+    const hasPalette = params?.palette;
+
+    return {
+      ...visState,
+      params: {
+        ...visState.params,
+        ...(!hasPalette && {
+          palette: {
+            type: 'palette',
+            name: 'kibana_palette',
+          },
+        }),
+        distinctColors: true,
+      },
+    };
+  }
+
+  return visState;
+};
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 36e1635ad4730..7ee43f36c864e 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
@@ -2114,4 +2114,52 @@ describe('migration visualization', () => {
       checkRuleIsNotAddedToArray('gauge_color_rules', params, migratedParams, rule4);
     });
   });
+
+  describe('7.14.0 update pie visualization defaults', () => {
+    const migrate = (doc: any) =>
+      visualizationSavedObjectTypeMigrations['7.14.0'](
+        doc as Parameters<SavedObjectMigrationFn>[0],
+        savedObjectMigrationContext
+      );
+    const getTestDoc = (hasPalette = false) => ({
+      attributes: {
+        title: 'My Vis',
+        description: 'This is my super cool vis.',
+        visState: JSON.stringify({
+          type: 'pie',
+          title: '[Flights] Delay Type',
+          params: {
+            type: 'pie',
+            ...(hasPalette && {
+              palette: {
+                type: 'palette',
+                name: 'default',
+              },
+            }),
+          },
+        }),
+      },
+    });
+
+    it('should decorate existing docs with the kibana legacy palette if the palette is not defined - pie', () => {
+      const migratedTestDoc = migrate(getTestDoc());
+      const { palette } = JSON.parse(migratedTestDoc.attributes.visState).params;
+
+      expect(palette.name).toEqual('kibana_palette');
+    });
+
+    it('should not overwrite the palette with the legacy one if the palette already exists in the saved object', () => {
+      const migratedTestDoc = migrate(getTestDoc(true));
+      const { palette } = JSON.parse(migratedTestDoc.attributes.visState).params;
+
+      expect(palette.name).toEqual('default');
+    });
+
+    it('should default the distinct colors per slice setting to true', () => {
+      const migratedTestDoc = migrate(getTestDoc());
+      const { distinctColors } = JSON.parse(migratedTestDoc.attributes.visState).params;
+
+      expect(distinctColors).toBe(true);
+    });
+  });
 });
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 c5050b4a6940b..f386d9eb12091 100644
--- a/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
+++ b/src/plugins/visualizations/server/migrations/visualization_saved_object_migrations.ts
@@ -15,6 +15,7 @@ import {
   commonAddSupportOfDualIndexSelectionModeInTSVB,
   commonHideTSVBLastValueIndicator,
   commonRemoveDefaultIndexPatternAndTimeFieldFromTSVBModel,
+  commonMigrateVislibPie,
   commonAddEmptyValueColorRule,
 } from './visualization_common_migrations';
 
@@ -990,6 +991,29 @@ const addEmptyValueColorRule: SavedObjectMigrationFn<any, any> = (doc) => {
   return doc;
 };
 
+// [Pie Chart] Migrate vislib pie chart to use the new plugin vis_type_pie
+const migrateVislibPie: SavedObjectMigrationFn<any, any> = (doc) => {
+  const visStateJSON = get(doc, 'attributes.visState');
+  let visState;
+
+  if (visStateJSON) {
+    try {
+      visState = JSON.parse(visStateJSON);
+    } catch (e) {
+      // Let it go, the data is invalid and we'll leave it as is
+    }
+    const newVisState = commonMigrateVislibPie(visState);
+    return {
+      ...doc,
+      attributes: {
+        ...doc.attributes,
+        visState: JSON.stringify(newVisState),
+      },
+    };
+  }
+  return doc;
+};
+
 export const visualizationSavedObjectTypeMigrations = {
   /**
    * We need to have this migration twice, once with a version prior to 7.0.0 once with a version
@@ -1036,5 +1060,5 @@ export const visualizationSavedObjectTypeMigrations = {
     hideTSVBLastValueIndicator,
     removeDefaultIndexPatternAndTimeFieldFromTSVBModel
   ),
-  '7.14.0': flow(addEmptyValueColorRule),
+  '7.14.0': flow(addEmptyValueColorRule, migrateVislibPie),
 };
diff --git a/src/plugins/visualizations/server/plugin.ts b/src/plugins/visualizations/server/plugin.ts
index 5a5a80b2689d6..1fec63f2bb45a 100644
--- a/src/plugins/visualizations/server/plugin.ts
+++ b/src/plugins/visualizations/server/plugin.ts
@@ -18,7 +18,7 @@ import {
   Logger,
 } from '../../../core/server';
 
-import { VISUALIZE_ENABLE_LABS_SETTING } from '../common/constants';
+import { VISUALIZE_ENABLE_LABS_SETTING, LEGACY_CHARTS_LIBRARY } from '../common/constants';
 
 import { visualizationSavedObjectType } from './saved_objects';
 
@@ -58,6 +58,27 @@ export class VisualizationsPlugin
         category: ['visualization'],
         schema: schema.boolean(),
       },
+      // TODO: Remove this when vis_type_vislib is removed
+      // https://github.com/elastic/kibana/issues/56143
+      [LEGACY_CHARTS_LIBRARY]: {
+        name: i18n.translate(
+          'visualizations.advancedSettings.visualization.legacyChartsLibrary.name',
+          {
+            defaultMessage: 'Legacy charts library',
+          }
+        ),
+        requiresPageReload: true,
+        value: false,
+        description: i18n.translate(
+          'visualizations.advancedSettings.visualization.legacyChartsLibrary.description',
+          {
+            defaultMessage:
+              'Enables legacy charts library for area, line, bar, pie charts in visualize.',
+          }
+        ),
+        category: ['visualization'],
+        schema: schema.boolean(),
+      },
     });
 
     if (plugins.usageCollection) {
diff --git a/test/accessibility/apps/dashboard.ts b/test/accessibility/apps/dashboard.ts
index 08d577b3df08c..20b18583d0d72 100644
--- a/test/accessibility/apps/dashboard.ts
+++ b/test/accessibility/apps/dashboard.ts
@@ -110,13 +110,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('Exit out of edit mode', async () => {
-      await PageObjects.dashboard.clickDiscardChanges(false);
+      await PageObjects.dashboard.clickCancelOutOfEditMode(false);
       await a11y.testAppSnapshot();
     });
 
     it('Discard changes', async () => {
-      await testSubjects.exists('dashboardDiscardConfirmDiscard');
-      await testSubjects.click('dashboardDiscardConfirmDiscard');
+      await PageObjects.common.clickConfirmOnModal();
       await PageObjects.dashboard.getIsInViewMode();
       await a11y.testAppSnapshot();
     });
diff --git a/test/accessibility/apps/discover.ts b/test/accessibility/apps/discover.ts
index 67abe15ea537a..6705598ef6e74 100644
--- a/test/accessibility/apps/discover.ts
+++ b/test/accessibility/apps/discover.ts
@@ -19,8 +19,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Discover a11y tests', () => {
     before(async () => {
-      await esArchiver.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.update({
         defaultIndex: 'logstash-*',
         'doc_table:legacy': true,
@@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     it('Discover main page', async () => {
diff --git a/test/accessibility/apps/management.ts b/test/accessibility/apps/management.ts
index 82b3479362298..692b140ade7ee 100644
--- a/test/accessibility/apps/management.ts
+++ b/test/accessibility/apps/management.ts
@@ -16,8 +16,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Management', () => {
     before(async () => {
-      await esArchiver.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.update({
         defaultIndex: 'logstash-*',
       });
@@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     it('main view', async () => {
diff --git a/test/accessibility/apps/visualize.ts b/test/accessibility/apps/visualize.ts
index e493b288eaa89..6478907fcb96a 100644
--- a/test/accessibility/apps/visualize.ts
+++ b/test/accessibility/apps/visualize.ts
@@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Visualize', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
       await PageObjects.common.navigateToApp('visualize');
     });
 
diff --git a/test/accessibility/ftr_provider_context.d.ts b/test/accessibility/ftr_provider_context.d.ts
deleted file mode 100644
index 4c827393e1ef3..0000000000000
--- a/test/accessibility/ftr_provider_context.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { GenericFtrProviderContext } from '@kbn/test';
-
-import { pageObjects } from './page_objects';
-import { services } from './services';
-
-export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/test/accessibility/ftr_provider_context.ts b/test/accessibility/ftr_provider_context.ts
new file mode 100644
index 0000000000000..a1a29f50b7761
--- /dev/null
+++ b/test/accessibility/ftr_provider_context.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 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 { GenericFtrProviderContext, GenericFtrService } from '@kbn/test';
+
+import { pageObjects } from './page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
+export class FtrService extends GenericFtrService<FtrProviderContext> {}
diff --git a/test/accessibility/services/a11y/a11y.ts b/test/accessibility/services/a11y/a11y.ts
index ea205e8121eba..4b01b0dd3b953 100644
--- a/test/accessibility/services/a11y/a11y.ts
+++ b/test/accessibility/services/a11y/a11y.ts
@@ -9,7 +9,7 @@
 import chalk from 'chalk';
 import testSubjectToCss from '@kbn/test-subj-selector';
 
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrService } from '../../ftr_provider_context';
 import { AxeReport, printResult } from './axe_report';
 // @ts-ignore JS that is run in browser as is
 import { analyzeWithAxe, analyzeWithAxeWithClient } from './analyze_with_axe';
@@ -33,86 +33,84 @@ export const normalizeResult = (report: any) => {
   return report.result as false | AxeReport;
 };
 
-export function A11yProvider({ getService }: FtrProviderContext) {
-  const browser = getService('browser');
-  const Wd = getService('__webdriver__');
-
-  /**
-   * Accessibility testing service using the Axe (https://www.deque.com/axe/)
-   * toolset to validate a11y rules similar to ESLint. In order to test against
-   * the rules we must load up the UI and feed a full HTML snapshot into Axe.
-   */
-  return new (class Accessibility {
-    public async testAppSnapshot(options: TestOptions = {}) {
-      const context = this.getAxeContext(true, options.excludeTestSubj);
-      const report = await this.captureAxeReport(context);
-      await this.testAxeReport(report);
-    }
+/**
+ * Accessibility testing service using the Axe (https://www.deque.com/axe/)
+ * toolset to validate a11y rules similar to ESLint. In order to test against
+ * the rules we must load up the UI and feed a full HTML snapshot into Axe.
+ */
+export class AccessibilityService extends FtrService {
+  private readonly browser = this.ctx.getService('browser');
+  private readonly Wd = this.ctx.getService('__webdriver__');
+
+  public async testAppSnapshot(options: TestOptions = {}) {
+    const context = this.getAxeContext(true, options.excludeTestSubj);
+    const report = await this.captureAxeReport(context);
+    this.assertValidAxeReport(report);
+  }
 
-    public async testGlobalSnapshot(options: TestOptions = {}) {
-      const context = this.getAxeContext(false, options.excludeTestSubj);
-      const report = await this.captureAxeReport(context);
-      await this.testAxeReport(report);
-    }
+  public async testGlobalSnapshot(options: TestOptions = {}) {
+    const context = this.getAxeContext(false, options.excludeTestSubj);
+    const report = await this.captureAxeReport(context);
+    this.assertValidAxeReport(report);
+  }
 
-    private getAxeContext(global: boolean, excludeTestSubj?: string | string[]): AxeContext {
-      return {
-        include: global ? undefined : [testSubjectToCss('appA11yRoot')],
-        exclude: ([] as string[])
-          .concat(excludeTestSubj || [])
-          .map((ts) => [testSubjectToCss(ts)])
-          .concat([['[role="graphics-document"][aria-roledescription="visualization"]']]),
-      };
-    }
+  private getAxeContext(global: boolean, excludeTestSubj?: string | string[]): AxeContext {
+    return {
+      include: global ? undefined : [testSubjectToCss('appA11yRoot')],
+      exclude: ([] as string[])
+        .concat(excludeTestSubj || [])
+        .map((ts) => [testSubjectToCss(ts)])
+        .concat([['[role="graphics-document"][aria-roledescription="visualization"]']]),
+    };
+  }
 
-    private testAxeReport(report: AxeReport) {
-      const errorMsgs = [];
+  private assertValidAxeReport(report: AxeReport) {
+    const errorMsgs = [];
 
-      for (const result of report.violations) {
-        errorMsgs.push(printResult(chalk.red('VIOLATION'), result));
-      }
+    for (const result of report.violations) {
+      errorMsgs.push(printResult(chalk.red('VIOLATION'), result));
+    }
 
-      if (errorMsgs.length) {
-        throw new Error(`a11y report:\n${errorMsgs.join('\n')}`);
-      }
+    if (errorMsgs.length) {
+      throw new Error(`a11y report:\n${errorMsgs.join('\n')}`);
     }
+  }
 
-    private async captureAxeReport(context: AxeContext): Promise<AxeReport> {
-      const axeOptions = {
-        reporter: 'v2',
-        runOnly: ['wcag2a', 'wcag2aa'],
-        rules: {
-          'color-contrast': {
-            enabled: false, // disabled because we have too many failures
-          },
-          bypass: {
-            enabled: false, // disabled because it's too flaky
-          },
+  private async captureAxeReport(context: AxeContext): Promise<AxeReport> {
+    const axeOptions = {
+      reporter: 'v2',
+      runOnly: ['wcag2a', 'wcag2aa'],
+      rules: {
+        'color-contrast': {
+          enabled: false, // disabled because we have too many failures
         },
-      };
-
-      await (Wd.driver.manage() as any).setTimeouts({
-        ...(await (Wd.driver.manage() as any).getTimeouts()),
-        script: 600000,
-      });
+        bypass: {
+          enabled: false, // disabled because it's too flaky
+        },
+      },
+    };
 
-      const report = normalizeResult(
-        await browser.executeAsync(analyzeWithAxe, context, axeOptions)
-      );
+    await this.Wd.driver.manage().setTimeouts({
+      ...(await this.Wd.driver.manage().getTimeouts()),
+      script: 600000,
+    });
 
-      if (report !== false) {
-        return report;
-      }
+    const report = normalizeResult(
+      await this.browser.executeAsync(analyzeWithAxe, context, axeOptions)
+    );
 
-      const withClientReport = normalizeResult(
-        await browser.executeAsync(analyzeWithAxeWithClient, context, axeOptions)
-      );
+    if (report !== false) {
+      return report;
+    }
 
-      if (withClientReport === false) {
-        throw new Error('Attempted to analyze with axe but failed to load axe client');
-      }
+    const withClientReport = normalizeResult(
+      await this.browser.executeAsync(analyzeWithAxeWithClient, context, axeOptions)
+    );
 
-      return withClientReport;
+    if (withClientReport === false) {
+      throw new Error('Attempted to analyze with axe but failed to load axe client');
     }
-  })();
+
+    return withClientReport;
+  }
 }
diff --git a/test/accessibility/services/a11y/index.ts b/test/accessibility/services/a11y/index.ts
index 79912dd99d326..642b170c4e077 100644
--- a/test/accessibility/services/a11y/index.ts
+++ b/test/accessibility/services/a11y/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { A11yProvider } from './a11y';
+export * from './a11y';
diff --git a/test/accessibility/services/index.ts b/test/accessibility/services/index.ts
index ec3bf534590b3..ef5674d4011fb 100644
--- a/test/accessibility/services/index.ts
+++ b/test/accessibility/services/index.ts
@@ -7,9 +7,9 @@
  */
 
 import { services as kibanaFunctionalServices } from '../../functional/services';
-import { A11yProvider } from './a11y';
+import { AccessibilityService } from './a11y';
 
 export const services = {
   ...kibanaFunctionalServices,
-  a11y: A11yProvider,
+  a11y: AccessibilityService,
 };
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 fab59ef256a05..1a48b391ae87d 100644
--- a/test/api_integration/apis/index_patterns/es_errors/errors.js
+++ b/test/api_integration/apis/index_patterns/es_errors/errors.js
@@ -27,12 +27,14 @@ export default function ({ getService }) {
     let indexNotFoundError;
     let docNotFoundError;
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
       indexNotFoundError = await getIndexNotFoundError(es);
       docNotFoundError = await getDocNotFoundError(es);
     });
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
     });
 
     describe('isEsIndexNotFoundError()', () => {
diff --git a/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts b/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts
index c75b6c607f56e..16861f3c28051 100644
--- a/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts
+++ b/test/api_integration/apis/index_patterns/fields_api/update_fields/main.ts
@@ -18,10 +18,11 @@ export default function ({ getService }: FtrProviderContext) {
     let indexPattern: any;
 
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
 
       indexPattern = (
         await supertest.post('/api/index_patterns/index_pattern').send({
+          override: true,
           index_pattern: {
             title: basicIndex,
           },
@@ -30,7 +31,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
 
       if (indexPattern) {
         await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id);
diff --git a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js
index e14086f9d973a..8d72cbd2fb37f 100644
--- a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js
+++ b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/pattern.js
@@ -13,8 +13,12 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('pattern', () => {
-    before(() => esArchiver.load('index_patterns/daily_index'));
-    after(() => esArchiver.unload('index_patterns/daily_index'));
+    before(() =>
+      esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/daily_index')
+    );
+    after(() =>
+      esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/daily_index')
+    );
 
     it('matches indices with compatible patterns', () =>
       supertest
diff --git a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js
index 3ccf6a7791f6c..481f433deeb73 100644
--- a/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js
+++ b/test/api_integration/apis/index_patterns/fields_for_time_pattern_route/query_params.js
@@ -13,8 +13,12 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('query params', () => {
-    before(() => esArchiver.load('index_patterns/daily_index'));
-    after(() => esArchiver.unload('index_patterns/daily_index'));
+    before(() =>
+      esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/daily_index')
+    );
+    after(() =>
+      esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/daily_index')
+    );
 
     it('requires `pattern` query param', () =>
       supertest
diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js
index a06c37ea84b4c..f050e2a0626d3 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/conflicts.js
@@ -13,8 +13,12 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('conflicts', () => {
-    before(() => esArchiver.load('index_patterns/conflicts'));
-    after(() => esArchiver.unload('index_patterns/conflicts'));
+    before(() =>
+      esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/conflicts')
+    );
+    after(() =>
+      esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/conflicts')
+    );
 
     it('flags fields with mismatched types as conflicting', () =>
       supertest
diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
index 61b795ed67d33..5b82473721be8 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/params.js
@@ -12,8 +12,12 @@ export default function ({ getService }) {
   const randomness = getService('randomness');
 
   describe('params', () => {
-    before(() => esArchiver.load('index_patterns/basic_index'));
-    after(() => esArchiver.unload('index_patterns/basic_index'));
+    before(() =>
+      esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index')
+    );
+    after(() =>
+      esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/basic_index')
+    );
 
     it('requires a pattern query param', () =>
       supertest.get('/api/index_patterns/_fields_for_wildcard').query({}).expect(400));
diff --git a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
index 87c5aa535ccd9..913db9aee9c0f 100644
--- a/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
+++ b/test/api_integration/apis/index_patterns/fields_for_wildcard_route/response.js
@@ -67,8 +67,12 @@ export default function ({ getService }) {
   ];
 
   describe('fields_for_wildcard_route response', () => {
-    before(() => esArchiver.load('index_patterns/basic_index'));
-    after(() => esArchiver.unload('index_patterns/basic_index'));
+    before(() =>
+      esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index')
+    );
+    after(() =>
+      esArchiver.unload('test/api_integration/fixtures/es_archiver/index_patterns/basic_index')
+    );
 
     it('returns a flattened version of the fields in es', async () => {
       await supertest
diff --git a/test/api_integration/apis/index_patterns/index.js b/test/api_integration/apis/index_patterns/index.js
index 9c1e1bba0ab9a..656b4e506fa23 100644
--- a/test/api_integration/apis/index_patterns/index.js
+++ b/test/api_integration/apis/index_patterns/index.js
@@ -15,5 +15,7 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./scripted_fields_crud'));
     loadTestFile(require.resolve('./fields_api'));
     loadTestFile(require.resolve('./default_index_pattern'));
+    loadTestFile(require.resolve('./runtime_fields_crud'));
+    loadTestFile(require.resolve('./integration'));
   });
 }
diff --git a/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts b/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts
index 1f94e60430c6b..500a642f60850 100644
--- a/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts
+++ b/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/main.ts
@@ -11,6 +11,7 @@ import { FtrProviderContext } from '../../../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
 
   describe('main', () => {
     it('can create an index_pattern with just a title', async () => {
@@ -45,7 +46,6 @@ export default function ({ getService }: FtrProviderContext) {
         index_pattern: {
           title,
           id,
-          version: 'test-version',
           type: 'test-type',
           timeFieldName: 'test-timeFieldName',
         },
@@ -54,7 +54,6 @@ export default function ({ getService }: FtrProviderContext) {
       expect(response.status).to.be(200);
       expect(response.body.index_pattern.title).to.be(title);
       expect(response.body.index_pattern.id).to.be(id);
-      expect(response.body.index_pattern.version).to.be('test-version');
       expect(response.body.index_pattern.type).to.be('test-type');
       expect(response.body.index_pattern.timeFieldName).to.be('test-timeFieldName');
     });
@@ -77,60 +76,115 @@ export default function ({ getService }: FtrProviderContext) {
       expect(response.body.index_pattern.sourceFilters[0].value).to.be('foo');
     });
 
-    it('can specify optional fields attribute when creating an index pattern', async () => {
-      const title = `foo-${Date.now()}-${Math.random()}*`;
-      const response = await supertest.post('/api/index_patterns/index_pattern').send({
-        index_pattern: {
-          title,
-          fields: {
-            foo: {
-              name: 'foo',
-              type: 'string',
-            },
-          },
-        },
+    describe('creating fields', () => {
+      before(async () => {
+        await esArchiver.load(
+          'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+        );
       });
 
-      expect(response.status).to.be(200);
-      expect(response.body.index_pattern.title).to.be(title);
-      expect(response.body.index_pattern.fields.foo.name).to.be('foo');
-      expect(response.body.index_pattern.fields.foo.type).to.be('string');
-    });
+      after(async () => {
+        await esArchiver.unload(
+          'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+        );
+      });
 
-    it('can add two fields, one with all fields specified', async () => {
-      const title = `foo-${Date.now()}-${Math.random()}*`;
-      const response = await supertest.post('/api/index_patterns/index_pattern').send({
-        index_pattern: {
-          title,
-          fields: {
-            foo: {
-              name: 'foo',
-              type: 'string',
+      it('can specify optional fields attribute when creating an index pattern', async () => {
+        const title = `basic_index*`;
+        const response = await supertest.post('/api/index_patterns/index_pattern').send({
+          override: true,
+          index_pattern: {
+            title,
+            fields: {
+              foo: {
+                name: 'foo',
+                type: 'string',
+                scripted: true,
+                script: "doc['field_name'].value",
+              },
             },
-            bar: {
-              name: 'bar',
-              type: 'number',
-              count: 123,
-              script: '',
-              esTypes: ['test-type'],
-              scripted: true,
+          },
+        });
+
+        expect(response.status).to.be(200);
+        expect(response.body.index_pattern.title).to.be(title);
+        expect(response.body.index_pattern.fields.foo.name).to.be('foo');
+        expect(response.body.index_pattern.fields.foo.type).to.be('string');
+        expect(response.body.index_pattern.fields.foo.scripted).to.be(true);
+        expect(response.body.index_pattern.fields.foo.script).to.be("doc['field_name'].value");
+
+        expect(response.body.index_pattern.fields.bar.name).to.be('bar'); // created from es index
+        expect(response.body.index_pattern.fields.bar.type).to.be('boolean');
+      });
+
+      it('can add scripted fields, other fields created from es index', async () => {
+        const title = `basic_index*`;
+        const response = await supertest.post('/api/index_patterns/index_pattern').send({
+          override: true,
+          index_pattern: {
+            title,
+            fields: {
+              foo: {
+                name: 'foo',
+                type: 'string',
+              },
+              fake: {
+                name: 'fake',
+                type: 'string',
+              },
+              bar: {
+                name: 'bar',
+                type: 'number',
+                count: 123,
+                script: '',
+                esTypes: ['test-type'],
+                scripted: true,
+              },
             },
           },
-        },
+        });
+
+        expect(response.status).to.be(200);
+        expect(response.body.index_pattern.title).to.be(title);
+
+        expect(response.body.index_pattern.fields.foo.name).to.be('foo');
+        expect(response.body.index_pattern.fields.foo.type).to.be('number'); // picked up from index
+
+        expect(response.body.index_pattern.fields.fake).to.be(undefined); // not in index, so not created
+
+        expect(response.body.index_pattern.fields.bar.name).to.be('bar');
+        expect(response.body.index_pattern.fields.bar.type).to.be('number');
+        expect(response.body.index_pattern.fields.bar.count).to.be(123);
+        expect(response.body.index_pattern.fields.bar.script).to.be('');
+        expect(response.body.index_pattern.fields.bar.esTypes[0]).to.be('test-type');
+        expect(response.body.index_pattern.fields.bar.scripted).to.be(true);
       });
 
-      expect(response.status).to.be(200);
-      expect(response.body.index_pattern.title).to.be(title);
+      it('can add runtime fields', async () => {
+        const title = `basic_index*`;
+        const response = await supertest.post('/api/index_patterns/index_pattern').send({
+          override: true,
+          index_pattern: {
+            title,
+            runtimeFieldMap: {
+              runtimeFoo: {
+                type: 'keyword',
+                script: {
+                  source: 'emit(doc["foo"].value)',
+                },
+              },
+            },
+          },
+        });
 
-      expect(response.body.index_pattern.fields.foo.name).to.be('foo');
-      expect(response.body.index_pattern.fields.foo.type).to.be('string');
+        expect(response.status).to.be(200);
+        expect(response.body.index_pattern.title).to.be(title);
 
-      expect(response.body.index_pattern.fields.bar.name).to.be('bar');
-      expect(response.body.index_pattern.fields.bar.type).to.be('number');
-      expect(response.body.index_pattern.fields.bar.count).to.be(123);
-      expect(response.body.index_pattern.fields.bar.script).to.be('');
-      expect(response.body.index_pattern.fields.bar.esTypes[0]).to.be('test-type');
-      expect(response.body.index_pattern.fields.bar.scripted).to.be(true);
+        expect(response.body.index_pattern.runtimeFieldMap.runtimeFoo.type).to.be('keyword');
+        expect(response.body.index_pattern.runtimeFieldMap.runtimeFoo.script.source).to.be(
+          'emit(doc["foo"].value)'
+        );
+      });
     });
 
     it('can specify optional typeMeta attribute when creating an index pattern', async () => {
diff --git a/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/validation.ts b/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/validation.ts
index 2f62ea231b722..598001644eedb 100644
--- a/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/validation.ts
+++ b/test/api_integration/apis/index_patterns/index_pattern_crud/create_index_pattern/validation.ts
@@ -64,5 +64,25 @@ export default function ({ getService }: FtrProviderContext) {
         '[request body.refresh_fields]: expected value of type [boolean] but got [number]'
       );
     });
+
+    it('returns an error when unknown runtime field type', async () => {
+      const title = `basic_index*`;
+      const response = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+          runtimeFieldMap: {
+            runtimeFoo: {
+              type: 'wrong-type',
+              script: {
+                source: 'emit(doc["foo"].value)',
+              },
+            },
+          },
+        },
+      });
+
+      expect(response.status).to.be(400);
+    });
   });
 }
diff --git a/test/api_integration/apis/index_patterns/index_pattern_crud/update_index_pattern/main.ts b/test/api_integration/apis/index_patterns/index_pattern_crud/update_index_pattern/main.ts
index cd34724e6cda3..7532278d7eb12 100644
--- a/test/api_integration/apis/index_patterns/index_pattern_crud/update_index_pattern/main.ts
+++ b/test/api_integration/apis/index_patterns/index_pattern_crud/update_index_pattern/main.ts
@@ -284,5 +284,53 @@ export default function ({ getService }: FtrProviderContext) {
       expect(response3.body.index_pattern.intervalName).to.be('intervalName2');
       expect(response3.body.index_pattern.typeMeta.baz).to.be('qux');
     });
+
+    it('can update runtime fields', async () => {
+      const title = `basic_index*`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+          runtimeFieldMap: {
+            runtimeFoo: {
+              type: 'keyword',
+              script: {
+                source: 'emit(doc["foo"].value)',
+              },
+            },
+          },
+        },
+      });
+
+      expect(response1.status).to.be(200);
+      expect(response1.body.index_pattern.title).to.be(title);
+
+      expect(response1.body.index_pattern.runtimeFieldMap.runtimeFoo.type).to.be('keyword');
+      expect(response1.body.index_pattern.runtimeFieldMap.runtimeFoo.script.source).to.be(
+        'emit(doc["foo"].value)'
+      );
+
+      const id = response1.body.index_pattern.id;
+      const response2 = await supertest.post('/api/index_patterns/index_pattern/' + id).send({
+        index_pattern: {
+          runtimeFieldMap: {
+            runtimeBar: {
+              type: 'keyword',
+              script: {
+                source: 'emit(doc["foo"].value)',
+              },
+            },
+          },
+        },
+      });
+
+      expect(response2.body.index_pattern.runtimeFieldMap.runtimeBar.type).to.be('keyword');
+      expect(response2.body.index_pattern.runtimeFieldMap.runtimeFoo).to.be(undefined);
+
+      const response3 = await supertest.get('/api/index_patterns/index_pattern/' + id);
+
+      expect(response3.body.index_pattern.runtimeFieldMap.runtimeBar.type).to.be('keyword');
+      expect(response3.body.index_pattern.runtimeFieldMap.runtimeFoo).to.be(undefined);
+    });
   });
 }
diff --git a/test/api_integration/apis/index_patterns/integration/index.ts b/test/api_integration/apis/index_patterns/integration/index.ts
new file mode 100644
index 0000000000000..6fd5f644ae894
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/integration/index.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 { FtrProviderContext } from '../../../ftr_provider_context';
+
+/**
+ * Test usage of different index patterns APIs in combination
+ */
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('integration', () => {
+    loadTestFile(require.resolve('./integration'));
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/integration/integration.ts b/test/api_integration/apis/index_patterns/integration/integration.ts
new file mode 100644
index 0000000000000..22f0755373323
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/integration/integration.ts
@@ -0,0 +1,119 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 _ from 'lodash';
+import { FtrProviderContext } from '../../../ftr_provider_context';
+
+/**
+ * Test usage of different index patterns APIs in combination
+ */
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('integration', () => {
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+    });
+
+    it('create an index pattern, add a runtime field, add a field formatter, then re-create the same index pattern', async () => {
+      const title = `basic_index*`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+        },
+      });
+      const id = response1.body.index_pattern.id;
+      const response2 = await supertest
+        .post(`/api/index_patterns/index_pattern/${id}/runtime_field`)
+        .send({
+          name: 'runtimeBar',
+          runtimeField: {
+            type: 'long',
+            script: {
+              source: "emit(doc['field_name'].value)",
+            },
+          },
+        });
+
+      expect(response2.status).to.be(200);
+
+      const response3 = await supertest
+        .post(`/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/fields`)
+        .send({
+          fields: {
+            runtimeBar: {
+              count: 123,
+              customLabel: 'test',
+            },
+          },
+        });
+
+      expect(response3.status).to.be(200);
+
+      const response4 = await supertest
+        .post(`/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/fields`)
+        .send({
+          fields: {
+            runtimeBar: {
+              format: {
+                id: 'duration',
+                params: { inputFormat: 'milliseconds', outputFormat: 'humanizePrecise' },
+              },
+            },
+          },
+        });
+
+      expect(response4.status).to.be(200);
+
+      const response5 = await supertest.get(
+        '/api/index_patterns/index_pattern/' + response1.body.index_pattern.id
+      );
+
+      expect(response5.status).to.be(200);
+
+      const resultIndexPattern = response5.body.index_pattern;
+
+      const runtimeField = resultIndexPattern.fields.runtimeBar;
+      expect(runtimeField.name).to.be('runtimeBar');
+      expect(runtimeField.runtimeField.type).to.be('long');
+      expect(runtimeField.runtimeField.script.source).to.be("emit(doc['field_name'].value)");
+      expect(runtimeField.scripted).to.be(false);
+
+      expect(resultIndexPattern.fieldFormats.runtimeBar.id).to.be('duration');
+      expect(resultIndexPattern.fieldFormats.runtimeBar.params.inputFormat).to.be('milliseconds');
+      expect(resultIndexPattern.fieldFormats.runtimeBar.params.outputFormat).to.be(
+        'humanizePrecise'
+      );
+
+      expect(resultIndexPattern.fieldAttrs.runtimeBar.count).to.be(123);
+      expect(resultIndexPattern.fieldAttrs.runtimeBar.customLabel).to.be('test');
+
+      // check that retrieved object is transient and a clone can be created
+      const response6 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: resultIndexPattern,
+      });
+
+      expect(response6.status).to.be(200);
+      const recreatedIndexPattern = response6.body.index_pattern;
+
+      expect(_.omit(recreatedIndexPattern, 'version')).to.eql(
+        _.omit(resultIndexPattern, 'version')
+      );
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/errors.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/errors.ts
new file mode 100644
index 0000000000000..8ce9e3b36b5c8
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/errors.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('errors', () => {
+    it('returns an error field object is not provided', async () => {
+      const title = `foo-${Date.now()}-${Math.random()}*`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        index_pattern: {
+          title,
+        },
+      });
+      const id = response1.body.index_pattern.id;
+      const response2 = await supertest
+        .post(`/api/index_patterns/index_pattern/${id}/runtime_field`)
+        .send({});
+
+      expect(response2.status).to.be(400);
+      expect(response2.body.statusCode).to.be(400);
+      expect(response2.body.message).to.be(
+        '[request body.name]: expected value of type [string] but got [undefined]'
+      );
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/index.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/index.ts
new file mode 100644
index 0000000000000..2cb90ca087f49
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/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 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 { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('create_runtime_field', () => {
+    loadTestFile(require.resolve('./errors'));
+    loadTestFile(require.resolve('./main'));
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/main.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/main.ts
new file mode 100644
index 0000000000000..e262b9d838e97
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/create_runtime_field/main.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('main', () => {
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+    });
+
+    it('can create a new runtime field', async () => {
+      const title = `basic_index*`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+        },
+      });
+      const id = response1.body.index_pattern.id;
+      const response2 = await supertest
+        .post(`/api/index_patterns/index_pattern/${id}/runtime_field`)
+        .send({
+          name: 'runtimeBar',
+          runtimeField: {
+            type: 'long',
+            script: {
+              source: "emit(doc['field_name'].value)",
+            },
+          },
+        });
+
+      expect(response2.status).to.be(200);
+      expect(response2.body.field.name).to.be('runtimeBar');
+      expect(response2.body.field.runtimeField.type).to.be('long');
+      expect(response2.body.field.runtimeField.script.source).to.be(
+        "emit(doc['field_name'].value)"
+      );
+      expect(response2.body.field.scripted).to.be(false);
+    });
+
+    it('newly created runtime field is available in the index_pattern object', async () => {
+      const title = `basic_index`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+        },
+      });
+
+      await supertest
+        .post(`/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/runtime_field`)
+        .send({
+          name: 'runtimeBar',
+          runtimeField: {
+            type: 'long',
+            script: {
+              source: "emit(doc['field_name'].value)",
+            },
+          },
+        });
+
+      const response2 = await supertest.get(
+        '/api/index_patterns/index_pattern/' + response1.body.index_pattern.id
+      );
+
+      expect(response2.status).to.be(200);
+
+      const field = response2.body.index_pattern.fields.runtimeBar;
+
+      expect(field.name).to.be('runtimeBar');
+      expect(field.runtimeField.type).to.be('long');
+      expect(field.runtimeField.script.source).to.be("emit(doc['field_name'].value)");
+      expect(field.scripted).to.be(false);
+      await supertest.delete(
+        '/api/index_patterns/index_pattern/' + response1.body.index_pattern.id
+      );
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/errors.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/errors.ts
new file mode 100644
index 0000000000000..b41a630889ff8
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/errors.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertest');
+
+  describe('errors', () => {
+    const basicIndex = 'b*sic_index';
+    let indexPattern: any;
+
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+
+      indexPattern = (
+        await supertest.post('/api/index_patterns/index_pattern').send({
+          index_pattern: {
+            title: basicIndex,
+          },
+        })
+      ).body.index_pattern;
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+
+      if (indexPattern) {
+        await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id);
+      }
+    });
+
+    it('returns 404 error on non-existing index_pattern', async () => {
+      const id = `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx-${Date.now()}`;
+      const response = await supertest.delete(
+        `/api/index_patterns/index_pattern/${id}/runtime_field/foo`
+      );
+
+      expect(response.status).to.be(404);
+    });
+
+    it('returns 404 error on non-existing runtime field', async () => {
+      const response1 = await supertest.delete(
+        `/api/index_patterns/index_pattern/${indexPattern.id}/runtime_field/test`
+      );
+
+      expect(response1.status).to.be(404);
+    });
+
+    it('returns error when attempting to delete a field which is not a runtime field', async () => {
+      const response2 = await supertest.delete(
+        `/api/index_patterns/index_pattern/${indexPattern.id}/runtime_field/foo`
+      );
+
+      expect(response2.status).to.be(400);
+      expect(response2.body.statusCode).to.be(400);
+      expect(response2.body.message).to.be('Only runtime fields can be deleted.');
+    });
+
+    it('returns error when ID is too long', async () => {
+      const id = `xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx`;
+      const response = await supertest.delete(
+        `/api/index_patterns/index_pattern/${id}/runtime_field/foo`
+      );
+
+      expect(response.status).to.be(400);
+      expect(response.body.message).to.be(
+        '[request params.id]: value has length [1759] but it must have a maximum length of [1000].'
+      );
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/index.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/index.ts
new file mode 100644
index 0000000000000..a14201e750dda
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/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 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 { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('delete_runtime_field', () => {
+    loadTestFile(require.resolve('./errors'));
+    loadTestFile(require.resolve('./main'));
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/main.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/main.ts
new file mode 100644
index 0000000000000..3c74aa336e440
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/delete_runtime_field/main.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('main', () => {
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+    });
+
+    it('can delete a runtime field', async () => {
+      const title = `basic_index*`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+          runtimeFieldMap: {
+            runtimeBar: {
+              type: 'long',
+              script: {
+                source: "emit(doc['field_name'].value)",
+              },
+            },
+          },
+        },
+      });
+
+      const response2 = await supertest.get(
+        '/api/index_patterns/index_pattern/' + response1.body.index_pattern.id
+      );
+
+      expect(typeof response2.body.index_pattern.fields.runtimeBar).to.be('object');
+
+      const response3 = await supertest.delete(
+        `/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/runtime_field/runtimeBar`
+      );
+
+      expect(response3.status).to.be(200);
+
+      const response4 = await supertest.get(
+        '/api/index_patterns/index_pattern/' + response1.body.index_pattern.id
+      );
+
+      expect(typeof response4.body.index_pattern.fields.runtimeBar).to.be('undefined');
+      await supertest.delete(
+        '/api/index_patterns/index_pattern/' + response1.body.index_pattern.id
+      );
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/errors.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/errors.ts
new file mode 100644
index 0000000000000..3608089e4641a
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/errors.ts
@@ -0,0 +1,81 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 }: FtrProviderContext) {
+  const esArchiver = getService('esArchiver');
+  const supertest = getService('supertest');
+
+  describe('errors', () => {
+    const basicIndex = '*asic_index';
+    let indexPattern: any;
+
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+
+      indexPattern = (
+        await supertest.post('/api/index_patterns/index_pattern').send({
+          index_pattern: {
+            title: basicIndex,
+          },
+        })
+      ).body.index_pattern;
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+
+      if (indexPattern) {
+        await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id);
+      }
+    });
+
+    it('returns 404 error on non-existing index_pattern', async () => {
+      const id = `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx-${Date.now()}`;
+      const response = await supertest.get(
+        `/api/index_patterns/index_pattern/${id}/runtime_field/foo`
+      );
+
+      expect(response.status).to.be(404);
+    });
+
+    it('returns 404 error on non-existing runtime field', async () => {
+      const response1 = await supertest.get(
+        `/api/index_patterns/index_pattern/${indexPattern.id}/runtime_field/sf`
+      );
+
+      expect(response1.status).to.be(404);
+    });
+
+    it('returns error when ID is too long', async () => {
+      const id = `xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx-xxxxxxxxxx`;
+      const response = await supertest.get(
+        `/api/index_patterns/index_pattern/${id}/runtime_field/foo`
+      );
+
+      expect(response.status).to.be(400);
+      expect(response.body.message).to.be(
+        '[request params.id]: value has length [1759] but it must have a maximum length of [1000].'
+      );
+    });
+
+    it('returns error when attempting to fetch a field which is not a runtime field', async () => {
+      const response2 = await supertest.get(
+        `/api/index_patterns/index_pattern/${indexPattern.id}/runtime_field/foo`
+      );
+
+      expect(response2.status).to.be(400);
+      expect(response2.body.statusCode).to.be(400);
+      expect(response2.body.message).to.be('Only runtime fields can be retrieved.');
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/index.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/index.ts
new file mode 100644
index 0000000000000..2e48ba64841ee
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/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 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 { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('get_runtime_field', () => {
+    loadTestFile(require.resolve('./errors'));
+    loadTestFile(require.resolve('./main'));
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/main.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/main.ts
new file mode 100644
index 0000000000000..fa0283d69d8e3
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/get_runtime_field/main.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 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 }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('main', () => {
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+    });
+
+    it('can fetch a runtime field', async () => {
+      const title = `basic_index*`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+          runtimeFieldMap: {
+            runtimeFoo: {
+              type: 'keyword',
+              script: {
+                source: "emit(doc['field_name'].value)",
+              },
+            },
+            runtimeBar: {
+              type: 'keyword',
+              script: {
+                source: "emit(doc['field_name'].value)",
+              },
+            },
+          },
+        },
+      });
+
+      expect(response1.status).to.be(200);
+
+      const response2 = await supertest.get(
+        '/api/index_patterns/index_pattern/' +
+          response1.body.index_pattern.id +
+          '/runtime_field/runtimeFoo'
+      );
+
+      expect(response2.status).to.be(200);
+      expect(typeof response2.body.field).to.be('object');
+      expect(response2.body.field.name).to.be('runtimeFoo');
+      expect(response2.body.field.type).to.be('string');
+      expect(response2.body.field.scripted).to.be(false);
+      expect(response2.body.field.runtimeField.script.source).to.be(
+        "emit(doc['field_name'].value)"
+      );
+      await supertest.delete(
+        '/api/index_patterns/index_pattern/' + response1.body.index_pattern.id
+      );
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/index.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/index.ts
new file mode 100644
index 0000000000000..7a727a3e86755
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/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 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 { FtrProviderContext } from '../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('runtime_fields_crud', () => {
+    loadTestFile(require.resolve('./create_runtime_field'));
+    loadTestFile(require.resolve('./get_runtime_field'));
+    loadTestFile(require.resolve('./delete_runtime_field'));
+    loadTestFile(require.resolve('./put_runtime_field'));
+    loadTestFile(require.resolve('./update_runtime_field'));
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/errors.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/errors.ts
new file mode 100644
index 0000000000000..9faca08238033
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/errors.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 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 }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('errors', () => {
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+    });
+
+    it('returns 404 error on non-existing index_pattern', async () => {
+      const id = `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx-${Date.now()}`;
+      const response = await supertest
+        .put(`/api/index_patterns/index_pattern/${id}/runtime_field`)
+        .send({
+          name: 'runtimeBar',
+          runtimeField: {
+            type: 'long',
+            script: {
+              source: "emit(doc['field_name'].value)",
+            },
+          },
+        });
+
+      expect(response.status).to.be(404);
+    });
+
+    it('returns error on non-runtime field update attempt', async () => {
+      const title = `basic_index`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+        },
+      });
+
+      const response2 = await supertest
+        .put(`/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/runtime_field`)
+        .send({
+          name: 'bar',
+          runtimeField: {
+            type: 'long',
+            script: {
+              source: "emit(doc['field_name'].value)",
+            },
+          },
+        });
+
+      expect(response2.status).to.be(400);
+      expect(response2.body.message).to.be('Only runtime fields can be updated');
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/index.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/index.ts
new file mode 100644
index 0000000000000..724f18e57f3ef
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/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 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 { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('put_runtime_field', () => {
+    loadTestFile(require.resolve('./errors'));
+    loadTestFile(require.resolve('./main'));
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/main.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/main.ts
new file mode 100644
index 0000000000000..92d8c6fd6d3c2
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/put_runtime_field/main.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('main', () => {
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+    });
+
+    it('can overwrite an existing field', async () => {
+      const title = `basic_index`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+          runtimeFieldMap: {
+            runtimeFoo: {
+              type: 'keyword',
+              script: {
+                source: "doc['field_name'].value",
+              },
+            },
+            runtimeBar: {
+              type: 'keyword',
+              script: {
+                source: "doc['field_name'].value",
+              },
+            },
+          },
+        },
+      });
+
+      const response2 = await supertest
+        .put(`/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/runtime_field`)
+        .send({
+          name: 'runtimeFoo',
+          runtimeField: {
+            type: 'long',
+            script: {
+              source: "doc['field_name'].value",
+            },
+          },
+        });
+
+      expect(response2.status).to.be(200);
+
+      const response3 = await supertest.get(
+        '/api/index_patterns/index_pattern/' +
+          response1.body.index_pattern.id +
+          '/runtime_field/runtimeFoo'
+      );
+
+      expect(response3.status).to.be(200);
+      expect(response3.body.field.type).to.be('number');
+
+      const response4 = await supertest.get(
+        '/api/index_patterns/index_pattern/' +
+          response1.body.index_pattern.id +
+          '/runtime_field/runtimeBar'
+      );
+
+      expect(response4.status).to.be(200);
+      expect(response4.body.field.type).to.be('string');
+    });
+
+    it('can add a new runtime field', async () => {
+      const title = `basic_index`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+          runtimeFieldMap: {
+            runtimeFoo: {
+              type: 'keyword',
+              script: {
+                source: "doc['field_name'].value",
+              },
+            },
+          },
+        },
+      });
+
+      await supertest
+        .put(`/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/runtime_field`)
+        .send({
+          name: 'runtimeBar',
+          runtimeField: {
+            type: 'long',
+            script: {
+              source: "doc['field_name'].value",
+            },
+          },
+        });
+
+      const response2 = await supertest.get(
+        '/api/index_patterns/index_pattern/' +
+          response1.body.index_pattern.id +
+          '/runtime_field/runtimeBar'
+      );
+
+      expect(response2.status).to.be(200);
+      expect(typeof response2.body.field.runtimeField).to.be('object');
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/errors.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/errors.ts
new file mode 100644
index 0000000000000..3980821c0fd09
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/errors.ts
@@ -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 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 }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('errors', () => {
+    it('returns 404 error on non-existing index_pattern', async () => {
+      const id = `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx-${Date.now()}`;
+      const response = await supertest
+        .post(`/api/index_patterns/index_pattern/${id}/runtime_field/foo`)
+        .send({
+          runtimeField: {
+            script: {
+              source: "doc['something_new'].value",
+            },
+          },
+        });
+
+      expect(response.status).to.be(404);
+    });
+
+    it('returns error when field name is specified', async () => {
+      const id = `xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx-${Date.now()}`;
+      const response = await supertest
+        .post(`/api/index_patterns/index_pattern/${id}/runtime_field/foo`)
+        .send({
+          name: 'foo',
+          runtimeField: {
+            script: {
+              source: "doc['something_new'].value",
+            },
+          },
+        });
+
+      expect(response.status).to.be(400);
+      expect(response.body.statusCode).to.be(400);
+      expect(response.body.message).to.be(
+        "[request body.name]: a value wasn't expected to be present"
+      );
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/index.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/index.ts
new file mode 100644
index 0000000000000..f5d556ca9994a
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/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 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 { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('update_runtime_field', () => {
+    loadTestFile(require.resolve('./errors'));
+    loadTestFile(require.resolve('./main'));
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/main.ts b/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/main.ts
new file mode 100644
index 0000000000000..6b924570a0e45
--- /dev/null
+++ b/test/api_integration/apis/index_patterns/runtime_fields_crud/update_runtime_field/main.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../ftr_provider_context';
+
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('main', () => {
+    before(async () => {
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+    });
+
+    after(async () => {
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+    });
+
+    it('can update an existing field', async () => {
+      const title = `basic_index`;
+      const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
+        index_pattern: {
+          title,
+          runtimeFieldMap: {
+            runtimeFoo: {
+              type: 'keyword',
+              script: {
+                source: "doc['field_name'].value",
+              },
+            },
+            runtimeBar: {
+              type: 'keyword',
+              script: {
+                source: "doc['field_name'].value",
+              },
+            },
+          },
+        },
+      });
+
+      const response2 = await supertest
+        .post(
+          `/api/index_patterns/index_pattern/${response1.body.index_pattern.id}/runtime_field/runtimeFoo`
+        )
+        .send({
+          runtimeField: {
+            script: {
+              source: "doc['something_new'].value",
+            },
+          },
+        });
+
+      expect(response2.status).to.be(200);
+
+      const response3 = await supertest.get(
+        '/api/index_patterns/index_pattern/' +
+          response1.body.index_pattern.id +
+          '/runtime_field/runtimeFoo'
+      );
+
+      expect(response3.status).to.be(200);
+      expect(response3.body.field.type).to.be('string');
+      expect(response3.body.field.runtimeField.type).to.be('keyword');
+      expect(response3.body.field.runtimeField.script.source).to.be("doc['something_new'].value");
+    });
+  });
+}
diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts
index f9ab482f98b76..663deae1d3476 100644
--- a/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts
+++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/create_scripted_field/main.ts
@@ -15,16 +15,19 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('main', () => {
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
     });
 
     it('can create a new scripted field', async () => {
       const title = `foo-${Date.now()}-${Math.random()}*`;
       const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
         index_pattern: {
           title,
         },
@@ -51,6 +54,7 @@ export default function ({ getService }: FtrProviderContext) {
     it('newly created scripted field is materialized in the index_pattern object', async () => {
       const title = `basic_index`;
       const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
         index_pattern: {
           title,
         },
diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts
index f0787500d505c..2b35f1ec50e91 100644
--- a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts
+++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/errors.ts
@@ -18,7 +18,7 @@ export default function ({ getService }: FtrProviderContext) {
     let indexPattern: any;
 
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
 
       indexPattern = (
         await supertest.post('/api/index_patterns/index_pattern').send({
@@ -30,7 +30,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
 
       if (indexPattern) {
         await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id);
diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts
index 40f57cd914a2f..b9ce3e84d5390 100644
--- a/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts
+++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/delete_scripted_field/main.ts
@@ -15,16 +15,19 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('main', () => {
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
     });
 
     it('can remove a scripted field', async () => {
       const title = `basic_index`;
       const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
         index_pattern: {
           title,
           fields: {
diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts
index ef2fbc5258d66..be9d213a32845 100644
--- a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts
+++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/errors.ts
@@ -18,7 +18,7 @@ export default function ({ getService }: FtrProviderContext) {
     let indexPattern: any;
 
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
 
       indexPattern = (
         await supertest.post('/api/index_patterns/index_pattern').send({
@@ -30,7 +30,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
 
       if (indexPattern) {
         await supertest.delete('/api/index_patterns/index_pattern/' + indexPattern.id);
diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts
index 7fff720e5195f..c38c3a01708a7 100644
--- a/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts
+++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/get_scripted_field/main.ts
@@ -15,16 +15,19 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('main', () => {
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
     });
 
     it('can fetch a scripted field', async () => {
       const title = `basic_index`;
       const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
         index_pattern: {
           title,
           fields: {
diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts
index dec20961b0de0..16b1958306818 100644
--- a/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts
+++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/put_scripted_field/main.ts
@@ -15,16 +15,19 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('main', () => {
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
     });
 
     it('can overwrite an existing field', async () => {
       const title = `basic_index`;
       const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
         index_pattern: {
           title,
           fields: {
diff --git a/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts b/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts
index ac6b11522124b..4ffc98e0660bc 100644
--- a/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts
+++ b/test/api_integration/apis/index_patterns/scripted_fields_crud/update_scripted_field/main.ts
@@ -15,16 +15,19 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('main', () => {
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
     });
 
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
     });
 
     it('can update an existing field', async () => {
       const title = `basic_index`;
       const response1 = await supertest.post('/api/index_patterns/index_pattern').send({
+        override: true,
         index_pattern: {
           title,
           fields: {
diff --git a/test/api_integration/apis/kql_telemetry/kql_telemetry.ts b/test/api_integration/apis/kql_telemetry/kql_telemetry.ts
index 5c4a8b25e4c05..09e36b9078792 100644
--- a/test/api_integration/apis/kql_telemetry/kql_telemetry.ts
+++ b/test/api_integration/apis/kql_telemetry/kql_telemetry.ts
@@ -13,12 +13,12 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
   const es = getService('es');
 
   describe('telemetry API', () => {
-    before(() => esArchiver.load('saved_objects/basic'));
-    after(() => esArchiver.unload('saved_objects/basic'));
+    before(() => kibanaServer.importExport.load('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
     it('should increment the opt *in* counter in the .kibana/kql-telemetry document', async () => {
       await supertest
diff --git a/test/api_integration/apis/saved_objects/bulk_create.ts b/test/api_integration/apis/saved_objects/bulk_create.ts
index 57b7ff0935f58..1f76567e973b2 100644
--- a/test/api_integration/apis/saved_objects/bulk_create.ts
+++ b/test/api_integration/apis/saved_objects/bulk_create.ts
@@ -12,8 +12,8 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
+  const SPACE_ID = 'ftr-so-bulk-create';
 
   const BULK_REQUESTS = [
     {
@@ -38,99 +38,58 @@ export default function ({ getService }: FtrProviderContext) {
 
     before(async () => {
       KIBANA_VERSION = await getKibanaVersion(getService);
+      await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
+      await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
     });
 
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
+    after(() => kibanaServer.spaces.delete(SPACE_ID));
 
-      it('should return 200 with individual responses', async () =>
-        await supertest
-          .post(`/api/saved_objects/_bulk_create`)
-          .send(BULK_REQUESTS)
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              saved_objects: [
-                {
-                  type: 'visualization',
-                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                  error: {
-                    error: 'Conflict',
-                    message:
-                      'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] conflict',
-                    statusCode: 409,
-                  },
+    it('should return 200 with individual responses', async () =>
+      await supertest
+        .post(`/s/${SPACE_ID}/api/saved_objects/_bulk_create`)
+        .send(BULK_REQUESTS)
+        .expect(200)
+        .then((resp) => {
+          expect(resp.body).to.eql({
+            saved_objects: [
+              {
+                type: 'visualization',
+                id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                error: {
+                  error: 'Conflict',
+                  message:
+                    'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] conflict',
+                  statusCode: 409,
                 },
-                {
-                  type: 'dashboard',
-                  id: 'a01b2f57-fcfd-4864-b735-09e28f0d815e',
-                  updated_at: resp.body.saved_objects[1].updated_at,
-                  version: resp.body.saved_objects[1].version,
-                  attributes: {
-                    title: 'A great new dashboard',
-                  },
-                  migrationVersion: {
-                    dashboard: resp.body.saved_objects[1].migrationVersion.dashboard,
-                  },
-                  coreMigrationVersion: KIBANA_VERSION,
-                  references: [],
-                  namespaces: ['default'],
+              },
+              {
+                type: 'dashboard',
+                id: 'a01b2f57-fcfd-4864-b735-09e28f0d815e',
+                updated_at: resp.body.saved_objects[1].updated_at,
+                version: resp.body.saved_objects[1].version,
+                attributes: {
+                  title: 'A great new dashboard',
                 },
-              ],
-            });
-          }));
-
-      it('should not return raw id when object id is unspecified', async () =>
-        await supertest
-          .post(`/api/saved_objects/_bulk_create`)
-          .send(BULK_REQUESTS.map(({ id, ...rest }) => rest))
-          .expect(200)
-          .then((resp) => {
-            resp.body.saved_objects.map(({ id }: { id: string }) =>
-              expect(id).not.match(/visualization|dashboard/)
-            );
-          }));
-    });
-
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
-
-      it('should return 200 with errors', async () => {
-        await new Promise((resolve) => setTimeout(resolve, 2000));
-        await supertest
-          .post('/api/saved_objects/_bulk_create')
-          .send(BULK_REQUESTS)
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              saved_objects: [
-                {
-                  id: BULK_REQUESTS[0].id,
-                  type: BULK_REQUESTS[0].type,
-                  error: {
-                    error: 'Internal Server Error',
-                    message: 'An internal server error occurred',
-                    statusCode: 500,
-                  },
+                migrationVersion: {
+                  dashboard: resp.body.saved_objects[1].migrationVersion.dashboard,
                 },
-                {
-                  id: BULK_REQUESTS[1].id,
-                  type: BULK_REQUESTS[1].type,
-                  error: {
-                    error: 'Internal Server Error',
-                    message: 'An internal server error occurred',
-                    statusCode: 500,
-                  },
-                },
-              ],
-            });
+                coreMigrationVersion: KIBANA_VERSION,
+                references: [],
+                namespaces: [SPACE_ID],
+              },
+            ],
           });
-      });
-    });
+        }));
+
+    it('should not return raw id when object id is unspecified', async () =>
+      await supertest
+        .post(`/s/${SPACE_ID}/api/saved_objects/_bulk_create`)
+        .send(BULK_REQUESTS.map(({ id, ...rest }) => rest))
+        .expect(200)
+        .then((resp) => {
+          resp.body.saved_objects.map(({ id }: { id: string }) =>
+            expect(id).not.match(/visualization|dashboard/)
+          );
+        }));
   });
 }
diff --git a/test/api_integration/apis/saved_objects/bulk_get.ts b/test/api_integration/apis/saved_objects/bulk_get.ts
index 77f84dee25ded..81e86913aaf86 100644
--- a/test/api_integration/apis/saved_objects/bulk_get.ts
+++ b/test/api_integration/apis/saved_objects/bulk_get.ts
@@ -12,8 +12,7 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   const BULK_REQUESTS = [
     {
@@ -35,121 +34,75 @@ export default function ({ getService }: FtrProviderContext) {
 
     before(async () => {
       KIBANA_VERSION = await getKibanaVersion(getService);
+      await kibanaServer.importExport.load('saved_objects/basic');
     });
 
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
-      it('should return 200 with individual responses', async () =>
-        await supertest
-          .post(`/api/saved_objects/_bulk_get`)
-          .send(BULK_REQUESTS)
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              saved_objects: [
-                {
-                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                  type: 'visualization',
-                  updated_at: '2017-09-21T18:51:23.794Z',
-                  version: resp.body.saved_objects[0].version,
-                  attributes: {
-                    title: 'Count of requests',
-                    description: '',
-                    version: 1,
-                    // cheat for some of the more complex attributes
-                    visState: resp.body.saved_objects[0].attributes.visState,
-                    uiStateJSON: resp.body.saved_objects[0].attributes.uiStateJSON,
-                    kibanaSavedObjectMeta:
-                      resp.body.saved_objects[0].attributes.kibanaSavedObjectMeta,
-                  },
-                  migrationVersion: resp.body.saved_objects[0].migrationVersion,
-                  coreMigrationVersion: KIBANA_VERSION,
-                  namespaces: ['default'],
-                  references: [
-                    {
-                      name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-                      type: 'index-pattern',
-                      id: '91200a00-9efd-11e7-acb3-3dab96693fab',
-                    },
-                  ],
-                },
-                {
-                  id: 'does not exist',
-                  type: 'dashboard',
-                  error: {
-                    error: 'Not Found',
-                    message: 'Saved object [dashboard/does not exist] not found',
-                    statusCode: 404,
-                  },
-                },
-                {
-                  id: '7.0.0-alpha1',
-                  type: 'config',
-                  updated_at: '2017-09-21T18:49:16.302Z',
-                  version: resp.body.saved_objects[2].version,
-                  attributes: {
-                    buildNum: 8467,
-                    defaultIndex: '91200a00-9efd-11e7-acb3-3dab96693fab',
-                  },
-                  namespaces: ['default'],
-                  migrationVersion: resp.body.saved_objects[2].migrationVersion,
-                  coreMigrationVersion: KIBANA_VERSION,
-                  references: [],
-                },
-              ],
-            });
-            expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
-          }));
-    });
-
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
+    it('should return 200 with individual responses', async () =>
+      await supertest
+        .post(`/api/saved_objects/_bulk_get`)
+        .send(BULK_REQUESTS)
+        .expect(200)
+        .then((resp) => {
+          const mockDate = '2015-01-01T00:00:00.000Z';
+          resp.body.saved_objects[0].updated_at = mockDate;
+          resp.body.saved_objects[2].updated_at = mockDate;
 
-      it('should return 200 with individual responses', async () =>
-        await supertest
-          .post('/api/saved_objects/_bulk_get')
-          .send(BULK_REQUESTS)
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              saved_objects: [
-                {
-                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                  type: 'visualization',
-                  error: {
-                    error: 'Not Found',
-                    message:
-                      'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] not found',
-                    statusCode: 404,
-                  },
+          expect(resp.body).to.eql({
+            saved_objects: [
+              {
+                id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                type: 'visualization',
+                updated_at: '2015-01-01T00:00:00.000Z',
+                version: resp.body.saved_objects[0].version,
+                attributes: {
+                  title: 'Count of requests',
+                  description: '',
+                  version: 1,
+                  // cheat for some of the more complex attributes
+                  visState: resp.body.saved_objects[0].attributes.visState,
+                  uiStateJSON: resp.body.saved_objects[0].attributes.uiStateJSON,
+                  kibanaSavedObjectMeta:
+                    resp.body.saved_objects[0].attributes.kibanaSavedObjectMeta,
                 },
-                {
-                  id: 'does not exist',
-                  type: 'dashboard',
-                  error: {
-                    error: 'Not Found',
-                    message: 'Saved object [dashboard/does not exist] not found',
-                    statusCode: 404,
+                migrationVersion: resp.body.saved_objects[0].migrationVersion,
+                coreMigrationVersion: KIBANA_VERSION,
+                namespaces: ['default'],
+                references: [
+                  {
+                    name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+                    type: 'index-pattern',
+                    id: '91200a00-9efd-11e7-acb3-3dab96693fab',
                   },
+                ],
+              },
+              {
+                id: 'does not exist',
+                type: 'dashboard',
+                error: {
+                  error: 'Not Found',
+                  message: 'Saved object [dashboard/does not exist] not found',
+                  statusCode: 404,
                 },
-                {
-                  id: '7.0.0-alpha1',
-                  type: 'config',
-                  error: {
-                    error: 'Not Found',
-                    message: 'Saved object [config/7.0.0-alpha1] not found',
-                    statusCode: 404,
-                  },
+              },
+              {
+                id: '7.0.0-alpha1',
+                type: 'config',
+                updated_at: '2015-01-01T00:00:00.000Z',
+                version: resp.body.saved_objects[2].version,
+                attributes: {
+                  buildNum: 8467,
+                  defaultIndex: '91200a00-9efd-11e7-acb3-3dab96693fab',
                 },
-              ],
-            });
-          }));
-    });
+                namespaces: ['default'],
+                migrationVersion: resp.body.saved_objects[2].migrationVersion,
+                coreMigrationVersion: KIBANA_VERSION,
+                references: [],
+              },
+            ],
+          });
+          expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
+        }));
   });
 }
diff --git a/test/api_integration/apis/saved_objects/bulk_update.ts b/test/api_integration/apis/saved_objects/bulk_update.ts
index a5f5262196346..8740652fc3953 100644
--- a/test/api_integration/apis/saved_objects/bulk_update.ts
+++ b/test/api_integration/apis/saved_objects/bulk_update.ts
@@ -12,239 +12,180 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   describe('bulkUpdate', () => {
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
-      it('should return 200', async () => {
-        const response = await supertest
-          .put(`/api/saved_objects/_bulk_update`)
-          .send([
-            {
-              type: 'visualization',
-              id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-              attributes: {
-                title: 'An existing visualization',
-              },
-            },
-            {
-              type: 'dashboard',
-              id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-              attributes: {
-                title: 'An existing dashboard',
-              },
-            },
-          ])
-          .expect(200);
-
-        const {
-          saved_objects: [firstObject, secondObject],
-        } = response.body;
-
-        // loose ISO8601 UTC time with milliseconds validation
-        expect(firstObject)
-          .to.have.property('updated_at')
-          .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-        expect(_.omit(firstObject, ['updated_at'])).to.eql({
-          id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-          type: 'visualization',
-          version: firstObject.version,
-          attributes: {
-            title: 'An existing visualization',
-          },
-          namespaces: ['default'],
-        });
-
-        expect(secondObject)
-          .to.have.property('updated_at')
-          .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-        expect(_.omit(secondObject, ['updated_at'])).to.eql({
-          id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-          type: 'dashboard',
-          version: secondObject.version,
-          attributes: {
-            title: 'An existing dashboard',
-          },
-          namespaces: ['default'],
-        });
-      });
+    before(() => kibanaServer.importExport.load('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
-      it('does not pass references if omitted', async () => {
-        const {
-          body: {
-            saved_objects: [visObject, dashObject],
-          },
-        } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
+    it('should return 200', async () => {
+      const response = await supertest
+        .put(`/api/saved_objects/_bulk_update`)
+        .send([
           {
             type: 'visualization',
             id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+            attributes: {
+              title: 'An existing visualization',
+            },
           },
           {
             type: 'dashboard',
             id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+            attributes: {
+              title: 'An existing dashboard',
+            },
           },
-        ]);
+        ])
+        .expect(200);
+
+      const {
+        saved_objects: [firstObject, secondObject],
+      } = response.body;
+
+      // loose ISO8601 UTC time with milliseconds validation
+      expect(firstObject)
+        .to.have.property('updated_at')
+        .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+      expect(_.omit(firstObject, ['updated_at'])).to.eql({
+        id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+        type: 'visualization',
+        version: firstObject.version,
+        attributes: {
+          title: 'An existing visualization',
+        },
+        namespaces: ['default'],
+      });
 
-        const response = await supertest
-          .put(`/api/saved_objects/_bulk_update`)
-          .send([
-            {
-              type: 'visualization',
-              id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-              attributes: {
-                title: 'Changed title but nothing else',
-              },
-              version: visObject.version,
-            },
-            {
-              type: 'dashboard',
-              id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-              attributes: {
-                title: 'Changed title and references',
-              },
-              version: dashObject.version,
-              references: [{ id: 'foo', name: 'Foo', type: 'visualization' }],
-            },
-          ])
-          .expect(200);
+      expect(secondObject)
+        .to.have.property('updated_at')
+        .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+      expect(_.omit(secondObject, ['updated_at'])).to.eql({
+        id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+        type: 'dashboard',
+        version: secondObject.version,
+        attributes: {
+          title: 'An existing dashboard',
+        },
+        namespaces: ['default'],
+      });
+    });
 
-        const {
-          saved_objects: [firstUpdatedObject, secondUpdatedObject],
-        } = response.body;
-        expect(firstUpdatedObject).to.not.have.property('error');
-        expect(secondUpdatedObject).to.not.have.property('error');
+    it('does not pass references if omitted', async () => {
+      const {
+        body: {
+          saved_objects: [visObject, dashObject],
+        },
+      } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
+        {
+          type: 'visualization',
+          id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+        },
+        {
+          type: 'dashboard',
+          id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+        },
+      ]);
 
-        const {
-          body: {
-            saved_objects: [visObjectAfterUpdate, dashObjectAfterUpdate],
-          },
-        } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
+      const response = await supertest
+        .put(`/api/saved_objects/_bulk_update`)
+        .send([
           {
             type: 'visualization',
             id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+            attributes: {
+              title: 'Changed title but nothing else',
+            },
+            version: visObject.version,
           },
           {
             type: 'dashboard',
             id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+            attributes: {
+              title: 'Changed title and references',
+            },
+            version: dashObject.version,
+            references: [{ id: 'foo', name: 'Foo', type: 'visualization' }],
           },
-        ]);
-
-        expect(visObjectAfterUpdate.references).to.eql(visObject.references);
-        expect(dashObjectAfterUpdate.references).to.eql([
-          { id: 'foo', name: 'Foo', type: 'visualization' },
-        ]);
-      });
+        ])
+        .expect(200);
+
+      const {
+        saved_objects: [firstUpdatedObject, secondUpdatedObject],
+      } = response.body;
+      expect(firstUpdatedObject).to.not.have.property('error');
+      expect(secondUpdatedObject).to.not.have.property('error');
+
+      const {
+        body: {
+          saved_objects: [visObjectAfterUpdate, dashObjectAfterUpdate],
+        },
+      } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
+        {
+          type: 'visualization',
+          id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+        },
+        {
+          type: 'dashboard',
+          id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+        },
+      ]);
 
-      it('passes empty references array if empty references array is provided', async () => {
-        const {
-          body: {
-            saved_objects: [{ version }],
-          },
-        } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
-          {
-            type: 'visualization',
-            id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-          },
-        ]);
+      expect(visObjectAfterUpdate.references).to.eql(visObject.references);
+      expect(dashObjectAfterUpdate.references).to.eql([
+        { id: 'foo', name: 'Foo', type: 'visualization' },
+      ]);
+    });
 
-        await supertest
-          .put(`/api/saved_objects/_bulk_update`)
-          .send([
-            {
-              type: 'visualization',
-              id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-              attributes: {
-                title: 'Changed title but nothing else',
-              },
-              version,
-              references: [],
-            },
-          ])
-          .expect(200);
+    it('passes empty references array if empty references array is provided', async () => {
+      const {
+        body: {
+          saved_objects: [{ version }],
+        },
+      } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
+        {
+          type: 'visualization',
+          id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+        },
+      ]);
 
-        const {
-          body: {
-            saved_objects: [visObjectAfterUpdate],
-          },
-        } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
+      await supertest
+        .put(`/api/saved_objects/_bulk_update`)
+        .send([
           {
             type: 'visualization',
             id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-          },
-        ]);
-
-        expect(visObjectAfterUpdate.references).to.eql([]);
-      });
-
-      describe('unknown id', () => {
-        it('should return a generic 404', async () => {
-          const response = await supertest
-            .put(`/api/saved_objects/_bulk_update`)
-            .send([
-              {
-                type: 'visualization',
-                id: 'not an id',
-                attributes: {
-                  title: 'An existing visualization',
-                },
-              },
-              {
-                type: 'dashboard',
-                id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-                attributes: {
-                  title: 'An existing dashboard',
-                },
-              },
-            ])
-            .expect(200);
-
-          const {
-            saved_objects: [missingObject, updatedObject],
-          } = response.body;
-
-          // loose ISO8601 UTC time with milliseconds validation
-          expect(missingObject).eql({
-            type: 'visualization',
-            id: 'not an id',
-            error: {
-              statusCode: 404,
-              error: 'Not Found',
-              message: 'Saved object [visualization/not an id] not found',
-            },
-          });
-
-          expect(updatedObject)
-            .to.have.property('updated_at')
-            .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-          expect(_.omit(updatedObject, ['updated_at', 'version'])).to.eql({
-            id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-            type: 'dashboard',
             attributes: {
-              title: 'An existing dashboard',
+              title: 'Changed title but nothing else',
             },
-            namespaces: ['default'],
-          });
-        });
-      });
-    });
+            version,
+            references: [],
+          },
+        ])
+        .expect(200);
+
+      const {
+        body: {
+          saved_objects: [visObjectAfterUpdate],
+        },
+      } = await supertest.post(`/api/saved_objects/_bulk_get`).send([
+        {
+          type: 'visualization',
+          id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+        },
+      ]);
 
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
+      expect(visObjectAfterUpdate.references).to.eql([]);
+    });
 
-      it('should return 200 with errors', async () => {
+    describe('unknown id', () => {
+      it('should return a generic 404', async () => {
         const response = await supertest
           .put(`/api/saved_objects/_bulk_update`)
           .send([
             {
               type: 'visualization',
-              id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+              id: 'not an id',
               attributes: {
                 title: 'An existing visualization',
               },
@@ -260,27 +201,30 @@ export default function ({ getService }: FtrProviderContext) {
           .expect(200);
 
         const {
-          saved_objects: [firstObject, secondObject],
+          saved_objects: [missingObject, updatedObject],
         } = response.body;
 
-        expect(firstObject).to.eql({
-          id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+        // loose ISO8601 UTC time with milliseconds validation
+        expect(missingObject).eql({
           type: 'visualization',
+          id: 'not an id',
           error: {
-            statusCode: 500,
-            error: 'Internal Server Error',
-            message: 'An internal server error occurred',
+            statusCode: 404,
+            error: 'Not Found',
+            message: 'Saved object [visualization/not an id] not found',
           },
         });
 
-        expect(secondObject).to.eql({
+        expect(updatedObject)
+          .to.have.property('updated_at')
+          .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+        expect(_.omit(updatedObject, ['updated_at', 'version'])).to.eql({
           id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
           type: 'dashboard',
-          error: {
-            statusCode: 500,
-            error: 'Internal Server Error',
-            message: 'An internal server error occurred',
+          attributes: {
+            title: 'An existing dashboard',
           },
+          namespaces: ['default'],
         });
       });
     });
diff --git a/test/api_integration/apis/saved_objects/create.ts b/test/api_integration/apis/saved_objects/create.ts
index de31b621a6480..dfa7ceb503dfd 100644
--- a/test/api_integration/apis/saved_objects/create.ts
+++ b/test/api_integration/apis/saved_objects/create.ts
@@ -12,99 +12,68 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const es = getService('es');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   describe('create', () => {
     let KIBANA_VERSION: string;
 
     before(async () => {
       KIBANA_VERSION = await getKibanaVersion(getService);
+      await kibanaServer.importExport.load('saved_objects/basic');
     });
 
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
-      it('should return 200', async () => {
-        await supertest
-          .post(`/api/saved_objects/visualization`)
-          .send({
-            attributes: {
-              title: 'My favorite vis',
-            },
-          })
-          .expect(200)
-          .then((resp) => {
-            // loose uuid validation
-            expect(resp.body)
-              .to.have.property('id')
-              .match(/^[0-9a-f-]{36}$/);
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
-            // loose ISO8601 UTC time with milliseconds validation
-            expect(resp.body)
-              .to.have.property('updated_at')
-              .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+    it('should return 200', async () => {
+      await supertest
+        .post(`/api/saved_objects/visualization`)
+        .send({
+          attributes: {
+            title: 'My favorite vis',
+          },
+        })
+        .expect(200)
+        .then((resp) => {
+          // loose uuid validation
+          expect(resp.body)
+            .to.have.property('id')
+            .match(/^[0-9a-f-]{36}$/);
 
-            expect(resp.body).to.eql({
-              id: resp.body.id,
-              type: 'visualization',
-              migrationVersion: resp.body.migrationVersion,
-              coreMigrationVersion: KIBANA_VERSION,
-              updated_at: resp.body.updated_at,
-              version: resp.body.version,
-              attributes: {
-                title: 'My favorite vis',
-              },
-              references: [],
-              namespaces: ['default'],
-            });
-            expect(resp.body.migrationVersion).to.be.ok();
-          });
-      });
+          // loose ISO8601 UTC time with milliseconds validation
+          expect(resp.body)
+            .to.have.property('updated_at')
+            .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
 
-      it('result should be updated to the latest coreMigrationVersion', async () => {
-        await supertest
-          .post(`/api/saved_objects/visualization`)
-          .send({
+          expect(resp.body).to.eql({
+            id: resp.body.id,
+            type: 'visualization',
+            migrationVersion: resp.body.migrationVersion,
+            coreMigrationVersion: KIBANA_VERSION,
+            updated_at: resp.body.updated_at,
+            version: resp.body.version,
             attributes: {
               title: 'My favorite vis',
             },
-            coreMigrationVersion: '1.2.3',
-          })
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body.coreMigrationVersion).to.eql(KIBANA_VERSION);
+            references: [],
+            namespaces: ['default'],
           });
-      });
+          expect(resp.body.migrationVersion).to.be.ok();
+        });
     });
 
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
-
-      it('should return 500 and not auto-create saved objects index', async () => {
-        await supertest
-          .post(`/api/saved_objects/visualization`)
-          .send({
-            attributes: {
-              title: 'My favorite vis',
-            },
-          })
-          .expect(500)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              error: 'Internal Server Error',
-              message: 'An internal server error occurred.',
-              statusCode: 500,
-            });
-          });
-
-        expect((await es.indices.exists({ index: '.kibana' })).body).to.be(false);
-      });
+    it('result should be updated to the latest coreMigrationVersion', async () => {
+      await supertest
+        .post(`/api/saved_objects/visualization`)
+        .send({
+          attributes: {
+            title: 'My favorite vis',
+          },
+          coreMigrationVersion: '1.2.3',
+        })
+        .expect(200)
+        .then((resp) => {
+          expect(resp.body.coreMigrationVersion).to.eql(KIBANA_VERSION);
+        });
     });
   });
 }
diff --git a/test/api_integration/apis/saved_objects/delete.ts b/test/api_integration/apis/saved_objects/delete.ts
index 0dfece825d3a1..9a4525df1b5f7 100644
--- a/test/api_integration/apis/saved_objects/delete.ts
+++ b/test/api_integration/apis/saved_objects/delete.ts
@@ -11,53 +11,30 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   describe('delete', () => {
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
+    before(() => kibanaServer.importExport.load('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
-      it('should return 200 when deleting a doc', async () =>
-        await supertest
-          .delete(`/api/saved_objects/dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab`)
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body).to.eql({});
-          }));
+    it('should return 200 when deleting a doc', async () =>
+      await supertest
+        .delete(`/api/saved_objects/dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab`)
+        .expect(200)
+        .then((resp) => {
+          expect(resp.body).to.eql({});
+        }));
 
-      it('should return generic 404 when deleting an unknown doc', async () =>
-        await supertest
-          .delete(`/api/saved_objects/dashboard/not-a-real-id`)
-          .expect(404)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              statusCode: 404,
-              error: 'Not Found',
-              message: 'Saved object [dashboard/not-a-real-id] not found',
-            });
-          }));
-    });
-
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
-
-      it('returns generic 404 when kibana index is missing', async () =>
-        await supertest
-          .delete(`/api/saved_objects/dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab`)
-          .expect(404)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              statusCode: 404,
-              error: 'Not Found',
-              message: 'Saved object [dashboard/be3733a0-9efe-11e7-acb3-3dab96693fab] not found',
-            });
-          }));
-    });
+    it('should return generic 404 when deleting an unknown doc', async () =>
+      await supertest
+        .delete(`/api/saved_objects/dashboard/not-a-real-id`)
+        .expect(404)
+        .then((resp) => {
+          expect(resp.body).to.eql({
+            statusCode: 404,
+            error: 'Not Found',
+            message: 'Saved object [dashboard/not-a-real-id] not found',
+          });
+        }));
   });
 }
diff --git a/test/api_integration/apis/saved_objects/export.ts b/test/api_integration/apis/saved_objects/export.ts
index c02ce76340da8..c42afd4e773c5 100644
--- a/test/api_integration/apis/saved_objects/export.ts
+++ b/test/api_integration/apis/saved_objects/export.ts
@@ -15,573 +15,559 @@ function ndjsonToObject(input: string) {
 }
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
+  const SPACE_ID = 'ftr-so-export';
 
   describe('export', () => {
     let KIBANA_VERSION: string;
 
     before(async () => {
       KIBANA_VERSION = await getKibanaVersion(getService);
+      await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
+      await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
     });
 
-    describe('with kibana index', () => {
-      describe('basic amount of saved objects', () => {
-        before(() => esArchiver.load('saved_objects/basic'));
-        after(() => esArchiver.unload('saved_objects/basic'));
+    after(() => kibanaServer.spaces.delete(SPACE_ID));
 
-        it('should return objects in dependency order', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: ['index-pattern', 'search', 'visualization', 'dashboard'],
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = ndjsonToObject(resp.text);
-              expect(objects).to.have.length(4);
-              expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[0]).to.have.property('type', 'index-pattern');
-              expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[1]).to.have.property('type', 'visualization');
-              expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
-              expect(objects[2]).to.have.property('type', 'dashboard');
-              expect(objects[3]).to.have.property('exportedCount', 3);
-              expect(objects[3]).to.have.property('missingRefCount', 0);
-              expect(objects[3].missingReferences).to.have.length(0);
-            });
-        });
+    describe('basic amount of saved objects', () => {
+      it('should return objects in dependency order', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: ['index-pattern', 'search', 'visualization', 'dashboard'],
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = ndjsonToObject(resp.text);
+            expect(objects).to.have.length(4);
+            expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[0]).to.have.property('type', 'index-pattern');
+            expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[1]).to.have.property('type', 'visualization');
+            expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
+            expect(objects[2]).to.have.property('type', 'dashboard');
+            expect(objects[3]).to.have.property('exportedCount', 3);
+            expect(objects[3]).to.have.property('missingRefCount', 0);
+            expect(objects[3].missingReferences).to.have.length(0);
+          });
+      });
 
-        it('should exclude the export details if asked', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: ['index-pattern', 'search', 'visualization', 'dashboard'],
-              excludeExportDetails: true,
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = ndjsonToObject(resp.text);
-              expect(objects).to.have.length(3);
-              expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[0]).to.have.property('type', 'index-pattern');
-              expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[1]).to.have.property('type', 'visualization');
-              expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
-              expect(objects[2]).to.have.property('type', 'dashboard');
-            });
-        });
+      it('should exclude the export details if asked', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: ['index-pattern', 'search', 'visualization', 'dashboard'],
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = ndjsonToObject(resp.text);
+            expect(objects).to.have.length(3);
+            expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[0]).to.have.property('type', 'index-pattern');
+            expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[1]).to.have.property('type', 'visualization');
+            expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
+            expect(objects[2]).to.have.property('type', 'dashboard');
+          });
+      });
 
-        it('should support including dependencies when exporting selected objects', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              includeReferencesDeep: true,
-              objects: [
-                {
-                  type: 'dashboard',
-                  id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-                },
-              ],
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = ndjsonToObject(resp.text);
-              expect(objects).to.have.length(4);
-              expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[0]).to.have.property('type', 'index-pattern');
-              expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[1]).to.have.property('type', 'visualization');
-              expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
-              expect(objects[2]).to.have.property('type', 'dashboard');
-              expect(objects[3]).to.have.property('exportedCount', 3);
-              expect(objects[3]).to.have.property('missingRefCount', 0);
-              expect(objects[3].missingReferences).to.have.length(0);
-            });
-        });
+      it('should support including dependencies when exporting selected objects', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            includeReferencesDeep: true,
+            objects: [
+              {
+                type: 'dashboard',
+                id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+              },
+            ],
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = ndjsonToObject(resp.text);
+            expect(objects).to.have.length(4);
+            expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[0]).to.have.property('type', 'index-pattern');
+            expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[1]).to.have.property('type', 'visualization');
+            expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
+            expect(objects[2]).to.have.property('type', 'dashboard');
+            expect(objects[3]).to.have.property('exportedCount', 3);
+            expect(objects[3]).to.have.property('missingRefCount', 0);
+            expect(objects[3].missingReferences).to.have.length(0);
+          });
+      });
 
-        it('should support including dependencies when exporting by type', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              includeReferencesDeep: true,
-              type: ['dashboard'],
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = resp.text.split('\n').map((str) => JSON.parse(str));
-              expect(objects).to.have.length(4);
-              expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[0]).to.have.property('type', 'index-pattern');
-              expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[1]).to.have.property('type', 'visualization');
-              expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
-              expect(objects[2]).to.have.property('type', 'dashboard');
-              expect(objects[3]).to.have.property('exportedCount', 3);
-              expect(objects[3]).to.have.property('missingRefCount', 0);
-              expect(objects[3].missingReferences).to.have.length(0);
-            });
-        });
+      it('should support including dependencies when exporting by type', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            includeReferencesDeep: true,
+            type: ['dashboard'],
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = resp.text.split('\n').map((str) => JSON.parse(str));
+            expect(objects).to.have.length(4);
+            expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[0]).to.have.property('type', 'index-pattern');
+            expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[1]).to.have.property('type', 'visualization');
+            expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
+            expect(objects[2]).to.have.property('type', 'dashboard');
+            expect(objects[3]).to.have.property('exportedCount', 3);
+            expect(objects[3]).to.have.property('missingRefCount', 0);
+            expect(objects[3].missingReferences).to.have.length(0);
+          });
+      });
 
-        it('should support including dependencies when exporting by type and search', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              includeReferencesDeep: true,
-              type: ['dashboard'],
-              search: 'Requests*',
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = ndjsonToObject(resp.text);
-              expect(objects).to.have.length(4);
-              expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[0]).to.have.property('type', 'index-pattern');
-              expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
-              expect(objects[1]).to.have.property('type', 'visualization');
-              expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
-              expect(objects[2]).to.have.property('type', 'dashboard');
-              expect(objects[3]).to.have.property('exportedCount', 3);
-              expect(objects[3]).to.have.property('missingRefCount', 0);
-              expect(objects[3].missingReferences).to.have.length(0);
-            });
-        });
+      it('should support including dependencies when exporting by type and search', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            includeReferencesDeep: true,
+            type: ['dashboard'],
+            search: 'Requests*',
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = ndjsonToObject(resp.text);
+            expect(objects).to.have.length(4);
+            expect(objects[0]).to.have.property('id', '91200a00-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[0]).to.have.property('type', 'index-pattern');
+            expect(objects[1]).to.have.property('id', 'dd7caf20-9efd-11e7-acb3-3dab96693fab');
+            expect(objects[1]).to.have.property('type', 'visualization');
+            expect(objects[2]).to.have.property('id', 'be3733a0-9efe-11e7-acb3-3dab96693fab');
+            expect(objects[2]).to.have.property('type', 'dashboard');
+            expect(objects[3]).to.have.property('exportedCount', 3);
+            expect(objects[3]).to.have.property('missingRefCount', 0);
+            expect(objects[3].missingReferences).to.have.length(0);
+          });
+      });
 
-        it(`should throw error when object doesn't exist`, async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              objects: [
-                {
-                  type: 'dashboard',
-                  id: '1',
-                },
-              ],
-            })
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: 'Error fetching objects to export',
-                attributes: {
-                  objects: [
-                    {
-                      id: '1',
-                      type: 'dashboard',
-                      error: {
-                        error: 'Not Found',
-                        message: 'Saved object [dashboard/1] not found',
-                        statusCode: 404,
-                      },
+      it(`should throw error when object doesn't exist`, async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            objects: [
+              {
+                type: 'dashboard',
+                id: '1',
+              },
+            ],
+          })
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: 'Error fetching objects to export',
+              attributes: {
+                objects: [
+                  {
+                    id: '1',
+                    type: 'dashboard',
+                    error: {
+                      error: 'Not Found',
+                      message: 'Saved object [dashboard/1] not found',
+                      statusCode: 404,
                     },
-                  ],
-                },
-              });
+                  },
+                ],
+              },
             });
-        });
+          });
+      });
 
-        it(`should return 400 when exporting unsupported type`, async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: ['wigwags'],
-            })
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: 'Trying to export non-exportable type(s): wigwags',
-              });
+      it(`should return 400 when exporting unsupported type`, async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: ['wigwags'],
+          })
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: 'Trying to export non-exportable type(s): wigwags',
             });
-        });
+          });
+      });
 
-        it(`should return 400 when exporting objects with unsupported type`, async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              objects: [
-                {
-                  type: 'wigwags',
-                  id: '1',
-                },
-              ],
-            })
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: 'Trying to export object(s) with non-exportable types: wigwags:1',
-              });
+      it(`should return 400 when exporting objects with unsupported type`, async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            objects: [
+              {
+                type: 'wigwags',
+                id: '1',
+              },
+            ],
+          })
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: 'Trying to export object(s) with non-exportable types: wigwags:1',
             });
-        });
+          });
+      });
 
-        it('should export object with circular refs', async () => {
-          const soWithCycliRefs = [
-            {
-              type: 'dashboard',
-              id: 'dashboard-a',
-              attributes: {
-                title: 'dashboard-a',
+      it('should export object with circular refs', async () => {
+        const soWithCycliRefs = [
+          {
+            type: 'dashboard',
+            id: 'dashboard-a',
+            attributes: {
+              title: 'dashboard-a',
+            },
+            references: [
+              {
+                name: 'circular-dashboard-ref',
+                id: 'dashboard-b',
+                type: 'dashboard',
               },
-              references: [
-                {
-                  name: 'circular-dashboard-ref',
-                  id: 'dashboard-b',
-                  type: 'dashboard',
-                },
-              ],
+            ],
+          },
+          {
+            type: 'dashboard',
+            id: 'dashboard-b',
+            attributes: {
+              title: 'dashboard-b',
             },
-            {
-              type: 'dashboard',
-              id: 'dashboard-b',
+            references: [
+              {
+                name: 'circular-dashboard-ref',
+                id: 'dashboard-a',
+                type: 'dashboard',
+              },
+            ],
+          },
+        ];
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_bulk_create`)
+          .send(soWithCycliRefs)
+          .expect(200);
+        const resp = await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            includeReferencesDeep: true,
+            type: ['dashboard'],
+          })
+          .expect(200);
+
+        const objects = ndjsonToObject(resp.text);
+        expect(objects.find((o) => o.id === 'dashboard-a')).to.be.ok();
+        expect(objects.find((o) => o.id === 'dashboard-b')).to.be.ok();
+      });
+    });
+
+    describe('10,000 objects', () => {
+      before(async () => {
+        const fileChunks = [];
+        for (let i = 0; i <= 9995; i++) {
+          fileChunks.push(
+            JSON.stringify({
+              type: 'visualization',
+              id: `${SPACE_ID}-${i}`,
               attributes: {
-                title: 'dashboard-b',
+                title: `My visualization (${i})`,
+                uiStateJSON: '{}',
+                visState: '{}',
               },
               references: [
                 {
-                  name: 'circular-dashboard-ref',
-                  id: 'dashboard-a',
-                  type: 'dashboard',
+                  name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+                  type: 'index-pattern',
+                  id: '91200a00-9efd-11e7-acb3-3dab96693fab',
                 },
               ],
-            },
-          ];
-          await supertest.post('/api/saved_objects/_bulk_create').send(soWithCycliRefs).expect(200);
-          const resp = await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              includeReferencesDeep: true,
-              type: ['dashboard'],
             })
-            .expect(200);
+          );
+        }
 
-          const objects = ndjsonToObject(resp.text);
-          expect(objects.find((o) => o.id === 'dashboard-a')).to.be.ok();
-          expect(objects.find((o) => o.id === 'dashboard-b')).to.be.ok();
-        });
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_import`)
+          .attach('file', Buffer.from(fileChunks.join('\n'), 'utf8'), 'export.ndjson')
+          .expect(200);
       });
 
-      describe('10,000 objects', () => {
-        before(() => esArchiver.load('saved_objects/10k'));
-        after(() => esArchiver.unload('saved_objects/10k'));
-
-        it('should return 400 when exporting without type or objects passed in', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: '[request body]: expected a plain object value, but found [null] instead.',
-              });
+      it('should return 400 when exporting without type or objects passed in', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: '[request body]: expected a plain object value, but found [null] instead.',
             });
-        });
-
-        it('should return 200 when exporting by single type', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: 'dashboard',
-              excludeExportDetails: true,
-            })
-            .expect(200)
-            .then((resp) => {
-              expect(resp.header['content-disposition']).to.eql(
-                'attachment; filename="export.ndjson"'
-              );
-              expect(resp.header['content-type']).to.eql('application/ndjson');
-              const objects = ndjsonToObject(resp.text);
+          });
+      });
 
-              // Sort values aren't deterministic so we need to exclude them
-              const { sort, ...obj } = objects[0];
-              expect(obj).to.eql({
-                attributes: {
-                  description: '',
-                  hits: 0,
-                  kibanaSavedObjectMeta: {
-                    searchSourceJSON: objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON,
-                  },
-                  optionsJSON: objects[0].attributes.optionsJSON,
-                  panelsJSON: objects[0].attributes.panelsJSON,
-                  refreshInterval: {
-                    display: 'Off',
-                    pause: false,
-                    value: 0,
-                  },
-                  timeFrom: 'Wed Sep 16 2015 22:52:17 GMT-0700',
-                  timeRestore: true,
-                  timeTo: 'Fri Sep 18 2015 12:24:38 GMT-0700',
-                  title: 'Requests',
-                  version: 1,
-                },
-                id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-                migrationVersion: objects[0].migrationVersion,
-                coreMigrationVersion: KIBANA_VERSION,
-                references: [
-                  {
-                    id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                    name: '1:panel_1',
-                    type: 'visualization',
-                  },
-                ],
-                type: 'dashboard',
-                updated_at: '2017-09-21T18:57:40.826Z',
-                version: objects[0].version,
-              });
-              expect(objects[0].migrationVersion).to.be.ok();
-              expect(() =>
-                JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON)
-              ).not.to.throwError();
-              expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError();
-              expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError();
-            });
-        });
+      it('should return 200 when exporting by single type', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: 'dashboard',
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            expect(resp.header['content-disposition']).to.eql(
+              'attachment; filename="export.ndjson"'
+            );
+            expect(resp.header['content-type']).to.eql('application/ndjson');
+            const objects = ndjsonToObject(resp.text);
 
-        it('should return 200 when exporting by array type', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: ['dashboard'],
-              excludeExportDetails: true,
-            })
-            .expect(200)
-            .then((resp) => {
-              expect(resp.header['content-disposition']).to.eql(
-                'attachment; filename="export.ndjson"'
-              );
-              expect(resp.header['content-type']).to.eql('application/ndjson');
-              const objects = ndjsonToObject(resp.text);
+            // Sort values aren't deterministic so we need to exclude them
+            const { sort, ...obj } = objects[0];
 
-              // Sort values aren't deterministic so we need to exclude them
-              const { sort, ...obj } = objects[0];
-              expect(obj).to.eql({
-                attributes: {
-                  description: '',
-                  hits: 0,
-                  kibanaSavedObjectMeta: {
-                    searchSourceJSON: objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON,
-                  },
-                  optionsJSON: objects[0].attributes.optionsJSON,
-                  panelsJSON: objects[0].attributes.panelsJSON,
-                  refreshInterval: {
-                    display: 'Off',
-                    pause: false,
-                    value: 0,
-                  },
-                  timeFrom: 'Wed Sep 16 2015 22:52:17 GMT-0700',
-                  timeRestore: true,
-                  timeTo: 'Fri Sep 18 2015 12:24:38 GMT-0700',
-                  title: 'Requests',
-                  version: 1,
+            expect(obj).to.eql({
+              attributes: {
+                description: '',
+                hits: 0,
+                kibanaSavedObjectMeta: {
+                  searchSourceJSON: objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON,
                 },
-                id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-                migrationVersion: objects[0].migrationVersion,
-                coreMigrationVersion: KIBANA_VERSION,
-                references: [
-                  {
-                    id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                    name: '1:panel_1',
-                    type: 'visualization',
-                  },
-                ],
-                type: 'dashboard',
-                updated_at: '2017-09-21T18:57:40.826Z',
-                version: objects[0].version,
-              });
-              expect(objects[0].migrationVersion).to.be.ok();
-              expect(() =>
-                JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON)
-              ).not.to.throwError();
-              expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError();
-              expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError();
-            });
-        });
-
-        it('should return 200 when exporting by objects', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              objects: [
+                optionsJSON: objects[0].attributes.optionsJSON,
+                panelsJSON: objects[0].attributes.panelsJSON,
+                refreshInterval: {
+                  display: 'Off',
+                  pause: false,
+                  value: 0,
+                },
+                timeFrom: 'Wed Sep 16 2015 22:52:17 GMT-0700',
+                timeRestore: true,
+                timeTo: 'Fri Sep 18 2015 12:24:38 GMT-0700',
+                title: 'Requests',
+                version: 1,
+              },
+              id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+              migrationVersion: objects[0].migrationVersion,
+              coreMigrationVersion: KIBANA_VERSION,
+              references: [
                 {
-                  type: 'dashboard',
-                  id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                  name: '1:panel_1',
+                  type: 'visualization',
                 },
               ],
-              excludeExportDetails: true,
-            })
-            .expect(200)
-            .then((resp) => {
-              expect(resp.header['content-disposition']).to.eql(
-                'attachment; filename="export.ndjson"'
-              );
-              expect(resp.header['content-type']).to.eql('application/ndjson');
-              const objects = ndjsonToObject(resp.text);
-
-              // Sort values aren't deterministic so we need to exclude them
-              const { sort, ...obj } = objects[0];
-              expect(obj).to.eql({
-                attributes: {
-                  description: '',
-                  hits: 0,
-                  kibanaSavedObjectMeta: {
-                    searchSourceJSON: objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON,
-                  },
-                  optionsJSON: objects[0].attributes.optionsJSON,
-                  panelsJSON: objects[0].attributes.panelsJSON,
-                  refreshInterval: {
-                    display: 'Off',
-                    pause: false,
-                    value: 0,
-                  },
-                  timeFrom: 'Wed Sep 16 2015 22:52:17 GMT-0700',
-                  timeRestore: true,
-                  timeTo: 'Fri Sep 18 2015 12:24:38 GMT-0700',
-                  title: 'Requests',
-                  version: 1,
-                },
-                id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-                migrationVersion: objects[0].migrationVersion,
-                coreMigrationVersion: KIBANA_VERSION,
-                references: [
-                  {
-                    id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                    name: '1:panel_1',
-                    type: 'visualization',
-                  },
-                ],
-                type: 'dashboard',
-                updated_at: '2017-09-21T18:57:40.826Z',
-                version: objects[0].version,
-              });
-              expect(objects[0].migrationVersion).to.be.ok();
-              expect(() =>
-                JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON)
-              ).not.to.throwError();
-              expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError();
-              expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError();
+              type: 'dashboard',
+              updated_at: objects[0].updated_at,
+              version: objects[0].version,
             });
-        });
+            expect(objects[0].migrationVersion).to.be.ok();
+            expect(() =>
+              JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON)
+            ).not.to.throwError();
+            expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError();
+            expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError();
+          });
+      });
 
-        it('should return 400 when exporting by type and objects', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: 'dashboard',
-              objects: [
+      it('should return 200 when exporting by array type', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: ['dashboard'],
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            expect(resp.header['content-disposition']).to.eql(
+              'attachment; filename="export.ndjson"'
+            );
+            expect(resp.header['content-type']).to.eql('application/ndjson');
+            const objects = ndjsonToObject(resp.text);
+
+            // Sort values aren't deterministic so we need to exclude them
+            const { sort, ...obj } = objects[0];
+            expect(obj).to.eql({
+              attributes: {
+                description: '',
+                hits: 0,
+                kibanaSavedObjectMeta: {
+                  searchSourceJSON: objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON,
+                },
+                optionsJSON: objects[0].attributes.optionsJSON,
+                panelsJSON: objects[0].attributes.panelsJSON,
+                refreshInterval: {
+                  display: 'Off',
+                  pause: false,
+                  value: 0,
+                },
+                timeFrom: 'Wed Sep 16 2015 22:52:17 GMT-0700',
+                timeRestore: true,
+                timeTo: 'Fri Sep 18 2015 12:24:38 GMT-0700',
+                title: 'Requests',
+                version: 1,
+              },
+              id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+              migrationVersion: objects[0].migrationVersion,
+              coreMigrationVersion: KIBANA_VERSION,
+              references: [
                 {
-                  type: 'dashboard',
-                  id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                  name: '1:panel_1',
+                  type: 'visualization',
                 },
               ],
-              excludeExportDetails: true,
-            })
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: `Can't specify both "types" and "objects" properties when exporting`,
-              });
+              type: 'dashboard',
+              updated_at: objects[0].updated_at,
+              version: objects[0].version,
             });
-        });
+            expect(objects[0].migrationVersion).to.be.ok();
+            expect(() =>
+              JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON)
+            ).not.to.throwError();
+            expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError();
+            expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError();
+          });
       });
 
-      describe('10,001 objects', () => {
-        let customVisId: string;
-        before(async () => {
-          await esArchiver.load('saved_objects/10k');
-          await supertest
-            .post('/api/saved_objects/visualization')
-            .send({
-              attributes: {
-                title: 'My favorite vis',
+      it('should return 200 when exporting by objects', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            objects: [
+              {
+                type: 'dashboard',
+                id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
               },
-            })
-            .expect(200)
-            .then((resp) => {
-              customVisId = resp.body.id;
-            });
-        });
-        after(async () => {
-          await supertest.delete(`/api/saved_objects/visualization/${customVisId}`).expect(200);
-          await esArchiver.unload('saved_objects/10k');
-        });
-
-        it('should allow exporting more than 10,000 objects if permitted by maxImportExportSize', async () => {
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: ['dashboard', 'visualization', 'search', 'index-pattern'],
-              excludeExportDetails: true,
-            })
-            .expect(200)
-            .then((resp) => {
-              expect(resp.header['content-disposition']).to.eql(
-                'attachment; filename="export.ndjson"'
-              );
-              expect(resp.header['content-type']).to.eql('application/ndjson');
-              const objects = ndjsonToObject(resp.text);
-              expect(objects.length).to.eql(10001);
-            });
-        });
+            ],
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            expect(resp.header['content-disposition']).to.eql(
+              'attachment; filename="export.ndjson"'
+            );
+            expect(resp.header['content-type']).to.eql('application/ndjson');
+            const objects = ndjsonToObject(resp.text);
 
-        it('should return 400 when exporting more than allowed by maxImportExportSize', async () => {
-          let anotherCustomVisId: string;
-          await supertest
-            .post('/api/saved_objects/visualization')
-            .send({
+            // Sort values aren't deterministic so we need to exclude them
+            const { sort, ...obj } = objects[0];
+            expect(obj).to.eql({
               attributes: {
-                title: 'My other favorite vis',
+                description: '',
+                hits: 0,
+                kibanaSavedObjectMeta: {
+                  searchSourceJSON: objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON,
+                },
+                optionsJSON: objects[0].attributes.optionsJSON,
+                panelsJSON: objects[0].attributes.panelsJSON,
+                refreshInterval: {
+                  display: 'Off',
+                  pause: false,
+                  value: 0,
+                },
+                timeFrom: 'Wed Sep 16 2015 22:52:17 GMT-0700',
+                timeRestore: true,
+                timeTo: 'Fri Sep 18 2015 12:24:38 GMT-0700',
+                title: 'Requests',
+                version: 1,
               },
-            })
-            .expect(200)
-            .then((resp) => {
-              anotherCustomVisId = resp.body.id;
-            });
-          await supertest
-            .post('/api/saved_objects/_export')
-            .send({
-              type: ['dashboard', 'visualization', 'search', 'index-pattern'],
-              excludeExportDetails: true,
-            })
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: `Can't export more than 10001 objects. If your server has enough memory, this limit can be increased by adjusting the \"savedObjects.maxImportExportSize\" setting.`,
-              });
+              id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+              migrationVersion: objects[0].migrationVersion,
+              coreMigrationVersion: KIBANA_VERSION,
+              references: [
+                {
+                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                  name: '1:panel_1',
+                  type: 'visualization',
+                },
+              ],
+              type: 'dashboard',
+              updated_at: objects[0].updated_at,
+              version: objects[0].version,
             });
-          await supertest
-            // @ts-expect-error TS complains about using `anotherCustomVisId` before it is assigned
-            .delete(`/api/saved_objects/visualization/${anotherCustomVisId}`)
-            .expect(200);
-        });
+            expect(objects[0].migrationVersion).to.be.ok();
+            expect(() =>
+              JSON.parse(objects[0].attributes.kibanaSavedObjectMeta.searchSourceJSON)
+            ).not.to.throwError();
+            expect(() => JSON.parse(objects[0].attributes.optionsJSON)).not.to.throwError();
+            expect(() => JSON.parse(objects[0].attributes.panelsJSON)).not.to.throwError();
+          });
       });
-    });
 
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
+      it('should return 400 when exporting by type and objects', async () => {
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: 'dashboard',
+            objects: [
+              {
+                type: 'dashboard',
+                id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+              },
+            ],
+            excludeExportDetails: true,
+          })
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: `Can't specify both "types" and "objects" properties when exporting`,
+            });
+          });
+      });
 
-      it('should return empty response', async () => {
+      it('should allow exporting more than 10,000 objects if permitted by maxImportExportSize', async () => {
         await supertest
-          .post('/api/saved_objects/_export')
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
           .send({
-            type: ['index-pattern', 'search', 'visualization', 'dashboard'],
+            type: ['dashboard', 'visualization', 'search', 'index-pattern'],
             excludeExportDetails: true,
           })
           .expect(200)
           .then((resp) => {
-            expect(resp.text).to.eql('');
+            expect(resp.header['content-disposition']).to.eql(
+              'attachment; filename="export.ndjson"'
+            );
+            expect(resp.header['content-type']).to.eql('application/ndjson');
+            const objects = ndjsonToObject(resp.text);
+            expect(objects.length).to.eql(10001);
+          });
+      });
+
+      it('should return 400 when exporting more than allowed by maxImportExportSize', async () => {
+        let anotherCustomVisId: string;
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/visualization`)
+          .send({
+            attributes: {
+              title: 'My other favorite vis',
+            },
+          })
+          .expect(200)
+          .then((resp) => {
+            anotherCustomVisId = resp.body.id;
+          });
+        await supertest
+          .post(`/s/${SPACE_ID}/api/saved_objects/_export`)
+          .send({
+            type: ['dashboard', 'visualization', 'search', 'index-pattern'],
+            excludeExportDetails: true,
+          })
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: `Can't export more than 10001 objects. If your server has enough memory, this limit can be increased by adjusting the \"savedObjects.maxImportExportSize\" setting.`,
+            });
           });
+        await supertest
+          // @ts-expect-error TS complains about using `anotherCustomVisId` before it is assigned
+          .delete(`/s/${SPACE_ID}/api/saved_objects/visualization/${anotherCustomVisId}`)
+          .expect(200);
       });
     });
   });
diff --git a/test/api_integration/apis/saved_objects/find.ts b/test/api_integration/apis/saved_objects/find.ts
index a4862707e2d0e..02fa2d325f171 100644
--- a/test/api_integration/apis/saved_objects/find.ts
+++ b/test/api_integration/apis/saved_objects/find.ts
@@ -12,303 +12,323 @@ import { SavedObject } from '../../../../src/core/server';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
+  const SPACE_ID = 'ftr-so-find';
 
   describe('find', () => {
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
+    before(async () => {
+      await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
+      await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
 
-      it('should return 200 with individual responses', async () =>
+      await kibanaServer.spaces.create({ id: `${SPACE_ID}-foo`, name: `${SPACE_ID}-foo` });
+      await kibanaServer.importExport.load('saved_objects/basic/foo-ns', {
+        space: `${SPACE_ID}-foo`,
+      });
+    });
+
+    after(async () => {
+      await kibanaServer.spaces.delete(SPACE_ID);
+      await kibanaServer.spaces.delete(`${SPACE_ID}-foo`);
+    });
+
+    it('should return 200 with individual responses', async () =>
+      await supertest
+        .get(`/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&fields=title`)
+        .expect(200)
+        .then((resp) => {
+          expect(resp.body.saved_objects.map((so: { id: string }) => so.id)).to.eql([
+            'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+          ]);
+          expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
+        }));
+
+    describe('unknown type', () => {
+      it('should return 200 with empty response', async () =>
         await supertest
-          .get('/api/saved_objects/_find?type=visualization&fields=title')
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find?type=wigwags`)
           .expect(200)
           .then((resp) => {
-            expect(resp.body.saved_objects.map((so: { id: string }) => so.id)).to.eql([
-              'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-            ]);
-            expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
+            expect(resp.body).to.eql({
+              page: 1,
+              per_page: 20,
+              total: 0,
+              saved_objects: [],
+            });
           }));
+    });
 
-      describe('unknown type', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=wigwags')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 1,
-                per_page: 20,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
+    // FLAKY: https://github.com/elastic/kibana/issues/85911
+    describe.skip('page beyond total', () => {
+      it('should return 200 with empty response', async () =>
+        await supertest
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&page=100&per_page=100`)
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              page: 100,
+              per_page: 100,
+              total: 1,
+              saved_objects: [],
+            });
+          }));
+    });
 
-      // FLAKY: https://github.com/elastic/kibana/issues/85911
-      describe.skip('page beyond total', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=visualization&page=100&per_page=100')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 100,
-                per_page: 100,
-                total: 1,
-                saved_objects: [],
-              });
-            }));
-      });
+    describe('unknown search field', () => {
+      it('should return 200 with empty response', async () =>
+        await supertest
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find?type=url&search_fields=a`)
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              page: 1,
+              per_page: 20,
+              total: 0,
+              saved_objects: [],
+            });
+          }));
+    });
 
-      describe('unknown search field', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=url&search_fields=a')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 1,
-                per_page: 20,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
+    describe('unknown namespace', () => {
+      it('should return 200 with empty response', async () =>
+        await supertest
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&namespaces=foo`)
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              page: 1,
+              per_page: 20,
+              total: 0,
+              saved_objects: [],
+            });
+          }));
+    });
 
-      describe('unknown namespace', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=visualization&namespaces=foo')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 1,
-                per_page: 20,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
+    describe('known namespace', () => {
+      it('should return 200 with individual responses', async () =>
+        await supertest
+          .get(`/api/saved_objects/_find?type=visualization&fields=title&namespaces=${SPACE_ID}`)
+          .expect(200)
+          .then((resp) => {
+            expect(
+              resp.body.saved_objects.map((so: { id: string; namespaces: string[] }) => ({
+                id: so.id,
+                namespaces: so.namespaces,
+              }))
+            ).to.eql([{ id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', namespaces: [SPACE_ID] }]);
+            expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
+          }));
+    });
 
-      describe('known namespace', () => {
-        it('should return 200 with individual responses', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=visualization&fields=title&namespaces=default')
-            .expect(200)
-            .then((resp) => {
-              expect(
-                resp.body.saved_objects.map((so: { id: string; namespaces: string[] }) => ({
-                  id: so.id,
-                  namespaces: so.namespaces,
-                }))
-              ).to.eql([{ id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', namespaces: ['default'] }]);
-              expect(resp.body.saved_objects[0].migrationVersion).to.be.ok();
-            }));
-      });
+    describe('wildcard namespace', () => {
+      it('should return 200 with individual responses from the all namespaces', async () =>
+        await supertest
+          .get(`/api/saved_objects/_find?type=visualization&fields=title&namespaces=*`)
+          .expect(200)
+          .then((resp) => {
+            const knownDocuments = resp.body.saved_objects.filter((so: { namespaces: string[] }) =>
+              so.namespaces.some((ns) => [SPACE_ID, `${SPACE_ID}-foo`].includes(ns))
+            );
 
-      describe('wildcard namespace', () => {
-        it('should return 200 with individual responses from the all namespaces', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=visualization&fields=title&namespaces=*')
-            .expect(200)
-            .then((resp) => {
-              expect(
-                resp.body.saved_objects.map((so: { id: string; namespaces: string[] }) => ({
-                  id: so.id,
-                  namespaces: so.namespaces,
-                }))
-              ).to.eql([
-                { id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', namespaces: ['default'] },
-                { id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', namespaces: ['foo-ns'] },
-              ]);
-            }));
-      });
+            expect(
+              knownDocuments.map((so: { id: string; namespaces: string[] }) => ({
+                id: so.id,
+                namespaces: so.namespaces,
+              }))
+            ).to.eql([
+              { id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', namespaces: [SPACE_ID] },
+              { id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab', namespaces: [`${SPACE_ID}-foo`] },
+            ]);
+          }));
+    });
 
-      describe('with a filter', () => {
-        it('should return 200 with a valid response', async () =>
-          await supertest
-            .get(
-              '/api/saved_objects/_find?type=visualization&filter=visualization.attributes.title:"Count of requests"'
-            )
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body.saved_objects.map((so: { id: string }) => so.id)).to.eql([
-                'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-              ]);
-            }));
+    describe('with a filter', () => {
+      it('should return 200 with a valid response', async () =>
+        await supertest
+          .get(
+            `/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&filter=visualization.attributes.title:"Count of requests"`
+          )
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body.saved_objects.map((so: { id: string }) => so.id)).to.eql([
+              'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+            ]);
+          }));
 
-        it('wrong type should return 400 with Bad Request', async () =>
-          await supertest
-            .get(
-              '/api/saved_objects/_find?type=visualization&filter=dashboard.attributes.title:foo'
-            )
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                error: 'Bad Request',
-                message: 'This type dashboard is not allowed: Bad Request',
-                statusCode: 400,
-              });
-            }));
+      it('wrong type should return 400 with Bad Request', async () =>
+        await supertest
+          .get(
+            `/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&filter=dashboard.attributes.title:foo`
+          )
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              error: 'Bad Request',
+              message: 'This type dashboard is not allowed: Bad Request',
+              statusCode: 400,
+            });
+          }));
 
-        it('KQL syntax error should return 400 with Bad Request', async () =>
-          await supertest
-            .get(
-              '/api/saved_objects/_find?type=dashboard&filter=dashboard.attributes.title:foo<invalid'
-            )
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                error: 'Bad Request',
-                message:
-                  'KQLSyntaxError: Expected AND, OR, end of input but "<" found.\ndashboard.' +
-                  'attributes.title:foo<invalid\n------------------------------^: Bad Request',
-                statusCode: 400,
-              });
-            }));
-      });
+      it('KQL syntax error should return 400 with Bad Request', async () =>
+        await supertest
+          .get(
+            `/s/${SPACE_ID}/api/saved_objects/_find?type=dashboard&filter=dashboard.attributes.title:foo<invalid`
+          )
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              error: 'Bad Request',
+              message:
+                'KQLSyntaxError: Expected AND, OR, end of input but "<" found.\ndashboard.' +
+                'attributes.title:foo<invalid\n------------------------------^: Bad Request',
+              statusCode: 400,
+            });
+          }));
+    });
 
-      describe('using aggregations', () => {
-        it('should return 200 with valid response for a valid aggregation', async () =>
-          await supertest
-            .get(
-              `/api/saved_objects/_find?type=visualization&per_page=0&aggs=${encodeURIComponent(
-                JSON.stringify({
-                  type_count: { max: { field: 'visualization.attributes.version' } },
-                })
-              )}`
-            )
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                aggregations: {
-                  type_count: {
-                    value: 1,
-                  },
+    describe('using aggregations', () => {
+      it('should return 200 with valid response for a valid aggregation', async () =>
+        await supertest
+          .get(
+            `/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&per_page=0&aggs=${encodeURIComponent(
+              JSON.stringify({
+                type_count: { max: { field: 'visualization.attributes.version' } },
+              })
+            )}`
+          )
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              aggregations: {
+                type_count: {
+                  value: 1,
                 },
-                page: 1,
-                per_page: 0,
-                saved_objects: [],
-                total: 1,
-              });
-            }));
+              },
+              page: 1,
+              per_page: 0,
+              saved_objects: [],
+              total: 1,
+            });
+          }));
 
-        it('should return a 400 when referencing an invalid SO attribute', async () =>
-          await supertest
-            .get(
-              `/api/saved_objects/_find?type=visualization&per_page=0&aggs=${encodeURIComponent(
-                JSON.stringify({
-                  type_count: { max: { field: 'dashboard.attributes.version' } },
-                })
-              )}`
-            )
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                error: 'Bad Request',
-                message:
-                  'Invalid aggregation: [type_count.max.field] Invalid attribute path: dashboard.attributes.version: Bad Request',
-                statusCode: 400,
-              });
-            }));
+      it('should return a 400 when referencing an invalid SO attribute', async () =>
+        await supertest
+          .get(
+            `/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&per_page=0&aggs=${encodeURIComponent(
+              JSON.stringify({
+                type_count: { max: { field: 'dashboard.attributes.version' } },
+              })
+            )}`
+          )
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              error: 'Bad Request',
+              message:
+                'Invalid aggregation: [type_count.max.field] Invalid attribute path: dashboard.attributes.version: Bad Request',
+              statusCode: 400,
+            });
+          }));
 
-        it('should return a 400 when using a forbidden aggregation option', async () =>
-          await supertest
-            .get(
-              `/api/saved_objects/_find?type=visualization&per_page=0&aggs=${encodeURIComponent(
-                JSON.stringify({
-                  type_count: {
-                    max: {
-                      field: 'visualization.attributes.version',
-                      script: 'Bad script is bad',
-                    },
+      it('should return a 400 when using a forbidden aggregation option', async () =>
+        await supertest
+          .get(
+            `/s/${SPACE_ID}/api/saved_objects/_find?type=visualization&per_page=0&aggs=${encodeURIComponent(
+              JSON.stringify({
+                type_count: {
+                  max: {
+                    field: 'visualization.attributes.version',
+                    script: 'Bad script is bad',
                   },
-                })
-              )}`
-            )
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                error: 'Bad Request',
-                message:
-                  'Invalid aggregation: [type_count.max.script]: definition for this key is missing: Bad Request',
-                statusCode: 400,
-              });
-            }));
-      });
+                },
+              })
+            )}`
+          )
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              error: 'Bad Request',
+              message:
+                'Invalid aggregation: [type_count.max.script]: definition for this key is missing: Bad Request',
+              statusCode: 400,
+            });
+          }));
+    });
 
-      describe('`has_reference` and `has_reference_operator` parameters', () => {
-        before(() => esArchiver.load('saved_objects/references'));
-        after(() => esArchiver.unload('saved_objects/references'));
+    describe('`has_reference` and `has_reference_operator` parameters', () => {
+      before(() => kibanaServer.importExport.load('saved_objects/references', { space: SPACE_ID }));
+      after(() =>
+        kibanaServer.importExport.unload('saved_objects/references', { space: SPACE_ID })
+      );
 
-        it('search for a reference', async () => {
-          await supertest
-            .get('/api/saved_objects/_find')
-            .query({
-              type: 'visualization',
-              has_reference: JSON.stringify({ type: 'ref-type', id: 'ref-1' }),
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = resp.body.saved_objects;
-              expect(objects.map((obj: SavedObject) => obj.id)).to.eql([
-                'only-ref-1',
-                'ref-1-and-ref-2',
-              ]);
-            });
-        });
+      it('search for a reference', async () => {
+        await supertest
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find`)
+          .query({
+            type: 'visualization',
+            has_reference: JSON.stringify({ type: 'ref-type', id: 'ref-1' }),
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = resp.body.saved_objects;
+            expect(objects.map((obj: SavedObject) => obj.id)).to.eql([
+              'only-ref-1',
+              'ref-1-and-ref-2',
+            ]);
+          });
+      });
 
-        it('search for multiple references with OR operator', async () => {
-          await supertest
-            .get('/api/saved_objects/_find')
-            .query({
-              type: 'visualization',
-              has_reference: JSON.stringify([
-                { type: 'ref-type', id: 'ref-1' },
-                { type: 'ref-type', id: 'ref-2' },
-              ]),
-              has_reference_operator: 'OR',
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = resp.body.saved_objects;
-              expect(objects.map((obj: SavedObject) => obj.id)).to.eql([
-                'only-ref-1',
-                'ref-1-and-ref-2',
-                'only-ref-2',
-              ]);
-            });
-        });
+      it('search for multiple references with OR operator', async () => {
+        await supertest
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find`)
+          .query({
+            type: 'visualization',
+            has_reference: JSON.stringify([
+              { type: 'ref-type', id: 'ref-1' },
+              { type: 'ref-type', id: 'ref-2' },
+            ]),
+            has_reference_operator: 'OR',
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = resp.body.saved_objects;
+            expect(objects.map((obj: SavedObject) => obj.id)).to.eql([
+              'only-ref-1',
+              'only-ref-2',
+              'ref-1-and-ref-2',
+            ]);
+          });
+      });
 
-        it('search for multiple references with AND operator', async () => {
-          await supertest
-            .get('/api/saved_objects/_find')
-            .query({
-              type: 'visualization',
-              has_reference: JSON.stringify([
-                { type: 'ref-type', id: 'ref-1' },
-                { type: 'ref-type', id: 'ref-2' },
-              ]),
-              has_reference_operator: 'AND',
-            })
-            .expect(200)
-            .then((resp) => {
-              const objects = resp.body.saved_objects;
-              expect(objects.map((obj: SavedObject) => obj.id)).to.eql(['ref-1-and-ref-2']);
-            });
-        });
+      it('search for multiple references with AND operator', async () => {
+        await supertest
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find`)
+          .query({
+            type: 'visualization',
+            has_reference: JSON.stringify([
+              { type: 'ref-type', id: 'ref-1' },
+              { type: 'ref-type', id: 'ref-2' },
+            ]),
+            has_reference_operator: 'AND',
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = resp.body.saved_objects;
+            expect(objects.map((obj: SavedObject) => obj.id)).to.eql(['ref-1-and-ref-2']);
+          });
       });
     });
 
     describe('searching for special characters', () => {
-      before(() => esArchiver.load('saved_objects/find_edgecases'));
-      after(() => esArchiver.unload('saved_objects/find_edgecases'));
+      before(() =>
+        kibanaServer.importExport.load('saved_objects/find_edgecases', { space: SPACE_ID })
+      );
+      after(() =>
+        kibanaServer.importExport.unload('saved_objects/find_edgecases', { space: SPACE_ID })
+      );
 
       it('can search for objects with dashes', async () =>
         await supertest
-          .get('/api/saved_objects/_find')
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find`)
           .query({
             type: 'visualization',
             search_fields: 'title',
@@ -324,7 +344,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('can search with the prefix search character just after a special one', async () =>
         await supertest
-          .get('/api/saved_objects/_find')
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find`)
           .query({
             type: 'visualization',
             search_fields: 'title',
@@ -340,7 +360,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('can search for objects with asterisk', async () =>
         await supertest
-          .get('/api/saved_objects/_find')
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find`)
           .query({
             type: 'visualization',
             search_fields: 'title',
@@ -356,7 +376,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('can still search tokens by prefix', async () =>
         await supertest
-          .get('/api/saved_objects/_find')
+          .get(`/s/${SPACE_ID}/api/saved_objects/_find`)
           .query({
             type: 'visualization',
             search_fields: 'title',
@@ -367,120 +387,8 @@ export default function ({ getService }: FtrProviderContext) {
             const savedObjects = resp.body.saved_objects;
             expect(
               savedObjects.map((so: SavedObject<{ title: string }>) => so.attributes.title)
-            ).to.eql(['my-visualization', 'some*visualization']);
+            ).to.eql(['some*visualization', 'my-visualization']);
           }));
     });
-
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
-
-      it('should return 200 with empty response', async () =>
-        await supertest
-          .get('/api/saved_objects/_find?type=visualization')
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              page: 1,
-              per_page: 20,
-              total: 0,
-              saved_objects: [],
-            });
-          }));
-
-      describe('unknown type', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=wigwags')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 1,
-                per_page: 20,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
-
-      describe('missing type', () => {
-        it('should return 400', async () =>
-          await supertest
-            .get('/api/saved_objects/_find')
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                error: 'Bad Request',
-                message:
-                  '[request query.type]: expected at least one defined value but got [undefined]',
-                statusCode: 400,
-              });
-            }));
-      });
-
-      describe('page beyond total', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=visualization&page=100&per_page=100')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 100,
-                per_page: 100,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
-
-      describe('unknown search field', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/saved_objects/_find?type=url&search_fields=a')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 1,
-                per_page: 20,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
-
-      describe('with a filter', () => {
-        it('should return 200 with an empty response', async () =>
-          await supertest
-            .get(
-              '/api/saved_objects/_find?type=visualization&filter=visualization.attributes.title:"Count of requests"'
-            )
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                page: 1,
-                per_page: 20,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-
-        it('wrong type should return 400 with Bad Request', async () =>
-          await supertest
-            .get(
-              '/api/saved_objects/_find?type=visualization&filter=dashboard.attributes.title:foo'
-            )
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                error: 'Bad Request',
-                message: 'This type dashboard is not allowed: Bad Request',
-                statusCode: 400,
-              });
-            }));
-      });
-    });
   });
 }
diff --git a/test/api_integration/apis/saved_objects/get.ts b/test/api_integration/apis/saved_objects/get.ts
index 84ab6e36956d5..77d7b4faacb41 100644
--- a/test/api_integration/apis/saved_objects/get.ts
+++ b/test/api_integration/apis/saved_objects/get.ts
@@ -12,84 +12,59 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   describe('get', () => {
     let KIBANA_VERSION: string;
 
     before(async () => {
       KIBANA_VERSION = await getKibanaVersion(getService);
+      await kibanaServer.importExport.load('saved_objects/basic');
     });
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
-
-      it('should return 200', async () =>
-        await supertest
-          .get(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
-          .expect(200)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-              type: 'visualization',
-              updated_at: '2017-09-21T18:51:23.794Z',
-              version: resp.body.version,
-              migrationVersion: resp.body.migrationVersion,
-              coreMigrationVersion: KIBANA_VERSION,
-              attributes: {
-                title: 'Count of requests',
-                description: '',
-                version: 1,
-                // cheat for some of the more complex attributes
-                visState: resp.body.attributes.visState,
-                uiStateJSON: resp.body.attributes.uiStateJSON,
-                kibanaSavedObjectMeta: resp.body.attributes.kibanaSavedObjectMeta,
+    it('should return 200', async () =>
+      await supertest
+        .get(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
+        .expect(200)
+        .then((resp) => {
+          expect(resp.body).to.eql({
+            id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+            type: 'visualization',
+            updated_at: resp.body.updated_at,
+            version: resp.body.version,
+            migrationVersion: resp.body.migrationVersion,
+            coreMigrationVersion: KIBANA_VERSION,
+            attributes: {
+              title: 'Count of requests',
+              description: '',
+              version: 1,
+              // cheat for some of the more complex attributes
+              visState: resp.body.attributes.visState,
+              uiStateJSON: resp.body.attributes.uiStateJSON,
+              kibanaSavedObjectMeta: resp.body.attributes.kibanaSavedObjectMeta,
+            },
+            references: [
+              {
+                type: 'index-pattern',
+                name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
+                id: '91200a00-9efd-11e7-acb3-3dab96693fab',
               },
-              references: [
-                {
-                  type: 'index-pattern',
-                  name: 'kibanaSavedObjectMeta.searchSourceJSON.index',
-                  id: '91200a00-9efd-11e7-acb3-3dab96693fab',
-                },
-              ],
-              namespaces: ['default'],
-            });
-            expect(resp.body.migrationVersion).to.be.ok();
-          }));
-
-      describe('doc does not exist', () => {
-        it('should return same generic error as when index does not exist', async () =>
-          await supertest
-            .get(`/api/saved_objects/visualization/foobar`)
-            .expect(404)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                error: 'Not Found',
-                message: 'Saved object [visualization/foobar] not found',
-                statusCode: 404,
-              });
-            }));
-      });
-    });
-
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
+            ],
+            namespaces: ['default'],
+          });
+          expect(resp.body.migrationVersion).to.be.ok();
+        }));
 
-      it('should return basic 404 without mentioning index', async () =>
+    describe('doc does not exist', () => {
+      it('should return same generic error as when index does not exist', async () =>
         await supertest
-          .get('/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab')
+          .get(`/api/saved_objects/visualization/foobar`)
           .expect(404)
           .then((resp) => {
             expect(resp.body).to.eql({
               error: 'Not Found',
-              message:
-                'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] not found',
+              message: 'Saved object [visualization/foobar] not found',
               statusCode: 404,
             });
           }));
diff --git a/test/api_integration/apis/saved_objects/import.ts b/test/api_integration/apis/saved_objects/import.ts
index d463b9498a52a..8d3c0b7bbcea3 100644
--- a/test/api_integration/apis/saved_objects/import.ts
+++ b/test/api_integration/apis/saved_objects/import.ts
@@ -22,7 +22,7 @@ const createConflictError = (
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
 
   describe('import', () => {
     // mock success results including metadata
@@ -42,199 +42,197 @@ export default function ({ getService }: FtrProviderContext) {
       meta: { title: 'Requests', icon: 'dashboardApp' },
     };
 
-    describe('with kibana index', () => {
-      describe('with basic data existing', () => {
-        before(() => esArchiver.load('saved_objects/basic'));
-        after(() => esArchiver.unload('saved_objects/basic'));
+    describe('with basic data existing', () => {
+      before(() => kibanaServer.importExport.load('saved_objects/basic'));
+      after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
-        it('should return 415 when no file passed in', async () => {
-          await supertest
-            .post('/api/saved_objects/_import')
-            .expect(415)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 415,
-                error: 'Unsupported Media Type',
-                message: 'Unsupported Media Type',
-              });
+      it('should return 415 when no file passed in', async () => {
+        await supertest
+          .post('/api/saved_objects/_import')
+          .expect(415)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 415,
+              error: 'Unsupported Media Type',
+              message: 'Unsupported Media Type',
             });
-        });
+          });
+      });
 
-        it('should return errors when conflicts exist', async () => {
-          await supertest
-            .post('/api/saved_objects/_import')
-            .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: false,
-                successCount: 0,
-                errors: [
-                  createConflictError(indexPattern),
-                  createConflictError(visualization),
-                  createConflictError(dashboard),
-                ],
-                warnings: [],
-              });
+      it('should return errors when conflicts exist', async () => {
+        await supertest
+          .post('/api/saved_objects/_import')
+          .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              success: false,
+              successCount: 0,
+              errors: [
+                createConflictError(indexPattern),
+                createConflictError(visualization),
+                createConflictError(dashboard),
+              ],
+              warnings: [],
             });
-        });
+          });
+      });
 
-        it('should return 200 when conflicts exist but overwrite is passed in', async () => {
-          await supertest
-            .post('/api/saved_objects/_import')
-            .query({ overwrite: true })
-            .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: true,
-                successCount: 3,
-                successResults: [
-                  { ...indexPattern, overwrite: true },
-                  { ...visualization, overwrite: true },
-                  { ...dashboard, overwrite: true },
-                ],
-                warnings: [],
-              });
+      it('should return 200 when conflicts exist but overwrite is passed in', async () => {
+        await supertest
+          .post('/api/saved_objects/_import')
+          .query({ overwrite: true })
+          .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              success: true,
+              successCount: 3,
+              successResults: [
+                { ...indexPattern, overwrite: true },
+                { ...visualization, overwrite: true },
+                { ...dashboard, overwrite: true },
+              ],
+              warnings: [],
             });
-        });
+          });
+      });
 
-        it('should return 200 when trying to import unsupported types', async () => {
-          const fileBuffer = Buffer.from(
-            '{"id":"1","type":"wigwags","attributes":{"title":"my title"},"references":[]}',
-            'utf8'
-          );
-          await supertest
-            .post('/api/saved_objects/_import')
-            .attach('file', fileBuffer, 'export.ndjson')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: false,
-                successCount: 0,
-                errors: [
-                  {
-                    id: '1',
-                    type: 'wigwags',
-                    title: 'my title',
-                    meta: { title: 'my title' },
-                    error: { type: 'unsupported_type' },
-                  },
-                ],
-                warnings: [],
-              });
+      it('should return 200 when trying to import unsupported types', async () => {
+        const fileBuffer = Buffer.from(
+          '{"id":"1","type":"wigwags","attributes":{"title":"my title"},"references":[]}',
+          'utf8'
+        );
+        await supertest
+          .post('/api/saved_objects/_import')
+          .attach('file', fileBuffer, 'export.ndjson')
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              success: false,
+              successCount: 0,
+              errors: [
+                {
+                  id: '1',
+                  type: 'wigwags',
+                  title: 'my title',
+                  meta: { title: 'my title' },
+                  error: { type: 'unsupported_type' },
+                },
+              ],
+              warnings: [],
             });
-        });
+          });
+      });
 
-        it('should return 200 when importing SO with circular refs', async () => {
-          const fileBuffer = Buffer.from(
-            dedent`
-              {"attributes":{"title":"dashboard-b"},"id":"dashboard-b","references":[{"id":"dashboard-a","name":"circular-dashboard-ref","type":"dashboard"}],"type":"dashboard"}
-              {"attributes":{"title":"dashboard-a"},"id":"dashboard-a","references":[{"id":"dashboard-b","name":"circular-dashboard-ref","type":"dashboard"}],"type":"dashboard"}
-            `,
-            'utf8'
-          );
-          const resp = await supertest
-            .post('/api/saved_objects/_import')
-            .attach('file', fileBuffer, 'export.ndjson')
-            .expect(200);
+      it('should return 200 when importing SO with circular refs', async () => {
+        const fileBuffer = Buffer.from(
+          dedent`
+            {"attributes":{"title":"dashboard-b"},"id":"dashboard-b","references":[{"id":"dashboard-a","name":"circular-dashboard-ref","type":"dashboard"}],"type":"dashboard"}
+            {"attributes":{"title":"dashboard-a"},"id":"dashboard-a","references":[{"id":"dashboard-b","name":"circular-dashboard-ref","type":"dashboard"}],"type":"dashboard"}
+          `,
+          'utf8'
+        );
+        const resp = await supertest
+          .post('/api/saved_objects/_import')
+          .attach('file', fileBuffer, 'export.ndjson')
+          .expect(200);
 
-          expect(resp.body).to.eql({
-            success: true,
-            successCount: 2,
-            successResults: [
-              {
-                id: 'dashboard-b',
-                meta: {
-                  icon: 'dashboardApp',
-                  title: 'dashboard-b',
-                },
-                type: 'dashboard',
+        expect(resp.body).to.eql({
+          success: true,
+          successCount: 2,
+          successResults: [
+            {
+              id: 'dashboard-b',
+              meta: {
+                icon: 'dashboardApp',
+                title: 'dashboard-b',
               },
-              {
-                id: 'dashboard-a',
-                meta: {
-                  icon: 'dashboardApp',
-                  title: 'dashboard-a',
-                },
-                type: 'dashboard',
+              type: 'dashboard',
+            },
+            {
+              id: 'dashboard-a',
+              meta: {
+                icon: 'dashboardApp',
+                title: 'dashboard-a',
               },
-            ],
-            warnings: [],
-          });
+              type: 'dashboard',
+            },
+          ],
+          warnings: [],
         });
+      });
 
-        it('should return 400 when trying to import more than 10,000 objects', async () => {
-          const fileChunks = [];
-          for (let i = 0; i <= 10001; i++) {
-            fileChunks.push(`{"type":"visualization","id":"${i}","attributes":{},"references":[]}`);
-          }
-          await supertest
-            .post('/api/saved_objects/_import')
-            .attach('file', Buffer.from(fileChunks.join('\n'), 'utf8'), 'export.ndjson')
-            .expect(400)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: "Can't import more than 10001 objects",
-              });
+      it('should return 400 when trying to import more than 10,000 objects', async () => {
+        const fileChunks = [];
+        for (let i = 0; i <= 10001; i++) {
+          fileChunks.push(`{"type":"visualization","id":"${i}","attributes":{},"references":[]}`);
+        }
+        await supertest
+          .post('/api/saved_objects/_import')
+          .attach('file', Buffer.from(fileChunks.join('\n'), 'utf8'), 'export.ndjson')
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              statusCode: 400,
+              error: 'Bad Request',
+              message: "Can't import more than 10001 objects",
             });
-        });
+          });
+      });
 
-        it('should return errors when index patterns or search are missing', async () => {
-          const objectsToImport = [
-            JSON.stringify({
-              type: 'visualization',
-              id: '1',
-              attributes: { title: 'My visualization' },
-              references: [
-                {
-                  name: 'ref_0',
-                  type: 'index-pattern',
-                  id: 'non-existing',
-                },
+      it('should return errors when index patterns or search are missing', async () => {
+        const objectsToImport = [
+          JSON.stringify({
+            type: 'visualization',
+            id: '1',
+            attributes: { title: 'My visualization' },
+            references: [
+              {
+                name: 'ref_0',
+                type: 'index-pattern',
+                id: 'non-existing',
+              },
+              {
+                name: 'ref_1',
+                type: 'search',
+                id: 'non-existing-search',
+              },
+            ],
+          }),
+        ];
+        await supertest
+          .post('/api/saved_objects/_import')
+          .attach('file', Buffer.from(objectsToImport.join('\n'), 'utf8'), 'export.ndjson')
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              success: false,
+              successCount: 0,
+              errors: [
                 {
-                  name: 'ref_1',
-                  type: 'search',
-                  id: 'non-existing-search',
+                  type: 'visualization',
+                  id: '1',
+                  title: 'My visualization',
+                  meta: { title: 'My visualization', icon: 'visualizeApp' },
+                  error: {
+                    type: 'missing_references',
+                    references: [
+                      {
+                        type: 'index-pattern',
+                        id: 'non-existing',
+                      },
+                      {
+                        type: 'search',
+                        id: 'non-existing-search',
+                      },
+                    ],
+                  },
                 },
               ],
-            }),
-          ];
-          await supertest
-            .post('/api/saved_objects/_import')
-            .attach('file', Buffer.from(objectsToImport.join('\n'), 'utf8'), 'export.ndjson')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: false,
-                successCount: 0,
-                errors: [
-                  {
-                    type: 'visualization',
-                    id: '1',
-                    title: 'My visualization',
-                    meta: { title: 'My visualization', icon: 'visualizeApp' },
-                    error: {
-                      type: 'missing_references',
-                      references: [
-                        {
-                          type: 'index-pattern',
-                          id: 'non-existing',
-                        },
-                        {
-                          type: 'search',
-                          id: 'non-existing-search',
-                        },
-                      ],
-                    },
-                  },
-                ],
-                warnings: [],
-              });
+              warnings: [],
             });
-        });
+          });
       });
     });
   });
diff --git a/test/api_integration/apis/saved_objects/migrations.ts b/test/api_integration/apis/saved_objects/migrations.ts
index d009a66e9df55..0877998ca6c1f 100644
--- a/test/api_integration/apis/saved_objects/migrations.ts
+++ b/test/api_integration/apis/saved_objects/migrations.ts
@@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => {
       const mappingProperties = {
         foo: { properties: { name: { type: 'text' } } },
         bar: { properties: { mynum: { type: 'integer' } } },
-      };
+      } as const;
 
       const savedObjectTypes: SavedObjectsType[] = [
         {
@@ -221,7 +221,7 @@ export default ({ getService }: FtrProviderContext) => {
       const mappingProperties = {
         foo: { properties: { name: { type: 'text' } } },
         bar: { properties: { mynum: { type: 'integer' } } },
-      };
+      } as const;
 
       let savedObjectTypes: SavedObjectsType[] = [
         {
@@ -357,7 +357,7 @@ export default ({ getService }: FtrProviderContext) => {
       const mappingProperties = {
         'fleet-agent-event': { properties: { name: { type: 'text' } } },
         bar: { properties: { mynum: { type: 'integer' } } },
-      };
+      } as const;
 
       let savedObjectTypes: SavedObjectsType[] = [
         FLEET_AGENT_EVENT_TYPE,
@@ -417,7 +417,7 @@ export default ({ getService }: FtrProviderContext) => {
 
       const mappingProperties = {
         foo: { properties: { name: { type: 'text' } } },
-      };
+      } as const;
 
       const savedObjectTypes: SavedObjectsType[] = [
         {
@@ -510,7 +510,7 @@ export default ({ getService }: FtrProviderContext) => {
         foo: { properties: { name: { type: 'text' } } },
         bar: { properties: { nomnom: { type: 'integer' } } },
         baz: { properties: { title: { type: 'keyword' } } },
-      };
+      } as const;
 
       const savedObjectTypes: SavedObjectsType[] = [
         {
@@ -677,7 +677,7 @@ async function createIndex({
     coreMigrationVersion: {
       type: 'keyword',
     },
-  };
+  } as const;
   await esClient.indices.create({
     index,
     body: { mappings: { dynamic: 'strict', properties } },
diff --git a/test/api_integration/apis/saved_objects/resolve.ts b/test/api_integration/apis/saved_objects/resolve.ts
index 9c17dcde8ba22..fcfef0aeb6b58 100644
--- a/test/api_integration/apis/saved_objects/resolve.ts
+++ b/test/api_integration/apis/saved_objects/resolve.ts
@@ -12,8 +12,7 @@ import { getKibanaVersion } from './lib/saved_objects_test_utils';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   describe('resolve', () => {
     let KIBANA_VERSION: string;
@@ -23,19 +22,21 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
+      before(() => kibanaServer.importExport.load('saved_objects/basic'));
+      after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
       it('should return 200', async () =>
         await supertest
           .get(`/api/saved_objects/resolve/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
           .expect(200)
           .then((resp) => {
+            resp.body.saved_object.updated_at = '2015-01-01T00:00:00.000Z';
+
             expect(resp.body).to.eql({
               saved_object: {
                 id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
                 type: 'visualization',
-                updated_at: '2017-09-21T18:51:23.794Z',
+                updated_at: '2015-01-01T00:00:00.000Z',
                 version: resp.body.saved_object.version,
                 migrationVersion: resp.body.saved_object.migrationVersion,
                 coreMigrationVersion: KIBANA_VERSION,
@@ -76,26 +77,5 @@ export default function ({ getService }: FtrProviderContext) {
             }));
       });
     });
-
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana')
-      );
-
-      it('should return basic 404 without mentioning index', async () =>
-        await supertest
-          .get('/api/saved_objects/resolve/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab')
-          .expect(404)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              error: 'Not Found',
-              message:
-                'Saved object [visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab] not found',
-              statusCode: 404,
-            });
-          }));
-    });
   });
 }
diff --git a/test/api_integration/apis/saved_objects/resolve_import_errors.ts b/test/api_integration/apis/saved_objects/resolve_import_errors.ts
index b93f3a52d73d9..43ff01d321f9f 100644
--- a/test/api_integration/apis/saved_objects/resolve_import_errors.ts
+++ b/test/api_integration/apis/saved_objects/resolve_import_errors.ts
@@ -12,8 +12,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   describe('resolve_import_errors', () => {
     // mock success results including metadata
@@ -32,49 +31,45 @@ export default function ({ getService }: FtrProviderContext) {
       id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
       meta: { title: 'Requests', icon: 'dashboardApp' },
     };
+    const SPACE_ID = 'ftr-so-resolve_import_errors';
 
-    describe('without kibana index', () => {
-      // Cleanup data that got created in import
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
+    describe('with basic data existing', () => {
+      before(async () => {
+        await kibanaServer.spaces.create({ id: SPACE_ID, name: SPACE_ID });
+        await kibanaServer.importExport.load('saved_objects/basic', { space: SPACE_ID });
+      });
+      after(() => kibanaServer.spaces.delete(SPACE_ID));
 
-      it('should return 200 and import nothing when empty parameters are passed in', async () => {
+      it('should return 200 when skipping all the records', async () => {
         await supertest
-          .post('/api/saved_objects/_resolve_import_errors')
+          .post(`/s/${SPACE_ID}/api/saved_objects/_resolve_import_errors`)
           .field('retries', '[]')
           .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
           .expect(200)
           .then((resp) => {
-            expect(resp.body).to.eql({
-              success: true,
-              successCount: 0,
-              warnings: [],
-            });
+            expect(resp.body).to.eql({ success: true, successCount: 0, warnings: [] });
           });
       });
 
-      it('should return 200 with internal server errors', async () => {
+      it('should return 200 when manually overwriting each object', async () => {
         await supertest
-          .post('/api/saved_objects/_resolve_import_errors')
+          .post(`/s/${SPACE_ID}/api/saved_objects/_resolve_import_errors`)
           .field(
             'retries',
             JSON.stringify([
               {
-                type: 'index-pattern',
                 id: '91200a00-9efd-11e7-acb3-3dab96693fab',
+                type: 'index-pattern',
                 overwrite: true,
               },
               {
-                type: 'visualization',
                 id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                type: 'visualization',
                 overwrite: true,
               },
               {
-                type: 'dashboard',
                 id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
+                type: 'dashboard',
                 overwrite: true,
               },
             ])
@@ -83,110 +78,44 @@ export default function ({ getService }: FtrProviderContext) {
           .expect(200)
           .then((resp) => {
             expect(resp.body).to.eql({
-              successCount: 0,
-              success: false,
-              errors: [
-                {
-                  ...indexPattern,
-                  ...{ title: indexPattern.meta.title },
-                  overwrite: true,
-                  error: {
-                    statusCode: 500,
-                    error: 'Internal Server Error',
-                    message: 'An internal server error occurred',
-                    type: 'unknown',
-                  },
-                },
-                {
-                  ...visualization,
-                  ...{ title: visualization.meta.title },
-                  overwrite: true,
-                  error: {
-                    statusCode: 500,
-                    error: 'Internal Server Error',
-                    message: 'An internal server error occurred',
-                    type: 'unknown',
-                  },
-                },
-                {
-                  ...dashboard,
-                  ...{ title: dashboard.meta.title },
-                  overwrite: true,
-                  error: {
-                    statusCode: 500,
-                    error: 'Internal Server Error',
-                    message: 'An internal server error occurred',
-                    type: 'unknown',
-                  },
-                },
+              success: true,
+              successCount: 3,
+              successResults: [
+                { ...indexPattern, overwrite: true },
+                { ...visualization, overwrite: true },
+                { ...dashboard, overwrite: true },
               ],
               warnings: [],
             });
           });
       });
 
-      it('should return 400 when no file passed in', async () => {
+      it('should return 200 with only one record when overwriting 1 and skipping 1', async () => {
         await supertest
-          .post('/api/saved_objects/_resolve_import_errors')
-          .field('retries', '[]')
-          .expect(400)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              statusCode: 400,
-              error: 'Bad Request',
-              message: '[request body.file]: expected value of type [Stream] but got [undefined]',
-            });
-          });
-      });
-
-      it('should return 200 when retrying unsupported types', async () => {
-        const fileBuffer = Buffer.from(
-          '{"id":"1","type":"wigwags","attributes":{"title":"my title"},"references":[]}',
-          'utf8'
-        );
-        await supertest
-          .post('/api/saved_objects/_resolve_import_errors')
-          .field('retries', JSON.stringify([{ type: 'wigwags', id: '1' }]))
-          .attach('file', fileBuffer, 'export.ndjson')
+          .post(`/s/${SPACE_ID}/api/saved_objects/_resolve_import_errors`)
+          .field(
+            'retries',
+            JSON.stringify([
+              {
+                id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
+                type: 'visualization',
+                overwrite: true,
+              },
+            ])
+          )
+          .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
           .expect(200)
           .then((resp) => {
             expect(resp.body).to.eql({
-              success: false,
-              successCount: 0,
-              errors: [
-                {
-                  id: '1',
-                  type: 'wigwags',
-                  title: 'my title',
-                  meta: { title: 'my title' },
-                  error: { type: 'unsupported_type' },
-                },
-              ],
+              success: true,
+              successCount: 1,
+              successResults: [{ ...visualization, overwrite: true }],
               warnings: [],
             });
           });
       });
 
-      it('should return 400 when resolving conflicts with a file containing more than 10,001 objects', async () => {
-        const fileChunks = [];
-        for (let i = 0; i <= 10001; i++) {
-          fileChunks.push(`{"type":"visualization","id":"${i}","attributes":{},"references":[]}`);
-        }
-        await supertest
-          .post('/api/saved_objects/_resolve_import_errors')
-          .field('retries', '[]')
-          .attach('file', Buffer.from(fileChunks.join('\n'), 'utf8'), 'export.ndjson')
-          .expect(400)
-          .then((resp) => {
-            expect(resp.body).to.eql({
-              statusCode: 400,
-              error: 'Bad Request',
-              message: "Can't import more than 10001 objects",
-            });
-          });
-      });
-
-      it('should return 200 with errors when missing references', async () => {
+      it('should return 200 when replacing references', async () => {
         const objToInsert = {
           id: '1',
           type: 'visualization',
@@ -203,13 +132,20 @@ export default function ({ getService }: FtrProviderContext) {
           ],
         };
         await supertest
-          .post('/api/saved_objects/_resolve_import_errors')
+          .post(`/s/${SPACE_ID}/api/saved_objects/_resolve_import_errors`)
           .field(
             'retries',
             JSON.stringify([
               {
                 type: 'visualization',
                 id: '1',
+                replaceReferences: [
+                  {
+                    type: 'index-pattern',
+                    from: '2',
+                    to: '91200a00-9efd-11e7-acb3-3dab96693fab',
+                  },
+                ],
               },
             ])
           )
@@ -217,174 +153,30 @@ export default function ({ getService }: FtrProviderContext) {
           .expect(200)
           .then((resp) => {
             expect(resp.body).to.eql({
-              success: false,
-              successCount: 0,
-              errors: [
+              success: true,
+              successCount: 1,
+              successResults: [
                 {
-                  id: '1',
                   type: 'visualization',
-                  title: 'My favorite vis',
+                  id: '1',
                   meta: { title: 'My favorite vis', icon: 'visualizeApp' },
-                  error: {
-                    type: 'missing_references',
-                    references: [
-                      {
-                        type: 'index-pattern',
-                        id: '2',
-                      },
-                    ],
-                  },
                 },
               ],
               warnings: [],
             });
           });
-      });
-    });
-
-    describe('with kibana index', () => {
-      describe('with basic data existing', () => {
-        before(() => esArchiver.load('saved_objects/basic'));
-        after(() => esArchiver.unload('saved_objects/basic'));
-
-        it('should return 200 when skipping all the records', async () => {
-          await supertest
-            .post('/api/saved_objects/_resolve_import_errors')
-            .field('retries', '[]')
-            .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({ success: true, successCount: 0, warnings: [] });
-            });
-        });
-
-        it('should return 200 when manually overwriting each object', async () => {
-          await supertest
-            .post('/api/saved_objects/_resolve_import_errors')
-            .field(
-              'retries',
-              JSON.stringify([
-                {
-                  id: '91200a00-9efd-11e7-acb3-3dab96693fab',
-                  type: 'index-pattern',
-                  overwrite: true,
-                },
-                {
-                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                  type: 'visualization',
-                  overwrite: true,
-                },
-                {
-                  id: 'be3733a0-9efe-11e7-acb3-3dab96693fab',
-                  type: 'dashboard',
-                  overwrite: true,
-                },
-              ])
-            )
-            .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: true,
-                successCount: 3,
-                successResults: [
-                  { ...indexPattern, overwrite: true },
-                  { ...visualization, overwrite: true },
-                  { ...dashboard, overwrite: true },
-                ],
-                warnings: [],
-              });
-            });
-        });
-
-        it('should return 200 with only one record when overwriting 1 and skipping 1', async () => {
-          await supertest
-            .post('/api/saved_objects/_resolve_import_errors')
-            .field(
-              'retries',
-              JSON.stringify([
-                {
-                  id: 'dd7caf20-9efd-11e7-acb3-3dab96693fab',
-                  type: 'visualization',
-                  overwrite: true,
-                },
-              ])
-            )
-            .attach('file', join(__dirname, '../../fixtures/import.ndjson'))
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: true,
-                successCount: 1,
-                successResults: [{ ...visualization, overwrite: true }],
-                warnings: [],
-              });
-            });
-        });
-
-        it('should return 200 when replacing references', async () => {
-          const objToInsert = {
-            id: '1',
-            type: 'visualization',
-            attributes: {
-              title: 'My favorite vis',
-              visState: '{}',
-            },
-            references: [
+        await supertest
+          .get(`/s/${SPACE_ID}/api/saved_objects/visualization/1`)
+          .expect(200)
+          .then((resp) => {
+            expect(resp.body.references).to.eql([
               {
                 name: 'ref_0',
                 type: 'index-pattern',
-                id: '2',
+                id: '91200a00-9efd-11e7-acb3-3dab96693fab',
               },
-            ],
-          };
-          await supertest
-            .post('/api/saved_objects/_resolve_import_errors')
-            .field(
-              'retries',
-              JSON.stringify([
-                {
-                  type: 'visualization',
-                  id: '1',
-                  replaceReferences: [
-                    {
-                      type: 'index-pattern',
-                      from: '2',
-                      to: '91200a00-9efd-11e7-acb3-3dab96693fab',
-                    },
-                  ],
-                },
-              ])
-            )
-            .attach('file', Buffer.from(JSON.stringify(objToInsert), 'utf8'), 'export.ndjson')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body).to.eql({
-                success: true,
-                successCount: 1,
-                successResults: [
-                  {
-                    type: 'visualization',
-                    id: '1',
-                    meta: { title: 'My favorite vis', icon: 'visualizeApp' },
-                  },
-                ],
-                warnings: [],
-              });
-            });
-          await supertest
-            .get('/api/saved_objects/visualization/1')
-            .expect(200)
-            .then((resp) => {
-              expect(resp.body.references).to.eql([
-                {
-                  name: 'ref_0',
-                  type: 'index-pattern',
-                  id: '91200a00-9efd-11e7-acb3-3dab96693fab',
-                },
-              ]);
-            });
-        });
+            ]);
+          });
       });
     });
   });
diff --git a/test/api_integration/apis/saved_objects/update.ts b/test/api_integration/apis/saved_objects/update.ts
index 7a683175c412e..75b8651ee64a7 100644
--- a/test/api_integration/apis/saved_objects/update.ts
+++ b/test/api_integration/apis/saved_objects/update.ts
@@ -11,181 +11,153 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
+  const kibanaServer = getService('kibanaServer');
 
   describe('update', () => {
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
-      it('should return 200', async () => {
-        await supertest
-          .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
-          .send({
+    before(() => kibanaServer.importExport.load('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
+    it('should return 200', async () => {
+      await supertest
+        .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
+        .send({
+          attributes: {
+            title: 'My second favorite vis',
+          },
+        })
+        .expect(200)
+        .then((resp) => {
+          // loose uuid validation
+          expect(resp.body)
+            .to.have.property('id')
+            .match(/^[0-9a-f-]{36}$/);
+
+          // loose ISO8601 UTC time with milliseconds validation
+          expect(resp.body)
+            .to.have.property('updated_at')
+            .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
+
+          expect(resp.body).to.eql({
+            id: resp.body.id,
+            type: 'visualization',
+            updated_at: resp.body.updated_at,
+            version: resp.body.version,
             attributes: {
               title: 'My second favorite vis',
             },
-          })
-          .expect(200)
-          .then((resp) => {
-            // loose uuid validation
-            expect(resp.body)
-              .to.have.property('id')
-              .match(/^[0-9a-f-]{36}$/);
-
-            // loose ISO8601 UTC time with milliseconds validation
-            expect(resp.body)
-              .to.have.property('updated_at')
-              .match(/^[\d-]{10}T[\d:\.]{12}Z$/);
-
-            expect(resp.body).to.eql({
-              id: resp.body.id,
-              type: 'visualization',
-              updated_at: resp.body.updated_at,
-              version: resp.body.version,
-              attributes: {
-                title: 'My second favorite vis',
-              },
-              namespaces: ['default'],
-            });
+            namespaces: ['default'],
           });
-      });
-
-      it('does not pass references if omitted', async () => {
-        const resp = await supertest
-          .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
-          .send({
-            attributes: {
-              title: 'foo',
-            },
-          })
-          .expect(200);
-
-        expect(resp.body).not.to.have.property('references');
-      });
-
-      it('passes references if they are provided', async () => {
-        const references = [{ id: 'foo', name: 'Foo', type: 'visualization' }];
-
-        const resp = await supertest
-          .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
-          .send({
-            attributes: {
-              title: 'foo',
-            },
-            references,
-          })
-          .expect(200);
-
-        expect(resp.body).to.have.property('references');
-        expect(resp.body.references).to.eql(references);
-      });
-
-      it('passes empty references array if empty references array is provided', async () => {
-        const resp = await supertest
-          .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
-          .send({
-            attributes: {
-              title: 'foo',
-            },
-            references: [],
-          })
-          .expect(200);
-
-        expect(resp.body).to.have.property('references');
-        expect(resp.body.references).to.eql([]);
-      });
-
-      it('handles upsert', async () => {
-        await supertest
-          .put(`/api/saved_objects/visualization/upserted-viz`)
-          .send({
-            attributes: {
-              title: 'foo',
-            },
-            upsert: {
-              title: 'upserted title',
-              description: 'upserted description',
-            },
-          })
-          .expect(200);
-
-        const { body: upserted } = await supertest
-          .get(`/api/saved_objects/visualization/upserted-viz`)
-          .expect(200);
-
-        expect(upserted.attributes).to.eql({
-          title: 'upserted title',
-          description: 'upserted description',
         });
+    });
 
-        await supertest
-          .put(`/api/saved_objects/visualization/upserted-viz`)
-          .send({
-            attributes: {
-              title: 'foobar',
-            },
-            upsert: {
-              description: 'new upserted description',
-              version: 9000,
-            },
-          })
-          .expect(200);
+    it('does not pass references if omitted', async () => {
+      const resp = await supertest
+        .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
+        .send({
+          attributes: {
+            title: 'foo',
+          },
+        })
+        .expect(200);
+
+      expect(resp.body).not.to.have.property('references');
+    });
 
-        const { body: notUpserted } = await supertest
-          .get(`/api/saved_objects/visualization/upserted-viz`)
-          .expect(200);
+    it('passes references if they are provided', async () => {
+      const references = [{ id: 'foo', name: 'Foo', type: 'visualization' }];
+
+      const resp = await supertest
+        .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
+        .send({
+          attributes: {
+            title: 'foo',
+          },
+          references,
+        })
+        .expect(200);
+
+      expect(resp.body).to.have.property('references');
+      expect(resp.body.references).to.eql(references);
+    });
 
-        expect(notUpserted.attributes).to.eql({
-          title: 'foobar',
-          description: 'upserted description',
-        });
+    it('passes empty references array if empty references array is provided', async () => {
+      const resp = await supertest
+        .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
+        .send({
+          attributes: {
+            title: 'foo',
+          },
+          references: [],
+        })
+        .expect(200);
+
+      expect(resp.body).to.have.property('references');
+      expect(resp.body.references).to.eql([]);
+    });
+
+    it('handles upsert', async () => {
+      await supertest
+        .put(`/api/saved_objects/visualization/upserted-viz`)
+        .send({
+          attributes: {
+            title: 'foo',
+          },
+          upsert: {
+            title: 'upserted title',
+            description: 'upserted description',
+          },
+        })
+        .expect(200);
+
+      const { body: upserted } = await supertest
+        .get(`/api/saved_objects/visualization/upserted-viz`)
+        .expect(200);
+
+      expect(upserted.attributes).to.eql({
+        title: 'upserted title',
+        description: 'upserted description',
       });
 
-      describe('unknown id', () => {
-        it('should return a generic 404', async () => {
-          await supertest
-            .put(`/api/saved_objects/visualization/not an id`)
-            .send({
-              attributes: {
-                title: 'My second favorite vis',
-              },
-            })
-            .expect(404)
-            .then((resp) => {
-              expect(resp.body).eql({
-                statusCode: 404,
-                error: 'Not Found',
-                message: 'Saved object [visualization/not an id] not found',
-              });
-            });
-        });
+      await supertest
+        .put(`/api/saved_objects/visualization/upserted-viz`)
+        .send({
+          attributes: {
+            title: 'foobar',
+          },
+          upsert: {
+            description: 'new upserted description',
+            version: 9000,
+          },
+        })
+        .expect(200);
+
+      const { body: notUpserted } = await supertest
+        .get(`/api/saved_objects/visualization/upserted-viz`)
+        .expect(200);
+
+      expect(notUpserted.attributes).to.eql({
+        title: 'foobar',
+        description: 'upserted description',
       });
     });
 
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
-
-      it('should return 500', async () =>
+    describe('unknown id', () => {
+      it('should return a generic 404', async () => {
         await supertest
-          .put(`/api/saved_objects/visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab`)
+          .put(`/api/saved_objects/visualization/not an id`)
           .send({
             attributes: {
               title: 'My second favorite vis',
             },
           })
-          .expect(500)
+          .expect(404)
           .then((resp) => {
             expect(resp.body).eql({
-              statusCode: 500,
-              error: 'Internal Server Error',
-              message: 'An internal server error occurred.',
+              statusCode: 404,
+              error: 'Not Found',
+              message: 'Saved object [visualization/not an id] not found',
             });
-          }));
+          });
+      });
     });
   });
 }
diff --git a/test/api_integration/apis/saved_objects_management/find.ts b/test/api_integration/apis/saved_objects_management/find.ts
index 9bf3045bd0138..6aefd74f0f36b 100644
--- a/test/api_integration/apis/saved_objects_management/find.ts
+++ b/test/api_integration/apis/saved_objects_management/find.ts
@@ -11,7 +11,6 @@ import { Response } from 'supertest';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
@@ -26,8 +25,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
+      before(() => kibanaServer.importExport.load('saved_objects/basic'));
+      after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
       it('should return 200 with individual responses', async () =>
         await supertest
@@ -86,8 +85,8 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       describe('`hasReference` and `hasReferenceOperator` parameters', () => {
-        before(() => esArchiver.load('saved_objects/references'));
-        after(() => esArchiver.unload('saved_objects/references'));
+        before(() => kibanaServer.importExport.load('saved_objects/references'));
+        after(() => kibanaServer.importExport.unload('saved_objects/references'));
 
         it('search for a reference', async () => {
           await supertest
@@ -119,8 +118,8 @@ export default function ({ getService }: FtrProviderContext) {
               const objects = resp.body.saved_objects;
               expect(objects.map((obj: any) => obj.id)).to.eql([
                 'only-ref-1',
-                'ref-1-and-ref-2',
                 'only-ref-2',
+                'ref-1-and-ref-2',
               ]);
             });
         });
@@ -145,91 +144,15 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
 
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
-
-      it('should return 200 with empty response', async () =>
-        await supertest
-          .get('/api/kibana/management/saved_objects/_find?type=visualization')
-          .expect(200)
-          .then((resp: Response) => {
-            expect(resp.body).to.eql({
-              page: 1,
-              per_page: 20,
-              total: 0,
-              saved_objects: [],
-            });
-          }));
-
-      describe('unknown type', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get('/api/kibana/management/saved_objects/_find?type=wigwags')
-            .expect(200)
-            .then((resp: Response) => {
-              expect(resp.body).to.eql({
-                page: 1,
-                per_page: 20,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
-
-      describe('missing type', () => {
-        it('should return 400', async () =>
-          await supertest
-            .get('/api/kibana/management/saved_objects/_find')
-            .expect(400)
-            .then((resp: Response) => {
-              expect(resp.body).to.eql({
-                error: 'Bad Request',
-                message:
-                  '[request query.type]: expected at least one defined value but got [undefined]',
-                statusCode: 400,
-              });
-            }));
-      });
-
-      describe('page beyond total', () => {
-        it('should return 200 with empty response', async () =>
-          await supertest
-            .get(
-              '/api/kibana/management/saved_objects/_find?type=visualization&page=100&perPage=100'
-            )
-            .expect(200)
-            .then((resp: Response) => {
-              expect(resp.body).to.eql({
-                page: 100,
-                per_page: 100,
-                total: 0,
-                saved_objects: [],
-              });
-            }));
-      });
-
-      describe('unknown search field', () => {
-        it('should return 400 when using searchFields', async () =>
-          await supertest
-            .get('/api/kibana/management/saved_objects/_find?type=url&searchFields=a')
-            .expect(400)
-            .then((resp: Response) => {
-              expect(resp.body).to.eql({
-                statusCode: 400,
-                error: 'Bad Request',
-                message: '[request query.searchFields]: definition for this key is missing',
-              });
-            }));
-      });
-    });
-
     describe('meta attributes injected properly', () => {
-      before(() => esArchiver.load('management/saved_objects/search'));
-      after(() => esArchiver.unload('management/saved_objects/search'));
+      before(() =>
+        esArchiver.load('test/api_integration/fixtures/es_archiver/management/saved_objects/search')
+      );
+      after(() =>
+        esArchiver.unload(
+          'test/api_integration/fixtures/es_archiver/management/saved_objects/search'
+        )
+      );
 
       it('should inject meta attributes for searches', async () =>
         await supertest
diff --git a/test/api_integration/apis/saved_objects_management/get.ts b/test/api_integration/apis/saved_objects_management/get.ts
index 4dfd06a61eecf..eb0b832cb2ed1 100644
--- a/test/api_integration/apis/saved_objects_management/get.ts
+++ b/test/api_integration/apis/saved_objects_management/get.ts
@@ -11,45 +11,29 @@ import { Response } from 'supertest';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
-  const esDeleteAllIndices = getService('esDeleteAllIndices');
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
 
   describe('get', () => {
     const existingObject = 'visualization/dd7caf20-9efd-11e7-acb3-3dab96693fab';
     const nonexistentObject = 'wigwags/foo';
 
-    describe('with kibana index', () => {
-      before(() => esArchiver.load('saved_objects/basic'));
-      after(() => esArchiver.unload('saved_objects/basic'));
-
-      it('should return 200 for object that exists and inject metadata', async () =>
-        await supertest
-          .get(`/api/kibana/management/saved_objects/${existingObject}`)
-          .expect(200)
-          .then((resp: Response) => {
-            const { body } = resp;
-            const { type, id, meta } = body;
-            expect(type).to.eql('visualization');
-            expect(id).to.eql('dd7caf20-9efd-11e7-acb3-3dab96693fab');
-            expect(meta).to.not.equal(undefined);
-          }));
-
-      it('should return 404 for object that does not exist', async () =>
-        await supertest
-          .get(`/api/kibana/management/saved_objects/${nonexistentObject}`)
-          .expect(404));
-    });
-
-    describe('without kibana index', () => {
-      before(
-        async () =>
-          // just in case the kibana server has recreated it
-          await esDeleteAllIndices('.kibana*')
-      );
-
-      it('should return 404 for object that no longer exists', async () =>
-        await supertest.get(`/api/kibana/management/saved_objects/${existingObject}`).expect(404));
-    });
+    before(() => kibanaServer.importExport.load('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
+
+    it('should return 200 for object that exists and inject metadata', async () =>
+      await supertest
+        .get(`/api/kibana/management/saved_objects/${existingObject}`)
+        .expect(200)
+        .then((resp: Response) => {
+          const { body } = resp;
+          const { type, id, meta } = body;
+          expect(type).to.eql('visualization');
+          expect(id).to.eql('dd7caf20-9efd-11e7-acb3-3dab96693fab');
+          expect(meta).to.not.equal(undefined);
+        }));
+
+    it('should return 404 for object that does not exist', async () =>
+      await supertest.get(`/api/kibana/management/saved_objects/${nonexistentObject}`).expect(404));
   });
 }
diff --git a/test/api_integration/apis/saved_objects_management/relationships.ts b/test/api_integration/apis/saved_objects_management/relationships.ts
index 17e562d221d72..ffc97b1385957 100644
--- a/test/api_integration/apis/saved_objects_management/relationships.ts
+++ b/test/api_integration/apis/saved_objects_management/relationships.ts
@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
 
   const relationSchema = schema.object({
     id: schema.string(),
@@ -43,12 +43,8 @@ export default function ({ getService }: FtrProviderContext) {
   });
 
   describe('relationships', () => {
-    before(async () => {
-      await esArchiver.load('management/saved_objects/relationships');
-    });
-    after(async () => {
-      await esArchiver.unload('management/saved_objects/relationships');
-    });
+    before(() => kibanaServer.importExport.load('management/saved_objects/relationships'));
+    after(() => kibanaServer.importExport.unload('management/saved_objects/relationships'));
 
     const baseApiUrl = `/api/kibana/management/saved_objects/relationships`;
     const defaultTypes = ['visualization', 'index-pattern', 'search', 'dashboard'];
diff --git a/test/api_integration/apis/saved_objects_management/scroll_count.ts b/test/api_integration/apis/saved_objects_management/scroll_count.ts
index 78fd316eb4ecb..088b26d8205da 100644
--- a/test/api_integration/apis/saved_objects_management/scroll_count.ts
+++ b/test/api_integration/apis/saved_objects_management/scroll_count.ts
@@ -19,10 +19,14 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('scroll_count', () => {
     before(async () => {
-      await esArchiver.load('management/saved_objects/scroll_count');
+      await esArchiver.load(
+        'test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count'
+      );
     });
     after(async () => {
-      await esArchiver.unload('management/saved_objects/scroll_count');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count'
+      );
     });
 
     it('returns the count for each included types', async () => {
diff --git a/test/api_integration/apis/search/bsearch.ts b/test/api_integration/apis/search/bsearch.ts
index f539d0f9e4544..f80bc1d0d9dfa 100644
--- a/test/api_integration/apis/search/bsearch.ts
+++ b/test/api_integration/apis/search/bsearch.ts
@@ -8,15 +8,18 @@
 
 import expect from '@kbn/expect';
 import request from 'superagent';
+import { inflateResponse } from '../../../../src/plugins/bfetch/public/streaming';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { painlessErrReq } from './painless_err_req';
 import { verifyErrorResponse } from './verify_error';
 
-function parseBfetchResponse(resp: request.Response): Array<Record<string, any>> {
+function parseBfetchResponse(resp: request.Response, compressed: boolean = false) {
   return resp.text
     .trim()
     .split('\n')
-    .map((item) => JSON.parse(item));
+    .map((item) => {
+      return JSON.parse(compressed ? inflateResponse<any>(item) : item);
+    });
 }
 
 export default function ({ getService }: FtrProviderContext) {
@@ -26,29 +29,69 @@ export default function ({ getService }: FtrProviderContext) {
   describe('bsearch', () => {
     describe('post', () => {
       it('should return 200 a single response', async () => {
-        const resp = await supertest.post(`/internal/bsearch`).send({
-          batch: [
-            {
-              request: {
-                params: {
-                  body: {
-                    query: {
-                      match_all: {},
+        const resp = await supertest
+          .post(`/internal/bsearch`)
+          .set({ 'X-Chunk-Encoding': '' })
+          .send({
+            batch: [
+              {
+                request: {
+                  params: {
+                    index: '.kibana',
+                    body: {
+                      query: {
+                        match_all: {},
+                      },
                     },
                   },
                 },
+                options: {
+                  strategy: 'es',
+                },
               },
-            },
-          ],
-        });
+            ],
+          });
+
+        const jsonBody = parseBfetchResponse(resp);
+
+        expect(resp.status).to.be(200);
+        expect(jsonBody[0].id).to.be(0);
+        expect(jsonBody[0].result.isPartial).to.be(false);
+        expect(jsonBody[0].result.isRunning).to.be(false);
+        expect(jsonBody[0].result).to.have.property('rawResponse');
+      });
+
+      it('should return 200 a single response from compressed', async () => {
+        const resp = await supertest
+          .post(`/internal/bsearch`)
+          .set({ 'X-Chunk-Encoding': 'deflate' })
+          .send({
+            batch: [
+              {
+                request: {
+                  params: {
+                    index: '.kibana',
+                    body: {
+                      query: {
+                        match_all: {},
+                      },
+                    },
+                  },
+                },
+                options: {
+                  strategy: 'es',
+                },
+              },
+            ],
+          });
 
-        const jsonBody = JSON.parse(resp.text);
+        const jsonBody = parseBfetchResponse(resp, true);
 
         expect(resp.status).to.be(200);
-        expect(jsonBody.id).to.be(0);
-        expect(jsonBody.result).to.have.property('isPartial');
-        expect(jsonBody.result).to.have.property('isRunning');
-        expect(jsonBody.result).to.have.property('rawResponse');
+        expect(jsonBody[0].id).to.be(0);
+        expect(jsonBody[0].result.isPartial).to.be(false);
+        expect(jsonBody[0].result.isRunning).to.be(false);
+        expect(jsonBody[0].result).to.have.property('rawResponse');
       });
 
       it('should return a batch of successful responses', async () => {
@@ -57,6 +100,7 @@ export default function ({ getService }: FtrProviderContext) {
             {
               request: {
                 params: {
+                  index: '.kibana',
                   body: {
                     query: {
                       match_all: {},
@@ -68,6 +112,7 @@ export default function ({ getService }: FtrProviderContext) {
             {
               request: {
                 params: {
+                  index: '.kibana',
                   body: {
                     query: {
                       match_all: {},
@@ -95,6 +140,7 @@ export default function ({ getService }: FtrProviderContext) {
             {
               request: {
                 params: {
+                  index: '.kibana',
                   body: {
                     query: {
                       match_all: {},
@@ -121,6 +167,7 @@ export default function ({ getService }: FtrProviderContext) {
           batch: [
             {
               request: {
+                index: '.kibana',
                 indexType: 'baad',
                 params: {
                   body: {
@@ -146,13 +193,11 @@ export default function ({ getService }: FtrProviderContext) {
 
       describe('painless', () => {
         before(async () => {
-          await esArchiver.loadIfNeeded(
-            '../../../functional/fixtures/es_archiver/logstash_functional'
-          );
+          await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
         });
 
         after(async () => {
-          await esArchiver.unload('../../../functional/fixtures/es_archiver/logstash_functional');
+          await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
         });
         it('should return 400 "search_phase_execution_exception" for Painless error in "es" strategy', async () => {
           const resp = await supertest.post(`/internal/bsearch`).send({
diff --git a/test/api_integration/apis/search/search.ts b/test/api_integration/apis/search/search.ts
index 7ef82cd5467ab..96e7f6ab7161b 100644
--- a/test/api_integration/apis/search/search.ts
+++ b/test/api_integration/apis/search/search.ts
@@ -18,11 +18,11 @@ export default function ({ getService }: FtrProviderContext) {
   describe('search', () => {
     before(async () => {
       await esArchiver.emptyKibanaIndex();
-      await esArchiver.loadIfNeeded('../../../functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     after(async () => {
-      await esArchiver.unload('../../../functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
     describe('post', () => {
       it('should return 200 when correctly formatted searches are provided', async () => {
diff --git a/test/api_integration/apis/search/verify_error.ts b/test/api_integration/apis/search/verify_error.ts
index d6b729f59d8d4..1973fe4e4ab36 100644
--- a/test/api_integration/apis/search/verify_error.ts
+++ b/test/api_integration/apis/search/verify_error.ts
@@ -16,7 +16,7 @@ export const verifyErrorResponse = (
 ) => {
   expect(r.statusCode).to.be(expectedCode);
   if (message) {
-    expect(r.message).to.be(message);
+    expect(r.message).to.include.string(message);
   }
   if (shouldHaveAttrs) {
     expect(r).to.have.property('attributes');
diff --git a/test/api_integration/apis/shorten/index.js b/test/api_integration/apis/shorten/index.js
index d2545e6167cd4..9af979b6af95d 100644
--- a/test/api_integration/apis/shorten/index.js
+++ b/test/api_integration/apis/shorten/index.js
@@ -9,12 +9,12 @@
 import expect from '@kbn/expect';
 
 export default function ({ getService }) {
-  const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
 
   describe('url shortener', () => {
-    before(() => esArchiver.load('saved_objects/basic'));
-    after(() => esArchiver.unload('saved_objects/basic'));
+    before(() => kibanaServer.importExport.load('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
     it('generates shortened urls', async () => {
       const resp = await supertest
diff --git a/test/api_integration/apis/stats/stats.js b/test/api_integration/apis/stats/stats.js
index 159c65c98ef87..2ba14e29a3d1a 100644
--- a/test/api_integration/apis/stats/stats.js
+++ b/test/api_integration/apis/stats/stats.js
@@ -44,11 +44,11 @@ const assertStatsAndMetrics = (body) => {
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
 
   describe('kibana stats api', () => {
-    before('make sure there are some saved objects', () => esArchiver.load('saved_objects/basic'));
-    after('cleanup saved objects changes', () => esArchiver.unload('saved_objects/basic'));
+    before(() => kibanaServer.importExport.load('saved_objects/basic'));
+    after(() => kibanaServer.importExport.unload('saved_objects/basic'));
 
     describe('basic', () => {
       it('should return the stats without cluster_uuid with no query string params', () => {
diff --git a/test/api_integration/apis/suggestions/suggestions.js b/test/api_integration/apis/suggestions/suggestions.js
index 39cff3cb2d745..526cb9669f278 100644
--- a/test/api_integration/apis/suggestions/suggestions.js
+++ b/test/api_integration/apis/suggestions/suggestions.js
@@ -8,16 +8,19 @@
 
 export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
+  const kibanaServer = getService('kibanaServer');
   const supertest = getService('supertest');
 
   describe('Suggestions API', function () {
     before(async () => {
-      await esArchiver.load('index_patterns/basic_index');
-      await esArchiver.load('index_patterns/basic_kibana');
+      await esArchiver.load('test/api_integration/fixtures/es_archiver/index_patterns/basic_index');
+      await kibanaServer.importExport.load('index_patterns/basic_kibana');
     });
     after(async () => {
-      await esArchiver.unload('index_patterns/basic_index');
-      await esArchiver.unload('index_patterns/basic_kibana');
+      await esArchiver.unload(
+        'test/api_integration/fixtures/es_archiver/index_patterns/basic_index'
+      );
+      await kibanaServer.importExport.unload('index_patterns/basic_kibana');
     });
 
     it('should return 200 with special characters', () =>
diff --git a/test/api_integration/apis/ui_counters/ui_counters.ts b/test/api_integration/apis/ui_counters/ui_counters.ts
index ab3ca2e8dd3a7..2be6ea4341fb0 100644
--- a/test/api_integration/apis/ui_counters/ui_counters.ts
+++ b/test/api_integration/apis/ui_counters/ui_counters.ts
@@ -15,6 +15,7 @@ import { UsageCountersSavedObject } from '../../../../src/plugins/usage_collecti
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
+  const retry = getService('retry');
 
   const createUiCounterEvent = (eventName: string, type: UiCounterMetricType, count = 1) => ({
     eventName,
@@ -23,16 +24,24 @@ export default function ({ getService }: FtrProviderContext) {
     count,
   });
 
-  const sendReport = async (report: Report) => {
+  const fetchUsageCountersObjects = async (): Promise<UsageCountersSavedObject[]> => {
+    const {
+      body: { saved_objects: savedObjects },
+    } = await supertest
+      .get('/api/saved_objects/_find?type=usage-counters')
+      .set('kbn-xsrf', 'kibana')
+      .expect(200);
+
+    return savedObjects;
+  };
+
+  const sendReport = async (report: Report): Promise<void> => {
     await supertest
       .post('/api/ui_counters/_report')
       .set('kbn-xsrf', 'kibana')
       .set('content-type', 'application/json')
       .send({ report })
       .expect(200);
-
-    // wait for SO to index data into ES
-    await new Promise((res) => setTimeout(res, 5 * 1000));
   };
 
   const getCounterById = (
@@ -47,8 +56,7 @@ export default function ({ getService }: FtrProviderContext) {
     return savedObject;
   };
 
-  // FLAKY: https://github.com/elastic/kibana/issues/98240
-  describe.skip('UI Counters API', () => {
+  describe('UI Counters API', () => {
     const dayDate = moment().format('DDMMYYYY');
     before(async () => await esArchiver.emptyKibanaIndex());
 
@@ -61,18 +69,15 @@ export default function ({ getService }: FtrProviderContext) {
 
       await sendReport(report);
 
-      const {
-        body: { saved_objects: savedObjects },
-      } = await supertest
-        .get('/api/saved_objects/_find?type=usage-counters')
-        .set('kbn-xsrf', 'kibana')
-        .expect(200);
-
-      const countTypeEvent = getCounterById(
-        savedObjects,
-        `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:my_event`
-      );
-      expect(countTypeEvent.attributes.count).to.eql(1);
+      await retry.waitForWithTimeout('reported events to be stored into ES', 8000, async () => {
+        const savedObjects = await fetchUsageCountersObjects();
+        const countTypeEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:my_event`
+        );
+        expect(countTypeEvent.attributes.count).to.eql(1);
+        return true;
+      });
     });
 
     it('supports multiple events', async () => {
@@ -87,31 +92,27 @@ export default function ({ getService }: FtrProviderContext) {
       ]);
 
       await sendReport(report);
-
-      const {
-        body: { saved_objects: savedObjects },
-      } = await supertest
-        .get('/api/saved_objects/_find?type=usage-counters&fields=count')
-        .set('kbn-xsrf', 'kibana')
-        .expect(200);
-
-      const countTypeEvent = getCounterById(
-        savedObjects,
-        `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}`
-      );
-      expect(countTypeEvent.attributes.count).to.eql(1);
-
-      const clickTypeEvent = getCounterById(
-        savedObjects,
-        `uiCounter:${dayDate}:${METRIC_TYPE.CLICK}:myApp:${uniqueEventName}`
-      );
-      expect(clickTypeEvent.attributes.count).to.eql(2);
-
-      const secondEvent = getCounterById(
-        savedObjects,
-        `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}_2`
-      );
-      expect(secondEvent.attributes.count).to.eql(1);
+      await retry.waitForWithTimeout('reported events to be stored into ES', 8000, async () => {
+        const savedObjects = await fetchUsageCountersObjects();
+        const countTypeEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}`
+        );
+        expect(countTypeEvent.attributes.count).to.eql(1);
+
+        const clickTypeEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.CLICK}:myApp:${uniqueEventName}`
+        );
+        expect(clickTypeEvent.attributes.count).to.eql(2);
+
+        const secondEvent = getCounterById(
+          savedObjects,
+          `uiCounter:${dayDate}:${METRIC_TYPE.COUNT}:myApp:${uniqueEventName}_2`
+        );
+        expect(secondEvent.attributes.count).to.eql(1);
+        return true;
+      });
     });
   });
 }
diff --git a/test/api_integration/config.js b/test/api_integration/config.js
index 7bbace4c60570..84fb0b7907c3b 100644
--- a/test/api_integration/config.js
+++ b/test/api_integration/config.js
@@ -31,6 +31,7 @@ export default async function ({ readConfigFile }) {
         '--server.xsrf.disableProtection=true',
         '--server.compression.referrerWhitelist=["some-host.com"]',
         `--savedObjects.maxImportExportSize=10001`,
+        '--savedObjects.maxImportPayloadBytes=30000000',
         // for testing set buffer duration to 0 to immediately flush counters into saved objects.
         '--usageCollection.usageCounters.bufferDuration=0',
       ],
diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json
deleted file mode 100644
index 54276b59dcc23..0000000000000
--- a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/data.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "index-pattern:91200a00-9efd-11e7-acb3-3dab96693fab",
-    "source": {
-      "type": "index-pattern",
-      "updated_at": "2017-09-21T18:49:16.270Z",
-      "index-pattern": {
-        "title": "basic_index",
-        "fields": "[{\"name\":\"bar\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"baz\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"baz.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"foo\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"nestedField.child\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"nested\":{\"path\":\"nestedField\"}}}]"
-      }
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json b/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json
deleted file mode 100644
index 99264d7ebbff8..0000000000000
--- a/test/api_integration/fixtures/es_archiver/index_patterns/basic_kibana/mappings.json
+++ /dev/null
@@ -1,253 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "index": ".kibana",
-    "settings": {
-      "index": {
-        "number_of_shards": "1",
-        "number_of_replicas": "1"
-      }
-    },
-    "mappings": {
-      "dynamic": "strict",
-      "properties": {
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "defaultIndex": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 256
-                }
-              }
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 2048
-                }
-              }
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/data.json b/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/data.json
deleted file mode 100644
index 21d84c4b55e55..0000000000000
--- a/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/data.json
+++ /dev/null
@@ -1,190 +0,0 @@
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "timelion-sheet:190f3e90-2ec3-11e8-ba48-69fc4e41e1f6",
-    "source": {
-      "type": "timelion-sheet",
-      "updated_at": "2018-03-23T17:53:30.872Z",
-      "timelion-sheet": {
-        "title": "New TimeLion Sheet",
-        "hits": 0,
-        "description": "",
-        "timelion_sheet": [
-          ".es(*)"
-        ],
-        "timelion_interval": "auto",
-        "timelion_chart_height": 275,
-        "timelion_columns": 2,
-        "timelion_rows": 2,
-        "version": 1
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "index-pattern:8963ca30-3224-11e8-a572-ffca06da1357",
-    "source": {
-      "type": "index-pattern",
-      "updated_at": "2018-03-28T01:08:34.290Z",
-      "index-pattern": {
-        "title": "saved_objects*",
-        "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]"
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "config:7.0.0-alpha1",
-    "source": {
-      "type": "config",
-      "updated_at": "2018-03-28T01:08:39.248Z",
-      "config": {
-        "buildNum": 8467,
-        "telemetry:optIn": false,
-        "defaultIndex": "8963ca30-3224-11e8-a572-ffca06da1357"
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "search:960372e0-3224-11e8-a572-ffca06da1357",
-    "source": {
-      "type": "search",
-      "updated_at": "2018-03-28T01:08:55.182Z",
-      "search": {
-        "title": "OneRecord",
-        "description": "",
-        "hits": 0,
-        "columns": [
-          "_source"
-        ],
-        "sort": [
-          "_score",
-          "desc"
-        ],
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"8963ca30-3224-11e8-a572-ffca06da1357\",\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"id:3\",\"language\":\"lucene\"},\"filter\":[]}"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:a42c0580-3224-11e8-a572-ffca06da1357",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2018-03-28T01:09:18.936Z",
-      "visualization": {
-        "title": "VisualizationFromSavedSearch",
-        "visState": "{\"title\":\"VisualizationFromSavedSearch\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}",
-        "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
-        "description": "",
-        "savedSearchId": "960372e0-3224-11e8-a572-ffca06da1357",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:add810b0-3224-11e8-a572-ffca06da1357",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2018-03-28T01:09:35.163Z",
-      "visualization": {
-        "title": "Visualization",
-        "visState": "{\"title\":\"Visualization\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":60}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}",
-        "uiStateJSON": "{}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"index\":\"8963ca30-3224-11e8-a572-ffca06da1357\",\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "dashboard:b70c7ae0-3224-11e8-a572-ffca06da1357",
-    "source": {
-      "type": "dashboard",
-      "updated_at": "2018-03-28T01:09:50.606Z",
-      "dashboard": {
-        "title": "Dashboard",
-        "hits": 0,
-        "description": "",
-        "panelsJSON": "[{\"gridData\":{\"w\":24,\"h\":15,\"x\":0,\"y\":0,\"i\":\"1\"},\"version\":\"7.0.0-alpha1\",\"panelIndex\":\"1\",\"type\":\"visualization\",\"id\":\"add810b0-3224-11e8-a572-ffca06da1357\",\"embeddableConfig\":{}},{\"gridData\":{\"w\":24,\"h\":15,\"x\":24,\"y\":0,\"i\":\"2\"},\"version\":\"7.0.0-alpha1\",\"panelIndex\":\"2\",\"type\":\"visualization\",\"id\":\"a42c0580-3224-11e8-a572-ffca06da1357\",\"embeddableConfig\":{}}]",
-        "optionsJSON": "{\"darkTheme\":false,\"useMargins\":true,\"hidePanelTitles\":false}",
-        "version": 1,
-        "timeRestore": false,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
-        }
-      }
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "dashboard:invalid-refs",
-    "source": {
-      "type": "dashboard",
-      "updated_at": "2018-03-28T01:09:50.606Z",
-      "dashboard": {
-        "title": "Dashboard",
-        "hits": 0,
-        "description": "",
-        "panelsJSON": "[]",
-        "optionsJSON": "{}",
-        "version": 1,
-        "timeRestore": false,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{}"
-        }
-      },
-      "references": [
-        {
-          "type":"visualization",
-          "id": "add810b0-3224-11e8-a572-ffca06da1357",
-          "name": "valid-ref"
-        },
-        {
-          "type":"visualization",
-          "id": "invalid-vis",
-          "name": "missing-ref"
-        }
-      ]
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/mappings.json b/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/mappings.json
deleted file mode 100644
index 6dd4d198e0f67..0000000000000
--- a/test/api_integration/fixtures/es_archiver/management/saved_objects/relationships/mappings.json
+++ /dev/null
@@ -1,297 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "index": ".kibana",
-    "settings": {
-      "index": {
-        "number_of_shards": "1",
-        "auto_expand_replicas": "0-1",
-        "number_of_replicas": "0"
-      }
-    },
-    "mappings": {
-      "dynamic": "strict",
-      "properties": {
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "defaultIndex": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 256
-                }
-              }
-            },
-            "telemetry:optIn": {
-              "type": "boolean"
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "graph-workspace": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "numLinks": {
-              "type": "integer"
-            },
-            "numVertices": {
-              "type": "integer"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "wsState": {
-              "type": "text"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 2048
-                }
-              }
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/mappings.json b/test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/mappings.json
index 8270c573e4c1e..d2177481130a2 100644
--- a/test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/mappings.json
+++ b/test/api_integration/fixtures/es_archiver/management/saved_objects/scroll_count/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/api_integration/fixtures/es_archiver/management/saved_objects/search/mappings.json b/test/api_integration/fixtures/es_archiver/management/saved_objects/search/mappings.json
index c670508247b1a..7a6d752eafb08 100644
--- a/test/api_integration/fixtures/es_archiver/management/saved_objects/search/mappings.json
+++ b/test/api_integration/fixtures/es_archiver/management/saved_objects/search/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/10k/data.json.gz b/test/api_integration/fixtures/es_archiver/saved_objects/10k/data.json.gz
deleted file mode 100644
index b1a2b4301f4d8..0000000000000
Binary files a/test/api_integration/fixtures/es_archiver/saved_objects/10k/data.json.gz and /dev/null differ
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/10k/mappings.json b/test/api_integration/fixtures/es_archiver/saved_objects/10k/mappings.json
deleted file mode 100644
index 99264d7ebbff8..0000000000000
--- a/test/api_integration/fixtures/es_archiver/saved_objects/10k/mappings.json
+++ /dev/null
@@ -1,253 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "index": ".kibana",
-    "settings": {
-      "index": {
-        "number_of_shards": "1",
-        "number_of_replicas": "1"
-      }
-    },
-    "mappings": {
-      "dynamic": "strict",
-      "properties": {
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "defaultIndex": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 256
-                }
-              }
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 2048
-                }
-              }
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/basic/data.json.gz b/test/api_integration/fixtures/es_archiver/saved_objects/basic/data.json.gz
deleted file mode 100644
index d65e1920b2342..0000000000000
Binary files a/test/api_integration/fixtures/es_archiver/saved_objects/basic/data.json.gz and /dev/null differ
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/basic/mappings.json b/test/api_integration/fixtures/es_archiver/saved_objects/basic/mappings.json
deleted file mode 100644
index 6dac52137ef01..0000000000000
--- a/test/api_integration/fixtures/es_archiver/saved_objects/basic/mappings.json
+++ /dev/null
@@ -1,2866 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "aliases": {
-      ".kibana": {
-      }
-    },
-    "index": ".kibana_1",
-    "mappings": {
-      "_meta": {
-        "migrationMappingPropertyHashes": {
-          "action": "6e96ac5e648f57523879661ea72525b7",
-          "action_task_params": "a9d49f184ee89641044be0ca2950fa3a",
-          "alert": "05d57e6963593484582a4de341446974",
-          "api_key_pending_invalidation": "16f515278a295f6245149ad7c5ddedb7",
-          "apm-indices": "9bb9b2bf1fa636ed8619cbab5ce6a1dd",
-          "apm-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "app_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "application_usage_daily": "43b8830d5d0df85a6823d290885fc9fd",
-          "application_usage_totals": "3d1b76c39bfb2cc8296b024d73854724",
-          "application_usage_transactional": "3d1b76c39bfb2cc8296b024d73854724",
-          "canvas-element": "7390014e1091044523666d97247392fc",
-          "canvas-workpad": "b0a1706d356228dbdcb4a17e6b9eb231",
-          "canvas-workpad-template": "ae2673f678281e2c055d764b153e9715",
-          "cases": "7c28a18fbac7c2a4e79449e9802ef476",
-          "cases-comments": "112cefc2b6737e613a8ef033234755e6",
-          "cases-configure": "387c5f3a3bda7e0ae0dd4e106f914a69",
-          "cases-connector-mappings": "6bc7e49411d38be4969dc6aa8bd43776",
-          "cases-sub-case": "2dc9dbf1fc7144e2b18fffc017358ff9",
-          "cases-user-actions": "32277330ec6b721abe3b846cfd939a71",
-          "config": "c63748b75f39d0c54de12d12c1ccbc20",
-          "core-usage-stats": "3d1b76c39bfb2cc8296b024d73854724",
-          "coreMigrationVersion": "2f4316de49999235636386fe51dc06c1",
-          "dashboard": "40554caf09725935e2c02e02563a2d07",
-          "endpoint:user-artifact": "4a11183eee21e6fbad864f7a30b39ad0",
-          "endpoint:user-artifact-manifest": "a0d7b04ad405eed54d76e279c3727862",
-          "enterprise_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "epm-packages": "0cbbb16506734d341a96aaed65ec6413",
-          "epm-packages-assets": "44621b2f6052ef966da47b7c3a00f33b",
-          "exception-list": "baf108c9934dda844921f692a513adae",
-          "exception-list-agnostic": "baf108c9934dda844921f692a513adae",
-          "file-upload-usage-collection-telemetry": "a34fbb8e3263d105044869264860c697",
-          "fleet-agent-actions": "9511b565b1cc6441a42033db3d5de8e9",
-          "fleet-agent-events": "e20a508b6e805189356be381dbfac8db",
-          "fleet-agents": "59fd74f819f028f8555776db198d2562",
-          "fleet-enrollment-api-keys": "a69ef7ae661dab31561d6c6f052ef2a7",
-          "graph-workspace": "27a94b2edcb0610c6aea54a7c56d7752",
-          "index-pattern": "45915a1ad866812242df474eb0479052",
-          "infrastructure-ui-source": "3d1b76c39bfb2cc8296b024d73854724",
-          "ingest-agent-policies": "8df93787e2927f227dc80db8b6d309b9",
-          "ingest-outputs": "8854f34453a47e26f86a29f8f3b80b4e",
-          "ingest-package-policies": "c91ca97b1ff700f0fc64dc6b13d65a85",
-          "ingest_manager_settings": "22d4d1288c2687ef6a8f6e83159b4542",
-          "inventory-view": "3d1b76c39bfb2cc8296b024d73854724",
-          "kql-telemetry": "d12a98a6f19a2d273696597547e064ee",
-          "legacy-url-alias": "3d1b76c39bfb2cc8296b024d73854724",
-          "lens": "52346cfec69ff7b47d5f0c12361a2797",
-          "lens-ui-telemetry": "509bfa5978586998e05f9e303c07a327",
-          "map": "9134b47593116d7953f6adba096fc463",
-          "maps-telemetry": "5ef305b18111b77789afefbd36b66171",
-          "metrics-explorer-view": "3d1b76c39bfb2cc8296b024d73854724",
-          "migrationVersion": "4a1746014a75ade3a714e1db5763276f",
-          "ml-job": "3bb64c31915acf93fc724af137a0891b",
-          "ml-module": "46ef4f0d6682636f0fff9799d6a2d7ac",
-          "monitoring-telemetry": "2669d5ec15e82391cf58df4294ee9c68",
-          "namespace": "2f4316de49999235636386fe51dc06c1",
-          "namespaces": "2f4316de49999235636386fe51dc06c1",
-          "originId": "2f4316de49999235636386fe51dc06c1",
-          "query": "11aaeb7f5f7fa5bb43f25e18ce26e7d9",
-          "references": "7997cf5a56cc02bdc9c93361bde732b0",
-          "sample-data-telemetry": "7d3cfeb915303c9641c59681967ffeb4",
-          "search": "db2c00e39b36f40930a3b9fc71c823e1",
-          "search-session": "33157cf0119e41cd4e7a1d24266beff4",
-          "search-telemetry": "3d1b76c39bfb2cc8296b024d73854724",
-          "security-solution-signals-migration": "72761fd374ca11122ac8025a92b84fca",
-          "siem-detection-engine-rule-actions": "6569b288c169539db10cb262bf79de18",
-          "siem-detection-engine-rule-status": "ae783f41c6937db6b7a2ef5c93a9e9b0",
-          "siem-ui-timeline": "3e97beae13cdfc6d62bc1846119f7276",
-          "siem-ui-timeline-note": "8874706eedc49059d4cf0f5094559084",
-          "siem-ui-timeline-pinned-event": "20638091112f0e14f0e443d512301c29",
-          "space": "c5ca8acafa0beaa4d08d014a97b6bc6b",
-          "spaces-usage-stats": "3d1b76c39bfb2cc8296b024d73854724",
-          "tag": "83d55da58f6530f7055415717ec06474",
-          "telemetry": "36a616f7026dfa617d6655df850fe16d",
-          "timelion-sheet": "9a2a2748877c7a7b582fef201ab1d4cf",
-          "type": "2f4316de49999235636386fe51dc06c1",
-          "ui-counter": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "ui-metric": "0d409297dc5ebe1e3a1da691c6ee32e3",
-          "updated_at": "00da57df13e94e9d98437d13ace4bfe0",
-          "upgrade-assistant-reindex-operation": "215107c281839ea9b3ad5f6419819763",
-          "upgrade-assistant-telemetry": "56702cec857e0a9dacfb696655b4ff7b",
-          "uptime-dynamic-settings": "3d1b76c39bfb2cc8296b024d73854724",
-          "url": "c7f66a0df8b1b52f17c28c4adb111105",
-          "visualization": "f819cf6636b75c9e76ba733a0c6ef355",
-          "workplace_search_telemetry": "3d1b76c39bfb2cc8296b024d73854724"
-        }
-      },
-      "dynamic": "strict",
-      "properties": {
-        "action": {
-          "properties": {
-            "actionTypeId": {
-              "type": "keyword"
-            },
-            "config": {
-              "enabled": false,
-              "type": "object"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "secrets": {
-              "type": "binary"
-            }
-          }
-        },
-        "action_task_params": {
-          "properties": {
-            "actionId": {
-              "type": "keyword"
-            },
-            "apiKey": {
-              "type": "binary"
-            },
-            "params": {
-              "enabled": false,
-              "type": "object"
-            }
-          }
-        },
-        "alert": {
-          "properties": {
-            "actions": {
-              "properties": {
-                "actionRef": {
-                  "type": "keyword"
-                },
-                "actionTypeId": {
-                  "type": "keyword"
-                },
-                "group": {
-                  "type": "keyword"
-                },
-                "params": {
-                  "enabled": false,
-                  "type": "object"
-                }
-              },
-              "type": "nested"
-            },
-            "alertTypeId": {
-              "type": "keyword"
-            },
-            "apiKey": {
-              "type": "binary"
-            },
-            "apiKeyOwner": {
-              "type": "keyword"
-            },
-            "consumer": {
-              "type": "keyword"
-            },
-            "createdAt": {
-              "type": "date"
-            },
-            "createdBy": {
-              "type": "keyword"
-            },
-            "enabled": {
-              "type": "boolean"
-            },
-            "executionStatus": {
-              "properties": {
-                "error": {
-                  "properties": {
-                    "message": {
-                      "type": "keyword"
-                    },
-                    "reason": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "lastExecutionDate": {
-                  "type": "date"
-                },
-                "status": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "meta": {
-              "properties": {
-                "versionApiKeyLastmodified": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "muteAll": {
-              "type": "boolean"
-            },
-            "mutedInstanceIds": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "notifyWhen": {
-              "type": "keyword"
-            },
-            "params": {
-              "type": "flattened"
-            },
-            "schedule": {
-              "properties": {
-                "interval": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "scheduledTaskId": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "throttle": {
-              "type": "keyword"
-            },
-            "updatedAt": {
-              "type": "date"
-            },
-            "updatedBy": {
-              "type": "keyword"
-            }
-          }
-        },
-        "api_key_pending_invalidation": {
-          "properties": {
-            "apiKeyId": {
-              "type": "keyword"
-            },
-            "createdAt": {
-              "type": "date"
-            }
-          }
-        },
-        "apm-indices": {
-          "properties": {
-            "apm_oss": {
-              "properties": {
-                "errorIndices": {
-                  "type": "keyword"
-                },
-                "metricsIndices": {
-                  "type": "keyword"
-                },
-                "onboardingIndices": {
-                  "type": "keyword"
-                },
-                "sourcemapIndices": {
-                  "type": "keyword"
-                },
-                "spanIndices": {
-                  "type": "keyword"
-                },
-                "transactionIndices": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "apm-telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "app_search_telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "application_usage_daily": {
-          "dynamic": "false",
-          "properties": {
-            "timestamp": {
-              "type": "date"
-            }
-          }
-        },
-        "application_usage_totals": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "application_usage_transactional": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "canvas-element": {
-          "dynamic": "false",
-          "properties": {
-            "@created": {
-              "type": "date"
-            },
-            "@timestamp": {
-              "type": "date"
-            },
-            "content": {
-              "type": "text"
-            },
-            "help": {
-              "type": "text"
-            },
-            "image": {
-              "type": "text"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "canvas-workpad": {
-          "dynamic": "false",
-          "properties": {
-            "@created": {
-              "type": "date"
-            },
-            "@timestamp": {
-              "type": "date"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "canvas-workpad-template": {
-          "dynamic": "false",
-          "properties": {
-            "help": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "tags": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "template_key": {
-              "type": "keyword"
-            }
-          }
-        },
-        "cases": {
-          "properties": {
-            "closed_at": {
-              "type": "date"
-            },
-            "closed_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "connector": {
-              "properties": {
-                "fields": {
-                  "properties": {
-                    "key": {
-                      "type": "text"
-                    },
-                    "value": {
-                      "type": "text"
-                    }
-                  }
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "description": {
-              "type": "text"
-            },
-            "external_service": {
-              "properties": {
-                "connector_id": {
-                  "type": "keyword"
-                },
-                "connector_name": {
-                  "type": "keyword"
-                },
-                "external_id": {
-                  "type": "keyword"
-                },
-                "external_title": {
-                  "type": "text"
-                },
-                "external_url": {
-                  "type": "text"
-                },
-                "pushed_at": {
-                  "type": "date"
-                },
-                "pushed_by": {
-                  "properties": {
-                    "email": {
-                      "type": "keyword"
-                    },
-                    "full_name": {
-                      "type": "keyword"
-                    },
-                    "username": {
-                      "type": "keyword"
-                    }
-                  }
-                }
-              }
-            },
-            "settings": {
-              "properties": {
-                "syncAlerts": {
-                  "type": "boolean"
-                }
-              }
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "tags": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-comments": {
-          "properties": {
-            "alertId": {
-              "type": "keyword"
-            },
-            "associationType": {
-              "type": "keyword"
-            },
-            "comment": {
-              "type": "text"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "index": {
-              "type": "keyword"
-            },
-            "pushed_at": {
-              "type": "date"
-            },
-            "pushed_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "rule": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-configure": {
-          "properties": {
-            "closure_type": {
-              "type": "keyword"
-            },
-            "connector": {
-              "properties": {
-                "fields": {
-                  "properties": {
-                    "key": {
-                      "type": "text"
-                    },
-                    "value": {
-                      "type": "text"
-                    }
-                  }
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "text"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-connector-mappings": {
-          "properties": {
-            "mappings": {
-              "properties": {
-                "action_type": {
-                  "type": "keyword"
-                },
-                "source": {
-                  "type": "keyword"
-                },
-                "target": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-sub-case": {
-          "properties": {
-            "closed_at": {
-              "type": "date"
-            },
-            "closed_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            }
-          }
-        },
-        "cases-user-actions": {
-          "properties": {
-            "action": {
-              "type": "keyword"
-            },
-            "action_at": {
-              "type": "date"
-            },
-            "action_by": {
-              "properties": {
-                "email": {
-                  "type": "keyword"
-                },
-                "full_name": {
-                  "type": "keyword"
-                },
-                "username": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "action_field": {
-              "type": "keyword"
-            },
-            "new_value": {
-              "type": "text"
-            },
-            "old_value": {
-              "type": "text"
-            }
-          }
-        },
-        "config": {
-          "dynamic": "false",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            }
-          }
-        },
-        "core-usage-stats": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "coreMigrationVersion": {
-          "type": "keyword"
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "doc_values": false,
-              "index": false,
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "index": false,
-              "type": "text"
-            },
-            "panelsJSON": {
-              "index": false,
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "keyword"
-                },
-                "pause": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "boolean"
-                },
-                "section": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "integer"
-                },
-                "value": {
-                  "doc_values": false,
-                  "index": false,
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "doc_values": false,
-              "index": false,
-              "type": "boolean"
-            },
-            "timeTo": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "endpoint:user-artifact": {
-          "properties": {
-            "body": {
-              "type": "binary"
-            },
-            "compressionAlgorithm": {
-              "index": false,
-              "type": "keyword"
-            },
-            "created": {
-              "index": false,
-              "type": "date"
-            },
-            "decodedSha256": {
-              "index": false,
-              "type": "keyword"
-            },
-            "decodedSize": {
-              "index": false,
-              "type": "long"
-            },
-            "encodedSha256": {
-              "type": "keyword"
-            },
-            "encodedSize": {
-              "index": false,
-              "type": "long"
-            },
-            "encryptionAlgorithm": {
-              "index": false,
-              "type": "keyword"
-            },
-            "identifier": {
-              "type": "keyword"
-            }
-          }
-        },
-        "endpoint:user-artifact-manifest": {
-          "properties": {
-            "artifacts": {
-              "properties": {
-                "artifactId": {
-                  "index": false,
-                  "type": "keyword"
-                },
-                "policyId": {
-                  "index": false,
-                  "type": "keyword"
-                }
-              },
-              "type": "nested"
-            },
-            "created": {
-              "index": false,
-              "type": "date"
-            },
-            "schemaVersion": {
-              "type": "keyword"
-            },
-            "semanticVersion": {
-              "index": false,
-              "type": "keyword"
-            }
-          }
-        },
-        "enterprise_search_telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "epm-packages": {
-          "properties": {
-            "es_index_patterns": {
-              "enabled": false,
-              "type": "object"
-            },
-            "install_source": {
-              "type": "keyword"
-            },
-            "install_started_at": {
-              "type": "date"
-            },
-            "install_status": {
-              "type": "keyword"
-            },
-            "install_version": {
-              "type": "keyword"
-            },
-            "installed_es": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              },
-              "type": "nested"
-            },
-            "installed_kibana": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              },
-              "type": "nested"
-            },
-            "internal": {
-              "type": "boolean"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "package_assets": {
-              "properties": {
-                "id": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              },
-              "type": "nested"
-            },
-            "removable": {
-              "type": "boolean"
-            },
-            "version": {
-              "type": "keyword"
-            }
-          }
-        },
-        "epm-packages-assets": {
-          "properties": {
-            "asset_path": {
-              "type": "keyword"
-            },
-            "data_base64": {
-              "type": "binary"
-            },
-            "data_utf8": {
-              "index": false,
-              "type": "text"
-            },
-            "install_source": {
-              "type": "keyword"
-            },
-            "media_type": {
-              "type": "keyword"
-            },
-            "package_name": {
-              "type": "keyword"
-            },
-            "package_version": {
-              "type": "keyword"
-            }
-          }
-        },
-        "exception-list": {
-          "properties": {
-            "_tags": {
-              "type": "keyword"
-            },
-            "comments": {
-              "properties": {
-                "comment": {
-                  "type": "keyword"
-                },
-                "created_at": {
-                  "type": "keyword"
-                },
-                "created_by": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "updated_at": {
-                  "type": "keyword"
-                },
-                "updated_by": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "created_at": {
-              "type": "keyword"
-            },
-            "created_by": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "keyword"
-            },
-            "entries": {
-              "properties": {
-                "entries": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "operator": {
-                      "type": "keyword"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "fields": {
-                        "text": {
-                          "type": "text"
-                        }
-                      },
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "field": {
-                  "type": "keyword"
-                },
-                "list": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "operator": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "value": {
-                  "fields": {
-                    "text": {
-                      "type": "text"
-                    }
-                  },
-                  "type": "keyword"
-                }
-              }
-            },
-            "immutable": {
-              "type": "boolean"
-            },
-            "item_id": {
-              "type": "keyword"
-            },
-            "list_id": {
-              "type": "keyword"
-            },
-            "list_type": {
-              "type": "keyword"
-            },
-            "meta": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "text": {
-                  "type": "text"
-                }
-              },
-              "type": "keyword"
-            },
-            "os_types": {
-              "type": "keyword"
-            },
-            "tags": {
-              "fields": {
-                "text": {
-                  "type": "text"
-                }
-              },
-              "type": "keyword"
-            },
-            "tie_breaker_id": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_by": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            }
-          }
-        },
-        "exception-list-agnostic": {
-          "properties": {
-            "_tags": {
-              "type": "keyword"
-            },
-            "comments": {
-              "properties": {
-                "comment": {
-                  "type": "keyword"
-                },
-                "created_at": {
-                  "type": "keyword"
-                },
-                "created_by": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "updated_at": {
-                  "type": "keyword"
-                },
-                "updated_by": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "created_at": {
-              "type": "keyword"
-            },
-            "created_by": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "keyword"
-            },
-            "entries": {
-              "properties": {
-                "entries": {
-                  "properties": {
-                    "field": {
-                      "type": "keyword"
-                    },
-                    "operator": {
-                      "type": "keyword"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "fields": {
-                        "text": {
-                          "type": "text"
-                        }
-                      },
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "field": {
-                  "type": "keyword"
-                },
-                "list": {
-                  "properties": {
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    }
-                  }
-                },
-                "operator": {
-                  "type": "keyword"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "value": {
-                  "fields": {
-                    "text": {
-                      "type": "text"
-                    }
-                  },
-                  "type": "keyword"
-                }
-              }
-            },
-            "immutable": {
-              "type": "boolean"
-            },
-            "item_id": {
-              "type": "keyword"
-            },
-            "list_id": {
-              "type": "keyword"
-            },
-            "list_type": {
-              "type": "keyword"
-            },
-            "meta": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "text": {
-                  "type": "text"
-                }
-              },
-              "type": "keyword"
-            },
-            "os_types": {
-              "type": "keyword"
-            },
-            "tags": {
-              "fields": {
-                "text": {
-                  "type": "text"
-                }
-              },
-              "type": "keyword"
-            },
-            "tie_breaker_id": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_by": {
-              "type": "keyword"
-            },
-            "version": {
-              "type": "keyword"
-            }
-          }
-        },
-        "file-upload-usage-collection-telemetry": {
-          "properties": {
-            "file_upload": {
-              "properties": {
-                "index_creation_count": {
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
-        "fleet-agent-actions": {
-          "properties": {
-            "ack_data": {
-              "type": "text"
-            },
-            "agent_id": {
-              "type": "keyword"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "data": {
-              "type": "binary"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "policy_revision": {
-              "type": "integer"
-            },
-            "sent_at": {
-              "type": "date"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "fleet-agent-events": {
-          "properties": {
-            "action_id": {
-              "type": "keyword"
-            },
-            "agent_id": {
-              "type": "keyword"
-            },
-            "data": {
-              "type": "text"
-            },
-            "message": {
-              "type": "text"
-            },
-            "payload": {
-              "type": "text"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "stream_id": {
-              "type": "keyword"
-            },
-            "subtype": {
-              "type": "keyword"
-            },
-            "timestamp": {
-              "type": "date"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "fleet-agents": {
-          "properties": {
-            "access_api_key_id": {
-              "type": "keyword"
-            },
-            "active": {
-              "type": "boolean"
-            },
-            "current_error_events": {
-              "index": false,
-              "type": "text"
-            },
-            "default_api_key": {
-              "type": "binary"
-            },
-            "default_api_key_id": {
-              "type": "keyword"
-            },
-            "enrolled_at": {
-              "type": "date"
-            },
-            "last_checkin": {
-              "type": "date"
-            },
-            "last_checkin_status": {
-              "type": "keyword"
-            },
-            "last_updated": {
-              "type": "date"
-            },
-            "local_metadata": {
-              "type": "flattened"
-            },
-            "packages": {
-              "type": "keyword"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "policy_revision": {
-              "type": "integer"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "unenrolled_at": {
-              "type": "date"
-            },
-            "unenrollment_started_at": {
-              "type": "date"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "upgrade_started_at": {
-              "type": "date"
-            },
-            "upgraded_at": {
-              "type": "date"
-            },
-            "user_provided_metadata": {
-              "type": "flattened"
-            },
-            "version": {
-              "type": "keyword"
-            }
-          }
-        },
-        "fleet-enrollment-api-keys": {
-          "properties": {
-            "active": {
-              "type": "boolean"
-            },
-            "api_key": {
-              "type": "binary"
-            },
-            "api_key_id": {
-              "type": "keyword"
-            },
-            "created_at": {
-              "type": "date"
-            },
-            "expire_at": {
-              "type": "date"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            }
-          }
-        },
-        "graph-workspace": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "legacyIndexPatternRef": {
-              "index": false,
-              "type": "text"
-            },
-            "numLinks": {
-              "type": "integer"
-            },
-            "numVertices": {
-              "type": "integer"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "wsState": {
-              "type": "text"
-            }
-          }
-        },
-        "index-pattern": {
-          "dynamic": "false",
-          "properties": {
-            "title": {
-              "type": "text"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "infrastructure-ui-source": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "ingest-agent-policies": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "is_default": {
-              "type": "boolean"
-            },
-            "is_default_fleet_server": {
-              "type": "boolean"
-            },
-            "is_managed": {
-              "type": "boolean"
-            },
-            "monitoring_enabled": {
-              "index": false,
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "namespace": {
-              "type": "keyword"
-            },
-            "package_policies": {
-              "type": "keyword"
-            },
-            "revision": {
-              "type": "integer"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "type": "keyword"
-            }
-          }
-        },
-        "ingest-outputs": {
-          "properties": {
-            "ca_sha256": {
-              "index": false,
-              "type": "keyword"
-            },
-            "config": {
-              "type": "flattened"
-            },
-            "config_yaml": {
-              "type": "text"
-            },
-            "fleet_enroll_password": {
-              "type": "binary"
-            },
-            "fleet_enroll_username": {
-              "type": "binary"
-            },
-            "hosts": {
-              "type": "keyword"
-            },
-            "is_default": {
-              "type": "boolean"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "ingest-package-policies": {
-          "properties": {
-            "created_at": {
-              "type": "date"
-            },
-            "created_by": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "enabled": {
-              "type": "boolean"
-            },
-            "inputs": {
-              "enabled": false,
-              "properties": {
-                "compiled_input": {
-                  "type": "flattened"
-                },
-                "config": {
-                  "type": "flattened"
-                },
-                "enabled": {
-                  "type": "boolean"
-                },
-                "streams": {
-                  "properties": {
-                    "compiled_stream": {
-                      "type": "flattened"
-                    },
-                    "config": {
-                      "type": "flattened"
-                    },
-                    "data_stream": {
-                      "properties": {
-                        "dataset": {
-                          "type": "keyword"
-                        },
-                        "type": {
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "enabled": {
-                      "type": "boolean"
-                    },
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "vars": {
-                      "type": "flattened"
-                    }
-                  },
-                  "type": "nested"
-                },
-                "type": {
-                  "type": "keyword"
-                },
-                "vars": {
-                  "type": "flattened"
-                }
-              },
-              "type": "nested"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "namespace": {
-              "type": "keyword"
-            },
-            "output_id": {
-              "type": "keyword"
-            },
-            "package": {
-              "properties": {
-                "name": {
-                  "type": "keyword"
-                },
-                "title": {
-                  "type": "keyword"
-                },
-                "version": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "policy_id": {
-              "type": "keyword"
-            },
-            "revision": {
-              "type": "integer"
-            },
-            "updated_at": {
-              "type": "date"
-            },
-            "updated_by": {
-              "type": "keyword"
-            }
-          }
-        },
-        "ingest_manager_settings": {
-          "properties": {
-            "has_seen_add_data_notice": {
-              "index": false,
-              "type": "boolean"
-            },
-            "kibana_ca_sha256": {
-              "type": "keyword"
-            },
-            "kibana_urls": {
-              "type": "keyword"
-            }
-          }
-        },
-        "inventory-view": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "kql-telemetry": {
-          "properties": {
-            "optInCount": {
-              "type": "long"
-            },
-            "optOutCount": {
-              "type": "long"
-            }
-          }
-        },
-        "legacy-url-alias": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "lens": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "expression": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "state": {
-              "type": "flattened"
-            },
-            "title": {
-              "type": "text"
-            },
-            "visualizationType": {
-              "type": "keyword"
-            }
-          }
-        },
-        "lens-ui-telemetry": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            },
-            "date": {
-              "type": "date"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "map": {
-          "properties": {
-            "bounds": {
-              "dynamic": "false",
-              "type": "object"
-            },
-            "description": {
-              "type": "text"
-            },
-            "layerListJSON": {
-              "type": "text"
-            },
-            "mapStateJSON": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "maps-telemetry": {
-          "enabled": false,
-          "type": "object"
-        },
-        "metrics-explorer-view": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "migrationVersion": {
-          "dynamic": "true",
-          "properties": {
-            "config": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "dashboard": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "index-pattern": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "visualization": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "ml-job": {
-          "properties": {
-            "datafeed_id": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "job_id": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          }
-        },
-        "ml-module": {
-          "dynamic": "false",
-          "properties": {
-            "datafeeds": {
-              "type": "object"
-            },
-            "defaultIndexPattern": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "description": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "id": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "jobs": {
-              "type": "object"
-            },
-            "logo": {
-              "type": "object"
-            },
-            "query": {
-              "type": "object"
-            },
-            "title": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "type": {
-              "fields": {
-                "keyword": {
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "monitoring-telemetry": {
-          "properties": {
-            "reportedClusterUuids": {
-              "type": "keyword"
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "namespaces": {
-          "type": "keyword"
-        },
-        "originId": {
-          "type": "keyword"
-        },
-        "query": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "filters": {
-              "enabled": false,
-              "type": "object"
-            },
-            "query": {
-              "properties": {
-                "language": {
-                  "type": "keyword"
-                },
-                "query": {
-                  "index": false,
-                  "type": "keyword"
-                }
-              }
-            },
-            "timefilter": {
-              "enabled": false,
-              "type": "object"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "sample-data-telemetry": {
-          "properties": {
-            "installCount": {
-              "type": "long"
-            },
-            "unInstallCount": {
-              "type": "long"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "grid": {
-              "enabled": false,
-              "type": "object"
-            },
-            "hideChart": {
-              "doc_values": false,
-              "index": false,
-              "type": "boolean"
-            },
-            "hits": {
-              "doc_values": false,
-              "index": false,
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "search-session": {
-          "properties": {
-            "appId": {
-              "type": "keyword"
-            },
-            "created": {
-              "type": "date"
-            },
-            "expires": {
-              "type": "date"
-            },
-            "idMapping": {
-              "enabled": false,
-              "type": "object"
-            },
-            "initialState": {
-              "enabled": false,
-              "type": "object"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "persisted": {
-              "type": "boolean"
-            },
-            "realmName": {
-              "type": "keyword"
-            },
-            "realmType": {
-              "type": "keyword"
-            },
-            "restoreState": {
-              "enabled": false,
-              "type": "object"
-            },
-            "sessionId": {
-              "type": "keyword"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "touched": {
-              "type": "date"
-            },
-            "urlGeneratorId": {
-              "type": "keyword"
-            },
-            "username": {
-              "type": "keyword"
-            }
-          }
-        },
-        "search-telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "security-solution-signals-migration": {
-          "properties": {
-            "created": {
-              "index": false,
-              "type": "date"
-            },
-            "createdBy": {
-              "index": false,
-              "type": "text"
-            },
-            "destinationIndex": {
-              "index": false,
-              "type": "keyword"
-            },
-            "error": {
-              "index": false,
-              "type": "text"
-            },
-            "sourceIndex": {
-              "type": "keyword"
-            },
-            "status": {
-              "index": false,
-              "type": "keyword"
-            },
-            "taskId": {
-              "index": false,
-              "type": "keyword"
-            },
-            "updated": {
-              "index": false,
-              "type": "date"
-            },
-            "updatedBy": {
-              "index": false,
-              "type": "text"
-            },
-            "version": {
-              "type": "long"
-            }
-          }
-        },
-        "server": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "siem-detection-engine-rule-actions": {
-          "properties": {
-            "actions": {
-              "properties": {
-                "action_type_id": {
-                  "type": "keyword"
-                },
-                "group": {
-                  "type": "keyword"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "params": {
-                  "enabled": false,
-                  "type": "object"
-                }
-              }
-            },
-            "alertThrottle": {
-              "type": "keyword"
-            },
-            "ruleAlertId": {
-              "type": "keyword"
-            },
-            "ruleThrottle": {
-              "type": "keyword"
-            }
-          }
-        },
-        "siem-detection-engine-rule-status": {
-          "properties": {
-            "alertId": {
-              "type": "keyword"
-            },
-            "bulkCreateTimeDurations": {
-              "type": "float"
-            },
-            "gap": {
-              "type": "text"
-            },
-            "lastFailureAt": {
-              "type": "date"
-            },
-            "lastFailureMessage": {
-              "type": "text"
-            },
-            "lastLookBackDate": {
-              "type": "date"
-            },
-            "lastSuccessAt": {
-              "type": "date"
-            },
-            "lastSuccessMessage": {
-              "type": "text"
-            },
-            "searchAfterTimeDurations": {
-              "type": "float"
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "statusDate": {
-              "type": "date"
-            }
-          }
-        },
-        "siem-ui-timeline": {
-          "properties": {
-            "columns": {
-              "properties": {
-                "aggregatable": {
-                  "type": "boolean"
-                },
-                "category": {
-                  "type": "keyword"
-                },
-                "columnHeaderType": {
-                  "type": "keyword"
-                },
-                "description": {
-                  "type": "text"
-                },
-                "example": {
-                  "type": "text"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "indexes": {
-                  "type": "keyword"
-                },
-                "name": {
-                  "type": "text"
-                },
-                "placeholder": {
-                  "type": "text"
-                },
-                "searchable": {
-                  "type": "boolean"
-                },
-                "type": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "created": {
-              "type": "date"
-            },
-            "createdBy": {
-              "type": "text"
-            },
-            "dataProviders": {
-              "properties": {
-                "and": {
-                  "properties": {
-                    "enabled": {
-                      "type": "boolean"
-                    },
-                    "excluded": {
-                      "type": "boolean"
-                    },
-                    "id": {
-                      "type": "keyword"
-                    },
-                    "kqlQuery": {
-                      "type": "text"
-                    },
-                    "name": {
-                      "type": "text"
-                    },
-                    "queryMatch": {
-                      "properties": {
-                        "displayField": {
-                          "type": "text"
-                        },
-                        "displayValue": {
-                          "type": "text"
-                        },
-                        "field": {
-                          "type": "text"
-                        },
-                        "operator": {
-                          "type": "text"
-                        },
-                        "value": {
-                          "type": "text"
-                        }
-                      }
-                    },
-                    "type": {
-                      "type": "text"
-                    }
-                  }
-                },
-                "enabled": {
-                  "type": "boolean"
-                },
-                "excluded": {
-                  "type": "boolean"
-                },
-                "id": {
-                  "type": "keyword"
-                },
-                "kqlQuery": {
-                  "type": "text"
-                },
-                "name": {
-                  "type": "text"
-                },
-                "queryMatch": {
-                  "properties": {
-                    "displayField": {
-                      "type": "text"
-                    },
-                    "displayValue": {
-                      "type": "text"
-                    },
-                    "field": {
-                      "type": "text"
-                    },
-                    "operator": {
-                      "type": "text"
-                    },
-                    "value": {
-                      "type": "text"
-                    }
-                  }
-                },
-                "type": {
-                  "type": "text"
-                }
-              }
-            },
-            "dateRange": {
-              "properties": {
-                "end": {
-                  "type": "date"
-                },
-                "start": {
-                  "type": "date"
-                }
-              }
-            },
-            "description": {
-              "type": "text"
-            },
-            "eqlOptions": {
-              "properties": {
-                "eventCategoryField": {
-                  "type": "text"
-                },
-                "query": {
-                  "type": "text"
-                },
-                "size": {
-                  "type": "text"
-                },
-                "tiebreakerField": {
-                  "type": "text"
-                },
-                "timestampField": {
-                  "type": "text"
-                }
-              }
-            },
-            "eventType": {
-              "type": "keyword"
-            },
-            "excludedRowRendererIds": {
-              "type": "text"
-            },
-            "favorite": {
-              "properties": {
-                "favoriteDate": {
-                  "type": "date"
-                },
-                "fullName": {
-                  "type": "text"
-                },
-                "keySearch": {
-                  "type": "text"
-                },
-                "userName": {
-                  "type": "text"
-                }
-              }
-            },
-            "filters": {
-              "properties": {
-                "exists": {
-                  "type": "text"
-                },
-                "match_all": {
-                  "type": "text"
-                },
-                "meta": {
-                  "properties": {
-                    "alias": {
-                      "type": "text"
-                    },
-                    "controlledBy": {
-                      "type": "text"
-                    },
-                    "disabled": {
-                      "type": "boolean"
-                    },
-                    "field": {
-                      "type": "text"
-                    },
-                    "formattedValue": {
-                      "type": "text"
-                    },
-                    "index": {
-                      "type": "keyword"
-                    },
-                    "key": {
-                      "type": "keyword"
-                    },
-                    "negate": {
-                      "type": "boolean"
-                    },
-                    "params": {
-                      "type": "text"
-                    },
-                    "type": {
-                      "type": "keyword"
-                    },
-                    "value": {
-                      "type": "text"
-                    }
-                  }
-                },
-                "missing": {
-                  "type": "text"
-                },
-                "query": {
-                  "type": "text"
-                },
-                "range": {
-                  "type": "text"
-                },
-                "script": {
-                  "type": "text"
-                }
-              }
-            },
-            "indexNames": {
-              "type": "text"
-            },
-            "kqlMode": {
-              "type": "keyword"
-            },
-            "kqlQuery": {
-              "properties": {
-                "filterQuery": {
-                  "properties": {
-                    "kuery": {
-                      "properties": {
-                        "expression": {
-                          "type": "text"
-                        },
-                        "kind": {
-                          "type": "keyword"
-                        }
-                      }
-                    },
-                    "serializedQuery": {
-                      "type": "text"
-                    }
-                  }
-                }
-              }
-            },
-            "savedQueryId": {
-              "type": "keyword"
-            },
-            "sort": {
-              "dynamic": "false",
-              "properties": {
-                "columnId": {
-                  "type": "keyword"
-                },
-                "columnType": {
-                  "type": "keyword"
-                },
-                "sortDirection": {
-                  "type": "keyword"
-                }
-              }
-            },
-            "status": {
-              "type": "keyword"
-            },
-            "templateTimelineId": {
-              "type": "text"
-            },
-            "templateTimelineVersion": {
-              "type": "integer"
-            },
-            "timelineType": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "updated": {
-              "type": "date"
-            },
-            "updatedBy": {
-              "type": "text"
-            }
-          }
-        },
-        "siem-ui-timeline-note": {
-          "properties": {
-            "created": {
-              "type": "date"
-            },
-            "createdBy": {
-              "type": "text"
-            },
-            "eventId": {
-              "type": "keyword"
-            },
-            "note": {
-              "type": "text"
-            },
-            "timelineId": {
-              "type": "keyword"
-            },
-            "updated": {
-              "type": "date"
-            },
-            "updatedBy": {
-              "type": "text"
-            }
-          }
-        },
-        "siem-ui-timeline-pinned-event": {
-          "properties": {
-            "created": {
-              "type": "date"
-            },
-            "createdBy": {
-              "type": "text"
-            },
-            "eventId": {
-              "type": "keyword"
-            },
-            "timelineId": {
-              "type": "keyword"
-            },
-            "updated": {
-              "type": "date"
-            },
-            "updatedBy": {
-              "type": "text"
-            }
-          }
-        },
-        "space": {
-          "properties": {
-            "_reserved": {
-              "type": "boolean"
-            },
-            "color": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "disabledFeatures": {
-              "type": "keyword"
-            },
-            "imageUrl": {
-              "index": false,
-              "type": "text"
-            },
-            "initials": {
-              "type": "keyword"
-            },
-            "name": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "spaces-usage-stats": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "tag": {
-          "properties": {
-            "color": {
-              "type": "text"
-            },
-            "description": {
-              "type": "text"
-            },
-            "name": {
-              "type": "text"
-            }
-          }
-        },
-        "telemetry": {
-          "properties": {
-            "allowChangingOptInStatus": {
-              "type": "boolean"
-            },
-            "enabled": {
-              "type": "boolean"
-            },
-            "lastReported": {
-              "type": "date"
-            },
-            "lastVersionChecked": {
-              "type": "keyword"
-            },
-            "reportFailureCount": {
-              "type": "integer"
-            },
-            "reportFailureVersion": {
-              "type": "keyword"
-            },
-            "sendUsageFrom": {
-              "type": "keyword"
-            },
-            "userHasSeenNotice": {
-              "type": "boolean"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "ui-counter": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "ui-metric": {
-          "properties": {
-            "count": {
-              "type": "integer"
-            }
-          }
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "upgrade-assistant-reindex-operation": {
-          "properties": {
-            "errorMessage": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "indexName": {
-              "type": "keyword"
-            },
-            "lastCompletedStep": {
-              "type": "long"
-            },
-            "locked": {
-              "type": "date"
-            },
-            "newIndexName": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "reindexOptions": {
-              "properties": {
-                "openAndClose": {
-                  "type": "boolean"
-                },
-                "queueSettings": {
-                  "properties": {
-                    "queuedAt": {
-                      "type": "long"
-                    },
-                    "startedAt": {
-                      "type": "long"
-                    }
-                  }
-                }
-              }
-            },
-            "reindexTaskId": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 256,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            },
-            "reindexTaskPercComplete": {
-              "type": "float"
-            },
-            "runningReindexCount": {
-              "type": "integer"
-            },
-            "status": {
-              "type": "integer"
-            }
-          }
-        },
-        "upgrade-assistant-telemetry": {
-          "properties": {
-            "features": {
-              "properties": {
-                "deprecation_logging": {
-                  "properties": {
-                    "enabled": {
-                      "null_value": true,
-                      "type": "boolean"
-                    }
-                  }
-                }
-              }
-            },
-            "ui_open": {
-              "properties": {
-                "cluster": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "indices": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "overview": {
-                  "null_value": 0,
-                  "type": "long"
-                }
-              }
-            },
-            "ui_reindex": {
-              "properties": {
-                "close": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "open": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "start": {
-                  "null_value": 0,
-                  "type": "long"
-                },
-                "stop": {
-                  "null_value": 0,
-                  "type": "long"
-                }
-              }
-            }
-          }
-        },
-        "uptime-dynamic-settings": {
-          "dynamic": "false",
-          "type": "object"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "fields": {
-                "keyword": {
-                  "ignore_above": 2048,
-                  "type": "keyword"
-                }
-              },
-              "type": "text"
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "index": false,
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchRefName": {
-              "doc_values": false,
-              "index": false,
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "index": false,
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "index": false,
-              "type": "text"
-            }
-          }
-        },
-        "workplace_search_telemetry": {
-          "dynamic": "false",
-          "type": "object"
-        }
-      }
-    },
-    "settings": {
-      "index": {
-        "number_of_replicas": "0",
-        "number_of_shards": "1"
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/data.json b/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/data.json
deleted file mode 100644
index 0c8b35fd3f499..0000000000000
--- a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/data.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:title-with-dash",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "my-visualization",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": []
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:title-with-asterisk",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "some*visualization",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": []
-    }
-  }
-}
-
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:noise-1",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "Just some noise in the dataset",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": []
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:noise-2",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "Just some noise in the dataset",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": []
-    }
-  }
-}
-
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/mappings.json b/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/mappings.json
deleted file mode 100644
index e601c43431437..0000000000000
--- a/test/api_integration/fixtures/es_archiver/saved_objects/find_edgecases/mappings.json
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "index": ".kibana",
-    "settings": {
-      "index": {
-        "number_of_shards": "1",
-        "number_of_replicas": "1"
-      }
-    },
-    "mappings": {
-      "dynamic": "strict",
-      "properties": {
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "defaultIndex": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 256
-                }
-              }
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 2048
-                }
-              }
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/references/data.json b/test/api_integration/fixtures/es_archiver/saved_objects/references/data.json
deleted file mode 100644
index 8b2095972bd4d..0000000000000
--- a/test/api_integration/fixtures/es_archiver/saved_objects/references/data.json
+++ /dev/null
@@ -1,120 +0,0 @@
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:only-ref-1",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "Vis with ref to ref-1",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": [
-        {
-          "type": "ref-type",
-          "id": "ref-1",
-          "name": "ref-1"
-        }
-      ]
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:ref-1-and-ref-2",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "Vis with ref to ref-1 and ref-2",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": [
-        {
-          "type": "ref-type",
-          "id": "ref-1",
-          "name": "ref-1"
-        },
-        {
-          "type": "ref-type",
-          "id": "ref-2",
-          "name": "ref-2"
-        }
-      ]
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:only-ref-2",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "Vis with ref to ref-2",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": [
-        {
-          "type": "ref-type",
-          "id": "ref-2",
-          "name": "ref-2"
-        }
-      ]
-    }
-  }
-}
-
-{
-  "type": "doc",
-  "value": {
-    "index": ".kibana",
-    "id": "visualization:only-ref-3",
-    "source": {
-      "type": "visualization",
-      "updated_at": "2017-09-21T18:51:23.794Z",
-      "visualization": {
-        "title": "Vis with ref to ref-3",
-        "visState": "{}",
-        "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
-        "description": "",
-        "version": 1,
-        "kibanaSavedObjectMeta": {
-          "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
-        }
-      },
-      "references": [
-        {
-          "type": "ref-type",
-          "id": "ref-3",
-          "name": "ref-3"
-        }
-      ]
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/references/mappings.json b/test/api_integration/fixtures/es_archiver/saved_objects/references/mappings.json
deleted file mode 100644
index e601c43431437..0000000000000
--- a/test/api_integration/fixtures/es_archiver/saved_objects/references/mappings.json
+++ /dev/null
@@ -1,267 +0,0 @@
-{
-  "type": "index",
-  "value": {
-    "index": ".kibana",
-    "settings": {
-      "index": {
-        "number_of_shards": "1",
-        "number_of_replicas": "1"
-      }
-    },
-    "mappings": {
-      "dynamic": "strict",
-      "properties": {
-        "config": {
-          "dynamic": "true",
-          "properties": {
-            "buildNum": {
-              "type": "keyword"
-            },
-            "defaultIndex": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 256
-                }
-              }
-            }
-          }
-        },
-        "dashboard": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "optionsJSON": {
-              "type": "text"
-            },
-            "panelsJSON": {
-              "type": "text"
-            },
-            "refreshInterval": {
-              "properties": {
-                "display": {
-                  "type": "keyword"
-                },
-                "pause": {
-                  "type": "boolean"
-                },
-                "section": {
-                  "type": "integer"
-                },
-                "value": {
-                  "type": "integer"
-                }
-              }
-            },
-            "timeFrom": {
-              "type": "keyword"
-            },
-            "timeRestore": {
-              "type": "boolean"
-            },
-            "timeTo": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "index-pattern": {
-          "properties": {
-            "fieldFormatMap": {
-              "type": "text"
-            },
-            "fields": {
-              "type": "text"
-            },
-            "intervalName": {
-              "type": "keyword"
-            },
-            "notExpandable": {
-              "type": "boolean"
-            },
-            "sourceFilters": {
-              "type": "text"
-            },
-            "timeFieldName": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            }
-          }
-        },
-        "search": {
-          "properties": {
-            "columns": {
-              "type": "keyword"
-            },
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "sort": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "server": {
-          "properties": {
-            "uuid": {
-              "type": "keyword"
-            }
-          }
-        },
-        "timelion-sheet": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "hits": {
-              "type": "integer"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "timelion_chart_height": {
-              "type": "integer"
-            },
-            "timelion_columns": {
-              "type": "integer"
-            },
-            "timelion_interval": {
-              "type": "keyword"
-            },
-            "timelion_other_interval": {
-              "type": "keyword"
-            },
-            "timelion_rows": {
-              "type": "integer"
-            },
-            "timelion_sheet": {
-              "type": "text"
-            },
-            "title": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            }
-          }
-        },
-        "namespace": {
-          "type": "keyword"
-        },
-        "references": {
-          "properties": {
-            "id": {
-              "type": "keyword"
-            },
-            "name": {
-              "type": "keyword"
-            },
-            "type": {
-              "type": "keyword"
-            }
-          },
-          "type": "nested"
-        },
-        "type": {
-          "type": "keyword"
-        },
-        "updated_at": {
-          "type": "date"
-        },
-        "url": {
-          "properties": {
-            "accessCount": {
-              "type": "long"
-            },
-            "accessDate": {
-              "type": "date"
-            },
-            "createDate": {
-              "type": "date"
-            },
-            "url": {
-              "type": "text",
-              "fields": {
-                "keyword": {
-                  "type": "keyword",
-                  "ignore_above": 2048
-                }
-              }
-            }
-          }
-        },
-        "visualization": {
-          "properties": {
-            "description": {
-              "type": "text"
-            },
-            "kibanaSavedObjectMeta": {
-              "properties": {
-                "searchSourceJSON": {
-                  "type": "text"
-                }
-              }
-            },
-            "savedSearchId": {
-              "type": "keyword"
-            },
-            "title": {
-              "type": "text"
-            },
-            "uiStateJSON": {
-              "type": "text"
-            },
-            "version": {
-              "type": "integer"
-            },
-            "visState": {
-              "type": "text"
-            }
-          }
-        }
-      }
-    }
-  }
-}
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/ui_counters/mappings.json b/test/api_integration/fixtures/es_archiver/saved_objects/ui_counters/mappings.json
index 39902f8a9211a..99f2f999db988 100644
--- a/test/api_integration/fixtures/es_archiver/saved_objects/ui_counters/mappings.json
+++ b/test/api_integration/fixtures/es_archiver/saved_objects/ui_counters/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/api_integration/fixtures/es_archiver/saved_objects/usage_counters/mappings.json b/test/api_integration/fixtures/es_archiver/saved_objects/usage_counters/mappings.json
index 14ed147b2da8e..c2ec5c8881087 100644
--- a/test/api_integration/fixtures/es_archiver/saved_objects/usage_counters/mappings.json
+++ b/test/api_integration/fixtures/es_archiver/saved_objects/usage_counters/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/api_integration/fixtures/es_archiver/search/count/mappings.json b/test/api_integration/fixtures/es_archiver/search/count/mappings.json
index b62c5da05c2e6..41d5c07e93239 100644
--- a/test/api_integration/fixtures/es_archiver/search/count/mappings.json
+++ b/test/api_integration/fixtures/es_archiver/search/count/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/api_integration/fixtures/kbn_archiver/index_patterns/basic_kibana.json b/test/api_integration/fixtures/kbn_archiver/index_patterns/basic_kibana.json
new file mode 100644
index 0000000000000..2fff00dd22664
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/index_patterns/basic_kibana.json
@@ -0,0 +1,15 @@
+{
+  "attributes": {
+    "fields": "[{\"name\":\"bar\",\"type\":\"boolean\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"baz\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"baz.keyword\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"foo\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"nestedField.child\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true,\"subType\":{\"nested\":{\"path\":\"nestedField\"}}}]",
+    "title": "basic_index"
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "91200a00-9efd-11e7-acb3-3dab96693fab",
+  "migrationVersion": {
+    "index-pattern": "7.11.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2017-09-21T18:49:16.270Z",
+  "version": "WzEsMl0="
+}
\ No newline at end of file
diff --git a/test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json b/test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json
new file mode 100644
index 0000000000000..da2241952ca37
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/management/saved_objects/relationships.json
@@ -0,0 +1,200 @@
+{
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "timelion_chart_height": 275,
+    "timelion_columns": 2,
+    "timelion_interval": "auto",
+    "timelion_rows": 2,
+    "timelion_sheet": [
+      ".es(*)"
+    ],
+    "title": "New TimeLion Sheet",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "190f3e90-2ec3-11e8-ba48-69fc4e41e1f6",
+  "references": [],
+  "type": "timelion-sheet",
+  "updated_at": "2018-03-23T17:53:30.872Z",
+  "version": "WzgsMl0="
+}
+
+{
+  "attributes": {
+    "fields": "[{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+    "title": "saved_objects*"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "8963ca30-3224-11e8-a572-ffca06da1357",
+  "migrationVersion": {
+    "index-pattern": "7.11.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2018-03-28T01:08:34.290Z",
+  "version": "WzksMl0="
+}
+
+{
+  "attributes": {
+    "columns": [
+      "_source"
+    ],
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"highlightAll\":true,\"version\":true,\"query\":{\"query\":\"id:3\",\"language\":\"lucene\"},\"filter\":[],\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "sort": [
+      [
+        "_score",
+        "desc"
+      ]
+    ],
+    "title": "OneRecord",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "960372e0-3224-11e8-a572-ffca06da1357",
+  "migrationVersion": {
+    "search": "7.9.3"
+  },
+  "references": [
+    {
+      "id": "8963ca30-3224-11e8-a572-ffca06da1357",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "search",
+  "updated_at": "2018-03-28T01:08:55.182Z",
+  "version": "WzExLDJd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "savedSearchRefName": "search_0",
+    "title": "VisualizationFromSavedSearch",
+    "uiStateJSON": "{\"vis\":{\"params\":{\"sort\":{\"columnIndex\":null,\"direction\":null}}}}",
+    "version": 1,
+    "visState": "{\"title\":\"VisualizationFromSavedSearch\",\"type\":\"table\",\"params\":{\"perPage\":10,\"showPartialRows\":false,\"showMeticsAtAllLevels\":false,\"sort\":{\"columnIndex\":null,\"direction\":null},\"showTotal\":false,\"totalFunc\":\"sum\",\"showToolbar\":true},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "a42c0580-3224-11e8-a572-ffca06da1357",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "960372e0-3224-11e8-a572-ffca06da1357",
+      "name": "search_0",
+      "type": "search"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2018-03-28T01:09:18.936Z",
+  "version": "WzEyLDJd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "title": "Visualization",
+    "uiStateJSON": "{}",
+    "version": 1,
+    "visState": "{\"title\":\"Visualization\",\"type\":\"metric\",\"params\":{\"addTooltip\":true,\"addLegend\":false,\"type\":\"metric\",\"metric\":{\"percentageMode\":false,\"useRanges\":false,\"colorSchema\":\"Green to Red\",\"metricColorMode\":\"None\",\"colorsRange\":[{\"from\":0,\"to\":10000}],\"labels\":{\"show\":true},\"invertColors\":false,\"style\":{\"bgFill\":\"#000\",\"bgColor\":false,\"labelColor\":false,\"subText\":\"\",\"fontSize\":60}}},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}}]}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "add810b0-3224-11e8-a572-ffca06da1357",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "8963ca30-3224-11e8-a572-ffca06da1357",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2018-03-28T01:09:35.163Z",
+  "version": "WzEzLDJd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
+    },
+    "optionsJSON": "{\"darkTheme\":false,\"useMargins\":true,\"hidePanelTitles\":false}",
+    "panelsJSON": "[{\"version\":\"7.0.0-alpha1\",\"gridData\":{\"w\":24,\"h\":15,\"x\":0,\"y\":0,\"i\":\"1\"},\"panelIndex\":\"1\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_0\"},{\"version\":\"7.0.0-alpha1\",\"gridData\":{\"w\":24,\"h\":15,\"x\":24,\"y\":0,\"i\":\"2\"},\"panelIndex\":\"2\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_1\"}]",
+    "timeRestore": false,
+    "title": "Dashboard",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "b70c7ae0-3224-11e8-a572-ffca06da1357",
+  "migrationVersion": {
+    "dashboard": "7.11.0"
+  },
+  "references": [
+    {
+      "id": "add810b0-3224-11e8-a572-ffca06da1357",
+      "name": "panel_0",
+      "type": "visualization"
+    },
+    {
+      "id": "a42c0580-3224-11e8-a572-ffca06da1357",
+      "name": "panel_1",
+      "type": "visualization"
+    }
+  ],
+  "type": "dashboard",
+  "updated_at": "2018-03-28T01:09:50.606Z",
+  "version": "WzE0LDJd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"kuery\"}}"
+    },
+    "optionsJSON": "{}",
+    "panelsJSON": "[]",
+    "timeRestore": false,
+    "title": "Dashboard",
+    "version": 1
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "invalid-refs",
+  "migrationVersion": {
+    "dashboard": "7.11.0"
+  },
+  "references": [
+    {
+      "id": "add810b0-3224-11e8-a572-ffca06da1357",
+      "name": "valid-ref",
+      "type": "visualization"
+    },
+    {
+      "id": "invalid-vis",
+      "name": "missing-ref",
+      "type": "visualization"
+    }
+  ],
+  "type": "dashboard",
+  "updated_at": "2018-03-28T01:09:50.606Z",
+  "version": "WzE1LDJd"
+}
\ No newline at end of file
diff --git a/test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json b/test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json
new file mode 100644
index 0000000000000..4f343b81cd402
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/saved_objects/basic.json
@@ -0,0 +1,97 @@
+{
+  "attributes": {
+    "buildNum": 8467,
+    "defaultIndex": "91200a00-9efd-11e7-acb3-3dab96693fab"
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "7.0.0-alpha1",
+  "migrationVersion": {
+    "config": "7.13.0"
+  },
+  "references": [],
+  "type": "config",
+  "updated_at": "2017-09-21T18:49:16.302Z",
+  "version": "WzksMl0="
+}
+
+{
+  "attributes": {
+    "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+    "timeFieldName": "@timestamp",
+    "title": "logstash-*"
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "91200a00-9efd-11e7-acb3-3dab96693fab",
+  "migrationVersion": {
+    "index-pattern": "7.11.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2017-09-21T18:49:16.270Z",
+  "version": "WzgsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "title": "Count of requests",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{\"title\":\"Count of requests\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"filter\":true},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1,\"extended_bounds\":{}}}]}"
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "dd7caf20-9efd-11e7-acb3-3dab96693fab",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "91200a00-9efd-11e7-acb3-3dab96693fab",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzEwLDJd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
+    },
+    "optionsJSON": "{\"darkTheme\":false}",
+    "panelsJSON": "[{\"version\":\"7.3.0\",\"type\":\"visualization\",\"gridData\":{\"x\":0,\"y\":0,\"w\":24,\"h\":12,\"i\":\"1\"},\"panelIndex\":\"1\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_1\"}]",
+    "refreshInterval": {
+      "display": "Off",
+      "pause": false,
+      "value": 0
+    },
+    "timeFrom": "Wed Sep 16 2015 22:52:17 GMT-0700",
+    "timeRestore": true,
+    "timeTo": "Fri Sep 18 2015 12:24:38 GMT-0700",
+    "title": "Requests",
+    "version": 1
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "be3733a0-9efe-11e7-acb3-3dab96693fab",
+  "migrationVersion": {
+    "dashboard": "7.11.0"
+  },
+  "references": [
+    {
+      "id": "dd7caf20-9efd-11e7-acb3-3dab96693fab",
+      "name": "1:panel_1",
+      "type": "visualization"
+    }
+  ],
+  "type": "dashboard",
+  "updated_at": "2017-09-21T18:57:40.826Z",
+  "version": "WzExLDJd"
+}
\ No newline at end of file
diff --git a/test/api_integration/fixtures/kbn_archiver/saved_objects/basic/foo-ns.json b/test/api_integration/fixtures/kbn_archiver/saved_objects/basic/foo-ns.json
new file mode 100644
index 0000000000000..736abf331d314
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/saved_objects/basic/foo-ns.json
@@ -0,0 +1,97 @@
+{
+  "attributes": {
+    "buildNum": 8467,
+    "defaultIndex": "91200a00-9efd-11e7-acb3-3dab96693fab"
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "7.0.0-alpha1",
+  "migrationVersion": {
+    "config": "7.13.0"
+  },
+  "references": [],
+  "type": "config",
+  "updated_at": "2017-09-21T18:49:16.302Z",
+  "version": "WzEzLDJd"
+}
+
+{
+  "attributes": {
+    "fields": "[{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"searchable\":false,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":false},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":false,\"readFromDocValues\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"searchable\":true,\"aggregatable\":true,\"readFromDocValues\":true}]",
+    "timeFieldName": "@timestamp",
+    "title": "logstash-*"
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "91200a00-9efd-11e7-acb3-3dab96693fab",
+  "migrationVersion": {
+    "index-pattern": "7.11.0"
+  },
+  "references": [],
+  "type": "index-pattern",
+  "updated_at": "2017-09-21T18:49:16.270Z",
+  "version": "WzEyLDJd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"indexRefName\":\"kibanaSavedObjectMeta.searchSourceJSON.index\"}"
+    },
+    "title": "Count of requests",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{\"title\":\"Count of requests\",\"type\":\"area\",\"params\":{\"type\":\"area\",\"grid\":{\"categoryLines\":false,\"style\":{\"color\":\"#eee\"}},\"categoryAxes\":[{\"id\":\"CategoryAxis-1\",\"type\":\"category\",\"position\":\"bottom\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\"},\"labels\":{\"show\":true,\"truncate\":100,\"filter\":true},\"title\":{}}],\"valueAxes\":[{\"id\":\"ValueAxis-1\",\"name\":\"LeftAxis-1\",\"type\":\"value\",\"position\":\"left\",\"show\":true,\"style\":{},\"scale\":{\"type\":\"linear\",\"mode\":\"normal\"},\"labels\":{\"show\":true,\"rotate\":0,\"filter\":false,\"truncate\":100},\"title\":{\"text\":\"Count\"}}],\"seriesParams\":[{\"show\":\"true\",\"type\":\"area\",\"mode\":\"stacked\",\"data\":{\"label\":\"Count\",\"id\":\"1\"},\"drawLinesBetweenPoints\":true,\"showCircles\":true,\"interpolate\":\"linear\",\"valueAxis\":\"ValueAxis-1\"}],\"addTooltip\":true,\"addLegend\":true,\"legendPosition\":\"right\",\"times\":[],\"addTimeMarker\":false,\"palette\":{\"type\":\"palette\",\"name\":\"kibana_palette\"},\"isVislibVis\":true,\"detailedTooltip\":true,\"fittingFunction\":\"zero\"},\"aggs\":[{\"id\":\"1\",\"enabled\":true,\"type\":\"count\",\"schema\":\"metric\",\"params\":{}},{\"id\":\"2\",\"enabled\":true,\"type\":\"date_histogram\",\"schema\":\"segment\",\"params\":{\"field\":\"@timestamp\",\"interval\":\"auto\",\"min_doc_count\":1,\"extended_bounds\":{}}}]}"
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "dd7caf20-9efd-11e7-acb3-3dab96693fab",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "91200a00-9efd-11e7-acb3-3dab96693fab",
+      "name": "kibanaSavedObjectMeta.searchSourceJSON.index",
+      "type": "index-pattern"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzE0LDJd"
+}
+
+{
+  "attributes": {
+    "description": "",
+    "hits": 0,
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"query\":{\"query\":\"\",\"language\":\"lucene\"},\"filter\":[],\"highlightAll\":true,\"version\":true}"
+    },
+    "optionsJSON": "{\"darkTheme\":false}",
+    "panelsJSON": "[{\"version\":\"7.3.0\",\"type\":\"visualization\",\"gridData\":{\"x\":0,\"y\":0,\"w\":24,\"h\":12,\"i\":\"1\"},\"panelIndex\":\"1\",\"embeddableConfig\":{\"enhancements\":{}},\"panelRefName\":\"panel_1\"}]",
+    "refreshInterval": {
+      "display": "Off",
+      "pause": false,
+      "value": 0
+    },
+    "timeFrom": "Wed Sep 16 2015 22:52:17 GMT-0700",
+    "timeRestore": true,
+    "timeTo": "Fri Sep 18 2015 12:24:38 GMT-0700",
+    "title": "Requests",
+    "version": 1
+  },
+  "coreMigrationVersion": "7.14.0",
+  "id": "be3733a0-9efe-11e7-acb3-3dab96693fab",
+  "migrationVersion": {
+    "dashboard": "7.11.0"
+  },
+  "references": [
+    {
+      "id": "dd7caf20-9efd-11e7-acb3-3dab96693fab",
+      "name": "1:panel_1",
+      "type": "visualization"
+    }
+  ],
+  "type": "dashboard",
+  "updated_at": "2017-09-21T18:57:40.826Z",
+  "version": "WzE1LDJd"
+}
\ No newline at end of file
diff --git a/test/api_integration/fixtures/kbn_archiver/saved_objects/find_edgecases.json b/test/api_integration/fixtures/kbn_archiver/saved_objects/find_edgecases.json
new file mode 100644
index 0000000000000..7b181e10b958f
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/saved_objects/find_edgecases.json
@@ -0,0 +1,87 @@
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "Just some noise in the dataset",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "noise-1",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzYsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "Just some noise in the dataset",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "noise-2",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzcsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "some*visualization",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "title-with-asterisk",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzUsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "my-visualization",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "title-with-dash",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzQsMl0="
+}
\ No newline at end of file
diff --git a/test/api_integration/fixtures/kbn_archiver/saved_objects/references.json b/test/api_integration/fixtures/kbn_archiver/saved_objects/references.json
new file mode 100644
index 0000000000000..1da6ed3731e32
--- /dev/null
+++ b/test/api_integration/fixtures/kbn_archiver/saved_objects/references.json
@@ -0,0 +1,116 @@
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "Vis with ref to ref-1",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "only-ref-1",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "ref-1",
+      "name": "ref-1",
+      "type": "ref-type"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzQsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "Vis with ref to ref-2",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "only-ref-2",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "ref-2",
+      "name": "ref-2",
+      "type": "ref-type"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzYsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "Vis with ref to ref-3",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "only-ref-3",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "ref-3",
+      "name": "ref-3",
+      "type": "ref-type"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzcsMl0="
+}
+
+{
+  "attributes": {
+    "description": "",
+    "kibanaSavedObjectMeta": {
+      "searchSourceJSON": "{\"filter\":[],\"query\":{\"query\":\"\",\"language\":\"lucene\"}}"
+    },
+    "title": "Vis with ref to ref-1 and ref-2",
+    "uiStateJSON": "{\"spy\":{\"mode\":{\"name\":null,\"fill\":false}}}",
+    "version": 1,
+    "visState": "{}"
+  },
+  "coreMigrationVersion": "8.0.0",
+  "id": "ref-1-and-ref-2",
+  "migrationVersion": {
+    "visualization": "7.13.0"
+  },
+  "references": [
+    {
+      "id": "ref-1",
+      "name": "ref-1",
+      "type": "ref-type"
+    },
+    {
+      "id": "ref-2",
+      "name": "ref-2",
+      "type": "ref-type"
+    }
+  ],
+  "type": "visualization",
+  "updated_at": "2017-09-21T18:51:23.794Z",
+  "version": "WzUsMl0="
+}
\ No newline at end of file
diff --git a/test/common/services/es_archiver.ts b/test/common/services/es_archiver.ts
index 742ba74c0dcaf..d99a2e8d10236 100644
--- a/test/common/services/es_archiver.ts
+++ b/test/common/services/es_archiver.ts
@@ -19,15 +19,8 @@ export function EsArchiverProvider({ getService }: FtrProviderContext): EsArchiv
   const kibanaServer = getService('kibanaServer');
   const retry = getService('retry');
 
-  if (!config.get('esArchiver')) {
-    throw new Error(`esArchiver can't be used unless you specify it's config in your config file`);
-  }
-
-  const dataDir = config.get('esArchiver.directory');
-
   const esArchiver = new EsArchiver({
     client,
-    dataDir,
     log,
     kbnClient: kibanaServer,
   });
diff --git a/test/common/services/kibana_server/extend_es_archiver.js b/test/common/services/kibana_server/extend_es_archiver.js
deleted file mode 100644
index 9a06dd7b74969..0000000000000
--- a/test/common/services/kibana_server/extend_es_archiver.js
+++ /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 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 ES_ARCHIVER_LOAD_METHODS = ['load', 'loadIfNeeded', 'unload', 'emptyKibanaIndex'];
-const KIBANA_INDEX = '.kibana';
-
-export function extendEsArchiver({ esArchiver, kibanaServer, retry, defaults }) {
-  // only extend the esArchiver if there are default uiSettings to restore
-  if (!defaults) {
-    return;
-  }
-
-  ES_ARCHIVER_LOAD_METHODS.forEach((method) => {
-    const originalMethod = esArchiver[method];
-
-    esArchiver[method] = async (...args) => {
-      // esArchiver methods return a stats object, with information about the indexes created
-      const stats = await originalMethod.apply(esArchiver, args);
-
-      const statsKeys = Object.keys(stats);
-      const kibanaKeys = statsKeys.filter(
-        // this also matches stats keys like '.kibana_1' and '.kibana_2,.kibana_1'
-        (key) => key.includes(KIBANA_INDEX) && stats[key].created
-      );
-
-      // if the kibana index was created by the esArchiver then update the uiSettings
-      // with the defaults to make sure that they are always in place initially
-      if (kibanaKeys.length > 0) {
-        await retry.try(async () => {
-          await kibanaServer.uiSettings.update(defaults);
-        });
-      }
-
-      return stats;
-    };
-  });
-}
diff --git a/test/common/services/kibana_server/extend_es_archiver.ts b/test/common/services/kibana_server/extend_es_archiver.ts
new file mode 100644
index 0000000000000..98c28960bf523
--- /dev/null
+++ b/test/common/services/kibana_server/extend_es_archiver.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 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 { ProvidedType } from '@kbn/test';
+
+import type { EsArchiverProvider } from '../es_archiver';
+import type { RetryService } from '../retry';
+import type { KibanaServerProvider } from './kibana_server';
+
+const ES_ARCHIVER_LOAD_METHODS = ['load', 'loadIfNeeded', 'unload', 'emptyKibanaIndex'] as const;
+const KIBANA_INDEX = '.kibana';
+
+interface Options {
+  esArchiver: ProvidedType<typeof EsArchiverProvider>;
+  kibanaServer: ProvidedType<typeof KibanaServerProvider>;
+  retry: RetryService;
+  defaults: Record<string, any>;
+}
+
+export function extendEsArchiver({ esArchiver, kibanaServer, retry, defaults }: Options) {
+  // only extend the esArchiver if there are default uiSettings to restore
+  if (!defaults) {
+    return;
+  }
+
+  ES_ARCHIVER_LOAD_METHODS.forEach((method) => {
+    const originalMethod = esArchiver[method];
+
+    esArchiver[method] = async (...args: unknown[]) => {
+      // esArchiver methods return a stats object, with information about the indexes created
+      const stats = await originalMethod.apply(esArchiver, args as any);
+
+      const statsKeys = Object.keys(stats);
+      const kibanaKeys = statsKeys.filter(
+        // this also matches stats keys like '.kibana_1' and '.kibana_2,.kibana_1'
+        (key) => key.includes(KIBANA_INDEX) && stats[key].created
+      );
+
+      // if the kibana index was created by the esArchiver then update the uiSettings
+      // with the defaults to make sure that they are always in place initially
+      if (kibanaKeys.length > 0) {
+        await retry.try(async () => {
+          await kibanaServer.uiSettings.update(defaults);
+        });
+      }
+
+      return stats;
+    };
+  });
+}
diff --git a/test/common/services/kibana_server/index.ts b/test/common/services/kibana_server/index.ts
index 7f727179032f2..2a749de2b4ce8 100644
--- a/test/common/services/kibana_server/index.ts
+++ b/test/common/services/kibana_server/index.ts
@@ -7,5 +7,4 @@
  */
 
 export { KibanaServerProvider } from './kibana_server';
-// @ts-ignore
 export { extendEsArchiver } from './extend_es_archiver';
diff --git a/test/common/services/saved_object_info.ts b/test/common/services/saved_object_info.ts
index 1558b364f5391..2be1763650894 100644
--- a/test/common/services/saved_object_info.ts
+++ b/test/common/services/saved_object_info.ts
@@ -8,7 +8,7 @@
 
 import { inspect } from 'util';
 
-import { TermsAggregate } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 
 import { FtrService } from '../ftr_provider_context';
 
@@ -32,7 +32,7 @@ export class SavedObjectInfoService extends FtrService {
       });
 
       const agg = body.aggregations?.savedobjs as
-        | TermsAggregate<{ key: string; doc_count: number }>
+        | estypes.AggregationsTermsAggregate<{ key: string; doc_count: number }>
         | undefined;
 
       if (!agg?.buckets) {
diff --git a/test/examples/config.js b/test/examples/config.js
index 1ee095fbdedeb..cb6c487c564c3 100644
--- a/test/examples/config.js
+++ b/test/examples/config.js
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import path, { resolve } from 'path';
+import { resolve } from 'path';
 import { services } from '../plugin_functional/services';
 import fs from 'fs';
 import { KIBANA_ROOT } from '@kbn/test';
@@ -47,9 +47,6 @@ export default async function ({ readConfigFile }) {
       serverArgs: ['xpack.security.enabled=false'],
     },
     apps: functionalConfig.get('apps'),
-    esArchiver: {
-      directory: path.resolve(__dirname, '../es_archives'),
-    },
     screenshots: functionalConfig.get('screenshots'),
     junit: {
       reportName: 'Example plugin functional tests',
diff --git a/test/examples/embeddables/dashboard.ts b/test/examples/embeddables/dashboard.ts
index 597846ab6a43d..77ad5a5da9eeb 100644
--- a/test/examples/embeddables/dashboard.ts
+++ b/test/examples/embeddables/dashboard.ts
@@ -97,18 +97,24 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   const pieChart = getService('pieChart');
   const browser = getService('browser');
   const dashboardExpect = getService('dashboardExpect');
-  const PageObjects = getPageObjects(['common']);
+  const elasticChart = getService('elasticChart');
+  const PageObjects = getPageObjects(['common', 'visChart']);
 
   describe('dashboard container', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/dashboard/current/data');
-      await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/dashboard/current/kibana');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/dashboard/current/kibana'
+      );
       await PageObjects.common.navigateToApp('dashboardEmbeddableExamples');
       await testSubjects.click('dashboardEmbeddableByValue');
       await updateInput(JSON.stringify(testDashboardInput, null, 4));
     });
 
     it('pie charts', async () => {
+      if (await PageObjects.visChart.isNewChartsLibraryEnabled()) {
+        await elasticChart.setNewChartUiDebugFlag();
+      }
       await pieChart.expectPieSliceCount(5);
     });
 
diff --git a/test/functional/apps/context/_date_nanos.js b/test/functional/apps/context/_date_nanos.js
index f5408661b9c6e..35e38abc6fdb7 100644
--- a/test/functional/apps/context/_date_nanos.js
+++ b/test/functional/apps/context/_date_nanos.js
@@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) {
   describe('context view for date_nanos', () => {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos']);
-      await esArchiver.loadIfNeeded('date_nanos');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos');
       await kibanaServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN });
       await kibanaServer.uiSettings.update({
         'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`,
@@ -32,7 +32,7 @@ export default function ({ getService, getPageObjects }) {
 
     after(async function unloadMakelogs() {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('date_nanos');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos');
     });
 
     it('displays predessors - anchor - successors in right order ', async function () {
diff --git a/test/functional/apps/context/_date_nanos_custom_timestamp.js b/test/functional/apps/context/_date_nanos_custom_timestamp.js
index b837c55d821ac..a933c2f20b163 100644
--- a/test/functional/apps/context/_date_nanos_custom_timestamp.js
+++ b/test/functional/apps/context/_date_nanos_custom_timestamp.js
@@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) {
   describe('context view for date_nanos with custom timestamp', () => {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos_custom']);
-      await esArchiver.loadIfNeeded('date_nanos_custom');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos_custom');
       await kibanaServer.uiSettings.replace({ defaultIndex: TEST_INDEX_PATTERN });
       await kibanaServer.uiSettings.update({
         'context:defaultSize': `${TEST_DEFAULT_CONTEXT_SIZE}`,
@@ -43,7 +43,7 @@ export default function ({ getService, getPageObjects }) {
 
     after(async function () {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('date_nanos_custom');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos_custom');
     });
   });
 }
diff --git a/test/functional/apps/context/index.js b/test/functional/apps/context/index.js
index 245f88a337dce..7612dae338d9f 100644
--- a/test/functional/apps/context/index.js
+++ b/test/functional/apps/context/index.js
@@ -17,14 +17,14 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
 
     before(async function () {
       await browser.setWindowSize(1200, 800);
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('visualize');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.load('test/functional/fixtures/es_archiver/visualize');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.common.navigateToApp('discover');
     });
 
     after(function unloadMakelogs() {
-      return esArchiver.unload('logstash_functional');
+      return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     loadTestFile(require.resolve('./_context_navigation'));
diff --git a/test/functional/apps/dashboard/copy_panel_to.ts b/test/functional/apps/dashboard/copy_panel_to.ts
index 641d520801c4d..8877e5e47bd95 100644
--- a/test/functional/apps/dashboard/copy_panel_to.ts
+++ b/test/functional/apps/dashboard/copy_panel_to.ts
@@ -40,7 +40,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard panel copy to', function viewEditModeTests() {
     before(async function () {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/create_and_add_embeddables.ts b/test/functional/apps/dashboard/create_and_add_embeddables.ts
index 3de3b2f843f55..62ce68e026f72 100644
--- a/test/functional/apps/dashboard/create_and_add_embeddables.ts
+++ b/test/functional/apps/dashboard/create_and_add_embeddables.ts
@@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('create and add embeddables', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_back_button.ts b/test/functional/apps/dashboard/dashboard_back_button.ts
index 7e0bf92e3292a..1e901cdbd48be 100644
--- a/test/functional/apps/dashboard/dashboard_back_button.ts
+++ b/test/functional/apps/dashboard/dashboard_back_button.ts
@@ -17,7 +17,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard back button', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('dashboard/current/kibana');
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/dashboard/current/kibana'
+      );
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_error_handling.ts b/test/functional/apps/dashboard/dashboard_error_handling.ts
index 5d3d8bd251d63..89c2d42029935 100644
--- a/test/functional/apps/dashboard/dashboard_error_handling.ts
+++ b/test/functional/apps/dashboard/dashboard_error_handling.ts
@@ -19,7 +19,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
    */
   describe('dashboard error handling', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('dashboard/current/kibana');
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/dashboard/current/kibana'
+      );
       await PageObjects.common.navigateToApp('dashboard');
     });
 
diff --git a/test/functional/apps/dashboard/dashboard_filter_bar.ts b/test/functional/apps/dashboard/dashboard_filter_bar.ts
index c2d6cc4c38b6b..e1a15009afe51 100644
--- a/test/functional/apps/dashboard/dashboard_filter_bar.ts
+++ b/test/functional/apps/dashboard/dashboard_filter_bar.ts
@@ -31,7 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard filter bar', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_filtering.ts b/test/functional/apps/dashboard/dashboard_filtering.ts
index 86c57efec818b..acb04b4946fad 100644
--- a/test/functional/apps/dashboard/dashboard_filtering.ts
+++ b/test/functional/apps/dashboard/dashboard_filtering.ts
@@ -54,7 +54,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     };
 
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await security.testUser.setRoles(['kibana_admin', 'test_logstash_reader', 'animals']);
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
diff --git a/test/functional/apps/dashboard/dashboard_grid.ts b/test/functional/apps/dashboard/dashboard_grid.ts
index 809fb6fc14001..fecec34fd91e3 100644
--- a/test/functional/apps/dashboard/dashboard_grid.ts
+++ b/test/functional/apps/dashboard/dashboard_grid.ts
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard grid', function () {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_options.ts b/test/functional/apps/dashboard/dashboard_options.ts
index 1f62256a3fdb5..5702286bba6b6 100644
--- a/test/functional/apps/dashboard/dashboard_options.ts
+++ b/test/functional/apps/dashboard/dashboard_options.ts
@@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     let originalTitles: string[] = [];
 
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_query_bar.ts b/test/functional/apps/dashboard/dashboard_query_bar.ts
index bf8300defc445..07fa3355c6fba 100644
--- a/test/functional/apps/dashboard/dashboard_query_bar.ts
+++ b/test/functional/apps/dashboard/dashboard_query_bar.ts
@@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard query bar', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
@@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it('causes panels to reload when refresh is clicked', async () => {
-      await esArchiver.unload('dashboard/current/data');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data');
 
       await queryBar.clickQuerySubmitButton();
       await retry.tryForTime(5000, async () => {
diff --git a/test/functional/apps/dashboard/dashboard_saved_query.ts b/test/functional/apps/dashboard/dashboard_saved_query.ts
index bdf97e8ced140..015a00a713bdc 100644
--- a/test/functional/apps/dashboard/dashboard_saved_query.ts
+++ b/test/functional/apps/dashboard/dashboard_saved_query.ts
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard saved queries', function describeIndexTests() {
     before(async function () {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_snapshots.ts b/test/functional/apps/dashboard/dashboard_snapshots.ts
index c93636aeb63c6..3aba671c0a4b2 100644
--- a/test/functional/apps/dashboard/dashboard_snapshots.ts
+++ b/test/functional/apps/dashboard/dashboard_snapshots.ts
@@ -25,7 +25,7 @@ export default function ({
 
   describe('dashboard snapshots', function describeIndexTests() {
     before(async function () {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_state.ts b/test/functional/apps/dashboard/dashboard_state.ts
index acb2bd869819d..047681e1a8ace 100644
--- a/test/functional/apps/dashboard/dashboard_state.ts
+++ b/test/functional/apps/dashboard/dashboard_state.ts
@@ -34,6 +34,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const dashboardPanelActions = getService('dashboardPanelActions');
   const dashboardAddPanel = getService('dashboardAddPanel');
 
+  const enableNewChartLibraryDebug = async () => {
+    if (await PageObjects.visChart.isNewChartsLibraryEnabled()) {
+      await elasticChart.setNewChartUiDebugFlag();
+      await queryBar.submitQuery();
+    }
+  };
+
   describe('dashboard state', function describeIndexTests() {
     // Used to track flag before and after reset
     let isNewChartsLibraryEnabled = false;
@@ -84,10 +91,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.dashboard.gotoDashboardLandingPage();
       await PageObjects.dashboard.loadSavedDashboard(dashboarName);
 
-      if (await PageObjects.visChart.isNewChartsLibraryEnabled()) {
-        await elasticChart.setNewChartUiDebugFlag();
-        await queryBar.submitQuery();
-      }
+      await enableNewChartLibraryDebug();
 
       const colorChoiceRetained = await PageObjects.visChart.doesSelectedLegendColorExist(
         overwriteColor
@@ -149,11 +153,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('Saved search will update when the query is changed in the URL', async () => {
       const currentQuery = await queryBar.getQueryString();
       expect(currentQuery).to.equal('');
-      const currentUrl = await browser.getCurrentUrl();
-      const newUrl = currentUrl.replace('query:%27%27', 'query:%27abc12345678910%27');
-      // Don't add the timestamp to the url or it will cause a hard refresh and we want to test a
-      // soft refresh.
-      await browser.get(newUrl.toString(), false);
+      const currentUrl = await getUrlFromShare();
+      const newUrl = currentUrl.replace(`query:''`, `query:'abc12345678910'`);
+
+      // We need to add a timestamp to the URL because URL changes now only work with a hard refresh.
+      await browser.get(newUrl.toString());
       await PageObjects.header.waitUntilLoadingHasFinished();
 
       const headers = await PageObjects.discover.getColumnHeaders();
@@ -200,20 +204,34 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       return sharedUrl;
     };
 
+    const hardRefresh = async (newUrl: string) => {
+      // We need to add a timestamp to the URL because URL changes now only work with a hard refresh.
+      await browser.get(newUrl.toString());
+      const alert = await browser.getAlert();
+      await alert?.accept();
+      await enableNewChartLibraryDebug();
+      await PageObjects.dashboard.waitForRenderComplete();
+    };
+
     describe('Directly modifying url updates dashboard state', () => {
-      it('for query parameter', async function () {
+      before(async () => {
         await PageObjects.dashboard.gotoDashboardLandingPage();
         await PageObjects.dashboard.clickNewDashboard();
+        await PageObjects.timePicker.setHistoricalDataRange();
+      });
 
+      it('for query parameter', async function () {
         const currentQuery = await queryBar.getQueryString();
         expect(currentQuery).to.equal('');
-        const currentUrl = await browser.getCurrentUrl();
-        const newUrl = currentUrl.replace('query:%27%27', 'query:%27hi%27');
-        // Don't add the timestamp to the url or it will cause a hard refresh and we want to test a
-        // soft refresh.
-        await browser.get(newUrl.toString(), false);
+        const currentUrl = await getUrlFromShare();
+        const newUrl = currentUrl.replace(`query:''`, `query:'hi:hello'`);
+
+        // We need to add a timestamp to the URL because URL changes now only work with a hard refresh.
+        await browser.get(newUrl.toString());
         const newQuery = await queryBar.getQueryString();
-        expect(newQuery).to.equal('hi');
+        expect(newQuery).to.equal('hi:hello');
+        await queryBar.clearQuery();
+        await queryBar.clickQuerySubmitButton();
       });
 
       it('for panel size parameters', async function () {
@@ -224,7 +242,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           `w:${DEFAULT_PANEL_WIDTH}`,
           `w:${DEFAULT_PANEL_WIDTH * 2}`
         );
-        await browser.get(newUrl.toString(), false);
+        await hardRefresh(newUrl);
+
         await retry.try(async () => {
           const newPanelDimensions = await PageObjects.dashboard.getPanelDimensions();
           if (newPanelDimensions.length < 0) {
@@ -247,7 +266,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.dashboard.waitForRenderComplete();
         const currentUrl = await getUrlFromShare();
         const newUrl = currentUrl.replace(/panels:\!\(.*\),query/, 'panels:!(),query');
-        await browser.get(newUrl.toString(), false);
+        await hardRefresh(newUrl);
 
         await retry.try(async () => {
           const newPanelCount = await PageObjects.dashboard.getPanelCount();
@@ -256,8 +275,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       describe('for embeddable config color parameters on a visualization', () => {
-        it('updates a pie slice color on a soft refresh', async function () {
+        let originalPieSliceStyle = '';
+
+        before(async () => {
           await dashboardAddPanel.addVisualization(PIE_CHART_VIS_NAME);
+          await enableNewChartLibraryDebug();
+          originalPieSliceStyle = await pieChart.getPieSliceStyle(`80,000`);
+        });
+
+        it('updates a pie slice color on a hard refresh', async function () {
           await PageObjects.visChart.openLegendOptionColors(
             '80,000',
             `[data-title="${PIE_CHART_VIS_NAME}"]`
@@ -265,14 +291,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await PageObjects.visChart.selectNewLegendColorChoice('#F9D9F9');
           const currentUrl = await getUrlFromShare();
           const newUrl = currentUrl.replace('F9D9F9', 'FFFFFF');
-          await browser.get(newUrl.toString(), false);
+          await hardRefresh(newUrl);
           await PageObjects.header.waitUntilLoadingHasFinished();
 
           await retry.try(async () => {
             const allPieSlicesColor = await pieChart.getAllPieSliceStyles('80,000');
             let whitePieSliceCounts = 0;
             allPieSlicesColor.forEach((style) => {
-              if (style.indexOf('rgb(255, 255, 255)') > 0) {
+              if (style.indexOf('rgb(255, 255, 255)') > -1) {
                 whitePieSliceCounts++;
               }
             });
@@ -290,14 +316,18 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
         it('resets a pie slice color to the original when removed', async function () {
           const currentUrl = await getUrlFromShare();
-          const newUrl = currentUrl.replace(`vis:(colors:('80,000':%23FFFFFF))`, '');
-          await browser.get(newUrl.toString(), false);
+          const newUrl = isNewChartsLibraryEnabled
+            ? currentUrl.replace(`'80000':%23FFFFFF`, '')
+            : currentUrl.replace(`vis:(colors:('80,000':%23FFFFFF))`, '');
+
+          await hardRefresh(newUrl);
           await PageObjects.header.waitUntilLoadingHasFinished();
 
           await retry.try(async () => {
-            const pieSliceStyle = await pieChart.getPieSliceStyle(`80,000`);
-            // The default green color that was stored with the visualization before any dashboard overrides.
-            expect(pieSliceStyle.indexOf('rgb(87, 193, 123)')).to.be.greaterThan(0);
+            const pieSliceStyle = await pieChart.getPieSliceStyle('80,000');
+
+            // After removing all overrides, pie slice style should match original.
+            expect(pieSliceStyle).to.be(originalPieSliceStyle);
           });
         });
 
diff --git a/test/functional/apps/dashboard/dashboard_unsaved_listing.ts b/test/functional/apps/dashboard/dashboard_unsaved_listing.ts
index 1cdc4bbff2c53..2b2d96e8d723a 100644
--- a/test/functional/apps/dashboard/dashboard_unsaved_listing.ts
+++ b/test/functional/apps/dashboard/dashboard_unsaved_listing.ts
@@ -36,7 +36,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     };
 
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/dashboard_unsaved_state.ts b/test/functional/apps/dashboard/dashboard_unsaved_state.ts
index fd203cd8c1356..6b71dd34b76f8 100644
--- a/test/functional/apps/dashboard/dashboard_unsaved_state.ts
+++ b/test/functional/apps/dashboard/dashboard_unsaved_state.ts
@@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   // FLAKY: https://github.com/elastic/kibana/issues/91191
   describe.skip('dashboard unsaved panels', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/data_shared_attributes.ts b/test/functional/apps/dashboard/data_shared_attributes.ts
index 2d6396be80f46..34fd4ddb346ed 100644
--- a/test/functional/apps/dashboard/data_shared_attributes.ts
+++ b/test/functional/apps/dashboard/data_shared_attributes.ts
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     let originalPanelTitles: string[];
 
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/edit_embeddable_redirects.ts b/test/functional/apps/dashboard/edit_embeddable_redirects.ts
index be540e18a503f..02f178a5153a2 100644
--- a/test/functional/apps/dashboard/edit_embeddable_redirects.ts
+++ b/test/functional/apps/dashboard/edit_embeddable_redirects.ts
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('edit embeddable redirects', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/edit_visualizations.js b/test/functional/apps/dashboard/edit_visualizations.js
index b2f21aefcf79c..507d4b8308d4c 100644
--- a/test/functional/apps/dashboard/edit_visualizations.js
+++ b/test/functional/apps/dashboard/edit_visualizations.js
@@ -44,7 +44,7 @@ export default function ({ getService, getPageObjects }) {
 
   describe('edit visualizations from dashboard', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/embed_mode.ts b/test/functional/apps/dashboard/embed_mode.ts
index b96e957262573..943a6b3bdb469 100644
--- a/test/functional/apps/dashboard/embed_mode.ts
+++ b/test/functional/apps/dashboard/embed_mode.ts
@@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     ];
 
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/embeddable_data_grid.ts b/test/functional/apps/dashboard/embeddable_data_grid.ts
index a9e0039de1f79..66aca561383c3 100644
--- a/test/functional/apps/dashboard/embeddable_data_grid.ts
+++ b/test/functional/apps/dashboard/embeddable_data_grid.ts
@@ -21,9 +21,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard embeddable data grid', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('dashboard/current/data');
-      await esArchiver.loadIfNeeded('dashboard/current/kibana');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/dashboard/current/kibana'
+      );
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
         'doc_table:legacy': false,
diff --git a/test/functional/apps/dashboard/embeddable_library.ts b/test/functional/apps/dashboard/embeddable_library.ts
index 20fe9aeb1387a..d66f6e834c367 100644
--- a/test/functional/apps/dashboard/embeddable_library.ts
+++ b/test/functional/apps/dashboard/embeddable_library.ts
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('embeddable library', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/embeddable_rendering.ts b/test/functional/apps/dashboard/embeddable_rendering.ts
index 11807831dc352..e045b1a1e3f5e 100644
--- a/test/functional/apps/dashboard/embeddable_rendering.ts
+++ b/test/functional/apps/dashboard/embeddable_rendering.ts
@@ -94,7 +94,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe.skip('dashboard embeddable rendering', function describeIndexTests() {
     before(async () => {
       await security.testUser.setRoles(['kibana_admin', 'animals', 'test_logstash_reader']);
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/empty_dashboard.ts b/test/functional/apps/dashboard/empty_dashboard.ts
index 2cfa6d73dcb72..46a8545b79596 100644
--- a/test/functional/apps/dashboard/empty_dashboard.ts
+++ b/test/functional/apps/dashboard/empty_dashboard.ts
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('empty dashboard', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/full_screen_mode.ts b/test/functional/apps/dashboard/full_screen_mode.ts
index 1f63dcdafdcce..02669759f68ea 100644
--- a/test/functional/apps/dashboard/full_screen_mode.ts
+++ b/test/functional/apps/dashboard/full_screen_mode.ts
@@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('full screen mode', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/index.ts b/test/functional/apps/dashboard/index.ts
index 9f9422ddaec64..4b83b2ac92deb 100644
--- a/test/functional/apps/dashboard/index.ts
+++ b/test/functional/apps/dashboard/index.ts
@@ -15,21 +15,21 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
   async function loadCurrentData() {
     await browser.setWindowSize(1300, 900);
-    await esArchiver.unload('logstash_functional');
-    await esArchiver.loadIfNeeded('dashboard/current/data');
+    await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+    await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
   }
 
   async function unloadCurrentData() {
-    await esArchiver.unload('dashboard/current/data');
+    await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data');
   }
 
   async function loadLogstash() {
     await browser.setWindowSize(1200, 900);
-    await esArchiver.loadIfNeeded('logstash_functional');
+    await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
   }
 
   async function unloadLogstash() {
-    await esArchiver.unload('logstash_functional');
+    await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
   }
 
   describe('dashboard app', function () {
diff --git a/test/functional/apps/dashboard/legacy_urls.ts b/test/functional/apps/dashboard/legacy_urls.ts
index 9c7f472b287a7..96c7a5aac3f4b 100644
--- a/test/functional/apps/dashboard/legacy_urls.ts
+++ b/test/functional/apps/dashboard/legacy_urls.ts
@@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('legacy urls', function describeIndexTests() {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'animals']);
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.clickNewDashboard();
       await dashboardAddPanel.addVisualization('Rendering-Test:-animal-sounds-pie');
diff --git a/test/functional/apps/dashboard/panel_expand_toggle.ts b/test/functional/apps/dashboard/panel_expand_toggle.ts
index 45642542cc0ac..00500450595eb 100644
--- a/test/functional/apps/dashboard/panel_expand_toggle.ts
+++ b/test/functional/apps/dashboard/panel_expand_toggle.ts
@@ -12,7 +12,6 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
-  const browser = getService('browser');
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const dashboardPanelActions = getService('dashboardPanelActions');
@@ -20,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('expanding a panel', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
@@ -53,18 +52,5 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         expect(panelCountAfterMaxThenMinimize).to.be(panelCount);
       });
     });
-
-    it('minimizes using the browser back button', async () => {
-      const panelCount = await PageObjects.dashboard.getPanelCount();
-
-      await dashboardPanelActions.openContextMenu();
-      await dashboardPanelActions.clickExpandPanelToggle();
-
-      await browser.goBack();
-      await retry.try(async () => {
-        const panelCountAfterMaxThenMinimize = await PageObjects.dashboard.getPanelCount();
-        expect(panelCountAfterMaxThenMinimize).to.be(panelCount);
-      });
-    });
   });
 }
diff --git a/test/functional/apps/dashboard/saved_search_embeddable.ts b/test/functional/apps/dashboard/saved_search_embeddable.ts
index 098f6ccc00d94..5bcec338aad1e 100644
--- a/test/functional/apps/dashboard/saved_search_embeddable.ts
+++ b/test/functional/apps/dashboard/saved_search_embeddable.ts
@@ -19,9 +19,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('dashboard saved search embeddable', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('dashboard/current/data');
-      await esArchiver.loadIfNeeded('dashboard/current/kibana');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/dashboard/current/kibana'
+      );
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/share.ts b/test/functional/apps/dashboard/share.ts
index 8191b5efb51f6..77a858b22ec79 100644
--- a/test/functional/apps/dashboard/share.ts
+++ b/test/functional/apps/dashboard/share.ts
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('share dashboard', () => {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/time_zones.ts b/test/functional/apps/dashboard/time_zones.ts
index a4a586cb635d5..e5c532537b6f0 100644
--- a/test/functional/apps/dashboard/time_zones.ts
+++ b/test/functional/apps/dashboard/time_zones.ts
@@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     this.tags('includeFirefox');
 
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/url_field_formatter.ts b/test/functional/apps/dashboard/url_field_formatter.ts
index f930987f16d5f..8a4371a0adf77 100644
--- a/test/functional/apps/dashboard/url_field_formatter.ts
+++ b/test/functional/apps/dashboard/url_field_formatter.ts
@@ -39,7 +39,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   // FLAKY: https://github.com/elastic/kibana/issues/79463
   describe.skip('Changing field formatter to Url', () => {
     before(async function () {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/functional/apps/dashboard/view_edit.ts b/test/functional/apps/dashboard/view_edit.ts
index 99a78ebd069c5..b29b07f9df4e4 100644
--- a/test/functional/apps/dashboard/view_edit.ts
+++ b/test/functional/apps/dashboard/view_edit.ts
@@ -15,14 +15,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const dashboardAddPanel = getService('dashboardAddPanel');
-  const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['dashboard', 'header', 'common', 'visualize', 'timePicker']);
   const dashboardName = 'dashboard with filter';
   const filterBar = getService('filterBar');
 
   describe('dashboard view edit mode', function viewEditModeTests() {
     before(async () => {
-      await esArchiver.load('dashboard/current/kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
@@ -33,7 +32,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('create new dashboard opens in edit mode', async function () {
       await PageObjects.dashboard.gotoDashboardLandingPage();
       await PageObjects.dashboard.clickNewDashboard();
-      await PageObjects.dashboard.clickCancelOutOfEditMode();
+      const isInViewMode = await PageObjects.dashboard.getIsInViewMode();
+      expect(isInViewMode).to.be(false);
     });
 
     it('existing dashboard opens in view mode', async function () {
@@ -72,7 +72,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             'Sep 19, 2013 @ 06:31:44.000',
             'Sep 19, 2013 @ 06:31:44.000'
           );
-          await PageObjects.dashboard.clickDiscardChanges();
+          await PageObjects.dashboard.clickCancelOutOfEditMode();
 
           const newTime = await PageObjects.timePicker.getTimeConfig();
 
@@ -85,7 +85,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           await queryBar.setQuery(`${originalQuery}and extra stuff`);
           await queryBar.submitQuery();
 
-          await PageObjects.dashboard.clickDiscardChanges();
+          await PageObjects.dashboard.clickCancelOutOfEditMode();
 
           const query = await queryBar.getQueryString();
           expect(query).to.equal(originalQuery);
@@ -105,7 +105,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           hasFilter = await filterBar.hasFilter('animal', 'dog');
           expect(hasFilter).to.be(false);
 
-          await PageObjects.dashboard.clickDiscardChanges();
+          await PageObjects.dashboard.clickCancelOutOfEditMode();
 
           hasFilter = await filterBar.hasFilter('animal', 'dog');
           expect(hasFilter).to.be(true);
@@ -122,13 +122,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             redirectToOrigin: true,
           });
 
-          await PageObjects.dashboard.clickDiscardChanges(false);
+          await PageObjects.dashboard.clickCancelOutOfEditMode(false);
           // for this sleep see https://github.com/elastic/kibana/issues/22299
           await PageObjects.common.sleep(500);
 
           // confirm lose changes
-          await testSubjects.exists('dashboardDiscardConfirmDiscard');
-          await testSubjects.click('dashboardDiscardConfirmDiscard');
+          await PageObjects.common.clickConfirmOnModal();
 
           const panelCount = await PageObjects.dashboard.getPanelCount();
           expect(panelCount).to.eql(originalPanelCount);
@@ -138,7 +137,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           const originalPanelCount = await PageObjects.dashboard.getPanelCount();
 
           await dashboardAddPanel.addVisualization('new viz panel');
-          await PageObjects.dashboard.clickDiscardChanges();
+          await PageObjects.dashboard.clickCancelOutOfEditMode();
 
           const panelCount = await PageObjects.dashboard.getPanelCount();
           expect(panelCount).to.eql(originalPanelCount);
@@ -158,10 +157,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
             'Sep 19, 2015 @ 06:31:44.000',
             'Sep 19, 2015 @ 06:31:44.000'
           );
-          await PageObjects.dashboard.clickDiscardChanges(false);
+          await PageObjects.dashboard.clickCancelOutOfEditMode(false);
 
-          await testSubjects.exists('dashboardDiscardConfirmCancel');
-          await testSubjects.click('dashboardDiscardConfirmCancel');
+          await PageObjects.common.clickCancelOnModal();
           await PageObjects.dashboard.saveDashboard(dashboardName, {
             storeTimeWithDashboard: true,
           });
@@ -188,10 +186,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         );
         const newTime = await PageObjects.timePicker.getTimeConfig();
 
-        await PageObjects.dashboard.clickDiscardChanges(false);
+        await PageObjects.dashboard.clickCancelOutOfEditMode(false);
 
-        await testSubjects.exists('dashboardDiscardConfirmCancel');
-        await testSubjects.click('dashboardDiscardConfirmCancel');
+        await PageObjects.common.clickCancelOnModal();
         await PageObjects.dashboard.saveDashboard(dashboardName, { storeTimeWithDashboard: true });
 
         await PageObjects.dashboard.loadSavedDashboard(dashboardName);
diff --git a/test/functional/apps/discover/_data_grid.ts b/test/functional/apps/discover/_data_grid.ts
index 366865b53fb0d..eaefb3ba38f05 100644
--- a/test/functional/apps/discover/_data_grid.ts
+++ b/test/functional/apps/discover/_data_grid.ts
@@ -25,7 +25,7 @@ export default function ({
     before(async function () {
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
       await PageObjects.timePicker.setDefaultAbsoluteRange();
diff --git a/test/functional/apps/discover/_data_grid_context.ts b/test/functional/apps/discover/_data_grid_context.ts
index 275ac011820be..bfce69ca08d55 100644
--- a/test/functional/apps/discover/_data_grid_context.ts
+++ b/test/functional/apps/discover/_data_grid_context.ts
@@ -19,7 +19,6 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const filterBar = getService('filterBar');
   const dataGrid = getService('dataGrid');
-  const docTable = getService('docTable');
   const PageObjects = getPageObjects([
     'common',
     'discover',
@@ -38,7 +37,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     before(async () => {
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await kibanaServer.uiSettings.update(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
@@ -67,16 +66,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await dataGrid.clickRowToggle({ rowIndex: 0 });
         const rowActions = await dataGrid.getRowActions({ rowIndex: 0 });
         await rowActions[1].click();
-        // entering the context view (contains the legacy type)
-        const contextFields = await docTable.getFields();
+
+        const contextFields = await dataGrid.getFields();
         const anchorTimestamp = contextFields[0][0];
+
         return anchorTimestamp === firstTimestamp;
       });
     });
 
     it('should open the context view with the same columns', async () => {
-      const columnNames = await docTable.getHeaderFields();
-      expect(columnNames).to.eql(['Time', ...TEST_COLUMN_NAMES]);
+      const columnNames = await dataGrid.getHeaderFields();
+      expect(columnNames).to.eql(['Time (@timestamp)', ...TEST_COLUMN_NAMES]);
     });
 
     it('should open the context view with the filters disabled', async () => {
@@ -111,7 +111,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await browser.getCurrentUrl()).to.contain('#/context');
       await PageObjects.header.waitUntilLoadingHasFinished();
       await retry.waitFor('document table has a length of 6', async () => {
-        const nrOfDocs = (await docTable.getBodyRows()).length;
+        const nrOfDocs = (await dataGrid.getBodyRows()).length;
         return nrOfDocs === 6;
       });
     });
diff --git a/test/functional/apps/discover/_data_grid_doc_navigation.ts b/test/functional/apps/discover/_data_grid_doc_navigation.ts
index 2225cb5871f34..e3e8a20b693f8 100644
--- a/test/functional/apps/discover/_data_grid_doc_navigation.ts
+++ b/test/functional/apps/discover/_data_grid_doc_navigation.ts
@@ -21,8 +21,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover data grid doc link', function () {
     beforeEach(async function () {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await kibanaServer.uiSettings.update(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/_data_grid_doc_table.ts b/test/functional/apps/discover/_data_grid_doc_table.ts
index f0d6abb23d30f..bbd633df6fa1e 100644
--- a/test/functional/apps/discover/_data_grid_doc_table.ts
+++ b/test/functional/apps/discover/_data_grid_doc_table.ts
@@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/_data_grid_field_data.ts b/test/functional/apps/discover/_data_grid_field_data.ts
index 5d73192c1608c..8296b518bee32 100644
--- a/test/functional/apps/discover/_data_grid_field_data.ts
+++ b/test/functional/apps/discover/_data_grid_field_data.ts
@@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     before(async function () {
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await kibanaServer.uiSettings.update(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/_date_nanos.ts b/test/functional/apps/discover/_date_nanos.ts
index 09970b3719c4e..81327d0744bfe 100644
--- a/test/functional/apps/discover/_date_nanos.ts
+++ b/test/functional/apps/discover/_date_nanos.ts
@@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('date_nanos', function () {
     before(async function () {
-      await esArchiver.loadIfNeeded('date_nanos');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'date-nanos' });
       await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos']);
       await PageObjects.common.navigateToApp('discover');
@@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     after(async function unloadMakelogs() {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('date_nanos');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos');
     });
 
     it('should show a timestamp with nanoseconds in the first result row', async function () {
diff --git a/test/functional/apps/discover/_date_nanos_mixed.ts b/test/functional/apps/discover/_date_nanos_mixed.ts
index a3402cc733431..7d4104c3ac344 100644
--- a/test/functional/apps/discover/_date_nanos_mixed.ts
+++ b/test/functional/apps/discover/_date_nanos_mixed.ts
@@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('date_nanos_mixed', function () {
     before(async function () {
-      await esArchiver.loadIfNeeded('date_nanos_mixed');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/date_nanos_mixed');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'timestamp-*' });
       await security.testUser.setRoles(['kibana_admin', 'kibana_date_nanos_mixed']);
       await PageObjects.common.navigateToApp('discover');
@@ -29,7 +29,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     after(async () => {
       await security.testUser.restoreDefaults();
-      esArchiver.unload('date_nanos_mixed');
+      esArchiver.unload('test/functional/fixtures/es_archiver/date_nanos_mixed');
     });
 
     it('shows a list of records of indices with date & date_nanos fields in the right order', async function () {
diff --git a/test/functional/apps/discover/_discover.ts b/test/functional/apps/discover/_discover.ts
index 8ed54f88afea3..f26d1f4536e55 100644
--- a/test/functional/apps/discover/_discover.ts
+++ b/test/functional/apps/discover/_discover.ts
@@ -32,7 +32,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await kibanaServer.importExport.load('discover');
 
       // and load a set of makelogs data
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
       await PageObjects.timePicker.setDefaultAbsoluteRange();
@@ -327,10 +327,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         const intervalS = 5;
         await PageObjects.timePicker.startAutoRefresh(intervalS);
 
-        // check inspector panel request stats for timestamp
-        await inspector.open();
-
         const getRequestTimestamp = async () => {
+          // check inspector panel request stats for timestamp
+          await inspector.open();
           const requestStats = await inspector.getTableData();
           const requestStatsRow = requestStats.filter(
             (r) => r && r[0] && r[0].includes('Request timestamp')
@@ -338,6 +337,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           if (!requestStatsRow || !requestStatsRow[0] || !requestStatsRow[0][1]) {
             return '';
           }
+          await inspector.close();
           return requestStatsRow[0][1];
         };
 
diff --git a/test/functional/apps/discover/_discover_fields_api.ts b/test/functional/apps/discover/_discover_fields_api.ts
index 0a6029a9f10e8..d3df79dc8658b 100644
--- a/test/functional/apps/discover/_discover_fields_api.ts
+++ b/test/functional/apps/discover/_discover_fields_api.ts
@@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       log.debug('discover');
       await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/_discover_histogram.ts b/test/functional/apps/discover/_discover_histogram.ts
index e41422555f81d..d4b3758fd9b8c 100644
--- a/test/functional/apps/discover/_discover_histogram.ts
+++ b/test/functional/apps/discover/_discover_histogram.ts
@@ -25,16 +25,20 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover histogram', function describeIndexTests() {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('long_window_logstash');
-      await esArchiver.load('long_window_logstash_index_pattern');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.load('test/functional/fixtures/es_archiver/long_window_logstash');
+      await esArchiver.load(
+        'test/functional/fixtures/es_archiver/long_window_logstash_index_pattern'
+      );
       await security.testUser.setRoles(['kibana_admin', 'long_window_logstash']);
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
     });
     after(async () => {
-      await esArchiver.unload('long_window_logstash');
-      await esArchiver.unload('long_window_logstash_index_pattern');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/long_window_logstash');
+      await esArchiver.unload(
+        'test/functional/fixtures/es_archiver/long_window_logstash_index_pattern'
+      );
       await security.testUser.restoreDefaults();
     });
 
diff --git a/test/functional/apps/discover/_doc_navigation.ts b/test/functional/apps/discover/_doc_navigation.ts
index 90d3c4eca423a..771dac4d40a64 100644
--- a/test/functional/apps/discover/_doc_navigation.ts
+++ b/test/functional/apps/discover/_doc_navigation.ts
@@ -21,8 +21,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('doc link in discover', function contextSize() {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await kibanaServer.uiSettings.update({
         'doc_table:legacy': true,
diff --git a/test/functional/apps/discover/_doc_table.ts b/test/functional/apps/discover/_doc_table.ts
index 6f298a364abfa..ffe989f8d498c 100644
--- a/test/functional/apps/discover/_doc_table.ts
+++ b/test/functional/apps/discover/_doc_table.ts
@@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await kibanaServer.importExport.load('discover');
 
       // and load a set of makelogs data
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       log.debug('discover doc table');
diff --git a/test/functional/apps/discover/_errors.ts b/test/functional/apps/discover/_errors.ts
index 8b8877016b103..f127c39fd5d9a 100644
--- a/test/functional/apps/discover/_errors.ts
+++ b/test/functional/apps/discover/_errors.ts
@@ -16,14 +16,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('errors', function describeIndexTests() {
     before(async function () {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('invalid_scripted_field');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.load('test/functional/fixtures/es_archiver/invalid_scripted_field');
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
     });
 
     after(async function () {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
     });
 
     describe('invalid scripted field error', () => {
diff --git a/test/functional/apps/discover/_field_data.ts b/test/functional/apps/discover/_field_data.ts
index 1831fb9aa73b1..e8698b984f6cc 100644
--- a/test/functional/apps/discover/_field_data.ts
+++ b/test/functional/apps/discover/_field_data.ts
@@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     before(async function () {
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
         'discover:searchFieldsFromSource': true,
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 319722e0c8842..7de123bb44f2a 100644
--- a/test/functional/apps/discover/_field_data_with_fields_api.ts
+++ b/test/functional/apps/discover/_field_data_with_fields_api.ts
@@ -25,7 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     before(async function () {
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
         'discover:searchFieldsFromSource': false,
diff --git a/test/functional/apps/discover/_filter_editor.ts b/test/functional/apps/discover/_filter_editor.ts
index b94ba3cda4044..4e9839d4e799a 100644
--- a/test/functional/apps/discover/_filter_editor.ts
+++ b/test/functional/apps/discover/_filter_editor.ts
@@ -28,7 +28,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await kibanaServer.importExport.load('discover');
 
       // and load a set of makelogs data
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       log.debug('discover filter editor');
       await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/_huge_fields.ts b/test/functional/apps/discover/_huge_fields.ts
index b3e63e482e734..c7fe0a94b6019 100644
--- a/test/functional/apps/discover/_huge_fields.ts
+++ b/test/functional/apps/discover/_huge_fields.ts
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe.skip('test large number of fields in sidebar', function () {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'test_testhuge_reader'], false);
-      await esArchiver.loadIfNeeded('large_fields');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/large_fields');
       await PageObjects.settings.navigateTo();
       await kibanaServer.uiSettings.update({
         'timepicker:timeDefaults': `{ "from": "2016-10-05T00:00:00", "to": "2016-10-06T00:00:00"}`,
@@ -41,7 +41,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     after(async () => {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('large_fields');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/large_fields');
       await kibanaServer.uiSettings.replace({});
     });
   });
diff --git a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts
index 06933e828db7e..e986429a15d26 100644
--- a/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts
+++ b/test/functional/apps/discover/_indexpattern_with_unmapped_fields.ts
@@ -18,7 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('index pattern with unmapped fields', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('unmapped_fields');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/unmapped_fields');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'test-index-unmapped-fields',
         'discover:searchFieldsFromSource': false,
@@ -31,7 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('unmapped_fields');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/unmapped_fields');
     });
 
     it('unmapped fields exist on a new saved search', async () => {
diff --git a/test/functional/apps/discover/_indexpattern_without_timefield.ts b/test/functional/apps/discover/_indexpattern_without_timefield.ts
index cef02a0f54f05..ff3ad0daf69db 100644
--- a/test/functional/apps/discover/_indexpattern_without_timefield.ts
+++ b/test/functional/apps/discover/_indexpattern_without_timefield.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 expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService, getPageObjects }: FtrProviderContext) {
@@ -13,19 +13,29 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const kibanaServer = getService('kibanaServer');
   const security = getService('security');
+  const testSubjects = getService('testSubjects');
   const PageObjects = getPageObjects(['common', 'timePicker', 'discover']);
 
   describe('indexpattern without timefield', () => {
     before(async () => {
       await security.testUser.setRoles(['kibana_admin', 'kibana_timefield']);
-      await esArchiver.loadIfNeeded('index_pattern_without_timefield');
-      await kibanaServer.uiSettings.replace({ defaultIndex: 'without-timefield' });
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
+      );
+      await kibanaServer.uiSettings.replace({
+        defaultIndex: 'without-timefield',
+        'timepicker:timeDefaults': '{  "from": "2019-01-18T19:37:13.000Z",  "to": "now"}',
+      });
       await PageObjects.common.navigateToApp('discover');
     });
 
     after(async () => {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('index_pattern_without_timefield');
+      await kibanaServer.uiSettings.unset('timepicker:timeDefaults');
+      await kibanaServer.uiSettings.unset('defaultIndex');
+      await esArchiver.unload(
+        'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
+      );
     });
 
     it('should not display a timepicker', async () => {
@@ -34,6 +44,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       }
     });
 
+    it('should adapt sidebar fields when switching', async () => {
+      await PageObjects.discover.selectIndexPattern('with-timefield');
+      const timefieldExistsWithTimefield = await testSubjects.exists('field-@timestamp');
+      expect(timefieldExistsWithTimefield).to.be(true);
+      await PageObjects.discover.selectIndexPattern('without-timefield');
+      await PageObjects.discover.waitForDocTableLoadingComplete();
+      const timefieldExistsWithoutTimefield = await testSubjects.exists('field-@timestamp');
+      expect(timefieldExistsWithoutTimefield).to.be(false);
+    });
+
     it('should display a timepicker after switching to an index pattern with timefield', async () => {
       await PageObjects.discover.selectIndexPattern('with-timefield');
       if (!(await PageObjects.timePicker.timePickerExists())) {
diff --git a/test/functional/apps/discover/_inspector.ts b/test/functional/apps/discover/_inspector.ts
index ca8539df9a926..9d4fd93eb3a9f 100644
--- a/test/functional/apps/discover/_inspector.ts
+++ b/test/functional/apps/discover/_inspector.ts
@@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const STATS_ROW_VALUE_INDEX = 1;
   function getHitCount(requestStats: string[][]): string | undefined {
     const hitsCountStatsRow = requestStats.find((statsRow) => {
-      return statsRow[STATS_ROW_NAME_INDEX] === 'Hits (total)';
+      return statsRow[STATS_ROW_NAME_INDEX] === 'Hits';
     });
 
     if (!hitsCountStatsRow) {
@@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
 
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       // delete .kibana index and update configDoc
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
@@ -61,7 +61,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await inspector.open();
       const requestStats = await inspector.getTableData();
 
-      expect(getHitCount(requestStats)).to.be('14004');
+      expect(getHitCount(requestStats)).to.be('500');
     });
   });
 }
diff --git a/test/functional/apps/discover/_large_string.ts b/test/functional/apps/discover/_large_string.ts
index 0f6be04212a62..3e426c6237d89 100644
--- a/test/functional/apps/discover/_large_string.ts
+++ b/test/functional/apps/discover/_large_string.ts
@@ -24,7 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await security.testUser.setRoles(['kibana_admin', 'kibana_large_strings']);
 
       await kibanaServer.importExport.load('testlargestring');
-      await esArchiver.loadIfNeeded('hamlet');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/hamlet');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'testlargestring' });
     });
 
@@ -68,7 +68,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     after(async () => {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('hamlet');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet');
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
     });
   });
diff --git a/test/functional/apps/discover/_runtime_fields_editor.ts b/test/functional/apps/discover/_runtime_fields_editor.ts
index 62045e3c9a6b1..fd2ca4dd4b5cf 100644
--- a/test/functional/apps/discover/_runtime_fields_editor.ts
+++ b/test/functional/apps/discover/_runtime_fields_editor.ts
@@ -33,8 +33,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover integration with runtime fields editor', function describeIndexTests() {
     before(async function () {
-      await esArchiver.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       log.debug('discover');
       await PageObjects.common.navigateToApp('discover');
@@ -56,7 +56,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     it('allows creation of a new field', async function () {
       await createRuntimeField('runtimefield');
       await PageObjects.header.waitUntilLoadingHasFinished();
-      expect((await PageObjects.discover.getAllFieldNames()).includes('runtimefield')).to.be(true);
+      await retry.waitFor('fieldNames to include runtimefield', async () => {
+        const fieldNames = await PageObjects.discover.getAllFieldNames();
+        return fieldNames.includes('runtimefield');
+      });
     });
 
     it('allows editing of a newly created field', async function () {
@@ -65,10 +68,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await fieldEditor.save();
       await fieldEditor.confirmSave();
       await PageObjects.header.waitUntilLoadingHasFinished();
-      expect((await PageObjects.discover.getAllFieldNames()).includes('runtimefield')).to.be(false);
-      expect((await PageObjects.discover.getAllFieldNames()).includes('runtimefield edited')).to.be(
-        true
-      );
+
+      await retry.waitFor('fieldNames to include edits', async () => {
+        const fieldNames = await PageObjects.discover.getAllFieldNames();
+        return fieldNames.includes('runtimefield edited');
+      });
     });
 
     it('allows creation of a new field and use it in a saved search', async function () {
@@ -94,7 +98,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.discover.removeField('delete');
       await fieldEditor.confirmDelete();
       await PageObjects.header.waitUntilLoadingHasFinished();
-      expect((await PageObjects.discover.getAllFieldNames()).includes('delete')).to.be(false);
+      await retry.waitFor('fieldNames to include edits', async () => {
+        const fieldNames = await PageObjects.discover.getAllFieldNames();
+        return !fieldNames.includes('delete');
+      });
     });
 
     it('doc view includes runtime fields', async function () {
diff --git a/test/functional/apps/discover/_saved_queries.ts b/test/functional/apps/discover/_saved_queries.ts
index acf78802fa18f..67806c9d16a94 100644
--- a/test/functional/apps/discover/_saved_queries.ts
+++ b/test/functional/apps/discover/_saved_queries.ts
@@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await kibanaServer.importExport.load('discover');
 
       // and load a set of makelogs data
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       log.debug('discover');
       await PageObjects.common.navigateToApp('discover');
diff --git a/test/functional/apps/discover/_shared_links.ts b/test/functional/apps/discover/_shared_links.ts
index 512e05e4b2d79..151e8555eea77 100644
--- a/test/functional/apps/discover/_shared_links.ts
+++ b/test/functional/apps/discover/_shared_links.ts
@@ -39,7 +39,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       log.debug('load kibana index with default index pattern');
       await kibanaServer.savedObjects.clean({ types: ['search', 'index-pattern'] });
       await kibanaServer.importExport.load('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
 
       await kibanaServer.uiSettings.replace({
         'state:storeInSessionStorage': storeStateInSessionStorage,
diff --git a/test/functional/apps/discover/_sidebar.ts b/test/functional/apps/discover/_sidebar.ts
index f4b806976fc5d..d8701261126c4 100644
--- a/test/functional/apps/discover/_sidebar.ts
+++ b/test/functional/apps/discover/_sidebar.ts
@@ -16,8 +16,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover sidebar', function describeIndexTests() {
     before(async function () {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
       });
diff --git a/test/functional/apps/discover/_source_filters.ts b/test/functional/apps/discover/_source_filters.ts
index 4161f7f289dbf..f3793dc3e0288 100644
--- a/test/functional/apps/discover/_source_filters.ts
+++ b/test/functional/apps/discover/_source_filters.ts
@@ -24,10 +24,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       log.debug('load kibana index with default index pattern');
-      await esArchiver.load('visualize_source-filters');
+      await esArchiver.load('test/functional/fixtures/es_archiver/visualize_source-filters');
 
       // and load a set of makelogs data
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
 
       await kibanaServer.uiSettings.update({
         'discover:searchFieldsFromSource': false,
diff --git a/test/functional/apps/discover/index.ts b/test/functional/apps/discover/index.ts
index db76cd1c20c38..869fb625e8796 100644
--- a/test/functional/apps/discover/index.ts
+++ b/test/functional/apps/discover/index.ts
@@ -20,7 +20,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     });
 
     after(function unloadMakelogs() {
-      return esArchiver.unload('logstash_functional');
+      return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     loadTestFile(require.resolve('./_saved_queries'));
diff --git a/test/functional/apps/getting_started/_shakespeare.ts b/test/functional/apps/getting_started/_shakespeare.ts
index 4bc1f54852b82..945c1fdcbdcf4 100644
--- a/test/functional/apps/getting_started/_shakespeare.ts
+++ b/test/functional/apps/getting_started/_shakespeare.ts
@@ -46,9 +46,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       );
       isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
       await security.testUser.setRoles(['kibana_admin', 'test_shakespeare_reader']);
-      await esArchiver.load('empty_kibana', { skipExisting: true });
+      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana', {
+        skipExisting: true,
+      });
       log.debug('Load shakespeare data');
-      await esArchiver.loadIfNeeded('getting_started/shakespeare');
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/getting_started/shakespeare'
+      );
 
       if (isNewChartsLibraryEnabled) {
         await kibanaServer.uiSettings.update({
diff --git a/test/functional/apps/home/_navigation.ts b/test/functional/apps/home/_navigation.ts
index 401f33b789c85..a57ce0596abac 100644
--- a/test/functional/apps/home/_navigation.ts
+++ b/test/functional/apps/home/_navigation.ts
@@ -17,8 +17,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Kibana browser back navigation should work', function describeIndexTests() {
     before(async () => {
-      await esArchiver.loadIfNeeded('discover');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     it('detect navigate back issues', async () => {
diff --git a/test/functional/apps/management/_field_formatter.js b/test/functional/apps/management/_field_formatter.js
index 49b6c162caa41..383b4faecc40c 100644
--- a/test/functional/apps/management/_field_formatter.js
+++ b/test/functional/apps/management/_field_formatter.js
@@ -18,7 +18,7 @@ export default function ({ getService, getPageObjects }) {
 
     before(async function () {
       await browser.setWindowSize(1200, 800);
-      await esArchiver.load('discover');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
       await kibanaServer.uiSettings.replace({});
       await kibanaServer.uiSettings.update({});
     });
diff --git a/test/functional/apps/management/_handle_alias.js b/test/functional/apps/management/_handle_alias.js
index 6c90556d77cf0..891e59d84a04b 100644
--- a/test/functional/apps/management/_handle_alias.js
+++ b/test/functional/apps/management/_handle_alias.js
@@ -18,8 +18,8 @@ export default function ({ getService, getPageObjects }) {
   describe('Index patterns on aliases', function () {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'test_alias_reader']);
-      await esArchiver.loadIfNeeded('alias');
-      await esArchiver.load('empty_kibana');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/alias');
+      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
       await es.indices.updateAliases({
         body: {
           actions: [
@@ -71,7 +71,7 @@ export default function ({ getService, getPageObjects }) {
 
     after(async () => {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('alias');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/alias');
     });
   });
 }
diff --git a/test/functional/apps/management/_handle_version_conflict.js b/test/functional/apps/management/_handle_version_conflict.js
index 2daad1e457a6b..82723ad7ce967 100644
--- a/test/functional/apps/management/_handle_version_conflict.js
+++ b/test/functional/apps/management/_handle_version_conflict.js
@@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }) {
   describe('index version conflict', function describeIndexTests() {
     before(async function () {
       await browser.setWindowSize(1200, 800);
-      await esArchiver.load('discover');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
     });
 
     it('Should be able to surface version conflict notification while creating scripted field', async function () {
diff --git a/test/functional/apps/management/_import_objects.ts b/test/functional/apps/management/_import_objects.ts
index d9eb945be7777..0278955c577a1 100644
--- a/test/functional/apps/management/_import_objects.ts
+++ b/test/functional/apps/management/_import_objects.ts
@@ -27,14 +27,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('import objects', function describeIndexTests() {
     describe('.ndjson file', () => {
       beforeEach(async function () {
-        await esArchiver.load('management');
+        await esArchiver.load('test/functional/fixtures/es_archiver/management');
         await kibanaServer.uiSettings.replace({});
         await PageObjects.settings.navigateTo();
         await PageObjects.settings.clickKibanaSavedObjects();
       });
 
       afterEach(async function () {
-        await esArchiver.unload('management');
+        await esArchiver.unload('test/functional/fixtures/es_archiver/management');
       });
 
       it('should import saved objects', async function () {
@@ -213,14 +213,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('.json file', () => {
       beforeEach(async function () {
-        await esArchiver.load('saved_objects_imports');
+        await esArchiver.load('test/functional/fixtures/es_archiver/saved_objects_imports');
         await kibanaServer.uiSettings.replace({});
         await PageObjects.settings.navigateTo();
         await PageObjects.settings.clickKibanaSavedObjects();
       });
 
       afterEach(async function () {
-        await esArchiver.unload('saved_objects_imports');
+        await esArchiver.unload('test/functional/fixtures/es_archiver/saved_objects_imports');
       });
 
       it('should import saved objects', async function () {
diff --git a/test/functional/apps/management/_index_patterns_empty.ts b/test/functional/apps/management/_index_patterns_empty.ts
index 3a09340f06ba0..038039275b843 100644
--- a/test/functional/apps/management/_index_patterns_empty.ts
+++ b/test/functional/apps/management/_index_patterns_empty.ts
@@ -20,14 +20,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   describe('index pattern empty view', () => {
     before(async () => {
       await esArchiver.emptyKibanaIndex();
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.unload('makelogs');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/makelogs');
       await kibanaServer.uiSettings.replace({});
       await PageObjects.settings.navigateTo();
     });
 
     after(async () => {
-      await esArchiver.loadIfNeeded('makelogs');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/makelogs');
       await es.transport.request({
         path: '/logstash-a',
         method: 'DELETE',
diff --git a/test/functional/apps/management/_kibana_settings.js b/test/functional/apps/management/_kibana_settings.js
index 43f6631efb5c1..cfe4e88cda21d 100644
--- a/test/functional/apps/management/_kibana_settings.js
+++ b/test/functional/apps/management/_kibana_settings.js
@@ -37,14 +37,9 @@ export default function ({ getService, getPageObjects }) {
     describe('state:storeInSessionStorage', () => {
       async function getStateFromUrl() {
         const currentUrl = await browser.getCurrentUrl();
-        let match = currentUrl.match(/(.*)?_g=(.*)&_a=(.*)/);
-        if (match) return [match[2], match[3]];
-        match = currentUrl.match(/(.*)?_a=(.*)&_g=(.*)/);
-        if (match) return [match[3], match[2]];
-
-        if (!match) {
-          throw new Error('State in url is missing or malformed: ' + currentUrl);
-        }
+        const match = currentUrl.match(/(.*)?_g=(.*)/);
+        if (match) return match[2];
+        throw new Error('State in url is missing or malformed: ' + currentUrl);
       }
 
       it('defaults to null', async () => {
@@ -59,12 +54,11 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.common.navigateToApp('dashboard');
         await PageObjects.dashboard.clickNewDashboard();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        const [globalState, appState] = await getStateFromUrl();
+        const globalState = await getStateFromUrl();
 
         // We don't have to be exact, just need to ensure it's greater than when the hashed variation is being used,
         // which is less than 20 characters.
         expect(globalState.length).to.be.greaterThan(20);
-        expect(appState.length).to.be.greaterThan(20);
       });
 
       it('setting to true change is preserved', async function () {
@@ -81,12 +75,11 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.common.navigateToApp('dashboard');
         await PageObjects.dashboard.clickNewDashboard();
         await PageObjects.timePicker.setDefaultAbsoluteRange();
-        const [globalState, appState] = await getStateFromUrl();
+        const globalState = await getStateFromUrl();
 
         // We don't have to be exact, just need to ensure it's less than the unhashed version, which will be
         // greater than 20 characters with the default state plus a time.
         expect(globalState.length).to.be.lessThan(20);
-        expect(appState.length).to.be.lessThan(20);
       });
 
       it("changing 'state:storeInSessionStorage' also takes effect without full page reload", async () => {
@@ -95,11 +88,10 @@ export default function ({ getService, getPageObjects }) {
         await PageObjects.settings.clickKibanaSettings();
         await PageObjects.settings.toggleAdvancedSettingCheckbox('state:storeInSessionStorage');
         await PageObjects.header.clickDashboard();
-        const [globalState, appState] = await getStateFromUrl();
+        const globalState = await getStateFromUrl();
         // We don't have to be exact, just need to ensure it's greater than when the hashed variation is being used,
         // which is less than 20 characters.
         expect(globalState.length).to.be.greaterThan(20);
-        expect(appState.length).to.be.greaterThan(20);
       });
     });
 
diff --git a/test/functional/apps/management/_mgmt_import_saved_objects.js b/test/functional/apps/management/_mgmt_import_saved_objects.js
index 8697dc49de46a..84e57a798c006 100644
--- a/test/functional/apps/management/_mgmt_import_saved_objects.js
+++ b/test/functional/apps/management/_mgmt_import_saved_objects.js
@@ -19,12 +19,12 @@ export default function ({ getService, getPageObjects }) {
   describe('mgmt saved objects', function describeIndexTests() {
     beforeEach(async function () {
       await esArchiver.emptyKibanaIndex();
-      await esArchiver.load('discover');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
       await PageObjects.settings.navigateTo();
     });
 
     afterEach(async function () {
-      await esArchiver.unload('discover');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/discover');
     });
 
     it('should import saved objects mgmt', async function () {
diff --git a/test/functional/apps/management/_runtime_fields.js b/test/functional/apps/management/_runtime_fields.js
index 44abf07b38ac6..105e1a394fecb 100644
--- a/test/functional/apps/management/_runtime_fields.js
+++ b/test/functional/apps/management/_runtime_fields.js
@@ -23,7 +23,7 @@ export default function ({ getService, getPageObjects }) {
 
     before(async function () {
       await browser.setWindowSize(1200, 800);
-      await esArchiver.load('discover');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
       // delete .kibana index and then wait for Kibana to re-create it
       await kibanaServer.uiSettings.replace({});
       await kibanaServer.uiSettings.update({});
diff --git a/test/functional/apps/management/_scripted_fields.js b/test/functional/apps/management/_scripted_fields.js
index c7a4c8c51bf44..2ff9e55c59ebb 100644
--- a/test/functional/apps/management/_scripted_fields.js
+++ b/test/functional/apps/management/_scripted_fields.js
@@ -46,7 +46,7 @@ export default function ({ getService, getPageObjects }) {
 
     before(async function () {
       await browser.setWindowSize(1200, 800);
-      await esArchiver.load('discover');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
       // delete .kibana index and then wait for Kibana to re-create it
       await kibanaServer.uiSettings.replace({});
       await kibanaServer.uiSettings.update({ 'doc_table:legacy': true });
diff --git a/test/functional/apps/management/_scripted_fields_filter.js b/test/functional/apps/management/_scripted_fields_filter.js
index 7ed15a6cddbca..6ced089936e5e 100644
--- a/test/functional/apps/management/_scripted_fields_filter.js
+++ b/test/functional/apps/management/_scripted_fields_filter.js
@@ -20,14 +20,14 @@ export default function ({ getService, getPageObjects }) {
     before(async function () {
       // delete .kibana index and then wait for Kibana to re-create it
       await browser.setWindowSize(1200, 800);
-      await esArchiver.load('management');
+      await esArchiver.load('test/functional/fixtures/es_archiver/management');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'f1e4c910-a2e6-11e7-bb30-233be9be6a15',
       });
     });
 
     after(async function () {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
     });
 
     const scriptedPainlessFieldName = 'ram_pain1';
diff --git a/test/functional/apps/management/_test_huge_fields.js b/test/functional/apps/management/_test_huge_fields.js
index dcfb8cf8b4c6b..c8710a79e4fc8 100644
--- a/test/functional/apps/management/_test_huge_fields.js
+++ b/test/functional/apps/management/_test_huge_fields.js
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) {
     before(async function () {
       await security.testUser.setRoles(['kibana_admin', 'test_testhuge_reader'], false);
       await esArchiver.emptyKibanaIndex();
-      await esArchiver.loadIfNeeded('large_fields');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/large_fields');
       await PageObjects.settings.navigateTo();
       await PageObjects.settings.createIndexPattern('testhuge', 'date');
     });
@@ -33,7 +33,7 @@ export default function ({ getService, getPageObjects }) {
 
     after(async () => {
       await security.testUser.restoreDefaults();
-      await esArchiver.unload('large_fields');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/large_fields');
     });
   });
 }
diff --git a/test/functional/apps/management/index.ts b/test/functional/apps/management/index.ts
index ac0df0aa90c4d..c8049d2db4b28 100644
--- a/test/functional/apps/management/index.ts
+++ b/test/functional/apps/management/index.ts
@@ -13,12 +13,12 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
   describe('management', function () {
     before(async () => {
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.loadIfNeeded('makelogs');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/makelogs');
     });
 
     after(async () => {
-      await esArchiver.unload('makelogs');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/makelogs');
     });
 
     describe('', function () {
diff --git a/test/functional/apps/saved_objects_management/edit_saved_object.ts b/test/functional/apps/saved_objects_management/edit_saved_object.ts
index 89889088bd73b..a90e927416685 100644
--- a/test/functional/apps/saved_objects_management/edit_saved_object.ts
+++ b/test/functional/apps/saved_objects_management/edit_saved_object.ts
@@ -57,11 +57,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('saved objects edition page', () => {
     beforeEach(async () => {
-      await esArchiver.load('saved_objects_management/edit_saved_object');
+      await esArchiver.load(
+        'test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('saved_objects_management/edit_saved_object');
+      await esArchiver.unload(
+        'test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object'
+      );
     });
 
     it('allows to update the saved object when submitting', async () => {
diff --git a/test/functional/apps/saved_objects_management/show_relationships.ts b/test/functional/apps/saved_objects_management/show_relationships.ts
index 92c65323333d0..26fd2a00430f1 100644
--- a/test/functional/apps/saved_objects_management/show_relationships.ts
+++ b/test/functional/apps/saved_objects_management/show_relationships.ts
@@ -15,11 +15,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('saved objects relationships flyout', () => {
     beforeEach(async () => {
-      await esArchiver.load('saved_objects_management/show_relationships');
+      await esArchiver.load(
+        'test/functional/fixtures/es_archiver/saved_objects_management/show_relationships'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('saved_objects_management/show_relationships');
+      await esArchiver.unload(
+        'test/functional/fixtures/es_archiver/saved_objects_management/show_relationships'
+      );
     });
 
     it('displays the invalid references', async () => {
diff --git a/test/functional/apps/timelion/index.js b/test/functional/apps/timelion/index.js
index 8fba1a5ae2e5b..b81a0e70d8a6d 100644
--- a/test/functional/apps/timelion/index.js
+++ b/test/functional/apps/timelion/index.js
@@ -18,7 +18,7 @@ export default function ({ getService, loadTestFile }) {
     before(async function () {
       log.debug('Starting timelion before method');
       await browser.setWindowSize(1280, 800);
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
     });
 
diff --git a/test/functional/apps/visualize/_area_chart.ts b/test/functional/apps/visualize/_area_chart.ts
index 99f65458bb606..be777607c7836 100644
--- a/test/functional/apps/visualize/_area_chart.ts
+++ b/test/functional/apps/visualize/_area_chart.ts
@@ -34,8 +34,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     );
 
   describe('area charts', function indexPatternCreation() {
+    let isNewChartsLibraryEnabled = false;
     before(async () => {
-      await PageObjects.visualize.initTests();
+      isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
+      await PageObjects.visualize.initTests(isNewChartsLibraryEnabled);
     });
     const initAreaChart = async () => {
       log.debug('navigateToApp visualize');
diff --git a/test/functional/apps/visualize/_histogram_request_start.ts b/test/functional/apps/visualize/_histogram_request_start.ts
index 8b5c31701d025..28ebb25744d3f 100644
--- a/test/functional/apps/visualize/_histogram_request_start.ts
+++ b/test/functional/apps/visualize/_histogram_request_start.ts
@@ -26,10 +26,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('histogram agg onSearchRequestStart', function () {
     before(async function () {
       // loading back default data
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
 
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('long_window_logstash');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
 
       await PageObjects.visualize.initTests();
       log.debug('navigateToApp visualize');
diff --git a/test/functional/apps/visualize/_line_chart_split_chart.ts b/test/functional/apps/visualize/_line_chart_split_chart.ts
index 91c1db533cee9..9b1c12de9666e 100644
--- a/test/functional/apps/visualize/_line_chart_split_chart.ts
+++ b/test/functional/apps/visualize/_line_chart_split_chart.ts
@@ -25,6 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   ]);
 
   describe('line charts - split chart', function () {
+    let isNewChartsLibraryEnabled = false;
     const initLineChart = async function () {
       log.debug('navigateToApp visualize');
       await PageObjects.visualize.navigateToNewAggBasedVisualization();
@@ -44,7 +45,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     };
 
     before(async () => {
-      await PageObjects.visualize.initTests();
+      isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
+      await PageObjects.visualize.initTests(isNewChartsLibraryEnabled);
       await initLineChart();
     });
 
diff --git a/test/functional/apps/visualize/_line_chart_split_series.ts b/test/functional/apps/visualize/_line_chart_split_series.ts
index 6630690b89c2c..1c4b34b855cde 100644
--- a/test/functional/apps/visualize/_line_chart_split_series.ts
+++ b/test/functional/apps/visualize/_line_chart_split_series.ts
@@ -25,6 +25,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   ]);
 
   describe('line charts - split series', function () {
+    let isNewChartsLibraryEnabled = false;
     const initLineChart = async function () {
       log.debug('navigateToApp visualize');
       await PageObjects.visualize.navigateToNewAggBasedVisualization();
@@ -42,7 +43,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     };
 
     before(async () => {
-      await PageObjects.visualize.initTests();
+      isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
+      await PageObjects.visualize.initTests(isNewChartsLibraryEnabled);
       await initLineChart();
     });
 
diff --git a/test/functional/apps/visualize/_pie_chart.ts b/test/functional/apps/visualize/_pie_chart.ts
index dd58ca6514c36..744ba3caa719e 100644
--- a/test/functional/apps/visualize/_pie_chart.ts
+++ b/test/functional/apps/visualize/_pie_chart.ts
@@ -15,6 +15,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const filterBar = getService('filterBar');
   const pieChart = getService('pieChart');
   const inspector = getService('inspector');
+
   const PageObjects = getPageObjects([
     'common',
     'visualize',
@@ -25,9 +26,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   ]);
 
   describe('pie chart', function () {
+    // Used to track flag before and after reset
+    let isNewChartsLibraryEnabled = false;
     const vizName1 = 'Visualization PieChart';
     before(async function () {
-      await PageObjects.visualize.initTests();
+      isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
+      await PageObjects.visualize.initTests(isNewChartsLibraryEnabled);
+
       log.debug('navigateToApp visualize');
       await PageObjects.visualize.navigateToNewAggBasedVisualization();
       log.debug('clickPieChart');
@@ -84,7 +89,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('other bucket', () => {
       it('should show other and missing bucket', async function () {
-        const expectedTableData = ['win 8', 'win xp', 'win 7', 'ios', 'Missing', 'Other'];
+        const expectedTableData = ['Missing', 'Other', 'ios', 'win 7', 'win 8', 'win xp'];
 
         await PageObjects.visualize.navigateToNewAggBasedVisualization();
         log.debug('clickPieChart');
@@ -168,7 +173,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           'ID',
           'BR',
           'Other',
-        ];
+        ].sort();
 
         await PageObjects.visEditor.toggleOpenEditor(2, 'false');
         await PageObjects.visEditor.clickBucket('Split slices');
@@ -190,7 +195,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('should show correct result with one agg disabled', async () => {
-        const expectedTableData = ['win 8', 'win xp', 'win 7', 'ios', 'osx'];
+        const expectedTableData = ['ios', 'osx', 'win 7', 'win 8', 'win xp'];
 
         await PageObjects.visEditor.clickBucket('Split slices');
         await PageObjects.visEditor.selectAggregation('Terms');
@@ -207,7 +212,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await PageObjects.visualize.loadSavedVisualization(vizName1);
         await PageObjects.visChart.waitForRenderingCount();
 
-        const expectedTableData = ['win 8', 'win xp', 'win 7', 'ios', 'osx'];
+        const expectedTableData = ['ios', 'osx', 'win 7', 'win 8', 'win xp'];
         await pieChart.expectPieChartLabels(expectedTableData);
       });
 
@@ -276,7 +281,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           'ios',
           'win 8',
           'osx',
-        ];
+        ].sort();
 
         await pieChart.expectPieChartLabels(expectedTableData);
       });
@@ -426,7 +431,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           'CN',
           '360,000',
           'CN',
-        ];
+        ].sort();
+        if (await PageObjects.visChart.isNewLibraryChart('visTypePieChart')) {
+          await PageObjects.visEditor.clickOptionsTab();
+          await PageObjects.visEditor.togglePieLegend();
+          await PageObjects.visEditor.togglePieNestedLegend();
+          await PageObjects.visEditor.clickDataTab();
+          await PageObjects.visEditor.clickGo();
+        }
         await PageObjects.visChart.filterLegend('CN');
         await PageObjects.visChart.waitForVisualization();
         await pieChart.expectPieChartLabels(expectedTableData);
diff --git a/test/functional/apps/visualize/_point_series_options.ts b/test/functional/apps/visualize/_point_series_options.ts
index b81feaf29e194..ee64fdf7ddda3 100644
--- a/test/functional/apps/visualize/_point_series_options.ts
+++ b/test/functional/apps/visualize/_point_series_options.ts
@@ -60,9 +60,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     await PageObjects.visEditor.clickGo();
   }
 
-  describe('vlad point series', function describeIndexTests() {
+  describe('point series', function describeIndexTests() {
+    let isNewChartsLibraryEnabled = false;
     before(async () => {
-      await PageObjects.visualize.initTests();
+      isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
+      await PageObjects.visualize.initTests(isNewChartsLibraryEnabled);
       await initChart();
     });
 
diff --git a/test/functional/apps/visualize/_tsvb_chart.ts b/test/functional/apps/visualize/_tsvb_chart.ts
index 690db676cb368..1d4d4fee0175e 100644
--- a/test/functional/apps/visualize/_tsvb_chart.ts
+++ b/test/functional/apps/visualize/_tsvb_chart.ts
@@ -127,7 +127,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('switch index patterns', () => {
       before(async () => {
-        await esArchiver.loadIfNeeded('index_pattern_without_timefield');
+        await esArchiver.loadIfNeeded(
+          'test/functional/fixtures/es_archiver/index_pattern_without_timefield'
+        );
       });
 
       beforeEach(async () => {
@@ -146,7 +148,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
       after(async () => {
         await security.testUser.restoreDefaults();
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
         await PageObjects.visualize.initTests();
       });
 
diff --git a/test/functional/apps/visualize/_vertical_bar_chart.ts b/test/functional/apps/visualize/_vertical_bar_chart.ts
index 1fe0d2f9a955b..a728757a485e1 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart.ts
+++ b/test/functional/apps/visualize/_vertical_bar_chart.ts
@@ -19,8 +19,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['visualize', 'visEditor', 'visChart', 'timePicker']);
 
   describe('vertical bar chart', function () {
+    let isNewChartsLibraryEnabled = false;
     before(async () => {
-      await PageObjects.visualize.initTests();
+      isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
+      await PageObjects.visualize.initTests(isNewChartsLibraryEnabled);
     });
 
     const vizName1 = 'Visualization VerticalBarChart';
diff --git a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.ts b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.ts
index 5f066e96c6e7c..97817315b5801 100644
--- a/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.ts
+++ b/test/functional/apps/visualize/_vertical_bar_chart_nontimeindex.ts
@@ -18,6 +18,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('vertical bar chart with index without time filter', function () {
     const vizName1 = 'Visualization VerticalBarChart without time filter';
+    let isNewChartsLibraryEnabled = false;
 
     const initBarChart = async () => {
       log.debug('navigateToApp visualize');
@@ -40,7 +41,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     };
 
     before(async () => {
-      await PageObjects.visualize.initTests();
+      isNewChartsLibraryEnabled = await PageObjects.visChart.isNewChartsLibraryEnabled();
+      await PageObjects.visualize.initTests(isNewChartsLibraryEnabled);
       await initBarChart();
     });
 
diff --git a/test/functional/apps/visualize/index.ts b/test/functional/apps/visualize/index.ts
index b87184bab3c0d..cecd206abd1db 100644
--- a/test/functional/apps/visualize/index.ts
+++ b/test/functional/apps/visualize/index.ts
@@ -18,10 +18,10 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     before(async () => {
       log.debug('Starting visualize before method');
       await browser.setWindowSize(1280, 800);
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('test/functional/fixtures/es_archiver/empty_kibana');
 
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('long_window_logstash');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
     });
 
     // TODO: Remove when vislib is removed
@@ -49,6 +49,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./_point_series_options'));
       loadTestFile(require.resolve('./_vertical_bar_chart'));
       loadTestFile(require.resolve('./_vertical_bar_chart_nontimeindex'));
+      loadTestFile(require.resolve('./_pie_chart'));
     });
 
     describe('visualize ciGroup9', function () {
diff --git a/test/functional/apps/visualize/input_control_vis/input_control_range.ts b/test/functional/apps/visualize/input_control_vis/input_control_range.ts
index 97e746ba4a4c0..566e6f033d2fd 100644
--- a/test/functional/apps/visualize/input_control_vis/input_control_range.ts
+++ b/test/functional/apps/visualize/input_control_vis/input_control_range.ts
@@ -22,7 +22,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     before(async () => {
       await PageObjects.visualize.initTests();
       await security.testUser.setRoles(['kibana_admin', 'kibana_sample_admin']);
-      await esArchiver.load('kibana_sample_data_flights_index_pattern');
+      await esArchiver.load(
+        'test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern'
+      );
       await visualize.navigateToNewVisualization();
       await visualize.clickInputControlVis();
     });
@@ -50,7 +52,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('kibana_sample_data_flights_index_pattern');
+      await esArchiver.unload(
+        'test/functional/fixtures/es_archiver/kibana_sample_data_flights_index_pattern'
+      );
       await security.testUser.restoreDefaults();
     });
   });
diff --git a/test/functional/apps/visualize/legacy/index.ts b/test/functional/apps/visualize/legacy/index.ts
index 914559e5cea92..4e43ec90d1699 100644
--- a/test/functional/apps/visualize/legacy/index.ts
+++ b/test/functional/apps/visualize/legacy/index.ts
@@ -21,8 +21,8 @@ export default function ({ getPageObjects, getService, loadTestFile }: FtrProvid
       await PageObjects.visualize.initTests();
       log.debug('Starting visualize legacy before method');
       await browser.setWindowSize(1280, 800);
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('long_window_logstash');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/long_window_logstash');
       await kibanaServer.importExport.load('visualize');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
diff --git a/test/functional/fixtures/es_archiver/dashboard/legacy/mappings.json b/test/functional/fixtures/es_archiver/dashboard/legacy/mappings.json
index a89fe1dfacfc8..45b2508d38033 100644
--- a/test/functional/fixtures/es_archiver/dashboard/legacy/mappings.json
+++ b/test/functional/fixtures/es_archiver/dashboard/legacy/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/deprecations_service/mappings.json b/test/functional/fixtures/es_archiver/deprecations_service/mappings.json
index 5f7c7e0e7b7dc..41cddecef0c41 100644
--- a/test/functional/fixtures/es_archiver/deprecations_service/mappings.json
+++ b/test/functional/fixtures/es_archiver/deprecations_service/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/discover/mappings.json b/test/functional/fixtures/es_archiver/discover/mappings.json
index 53bbe8a5baa5b..519af2dd75b9e 100644
--- a/test/functional/fixtures/es_archiver/discover/mappings.json
+++ b/test/functional/fixtures/es_archiver/discover/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/empty_kibana/mappings.json b/test/functional/fixtures/es_archiver/empty_kibana/mappings.json
index 403a891ba1175..264096beb11ee 100644
--- a/test/functional/fixtures/es_archiver/empty_kibana/mappings.json
+++ b/test/functional/fixtures/es_archiver/empty_kibana/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json b/test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json
index 9493408a30040..0888079ec7c52 100644
--- a/test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json
+++ b/test/functional/fixtures/es_archiver/index_pattern_without_timefield/data.json
@@ -5,7 +5,7 @@
     "index": ".kibana",
     "source": {
       "index-pattern": {
-        "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
+        "fields": "[]",
         "title": "without-timefield"
       },
       "type": "index-pattern"
@@ -20,7 +20,6 @@
     "index": "without-timefield",
     "source": {
       "@message" : "5",
-      "@timestamp": "2019-09-22T23:50:13.253Z",
       "referer": "http://twitter.com/error/takuya-onishi",
       "request": "/uploads/dafydd-williams.jpg",
       "response": "200",
@@ -37,7 +36,7 @@
     "index": ".kibana",
     "source": {
       "index-pattern": {
-        "fields": "[{\"name\":\"referer\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"agent\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"xss.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.lastname\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.dest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"utc_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.char\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"clientip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"machine.ram\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"links\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"id\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"phpmemory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.twitter:card.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"ip\",\"type\":\"ip\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:modified_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:site_name.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:tag\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"agent.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"headings\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"_source\",\"type\":\"_source\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.og:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"request\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"index.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"memory\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_index\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"relatedContent.twitter:site\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.coordinates\",\"type\":\"geo_point\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"meta.related\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@message.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.article:section\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"xss\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"links.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"geo.srcdest\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"extension.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"machine.os.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@tags\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"host.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:type.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"geo.src\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"spaces.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:image:height.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"url\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:site_name\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:title\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"@message\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.twitter:image.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"@timestamp\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"bytes\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"response\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"meta.user.firstname\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":true,\"doc_values\":false},{\"name\":\"relatedContent.og:image:width.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.og:description.raw\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"relatedContent.article:published_time\",\"type\":\"date\",\"count\":0,\"scripted\":false,\"indexed\":true,\"analyzed\":false,\"doc_values\":true},{\"name\":\"_id\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_type\",\"type\":\"string\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false},{\"name\":\"_score\",\"type\":\"number\",\"count\":0,\"scripted\":false,\"indexed\":false,\"analyzed\":false,\"doc_values\":false}]",
+        "fields": "[]",
         "title": "with-timefield",
         "timeFieldName": "@timestamp"
       },
diff --git a/test/functional/fixtures/es_archiver/index_pattern_without_timefield/mappings.json b/test/functional/fixtures/es_archiver/index_pattern_without_timefield/mappings.json
index 0096111923951..dd41e01592a7b 100644
--- a/test/functional/fixtures/es_archiver/index_pattern_without_timefield/mappings.json
+++ b/test/functional/fixtures/es_archiver/index_pattern_without_timefield/mappings.json
@@ -2,13 +2,6 @@
   "type": "index",
   "value": {
     "index": "without-timefield",
-    "mappings": {
-      "properties": {
-        "@timestamp": {
-          "type": "date"
-        }
-      }
-    },
     "settings": {
       "index": {
         "number_of_replicas": "0",
diff --git a/test/functional/fixtures/es_archiver/invalid_scripted_field/mappings.json b/test/functional/fixtures/es_archiver/invalid_scripted_field/mappings.json
index 0024c6943ed1c..63cc283f96d32 100644
--- a/test/functional/fixtures/es_archiver/invalid_scripted_field/mappings.json
+++ b/test/functional/fixtures/es_archiver/invalid_scripted_field/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/test/functional/fixtures/es_archiver/management/mappings.json b/test/functional/fixtures/es_archiver/management/mappings.json
index a89fe1dfacfc8..45b2508d38033 100644
--- a/test/functional/fixtures/es_archiver/management/mappings.json
+++ b/test/functional/fixtures/es_archiver/management/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/mgmt/mappings.json b/test/functional/fixtures/es_archiver/mgmt/mappings.json
index 28198102d3d68..aefbd9d0ccc8a 100644
--- a/test/functional/fixtures/es_archiver/mgmt/mappings.json
+++ b/test/functional/fixtures/es_archiver/mgmt/mappings.json
@@ -2,8 +2,9 @@
   "type": "index",
   "value": {
     "aliases": {
+      ".kibana": {}
     },
-    "index": ".kibana",
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json
index a89fe1dfacfc8..45b2508d38033 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_imports/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json
index 6a416126d7f26..05ca4d8e8307e 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/edit_saved_object/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/export_transform/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/export_transform/mappings.json
index 43b851e817fa8..653e639954813 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/export_transform/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/export_transform/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects/mappings.json
index 1de768d290d35..a158deb527cc8 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json
index a9abae009cb59..61763f55c1b6a 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/hidden_types/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform/data.json b/test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform/data.json
new file mode 100644
index 0000000000000..caac89461b9ef
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform/data.json
@@ -0,0 +1,87 @@
+{
+  "type": "doc",
+  "value": {
+    "index": ".kibana",
+    "type": "doc",
+    "id": "test-export-transform:type_1-obj_1",
+    "source": {
+      "test-export-transform": {
+        "title": "test_1-obj_1",
+        "enabled": true
+      },
+      "type": "test-export-transform",
+      "migrationVersion": {},
+      "updated_at": "2018-12-21T00:43:07.096Z",
+      "references": [
+        {
+          "type": "test-export-transform",
+          "id": "type_1-obj_2",
+          "name": "ref-1"
+        },
+        {
+          "type": "test-export-add",
+          "id": "type_2-obj_1",
+          "name": "ref-2"
+        }
+      ]
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "index": ".kibana",
+    "type": "doc",
+    "id": "test-export-transform:type_1-obj_2",
+    "source": {
+      "test-export-transform": {
+        "title": "test_1-obj_2",
+        "enabled": true
+      },
+      "type": "test-export-transform",
+      "migrationVersion": {},
+      "updated_at": "2018-12-21T00:43:07.096Z"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "index": ".kibana",
+    "type": "doc",
+    "id": "test-export-add:type_2-obj_1",
+    "source": {
+      "test-export-add": {
+        "title": "test_2-obj_1"
+      },
+      "type": "test-export-add",
+      "migrationVersion": {},
+      "updated_at": "2018-12-21T00:43:07.096Z"
+    }
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "index": ".kibana",
+    "type": "doc",
+    "id": "test-export-add-dep:type_dep-obj_1",
+    "source": {
+      "test-export-add-dep": {
+        "title": "type_dep-obj_1"
+      },
+      "type": "test-export-add-dep",
+      "migrationVersion": {},
+      "updated_at": "2018-12-21T00:43:07.096Z",
+      "references": [
+        {
+          "type": "test-export-add",
+          "id": "type_2-obj_1"
+        }
+      ]
+    }
+  }
+}
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform/mappings.json
new file mode 100644
index 0000000000000..653e639954813
--- /dev/null
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform/mappings.json
@@ -0,0 +1,502 @@
+{
+  "type": "index",
+  "value": {
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
+    "settings": {
+      "index": {
+        "number_of_shards": "1",
+        "auto_expand_replicas": "0-1",
+        "number_of_replicas": "0"
+      }
+    },
+    "mappings": {
+      "dynamic": "strict",
+      "properties": {
+        "test-export-transform": {
+          "properties": {
+            "title": { "type": "text" },
+            "enabled": { "type": "boolean" }
+          }
+        },
+        "test-export-add": {
+          "properties": {
+            "title": { "type": "text" }
+          }
+        },
+        "test-export-add-dep": {
+          "properties": {
+            "title": { "type": "text" }
+          }
+        },
+        "test-export-transform-error": {
+          "properties": {
+            "title": { "type": "text" }
+          }
+        },
+        "test-export-invalid-transform": {
+          "properties": {
+            "title": { "type": "text" }
+          }
+        },
+        "apm-telemetry": {
+          "properties": {
+            "has_any_services": {
+              "type": "boolean"
+            },
+            "services_per_agent": {
+              "properties": {
+                "go": {
+                  "type": "long",
+                  "null_value": 0
+                },
+                "java": {
+                  "type": "long",
+                  "null_value": 0
+                },
+                "js-base": {
+                  "type": "long",
+                  "null_value": 0
+                },
+                "nodejs": {
+                  "type": "long",
+                  "null_value": 0
+                },
+                "python": {
+                  "type": "long",
+                  "null_value": 0
+                },
+                "ruby": {
+                  "type": "long",
+                  "null_value": 0
+                }
+              }
+            }
+          }
+        },
+        "canvas-workpad": {
+          "dynamic": "false",
+          "properties": {
+            "@created": {
+              "type": "date"
+            },
+            "@timestamp": {
+              "type": "date"
+            },
+            "id": {
+              "type": "text",
+              "index": false
+            },
+            "name": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword"
+                }
+              }
+            }
+          }
+        },
+        "config": {
+          "dynamic": "true",
+          "properties": {
+            "accessibility:disableAnimations": {
+              "type": "boolean"
+            },
+            "buildNum": {
+              "type": "keyword"
+            },
+            "dateFormat:tz": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 256
+                }
+              }
+            },
+            "defaultIndex": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 256
+                }
+              }
+            },
+            "telemetry:optIn": {
+              "type": "boolean"
+            }
+          }
+        },
+        "dashboard": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "optionsJSON": {
+              "type": "text"
+            },
+            "panelsJSON": {
+              "type": "text"
+            },
+            "refreshInterval": {
+              "properties": {
+                "display": {
+                  "type": "keyword"
+                },
+                "pause": {
+                  "type": "boolean"
+                },
+                "section": {
+                  "type": "integer"
+                },
+                "value": {
+                  "type": "integer"
+                }
+              }
+            },
+            "timeFrom": {
+              "type": "keyword"
+            },
+            "timeRestore": {
+              "type": "boolean"
+            },
+            "timeTo": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "map": {
+          "properties": {
+            "bounds": {
+              "dynamic": false,
+              "properties": {}
+            },
+            "description": {
+              "type": "text"
+            },
+            "layerListJSON": {
+              "type": "text"
+            },
+            "mapStateJSON": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "graph-workspace": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "numLinks": {
+              "type": "integer"
+            },
+            "numVertices": {
+              "type": "integer"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "wsState": {
+              "type": "text"
+            }
+          }
+        },
+        "index-pattern": {
+          "properties": {
+            "fieldFormatMap": {
+              "type": "text"
+            },
+            "fields": {
+              "type": "text"
+            },
+            "intervalName": {
+              "type": "keyword"
+            },
+            "notExpandable": {
+              "type": "boolean"
+            },
+            "sourceFilters": {
+              "type": "text"
+            },
+            "timeFieldName": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "type": {
+              "type": "keyword"
+            },
+            "typeMeta": {
+              "type": "keyword"
+            }
+          }
+        },
+        "kql-telemetry": {
+          "properties": {
+            "optInCount": {
+              "type": "long"
+            },
+            "optOutCount": {
+              "type": "long"
+            }
+          }
+        },
+        "migrationVersion": {
+          "dynamic": "true",
+          "properties": {
+            "index-pattern": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 256
+                }
+              }
+            },
+            "space": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 256
+                }
+              }
+            }
+          }
+        },
+        "namespace": {
+          "type": "keyword"
+        },
+        "search": {
+          "properties": {
+            "columns": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "sort": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "server": {
+          "properties": {
+            "uuid": {
+              "type": "keyword"
+            }
+          }
+        },
+        "space": {
+          "properties": {
+            "_reserved": {
+              "type": "boolean"
+            },
+            "color": {
+              "type": "keyword"
+            },
+            "description": {
+              "type": "text"
+            },
+            "disabledFeatures": {
+              "type": "keyword"
+            },
+            "initials": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 2048
+                }
+              }
+            }
+          }
+        },
+        "spaceId": {
+          "type": "keyword"
+        },
+        "telemetry": {
+          "properties": {
+            "enabled": {
+              "type": "boolean"
+            }
+          }
+        },
+        "timelion-sheet": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "hits": {
+              "type": "integer"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "timelion_chart_height": {
+              "type": "integer"
+            },
+            "timelion_columns": {
+              "type": "integer"
+            },
+            "timelion_interval": {
+              "type": "keyword"
+            },
+            "timelion_other_interval": {
+              "type": "keyword"
+            },
+            "timelion_rows": {
+              "type": "integer"
+            },
+            "timelion_sheet": {
+              "type": "text"
+            },
+            "title": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            }
+          }
+        },
+        "type": {
+          "type": "keyword"
+        },
+        "updated_at": {
+          "type": "date"
+        },
+        "url": {
+          "properties": {
+            "accessCount": {
+              "type": "long"
+            },
+            "accessDate": {
+              "type": "date"
+            },
+            "createDate": {
+              "type": "date"
+            },
+            "url": {
+              "type": "text",
+              "fields": {
+                "keyword": {
+                  "type": "keyword",
+                  "ignore_above": 2048
+                }
+              }
+            }
+          }
+        },
+        "visualization": {
+          "properties": {
+            "description": {
+              "type": "text"
+            },
+            "kibanaSavedObjectMeta": {
+              "properties": {
+                "searchSourceJSON": {
+                  "type": "text"
+                }
+              }
+            },
+            "savedSearchId": {
+              "type": "keyword"
+            },
+            "title": {
+              "type": "text"
+            },
+            "uiStateJSON": {
+              "type": "text"
+            },
+            "version": {
+              "type": "integer"
+            },
+            "visState": {
+              "type": "text"
+            }
+          }
+        },
+        "references": {
+          "properties": {
+            "id": {
+              "type": "keyword"
+            },
+            "name": {
+              "type": "keyword"
+            },
+            "type": {
+              "type": "keyword"
+            }
+          },
+          "type": "nested"
+        }
+      }
+    }
+  }
+}
diff --git a/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json b/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json
index a5478a5805d50..aba581867bb8a 100644
--- a/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json
+++ b/test/functional/fixtures/es_archiver/saved_objects_management/show_relationships/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/test/functional/fixtures/es_archiver/timelion/mappings.json b/test/functional/fixtures/es_archiver/timelion/mappings.json
index a89fe1dfacfc8..45b2508d38033 100644
--- a/test/functional/fixtures/es_archiver/timelion/mappings.json
+++ b/test/functional/fixtures/es_archiver/timelion/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/visualize/mappings.json b/test/functional/fixtures/es_archiver/visualize/mappings.json
index 464f6751eac5c..59ec24853e227 100644
--- a/test/functional/fixtures/es_archiver/visualize/mappings.json
+++ b/test/functional/fixtures/es_archiver/visualize/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/visualize_embedding/mappings.json b/test/functional/fixtures/es_archiver/visualize_embedding/mappings.json
index a89fe1dfacfc8..45b2508d38033 100644
--- a/test/functional/fixtures/es_archiver/visualize_embedding/mappings.json
+++ b/test/functional/fixtures/es_archiver/visualize_embedding/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/visualize_source-filters/mappings.json b/test/functional/fixtures/es_archiver/visualize_source-filters/mappings.json
index a89fe1dfacfc8..45b2508d38033 100644
--- a/test/functional/fixtures/es_archiver/visualize_source-filters/mappings.json
+++ b/test/functional/fixtures/es_archiver/visualize_source-filters/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/fixtures/es_archiver/visualize_source_filters/mappings.json b/test/functional/fixtures/es_archiver/visualize_source_filters/mappings.json
index 0f17621dbf529..5ac113e7e4b74 100644
--- a/test/functional/fixtures/es_archiver/visualize_source_filters/mappings.json
+++ b/test/functional/fixtures/es_archiver/visualize_source_filters/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/test/functional/page_objects/common_page.ts b/test/functional/page_objects/common_page.ts
index bc60b8ce5f19c..49d56d6f43784 100644
--- a/test/functional/page_objects/common_page.ts
+++ b/test/functional/page_objects/common_page.ts
@@ -11,470 +11,465 @@ import expect from '@kbn/expect';
 // @ts-ignore
 import fetch from 'node-fetch';
 import { getUrl } from '@kbn/test';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function CommonPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
-  const config = getService('config');
-  const browser = getService('browser');
-  const retry = getService('retry');
-  const find = getService('find');
-  const globalNav = getService('globalNav');
-  const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['login']);
-
-  const defaultTryTimeout = config.get('timeouts.try');
-  const defaultFindTimeout = config.get('timeouts.find');
-
-  interface NavigateProps {
-    appConfig: {};
-    ensureCurrentUrl: boolean;
-    shouldLoginIfPrompted: boolean;
-    useActualUrl: boolean;
-    insertTimestamp: boolean;
-  }
-
-  class CommonPage {
-    /**
-     * Logins to Kibana as default user and navigates to provided app
-     * @param appUrl Kibana URL
-     */
-    private async loginIfPrompted(appUrl: string, insertTimestamp: boolean) {
-      // Disable the welcome screen. This is relevant for environments
-      // which don't allow to use the yml setting, e.g. cloud production.
-      // It is done here so it applies to logins but also to a login re-use.
-      await browser.setLocalStorageItem('home:welcome:show', 'false');
-
-      let currentUrl = await browser.getCurrentUrl();
-      log.debug(`currentUrl = ${currentUrl}\n    appUrl = ${appUrl}`);
-      await testSubjects.find('kibanaChrome', 6 * defaultFindTimeout); // 60 sec waiting
-      const loginPage = currentUrl.includes('/login');
-      const wantedLoginPage = appUrl.includes('/login') || appUrl.includes('/logout');
-
-      if (loginPage && !wantedLoginPage) {
-        log.debug('Found login page');
-        if (config.get('security.disableTestUser')) {
-          await PageObjects.login.login(
-            config.get('servers.kibana.username'),
-            config.get('servers.kibana.password')
-          );
-        } else {
-          await PageObjects.login.login('test_user', 'changeme');
-        }
-
-        await find.byCssSelector(
-          '[data-test-subj="kibanaChrome"] nav:not(.ng-hide)',
-          6 * defaultFindTimeout
+import { FtrService } from '../ftr_provider_context';
+
+interface NavigateProps {
+  appConfig: {};
+  ensureCurrentUrl: boolean;
+  shouldLoginIfPrompted: boolean;
+  useActualUrl: boolean;
+  insertTimestamp: boolean;
+}
+export class CommonPageObject extends FtrService {
+  private readonly log = this.ctx.getService('log');
+  private readonly config = this.ctx.getService('config');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly find = this.ctx.getService('find');
+  private readonly globalNav = this.ctx.getService('globalNav');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly loginPage = this.ctx.getPageObject('login');
+
+  private readonly defaultTryTimeout = this.config.get('timeouts.try');
+  private readonly defaultFindTimeout = this.config.get('timeouts.find');
+
+  /**
+   * Logins to Kibana as default user and navigates to provided app
+   * @param appUrl Kibana URL
+   */
+  private async loginIfPrompted(appUrl: string, insertTimestamp: boolean) {
+    // Disable the welcome screen. This is relevant for environments
+    // which don't allow to use the yml setting, e.g. cloud production.
+    // It is done here so it applies to logins but also to a login re-use.
+    await this.browser.setLocalStorageItem('home:welcome:show', 'false');
+
+    let currentUrl = await this.browser.getCurrentUrl();
+    this.log.debug(`currentUrl = ${currentUrl}\n    appUrl = ${appUrl}`);
+    await this.testSubjects.find('kibanaChrome', 6 * this.defaultFindTimeout); // 60 sec waiting
+    const loginPage = currentUrl.includes('/login');
+    const wantedLoginPage = appUrl.includes('/login') || appUrl.includes('/logout');
+
+    if (loginPage && !wantedLoginPage) {
+      this.log.debug('Found login page');
+      if (this.config.get('security.disableTestUser')) {
+        await this.loginPage.login(
+          this.config.get('servers.kibana.username'),
+          this.config.get('servers.kibana.password')
         );
-        await browser.get(appUrl, insertTimestamp);
-        currentUrl = await browser.getCurrentUrl();
-        log.debug(`Finished login process currentUrl = ${currentUrl}`);
+      } else {
+        await this.loginPage.login('test_user', 'changeme');
       }
-      return currentUrl;
-    }
 
-    private async navigate(navigateProps: NavigateProps) {
-      const {
-        appConfig,
-        ensureCurrentUrl,
-        shouldLoginIfPrompted,
-        useActualUrl,
-        insertTimestamp,
-      } = navigateProps;
-      const appUrl = getUrl.noAuth(config.get('servers.kibana'), appConfig);
-
-      await retry.try(async () => {
-        if (useActualUrl) {
-          log.debug(`navigateToActualUrl ${appUrl}`);
-          await browser.get(appUrl);
-        } else {
-          log.debug(`navigateToUrl ${appUrl}`);
-          await browser.get(appUrl, insertTimestamp);
-        }
+      await this.find.byCssSelector(
+        '[data-test-subj="kibanaChrome"] nav:not(.ng-hide)',
+        6 * this.defaultFindTimeout
+      );
+      await this.browser.get(appUrl, insertTimestamp);
+      currentUrl = await this.browser.getCurrentUrl();
+      this.log.debug(`Finished login process currentUrl = ${currentUrl}`);
+    }
+    return currentUrl;
+  }
 
-        // accept alert if it pops up
-        const alert = await browser.getAlert();
-        await alert?.accept();
+  private async navigate(navigateProps: NavigateProps) {
+    const {
+      appConfig,
+      ensureCurrentUrl,
+      shouldLoginIfPrompted,
+      useActualUrl,
+      insertTimestamp,
+    } = navigateProps;
+    const appUrl = getUrl.noAuth(this.config.get('servers.kibana'), appConfig);
+
+    await this.retry.try(async () => {
+      if (useActualUrl) {
+        this.log.debug(`navigateToActualUrl ${appUrl}`);
+        await this.browser.get(appUrl);
+      } else {
+        this.log.debug(`navigateToUrl ${appUrl}`);
+        await this.browser.get(appUrl, insertTimestamp);
+      }
 
-        const currentUrl = shouldLoginIfPrompted
-          ? await this.loginIfPrompted(appUrl, insertTimestamp)
-          : await browser.getCurrentUrl();
+      // accept alert if it pops up
+      const alert = await this.browser.getAlert();
+      await alert?.accept();
 
-        if (ensureCurrentUrl && !currentUrl.includes(appUrl)) {
-          throw new Error(`expected ${currentUrl}.includes(${appUrl})`);
-        }
-      });
-    }
+      const currentUrl = shouldLoginIfPrompted
+        ? await this.loginIfPrompted(appUrl, insertTimestamp)
+        : await this.browser.getCurrentUrl();
 
-    /**
-     * Navigates browser using the pathname from the appConfig and subUrl as the hash
-     * @param appName As defined in the apps config, e.g. 'home'
-     * @param subUrl The route after the hash (#), e.g. '/tutorial_directory/sampleData'
-     * @param args additional arguments
-     */
-    public async navigateToUrl(
-      appName: string,
-      subUrl?: string,
-      {
-        basePath = '',
-        ensureCurrentUrl = true,
-        shouldLoginIfPrompted = true,
-        useActualUrl = false,
-        insertTimestamp = true,
-        shouldUseHashForSubUrl = true,
-      } = {}
-    ) {
-      const appConfig: { pathname: string; hash?: string } = {
-        pathname: `${basePath}${config.get(['apps', appName]).pathname}`,
-      };
-
-      if (shouldUseHashForSubUrl) {
-        appConfig.hash = useActualUrl ? subUrl : `/${appName}/${subUrl}`;
-      } else {
-        appConfig.pathname += `/${subUrl}`;
+      if (ensureCurrentUrl && !currentUrl.includes(appUrl)) {
+        throw new Error(`expected ${currentUrl}.includes(${appUrl})`);
       }
+    });
+  }
 
-      await this.navigate({
-        appConfig,
-        ensureCurrentUrl,
-        shouldLoginIfPrompted,
-        useActualUrl,
-        insertTimestamp,
-      });
+  /**
+   * Navigates browser using the pathname from the appConfig and subUrl as the hash
+   * @param appName As defined in the apps config, e.g. 'home'
+   * @param subUrl The route after the hash (#), e.g. '/tutorial_directory/sampleData'
+   * @param args additional arguments
+   */
+  public async navigateToUrl(
+    appName: string,
+    subUrl?: string,
+    {
+      basePath = '',
+      ensureCurrentUrl = true,
+      shouldLoginIfPrompted = true,
+      useActualUrl = false,
+      insertTimestamp = true,
+      shouldUseHashForSubUrl = true,
+    } = {}
+  ) {
+    const appConfig: { pathname: string; hash?: string } = {
+      pathname: `${basePath}${this.config.get(['apps', appName]).pathname}`,
+    };
+
+    if (shouldUseHashForSubUrl) {
+      appConfig.hash = useActualUrl ? subUrl : `/${appName}/${subUrl}`;
+    } else {
+      appConfig.pathname += `/${subUrl}`;
     }
 
-    /**
-     * Navigates browser using the pathname from the appConfig and subUrl as the extended path.
-     * This was added to be able to test an application that uses browser history over hash history.
-     * @param appName As defined in the apps config, e.g. 'home'
-     * @param subUrl The route after the appUrl, e.g. '/tutorial_directory/sampleData'
-     * @param args additional arguments
-     */
-    public async navigateToUrlWithBrowserHistory(
-      appName: string,
-      subUrl?: string,
-      search?: string,
-      {
-        basePath = '',
-        ensureCurrentUrl = true,
-        shouldLoginIfPrompted = true,
-        useActualUrl = true,
-        insertTimestamp = true,
-      } = {}
-    ) {
-      const appConfig = {
-        // subUrl following the basePath, assumes no hashes.  Ex: 'app/endpoint/management'
-        pathname: `${basePath}${config.get(['apps', appName]).pathname}${subUrl}`,
-        search,
-      };
-
-      await this.navigate({
-        appConfig,
-        ensureCurrentUrl,
-        shouldLoginIfPrompted,
-        useActualUrl,
-        insertTimestamp,
-      });
-    }
+    await this.navigate({
+      appConfig,
+      ensureCurrentUrl,
+      shouldLoginIfPrompted,
+      useActualUrl,
+      insertTimestamp,
+    });
+  }
 
-    /**
-     * Navigates browser using only the pathname from the appConfig
-     * @param appName As defined in the apps config, e.g. 'kibana'
-     * @param hash The route after the hash (#), e.g. 'management/kibana/settings'
-     * @param args additional arguments
-     */
-    async navigateToActualUrl(
-      appName: string,
-      hash?: string,
-      { basePath = '', ensureCurrentUrl = true, shouldLoginIfPrompted = true } = {}
-    ) {
-      await this.navigateToUrl(appName, hash, {
-        basePath,
-        ensureCurrentUrl,
-        shouldLoginIfPrompted,
-        useActualUrl: true,
-      });
-    }
+  /**
+   * Navigates browser using the pathname from the appConfig and subUrl as the extended path.
+   * This was added to be able to test an application that uses browser history over hash history.
+   * @param appName As defined in the apps config, e.g. 'home'
+   * @param subUrl The route after the appUrl, e.g. '/tutorial_directory/sampleData'
+   * @param args additional arguments
+   */
+  public async navigateToUrlWithBrowserHistory(
+    appName: string,
+    subUrl?: string,
+    search?: string,
+    {
+      basePath = '',
+      ensureCurrentUrl = true,
+      shouldLoginIfPrompted = true,
+      useActualUrl = true,
+      insertTimestamp = true,
+    } = {}
+  ) {
+    const appConfig = {
+      // subUrl following the basePath, assumes no hashes.  Ex: 'app/endpoint/management'
+      pathname: `${basePath}${this.config.get(['apps', appName]).pathname}${subUrl}`,
+      search,
+    };
+
+    await this.navigate({
+      appConfig,
+      ensureCurrentUrl,
+      shouldLoginIfPrompted,
+      useActualUrl,
+      insertTimestamp,
+    });
+  }
 
-    async sleep(sleepMilliseconds: number) {
-      log.debug(`... sleep(${sleepMilliseconds}) start`);
-      await delay(sleepMilliseconds);
-      log.debug(`... sleep(${sleepMilliseconds}) end`);
-    }
+  /**
+   * Navigates browser using only the pathname from the appConfig
+   * @param appName As defined in the apps config, e.g. 'kibana'
+   * @param hash The route after the hash (#), e.g. 'management/kibana/settings'
+   * @param args additional arguments
+   */
+  async navigateToActualUrl(
+    appName: string,
+    hash?: string,
+    { basePath = '', ensureCurrentUrl = true, shouldLoginIfPrompted = true } = {}
+  ) {
+    await this.navigateToUrl(appName, hash, {
+      basePath,
+      ensureCurrentUrl,
+      shouldLoginIfPrompted,
+      useActualUrl: true,
+    });
+  }
 
-    async navigateToApp(
-      appName: string,
-      { basePath = '', shouldLoginIfPrompted = true, hash = '', insertTimestamp = true } = {}
-    ) {
-      let appUrl: string;
-      if (config.has(['apps', appName])) {
-        // Legacy applications
-        const appConfig = config.get(['apps', appName]);
-        appUrl = getUrl.noAuth(config.get('servers.kibana'), {
-          pathname: `${basePath}${appConfig.pathname}`,
-          hash: hash || appConfig.hash,
-        });
-      } else {
-        appUrl = getUrl.noAuth(config.get('servers.kibana'), {
-          pathname: `${basePath}/app/${appName}`,
-          hash,
-        });
-      }
+  async sleep(sleepMilliseconds: number) {
+    this.log.debug(`... sleep(${sleepMilliseconds}) start`);
+    await delay(sleepMilliseconds);
+    this.log.debug(`... sleep(${sleepMilliseconds}) end`);
+  }
 
-      log.debug('navigating to ' + appName + ' url: ' + appUrl);
-
-      await retry.tryForTime(defaultTryTimeout * 2, async () => {
-        let lastUrl = await retry.try(async () => {
-          // since we're using hash URLs, always reload first to force re-render
-          log.debug('navigate to: ' + appUrl);
-          await browser.get(appUrl, insertTimestamp);
-          // accept alert if it pops up
-          const alert = await browser.getAlert();
-          await alert?.accept();
-          await this.sleep(700);
-          log.debug('returned from get, calling refresh');
-          await browser.refresh();
-          let currentUrl = shouldLoginIfPrompted
-            ? await this.loginIfPrompted(appUrl, insertTimestamp)
-            : await browser.getCurrentUrl();
-
-          if (currentUrl.includes('app/kibana')) {
-            await testSubjects.find('kibanaChrome');
-          }
-
-          currentUrl = (await browser.getCurrentUrl()).replace(/\/\/\w+:\w+@/, '//');
-
-          const navSuccessful = currentUrl
-            .replace(':80/', '/')
-            .replace(':443/', '/')
-            .startsWith(appUrl);
-
-          if (!navSuccessful) {
-            const msg = `App failed to load: ${appName} in ${defaultFindTimeout}ms appUrl=${appUrl} currentUrl=${currentUrl}`;
-            log.debug(msg);
-            throw new Error(msg);
-          }
-          return currentUrl;
-        });
-
-        await retry.tryForTime(defaultFindTimeout, async () => {
-          await this.sleep(501);
-          const currentUrl = await browser.getCurrentUrl();
-          log.debug('in navigateTo url = ' + currentUrl);
-          if (lastUrl !== currentUrl) {
-            lastUrl = currentUrl;
-            throw new Error('URL changed, waiting for it to settle');
-          }
-        });
+  async navigateToApp(
+    appName: string,
+    { basePath = '', shouldLoginIfPrompted = true, hash = '', insertTimestamp = true } = {}
+  ) {
+    let appUrl: string;
+    if (this.config.has(['apps', appName])) {
+      // Legacy applications
+      const appConfig = this.config.get(['apps', appName]);
+      appUrl = getUrl.noAuth(this.config.get('servers.kibana'), {
+        pathname: `${basePath}${appConfig.pathname}`,
+        hash: hash || appConfig.hash,
+      });
+    } else {
+      appUrl = getUrl.noAuth(this.config.get('servers.kibana'), {
+        pathname: `${basePath}/app/${appName}`,
+        hash,
       });
     }
 
-    async waitUntilUrlIncludes(path: string) {
-      await retry.try(async () => {
-        const url = await browser.getCurrentUrl();
-        if (!url.includes(path)) {
-          throw new Error('Url not found');
+    this.log.debug('navigating to ' + appName + ' url: ' + appUrl);
+
+    await this.retry.tryForTime(this.defaultTryTimeout * 2, async () => {
+      let lastUrl = await this.retry.try(async () => {
+        // since we're using hash URLs, always reload first to force re-render
+        this.log.debug('navigate to: ' + appUrl);
+        await this.browser.get(appUrl, insertTimestamp);
+        // accept alert if it pops up
+        const alert = await this.browser.getAlert();
+        await alert?.accept();
+        await this.sleep(700);
+        this.log.debug('returned from get, calling refresh');
+        await this.browser.refresh();
+        let currentUrl = shouldLoginIfPrompted
+          ? await this.loginIfPrompted(appUrl, insertTimestamp)
+          : await this.browser.getCurrentUrl();
+
+        if (currentUrl.includes('app/kibana')) {
+          await this.testSubjects.find('kibanaChrome');
         }
-      });
-    }
 
-    async getSharedItemTitleAndDescription() {
-      const cssSelector = '[data-shared-item][data-title][data-description]';
-      const element = await find.byCssSelector(cssSelector);
+        currentUrl = (await this.browser.getCurrentUrl()).replace(/\/\/\w+:\w+@/, '//');
 
-      return {
-        title: await element.getAttribute('data-title'),
-        description: await element.getAttribute('data-description'),
-      };
-    }
+        const navSuccessful = currentUrl
+          .replace(':80/', '/')
+          .replace(':443/', '/')
+          .startsWith(appUrl);
 
-    async getSharedItemContainers() {
-      const cssSelector = '[data-shared-items-container]';
-      return find.allByCssSelector(cssSelector);
-    }
+        if (!navSuccessful) {
+          const msg = `App failed to load: ${appName} in ${this.defaultFindTimeout}ms appUrl=${appUrl} currentUrl=${currentUrl}`;
+          this.log.debug(msg);
+          throw new Error(msg);
+        }
+        return currentUrl;
+      });
 
-    async ensureModalOverlayHidden() {
-      return retry.try(async () => {
-        const shown = await testSubjects.exists('confirmModalTitleText');
-        if (shown) {
-          throw new Error('Modal overlay is showing');
+      await this.retry.tryForTime(this.defaultFindTimeout, async () => {
+        await this.sleep(501);
+        const currentUrl = await this.browser.getCurrentUrl();
+        this.log.debug('in navigateTo url = ' + currentUrl);
+        if (lastUrl !== currentUrl) {
+          lastUrl = currentUrl;
+          throw new Error('URL changed, waiting for it to settle');
         }
       });
-    }
+    });
+  }
 
-    async clickConfirmOnModal(ensureHidden = true) {
-      log.debug('Clicking modal confirm');
-      // make sure this data-test-subj 'confirmModalTitleText' exists because we're going to wait for it to be gone later
-      await testSubjects.exists('confirmModalTitleText');
-      await testSubjects.click('confirmModalConfirmButton');
-      if (ensureHidden) {
-        await this.ensureModalOverlayHidden();
+  async waitUntilUrlIncludes(path: string) {
+    await this.retry.try(async () => {
+      const url = await this.browser.getCurrentUrl();
+      if (!url.includes(path)) {
+        throw new Error('Url not found');
       }
-    }
+    });
+  }
 
-    async pressEnterKey() {
-      await browser.pressKeys(browser.keys.ENTER);
-    }
+  async getSharedItemTitleAndDescription() {
+    const cssSelector = '[data-shared-item][data-title][data-description]';
+    const element = await this.find.byCssSelector(cssSelector);
 
-    async pressTabKey() {
-      await browser.pressKeys(browser.keys.TAB);
-    }
+    return {
+      title: await element.getAttribute('data-title'),
+      description: await element.getAttribute('data-description'),
+    };
+  }
 
-    // Pause the browser at a certain place for debugging
-    // Not meant for usage in CI, only for dev-usage
-    async pause() {
-      return browser.pause();
-    }
+  async getSharedItemContainers() {
+    const cssSelector = '[data-shared-items-container]';
+    return this.find.allByCssSelector(cssSelector);
+  }
 
-    /**
-     * Clicks cancel button on modal
-     * @param overlayWillStay pass in true if your test will show multiple modals in succession
-     */
-    async clickCancelOnModal(overlayWillStay = true) {
-      log.debug('Clicking modal cancel');
-      await testSubjects.click('confirmModalCancelButton');
-      if (!overlayWillStay) {
-        await this.ensureModalOverlayHidden();
+  async ensureModalOverlayHidden() {
+    return this.retry.try(async () => {
+      const shown = await this.testSubjects.exists('confirmModalTitleText');
+      if (shown) {
+        throw new Error('Modal overlay is showing');
       }
-    }
+    });
+  }
 
-    async expectConfirmModalOpenState(state: boolean) {
-      log.debug(`expectConfirmModalOpenState(${state})`);
-      // we use retry here instead of a simple .exists() check because the modal
-      // fades in/out, which takes time, and we really only care that at some point
-      // the modal is either open or closed
-      await retry.try(async () => {
-        const actualState = await testSubjects.exists('confirmModalCancelButton');
-        expect(actualState).to.equal(
-          state,
-          state ? 'Confirm modal should be present' : 'Confirm modal should be hidden'
-        );
-      });
+  async clickConfirmOnModal(ensureHidden = true) {
+    this.log.debug('Clicking modal confirm');
+    // make sure this data-test-subj 'confirmModalTitleText' exists because we're going to wait for it to be gone later
+    await this.testSubjects.exists('confirmModalTitleText');
+    await this.testSubjects.click('confirmModalConfirmButton');
+    if (ensureHidden) {
+      await this.ensureModalOverlayHidden();
     }
+  }
 
-    async isChromeVisible() {
-      const globalNavShown = await globalNav.exists();
-      return globalNavShown;
-    }
+  async pressEnterKey() {
+    await this.browser.pressKeys(this.browser.keys.ENTER);
+  }
 
-    async isChromeHidden() {
-      const globalNavShown = await globalNav.exists();
-      return !globalNavShown;
-    }
+  async pressTabKey() {
+    await this.browser.pressKeys(this.browser.keys.TAB);
+  }
 
-    async waitForTopNavToBeVisible() {
-      await retry.try(async () => {
-        const isNavVisible = await testSubjects.exists('top-nav');
-        if (!isNavVisible) {
-          throw new Error('Local nav not visible yet');
-        }
-      });
+  // Pause the browser at a certain place for debugging
+  // Not meant for usage in CI, only for dev-usage
+  async pause() {
+    return this.browser.pause();
+  }
+
+  /**
+   * Clicks cancel button on modal
+   * @param overlayWillStay pass in true if your test will show multiple modals in succession
+   */
+  async clickCancelOnModal(overlayWillStay = true) {
+    this.log.debug('Clicking modal cancel');
+    await this.testSubjects.click('confirmModalCancelButton');
+    if (!overlayWillStay) {
+      await this.ensureModalOverlayHidden();
     }
+  }
 
-    async closeToast() {
-      const toast = await find.byCssSelector('.euiToast', 6 * defaultFindTimeout);
-      await toast.moveMouseTo();
-      const title = await (await find.byCssSelector('.euiToastHeader__title')).getVisibleText();
+  async expectConfirmModalOpenState(state: boolean) {
+    this.log.debug(`expectConfirmModalOpenState(${state})`);
+    // we use retry here instead of a simple .exists() check because the modal
+    // fades in/out, which takes time, and we really only care that at some point
+    // the modal is either open or closed
+    await this.retry.try(async () => {
+      const actualState = await this.testSubjects.exists('confirmModalCancelButton');
+      expect(actualState).to.equal(
+        state,
+        state ? 'Confirm modal should be present' : 'Confirm modal should be hidden'
+      );
+    });
+  }
 
-      await find.clickByCssSelector('.euiToast__closeButton');
-      return title;
-    }
+  async isChromeVisible() {
+    const globalNavShown = await this.globalNav.exists();
+    return globalNavShown;
+  }
 
-    async closeToastIfExists() {
-      const toastShown = await find.existsByCssSelector('.euiToast');
-      if (toastShown) {
-        try {
-          await find.clickByCssSelector('.euiToast__closeButton');
-        } catch (err) {
-          // ignore errors, toast clear themselves after timeout
-        }
-      }
-    }
+  async isChromeHidden() {
+    const globalNavShown = await this.globalNav.exists();
+    return !globalNavShown;
+  }
 
-    async clearAllToasts() {
-      const toasts = await find.allByCssSelector('.euiToast');
-      for (const toastElement of toasts) {
-        try {
-          await toastElement.moveMouseTo();
-          const closeBtn = await toastElement.findByCssSelector('.euiToast__closeButton');
-          await closeBtn.click();
-        } catch (err) {
-          // ignore errors, toast clear themselves after timeout
-        }
+  async waitForTopNavToBeVisible() {
+    await this.retry.try(async () => {
+      const isNavVisible = await this.testSubjects.exists('top-nav');
+      if (!isNavVisible) {
+        throw new Error('Local nav not visible yet');
       }
-    }
+    });
+  }
 
-    async getJsonBodyText() {
-      if (await find.existsByCssSelector('a[id=rawdata-tab]', defaultFindTimeout)) {
-        // Firefox has 3 tabs and requires navigation to see Raw output
-        await find.clickByCssSelector('a[id=rawdata-tab]');
-      }
-      const msgElements = await find.allByCssSelector('body pre');
-      if (msgElements.length > 0) {
-        return await msgElements[0].getVisibleText();
-      } else {
-        // Sometimes Firefox renders Timelion page without tabs and with div#json
-        const jsonElement = await find.byCssSelector('body div#json');
-        return await jsonElement.getVisibleText();
+  async closeToast() {
+    const toast = await this.find.byCssSelector('.euiToast', 6 * this.defaultFindTimeout);
+    await toast.moveMouseTo();
+    const title = await (await this.find.byCssSelector('.euiToastHeader__title')).getVisibleText();
+
+    await this.find.clickByCssSelector('.euiToast__closeButton');
+    return title;
+  }
+
+  async closeToastIfExists() {
+    const toastShown = await this.find.existsByCssSelector('.euiToast');
+    if (toastShown) {
+      try {
+        await this.find.clickByCssSelector('.euiToast__closeButton');
+      } catch (err) {
+        // ignore errors, toast clear themselves after timeout
       }
     }
+  }
 
-    async getBodyText() {
-      const body = await find.byCssSelector('body');
-      return await body.getVisibleText();
+  async clearAllToasts() {
+    const toasts = await this.find.allByCssSelector('.euiToast');
+    for (const toastElement of toasts) {
+      try {
+        await toastElement.moveMouseTo();
+        const closeBtn = await toastElement.findByCssSelector('.euiToast__closeButton');
+        await closeBtn.click();
+      } catch (err) {
+        // ignore errors, toast clear themselves after timeout
+      }
     }
+  }
 
-    async waitForSaveModalToClose() {
-      log.debug('Waiting for save modal to close');
-      await retry.try(async () => {
-        if (await testSubjects.exists('savedObjectSaveModal')) {
-          throw new Error('save modal still open');
-        }
-      });
+  async getJsonBodyText() {
+    if (await this.find.existsByCssSelector('a[id=rawdata-tab]', this.defaultFindTimeout)) {
+      // Firefox has 3 tabs and requires navigation to see Raw output
+      await this.find.clickByCssSelector('a[id=rawdata-tab]');
     }
-
-    async setFileInputPath(path: string) {
-      log.debug(`Setting the path '${path}' on the file input`);
-      const input = await find.byCssSelector('.euiFilePicker__input');
-      await input.type(path);
+    const msgElements = await this.find.allByCssSelector('body pre');
+    if (msgElements.length > 0) {
+      return await msgElements[0].getVisibleText();
+    } else {
+      // Sometimes Firefox renders Timelion page without tabs and with div#json
+      const jsonElement = await this.find.byCssSelector('body div#json');
+      return await jsonElement.getVisibleText();
     }
+  }
 
-    async scrollKibanaBodyTop() {
-      await browser.setScrollToById('kibana-body', 0, 0);
-    }
+  async getBodyText() {
+    const body = await this.find.byCssSelector('body');
+    return await body.getVisibleText();
+  }
 
-    /**
-     * Dismiss Banner if available.
-     */
-    async dismissBanner() {
-      if (await testSubjects.exists('global-banner-item')) {
-        const button = await find.byButtonText('Dismiss');
-        await button.click();
+  async waitForSaveModalToClose() {
+    this.log.debug('Waiting for save modal to close');
+    await this.retry.try(async () => {
+      if (await this.testSubjects.exists('savedObjectSaveModal')) {
+        throw new Error('save modal still open');
       }
-    }
+    });
+  }
 
-    /**
-     * Get visible text of the Welcome Banner
-     */
-    async getWelcomeText() {
-      return await testSubjects.getVisibleText('global-banner-item');
-    }
+  async setFileInputPath(path: string) {
+    this.log.debug(`Setting the path '${path}' on the file input`);
+    const input = await this.find.byCssSelector('.euiFilePicker__input');
+    await input.type(path);
+  }
+
+  async scrollKibanaBodyTop() {
+    await this.browser.setScrollToById('kibana-body', 0, 0);
+  }
 
-    /**
-     * Clicks on an element, and validates that the desired effect has taken place
-     * by confirming the existence of a validator
-     */
-    async clickAndValidate(
-      clickTarget: string,
-      validator: string,
-      isValidatorCssString: boolean = false,
-      topOffset?: number
-    ) {
-      await testSubjects.click(clickTarget, undefined, topOffset);
-      const validate = isValidatorCssString ? find.byCssSelector : testSubjects.exists;
-      await validate(validator);
+  /**
+   * Dismiss Banner if available.
+   */
+  async dismissBanner() {
+    if (await this.testSubjects.exists('global-banner-item')) {
+      const button = await this.find.byButtonText('Dismiss');
+      await button.click();
     }
   }
 
-  return new CommonPage();
+  /**
+   * Get visible text of the Welcome Banner
+   */
+  async getWelcomeText() {
+    return await this.testSubjects.getVisibleText('global-banner-item');
+  }
+
+  /**
+   * Clicks on an element, and validates that the desired effect has taken place
+   * by confirming the existence of a validator
+   */
+  async clickAndValidate(
+    clickTarget: string,
+    validator: string,
+    isValidatorCssString: boolean = false,
+    topOffset?: number
+  ) {
+    await this.testSubjects.click(clickTarget, undefined, topOffset);
+    const validate = isValidatorCssString ? this.find.byCssSelector : this.testSubjects.exists;
+    await validate(validator);
+  }
 }
diff --git a/test/functional/page_objects/console_page.ts b/test/functional/page_objects/console_page.ts
index 6fb554e6d34a0..77c87f6066e85 100644
--- a/test/functional/page_objects/console_page.ts
+++ b/test/functional/page_objects/console_page.ts
@@ -7,102 +7,98 @@
  */
 
 import { Key } from 'selenium-webdriver';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
-export function ConsolePageProvider({ getService }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const find = getService('find');
+export class ConsolePageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly find = this.ctx.getService('find');
 
-  class ConsolePage {
-    public async getVisibleTextFromAceEditor(editor: WebElementWrapper) {
-      const lines = await editor.findAllByClassName('ace_line_group');
-      const linesText = await Promise.all(lines.map(async (line) => await line.getVisibleText()));
-      return linesText.join('\n');
-    }
+  public async getVisibleTextFromAceEditor(editor: WebElementWrapper) {
+    const lines = await editor.findAllByClassName('ace_line_group');
+    const linesText = await Promise.all(lines.map(async (line) => await line.getVisibleText()));
+    return linesText.join('\n');
+  }
 
-    public async getRequestEditor() {
-      return await testSubjects.find('request-editor');
-    }
+  public async getRequestEditor() {
+    return await this.testSubjects.find('request-editor');
+  }
 
-    public async getRequest() {
-      const requestEditor = await this.getRequestEditor();
-      return await this.getVisibleTextFromAceEditor(requestEditor);
-    }
+  public async getRequest() {
+    const requestEditor = await this.getRequestEditor();
+    return await this.getVisibleTextFromAceEditor(requestEditor);
+  }
 
-    public async getResponse() {
-      const responseEditor = await testSubjects.find('response-editor');
-      return await this.getVisibleTextFromAceEditor(responseEditor);
-    }
+  public async getResponse() {
+    const responseEditor = await this.testSubjects.find('response-editor');
+    return await this.getVisibleTextFromAceEditor(responseEditor);
+  }
 
-    public async clickPlay() {
-      await testSubjects.click('sendRequestButton');
-    }
+  public async clickPlay() {
+    await this.testSubjects.click('sendRequestButton');
+  }
 
-    public async collapseHelp() {
-      await testSubjects.click('help-close-button');
-    }
+  public async collapseHelp() {
+    await this.testSubjects.click('help-close-button');
+  }
 
-    public async openSettings() {
-      await testSubjects.click('consoleSettingsButton');
-    }
+  public async openSettings() {
+    await this.testSubjects.click('consoleSettingsButton');
+  }
 
-    public async setFontSizeSetting(newSize: number) {
-      await this.openSettings();
+  public async setFontSizeSetting(newSize: number) {
+    await this.openSettings();
 
-      // while the settings form opens/loads this may fail, so retry for a while
-      await retry.try(async () => {
-        const fontSizeInput = await testSubjects.find('setting-font-size-input');
-        await fontSizeInput.clearValue({ withJS: true });
-        await fontSizeInput.click();
-        await fontSizeInput.type(String(newSize));
-      });
+    // while the settings form opens/loads this may fail, so retry for a while
+    await this.retry.try(async () => {
+      const fontSizeInput = await this.testSubjects.find('setting-font-size-input');
+      await fontSizeInput.clearValue({ withJS: true });
+      await fontSizeInput.click();
+      await fontSizeInput.type(String(newSize));
+    });
 
-      await testSubjects.click('settings-save-button');
-    }
+    await this.testSubjects.click('settings-save-button');
+  }
 
-    public async getFontSize(editor: WebElementWrapper) {
-      const aceLine = await editor.findByClassName('ace_line');
-      return await aceLine.getComputedStyle('font-size');
-    }
+  public async getFontSize(editor: WebElementWrapper) {
+    const aceLine = await editor.findByClassName('ace_line');
+    return await aceLine.getComputedStyle('font-size');
+  }
 
-    public async getRequestFontSize() {
-      return await this.getFontSize(await this.getRequestEditor());
-    }
+  public async getRequestFontSize() {
+    return await this.getFontSize(await this.getRequestEditor());
+  }
 
-    public async getEditor() {
-      return testSubjects.find('console-application');
-    }
+  public async getEditor() {
+    return this.testSubjects.find('console-application');
+  }
 
-    public async dismissTutorial() {
-      try {
-        const closeButton = await testSubjects.find('help-close-button');
-        await closeButton.click();
-      } catch (e) {
-        // Ignore because it is probably not there.
-      }
+  public async dismissTutorial() {
+    try {
+      const closeButton = await this.testSubjects.find('help-close-button');
+      await closeButton.click();
+    } catch (e) {
+      // Ignore because it is probably not there.
     }
+  }
 
-    public async promptAutocomplete() {
-      // This focusses the cursor on the bottom of the text area
-      const editor = await this.getEditor();
-      const content = await editor.findByCssSelector('.ace_content');
-      await content.click();
-      const textArea = await testSubjects.find('console-textarea');
-      // There should be autocomplete for this on all license levels
-      await textArea.pressKeys('\nGET s');
-      await textArea.pressKeys([Key.CONTROL, Key.SPACE]);
-    }
+  public async promptAutocomplete() {
+    // This focusses the cursor on the bottom of the text area
+    const editor = await this.getEditor();
+    const content = await editor.findByCssSelector('.ace_content');
+    await content.click();
+    const textArea = await this.testSubjects.find('console-textarea');
+    // There should be autocomplete for this on all license levels
+    await textArea.pressKeys('\nGET s');
+    await textArea.pressKeys([Key.CONTROL, Key.SPACE]);
+  }
 
-    public async hasAutocompleter(): Promise<boolean> {
-      try {
-        return Boolean(await find.byCssSelector('.ace_autocomplete'));
-      } catch (e) {
-        return false;
-      }
+  public async hasAutocompleter(): Promise<boolean> {
+    try {
+      return Boolean(await this.find.byCssSelector('.ace_autocomplete'));
+    } catch (e) {
+      return false;
     }
   }
-
-  return new ConsolePage();
 }
diff --git a/test/functional/page_objects/context_page.ts b/test/functional/page_objects/context_page.ts
index b758423d9346d..05ea89cb65b3d 100644
--- a/test/functional/page_objects/context_page.ts
+++ b/test/functional/page_objects/context_page.ts
@@ -8,93 +8,91 @@
 
 import rison from 'rison-node';
 import { getUrl } from '@kbn/test';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 const DEFAULT_INITIAL_STATE = {
   columns: ['@message'],
 };
 
-export function ContextPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const browser = getService('browser');
-  const config = getService('config');
-  const retry = getService('retry');
-  const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['header', 'common']);
-  const log = getService('log');
+export class ContextPageObject extends FtrService {
+  private readonly browser = this.ctx.getService('browser');
+  private readonly config = this.ctx.getService('config');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly log = this.ctx.getService('log');
 
-  class ContextPage {
-    public async navigateTo(indexPattern: string, anchorId: string, overrideInitialState = {}) {
-      const initialState = rison.encode({
-        ...DEFAULT_INITIAL_STATE,
-        ...overrideInitialState,
-      });
-      const appUrl = getUrl.noAuth(config.get('servers.kibana'), {
-        ...config.get('apps.context'),
-        hash: `${config.get('apps.context.hash')}/${indexPattern}/${anchorId}?_a=${initialState}`,
-      });
+  public async navigateTo(indexPattern: string, anchorId: string, overrideInitialState = {}) {
+    const initialState = rison.encode({
+      ...DEFAULT_INITIAL_STATE,
+      ...overrideInitialState,
+    });
+    const contextHash = this.config.get('apps.context.hash');
+    const appUrl = getUrl.noAuth(this.config.get('servers.kibana'), {
+      ...this.config.get('apps.context'),
+      hash: `${contextHash}/${indexPattern}/${anchorId}?_a=${initialState}`,
+    });
 
-      log.debug(`browser.get(${appUrl})`);
+    this.log.debug(`browser.get(${appUrl})`);
 
-      await browser.get(appUrl);
-      await PageObjects.header.awaitGlobalLoadingIndicatorHidden();
-      await this.waitUntilContextLoadingHasFinished();
-      // For lack of a better way, using a sleep to ensure page is loaded before proceeding
-      await PageObjects.common.sleep(1000);
-    }
-
-    public async getPredecessorCountPicker() {
-      return await testSubjects.find('predecessorsCountPicker');
-    }
+    await this.browser.get(appUrl);
+    await this.header.awaitGlobalLoadingIndicatorHidden();
+    await this.waitUntilContextLoadingHasFinished();
+    // For lack of a better way, using a sleep to ensure page is loaded before proceeding
+    await this.common.sleep(1000);
+  }
 
-    public async getSuccessorCountPicker() {
-      return await testSubjects.find('successorsCountPicker');
-    }
+  public async getPredecessorCountPicker() {
+    return await this.testSubjects.find('predecessorsCountPicker');
+  }
 
-    public async getPredecessorLoadMoreButton() {
-      return await testSubjects.find('predecessorsLoadMoreButton');
-    }
+  public async getSuccessorCountPicker() {
+    return await this.testSubjects.find('successorsCountPicker');
+  }
 
-    public async getSuccessorLoadMoreButton() {
-      return await testSubjects.find('successorsLoadMoreButton');
-    }
+  public async getPredecessorLoadMoreButton() {
+    return await this.testSubjects.find('predecessorsLoadMoreButton');
+  }
 
-    public async clickPredecessorLoadMoreButton() {
-      log.debug('Click Predecessor Load More Button');
-      await retry.try(async () => {
-        const predecessorButton = await this.getPredecessorLoadMoreButton();
-        await predecessorButton.click();
-      });
-      await this.waitUntilContextLoadingHasFinished();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async getSuccessorLoadMoreButton() {
+    return await this.testSubjects.find('successorsLoadMoreButton');
+  }
 
-    public async clickSuccessorLoadMoreButton() {
-      log.debug('Click Successor Load More Button');
-      await retry.try(async () => {
-        const sucessorButton = await this.getSuccessorLoadMoreButton();
-        await sucessorButton.click();
-      });
-      await this.waitUntilContextLoadingHasFinished();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async clickPredecessorLoadMoreButton() {
+    this.log.debug('Click Predecessor Load More Button');
+    await this.retry.try(async () => {
+      const predecessorButton = await this.getPredecessorLoadMoreButton();
+      await predecessorButton.click();
+    });
+    await this.waitUntilContextLoadingHasFinished();
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async waitUntilContextLoadingHasFinished() {
-      return await retry.try(async () => {
-        const successorLoadMoreButton = await this.getSuccessorLoadMoreButton();
-        const predecessorLoadMoreButton = await this.getPredecessorLoadMoreButton();
-        if (
-          !(
-            (await successorLoadMoreButton.isEnabled()) &&
-            (await successorLoadMoreButton.isDisplayed()) &&
-            (await predecessorLoadMoreButton.isEnabled()) &&
-            (await predecessorLoadMoreButton.isDisplayed())
-          )
-        ) {
-          throw new Error('loading context rows');
-        }
-      });
-    }
+  public async clickSuccessorLoadMoreButton() {
+    this.log.debug('Click Successor Load More Button');
+    await this.retry.try(async () => {
+      const sucessorButton = await this.getSuccessorLoadMoreButton();
+      await sucessorButton.click();
+    });
+    await this.waitUntilContextLoadingHasFinished();
+    await this.header.waitUntilLoadingHasFinished();
   }
 
-  return new ContextPage();
+  public async waitUntilContextLoadingHasFinished() {
+    return await this.retry.try(async () => {
+      const successorLoadMoreButton = await this.getSuccessorLoadMoreButton();
+      const predecessorLoadMoreButton = await this.getPredecessorLoadMoreButton();
+      if (
+        !(
+          (await successorLoadMoreButton.isEnabled()) &&
+          (await successorLoadMoreButton.isDisplayed()) &&
+          (await predecessorLoadMoreButton.isEnabled()) &&
+          (await predecessorLoadMoreButton.isDisplayed())
+        )
+      ) {
+        throw new Error('loading context rows');
+      }
+    });
+  }
 }
diff --git a/test/functional/page_objects/dashboard_page.ts b/test/functional/page_objects/dashboard_page.ts
index ba75ab75cc6e8..ecba9549cea02 100644
--- a/test/functional/page_objects/dashboard_page.ts
+++ b/test/functional/page_objects/dashboard_page.ts
@@ -9,668 +9,668 @@
 export const PIE_CHART_VIS_NAME = 'Visualization PieChart';
 export const AREA_CHART_VIS_NAME = 'Visualization漢字 AreaChart';
 export const LINE_CHART_VIS_NAME = 'Visualization漢字 LineChart';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function DashboardPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
-  const find = getService('find');
-  const retry = getService('retry');
-  const browser = getService('browser');
-  const globalNav = getService('globalNav');
-  const esArchiver = getService('esArchiver');
-  const kibanaServer = getService('kibanaServer');
-  const testSubjects = getService('testSubjects');
-  const dashboardAddPanel = getService('dashboardAddPanel');
-  const renderable = getService('renderable');
-  const listingTable = getService('listingTable');
-  const elasticChart = getService('elasticChart');
-  const PageObjects = getPageObjects(['common', 'header', 'visualize', 'discover']);
-
-  interface SaveDashboardOptions {
-    /**
-     * @default true
-     */
-    waitDialogIsClosed?: boolean;
-    exitFromEditMode?: boolean;
-    needsConfirm?: boolean;
-    storeTimeWithDashboard?: boolean;
-    saveAsNew?: boolean;
-    tags?: string[];
-  }
-
-  class DashboardPage {
-    async initTests({ kibanaIndex = 'dashboard/legacy', defaultIndex = 'logstash-*' } = {}) {
-      log.debug('load kibana index with visualizations and log data');
-      await esArchiver.load(kibanaIndex);
-      await kibanaServer.uiSettings.replace({ defaultIndex });
-      await PageObjects.common.navigateToApp('dashboard');
-    }
-
-    public async preserveCrossAppState() {
-      const url = await browser.getCurrentUrl();
-      await browser.get(url, false);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    public async clickFullScreenMode() {
-      log.debug(`clickFullScreenMode`);
-      await testSubjects.click('dashboardFullScreenMode');
-      await testSubjects.exists('exitFullScreenModeLogo');
-      await this.waitForRenderComplete();
-    }
-
-    public async exitFullScreenMode() {
-      log.debug(`exitFullScreenMode`);
-      const logoButton = await this.getExitFullScreenLogoButton();
-      await logoButton.moveMouseTo();
-      await this.clickExitFullScreenTextButton();
-    }
-
-    public async fullScreenModeMenuItemExists() {
-      return await testSubjects.exists('dashboardFullScreenMode');
-    }
+import { FtrService } from '../ftr_provider_context';
+
+interface SaveDashboardOptions {
+  /**
+   * @default true
+   */
+  waitDialogIsClosed?: boolean;
+  exitFromEditMode?: boolean;
+  needsConfirm?: boolean;
+  storeTimeWithDashboard?: boolean;
+  saveAsNew?: boolean;
+  tags?: string[];
+}
 
-    public async exitFullScreenTextButtonExists() {
-      return await testSubjects.exists('exitFullScreenModeText');
-    }
+export class DashboardPageObject extends FtrService {
+  private readonly log = this.ctx.getService('log');
+  private readonly find = this.ctx.getService('find');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly globalNav = this.ctx.getService('globalNav');
+  private readonly esArchiver = this.ctx.getService('esArchiver');
+  private readonly kibanaServer = this.ctx.getService('kibanaServer');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly dashboardAddPanel = this.ctx.getService('dashboardAddPanel');
+  private readonly renderable = this.ctx.getService('renderable');
+  private readonly listingTable = this.ctx.getService('listingTable');
+  private readonly elasticChart = this.ctx.getService('elasticChart');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly visualize = this.ctx.getPageObject('visualize');
+  private readonly discover = this.ctx.getPageObject('discover');
+
+  async initTests({
+    kibanaIndex = 'test/functional/fixtures/es_archiver/dashboard/legacy',
+    defaultIndex = 'logstash-*',
+  } = {}) {
+    this.log.debug('load kibana index with visualizations and log data');
+    await this.esArchiver.load(kibanaIndex);
+    await this.kibanaServer.uiSettings.replace({ defaultIndex });
+    await this.common.navigateToApp('dashboard');
+  }
 
-    public async getExitFullScreenTextButton() {
-      return await testSubjects.find('exitFullScreenModeText');
-    }
+  public async preserveCrossAppState() {
+    const url = await this.browser.getCurrentUrl();
+    await this.browser.get(url, false);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async exitFullScreenLogoButtonExists() {
-      return await testSubjects.exists('exitFullScreenModeLogo');
-    }
+  public async clickFullScreenMode() {
+    this.log.debug(`clickFullScreenMode`);
+    await this.testSubjects.click('dashboardFullScreenMode');
+    await this.testSubjects.exists('exitFullScreenModeLogo');
+    await this.waitForRenderComplete();
+  }
 
-    public async getExitFullScreenLogoButton() {
-      return await testSubjects.find('exitFullScreenModeLogo');
-    }
+  public async exitFullScreenMode() {
+    this.log.debug(`exitFullScreenMode`);
+    const logoButton = await this.getExitFullScreenLogoButton();
+    await logoButton.moveMouseTo();
+    await this.clickExitFullScreenTextButton();
+  }
 
-    public async clickExitFullScreenLogoButton() {
-      await testSubjects.click('exitFullScreenModeLogo');
-      await this.waitForRenderComplete();
-    }
+  public async fullScreenModeMenuItemExists() {
+    return await this.testSubjects.exists('dashboardFullScreenMode');
+  }
 
-    public async clickExitFullScreenTextButton() {
-      await testSubjects.click('exitFullScreenModeText');
-      await this.waitForRenderComplete();
-    }
+  public async exitFullScreenTextButtonExists() {
+    return await this.testSubjects.exists('exitFullScreenModeText');
+  }
 
-    public async getDashboardIdFromCurrentUrl() {
-      const currentUrl = await browser.getCurrentUrl();
-      const id = this.getDashboardIdFromUrl(currentUrl);
+  public async getExitFullScreenTextButton() {
+    return await this.testSubjects.find('exitFullScreenModeText');
+  }
 
-      log.debug(`Dashboard id extracted from ${currentUrl} is ${id}`);
+  public async exitFullScreenLogoButtonExists() {
+    return await this.testSubjects.exists('exitFullScreenModeLogo');
+  }
 
-      return id;
-    }
+  public async getExitFullScreenLogoButton() {
+    return await this.testSubjects.find('exitFullScreenModeLogo');
+  }
 
-    public getDashboardIdFromUrl(url: string) {
-      const urlSubstring = '#/view/';
-      const startOfIdIndex = url.indexOf(urlSubstring) + urlSubstring.length;
-      const endIndex = url.indexOf('?');
-      const id = url.substring(startOfIdIndex, endIndex < 0 ? url.length : endIndex);
-      return id;
-    }
+  public async clickExitFullScreenLogoButton() {
+    await this.testSubjects.click('exitFullScreenModeLogo');
+    await this.waitForRenderComplete();
+  }
 
-    public async expectUnsavedChangesListingExists(title: string) {
-      log.debug(`Expect Unsaved Changes Listing Exists for `, title);
-      await testSubjects.existOrFail(`edit-unsaved-${title.split(' ').join('-')}`);
-    }
+  public async clickExitFullScreenTextButton() {
+    await this.testSubjects.click('exitFullScreenModeText');
+    await this.waitForRenderComplete();
+  }
 
-    public async expectUnsavedChangesDoesNotExist(title: string) {
-      log.debug(`Expect Unsaved Changes Listing Does Not Exist for `, title);
-      await testSubjects.missingOrFail(`edit-unsaved-${title.split(' ').join('-')}`);
-    }
+  public async getDashboardIdFromCurrentUrl() {
+    const currentUrl = await this.browser.getCurrentUrl();
+    const id = this.getDashboardIdFromUrl(currentUrl);
 
-    public async clickUnsavedChangesContinueEditing(title: string) {
-      log.debug(`Click Unsaved Changes Continue Editing `, title);
-      await testSubjects.existOrFail(`edit-unsaved-${title.split(' ').join('-')}`);
-      await testSubjects.click(`edit-unsaved-${title.split(' ').join('-')}`);
-    }
+    this.log.debug(`Dashboard id extracted from ${currentUrl} is ${id}`);
 
-    public async clickUnsavedChangesDiscard(title: string, confirmDiscard = true) {
-      log.debug(`Click Unsaved Changes Discard for `, title);
-      await testSubjects.existOrFail(`discard-unsaved-${title.split(' ').join('-')}`);
-      await testSubjects.click(`discard-unsaved-${title.split(' ').join('-')}`);
-      if (confirmDiscard) {
-        await PageObjects.common.clickConfirmOnModal();
-      } else {
-        await PageObjects.common.clickCancelOnModal();
-      }
-    }
+    return id;
+  }
 
-    /**
-     * Returns true if already on the dashboard landing page (that page doesn't have a link to itself).
-     * @returns {Promise<boolean>}
-     */
-    public async onDashboardLandingPage() {
-      log.debug(`onDashboardLandingPage`);
-      return await listingTable.onListingPage('dashboard');
-    }
+  public getDashboardIdFromUrl(url: string) {
+    const urlSubstring = '#/view/';
+    const startOfIdIndex = url.indexOf(urlSubstring) + urlSubstring.length;
+    const endIndex = url.indexOf('?');
+    const id = url.substring(startOfIdIndex, endIndex < 0 ? url.length : endIndex);
+    return id;
+  }
 
-    public async expectExistsDashboardLandingPage() {
-      log.debug(`expectExistsDashboardLandingPage`);
-      await testSubjects.existOrFail('dashboardLandingPage');
-    }
+  public async expectUnsavedChangesListingExists(title: string) {
+    this.log.debug(`Expect Unsaved Changes Listing Exists for `, title);
+    await this.testSubjects.existOrFail(`edit-unsaved-${title.split(' ').join('-')}`);
+  }
 
-    public async clickDashboardBreadcrumbLink() {
-      log.debug('clickDashboardBreadcrumbLink');
-      await testSubjects.click('breadcrumb dashboardListingBreadcrumb first');
-    }
+  public async expectUnsavedChangesDoesNotExist(title: string) {
+    this.log.debug(`Expect Unsaved Changes Listing Does Not Exist for `, title);
+    await this.testSubjects.missingOrFail(`edit-unsaved-${title.split(' ').join('-')}`);
+  }
 
-    public async expectOnDashboard(dashboardTitle: string) {
-      await retry.waitFor(
-        'last breadcrumb to have dashboard title',
-        async () => (await globalNav.getLastBreadcrumb()) === dashboardTitle
-      );
-    }
+  public async clickUnsavedChangesContinueEditing(title: string) {
+    this.log.debug(`Click Unsaved Changes Continue Editing `, title);
+    await this.testSubjects.existOrFail(`edit-unsaved-${title.split(' ').join('-')}`);
+    await this.testSubjects.click(`edit-unsaved-${title.split(' ').join('-')}`);
+  }
 
-    public async gotoDashboardLandingPage(ignorePageLeaveWarning = true) {
-      log.debug('gotoDashboardLandingPage');
-      const onPage = await this.onDashboardLandingPage();
-      if (!onPage) {
-        await this.clickDashboardBreadcrumbLink();
-        await retry.try(async () => {
-          const warning = await testSubjects.exists('confirmModalTitleText');
-          if (warning) {
-            await testSubjects.click(
-              ignorePageLeaveWarning ? 'confirmModalConfirmButton' : 'confirmModalCancelButton'
-            );
-          }
-        });
-        await this.expectExistsDashboardLandingPage();
-      }
+  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('-')}`);
+    if (confirmDiscard) {
+      await this.common.clickConfirmOnModal();
+    } else {
+      await this.common.clickCancelOnModal();
     }
+  }
 
-    public async clickClone() {
-      log.debug('Clicking clone');
-      await testSubjects.click('dashboardClone');
-    }
+  /**
+   * Returns true if already on the dashboard landing page (that page doesn't have a link to itself).
+   * @returns {Promise<boolean>}
+   */
+  public async onDashboardLandingPage() {
+    this.log.debug(`onDashboardLandingPage`);
+    return await this.listingTable.onListingPage('dashboard');
+  }
 
-    public async getCloneTitle() {
-      return await testSubjects.getAttribute('clonedDashboardTitle', 'value');
-    }
+  public async expectExistsDashboardLandingPage() {
+    this.log.debug(`expectExistsDashboardLandingPage`);
+    await this.testSubjects.existOrFail('dashboardLandingPage');
+  }
 
-    public async confirmClone() {
-      log.debug('Confirming clone');
-      await testSubjects.click('cloneConfirmButton');
-    }
+  public async clickDashboardBreadcrumbLink() {
+    this.log.debug('clickDashboardBreadcrumbLink');
+    await this.testSubjects.click('breadcrumb dashboardListingBreadcrumb first');
+  }
 
-    public async cancelClone() {
-      log.debug('Canceling clone');
-      await testSubjects.click('cloneCancelButton');
-    }
+  public async expectOnDashboard(dashboardTitle: string) {
+    await this.retry.waitFor(
+      'last breadcrumb to have dashboard title',
+      async () => (await this.globalNav.getLastBreadcrumb()) === dashboardTitle
+    );
+  }
 
-    public async setClonedDashboardTitle(title: string) {
-      await testSubjects.setValue('clonedDashboardTitle', title);
+  public async gotoDashboardLandingPage(ignorePageLeaveWarning = true) {
+    this.log.debug('gotoDashboardLandingPage');
+    const onPage = await this.onDashboardLandingPage();
+    if (!onPage) {
+      await this.clickDashboardBreadcrumbLink();
+      await this.retry.try(async () => {
+        const warning = await this.testSubjects.exists('confirmModalTitleText');
+        if (warning) {
+          await this.testSubjects.click(
+            ignorePageLeaveWarning ? 'confirmModalConfirmButton' : 'confirmModalCancelButton'
+          );
+        }
+      });
+      await this.expectExistsDashboardLandingPage();
     }
+  }
 
-    /**
-     * Asserts that the duplicate title warning is either displayed or not displayed.
-     * @param { displayed: boolean }
-     */
-    public async expectDuplicateTitleWarningDisplayed({ displayed = true }) {
-      if (displayed) {
-        await testSubjects.existOrFail('titleDupicateWarnMsg');
-      } else {
-        await testSubjects.missingOrFail('titleDupicateWarnMsg');
-      }
-    }
+  public async clickClone() {
+    this.log.debug('Clicking clone');
+    await this.testSubjects.click('dashboardClone');
+  }
 
-    /**
-     * Asserts that the toolbar pagination (count and arrows) is either displayed or not displayed.
+  public async getCloneTitle() {
+    return await this.testSubjects.getAttribute('clonedDashboardTitle', 'value');
+  }
 
-     */
-    public async expectToolbarPaginationDisplayed() {
-      const isLegacyDefault = PageObjects.discover.useLegacyTable();
-      if (isLegacyDefault) {
-        const subjects = ['btnPrevPage', 'btnNextPage', 'toolBarPagerText'];
-        await Promise.all(subjects.map(async (subj) => await testSubjects.existOrFail(subj)));
-      } else {
-        const subjects = ['pagination-button-previous', 'pagination-button-next'];
+  public async confirmClone() {
+    this.log.debug('Confirming clone');
+    await this.testSubjects.click('cloneConfirmButton');
+  }
 
-        await Promise.all(subjects.map(async (subj) => await testSubjects.existOrFail(subj)));
-        const paginationListExists = await find.existsByCssSelector('.euiPagination__list');
-        if (!paginationListExists) {
-          throw new Error(`expected discover data grid pagination list to exist`);
-        }
-      }
-    }
+  public async cancelClone() {
+    this.log.debug('Canceling clone');
+    await this.testSubjects.click('cloneCancelButton');
+  }
 
-    public async switchToEditMode() {
-      log.debug('Switching to edit mode');
-      await testSubjects.click('dashboardEditMode');
-      // wait until the count of dashboard panels equals the count of toggle menu icons
-      await retry.waitFor('in edit mode', async () => {
-        const panels = await testSubjects.findAll('embeddablePanel', 2500);
-        const menuIcons = await testSubjects.findAll('embeddablePanelToggleMenuIcon', 2500);
-        return panels.length === menuIcons.length;
-      });
-    }
+  public async setClonedDashboardTitle(title: string) {
+    await this.testSubjects.setValue('clonedDashboardTitle', title);
+  }
 
-    public async getIsInViewMode() {
-      log.debug('getIsInViewMode');
-      return await testSubjects.exists('dashboardEditMode');
+  /**
+   * Asserts that the duplicate title warning is either displayed or not displayed.
+   * @param { displayed: boolean }
+   */
+  public async expectDuplicateTitleWarningDisplayed({ displayed = true }) {
+    if (displayed) {
+      await this.testSubjects.existOrFail('titleDupicateWarnMsg');
+    } else {
+      await this.testSubjects.missingOrFail('titleDupicateWarnMsg');
     }
+  }
 
-    public async clickCancelOutOfEditMode(accept = true) {
-      log.debug('clickCancelOutOfEditMode');
-      await testSubjects.click('dashboardViewOnlyMode');
-      if (accept) {
-        const confirmation = await testSubjects.exists('dashboardDiscardConfirmKeep');
-        if (confirmation) {
-          await testSubjects.click('dashboardDiscardConfirmKeep');
-        }
+  /**
+   * Asserts that the toolbar pagination (count and arrows) is either displayed or not displayed.
+
+   */
+  public async expectToolbarPaginationDisplayed() {
+    const isLegacyDefault = this.discover.useLegacyTable();
+    if (isLegacyDefault) {
+      const subjects = ['btnPrevPage', 'btnNextPage', 'toolBarPagerText'];
+      await Promise.all(subjects.map(async (subj) => await this.testSubjects.existOrFail(subj)));
+    } else {
+      const subjects = ['pagination-button-previous', 'pagination-button-next'];
+
+      await Promise.all(subjects.map(async (subj) => await this.testSubjects.existOrFail(subj)));
+      const paginationListExists = await this.find.existsByCssSelector('.euiPagination__list');
+      if (!paginationListExists) {
+        throw new Error(`expected discover data grid pagination list to exist`);
       }
     }
+  }
 
-    public async clickDiscardChanges(accept = true) {
-      log.debug('clickDiscardChanges');
-      await testSubjects.click('dashboardViewOnlyMode');
-      if (accept) {
-        const confirmation = await testSubjects.exists('dashboardDiscardConfirmDiscard');
-        if (confirmation) {
-          await testSubjects.click('dashboardDiscardConfirmDiscard');
-        }
-      }
-    }
+  public async switchToEditMode() {
+    this.log.debug('Switching to edit mode');
+    if (await this.testSubjects.exists('dashboardEditMode')) {
+      // if the dashboard is not already in edit mode
+      await this.testSubjects.click('dashboardEditMode');
+    }
+    // wait until the count of dashboard panels equals the count of toggle menu icons
+    await this.retry.waitFor('in edit mode', async () => {
+      const panels = await this.testSubjects.findAll('embeddablePanel', 2500);
+      const menuIcons = await this.testSubjects.findAll('embeddablePanelToggleMenuIcon', 2500);
+      return panels.length === menuIcons.length;
+    });
+  }
 
-    public async clickQuickSave() {
-      await this.expectQuickSaveButtonEnabled();
-      log.debug('clickQuickSave');
-      await testSubjects.click('dashboardQuickSaveMenuItem');
-    }
+  public async getIsInViewMode() {
+    this.log.debug('getIsInViewMode');
+    return await this.testSubjects.exists('dashboardEditMode');
+  }
 
-    public async clickNewDashboard(continueEditing = false) {
-      await listingTable.clickNewButton('createDashboardPromptButton');
-      if (await testSubjects.exists('dashboardCreateConfirm')) {
-        if (continueEditing) {
-          await testSubjects.click('dashboardCreateConfirmContinue');
-        } else {
-          await testSubjects.click('dashboardCreateConfirmStartOver');
-        }
+  public async clickCancelOutOfEditMode(accept = true) {
+    this.log.debug('clickCancelOutOfEditMode');
+    if (await this.getIsInViewMode()) return;
+    await this.retry.waitFor('leave edit mode button enabled', async () => {
+      const leaveEditModeButton = await this.testSubjects.find('dashboardViewOnlyMode');
+      const isDisabled = await leaveEditModeButton.getAttribute('disabled');
+      return !isDisabled;
+    });
+    await this.testSubjects.click('dashboardViewOnlyMode');
+    if (accept) {
+      const confirmation = await this.testSubjects.exists('confirmModalTitleText');
+      if (confirmation) {
+        await this.common.clickConfirmOnModal();
       }
-      // make sure the dashboard page is shown
-      await this.waitForRenderComplete();
     }
+  }
+
+  public async clickQuickSave() {
+    await this.expectQuickSaveButtonEnabled();
+    this.log.debug('clickQuickSave');
+    await this.testSubjects.click('dashboardQuickSaveMenuItem');
+  }
 
-    public async clickNewDashboardExpectWarning(continueEditing = false) {
-      await listingTable.clickNewButton('createDashboardPromptButton');
-      await testSubjects.existOrFail('dashboardCreateConfirm');
+  public async clickNewDashboard(continueEditing = false) {
+    await this.listingTable.clickNewButton('createDashboardPromptButton');
+    if (await this.testSubjects.exists('dashboardCreateConfirm')) {
       if (continueEditing) {
-        await testSubjects.click('dashboardCreateConfirmContinue');
+        await this.testSubjects.click('dashboardCreateConfirmContinue');
       } else {
-        await testSubjects.click('dashboardCreateConfirmStartOver');
+        await this.testSubjects.click('dashboardCreateConfirmStartOver');
       }
-      // make sure the dashboard page is shown
-      await this.waitForRenderComplete();
-    }
-
-    public async clickCreateDashboardPrompt() {
-      await testSubjects.click('createDashboardPromptButton');
     }
+    // make sure the dashboard page is shown
+    await this.waitForRenderComplete();
+  }
 
-    public async getCreateDashboardPromptExists() {
-      return await testSubjects.exists('createDashboardPromptButton');
+  public async clickNewDashboardExpectWarning(continueEditing = false) {
+    await this.listingTable.clickNewButton('createDashboardPromptButton');
+    await this.testSubjects.existOrFail('dashboardCreateConfirm');
+    if (continueEditing) {
+      await this.testSubjects.click('dashboardCreateConfirmContinue');
+    } else {
+      await this.testSubjects.click('dashboardCreateConfirmStartOver');
     }
+    // make sure the dashboard page is shown
+    await this.waitForRenderComplete();
+  }
 
-    public async isOptionsOpen() {
-      log.debug('isOptionsOpen');
-      return await testSubjects.exists('dashboardOptionsMenu');
-    }
+  public async clickCreateDashboardPrompt() {
+    await this.testSubjects.click('createDashboardPromptButton');
+  }
 
-    public async openOptions() {
-      log.debug('openOptions');
-      const isOpen = await this.isOptionsOpen();
-      if (!isOpen) {
-        return await testSubjects.click('dashboardOptionsButton');
-      }
-    }
+  public async getCreateDashboardPromptExists() {
+    return await this.testSubjects.exists('createDashboardPromptButton');
+  }
 
-    // avoids any 'Object with id x not found' errors when switching tests.
-    public async clearSavedObjectsFromAppLinks() {
-      await PageObjects.header.clickVisualize();
-      await PageObjects.visualize.gotoLandingPage();
-      await PageObjects.header.clickDashboard();
-      await this.gotoDashboardLandingPage();
-    }
+  public async isOptionsOpen() {
+    this.log.debug('isOptionsOpen');
+    return await this.testSubjects.exists('dashboardOptionsMenu');
+  }
 
-    public async isMarginsOn() {
-      log.debug('isMarginsOn');
-      await this.openOptions();
-      return await testSubjects.getAttribute('dashboardMarginsCheckbox', 'checked');
+  public async openOptions() {
+    this.log.debug('openOptions');
+    const isOpen = await this.isOptionsOpen();
+    if (!isOpen) {
+      return await this.testSubjects.click('dashboardOptionsButton');
     }
+  }
 
-    public async useMargins(on = true) {
-      await this.openOptions();
-      const isMarginsOn = await this.isMarginsOn();
-      if (isMarginsOn !== 'on') {
-        return await testSubjects.click('dashboardMarginsCheckbox');
-      }
-    }
+  // avoids any 'Object with id x not found' errors when switching tests.
+  public async clearSavedObjectsFromAppLinks() {
+    await this.header.clickVisualize();
+    await this.visualize.gotoLandingPage();
+    await this.header.clickDashboard();
+    await this.gotoDashboardLandingPage();
+  }
 
-    public async isColorSyncOn() {
-      log.debug('isColorSyncOn');
-      await this.openOptions();
-      return await testSubjects.getAttribute('dashboardSyncColorsCheckbox', 'checked');
-    }
+  public async isMarginsOn() {
+    this.log.debug('isMarginsOn');
+    await this.openOptions();
+    return await this.testSubjects.getAttribute('dashboardMarginsCheckbox', 'checked');
+  }
 
-    public async useColorSync(on = true) {
-      await this.openOptions();
-      const isColorSyncOn = await this.isColorSyncOn();
-      if (isColorSyncOn !== 'on') {
-        return await testSubjects.click('dashboardSyncColorsCheckbox');
-      }
+  public async useMargins(on = true) {
+    await this.openOptions();
+    const isMarginsOn = await this.isMarginsOn();
+    if (isMarginsOn !== 'on') {
+      return await this.testSubjects.click('dashboardMarginsCheckbox');
     }
+  }
 
-    public async gotoDashboardEditMode(dashboardName: string) {
-      await this.loadSavedDashboard(dashboardName);
-      await this.switchToEditMode();
-    }
+  public async isColorSyncOn() {
+    this.log.debug('isColorSyncOn');
+    await this.openOptions();
+    return await this.testSubjects.getAttribute('dashboardSyncColorsCheckbox', 'checked');
+  }
 
-    public async renameDashboard(dashboardName: string) {
-      log.debug(`Naming dashboard ` + dashboardName);
-      await testSubjects.click('dashboardRenameButton');
-      await testSubjects.setValue('savedObjectTitle', dashboardName);
+  public async useColorSync(on = true) {
+    await this.openOptions();
+    const isColorSyncOn = await this.isColorSyncOn();
+    if (isColorSyncOn !== 'on') {
+      return await this.testSubjects.click('dashboardSyncColorsCheckbox');
     }
+  }
 
-    /**
-     * Save the current dashboard with the specified name and options and
-     * verify that the save was successful, close the toast and return the
-     * toast message
-     *
-     * @param dashboardName {String}
-     * @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, needsConfirm: false,  waitDialogIsClosed: boolean }}
-     */
-    public async saveDashboard(
-      dashboardName: string,
-      saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true, exitFromEditMode: true }
-    ) {
-      await retry.try(async () => {
-        await this.enterDashboardTitleAndClickSave(dashboardName, saveOptions);
-
-        if (saveOptions.needsConfirm) {
-          await this.ensureDuplicateTitleCallout();
-          await this.clickSave();
-        }
+  public async gotoDashboardEditMode(dashboardName: string) {
+    await this.loadSavedDashboard(dashboardName);
+    await this.switchToEditMode();
+  }
 
-        // Confirm that the Dashboard has actually been saved
-        await testSubjects.existOrFail('saveDashboardSuccess');
-      });
-      const message = await PageObjects.common.closeToast();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await PageObjects.common.waitForSaveModalToClose();
+  public async renameDashboard(dashboardName: string) {
+    this.log.debug(`Naming dashboard ` + dashboardName);
+    await this.testSubjects.click('dashboardRenameButton');
+    await this.testSubjects.setValue('savedObjectTitle', dashboardName);
+  }
 
-      const isInViewMode = await testSubjects.exists('dashboardEditMode');
-      if (saveOptions.exitFromEditMode && !isInViewMode) {
-        await this.clickCancelOutOfEditMode();
+  /**
+   * Save the current dashboard with the specified name and options and
+   * verify that the save was successful, close the toast and return the
+   * toast message
+   *
+   * @param dashboardName {String}
+   * @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, needsConfirm: false,  waitDialogIsClosed: boolean }}
+   */
+  public async saveDashboard(
+    dashboardName: string,
+    saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true, exitFromEditMode: true }
+  ) {
+    await this.retry.try(async () => {
+      await this.enterDashboardTitleAndClickSave(dashboardName, saveOptions);
+
+      if (saveOptions.needsConfirm) {
+        await this.ensureDuplicateTitleCallout();
+        await this.clickSave();
       }
-      await PageObjects.header.waitUntilLoadingHasFinished();
 
-      return message;
-    }
+      // Confirm that the Dashboard has actually been saved
+      await this.testSubjects.existOrFail('saveDashboardSuccess');
+    });
+    const message = await this.common.closeToast();
+    await this.header.waitUntilLoadingHasFinished();
+    await this.common.waitForSaveModalToClose();
 
-    public async cancelSave() {
-      log.debug('Canceling save');
-      await testSubjects.click('saveCancelButton');
+    const isInViewMode = await this.testSubjects.exists('dashboardEditMode');
+    if (saveOptions.exitFromEditMode && !isInViewMode) {
+      await this.clickCancelOutOfEditMode();
     }
+    await this.header.waitUntilLoadingHasFinished();
 
-    public async clickSave() {
-      log.debug('DashboardPage.clickSave');
-      await testSubjects.click('confirmSaveSavedObjectButton');
-    }
+    return message;
+  }
 
-    /**
-     *
-     * @param dashboardTitle {String}
-     * @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, waitDialogIsClosed: boolean}}
-     */
-    public async enterDashboardTitleAndClickSave(
-      dashboardTitle: string,
-      saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true }
-    ) {
-      await testSubjects.click('dashboardSaveMenuItem');
-      const modalDialog = await testSubjects.find('savedObjectSaveModal');
-
-      log.debug('entering new title');
-      await testSubjects.setValue('savedObjectTitle', dashboardTitle);
-
-      if (saveOptions.storeTimeWithDashboard !== undefined) {
-        await this.setStoreTimeWithDashboard(saveOptions.storeTimeWithDashboard);
-      }
+  public async cancelSave() {
+    this.log.debug('Canceling save');
+    await this.testSubjects.click('saveCancelButton');
+  }
 
-      const saveAsNewCheckboxExists = await testSubjects.exists('saveAsNewCheckbox');
-      if (saveAsNewCheckboxExists) {
-        await this.setSaveAsNewCheckBox(Boolean(saveOptions.saveAsNew));
-      }
+  public async clickSave() {
+    this.log.debug('DashboardPage.clickSave');
+    await this.testSubjects.click('confirmSaveSavedObjectButton');
+  }
 
-      if (saveOptions.tags) {
-        await this.selectDashboardTags(saveOptions.tags);
-      }
+  /**
+   *
+   * @param dashboardTitle {String}
+   * @param saveOptions {{storeTimeWithDashboard: boolean, saveAsNew: boolean, waitDialogIsClosed: boolean}}
+   */
+  public async enterDashboardTitleAndClickSave(
+    dashboardTitle: string,
+    saveOptions: SaveDashboardOptions = { waitDialogIsClosed: true }
+  ) {
+    await this.testSubjects.click('dashboardSaveMenuItem');
+    const modalDialog = await this.testSubjects.find('savedObjectSaveModal');
 
-      await this.clickSave();
-      if (saveOptions.waitDialogIsClosed) {
-        await testSubjects.waitForDeleted(modalDialog);
-      }
+    this.log.debug('entering new title');
+    await this.testSubjects.setValue('savedObjectTitle', dashboardTitle);
+
+    if (saveOptions.storeTimeWithDashboard !== undefined) {
+      await this.setStoreTimeWithDashboard(saveOptions.storeTimeWithDashboard);
     }
 
-    public async ensureDuplicateTitleCallout() {
-      await testSubjects.existOrFail('titleDupicateWarnMsg');
+    const saveAsNewCheckboxExists = await this.testSubjects.exists('saveAsNewCheckbox');
+    if (saveAsNewCheckboxExists) {
+      await this.setSaveAsNewCheckBox(Boolean(saveOptions.saveAsNew));
     }
 
-    public async selectDashboardTags(tagNames: string[]) {
-      await testSubjects.click('savedObjectTagSelector');
-      for (const tagName of tagNames) {
-        await testSubjects.click(`tagSelectorOption-${tagName.replace(' ', '_')}`);
-      }
-      await testSubjects.click('savedObjectTitle');
+    if (saveOptions.tags) {
+      await this.selectDashboardTags(saveOptions.tags);
     }
 
-    /**
-     * @param dashboardTitle {String}
-     */
-    public async enterDashboardTitleAndPressEnter(dashboardTitle: string) {
-      await testSubjects.click('dashboardSaveMenuItem');
-      const modalDialog = await testSubjects.find('savedObjectSaveModal');
+    await this.clickSave();
+    if (saveOptions.waitDialogIsClosed) {
+      await this.testSubjects.waitForDeleted(modalDialog);
+    }
+  }
 
-      log.debug('entering new title');
-      await testSubjects.setValue('savedObjectTitle', dashboardTitle);
+  public async ensureDuplicateTitleCallout() {
+    await this.testSubjects.existOrFail('titleDupicateWarnMsg');
+  }
 
-      await PageObjects.common.pressEnterKey();
-      await testSubjects.waitForDeleted(modalDialog);
+  public async selectDashboardTags(tagNames: string[]) {
+    await this.testSubjects.click('savedObjectTagSelector');
+    for (const tagName of tagNames) {
+      await this.testSubjects.click(`tagSelectorOption-${tagName.replace(' ', '_')}`);
     }
+    await this.testSubjects.click('savedObjectTitle');
+  }
 
-    // use the search filter box to narrow the results down to a single
-    // entry, or at least to a single page of results
-    public async loadSavedDashboard(dashboardName: string) {
-      log.debug(`Load Saved Dashboard ${dashboardName}`);
+  /**
+   * @param dashboardTitle {String}
+   */
+  public async enterDashboardTitleAndPressEnter(dashboardTitle: string) {
+    await this.testSubjects.click('dashboardSaveMenuItem');
+    const modalDialog = await this.testSubjects.find('savedObjectSaveModal');
 
-      await this.gotoDashboardLandingPage();
+    this.log.debug('entering new title');
+    await this.testSubjects.setValue('savedObjectTitle', dashboardTitle);
 
-      await listingTable.searchForItemWithName(dashboardName);
-      await retry.try(async () => {
-        await listingTable.clickItemLink('dashboard', dashboardName);
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        // check Dashboard landing page is not present
-        await testSubjects.missingOrFail('dashboardLandingPage', { timeout: 10000 });
-      });
-    }
+    await this.common.pressEnterKey();
+    await this.testSubjects.waitForDeleted(modalDialog);
+  }
 
-    public async getPanelTitles() {
-      log.debug('in getPanelTitles');
-      const titleObjects = await testSubjects.findAll('dashboardPanelTitle');
-      return await Promise.all(titleObjects.map(async (title) => await title.getVisibleText()));
-    }
+  // use the search filter box to narrow the results down to a single
+  // entry, or at least to a single page of results
+  public async loadSavedDashboard(dashboardName: string) {
+    this.log.debug(`Load Saved Dashboard ${dashboardName}`);
 
-    public async getPanelDimensions() {
-      const panels = await find.allByCssSelector('.react-grid-item'); // These are gridster-defined elements and classes
-      return await Promise.all(
-        panels.map(async (panel) => {
-          const size = await panel.getSize();
-          return {
-            width: size.width,
-            height: size.height,
-          };
-        })
-      );
-    }
+    await this.gotoDashboardLandingPage();
 
-    public async getPanelCount() {
-      log.debug('getPanelCount');
-      const panels = await testSubjects.findAll('embeddablePanel');
-      return panels.length;
-    }
+    await this.listingTable.searchForItemWithName(dashboardName);
+    await this.retry.try(async () => {
+      await this.listingTable.clickItemLink('dashboard', dashboardName);
+      await this.header.waitUntilLoadingHasFinished();
+      // check Dashboard landing page is not present
+      await this.testSubjects.missingOrFail('dashboardLandingPage', { timeout: 10000 });
+    });
+  }
 
-    public getTestVisualizations() {
-      return [
-        { name: PIE_CHART_VIS_NAME, description: 'PieChart' },
-        { name: 'Visualization☺ VerticalBarChart', description: 'VerticalBarChart' },
-        { name: AREA_CHART_VIS_NAME, description: 'AreaChart' },
-        { name: 'Visualization☺漢字 DataTable', description: 'DataTable' },
-        { name: LINE_CHART_VIS_NAME, description: 'LineChart' },
-        { name: 'Visualization TileMap', description: 'TileMap' },
-        { name: 'Visualization MetricChart', description: 'MetricChart' },
-      ];
-    }
+  public async getPanelTitles() {
+    this.log.debug('in getPanelTitles');
+    const titleObjects = await this.testSubjects.findAll('dashboardPanelTitle');
+    return await Promise.all(titleObjects.map(async (title) => await title.getVisibleText()));
+  }
 
-    public getTestVisualizationNames() {
-      return this.getTestVisualizations().map((visualization) => visualization.name);
-    }
+  public async getPanelDimensions() {
+    const panels = await this.find.allByCssSelector('.react-grid-item'); // These are gridster-defined elements and classes
+    return await Promise.all(
+      panels.map(async (panel) => {
+        const size = await panel.getSize();
+        return {
+          width: size.width,
+          height: size.height,
+        };
+      })
+    );
+  }
 
-    public getTestVisualizationDescriptions() {
-      return this.getTestVisualizations().map((visualization) => visualization.description);
-    }
+  public async getPanelCount() {
+    this.log.debug('getPanelCount');
+    const panels = await this.testSubjects.findAll('embeddablePanel');
+    return panels.length;
+  }
 
-    public async getDashboardPanels() {
-      return await testSubjects.findAll('embeddablePanel');
-    }
+  public getTestVisualizations() {
+    return [
+      { name: PIE_CHART_VIS_NAME, description: 'PieChart' },
+      { name: 'Visualization☺ VerticalBarChart', description: 'VerticalBarChart' },
+      { name: AREA_CHART_VIS_NAME, description: 'AreaChart' },
+      { name: 'Visualization☺漢字 DataTable', description: 'DataTable' },
+      { name: LINE_CHART_VIS_NAME, description: 'LineChart' },
+      { name: 'Visualization TileMap', description: 'TileMap' },
+      { name: 'Visualization MetricChart', description: 'MetricChart' },
+    ];
+  }
 
-    public async addVisualizations(visualizations: string[]) {
-      await dashboardAddPanel.addVisualizations(visualizations);
-    }
+  public getTestVisualizationNames() {
+    return this.getTestVisualizations().map((visualization) => visualization.name);
+  }
 
-    public async setSaveAsNewCheckBox(checked: boolean) {
-      log.debug('saveAsNewCheckbox: ' + checked);
-      let saveAsNewCheckbox = await testSubjects.find('saveAsNewCheckbox');
-      const isAlreadyChecked = (await saveAsNewCheckbox.getAttribute('aria-checked')) === 'true';
-      if (isAlreadyChecked !== checked) {
-        log.debug('Flipping save as new checkbox');
-        saveAsNewCheckbox = await testSubjects.find('saveAsNewCheckbox');
-        await retry.try(() => saveAsNewCheckbox.click());
-      }
-    }
+  public getTestVisualizationDescriptions() {
+    return this.getTestVisualizations().map((visualization) => visualization.description);
+  }
 
-    public async setStoreTimeWithDashboard(checked: boolean) {
-      log.debug('Storing time with dashboard: ' + checked);
-      let storeTimeCheckbox = await testSubjects.find('storeTimeWithDashboard');
-      const isAlreadyChecked = (await storeTimeCheckbox.getAttribute('aria-checked')) === 'true';
-      if (isAlreadyChecked !== checked) {
-        log.debug('Flipping store time checkbox');
-        storeTimeCheckbox = await testSubjects.find('storeTimeWithDashboard');
-        await retry.try(() => storeTimeCheckbox.click());
-      }
-    }
+  public async getDashboardPanels() {
+    return await this.testSubjects.findAll('embeddablePanel');
+  }
 
-    public async getSharedItemsCount() {
-      log.debug('in getSharedItemsCount');
-      const attributeName = 'data-shared-items-count';
-      const element = await find.byCssSelector(`[${attributeName}]`);
-      if (element) {
-        return await element.getAttribute(attributeName);
-      }
+  public async addVisualizations(visualizations: string[]) {
+    await this.dashboardAddPanel.addVisualizations(visualizations);
+  }
 
-      throw new Error('no element');
+  public async setSaveAsNewCheckBox(checked: boolean) {
+    this.log.debug('saveAsNewCheckbox: ' + checked);
+    let saveAsNewCheckbox = await this.testSubjects.find('saveAsNewCheckbox');
+    const isAlreadyChecked = (await saveAsNewCheckbox.getAttribute('aria-checked')) === 'true';
+    if (isAlreadyChecked !== checked) {
+      this.log.debug('Flipping save as new checkbox');
+      saveAsNewCheckbox = await this.testSubjects.find('saveAsNewCheckbox');
+      await this.retry.try(() => saveAsNewCheckbox.click());
     }
+  }
 
-    public async waitForRenderComplete() {
-      log.debug('waitForRenderComplete');
-      const count = await this.getSharedItemsCount();
-      // eslint-disable-next-line radix
-      await renderable.waitForRender(parseInt(count));
+  public async setStoreTimeWithDashboard(checked: boolean) {
+    this.log.debug('Storing time with dashboard: ' + checked);
+    let storeTimeCheckbox = await this.testSubjects.find('storeTimeWithDashboard');
+    const isAlreadyChecked = (await storeTimeCheckbox.getAttribute('aria-checked')) === 'true';
+    if (isAlreadyChecked !== checked) {
+      this.log.debug('Flipping store time checkbox');
+      storeTimeCheckbox = await this.testSubjects.find('storeTimeWithDashboard');
+      await this.retry.try(() => storeTimeCheckbox.click());
     }
+  }
 
-    public async getSharedContainerData() {
-      log.debug('getSharedContainerData');
-      const sharedContainer = await find.byCssSelector('[data-shared-items-container]');
-      return {
-        title: await sharedContainer.getAttribute('data-title'),
-        description: await sharedContainer.getAttribute('data-description'),
-        count: await sharedContainer.getAttribute('data-shared-items-count'),
-      };
+  public async getSharedItemsCount() {
+    this.log.debug('in getSharedItemsCount');
+    const attributeName = 'data-shared-items-count';
+    const element = await this.find.byCssSelector(`[${attributeName}]`);
+    if (element) {
+      return await element.getAttribute(attributeName);
     }
 
-    public async getPanelSharedItemData() {
-      log.debug('in getPanelSharedItemData');
-      const sharedItemscontainer = await find.byCssSelector('[data-shared-items-count]');
-      const $ = await sharedItemscontainer.parseDomContent();
-      return $('[data-shared-item]')
-        .toArray()
-        .map((item) => {
-          return {
-            title: $(item).attr('data-title'),
-            description: $(item).attr('data-description'),
-          };
-        });
-    }
+    throw new Error('no element');
+  }
 
-    public async checkHideTitle() {
-      log.debug('ensure that you can click on hide title checkbox');
-      await this.openOptions();
-      return await testSubjects.click('dashboardPanelTitlesCheckbox');
-    }
+  public async waitForRenderComplete() {
+    this.log.debug('waitForRenderComplete');
+    const count = await this.getSharedItemsCount();
+    // eslint-disable-next-line radix
+    await this.renderable.waitForRender(parseInt(count));
+  }
 
-    public async expectMissingSaveOption() {
-      await testSubjects.missingOrFail('dashboardSaveMenuItem');
-    }
+  public async getSharedContainerData() {
+    this.log.debug('getSharedContainerData');
+    const sharedContainer = await this.find.byCssSelector('[data-shared-items-container]');
+    return {
+      title: await sharedContainer.getAttribute('data-title'),
+      description: await sharedContainer.getAttribute('data-description'),
+      count: await sharedContainer.getAttribute('data-shared-items-count'),
+    };
+  }
 
-    public async expectMissingQuickSaveOption() {
-      await testSubjects.missingOrFail('dashboardQuickSaveMenuItem');
-    }
-    public async expectExistsQuickSaveOption() {
-      await testSubjects.existOrFail('dashboardQuickSaveMenuItem');
-    }
+  public async getPanelSharedItemData() {
+    this.log.debug('in getPanelSharedItemData');
+    const sharedItemscontainer = await this.find.byCssSelector('[data-shared-items-count]');
+    const $ = await sharedItemscontainer.parseDomContent();
+    return $('[data-shared-item]')
+      .toArray()
+      .map((item) => {
+        return {
+          title: $(item).attr('data-title'),
+          description: $(item).attr('data-description'),
+        };
+      });
+  }
 
-    public async expectQuickSaveButtonEnabled() {
-      log.debug('expectQuickSaveButtonEnabled');
-      const quickSaveButton = await testSubjects.find('dashboardQuickSaveMenuItem');
-      const isDisabled = await quickSaveButton.getAttribute('disabled');
-      if (isDisabled) {
-        throw new Error('Quick save button disabled');
-      }
-    }
+  public async checkHideTitle() {
+    this.log.debug('ensure that you can click on hide title checkbox');
+    await this.openOptions();
+    return await this.testSubjects.click('dashboardPanelTitlesCheckbox');
+  }
 
-    public async getNotLoadedVisualizations(vizList: string[]) {
-      const checkList = [];
-      for (const name of vizList) {
-        const isPresent = await testSubjects.exists(
-          `embeddablePanelHeading-${name.replace(/\s+/g, '')}`,
-          { timeout: 10000 }
-        );
-        checkList.push({ name, isPresent });
-      }
+  public async expectMissingSaveOption() {
+    await this.testSubjects.missingOrFail('dashboardSaveMenuItem');
+  }
+
+  public async expectMissingQuickSaveOption() {
+    await this.testSubjects.missingOrFail('dashboardQuickSaveMenuItem');
+  }
+  public async expectExistsQuickSaveOption() {
+    await this.testSubjects.existOrFail('dashboardQuickSaveMenuItem');
+  }
 
-      return checkList.filter((viz) => viz.isPresent === false).map((viz) => viz.name);
+  public async expectQuickSaveButtonEnabled() {
+    this.log.debug('expectQuickSaveButtonEnabled');
+    const quickSaveButton = await this.testSubjects.find('dashboardQuickSaveMenuItem');
+    const isDisabled = await quickSaveButton.getAttribute('disabled');
+    if (isDisabled) {
+      throw new Error('Quick save button disabled');
     }
+  }
 
-    public async getPanelDrilldownCount(panelIndex = 0): Promise<number> {
-      log.debug('getPanelDrilldownCount');
-      const panel = (await this.getDashboardPanels())[panelIndex];
-      try {
-        const count = await panel.findByTestSubject(
-          'embeddablePanelNotification-ACTION_PANEL_NOTIFICATIONS'
-        );
-        return Number.parseInt(await count.getVisibleText(), 10);
-      } catch (e) {
-        // if not found then this is 0 (we don't show badge with 0)
-        return 0;
-      }
+  public async getNotLoadedVisualizations(vizList: string[]) {
+    const checkList = [];
+    for (const name of vizList) {
+      const isPresent = await this.testSubjects.exists(
+        `embeddablePanelHeading-${name.replace(/\s+/g, '')}`,
+        { timeout: 10000 }
+      );
+      checkList.push({ name, isPresent });
     }
 
-    public async getPanelChartDebugState(panelIndex: number) {
-      return await elasticChart.getChartDebugData(undefined, panelIndex);
+    return checkList.filter((viz) => viz.isPresent === false).map((viz) => viz.name);
+  }
+
+  public async getPanelDrilldownCount(panelIndex = 0): Promise<number> {
+    this.log.debug('getPanelDrilldownCount');
+    const panel = (await this.getDashboardPanels())[panelIndex];
+    try {
+      const count = await panel.findByTestSubject(
+        'embeddablePanelNotification-ACTION_PANEL_NOTIFICATIONS'
+      );
+      return Number.parseInt(await count.getVisibleText(), 10);
+    } catch (e) {
+      // if not found then this is 0 (we don't show badge with 0)
+      return 0;
     }
   }
 
-  return new DashboardPage();
+  public async getPanelChartDebugState(panelIndex: number) {
+    return await this.elasticChart.getChartDebugData(undefined, panelIndex);
+  }
 }
diff --git a/test/functional/page_objects/discover_page.ts b/test/functional/page_objects/discover_page.ts
index 436d22d659aec..41c4441a1c95d 100644
--- a/test/functional/page_objects/discover_page.ts
+++ b/test/functional/page_objects/discover_page.ts
@@ -6,511 +6,510 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function DiscoverPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const retry = getService('retry');
-  const testSubjects = getService('testSubjects');
-  const find = getService('find');
-  const flyout = getService('flyout');
-  const { header } = getPageObjects(['header']);
-  const browser = getService('browser');
-  const globalNav = getService('globalNav');
-  const elasticChart = getService('elasticChart');
-  const docTable = getService('docTable');
-  const config = getService('config');
-  const defaultFindTimeout = config.get('timeouts.find');
-  const dataGrid = getService('dataGrid');
-  const kibanaServer = getService('kibanaServer');
-
-  class DiscoverPage {
-    public async getChartTimespan() {
-      const el = await find.byCssSelector('[data-test-subj="discoverIntervalDateRange"]');
-      return await el.getVisibleText();
-    }
+import { FtrService } from '../ftr_provider_context';
+
+export class DiscoverPageObject extends FtrService {
+  private readonly retry = this.ctx.getService('retry');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly find = this.ctx.getService('find');
+  private readonly flyout = this.ctx.getService('flyout');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly globalNav = this.ctx.getService('globalNav');
+  private readonly elasticChart = this.ctx.getService('elasticChart');
+  private readonly docTable = this.ctx.getService('docTable');
+  private readonly config = this.ctx.getService('config');
+  private readonly dataGrid = this.ctx.getService('dataGrid');
+  private readonly kibanaServer = this.ctx.getService('kibanaServer');
+
+  private readonly defaultFindTimeout = this.config.get('timeouts.find');
+
+  public async getChartTimespan() {
+    const el = await this.find.byCssSelector('[data-test-subj="discoverIntervalDateRange"]');
+    return await el.getVisibleText();
+  }
 
-    public async getDocTable() {
-      const isLegacyDefault = await this.useLegacyTable();
-      if (isLegacyDefault) {
-        return docTable;
-      } else {
-        return dataGrid;
-      }
+  public async getDocTable() {
+    const isLegacyDefault = await this.useLegacyTable();
+    if (isLegacyDefault) {
+      return this.docTable;
+    } else {
+      return this.dataGrid;
     }
+  }
 
-    public async findFieldByName(name: string) {
-      const fieldSearch = await testSubjects.find('fieldFilterSearchInput');
-      await fieldSearch.type(name);
-    }
+  public async findFieldByName(name: string) {
+    const fieldSearch = await this.testSubjects.find('fieldFilterSearchInput');
+    await fieldSearch.type(name);
+  }
 
-    public async clearFieldSearchInput() {
-      const fieldSearch = await testSubjects.find('fieldFilterSearchInput');
-      await fieldSearch.clearValue();
-    }
+  public async clearFieldSearchInput() {
+    const fieldSearch = await this.testSubjects.find('fieldFilterSearchInput');
+    await fieldSearch.clearValue();
+  }
 
-    public async saveSearch(searchName: string) {
-      await this.clickSaveSearchButton();
-      // preventing an occasional flakiness when the saved object wasn't set and the form can't be submitted
-      await retry.waitFor(
-        `saved search title is set to ${searchName} and save button is clickable`,
-        async () => {
-          const saveButton = await testSubjects.find('confirmSaveSavedObjectButton');
-          await testSubjects.setValue('savedObjectTitle', searchName);
-          return (await saveButton.getAttribute('disabled')) !== 'true';
-        }
-      );
-      await testSubjects.click('confirmSaveSavedObjectButton');
-      await header.waitUntilLoadingHasFinished();
-      // LeeDr - this additional checking for the saved search name was an attempt
-      // to cause this method to wait for the reloading of the page to complete so
-      // that the next action wouldn't have to retry.  But it doesn't really solve
-      // that issue.  But it does typically take about 3 retries to
-      // complete with the expected searchName.
-      await retry.waitFor(`saved search was persisted with name ${searchName}`, async () => {
-        return (await this.getCurrentQueryName()) === searchName;
-      });
-    }
+  public async saveSearch(searchName: string) {
+    await this.clickSaveSearchButton();
+    // preventing an occasional flakiness when the saved object wasn't set and the form can't be submitted
+    await this.retry.waitFor(
+      `saved search title is set to ${searchName} and save button is clickable`,
+      async () => {
+        const saveButton = await this.testSubjects.find('confirmSaveSavedObjectButton');
+        await this.testSubjects.setValue('savedObjectTitle', searchName);
+        return (await saveButton.getAttribute('disabled')) !== 'true';
+      }
+    );
+    await this.testSubjects.click('confirmSaveSavedObjectButton');
+    await this.header.waitUntilLoadingHasFinished();
+    // LeeDr - this additional checking for the saved search name was an attempt
+    // to cause this method to wait for the reloading of the page to complete so
+    // that the next action wouldn't have to retry.  But it doesn't really solve
+    // that issue.  But it does typically take about 3 retries to
+    // complete with the expected searchName.
+    await this.retry.waitFor(`saved search was persisted with name ${searchName}`, async () => {
+      return (await this.getCurrentQueryName()) === searchName;
+    });
+  }
 
-    public async inputSavedSearchTitle(searchName: string) {
-      await testSubjects.setValue('savedObjectTitle', searchName);
-    }
+  public async inputSavedSearchTitle(searchName: string) {
+    await this.testSubjects.setValue('savedObjectTitle', searchName);
+  }
 
-    public async clickConfirmSavedSearch() {
-      await testSubjects.click('confirmSaveSavedObjectButton');
-    }
+  public async clickConfirmSavedSearch() {
+    await this.testSubjects.click('confirmSaveSavedObjectButton');
+  }
 
-    public async openAddFilterPanel() {
-      await testSubjects.click('addFilter');
-    }
+  public async openAddFilterPanel() {
+    await this.testSubjects.click('addFilter');
+  }
 
-    public async waitUntilSearchingHasFinished() {
-      await testSubjects.missingOrFail('loadingSpinner', { timeout: defaultFindTimeout * 10 });
+  public async waitUntilSearchingHasFinished() {
+    await this.testSubjects.missingOrFail('loadingSpinner', {
+      timeout: this.defaultFindTimeout * 10,
+    });
+  }
+
+  public async getColumnHeaders() {
+    const isLegacy = await this.useLegacyTable();
+    if (isLegacy) {
+      return await this.docTable.getHeaderFields('embeddedSavedSearchDocTable');
     }
+    const table = await this.getDocTable();
+    return await table.getHeaderFields();
+  }
 
-    public async getColumnHeaders() {
-      const isLegacy = await this.useLegacyTable();
-      if (isLegacy) {
-        return await docTable.getHeaderFields('embeddedSavedSearchDocTable');
-      }
-      const table = await this.getDocTable();
-      return await table.getHeaderFields();
+  public async openLoadSavedSearchPanel() {
+    let isOpen = await this.testSubjects.exists('loadSearchForm');
+    if (isOpen) {
+      return;
     }
 
-    public async openLoadSavedSearchPanel() {
-      let isOpen = await testSubjects.exists('loadSearchForm');
-      if (isOpen) {
-        return;
-      }
+    // We need this try loop here because previous actions in Discover like
+    // saving a search cause reloading of the page and the "Open" menu item goes stale.
+    await this.retry.waitFor('saved search panel is opened', async () => {
+      await this.clickLoadSavedSearchButton();
+      await this.header.waitUntilLoadingHasFinished();
+      isOpen = await this.testSubjects.exists('loadSearchForm');
+      return isOpen === true;
+    });
+  }
 
-      // We need this try loop here because previous actions in Discover like
-      // saving a search cause reloading of the page and the "Open" menu item goes stale.
-      await retry.waitFor('saved search panel is opened', async () => {
-        await this.clickLoadSavedSearchButton();
-        await header.waitUntilLoadingHasFinished();
-        isOpen = await testSubjects.exists('loadSearchForm');
-        return isOpen === true;
-      });
-    }
+  public async closeLoadSaveSearchPanel() {
+    await this.flyout.ensureClosed('loadSearchForm');
+  }
 
-    public async closeLoadSaveSearchPanel() {
-      await flyout.ensureClosed('loadSearchForm');
-    }
+  public async hasSavedSearch(searchName: string) {
+    const searchLink = await this.find.byButtonText(searchName);
+    return await searchLink.isDisplayed();
+  }
 
-    public async hasSavedSearch(searchName: string) {
-      const searchLink = await find.byButtonText(searchName);
-      return await searchLink.isDisplayed();
-    }
+  public async loadSavedSearch(searchName: string) {
+    await this.openLoadSavedSearchPanel();
+    await this.testSubjects.click(`savedObjectTitle${searchName.split(' ').join('-')}`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async loadSavedSearch(searchName: string) {
-      await this.openLoadSavedSearchPanel();
-      await testSubjects.click(`savedObjectTitle${searchName.split(' ').join('-')}`);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async clickNewSearchButton() {
+    await this.testSubjects.click('discoverNewButton');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async clickNewSearchButton() {
-      await testSubjects.click('discoverNewButton');
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async clickSaveSearchButton() {
+    await this.testSubjects.click('discoverSaveButton');
+  }
 
-    public async clickSaveSearchButton() {
-      await testSubjects.click('discoverSaveButton');
-    }
+  public async clickLoadSavedSearchButton() {
+    await this.testSubjects.moveMouseTo('discoverOpenButton');
+    await this.testSubjects.click('discoverOpenButton');
+  }
 
-    public async clickLoadSavedSearchButton() {
-      await testSubjects.moveMouseTo('discoverOpenButton');
-      await testSubjects.click('discoverOpenButton');
-    }
+  public async clickResetSavedSearchButton() {
+    await this.testSubjects.moveMouseTo('resetSavedSearch');
+    await this.testSubjects.click('resetSavedSearch');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async clickResetSavedSearchButton() {
-      await testSubjects.moveMouseTo('resetSavedSearch');
-      await testSubjects.click('resetSavedSearch');
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async closeLoadSavedSearchPanel() {
+    await this.testSubjects.click('euiFlyoutCloseButton');
+  }
 
-    public async closeLoadSavedSearchPanel() {
-      await testSubjects.click('euiFlyoutCloseButton');
-    }
+  public async clickHistogramBar() {
+    await this.elasticChart.waitForRenderComplete();
+    const el = await this.elasticChart.getCanvas();
 
-    public async clickHistogramBar() {
-      await elasticChart.waitForRenderComplete();
-      const el = await elasticChart.getCanvas();
+    await this.browser.getActions().move({ x: 0, y: 0, origin: el._webElement }).click().perform();
+  }
 
-      await browser.getActions().move({ x: 0, y: 0, origin: el._webElement }).click().perform();
-    }
+  public async brushHistogram() {
+    await this.elasticChart.waitForRenderComplete();
+    const el = await this.elasticChart.getCanvas();
 
-    public async brushHistogram() {
-      await elasticChart.waitForRenderComplete();
-      const el = await elasticChart.getCanvas();
+    await this.browser.dragAndDrop(
+      { location: el, offset: { x: -300, y: 20 } },
+      { location: el, offset: { x: -100, y: 30 } }
+    );
+  }
 
-      await browser.dragAndDrop(
-        { location: el, offset: { x: -300, y: 20 } },
-        { location: el, offset: { x: -100, y: 30 } }
-      );
-    }
+  public async getCurrentQueryName() {
+    return await this.globalNav.getLastBreadcrumb();
+  }
 
-    public async getCurrentQueryName() {
-      return await globalNav.getLastBreadcrumb();
-    }
+  public async getChartInterval() {
+    const selectedValue = await this.testSubjects.getAttribute('discoverIntervalSelect', 'value');
+    const selectedOption = await this.find.byCssSelector(`option[value="${selectedValue}"]`);
+    return selectedOption.getVisibleText();
+  }
 
-    public async getChartInterval() {
-      const selectedValue = await testSubjects.getAttribute('discoverIntervalSelect', 'value');
-      const selectedOption = await find.byCssSelector(`option[value="${selectedValue}"]`);
-      return selectedOption.getVisibleText();
-    }
+  public async getChartIntervalWarningIcon() {
+    await this.header.waitUntilLoadingHasFinished();
+    return await this.find.existsByCssSelector('.euiToolTipAnchor');
+  }
 
-    public async getChartIntervalWarningIcon() {
-      await header.waitUntilLoadingHasFinished();
-      return await find.existsByCssSelector('.euiToolTipAnchor');
-    }
+  public async setChartInterval(interval: string) {
+    const optionElement = await this.find.byCssSelector(`option[label="${interval}"]`, 5000);
+    await optionElement.click();
+    return await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async setChartInterval(interval: string) {
-      const optionElement = await find.byCssSelector(`option[label="${interval}"]`, 5000);
-      await optionElement.click();
-      return await header.waitUntilLoadingHasFinished();
-    }
+  public async getHitCount() {
+    await this.header.waitUntilLoadingHasFinished();
+    return await this.testSubjects.getVisibleText('discoverQueryHits');
+  }
 
-    public async getHitCount() {
-      await header.waitUntilLoadingHasFinished();
-      return await testSubjects.getVisibleText('discoverQueryHits');
-    }
+  public async getDocHeader() {
+    const table = await this.getDocTable();
+    const docHeader = await table.getHeaders();
+    return docHeader.join();
+  }
 
-    public async getDocHeader() {
-      const table = await this.getDocTable();
-      const docHeader = await table.getHeaders();
-      return docHeader.join();
-    }
+  public async getDocTableRows() {
+    await this.header.waitUntilLoadingHasFinished();
+    const table = await this.getDocTable();
+    return await table.getBodyRows();
+  }
 
-    public async getDocTableRows() {
-      await header.waitUntilLoadingHasFinished();
-      const table = await this.getDocTable();
-      return await table.getBodyRows();
-    }
+  public async useLegacyTable() {
+    return (await this.kibanaServer.uiSettings.get('doc_table:legacy')) !== false;
+  }
 
-    public async useLegacyTable() {
-      return (await kibanaServer.uiSettings.get('doc_table:legacy')) !== false;
+  public async getDocTableIndex(index: number) {
+    const isLegacyDefault = await this.useLegacyTable();
+    if (isLegacyDefault) {
+      const row = await this.find.byCssSelector(`tr.kbnDocTable__row:nth-child(${index})`);
+      return await row.getVisibleText();
     }
 
-    public async getDocTableIndex(index: number) {
-      const isLegacyDefault = await this.useLegacyTable();
-      if (isLegacyDefault) {
-        const row = await find.byCssSelector(`tr.kbnDocTable__row:nth-child(${index})`);
-        return await row.getVisibleText();
-      }
+    const row = await this.dataGrid.getRow({ rowIndex: index - 1 });
+    const result = await Promise.all(row.map(async (cell) => await cell.getVisibleText()));
+    // Remove control columns
+    return result.slice(2).join(' ');
+  }
 
-      const row = await dataGrid.getRow({ rowIndex: index - 1 });
-      const result = await Promise.all(row.map(async (cell) => await cell.getVisibleText()));
-      // Remove control columns
-      return result.slice(2).join(' ');
-    }
+  public async getDocTableIndexLegacy(index: number) {
+    const row = await this.find.byCssSelector(`tr.kbnDocTable__row:nth-child(${index})`);
+    return await row.getVisibleText();
+  }
 
-    public async getDocTableIndexLegacy(index: number) {
-      const row = await find.byCssSelector(`tr.kbnDocTable__row:nth-child(${index})`);
-      return await row.getVisibleText();
+  public async getDocTableField(index: number, cellIdx: number = -1) {
+    const isLegacyDefault = await this.useLegacyTable();
+    const usedDefaultCellIdx = isLegacyDefault ? 0 : 2;
+    const usedCellIdx = cellIdx === -1 ? usedDefaultCellIdx : cellIdx;
+    if (isLegacyDefault) {
+      const fields = await this.find.allByCssSelector(
+        `tr.kbnDocTable__row:nth-child(${index}) [data-test-subj='docTableField']`
+      );
+      return await fields[usedCellIdx].getVisibleText();
     }
+    const row = await this.dataGrid.getRow({ rowIndex: index - 1 });
+    const result = await Promise.all(row.map(async (cell) => await cell.getVisibleText()));
+    return result[usedCellIdx];
+  }
 
-    public async getDocTableField(index: number, cellIdx: number = -1) {
-      const isLegacyDefault = await this.useLegacyTable();
-      const usedDefaultCellIdx = isLegacyDefault ? 0 : 2;
-      const usedCellIdx = cellIdx === -1 ? usedDefaultCellIdx : cellIdx;
-      if (isLegacyDefault) {
-        const fields = await find.allByCssSelector(
-          `tr.kbnDocTable__row:nth-child(${index}) [data-test-subj='docTableField']`
-        );
-        return await fields[usedCellIdx].getVisibleText();
-      }
-      const row = await dataGrid.getRow({ rowIndex: index - 1 });
-      const result = await Promise.all(row.map(async (cell) => await cell.getVisibleText()));
-      return result[usedCellIdx];
-    }
+  public async skipToEndOfDocTable() {
+    // add the focus to the button to make it appear
+    const skipButton = await this.testSubjects.find('discoverSkipTableButton');
+    // force focus on it, to make it interactable
+    skipButton.focus();
+    // now click it!
+    return skipButton.click();
+  }
 
-    public async skipToEndOfDocTable() {
-      // add the focus to the button to make it appear
-      const skipButton = await testSubjects.find('discoverSkipTableButton');
-      // force focus on it, to make it interactable
-      skipButton.focus();
-      // now click it!
-      return skipButton.click();
-    }
+  /**
+   * When scrolling down the legacy table there's a link to scroll up
+   * So this is done by this function
+   */
+  public async backToTop() {
+    const skipButton = await this.testSubjects.find('discoverBackToTop');
+    return skipButton.click();
+  }
 
-    /**
-     * When scrolling down the legacy table there's a link to scroll up
-     * So this is done by this function
-     */
-    public async backToTop() {
-      const skipButton = await testSubjects.find('discoverBackToTop');
-      return skipButton.click();
-    }
+  public async getDocTableFooter() {
+    return await this.testSubjects.find('discoverDocTableFooter');
+  }
 
-    public async getDocTableFooter() {
-      return await testSubjects.find('discoverDocTableFooter');
+  public async clickDocSortDown() {
+    const isLegacyDefault = await this.useLegacyTable();
+    if (isLegacyDefault) {
+      await this.find.clickByCssSelector('.fa-sort-down');
+    } else {
+      await this.dataGrid.clickDocSortAsc();
     }
+  }
 
-    public async clickDocSortDown() {
-      const isLegacyDefault = await this.useLegacyTable();
-      if (isLegacyDefault) {
-        await find.clickByCssSelector('.fa-sort-down');
-      } else {
-        await dataGrid.clickDocSortAsc();
-      }
+  public async clickDocSortUp() {
+    const isLegacyDefault = await this.useLegacyTable();
+    if (isLegacyDefault) {
+      await this.find.clickByCssSelector('.fa-sort-up');
+    } else {
+      await this.dataGrid.clickDocSortDesc();
     }
+  }
 
-    public async clickDocSortUp() {
-      const isLegacyDefault = await this.useLegacyTable();
-      if (isLegacyDefault) {
-        await find.clickByCssSelector('.fa-sort-up');
-      } else {
-        await dataGrid.clickDocSortDesc();
-      }
-    }
+  public async isShowingDocViewer() {
+    return await this.testSubjects.exists('kbnDocViewer');
+  }
 
-    public async isShowingDocViewer() {
-      return await testSubjects.exists('kbnDocViewer');
-    }
+  public async getMarks() {
+    const table = await this.docTable.getTable();
+    const marks = await table.findAllByTagName('mark');
+    return await Promise.all(marks.map((mark) => mark.getVisibleText()));
+  }
 
-    public async getMarks() {
-      const table = await docTable.getTable();
-      const marks = await table.findAllByTagName('mark');
-      return await Promise.all(marks.map((mark) => mark.getVisibleText()));
-    }
+  public async toggleSidebarCollapse() {
+    return await this.testSubjects.click('collapseSideBarButton');
+  }
 
-    public async toggleSidebarCollapse() {
-      return await testSubjects.click('collapseSideBarButton');
-    }
+  public async getAllFieldNames() {
+    const sidebar = await this.testSubjects.find('discover-sidebar');
+    const $ = await sidebar.parseDomContent();
+    return $('.dscSidebarField__name')
+      .toArray()
+      .map((field) => $(field).text());
+  }
 
-    public async getAllFieldNames() {
-      const sidebar = await testSubjects.find('discover-sidebar');
-      const $ = await sidebar.parseDomContent();
-      return $('.dscSidebarField__name')
-        .toArray()
-        .map((field) => $(field).text());
-    }
+  public async editField(field: string) {
+    await this.retry.try(async () => {
+      await this.testSubjects.click(`field-${field}`);
+      await this.testSubjects.click(`discoverFieldListPanelEdit-${field}`);
+      await this.find.byClassName('indexPatternFieldEditor__form');
+    });
+  }
 
-    public async editField(field: string) {
-      await retry.try(async () => {
-        await testSubjects.click(`field-${field}`);
-        await testSubjects.click(`discoverFieldListPanelEdit-${field}`);
-        await find.byClassName('indexPatternFieldEditor__form');
-      });
-    }
+  public async removeField(field: string) {
+    await this.testSubjects.click(`field-${field}`);
+    await this.testSubjects.click(`discoverFieldListPanelDelete-${field}`);
+    await this.testSubjects.existOrFail('runtimeFieldDeleteConfirmModal');
+  }
 
-    public async removeField(field: string) {
-      await testSubjects.click(`field-${field}`);
-      await testSubjects.click(`discoverFieldListPanelDelete-${field}`);
-      await testSubjects.existOrFail('runtimeFieldDeleteConfirmModal');
-    }
+  public async clickIndexPatternActions() {
+    await this.retry.try(async () => {
+      await this.testSubjects.click('discoverIndexPatternActions');
+      await this.testSubjects.existOrFail('discover-addRuntimeField-popover');
+    });
+  }
 
-    public async clickIndexPatternActions() {
-      await retry.try(async () => {
-        await testSubjects.click('discoverIndexPatternActions');
-        await testSubjects.existOrFail('discover-addRuntimeField-popover');
-      });
-    }
+  public async clickAddNewField() {
+    await this.retry.try(async () => {
+      await this.testSubjects.click('indexPattern-add-field');
+      await this.find.byClassName('indexPatternFieldEditor__form');
+    });
+  }
 
-    public async clickAddNewField() {
-      await retry.try(async () => {
-        await testSubjects.click('indexPattern-add-field');
-        await find.byClassName('indexPatternFieldEditor__form');
-      });
-    }
+  public async hasNoResults() {
+    return await this.testSubjects.exists('discoverNoResults');
+  }
 
-    public async hasNoResults() {
-      return await testSubjects.exists('discoverNoResults');
-    }
+  public async hasNoResultsTimepicker() {
+    return await this.testSubjects.exists('discoverNoResultsTimefilter');
+  }
 
-    public async hasNoResultsTimepicker() {
-      return await testSubjects.exists('discoverNoResultsTimefilter');
-    }
+  public async clickFieldListItem(field: string) {
+    return await this.testSubjects.click(`field-${field}`);
+  }
 
-    public async clickFieldListItem(field: string) {
-      return await testSubjects.click(`field-${field}`);
+  public async clickFieldSort(field: string, text = 'Sort New-Old') {
+    const isLegacyDefault = await this.useLegacyTable();
+    if (isLegacyDefault) {
+      return await this.testSubjects.click(`docTableHeaderFieldSort_${field}`);
     }
+    return await this.dataGrid.clickDocSortAsc(field, text);
+  }
 
-    public async clickFieldSort(field: string, text = 'Sort New-Old') {
-      const isLegacyDefault = await this.useLegacyTable();
-      if (isLegacyDefault) {
-        return await testSubjects.click(`docTableHeaderFieldSort_${field}`);
-      }
-      return await dataGrid.clickDocSortAsc(field, text);
-    }
+  public async clickFieldListItemToggle(field: string) {
+    await this.testSubjects.moveMouseTo(`field-${field}`);
+    await this.testSubjects.click(`fieldToggle-${field}`);
+  }
 
-    public async clickFieldListItemToggle(field: string) {
-      await testSubjects.moveMouseTo(`field-${field}`);
-      await testSubjects.click(`fieldToggle-${field}`);
-    }
+  public async clickFieldListItemAdd(field: string) {
+    // a filter check may make sense here, but it should be properly handled to make
+    // it work with the _score and _source fields as well
+    await this.clickFieldListItemToggle(field);
+  }
 
-    public async clickFieldListItemAdd(field: string) {
-      // a filter check may make sense here, but it should be properly handled to make
-      // it work with the _score and _source fields as well
-      await this.clickFieldListItemToggle(field);
+  public async clickFieldListItemRemove(field: string) {
+    if (!(await this.testSubjects.exists('fieldList-selected'))) {
+      return;
     }
-
-    public async clickFieldListItemRemove(field: string) {
-      if (!(await testSubjects.exists('fieldList-selected'))) {
-        return;
-      }
-      const selectedList = await testSubjects.find('fieldList-selected');
-      if (await testSubjects.descendantExists(`field-${field}`, selectedList)) {
-        await this.clickFieldListItemToggle(field);
-      }
+    const selectedList = await this.testSubjects.find('fieldList-selected');
+    if (await this.testSubjects.descendantExists(`field-${field}`, selectedList)) {
+      await this.clickFieldListItemToggle(field);
     }
+  }
 
-    public async clickFieldListItemVisualize(fieldName: string) {
-      const field = await testSubjects.find(`field-${fieldName}-showDetails`);
-      const isActive = await field.elementHasClass('dscSidebarItem--active');
+  public async clickFieldListItemVisualize(fieldName: string) {
+    const field = await this.testSubjects.find(`field-${fieldName}-showDetails`);
+    const isActive = await field.elementHasClass('dscSidebarItem--active');
 
-      if (!isActive) {
-        // expand the field to show the "Visualize" button
-        await field.click();
-      }
-
-      await testSubjects.click(`fieldVisualize-${fieldName}`);
+    if (!isActive) {
+      // expand the field to show the "Visualize" button
+      await field.click();
     }
 
-    public async expectFieldListItemVisualize(field: string) {
-      await testSubjects.existOrFail(`fieldVisualize-${field}`);
-    }
+    await this.testSubjects.click(`fieldVisualize-${fieldName}`);
+  }
 
-    public async expectMissingFieldListItemVisualize(field: string) {
-      await testSubjects.missingOrFail(`fieldVisualize-${field}`);
-    }
+  public async expectFieldListItemVisualize(field: string) {
+    await this.testSubjects.existOrFail(`fieldVisualize-${field}`);
+  }
 
-    public async clickFieldListPlusFilter(field: string, value: string) {
-      const plusFilterTestSubj = `plus-${field}-${value}`;
-      if (!(await testSubjects.exists(plusFilterTestSubj))) {
-        // field has to be open
-        await this.clickFieldListItem(field);
-      }
-      // testSubjects.find doesn't handle spaces in the data-test-subj value
-      await testSubjects.click(plusFilterTestSubj);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async expectMissingFieldListItemVisualize(field: string) {
+    await this.testSubjects.missingOrFail(`fieldVisualize-${field}`);
+  }
 
-    public async clickFieldListMinusFilter(field: string, value: string) {
-      // this method requires the field details to be open from clickFieldListItem()
-      // testSubjects.find doesn't handle spaces in the data-test-subj value
-      await testSubjects.click(`minus-${field}-${value}`);
-      await header.waitUntilLoadingHasFinished();
+  public async clickFieldListPlusFilter(field: string, value: string) {
+    const plusFilterTestSubj = `plus-${field}-${value}`;
+    if (!(await this.testSubjects.exists(plusFilterTestSubj))) {
+      // field has to be open
+      await this.clickFieldListItem(field);
     }
+    // this.testSubjects.find doesn't handle spaces in the data-test-subj value
+    await this.testSubjects.click(plusFilterTestSubj);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async selectIndexPattern(indexPattern: string) {
-      await testSubjects.click('indexPattern-switch-link');
-      await find.setValue('[data-test-subj="indexPattern-switcher"] input', indexPattern);
-      await find.clickByCssSelector(
-        `[data-test-subj="indexPattern-switcher"] [title="${indexPattern}"]`
-      );
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async clickFieldListMinusFilter(field: string, value: string) {
+    // this method requires the field details to be open from clickFieldListItem()
+    // this.testSubjects.find doesn't handle spaces in the data-test-subj value
+    await this.testSubjects.click(`minus-${field}-${value}`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async removeHeaderColumn(name: string) {
-      const isLegacyDefault = await this.useLegacyTable();
-      if (isLegacyDefault) {
-        await testSubjects.moveMouseTo(`docTableHeader-${name}`);
-        await testSubjects.click(`docTableRemoveHeader-${name}`);
-      } else {
-        await dataGrid.clickRemoveColumn(name);
-      }
-    }
+  public async selectIndexPattern(indexPattern: string) {
+    await this.testSubjects.click('indexPattern-switch-link');
+    await this.find.setValue('[data-test-subj="indexPattern-switcher"] input', indexPattern);
+    await this.find.clickByCssSelector(
+      `[data-test-subj="indexPattern-switcher"] [title="${indexPattern}"]`
+    );
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async openSidebarFieldFilter() {
-      await testSubjects.click('toggleFieldFilterButton');
-      await testSubjects.existOrFail('filterSelectionPanel');
+  public async removeHeaderColumn(name: string) {
+    const isLegacyDefault = await this.useLegacyTable();
+    if (isLegacyDefault) {
+      await this.testSubjects.moveMouseTo(`docTableHeader-${name}`);
+      await this.testSubjects.click(`docTableRemoveHeader-${name}`);
+    } else {
+      await this.dataGrid.clickRemoveColumn(name);
     }
+  }
 
-    public async closeSidebarFieldFilter() {
-      await testSubjects.click('toggleFieldFilterButton');
-      await testSubjects.missingOrFail('filterSelectionPanel');
-    }
+  public async openSidebarFieldFilter() {
+    await this.testSubjects.click('toggleFieldFilterButton');
+    await this.testSubjects.existOrFail('filterSelectionPanel');
+  }
 
-    public async waitForChartLoadingComplete(renderCount: number) {
-      await elasticChart.waitForRenderingCount(renderCount, 'discoverChart');
-    }
+  public async closeSidebarFieldFilter() {
+    await this.testSubjects.click('toggleFieldFilterButton');
+    await this.testSubjects.missingOrFail('filterSelectionPanel');
+  }
 
-    public async waitForDocTableLoadingComplete() {
-      await testSubjects.waitForAttributeToChange(
-        'discoverDocTable',
-        'data-render-complete',
-        'true'
-      );
-    }
-    public async getNrOfFetches() {
-      const el = await find.byCssSelector('[data-fetch-counter]');
-      const nr = await el.getAttribute('data-fetch-counter');
-      return Number(nr);
-    }
+  public async waitForChartLoadingComplete(renderCount: number) {
+    await this.elasticChart.waitForRenderingCount(renderCount, 'discoverChart');
+  }
 
-    /**
-     * Check if Discover app is currently rendered on the screen.
-     */
-    public async isDiscoverAppOnScreen(): Promise<boolean> {
-      const result = await find.allByCssSelector('discover-app');
-      return result.length === 1;
-    }
+  public async waitForDocTableLoadingComplete() {
+    await this.testSubjects.waitForAttributeToChange(
+      'discoverDocTable',
+      'data-render-complete',
+      'true'
+    );
+  }
+  public async getNrOfFetches() {
+    const el = await this.find.byCssSelector('[data-fetch-counter]');
+    const nr = await el.getAttribute('data-fetch-counter');
+    return Number(nr);
+  }
 
-    /**
-     * Wait until Discover app is rendered on the screen.
-     */
-    public async waitForDiscoverAppOnScreen() {
-      await retry.waitFor('Discover app on screen', async () => {
-        return await this.isDiscoverAppOnScreen();
-      });
-    }
+  /**
+   * Check if Discover app is currently rendered on the screen.
+   */
+  public async isDiscoverAppOnScreen(): Promise<boolean> {
+    const result = await this.find.allByCssSelector('discover-app');
+    return result.length === 1;
+  }
 
-    public async showAllFilterActions() {
-      await testSubjects.click('showFilterActions');
-    }
+  /**
+   * Wait until Discover app is rendered on the screen.
+   */
+  public async waitForDiscoverAppOnScreen() {
+    await this.retry.waitFor('Discover app on screen', async () => {
+      return await this.isDiscoverAppOnScreen();
+    });
+  }
 
-    public async clickSavedQueriesPopOver() {
-      await testSubjects.click('saved-query-management-popover-button');
-    }
+  public async showAllFilterActions() {
+    await this.testSubjects.click('showFilterActions');
+  }
 
-    public async clickCurrentSavedQuery() {
-      await testSubjects.click('saved-query-management-save-button');
-    }
+  public async clickSavedQueriesPopOver() {
+    await this.testSubjects.click('saved-query-management-popover-button');
+  }
 
-    public async setSaveQueryFormTitle(savedQueryName: string) {
-      await testSubjects.setValue('saveQueryFormTitle', savedQueryName);
-    }
+  public async clickCurrentSavedQuery() {
+    await this.testSubjects.click('saved-query-management-save-button');
+  }
 
-    public async toggleIncludeFilters() {
-      await testSubjects.click('saveQueryFormIncludeFiltersOption');
-    }
+  public async setSaveQueryFormTitle(savedQueryName: string) {
+    await this.testSubjects.setValue('saveQueryFormTitle', savedQueryName);
+  }
 
-    public async saveCurrentSavedQuery() {
-      await testSubjects.click('savedQueryFormSaveButton');
-    }
+  public async toggleIncludeFilters() {
+    await this.testSubjects.click('saveQueryFormIncludeFiltersOption');
+  }
 
-    public async deleteSavedQuery() {
-      await testSubjects.click('delete-saved-query-TEST-button');
-    }
+  public async saveCurrentSavedQuery() {
+    await this.testSubjects.click('savedQueryFormSaveButton');
+  }
 
-    public async confirmDeletionOfSavedQuery() {
-      await testSubjects.click('confirmModalConfirmButton');
-    }
+  public async deleteSavedQuery() {
+    await this.testSubjects.click('delete-saved-query-TEST-button');
+  }
 
-    public async clearSavedQuery() {
-      await testSubjects.click('saved-query-management-clear-button');
-    }
+  public async confirmDeletionOfSavedQuery() {
+    await this.testSubjects.click('confirmModalConfirmButton');
   }
 
-  return new DiscoverPage();
+  public async clearSavedQuery() {
+    await this.testSubjects.click('saved-query-management-clear-button');
+  }
 }
diff --git a/test/functional/page_objects/error_page.ts b/test/functional/page_objects/error_page.ts
index e3d5a7fdf57c2..b0166e3753dd5 100644
--- a/test/functional/page_objects/error_page.ts
+++ b/test/functional/page_objects/error_page.ts
@@ -6,29 +6,25 @@
  * Side Public License, v 1.
  */
 
-import expect from '@kbn/expect/expect.js';
-import { FtrProviderContext } from '../ftr_provider_context';
+import expect from '@kbn/expect';
+import { FtrService } from '../ftr_provider_context';
 
-export function ErrorPageProvider({ getPageObjects }: FtrProviderContext) {
-  const { common } = getPageObjects(['common']);
+export class ErrorPageObject extends FtrService {
+  private readonly common = this.ctx.getPageObject('common');
 
-  class ErrorPage {
-    public async expectForbidden() {
-      const messageText = await common.getBodyText();
-      expect(messageText).to.contain('You do not have permission to access the requested page');
-    }
-
-    public async expectNotFound() {
-      const messageText = await common.getJsonBodyText();
-      expect(messageText).to.eql(
-        JSON.stringify({
-          statusCode: 404,
-          error: 'Not Found',
-          message: 'Not Found',
-        })
-      );
-    }
+  public async expectForbidden() {
+    const messageText = await this.common.getBodyText();
+    expect(messageText).to.contain('You do not have permission to access the requested page');
   }
 
-  return new ErrorPage();
+  public async expectNotFound() {
+    const messageText = await this.common.getJsonBodyText();
+    expect(messageText).to.eql(
+      JSON.stringify({
+        statusCode: 404,
+        error: 'Not Found',
+        message: 'Not Found',
+      })
+    );
+  }
 }
diff --git a/test/functional/page_objects/header_page.ts b/test/functional/page_objects/header_page.ts
index c5a796a1eb13b..8597a4b4ee2fb 100644
--- a/test/functional/page_objects/header_page.ts
+++ b/test/functional/page_objects/header_page.ts
@@ -6,92 +6,88 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function HeaderPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const config = getService('config');
-  const log = getService('log');
-  const retry = getService('retry');
-  const testSubjects = getService('testSubjects');
-  const appsMenu = getService('appsMenu');
-  const PageObjects = getPageObjects(['common']);
+export class HeaderPageObject extends FtrService {
+  private readonly config = this.ctx.getService('config');
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly appsMenu = this.ctx.getService('appsMenu');
+  private readonly common = this.ctx.getPageObject('common');
 
-  const defaultFindTimeout = config.get('timeouts.find');
+  private readonly defaultFindTimeout = this.config.get('timeouts.find');
 
-  class HeaderPage {
-    public async clickDiscover(ignoreAppLeaveWarning = false) {
-      await appsMenu.clickLink('Discover', { category: 'kibana' });
-      await this.onAppLeaveWarning(ignoreAppLeaveWarning);
-      await PageObjects.common.waitForTopNavToBeVisible();
-      await this.awaitGlobalLoadingIndicatorHidden();
-    }
+  public async clickDiscover(ignoreAppLeaveWarning = false) {
+    await this.appsMenu.clickLink('Discover', { category: 'kibana' });
+    await this.onAppLeaveWarning(ignoreAppLeaveWarning);
+    await this.common.waitForTopNavToBeVisible();
+    await this.awaitGlobalLoadingIndicatorHidden();
+  }
 
-    public async clickVisualize(ignoreAppLeaveWarning = false) {
-      await appsMenu.clickLink('Visualize Library', { category: 'kibana' });
-      await this.onAppLeaveWarning(ignoreAppLeaveWarning);
-      await this.awaitGlobalLoadingIndicatorHidden();
-      await retry.waitFor('Visualize app to be loaded', async () => {
-        const isNavVisible = await testSubjects.exists('top-nav');
-        return isNavVisible;
-      });
-    }
+  public async clickVisualize(ignoreAppLeaveWarning = false) {
+    await this.appsMenu.clickLink('Visualize Library', { category: 'kibana' });
+    await this.onAppLeaveWarning(ignoreAppLeaveWarning);
+    await this.awaitGlobalLoadingIndicatorHidden();
+    await this.retry.waitFor('Visualize app to be loaded', async () => {
+      const isNavVisible = await this.testSubjects.exists('top-nav');
+      return isNavVisible;
+    });
+  }
 
-    public async clickDashboard() {
-      await appsMenu.clickLink('Dashboard', { category: 'kibana' });
-      await retry.waitFor('dashboard app to be loaded', async () => {
-        const isNavVisible = await testSubjects.exists('top-nav');
-        const isLandingPageVisible = await testSubjects.exists('dashboardLandingPage');
-        return isNavVisible || isLandingPageVisible;
-      });
-      await this.awaitGlobalLoadingIndicatorHidden();
-    }
+  public async clickDashboard() {
+    await this.appsMenu.clickLink('Dashboard', { category: 'kibana' });
+    await this.retry.waitFor('dashboard app to be loaded', async () => {
+      const isNavVisible = await this.testSubjects.exists('top-nav');
+      const isLandingPageVisible = await this.testSubjects.exists('dashboardLandingPage');
+      return isNavVisible || isLandingPageVisible;
+    });
+    await this.awaitGlobalLoadingIndicatorHidden();
+  }
 
-    public async clickStackManagement() {
-      await appsMenu.clickLink('Stack Management', { category: 'management' });
-      await this.awaitGlobalLoadingIndicatorHidden();
-    }
+  public async clickStackManagement() {
+    await this.appsMenu.clickLink('Stack Management', { category: 'management' });
+    await this.awaitGlobalLoadingIndicatorHidden();
+  }
 
-    public async waitUntilLoadingHasFinished() {
-      try {
-        await this.isGlobalLoadingIndicatorVisible();
-      } catch (exception) {
-        if (exception.name === 'ElementNotVisible') {
-          // selenium might just have been too slow to catch it
-        } else {
-          throw exception;
-        }
+  public async waitUntilLoadingHasFinished() {
+    try {
+      await this.isGlobalLoadingIndicatorVisible();
+    } catch (exception) {
+      if (exception.name === 'ElementNotVisible') {
+        // selenium might just have been too slow to catch it
+      } else {
+        throw exception;
       }
-      await this.awaitGlobalLoadingIndicatorHidden();
-    }
-
-    public async isGlobalLoadingIndicatorVisible() {
-      log.debug('isGlobalLoadingIndicatorVisible');
-      return await testSubjects.exists('globalLoadingIndicator', { timeout: 1500 });
     }
+    await this.awaitGlobalLoadingIndicatorHidden();
+  }
 
-    public async awaitGlobalLoadingIndicatorHidden() {
-      await testSubjects.existOrFail('globalLoadingIndicator-hidden', {
-        allowHidden: true,
-        timeout: defaultFindTimeout * 10,
-      });
-    }
+  public async isGlobalLoadingIndicatorVisible() {
+    this.log.debug('isGlobalLoadingIndicatorVisible');
+    return await this.testSubjects.exists('globalLoadingIndicator', { timeout: 1500 });
+  }
 
-    public async awaitKibanaChrome() {
-      log.debug('awaitKibanaChrome');
-      await testSubjects.find('kibanaChrome', defaultFindTimeout * 10);
-    }
+  public async awaitGlobalLoadingIndicatorHidden() {
+    await this.testSubjects.existOrFail('globalLoadingIndicator-hidden', {
+      allowHidden: true,
+      timeout: this.defaultFindTimeout * 10,
+    });
+  }
 
-    public async onAppLeaveWarning(ignoreWarning = false) {
-      await retry.try(async () => {
-        const warning = await testSubjects.exists('confirmModalTitleText');
-        if (warning) {
-          await testSubjects.click(
-            ignoreWarning ? 'confirmModalConfirmButton' : 'confirmModalCancelButton'
-          );
-        }
-      });
-    }
+  public async awaitKibanaChrome() {
+    this.log.debug('awaitKibanaChrome');
+    await this.testSubjects.find('kibanaChrome', this.defaultFindTimeout * 10);
   }
 
-  return new HeaderPage();
+  public async onAppLeaveWarning(ignoreWarning = false) {
+    await this.retry.try(async () => {
+      const warning = await this.testSubjects.exists('confirmModalTitleText');
+      if (warning) {
+        await this.testSubjects.click(
+          ignoreWarning ? 'confirmModalConfirmButton' : 'confirmModalCancelButton'
+        );
+      }
+    });
+  }
 }
diff --git a/test/functional/page_objects/home_page.ts b/test/functional/page_objects/home_page.ts
index f03f74ef8c61d..33de6a33c50f5 100644
--- a/test/functional/page_objects/home_page.ts
+++ b/test/functional/page_objects/home_page.ts
@@ -6,138 +6,134 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function HomePageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const find = getService('find');
-  const PageObjects = getPageObjects(['common']);
+export class HomePageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly find = this.ctx.getService('find');
+  private readonly common = this.ctx.getPageObject('common');
 
-  class HomePage {
-    async clickSynopsis(title: string) {
-      await testSubjects.click(`homeSynopsisLink${title}`);
-    }
-
-    async doesSynopsisExist(title: string) {
-      return await testSubjects.exists(`homeSynopsisLink${title}`);
-    }
+  async clickSynopsis(title: string) {
+    await this.testSubjects.click(`homeSynopsisLink${title}`);
+  }
 
-    async doesSampleDataSetExist(id: string) {
-      return await testSubjects.exists(`sampleDataSetCard${id}`);
-    }
+  async doesSynopsisExist(title: string) {
+    return await this.testSubjects.exists(`homeSynopsisLink${title}`);
+  }
 
-    async isSampleDataSetInstalled(id: string) {
-      return !(await testSubjects.exists(`addSampleDataSet${id}`));
-    }
+  async doesSampleDataSetExist(id: string) {
+    return await this.testSubjects.exists(`sampleDataSetCard${id}`);
+  }
 
-    async getVisibileSolutions() {
-      const solutionPanels = await testSubjects.findAll('~homSolutionPanel', 2000);
-      const panelAttributes = await Promise.all(
-        solutionPanels.map((panel) => panel.getAttribute('data-test-subj'))
-      );
-      return panelAttributes.map((attributeValue) => attributeValue.split('homSolutionPanel_')[1]);
-    }
+  async isSampleDataSetInstalled(id: string) {
+    return !(await this.testSubjects.exists(`addSampleDataSet${id}`));
+  }
 
-    async addSampleDataSet(id: string) {
-      const isInstalled = await this.isSampleDataSetInstalled(id);
-      if (!isInstalled) {
-        await testSubjects.click(`addSampleDataSet${id}`);
-        await this._waitForSampleDataLoadingAction(id);
-      }
-    }
+  async getVisibileSolutions() {
+    const solutionPanels = await this.testSubjects.findAll('~homSolutionPanel', 2000);
+    const panelAttributes = await Promise.all(
+      solutionPanels.map((panel) => panel.getAttribute('data-test-subj'))
+    );
+    return panelAttributes.map((attributeValue) => attributeValue.split('homSolutionPanel_')[1]);
+  }
 
-    async removeSampleDataSet(id: string) {
-      // looks like overkill but we're hitting flaky cases where we click but it doesn't remove
-      await testSubjects.waitForEnabled(`removeSampleDataSet${id}`);
-      // https://github.com/elastic/kibana/issues/65949
-      // Even after waiting for the "Remove" button to be enabled we still have failures
-      // where it appears the click just didn't work.
-      await PageObjects.common.sleep(1010);
-      await testSubjects.click(`removeSampleDataSet${id}`);
+  async addSampleDataSet(id: string) {
+    const isInstalled = await this.isSampleDataSetInstalled(id);
+    if (!isInstalled) {
+      await this.testSubjects.click(`addSampleDataSet${id}`);
       await this._waitForSampleDataLoadingAction(id);
     }
+  }
 
-    // loading action is either uninstall and install
-    async _waitForSampleDataLoadingAction(id: string) {
-      const sampleDataCard = await testSubjects.find(`sampleDataSetCard${id}`);
-      await retry.try(async () => {
-        // waitForDeletedByCssSelector needs to be inside retry because it will timeout at least once
-        // before action is complete
-        await sampleDataCard.waitForDeletedByCssSelector('.euiLoadingSpinner');
-      });
-    }
+  async removeSampleDataSet(id: string) {
+    // looks like overkill but we're hitting flaky cases where we click but it doesn't remove
+    await this.testSubjects.waitForEnabled(`removeSampleDataSet${id}`);
+    // https://github.com/elastic/kibana/issues/65949
+    // Even after waiting for the "Remove" button to be enabled we still have failures
+    // where it appears the click just didn't work.
+    await this.common.sleep(1010);
+    await this.testSubjects.click(`removeSampleDataSet${id}`);
+    await this._waitForSampleDataLoadingAction(id);
+  }
 
-    async launchSampleDashboard(id: string) {
-      await this.launchSampleDataSet(id);
-      await find.clickByLinkText('Dashboard');
-    }
+  // loading action is either uninstall and install
+  async _waitForSampleDataLoadingAction(id: string) {
+    const sampleDataCard = await this.testSubjects.find(`sampleDataSetCard${id}`);
+    await this.retry.try(async () => {
+      // waitForDeletedByCssSelector needs to be inside retry because it will timeout at least once
+      // before action is complete
+      await sampleDataCard.waitForDeletedByCssSelector('.euiLoadingSpinner');
+    });
+  }
 
-    async launchSampleDataSet(id: string) {
-      await this.addSampleDataSet(id);
-      await testSubjects.click(`launchSampleDataSet${id}`);
-    }
+  async launchSampleDashboard(id: string) {
+    await this.launchSampleDataSet(id);
+    await this.find.clickByLinkText('Dashboard');
+  }
 
-    async clickAllKibanaPlugins() {
-      await testSubjects.click('allPlugins');
-    }
+  async launchSampleDataSet(id: string) {
+    await this.addSampleDataSet(id);
+    await this.testSubjects.click(`launchSampleDataSet${id}`);
+  }
 
-    async clickVisualizeExplorePlugins() {
-      await testSubjects.click('tab-data');
-    }
+  async clickAllKibanaPlugins() {
+    await this.testSubjects.click('allPlugins');
+  }
 
-    async clickAdminPlugin() {
-      await testSubjects.click('tab-admin');
-    }
+  async clickVisualizeExplorePlugins() {
+    await this.testSubjects.click('tab-data');
+  }
 
-    async clickOnConsole() {
-      await this.clickSynopsis('console');
-    }
-    async clickOnLogo() {
-      await testSubjects.click('logo');
-    }
+  async clickAdminPlugin() {
+    await this.testSubjects.click('tab-admin');
+  }
 
-    async clickOnAddData() {
-      await this.clickSynopsis('home_tutorial_directory');
-    }
+  async clickOnConsole() {
+    await this.clickSynopsis('console');
+  }
+  async clickOnLogo() {
+    await this.testSubjects.click('logo');
+  }
 
-    // clicks on Active MQ logs
-    async clickOnLogsTutorial() {
-      await this.clickSynopsis('activemqlogs');
-    }
+  async clickOnAddData() {
+    await this.clickSynopsis('home_tutorial_directory');
+  }
 
-    // clicks on cloud tutorial link
-    async clickOnCloudTutorial() {
-      await testSubjects.click('onCloudTutorial');
-    }
+  // clicks on Active MQ logs
+  async clickOnLogsTutorial() {
+    await this.clickSynopsis('activemqlogs');
+  }
 
-    // click on side nav toggle button to see all of side nav
-    async clickOnToggleNavButton() {
-      await testSubjects.click('toggleNavButton');
-    }
+  // clicks on cloud tutorial link
+  async clickOnCloudTutorial() {
+    await this.testSubjects.click('onCloudTutorial');
+  }
 
-    // collapse the observability side nav details
-    async collapseObservabibilitySideNav() {
-      await testSubjects.click('collapsibleNavGroup-observability');
-    }
+  // click on side nav toggle button to see all of side nav
+  async clickOnToggleNavButton() {
+    await this.testSubjects.click('toggleNavButton');
+  }
 
-    // dock the side nav
-    async dockTheSideNav() {
-      await testSubjects.click('collapsible-nav-lock');
-    }
+  // collapse the observability side nav details
+  async collapseObservabibilitySideNav() {
+    await this.testSubjects.click('collapsibleNavGroup-observability');
+  }
 
-    async loadSavedObjects() {
-      await retry.try(async () => {
-        await testSubjects.click('loadSavedObjects');
-        const successMsgExists = await testSubjects.exists('loadSavedObjects_success', {
-          timeout: 5000,
-        });
-        if (!successMsgExists) {
-          throw new Error('Failed to load saved objects');
-        }
-      });
-    }
+  // dock the side nav
+  async dockTheSideNav() {
+    await this.testSubjects.click('collapsible-nav-lock');
   }
 
-  return new HomePage();
+  async loadSavedObjects() {
+    await this.retry.try(async () => {
+      await this.testSubjects.click('loadSavedObjects');
+      const successMsgExists = await this.testSubjects.exists('loadSavedObjects_success', {
+        timeout: 5000,
+      });
+      if (!successMsgExists) {
+        throw new Error('Failed to load saved objects');
+      }
+    });
+  }
 }
diff --git a/test/functional/page_objects/index.ts b/test/functional/page_objects/index.ts
index 413e0aef1444b..7c06344c1a1ad 100644
--- a/test/functional/page_objects/index.ts
+++ b/test/functional/page_objects/index.ts
@@ -6,54 +6,54 @@
  * Side Public License, v 1.
  */
 
-import { CommonPageProvider } from './common_page';
-import { ConsolePageProvider } from './console_page';
-import { ContextPageProvider } from './context_page';
-import { DashboardPageProvider } from './dashboard_page';
-import { DiscoverPageProvider } from './discover_page';
-import { ErrorPageProvider } from './error_page';
-import { HeaderPageProvider } from './header_page';
-import { HomePageProvider } from './home_page';
-import { NewsfeedPageProvider } from './newsfeed_page';
-import { SettingsPageProvider } from './settings_page';
-import { SharePageProvider } from './share_page';
-import { LoginPageProvider } from './login_page';
-import { TimePickerProvider } from './time_picker';
-import { TimelionPageProvider } from './timelion_page';
-import { VisualBuilderPageProvider } from './visual_builder_page';
-import { VisualizePageProvider } from './visualize_page';
-import { VisualizeEditorPageProvider } from './visualize_editor_page';
-import { VisualizeChartPageProvider } from './visualize_chart_page';
-import { TileMapPageProvider } from './tile_map_page';
-import { TimeToVisualizePageProvider } from './time_to_visualize_page';
-import { TagCloudPageProvider } from './tag_cloud_page';
-import { VegaChartPageProvider } from './vega_chart_page';
-import { SavedObjectsPageProvider } from './management/saved_objects_page';
-import { LegacyDataTableVisProvider } from './legacy/data_table_vis';
+import { CommonPageObject } from './common_page';
+import { ConsolePageObject } from './console_page';
+import { ContextPageObject } from './context_page';
+import { DashboardPageObject } from './dashboard_page';
+import { DiscoverPageObject } from './discover_page';
+import { ErrorPageObject } from './error_page';
+import { HeaderPageObject } from './header_page';
+import { HomePageObject } from './home_page';
+import { NewsfeedPageObject } from './newsfeed_page';
+import { SettingsPageObject } from './settings_page';
+import { SharePageObject } from './share_page';
+import { LoginPageObject } from './login_page';
+import { TimePickerPageObject } from './time_picker';
+import { TimelionPageObject } from './timelion_page';
+import { VisualBuilderPageObject } from './visual_builder_page';
+import { VisualizePageObject } from './visualize_page';
+import { VisualizeEditorPageObject } from './visualize_editor_page';
+import { VisualizeChartPageObject } from './visualize_chart_page';
+import { TileMapPageObject } from './tile_map_page';
+import { TimeToVisualizePageObject } from './time_to_visualize_page';
+import { TagCloudPageObject } from './tag_cloud_page';
+import { VegaChartPageObject } from './vega_chart_page';
+import { SavedObjectsPageObject } from './management/saved_objects_page';
+import { LegacyDataTableVisPageObject } from './legacy/data_table_vis';
 
 export const pageObjects = {
-  common: CommonPageProvider,
-  console: ConsolePageProvider,
-  context: ContextPageProvider,
-  dashboard: DashboardPageProvider,
-  discover: DiscoverPageProvider,
-  error: ErrorPageProvider,
-  header: HeaderPageProvider,
-  home: HomePageProvider,
-  newsfeed: NewsfeedPageProvider,
-  settings: SettingsPageProvider,
-  share: SharePageProvider,
-  legacyDataTableVis: LegacyDataTableVisProvider,
-  login: LoginPageProvider,
-  timelion: TimelionPageProvider,
-  timePicker: TimePickerProvider,
-  visualBuilder: VisualBuilderPageProvider,
-  visualize: VisualizePageProvider,
-  visEditor: VisualizeEditorPageProvider,
-  visChart: VisualizeChartPageProvider,
-  tileMap: TileMapPageProvider,
-  timeToVisualize: TimeToVisualizePageProvider,
-  tagCloud: TagCloudPageProvider,
-  vegaChart: VegaChartPageProvider,
-  savedObjects: SavedObjectsPageProvider,
+  common: CommonPageObject,
+  console: ConsolePageObject,
+  context: ContextPageObject,
+  dashboard: DashboardPageObject,
+  discover: DiscoverPageObject,
+  error: ErrorPageObject,
+  header: HeaderPageObject,
+  home: HomePageObject,
+  newsfeed: NewsfeedPageObject,
+  settings: SettingsPageObject,
+  share: SharePageObject,
+  legacyDataTableVis: LegacyDataTableVisPageObject,
+  login: LoginPageObject,
+  timelion: TimelionPageObject,
+  timePicker: TimePickerPageObject,
+  visualBuilder: VisualBuilderPageObject,
+  visualize: VisualizePageObject,
+  visEditor: VisualizeEditorPageObject,
+  visChart: VisualizeChartPageObject,
+  tileMap: TileMapPageObject,
+  timeToVisualize: TimeToVisualizePageObject,
+  tagCloud: TagCloudPageObject,
+  vegaChart: VegaChartPageObject,
+  savedObjects: SavedObjectsPageObject,
 };
diff --git a/test/functional/page_objects/legacy/data_table_vis.ts b/test/functional/page_objects/legacy/data_table_vis.ts
index ef787263f2ab9..122409f28de90 100644
--- a/test/functional/page_objects/legacy/data_table_vis.ts
+++ b/test/functional/page_objects/legacy/data_table_vis.ts
@@ -6,80 +6,79 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from 'test/functional/ftr_provider_context';
-import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
+import { FtrService } from '../../ftr_provider_context';
+import { WebElementWrapper } from '../../services/lib/web_element_wrapper';
 
-export function LegacyDataTableVisProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
+export class LegacyDataTableVisPageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
 
-  class LegacyDataTableVis {
-    /**
-     * Converts the table data into nested array
-     * [ [cell1_in_row1, cell2_in_row1], [cell1_in_row2, cell2_in_row2] ]
-     * @param element table
-     */
-    private async getDataFromElement(element: WebElementWrapper): Promise<string[][]> {
-      const $ = await element.parseDomContent();
-      return $('tr')
-        .toArray()
-        .map((row) =>
-          $(row)
-            .find('td')
-            .toArray()
-            .map((cell) =>
-              $(cell)
-                .text()
-                .replace(/&nbsp;/g, '')
-                .trim()
-            )
-        );
-    }
-
-    public async getTableVisContent({ stripEmptyRows = true } = {}) {
-      return await retry.try(async () => {
-        const container = await testSubjects.find('tableVis');
-        const allTables = await testSubjects.findAllDescendant('paginated-table-body', container);
+  /**
+   * Converts the table data into nested array
+   * [ [cell1_in_row1, cell2_in_row1], [cell1_in_row2, cell2_in_row2] ]
+   * @param element table
+   */
+  private async getDataFromElement(element: WebElementWrapper): Promise<string[][]> {
+    const $ = await element.parseDomContent();
+    return $('tr')
+      .toArray()
+      .map((row) =>
+        $(row)
+          .find('td')
+          .toArray()
+          .map((cell) =>
+            $(cell)
+              .text()
+              .replace(/&nbsp;/g, '')
+              .trim()
+          )
+      );
+  }
 
-        if (allTables.length === 0) {
-          return [];
-        }
+  public async getTableVisContent({ stripEmptyRows = true } = {}) {
+    return await this.retry.try(async () => {
+      const container = await this.testSubjects.find('tableVis');
+      const allTables = await this.testSubjects.findAllDescendant(
+        'paginated-table-body',
+        container
+      );
 
-        const allData = await Promise.all(
-          allTables.map(async (t) => {
-            let data = await this.getDataFromElement(t);
-            if (stripEmptyRows) {
-              data = data.filter(
-                (row) => row.length > 0 && row.some((cell) => cell.trim().length > 0)
-              );
-            }
-            return data;
-          })
-        );
+      if (allTables.length === 0) {
+        return [];
+      }
 
-        if (allTables.length === 1) {
-          // If there was only one table we return only the data for that table
-          // This prevents an unnecessary array around that single table, which
-          // is the case we have in most tests.
-          return allData[0];
-        }
+      const allData = await Promise.all(
+        allTables.map(async (t) => {
+          let data = await this.getDataFromElement(t);
+          if (stripEmptyRows) {
+            data = data.filter(
+              (row) => row.length > 0 && row.some((cell) => cell.trim().length > 0)
+            );
+          }
+          return data;
+        })
+      );
 
-        return allData;
-      });
-    }
+      if (allTables.length === 1) {
+        // If there was only one table we return only the data for that table
+        // This prevents an unnecessary array around that single table, which
+        // is the case we have in most tests.
+        return allData[0];
+      }
 
-    public async filterOnTableCell(columnIndex: number, rowIndex: number) {
-      await retry.try(async () => {
-        const tableVis = await testSubjects.find('tableVis');
-        const cell = await tableVis.findByCssSelector(
-          `tbody tr:nth-child(${rowIndex}) td:nth-child(${columnIndex})`
-        );
-        await cell.moveMouseTo();
-        const filterBtn = await testSubjects.findDescendant('filterForCellValue', cell);
-        await filterBtn.click();
-      });
-    }
+      return allData;
+    });
   }
 
-  return new LegacyDataTableVis();
+  public async filterOnTableCell(columnIndex: number, rowIndex: number) {
+    await this.retry.try(async () => {
+      const tableVis = await this.testSubjects.find('tableVis');
+      const cell = await tableVis.findByCssSelector(
+        `tbody tr:nth-child(${rowIndex}) td:nth-child(${columnIndex})`
+      );
+      await cell.moveMouseTo();
+      const filterBtn = await this.testSubjects.findDescendant('filterForCellValue', cell);
+      await filterBtn.click();
+    });
+  }
 }
diff --git a/test/functional/page_objects/login_page.ts b/test/functional/page_objects/login_page.ts
index 606ddf4643c40..5318a2b2d0c15 100644
--- a/test/functional/page_objects/login_page.ts
+++ b/test/functional/page_objects/login_page.ts
@@ -7,65 +7,61 @@
  */
 
 import { delay } from 'bluebird';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function LoginPageProvider({ getService }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const log = getService('log');
-  const find = getService('find');
+export class LoginPageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly log = this.ctx.getService('log');
+  private readonly find = this.ctx.getService('find');
 
-  const regularLogin = async (user: string, pwd: string) => {
-    await testSubjects.setValue('loginUsername', user);
-    await testSubjects.setValue('loginPassword', pwd);
-    await testSubjects.click('loginSubmit');
-    await find.waitForDeletedByCssSelector('.kibanaWelcomeLogo');
-    await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
-  };
-
-  const samlLogin = async (user: string, pwd: string) => {
-    try {
-      await find.clickByButtonText('Login using SAML');
-      await find.setValue('input[name="email"]', user);
-      await find.setValue('input[type="password"]', pwd);
-      await find.clickByCssSelector('.auth0-label-submit');
-      await find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
-    } catch (err) {
-      log.debug(`${err} \nFailed to find Auth0 login page, trying the Auth0 last login page`);
-      await find.clickByCssSelector('.auth0-lock-social-button');
+  async login(user: string, pwd: string) {
+    const loginType = process.env.VM || '';
+    if (loginType.includes('oidc') || loginType.includes('saml')) {
+      await this.samlLogin(user, pwd);
+      return;
     }
-  };
 
-  class LoginPage {
-    async login(user: string, pwd: string) {
-      const loginType = process.env.VM || '';
-      if (loginType.includes('oidc') || loginType.includes('saml')) {
-        await samlLogin(user, pwd);
-        return;
-      }
+    await this.regularLogin(user, pwd);
+  }
 
-      await regularLogin(user, pwd);
-    }
+  async logoutLogin(user: string, pwd: string) {
+    await this.logout();
+    await this.sleep(3002);
+    await this.login(user, pwd);
+  }
 
-    async logoutLogin(user: string, pwd: string) {
-      await this.logout();
-      await this.sleep(3002);
-      await this.login(user, pwd);
-    }
+  async logout() {
+    await this.testSubjects.click('userMenuButton');
+    await this.sleep(500);
+    await this.testSubjects.click('logoutLink');
+    this.log.debug('### found and clicked log out--------------------------');
+    await this.sleep(8002);
+  }
 
-    async logout() {
-      await testSubjects.click('userMenuButton');
-      await this.sleep(500);
-      await testSubjects.click('logoutLink');
-      log.debug('### found and clicked log out--------------------------');
-      await this.sleep(8002);
-    }
+  async sleep(sleepMilliseconds: number) {
+    this.log.debug(`... sleep(${sleepMilliseconds}) start`);
+    await delay(sleepMilliseconds);
+    this.log.debug(`... sleep(${sleepMilliseconds}) end`);
+  }
 
-    async sleep(sleepMilliseconds: number) {
-      log.debug(`... sleep(${sleepMilliseconds}) start`);
-      await delay(sleepMilliseconds);
-      log.debug(`... sleep(${sleepMilliseconds}) end`);
-    }
+  private async regularLogin(user: string, pwd: string) {
+    await this.testSubjects.setValue('loginUsername', user);
+    await this.testSubjects.setValue('loginPassword', pwd);
+    await this.testSubjects.click('loginSubmit');
+    await this.find.waitForDeletedByCssSelector('.kibanaWelcomeLogo');
+    await this.find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
   }
 
-  return new LoginPage();
+  private async samlLogin(user: string, pwd: string) {
+    try {
+      await this.find.clickByButtonText('Login using SAML');
+      await this.find.setValue('input[name="email"]', user);
+      await this.find.setValue('input[type="password"]', pwd);
+      await this.find.clickByCssSelector('.auth0-label-submit');
+      await this.find.byCssSelector('[data-test-subj="kibanaChrome"]', 60000); // 60 sec waiting
+    } catch (err) {
+      this.log.debug(`${err} \nFailed to find Auth0 login page, trying the Auth0 last login page`);
+      await this.find.clickByCssSelector('.auth0-lock-social-button');
+    }
+  }
 }
diff --git a/test/functional/page_objects/management/saved_objects_page.ts b/test/functional/page_objects/management/saved_objects_page.ts
index fc4de6ed7f82f..9f48a6f57c8d8 100644
--- a/test/functional/page_objects/management/saved_objects_page.ts
+++ b/test/functional/page_objects/management/saved_objects_page.ts
@@ -8,328 +8,325 @@
 
 import { keyBy } from 'lodash';
 import { map as mapAsync } from 'bluebird';
-import { FtrProviderContext } from '../../ftr_provider_context';
-
-export function SavedObjectsPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
-  const retry = getService('retry');
-  const browser = getService('browser');
-  const find = getService('find');
-  const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['header', 'common']);
-
-  class SavedObjectsPage {
-    async searchForObject(objectName: string) {
-      const searchBox = await testSubjects.find('savedObjectSearchBar');
-      await searchBox.clearValue();
-      await searchBox.type(objectName);
-      await searchBox.pressKeys(browser.keys.ENTER);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await this.waitTableIsLoaded();
-    }
-
-    async getCurrentSearchValue() {
-      const searchBox = await testSubjects.find('savedObjectSearchBar');
-      return await searchBox.getAttribute('value');
-    }
+import { FtrService } from '../../ftr_provider_context';
+
+export class SavedObjectsPageObject extends FtrService {
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly find = this.ctx.getService('find');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+
+  async searchForObject(objectName: string) {
+    const searchBox = await this.testSubjects.find('savedObjectSearchBar');
+    await searchBox.clearValue();
+    await searchBox.type(objectName);
+    await searchBox.pressKeys(this.browser.keys.ENTER);
+    await this.header.waitUntilLoadingHasFinished();
+    await this.waitTableIsLoaded();
+  }
 
-    async importFile(path: string, overwriteAll = true) {
-      log.debug(`importFile(${path})`);
+  async getCurrentSearchValue() {
+    const searchBox = await this.testSubjects.find('savedObjectSearchBar');
+    return await searchBox.getAttribute('value');
+  }
 
-      log.debug(`Clicking importObjects`);
-      await testSubjects.click('importObjects');
-      await PageObjects.common.setFileInputPath(path);
+  async importFile(path: string, overwriteAll = true) {
+    this.log.debug(`importFile(${path})`);
 
-      if (!overwriteAll) {
-        log.debug(`Toggling overwriteAll`);
-        const radio = await testSubjects.find(
-          'savedObjectsManagement-importModeControl-overwriteRadioGroup'
-        );
-        // a radio button consists of a div tag that contains an input, a div, and a label
-        // we can't click the input directly, need to go up one level and click the parent div
-        const div = await radio.findByXpath("//div[input[@id='overwriteDisabled']]");
-        await div.click();
-      } else {
-        log.debug(`Leaving overwriteAll alone`);
-      }
-      await testSubjects.click('importSavedObjectsImportBtn');
-      log.debug(`done importing the file`);
+    this.log.debug(`Clicking importObjects`);
+    await this.testSubjects.click('importObjects');
+    await this.common.setFileInputPath(path);
 
-      // Wait for all the saves to happen
-      await PageObjects.header.waitUntilLoadingHasFinished();
+    if (!overwriteAll) {
+      this.log.debug(`Toggling overwriteAll`);
+      const radio = await this.testSubjects.find(
+        'savedObjectsManagement-importModeControl-overwriteRadioGroup'
+      );
+      // a radio button consists of a div tag that contains an input, a div, and a label
+      // we can't click the input directly, need to go up one level and click the parent div
+      const div = await radio.findByXpath("//div[input[@id='overwriteDisabled']]");
+      await div.click();
+    } else {
+      this.log.debug(`Leaving overwriteAll alone`);
     }
+    await this.testSubjects.click('importSavedObjectsImportBtn');
+    this.log.debug(`done importing the file`);
 
-    async checkImportSucceeded() {
-      await testSubjects.existOrFail('importSavedObjectsSuccess', { timeout: 20000 });
-    }
+    // Wait for all the saves to happen
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async checkNoneImported() {
-      await testSubjects.existOrFail('importSavedObjectsSuccessNoneImported', { timeout: 20000 });
-    }
+  async checkImportSucceeded() {
+    await this.testSubjects.existOrFail('importSavedObjectsSuccess', { timeout: 20000 });
+  }
 
-    async checkImportConflictsWarning() {
-      await testSubjects.existOrFail('importSavedObjectsConflictsWarning', { timeout: 20000 });
-    }
+  async checkNoneImported() {
+    await this.testSubjects.existOrFail('importSavedObjectsSuccessNoneImported', {
+      timeout: 20000,
+    });
+  }
 
-    async checkImportLegacyWarning() {
-      await testSubjects.existOrFail('importSavedObjectsLegacyWarning', { timeout: 20000 });
-    }
+  async checkImportConflictsWarning() {
+    await this.testSubjects.existOrFail('importSavedObjectsConflictsWarning', { timeout: 20000 });
+  }
 
-    async checkImportFailedWarning() {
-      await testSubjects.existOrFail('importSavedObjectsFailedWarning', { timeout: 20000 });
-    }
+  async checkImportLegacyWarning() {
+    await this.testSubjects.existOrFail('importSavedObjectsLegacyWarning', { timeout: 20000 });
+  }
 
-    async checkImportError() {
-      await testSubjects.existOrFail('importSavedObjectsErrorText', { timeout: 20000 });
-    }
+  async checkImportFailedWarning() {
+    await this.testSubjects.existOrFail('importSavedObjectsFailedWarning', { timeout: 20000 });
+  }
 
-    async getImportErrorText() {
-      return await testSubjects.getVisibleText('importSavedObjectsErrorText');
-    }
+  async checkImportError() {
+    await this.testSubjects.existOrFail('importSavedObjectsErrorText', { timeout: 20000 });
+  }
 
-    async clickImportDone() {
-      await testSubjects.click('importSavedObjectsDoneBtn');
-      await this.waitTableIsLoaded();
-    }
+  async getImportErrorText() {
+    return await this.testSubjects.getVisibleText('importSavedObjectsErrorText');
+  }
 
-    async clickConfirmChanges() {
-      await testSubjects.click('importSavedObjectsConfirmBtn');
-    }
+  async clickImportDone() {
+    await this.testSubjects.click('importSavedObjectsDoneBtn');
+    await this.waitTableIsLoaded();
+  }
 
-    async waitTableIsLoaded() {
-      return retry.try(async () => {
-        const isLoaded = await find.existsByDisplayedByCssSelector(
-          '*[data-test-subj="savedObjectsTable"] :not(.euiBasicTable-loading)'
-        );
+  async clickConfirmChanges() {
+    await this.testSubjects.click('importSavedObjectsConfirmBtn');
+  }
 
-        if (isLoaded) {
-          return true;
-        } else {
-          throw new Error('Waiting');
-        }
-      });
-    }
+  async waitTableIsLoaded() {
+    return this.retry.try(async () => {
+      const isLoaded = await this.find.existsByDisplayedByCssSelector(
+        '*[data-test-subj="savedObjectsTable"] :not(.euiBasicTable-loading)'
+      );
 
-    async clickRelationshipsByTitle(title: string) {
-      const table = keyBy(await this.getElementsInTable(), 'title');
-      // should we check if table size > 0 and log error if not?
-      if (table[title].menuElement) {
-        log.debug(`we found a context menu element for (${title}) so click it`);
-        await table[title].menuElement?.click();
-        // Wait for context menu to render
-        const menuPanel = await find.byCssSelector('.euiContextMenuPanel');
-        await (await menuPanel.findByTestSubject('savedObjectsTableAction-relationships')).click();
+      if (isLoaded) {
+        return true;
       } else {
-        log.debug(
-          `we didn't find a menu element so should be a relastionships element for (${title}) to click`
-        );
-        // or the action elements are on the row without the menu
-        await table[title].relationshipsElement?.click();
+        throw new Error('Waiting');
       }
-    }
+    });
+  }
 
-    async setOverriddenIndexPatternValue(oldName: string, newName: string) {
-      const select = await testSubjects.find(`managementChangeIndexSelection-${oldName}`);
-      const option = await testSubjects.findDescendant(`indexPatternOption-${newName}`, select);
-      await option.click();
+  async clickRelationshipsByTitle(title: string) {
+    const table = keyBy(await this.getElementsInTable(), 'title');
+    // should we check if table size > 0 and log error if not?
+    if (table[title].menuElement) {
+      this.log.debug(`we found a context menu element for (${title}) so click it`);
+      await table[title].menuElement?.click();
+      // Wait for context menu to render
+      const menuPanel = await this.find.byCssSelector('.euiContextMenuPanel');
+      await (await menuPanel.findByTestSubject('savedObjectsTableAction-relationships')).click();
+    } else {
+      this.log.debug(
+        `we didn't find a menu element so should be a relastionships element for (${title}) to click`
+      );
+      // or the action elements are on the row without the menu
+      await table[title].relationshipsElement?.click();
     }
+  }
 
-    async clickCopyToSpaceByTitle(title: string) {
-      const table = keyBy(await this.getElementsInTable(), 'title');
-      // should we check if table size > 0 and log error if not?
-      if (table[title].menuElement) {
-        log.debug(`we found a context menu element for (${title}) so click it`);
-        await table[title].menuElement?.click();
-        // Wait for context menu to render
-        const menuPanel = await find.byCssSelector('.euiContextMenuPanel');
-        await (
-          await menuPanel.findByTestSubject('savedObjectsTableAction-copy_saved_objects_to_space')
-        ).click();
-      } else {
-        log.debug(
-          `we didn't find a menu element so should be a "copy to space" element for (${title}) to click`
-        );
-        // or the action elements are on the row without the menu
-        await table[title].copySaveObjectsElement?.click();
-      }
-    }
+  async setOverriddenIndexPatternValue(oldName: string, newName: string) {
+    const select = await this.testSubjects.find(`managementChangeIndexSelection-${oldName}`);
+    const option = await this.testSubjects.findDescendant(`indexPatternOption-${newName}`, select);
+    await option.click();
+  }
 
-    async clickInspectByTitle(title: string) {
-      const table = keyBy(await this.getElementsInTable(), 'title');
-      if (table[title].menuElement) {
-        await table[title].menuElement?.click();
-        // Wait for context menu to render
-        const menuPanel = await find.byCssSelector('.euiContextMenuPanel');
-        const panelButton = await menuPanel.findByTestSubject('savedObjectsTableAction-inspect');
-        await panelButton.click();
-      } else {
-        // or the action elements are on the row without the menu
-        await table[title].copySaveObjectsElement?.click();
-      }
+  async clickCopyToSpaceByTitle(title: string) {
+    const table = keyBy(await this.getElementsInTable(), 'title');
+    // should we check if table size > 0 and log error if not?
+    if (table[title].menuElement) {
+      this.log.debug(`we found a context menu element for (${title}) so click it`);
+      await table[title].menuElement?.click();
+      // Wait for context menu to render
+      const menuPanel = await this.find.byCssSelector('.euiContextMenuPanel');
+      await (
+        await menuPanel.findByTestSubject('savedObjectsTableAction-copy_saved_objects_to_space')
+      ).click();
+    } else {
+      this.log.debug(
+        `we didn't find a menu element so should be a "copy to space" element for (${title}) to click`
+      );
+      // or the action elements are on the row without the menu
+      await table[title].copySaveObjectsElement?.click();
     }
+  }
 
-    async clickCheckboxByTitle(title: string) {
-      const table = keyBy(await this.getElementsInTable(), 'title');
-      // should we check if table size > 0 and log error if not?
-      await table[title].checkbox.click();
+  async clickInspectByTitle(title: string) {
+    const table = keyBy(await this.getElementsInTable(), 'title');
+    if (table[title].menuElement) {
+      await table[title].menuElement?.click();
+      // Wait for context menu to render
+      const menuPanel = await this.find.byCssSelector('.euiContextMenuPanel');
+      const panelButton = await menuPanel.findByTestSubject('savedObjectsTableAction-inspect');
+      await panelButton.click();
+    } else {
+      // or the action elements are on the row without the menu
+      await table[title].copySaveObjectsElement?.click();
     }
+  }
 
-    async getObjectTypeByTitle(title: string) {
-      const table = keyBy(await this.getElementsInTable(), 'title');
-      // should we check if table size > 0 and log error if not?
-      return table[title].objectType;
-    }
+  async clickCheckboxByTitle(title: string) {
+    const table = keyBy(await this.getElementsInTable(), 'title');
+    // should we check if table size > 0 and log error if not?
+    await table[title].checkbox.click();
+  }
 
-    async getElementsInTable() {
-      const rows = await testSubjects.findAll('~savedObjectsTableRow');
-      return mapAsync(rows, async (row) => {
-        const checkbox = await row.findByCssSelector('[data-test-subj*="checkboxSelectRow"]');
-        // return the object type aria-label="index patterns"
-        const objectType = await row.findByTestSubject('objectType');
-        const titleElement = await row.findByTestSubject('savedObjectsTableRowTitle');
-        // not all rows have inspect button - Advanced Settings objects don't
-        // Advanced Settings has 2 actions,
-        //   data-test-subj="savedObjectsTableAction-relationships"
-        //   data-test-subj="savedObjectsTableAction-copy_saved_objects_to_space"
-        // Some other objects have the ...
-        //   data-test-subj="euiCollapsedItemActionsButton"
-        // Maybe some objects still have the inspect element visible?
-        // !!! Also note that since we don't have spaces on OSS, the actions for the same object can be different depending on OSS or not
-        let menuElement = null;
-        let inspectElement = null;
-        let relationshipsElement = null;
-        let copySaveObjectsElement = null;
-        const actions = await row.findByClassName('euiTableRowCell--hasActions');
-        // getting the innerHTML and checking if it 'includes' a string is faster than a timeout looking for each element
-        const actionsHTML = await actions.getAttribute('innerHTML');
-        if (actionsHTML.includes('euiCollapsedItemActionsButton')) {
-          menuElement = await row.findByTestSubject('euiCollapsedItemActionsButton');
-        }
-        if (actionsHTML.includes('savedObjectsTableAction-inspect')) {
-          inspectElement = await row.findByTestSubject('savedObjectsTableAction-inspect');
-        }
-        if (actionsHTML.includes('savedObjectsTableAction-relationships')) {
-          relationshipsElement = await row.findByTestSubject(
-            'savedObjectsTableAction-relationships'
-          );
-        }
-        if (actionsHTML.includes('savedObjectsTableAction-copy_saved_objects_to_space')) {
-          copySaveObjectsElement = await row.findByTestSubject(
-            'savedObjectsTableAction-copy_saved_objects_to_space'
-          );
-        }
-        return {
-          checkbox,
-          objectType: await objectType.getAttribute('aria-label'),
-          titleElement,
-          title: await titleElement.getVisibleText(),
-          menuElement,
-          inspectElement,
-          relationshipsElement,
-          copySaveObjectsElement,
-        };
-      });
-    }
+  async getObjectTypeByTitle(title: string) {
+    const table = keyBy(await this.getElementsInTable(), 'title');
+    // should we check if table size > 0 and log error if not?
+    return table[title].objectType;
+  }
 
-    async getRowTitles() {
-      await this.waitTableIsLoaded();
-      const table = await testSubjects.find('savedObjectsTable');
-      const $ = await table.parseDomContent();
-      return $.findTestSubjects('savedObjectsTableRowTitle')
-        .toArray()
-        .map((cell) => $(cell).find('.euiTableCellContent').text());
-    }
+  async getElementsInTable() {
+    const rows = await this.testSubjects.findAll('~savedObjectsTableRow');
+    return mapAsync(rows, async (row) => {
+      const checkbox = await row.findByCssSelector('[data-test-subj*="checkboxSelectRow"]');
+      // return the object type aria-label="index patterns"
+      const objectType = await row.findByTestSubject('objectType');
+      const titleElement = await row.findByTestSubject('savedObjectsTableRowTitle');
+      // not all rows have inspect button - Advanced Settings objects don't
+      // Advanced Settings has 2 actions,
+      //   data-test-subj="savedObjectsTableAction-relationships"
+      //   data-test-subj="savedObjectsTableAction-copy_saved_objects_to_space"
+      // Some other objects have the ...
+      //   data-test-subj="euiCollapsedItemActionsButton"
+      // Maybe some objects still have the inspect element visible?
+      // !!! Also note that since we don't have spaces on OSS, the actions for the same object can be different depending on OSS or not
+      let menuElement = null;
+      let inspectElement = null;
+      let relationshipsElement = null;
+      let copySaveObjectsElement = null;
+      const actions = await row.findByClassName('euiTableRowCell--hasActions');
+      // getting the innerHTML and checking if it 'includes' a string is faster than a timeout looking for each element
+      const actionsHTML = await actions.getAttribute('innerHTML');
+      if (actionsHTML.includes('euiCollapsedItemActionsButton')) {
+        menuElement = await row.findByTestSubject('euiCollapsedItemActionsButton');
+      }
+      if (actionsHTML.includes('savedObjectsTableAction-inspect')) {
+        inspectElement = await row.findByTestSubject('savedObjectsTableAction-inspect');
+      }
+      if (actionsHTML.includes('savedObjectsTableAction-relationships')) {
+        relationshipsElement = await row.findByTestSubject('savedObjectsTableAction-relationships');
+      }
+      if (actionsHTML.includes('savedObjectsTableAction-copy_saved_objects_to_space')) {
+        copySaveObjectsElement = await row.findByTestSubject(
+          'savedObjectsTableAction-copy_saved_objects_to_space'
+        );
+      }
+      return {
+        checkbox,
+        objectType: await objectType.getAttribute('aria-label'),
+        titleElement,
+        title: await titleElement.getVisibleText(),
+        menuElement,
+        inspectElement,
+        relationshipsElement,
+        copySaveObjectsElement,
+      };
+    });
+  }
 
-    async getRelationshipFlyout() {
-      const rows = await testSubjects.findAll('relationshipsTableRow');
-      return mapAsync(rows, async (row) => {
-        const objectType = await row.findByTestSubject('relationshipsObjectType');
-        const relationship = await row.findByTestSubject('directRelationship');
-        const titleElement = await row.findByTestSubject('relationshipsTitle');
-        const inspectElement = await row.findByTestSubject('relationshipsTableAction-inspect');
-        return {
-          objectType: await objectType.getAttribute('aria-label'),
-          relationship: await relationship.getVisibleText(),
-          titleElement,
-          title: await titleElement.getVisibleText(),
-          inspectElement,
-        };
-      });
-    }
+  async getRowTitles() {
+    await this.waitTableIsLoaded();
+    const table = await this.testSubjects.find('savedObjectsTable');
+    const $ = await table.parseDomContent();
+    return $.findTestSubjects('savedObjectsTableRowTitle')
+      .toArray()
+      .map((cell) => $(cell).find('.euiTableCellContent').text());
+  }
 
-    async getInvalidRelations() {
-      const rows = await testSubjects.findAll('invalidRelationshipsTableRow');
-      return mapAsync(rows, async (row) => {
-        const objectType = await row.findByTestSubject('relationshipsObjectType');
-        const objectId = await row.findByTestSubject('relationshipsObjectId');
-        const relationship = await row.findByTestSubject('directRelationship');
-        const error = await row.findByTestSubject('relationshipsError');
+  async getRelationshipFlyout() {
+    const rows = await this.testSubjects.findAll('relationshipsTableRow');
+    return mapAsync(rows, async (row) => {
+      const objectType = await row.findByTestSubject('relationshipsObjectType');
+      const relationship = await row.findByTestSubject('directRelationship');
+      const titleElement = await row.findByTestSubject('relationshipsTitle');
+      const inspectElement = await row.findByTestSubject('relationshipsTableAction-inspect');
+      return {
+        objectType: await objectType.getAttribute('aria-label'),
+        relationship: await relationship.getVisibleText(),
+        titleElement,
+        title: await titleElement.getVisibleText(),
+        inspectElement,
+      };
+    });
+  }
+
+  async getInvalidRelations() {
+    const rows = await this.testSubjects.findAll('invalidRelationshipsTableRow');
+    return mapAsync(rows, async (row) => {
+      const objectType = await row.findByTestSubject('relationshipsObjectType');
+      const objectId = await row.findByTestSubject('relationshipsObjectId');
+      const relationship = await row.findByTestSubject('directRelationship');
+      const error = await row.findByTestSubject('relationshipsError');
+      return {
+        type: await objectType.getVisibleText(),
+        id: await objectId.getVisibleText(),
+        relationship: await relationship.getVisibleText(),
+        error: await error.getVisibleText(),
+      };
+    });
+  }
+
+  async getTableSummary() {
+    const table = await this.testSubjects.find('savedObjectsTable');
+    const $ = await table.parseDomContent();
+    return $('tbody tr')
+      .toArray()
+      .map((row) => {
         return {
-          type: await objectType.getVisibleText(),
-          id: await objectId.getVisibleText(),
-          relationship: await relationship.getVisibleText(),
-          error: await error.getVisibleText(),
+          title: $(row).find('td:nth-child(3) .euiTableCellContent').text(),
+          canViewInApp: Boolean($(row).find('td:nth-child(3) a').length),
         };
       });
-    }
+  }
 
-    async getTableSummary() {
-      const table = await testSubjects.find('savedObjectsTable');
-      const $ = await table.parseDomContent();
-      return $('tbody tr')
-        .toArray()
-        .map((row) => {
-          return {
-            title: $(row).find('td:nth-child(3) .euiTableCellContent').text(),
-            canViewInApp: Boolean($(row).find('td:nth-child(3) a').length),
-          };
-        });
-    }
+  async clickTableSelectAll() {
+    await this.testSubjects.click('checkboxSelectAll');
+  }
 
-    async clickTableSelectAll() {
-      await testSubjects.click('checkboxSelectAll');
-    }
+  async canBeDeleted() {
+    return await this.testSubjects.isEnabled('savedObjectsManagementDelete');
+  }
 
-    async canBeDeleted() {
-      return await testSubjects.isEnabled('savedObjectsManagementDelete');
+  async clickDelete({ confirmDelete = true }: { confirmDelete?: boolean } = {}) {
+    await this.testSubjects.click('savedObjectsManagementDelete');
+    if (confirmDelete) {
+      await this.testSubjects.click('confirmModalConfirmButton');
+      await this.waitTableIsLoaded();
     }
+  }
 
-    async clickDelete({ confirmDelete = true }: { confirmDelete?: boolean } = {}) {
-      await testSubjects.click('savedObjectsManagementDelete');
-      if (confirmDelete) {
-        await testSubjects.click('confirmModalConfirmButton');
-        await this.waitTableIsLoaded();
-      }
-    }
+  async getImportWarnings() {
+    const elements = await this.testSubjects.findAll('importSavedObjectsWarning');
+    return Promise.all(
+      elements.map(async (element) => {
+        const message = await element
+          .findByClassName('euiCallOutHeader__title')
+          .then((titleEl) => titleEl.getVisibleText());
+        const buttons = await element.findAllByClassName('euiButton');
+        return {
+          message,
+          type: buttons.length ? 'action_required' : 'simple',
+        };
+      })
+    );
+  }
 
-    async getImportWarnings() {
-      const elements = await testSubjects.findAll('importSavedObjectsWarning');
-      return Promise.all(
-        elements.map(async (element) => {
-          const message = await element
-            .findByClassName('euiCallOutHeader__title')
-            .then((titleEl) => titleEl.getVisibleText());
-          const buttons = await element.findAllByClassName('euiButton');
-          return {
-            message,
-            type: buttons.length ? 'action_required' : 'simple',
-          };
-        })
-      );
+  async getImportErrorsCount() {
+    this.log.debug(`Toggling overwriteAll`);
+    const errorCountNode = await this.testSubjects.find('importSavedObjectsErrorsCount');
+    const errorCountText = await errorCountNode.getVisibleText();
+    const match = errorCountText.match(/(\d)+/);
+    if (!match) {
+      throw Error(`unable to parse error count from text ${errorCountText}`);
     }
 
-    async getImportErrorsCount() {
-      log.debug(`Toggling overwriteAll`);
-      const errorCountNode = await testSubjects.find('importSavedObjectsErrorsCount');
-      const errorCountText = await errorCountNode.getVisibleText();
-      const match = errorCountText.match(/(\d)+/);
-      if (!match) {
-        throw Error(`unable to parse error count from text ${errorCountText}`);
-      }
-
-      return +match[1];
-    }
+    return +match[1];
   }
-
-  return new SavedObjectsPage();
 }
diff --git a/test/functional/page_objects/newsfeed_page.ts b/test/functional/page_objects/newsfeed_page.ts
index 1fa9bb5b90002..3a4bbee924552 100644
--- a/test/functional/page_objects/newsfeed_page.ts
+++ b/test/functional/page_objects/newsfeed_page.ts
@@ -6,58 +6,54 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function NewsfeedPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
-  const find = getService('find');
-  const retry = getService('retry');
-  const flyout = getService('flyout');
-  const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common']);
-
-  class NewsfeedPage {
-    async resetPage() {
-      await PageObjects.common.navigateToUrl('home', '', { useActualUrl: true });
-    }
-
-    async closeNewsfeedPanel() {
-      await flyout.ensureClosed('NewsfeedFlyout');
-      log.debug('clickNewsfeed icon');
-      await retry.waitFor('newsfeed flyout', async () => {
-        if (await testSubjects.exists('NewsfeedFlyout')) {
-          await testSubjects.click('NewsfeedFlyout > euiFlyoutCloseButton');
-          return false;
-        }
-        return true;
-      });
-    }
+import { FtrService } from '../ftr_provider_context';
+
+export class NewsfeedPageObject extends FtrService {
+  private readonly log = this.ctx.getService('log');
+  private readonly find = this.ctx.getService('find');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly flyout = this.ctx.getService('flyout');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly common = this.ctx.getPageObject('common');
+
+  async resetPage() {
+    await this.common.navigateToUrl('home', '', { useActualUrl: true });
+  }
 
-    async openNewsfeedPanel() {
-      log.debug('clickNewsfeed icon');
-      return await testSubjects.exists('NewsfeedFlyout');
-    }
+  async closeNewsfeedPanel() {
+    await this.flyout.ensureClosed('NewsfeedFlyout');
+    this.log.debug('clickNewsfeed icon');
+    await this.retry.waitFor('newsfeed flyout', async () => {
+      if (await this.testSubjects.exists('NewsfeedFlyout')) {
+        await this.testSubjects.click('NewsfeedFlyout > euiFlyoutCloseButton');
+        return false;
+      }
+      return true;
+    });
+  }
 
-    async getRedButtonSign() {
-      return await find.existsByCssSelector('.euiHeaderSectionItemButton__notification--dot');
-    }
+  async openNewsfeedPanel() {
+    this.log.debug('clickNewsfeed icon');
+    return await this.testSubjects.exists('NewsfeedFlyout');
+  }
 
-    async getNewsfeedList() {
-      const list = await testSubjects.find('NewsfeedFlyout');
-      const cells = await list.findAllByTestSubject('newsHeadAlert');
+  async getRedButtonSign() {
+    return await this.find.existsByCssSelector('.euiHeaderSectionItemButton__notification--dot');
+  }
 
-      const objects = [];
-      for (const cell of cells) {
-        objects.push(await cell.getVisibleText());
-      }
+  async getNewsfeedList() {
+    const list = await this.testSubjects.find('NewsfeedFlyout');
+    const cells = await list.findAllByTestSubject('newsHeadAlert');
 
-      return objects;
+    const objects = [];
+    for (const cell of cells) {
+      objects.push(await cell.getVisibleText());
     }
 
-    async openNewsfeedEmptyPanel() {
-      return await testSubjects.exists('emptyNewsfeed');
-    }
+    return objects;
   }
 
-  return new NewsfeedPage();
+  async openNewsfeedEmptyPanel() {
+    return await this.testSubjects.exists('emptyNewsfeed');
+  }
 }
diff --git a/test/functional/page_objects/settings_page.ts b/test/functional/page_objects/settings_page.ts
index 699165a51ca8c..7d7da79b4a397 100644
--- a/test/functional/page_objects/settings_page.ts
+++ b/test/functional/page_objects/settings_page.ts
@@ -8,731 +8,730 @@
 
 import { map as mapAsync } from 'bluebird';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function SettingsPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
-  const retry = getService('retry');
-  const browser = getService('browser');
-  const find = getService('find');
-  const flyout = getService('flyout');
-  const testSubjects = getService('testSubjects');
-  const comboBox = getService('comboBox');
-  const PageObjects = getPageObjects(['header', 'common', 'savedObjects']);
-
-  class SettingsPage {
-    async clickNavigation() {
-      await find.clickDisplayedByCssSelector('.app-link:nth-child(5) a');
-    }
+import { FtrService } from '../ftr_provider_context';
+
+export class SettingsPageObject extends FtrService {
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly find = this.ctx.getService('find');
+  private readonly flyout = this.ctx.getService('flyout');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly comboBox = this.ctx.getService('comboBox');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly savedObjects = this.ctx.getPageObject('savedObjects');
+
+  async clickNavigation() {
+    await this.find.clickDisplayedByCssSelector('.app-link:nth-child(5) a');
+  }
 
-    async clickLinkText(text: string) {
-      await find.clickByDisplayedLinkText(text);
-    }
+  async clickLinkText(text: string) {
+    await this.find.clickByDisplayedLinkText(text);
+  }
 
-    async clickKibanaSettings() {
-      await testSubjects.click('settings');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await testSubjects.existOrFail('managementSettingsTitle');
-    }
+  async clickKibanaSettings() {
+    await this.testSubjects.click('settings');
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.existOrFail('managementSettingsTitle');
+  }
 
-    async clickKibanaSavedObjects() {
-      await testSubjects.click('objects');
-      await PageObjects.savedObjects.waitTableIsLoaded();
-    }
+  async clickKibanaSavedObjects() {
+    await this.testSubjects.click('objects');
+    await this.savedObjects.waitTableIsLoaded();
+  }
 
-    async clickKibanaIndexPatterns() {
-      log.debug('clickKibanaIndexPatterns link');
-      await testSubjects.click('indexPatterns');
+  async clickKibanaIndexPatterns() {
+    this.log.debug('clickKibanaIndexPatterns link');
+    await this.testSubjects.click('indexPatterns');
 
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async getAdvancedSettings(propertyName: string) {
-      log.debug('in getAdvancedSettings');
-      return await testSubjects.getAttribute(`advancedSetting-editField-${propertyName}`, 'value');
-    }
+  async getAdvancedSettings(propertyName: string) {
+    this.log.debug('in getAdvancedSettings');
+    return await this.testSubjects.getAttribute(
+      `advancedSetting-editField-${propertyName}`,
+      'value'
+    );
+  }
 
-    async expectDisabledAdvancedSetting(propertyName: string) {
-      expect(
-        await testSubjects.getAttribute(`advancedSetting-editField-${propertyName}`, 'disabled')
-      ).to.eql('true');
-    }
+  async expectDisabledAdvancedSetting(propertyName: string) {
+    expect(
+      await this.testSubjects.getAttribute(`advancedSetting-editField-${propertyName}`, 'disabled')
+    ).to.eql('true');
+  }
 
-    async getAdvancedSettingCheckbox(propertyName: string) {
-      log.debug('in getAdvancedSettingCheckbox');
-      return await testSubjects.getAttribute(
-        `advancedSetting-editField-${propertyName}`,
-        'checked'
-      );
-    }
+  async getAdvancedSettingCheckbox(propertyName: string) {
+    this.log.debug('in getAdvancedSettingCheckbox');
+    return await this.testSubjects.getAttribute(
+      `advancedSetting-editField-${propertyName}`,
+      'checked'
+    );
+  }
 
-    async clearAdvancedSettings(propertyName: string) {
-      await testSubjects.click(`advancedSetting-resetField-${propertyName}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await testSubjects.click(`advancedSetting-saveButton`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async clearAdvancedSettings(propertyName: string) {
+    await this.testSubjects.click(`advancedSetting-resetField-${propertyName}`);
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.click(`advancedSetting-saveButton`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async setAdvancedSettingsSelect(propertyName: string, propertyValue: string) {
-      await find.clickByCssSelector(
-        `[data-test-subj="advancedSetting-editField-${propertyName}"] option[value="${propertyValue}"]`
-      );
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await testSubjects.click(`advancedSetting-saveButton`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async setAdvancedSettingsSelect(propertyName: string, propertyValue: string) {
+    await this.find.clickByCssSelector(
+      `[data-test-subj="advancedSetting-editField-${propertyName}"] option[value="${propertyValue}"]`
+    );
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.click(`advancedSetting-saveButton`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async setAdvancedSettingsInput(propertyName: string, propertyValue: string) {
-      const input = await testSubjects.find(`advancedSetting-editField-${propertyName}`);
-      await input.clearValue();
-      await input.type(propertyValue);
-      await testSubjects.click(`advancedSetting-saveButton`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async setAdvancedSettingsInput(propertyName: string, propertyValue: string) {
+    const input = await this.testSubjects.find(`advancedSetting-editField-${propertyName}`);
+    await input.clearValue();
+    await input.type(propertyValue);
+    await this.testSubjects.click(`advancedSetting-saveButton`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async setAdvancedSettingsTextArea(propertyName: string, propertyValue: string) {
-      const wrapper = await testSubjects.find(`advancedSetting-editField-${propertyName}`);
-      const textarea = await wrapper.findByTagName('textarea');
-      await textarea.focus();
-      // only way to properly replace the value of the ace editor is via the JS api
-      await browser.execute(
-        (editor: string, value: string) => {
-          return (window as any).ace.edit(editor).setValue(value);
-        },
-        `advancedSetting-editField-${propertyName}-editor`,
-        propertyValue
-      );
-      await testSubjects.click(`advancedSetting-saveButton`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async setAdvancedSettingsTextArea(propertyName: string, propertyValue: string) {
+    const wrapper = await this.testSubjects.find(`advancedSetting-editField-${propertyName}`);
+    const textarea = await wrapper.findByTagName('textarea');
+    await textarea.focus();
+    // only way to properly replace the value of the ace editor is via the JS api
+    await this.browser.execute(
+      (editor: string, value: string) => {
+        return (window as any).ace.edit(editor).setValue(value);
+      },
+      `advancedSetting-editField-${propertyName}-editor`,
+      propertyValue
+    );
+    await this.testSubjects.click(`advancedSetting-saveButton`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async toggleAdvancedSettingCheckbox(propertyName: string) {
-      await testSubjects.click(`advancedSetting-editField-${propertyName}`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await testSubjects.click(`advancedSetting-saveButton`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async toggleAdvancedSettingCheckbox(propertyName: string) {
+    await this.testSubjects.click(`advancedSetting-editField-${propertyName}`);
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.click(`advancedSetting-saveButton`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async navigateTo() {
-      await PageObjects.common.navigateToApp('settings');
-    }
+  async navigateTo() {
+    await this.common.navigateToApp('settings');
+  }
 
-    async getIndexPatternField() {
-      return await testSubjects.find('createIndexPatternNameInput');
-    }
+  async getIndexPatternField() {
+    return await this.testSubjects.find('createIndexPatternNameInput');
+  }
 
-    async clickTimeFieldNameField() {
-      return await testSubjects.click('createIndexPatternTimeFieldSelect');
-    }
+  async clickTimeFieldNameField() {
+    return await this.testSubjects.click('createIndexPatternTimeFieldSelect');
+  }
 
-    async getTimeFieldNameField() {
-      return await testSubjects.find('createIndexPatternTimeFieldSelect');
-    }
+  async getTimeFieldNameField() {
+    return await this.testSubjects.find('createIndexPatternTimeFieldSelect');
+  }
 
-    async selectTimeFieldOption(selection: string) {
-      // open dropdown
-      await this.clickTimeFieldNameField();
-      // close dropdown, keep focus
-      await this.clickTimeFieldNameField();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      return await retry.try(async () => {
-        log.debug(`selectTimeFieldOption(${selection})`);
-        const timeFieldOption = await this.getTimeFieldOption(selection);
-        await timeFieldOption.click();
-        const selected = await timeFieldOption.isSelected();
-        if (!selected) throw new Error('option not selected: ' + selected);
-      });
-    }
+  async selectTimeFieldOption(selection: string) {
+    // open dropdown
+    await this.clickTimeFieldNameField();
+    // close dropdown, keep focus
+    await this.clickTimeFieldNameField();
+    await this.header.waitUntilLoadingHasFinished();
+    return await this.retry.try(async () => {
+      this.log.debug(`selectTimeFieldOption(${selection})`);
+      const timeFieldOption = await this.getTimeFieldOption(selection);
+      await timeFieldOption.click();
+      const selected = await timeFieldOption.isSelected();
+      if (!selected) throw new Error('option not selected: ' + selected);
+    });
+  }
 
-    async getTimeFieldOption(selection: string) {
-      return await find.displayedByCssSelector('option[value="' + selection + '"]');
-    }
+  async getTimeFieldOption(selection: string) {
+    return await this.find.displayedByCssSelector('option[value="' + selection + '"]');
+  }
 
-    async getCreateIndexPatternButton() {
-      return await testSubjects.find('createIndexPatternButton');
-    }
+  async getCreateIndexPatternButton() {
+    return await this.testSubjects.find('createIndexPatternButton');
+  }
 
-    async getCreateButton() {
-      return await find.displayedByCssSelector('[type="submit"]');
-    }
+  async getCreateButton() {
+    return await this.find.displayedByCssSelector('[type="submit"]');
+  }
 
-    async clickDefaultIndexButton() {
-      await testSubjects.click('setDefaultIndexPatternButton');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async clickDefaultIndexButton() {
+    await this.testSubjects.click('setDefaultIndexPatternButton');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async clickDeletePattern() {
-      await testSubjects.click('deleteIndexPatternButton');
-    }
+  async clickDeletePattern() {
+    await this.testSubjects.click('deleteIndexPatternButton');
+  }
 
-    async getIndexPageHeading() {
-      return await testSubjects.getVisibleText('indexPatternTitle');
-    }
+  async getIndexPageHeading() {
+    return await this.testSubjects.getVisibleText('indexPatternTitle');
+  }
 
-    async getConfigureHeader() {
-      return await find.byCssSelector('h1');
-    }
+  async getConfigureHeader() {
+    return await this.find.byCssSelector('h1');
+  }
 
-    async getTableHeader() {
-      return await find.allByCssSelector('table.euiTable thead tr th');
-    }
+  async getTableHeader() {
+    return await this.find.allByCssSelector('table.euiTable thead tr th');
+  }
 
-    async sortBy(columnName: string) {
-      const chartTypes = await find.allByCssSelector('table.euiTable thead tr th button');
+  async sortBy(columnName: string) {
+    const chartTypes = await this.find.allByCssSelector('table.euiTable thead tr th button');
 
-      async function getChartType(chart: Record<string, any>) {
-        const chartString = await chart.getVisibleText();
-        if (chartString === columnName) {
-          await chart.click();
-          await PageObjects.header.waitUntilLoadingHasFinished();
-        }
+    const getChartType = async (chart: Record<string, any>) => {
+      const chartString = await chart.getVisibleText();
+      if (chartString === columnName) {
+        await chart.click();
+        await this.header.waitUntilLoadingHasFinished();
       }
+    };
 
-      const getChartTypesPromises = chartTypes.map(getChartType);
-      return Promise.all(getChartTypesPromises);
-    }
+    const getChartTypesPromises = chartTypes.map(getChartType);
+    return Promise.all(getChartTypesPromises);
+  }
 
-    async getTableRow(rowNumber: number, colNumber: number) {
-      // passing in zero-based index, but adding 1 for css 1-based indexes
-      return await find.byCssSelector(
-        'table.euiTable tbody tr:nth-child(' +
-          (rowNumber + 1) +
-          ') td.euiTableRowCell:nth-child(' +
-          (colNumber + 1) +
-          ')'
-      );
-    }
+  async getTableRow(rowNumber: number, colNumber: number) {
+    // passing in zero-based index, but adding 1 for css 1-based indexes
+    return await this.find.byCssSelector(
+      'table.euiTable tbody tr:nth-child(' +
+        (rowNumber + 1) +
+        ') td.euiTableRowCell:nth-child(' +
+        (colNumber + 1) +
+        ')'
+    );
+  }
 
-    async getFieldsTabCount() {
-      return retry.try(async () => {
-        const text = await testSubjects.getVisibleText('tab-indexedFields');
-        return text.split(' ')[1].replace(/\((.*)\)/, '$1');
-      });
-    }
+  async getFieldsTabCount() {
+    return this.retry.try(async () => {
+      const text = await this.testSubjects.getVisibleText('tab-indexedFields');
+      return text.split(' ')[1].replace(/\((.*)\)/, '$1');
+    });
+  }
 
-    async getScriptedFieldsTabCount() {
-      return await retry.try(async () => {
-        const text = await testSubjects.getVisibleText('tab-scriptedFields');
-        return text.split(' ')[2].replace(/\((.*)\)/, '$1');
-      });
-    }
+  async getScriptedFieldsTabCount() {
+    return await this.retry.try(async () => {
+      const text = await this.testSubjects.getVisibleText('tab-scriptedFields');
+      return text.split(' ')[2].replace(/\((.*)\)/, '$1');
+    });
+  }
 
-    async getFieldNames() {
-      const fieldNameCells = await testSubjects.findAll('editIndexPattern > indexedFieldName');
-      return await mapAsync(fieldNameCells, async (cell) => {
-        return (await cell.getVisibleText()).trim();
-      });
-    }
+  async getFieldNames() {
+    const fieldNameCells = await this.testSubjects.findAll('editIndexPattern > indexedFieldName');
+    return await mapAsync(fieldNameCells, async (cell) => {
+      return (await cell.getVisibleText()).trim();
+    });
+  }
 
-    async getFieldTypes() {
-      const fieldNameCells = await testSubjects.findAll('editIndexPattern > indexedFieldType');
-      return await mapAsync(fieldNameCells, async (cell) => {
-        return (await cell.getVisibleText()).trim();
-      });
-    }
+  async getFieldTypes() {
+    const fieldNameCells = await this.testSubjects.findAll('editIndexPattern > indexedFieldType');
+    return await mapAsync(fieldNameCells, async (cell) => {
+      return (await cell.getVisibleText()).trim();
+    });
+  }
 
-    async getScriptedFieldLangs() {
-      const fieldNameCells = await testSubjects.findAll('editIndexPattern > scriptedFieldLang');
-      return await mapAsync(fieldNameCells, async (cell) => {
-        return (await cell.getVisibleText()).trim();
-      });
-    }
+  async getScriptedFieldLangs() {
+    const fieldNameCells = await this.testSubjects.findAll('editIndexPattern > scriptedFieldLang');
+    return await mapAsync(fieldNameCells, async (cell) => {
+      return (await cell.getVisibleText()).trim();
+    });
+  }
 
-    async setFieldTypeFilter(type: string) {
-      await find.clickByCssSelector(
-        'select[data-test-subj="indexedFieldTypeFilterDropdown"] > option[value="' + type + '"]'
-      );
-    }
+  async setFieldTypeFilter(type: string) {
+    await this.find.clickByCssSelector(
+      'select[data-test-subj="indexedFieldTypeFilterDropdown"] > option[value="' + type + '"]'
+    );
+  }
 
-    async setScriptedFieldLanguageFilter(language: string) {
-      await find.clickByCssSelector(
-        'select[data-test-subj="scriptedFieldLanguageFilterDropdown"] > option[value="' +
-          language +
-          '"]'
-      );
-    }
+  async setScriptedFieldLanguageFilter(language: string) {
+    await this.find.clickByCssSelector(
+      'select[data-test-subj="scriptedFieldLanguageFilterDropdown"] > option[value="' +
+        language +
+        '"]'
+    );
+  }
 
-    async filterField(name: string) {
-      const input = await testSubjects.find('indexPatternFieldFilter');
-      await input.clearValue();
-      await input.type(name);
-    }
+  async filterField(name: string) {
+    const input = await this.testSubjects.find('indexPatternFieldFilter');
+    await input.clearValue();
+    await input.type(name);
+  }
 
-    async openControlsByName(name: string) {
-      await this.filterField(name);
-      const tableFields = await (
-        await find.byCssSelector(
-          'table.euiTable tbody tr.euiTableRow td.euiTableRowCell:first-child'
-        )
-      ).getVisibleText();
-
-      await find.clickByCssSelector(
-        `table.euiTable tbody tr.euiTableRow:nth-child(${tableFields.indexOf(name) + 1})
-          td:nth-last-child(2) button`
-      );
-    }
+  async openControlsByName(name: string) {
+    await this.filterField(name);
+    const tableFields = await (
+      await this.find.byCssSelector(
+        'table.euiTable tbody tr.euiTableRow td.euiTableRowCell:first-child'
+      )
+    ).getVisibleText();
+
+    await this.find.clickByCssSelector(
+      `table.euiTable tbody tr.euiTableRow:nth-child(${tableFields.indexOf(name) + 1})
+        td:nth-last-child(2) button`
+    );
+  }
 
-    async increasePopularity() {
-      await testSubjects.setValue('editorFieldCount', '1', { clearWithKeyboard: true });
-    }
+  async increasePopularity() {
+    await this.testSubjects.setValue('editorFieldCount', '1', { clearWithKeyboard: true });
+  }
 
-    async getPopularity() {
-      return await testSubjects.getAttribute('editorFieldCount', 'value');
-    }
+  async getPopularity() {
+    return await this.testSubjects.getAttribute('editorFieldCount', 'value');
+  }
 
-    async controlChangeCancel() {
-      await testSubjects.click('fieldCancelButton');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async controlChangeCancel() {
+    await this.testSubjects.click('fieldCancelButton');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async controlChangeSave() {
-      await testSubjects.click('fieldSaveButton');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async controlChangeSave() {
+    await this.testSubjects.click('fieldSaveButton');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async hasIndexPattern(name: string) {
-      return await find.existsByLinkText(name);
-    }
+  async hasIndexPattern(name: string) {
+    return await this.find.existsByLinkText(name);
+  }
 
-    async clickIndexPatternByName(name: string) {
-      const indexLink = await find.byXPath(`//a[descendant::*[text()='${name}']]`);
-      await indexLink.click();
-    }
+  async clickIndexPatternByName(name: string) {
+    const indexLink = await this.find.byXPath(`//a[descendant::*[text()='${name}']]`);
+    await indexLink.click();
+  }
 
-    async clickIndexPatternLogstash() {
-      await this.clickIndexPatternByName('logstash-*');
-    }
+  async clickIndexPatternLogstash() {
+    await this.clickIndexPatternByName('logstash-*');
+  }
 
-    async getIndexPatternList() {
-      await testSubjects.existOrFail('indexPatternTable', { timeout: 5000 });
-      return await find.allByCssSelector(
-        '[data-test-subj="indexPatternTable"] .euiTable .euiTableRow'
-      );
-    }
+  async getIndexPatternList() {
+    await this.testSubjects.existOrFail('indexPatternTable', { timeout: 5000 });
+    return await this.find.allByCssSelector(
+      '[data-test-subj="indexPatternTable"] .euiTable .euiTableRow'
+    );
+  }
 
-    async getAllIndexPatternNames() {
-      const indexPatterns = await this.getIndexPatternList();
-      return await mapAsync(indexPatterns, async (index) => {
-        return await index.getVisibleText();
-      });
-    }
+  async getAllIndexPatternNames() {
+    const indexPatterns = await this.getIndexPatternList();
+    return await mapAsync(indexPatterns, async (index) => {
+      return await index.getVisibleText();
+    });
+  }
 
-    async isIndexPatternListEmpty() {
-      return !(await testSubjects.exists('indexPatternTable', { timeout: 5000 }));
-    }
+  async isIndexPatternListEmpty() {
+    return !(await this.testSubjects.exists('indexPatternTable', { timeout: 5000 }));
+  }
 
-    async removeLogstashIndexPatternIfExist() {
-      if (!(await this.isIndexPatternListEmpty())) {
-        await this.clickIndexPatternLogstash();
-        await this.removeIndexPattern();
-      }
+  async removeLogstashIndexPatternIfExist() {
+    if (!(await this.isIndexPatternListEmpty())) {
+      await this.clickIndexPatternLogstash();
+      await this.removeIndexPattern();
     }
+  }
 
-    async createIndexPattern(
-      indexPatternName: string,
-      // null to bypass default value
-      timefield: string | null = '@timestamp',
-      isStandardIndexPattern = true
-    ) {
-      await retry.try(async () => {
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        await this.clickKibanaIndexPatterns();
-        const exists = await this.hasIndexPattern(indexPatternName);
-
-        if (exists) {
-          await this.clickIndexPatternByName(indexPatternName);
-          return;
-        }
+  async createIndexPattern(
+    indexPatternName: string,
+    // null to bypass default value
+    timefield: string | null = '@timestamp',
+    isStandardIndexPattern = true
+  ) {
+    await this.retry.try(async () => {
+      await this.header.waitUntilLoadingHasFinished();
+      await this.clickKibanaIndexPatterns();
+      const exists = await this.hasIndexPattern(indexPatternName);
+
+      if (exists) {
+        await this.clickIndexPatternByName(indexPatternName);
+        return;
+      }
 
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        await this.clickAddNewIndexPatternButton();
-        if (!isStandardIndexPattern) {
-          await this.clickCreateNewRollupButton();
-        }
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        await retry.try(async () => {
-          await this.setIndexPatternField(indexPatternName);
-        });
-
-        const btn = await this.getCreateIndexPatternGoToStep2Button();
-        await retry.waitFor(`index pattern Go To Step 2 button to be enabled`, async () => {
-          return await btn.isEnabled();
-        });
-        await btn.click();
-
-        await PageObjects.common.sleep(2000);
-        if (timefield) {
-          await this.selectTimeFieldOption(timefield);
-        }
-        await (await this.getCreateIndexPatternButton()).click();
+      await this.header.waitUntilLoadingHasFinished();
+      await this.clickAddNewIndexPatternButton();
+      if (!isStandardIndexPattern) {
+        await this.clickCreateNewRollupButton();
+      }
+      await this.header.waitUntilLoadingHasFinished();
+      await this.retry.try(async () => {
+        await this.setIndexPatternField(indexPatternName);
       });
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await retry.try(async () => {
-        const currentUrl = await browser.getCurrentUrl();
-        log.info('currentUrl', currentUrl);
-        if (!currentUrl.match(/indexPatterns\/.+\?/)) {
-          throw new Error('Index pattern not created');
-        } else {
-          log.debug('Index pattern created: ' + currentUrl);
-        }
+
+      const btn = await this.getCreateIndexPatternGoToStep2Button();
+      await this.retry.waitFor(`index pattern Go To Step 2 button to be enabled`, async () => {
+        return await btn.isEnabled();
       });
+      await btn.click();
 
-      return await this.getIndexPatternIdFromUrl();
-    }
+      await this.common.sleep(2000);
+      if (timefield) {
+        await this.selectTimeFieldOption(timefield);
+      }
+      await (await this.getCreateIndexPatternButton()).click();
+    });
+    await this.header.waitUntilLoadingHasFinished();
+    await this.retry.try(async () => {
+      const currentUrl = await this.browser.getCurrentUrl();
+      this.log.info('currentUrl', currentUrl);
+      if (!currentUrl.match(/indexPatterns\/.+\?/)) {
+        throw new Error('Index pattern not created');
+      } else {
+        this.log.debug('Index pattern created: ' + currentUrl);
+      }
+    });
 
-    async clickAddNewIndexPatternButton() {
-      await PageObjects.common.scrollKibanaBodyTop();
-      await testSubjects.click('createIndexPatternButton');
-    }
+    return await this.getIndexPatternIdFromUrl();
+  }
 
-    async clickCreateNewRollupButton() {
-      await testSubjects.click('createRollupIndexPatternButton');
-    }
+  async clickAddNewIndexPatternButton() {
+    await this.common.scrollKibanaBodyTop();
+    await this.testSubjects.click('createIndexPatternButton');
+  }
 
-    async getIndexPatternIdFromUrl() {
-      const currentUrl = await browser.getCurrentUrl();
-      const indexPatternId = currentUrl.match(/.*\/(.*)/)![1];
+  async clickCreateNewRollupButton() {
+    await this.testSubjects.click('createRollupIndexPatternButton');
+  }
 
-      log.debug('index pattern ID: ', indexPatternId);
+  async getIndexPatternIdFromUrl() {
+    const currentUrl = await this.browser.getCurrentUrl();
+    const indexPatternId = currentUrl.match(/.*\/(.*)/)![1];
 
-      return indexPatternId;
-    }
+    this.log.debug('index pattern ID: ', indexPatternId);
 
-    async setIndexPatternField(indexPatternName = 'logstash-*') {
-      log.debug(`setIndexPatternField(${indexPatternName})`);
-      const field = await this.getIndexPatternField();
-      await field.clearValue();
-      if (
-        indexPatternName.charAt(0) === '*' &&
-        indexPatternName.charAt(indexPatternName.length - 1) === '*'
-      ) {
-        // this is a special case when the index pattern name starts with '*'
-        // like '*:makelogs-*' where the UI will not append *
-        await field.type(indexPatternName, { charByChar: true });
-      } else if (indexPatternName.charAt(indexPatternName.length - 1) === '*') {
-        // the common case where the UI will append '*' automatically so we won't type it
-        const tempName = indexPatternName.slice(0, -1);
-        await field.type(tempName, { charByChar: true });
-      } else {
-        // case where we don't want the * appended so we'll remove it if it was added
-        await field.type(indexPatternName, { charByChar: true });
-        const tempName = await field.getAttribute('value');
-        if (tempName.length > indexPatternName.length) {
-          await field.type(browser.keys.DELETE, { charByChar: true });
-        }
+    return indexPatternId;
+  }
+
+  async setIndexPatternField(indexPatternName = 'logstash-*') {
+    this.log.debug(`setIndexPatternField(${indexPatternName})`);
+    const field = await this.getIndexPatternField();
+    await field.clearValue();
+    if (
+      indexPatternName.charAt(0) === '*' &&
+      indexPatternName.charAt(indexPatternName.length - 1) === '*'
+    ) {
+      // this is a special case when the index pattern name starts with '*'
+      // like '*:makelogs-*' where the UI will not append *
+      await field.type(indexPatternName, { charByChar: true });
+    } else if (indexPatternName.charAt(indexPatternName.length - 1) === '*') {
+      // the common case where the UI will append '*' automatically so we won't type it
+      const tempName = indexPatternName.slice(0, -1);
+      await field.type(tempName, { charByChar: true });
+    } else {
+      // case where we don't want the * appended so we'll remove it if it was added
+      await field.type(indexPatternName, { charByChar: true });
+      const tempName = await field.getAttribute('value');
+      if (tempName.length > indexPatternName.length) {
+        await field.type(this.browser.keys.DELETE, { charByChar: true });
       }
-      const currentName = await field.getAttribute('value');
-      log.debug(`setIndexPatternField set to ${currentName}`);
-      expect(currentName).to.eql(indexPatternName);
     }
+    const currentName = await field.getAttribute('value');
+    this.log.debug(`setIndexPatternField set to ${currentName}`);
+    expect(currentName).to.eql(indexPatternName);
+  }
 
-    async getCreateIndexPatternGoToStep2Button() {
-      return await testSubjects.find('createIndexPatternGoToStep2Button');
-    }
+  async getCreateIndexPatternGoToStep2Button() {
+    return await this.testSubjects.find('createIndexPatternGoToStep2Button');
+  }
 
-    async removeIndexPattern() {
-      let alertText;
-      await retry.try(async () => {
-        log.debug('click delete index pattern button');
-        await this.clickDeletePattern();
-      });
-      await retry.try(async () => {
-        log.debug('getAlertText');
-        alertText = await testSubjects.getVisibleText('confirmModalTitleText');
-      });
-      await retry.try(async () => {
-        log.debug('acceptConfirmation');
-        await testSubjects.click('confirmModalConfirmButton');
-      });
-      await retry.try(async () => {
-        const currentUrl = await browser.getCurrentUrl();
-        if (currentUrl.match(/index_patterns\/.+\?/)) {
-          throw new Error('Index pattern not removed');
-        }
-      });
-      return alertText;
-    }
+  async removeIndexPattern() {
+    let alertText;
+    await this.retry.try(async () => {
+      this.log.debug('click delete index pattern button');
+      await this.clickDeletePattern();
+    });
+    await this.retry.try(async () => {
+      this.log.debug('getAlertText');
+      alertText = await this.testSubjects.getVisibleText('confirmModalTitleText');
+    });
+    await this.retry.try(async () => {
+      this.log.debug('acceptConfirmation');
+      await this.testSubjects.click('confirmModalConfirmButton');
+    });
+    await this.retry.try(async () => {
+      const currentUrl = await this.browser.getCurrentUrl();
+      if (currentUrl.match(/index_patterns\/.+\?/)) {
+        throw new Error('Index pattern not removed');
+      }
+    });
+    return alertText;
+  }
 
-    async clickFieldsTab() {
-      log.debug('click Fields tab');
-      await testSubjects.click('tab-indexedFields');
-    }
+  async clickFieldsTab() {
+    this.log.debug('click Fields tab');
+    await this.testSubjects.click('tab-indexedFields');
+  }
 
-    async clickScriptedFieldsTab() {
-      log.debug('click Scripted Fields tab');
-      await testSubjects.click('tab-scriptedFields');
-    }
+  async clickScriptedFieldsTab() {
+    this.log.debug('click Scripted Fields tab');
+    await this.testSubjects.click('tab-scriptedFields');
+  }
 
-    async clickSourceFiltersTab() {
-      log.debug('click Source Filters tab');
-      await testSubjects.click('tab-sourceFilters');
-    }
+  async clickSourceFiltersTab() {
+    this.log.debug('click Source Filters tab');
+    await this.testSubjects.click('tab-sourceFilters');
+  }
 
-    async editScriptedField(name: string) {
-      await this.filterField(name);
-      await find.clickByCssSelector('.euiTableRowCell--hasActions button:first-child');
-    }
+  async editScriptedField(name: string) {
+    await this.filterField(name);
+    await this.find.clickByCssSelector('.euiTableRowCell--hasActions button:first-child');
+  }
 
-    async addScriptedField(
-      name: string,
-      language: string,
-      type: string,
-      format: Record<string, any>,
-      popularity: string,
-      script: string
-    ) {
-      await this.clickAddScriptedField();
-      await this.setScriptedFieldName(name);
-      if (language) await this.setScriptedFieldLanguage(language);
-      if (type) await this.setScriptedFieldType(type);
-      if (format) {
-        await this.setFieldFormat(format.format);
-        // null means leave - default - which has no other settings
-        // Url adds Type, Url Template, and Label Template
-        // Date adds moment.js format pattern (Default: "MMMM Do YYYY, HH:mm:ss.SSS")
-        // String adds Transform
-        switch (format.format) {
-          case 'url':
-            await this.setScriptedFieldUrlType(format.type);
-            await this.setScriptedFieldUrlTemplate(format.template);
-            await this.setScriptedFieldUrlLabelTemplate(format.labelTemplate);
-            break;
-          case 'date':
-            await this.setScriptedFieldDatePattern(format.datePattern);
-            break;
-          case 'string':
-            await this.setScriptedFieldStringTransform(format.stringTransform);
-            break;
-        }
+  async addScriptedField(
+    name: string,
+    language: string,
+    type: string,
+    format: Record<string, any>,
+    popularity: string,
+    script: string
+  ) {
+    await this.clickAddScriptedField();
+    await this.setScriptedFieldName(name);
+    if (language) await this.setScriptedFieldLanguage(language);
+    if (type) await this.setScriptedFieldType(type);
+    if (format) {
+      await this.setFieldFormat(format.format);
+      // null means leave - default - which has no other settings
+      // Url adds Type, Url Template, and Label Template
+      // Date adds moment.js format pattern (Default: "MMMM Do YYYY, HH:mm:ss.SSS")
+      // String adds Transform
+      switch (format.format) {
+        case 'url':
+          await this.setScriptedFieldUrlType(format.type);
+          await this.setScriptedFieldUrlTemplate(format.template);
+          await this.setScriptedFieldUrlLabelTemplate(format.labelTemplate);
+          break;
+        case 'date':
+          await this.setScriptedFieldDatePattern(format.datePattern);
+          break;
+        case 'string':
+          await this.setScriptedFieldStringTransform(format.stringTransform);
+          break;
       }
-      if (popularity) await this.setScriptedFieldPopularity(popularity);
-      await this.setScriptedFieldScript(script);
-      await this.clickSaveScriptedField();
     }
+    if (popularity) await this.setScriptedFieldPopularity(popularity);
+    await this.setScriptedFieldScript(script);
+    await this.clickSaveScriptedField();
+  }
 
-    async addRuntimeField(name: string, type: string, script: string) {
-      await this.clickAddField();
-      await this.setFieldName(name);
-      await this.setFieldType(type);
-      if (script) {
-        await this.setFieldScript(script);
-      }
-      await this.clickSaveField();
-      await this.closeIndexPatternFieldEditor();
+  async addRuntimeField(name: string, type: string, script: string) {
+    await this.clickAddField();
+    await this.setFieldName(name);
+    await this.setFieldType(type);
+    if (script) {
+      await this.setFieldScript(script);
     }
+    await this.clickSaveField();
+    await this.closeIndexPatternFieldEditor();
+  }
 
-    public async confirmSave() {
-      await testSubjects.setValue('saveModalConfirmText', 'change');
-      await testSubjects.click('confirmModalConfirmButton');
-    }
+  public async confirmSave() {
+    await this.testSubjects.setValue('saveModalConfirmText', 'change');
+    await this.testSubjects.click('confirmModalConfirmButton');
+  }
 
-    public async confirmDelete() {
-      await testSubjects.setValue('deleteModalConfirmText', 'remove');
-      await testSubjects.click('confirmModalConfirmButton');
-    }
+  public async confirmDelete() {
+    await this.testSubjects.setValue('deleteModalConfirmText', 'remove');
+    await this.testSubjects.click('confirmModalConfirmButton');
+  }
 
-    async closeIndexPatternFieldEditor() {
-      await retry.waitFor('field editor flyout to close', async () => {
-        return !(await testSubjects.exists('euiFlyoutCloseButton'));
-      });
-    }
+  async closeIndexPatternFieldEditor() {
+    await this.retry.waitFor('field editor flyout to close', async () => {
+      return !(await this.testSubjects.exists('euiFlyoutCloseButton'));
+    });
+  }
 
-    async clickAddField() {
-      log.debug('click Add Field');
-      await testSubjects.click('addField');
-    }
+  async clickAddField() {
+    this.log.debug('click Add Field');
+    await this.testSubjects.click('addField');
+  }
 
-    async clickSaveField() {
-      log.debug('click Save');
-      await testSubjects.click('fieldSaveButton');
-    }
+  async clickSaveField() {
+    this.log.debug('click Save');
+    await this.testSubjects.click('fieldSaveButton');
+  }
 
-    async setFieldName(name: string) {
-      log.debug('set field name = ' + name);
-      await testSubjects.setValue('nameField', name);
-    }
+  async setFieldName(name: string) {
+    this.log.debug('set field name = ' + name);
+    await this.testSubjects.setValue('nameField', name);
+  }
 
-    async setFieldType(type: string) {
-      log.debug('set type = ' + type);
-      await testSubjects.setValue('typeField', type);
-    }
+  async setFieldType(type: string) {
+    this.log.debug('set type = ' + type);
+    await this.testSubjects.setValue('typeField', type);
+  }
 
-    async setFieldScript(script: string) {
-      log.debug('set script = ' + script);
-      const formatRow = await testSubjects.find('valueRow');
-      const formatRowToggle = (
-        await formatRow.findAllByCssSelector('[data-test-subj="toggle"]')
-      )[0];
-
-      await formatRowToggle.click();
-      const getMonacoTextArea = async () => (await formatRow.findAllByCssSelector('textarea'))[0];
-      retry.waitFor('monaco editor is ready', async () => !!(await getMonacoTextArea()));
-      const monacoTextArea = await getMonacoTextArea();
-      await monacoTextArea.focus();
-      browser.pressKeys(script);
-    }
+  async setFieldScript(script: string) {
+    this.log.debug('set script = ' + script);
+    const formatRow = await this.testSubjects.find('valueRow');
+    const formatRowToggle = (await formatRow.findAllByCssSelector('[data-test-subj="toggle"]'))[0];
+
+    await formatRowToggle.click();
+    const getMonacoTextArea = async () => (await formatRow.findAllByCssSelector('textarea'))[0];
+    this.retry.waitFor('monaco editor is ready', async () => !!(await getMonacoTextArea()));
+    const monacoTextArea = await getMonacoTextArea();
+    await monacoTextArea.focus();
+    this.browser.pressKeys(script);
+  }
 
-    async changeFieldScript(script: string) {
-      log.debug('set script = ' + script);
-      const formatRow = await testSubjects.find('valueRow');
-      const getMonacoTextArea = async () => (await formatRow.findAllByCssSelector('textarea'))[0];
-      retry.waitFor('monaco editor is ready', async () => !!(await getMonacoTextArea()));
-      const monacoTextArea = await getMonacoTextArea();
-      await monacoTextArea.focus();
-      browser.pressKeys(browser.keys.DELETE.repeat(30));
-      browser.pressKeys(script);
-    }
+  async changeFieldScript(script: string) {
+    this.log.debug('set script = ' + script);
+    const formatRow = await this.testSubjects.find('valueRow');
+    const getMonacoTextArea = async () => (await formatRow.findAllByCssSelector('textarea'))[0];
+    this.retry.waitFor('monaco editor is ready', async () => !!(await getMonacoTextArea()));
+    const monacoTextArea = await getMonacoTextArea();
+    await monacoTextArea.focus();
+    this.browser.pressKeys(this.browser.keys.DELETE.repeat(30));
+    this.browser.pressKeys(script);
+  }
 
-    async clickAddScriptedField() {
-      log.debug('click Add Scripted Field');
-      await testSubjects.click('addScriptedFieldLink');
-    }
+  async clickAddScriptedField() {
+    this.log.debug('click Add Scripted Field');
+    await this.testSubjects.click('addScriptedFieldLink');
+  }
 
-    async clickSaveScriptedField() {
-      log.debug('click Save Scripted Field');
-      await testSubjects.click('fieldSaveButton');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async clickSaveScriptedField() {
+    this.log.debug('click Save Scripted Field');
+    await this.testSubjects.click('fieldSaveButton');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async setScriptedFieldName(name: string) {
-      log.debug('set scripted field name = ' + name);
-      await testSubjects.setValue('editorFieldName', name);
-    }
+  async setScriptedFieldName(name: string) {
+    this.log.debug('set scripted field name = ' + name);
+    await this.testSubjects.setValue('editorFieldName', name);
+  }
 
-    async setScriptedFieldLanguage(language: string) {
-      log.debug('set scripted field language = ' + language);
-      await find.clickByCssSelector(
-        'select[data-test-subj="editorFieldLang"] > option[value="' + language + '"]'
-      );
-    }
+  async setScriptedFieldLanguage(language: string) {
+    this.log.debug('set scripted field language = ' + language);
+    await this.find.clickByCssSelector(
+      'select[data-test-subj="editorFieldLang"] > option[value="' + language + '"]'
+    );
+  }
 
-    async setScriptedFieldType(type: string) {
-      log.debug('set scripted field type = ' + type);
-      await find.clickByCssSelector(
-        'select[data-test-subj="editorFieldType"] > option[value="' + type + '"]'
-      );
-    }
+  async setScriptedFieldType(type: string) {
+    this.log.debug('set scripted field type = ' + type);
+    await this.find.clickByCssSelector(
+      'select[data-test-subj="editorFieldType"] > option[value="' + type + '"]'
+    );
+  }
 
-    async setFieldFormat(format: string) {
-      log.debug('set scripted field format = ' + format);
-      await find.clickByCssSelector(
-        'select[data-test-subj="editorSelectedFormatId"] > option[value="' + format + '"]'
-      );
-    }
+  async setFieldFormat(format: string) {
+    this.log.debug('set scripted field format = ' + format);
+    await this.find.clickByCssSelector(
+      'select[data-test-subj="editorSelectedFormatId"] > option[value="' + format + '"]'
+    );
+  }
 
-    async setScriptedFieldUrlType(type: string) {
-      log.debug('set scripted field Url type = ' + type);
-      await find.clickByCssSelector(
-        'select[data-test-subj="urlEditorType"] > option[value="' + type + '"]'
-      );
-    }
+  async setScriptedFieldUrlType(type: string) {
+    this.log.debug('set scripted field Url type = ' + type);
+    await this.find.clickByCssSelector(
+      'select[data-test-subj="urlEditorType"] > option[value="' + type + '"]'
+    );
+  }
 
-    async setScriptedFieldUrlTemplate(template: string) {
-      log.debug('set scripted field Url Template = ' + template);
-      const urlTemplateField = await find.byCssSelector(
-        'input[data-test-subj="urlEditorUrlTemplate"]'
-      );
-      await urlTemplateField.type(template);
-    }
+  async setScriptedFieldUrlTemplate(template: string) {
+    this.log.debug('set scripted field Url Template = ' + template);
+    const urlTemplateField = await this.find.byCssSelector(
+      'input[data-test-subj="urlEditorUrlTemplate"]'
+    );
+    await urlTemplateField.type(template);
+  }
 
-    async setScriptedFieldUrlLabelTemplate(labelTemplate: string) {
-      log.debug('set scripted field Url Label Template = ' + labelTemplate);
-      const urlEditorLabelTemplate = await find.byCssSelector(
-        'input[data-test-subj="urlEditorLabelTemplate"]'
-      );
-      await urlEditorLabelTemplate.type(labelTemplate);
-    }
+  async setScriptedFieldUrlLabelTemplate(labelTemplate: string) {
+    this.log.debug('set scripted field Url Label Template = ' + labelTemplate);
+    const urlEditorLabelTemplate = await this.find.byCssSelector(
+      'input[data-test-subj="urlEditorLabelTemplate"]'
+    );
+    await urlEditorLabelTemplate.type(labelTemplate);
+  }
 
-    async setScriptedFieldDatePattern(datePattern: string) {
-      log.debug('set scripted field Date Pattern = ' + datePattern);
-      const datePatternField = await find.byCssSelector(
-        'input[data-test-subj="dateEditorPattern"]'
-      );
-      // clearValue does not work here
-      // Send Backspace event for each char in value string to clear field
-      await datePatternField.clearValueWithKeyboard({ charByChar: true });
-      await datePatternField.type(datePattern);
-    }
+  async setScriptedFieldDatePattern(datePattern: string) {
+    this.log.debug('set scripted field Date Pattern = ' + datePattern);
+    const datePatternField = await this.find.byCssSelector(
+      'input[data-test-subj="dateEditorPattern"]'
+    );
+    // clearValue does not work here
+    // Send Backspace event for each char in value string to clear field
+    await datePatternField.clearValueWithKeyboard({ charByChar: true });
+    await datePatternField.type(datePattern);
+  }
 
-    async setScriptedFieldStringTransform(stringTransform: string) {
-      log.debug('set scripted field string Transform = ' + stringTransform);
-      await find.clickByCssSelector(
-        'select[data-test-subj="stringEditorTransform"] > option[value="' + stringTransform + '"]'
-      );
-    }
+  async setScriptedFieldStringTransform(stringTransform: string) {
+    this.log.debug('set scripted field string Transform = ' + stringTransform);
+    await this.find.clickByCssSelector(
+      'select[data-test-subj="stringEditorTransform"] > option[value="' + stringTransform + '"]'
+    );
+  }
 
-    async setScriptedFieldPopularity(popularity: string) {
-      log.debug('set scripted field popularity = ' + popularity);
-      await testSubjects.setValue('editorFieldCount', popularity);
-    }
+  async setScriptedFieldPopularity(popularity: string) {
+    this.log.debug('set scripted field popularity = ' + popularity);
+    await this.testSubjects.setValue('editorFieldCount', popularity);
+  }
 
-    async setScriptedFieldScript(script: string) {
-      log.debug('set scripted field script = ' + script);
-      const aceEditorCssSelector = '[data-test-subj="editorFieldScript"] .ace_editor';
-      const editor = await find.byCssSelector(aceEditorCssSelector);
-      await editor.click();
-      const existingText = await editor.getVisibleText();
-      for (let i = 0; i < existingText.length; i++) {
-        await browser.pressKeys(browser.keys.BACK_SPACE);
-      }
-      await browser.pressKeys(...script.split(''));
+  async setScriptedFieldScript(script: string) {
+    this.log.debug('set scripted field script = ' + script);
+    const aceEditorCssSelector = '[data-test-subj="editorFieldScript"] .ace_editor';
+    const editor = await this.find.byCssSelector(aceEditorCssSelector);
+    await editor.click();
+    const existingText = await editor.getVisibleText();
+    for (let i = 0; i < existingText.length; i++) {
+      await this.browser.pressKeys(this.browser.keys.BACK_SPACE);
     }
+    await this.browser.pressKeys(...script.split(''));
+  }
 
-    async openScriptedFieldHelp(activeTab: string) {
-      log.debug('open Scripted Fields help');
-      let isOpen = await testSubjects.exists('scriptedFieldsHelpFlyout');
-      if (!isOpen) {
-        await retry.try(async () => {
-          await testSubjects.click('scriptedFieldsHelpLink');
-          isOpen = await testSubjects.exists('scriptedFieldsHelpFlyout');
-          if (!isOpen) {
-            throw new Error('Failed to open scripted fields help');
-          }
-        });
-      }
-
-      if (activeTab) {
-        await testSubjects.click(activeTab);
-      }
+  async openScriptedFieldHelp(activeTab: string) {
+    this.log.debug('open Scripted Fields help');
+    let isOpen = await this.testSubjects.exists('scriptedFieldsHelpFlyout');
+    if (!isOpen) {
+      await this.retry.try(async () => {
+        await this.testSubjects.click('scriptedFieldsHelpLink');
+        isOpen = await this.testSubjects.exists('scriptedFieldsHelpFlyout');
+        if (!isOpen) {
+          throw new Error('Failed to open scripted fields help');
+        }
+      });
     }
 
-    async closeScriptedFieldHelp() {
-      await flyout.ensureClosed('scriptedFieldsHelpFlyout');
+    if (activeTab) {
+      await this.testSubjects.click(activeTab);
     }
+  }
 
-    async executeScriptedField(script: string, additionalField: string) {
-      log.debug('execute Scripted Fields help');
-      await this.closeScriptedFieldHelp(); // ensure script help is closed so script input is not blocked
-      await this.setScriptedFieldScript(script);
-      await this.openScriptedFieldHelp('testTab');
-      if (additionalField) {
-        await comboBox.set('additionalFieldsSelect', additionalField);
-        await testSubjects.find('scriptedFieldPreview');
-        await testSubjects.click('runScriptButton');
-        await testSubjects.waitForDeleted('.euiLoadingSpinner');
-      }
-      let scriptResults;
-      await retry.try(async () => {
-        scriptResults = await testSubjects.getVisibleText('scriptedFieldPreview');
-      });
-      return scriptResults;
-    }
+  async closeScriptedFieldHelp() {
+    await this.flyout.ensureClosed('scriptedFieldsHelpFlyout');
+  }
 
-    async clickEditFieldFormat() {
-      await testSubjects.click('editFieldFormat');
-    }
+  async executeScriptedField(script: string, additionalField: string) {
+    this.log.debug('execute Scripted Fields help');
+    await this.closeScriptedFieldHelp(); // ensure script help is closed so script input is not blocked
+    await this.setScriptedFieldScript(script);
+    await this.openScriptedFieldHelp('testTab');
+    if (additionalField) {
+      await this.comboBox.set('additionalFieldsSelect', additionalField);
+      await this.testSubjects.find('scriptedFieldPreview');
+      await this.testSubjects.click('runScriptButton');
+      await this.testSubjects.waitForDeleted('.euiLoadingSpinner');
+    }
+    let scriptResults;
+    await this.retry.try(async () => {
+      scriptResults = await this.testSubjects.getVisibleText('scriptedFieldPreview');
+    });
+    return scriptResults;
+  }
 
-    async associateIndexPattern(oldIndexPatternId: string, newIndexPatternTitle: string) {
-      await find.clickByCssSelector(
-        `select[data-test-subj="managementChangeIndexSelection-${oldIndexPatternId}"] >
-        [data-test-subj="indexPatternOption-${newIndexPatternTitle}"]`
-      );
-    }
+  async clickEditFieldFormat() {
+    await this.testSubjects.click('editFieldFormat');
+  }
 
-    async clickChangeIndexConfirmButton() {
-      await testSubjects.click('changeIndexConfirmButton');
-    }
+  async associateIndexPattern(oldIndexPatternId: string, newIndexPatternTitle: string) {
+    await this.find.clickByCssSelector(
+      `select[data-test-subj="managementChangeIndexSelection-${oldIndexPatternId}"] >
+      [data-test-subj="indexPatternOption-${newIndexPatternTitle}"]`
+    );
   }
 
-  return new SettingsPage();
+  async clickChangeIndexConfirmButton() {
+    await this.testSubjects.click('changeIndexConfirmButton');
+  }
 }
diff --git a/test/functional/page_objects/share_page.ts b/test/functional/page_objects/share_page.ts
index aa58341600599..ce1dc4c45e21f 100644
--- a/test/functional/page_objects/share_page.ts
+++ b/test/functional/page_objects/share_page.ts
@@ -6,76 +6,72 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function SharePageProvider({ getService }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const find = getService('find');
-  const log = getService('log');
+export class SharePageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly find = this.ctx.getService('find');
+  private readonly log = this.ctx.getService('log');
 
-  class SharePage {
-    async isShareMenuOpen() {
-      return await testSubjects.exists('shareContextMenu');
-    }
-
-    async clickShareTopNavButton() {
-      return testSubjects.click('shareTopNavButton');
-    }
+  async isShareMenuOpen() {
+    return await this.testSubjects.exists('shareContextMenu');
+  }
 
-    async openShareMenuItem(itemTitle: string) {
-      log.debug(`openShareMenuItem title:${itemTitle}`);
-      const isShareMenuOpen = await this.isShareMenuOpen();
-      if (!isShareMenuOpen) {
-        await this.clickShareTopNavButton();
-      } else {
-        // there is no easy way to ensure the menu is at the top level
-        // so just close the existing menu
-        await this.clickShareTopNavButton();
-        // and then re-open the menu
-        await this.clickShareTopNavButton();
-      }
-      const menuPanel = await find.byCssSelector('div.euiContextMenuPanel');
-      await testSubjects.click(`sharePanel-${itemTitle.replace(' ', '')}`);
-      await testSubjects.waitForDeleted(menuPanel);
-    }
+  async clickShareTopNavButton() {
+    return this.testSubjects.click('shareTopNavButton');
+  }
 
-    /**
-     * if there are more entries in the share menu, the permalinks entry has to be clicked first
-     * else the selection isn't displayed. this happens if you're testing against an instance
-     * with xpack features enabled, where there's also a csv sharing option
-     * in a pure OSS environment, the permalinks sharing panel is displayed initially
-     */
-    async openPermaLinks() {
-      if (await testSubjects.exists('sharePanel-Permalinks')) {
-        await testSubjects.click(`sharePanel-Permalinks`);
-      }
+  async openShareMenuItem(itemTitle: string) {
+    this.log.debug(`openShareMenuItem title:${itemTitle}`);
+    const isShareMenuOpen = await this.isShareMenuOpen();
+    if (!isShareMenuOpen) {
+      await this.clickShareTopNavButton();
+    } else {
+      // there is no easy way to ensure the menu is at the top level
+      // so just close the existing menu
+      await this.clickShareTopNavButton();
+      // and then re-open the menu
+      await this.clickShareTopNavButton();
     }
+    const menuPanel = await this.find.byCssSelector('div.euiContextMenuPanel');
+    await this.testSubjects.click(`sharePanel-${itemTitle.replace(' ', '')}`);
+    await this.testSubjects.waitForDeleted(menuPanel);
+  }
 
-    async getSharedUrl() {
-      await this.openPermaLinks();
-      return await testSubjects.getAttribute('copyShareUrlButton', 'data-share-url');
+  /**
+   * if there are more entries in the share menu, the permalinks entry has to be clicked first
+   * else the selection isn't displayed. this happens if you're testing against an instance
+   * with xpack features enabled, where there's also a csv sharing option
+   * in a pure OSS environment, the permalinks sharing panel is displayed initially
+   */
+  async openPermaLinks() {
+    if (await this.testSubjects.exists('sharePanel-Permalinks')) {
+      await this.testSubjects.click(`sharePanel-Permalinks`);
     }
+  }
 
-    async createShortUrlExistOrFail() {
-      await testSubjects.existOrFail('createShortUrl');
-    }
+  async getSharedUrl() {
+    await this.openPermaLinks();
+    return await this.testSubjects.getAttribute('copyShareUrlButton', 'data-share-url');
+  }
 
-    async createShortUrlMissingOrFail() {
-      await testSubjects.missingOrFail('createShortUrl');
-    }
+  async createShortUrlExistOrFail() {
+    await this.testSubjects.existOrFail('createShortUrl');
+  }
 
-    async checkShortenUrl() {
-      await this.openPermaLinks();
-      const shareForm = await testSubjects.find('shareUrlForm');
-      await testSubjects.setCheckbox('useShortUrl', 'check');
-      await shareForm.waitForDeletedByCssSelector('.euiLoadingSpinner');
-    }
+  async createShortUrlMissingOrFail() {
+    await this.testSubjects.missingOrFail('createShortUrl');
+  }
 
-    async exportAsSavedObject() {
-      await this.openPermaLinks();
-      return await testSubjects.click('exportAsSavedObject');
-    }
+  async checkShortenUrl() {
+    await this.openPermaLinks();
+    const shareForm = await this.testSubjects.find('shareUrlForm');
+    await this.testSubjects.setCheckbox('useShortUrl', 'check');
+    await shareForm.waitForDeletedByCssSelector('.euiLoadingSpinner');
   }
 
-  return new SharePage();
+  async exportAsSavedObject() {
+    await this.openPermaLinks();
+    return await this.testSubjects.click('exportAsSavedObject');
+  }
 }
diff --git a/test/functional/page_objects/tag_cloud_page.ts b/test/functional/page_objects/tag_cloud_page.ts
index fa977618e64d7..61e844c813df8 100644
--- a/test/functional/page_objects/tag_cloud_page.ts
+++ b/test/functional/page_objects/tag_cloud_page.ts
@@ -6,36 +6,33 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
-export function TagCloudPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const find = getService('find');
-  const testSubjects = getService('testSubjects');
-  const { header, visChart } = getPageObjects(['header', 'visChart']);
+export class TagCloudPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly visChart = this.ctx.getPageObject('visChart');
 
-  class TagCloudPage {
-    public async selectTagCloudTag(tagDisplayText: string) {
-      await testSubjects.click(tagDisplayText);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async selectTagCloudTag(tagDisplayText: string) {
+    await this.testSubjects.click(tagDisplayText);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async getTextTag() {
-      await visChart.waitForVisualization();
-      const elements = await find.allByCssSelector('text');
-      return await Promise.all(elements.map(async (element) => await element.getVisibleText()));
-    }
+  public async getTextTag() {
+    await this.visChart.waitForVisualization();
+    const elements = await this.find.allByCssSelector('text');
+    return await Promise.all(elements.map(async (element) => await element.getVisibleText()));
+  }
 
-    public async getTextSizes() {
-      const tags = await find.allByCssSelector('text');
-      async function returnTagSize(tag: WebElementWrapper) {
-        const style = await tag.getAttribute('style');
-        const fontSize = style.match(/font-size: ([^;]*);/);
-        return fontSize ? fontSize[1] : '';
-      }
-      return await Promise.all(tags.map(returnTagSize));
+  public async getTextSizes() {
+    const tags = await this.find.allByCssSelector('text');
+    async function returnTagSize(tag: WebElementWrapper) {
+      const style = await tag.getAttribute('style');
+      const fontSize = style.match(/font-size: ([^;]*);/);
+      return fontSize ? fontSize[1] : '';
     }
+    return await Promise.all(tags.map(returnTagSize));
   }
-
-  return new TagCloudPage();
 }
diff --git a/test/functional/page_objects/tile_map_page.ts b/test/functional/page_objects/tile_map_page.ts
index 6008d7434bf1d..079ca919543e2 100644
--- a/test/functional/page_objects/tile_map_page.ts
+++ b/test/functional/page_objects/tile_map_page.ts
@@ -6,92 +6,88 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function TileMapPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const find = getService('find');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const log = getService('log');
-  const inspector = getService('inspector');
-  const monacoEditor = getService('monacoEditor');
-  const { header } = getPageObjects(['header']);
-
-  class TileMapPage {
-    public async getZoomSelectors(zoomSelector: string) {
-      return await find.allByCssSelector(zoomSelector);
-    }
-
-    public async clickMapButton(zoomSelector: string, waitForLoading?: boolean) {
-      await retry.try(async () => {
-        const zooms = await this.getZoomSelectors(zoomSelector);
-        for (let i = 0; i < zooms.length; i++) {
-          await zooms[i].click();
-        }
-        if (waitForLoading) {
-          await header.waitUntilLoadingHasFinished();
-        }
-      });
-    }
+import { FtrService } from '../ftr_provider_context';
+
+export class TileMapPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly log = this.ctx.getService('log');
+  private readonly inspector = this.ctx.getService('inspector');
+  private readonly monacoEditor = this.ctx.getService('monacoEditor');
+  private readonly header = this.ctx.getPageObject('header');
+
+  public async getZoomSelectors(zoomSelector: string) {
+    return await this.find.allByCssSelector(zoomSelector);
+  }
 
-    public async getVisualizationRequest() {
-      log.debug('getVisualizationRequest');
-      await inspector.open();
-      await testSubjects.click('inspectorViewChooser');
-      await testSubjects.click('inspectorViewChooserRequests');
-      await testSubjects.click('inspectorRequestDetailRequest');
-      await find.byCssSelector('.react-monaco-editor-container');
+  public async clickMapButton(zoomSelector: string, waitForLoading?: boolean) {
+    await this.retry.try(async () => {
+      const zooms = await this.getZoomSelectors(zoomSelector);
+      for (let i = 0; i < zooms.length; i++) {
+        await zooms[i].click();
+      }
+      if (waitForLoading) {
+        await this.header.waitUntilLoadingHasFinished();
+      }
+    });
+  }
 
-      return await monacoEditor.getCodeEditorValue(1);
-    }
+  public async getVisualizationRequest() {
+    this.log.debug('getVisualizationRequest');
+    await this.inspector.open();
+    await this.testSubjects.click('inspectorViewChooser');
+    await this.testSubjects.click('inspectorViewChooserRequests');
+    await this.testSubjects.click('inspectorRequestDetailRequest');
+    await this.find.byCssSelector('.react-monaco-editor-container');
 
-    public async getMapBounds(): Promise<object> {
-      const request = await this.getVisualizationRequest();
-      const requestObject = JSON.parse(request);
+    return await this.monacoEditor.getCodeEditorValue(1);
+  }
 
-      return requestObject.aggs.filter_agg.filter.geo_bounding_box['geo.coordinates'];
-    }
+  public async getMapBounds(): Promise<object> {
+    const request = await this.getVisualizationRequest();
+    const requestObject = JSON.parse(request);
 
-    public async clickMapZoomIn(waitForLoading = true) {
-      await this.clickMapButton('a.leaflet-control-zoom-in', waitForLoading);
-    }
+    return requestObject.aggs.filter_agg.filter.geo_bounding_box['geo.coordinates'];
+  }
 
-    public async clickMapZoomOut(waitForLoading = true) {
-      await this.clickMapButton('a.leaflet-control-zoom-out', waitForLoading);
-    }
+  public async clickMapZoomIn(waitForLoading = true) {
+    await this.clickMapButton('a.leaflet-control-zoom-in', waitForLoading);
+  }
 
-    public async getMapZoomEnabled(zoomSelector: string): Promise<boolean> {
-      const zooms = await this.getZoomSelectors(zoomSelector);
-      const classAttributes = await Promise.all(
-        zooms.map(async (zoom) => await zoom.getAttribute('class'))
-      );
-      return !classAttributes.join('').includes('leaflet-disabled');
-    }
+  public async clickMapZoomOut(waitForLoading = true) {
+    await this.clickMapButton('a.leaflet-control-zoom-out', waitForLoading);
+  }
 
-    public async zoomAllTheWayOut(): Promise<void> {
-      // we can tell we're at level 1 because zoom out is disabled
-      return await retry.try(async () => {
-        await this.clickMapZoomOut();
-        const enabled = await this.getMapZoomOutEnabled();
-        // should be able to zoom more as current config has 0 as min level.
-        if (enabled) {
-          throw new Error('Not fully zoomed out yet');
-        }
-      });
-    }
+  public async getMapZoomEnabled(zoomSelector: string): Promise<boolean> {
+    const zooms = await this.getZoomSelectors(zoomSelector);
+    const classAttributes = await Promise.all(
+      zooms.map(async (zoom) => await zoom.getAttribute('class'))
+    );
+    return !classAttributes.join('').includes('leaflet-disabled');
+  }
 
-    public async getMapZoomInEnabled() {
-      return await this.getMapZoomEnabled('a.leaflet-control-zoom-in');
-    }
+  public async zoomAllTheWayOut(): Promise<void> {
+    // we can tell we're at level 1 because zoom out is disabled
+    return await this.retry.try(async () => {
+      await this.clickMapZoomOut();
+      const enabled = await this.getMapZoomOutEnabled();
+      // should be able to zoom more as current config has 0 as min level.
+      if (enabled) {
+        throw new Error('Not fully zoomed out yet');
+      }
+    });
+  }
 
-    public async getMapZoomOutEnabled() {
-      return await this.getMapZoomEnabled('a.leaflet-control-zoom-out');
-    }
+  public async getMapZoomInEnabled() {
+    return await this.getMapZoomEnabled('a.leaflet-control-zoom-in');
+  }
 
-    public async clickMapFitDataBounds() {
-      return await this.clickMapButton('a.fa-crop');
-    }
+  public async getMapZoomOutEnabled() {
+    return await this.getMapZoomEnabled('a.leaflet-control-zoom-out');
   }
 
-  return new TileMapPage();
+  public async clickMapFitDataBounds() {
+    return await this.clickMapButton('a.fa-crop');
+  }
 }
diff --git a/test/functional/page_objects/time_picker.ts b/test/functional/page_objects/time_picker.ts
index 4d0930c3ff932..e8f6afc365f5d 100644
--- a/test/functional/page_objects/time_picker.ts
+++ b/test/functional/page_objects/time_picker.ts
@@ -7,7 +7,7 @@
  */
 
 import moment from 'moment';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
 export type CommonlyUsed =
@@ -22,275 +22,270 @@ export type CommonlyUsed =
   | 'Last_90 days'
   | 'Last_1 year';
 
-export function TimePickerProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const log = getService('log');
-  const find = getService('find');
-  const browser = getService('browser');
-  const retry = getService('retry');
-  const testSubjects = getService('testSubjects');
-  const { header } = getPageObjects(['header']);
-  const kibanaServer = getService('kibanaServer');
-  const menuToggle = getService('menuToggle');
-
-  const quickSelectTimeMenuToggle = menuToggle.create({
+export class TimePickerPageObject extends FtrService {
+  private readonly log = this.ctx.getService('log');
+  private readonly find = this.ctx.getService('find');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly kibanaServer = this.ctx.getService('kibanaServer');
+
+  private readonly quickSelectTimeMenuToggle = this.ctx.getService('menuToggle').create({
     name: 'QuickSelectTime Menu',
     menuTestSubject: 'superDatePickerQuickMenu',
     toggleButtonTestSubject: 'superDatePickerToggleQuickMenuButton',
   });
 
-  class TimePicker {
-    defaultStartTime = 'Sep 19, 2015 @ 06:31:44.000';
-    defaultEndTime = 'Sep 23, 2015 @ 18:31:44.000';
-    defaultStartTimeUTC = '2015-09-18T06:31:44.000Z';
-    defaultEndTimeUTC = '2015-09-23T18:31:44.000Z';
-
-    async setDefaultAbsoluteRange() {
-      await this.setAbsoluteRange(this.defaultStartTime, this.defaultEndTime);
-    }
+  public readonly defaultStartTime = 'Sep 19, 2015 @ 06:31:44.000';
+  public readonly defaultEndTime = 'Sep 23, 2015 @ 18:31:44.000';
+  public readonly defaultStartTimeUTC = '2015-09-18T06:31:44.000Z';
+  public readonly defaultEndTimeUTC = '2015-09-23T18:31:44.000Z';
 
-    async ensureHiddenNoDataPopover() {
-      const isVisible = await testSubjects.exists('noDataPopoverDismissButton');
-      if (isVisible) {
-        await testSubjects.click('noDataPopoverDismissButton');
-      }
-    }
+  async setDefaultAbsoluteRange() {
+    await this.setAbsoluteRange(this.defaultStartTime, this.defaultEndTime);
+  }
 
-    /**
-     * the provides a quicker way to set the timepicker to the default range, saves a few seconds
-     */
-    async setDefaultAbsoluteRangeViaUiSettings() {
-      await kibanaServer.uiSettings.update({
-        'timepicker:timeDefaults': `{ "from": "${this.defaultStartTimeUTC}", "to": "${this.defaultEndTimeUTC}"}`,
-      });
+  async ensureHiddenNoDataPopover() {
+    const isVisible = await this.testSubjects.exists('noDataPopoverDismissButton');
+    if (isVisible) {
+      await this.testSubjects.click('noDataPopoverDismissButton');
     }
+  }
 
-    async resetDefaultAbsoluteRangeViaUiSettings() {
-      await kibanaServer.uiSettings.replace({});
-    }
+  /**
+   * the provides a quicker way to set the timepicker to the default range, saves a few seconds
+   */
+  async setDefaultAbsoluteRangeViaUiSettings() {
+    await this.kibanaServer.uiSettings.update({
+      'timepicker:timeDefaults': `{ "from": "${this.defaultStartTimeUTC}", "to": "${this.defaultEndTimeUTC}"}`,
+    });
+  }
 
-    private async getTimePickerPanel() {
-      return await retry.try(async () => {
-        return await find.byCssSelector('div.euiPopover__panel-isOpen');
-      });
-    }
+  async resetDefaultAbsoluteRangeViaUiSettings() {
+    await this.kibanaServer.uiSettings.replace({});
+  }
 
-    private async waitPanelIsGone(panelElement: WebElementWrapper) {
-      await find.waitForElementStale(panelElement);
-    }
+  private async getTimePickerPanel() {
+    return await this.retry.try(async () => {
+      return await this.find.byCssSelector('div.euiPopover__panel-isOpen');
+    });
+  }
 
-    public async timePickerExists() {
-      return await testSubjects.exists('superDatePickerToggleQuickMenuButton');
-    }
+  private async waitPanelIsGone(panelElement: WebElementWrapper) {
+    await this.find.waitForElementStale(panelElement);
+  }
 
-    /**
-     * Sets commonly used time
-     * @param option 'Today' | 'This_week' | 'Last_15 minutes' | 'Last_24 hours' ...
-     */
-    async setCommonlyUsedTime(option: CommonlyUsed | string) {
-      await testSubjects.click('superDatePickerToggleQuickMenuButton');
-      await testSubjects.click(`superDatePickerCommonlyUsed_${option}`);
-    }
+  public async timePickerExists() {
+    return await this.testSubjects.exists('superDatePickerToggleQuickMenuButton');
+  }
 
-    public async inputValue(dataTestSubj: string, value: string) {
-      if (browser.isFirefox) {
-        const input = await testSubjects.find(dataTestSubj);
-        await input.clearValue();
-        await input.type(value);
-      } else {
-        await testSubjects.setValue(dataTestSubj, value);
-      }
-    }
+  /**
+   * Sets commonly used time
+   * @param option 'Today' | 'This_week' | 'Last_15 minutes' | 'Last_24 hours' ...
+   */
+  async setCommonlyUsedTime(option: CommonlyUsed | string) {
+    await this.testSubjects.click('superDatePickerToggleQuickMenuButton');
+    await this.testSubjects.click(`superDatePickerCommonlyUsed_${option}`);
+  }
 
-    private async showStartEndTimes() {
-      // This first await makes sure the superDatePicker has loaded before we check for the ShowDatesButton
-      await testSubjects.exists('superDatePickerToggleQuickMenuButton', { timeout: 20000 });
-      const isShowDatesButton = await testSubjects.exists('superDatePickerShowDatesButton');
-      if (isShowDatesButton) {
-        await testSubjects.click('superDatePickerShowDatesButton');
-      }
-      await testSubjects.exists('superDatePickerstartDatePopoverButton');
+  public async inputValue(dataTestSubj: string, value: string) {
+    if (this.browser.isFirefox) {
+      const input = await this.testSubjects.find(dataTestSubj);
+      await input.clearValue();
+      await input.type(value);
+    } else {
+      await this.testSubjects.setValue(dataTestSubj, value);
     }
+  }
 
-    /**
-     * @param {String} fromTime MMM D, YYYY @ HH:mm:ss.SSS
-     * @param {String} toTime MMM D, YYYY @ HH:mm:ss.SSS
-     */
-    public async setAbsoluteRange(fromTime: string, toTime: string) {
-      log.debug(`Setting absolute range to ${fromTime} to ${toTime}`);
-      await this.showStartEndTimes();
-
-      // set to time
-      await testSubjects.click('superDatePickerendDatePopoverButton');
-      let panel = await this.getTimePickerPanel();
-      await testSubjects.click('superDatePickerAbsoluteTab');
-      await testSubjects.click('superDatePickerAbsoluteDateInput');
-      await this.inputValue('superDatePickerAbsoluteDateInput', toTime);
-      await browser.pressKeys(browser.keys.ESCAPE); // close popover because sometimes browser can't find start input
-
-      // set from time
-      await testSubjects.click('superDatePickerstartDatePopoverButton');
-      await this.waitPanelIsGone(panel);
-      panel = await this.getTimePickerPanel();
-      await testSubjects.click('superDatePickerAbsoluteTab');
-      await testSubjects.click('superDatePickerAbsoluteDateInput');
-      await this.inputValue('superDatePickerAbsoluteDateInput', fromTime);
-
-      const superDatePickerApplyButtonExists = await testSubjects.exists(
-        'superDatePickerApplyTimeButton'
-      );
-      if (superDatePickerApplyButtonExists) {
-        // Timepicker is in top nav
-        // Click super date picker apply button to apply time range
-        await testSubjects.click('superDatePickerApplyTimeButton');
-      } else {
-        // Timepicker is embedded in query bar
-        // click query bar submit button to apply time range
-        await testSubjects.click('querySubmitButton');
-      }
-
-      await this.waitPanelIsGone(panel);
-      await header.awaitGlobalLoadingIndicatorHidden();
+  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');
+  }
 
-    public async isOff() {
-      return await find.existsByCssSelector('.euiDatePickerRange--readOnly');
+  /**
+   * @param {String} fromTime MMM D, YYYY @ HH:mm:ss.SSS
+   * @param {String} toTime MMM D, YYYY @ HH:mm:ss.SSS
+   */
+  public async setAbsoluteRange(fromTime: string, toTime: string) {
+    this.log.debug(`Setting absolute range to ${fromTime} to ${toTime}`);
+    await this.showStartEndTimes();
+
+    // set to time
+    await this.testSubjects.click('superDatePickerendDatePopoverButton');
+    let panel = await this.getTimePickerPanel();
+    await this.testSubjects.click('superDatePickerAbsoluteTab');
+    await this.testSubjects.click('superDatePickerAbsoluteDateInput');
+    await this.inputValue('superDatePickerAbsoluteDateInput', toTime);
+    await this.browser.pressKeys(this.browser.keys.ESCAPE); // close popover because sometimes browser can't find start input
+
+    // set from time
+    await this.testSubjects.click('superDatePickerstartDatePopoverButton');
+    await this.waitPanelIsGone(panel);
+    panel = await this.getTimePickerPanel();
+    await this.testSubjects.click('superDatePickerAbsoluteTab');
+    await this.testSubjects.click('superDatePickerAbsoluteDateInput');
+    await this.inputValue('superDatePickerAbsoluteDateInput', fromTime);
+
+    const superDatePickerApplyButtonExists = await this.testSubjects.exists(
+      'superDatePickerApplyTimeButton'
+    );
+    if (superDatePickerApplyButtonExists) {
+      // Timepicker is in top nav
+      // Click super date picker apply button to apply time range
+      await this.testSubjects.click('superDatePickerApplyTimeButton');
+    } else {
+      // Timepicker is embedded in query bar
+      // click query bar submit button to apply time range
+      await this.testSubjects.click('querySubmitButton');
     }
 
-    public async getRefreshConfig(keepQuickSelectOpen = false) {
-      await quickSelectTimeMenuToggle.open();
-      const interval = await testSubjects.getAttribute(
-        'superDatePickerRefreshIntervalInput',
-        'value'
-      );
-
-      let selectedUnit;
-      const select = await testSubjects.find('superDatePickerRefreshIntervalUnitsSelect');
-      const options = await find.allDescendantDisplayedByCssSelector('option', select);
-      await Promise.all(
-        options.map(async (optionElement) => {
-          const isSelected = await optionElement.isSelected();
-          if (isSelected) {
-            selectedUnit = await optionElement.getVisibleText();
-          }
-        })
-      );
-
-      const toggleButtonText = await testSubjects.getVisibleText(
-        'superDatePickerToggleRefreshButton'
-      );
-      if (!keepQuickSelectOpen) {
-        await quickSelectTimeMenuToggle.close();
-      }
-
-      return {
-        interval,
-        units: selectedUnit,
-        isPaused: toggleButtonText === 'Start' ? true : false,
-      };
-    }
+    await this.waitPanelIsGone(panel);
+    await this.header.awaitGlobalLoadingIndicatorHidden();
+  }
 
-    public async getTimeConfig() {
-      await this.showStartEndTimes();
-      const start = await testSubjects.getVisibleText('superDatePickerstartDatePopoverButton');
-      const end = await testSubjects.getVisibleText('superDatePickerendDatePopoverButton');
-      return {
-        start,
-        end,
-      };
-    }
+  public async isOff() {
+    return await this.find.existsByCssSelector('.euiDatePickerRange--readOnly');
+  }
 
-    public async getShowDatesButtonText() {
-      const button = await testSubjects.find('superDatePickerShowDatesButton');
-      const text = await button.getVisibleText();
-      return text;
+  public async getRefreshConfig(keepQuickSelectOpen = false) {
+    await this.quickSelectTimeMenuToggle.open();
+    const interval = await this.testSubjects.getAttribute(
+      'superDatePickerRefreshIntervalInput',
+      'value'
+    );
+
+    let selectedUnit;
+    const select = await this.testSubjects.find('superDatePickerRefreshIntervalUnitsSelect');
+    const options = await this.find.allDescendantDisplayedByCssSelector('option', select);
+    await Promise.all(
+      options.map(async (optionElement) => {
+        const isSelected = await optionElement.isSelected();
+        if (isSelected) {
+          selectedUnit = await optionElement.getVisibleText();
+        }
+      })
+    );
+
+    const toggleButtonText = await this.testSubjects.getVisibleText(
+      'superDatePickerToggleRefreshButton'
+    );
+    if (!keepQuickSelectOpen) {
+      await this.quickSelectTimeMenuToggle.close();
     }
 
-    public async getTimeDurationForSharing() {
-      return await testSubjects.getAttribute(
-        'dataSharedTimefilterDuration',
-        'data-shared-timefilter-duration'
-      );
-    }
+    return {
+      interval,
+      units: selectedUnit,
+      isPaused: toggleButtonText === 'Start' ? true : false,
+    };
+  }
 
-    public async getTimeConfigAsAbsoluteTimes() {
-      await this.showStartEndTimes();
-
-      // get to time
-      await testSubjects.click('superDatePickerendDatePopoverButton');
-      const panel = await this.getTimePickerPanel();
-      await testSubjects.click('superDatePickerAbsoluteTab');
-      const end = await testSubjects.getAttribute('superDatePickerAbsoluteDateInput', 'value');
-
-      // get from time
-      await testSubjects.click('superDatePickerstartDatePopoverButton');
-      await this.waitPanelIsGone(panel);
-      await testSubjects.click('superDatePickerAbsoluteTab');
-      const start = await testSubjects.getAttribute('superDatePickerAbsoluteDateInput', 'value');
-
-      return {
-        start,
-        end,
-      };
-    }
+  public async getTimeConfig() {
+    await this.showStartEndTimes();
+    const start = await this.testSubjects.getVisibleText('superDatePickerstartDatePopoverButton');
+    const end = await this.testSubjects.getVisibleText('superDatePickerendDatePopoverButton');
+    return {
+      start,
+      end,
+    };
+  }
 
-    public async getTimeDurationInHours() {
-      const DEFAULT_DATE_FORMAT = 'MMM D, YYYY @ HH:mm:ss.SSS';
-      const { start, end } = await this.getTimeConfigAsAbsoluteTimes();
-      const startMoment = moment(start, DEFAULT_DATE_FORMAT);
-      const endMoment = moment(end, DEFAULT_DATE_FORMAT);
-      return moment.duration(endMoment.diff(startMoment)).asHours();
-    }
+  public async getShowDatesButtonText() {
+    const button = await this.testSubjects.find('superDatePickerShowDatesButton');
+    const text = await button.getVisibleText();
+    return text;
+  }
 
-    public async startAutoRefresh(intervalS = 3) {
-      await quickSelectTimeMenuToggle.open();
-      await this.inputValue('superDatePickerRefreshIntervalInput', intervalS.toString());
-      const refreshConfig = await this.getRefreshConfig(true);
-      if (refreshConfig.isPaused) {
-        log.debug('start auto refresh');
-        await testSubjects.click('superDatePickerToggleRefreshButton');
-      }
-      await quickSelectTimeMenuToggle.close();
-    }
+  public async getTimeDurationForSharing() {
+    return await this.testSubjects.getAttribute(
+      'dataSharedTimefilterDuration',
+      'data-shared-timefilter-duration'
+    );
+  }
 
-    public async pauseAutoRefresh() {
-      log.debug('pauseAutoRefresh');
-      const refreshConfig = await this.getRefreshConfig(true);
+  public async getTimeConfigAsAbsoluteTimes() {
+    await this.showStartEndTimes();
+
+    // get to time
+    await this.testSubjects.click('superDatePickerendDatePopoverButton');
+    const panel = await this.getTimePickerPanel();
+    await this.testSubjects.click('superDatePickerAbsoluteTab');
+    const end = await this.testSubjects.getAttribute('superDatePickerAbsoluteDateInput', 'value');
+
+    // get from time
+    await this.testSubjects.click('superDatePickerstartDatePopoverButton');
+    await this.waitPanelIsGone(panel);
+    await this.testSubjects.click('superDatePickerAbsoluteTab');
+    const start = await this.testSubjects.getAttribute('superDatePickerAbsoluteDateInput', 'value');
+
+    return {
+      start,
+      end,
+    };
+  }
 
-      if (!refreshConfig.isPaused) {
-        log.debug('pause auto refresh');
-        await testSubjects.click('superDatePickerToggleRefreshButton');
-      }
+  public async getTimeDurationInHours() {
+    const DEFAULT_DATE_FORMAT = 'MMM D, YYYY @ HH:mm:ss.SSS';
+    const { start, end } = await this.getTimeConfigAsAbsoluteTimes();
+    const startMoment = moment(start, DEFAULT_DATE_FORMAT);
+    const endMoment = moment(end, DEFAULT_DATE_FORMAT);
+    return moment.duration(endMoment.diff(startMoment)).asHours();
+  }
 
-      await quickSelectTimeMenuToggle.close();
+  public async startAutoRefresh(intervalS = 3) {
+    await this.quickSelectTimeMenuToggle.open();
+    await this.inputValue('superDatePickerRefreshIntervalInput', intervalS.toString());
+    const refreshConfig = await this.getRefreshConfig(true);
+    if (refreshConfig.isPaused) {
+      this.log.debug('start auto refresh');
+      await this.testSubjects.click('superDatePickerToggleRefreshButton');
     }
+    await this.quickSelectTimeMenuToggle.close();
+  }
 
-    public async resumeAutoRefresh() {
-      log.debug('resumeAutoRefresh');
-      const refreshConfig = await this.getRefreshConfig(true);
-      if (refreshConfig.isPaused) {
-        log.debug('resume auto refresh');
-        await testSubjects.click('superDatePickerToggleRefreshButton');
-      }
+  public async pauseAutoRefresh() {
+    this.log.debug('pauseAutoRefresh');
+    const refreshConfig = await this.getRefreshConfig(true);
 
-      await quickSelectTimeMenuToggle.close();
+    if (!refreshConfig.isPaused) {
+      this.log.debug('pause auto refresh');
+      await this.testSubjects.click('superDatePickerToggleRefreshButton');
     }
 
-    public async setHistoricalDataRange() {
-      await this.setDefaultAbsoluteRange();
-    }
+    await this.quickSelectTimeMenuToggle.close();
+  }
 
-    public async setDefaultDataRange() {
-      const fromTime = 'Jan 1, 2018 @ 00:00:00.000';
-      const toTime = 'Apr 13, 2018 @ 00:00:00.000';
-      await this.setAbsoluteRange(fromTime, toTime);
+  public async resumeAutoRefresh() {
+    this.log.debug('resumeAutoRefresh');
+    const refreshConfig = await this.getRefreshConfig(true);
+    if (refreshConfig.isPaused) {
+      this.log.debug('resume auto refresh');
+      await this.testSubjects.click('superDatePickerToggleRefreshButton');
     }
 
-    public async setLogstashDataRange() {
-      const fromTime = 'Apr 9, 2018 @ 00:00:00.000';
-      const toTime = 'Apr 13, 2018 @ 00:00:00.000';
-      await this.setAbsoluteRange(fromTime, toTime);
-    }
+    await this.quickSelectTimeMenuToggle.close();
   }
 
-  return new TimePicker();
+  public async setHistoricalDataRange() {
+    await this.setDefaultAbsoluteRange();
+  }
+
+  public async setDefaultDataRange() {
+    const fromTime = 'Jan 1, 2018 @ 00:00:00.000';
+    const toTime = 'Apr 13, 2018 @ 00:00:00.000';
+    await this.setAbsoluteRange(fromTime, toTime);
+  }
+
+  public async setLogstashDataRange() {
+    const fromTime = 'Apr 9, 2018 @ 00:00:00.000';
+    const toTime = 'Apr 13, 2018 @ 00:00:00.000';
+    await this.setAbsoluteRange(fromTime, toTime);
+  }
 }
diff --git a/test/functional/page_objects/time_to_visualize_page.ts b/test/functional/page_objects/time_to_visualize_page.ts
index 458b4dd3e60a1..287b03ec60d88 100644
--- a/test/functional/page_objects/time_to_visualize_page.ts
+++ b/test/functional/page_objects/time_to_visualize_page.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 interface SaveModalArgs {
   addToDashboard?: 'new' | 'existing' | null;
@@ -21,117 +21,108 @@ type DashboardPickerOption =
   | 'existing-dashboard-option'
   | 'new-dashboard-option';
 
-export function TimeToVisualizePageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const log = getService('log');
-  const find = getService('find');
-  const { common, dashboard } = getPageObjects(['common', 'dashboard']);
+export class TimeToVisualizePageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly log = this.ctx.getService('log');
+  private readonly find = this.ctx.getService('find');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly dashboard = this.ctx.getPageObject('dashboard');
 
-  class TimeToVisualizePage {
-    public async ensureSaveModalIsOpen() {
-      await testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
-    }
+  public async ensureSaveModalIsOpen() {
+    await this.testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
+  }
 
-    public async ensureDashboardOptionsAreDisabled() {
-      const dashboardSelector = await testSubjects.find('add-to-dashboard-options');
-      await dashboardSelector.findByCssSelector(`input[id="new-dashboard-option"]:disabled`);
-      await dashboardSelector.findByCssSelector(`input[id="existing-dashboard-option"]:disabled`);
+  public async ensureDashboardOptionsAreDisabled() {
+    const dashboardSelector = await this.testSubjects.find('add-to-dashboard-options');
+    await dashboardSelector.findByCssSelector(`input[id="new-dashboard-option"]:disabled`);
+    await dashboardSelector.findByCssSelector(`input[id="existing-dashboard-option"]:disabled`);
 
-      const librarySelector = await testSubjects.find('add-to-library-checkbox');
-      await librarySelector.findByCssSelector(`input[id="add-to-library-checkbox"]:disabled`);
-    }
-
-    public async resetNewDashboard() {
-      await common.navigateToApp('dashboard');
-      await dashboard.gotoDashboardLandingPage(true);
-      await dashboard.clickNewDashboard(false);
-    }
+    const librarySelector = await this.testSubjects.find('add-to-library-checkbox');
+    await librarySelector.findByCssSelector(`input[id="add-to-library-checkbox"]:disabled`);
+  }
 
-    public async setSaveModalValues(
-      vizName: string,
-      {
-        saveAsNew,
-        redirectToOrigin,
-        addToDashboard,
-        dashboardId,
-        saveToLibrary,
-      }: SaveModalArgs = {}
-    ) {
-      await testSubjects.setValue('savedObjectTitle', vizName);
-
-      const hasSaveAsNew = await testSubjects.exists('saveAsNewCheckbox');
-      if (hasSaveAsNew && saveAsNew !== undefined) {
-        const state = saveAsNew ? 'check' : 'uncheck';
-        log.debug('save as new checkbox exists. Setting its state to', state);
-        await testSubjects.setEuiSwitch('saveAsNewCheckbox', state);
-      }
+  public async resetNewDashboard() {
+    await this.common.navigateToApp('dashboard');
+    await this.dashboard.gotoDashboardLandingPage(true);
+    await this.dashboard.clickNewDashboard(false);
+  }
 
-      const hasDashboardSelector = await testSubjects.exists('add-to-dashboard-options');
-      if (hasDashboardSelector && addToDashboard !== undefined) {
-        let option: DashboardPickerOption = 'add-to-library-option';
-        if (addToDashboard) {
-          option = dashboardId ? 'existing-dashboard-option' : 'new-dashboard-option';
-        }
-        log.debug('save modal dashboard selector, choosing option:', option);
-        const dashboardSelector = await testSubjects.find('add-to-dashboard-options');
-        const label = await dashboardSelector.findByCssSelector(`label[for="${option}"]`);
-        await label.click();
+  public async setSaveModalValues(
+    vizName: string,
+    { saveAsNew, redirectToOrigin, addToDashboard, dashboardId, saveToLibrary }: SaveModalArgs = {}
+  ) {
+    await this.testSubjects.setValue('savedObjectTitle', vizName);
+
+    const hasSaveAsNew = await this.testSubjects.exists('saveAsNewCheckbox');
+    if (hasSaveAsNew && saveAsNew !== undefined) {
+      const state = saveAsNew ? 'check' : 'uncheck';
+      this.log.debug('save as new checkbox exists. Setting its state to', state);
+      await this.testSubjects.setEuiSwitch('saveAsNewCheckbox', state);
+    }
 
-        if (dashboardId) {
-          await testSubjects.setValue('dashboardPickerInput', dashboardId);
-          await find.clickByButtonText(dashboardId);
-        }
+    const hasDashboardSelector = await this.testSubjects.exists('add-to-dashboard-options');
+    if (hasDashboardSelector && addToDashboard !== undefined) {
+      let option: DashboardPickerOption = 'add-to-library-option';
+      if (addToDashboard) {
+        option = dashboardId ? 'existing-dashboard-option' : 'new-dashboard-option';
       }
-
-      const hasSaveToLibrary = await testSubjects.exists('add-to-library-checkbox');
-      if (hasSaveToLibrary && saveToLibrary !== undefined) {
-        const libraryCheckbox = await find.byCssSelector('#add-to-library-checkbox');
-        const isChecked = await libraryCheckbox.isSelected();
-        const needsClick = isChecked !== saveToLibrary;
-        const state = saveToLibrary ? 'check' : 'uncheck';
-
-        log.debug('save to library checkbox exists. Setting its state to', state);
-        if (needsClick) {
-          const selector = await testSubjects.find('add-to-library-checkbox');
-          const label = await selector.findByCssSelector(`label[for="add-to-library-checkbox"]`);
-          await label.click();
-        }
+      this.log.debug('save modal dashboard selector, choosing option:', option);
+      const dashboardSelector = await this.testSubjects.find('add-to-dashboard-options');
+      const label = await dashboardSelector.findByCssSelector(`label[for="${option}"]`);
+      await label.click();
+
+      if (dashboardId) {
+        await this.testSubjects.setValue('dashboardPickerInput', dashboardId);
+        await this.find.clickByButtonText(dashboardId);
       }
+    }
 
-      const hasRedirectToOrigin = await testSubjects.exists('returnToOriginModeSwitch');
-      if (hasRedirectToOrigin && redirectToOrigin !== undefined) {
-        const state = redirectToOrigin ? 'check' : 'uncheck';
-        log.debug('redirect to origin checkbox exists. Setting its state to', state);
-        await testSubjects.setEuiSwitch('returnToOriginModeSwitch', state);
+    const hasSaveToLibrary = await this.testSubjects.exists('add-to-library-checkbox');
+    if (hasSaveToLibrary && saveToLibrary !== undefined) {
+      const libraryCheckbox = await this.find.byCssSelector('#add-to-library-checkbox');
+      const isChecked = await libraryCheckbox.isSelected();
+      const needsClick = isChecked !== saveToLibrary;
+      const state = saveToLibrary ? 'check' : 'uncheck';
+
+      this.log.debug('save to library checkbox exists. Setting its state to', state);
+      if (needsClick) {
+        const selector = await this.testSubjects.find('add-to-library-checkbox');
+        const label = await selector.findByCssSelector(`label[for="add-to-library-checkbox"]`);
+        await label.click();
       }
     }
 
-    public async libraryNotificationExists(panelTitle: string) {
-      log.debug('searching for library modal on panel:', panelTitle);
-      const panel = await testSubjects.find(
-        `embeddablePanelHeading-${panelTitle.replace(/ /g, '')}`
-      );
-      const libraryActionExists = await testSubjects.descendantExists(
-        'embeddablePanelNotification-ACTION_LIBRARY_NOTIFICATION',
-        panel
-      );
-      return libraryActionExists;
+    const hasRedirectToOrigin = await this.testSubjects.exists('returnToOriginModeSwitch');
+    if (hasRedirectToOrigin && redirectToOrigin !== undefined) {
+      const state = redirectToOrigin ? 'check' : 'uncheck';
+      this.log.debug('redirect to origin checkbox exists. Setting its state to', state);
+      await this.testSubjects.setEuiSwitch('returnToOriginModeSwitch', state);
     }
+  }
 
-    public async saveFromModal(
-      vizName: string,
-      saveModalArgs: SaveModalArgs = { addToDashboard: null }
-    ) {
-      await this.ensureSaveModalIsOpen();
+  public async libraryNotificationExists(panelTitle: string) {
+    this.log.debug('searching for library modal on panel:', panelTitle);
+    const panel = await this.testSubjects.find(
+      `embeddablePanelHeading-${panelTitle.replace(/ /g, '')}`
+    );
+    const libraryActionExists = await this.testSubjects.descendantExists(
+      'embeddablePanelNotification-ACTION_LIBRARY_NOTIFICATION',
+      panel
+    );
+    return libraryActionExists;
+  }
 
-      await this.setSaveModalValues(vizName, saveModalArgs);
-      log.debug('Click Save Visualization button');
+  public async saveFromModal(
+    vizName: string,
+    saveModalArgs: SaveModalArgs = { addToDashboard: null }
+  ) {
+    await this.ensureSaveModalIsOpen();
 
-      await testSubjects.click('confirmSaveSavedObjectButton');
+    await this.setSaveModalValues(vizName, saveModalArgs);
+    this.log.debug('Click Save Visualization button');
 
-      await common.waitForSaveModalToClose();
-    }
-  }
+    await this.testSubjects.click('confirmSaveSavedObjectButton');
 
-  return new TimeToVisualizePage();
+    await this.common.waitForSaveModalToClose();
+  }
 }
diff --git a/test/functional/page_objects/timelion_page.ts b/test/functional/page_objects/timelion_page.ts
index 7f4c4eb125c8e..65584d98022be 100644
--- a/test/functional/page_objects/timelion_page.ts
+++ b/test/functional/page_objects/timelion_page.ts
@@ -6,79 +6,75 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function TimelionPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const log = getService('log');
-  const PageObjects = getPageObjects(['common', 'header']);
-  const esArchiver = getService('esArchiver');
-  const kibanaServer = getService('kibanaServer');
+export class TimelionPageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly log = this.ctx.getService('log');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly esArchiver = this.ctx.getService('esArchiver');
+  private readonly kibanaServer = this.ctx.getService('kibanaServer');
 
-  class TimelionPage {
-    public async initTests() {
-      await kibanaServer.uiSettings.replace({
-        defaultIndex: 'logstash-*',
-      });
+  public async initTests() {
+    await this.kibanaServer.uiSettings.replace({
+      defaultIndex: 'logstash-*',
+    });
 
-      log.debug('load kibana index');
-      await esArchiver.load('timelion');
+    this.log.debug('load kibana index');
+    await this.esArchiver.load('test/functional/fixtures/es_archiver/timelion');
 
-      await PageObjects.common.navigateToApp('timelion');
-    }
-
-    public async setExpression(expression: string) {
-      const input = await testSubjects.find('timelionExpressionTextArea');
-      await input.clearValue();
-      await input.type(expression);
-    }
+    await this.common.navigateToApp('timelion');
+  }
 
-    public async updateExpression(updates: string) {
-      const input = await testSubjects.find('timelionExpressionTextArea');
-      await input.type(updates);
-      await PageObjects.common.sleep(1000);
-    }
+  public async setExpression(expression: string) {
+    const input = await this.testSubjects.find('timelionExpressionTextArea');
+    await input.clearValue();
+    await input.type(expression);
+  }
 
-    public async getExpression() {
-      const input = await testSubjects.find('timelionExpressionTextArea');
-      return input.getVisibleText();
-    }
+  public async updateExpression(updates: string) {
+    const input = await this.testSubjects.find('timelionExpressionTextArea');
+    await input.type(updates);
+    await this.common.sleep(1000);
+  }
 
-    public async getSuggestionItemsText() {
-      const elements = await testSubjects.findAll('timelionSuggestionListItem');
-      return await Promise.all(elements.map(async (element) => await element.getVisibleText()));
-    }
+  public async getExpression() {
+    const input = await this.testSubjects.find('timelionExpressionTextArea');
+    return input.getVisibleText();
+  }
 
-    public async clickSuggestion(suggestionIndex = 0, waitTime = 1000) {
-      const elements = await testSubjects.findAll('timelionSuggestionListItem');
-      if (suggestionIndex > elements.length) {
-        throw new Error(
-          `Unable to select suggestion ${suggestionIndex}, only ${elements.length} suggestions available.`
-        );
-      }
-      await elements[suggestionIndex].click();
-      // Wait for timelion expression to be updated after clicking suggestions
-      await PageObjects.common.sleep(waitTime);
-    }
+  public async getSuggestionItemsText() {
+    const elements = await this.testSubjects.findAll('timelionSuggestionListItem');
+    return await Promise.all(elements.map(async (element) => await element.getVisibleText()));
+  }
 
-    public async saveTimelionSheet() {
-      await testSubjects.click('timelionSaveButton');
-      await testSubjects.click('timelionSaveAsSheetButton');
-      await testSubjects.click('timelionFinishSaveButton');
-      await testSubjects.existOrFail('timelionSaveSuccessToast');
-      await testSubjects.waitForDeleted('timelionSaveSuccessToast');
+  public async clickSuggestion(suggestionIndex = 0, waitTime = 1000) {
+    const elements = await this.testSubjects.findAll('timelionSuggestionListItem');
+    if (suggestionIndex > elements.length) {
+      throw new Error(
+        `Unable to select suggestion ${suggestionIndex}, only ${elements.length} suggestions available.`
+      );
     }
+    await elements[suggestionIndex].click();
+    // Wait for timelion expression to be updated after clicking suggestions
+    await this.common.sleep(waitTime);
+  }
 
-    public async expectWriteControls() {
-      await testSubjects.existOrFail('timelionSaveButton');
-      await testSubjects.existOrFail('timelionDeleteButton');
-    }
+  public async saveTimelionSheet() {
+    await this.testSubjects.click('timelionSaveButton');
+    await this.testSubjects.click('timelionSaveAsSheetButton');
+    await this.testSubjects.click('timelionFinishSaveButton');
+    await this.testSubjects.existOrFail('timelionSaveSuccessToast');
+    await this.testSubjects.waitForDeleted('timelionSaveSuccessToast');
+  }
 
-    public async expectMissingWriteControls() {
-      await testSubjects.missingOrFail('timelionSaveButton');
-      await testSubjects.missingOrFail('timelionDeleteButton');
-    }
+  public async expectWriteControls() {
+    await this.testSubjects.existOrFail('timelionSaveButton');
+    await this.testSubjects.existOrFail('timelionDeleteButton');
   }
 
-  return new TimelionPage();
+  public async expectMissingWriteControls() {
+    await this.testSubjects.missingOrFail('timelionSaveButton');
+    await this.testSubjects.missingOrFail('timelionDeleteButton');
+  }
 }
diff --git a/test/functional/page_objects/vega_chart_page.ts b/test/functional/page_objects/vega_chart_page.ts
index 3e165b3434f8a..f83c5e193034e 100644
--- a/test/functional/page_objects/vega_chart_page.ts
+++ b/test/functional/page_objects/vega_chart_page.ts
@@ -7,110 +7,103 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 const compareSpecs = (first: string, second: string) => {
   const normalizeSpec = (spec: string) => spec.replace(/[\n ]/g, '');
   return normalizeSpec(first) === normalizeSpec(second);
 };
 
-export function VegaChartPageProvider({
-  getService,
-  getPageObjects,
-}: FtrProviderContext & { updateBaselines: boolean }) {
-  const find = getService('find');
-  const testSubjects = getService('testSubjects');
-  const browser = getService('browser');
-  const retry = getService('retry');
-
-  class VegaChartPage {
-    public getEditor() {
-      return testSubjects.find('vega-editor');
-    }
+export class VegaChartPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly retry = this.ctx.getService('retry');
 
-    public getViewContainer() {
-      return find.byCssSelector('div.vgaVis__view');
-    }
+  public getEditor() {
+    return this.testSubjects.find('vega-editor');
+  }
 
-    public getControlContainer() {
-      return find.byCssSelector('div.vgaVis__controls');
-    }
+  public getViewContainer() {
+    return this.find.byCssSelector('div.vgaVis__view');
+  }
 
-    public getYAxisContainer() {
-      return find.byCssSelector('[aria-label^="Y-axis"]');
-    }
+  public getControlContainer() {
+    return this.find.byCssSelector('div.vgaVis__controls');
+  }
 
-    public async getAceGutterContainer() {
-      const editor = await this.getEditor();
-      return editor.findByClassName('ace_gutter');
-    }
+  public getYAxisContainer() {
+    return this.find.byCssSelector('[aria-label^="Y-axis"]');
+  }
 
-    public async getRawSpec() {
-      // Adapted from console_page.js:getVisibleTextFromAceEditor(). Is there a common utilities file?
-      const editor = await this.getEditor();
-      const lines = await editor.findAllByClassName('ace_line_group');
+  public async getAceGutterContainer() {
+    const editor = await this.getEditor();
+    return editor.findByClassName('ace_gutter');
+  }
 
-      return await Promise.all(
-        lines.map(async (line) => {
-          return await line.getVisibleText();
-        })
-      );
-    }
+  public async getRawSpec() {
+    // Adapted from console_page.js:getVisibleTextFromAceEditor(). Is there a common utilities file?
+    const editor = await this.getEditor();
+    const lines = await editor.findAllByClassName('ace_line_group');
 
-    public async getSpec() {
-      return (await this.getRawSpec()).join('\n');
-    }
+    return await Promise.all(
+      lines.map(async (line) => {
+        return await line.getVisibleText();
+      })
+    );
+  }
 
-    public async focusEditor() {
-      const editor = await this.getEditor();
-      const textarea = await editor.findByClassName('ace_content');
+  public async getSpec() {
+    return (await this.getRawSpec()).join('\n');
+  }
 
-      await textarea.click();
-    }
+  public async focusEditor() {
+    const editor = await this.getEditor();
+    const textarea = await editor.findByClassName('ace_content');
 
-    public async fillSpec(newSpec: string) {
-      await retry.try(async () => {
-        await this.cleanSpec();
-        await this.focusEditor();
-        await browser.pressKeys(newSpec);
+    await textarea.click();
+  }
 
-        expect(compareSpecs(await this.getSpec(), newSpec)).to.be(true);
-      });
-    }
+  public async fillSpec(newSpec: string) {
+    await this.retry.try(async () => {
+      await this.cleanSpec();
+      await this.focusEditor();
+      await this.browser.pressKeys(newSpec);
 
-    public async typeInSpec(text: string) {
-      const aceGutter = await this.getAceGutterContainer();
+      expect(compareSpecs(await this.getSpec(), newSpec)).to.be(true);
+    });
+  }
 
-      await aceGutter.doubleClick();
-      await browser.pressKeys(browser.keys.RIGHT);
-      await browser.pressKeys(browser.keys.LEFT);
-      await browser.pressKeys(browser.keys.LEFT);
-      await browser.pressKeys(text);
-    }
+  public async typeInSpec(text: string) {
+    const aceGutter = await this.getAceGutterContainer();
 
-    public async cleanSpec() {
-      const aceGutter = await this.getAceGutterContainer();
+    await aceGutter.doubleClick();
+    await this.browser.pressKeys(this.browser.keys.RIGHT);
+    await this.browser.pressKeys(this.browser.keys.LEFT);
+    await this.browser.pressKeys(this.browser.keys.LEFT);
+    await this.browser.pressKeys(text);
+  }
 
-      await retry.try(async () => {
-        await aceGutter.doubleClick();
-        await browser.pressKeys(browser.keys.BACK_SPACE);
+  public async cleanSpec() {
+    const aceGutter = await this.getAceGutterContainer();
 
-        expect(await this.getSpec()).to.be('');
-      });
-    }
+    await this.retry.try(async () => {
+      await aceGutter.doubleClick();
+      await this.browser.pressKeys(this.browser.keys.BACK_SPACE);
 
-    public async getYAxisLabels() {
-      const yAxis = await this.getYAxisContainer();
-      const tickGroup = await yAxis.findByClassName('role-axis-label');
-      const labels = await tickGroup.findAllByCssSelector('text');
-      const labelTexts: string[] = [];
+      expect(await this.getSpec()).to.be('');
+    });
+  }
+
+  public async getYAxisLabels() {
+    const yAxis = await this.getYAxisContainer();
+    const tickGroup = await yAxis.findByClassName('role-axis-label');
+    const labels = await tickGroup.findAllByCssSelector('text');
+    const labelTexts: string[] = [];
 
-      for (const label of labels) {
-        labelTexts.push(await label.getVisibleText());
-      }
-      return labelTexts;
+    for (const label of labels) {
+      labelTexts.push(await label.getVisibleText());
     }
+    return labelTexts;
   }
-
-  return new VegaChartPage();
 }
diff --git a/test/functional/page_objects/visual_builder_page.ts b/test/functional/page_objects/visual_builder_page.ts
index 997a1127005ee..d796067372fa8 100644
--- a/test/functional/page_objects/visual_builder_page.ts
+++ b/test/functional/page_objects/visual_builder_page.ts
@@ -6,654 +6,651 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 import { WebElementWrapper } from '../services/lib/web_element_wrapper';
 
-export function VisualBuilderPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const find = getService('find');
-  const log = getService('log');
-  const retry = getService('retry');
-  const testSubjects = getService('testSubjects');
-  const comboBox = getService('comboBox');
-  const PageObjects = getPageObjects(['common', 'header', 'visualize', 'timePicker', 'visChart']);
-
-  type Duration =
-    | 'Milliseconds'
-    | 'Seconds'
-    | 'Minutes'
-    | 'Hours'
-    | 'Days'
-    | 'Weeks'
-    | 'Months'
-    | 'Years';
-
-  type FromDuration = Duration | 'Picoseconds' | 'Nanoseconds' | 'Microseconds';
-  type ToDuration = Duration | 'Human readable';
-
-  class VisualBuilderPage {
-    public async resetPage(
-      fromTime = 'Sep 19, 2015 @ 06:31:44.000',
-      toTime = 'Sep 22, 2015 @ 18:31:44.000'
-    ) {
-      await PageObjects.common.navigateToUrl('visualize', 'create?type=metrics', {
-        useActualUrl: true,
-      });
-      log.debug('Wait for initializing TSVB editor');
-      await this.checkVisualBuilderIsPresent();
-      log.debug('Set absolute time range from "' + fromTime + '" to "' + toTime + '"');
-      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-      // 2 sec sleep until https://github.com/elastic/kibana/issues/46353 is fixed
-      await PageObjects.common.sleep(2000);
-    }
+type Duration =
+  | 'Milliseconds'
+  | 'Seconds'
+  | 'Minutes'
+  | 'Hours'
+  | 'Days'
+  | 'Weeks'
+  | 'Months'
+  | 'Years';
+
+type FromDuration = Duration | 'Picoseconds' | 'Nanoseconds' | 'Microseconds';
+type ToDuration = Duration | 'Human readable';
+
+export class VisualBuilderPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly comboBox = this.ctx.getService('comboBox');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly timePicker = this.ctx.getPageObject('timePicker');
+  private readonly visChart = this.ctx.getPageObject('visChart');
+
+  public async resetPage(
+    fromTime = 'Sep 19, 2015 @ 06:31:44.000',
+    toTime = 'Sep 22, 2015 @ 18:31:44.000'
+  ) {
+    await this.common.navigateToUrl('visualize', 'create?type=metrics', {
+      useActualUrl: true,
+    });
+    this.log.debug('Wait for initializing TSVB editor');
+    await this.checkVisualBuilderIsPresent();
+    this.log.debug('Set absolute time range from "' + fromTime + '" to "' + toTime + '"');
+    await this.timePicker.setAbsoluteRange(fromTime, toTime);
+    // 2 sec sleep until https://github.com/elastic/kibana/issues/46353 is fixed
+    await this.common.sleep(2000);
+  }
 
-    public async checkTabIsLoaded(testSubj: string, name: string) {
-      let isPresent = false;
-      await retry.try(async () => {
-        isPresent = await testSubjects.exists(testSubj, { timeout: 20000 });
-        if (!isPresent) {
-          isPresent = await testSubjects.exists('visNoResult', { timeout: 1000 });
-        }
-      });
+  public async checkTabIsLoaded(testSubj: string, name: string) {
+    let isPresent = false;
+    await this.retry.try(async () => {
+      isPresent = await this.testSubjects.exists(testSubj, { timeout: 20000 });
       if (!isPresent) {
-        throw new Error(`TSVB ${name} tab is not loaded`);
+        isPresent = await this.testSubjects.exists('visNoResult', { timeout: 1000 });
       }
+    });
+    if (!isPresent) {
+      throw new Error(`TSVB ${name} tab is not loaded`);
     }
+  }
 
-    public async checkTabIsSelected(chartType: string) {
-      const chartTypeBtn = await testSubjects.find(`${chartType}TsvbTypeBtn`);
-      const isSelected = await chartTypeBtn.getAttribute('aria-selected');
+  public async checkTabIsSelected(chartType: string) {
+    const chartTypeBtn = await this.testSubjects.find(`${chartType}TsvbTypeBtn`);
+    const isSelected = await chartTypeBtn.getAttribute('aria-selected');
 
-      if (isSelected !== 'true') {
-        throw new Error(`TSVB ${chartType} tab is not selected`);
-      }
+    if (isSelected !== 'true') {
+      throw new Error(`TSVB ${chartType} tab is not selected`);
     }
+  }
 
-    public async checkPanelConfigIsPresent(chartType: string) {
-      await testSubjects.existOrFail(`tvbPanelConfig__${chartType}`);
-    }
+  public async checkPanelConfigIsPresent(chartType: string) {
+    await this.testSubjects.existOrFail(`tvbPanelConfig__${chartType}`);
+  }
 
-    public async checkVisualBuilderIsPresent() {
-      await this.checkTabIsLoaded('tvbVisEditor', 'Time Series');
-    }
+  public async checkVisualBuilderIsPresent() {
+    await this.checkTabIsLoaded('tvbVisEditor', 'Time Series');
+  }
 
-    public async checkTimeSeriesChartIsPresent() {
-      const isPresent = await find.existsByCssSelector('.tvbVisTimeSeries');
-      if (!isPresent) {
-        throw new Error(`TimeSeries chart is not loaded`);
-      }
+  public async checkTimeSeriesChartIsPresent() {
+    const isPresent = await this.find.existsByCssSelector('.tvbVisTimeSeries');
+    if (!isPresent) {
+      throw new Error(`TimeSeries chart is not loaded`);
     }
+  }
 
-    public async checkTimeSeriesIsLight() {
-      return await find.existsByCssSelector('.tvbVisTimeSeriesLight');
-    }
+  public async checkTimeSeriesIsLight() {
+    return await this.find.existsByCssSelector('.tvbVisTimeSeriesLight');
+  }
 
-    public async checkTimeSeriesLegendIsPresent() {
-      const isPresent = await find.existsByCssSelector('.echLegend');
-      if (!isPresent) {
-        throw new Error(`TimeSeries legend is not loaded`);
-      }
+  public async checkTimeSeriesLegendIsPresent() {
+    const isPresent = await this.find.existsByCssSelector('.echLegend');
+    if (!isPresent) {
+      throw new Error(`TimeSeries legend is not loaded`);
     }
+  }
 
-    public async checkMetricTabIsPresent() {
-      await this.checkTabIsLoaded('tsvbMetricValue', 'Metric');
-    }
+  public async checkMetricTabIsPresent() {
+    await this.checkTabIsLoaded('tsvbMetricValue', 'Metric');
+  }
 
-    public async checkGaugeTabIsPresent() {
-      await this.checkTabIsLoaded('tvbVisGaugeContainer', 'Gauge');
-    }
+  public async checkGaugeTabIsPresent() {
+    await this.checkTabIsLoaded('tvbVisGaugeContainer', 'Gauge');
+  }
 
-    public async checkTopNTabIsPresent() {
-      await this.checkTabIsLoaded('tvbVisTopNTable', 'TopN');
-    }
+  public async checkTopNTabIsPresent() {
+    await this.checkTabIsLoaded('tvbVisTopNTable', 'TopN');
+  }
 
-    public async clickMetric() {
-      const button = await testSubjects.find('metricTsvbTypeBtn');
-      await button.click();
-    }
+  public async clickMetric() {
+    const button = await this.testSubjects.find('metricTsvbTypeBtn');
+    await button.click();
+  }
 
-    public async clickMarkdown() {
-      const button = await testSubjects.find('markdownTsvbTypeBtn');
-      await button.click();
-    }
+  public async clickMarkdown() {
+    const button = await this.testSubjects.find('markdownTsvbTypeBtn');
+    await button.click();
+  }
 
-    public async getMetricValue() {
-      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-      const metricValue = await find.byCssSelector('.tvbVisMetric__value--primary');
-      return metricValue.getVisibleText();
-    }
+  public async getMetricValue() {
+    await this.visChart.waitForVisualizationRenderingStabilized();
+    const metricValue = await this.find.byCssSelector('.tvbVisMetric__value--primary');
+    return metricValue.getVisibleText();
+  }
 
-    public async enterMarkdown(markdown: string) {
-      await this.clearMarkdown();
-      const input = await find.byCssSelector('.tvbMarkdownEditor__editor textarea');
-      await input.type(markdown);
-      await PageObjects.common.sleep(3000);
-    }
+  public async enterMarkdown(markdown: string) {
+    await this.clearMarkdown();
+    const input = await this.find.byCssSelector('.tvbMarkdownEditor__editor textarea');
+    await input.type(markdown);
+    await this.common.sleep(3000);
+  }
 
-    public async clearMarkdown() {
-      // Since we use ACE editor and that isn't really storing its value inside
-      // a textarea we must really select all text and remove it, and cannot use
-      // clearValue().
-      await retry.waitForWithTimeout('text area is cleared', 20000, async () => {
-        const editor = await testSubjects.find('codeEditorContainer');
-        const $ = await editor.parseDomContent();
-        const value = $('.ace_line').text();
-        if (value.length > 0) {
-          log.debug('Clearing text area input');
-          this.waitForMarkdownTextAreaCleaned();
-        }
-
-        return value.length === 0;
-      });
-    }
+  public async clearMarkdown() {
+    // Since we use ACE editor and that isn't really storing its value inside
+    // a textarea we must really select all text and remove it, and cannot use
+    // clearValue().
+    await this.retry.waitForWithTimeout('text area is cleared', 20000, async () => {
+      const editor = await this.testSubjects.find('codeEditorContainer');
+      const $ = await editor.parseDomContent();
+      const value = $('.ace_line').text();
+      if (value.length > 0) {
+        this.log.debug('Clearing text area input');
+        this.waitForMarkdownTextAreaCleaned();
+      }
 
-    public async waitForMarkdownTextAreaCleaned() {
-      const input = await find.byCssSelector('.tvbMarkdownEditor__editor textarea');
-      await input.clearValueWithKeyboard();
-      const text = await this.getMarkdownText();
-      return text.length === 0;
-    }
+      return value.length === 0;
+    });
+  }
 
-    public async getMarkdownText(): Promise<string> {
-      const el = await find.byCssSelector('.tvbVis');
-      const text = await el.getVisibleText();
-      return text;
-    }
+  public async waitForMarkdownTextAreaCleaned() {
+    const input = await this.find.byCssSelector('.tvbMarkdownEditor__editor textarea');
+    await input.clearValueWithKeyboard();
+    const text = await this.getMarkdownText();
+    return text.length === 0;
+  }
 
-    /**
-     *
-     * getting all markdown variables list which located on `table` section
-     *
-     * **Note**: if `table` not have variables, use `getMarkdownTableNoVariables` method instead
-     * @see {getMarkdownTableNoVariables}
-     * @returns {Promise<Array<{key:string, value:string, selector:any}>>}
-     * @memberof VisualBuilderPage
-     */
-    public async getMarkdownTableVariables(): Promise<
-      Array<{ key: string; value: string; selector: WebElementWrapper }>
-    > {
-      const testTableVariables = await testSubjects.find('tsvbMarkdownVariablesTable');
-      const variablesSelector = 'tbody tr';
-      const exists = await find.existsByCssSelector(variablesSelector);
-      if (!exists) {
-        log.debug('variable list is empty');
-        return [];
-      }
-      const variables = await testTableVariables.findAllByCssSelector(variablesSelector);
-
-      const variablesKeyValueSelectorMap = await Promise.all(
-        variables.map(async (variable) => {
-          const subVars = await variable.findAllByCssSelector('td');
-          const selector = await subVars[0].findByTagName('a');
-          const key = await selector.getVisibleText();
-          const value = await subVars[1].getVisibleText();
-          log.debug(`markdown table variables table is: ${key} ${value}`);
-          return { key, value, selector };
-        })
-      );
-      return variablesKeyValueSelectorMap;
-    }
+  public async getMarkdownText(): Promise<string> {
+    const el = await this.find.byCssSelector('.tvbVis');
+    const text = await el.getVisibleText();
+    return text;
+  }
 
-    /**
-     * return variable table message, if `table` is empty it will be fail
-     *
-     * **Note:** if `table` have variables, use `getMarkdownTableVariables` method instead
-     * @see {@link VisualBuilderPage#getMarkdownTableVariables}
-     * @returns
-     * @memberof VisualBuilderPage
-     */
-    public async getMarkdownTableNoVariables() {
-      return await testSubjects.getVisibleText('tvbMarkdownEditor__noVariables');
-    }
+  /**
+   *
+   * getting all markdown variables list which located on `table` section
+   *
+   * **Note**: if `table` not have variables, use `getMarkdownTableNoVariables` method instead
+   * @see {getMarkdownTableNoVariables}
+   * @returns {Promise<Array<{key:string, value:string, selector:any}>>}
+   * @memberof VisualBuilderPage
+   */
+  public async getMarkdownTableVariables(): Promise<
+    Array<{ key: string; value: string; selector: WebElementWrapper }>
+  > {
+    const testTableVariables = await this.testSubjects.find('tsvbMarkdownVariablesTable');
+    const variablesSelector = 'tbody tr';
+    const exists = await this.find.existsByCssSelector(variablesSelector);
+    if (!exists) {
+      this.log.debug('variable list is empty');
+      return [];
+    }
+    const variables = await testTableVariables.findAllByCssSelector(variablesSelector);
+
+    const variablesKeyValueSelectorMap = await Promise.all(
+      variables.map(async (variable) => {
+        const subVars = await variable.findAllByCssSelector('td');
+        const selector = await subVars[0].findByTagName('a');
+        const key = await selector.getVisibleText();
+        const value = await subVars[1].getVisibleText();
+        this.log.debug(`markdown table variables table is: ${key} ${value}`);
+        return { key, value, selector };
+      })
+    );
+    return variablesKeyValueSelectorMap;
+  }
 
-    /**
-     * get all sub-tabs count for `time series`, `metric`, `top n`, `gauge`, `markdown` or `table` tab.
-     *
-     * @returns {Promise<any[]>}
-     * @memberof VisualBuilderPage
-     */
-    public async getSubTabs(): Promise<WebElementWrapper[]> {
-      return await find.allByCssSelector('[data-test-subj$="-subtab"]');
-    }
+  /**
+   * return variable table message, if `table` is empty it will be fail
+   *
+   * **Note:** if `table` have variables, use `getMarkdownTableVariables` method instead
+   * @see {@link VisualBuilderPage#getMarkdownTableVariables}
+   * @returns
+   * @memberof VisualBuilderPage
+   */
+  public async getMarkdownTableNoVariables() {
+    return await this.testSubjects.getVisibleText('tvbMarkdownEditor__noVariables');
+  }
 
-    /**
-     * switch markdown sub-tab for visualization
-     *
-     * @param {'data' | 'options'| 'markdown'} subTab
-     * @memberof VisualBuilderPage
-     */
-    public async markdownSwitchSubTab(subTab: 'data' | 'options' | 'markdown') {
-      const tab = await testSubjects.find(`${subTab}-subtab`);
-      const isSelected = await tab.getAttribute('aria-selected');
-      if (isSelected !== 'true') {
-        await tab.click();
-      }
-    }
+  /**
+   * get all sub-tabs count for `time series`, `metric`, `top n`, `gauge`, `markdown` or `table` tab.
+   *
+   * @returns {Promise<any[]>}
+   * @memberof VisualBuilderPage
+   */
+  public async getSubTabs(): Promise<WebElementWrapper[]> {
+    return await this.find.allByCssSelector('[data-test-subj$="-subtab"]');
+  }
 
-    /**
-     * setting label for markdown visualization
-     *
-     * @param {string} variableName
-     * @param type
-     * @memberof VisualBuilderPage
-     */
-    public async setMarkdownDataVariable(variableName: string, type: 'variable' | 'label') {
-      const SELECTOR = type === 'label' ? '[placeholder="Label"]' : '[placeholder="Variable name"]';
-      if (variableName) {
-        await find.setValue(SELECTOR, variableName);
-      } else {
-        const input = await find.byCssSelector(SELECTOR);
-        await input.clearValueWithKeyboard({ charByChar: true });
-      }
+  /**
+   * switch markdown sub-tab for visualization
+   *
+   * @param {'data' | 'options'| 'markdown'} subTab
+   * @memberof VisualBuilderPage
+   */
+  public async markdownSwitchSubTab(subTab: 'data' | 'options' | 'markdown') {
+    const tab = await this.testSubjects.find(`${subTab}-subtab`);
+    const isSelected = await tab.getAttribute('aria-selected');
+    if (isSelected !== 'true') {
+      await tab.click();
     }
+  }
 
-    public async clickSeriesOption(nth = 0) {
-      const el = await testSubjects.findAll('seriesOptions');
-      await el[nth].click();
+  /**
+   * setting label for markdown visualization
+   *
+   * @param {string} variableName
+   * @param type
+   * @memberof VisualBuilderPage
+   */
+  public async setMarkdownDataVariable(variableName: string, type: 'variable' | 'label') {
+    const SELECTOR = type === 'label' ? '[placeholder="Label"]' : '[placeholder="Variable name"]';
+    if (variableName) {
+      await this.find.setValue(SELECTOR, variableName);
+    } else {
+      const input = await this.find.byCssSelector(SELECTOR);
+      await input.clearValueWithKeyboard({ charByChar: true });
     }
+  }
 
-    public async clearOffsetSeries() {
-      const el = await testSubjects.find('offsetTimeSeries');
-      await el.clearValue();
-    }
+  public async clickSeriesOption(nth = 0) {
+    const el = await this.testSubjects.findAll('seriesOptions');
+    await el[nth].click();
+  }
 
-    public async toggleAutoApplyChanges() {
-      await find.clickByCssSelector('#tsvbAutoApplyInput');
-    }
+  public async clearOffsetSeries() {
+    const el = await this.testSubjects.find('offsetTimeSeries');
+    await el.clearValue();
+  }
 
-    public async applyChanges() {
-      await testSubjects.clickWhenNotDisabled('applyBtn');
-    }
+  public async toggleAutoApplyChanges() {
+    await this.find.clickByCssSelector('#tsvbAutoApplyInput');
+  }
 
-    /**
-     * change the data formatter for template in an `options` label tab
-     *
-     * @param formatter - typeof formatter which you can use for presenting data. By default kibana show `Number` formatter
-     */
-    public async changeDataFormatter(
-      formatter: 'Bytes' | 'Number' | 'Percent' | 'Duration' | 'Custom'
-    ) {
-      const formatterEl = await testSubjects.find('tsvbDataFormatPicker');
-      await comboBox.setElement(formatterEl, formatter, { clickWithMouse: true });
-    }
+  public async applyChanges() {
+    await this.testSubjects.clickWhenNotDisabled('applyBtn');
+  }
 
-    /**
-     * set duration formatter additional settings
-     *
-     * @param from start format
-     * @param to end format
-     * @param decimalPlaces decimals count
-     */
-    public async setDurationFormatterSettings({
-      from,
-      to,
-      decimalPlaces,
-    }: {
-      from?: FromDuration;
-      to?: ToDuration;
-      decimalPlaces?: string;
-    }) {
-      if (from) {
-        await retry.try(async () => {
-          const fromCombobox = await find.byCssSelector('[id$="from-row"] .euiComboBox');
-          await comboBox.setElement(fromCombobox, from, { clickWithMouse: true });
-        });
-      }
-      if (to) {
-        const toCombobox = await find.byCssSelector('[id$="to-row"] .euiComboBox');
-        await comboBox.setElement(toCombobox, to, { clickWithMouse: true });
-      }
-      if (decimalPlaces) {
-        const decimalPlacesInput = await find.byCssSelector('[id$="decimal"]');
-        await decimalPlacesInput.type(decimalPlaces);
-      }
-    }
+  /**
+   * change the data formatter for template in an `options` label tab
+   *
+   * @param formatter - typeof formatter which you can use for presenting data. By default kibana show `Number` formatter
+   */
+  public async changeDataFormatter(
+    formatter: 'Bytes' | 'Number' | 'Percent' | 'Duration' | 'Custom'
+  ) {
+    const formatterEl = await this.testSubjects.find('tsvbDataFormatPicker');
+    await this.comboBox.setElement(formatterEl, formatter, { clickWithMouse: true });
+  }
 
-    /**
-     * write template for aggregation row in the `option` tab
-     *
-     * @param template always should contain `{{value}}`
-     * @example
-     * await visualBuilder.enterSeriesTemplate('$ {{value}}') // add `$` symbol for value
-     */
-    public async enterSeriesTemplate(template: string) {
-      const el = await testSubjects.find('tsvb_series_value');
-      await el.clearValueWithKeyboard();
-      await el.type(template);
+  /**
+   * set duration formatter additional settings
+   *
+   * @param from start format
+   * @param to end format
+   * @param decimalPlaces decimals count
+   */
+  public async setDurationFormatterSettings({
+    from,
+    to,
+    decimalPlaces,
+  }: {
+    from?: FromDuration;
+    to?: ToDuration;
+    decimalPlaces?: string;
+  }) {
+    if (from) {
+      await this.retry.try(async () => {
+        const fromCombobox = await this.find.byCssSelector('[id$="from-row"] .euiComboBox');
+        await this.comboBox.setElement(fromCombobox, from, { clickWithMouse: true });
+      });
     }
-
-    public async enterOffsetSeries(value: string) {
-      const el = await testSubjects.find('offsetTimeSeries');
-      await el.clearValue();
-      await el.type(value);
+    if (to) {
+      const toCombobox = await this.find.byCssSelector('[id$="to-row"] .euiComboBox');
+      await this.comboBox.setElement(toCombobox, to, { clickWithMouse: true });
     }
-
-    public async getRhythmChartLegendValue(nth = 0) {
-      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-      const metricValue = (
-        await find.allByCssSelector(`.echLegendItem .echLegendItem__extra`, 20000)
-      )[nth];
-      await metricValue.moveMouseTo();
-      return await metricValue.getVisibleText();
+    if (decimalPlaces) {
+      const decimalPlacesInput = await this.find.byCssSelector('[id$="decimal"]');
+      await decimalPlacesInput.type(decimalPlaces);
     }
+  }
 
-    public async clickGauge() {
-      await testSubjects.click('gaugeTsvbTypeBtn');
-    }
+  /**
+   * write template for aggregation row in the `option` tab
+   *
+   * @param template always should contain `{{value}}`
+   * @example
+   * await visualBuilder.enterSeriesTemplate('$ {{value}}') // add `$` symbol for value
+   */
+  public async enterSeriesTemplate(template: string) {
+    const el = await this.testSubjects.find('tsvb_series_value');
+    await el.clearValueWithKeyboard();
+    await el.type(template);
+  }
 
-    public async getGaugeLabel() {
-      const gaugeLabel = await find.byCssSelector('.tvbVisGauge__label');
-      return await gaugeLabel.getVisibleText();
-    }
+  public async enterOffsetSeries(value: string) {
+    const el = await this.testSubjects.find('offsetTimeSeries');
+    await el.clearValue();
+    await el.type(value);
+  }
 
-    public async getGaugeCount() {
-      const gaugeCount = await find.byCssSelector('.tvbVisGauge__value');
-      return await gaugeCount.getVisibleText();
-    }
+  public async getRhythmChartLegendValue(nth = 0) {
+    await this.visChart.waitForVisualizationRenderingStabilized();
+    const metricValue = (
+      await this.find.allByCssSelector(`.echLegendItem .echLegendItem__extra`, 20000)
+    )[nth];
+    await metricValue.moveMouseTo();
+    return await metricValue.getVisibleText();
+  }
 
-    public async clickTopN() {
-      await testSubjects.click('top_nTsvbTypeBtn');
-    }
+  public async clickGauge() {
+    await this.testSubjects.click('gaugeTsvbTypeBtn');
+  }
 
-    public async getTopNLabel() {
-      const topNLabel = await find.byCssSelector('.tvbVisTopN__label');
-      return await topNLabel.getVisibleText();
-    }
+  public async getGaugeLabel() {
+    const gaugeLabel = await this.find.byCssSelector('.tvbVisGauge__label');
+    return await gaugeLabel.getVisibleText();
+  }
 
-    public async getTopNCount() {
-      const gaugeCount = await find.byCssSelector('.tvbVisTopN__value');
-      return await gaugeCount.getVisibleText();
-    }
+  public async getGaugeCount() {
+    const gaugeCount = await this.find.byCssSelector('.tvbVisGauge__value');
+    return await gaugeCount.getVisibleText();
+  }
 
-    public async clickTable() {
-      await testSubjects.click('tableTsvbTypeBtn');
-    }
+  public async clickTopN() {
+    await this.testSubjects.click('top_nTsvbTypeBtn');
+  }
 
-    public async createNewAgg(nth = 0) {
-      const prevAggs = await testSubjects.findAll('aggSelector');
-      const elements = await testSubjects.findAll('addMetricAddBtn');
-      await elements[nth].click();
-      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-      await retry.waitFor('new agg is added', async () => {
-        const currentAggs = await testSubjects.findAll('aggSelector');
-        return currentAggs.length > prevAggs.length;
-      });
-    }
+  public async getTopNLabel() {
+    const topNLabel = await this.find.byCssSelector('.tvbVisTopN__label');
+    return await topNLabel.getVisibleText();
+  }
 
-    public async selectAggType(value: string, nth = 0) {
-      const elements = await testSubjects.findAll('aggSelector');
-      await comboBox.setElement(elements[nth], value);
-      return await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async getTopNCount() {
+    const gaugeCount = await this.find.byCssSelector('.tvbVisTopN__value');
+    return await gaugeCount.getVisibleText();
+  }
 
-    public async fillInExpression(expression: string, nth = 0) {
-      const expressions = await testSubjects.findAll('mathExpression');
-      await expressions[nth].type(expression);
-      return await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async clickTable() {
+    await this.testSubjects.click('tableTsvbTypeBtn');
+  }
 
-    public async fillInVariable(name = 'test', metric = 'Count', nth = 0) {
-      const elements = await testSubjects.findAll('varRow');
-      const varNameInput = await elements[nth].findByCssSelector('.tvbAggs__varName');
-      await varNameInput.type(name);
-      const metricSelectWrapper = await elements[nth].findByCssSelector(
-        '.tvbAggs__varMetricWrapper'
-      );
-      await comboBox.setElement(metricSelectWrapper, metric);
-      return await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async createNewAgg(nth = 0) {
+    const prevAggs = await this.testSubjects.findAll('aggSelector');
+    const elements = await this.testSubjects.findAll('addMetricAddBtn');
+    await elements[nth].click();
+    await this.visChart.waitForVisualizationRenderingStabilized();
+    await this.retry.waitFor('new agg is added', async () => {
+      const currentAggs = await this.testSubjects.findAll('aggSelector');
+      return currentAggs.length > prevAggs.length;
+    });
+  }
 
-    public async selectGroupByField(fieldName: string) {
-      await comboBox.set('groupByField', fieldName);
-    }
+  public async selectAggType(value: string, nth = 0) {
+    const elements = await this.testSubjects.findAll('aggSelector');
+    await this.comboBox.setElement(elements[nth], value);
+    return await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async setColumnLabelValue(value: string) {
-      const el = await testSubjects.find('columnLabelName');
-      await el.clearValue();
-      await el.type(value);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async fillInExpression(expression: string, nth = 0) {
+    const expressions = await this.testSubjects.findAll('mathExpression');
+    await expressions[nth].type(expression);
+    return await this.header.waitUntilLoadingHasFinished();
+  }
 
-    /**
-     * get values for rendered table
-     *
-     * **Note:** this work only for table visualization
-     *
-     * @returns {Promise<string>}
-     * @memberof VisualBuilderPage
-     */
-    public async getViewTable(): Promise<string> {
-      const tableView = await testSubjects.find('tableView', 20000);
-      return await tableView.getVisibleText();
-    }
+  public async fillInVariable(name = 'test', metric = 'Count', nth = 0) {
+    const elements = await this.testSubjects.findAll('varRow');
+    const varNameInput = await elements[nth].findByCssSelector('.tvbAggs__varName');
+    await varNameInput.type(name);
+    const metricSelectWrapper = await elements[nth].findByCssSelector('.tvbAggs__varMetricWrapper');
+    await this.comboBox.setElement(metricSelectWrapper, metric);
+    return await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async clickPanelOptions(tabName: string) {
-      await testSubjects.click(`${tabName}EditorPanelOptionsBtn`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async selectGroupByField(fieldName: string) {
+    await this.comboBox.set('groupByField', fieldName);
+  }
 
-    public async clickDataTab(tabName: string) {
-      await testSubjects.click(`${tabName}EditorDataBtn`);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  public async setColumnLabelValue(value: string) {
+    const el = await this.testSubjects.find('columnLabelName');
+    await el.clearValue();
+    await el.type(value);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async switchIndexPatternSelectionMode(useKibanaIndices: boolean) {
-      await testSubjects.click('switchIndexPatternSelectionModePopover');
-      await testSubjects.setEuiSwitch(
-        'switchIndexPatternSelectionMode',
-        useKibanaIndices ? 'check' : 'uncheck'
-      );
-    }
+  /**
+   * get values for rendered table
+   *
+   * **Note:** this work only for table visualization
+   *
+   * @returns {Promise<string>}
+   * @memberof VisualBuilderPage
+   */
+  public async getViewTable(): Promise<string> {
+    const tableView = await this.testSubjects.find('tableView', 20000);
+    return await tableView.getVisibleText();
+  }
 
-    public async setIndexPatternValue(value: string, useKibanaIndices?: boolean) {
-      const metricsIndexPatternInput = 'metricsIndexPatternInput';
+  public async clickPanelOptions(tabName: string) {
+    await this.testSubjects.click(`${tabName}EditorPanelOptionsBtn`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-      if (useKibanaIndices !== undefined) {
-        await this.switchIndexPatternSelectionMode(useKibanaIndices);
-      }
+  public async clickDataTab(tabName: string) {
+    await this.testSubjects.click(`${tabName}EditorDataBtn`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-      if (useKibanaIndices === false) {
-        const el = await testSubjects.find(metricsIndexPatternInput);
-        await el.clearValue();
-        if (value) {
-          await el.type(value, { charByChar: true });
-        }
-      } else {
-        await comboBox.clearInputField(metricsIndexPatternInput);
-        if (value) {
-          await comboBox.setCustom(metricsIndexPatternInput, value);
-        }
-      }
+  public async switchIndexPatternSelectionMode(useKibanaIndices: boolean) {
+    await this.testSubjects.click('switchIndexPatternSelectionModePopover');
+    await this.testSubjects.setEuiSwitch(
+      'switchIndexPatternSelectionMode',
+      useKibanaIndices ? 'check' : 'uncheck'
+    );
+  }
+
+  public async setIndexPatternValue(value: string, useKibanaIndices?: boolean) {
+    const metricsIndexPatternInput = 'metricsIndexPatternInput';
 
-      await PageObjects.header.waitUntilLoadingHasFinished();
+    if (useKibanaIndices !== undefined) {
+      await this.switchIndexPatternSelectionMode(useKibanaIndices);
     }
 
-    public async setIntervalValue(value: string) {
-      const el = await testSubjects.find('metricsIndexPatternInterval');
+    if (useKibanaIndices === false) {
+      const el = await this.testSubjects.find(metricsIndexPatternInput);
       await el.clearValue();
-      await el.type(value);
-      await PageObjects.header.waitUntilLoadingHasFinished();
+      if (value) {
+        await el.type(value, { charByChar: true });
+      }
+    } else {
+      await this.comboBox.clearInputField(metricsIndexPatternInput);
+      if (value) {
+        await this.comboBox.setCustom(metricsIndexPatternInput, value);
+      }
     }
 
-    public async setDropLastBucket(value: boolean) {
-      const option = await testSubjects.find(`metricsDropLastBucket-${value ? 'yes' : 'no'}`);
-      (await option.findByCssSelector('label')).click();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async waitForIndexPatternTimeFieldOptionsLoaded() {
-      await retry.waitFor('combobox options loaded', async () => {
-        const options = await comboBox.getOptions('metricsIndexPatternFieldsSelect');
-        log.debug(`-- optionsCount=${options.length}`);
-        return options.length > 0;
-      });
-    }
+  public async setIntervalValue(value: string) {
+    const el = await this.testSubjects.find('metricsIndexPatternInterval');
+    await el.clearValue();
+    await el.type(value);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async selectIndexPatternTimeField(timeField: string) {
-      await retry.try(async () => {
-        await comboBox.clearInputField('metricsIndexPatternFieldsSelect');
-        await comboBox.set('metricsIndexPatternFieldsSelect', timeField);
-      });
-    }
+  public async setDropLastBucket(value: boolean) {
+    const option = await this.testSubjects.find(`metricsDropLastBucket-${value ? 'yes' : 'no'}`);
+    (await option.findByCssSelector('label')).click();
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    /**
-     * check that table visualization is visible and ready for interact
-     *
-     * @returns {Promise<void>}
-     * @memberof VisualBuilderPage
-     */
-    public async checkTableTabIsPresent(): Promise<void> {
-      await testSubjects.existOrFail('visualizationLoader');
-      const isDataExists = await testSubjects.exists('tableView');
-      log.debug(`data is already rendered: ${isDataExists}`);
-      if (!isDataExists) {
-        await this.checkPreviewIsDisabled();
-      }
-    }
+  public async waitForIndexPatternTimeFieldOptionsLoaded() {
+    await this.retry.waitFor('combobox options loaded', async () => {
+      const options = await this.comboBox.getOptions('metricsIndexPatternFieldsSelect');
+      this.log.debug(`-- optionsCount=${options.length}`);
+      return options.length > 0;
+    });
+  }
 
-    /**
-     * set label name for aggregation
-     *
-     * @param {string} labelName
-     * @param {number} [nth=0]
-     * @memberof VisualBuilderPage
-     */
-    public async setLabel(labelName: string, nth: number = 0): Promise<void> {
-      const input = (await find.allByCssSelector('[placeholder="Label"]'))[nth];
-      await input.type(labelName);
-    }
+  public async selectIndexPatternTimeField(timeField: string) {
+    await this.retry.try(async () => {
+      await this.comboBox.clearInputField('metricsIndexPatternFieldsSelect');
+      await this.comboBox.set('metricsIndexPatternFieldsSelect', timeField);
+    });
+  }
 
-    /**
-     * set field for type of aggregation
-     *
-     * @param {string} field name of field
-     * @param {number} [aggNth=0] number of aggregation. Start by zero
-     * @default 0
-     * @memberof VisualBuilderPage
-     */
-    public async setFieldForAggregation(field: string, aggNth: number = 0): Promise<void> {
-      const fieldEl = await this.getFieldForAggregation(aggNth);
-
-      await comboBox.setElement(fieldEl, field);
+  /**
+   * check that table visualization is visible and ready for interact
+   *
+   * @returns {Promise<void>}
+   * @memberof VisualBuilderPage
+   */
+  public async checkTableTabIsPresent(): Promise<void> {
+    await this.testSubjects.existOrFail('visualizationLoader');
+    const isDataExists = await this.testSubjects.exists('tableView');
+    this.log.debug(`data is already rendered: ${isDataExists}`);
+    if (!isDataExists) {
+      await this.checkPreviewIsDisabled();
     }
+  }
 
-    public async checkFieldForAggregationValidity(aggNth: number = 0): Promise<boolean> {
-      const fieldEl = await this.getFieldForAggregation(aggNth);
+  /**
+   * set label name for aggregation
+   *
+   * @param {string} labelName
+   * @param {number} [nth=0]
+   * @memberof VisualBuilderPage
+   */
+  public async setLabel(labelName: string, nth: number = 0): Promise<void> {
+    const input = (await this.find.allByCssSelector('[placeholder="Label"]'))[nth];
+    await input.type(labelName);
+  }
 
-      return await comboBox.checkValidity(fieldEl);
-    }
+  /**
+   * set field for type of aggregation
+   *
+   * @param {string} field name of field
+   * @param {number} [aggNth=0] number of aggregation. Start by zero
+   * @default 0
+   * @memberof VisualBuilderPage
+   */
+  public async setFieldForAggregation(field: string, aggNth: number = 0): Promise<void> {
+    const fieldEl = await this.getFieldForAggregation(aggNth);
+
+    await this.comboBox.setElement(fieldEl, field);
+  }
 
-    public async getFieldForAggregation(aggNth: number = 0): Promise<WebElementWrapper> {
-      const labels = await testSubjects.findAll('aggRow');
-      const label = labels[aggNth];
+  public async checkFieldForAggregationValidity(aggNth: number = 0): Promise<boolean> {
+    const fieldEl = await this.getFieldForAggregation(aggNth);
 
-      return (await label.findAllByTestSubject('comboBoxInput'))[1];
-    }
+    return await this.comboBox.checkValidity(fieldEl);
+  }
 
-    public async clickColorPicker(): Promise<void> {
-      const picker = await find.byCssSelector('.tvbColorPicker button');
-      await picker.clickMouseButton();
-    }
+  public async getFieldForAggregation(aggNth: number = 0): Promise<WebElementWrapper> {
+    const labels = await this.testSubjects.findAll('aggRow');
+    const label = labels[aggNth];
 
-    public async setBackgroundColor(colorHex: string): Promise<void> {
-      await this.clickColorPicker();
-      await this.checkColorPickerPopUpIsPresent();
-      await find.setValue('.euiColorPicker input', colorHex);
-      await this.clickColorPicker();
-      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-    }
+    return (await label.findAllByTestSubject('comboBoxInput'))[1];
+  }
 
-    public async checkColorPickerPopUpIsPresent(): Promise<void> {
-      log.debug(`Check color picker popup is present`);
-      await testSubjects.existOrFail('colorPickerPopover', { timeout: 5000 });
-    }
+  public async clickColorPicker(): Promise<void> {
+    const picker = await this.find.byCssSelector('.tvbColorPicker button');
+    await picker.clickMouseButton();
+  }
 
-    public async changePanelPreview(nth: number = 0): Promise<void> {
-      const prevRenderingCount = await PageObjects.visChart.getVisualizationRenderingCount();
-      const changePreviewBtnArray = await testSubjects.findAll('AddActivatePanelBtn');
-      await changePreviewBtnArray[nth].click();
-      await PageObjects.visChart.waitForRenderingCount(prevRenderingCount + 1);
-    }
+  public async setBackgroundColor(colorHex: string): Promise<void> {
+    await this.clickColorPicker();
+    await this.checkColorPickerPopUpIsPresent();
+    await this.find.setValue('.euiColorPicker input', colorHex);
+    await this.clickColorPicker();
+    await this.visChart.waitForVisualizationRenderingStabilized();
+  }
 
-    public async checkPreviewIsDisabled(): Promise<void> {
-      log.debug(`Check no data message is present`);
-      await testSubjects.existOrFail('timeseriesVis > visNoResult', { timeout: 5000 });
-    }
+  public async checkColorPickerPopUpIsPresent(): Promise<void> {
+    this.log.debug(`Check color picker popup is present`);
+    await this.testSubjects.existOrFail('colorPickerPopover', { timeout: 5000 });
+  }
 
-    public async cloneSeries(nth: number = 0): Promise<void> {
-      const cloneBtnArray = await testSubjects.findAll('AddCloneBtn');
-      await cloneBtnArray[nth].click();
-      await PageObjects.visChart.waitForVisualizationRenderingStabilized();
-    }
+  public async changePanelPreview(nth: number = 0): Promise<void> {
+    const prevRenderingCount = await this.visChart.getVisualizationRenderingCount();
+    const changePreviewBtnArray = await this.testSubjects.findAll('AddActivatePanelBtn');
+    await changePreviewBtnArray[nth].click();
+    await this.visChart.waitForRenderingCount(prevRenderingCount + 1);
+  }
 
-    /**
-     * Get aggregation count for the current series
-     *
-     * @param {number} [nth=0] series
-     * @returns {Promise<number>}
-     * @memberof VisualBuilderPage
-     */
-    public async getAggregationCount(nth: number = 0): Promise<number> {
-      const series = await this.getSeries();
-      const aggregation = await series[nth].findAllByTestSubject('draggable');
-      return aggregation.length;
-    }
+  public async checkPreviewIsDisabled(): Promise<void> {
+    this.log.debug(`Check no data message is present`);
+    await this.testSubjects.existOrFail('timeseriesVis > visNoResult', { timeout: 5000 });
+  }
 
-    public async deleteSeries(nth: number = 0): Promise<void> {
-      const prevRenderingCount = await PageObjects.visChart.getVisualizationRenderingCount();
-      const cloneBtnArray = await testSubjects.findAll('AddDeleteBtn');
-      await cloneBtnArray[nth].click();
-      await PageObjects.visChart.waitForRenderingCount(prevRenderingCount + 1);
-    }
+  public async cloneSeries(nth: number = 0): Promise<void> {
+    const cloneBtnArray = await this.testSubjects.findAll('AddCloneBtn');
+    await cloneBtnArray[nth].click();
+    await this.visChart.waitForVisualizationRenderingStabilized();
+  }
 
-    public async getLegendItems(): Promise<WebElementWrapper[]> {
-      return await find.allByCssSelector('.echLegendItem');
-    }
+  /**
+   * Get aggregation count for the current series
+   *
+   * @param {number} [nth=0] series
+   * @returns {Promise<number>}
+   * @memberof VisualBuilderPage
+   */
+  public async getAggregationCount(nth: number = 0): Promise<number> {
+    const series = await this.getSeries();
+    const aggregation = await series[nth].findAllByTestSubject('draggable');
+    return aggregation.length;
+  }
 
-    public async getLegendItemsContent(): Promise<string[]> {
-      const legendList = await find.byCssSelector('.echLegendList');
-      const $ = await legendList.parseDomContent();
+  public async deleteSeries(nth: number = 0): Promise<void> {
+    const prevRenderingCount = await this.visChart.getVisualizationRenderingCount();
+    const cloneBtnArray = await this.testSubjects.findAll('AddDeleteBtn');
+    await cloneBtnArray[nth].click();
+    await this.visChart.waitForRenderingCount(prevRenderingCount + 1);
+  }
 
-      return $('li')
-        .toArray()
-        .map((li) => {
-          const label = $(li).find('.echLegendItem__label').text();
-          const value = $(li).find('.echLegendItem__extra').text();
+  public async getLegendItems(): Promise<WebElementWrapper[]> {
+    return await this.find.allByCssSelector('.echLegendItem');
+  }
 
-          return `${label}: ${value}`;
-        });
-    }
+  public async getLegendItemsContent(): Promise<string[]> {
+    const legendList = await this.find.byCssSelector('.echLegendList');
+    const $ = await legendList.parseDomContent();
 
-    public async getSeries(): Promise<WebElementWrapper[]> {
-      return await find.allByCssSelector('.tvbSeriesEditor');
-    }
+    return $('li')
+      .toArray()
+      .map((li) => {
+        const label = $(li).find('.echLegendItem__label').text();
+        const value = $(li).find('.echLegendItem__extra').text();
 
-    public async setMetricsGroupByTerms(field: string) {
-      const groupBy = await find.byCssSelector(
-        '.tvbAggRow--split [data-test-subj="comboBoxInput"]'
-      );
-      await comboBox.setElement(groupBy, 'Terms', { clickWithMouse: true });
-      await PageObjects.common.sleep(1000);
-      const byField = await testSubjects.find('groupByField');
-      await comboBox.setElement(byField, field);
-    }
+        return `${label}: ${value}`;
+      });
+  }
 
-    public async checkSelectedMetricsGroupByValue(value: string) {
-      const groupBy = await find.byCssSelector(
-        '.tvbAggRow--split [data-test-subj="comboBoxInput"]'
-      );
-      return await comboBox.isOptionSelected(groupBy, value);
-    }
+  public async getSeries(): Promise<WebElementWrapper[]> {
+    return await this.find.allByCssSelector('.tvbSeriesEditor');
+  }
 
-    public async setMetricsDataTimerangeMode(value: string) {
-      const dataTimeRangeMode = await testSubjects.find('dataTimeRangeMode');
-      return await comboBox.setElement(dataTimeRangeMode, value);
-    }
+  public async setMetricsGroupByTerms(field: string) {
+    const groupBy = await this.find.byCssSelector(
+      '.tvbAggRow--split [data-test-subj="comboBoxInput"]'
+    );
+    await this.comboBox.setElement(groupBy, 'Terms', { clickWithMouse: true });
+    await this.common.sleep(1000);
+    const byField = await this.testSubjects.find('groupByField');
+    await this.comboBox.setElement(byField, field);
+  }
 
-    public async checkSelectedDataTimerangeMode(value: string) {
-      const dataTimeRangeMode = await testSubjects.find('dataTimeRangeMode');
-      return await comboBox.isOptionSelected(dataTimeRangeMode, value);
-    }
+  public async checkSelectedMetricsGroupByValue(value: string) {
+    const groupBy = await this.find.byCssSelector(
+      '.tvbAggRow--split [data-test-subj="comboBoxInput"]'
+    );
+    return await this.comboBox.isOptionSelected(groupBy, value);
   }
 
-  return new VisualBuilderPage();
+  public async setMetricsDataTimerangeMode(value: string) {
+    const dataTimeRangeMode = await this.testSubjects.find('dataTimeRangeMode');
+    return await this.comboBox.setElement(dataTimeRangeMode, value);
+  }
+
+  public async checkSelectedDataTimerangeMode(value: string) {
+    const dataTimeRangeMode = await this.testSubjects.find('dataTimeRangeMode');
+    return await this.comboBox.isOptionSelected(dataTimeRangeMode, value);
+  }
 }
diff --git a/test/functional/page_objects/visualize_chart_page.ts b/test/functional/page_objects/visualize_chart_page.ts
index 7b69101b92475..c8587f4ffd346 100644
--- a/test/functional/page_objects/visualize_chart_page.ts
+++ b/test/functional/page_objects/visualize_chart_page.ts
@@ -7,588 +7,620 @@
  */
 
 import { Position } from '@elastic/charts';
+import Color from 'color';
 
-import { FtrProviderContext } from '../ftr_provider_context';
-
-const elasticChartSelector = 'visTypeXyChart';
-
-export function VisualizeChartPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const config = getService('config');
-  const find = getService('find');
-  const log = getService('log');
-  const retry = getService('retry');
-  const kibanaServer = getService('kibanaServer');
-  const elasticChart = getService('elasticChart');
-  const dataGrid = getService('dataGrid');
-  const defaultFindTimeout = config.get('timeouts.find');
-  const { common } = getPageObjects(['common']);
-
-  class VisualizeChart {
-    private async getDebugState() {
-      return await elasticChart.getChartDebugData(elasticChartSelector);
-    }
+import { FtrService } from '../ftr_provider_context';
 
-    /**
-     * Is new charts library advanced setting enabled
-     */
-    public async isNewChartsLibraryEnabled(): Promise<boolean> {
-      const legacyChartsLibrary =
-        Boolean(await kibanaServer.uiSettings.get('visualization:visualize:legacyChartsLibrary')) ??
-        true;
-      const enabled = !legacyChartsLibrary;
-      log.debug(`-- isNewChartsLibraryEnabled = ${enabled}`);
-
-      return enabled;
-    }
+const xyChartSelector = 'visTypeXyChart';
+const pieChartSelector = 'visTypePieChart';
 
-    /**
-     * Is new charts library enabled and an area, line or histogram chart exists
-     */
-    private async isVisTypeXYChart(): Promise<boolean> {
-      const enabled = await this.isNewChartsLibraryEnabled();
+export class VisualizeChartPageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly config = this.ctx.getService('config');
+  private readonly find = this.ctx.getService('find');
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly kibanaServer = this.ctx.getService('kibanaServer');
+  private readonly elasticChart = this.ctx.getService('elasticChart');
+  private readonly dataGrid = this.ctx.getService('dataGrid');
+  private readonly common = this.ctx.getPageObject('common');
 
-      if (!enabled) {
-        log.debug(`-- isVisTypeXYChart = false`);
-        return false;
-      }
+  private readonly defaultFindTimeout = this.config.get('timeouts.find');
 
-      // check if enabled but not a line, area or histogram chart
-      if (await find.existsByCssSelector('.visLib__chart', 1)) {
-        const chart = await find.byCssSelector('.visLib__chart');
-        const chartType = await chart.getAttribute('data-vislib-chart-type');
+  public async getEsChartDebugState(chartSelector: string) {
+    return await this.elasticChart.getChartDebugData(chartSelector);
+  }
 
-        if (!['line', 'area', 'histogram'].includes(chartType)) {
-          log.debug(`-- isVisTypeXYChart = false`);
-          return false;
-        }
-      }
+  /**
+   * Is new charts library advanced setting enabled
+   */
+  public async isNewChartsLibraryEnabled(): Promise<boolean> {
+    const legacyChartsLibrary =
+      Boolean(
+        await this.kibanaServer.uiSettings.get('visualization:visualize:legacyChartsLibrary')
+      ) ?? true;
+    const enabled = !legacyChartsLibrary;
+    this.log.debug(`-- isNewChartsLibraryEnabled = ${enabled}`);
+
+    return enabled;
+  }
 
-      if (!(await elasticChart.hasChart(elasticChartSelector, 1))) {
-        // not be a vislib chart type
-        log.debug(`-- isVisTypeXYChart = false`);
-        return false;
-      }
+  /**
+   * Is new charts library enabled and an area, line or histogram chart exists
+   */
+  public async isNewLibraryChart(chartSelector: string): Promise<boolean> {
+    const enabled = await this.isNewChartsLibraryEnabled();
 
-      log.debug(`-- isVisTypeXYChart = true`);
-      return true;
+    if (!enabled) {
+      this.log.debug(`-- isNewLibraryChart = false`);
+      return false;
     }
 
-    /**
-     * Helper method to get expected values that are slightly different
-     * between vislib and elastic-chart inplementations
-     * @param vislibValue value expected for vislib chart
-     * @param elasticChartsValue value expected for `@elastic/charts` chart
-     */
-    public async getExpectedValue<T>(vislibValue: T, elasticChartsValue: T): Promise<T> {
-      if (await this.isVisTypeXYChart()) {
-        return elasticChartsValue;
+    // check if enabled but not a line, area, histogram or pie chart
+    if (await this.find.existsByCssSelector('.visLib__chart', 1)) {
+      const chart = await this.find.byCssSelector('.visLib__chart');
+      const chartType = await chart.getAttribute('data-vislib-chart-type');
+
+      if (!['line', 'area', 'histogram', 'pie'].includes(chartType)) {
+        this.log.debug(`-- isNewLibraryChart = false`);
+        return false;
       }
+    }
 
-      return vislibValue;
+    if (!(await this.elasticChart.hasChart(chartSelector, 1))) {
+      // not be a vislib chart type
+      this.log.debug(`-- isNewLibraryChart = false`);
+      return false;
     }
 
-    public async getYAxisTitle() {
-      if (await this.isVisTypeXYChart()) {
-        const xAxis = (await this.getDebugState())?.axes?.y ?? [];
-        return xAxis[0]?.title;
-      }
+    this.log.debug(`-- isNewLibraryChart = true`);
+    return true;
+  }
 
-      const title = await find.byCssSelector('.y-axis-div .y-axis-title text');
-      return await title.getVisibleText();
+  /**
+   * Helper method to get expected values that are slightly different
+   * between vislib and elastic-chart inplementations
+   * @param vislibValue value expected for vislib chart
+   * @param elasticChartsValue value expected for `@elastic/charts` chart
+   */
+  public async getExpectedValue<T>(vislibValue: T, elasticChartsValue: T): Promise<T> {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      return elasticChartsValue;
     }
 
-    public async getXAxisLabels() {
-      if (await this.isVisTypeXYChart()) {
-        const [xAxis] = (await this.getDebugState())?.axes?.x ?? [];
-        return xAxis?.labels;
-      }
+    return vislibValue;
+  }
 
-      const xAxis = await find.byCssSelector('.visAxis--x.visAxis__column--bottom');
-      const $ = await xAxis.parseDomContent();
-      return $('.x > g > text')
-        .toArray()
-        .map((tick) => $(tick).text().trim());
+  public async getYAxisTitle() {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const xAxis = (await this.getEsChartDebugState(xyChartSelector))?.axes?.y ?? [];
+      return xAxis[0]?.title;
     }
 
-    public async getYAxisLabels() {
-      if (await this.isVisTypeXYChart()) {
-        const [yAxis] = (await this.getDebugState())?.axes?.y ?? [];
-        return yAxis?.labels;
-      }
+    const title = await this.find.byCssSelector('.y-axis-div .y-axis-title text');
+    return await title.getVisibleText();
+  }
 
-      const yAxis = await find.byCssSelector('.visAxis__column--y.visAxis__column--left');
-      const $ = await yAxis.parseDomContent();
-      return $('.y > g > text')
-        .toArray()
-        .map((tick) => $(tick).text().trim());
+  public async getXAxisLabels() {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const [xAxis] = (await this.getEsChartDebugState(xyChartSelector))?.axes?.x ?? [];
+      return xAxis?.labels;
     }
 
-    public async getYAxisLabelsAsNumbers() {
-      if (await this.isVisTypeXYChart()) {
-        const [yAxis] = (await this.getDebugState())?.axes?.y ?? [];
-        return yAxis?.values;
-      }
+    const xAxis = await this.find.byCssSelector('.visAxis--x.visAxis__column--bottom');
+    const $ = await xAxis.parseDomContent();
+    return $('.x > g > text')
+      .toArray()
+      .map((tick) => $(tick).text().trim());
+  }
 
-      return (await this.getYAxisLabels()).map((label) => Number(label.replace(',', '')));
+  public async getYAxisLabels() {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const [yAxis] = (await this.getEsChartDebugState(xyChartSelector))?.axes?.y ?? [];
+      return yAxis?.labels;
     }
 
-    /**
-     * Gets the chart data and scales it based on chart height and label.
-     * @param dataLabel data-label value
-     * @param axis  axis value, 'ValueAxis-1' by default
-     *
-     * Returns an array of height values
-     */
-    public async getAreaChartData(dataLabel: string, axis = 'ValueAxis-1') {
-      if (await this.isVisTypeXYChart()) {
-        const areas = (await this.getDebugState())?.areas ?? [];
-        const points = areas.find(({ name }) => name === dataLabel)?.lines.y1.points ?? [];
-        return points.map(({ y }) => y);
-      }
+    const yAxis = await this.find.byCssSelector('.visAxis__column--y.visAxis__column--left');
+    const $ = await yAxis.parseDomContent();
+    return $('.y > g > text')
+      .toArray()
+      .map((tick) => $(tick).text().trim());
+  }
 
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
+  public async getYAxisLabelsAsNumbers() {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const [yAxis] = (await this.getEsChartDebugState(xyChartSelector))?.axes?.y ?? [];
+      return yAxis?.values;
+    }
 
-      const rectangle = await find.byCssSelector('rect.background');
-      const yAxisHeight = Number(await rectangle.getAttribute('height'));
-      log.debug(`height --------- ${yAxisHeight}`);
+    return (await this.getYAxisLabels()).map((label) => Number(label.replace(',', '')));
+  }
 
-      const path = await retry.try(
-        async () =>
-          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
-      );
-      const data = await path.getAttribute('d');
-      log.debug(data);
-      // This area chart data starts with a 'M'ove to a x,y location, followed
-      // by a bunch of 'L'ines from that point to the next.  Those points are
-      // the values we're going to use to calculate the data values we're testing.
-      // So git rid of the one 'M' and split the rest on the 'L's.
-      const tempArray = data
-        .replace('M ', '')
-        .replace('M', '')
-        .replace(/ L /g, 'L')
-        .replace(/ /g, ',')
-        .split('L');
-      const chartSections = tempArray.length / 2;
-      const chartData = [];
-      for (let i = 0; i < chartSections; i++) {
-        chartData[i] = Math.round((yAxisHeight - Number(tempArray[i].split(',')[1])) * yAxisRatio);
-        log.debug('chartData[i] =' + chartData[i]);
-      }
-      return chartData;
-    }
+  /**
+   * Gets the chart data and scales it based on chart height and label.
+   * @param dataLabel data-label value
+   * @param axis  axis value, 'ValueAxis-1' by default
+   *
+   * Returns an array of height values
+   */
+  public async getAreaChartData(dataLabel: string, axis = 'ValueAxis-1') {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const areas = (await this.getEsChartDebugState(xyChartSelector))?.areas ?? [];
+      const points = areas.find(({ name }) => name === dataLabel)?.lines.y1.points ?? [];
+      return points.map(({ y }) => y);
+    }
+
+    const yAxisRatio = await this.getChartYAxisRatio(axis);
+
+    const rectangle = await this.find.byCssSelector('rect.background');
+    const yAxisHeight = Number(await rectangle.getAttribute('height'));
+    this.log.debug(`height --------- ${yAxisHeight}`);
+
+    const path = await this.retry.try(
+      async () =>
+        await this.find.byCssSelector(
+          `path[data-label="${dataLabel}"]`,
+          this.defaultFindTimeout * 2
+        )
+    );
+    const data = await path.getAttribute('d');
+    this.log.debug(data);
+    // This area chart data starts with a 'M'ove to a x,y location, followed
+    // by a bunch of 'L'ines from that point to the next.  Those points are
+    // the values we're going to use to calculate the data values we're testing.
+    // So git rid of the one 'M' and split the rest on the 'L's.
+    const tempArray = data
+      .replace('M ', '')
+      .replace('M', '')
+      .replace(/ L /g, 'L')
+      .replace(/ /g, ',')
+      .split('L');
+    const chartSections = tempArray.length / 2;
+    const chartData = [];
+    for (let i = 0; i < chartSections; i++) {
+      chartData[i] = Math.round((yAxisHeight - Number(tempArray[i].split(',')[1])) * yAxisRatio);
+      this.log.debug('chartData[i] =' + chartData[i]);
+    }
+    return chartData;
+  }
 
-    /**
-     * Returns the paths that compose an area chart.
-     * @param dataLabel data-label value
-     */
-    public async getAreaChartPaths(dataLabel: string) {
-      if (await this.isVisTypeXYChart()) {
-        const areas = (await this.getDebugState())?.areas ?? [];
-        const path = areas.find(({ name }) => name === dataLabel)?.path ?? '';
-        return path.split('L');
-      }
+  /**
+   * Returns the paths that compose an area chart.
+   * @param dataLabel data-label value
+   */
+  public async getAreaChartPaths(dataLabel: string) {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const areas = (await this.getEsChartDebugState(xyChartSelector))?.areas ?? [];
+      const path = areas.find(({ name }) => name === dataLabel)?.path ?? '';
+      return path.split('L');
+    }
+
+    const path = await this.retry.try(
+      async () =>
+        await this.find.byCssSelector(
+          `path[data-label="${dataLabel}"]`,
+          this.defaultFindTimeout * 2
+        )
+    );
+    const data = await path.getAttribute('d');
+    this.log.debug(data);
+    // This area chart data starts with a 'M'ove to a x,y location, followed
+    // by a bunch of 'L'ines from that point to the next.  Those points are
+    // the values we're going to use to calculate the data values we're testing.
+    // So git rid of the one 'M' and split the rest on the 'L's.
+    return data.split('L');
+  }
 
-      const path = await retry.try(
-        async () =>
-          await find.byCssSelector(`path[data-label="${dataLabel}"]`, defaultFindTimeout * 2)
-      );
-      const data = await path.getAttribute('d');
-      log.debug(data);
-      // This area chart data starts with a 'M'ove to a x,y location, followed
-      // by a bunch of 'L'ines from that point to the next.  Those points are
-      // the values we're going to use to calculate the data values we're testing.
-      // So git rid of the one 'M' and split the rest on the 'L's.
-      return data.split('L');
-    }
+  /**
+   * Gets the dots and normalizes their height.
+   * @param dataLabel data-label value
+   * @param axis axis value, 'ValueAxis-1' by default
+   */
+  public async getLineChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      // For now lines are rendered as areas to enable stacking
+      const areas = (await this.getEsChartDebugState(xyChartSelector))?.areas ?? [];
+      const lines = areas.map(({ lines: { y1 }, name, color }) => ({ ...y1, name, color }));
+      const points = lines.find(({ name }) => name === dataLabel)?.points ?? [];
+      return points.map(({ y }) => y);
+    }
+
+    // 1). get the range/pixel ratio
+    const yAxisRatio = await this.getChartYAxisRatio(axis);
+    // 2). find and save the y-axis pixel size (the chart height)
+    const rectangle = await this.find.byCssSelector('clipPath rect');
+    const yAxisHeight = Number(await rectangle.getAttribute('height'));
+    // 3). get the visWrapper__chart elements
+    const chartTypes = await this.retry.try(
+      async () =>
+        await this.find.allByCssSelector(
+          `.visWrapper__chart circle[data-label="${dataLabel}"][fill-opacity="1"]`,
+          this.defaultFindTimeout * 2
+        )
+    );
+    // 4). for each chart element, find the green circle, then the cy position
+    const chartData = await Promise.all(
+      chartTypes.map(async (chart) => {
+        const cy = Number(await chart.getAttribute('cy'));
+        // the point_series_options test has data in the billions range and
+        // getting 11 digits of precision with these calculations is very hard
+        return Math.round(Number(((yAxisHeight - cy) * yAxisRatio).toPrecision(6)));
+      })
+    );
+
+    return chartData;
+  }
 
-    /**
-     * Gets the dots and normalizes their height.
-     * @param dataLabel data-label value
-     * @param axis axis value, 'ValueAxis-1' by default
-     */
-    public async getLineChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
-      if (await this.isVisTypeXYChart()) {
-        // For now lines are rendered as areas to enable stacking
-        const areas = (await this.getDebugState())?.areas ?? [];
-        const lines = areas.map(({ lines: { y1 }, name, color }) => ({ ...y1, name, color }));
-        const points = lines.find(({ name }) => name === dataLabel)?.points ?? [];
-        return points.map(({ y }) => y);
-      }
+  /**
+   * Returns bar chart data in pixels
+   * @param dataLabel data-label value
+   * @param axis axis value, 'ValueAxis-1' by default
+   */
+  public async getBarChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const bars = (await this.getEsChartDebugState(xyChartSelector))?.bars ?? [];
+      const values = bars.find(({ name }) => name === dataLabel)?.bars ?? [];
+      return values.map(({ y }) => y);
+    }
+
+    const yAxisRatio = await this.getChartYAxisRatio(axis);
+    const svg = await this.find.byCssSelector('div.chart');
+    const $ = await svg.parseDomContent();
+    const chartData = $(`g > g.series > rect[data-label="${dataLabel}"]`)
+      .toArray()
+      .map((chart) => {
+        const barHeight = Number($(chart).attr('height'));
+        return Math.round(barHeight * yAxisRatio);
+      });
 
-      // 1). get the range/pixel ratio
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-      // 2). find and save the y-axis pixel size (the chart height)
-      const rectangle = await find.byCssSelector('clipPath rect');
-      const yAxisHeight = Number(await rectangle.getAttribute('height'));
-      // 3). get the visWrapper__chart elements
-      const chartTypes = await retry.try(
-        async () =>
-          await find.allByCssSelector(
-            `.visWrapper__chart circle[data-label="${dataLabel}"][fill-opacity="1"]`,
-            defaultFindTimeout * 2
-          )
-      );
-      // 4). for each chart element, find the green circle, then the cy position
-      const chartData = await Promise.all(
-        chartTypes.map(async (chart) => {
-          const cy = Number(await chart.getAttribute('cy'));
-          // the point_series_options test has data in the billions range and
-          // getting 11 digits of precision with these calculations is very hard
-          return Math.round(Number(((yAxisHeight - cy) * yAxisRatio).toPrecision(6)));
-        })
-      );
+    return chartData;
+  }
 
-      return chartData;
-    }
+  /**
+   * Returns the range/pixel ratio
+   * @param axis axis value, 'ValueAxis-1' by default
+   */
+  private async getChartYAxisRatio(axis = 'ValueAxis-1') {
+    // 1). get the maximum chart Y-Axis marker value and Y position
+    const maxYAxisChartMarker = await this.retry.try(
+      async () =>
+        await this.find.byCssSelector(
+          `div.visAxis__splitAxes--y > div > svg > g.${axis} > g:last-of-type.tick`
+        )
+    );
+    const maxYLabel = (await maxYAxisChartMarker.getVisibleText()).replace(/,/g, '');
+    const maxYLabelYPosition = (await maxYAxisChartMarker.getPosition()).y;
+    this.log.debug(`maxYLabel = ${maxYLabel}, maxYLabelYPosition = ${maxYLabelYPosition}`);
+
+    // 2). get the minimum chart Y-Axis marker value and Y position
+    const minYAxisChartMarker = await this.find.byCssSelector(
+      'div.visAxis__column--y.visAxis__column--left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick'
+    );
+    const minYLabel = (await minYAxisChartMarker.getVisibleText()).replace(',', '');
+    const minYLabelYPosition = (await minYAxisChartMarker.getPosition()).y;
+    return (Number(maxYLabel) - Number(minYLabel)) / (minYLabelYPosition - maxYLabelYPosition);
+  }
+
+  public async toggleLegend(show = true) {
+    const isVisTypeXYChart = await this.isNewLibraryChart(xyChartSelector);
+    const isVisTypePieChart = await this.isNewLibraryChart(pieChartSelector);
+    const legendSelector = isVisTypeXYChart || isVisTypePieChart ? '.echLegend' : '.visLegend';
 
-    /**
-     * Returns bar chart data in pixels
-     * @param dataLabel data-label value
-     * @param axis axis value, 'ValueAxis-1' by default
-     */
-    public async getBarChartData(dataLabel = 'Count', axis = 'ValueAxis-1') {
-      if (await this.isVisTypeXYChart()) {
-        const bars = (await this.getDebugState())?.bars ?? [];
-        const values = bars.find(({ name }) => name === dataLabel)?.bars ?? [];
-        return values.map(({ y }) => y);
+    await this.retry.try(async () => {
+      const isVisible = await this.find.existsByCssSelector(legendSelector);
+      if ((show && !isVisible) || (!show && isVisible)) {
+        await this.testSubjects.click('vislibToggleLegend');
       }
+    });
+  }
 
-      const yAxisRatio = await this.getChartYAxisRatio(axis);
-      const svg = await find.byCssSelector('div.chart');
-      const $ = await svg.parseDomContent();
-      const chartData = $(`g > g.series > rect[data-label="${dataLabel}"]`)
-        .toArray()
-        .map((chart) => {
-          const barHeight = Number($(chart).attr('height'));
-          return Math.round(barHeight * yAxisRatio);
-        });
-
-      return chartData;
-    }
+  public async filterLegend(name: string) {
+    await this.toggleLegend();
+    await this.testSubjects.click(`legend-${name}`);
+    const filterIn = await this.testSubjects.find(`legend-${name}-filterIn`);
+    await filterIn.click();
+    await this.waitForVisualizationRenderingStabilized();
+  }
 
-    /**
-     * Returns the range/pixel ratio
-     * @param axis axis value, 'ValueAxis-1' by default
-     */
-    private async getChartYAxisRatio(axis = 'ValueAxis-1') {
-      // 1). get the maximum chart Y-Axis marker value and Y position
-      const maxYAxisChartMarker = await retry.try(
-        async () =>
-          await find.byCssSelector(
-            `div.visAxis__splitAxes--y > div > svg > g.${axis} > g:last-of-type.tick`
-          )
-      );
-      const maxYLabel = (await maxYAxisChartMarker.getVisibleText()).replace(/,/g, '');
-      const maxYLabelYPosition = (await maxYAxisChartMarker.getPosition()).y;
-      log.debug(`maxYLabel = ${maxYLabel}, maxYLabelYPosition = ${maxYLabelYPosition}`);
+  public async doesLegendColorChoiceExist(color: string) {
+    return await this.testSubjects.exists(`visColorPickerColor-${color}`);
+  }
 
-      // 2). get the minimum chart Y-Axis marker value and Y position
-      const minYAxisChartMarker = await find.byCssSelector(
-        'div.visAxis__column--y.visAxis__column--left  > div > div > svg:nth-child(2) > g > g:nth-child(1).tick'
-      );
-      const minYLabel = (await minYAxisChartMarker.getVisibleText()).replace(',', '');
-      const minYLabelYPosition = (await minYAxisChartMarker.getPosition()).y;
-      return (Number(maxYLabel) - Number(minYLabel)) / (minYLabelYPosition - maxYLabelYPosition);
-    }
+  public async selectNewLegendColorChoice(color: string) {
+    await this.testSubjects.click(`visColorPickerColor-${color}`);
+  }
 
-    public async toggleLegend(show = true) {
-      const isVisTypeXYChart = await this.isVisTypeXYChart();
-      const legendSelector = isVisTypeXYChart ? '.echLegend' : '.visLegend';
+  public async doesSelectedLegendColorExist(color: string) {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const items = (await this.getEsChartDebugState(xyChartSelector))?.legend?.items ?? [];
+      return items.some(({ color: c }) => c === color);
+    }
 
-      await retry.try(async () => {
-        const isVisible = await find.existsByCssSelector(legendSelector);
-        if ((show && !isVisible) || (!show && isVisible)) {
-          await testSubjects.click('vislibToggleLegend');
-        }
+    if (await this.isNewLibraryChart(pieChartSelector)) {
+      const slices =
+        (await this.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ?? [];
+      return slices.some(({ color: c }) => {
+        const rgbColor = new Color(color).rgb().toString();
+        return c === rgbColor;
       });
     }
 
-    public async filterLegend(name: string) {
-      await this.toggleLegend();
-      await testSubjects.click(`legend-${name}`);
-      const filterIn = await testSubjects.find(`legend-${name}-filterIn`);
-      await filterIn.click();
-      await this.waitForVisualizationRenderingStabilized();
-    }
+    return await this.testSubjects.exists(`legendSelectedColor-${color}`);
+  }
 
-    public async doesLegendColorChoiceExist(color: string) {
-      return await testSubjects.exists(`visColorPickerColor-${color}`);
+  public async expectError() {
+    if (!this.isNewLibraryChart(xyChartSelector)) {
+      await this.testSubjects.existOrFail('vislibVisualizeError');
     }
+  }
 
-    public async selectNewLegendColorChoice(color: string) {
-      await testSubjects.click(`visColorPickerColor-${color}`);
-    }
+  public async getVisualizationRenderingCount() {
+    const visualizationLoader = await this.testSubjects.find('visualizationLoader');
+    const renderingCount = await visualizationLoader.getAttribute('data-rendering-count');
+    return Number(renderingCount);
+  }
 
-    public async doesSelectedLegendColorExist(color: string) {
-      if (await this.isVisTypeXYChart()) {
-        const items = (await this.getDebugState())?.legend?.items ?? [];
-        return items.some(({ color: c }) => c === color);
+  public async waitForRenderingCount(minimumCount = 1) {
+    await this.retry.waitFor(
+      `rendering count to be greater than or equal to [${minimumCount}]`,
+      async () => {
+        const currentRenderingCount = await this.getVisualizationRenderingCount();
+        this.log.debug(`-- currentRenderingCount=${currentRenderingCount}`);
+        this.log.debug(`-- expectedCount=${minimumCount}`);
+        return currentRenderingCount >= minimumCount;
       }
+    );
+  }
 
-      return await testSubjects.exists(`legendSelectedColor-${color}`);
-    }
+  public async waitForVisualizationRenderingStabilized() {
+    // assuming rendering is done when data-rendering-count is constant within 1000 ms
+    await this.retry.waitFor('rendering count to stabilize', async () => {
+      const firstCount = await this.getVisualizationRenderingCount();
+      this.log.debug(`-- firstCount=${firstCount}`);
 
-    public async expectError() {
-      if (!this.isVisTypeXYChart()) {
-        await testSubjects.existOrFail('vislibVisualizeError');
-      }
-    }
+      await this.common.sleep(2000);
 
-    public async getVisualizationRenderingCount() {
-      const visualizationLoader = await testSubjects.find('visualizationLoader');
-      const renderingCount = await visualizationLoader.getAttribute('data-rendering-count');
-      return Number(renderingCount);
-    }
+      const secondCount = await this.getVisualizationRenderingCount();
+      this.log.debug(`-- secondCount=${secondCount}`);
 
-    public async waitForRenderingCount(minimumCount = 1) {
-      await retry.waitFor(
-        `rendering count to be greater than or equal to [${minimumCount}]`,
-        async () => {
-          const currentRenderingCount = await this.getVisualizationRenderingCount();
-          log.debug(`-- currentRenderingCount=${currentRenderingCount}`);
-          log.debug(`-- expectedCount=${minimumCount}`);
-          return currentRenderingCount >= minimumCount;
-        }
-      );
-    }
-
-    public async waitForVisualizationRenderingStabilized() {
-      // assuming rendering is done when data-rendering-count is constant within 1000 ms
-      await retry.waitFor('rendering count to stabilize', async () => {
-        const firstCount = await this.getVisualizationRenderingCount();
-        log.debug(`-- firstCount=${firstCount}`);
-
-        await common.sleep(2000);
+      return firstCount === secondCount;
+    });
+  }
 
-        const secondCount = await this.getVisualizationRenderingCount();
-        log.debug(`-- secondCount=${secondCount}`);
+  public async waitForVisualization() {
+    await this.waitForVisualizationRenderingStabilized();
 
-        return firstCount === secondCount;
-      });
+    if (!(await this.isNewLibraryChart(xyChartSelector))) {
+      await this.find.byCssSelector('.visualization');
     }
+  }
 
-    public async waitForVisualization() {
-      await this.waitForVisualizationRenderingStabilized();
-
-      if (!(await this.isVisTypeXYChart())) {
-        await find.byCssSelector('.visualization');
-      }
+  public async getLegendEntries() {
+    const isVisTypeXYChart = await this.isNewLibraryChart(xyChartSelector);
+    const isVisTypePieChart = await this.isNewLibraryChart(pieChartSelector);
+    if (isVisTypeXYChart) {
+      const items = (await this.getEsChartDebugState(xyChartSelector))?.legend?.items ?? [];
+      return items.map(({ name }) => name);
     }
 
-    public async getLegendEntries() {
-      if (await this.isVisTypeXYChart()) {
-        const items = (await this.getDebugState())?.legend?.items ?? [];
-        return items.map(({ name }) => name);
-      }
-
-      const legendEntries = await find.allByCssSelector(
-        '.visLegend__button',
-        defaultFindTimeout * 2
-      );
-      return await Promise.all(
-        legendEntries.map(async (chart) => await chart.getAttribute('data-label'))
-      );
+    if (isVisTypePieChart) {
+      const slices =
+        (await this.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ?? [];
+      return slices.map(({ name }) => name);
     }
 
-    public async openLegendOptionColors(name: string, chartSelector = elasticChartSelector) {
-      await this.waitForVisualizationRenderingStabilized();
-      await retry.try(async () => {
-        if (await this.isVisTypeXYChart()) {
-          const chart = await find.byCssSelector(chartSelector);
-          const legendItemColor = await chart.findByCssSelector(
-            `[data-ech-series-name="${name}"] .echLegendItem__color`
-          );
-          legendItemColor.click();
-        } else {
-          // This click has been flaky in opening the legend, hence the retry.  See
-          // https://github.com/elastic/kibana/issues/17468
-          await testSubjects.click(`legend-${name}`);
-        }
-
-        await this.waitForVisualizationRenderingStabilized();
-        // arbitrary color chosen, any available would do
-        const arbitraryColor = (await this.isVisTypeXYChart()) ? '#d36086' : '#EF843C';
-        const isOpen = await this.doesLegendColorChoiceExist(arbitraryColor);
-        if (!isOpen) {
-          throw new Error('legend color selector not open');
-        }
-      });
-    }
+    const legendEntries = await this.find.allByCssSelector(
+      '.visLegend__button',
+      this.defaultFindTimeout * 2
+    );
+    return await Promise.all(
+      legendEntries.map(async (chart) => await chart.getAttribute('data-label'))
+    );
+  }
 
-    public async filterOnTableCell(columnIndex: number, rowIndex: number) {
-      await retry.try(async () => {
-        const cell = await dataGrid.getCellElement(rowIndex, columnIndex);
-        await cell.click();
-        const filterBtn = await testSubjects.findDescendant(
-          'tbvChartCell__filterForCellValue',
-          cell
+  public async openLegendOptionColors(name: string, chartSelector: string) {
+    await this.waitForVisualizationRenderingStabilized();
+    await this.retry.try(async () => {
+      if (
+        (await this.isNewLibraryChart(xyChartSelector)) ||
+        (await this.isNewLibraryChart(pieChartSelector))
+      ) {
+        const chart = await this.find.byCssSelector(chartSelector);
+        const legendItemColor = await chart.findByCssSelector(
+          `[data-ech-series-name="${name}"] .echLegendItem__color`
         );
-        await common.sleep(2000);
-        filterBtn.click();
-      });
-    }
+        legendItemColor.click();
+      } else {
+        // This click has been flaky in opening the legend, hence the this.retry.  See
+        // https://github.com/elastic/kibana/issues/17468
+        await this.testSubjects.click(`legend-${name}`);
+      }
 
-    public async getMarkdownText() {
-      const markdownContainer = await testSubjects.find('markdownBody');
-      return markdownContainer.getVisibleText();
-    }
+      await this.waitForVisualizationRenderingStabilized();
+      // arbitrary color chosen, any available would do
+      const arbitraryColor = (await this.isNewLibraryChart(xyChartSelector))
+        ? '#d36086'
+        : '#EF843C';
+      const isOpen = await this.doesLegendColorChoiceExist(arbitraryColor);
+      if (!isOpen) {
+        throw new Error('legend color selector not open');
+      }
+    });
+  }
 
-    public async getMarkdownBodyDescendentText(selector: string) {
-      const markdownContainer = await testSubjects.find('markdownBody');
-      const element = await find.descendantDisplayedByCssSelector(selector, markdownContainer);
-      return element.getVisibleText();
-    }
+  public async filterOnTableCell(columnIndex: number, rowIndex: number) {
+    await this.retry.try(async () => {
+      const cell = await this.dataGrid.getCellElement(rowIndex, columnIndex);
+      await cell.click();
+      const filterBtn = await this.testSubjects.findDescendant(
+        'tbvChartCell__filterForCellValue',
+        cell
+      );
+      await this.common.sleep(2000);
+      filterBtn.click();
+    });
+  }
 
-    // Table visualization
+  public async getMarkdownText() {
+    const markdownContainer = await this.testSubjects.find('markdownBody');
+    return markdownContainer.getVisibleText();
+  }
 
-    public async getTableVisNoResult() {
-      return await testSubjects.find('tbvChartContainer>visNoResult');
-    }
+  public async getMarkdownBodyDescendentText(selector: string) {
+    const markdownContainer = await this.testSubjects.find('markdownBody');
+    const element = await this.find.descendantDisplayedByCssSelector(selector, markdownContainer);
+    return element.getVisibleText();
+  }
 
-    /**
-     * This function returns the text displayed in the Table Vis header
-     */
-    public async getTableVisHeader() {
-      return await testSubjects.getVisibleText('dataGridHeader');
-    }
+  // Table visualization
 
-    public async getFieldLinkInVisTable(fieldName: string, rowIndex: number = 1) {
-      const headers = await dataGrid.getHeaders();
-      const fieldColumnIndex = headers.indexOf(fieldName);
-      const cell = await dataGrid.getCellElement(rowIndex, fieldColumnIndex + 1);
-      return await cell.findByTagName('a');
-    }
+  public async getTableVisNoResult() {
+    return await this.testSubjects.find('tbvChartContainer>visNoResult');
+  }
 
-    /**
-     * Function to retrieve data from within a table visualization.
-     */
-    public async getTableVisContent({ stripEmptyRows = true } = {}) {
-      return await retry.try(async () => {
-        const container = await testSubjects.find('tbvChart');
-        const allTables = await testSubjects.findAllDescendant('dataGridWrapper', container);
-
-        if (allTables.length === 0) {
-          return [];
-        }
-
-        const allData = await Promise.all(
-          allTables.map(async (t) => {
-            let data = await dataGrid.getDataFromElement(t, 'tbvChartCellContent');
-            if (stripEmptyRows) {
-              data = data.filter(
-                (row) => row.length > 0 && row.some((cell) => cell.trim().length > 0)
-              );
-            }
-            return data;
-          })
-        );
+  /**
+   * This function returns the text displayed in the Table Vis header
+   */
+  public async getTableVisHeader() {
+    return await this.testSubjects.getVisibleText('dataGridHeader');
+  }
 
-        if (allTables.length === 1) {
-          // If there was only one table we return only the data for that table
-          // This prevents an unnecessary array around that single table, which
-          // is the case we have in most tests.
-          return allData[0];
-        }
+  public async getFieldLinkInVisTable(fieldName: string, rowIndex: number = 1) {
+    const headers = await this.dataGrid.getHeaders();
+    const fieldColumnIndex = headers.indexOf(fieldName);
+    const cell = await this.dataGrid.getCellElement(rowIndex, fieldColumnIndex + 1);
+    return await cell.findByTagName('a');
+  }
 
-        return allData;
-      });
-    }
+  /**
+   * Function to retrieve data from within a table visualization.
+   */
+  public async getTableVisContent({ stripEmptyRows = true } = {}) {
+    return await this.retry.try(async () => {
+      const container = await this.testSubjects.find('tbvChart');
+      const allTables = await this.testSubjects.findAllDescendant('dataGridWrapper', container);
 
-    public async getMetric() {
-      const elements = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .mtrVis__container'
-      );
-      const values = await Promise.all(
-        elements.map(async (element) => {
-          const text = await element.getVisibleText();
-          return text;
-        })
-      );
-      return values
-        .filter((item) => item.length > 0)
-        .reduce((arr: string[], item) => arr.concat(item.split('\n')), []);
-    }
+      if (allTables.length === 0) {
+        return [];
+      }
 
-    public async getGaugeValue() {
-      const elements = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .chart svg text'
-      );
-      const values = await Promise.all(
-        elements.map(async (element) => {
-          const text = await element.getVisibleText();
-          return text;
+      const allData = await Promise.all(
+        allTables.map(async (t) => {
+          let data = await this.dataGrid.getDataFromElement(t, 'tbvChartCellContent');
+          if (stripEmptyRows) {
+            data = data.filter(
+              (row) => row.length > 0 && row.some((cell) => cell.trim().length > 0)
+            );
+          }
+          return data;
         })
       );
-      return values.filter((item) => item.length > 0);
-    }
 
-    public async getRightValueAxesCount() {
-      if (await this.isVisTypeXYChart()) {
-        const yAxes = (await this.getDebugState())?.axes?.y ?? [];
-        return yAxes.filter(({ position }) => position === Position.Right).length;
+      if (allTables.length === 1) {
+        // If there was only one table we return only the data for that table
+        // This prevents an unnecessary array around that single table, which
+        // is the case we have in most tests.
+        return allData[0];
       }
-      const axes = await find.allByCssSelector('.visAxis__column--right g.axis');
-      return axes.length;
-    }
 
-    public async clickOnGaugeByLabel(label: string) {
-      const gauge = await testSubjects.find(`visGauge__meter--${label}`);
-      const gaugeSize = await gauge.getSize();
-      const gaugeHeight = gaugeSize.height;
-      // To click at Gauge arc instead of the center of SVG element
-      // the offset for a click is calculated as half arc height without 1 pixel
-      const yOffset = 1 - Math.floor(gaugeHeight / 2);
+      return allData;
+    });
+  }
 
-      await gauge.clickMouseButton({ xOffset: 0, yOffset });
-    }
+  public async getMetric() {
+    const elements = await this.find.allByCssSelector(
+      '[data-test-subj="visualizationLoader"] .mtrVis__container'
+    );
+    const values = await Promise.all(
+      elements.map(async (element) => {
+        const text = await element.getVisibleText();
+        return text;
+      })
+    );
+    return values
+      .filter((item) => item.length > 0)
+      .reduce((arr: string[], item) => arr.concat(item.split('\n')), []);
+  }
 
-    public async getHistogramSeriesCount() {
-      if (await this.isVisTypeXYChart()) {
-        const bars = (await this.getDebugState())?.bars ?? [];
-        return bars.filter(({ visible }) => visible).length;
-      }
+  public async getGaugeValue() {
+    const elements = await this.find.allByCssSelector(
+      '[data-test-subj="visualizationLoader"] .chart svg text'
+    );
+    const values = await Promise.all(
+      elements.map(async (element) => {
+        const text = await element.getVisibleText();
+        return text;
+      })
+    );
+    return values.filter((item) => item.length > 0);
+  }
 
-      const series = await find.allByCssSelector('.series.histogram');
-      return series.length;
+  public async getRightValueAxesCount() {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const yAxes = (await this.getEsChartDebugState(xyChartSelector))?.axes?.y ?? [];
+      return yAxes.filter(({ position }) => position === Position.Right).length;
     }
+    const axes = await this.find.allByCssSelector('.visAxis__column--right g.axis');
+    return axes.length;
+  }
 
-    public async getGridLines(): Promise<Array<{ x: number; y: number }>> {
-      if (await this.isVisTypeXYChart()) {
-        const { x, y } = (await this.getDebugState())?.axes ?? { x: [], y: [] };
-        return [...x, ...y].flatMap(({ gridlines }) => gridlines);
-      }
+  public async clickOnGaugeByLabel(label: string) {
+    const gauge = await this.testSubjects.find(`visGauge__meter--${label}`);
+    const gaugeSize = await gauge.getSize();
+    const gaugeHeight = gaugeSize.height;
+    // To click at Gauge arc instead of the center of SVG element
+    // the offset for a click is calculated as half arc height without 1 pixel
+    const yOffset = 1 - Math.floor(gaugeHeight / 2);
 
-      const grid = await find.byCssSelector('g.grid');
-      const $ = await grid.parseDomContent();
-      return $('path')
-        .toArray()
-        .map((line) => {
-          const dAttribute = $(line).attr('d');
-          const firstPoint = dAttribute.split('L')[0].replace('M', '').split(',');
-          return {
-            x: parseFloat(firstPoint[0]),
-            y: parseFloat(firstPoint[1]),
-          };
-        });
+    await gauge.clickMouseButton({ xOffset: 0, yOffset });
+  }
+
+  public async getHistogramSeriesCount() {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const bars = (await this.getEsChartDebugState(xyChartSelector))?.bars ?? [];
+      return bars.filter(({ visible }) => visible).length;
     }
 
-    public async getChartValues() {
-      if (await this.isVisTypeXYChart()) {
-        const barSeries = (await this.getDebugState())?.bars ?? [];
-        return barSeries.filter(({ visible }) => visible).flatMap((bars) => bars.labels);
-      }
+    const series = await this.find.allByCssSelector('.series.histogram');
+    return series.length;
+  }
 
-      const elements = await find.allByCssSelector('.series.histogram text');
-      const values = await Promise.all(
-        elements.map(async (element) => {
-          const text = await element.getVisibleText();
-          return text;
-        })
-      );
-      return values;
-    }
+  public async getGridLines(): Promise<Array<{ x: number; y: number }>> {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const { x, y } = (await this.getEsChartDebugState(xyChartSelector))?.axes ?? {
+        x: [],
+        y: [],
+      };
+      return [...x, ...y].flatMap(({ gridlines }) => gridlines);
+    }
+
+    const grid = await this.find.byCssSelector('g.grid');
+    const $ = await grid.parseDomContent();
+    return $('path')
+      .toArray()
+      .map((line) => {
+        const dAttribute = $(line).attr('d');
+        const firstPoint = dAttribute.split('L')[0].replace('M', '').split(',');
+        return {
+          x: parseFloat(firstPoint[0]),
+          y: parseFloat(firstPoint[1]),
+        };
+      });
   }
 
-  return new VisualizeChart();
+  public async getChartValues() {
+    if (await this.isNewLibraryChart(xyChartSelector)) {
+      const barSeries = (await this.getEsChartDebugState(xyChartSelector))?.bars ?? [];
+      return barSeries.filter(({ visible }) => visible).flatMap((bars) => bars.labels);
+    }
+
+    const elements = await this.find.allByCssSelector('.series.histogram text');
+    const values = await Promise.all(
+      elements.map(async (element) => {
+        const text = await element.getVisibleText();
+        return text;
+      })
+    );
+    return values;
+  }
 }
diff --git a/test/functional/page_objects/visualize_editor_page.ts b/test/functional/page_objects/visualize_editor_page.ts
index 59e93bd1f5700..ab458c2c0fdc1 100644
--- a/test/functional/page_objects/visualize_editor_page.ts
+++ b/test/functional/page_objects/visualize_editor_page.ts
@@ -6,528 +6,530 @@
  * Side Public License, v 1.
  */
 
-import expect from '@kbn/expect/expect.js';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function VisualizeEditorPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const find = getService('find');
-  const log = getService('log');
-  const retry = getService('retry');
-  const browser = getService('browser');
-  const testSubjects = getService('testSubjects');
-  const comboBox = getService('comboBox');
-  const elasticChart = getService('elasticChart');
-  const { common, header, visChart } = getPageObjects(['common', 'header', 'visChart']);
-
-  interface IntervalOptions {
-    type?: 'default' | 'numeric' | 'custom';
-    aggNth?: number;
-    append?: boolean;
-  }
-
-  class VisualizeEditorPage {
-    public async clickDataTab() {
-      await testSubjects.click('visEditorTab__data');
-    }
+import expect from '@kbn/expect';
+import { FtrService } from '../ftr_provider_context';
 
-    public async clickOptionsTab() {
-      await testSubjects.click('visEditorTab__options');
-    }
+interface IntervalOptions {
+  type?: 'default' | 'numeric' | 'custom';
+  aggNth?: number;
+  append?: boolean;
+}
 
-    public async clickMetricsAndAxes() {
-      await testSubjects.click('visEditorTab__advanced');
-    }
+export class VisualizeEditorPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly comboBox = this.ctx.getService('comboBox');
+  private readonly elasticChart = this.ctx.getService('elasticChart');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly visChart = this.ctx.getPageObject('visChart');
+
+  public async clickDataTab() {
+    await this.testSubjects.click('visEditorTab__data');
+  }
 
-    public async clickVisEditorTab(tabName: string) {
-      await testSubjects.click(`visEditorTab__${tabName}`);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async clickOptionsTab() {
+    await this.testSubjects.click('visEditorTab__options');
+  }
 
-    public async addInputControl(type?: string) {
-      if (type) {
-        const selectInput = await testSubjects.find('selectControlType');
-        await selectInput.type(type);
-      }
-      await testSubjects.click('inputControlEditorAddBtn');
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async clickMetricsAndAxes() {
+    await this.testSubjects.click('visEditorTab__advanced');
+  }
 
-    public async inputControlClear() {
-      await testSubjects.click('inputControlClearBtn');
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async clickVisEditorTab(tabName: string) {
+    await this.testSubjects.click(`visEditorTab__${tabName}`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async inputControlSubmit() {
-      await testSubjects.clickWhenNotDisabled('inputControlSubmitBtn');
-      await visChart.waitForVisualizationRenderingStabilized();
+  public async addInputControl(type?: string) {
+    if (type) {
+      const selectInput = await this.testSubjects.find('selectControlType');
+      await selectInput.type(type);
     }
+    await this.testSubjects.click('inputControlEditorAddBtn');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async clickGo() {
-      if (await visChart.isNewChartsLibraryEnabled()) {
-        await elasticChart.setNewChartUiDebugFlag();
-      }
+  public async inputControlClear() {
+    await this.testSubjects.click('inputControlClearBtn');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-      const prevRenderingCount = await visChart.getVisualizationRenderingCount();
-      log.debug(`Before Rendering count ${prevRenderingCount}`);
-      await testSubjects.clickWhenNotDisabled('visualizeEditorRenderButton');
-      await visChart.waitForRenderingCount(prevRenderingCount + 1);
-    }
+  public async inputControlSubmit() {
+    await this.testSubjects.clickWhenNotDisabled('inputControlSubmitBtn');
+    await this.visChart.waitForVisualizationRenderingStabilized();
+  }
 
-    public async removeDimension(aggNth: number) {
-      await testSubjects.click(`visEditorAggAccordion${aggNth} > removeDimensionBtn`);
+  public async clickGo() {
+    if (await this.visChart.isNewChartsLibraryEnabled()) {
+      await this.elasticChart.setNewChartUiDebugFlag();
     }
 
-    public async setFilterParams(aggNth: number, indexPattern: string, field: string) {
-      await comboBox.set(`indexPatternSelect-${aggNth}`, indexPattern);
-      await comboBox.set(`fieldSelect-${aggNth}`, field);
-    }
+    const prevRenderingCount = await this.visChart.getVisualizationRenderingCount();
+    this.log.debug(`Before Rendering count ${prevRenderingCount}`);
+    await this.testSubjects.clickWhenNotDisabled('visualizeEditorRenderButton');
+    await this.visChart.waitForRenderingCount(prevRenderingCount + 1);
+  }
 
-    public async setFilterRange(aggNth: number, min: string, max: string) {
-      const control = await testSubjects.find(`inputControl${aggNth}`);
-      const inputMin = await control.findByCssSelector('[name$="minValue"]');
-      await inputMin.type(min);
-      const inputMax = await control.findByCssSelector('[name$="maxValue"]');
-      await inputMax.type(max);
-    }
+  public async removeDimension(aggNth: number) {
+    await this.testSubjects.click(`visEditorAggAccordion${aggNth} > removeDimensionBtn`);
+  }
 
-    public async clickSplitDirection(direction: string) {
-      const radioBtn = await find.byCssSelector(`[data-test-subj="visEditorSplitBy-${direction}"]`);
-      await radioBtn.click();
-    }
+  public async setFilterParams(aggNth: number, indexPattern: string, field: string) {
+    await this.comboBox.set(`indexPatternSelect-${aggNth}`, indexPattern);
+    await this.comboBox.set(`fieldSelect-${aggNth}`, field);
+  }
 
-    public async clickAddDateRange() {
-      await testSubjects.click(`visEditorAddDateRange`);
-    }
+  public async setFilterRange(aggNth: number, min: string, max: string) {
+    const control = await this.testSubjects.find(`inputControl${aggNth}`);
+    const inputMin = await control.findByCssSelector('[name$="minValue"]');
+    await inputMin.type(min);
+    const inputMax = await control.findByCssSelector('[name$="maxValue"]');
+    await inputMax.type(max);
+  }
 
-    public async setDateRangeByIndex(index: string, from: string, to: string) {
-      await testSubjects.setValue(`visEditorDateRange${index}__from`, from);
-      await testSubjects.setValue(`visEditorDateRange${index}__to`, to);
-    }
+  public async clickSplitDirection(direction: string) {
+    const radioBtn = await this.find.byCssSelector(
+      `[data-test-subj="visEditorSplitBy-${direction}"]`
+    );
+    await radioBtn.click();
+  }
 
-    /**
-     * Adds new bucket
-     * @param bucketName bucket name, like 'X-axis', 'Split rows', 'Split series'
-     * @param type aggregation type, like 'buckets', 'metrics'
-     */
-    public async clickBucket(bucketName: string, type = 'buckets') {
-      await testSubjects.click(`visEditorAdd_${type}`);
-      await testSubjects.click(`visEditorAdd_${type}_${bucketName}`);
-    }
+  public async clickAddDateRange() {
+    await this.testSubjects.click(`visEditorAddDateRange`);
+  }
 
-    public async clickEnableCustomRanges() {
-      await testSubjects.click('heatmapUseCustomRanges');
-    }
+  public async setDateRangeByIndex(index: string, from: string, to: string) {
+    await this.testSubjects.setValue(`visEditorDateRange${index}__from`, from);
+    await this.testSubjects.setValue(`visEditorDateRange${index}__to`, to);
+  }
 
-    public async clickAddRange() {
-      await testSubjects.click(`heatmapColorRange__addRangeButton`);
-    }
+  /**
+   * Adds new bucket
+   * @param bucketName bucket name, like 'X-axis', 'Split rows', 'Split series'
+   * @param type aggregation type, like 'buckets', 'metrics'
+   */
+  public async clickBucket(bucketName: string, type = 'buckets') {
+    await this.testSubjects.click(`visEditorAdd_${type}`);
+    await this.testSubjects.click(`visEditorAdd_${type}_${bucketName}`);
+  }
 
-    public async setCustomRangeByIndex(index: string | number, from: string, to: string) {
-      await testSubjects.setValue(`heatmapColorRange${index}__from`, from);
-      await testSubjects.setValue(`heatmapColorRange${index}__to`, to);
-    }
+  public async clickEnableCustomRanges() {
+    await this.testSubjects.click('heatmapUseCustomRanges');
+  }
 
-    public async changeHeatmapColorNumbers(value = 6) {
-      await testSubjects.setValue('heatmapColorsNumber', `${value}`);
-    }
+  public async clickAddRange() {
+    await this.testSubjects.click(`heatmapColorRange__addRangeButton`);
+  }
 
-    public async getBucketErrorMessage() {
-      const error = await find.byCssSelector(
-        '[data-test-subj="bucketsAggGroup"] [data-test-subj="defaultEditorAggSelect"] + .euiFormErrorText'
-      );
-      const errorMessage = await error.getAttribute('innerText');
-      log.debug(errorMessage);
-      return errorMessage;
-    }
+  public async setCustomRangeByIndex(index: string | number, from: string, to: string) {
+    await this.testSubjects.setValue(`heatmapColorRange${index}__from`, from);
+    await this.testSubjects.setValue(`heatmapColorRange${index}__to`, to);
+  }
 
-    public async addNewFilterAggregation() {
-      await testSubjects.click('visEditorAddFilterButton');
-    }
+  public async changeHeatmapColorNumbers(value = 6) {
+    await this.testSubjects.setValue('heatmapColorsNumber', `${value}`);
+  }
 
-    public async selectField(
-      fieldValue: string,
-      groupName = 'buckets',
-      isChildAggregation = false
-    ) {
-      log.debug(`selectField ${fieldValue}`);
-      const selector = `
-          [data-test-subj="${groupName}AggGroup"]
-          [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
-          [data-test-subj="visAggEditorParams"]
-          ${isChildAggregation ? '.visEditorAgg__subAgg' : ''}
-          [data-test-subj="visDefaultEditorField"]
-        `;
-      const fieldEl = await find.byCssSelector(selector);
-      await comboBox.setElement(fieldEl, fieldValue);
-    }
+  public async getBucketErrorMessage() {
+    const error = await this.find.byCssSelector(
+      '[data-test-subj="bucketsAggGroup"] [data-test-subj="defaultEditorAggSelect"] + .euiFormErrorText'
+    );
+    const errorMessage = await error.getAttribute('innerText');
+    this.log.debug(errorMessage);
+    return errorMessage;
+  }
 
-    public async selectOrderByMetric(aggNth: number, metric: string) {
-      const sortSelect = await testSubjects.find(`visEditorOrderBy${aggNth}`);
-      const sortMetric = await sortSelect.findByCssSelector(`option[value="${metric}"]`);
-      await sortMetric.click();
-    }
+  public async addNewFilterAggregation() {
+    await this.testSubjects.click('visEditorAddFilterButton');
+  }
 
-    public async selectCustomSortMetric(aggNth: number, metric: string, field: string) {
-      await this.selectOrderByMetric(aggNth, 'custom');
-      await this.selectAggregation(metric, 'buckets', true);
-      await this.selectField(field, 'buckets', true);
-    }
+  public async selectField(fieldValue: string, groupName = 'buckets', isChildAggregation = false) {
+    this.log.debug(`selectField ${fieldValue}`);
+    const selector = `
+        [data-test-subj="${groupName}AggGroup"]
+        [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
+        [data-test-subj="visAggEditorParams"]
+        ${isChildAggregation ? '.visEditorAgg__subAgg' : ''}
+        [data-test-subj="visDefaultEditorField"]
+      `;
+    const fieldEl = await this.find.byCssSelector(selector);
+    await this.comboBox.setElement(fieldEl, fieldValue);
+  }
 
-    public async selectAggregation(
-      aggValue: string,
-      groupName = 'buckets',
-      isChildAggregation = false
-    ) {
-      const comboBoxElement = await find.byCssSelector(`
-          [data-test-subj="${groupName}AggGroup"]
-          [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
-          ${isChildAggregation ? '.visEditorAgg__subAgg' : ''}
-          [data-test-subj="defaultEditorAggSelect"]
-        `);
-
-      await comboBox.setElement(comboBoxElement, aggValue);
-      await common.sleep(500);
-    }
+  public async selectOrderByMetric(aggNth: number, metric: string) {
+    const sortSelect = await this.testSubjects.find(`visEditorOrderBy${aggNth}`);
+    const sortMetric = await sortSelect.findByCssSelector(`option[value="${metric}"]`);
+    await sortMetric.click();
+  }
 
-    /**
-     * Set the test for a filter aggregation.
-     * @param {*} filterValue the string value of the filter
-     * @param {*} filterIndex used when multiple filters are configured on the same aggregation
-     * @param {*} aggregationId the ID if the aggregation. On Tests, it start at from 2
-     */
-    public async setFilterAggregationValue(
-      filterValue: string,
-      filterIndex = 0,
-      aggregationId = 2
-    ) {
-      await testSubjects.setValue(
-        `visEditorFilterInput_${aggregationId}_${filterIndex}`,
-        filterValue
-      );
-    }
+  public async selectCustomSortMetric(aggNth: number, metric: string, field: string) {
+    await this.selectOrderByMetric(aggNth, 'custom');
+    await this.selectAggregation(metric, 'buckets', true);
+    await this.selectField(field, 'buckets', true);
+  }
 
-    public async setValue(newValue: string) {
-      const input = await find.byCssSelector('[data-test-subj="visEditorPercentileRanks"] input');
-      await input.clearValue();
-      await input.type(newValue);
-    }
+  public async selectAggregation(
+    aggValue: string,
+    groupName = 'buckets',
+    isChildAggregation = false
+  ) {
+    const comboBoxElement = await this.find.byCssSelector(`
+        [data-test-subj="${groupName}AggGroup"]
+        [data-test-subj^="visEditorAggAccordion"].euiAccordion-isOpen
+        ${isChildAggregation ? '.visEditorAgg__subAgg' : ''}
+        [data-test-subj="defaultEditorAggSelect"]
+      `);
+
+    await this.comboBox.setElement(comboBoxElement, aggValue);
+    await this.common.sleep(500);
+  }
 
-    public async clickEditorSidebarCollapse() {
-      await testSubjects.click('collapseSideBarButton');
-    }
+  /**
+   * Set the test for a filter aggregation.
+   * @param {*} filterValue the string value of the filter
+   * @param {*} filterIndex used when multiple filters are configured on the same aggregation
+   * @param {*} aggregationId the ID if the aggregation. On Tests, it start at from 2
+   */
+  public async setFilterAggregationValue(filterValue: string, filterIndex = 0, aggregationId = 2) {
+    await this.testSubjects.setValue(
+      `visEditorFilterInput_${aggregationId}_${filterIndex}`,
+      filterValue
+    );
+  }
 
-    public async clickDropPartialBuckets() {
-      await testSubjects.click('dropPartialBucketsCheckbox');
-    }
+  public async setValue(newValue: string) {
+    const input = await this.find.byCssSelector(
+      '[data-test-subj="visEditorPercentileRanks"] input'
+    );
+    await input.clearValue();
+    await input.type(newValue);
+  }
 
-    public async expectMarkdownTextArea() {
-      await testSubjects.existOrFail('markdownTextarea');
-    }
+  public async clickEditorSidebarCollapse() {
+    await this.testSubjects.click('collapseSideBarButton');
+  }
 
-    public async setMarkdownTxt(markdownTxt: string) {
-      const input = await testSubjects.find('markdownTextarea');
-      await input.clearValue();
-      await input.type(markdownTxt);
-    }
+  public async clickDropPartialBuckets() {
+    await this.testSubjects.click('dropPartialBucketsCheckbox');
+  }
 
-    public async isSwitchChecked(selector: string) {
-      const checkbox = await testSubjects.find(selector);
-      const isChecked = await checkbox.getAttribute('aria-checked');
-      return isChecked === 'true';
-    }
+  public async expectMarkdownTextArea() {
+    await this.testSubjects.existOrFail('markdownTextarea');
+  }
 
-    public async checkSwitch(selector: string) {
-      const isChecked = await this.isSwitchChecked(selector);
-      if (!isChecked) {
-        log.debug(`checking switch ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
+  public async setMarkdownTxt(markdownTxt: string) {
+    const input = await this.testSubjects.find('markdownTextarea');
+    await input.clearValue();
+    await input.type(markdownTxt);
+  }
 
-    public async uncheckSwitch(selector: string) {
-      const isChecked = await this.isSwitchChecked(selector);
-      if (isChecked) {
-        log.debug(`unchecking switch ${selector}`);
-        await testSubjects.click(selector);
-      }
-    }
+  public async isSwitchChecked(selector: string) {
+    const checkbox = await this.testSubjects.find(selector);
+    const isChecked = await checkbox.getAttribute('aria-checked');
+    return isChecked === 'true';
+  }
 
-    public async setIsFilteredByCollarCheckbox(value = true) {
-      await retry.try(async () => {
-        const isChecked = await this.isSwitchChecked('isFilteredByCollarCheckbox');
-        if (isChecked !== value) {
-          await testSubjects.click('isFilteredByCollarCheckbox');
-          throw new Error('isFilteredByCollar not set correctly');
-        }
-      });
+  public async checkSwitch(selector: string) {
+    const isChecked = await this.isSwitchChecked(selector);
+    if (!isChecked) {
+      this.log.debug(`checking switch ${selector}`);
+      await this.testSubjects.click(selector);
     }
+  }
 
-    public async setCustomLabel(label: string, index: number | string = 1) {
-      const customLabel = await testSubjects.find(`visEditorStringInput${index}customLabel`);
-      customLabel.type(label);
+  public async uncheckSwitch(selector: string) {
+    const isChecked = await this.isSwitchChecked(selector);
+    if (isChecked) {
+      this.log.debug(`unchecking switch ${selector}`);
+      await this.testSubjects.click(selector);
     }
+  }
 
-    public async selectYAxisAggregation(agg: string, field: string, label: string, index = 1) {
-      // index starts on the first "count" metric at 1
-      // Each new metric or aggregation added to a visualization gets the next index.
-      // So to modify a metric or aggregation tests need to keep track of the
-      // order they are added.
-      await this.toggleOpenEditor(index);
+  public async setIsFilteredByCollarCheckbox(value = true) {
+    await this.retry.try(async () => {
+      const isChecked = await this.isSwitchChecked('isFilteredByCollarCheckbox');
+      if (isChecked !== value) {
+        await this.testSubjects.click('isFilteredByCollarCheckbox');
+        throw new Error('isFilteredByCollar not set correctly');
+      }
+    });
+  }
 
-      // select our agg
-      const aggSelect = await find.byCssSelector(
-        `#visEditorAggAccordion${index} [data-test-subj="defaultEditorAggSelect"]`
-      );
-      await comboBox.setElement(aggSelect, agg);
+  public async setCustomLabel(label: string, index: number | string = 1) {
+    const customLabel = await this.testSubjects.find(`visEditorStringInput${index}customLabel`);
+    customLabel.type(label);
+  }
 
-      const fieldSelect = await find.byCssSelector(
-        `#visEditorAggAccordion${index} [data-test-subj="visDefaultEditorField"]`
-      );
-      // select our field
-      await comboBox.setElement(fieldSelect, field);
-      // enter custom label
-      await this.setCustomLabel(label, index);
-    }
+  public async selectYAxisAggregation(agg: string, field: string, label: string, index = 1) {
+    // index starts on the first "count" metric at 1
+    // Each new metric or aggregation added to a visualization gets the next index.
+    // So to modify a metric or aggregation tests need to keep track of the
+    // order they are added.
+    await this.toggleOpenEditor(index);
+
+    // select our agg
+    const aggSelect = await this.find.byCssSelector(
+      `#visEditorAggAccordion${index} [data-test-subj="defaultEditorAggSelect"]`
+    );
+    await this.comboBox.setElement(aggSelect, agg);
+
+    const fieldSelect = await this.find.byCssSelector(
+      `#visEditorAggAccordion${index} [data-test-subj="visDefaultEditorField"]`
+    );
+    // select our field
+    await this.comboBox.setElement(fieldSelect, field);
+    // enter custom label
+    await this.setCustomLabel(label, index);
+  }
 
-    public async getField() {
-      return await comboBox.getComboBoxSelectedOptions('visDefaultEditorField');
-    }
+  public async getField() {
+    return await this.comboBox.getComboBoxSelectedOptions('visDefaultEditorField');
+  }
 
-    public async sizeUpEditor() {
-      const resizerPanel = await testSubjects.find('euiResizableButton');
-      // Drag panel 100 px left
-      await browser.dragAndDrop({ location: resizerPanel }, { location: { x: -100, y: 0 } });
-    }
+  public async sizeUpEditor() {
+    const resizerPanel = await this.testSubjects.find('euiResizableButton');
+    // Drag panel 100 px left
+    await this.browser.dragAndDrop({ location: resizerPanel }, { location: { x: -100, y: 0 } });
+  }
 
-    public async toggleDisabledAgg(agg: string | number) {
-      await testSubjects.click(`visEditorAggAccordion${agg} > ~toggleDisableAggregationBtn`);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async toggleDisabledAgg(agg: string | number) {
+    await this.testSubjects.click(`visEditorAggAccordion${agg} > ~toggleDisableAggregationBtn`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async toggleAggregationEditor(agg: string | number) {
-      await find.clickByCssSelector(
-        `[data-test-subj="visEditorAggAccordion${agg}"] .euiAccordion__button`
-      );
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async toggleAggregationEditor(agg: string | number) {
+    await this.find.clickByCssSelector(
+      `[data-test-subj="visEditorAggAccordion${agg}"] .euiAccordion__button`
+    );
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async toggleOtherBucket(agg: string | number = 2) {
-      await testSubjects.click(`visEditorAggAccordion${agg} > otherBucketSwitch`);
-    }
+  public async toggleOtherBucket(agg: string | number = 2) {
+    await this.testSubjects.click(`visEditorAggAccordion${agg} > otherBucketSwitch`);
+  }
 
-    public async toggleMissingBucket(agg: string | number = 2) {
-      await testSubjects.click(`visEditorAggAccordion${agg} > missingBucketSwitch`);
-    }
+  public async toggleMissingBucket(agg: string | number = 2) {
+    await this.testSubjects.click(`visEditorAggAccordion${agg} > missingBucketSwitch`);
+  }
 
-    public async toggleScaleMetrics() {
-      await testSubjects.click('scaleMetricsSwitch');
-    }
+  public async toggleScaleMetrics() {
+    await this.testSubjects.click('scaleMetricsSwitch');
+  }
 
-    public async toggleAutoMode() {
-      await testSubjects.click('visualizeEditorAutoButton');
-    }
+  public async toggleAutoMode() {
+    await this.testSubjects.click('visualizeEditorAutoButton');
+  }
 
-    public async isApplyEnabled() {
-      const applyButton = await testSubjects.find('visualizeEditorRenderButton');
-      return await applyButton.isEnabled();
-    }
+  public async togglePieLegend() {
+    await this.testSubjects.click('visTypePieAddLegendSwitch');
+  }
 
-    public async toggleAccordion(id: string, toState = 'true') {
-      const toggle = await find.byCssSelector(`button[aria-controls="${id}"]`);
-      const toggleOpen = await toggle.getAttribute('aria-expanded');
-      log.debug(`toggle ${id} expand = ${toggleOpen}`);
-      if (toggleOpen !== toState) {
-        log.debug(`toggle ${id} click()`);
-        await toggle.click();
-      }
-    }
+  public async togglePieNestedLegend() {
+    await this.testSubjects.click('visTypePieNestedLegendSwitch');
+  }
 
-    public async toggleOpenEditor(index: number, toState = 'true') {
-      // index, see selectYAxisAggregation
-      await this.toggleAccordion(`visEditorAggAccordion${index}`, toState);
-    }
+  public async isApplyEnabled() {
+    const applyButton = await this.testSubjects.find('visualizeEditorRenderButton');
+    return await applyButton.isEnabled();
+  }
 
-    public async toggleAdvancedParams(aggId: string) {
-      const accordion = await testSubjects.find(`advancedParams-${aggId}`);
-      const accordionButton = await find.descendantDisplayedByCssSelector('button', accordion);
-      await accordionButton.click();
+  public async toggleAccordion(id: string, toState = 'true') {
+    const toggle = await this.find.byCssSelector(`button[aria-controls="${id}"]`);
+    const toggleOpen = await toggle.getAttribute('aria-expanded');
+    this.log.debug(`toggle ${id} expand = ${toggleOpen}`);
+    if (toggleOpen !== toState) {
+      this.log.debug(`toggle ${id} click()`);
+      await toggle.click();
     }
+  }
 
-    public async inputValueInCodeEditor(value: string) {
-      const codeEditor = await find.byCssSelector('.react-monaco-editor-container');
-      const textarea = await codeEditor.findByClassName('monaco-mouse-cursor-text');
+  public async toggleOpenEditor(index: number, toState = 'true') {
+    // index, see selectYAxisAggregation
+    await this.toggleAccordion(`visEditorAggAccordion${index}`, toState);
+  }
 
-      await textarea.click();
-      await browser.pressKeys(value);
-    }
+  public async toggleAdvancedParams(aggId: string) {
+    const accordion = await this.testSubjects.find(`advancedParams-${aggId}`);
+    const accordionButton = await this.find.descendantDisplayedByCssSelector('button', accordion);
+    await accordionButton.click();
+  }
 
-    public async clickReset() {
-      await testSubjects.click('visualizeEditorResetButton');
-      await visChart.waitForVisualization();
-    }
+  public async inputValueInCodeEditor(value: string) {
+    const codeEditor = await this.find.byCssSelector('.react-monaco-editor-container');
+    const textarea = await codeEditor.findByClassName('monaco-mouse-cursor-text');
 
-    public async clickYAxisOptions(axisId: string) {
-      await testSubjects.click(`toggleYAxisOptions-${axisId}`);
-    }
+    await textarea.click();
+    await this.browser.pressKeys(value);
+  }
 
-    public async changeYAxisShowCheckbox(axisId: string, enabled: boolean) {
-      const selector = `valueAxisShow-${axisId}`;
-      const button = await testSubjects.find(selector);
-      const isEnabled = (await button.getAttribute('aria-checked')) === 'true';
-      if (enabled !== isEnabled) {
-        await button.click();
-      }
-    }
+  public async clickReset() {
+    await this.testSubjects.click('visualizeEditorResetButton');
+    await this.visChart.waitForVisualization();
+  }
 
-    public async changeYAxisFilterLabelsCheckbox(axisId: string, enabled: boolean) {
-      const selector = `yAxisFilterLabelsCheckbox-${axisId}`;
-      const button = await testSubjects.find(selector);
-      const isEnabled = (await button.getAttribute('aria-checked')) === 'true';
-      if (enabled !== isEnabled) {
-        await button.click();
-      }
-    }
+  public async clickYAxisOptions(axisId: string) {
+    await this.testSubjects.click(`toggleYAxisOptions-${axisId}`);
+  }
 
-    public async setSize(newValue: number, aggId?: number) {
-      const dataTestSubj = aggId
-        ? `visEditorAggAccordion${aggId} > sizeParamEditor`
-        : 'sizeParamEditor';
-      await testSubjects.setValue(dataTestSubj, String(newValue));
+  public async changeYAxisShowCheckbox(axisId: string, enabled: boolean) {
+    const selector = `valueAxisShow-${axisId}`;
+    const button = await this.testSubjects.find(selector);
+    const isEnabled = (await button.getAttribute('aria-checked')) === 'true';
+    if (enabled !== isEnabled) {
+      await button.click();
     }
+  }
 
-    public async selectChartMode(mode: string) {
-      const selector = await find.byCssSelector(`#seriesMode0 > option[value="${mode}"]`);
-      await selector.click();
+  public async changeYAxisFilterLabelsCheckbox(axisId: string, enabled: boolean) {
+    const selector = `yAxisFilterLabelsCheckbox-${axisId}`;
+    const button = await this.testSubjects.find(selector);
+    const isEnabled = (await button.getAttribute('aria-checked')) === 'true';
+    if (enabled !== isEnabled) {
+      await button.click();
     }
+  }
 
-    public async selectYAxisScaleType(axisId: string, scaleType: string) {
-      const selector = await find.byCssSelector(
-        `#scaleSelectYAxis-${axisId} > option[value="${scaleType}"]`
-      );
-      await selector.click();
-    }
+  public async setSize(newValue: number, aggId?: number) {
+    const dataTestSubj = aggId
+      ? `visEditorAggAccordion${aggId} > sizeParamEditor`
+      : 'sizeParamEditor';
+    await this.testSubjects.setValue(dataTestSubj, String(newValue));
+  }
 
-    public async selectXAxisPosition(position: string) {
-      const option = await (await testSubjects.find('categoryAxisPosition')).findByCssSelector(
-        `option[value="${position}"]`
-      );
-      await option.click();
-    }
+  public async selectChartMode(mode: string) {
+    const selector = await this.find.byCssSelector(`#seriesMode0 > option[value="${mode}"]`);
+    await selector.click();
+  }
 
-    public async selectYAxisMode(mode: string) {
-      const selector = await find.byCssSelector(`#valueAxisMode0 > option[value="${mode}"]`);
-      await selector.click();
-    }
+  public async selectYAxisScaleType(axisId: string, scaleType: string) {
+    const selector = await this.find.byCssSelector(
+      `#scaleSelectYAxis-${axisId} > option[value="${scaleType}"]`
+    );
+    await selector.click();
+  }
 
-    public async setAxisExtents(min: string, max: string, axisId = 'ValueAxis-1') {
-      await this.toggleAccordion(`yAxisAccordion${axisId}`);
-      await this.toggleAccordion(`yAxisOptionsAccordion${axisId}`);
+  public async selectXAxisPosition(position: string) {
+    const option = await (await this.testSubjects.find('categoryAxisPosition')).findByCssSelector(
+      `option[value="${position}"]`
+    );
+    await option.click();
+  }
 
-      await testSubjects.click('yAxisSetYExtents');
-      await testSubjects.setValue('yAxisYExtentsMax', max);
-      await testSubjects.setValue('yAxisYExtentsMin', min);
-    }
+  public async selectYAxisMode(mode: string) {
+    const selector = await this.find.byCssSelector(`#valueAxisMode0 > option[value="${mode}"]`);
+    await selector.click();
+  }
 
-    public async selectAggregateWith(fieldValue: string) {
-      await testSubjects.selectValue('visDefaultEditorAggregateWith', fieldValue);
-    }
+  public async setAxisExtents(min: string, max: string, axisId = 'ValueAxis-1') {
+    await this.toggleAccordion(`yAxisAccordion${axisId}`);
+    await this.toggleAccordion(`yAxisOptionsAccordion${axisId}`);
 
-    public async setInterval(newValue: string | number, options: IntervalOptions = {}) {
-      const newValueString = `${newValue}`;
-      const { type = 'default', aggNth = 2, append = false } = options;
-      log.debug(`visEditor.setInterval(${newValueString}, {${type}, ${aggNth}, ${append}})`);
-      if (type === 'default') {
-        await comboBox.set('visEditorInterval', newValueString);
-      } else if (type === 'custom') {
-        await comboBox.setCustom('visEditorInterval', newValueString);
-      } else {
-        if (type === 'numeric') {
-          const autoMode = await testSubjects.getAttribute(
-            `visEditorIntervalSwitch${aggNth}`,
-            'aria-checked'
-          );
-          if (autoMode === 'true') {
-            await testSubjects.click(`visEditorIntervalSwitch${aggNth}`);
-          }
-        }
-        if (append) {
-          await testSubjects.append(`visEditorInterval${aggNth}`, String(newValueString));
-        } else {
-          await testSubjects.setValue(`visEditorInterval${aggNth}`, String(newValueString));
+    await this.testSubjects.click('yAxisSetYExtents');
+    await this.testSubjects.setValue('yAxisYExtentsMax', max);
+    await this.testSubjects.setValue('yAxisYExtentsMin', min);
+  }
+
+  public async selectAggregateWith(fieldValue: string) {
+    await this.testSubjects.selectValue('visDefaultEditorAggregateWith', fieldValue);
+  }
+
+  public async setInterval(newValue: string | number, options: IntervalOptions = {}) {
+    const newValueString = `${newValue}`;
+    const { type = 'default', aggNth = 2, append = false } = options;
+    this.log.debug(`visEditor.setInterval(${newValueString}, {${type}, ${aggNth}, ${append}})`);
+    if (type === 'default') {
+      await this.comboBox.set('visEditorInterval', newValueString);
+    } else if (type === 'custom') {
+      await this.comboBox.setCustom('visEditorInterval', newValueString);
+    } else {
+      if (type === 'numeric') {
+        const autoMode = await this.testSubjects.getAttribute(
+          `visEditorIntervalSwitch${aggNth}`,
+          'aria-checked'
+        );
+        if (autoMode === 'true') {
+          await this.testSubjects.click(`visEditorIntervalSwitch${aggNth}`);
         }
       }
+      if (append) {
+        await this.testSubjects.append(`visEditorInterval${aggNth}`, String(newValueString));
+      } else {
+        await this.testSubjects.setValue(`visEditorInterval${aggNth}`, String(newValueString));
+      }
     }
+  }
 
-    public async getInterval() {
-      return await comboBox.getComboBoxSelectedOptions('visEditorInterval');
-    }
+  public async getInterval() {
+    return await this.comboBox.getComboBoxSelectedOptions('visEditorInterval');
+  }
 
-    public async getNumericInterval(aggNth = 2) {
-      return await testSubjects.getAttribute(`visEditorInterval${aggNth}`, 'value');
-    }
+  public async getNumericInterval(aggNth = 2) {
+    return await this.testSubjects.getAttribute(`visEditorInterval${aggNth}`, 'value');
+  }
 
-    public async clickMetricEditor() {
-      await find.clickByCssSelector('[data-test-subj="metricsAggGroup"] .euiAccordion__button');
-    }
+  public async clickMetricEditor() {
+    await this.find.clickByCssSelector('[data-test-subj="metricsAggGroup"] .euiAccordion__button');
+  }
 
-    public async clickMetricByIndex(index: number) {
-      const metrics = await find.allByCssSelector(
-        '[data-test-subj="visualizationLoader"] .mtrVis .mtrVis__container'
-      );
-      expect(metrics.length).greaterThan(index);
-      await metrics[index].click();
-    }
+  public async clickMetricByIndex(index: number) {
+    const metrics = await this.find.allByCssSelector(
+      '[data-test-subj="visualizationLoader"] .mtrVis .mtrVis__container'
+    );
+    expect(metrics.length).greaterThan(index);
+    await metrics[index].click();
+  }
 
-    public async setSelectByOptionText(selectId: string, optionText: string) {
-      const selectField = await find.byCssSelector(`#${selectId}`);
-      const options = await find.allByCssSelector(`#${selectId} > option`);
-      const $ = await selectField.parseDomContent();
-      const optionsText = $('option')
-        .toArray()
-        .map((option) => $(option).text());
-      const optionIndex = optionsText.indexOf(optionText);
-
-      if (optionIndex === -1) {
-        throw new Error(
-          `Unable to find option '${optionText}' in select ${selectId}. Available options: ${optionsText.join(
-            ','
-          )}`
-        );
-      }
-      await options[optionIndex].click();
+  public async setSelectByOptionText(selectId: string, optionText: string) {
+    const selectField = await this.find.byCssSelector(`#${selectId}`);
+    const options = await this.find.allByCssSelector(`#${selectId} > option`);
+    const $ = await selectField.parseDomContent();
+    const optionsText = $('option')
+      .toArray()
+      .map((option) => $(option).text());
+    const optionIndex = optionsText.indexOf(optionText);
+
+    if (optionIndex === -1) {
+      throw new Error(
+        `Unable to find option '${optionText}' in select ${selectId}. Available options: ${optionsText.join(
+          ','
+        )}`
+      );
     }
+    await options[optionIndex].click();
+  }
 
-    // point series
-
-    async clickAddAxis() {
-      return await testSubjects.click('visualizeAddYAxisButton');
-    }
+  // point series
 
-    async setAxisTitle(title: string, aggNth = 0) {
-      return await testSubjects.setValue(`valueAxisTitle${aggNth}`, title);
-    }
+  async clickAddAxis() {
+    return await this.testSubjects.click('visualizeAddYAxisButton');
+  }
 
-    public async toggleGridCategoryLines() {
-      return await testSubjects.click('showCategoryLines');
-    }
+  async setAxisTitle(title: string, aggNth = 0) {
+    return await this.testSubjects.setValue(`valueAxisTitle${aggNth}`, title);
+  }
 
-    public async toggleValuesOnChart() {
-      return await testSubjects.click('showValuesOnChart');
-    }
+  public async toggleGridCategoryLines() {
+    return await this.testSubjects.click('showCategoryLines');
+  }
 
-    public async setGridValueAxis(axis: string) {
-      log.debug(`setGridValueAxis(${axis})`);
-      await find.selectValue('select#gridAxis', axis);
-    }
+  public async toggleValuesOnChart() {
+    return await this.testSubjects.click('showValuesOnChart');
+  }
 
-    public async setSeriesAxis(seriesNth: number, axis: string) {
-      await find.selectValue(`select#seriesValueAxis${seriesNth}`, axis);
-    }
+  public async setGridValueAxis(axis: string) {
+    this.log.debug(`setGridValueAxis(${axis})`);
+    await this.find.selectValue('select#gridAxis', axis);
+  }
 
-    public async setSeriesType(seriesNth: number, type: string) {
-      await find.selectValue(`select#seriesType${seriesNth}`, type);
-    }
+  public async setSeriesAxis(seriesNth: number, axis: string) {
+    await this.find.selectValue(`select#seriesValueAxis${seriesNth}`, axis);
   }
 
-  return new VisualizeEditorPage();
+  public async setSeriesType(seriesNth: number, type: string) {
+    await this.find.selectValue(`select#seriesType${seriesNth}`, type);
+  }
 }
diff --git a/test/functional/page_objects/visualize_page.ts b/test/functional/page_objects/visualize_page.ts
index 78a963867b8c2..f77db553e015f 100644
--- a/test/functional/page_objects/visualize_page.ts
+++ b/test/functional/page_objects/visualize_page.ts
@@ -6,7 +6,7 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 import { VisualizeConstants } from '../../../src/plugins/visualize/public/application/visualize_constants';
 import { UI_SETTINGS } from '../../../src/plugins/data/common';
 
@@ -23,455 +23,452 @@ type DashboardPickerOption =
   | 'existing-dashboard-option'
   | 'new-dashboard-option';
 
-export function VisualizePageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const kibanaServer = getService('kibanaServer');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const find = getService('find');
-  const log = getService('log');
-  const globalNav = getService('globalNav');
-  const listingTable = getService('listingTable');
-  const queryBar = getService('queryBar');
-  const elasticChart = getService('elasticChart');
-  const { common, header, visEditor, visChart } = getPageObjects([
-    'common',
-    'header',
-    'visEditor',
-    'visChart',
-  ]);
-
-  /**
-   * This page object contains the visualization type selection, the landing page,
-   * and the open/save dialog functions
-   */
-  class VisualizePage {
-    index = {
-      LOGSTASH_TIME_BASED: 'logstash-*',
-      LOGSTASH_NON_TIME_BASED: 'logstash*',
-    };
-
-    public async initTests() {
-      await kibanaServer.savedObjects.clean({ types: ['visualization'] });
-      await kibanaServer.importExport.load('visualize');
-
-      await kibanaServer.uiSettings.replace({
-        defaultIndex: 'logstash-*',
-        [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b',
-      });
-    }
-
-    public async gotoVisualizationLandingPage() {
-      await common.navigateToApp('visualize');
-    }
+/**
+ * This page object contains the visualization type selection, the landing page,
+ * and the open/save dialog functions
+ */
+export class VisualizePageObject extends FtrService {
+  private readonly kibanaServer = this.ctx.getService('kibanaServer');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly find = this.ctx.getService('find');
+  private readonly log = this.ctx.getService('log');
+  private readonly globalNav = this.ctx.getService('globalNav');
+  private readonly listingTable = this.ctx.getService('listingTable');
+  private readonly queryBar = this.ctx.getService('queryBar');
+  private readonly elasticChart = this.ctx.getService('elasticChart');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly visEditor = this.ctx.getPageObject('visEditor');
+  private readonly visChart = this.ctx.getPageObject('visChart');
+
+  index = {
+    LOGSTASH_TIME_BASED: 'logstash-*',
+    LOGSTASH_NON_TIME_BASED: 'logstash*',
+  };
+
+  public async initTests(isNewLibrary = false) {
+    await this.kibanaServer.savedObjects.clean({ types: ['visualization'] });
+    await this.kibanaServer.importExport.load('visualize');
+
+    await this.kibanaServer.uiSettings.replace({
+      defaultIndex: 'logstash-*',
+      [UI_SETTINGS.FORMAT_BYTES_DEFAULT_PATTERN]: '0,0.[000]b',
+      'visualization:visualize:legacyChartsLibrary': !isNewLibrary,
+    });
+  }
 
-    public async clickNewVisualization() {
-      await listingTable.clickNewButton('createVisualizationPromptButton');
-    }
+  public async gotoVisualizationLandingPage() {
+    await this.common.navigateToApp('visualize');
+  }
 
-    public async clickAggBasedVisualizations() {
-      await testSubjects.click('visGroupAggBasedExploreLink');
-    }
+  public async clickNewVisualization() {
+    await this.listingTable.clickNewButton('createVisualizationPromptButton');
+  }
 
-    public async goBackToGroups() {
-      await testSubjects.click('goBackLink');
-    }
+  public async clickAggBasedVisualizations() {
+    await this.testSubjects.click('visGroupAggBasedExploreLink');
+  }
 
-    public async createVisualizationPromptButton() {
-      await testSubjects.click('createVisualizationPromptButton');
-    }
+  public async goBackToGroups() {
+    await this.testSubjects.click('goBackLink');
+  }
 
-    public async getChartTypes() {
-      const chartTypeField = await testSubjects.find('visNewDialogTypes');
-      const $ = await chartTypeField.parseDomContent();
-      return $('button')
-        .toArray()
-        .map((chart) => $(chart).findTestSubject('visTypeTitle').text().trim());
-    }
+  public async createVisualizationPromptButton() {
+    await this.testSubjects.click('createVisualizationPromptButton');
+  }
 
-    public async getPromotedVisTypes() {
-      const chartTypeField = await testSubjects.find('visNewDialogGroups');
-      const $ = await chartTypeField.parseDomContent();
-      const promotedVisTypes: string[] = [];
-      $('button')
-        .toArray()
-        .forEach((chart) => {
-          const title = $(chart).findTestSubject('visTypeTitle').text().trim();
-          if (title) {
-            promotedVisTypes.push(title);
-          }
-        });
-      return promotedVisTypes;
-    }
+  public async getChartTypes() {
+    const chartTypeField = await this.testSubjects.find('visNewDialogTypes');
+    const $ = await chartTypeField.parseDomContent();
+    return $('button')
+      .toArray()
+      .map((chart) => $(chart).findTestSubject('visTypeTitle').text().trim());
+  }
 
-    public async waitForVisualizationSelectPage() {
-      await retry.try(async () => {
-        const visualizeSelectTypePage = await testSubjects.find('visNewDialogTypes');
-        if (!(await visualizeSelectTypePage.isDisplayed())) {
-          throw new Error('wait for visualization select page');
+  public async getPromotedVisTypes() {
+    const chartTypeField = await this.testSubjects.find('visNewDialogGroups');
+    const $ = await chartTypeField.parseDomContent();
+    const promotedVisTypes: string[] = [];
+    $('button')
+      .toArray()
+      .forEach((chart) => {
+        const title = $(chart).findTestSubject('visTypeTitle').text().trim();
+        if (title) {
+          promotedVisTypes.push(title);
         }
       });
-    }
+    return promotedVisTypes;
+  }
 
-    public async clickRefresh() {
-      if (await visChart.isNewChartsLibraryEnabled()) {
-        await elasticChart.setNewChartUiDebugFlag();
+  public async waitForVisualizationSelectPage() {
+    await this.retry.try(async () => {
+      const visualizeSelectTypePage = await this.testSubjects.find('visNewDialogTypes');
+      if (!(await visualizeSelectTypePage.isDisplayed())) {
+        throw new Error('wait for visualization select page');
       }
-      await queryBar.clickQuerySubmitButton();
-    }
-
-    public async waitForGroupsSelectPage() {
-      await retry.try(async () => {
-        const visualizeSelectGroupStep = await testSubjects.find('visNewDialogGroups');
-        if (!(await visualizeSelectGroupStep.isDisplayed())) {
-          throw new Error('wait for vis groups select step');
-        }
-      });
-    }
-
-    public async navigateToNewVisualization() {
-      await this.gotoVisualizationLandingPage();
-      await header.waitUntilLoadingHasFinished();
-      await this.clickNewVisualization();
-      await this.waitForGroupsSelectPage();
-    }
+    });
+  }
 
-    public async navigateToNewAggBasedVisualization() {
-      await this.gotoVisualizationLandingPage();
-      await header.waitUntilLoadingHasFinished();
-      await this.clickNewVisualization();
-      await this.clickAggBasedVisualizations();
-      await this.waitForVisualizationSelectPage();
+  public async clickRefresh() {
+    if (await this.visChart.isNewChartsLibraryEnabled()) {
+      await this.elasticChart.setNewChartUiDebugFlag();
     }
+    await this.queryBar.clickQuerySubmitButton();
+  }
 
-    public async hasVisType(type: string) {
-      return await testSubjects.exists(`visType-${type}`);
-    }
+  public async waitForGroupsSelectPage() {
+    await this.retry.try(async () => {
+      const visualizeSelectGroupStep = await this.testSubjects.find('visNewDialogGroups');
+      if (!(await visualizeSelectGroupStep.isDisplayed())) {
+        throw new Error('wait for vis groups select step');
+      }
+    });
+  }
 
-    public async clickVisType(type: string) {
-      await testSubjects.click(`visType-${type}`);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async navigateToNewVisualization() {
+    await this.gotoVisualizationLandingPage();
+    await this.header.waitUntilLoadingHasFinished();
+    await this.clickNewVisualization();
+    await this.waitForGroupsSelectPage();
+  }
 
-    public async clickAreaChart() {
-      await this.clickVisType('area');
-    }
+  public async navigateToNewAggBasedVisualization() {
+    await this.gotoVisualizationLandingPage();
+    await this.header.waitUntilLoadingHasFinished();
+    await this.clickNewVisualization();
+    await this.clickAggBasedVisualizations();
+    await this.waitForVisualizationSelectPage();
+  }
 
-    public async clickDataTable() {
-      await this.clickVisType('table');
-    }
+  public async hasVisType(type: string) {
+    return await this.testSubjects.exists(`visType-${type}`);
+  }
 
-    public async clickLineChart() {
-      await this.clickVisType('line');
-    }
+  public async clickVisType(type: string) {
+    await this.testSubjects.click(`visType-${type}`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async clickRegionMap() {
-      await this.clickVisType('region_map');
-    }
+  public async clickAreaChart() {
+    await this.clickVisType('area');
+  }
 
-    public async hasRegionMap() {
-      return await this.hasVisType('region_map');
-    }
+  public async clickDataTable() {
+    await this.clickVisType('table');
+  }
 
-    public async clickMarkdownWidget() {
-      await this.clickVisType('markdown');
-    }
+  public async clickLineChart() {
+    await this.clickVisType('line');
+  }
 
-    public async clickMetric() {
-      await this.clickVisType('metric');
-    }
+  public async clickRegionMap() {
+    await this.clickVisType('region_map');
+  }
 
-    public async clickGauge() {
-      await this.clickVisType('gauge');
-    }
+  public async hasRegionMap() {
+    return await this.hasVisType('region_map');
+  }
 
-    public async clickPieChart() {
-      await this.clickVisType('pie');
-    }
+  public async clickMarkdownWidget() {
+    await this.clickVisType('markdown');
+  }
 
-    public async clickTileMap() {
-      await this.clickVisType('tile_map');
-    }
+  public async clickMetric() {
+    await this.clickVisType('metric');
+  }
 
-    public async hasTileMap() {
-      return await this.hasVisType('tile_map');
-    }
+  public async clickGauge() {
+    await this.clickVisType('gauge');
+  }
 
-    public async clickTagCloud() {
-      await this.clickVisType('tagcloud');
-    }
+  public async clickPieChart() {
+    await this.clickVisType('pie');
+  }
 
-    public async clickVega() {
-      await this.clickVisType('vega');
-    }
+  public async clickTileMap() {
+    await this.clickVisType('tile_map');
+  }
 
-    public async clickVisualBuilder() {
-      await this.clickVisType('metrics');
-    }
+  public async hasTileMap() {
+    return await this.hasVisType('tile_map');
+  }
 
-    public async clickVerticalBarChart() {
-      await this.clickVisType('histogram');
-    }
+  public async clickTagCloud() {
+    await this.clickVisType('tagcloud');
+  }
 
-    public async clickHeatmapChart() {
-      await this.clickVisType('heatmap');
-    }
+  public async clickVega() {
+    await this.clickVisType('vega');
+  }
 
-    public async clickInputControlVis() {
-      await this.clickVisType('input_control_vis');
-    }
+  public async clickVisualBuilder() {
+    await this.clickVisType('metrics');
+  }
 
-    public async clickLensWidget() {
-      await this.clickVisType('lens');
-    }
+  public async clickVerticalBarChart() {
+    await this.clickVisType('histogram');
+  }
 
-    public async clickMapsApp() {
-      await this.clickVisType('maps');
-    }
+  public async clickHeatmapChart() {
+    await this.clickVisType('heatmap');
+  }
 
-    public async hasMapsApp() {
-      return await this.hasVisType('maps');
-    }
+  public async clickInputControlVis() {
+    await this.clickVisType('input_control_vis');
+  }
 
-    public async createSimpleMarkdownViz(vizName: string) {
-      await this.gotoVisualizationLandingPage();
-      await this.navigateToNewVisualization();
-      await this.clickMarkdownWidget();
-      await visEditor.setMarkdownTxt(vizName);
-      await visEditor.clickGo();
-      await this.saveVisualization(vizName);
-    }
+  public async clickLensWidget() {
+    await this.clickVisType('lens');
+  }
 
-    public async clickNewSearch(indexPattern = this.index.LOGSTASH_TIME_BASED) {
-      await testSubjects.click(`savedObjectTitle${indexPattern.split(' ').join('-')}`);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async clickMapsApp() {
+    await this.clickVisType('maps');
+  }
 
-    public async selectVisSourceIfRequired() {
-      log.debug('selectVisSourceIfRequired');
-      const selectPage = await testSubjects.findAll('visualizeSelectSearch');
-      if (selectPage.length) {
-        log.debug('a search is required for this visualization');
-        await this.clickNewSearch();
-      }
-    }
+  public async hasMapsApp() {
+    return await this.hasVisType('maps');
+  }
 
-    /**
-     * Deletes all existing visualizations
-     */
-    public async deleteAllVisualizations() {
-      await retry.try(async () => {
-        await listingTable.checkListingSelectAllCheckbox();
-        await listingTable.clickDeleteSelected();
-        await common.clickConfirmOnModal();
-        await testSubjects.find('createVisualizationPromptButton');
-      });
-    }
+  public async createSimpleMarkdownViz(vizName: string) {
+    await this.gotoVisualizationLandingPage();
+    await this.navigateToNewVisualization();
+    await this.clickMarkdownWidget();
+    await this.visEditor.setMarkdownTxt(vizName);
+    await this.visEditor.clickGo();
+    await this.saveVisualization(vizName);
+  }
 
-    public async isBetaInfoShown() {
-      return await testSubjects.exists('betaVisInfo');
-    }
+  public async clickNewSearch(indexPattern = this.index.LOGSTASH_TIME_BASED) {
+    await this.testSubjects.click(`savedObjectTitle${indexPattern.split(' ').join('-')}`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async getBetaTypeLinks() {
-      return await find.allByCssSelector('[data-vis-stage="beta"]');
+  public async selectVisSourceIfRequired() {
+    this.log.debug('selectVisSourceIfRequired');
+    const selectPage = await this.testSubjects.findAll('visualizeSelectSearch');
+    if (selectPage.length) {
+      this.log.debug('a search is required for this visualization');
+      await this.clickNewSearch();
     }
+  }
 
-    public async getExperimentalTypeLinks() {
-      return await find.allByCssSelector('[data-vis-stage="experimental"]');
-    }
+  /**
+   * Deletes all existing visualizations
+   */
+  public async deleteAllVisualizations() {
+    await this.retry.try(async () => {
+      await this.listingTable.checkListingSelectAllCheckbox();
+      await this.listingTable.clickDeleteSelected();
+      await this.common.clickConfirmOnModal();
+      await this.testSubjects.find('createVisualizationPromptButton');
+    });
+  }
 
-    public async isExperimentalInfoShown() {
-      return await testSubjects.exists('experimentalVisInfo');
-    }
+  public async isBetaInfoShown() {
+    return await this.testSubjects.exists('betaVisInfo');
+  }
 
-    public async getExperimentalInfo() {
-      return await testSubjects.find('experimentalVisInfo');
-    }
+  public async getBetaTypeLinks() {
+    return await this.find.allByCssSelector('[data-vis-stage="beta"]');
+  }
 
-    public async getSideEditorExists() {
-      return await find.existsByCssSelector('.visEditor__collapsibleSidebar');
-    }
+  public async getExperimentalTypeLinks() {
+    return await this.find.allByCssSelector('[data-vis-stage="experimental"]');
+  }
 
-    public async clickSavedSearch(savedSearchName: string) {
-      await testSubjects.click(`savedObjectTitle${savedSearchName.split(' ').join('-')}`);
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async isExperimentalInfoShown() {
+    return await this.testSubjects.exists('experimentalVisInfo');
+  }
 
-    public async clickUnlinkSavedSearch() {
-      await testSubjects.click('showUnlinkSavedSearchPopover');
-      await testSubjects.click('unlinkSavedSearch');
-      await header.waitUntilLoadingHasFinished();
-    }
+  public async getExperimentalInfo() {
+    return await this.testSubjects.find('experimentalVisInfo');
+  }
 
-    public async ensureSavePanelOpen() {
-      log.debug('ensureSavePanelOpen');
-      await header.waitUntilLoadingHasFinished();
-      const isOpen = await testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
-      if (!isOpen) {
-        await testSubjects.click('visualizeSaveButton');
-      }
-    }
+  public async getSideEditorExists() {
+    return await this.find.existsByCssSelector('.visEditor__collapsibleSidebar');
+  }
 
-    public async clickLoadSavedVisButton() {
-      // TODO: Use a test subject selector once we rewrite breadcrumbs to accept each breadcrumb
-      // element as a child instead of building the breadcrumbs dynamically.
-      await find.clickByCssSelector('[href="#/"]');
-    }
+  public async clickSavedSearch(savedSearchName: string) {
+    await this.testSubjects.click(`savedObjectTitle${savedSearchName.split(' ').join('-')}`);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async loadSavedVisualization(vizName: string, { navigateToVisualize = true } = {}) {
-      if (navigateToVisualize) {
-        await this.clickLoadSavedVisButton();
-      }
-      await this.openSavedVisualization(vizName);
-    }
+  public async clickUnlinkSavedSearch() {
+    await this.testSubjects.click('showUnlinkSavedSearchPopover');
+    await this.testSubjects.click('unlinkSavedSearch');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async openSavedVisualization(vizName: string) {
-      const dataTestSubj = `visListingTitleLink-${vizName.split(' ').join('-')}`;
-      await testSubjects.click(dataTestSubj, 20000);
-      await header.waitUntilLoadingHasFinished();
+  public async ensureSavePanelOpen() {
+    this.log.debug('ensureSavePanelOpen');
+    await this.header.waitUntilLoadingHasFinished();
+    const isOpen = await this.testSubjects.exists('savedObjectSaveModal', { timeout: 5000 });
+    if (!isOpen) {
+      await this.testSubjects.click('visualizeSaveButton');
     }
+  }
 
-    public async waitForVisualizationSavedToastGone() {
-      await testSubjects.waitForDeleted('saveVisualizationSuccess');
-    }
+  public async clickLoadSavedVisButton() {
+    // TODO: Use a test subject selector once we rewrite breadcrumbs to accept each breadcrumb
+    // element as a child instead of building the breadcrumbs dynamically.
+    await this.find.clickByCssSelector('[href="#/"]');
+  }
 
-    public async clickLandingPageBreadcrumbLink() {
-      log.debug('clickLandingPageBreadcrumbLink');
-      await find.clickByCssSelector(`a[href="#${VisualizeConstants.LANDING_PAGE_PATH}"]`);
+  public async loadSavedVisualization(vizName: string, { navigateToVisualize = true } = {}) {
+    if (navigateToVisualize) {
+      await this.clickLoadSavedVisButton();
     }
+    await this.openSavedVisualization(vizName);
+  }
 
-    /**
-     * Returns true if already on the landing page (that page doesn't have a link to itself).
-     * @returns {Promise<boolean>}
-     */
-    public async onLandingPage() {
-      log.debug(`VisualizePage.onLandingPage`);
-      return await testSubjects.exists('visualizationLandingPage');
-    }
+  public async openSavedVisualization(vizName: string) {
+    const dataTestSubj = `visListingTitleLink-${vizName.split(' ').join('-')}`;
+    await this.testSubjects.click(dataTestSubj, 20000);
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    public async gotoLandingPage() {
-      log.debug('VisualizePage.gotoLandingPage');
-      const onPage = await this.onLandingPage();
-      if (!onPage) {
-        await retry.try(async () => {
-          await this.clickLandingPageBreadcrumbLink();
-          const onLandingPage = await this.onLandingPage();
-          if (!onLandingPage) throw new Error('Not on the landing page.');
-        });
-      }
-    }
+  public async waitForVisualizationSavedToastGone() {
+    await this.testSubjects.waitForDeleted('saveVisualizationSuccess');
+  }
 
-    public async saveVisualization(vizName: string, saveModalArgs: VisualizeSaveModalArgs = {}) {
-      await this.ensureSavePanelOpen();
+  public async clickLandingPageBreadcrumbLink() {
+    this.log.debug('clickLandingPageBreadcrumbLink');
+    await this.find.clickByCssSelector(`a[href="#${VisualizeConstants.LANDING_PAGE_PATH}"]`);
+  }
 
-      await this.setSaveModalValues(vizName, saveModalArgs);
-      log.debug('Click Save Visualization button');
+  /**
+   * Returns true if already on the landing page (that page doesn't have a link to itself).
+   * @returns {Promise<boolean>}
+   */
+  public async onLandingPage() {
+    this.log.debug(`VisualizePage.onLandingPage`);
+    return await this.testSubjects.exists('visualizationLandingPage');
+  }
 
-      await testSubjects.click('confirmSaveSavedObjectButton');
+  public async gotoLandingPage() {
+    this.log.debug('VisualizePage.gotoLandingPage');
+    const onPage = await this.onLandingPage();
+    if (!onPage) {
+      await this.retry.try(async () => {
+        await this.clickLandingPageBreadcrumbLink();
+        const onLandingPage = await this.onLandingPage();
+        if (!onLandingPage) throw new Error('Not on the landing page.');
+      });
+    }
+  }
 
-      // Confirm that the Visualization has actually been saved
-      await testSubjects.existOrFail('saveVisualizationSuccess');
-      const message = await common.closeToast();
-      await header.waitUntilLoadingHasFinished();
-      await common.waitForSaveModalToClose();
+  public async saveVisualization(vizName: string, saveModalArgs: VisualizeSaveModalArgs = {}) {
+    await this.ensureSavePanelOpen();
 
-      return message;
-    }
+    await this.setSaveModalValues(vizName, saveModalArgs);
+    this.log.debug('Click Save Visualization button');
 
-    public async setSaveModalValues(
-      vizName: string,
-      { saveAsNew, redirectToOrigin, addToDashboard, dashboardId }: VisualizeSaveModalArgs = {}
-    ) {
-      await testSubjects.setValue('savedObjectTitle', vizName);
-
-      const saveAsNewCheckboxExists = await testSubjects.exists('saveAsNewCheckbox');
-      if (saveAsNewCheckboxExists) {
-        const state = saveAsNew ? 'check' : 'uncheck';
-        log.debug('save as new checkbox exists. Setting its state to', state);
-        await testSubjects.setEuiSwitch('saveAsNewCheckbox', state);
-      }
+    await this.testSubjects.click('confirmSaveSavedObjectButton');
 
-      const redirectToOriginCheckboxExists = await testSubjects.exists('returnToOriginModeSwitch');
-      if (redirectToOriginCheckboxExists) {
-        const state = redirectToOrigin ? 'check' : 'uncheck';
-        log.debug('redirect to origin checkbox exists. Setting its state to', state);
-        await testSubjects.setEuiSwitch('returnToOriginModeSwitch', state);
-      }
+    // Confirm that the Visualization has actually been saved
+    await this.testSubjects.existOrFail('saveVisualizationSuccess');
+    const message = await this.common.closeToast();
+    await this.header.waitUntilLoadingHasFinished();
+    await this.common.waitForSaveModalToClose();
 
-      const dashboardSelectorExists = await testSubjects.exists('add-to-dashboard-options');
-      if (dashboardSelectorExists) {
-        let option: DashboardPickerOption = 'add-to-library-option';
-        if (addToDashboard) {
-          option = dashboardId ? 'existing-dashboard-option' : 'new-dashboard-option';
-        }
-        log.debug('save modal dashboard selector, choosing option:', option);
-        const dashboardSelector = await testSubjects.find('add-to-dashboard-options');
-        const label = await dashboardSelector.findByCssSelector(`label[for="${option}"]`);
-        await label.click();
+    return message;
+  }
 
-        if (dashboardId) {
-          // TODO - selecting an existing dashboard
-        }
+  public async setSaveModalValues(
+    vizName: string,
+    { saveAsNew, redirectToOrigin, addToDashboard, dashboardId }: VisualizeSaveModalArgs = {}
+  ) {
+    await this.testSubjects.setValue('savedObjectTitle', vizName);
+
+    const saveAsNewCheckboxExists = await this.testSubjects.exists('saveAsNewCheckbox');
+    if (saveAsNewCheckboxExists) {
+      const state = saveAsNew ? 'check' : 'uncheck';
+      this.log.debug('save as new checkbox exists. Setting its state to', state);
+      await this.testSubjects.setEuiSwitch('saveAsNewCheckbox', state);
+    }
+
+    const redirectToOriginCheckboxExists = await this.testSubjects.exists(
+      'returnToOriginModeSwitch'
+    );
+    if (redirectToOriginCheckboxExists) {
+      const state = redirectToOrigin ? 'check' : 'uncheck';
+      this.log.debug('redirect to origin checkbox exists. Setting its state to', state);
+      await this.testSubjects.setEuiSwitch('returnToOriginModeSwitch', state);
+    }
+
+    const dashboardSelectorExists = await this.testSubjects.exists('add-to-dashboard-options');
+    if (dashboardSelectorExists) {
+      let option: DashboardPickerOption = 'add-to-library-option';
+      if (addToDashboard) {
+        option = dashboardId ? 'existing-dashboard-option' : 'new-dashboard-option';
       }
-    }
+      this.log.debug('save modal dashboard selector, choosing option:', option);
+      const dashboardSelector = await this.testSubjects.find('add-to-dashboard-options');
+      const label = await dashboardSelector.findByCssSelector(`label[for="${option}"]`);
+      await label.click();
 
-    public async saveVisualizationExpectSuccess(
-      vizName: string,
-      { saveAsNew, redirectToOrigin, addToDashboard, dashboardId }: VisualizeSaveModalArgs = {}
-    ) {
-      const saveMessage = await this.saveVisualization(vizName, {
-        saveAsNew,
-        redirectToOrigin,
-        addToDashboard,
-        dashboardId,
-      });
-      if (!saveMessage) {
-        throw new Error(
-          `Expected saveVisualization to respond with the saveMessage from the toast, got ${saveMessage}`
-        );
+      if (dashboardId) {
+        // TODO - selecting an existing dashboard
       }
     }
+  }
 
-    public async saveVisualizationExpectSuccessAndBreadcrumb(
-      vizName: string,
-      { saveAsNew = false, redirectToOrigin = false } = {}
-    ) {
-      await this.saveVisualizationExpectSuccess(vizName, { saveAsNew, redirectToOrigin });
-      await retry.waitFor(
-        'last breadcrumb to have new vis name',
-        async () => (await globalNav.getLastBreadcrumb()) === vizName
+  public async saveVisualizationExpectSuccess(
+    vizName: string,
+    { saveAsNew, redirectToOrigin, addToDashboard, dashboardId }: VisualizeSaveModalArgs = {}
+  ) {
+    const saveMessage = await this.saveVisualization(vizName, {
+      saveAsNew,
+      redirectToOrigin,
+      addToDashboard,
+      dashboardId,
+    });
+    if (!saveMessage) {
+      throw new Error(
+        `Expected saveVisualization to respond with the saveMessage from the toast, got ${saveMessage}`
       );
     }
+  }
 
-    public async saveVisualizationAndReturn() {
-      await header.waitUntilLoadingHasFinished();
-      await testSubjects.existOrFail('visualizesaveAndReturnButton');
-      await testSubjects.click('visualizesaveAndReturnButton');
-    }
+  public async saveVisualizationExpectSuccessAndBreadcrumb(
+    vizName: string,
+    { saveAsNew = false, redirectToOrigin = false } = {}
+  ) {
+    await this.saveVisualizationExpectSuccess(vizName, { saveAsNew, redirectToOrigin });
+    await this.retry.waitFor(
+      'last breadcrumb to have new vis name',
+      async () => (await this.globalNav.getLastBreadcrumb()) === vizName
+    );
+  }
 
-    public async linkedToOriginatingApp() {
-      await header.waitUntilLoadingHasFinished();
-      await testSubjects.existOrFail('visualizesaveAndReturnButton');
-    }
+  public async saveVisualizationAndReturn() {
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.existOrFail('visualizesaveAndReturnButton');
+    await this.testSubjects.click('visualizesaveAndReturnButton');
+  }
 
-    public async notLinkedToOriginatingApp() {
-      await header.waitUntilLoadingHasFinished();
-      await testSubjects.missingOrFail('visualizesaveAndReturnButton');
-    }
+  public async linkedToOriginatingApp() {
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.existOrFail('visualizesaveAndReturnButton');
+  }
 
-    public async cancelAndReturn(showConfirmModal: boolean) {
-      await header.waitUntilLoadingHasFinished();
-      await testSubjects.existOrFail('visualizeCancelAndReturnButton');
-      await testSubjects.click('visualizeCancelAndReturnButton');
-      if (showConfirmModal) {
-        await retry.waitFor(
-          'confirm modal to show',
-          async () => await testSubjects.exists('appLeaveConfirmModal')
-        );
-        await testSubjects.exists('confirmModalConfirmButton');
-        await testSubjects.click('confirmModalConfirmButton');
-      }
-    }
+  public async notLinkedToOriginatingApp() {
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.missingOrFail('visualizesaveAndReturnButton');
   }
 
-  return new VisualizePage();
+  public async cancelAndReturn(showConfirmModal: boolean) {
+    await this.header.waitUntilLoadingHasFinished();
+    await this.testSubjects.existOrFail('visualizeCancelAndReturnButton');
+    await this.testSubjects.click('visualizeCancelAndReturnButton');
+    if (showConfirmModal) {
+      await this.retry.waitFor(
+        'confirm modal to show',
+        async () => await this.testSubjects.exists('appLeaveConfirmModal')
+      );
+      await this.testSubjects.exists('confirmModalConfirmButton');
+      await this.testSubjects.click('confirmModalConfirmButton');
+    }
+  }
 }
diff --git a/test/functional/services/combo_box.ts b/test/functional/services/combo_box.ts
index a198aec1d1696..6706db82ce708 100644
--- a/test/functional/services/combo_box.ts
+++ b/test/functional/services/combo_box.ts
@@ -21,7 +21,7 @@ export class ComboBoxService extends FtrService {
   private readonly log = this.ctx.getService('log');
   private readonly retry = this.ctx.getService('retry');
   private readonly browser = this.ctx.getService('browser');
-  private readonly PageObjects = this.ctx.getPageObjects(['common']);
+  private readonly common = this.ctx.getPageObject('common');
 
   private readonly WAIT_FOR_EXISTS_TIME: number = this.config.get('timeouts.waitForExists');
 
@@ -113,7 +113,7 @@ export class ComboBoxService extends FtrService {
     this.log.debug(`comboBox.setCustom, comboBoxSelector: ${comboBoxSelector}, value: ${value}`);
     const comboBoxElement = await this.testSubjects.find(comboBoxSelector);
     await this.setFilterValue(comboBoxElement, value);
-    await this.PageObjects.common.pressEnterKey();
+    await this.common.pressEnterKey();
     await this.closeOptionsList(comboBoxElement);
   }
 
diff --git a/test/functional/services/dashboard/add_panel.ts b/test/functional/services/dashboard/add_panel.ts
index 98e947541b52d..43ab1f966bc9a 100644
--- a/test/functional/services/dashboard/add_panel.ts
+++ b/test/functional/services/dashboard/add_panel.ts
@@ -13,20 +13,21 @@ export class DashboardAddPanelService extends FtrService {
   private readonly retry = this.ctx.getService('retry');
   private readonly testSubjects = this.ctx.getService('testSubjects');
   private readonly flyout = this.ctx.getService('flyout');
-  private readonly PageObjects = this.ctx.getPageObjects(['header', 'common']);
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
 
   async clickOpenAddPanel() {
     this.log.debug('DashboardAddPanel.clickOpenAddPanel');
     await this.testSubjects.click('dashboardAddPanelButton');
     // Give some time for the animation to complete
-    await this.PageObjects.common.sleep(500);
+    await this.common.sleep(500);
   }
 
   async clickCreateNewLink() {
     this.log.debug('DashboardAddPanel.clickAddNewPanelButton');
     await this.testSubjects.click('dashboardAddNewPanelButton');
     // Give some time for the animation to complete
-    await this.PageObjects.common.sleep(500);
+    await this.common.sleep(500);
   }
 
   async clickQuickButton(visType: string) {
@@ -94,7 +95,7 @@ export class DashboardAddPanelService extends FtrService {
         }
 
         await embeddableRows[i].click();
-        await this.PageObjects.common.closeToast();
+        await this.common.closeToast();
         embeddableList.push(name);
       }
     });
@@ -104,7 +105,7 @@ export class DashboardAddPanelService extends FtrService {
 
   async clickPagerNextButton() {
     // Clear all toasts that could hide pagination controls
-    await this.PageObjects.common.clearAllToasts();
+    await this.common.clearAllToasts();
 
     const isNext = await this.testSubjects.exists('pagination-button-next');
     if (!isNext) {
@@ -118,9 +119,9 @@ export class DashboardAddPanelService extends FtrService {
       return false;
     }
 
-    await this.PageObjects.header.waitUntilLoadingHasFinished();
+    await this.header.waitUntilLoadingHasFinished();
     await pagerNextButton.click();
-    await this.PageObjects.header.waitUntilLoadingHasFinished();
+    await this.header.waitUntilLoadingHasFinished();
     return true;
   }
 
diff --git a/test/functional/services/dashboard/expectations.ts b/test/functional/services/dashboard/expectations.ts
index 34a4a9de7899a..c22eddb032cf9 100644
--- a/test/functional/services/dashboard/expectations.ts
+++ b/test/functional/services/dashboard/expectations.ts
@@ -16,20 +16,21 @@ export class DashboardExpectService extends FtrService {
   private readonly testSubjects = this.ctx.getService('testSubjects');
   private readonly find = this.ctx.getService('find');
   private readonly filterBar = this.ctx.getService('filterBar');
-  private readonly PageObjects = this.ctx.getPageObjects(['dashboard', 'visualize', 'visChart']);
+  private readonly dashboard = this.ctx.getPageObject('dashboard');
+  private readonly visChart = this.ctx.getPageObject('visChart');
   private readonly findTimeout = 2500;
 
   async panelCount(expectedCount: number) {
     this.log.debug(`DashboardExpect.panelCount(${expectedCount})`);
     await this.retry.try(async () => {
-      const panelCount = await this.PageObjects.dashboard.getPanelCount();
+      const panelCount = await this.dashboard.getPanelCount();
       expect(panelCount).to.be(expectedCount);
     });
   }
 
   async visualizationsArePresent(vizList: string[]) {
     this.log.debug('Checking all visualisations are present on dashsboard');
-    let notLoaded = await this.PageObjects.dashboard.getNotLoadedVisualizations(vizList);
+    let notLoaded = await this.dashboard.getNotLoadedVisualizations(vizList);
     // TODO: Determine issue occasionally preventing 'geo map' from loading
     notLoaded = notLoaded.filter((x) => x !== 'Rendering Test: geo map');
     expect(notLoaded).to.be.empty();
@@ -231,7 +232,7 @@ export class DashboardExpectService extends FtrService {
   async dataTableRowCount(expectedCount: number) {
     this.log.debug(`DashboardExpect.dataTableRowCount(${expectedCount})`);
     await this.retry.try(async () => {
-      const dataTableRows = await this.PageObjects.visChart.getTableVisContent();
+      const dataTableRows = await this.visChart.getTableVisContent();
       expect(dataTableRows.length).to.be(expectedCount);
     });
   }
@@ -239,7 +240,7 @@ export class DashboardExpectService extends FtrService {
   async dataTableNoResult() {
     this.log.debug(`DashboardExpect.dataTableNoResult`);
     await this.retry.try(async () => {
-      await this.PageObjects.visChart.getTableVisNoResult();
+      await this.visChart.getTableVisNoResult();
     });
   }
 
diff --git a/test/functional/services/dashboard/panel_actions.ts b/test/functional/services/dashboard/panel_actions.ts
index e7c028acc0e1b..9aca790b0b437 100644
--- a/test/functional/services/dashboard/panel_actions.ts
+++ b/test/functional/services/dashboard/panel_actions.ts
@@ -25,7 +25,9 @@ export class DashboardPanelActionsService extends FtrService {
   private readonly log = this.ctx.getService('log');
   private readonly testSubjects = this.ctx.getService('testSubjects');
   private readonly inspector = this.ctx.getService('inspector');
-  private readonly PageObjects = this.ctx.getPageObjects(['header', 'common', 'dashboard']);
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly dashboard = this.ctx.getPageObject('dashboard');
 
   async findContextMenu(parent?: WebElementWrapper) {
     return parent
@@ -78,8 +80,8 @@ export class DashboardPanelActionsService extends FtrService {
     const isActionVisible = await this.testSubjects.exists(EDIT_PANEL_DATA_TEST_SUBJ);
     if (!isActionVisible) await this.clickContextMenuMoreItem();
     await this.testSubjects.clickWhenNotDisabled(EDIT_PANEL_DATA_TEST_SUBJ);
-    await this.PageObjects.header.waitUntilLoadingHasFinished();
-    await this.PageObjects.common.waitForTopNavToBeVisible();
+    await this.header.waitUntilLoadingHasFinished();
+    await this.common.waitForTopNavToBeVisible();
   }
 
   async editPanelByTitle(title?: string) {
@@ -146,7 +148,7 @@ export class DashboardPanelActionsService extends FtrService {
       await this.openContextMenu();
     }
     await this.testSubjects.click(CLONE_PANEL_DATA_TEST_SUBJ);
-    await this.PageObjects.dashboard.waitForRenderComplete();
+    await this.dashboard.waitForRenderComplete();
   }
 
   async openCopyToModalByTitle(title?: string) {
diff --git a/test/functional/services/dashboard/visualizations.ts b/test/functional/services/dashboard/visualizations.ts
index a6b88802d7b81..8688d375f7a7b 100644
--- a/test/functional/services/dashboard/visualizations.ts
+++ b/test/functional/services/dashboard/visualizations.ts
@@ -13,25 +13,23 @@ export class DashboardVisualizationsService extends FtrService {
   private readonly queryBar = this.ctx.getService('queryBar');
   private readonly testSubjects = this.ctx.getService('testSubjects');
   private readonly dashboardAddPanel = this.ctx.getService('dashboardAddPanel');
-  private readonly PageObjects = this.ctx.getPageObjects([
-    'dashboard',
-    'visualize',
-    'visEditor',
-    'header',
-    'discover',
-    'timePicker',
-  ]);
+  private readonly dashboard = this.ctx.getPageObject('dashboard');
+  private readonly visualize = this.ctx.getPageObject('visualize');
+  private readonly visEditor = this.ctx.getPageObject('visEditor');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly discover = this.ctx.getPageObject('discover');
+  private readonly timePicker = this.ctx.getPageObject('timePicker');
 
   async createAndAddTSVBVisualization(name: string) {
     this.log.debug(`createAndAddTSVBVisualization(${name})`);
-    const inViewMode = await this.PageObjects.dashboard.getIsInViewMode();
+    const inViewMode = await this.dashboard.getIsInViewMode();
     if (inViewMode) {
-      await this.PageObjects.dashboard.switchToEditMode();
+      await this.dashboard.switchToEditMode();
     }
     await this.dashboardAddPanel.clickEditorMenuButton();
     await this.dashboardAddPanel.clickAddNewEmbeddableLink('metrics');
-    await this.PageObjects.visualize.clickVisualBuilder();
-    await this.PageObjects.visualize.saveVisualizationExpectSuccess(name);
+    await this.visualize.clickVisualBuilder();
+    await this.visualize.saveVisualizationExpectSuccess(name);
   }
 
   async createSavedSearch({
@@ -44,8 +42,8 @@ export class DashboardVisualizationsService extends FtrService {
     fields?: string[];
   }) {
     this.log.debug(`createSavedSearch(${name})`);
-    await this.PageObjects.header.clickDiscover(true);
-    await this.PageObjects.timePicker.setHistoricalDataRange();
+    await this.header.clickDiscover(true);
+    await this.timePicker.setHistoricalDataRange();
 
     if (query) {
       await this.queryBar.setQuery(query);
@@ -54,12 +52,12 @@ export class DashboardVisualizationsService extends FtrService {
 
     if (fields) {
       for (let i = 0; i < fields.length; i++) {
-        await this.PageObjects.discover.clickFieldListItemAdd(fields[i]);
+        await this.discover.clickFieldListItemAdd(fields[i]);
       }
     }
 
-    await this.PageObjects.discover.saveSearch(name);
-    await this.PageObjects.header.waitUntilLoadingHasFinished();
+    await this.discover.saveSearch(name);
+    await this.header.waitUntilLoadingHasFinished();
     await this.testSubjects.exists('saveSearchSuccess');
   }
 
@@ -75,25 +73,25 @@ export class DashboardVisualizationsService extends FtrService {
     this.log.debug(`createAndAddSavedSearch(${name})`);
     await this.createSavedSearch({ name, query, fields });
 
-    await this.PageObjects.header.clickDashboard();
+    await this.header.clickDashboard();
 
-    const inViewMode = await this.PageObjects.dashboard.getIsInViewMode();
+    const inViewMode = await this.dashboard.getIsInViewMode();
     if (inViewMode) {
-      await this.PageObjects.dashboard.switchToEditMode();
+      await this.dashboard.switchToEditMode();
     }
     await this.dashboardAddPanel.addSavedSearch(name);
   }
 
   async createAndAddMarkdown({ name, markdown }: { name: string; markdown: string }) {
     this.log.debug(`createAndAddMarkdown(${markdown})`);
-    const inViewMode = await this.PageObjects.dashboard.getIsInViewMode();
+    const inViewMode = await this.dashboard.getIsInViewMode();
     if (inViewMode) {
-      await this.PageObjects.dashboard.switchToEditMode();
+      await this.dashboard.switchToEditMode();
     }
     await this.dashboardAddPanel.clickMarkdownQuickButton();
-    await this.PageObjects.visEditor.setMarkdownTxt(markdown);
-    await this.PageObjects.visEditor.clickGo();
-    await this.PageObjects.visualize.saveVisualizationExpectSuccess(name, {
+    await this.visEditor.setMarkdownTxt(markdown);
+    await this.visEditor.clickGo();
+    await this.visualize.saveVisualizationExpectSuccess(name, {
       saveAsNew: false,
       redirectToOrigin: true,
     });
@@ -101,9 +99,9 @@ export class DashboardVisualizationsService extends FtrService {
 
   async createAndEmbedMetric(name: string) {
     this.log.debug(`createAndEmbedMetric(${name})`);
-    const inViewMode = await this.PageObjects.dashboard.getIsInViewMode();
+    const inViewMode = await this.dashboard.getIsInViewMode();
     if (inViewMode) {
-      await this.PageObjects.dashboard.switchToEditMode();
+      await this.dashboard.switchToEditMode();
     }
     await this.dashboardAddPanel.clickEditorMenuButton();
     await this.dashboardAddPanel.clickAggBasedVisualizations();
@@ -115,13 +113,13 @@ export class DashboardVisualizationsService extends FtrService {
 
   async createAndEmbedMarkdown({ name, markdown }: { name: string; markdown: string }) {
     this.log.debug(`createAndEmbedMarkdown(${markdown})`);
-    const inViewMode = await this.PageObjects.dashboard.getIsInViewMode();
+    const inViewMode = await this.dashboard.getIsInViewMode();
     if (inViewMode) {
-      await this.PageObjects.dashboard.switchToEditMode();
+      await this.dashboard.switchToEditMode();
     }
     await this.dashboardAddPanel.clickMarkdownQuickButton();
-    await this.PageObjects.visEditor.setMarkdownTxt(markdown);
-    await this.PageObjects.visEditor.clickGo();
+    await this.visEditor.setMarkdownTxt(markdown);
+    await this.visEditor.clickGo();
     await this.testSubjects.click('visualizesaveAndReturnButton');
   }
 }
diff --git a/test/functional/services/data_grid.ts b/test/functional/services/data_grid.ts
index a00587c978977..f54e7b65a46e2 100644
--- a/test/functional/services/data_grid.ts
+++ b/test/functional/services/data_grid.ts
@@ -10,7 +10,7 @@ import { chunk } from 'lodash';
 import { FtrService } from '../ftr_provider_context';
 import { WebElementWrapper } from './lib/web_element_wrapper';
 
-interface TabbedGridData {
+export interface TabbedGridData {
   columns: string[];
   rows: string[][];
 }
@@ -22,7 +22,7 @@ interface SelectOptions {
 export class DataGridService extends FtrService {
   private readonly find = this.ctx.getService('find');
   private readonly testSubjects = this.ctx.getService('testSubjects');
-  private readonly PageObjects = this.ctx.getPageObjects(['common', 'header']);
+  private readonly header = this.ctx.getPageObject('header');
   private readonly retry = this.ctx.getService('retry');
 
   async getDataGridTableData(): Promise<TabbedGridData> {
@@ -135,6 +135,7 @@ export class DataGridService extends FtrService {
     if (!table) {
       return [];
     }
+
     const cells = await table.findAllByCssSelector('.euiDataGridRowCell');
 
     const rows: WebElementWrapper[][] = [];
@@ -173,14 +174,13 @@ export class DataGridService extends FtrService {
   }
 
   public async getHeaderFields(): Promise<string[]> {
-    const result = await this.find.allByCssSelector('.euiDataGridHeaderCell__content');
+    const result = await this.find.allByCssSelector(
+      '.euiDataGridHeaderCell__button > .euiDataGridHeaderCell__content'
+    );
+
     const textArr = [];
-    let idx = 0;
     for (const cell of result) {
-      if (idx > 1) {
-        textArr.push(await cell.getVisibleText());
-      }
-      idx++;
+      textArr.push(await cell.getVisibleText());
     }
     return Promise.resolve(textArr);
   }
@@ -200,7 +200,7 @@ export class DataGridService extends FtrService {
     });
   }
 
-  public async clickDocSortAsc(field?: string, sortText = 'Sort New-Old') {
+  public async clickDocSortAsc(field?: string, sortText = 'Sort Old-New') {
     if (field) {
       await this.openColMenuByField(field);
     } else {
@@ -209,7 +209,7 @@ export class DataGridService extends FtrService {
     await this.find.clickByButtonText(sortText);
   }
 
-  public async clickDocSortDesc(field?: string, sortText = 'Sort Old-New') {
+  public async clickDocSortDesc(field?: string, sortText = 'Sort New-Old') {
     if (field) {
       await this.openColMenuByField(field);
     } else {
@@ -234,7 +234,7 @@ export class DataGridService extends FtrService {
     const tableDocViewRow = await this.getTableDocViewRow(detailsRow, fieldName);
     const addInclusiveFilterButton = await this.getAddInclusiveFilterButton(tableDocViewRow);
     await addInclusiveFilterButton.click();
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async getAddInclusiveFilterButton(
@@ -263,7 +263,7 @@ export class DataGridService extends FtrService {
     const tableDocViewRow = await this.getTableDocViewRow(detailsRow, fieldName);
     const addInclusiveFilterButton = await this.getRemoveInclusiveFilterButton(tableDocViewRow);
     await addInclusiveFilterButton.click();
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async hasNoResults() {
diff --git a/test/functional/services/doc_table.ts b/test/functional/services/doc_table.ts
index 6c73faec16b1a..685f1748d56b2 100644
--- a/test/functional/services/doc_table.ts
+++ b/test/functional/services/doc_table.ts
@@ -17,7 +17,7 @@ interface SelectOptions {
 export class DocTableService extends FtrService {
   private readonly testSubjects = this.ctx.getService('testSubjects');
   private readonly retry = this.ctx.getService('retry');
-  private readonly PageObjects = this.ctx.getPageObjects(['common', 'header']);
+  private readonly header = this.ctx.getPageObject('header');
 
   public async getTable(selector?: string) {
     return await this.testSubjects.find(selector ? selector : 'docTable');
@@ -126,7 +126,7 @@ export class DocTableService extends FtrService {
     const tableDocViewRow = await this.getTableDocViewRow(detailsRow, fieldName);
     const addInclusiveFilterButton = await this.getAddInclusiveFilterButton(tableDocViewRow);
     await addInclusiveFilterButton.click();
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async getRemoveInclusiveFilterButton(
@@ -142,7 +142,7 @@ export class DocTableService extends FtrService {
     const tableDocViewRow = await this.getTableDocViewRow(detailsRow, fieldName);
     const addInclusiveFilterButton = await this.getRemoveInclusiveFilterButton(tableDocViewRow);
     await addInclusiveFilterButton.click();
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async getAddExistsFilterButton(
@@ -155,7 +155,7 @@ export class DocTableService extends FtrService {
     const tableDocViewRow = await this.getTableDocViewRow(detailsRow, fieldName);
     const addInclusiveFilterButton = await this.getAddExistsFilterButton(tableDocViewRow);
     await addInclusiveFilterButton.click();
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async toggleRowExpanded({
@@ -163,7 +163,7 @@ export class DocTableService extends FtrService {
     rowIndex = 0,
   }: SelectOptions = {}): Promise<WebElementWrapper> {
     await this.clickRowToggle({ isAnchorRow, rowIndex });
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
     return await this.retry.try(async () => {
       const row = isAnchorRow ? await this.getAnchorRow() : (await this.getBodyRows())[rowIndex];
       const detailsRow = await row.findByXpath(
diff --git a/test/functional/services/embedding.ts b/test/functional/services/embedding.ts
index e394aff19ab8b..6d168b00c5447 100644
--- a/test/functional/services/embedding.ts
+++ b/test/functional/services/embedding.ts
@@ -11,7 +11,7 @@ import { FtrService } from '../ftr_provider_context';
 export class EmbeddingService extends FtrService {
   private readonly browser = this.ctx.getService('browser');
   private readonly log = this.ctx.getService('log');
-  private readonly PageObjects = this.ctx.getPageObjects(['header']);
+  private readonly header = this.ctx.getPageObject('header');
 
   /**
    * Opens current page in embeded mode
@@ -20,6 +20,6 @@ export class EmbeddingService extends FtrService {
     const currentUrl = await this.browser.getCurrentUrl();
     this.log.debug(`Opening in embedded mode: ${currentUrl}`);
     await this.browser.get(`${currentUrl}&embed=true`);
-    await this.PageObjects.header.waitUntilLoadingHasFinished();
+    await this.header.waitUntilLoadingHasFinished();
   }
 }
diff --git a/test/functional/services/filter_bar.ts b/test/functional/services/filter_bar.ts
index 5f20d3d4f8b7b..1d0b85eed3a9c 100644
--- a/test/functional/services/filter_bar.ts
+++ b/test/functional/services/filter_bar.ts
@@ -12,7 +12,8 @@ import { FtrService } from '../ftr_provider_context';
 export class FilterBarService extends FtrService {
   private readonly comboBox = this.ctx.getService('comboBox');
   private readonly testSubjects = this.ctx.getService('testSubjects');
-  private readonly PageObjects = this.ctx.getPageObjects(['common', 'header']);
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
 
   /**
    * Checks if specified filter exists
@@ -56,7 +57,7 @@ export class FilterBarService extends FtrService {
   public async removeFilter(key: string): Promise<void> {
     await this.testSubjects.click(`~filter & ~filter-key-${key}`);
     await this.testSubjects.click(`deleteFilter`);
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   /**
@@ -65,8 +66,8 @@ export class FilterBarService extends FtrService {
   public async removeAllFilters(): Promise<void> {
     await this.testSubjects.click('showFilterActions');
     await this.testSubjects.click('removeAllFilters');
-    await this.PageObjects.header.waitUntilLoadingHasFinished();
-    await this.PageObjects.common.waitUntilUrlIncludes('filters:!()');
+    await this.header.waitUntilLoadingHasFinished();
+    await this.common.waitUntilUrlIncludes('filters:!()');
   }
 
   /**
@@ -77,13 +78,13 @@ export class FilterBarService extends FtrService {
   public async toggleFilterEnabled(key: string): Promise<void> {
     await this.testSubjects.click(`~filter & ~filter-key-${key}`);
     await this.testSubjects.click(`disableFilter`);
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async toggleFilterPinned(key: string): Promise<void> {
     await this.testSubjects.click(`~filter & ~filter-key-${key}`);
     await this.testSubjects.click(`pinFilter`);
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   public async isFilterPinned(key: string): Promise<boolean> {
@@ -141,7 +142,7 @@ export class FilterBarService extends FtrService {
       }
     }
     await this.testSubjects.click('saveFilter');
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   /**
@@ -152,7 +153,7 @@ export class FilterBarService extends FtrService {
   public async clickEditFilter(key: string, value: string): Promise<void> {
     await this.testSubjects.click(`~filter & ~filter-key-${key} & ~filter-value-${value}`);
     await this.testSubjects.click(`editFilter`);
-    await this.PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    await this.header.awaitGlobalLoadingIndicatorHidden();
   }
 
   /**
diff --git a/test/functional/services/index.ts b/test/functional/services/index.ts
index a509141390f67..26f562799b297 100644
--- a/test/functional/services/index.ts
+++ b/test/functional/services/index.ts
@@ -47,7 +47,7 @@ import { ListingTableService } from './listing_table';
 import { SavedQueryManagementComponentService } from './saved_query_management_component';
 import { KibanaSupertestProvider } from './supertest';
 import { MenuToggleService } from './menu_toggle';
-import { MonacoEditorProvider } from './monaco_editor';
+import { MonacoEditorService } from './monaco_editor';
 
 export const services = {
   ...commonServiceProviders,
@@ -84,6 +84,6 @@ export const services = {
   elasticChart: ElasticChartService,
   supertest: KibanaSupertestProvider,
   managementMenu: ManagementMenuService,
-  monacoEditor: MonacoEditorProvider,
+  monacoEditor: MonacoEditorService,
   menuToggle: MenuToggleService,
 };
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 b1561b29342da..148c21ffac191 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
@@ -9,7 +9,6 @@
 import { delay } from 'bluebird';
 import { WebElement, WebDriver, By, Key } from 'selenium-webdriver';
 import { PNG } from 'pngjs';
-// @ts-ignore not supported yet
 import cheerio from 'cheerio';
 import testSubjSelector from '@kbn/test-subj-selector';
 import { ToolingLog } from '@kbn/dev-utils';
diff --git a/test/functional/services/listing_table.ts b/test/functional/services/listing_table.ts
index 79678cf7a812b..1cd4249df5050 100644
--- a/test/functional/services/listing_table.ts
+++ b/test/functional/services/listing_table.ts
@@ -17,8 +17,8 @@ export class ListingTableService extends FtrService {
   private readonly find = this.ctx.getService('find');
   private readonly log = this.ctx.getService('log');
   private readonly retry = this.ctx.getService('retry');
-  private readonly common = this.ctx.getPageObjects(['common']).common;
-  private readonly header = this.ctx.getPageObjects(['header']).header;
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
 
   private async getSearchFilter() {
     return await this.testSubjects.find('tableListSearchBox');
diff --git a/test/functional/services/management/management_menu.ts b/test/functional/services/management/management_menu.ts
index 738a8d55439ec..2b93fce4daa51 100644
--- a/test/functional/services/management/management_menu.ts
+++ b/test/functional/services/management/management_menu.ts
@@ -13,7 +13,7 @@ export class ManagementMenuService extends FtrService {
 
   public async getSections() {
     const sectionsElements = await this.find.allByCssSelector(
-      '.mgtSideBarNav > .euiSideNav__content > .euiSideNavItem'
+      '.kbnPageTemplateSolutionNav .euiSideNavItem--root'
     );
 
     const sections = [];
diff --git a/test/functional/services/monaco_editor.ts b/test/functional/services/monaco_editor.ts
index 4e791e54c4b09..572606f896454 100644
--- a/test/functional/services/monaco_editor.ts
+++ b/test/functional/services/monaco_editor.ts
@@ -6,26 +6,24 @@
  * Side Public License, v 1.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function MonacoEditorProvider({ getService }: FtrProviderContext) {
-  const retry = getService('retry');
-  const browser = getService('browser');
+export class MonacoEditorService extends FtrService {
+  private readonly retry = this.ctx.getService('retry');
+  private readonly browser = this.ctx.getService('browser');
 
-  return new (class MonacoEditor {
-    public async getCodeEditorValue(nthIndex: number = 0) {
-      let values: string[] = [];
+  public async getCodeEditorValue(nthIndex: number = 0) {
+    let values: string[] = [];
 
-      await retry.try(async () => {
-        values = await browser.execute(
-          () =>
-            (window as any).MonacoEnvironment.monaco.editor
-              .getModels()
-              .map((model: any) => model.getValue()) as string[]
-        );
-      });
+    await this.retry.try(async () => {
+      values = await this.browser.execute(
+        () =>
+          (window as any).MonacoEnvironment.monaco.editor
+            .getModels()
+            .map((model: any) => model.getValue()) as string[]
+      );
+    });
 
-      return values[nthIndex] as string;
-    }
-  })();
+    return values[nthIndex] as string;
+  }
 }
diff --git a/test/functional/services/query_bar.ts b/test/functional/services/query_bar.ts
index 31586d92d92a9..f0728f2b022e3 100644
--- a/test/functional/services/query_bar.ts
+++ b/test/functional/services/query_bar.ts
@@ -13,7 +13,8 @@ export class QueryBarService extends FtrService {
   private readonly testSubjects = this.ctx.getService('testSubjects');
   private readonly retry = this.ctx.getService('retry');
   private readonly log = this.ctx.getService('log');
-  private readonly PageObjects = this.ctx.getPageObjects(['header', 'common']);
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
   private readonly find = this.ctx.getService('find');
   private readonly browser = this.ctx.getService('browser');
 
@@ -42,15 +43,15 @@ export class QueryBarService extends FtrService {
 
   public async clearQuery(): Promise<void> {
     await this.setQuery('');
-    await this.PageObjects.common.pressTabKey(); // move outside of input into language switcher
-    await this.PageObjects.common.pressTabKey(); // move outside of language switcher so time picker appears
+    await this.common.pressTabKey(); // move outside of input into language switcher
+    await this.common.pressTabKey(); // move outside of language switcher so time picker appears
   }
 
   public async submitQuery(): Promise<void> {
     this.log.debug('QueryBar.submitQuery');
     await this.testSubjects.click('queryInput');
-    await this.PageObjects.common.pressEnterKey();
-    await this.PageObjects.header.waitUntilLoadingHasFinished();
+    await this.common.pressEnterKey();
+    await this.header.waitUntilLoadingHasFinished();
   }
 
   public async clickQuerySubmitButton(): Promise<void> {
diff --git a/test/functional/services/remote/prevent_parallel_calls.ts b/test/functional/services/remote/prevent_parallel_calls.ts
index d21abc9d26867..338bfbd427873 100644
--- a/test/functional/services/remote/prevent_parallel_calls.ts
+++ b/test/functional/services/remote/prevent_parallel_calls.ts
@@ -6,44 +6,49 @@
  * Side Public License, v 1.
  */
 
-export function preventParallelCalls<C extends void, A, R>(
-  fn: (this: C, arg: A) => Promise<R>,
-  filter: (arg: A) => boolean
-) {
-  const execQueue: Task[] = [];
+class Task<C, A, R> {
+  public promise: Promise<R>;
+  private resolve!: (result: R) => void;
+  private reject!: (error: Error) => void;
 
-  class Task {
-    public promise: Promise<R>;
-    private resolve!: (result: R) => void;
-    private reject!: (error: Error) => void;
-
-    constructor(private readonly context: C, private readonly arg: A) {
-      this.promise = new Promise((resolve, reject) => {
-        this.resolve = resolve;
-        this.reject = reject;
-      });
-    }
+  constructor(
+    private readonly execQueue: Array<Task<C, A, R>>,
+    private readonly fn: (this: C, arg: A) => Promise<R>,
+    private readonly context: C,
+    private readonly arg: A
+  ) {
+    this.promise = new Promise((resolve, reject) => {
+      this.resolve = resolve;
+      this.reject = reject;
+    });
+  }
 
-    public async exec() {
-      try {
-        this.resolve(await fn.call(this.context, this.arg));
-      } catch (error) {
-        this.reject(error);
-      } finally {
-        execQueue.shift();
-        if (execQueue.length) {
-          execQueue[0].exec();
-        }
+  public async exec() {
+    try {
+      this.resolve(await this.fn.call(this.context, this.arg));
+    } catch (error) {
+      this.reject(error);
+    } finally {
+      this.execQueue.shift();
+      if (this.execQueue.length) {
+        this.execQueue[0].exec();
       }
     }
   }
+}
+
+export function preventParallelCalls<C extends void, A, R>(
+  fn: (this: C, arg: A) => Promise<R>,
+  filter: (arg: A) => boolean
+) {
+  const execQueue: Array<Task<C, A, R>> = [];
 
   return async function (this: C, arg: A) {
     if (filter(arg)) {
       return await fn.call(this, arg);
     }
 
-    const task = new Task(this, arg);
+    const task = new Task(execQueue, fn, this, arg);
     if (execQueue.push(task) === 1) {
       // only item in the queue, kick it off
       task.exec();
diff --git a/test/functional/services/saved_query_management_component.ts b/test/functional/services/saved_query_management_component.ts
index aabe8c0aebb0c..decf1618c7879 100644
--- a/test/functional/services/saved_query_management_component.ts
+++ b/test/functional/services/saved_query_management_component.ts
@@ -14,7 +14,7 @@ export class SavedQueryManagementComponentService extends FtrService {
   private readonly queryBar = this.ctx.getService('queryBar');
   private readonly retry = this.ctx.getService('retry');
   private readonly config = this.ctx.getService('config');
-  private readonly PageObjects = this.ctx.getPageObjects(['common']);
+  private readonly common = this.ctx.getPageObject('common');
 
   public async getCurrentlyLoadedQueryID() {
     await this.openSavedQueryManagementComponent();
@@ -93,7 +93,7 @@ export class SavedQueryManagementComponentService extends FtrService {
   public async deleteSavedQuery(title: string) {
     await this.openSavedQueryManagementComponent();
     await this.testSubjects.click(`~delete-saved-query-${title}-button`);
-    await this.PageObjects.common.clickConfirmOnModal();
+    await this.common.clickConfirmOnModal();
   }
 
   async clearCurrentlyLoadedQuery() {
diff --git a/test/functional/services/visualizations/pie_chart.ts b/test/functional/services/visualizations/pie_chart.ts
index cac4e8fe64c5e..7c925318f0211 100644
--- a/test/functional/services/visualizations/pie_chart.ts
+++ b/test/functional/services/visualizations/pie_chart.ts
@@ -9,6 +9,8 @@
 import expect from '@kbn/expect';
 import { FtrService } from '../../ftr_provider_context';
 
+const pieChartSelector = 'visTypePieChart';
+
 export class PieChartService extends FtrService {
   private readonly log = this.ctx.getService('log');
   private readonly retry = this.ctx.getService('retry');
@@ -18,20 +20,42 @@ export class PieChartService extends FtrService {
   private readonly find = this.ctx.getService('find');
   private readonly panelActions = this.ctx.getService('dashboardPanelActions');
   private readonly defaultFindTimeout = this.config.get('timeouts.find');
+  private readonly visChart = this.ctx.getPageObject('visChart');
 
   private readonly filterActionText = 'Apply filter to current view';
 
   async clickOnPieSlice(name?: string) {
     this.log.debug(`PieChart.clickOnPieSlice(${name})`);
-    if (name) {
-      await this.testSubjects.click(`pieSlice-${name.split(' ').join('-')}`);
+    if (await this.visChart.isNewLibraryChart(pieChartSelector)) {
+      const slices =
+        (await this.visChart.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ??
+        [];
+      let sliceLabel = name || slices[0].name;
+      if (name === 'Other') {
+        sliceLabel = '__other__';
+      }
+      const pieSlice = slices.find((slice) => slice.name === sliceLabel);
+      const pie = await this.testSubjects.find(pieChartSelector);
+      if (pieSlice) {
+        const pieSize = await pie.getSize();
+        const pieHeight = pieSize.height;
+        const pieWidth = pieSize.width;
+        await pie.clickMouseButton({
+          xOffset: pieSlice.coords[0] - Math.floor(pieWidth / 2),
+          yOffset: pieSlice.coords[1] - Math.floor(pieHeight / 2),
+        });
+      }
     } else {
-      // If no pie slice has been provided, find the first one available.
-      await this.retry.try(async () => {
-        const slices = await this.find.allByCssSelector('svg > g > g.arcs > path.slice');
-        this.log.debug('Slices found:' + slices.length);
-        return slices[0].click();
-      });
+      if (name) {
+        await this.testSubjects.click(`pieSlice-${name.split(' ').join('-')}`);
+      } else {
+        // If no pie slice has been provided, find the first one available.
+        await this.retry.try(async () => {
+          const slices = await this.find.allByCssSelector('svg > g > g.arcs > path.slice');
+          this.log.debug('Slices found:' + slices.length);
+          return slices[0].click();
+        });
+      }
     }
   }
 
@@ -63,12 +87,30 @@ export class PieChartService extends FtrService {
 
   async getPieSliceStyle(name: string) {
     this.log.debug(`VisualizePage.getPieSliceStyle(${name})`);
+    if (await this.visChart.isNewLibraryChart(pieChartSelector)) {
+      const slices =
+        (await this.visChart.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ??
+        [];
+      const selectedSlice = slices.filter((slice) => {
+        return slice.name.toString() === name.replace(',', '');
+      });
+      return selectedSlice[0]?.color;
+    }
     const pieSlice = await this.getPieSlice(name);
     return await pieSlice.getAttribute('style');
   }
 
   async getAllPieSliceStyles(name: string) {
     this.log.debug(`VisualizePage.getAllPieSliceStyles(${name})`);
+    if (await this.visChart.isNewLibraryChart(pieChartSelector)) {
+      const slices =
+        (await this.visChart.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ??
+        [];
+      const selectedSlice = slices.filter((slice) => {
+        return slice.name.toString() === name.replace(',', '');
+      });
+      return selectedSlice.map((slice) => slice.color);
+    }
     const pieSlices = await this.getAllPieSlices(name);
     return await Promise.all(
       pieSlices.map(async (pieSlice) => await pieSlice.getAttribute('style'))
@@ -87,6 +129,24 @@ export class PieChartService extends FtrService {
   }
 
   async getPieChartLabels() {
+    if (await this.visChart.isNewLibraryChart(pieChartSelector)) {
+      const slices =
+        (await this.visChart.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ??
+        [];
+      return slices.map((slice) => {
+        if (slice.name === '__missing__') {
+          return 'Missing';
+        } else if (slice.name === '__other__') {
+          return 'Other';
+        } else if (typeof slice.name === 'number') {
+          // debugState of escharts returns the numbers without comma
+          const val = slice.name as number;
+          return val.toString().replace(/\B(?<!\.\d*)(?=(\d{3})+(?!\d))/g, ',');
+        } else {
+          return slice.name;
+        }
+      });
+    }
     const chartTypes = await this.find.allByCssSelector('path.slice', this.defaultFindTimeout * 2);
     return await Promise.all(
       chartTypes.map(async (chart) => await chart.getAttribute('data-label'))
@@ -95,10 +155,23 @@ export class PieChartService extends FtrService {
 
   async getPieSliceCount() {
     this.log.debug('PieChart.getPieSliceCount');
+    if (await this.visChart.isNewLibraryChart(pieChartSelector)) {
+      const slices =
+        (await this.visChart.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ??
+        [];
+      return slices?.length;
+    }
     const slices = await this.find.allByCssSelector('svg > g > g.arcs > path.slice');
     return slices.length;
   }
 
+  async expectPieSliceCountEsCharts(expectedCount: number) {
+    const slices =
+      (await this.visChart.getEsChartDebugState(pieChartSelector))?.partition?.[0]?.partitions ??
+      [];
+    expect(slices.length).to.be(expectedCount);
+  }
+
   async expectPieSliceCount(expectedCount: number) {
     this.log.debug(`PieChart.expectPieSliceCount(${expectedCount})`);
     await this.retry.try(async () => {
@@ -111,7 +184,7 @@ export class PieChartService extends FtrService {
     this.log.debug(`PieChart.expectPieChartLabels(${expectedLabels.join(',')})`);
     await this.retry.try(async () => {
       const pieData = await this.getPieChartLabels();
-      expect(pieData).to.eql(expectedLabels);
+      expect(pieData.sort()).to.eql(expectedLabels);
     });
   }
 }
diff --git a/test/interpreter_functional/config.ts b/test/interpreter_functional/config.ts
index adcac520125ad..c0ec982fb98b6 100644
--- a/test/interpreter_functional/config.ts
+++ b/test/interpreter_functional/config.ts
@@ -26,9 +26,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers: functionalConfig.get('servers'),
     esTestCluster: functionalConfig.get('esTestCluster'),
     apps: functionalConfig.get('apps'),
-    esArchiver: {
-      directory: path.resolve(__dirname, '../es_archives'),
-    },
     snapshots: {
       directory: path.resolve(__dirname, 'snapshots'),
     },
diff --git a/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
new file mode 100644
index 0000000000000..c750602f735bd
--- /dev/null
+++ b/test/interpreter_functional/test_suites/run_pipeline/esaggs_timeshift.ts
@@ -0,0 +1,371 @@
+/*
+ * Copyright 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 { Datatable } from 'src/plugins/expressions';
+import { ExpectExpression, expectExpressionProvider } from './helpers';
+import { FtrProviderContext } from '../../../functional/ftr_provider_context';
+
+function getCell(esaggsResult: any, row: number, column: number): unknown | undefined {
+  const columnId = esaggsResult?.columns[column]?.id;
+  if (!columnId) {
+    return;
+  }
+  return esaggsResult?.rows[row]?.[columnId];
+}
+
+function checkShift(rows: Datatable['rows'], columns: Datatable['columns'], metricIndex = 1) {
+  rows.shift();
+  rows.pop();
+  rows.forEach((_, index) => {
+    if (index < rows.length - 1) {
+      expect(getCell({ rows, columns }, index, metricIndex + 1)).to.be(
+        getCell({ rows, columns }, index + 1, metricIndex)
+      );
+    }
+  });
+}
+
+export default function ({
+  getService,
+  updateBaselines,
+}: FtrProviderContext & { updateBaselines: boolean }) {
+  let expectExpression: ExpectExpression;
+
+  describe('esaggs timeshift tests', () => {
+    before(() => {
+      expectExpression = expectExpressionProvider({ getService, updateBaselines });
+    });
+
+    const timeRange = {
+      from: '2015-09-21T00:00:00Z',
+      to: '2015-09-22T00:00:00Z',
+    };
+
+    it('shifts single metric', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggCount id="1" enabled=true schema="metric" timeShift="1d"}
+        `;
+      const result = await expectExpression('esaggs_shift_single_metric', expression).getResponse();
+      expect(getCell(result, 0, 0)).to.be(4763);
+    });
+
+    it('shifts multiple metrics', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggCount id="1" enabled=true schema="metric" timeShift="12h"}
+          aggs={aggCount id="2" enabled=true schema="metric" timeShift="1d"}
+          aggs={aggCount id="3" enabled=true schema="metric"}
+        `;
+      const result = await expectExpression('esaggs_shift_multi_metric', expression).getResponse();
+      expect(getCell(result, 0, 0)).to.be(4629);
+      expect(getCell(result, 0, 1)).to.be(4763);
+      expect(getCell(result, 0, 2)).to.be(4618);
+    });
+
+    it('shifts single percentile', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggSinglePercentile id="1" enabled=true schema="metric" field="bytes" percentile=95}
+          aggs={aggSinglePercentile id="2" enabled=true schema="metric" field="bytes" percentile=95 timeShift="1d"}
+        `;
+      const result = await expectExpression(
+        'esaggs_shift_single_percentile',
+        expression
+      ).getResponse();
+      // percentile is not stable
+      expect(getCell(result, 0, 0)).to.be.within(10000, 20000);
+      expect(getCell(result, 0, 1)).to.be.within(10000, 20000);
+    });
+
+    it('shifts multiple percentiles', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggPercentiles id="1" enabled=true schema="metric" field="bytes" percents=5 percents=95}
+          aggs={aggPercentiles id="2" enabled=true schema="metric" field="bytes" percents=5 percents=95 timeShift="1d"}
+        `;
+      const result = await expectExpression(
+        'esaggs_shift_multi_percentile',
+        expression
+      ).getResponse();
+      // percentile is not stable
+      expect(getCell(result, 0, 0)).to.be.within(100, 1000);
+      expect(getCell(result, 0, 1)).to.be.within(10000, 20000);
+      expect(getCell(result, 0, 2)).to.be.within(100, 1000);
+      expect(getCell(result, 0, 3)).to.be.within(10000, 20000);
+    });
+
+    it('shifts date histogram', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggDateHistogram id="1" enabled=true schema="bucket" field="@timestamp" interval="1h"}
+          aggs={aggAvg id="2" field="bytes" enabled=true schema="metric" timeShift="1h"}
+          aggs={aggAvg id="3" field="bytes" enabled=true schema="metric"}
+        `;
+      const result: Datatable = await expectExpression(
+        'esaggs_shift_date_histogram',
+        expression
+      ).getResponse();
+      expect(result.rows.length).to.be(25);
+      checkShift(result.rows, result.columns);
+    });
+
+    it('shifts filtered metrics', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggDateHistogram id="1" enabled=true schema="bucket" field="@timestamp" interval="1h"}
+          aggs={aggFilteredMetric
+            id="2"
+            customBucket={aggFilter
+              id="2-filter"
+              enabled=true
+              schema="bucket"
+              filter='{"language":"kuery","query":"geo.src:US"}'
+            }
+            customMetric={aggAvg id="3"
+              field="bytes"
+              enabled=true
+              schema="metric" 
+            }
+            enabled=true
+            schema="metric"
+            timeShift="1h"
+          }
+          aggs={aggFilteredMetric
+            id="4"
+            customBucket={aggFilter
+              id="4-filter"
+              enabled=true
+              schema="bucket"
+              filter='{"language":"kuery","query":"geo.src:US"}'
+            }
+            customMetric={aggAvg id="5"
+              field="bytes"
+              enabled=true
+              schema="metric" 
+            }
+            enabled=true
+            schema="metric"
+          }
+        `;
+      const result: Datatable = await expectExpression(
+        'esaggs_shift_filtered_metrics',
+        expression
+      ).getResponse();
+      expect(result.rows.length).to.be(25);
+      checkShift(result.rows, result.columns);
+    });
+
+    it('shifts terms', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggTerms id="1" field="geo.src" size="3" enabled=true schema="bucket" orderAgg={aggCount id="order" enabled=true schema="metric"} otherBucket=true}
+          aggs={aggAvg id="2" field="bytes" enabled=true schema="metric" timeShift="1d"}
+          aggs={aggAvg id="3" field="bytes" enabled=true schema="metric"}
+        `;
+      const result: Datatable = await expectExpression(
+        'esaggs_shift_terms',
+        expression
+      ).getResponse();
+      expect(result.rows).to.eql([
+        {
+          'col-0-1': 'CN',
+          'col-1-2': 40,
+          'col-2-3': 5806.404352806415,
+        },
+        {
+          'col-0-1': 'IN',
+          'col-1-2': 7901,
+          'col-2-3': 5838.315923566879,
+        },
+        {
+          'col-0-1': 'US',
+          'col-1-2': 7440,
+          'col-2-3': 5614.142857142857,
+        },
+        {
+          'col-0-1': '__other__',
+          'col-1-2': 5766.575645756458,
+          'col-2-3': 5742.1265576323985,
+        },
+      ]);
+    });
+
+    it('shifts filters', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggFilters id="1" filters='[{"input":{"query":"geo.src:\\"US\\" ","language":"kuery"},"label":""},{"input":{"query":"geo.src: \\"CN\\"","language":"kuery"},"label":""}]'}
+          aggs={aggFilters id="2" filters='[{"input":{"query":"geo.dest:\\"US\\" ","language":"kuery"},"label":""},{"input":{"query":"geo.dest: \\"CN\\"","language":"kuery"},"label":""}]'}
+          aggs={aggAvg id="3" field="bytes" enabled=true schema="metric" timeShift="2h"}
+          aggs={aggAvg id="4" field="bytes" enabled=true schema="metric"}
+        `;
+      const result: Datatable = await expectExpression(
+        'esaggs_shift_filters',
+        expression
+      ).getResponse();
+      expect(result.rows).to.eql([
+        {
+          'col-0-1': 'geo.src:"US" ',
+          'col-1-2': 'geo.dest:"US" ',
+          'col-2-3': 5956.9,
+          'col-3-4': 5956.9,
+        },
+        {
+          'col-0-1': 'geo.src:"US" ',
+          'col-1-2': 'geo.dest: "CN"',
+          'col-2-3': 5127.854838709677,
+          'col-3-4': 5085.746031746032,
+        },
+        {
+          'col-0-1': 'geo.src: "CN"',
+          'col-1-2': 'geo.dest:"US" ',
+          'col-2-3': 5648.25,
+          'col-3-4': 5643.793650793651,
+        },
+        {
+          'col-0-1': 'geo.src: "CN"',
+          'col-1-2': 'geo.dest: "CN"',
+          'col-2-3': 5842.858823529412,
+          'col-3-4': 5842.858823529412,
+        },
+      ]);
+    });
+
+    it('shifts histogram', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggHistogram id="1" field="bytes" interval=5000 enabled=true schema="bucket"}
+          aggs={aggCount id="2" enabled=true schema="metric"}
+          aggs={aggCount id="3" enabled=true schema="metric" timeShift="6h"}
+        `;
+      const result: Datatable = await expectExpression(
+        'esaggs_shift_histogram',
+        expression
+      ).getResponse();
+      expect(result.rows).to.eql([
+        {
+          'col-0-1': 0,
+          'col-1-2': 2020,
+          'col-2-3': 2036,
+        },
+        {
+          'col-0-1': 5000,
+          'col-1-2': 2360,
+          'col-2-3': 2358,
+        },
+        {
+          'col-0-1': 10000,
+          'col-1-2': 126,
+          'col-2-3': 127,
+        },
+        {
+          'col-0-1': 15000,
+          'col-1-2': 112,
+          'col-2-3': 108,
+        },
+      ]);
+    });
+
+    it('shifts sibling pipeline aggs', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggBucketSum id="1" enabled=true schema="metric" customBucket={aggTerms id="2" enabled="true" schema="bucket" field="geo.src" size="3"} customMetric={aggCount id="4" enabled="true" schema="metric"}}
+          aggs={aggBucketSum id="5" enabled=true schema="metric" timeShift="1d" customBucket={aggTerms id="6" enabled="true" schema="bucket" field="geo.src" size="3"} customMetric={aggCount id="7" enabled="true" schema="metric"}}
+        `;
+      const result: Datatable = await expectExpression(
+        'esaggs_shift_sibling_pipeline_aggs',
+        expression
+      ).getResponse();
+      expect(getCell(result, 0, 0)).to.be(2050);
+      expect(getCell(result, 0, 1)).to.be(2053);
+    });
+
+    it('shifts parent pipeline aggs', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'}
+          aggs={aggDateHistogram id="1" enabled=true schema="bucket" field="@timestamp" interval="3h" min_doc_count=0}
+          aggs={aggMovingAvg id="2" enabled=true schema="metric" metricAgg="custom" window=5 script="MovingFunctions.unweightedAvg(values)" timeShift="3h" customMetric={aggCount id="2-metric" enabled="true" schema="metric"}}
+        `;
+      const result: Datatable = await expectExpression(
+        'esaggs_shift_parent_pipeline_aggs',
+        expression
+      ).getResponse();
+      expect(result.rows).to.eql([
+        {
+          'col-0-1': 1442791800000,
+          'col-1-2': null,
+        },
+        {
+          'col-0-1': 1442802600000,
+          'col-1-2': 30,
+        },
+        {
+          'col-0-1': 1442813400000,
+          'col-1-2': 30.5,
+        },
+        {
+          'col-0-1': 1442824200000,
+          'col-1-2': 69.66666666666667,
+        },
+        {
+          'col-0-1': 1442835000000,
+          'col-1-2': 198.5,
+        },
+        {
+          'col-0-1': 1442845800000,
+          'col-1-2': 415.6,
+        },
+        {
+          'col-0-1': 1442856600000,
+          'col-1-2': 702.2,
+        },
+        {
+          'col-0-1': 1442867400000,
+          'col-1-2': 859.8,
+        },
+        {
+          'col-0-1': 1442878200000,
+          'col-1-2': 878.4,
+        },
+      ]);
+    });
+
+    it('metrics at all levels should work for single shift', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'} metricsAtAllLevels=true
+          aggs={aggCount id="1" enabled=true schema="metric" timeShift="1d"}
+        `;
+      const result = await expectExpression('esaggs_shift_single_metric', expression).getResponse();
+      expect(getCell(result, 0, 0)).to.be(4763);
+    });
+
+    it('metrics at all levels should fail for multiple shifts', async () => {
+      const expression = `
+          kibana_context timeRange={timerange from='${timeRange.from}' to='${timeRange.to}'}
+          | esaggs index={indexPatternLoad id='logstash-*'} metricsAtAllLevels=true
+          aggs={aggCount id="1" enabled=true schema="metric" timeShift="1d"}
+          aggs={aggCount id="2" enabled=true schema="metric"}
+        `;
+      const result = await expectExpression('esaggs_shift_single_metric', expression).getResponse();
+      expect(result.type).to.be('error');
+    });
+  });
+}
diff --git a/test/interpreter_functional/test_suites/run_pipeline/index.ts b/test/interpreter_functional/test_suites/run_pipeline/index.ts
index c33a87a93b903..9cf7e0deba2fa 100644
--- a/test/interpreter_functional/test_suites/run_pipeline/index.ts
+++ b/test/interpreter_functional/test_suites/run_pipeline/index.ts
@@ -20,8 +20,8 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
     this.tags(['skipFirefox']);
 
     before(async () => {
-      await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/logstash_functional');
-      await esArchiver.load('../functional/fixtures/es_archiver/visualize_embedding');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.load('test/functional/fixtures/es_archiver/visualize_embedding');
       await kibanaServer.uiSettings.replace({
         'dateFormat:tz': 'Australia/North',
         defaultIndex: 'logstash-*',
@@ -36,5 +36,6 @@ export default function ({ getService, getPageObjects, loadTestFile }: FtrProvid
     loadTestFile(require.resolve('./tag_cloud'));
     loadTestFile(require.resolve('./metric'));
     loadTestFile(require.resolve('./esaggs'));
+    loadTestFile(require.resolve('./esaggs_timeshift'));
   });
 }
diff --git a/test/new_visualize_flow/dashboard_embedding.ts b/test/new_visualize_flow/dashboard_embedding.ts
index 04b91542223ba..3470973f9c96c 100644
--- a/test/new_visualize_flow/dashboard_embedding.ts
+++ b/test/new_visualize_flow/dashboard_embedding.ts
@@ -34,7 +34,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Dashboard Embedding', function describeIndexTests() {
     before(async () => {
-      await esArchiver.load('kibana');
+      await esArchiver.load('test/new_visualize_flow/fixtures/es_archiver/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: '0bf35f60-3dc9-11e8-8660-4d65aa086b3c',
       });
diff --git a/test/new_visualize_flow/index.ts b/test/new_visualize_flow/index.ts
index d17501305d0bd..02245002e8336 100644
--- a/test/new_visualize_flow/index.ts
+++ b/test/new_visualize_flow/index.ts
@@ -14,7 +14,9 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
     this.tags('ciGroup2');
     const esArchiver = getService('esArchiver');
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded(
+        'test/new_visualize_flow/fixtures/es_archiver/logstash_functional'
+      );
     });
 
     loadTestFile(require.resolve('./dashboard_embedding'));
diff --git a/test/plugin_functional/config.ts b/test/plugin_functional/config.ts
index 1ff55edc010da..3791e663fb68c 100644
--- a/test/plugin_functional/config.ts
+++ b/test/plugin_functional/config.ts
@@ -22,6 +22,7 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   return {
     testFiles: [
       require.resolve('./test_suites/usage_collection'),
+      require.resolve('./test_suites/telemetry'),
       require.resolve('./test_suites/core'),
       require.resolve('./test_suites/custom_visualizations'),
       require.resolve('./test_suites/panel_actions'),
@@ -43,9 +44,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       serverArgs: ['xpack.security.enabled=false'],
     },
     apps: functionalConfig.get('apps'),
-    esArchiver: {
-      directory: path.resolve(__dirname, '../es_archives'),
-    },
     screenshots: functionalConfig.get('screenshots'),
     junit: {
       reportName: 'Plugin Functional Tests',
diff --git a/test/plugin_functional/plugins/core_app_status/tsconfig.json b/test/plugin_functional/plugins/core_app_status/tsconfig.json
index 4d979fbf7f15f..0f0e7caf2b486 100644
--- a/test/plugin_functional/plugins/core_app_status/tsconfig.json
+++ b/test/plugin_functional/plugins/core_app_status/tsconfig.json
@@ -1,8 +1,11 @@
 {
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./target",
-    "skipLibCheck": true
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
   },
   "include": [
     "index.ts",
@@ -10,5 +13,8 @@
     "public/**/*.tsx",
     "../../../../typings/**/*",
   ],
-  "exclude": []
+  "exclude": [],
+  "references": [
+    { "path": "../../../../src/core/tsconfig.json" },
+  ],
 }
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/kibana.json b/test/plugin_functional/plugins/core_plugin_deep_links/kibana.json
new file mode 100644
index 0000000000000..539550974c563
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/kibana.json
@@ -0,0 +1,7 @@
+{
+  "id": "corePluginDeepLinks",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["core_plugin_deep_links"],
+  "ui": true
+}
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/package.json b/test/plugin_functional/plugins/core_plugin_deep_links/package.json
new file mode 100644
index 0000000000000..3fe16ddee5321
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "core_plugin_deep_links",
+  "version": "1.0.0",
+  "main": "target/test/plugin_functional/plugins/core_plugin_deep_links",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "scripts": {
+    "kbn": "node ../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && ../../../../node_modules/.bin/tsc"
+  }
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000000..90814bd552d37
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/application.tsx
@@ -0,0 +1,158 @@
+/*
+ * Copyright 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 { History } from 'history';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Router, Route, withRouter, RouteComponentProps, Redirect } from 'react-router-dom';
+
+import {
+  EuiPage,
+  EuiPageBody,
+  EuiPageContent,
+  EuiPageContentBody,
+  EuiPageContentHeader,
+  EuiPageContentHeaderSection,
+  EuiPageHeader,
+  EuiPageHeaderSection,
+  EuiPageSideBar,
+  EuiTitle,
+  EuiSideNav,
+} from '@elastic/eui';
+
+import { CoreStart, AppMountParameters } from 'kibana/public';
+
+const Home = () => (
+  <EuiPageBody data-test-subj="dlAppHome">
+    <EuiPageHeader>
+      <EuiPageHeaderSection>
+        <EuiTitle size="l">
+          <h1>Welcome to DL!</h1>
+        </EuiTitle>
+      </EuiPageHeaderSection>
+    </EuiPageHeader>
+    <EuiPageContent>
+      <EuiPageContentHeader>
+        <EuiPageContentHeaderSection>
+          <EuiTitle>
+            <h2>DL home page section title</h2>
+          </EuiTitle>
+        </EuiPageContentHeaderSection>
+      </EuiPageContentHeader>
+      <EuiPageContentBody>Wow this is the content!</EuiPageContentBody>
+    </EuiPageContent>
+  </EuiPageBody>
+);
+
+const PageA = () => (
+  <EuiPageBody data-test-subj="dlAppPageA">
+    <EuiPageHeader>
+      <EuiPageHeaderSection>
+        <EuiTitle size="l">
+          <h1>DL Page A</h1>
+        </EuiTitle>
+      </EuiPageHeaderSection>
+    </EuiPageHeader>
+    <EuiPageContent>
+      <EuiPageContentHeader>
+        <EuiPageContentHeaderSection>
+          <EuiTitle>
+            <h2>DL Page A section title</h2>
+          </EuiTitle>
+        </EuiPageContentHeaderSection>
+      </EuiPageContentHeader>
+      <EuiPageContentBody>DL Page A&apos;s content goes here</EuiPageContentBody>
+    </EuiPageContent>
+  </EuiPageBody>
+);
+
+const PageB = () => (
+  <EuiPageBody data-test-subj="dlAppPageB">
+    <EuiPageHeader>
+      <EuiPageHeaderSection>
+        <EuiTitle size="l">
+          <h1>DL Page B</h1>
+        </EuiTitle>
+      </EuiPageHeaderSection>
+    </EuiPageHeader>
+    <EuiPageContent>
+      <EuiPageContentHeader>
+        <EuiPageContentHeaderSection>
+          <EuiTitle>
+            <h2>DL Page B section title</h2>
+          </EuiTitle>
+        </EuiPageContentHeaderSection>
+      </EuiPageContentHeader>
+      <EuiPageContentBody>DL Page B&apos;s content goes here</EuiPageContentBody>
+    </EuiPageContent>
+  </EuiPageBody>
+);
+
+type NavProps = RouteComponentProps & {
+  navigateToApp: CoreStart['application']['navigateToApp'];
+};
+const Nav = withRouter(({ history, navigateToApp }: NavProps) => (
+  <EuiSideNav
+    items={[
+      {
+        name: 'DeepLinks!',
+        id: 'deeplinks',
+        items: [
+          {
+            id: 'home',
+            name: 'DL Home',
+            onClick: () => history.push('/home'),
+            'data-test-subj': 'dlNavHome',
+          },
+          {
+            id: 'page-a',
+            name: 'DL page A',
+            onClick: () => history.push('/page-a'),
+            'data-test-subj': 'dlNavPageA',
+          },
+          {
+            id: 'navigateDeepByPath',
+            name: 'DL section 1 page B',
+            onClick: () => {
+              navigateToApp('deeplinks', { path: '/page-b' });
+            },
+            'data-test-subj': 'dlNavDeepPageB',
+          },
+          {
+            id: 'navigateDeepById',
+            name: 'DL page A deep link',
+            onClick: () => {
+              navigateToApp('deeplinks', { deepLinkId: 'pageA' });
+            },
+            'data-test-subj': 'dlNavDeepPageAById',
+          },
+        ],
+      },
+    ]}
+  />
+));
+
+const DlApp = ({ history, coreStart }: { history: History; coreStart: CoreStart }) => (
+  <Router history={history}>
+    <EuiPage>
+      <EuiPageSideBar>
+        <Nav navigateToApp={coreStart.application.navigateToApp} />
+      </EuiPageSideBar>
+      <Route path="/" exact render={() => <Redirect to="/home" />} />
+      <Route path="/home" exact component={Home} />
+      <Route path="/page-a" component={PageA} />
+      <Route path="/page-b" component={PageB} />
+    </EuiPage>
+  </Router>
+);
+
+export const renderApp = (coreStart: CoreStart, { history, element }: AppMountParameters) => {
+  ReactDOM.render(<DlApp history={history} coreStart={coreStart} />, element);
+
+  return () => ReactDOM.unmountComponentAtNode(element);
+};
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
new file mode 100644
index 0000000000000..d908134d27d62
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/index.ts
@@ -0,0 +1,19 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { PluginInitializer } from 'kibana/public';
+import {
+  CorePluginDeepLinksPlugin,
+  CorePluginDeepLinksPluginSetup,
+  CorePluginDeepLinksPluginStart,
+} from './plugin';
+
+export const plugin: PluginInitializer<
+  CorePluginDeepLinksPluginSetup,
+  CorePluginDeepLinksPluginStart
+> = () => new CorePluginDeepLinksPlugin();
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
new file mode 100644
index 0000000000000..48f11132ffb40
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/public/plugin.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 { Plugin, CoreSetup } from 'kibana/public';
+import { DEFAULT_APP_CATEGORIES, AppNavLinkStatus } from '../../../../../src/core/public';
+
+export class CorePluginDeepLinksPlugin
+  implements Plugin<CorePluginDeepLinksPluginSetup, CorePluginDeepLinksPluginStart> {
+  public setup(core: CoreSetup, deps: {}) {
+    core.application.register({
+      id: 'deeplinks',
+      title: 'Deep Links',
+      appRoute: '/app/dl',
+      defaultPath: '/home',
+      category: DEFAULT_APP_CATEGORIES.security,
+      navLinkStatus: AppNavLinkStatus.hidden,
+      deepLinks: [
+        {
+          id: 'home',
+          title: 'DL Home',
+          path: '/home',
+          navLinkStatus: AppNavLinkStatus.visible,
+        },
+        {
+          id: 'pageA',
+          title: 'DL Page A',
+          path: '/page-a',
+          navLinkStatus: AppNavLinkStatus.visible,
+        },
+        {
+          id: 'sectionOne',
+          title: 'DL Section One',
+          deepLinks: [
+            {
+              id: 'pageB',
+              title: 'DL Page B',
+              path: '/page-b',
+              navLinkStatus: AppNavLinkStatus.visible,
+            },
+          ],
+        },
+        {
+          id: 'pageC',
+          title: 'DL Page C',
+          path: '/page-c',
+          // navLinkStatus hidden by default
+        },
+      ],
+      async mount(params) {
+        const { renderApp } = await import('./application');
+        const [coreStart] = await core.getStartServices();
+        return renderApp(coreStart, params);
+      },
+    });
+
+    return {
+      getGreeting() {
+        return 'Hello from Deep Link Plugin!';
+      },
+    };
+  }
+
+  public start() {}
+  public stop() {}
+}
+
+export type CorePluginDeepLinksPluginSetup = ReturnType<CorePluginDeepLinksPlugin['setup']>;
+export type CorePluginDeepLinksPluginStart = ReturnType<CorePluginDeepLinksPlugin['start']>;
diff --git a/test/plugin_functional/plugins/core_plugin_deep_links/tsconfig.json b/test/plugin_functional/plugins/core_plugin_deep_links/tsconfig.json
new file mode 100644
index 0000000000000..f77a5eaffc301
--- /dev/null
+++ b/test/plugin_functional/plugins/core_plugin_deep_links/tsconfig.json
@@ -0,0 +1,17 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": [
+    "index.ts",
+    "public/**/*.ts",
+    "public/**/*.tsx",
+    "../../../../typings/**/*",
+  ],
+  "exclude": [],
+  "references": [
+    { "path": "../../../../src/core/tsconfig.json" }
+  ]
+}
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 e051c39f68150..650567f761aa3 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/config.ts
@@ -26,6 +26,11 @@ const configSecretDeprecation: ConfigDeprecation = (settings, fromPath, addDepre
       message:
         'Kibana plugin functional tests will no longer allow corePluginDeprecations.secret ' +
         'config to be set to anything except 42.',
+      correctiveActions: {
+        manualSteps: [
+          `This is an intentional deprecation for testing with no intention for having it fixed!`,
+        ],
+      },
     });
   }
   return settings;
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 38565b1e2c0a8..9922e56f44bd9 100644
--- a/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
+++ b/test/plugin_functional/plugins/core_plugin_deprecations/server/plugin.ts
@@ -18,6 +18,7 @@ async function getDeprecations({
     message: `CorePluginDeprecationsPlugin is a deprecated feature for testing.`,
     documentationUrl: 'test-url',
     level: 'warning',
+    deprecationType: 'feature',
     correctiveActions: {
       manualSteps: ['Step a', 'Step b'],
     },
@@ -28,7 +29,9 @@ async function getDeprecations({
       message: `SavedObject test-deprecations-plugin is still being used.`,
       documentationUrl: 'another-test-url',
       level: 'critical',
-      correctiveActions: {},
+      correctiveActions: {
+        manualSteps: ['Step a', 'Step b'],
+      },
     });
   }
 
diff --git a/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
index eacd2f5e9aee3..d0d1f2d99295a 100644
--- a/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
+++ b/test/plugin_functional/plugins/core_provider_plugin/tsconfig.json
@@ -1,8 +1,11 @@
 {
   "extends": "../../../../tsconfig.base.json",
   "compilerOptions": {
+    "composite": true,
     "outDir": "./target",
-    "skipLibCheck": true
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
   },
   "include": [
     "index.ts",
@@ -12,6 +15,6 @@
   ],
   "exclude": [],
   "references": [
-    { "path": "../../../../src/core/tsconfig.json" }
-  ]
+    { "path": "../../../../src/core/tsconfig.json" },
+  ],
 }
diff --git a/test/plugin_functional/plugins/telemetry/kibana.json b/test/plugin_functional/plugins/telemetry/kibana.json
new file mode 100644
index 0000000000000..40a7d59d7dc2d
--- /dev/null
+++ b/test/plugin_functional/plugins/telemetry/kibana.json
@@ -0,0 +1,9 @@
+{
+  "id": "telemetryTestPlugin",
+  "version": "0.0.1",
+  "kibanaVersion": "kibana",
+  "configPath": ["telemetryTestPlugin"],
+  "requiredPlugins": ["telemetry"],
+  "server": false,
+  "ui": true
+}
diff --git a/test/plugin_functional/plugins/telemetry/package.json b/test/plugin_functional/plugins/telemetry/package.json
new file mode 100644
index 0000000000000..8e850fb582fec
--- /dev/null
+++ b/test/plugin_functional/plugins/telemetry/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "telemetry_test_plugin",
+  "version": "1.0.0",
+  "main": "target/test/plugin_functional/plugins/telemetry",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "license": "SSPL-1.0 OR Elastic License 2.0",
+  "scripts": {
+    "kbn": "node ../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && ../../../../node_modules/.bin/tsc"
+  }
+}
diff --git a/test/plugin_functional/plugins/telemetry/public/index.ts b/test/plugin_functional/plugins/telemetry/public/index.ts
new file mode 100644
index 0000000000000..b32ccb51153a1
--- /dev/null
+++ b/test/plugin_functional/plugins/telemetry/public/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { TelemetryTestPlugin } from './plugin';
+
+export const plugin = () => new TelemetryTestPlugin();
diff --git a/test/plugin_functional/plugins/telemetry/public/plugin.ts b/test/plugin_functional/plugins/telemetry/public/plugin.ts
new file mode 100644
index 0000000000000..441675b1aa4ed
--- /dev/null
+++ b/test/plugin_functional/plugins/telemetry/public/plugin.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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, Plugin } from 'src/core/public';
+import type { TelemetryPluginSetup } from '../../../../../src/plugins/telemetry/public';
+
+interface TelemetryTestPluginSetupDependencies {
+  telemetry: TelemetryPluginSetup;
+}
+
+export class TelemetryTestPlugin implements Plugin {
+  setup(core: CoreSetup, { telemetry }: TelemetryTestPluginSetupDependencies) {
+    window._checkCanSendTelemetry = async () => {
+      await telemetry.telemetryService.setOptIn(true);
+      return telemetry.telemetryService.canSendTelemetry();
+    };
+
+    window._resetTelemetry = async () => {
+      await telemetry.telemetryService.setOptIn(false);
+    };
+  }
+  start() {}
+}
diff --git a/test/plugin_functional/plugins/telemetry/tsconfig.json b/test/plugin_functional/plugins/telemetry/tsconfig.json
new file mode 100644
index 0000000000000..947eb49a61b3a
--- /dev/null
+++ b/test/plugin_functional/plugins/telemetry/tsconfig.json
@@ -0,0 +1,10 @@
+{
+  "extends": "../../../../tsconfig.base.json",
+  "compilerOptions": {
+    "outDir": "./target",
+    "skipLibCheck": true
+  },
+  "include": ["public/**/*.ts", "types.ts", "../../../../typings/**/*"],
+  "exclude": [],
+  "references": [{ "path": "../../../../src/core/tsconfig.json" }]
+}
diff --git a/test/plugin_functional/plugins/telemetry/types.ts b/test/plugin_functional/plugins/telemetry/types.ts
new file mode 100644
index 0000000000000..aba7bc0abca80
--- /dev/null
+++ b/test/plugin_functional/plugins/telemetry/types.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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.
+ */
+
+declare global {
+  interface Window {
+    _checkCanSendTelemetry: () => Promise<boolean>;
+    _resetTelemetry: () => Promise<void>;
+  }
+}
+
+// Turn this file into a module
+export {};
diff --git a/test/plugin_functional/test_suites/core/deprecations.ts b/test/plugin_functional/test_suites/core/deprecations.ts
index a78527d0d82e2..112b29a896a00 100644
--- a/test/plugin_functional/test_suites/core/deprecations.ts
+++ b/test/plugin_functional/test_suites/core/deprecations.ts
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   const PageObjects = getPageObjects(['common']);
   const browser = getService('browser');
 
-  const CorePluginDeprecationsPluginDeprecations = [
+  const CorePluginDeprecationsPluginDeprecations: DomainDeprecationDetails[] = [
     {
       level: 'critical',
       message:
@@ -27,6 +27,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
           'Replace "corePluginDeprecations.oldProperty" with "corePluginDeprecations.newProperty" in the Kibana config file, CLI flag, or environment variable (in Docker only).',
         ],
       },
+      deprecationType: 'config',
       domainId: 'corePluginDeprecations',
     },
     {
@@ -37,14 +38,20 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
           'Remove "corePluginDeprecations.noLongerUsed" from the Kibana config file, CLI flag, or environment variable (in Docker only)',
         ],
       },
+      deprecationType: 'config',
       domainId: 'corePluginDeprecations',
     },
     {
       level: 'critical',
       message:
         'Kibana plugin functional tests will no longer allow corePluginDeprecations.secret config to be set to anything except 42.',
-      correctiveActions: {},
+      correctiveActions: {
+        manualSteps: [
+          'This is an intentional deprecation for testing with no intention for having it fixed!',
+        ],
+      },
       documentationUrl: 'config-secret-doc-url',
+      deprecationType: 'config',
       domainId: 'corePluginDeprecations',
     },
     {
@@ -54,20 +61,23 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       correctiveActions: {
         manualSteps: ['Step a', 'Step b'],
       },
+      deprecationType: 'feature',
       domainId: 'corePluginDeprecations',
     },
     {
       message: 'SavedObject test-deprecations-plugin is still being used.',
       documentationUrl: 'another-test-url',
       level: 'critical',
-      correctiveActions: {},
+      correctiveActions: {
+        manualSteps: ['Step a', 'Step b'],
+      },
       domainId: 'corePluginDeprecations',
     },
   ];
 
   describe('deprecations service', () => {
-    before(() => esArchiver.load('../functional/fixtures/es_archiver/deprecations_service'));
-    after(() => esArchiver.unload('../functional/fixtures/es_archiver/deprecations_service'));
+    before(() => esArchiver.load('test/functional/fixtures/es_archiver/deprecations_service'));
+    after(() => esArchiver.unload('test/functional/fixtures/es_archiver/deprecations_service'));
 
     describe('GET /api/deprecations/', async () => {
       it('returns registered config deprecations and feature deprecations', async () => {
@@ -147,6 +157,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
                       mockFail: true,
                     },
                   },
+                  manualSteps: ['Step a', 'Step b'],
                 },
                 domainId: 'corePluginDeprecations',
               })
@@ -174,6 +185,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
                       mockFail: true,
                     },
                   },
+                  manualSteps: ['Step a', 'Step b'],
                 },
                 domainId: 'corePluginDeprecations',
               })
@@ -209,6 +221,7 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
                       path: '/api/core_deprecations_resolve/',
                       body: { keyId },
                     },
+                    manualSteps: ['Step a', 'Step b'],
                   },
                   domainId: 'corePluginDeprecations',
                 })
diff --git a/test/plugin_functional/test_suites/core_plugins/application_deep_links.ts b/test/plugin_functional/test_suites/core_plugins/application_deep_links.ts
new file mode 100644
index 0000000000000..1fa902ed6d15a
--- /dev/null
+++ b/test/plugin_functional/test_suites/core_plugins/application_deep_links.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 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 url from 'url';
+import expect from '@kbn/expect';
+import { PluginFunctionalProviderContext } from '../../services';
+
+export default function ({ getService, getPageObjects }: PluginFunctionalProviderContext) {
+  const PageObjects = getPageObjects(['common']);
+
+  const browser = getService('browser');
+  const appsMenu = getService('appsMenu');
+  const testSubjects = getService('testSubjects');
+  const retry = getService('retry');
+  const esArchiver = getService('esArchiver');
+
+  const loadingScreenNotShown = async () =>
+    expect(await testSubjects.exists('kbnLoadingMessage')).to.be(false);
+
+  const getKibanaUrl = (pathname?: string, search?: string) =>
+    url.format({
+      protocol: 'http:',
+      hostname: process.env.TEST_KIBANA_HOST || 'localhost',
+      port: process.env.TEST_KIBANA_PORT || '5620',
+      pathname,
+      search,
+    });
+
+  /** Use retry logic to make URL assertions less flaky */
+  const waitForUrlToBe = (pathname?: string, search?: string) => {
+    const expectedUrl = getKibanaUrl(pathname, search);
+    return retry.waitFor(`Url to be ${expectedUrl}`, async () => {
+      return (await browser.getCurrentUrl()) === expectedUrl;
+    });
+  };
+
+  describe('application deep links navigation', function describeDeepLinksTests() {
+    before(async () => {
+      await esArchiver.emptyKibanaIndex();
+      await PageObjects.common.navigateToApp('dl');
+    });
+
+    it('should start on home page', async () => {
+      await testSubjects.existOrFail('dlAppHome');
+    });
+
+    it('should navigate to page A when navlink is clicked', async () => {
+      await appsMenu.clickLink('DL Page A');
+      await waitForUrlToBe('/app/dl/page-a');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('dlAppPageA');
+    });
+
+    it('should be able to use the back button to navigate back to previous deep link', async () => {
+      await browser.goBack();
+      await waitForUrlToBe('/app/dl/home');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('dlAppHome');
+    });
+
+    it('should navigate to nested page B when navlink is clicked', async () => {
+      await appsMenu.clickLink('DL Page B');
+      await waitForUrlToBe('/app/dl/page-b');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('dlAppPageB');
+    });
+
+    it('should navigate to Home when navlink is clicked inside the defined category group', async () => {
+      await appsMenu.clickLink('DL Home', { category: 'securitySolution' });
+      await waitForUrlToBe('/app/dl/home');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('dlAppHome');
+    });
+
+    it('should navigate to nested page B using navigateToApp path', async () => {
+      await testSubjects.click('dlNavDeepPageB');
+      await waitForUrlToBe('/app/dl/page-b');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('dlAppPageB');
+    });
+
+    it('should navigate to nested page A using navigateToApp deepLinkId', async () => {
+      await testSubjects.click('dlNavDeepPageAById');
+      await waitForUrlToBe('/app/dl/page-a');
+      await loadingScreenNotShown();
+      await testSubjects.existOrFail('dlAppPageA');
+    });
+
+    it('should not display hidden deep links', async () => {
+      expect(await appsMenu.linkExists('DL Section One')).to.be(false);
+      expect(await appsMenu.linkExists('DL Page C')).to.be(false);
+    });
+  });
+}
diff --git a/test/plugin_functional/test_suites/core_plugins/index.ts b/test/plugin_functional/test_suites/core_plugins/index.ts
index 25868ac9a62db..87a153a24570d 100644
--- a/test/plugin_functional/test_suites/core_plugins/index.ts
+++ b/test/plugin_functional/test_suites/core_plugins/index.ts
@@ -18,6 +18,7 @@ export default function ({ loadTestFile }: PluginFunctionalProviderContext) {
     loadTestFile(require.resolve('./top_nav'));
     loadTestFile(require.resolve('./application_leave_confirm'));
     loadTestFile(require.resolve('./application_status'));
+    loadTestFile(require.resolve('./application_deep_links'));
     loadTestFile(require.resolve('./rendering'));
     loadTestFile(require.resolve('./chrome_help_menu_links'));
     loadTestFile(require.resolve('./history_block'));
diff --git a/test/plugin_functional/test_suites/custom_visualizations/index.js b/test/plugin_functional/test_suites/custom_visualizations/index.js
index eaca1ad3f4d3b..0998b97da67ff 100644
--- a/test/plugin_functional/test_suites/custom_visualizations/index.js
+++ b/test/plugin_functional/test_suites/custom_visualizations/index.js
@@ -13,8 +13,8 @@ export default function ({ getService, loadTestFile }) {
 
   describe('custom visualizations', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/logstash_functional');
-      await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/visualize');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/visualize');
       await kibanaServer.uiSettings.replace({
         'dateFormat:tz': 'Australia/North',
         defaultIndex: 'logstash-*',
diff --git a/test/plugin_functional/test_suites/data_plugin/index.ts b/test/plugin_functional/test_suites/data_plugin/index.ts
index d39eb839d322d..01a88dbd19b15 100644
--- a/test/plugin_functional/test_suites/data_plugin/index.ts
+++ b/test/plugin_functional/test_suites/data_plugin/index.ts
@@ -19,7 +19,7 @@ export default function ({
   describe('data plugin', () => {
     before(async () => {
       await esArchiver.loadIfNeeded(
-        '../functional/fixtures/es_archiver/getting_started/shakespeare'
+        'test/functional/fixtures/es_archiver/getting_started/shakespeare'
       );
       await PageObjects.common.navigateToApp('settings');
       await PageObjects.settings.createIndexPattern('shakespeare', '');
diff --git a/test/plugin_functional/test_suites/data_plugin/session.ts b/test/plugin_functional/test_suites/data_plugin/session.ts
index ae4f8ffdf4072..54b86f0c8060b 100644
--- a/test/plugin_functional/test_suites/data_plugin/session.ts
+++ b/test/plugin_functional/test_suites/data_plugin/session.ts
@@ -70,9 +70,11 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
 
     describe('Dashboard', () => {
       before(async () => {
-        await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/dashboard/current/data');
         await esArchiver.loadIfNeeded(
-          '../functional/fixtures/es_archiver/dashboard/current/kibana'
+          'test/functional/fixtures/es_archiver/dashboard/current/data'
+        );
+        await esArchiver.loadIfNeeded(
+          'test/functional/fixtures/es_archiver/dashboard/current/kibana'
         );
         await PageObjects.common.navigateToApp('dashboard');
         await PageObjects.dashboard.loadSavedDashboard('dashboard with filter');
@@ -85,8 +87,8 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
       });
 
       after(async () => {
-        await esArchiver.unload('../functional/fixtures/es_archiver/dashboard/current/data');
-        await esArchiver.unload('../functional/fixtures/es_archiver/dashboard/current/kibana');
+        await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data');
+        await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/kibana');
       });
 
       it('on load there is a single session', async () => {
diff --git a/test/plugin_functional/test_suites/doc_views/index.ts b/test/plugin_functional/test_suites/doc_views/index.ts
index e02b9ac4646f6..a790f062e32d4 100644
--- a/test/plugin_functional/test_suites/doc_views/index.ts
+++ b/test/plugin_functional/test_suites/doc_views/index.ts
@@ -14,7 +14,7 @@ export default function ({ getService, loadTestFile }: PluginFunctionalProviderC
   // SKIPPED: https://github.com/elastic/kibana/issues/100060
   describe.skip('doc views', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('../functional/fixtures/es_archiver/discover');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/discover');
     });
 
     loadTestFile(require.resolve('./doc_views'));
diff --git a/test/plugin_functional/test_suites/panel_actions/index.js b/test/plugin_functional/test_suites/panel_actions/index.js
index 4951b810854fe..70e6ed67b218c 100644
--- a/test/plugin_functional/test_suites/panel_actions/index.js
+++ b/test/plugin_functional/test_suites/panel_actions/index.js
@@ -6,17 +6,6 @@
  * Side Public License, v 1.
  */
 
-import path from 'path';
-
-export const KIBANA_ARCHIVE_PATH = path.resolve(
-  __dirname,
-  '../../../functional/fixtures/es_archiver/dashboard/current/kibana'
-);
-export const DATA_ARCHIVE_PATH = path.resolve(
-  __dirname,
-  '../../../functional/fixtures/es_archiver/dashboard/current/data'
-);
-
 export default function ({ getService, getPageObjects, loadTestFile }) {
   const browser = getService('browser');
   const esArchiver = getService('esArchiver');
@@ -26,8 +15,8 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
   describe('pluggable panel actions', function () {
     before(async () => {
       await browser.setWindowSize(1300, 900);
-      await esArchiver.load(KIBANA_ARCHIVE_PATH);
-      await esArchiver.loadIfNeeded(DATA_ARCHIVE_PATH);
+      await esArchiver.load('test/functional/fixtures/es_archiver/dashboard/current/kibana');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/dashboard/current/data');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
       });
@@ -37,8 +26,8 @@ export default function ({ getService, getPageObjects, loadTestFile }) {
 
     after(async function () {
       await PageObjects.dashboard.clearSavedObjectsFromAppLinks();
-      await esArchiver.unload(KIBANA_ARCHIVE_PATH);
-      await esArchiver.unload(DATA_ARCHIVE_PATH);
+      await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/kibana');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/dashboard/current/data');
     });
 
     loadTestFile(require.resolve('./panel_actions'));
diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts
index 666afe1acedca..04fcc29efe612 100644
--- a/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts
+++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/delete.ts
@@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
   describe('delete', () => {
     before(() =>
       esArchiver.load(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
     after(() =>
       esArchiver.unload(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
 
diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts
index af25835db5a81..9d1f370dc73e7 100644
--- a/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts
+++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/export.ts
@@ -20,12 +20,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
   describe('export', () => {
     before(() =>
       esArchiver.load(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
     after(() =>
       esArchiver.unload(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
 
diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts
index 723140f5c6bf5..5a31da2b57a8e 100644
--- a/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts
+++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/find.ts
@@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
   describe('find', () => {
     before(() =>
       esArchiver.load(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
     after(() =>
       esArchiver.unload(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
 
diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts
index 5de7d8375dd8c..70241ade50a3d 100644
--- a/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts
+++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/import.ts
@@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
   describe('import', () => {
     before(() =>
       esArchiver.load(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
     after(() =>
       esArchiver.unload(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
 
diff --git a/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts b/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts
index dddee085ae22b..8af5e07ab69ad 100644
--- a/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts
+++ b/test/plugin_functional/test_suites/saved_objects_hidden_type/resolve_import_errors.ts
@@ -16,12 +16,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
   describe('export', () => {
     before(() =>
       esArchiver.load(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
     after(() =>
       esArchiver.unload(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
       )
     );
 
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 87bf5e0584a7d..0351c5abdde46 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
@@ -19,122 +19,169 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('export transforms', () => {
-    before(async () => {
-      await esArchiver.load(
-        '../functional/fixtures/es_archiver/saved_objects_management/export_transform'
-      );
-    });
+    describe('root objects export transforms', () => {
+      before(async () => {
+        await esArchiver.load(
+          'test/functional/fixtures/es_archiver/saved_objects_management/export_transform'
+        );
+      });
 
-    after(async () => {
-      await esArchiver.unload(
-        '../functional/fixtures/es_archiver/saved_objects_management/export_transform'
-      );
-    });
+      after(async () => {
+        await esArchiver.unload(
+          'test/functional/fixtures/es_archiver/saved_objects_management/export_transform'
+        );
+      });
 
-    it('allows to mutate the objects during an export', async () => {
-      await supertest
-        .post('/api/saved_objects/_export')
-        .set('kbn-xsrf', 'true')
-        .send({
-          type: ['test-export-transform'],
-          excludeExportDetails: true,
-        })
-        .expect(200)
-        .then((resp) => {
-          const objects = parseNdJson(resp.text);
-          expect(objects.map((obj) => ({ id: obj.id, enabled: obj.attributes.enabled }))).to.eql([
-            {
-              id: 'type_1-obj_1',
-              enabled: false,
-            },
-            {
-              id: 'type_1-obj_2',
-              enabled: false,
-            },
-          ]);
-        });
-    });
+      it('allows to mutate the objects during an export', async () => {
+        await supertest
+          .post('/api/saved_objects/_export')
+          .set('kbn-xsrf', 'true')
+          .send({
+            type: ['test-export-transform'],
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = parseNdJson(resp.text);
+            expect(objects.map((obj) => ({ id: obj.id, enabled: obj.attributes.enabled }))).to.eql([
+              {
+                id: 'type_1-obj_1',
+                enabled: false,
+              },
+              {
+                id: 'type_1-obj_2',
+                enabled: false,
+              },
+            ]);
+          });
+      });
 
-    it('allows to add additional objects to an export', async () => {
-      await supertest
-        .post('/api/saved_objects/_export')
-        .set('kbn-xsrf', 'true')
-        .send({
-          objects: [
-            {
-              type: 'test-export-add',
-              id: 'type_2-obj_1',
-            },
-          ],
-          excludeExportDetails: true,
-        })
-        .expect(200)
-        .then((resp) => {
-          const objects = parseNdJson(resp.text);
-          expect(objects.map((obj) => obj.id)).to.eql(['type_2-obj_1', 'type_dep-obj_1']);
-        });
-    });
+      it('allows to add additional objects to an export', async () => {
+        await supertest
+          .post('/api/saved_objects/_export')
+          .set('kbn-xsrf', 'true')
+          .send({
+            objects: [
+              {
+                type: 'test-export-add',
+                id: 'type_2-obj_1',
+              },
+            ],
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = parseNdJson(resp.text);
+            expect(objects.map((obj) => obj.id)).to.eql(['type_2-obj_1', 'type_dep-obj_1']);
+          });
+      });
 
-    it('allows to add additional objects to an export when exporting by type', async () => {
-      await supertest
-        .post('/api/saved_objects/_export')
-        .set('kbn-xsrf', 'true')
-        .send({
-          type: ['test-export-add'],
-          excludeExportDetails: true,
-        })
-        .expect(200)
-        .then((resp) => {
-          const objects = parseNdJson(resp.text);
-          expect(objects.map((obj) => obj.id)).to.eql([
-            'type_2-obj_1',
-            'type_2-obj_2',
-            'type_dep-obj_1',
-            'type_dep-obj_2',
-          ]);
-        });
-    });
+      it('allows to add additional objects to an export when exporting by type', async () => {
+        await supertest
+          .post('/api/saved_objects/_export')
+          .set('kbn-xsrf', 'true')
+          .send({
+            type: ['test-export-add'],
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = parseNdJson(resp.text);
+            expect(objects.map((obj) => obj.id)).to.eql([
+              'type_2-obj_1',
+              'type_2-obj_2',
+              'type_dep-obj_1',
+              'type_dep-obj_2',
+            ]);
+          });
+      });
+
+      it('returns a 400 when the type causes a transform error', async () => {
+        await supertest
+          .post('/api/saved_objects/_export')
+          .set('kbn-xsrf', 'true')
+          .send({
+            type: ['test-export-transform-error'],
+            excludeExportDetails: true,
+          })
+          .expect(400)
+          .then((resp) => {
+            const { attributes, ...error } = resp.body;
+            expect(error).to.eql({
+              error: 'Bad Request',
+              message: 'Error transforming objects to export',
+              statusCode: 400,
+            });
+            expect(attributes.cause).to.eql('Error during transform');
+            expect(attributes.objects.map((obj: any) => obj.id)).to.eql(['type_4-obj_1']);
+          });
+      });
 
-    it('returns a 400 when the type causes a transform error', async () => {
-      await supertest
-        .post('/api/saved_objects/_export')
-        .set('kbn-xsrf', 'true')
-        .send({
-          type: ['test-export-transform-error'],
-          excludeExportDetails: true,
-        })
-        .expect(400)
-        .then((resp) => {
-          const { attributes, ...error } = resp.body;
-          expect(error).to.eql({
-            error: 'Bad Request',
-            message: 'Error transforming objects to export',
-            statusCode: 400,
+      it('returns a 400 when the type causes an invalid transform', async () => {
+        await supertest
+          .post('/api/saved_objects/_export')
+          .set('kbn-xsrf', 'true')
+          .send({
+            type: ['test-export-invalid-transform'],
+            excludeExportDetails: true,
+          })
+          .expect(400)
+          .then((resp) => {
+            expect(resp.body).to.eql({
+              error: 'Bad Request',
+              message: 'Invalid transform performed on objects to export',
+              statusCode: 400,
+              attributes: {
+                objectKeys: ['test-export-invalid-transform|type_3-obj_1'],
+              },
+            });
           });
-          expect(attributes.cause).to.eql('Error during transform');
-          expect(attributes.objects.map((obj: any) => obj.id)).to.eql(['type_4-obj_1']);
-        });
+      });
     });
 
-    it('returns a 400 when the type causes an invalid transform', async () => {
-      await supertest
-        .post('/api/saved_objects/_export')
-        .set('kbn-xsrf', 'true')
-        .send({
-          type: ['test-export-invalid-transform'],
-          excludeExportDetails: true,
-        })
-        .expect(400)
-        .then((resp) => {
-          expect(resp.body).to.eql({
-            error: 'Bad Request',
-            message: 'Invalid transform performed on objects to export',
-            statusCode: 400,
-            attributes: {
-              objectKeys: ['test-export-invalid-transform|type_3-obj_1'],
-            },
+    describe('FOO nested export transforms', () => {
+      before(async () => {
+        await esArchiver.load(
+          'test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform'
+        );
+      });
+
+      after(async () => {
+        await esArchiver.unload(
+          'test/functional/fixtures/es_archiver/saved_objects_management/nested_export_transform'
+        );
+      });
+
+      it('execute export transforms for reference objects', async () => {
+        await supertest
+          .post('/api/saved_objects/_export')
+          .set('kbn-xsrf', 'true')
+          .send({
+            objects: [
+              {
+                type: 'test-export-transform',
+                id: 'type_1-obj_1',
+              },
+            ],
+            includeReferencesDeep: true,
+            excludeExportDetails: true,
+          })
+          .expect(200)
+          .then((resp) => {
+            const objects = parseNdJson(resp.text).sort((obj1, obj2) =>
+              obj1.id.localeCompare(obj2.id)
+            );
+            expect(objects.map((obj) => obj.id)).to.eql([
+              'type_1-obj_1',
+              'type_1-obj_2',
+              'type_2-obj_1',
+              'type_dep-obj_1',
+            ]);
+
+            expect(objects[0].attributes.enabled).to.eql(false);
+            expect(objects[1].attributes.enabled).to.eql(false);
           });
-        });
+      });
     });
   });
 }
diff --git a/test/plugin_functional/test_suites/saved_objects_management/find.ts b/test/plugin_functional/test_suites/saved_objects_management/find.ts
index e5a5d69c7e4d4..fdeb2c6f8b124 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/find.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/find.ts
@@ -17,12 +17,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
     describe('saved objects with hidden type', () => {
       before(() =>
         esArchiver.load(
-          '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+          'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
         )
       );
       after(() =>
         esArchiver.unload(
-          '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+          'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
         )
       );
       it('returns saved objects with importableAndExportable types', async () =>
diff --git a/test/plugin_functional/test_suites/saved_objects_management/get.ts b/test/plugin_functional/test_suites/saved_objects_management/get.ts
index fa35983df8301..6a69aa9146f3e 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/get.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/get.ts
@@ -17,12 +17,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
     describe('saved objects with hidden type', () => {
       before(() =>
         esArchiver.load(
-          '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+          'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
         )
       );
       after(() =>
         esArchiver.unload(
-          '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+          'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
         )
       );
       const hiddenTypeExportableImportable =
diff --git a/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts b/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts
index 464b7c6e7ced7..8e7adb504ebee 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/hidden_types.ts
@@ -24,13 +24,13 @@ export default function ({ getService, getPageObjects }: PluginFunctionalProvide
   describe('saved objects management with hidden types', () => {
     before(async () => {
       await esArchiver.load(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_types'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_types'
       );
     });
 
     after(async () => {
       await esArchiver.unload(
-        '../functional/fixtures/es_archiver/saved_objects_management/hidden_types'
+        'test/functional/fixtures/es_archiver/saved_objects_management/hidden_types'
       );
     });
 
diff --git a/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts b/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts
index f74cd5b938447..0041344733f0d 100644
--- a/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts
+++ b/test/plugin_functional/test_suites/saved_objects_management/scroll_count.ts
@@ -18,12 +18,12 @@ export default function ({ getService }: PluginFunctionalProviderContext) {
     describe('saved objects with hidden type', () => {
       before(() =>
         esArchiver.load(
-          '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+          'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
         )
       );
       after(() =>
         esArchiver.unload(
-          '../functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
+          'test/functional/fixtures/es_archiver/saved_objects_management/hidden_saved_objects'
         )
       );
 
diff --git a/test/plugin_functional/test_suites/telemetry/index.ts b/test/plugin_functional/test_suites/telemetry/index.ts
new file mode 100644
index 0000000000000..2e94cc5d3bfd1
--- /dev/null
+++ b/test/plugin_functional/test_suites/telemetry/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { PluginFunctionalProviderContext } from '../../services';
+
+export default function ({ loadTestFile }: PluginFunctionalProviderContext) {
+  describe('telemetry', function () {
+    loadTestFile(require.resolve('./telemetry'));
+  });
+}
diff --git a/test/plugin_functional/test_suites/telemetry/telemetry.ts b/test/plugin_functional/test_suites/telemetry/telemetry.ts
new file mode 100644
index 0000000000000..8ebc78c9b2f84
--- /dev/null
+++ b/test/plugin_functional/test_suites/telemetry/telemetry.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 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 { 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');
+  const PageObjects = getPageObjects(['common']);
+
+  describe('Telemetry service', () => {
+    const checkCanSendTelemetry = (): Promise<boolean> => {
+      return browser.executeAsync<boolean>((cb) => {
+        ((window as unknown) as Record<string, () => Promise<boolean>>)
+          ._checkCanSendTelemetry()
+          .then(cb);
+      });
+    };
+
+    after(async () => {
+      await browser.removeLocalStorageItem(KBN_SCREENSHOT_MODE_ENABLED_KEY);
+      await browser.executeAsync<void>((cb) => {
+        ((window as unknown) as Record<string, () => Promise<boolean>>)
+          ._resetTelemetry()
+          .then(() => cb());
+      });
+    });
+
+    it('detects that telemetry cannot be sent in screenshot mode', async () => {
+      await PageObjects.common.navigateToApp('home');
+      expect(await checkCanSendTelemetry()).to.be(true);
+
+      await browser.setLocalStorageItem(KBN_SCREENSHOT_MODE_ENABLED_KEY, 'true');
+      await PageObjects.common.navigateToApp('home');
+
+      expect(await checkCanSendTelemetry()).to.be(false);
+    });
+  });
+}
diff --git a/test/scripts/checks/baseline_plugin_public_api_docs.sh b/test/scripts/checks/baseline_plugin_public_api_docs.sh
new file mode 100755
index 0000000000000..6b357897d963c
--- /dev/null
+++ b/test/scripts/checks/baseline_plugin_public_api_docs.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+###
+### rebuild plugin api docs to ensure it's not out of date
+###
+echo " -- building api docs"
+node scripts/build_api_docs
diff --git a/test/scripts/checks/plugin_public_api_docs.sh b/test/scripts/checks/plugin_public_api_docs.sh
deleted file mode 100644
index 8fe9eb3f2f43c..0000000000000
--- a/test/scripts/checks/plugin_public_api_docs.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/env bash
-
-source src/dev/ci_setup/setup_env.sh
-
-###
-### rebuild plugin api docs to ensure it's not out of date
-###
-echo " -- building api docs"
-node scripts/build_api_docs
-
-###
-### verify no api changes
-###
-### GIT_CHANGES="$(git ls-files --modified)"
-
-### if [ "$GIT_CHANGES" ]; then
-###   echo -e "\n${RED}ERROR: 'node scripts/build_api_docs' caused changes to the following files:${C_RESET}\n"
-###   echo -e "$GIT_CHANGES\n"
-###   exit 1
-### fi
diff --git a/test/scripts/checks/type_check.sh b/test/scripts/checks/type_check.sh
deleted file mode 100755
index bbe5748558684..0000000000000
--- a/test/scripts/checks/type_check.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-source src/dev/ci_setup/setup_env.sh
-
-checks-reporter-with-killswitch "Build TS Refs" \
-  node scripts/build_ts_refs \
-    --ignore-type-failures \
-    --clean \
-    --no-cache \
-    --force \
-    --debug
-
-checks-reporter-with-killswitch "Check Types" \
-  node scripts/type_check
diff --git a/test/scripts/checks/type_check_plugin_public_api_docs.sh b/test/scripts/checks/type_check_plugin_public_api_docs.sh
new file mode 100755
index 0000000000000..d32343fcd173d
--- /dev/null
+++ b/test/scripts/checks/type_check_plugin_public_api_docs.sh
@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+source src/dev/ci_setup/setup_env.sh
+
+checks-reporter-with-killswitch "Build TS Refs" \
+  node scripts/build_ts_refs \
+    --ignore-type-failures \
+    --clean \
+    --no-cache \
+    --force \
+    --debug
+
+checks-reporter-with-killswitch "Check Types" \
+  node scripts/type_check
+
+echo " -- building api docs"
+node scripts/build_api_docs
diff --git a/test/security_functional/config.ts b/test/security_functional/config.ts
index f61f3bbf240ec..b01f27b4cb7d6 100644
--- a/test/security_functional/config.ts
+++ b/test/security_functional/config.ts
@@ -19,9 +19,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers: functionalConfig.get('servers'),
     esTestCluster: functionalConfig.get('esTestCluster'),
     apps: {},
-    esArchiver: {
-      directory: path.resolve(__dirname, '../functional/fixtures/es_archiver'),
-    },
     snapshots: {
       directory: path.resolve(__dirname, 'snapshots'),
     },
diff --git a/test/security_functional/insecure_cluster_warning.ts b/test/security_functional/insecure_cluster_warning.ts
index 44a0e2eb0e121..238643e573540 100644
--- a/test/security_functional/insecure_cluster_warning.ts
+++ b/test/security_functional/insecure_cluster_warning.ts
@@ -20,17 +20,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await pageObjects.common.navigateToApp('home');
       await browser.setLocalStorageItem('insecureClusterWarningVisibility', '');
       // starting without user data
-      await esArchiver.unload('hamlet');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet');
     });
 
     after(async () => {
-      await esArchiver.unload('hamlet');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet');
     });
 
     describe('without user data', () => {
       before(async () => {
         await browser.setLocalStorageItem('insecureClusterWarningVisibility', '');
-        await esArchiver.unload('hamlet');
+        await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet');
         await esArchiver.emptyKibanaIndex();
       });
 
@@ -48,11 +48,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       before(async () => {
         await pageObjects.common.navigateToApp('home');
         await browser.setLocalStorageItem('insecureClusterWarningVisibility', '');
-        await esArchiver.load('hamlet');
+        await esArchiver.load('test/functional/fixtures/es_archiver/hamlet');
       });
 
       after(async () => {
-        await esArchiver.unload('hamlet');
+        await esArchiver.unload('test/functional/fixtures/es_archiver/hamlet');
       });
 
       it('should warn about an insecure cluster, and hide when dismissed', async () => {
diff --git a/test/tsconfig.json b/test/tsconfig.json
index c68e15b2419a1..3e02283946080 100644
--- a/test/tsconfig.json
+++ b/test/tsconfig.json
@@ -1,15 +1,23 @@
 {
   "extends": "../tsconfig.base.json",
   "compilerOptions": {
-    "incremental": false,
-    "types": ["node"]
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true,
+    "types": ["node", "resize-observer-polyfill"]
   },
   "include": [
     "**/*",
     "../typings/**/*",
-    "../packages/kbn-test/types/ftr_globals/**/*"
+    "../packages/kbn-test/types/ftr_globals/**/*",
+    "api_integration/apis/logstash/pipeline/fixtures/*.json",
+    "api_integration/apis/logstash/pipelines/fixtures/*.json",
+    "api_integration/apis/telemetry/fixtures/*.json",
+    "api_integration/apis/telemetry/fixtures/*.json",
   ],
-  "exclude": ["plugin_functional/plugins/**/*", "interpreter_functional/plugins/**/*"],
+  "exclude": ["target/**/*", "plugin_functional/plugins/**/*", "interpreter_functional/plugins/**/*"],
   "references": [
     { "path": "../src/core/tsconfig.json" },
     { "path": "../src/plugins/telemetry_management_section/tsconfig.json" },
@@ -40,6 +48,9 @@
     { "path": "../src/plugins/url_forwarding/tsconfig.json" },
     { "path": "../src/plugins/usage_collection/tsconfig.json" },
     { "path": "../src/plugins/index_pattern_management/tsconfig.json" },
-    { "path": "../src/plugins/legacy_export/tsconfig.json" }
+    { "path": "../src/plugins/legacy_export/tsconfig.json" },
+    { "path": "../src/plugins/visualize/tsconfig.json" },
+    { "path": "plugin_functional/plugins/core_app_status/tsconfig.json" },
+    { "path": "plugin_functional/plugins/core_provider_plugin/tsconfig.json" },
   ]
 }
diff --git a/test/visual_regression/ftr_provider_context.d.ts b/test/visual_regression/ftr_provider_context.d.ts
deleted file mode 100644
index ba3eb370048b8..0000000000000
--- a/test/visual_regression/ftr_provider_context.d.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { GenericFtrProviderContext } from '@kbn/test';
-
-import { pageObjects } from '../functional/page_objects';
-import { services } from './services';
-
-export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
diff --git a/test/visual_regression/ftr_provider_context.ts b/test/visual_regression/ftr_provider_context.ts
new file mode 100644
index 0000000000000..28bedd1ca6bc3
--- /dev/null
+++ b/test/visual_regression/ftr_provider_context.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 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 { GenericFtrProviderContext, GenericFtrService } from '@kbn/test';
+
+import { pageObjects } from '../functional/page_objects';
+import { services } from './services';
+
+export type FtrProviderContext = GenericFtrProviderContext<typeof services, typeof pageObjects>;
+export class FtrService extends GenericFtrService<FtrProviderContext> {}
diff --git a/test/visual_regression/services/index.ts b/test/visual_regression/services/index.ts
index a948e4ef5d94e..9aefe1f8de780 100644
--- a/test/visual_regression/services/index.ts
+++ b/test/visual_regression/services/index.ts
@@ -7,9 +7,9 @@
  */
 
 import { services as functionalServices } from '../../functional/services';
-import { VisualTestingProvider } from './visual_testing';
+import { VisualTestingService } from './visual_testing';
 
 export const services = {
   ...functionalServices,
-  visualTesting: VisualTestingProvider,
+  visualTesting: VisualTestingService,
 };
diff --git a/test/visual_regression/services/visual_testing/index.ts b/test/visual_regression/services/visual_testing/index.ts
index 9add3a7f6fd33..156e3814d8a1d 100644
--- a/test/visual_regression/services/visual_testing/index.ts
+++ b/test/visual_regression/services/visual_testing/index.ts
@@ -6,4 +6,4 @@
  * Side Public License, v 1.
  */
 
-export { VisualTestingProvider } from './visual_testing';
+export * from './visual_testing';
diff --git a/test/visual_regression/services/visual_testing/visual_testing.ts b/test/visual_regression/services/visual_testing/visual_testing.ts
index a0d9afa90f3fe..59c601e6a2b6e 100644
--- a/test/visual_regression/services/visual_testing/visual_testing.ts
+++ b/test/visual_regression/services/visual_testing/visual_testing.ts
@@ -10,7 +10,7 @@ import { postSnapshot } from '@percy/agent/dist/utils/sdk-utils';
 import testSubjSelector from '@kbn/test-subj-selector';
 import { Test } from '@kbn/test';
 import { kibanaPackageJson as pkg } from '@kbn/utils';
-import { FtrProviderContext } from '../../ftr_provider_context';
+import { FtrService, FtrProviderContext } from '../../ftr_provider_context';
 
 // @ts-ignore internal js that is passed to the browser as is
 import { takePercySnapshot, takePercySnapshotWithAgent } from './take_percy_snapshot';
@@ -34,79 +34,81 @@ export interface SnapshotOptions {
   hide?: string[];
 }
 
-export async function VisualTestingProvider({ getService }: FtrProviderContext) {
-  const browser = getService('browser');
-  const log = getService('log');
-  const lifecycle = getService('lifecycle');
+const statsCache = new WeakMap<Test, { snapshotCount: number }>();
 
-  let currentTest: Test | undefined;
-  lifecycle.beforeEachTest.add((test) => {
-    currentTest = test;
-  });
+function getStats(test: Test) {
+  if (!statsCache.has(test)) {
+    statsCache.set(test, {
+      snapshotCount: 0,
+    });
+  }
+
+  return statsCache.get(test)!;
+}
 
-  const statsCache = new WeakMap<Test, { snapshotCount: number }>();
+export class VisualTestingService extends FtrService {
+  private readonly browser = this.ctx.getService('browser');
+  private readonly log = this.ctx.getService('log');
 
-  function getStats(test: Test) {
-    if (!statsCache.has(test)) {
-      statsCache.set(test, {
-        snapshotCount: 0,
-      });
-    }
+  private currentTest: Test | undefined;
 
-    return statsCache.get(test)!;
+  constructor(ctx: FtrProviderContext) {
+    super(ctx);
+
+    this.ctx.getService('lifecycle').beforeEachTest.add((test) => {
+      this.currentTest = test;
+    });
   }
 
-  return new (class VisualTesting {
-    public async snapshot(options: SnapshotOptions = {}) {
-      if (process.env.DISABLE_VISUAL_TESTING) {
-        log.warning(
-          'Capturing of percy snapshots disabled, would normally capture a snapshot here!'
-        );
-        return;
-      }
-
-      log.debug('Capturing percy snapshot');
-
-      if (!currentTest) {
-        throw new Error('unable to determine current test');
-      }
-
-      const [domSnapshot, url] = await Promise.all([
-        this.getSnapshot(options.show, options.hide),
-        browser.getCurrentUrl(),
-      ]);
-      const stats = getStats(currentTest);
-      stats.snapshotCount += 1;
-
-      const { name } = options;
-      const success = await postSnapshot({
-        name: `${currentTest.fullTitle()} [${name ? name : stats.snapshotCount}]`,
-        url,
-        domSnapshot,
-        clientInfo: `kibana-ftr:${pkg.version}`,
-        ...DEFAULT_OPTIONS,
-      });
-
-      if (!success) {
-        throw new Error('Percy snapshot failed');
-      }
+  public async snapshot(options: SnapshotOptions = {}) {
+    if (process.env.DISABLE_VISUAL_TESTING) {
+      this.log.warning(
+        'Capturing of percy snapshots disabled, would normally capture a snapshot here!'
+      );
+      return;
     }
 
-    private async getSnapshot(show: string[] = [], hide: string[] = []) {
-      const showSelectors = show.map(testSubjSelector);
-      const hideSelectors = hide.map(testSubjSelector);
-      const snapshot = await browser.execute<[string[], string[]], string | false>(
-        takePercySnapshot,
-        showSelectors,
-        hideSelectors
-      );
-      return snapshot !== false
-        ? snapshot
-        : await browser.execute<[string[], string[]], string>(
-            takePercySnapshotWithAgent,
-            showSelectors,
-            hideSelectors
-          );
+    this.log.debug('Capturing percy snapshot');
+
+    if (!this.currentTest) {
+      throw new Error('unable to determine current test');
+    }
+
+    const [domSnapshot, url] = await Promise.all([
+      this.getSnapshot(options.show, options.hide),
+      this.browser.getCurrentUrl(),
+    ]);
+    const stats = getStats(this.currentTest);
+    stats.snapshotCount += 1;
+
+    const { name } = options;
+    const success = await postSnapshot({
+      name: `${this.currentTest.fullTitle()} [${name ? name : stats.snapshotCount}]`,
+      url,
+      domSnapshot,
+      clientInfo: `kibana-ftr:${pkg.version}`,
+      ...DEFAULT_OPTIONS,
+    });
+
+    if (!success) {
+      throw new Error('Percy snapshot failed');
     }
-  })();
+  }
+
+  private async getSnapshot(show: string[] = [], hide: string[] = []) {
+    const showSelectors = show.map(testSubjSelector);
+    const hideSelectors = hide.map(testSubjSelector);
+    const snapshot = await this.browser.execute<[string[], string[]], string | false>(
+      takePercySnapshot,
+      showSelectors,
+      hideSelectors
+    );
+    return snapshot !== false
+      ? snapshot
+      : await this.browser.execute<[string[], string[]], string>(
+          takePercySnapshotWithAgent,
+          showSelectors,
+          hideSelectors
+        );
+  }
 }
diff --git a/test/visual_regression/tests/discover/chart_visualization.ts b/test/visual_regression/tests/discover/chart_visualization.ts
index c8e4fdbef53b2..389a0a4b6a314 100644
--- a/test/visual_regression/tests/discover/chart_visualization.ts
+++ b/test/visual_regression/tests/discover/chart_visualization.ts
@@ -24,17 +24,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('discover', function describeIndexTests() {
     before(async function () {
-      await esArchiver.load('discover');
+      await esArchiver.load('test/functional/fixtures/es_archiver/discover');
 
       // and load a set of makelogs data
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/logstash_functional');
       await kibanaServer.uiSettings.replace(defaultSettings);
       await PageObjects.common.navigateToApp('discover');
       await PageObjects.timePicker.setDefaultAbsoluteRange();
     });
 
     after(function unloadMakelogs() {
-      return esArchiver.unload('logstash_functional');
+      return esArchiver.unload('test/functional/fixtures/es_archiver/logstash_functional');
     });
 
     async function refreshDiscover() {
diff --git a/test/visual_regression/tests/vega/vega_map_visualization.ts b/test/visual_regression/tests/vega/vega_map_visualization.ts
index fa8704687bec9..96b08467e4a8f 100644
--- a/test/visual_regression/tests/vega/vega_map_visualization.ts
+++ b/test/visual_regression/tests/vega/vega_map_visualization.ts
@@ -15,13 +15,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('vega chart in visualize app', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('kibana_sample_data_flights');
-      await esArchiver.loadIfNeeded('visualize');
+      await esArchiver.loadIfNeeded(
+        'test/functional/fixtures/es_archiver/kibana_sample_data_flights'
+      );
+      await esArchiver.loadIfNeeded('test/functional/fixtures/es_archiver/visualize');
     });
 
     after(async () => {
-      await esArchiver.unload('kibana_sample_data_flights');
-      await esArchiver.unload('visualize');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/kibana_sample_data_flights');
+      await esArchiver.unload('test/functional/fixtures/es_archiver/visualize');
     });
 
     it('should show map with vega layer', async function () {
diff --git a/tsconfig.base.json b/tsconfig.base.json
index da4de5ef3712b..cc8b66848a394 100644
--- a/tsconfig.base.json
+++ b/tsconfig.base.json
@@ -2,6 +2,13 @@
   "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-*",
+      ],
       // Allows for importing from `kibana` package for the exported types.
       "kibana": ["./kibana"],
       "kibana/public": ["src/core/public"],
@@ -54,7 +61,8 @@
       "jest",
       "flot",
       "jest-styled-components",
-      "@testing-library/jest-dom"
+      "@testing-library/jest-dom",
+      "resize-observer-polyfill"
     ]
   }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 37fc9ee05a29b..c91f7b768a5c4 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -65,6 +65,7 @@
     { "path": "./src/plugins/vis_type_vislib/tsconfig.json" },
     { "path": "./src/plugins/vis_type_vega/tsconfig.json" },
     { "path": "./src/plugins/vis_type_xy/tsconfig.json" },
+    { "path": "./src/plugins/vis_type_pie/tsconfig.json" },
     { "path": "./src/plugins/visualizations/tsconfig.json" },
     { "path": "./src/plugins/visualize/tsconfig.json" },
     { "path": "./src/plugins/index_pattern_management/tsconfig.json" },
diff --git a/tsconfig.refs.json b/tsconfig.refs.json
index 1b8a76d601e38..3baf5c323ef81 100644
--- a/tsconfig.refs.json
+++ b/tsconfig.refs.json
@@ -52,9 +52,11 @@
     { "path": "./src/plugins/vis_type_vislib/tsconfig.json" },
     { "path": "./src/plugins/vis_type_vega/tsconfig.json" },
     { "path": "./src/plugins/vis_type_xy/tsconfig.json" },
+    { "path": "./src/plugins/vis_type_pie/tsconfig.json" },
     { "path": "./src/plugins/visualizations/tsconfig.json" },
     { "path": "./src/plugins/visualize/tsconfig.json" },
     { "path": "./src/plugins/index_pattern_management/tsconfig.json" },
+    { "path": "./test/tsconfig.json" },
     { "path": "./x-pack/plugins/actions/tsconfig.json" },
     { "path": "./x-pack/plugins/alerting/tsconfig.json" },
     { "path": "./x-pack/plugins/apm/tsconfig.json" },
@@ -117,5 +119,6 @@
     { "path": "./x-pack/plugins/index_lifecycle_management/tsconfig.json" },
     { "path": "./x-pack/plugins/uptime/tsconfig.json" },
     { "path": "./x-pack/plugins/xpack_legacy/tsconfig.json" },
+    { "path": "./x-pack/test/tsconfig.json" },
   ]
 }
diff --git a/typings/elasticsearch/index.d.ts b/typings/elasticsearch/index.d.ts
index 7eaf762d353ac..1951434890c50 100644
--- a/typings/elasticsearch/index.d.ts
+++ b/typings/elasticsearch/index.d.ts
@@ -8,9 +8,9 @@
 import { estypes } from '@elastic/elasticsearch';
 import { InferSearchResponseOf, AggregateOf as AggregationResultOf, SearchHit } from './search';
 
-export type ESFilter = estypes.QueryContainer;
+export type ESFilter = estypes.QueryDslQueryContainer;
 export type ESSearchRequest = estypes.SearchRequest;
-export type AggregationOptionsByType = Required<estypes.AggregationContainer>;
+export type AggregationOptionsByType = Required<estypes.AggregationsAggregationContainer>;
 
 // Typings for Elasticsearch queries and aggregations. These are intended to be
 // moved to the Elasticsearch JS client at some point (see #77720.)
diff --git a/typings/elasticsearch/search.d.ts b/typings/elasticsearch/search.d.ts
index d75f31d388176..36a684fb097a5 100644
--- a/typings/elasticsearch/search.d.ts
+++ b/typings/elasticsearch/search.d.ts
@@ -28,14 +28,14 @@ type KeysOfSources<T extends any[]> = T extends [infer U, ...infer V]
   : {};
 
 type CompositeKeysOf<
-  TAggregationContainer extends estypes.AggregationContainer
+  TAggregationContainer extends estypes.AggregationsAggregationContainer
 > = TAggregationContainer extends {
   composite: { sources: [...infer TSource] };
 }
   ? KeysOfSources<TSource>
   : unknown;
 
-type Source = estypes.SourceFilter | boolean | estypes.Fields;
+type Source = estypes.SearchSourceFilter | boolean | estypes.Fields;
 
 type ValueTypeOfField<T> = T extends Record<string, string | number>
   ? ValuesType<T>
@@ -50,13 +50,13 @@ type ValueTypeOfField<T> = T extends Record<string, string | number>
 type MaybeArray<T> = T | T[];
 
 type Fields = Exclude<Required<estypes.SearchRequest>['body']['fields'], undefined>;
-type DocValueFields = MaybeArray<string | estypes.DocValueField>;
+type DocValueFields = MaybeArray<string | estypes.SearchDocValueField>;
 
 export type SearchHit<
   TSource extends any = unknown,
   TFields extends Fields | undefined = undefined,
   TDocValueFields extends DocValueFields | undefined = undefined
-> = Omit<estypes.Hit, '_source' | 'fields'> &
+> = Omit<estypes.SearchHit, '_source' | 'fields'> &
   (TSource extends false ? {} : { _source: TSource }) &
   (TFields extends Fields
     ? {
@@ -82,11 +82,17 @@ type HitsOf<
   >
 >;
 
-type AggregationTypeName = Exclude<keyof estypes.AggregationContainer, 'aggs' | 'aggregations'>;
+type AggregationTypeName = Exclude<
+  keyof estypes.AggregationsAggregationContainer,
+  'aggs' | 'aggregations'
+>;
 
-type AggregationMap = Partial<Record<string, estypes.AggregationContainer>>;
+type AggregationMap = Partial<Record<string, estypes.AggregationsAggregationContainer>>;
 
-type TopLevelAggregationRequest = Pick<estypes.AggregationContainer, 'aggs' | 'aggregations'>;
+type TopLevelAggregationRequest = Pick<
+  estypes.AggregationsAggregationContainer,
+  'aggs' | 'aggregations'
+>;
 
 type MaybeKeyed<
   TAggregationContainer,
@@ -97,7 +103,7 @@ type MaybeKeyed<
   : { buckets: TBucket[] };
 
 export type AggregateOf<
-  TAggregationContainer extends estypes.AggregationContainer,
+  TAggregationContainer extends estypes.AggregationsAggregationContainer,
   TDocument
 > = (Record<AggregationTypeName, unknown> & {
   adjacency_matrix: {
@@ -518,9 +524,9 @@ export type AggregateOf<
         relation: 'eq' | 'gte';
       };
       max_score: number | null;
-      hits: TAggregationContainer extends { top_hits: estypes.TopHitsAggregation }
+      hits: TAggregationContainer extends { top_hits: estypes.AggregationsTopHitsAggregation }
         ? HitsOf<TAggregationContainer['top_hits'], TDocument>
-        : estypes.HitsMetadata<TDocument>;
+        : estypes.SearchHitsMetadata<TDocument>;
     };
   };
   top_metrics: {
@@ -542,7 +548,7 @@ export type AggregateOf<
 })[ValidAggregationKeysOf<TAggregationContainer> & AggregationTypeName];
 
 type AggregateOfMap<TAggregationMap extends AggregationMap, TDocument> = {
-  [TAggregationName in keyof TAggregationMap]: TAggregationMap[TAggregationName] extends estypes.AggregationContainer
+  [TAggregationName in keyof TAggregationMap]: TAggregationMap[TAggregationName] extends estypes.AggregationsAggregationContainer
     ? AggregateOf<TAggregationMap[TAggregationName], TDocument>
     : never; // using never means we effectively ignore optional keys, using {} creates a union type of { ... } | {}
 };
diff --git a/vars/tasks.groovy b/vars/tasks.groovy
index e6061de2987ba..e6ab3eaf92afd 100644
--- a/vars/tasks.groovy
+++ b/vars/tasks.groovy
@@ -11,8 +11,7 @@ def check() {
     kibanaPipeline.scriptTask('Check Doc API Changes', 'test/scripts/checks/doc_api_changes.sh'),
     kibanaPipeline.scriptTask('Check @kbn/pm Distributable', 'test/scripts/checks/kbn_pm_dist.sh'),
     kibanaPipeline.scriptTask('Check Plugin List Docs', 'test/scripts/checks/plugin_list_docs.sh'),
-    kibanaPipeline.scriptTask('Check Public API Docs', 'test/scripts/checks/plugin_public_api_docs.sh'),
-    kibanaPipeline.scriptTask('Check Types', 'test/scripts/checks/type_check.sh'),
+    kibanaPipeline.scriptTask('Check Types and Public API Docs', 'test/scripts/checks/type_check_plugin_public_api_docs.sh'),
     kibanaPipeline.scriptTask('Check Bundle Limits', 'test/scripts/checks/bundle_limits.sh'),
     kibanaPipeline.scriptTask('Check i18n', 'test/scripts/checks/i18n.sh'),
     kibanaPipeline.scriptTask('Check File Casing', 'test/scripts/checks/file_casing.sh'),
diff --git a/x-pack/.i18nrc.json b/x-pack/.i18nrc.json
index b2c3a36ae3414..9b98ca864f496 100644
--- a/x-pack/.i18nrc.json
+++ b/x-pack/.i18nrc.json
@@ -19,7 +19,7 @@
     "xpack.endpoint": "plugins/endpoint",
     "xpack.enterpriseSearch": "plugins/enterprise_search",
     "xpack.features": "plugins/features",
-    "xpack.fileDataVisualizer": "plugins/file_data_visualizer",
+    "xpack.dataVisualizer": "plugins/data_visualizer",
     "xpack.fileUpload": "plugins/file_upload",
     "xpack.globalSearch": ["plugins/global_search"],
     "xpack.globalSearchBar": ["plugins/global_search_bar"],
diff --git a/x-pack/build_chromium/README.md b/x-pack/build_chromium/README.md
index efa4d8eaa5cfc..267de376c68ff 100644
--- a/x-pack/build_chromium/README.md
+++ b/x-pack/build_chromium/README.md
@@ -1,26 +1,29 @@
 # Chromium build
 
-We ship our own headless build of Chromium which is significantly smaller than
-the standard binaries shipped by Google. The scripts in this folder can be used
-to accept a commit hash from the Chromium repository, and initialize the build
-on Ubuntu Linux.
+We ship our own headless build of Chromium for Linux and Mac OS, using a
+version of the source that corresponds to the requirements of the Puppeteer
+node module. The scripts in this folder can be used to accept a commit hash
+from the Chromium repository, and initialize the build in a workspace.
 
 ## Why do we do this
 
-By default, Puppeteer will download a zip file containing the Chromium browser for any
-OS. This creates problems on Linux, because Chromium has a dependency on X11, which
-is often not installed for a server environment. We don't want to make a requirement
-for Linux that you need X11 to run Kibana. To work around this, we create our own Chromium
-build, using the
+**Linux**: By default, Puppeteer will download a zip file containing the
+Chromium browser for any OS. This creates problems on Linux, because Chromium
+has a dependency on X11, which is often not installed for a server environment.
+We don't want to make a requirement for Linux that you need X11 to run Kibana.
+To work around this, we create our own Chromium build, using the
 [`headless_shell`](https://chromium.googlesource.com/chromium/src/+/5cf4b8b13ed518472038170f8de9db2f6c258fe4/headless)
-build target. There are no (trustworthy) sources of these builds available elsewhere.
-
-Fortunately, creating the custom builds is only necessary for Linux. When you have a build
-of Kibana for Linux, or if you use a Linux desktop to develop Kibana, you have a copy of
-`headless_shell` bundled inside. When you have a Windows or Mac build of Kibana, or use
-either of those for development, you have a copy of the full build of Chromium, which
-was downloaded from the main [Chromium download
-location](https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html).
+build target. There are no (trustworthy) sources of these builds available
+elsewhere.
+
+**Mac**: We do this on Mac because Elastic signs the Kibanna release artifact
+with Apple to work with Gatekeeper on Mac OS. Having our own binary of Chromium
+and bundling it with Kibana is integral to the artifact signing process.
+
+**Windows**: No custom build is necessary for Windows. We are able to use the
+full build of Chromium, downloaded from the main [Chromium download
+location](https://commondatastorage.googleapis.com/chromium-browser-snapshots/index.html),
+using the revision that corresponds with the Puppeteer dependency.
 
 ## Build Script Usage
 
diff --git a/x-pack/build_chromium/build.py b/x-pack/build_chromium/build.py
index 2f85e95b337d5..8f6c6c79e2d8c 100644
--- a/x-pack/build_chromium/build.py
+++ b/x-pack/build_chromium/build.py
@@ -6,7 +6,7 @@
   md5_file,
 )
 
-# This file builds Chromium headless on Linux.
+# This file builds Chromium headless on Mac and Linux.
 
 # Verify that we have an argument, and if not print instructions
 if (len(sys.argv) < 2):
@@ -68,7 +68,6 @@
   print('Running install-build-deps...')
   runcmd(src_path + '/build/install-build-deps.sh')
 
-
 print('Updating all modules')
 runcmd('gclient sync -D')
 
@@ -89,7 +88,7 @@
 print('Compiling... this will take a while')
 runcmd('autoninja -C out/headless headless_shell')
 
-# Optimize the output on Linux x64 by stripping inessentials from the binary
+# Optimize the output on Linux x64 and Mac by stripping inessentials from the binary
 # ARM must be cross-compiled from Linux and can not read the ARM binary in order to strip
 if platform.system() != 'Windows' and arch_name != 'arm64':
   print('Optimizing headless_shell')
@@ -112,10 +111,18 @@ def archive_file(name):
   archive.write(from_path, to_path)
   return to_path
 
-# Add dependencies that must be bundled with the Chromium executable.
+# Each platform has slightly different requirements for what dependencies
+# must be bundled with the Chromium executable.
 archive_file('headless_shell')
-archive_file(path.join('swiftshader', 'libEGL.so'))
-archive_file(path.join('swiftshader', 'libGLESv2.so'))
+if platform.system() == 'Linux':
+  archive_file(path.join('swiftshader', 'libEGL.so'))
+  archive_file(path.join('swiftshader', 'libGLESv2.so'))
+
+elif platform.system() == 'Darwin':
+  archive_file('headless_shell')
+  archive_file('libswiftshader_libEGL.dylib')
+  archive_file('libswiftshader_libGLESv2.dylib')
+  archive_file(path.join('Helpers', 'chrome_crashpad_handler'))
 
 archive.close()
 
diff --git a/x-pack/build_chromium/darwin/args.gn b/x-pack/build_chromium/darwin/args.gn
new file mode 100644
index 0000000000000..605778a6a737c
--- /dev/null
+++ b/x-pack/build_chromium/darwin/args.gn
@@ -0,0 +1,30 @@
+# Based on //build/headless.gn
+
+# Embed resource.pak into binary to simplify deployment.
+headless_use_embedded_resources = true
+
+# In order to simplify deployment we build ICU data file
+# into binary.
+icu_use_data_file = false
+
+# Use embedded data instead external files for headless in order
+# to simplify deployment.
+v8_use_external_startup_data = false
+
+enable_nacl = false
+enable_print_preview = false
+enable_basic_printing = false
+enable_remoting = false
+use_alsa = false
+use_cups = false
+use_dbus = false
+use_gio = false
+# Please, consult @elastic/kibana-security before changing/removing this option.
+use_kerberos = false
+use_libpci = false
+use_pulseaudio = false
+use_udev = false
+
+is_debug = false
+symbol_level = 0
+is_component_build = false
diff --git a/x-pack/examples/alerting_example/public/components/documentation.tsx b/x-pack/examples/alerting_example/public/components/documentation.tsx
index 2cef174675533..7dd5af38288cc 100644
--- a/x-pack/examples/alerting_example/public/components/documentation.tsx
+++ b/x-pack/examples/alerting_example/public/components/documentation.tsx
@@ -17,6 +17,7 @@ import {
   EuiPageHeader,
   EuiPageHeaderSection,
   EuiTitle,
+  EuiCallOut,
   EuiSpacer,
 } from '@elastic/eui';
 import { CreateAlert } from './create_alert';
@@ -49,6 +50,13 @@ export const DocumentationPage = (
             registration of example the RuleTypes, while the `public` handles creation of, and
             navigation for, these rule types.
           </p>
+          <EuiCallOut title="Transport Layer Security" iconType="alert" color="warning">
+            If you see a message about needing to enable the Transport Layer Security, start ES with{' '}
+            <code>yarn es snapshot --ssl --license trial</code> and Kibana with{' '}
+            <code>yarn start --run-examples --ssl</code>. If you running chrome on a mac, you may
+            need to type in <code>thisisunsafe</code> if you see the Certificate invalid screen with
+            no way to &lsquo;proceed anyway&rsquo;.
+          </EuiCallOut>
         </EuiText>
         <EuiSpacer />
         <CreateAlert {...deps} />
diff --git a/x-pack/plugins/actions/server/actions_client.ts b/x-pack/plugins/actions/server/actions_client.ts
index c655141415b54..449d218ed5ae0 100644
--- a/x-pack/plugins/actions/server/actions_client.ts
+++ b/x-pack/plugins/actions/server/actions_client.ts
@@ -515,7 +515,7 @@ async function injectExtraFindData(
   scopedClusterClient: IScopedClusterClient,
   actionResults: ActionResult[]
 ): Promise<FindActionResult[]> {
-  const aggs: Record<string, estypes.AggregationContainer> = {};
+  const aggs: Record<string, estypes.AggregationsAggregationContainer> = {};
   for (const actionResult of actionResults) {
     aggs[actionResult.id] = {
       filter: {
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 93c5dd4a44db0..7540785714bcd 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
@@ -152,14 +152,15 @@ describe('validateParams()', () => {
 `);
   });
 
-  test('should validate and throw error when timestamp has spaces', () => {
+  test('should validate and pass when valid timestamp has spaces', () => {
     const randoDate = new Date('1963-09-23T01:23:45Z').toISOString();
     const timestamp = `  ${randoDate}`;
-    expect(() => {
-      validateParams(actionType, {
-        timestamp,
-      });
-    }).toThrowError(`error validating action params: error parsing timestamp "${timestamp}"`);
+    expect(validateParams(actionType, { timestamp })).toEqual({ timestamp });
+  });
+
+  test('should validate and pass when timestamp is empty string', () => {
+    const timestamp = '';
+    expect(validateParams(actionType, { timestamp })).toEqual({ timestamp });
   });
 
   test('should validate and throw error when timestamp is invalid', () => {
@@ -409,7 +410,7 @@ describe('execute()', () => {
     `);
   });
 
-  test('should fail when sendPagerdury throws', async () => {
+  test('should fail when sendPagerduty throws', async () => {
     const secrets = { routingKey: 'super-secret' };
     const config = { apiUrl: null };
     const params = {};
@@ -576,4 +577,195 @@ describe('execute()', () => {
       }
     `);
   });
+
+  test('should succeed when timestamp contains valid date and extraneous spaces', async () => {
+    const randoDate = new Date('1963-09-23T01:23:45Z').toISOString();
+    const secrets = {
+      routingKey: 'super-secret',
+    };
+    const config = {
+      apiUrl: 'the-api-url',
+    };
+    const params: ActionParamsType = {
+      eventAction: 'trigger',
+      dedupKey: 'a-dedup-key',
+      summary: 'the summary',
+      source: 'the-source',
+      severity: 'critical',
+      timestamp: `   ${randoDate}  `,
+      component: 'the-component',
+      group: 'the-group',
+      class: 'the-class',
+    };
+
+    postPagerdutyMock.mockImplementation(() => {
+      return { status: 202, data: 'data-here' };
+    });
+
+    const actionId = 'some-action-id';
+    const executorOptions: PagerDutyActionTypeExecutorOptions = {
+      actionId,
+      config,
+      params,
+      secrets,
+      services,
+    };
+    const actionResponse = await actionType.executor(executorOptions);
+    const { apiUrl, data, headers } = postPagerdutyMock.mock.calls[0][0];
+    expect({ apiUrl, data, headers }).toMatchInlineSnapshot(`
+      Object {
+        "apiUrl": "the-api-url",
+        "data": Object {
+          "dedup_key": "a-dedup-key",
+          "event_action": "trigger",
+          "payload": Object {
+            "class": "the-class",
+            "component": "the-component",
+            "group": "the-group",
+            "severity": "critical",
+            "source": "the-source",
+            "summary": "the summary",
+            "timestamp": "1963-09-23T01:23:45.000Z",
+          },
+        },
+        "headers": Object {
+          "Content-Type": "application/json",
+          "X-Routing-Key": "super-secret",
+        },
+      }
+    `);
+    expect(actionResponse).toMatchInlineSnapshot(`
+      Object {
+        "actionId": "some-action-id",
+        "data": "data-here",
+        "status": "ok",
+      }
+    `);
+  });
+
+  test('should not pass timestamp field when timestamp is empty string', async () => {
+    const secrets = {
+      routingKey: 'super-secret',
+    };
+    const config = {
+      apiUrl: 'the-api-url',
+    };
+    const params: ActionParamsType = {
+      eventAction: 'trigger',
+      dedupKey: 'a-dedup-key',
+      summary: 'the summary',
+      source: 'the-source',
+      severity: 'critical',
+      timestamp: '',
+      component: 'the-component',
+      group: 'the-group',
+      class: 'the-class',
+    };
+
+    postPagerdutyMock.mockImplementation(() => {
+      return { status: 202, data: 'data-here' };
+    });
+
+    const actionId = 'some-action-id';
+    const executorOptions: PagerDutyActionTypeExecutorOptions = {
+      actionId,
+      config,
+      params,
+      secrets,
+      services,
+    };
+    const actionResponse = await actionType.executor(executorOptions);
+    const { apiUrl, data, headers } = postPagerdutyMock.mock.calls[0][0];
+    expect({ apiUrl, data, headers }).toMatchInlineSnapshot(`
+      Object {
+        "apiUrl": "the-api-url",
+        "data": Object {
+          "dedup_key": "a-dedup-key",
+          "event_action": "trigger",
+          "payload": Object {
+            "class": "the-class",
+            "component": "the-component",
+            "group": "the-group",
+            "severity": "critical",
+            "source": "the-source",
+            "summary": "the summary",
+          },
+        },
+        "headers": Object {
+          "Content-Type": "application/json",
+          "X-Routing-Key": "super-secret",
+        },
+      }
+    `);
+    expect(actionResponse).toMatchInlineSnapshot(`
+      Object {
+        "actionId": "some-action-id",
+        "data": "data-here",
+        "status": "ok",
+      }
+    `);
+  });
+
+  test('should not pass timestamp field when timestamp is string of spaces', async () => {
+    const secrets = {
+      routingKey: 'super-secret',
+    };
+    const config = {
+      apiUrl: 'the-api-url',
+    };
+    const params: ActionParamsType = {
+      eventAction: 'trigger',
+      dedupKey: 'a-dedup-key',
+      summary: 'the summary',
+      source: 'the-source',
+      severity: 'critical',
+      timestamp: '   ',
+      component: 'the-component',
+      group: 'the-group',
+      class: 'the-class',
+    };
+
+    postPagerdutyMock.mockImplementation(() => {
+      return { status: 202, data: 'data-here' };
+    });
+
+    const actionId = 'some-action-id';
+    const executorOptions: PagerDutyActionTypeExecutorOptions = {
+      actionId,
+      config,
+      params,
+      secrets,
+      services,
+    };
+    const actionResponse = await actionType.executor(executorOptions);
+    const { apiUrl, data, headers } = postPagerdutyMock.mock.calls[0][0];
+    expect({ apiUrl, data, headers }).toMatchInlineSnapshot(`
+      Object {
+        "apiUrl": "the-api-url",
+        "data": Object {
+          "dedup_key": "a-dedup-key",
+          "event_action": "trigger",
+          "payload": Object {
+            "class": "the-class",
+            "component": "the-component",
+            "group": "the-group",
+            "severity": "critical",
+            "source": "the-source",
+            "summary": "the summary",
+          },
+        },
+        "headers": Object {
+          "Content-Type": "application/json",
+          "X-Routing-Key": "super-secret",
+        },
+      }
+    `);
+    expect(actionResponse).toMatchInlineSnapshot(`
+      Object {
+        "actionId": "some-action-id",
+        "data": "data-here",
+        "status": "ok",
+      }
+    `);
+  });
 });
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 b64cf6ec346d5..5d83b658111e4 100644
--- a/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
+++ b/x-pack/plugins/actions/server/builtin_action_types/pagerduty.ts
@@ -85,11 +85,19 @@ const ParamsSchema = schema.object(
   { validate: validateParams }
 );
 
+function validateTimestamp(timestamp?: string): string | null {
+  if (timestamp) {
+    return timestamp.trim().length > 0 ? timestamp.trim() : null;
+  }
+  return null;
+}
+
 function validateParams(paramsObject: unknown): string | void {
   const { timestamp, eventAction, dedupKey } = paramsObject as ActionParamsType;
-  if (timestamp != null) {
+  const validatedTimestamp = validateTimestamp(timestamp);
+  if (validatedTimestamp != null) {
     try {
-      const date = Date.parse(timestamp);
+      const date = Date.parse(validatedTimestamp);
       if (isNaN(date)) {
         return i18n.translate('xpack.actions.builtin.pagerduty.invalidTimestampErrorMessage', {
           defaultMessage: `error parsing timestamp "{timestamp}"`,
@@ -279,11 +287,14 @@ function getBodyForEventAction(actionId: string, params: ActionParamsType): Page
     return data;
   }
 
+  const validatedTimestamp = validateTimestamp(params.timestamp);
+
   data.payload = {
     summary: params.summary || 'No summary provided.',
     source: params.source || `Kibana Action ${actionId}`,
     severity: params.severity || 'info',
-    ...omitBy(pick(params, ['timestamp', 'component', 'group', 'class']), isUndefined),
+    ...(validatedTimestamp ? { timestamp: validatedTimestamp } : {}),
+    ...omitBy(pick(params, ['component', 'group', 'class']), isUndefined),
   };
 
   return data;
diff --git a/x-pack/plugins/actions/server/index.ts b/x-pack/plugins/actions/server/index.ts
index 6a0f06b34d670..692ff6fa0a508 100644
--- a/x-pack/plugins/actions/server/index.ts
+++ b/x-pack/plugins/actions/server/index.ts
@@ -69,7 +69,18 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
       ) {
         addDeprecation({
           message:
-            '`xpack.actions.customHostSettings[<index>].tls.rejectUnauthorized` is deprecated. Use `xpack.actions.customHostSettings[<index>].tls.verificationMode` instead, with the setting `verificationMode:full` eql to `rejectUnauthorized:true`, and `verificationMode:none` eql to `rejectUnauthorized:false`.',
+            `"xpack.actions.customHostSettings[<index>].tls.rejectUnauthorized" is deprecated.` +
+            `Use "xpack.actions.customHostSettings[<index>].tls.verificationMode" instead, ` +
+            `with the setting "verificationMode:full" eql to "rejectUnauthorized:true", ` +
+            `and "verificationMode:none" eql to "rejectUnauthorized:false".`,
+          correctiveActions: {
+            manualSteps: [
+              `Remove "xpack.actions.customHostSettings[<index>].tls.rejectUnauthorized" from your kibana configs.`,
+              `Use "xpack.actions.customHostSettings[<index>].tls.verificationMode" ` +
+                `with the setting "verificationMode:full" eql to "rejectUnauthorized:true", ` +
+                `and "verificationMode:none" eql to "rejectUnauthorized:false".`,
+            ],
+          },
         });
       }
     },
@@ -77,7 +88,17 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
       if (!!settings?.xpack?.actions?.rejectUnauthorized) {
         addDeprecation({
           message:
-            '`xpack.actions.rejectUnauthorized` is deprecated. Use `xpack.actions.verificationMode` instead, with the setting `verificationMode:full` eql to `rejectUnauthorized:true`, and `verificationMode:none` eql to `rejectUnauthorized:false`.',
+            `"xpack.actions.rejectUnauthorized" is deprecated. Use "xpack.actions.verificationMode" instead, ` +
+            `with the setting "verificationMode:full" eql to "rejectUnauthorized:true", ` +
+            `and "verificationMode:none" eql to "rejectUnauthorized:false".`,
+          correctiveActions: {
+            manualSteps: [
+              `Remove "xpack.actions.rejectUnauthorized" from your kibana configs.`,
+              `Use "xpack.actions.verificationMode" ` +
+                `with the setting "verificationMode:full" eql to "rejectUnauthorized:true", ` +
+                `and "verificationMode:none" eql to "rejectUnauthorized:false".`,
+            ],
+          },
         });
       }
     },
@@ -85,7 +106,17 @@ export const config: PluginConfigDescriptor<ActionsConfig> = {
       if (!!settings?.xpack?.actions?.proxyRejectUnauthorizedCertificates) {
         addDeprecation({
           message:
-            '`xpack.actions.proxyRejectUnauthorizedCertificates` is deprecated. Use `xpack.actions.proxyVerificationMode` instead, with the setting `proxyVerificationMode:full` eql to `rejectUnauthorized:true`, and `proxyVerificationMode:none` eql to `rejectUnauthorized:false`.',
+            `"xpack.actions.proxyRejectUnauthorizedCertificates" is deprecated. Use "xpack.actions.proxyVerificationMode" instead, ` +
+            `with the setting "proxyVerificationMode:full" eql to "rejectUnauthorized:true",` +
+            `and "proxyVerificationMode:none" eql to "rejectUnauthorized:false".`,
+          correctiveActions: {
+            manualSteps: [
+              `Remove "xpack.actions.proxyRejectUnauthorizedCertificates" from your kibana configs.`,
+              `Use "xpack.actions.proxyVerificationMode" ` +
+                `with the setting "proxyVerificationMode:full" eql to "rejectUnauthorized:true",` +
+                `and "proxyVerificationMode:none" eql to "rejectUnauthorized:false".`,
+            ],
+          },
         });
       }
     },
diff --git a/x-pack/plugins/actions/server/lib/action_executor.ts b/x-pack/plugins/actions/server/lib/action_executor.ts
index b08985e516f84..0737e0ce3f071 100644
--- a/x-pack/plugins/actions/server/lib/action_executor.ts
+++ b/x-pack/plugins/actions/server/lib/action_executor.ts
@@ -7,6 +7,7 @@
 
 import type { PublicMethodsOf } from '@kbn/utility-types';
 import { Logger, KibanaRequest } from 'src/core/server';
+import { withSpan } from '@kbn/apm-utils';
 import { validateParams, validateConfig, validateSecrets } from './validate_with_schema';
 import {
   ActionTypeExecutorResult,
@@ -78,113 +79,136 @@ export class ActionExecutor {
       );
     }
 
-    const {
-      logger,
-      spaces,
-      getServices,
-      encryptedSavedObjectsClient,
-      actionTypeRegistry,
-      eventLogger,
-      preconfiguredActions,
-      getActionsClientWithRequest,
-    } = this.actionExecutorContext!;
-
-    const services = getServices(request);
-    const spaceId = spaces && spaces.getSpaceId(request);
-    const namespace = spaceId && spaceId !== 'default' ? { namespace: spaceId } : {};
-
-    const { actionTypeId, name, config, secrets } = await getActionInfo(
-      await getActionsClientWithRequest(request, source),
-      encryptedSavedObjectsClient,
-      preconfiguredActions,
-      actionId,
-      namespace.namespace
-    );
+    return withSpan(
+      {
+        name: `execute_action`,
+        type: 'actions',
+        labels: {
+          actionId,
+        },
+      },
+      async (span) => {
+        const {
+          logger,
+          spaces,
+          getServices,
+          encryptedSavedObjectsClient,
+          actionTypeRegistry,
+          eventLogger,
+          preconfiguredActions,
+          getActionsClientWithRequest,
+        } = this.actionExecutorContext!;
 
-    if (!actionTypeRegistry.isActionExecutable(actionId, actionTypeId, { notifyUsage: true })) {
-      actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
-    }
-    const actionType = actionTypeRegistry.get(actionTypeId);
-
-    let validatedParams: Record<string, unknown>;
-    let validatedConfig: Record<string, unknown>;
-    let validatedSecrets: Record<string, unknown>;
-
-    try {
-      validatedParams = validateParams(actionType, params);
-      validatedConfig = validateConfig(actionType, config);
-      validatedSecrets = validateSecrets(actionType, secrets);
-    } catch (err) {
-      return { status: 'error', actionId, message: err.message, retry: false };
-    }
+        const services = getServices(request);
+        const spaceId = spaces && spaces.getSpaceId(request);
+        const namespace = spaceId && spaceId !== 'default' ? { namespace: spaceId } : {};
+
+        const { actionTypeId, name, config, secrets } = await getActionInfo(
+          await getActionsClientWithRequest(request, source),
+          encryptedSavedObjectsClient,
+          preconfiguredActions,
+          actionId,
+          namespace.namespace
+        );
+
+        if (span) {
+          span.name = `execute_action ${actionTypeId}`;
+          span.addLabels({
+            actionTypeId,
+          });
+        }
+
+        if (!actionTypeRegistry.isActionExecutable(actionId, actionTypeId, { notifyUsage: true })) {
+          actionTypeRegistry.ensureActionTypeEnabled(actionTypeId);
+        }
+        const actionType = actionTypeRegistry.get(actionTypeId);
+
+        let validatedParams: Record<string, unknown>;
+        let validatedConfig: Record<string, unknown>;
+        let validatedSecrets: Record<string, unknown>;
+
+        try {
+          validatedParams = validateParams(actionType, params);
+          validatedConfig = validateConfig(actionType, config);
+          validatedSecrets = validateSecrets(actionType, secrets);
+        } catch (err) {
+          span?.setOutcome('failure');
+          return { status: 'error', actionId, message: err.message, retry: false };
+        }
 
-    const actionLabel = `${actionTypeId}:${actionId}: ${name}`;
-    logger.debug(`executing action ${actionLabel}`);
-
-    const event: IEvent = {
-      event: { action: EVENT_LOG_ACTIONS.execute },
-      kibana: {
-        saved_objects: [
-          {
-            rel: SAVED_OBJECT_REL_PRIMARY,
-            type: 'action',
-            id: actionId,
-            ...namespace,
+        const actionLabel = `${actionTypeId}:${actionId}: ${name}`;
+        logger.debug(`executing action ${actionLabel}`);
+
+        const event: IEvent = {
+          event: { action: EVENT_LOG_ACTIONS.execute },
+          kibana: {
+            saved_objects: [
+              {
+                rel: SAVED_OBJECT_REL_PRIMARY,
+                type: 'action',
+                id: actionId,
+                type_id: actionTypeId,
+                ...namespace,
+              },
+            ],
           },
-        ],
-      },
-    };
+        };
 
-    eventLogger.startTiming(event);
-    let rawResult: ActionTypeExecutorResult<unknown>;
-    try {
-      rawResult = await actionType.executor({
-        actionId,
-        services,
-        params: validatedParams,
-        config: validatedConfig,
-        secrets: validatedSecrets,
-      });
-    } catch (err) {
-      rawResult = {
-        actionId,
-        status: 'error',
-        message: 'an error occurred while running the action executor',
-        serviceMessage: err.message,
-        retry: false,
-      };
-    }
-    eventLogger.stopTiming(event);
+        eventLogger.startTiming(event);
+        let rawResult: ActionTypeExecutorResult<unknown>;
+        try {
+          rawResult = await actionType.executor({
+            actionId,
+            services,
+            params: validatedParams,
+            config: validatedConfig,
+            secrets: validatedSecrets,
+          });
+        } catch (err) {
+          rawResult = {
+            actionId,
+            status: 'error',
+            message: 'an error occurred while running the action executor',
+            serviceMessage: err.message,
+            retry: false,
+          };
+        }
+        eventLogger.stopTiming(event);
 
-    // allow null-ish return to indicate success
-    const result = rawResult || {
-      actionId,
-      status: 'ok',
-    };
+        // allow null-ish return to indicate success
+        const result = rawResult || {
+          actionId,
+          status: 'ok',
+        };
 
-    event.event = event.event || {};
-
-    if (result.status === 'ok') {
-      event.event.outcome = 'success';
-      event.message = `action executed: ${actionLabel}`;
-    } else if (result.status === 'error') {
-      event.event.outcome = 'failure';
-      event.message = `action execution failure: ${actionLabel}`;
-      event.error = event.error || {};
-      event.error.message = actionErrorToMessage(result);
-      logger.warn(`action execution failure: ${actionLabel}: ${event.error.message}`);
-    } else {
-      event.event.outcome = 'failure';
-      event.message = `action execution returned unexpected result: ${actionLabel}: "${result.status}"`;
-      event.error = event.error || {};
-      event.error.message = 'action execution returned unexpected result';
-      logger.warn(
-        `action execution failure: ${actionLabel}: returned unexpected result "${result.status}"`
-      );
-    }
+        event.event = event.event || {};
 
-    eventLogger.logEvent(event);
-    return result;
+        if (result.status === 'ok') {
+          span?.setOutcome('success');
+          event.event.outcome = 'success';
+          event.message = `action executed: ${actionLabel}`;
+        } else if (result.status === 'error') {
+          span?.setOutcome('failure');
+          event.event.outcome = 'failure';
+          event.message = `action execution failure: ${actionLabel}`;
+          event.error = event.error || {};
+          event.error.message = actionErrorToMessage(result);
+          logger.warn(`action execution failure: ${actionLabel}: ${event.error.message}`);
+        } else {
+          span?.setOutcome('failure');
+          event.event.outcome = 'failure';
+          event.message = `action execution returned unexpected result: ${actionLabel}: "${result.status}"`;
+          event.error = event.error || {};
+          event.error.message = 'action execution returned unexpected result';
+          logger.warn(
+            `action execution failure: ${actionLabel}: returned unexpected result "${result.status}"`
+          );
+        }
+
+        eventLogger.logEvent(event);
+        return result;
+      }
+    );
   }
 }
 
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 fe9874fb1d671..28b904361e677 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
@@ -56,6 +56,7 @@ async function createIndexTemplate({
     await client.indices.putIndexTemplate({
       name: templateName,
       body: template,
+      // @ts-expect-error doesn't exist in @elastic/elasticsearch
       create: true,
     });
   } catch (err) {
diff --git a/x-pack/plugins/actions/server/saved_objects/index.ts b/x-pack/plugins/actions/server/saved_objects/index.ts
index 9360bc919a2d5..9d8c364007959 100644
--- a/x-pack/plugins/actions/server/saved_objects/index.ts
+++ b/x-pack/plugins/actions/server/saved_objects/index.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import {
+import type {
   SavedObject,
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
+  SavedObjectsTypeMappingDefinition,
 } from 'kibana/server';
 import { EncryptedSavedObjectsPluginSetup } from '../../../encrypted_saved_objects/server';
 import mappings from './mappings.json';
@@ -31,7 +32,7 @@ export function setupSavedObjects(
     name: ACTION_SAVED_OBJECT_TYPE,
     hidden: true,
     namespaceType: 'single',
-    mappings: mappings.action,
+    mappings: mappings.action as SavedObjectsTypeMappingDefinition,
     migrations: getMigrations(encryptedSavedObjects),
     management: {
       defaultSearchField: 'name',
@@ -67,7 +68,7 @@ export function setupSavedObjects(
     name: ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
     hidden: true,
     namespaceType: 'single',
-    mappings: mappings.action_task_params,
+    mappings: mappings.action_task_params as SavedObjectsTypeMappingDefinition,
   });
   encryptedSavedObjects.registerType({
     type: ACTION_TASK_PARAMS_SAVED_OBJECT_TYPE,
diff --git a/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts b/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
index b8df0c3d8de09..c81fa7927ef7d 100644
--- a/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
+++ b/x-pack/plugins/alerting/server/alerts_client/alerts_client.ts
@@ -109,7 +109,7 @@ export interface FindOptions extends IndexType {
   defaultSearchOperator?: 'AND' | 'OR';
   searchFields?: string[];
   sortField?: string;
-  sortOrder?: estypes.SortOrder;
+  sortOrder?: estypes.SearchSortOrder;
   hasReference?: {
     type: string;
     id: string;
diff --git a/x-pack/plugins/alerting/server/health/get_health.ts b/x-pack/plugins/alerting/server/health/get_health.ts
index 4a0266c9b729f..6966c9b75ca43 100644
--- a/x-pack/plugins/alerting/server/health/get_health.ts
+++ b/x-pack/plugins/alerting/server/health/get_health.ts
@@ -34,6 +34,7 @@ export const getHealth = async (
     sortOrder: 'desc',
     page: 1,
     perPage: 1,
+    namespaces: ['*'],
   });
 
   if (decryptErrorData.length > 0) {
@@ -51,6 +52,7 @@ export const getHealth = async (
     sortOrder: 'desc',
     page: 1,
     perPage: 1,
+    namespaces: ['*'],
   });
 
   if (executeErrorData.length > 0) {
@@ -68,6 +70,7 @@ export const getHealth = async (
     sortOrder: 'desc',
     page: 1,
     perPage: 1,
+    namespaces: ['*'],
   });
 
   if (readErrorData.length > 0) {
@@ -83,6 +86,7 @@ export const getHealth = async (
     type: 'alert',
     sortField: 'executionStatus.lastExecutionDate',
     sortOrder: 'desc',
+    namespaces: ['*'],
   });
   const lastExecutionDate =
     noErrorData.length > 0
diff --git a/x-pack/plugins/alerting/server/saved_objects/index.ts b/x-pack/plugins/alerting/server/saved_objects/index.ts
index c339183eeedcd..1ad0f972b2ec0 100644
--- a/x-pack/plugins/alerting/server/saved_objects/index.ts
+++ b/x-pack/plugins/alerting/server/saved_objects/index.ts
@@ -5,10 +5,11 @@
  * 2.0.
  */
 
-import {
+import type {
   SavedObject,
   SavedObjectsExportTransformContext,
   SavedObjectsServiceSetup,
+  SavedObjectsTypeMappingDefinition,
 } from 'kibana/server';
 import mappings from './mappings.json';
 import { getMigrations } from './migrations';
@@ -51,7 +52,7 @@ export function setupSavedObjects(
       hidden: true,
       namespaceType: 'single',
       migrations: getMigrations(encryptedSavedObjects),
-      mappings: mappings.alert,
+      mappings: mappings.alert as SavedObjectsTypeMappingDefinition,
       ...(config.enableImportExport
         ? {
             management: {
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 78d74b78c99ba..5ab25fbfa39e7 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
@@ -166,10 +166,12 @@ test('enqueues execution per selected action', async () => {
                 "id": "1",
                 "rel": "primary",
                 "type": "alert",
+                "type_id": "test",
               },
               Object {
                 "id": "1",
                 "type": "action",
+                "type_id": "test",
               },
             ],
           },
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 93cced2043d5e..ef93179bdaba1 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
@@ -182,8 +182,14 @@ export function createExecutionHandler<
             action_subgroup: actionSubgroup,
           },
           saved_objects: [
-            { rel: SAVED_OBJECT_REL_PRIMARY, type: 'alert', id: alertId, ...namespace },
-            { type: 'action', id: action.id, ...namespace },
+            {
+              rel: SAVED_OBJECT_REL_PRIMARY,
+              type: 'alert',
+              id: alertId,
+              type_id: alertType.id,
+              ...namespace,
+            },
+            { type: 'action', id: action.id, type_id: action.actionTypeId, ...namespace },
           ],
         },
       };
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 9c5ef25e5dfa0..7f31aead1e83c 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
@@ -37,7 +37,7 @@ import { Alert, RecoveredActionGroup } from '../../common';
 import { omit } from 'lodash';
 import { UntypedNormalizedAlertType } from '../alert_type_registry';
 import { alertTypeRegistryMock } from '../alert_type_registry.mock';
-import uuid from 'uuid';
+
 const alertType: jest.Mocked<UntypedNormalizedAlertType> = {
   id: 'test',
   name: 'My test alert',
@@ -278,6 +278,7 @@ describe('Task Runner', () => {
               "namespace": undefined,
               "rel": "primary",
               "type": "alert",
+              "type_id": "test",
             },
           ],
         },
@@ -372,6 +373,8 @@ describe('Task Runner', () => {
     expect(eventLogger.logEvent).toHaveBeenNthCalledWith(1, {
       event: {
         action: 'new-instance',
+        duration: 0,
+        start: '1970-01-01T00:00:00.000Z',
       },
       kibana: {
         alerting: {
@@ -385,6 +388,7 @@ describe('Task Runner', () => {
             namespace: undefined,
             rel: 'primary',
             type: 'alert',
+            type_id: 'test',
           },
         ],
       },
@@ -393,6 +397,8 @@ describe('Task Runner', () => {
     expect(eventLogger.logEvent).toHaveBeenNthCalledWith(2, {
       event: {
         action: 'active-instance',
+        duration: 0,
+        start: '1970-01-01T00:00:00.000Z',
       },
       kibana: {
         alerting: {
@@ -406,6 +412,7 @@ describe('Task Runner', () => {
             namespace: undefined,
             rel: 'primary',
             type: 'alert',
+            type_id: 'test',
           },
         ],
       },
@@ -428,11 +435,13 @@ describe('Task Runner', () => {
             namespace: undefined,
             rel: 'primary',
             type: 'alert',
+            type_id: 'test',
           },
           {
             id: '1',
             namespace: undefined,
             type: 'action',
+            type_id: 'action',
           },
         ],
       },
@@ -455,6 +464,7 @@ describe('Task Runner', () => {
             namespace: undefined,
             rel: 'primary',
             type: 'alert',
+            type_id: 'test',
           },
         ],
       },
@@ -519,6 +529,8 @@ describe('Task Runner', () => {
     expect(eventLogger.logEvent).toHaveBeenNthCalledWith(1, {
       event: {
         action: 'new-instance',
+        duration: 0,
+        start: '1970-01-01T00:00:00.000Z',
       },
       kibana: {
         alerting: {
@@ -531,6 +543,7 @@ describe('Task Runner', () => {
             namespace: undefined,
             rel: 'primary',
             type: 'alert',
+            type_id: 'test',
           },
         ],
       },
@@ -539,6 +552,8 @@ describe('Task Runner', () => {
     expect(eventLogger.logEvent).toHaveBeenNthCalledWith(2, {
       event: {
         action: 'active-instance',
+        duration: 0,
+        start: '1970-01-01T00:00:00.000Z',
       },
       kibana: {
         alerting: {
@@ -551,6 +566,7 @@ describe('Task Runner', () => {
             namespace: undefined,
             rel: 'primary',
             type: 'alert',
+            type_id: 'test',
           },
         ],
       },
@@ -572,6 +588,7 @@ describe('Task Runner', () => {
             namespace: undefined,
             rel: 'primary',
             type: 'alert',
+            type_id: 'test',
           },
         ],
       },
@@ -660,7 +677,11 @@ describe('Task Runner', () => {
               meta: {
                 lastScheduledActions: { date: '1970-01-01T00:00:00.000Z', group: 'default' },
               },
-              state: { bar: false },
+              state: {
+                bar: false,
+                start: '1969-12-31T00:00:00.000Z',
+                duration: 86400000000000,
+              },
             },
           },
         },
@@ -690,6 +711,8 @@ describe('Task Runner', () => {
           Object {
             "event": Object {
               "action": "active-instance",
+              "duration": 86400000000000,
+              "start": "1969-12-31T00:00:00.000Z",
             },
             "kibana": Object {
               "alerting": Object {
@@ -702,6 +725,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -725,6 +749,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -913,17 +938,221 @@ describe('Task Runner', () => {
 
     const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
     expect(eventLogger.logEvent).toHaveBeenCalledTimes(4);
+    expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
+    Array [
+      Array [
+        Object {
+          "event": Object {
+            "action": "new-instance",
+            "duration": 0,
+            "start": "1970-01-01T00:00:00.000Z",
+          },
+          "kibana": Object {
+            "alerting": Object {
+              "action_group_id": "default",
+              "instance_id": "1",
+            },
+            "saved_objects": Array [
+              Object {
+                "id": "1",
+                "namespace": undefined,
+                "rel": "primary",
+                "type": "alert",
+                "type_id": "test",
+              },
+            ],
+          },
+          "message": "test:1: 'alert-name' created new instance: '1'",
+        },
+      ],
+      Array [
+        Object {
+          "event": Object {
+            "action": "active-instance",
+            "duration": 0,
+            "start": "1970-01-01T00:00:00.000Z",
+          },
+          "kibana": Object {
+            "alerting": Object {
+              "action_group_id": "default",
+              "instance_id": "1",
+            },
+            "saved_objects": Array [
+              Object {
+                "id": "1",
+                "namespace": undefined,
+                "rel": "primary",
+                "type": "alert",
+                "type_id": "test",
+              },
+            ],
+          },
+          "message": "test:1: 'alert-name' active instance: '1' in actionGroup: 'default'",
+        },
+      ],
+      Array [
+        Object {
+          "event": Object {
+            "action": "execute-action",
+          },
+          "kibana": Object {
+            "alerting": Object {
+              "action_group_id": "default",
+              "action_subgroup": undefined,
+              "instance_id": "1",
+            },
+            "saved_objects": Array [
+              Object {
+                "id": "1",
+                "namespace": undefined,
+                "rel": "primary",
+                "type": "alert",
+                "type_id": "test",
+              },
+              Object {
+                "id": "1",
+                "namespace": undefined,
+                "type": "action",
+                "type_id": "action",
+              },
+            ],
+          },
+          "message": "alert: test:1: 'alert-name' instanceId: '1' scheduled actionGroup: 'default' action: action:1",
+        },
+      ],
+      Array [
+        Object {
+          "@timestamp": "1970-01-01T00:00:00.000Z",
+          "event": Object {
+            "action": "execute",
+            "outcome": "success",
+          },
+          "kibana": Object {
+            "alerting": Object {
+              "status": "active",
+            },
+            "saved_objects": Array [
+              Object {
+                "id": "1",
+                "namespace": undefined,
+                "rel": "primary",
+                "type": "alert",
+                "type_id": "test",
+              },
+            ],
+          },
+          "message": "alert executed: test:1: 'alert-name'",
+        },
+      ],
+    ]
+  `);
+  });
+
+  test('fire recovered actions for execution for the alertInstances which is in the recovered state', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
+
+    alertType.executor.mockImplementation(
+      async ({
+        services: executorServices,
+      }: AlertExecutorOptions<
+        AlertTypeParams,
+        AlertTypeState,
+        AlertInstanceState,
+        AlertInstanceContext,
+        string
+      >) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {
+            '1': {
+              meta: {},
+              state: {
+                bar: false,
+                start: '1969-12-31T00:00:00.000Z',
+                duration: 80000000000,
+              },
+            },
+            '2': {
+              meta: {},
+              state: {
+                bar: false,
+                start: '1969-12-31T06:00:00.000Z',
+                duration: 70000000000,
+              },
+            },
+          },
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    alertsClient.get.mockResolvedValue(mockedAlertTypeSavedObject);
+    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    const runnerResult = await taskRunner.run();
+    expect(runnerResult.state.alertInstances).toMatchInlineSnapshot(`
+  Object {
+    "1": Object {
+      "meta": Object {
+        "lastScheduledActions": Object {
+          "date": 1970-01-01T00:00:00.000Z,
+          "group": "default",
+          "subgroup": undefined,
+        },
+      },
+      "state": Object {
+        "bar": false,
+        "duration": 86400000000000,
+        "start": "1969-12-31T00:00:00.000Z",
+      },
+    },
+  }
+    `);
+
+    const logger = taskRunnerFactoryInitializerParams.logger;
+    expect(logger.debug).toHaveBeenCalledTimes(4);
+    expect(logger.debug).nthCalledWith(1, 'executing alert test:1 at 1970-01-01T00:00:00.000Z');
+    expect(logger.debug).nthCalledWith(
+      2,
+      `alert test:1: 'alert-name' has 1 active alert instances: [{\"instanceId\":\"1\",\"actionGroup\":\"default\"}]`
+    );
+    expect(logger.debug).nthCalledWith(
+      3,
+      `alert test:1: 'alert-name' has 1 recovered alert instances: [\"2\"]`
+    );
+    expect(logger.debug).nthCalledWith(
+      4,
+      'alertExecutionStatus for test:1: {"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
+    );
+
+    const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
+    expect(eventLogger.logEvent).toHaveBeenCalledTimes(5);
     expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
       Array [
         Array [
           Object {
             "event": Object {
-              "action": "new-instance",
+              "action": "recovered-instance",
+              "duration": 64800000000000,
+              "end": "1970-01-01T00:00:00.000Z",
+              "start": "1969-12-31T06:00:00.000Z",
             },
             "kibana": Object {
               "alerting": Object {
-                "action_group_id": "default",
-                "instance_id": "1",
+                "instance_id": "2",
               },
               "saved_objects": Array [
                 Object {
@@ -931,16 +1160,19 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
-            "message": "test:1: 'alert-name' created new instance: '1'",
+            "message": "test:1: 'alert-name' instance '2' has recovered",
           },
         ],
         Array [
           Object {
             "event": Object {
               "action": "active-instance",
+              "duration": 86400000000000,
+              "start": "1969-12-31T00:00:00.000Z",
             },
             "kibana": Object {
               "alerting": Object {
@@ -953,12 +1185,43 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
             "message": "test:1: 'alert-name' active instance: '1' in actionGroup: 'default'",
           },
         ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "execute-action",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "recovered",
+                "action_subgroup": undefined,
+                "instance_id": "2",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+                Object {
+                  "id": "2",
+                  "namespace": undefined,
+                  "type": "action",
+                  "type_id": "action",
+                },
+              ],
+            },
+            "message": "alert: test:1: 'alert-name' instanceId: '2' scheduled actionGroup: 'recovered' action: action:2",
+          },
+        ],
         Array [
           Object {
             "event": Object {
@@ -976,11 +1239,13 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
                 Object {
                   "id": "1",
                   "namespace": undefined,
                   "type": "action",
+                  "type_id": "action",
                 },
               ],
             },
@@ -1004,6 +1269,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1012,84 +1278,7 @@ describe('Task Runner', () => {
         ],
       ]
     `);
-  });
-
-  test('fire recovered actions for execution for the alertInstances which is in the recovered state', async () => {
-    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
-    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
-
-    alertType.executor.mockImplementation(
-      async ({
-        services: executorServices,
-      }: AlertExecutorOptions<
-        AlertTypeParams,
-        AlertTypeState,
-        AlertInstanceState,
-        AlertInstanceContext,
-        string
-      >) => {
-        executorServices.alertInstanceFactory('1').scheduleActions('default');
-      }
-    );
-    const taskRunner = new TaskRunner(
-      alertType,
-      {
-        ...mockedTaskInstance,
-        state: {
-          ...mockedTaskInstance.state,
-          alertInstances: {
-            '1': { meta: {}, state: { bar: false } },
-            '2': { meta: {}, state: { bar: false } },
-          },
-        },
-      },
-      taskRunnerFactoryInitializerParams
-    );
-    alertsClient.get.mockResolvedValue(mockedAlertTypeSavedObject);
-    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
-      id: '1',
-      type: 'alert',
-      attributes: {
-        apiKey: Buffer.from('123:abc').toString('base64'),
-      },
-      references: [],
-    });
-    const runnerResult = await taskRunner.run();
-    expect(runnerResult.state.alertInstances).toMatchInlineSnapshot(`
-      Object {
-        "1": Object {
-          "meta": Object {
-            "lastScheduledActions": Object {
-              "date": 1970-01-01T00:00:00.000Z,
-              "group": "default",
-              "subgroup": undefined,
-            },
-          },
-          "state": Object {
-            "bar": false,
-          },
-        },
-      }
-    `);
-
-    const logger = taskRunnerFactoryInitializerParams.logger;
-    expect(logger.debug).toHaveBeenCalledTimes(4);
-    expect(logger.debug).nthCalledWith(1, 'executing alert test:1 at 1970-01-01T00:00:00.000Z');
-    expect(logger.debug).nthCalledWith(
-      2,
-      `alert test:1: 'alert-name' has 1 active alert instances: [{\"instanceId\":\"1\",\"actionGroup\":\"default\"}]`
-    );
-    expect(logger.debug).nthCalledWith(
-      3,
-      `alert test:1: 'alert-name' has 1 recovered alert instances: [\"2\"]`
-    );
-    expect(logger.debug).nthCalledWith(
-      4,
-      'alertExecutionStatus for test:1: {"lastExecutionDate":"1970-01-01T00:00:00.000Z","status":"active"}'
-    );
 
-    const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
-    expect(eventLogger.logEvent).toHaveBeenCalledTimes(5);
     expect(actionsClient.enqueueExecution).toHaveBeenCalledTimes(2);
     expect(actionsClient.enqueueExecution.mock.calls[0]).toMatchInlineSnapshot(`
       Array [
@@ -1113,7 +1302,7 @@ describe('Task Runner', () => {
   });
 
   test('should skip alertInstances which werent active on the previous execution', async () => {
-    const alertId = uuid.v4();
+    const alertId = 'e558aaad-fd81-46d2-96fc-3bd8fc3dc03f';
     taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
     taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
 
@@ -1328,11 +1517,19 @@ describe('Task Runner', () => {
           alertInstances: {
             '1': {
               meta: { lastScheduledActions: { group: 'default', date } },
-              state: { bar: false },
+              state: {
+                bar: false,
+                start: '1969-12-31T00:00:00.000Z',
+                duration: 80000000000,
+              },
             },
             '2': {
               meta: { lastScheduledActions: { group: 'default', date } },
-              state: { bar: false },
+              state: {
+                bar: false,
+                start: '1969-12-31T06:00:00.000Z',
+                duration: 70000000000,
+              },
             },
           },
         },
@@ -1361,6 +1558,8 @@ describe('Task Runner', () => {
           },
           "state": Object {
             "bar": false,
+            "duration": 86400000000000,
+            "start": "1969-12-31T00:00:00.000Z",
           },
         },
       }
@@ -1374,6 +1573,9 @@ describe('Task Runner', () => {
           Object {
             "event": Object {
               "action": "recovered-instance",
+              "duration": 64800000000000,
+              "end": "1970-01-01T00:00:00.000Z",
+              "start": "1969-12-31T06:00:00.000Z",
             },
             "kibana": Object {
               "alerting": Object {
@@ -1386,6 +1588,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1396,6 +1599,8 @@ describe('Task Runner', () => {
           Object {
             "event": Object {
               "action": "active-instance",
+              "duration": 86400000000000,
+              "start": "1969-12-31T00:00:00.000Z",
             },
             "kibana": Object {
               "alerting": Object {
@@ -1408,6 +1613,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1431,6 +1637,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1641,6 +1848,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1700,6 +1908,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1767,6 +1976,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1834,6 +2044,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -1900,6 +2111,7 @@ describe('Task Runner', () => {
                   "namespace": undefined,
                   "rel": "primary",
                   "type": "alert",
+                  "type_id": "test",
                 },
               ],
             },
@@ -2016,4 +2228,705 @@ describe('Task Runner', () => {
       expect(isUnrecoverableError(ex)).toBeTruthy();
     });
   });
+
+  test('start time is logged for new alerts', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
+    alertType.executor.mockImplementation(
+      async ({
+        services: executorServices,
+      }: AlertExecutorOptions<
+        AlertTypeParams,
+        AlertTypeState,
+        AlertInstanceState,
+        AlertInstanceContext,
+        string
+      >) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+        executorServices.alertInstanceFactory('2').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {},
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    alertsClient.get.mockResolvedValue({
+      ...mockedAlertTypeSavedObject,
+      notifyWhen: 'onActionGroupChange',
+      actions: [],
+    });
+    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    await taskRunner.run();
+
+    const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
+    expect(eventLogger.logEvent).toHaveBeenCalledTimes(5);
+    expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "event": Object {
+              "action": "new-instance",
+              "duration": 0,
+              "start": "1970-01-01T00:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "1",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' created new instance: '1'",
+          },
+        ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "new-instance",
+              "duration": 0,
+              "start": "1970-01-01T00:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "2",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' created new instance: '2'",
+          },
+        ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "active-instance",
+              "duration": 0,
+              "start": "1970-01-01T00:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "1",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' active instance: '1' in actionGroup: 'default'",
+          },
+        ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "active-instance",
+              "duration": 0,
+              "start": "1970-01-01T00:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "2",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' active instance: '2' in actionGroup: 'default'",
+          },
+        ],
+        Array [
+          Object {
+            "@timestamp": "1970-01-01T00:00:00.000Z",
+            "event": Object {
+              "action": "execute",
+              "outcome": "success",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "status": "active",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "alert executed: test:1: 'alert-name'",
+          },
+        ],
+      ]
+    `);
+  });
+
+  test('duration is updated for active alerts when alert state contains start time', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
+    alertType.executor.mockImplementation(
+      async ({
+        services: executorServices,
+      }: AlertExecutorOptions<
+        AlertTypeParams,
+        AlertTypeState,
+        AlertInstanceState,
+        AlertInstanceContext,
+        string
+      >) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+        executorServices.alertInstanceFactory('2').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {
+            '1': {
+              meta: {},
+              state: {
+                bar: false,
+                start: '1969-12-31T00:00:00.000Z',
+                duration: 80000000000,
+              },
+            },
+            '2': {
+              meta: {},
+              state: {
+                bar: false,
+                start: '1969-12-31T06:00:00.000Z',
+                duration: 70000000000,
+              },
+            },
+          },
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    alertsClient.get.mockResolvedValue({
+      ...mockedAlertTypeSavedObject,
+      notifyWhen: 'onActionGroupChange',
+      actions: [],
+    });
+    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    await taskRunner.run();
+
+    const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
+    expect(eventLogger.logEvent).toHaveBeenCalledTimes(3);
+    expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "event": Object {
+              "action": "active-instance",
+              "duration": 86400000000000,
+              "start": "1969-12-31T00:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "1",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' active instance: '1' in actionGroup: 'default'",
+          },
+        ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "active-instance",
+              "duration": 64800000000000,
+              "start": "1969-12-31T06:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "2",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' active instance: '2' in actionGroup: 'default'",
+          },
+        ],
+        Array [
+          Object {
+            "@timestamp": "1970-01-01T00:00:00.000Z",
+            "event": Object {
+              "action": "execute",
+              "outcome": "success",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "status": "active",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "alert executed: test:1: 'alert-name'",
+          },
+        ],
+      ]
+    `);
+  });
+
+  test('duration is not calculated for active alerts when alert state does not contain start time', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
+    alertType.executor.mockImplementation(
+      async ({
+        services: executorServices,
+      }: AlertExecutorOptions<
+        AlertTypeParams,
+        AlertTypeState,
+        AlertInstanceState,
+        AlertInstanceContext,
+        string
+      >) => {
+        executorServices.alertInstanceFactory('1').scheduleActions('default');
+        executorServices.alertInstanceFactory('2').scheduleActions('default');
+      }
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {
+            '1': {
+              meta: {},
+              state: { bar: false },
+            },
+            '2': {
+              meta: {},
+              state: { bar: false },
+            },
+          },
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    alertsClient.get.mockResolvedValue({
+      ...mockedAlertTypeSavedObject,
+      notifyWhen: 'onActionGroupChange',
+      actions: [],
+    });
+    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    await taskRunner.run();
+
+    const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
+    expect(eventLogger.logEvent).toHaveBeenCalledTimes(3);
+    expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "event": Object {
+              "action": "active-instance",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "1",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' active instance: '1' in actionGroup: 'default'",
+          },
+        ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "active-instance",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "action_group_id": "default",
+                "instance_id": "2",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' active instance: '2' in actionGroup: 'default'",
+          },
+        ],
+        Array [
+          Object {
+            "@timestamp": "1970-01-01T00:00:00.000Z",
+            "event": Object {
+              "action": "execute",
+              "outcome": "success",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "status": "active",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "alert executed: test:1: 'alert-name'",
+          },
+        ],
+      ]
+    `);
+  });
+
+  test('end is logged for active alerts when alert state contains start time and alert recovers', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
+    alertType.executor.mockImplementation(async () => {});
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {
+            '1': {
+              meta: {},
+              state: {
+                bar: false,
+                start: '1969-12-31T00:00:00.000Z',
+                duration: 80000000000,
+              },
+            },
+            '2': {
+              meta: {},
+              state: {
+                bar: false,
+                start: '1969-12-31T06:00:00.000Z',
+                duration: 70000000000,
+              },
+            },
+          },
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    alertsClient.get.mockResolvedValue({
+      ...mockedAlertTypeSavedObject,
+      notifyWhen: 'onActionGroupChange',
+      actions: [],
+    });
+    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    await taskRunner.run();
+
+    const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
+    expect(eventLogger.logEvent).toHaveBeenCalledTimes(3);
+    expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "event": Object {
+              "action": "recovered-instance",
+              "duration": 86400000000000,
+              "end": "1970-01-01T00:00:00.000Z",
+              "start": "1969-12-31T00:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "instance_id": "1",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' instance '1' has recovered",
+          },
+        ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "recovered-instance",
+              "duration": 64800000000000,
+              "end": "1970-01-01T00:00:00.000Z",
+              "start": "1969-12-31T06:00:00.000Z",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "instance_id": "2",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' instance '2' has recovered",
+          },
+        ],
+        Array [
+          Object {
+            "@timestamp": "1970-01-01T00:00:00.000Z",
+            "event": Object {
+              "action": "execute",
+              "outcome": "success",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "status": "ok",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "alert executed: test:1: 'alert-name'",
+          },
+        ],
+      ]
+    `);
+  });
+
+  test('end calculation is skipped for active alerts when alert state does not contain start time and alert recovers', async () => {
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionTypeEnabled.mockReturnValue(true);
+    taskRunnerFactoryInitializerParams.actionsPlugin.isActionExecutable.mockReturnValue(true);
+    alertType.executor.mockImplementation(
+      async ({
+        services: executorServices,
+      }: AlertExecutorOptions<
+        AlertTypeParams,
+        AlertTypeState,
+        AlertInstanceState,
+        AlertInstanceContext,
+        string
+      >) => {}
+    );
+    const taskRunner = new TaskRunner(
+      alertType,
+      {
+        ...mockedTaskInstance,
+        state: {
+          ...mockedTaskInstance.state,
+          alertInstances: {
+            '1': {
+              meta: {},
+              state: { bar: false },
+            },
+            '2': {
+              meta: {},
+              state: { bar: false },
+            },
+          },
+        },
+      },
+      taskRunnerFactoryInitializerParams
+    );
+    alertsClient.get.mockResolvedValue({
+      ...mockedAlertTypeSavedObject,
+      notifyWhen: 'onActionGroupChange',
+      actions: [],
+    });
+    encryptedSavedObjectsClient.getDecryptedAsInternalUser.mockResolvedValue({
+      id: '1',
+      type: 'alert',
+      attributes: {
+        apiKey: Buffer.from('123:abc').toString('base64'),
+      },
+      references: [],
+    });
+    await taskRunner.run();
+
+    const eventLogger = taskRunnerFactoryInitializerParams.eventLogger;
+    expect(eventLogger.logEvent).toHaveBeenCalledTimes(3);
+    expect(eventLogger.logEvent.mock.calls).toMatchInlineSnapshot(`
+      Array [
+        Array [
+          Object {
+            "event": Object {
+              "action": "recovered-instance",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "instance_id": "1",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' instance '1' has recovered",
+          },
+        ],
+        Array [
+          Object {
+            "event": Object {
+              "action": "recovered-instance",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "instance_id": "2",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "test:1: 'alert-name' instance '2' has recovered",
+          },
+        ],
+        Array [
+          Object {
+            "@timestamp": "1970-01-01T00:00:00.000Z",
+            "event": Object {
+              "action": "execute",
+              "outcome": "success",
+            },
+            "kibana": Object {
+              "alerting": Object {
+                "status": "ok",
+              },
+              "saved_objects": Array [
+                Object {
+                  "id": "1",
+                  "namespace": undefined,
+                  "rel": "primary",
+                  "type": "alert",
+                  "type_id": "test",
+                },
+              ],
+            },
+            "message": "alert executed: test:1: 'alert-name'",
+          },
+        ],
+      ]
+    `);
+  });
 });
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 043f30ddca371..f139617291a84 100644
--- a/x-pack/plugins/alerting/server/task_runner/task_runner.ts
+++ b/x-pack/plugins/alerting/server/task_runner/task_runner.ts
@@ -323,6 +323,12 @@ export class TaskRunner<
       alertLabel,
     });
 
+    trackAlertDurations({
+      originalAlerts: originalAlertInstances,
+      currentAlerts: instancesWithScheduledActions,
+      recoveredAlerts: recoveredAlertInstances,
+    });
+
     generateNewAndRecoveredInstanceEvents({
       eventLogger,
       originalAlertInstances,
@@ -331,6 +337,7 @@ export class TaskRunner<
       alertId,
       alertLabel,
       namespace,
+      ruleTypeId: alert.alertTypeId,
     });
 
     if (!muteAll) {
@@ -493,6 +500,7 @@ export class TaskRunner<
             rel: SAVED_OBJECT_REL_PRIMARY,
             type: 'alert',
             id: alertId,
+            type_id: this.alertType.id,
             namespace,
           },
         ],
@@ -587,6 +595,61 @@ export class TaskRunner<
   }
 }
 
+interface TrackAlertDurationsParams<
+  InstanceState extends AlertInstanceState,
+  InstanceContext extends AlertInstanceContext
+> {
+  originalAlerts: Dictionary<AlertInstance<InstanceState, InstanceContext>>;
+  currentAlerts: Dictionary<AlertInstance<InstanceState, InstanceContext>>;
+  recoveredAlerts: Dictionary<AlertInstance<InstanceState, InstanceContext>>;
+}
+
+function trackAlertDurations<
+  InstanceState extends AlertInstanceState,
+  InstanceContext extends AlertInstanceContext
+>(params: TrackAlertDurationsParams<InstanceState, InstanceContext>) {
+  const currentTime = new Date().toISOString();
+  const { currentAlerts, originalAlerts, recoveredAlerts } = params;
+  const originalAlertIds = Object.keys(originalAlerts);
+  const currentAlertIds = Object.keys(currentAlerts);
+  const recoveredAlertIds = Object.keys(recoveredAlerts);
+  const newAlertIds = without(currentAlertIds, ...originalAlertIds);
+
+  // Inject start time into instance state of new instances
+  for (const id of newAlertIds) {
+    const state = currentAlerts[id].getState();
+    currentAlerts[id].replaceState({ ...state, start: currentTime });
+  }
+
+  // Calculate duration to date for active instances
+  for (const id of currentAlertIds) {
+    const state = originalAlertIds.includes(id)
+      ? originalAlerts[id].getState()
+      : currentAlerts[id].getState();
+    const duration = state.start
+      ? (new Date(currentTime).valueOf() - new Date(state.start as string).valueOf()) * 1000 * 1000 // nanoseconds
+      : undefined;
+    currentAlerts[id].replaceState({
+      ...state,
+      ...(state.start ? { start: state.start } : {}),
+      ...(duration !== undefined ? { duration } : {}),
+    });
+  }
+
+  // Inject end time into instance state of recovered instances
+  for (const id of recoveredAlertIds) {
+    const state = recoveredAlerts[id].getState();
+    const duration = state.start
+      ? (new Date(currentTime).valueOf() - new Date(state.start as string).valueOf()) * 1000 * 1000 // nanoseconds
+      : undefined;
+    recoveredAlerts[id].replaceState({
+      ...state,
+      ...(duration ? { duration } : {}),
+      ...(state.start ? { end: currentTime } : {}),
+    });
+  }
+}
+
 interface GenerateNewAndRecoveredInstanceEventsParams<
   InstanceState extends AlertInstanceState,
   InstanceContext extends AlertInstanceContext
@@ -598,6 +661,7 @@ interface GenerateNewAndRecoveredInstanceEventsParams<
   alertId: string;
   alertLabel: string;
   namespace: string | undefined;
+  ruleTypeId: string;
 }
 
 function generateNewAndRecoveredInstanceEvents<
@@ -611,6 +675,7 @@ function generateNewAndRecoveredInstanceEvents<
     currentAlertInstances,
     originalAlertInstances,
     recoveredAlertInstances,
+    ruleTypeId,
   } = params;
   const originalAlertInstanceIds = Object.keys(originalAlertInstances);
   const currentAlertInstanceIds = Object.keys(currentAlertInstances);
@@ -620,38 +685,66 @@ function generateNewAndRecoveredInstanceEvents<
   for (const id of recoveredAlertInstanceIds) {
     const { group: actionGroup, subgroup: actionSubgroup } =
       recoveredAlertInstances[id].getLastScheduledActions() ?? {};
+    const state = recoveredAlertInstances[id].getState();
     const message = `${params.alertLabel} instance '${id}' has recovered`;
-    logInstanceEvent(id, EVENT_LOG_ACTIONS.recoveredInstance, message, actionGroup, actionSubgroup);
+    logInstanceEvent(
+      id,
+      EVENT_LOG_ACTIONS.recoveredInstance,
+      message,
+      state,
+      actionGroup,
+      actionSubgroup
+    );
   }
 
   for (const id of newIds) {
     const { actionGroup, subgroup: actionSubgroup } =
       currentAlertInstances[id].getScheduledActionOptions() ?? {};
+    const state = currentAlertInstances[id].getState();
     const message = `${params.alertLabel} created new instance: '${id}'`;
-    logInstanceEvent(id, EVENT_LOG_ACTIONS.newInstance, message, actionGroup, actionSubgroup);
+    logInstanceEvent(
+      id,
+      EVENT_LOG_ACTIONS.newInstance,
+      message,
+      state,
+      actionGroup,
+      actionSubgroup
+    );
   }
 
   for (const id of currentAlertInstanceIds) {
     const { actionGroup, subgroup: actionSubgroup } =
       currentAlertInstances[id].getScheduledActionOptions() ?? {};
+    const state = currentAlertInstances[id].getState();
     const message = `${params.alertLabel} active instance: '${id}' in ${
       actionSubgroup
         ? `actionGroup(subgroup): '${actionGroup}(${actionSubgroup})'`
         : `actionGroup: '${actionGroup}'`
     }`;
-    logInstanceEvent(id, EVENT_LOG_ACTIONS.activeInstance, message, actionGroup, actionSubgroup);
+    logInstanceEvent(
+      id,
+      EVENT_LOG_ACTIONS.activeInstance,
+      message,
+      state,
+      actionGroup,
+      actionSubgroup
+    );
   }
 
   function logInstanceEvent(
     instanceId: string,
     action: string,
     message: string,
+    state: InstanceState,
     group?: string,
     subgroup?: string
   ) {
     const event: IEvent = {
       event: {
         action,
+        ...(state?.start ? { start: state.start as string } : {}),
+        ...(state?.end ? { end: state.end as string } : {}),
+        ...(state?.duration !== undefined ? { duration: state.duration as number } : {}),
       },
       kibana: {
         alerting: {
@@ -664,6 +757,7 @@ function generateNewAndRecoveredInstanceEvents<
             rel: SAVED_OBJECT_REL_PRIMARY,
             type: 'alert',
             id: alertId,
+            type_id: ruleTypeId,
             namespace,
           },
         ],
diff --git a/x-pack/plugins/apm/common/agent_name.ts b/x-pack/plugins/apm/common/agent_name.ts
index 247b07b5e71bb..8e40b088dff26 100644
--- a/x-pack/plugins/apm/common/agent_name.ts
+++ b/x-pack/plugins/apm/common/agent_name.ts
@@ -35,6 +35,7 @@ export const AGENT_NAMES: AgentName[] = [
   'java',
   'js-base',
   'nodejs',
+  'php',
   'python',
   'ruby',
   'rum-js',
diff --git a/x-pack/plugins/apm/common/environment_filter_values.ts b/x-pack/plugins/apm/common/environment_filter_values.ts
index c80541ee1ba6b..e4f0b40607679 100644
--- a/x-pack/plugins/apm/common/environment_filter_values.ts
+++ b/x-pack/plugins/apm/common/environment_filter_values.ts
@@ -37,6 +37,18 @@ export function getEnvironmentLabel(environment: string) {
   return environmentLabels[environment] || environment;
 }
 
+export function omitEsFieldValue({
+  esFieldValue,
+  value,
+  text,
+}: {
+  esFieldValue?: string;
+  value: string;
+  text: string;
+}) {
+  return { value, text };
+}
+
 export function parseEnvironmentUrlParam(environment: string) {
   if (environment === ENVIRONMENT_ALL_VALUE) {
     return ENVIRONMENT_ALL;
diff --git a/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature b/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature
index 4c598d8d168a4..2b95216bc3719 100644
--- a/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature
+++ b/x-pack/plugins/apm/e2e/cypress/integration/csm_dashboard.feature
@@ -29,7 +29,6 @@ Feature: CSM Dashboard
     When a user browses the APM UI application for RUM Data
     Then should display percentile for page load chart
       And should display tooltip on hover
-      And should display chart legend
 
   Scenario: Breakdown filter
     Given a user clicks the page load breakdown filter
diff --git a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_dashboard.ts b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_dashboard.ts
index 47154ee214dc4..cbcb48796a6d4 100644
--- a/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_dashboard.ts
+++ b/x-pack/plugins/apm/e2e/cypress/support/step_definitions/csm/csm_dashboard.ts
@@ -51,16 +51,16 @@ Then(`should display percentile for page load chart`, () => {
   cy.get(pMarkers).eq(3).should('have.text', '95th');
 });
 
-Then(`should display chart legend`, () => {
-  const chartLegend = 'button.echLegendItem__label';
+// Then(`should display chart legend`, () => {
+//   const chartLegend = 'button.echLegendItem__label';
 
-  waitForLoadingToFinish();
-  cy.get('.euiLoadingChart').should('not.exist');
+//   waitForLoadingToFinish();
+//   cy.get('.euiLoadingChart').should('not.exist');
 
-  cy.get('[data-cy=pageLoadDist]').within(() => {
-    cy.get(chartLegend, DEFAULT_TIMEOUT).eq(0).should('have.text', 'Overall');
-  });
-});
+//   cy.get('[data-cy=pageLoadDist]').within(() => {
+//     cy.get(chartLegend, DEFAULT_TIMEOUT).eq(0).should('have.text', 'Overall');
+//   });
+// });
 
 Then(`should display tooltip on hover`, () => {
   cy.get('.euiLoadingChart').should('not.exist');
diff --git a/x-pack/plugins/apm/ftr_e2e/config.ts b/x-pack/plugins/apm/ftr_e2e/config.ts
index cace655ad7c5b..38c196fbe70c2 100644
--- a/x-pack/plugins/apm/ftr_e2e/config.ts
+++ b/x-pack/plugins/apm/ftr_e2e/config.ts
@@ -21,10 +21,6 @@ async function config({ readConfigFile }: FtrConfigProviderContext) {
   return {
     ...kibanaCommonTestsConfig.getAll(),
 
-    esArchiver: {
-      directory: resolve(__dirname, 'cypress/fixtures/es_archiver'),
-    },
-
     esTestCluster: {
       ...xpackFunctionalTestsConfig.get('esTestCluster'),
       serverArgs: [
diff --git a/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts b/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts
index 6388af94df16a..25090e14ebf91 100644
--- a/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts
+++ b/x-pack/plugins/apm/ftr_e2e/cypress/tasks/es_archiver.ts
@@ -5,15 +5,21 @@
  * 2.0.
  */
 
+import Path from 'path';
+
+const ES_ARCHIVE_DIR = './cypress/fixtures/es_archiver';
+
 export const esArchiverLoad = (folder: string) => {
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
-    `node ../../../../scripts/es_archiver load ${folder} --dir ./cypress/fixtures/es_archiver --config ../../../test/functional/config.js`
+    `node ../../../../scripts/es_archiver load "${path}" --config ../../../test/functional/config.js`
   );
 };
 
 export const esArchiverUnload = (folder: string) => {
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
-    `node ../../../../scripts/es_archiver unload ${folder} --dir ./cypress/fixtures/es_archiver --config ../../../test/functional/config.js`
+    `node ../../../../scripts/es_archiver unload "${path}" --config ../../../test/functional/config.js`
   );
 };
 
diff --git a/x-pack/plugins/apm/kibana.json b/x-pack/plugins/apm/kibana.json
index 23ae90a204594..a5fbcb67b6831 100644
--- a/x-pack/plugins/apm/kibana.json
+++ b/x-pack/plugins/apm/kibana.json
@@ -24,7 +24,8 @@
     "security",
     "ml",
     "home",
-    "maps"
+    "maps",
+    "fleet"
   ],
   "server": true,
   "ui": true,
diff --git a/x-pack/plugins/apm/public/application/action_menu/index.tsx b/x-pack/plugins/apm/public/application/action_menu/index.tsx
deleted file mode 100644
index 2d9b619a3176d..0000000000000
--- a/x-pack/plugins/apm/public/application/action_menu/index.tsx
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React from 'react';
-import { useParams } from 'react-router-dom';
-import { getAlertingCapabilities } from '../../components/alerting/get_alerting_capabilities';
-import { getAPMHref } from '../../components/shared/Links/apm/APMLink';
-import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
-import { AlertingPopoverAndFlyout } from './alerting_popover_flyout';
-import { AnomalyDetectionSetupLink } from './anomaly_detection_setup_link';
-
-export function ActionMenu() {
-  const { core, plugins } = useApmPluginContext();
-  const { serviceName } = useParams<{ serviceName?: string }>();
-  const { search } = window.location;
-  const { application, http } = core;
-  const { basePath } = http;
-  const { capabilities } = application;
-  const canAccessML = !!capabilities.ml?.canAccessML;
-  const {
-    isAlertingAvailable,
-    canReadAlerts,
-    canSaveAlerts,
-    canReadAnomalies,
-  } = getAlertingCapabilities(plugins, capabilities);
-  const canSaveApmAlerts = capabilities.apm.save && canSaveAlerts;
-
-  function apmHref(path: string) {
-    return getAPMHref({ basePath, path, search });
-  }
-
-  function kibanaHref(path: string) {
-    return basePath.prepend(path);
-  }
-
-  return (
-    <EuiHeaderLinks>
-      <EuiHeaderLink
-        color="primary"
-        href={apmHref('/settings')}
-        iconType="gear"
-      >
-        {i18n.translate('xpack.apm.settingsLinkLabel', {
-          defaultMessage: 'Settings',
-        })}
-      </EuiHeaderLink>
-      {isAlertingAvailable && (
-        <AlertingPopoverAndFlyout
-          basePath={basePath}
-          canReadAlerts={canReadAlerts}
-          canSaveAlerts={canSaveApmAlerts}
-          canReadAnomalies={canReadAnomalies}
-          includeTransactionDuration={serviceName !== undefined}
-        />
-      )}
-      {canAccessML && <AnomalyDetectionSetupLink />}
-      <EuiHeaderLink
-        color="primary"
-        href={kibanaHref('/app/home#/tutorial/apm')}
-        iconType="indexOpen"
-      >
-        {i18n.translate('xpack.apm.addDataButtonLabel', {
-          defaultMessage: 'Add data',
-        })}
-      </EuiHeaderLink>
-    </EuiHeaderLinks>
-  );
-}
diff --git a/x-pack/plugins/apm/public/application/application.test.tsx b/x-pack/plugins/apm/public/application/application.test.tsx
index 4ec654a6c0bfd..78cdb2fb3c979 100644
--- a/x-pack/plugins/apm/public/application/application.test.tsx
+++ b/x-pack/plugins/apm/public/application/application.test.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import React from 'react';
 import { act } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import { Observable } from 'rxjs';
@@ -15,6 +16,7 @@ import { renderApp } from './';
 import { disableConsoleWarning } from '../utils/testHelpers';
 import { dataPluginMock } from 'src/plugins/data/public/mocks';
 import { embeddablePluginMock } from 'src/plugins/embeddable/public/mocks';
+import { ApmPluginStartDeps } from '../plugin';
 
 jest.mock('../services/rest/index_pattern', () => ({
   createStaticIndexPattern: () => Promise.resolve(undefined),
@@ -44,10 +46,10 @@ describe('renderApp', () => {
       config,
       observabilityRuleTypeRegistry,
     } = mockApmPluginContextValue;
+
     const plugins = {
       licensing: { license$: new Observable() },
       triggersActionsUi: { actionTypeRegistry: {}, alertTypeRegistry: {} },
-      usageCollection: { reportUiCounter: () => {} },
       data: {
         query: {
           timefilter: {
@@ -56,7 +58,7 @@ describe('renderApp', () => {
         },
       },
     };
-    const params = {
+    const appMountParameters = {
       element: document.createElement('div'),
       history: createMemoryHistory(),
       setHeaderActionMenu: () => {},
@@ -64,16 +66,27 @@ describe('renderApp', () => {
 
     const data = dataPluginMock.createStartContract();
     const embeddable = embeddablePluginMock.createStartContract();
-    const startDeps = {
+
+    const pluginsStart = ({
+      data,
+      embeddable,
+      observability: {
+        navigation: {
+          registerSections: () => jest.fn(),
+          PageTemplate: ({ children }: { children: React.ReactNode }) => (
+            <div>hello worlds {children}</div>
+          ),
+        },
+      },
       triggersActionsUi: {
         actionTypeRegistry: {},
         alertTypeRegistry: {},
         getAddAlertFlyout: jest.fn(),
         getEditAlertFlyout: jest.fn(),
       },
-      data,
-      embeddable,
-    };
+      usageCollection: { reportUiCounter: () => {} },
+    } as unknown) as ApmPluginStartDeps;
+
     jest.spyOn(window, 'scrollTo').mockReturnValueOnce(undefined);
     createCallApmApi((core as unknown) as CoreStart);
 
@@ -93,8 +106,8 @@ describe('renderApp', () => {
       unmount = renderApp({
         coreStart: core as any,
         pluginsSetup: plugins as any,
-        appMountParameters: params as any,
-        pluginsStart: startDeps as any,
+        appMountParameters: appMountParameters as any,
+        pluginsStart,
         config,
         observabilityRuleTypeRegistry,
       });
diff --git a/x-pack/plugins/apm/public/application/csmApp.tsx b/x-pack/plugins/apm/public/application/csmApp.tsx
deleted file mode 100644
index 11a2777f47f6a..0000000000000
--- a/x-pack/plugins/apm/public/application/csmApp.tsx
+++ /dev/null
@@ -1,158 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
-import { AppMountParameters, CoreStart } from 'kibana/public';
-import React from 'react';
-import ReactDOM from 'react-dom';
-import { Route, Router } from 'react-router-dom';
-import { DefaultTheme, ThemeProvider } from 'styled-components';
-import type { ObservabilityRuleTypeRegistry } from '../../../observability/public';
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
-import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-  useUiSetting$,
-} from '../../../../../src/plugins/kibana_react/public';
-import { APMRouteDefinition } from '../application/routes';
-import { renderAsRedirectTo } from '../components/app/Main/route_config';
-import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
-import { RumHome, UX_LABEL } from '../components/app/RumDashboard/RumHome';
-import { ApmPluginContext } from '../context/apm_plugin/apm_plugin_context';
-import { UrlParamsProvider } from '../context/url_params_context/url_params_context';
-import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
-import { ConfigSchema } from '../index';
-import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
-import { createCallApmApi } from '../services/rest/createCallApmApi';
-import { px, units } from '../style/variables';
-import { createStaticIndexPattern } from '../services/rest/index_pattern';
-import { UXActionMenu } from '../components/app/RumDashboard/ActionMenu';
-
-const CsmMainContainer = euiStyled.div`
-  padding: ${px(units.plus)};
-  height: 100%;
-`;
-
-export const rumRoutes: APMRouteDefinition[] = [
-  {
-    exact: true,
-    path: '/',
-    render: renderAsRedirectTo('/ux'),
-    breadcrumb: UX_LABEL,
-  },
-];
-
-function CsmApp() {
-  const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
-
-  useBreadcrumbs(rumRoutes);
-
-  return (
-    <ThemeProvider
-      theme={(outerTheme?: DefaultTheme) => ({
-        ...outerTheme,
-        eui: darkMode ? euiDarkVars : euiLightVars,
-        darkMode,
-      })}
-    >
-      <CsmMainContainer data-test-subj="csmMainContainer" role="main">
-        <Route component={ScrollToTopOnPathChange} />
-        <RumHome />
-      </CsmMainContainer>
-    </ThemeProvider>
-  );
-}
-
-export function CsmAppRoot({
-  appMountParameters,
-  core,
-  deps,
-  config,
-  corePlugins: { embeddable, maps },
-  observabilityRuleTypeRegistry,
-}: {
-  appMountParameters: AppMountParameters;
-  core: CoreStart;
-  deps: ApmPluginSetupDeps;
-  config: ConfigSchema;
-  corePlugins: ApmPluginStartDeps;
-  observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
-}) {
-  const { history } = appMountParameters;
-  const i18nCore = core.i18n;
-  const plugins = { ...deps, maps };
-  const apmPluginContextValue = {
-    appMountParameters,
-    config,
-    core,
-    plugins,
-    observabilityRuleTypeRegistry,
-  };
-
-  return (
-    <RedirectAppLinks application={core.application}>
-      <ApmPluginContext.Provider value={apmPluginContextValue}>
-        <KibanaContextProvider services={{ ...core, ...plugins, embeddable }}>
-          <i18nCore.Context>
-            <Router history={history}>
-              <UrlParamsProvider>
-                <CsmApp />
-                <UXActionMenu appMountParameters={appMountParameters} />
-              </UrlParamsProvider>
-            </Router>
-          </i18nCore.Context>
-        </KibanaContextProvider>
-      </ApmPluginContext.Provider>
-    </RedirectAppLinks>
-  );
-}
-
-/**
- * This module is rendered asynchronously in the Kibana platform.
- */
-
-export const renderApp = ({
-  core,
-  deps,
-  appMountParameters,
-  config,
-  corePlugins,
-  observabilityRuleTypeRegistry,
-}: {
-  core: CoreStart;
-  deps: ApmPluginSetupDeps;
-  appMountParameters: AppMountParameters;
-  config: ConfigSchema;
-  corePlugins: ApmPluginStartDeps;
-  observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
-}) => {
-  const { element } = appMountParameters;
-
-  createCallApmApi(core);
-
-  // Automatically creates static index pattern and stores as saved object
-  createStaticIndexPattern().catch((e) => {
-    // eslint-disable-next-line no-console
-    console.log('Error creating static index pattern', e);
-  });
-
-  ReactDOM.render(
-    <CsmAppRoot
-      appMountParameters={appMountParameters}
-      core={core}
-      deps={deps}
-      config={config}
-      corePlugins={corePlugins}
-      observabilityRuleTypeRegistry={observabilityRuleTypeRegistry}
-    />,
-    element
-  );
-  return () => {
-    ReactDOM.unmountComponentAtNode(element);
-  };
-};
diff --git a/x-pack/plugins/apm/public/application/index.tsx b/x-pack/plugins/apm/public/application/index.tsx
index e2a0bdb6b48b1..6924a8b9161b2 100644
--- a/x-pack/plugins/apm/public/application/index.tsx
+++ b/x-pack/plugins/apm/public/application/index.tsx
@@ -5,99 +5,22 @@
  * 2.0.
  */
 
-import { ApmRoute } from '@elastic/apm-rum-react';
-import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
-import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
 import React from 'react';
 import ReactDOM from 'react-dom';
-import { Route, Router, Switch } from 'react-router-dom';
 import 'react-vis/dist/style.css';
-import { DefaultTheme, ThemeProvider } from 'styled-components';
 import type { ObservabilityRuleTypeRegistry } from '../../../observability/public';
-import { euiStyled } from '../../../../../src/plugins/kibana_react/common';
 import { ConfigSchema } from '../';
-import { AppMountParameters, CoreStart } from '../../../../../src/core/public';
 import {
-  KibanaContextProvider,
-  RedirectAppLinks,
-  useUiSetting$,
-} from '../../../../../src/plugins/kibana_react/public';
-import { routes } from '../components/app/Main/route_config';
-import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
-import {
-  ApmPluginContext,
-  ApmPluginContextValue,
-} from '../context/apm_plugin/apm_plugin_context';
-import { LicenseProvider } from '../context/license/license_context';
-import { UrlParamsProvider } from '../context/url_params_context/url_params_context';
-import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
+  AppMountParameters,
+  CoreStart,
+  APP_WRAPPER_CLASS,
+} from '../../../../../src/core/public';
 import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
 import { createCallApmApi } from '../services/rest/createCallApmApi';
 import { createStaticIndexPattern } from '../services/rest/index_pattern';
 import { setHelpExtension } from '../setHelpExtension';
 import { setReadonlyBadge } from '../updateBadge';
-import { AnomalyDetectionJobsContextProvider } from '../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
-
-const MainContainer = euiStyled.div`
-  height: 100%;
-`;
-
-function App() {
-  const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
-
-  useBreadcrumbs(routes);
-
-  return (
-    <ThemeProvider
-      theme={(outerTheme?: DefaultTheme) => ({
-        ...outerTheme,
-        eui: darkMode ? euiDarkVars : euiLightVars,
-        darkMode,
-      })}
-    >
-      <MainContainer data-test-subj="apmMainContainer" role="main">
-        <Route component={ScrollToTopOnPathChange} />
-        <Switch>
-          {routes.map((route, i) => (
-            <ApmRoute key={i} {...route} />
-          ))}
-        </Switch>
-      </MainContainer>
-    </ThemeProvider>
-  );
-}
-
-export function ApmAppRoot({
-  apmPluginContextValue,
-  startDeps,
-}: {
-  apmPluginContextValue: ApmPluginContextValue;
-  startDeps: ApmPluginStartDeps;
-}) {
-  const { appMountParameters, core } = apmPluginContextValue;
-  const { history } = appMountParameters;
-  const i18nCore = core.i18n;
-
-  return (
-    <RedirectAppLinks application={core.application}>
-      <ApmPluginContext.Provider value={apmPluginContextValue}>
-        <KibanaContextProvider services={{ ...core, ...startDeps }}>
-          <i18nCore.Context>
-            <Router history={history}>
-              <UrlParamsProvider>
-                <LicenseProvider>
-                  <AnomalyDetectionJobsContextProvider>
-                    <App />
-                  </AnomalyDetectionJobsContextProvider>
-                </LicenseProvider>
-              </UrlParamsProvider>
-            </Router>
-          </i18nCore.Context>
-        </KibanaContextProvider>
-      </ApmPluginContext.Provider>
-    </RedirectAppLinks>
-  );
-}
+import { ApmAppRoot } from '../components/routing/app_root';
 
 /**
  * This module is rendered asynchronously in the Kibana platform.
@@ -124,6 +47,7 @@ export const renderApp = ({
     config,
     core: coreStart,
     plugins: pluginsSetup,
+    observability: pluginsStart.observability,
     observabilityRuleTypeRegistry,
   };
 
@@ -138,10 +62,13 @@ export const renderApp = ({
     console.log('Error creating static index pattern', e);
   });
 
+  // add .kbnAppWrappers class to root element
+  element.classList.add(APP_WRAPPER_CLASS);
+
   ReactDOM.render(
     <ApmAppRoot
       apmPluginContextValue={apmPluginContextValue}
-      startDeps={pluginsStart}
+      pluginsStart={pluginsStart}
     />,
     element
   );
diff --git a/x-pack/plugins/apm/public/application/uxApp.tsx b/x-pack/plugins/apm/public/application/uxApp.tsx
new file mode 100644
index 0000000000000..947ff404a1437
--- /dev/null
+++ b/x-pack/plugins/apm/public/application/uxApp.tsx
@@ -0,0 +1,164 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import { AppMountParameters, CoreStart } from 'kibana/public';
+import React from 'react';
+import ReactDOM from 'react-dom';
+import { Route, Router } from 'react-router-dom';
+import { DefaultTheme, ThemeProvider } from 'styled-components';
+import { i18n } from '@kbn/i18n';
+import type { ObservabilityRuleTypeRegistry } from '../../../observability/public';
+import {
+  KibanaContextProvider,
+  RedirectAppLinks,
+  useUiSetting$,
+} from '../../../../../src/plugins/kibana_react/public';
+import { APMRouteDefinition } from '../application/routes';
+import { ScrollToTopOnPathChange } from '../components/app/Main/ScrollToTopOnPathChange';
+import { RumHome, UX_LABEL } from '../components/app/RumDashboard/RumHome';
+import { ApmPluginContext } from '../context/apm_plugin/apm_plugin_context';
+import { UrlParamsProvider } from '../context/url_params_context/url_params_context';
+import { ConfigSchema } from '../index';
+import { ApmPluginSetupDeps, ApmPluginStartDeps } from '../plugin';
+import { createCallApmApi } from '../services/rest/createCallApmApi';
+import { createStaticIndexPattern } from '../services/rest/index_pattern';
+import { UXActionMenu } from '../components/app/RumDashboard/ActionMenu';
+import { redirectTo } from '../components/routing/redirect_to';
+import { useBreadcrumbs } from '../../../observability/public';
+import { useApmPluginContext } from '../context/apm_plugin/use_apm_plugin_context';
+
+export const uxRoutes: APMRouteDefinition[] = [
+  {
+    exact: true,
+    path: '/',
+    render: redirectTo('/ux'),
+    breadcrumb: UX_LABEL,
+  },
+];
+
+function UxApp() {
+  const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
+
+  const { core } = useApmPluginContext();
+  const basePath = core.http.basePath.get();
+
+  useBreadcrumbs([
+    { text: UX_LABEL, href: basePath + '/app/ux' },
+    {
+      text: i18n.translate('xpack.apm.ux.overview', {
+        defaultMessage: 'Overview',
+      }),
+    },
+  ]);
+
+  return (
+    <ThemeProvider
+      theme={(outerTheme?: DefaultTheme) => ({
+        ...outerTheme,
+        eui: darkMode ? euiDarkVars : euiLightVars,
+        darkMode,
+      })}
+    >
+      <div data-test-subj="csmMainContainer" role="main">
+        <Route component={ScrollToTopOnPathChange} />
+        <RumHome />
+      </div>
+    </ThemeProvider>
+  );
+}
+
+export function UXAppRoot({
+  appMountParameters,
+  core,
+  deps,
+  config,
+  corePlugins: { embeddable, maps, observability },
+  observabilityRuleTypeRegistry,
+}: {
+  appMountParameters: AppMountParameters;
+  core: CoreStart;
+  deps: ApmPluginSetupDeps;
+  config: ConfigSchema;
+  corePlugins: ApmPluginStartDeps;
+  observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
+}) {
+  const { history } = appMountParameters;
+  const i18nCore = core.i18n;
+  const plugins = { ...deps, maps };
+  const apmPluginContextValue = {
+    appMountParameters,
+    config,
+    core,
+    plugins,
+    observability,
+    observabilityRuleTypeRegistry,
+  };
+
+  return (
+    <RedirectAppLinks application={core.application}>
+      <ApmPluginContext.Provider value={apmPluginContextValue}>
+        <KibanaContextProvider services={{ ...core, ...plugins, embeddable }}>
+          <i18nCore.Context>
+            <Router history={history}>
+              <UrlParamsProvider>
+                <UxApp />
+                <UXActionMenu appMountParameters={appMountParameters} />
+              </UrlParamsProvider>
+            </Router>
+          </i18nCore.Context>
+        </KibanaContextProvider>
+      </ApmPluginContext.Provider>
+    </RedirectAppLinks>
+  );
+}
+
+/**
+ * This module is rendered asynchronously in the Kibana platform.
+ */
+
+export const renderApp = ({
+  core,
+  deps,
+  appMountParameters,
+  config,
+  corePlugins,
+  observabilityRuleTypeRegistry,
+}: {
+  core: CoreStart;
+  deps: ApmPluginSetupDeps;
+  appMountParameters: AppMountParameters;
+  config: ConfigSchema;
+  corePlugins: ApmPluginStartDeps;
+  observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
+}) => {
+  const { element } = appMountParameters;
+
+  createCallApmApi(core);
+
+  // Automatically creates static index pattern and stores as saved object
+  createStaticIndexPattern().catch((e) => {
+    // eslint-disable-next-line no-console
+    console.log('Error creating static index pattern', e);
+  });
+
+  ReactDOM.render(
+    <UXAppRoot
+      appMountParameters={appMountParameters}
+      core={core}
+      deps={deps}
+      config={config}
+      corePlugins={corePlugins}
+      observabilityRuleTypeRegistry={observabilityRuleTypeRegistry}
+    />,
+    element
+  );
+  return () => {
+    ReactDOM.unmountComponentAtNode(element);
+  };
+};
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 50788c28999b5..35863d8099394 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
@@ -10,24 +10,17 @@ import { useParams } from 'react-router-dom';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { AlertType } from '../../../../common/alert_types';
 import { getInitialAlertValues } from '../get_initial_alert_values';
-import { TriggersAndActionsUIPublicPluginStart } from '../../../../../triggers_actions_ui/public';
+import { ApmPluginStartDeps } from '../../../plugin';
 interface Props {
   addFlyoutVisible: boolean;
   setAddFlyoutVisibility: React.Dispatch<React.SetStateAction<boolean>>;
   alertType: AlertType | null;
 }
 
-interface KibanaDeps {
-  triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
-}
-
 export function AlertingFlyout(props: Props) {
   const { addFlyoutVisible, setAddFlyoutVisibility, alertType } = props;
   const { serviceName } = useParams<{ serviceName?: string }>();
-  const {
-    services: { triggersActionsUi },
-  } = useKibana<KibanaDeps>();
-
+  const { services } = useKibana<ApmPluginStartDeps>();
   const initialValues = getInitialAlertValues(alertType, serviceName);
 
   const onCloseAddFlyout = useCallback(() => setAddFlyoutVisibility(false), [
@@ -37,7 +30,7 @@ export function AlertingFlyout(props: Props) {
   const addAlertFlyout = useMemo(
     () =>
       alertType &&
-      triggersActionsUi.getAddAlertFlyout({
+      services.triggersActionsUi.getAddAlertFlyout({
         consumer: 'apm',
         onClose: onCloseAddFlyout,
         alertTypeId: alertType,
@@ -45,7 +38,7 @@ export function AlertingFlyout(props: Props) {
         initialValues,
       }),
     /* eslint-disable-next-line react-hooks/exhaustive-deps */
-    [alertType, onCloseAddFlyout, triggersActionsUi]
+    [alertType, onCloseAddFlyout, services.triggersActionsUi]
   );
   return <>{addFlyoutVisible && addAlertFlyout}</>;
 }
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx
index 5671f0bfcf085..9cb5a57b090f3 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.test.tsx
@@ -6,7 +6,6 @@
  */
 
 import { shallow } from 'enzyme';
-import { Location } from 'history';
 import React from 'react';
 import { mockMoment } from '../../../../utils/testHelpers';
 import { DetailView } from './index';
@@ -19,11 +18,7 @@ describe('DetailView', () => {
 
   it('should render empty state', () => {
     const wrapper = shallow(
-      <DetailView
-        errorGroup={{} as any}
-        urlParams={{}}
-        location={{} as Location}
-      />
+      <DetailView errorGroup={{} as any} urlParams={{}} />
     );
     expect(wrapper.isEmptyRender()).toBe(true);
   });
@@ -46,11 +41,7 @@ describe('DetailView', () => {
     };
 
     const wrapper = shallow(
-      <DetailView
-        errorGroup={errorGroup}
-        urlParams={{}}
-        location={{} as Location}
-      />
+      <DetailView errorGroup={errorGroup} urlParams={{}} />
     ).find('DiscoverErrorLink');
 
     expect(wrapper.exists()).toBe(true);
@@ -69,11 +60,7 @@ describe('DetailView', () => {
       transaction: undefined,
     };
     const wrapper = shallow(
-      <DetailView
-        errorGroup={errorGroup}
-        urlParams={{}}
-        location={{} as Location}
-      />
+      <DetailView errorGroup={errorGroup} urlParams={{}} />
     ).find('Summary');
 
     expect(wrapper.exists()).toBe(true);
@@ -93,11 +80,7 @@ describe('DetailView', () => {
       } as any,
     };
     const wrapper = shallow(
-      <DetailView
-        errorGroup={errorGroup}
-        urlParams={{}}
-        location={{} as Location}
-      />
+      <DetailView errorGroup={errorGroup} urlParams={{}} />
     ).find('EuiTabs');
 
     expect(wrapper.exists()).toBe(true);
@@ -117,11 +100,7 @@ describe('DetailView', () => {
       } as any,
     };
     const wrapper = shallow(
-      <DetailView
-        errorGroup={errorGroup}
-        urlParams={{}}
-        location={{} as Location}
-      />
+      <DetailView errorGroup={errorGroup} urlParams={{}} />
     ).find('TabContent');
 
     expect(wrapper.exists()).toBe(true);
@@ -145,13 +124,7 @@ describe('DetailView', () => {
       } as any,
     };
     expect(() =>
-      shallow(
-        <DetailView
-          errorGroup={errorGroup}
-          urlParams={{}}
-          location={{} as Location}
-        />
-      )
+      shallow(<DetailView errorGroup={errorGroup} urlParams={{}} />)
     ).not.toThrowError();
   });
 });
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
index cd893c1736988..da55f274bd77c 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/DetailView/index.tsx
@@ -16,7 +16,6 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Location } from 'history';
 import { first } from 'lodash';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
@@ -58,7 +57,6 @@ const TransactionLinkName = euiStyled.div`
 interface Props {
   errorGroup: APIReturnType<'GET /api/apm/services/{serviceName}/errors/{groupId}'>;
   urlParams: IUrlParams;
-  location: Location;
 }
 
 // TODO: Move query-string-based tabs into a re-usable component?
@@ -70,7 +68,7 @@ function getCurrentTab(
   return selectedTab ? selectedTab : first(tabs) || {};
 }
 
-export function DetailView({ errorGroup, urlParams, location }: Props) {
+export function DetailView({ errorGroup, urlParams }: Props) {
   const history = useHistory();
   const { transaction, error, occurrencesCount } = errorGroup;
 
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
index 16ac1a35666d2..a38e3b2a3d7c6 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/Distribution/index.tsx
@@ -26,6 +26,7 @@ import { asRelativeDateTimeRange } from '../../../../../common/utils/formatters'
 import { useTheme } from '../../../../hooks/use_theme';
 import { AlertType } from '../../../../../common/alert_types';
 import { getAlertAnnotations } from '../../../shared/charts/helper/get_alert_annotations';
+import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
 
 type ErrorDistributionAPIResponse = APIReturnType<'GET /api/apm/services/{serviceName}/errors/distribution'>;
 
@@ -64,8 +65,9 @@ export function ErrorDistribution({ distribution, title }: Props) {
   const xMax = d3.max(buckets, (d) => d.x0);
 
   const xFormatter = niceTimeFormatter([xMin, xMax]);
-
+  const { observabilityRuleTypeRegistry } = useApmPluginContext();
   const { alerts } = useApmServiceContext();
+  const { getFormatter } = observabilityRuleTypeRegistry;
 
   const tooltipProps: SettingsSpec['tooltip'] = {
     headerFormatter: (tooltip: TooltipValue) => {
@@ -118,6 +120,8 @@ export function ErrorDistribution({ distribution, title }: Props) {
             alerts: alerts?.filter(
               (alert) => alert[RULE_ID]?.[0] === AlertType.ErrorCount
             ),
+            chartStartTime: buckets[0].x0,
+            getFormatter,
             theme,
           })}
         </Chart>
diff --git a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
index 5fcd2914f2225..0f2180721afe3 100644
--- a/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/ErrorGroupDetails/index.tsx
@@ -9,24 +9,19 @@ import {
   EuiBadge,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPage,
-  EuiPageBody,
   EuiPanel,
   EuiSpacer,
   EuiText,
   EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import React, { Fragment } from 'react';
-import { RouteComponentProps } from 'react-router-dom';
+import React from 'react';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { useTrackPageview } from '../../../../../observability/public';
 import { NOT_AVAILABLE_LABEL } from '../../../../common/i18n';
 import { useFetcher } from '../../../hooks/use_fetcher';
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
 import { fontFamilyCode, fontSizes, px, units } from '../../../style/variables';
-import { ApmHeader } from '../../shared/ApmHeader';
-import { SearchBar } from '../../shared/search_bar';
 import { DetailView } from './DetailView';
 import { ErrorDistribution } from './Distribution';
 import { useErrorGroupDistributionFetcher } from '../../../hooks/use_error_group_distribution_fetcher';
@@ -68,44 +63,42 @@ function ErrorGroupHeader({
   isUnhandled?: boolean;
 }) {
   return (
-    <>
-      <ApmHeader>
-        <EuiFlexGroup alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiTitle>
-              <h1>
-                {i18n.translate('xpack.apm.errorGroupDetails.errorGroupTitle', {
-                  defaultMessage: 'Error group {errorGroupId}',
-                  values: {
-                    errorGroupId: getShortGroupId(groupId),
-                  },
-                })}
-              </h1>
-            </EuiTitle>
-          </EuiFlexItem>
-          {isUnhandled && (
-            <EuiFlexItem grow={false}>
-              <EuiBadge color="warning">
-                {i18n.translate('xpack.apm.errorGroupDetails.unhandledLabel', {
-                  defaultMessage: 'Unhandled',
-                })}
-              </EuiBadge>
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
-      </ApmHeader>
-      <SearchBar />
-    </>
+    <EuiFlexGroup alignItems="center">
+      <EuiFlexItem grow={false}>
+        <EuiTitle>
+          <h2>
+            {i18n.translate('xpack.apm.errorGroupDetails.errorGroupTitle', {
+              defaultMessage: 'Error group {errorGroupId}',
+              values: {
+                errorGroupId: getShortGroupId(groupId),
+              },
+            })}
+          </h2>
+        </EuiTitle>
+      </EuiFlexItem>
+
+      {isUnhandled && (
+        <EuiFlexItem grow={false}>
+          <EuiBadge color="warning">
+            {i18n.translate('xpack.apm.errorGroupDetails.unhandledLabel', {
+              defaultMessage: 'Unhandled',
+            })}
+          </EuiBadge>
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
   );
 }
 
-type ErrorGroupDetailsProps = RouteComponentProps<{
+interface ErrorGroupDetailsProps {
   groupId: string;
   serviceName: string;
-}>;
+}
 
-export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
-  const { serviceName, groupId } = match.params;
+export function ErrorGroupDetails({
+  serviceName,
+  groupId,
+}: ErrorGroupDetailsProps) {
   const { urlParams } = useUrlParams();
   const { environment, kuery, start, end } = urlParams;
   const { data: errorGroupData } = useFetcher(
@@ -154,66 +147,56 @@ export function ErrorGroupDetails({ location, match }: ErrorGroupDetailsProps) {
   return (
     <>
       <ErrorGroupHeader groupId={groupId} isUnhandled={isUnhandled} />
-      <EuiPage>
-        <EuiPageBody>
-          <EuiPanel>
-            {showDetails && (
-              <Titles>
-                <EuiText>
-                  {logMessage && (
-                    <Fragment>
-                      <Label>
-                        {i18n.translate(
-                          'xpack.apm.errorGroupDetails.logMessageLabel',
-                          {
-                            defaultMessage: 'Log message',
-                          }
-                        )}
-                      </Label>
-                      <Message>{logMessage}</Message>
-                    </Fragment>
-                  )}
-                  <Label>
-                    {i18n.translate(
-                      'xpack.apm.errorGroupDetails.exceptionMessageLabel',
-                      {
-                        defaultMessage: 'Exception message',
-                      }
-                    )}
-                  </Label>
-                  <Message>{excMessage || NOT_AVAILABLE_LABEL}</Message>
+
+      <EuiPanel>
+        {showDetails && (
+          <Titles>
+            <EuiText>
+              {logMessage && (
+                <>
                   <Label>
                     {i18n.translate(
-                      'xpack.apm.errorGroupDetails.culpritLabel',
+                      'xpack.apm.errorGroupDetails.logMessageLabel',
                       {
-                        defaultMessage: 'Culprit',
+                        defaultMessage: 'Log message',
                       }
                     )}
                   </Label>
-                  <Culprit>{culprit || NOT_AVAILABLE_LABEL}</Culprit>
-                </EuiText>
-              </Titles>
-            )}
-            <ErrorDistribution
-              distribution={errorDistributionData}
-              title={i18n.translate(
-                'xpack.apm.errorGroupDetails.occurrencesChartLabel',
-                {
-                  defaultMessage: 'Occurrences',
-                }
+                  <Message>{logMessage}</Message>
+                </>
               )}
-            />
-          </EuiPanel>
-          <EuiSpacer size="s" />
-          {showDetails && (
-            <DetailView
-              errorGroup={errorGroupData}
-              urlParams={urlParams}
-              location={location}
-            />
+              <Label>
+                {i18n.translate(
+                  'xpack.apm.errorGroupDetails.exceptionMessageLabel',
+                  {
+                    defaultMessage: 'Exception message',
+                  }
+                )}
+              </Label>
+              <Message>{excMessage || NOT_AVAILABLE_LABEL}</Message>
+              <Label>
+                {i18n.translate('xpack.apm.errorGroupDetails.culpritLabel', {
+                  defaultMessage: 'Culprit',
+                })}
+              </Label>
+              <Culprit>{culprit || NOT_AVAILABLE_LABEL}</Culprit>
+            </EuiText>
+          </Titles>
+        )}
+        <ErrorDistribution
+          distribution={errorDistributionData}
+          title={i18n.translate(
+            'xpack.apm.errorGroupDetails.occurrencesChartLabel',
+            {
+              defaultMessage: 'Occurrences',
+            }
           )}
-        </EuiPageBody>
-      </EuiPage>
+        />
+      </EuiPanel>
+      <EuiSpacer size="s" />
+      {showDetails && (
+        <DetailView errorGroup={errorGroupData} urlParams={urlParams} />
+      )}
     </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/Home/Home.test.tsx b/x-pack/plugins/apm/public/components/app/Home/Home.test.tsx
deleted file mode 100644
index ab3b76848c248..0000000000000
--- a/x-pack/plugins/apm/public/components/app/Home/Home.test.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { Home } from '../Home';
-import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-
-describe('Home component', () => {
-  it('should render services', () => {
-    expect(
-      shallow(
-        <MockApmPluginContextWrapper>
-          <Home tab="services" />
-        </MockApmPluginContextWrapper>
-      )
-    ).toMatchSnapshot();
-  });
-
-  it('should render traces', () => {
-    expect(
-      shallow(
-        <MockApmPluginContextWrapper>
-          <Home tab="traces" />
-        </MockApmPluginContextWrapper>
-      )
-    ).toMatchSnapshot();
-  });
-});
diff --git a/x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap b/x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
deleted file mode 100644
index f13cce3fd9b40..0000000000000
--- a/x-pack/plugins/apm/public/components/app/Home/__snapshots__/Home.test.tsx.snap
+++ /dev/null
@@ -1,189 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`Home component should render services 1`] = `
-<ContextProvider
-  value={
-    Object {
-      "appMountParameters": Object {
-        "setHeaderActionMenu": [Function],
-      },
-      "config": Object {
-        "profilingEnabled": false,
-        "serviceMapEnabled": true,
-        "ui": Object {
-          "enabled": false,
-        },
-      },
-      "core": Object {
-        "application": Object {
-          "capabilities": Object {
-            "apm": Object {},
-            "ml": Object {},
-          },
-          "currentAppId$": Observable {
-            "_isScalar": false,
-          },
-          "navigateToUrl": [Function],
-        },
-        "chrome": Object {
-          "docTitle": Object {
-            "change": [Function],
-          },
-          "setBadge": [Function],
-          "setBreadcrumbs": [Function],
-          "setHelpExtension": [Function],
-        },
-        "docLinks": Object {
-          "DOC_LINK_VERSION": "0",
-          "ELASTIC_WEBSITE_URL": "https://www.elastic.co/",
-        },
-        "http": Object {
-          "basePath": Object {
-            "get": [Function],
-            "prepend": [Function],
-          },
-        },
-        "i18n": Object {
-          "Context": [Function],
-        },
-        "notifications": Object {
-          "toasts": Object {
-            "addDanger": [Function],
-            "addWarning": [Function],
-          },
-        },
-        "uiSettings": Object {
-          "get": [Function],
-          "get$": [Function],
-        },
-      },
-      "observabilityRuleTypeRegistry": Object {
-        "registerFormatter": [Function],
-      },
-      "plugins": Object {
-        "data": Object {
-          "query": Object {
-            "timefilter": Object {
-              "timefilter": Object {
-                "getTime": [Function],
-                "setTime": [Function],
-              },
-            },
-          },
-        },
-        "ml": Object {
-          "urlGenerator": MlUrlGenerator {
-            "createUrl": [Function],
-            "id": "ML_APP_URL_GENERATOR",
-            "params": Object {
-              "appBasePath": "/app/ml",
-              "useHash": false,
-            },
-          },
-        },
-        "observability": Object {
-          "isAlertingExperienceEnabled": [Function],
-        },
-      },
-    }
-  }
->
-  <Home
-    tab="services"
-  />
-</ContextProvider>
-`;
-
-exports[`Home component should render traces 1`] = `
-<ContextProvider
-  value={
-    Object {
-      "appMountParameters": Object {
-        "setHeaderActionMenu": [Function],
-      },
-      "config": Object {
-        "profilingEnabled": false,
-        "serviceMapEnabled": true,
-        "ui": Object {
-          "enabled": false,
-        },
-      },
-      "core": Object {
-        "application": Object {
-          "capabilities": Object {
-            "apm": Object {},
-            "ml": Object {},
-          },
-          "currentAppId$": Observable {
-            "_isScalar": false,
-          },
-          "navigateToUrl": [Function],
-        },
-        "chrome": Object {
-          "docTitle": Object {
-            "change": [Function],
-          },
-          "setBadge": [Function],
-          "setBreadcrumbs": [Function],
-          "setHelpExtension": [Function],
-        },
-        "docLinks": Object {
-          "DOC_LINK_VERSION": "0",
-          "ELASTIC_WEBSITE_URL": "https://www.elastic.co/",
-        },
-        "http": Object {
-          "basePath": Object {
-            "get": [Function],
-            "prepend": [Function],
-          },
-        },
-        "i18n": Object {
-          "Context": [Function],
-        },
-        "notifications": Object {
-          "toasts": Object {
-            "addDanger": [Function],
-            "addWarning": [Function],
-          },
-        },
-        "uiSettings": Object {
-          "get": [Function],
-          "get$": [Function],
-        },
-      },
-      "observabilityRuleTypeRegistry": Object {
-        "registerFormatter": [Function],
-      },
-      "plugins": Object {
-        "data": Object {
-          "query": Object {
-            "timefilter": Object {
-              "timefilter": Object {
-                "getTime": [Function],
-                "setTime": [Function],
-              },
-            },
-          },
-        },
-        "ml": Object {
-          "urlGenerator": MlUrlGenerator {
-            "createUrl": [Function],
-            "id": "ML_APP_URL_GENERATOR",
-            "params": Object {
-              "appBasePath": "/app/ml",
-              "useHash": false,
-            },
-          },
-        },
-        "observability": Object {
-          "isAlertingExperienceEnabled": [Function],
-        },
-      },
-    }
-  }
->
-  <Home
-    tab="traces"
-  />
-</ContextProvider>
-`;
diff --git a/x-pack/plugins/apm/public/components/app/Home/index.tsx b/x-pack/plugins/apm/public/components/app/Home/index.tsx
deleted file mode 100644
index 834c2d5c40bce..0000000000000
--- a/x-pack/plugins/apm/public/components/app/Home/index.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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiTab, EuiTitle } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React, { ComponentType } from 'react';
-import { $ElementType } from 'utility-types';
-import { ApmHeader } from '../../shared/ApmHeader';
-import { useServiceMapHref } from '../../shared/Links/apm/ServiceMapLink';
-import { useServiceInventoryHref } from '../../shared/Links/apm/service_inventory_link';
-import { useTraceOverviewHref } from '../../shared/Links/apm/TraceOverviewLink';
-import { MainTabs } from '../../shared/main_tabs';
-import { ServiceMap } from '../ServiceMap';
-import { ServiceInventory } from '../service_inventory';
-import { TraceOverview } from '../trace_overview';
-
-interface Tab {
-  key: string;
-  href: string;
-  text: string;
-  Component: ComponentType;
-}
-
-interface Props {
-  tab: 'traces' | 'services' | 'service-map';
-}
-
-export function Home({ tab }: Props) {
-  const homeTabs: Tab[] = [
-    {
-      key: 'services',
-      href: useServiceInventoryHref(),
-      text: i18n.translate('xpack.apm.home.servicesTabLabel', {
-        defaultMessage: 'Services',
-      }),
-      Component: ServiceInventory,
-    },
-    {
-      key: 'traces',
-      href: useTraceOverviewHref(),
-      text: i18n.translate('xpack.apm.home.tracesTabLabel', {
-        defaultMessage: 'Traces',
-      }),
-      Component: TraceOverview,
-    },
-    {
-      key: 'service-map',
-      href: useServiceMapHref(),
-      text: i18n.translate('xpack.apm.home.serviceMapTabLabel', {
-        defaultMessage: 'Service Map',
-      }),
-      Component: ServiceMap,
-    },
-  ];
-  const selectedTab = homeTabs.find(
-    (homeTab) => homeTab.key === tab
-  ) as $ElementType<typeof homeTabs, number>;
-
-  return (
-    <>
-      <ApmHeader>
-        <EuiTitle>
-          <h1>APM</h1>
-        </EuiTitle>
-      </ApmHeader>
-      <MainTabs>
-        {homeTabs.map(({ href, key, text }) => (
-          <EuiTab href={href} isSelected={key === selectedTab.key} key={key}>
-            {text}
-          </EuiTab>
-        ))}
-      </MainTabs>
-      <selectedTab.Component />
-    </>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
deleted file mode 100644
index 89b8db5f386dc..0000000000000
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
+++ /dev/null
@@ -1,369 +0,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 React from 'react';
-import { Redirect, RouteComponentProps } from 'react-router-dom';
-import { ApmServiceContextProvider } from '../../../../context/apm_service/apm_service_context';
-import { getServiceNodeName } from '../../../../../common/service_nodes';
-import { APMRouteDefinition } from '../../../../application/routes';
-import { toQuery } from '../../../shared/Links/url_helpers';
-import { ErrorGroupDetails } from '../../ErrorGroupDetails';
-import { Home } from '../../Home';
-import { ServiceDetails } from '../../service_details';
-import { ServiceNodeMetrics } from '../../service_node_metrics';
-import { Settings } from '../../Settings';
-import { AgentConfigurations } from '../../Settings/AgentConfigurations';
-import { AnomalyDetection } from '../../Settings/anomaly_detection';
-import { ApmIndices } from '../../Settings/ApmIndices';
-import { CustomizeUI } from '../../Settings/CustomizeUI';
-import { TraceLink } from '../../TraceLink';
-import { TransactionDetails } from '../../transaction_details';
-import {
-  CreateAgentConfigurationRouteHandler,
-  EditAgentConfigurationRouteHandler,
-} from './route_handlers/agent_configuration';
-import { enableServiceOverview } from '../../../../../common/ui_settings_keys';
-import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-
-/**
- * Given a path, redirect to that location, preserving the search and maintaining
- * backward-compatibilty with legacy (pre-7.9) hash-based URLs.
- */
-export function renderAsRedirectTo(to: string) {
-  return ({ location }: RouteComponentProps<{}>) => {
-    let resolvedUrl: URL | undefined;
-
-    // Redirect root URLs with a hash to support backward compatibility with URLs
-    // from before we switched to the non-hash platform history.
-    if (location.pathname === '' && location.hash.length > 0) {
-      // We just want the search and pathname so the host doesn't matter
-      resolvedUrl = new URL(location.hash.slice(1), 'http://localhost');
-      to = resolvedUrl.pathname;
-    }
-
-    return (
-      <Redirect
-        to={{
-          ...location,
-          hash: '',
-          pathname: to,
-          search: resolvedUrl ? resolvedUrl.search : location.search,
-        }}
-      />
-    );
-  };
-}
-
-// These component function definitions are used below with the `component`
-// property of the route definitions.
-//
-// If you provide an inline function to the component prop, you would create a
-// new component every render. This results in the existing component unmounting
-// and the new component mounting instead of just updating the existing component.
-function HomeServices() {
-  return <Home tab="services" />;
-}
-
-function HomeServiceMap() {
-  return <Home tab="service-map" />;
-}
-
-function HomeTraces() {
-  return <Home tab="traces" />;
-}
-
-function ServiceDetailsErrors(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  return <ServiceDetails {...props} tab="errors" />;
-}
-
-function ServiceDetailsMetrics(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  return <ServiceDetails {...props} tab="metrics" />;
-}
-
-function ServiceDetailsNodes(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  return <ServiceDetails {...props} tab="nodes" />;
-}
-
-function ServiceDetailsOverview(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  return <ServiceDetails {...props} tab="overview" />;
-}
-
-function ServiceDetailsServiceMap(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  return <ServiceDetails {...props} tab="service-map" />;
-}
-
-function ServiceDetailsTransactions(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  return <ServiceDetails {...props} tab="transactions" />;
-}
-
-function ServiceDetailsProfiling(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  return <ServiceDetails {...props} tab="profiling" />;
-}
-
-function SettingsAgentConfiguration(props: RouteComponentProps<{}>) {
-  return (
-    <Settings {...props}>
-      <AgentConfigurations />
-    </Settings>
-  );
-}
-
-function SettingsAnomalyDetection(props: RouteComponentProps<{}>) {
-  return (
-    <Settings {...props}>
-      <AnomalyDetection />
-    </Settings>
-  );
-}
-
-function SettingsApmIndices(props: RouteComponentProps<{}>) {
-  return (
-    <Settings {...props}>
-      <ApmIndices />
-    </Settings>
-  );
-}
-
-function SettingsCustomizeUI(props: RouteComponentProps<{}>) {
-  return (
-    <Settings {...props}>
-      <CustomizeUI />
-    </Settings>
-  );
-}
-
-function DefaultServicePageRouteHandler(
-  props: RouteComponentProps<{ serviceName: string }>
-) {
-  const { uiSettings } = useApmPluginContext().core;
-  const { serviceName } = props.match.params;
-  if (uiSettings.get(enableServiceOverview)) {
-    return renderAsRedirectTo(`/services/${serviceName}/overview`)(props);
-  }
-  return renderAsRedirectTo(`/services/${serviceName}/transactions`)(props);
-}
-
-/**
- * The array of route definitions to be used when the application
- * creates the routes.
- */
-export const routes: APMRouteDefinition[] = [
-  {
-    exact: true,
-    path: '/',
-    render: renderAsRedirectTo('/services'),
-    breadcrumb: 'APM',
-  },
-  // !! Need to be kept in sync with the deepLinks in x-pack/plugins/apm/public/plugin.ts
-  {
-    exact: true,
-    path: '/services',
-    component: HomeServices,
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.servicesTitle', {
-      defaultMessage: 'Services',
-    }),
-  },
-  // !! Need to be kept in sync with the deepLinks in x-pack/plugins/apm/public/plugin.ts
-  {
-    exact: true,
-    path: '/traces',
-    component: HomeTraces,
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.tracesTitle', {
-      defaultMessage: 'Traces',
-    }),
-  },
-  {
-    exact: true,
-    path: '/settings',
-    render: renderAsRedirectTo('/settings/agent-configuration'),
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.listSettingsTitle', {
-      defaultMessage: 'Settings',
-    }),
-  },
-  {
-    exact: true,
-    path: '/settings/apm-indices',
-    component: SettingsApmIndices,
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.settings.indicesTitle', {
-      defaultMessage: 'Indices',
-    }),
-  },
-  {
-    exact: true,
-    path: '/settings/agent-configuration',
-    component: SettingsAgentConfiguration,
-    breadcrumb: i18n.translate(
-      'xpack.apm.breadcrumb.settings.agentConfigurationTitle',
-      { defaultMessage: 'Agent Configuration' }
-    ),
-  },
-  {
-    exact: true,
-    path: '/settings/agent-configuration/create',
-    breadcrumb: i18n.translate(
-      'xpack.apm.breadcrumb.settings.createAgentConfigurationTitle',
-      { defaultMessage: 'Create Agent Configuration' }
-    ),
-    component: CreateAgentConfigurationRouteHandler,
-  },
-  {
-    exact: true,
-    path: '/settings/agent-configuration/edit',
-    breadcrumb: i18n.translate(
-      'xpack.apm.breadcrumb.settings.editAgentConfigurationTitle',
-      { defaultMessage: 'Edit Agent Configuration' }
-    ),
-    component: EditAgentConfigurationRouteHandler,
-  },
-  {
-    exact: true,
-    path: '/services/:serviceName',
-    breadcrumb: ({ match }) => match.params.serviceName,
-    component: DefaultServicePageRouteHandler,
-  } as APMRouteDefinition<{ serviceName: string }>,
-  {
-    exact: true,
-    path: '/services/:serviceName/overview',
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.overviewTitle', {
-      defaultMessage: 'Overview',
-    }),
-    component: withApmServiceContext(ServiceDetailsOverview),
-  } as APMRouteDefinition<{ serviceName: string }>,
-  // errors
-  {
-    exact: true,
-    path: '/services/:serviceName/errors/:groupId',
-    component: withApmServiceContext(ErrorGroupDetails),
-    breadcrumb: ({ match }) => match.params.groupId,
-  } as APMRouteDefinition<{ groupId: string; serviceName: string }>,
-  {
-    exact: true,
-    path: '/services/:serviceName/errors',
-    component: withApmServiceContext(ServiceDetailsErrors),
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.errorsTitle', {
-      defaultMessage: 'Errors',
-    }),
-  },
-  // transactions
-  {
-    exact: true,
-    path: '/services/:serviceName/transactions',
-    component: withApmServiceContext(ServiceDetailsTransactions),
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.transactionsTitle', {
-      defaultMessage: 'Transactions',
-    }),
-  },
-  // metrics
-  {
-    exact: true,
-    path: '/services/:serviceName/metrics',
-    component: withApmServiceContext(ServiceDetailsMetrics),
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.metricsTitle', {
-      defaultMessage: 'Metrics',
-    }),
-  },
-  // service nodes, only enabled for java agents for now
-  {
-    exact: true,
-    path: '/services/:serviceName/nodes',
-    component: withApmServiceContext(ServiceDetailsNodes),
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.nodesTitle', {
-      defaultMessage: 'JVMs',
-    }),
-  },
-  // node metrics
-  {
-    exact: true,
-    path: '/services/:serviceName/nodes/:serviceNodeName/metrics',
-    component: withApmServiceContext(ServiceNodeMetrics),
-    breadcrumb: ({ match }) => getServiceNodeName(match.params.serviceNodeName),
-  },
-  {
-    exact: true,
-    path: '/services/:serviceName/transactions/view',
-    component: withApmServiceContext(TransactionDetails),
-    breadcrumb: ({ location }) => {
-      const query = toQuery(location.search);
-      return query.transactionName as string;
-    },
-  },
-  {
-    exact: true,
-    path: '/services/:serviceName/profiling',
-    component: withApmServiceContext(ServiceDetailsProfiling),
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.serviceProfilingTitle', {
-      defaultMessage: 'Profiling',
-    }),
-  },
-  {
-    exact: true,
-    path: '/services/:serviceName/service-map',
-    component: withApmServiceContext(ServiceDetailsServiceMap),
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.serviceMapTitle', {
-      defaultMessage: 'Service Map',
-    }),
-  },
-  {
-    exact: true,
-    path: '/link-to/trace/:traceId',
-    component: TraceLink,
-    breadcrumb: null,
-  },
-  // !! Need to be kept in sync with the deepLinks in x-pack/plugins/apm/public/plugin.ts
-  {
-    exact: true,
-    path: '/service-map',
-    component: HomeServiceMap,
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.serviceMapTitle', {
-      defaultMessage: 'Service Map',
-    }),
-  },
-  {
-    exact: true,
-    path: '/settings/customize-ui',
-    component: SettingsCustomizeUI,
-    breadcrumb: i18n.translate('xpack.apm.breadcrumb.settings.customizeUI', {
-      defaultMessage: 'Customize UI',
-    }),
-  },
-  {
-    exact: true,
-    path: '/settings/anomaly-detection',
-    component: SettingsAnomalyDetection,
-    breadcrumb: i18n.translate(
-      'xpack.apm.breadcrumb.settings.anomalyDetection',
-      {
-        defaultMessage: 'Anomaly detection',
-      }
-    ),
-  },
-];
-
-function withApmServiceContext(WrappedComponent: React.ComponentType<any>) {
-  return (props: any) => {
-    return (
-      <ApmServiceContextProvider>
-        <WrappedComponent {...props} />
-      </ApmServiceContextProvider>
-    );
-  };
-}
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx b/x-pack/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
deleted file mode 100644
index e5d238e6aa89c..0000000000000
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/route_handlers/agent_configuration.tsx
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
-import { useFetcher } from '../../../../../hooks/use_fetcher';
-import { toQuery } from '../../../../shared/Links/url_helpers';
-import { Settings } from '../../../Settings';
-import { AgentConfigurationCreateEdit } from '../../../Settings/AgentConfigurations/AgentConfigurationCreateEdit';
-
-type EditAgentConfigurationRouteHandler = RouteComponentProps<{}>;
-
-export function EditAgentConfigurationRouteHandler(
-  props: EditAgentConfigurationRouteHandler
-) {
-  const { search } = props.history.location;
-
-  // typescript complains because `pageStop` does not exist in `APMQueryParams`
-  // Going forward we should move away from globally declared query params and this is a first step
-  // @ts-expect-error
-  const { name, environment, pageStep } = toQuery(search);
-
-  const res = useFetcher(
-    (callApmApi) => {
-      return callApmApi({
-        endpoint: 'GET /api/apm/settings/agent-configuration/view',
-        params: { query: { name, environment } },
-      });
-    },
-    [name, environment]
-  );
-
-  return (
-    <Settings {...props}>
-      <AgentConfigurationCreateEdit
-        pageStep={pageStep || 'choose-settings-step'}
-        existingConfigResult={res}
-      />
-    </Settings>
-  );
-}
-
-type CreateAgentConfigurationRouteHandlerProps = RouteComponentProps<{}>;
-
-export function CreateAgentConfigurationRouteHandler(
-  props: CreateAgentConfigurationRouteHandlerProps
-) {
-  const { search } = props.history.location;
-
-  // Ignoring here because we specifically DO NOT want to add the query params to the global route handler
-  // @ts-expect-error
-  const { pageStep } = toQuery(search);
-
-  return (
-    <Settings {...props}>
-      <AgentConfigurationCreateEdit
-        pageStep={pageStep || 'choose-service-step'}
-      />
-    </Settings>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/CsmSharedContext/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/CsmSharedContext/index.tsx
index bb23c8efc0476..b044fb8d112e9 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/CsmSharedContext/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/CsmSharedContext/index.tsx
@@ -30,7 +30,7 @@ export const CsmSharedContext = createContext(defaultContext);
 export function CsmSharedContextProvider({
   children,
 }: {
-  children: JSX.Element[];
+  children: JSX.Element;
 }) {
   const [newData, setNewData] = useState<SharedData>({ totalPageViews: 0 });
 
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx
index d04bcb79a53e1..4b31ee63eb7ad 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/Panels/MainFilters.tsx
@@ -6,14 +6,10 @@
  */
 
 import React from 'react';
-import { EuiFlexItem } from '@elastic/eui';
-import { EnvironmentFilter } from '../../../shared/EnvironmentFilter';
 import { ServiceNameFilter } from '../URLFilter/ServiceNameFilter';
 import { useFetcher } from '../../../../hooks/use_fetcher';
 import { RUM_AGENT_NAMES } from '../../../../../common/agent_name';
 import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { UserPercentile } from '../UserPercentile';
-import { useBreakPoints } from '../../../../hooks/use_break_points';
 
 export function MainFilters() {
   const {
@@ -39,25 +35,11 @@ export function MainFilters() {
   );
 
   const rumServiceNames = data?.rumServices ?? [];
-  const { isSmall } = useBreakPoints();
-
-  // on mobile we want it to take full width
-  const envStyle = isSmall ? {} : { maxWidth: 200 };
 
   return (
-    <>
-      <EuiFlexItem grow={false}>
-        <ServiceNameFilter
-          loading={status !== 'success'}
-          serviceNames={rumServiceNames}
-        />
-      </EuiFlexItem>
-      <EuiFlexItem grow={false} style={envStyle}>
-        <EnvironmentFilter />
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <UserPercentile />
-      </EuiFlexItem>
-    </>
+    <ServiceNameFilter
+      loading={status !== 'success'}
+      serviceNames={rumServiceNames}
+    />
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
index a0b3781a30b20..40f091ad1a9fc 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/RumHome.tsx
@@ -5,33 +5,58 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { RumOverview } from '../RumDashboard';
 import { CsmSharedContextProvider } from './CsmSharedContext';
 import { MainFilters } from './Panels/MainFilters';
 import { DatePicker } from '../../shared/DatePicker';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+import { EnvironmentFilter } from '../../shared/EnvironmentFilter';
+import { UserPercentile } from './UserPercentile';
+import { useBreakPoints } from '../../../hooks/use_break_points';
 
 export const UX_LABEL = i18n.translate('xpack.apm.ux.title', {
   defaultMessage: 'User Experience',
 });
 
 export function RumHome() {
+  const { observability } = useApmPluginContext();
+  const PageTemplateComponent = observability.navigation.PageTemplate;
+
+  const { isSmall } = useBreakPoints();
+
+  const envStyle = isSmall ? {} : { maxWidth: 200 };
+
   return (
     <CsmSharedContextProvider>
-      <EuiFlexGroup wrap justifyContent={'flexEnd'} responsive={true}>
-        <EuiFlexItem>
-          <EuiTitle>
-            <h1 className="eui-textNoWrap">{UX_LABEL}</h1>
-          </EuiTitle>
-        </EuiFlexItem>
-        <MainFilters />
-        <EuiFlexItem grow={false}>
-          <DatePicker />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <RumOverview />
+      <PageTemplateComponent
+        pageHeader={{
+          pageTitle: UX_LABEL,
+          rightSideItems: [
+            <DatePicker />,
+            <div style={envStyle}>
+              <EnvironmentFilter />
+            </div>,
+            <UserPercentile />,
+            <MainFilters />,
+          ],
+        }}
+      >
+        <RumOverview />
+      </PageTemplateComponent>
     </CsmSharedContextProvider>
   );
 }
+
+export function UxHomeHeaderItems() {
+  return (
+    <EuiFlexGroup wrap justifyContent={'flexEnd'} responsive={true}>
+      <MainFilters />
+      <EuiFlexItem grow={false}>
+        <DatePicker />
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/EmbeddedMap.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/EmbeddedMap.tsx
index 11bc6796c87b7..b5a29ed09673e 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/EmbeddedMap.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/VisitorBreakdownMap/EmbeddedMap.tsx
@@ -83,10 +83,6 @@ export function EmbeddedMapComponent() {
     attributes: { title: '' },
     id: uuid.v4(),
     filters: mapFilters,
-    refreshConfig: {
-      value: 0,
-      pause: false,
-    },
     viewMode: ViewMode.VIEW,
     isLayerTOCOpen: false,
     query: {
diff --git a/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx b/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx
index 9bdad14eb8a18..e42cb5b2989b6 100644
--- a/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/RumDashboard/index.tsx
@@ -25,19 +25,16 @@ export function RumOverview() {
   }, []);
 
   return (
-    <>
-      <EuiSpacer size="m" />
-      <EuiFlexGroup>
-        <EuiFlexItem grow={1}>
-          <LocalUIFilters {...localUIFiltersConfig} showCount={true}>
-            <URLFilter />
-            <EuiSpacer size="s" />
-          </LocalUIFilters>
-        </EuiFlexItem>
-        <EuiFlexItem grow={7}>
-          <RumDashboard />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </>
+    <EuiFlexGroup>
+      <EuiFlexItem grow={1}>
+        <LocalUIFilters {...localUIFiltersConfig} showCount={true}>
+          <URLFilter />
+          <EuiSpacer size="s" />
+        </LocalUIFilters>
+      </EuiFlexItem>
+      <EuiFlexItem grow={7}>
+        <RumDashboard />
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/index.test.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/index.test.tsx
deleted file mode 100644
index e8384de1d15ba..0000000000000
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/index.test.tsx
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { render } from '@testing-library/react';
-import { createMemoryHistory } from 'history';
-import { CoreStart } from 'kibana/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 { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-import { LicenseContext } from '../../../context/license/license_context';
-import * as useFetcherModule from '../../../hooks/use_fetcher';
-import { ServiceMap } from './';
-import { UrlParamsProvider } from '../../../context/url_params_context/url_params_context';
-import { Router } from 'react-router-dom';
-
-const history = createMemoryHistory();
-
-const KibanaReactContext = createKibanaReactContext({
-  usageCollection: { reportUiCounter: () => {} },
-} as Partial<CoreStart>);
-
-const activeLicense = new License({
-  signature: 'active test signature',
-  license: {
-    expiryDateInMillis: 0,
-    mode: 'platinum',
-    status: 'active',
-    type: 'platinum',
-    uid: '1',
-  },
-});
-
-const expiredLicense = new License({
-  signature: 'expired test signature',
-  license: {
-    expiryDateInMillis: 0,
-    mode: 'platinum',
-    status: 'expired',
-    type: 'platinum',
-    uid: '1',
-  },
-});
-
-function createWrapper(license: License | null) {
-  return ({ children }: { children?: ReactNode }) => {
-    return (
-      <EuiThemeProvider>
-        <KibanaReactContext.Provider>
-          <LicenseContext.Provider value={license || undefined}>
-            <MockApmPluginContextWrapper>
-              <Router history={history}>
-                <UrlParamsProvider>{children}</UrlParamsProvider>
-              </Router>
-            </MockApmPluginContextWrapper>
-          </LicenseContext.Provider>
-        </KibanaReactContext.Provider>
-      </EuiThemeProvider>
-    );
-  };
-}
-
-describe('ServiceMap', () => {
-  describe('with no license', () => {
-    it('renders null', async () => {
-      expect(
-        await render(<ServiceMap />, {
-          wrapper: createWrapper(null),
-        }).queryByTestId('ServiceMap')
-      ).not.toBeInTheDocument();
-    });
-  });
-
-  describe('with an expired license', () => {
-    it('renders the license banner', async () => {
-      expect(
-        await render(<ServiceMap />, {
-          wrapper: createWrapper(expiredLicense),
-        }).findAllByText(/Platinum/)
-      ).toHaveLength(1);
-    });
-  });
-
-  describe('with an active license', () => {
-    describe('with an empty response', () => {
-      it('renders the empty banner', async () => {
-        jest.spyOn(useFetcherModule, 'useFetcher').mockReturnValueOnce({
-          data: { elements: [] },
-          refetch: () => {},
-          status: useFetcherModule.FETCH_STATUS.SUCCESS,
-        });
-
-        expect(
-          await render(<ServiceMap />, {
-            wrapper: createWrapper(activeLicense),
-          }).findAllByText(/No services available/)
-        ).toHaveLength(1);
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx b/x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx
deleted file mode 100644
index b338d1e4ab03d..0000000000000
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/index.tsx
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
-import React, { PropsWithChildren, ReactNode } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { isActivePlatinumLicense } from '../../../../common/license_check';
-import { useTrackPageview } from '../../../../../observability/public';
-import {
-  invalidLicenseMessage,
-  SERVICE_MAP_TIMEOUT_ERROR,
-} from '../../../../common/service_map';
-import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
-import { useLicenseContext } from '../../../context/license/use_license_context';
-import { useTheme } from '../../../hooks/use_theme';
-import { useUrlParams } from '../../../context/url_params_context/use_url_params';
-import { DatePicker } from '../../shared/DatePicker';
-import { LicensePrompt } from '../../shared/license_prompt';
-import { Controls } from './Controls';
-import { Cytoscape } from './Cytoscape';
-import { getCytoscapeDivStyle } from './cytoscape_options';
-import { EmptyBanner } from './EmptyBanner';
-import { EmptyPrompt } from './empty_prompt';
-import { Popover } from './Popover';
-import { TimeoutPrompt } from './timeout_prompt';
-import { useRefDimensions } from './useRefDimensions';
-
-interface ServiceMapProps {
-  serviceName?: string;
-}
-
-const ServiceMapDatePickerFlexGroup = euiStyled(EuiFlexGroup)`
-  padding: ${({ theme }) => theme.eui.euiSizeM};
-  border-bottom: ${({ theme }) => theme.eui.euiBorderThin};
-  margin: 0;
-`;
-
-function DatePickerSection() {
-  return (
-    <ServiceMapDatePickerFlexGroup justifyContent="flexEnd" gutterSize="s">
-      <EuiFlexItem grow={false}>
-        <DatePicker />
-      </EuiFlexItem>
-    </ServiceMapDatePickerFlexGroup>
-  );
-}
-
-function PromptContainer({ children }: { children: ReactNode }) {
-  return (
-    <>
-      <DatePickerSection />
-      <EuiFlexGroup
-        alignItems="center"
-        justifyContent="spaceAround"
-        // Set the height to give it some top margin
-        style={{ height: '60vh' }}
-      >
-        <EuiFlexItem
-          grow={false}
-          style={{ width: 600, textAlign: 'center' as const }}
-        >
-          {children}
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </>
-  );
-}
-
-function LoadingSpinner() {
-  return (
-    <EuiLoadingSpinner
-      size="xl"
-      style={{ position: 'absolute', top: '50%', left: '50%' }}
-    />
-  );
-}
-
-export function ServiceMap({
-  serviceName,
-}: PropsWithChildren<ServiceMapProps>) {
-  const theme = useTheme();
-  const license = useLicenseContext();
-  const { urlParams } = useUrlParams();
-
-  const { data = { elements: [] }, status, error } = useFetcher(
-    (callApmApi) => {
-      // When we don't have a license or a valid license, don't make the request.
-      if (!license || !isActivePlatinumLicense(license)) {
-        return;
-      }
-
-      const { start, end, environment } = urlParams;
-      if (start && end) {
-        return callApmApi({
-          isCachable: false,
-          endpoint: 'GET /api/apm/service-map',
-          params: {
-            query: {
-              start,
-              end,
-              environment,
-              serviceName,
-            },
-          },
-        });
-      }
-    },
-    [license, serviceName, urlParams]
-  );
-
-  const { ref, height } = useRefDimensions();
-
-  useTrackPageview({ app: 'apm', path: 'service_map' });
-  useTrackPageview({ app: 'apm', path: 'service_map', delay: 15000 });
-
-  if (!license) {
-    return null;
-  }
-
-  if (!isActivePlatinumLicense(license)) {
-    return (
-      <PromptContainer>
-        <LicensePrompt text={invalidLicenseMessage} />
-      </PromptContainer>
-    );
-  }
-
-  if (status === FETCH_STATUS.SUCCESS && data.elements.length === 0) {
-    return (
-      <PromptContainer>
-        <EmptyPrompt />
-      </PromptContainer>
-    );
-  }
-
-  if (
-    status === FETCH_STATUS.FAILURE &&
-    error &&
-    'body' in error &&
-    error.body.statusCode === 500 &&
-    error.body.message === SERVICE_MAP_TIMEOUT_ERROR
-  ) {
-    return (
-      <PromptContainer>
-        <TimeoutPrompt isGlobalServiceMap={!serviceName} />
-      </PromptContainer>
-    );
-  }
-
-  return (
-    <>
-      <DatePickerSection />
-      <div data-test-subj="ServiceMap" style={{ height }} ref={ref}>
-        <Cytoscape
-          elements={data.elements}
-          height={height}
-          serviceName={serviceName}
-          style={getCytoscapeDivStyle(theme, status)}
-        >
-          <Controls />
-          {serviceName && <EmptyBanner />}
-          {status === FETCH_STATUS.LOADING && <LoadingSpinner />}
-          <Popover focusedServiceName={serviceName} />
-        </Cytoscape>
-      </div>
-    </>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx
index 71355a84d28d4..d71751805ce41 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/ServicePage/ServicePage.tsx
@@ -5,14 +5,7 @@
  * 2.0.
  */
 
-import {
-  EuiTitle,
-  EuiSpacer,
-  EuiPanel,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiButton,
-} from '@elastic/eui';
+import { EuiSpacer, EuiFlexGroup, EuiFlexItem, EuiButton } from '@elastic/eui';
 import React from 'react';
 import { i18n } from '@kbn/i18n';
 import { isString } from 'lodash';
@@ -100,17 +93,7 @@ export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
   );
 
   return (
-    <EuiPanel paddingSize="m">
-      <EuiTitle size="xs">
-        <h3>
-          {i18n.translate('xpack.apm.agentConfig.servicePage.title', {
-            defaultMessage: 'Choose service',
-          })}
-        </h3>
-      </EuiTitle>
-
-      <EuiSpacer size="m" />
-
+    <>
       {/* Service name options */}
       <FormRowSelect
         title={i18n.translate(
@@ -207,6 +190,6 @@ export function ServicePage({ newConfig, setNewConfig, onClickNext }: Props) {
           </EuiButton>
         </EuiFlexItem>
       </EuiFlexGroup>
-    </EuiPanel>
+    </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
index b26779c5fe949..7623e467aaa2d 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/SettingsPage/SettingsPage.tsx
@@ -15,11 +15,10 @@ import {
   EuiForm,
   EuiHealth,
   EuiLoadingSpinner,
-  EuiPanel,
   EuiSpacer,
   EuiStat,
   EuiText,
-  EuiTitle,
+  EuiHorizontalRule,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useMemo, useState } from 'react';
@@ -136,79 +135,55 @@ export function SettingsPage({
           }}
         >
           {/* Selected Service panel */}
-          <EuiPanel paddingSize="m">
-            <EuiTitle size="s">
-              <h3>
-                {i18n.translate('xpack.apm.agentConfig.chooseService.title', {
-                  defaultMessage: 'Choose service',
-                })}
-              </h3>
-            </EuiTitle>
-
-            <EuiSpacer size="m" />
 
-            <EuiFlexGroup>
-              <EuiFlexItem>
-                <EuiStat
-                  titleSize="xs"
-                  title={
-                    isLoading ? '-' : getOptionLabel(newConfig.service.name)
-                  }
-                  description={i18n.translate(
-                    'xpack.apm.agentConfig.chooseService.service.name.label',
-                    { defaultMessage: 'Service name' }
-                  )}
-                />
-              </EuiFlexItem>
-              <EuiFlexItem>
-                <EuiStat
-                  titleSize="xs"
-                  title={
-                    isLoading
-                      ? '-'
-                      : getOptionLabel(newConfig.service.environment)
-                  }
-                  description={i18n.translate(
-                    'xpack.apm.agentConfig.chooseService.service.environment.label',
-                    { defaultMessage: 'Environment' }
-                  )}
-                />
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                {!isEditMode && (
-                  <EuiButton onClick={onClickEdit} iconType="pencil">
-                    {i18n.translate(
-                      'xpack.apm.agentConfig.chooseService.editButton',
-                      { defaultMessage: 'Edit' }
-                    )}
-                  </EuiButton>
+          <EuiFlexGroup>
+            <EuiFlexItem>
+              <EuiStat
+                titleSize="xs"
+                title={isLoading ? '-' : getOptionLabel(newConfig.service.name)}
+                description={i18n.translate(
+                  'xpack.apm.agentConfig.chooseService.service.name.label',
+                  { defaultMessage: 'Service name' }
+                )}
+              />
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiStat
+                titleSize="xs"
+                title={
+                  isLoading
+                    ? '-'
+                    : getOptionLabel(newConfig.service.environment)
+                }
+                description={i18n.translate(
+                  'xpack.apm.agentConfig.chooseService.service.environment.label',
+                  { defaultMessage: 'Environment' }
                 )}
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiPanel>
+              />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              {!isEditMode && (
+                <EuiButton onClick={onClickEdit} iconType="pencil">
+                  {i18n.translate(
+                    'xpack.apm.agentConfig.chooseService.editButton',
+                    { defaultMessage: 'Edit' }
+                  )}
+                </EuiButton>
+              )}
+            </EuiFlexItem>
+          </EuiFlexGroup>
 
-          <EuiSpacer size="m" />
+          <EuiHorizontalRule />
 
           {/* Settings panel */}
-          <EuiPanel paddingSize="m">
-            <EuiTitle size="s">
-              <h3>
-                {i18n.translate('xpack.apm.agentConfig.settings.title', {
-                  defaultMessage: 'Configuration options',
-                })}
-              </h3>
-            </EuiTitle>
 
-            <EuiSpacer size="m" />
-
-            {isLoading ? (
-              <div style={{ textAlign: 'center' }}>
-                <EuiLoadingSpinner size="m" />
-              </div>
-            ) : (
-              renderSettings({ unsavedChanges, newConfig, setNewConfig })
-            )}
-          </EuiPanel>
+          {isLoading ? (
+            <div style={{ textAlign: 'center' }}>
+              <EuiLoadingSpinner size="m" />
+            </div>
+          ) : (
+            renderSettings({ unsavedChanges, newConfig, setNewConfig })
+          )}
         </form>
       </EuiForm>
       <EuiSpacer size="xxl" />
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
index 07afb2fece283..a0ca7daf82610 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/AgentConfigurationCreateEdit/index.tsx
@@ -109,7 +109,15 @@ export function AgentConfigurationCreateEdit({
 
   return (
     <>
-      <EuiTitle>
+      <EuiText color="subdued">
+        {i18n.translate('xpack.apm.agentConfig.newConfig.description', {
+          defaultMessage: `Fine-tune your agent configuration from within the APM app. Changes are automatically propagated to your APM agents, so there’s no need to redeploy.`,
+        })}
+      </EuiText>
+
+      <EuiSpacer size="m" />
+
+      <EuiTitle size="s">
         <h2>
           {isEditMode
             ? i18n.translate('xpack.apm.agentConfig.editConfigTitle', {
@@ -121,12 +129,6 @@ export function AgentConfigurationCreateEdit({
         </h2>
       </EuiTitle>
 
-      <EuiText size="s">
-        {i18n.translate('xpack.apm.agentConfig.newConfig.description', {
-          defaultMessage: `Fine-tune your agent configuration from within the APM app. Changes are automatically propagated to your APM agents, so there’s no need to redeploy.`,
-        })}
-      </EuiText>
-
       <EuiSpacer size="m" />
 
       {pageStep === 'choose-service-step' && (
diff --git a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
index 3225951fd6c70..1ca7f46a0b26f 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/AgentConfigurations/index.tsx
@@ -10,7 +10,6 @@ import {
   EuiButton,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPanel,
   EuiSpacer,
   EuiTitle,
   EuiText,
@@ -42,44 +41,36 @@ export function AgentConfigurations() {
 
   return (
     <>
-      <EuiTitle size="l">
-        <h1>
-          {i18n.translate('xpack.apm.agentConfig.titleText', {
-            defaultMessage: 'Agent central configuration',
-          })}
-        </h1>
-      </EuiTitle>
-      <EuiSpacer size="s" />
       <EuiText color="subdued">
         {i18n.translate('xpack.apm.settings.agentConfig.descriptionText', {
           defaultMessage: `Fine-tune your agent configuration from within the APM app. Changes are automatically propagated to your APM agents, so there’s no need to redeploy.`,
         })}
       </EuiText>
-      <EuiSpacer size="l" />
-      <EuiPanel>
-        <EuiFlexGroup alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiTitle size="s">
-              <h2>
-                {i18n.translate(
-                  'xpack.apm.agentConfig.configurationsPanelTitle',
-                  { defaultMessage: 'Configurations' }
-                )}
-              </h2>
-            </EuiTitle>
-          </EuiFlexItem>
 
-          {hasConfigurations ? <CreateConfigurationButton /> : null}
-        </EuiFlexGroup>
+      <EuiSpacer size="m" />
 
-        <EuiSpacer size="m" />
+      <EuiFlexGroup alignItems="center">
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="s">
+            <h2>
+              {i18n.translate(
+                'xpack.apm.agentConfig.configurationsPanelTitle',
+                { defaultMessage: 'Configurations' }
+              )}
+            </h2>
+          </EuiTitle>
+        </EuiFlexItem>
+
+        {hasConfigurations ? <CreateConfigurationButton /> : null}
+      </EuiFlexGroup>
+
+      <EuiSpacer size="m" />
 
-        <AgentConfigurationList
-          status={status}
-          configurations={data.configurations}
-          refetch={refetch}
-        />
-      </EuiPanel>
+      <AgentConfigurationList
+        status={status}
+        configurations={data.configurations}
+        refetch={refetch}
+      />
     </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
index 70672df85b649..1b19bb5860b2c 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.test.tsx
@@ -25,11 +25,11 @@ describe('ApmIndices', () => {
     );
 
     expect(getByText('Indices')).toMatchInlineSnapshot(`
-      <h1
-        class="euiTitle euiTitle--large"
+      <h2
+        class="euiTitle euiTitle--small"
       >
         Indices
-      </h1>
+      </h2>
     `);
 
     expect(spy).toHaveBeenCalledTimes(2);
diff --git a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
index 9d2b4bba22afb..2d74187f9d83b 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/ApmIndices/index.tsx
@@ -13,7 +13,6 @@ import {
   EuiFlexItem,
   EuiForm,
   EuiFormRow,
-  EuiPanel,
   EuiSpacer,
   EuiText,
   EuiTitle,
@@ -176,100 +175,101 @@ export function ApmIndices() {
 
   return (
     <>
-      <EuiTitle size="l">
-        <h1>
-          {i18n.translate('xpack.apm.settings.apmIndices.title', {
-            defaultMessage: 'Indices',
-          })}
-        </h1>
-      </EuiTitle>
-      <EuiSpacer size="s" />
       <EuiText color="subdued">
         {i18n.translate('xpack.apm.settings.apmIndices.description', {
           defaultMessage: `The APM UI uses index patterns to query your APM indices. If you've customized the index names that APM Server writes events to, you may need to update these patterns for the APM UI to work. Settings here take precedence over those set in kibana.yml.`,
         })}
       </EuiText>
-      <EuiSpacer size="l" />
-      <EuiPanel>
-        <EuiFlexGroup alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiForm>
-              {APM_INDEX_LABELS.map(({ configurationName, label }) => {
-                const matchedConfiguration = data.apmIndexSettings.find(
-                  ({ configurationName: configName }) =>
-                    configName === configurationName
-                );
-                const defaultValue = matchedConfiguration
-                  ? matchedConfiguration.defaultValue
-                  : '';
-                const savedUiIndexValue = apmIndices[configurationName] || '';
-                return (
-                  <EuiFormRow
-                    key={configurationName}
-                    label={label}
-                    helpText={i18n.translate(
-                      'xpack.apm.settings.apmIndices.helpText',
+
+      <EuiSpacer size="m" />
+
+      <EuiTitle size="s">
+        <h2>
+          {i18n.translate('xpack.apm.settings.apmIndices.title', {
+            defaultMessage: 'Indices',
+          })}
+        </h2>
+      </EuiTitle>
+
+      <EuiSpacer size="m" />
+
+      <EuiFlexGroup alignItems="center">
+        <EuiFlexItem grow={false}>
+          <EuiForm>
+            {APM_INDEX_LABELS.map(({ configurationName, label }) => {
+              const matchedConfiguration = data.apmIndexSettings.find(
+                ({ configurationName: configName }) =>
+                  configName === configurationName
+              );
+              const defaultValue = matchedConfiguration
+                ? matchedConfiguration.defaultValue
+                : '';
+              const savedUiIndexValue = apmIndices[configurationName] || '';
+              return (
+                <EuiFormRow
+                  key={configurationName}
+                  label={label}
+                  helpText={i18n.translate(
+                    'xpack.apm.settings.apmIndices.helpText',
+                    {
+                      defaultMessage:
+                        'Overrides {configurationName}: {defaultValue}',
+                      values: { configurationName, defaultValue },
+                    }
+                  )}
+                  fullWidth
+                >
+                  <EuiFieldText
+                    disabled={!canSave}
+                    fullWidth
+                    name={configurationName}
+                    placeholder={defaultValue}
+                    value={savedUiIndexValue}
+                    onChange={handleChangeIndexConfigurationEvent}
+                  />
+                </EuiFormRow>
+              );
+            })}
+            <EuiSpacer />
+            <EuiFlexGroup justifyContent="flexEnd">
+              <EuiFlexItem grow={false}>
+                <EuiButtonEmpty onClick={refetch}>
+                  {i18n.translate(
+                    'xpack.apm.settings.apmIndices.cancelButton',
+                    { defaultMessage: 'Cancel' }
+                  )}
+                </EuiButtonEmpty>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false}>
+                <EuiToolTip
+                  content={
+                    !canSave &&
+                    i18n.translate(
+                      'xpack.apm.settings.apmIndices.noPermissionTooltipLabel',
                       {
                         defaultMessage:
-                          'Overrides {configurationName}: {defaultValue}',
-                        values: { configurationName, defaultValue },
+                          "Your user role doesn't have permissions to change APM indices",
                       }
-                    )}
-                    fullWidth
+                    )
+                  }
+                >
+                  <EuiButton
+                    fill
+                    onClick={handleApplyChangesEvent}
+                    isLoading={isSaving}
+                    isDisabled={!canSave}
                   >
-                    <EuiFieldText
-                      disabled={!canSave}
-                      fullWidth
-                      name={configurationName}
-                      placeholder={defaultValue}
-                      value={savedUiIndexValue}
-                      onChange={handleChangeIndexConfigurationEvent}
-                    />
-                  </EuiFormRow>
-                );
-              })}
-              <EuiSpacer />
-              <EuiFlexGroup justifyContent="flexEnd">
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty onClick={refetch}>
                     {i18n.translate(
-                      'xpack.apm.settings.apmIndices.cancelButton',
-                      { defaultMessage: 'Cancel' }
+                      'xpack.apm.settings.apmIndices.applyButton',
+                      { defaultMessage: 'Apply changes' }
                     )}
-                  </EuiButtonEmpty>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiToolTip
-                    content={
-                      !canSave &&
-                      i18n.translate(
-                        'xpack.apm.settings.apmIndices.noPermissionTooltipLabel',
-                        {
-                          defaultMessage:
-                            "Your user role doesn't have permissions to change APM indices",
-                        }
-                      )
-                    }
-                  >
-                    <EuiButton
-                      fill
-                      onClick={handleApplyChangesEvent}
-                      isLoading={isSaving}
-                      isDisabled={!canSave}
-                    >
-                      {i18n.translate(
-                        'xpack.apm.settings.apmIndices.applyButton',
-                        { defaultMessage: 'Apply changes' }
-                      )}
-                    </EuiButton>
-                  </EuiToolTip>
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiForm>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiSpacer size="m" />
-      </EuiPanel>
+                  </EuiButton>
+                </EuiToolTip>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiForm>
+        </EuiFlexItem>
+      </EuiFlexGroup>
     </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
index ab18a31e76917..c1315f165abdb 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/CustomLink/index.tsx
@@ -8,7 +8,6 @@
 import {
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPanel,
   EuiTitle,
   EuiText,
   EuiSpacer,
@@ -83,62 +82,51 @@ export function CustomLinkOverview() {
           }}
         />
       )}
-      <EuiPanel>
-        <EuiFlexGroup gutterSize="none" alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiFlexGroup alignItems="center" gutterSize="none">
+
+      <EuiText color="subdued">
+        {i18n.translate('xpack.apm.settings.customizeUI.customLink.info', {
+          defaultMessage:
+            'These links will be shown in the Actions context menu in selected areas of the app, e.g. by the transactions detail.',
+        })}
+      </EuiText>
+
+      <EuiSpacer size="m" />
+
+      <EuiFlexGroup alignItems="center">
+        <EuiFlexItem grow={false}>
+          <EuiTitle size="s">
+            <h2>
+              {i18n.translate('xpack.apm.settings.customizeUI.customLink', {
+                defaultMessage: 'Custom Links',
+              })}
+            </h2>
+          </EuiTitle>
+        </EuiFlexItem>
+        {hasValidLicense && !showEmptyPrompt && (
+          <EuiFlexItem>
+            <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
               <EuiFlexItem grow={false}>
-                <EuiTitle size="s">
-                  <EuiFlexGroup
-                    alignItems="center"
-                    gutterSize="none"
-                    responsive={false}
-                  >
-                    <EuiFlexItem grow={false}>
-                      <h2>
-                        {i18n.translate(
-                          'xpack.apm.settings.customizeUI.customLink',
-                          {
-                            defaultMessage: 'Custom Links',
-                          }
-                        )}
-                      </h2>
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </EuiTitle>
+                <CreateCustomLinkButton onClick={onCreateCustomLinkClick} />
               </EuiFlexItem>
             </EuiFlexGroup>
           </EuiFlexItem>
-          {hasValidLicense && !showEmptyPrompt && (
-            <EuiFlexItem>
-              <EuiFlexGroup alignItems="center" justifyContent="flexEnd">
-                <EuiFlexItem grow={false}>
-                  <CreateCustomLinkButton onClick={onCreateCustomLinkClick} />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
-        <EuiSpacer size="xs" />
-        <EuiText color="subdued" size="s">
-          {i18n.translate('xpack.apm.settings.customizeUI.customLink.info', {
-            defaultMessage:
-              'These links will be shown in the Actions context menu in selected areas of the app, e.g. by the transactions detail.',
-          })}
-        </EuiText>
-        {hasValidLicense ? (
-          showEmptyPrompt ? (
-            <EmptyPrompt onCreateCustomLinkClick={onCreateCustomLinkClick} />
-          ) : (
-            <CustomLinkTable
-              items={customLinks}
-              onCustomLinkSelected={setCustomLinkSelected}
-            />
-          )
-        ) : (
-          <LicensePrompt text={INVALID_LICENSE} />
         )}
-      </EuiPanel>
+      </EuiFlexGroup>
+
+      <EuiSpacer size="m" />
+
+      {hasValidLicense ? (
+        showEmptyPrompt ? (
+          <EmptyPrompt onCreateCustomLinkClick={onCreateCustomLinkClick} />
+        ) : (
+          <CustomLinkTable
+            items={customLinks}
+            onCustomLinkSelected={setCustomLinkSelected}
+          />
+        )
+      ) : (
+        <LicensePrompt text={INVALID_LICENSE} />
+      )}
     </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx
index fabd70cec6647..9ce1f1325bb2c 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/CustomizeUI/index.tsx
@@ -6,28 +6,8 @@
  */
 
 import React from 'react';
-import { EuiTitle, EuiSpacer, EuiText } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 import { CustomLinkOverview } from './CustomLink';
 
 export function CustomizeUI() {
-  return (
-    <>
-      <EuiTitle size="l">
-        <h1>
-          {i18n.translate('xpack.apm.settings.customizeApp.title', {
-            defaultMessage: 'Customize app',
-          })}
-        </h1>
-      </EuiTitle>
-      <EuiSpacer size="s" />
-      <EuiText color="subdued">
-        {i18n.translate('xpack.apm.settings.customizeApp.description', {
-          defaultMessage: `Extend the APM app experience with the following settings.`,
-        })}
-      </EuiText>
-      <EuiSpacer size="l" />
-      <CustomLinkOverview />
-    </>
-  );
+  return <CustomLinkOverview />;
 }
diff --git a/x-pack/plugins/apm/public/components/app/Settings/Settings.test.tsx b/x-pack/plugins/apm/public/components/app/Settings/Settings.test.tsx
deleted file mode 100644
index 807cfd9c02654..0000000000000
--- a/x-pack/plugins/apm/public/components/app/Settings/Settings.test.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { render } from '@testing-library/react';
-import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-import React, { ReactNode } from 'react';
-import { Settings } from './';
-import { createMemoryHistory } from 'history';
-import { MemoryRouter, RouteComponentProps } from 'react-router-dom';
-
-const { location } = createMemoryHistory();
-
-function Wrapper({ children }: { children?: ReactNode }) {
-  return (
-    <MemoryRouter>
-      <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>
-    </MemoryRouter>
-  );
-}
-
-describe('Settings', () => {
-  it('renders', async () => {
-    const routerProps = ({
-      location,
-    } as unknown) as RouteComponentProps<{}>;
-    expect(() =>
-      render(
-        <Settings {...routerProps}>
-          <div />
-        </Settings>,
-        { wrapper: Wrapper }
-      )
-    ).not.toThrowError();
-  });
-});
diff --git a/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx b/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx
index bf9062418313a..89e5dfcbdadfb 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/add_environments.tsx
@@ -7,7 +7,6 @@
 
 import React, { useState } from 'react';
 import {
-  EuiPanel,
   EuiTitle,
   EuiText,
   EuiSpacer,
@@ -70,29 +69,27 @@ export function AddEnvironments({
 
   if (!canCreateJob) {
     return (
-      <EuiPanel>
-        <EuiEmptyPrompt
-          iconType="alert"
-          body={<>{ML_ERRORS.MISSING_WRITE_PRIVILEGES}</>}
-        />
-      </EuiPanel>
+      <EuiEmptyPrompt
+        iconType="alert"
+        body={<>{ML_ERRORS.MISSING_WRITE_PRIVILEGES}</>}
+      />
     );
   }
 
   const isLoading = status === FETCH_STATUS.LOADING;
   return (
-    <EuiPanel>
-      <EuiTitle>
+    <>
+      <EuiTitle size="s">
         <h2>
           {i18n.translate(
             'xpack.apm.settings.anomalyDetection.addEnvironments.titleText',
-            {
-              defaultMessage: 'Select environments',
-            }
+            { defaultMessage: 'Select environments' }
           )}
         </h2>
       </EuiTitle>
+
       <EuiSpacer size="l" />
+
       <EuiText>
         {i18n.translate(
           'xpack.apm.settings.anomalyDetection.addEnvironments.descriptionText',
@@ -181,6 +178,6 @@ export function AddEnvironments({
         </EuiFlexItem>
       </EuiFlexGroup>
       <EuiSpacer size="l" />
-    </EuiPanel>
+    </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx
index 62b39664cf63d..57d141d763909 100644
--- a/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/Settings/anomaly_detection/index.tsx
@@ -6,8 +6,6 @@
  */
 
 import React, { useState } from 'react';
-import { EuiTitle, EuiSpacer, EuiText } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 import { EuiPanel, EuiEmptyPrompt } from '@elastic/eui';
 import { ML_ERRORS } from '../../../../../common/anomaly_detection';
 import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
@@ -66,20 +64,6 @@ export function AnomalyDetection() {
 
   return (
     <>
-      <EuiTitle size="l">
-        <h1>
-          {i18n.translate('xpack.apm.settings.anomalyDetection.titleText', {
-            defaultMessage: 'Anomaly detection',
-          })}
-        </h1>
-      </EuiTitle>
-      <EuiSpacer size="s" />
-      <EuiText color="subdued">
-        {i18n.translate('xpack.apm.settings.anomalyDetection.descriptionText', {
-          defaultMessage: `Machine Learning's anomaly detection integration enables application health status indicators for services in each configured environment by identifying anomalies in latency.`,
-        })}
-      </EuiText>
-      <EuiSpacer size="l" />
       {viewAddEnvironments ? (
         <AddEnvironments
           currentEnvironments={data.jobs.map(({ environment }) => environment)}
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 9c69d692876b0..6df2ed73afe76 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
@@ -9,7 +9,6 @@ import {
   EuiButton,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPanel,
   EuiSpacer,
   EuiText,
   EuiTitle,
@@ -66,7 +65,28 @@ export function JobsList({ data, status, onAddEnvironments }: Props) {
   const { jobs, hasLegacyJobs } = data;
 
   return (
-    <EuiPanel>
+    <>
+      <EuiText color="subdued">
+        <FormattedMessage
+          id="xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText"
+          defaultMessage="To add anomaly detection to a new environment, create a machine learning job. Existing machine learning jobs can be managed in {mlJobsLink}."
+          values={{
+            mlJobsLink: (
+              <MLManageJobsLink>
+                {i18n.translate(
+                  'xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText.mlJobsLinkText',
+                  {
+                    defaultMessage: 'Machine Learning',
+                  }
+                )}
+              </MLManageJobsLink>
+            ),
+          }}
+        />
+      </EuiText>
+
+      <EuiSpacer size="m" />
+
       <EuiFlexGroup>
         <EuiFlexItem>
           <EuiTitle size="s">
@@ -91,25 +111,9 @@ export function JobsList({ data, status, onAddEnvironments }: Props) {
           </EuiButton>
         </EuiFlexItem>
       </EuiFlexGroup>
-      <EuiText size="s" color="subdued">
-        <FormattedMessage
-          id="xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText"
-          defaultMessage="To add anomaly detection to a new environment, create a machine learning job. Existing machine learning jobs can be managed in {mlJobsLink}."
-          values={{
-            mlJobsLink: (
-              <MLManageJobsLink>
-                {i18n.translate(
-                  'xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText.mlJobsLinkText',
-                  {
-                    defaultMessage: 'Machine Learning',
-                  }
-                )}
-              </MLManageJobsLink>
-            ),
-          }}
-        />
-      </EuiText>
-      <EuiSpacer size="l" />
+
+      <EuiSpacer size="m" />
+
       <ManagedTable
         noItemsMessage={getNoItemsMessage({ status })}
         columns={columns}
@@ -118,7 +122,7 @@ export function JobsList({ data, status, onAddEnvironments }: Props) {
       <EuiSpacer size="l" />
 
       {hasLegacyJobs && <LegacyJobsCallout />}
-    </EuiPanel>
+    </>
   );
 }
 
diff --git a/x-pack/plugins/apm/public/components/app/Settings/index.tsx b/x-pack/plugins/apm/public/components/app/Settings/index.tsx
deleted file mode 100644
index 36c36e3957e96..0000000000000
--- a/x-pack/plugins/apm/public/components/app/Settings/index.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiButtonEmpty,
-  EuiPage,
-  EuiPageBody,
-  EuiPageSideBar,
-  EuiSideNav,
-  EuiSpacer,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React, { ReactNode, useState } from 'react';
-import { RouteComponentProps } from 'react-router-dom';
-import { HeaderMenuPortal } from '../../../../../observability/public';
-import { ActionMenu } from '../../../application/action_menu';
-import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
-import { getAPMHref } from '../../shared/Links/apm/APMLink';
-import { HomeLink } from '../../shared/Links/apm/HomeLink';
-
-interface SettingsProps extends RouteComponentProps<{}> {
-  children: ReactNode;
-}
-
-export function Settings({ children, location }: SettingsProps) {
-  const { appMountParameters, core } = useApmPluginContext();
-  const { basePath } = core.http;
-  const canAccessML = !!core.application.capabilities.ml?.canAccessML;
-  const { search, pathname } = location;
-
-  const [isSideNavOpenOnMobile, setisSideNavOpenOnMobile] = useState(false);
-
-  const toggleOpenOnMobile = () => {
-    setisSideNavOpenOnMobile((prevState) => !prevState);
-  };
-
-  function getSettingsHref(path: string) {
-    return getAPMHref({ basePath, path: `/settings${path}`, search });
-  }
-
-  return (
-    <>
-      <HeaderMenuPortal
-        setHeaderActionMenu={appMountParameters.setHeaderActionMenu}
-      >
-        <ActionMenu />
-      </HeaderMenuPortal>
-      <EuiPage>
-        <EuiPageSideBar>
-          <HomeLink>
-            <EuiButtonEmpty
-              flush="left"
-              size="s"
-              color="primary"
-              iconType="arrowLeft"
-            >
-              {i18n.translate('xpack.apm.settings.returnLinkLabel', {
-                defaultMessage: 'Return to inventory',
-              })}
-            </EuiButtonEmpty>
-            <EuiSpacer size="s" />
-          </HomeLink>
-          <EuiSideNav
-            toggleOpenOnMobile={() => toggleOpenOnMobile()}
-            isOpenOnMobile={isSideNavOpenOnMobile}
-            items={[
-              {
-                name: i18n.translate('xpack.apm.settings.pageTitle', {
-                  defaultMessage: 'Settings',
-                }),
-                id: 0,
-                items: [
-                  {
-                    name: i18n.translate('xpack.apm.settings.agentConfig', {
-                      defaultMessage: 'Agent Configuration',
-                    }),
-                    id: '1',
-                    href: getSettingsHref('/agent-configuration'),
-                    isSelected: pathname.startsWith(
-                      '/settings/agent-configuration'
-                    ),
-                  },
-                  ...(canAccessML
-                    ? [
-                        {
-                          name: i18n.translate(
-                            'xpack.apm.settings.anomalyDetection',
-                            {
-                              defaultMessage: 'Anomaly detection',
-                            }
-                          ),
-                          id: '4',
-                          href: getSettingsHref('/anomaly-detection'),
-                          isSelected:
-                            pathname === '/settings/anomaly-detection',
-                        },
-                      ]
-                    : []),
-                  {
-                    name: i18n.translate('xpack.apm.settings.customizeApp', {
-                      defaultMessage: 'Customize app',
-                    }),
-                    id: '3',
-                    href: getSettingsHref('/customize-ui'),
-                    isSelected: pathname === '/settings/customize-ui',
-                  },
-                  {
-                    name: i18n.translate('xpack.apm.settings.indices', {
-                      defaultMessage: 'Indices',
-                    }),
-                    id: '2',
-                    href: getSettingsHref('/apm-indices'),
-                    isSelected: pathname === '/settings/apm-indices',
-                  },
-                ],
-              },
-            ]}
-          />
-        </EuiPageSideBar>
-        <EuiPageBody>{children}</EuiPageBody>
-      </EuiPage>
-    </>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap b/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap
index 58d5287e084ca..92337a97573e4 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/List/__snapshots__/List.test.tsx.snap
@@ -37,8 +37,9 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                   >
                     <span
                       className="euiButtonContent__icon"
+                      color="inherit"
                       data-euiicon-type="arrowDown"
-                      size="m"
+                      size="s"
                     />
                     <span
                       className="euiButtonEmpty__text"
@@ -74,7 +75,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent"
             >
               <span
@@ -101,7 +102,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                   />
                 </span>
               </span>
-            </div>
+            </span>
           </th>
           <th
             className="euiTableHeaderCell"
@@ -114,7 +115,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent"
             >
               <span
@@ -123,7 +124,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               >
                 Type
               </span>
-            </div>
+            </span>
           </th>
           <th
             className="euiTableHeaderCell"
@@ -136,7 +137,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent"
             >
               <span
@@ -145,7 +146,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               >
                 Error message and culprit
               </span>
-            </div>
+            </span>
           </th>
           <td
             className="euiTableHeaderCell"
@@ -158,13 +159,13 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent euiTableCellContent--alignRight"
             >
               <span
                 className="euiTableCellContent__text"
               />
-            </div>
+            </span>
           </td>
           <th
             aria-live="polite"
@@ -190,7 +191,7 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
               >
                 <span
                   className="euiTableCellContent__text"
-                  title="Occurrences; Sorted in descending order"
+                  title="Occurrences"
                 >
                   Occurrences
                 </span>
@@ -200,11 +201,6 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                   size="m"
                 />
               </span>
-              <span
-                className="euiScreenReaderOnly"
-              >
-                Click to sort in ascending order
-              </span>
             </button>
           </th>
           <th
@@ -236,11 +232,6 @@ exports[`ErrorGroupOverview -> List should render empty state 1`] = `
                   Latest occurrence
                 </span>
               </span>
-              <span
-                className="euiScreenReaderOnly"
-              >
-                Click to sort in ascending order
-              </span>
             </button>
           </th>
         </tr>
@@ -343,8 +334,9 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   >
                     <span
                       className="euiButtonContent__icon"
+                      color="inherit"
                       data-euiicon-type="arrowDown"
-                      size="m"
+                      size="s"
                     />
                     <span
                       className="euiButtonEmpty__text"
@@ -380,7 +372,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent"
             >
               <span
@@ -407,7 +399,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   />
                 </span>
               </span>
-            </div>
+            </span>
           </th>
           <th
             className="euiTableHeaderCell"
@@ -420,7 +412,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent"
             >
               <span
@@ -429,7 +421,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               >
                 Type
               </span>
-            </div>
+            </span>
           </th>
           <th
             className="euiTableHeaderCell"
@@ -442,7 +434,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent"
             >
               <span
@@ -451,7 +443,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               >
                 Error message and culprit
               </span>
-            </div>
+            </span>
           </th>
           <td
             className="euiTableHeaderCell"
@@ -464,13 +456,13 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               }
             }
           >
-            <div
+            <span
               className="euiTableCellContent euiTableCellContent--alignRight"
             >
               <span
                 className="euiTableCellContent__text"
               />
-            </div>
+            </span>
           </td>
           <th
             aria-live="polite"
@@ -496,7 +488,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
               >
                 <span
                   className="euiTableCellContent__text"
-                  title="Occurrences; Sorted in descending order"
+                  title="Occurrences"
                 >
                   Occurrences
                 </span>
@@ -506,11 +498,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   size="m"
                 />
               </span>
-              <span
-                className="euiScreenReaderOnly"
-              >
-                Click to sort in ascending order
-              </span>
             </button>
           </th>
           <th
@@ -542,11 +529,6 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
                   Latest occurrence
                 </span>
               </span>
-              <span
-                className="euiScreenReaderOnly"
-              >
-                Click to sort in ascending order
-              </span>
             </button>
           </th>
         </tr>
@@ -1314,6 +1296,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="arrowLeft"
               size="m"
             />
@@ -1357,6 +1340,7 @@ exports[`ErrorGroupOverview -> List should render with data 1`] = `
             <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="arrowRight"
               size="m"
             />
diff --git a/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
index 6f7a8228db298..95ec80b1a51bc 100644
--- a/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/error_group_overview/index.tsx
@@ -7,7 +7,7 @@
 
 import {
   EuiFlexGroup,
-  EuiPage,
+  EuiFlexItem,
   EuiPanel,
   EuiSpacer,
   EuiTitle,
@@ -18,7 +18,6 @@ import { useTrackPageview } from '../../../../../observability/public';
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
 import { useErrorGroupDistributionFetcher } from '../../../hooks/use_error_group_distribution_fetcher';
 import { useFetcher } from '../../../hooks/use_fetcher';
-import { SearchBar } from '../../shared/search_bar';
 import { ErrorDistribution } from '../ErrorGroupDetails/Distribution';
 import { ErrorGroupList } from './List';
 
@@ -68,41 +67,41 @@ export function ErrorGroupOverview({ serviceName }: ErrorGroupOverviewProps) {
   useTrackPageview({ app: 'apm', path: 'error_group_overview', delay: 15000 });
 
   if (!errorDistributionData || !errorGroupListData) {
-    return <SearchBar />;
+    return null;
   }
 
   return (
-    <>
-      <SearchBar />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          <EuiPanel>
-            <ErrorDistribution
-              distribution={errorDistributionData}
-              title={i18n.translate(
-                'xpack.apm.serviceDetails.metrics.errorOccurrencesChartTitle',
-                {
-                  defaultMessage: 'Error occurrences',
-                }
-              )}
-            />
-          </EuiPanel>
+    <EuiFlexGroup direction="column" gutterSize="s">
+      <EuiFlexItem>
+        <EuiPanel>
+          <ErrorDistribution
+            distribution={errorDistributionData}
+            title={i18n.translate(
+              'xpack.apm.serviceDetails.metrics.errorOccurrencesChart.title',
+              { defaultMessage: 'Error occurrences' }
+            )}
+          />
+        </EuiPanel>
+      </EuiFlexItem>
 
+      <EuiFlexItem>
+        <EuiPanel>
+          <EuiTitle size="xs">
+            <h3>
+              {i18n.translate(
+                'xpack.apm.serviceDetails.metrics.errorsList.title',
+                { defaultMessage: 'Errors' }
+              )}
+            </h3>
+          </EuiTitle>
           <EuiSpacer size="s" />
 
-          <EuiPanel>
-            <EuiTitle size="xs">
-              <h3>Errors</h3>
-            </EuiTitle>
-            <EuiSpacer size="s" />
-
-            <ErrorGroupList
-              items={errorGroupListData.errorGroups}
-              serviceName={serviceName}
-            />
-          </EuiPanel>
-        </EuiFlexGroup>
-      </EuiPage>
-    </>
+          <ErrorGroupList
+            items={errorGroupListData.errorGroups}
+            serviceName={serviceName}
+          />
+        </EuiPanel>
+      </EuiFlexItem>
+    </EuiFlexGroup>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/service_details/index.tsx b/x-pack/plugins/apm/public/components/app/service_details/index.tsx
deleted file mode 100644
index 29bb1c04ab945..0000000000000
--- a/x-pack/plugins/apm/public/components/app/service_details/index.tsx
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiTitle } from '@elastic/eui';
-import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
-import { ApmHeader } from '../../shared/ApmHeader';
-import { ServiceIcons } from './service_icons';
-import { ServiceDetailTabs } from './service_detail_tabs';
-
-interface Props extends RouteComponentProps<{ serviceName: string }> {
-  tab: React.ComponentProps<typeof ServiceDetailTabs>['tab'];
-}
-
-export function ServiceDetails({ match, tab }: Props) {
-  const { serviceName } = match.params;
-
-  return (
-    <div>
-      <ApmHeader>
-        <EuiFlexGroup alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiTitle>
-              <h1>{serviceName}</h1>
-            </EuiTitle>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <ServiceIcons serviceName={serviceName} />
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </ApmHeader>
-      <ServiceDetailTabs serviceName={serviceName} tab={tab} />
-    </div>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_detail_tabs.tsx b/x-pack/plugins/apm/public/components/app/service_details/service_detail_tabs.tsx
deleted file mode 100644
index d360b186aba16..0000000000000
--- a/x-pack/plugins/apm/public/components/app/service_details/service_detail_tabs.tsx
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiTab } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React, { ReactNode } from 'react';
-import { EuiBetaBadge } from '@elastic/eui';
-import { EuiFlexItem } from '@elastic/eui';
-import { EuiFlexGroup } from '@elastic/eui';
-import { isJavaAgentName, isRumAgentName } from '../../../../common/agent_name';
-import { enableServiceOverview } from '../../../../common/ui_settings_keys';
-import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
-import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
-import { useUrlParams } from '../../../context/url_params_context/use_url_params';
-import { useErrorOverviewHref } from '../../shared/Links/apm/ErrorOverviewLink';
-import { useMetricOverviewHref } from '../../shared/Links/apm/MetricOverviewLink';
-import { useServiceMapHref } from '../../shared/Links/apm/ServiceMapLink';
-import { useServiceNodeOverviewHref } from '../../shared/Links/apm/ServiceNodeOverviewLink';
-import { useServiceOverviewHref } from '../../shared/Links/apm/service_overview_link';
-import { useTransactionsOverviewHref } from '../../shared/Links/apm/transaction_overview_link';
-import { useServiceProfilingHref } from '../../shared/Links/apm/service_profiling_link';
-import { MainTabs } from '../../shared/main_tabs';
-import { ErrorGroupOverview } from '../error_group_overview';
-import { ServiceMap } from '../ServiceMap';
-import { ServiceNodeOverview } from '../service_node_overview';
-import { ServiceMetrics } from '../service_metrics';
-import { ServiceOverview } from '../service_overview';
-import { TransactionOverview } from '../transaction_overview';
-import { ServiceProfiling } from '../service_profiling';
-import { Correlations } from '../correlations';
-
-interface Tab {
-  key: string;
-  href: string;
-  text: ReactNode;
-  hidden?: boolean;
-  render: () => ReactNode;
-}
-
-interface Props {
-  serviceName: string;
-  tab:
-    | 'errors'
-    | 'metrics'
-    | 'nodes'
-    | 'overview'
-    | 'service-map'
-    | 'profiling'
-    | 'transactions';
-}
-
-export function ServiceDetailTabs({ serviceName, tab }: Props) {
-  const { agentName, transactionType } = useApmServiceContext();
-  const {
-    core: { uiSettings },
-    config,
-  } = useApmPluginContext();
-  const {
-    urlParams: { latencyAggregationType },
-  } = useUrlParams();
-
-  const overviewTab = {
-    key: 'overview',
-    href: useServiceOverviewHref({ serviceName, transactionType }),
-    text: i18n.translate('xpack.apm.serviceDetails.overviewTabLabel', {
-      defaultMessage: 'Overview',
-    }),
-    render: () => (
-      <ServiceOverview agentName={agentName} serviceName={serviceName} />
-    ),
-  };
-
-  const transactionsTab = {
-    key: 'transactions',
-    href: useTransactionsOverviewHref({
-      serviceName,
-      latencyAggregationType,
-      transactionType,
-    }),
-    text: i18n.translate('xpack.apm.serviceDetails.transactionsTabLabel', {
-      defaultMessage: 'Transactions',
-    }),
-    render: () => <TransactionOverview serviceName={serviceName} />,
-  };
-
-  const errorsTab = {
-    key: 'errors',
-    href: useErrorOverviewHref(serviceName),
-    text: i18n.translate('xpack.apm.serviceDetails.errorsTabLabel', {
-      defaultMessage: 'Errors',
-    }),
-    render: () => {
-      return <ErrorGroupOverview serviceName={serviceName} />;
-    },
-  };
-
-  const serviceMapTab = {
-    key: 'service-map',
-    href: useServiceMapHref(serviceName),
-    text: i18n.translate('xpack.apm.home.serviceMapTabLabel', {
-      defaultMessage: 'Service Map',
-    }),
-    render: () => <ServiceMap serviceName={serviceName} />,
-  };
-
-  const nodesListTab = {
-    key: 'nodes',
-    href: useServiceNodeOverviewHref(serviceName),
-    text: i18n.translate('xpack.apm.serviceDetails.nodesTabLabel', {
-      defaultMessage: 'JVMs',
-    }),
-    render: () => <ServiceNodeOverview serviceName={serviceName} />,
-  };
-
-  const metricsTab = {
-    key: 'metrics',
-    href: useMetricOverviewHref(serviceName),
-    text: i18n.translate('xpack.apm.serviceDetails.metricsTabLabel', {
-      defaultMessage: 'Metrics',
-    }),
-    render: () =>
-      agentName ? (
-        <ServiceMetrics agentName={agentName} serviceName={serviceName} />
-      ) : null,
-  };
-
-  const profilingTab = {
-    key: 'profiling',
-    href: useServiceProfilingHref({ serviceName }),
-    hidden: !config.profilingEnabled,
-    text: (
-      <EuiFlexGroup direction="row" gutterSize="s">
-        <EuiFlexItem>
-          {i18n.translate('xpack.apm.serviceDetails.profilingTabLabel', {
-            defaultMessage: 'Profiling',
-          })}
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiBetaBadge
-            label={i18n.translate(
-              'xpack.apm.serviceDetails.profilingTabExperimentalLabel',
-              {
-                defaultMessage: 'Experimental',
-              }
-            )}
-            tooltipContent={i18n.translate(
-              'xpack.apm.serviceDetails.profilingTabExperimentalDescription',
-              {
-                defaultMessage:
-                  'Profiling is highly experimental and for internal use only.',
-              }
-            )}
-          />
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    ),
-    render: () => <ServiceProfiling serviceName={serviceName} />,
-  };
-
-  const tabs: Tab[] = [transactionsTab, errorsTab];
-
-  if (uiSettings.get(enableServiceOverview)) {
-    tabs.unshift(overviewTab);
-  }
-
-  if (isJavaAgentName(agentName)) {
-    tabs.push(nodesListTab);
-  } else if (agentName && !isRumAgentName(agentName)) {
-    tabs.push(metricsTab);
-  }
-
-  tabs.push(serviceMapTab, profilingTab);
-
-  const selectedTab = tabs.find((serviceTab) => serviceTab.key === tab);
-
-  return (
-    <>
-      <MainTabs>
-        {tabs
-          .filter((t) => !t.hidden)
-          .map(({ href, key, text }) => (
-            <EuiTab
-              data-test-subj={`tab_${key}`}
-              href={href}
-              isSelected={key === tab}
-              key={key}
-            >
-              {text}
-            </EuiTab>
-          ))}
-        <div style={{ marginLeft: 'auto' }}>
-          <Correlations />
-        </div>
-      </MainTabs>
-      {selectedTab ? selectedTab.render() : null}
-    </>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.test.tsx b/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.test.tsx
deleted file mode 100644
index 6027e8b1d07c5..0000000000000
--- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.test.tsx
+++ /dev/null
@@ -1,248 +0,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 { fireEvent, render } from '@testing-library/react';
-import { CoreStart } from 'kibana/public';
-import { merge } from 'lodash';
-// import { renderWithTheme } from '../../../../utils/testHelpers';
-import React, { ReactNode } from 'react';
-import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
-import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
-import { ApmPluginContextValue } from '../../../../context/apm_plugin/apm_plugin_context';
-import {
-  mockApmPluginContextValue,
-  MockApmPluginContextWrapper,
-} 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';
-
-const KibanaReactContext = createKibanaReactContext({
-  usageCollection: { reportUiCounter: () => {} },
-} as Partial<CoreStart>);
-
-const addWarning = jest.fn();
-const httpGet = jest.fn();
-
-function Wrapper({ children }: { children?: ReactNode }) {
-  const mockPluginContext = (merge({}, mockApmPluginContextValue, {
-    core: { http: { get: httpGet }, notifications: { toasts: { addWarning } } },
-  }) as unknown) as ApmPluginContextValue;
-
-  return (
-    <KibanaReactContext.Provider>
-      <MockApmPluginContextWrapper value={mockPluginContext}>
-        <MockUrlParamsContextProvider
-          params={{
-            rangeFrom: 'now-15m',
-            rangeTo: 'now',
-            start: 'mystart',
-            end: 'myend',
-          }}
-        >
-          {children}
-        </MockUrlParamsContextProvider>
-      </MockApmPluginContextWrapper>
-    </KibanaReactContext.Provider>
-  );
-}
-
-describe('ServiceIcons', () => {
-  describe('icons', () => {
-    it('Shows loading spinner while fetching data', () => {
-      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
-        data: undefined,
-        status: fetcherHook.FETCH_STATUS.LOADING,
-        refetch: jest.fn(),
-      });
-      const { getByTestId, queryAllByTestId } = render(
-        <Wrapper>
-          <EuiThemeProvider>
-            <ServiceIcons serviceName="foo" />
-          </EuiThemeProvider>
-        </Wrapper>
-      );
-      expect(getByTestId('loading')).toBeInTheDocument();
-      expect(queryAllByTestId('service')).toHaveLength(0);
-      expect(queryAllByTestId('container')).toHaveLength(0);
-      expect(queryAllByTestId('cloud')).toHaveLength(0);
-    });
-    it("doesn't show any icons", () => {
-      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
-        data: {},
-        status: fetcherHook.FETCH_STATUS.SUCCESS,
-        refetch: jest.fn(),
-      });
-
-      const { queryAllByTestId } = render(
-        <Wrapper>
-          <EuiThemeProvider>
-            <ServiceIcons serviceName="foo" />
-          </EuiThemeProvider>
-        </Wrapper>
-      );
-      expect(queryAllByTestId('loading')).toHaveLength(0);
-      expect(queryAllByTestId('service')).toHaveLength(0);
-      expect(queryAllByTestId('container')).toHaveLength(0);
-      expect(queryAllByTestId('cloud')).toHaveLength(0);
-    });
-    it('shows service icon', () => {
-      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
-        data: {
-          agentName: 'java',
-        },
-        status: fetcherHook.FETCH_STATUS.SUCCESS,
-        refetch: jest.fn(),
-      });
-
-      const { queryAllByTestId, getByTestId } = render(
-        <Wrapper>
-          <EuiThemeProvider>
-            <ServiceIcons serviceName="foo" />
-          </EuiThemeProvider>
-        </Wrapper>
-      );
-      expect(queryAllByTestId('loading')).toHaveLength(0);
-      expect(getByTestId('service')).toBeInTheDocument();
-      expect(queryAllByTestId('container')).toHaveLength(0);
-      expect(queryAllByTestId('cloud')).toHaveLength(0);
-    });
-    it('shows service and container icons', () => {
-      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
-        data: {
-          agentName: 'java',
-          containerType: 'Kubernetes',
-        },
-        status: fetcherHook.FETCH_STATUS.SUCCESS,
-        refetch: jest.fn(),
-      });
-
-      const { queryAllByTestId, getByTestId } = render(
-        <Wrapper>
-          <EuiThemeProvider>
-            <ServiceIcons serviceName="foo" />
-          </EuiThemeProvider>
-        </Wrapper>
-      );
-      expect(queryAllByTestId('loading')).toHaveLength(0);
-      expect(queryAllByTestId('cloud')).toHaveLength(0);
-      expect(getByTestId('service')).toBeInTheDocument();
-      expect(getByTestId('container')).toBeInTheDocument();
-    });
-    it('shows service, container and cloud icons', () => {
-      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
-        data: {
-          agentName: 'java',
-          containerType: 'Kubernetes',
-          cloudProvider: 'gcp',
-        },
-        status: fetcherHook.FETCH_STATUS.SUCCESS,
-        refetch: jest.fn(),
-      });
-
-      const { queryAllByTestId, getByTestId } = render(
-        <Wrapper>
-          <EuiThemeProvider>
-            <ServiceIcons serviceName="foo" />
-          </EuiThemeProvider>
-        </Wrapper>
-      );
-      expect(queryAllByTestId('loading')).toHaveLength(0);
-      expect(getByTestId('service')).toBeInTheDocument();
-      expect(getByTestId('container')).toBeInTheDocument();
-      expect(getByTestId('cloud')).toBeInTheDocument();
-    });
-  });
-
-  describe('details', () => {
-    const callApmApi = (apisMockData: Record<string, object>) => ({
-      endpoint,
-    }: {
-      endpoint: string;
-    }) => {
-      return apisMockData[endpoint];
-    };
-    it('Shows loading spinner while fetching data', () => {
-      const apisMockData = {
-        'GET /api/apm/services/{serviceName}/metadata/icons': {
-          data: {
-            agentName: 'java',
-            containerType: 'Kubernetes',
-            cloudProvider: 'gcp',
-          },
-          status: fetcherHook.FETCH_STATUS.SUCCESS,
-          refetch: jest.fn(),
-        },
-        'GET /api/apm/services/{serviceName}/metadata/details': {
-          data: undefined,
-          status: fetcherHook.FETCH_STATUS.LOADING,
-          refetch: jest.fn(),
-        },
-      };
-      jest
-        .spyOn(fetcherHook, 'useFetcher')
-        .mockImplementation((func: Function, deps: string[]) => {
-          return func(callApmApi(apisMockData)) || {};
-        });
-
-      const { queryAllByTestId, getByTestId } = render(
-        <Wrapper>
-          <EuiThemeProvider>
-            <ServiceIcons serviceName="foo" />
-          </EuiThemeProvider>
-        </Wrapper>
-      );
-      expect(queryAllByTestId('loading')).toHaveLength(0);
-      expect(getByTestId('service')).toBeInTheDocument();
-      expect(getByTestId('container')).toBeInTheDocument();
-      expect(getByTestId('cloud')).toBeInTheDocument();
-      fireEvent.click(getByTestId('popover_Service'));
-      expect(getByTestId('loading-content')).toBeInTheDocument();
-    });
-
-    it('shows service content', () => {
-      const apisMockData = {
-        'GET /api/apm/services/{serviceName}/metadata/icons': {
-          data: {
-            agentName: 'java',
-            containerType: 'Kubernetes',
-            cloudProvider: 'gcp',
-          },
-          status: fetcherHook.FETCH_STATUS.SUCCESS,
-          refetch: jest.fn(),
-        },
-        'GET /api/apm/services/{serviceName}/metadata/details': {
-          data: { service: { versions: ['v1.0.0'] } },
-          status: fetcherHook.FETCH_STATUS.SUCCESS,
-          refetch: jest.fn(),
-        },
-      };
-      jest
-        .spyOn(fetcherHook, 'useFetcher')
-        .mockImplementation((func: Function, deps: string[]) => {
-          return func(callApmApi(apisMockData)) || {};
-        });
-
-      const { queryAllByTestId, getByTestId, getByText } = render(
-        <Wrapper>
-          <EuiThemeProvider>
-            <ServiceIcons serviceName="foo" />
-          </EuiThemeProvider>
-        </Wrapper>
-      );
-      expect(queryAllByTestId('loading')).toHaveLength(0);
-      expect(getByTestId('service')).toBeInTheDocument();
-      expect(getByTestId('container')).toBeInTheDocument();
-      expect(getByTestId('cloud')).toBeInTheDocument();
-
-      fireEvent.click(getByTestId('popover_Service'));
-      expect(queryAllByTestId('loading-content')).toHaveLength(0);
-      expect(getByText('Service')).toBeInTheDocument();
-      expect(getByText('v1.0.0')).toBeInTheDocument();
-    });
-  });
-});
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.tsx b/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.tsx
deleted file mode 100644
index f7bed4e09a696..0000000000000
--- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/index.tsx
+++ /dev/null
@@ -1,192 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import React, { ReactChild, useState } from 'react';
-import { useApmServiceContext } from '../../../../context/apm_service/use_apm_service_context';
-import { useTheme } from '../../../../hooks/use_theme';
-import { ContainerType } from '../../../../../common/service_metadata';
-import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { FETCH_STATUS, useFetcher } from '../../../../hooks/use_fetcher';
-import { getAgentIcon } from '../../../shared/AgentIcon/get_agent_icon';
-import { CloudDetails } from './cloud_details';
-import { ContainerDetails } from './container_details';
-import { IconPopover } from './icon_popover';
-import { ServiceDetails } from './service_details';
-import { AlertDetails } from './alert_details';
-
-interface Props {
-  serviceName: string;
-}
-
-const cloudIcons: Record<string, string> = {
-  gcp: 'logoGCP',
-  aws: 'logoAWS',
-  azure: 'logoAzure',
-};
-
-export function getCloudIcon(provider?: string) {
-  if (provider) {
-    return cloudIcons[provider];
-  }
-}
-
-export function getContainerIcon(container?: ContainerType) {
-  if (!container) {
-    return;
-  }
-  switch (container) {
-    case 'Kubernetes':
-      return 'logoKubernetes';
-    default:
-      return 'logoDocker';
-  }
-}
-
-type Icons = 'service' | 'container' | 'cloud' | 'alerts';
-
-interface PopoverItem {
-  key: Icons;
-  icon: {
-    type?: string;
-    color?: string;
-    size?: 's' | 'm' | 'l';
-  };
-  isVisible: boolean;
-  title: string;
-  component: ReactChild;
-}
-
-export function ServiceIcons({ serviceName }: Props) {
-  const {
-    urlParams: { start, end },
-  } = useUrlParams();
-  const [
-    selectedIconPopover,
-    setSelectedIconPopover,
-  ] = useState<Icons | null>();
-
-  const theme = useTheme();
-
-  const { alerts } = useApmServiceContext();
-
-  const { data: icons, status: iconsFetchStatus } = useFetcher(
-    (callApmApi) => {
-      if (serviceName && start && end) {
-        return callApmApi({
-          endpoint: 'GET /api/apm/services/{serviceName}/metadata/icons',
-          params: {
-            path: { serviceName },
-            query: { start, end },
-          },
-        });
-      }
-    },
-    [serviceName, start, end]
-  );
-
-  const { data: details, status: detailsFetchStatus } = useFetcher(
-    (callApmApi) => {
-      if (selectedIconPopover && serviceName && start && end) {
-        return callApmApi({
-          isCachable: true,
-          endpoint: 'GET /api/apm/services/{serviceName}/metadata/details',
-          params: {
-            path: { serviceName },
-            query: { start, end },
-          },
-        });
-      }
-    },
-    [selectedIconPopover, serviceName, start, end]
-  );
-
-  const isLoading = !icons && iconsFetchStatus === FETCH_STATUS.LOADING;
-
-  if (isLoading) {
-    return <EuiLoadingSpinner data-test-subj="loading" />;
-  }
-
-  const popoverItems: PopoverItem[] = [
-    {
-      key: 'service',
-      icon: {
-        type: getAgentIcon(icons?.agentName, theme.darkMode) || 'node',
-      },
-      isVisible: !!icons?.agentName,
-      title: i18n.translate('xpack.apm.serviceIcons.service', {
-        defaultMessage: 'Service',
-      }),
-      component: <ServiceDetails service={details?.service} />,
-    },
-    {
-      key: 'container',
-      icon: {
-        type: getContainerIcon(icons?.containerType),
-      },
-      isVisible: !!icons?.containerType,
-      title: i18n.translate('xpack.apm.serviceIcons.container', {
-        defaultMessage: 'Container',
-      }),
-      component: <ContainerDetails container={details?.container} />,
-    },
-    {
-      key: 'cloud',
-      icon: {
-        type: getCloudIcon(icons?.cloudProvider),
-      },
-      isVisible: !!icons?.cloudProvider,
-      title: i18n.translate('xpack.apm.serviceIcons.cloud', {
-        defaultMessage: 'Cloud',
-      }),
-      component: <CloudDetails cloud={details?.cloud} />,
-    },
-    {
-      key: 'alerts',
-      icon: {
-        type: 'bell',
-        color: theme.eui.euiColorDanger,
-        size: 'm',
-      },
-      isVisible: alerts.length > 0,
-      title: i18n.translate('xpack.apm.serviceIcons.alerts', {
-        defaultMessage: 'Alerts',
-      }),
-      component: <AlertDetails alerts={alerts} />,
-    },
-  ];
-
-  return (
-    <EuiFlexGroup gutterSize="s" responsive={false}>
-      {popoverItems.map((item) => {
-        if (item.isVisible) {
-          return (
-            <EuiFlexItem grow={false} data-test-subj={item.key} key={item.key}>
-              <IconPopover
-                isOpen={selectedIconPopover === item.key}
-                icon={item.icon}
-                detailsFetchStatus={detailsFetchStatus}
-                title={item.title}
-                onClick={() => {
-                  setSelectedIconPopover((prevSelectedIconPopover) =>
-                    item.key === prevSelectedIconPopover ? null : item.key
-                  );
-                }}
-                onClose={() => {
-                  setSelectedIconPopover(null);
-                }}
-              >
-                {item.component}
-              </IconPopover>
-            </EuiFlexItem>
-          );
-        }
-      })}
-    </EuiFlexGroup>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/app/service_inventory/ServiceList/service_list.test.tsx b/x-pack/plugins/apm/public/components/app/service_inventory/ServiceList/service_list.test.tsx
index 323138bca139e..e09ddac525db0 100644
--- a/x-pack/plugins/apm/public/components/app/service_inventory/ServiceList/service_list.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_inventory/ServiceList/service_list.test.tsx
@@ -82,9 +82,7 @@ describe('ServiceList', () => {
         wrapper: Wrapper,
       });
 
-      expect(
-        await findByTitle('Throughput; Sorted in descending order')
-      ).toBeInTheDocument();
+      expect(await findByTitle('Throughput')).toBeInTheDocument();
     });
   });
 
@@ -100,9 +98,7 @@ describe('ServiceList', () => {
         { wrapper: Wrapper }
       );
 
-      expect(
-        await findByTitle('Health; Sorted in descending order')
-      ).toBeInTheDocument();
+      expect(await findByTitle('Health')).toBeInTheDocument();
     });
   });
 });
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 9c4728488d96a..e4a0ef3ef09f1 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
@@ -5,13 +5,7 @@
  * 2.0.
  */
 
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiLink,
-  EuiPage,
-  EuiPanel,
-} from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiLink } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useEffect } from 'react';
 import { toMountPoint } from '../../../../../../../src/plugins/kibana_react/public';
@@ -126,28 +120,24 @@ export function ServiceInventory() {
   return (
     <>
       <SearchBar />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          {displayMlCallout ? (
-            <EuiFlexItem>
-              <MLCallout onDismiss={() => setUserHasDismissedCallout(true)} />
-            </EuiFlexItem>
-          ) : null}
+      <EuiFlexGroup direction="column" gutterSize="s">
+        {displayMlCallout && (
           <EuiFlexItem>
-            <EuiPanel>
-              <ServiceList
-                items={servicesData.items}
-                noItemsMessage={
-                  <NoServicesMessage
-                    historicalDataFound={servicesData.hasHistoricalData}
-                    status={servicesStatus}
-                  />
-                }
-              />
-            </EuiPanel>
+            <MLCallout onDismiss={() => setUserHasDismissedCallout(true)} />
           </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiPage>
+        )}
+        <EuiFlexItem>
+          <ServiceList
+            items={servicesData.items}
+            noItemsMessage={
+              <NoServicesMessage
+                historicalDataFound={servicesData.hasHistoricalData}
+                status={servicesStatus}
+              />
+            }
+          />
+        </EuiFlexItem>
+      </EuiFlexGroup>
     </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/Controls.test.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Controls.test.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Controls.test.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Controls.tsx b/x-pack/plugins/apm/public/components/app/service_map/Controls.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Controls.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Controls.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx b/x-pack/plugins/apm/public/components/app/service_map/Cytoscape.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Cytoscape.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Cytoscape.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/EmptyBanner.tsx b/x-pack/plugins/apm/public/components/app/service_map/EmptyBanner.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/EmptyBanner.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/EmptyBanner.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/AnomalyDetection.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/AnomalyDetection.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/AnomalyDetection.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/AnomalyDetection.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/Buttons.test.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.test.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/Buttons.test.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/Buttons.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Buttons.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/Buttons.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/Contents.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Contents.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/Contents.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Info.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/Info.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Info.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/Info.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/Popover.stories.tsx
similarity index 97%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/Popover.stories.tsx
index ac1846155569a..fe3922060533a 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/Popover.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/Popover/Popover.stories.tsx
@@ -13,11 +13,11 @@ import { MockApmPluginContextWrapper } from '../../../../context/apm_plugin/mock
 import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
 import { createCallApmApi } from '../../../../services/rest/createCallApmApi';
 import { CytoscapeContext } from '../Cytoscape';
-import { Popover } from './';
+import { Popover } from '.';
 import exampleGroupedConnectionsData from '../__stories__/example_grouped_connections.json';
 
 export default {
-  title: 'app/ServiceMap/Popover',
+  title: 'app/service_map/Popover',
   component: Popover,
   decorators: [
     (Story: ComponentType) => {
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsFetcher.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/ServiceStatsFetcher.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsFetcher.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/ServiceStatsFetcher.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsList.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/ServiceStatsList.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/ServiceStatsList.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/ServiceStatsList.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/index.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/index.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/index.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/service_stats_list.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/Popover/service_stats_list.stories.tsx
similarity index 96%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/Popover/service_stats_list.stories.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/Popover/service_stats_list.stories.tsx
index a8f004a7295d9..83f0a3ea7e4b9 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/Popover/service_stats_list.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/Popover/service_stats_list.stories.tsx
@@ -10,7 +10,7 @@ import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_rea
 import { ServiceStatsList } from './ServiceStatsList';
 
 export default {
-  title: 'app/ServiceMap/Popover/ServiceStatsList',
+  title: 'app/service_map/Popover/ServiceStatsList',
   component: ServiceStatsList,
   decorators: [
     (Story: ComponentType) => (
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/Cytoscape.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/__stories__/Cytoscape.stories.tsx
similarity index 99%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/Cytoscape.stories.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/Cytoscape.stories.tsx
index 37644c084815e..c3f3c09e10e4f 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/Cytoscape.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/__stories__/Cytoscape.stories.tsx
@@ -14,7 +14,7 @@ import { iconForNode } from '../icons';
 import { Centerer } from './centerer';
 
 export default {
-  title: 'app/ServiceMap/Cytoscape',
+  title: 'app/service_map/Cytoscape',
   component: Cytoscape,
   decorators: [
     (Story: ComponentType) => (
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/centerer.tsx b/x-pack/plugins/apm/public/components/app/service_map/__stories__/centerer.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/centerer.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/centerer.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/cytoscape_example_data.stories.tsx b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
similarity index 98%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/cytoscape_example_data.stories.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
index 41eecb9181a2c..84351d5716edb 100644
--- a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/cytoscape_example_data.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_map/__stories__/cytoscape_example_data.stories.tsx
@@ -25,7 +25,7 @@ import exampleResponseOpbeansBeats from './example_response_opbeans_beats.json';
 import exampleResponseTodo from './example_response_todo.json';
 import { generateServiceMapElements } from './generate_service_map_elements';
 
-const STORYBOOK_PATH = 'app/ServiceMap/Cytoscape/Example data';
+const STORYBOOK_PATH = 'app/service_map/Cytoscape/Example data';
 
 const SESSION_STORAGE_KEY = `${STORYBOOK_PATH}/pre-loaded map`;
 function getSessionJson() {
@@ -40,7 +40,7 @@ function getHeight() {
 }
 
 export default {
-  title: 'app/ServiceMap/Cytoscape/Example data',
+  title: 'app/service_map/Cytoscape/Example data',
   component: Cytoscape,
   decorators: [
     (Story: ComponentType) => (
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_grouped_connections.json b/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_grouped_connections.json
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_grouped_connections.json
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/example_grouped_connections.json
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_hipster_store.json b/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_hipster_store.json
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_hipster_store.json
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_hipster_store.json
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json b/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_opbeans_beats.json
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_opbeans_beats.json
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_opbeans_beats.json
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_todo.json b/x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_todo.json
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/example_response_todo.json
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/example_response_todo.json
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/generate_service_map_elements.ts b/x-pack/plugins/apm/public/components/app/service_map/__stories__/generate_service_map_elements.ts
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/__stories__/generate_service_map_elements.ts
rename to x-pack/plugins/apm/public/components/app/service_map/__stories__/generate_service_map_elements.ts
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/cytoscape_options.ts b/x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/cytoscape_options.ts
rename to x-pack/plugins/apm/public/components/app/service_map/cytoscape_options.ts
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/empty_banner.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/empty_banner.test.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/empty_banner.test.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/empty_banner.test.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/empty_prompt.tsx b/x-pack/plugins/apm/public/components/app/service_map/empty_prompt.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/empty_prompt.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/empty_prompt.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/icons.ts b/x-pack/plugins/apm/public/components/app/service_map/icons.ts
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/icons.ts
rename to x-pack/plugins/apm/public/components/app/service_map/icons.ts
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
new file mode 100644
index 0000000000000..f68d8e46f66e3
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/service_map/index.test.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render } from '@testing-library/react';
+import { createMemoryHistory } from 'history';
+import { CoreStart } from 'kibana/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 { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
+import { LicenseContext } from '../../../context/license/license_context';
+import * as useFetcherModule from '../../../hooks/use_fetcher';
+import { ServiceMap } from '.';
+import { UrlParamsProvider } from '../../../context/url_params_context/url_params_context';
+import { Router } from 'react-router-dom';
+
+const history = createMemoryHistory();
+
+const KibanaReactContext = createKibanaReactContext({
+  usageCollection: { reportUiCounter: () => {} },
+} as Partial<CoreStart>);
+
+const activeLicense = new License({
+  signature: 'active test signature',
+  license: {
+    expiryDateInMillis: 0,
+    mode: 'platinum',
+    status: 'active',
+    type: 'platinum',
+    uid: '1',
+  },
+});
+
+const expiredLicense = new License({
+  signature: 'expired test signature',
+  license: {
+    expiryDateInMillis: 0,
+    mode: 'platinum',
+    status: 'expired',
+    type: 'platinum',
+    uid: '1',
+  },
+});
+
+function createWrapper(license: License | null) {
+  return ({ children }: { children?: ReactNode }) => {
+    return (
+      <EuiThemeProvider>
+        <KibanaReactContext.Provider>
+          <LicenseContext.Provider value={license || undefined}>
+            <MockApmPluginContextWrapper>
+              <Router history={history}>
+                <UrlParamsProvider>{children}</UrlParamsProvider>
+              </Router>
+            </MockApmPluginContextWrapper>
+          </LicenseContext.Provider>
+        </KibanaReactContext.Provider>
+      </EuiThemeProvider>
+    );
+  };
+}
+
+describe('ServiceMap', () => {
+  describe('with no license', () => {
+    it('renders null', async () => {
+      expect(
+        await render(<ServiceMap />, {
+          wrapper: createWrapper(null),
+        }).queryByTestId('ServiceMap')
+      ).not.toBeInTheDocument();
+    });
+  });
+
+  describe('with an expired license', () => {
+    it('renders the license banner', async () => {
+      expect(
+        await render(<ServiceMap />, {
+          wrapper: createWrapper(expiredLicense),
+        }).findAllByText(/Platinum/)
+      ).toHaveLength(1);
+    });
+  });
+
+  describe('with an active license', () => {
+    describe('with an empty response', () => {
+      it('renders the empty banner', async () => {
+        jest.spyOn(useFetcherModule, 'useFetcher').mockReturnValueOnce({
+          data: { elements: [] },
+          refetch: () => {},
+          status: useFetcherModule.FETCH_STATUS.SUCCESS,
+        });
+
+        expect(
+          await render(<ServiceMap />, {
+            wrapper: createWrapper(activeLicense),
+          }).findAllByText(/No services available/)
+        ).toHaveLength(1);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/app/service_map/index.tsx b/x-pack/plugins/apm/public/components/app/service_map/index.tsx
new file mode 100644
index 0000000000000..df8438c5c80a4
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/service_map/index.tsx
@@ -0,0 +1,170 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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,
+  EuiLoadingSpinner,
+  EuiPanel,
+} from '@elastic/eui';
+import React, { PropsWithChildren, ReactNode } from 'react';
+import { isActivePlatinumLicense } from '../../../../common/license_check';
+import { useTrackPageview } from '../../../../../observability/public';
+import {
+  invalidLicenseMessage,
+  SERVICE_MAP_TIMEOUT_ERROR,
+} from '../../../../common/service_map';
+import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
+import { useLicenseContext } from '../../../context/license/use_license_context';
+import { useTheme } from '../../../hooks/use_theme';
+import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { LicensePrompt } from '../../shared/license_prompt';
+import { Controls } from './Controls';
+import { Cytoscape } from './Cytoscape';
+import { getCytoscapeDivStyle } from './cytoscape_options';
+import { EmptyBanner } from './EmptyBanner';
+import { EmptyPrompt } from './empty_prompt';
+import { Popover } from './Popover';
+import { TimeoutPrompt } from './timeout_prompt';
+import { useRefDimensions } from './useRefDimensions';
+import { SearchBar } from '../../shared/search_bar';
+
+interface ServiceMapProps {
+  serviceName?: string;
+}
+
+function PromptContainer({ children }: { children: ReactNode }) {
+  return (
+    <>
+      <SearchBar showKueryBar={false} />
+      <EuiFlexGroup
+        alignItems="center"
+        justifyContent="spaceAround"
+        // Set the height to give it some top margin
+        style={{ height: '60vh' }}
+      >
+        <EuiFlexItem
+          grow={false}
+          style={{ width: 600, textAlign: 'center' as const }}
+        >
+          {children}
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </>
+  );
+}
+
+function LoadingSpinner() {
+  return (
+    <EuiLoadingSpinner
+      size="xl"
+      style={{ position: 'absolute', top: '50%', left: '50%' }}
+    />
+  );
+}
+
+export function ServiceMap({
+  serviceName,
+}: PropsWithChildren<ServiceMapProps>) {
+  const theme = useTheme();
+  const license = useLicenseContext();
+  const { urlParams } = useUrlParams();
+
+  const { data = { elements: [] }, status, error } = useFetcher(
+    (callApmApi) => {
+      // When we don't have a license or a valid license, don't make the request.
+      if (!license || !isActivePlatinumLicense(license)) {
+        return;
+      }
+
+      const { start, end, environment } = urlParams;
+      if (start && end) {
+        return callApmApi({
+          isCachable: false,
+          endpoint: 'GET /api/apm/service-map',
+          params: {
+            query: {
+              start,
+              end,
+              environment,
+              serviceName,
+            },
+          },
+        });
+      }
+    },
+    [license, serviceName, urlParams]
+  );
+
+  const { ref, height } = useRefDimensions();
+
+  // Temporary hack to work around bottom padding introduced by EuiPage
+  const PADDING_BOTTOM = 24;
+  const heightWithPadding = height - PADDING_BOTTOM;
+
+  useTrackPageview({ app: 'apm', path: 'service_map' });
+  useTrackPageview({ app: 'apm', path: 'service_map', delay: 15000 });
+
+  if (!license) {
+    return null;
+  }
+
+  if (!isActivePlatinumLicense(license)) {
+    return (
+      <PromptContainer>
+        <LicensePrompt text={invalidLicenseMessage} />
+      </PromptContainer>
+    );
+  }
+
+  if (status === FETCH_STATUS.SUCCESS && data.elements.length === 0) {
+    return (
+      <PromptContainer>
+        <EmptyPrompt />
+      </PromptContainer>
+    );
+  }
+
+  if (
+    status === FETCH_STATUS.FAILURE &&
+    error &&
+    'body' in error &&
+    error.body.statusCode === 500 &&
+    error.body.message === SERVICE_MAP_TIMEOUT_ERROR
+  ) {
+    return (
+      <PromptContainer>
+        <TimeoutPrompt isGlobalServiceMap={!serviceName} />
+      </PromptContainer>
+    );
+  }
+
+  return (
+    <>
+      <SearchBar showKueryBar={false} />
+      <EuiPanel paddingSize="none">
+        <div
+          data-test-subj="ServiceMap"
+          style={{ height: heightWithPadding }}
+          ref={ref}
+        >
+          <Cytoscape
+            elements={data.elements}
+            height={heightWithPadding}
+            serviceName={serviceName}
+            style={getCytoscapeDivStyle(theme, status)}
+          >
+            <Controls />
+            {serviceName && <EmptyBanner />}
+            {status === FETCH_STATUS.LOADING && <LoadingSpinner />}
+            <Popover focusedServiceName={serviceName} />
+          </Cytoscape>
+        </div>
+      </EuiPanel>
+    </>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/timeout_prompt.tsx b/x-pack/plugins/apm/public/components/app/service_map/timeout_prompt.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/timeout_prompt.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/timeout_prompt.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/useRefDimensions.ts b/x-pack/plugins/apm/public/components/app/service_map/useRefDimensions.ts
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/useRefDimensions.ts
rename to x-pack/plugins/apm/public/components/app/service_map/useRefDimensions.ts
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/use_cytoscape_event_handlers.test.tsx b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/use_cytoscape_event_handlers.test.tsx
rename to x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.test.tsx
diff --git a/x-pack/plugins/apm/public/components/app/ServiceMap/use_cytoscape_event_handlers.ts b/x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
similarity index 100%
rename from x-pack/plugins/apm/public/components/app/ServiceMap/use_cytoscape_event_handlers.ts
rename to x-pack/plugins/apm/public/components/app/service_map/use_cytoscape_event_handlers.ts
diff --git a/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx b/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx
index 44a5adf31d0b6..a4bc96fb2eec5 100644
--- a/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_metrics/index.tsx
@@ -5,30 +5,14 @@
  * 2.0.
  */
 
-import {
-  EuiFlexGrid,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPage,
-  EuiPanel,
-  EuiSpacer,
-} from '@elastic/eui';
+import { EuiFlexGrid, EuiFlexItem, EuiPanel, EuiSpacer } from '@elastic/eui';
 import React from 'react';
 import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context';
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
 import { useServiceMetricChartsFetcher } from '../../../hooks/use_service_metric_charts_fetcher';
 import { MetricsChart } from '../../shared/charts/metrics_chart';
-import { SearchBar } from '../../shared/search_bar';
 
-interface ServiceMetricsProps {
-  agentName: string;
-  serviceName: string;
-}
-
-export function ServiceMetrics({
-  agentName,
-  serviceName,
-}: ServiceMetricsProps) {
+export function ServiceMetrics() {
   const { urlParams } = useUrlParams();
   const { data, status } = useServiceMetricChartsFetcher({
     serviceNodeName: undefined,
@@ -36,29 +20,22 @@ export function ServiceMetrics({
   const { start, end } = urlParams;
 
   return (
-    <>
-      <SearchBar />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          <ChartPointerEventContextProvider>
-            <EuiFlexGrid columns={2} gutterSize="s">
-              {data.charts.map((chart) => (
-                <EuiFlexItem key={chart.key}>
-                  <EuiPanel>
-                    <MetricsChart
-                      start={start}
-                      end={end}
-                      chart={chart}
-                      fetchStatus={status}
-                    />
-                  </EuiPanel>
-                </EuiFlexItem>
-              ))}
-            </EuiFlexGrid>
-            <EuiSpacer size="xxl" />
-          </ChartPointerEventContextProvider>
-        </EuiFlexGroup>
-      </EuiPage>
-    </>
+    <ChartPointerEventContextProvider>
+      <EuiFlexGrid columns={2} gutterSize="s">
+        {data.charts.map((chart) => (
+          <EuiFlexItem key={chart.key}>
+            <EuiPanel>
+              <MetricsChart
+                start={start}
+                end={end}
+                chart={chart}
+                fetchStatus={status}
+              />
+            </EuiPanel>
+          </EuiFlexItem>
+        ))}
+      </EuiFlexGrid>
+      <EuiSpacer size="xxl" />
+    </ChartPointerEventContextProvider>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.test.tsx b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.test.tsx
index d9cd003042a45..8711366fdd185 100644
--- a/x-pack/plugins/apm/public/components/app/service_node_metrics/index.test.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_node_metrics/index.test.tsx
@@ -9,20 +9,17 @@ import React from 'react';
 import { shallow } from 'enzyme';
 import { ServiceNodeMetrics } from '.';
 import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-import { RouteComponentProps } from 'react-router-dom';
 
 describe('ServiceNodeMetrics', () => {
   describe('render', () => {
     it('renders', () => {
-      const props = ({} as unknown) as RouteComponentProps<{
-        serviceName: string;
-        serviceNodeName: string;
-      }>;
-
       expect(() =>
         shallow(
           <MockApmPluginContextWrapper>
-            <ServiceNodeMetrics {...props} />
+            <ServiceNodeMetrics
+              serviceName="my-service"
+              serviceNodeName="node-name"
+            />
           </MockApmPluginContextWrapper>
         )
       ).not.toThrowError();
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 186c148fa6918..5528bdaa40c41 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
@@ -10,17 +10,14 @@ import {
   EuiFlexGrid,
   EuiFlexGroup,
   EuiFlexItem,
-  EuiPage,
   EuiPanel,
   EuiSpacer,
   EuiStat,
-  EuiTitle,
   EuiToolTip,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
-import { RouteComponentProps } from 'react-router-dom';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { SERVICE_NODE_NAME_MISSING } from '../../../../common/service_nodes';
 import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context';
@@ -29,10 +26,8 @@ import { useServiceMetricChartsFetcher } from '../../../hooks/use_service_metric
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
 import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
 import { px, truncate, unit } from '../../../style/variables';
-import { ApmHeader } from '../../shared/ApmHeader';
 import { MetricsChart } from '../../shared/charts/metrics_chart';
 import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink';
-import { SearchBar } from '../../shared/search_bar';
 
 const INITIAL_DATA = {
   host: '',
@@ -44,23 +39,18 @@ const Truncate = euiStyled.span`
   ${truncate(px(unit * 12))}
 `;
 
-const MetadataFlexGroup = euiStyled(EuiFlexGroup)`
-  border-bottom: ${({ theme }) => theme.eui.euiBorderThin};
-  margin-bottom: ${({ theme }) => theme.eui.paddingSizes.m};
-  padding: ${({ theme }) =>
-    `${theme.eui.paddingSizes.m} 0 0 ${theme.eui.paddingSizes.m}`};
-`;
-
-type ServiceNodeMetricsProps = RouteComponentProps<{
+interface ServiceNodeMetricsProps {
   serviceName: string;
   serviceNodeName: string;
-}>;
+}
 
-export function ServiceNodeMetrics({ match }: ServiceNodeMetricsProps) {
+export function ServiceNodeMetrics({
+  serviceName,
+  serviceNodeName,
+}: ServiceNodeMetricsProps) {
   const {
     urlParams: { kuery, start, end },
   } = useUrlParams();
-  const { serviceName, serviceNodeName } = match.params;
   const { agentName } = useApmServiceContext();
   const { data } = useServiceMetricChartsFetcher({ serviceNodeName });
 
@@ -89,15 +79,6 @@ export function ServiceNodeMetrics({ match }: ServiceNodeMetricsProps) {
 
   return (
     <>
-      <ApmHeader>
-        <EuiFlexGroup alignItems="center">
-          <EuiFlexItem grow={false}>
-            <EuiTitle>
-              <h1>{serviceName}</h1>
-            </EuiTitle>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </ApmHeader>
       {isAggregatedData ? (
         <EuiCallOut
           title={i18n.translate(
@@ -129,78 +110,81 @@ export function ServiceNodeMetrics({ match }: ServiceNodeMetricsProps) {
           />
         </EuiCallOut>
       ) : (
-        <MetadataFlexGroup gutterSize="xl">
-          <EuiFlexItem grow={false}>
-            <EuiStat
-              titleSize="s"
-              description={i18n.translate(
-                'xpack.apm.serviceNodeMetrics.serviceName',
-                {
-                  defaultMessage: 'Service name',
+        <EuiPanel hasShadow={false}>
+          <EuiFlexGroup gutterSize="xl">
+            <EuiFlexItem grow={false}>
+              <EuiStat
+                titleSize="s"
+                description={i18n.translate(
+                  'xpack.apm.serviceNodeMetrics.serviceName',
+                  {
+                    defaultMessage: 'Service name',
+                  }
+                )}
+                title={
+                  <EuiToolTip content={serviceName}>
+                    <Truncate>{serviceName}</Truncate>
+                  </EuiToolTip>
                 }
-              )}
-              title={
-                <EuiToolTip content={serviceName}>
-                  <Truncate>{serviceName}</Truncate>
-                </EuiToolTip>
-              }
-            />
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiStat
-              titleSize="s"
-              isLoading={isLoading}
-              description={i18n.translate('xpack.apm.serviceNodeMetrics.host', {
-                defaultMessage: 'Host',
-              })}
-              title={
-                <EuiToolTip content={host}>
-                  <Truncate>{host}</Truncate>
-                </EuiToolTip>
-              }
-            />
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiStat
-              titleSize="s"
-              isLoading={isLoading}
-              description={i18n.translate(
-                'xpack.apm.serviceNodeMetrics.containerId',
-                {
-                  defaultMessage: 'Container ID',
+              />
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiStat
+                titleSize="s"
+                isLoading={isLoading}
+                description={i18n.translate(
+                  'xpack.apm.serviceNodeMetrics.host',
+                  {
+                    defaultMessage: 'Host',
+                  }
+                )}
+                title={
+                  <EuiToolTip content={host}>
+                    <Truncate>{host}</Truncate>
+                  </EuiToolTip>
                 }
-              )}
-              title={
-                <EuiToolTip content={containerId}>
-                  <Truncate>{containerId}</Truncate>
-                </EuiToolTip>
-              }
-            />
-          </EuiFlexItem>
-        </MetadataFlexGroup>
+              />
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiStat
+                titleSize="s"
+                isLoading={isLoading}
+                description={i18n.translate(
+                  'xpack.apm.serviceNodeMetrics.containerId',
+                  {
+                    defaultMessage: 'Container ID',
+                  }
+                )}
+                title={
+                  <EuiToolTip content={containerId}>
+                    <Truncate>{containerId}</Truncate>
+                  </EuiToolTip>
+                }
+              />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiPanel>
+      )}
+
+      {agentName && (
+        <ChartPointerEventContextProvider>
+          <EuiFlexGrid columns={2} gutterSize="s">
+            {data.charts.map((chart) => (
+              <EuiFlexItem key={chart.key}>
+                <EuiPanel>
+                  <MetricsChart
+                    start={start}
+                    end={end}
+                    chart={chart}
+                    fetchStatus={status}
+                  />
+                </EuiPanel>
+              </EuiFlexItem>
+            ))}
+          </EuiFlexGrid>
+          <EuiSpacer size="xxl" />
+        </ChartPointerEventContextProvider>
       )}
-      <SearchBar />
-      <EuiPage>
-        {agentName && (
-          <ChartPointerEventContextProvider>
-            <EuiFlexGrid columns={2} gutterSize="s">
-              {data.charts.map((chart) => (
-                <EuiFlexItem key={chart.key}>
-                  <EuiPanel>
-                    <MetricsChart
-                      start={start}
-                      end={end}
-                      chart={chart}
-                      fetchStatus={status}
-                    />
-                  </EuiPanel>
-                </EuiFlexItem>
-              ))}
-            </EuiFlexGrid>
-            <EuiSpacer size="xxl" />
-          </ChartPointerEventContextProvider>
-        )}
-      </EuiPage>
     </>
   );
 }
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 3d284de621ea3..1a432f90f1e3a 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
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { EuiFlexGroup, EuiPage, EuiPanel, EuiToolTip } from '@elastic/eui';
+import { EuiToolTip } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
@@ -22,7 +22,6 @@ import { useFetcher } from '../../../hooks/use_fetcher';
 import { px, truncate, unit } from '../../../style/variables';
 import { ServiceNodeMetricOverviewLink } from '../../shared/Links/apm/ServiceNodeMetricOverviewLink';
 import { ITableColumn, ManagedTable } from '../../shared/ManagedTable';
-import { SearchBar } from '../../shared/search_bar';
 
 const INITIAL_PAGE_SIZE = 25;
 const INITIAL_SORT_FIELD = 'cpu';
@@ -143,28 +142,16 @@ function ServiceNodeOverview({ serviceName }: ServiceNodeOverviewProps) {
   ];
 
   return (
-    <>
-      <SearchBar />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          <EuiPanel>
-            <ManagedTable
-              noItemsMessage={i18n.translate(
-                'xpack.apm.jvmsTable.noJvmsLabel',
-                {
-                  defaultMessage: 'No JVMs were found',
-                }
-              )}
-              items={items}
-              columns={columns}
-              initialPageSize={INITIAL_PAGE_SIZE}
-              initialSortField={INITIAL_SORT_FIELD}
-              initialSortDirection={INITIAL_SORT_DIRECTION}
-            />
-          </EuiPanel>
-        </EuiFlexGroup>
-      </EuiPage>
-    </>
+    <ManagedTable
+      noItemsMessage={i18n.translate('xpack.apm.jvmsTable.noJvmsLabel', {
+        defaultMessage: 'No JVMs were found',
+      })}
+      items={items}
+      columns={columns}
+      initialPageSize={INITIAL_PAGE_SIZE}
+      initialSortField={INITIAL_SORT_FIELD}
+      initialSortDirection={INITIAL_SORT_DIRECTION}
+    />
   );
 }
 
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
index cd1ced1830123..f7046d9e40138 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/index.tsx
@@ -5,17 +5,17 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiFlexItem, EuiPage, EuiPanel } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiPanel } from '@elastic/eui';
 import React from 'react';
 import { useTrackPageview } from '../../../../../observability/public';
 import { isRumAgentName } from '../../../../common/agent_name';
 import { AnnotationsContextProvider } from '../../../context/annotations/annotations_context';
+import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
 import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context';
 import { useBreakPoints } from '../../../hooks/use_break_points';
 import { LatencyChart } from '../../shared/charts/latency_chart';
 import { TransactionBreakdownChart } from '../../shared/charts/transaction_breakdown_chart';
 import { TransactionErrorRateChart } from '../../shared/charts/transaction_error_rate_chart';
-import { SearchBar } from '../../shared/search_bar';
 import { ServiceOverviewDependenciesTable } from './service_overview_dependencies_table';
 import { ServiceOverviewErrorsTable } from './service_overview_errors_table';
 import { ServiceOverviewInstancesChartAndTable } from './service_overview_instances_chart_and_table';
@@ -29,14 +29,12 @@ import { ServiceOverviewTransactionsTable } from './service_overview_transaction
 export const chartHeight = 288;
 
 interface ServiceOverviewProps {
-  agentName?: string;
   serviceName: string;
 }
 
-export function ServiceOverview({
-  agentName,
-  serviceName,
-}: ServiceOverviewProps) {
+export function ServiceOverview({ serviceName }: ServiceOverviewProps) {
+  const { agentName } = useApmServiceContext();
+
   useTrackPageview({ app: 'apm', path: 'service_overview' });
   useTrackPageview({ app: 'apm', path: 'service_overview', delay: 15000 });
 
@@ -49,89 +47,84 @@ export function ServiceOverview({
   return (
     <AnnotationsContextProvider>
       <ChartPointerEventContextProvider>
-        <SearchBar showTransactionTypeSelector showTimeComparison />
-        <EuiPage>
-          <EuiFlexGroup direction="column" gutterSize="s">
-            <EuiFlexItem>
-              <EuiPanel>
-                <LatencyChart height={200} />
-              </EuiPanel>
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiFlexGroup
-                direction={rowDirection}
-                gutterSize="s"
-                responsive={false}
-              >
+        <EuiFlexGroup direction="column" gutterSize="s">
+          <EuiFlexItem>
+            <EuiPanel>
+              <LatencyChart height={200} />
+            </EuiPanel>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiFlexGroup
+              direction={rowDirection}
+              gutterSize="s"
+              responsive={false}
+            >
+              <EuiFlexItem grow={3}>
+                <ServiceOverviewThroughputChart height={chartHeight} />
+              </EuiFlexItem>
+              <EuiFlexItem grow={7}>
+                <EuiPanel>
+                  <ServiceOverviewTransactionsTable serviceName={serviceName} />
+                </EuiPanel>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiFlexGroup
+              direction={rowDirection}
+              gutterSize="s"
+              responsive={false}
+            >
+              {!isRumAgent && (
                 <EuiFlexItem grow={3}>
-                  <ServiceOverviewThroughputChart height={chartHeight} />
+                  <TransactionErrorRateChart
+                    height={chartHeight}
+                    showAnnotations={false}
+                  />
                 </EuiFlexItem>
+              )}
+              <EuiFlexItem grow={7}>
+                <EuiPanel>
+                  <ServiceOverviewErrorsTable serviceName={serviceName} />
+                </EuiPanel>
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiFlexGroup
+              direction={rowDirection}
+              gutterSize="s"
+              responsive={false}
+            >
+              <EuiFlexItem grow={3}>
+                <TransactionBreakdownChart showAnnotations={false} />
+              </EuiFlexItem>
+              {!isRumAgent && (
                 <EuiFlexItem grow={7}>
                   <EuiPanel>
-                    <ServiceOverviewTransactionsTable
+                    <ServiceOverviewDependenciesTable
                       serviceName={serviceName}
                     />
                   </EuiPanel>
                 </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiFlexItem>
+              )}
+            </EuiFlexGroup>
+          </EuiFlexItem>
+          {!isRumAgent && (
             <EuiFlexItem>
               <EuiFlexGroup
-                direction={rowDirection}
+                direction="column"
                 gutterSize="s"
                 responsive={false}
               >
-                {!isRumAgent && (
-                  <EuiFlexItem grow={3}>
-                    <TransactionErrorRateChart
-                      height={chartHeight}
-                      showAnnotations={false}
-                    />
-                  </EuiFlexItem>
-                )}
-                <EuiFlexItem grow={7}>
-                  <EuiPanel>
-                    <ServiceOverviewErrorsTable serviceName={serviceName} />
-                  </EuiPanel>
-                </EuiFlexItem>
+                <ServiceOverviewInstancesChartAndTable
+                  chartHeight={chartHeight}
+                  serviceName={serviceName}
+                />
               </EuiFlexGroup>
             </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiFlexGroup
-                direction={rowDirection}
-                gutterSize="s"
-                responsive={false}
-              >
-                <EuiFlexItem grow={3}>
-                  <TransactionBreakdownChart showAnnotations={false} />
-                </EuiFlexItem>
-                {!isRumAgent && (
-                  <EuiFlexItem grow={7}>
-                    <EuiPanel>
-                      <ServiceOverviewDependenciesTable
-                        serviceName={serviceName}
-                      />
-                    </EuiPanel>
-                  </EuiFlexItem>
-                )}
-              </EuiFlexGroup>
-            </EuiFlexItem>
-            {!isRumAgent && (
-              <EuiFlexItem>
-                <EuiFlexGroup
-                  direction="column"
-                  gutterSize="s"
-                  responsive={false}
-                >
-                  <ServiceOverviewInstancesChartAndTable
-                    chartHeight={chartHeight}
-                    serviceName={serviceName}
-                  />
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            )}
-          </EuiFlexGroup>
-        </EuiPage>
+          )}
+        </EuiFlexGroup>
       </ChartPointerEventContextProvider>
     </AnnotationsContextProvider>
   );
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 46747e18c44af..a92efff103910 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
@@ -234,6 +234,7 @@ export function getColumns({
             anchorPosition="leftCenter"
             button={
               <EuiButtonIcon
+                aria-label="Edit"
                 data-test-subj={`instanceActionsButton_${instanceItem.serviceNodeName}`}
                 iconType="boxesHorizontal"
                 onClick={() =>
diff --git a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx
index ba1da7e6dd6eb..5c2bbd9e20c59 100644
--- a/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_overview/service_overview_instances_table/intance_details.tsx
@@ -32,10 +32,7 @@ import { pct } from '../../../../style/variables';
 import { getAgentIcon } from '../../../shared/AgentIcon/get_agent_icon';
 import { KeyValueFilterList } from '../../../shared/key_value_filter_list';
 import { pushNewItemToKueryBar } from '../../../shared/KueryBar/utils';
-import {
-  getCloudIcon,
-  getContainerIcon,
-} from '../../service_details/service_icons';
+import { getCloudIcon, getContainerIcon } from '../../../shared/service_icons';
 import { useInstanceDetailsFetcher } from './use_instance_details_fetcher';
 
 type ServiceInstanceDetails = APIReturnType<'GET /api/apm/services/{serviceName}/service_overview_instances/details/{serviceNodeName}'>;
diff --git a/x-pack/plugins/apm/public/components/app/service_profiling/index.tsx b/x-pack/plugins/apm/public/components/app/service_profiling/index.tsx
index 94391b5b2fb06..c6e1f575298c6 100644
--- a/x-pack/plugins/apm/public/components/app/service_profiling/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/service_profiling/index.tsx
@@ -4,14 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPage,
-  EuiPanel,
-  EuiTitle,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup, EuiFlexItem, EuiPanel, EuiTitle } from '@elastic/eui';
 import React, { useEffect, useState } from 'react';
 import {
   getValueTypeConfig,
@@ -20,7 +13,6 @@ import {
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
 import { useFetcher } from '../../../hooks/use_fetcher';
 import { APIReturnType } from '../../../services/rest/createCallApmApi';
-import { SearchBar } from '../../shared/search_bar';
 import { ServiceProfilingFlamegraph } from './service_profiling_flamegraph';
 import { ServiceProfilingTimeline } from './service_profiling_timeline';
 
@@ -90,54 +82,38 @@ export function ServiceProfiling({
 
   return (
     <>
-      <SearchBar />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          <EuiFlexItem grow={false}>
-            <EuiTitle size="s">
-              <h2>
-                {i18n.translate('xpack.apm.profilingOverviewTitle', {
-                  defaultMessage: 'Profiling',
-                })}
-              </h2>
-            </EuiTitle>
+      <EuiPanel>
+        <EuiFlexGroup direction="column">
+          <EuiFlexItem>
+            <ServiceProfilingTimeline
+              start={start!}
+              end={end!}
+              series={profilingTimeline}
+              onValueTypeSelect={(type) => {
+                setValueType(type);
+              }}
+              selectedValueType={valueType}
+            />
           </EuiFlexItem>
+          {valueType ? (
+            <EuiFlexItem>
+              <EuiTitle size="s">
+                <h3>{getValueTypeConfig(valueType).label}</h3>
+              </EuiTitle>
+            </EuiFlexItem>
+          ) : null}
           <EuiFlexItem>
-            <EuiPanel>
-              <EuiFlexGroup direction="column">
-                <EuiFlexItem>
-                  <ServiceProfilingTimeline
-                    start={start!}
-                    end={end!}
-                    series={profilingTimeline}
-                    onValueTypeSelect={(type) => {
-                      setValueType(type);
-                    }}
-                    selectedValueType={valueType}
-                  />
-                </EuiFlexItem>
-                {valueType ? (
-                  <EuiFlexItem>
-                    <EuiTitle size="s">
-                      <h3>{getValueTypeConfig(valueType).label}</h3>
-                    </EuiTitle>
-                  </EuiFlexItem>
-                ) : null}
-                <EuiFlexItem>
-                  <ServiceProfilingFlamegraph
-                    serviceName={serviceName}
-                    environment={environment}
-                    valueType={valueType}
-                    start={start}
-                    end={end}
-                    kuery={kuery}
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiPanel>
+            <ServiceProfilingFlamegraph
+              serviceName={serviceName}
+              environment={environment}
+              valueType={valueType}
+              start={start}
+              end={end}
+              kuery={kuery}
+            />
           </EuiFlexItem>
         </EuiFlexGroup>
-      </EuiPage>
+      </EuiPanel>
     </>
   );
 }
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 364266d277482..bf60463255d64 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
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { EuiFlexGroup, EuiPage, EuiPanel } from '@elastic/eui';
 import React from 'react';
 import { useTrackPageview } from '../../../../../observability/public';
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
@@ -50,16 +49,11 @@ export function TraceOverview() {
   return (
     <>
       <SearchBar />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          <EuiPanel>
-            <TraceList
-              items={data.items}
-              isLoading={status === FETCH_STATUS.LOADING}
-            />
-          </EuiPanel>
-        </EuiFlexGroup>
-      </EuiPage>
+
+      <TraceList
+        items={data.items}
+        isLoading={status === FETCH_STATUS.LOADING}
+      />
     </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/TransactionTabs.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/TransactionTabs.tsx
index 7f8ffb62d9e72..ae58e6f60cf09 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/TransactionTabs.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/TransactionTabs.tsx
@@ -7,7 +7,6 @@
 
 import { EuiSpacer, EuiTab, EuiTabs } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Location } from 'history';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { LogStream } from '../../../../../../infra/public';
@@ -19,7 +18,6 @@ import { WaterfallContainer } from './WaterfallContainer';
 import { IWaterfall } from './WaterfallContainer/Waterfall/waterfall_helpers/waterfall_helpers';
 
 interface Props {
-  location: Location;
   transaction: Transaction;
   urlParams: IUrlParams;
   waterfall: IWaterfall;
@@ -27,7 +25,6 @@ interface Props {
 }
 
 export function TransactionTabs({
-  location,
   transaction,
   urlParams,
   waterfall,
@@ -47,9 +44,9 @@ export function TransactionTabs({
             <EuiTab
               onClick={() => {
                 history.replace({
-                  ...location,
+                  ...history.location,
                   search: fromQuery({
-                    ...toQuery(location.search),
+                    ...toQuery(history.location.search),
                     detailTab: key,
                   }),
                 });
@@ -66,7 +63,6 @@ export function TransactionTabs({
       <EuiSpacer />
 
       <TabContent
-        location={location}
         urlParams={urlParams}
         waterfall={waterfall}
         exceedsMax={exceedsMax}
@@ -101,19 +97,16 @@ const logsTab = {
 };
 
 function TimelineTabContent({
-  location,
   urlParams,
   waterfall,
   exceedsMax,
 }: {
-  location: Location<any>;
   urlParams: IUrlParams;
   waterfall: IWaterfall;
   exceedsMax: boolean;
 }) {
   return (
     <WaterfallContainer
-      location={location}
       urlParams={urlParams}
       waterfall={waterfall}
       exceedsMax={exceedsMax}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
index 3c6b436b172d9..fddf4fcb4efc9 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/WaterfallFlyout.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { History, Location } from 'history';
+import { History } from 'history';
 import React from 'react';
 import { useHistory } from 'react-router-dom';
 import { SpanFlyout } from './SpanFlyout';
@@ -15,20 +15,12 @@ import { IWaterfall } from './waterfall_helpers/waterfall_helpers';
 interface Props {
   waterfallItemId?: string;
   waterfall: IWaterfall;
-  location: Location;
-  toggleFlyout: ({
-    history,
-    location,
-  }: {
-    history: History;
-    location: Location;
-  }) => void;
+  toggleFlyout: ({ history }: { history: History }) => void;
 }
 
 export function WaterfallFlyout({
   waterfallItemId,
   waterfall,
-  location,
   toggleFlyout,
 }: Props) {
   const history = useHistory();
@@ -52,14 +44,14 @@ export function WaterfallFlyout({
           totalDuration={waterfall.duration}
           span={currentItem.doc}
           parentTransaction={parentTransaction}
-          onClose={() => toggleFlyout({ history, location })}
+          onClose={() => toggleFlyout({ history })}
         />
       );
     case 'transaction':
       return (
         <TransactionFlyout
           transaction={currentItem.doc}
-          onClose={() => toggleFlyout({ history, location })}
+          onClose={() => toggleFlyout({ history })}
           rootTransactionDuration={
             waterfall.rootTransaction?.transaction.duration.us
           }
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx
index baced34ad3e56..b0721791081fa 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/accordion_waterfall.tsx
@@ -6,7 +6,6 @@
  */
 
 import { EuiAccordion, EuiAccordionProps } from '@elastic/eui';
-import { Location } from 'history';
 import { isEmpty } from 'lodash';
 import React, { useState } from 'react';
 import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
@@ -23,7 +22,6 @@ interface AccordionWaterfallProps {
   level: number;
   duration: IWaterfall['duration'];
   waterfallItemId?: string;
-  location: Location;
   errorsPerTransaction: IWaterfall['errorsPerTransaction'];
   childrenByParentId: Record<string, IWaterfallSpanOrTransaction[]>;
   onToggleEntryTransaction?: () => void;
@@ -100,7 +98,6 @@ export function AccordionWaterfall(props: AccordionWaterfallProps) {
     duration,
     childrenByParentId,
     waterfallItemId,
-    location,
     errorsPerTransaction,
     timelineMargins,
     onClickWaterfallItem,
@@ -160,7 +157,6 @@ export function AccordionWaterfall(props: AccordionWaterfallProps) {
           item={child}
           level={nextLevel}
           waterfallItemId={waterfallItemId}
-          location={location}
           errorsPerTransaction={errorsPerTransaction}
           duration={duration}
           childrenByParentId={childrenByParentId}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
index 4be595ac16c6c..d7613699221b4 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/Waterfall/index.tsx
@@ -7,7 +7,7 @@
 
 import { EuiButtonEmpty, EuiCallOut } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { History, Location } from 'history';
+import { History } from 'history';
 import React, { useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { euiStyled } from '../../../../../../../../../../src/plugins/kibana_react/common';
@@ -40,14 +40,12 @@ const TIMELINE_MARGINS = {
 const toggleFlyout = ({
   history,
   item,
-  location,
 }: {
   history: History;
   item?: IWaterfallItem;
-  location: Location;
 }) => {
   history.replace({
-    ...location,
+    ...history.location,
     search: fromQuery({
       ...toQuery(location.search),
       flyoutDetailTab: undefined,
@@ -63,15 +61,9 @@ const WaterfallItemsContainer = euiStyled.div`
 interface Props {
   waterfallItemId?: string;
   waterfall: IWaterfall;
-  location: Location;
   exceedsMax: boolean;
 }
-export function Waterfall({
-  waterfall,
-  exceedsMax,
-  waterfallItemId,
-  location,
-}: Props) {
+export function Waterfall({ waterfall, exceedsMax, waterfallItemId }: Props) {
   const history = useHistory();
   const [isAccordionOpen, setIsAccordionOpen] = useState(true);
   const itemContainerHeight = 58; // TODO: This is a nasty way to calculate the height of the svg element. A better approach should be found
@@ -97,13 +89,12 @@ export function Waterfall({
         item={entryWaterfallTransaction}
         level={0}
         waterfallItemId={waterfallItemId}
-        location={location}
         errorsPerTransaction={waterfall.errorsPerTransaction}
         duration={duration}
         childrenByParentId={childrenByParentId}
         timelineMargins={TIMELINE_MARGINS}
         onClickWaterfallItem={(item: IWaterfallItem) =>
-          toggleFlyout({ history, item, location })
+          toggleFlyout({ history, item })
         }
         onToggleEntryTransaction={() => setIsAccordionOpen((isOpen) => !isOpen)}
       />
@@ -148,7 +139,6 @@ export function Waterfall({
         <WaterfallFlyout
           waterfallItemId={waterfallItemId}
           waterfall={waterfall}
-          location={location}
           toggleFlyout={toggleFlyout}
         />
       </Container>
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx
index 57743590ea566..5ea2fca2dfa32 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/WaterfallContainer.stories.tsx
@@ -15,7 +15,6 @@ import { WaterfallContainer } from './index';
 import { getWaterfall } from './Waterfall/waterfall_helpers/waterfall_helpers';
 import {
   inferredSpans,
-  location,
   simpleTrace,
   traceChildStartBeforeParent,
   traceWithErrors,
@@ -45,7 +44,6 @@ export function Example() {
   );
   return (
     <WaterfallContainer
-      location={location}
       urlParams={urlParams}
       waterfall={waterfall}
       exceedsMax={false}
@@ -60,7 +58,6 @@ export function WithErrors() {
   );
   return (
     <WaterfallContainer
-      location={location}
       urlParams={urlParams}
       waterfall={waterfall}
       exceedsMax={false}
@@ -75,7 +72,6 @@ export function ChildStartsBeforeParent() {
   );
   return (
     <WaterfallContainer
-      location={location}
       urlParams={urlParams}
       waterfall={waterfall}
       exceedsMax={false}
@@ -90,7 +86,6 @@ export function InferredSpans() {
   );
   return (
     <WaterfallContainer
-      location={location}
       urlParams={urlParams}
       waterfall={waterfall}
       exceedsMax={false}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/index.tsx
index 11de1ac85c434..817e747551d95 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/WaterfallContainer/index.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import { Location } from 'history';
 import React from 'react';
 import { keyBy } from 'lodash';
 import { useParams } from 'react-router-dom';
@@ -19,13 +18,11 @@ import { WaterfallLegends } from './WaterfallLegends';
 
 interface Props {
   urlParams: IUrlParams;
-  location: Location;
   waterfall: IWaterfall;
   exceedsMax: boolean;
 }
 
 export function WaterfallContainer({
-  location,
   urlParams,
   waterfall,
   exceedsMax,
@@ -84,7 +81,6 @@ export function WaterfallContainer({
     <div>
       <WaterfallLegends legends={legendsWithFallbackLabel} type={colorBy} />
       <Waterfall
-        location={location}
         waterfallItemId={urlParams.waterfallItemId}
         waterfall={waterfall}
         exceedsMax={exceedsMax}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/index.tsx
index 88d4c53d85284..3d3ce3262f13b 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/WaterfallWithSummmary/index.tsx
@@ -15,7 +15,6 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { Location } from 'history';
 import React, { useEffect, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { APIReturnType } from '../../../../services/rest/createCallApmApi';
@@ -34,7 +33,6 @@ type DistributionBucket = DistributionApiResponse['buckets'][0];
 
 interface Props {
   urlParams: IUrlParams;
-  location: Location;
   waterfall: IWaterfall;
   exceedsMax: boolean;
   isLoading: boolean;
@@ -43,7 +41,6 @@ interface Props {
 
 export function WaterfallWithSummmary({
   urlParams,
-  location,
   waterfall,
   exceedsMax,
   isLoading,
@@ -135,7 +132,6 @@ export function WaterfallWithSummmary({
 
       <TransactionTabs
         transaction={entryTransaction}
-        location={location}
         urlParams={urlParams}
         waterfall={waterfall}
         exceedsMax={exceedsMax}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_details/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_details/index.tsx
index d6f45a4a45cc8..b9508b2d303a2 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_details/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_details/index.tsx
@@ -5,27 +5,18 @@
  * 2.0.
  */
 
-import {
-  EuiFlexGroup,
-  EuiHorizontalRule,
-  EuiPage,
-  EuiPanel,
-  EuiSpacer,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiHorizontalRule, EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
 import { flatten, isEmpty } from 'lodash';
 import React from 'react';
-import { RouteComponentProps, useHistory } from 'react-router-dom';
+import { useHistory } from 'react-router-dom';
 import { useTrackPageview } from '../../../../../observability/public';
 import { ChartPointerEventContextProvider } from '../../../context/chart_pointer_event/chart_pointer_event_context';
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
 import { FETCH_STATUS } from '../../../hooks/use_fetcher';
 import { useTransactionDistributionFetcher } from '../../../hooks/use_transaction_distribution_fetcher';
-import { ApmHeader } from '../../shared/ApmHeader';
 import { TransactionCharts } from '../../shared/charts/transaction_charts';
 import { HeightRetainer } from '../../shared/HeightRetainer';
 import { fromQuery, toQuery } from '../../shared/Links/url_helpers';
-import { SearchBar } from '../../shared/search_bar';
 import { TransactionDistribution } from './Distribution';
 import { useWaterfallFetcher } from './use_waterfall_fetcher';
 import { WaterfallWithSummmary } from './WaterfallWithSummmary';
@@ -35,12 +26,7 @@ interface Sample {
   transactionId: string;
 }
 
-type TransactionDetailsProps = RouteComponentProps<{ serviceName: string }>;
-
-export function TransactionDetails({
-  location,
-  match,
-}: TransactionDetailsProps) {
+export function TransactionDetails() {
   const { urlParams } = useUrlParams();
   const history = useHistory();
   const {
@@ -90,48 +76,43 @@ export function TransactionDetails({
 
   return (
     <>
-      <ApmHeader>
-        <EuiTitle>
-          <h1>{transactionName}</h1>
-        </EuiTitle>
-      </ApmHeader>
-      <SearchBar />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          <ChartPointerEventContextProvider>
-            <TransactionCharts />
-          </ChartPointerEventContextProvider>
-
-          <EuiHorizontalRule size="full" margin="l" />
-
-          <EuiPanel>
-            <TransactionDistribution
-              distribution={distributionData}
-              fetchStatus={distributionStatus}
-              urlParams={urlParams}
-              bucketIndex={bucketIndex}
-              onBucketClick={(bucket) => {
-                if (!isEmpty(bucket.samples)) {
-                  selectSampleFromBucketClick(bucket.samples[0]);
-                }
-              }}
-            />
-          </EuiPanel>
-
-          <EuiSpacer size="s" />
-
-          <HeightRetainer>
-            <WaterfallWithSummmary
-              location={location}
-              urlParams={urlParams}
-              waterfall={waterfall}
-              isLoading={waterfallStatus === FETCH_STATUS.LOADING}
-              exceedsMax={exceedsMax}
-              traceSamples={traceSamples}
-            />
-          </HeightRetainer>
-        </EuiFlexGroup>
-      </EuiPage>
+      <EuiTitle>
+        <h2>{transactionName}</h2>
+      </EuiTitle>
+
+      <EuiSpacer size="s" />
+
+      <ChartPointerEventContextProvider>
+        <TransactionCharts />
+      </ChartPointerEventContextProvider>
+
+      <EuiHorizontalRule size="full" margin="l" />
+
+      <EuiPanel>
+        <TransactionDistribution
+          distribution={distributionData}
+          fetchStatus={distributionStatus}
+          urlParams={urlParams}
+          bucketIndex={bucketIndex}
+          onBucketClick={(bucket) => {
+            if (!isEmpty(bucket.samples)) {
+              selectSampleFromBucketClick(bucket.samples[0]);
+            }
+          }}
+        />
+      </EuiPanel>
+
+      <EuiSpacer size="s" />
+
+      <HeightRetainer>
+        <WaterfallWithSummmary
+          urlParams={urlParams}
+          waterfall={waterfall}
+          isLoading={waterfallStatus === FETCH_STATUS.LOADING}
+          exceedsMax={exceedsMax}
+          traceSamples={traceSamples}
+        />
+      </HeightRetainer>
     </>
   );
 }
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
new file mode 100644
index 0000000000000..c6394f09b0d3c
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/app/transaction_link/index.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiEmptyPrompt } from '@elastic/eui';
+import React from 'react';
+import { Redirect, RouteComponentProps } from 'react-router-dom';
+import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
+import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { getRedirectToTransactionDetailPageUrl } from '../TraceLink/get_redirect_to_transaction_detail_page_url';
+
+const CentralizedContainer = euiStyled.div`
+  height: 100%;
+  display: flex;
+`;
+
+export function TransactionLink({
+  match,
+}: RouteComponentProps<{ transactionId: string }>) {
+  const { transactionId } = match.params;
+  const { urlParams } = useUrlParams();
+  const { rangeFrom, rangeTo } = urlParams;
+
+  const { data = { transaction: null }, status } = useFetcher(
+    (callApmApi) => {
+      if (transactionId) {
+        return callApmApi({
+          endpoint: 'GET /api/apm/transactions/{transactionId}',
+          params: {
+            path: {
+              transactionId,
+            },
+          },
+        });
+      }
+    },
+    [transactionId]
+  );
+  if (transactionId && status === FETCH_STATUS.SUCCESS) {
+    if (data.transaction) {
+      return (
+        <Redirect
+          to={getRedirectToTransactionDetailPageUrl({
+            transaction: data.transaction,
+            rangeFrom,
+            rangeTo,
+          })}
+        />
+      );
+    }
+
+    return <CentralizedContainer />;
+  }
+
+  return (
+    <CentralizedContainer>
+      <EuiEmptyPrompt
+        iconType="apmTrace"
+        title={<h2>Fetching transaction...</h2>}
+      />
+    </CentralizedContainer>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx
index 9e2743d7b5986..38066b4ecd3f7 100644
--- a/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx
+++ b/x-pack/plugins/apm/public/components/app/transaction_overview/index.tsx
@@ -8,8 +8,6 @@
 import {
   EuiCallOut,
   EuiCode,
-  EuiFlexGroup,
-  EuiPage,
   EuiPanel,
   EuiSpacer,
   EuiTitle,
@@ -26,7 +24,6 @@ import { useUrlParams } from '../../../context/url_params_context/use_url_params
 import { TransactionCharts } from '../../shared/charts/transaction_charts';
 import { ElasticDocsLink } from '../../shared/Links/ElasticDocsLink';
 import { fromQuery, toQuery } from '../../shared/Links/url_helpers';
-import { SearchBar } from '../../shared/search_bar';
 import { TransactionList } from './TransactionList';
 import { useRedirect } from './useRedirect';
 import { useTransactionListFetcher } from './use_transaction_list';
@@ -80,62 +77,55 @@ export function TransactionOverview({ serviceName }: TransactionOverviewProps) {
 
   return (
     <>
-      <SearchBar showTransactionTypeSelector />
-      <EuiPage>
-        <EuiFlexGroup direction="column" gutterSize="s">
-          <TransactionCharts />
-          <EuiSpacer size="s" />
-          <EuiPanel>
-            <EuiTitle size="xs">
-              <h3>Transactions</h3>
-            </EuiTitle>
-            <EuiSpacer size="s" />
-            {!transactionListData.isAggregationAccurate && (
-              <EuiCallOut
-                title={i18n.translate(
-                  'xpack.apm.transactionCardinalityWarning.title',
-                  {
-                    defaultMessage:
-                      'This view shows a subset of reported transactions.',
-                  }
-                )}
-                color="danger"
-                iconType="alert"
-              >
-                <p>
-                  <FormattedMessage
-                    id="xpack.apm.transactionCardinalityWarning.body"
-                    defaultMessage="The number of unique transaction names exceeds the configured value of {bucketSize}. Try reconfiguring your agents to group similar transactions or increase the value of {codeBlock}"
-                    values={{
-                      bucketSize: transactionListData.bucketSize,
-                      codeBlock: (
-                        <EuiCode>
-                          xpack.apm.ui.transactionGroupBucketSize
-                        </EuiCode>
-                      ),
-                    }}
-                  />
-
-                  <ElasticDocsLink
-                    section="/kibana"
-                    path="/troubleshooting.html#troubleshooting-too-many-transactions"
-                  >
-                    {i18n.translate(
-                      'xpack.apm.transactionCardinalityWarning.docsLink',
-                      { defaultMessage: 'Learn more in the docs' }
-                    )}
-                  </ElasticDocsLink>
-                </p>
-              </EuiCallOut>
+      <TransactionCharts />
+      <EuiSpacer size="s" />
+      <EuiPanel>
+        <EuiTitle size="xs">
+          <h3>Transactions</h3>
+        </EuiTitle>
+        <EuiSpacer size="s" />
+        {!transactionListData.isAggregationAccurate && (
+          <EuiCallOut
+            title={i18n.translate(
+              'xpack.apm.transactionCardinalityWarning.title',
+              {
+                defaultMessage:
+                  'This view shows a subset of reported transactions.',
+              }
             )}
-            <EuiSpacer size="s" />
-            <TransactionList
-              isLoading={transactionListStatus === 'loading'}
-              items={transactionListData.items || []}
-            />
-          </EuiPanel>
-        </EuiFlexGroup>
-      </EuiPage>
+            color="danger"
+            iconType="alert"
+          >
+            <p>
+              <FormattedMessage
+                id="xpack.apm.transactionCardinalityWarning.body"
+                defaultMessage="The number of unique transaction names exceeds the configured value of {bucketSize}. Try reconfiguring your agents to group similar transactions or increase the value of {codeBlock}"
+                values={{
+                  bucketSize: transactionListData.bucketSize,
+                  codeBlock: (
+                    <EuiCode>xpack.apm.ui.transactionGroupBucketSize</EuiCode>
+                  ),
+                }}
+              />
+
+              <ElasticDocsLink
+                section="/kibana"
+                path="/troubleshooting.html#troubleshooting-too-many-transactions"
+              >
+                {i18n.translate(
+                  'xpack.apm.transactionCardinalityWarning.docsLink',
+                  { defaultMessage: 'Learn more in the docs' }
+                )}
+              </ElasticDocsLink>
+            </p>
+          </EuiCallOut>
+        )}
+        <EuiSpacer size="s" />
+        <TransactionList
+          isLoading={transactionListStatus === 'loading'}
+          items={transactionListData.items || []}
+        />
+      </EuiPanel>
     </>
   );
 }
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 e4fbd07566060..9c4c2aa11a858 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { fireEvent, getByText, queryByLabelText } from '@testing-library/react';
+import { queryByLabelText } from '@testing-library/react';
 import { createMemoryHistory } from 'history';
 import { CoreStart } from 'kibana/public';
 import React from 'react';
@@ -107,46 +107,6 @@ describe('TransactionOverview', () => {
 
   const FILTER_BY_TYPE_LABEL = 'Transaction type';
 
-  describe('when transactionType is selected and multiple transaction types are given', () => {
-    it('renders a radio group with transaction types', () => {
-      const { container } = setup({
-        serviceTransactionTypes: ['firstType', 'secondType'],
-        urlParams: {
-          transactionType: 'secondType',
-        },
-      });
-
-      expect(getByText(container, 'firstType')).toBeInTheDocument();
-      expect(getByText(container, 'secondType')).toBeInTheDocument();
-
-      expect(getByText(container, 'firstType')).not.toBeNull();
-    });
-
-    it('should update the URL when a transaction type is selected', () => {
-      const { container } = setup({
-        serviceTransactionTypes: ['firstType', 'secondType'],
-        urlParams: {
-          transactionType: 'secondType',
-        },
-      });
-
-      expect(history.location.search).toEqual(
-        '?transactionType=secondType&rangeFrom=now-15m&rangeTo=now'
-      );
-      expect(getByText(container, 'firstType')).toBeInTheDocument();
-      expect(getByText(container, 'secondType')).toBeInTheDocument();
-
-      fireEvent.change(getByText(container, 'firstType').parentElement!, {
-        target: { value: 'firstType' },
-      });
-
-      expect(history.push).toHaveBeenCalled();
-      expect(history.location.search).toEqual(
-        '?transactionType=firstType&rangeFrom=now-15m&rangeTo=now'
-      );
-    });
-  });
-
   describe('when a transaction type is selected, and there are no other transaction types', () => {
     it('does not render a radio group with transaction types', () => {
       const { container } = setup({
diff --git a/x-pack/plugins/apm/public/components/routing/apm_route_config.tsx b/x-pack/plugins/apm/public/components/routing/apm_route_config.tsx
new file mode 100644
index 0000000000000..36580d38e660d
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/apm_route_config.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 { i18n } from '@kbn/i18n';
+import React from 'react';
+import { RouteComponentProps } from 'react-router-dom';
+import { getServiceNodeName } from '../../../common/service_nodes';
+import { APMRouteDefinition } from '../../application/routes';
+import { toQuery } from '../shared/Links/url_helpers';
+import { ErrorGroupDetails } from '../app/ErrorGroupDetails';
+import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
+import { ServiceNodeMetrics } from '../app/service_node_metrics';
+import { SettingsTemplate } from './templates/settings_template';
+import { AgentConfigurations } from '../app/Settings/AgentConfigurations';
+import { AnomalyDetection } from '../app/Settings/anomaly_detection';
+import { ApmIndices } from '../app/Settings/ApmIndices';
+import { CustomizeUI } from '../app/Settings/CustomizeUI';
+import { TraceLink } from '../app/TraceLink';
+import { TransactionLink } from '../app/transaction_link';
+import { TransactionDetails } from '../app/transaction_details';
+import { enableServiceOverview } from '../../../common/ui_settings_keys';
+import { redirectTo } from './redirect_to';
+import { ApmMainTemplate } from './templates/apm_main_template';
+import { ApmServiceTemplate } from './templates/apm_service_template';
+import { ServiceProfiling } from '../app/service_profiling';
+import { ErrorGroupOverview } from '../app/error_group_overview';
+import { ServiceMap } from '../app/service_map';
+import { ServiceNodeOverview } from '../app/service_node_overview';
+import { ServiceMetrics } from '../app/service_metrics';
+import { ServiceOverview } from '../app/service_overview';
+import { TransactionOverview } from '../app/transaction_overview';
+import { ServiceInventory } from '../app/service_inventory';
+import { TraceOverview } from '../app/trace_overview';
+import { useFetcher } from '../../hooks/use_fetcher';
+import { AgentConfigurationCreateEdit } from '../app/Settings/AgentConfigurations/AgentConfigurationCreateEdit';
+
+// These component function definitions are used below with the `component`
+// property of the route definitions.
+//
+// If you provide an inline function to the component prop, you would create a
+// new component every render. This results in the existing component unmounting
+// and the new component mounting instead of just updating the existing component.
+
+const ServiceInventoryTitle = i18n.translate(
+  'xpack.apm.views.serviceInventory.title',
+  { defaultMessage: 'Services' }
+);
+
+function ServiceInventoryView() {
+  return (
+    <ApmMainTemplate pageTitle={ServiceInventoryTitle}>
+      <ServiceInventory />
+    </ApmMainTemplate>
+  );
+}
+
+const TraceOverviewTitle = i18n.translate(
+  'xpack.apm.views.traceOverview.title',
+  {
+    defaultMessage: 'Traces',
+  }
+);
+
+function TraceOverviewView() {
+  return (
+    <ApmMainTemplate pageTitle={TraceOverviewTitle}>
+      <TraceOverview />
+    </ApmMainTemplate>
+  );
+}
+
+const ServiceMapTitle = i18n.translate('xpack.apm.views.serviceMap.title', {
+  defaultMessage: 'Service Map',
+});
+
+function ServiceMapView() {
+  return (
+    <ApmMainTemplate pageTitle={ServiceMapTitle}>
+      <ServiceMap />
+    </ApmMainTemplate>
+  );
+}
+
+function ServiceDetailsErrorsRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate serviceName={serviceName} selectedTab="errors">
+      <ErrorGroupOverview serviceName={serviceName} />
+    </ApmServiceTemplate>
+  );
+}
+
+function ErrorGroupDetailsRouteView(
+  props: RouteComponentProps<{ serviceName: string; groupId: string }>
+) {
+  const { serviceName, groupId } = props.match.params;
+  return (
+    <ApmServiceTemplate serviceName={serviceName} selectedTab="errors">
+      <ErrorGroupDetails serviceName={serviceName} groupId={groupId} />
+    </ApmServiceTemplate>
+  );
+}
+
+function ServiceDetailsMetricsRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate serviceName={serviceName} selectedTab="metrics">
+      <ServiceMetrics />
+    </ApmServiceTemplate>
+  );
+}
+
+function ServiceDetailsNodesRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate serviceName={serviceName} selectedTab="nodes">
+      <ServiceNodeOverview serviceName={serviceName} />
+    </ApmServiceTemplate>
+  );
+}
+
+function ServiceDetailsOverviewRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate
+      serviceName={serviceName}
+      selectedTab="overview"
+      searchBarOptions={{
+        showTransactionTypeSelector: true,
+        showTimeComparison: true,
+      }}
+    >
+      <ServiceOverview serviceName={serviceName} />
+    </ApmServiceTemplate>
+  );
+}
+
+function ServiceDetailsServiceMapRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate
+      serviceName={serviceName}
+      selectedTab="service-map"
+      searchBarOptions={{ hidden: true }}
+    >
+      <ServiceMap serviceName={serviceName} />
+    </ApmServiceTemplate>
+  );
+}
+
+function ServiceDetailsTransactionsRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate
+      serviceName={serviceName}
+      selectedTab="transactions"
+      searchBarOptions={{
+        showTransactionTypeSelector: true,
+      }}
+    >
+      <TransactionOverview serviceName={serviceName} />
+    </ApmServiceTemplate>
+  );
+}
+
+function ServiceDetailsProfilingRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate serviceName={serviceName} selectedTab="profiling">
+      <ServiceProfiling serviceName={serviceName} />
+    </ApmServiceTemplate>
+  );
+}
+
+function ServiceNodeMetricsRouteView(
+  props: RouteComponentProps<{
+    serviceName: string;
+    serviceNodeName: string;
+  }>
+) {
+  const { serviceName, serviceNodeName } = props.match.params;
+  return (
+    <ApmServiceTemplate serviceName={serviceName} selectedTab="nodes">
+      <ServiceNodeMetrics
+        serviceName={serviceName}
+        serviceNodeName={serviceNodeName}
+      />
+    </ApmServiceTemplate>
+  );
+}
+
+function TransactionDetailsRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { serviceName } = props.match.params;
+  return (
+    <ApmServiceTemplate serviceName={serviceName} selectedTab="transactions">
+      <TransactionDetails />
+    </ApmServiceTemplate>
+  );
+}
+
+function SettingsAgentConfigurationRouteView() {
+  return (
+    <SettingsTemplate selectedTab="agent-configurations">
+      <AgentConfigurations />
+    </SettingsTemplate>
+  );
+}
+
+function SettingsAnomalyDetectionRouteView() {
+  return (
+    <SettingsTemplate selectedTab="anomaly-detection">
+      <AnomalyDetection />
+    </SettingsTemplate>
+  );
+}
+
+function SettingsApmIndicesRouteView() {
+  return (
+    <SettingsTemplate selectedTab="apm-indices">
+      <ApmIndices />
+    </SettingsTemplate>
+  );
+}
+
+function SettingsCustomizeUI() {
+  return (
+    <SettingsTemplate selectedTab="customize-ui">
+      <CustomizeUI />
+    </SettingsTemplate>
+  );
+}
+
+export function EditAgentConfigurationRouteView(props: RouteComponentProps) {
+  const { search } = props.history.location;
+
+  // typescript complains because `pageStop` does not exist in `APMQueryParams`
+  // Going forward we should move away from globally declared query params and this is a first step
+  // @ts-expect-error
+  const { name, environment, pageStep } = toQuery(search);
+
+  const res = useFetcher(
+    (callApmApi) => {
+      return callApmApi({
+        endpoint: 'GET /api/apm/settings/agent-configuration/view',
+        params: { query: { name, environment } },
+      });
+    },
+    [name, environment]
+  );
+
+  return (
+    <SettingsTemplate selectedTab="agent-configurations" {...props}>
+      <AgentConfigurationCreateEdit
+        pageStep={pageStep || 'choose-settings-step'}
+        existingConfigResult={res}
+      />
+    </SettingsTemplate>
+  );
+}
+
+export function CreateAgentConfigurationRouteView(props: RouteComponentProps) {
+  const { search } = props.history.location;
+
+  // Ignoring here because we specifically DO NOT want to add the query params to the global route handler
+  // @ts-expect-error
+  const { pageStep } = toQuery(search);
+
+  return (
+    <SettingsTemplate selectedTab="agent-configurations" {...props}>
+      <AgentConfigurationCreateEdit
+        pageStep={pageStep || 'choose-service-step'}
+      />
+    </SettingsTemplate>
+  );
+}
+
+const SettingsApmIndicesTitle = i18n.translate(
+  'xpack.apm.views.settings.indices.title',
+  { defaultMessage: 'Indices' }
+);
+
+const SettingsAgentConfigurationTitle = i18n.translate(
+  'xpack.apm.views.settings.agentConfiguration.title',
+  { defaultMessage: 'Agent Configuration' }
+);
+const CreateAgentConfigurationTitle = i18n.translate(
+  'xpack.apm.views.settings.createAgentConfiguration.title',
+  { defaultMessage: 'Create Agent Configuration' }
+);
+const EditAgentConfigurationTitle = i18n.translate(
+  'xpack.apm.views.settings.editAgentConfiguration.title',
+  { defaultMessage: 'Edit Agent Configuration' }
+);
+const SettingsCustomizeUITitle = i18n.translate(
+  'xpack.apm.views.settings.customizeUI.title',
+  { defaultMessage: 'Customize app' }
+);
+const SettingsAnomalyDetectionTitle = i18n.translate(
+  'xpack.apm.views.settings.anomalyDetection.title',
+  { defaultMessage: 'Anomaly detection' }
+);
+const SettingsTitle = i18n.translate('xpack.apm.views.listSettings.title', {
+  defaultMessage: 'Settings',
+});
+
+/**
+ * The array of route definitions to be used when the application
+ * creates the routes.
+ */
+export const apmRouteConfig: APMRouteDefinition[] = [
+  /*
+   * Home routes
+   */
+  {
+    exact: true,
+    path: '/',
+    render: redirectTo('/services'),
+    breadcrumb: 'APM',
+  },
+  {
+    exact: true,
+    path: '/services', // !! Need to be kept in sync with the deepLinks in x-pack/plugins/apm/public/plugin.ts
+    component: ServiceInventoryView,
+    breadcrumb: ServiceInventoryTitle,
+  },
+  {
+    exact: true,
+    path: '/traces', // !! Need to be kept in sync with the deepLinks in x-pack/plugins/apm/public/plugin.ts
+    component: TraceOverviewView,
+    breadcrumb: TraceOverviewTitle,
+  },
+  {
+    exact: true,
+    path: '/service-map', // !! Need to be kept in sync with the deepLinks in x-pack/plugins/apm/public/plugin.ts
+    component: ServiceMapView,
+    breadcrumb: ServiceMapTitle,
+  },
+
+  /*
+   * Settings routes
+   */
+  {
+    exact: true,
+    path: '/settings',
+    render: redirectTo('/settings/agent-configuration'),
+    breadcrumb: SettingsTitle,
+  },
+  {
+    exact: true,
+    path: '/settings/agent-configuration',
+    component: SettingsAgentConfigurationRouteView,
+    breadcrumb: SettingsAgentConfigurationTitle,
+  },
+  {
+    exact: true,
+    path: '/settings/agent-configuration/create',
+    component: CreateAgentConfigurationRouteView,
+    breadcrumb: CreateAgentConfigurationTitle,
+  },
+  {
+    exact: true,
+    path: '/settings/agent-configuration/edit',
+    breadcrumb: EditAgentConfigurationTitle,
+    component: EditAgentConfigurationRouteView,
+  },
+  {
+    exact: true,
+    path: '/settings/apm-indices',
+    component: SettingsApmIndicesRouteView,
+    breadcrumb: SettingsApmIndicesTitle,
+  },
+  {
+    exact: true,
+    path: '/settings/customize-ui',
+    component: SettingsCustomizeUI,
+    breadcrumb: SettingsCustomizeUITitle,
+  },
+  {
+    exact: true,
+    path: '/settings/anomaly-detection',
+    component: SettingsAnomalyDetectionRouteView,
+    breadcrumb: SettingsAnomalyDetectionTitle,
+  },
+
+  /*
+   * Services routes (with APM Service context)
+   */
+  {
+    exact: true,
+    path: '/services/:serviceName',
+    breadcrumb: ({ match }) => match.params.serviceName,
+    component: RedirectToDefaultServiceRouteView,
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/overview',
+    breadcrumb: i18n.translate('xpack.apm.views.overview.title', {
+      defaultMessage: 'Overview',
+    }),
+    component: ServiceDetailsOverviewRouteView,
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/transactions',
+    component: ServiceDetailsTransactionsRouteView,
+    breadcrumb: i18n.translate('xpack.apm.views.transactions.title', {
+      defaultMessage: 'Transactions',
+    }),
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/errors/:groupId',
+    component: ErrorGroupDetailsRouteView,
+    breadcrumb: ({ match }) => match.params.groupId,
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/errors',
+    component: ServiceDetailsErrorsRouteView,
+    breadcrumb: i18n.translate('xpack.apm.views.errors.title', {
+      defaultMessage: 'Errors',
+    }),
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/metrics',
+    component: ServiceDetailsMetricsRouteView,
+    breadcrumb: i18n.translate('xpack.apm.views.metrics.title', {
+      defaultMessage: 'Metrics',
+    }),
+  },
+  // service nodes, only enabled for java agents for now
+  {
+    exact: true,
+    path: '/services/:serviceName/nodes',
+    component: ServiceDetailsNodesRouteView,
+    breadcrumb: i18n.translate('xpack.apm.views.nodes.title', {
+      defaultMessage: 'JVMs',
+    }),
+  },
+  // node metrics
+  {
+    exact: true,
+    path: '/services/:serviceName/nodes/:serviceNodeName/metrics',
+    component: ServiceNodeMetricsRouteView,
+    breadcrumb: ({ match }) => getServiceNodeName(match.params.serviceNodeName),
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/transactions/view',
+    component: TransactionDetailsRouteView,
+    breadcrumb: ({ location }) => {
+      const query = toQuery(location.search);
+      return query.transactionName as string;
+    },
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/profiling',
+    component: ServiceDetailsProfilingRouteView,
+    breadcrumb: i18n.translate('xpack.apm.views.serviceProfiling.title', {
+      defaultMessage: 'Profiling',
+    }),
+  },
+  {
+    exact: true,
+    path: '/services/:serviceName/service-map',
+    component: ServiceDetailsServiceMapRouteView,
+    breadcrumb: i18n.translate('xpack.apm.views.serviceMap.title', {
+      defaultMessage: 'Service Map',
+    }),
+  },
+  /*
+   * Utilility routes
+   */
+  {
+    exact: true,
+    path: '/link-to/trace/:traceId',
+    component: TraceLink,
+    breadcrumb: null,
+  },
+  {
+    exact: true,
+    path: '/link-to/transaction/:transactionId',
+    component: TransactionLink,
+    breadcrumb: null,
+  },
+];
+
+function RedirectToDefaultServiceRouteView(
+  props: RouteComponentProps<{ serviceName: string }>
+) {
+  const { uiSettings } = useApmPluginContext().core;
+  const { serviceName } = props.match.params;
+  if (uiSettings.get(enableServiceOverview)) {
+    return redirectTo(`/services/${serviceName}/overview`)(props);
+  }
+  return redirectTo(`/services/${serviceName}/transactions`)(props);
+}
diff --git a/x-pack/plugins/apm/public/components/routing/app_root.tsx b/x-pack/plugins/apm/public/components/routing/app_root.tsx
new file mode 100644
index 0000000000000..2bb387ae315ff
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/app_root.tsx
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ApmRoute } from '@elastic/apm-rum-react';
+import euiDarkVars from '@elastic/eui/dist/eui_theme_dark.json';
+import euiLightVars from '@elastic/eui/dist/eui_theme_light.json';
+import React from 'react';
+import { Route, Router, Switch } from 'react-router-dom';
+import { DefaultTheme, ThemeProvider } from 'styled-components';
+import { APP_WRAPPER_CLASS } from '../../../../../../src/core/public';
+import {
+  KibanaContextProvider,
+  RedirectAppLinks,
+  useUiSetting$,
+} from '../../../../../../src/plugins/kibana_react/public';
+import { ScrollToTopOnPathChange } from '../../components/app/Main/ScrollToTopOnPathChange';
+import {
+  ApmPluginContext,
+  ApmPluginContextValue,
+} from '../../context/apm_plugin/apm_plugin_context';
+import { LicenseProvider } from '../../context/license/license_context';
+import { UrlParamsProvider } from '../../context/url_params_context/url_params_context';
+import { useBreadcrumbs } from '../../hooks/use_breadcrumbs';
+import { ApmPluginStartDeps } from '../../plugin';
+import { HeaderMenuPortal } from '../../../../observability/public';
+import { ApmHeaderActionMenu } from '../shared/apm_header_action_menu';
+import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
+import { AnomalyDetectionJobsContextProvider } from '../../context/anomaly_detection_jobs/anomaly_detection_jobs_context';
+import { apmRouteConfig } from './apm_route_config';
+
+export function ApmAppRoot({
+  apmPluginContextValue,
+  pluginsStart,
+}: {
+  apmPluginContextValue: ApmPluginContextValue;
+  pluginsStart: ApmPluginStartDeps;
+}) {
+  const { appMountParameters, core } = apmPluginContextValue;
+  const { history } = appMountParameters;
+  const i18nCore = core.i18n;
+
+  return (
+    <RedirectAppLinks
+      application={core.application}
+      className={APP_WRAPPER_CLASS}
+      data-test-subj="apmMainContainer"
+      role="main"
+    >
+      <ApmPluginContext.Provider value={apmPluginContextValue}>
+        <KibanaContextProvider services={{ ...core, ...pluginsStart }}>
+          <i18nCore.Context>
+            <Router history={history}>
+              <UrlParamsProvider>
+                <LicenseProvider>
+                  <AnomalyDetectionJobsContextProvider>
+                    <ApmThemeProvider>
+                      <MountApmHeaderActionMenu />
+
+                      <Route component={ScrollToTopOnPathChange} />
+                      <Switch>
+                        {apmRouteConfig.map((route, i) => (
+                          <ApmRoute key={i} {...route} />
+                        ))}
+                      </Switch>
+                    </ApmThemeProvider>
+                  </AnomalyDetectionJobsContextProvider>
+                </LicenseProvider>
+              </UrlParamsProvider>
+            </Router>
+          </i18nCore.Context>
+        </KibanaContextProvider>
+      </ApmPluginContext.Provider>
+    </RedirectAppLinks>
+  );
+}
+
+function MountApmHeaderActionMenu() {
+  useBreadcrumbs(apmRouteConfig);
+  const { setHeaderActionMenu } = useApmPluginContext().appMountParameters;
+
+  return (
+    <HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu}>
+      <ApmHeaderActionMenu />
+    </HeaderMenuPortal>
+  );
+}
+
+function ApmThemeProvider({ children }: { children: React.ReactNode }) {
+  const [darkMode] = useUiSetting$<boolean>('theme:darkMode');
+
+  return (
+    <ThemeProvider
+      theme={(outerTheme?: DefaultTheme) => ({
+        ...outerTheme,
+        eui: darkMode ? euiDarkVars : euiLightVars,
+        darkMode,
+      })}
+    >
+      {children}
+    </ThemeProvider>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/routing/redirect_to.tsx b/x-pack/plugins/apm/public/components/routing/redirect_to.tsx
new file mode 100644
index 0000000000000..68ff2fce77f13
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/redirect_to.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 from 'react';
+import { Redirect, RouteComponentProps } from 'react-router-dom';
+
+/**
+ * Given a path, redirect to that location, preserving the search and maintaining
+ * backward-compatibilty with legacy (pre-7.9) hash-based URLs.
+ */
+export function redirectTo(to: string) {
+  return ({ location }: RouteComponentProps<{}>) => {
+    let resolvedUrl: URL | undefined;
+
+    // Redirect root URLs with a hash to support backward compatibility with URLs
+    // from before we switched to the non-hash platform history.
+    if (location.pathname === '' && location.hash.length > 0) {
+      // We just want the search and pathname so the host doesn't matter
+      resolvedUrl = new URL(location.hash.slice(1), 'http://localhost');
+      to = resolvedUrl.pathname;
+    }
+
+    return (
+      <Redirect
+        to={{
+          ...location,
+          hash: '',
+          pathname: to,
+          search: resolvedUrl ? resolvedUrl.search : location.search,
+        }}
+      />
+    );
+  };
+}
diff --git a/x-pack/plugins/apm/public/components/app/Main/route_config/route_config.test.tsx b/x-pack/plugins/apm/public/components/routing/route_config.test.tsx
similarity index 93%
rename from x-pack/plugins/apm/public/components/app/Main/route_config/route_config.test.tsx
rename to x-pack/plugins/apm/public/components/routing/route_config.test.tsx
index 62202d9489d51..b1d5c1a83b43b 100644
--- a/x-pack/plugins/apm/public/components/app/Main/route_config/route_config.test.tsx
+++ b/x-pack/plugins/apm/public/components/routing/route_config.test.tsx
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { routes } from './';
+import { apmRouteConfig } from './apm_route_config';
 
 describe('routes', () => {
   describe('/', () => {
-    const route = routes.find((r) => r.path === '/');
+    const route = apmRouteConfig.find((r) => r.path === '/');
 
     describe('with no hash path', () => {
       it('redirects to /services', () => {
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
new file mode 100644
index 0000000000000..357ba4c3d9f38
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_main_template.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 { EuiPageHeaderProps, EuiPageTemplateProps } from '@elastic/eui';
+import React from 'react';
+import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { ApmPluginStartDeps } from '../../../plugin';
+import { EnvironmentFilter } from '../../shared/EnvironmentFilter';
+
+/*
+ * This template contains:
+ *  - The Shared Observability Nav (https://github.com/elastic/kibana/blob/f7698bd8aa8787d683c728300ba4ca52b202369c/x-pack/plugins/observability/public/components/shared/page_template/README.md)
+ *  - The APM Header Action Menu
+ *  - Page title
+ *
+ *  Optionally:
+ *   - EnvironmentFilter
+ */
+export function ApmMainTemplate({
+  pageTitle,
+  pageHeader,
+  children,
+  ...pageTemplateProps
+}: {
+  pageTitle?: React.ReactNode;
+  pageHeader?: EuiPageHeaderProps;
+  children: React.ReactNode;
+} & EuiPageTemplateProps) {
+  const { services } = useKibana<ApmPluginStartDeps>();
+
+  const ObservabilityPageTemplate =
+    services.observability.navigation.PageTemplate;
+
+  return (
+    <ObservabilityPageTemplate
+      pageHeader={{
+        pageTitle,
+        rightSideItems: [<EnvironmentFilter />],
+        ...pageHeader,
+      }}
+      {...pageTemplateProps}
+    >
+      {children}
+    </ObservabilityPageTemplate>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/routing/templates/apm_service_template.tsx b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template.tsx
new file mode 100644
index 0000000000000..bbaffbd3374c6
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/templates/apm_service_template.tsx
@@ -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 React from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPageHeaderProps,
+  EuiTitle,
+  EuiBetaBadge,
+} from '@elastic/eui';
+import { ApmMainTemplate } from './apm_main_template';
+import { ApmServiceContextProvider } from '../../../context/apm_service/apm_service_context';
+import { enableServiceOverview } from '../../../../common/ui_settings_keys';
+import { isJavaAgentName, isRumAgentName } from '../../../../common/agent_name';
+import { ServiceIcons } from '../../shared/service_icons';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
+import { useErrorOverviewHref } from '../../shared/Links/apm/ErrorOverviewLink';
+import { useMetricOverviewHref } from '../../shared/Links/apm/MetricOverviewLink';
+import { useServiceMapHref } from '../../shared/Links/apm/ServiceMapLink';
+import { useServiceNodeOverviewHref } from '../../shared/Links/apm/ServiceNodeOverviewLink';
+import { useServiceOverviewHref } from '../../shared/Links/apm/service_overview_link';
+import { useServiceProfilingHref } from '../../shared/Links/apm/service_profiling_link';
+import { useTransactionsOverviewHref } from '../../shared/Links/apm/transaction_overview_link';
+import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { Correlations } from '../../app/correlations';
+import { SearchBar } from '../../shared/search_bar';
+
+type Tab = NonNullable<EuiPageHeaderProps['tabs']>[0] & {
+  key:
+    | 'errors'
+    | 'metrics'
+    | 'nodes'
+    | 'overview'
+    | 'service-map'
+    | 'profiling'
+    | 'transactions';
+  hidden?: boolean;
+};
+
+interface Props {
+  children: React.ReactNode;
+  serviceName: string;
+  selectedTab: Tab['key'];
+  searchBarOptions?: React.ComponentProps<typeof SearchBar>;
+}
+
+export function ApmServiceTemplate(props: Props) {
+  return (
+    <ApmServiceContextProvider>
+      <Template {...props} />
+    </ApmServiceContextProvider>
+  );
+}
+
+function Template({
+  children,
+  serviceName,
+  selectedTab,
+  searchBarOptions,
+}: Props) {
+  const tabs = useTabs({ serviceName, selectedTab });
+
+  return (
+    <ApmMainTemplate
+      pageHeader={{
+        tabs,
+        pageTitle: (
+          <EuiFlexGroup justifyContent="spaceBetween">
+            <EuiFlexItem>
+              <EuiFlexGroup alignItems="center">
+                <EuiFlexItem grow={false}>
+                  <EuiTitle size="l">
+                    <h1>{serviceName}</h1>
+                  </EuiTitle>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <ServiceIcons serviceName={serviceName} />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiFlexItem>
+
+            <EuiFlexItem grow={false}>
+              <Correlations />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        ),
+      }}
+    >
+      <SearchBar {...searchBarOptions} />
+
+      {children}
+    </ApmMainTemplate>
+  );
+}
+
+function useTabs({
+  serviceName,
+  selectedTab,
+}: {
+  serviceName: string;
+  selectedTab: Tab['key'];
+}) {
+  const { agentName, transactionType } = useApmServiceContext();
+  const { core, config } = useApmPluginContext();
+  const { urlParams } = useUrlParams();
+
+  const tabs: Tab[] = [
+    {
+      key: 'overview',
+      href: useServiceOverviewHref({ serviceName, transactionType }),
+      label: i18n.translate('xpack.apm.serviceDetails.overviewTabLabel', {
+        defaultMessage: 'Overview',
+      }),
+      hidden: !core.uiSettings.get(enableServiceOverview),
+    },
+    {
+      key: 'transactions',
+      href: useTransactionsOverviewHref({
+        serviceName,
+        latencyAggregationType: urlParams.latencyAggregationType,
+        transactionType,
+      }),
+      label: i18n.translate('xpack.apm.serviceDetails.transactionsTabLabel', {
+        defaultMessage: 'Transactions',
+      }),
+    },
+    {
+      key: 'errors',
+      href: useErrorOverviewHref(serviceName),
+      label: i18n.translate('xpack.apm.serviceDetails.errorsTabLabel', {
+        defaultMessage: 'Errors',
+      }),
+    },
+    {
+      key: 'nodes',
+      href: useServiceNodeOverviewHref(serviceName),
+      label: i18n.translate('xpack.apm.serviceDetails.nodesTabLabel', {
+        defaultMessage: 'JVMs',
+      }),
+      hidden: !isJavaAgentName(agentName),
+    },
+    {
+      key: 'metrics',
+      href: useMetricOverviewHref(serviceName),
+      label: i18n.translate('xpack.apm.serviceDetails.metricsTabLabel', {
+        defaultMessage: 'Metrics',
+      }),
+      hidden:
+        !agentName || isRumAgentName(agentName) || isJavaAgentName(agentName),
+    },
+    {
+      key: 'service-map',
+      href: useServiceMapHref(serviceName),
+      label: i18n.translate('xpack.apm.home.serviceMapTabLabel', {
+        defaultMessage: 'Service Map',
+      }),
+    },
+    {
+      key: 'profiling',
+      href: useServiceProfilingHref({ serviceName }),
+      hidden: !config.profilingEnabled,
+      label: (
+        <EuiFlexGroup direction="row" gutterSize="s">
+          <EuiFlexItem>
+            {i18n.translate('xpack.apm.serviceDetails.profilingTabLabel', {
+              defaultMessage: 'Profiling',
+            })}
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiBetaBadge
+              label={i18n.translate(
+                'xpack.apm.serviceDetails.profilingTabExperimentalLabel',
+                {
+                  defaultMessage: 'Experimental',
+                }
+              )}
+              tooltipContent={i18n.translate(
+                'xpack.apm.serviceDetails.profilingTabExperimentalDescription',
+                {
+                  defaultMessage:
+                    'Profiling is highly experimental and for internal use only.',
+                }
+              )}
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      ),
+    },
+  ];
+
+  return tabs
+    .filter((t) => !t.hidden)
+    .map(({ href, key, label }) => ({
+      href,
+      label,
+      isSelected: key === selectedTab,
+    }));
+}
diff --git a/x-pack/plugins/apm/public/components/routing/templates/settings_template.test.tsx b/x-pack/plugins/apm/public/components/routing/templates/settings_template.test.tsx
new file mode 100644
index 0000000000000..d3efef4c88380
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/templates/settings_template.test.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { render } from '@testing-library/react';
+import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
+import React, { ReactNode } from 'react';
+import { SettingsTemplate } from './settings_template';
+import { createMemoryHistory } from 'history';
+import { MemoryRouter, RouteComponentProps } from 'react-router-dom';
+import { CoreStart } from 'kibana/public';
+import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+
+const { location } = createMemoryHistory();
+
+const KibanaReactContext = createKibanaReactContext({
+  usageCollection: { reportUiCounter: () => {} },
+  observability: {
+    navigation: {
+      PageTemplate: () => {
+        return <>hello world</>;
+      },
+    },
+  },
+} as Partial<CoreStart>);
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  return (
+    <MemoryRouter>
+      <KibanaReactContext.Provider>
+        <MockApmPluginContextWrapper>{children}</MockApmPluginContextWrapper>
+      </KibanaReactContext.Provider>
+    </MemoryRouter>
+  );
+}
+
+describe('Settings', () => {
+  it('renders', async () => {
+    const routerProps = ({
+      location,
+    } as unknown) as RouteComponentProps<{}>;
+    expect(() =>
+      render(
+        <SettingsTemplate selectedTab="agent-configurations" {...routerProps}>
+          <div>hello world</div>
+        </SettingsTemplate>,
+        { wrapper: Wrapper }
+      )
+    ).not.toThrowError();
+  });
+});
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
new file mode 100644
index 0000000000000..0e610722a76e7
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/routing/templates/settings_template.tsx
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiPageHeaderProps } from '@elastic/eui';
+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 { ApmMainTemplate } from './apm_main_template';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+import { getAPMHref } from '../../shared/Links/apm/APMLink';
+
+type Tab = NonNullable<EuiPageHeaderProps['tabs']>[0] & {
+  key:
+    | 'agent-configurations'
+    | 'anomaly-detection'
+    | 'apm-indices'
+    | 'customize-ui';
+  hidden?: boolean;
+};
+
+interface Props {
+  children: React.ReactNode;
+  selectedTab: Tab['key'];
+}
+
+export function SettingsTemplate({ children, selectedTab }: Props) {
+  const { core } = useApmPluginContext();
+  const history = useHistory();
+  const tabs = getTabs({ history, core, selectedTab });
+
+  return (
+    <ApmMainTemplate
+      pageHeader={{
+        tabs,
+        pageTitle: i18n.translate('xpack.apm.settings.title', {
+          defaultMessage: 'Settings',
+        }),
+        rightSideItems: [], // hide EnvironmentFilter
+      }}
+    >
+      {children}
+    </ApmMainTemplate>
+  );
+}
+
+function getTabs({
+  history,
+  core,
+  selectedTab,
+}: {
+  history: History;
+  core: CoreStart;
+  selectedTab: Tab['key'];
+}) {
+  const { basePath } = core.http;
+  const canAccessML = !!core.application.capabilities.ml?.canAccessML;
+  const { search } = history.location;
+
+  const tabs: Tab[] = [
+    {
+      key: 'agent-configurations',
+      label: i18n.translate('xpack.apm.settings.agentConfig', {
+        defaultMessage: 'Agent Configuration',
+      }),
+      href: getAPMHref({
+        basePath,
+        path: `/settings/agent-configuration`,
+        search,
+      }),
+    },
+    {
+      key: 'anomaly-detection',
+      label: i18n.translate('xpack.apm.settings.anomalyDetection', {
+        defaultMessage: 'Anomaly detection',
+      }),
+      href: getAPMHref({
+        basePath,
+        path: `/settings/anomaly-detection`,
+        search,
+      }),
+      hidden: !canAccessML,
+    },
+    {
+      key: 'customize-ui',
+      label: i18n.translate('xpack.apm.settings.customizeApp', {
+        defaultMessage: 'Customize app',
+      }),
+      href: getAPMHref({ basePath, path: `/settings/customize-ui`, search }),
+    },
+    {
+      key: 'apm-indices',
+      label: i18n.translate('xpack.apm.settings.indices', {
+        defaultMessage: 'Indices',
+      }),
+      href: getAPMHref({ basePath, path: `/settings/apm-indices`, search }),
+    },
+  ];
+
+  return tabs
+    .filter((t) => !t.hidden)
+    .map(({ href, key, label }) => ({
+      href,
+      label,
+      isSelected: key === selectedTab,
+    }));
+}
diff --git a/x-pack/plugins/apm/public/components/shared/ApmHeader/apm_header.stories.tsx b/x-pack/plugins/apm/public/components/shared/ApmHeader/apm_header.stories.tsx
deleted file mode 100644
index 4bc9764b704b0..0000000000000
--- a/x-pack/plugins/apm/public/components/shared/ApmHeader/apm_header.stories.tsx
+++ /dev/null
@@ -1,53 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiTitle } from '@elastic/eui';
-import React, { ComponentType } from 'react';
-import { MemoryRouter } from 'react-router-dom';
-import { CoreStart } from '../../../../../../../src/core/public';
-import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
-import { MockApmPluginContextWrapper } from '../../../context/apm_plugin/mock_apm_plugin_context';
-import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
-import { createCallApmApi } from '../../../services/rest/createCallApmApi';
-import { ApmHeader } from './';
-
-export default {
-  title: 'shared/ApmHeader',
-  component: ApmHeader,
-  decorators: [
-    (Story: ComponentType) => {
-      createCallApmApi(({} as unknown) as CoreStart);
-
-      return (
-        <EuiThemeProvider>
-          <MockUrlParamsContextProvider
-            params={{ rangeFrom: 'now-15m', rangeTo: 'now' }}
-          >
-            <MockApmPluginContextWrapper>
-              <MemoryRouter>
-                <Story />
-              </MemoryRouter>
-            </MockApmPluginContextWrapper>
-          </MockUrlParamsContextProvider>
-        </EuiThemeProvider>
-      );
-    },
-  ],
-};
-
-export function Example() {
-  return (
-    <ApmHeader>
-      <EuiTitle>
-        <h1>
-          GET
-          /api/v1/regions/azure-eastus2/clusters/elasticsearch/xc18de071deb4262be54baebf5f6a1ce/proxy/_snapshot/found-snapshots/_all
-        </h1>
-      </EuiTitle>
-    </ApmHeader>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/shared/ApmHeader/index.tsx b/x-pack/plugins/apm/public/components/shared/ApmHeader/index.tsx
deleted file mode 100644
index f94bba84526a7..0000000000000
--- a/x-pack/plugins/apm/public/components/shared/ApmHeader/index.tsx
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import React, { ReactNode } from 'react';
-import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
-import { HeaderMenuPortal } from '../../../../../observability/public';
-import { ActionMenu } from '../../../application/action_menu';
-import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
-import { EnvironmentFilter } from '../EnvironmentFilter';
-
-const HeaderFlexGroup = euiStyled(EuiFlexGroup)`
-  padding: ${({ theme }) => theme.eui.gutterTypes.gutterMedium};
-  background: ${({ theme }) => theme.eui.euiColorEmptyShade};
-  border-bottom: ${({ theme }) => theme.eui.euiBorderThin};
-`;
-
-export function ApmHeader({ children }: { children: ReactNode }) {
-  const { setHeaderActionMenu } = useApmPluginContext().appMountParameters;
-
-  return (
-    <HeaderFlexGroup alignItems="center" gutterSize="s" wrap={true}>
-      <HeaderMenuPortal setHeaderActionMenu={setHeaderActionMenu}>
-        <ActionMenu />
-      </HeaderMenuPortal>
-      <EuiFlexItem>{children}</EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EnvironmentFilter />
-      </EuiFlexItem>
-    </HeaderFlexGroup>
-  );
-}
diff --git a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
index 59c99463144cb..c1bef7ac407ff 100644
--- a/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
+++ b/x-pack/plugins/apm/public/components/shared/EnvironmentFilter/index.tsx
@@ -13,6 +13,7 @@ import { useHistory, useLocation, useParams } from 'react-router-dom';
 import {
   ENVIRONMENT_ALL,
   ENVIRONMENT_NOT_DEFINED,
+  omitEsFieldValue,
 } from '../../../../common/environment_filter_values';
 import { useEnvironmentsFetcher } from '../../../hooks/use_environments_fetcher';
 import { useUrlParams } from '../../../context/url_params_context/use_url_params';
@@ -51,9 +52,9 @@ function getOptions(environments: string[]) {
     }));
 
   return [
-    ENVIRONMENT_ALL,
+    omitEsFieldValue(ENVIRONMENT_ALL),
     ...(environments.includes(ENVIRONMENT_NOT_DEFINED.value)
-      ? [ENVIRONMENT_NOT_DEFINED]
+      ? [omitEsFieldValue(ENVIRONMENT_NOT_DEFINED)]
       : []),
     ...(environmentOptions.length > 0 ? [SEPARATOR_OPTION] : []),
     ...environmentOptions,
@@ -78,12 +79,14 @@ export function EnvironmentFilter() {
   // the contents.
   const minWidth = 200;
 
+  const options = getOptions(environments);
+
   return (
     <EuiSelect
       prepend={i18n.translate('xpack.apm.filter.environment.label', {
         defaultMessage: 'Environment',
       })}
-      options={getOptions(environments)}
+      options={options}
       value={environment || ENVIRONMENT_ALL.value}
       onChange={(event) => {
         updateEnvironmentUrl(history, location, event.target.value);
diff --git a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__snapshots__/TransactionActionMenu.test.tsx.snap b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__snapshots__/TransactionActionMenu.test.tsx.snap
index ea33fb3c3df08..220e1155cc4b7 100644
--- a/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__snapshots__/TransactionActionMenu.test.tsx.snap
+++ b/x-pack/plugins/apm/public/components/shared/TransactionActionMenu/__snapshots__/TransactionActionMenu.test.tsx.snap
@@ -18,6 +18,7 @@ exports[`TransactionActionMenu component matches the snapshot 1`] = `
         >
           <span
             class="euiButtonContent__icon"
+            color="inherit"
             data-euiicon-type="arrowDown"
           />
           <span
diff --git a/x-pack/plugins/apm/public/application/action_menu/alerting_popover_flyout.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
similarity index 96%
rename from x-pack/plugins/apm/public/application/action_menu/alerting_popover_flyout.tsx
rename to x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
index 2ff3756855d14..95acc55196c54 100644
--- a/x-pack/plugins/apm/public/application/action_menu/alerting_popover_flyout.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/alerting_popover_flyout.tsx
@@ -13,9 +13,9 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import React, { useState } from 'react';
-import { IBasePath } from '../../../../../../src/core/public';
-import { AlertType } from '../../../common/alert_types';
-import { AlertingFlyout } from '../../components/alerting/alerting_flyout';
+import { IBasePath } from '../../../../../../../src/core/public';
+import { AlertType } from '../../../../common/alert_types';
+import { AlertingFlyout } from '../../alerting/alerting_flyout';
 
 const alertLabel = i18n.translate('xpack.apm.home.alertsMenu.alerts', {
   defaultMessage: 'Alerts',
diff --git a/x-pack/plugins/apm/public/application/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
similarity index 95%
rename from x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.test.tsx
rename to x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.test.tsx
index 044abbb2ec792..6a6ba3f9529ff 100644
--- a/x-pack/plugins/apm/public/application/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,8 +8,8 @@
 import React from 'react';
 import { render, fireEvent, waitFor } from '@testing-library/react';
 import { MissingJobsAlert } from './anomaly_detection_setup_link';
-import * as hooks from '../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
-import { FETCH_STATUS } from '../../hooks/use_fetcher';
+import * as hooks from '../../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
+import { FETCH_STATUS } from '../../../hooks/use_fetcher';
 
 async function renderTooltipAnchor({
   jobs,
diff --git a/x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.tsx
similarity index 83%
rename from x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.tsx
rename to x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.tsx
index 296e55fdff82b..ade49bc7e3aa4 100644
--- a/x-pack/plugins/apm/public/application/action_menu/anomaly_detection_setup_link.tsx
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/anomaly_detection_setup_link.tsx
@@ -16,15 +16,15 @@ import React from 'react';
 import {
   ENVIRONMENT_ALL,
   getEnvironmentLabel,
-} from '../../../common/environment_filter_values';
-import { getAPMHref } from '../../components/shared/Links/apm/APMLink';
-import { useAnomalyDetectionJobsContext } from '../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
-import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
-import { useLicenseContext } from '../../context/license/use_license_context';
-import { useUrlParams } from '../../context/url_params_context/use_url_params';
-import { FETCH_STATUS } from '../../hooks/use_fetcher';
-import { APIReturnType } from '../../services/rest/createCallApmApi';
-import { units } from '../../style/variables';
+} from '../../../../common/environment_filter_values';
+import { getAPMHref } from '../Links/apm/APMLink';
+import { useAnomalyDetectionJobsContext } from '../../../context/anomaly_detection_jobs/use_anomaly_detection_jobs_context';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+import { useLicenseContext } from '../../../context/license/use_license_context';
+import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { FETCH_STATUS } from '../../../hooks/use_fetcher';
+import { APIReturnType } from '../../../services/rest/createCallApmApi';
+import { units } from '../../../style/variables';
 
 export type AnomalyDetectionApiResponse = APIReturnType<'GET /api/apm/settings/anomaly-detection/jobs'>;
 
diff --git a/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/index.tsx b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/index.tsx
new file mode 100644
index 0000000000000..134941990a0f4
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/apm_header_action_menu/index.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiHeaderLink, EuiHeaderLinks } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React from 'react';
+import { useParams } from 'react-router-dom';
+import { getAlertingCapabilities } from '../../alerting/get_alerting_capabilities';
+import { getAPMHref } from '../Links/apm/APMLink';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+import { AlertingPopoverAndFlyout } from './alerting_popover_flyout';
+import { AnomalyDetectionSetupLink } from './anomaly_detection_setup_link';
+
+export function ApmHeaderActionMenu() {
+  const { core, plugins } = useApmPluginContext();
+  const { serviceName } = useParams<{ serviceName?: string }>();
+  const { search } = window.location;
+  const { application, http } = core;
+  const { basePath } = http;
+  const { capabilities } = application;
+  const canAccessML = !!capabilities.ml?.canAccessML;
+  const {
+    isAlertingAvailable,
+    canReadAlerts,
+    canSaveAlerts,
+    canReadAnomalies,
+  } = getAlertingCapabilities(plugins, capabilities);
+  const canSaveApmAlerts = capabilities.apm.save && canSaveAlerts;
+
+  function apmHref(path: string) {
+    return getAPMHref({ basePath, path, search });
+  }
+
+  function kibanaHref(path: string) {
+    return basePath.prepend(path);
+  }
+
+  return (
+    <EuiHeaderLinks>
+      <EuiHeaderLink
+        color="primary"
+        href={apmHref('/settings')}
+        iconType="gear"
+      >
+        {i18n.translate('xpack.apm.settingsLinkLabel', {
+          defaultMessage: 'Settings',
+        })}
+      </EuiHeaderLink>
+      {isAlertingAvailable && (
+        <AlertingPopoverAndFlyout
+          basePath={basePath}
+          canReadAlerts={canReadAlerts}
+          canSaveAlerts={canSaveApmAlerts}
+          canReadAnomalies={canReadAnomalies}
+          includeTransactionDuration={serviceName !== undefined}
+        />
+      )}
+      {canAccessML && <AnomalyDetectionSetupLink />}
+      <EuiHeaderLink
+        color="primary"
+        href={kibanaHref('/app/home#/tutorial/apm')}
+        iconType="indexOpen"
+      >
+        {i18n.translate('xpack.apm.addDataButtonLabel', {
+          defaultMessage: 'Add data',
+        })}
+      </EuiHeaderLink>
+    </EuiHeaderLinks>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_alert_annotations.test.tsx b/x-pack/plugins/apm/public/components/shared/charts/helper/get_alert_annotations.test.tsx
new file mode 100644
index 0000000000000..28d094dfed799
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/get_alert_annotations.test.tsx
@@ -0,0 +1,185 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ALERT_SEVERITY_LEVEL } from '@kbn/rule-data-utils/target/technical_field_names';
+import { ValuesType } from 'utility-types';
+import { EuiTheme } from '../../../../../../../../src/plugins/kibana_react/common';
+import { ObservabilityRuleTypeRegistry } from '../../../../../../observability/public';
+import { APIReturnType } from '../../../../services/rest/createCallApmApi';
+import { getAlertAnnotations } from './get_alert_annotations';
+
+type Alert = ValuesType<
+  APIReturnType<'GET /api/apm/services/{serviceName}/alerts'>['alerts']
+>;
+
+const euiColorDanger = 'red';
+const euiColorWarning = 'yellow';
+const theme = ({
+  eui: { euiColorDanger, euiColorWarning },
+} as unknown) as EuiTheme;
+const alert: Alert = {
+  'rule.id': ['apm.transaction_duration'],
+  'kibana.rac.alert.evaluation.value': [2057657.39],
+  'service.name': ['frontend-rum'],
+  'rule.name': ['Latency threshold | frontend-rum'],
+  'kibana.rac.alert.duration.us': [62879000],
+  'kibana.rac.alert.status': ['open'],
+  tags: ['apm', 'service.name:frontend-rum'],
+  'transaction.type': ['page-load'],
+  'kibana.rac.alert.producer': ['apm'],
+  'kibana.rac.alert.uuid': ['af2ae371-df79-4fca-b0eb-a2dbd9478180'],
+  'rule.uuid': ['82e0ee40-c2f4-11eb-9a42-a9da66a1722f'],
+  'event.action': ['active'],
+  '@timestamp': ['2021-06-01T16:16:05.183Z'],
+  'kibana.rac.alert.id': ['apm.transaction_duration_All'],
+  'processor.event': ['transaction'],
+  'kibana.rac.alert.evaluation.threshold': [500000],
+  'kibana.rac.alert.start': ['2021-06-01T16:15:02.304Z'],
+  'event.kind': ['state'],
+  'rule.category': ['Latency threshold'],
+};
+const chartStartTime = new Date(
+  alert['kibana.rac.alert.start']![0] as string
+).getTime();
+const getFormatter: ObservabilityRuleTypeRegistry['getFormatter'] = () => () => ({
+  link: '/',
+  reason: 'a good reason',
+});
+
+describe('getAlertAnnotations', () => {
+  describe('with no alerts', () => {
+    it('returns an empty array', () => {
+      expect(
+        getAlertAnnotations({ alerts: [], chartStartTime, getFormatter, theme })
+      ).toEqual([]);
+    });
+  });
+
+  describe('with an alert with an undefined severity', () => {
+    it('uses the danger color', () => {
+      expect(
+        getAlertAnnotations({
+          alerts: [alert],
+          chartStartTime,
+          getFormatter,
+          theme,
+        })![0].props.style.line.stroke
+      ).toEqual(euiColorDanger);
+    });
+
+    it('says "Alert" in the header', () => {
+      expect(
+        getAlertAnnotations({
+          alerts: [alert],
+          chartStartTime,
+          getFormatter,
+          theme,
+        })![0].props.dataValues[0].header
+      ).toEqual('Alert');
+    });
+
+    it('uses the reason in the annotation details', () => {
+      expect(
+        getAlertAnnotations({
+          alerts: [alert],
+          chartStartTime,
+          getFormatter,
+          theme,
+        })![0].props.dataValues[0].details
+      ).toEqual('a good reason');
+    });
+
+    describe('with no formatter', () => {
+      it('uses the rule type', () => {
+        const getNoFormatter: ObservabilityRuleTypeRegistry['getFormatter'] = () =>
+          undefined;
+
+        expect(
+          getAlertAnnotations({
+            alerts: [alert],
+            chartStartTime,
+            getFormatter: getNoFormatter,
+            theme,
+          })![0].props.dataValues[0].details
+        ).toEqual(alert['rule.name']![0]);
+      });
+    });
+
+    describe('when the alert start time is before the chart start time', () => {
+      it('uses the chart start time', () => {
+        const beforeChartStartTime = 1622565000000;
+
+        expect(
+          getAlertAnnotations({
+            alerts: [alert],
+            chartStartTime: beforeChartStartTime,
+            getFormatter,
+            theme,
+          })![0].props.dataValues[0].dataValue
+        ).toEqual(beforeChartStartTime);
+      });
+    });
+  });
+
+  describe('with an alert with a warning severity', () => {
+    const warningAlert: Alert = {
+      ...alert,
+      [ALERT_SEVERITY_LEVEL]: ['warning'],
+    };
+
+    it('uses the warning color', () => {
+      expect(
+        getAlertAnnotations({
+          alerts: [warningAlert],
+          chartStartTime,
+          getFormatter,
+          theme,
+        })![0].props.style.line.stroke
+      ).toEqual(euiColorWarning);
+    });
+
+    it('says "Warning Alert" in the header', () => {
+      expect(
+        getAlertAnnotations({
+          alerts: [warningAlert],
+          chartStartTime,
+          getFormatter,
+          theme,
+        })![0].props.dataValues[0].header
+      ).toEqual('Warning Alert');
+    });
+  });
+
+  describe('with an alert with a critical severity', () => {
+    const criticalAlert: Alert = {
+      ...alert,
+      [ALERT_SEVERITY_LEVEL]: ['critical'],
+    };
+
+    it('uses the critical color', () => {
+      expect(
+        getAlertAnnotations({
+          alerts: [criticalAlert],
+          chartStartTime,
+          getFormatter,
+          theme,
+        })![0].props.style.line.stroke
+      ).toEqual(euiColorDanger);
+    });
+
+    it('says "Critical Alert" in the header', () => {
+      expect(
+        getAlertAnnotations({
+          alerts: [criticalAlert],
+          chartStartTime,
+          getFormatter,
+          theme,
+        })![0].props.dataValues[0].header
+      ).toEqual('Critical Alert');
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/shared/charts/helper/get_alert_annotations.tsx b/x-pack/plugins/apm/public/components/shared/charts/helper/get_alert_annotations.tsx
index e906707730baa..2a2268b598efa 100644
--- a/x-pack/plugins/apm/public/components/shared/charts/helper/get_alert_annotations.tsx
+++ b/x-pack/plugins/apm/public/components/shared/charts/helper/get_alert_annotations.tsx
@@ -4,78 +4,131 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import React from 'react';
-import { ValuesType } from 'utility-types';
-import { RectAnnotation } from '@elastic/charts';
-import { EuiTheme } from 'src/plugins/kibana_react/common';
-import { rgba } from 'polished';
+import {
+  AnnotationDomainType,
+  LineAnnotation,
+  Position,
+  RectAnnotation,
+} from '@elastic/charts';
+import { EuiIcon } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
 import {
   ALERT_DURATION,
-  RULE_ID,
+  ALERT_SEVERITY_LEVEL,
   ALERT_START,
   ALERT_UUID,
+  RULE_ID,
+  RULE_NAME,
 } from '@kbn/rule-data-utils/target/technical_field_names';
+import React from 'react';
+import { EuiTheme } from 'src/plugins/kibana_react/common';
+import { ValuesType } from 'utility-types';
+import type { ObservabilityRuleTypeRegistry } from '../../../../../../observability/public';
 import { parseTechnicalFields } from '../../../../../../rule_registry/common';
+import { asDuration, asPercent } from '../../../../../common/utils/formatters';
 import { APIReturnType } from '../../../../services/rest/createCallApmApi';
 
 type Alert = ValuesType<
   APIReturnType<'GET /api/apm/services/{serviceName}/alerts'>['alerts']
 >;
 
-function getAlertColor({ theme, ruleId }: { ruleId: string; theme: EuiTheme }) {
-  switch (ruleId) {
+function getAlertColor({
+  severityLevel,
+  theme,
+}: {
+  severityLevel: string | undefined;
+  theme: EuiTheme;
+}) {
+  switch (severityLevel) {
+    case 'warning':
+      return theme.eui.euiColorWarning;
+    default:
+      return theme.eui.euiColorDanger;
+  }
+}
+
+function getAlertHeader({
+  severityLevel,
+}: {
+  severityLevel: string | undefined;
+}) {
+  switch (severityLevel) {
+    case 'critical':
+      return i18n.translate('xpack.apm.alertAnnotationCriticalTitle', {
+        defaultMessage: 'Critical Alert',
+      });
+    case 'warning':
+      return i18n.translate('xpack.apm.alertAnnotationWarningTitle', {
+        defaultMessage: 'Warning Alert',
+      });
     default:
-      return theme.eui.euiColorVis2;
+      return i18n.translate('xpack.apm.alertAnnotationNoSeverityTitle', {
+        defaultMessage: 'Alert',
+      });
   }
 }
 
 export function getAlertAnnotations({
   alerts,
+  chartStartTime,
+  getFormatter,
   theme,
 }: {
   alerts?: Alert[];
+  chartStartTime: number;
+  getFormatter: ObservabilityRuleTypeRegistry['getFormatter'];
   theme: EuiTheme;
 }) {
   return alerts?.flatMap((alert) => {
     const parsed = parseTechnicalFields(alert);
     const uuid = parsed[ALERT_UUID]!;
-    const start = new Date(parsed[ALERT_START]!).getTime();
+    // Don't start the annotation before the beginning of the chart time range
+    const start = Math.max(
+      chartStartTime,
+      new Date(parsed[ALERT_START]!).getTime()
+    );
     const end = start + parsed[ALERT_DURATION]! / 1000;
-    const color = getAlertColor({ ruleId: parsed[RULE_ID]!, theme });
+    const severityLevel = parsed[ALERT_SEVERITY_LEVEL];
+    const color = getAlertColor({ severityLevel, theme });
+    const header = getAlertHeader({ severityLevel });
+    const formatter = getFormatter(parsed[RULE_ID]!);
+    const formatted = {
+      link: undefined,
+      reason: parsed[RULE_NAME],
+      ...(formatter?.({
+        fields: parsed,
+        formatters: { asDuration, asPercent },
+      }) ?? {}),
+    };
 
     return [
-      <RectAnnotation
-        key={`alert_${uuid}_area`}
-        id={`alert_${uuid}_area`}
+      <LineAnnotation
         dataValues={[
           {
-            coordinates: {
-              x0: start,
-              x1: end,
-            },
+            dataValue: start,
+            details: formatted.reason,
+            header,
           },
         ]}
-        style={{ fill: color }}
+        domainType={AnnotationDomainType.XDomain}
+        id={`alert_${uuid}_line`}
+        key={`alert_${uuid}_line`}
+        marker={<EuiIcon type="alert" />}
+        markerPosition={Position.Top}
+        style={{ line: { opacity: 1, strokeWidth: 2, stroke: color } }}
       />,
       <RectAnnotation
-        key={`alert_${uuid}_border`}
-        id={`alert_${uuid}_border`}
+        key={`alert_${uuid}_area`}
+        id={`alert_${uuid}_area`}
         dataValues={[
           {
             coordinates: {
               x0: start,
               x1: end,
-              y0: 0,
-              y1: 0,
             },
           },
         ]}
-        style={{
-          fill: rgba(0, 0, 0, 0),
-          strokeWidth: 2,
-          stroke: color,
-          opacity: 1,
-        }}
+        style={{ fill: color }}
       />,
     ];
   });
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
new file mode 100644
index 0000000000000..0dd7da02001d7
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/charts/latency_chart/latency_chart.stories.tsx
@@ -0,0 +1,787 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { StoryContext } from '@storybook/react';
+import React, { ComponentType } from 'react';
+import { MemoryRouter, Route } from 'react-router-dom';
+import { EuiThemeProvider } from '../../../../../../../../src/plugins/kibana_react/common';
+import { LatencyAggregationType } from '../../../../../common/latency_aggregation_types';
+import {
+  ApmPluginContext,
+  ApmPluginContextValue,
+} from '../../../../context/apm_plugin/apm_plugin_context';
+import { ApmServiceContextProvider } from '../../../../context/apm_service/apm_service_context';
+import { ChartPointerEventContextProvider } from '../../../../context/chart_pointer_event/chart_pointer_event_context';
+import { MockUrlParamsContextProvider } from '../../../../context/url_params_context/mock_url_params_context_provider';
+import {
+  APIReturnType,
+  createCallApmApi,
+} from '../../../../services/rest/createCallApmApi';
+import { LatencyChart } from './';
+
+interface Args {
+  alertsResponse: APIReturnType<'GET /api/apm/services/{serviceName}/alerts'>;
+  latencyChartResponse: APIReturnType<'GET /api/apm/services/{serviceName}/transactions/charts/latency'>;
+}
+
+export default {
+  title: 'shared/charts/LatencyChart',
+  component: LatencyChart,
+  argTypes: {
+    latencyChartResponse: {
+      control: {
+        type: 'object',
+      },
+    },
+  },
+  decorators: [
+    (Story: ComponentType, { args }: StoryContext) => {
+      const { alertsResponse, latencyChartResponse } = args as Args;
+
+      const apmPluginContextMock = ({
+        core: {
+          notifications: {
+            toasts: { addWarning: () => {}, addDanger: () => {} },
+          },
+          http: {
+            get: (endpoint: string) => {
+              switch (endpoint) {
+                case '/api/apm/services/test-service/transactions/charts/latency':
+                  return latencyChartResponse;
+                case '/api/apm/services/test-service/alerts':
+                  return alertsResponse;
+                default:
+                  return {};
+              }
+            },
+          },
+          uiSettings: { get: () => true },
+        },
+        plugins: { observability: { isAlertingExperienceEnabled: () => true } },
+        observabilityRuleTypeRegistry: { getFormatter: () => undefined },
+      } as unknown) as ApmPluginContextValue;
+
+      createCallApmApi(apmPluginContextMock.core);
+
+      return (
+        <ApmPluginContext.Provider value={apmPluginContextMock}>
+          <MemoryRouter initialEntries={[`/app/apm/services/test-service`]}>
+            <Route path="/app/apm/services/:serviceName">
+              <EuiThemeProvider>
+                <MockUrlParamsContextProvider
+                  params={{
+                    latencyAggregationType: LatencyAggregationType.avg,
+                    transactionType: `${Math.random()}`, // So we don't memoize
+                  }}
+                >
+                  <ApmServiceContextProvider>
+                    <ChartPointerEventContextProvider>
+                      <Story />
+                    </ChartPointerEventContextProvider>
+                  </ApmServiceContextProvider>
+                </MockUrlParamsContextProvider>
+              </EuiThemeProvider>
+            </Route>
+          </MemoryRouter>
+        </ApmPluginContext.Provider>
+      );
+    },
+  ],
+};
+
+export function Example(_args: Args) {
+  return <LatencyChart height={300} />;
+}
+Example.args = {
+  alertsResponse: {
+    alerts: [
+      {
+        'rule.id': ['apm.transaction_duration'],
+        'kibana.rac.alert.evaluation.value': [2001708.19],
+        'service.name': ['frontend-rum'],
+        'rule.name': ['Latency threshold | frontend-rum'],
+        'kibana.rac.alert.duration.us': [10000000000],
+        'kibana.rac.alert.status': ['open'],
+        tags: ['apm', 'service.name:frontend-rum'],
+        'transaction.type': ['page-load'],
+        'kibana.rac.alert.producer': ['apm'],
+        'kibana.rac.alert.uuid': ['af2ae371-df79-4fca-b0eb-a2dbd9478180'],
+        'rule.uuid': ['82e0ee40-c2f4-11eb-9a42-a9da66a1722f'],
+        'event.action': ['active'],
+        '@timestamp': ['2021-06-01T20:27:48.833Z'],
+        'kibana.rac.alert.id': ['apm.transaction_duration_All'],
+        'processor.event': ['transaction'],
+        'kibana.rac.alert.evaluation.threshold': [500000],
+        'kibana.rac.alert.start': ['2021-06-02T04:00:00.000Z'],
+        'event.kind': ['state'],
+        'rule.category': ['Latency threshold'],
+      },
+      {
+        'rule.id': ['apm.transaction_duration'],
+        'kibana.rac.alert.evaluation.value': [2001708.19],
+        'service.name': ['frontend-rum'],
+        'rule.name': ['Latency threshold | frontend-rum'],
+        'kibana.rac.alert.duration.us': [10000000000],
+        'kibana.rac.alert.status': ['open'],
+        tags: ['apm', 'service.name:frontend-rum'],
+        'transaction.type': ['page-load'],
+        'kibana.rac.alert.producer': ['apm'],
+        'kibana.rac.alert.severity.level': ['warning'],
+        'kibana.rac.alert.uuid': ['af2ae371-df79-4fca-b0eb-a2dbd9478181'],
+        'rule.uuid': ['82e0ee40-c2f4-11eb-9a42-a9da66a1722f'],
+        'event.action': ['active'],
+        '@timestamp': ['2021-06-01T20:27:48.833Z'],
+        'kibana.rac.alert.id': ['apm.transaction_duration_All'],
+        'processor.event': ['transaction'],
+        'kibana.rac.alert.evaluation.threshold': [500000],
+        'kibana.rac.alert.start': ['2021-06-02T10:45:00.000Z'],
+        'event.kind': ['state'],
+        'rule.category': ['Latency threshold'],
+      },
+      {
+        'rule.id': ['apm.transaction_duration'],
+        'kibana.rac.alert.evaluation.value': [2001708.19],
+        'service.name': ['frontend-rum'],
+        'rule.name': ['Latency threshold | frontend-rum'],
+        'kibana.rac.alert.duration.us': [1000000000],
+        'kibana.rac.alert.status': ['open'],
+        tags: ['apm', 'service.name:frontend-rum'],
+        'transaction.type': ['page-load'],
+        'kibana.rac.alert.producer': ['apm'],
+        'kibana.rac.alert.severity.level': ['critical'],
+        'kibana.rac.alert.uuid': ['af2ae371-df79-4fca-b0eb-a2dbd9478182'],
+        'rule.uuid': ['82e0ee40-c2f4-11eb-9a42-a9da66a1722f'],
+        'event.action': ['active'],
+        '@timestamp': ['2021-06-01T20:27:48.833Z'],
+        'kibana.rac.alert.id': ['apm.transaction_duration_All'],
+        'processor.event': ['transaction'],
+        'kibana.rac.alert.evaluation.threshold': [500000],
+        'kibana.rac.alert.start': ['2021-06-02T16:50:00.000Z'],
+        'event.kind': ['state'],
+        'rule.category': ['Latency threshold'],
+      },
+    ],
+  },
+  latencyChartResponse: {
+    anomalyTimeseries: {
+      jobId: 'apm-production-00aa-high_mean_transaction_duration',
+      anomalyScore: [
+        {
+          x0: 1622613600000,
+          x: 1622616000000,
+          y: 90.7449171687341,
+        },
+      ],
+      anomalyBoundaries: [],
+    },
+    currentPeriod: {
+      overallAvgDuration: 3912.628446632232,
+      latencyTimeseries: [
+        {
+          x: 1622610000000,
+          y: 4208.681982447083,
+        },
+        {
+          x: 1622610300000,
+          y: 4279.664790174002,
+        },
+        {
+          x: 1622610600000,
+          y: 4137.2139896373055,
+        },
+        {
+          x: 1622610900000,
+          y: 3982.6822523881347,
+        },
+        {
+          x: 1622611200000,
+          y: 4536.218125960061,
+        },
+        {
+          x: 1622611500000,
+          y: 3732.4789422135163,
+        },
+        {
+          x: 1622611800000,
+          y: 4350.351269035533,
+        },
+        {
+          x: 1622612100000,
+          y: 3793.9078812691914,
+        },
+        {
+          x: 1622612400000,
+          y: 4274.450577019568,
+        },
+        {
+          x: 1622612700000,
+          y: 3860.8989280245023,
+        },
+        {
+          x: 1622613000000,
+          y: 4391.058464667006,
+        },
+        {
+          x: 1622613300000,
+          y: 3404.659691081216,
+        },
+        {
+          x: 1622613600000,
+          y: 4743.44957537155,
+        },
+        {
+          x: 1622613900000,
+          y: 4214.091001525166,
+        },
+        {
+          x: 1622614200000,
+          y: 4250.700154559506,
+        },
+        {
+          x: 1622614500000,
+          y: 3814.481089258699,
+        },
+        {
+          x: 1622614800000,
+          y: 10653.246323529413,
+        },
+        {
+          x: 1622615100000,
+          y: 4068.8035160289555,
+        },
+        {
+          x: 1622615400000,
+          y: 4333.230019493178,
+        },
+        {
+          x: 1622615700000,
+          y: 4333.82428115016,
+        },
+        {
+          x: 1622616000000,
+          y: 4532.12358974359,
+        },
+        {
+          x: 1622616300000,
+          y: 3908.336274001038,
+        },
+        {
+          x: 1622616600000,
+          y: 3960.448223350254,
+        },
+        {
+          x: 1622616900000,
+          y: 3823.611138491868,
+        },
+        {
+          x: 1622617200000,
+          y: 4057.287344913151,
+        },
+        {
+          x: 1622617500000,
+          y: 4235.4057539682535,
+        },
+        {
+          x: 1622617800000,
+          y: 4038.2624040920714,
+        },
+        {
+          x: 1622618100000,
+          y: 3672.8091328886608,
+        },
+        {
+          x: 1622618400000,
+          y: 3791.836018957346,
+        },
+        {
+          x: 1622618700000,
+          y: 3744.2,
+        },
+        {
+          x: 1622619000000,
+          y: 3850.6309760956174,
+        },
+        {
+          x: 1622619300000,
+          y: 3644.7181141439205,
+        },
+        {
+          x: 1622619600000,
+          y: 3524.808994441637,
+        },
+        {
+          x: 1622619900000,
+          y: 3292.7054108216435,
+        },
+        {
+          x: 1622620200000,
+          y: 2737.1506919528447,
+        },
+        {
+          x: 1622620500000,
+          y: 3606.829304390725,
+        },
+        {
+          x: 1622620800000,
+          y: 3564.9021739130435,
+        },
+        {
+          x: 1622621100000,
+          y: 3460.8380952380953,
+        },
+        {
+          x: 1622621400000,
+          y: 3667.977192093259,
+        },
+        {
+          x: 1622621700000,
+          y: 3216.88613625536,
+        },
+        {
+          x: 1622622000000,
+          y: 3803.754601226994,
+        },
+        {
+          x: 1622622300000,
+          y: 3412.371867007673,
+        },
+        {
+          x: 1622622600000,
+          y: 3052.968344577063,
+        },
+        {
+          x: 1622622900000,
+          y: 3729.7686965811968,
+        },
+        {
+          x: 1622623200000,
+          y: 4686.836363636364,
+        },
+        {
+          x: 1622623500000,
+          y: 2971.9769189479334,
+        },
+        {
+          x: 1622623800000,
+          y: 2778.008875739645,
+        },
+        {
+          x: 1622624100000,
+          y: 3562.3027475375843,
+        },
+        {
+          x: 1622624400000,
+          y: 4080.326075949367,
+        },
+        {
+          x: 1622624700000,
+          y: 3467.0493765586034,
+        },
+        {
+          x: 1622625000000,
+          y: 3492.6954887218044,
+        },
+        {
+          x: 1622625300000,
+          y: 3761.7813765182186,
+        },
+        {
+          x: 1622625600000,
+          y: 3287.3570332480817,
+        },
+        {
+          x: 1622625900000,
+          y: 3450.071392910634,
+        },
+        {
+          x: 1622626200000,
+          y: 4051.925287356322,
+        },
+        {
+          x: 1622626500000,
+          y: 3557.3268442622953,
+        },
+        {
+          x: 1622626800000,
+          y: 3541.3430837878036,
+        },
+        {
+          x: 1622627100000,
+          y: 3259.4907546226887,
+        },
+        {
+          x: 1622627400000,
+          y: 4360.087576374745,
+        },
+        {
+          x: 1622627700000,
+          y: 2857.941555225359,
+        },
+        {
+          x: 1622628000000,
+          y: 3200.8869168356996,
+        },
+        {
+          x: 1622628300000,
+          y: 4180.898125901009,
+        },
+        {
+          x: 1622628600000,
+          y: 3802.3408973697783,
+        },
+        {
+          x: 1622628900000,
+          y: 4238.939425051335,
+        },
+        {
+          x: 1622629200000,
+          y: 3179.4705021940517,
+        },
+        {
+          x: 1622629500000,
+          y: 3201.2916006339146,
+        },
+        {
+          x: 1622629800000,
+          y: 3275.699311023622,
+        },
+        {
+          x: 1622630100000,
+          y: 3257.324406265791,
+        },
+        {
+          x: 1622630400000,
+          y: 3034.4371781668383,
+        },
+        {
+          x: 1622630700000,
+          y: 5369.278318810866,
+        },
+        {
+          x: 1622631000000,
+          y: 4041.9754016064257,
+        },
+        {
+          x: 1622631300000,
+          y: 3714.3182773109243,
+        },
+        {
+          x: 1622631600000,
+          y: 3433.1565173628587,
+        },
+        {
+          x: 1622631900000,
+          y: 3911.4570990806947,
+        },
+        {
+          x: 1622632200000,
+          y: 3399.647921760391,
+        },
+        {
+          x: 1622632500000,
+          y: 3406.6709171162333,
+        },
+        {
+          x: 1622632800000,
+          y: 3796.1313494099536,
+        },
+        {
+          x: 1622633100000,
+          y: 4641.3845376452755,
+        },
+        {
+          x: 1622633400000,
+          y: 4476.154203197524,
+        },
+        {
+          x: 1622633700000,
+          y: 3615.25256147541,
+        },
+        {
+          x: 1622634000000,
+          y: 4720.787442099846,
+        },
+        {
+          x: 1622634300000,
+          y: 3572.421187308086,
+        },
+        {
+          x: 1622634600000,
+          y: 3945.6472690148034,
+        },
+        {
+          x: 1622634900000,
+          y: 3737.5801910507794,
+        },
+        {
+          x: 1622635200000,
+          y: 4170.001972386588,
+        },
+        {
+          x: 1622635500000,
+          y: 3420.740480961924,
+        },
+        {
+          x: 1622635800000,
+          y: 4206.541751527495,
+        },
+        {
+          x: 1622636100000,
+          y: 5315.030436917034,
+        },
+        {
+          x: 1622636400000,
+          y: 3784.5201995012467,
+        },
+        {
+          x: 1622636700000,
+          y: 3948.166,
+        },
+        {
+          x: 1622637000000,
+          y: 3856.821,
+        },
+        {
+          x: 1622637300000,
+          y: 3463.410723581468,
+        },
+        {
+          x: 1622637600000,
+          y: 3747.9292260692464,
+        },
+        {
+          x: 1622637900000,
+          y: 3454.205677290837,
+        },
+        {
+          x: 1622638200000,
+          y: 4110.846038114343,
+        },
+        {
+          x: 1622638500000,
+          y: 3336.22131147541,
+        },
+        {
+          x: 1622638800000,
+          y: 4649.731621349446,
+        },
+        {
+          x: 1622639100000,
+          y: 3165.643870314083,
+        },
+        {
+          x: 1622639400000,
+          y: 4956.4894625922025,
+        },
+        {
+          x: 1622639700000,
+          y: 3683.55785750379,
+        },
+        {
+          x: 1622640000000,
+          y: 3352.1956841589013,
+        },
+        {
+          x: 1622640300000,
+          y: 4620.592957017089,
+        },
+        {
+          x: 1622640600000,
+          y: 3428.9030303030304,
+        },
+        {
+          x: 1622640900000,
+          y: 3698.219571567673,
+        },
+        {
+          x: 1622641200000,
+          y: 4377.621443089431,
+        },
+        {
+          x: 1622641500000,
+          y: 5961.083591331269,
+        },
+        {
+          x: 1622641800000,
+          y: 3669.294088425236,
+        },
+        {
+          x: 1622642100000,
+          y: 3259.020638820639,
+        },
+        {
+          x: 1622642400000,
+          y: 3819.455216535433,
+        },
+        {
+          x: 1622642700000,
+          y: 3371.4274809160306,
+        },
+        {
+          x: 1622643000000,
+          y: 3743.922564102564,
+        },
+        {
+          x: 1622643300000,
+          y: 3834.112612612613,
+        },
+        {
+          x: 1622643600000,
+          y: 5444.119339371337,
+        },
+        {
+          x: 1622643900000,
+          y: 3574.8830908178625,
+        },
+        {
+          x: 1622644200000,
+          y: 3768.3267119707266,
+        },
+        {
+          x: 1622644500000,
+          y: 4140.902912621359,
+        },
+        {
+          x: 1622644800000,
+          y: 3342.3307086614172,
+        },
+        {
+          x: 1622645100000,
+          y: 3236.124428643982,
+        },
+        {
+          x: 1622645400000,
+          y: 3657.412544620092,
+        },
+        {
+          x: 1622645700000,
+          y: 3674.141194331984,
+        },
+        {
+          x: 1622646000000,
+          y: 3898.6586586586586,
+        },
+        {
+          x: 1622646300000,
+          y: 3124.4311287916457,
+        },
+        {
+          x: 1622646600000,
+          y: 3272.2118126272912,
+        },
+        {
+          x: 1622646900000,
+          y: 3800.5066872427983,
+        },
+        {
+          x: 1622647200000,
+          y: 3578.5175751400916,
+        },
+        {
+          x: 1622647500000,
+          y: 3542.9040895813046,
+        },
+        {
+          x: 1622647800000,
+          y: 3732.763408521303,
+        },
+        {
+          x: 1622648100000,
+          y: 3434.2902750491157,
+        },
+        {
+          x: 1622648400000,
+          y: 4330.74908328968,
+        },
+        {
+          x: 1622648700000,
+          y: 4577.840615690169,
+        },
+        {
+          x: 1622649000000,
+          y: 4781.996879875195,
+        },
+        {
+          x: 1622649300000,
+          y: 4025.662721893491,
+        },
+        {
+          x: 1622649600000,
+          y: 3477.1844410097888,
+        },
+        {
+          x: 1622649900000,
+          y: 3391.0057291666667,
+        },
+        {
+          x: 1622650200000,
+          y: 4029.693094629156,
+        },
+        {
+          x: 1622650500000,
+          y: 3592.2772633744858,
+        },
+        {
+          x: 1622650800000,
+          y: 4179.225288509784,
+        },
+        {
+          x: 1622651100000,
+          y: 4873.780174627632,
+        },
+        {
+          x: 1622651400000,
+          y: 3727.96688409433,
+        },
+        {
+          x: 1622651700000,
+          y: 4258.164556962025,
+        },
+        {
+          x: 1622652000000,
+          y: 5636.077639751553,
+        },
+        {
+          x: 1622652300000,
+          y: 4770.074738415546,
+        },
+        {
+          x: 1622652600000,
+          y: 4078.271392405063,
+        },
+        {
+          x: 1622652900000,
+          y: 3408.997037037037,
+        },
+        {
+          x: 1622653200000,
+          y: 5453.50645994832,
+        },
+        {
+          x: 1622653500000,
+          y: 3975.198969072165,
+        },
+        {
+          x: 1622653800000,
+          y: 2694.520754716981,
+        },
+      ],
+    },
+    previousPeriod: { latencyTimeseries: [] },
+  },
+};
+
+export function NoData(_args: Args) {
+  return <LatencyChart height={300} />;
+}
+NoData.args = {
+  alertsResponse: { alerts: [] },
+  latencyChartResponse: {
+    currentPeriod: { latencyTimeseries: [] },
+    previousPeriod: { latencyTimeseries: [] },
+  },
+};
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 1d096bbf4c432..49ef146f4b511 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
@@ -43,6 +43,7 @@ import { onBrushEnd, isTimeseriesEmpty } from './helper/helper';
 import { getLatencyChartSelector } from '../../../selectors/latency_chart_selectors';
 import { APMServiceAlert } from '../../../context/apm_service/apm_service_context';
 import { getAlertAnnotations } from './helper/get_alert_annotations';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
 
 interface Props {
   id: string;
@@ -81,6 +82,8 @@ export function TimeseriesChart({
   alerts,
 }: Props) {
   const history = useHistory();
+  const { observabilityRuleTypeRegistry } = useApmPluginContext();
+  const { getFormatter } = observabilityRuleTypeRegistry;
   const { annotations } = useAnnotationsContext();
   const { setPointerEvent, chartRef } = useChartPointerEventContext();
   const theme = useTheme();
@@ -203,6 +206,8 @@ export function TimeseriesChart({
         )}
         {getAlertAnnotations({
           alerts,
+          chartStartTime: xValues[0],
+          getFormatter,
           theme,
         })}
       </Chart>
diff --git a/x-pack/plugins/apm/public/components/shared/main_tabs.tsx b/x-pack/plugins/apm/public/components/shared/main_tabs.tsx
deleted file mode 100644
index f60da7c308711..0000000000000
--- a/x-pack/plugins/apm/public/components/shared/main_tabs.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiTabs } from '@elastic/eui';
-import React, { ReactNode } from 'react';
-import { euiStyled } from '../../../../../../src/plugins/kibana_react/common';
-
-// Since our `EuiTab` components have `APMLink`s inside of them and not just
-// `href`s, we need to override the color of the links inside or they will all
-// be the primary color.
-const StyledTabs = euiStyled(EuiTabs)`
-  padding: ${({ theme }) => `${theme.eui.gutterTypes.gutterMedium}`};
-  border-bottom: ${({ theme }) => theme.eui.euiBorderThin};
-  border-top: ${({ theme }) => theme.eui.euiBorderThin};
-  background: ${({ theme }) => theme.eui.euiColorEmptyShade};
-`;
-
-export function MainTabs({ children }: { children: ReactNode }) {
-  return <StyledTabs display="condensed">{children}</StyledTabs>;
-}
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
new file mode 100644
index 0000000000000..105bdb008042e
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/search_bar.test.tsx
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+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 { 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';
+import { IUrlParams } from '../../context/url_params_context/types';
+import * as useFetcherHook from '../../hooks/use_fetcher';
+import * as useServiceTransactionTypesHook from '../../context/apm_service/use_service_transaction_types_fetcher';
+import { renderWithTheme } from '../../utils/testHelpers';
+import { fromQuery } from './Links/url_helpers';
+import { CoreStart } from 'kibana/public';
+import { SearchBar } from './search_bar';
+
+function setup({
+  urlParams,
+  serviceTransactionTypes,
+  history,
+}: {
+  urlParams: IUrlParams;
+  serviceTransactionTypes: string[];
+  history: MemoryHistory;
+}) {
+  history.replace({
+    pathname: '/services/foo/transactions',
+    search: fromQuery(urlParams),
+  });
+
+  const KibanaReactContext = createKibanaReactContext({
+    usageCollection: { reportUiCounter: () => {} },
+  } as Partial<CoreStart>);
+
+  // mock transaction types
+  jest
+    .spyOn(useServiceTransactionTypesHook, 'useServiceTransactionTypesFetcher')
+    .mockReturnValue(serviceTransactionTypes);
+
+  jest.spyOn(useFetcherHook, 'useFetcher').mockReturnValue({} as any);
+
+  return renderWithTheme(
+    <KibanaReactContext.Provider>
+      <MockApmPluginContextWrapper>
+        <Router history={history}>
+          <UrlParamsProvider>
+            <ApmServiceContextProvider>
+              <SearchBar showTransactionTypeSelector />
+            </ApmServiceContextProvider>
+          </UrlParamsProvider>
+        </Router>
+      </MockApmPluginContextWrapper>
+    </KibanaReactContext.Provider>
+  );
+}
+
+describe('when transactionType is selected and multiple transaction types are given', () => {
+  let history: MemoryHistory;
+  beforeEach(() => {
+    history = createMemoryHistory();
+    jest.spyOn(history, 'push');
+    jest.spyOn(history, 'replace');
+  });
+
+  it('renders a radio group with transaction types', () => {
+    const { container } = setup({
+      history,
+      serviceTransactionTypes: ['firstType', 'secondType'],
+      urlParams: {
+        transactionType: 'secondType',
+      },
+    });
+
+    // transaction type selector
+    const dropdown = getByTestId(container, 'headerFilterTransactionType');
+
+    // both options should be listed
+    expect(getByText(dropdown, 'firstType')).toBeInTheDocument();
+    expect(getByText(dropdown, 'secondType')).toBeInTheDocument();
+
+    // second option should be selected
+    expect(dropdown).toHaveValue('secondType');
+  });
+
+  it('should update the URL when a transaction type is selected', () => {
+    const { container } = setup({
+      history,
+      serviceTransactionTypes: ['firstType', 'secondType'],
+      urlParams: {
+        transactionType: 'secondType',
+      },
+    });
+
+    expect(history.location.search).toEqual(
+      '?transactionType=secondType&rangeFrom=now-15m&rangeTo=now'
+    );
+
+    // transaction type selector
+    const dropdown = getByTestId(container, 'headerFilterTransactionType');
+    expect(getByText(dropdown, 'firstType')).toBeInTheDocument();
+    expect(getByText(dropdown, 'secondType')).toBeInTheDocument();
+
+    // change dropdown value
+    fireEvent.change(dropdown, { target: { value: 'firstType' } });
+
+    // assert that value was changed
+    expect(dropdown).toHaveValue('firstType');
+    expect(history.push).toHaveBeenCalled();
+    expect(history.location.search).toEqual(
+      '?transactionType=firstType&rangeFrom=now-15m&rangeTo=now'
+    );
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/shared/search_bar.tsx b/x-pack/plugins/apm/public/components/shared/search_bar.tsx
index f0fc18cf266b9..74374e331ee8e 100644
--- a/x-pack/plugins/apm/public/components/shared/search_bar.tsx
+++ b/x-pack/plugins/apm/public/components/shared/search_bar.tsx
@@ -15,7 +15,6 @@ 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 { enableInspectEsQueries } from '../../../../observability/public';
 import { useApmPluginContext } from '../../context/apm_plugin/use_apm_plugin_context';
 import { useKibanaUrl } from '../../hooks/useKibanaUrl';
@@ -26,12 +25,9 @@ import { KueryBar } from './KueryBar';
 import { TimeComparison } from './time_comparison';
 import { TransactionTypeSelect } from './transaction_type_select';
 
-const EuiFlexGroupSpaced = euiStyled(EuiFlexGroup)`
-  margin: ${({ theme }) =>
-    `${theme.eui.euiSizeS} ${theme.eui.euiSizeS} -${theme.eui.gutterTypes.gutterMedium} ${theme.eui.euiSizeS}`};
-`;
-
 interface Props {
+  hidden?: boolean;
+  showKueryBar?: boolean;
   showTimeComparison?: boolean;
   showTransactionTypeSelector?: boolean;
 }
@@ -49,7 +45,7 @@ function DebugQueryCallout() {
   }
 
   return (
-    <EuiFlexGroupSpaced>
+    <EuiFlexGroup>
       <EuiFlexItem>
         <EuiCallOut
           title={i18n.translate(
@@ -78,19 +74,26 @@ function DebugQueryCallout() {
           />
         </EuiCallOut>
       </EuiFlexItem>
-    </EuiFlexGroupSpaced>
+    </EuiFlexGroup>
   );
 }
 
 export function SearchBar({
+  hidden = false,
+  showKueryBar = true,
   showTimeComparison = false,
   showTransactionTypeSelector = false,
 }: Props) {
   const { isSmall, isMedium, isLarge, isXl, isXXL } = useBreakPoints();
+
+  if (hidden) {
+    return null;
+  }
+
   return (
     <>
       <DebugQueryCallout />
-      <EuiFlexGroupSpaced
+      <EuiFlexGroup
         gutterSize="s"
         responsive={false}
         direction={isXXL ? 'row' : 'column'}
@@ -106,9 +109,12 @@ export function SearchBar({
                 <TransactionTypeSelect />
               </EuiFlexItem>
             )}
-            <EuiFlexItem>
-              <KueryBar />
-            </EuiFlexItem>
+
+            {showKueryBar && (
+              <EuiFlexItem>
+                <KueryBar />
+              </EuiFlexItem>
+            )}
           </EuiFlexGroup>
         </EuiFlexItem>
         <EuiFlexItem grow={showTimeComparison && !isXXL}>
@@ -128,8 +134,8 @@ export function SearchBar({
             </EuiFlexItem>
           </EuiFlexGroup>
         </EuiFlexItem>
-      </EuiFlexGroupSpaced>
-      <EuiSpacer size="s" />
+      </EuiFlexGroup>
+      <EuiSpacer size="m" />
     </>
   );
 }
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/alert_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/alert_details.tsx
similarity index 84%
rename from x-pack/plugins/apm/public/components/app/service_details/service_icons/alert_details.tsx
rename to x-pack/plugins/apm/public/components/shared/service_icons/alert_details.tsx
index 0066480230c6b..9f6378ccb4497 100644
--- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/alert_details.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/alert_details.tsx
@@ -14,12 +14,12 @@ import {
   RULE_ID,
   RULE_NAME,
 } from '@kbn/rule-data-utils/target/technical_field_names';
-import { parseTechnicalFields } from '../../../../../../rule_registry/common';
-import { useUrlParams } from '../../../../context/url_params_context/use_url_params';
-import { useApmPluginContext } from '../../../../context/apm_plugin/use_apm_plugin_context';
-import { APIReturnType } from '../../../../services/rest/createCallApmApi';
-import { asPercent, asDuration } from '../../../../../common/utils/formatters';
-import { TimestampTooltip } from '../../../shared/TimestampTooltip';
+import { parseTechnicalFields } from '../../../../../rule_registry/common';
+import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { useApmPluginContext } from '../../../context/apm_plugin/use_apm_plugin_context';
+import { APIReturnType } from '../../../services/rest/createCallApmApi';
+import { asPercent, asDuration } from '../../../../common/utils/formatters';
+import { TimestampTooltip } from '../TimestampTooltip';
 
 interface AlertDetailProps {
   alerts: APIReturnType<'GET /api/apm/services/{serviceName}/alerts'>['alerts'];
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/cloud_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx
similarity index 97%
rename from x-pack/plugins/apm/public/components/app/service_details/service_icons/cloud_details.tsx
rename to x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx
index 2e19bc684d681..2e8fcfa1df672 100644
--- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/cloud_details.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/cloud_details.tsx
@@ -9,7 +9,7 @@ import { EuiBadge, EuiDescriptionList } from '@elastic/eui';
 import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { APIReturnType } from '../../../../services/rest/createCallApmApi';
+import { APIReturnType } from '../../../services/rest/createCallApmApi';
 
 type ServiceDetailsReturnType = APIReturnType<'GET /api/apm/services/{serviceName}/metadata/details'>;
 
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/container_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx
similarity index 94%
rename from x-pack/plugins/apm/public/components/app/service_details/service_icons/container_details.tsx
rename to x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx
index efc9a46526cf8..b590a67409d9e 100644
--- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/container_details.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/container_details.tsx
@@ -9,8 +9,8 @@ import { EuiDescriptionList } from '@elastic/eui';
 import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { asInteger } from '../../../../../common/utils/formatters';
-import { APIReturnType } from '../../../../services/rest/createCallApmApi';
+import { asInteger } from '../../../../common/utils/formatters';
+import { APIReturnType } from '../../../services/rest/createCallApmApi';
 
 type ServiceDetailsReturnType = APIReturnType<'GET /api/apm/services/{serviceName}/metadata/details'>;
 
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/icon_popover.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/icon_popover.tsx
similarity index 93%
rename from x-pack/plugins/apm/public/components/app/service_details/service_icons/icon_popover.tsx
rename to x-pack/plugins/apm/public/components/shared/service_icons/icon_popover.tsx
index 79f93ea76ee51..05305558564f1 100644
--- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/icon_popover.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/icon_popover.tsx
@@ -13,8 +13,8 @@ import {
   EuiPopoverTitle,
 } from '@elastic/eui';
 import React from 'react';
-import { FETCH_STATUS } from '../../../../hooks/use_fetcher';
-import { px } from '../../../../style/variables';
+import { FETCH_STATUS } from '../../../hooks/use_fetcher';
+import { px } from '../../../style/variables';
 
 interface IconPopoverProps {
   title: string;
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
new file mode 100644
index 0000000000000..d66625f613cdc
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/index.test.tsx
@@ -0,0 +1,248 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { fireEvent, render } from '@testing-library/react';
+import { CoreStart } from 'kibana/public';
+import { merge } from 'lodash';
+// import { renderWithTheme } from '../../../../utils/testHelpers';
+import React, { ReactNode } from 'react';
+import { createKibanaReactContext } from 'src/plugins/kibana_react/public';
+import { MockUrlParamsContextProvider } from '../../../context/url_params_context/mock_url_params_context_provider';
+import { ApmPluginContextValue } from '../../../context/apm_plugin/apm_plugin_context';
+import {
+  mockApmPluginContextValue,
+  MockApmPluginContextWrapper,
+} 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';
+
+const KibanaReactContext = createKibanaReactContext({
+  usageCollection: { reportUiCounter: () => {} },
+} as Partial<CoreStart>);
+
+const addWarning = jest.fn();
+const httpGet = jest.fn();
+
+function Wrapper({ children }: { children?: ReactNode }) {
+  const mockPluginContext = (merge({}, mockApmPluginContextValue, {
+    core: { http: { get: httpGet }, notifications: { toasts: { addWarning } } },
+  }) as unknown) as ApmPluginContextValue;
+
+  return (
+    <KibanaReactContext.Provider>
+      <MockApmPluginContextWrapper value={mockPluginContext}>
+        <MockUrlParamsContextProvider
+          params={{
+            rangeFrom: 'now-15m',
+            rangeTo: 'now',
+            start: 'mystart',
+            end: 'myend',
+          }}
+        >
+          {children}
+        </MockUrlParamsContextProvider>
+      </MockApmPluginContextWrapper>
+    </KibanaReactContext.Provider>
+  );
+}
+
+describe('ServiceIcons', () => {
+  describe('icons', () => {
+    it('Shows loading spinner while fetching data', () => {
+      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
+        data: undefined,
+        status: fetcherHook.FETCH_STATUS.LOADING,
+        refetch: jest.fn(),
+      });
+      const { getByTestId, queryAllByTestId } = render(
+        <Wrapper>
+          <EuiThemeProvider>
+            <ServiceIcons serviceName="foo" />
+          </EuiThemeProvider>
+        </Wrapper>
+      );
+      expect(getByTestId('loading')).toBeInTheDocument();
+      expect(queryAllByTestId('service')).toHaveLength(0);
+      expect(queryAllByTestId('container')).toHaveLength(0);
+      expect(queryAllByTestId('cloud')).toHaveLength(0);
+    });
+    it("doesn't show any icons", () => {
+      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
+        data: {},
+        status: fetcherHook.FETCH_STATUS.SUCCESS,
+        refetch: jest.fn(),
+      });
+
+      const { queryAllByTestId } = render(
+        <Wrapper>
+          <EuiThemeProvider>
+            <ServiceIcons serviceName="foo" />
+          </EuiThemeProvider>
+        </Wrapper>
+      );
+      expect(queryAllByTestId('loading')).toHaveLength(0);
+      expect(queryAllByTestId('service')).toHaveLength(0);
+      expect(queryAllByTestId('container')).toHaveLength(0);
+      expect(queryAllByTestId('cloud')).toHaveLength(0);
+    });
+    it('shows service icon', () => {
+      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
+        data: {
+          agentName: 'java',
+        },
+        status: fetcherHook.FETCH_STATUS.SUCCESS,
+        refetch: jest.fn(),
+      });
+
+      const { queryAllByTestId, getByTestId } = render(
+        <Wrapper>
+          <EuiThemeProvider>
+            <ServiceIcons serviceName="foo" />
+          </EuiThemeProvider>
+        </Wrapper>
+      );
+      expect(queryAllByTestId('loading')).toHaveLength(0);
+      expect(getByTestId('service')).toBeInTheDocument();
+      expect(queryAllByTestId('container')).toHaveLength(0);
+      expect(queryAllByTestId('cloud')).toHaveLength(0);
+    });
+    it('shows service and container icons', () => {
+      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
+        data: {
+          agentName: 'java',
+          containerType: 'Kubernetes',
+        },
+        status: fetcherHook.FETCH_STATUS.SUCCESS,
+        refetch: jest.fn(),
+      });
+
+      const { queryAllByTestId, getByTestId } = render(
+        <Wrapper>
+          <EuiThemeProvider>
+            <ServiceIcons serviceName="foo" />
+          </EuiThemeProvider>
+        </Wrapper>
+      );
+      expect(queryAllByTestId('loading')).toHaveLength(0);
+      expect(queryAllByTestId('cloud')).toHaveLength(0);
+      expect(getByTestId('service')).toBeInTheDocument();
+      expect(getByTestId('container')).toBeInTheDocument();
+    });
+    it('shows service, container and cloud icons', () => {
+      jest.spyOn(fetcherHook, 'useFetcher').mockReturnValue({
+        data: {
+          agentName: 'java',
+          containerType: 'Kubernetes',
+          cloudProvider: 'gcp',
+        },
+        status: fetcherHook.FETCH_STATUS.SUCCESS,
+        refetch: jest.fn(),
+      });
+
+      const { queryAllByTestId, getByTestId } = render(
+        <Wrapper>
+          <EuiThemeProvider>
+            <ServiceIcons serviceName="foo" />
+          </EuiThemeProvider>
+        </Wrapper>
+      );
+      expect(queryAllByTestId('loading')).toHaveLength(0);
+      expect(getByTestId('service')).toBeInTheDocument();
+      expect(getByTestId('container')).toBeInTheDocument();
+      expect(getByTestId('cloud')).toBeInTheDocument();
+    });
+  });
+
+  describe('details', () => {
+    const callApmApi = (apisMockData: Record<string, object>) => ({
+      endpoint,
+    }: {
+      endpoint: string;
+    }) => {
+      return apisMockData[endpoint];
+    };
+    it('Shows loading spinner while fetching data', () => {
+      const apisMockData = {
+        'GET /api/apm/services/{serviceName}/metadata/icons': {
+          data: {
+            agentName: 'java',
+            containerType: 'Kubernetes',
+            cloudProvider: 'gcp',
+          },
+          status: fetcherHook.FETCH_STATUS.SUCCESS,
+          refetch: jest.fn(),
+        },
+        'GET /api/apm/services/{serviceName}/metadata/details': {
+          data: undefined,
+          status: fetcherHook.FETCH_STATUS.LOADING,
+          refetch: jest.fn(),
+        },
+      };
+      jest
+        .spyOn(fetcherHook, 'useFetcher')
+        .mockImplementation((func: Function, deps: string[]) => {
+          return func(callApmApi(apisMockData)) || {};
+        });
+
+      const { queryAllByTestId, getByTestId } = render(
+        <Wrapper>
+          <EuiThemeProvider>
+            <ServiceIcons serviceName="foo" />
+          </EuiThemeProvider>
+        </Wrapper>
+      );
+      expect(queryAllByTestId('loading')).toHaveLength(0);
+      expect(getByTestId('service')).toBeInTheDocument();
+      expect(getByTestId('container')).toBeInTheDocument();
+      expect(getByTestId('cloud')).toBeInTheDocument();
+      fireEvent.click(getByTestId('popover_Service'));
+      expect(getByTestId('loading-content')).toBeInTheDocument();
+    });
+
+    it('shows service content', () => {
+      const apisMockData = {
+        'GET /api/apm/services/{serviceName}/metadata/icons': {
+          data: {
+            agentName: 'java',
+            containerType: 'Kubernetes',
+            cloudProvider: 'gcp',
+          },
+          status: fetcherHook.FETCH_STATUS.SUCCESS,
+          refetch: jest.fn(),
+        },
+        'GET /api/apm/services/{serviceName}/metadata/details': {
+          data: { service: { versions: ['v1.0.0'] } },
+          status: fetcherHook.FETCH_STATUS.SUCCESS,
+          refetch: jest.fn(),
+        },
+      };
+      jest
+        .spyOn(fetcherHook, 'useFetcher')
+        .mockImplementation((func: Function, deps: string[]) => {
+          return func(callApmApi(apisMockData)) || {};
+        });
+
+      const { queryAllByTestId, getByTestId, getByText } = render(
+        <Wrapper>
+          <EuiThemeProvider>
+            <ServiceIcons serviceName="foo" />
+          </EuiThemeProvider>
+        </Wrapper>
+      );
+      expect(queryAllByTestId('loading')).toHaveLength(0);
+      expect(getByTestId('service')).toBeInTheDocument();
+      expect(getByTestId('container')).toBeInTheDocument();
+      expect(getByTestId('cloud')).toBeInTheDocument();
+
+      fireEvent.click(getByTestId('popover_Service'));
+      expect(queryAllByTestId('loading-content')).toHaveLength(0);
+      expect(getByText('Service')).toBeInTheDocument();
+      expect(getByText('v1.0.0')).toBeInTheDocument();
+    });
+  });
+});
diff --git a/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx
new file mode 100644
index 0000000000000..d64605da2bc3f
--- /dev/null
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/index.tsx
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import React, { ReactChild, useState } from 'react';
+import { useApmServiceContext } from '../../../context/apm_service/use_apm_service_context';
+import { useTheme } from '../../../hooks/use_theme';
+import { ContainerType } from '../../../../common/service_metadata';
+import { useUrlParams } from '../../../context/url_params_context/use_url_params';
+import { FETCH_STATUS, useFetcher } from '../../../hooks/use_fetcher';
+import { getAgentIcon } from '../AgentIcon/get_agent_icon';
+import { CloudDetails } from './cloud_details';
+import { ContainerDetails } from './container_details';
+import { IconPopover } from './icon_popover';
+import { ServiceDetails } from './service_details';
+import { AlertDetails } from './alert_details';
+
+interface Props {
+  serviceName: string;
+}
+
+const cloudIcons: Record<string, string> = {
+  gcp: 'logoGCP',
+  aws: 'logoAWS',
+  azure: 'logoAzure',
+};
+
+export function getCloudIcon(provider?: string) {
+  if (provider) {
+    return cloudIcons[provider];
+  }
+}
+
+export function getContainerIcon(container?: ContainerType) {
+  if (!container) {
+    return;
+  }
+  switch (container) {
+    case 'Kubernetes':
+      return 'logoKubernetes';
+    default:
+      return 'logoDocker';
+  }
+}
+
+type Icons = 'service' | 'container' | 'cloud' | 'alerts';
+
+interface PopoverItem {
+  key: Icons;
+  icon: {
+    type?: string;
+    color?: string;
+    size?: 's' | 'm' | 'l';
+  };
+  isVisible: boolean;
+  title: string;
+  component: ReactChild;
+}
+
+export function ServiceIcons({ serviceName }: Props) {
+  const {
+    urlParams: { start, end },
+  } = useUrlParams();
+  const [
+    selectedIconPopover,
+    setSelectedIconPopover,
+  ] = useState<Icons | null>();
+
+  const theme = useTheme();
+
+  const { alerts } = useApmServiceContext();
+
+  const { data: icons, status: iconsFetchStatus } = useFetcher(
+    (callApmApi) => {
+      if (serviceName && start && end) {
+        return callApmApi({
+          endpoint: 'GET /api/apm/services/{serviceName}/metadata/icons',
+          params: {
+            path: { serviceName },
+            query: { start, end },
+          },
+        });
+      }
+    },
+    [serviceName, start, end]
+  );
+
+  const { data: details, status: detailsFetchStatus } = useFetcher(
+    (callApmApi) => {
+      if (selectedIconPopover && serviceName && start && end) {
+        return callApmApi({
+          isCachable: true,
+          endpoint: 'GET /api/apm/services/{serviceName}/metadata/details',
+          params: {
+            path: { serviceName },
+            query: { start, end },
+          },
+        });
+      }
+    },
+    [selectedIconPopover, serviceName, start, end]
+  );
+
+  const isLoading = !icons && iconsFetchStatus === FETCH_STATUS.LOADING;
+
+  if (isLoading) {
+    return <EuiLoadingSpinner data-test-subj="loading" />;
+  }
+
+  const popoverItems: PopoverItem[] = [
+    {
+      key: 'service',
+      icon: {
+        type: getAgentIcon(icons?.agentName, theme.darkMode) || 'node',
+      },
+      isVisible: !!icons?.agentName,
+      title: i18n.translate('xpack.apm.serviceIcons.service', {
+        defaultMessage: 'Service',
+      }),
+      component: <ServiceDetails service={details?.service} />,
+    },
+    {
+      key: 'container',
+      icon: {
+        type: getContainerIcon(icons?.containerType),
+      },
+      isVisible: !!icons?.containerType,
+      title: i18n.translate('xpack.apm.serviceIcons.container', {
+        defaultMessage: 'Container',
+      }),
+      component: <ContainerDetails container={details?.container} />,
+    },
+    {
+      key: 'cloud',
+      icon: {
+        type: getCloudIcon(icons?.cloudProvider),
+      },
+      isVisible: !!icons?.cloudProvider,
+      title: i18n.translate('xpack.apm.serviceIcons.cloud', {
+        defaultMessage: 'Cloud',
+      }),
+      component: <CloudDetails cloud={details?.cloud} />,
+    },
+    {
+      key: 'alerts',
+      icon: {
+        type: 'bell',
+        color: theme.eui.euiColorDanger,
+        size: 'm',
+      },
+      isVisible: alerts.length > 0,
+      title: i18n.translate('xpack.apm.serviceIcons.alerts', {
+        defaultMessage: 'Alerts',
+      }),
+      component: <AlertDetails alerts={alerts} />,
+    },
+  ];
+
+  return (
+    <EuiFlexGroup gutterSize="s" responsive={false}>
+      {popoverItems.map((item) => {
+        if (item.isVisible) {
+          return (
+            <EuiFlexItem grow={false} data-test-subj={item.key} key={item.key}>
+              <IconPopover
+                isOpen={selectedIconPopover === item.key}
+                icon={item.icon}
+                detailsFetchStatus={detailsFetchStatus}
+                title={item.title}
+                onClick={() => {
+                  setSelectedIconPopover((prevSelectedIconPopover) =>
+                    item.key === prevSelectedIconPopover ? null : item.key
+                  );
+                }}
+                onClose={() => {
+                  setSelectedIconPopover(null);
+                }}
+              >
+                {item.component}
+              </IconPopover>
+            </EuiFlexItem>
+          );
+        }
+      })}
+    </EuiFlexGroup>
+  );
+}
diff --git a/x-pack/plugins/apm/public/components/app/service_details/service_icons/service_details.tsx b/x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx
similarity index 96%
rename from x-pack/plugins/apm/public/components/app/service_details/service_icons/service_details.tsx
rename to x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx
index ed503a5cb34a0..1828465fff450 100644
--- a/x-pack/plugins/apm/public/components/app/service_details/service_icons/service_details.tsx
+++ b/x-pack/plugins/apm/public/components/shared/service_icons/service_details.tsx
@@ -9,7 +9,7 @@ import { EuiDescriptionList } from '@elastic/eui';
 import { EuiDescriptionListProps } from '@elastic/eui/src/components/description_list/description_list';
 import { i18n } from '@kbn/i18n';
 import React from 'react';
-import { APIReturnType } from '../../../../services/rest/createCallApmApi';
+import { APIReturnType } from '../../../services/rest/createCallApmApi';
 
 type ServiceDetailsReturnType = APIReturnType<'GET /api/apm/services/{serviceName}/metadata/details'>;
 
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 ec42a11783273..b332c491f6e55 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
@@ -11,6 +11,7 @@ import type { ObservabilityRuleTypeRegistry } from '../../../../observability/pu
 import { ConfigSchema } from '../..';
 import { ApmPluginSetupDeps } from '../../plugin';
 import { MapsStartApi } from '../../../../maps/public';
+import { ObservabilityPublicStart } from '../../../../observability/public';
 
 export interface ApmPluginContextValue {
   appMountParameters: AppMountParameters;
@@ -18,6 +19,7 @@ export interface ApmPluginContextValue {
   core: CoreStart;
   plugins: ApmPluginSetupDeps & { maps?: MapsStartApi };
   observabilityRuleTypeRegistry: ObservabilityRuleTypeRegistry;
+  observability: ObservabilityPublicStart;
 }
 
 export const ApmPluginContext = createContext({} as ApmPluginContextValue);
diff --git a/x-pack/plugins/apm/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/apm/public/hooks/use_breadcrumbs.test.tsx
index 13a2fa3b227da..64990651b52bb 100644
--- a/x-pack/plugins/apm/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/apm/public/hooks/use_breadcrumbs.test.tsx
@@ -9,7 +9,7 @@ import { renderHook } from '@testing-library/react-hooks';
 import produce from 'immer';
 import React, { ReactNode } from 'react';
 import { MemoryRouter } from 'react-router-dom';
-import { routes } from '../components/app/Main/route_config';
+import { apmRouteConfig } from '../components/routing/apm_route_config';
 import { ApmPluginContextValue } from '../context/apm_plugin/apm_plugin_context';
 import {
   mockApmPluginContextValue,
@@ -36,7 +36,9 @@ function createWrapper(path: string) {
 }
 
 function mountBreadcrumb(path: string) {
-  renderHook(() => useBreadcrumbs(routes), { wrapper: createWrapper(path) });
+  renderHook(() => useBreadcrumbs(apmRouteConfig), {
+    wrapper: createWrapper(path),
+  });
 }
 
 const changeTitle = jest.fn();
diff --git a/x-pack/plugins/apm/public/plugin.ts b/x-pack/plugins/apm/public/plugin.ts
index 10af1837dab42..bfc0a3daf6f0e 100644
--- a/x-pack/plugins/apm/public/plugin.ts
+++ b/x-pack/plugins/apm/public/plugin.ts
@@ -6,6 +6,8 @@
  */
 
 import { i18n } from '@kbn/i18n';
+import { from } from 'rxjs';
+import { map } from 'rxjs/operators';
 import type { ConfigSchema } from '.';
 import {
   AppMountParameters,
@@ -34,6 +36,7 @@ import type {
   FetchDataParams,
   HasDataParams,
   ObservabilityPublicSetup,
+  ObservabilityPublicStart,
 } from '../../observability/public';
 import type {
   TriggersAndActionsUIPublicPluginSetup,
@@ -48,24 +51,25 @@ export type ApmPluginStart = void;
 
 export interface ApmPluginSetupDeps {
   alerting?: AlertingPluginPublicSetup;
-  ml?: MlPluginSetup;
   data: DataPublicPluginSetup;
   features: FeaturesPluginSetup;
   home?: HomePublicPluginSetup;
   licensing: LicensingPluginSetup;
-  triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
+  ml?: MlPluginSetup;
   observability: ObservabilityPublicSetup;
+  triggersActionsUi: TriggersAndActionsUIPublicPluginSetup;
 }
 
 export interface ApmPluginStartDeps {
   alerting?: AlertingPluginPublicStart;
-  ml?: MlPluginStart;
   data: DataPublicPluginStart;
+  embeddable: EmbeddableStart;
   home: void;
   licensing: void;
-  triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
-  embeddable: EmbeddableStart;
   maps?: MapsStartApi;
+  ml?: MlPluginStart;
+  triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
+  observability: ObservabilityPublicStart;
 }
 
 export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
@@ -83,6 +87,58 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
       pluginSetupDeps.home.featureCatalogue.register(featureCatalogueEntry);
     }
 
+    const servicesTitle = i18n.translate('xpack.apm.navigation.servicesTitle', {
+      defaultMessage: 'Services',
+    });
+    const tracesTitle = i18n.translate('xpack.apm.navigation.tracesTitle', {
+      defaultMessage: 'Traces',
+    });
+    const serviceMapTitle = i18n.translate(
+      'xpack.apm.navigation.serviceMapTitle',
+      { defaultMessage: 'Service Map' }
+    );
+
+    // register observability nav if user has access to plugin
+    plugins.observability.navigation.registerSections(
+      from(core.getStartServices()).pipe(
+        map(([coreStart]) => {
+          if (coreStart.application.capabilities.apm.show) {
+            return [
+              // APM navigation
+              {
+                label: 'APM',
+                sortKey: 200,
+                entries: [
+                  { label: servicesTitle, app: 'apm', path: '/services' },
+                  { label: tracesTitle, app: 'apm', path: '/traces' },
+                  { label: serviceMapTitle, app: 'apm', path: '/service-map' },
+                ],
+              },
+
+              // UX navigation
+              {
+                label: 'User Experience',
+                sortKey: 201,
+                entries: [
+                  {
+                    label: i18n.translate('xpack.apm.ux.overview.heading', {
+                      defaultMessage: 'Overview',
+                    }),
+                    app: 'ux',
+                    path: '/',
+                    matchFullPath: true,
+                    ignoreTrailingSlash: true,
+                  },
+                ],
+              },
+            ];
+          }
+
+          return [];
+        })
+      )
+    );
+
     const getApmDataHelper = async () => {
       const {
         fetchObservabilityOverviewPageData,
@@ -140,29 +196,10 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
       appRoute: '/app/apm',
       icon: 'plugins/apm/public/icon.svg',
       category: DEFAULT_APP_CATEGORIES.observability,
-      // !! Need to be kept in sync with the routes in x-pack/plugins/apm/public/components/app/Main/route_config/index.tsx
       deepLinks: [
-        {
-          id: 'services',
-          title: i18n.translate('xpack.apm.breadcrumb.servicesTitle', {
-            defaultMessage: 'Services',
-          }),
-          path: '/services',
-        },
-        {
-          id: 'traces',
-          title: i18n.translate('xpack.apm.breadcrumb.tracesTitle', {
-            defaultMessage: 'Traces',
-          }),
-          path: '/traces',
-        },
-        {
-          id: 'service-map',
-          title: i18n.translate('xpack.apm.breadcrumb.serviceMapTitle', {
-            defaultMessage: 'Service Map',
-          }),
-          path: '/service-map',
-        },
+        { id: 'services', title: servicesTitle, path: '/services' },
+        { id: 'traces', title: tracesTitle, path: '/traces' },
+        { id: 'service-map', title: serviceMapTitle, path: '/service-map' },
       ],
 
       async mount(appMountParameters: AppMountParameters<unknown>) {
@@ -213,7 +250,7 @@ export class ApmPlugin implements Plugin<ApmPluginSetup, ApmPluginStart> {
       async mount(appMountParameters: AppMountParameters<unknown>) {
         // Load application bundle and Get start service
         const [{ renderApp }, [coreStart, corePlugins]] = await Promise.all([
-          import('./application/csmApp'),
+          import('./application/uxApp'),
           core.getStartServices(),
         ]);
 
diff --git a/x-pack/plugins/apm/public/utils/getRangeFromTimeSeries.ts b/x-pack/plugins/apm/public/utils/getRangeFromTimeSeries.ts
deleted file mode 100644
index 7b4a07dc7bbc5..0000000000000
--- a/x-pack/plugins/apm/public/utils/getRangeFromTimeSeries.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { flatten } from 'lodash';
-import { TimeSeries } from '../../typings/timeseries';
-
-export function getRangeFromTimeSeries(timeseries: TimeSeries[]) {
-  const dataPoints = flatten(timeseries.map((series) => series.data));
-
-  if (dataPoints.length) {
-    return {
-      start: dataPoints[0].x,
-      end: dataPoints[dataPoints.length - 1].x,
-    };
-  }
-
-  return null;
-}
diff --git a/x-pack/plugins/apm/readme.md b/x-pack/plugins/apm/readme.md
index ef2675f4f6c65..9cfb6210e2541 100644
--- a/x-pack/plugins/apm/readme.md
+++ b/x-pack/plugins/apm/readme.md
@@ -124,7 +124,7 @@ _Note: Run the following commands from `kibana/`._
 ### Typescript
 
 ```
-yarn tsc --noEmit --emitDeclarationOnly false --project x-pack/plugins/apm/tsconfig.json --skipLibCheck
+node scripts/type_check.js --project x-pack/plugins/apm/tsconfig.json
 ```
 
 ### Prettier
@@ -136,7 +136,7 @@ yarn prettier  "./x-pack/plugins/apm/**/*.{tsx,ts,js}" --write
 ### ESLint
 
 ```
-yarn eslint ./x-pack/plugins/apm --fix
+node scripts/eslint.js x-pack/legacy/plugins/apm
 ```
 
 ## Setup default APM users
diff --git a/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts b/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
index 7f62fd3998060..18cb641bd4e65 100644
--- a/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
+++ b/x-pack/plugins/apm/scripts/create-functional-tests-archive/index.ts
@@ -10,7 +10,7 @@ import { execSync } from 'child_process';
 import moment from 'moment';
 import path from 'path';
 import fs from 'fs';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { getEsClient } from '../shared/get_es_client';
 import { parseIndexUrl } from '../shared/parse_index_url';
 
@@ -117,7 +117,7 @@ async function run() {
 
   const query = {
     bool: {
-      should: should.map(({ bool }) => ({ bool })) as QueryContainer[],
+      should: should.map(({ bool }) => ({ bool })) as QueryDslQueryContainer[],
       minimum_should_match: 1,
     },
   };
diff --git a/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts b/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts
index 508b9419344cd..091982598d6a3 100644
--- a/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/chart_preview/get_transaction_duration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import {
   PROCESSOR_EVENT,
   SERVICE_NAME,
@@ -45,7 +45,7 @@ export function getTransactionDurationChartPreview({
             : []),
           ...rangeQuery(start, end),
           ...environmentQuery(environment),
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
       },
     };
 
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
index f77cc3ee930b1..3e870eb3e32c6 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_alert_type.ts
@@ -7,7 +7,7 @@
 
 import { schema } from '@kbn/config-schema';
 import { take } from 'rxjs/operators';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
@@ -109,7 +109,7 @@ export function registerTransactionDurationAlertType({
                   },
                 },
                 ...environmentQuery(alertParams.environment),
-              ] as QueryContainer[],
+              ] as QueryDslQueryContainer[],
             },
           },
           aggs: {
diff --git a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
index 399fb9a216ef5..4cc2324f47b9d 100644
--- a/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
+++ b/x-pack/plugins/apm/server/lib/alerts/register_transaction_duration_anomaly_alert_type.ts
@@ -8,7 +8,7 @@
 import { schema } from '@kbn/config-schema';
 import { compact } from 'lodash';
 import { ESSearchResponse } from 'typings/elasticsearch';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import {
   ALERT_EVALUATION_THRESHOLD,
   ALERT_EVALUATION_VALUE,
@@ -157,7 +157,7 @@ export function registerTransactionDurationAnomalyAlertType({
                         },
                       ]
                     : []),
-                ] as QueryContainer[],
+                ] as QueryDslQueryContainer[],
               },
             },
             aggs: {
diff --git a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
index e2a39b521466a..3d5b4b754e4aa 100644
--- a/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
+++ b/x-pack/plugins/apm/server/lib/apm_telemetry/collect_data_telemetry/tasks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import { flatten, merge, sortBy, sum, pickBy } from 'lodash';
-import { CompositeAggregationSource } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { asMutableArray } from '../../../../common/utils/as_mutable_array';
 import { ProcessorEvent } from '../../../../common/processor_event';
 import { TelemetryTask } from '.';
@@ -59,7 +59,7 @@ export const tasks: TelemetryTask[] = [
     // the transaction count for that time range.
     executor: async ({ indices, search }) => {
       async function getBucketCountFromPaginatedQuery(
-        sources: CompositeAggregationSource[],
+        sources: estypes.AggregationsCompositeAggregationSource[],
         prevResult?: {
           transaction_count: number;
           expected_metric_document_count: number;
diff --git a/x-pack/plugins/apm/server/lib/fleet/get_apm_package_policies.ts b/x-pack/plugins/apm/server/lib/fleet/get_apm_package_policies.ts
new file mode 100644
index 0000000000000..363ed77d56c4d
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/fleet/get_apm_package_policies.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 {
+  CoreSetup,
+  CoreStart,
+  SavedObjectsClientContract,
+} from 'kibana/server';
+import { APMPluginStartDependencies } from '../../types';
+import { getInternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
+
+export async function getApmPackgePolicies({
+  core,
+  fleetPluginStart,
+}: {
+  core: { setup: CoreSetup; start: () => Promise<CoreStart> };
+  fleetPluginStart: NonNullable<APMPluginStartDependencies['fleet']>;
+}) {
+  // @ts-ignore
+  const savedObjectsClient: SavedObjectsClientContract = await getInternalSavedObjectsClient(
+    core.setup
+  );
+  return await fleetPluginStart.packagePolicyService.list(savedObjectsClient, {
+    kuery: 'ingest-package-policies.package.name:apm',
+  });
+}
diff --git a/x-pack/plugins/apm/server/lib/fleet/register_fleet_policy_callbacks.ts b/x-pack/plugins/apm/server/lib/fleet/register_fleet_policy_callbacks.ts
new file mode 100644
index 0000000000000..e4306b4c2ec98
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/fleet/register_fleet_policy_callbacks.ts
@@ -0,0 +1,134 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { APMPlugin, APMRouteHandlerResources } from '../..';
+import { listConfigurations } from '../settings/agent_configuration/list_configurations';
+import { setupRequest } from '../helpers/setup_request';
+import { APMPluginStartDependencies } from '../../types';
+import { ExternalCallback } from '../../../../fleet/server';
+import { AGENT_NAME } from '../../../common/elasticsearch_fieldnames';
+import { AgentConfiguration } from '../../../common/agent_configuration/configuration_types';
+
+export async function registerFleetPolicyCallbacks({
+  plugins,
+  ruleDataClient,
+  config,
+  logger,
+}: {
+  plugins: APMRouteHandlerResources['plugins'];
+  ruleDataClient: APMRouteHandlerResources['ruleDataClient'];
+  config: NonNullable<APMPlugin['currentConfig']>;
+  logger: NonNullable<APMPlugin['logger']>;
+}) {
+  if (!plugins.fleet) {
+    return;
+  }
+  const fleetPluginStart = await plugins.fleet.start();
+
+  // Registers a callback invoked when a policy is created to populate the APM
+  // integration policy with pre-existing agent configurations
+  registerAgentConfigExternalCallback({
+    fleetPluginStart,
+    callbackName: 'packagePolicyCreate',
+    plugins,
+    ruleDataClient,
+    config,
+    logger,
+  });
+
+  // Registers a callback invoked when a policy is updated to populate the APM
+  // integration policy with existing agent configurations
+  registerAgentConfigExternalCallback({
+    fleetPluginStart,
+    callbackName: 'packagePolicyUpdate',
+    plugins,
+    ruleDataClient,
+    config,
+    logger,
+  });
+}
+
+type ExternalCallbackParams = Parameters<ExternalCallback[1]>;
+type PackagePolicy = ExternalCallbackParams[0];
+type Context = ExternalCallbackParams[1];
+type Request = ExternalCallbackParams[2];
+
+function registerAgentConfigExternalCallback({
+  fleetPluginStart,
+  callbackName,
+  plugins,
+  ruleDataClient,
+  config,
+  logger,
+}: {
+  fleetPluginStart: NonNullable<APMPluginStartDependencies['fleet']>;
+  callbackName: ExternalCallback[0];
+  plugins: APMRouteHandlerResources['plugins'];
+  ruleDataClient: APMRouteHandlerResources['ruleDataClient'];
+  config: NonNullable<APMPlugin['currentConfig']>;
+  logger: NonNullable<APMPlugin['logger']>;
+}) {
+  const callbackFn: ExternalCallback[1] = async (
+    packagePolicy: PackagePolicy,
+    context: Context,
+    request: Request
+  ) => {
+    if (packagePolicy.package?.name !== 'apm') {
+      return packagePolicy;
+    }
+    const setup = await setupRequest({
+      context: context as any,
+      params: { query: { _inspect: false } },
+      core: null as any,
+      plugins,
+      request,
+      config,
+      logger,
+      ruleDataClient,
+    });
+    const agentConfigurations = await listConfigurations({ setup });
+    return getPackagePolicyWithAgentConfigurations(
+      packagePolicy,
+      agentConfigurations
+    );
+  };
+
+  fleetPluginStart.registerExternalCallback(callbackName, callbackFn);
+}
+
+const APM_SERVER = 'apm-server';
+
+// Immutable function applies the given package policy with a set of agent configurations
+export function getPackagePolicyWithAgentConfigurations(
+  packagePolicy: PackagePolicy,
+  agentConfigurations: AgentConfiguration[]
+) {
+  const [firstInput, ...restInputs] = packagePolicy.inputs;
+  const apmServerValue = firstInput?.config?.[APM_SERVER].value;
+  return {
+    ...packagePolicy,
+    inputs: [
+      {
+        ...firstInput,
+        config: {
+          [APM_SERVER]: {
+            value: {
+              ...apmServerValue,
+              agent_config: agentConfigurations.map((configuration) => ({
+                service: configuration.service,
+                config: configuration.settings,
+                etag: configuration.etag,
+                [AGENT_NAME]: configuration.agent_name,
+              })),
+            },
+          },
+        },
+      },
+      ...restInputs,
+    ],
+  };
+}
diff --git a/x-pack/plugins/apm/server/lib/fleet/sync_agent_configs_to_apm_package_policies.ts b/x-pack/plugins/apm/server/lib/fleet/sync_agent_configs_to_apm_package_policies.ts
new file mode 100644
index 0000000000000..4294c5b82cd63
--- /dev/null
+++ b/x-pack/plugins/apm/server/lib/fleet/sync_agent_configs_to_apm_package_policies.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  CoreSetup,
+  CoreStart,
+  SavedObjectsClientContract,
+} from 'kibana/server';
+import { APMPluginStartDependencies } from '../../types';
+import { getInternalSavedObjectsClient } from '../helpers/get_internal_saved_objects_client';
+import { Setup } from '../helpers/setup_request';
+import { listConfigurations } from '../settings/agent_configuration/list_configurations';
+import { getApmPackgePolicies } from './get_apm_package_policies';
+import { getPackagePolicyWithAgentConfigurations } from './register_fleet_policy_callbacks';
+
+export async function syncAgentConfigsToApmPackagePolicies({
+  core,
+  fleetPluginStart,
+  setup,
+}: {
+  core: { setup: CoreSetup; start: () => Promise<CoreStart> };
+  fleetPluginStart: NonNullable<APMPluginStartDependencies['fleet']>;
+  setup: Setup;
+}) {
+  const coreStart = await core.start();
+  const esClient = coreStart.elasticsearch.client.asInternalUser;
+  const [
+    savedObjectsClient,
+    agentConfigurations,
+    packagePolicies,
+  ] = await Promise.all([
+    getInternalSavedObjectsClient(core.setup),
+    listConfigurations({ setup }),
+    getApmPackgePolicies({
+      core,
+      fleetPluginStart,
+    }),
+  ]);
+
+  return Promise.all(
+    packagePolicies.items.map(async (item) => {
+      const { id, revision, updated_at, updated_by, ...packagePolicy } = item; // eslint-disable-line @typescript-eslint/naming-convention
+      const updatedPackagePolicy = getPackagePolicyWithAgentConfigurations(
+        packagePolicy,
+        agentConfigurations
+      );
+      return fleetPluginStart.packagePolicyService.update(
+        (savedObjectsClient as unknown) as SavedObjectsClientContract,
+        esClient,
+        id,
+        updatedPackagePolicy
+      );
+    })
+  );
+}
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 9d7434d127ead..1544538de74a6 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,11 +6,7 @@
  */
 
 import { TransportRequestPromise } from '@elastic/elasticsearch/lib/Transport';
-import {
-  CreateIndexRequest,
-  DeleteRequest,
-  IndexRequest,
-} from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { unwrapEsResponse } from '../../../../../../observability/server';
 import { APMRouteHandlerResources } from '../../../../routes/typings';
 import {
@@ -24,7 +20,7 @@ import {
 } from '../call_async_with_debug';
 import { cancelEsRequestOnAbort } from '../cancel_es_request_on_abort';
 
-export type APMIndexDocumentParams<T> = IndexRequest<T>;
+export type APMIndexDocumentParams<T> = estypes.IndexRequest<T>;
 
 export type APMInternalClient = ReturnType<typeof createInternalESClient>;
 
@@ -78,14 +74,14 @@ export function createInternalESClient({
         params,
       });
     },
-    delete: (params: DeleteRequest): Promise<{ result: string }> => {
+    delete: (params: estypes.DeleteRequest): Promise<{ result: string }> => {
       return callEs({
         requestType: 'delete',
         cb: () => asInternalUser.delete(params),
         params,
       });
     },
-    indicesCreate: (params: CreateIndexRequest) => {
+    indicesCreate: (params: estypes.IndicesCreateRequest) => {
       return callEs({
         requestType: 'indices.create',
         cb: () => asInternalUser.indices.create(params),
diff --git a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
index c58fb170bd2b0..0ec2f2c2fcfb2 100644
--- a/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
+++ b/x-pack/plugins/apm/server/lib/metrics/by_agent/shared/memory/index.ts
@@ -46,7 +46,7 @@ const chartBase: ChartBase = {
 export const percentSystemMemoryUsedScript = {
   lang: 'expression',
   source: `1 - doc['${METRIC_SYSTEM_FREE_MEMORY}'] / doc['${METRIC_SYSTEM_TOTAL_MEMORY}']`,
-};
+} as const;
 
 export const percentCgroupMemoryUsedScript = {
   lang: 'painless',
@@ -68,7 +68,7 @@ export const percentCgroupMemoryUsedScript = {
 
     return used / total;
     `,
-};
+} as const;
 
 export async function getMemoryChartData({
   environment,
diff --git a/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts b/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
index 64de74fb9023b..6047b97651e6a 100644
--- a/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/fetch_service_paths_from_trace_ids.ts
@@ -211,7 +211,7 @@ export async function fetchServicePathsFromTraceIds(
               },
             },
           },
-        },
+        } as const,
       },
     };
 
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
index bcddbff34a8f6..129a0ee73b8cb 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_anomalies.ts
@@ -64,7 +64,7 @@ export async function getServiceAnomalies({
                   by_field_value: [TRANSACTION_REQUEST, TRANSACTION_PAGE_LOAD],
                 },
               },
-            ] as estypes.QueryContainer[],
+            ] as estypes.QueryDslQueryContainer[],
           },
         },
         aggs: {
@@ -74,7 +74,9 @@ export async function getServiceAnomalies({
               sources: [
                 { serviceName: { terms: { field: 'partition_field_value' } } },
                 { jobId: { terms: { field: 'job_id' } } },
-              ] as Array<Record<string, estypes.CompositeAggregationSource>>,
+              ] as Array<
+                Record<string, estypes.AggregationsCompositeAggregationSource>
+              >,
             },
             aggs: {
               metrics: {
diff --git a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
index c1dfed377a763..9850c36c573dd 100644
--- a/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
+++ b/x-pack/plugins/apm/server/lib/service_map/get_service_map_service_node_info.ts
@@ -224,7 +224,9 @@ function getMemoryStats({
       script,
     }: {
       additionalFilters: ESFilter[];
-      script: typeof percentCgroupMemoryUsedScript;
+      script:
+        | typeof percentCgroupMemoryUsedScript
+        | typeof percentSystemMemoryUsedScript;
     }) => {
       return withApmSpan('get_avg_memory_for_service_map_node', async () => {
         const response = await apmEventClient.search({
diff --git a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
index 7ec850717dab1..f43938891f1f0 100644
--- a/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/agent_configuration/create_agent_config_index.ts
@@ -36,10 +36,11 @@ const mappings: Mappings = {
   dynamic_templates: [
     {
       // force string to keyword (instead of default of text + keyword)
+      // @ts-expect-error @elastic/elasticsearch expects here mapping: MappingPropertyBase
       strings: {
         match_mapping_type: 'string',
         mapping: {
-          type: 'keyword',
+          type: 'keyword' as const,
           ignore_above: 1024,
         },
       },
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
index 3965e363499fc..085bb2b4be40d 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/create_custom_link_index.ts
@@ -6,7 +6,7 @@
  */
 
 import { ElasticsearchClient, Logger } from 'src/core/server';
-import { PropertyBase } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
 import {
   createOrUpdateIndex,
   Mappings,
@@ -47,7 +47,7 @@ const mappings: Mappings = {
         },
       },
       // FIXME: PropertyBase type is missing .fields
-    } as PropertyBase,
+    } as estypes.MappingPropertyBase,
     url: {
       type: 'keyword',
     },
diff --git a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
index f6b41f462c99f..0eac2e08d0901 100644
--- a/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
+++ b/x-pack/plugins/apm/server/lib/settings/custom_link/list_custom_links.ts
@@ -6,7 +6,7 @@
  */
 
 import * as t from 'io-ts';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import {
   CustomLink,
   CustomLinkES,
@@ -32,7 +32,7 @@ export function listCustomLinks({
           should: [
             { term: { [key]: value } },
             { bool: { must_not: [{ exists: { field: key } }] } },
-          ] as QueryContainer[],
+          ] as QueryDslQueryContainer[],
         },
       };
     });
diff --git a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
index a946fa66a3b92..157f09978eaec 100644
--- a/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
+++ b/x-pack/plugins/apm/server/lib/traces/get_trace_items.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { ProcessorEvent } from '../../../common/processor_event';
 import {
   TRACE_ID,
@@ -76,7 +76,7 @@ export async function getTraceItems(
               filter: [
                 { term: { [TRACE_ID]: traceId } },
                 ...rangeQuery(start, end),
-              ] as QueryContainer[],
+              ] as QueryDslQueryContainer[],
               should: {
                 exists: { field: PARENT_ID },
               },
diff --git a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts
index 86be82faee578..8156d52d984df 100644
--- a/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts
+++ b/x-pack/plugins/apm/server/lib/transaction_groups/get_transaction_group_stats.ts
@@ -23,7 +23,10 @@ type BucketKey = string | Record<string, string>;
 
 function mergeRequestWithAggs<
   TRequestBase extends TransactionGroupRequestBase,
-  TAggregationMap extends Record<string, estypes.AggregationContainer>
+  TAggregationMap extends Record<
+    string,
+    estypes.AggregationsAggregationContainer
+  >
 >(request: TRequestBase, aggs: TAggregationMap) {
   return merge({}, request, {
     body: {
diff --git a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
index 1a586d1d4dbb6..3b4319c37996d 100644
--- a/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/distribution/get_buckets/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { withApmSpan } from '../../../../utils/with_apm_span';
 import {
   SERVICE_NAME,
@@ -86,7 +86,7 @@ export async function getBuckets({
         ...rangeQuery(start, end),
         ...environmentQuery(environment),
         ...kqlQuery(kuery),
-      ] as QueryContainer[];
+      ] as QueryDslQueryContainer[];
 
       async function getSamplesForDistributionBuckets() {
         const response = await withApmSpan(
@@ -106,7 +106,7 @@ export async function getBuckets({
                     should: [
                       { term: { [TRACE_ID]: traceId } },
                       { term: { [TRANSACTION_ID]: transactionId } },
-                    ] as QueryContainer[],
+                    ] as QueryDslQueryContainer[],
                   },
                 },
                 aggs: {
diff --git a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
index 8b068fd6bd2fb..b105f3b5c0a30 100644
--- a/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/get_anomaly_data/fetcher.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { ESSearchResponse } from '../../../../../../../typings/elasticsearch';
 import { PromiseReturnType } from '../../../../../observability/typings/common';
 import { rangeQuery } from '../../../../server/utils/queries';
@@ -44,7 +44,7 @@ export function anomalySeriesFetcher({
               { term: { partition_field_value: serviceName } },
               { term: { by_field_value: transactionType } },
               ...rangeQuery(start, end, 'timestamp'),
-            ] as QueryContainer[],
+            ] as QueryDslQueryContainer[],
           },
         },
         aggs: {
diff --git a/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts b/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts
index b4323ae7f51e2..6987ef0757734 100644
--- a/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts
+++ b/x-pack/plugins/apm/server/lib/transactions/get_transaction/index.ts
@@ -21,11 +21,11 @@ export function getTransaction({
   setup,
 }: {
   transactionId: string;
-  traceId: string;
-  setup: Setup & SetupTimeRange;
+  traceId?: string;
+  setup: Setup | (Setup & SetupTimeRange);
 }) {
   return withApmSpan('get_transaction', async () => {
-    const { start, end, apmEventClient } = setup;
+    const { apmEventClient } = setup;
 
     const resp = await apmEventClient.search({
       apm: {
@@ -37,8 +37,8 @@ export function getTransaction({
           bool: {
             filter: asMutableArray([
               { term: { [TRANSACTION_ID]: transactionId } },
-              { term: { [TRACE_ID]: traceId } },
-              ...rangeQuery(start, end),
+              ...(traceId ? [{ term: { [TRACE_ID]: traceId } }] : []),
+              ...('start' in setup ? rangeQuery(setup.start, setup.end) : []),
             ]),
           },
         },
diff --git a/x-pack/plugins/apm/server/plugin.ts b/x-pack/plugins/apm/server/plugin.ts
index e91ebfd26599d..1b5377b835c47 100644
--- a/x-pack/plugins/apm/server/plugin.ts
+++ b/x-pack/plugins/apm/server/plugin.ts
@@ -24,6 +24,7 @@ import { mergeConfigs } from './index';
 import { UI_SETTINGS } from '../../../../src/plugins/data/common';
 import { APM_FEATURE, registerFeaturesUsage } from './feature';
 import { registerApmAlerts } from './lib/alerts/register_apm_alerts';
+import { registerFleetPolicyCallbacks } from './lib/fleet/register_fleet_policy_callbacks';
 import { createApmTelemetry } from './lib/apm_telemetry';
 import { createApmEventClient } from './lib/helpers/create_es_client/create_apm_event_client';
 import { getInternalSavedObjectsClient } from './lib/helpers/get_internal_saved_objects_client';
@@ -199,6 +200,19 @@ export class APMPlugin
       ready,
     });
 
+    const resourcePlugins = mapValues(plugins, (value, key) => {
+      return {
+        setup: value,
+        start: () =>
+          core.getStartServices().then((services) => {
+            const [, pluginsStartContracts] = services;
+            return pluginsStartContracts[
+              key as keyof APMPluginStartDependencies
+            ];
+          }),
+      };
+    }) as APMRouteHandlerResources['plugins'];
+
     registerRoutes({
       core: {
         setup: core,
@@ -227,6 +241,13 @@ export class APMPlugin
       });
     }
 
+    registerFleetPolicyCallbacks({
+      plugins: resourcePlugins,
+      ruleDataClient,
+      config: this.currentConfig,
+      logger: this.logger,
+    });
+
     return {
       config$: mergedConfig$,
       getApmIndices: boundGetApmIndices,
diff --git a/x-pack/plugins/apm/server/projections/metrics.ts b/x-pack/plugins/apm/server/projections/metrics.ts
index 68056f091c873..9a757893337e5 100644
--- a/x-pack/plugins/apm/server/projections/metrics.ts
+++ b/x-pack/plugins/apm/server/projections/metrics.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import {
   SERVICE_NAME,
@@ -52,7 +52,7 @@ export function getMetricsProjection({
     ...rangeQuery(start, end),
     ...environmentQuery(environment),
     ...kqlQuery(kuery),
-  ] as QueryContainer[];
+  ] as QueryDslQueryContainer[];
 
   return {
     apm: {
diff --git a/x-pack/plugins/apm/server/projections/transactions.ts b/x-pack/plugins/apm/server/projections/transactions.ts
index dd16b0b910abf..3e830403debb0 100644
--- a/x-pack/plugins/apm/server/projections/transactions.ts
+++ b/x-pack/plugins/apm/server/projections/transactions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { Setup, SetupTimeRange } from '../../server/lib/helpers/setup_request';
 import {
   SERVICE_NAME,
@@ -62,7 +62,7 @@ export function getTransactionsProjection({
       ...rangeQuery(start, end),
       ...environmentQuery(environment),
       ...kqlQuery(kuery),
-    ] as QueryContainer[],
+    ] as QueryDslQueryContainer[],
   };
 
   return {
diff --git a/x-pack/plugins/apm/server/projections/typings.ts b/x-pack/plugins/apm/server/projections/typings.ts
index bb90aa0bf5eb4..60a3317af1864 100644
--- a/x-pack/plugins/apm/server/projections/typings.ts
+++ b/x-pack/plugins/apm/server/projections/typings.ts
@@ -16,7 +16,7 @@ export type Projection = Omit<APMEventESSearchRequest, 'body'> & {
     aggs?: {
       [key: string]: {
         terms: AggregationOptionsByType['terms'] & { field: string };
-        aggs?: Record<string, estypes.AggregationContainer>;
+        aggs?: Record<string, estypes.AggregationsAggregationContainer>;
       };
     };
   };
diff --git a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
index ef1ade645cc44..b2461e381bd00 100644
--- a/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
+++ b/x-pack/plugins/apm/server/routes/settings/agent_configuration.ts
@@ -25,6 +25,7 @@ import {
 } from '../../../common/agent_configuration/runtime_types/agent_configuration_intake_rt';
 import { getSearchAggregatedTransactions } from '../../lib/helpers/aggregated_transactions';
 import { createApmServerRouteRepository } from '../create_apm_server_route_repository';
+import { syncAgentConfigsToApmPackagePolicies } from '../../lib/fleet/sync_agent_configs_to_apm_package_policies';
 
 // get list of configurations
 const agentConfigurationRoute = createApmServerRoute({
@@ -78,7 +79,7 @@ const deleteAgentConfigurationRoute = createApmServerRoute({
   }),
   handler: async (resources) => {
     const setup = await setupRequest(resources);
-    const { params, logger } = resources;
+    const { params, logger, core } = resources;
 
     const { service } = params.body;
 
@@ -95,10 +96,23 @@ const deleteAgentConfigurationRoute = createApmServerRoute({
       `Deleting config ${service.name}/${service.environment} (${config._id})`
     );
 
-    return await deleteConfiguration({
+    const deleteConfigurationResult = await deleteConfiguration({
       configurationId: config._id,
       setup,
     });
+
+    if (resources.plugins.fleet) {
+      await syncAgentConfigsToApmPackagePolicies({
+        core,
+        fleetPluginStart: await resources.plugins.fleet.start(),
+        setup,
+      });
+      logger.info(
+        `Updated Fleet integration policy for APM to remove the deleted agent configuration.`
+      );
+    }
+
+    return deleteConfigurationResult;
   },
 });
 
@@ -114,7 +128,7 @@ const createOrUpdateAgentConfigurationRoute = createApmServerRoute({
   ]),
   handler: async (resources) => {
     const setup = await setupRequest(resources);
-    const { params, logger } = resources;
+    const { params, logger, core } = resources;
     const { body, query } = params;
 
     // if the config already exists, it is fetched and updated
@@ -142,6 +156,17 @@ const createOrUpdateAgentConfigurationRoute = createApmServerRoute({
       configurationIntake: body,
       setup,
     });
+
+    if (resources.plugins.fleet) {
+      await syncAgentConfigsToApmPackagePolicies({
+        core,
+        fleetPluginStart: await resources.plugins.fleet.start(),
+        setup,
+      });
+      logger.info(
+        `Saved latest agent settings to Fleet integration policy for APM.`
+      );
+    }
   },
 });
 
diff --git a/x-pack/plugins/apm/server/routes/traces.ts b/x-pack/plugins/apm/server/routes/traces.ts
index dd392982b02fd..7fce04644f220 100644
--- a/x-pack/plugins/apm/server/routes/traces.ts
+++ b/x-pack/plugins/apm/server/routes/traces.ts
@@ -14,6 +14,7 @@ import { environmentRt, kueryRt, rangeRt } from './default_api_types';
 import { getSearchAggregatedTransactions } from '../lib/helpers/aggregated_transactions';
 import { getRootTransactionByTraceId } from '../lib/transactions/get_transaction_by_trace';
 import { createApmServerRouteRepository } from './create_apm_server_route_repository';
+import { getTransaction } from '../lib/transactions/get_transaction';
 
 const tracesRoute = createApmServerRoute({
   endpoint: 'GET /api/apm/traces',
@@ -70,7 +71,24 @@ const rootTransactionByTraceIdRoute = createApmServerRoute({
   },
 });
 
+const transactionByIdRoute = createApmServerRoute({
+  endpoint: 'GET /api/apm/transactions/{transactionId}',
+  params: t.type({
+    path: t.type({
+      transactionId: t.string,
+    }),
+  }),
+  options: { tags: ['access:apm'] },
+  handler: async (resources) => {
+    const { params } = resources;
+    const { transactionId } = params.path;
+    const setup = await setupRequest(resources);
+    return { transaction: await getTransaction({ transactionId, setup }) };
+  },
+});
+
 export const traceRouteRepository = createApmServerRouteRepository()
   .add(tracesByIdRoute)
   .add(tracesRoute)
-  .add(rootTransactionByTraceIdRoute);
+  .add(rootTransactionByTraceIdRoute)
+  .add(transactionByIdRoute);
diff --git a/x-pack/plugins/apm/server/types.ts b/x-pack/plugins/apm/server/types.ts
index 341d9bc8d8604..5464c94779f5c 100644
--- a/x-pack/plugins/apm/server/types.ts
+++ b/x-pack/plugins/apm/server/types.ts
@@ -157,6 +157,7 @@ const optionalDependencies = [
   'ml',
   'home',
   'maps',
+  'fleet',
 ] as const;
 
 type RequiredDependencies = Pick<
diff --git a/x-pack/plugins/apm/server/utils/queries.ts b/x-pack/plugins/apm/server/utils/queries.ts
index 7255e7ed75a63..f21ef9de0283f 100644
--- a/x-pack/plugins/apm/server/utils/queries.ts
+++ b/x-pack/plugins/apm/server/utils/queries.ts
@@ -13,9 +13,11 @@ import {
 } from '../../common/environment_filter_values';
 export { kqlQuery, rangeQuery } from '../../../observability/server';
 
-type QueryContainer = ESFilter;
+type QueryDslQueryContainer = ESFilter;
 
-export function environmentQuery(environment?: string): QueryContainer[] {
+export function environmentQuery(
+  environment?: string
+): QueryDslQueryContainer[] {
   if (!environment || environment === ENVIRONMENT_ALL.value) {
     return [];
   }
diff --git a/x-pack/plugins/banners/server/config.ts b/x-pack/plugins/banners/server/config.ts
index 5ee01ec2b0b19..37b4c57fc2ce1 100644
--- a/x-pack/plugins/banners/server/config.ts
+++ b/x-pack/plugins/banners/server/config.ts
@@ -45,6 +45,12 @@ export const config: PluginConfigDescriptor<BannersConfigType> = {
       if (pluginConfig?.placement === 'header') {
         addDeprecation({
           message: 'The `header` value for xpack.banners.placement has been replaced by `top`',
+          correctiveActions: {
+            manualSteps: [
+              `Remove "xpack.banners.placement: header" from your kibana configs.`,
+              `Add "xpack.banners.placement: to" to your kibana configs instead.`,
+            ],
+          },
         });
         return {
           set: [{ path: `${fromPath}.placement`, value: 'top' }],
diff --git a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
index 0a6e0ce5f4ae0..422a61d4ef03e 100644
--- a/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
+++ b/x-pack/plugins/canvas/canvas_plugin_src/renderers/filters/time_filter/components/__stories__/__snapshots__/time_filter.stories.storyshot
@@ -39,8 +39,9 @@ exports[`Storyshots renderers/TimeFilter default 1`] = `
                 >
                   <span
                     className="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
-                    size="m"
+                    size="s"
                   />
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -120,8 +121,9 @@ exports[`Storyshots renderers/TimeFilter with absolute time bounds 1`] = `
                 >
                   <span
                     className="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
-                    size="m"
+                    size="s"
                   />
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -231,8 +233,9 @@ exports[`Storyshots renderers/TimeFilter with commonlyUsedRanges 1`] = `
                 >
                   <span
                     className="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
-                    size="m"
+                    size="s"
                   />
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -312,8 +315,9 @@ exports[`Storyshots renderers/TimeFilter with dateFormat 1`] = `
                 >
                   <span
                     className="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
-                    size="m"
+                    size="s"
                   />
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
@@ -393,8 +397,9 @@ exports[`Storyshots renderers/TimeFilter with relative time bounds 1`] = `
                 >
                   <span
                     className="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
-                    size="m"
+                    size="s"
                   />
                   <span
                     className="euiButtonEmpty__text euiQuickSelectPopover__buttonText"
diff --git a/x-pack/plugins/canvas/i18n/components.ts b/x-pack/plugins/canvas/i18n/components.ts
index b60f8db5b25b4..a797a8bda061b 100644
--- a/x-pack/plugins/canvas/i18n/components.ts
+++ b/x-pack/plugins/canvas/i18n/components.ts
@@ -175,6 +175,12 @@ export const ComponentStrings = {
         defaultMessage: 'Asset thumbnail',
       }),
   },
+  CanvasLoading: {
+    getLoadingLabel: () =>
+      i18n.translate('xpack.canvas.canvasLoading.loadingMessage', {
+        defaultMessage: 'Loading',
+      }),
+  },
   ColorManager: {
     getAddAriaLabel: () =>
       i18n.translate('xpack.canvas.colorManager.addAriaLabel', {
@@ -1384,6 +1390,14 @@ export const ComponentStrings = {
       i18n.translate('xpack.canvas.workpadHeaderKioskControl.controlTitle', {
         defaultMessage: 'Cycle fullscreen pages',
       }),
+    getAutoplayListDurationManualText: () =>
+      i18n.translate('xpack.canvas.workpadHeaderKioskControl.autoplayListDurationManual', {
+        defaultMessage: 'Manually',
+      }),
+    getDisableTooltip: () =>
+      i18n.translate('xpack.canvas.workpadHeaderKioskControl.disableTooltip', {
+        defaultMessage: 'Disable auto-play',
+      }),
   },
   WorkpadHeaderRefreshControlSettings: {
     getRefreshAriaLabel: () =>
diff --git a/x-pack/plugins/canvas/public/application.tsx b/x-pack/plugins/canvas/public/application.tsx
index 154beb6faa7b0..4163cb88d5fef 100644
--- a/x-pack/plugins/canvas/public/application.tsx
+++ b/x-pack/plugins/canvas/public/application.tsx
@@ -18,7 +18,6 @@ import { includes, remove } from 'lodash';
 import { AppMountParameters, CoreStart, CoreSetup, AppUpdater } from 'kibana/public';
 
 import { CanvasStartDeps, CanvasSetupDeps } from './plugin';
-// @ts-expect-error untyped local
 import { App } from './components/app';
 import { KibanaContextProvider } from '../../../../src/plugins/kibana_react/public';
 import { registerLanguage } from './lib/monaco_language_def';
@@ -32,10 +31,6 @@ import { init as initStatsReporter } from './lib/ui_metric';
 import { CapabilitiesStrings } from '../i18n';
 
 import { startServices, services, ServicesProvider } from './services';
-// @ts-expect-error untyped local
-import { createHistory, destroyHistory } from './lib/history_provider';
-// @ts-expect-error untyped local
-import { stopRouter } from './lib/router_provider';
 import { initFunctions } from './functions';
 // @ts-expect-error untyped local
 import { appUnload } from './state/actions/app';
@@ -103,9 +98,6 @@ export const initializeCanvas = async (
     services.expressions.getService().registerFunction(fn);
   }
 
-  // Re-initialize our history
-  createHistory();
-
   // Create Store
   const canvasStore = await createStore(coreSetup, setupPlugins);
 
@@ -178,7 +170,4 @@ export const teardownCanvas = (coreStart: CoreStart, startPlugins: CanvasStartDe
 
   coreStart.chrome.setBadge(undefined);
   coreStart.chrome.setHelpExtension(undefined);
-
-  destroyHistory();
-  stopRouter();
 };
diff --git a/x-pack/plugins/canvas/public/apps/export/index.ts b/x-pack/plugins/canvas/public/apps/export/index.ts
deleted file mode 100644
index 898d61d935a8d..0000000000000
--- a/x-pack/plugins/canvas/public/apps/export/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { routes } from './routes';
-export { ExportApp } from './export';
diff --git a/x-pack/plugins/canvas/public/apps/export/routes.ts b/x-pack/plugins/canvas/public/apps/export/routes.ts
deleted file mode 100644
index 2887c780f308c..0000000000000
--- a/x-pack/plugins/canvas/public/apps/export/routes.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Dispatch } from 'redux';
-// @ts-expect-error Untyped local
-import * as workpadService from '../../lib/workpad_service';
-import { setWorkpad } from '../../state/actions/workpad';
-// @ts-expect-error Untyped local
-import { fetchAllRenderables } from '../../state/actions/elements';
-// @ts-expect-error Untyped local
-import { setPage } from '../../state/actions/pages';
-// @ts-expect-error Untyped local
-import { setAssets } from '../../state/actions/assets';
-import { ExportApp } from './export';
-
-export const routes = [
-  {
-    path: '/export/workpad',
-    children: [
-      {
-        name: 'exportWorkpad',
-        path: '/pdf/:id/page/:page',
-        action: (dispatch: Dispatch) => async ({
-          params,
-          // @ts-expect-error Fix when Router is typed.
-          router,
-        }: {
-          params: { id: string; page: string };
-        }) => {
-          // load workpad if given a new id via url param
-          const fetchedWorkpad = await workpadService.get(params.id);
-          const pageNumber = parseInt(params.page, 10);
-
-          // redirect to home app on invalid workpad id or page number
-          if (fetchedWorkpad == null && isNaN(pageNumber)) {
-            return router.redirectTo('home');
-          }
-
-          const { assets, ...workpad } = fetchedWorkpad;
-          dispatch(setAssets(assets));
-          dispatch(setWorkpad(workpad, { loadPages: false }));
-          dispatch(setPage(pageNumber - 1));
-          dispatch(fetchAllRenderables({ onlyActivePage: true }));
-        },
-        meta: {
-          component: ExportApp,
-        },
-      },
-    ],
-  },
-];
diff --git a/x-pack/plugins/canvas/public/apps/home/home_app/home_app.ts b/x-pack/plugins/canvas/public/apps/home/home_app/home_app.ts
deleted file mode 100644
index 78012eed2c587..0000000000000
--- a/x-pack/plugins/canvas/public/apps/home/home_app/home_app.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 { connect } from 'react-redux';
-import { resetWorkpad } from '../../../state/actions/workpad';
-import { HomeApp as Component } from './home_app.component';
-
-export const HomeApp = connect(null, (dispatch) => ({
-  onLoad() {
-    dispatch(resetWorkpad());
-  },
-}))(Component);
diff --git a/x-pack/plugins/canvas/public/apps/home/index.ts b/x-pack/plugins/canvas/public/apps/home/index.ts
deleted file mode 100644
index bfa5245af9e9a..0000000000000
--- a/x-pack/plugins/canvas/public/apps/home/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { routes } from './routes';
-export { HomeApp } from './home_app';
diff --git a/x-pack/plugins/canvas/public/apps/home/routes.ts b/x-pack/plugins/canvas/public/apps/home/routes.ts
deleted file mode 100644
index 13d0d7d758f6d..0000000000000
--- a/x-pack/plugins/canvas/public/apps/home/routes.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { getBaseBreadcrumb, setBreadcrumb } from '../../lib/breadcrumbs';
-import { HomeApp } from './home_app';
-
-export const routes = [
-  {
-    name: 'home',
-    path: '/',
-    action: () => () => {
-      setBreadcrumb([getBaseBreadcrumb()]);
-    },
-    meta: {
-      component: HomeApp,
-    },
-  },
-];
diff --git a/x-pack/plugins/canvas/public/apps/index.ts b/x-pack/plugins/canvas/public/apps/index.ts
deleted file mode 100644
index 74defd3533ae0..0000000000000
--- a/x-pack/plugins/canvas/public/apps/index.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as home from './home';
-import * as workpad from './workpad';
-import * as exp from './export';
-
-// @ts-expect-error Router and routes are not yet strongly typed
-export const routes = [].concat(workpad.routes, home.routes, exp.routes);
-
-export const apps = [workpad.WorkpadApp, home.HomeApp, exp.ExportApp];
diff --git a/x-pack/plugins/canvas/public/apps/workpad/index.ts b/x-pack/plugins/canvas/public/apps/workpad/index.ts
deleted file mode 100644
index 90ccc98bef5ec..0000000000000
--- a/x-pack/plugins/canvas/public/apps/workpad/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { routes } from './routes';
-export { WorkpadApp } from './workpad_app';
diff --git a/x-pack/plugins/canvas/public/apps/workpad/routes.ts b/x-pack/plugins/canvas/public/apps/workpad/routes.ts
deleted file mode 100644
index 8ecba5e183343..0000000000000
--- a/x-pack/plugins/canvas/public/apps/workpad/routes.ts
+++ /dev/null
@@ -1,110 +0,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 { Dispatch } from 'redux';
-// @ts-expect-error
-import * as workpadService from '../../lib/workpad_service';
-import { notifyService } from '../../services';
-import { getBaseBreadcrumb, getWorkpadBreadcrumb, setBreadcrumb } from '../../lib/breadcrumbs';
-// @ts-expect-error
-import { getDefaultWorkpad } from '../../state/defaults';
-import { setWorkpad } from '../../state/actions/workpad';
-// @ts-expect-error
-import { setAssets, resetAssets } from '../../state/actions/assets';
-// @ts-expect-error
-import { setPage } from '../../state/actions/pages';
-import { getWorkpad } from '../../state/selectors/workpad';
-// @ts-expect-error
-import { setZoomScale } from '../../state/actions/transient';
-import { ErrorStrings } from '../../../i18n';
-import { WorkpadApp } from './workpad_app';
-import { State } from '../../../types';
-
-const { workpadRoutes: strings } = ErrorStrings;
-
-export const routes = [
-  {
-    path: '/workpad',
-    children: [
-      {
-        name: 'createWorkpad',
-        path: '/create',
-        // @ts-expect-error Fix when Router is typed.
-        action: (dispatch: Dispatch) => async ({ router }) => {
-          const newWorkpad = getDefaultWorkpad();
-          try {
-            await workpadService.create(newWorkpad);
-            dispatch(setWorkpad(newWorkpad));
-            dispatch(resetAssets());
-            router.redirectTo('loadWorkpad', { id: newWorkpad.id, page: 1 });
-          } catch (err) {
-            notifyService
-              .getService()
-              .error(err, { title: strings.getCreateFailureErrorMessage() });
-            router.redirectTo('home');
-          }
-        },
-        meta: {
-          component: WorkpadApp,
-        },
-      },
-      {
-        name: 'loadWorkpad',
-        path: '/:id(/page/:page)',
-        action: (dispatch: Dispatch, getState: () => State) => async ({
-          params,
-          // @ts-expect-error Fix when Router is typed.
-          router,
-        }: {
-          params: { id: string; page?: string };
-        }) => {
-          // load workpad if given a new id via url param
-          const state = getState();
-          const currentWorkpad = getWorkpad(state);
-          if (params.id !== currentWorkpad.id) {
-            try {
-              const fetchedWorkpad = await workpadService.get(params.id);
-
-              const { assets, ...workpad } = fetchedWorkpad;
-              dispatch(setAssets(assets));
-              dispatch(setWorkpad(workpad));
-
-              // reset transient properties when changing workpads
-              dispatch(setZoomScale(1));
-            } catch (err) {
-              notifyService
-                .getService()
-                .error(err, { title: strings.getLoadFailureErrorMessage() });
-              return router.redirectTo('home');
-            }
-          }
-
-          // fetch the workpad again, to get changes
-          const workpad = getWorkpad(getState());
-          const pageNumber = params.page ? parseInt(params.page, 10) : null;
-
-          // no page provided, append current page to url
-          if (!pageNumber || isNaN(pageNumber)) {
-            return router.redirectTo('loadWorkpad', { id: workpad.id, page: workpad.page + 1 });
-          }
-
-          // set the active page using the number provided in the url
-          const pageIndex = pageNumber - 1;
-          if (pageIndex !== workpad.page) {
-            dispatch(setPage(pageIndex));
-          }
-
-          // update the application's breadcrumb
-          setBreadcrumb([getBaseBreadcrumb(), getWorkpadBreadcrumb(workpad)]);
-        },
-        meta: {
-          component: WorkpadApp,
-        },
-      },
-    ],
-  },
-];
diff --git a/x-pack/plugins/canvas/public/components/app/app.js b/x-pack/plugins/canvas/public/components/app/app.js
deleted file mode 100644
index 7a2c6ea5c6b73..0000000000000
--- a/x-pack/plugins/canvas/public/components/app/app.js
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { routes } from '../../apps';
-import { shortcutManager } from '../../lib/shortcut_manager';
-import { getWindow } from '../../lib/get_window';
-import { Router } from '../router';
-
-import { ComponentStrings } from '../../../i18n';
-
-const { App: strings } = ComponentStrings;
-
-export class App extends React.PureComponent {
-  static propTypes = {
-    appState: PropTypes.object.isRequired,
-    setAppReady: PropTypes.func.isRequired,
-    setAppError: PropTypes.func.isRequired,
-    onRouteChange: PropTypes.func.isRequired,
-  };
-
-  static childContextTypes = {
-    shortcuts: PropTypes.object.isRequired,
-  };
-
-  getChildContext() {
-    return { shortcuts: shortcutManager };
-  }
-
-  componentDidMount() {
-    const win = getWindow();
-    win.canvasInitErrorHandler && win.canvasInitErrorHandler();
-  }
-
-  componentWillUnmount() {
-    const win = getWindow();
-    win.canvasRestoreErrorHandler && win.canvasRestoreErrorHandler();
-  }
-
-  renderError = () => {
-    console.error(this.props.appState);
-
-    return (
-      <div>
-        <div>{strings.getLoadErrorTitle()}</div>
-        <div>{strings.getLoadErrorMessage(this.props.appState.messgae)}</div>
-      </div>
-    );
-  };
-
-  render() {
-    if (this.props.appState instanceof Error) {
-      return this.renderError();
-    }
-
-    return (
-      <div className="canvas canvasContainer">
-        <Router
-          routes={routes}
-          showLoading={this.props.appState.ready === false}
-          loadingMessage={strings.getLoadingMessage()}
-          onRouteChange={this.props.onRouteChange}
-          onLoad={() => this.props.setAppReady(true)}
-          onError={(err) => this.props.setAppError(err)}
-        />
-      </div>
-    );
-  }
-}
diff --git a/x-pack/plugins/canvas/public/components/app/index.js b/x-pack/plugins/canvas/public/components/app/index.js
deleted file mode 100644
index e872f9a1a5ae5..0000000000000
--- a/x-pack/plugins/canvas/public/components/app/index.js
+++ /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 { connect } from 'react-redux';
-import { compose, withProps } from 'recompose';
-import { getAppReady, getBasePath } from '../../state/selectors/app';
-import { appReady, appError } from '../../state/actions/app';
-import { withServices } from '../../services';
-
-import { App as Component } from './app';
-
-const mapStateToProps = (state) => {
-  // appReady could be an error object
-  const appState = getAppReady(state);
-
-  return {
-    appState: typeof appState === 'object' ? appState : { ready: appState },
-    basePath: getBasePath(state),
-  };
-};
-
-const mapDispatchToProps = (dispatch) => ({
-  setAppReady: () => async () => {
-    try {
-      // set app state to ready
-      dispatch(appReady());
-    } catch (e) {
-      dispatch(appError(e));
-    }
-  },
-  setAppError: (payload) => dispatch(appError(payload)),
-});
-
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  return {
-    ...ownProps,
-    ...stateProps,
-    ...dispatchProps,
-    setAppReady: dispatchProps.setAppReady(stateProps.basePath),
-  };
-};
-
-export const App = compose(
-  connect(mapStateToProps, mapDispatchToProps, mergeProps),
-  withServices,
-  withProps((props) => ({
-    onRouteChange: props.services.navLink.updatePath,
-  }))
-)(Component);
diff --git a/x-pack/plugins/canvas/public/components/app/index.tsx b/x-pack/plugins/canvas/public/components/app/index.tsx
new file mode 100644
index 0000000000000..c2d13ea537f62
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/app/index.tsx
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useRef, useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { History } from 'history';
+// @ts-expect-error
+import createHashStateHistory from 'history-extra/dist/createHashStateHistory';
+import { useServices } from '../../services';
+// @ts-expect-error
+import { shortcutManager } from '../../lib/shortcut_manager';
+import { CanvasRouter } from '../../routes';
+
+class ShortcutManagerContextWrapper extends React.Component {
+  static childContextTypes = {
+    shortcuts: PropTypes.object.isRequired,
+  };
+
+  getChildContext() {
+    return { shortcuts: shortcutManager };
+  }
+
+  render() {
+    return <>{this.props.children}</>;
+  }
+}
+
+export const App: FC = () => {
+  const historyRef = useRef<History>(createHashStateHistory() as History);
+  const services = useServices();
+
+  useEffect(() => {
+    return historyRef.current.listen(({ pathname }) => {
+      services.navLink.updatePath(pathname);
+    });
+  });
+
+  return (
+    <ShortcutManagerContextWrapper>
+      <div className="canvas canvasContainer">
+        <CanvasRouter history={historyRef.current} />
+      </div>
+    </ShortcutManagerContextWrapper>
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot
index 62cdbc8a578e6..138f8a2af68f0 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset.stories.storyshot
@@ -79,6 +79,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="vector"
                 size="m"
               />
@@ -110,6 +111,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
                 <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="sortDown"
                   size="m"
                 />
@@ -142,6 +144,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
                 <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="copyClipboard"
                   size="m"
                 />
@@ -170,6 +173,7 @@ exports[`Storyshots components/Assets/Asset airplane 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="trash"
                 size="m"
               />
@@ -261,6 +265,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="vector"
                 size="m"
               />
@@ -292,6 +297,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
                 <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="sortDown"
                   size="m"
                 />
@@ -324,6 +330,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
                 <span
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="copyClipboard"
                   size="m"
                 />
@@ -352,6 +359,7 @@ exports[`Storyshots components/Assets/Asset marker 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="trash"
                 size="m"
               />
diff --git a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
index 91c7fe3dbe04b..34b6b333f3ef5 100644
--- a/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/asset_manager/__stories__/__snapshots__/asset_manager.stories.storyshot
@@ -24,6 +24,7 @@ exports[`Storyshots components/Assets/AssetManager no assets 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -213,6 +214,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -366,6 +368,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
+                          color="inherit"
                           data-euiicon-type="vector"
                           size="m"
                         />
@@ -397,6 +400,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
+                            color="inherit"
                             data-euiicon-type="sortDown"
                             size="m"
                           />
@@ -429,6 +433,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
+                            color="inherit"
                             data-euiicon-type="copyClipboard"
                             size="m"
                           />
@@ -457,6 +462,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
+                          color="inherit"
                           data-euiicon-type="trash"
                           size="m"
                         />
@@ -537,6 +543,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
+                          color="inherit"
                           data-euiicon-type="vector"
                           size="m"
                         />
@@ -568,6 +575,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
+                            color="inherit"
                             data-euiicon-type="sortDown"
                             size="m"
                           />
@@ -600,6 +608,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                           <span
                             aria-hidden="true"
                             className="euiButtonIcon__icon"
+                            color="inherit"
                             data-euiicon-type="copyClipboard"
                             size="m"
                           />
@@ -628,6 +637,7 @@ exports[`Storyshots components/Assets/AssetManager two assets 1`] = `
                         <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
+                          color="inherit"
                           data-euiicon-type="trash"
                           size="m"
                         />
diff --git a/x-pack/plugins/canvas/public/components/canvas_loading/canvas_loading.component.tsx b/x-pack/plugins/canvas/public/components/canvas_loading/canvas_loading.component.tsx
new file mode 100644
index 0000000000000..38e62f46c945a
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/canvas_loading/canvas_loading.component.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+import { EuiPanel, EuiLoadingChart, EuiSpacer, EuiText } from '@elastic/eui';
+import { ComponentStrings } from '../../../i18n/components';
+
+const { CanvasLoading: strings } = ComponentStrings;
+
+export const CanvasLoading: FC<{ msg?: string }> = ({
+  msg = `${strings.getLoadingLabel()}...`,
+}) => (
+  <div className="canvasContainer--loading">
+    <EuiPanel>
+      <EuiLoadingChart size="m" />
+      <EuiSpacer size="s" />
+      <EuiText color="default" size="s">
+        <p>{msg}</p>
+      </EuiText>
+    </EuiPanel>
+  </div>
+);
diff --git a/x-pack/plugins/canvas/public/components/canvas_loading/index.ts b/x-pack/plugins/canvas/public/components/canvas_loading/index.ts
new file mode 100644
index 0000000000000..80efef1915082
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/canvas_loading/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 * from './canvas_loading.component';
diff --git a/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot b/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
index d390615693e13..fd127b589dfe2 100644
--- a/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_manager/__stories__/__snapshots__/color_manager.stories.storyshot
@@ -391,6 +391,7 @@ exports[`Storyshots components/Color/ColorManager interactive 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
@@ -405,6 +406,7 @@ exports[`Storyshots components/Color/ColorManager interactive 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="minusInCircle"
           size="m"
         />
@@ -801,6 +803,7 @@ Array [
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
@@ -815,6 +818,7 @@ Array [
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="minusInCircle"
           size="m"
         />
@@ -880,6 +884,7 @@ Array [
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
@@ -894,6 +899,7 @@ Array [
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="minusInCircle"
           size="m"
         />
@@ -959,6 +965,7 @@ Array [
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
@@ -973,6 +980,7 @@ Array [
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="minusInCircle"
           size="m"
         />
diff --git a/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
index 9402b3ce2f349..3842247a2ce98 100644
--- a/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/color_picker/__stories__/__snapshots__/color_picker.stories.storyshot
@@ -234,6 +234,7 @@ exports[`Storyshots components/Color/ColorPicker interactive 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="plusInCircle"
             size="m"
           />
@@ -248,6 +249,7 @@ exports[`Storyshots components/Color/ColorPicker interactive 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="minusInCircle"
             size="m"
           />
@@ -521,6 +523,7 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
@@ -535,6 +538,7 @@ exports[`Storyshots components/Color/ColorPicker six colors 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="minusInCircle"
           size="m"
         />
@@ -781,6 +785,7 @@ exports[`Storyshots components/Color/ColorPicker six colors, value missing 1`] =
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
@@ -795,6 +800,7 @@ exports[`Storyshots components/Color/ColorPicker six colors, value missing 1`] =
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="minusInCircle"
           size="m"
         />
@@ -963,6 +969,7 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
@@ -977,6 +984,7 @@ exports[`Storyshots components/Color/ColorPicker three colors 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="minusInCircle"
           size="m"
         />
diff --git a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
index f59abc4fec6f9..18f86aca24302 100644
--- a/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/custom_element_modal/__stories__/__snapshots__/custom_element_modal.stories.storyshot
@@ -25,6 +25,7 @@ exports[`Storyshots components/Elements/CustomElementModal with description 1`]
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -333,6 +334,7 @@ exports[`Storyshots components/Elements/CustomElementModal with image 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -638,6 +640,7 @@ exports[`Storyshots components/Elements/CustomElementModal with name 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -938,6 +941,7 @@ exports[`Storyshots components/Elements/CustomElementModal with title 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
diff --git a/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot b/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
index e41e6fa83bfe1..6d170d78dd01d 100644
--- a/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/datasource/__stories__/__snapshots__/datasource_component.stories.storyshot
@@ -15,6 +15,7 @@ exports[`Storyshots components/datasource/DatasourceComponent datasource with ex
     >
       <span
         className="euiButtonContent__icon"
+        color="inherit"
         data-euiicon-type="arrowRight"
         size="m"
       />
@@ -61,6 +62,7 @@ exports[`Storyshots components/datasource/DatasourceComponent simple datasource
     >
       <span
         className="euiButtonContent__icon"
+        color="inherit"
         data-euiicon-type="arrowRight"
         size="m"
       />
diff --git a/x-pack/plugins/canvas/public/apps/export/export/__snapshots__/export_app.test.tsx.snap b/x-pack/plugins/canvas/public/components/export_app/__snapshots__/export_app.test.tsx.snap
similarity index 87%
rename from x-pack/plugins/canvas/public/apps/export/export/__snapshots__/export_app.test.tsx.snap
rename to x-pack/plugins/canvas/public/components/export_app/__snapshots__/export_app.test.tsx.snap
index 19e9000c3bffc..80a36b238b7da 100644
--- a/x-pack/plugins/canvas/public/apps/export/export/__snapshots__/export_app.test.tsx.snap
+++ b/x-pack/plugins/canvas/public/components/export_app/__snapshots__/export_app.test.tsx.snap
@@ -38,18 +38,13 @@ exports[`<ExportApp /> renders as expected 1`] = `
       <div
         className="canvasLayout__stageHeader"
       >
-        <Link
-          name="loadWorkpad"
-          params={
-            Object {
-              "id": "my-workpad-abcd",
-            }
-          }
+        <RoutingLink
+          to="/workpad/my-workpad-abcd"
         >
           <div>
             Link
           </div>
-        </Link>
+        </RoutingLink>
       </div>
       <div
         className="canvasExport__stageContent"
@@ -108,18 +103,13 @@ exports[`<ExportApp /> renders as expected 2`] = `
       <div
         className="canvasLayout__stageHeader"
       >
-        <Link
-          name="loadWorkpad"
-          params={
-            Object {
-              "id": "my-workpad-abcd",
-            }
-          }
+        <RoutingLink
+          to="/workpad/my-workpad-abcd"
         >
           <div>
             Link
           </div>
-        </Link>
+        </RoutingLink>
       </div>
       <div
         className="canvasExport__stageContent"
diff --git a/x-pack/plugins/canvas/public/apps/export/export/export_app.component.tsx b/x-pack/plugins/canvas/public/components/export_app/export_app.component.tsx
similarity index 87%
rename from x-pack/plugins/canvas/public/apps/export/export/export_app.component.tsx
rename to x-pack/plugins/canvas/public/components/export_app/export_app.component.tsx
index 86ebada396109..c3facb9268961 100644
--- a/x-pack/plugins/canvas/public/apps/export/export/export_app.component.tsx
+++ b/x-pack/plugins/canvas/public/components/export_app/export_app.component.tsx
@@ -10,9 +10,9 @@ import PropTypes from 'prop-types';
 // @ts-expect-error untyped library
 import Style from 'style-it';
 // @ts-expect-error untyped local
-import { WorkpadPage } from '../../../components/workpad_page';
-import { Link } from '../../../components/link';
-import { CanvasWorkpad } from '../../../../types';
+import { WorkpadPage } from '../workpad_page';
+import { RoutingLink } from '../routing';
+import { CanvasWorkpad } from '../../../types';
 
 export interface Props {
   workpad: CanvasWorkpad;
@@ -31,9 +31,7 @@ export const ExportApp: FC<Props> = ({ workpad, selectedPageIndex, initializeWor
     <div className="canvasExport" data-shared-page={selectedPageIndex + 1}>
       <div className="canvasExport__stage">
         <div className="canvasLayout__stageHeader">
-          <Link name="loadWorkpad" params={{ id }}>
-            Edit Workpad
-          </Link>
+          <RoutingLink to={`/workpad/${id}`}>Edit Workpad</RoutingLink>
         </div>
         {Style.it(
           workpad.css,
diff --git a/x-pack/plugins/canvas/public/apps/export/export/export_app.scss b/x-pack/plugins/canvas/public/components/export_app/export_app.scss
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/export/export/export_app.scss
rename to x-pack/plugins/canvas/public/components/export_app/export_app.scss
diff --git a/x-pack/plugins/canvas/public/apps/export/export/export_app.test.tsx b/x-pack/plugins/canvas/public/components/export_app/export_app.test.tsx
similarity index 85%
rename from x-pack/plugins/canvas/public/apps/export/export/export_app.test.tsx
rename to x-pack/plugins/canvas/public/components/export_app/export_app.test.tsx
index 9f019ad70aed3..7bd8561629499 100644
--- a/x-pack/plugins/canvas/public/apps/export/export/export_app.test.tsx
+++ b/x-pack/plugins/canvas/public/components/export_app/export_app.test.tsx
@@ -8,18 +8,18 @@
 import React from 'react';
 import { mount } from 'enzyme';
 import { ExportApp } from './export_app.component';
-import { CanvasWorkpad } from '../../../../types';
+import { CanvasWorkpad } from '../../../types';
 
 jest.mock('style-it', () => ({
   it: (css: string, Component: any) => Component,
 }));
 
-jest.mock('../../../components/workpad_page', () => ({
+jest.mock('../workpad_page', () => ({
   WorkpadPage: (props: any) => <div>Page</div>,
 }));
 
-jest.mock('../../../components/link', () => ({
-  Link: (props: any) => <div>Link</div>,
+jest.mock('../routing', () => ({
+  RoutingLink: (props: any) => <div>Link</div>,
 }));
 
 describe('<ExportApp />', () => {
diff --git a/x-pack/plugins/canvas/public/apps/export/export/export_app.ts b/x-pack/plugins/canvas/public/components/export_app/export_app.ts
similarity index 75%
rename from x-pack/plugins/canvas/public/apps/export/export/export_app.ts
rename to x-pack/plugins/canvas/public/components/export_app/export_app.ts
index ba3fa3dd445e8..1b9c603657b10 100644
--- a/x-pack/plugins/canvas/public/apps/export/export/export_app.ts
+++ b/x-pack/plugins/canvas/public/components/export_app/export_app.ts
@@ -6,10 +6,10 @@
  */
 
 import { connect } from 'react-redux';
-import { initializeWorkpad } from '../../../state/actions/workpad';
-import { getWorkpad, getSelectedPageIndex } from '../../../state/selectors/workpad';
+import { initializeWorkpad } from '../../state/actions/workpad';
+import { getWorkpad, getSelectedPageIndex } from '../../state/selectors/workpad';
 import { ExportApp as Component } from './export_app.component';
-import { State } from '../../../../types';
+import { State } from '../../../types';
 
 export const ExportApp = connect(
   (state: State) => ({
diff --git a/x-pack/plugins/canvas/public/apps/export/export/index.ts b/x-pack/plugins/canvas/public/components/export_app/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/export/export/index.ts
rename to x-pack/plugins/canvas/public/components/export_app/index.ts
diff --git a/x-pack/plugins/canvas/public/components/fullscreen/index.js b/x-pack/plugins/canvas/public/components/fullscreen/index.js
deleted file mode 100644
index 9a59e142a1a34..0000000000000
--- a/x-pack/plugins/canvas/public/components/fullscreen/index.js
+++ /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 { connect } from 'react-redux';
-import { getFullscreen } from '../../state/selectors/app';
-import { Fullscreen as Component } from './fullscreen';
-
-const mapStateToProps = (state) => ({
-  isFullscreen: getFullscreen(state),
-});
-
-export const Fullscreen = connect(mapStateToProps)(Component);
diff --git a/x-pack/plugins/canvas/public/components/fullscreen/index.tsx b/x-pack/plugins/canvas/public/components/fullscreen/index.tsx
new file mode 100644
index 0000000000000..dbf5c378ffa1c
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/fullscreen/index.tsx
@@ -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 React, { FC, useContext } from 'react';
+// @ts-expect-error
+import { Fullscreen as Component } from './fullscreen';
+
+import { WorkpadRoutingContext } from '../../routes/workpad';
+
+export const Fullscreen: FC = ({ children }) => {
+  const { isFullscreen } = useContext(WorkpadRoutingContext);
+
+  return <Component isFullscreen={isFullscreen} children={children} />;
+};
diff --git a/x-pack/plugins/canvas/public/apps/home/home_app/home_app.component.tsx b/x-pack/plugins/canvas/public/components/home_app/home_app.component.tsx
similarity index 88%
rename from x-pack/plugins/canvas/public/apps/home/home_app/home_app.component.tsx
rename to x-pack/plugins/canvas/public/components/home_app/home_app.component.tsx
index 30e9fbc153750..712b06cb39299 100644
--- a/x-pack/plugins/canvas/public/apps/home/home_app/home_app.component.tsx
+++ b/x-pack/plugins/canvas/public/components/home_app/home_app.component.tsx
@@ -8,9 +8,9 @@
 import React, { FC } from 'react';
 import { EuiPage, EuiPageBody, EuiPageContent } from '@elastic/eui';
 // @ts-expect-error untyped local
-import { WorkpadManager } from '../../../components/workpad_manager';
+import { WorkpadManager } from '../workpad_manager';
 // @ts-expect-error untyped local
-import { setDocTitle } from '../../../lib/doc_title';
+import { setDocTitle } from '../../lib/doc_title';
 
 export interface Props {
   onLoad: () => void;
diff --git a/x-pack/plugins/canvas/public/apps/home/home_app/home_app.scss b/x-pack/plugins/canvas/public/components/home_app/home_app.scss
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/home/home_app/home_app.scss
rename to x-pack/plugins/canvas/public/components/home_app/home_app.scss
diff --git a/x-pack/plugins/canvas/public/components/home_app/home_app.tsx b/x-pack/plugins/canvas/public/components/home_app/home_app.tsx
new file mode 100644
index 0000000000000..b288612450bf7
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/home_app/home_app.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useEffect } from 'react';
+import { useDispatch } from 'react-redux';
+import { getBaseBreadcrumb } from '../../lib/breadcrumbs';
+import { resetWorkpad } from '../../state/actions/workpad';
+import { HomeApp as Component } from './home_app.component';
+import { usePlatformService } from '../../services';
+
+export const HomeApp = () => {
+  const { setBreadcrumbs } = usePlatformService();
+  const dispatch = useDispatch();
+  const onLoad = () => dispatch(resetWorkpad());
+
+  useEffect(() => {
+    setBreadcrumbs([getBaseBreadcrumb()]);
+  }, [setBreadcrumbs]);
+
+  return <Component onLoad={onLoad} />;
+};
diff --git a/x-pack/plugins/canvas/public/apps/home/home_app/index.ts b/x-pack/plugins/canvas/public/components/home_app/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/home/home_app/index.ts
rename to x-pack/plugins/canvas/public/components/home_app/index.ts
diff --git a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
index 0dfb322ff7c24..5e833944046a4 100644
--- a/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/keyboard_shortcuts_doc/__stories__/__snapshots__/keyboard_shortcuts_doc.stories.storyshot
@@ -20,6 +20,7 @@ exports[`Storyshots components/KeyboardShortcutsDoc default 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
diff --git a/x-pack/plugins/canvas/public/components/link/index.ts b/x-pack/plugins/canvas/public/components/link/index.ts
deleted file mode 100644
index 33d8b39b4bcae..0000000000000
--- a/x-pack/plugins/canvas/public/components/link/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { Link } from './link';
diff --git a/x-pack/plugins/canvas/public/components/link/link.tsx b/x-pack/plugins/canvas/public/components/link/link.tsx
deleted file mode 100644
index ef78b11654b23..0000000000000
--- a/x-pack/plugins/canvas/public/components/link/link.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, MouseEvent, useContext } from 'react';
-import PropTypes from 'prop-types';
-import { EuiLink, EuiLinkProps } from '@elastic/eui';
-import { RouterContext } from '../router';
-
-import { ComponentStrings } from '../../../i18n';
-
-const { Link: strings } = ComponentStrings;
-
-const isModifiedEvent = (ev: MouseEvent) =>
-  !!(ev.metaKey || ev.altKey || ev.ctrlKey || ev.shiftKey);
-
-interface Props {
-  name: string;
-  params: Record<string, any>;
-}
-
-export const Link: FC<Props & EuiLinkProps> = ({
-  onClick,
-  target,
-  name,
-  params,
-  children,
-  ...linkArgs
-}) => {
-  const router = useContext(RouterContext);
-
-  if (router) {
-    const navigateTo = (ev: MouseEvent<HTMLButtonElement, globalThis.MouseEvent>) => {
-      if (onClick) {
-        onClick(ev);
-      }
-
-      if (
-        !ev.defaultPrevented && // onClick prevented default
-        ev.button === 0 && // ignore everything but left clicks
-        !target && // let browser handle "target=_blank" etc.
-        !isModifiedEvent(ev) // ignore clicks with modifier keys
-      ) {
-        ev.preventDefault();
-        router.navigateTo(name, params);
-      }
-    };
-
-    try {
-      return (
-        <EuiLink {...linkArgs} target={target} onClick={navigateTo}>
-          {children}
-        </EuiLink>
-      );
-    } catch (e) {
-      return <div>{strings.getErrorMessage(e.message)}</div>;
-    }
-  }
-
-  return <div>{strings.getErrorMessage('Router Undefined')}</div>;
-};
-
-Link.contextTypes = {
-  router: PropTypes.object,
-};
-
-Link.propTypes = {
-  name: PropTypes.string.isRequired,
-  params: PropTypes.object,
-};
diff --git a/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx b/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx
index ab455bcdaadf6..06968d2e4be0a 100644
--- a/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx
+++ b/x-pack/plugins/canvas/public/components/page_manager/page_manager.component.tsx
@@ -11,9 +11,9 @@ import { EuiIcon, EuiFlexGroup, EuiFlexItem, EuiText, EuiToolTip } from '@elasti
 import { DragDropContext, Droppable, Draggable, DragDropContextProps } from 'react-beautiful-dnd';
 // @ts-expect-error untyped dependency
 import Style from 'style-it';
-
 import { ConfirmModal } from '../confirm_modal';
-import { Link } from '../link';
+import { RoutingLink } from '../routing';
+import { WorkpadRoutingContext } from '../../routes/workpad';
 import { PagePreview } from '../page_preview';
 
 import { ComponentStrings } from '../../../i18n';
@@ -131,14 +131,10 @@ export class PageManager extends Component<Props, State> {
   resetRemove = () => this._isMounted && this.setState({ removeId: null });
 
   doRemove = () => {
-    const { onPreviousPage, onRemovePage, selectedPage } = this.props;
+    const { onRemovePage } = this.props;
     const { removeId } = this.state;
     this.resetRemove();
 
-    if (removeId === selectedPage) {
-      onPreviousPage();
-    }
-
     if (removeId !== null) {
       onRemovePage(removeId);
     }
@@ -156,7 +152,7 @@ export class PageManager extends Component<Props, State> {
   };
 
   renderPage = (page: CanvasPage, i: number) => {
-    const { isWriteable, selectedPage, workpadId, workpadCSS } = this.props;
+    const { isWriteable, selectedPage, workpadCSS } = this.props;
     const pageNumber = i + 1;
 
     return (
@@ -183,18 +179,18 @@ export class PageManager extends Component<Props, State> {
                 </EuiText>
               </EuiFlexItem>
               <EuiFlexItem grow={false}>
-                <Link
-                  name="loadWorkpad"
-                  params={{ id: workpadId, page: pageNumber }}
-                  aria-label={strings.getPageNumberAriaLabel(pageNumber)}
-                >
-                  {Style.it(
-                    workpadCSS,
-                    <div>
-                      <PagePreview height={100} page={page} onRemove={this.onConfirmRemove} />
-                    </div>
+                <WorkpadRoutingContext.Consumer>
+                  {({ getUrl }) => (
+                    <RoutingLink to={getUrl(pageNumber)}>
+                      {Style.it(
+                        workpadCSS,
+                        <div>
+                          <PagePreview height={100} page={page} onRemove={this.onConfirmRemove} />
+                        </div>
+                      )}
+                    </RoutingLink>
                   )}
-                </Link>
+                </WorkpadRoutingContext.Consumer>
               </EuiFlexItem>
             </EuiFlexGroup>
           </div>
diff --git a/x-pack/plugins/canvas/public/components/page_manager/page_manager.ts b/x-pack/plugins/canvas/public/components/page_manager/page_manager.ts
deleted file mode 100644
index 64b97fed7e930..0000000000000
--- a/x-pack/plugins/canvas/public/components/page_manager/page_manager.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Dispatch } from 'redux';
-import { connect } from 'react-redux';
-// @ts-expect-error untyped local
-import * as pageActions from '../../state/actions/pages';
-import { canUserWrite } from '../../state/selectors/app';
-import { getSelectedPage, getWorkpad, getPages, isWriteable } from '../../state/selectors/workpad';
-import { DEFAULT_WORKPAD_CSS } from '../../../common/lib/constants';
-import { PageManager as Component } from './page_manager.component';
-import { State } from '../../../types';
-
-const mapStateToProps = (state: State) => ({
-  isWriteable: isWriteable(state) && canUserWrite(state),
-  pages: getPages(state),
-  selectedPage: getSelectedPage(state),
-  workpadId: getWorkpad(state).id,
-  workpadCSS: getWorkpad(state).css || DEFAULT_WORKPAD_CSS,
-});
-
-const mapDispatchToProps = (dispatch: Dispatch) => ({
-  onAddPage: () => dispatch(pageActions.addPage()),
-  onMovePage: (id: string, position: number) => dispatch(pageActions.movePage(id, position)),
-  onRemovePage: (id: string) => dispatch(pageActions.removePage(id)),
-});
-
-export const PageManager = connect(mapStateToProps, mapDispatchToProps)(Component);
diff --git a/x-pack/plugins/canvas/public/components/page_manager/page_manager.tsx b/x-pack/plugins/canvas/public/components/page_manager/page_manager.tsx
new file mode 100644
index 0000000000000..5452fe8eae295
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/page_manager/page_manager.tsx
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useCallback, useContext } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+// @ts-expect-error untyped local
+import * as pageActions from '../../state/actions/pages';
+import { canUserWrite } from '../../state/selectors/app';
+import { getSelectedPage, getWorkpad, getPages, isWriteable } from '../../state/selectors/workpad';
+import { DEFAULT_WORKPAD_CSS } from '../../../common/lib/constants';
+import { PageManager as Component } from './page_manager.component';
+import { State } from '../../../types';
+import { WorkpadRoutingContext } from '../../routes/workpad';
+
+export const PageManager: FC<{ onPreviousPage: () => void }> = ({ onPreviousPage }) => {
+  const dispatch = useDispatch();
+  const propsFromState = useSelector((state: State) => ({
+    isWriteable: isWriteable(state) && canUserWrite(state),
+    pages: getPages(state),
+    selectedPage: getSelectedPage(state),
+    workpadId: getWorkpad(state).id,
+    workpadCSS: getWorkpad(state).css || DEFAULT_WORKPAD_CSS,
+  }));
+
+  const { gotoPage } = useContext(WorkpadRoutingContext);
+
+  const onAddPage = useCallback(() => dispatch(pageActions.addPage({ gotoPage })), [
+    dispatch,
+    gotoPage,
+  ]);
+
+  const onMovePage = useCallback(
+    (id: string, position: number) => dispatch(pageActions.movePage(id, position, gotoPage)),
+    [dispatch, gotoPage]
+  );
+
+  const onRemovePage = useCallback(
+    (id: string) => dispatch(pageActions.removePage({ id, gotoPage })),
+    [dispatch, gotoPage]
+  );
+
+  return (
+    <Component
+      onPreviousPage={onPreviousPage}
+      onAddPage={onAddPage}
+      onMovePage={onMovePage}
+      onRemovePage={onRemovePage}
+      {...propsFromState}
+    />
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/page_preview/page_preview.ts b/x-pack/plugins/canvas/public/components/page_preview/page_preview.ts
deleted file mode 100644
index c9a866f5182a9..0000000000000
--- a/x-pack/plugins/canvas/public/components/page_preview/page_preview.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Dispatch } from 'redux';
-import { connect } from 'react-redux';
-// @ts-expect-error untyped local
-import * as pageActions from '../../state/actions/pages';
-import { canUserWrite } from '../../state/selectors/app';
-import { isWriteable } from '../../state/selectors/workpad';
-import { PagePreview as Component } from './page_preview.component';
-import { State } from '../../../types';
-
-const mapStateToProps = (state: State) => ({
-  isWriteable: isWriteable(state) && canUserWrite(state),
-});
-
-const mapDispatchToProps = (dispatch: Dispatch) => ({
-  onDuplicate: (id: string) => dispatch(pageActions.duplicatePage(id)),
-});
-
-export const PagePreview = connect(mapStateToProps, mapDispatchToProps)(Component);
diff --git a/x-pack/plugins/canvas/public/components/page_preview/page_preview.tsx b/x-pack/plugins/canvas/public/components/page_preview/page_preview.tsx
new file mode 100644
index 0000000000000..0dde8ffdae54b
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/page_preview/page_preview.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, { FC, useContext, useCallback } from 'react';
+
+import { useDispatch, useSelector } from 'react-redux';
+// @ts-expect-error untyped local
+import * as pageActions from '../../state/actions/pages';
+import { canUserWrite } from '../../state/selectors/app';
+import { isWriteable } from '../../state/selectors/workpad';
+import { PagePreview as Component, Props } from './page_preview.component';
+import { State } from '../../../types';
+import { WorkpadRoutingContext } from '../../routes/workpad';
+
+export const PagePreview: FC<Omit<Props, 'onDuplicate' | 'isWriteable'>> = (props) => {
+  const dispatch = useDispatch();
+  const stateFromProps = useSelector((state: State) => ({
+    isWriteable: isWriteable(state) && canUserWrite(state),
+  }));
+  const { gotoPage } = useContext(WorkpadRoutingContext);
+
+  const onDuplicate = useCallback(
+    (id: string) => {
+      dispatch(pageActions.duplicatePage({ id, gotoPage }));
+    },
+    [dispatch, gotoPage]
+  );
+
+  return (
+    <Component {...props} onDuplicate={onDuplicate} isWriteable={stateFromProps.isWriteable} />
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/router/canvas_loading.js b/x-pack/plugins/canvas/public/components/router/canvas_loading.js
deleted file mode 100644
index 994367d5973c1..0000000000000
--- a/x-pack/plugins/canvas/public/components/router/canvas_loading.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { EuiPanel, EuiLoadingChart, EuiSpacer, EuiText } from '@elastic/eui';
-
-export const CanvasLoading = ({ msg }) => (
-  <div className="canvasContainer--loading">
-    <EuiPanel>
-      <EuiLoadingChart size="m" />
-      <EuiSpacer size="s" />
-      <EuiText color="default" size="s">
-        <p>{msg}</p>
-      </EuiText>
-    </EuiPanel>
-  </div>
-);
-
-CanvasLoading.propTypes = {
-  msg: PropTypes.string,
-};
-
-CanvasLoading.defaultProps = {
-  msg: 'Loading...',
-};
diff --git a/x-pack/plugins/canvas/public/components/router/context.ts b/x-pack/plugins/canvas/public/components/router/context.ts
deleted file mode 100644
index 273503d610d18..0000000000000
--- a/x-pack/plugins/canvas/public/components/router/context.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-// TODO: We should fully build out this interface for our router
-// or switch to a different router that is already typed
-interface Router {
-  navigateTo: (
-    name: string,
-    params: Record<string, number | string>,
-    state?: Record<string, string>
-  ) => void;
-}
-
-export const RouterContext = React.createContext<Router | undefined>(undefined);
diff --git a/x-pack/plugins/canvas/public/components/router/index.ts b/x-pack/plugins/canvas/public/components/router/index.ts
deleted file mode 100644
index 7942fed6ae587..0000000000000
--- a/x-pack/plugins/canvas/public/components/router/index.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { connect } from 'react-redux';
-// @ts-expect-error untyped local
-import { setFullscreen } from '../../state/actions/transient';
-import {
-  enableAutoplay,
-  setRefreshInterval,
-  setAutoplayInterval,
-} from '../../state/actions/workpad';
-// @ts-expect-error untyped local
-import { Router as Component } from './router';
-import { State } from '../../../types';
-export * from './context';
-
-const mapDispatchToProps = {
-  enableAutoplay,
-  setAutoplayInterval,
-  setFullscreen,
-  setRefreshInterval,
-};
-
-const mapStateToProps = (state: State) => ({
-  refreshInterval: state.transient.refresh.interval,
-  autoplayInterval: state.transient.autoplay.interval,
-  autoplay: state.transient.autoplay.enabled,
-  fullscreen: state.transient.fullScreen,
-});
-
-export const Router = connect(
-  mapStateToProps,
-  mapDispatchToProps,
-  (stateProps, dispatchProps, ownProps) => {
-    return {
-      ...ownProps,
-      ...dispatchProps,
-      setRefreshInterval: (interval: number) => {
-        if (interval !== stateProps.refreshInterval) {
-          dispatchProps.setRefreshInterval(interval);
-        }
-      },
-      setAutoplayInterval: (interval: number) => {
-        if (interval !== stateProps.autoplayInterval) {
-          dispatchProps.setRefreshInterval(interval);
-        }
-      },
-      enableAutoplay: (autoplay: boolean) => {
-        if (autoplay !== stateProps.autoplay) {
-          dispatchProps.enableAutoplay(autoplay);
-        }
-      },
-      setFullscreen: (fullscreen: boolean) => {
-        if (fullscreen !== stateProps.fullscreen) {
-          dispatchProps.setFullscreen(fullscreen);
-        }
-      },
-    };
-  }
-)(Component);
diff --git a/x-pack/plugins/canvas/public/components/router/router.js b/x-pack/plugins/canvas/public/components/router/router.js
deleted file mode 100644
index c68fbe9bdd98e..0000000000000
--- a/x-pack/plugins/canvas/public/components/router/router.js
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import PropTypes from 'prop-types';
-import { routerProvider } from '../../lib/router_provider';
-import { getAppState } from '../../lib/app_state';
-import { getTimeInterval } from '../../lib/time_interval';
-import { CanvasLoading } from './canvas_loading';
-import { RouterContext } from './';
-
-export class Router extends React.PureComponent {
-  static propTypes = {
-    showLoading: PropTypes.bool.isRequired,
-    onLoad: PropTypes.func.isRequired,
-    onError: PropTypes.func.isRequired,
-    routes: PropTypes.array.isRequired,
-    loadingMessage: PropTypes.string,
-    onRouteChange: PropTypes.func,
-    setFullscreen: PropTypes.func.isRequired,
-  };
-
-  static childContextTypes = {
-    router: PropTypes.object.isRequired,
-  };
-
-  state = {
-    router: {},
-    activeComponent: CanvasLoading,
-  };
-
-  getChildContext() {
-    const { router } = this.state;
-    return { router };
-  }
-
-  UNSAFE_componentWillMount() {
-    // routerProvider is a singleton, and will only ever return one instance
-    const { routes, onRouteChange, onLoad, onError } = this.props;
-    const router = routerProvider(routes);
-    let firstLoad = true;
-
-    // when the component in the route changes, render it
-    router.onPathChange((route) => {
-      const { pathname } = route.location;
-      const { component } = route.meta;
-
-      if (!component) {
-        // TODO: render some kind of 404 page, maybe from a prop?
-        if (process.env.NODE_ENV !== 'production') {
-          console.warn(`No component defined on route: ${route.name}`);
-        }
-
-        return;
-      }
-
-      // if this is the first load, execute the route
-      if (firstLoad) {
-        firstLoad = false;
-
-        // execute the route
-        router
-          .execute()
-          .then(() => onLoad())
-          .catch((err) => onError(err));
-      }
-
-      const appState = getAppState();
-
-      if (appState.__fullscreen) {
-        this.props.setFullscreen(appState.__fullscreen);
-      }
-
-      if (appState.__refreshInterval) {
-        this.props.setRefreshInterval(getTimeInterval(appState.__refreshInterval));
-      }
-
-      if (!!appState.__autoplayInterval) {
-        this.props.enableAutoplay(true);
-        this.props.setAutoplayInterval(getTimeInterval(appState.__autoplayInterval));
-      }
-
-      // notify upstream handler of route change
-      onRouteChange && onRouteChange(pathname);
-
-      this.setState({ activeComponent: component });
-    });
-
-    this.setState({ router });
-  }
-
-  render() {
-    // show loading
-    if (this.props.showLoading) {
-      return React.createElement(CanvasLoading, { msg: this.props.loadingMessage });
-    }
-
-    return (
-      <RouterContext.Provider value={this.state.router}>
-        <this.state.activeComponent />
-      </RouterContext.Provider>
-    );
-  }
-}
diff --git a/x-pack/plugins/canvas/public/components/routing/index.ts b/x-pack/plugins/canvas/public/components/routing/index.ts
new file mode 100644
index 0000000000000..a87401f952103
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/routing/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 * from './routing_link';
diff --git a/x-pack/plugins/canvas/public/components/routing/routing_link.tsx b/x-pack/plugins/canvas/public/components/routing/routing_link.tsx
new file mode 100644
index 0000000000000..bb3123de3fec8
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/routing/routing_link.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+import { EuiLink, EuiLinkProps, EuiButtonIcon, EuiButtonIconProps } from '@elastic/eui';
+import { useHistory } from 'react-router-dom';
+
+interface RoutingProps {
+  to: string;
+}
+
+type RoutingLinkProps = Omit<EuiLinkProps, 'href' | 'onClick'> & RoutingProps;
+
+export const RoutingLink: FC<RoutingLinkProps> = ({ to, ...rest }) => {
+  const history = useHistory();
+
+  // Generate the correct link href (with basename accounted for)
+  const href = history.createHref({ pathname: to });
+
+  const props = { ...rest, href } as EuiLinkProps;
+
+  return <EuiLink {...props} />;
+};
+
+type RoutingButtonIconProps = Omit<EuiButtonIconProps, 'href' | 'onClick'> & RoutingProps;
+
+export const RoutingButtonIcon: FC<RoutingButtonIconProps> = ({ to, ...rest }) => {
+  const history = useHistory();
+
+  // Generate the correct link href (with basename accounted for)
+  const href = history.createHref({ pathname: to });
+
+  const props = { ...rest, href } as EuiButtonIconProps;
+
+  return <EuiButtonIcon {...props} />;
+};
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot
index 91f13e2584efa..e70905298a58c 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_controls.stories.storyshot
@@ -33,6 +33,7 @@ exports[`Storyshots components/SavedElementsModal/ElementControls has two button
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="pencil"
             size="m"
           />
@@ -61,6 +62,7 @@ exports[`Storyshots components/SavedElementsModal/ElementControls has two button
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="trash"
             size="m"
           />
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot
index a0e12d4338e95..e0ed2934f44b6 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/element_grid.stories.storyshot
@@ -84,6 +84,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="pencil"
                 size="m"
               />
@@ -112,6 +113,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="trash"
                 size="m"
               />
@@ -193,6 +195,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="pencil"
                 size="m"
               />
@@ -221,6 +224,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="trash"
                 size="m"
               />
@@ -302,6 +306,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="pencil"
                 size="m"
               />
@@ -330,6 +335,7 @@ exports[`Storyshots components/SavedElementsModal/ElementGrid default 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="trash"
                 size="m"
               />
diff --git a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
index 82806426ff26e..bbf8b5dcca896 100644
--- a/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/saved_elements_modal/__stories__/__snapshots__/saved_elements_modal.stories.storyshot
@@ -24,6 +24,7 @@ exports[`Storyshots components/SavedElementsModal no custom elements 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -172,6 +173,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -308,6 +310,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="pencil"
                         size="m"
                       />
@@ -336,6 +339,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="trash"
                         size="m"
                       />
@@ -417,6 +421,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="pencil"
                         size="m"
                       />
@@ -445,6 +450,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="trash"
                         size="m"
                       />
@@ -526,6 +532,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="pencil"
                         size="m"
                       />
@@ -554,6 +561,7 @@ exports[`Storyshots components/SavedElementsModal with custom elements 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="trash"
                         size="m"
                       />
@@ -620,6 +628,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
       <span
         aria-hidden="true"
         className="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
         size="m"
       />
@@ -771,6 +780,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="pencil"
                         size="m"
                       />
@@ -799,6 +809,7 @@ exports[`Storyshots components/SavedElementsModal with text filter 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="trash"
                         size="m"
                       />
diff --git a/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot b/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot
index 47ba90a5118f4..e01f34abeb9f0 100644
--- a/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/sidebar_header/__stories__/__snapshots__/sidebar_header.stories.storyshot
@@ -71,6 +71,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="sortUp"
                 size="m"
               />
@@ -98,6 +99,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowUp"
                 size="m"
               />
@@ -125,6 +127,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowDown"
                 size="m"
               />
@@ -152,6 +155,7 @@ exports[`Storyshots components/Sidebar/SidebarHeader with layer controls 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="sortDown"
                 size="m"
               />
diff --git a/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot b/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
index b61f3f7f5a1e9..1b60db12f0311 100644
--- a/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/text_style_picker/__stories__/__snapshots__/text_style_picker.stories.storyshot
@@ -241,6 +241,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorBold"
                   size="m"
                 />
@@ -270,6 +271,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorItalic"
                   size="m"
                 />
@@ -299,6 +301,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorUnderline"
                   size="m"
                 />
@@ -343,6 +346,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorAlignLeft"
                   size="m"
                 />
@@ -379,6 +383,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorAlignCenter"
                   size="m"
                 />
@@ -415,6 +420,7 @@ exports[`Storyshots components/TextStylePicker default 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorAlignRight"
                   size="m"
                 />
@@ -684,6 +690,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorBold"
                   size="m"
                 />
@@ -713,6 +720,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorItalic"
                   size="m"
                 />
@@ -742,6 +750,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorUnderline"
                   size="m"
                 />
@@ -786,6 +795,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorAlignLeft"
                   size="m"
                 />
@@ -822,6 +832,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorAlignCenter"
                   size="m"
                 />
@@ -858,6 +869,7 @@ exports[`Storyshots components/TextStylePicker interactive 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="editorAlignRight"
                   size="m"
                 />
diff --git a/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot b/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot
index 1ab597ae35ca2..1bb277ac90558 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/toolbar/__stories__/__snapshots__/toolbar.stories.storyshot
@@ -24,6 +24,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           >
             <span
               className="euiButtonContent__icon"
+              color="inherit"
               data-euiicon-type="grid"
               size="m"
             />
@@ -51,6 +52,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="arrowLeft"
             size="m"
           />
@@ -89,6 +91,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="arrowRight"
             size="m"
           />
@@ -112,6 +115,7 @@ exports[`Storyshots components/Toolbar element selected 1`] = `
           >
             <span
               className="euiButtonContent__icon"
+              color="inherit"
               data-euiicon-type="editorCodeBlock"
               size="m"
             />
@@ -152,6 +156,7 @@ exports[`Storyshots components/Toolbar no element selected 1`] = `
           >
             <span
               className="euiButtonContent__icon"
+              color="inherit"
               data-euiicon-type="grid"
               size="m"
             />
@@ -179,6 +184,7 @@ exports[`Storyshots components/Toolbar no element selected 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="arrowLeft"
             size="m"
           />
@@ -217,6 +223,7 @@ exports[`Storyshots components/Toolbar no element selected 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="arrowRight"
             size="m"
           />
diff --git a/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx b/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx
index 6e5c936a113bf..baafbdafcc549 100644
--- a/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx
+++ b/x-pack/plugins/canvas/public/components/toolbar/toolbar.component.tsx
@@ -9,7 +9,6 @@ import React, { FC, useState, useContext, useEffect } from 'react';
 import PropTypes from 'prop-types';
 import {
   EuiButtonEmpty,
-  EuiButtonIcon,
   EuiFlexGroup,
   EuiFlexItem,
   EuiModal,
@@ -19,13 +18,15 @@ import {
 
 // @ts-expect-error untyped local
 import { WorkpadManager } from '../workpad_manager';
-import { RouterContext } from '../router';
 import { PageManager } from '../page_manager';
 import { Expression } from '../expression';
 import { Tray } from './tray';
 
 import { CanvasElement } from '../../../types';
 import { ComponentStrings } from '../../../i18n';
+import { RoutingButtonIcon } from '../routing';
+
+import { WorkpadRoutingContext } from '../../routes/workpad';
 
 const { Toolbar: strings } = ComponentStrings;
 
@@ -50,7 +51,7 @@ export const Toolbar: FC<Props> = ({
 }) => {
   const [activeTray, setActiveTray] = useState<TrayType | null>(null);
   const [showWorkpadManager, setShowWorkpadManager] = useState(false);
-  const router = useContext(RouterContext);
+  const { getUrl, previousPage } = useContext(WorkpadRoutingContext);
 
   // While the tray doesn't get activated if the workpad isn't writeable,
   // this effect will ensure that if the tray is open and the workpad
@@ -61,20 +62,6 @@ export const Toolbar: FC<Props> = ({
     }
   }, [isWriteable, activeTray]);
 
-  if (!router) {
-    return <div>{strings.getErrorMessage('Router Undefined')}</div>;
-  }
-
-  const nextPage = () => {
-    const page = Math.min(selectedPageNumber + 1, totalPages);
-    router.navigateTo('loadWorkpad', { id: workpadId, page });
-  };
-
-  const previousPage = () => {
-    const page = Math.max(1, selectedPageNumber - 1);
-    router.navigateTo('loadWorkpad', { id: workpadId, page });
-  };
-
   const elementIsSelected = Boolean(selectedElement);
 
   const toggleTray = (tray: TrayType) => {
@@ -119,11 +106,11 @@ export const Toolbar: FC<Props> = ({
           </EuiFlexItem>
           <EuiFlexItem grow={false} />
           <EuiFlexItem grow={false}>
-            <EuiButtonIcon
+            <RoutingButtonIcon
               color="text"
-              onClick={previousPage}
+              to={getUrl(selectedPageNumber - 1)}
               iconType="arrowLeft"
-              disabled={selectedPageNumber <= 1}
+              isDisabled={selectedPageNumber <= 1}
               aria-label={strings.getPreviousPageAriaLabel()}
             />
           </EuiFlexItem>
@@ -133,11 +120,11 @@ export const Toolbar: FC<Props> = ({
             </EuiButtonEmpty>
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
-            <EuiButtonIcon
+            <RoutingButtonIcon
               color="text"
-              onClick={nextPage}
+              to={getUrl(selectedPageNumber + 1)}
               iconType="arrowRight"
-              disabled={selectedPageNumber >= totalPages}
+              isDisabled={selectedPageNumber >= totalPages}
               aria-label={strings.getNextPageAriaLabel()}
             />
           </EuiFlexItem>
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot
index 6634c0b9feee8..a83682140693d 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/delete_var.stories.storyshot
@@ -77,6 +77,7 @@ Array [
             >
               <span
                 className="euiButtonContent__icon"
+                color="inherit"
                 data-euiicon-type="trash"
                 size="m"
               />
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
index 82f5f8b7e23cd..056b98012f342 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/edit_var.stories.storyshot
@@ -44,6 +44,7 @@ Array [
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
@@ -250,6 +251,7 @@ Array [
             >
               <span
                 className="euiButtonContent__icon"
+                color="inherit"
                 data-euiicon-type="save"
                 size="m"
               />
@@ -331,6 +333,7 @@ Array [
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
@@ -476,6 +479,7 @@ Array [
             >
               <span
                 className="euiButtonContent__icon"
+                color="inherit"
                 data-euiicon-type="save"
                 size="m"
               />
@@ -557,6 +561,7 @@ Array [
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="alert"
             size="m"
           />
@@ -702,6 +707,7 @@ Array [
             >
               <span
                 className="euiButtonContent__icon"
+                color="inherit"
                 data-euiicon-type="save"
                 size="m"
               />
@@ -904,6 +910,7 @@ Array [
             >
               <span
                 className="euiButtonContent__icon"
+                color="inherit"
                 data-euiicon-type="save"
                 size="m"
               />
diff --git a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
index ca56d812b104d..5d8efeafef69c 100644
--- a/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/var_config/__stories__/__snapshots__/var_config.stories.storyshot
@@ -69,6 +69,7 @@ exports[`Storyshots components/Variables/VarConfig default 1`] = `
               <span
                 aria-hidden="true"
                 className="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="plusInCircle"
                 size="m"
               />
diff --git a/x-pack/plugins/canvas/public/components/workpad/index.js b/x-pack/plugins/canvas/public/components/workpad/index.js
index c24be53418754..2ebefa5e0e322 100644
--- a/x-pack/plugins/canvas/public/components/workpad/index.js
+++ b/x-pack/plugins/canvas/public/components/workpad/index.js
@@ -4,14 +4,13 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
+import React, { useContext, useCallback } from 'react';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { pure, compose, withState, withProps, getContext, withHandlers } from 'recompose';
 import { transitionsRegistry } from '../../lib/transitions_registry';
-import { undoHistory, redoHistory } from '../../state/actions/history';
 import { fetchAllRenderables } from '../../state/actions/elements';
-import { setZoomScale, setFullscreen } from '../../state/actions/transient';
+import { setZoomScale } from '../../state/actions/transient';
 import { getFullscreen, getZoomScale } from '../../state/selectors/app';
 import {
   getSelectedPageIndex,
@@ -22,7 +21,8 @@ import {
 import { zoomHandlerCreators } from '../../lib/app_handler_creators';
 import { trackCanvasUiMetric, METRIC_TYPE } from '../../lib/ui_metric';
 import { LAUNCHED_FULLSCREEN, LAUNCHED_FULLSCREEN_AUTOPLAY } from '../../../common/lib/constants';
-import { Workpad as Component } from './workpad';
+import { WorkpadRoutingContext } from '../../routes/workpad';
+import { Workpad as WorkpadComponent } from './workpad';
 
 const mapStateToProps = (state) => {
   const { width, height, id: workpadId, css: workpadCss } = getWorkpad(state);
@@ -40,11 +40,8 @@ const mapStateToProps = (state) => {
 };
 
 const mapDispatchToProps = {
-  undoHistory,
-  redoHistory,
   fetchAllRenderables,
   setZoomScale,
-  setFullscreen,
 };
 
 const mergeProps = (stateProps, dispatchProps, ownProps) => {
@@ -52,19 +49,38 @@ const mergeProps = (stateProps, dispatchProps, ownProps) => {
     ...ownProps,
     ...stateProps,
     ...dispatchProps,
-    setFullscreen: (value) => {
-      dispatchProps.setFullscreen(value);
+  };
+};
 
-      if (value === true) {
+const AddContexts = (props) => {
+  const { isFullscreen, setFullscreen, undo, redo, autoplayInterval } = useContext(
+    WorkpadRoutingContext
+  );
+
+  const setFullscreenWithEffect = useCallback(
+    (fullscreen) => {
+      setFullscreen(fullscreen);
+      if (fullscreen === true) {
         trackCanvasUiMetric(
           METRIC_TYPE.COUNT,
-          stateProps.autoplayEnabled
+          autoplayInterval > 0
             ? [LAUNCHED_FULLSCREEN, LAUNCHED_FULLSCREEN_AUTOPLAY]
             : LAUNCHED_FULLSCREEN
         );
       }
     },
-  };
+    [setFullscreen, autoplayInterval]
+  );
+
+  return (
+    <WorkpadComponent
+      {...props}
+      setFullscreen={setFullscreenWithEffect}
+      isFullscreen={isFullscreen}
+      undoHistory={undo}
+      redoHistory={redo}
+    />
+  );
 };
 
 export const Workpad = compose(
@@ -119,4 +135,4 @@ export const Workpad = compose(
     },
   }),
   withHandlers(zoomHandlerCreators)
-)(Component);
+)(AddContexts);
diff --git a/x-pack/plugins/canvas/public/components/workpad/workpad.js b/x-pack/plugins/canvas/public/components/workpad/workpad.js
index 8c5b095c7b105..1e46558c7a377 100644
--- a/x-pack/plugins/canvas/public/components/workpad/workpad.js
+++ b/x-pack/plugins/canvas/public/components/workpad/workpad.js
@@ -123,14 +123,6 @@ export class Workpad extends React.PureComponent {
                   style={fsStyle}
                   data-shared-items-count={totalElementCount}
                 >
-                  {isFullscreen && (
-                    <Shortcuts
-                      name="PRESENTATION"
-                      handler={this.keyHandler}
-                      targetNodeSelector="body"
-                      global
-                    />
-                  )}
                   {pages.map((page, i) => (
                     <WorkpadPage
                       key={page.id}
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.ts b/x-pack/plugins/canvas/public/components/workpad_app/index.ts
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/workpad/workpad_app/index.ts
rename to x-pack/plugins/canvas/public/components/workpad_app/index.ts
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.component.tsx b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
similarity index 86%
rename from x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.component.tsx
rename to x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
index 52e0a03efe8b6..5074eadf306e1 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.component.tsx
@@ -7,13 +7,13 @@
 
 import React, { FC, MouseEventHandler, useRef } from 'react';
 import PropTypes from 'prop-types';
-import { Sidebar } from '../../../components/sidebar';
-import { Toolbar } from '../../../components/toolbar';
+import { Sidebar } from '../../components/sidebar';
+import { Toolbar } from '../../components/toolbar';
 // @ts-expect-error Untyped local
-import { Workpad } from '../../../components/workpad';
-import { WorkpadHeader } from '../../../components/workpad_header';
-import { CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR } from '../../../../common/lib/constants';
-import { CommitFn } from '../../../../types';
+import { Workpad } from '../workpad';
+import { WorkpadHeader } from '../workpad_header';
+import { CANVAS_LAYOUT_STAGE_CONTENT_SELECTOR } from '../../../common/lib/constants';
+import { CommitFn } from '../../../types';
 
 export const WORKPAD_CONTAINER_ID = 'canvasWorkpadContainer';
 
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
similarity index 100%
rename from x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.scss
rename to x-pack/plugins/canvas/public/components/workpad_app/workpad_app.scss
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.ts b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.ts
similarity index 80%
rename from x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.ts
rename to x-pack/plugins/canvas/public/components/workpad_app/workpad_app.ts
index f7878d1ae422b..fe98e0f4b1bff 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_app.ts
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_app.ts
@@ -9,12 +9,12 @@ import { MouseEventHandler } from 'react';
 import { Dispatch } from 'redux';
 import { connect } from 'react-redux';
 // @ts-expect-error untyped local
-import { selectToplevelNodes } from '../../../state/actions/transient';
-import { canUserWrite } from '../../../state/selectors/app';
-import { getWorkpad, isWriteable } from '../../../state/selectors/workpad';
+import { selectToplevelNodes } from '../../state/actions/transient';
+import { canUserWrite } from '../../state/selectors/app';
+import { getWorkpad, isWriteable } from '../../state/selectors/workpad';
 import { WorkpadApp as Component } from './workpad_app.component';
 import { withElementsLoadedTelemetry } from './workpad_telemetry';
-import { State } from '../../../../types';
+import { State } from '../../../types';
 
 export { WORKPAD_CONTAINER_ID } from './workpad_app.component';
 
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx b/x-pack/plugins/canvas/public/components/workpad_app/workpad_telemetry.test.tsx
similarity index 98%
rename from x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx
rename to x-pack/plugins/canvas/public/components/workpad_app/workpad_telemetry.test.tsx
index 1624921eb22cd..54fd871203f1f 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.test.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_telemetry.test.tsx
@@ -12,8 +12,8 @@ import {
   WorkpadLoadedMetric,
   WorkpadLoadedWithErrorsMetric,
 } from './workpad_telemetry';
-import { METRIC_TYPE } from '../../../lib/ui_metric';
-import { ResolvedArgType } from '../../../../types';
+import { METRIC_TYPE } from '../../lib/ui_metric';
+import { ResolvedArgType } from '../../../types';
 
 const trackMetric = jest.fn();
 const Component = withUnconnectedElementsLoadedTelemetry(() => <div />, trackMetric);
diff --git a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx b/x-pack/plugins/canvas/public/components/workpad_app/workpad_telemetry.tsx
similarity index 94%
rename from x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx
rename to x-pack/plugins/canvas/public/components/workpad_app/workpad_telemetry.tsx
index fa28b65e318b4..0915c757ff893 100644
--- a/x-pack/plugins/canvas/public/apps/workpad/workpad_app/workpad_telemetry.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_app/workpad_telemetry.tsx
@@ -7,9 +7,9 @@
 
 import React, { useState, useEffect } from 'react';
 import { connect, ConnectedProps } from 'react-redux';
-import { trackCanvasUiMetric, METRIC_TYPE } from '../../../lib/ui_metric';
-import { getElementCounts } from '../../../state/selectors/workpad';
-import { getArgs } from '../../../state/selectors/resolved_args';
+import { trackCanvasUiMetric, METRIC_TYPE } from '../../lib/ui_metric';
+import { getElementCounts } from '../../state/selectors/workpad';
+import { getArgs } from '../../state/selectors/resolved_args';
 
 const WorkpadLoadedMetric = 'workpad-loaded';
 const WorkpadLoadedWithErrorsMetric = 'workpad-loaded-with-errors';
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.ts b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.ts
deleted file mode 100644
index a272c4d1aa696..0000000000000
--- a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.ts
+++ /dev/null
@@ -1,134 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { connect } from 'react-redux';
-import { compose, withHandlers, withProps } from 'recompose';
-import { Dispatch } from 'redux';
-import { State, PositionedElement } from '../../../../types';
-import { getClipboardData } from '../../../lib/clipboard';
-// @ts-expect-error untyped local
-import { flatten } from '../../../lib/aeroelastic/functional';
-// @ts-expect-error untyped local
-import { globalStateUpdater } from '../../workpad_page/integration_utils';
-// @ts-expect-error untyped local
-import { crawlTree } from '../../workpad_page/integration_utils';
-// @ts-expect-error untyped local
-import { insertNodes, elementLayer, removeElements } from '../../../state/actions/elements';
-// @ts-expect-error untyped local
-import { undoHistory, redoHistory } from '../../../state/actions/history';
-// @ts-expect-error untyped local
-import { selectToplevelNodes } from '../../../state/actions/transient';
-import {
-  getSelectedPage,
-  getNodes,
-  getSelectedToplevelNodes,
-} from '../../../state/selectors/workpad';
-import {
-  layerHandlerCreators,
-  clipboardHandlerCreators,
-  basicHandlerCreators,
-  groupHandlerCreators,
-  alignmentDistributionHandlerCreators,
-} from '../../../lib/element_handler_creators';
-import { EditMenu as Component, Props as ComponentProps } from './edit_menu.component';
-
-type LayoutState = any;
-
-type CommitFn = (type: string, payload: any) => LayoutState;
-
-interface OwnProps {
-  commit: CommitFn;
-}
-
-const withGlobalState = (
-  commit: CommitFn,
-  updateGlobalState: (layoutState: LayoutState) => void
-) => (type: string, payload: any) => {
-  const newLayoutState = commit(type, payload);
-  if (newLayoutState.currentScene.gestureEnd) {
-    updateGlobalState(newLayoutState);
-  }
-};
-
-/*
- * TODO: this is all copied from interactive_workpad_page and workpad_shortcuts
- */
-const mapStateToProps = (state: State) => {
-  const pageId = getSelectedPage(state);
-  const nodes = getNodes(state, pageId) as PositionedElement[];
-  const selectedToplevelNodes = getSelectedToplevelNodes(state);
-
-  const selectedPrimaryShapeObjects = selectedToplevelNodes
-    .map((id: string) => nodes.find((s: PositionedElement) => s.id === id))
-    .filter((shape?: PositionedElement) => shape) as PositionedElement[];
-
-  const selectedPersistentPrimaryNodes = flatten(
-    selectedPrimaryShapeObjects.map((shape: PositionedElement) =>
-      nodes.find((n: PositionedElement) => n.id === shape.id) // is it a leaf or a persisted group?
-        ? [shape.id]
-        : nodes.filter((s: PositionedElement) => s.position.parent === shape.id).map((s) => s.id)
-    )
-  );
-
-  const selectedNodeIds: string[] = flatten(selectedPersistentPrimaryNodes.map(crawlTree(nodes)));
-  const selectedNodes = selectedNodeIds
-    .map((id: string) => nodes.find((s) => s.id === id))
-    .filter((node: PositionedElement | undefined): node is PositionedElement => {
-      return !!node;
-    });
-
-  return {
-    pageId,
-    selectedToplevelNodes,
-    selectedNodes,
-    state,
-  };
-};
-
-const mapDispatchToProps = (dispatch: Dispatch) => ({
-  insertNodes: (selectedNodes: PositionedElement[], pageId: string) =>
-    dispatch(insertNodes(selectedNodes, pageId)),
-  removeNodes: (nodeIds: string[], pageId: string) => dispatch(removeElements(nodeIds, pageId)),
-  selectToplevelNodes: (nodes: PositionedElement[]) =>
-    dispatch(
-      selectToplevelNodes(
-        nodes.filter((e: PositionedElement) => !e.position.parent).map((e) => e.id)
-      )
-    ),
-  elementLayer: (pageId: string, elementId: string, movement: number) => {
-    dispatch(elementLayer({ pageId, elementId, movement }));
-  },
-  undoHistory: () => dispatch(undoHistory()),
-  redoHistory: () => dispatch(redoHistory()),
-  dispatch,
-});
-
-const mergeProps = (
-  { state, selectedToplevelNodes, ...restStateProps }: ReturnType<typeof mapStateToProps>,
-  { dispatch, ...restDispatchProps }: ReturnType<typeof mapDispatchToProps>,
-  { commit }: OwnProps
-) => {
-  const updateGlobalState = globalStateUpdater(dispatch, state);
-
-  return {
-    ...restDispatchProps,
-    ...restStateProps,
-    commit: withGlobalState(commit, updateGlobalState),
-    groupIsSelected:
-      selectedToplevelNodes.length === 1 && selectedToplevelNodes[0].includes('group'),
-  };
-};
-
-export const EditMenu = compose<ComponentProps, OwnProps>(
-  connect(mapStateToProps, mapDispatchToProps, mergeProps),
-  withProps(() => ({ hasPasteData: Boolean(getClipboardData()) })),
-  withHandlers(basicHandlerCreators),
-  withHandlers(clipboardHandlerCreators),
-  withHandlers(layerHandlerCreators),
-  withHandlers(groupHandlerCreators),
-  withHandlers(alignmentDistributionHandlerCreators)
-)(Component);
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.tsx
new file mode 100644
index 0000000000000..00f4810be3608
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_header/edit_menu/edit_menu.tsx
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useContext } from 'react';
+import { connect } from 'react-redux';
+import { compose, withHandlers, withProps } from 'recompose';
+import { Dispatch } from 'redux';
+import { State, PositionedElement } from '../../../../types';
+import { getClipboardData } from '../../../lib/clipboard';
+// @ts-expect-error untyped local
+import { flatten } from '../../../lib/aeroelastic/functional';
+// @ts-expect-error untyped local
+import { globalStateUpdater } from '../../workpad_page/integration_utils';
+// @ts-expect-error untyped local
+import { crawlTree } from '../../workpad_page/integration_utils';
+// @ts-expect-error untyped local
+import { insertNodes, elementLayer, removeElements } from '../../../state/actions/elements';
+// @ts-expect-error untyped local
+import { undoHistory, redoHistory } from '../../../state/actions/history';
+// @ts-expect-error untyped local
+import { selectToplevelNodes } from '../../../state/actions/transient';
+import {
+  getSelectedPage,
+  getNodes,
+  getSelectedToplevelNodes,
+} from '../../../state/selectors/workpad';
+import {
+  layerHandlerCreators,
+  clipboardHandlerCreators,
+  basicHandlerCreators,
+  groupHandlerCreators,
+  alignmentDistributionHandlerCreators,
+} from '../../../lib/element_handler_creators';
+import { EditMenu as Component, Props as ComponentProps } from './edit_menu.component';
+import { WorkpadRoutingContext } from '../../../routes/workpad';
+
+type LayoutState = any;
+
+type CommitFn = (type: string, payload: any) => LayoutState;
+
+interface OwnProps {
+  commit: CommitFn;
+}
+
+const withGlobalState = (
+  commit: CommitFn,
+  updateGlobalState: (layoutState: LayoutState) => void
+) => (type: string, payload: any) => {
+  const newLayoutState = commit(type, payload);
+  if (newLayoutState.currentScene.gestureEnd) {
+    updateGlobalState(newLayoutState);
+  }
+};
+
+/*
+ * TODO: this is all copied from interactive_workpad_page and workpad_shortcuts
+ */
+const mapStateToProps = (state: State) => {
+  const pageId = getSelectedPage(state);
+  const nodes = getNodes(state, pageId) as PositionedElement[];
+  const selectedToplevelNodes = getSelectedToplevelNodes(state);
+
+  const selectedPrimaryShapeObjects = selectedToplevelNodes
+    .map((id: string) => nodes.find((s: PositionedElement) => s.id === id))
+    .filter((shape?: PositionedElement) => shape) as PositionedElement[];
+
+  const selectedPersistentPrimaryNodes = flatten(
+    selectedPrimaryShapeObjects.map((shape: PositionedElement) =>
+      nodes.find((n: PositionedElement) => n.id === shape.id) // is it a leaf or a persisted group?
+        ? [shape.id]
+        : nodes.filter((s: PositionedElement) => s.position.parent === shape.id).map((s) => s.id)
+    )
+  );
+
+  const selectedNodeIds: string[] = flatten(selectedPersistentPrimaryNodes.map(crawlTree(nodes)));
+  const selectedNodes = selectedNodeIds
+    .map((id: string) => nodes.find((s) => s.id === id))
+    .filter((node: PositionedElement | undefined): node is PositionedElement => {
+      return !!node;
+    });
+
+  return {
+    pageId,
+    selectedToplevelNodes,
+    selectedNodes,
+    state,
+  };
+};
+
+const mapDispatchToProps = (dispatch: Dispatch) => ({
+  insertNodes: (selectedNodes: PositionedElement[], pageId: string) =>
+    dispatch(insertNodes(selectedNodes, pageId)),
+  removeNodes: (nodeIds: string[], pageId: string) => dispatch(removeElements(nodeIds, pageId)),
+  selectToplevelNodes: (nodes: PositionedElement[]) =>
+    dispatch(
+      selectToplevelNodes(
+        nodes.filter((e: PositionedElement) => !e.position.parent).map((e) => e.id)
+      )
+    ),
+  elementLayer: (pageId: string, elementId: string, movement: number) => {
+    dispatch(elementLayer({ pageId, elementId, movement }));
+  },
+  dispatch,
+});
+
+const mergeProps = (
+  { state, selectedToplevelNodes, ...restStateProps }: ReturnType<typeof mapStateToProps>,
+  { dispatch, ...restDispatchProps }: ReturnType<typeof mapDispatchToProps>,
+  { commit }: OwnProps
+) => {
+  const updateGlobalState = globalStateUpdater(dispatch, state);
+
+  return {
+    ...restDispatchProps,
+    ...restStateProps,
+    commit: withGlobalState(commit, updateGlobalState),
+    groupIsSelected:
+      selectedToplevelNodes.length === 1 && selectedToplevelNodes[0].includes('group'),
+  };
+};
+
+export const EditMenuWithContext: FC<ComponentProps> = (props) => {
+  const { undo, redo } = useContext(WorkpadRoutingContext);
+
+  return <Component {...props} undoHistory={undo} redoHistory={redo} />;
+};
+
+export const EditMenu = compose<ComponentProps, OwnProps>(
+  connect(mapStateToProps, mapDispatchToProps, mergeProps),
+  withProps(() => ({ hasPasteData: Boolean(getClipboardData()) })),
+  withHandlers(basicHandlerCreators),
+  withHandlers(clipboardHandlerCreators),
+  withHandlers(layerHandlerCreators),
+  withHandlers(groupHandlerCreators),
+  withHandlers(alignmentDistributionHandlerCreators)
+)(EditMenuWithContext);
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot
index f3a29f6bb1814..371a5133fe88e 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_header/element_menu/__stories__/__snapshots__/element_menu.stories.storyshot
@@ -25,6 +25,7 @@ exports[`Storyshots components/WorkpadHeader/ElementMenu default 1`] = `
       >
         <span
           className="euiButtonContent__icon"
+          color="inherit"
           data-euiicon-type="plusInCircle"
           size="m"
         />
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx
index 83058209f7255..5c35fa75989cf 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/fullscreen_control.tsx
@@ -21,7 +21,7 @@ interface Props {
   setFullscreen: (fullscreen: boolean) => void;
 
   autoplayEnabled: boolean;
-  enableAutoplay: (autoplay: boolean) => void;
+  toggleAutoplay: () => void;
 
   onPageChange: (pageNumber: number) => void;
   previousPage: () => void;
@@ -39,19 +39,37 @@ export class FullscreenControl extends React.PureComponent<Props> {
     children: PropTypes.func.isRequired,
   };
 
+  /*
+    We need these instance functions because ReactShortcuts bind the handlers on it's mount, 
+    but then does no rebinding if it's props change. Using these instance functions will 
+    properly handle changes to incoming props since the instance functions are bound to the components
+    "this" context
+  */
   _toggleFullscreen = () => {
     const { setFullscreen, isFullscreen } = this.props;
     setFullscreen(!isFullscreen);
   };
 
+  toggleAutoplay = () => {
+    this.props.toggleAutoplay();
+  };
+
+  nextPage = () => {
+    this.props.nextPage();
+  };
+
+  previousPage = () => {
+    this.props.previousPage();
+  };
+
   // handle keypress events for presentation events
   _keyMap: { [key: string]: (...args: any[]) => void } = {
     REFRESH: this.props.fetchAllRenderables,
-    PREV: this.props.previousPage,
-    NEXT: this.props.nextPage,
+    PREV: this.previousPage,
+    NEXT: this.nextPage,
     FULLSCREEN: this._toggleFullscreen,
     FULLSCREEN_EXIT: this._toggleFullscreen,
-    PAGE_CYCLE_TOGGLE: () => this.props.enableAutoplay(!this.props.autoplayEnabled),
+    PAGE_CYCLE_TOGGLE: this.toggleAutoplay,
   };
 
   _keyHandler = (action: string, event: KeyboardEvent) => {
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js
index 630f7407f8a8d..e428dbba57b9b 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js
+++ b/x-pack/plugins/canvas/public/components/workpad_header/fullscreen_control/index.js
@@ -5,18 +5,12 @@
  * 2.0.
  */
 
-import { connect } from 'react-redux';
+import React, { useContext, useCallback } from 'react';
+import { connect, useDispatch } from 'react-redux';
 import PropTypes from 'prop-types';
 import { withState, withProps, withHandlers, compose, getContext } from 'recompose';
-import { setFullscreen, selectToplevelNodes } from '../../../state/actions/transient';
-import { enableAutoplay } from '../../../state/actions/workpad';
-import { getFullscreen } from '../../../state/selectors/app';
-import {
-  getAutoplay,
-  getSelectedPageIndex,
-  getPages,
-  getWorkpad,
-} from '../../../state/selectors/workpad';
+import { selectToplevelNodes } from '../../../state/actions/transient';
+import { getSelectedPageIndex, getPages, getWorkpad } from '../../../state/selectors/workpad';
 import { trackCanvasUiMetric, METRIC_TYPE } from '../../../lib/ui_metric';
 import {
   LAUNCHED_FULLSCREEN,
@@ -24,6 +18,7 @@ import {
 } from '../../../../common/lib/constants';
 import { transitionsRegistry } from '../../../lib/transitions_registry';
 import { fetchAllRenderables } from '../../../state/actions/elements';
+import { WorkpadRoutingContext } from '../../../routes/workpad/workpad_routing_context';
 import { FullscreenControl as Component } from './fullscreen_control';
 
 // TODO: a lot of this is borrowed code from `/components/workpad/index.js`.
@@ -32,44 +27,65 @@ const mapStateToProps = (state) => ({
   workpadId: getWorkpad(state).id,
   pages: getPages(state),
   selectedPageNumber: getSelectedPageIndex(state) + 1,
-  isFullscreen: getFullscreen(state),
-  autoplayEnabled: getAutoplay(state).enabled,
 });
 
 const mapDispatchToProps = (dispatch) => ({
-  setFullscreen: (value) => {
-    dispatch(setFullscreen(value));
-    value && dispatch(selectToplevelNodes([]));
-  },
-  enableAutoplay: (enabled) => dispatch(enableAutoplay(enabled)),
   fetchAllRenderables: () => dispatch(fetchAllRenderables()),
 });
 
-const mergeProps = (stateProps, dispatchProps, ownProps) => {
-  return {
-    ...ownProps,
-    ...stateProps,
-    ...dispatchProps,
-    setFullscreen: (value) => {
-      dispatchProps.setFullscreen(value);
+export const FullscreenControlWithContext = (props) => {
+  const {
+    isFullscreen,
+    autoplayInterval,
+    nextPage,
+    previousPage,
+    setFullscreen,
+    setIsAutoplayPaused,
+    isAutoplayPaused,
+  } = useContext(WorkpadRoutingContext);
+
+  const autoplayEnabled = autoplayInterval > 0 ? true : false;
+  const dispatch = useDispatch();
+
+  const setFullscreenWithEffects = useCallback(
+    (value) => {
+      value && dispatch(selectToplevelNodes([]));
+      setFullscreen(value);
 
       if (value === true) {
         trackCanvasUiMetric(
           METRIC_TYPE.COUNT,
-          stateProps.autoplayEnabled
+          autoplayEnabled
             ? [LAUNCHED_FULLSCREEN, LAUNCHED_FULLSCREEN_AUTOPLAY]
             : LAUNCHED_FULLSCREEN
         );
       }
     },
-  };
+    [dispatch, setFullscreen, autoplayEnabled]
+  );
+
+  const toggleAutoplay = useCallback(() => {
+    setIsAutoplayPaused(!isAutoplayPaused);
+  }, [setIsAutoplayPaused, isAutoplayPaused]);
+
+  return (
+    <Component
+      isFullscreen={isFullscreen}
+      nextPage={nextPage}
+      previousPage={previousPage}
+      autoplayEnabled={autoplayEnabled}
+      setFullscreen={setFullscreenWithEffects}
+      toggleAutoplay={toggleAutoplay}
+      {...props}
+    />
+  );
 };
 
 export const FullscreenControl = compose(
   getContext({
     router: PropTypes.object,
   }),
-  connect(mapStateToProps, mapDispatchToProps, mergeProps),
+  connect(mapStateToProps, mapDispatchToProps),
   withState('transition', 'setTransition', null),
   withState('prevSelectedPageNumber', 'setPrevSelectedPageNumber', 0),
   withProps(({ selectedPageNumber, prevSelectedPageNumber, transition }) => {
@@ -89,29 +105,7 @@ export const FullscreenControl = compose(
 
     return { getAnimation };
   }),
-  withHandlers({
-    onPageChange: (props) => (pageNumber) => {
-      if (pageNumber === props.selectedPageNumber) {
-        return;
-      }
-      props.setPrevSelectedPageNumber(props.selectedPageNumber);
-      const transitionPage = Math.max(props.selectedPageNumber, pageNumber) - 1;
-      const { transition } = props.pages[transitionPage];
-      if (transition) {
-        props.setTransition(transition);
-      }
-      props.router.navigateTo('loadWorkpad', { id: props.workpadId, page: pageNumber });
-    },
-  }),
   withHandlers({
     onTransitionEnd: ({ setTransition }) => () => setTransition(null),
-    nextPage: (props) => () => {
-      const pageNumber = Math.min(props.selectedPageNumber + 1, props.pages.length);
-      props.onPageChange(pageNumber);
-    },
-    previousPage: (props) => () => {
-      const pageNumber = Math.max(1, props.selectedPageNumber - 1);
-      props.onPageChange(pageNumber);
-    },
   })
-)(Component);
+)(FullscreenControlWithContext);
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx
index 88f383bf29c6b..1508f8683b8c1 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/auto_refresh_controls.tsx
@@ -32,7 +32,7 @@ const { getSecondsText, getMinutesText, getHoursText } = timeStrings;
 
 interface Props {
   refreshInterval: number;
-  setRefresh: (interval: number | undefined) => void;
+  setRefresh: (interval: number) => void;
   disableInterval: () => void;
 }
 
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx
index d054475d811c2..55373d7a3515c 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/kiosk_controls.tsx
@@ -5,13 +5,15 @@
  * 2.0.
  */
 
-import React, { ReactNode } from 'react';
+import React, { ReactNode, useCallback } from 'react';
 import PropTypes from 'prop-types';
 import {
+  EuiButtonIcon,
   EuiDescriptionList,
   EuiDescriptionListDescription,
   EuiDescriptionListTitle,
   EuiTitle,
+  EuiToolTip,
   EuiHorizontalRule,
   EuiLink,
   EuiSpacer,
@@ -30,7 +32,7 @@ const { getSecondsText, getMinutesText } = timeStrings;
 
 interface Props {
   autoplayInterval: number;
-  onSetInterval: (interval: number | undefined) => void;
+  onSetInterval: (interval: number) => void;
 }
 
 interface ListGroupProps {
@@ -53,6 +55,10 @@ const ListGroup = ({ children, ...rest }: ListGroupProps) => (
 const generateId = htmlIdGenerator();
 
 export const KioskControls = ({ autoplayInterval, onSetInterval }: Props) => {
+  const disableAutoplay = useCallback(() => {
+    onSetInterval(0);
+  }, [onSetInterval]);
+
   const RefreshItem = ({ duration, label, descriptionId }: RefreshItemProps) => (
     <li>
       <EuiLink onClick={() => onSetInterval(duration)} aria-describedby={descriptionId}>
@@ -71,12 +77,37 @@ export const KioskControls = ({ autoplayInterval, onSetInterval }: Props) => {
       className="canvasViewMenu__kioskSettings"
     >
       <EuiFlexItem grow={false}>
-        <EuiDescriptionList textStyle="reverse">
-          <EuiDescriptionListTitle>{strings.getTitle()}</EuiDescriptionListTitle>
-          <EuiDescriptionListDescription>
-            {timeStrings.getCycleTimeText(interval.length, interval.format)}
-          </EuiDescriptionListDescription>
-        </EuiDescriptionList>
+        <EuiFlexGroup alignItems="center" justifyContent="spaceAround" gutterSize="xs">
+          <EuiFlexItem>
+            <EuiDescriptionList textStyle="reverse">
+              <EuiDescriptionListTitle>{strings.getTitle()}</EuiDescriptionListTitle>
+              <EuiDescriptionListDescription>
+                {autoplayInterval > 0 ? (
+                  <>{timeStrings.getCycleTimeText(interval.length, interval.format)}</>
+                ) : (
+                  <>{strings.getAutoplayListDurationManualText()}</>
+                )}
+              </EuiDescriptionListDescription>
+            </EuiDescriptionList>
+          </EuiFlexItem>
+
+          <EuiFlexItem grow={false}>
+            <EuiFlexGroup justifyContent="flexEnd" gutterSize="xs">
+              {autoplayInterval > 0 ? (
+                <EuiFlexItem grow={false}>
+                  <EuiToolTip position="bottom" content={strings.getDisableTooltip()}>
+                    <EuiButtonIcon
+                      iconType="cross"
+                      onClick={disableAutoplay}
+                      aria-label={strings.getDisableTooltip()}
+                    />
+                  </EuiToolTip>
+                </EuiFlexItem>
+              ) : null}
+            </EuiFlexGroup>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+
         <EuiHorizontalRule margin="m" />
         <EuiTitle size="xxxs" id={intervalTitleId}>
           <p>{strings.getCycleFormLabel()}</p>
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx
index ddac362e9fe50..8f92db4e7f3f4 100644
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.component.tsx
@@ -76,7 +76,7 @@ export interface Props {
   /**
    * Sets auto refresh interval
    */
-  setRefreshInterval: (interval?: number) => void;
+  setRefreshInterval: (interval: number) => void;
   /**
    * Is autoplay enabled?
    */
@@ -92,7 +92,7 @@ export interface Props {
   /**
    * Sets autoplay interval
    */
-  setAutoplayInterval: (interval?: number) => void;
+  setAutoplayInterval: (interval: number) => void;
 }
 
 export const ViewMenu: FunctionComponent<Props> = ({
@@ -113,7 +113,7 @@ export const ViewMenu: FunctionComponent<Props> = ({
   enableAutoplay,
   setAutoplayInterval,
 }) => {
-  const setRefresh = (val: number | undefined) => setRefreshInterval(val);
+  const setRefresh = (val: number) => setRefreshInterval(val);
 
   const disableInterval = () => {
     setRefresh(0);
@@ -196,16 +196,6 @@ export const ViewMenu: FunctionComponent<Props> = ({
           closePopover();
         },
       },
-      {
-        name: autoplayEnabled
-          ? strings.getAutoplayOffMenuItemLabel()
-          : strings.getAutoplayOnMenuItemLabel(),
-        icon: autoplayEnabled ? 'stop' : 'play',
-        onClick: () => {
-          enableAutoplay(!autoplayEnabled);
-          closePopover();
-        },
-      },
       {
         name: strings.getAutoplaySettingsMenuItemLabel(),
         icon: 'empty',
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.ts b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.ts
deleted file mode 100644
index cd143ff240463..0000000000000
--- a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.ts
+++ /dev/null
@@ -1,101 +0,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 { connect } from 'react-redux';
-import { compose, withHandlers } from 'recompose';
-import { Dispatch } from 'redux';
-import { zoomHandlerCreators } from '../../../lib/app_handler_creators';
-import { State, CanvasWorkpadBoundingBox } from '../../../../types';
-// @ts-expect-error untyped local
-import { fetchAllRenderables } from '../../../state/actions/elements';
-// @ts-expect-error untyped local
-import { setZoomScale, setFullscreen, selectToplevelNodes } from '../../../state/actions/transient';
-import {
-  setWriteable,
-  setRefreshInterval,
-  enableAutoplay,
-  setAutoplayInterval,
-} from '../../../state/actions/workpad';
-import { getZoomScale, canUserWrite } from '../../../state/selectors/app';
-import {
-  getWorkpadBoundingBox,
-  getWorkpadWidth,
-  getWorkpadHeight,
-  isWriteable,
-  getRefreshInterval,
-  getAutoplay,
-} from '../../../state/selectors/workpad';
-import { ViewMenu as Component, Props as ComponentProps } from './view_menu.component';
-import { getFitZoomScale } from './lib/get_fit_zoom_scale';
-
-interface StateProps {
-  zoomScale: number;
-  boundingBox: CanvasWorkpadBoundingBox;
-  workpadWidth: number;
-  workpadHeight: number;
-  isWriteable: boolean;
-}
-
-interface DispatchProps {
-  setWriteable: (isWorkpadWriteable: boolean) => void;
-  setZoomScale: (scale: number) => void;
-  setFullscreen: (showFullscreen: boolean) => void;
-}
-
-const mapStateToProps = (state: State) => {
-  const { enabled, interval } = getAutoplay(state);
-
-  return {
-    zoomScale: getZoomScale(state),
-    boundingBox: getWorkpadBoundingBox(state),
-    workpadWidth: getWorkpadWidth(state),
-    workpadHeight: getWorkpadHeight(state),
-    isWriteable: isWriteable(state) && canUserWrite(state),
-    refreshInterval: getRefreshInterval(state),
-    autoplayEnabled: enabled,
-    autoplayInterval: interval,
-  };
-};
-
-const mapDispatchToProps = (dispatch: Dispatch) => ({
-  setZoomScale: (scale: number) => dispatch(setZoomScale(scale)),
-  setWriteable: (isWorkpadWriteable: boolean) => dispatch(setWriteable(isWorkpadWriteable)),
-  setFullscreen: (value: boolean) => {
-    dispatch(setFullscreen(value));
-
-    if (value) {
-      dispatch(selectToplevelNodes([]));
-    }
-  },
-  doRefresh: () => dispatch(fetchAllRenderables()),
-  setRefreshInterval: (interval: number) => dispatch(setRefreshInterval(interval)),
-  enableAutoplay: (autoplay: number) => dispatch(enableAutoplay(!!autoplay)),
-  setAutoplayInterval: (interval: number) => dispatch(setAutoplayInterval(interval)),
-});
-
-const mergeProps = (
-  stateProps: StateProps,
-  dispatchProps: DispatchProps,
-  ownProps: ComponentProps
-): ComponentProps => {
-  const { boundingBox, workpadWidth, workpadHeight, ...remainingStateProps } = stateProps;
-
-  return {
-    ...remainingStateProps,
-    ...dispatchProps,
-    ...ownProps,
-    toggleWriteable: () => dispatchProps.setWriteable(!stateProps.isWriteable),
-    enterFullscreen: () => dispatchProps.setFullscreen(true),
-    fitToWindow: () =>
-      dispatchProps.setZoomScale(getFitZoomScale(boundingBox, workpadWidth, workpadHeight)),
-  };
-};
-
-export const ViewMenu = compose<ComponentProps, {}>(
-  connect(mapStateToProps, mapDispatchToProps, mergeProps),
-  withHandlers(zoomHandlerCreators)
-)(Component);
diff --git a/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.tsx
new file mode 100644
index 0000000000000..7b9c5b767aba0
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_header/view_menu/view_menu.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, { FC, useCallback, useContext } from 'react';
+import { connect, useDispatch } from 'react-redux';
+import { compose, withHandlers } from 'recompose';
+import { Dispatch } from 'redux';
+import { zoomHandlerCreators } from '../../../lib/app_handler_creators';
+import { State, CanvasWorkpadBoundingBox } from '../../../../types';
+// @ts-expect-error untyped local
+import { fetchAllRenderables } from '../../../state/actions/elements';
+// @ts-expect-error untyped local
+import { setZoomScale, selectToplevelNodes } from '../../../state/actions/transient';
+import { setWriteable } from '../../../state/actions/workpad';
+import { getZoomScale, canUserWrite } from '../../../state/selectors/app';
+import {
+  getWorkpadBoundingBox,
+  getWorkpadWidth,
+  getWorkpadHeight,
+  isWriteable,
+} from '../../../state/selectors/workpad';
+import { WorkpadRoutingContext } from '../../../routes/workpad';
+import { ViewMenu as Component, Props as ComponentProps } from './view_menu.component';
+import { getFitZoomScale } from './lib/get_fit_zoom_scale';
+
+interface StateProps {
+  zoomScale: number;
+  boundingBox: CanvasWorkpadBoundingBox;
+  workpadWidth: number;
+  workpadHeight: number;
+  isWriteable: boolean;
+}
+
+interface DispatchProps {
+  setWriteable: (isWorkpadWriteable: boolean) => void;
+  setZoomScale: (scale: number) => void;
+  doRefresh: () => void;
+}
+
+type PropsFromContext =
+  | 'enterFullscreen'
+  | 'setAutoplayInterval'
+  | 'autoplayEnabled'
+  | 'autoplayInterval'
+  | 'setRefreshInterval'
+  | 'refreshInterval';
+
+const mapStateToProps = (state: State) => {
+  return {
+    zoomScale: getZoomScale(state),
+    boundingBox: getWorkpadBoundingBox(state),
+    workpadWidth: getWorkpadWidth(state),
+    workpadHeight: getWorkpadHeight(state),
+    isWriteable: isWriteable(state) && canUserWrite(state),
+  };
+};
+
+const mapDispatchToProps = (dispatch: Dispatch) => ({
+  setZoomScale: (scale: number) => dispatch(setZoomScale(scale)),
+  setWriteable: (isWorkpadWriteable: boolean) => dispatch(setWriteable(isWorkpadWriteable)),
+  doRefresh: () => dispatch(fetchAllRenderables()),
+});
+
+const mergeProps = (
+  stateProps: StateProps,
+  dispatchProps: DispatchProps,
+  ownProps: ComponentProps
+): ComponentProps => {
+  const { boundingBox, workpadWidth, workpadHeight, ...remainingStateProps } = stateProps;
+
+  return {
+    ...remainingStateProps,
+    ...dispatchProps,
+    ...ownProps,
+    toggleWriteable: () => dispatchProps.setWriteable(!stateProps.isWriteable),
+    fitToWindow: () =>
+      dispatchProps.setZoomScale(getFitZoomScale(boundingBox, workpadWidth, workpadHeight)),
+  };
+};
+
+const ViewMenuWithContext: FC<Omit<ComponentProps, PropsFromContext>> = (props) => {
+  const dispatch = useDispatch();
+  const {
+    autoplayInterval,
+    setAutoplayInterval,
+    setFullscreen,
+    setRefreshInterval,
+    refreshInterval,
+  } = useContext(WorkpadRoutingContext);
+
+  const enterFullscreen = useCallback(() => {
+    dispatch(selectToplevelNodes([]));
+    setFullscreen(true);
+  }, [dispatch, setFullscreen]);
+
+  return (
+    <Component
+      {...props}
+      enterFullscreen={enterFullscreen}
+      setAutoplayInterval={setAutoplayInterval}
+      autoplayEnabled={true}
+      autoplayInterval={autoplayInterval}
+      setRefreshInterval={setRefreshInterval}
+      refreshInterval={refreshInterval}
+    />
+  );
+};
+
+export const ViewMenu = compose<Omit<ComponentProps, PropsFromContext>, {}>(
+  connect(mapStateToProps, mapDispatchToProps, mergeProps),
+  withHandlers(zoomHandlerCreators)
+)(ViewMenuWithContext);
diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/index.js b/x-pack/plugins/canvas/public/components/workpad_loader/index.js
deleted file mode 100644
index b279000837dd5..0000000000000
--- a/x-pack/plugins/canvas/public/components/workpad_loader/index.js
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import PropTypes from 'prop-types';
-import { connect } from 'react-redux';
-import { compose, withState, getContext, withHandlers, withProps } from 'recompose';
-import moment from 'moment';
-import * as workpadService from '../../lib/workpad_service';
-import { canUserWrite } from '../../state/selectors/app';
-import { getWorkpad } from '../../state/selectors/workpad';
-import { getId } from '../../lib/get_id';
-import { downloadWorkpad } from '../../lib/download_workpad';
-import { ComponentStrings, ErrorStrings } from '../../../i18n';
-import { withServices } from '../../services';
-import { WorkpadLoader as Component } from './workpad_loader';
-
-const { WorkpadLoader: strings } = ComponentStrings;
-const { WorkpadLoader: errors } = ErrorStrings;
-
-const mapStateToProps = (state) => ({
-  workpadId: getWorkpad(state).id,
-  canUserWrite: canUserWrite(state),
-});
-
-export const WorkpadLoader = compose(
-  getContext({
-    router: PropTypes.object,
-  }),
-  connect(mapStateToProps),
-  withState('workpads', 'setWorkpads', null),
-  withServices,
-  withProps(({ services }) => ({
-    notify: services.notify,
-  })),
-  withHandlers(({ services }) => ({
-    // Workpad creation via navigation
-    createWorkpad: (props) => async (workpad) => {
-      // workpad data uploaded, create and load it
-      if (workpad != null) {
-        try {
-          await workpadService.create(workpad);
-          props.router.navigateTo('loadWorkpad', { id: workpad.id, page: 1 });
-        } catch (err) {
-          services.notify.error(err, {
-            title: errors.getUploadFailureErrorMessage(),
-          });
-        }
-        return;
-      }
-
-      props.router.navigateTo('createWorkpad');
-    },
-
-    // Workpad search
-    findWorkpads: ({ setWorkpads }) => async (text) => {
-      try {
-        const workpads = await workpadService.find(text);
-        setWorkpads(workpads);
-      } catch (err) {
-        services.notify.error(err, { title: errors.getFindFailureErrorMessage() });
-      }
-    },
-
-    // Workpad import/export methods
-    downloadWorkpad: () => (workpadId) => downloadWorkpad(workpadId),
-
-    // Clone workpad given an id
-    cloneWorkpad: (props) => async (workpadId) => {
-      try {
-        const workpad = await workpadService.get(workpadId);
-        workpad.name = strings.getClonedWorkpadName(workpad.name);
-        workpad.id = getId('workpad');
-        await workpadService.create(workpad);
-        props.router.navigateTo('loadWorkpad', { id: workpad.id, page: 1 });
-      } catch (err) {
-        services.notify.error(err, { title: errors.getCloneFailureErrorMessage() });
-      }
-    },
-
-    // Remove workpad given an array of id
-    removeWorkpads: (props) => async (workpadIds) => {
-      const { setWorkpads, workpads, workpadId: loadedWorkpad } = props;
-
-      const removeWorkpads = workpadIds.map((id) =>
-        workpadService
-          .remove(id)
-          .then(() => ({ id, err: null }))
-          .catch((err) => ({
-            id,
-            err,
-          }))
-      );
-
-      return Promise.all(removeWorkpads).then((results) => {
-        let redirectHome = false;
-
-        const [passes, errored] = results.reduce(
-          ([passes, errors], result) => {
-            if (result.id === loadedWorkpad && !result.err) {
-              redirectHome = true;
-            }
-
-            if (result.err) {
-              errors.push(result.id);
-            } else {
-              passes.push(result.id);
-            }
-
-            return [passes, errors];
-          },
-          [[], []]
-        );
-
-        const remainingWorkpads = workpads.workpads.filter(({ id }) => !passes.includes(id));
-
-        const workpadState = {
-          total: remainingWorkpads.length,
-          workpads: remainingWorkpads,
-        };
-
-        if (errored.length > 0) {
-          services.notify.error(errors.getDeleteFailureErrorMessage());
-        }
-
-        setWorkpads(workpadState);
-
-        if (redirectHome) {
-          props.router.navigateTo('home');
-        }
-
-        return errored.map(({ id }) => id);
-      });
-    },
-  })),
-  withProps((props) => ({
-    formatDate: (date) => {
-      const dateFormat = props.services.platform.getUISetting('dateFormat');
-      return date && moment(date).format(dateFormat);
-    },
-  }))
-)(Component);
diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/index.tsx b/x-pack/plugins/canvas/public/components/workpad_loader/index.tsx
new file mode 100644
index 0000000000000..2afd5fe70abe1
--- /dev/null
+++ b/x-pack/plugins/canvas/public/components/workpad_loader/index.tsx
@@ -0,0 +1,173 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, useState, useCallback } from 'react';
+import { useHistory } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import moment from 'moment';
+// @ts-expect-error
+import { getDefaultWorkpad } from '../../state/defaults';
+import { canUserWrite as canUserWriteSelector } from '../../state/selectors/app';
+import { getWorkpad } from '../../state/selectors/workpad';
+import { getId } from '../../lib/get_id';
+import { downloadWorkpad } from '../../lib/download_workpad';
+import { ComponentStrings, ErrorStrings } from '../../../i18n';
+import { State, CanvasWorkpad } from '../../../types';
+import { useNotifyService, useWorkpadService, usePlatformService } from '../../services';
+// @ts-expect-error
+import { WorkpadLoader as Component } from './workpad_loader';
+
+const { WorkpadLoader: strings } = ComponentStrings;
+const { WorkpadLoader: errors } = ErrorStrings;
+
+type WorkpadStatePromise = ReturnType<ReturnType<typeof useWorkpadService>['find']>;
+type WorkpadState = WorkpadStatePromise extends PromiseLike<infer U> ? U : never;
+
+export const WorkpadLoader: FC<{ onClose: () => void }> = ({ onClose }) => {
+  const fromState = useSelector((state: State) => ({
+    workpadId: getWorkpad(state).id,
+    canUserWrite: canUserWriteSelector(state),
+  }));
+
+  const [workpadsState, setWorkpadsState] = useState<WorkpadState | null>(null);
+  const workpadService = useWorkpadService();
+  const notifyService = useNotifyService();
+  const platformService = usePlatformService();
+  const history = useHistory();
+
+  const createWorkpad = useCallback(
+    async (_workpad: CanvasWorkpad | null | undefined) => {
+      const workpad = _workpad || getDefaultWorkpad();
+      if (workpad != null) {
+        try {
+          await workpadService.create(workpad);
+          history.push(`/workpad/${workpad.id}/page/1`);
+        } catch (err) {
+          notifyService.error(err, {
+            title: errors.getUploadFailureErrorMessage(),
+          });
+        }
+        return;
+      }
+    },
+    [workpadService, notifyService, history]
+  );
+
+  const findWorkpads = useCallback(
+    async (text) => {
+      try {
+        const fetchedWorkpads = await workpadService.find(text);
+        setWorkpadsState(fetchedWorkpads);
+      } catch (err) {
+        notifyService.error(err, { title: errors.getFindFailureErrorMessage() });
+      }
+    },
+    [notifyService, workpadService]
+  );
+
+  const onDownloadWorkpad = useCallback((workpadId: string) => downloadWorkpad(workpadId), []);
+
+  const cloneWorkpad = useCallback(
+    async (workpadId: string) => {
+      try {
+        const workpad = await workpadService.get(workpadId);
+        workpad.name = strings.getClonedWorkpadName(workpad.name);
+        workpad.id = getId('workpad');
+        await workpadService.create(workpad);
+        history.push(`/workpad/${workpad.id}/page/1`);
+      } catch (err) {
+        notifyService.error(err, { title: errors.getCloneFailureErrorMessage() });
+      }
+    },
+    [notifyService, workpadService, history]
+  );
+
+  const removeWorkpads = useCallback(
+    (workpadIds: string[]) => {
+      if (workpadsState === null) {
+        return;
+      }
+
+      const removedWorkpads = workpadIds.map(async (id) => {
+        try {
+          await workpadService.remove(id);
+          return { id, err: null };
+        } catch (err) {
+          return { id, err };
+        }
+      });
+
+      return Promise.all(removedWorkpads).then((results) => {
+        let redirectHome = false;
+
+        const [passes, errored] = results.reduce<[string[], string[]]>(
+          ([passesArr, errorsArr], result) => {
+            if (result.id === fromState.workpadId && !result.err) {
+              redirectHome = true;
+            }
+
+            if (result.err) {
+              errorsArr.push(result.id);
+            } else {
+              passesArr.push(result.id);
+            }
+
+            return [passesArr, errorsArr];
+          },
+          [[], []]
+        );
+
+        const remainingWorkpads = workpadsState.workpads.filter(({ id }) => !passes.includes(id));
+
+        const workpadState = {
+          total: remainingWorkpads.length,
+          workpads: remainingWorkpads,
+        };
+
+        if (errored.length > 0) {
+          notifyService.error(errors.getDeleteFailureErrorMessage());
+        }
+
+        setWorkpadsState(workpadState);
+
+        if (redirectHome) {
+          history.push('/');
+        }
+
+        return errored;
+      });
+    },
+    [history, workpadService, fromState.workpadId, workpadsState, notifyService]
+  );
+
+  const formatDate = useCallback(
+    (date: any) => {
+      const dateFormat = platformService.getUISetting('dateFormat');
+      return date && moment(date).format(dateFormat);
+    },
+    [platformService]
+  );
+
+  const { workpadId, canUserWrite } = fromState;
+
+  return (
+    <Component
+      {...{
+        downloadWorkpad: onDownloadWorkpad,
+        workpads: workpadsState,
+        workpadId,
+        canUserWrite,
+        cloneWorkpad,
+        createWorkpad,
+        findWorkpads,
+        removeWorkpads,
+        formatDate,
+        onClose,
+      }}
+    />
+  );
+};
diff --git a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js
index 25c17fabe9fad..9c232ab43ec8d 100644
--- a/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js
+++ b/x-pack/plugins/canvas/public/components/workpad_loader/workpad_loader.js
@@ -22,7 +22,7 @@ import {
 } from '@elastic/eui';
 import { orderBy } from 'lodash';
 import { ConfirmModal } from '../confirm_modal';
-import { Link } from '../link';
+import { RoutingLink } from '../routing';
 import { Paginate } from '../paginate';
 import { ComponentStrings } from '../../../i18n';
 import { WorkpadDropzone } from './workpad_dropzone';
@@ -186,14 +186,13 @@ export class WorkpadLoader extends React.PureComponent {
           const workpadName = getDisplayName(name, workpad, loadedWorkpad);
 
           return (
-            <Link
+            <RoutingLink
               data-test-subj="canvasWorkpadLoaderWorkpad"
-              name="loadWorkpad"
-              params={{ id: workpad.id }}
+              to={`/workpad/${workpad.id}`}
               aria-label={strings.getLoadWorkpadArialLabel()}
             >
               {workpadName}
-            </Link>
+            </RoutingLink>
           );
         },
       },
diff --git a/x-pack/plugins/canvas/public/components/workpad_page/index.js b/x-pack/plugins/canvas/public/components/workpad_page/index.js
index 04ceb1266f7c9..6839dc0a128ed 100644
--- a/x-pack/plugins/canvas/public/components/workpad_page/index.js
+++ b/x-pack/plugins/canvas/public/components/workpad_page/index.js
@@ -5,13 +5,15 @@
  * 2.0.
  */
 
+import React, { useContext } from 'react';
 import isEqual from 'react-fast-compare';
 import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import { branch, compose, shouldUpdate, withProps } from 'recompose';
-import { canUserWrite, getFullscreen } from '../../state/selectors/app';
+import { canUserWrite } from '../../state/selectors/app';
 import { getNodes, getPageById, isWriteable } from '../../state/selectors/workpad';
 import { not } from '../../lib/aeroelastic/functional';
+import { WorkpadRoutingContext } from '../../routes/workpad';
 import { StaticPage } from './workpad_static_page';
 import { InteractivePage } from './workpad_interactive_page';
 
@@ -26,19 +28,25 @@ const animationProps = ({ animation, isSelected }) =>
       }
     : { className: isSelected ? 'isActive' : 'isInactive', animationStyle: {} };
 
-const mapStateToProps = (state, { isSelected, pageId }) => ({
-  isInteractive: isSelected && !getFullscreen(state) && isWriteable(state) && canUserWrite(state),
+const mapStateToProps = (state, { isSelected, pageId, isFullscreen }) => ({
+  isInteractive: isSelected && !isFullscreen && isWriteable(state) && canUserWrite(state),
   elements: getNodes(state, pageId),
   pageStyle: getPageById(state, pageId).style,
 });
 
-export const WorkpadPage = compose(
+export const ComposedWorkpadPage = compose(
   shouldUpdate(not(isEqual)), // this is critical, else random unrelated rerenders in the parent cause glitches here
   withProps(animationProps),
   connect(mapStateToProps),
   branch(({ isInteractive }) => isInteractive, InteractivePage, StaticPage)
 )();
 
+export const WorkpadPage = (props) => {
+  const { isFullscreen } = useContext(WorkpadRoutingContext);
+
+  return <ComposedWorkpadPage {...props} isFullscreen={isFullscreen} />;
+};
+
 WorkpadPage.propTypes = {
   pageId: PropTypes.string.isRequired,
 };
diff --git a/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx
index a3ef8b03bdf1d..a15458f4c7276 100644
--- a/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_page/workpad_interactive_page/interaction_boundary.tsx
@@ -7,7 +7,7 @@
 
 import React, { CSSProperties, PureComponent } from 'react';
 // @ts-expect-error untyped local
-import { WORKPAD_CONTAINER_ID } from '../../../apps/workpad/workpad_app';
+import { WORKPAD_CONTAINER_ID } from '../../workpad_app';
 
 interface State {
   height: string;
diff --git a/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot b/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot
index dbb78a1b99f20..cab6e8fd9b5f5 100644
--- a/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot
+++ b/x-pack/plugins/canvas/public/components/workpad_templates/examples/__snapshots__/workpad_templates.stories.storyshot
@@ -69,6 +69,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
               >
                 <span
                   className="euiButtonContent__icon"
+                  color="inherit"
                   data-euiicon-type="arrowDown"
                   size="m"
                 />
@@ -130,8 +131,9 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                     >
                       <span
                         className="euiButtonContent__icon"
+                        color="inherit"
                         data-euiicon-type="arrowDown"
-                        size="m"
+                        size="s"
                       />
                       <span
                         className="euiButtonEmpty__text"
@@ -180,7 +182,6 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                 >
                   <span
                     className="euiTableCellContent__text"
-                    title="; Sorted in ascending order"
                   >
                     Template name
                   </span>
@@ -190,11 +191,6 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                     size="m"
                   />
                 </span>
-                <span
-                  className="euiScreenReaderOnly"
-                >
-                  Click to sort in descending order
-                </span>
               </button>
             </th>
             <th
@@ -208,7 +204,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                 }
               }
             >
-              <div
+              <span
                 className="euiTableCellContent"
               >
                 <span
@@ -216,7 +212,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                 >
                   Description
                 </span>
-              </div>
+              </span>
             </th>
             <th
               className="euiTableHeaderCell"
@@ -229,7 +225,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                 }
               }
             >
-              <div
+              <span
                 className="euiTableCellContent"
               >
                 <span
@@ -237,7 +233,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
                 >
                   Tags
                 </span>
-              </div>
+              </span>
             </th>
           </tr>
         </thead>
@@ -513,6 +509,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="arrowLeft"
             size="m"
           />
@@ -555,6 +552,7 @@ exports[`Storyshots components/WorkpadTemplates default 1`] = `
           <span
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="arrowRight"
             size="m"
           />
diff --git a/x-pack/plugins/canvas/public/components/workpad_templates/index.tsx b/x-pack/plugins/canvas/public/components/workpad_templates/index.tsx
index 91520c8c479cd..7e007b1253464 100644
--- a/x-pack/plugins/canvas/public/components/workpad_templates/index.tsx
+++ b/x-pack/plugins/canvas/public/components/workpad_templates/index.tsx
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-import React, { useContext, useState, useEffect, FunctionComponent } from 'react';
+import React, { useCallback, useState, useEffect, FunctionComponent } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
-import { RouterContext } from '../router';
+import { useHistory } from 'react-router-dom';
+
 import { ComponentStrings } from '../../../i18n/components';
 // @ts-expect-error
 import * as workpadService from '../../lib/workpad_service';
@@ -15,7 +16,7 @@ import { WorkpadTemplates as Component } from './workpad_templates';
 import { CanvasTemplate } from '../../../types';
 import { list } from '../../lib/template_service';
 import { applyTemplateStrings } from '../../../i18n/templates/apply_strings';
-import { useNotifyService } from '../../services';
+import { useNotifyService, useServices } from '../../services';
 
 interface WorkpadTemplatesProps {
   onClose: () => void;
@@ -28,7 +29,9 @@ const Creating: FunctionComponent<{ name: string }> = ({ name }) => (
   </div>
 );
 export const WorkpadTemplates: FunctionComponent<WorkpadTemplatesProps> = ({ onClose }) => {
-  const router = useContext(RouterContext);
+  const history = useHistory();
+  const services = useServices();
+
   const [templates, setTemplates] = useState<CanvasTemplate[] | undefined>(undefined);
   const [creatingFromTemplateName, setCreatingFromTemplateName] = useState<string | undefined>(
     undefined
@@ -53,20 +56,21 @@ export const WorkpadTemplates: FunctionComponent<WorkpadTemplatesProps> = ({ onC
     }, {});
   }
 
-  const createFromTemplate = async (template: CanvasTemplate) => {
-    setCreatingFromTemplateName(template.name);
-    try {
-      const result = await workpadService.createFromTemplate(template.id);
-      if (router) {
-        router.navigateTo('loadWorkpad', { id: result.data.id, page: 1 });
+  const createFromTemplate = useCallback(
+    async (template: CanvasTemplate) => {
+      setCreatingFromTemplateName(template.name);
+      try {
+        const result = await services.workpad.createFromTemplate(template.id);
+        history.push(`/workpad/${result.id}/page/1`);
+      } catch (e) {
+        setCreatingFromTemplateName(undefined);
+        error(e, {
+          title: `Couldn't create workpad from template`,
+        });
       }
-    } catch (e) {
-      setCreatingFromTemplateName(undefined);
-      error(e, {
-        title: `Couldn't create workpad from template`,
-      });
-    }
-  };
+    },
+    [services.workpad, error, history]
+  );
 
   if (creatingFromTemplateName) {
     return <Creating name={creatingFromTemplateName} />;
diff --git a/x-pack/plugins/canvas/public/lib/app_state.ts b/x-pack/plugins/canvas/public/lib/app_state.ts
deleted file mode 100644
index 3b9b6b5f5419d..0000000000000
--- a/x-pack/plugins/canvas/public/lib/app_state.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { parse } from 'query-string';
-import { get } from 'lodash';
-// @ts-expect-error untyped local
-import { getInitialState } from '../state/initial_state';
-import { getWindow } from './get_window';
-// @ts-expect-error untyped local
-import { historyProvider } from './history_provider';
-// @ts-expect-error untyped local
-import { routerProvider } from './router_provider';
-import { createTimeInterval, isValidTimeInterval, getTimeInterval } from './time_interval';
-import { AppState, AppStateKeys } from '../../types';
-
-export function getDefaultAppState(): AppState {
-  const transientState = getInitialState('transient');
-  const state: AppState = {};
-
-  if (transientState.fullscreen) {
-    state[AppStateKeys.FULLSCREEN] = true;
-  }
-
-  if (transientState.refresh.interval > 0) {
-    state[AppStateKeys.REFRESH_INTERVAL] = createTimeInterval(transientState.refresh.interval);
-  }
-
-  if (transientState.autoplay.enabled) {
-    state[AppStateKeys.AUTOPLAY_INTERVAL] = createTimeInterval(transientState.autoplay.interval);
-  }
-
-  return state;
-}
-
-export function getCurrentAppState(): AppState {
-  const history = historyProvider(getWindow());
-  const { search } = history.getLocation();
-  const qs = !!search ? parse(search.replace(/^\?/, ''), { sort: false }) : {};
-  const appState = assignAppState({}, qs);
-
-  return appState;
-}
-
-export function getAppState(key?: string): AppState {
-  const appState = { ...getDefaultAppState(), ...getCurrentAppState() };
-  return key ? get(appState, key) : appState;
-}
-
-export function assignAppState(obj: AppState & { [key: string]: any }, appState: AppState) {
-  const fullscreen = appState[AppStateKeys.FULLSCREEN];
-  const refreshKey = appState[AppStateKeys.REFRESH_INTERVAL];
-  const autoplayKey = appState[AppStateKeys.AUTOPLAY_INTERVAL];
-
-  if (fullscreen) {
-    obj[AppStateKeys.FULLSCREEN] = true;
-  } else {
-    delete obj[AppStateKeys.FULLSCREEN];
-  }
-
-  const refresh = Array.isArray(refreshKey) ? refreshKey[0] : refreshKey;
-
-  if (refresh && isValidTimeInterval(refresh)) {
-    obj[AppStateKeys.REFRESH_INTERVAL] = refresh;
-  } else {
-    delete obj[AppStateKeys.REFRESH_INTERVAL];
-  }
-
-  const autoplay = Array.isArray(autoplayKey) ? autoplayKey[0] : autoplayKey;
-
-  if (autoplay && isValidTimeInterval(autoplay)) {
-    obj[AppStateKeys.AUTOPLAY_INTERVAL] = autoplay;
-  } else {
-    delete obj[AppStateKeys.AUTOPLAY_INTERVAL];
-  }
-
-  return obj;
-}
-
-export function setFullscreen(payload: boolean) {
-  const appState = getAppState();
-  const appValue = appState[AppStateKeys.FULLSCREEN];
-
-  if (payload === false && appValue) {
-    delete appState[AppStateKeys.FULLSCREEN];
-    routerProvider().updateAppState(appState);
-  } else if (payload === true && !appValue) {
-    appState[AppStateKeys.FULLSCREEN] = true;
-    routerProvider().updateAppState(appState);
-  }
-}
-
-export function setAutoplayInterval(payload: string | null) {
-  const appState = getAppState();
-  const appValue = appState[AppStateKeys.AUTOPLAY_INTERVAL];
-
-  if (payload !== appValue) {
-    if (!payload && appValue) {
-      delete appState[AppStateKeys.AUTOPLAY_INTERVAL];
-      routerProvider().updateAppState(appState);
-    } else if (payload) {
-      appState[AppStateKeys.AUTOPLAY_INTERVAL] = payload;
-      routerProvider().updateAppState(appState);
-    }
-  }
-}
-
-export function setRefreshInterval(payload: string) {
-  const appState = getAppState();
-  const appValue = appState[AppStateKeys.REFRESH_INTERVAL];
-
-  if (payload !== appValue) {
-    if (getTimeInterval(payload)) {
-      appState[AppStateKeys.REFRESH_INTERVAL] = payload;
-      routerProvider().updateAppState(appState);
-    } else {
-      delete appState[AppStateKeys.REFRESH_INTERVAL];
-      routerProvider().updateAppState(appState);
-    }
-  }
-}
diff --git a/x-pack/plugins/canvas/public/lib/breadcrumbs.ts b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
index f1dc00f777703..35a17eda8c165 100644
--- a/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
+++ b/x-pack/plugins/canvas/public/lib/breadcrumbs.ts
@@ -6,7 +6,6 @@
  */
 
 import { ChromeBreadcrumb } from '../../../../../src/core/public';
-import { platformService } from '../services';
 
 export const getBaseBreadcrumb = () => ({
   text: 'Canvas',
@@ -23,7 +22,3 @@ export const getWorkpadBreadcrumb = ({
   }
   return output;
 };
-
-export const setBreadcrumb = (paths: ChromeBreadcrumb | ChromeBreadcrumb[]) => {
-  platformService.getService().setBreadcrumbs(Array.isArray(paths) ? paths : [paths]);
-};
diff --git a/x-pack/plugins/canvas/public/lib/create_handlers.ts b/x-pack/plugins/canvas/public/lib/create_handlers.ts
index d5888f23046c1..9f531d6921417 100644
--- a/x-pack/plugins/canvas/public/lib/create_handlers.ts
+++ b/x-pack/plugins/canvas/public/lib/create_handlers.ts
@@ -6,6 +6,10 @@
  */
 
 import { isEqual } from 'lodash';
+import {
+  ExpressionRendererEvent,
+  IInterpreterRenderHandlers,
+} from 'src/plugins/expressions/public';
 // @ts-expect-error untyped local
 import { setFilter } from '../state/actions/elements';
 import { updateEmbeddableExpression, fetchEmbeddableRenderable } from '../state/actions/embeddable';
@@ -14,38 +18,41 @@ import { RendererHandlers, CanvasElement } from '../../types';
 // This class creates stub handlers to ensure every element and renderer fulfills the contract.
 // TODO: consider warning if these methods are invoked but not implemented by the renderer...?
 
-export const createHandlers = (): RendererHandlers => ({
-  destroy() {},
+// We need to move towards only using these handlers and ditching our canvas specific ones
+export const createBaseHandlers = (): IInterpreterRenderHandlers => ({
   done() {},
+  reload() {},
+  update() {},
   event() {},
+  onDestroy() {},
+  getRenderMode: () => 'display',
+  isSyncColorsEnabled: () => false,
+});
+
+export const createHandlers = (baseHandlers = createBaseHandlers()): RendererHandlers => ({
+  ...baseHandlers,
+  destroy() {},
+
   getElementId() {
     return '';
   },
   getFilter() {
     return '';
   },
-  getRenderMode() {
-    return 'display';
-  },
-  isSyncColorsEnabled() {
-    return false;
-  },
+
   onComplete(fn: () => void) {
     this.done = fn;
   },
-  onDestroy(fn: () => void) {
-    this.destroy = fn;
-  },
+
   // TODO: these functions do not match the `onXYZ` and `xyz` pattern elsewhere.
   onEmbeddableDestroyed() {},
   onEmbeddableInputChange() {},
   onResize(fn: (size: { height: number; width: number }) => void) {
     this.resize = fn;
   },
-  reload() {},
+
   resize(_size: { height: number; width: number }) {},
   setFilter() {},
-  update() {},
 });
 
 export const assignHandlers = (handlers: Partial<RendererHandlers> = {}): RendererHandlers =>
@@ -66,7 +73,33 @@ export const createDispatchedHandlerFactory = (
       oldElement = element;
     }
 
-    return assignHandlers({
+    const handlers: RendererHandlers & {
+      event: IInterpreterRenderHandlers['event'];
+      done: IInterpreterRenderHandlers['done'];
+    } = {
+      ...createHandlers(),
+      event(event: ExpressionRendererEvent) {
+        switch (event.name) {
+          case 'embeddableInputChange':
+            this.onEmbeddableInputChange(event.data);
+            break;
+          case 'setFilter':
+            this.setFilter(event.data);
+            break;
+          case 'onComplete':
+            this.onComplete(event.data);
+            break;
+          case 'embeddableDestroyed':
+            this.onEmbeddableDestroyed();
+            break;
+          case 'resize':
+            this.resize(event.data);
+            break;
+          case 'onResize':
+            this.onResize(event.data);
+            break;
+        }
+      },
       setFilter(text: string) {
         dispatch(setFilter(text, element.id, true));
       },
@@ -98,6 +131,8 @@ export const createDispatchedHandlerFactory = (
         isComplete = true;
         completeFn();
       },
-    });
+    };
+
+    return handlers;
   };
 };
diff --git a/x-pack/plugins/canvas/public/lib/history_provider.js b/x-pack/plugins/canvas/public/lib/history_provider.js
deleted file mode 100644
index 09d1dde814560..0000000000000
--- a/x-pack/plugins/canvas/public/lib/history_provider.js
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import lzString from 'lz-string';
-import { createMemoryHistory, parsePath, createPath } from 'history';
-import createHashStateHistory from 'history-extra/dist/createHashStateHistory';
-import { getWindow } from './get_window';
-
-function wrapHistoryInstance(history) {
-  const historyState = {
-    onChange: [],
-    prevLocation: {},
-    changeUnlisten: null,
-  };
-
-  const locationFormat = (location, action, parser) => ({
-    pathname: location.pathname,
-    hash: location.hash,
-    search: location.search,
-    state: parser(location.state),
-    action: action.toLowerCase(),
-  });
-
-  const wrappedHistory = {
-    undo() {
-      history.goBack();
-    },
-
-    redo() {
-      history.goForward();
-    },
-
-    go(idx) {
-      history.go(idx);
-    },
-
-    parse(payload) {
-      try {
-        const stateJSON = lzString.decompress(payload);
-        return JSON.parse(stateJSON);
-      } catch (e) {
-        return null;
-      }
-    },
-
-    encode(state) {
-      try {
-        const stateJSON = JSON.stringify(state);
-        return lzString.compress(stateJSON);
-      } catch (e) {
-        throw new Error('Could not encode state: ', e.message);
-      }
-    },
-
-    getLocation() {
-      const location = history.location;
-      return {
-        ...location,
-        state: this.parse(location.state),
-      };
-    },
-
-    getPath(path) {
-      if (path != null) {
-        return createPath(parsePath(path));
-      }
-      return createPath(this.getLocation());
-    },
-
-    getFullPath(path) {
-      if (path != null) {
-        return history.createHref(parsePath(path));
-      }
-      return history.createHref(this.getLocation());
-    },
-
-    push(state, path) {
-      history.push(path || this.getPath(), this.encode(state));
-    },
-
-    replace(state, path) {
-      history.replace(path || this.getPath(), this.encode(state));
-    },
-
-    onChange(fn) {
-      // if no handler fn passed, do nothing
-      if (fn == null) {
-        return;
-      }
-
-      // push onChange function onto listener stack and return a function to remove it
-      const pushedIndex = historyState.onChange.push(fn) - 1;
-      return (() => {
-        // only allow the unlisten function to be called once
-        let called = false;
-        return () => {
-          if (called) {
-            return;
-          }
-          historyState.onChange.splice(pushedIndex, 1);
-          called = true;
-        };
-      })();
-    },
-
-    resetOnChange() {
-      // splice to clear the onChange array, and remove listener for each fn
-      historyState.onChange.splice(0);
-    },
-
-    get historyInstance() {
-      // getter to get access to the underlying history instance
-      return history;
-    },
-  };
-
-  // track the initial history location and create update listener
-  historyState.prevLocation = wrappedHistory.getLocation();
-  historyState.changeUnlisten = history.listen((location, action) => {
-    const { prevLocation } = historyState;
-    const locationObj = locationFormat(location, action, wrappedHistory.parse);
-    const prevLocationObj = locationFormat(prevLocation, action, wrappedHistory.parse);
-
-    // execute all listeners
-    historyState.onChange.forEach((fn) => fn.call(null, locationObj, prevLocationObj));
-
-    // track the updated location
-    historyState.prevLocation = wrappedHistory.getLocation();
-  });
-
-  return wrappedHistory;
-}
-
-const instances = new WeakMap();
-
-const getHistoryInstance = (win) => {
-  // if no window object, use memory module
-  if (typeof win === 'undefined' || !win.history) {
-    return createMemoryHistory();
-  }
-  return createHashStateHistory();
-};
-
-export const createHistory = (win = getWindow()) => {
-  // create and cache wrapped history instance
-  const historyInstance = getHistoryInstance(win);
-  const wrappedInstance = wrapHistoryInstance(historyInstance);
-  instances.set(win, wrappedInstance);
-
-  return wrappedInstance;
-};
-
-export const historyProvider = (win = getWindow()) => {
-  // return cached instance if one exists
-  const instance = instances.get(win);
-  if (instance) {
-    return instance;
-  }
-
-  return createHistory(win);
-};
-
-export const destroyHistory = (win = getWindow()) => {
-  const instance = instances.get(win);
-
-  if (instance) {
-    instance.resetOnChange();
-  }
-};
diff --git a/x-pack/plugins/canvas/public/lib/router_provider.js b/x-pack/plugins/canvas/public/lib/router_provider.js
deleted file mode 100644
index 89abc52361e87..0000000000000
--- a/x-pack/plugins/canvas/public/lib/router_provider.js
+++ /dev/null
@@ -1,129 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import createRouter from '@scant/router';
-import { getWindow } from './get_window';
-import { historyProvider } from './history_provider';
-import { getCurrentAppState, assignAppState } from './app_state';
-import { modifyUrl } from './modify_url';
-
-// used to make this provider a singleton
-let router;
-
-export function routerProvider(routes) {
-  if (router) {
-    return router;
-  }
-
-  const baseRouter = createRouter(routes);
-  const history = historyProvider(getWindow());
-  const componentListeners = [];
-
-  // assume any string starting with a / is a path
-  const isPath = (str) => typeof str === 'string' && str.substr(0, 1) === '/';
-
-  // helper to get the current state in history
-  const getState = (name, params, state) => {
-    // given a path, assuming params is the state
-    if (isPath(name)) {
-      return params || history.getLocation().state;
-    }
-    return state || history.getLocation().state;
-  };
-
-  // helper to append appState to a given url path
-  const appendAppState = (path, appState = getCurrentAppState()) => {
-    const newUrl = modifyUrl(path, (parts) => {
-      parts.query = assignAppState(parts.query, appState);
-    });
-
-    return newUrl;
-  };
-
-  // add or replace history with new url, either from path or derived path via name and params
-  const updateLocation = (name, params, state, replace = false) => {
-    const currentState = getState(name, params, state);
-    const method = replace ? 'replace' : 'push';
-
-    // given a path, go there directly
-    if (isPath(name)) {
-      return history[method](currentState, appendAppState(name));
-    }
-
-    history[method](currentState, appendAppState(baseRouter.create(name, params)));
-  };
-
-  // our router is an extended version of the imported router
-  // which mixes in history methods for navigation
-  router = {
-    ...baseRouter,
-    execute(path = history.getPath()) {
-      return this.parse(path);
-    },
-    getPath: () => history.getPath(),
-    getFullPath: () => history.getFullPath(),
-    navigateTo(name, params, state) {
-      updateLocation(name, params, state);
-    },
-    redirectTo(name, params, state) {
-      updateLocation(name, params, state, true);
-    },
-    updateAppState(appState, replace = true) {
-      const method = replace ? 'replace' : 'push';
-      const newPath = appendAppState(this.getPath(), appState);
-      const currentState = history.getLocation().state;
-      history[method](currentState, newPath);
-    },
-    onPathChange(fn) {
-      const execOnMatch = (location) => {
-        const { pathname } = location;
-        const match = this.match(pathname);
-
-        if (!match) {
-          // TODO: show some kind of error, or redirect somewhere; maybe home?
-          console.error('No route found for path: ', pathname);
-          return;
-        }
-
-        fn({ ...match, location });
-      };
-
-      // on path changes, fire the path change handler
-      const unlisten = history.onChange((locationObj, prevLocationObj) => {
-        if (
-          locationObj.pathname !== prevLocationObj.pathname ||
-          locationObj.search !== prevLocationObj.search
-        ) {
-          execOnMatch(locationObj);
-        }
-      });
-
-      // keep track of all change handler removal functions, for cleanup
-      // TODO: clean up listeners when baseRounter.stop is called
-      componentListeners.push(unlisten);
-
-      // initially fire the path change handler
-      execOnMatch(history.getLocation());
-
-      return unlisten; // return function to remove change handler
-    },
-    stop: () => {
-      for (const listener of componentListeners) {
-        listener();
-      }
-    },
-  };
-
-  return router;
-}
-
-export const stopRouter = () => {
-  if (router) {
-    router.stop();
-    router = undefined;
-  }
-};
diff --git a/x-pack/plugins/canvas/public/routes/home/home_route.tsx b/x-pack/plugins/canvas/public/routes/home/home_route.tsx
new file mode 100644
index 0000000000000..ee331d914f0c7
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/home/home_route.tsx
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React from 'react';
+import { Route } from 'react-router-dom';
+import { HomeApp } from '../../components/home_app';
+
+export const HomeRoute = () => (
+  <Route path="/">
+    <HomeApp />
+  </Route>
+);
diff --git a/x-pack/plugins/canvas/public/routes/home/index.tsx b/x-pack/plugins/canvas/public/routes/home/index.tsx
new file mode 100644
index 0000000000000..7d247c7b9b12e
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/home/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 * from './home_route';
diff --git a/x-pack/plugins/canvas/public/routes/index.tsx b/x-pack/plugins/canvas/public/routes/index.tsx
new file mode 100644
index 0000000000000..fd09aeae3fa9a
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/index.tsx
@@ -0,0 +1,22 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+import { Router, Switch } from 'react-router-dom';
+import { History } from 'history';
+import { HomeRoute } from './home';
+import { WorkpadRoute, ExportWorkpadRoute } from './workpad';
+
+export const CanvasRouter: FC<{ history: History }> = ({ history }) => (
+  <Router history={history}>
+    <Switch>
+      {ExportWorkpadRoute()}
+      {WorkpadRoute()}
+      {HomeRoute()}
+    </Switch>
+  </Router>
+);
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_autoplay_helper.test.tsx b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_autoplay_helper.test.tsx
new file mode 100644
index 0000000000000..0fa347e8e0605
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_autoplay_helper.test.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 React, { FC } from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import { useAutoplayHelper } from './use_autoplay_helper';
+import { WorkpadRoutingContext, WorkpadRoutingContextType } from '../workpad_routing_context';
+
+const getMockedContext = (context: any) =>
+  ({
+    nextPage: jest.fn(),
+    isFullscreen: false,
+    autoplayInterval: 0,
+    isAutoplayPaused: false,
+    ...context,
+  } as WorkpadRoutingContextType);
+
+const getContextWrapper: (context: WorkpadRoutingContextType) => FC = (context) => ({
+  children,
+}) => <WorkpadRoutingContext.Provider value={context}>{children}</WorkpadRoutingContext.Provider>;
+
+describe('useAutoplayHelper', () => {
+  beforeEach(() => jest.useFakeTimers());
+  test('starts the timer when fullscreen and autoplay is on', () => {
+    const context = getMockedContext({
+      isFullscreen: true,
+      autoplayInterval: 1,
+    });
+
+    renderHook(useAutoplayHelper, { wrapper: getContextWrapper(context) });
+
+    jest.runAllTimers();
+
+    expect(context.nextPage).toHaveBeenCalled();
+  });
+
+  test('stops the timer when autoplay pauses', () => {
+    const context = getMockedContext({
+      isFullscreen: true,
+      autoplayInterval: 1000,
+    });
+
+    const { rerender } = renderHook(useAutoplayHelper, { wrapper: getContextWrapper(context) });
+
+    jest.runTimersToTime(context.autoplayInterval - 1);
+
+    context.isAutoplayPaused = true;
+
+    rerender();
+
+    jest.runAllTimers();
+
+    expect(context.nextPage).not.toHaveBeenCalled();
+  });
+
+  test('starts the timer when autoplay unpauses', () => {
+    const context = getMockedContext({
+      isFullscreen: true,
+      autoplayInterval: 1000,
+      isAutoplayPaused: true,
+    });
+
+    const { rerender } = renderHook(useAutoplayHelper, { wrapper: getContextWrapper(context) });
+
+    jest.runAllTimers();
+
+    expect(context.nextPage).not.toHaveBeenCalled();
+
+    context.isAutoplayPaused = false;
+
+    rerender();
+
+    jest.runAllTimers();
+
+    expect(context.nextPage).toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_autoplay_helper.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_autoplay_helper.ts
new file mode 100644
index 0000000000000..5015da495e47c
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_autoplay_helper.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 { useContext, useEffect, useRef } from 'react';
+import { WorkpadRoutingContext } from '../workpad_routing_context';
+
+export const useAutoplayHelper = () => {
+  const { nextPage, isFullscreen, autoplayInterval, isAutoplayPaused } = useContext(
+    WorkpadRoutingContext
+  );
+  const timer = useRef<number | undefined>(undefined);
+
+  useEffect(() => {
+    if (timer.current || !isFullscreen || isAutoplayPaused) {
+      clearTimeout(timer.current);
+    }
+
+    if (isFullscreen && !isAutoplayPaused && autoplayInterval > 0) {
+      timer.current = window.setTimeout(() => {
+        nextPage();
+      }, autoplayInterval);
+    }
+
+    return () => clearTimeout(timer.current);
+  }, [isFullscreen, nextPage, autoplayInterval, isAutoplayPaused]);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_fullscreen_presentation_helper.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_fullscreen_presentation_helper.ts
new file mode 100644
index 0000000000000..ab26625038bc5
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_fullscreen_presentation_helper.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 { useContext, useEffect } from 'react';
+import { useServices } from '../../../services';
+import { WorkpadRoutingContext } from '..';
+
+const fullscreenClass = 'canvas-isFullscreen';
+
+export const useFullscreenPresentationHelper = () => {
+  const { isFullscreen } = useContext(WorkpadRoutingContext);
+  const services = useServices();
+  const { setFullscreen } = services.platform;
+
+  useEffect(() => {
+    const body = document.querySelector('body');
+    const bodyClassList = body!.classList;
+    const hasFullscreenClass = bodyClassList.contains(fullscreenClass);
+
+    if (isFullscreen && !hasFullscreenClass) {
+      setFullscreen(false);
+      bodyClassList.add(fullscreenClass);
+    } else if (!isFullscreen && hasFullscreenClass) {
+      bodyClassList.remove(fullscreenClass);
+      setFullscreen(true);
+    }
+  }, [isFullscreen, setFullscreen]);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.test.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.test.ts
new file mode 100644
index 0000000000000..6d4c99cf618fb
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.test.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { usePageSync } from './use_page_sync';
+
+const mockDispatch = jest.fn();
+const mockGetParams = jest.fn();
+const mockGetState = jest.fn();
+
+// Mock the hooks and actions used by the UseWorkpad hook
+jest.mock('react-redux', () => ({
+  useDispatch: () => mockDispatch,
+  useSelector: (selector: any) => selector(mockGetState()),
+}));
+
+jest.mock('react-router-dom', () => ({
+  useParams: () => mockGetParams(),
+}));
+
+describe('usePageSync', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  test('dispatches page index to match the pagenumber param', () => {
+    const pageParam = '1';
+    const state = {
+      persistent: {
+        workpad: {
+          page: 5,
+        },
+      },
+    };
+
+    mockGetParams.mockReturnValue({ pageNumber: pageParam });
+    mockGetState.mockReturnValue(state);
+
+    renderHook(() => usePageSync());
+
+    expect(mockDispatch).toHaveBeenCalledWith({ type: 'setPage', payload: 0 });
+  });
+
+  test('no dispatch if pageNumber matches page index', () => {
+    const pageParam = '6'; // Page number 6 is index 5
+    const state = {
+      persistent: {
+        workpad: {
+          page: 5,
+        },
+      },
+    };
+
+    mockGetParams.mockReturnValue({ pageNumber: pageParam });
+    mockGetState.mockReturnValue(state);
+
+    renderHook(() => usePageSync());
+
+    expect(mockDispatch).not.toHaveBeenCalled();
+  });
+
+  test('pageNumber that is NaN does not dispatch', () => {
+    const pageParam = 'A';
+    const state = {
+      persistent: {
+        workpad: {
+          page: 5,
+        },
+      },
+    };
+
+    mockGetParams.mockReturnValue({ pageNumber: pageParam });
+    mockGetState.mockReturnValue(state);
+
+    renderHook(() => usePageSync());
+
+    expect(mockDispatch).not.toHaveBeenCalled();
+  });
+});
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
new file mode 100644
index 0000000000000..e54e4d5065564
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_page_sync.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 { useEffect } from 'react';
+import { useSelector, useDispatch } from 'react-redux';
+import { useParams } from 'react-router-dom';
+import { WorkpadPageRouteParams } from '../';
+import { getWorkpad } from '../../../state/selectors/workpad';
+// @ts-expect-error
+import { setPage } from '../../../state/actions/pages';
+
+export const usePageSync = () => {
+  const params = useParams<WorkpadPageRouteParams>();
+  const workpad = useSelector(getWorkpad);
+  const dispatch = useDispatch();
+
+  const pageNumber = parseInt(params.pageNumber, 10);
+  let pageIndex = workpad.page;
+  if (!isNaN(pageNumber)) {
+    pageIndex = pageNumber - 1;
+  }
+
+  useEffect(() => {
+    if (pageIndex !== workpad.page) {
+      dispatch(setPage(pageIndex));
+    }
+  }, [pageIndex, workpad.page, dispatch]);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_refresh_helper.test.tsx b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_refresh_helper.test.tsx
new file mode 100644
index 0000000000000..59c4821d82a72
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_refresh_helper.test.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+import { renderHook } from '@testing-library/react-hooks';
+import { useRefreshHelper } from './use_refresh_helper';
+import { WorkpadRoutingContext, WorkpadRoutingContextType } from '../workpad_routing_context';
+
+const mockDispatch = jest.fn();
+const mockGetState = jest.fn();
+const refreshAction = { type: 'fetchAllRenderables' };
+
+jest.mock('react-redux', () => ({
+  useDispatch: () => mockDispatch,
+  useSelector: (selector: any) => selector(mockGetState()),
+}));
+
+jest.mock('../../../state/actions/elements', () => ({
+  fetchAllRenderables: () => refreshAction,
+}));
+
+const getMockedContext = (context: any) =>
+  ({
+    refreshInterval: 0,
+    ...context,
+  } as WorkpadRoutingContextType);
+
+const getContextWrapper: (context: WorkpadRoutingContextType) => FC = (context) => ({
+  children,
+}) => <WorkpadRoutingContext.Provider value={context}>{children}</WorkpadRoutingContext.Provider>;
+
+describe('useRefreshHelper', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+    jest.useFakeTimers();
+  });
+
+  test('starts a timer to refresh', () => {
+    const context = getMockedContext({
+      refreshInterval: 1,
+    });
+    const state = {
+      transient: {
+        inFlight: false,
+      },
+    };
+
+    mockGetState.mockReturnValue(state);
+
+    renderHook(useRefreshHelper, { wrapper: getContextWrapper(context) });
+    expect(mockDispatch).not.toHaveBeenCalledWith(refreshAction);
+
+    jest.runAllTimers();
+    expect(mockDispatch).toHaveBeenCalledWith(refreshAction);
+  });
+
+  test('cancels a timer when inflight is active', () => {
+    const context = getMockedContext({
+      refreshInterval: 100,
+    });
+
+    const state = {
+      transient: {
+        inFlight: false,
+      },
+    };
+
+    mockGetState.mockReturnValue(state);
+    const { rerender } = renderHook(useRefreshHelper, { wrapper: getContextWrapper(context) });
+
+    jest.runTimersToTime(context.refreshInterval - 1);
+    expect(mockDispatch).not.toHaveBeenCalledWith(refreshAction);
+
+    state.transient.inFlight = true;
+    rerender(useRefreshHelper);
+
+    jest.runAllTimers();
+    expect(mockDispatch).not.toHaveBeenCalled();
+  });
+});
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_refresh_helper.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_refresh_helper.ts
new file mode 100644
index 0000000000000..e1d593644cc65
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_refresh_helper.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 { useEffect, useContext, useRef } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { WorkpadRoutingContext } from '../workpad_routing_context';
+import { getInFlight } from '../../../state/selectors/resolved_args';
+// @ts-expect-error untyped local
+import { fetchAllRenderables } from '../../../state/actions/elements';
+
+export const useRefreshHelper = () => {
+  const dispatch = useDispatch();
+  const { refreshInterval } = useContext(WorkpadRoutingContext);
+  const timer = useRef<number | undefined>(undefined);
+  const inFlight = useSelector(getInFlight);
+
+  useEffect(() => {
+    // We got here because inFlight or refreshInterval changed.
+    // Either way, we want to cancel existing refresh timer
+    clearTimeout(timer.current);
+
+    if (refreshInterval > 0 && !inFlight) {
+      timer.current = window.setTimeout(() => {
+        dispatch(fetchAllRenderables());
+      }, refreshInterval);
+    }
+
+    return () => {
+      clearTimeout(timer.current);
+    };
+  }, [inFlight, dispatch, refreshInterval]);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_restore_history.test.tsx b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_restore_history.test.tsx
new file mode 100644
index 0000000000000..0504368be05ac
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_restore_history.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 { renderHook } from '@testing-library/react-hooks';
+import { useRestoreHistory } from './use_restore_history';
+import { encode } from '../route_state';
+
+const mockDispatch = jest.fn();
+const mockGetLocation = jest.fn();
+const mockGetHistory = jest.fn();
+
+const location = { state: undefined };
+const history = { action: 'POP' };
+
+// Mock the hooks and actions
+jest.mock('react-redux', () => ({
+  useDispatch: () => mockDispatch,
+}));
+
+jest.mock('react-router-dom', () => ({
+  useLocation: () => mockGetLocation(),
+  useHistory: () => mockGetHistory(),
+}));
+
+jest.mock('../../../state/actions/workpad', () => ({
+  initializeWorkpad: () => ({ type: 'initialize' }),
+}));
+
+describe('useRestoreHistory', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  test('dispatches nothing on initial run', () => {
+    mockGetLocation.mockReturnValue(location);
+    mockGetHistory.mockReturnValue(history);
+    renderHook(() => useRestoreHistory());
+
+    expect(mockDispatch).not.toBeCalled();
+  });
+
+  test('dispatches nothing on a non pop event', () => {
+    mockGetLocation.mockReturnValue(location);
+    mockGetHistory.mockReturnValue({ action: 'not-pop' });
+    const { rerender } = renderHook(() => useRestoreHistory());
+
+    expect(mockDispatch).not.toBeCalled();
+
+    mockGetLocation.mockReturnValue({ state: encode({ some: 'state' }) });
+    rerender();
+
+    expect(mockDispatch).not.toBeCalled();
+  });
+
+  test('dispatches restore history if state changes on a POP action', () => {
+    const oldState = { a: 'a', b: 'b' };
+    const newState = { c: 'c', d: 'd' };
+
+    mockGetHistory.mockReturnValue(history);
+    mockGetLocation.mockReturnValue({
+      state: encode(oldState),
+    });
+
+    const { rerender } = renderHook(() => useRestoreHistory());
+
+    mockGetLocation.mockReturnValue({
+      state: encode(newState),
+    });
+
+    rerender();
+
+    expect(mockDispatch).toHaveBeenCalledWith({ type: 'restoreHistory', payload: newState });
+  });
+});
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_restore_history.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_restore_history.ts
new file mode 100644
index 0000000000000..a1fe74975e2be
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_restore_history.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 { useRef, useEffect } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
+// @ts-expect-error
+import { restoreHistory } from '../../../state/actions/history';
+import { initializeWorkpad } from '../../../state/actions/workpad';
+import { decode } from '../route_state';
+
+export const useRestoreHistory = () => {
+  const history = useHistory();
+  const location = useLocation();
+  const dispatch = useDispatch();
+
+  const { state: historyState } = location;
+  const previousState = useRef<string | undefined>(historyState);
+  const historyAction = history.action.toLowerCase();
+
+  useEffect(() => {
+    const isBrowserNav = historyAction === 'pop' && historyState != null;
+    if (isBrowserNav && historyState !== previousState.current) {
+      previousState.current = historyState;
+      dispatch(restoreHistory(decode(historyState)));
+      dispatch(initializeWorkpad());
+    }
+
+    previousState.current = historyState;
+  }, [dispatch, historyAction, historyState]);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_routing_context.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_routing_context.ts
new file mode 100644
index 0000000000000..e8f5a17df23fa
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_routing_context.ts
@@ -0,0 +1,160 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, useMemo, useState } from 'react';
+import { useHistory, useParams } from 'react-router-dom';
+import { useSelector } from 'react-redux';
+import { getWorkpad } from '../../../state/selectors/workpad';
+import { WorkpadPageRouteParams, WorkpadRoutingContextType } from '..';
+import {
+  createTimeInterval,
+  isValidTimeInterval,
+  getTimeInterval,
+} from '../../../lib/time_interval';
+
+export const useRoutingContext: () => WorkpadRoutingContextType = () => {
+  const [isAutoplayPaused, setIsAutoplayPaused] = useState<boolean>(false);
+  const history = useHistory();
+  const { search } = history.location;
+  const params = useParams<WorkpadPageRouteParams>();
+  const workpad = useSelector(getWorkpad);
+  const searchParams = new URLSearchParams(search);
+  const parsedPage = parseInt(params.pageNumber!, 10);
+  const pageNumber = isNaN(parsedPage) ? workpad.page + 1 : parsedPage;
+  const workpadPages = workpad.pages.length;
+
+  const getUrl = useCallback(
+    (page: number) => `/workpad/${params.id}/page/${page}${history.location.search}`,
+    [params.id, history.location.search]
+  );
+
+  const gotoPage = useCallback(
+    (page: number) => {
+      history.push(getUrl(page));
+    },
+    [getUrl, history]
+  );
+
+  const nextPage = useCallback(() => {
+    let newPage = pageNumber + 1;
+    if (newPage > workpadPages) {
+      newPage = 1;
+    }
+
+    gotoPage(newPage);
+  }, [pageNumber, workpadPages, gotoPage]);
+
+  const previousPage = useCallback(() => {
+    let newPage = pageNumber - 1;
+    if (newPage < 1) {
+      newPage = workpadPages;
+    }
+
+    gotoPage(newPage);
+  }, [pageNumber, workpadPages, gotoPage]);
+
+  const isFullscreen = searchParams.get('__fullScreen') === 'true';
+
+  const autoplayValue = searchParams.get('__autoplayInterval');
+  const autoplayInterval =
+    autoplayValue && isValidTimeInterval(autoplayValue) ? getTimeInterval(autoplayValue) || 0 : 0;
+
+  const refreshValue = searchParams.get('__refreshInterval');
+  const refreshInterval =
+    refreshValue && isValidTimeInterval(refreshValue) ? getTimeInterval(refreshValue) || 0 : 0;
+
+  const setFullscreen = useCallback(
+    (enable: boolean) => {
+      const newQuery = new URLSearchParams(history.location.search);
+
+      if (enable) {
+        newQuery.set('__fullScreen', 'true');
+      } else {
+        setIsAutoplayPaused(false);
+        newQuery.delete('__fullScreen');
+      }
+
+      history.push(`${history.location.pathname}?${newQuery.toString()}`);
+    },
+    [history, setIsAutoplayPaused]
+  );
+
+  const setAutoplayInterval = useCallback(
+    (interval: number) => {
+      const newQuery = new URLSearchParams(history.location.search);
+
+      if (interval > 0) {
+        newQuery.set('__autoplayInterval', createTimeInterval(interval));
+      } else {
+        newQuery.delete('__autoplayInterval');
+      }
+
+      history.push(`${history.location.pathname}?${newQuery.toString()}`);
+    },
+    [history]
+  );
+
+  const setRefreshInterval = useCallback(
+    (interval: number) => {
+      const newQuery = new URLSearchParams(history.location.search);
+
+      if (interval > 0) {
+        newQuery.set('__refreshInterval', createTimeInterval(interval));
+      } else {
+        newQuery.delete('__refreshInterval');
+      }
+
+      history.push(`${history.location.pathname}?${newQuery.toString()}`);
+    },
+    [history]
+  );
+
+  const undo = useCallback(() => {
+    history.goBack();
+  }, [history]);
+
+  const redo = useCallback(() => {
+    history.goForward();
+  }, [history]);
+
+  const getRoutingContext = useCallback(
+    () => ({
+      gotoPage,
+      getUrl,
+      isFullscreen,
+      setFullscreen,
+      autoplayInterval,
+      setAutoplayInterval,
+      nextPage,
+      previousPage,
+      refreshInterval,
+      setRefreshInterval,
+      isAutoplayPaused,
+      setIsAutoplayPaused,
+      undo,
+      redo,
+    }),
+    [
+      gotoPage,
+      getUrl,
+      isFullscreen,
+      setFullscreen,
+      autoplayInterval,
+      setAutoplayInterval,
+      nextPage,
+      previousPage,
+      refreshInterval,
+      setRefreshInterval,
+      isAutoplayPaused,
+      setIsAutoplayPaused,
+      undo,
+      redo,
+    ]
+  );
+
+  return useMemo(() => getRoutingContext(), [getRoutingContext]);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.test.tsx b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.test.tsx
new file mode 100644
index 0000000000000..e77b878359d11
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.test.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { waitFor } from '@testing-library/react';
+import { renderHook } from '@testing-library/react-hooks';
+import { useWorkpad } from './use_workpad';
+
+const mockDispatch = jest.fn();
+const mockSelector = jest.fn();
+const mockGetWorkpad = jest.fn();
+
+const workpad = {
+  id: 'someworkpad',
+  pages: [],
+};
+
+const assets = [{ id: 'asset-id' }];
+
+const workpadResponse = {
+  ...workpad,
+  assets,
+};
+
+// Mock the hooks and actions used by the UseWorkpad hook
+jest.mock('react-redux', () => ({
+  useDispatch: () => mockDispatch,
+  useSelector: () => mockSelector,
+}));
+
+jest.mock('../../../services', () => ({
+  useServices: () => ({
+    workpad: {
+      get: mockGetWorkpad,
+    },
+  }),
+}));
+
+jest.mock('../../../state/actions/workpad', () => ({
+  setWorkpad: (payload: any) => ({
+    type: 'setWorkpad',
+    payload,
+  }),
+}));
+
+describe('useWorkpad', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  test('fires request to load workpad and dispatches results', async () => {
+    const workpadId = 'someworkpad';
+    mockGetWorkpad.mockResolvedValue(workpadResponse);
+
+    renderHook(() => useWorkpad(workpadId));
+
+    await waitFor(() => expect(mockGetWorkpad).toHaveBeenCalledWith(workpadId));
+
+    expect(mockGetWorkpad).toHaveBeenCalledWith(workpadId);
+    expect(mockDispatch).toHaveBeenCalledWith({ type: 'setAssets', payload: assets });
+    expect(mockDispatch).toHaveBeenCalledWith({ type: 'setWorkpad', payload: workpad });
+    expect(mockDispatch).toHaveBeenCalledWith({ type: 'setZoomScale', payload: 1 });
+  });
+});
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.ts
new file mode 100644
index 0000000000000..29b869b46e416
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad.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 { useEffect, useState } from 'react';
+import { useDispatch, useSelector } from 'react-redux';
+import { useServices } from '../../../services';
+import { getWorkpad } from '../../../state/selectors/workpad';
+import { setWorkpad } from '../../../state/actions/workpad';
+// @ts-expect-error
+import { setAssets } from '../../../state/actions/assets';
+// @ts-expect-error
+import { setZoomScale } from '../../../state/actions/transient';
+import { CanvasWorkpad } from '../../../../types';
+
+export const useWorkpad = (
+  workpadId: string,
+  loadPages: boolean = true
+): [CanvasWorkpad | undefined, string | Error | undefined] => {
+  const services = useServices();
+  const dispatch = useDispatch();
+  const storedWorkpad = useSelector(getWorkpad);
+  const [error, setError] = useState<string | Error | undefined>(undefined);
+
+  useEffect(() => {
+    (async () => {
+      try {
+        const { assets, ...workpad } = await services.workpad.get(workpadId);
+        dispatch(setAssets(assets));
+        dispatch(setWorkpad(workpad, { loadPages }));
+        dispatch(setZoomScale(1));
+      } catch (e) {
+        setError(e);
+      }
+    })();
+  }, [workpadId, services.workpad, dispatch, setError, loadPages]);
+
+  return [storedWorkpad.id === workpadId ? storedWorkpad : undefined, error];
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad_history.test.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad_history.test.ts
new file mode 100644
index 0000000000000..b5b9c038cfd2d
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad_history.test.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 { renderHook } from '@testing-library/react-hooks';
+import { useWorkpadHistory } from './use_workpad_history';
+import { encode } from '../route_state';
+
+const mockGetState = jest.fn();
+const mockGetHistory = jest.fn();
+
+// Mock the hooks and actions used by the UseWorkpad hook
+jest.mock('react-router-dom', () => ({
+  useHistory: () => mockGetHistory(),
+}));
+
+jest.mock('react-redux', () => ({
+  useSelector: (selector: any) => selector(mockGetState()),
+}));
+
+describe('useRestoreHistory', () => {
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  test('replaces undefined state with current state', () => {
+    const history = {
+      location: {
+        state: undefined,
+        pathname: 'somepath',
+      },
+      push: jest.fn(),
+      replace: jest.fn(),
+    };
+
+    const state = {
+      persistent: { some: 'state' },
+    };
+
+    mockGetState.mockReturnValue(state);
+    mockGetHistory.mockReturnValue(history);
+
+    renderHook(() => useWorkpadHistory());
+
+    expect(history.replace).toBeCalledWith(history.location.pathname, encode(state.persistent));
+  });
+
+  test('does not do a push on initial render if states do not match', () => {
+    const history = {
+      location: {
+        state: encode({ old: 'state' }),
+        pathname: 'somepath',
+      },
+      push: jest.fn(),
+      replace: jest.fn(),
+    };
+
+    const state = {
+      persistent: { some: 'state' },
+    };
+
+    mockGetState.mockReturnValue(state);
+    mockGetHistory.mockReturnValue(history);
+
+    renderHook(() => useWorkpadHistory());
+
+    expect(history.push).not.toBeCalled();
+  });
+
+  test('rerender does a push if location state does not match store state', () => {
+    const history = {
+      location: {
+        state: encode({ old: 'state' }),
+        pathname: 'somepath',
+      },
+      push: jest.fn(),
+      replace: jest.fn(),
+    };
+
+    const oldState = {
+      persistent: { some: 'state' },
+    };
+
+    const newState = {
+      persistent: { new: 'state' },
+    };
+
+    mockGetState.mockReturnValue(oldState);
+    mockGetHistory.mockReturnValue(history);
+
+    const { rerender } = renderHook(() => useWorkpadHistory());
+
+    mockGetState.mockReturnValue(newState);
+    rerender();
+
+    expect(history.push).toBeCalledWith(history.location.pathname, encode(newState.persistent));
+  });
+});
diff --git a/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad_history.ts b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad_history.ts
new file mode 100644
index 0000000000000..1f563f7147330
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/hooks/use_workpad_history.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 { useEffect, useRef } from 'react';
+import { useSelector } from 'react-redux';
+import { useHistory } from 'react-router-dom';
+import { isEqual } from 'lodash';
+import { createPath } from 'history';
+import { encode, decode } from '../route_state';
+import { State } from '../../../../types';
+
+export const useWorkpadHistory = () => {
+  const history = useHistory();
+  const historyState = useSelector((state: State) => state.persistent);
+  const hasRun = useRef<boolean>(false);
+
+  useEffect(() => {
+    const isInitialRun = !hasRun.current;
+    const locationState = history.location.state;
+    const decodedState = locationState ? decode(locationState) : {};
+    const doesStateMatchLocationState = isEqual(historyState, decodedState);
+    const fullPath = createPath(history.location);
+
+    hasRun.current = true;
+
+    // If there is no location state, then let's replace the curent route with the location state
+    // This will happen when navigating directly to a url (there will be no state on that link click)
+    if (locationState === undefined) {
+      history.replace(fullPath, encode(historyState));
+    } else if (!doesStateMatchLocationState && !isInitialRun) {
+      // There was a state change here
+
+      // If the state of the route that we are on does not match this new state, then we are going to push
+      history.push(fullPath, encode(historyState));
+    }
+  }, [history, historyState]);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/index.tsx b/x-pack/plugins/canvas/public/routes/workpad/index.tsx
new file mode 100644
index 0000000000000..4c98511baad0b
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/index.tsx
@@ -0,0 +1,23 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { RouteComponentProps } from 'react-router-dom';
+
+export { WorkpadRoute, ExportWorkpadRoute } from './workpad_route';
+
+export { WorkpadRoutingContext, WorkpadRoutingContextType } from './workpad_routing_context';
+
+export interface WorkpadRouteParams {
+  id: string;
+}
+
+export interface WorkpadPageRouteParams extends WorkpadRouteParams {
+  pageNumber: string;
+}
+
+export type WorkpadRouteProps = RouteComponentProps<WorkpadRouteParams>;
+export type WorkpadPageRouteProps = RouteComponentProps<WorkpadPageRouteParams>;
diff --git a/x-pack/plugins/canvas/public/routes/workpad/route_state.ts b/x-pack/plugins/canvas/public/routes/workpad/route_state.ts
new file mode 100644
index 0000000000000..c224af8c3123b
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/route_state.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.
+ */
+
+// @ts-expect-error
+import lzString from 'lz-string';
+
+export const encode = (state: any) => {
+  try {
+    const stateJSON = JSON.stringify(state);
+    return lzString.compress(stateJSON);
+  } catch (e) {
+    throw new Error(`Could not encode state: ${e.message}`);
+  }
+};
+
+export const decode = (payload: string) => {
+  try {
+    const stateJSON = lzString.decompress(payload);
+    return JSON.parse(stateJSON);
+  } catch (e) {
+    return null;
+  }
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/workpad_presentation_helper.tsx b/x-pack/plugins/canvas/public/routes/workpad/workpad_presentation_helper.tsx
new file mode 100644
index 0000000000000..cecb8a376c242
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/workpad_presentation_helper.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, { FC, useEffect } from 'react';
+import { useSelector } from 'react-redux';
+import { getBaseBreadcrumb, getWorkpadBreadcrumb } from '../../lib/breadcrumbs';
+// @ts-expect-error
+import { setDocTitle } from '../../lib/doc_title';
+import { getWorkpad } from '../../state/selectors/workpad';
+import { useFullscreenPresentationHelper } from './hooks/use_fullscreen_presentation_helper';
+import { useAutoplayHelper } from './hooks/use_autoplay_helper';
+import { useRefreshHelper } from './hooks/use_refresh_helper';
+import { useServices } from '../../services';
+
+export const WorkpadPresentationHelper: FC = ({ children }) => {
+  const services = useServices();
+  const workpad = useSelector(getWorkpad);
+  useFullscreenPresentationHelper();
+  useAutoplayHelper();
+  useRefreshHelper();
+
+  useEffect(() => {
+    services.platform.setBreadcrumbs([
+      getBaseBreadcrumb(),
+      getWorkpadBreadcrumb({ name: workpad.name, id: workpad.id }),
+    ]);
+  }, [workpad.name, workpad.id, services.platform]);
+
+  useEffect(() => {
+    setDocTitle(workpad.name);
+  }, [workpad.name]);
+
+  return <>{children}</>;
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/workpad_route.tsx b/x-pack/plugins/canvas/public/routes/workpad/workpad_route.tsx
new file mode 100644
index 0000000000000..7683b3413f681
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/workpad_route.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useEffect } from 'react';
+import { Route, Switch, Redirect, useParams } from 'react-router-dom';
+import { useDispatch } from 'react-redux';
+import { WorkpadApp } from '../../components/workpad_app';
+import { ExportApp } from '../../components/export_app';
+import { CanvasLoading } from '../../components/canvas_loading';
+// @ts-expect-error
+import { fetchAllRenderables } from '../../state/actions/elements';
+import { useServices } from '../../services';
+import { CanvasWorkpad } from '../../../types';
+import { ErrorStrings } from '../../../i18n';
+import { useWorkpad } from './hooks/use_workpad';
+import { useRestoreHistory } from './hooks/use_restore_history';
+import { useWorkpadHistory } from './hooks/use_workpad_history';
+import { usePageSync } from './hooks/use_page_sync';
+import { WorkpadPageRouteProps, WorkpadRouteProps, WorkpadPageRouteParams } from '.';
+import { WorkpadRoutingContextComponent } from './workpad_routing_context';
+import { WorkpadPresentationHelper } from './workpad_presentation_helper';
+
+const { workpadRoutes: strings } = ErrorStrings;
+
+export const WorkpadRoute = () => (
+  <Route
+    path={'/workpad/:id'}
+    exact={false}
+    children={(route: WorkpadRouteProps) => (
+      <WorkpadLoaderComponent params={route.match.params} key="workpad-loader">
+        {(workpad: CanvasWorkpad) => (
+          <Switch>
+            <Route
+              path="/workpad/:id/page/:pageNumber"
+              children={(pageRoute) => (
+                <WorkpadHistoryManager>
+                  <WorkpadRoutingContextComponent>
+                    <WorkpadPresentationHelper>
+                      <WorkpadApp />
+                    </WorkpadPresentationHelper>
+                  </WorkpadRoutingContextComponent>
+                </WorkpadHistoryManager>
+              )}
+            />
+            <Route path="/workpad/:id" strict={false} exact={true}>
+              <Redirect to={`/workpad/${route.match.params.id}/page/${workpad.page + 1}`} />
+            </Route>
+          </Switch>
+        )}
+      </WorkpadLoaderComponent>
+    )}
+  />
+);
+
+export const ExportWorkpadRoute = () => (
+  <Route
+    path={'/export/workpad/pdf/:id/page/:pageNumber'}
+    children={(route: WorkpadPageRouteProps) => (
+      <WorkpadLoaderComponent loadPages={false} params={route.match.params}>
+        {() => (
+          <ExportRouteManager>
+            <ExportApp />
+          </ExportRouteManager>
+        )}
+      </WorkpadLoaderComponent>
+    )}
+  />
+);
+
+export const ExportRouteManager: FC = ({ children }) => {
+  const params = useParams<WorkpadPageRouteParams>();
+  usePageSync();
+
+  const dispatch = useDispatch();
+
+  useEffect(() => {
+    dispatch(fetchAllRenderables({ onlyActivePage: true }));
+  }, [dispatch, params.pageNumber]);
+
+  return <>{children}</>;
+};
+
+export const WorkpadHistoryManager: FC = ({ children }) => {
+  useRestoreHistory();
+  useWorkpadHistory();
+  usePageSync();
+
+  return <>{children}</>;
+};
+
+const WorkpadLoaderComponent: FC<{
+  params: WorkpadRouteProps['match']['params'];
+  loadPages?: boolean;
+  children: (workpad: CanvasWorkpad) => JSX.Element;
+}> = ({ params, children, loadPages }) => {
+  const [workpad, error] = useWorkpad(params.id, loadPages);
+  const services = useServices();
+
+  useEffect(() => {
+    if (error) {
+      services.notify.error(error, { title: strings.getLoadFailureErrorMessage() });
+    }
+  }, [error, services.notify]);
+
+  if (error) {
+    return <Redirect to="/" />;
+  }
+
+  if (!workpad) {
+    return <CanvasLoading />;
+  }
+
+  return children(workpad);
+};
diff --git a/x-pack/plugins/canvas/public/routes/workpad/workpad_routing_context.tsx b/x-pack/plugins/canvas/public/routes/workpad/workpad_routing_context.tsx
new file mode 100644
index 0000000000000..fe90a9e325b7d
--- /dev/null
+++ b/x-pack/plugins/canvas/public/routes/workpad/workpad_routing_context.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, createContext } from 'react';
+import { useRoutingContext } from './hooks/use_routing_context';
+
+export interface WorkpadRoutingContextType {
+  gotoPage: (page: number) => void;
+  getUrl: (page: number) => string;
+  isFullscreen: boolean;
+  setFullscreen: (fullscreen: boolean) => void;
+  autoplayInterval: number;
+  setAutoplayInterval: (interval: number) => void;
+  isAutoplayPaused: boolean;
+  setIsAutoplayPaused: (isPaused: boolean) => void;
+  nextPage: () => void;
+  previousPage: () => void;
+  refreshInterval: number;
+  setRefreshInterval: (interval: number) => void;
+  undo: () => void;
+  redo: () => void;
+}
+
+const basicWorkpadRoutingContext = {
+  gotoPage: (page: number) => undefined,
+  getUrl: (page: number) => '',
+  isFullscreen: false,
+  setFullscreen: (fullscreen: boolean) => undefined,
+  autoplayInterval: 0,
+  setAutoplayInterval: (interval: number) => undefined,
+  isAutoplayPaused: true,
+  setIsAutoplayPaused: (isPaused: boolean) => undefined,
+  nextPage: () => undefined,
+  previousPage: () => undefined,
+  refreshInterval: 0,
+  setRefreshInterval: (interval: number) => undefined,
+  undo: () => undefined,
+  redo: () => undefined,
+};
+
+export const WorkpadRoutingContext = createContext<WorkpadRoutingContextType>(
+  basicWorkpadRoutingContext
+);
+
+export const WorkpadRoutingContextComponent: FC = ({ children }) => {
+  const routingContext = useRoutingContext();
+
+  return (
+    <WorkpadRoutingContext.Provider value={routingContext}>
+      {children}
+    </WorkpadRoutingContext.Provider>
+  );
+};
diff --git a/x-pack/plugins/canvas/public/services/context.tsx b/x-pack/plugins/canvas/public/services/context.tsx
index e078efe18b542..3a78e314b9635 100644
--- a/x-pack/plugins/canvas/public/services/context.tsx
+++ b/x-pack/plugins/canvas/public/services/context.tsx
@@ -26,6 +26,7 @@ const defaultContextValue = {
   platform: {},
   navLink: {},
   search: {},
+  workpad: {},
 };
 
 const context = createContext<CanvasServices>(defaultContextValue as CanvasServices);
@@ -37,6 +38,7 @@ export const useExpressionsService = () => useServices().expressions;
 export const useNotifyService = () => useServices().notify;
 export const useNavLinkService = () => useServices().navLink;
 export const useLabsService = () => useServices().labs;
+export const useWorkpadService = () => useServices().workpad;
 
 export const withServices = <Props extends WithServicesProps>(type: ComponentType<Props>) => {
   const EnhancedType: FC<Props> = (props) =>
@@ -58,6 +60,7 @@ export const ServicesProvider: FC<{
     search: specifiedProviders.search.getService(),
     reporting: specifiedProviders.reporting.getService(),
     labs: specifiedProviders.labs.getService(),
+    workpad: specifiedProviders.workpad.getService(),
   };
   return <context.Provider value={value}>{children}</context.Provider>;
 };
diff --git a/x-pack/plugins/canvas/public/services/index.ts b/x-pack/plugins/canvas/public/services/index.ts
index cbe7de43eff95..6c039660c64c7 100644
--- a/x-pack/plugins/canvas/public/services/index.ts
+++ b/x-pack/plugins/canvas/public/services/index.ts
@@ -16,6 +16,7 @@ import { expressionsServiceFactory } from './expressions';
 import { searchServiceFactory } from './search';
 import { labsServiceFactory } from './labs';
 import { reportingServiceFactory } from './reporting';
+import { workpadServiceFactory } from './workpad';
 
 export { NotifyService } from './notify';
 export { SearchService } from './search';
@@ -85,6 +86,7 @@ export const services = {
   search: new CanvasServiceProvider(searchServiceFactory),
   reporting: new CanvasServiceProvider(reportingServiceFactory),
   labs: new CanvasServiceProvider(labsServiceFactory),
+  workpad: new CanvasServiceProvider(workpadServiceFactory),
 };
 
 export type CanvasServiceProviders = typeof services;
@@ -98,6 +100,7 @@ export interface CanvasServices {
   search: ServiceFromProvider<typeof services.search>;
   reporting: ServiceFromProvider<typeof services.reporting>;
   labs: ServiceFromProvider<typeof services.labs>;
+  workpad: ServiceFromProvider<typeof services.workpad>;
 }
 
 export const startServices = async (
diff --git a/x-pack/plugins/canvas/public/services/notify.ts b/x-pack/plugins/canvas/public/services/notify.ts
index a65d9fe02a9c2..6ee5eec6291ab 100644
--- a/x-pack/plugins/canvas/public/services/notify.ts
+++ b/x-pack/plugins/canvas/public/services/notify.ts
@@ -12,7 +12,8 @@ import { ToastInputFields } from '../../../../../src/core/public';
 
 const getToast = (err: Error | string, opts: ToastInputFields = {}) => {
   const errData = (get(err, 'response') || err) as Error | string;
-  const errMsg = formatMsg(errData);
+  const errBody = get(err, 'body', undefined);
+  const errMsg = formatMsg(errBody !== undefined ? err : errData);
   const { title, ...rest } = opts;
   let text;
 
diff --git a/x-pack/plugins/canvas/public/services/stubs/index.ts b/x-pack/plugins/canvas/public/services/stubs/index.ts
index 7246a34d7f491..3b00e0e6195f3 100644
--- a/x-pack/plugins/canvas/public/services/stubs/index.ts
+++ b/x-pack/plugins/canvas/public/services/stubs/index.ts
@@ -14,6 +14,7 @@ import { notifyService } from './notify';
 import { labsService } from './labs';
 import { platformService } from './platform';
 import { searchService } from './search';
+import { workpadService } from './workpad';
 
 export const stubs: CanvasServices = {
   embeddables: embeddablesService,
@@ -24,6 +25,7 @@ export const stubs: CanvasServices = {
   platform: platformService,
   search: searchService,
   labs: labsService,
+  workpad: workpadService,
 };
 
 export const startServices = async (providedServices: Partial<CanvasServices> = {}) => {
diff --git a/x-pack/plugins/canvas/public/services/stubs/workpad.ts b/x-pack/plugins/canvas/public/services/stubs/workpad.ts
new file mode 100644
index 0000000000000..857831c92a8a6
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/stubs/workpad.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 { WorkpadService } from '../workpad';
+import { CanvasWorkpad } from '../../../types';
+
+export const workpadService: WorkpadService = {
+  get: (id: string) => Promise.resolve({} as CanvasWorkpad),
+  create: (workpad) => Promise.resolve({} as CanvasWorkpad),
+  createFromTemplate: (templateId: string) => Promise.resolve({} as CanvasWorkpad),
+  find: (term: string) =>
+    Promise.resolve({
+      total: 0,
+      workpads: [],
+    }),
+  remove: (id: string) => Promise.resolve(undefined),
+};
diff --git a/x-pack/plugins/canvas/public/services/workpad.ts b/x-pack/plugins/canvas/public/services/workpad.ts
new file mode 100644
index 0000000000000..11690ca4c0c45
--- /dev/null
+++ b/x-pack/plugins/canvas/public/services/workpad.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 { API_ROUTE_WORKPAD, DEFAULT_WORKPAD_CSS } from '../../common/lib/constants';
+import { CanvasWorkpad } from '../../types';
+import { CanvasServiceFactory } from './';
+
+/*
+  Remove any top level keys from the workpad which will be rejected by validation
+*/
+const validKeys = [
+  '@created',
+  '@timestamp',
+  'assets',
+  'colors',
+  'css',
+  'variables',
+  'height',
+  'id',
+  'isWriteable',
+  'name',
+  'page',
+  'pages',
+  'width',
+];
+
+const sanitizeWorkpad = function (workpad: CanvasWorkpad) {
+  const workpadKeys = Object.keys(workpad);
+
+  for (const key of workpadKeys) {
+    if (!validKeys.includes(key)) {
+      delete (workpad as { [key: string]: any })[key];
+    }
+  }
+
+  return workpad;
+};
+
+interface WorkpadFindResponse {
+  total: number;
+  workpads: Array<Pick<CanvasWorkpad, 'name' | 'id' | '@timestamp' | '@created'>>;
+}
+
+export interface WorkpadService {
+  get: (id: string) => Promise<CanvasWorkpad>;
+  create: (workpad: CanvasWorkpad) => Promise<CanvasWorkpad>;
+  createFromTemplate: (templateId: string) => Promise<CanvasWorkpad>;
+  find: (term: string) => Promise<WorkpadFindResponse>;
+  remove: (id: string) => Promise<void>;
+}
+
+export const workpadServiceFactory: CanvasServiceFactory<WorkpadService> = (
+  _coreSetup,
+  coreStart,
+  _setupPlugins,
+  startPlugins
+): WorkpadService => {
+  const getApiPath = function () {
+    return `${API_ROUTE_WORKPAD}`;
+  };
+  return {
+    get: async (id: string) => {
+      const workpad = await coreStart.http.get(`${getApiPath()}/${id}`);
+
+      return { css: DEFAULT_WORKPAD_CSS, variables: [], ...workpad };
+    },
+    create: (workpad: CanvasWorkpad) => {
+      return coreStart.http.post(getApiPath(), {
+        body: JSON.stringify({
+          ...sanitizeWorkpad({ ...workpad }),
+          assets: workpad.assets || {},
+          variables: workpad.variables || [],
+        }),
+      });
+    },
+    createFromTemplate: (templateId: string) => {
+      return coreStart.http.post(getApiPath(), {
+        body: JSON.stringify({ templateId }),
+      });
+    },
+    find: (searchTerm: string) => {
+      const validSearchTerm = typeof searchTerm === 'string' && searchTerm.length > 0;
+
+      return coreStart.http.get(`${getApiPath()}/find`, {
+        query: {
+          perPage: 10000,
+          name: validSearchTerm ? searchTerm : '',
+        },
+      });
+    },
+    remove: (id: string) => {
+      return coreStart.http.delete(`${getApiPath()}/${id}`);
+    },
+  };
+};
diff --git a/x-pack/plugins/canvas/public/state/actions/pages.js b/x-pack/plugins/canvas/public/state/actions/pages.js
index 64910e7b8a4a1..478fa0f52df65 100644
--- a/x-pack/plugins/canvas/public/state/actions/pages.js
+++ b/x-pack/plugins/canvas/public/state/actions/pages.js
@@ -9,7 +9,11 @@ import { createAction } from 'redux-actions';
 
 export const addPage = createAction('addPage');
 export const duplicatePage = createAction('duplicatePage');
-export const movePage = createAction('movePage', (id, position) => ({ id, position }));
+export const movePage = createAction('movePage', (id, position, gotoPage) => ({
+  id,
+  position,
+  gotoPage,
+}));
 export const removePage = createAction('removePage');
 export const stylePage = createAction('stylePage', (pageId, style) => ({ pageId, style }));
 export const setPage = createAction('setPage');
diff --git a/x-pack/plugins/canvas/public/state/actions/workpad.ts b/x-pack/plugins/canvas/public/state/actions/workpad.ts
index 648aed4245fbd..675c9867d87bc 100644
--- a/x-pack/plugins/canvas/public/state/actions/workpad.ts
+++ b/x-pack/plugins/canvas/public/state/actions/workpad.ts
@@ -52,7 +52,7 @@ export const setWorkpad = createThunk(
   'setWorkpad',
   (
     { dispatch, type },
-    workpad: CanvasWorkpad,
+    workpad: Omit<CanvasWorkpad, 'assets'>,
     { loadPages = true }: { loadPages?: boolean } = {}
   ) => {
     dispatch(createAction(type)(workpad)); // set the workpad object in state
diff --git a/x-pack/plugins/canvas/public/state/middleware/app_ready.js b/x-pack/plugins/canvas/public/state/middleware/app_ready.js
deleted file mode 100644
index c18896710bd0e..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/app_ready.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { isAppReady } from '../selectors/app';
-import { appReady as readyAction } from '../actions/app';
-
-export const appReady = ({ dispatch, getState }) => (next) => (action) => {
-  // execute the action
-  next(action);
-
-  // read the new state
-  const state = getState();
-
-  // if app is already ready, there's nothing more to do here
-  if (state.app.ready) {
-    return;
-  }
-
-  // check for all conditions in the state that indicate that the app is ready
-  if (isAppReady(state)) {
-    dispatch(readyAction());
-  }
-};
diff --git a/x-pack/plugins/canvas/public/state/middleware/breadcrumbs.js b/x-pack/plugins/canvas/public/state/middleware/breadcrumbs.js
deleted file mode 100644
index 820396fb87ec0..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/breadcrumbs.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { getWorkpad } from '../selectors/workpad';
-import { getBaseBreadcrumb, getWorkpadBreadcrumb, setBreadcrumb } from '../../lib/breadcrumbs';
-
-export const breadcrumbs = ({ getState }) => (next) => (action) => {
-  // capture the current workpad
-  const currentWorkpad = getWorkpad(getState());
-
-  // execute the default action
-  next(action);
-
-  // capture the workpad after the action completes
-  const updatedWorkpad = getWorkpad(getState());
-
-  // if the workpad name changed, update the breadcrumb data
-  if (currentWorkpad.name !== updatedWorkpad.name) {
-    setBreadcrumb([getBaseBreadcrumb(), getWorkpadBreadcrumb(updatedWorkpad)]);
-  }
-};
diff --git a/x-pack/plugins/canvas/public/state/middleware/fullscreen.js b/x-pack/plugins/canvas/public/state/middleware/fullscreen.js
deleted file mode 100644
index f40558c21f84a..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/fullscreen.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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { setFullscreen } from '../../lib/fullscreen';
-import { setFullscreen as setAppStateFullscreen } from '../../lib/app_state';
-import { setFullscreen as setFullscreenAction } from '../actions/transient';
-import { getFullscreen } from '../selectors/app';
-
-export const fullscreen = ({ getState }) => (next) => (action) => {
-  // execute the default action
-  next(action);
-
-  // pass current state's fullscreen info to the fullscreen service
-  if (action.type === setFullscreenAction.toString()) {
-    const fullscreen = getFullscreen(getState());
-    setFullscreen(fullscreen);
-    setAppStateFullscreen(fullscreen);
-  }
-};
diff --git a/x-pack/plugins/canvas/public/state/middleware/history.js b/x-pack/plugins/canvas/public/state/middleware/history.js
deleted file mode 100644
index 677f538a97294..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/history.js
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { isEqual } from 'lodash';
-import { routes } from '../../apps';
-import { historyProvider } from '../../lib/history_provider';
-import { routerProvider } from '../../lib/router_provider';
-import { get as fetchWorkpad } from '../../lib/workpad_service';
-import { restoreHistory, undoHistory, redoHistory } from '../actions/history';
-import { initializeWorkpad } from '../actions/workpad';
-import { setAssets } from '../actions/assets';
-import { isAppReady } from '../selectors/app';
-import { getWorkpad } from '../selectors/workpad';
-
-function getHistoryState(state) {
-  // this is what gets written to browser history
-  return state.persistent;
-}
-
-export const historyMiddleware = ({ dispatch, getState }) => {
-  // iterate over routes, injecting redux to action handlers
-  const reduxInject = (routes) => {
-    return routes.map((route) => {
-      if (route.children) {
-        return {
-          ...route,
-          children: reduxInject(route.children),
-        };
-      }
-
-      if (!route.action) {
-        return route;
-      }
-
-      return {
-        ...route,
-        action: route.action(dispatch, getState),
-      };
-    });
-  };
-
-  const handlerState = {
-    pendingCount: 0,
-  };
-
-  // wrap up the application route actions in redux
-  const router = routerProvider(reduxInject(routes));
-  const history = historyProvider();
-
-  // wire up history change handler (this only happens once)
-  const handleHistoryChanges = async (location, prevLocation) => {
-    const { pathname, state: historyState, action: historyAction } = location;
-    // pop state will fire on any hash-based url change, but only back/forward will have state
-    const isBrowserNav = historyAction === 'pop' && historyState != null;
-    const isUrlChange =
-      (!isBrowserNav && historyAction === 'pop') ||
-      ((historyAction === 'push' || historyAction === 'replace') &&
-        prevLocation.pathname !== pathname);
-
-    // only restore the history on popState events with state
-    // this only happens when using back/forward with popState objects
-    if (isBrowserNav) {
-      // TODO: oof, this sucks. we can't just shove assets into history state because
-      // firefox is limited to 640k (wat!). so, when we see that the workpad id is changing,
-      // we instead just restore the assets, which ensures the overall state is correct.
-      // there must be a better way to handle history though...
-      const currentWorkpadId = getWorkpad(getState()).id;
-      if (currentWorkpadId !== historyState.workpad.id) {
-        const newWorkpad = await fetchWorkpad(historyState.workpad.id);
-        dispatch(setAssets(newWorkpad.assets));
-      }
-
-      return dispatch(restoreHistory(historyState));
-    }
-
-    // execute route action on pushState and popState events
-    if (isUrlChange) {
-      return await router.parse(pathname);
-    }
-  };
-
-  history.onChange(async (...args) => {
-    // use history replace until any async handlers are completed
-    handlerState.pendingCount += 1;
-
-    try {
-      await handleHistoryChanges(...args);
-    } catch (e) {
-      // TODO: handle errors here
-    } finally {
-      // restore default history method
-      handlerState.pendingCount -= 1;
-    }
-  });
-
-  return (next) => (action) => {
-    const oldState = getState();
-
-    // deal with history actions
-    switch (action.type) {
-      case undoHistory.toString():
-        return history.undo();
-      case redoHistory.toString():
-        return history.redo();
-      case restoreHistory.toString():
-        // skip state compare, simply execute the action
-        next(action);
-        // TODO: we shouldn't need to reset the entire workpad for undo/redo
-        dispatch(initializeWorkpad());
-        return;
-    }
-
-    // execute the action like normal
-    next(action);
-    const newState = getState();
-
-    // if the app is not ready, don't persist anything
-    if (!isAppReady(newState)) {
-      return;
-    }
-
-    // if app switched from not ready to ready, replace current state
-    // this allows the back button to work correctly all the way to first page load
-    if (!isAppReady(oldState) && isAppReady(newState)) {
-      history.replace(getHistoryState(newState));
-      return;
-    }
-
-    // if the persistent state changed, push it into the history
-    const oldHistoryState = getHistoryState(oldState);
-    const historyState = getHistoryState(newState);
-    if (!isEqual(historyState, oldHistoryState)) {
-      // if there are pending route changes, just replace current route (to avoid extra back/forth history entries)
-      const useReplaceState = handlerState.pendingCount !== 0;
-      useReplaceState ? history.replace(historyState) : history.push(historyState);
-    }
-  };
-};
diff --git a/x-pack/plugins/canvas/public/state/middleware/index.js b/x-pack/plugins/canvas/public/state/middleware/index.js
index 1aeaaa6bcf907..713232543fab1 100644
--- a/x-pack/plugins/canvas/public/state/middleware/index.js
+++ b/x-pack/plugins/canvas/public/state/middleware/index.js
@@ -8,15 +8,9 @@
 import { applyMiddleware, compose as reduxCompose } from 'redux';
 import thunkMiddleware from 'redux-thunk';
 import { getWindow } from '../../lib/get_window';
-import { breadcrumbs } from './breadcrumbs';
 import { esPersistMiddleware } from './es_persist';
-import { fullscreen } from './fullscreen';
-import { historyMiddleware } from './history';
 import { inFlight } from './in_flight';
 import { workpadUpdate } from './workpad_update';
-import { workpadRefresh } from './workpad_refresh';
-import { workpadAutoplay } from './workpad_autoplay';
-import { appReady } from './app_ready';
 import { elementStats } from './element_stats';
 import { resolvedArgs } from './resolved_args';
 
@@ -26,14 +20,8 @@ const middlewares = [
     elementStats,
     resolvedArgs,
     esPersistMiddleware,
-    historyMiddleware,
-    breadcrumbs,
-    fullscreen,
     inFlight,
-    appReady,
-    workpadUpdate,
-    workpadRefresh,
-    workpadAutoplay
+    workpadUpdate
   ),
 ];
 
diff --git a/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.test.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.test.ts
deleted file mode 100644
index 41d1d7d2777fd..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.test.ts
+++ /dev/null
@@ -1,146 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-jest.mock('../../lib/app_state');
-jest.mock('../../lib/router_provider');
-
-import { workpadAutoplay } from './workpad_autoplay';
-import { setAutoplayInterval } from '../../lib/app_state';
-import { createTimeInterval } from '../../lib/time_interval';
-// @ts-expect-error untyped local
-import { routerProvider } from '../../lib/router_provider';
-
-const next = jest.fn();
-const dispatch = jest.fn();
-const getState = jest.fn();
-const routerMock = { navigateTo: jest.fn() };
-routerProvider.mockReturnValue(routerMock);
-
-const middleware = workpadAutoplay({ dispatch, getState })(next);
-
-const workpadState = {
-  persistent: {
-    workpad: {
-      id: 'workpad-id',
-      pages: ['page1', 'page2', 'page3'],
-      page: 0,
-    },
-  },
-};
-
-const autoplayState = {
-  ...workpadState,
-  transient: {
-    autoplay: {
-      inFlight: false,
-      enabled: true,
-      interval: 5000,
-    },
-    fullscreen: true,
-  },
-};
-
-const autoplayDisabledState = {
-  ...workpadState,
-  transient: {
-    autoplay: {
-      inFlight: false,
-      enabled: false,
-      interval: 5000,
-    },
-  },
-};
-
-const action = {};
-
-describe('workpad autoplay middleware', () => {
-  beforeEach(() => {
-    dispatch.mockClear();
-    jest.resetAllMocks();
-  });
-
-  describe('app state', () => {
-    it('sets the app state to the interval from state when enabled', () => {
-      getState.mockReturnValue(autoplayState);
-      middleware(action);
-
-      expect(setAutoplayInterval).toBeCalledWith(
-        createTimeInterval(autoplayState.transient.autoplay.interval)
-      );
-    });
-
-    it('sets the app state to null when not enabled', () => {
-      getState.mockReturnValue(autoplayDisabledState);
-      middleware(action);
-
-      expect(setAutoplayInterval).toBeCalledWith(null);
-    });
-  });
-
-  describe('autoplay navigation', () => {
-    it('navigates forward after interval', () => {
-      jest.useFakeTimers();
-      getState.mockReturnValue(autoplayState);
-      middleware(action);
-
-      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval + 1);
-
-      expect(routerMock.navigateTo).toBeCalledWith('loadWorkpad', {
-        id: workpadState.persistent.workpad.id,
-        page: workpadState.persistent.workpad.page + 2, // (index + 1) + 1 more for 1 indexed page number
-      });
-
-      jest.useRealTimers();
-    });
-
-    it('navigates from last page back to front', () => {
-      jest.useFakeTimers();
-      const onLastPageState = { ...autoplayState };
-      onLastPageState.persistent.workpad.page = onLastPageState.persistent.workpad.pages.length - 1;
-
-      getState.mockReturnValue(autoplayState);
-      middleware(action);
-
-      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval + 1);
-
-      expect(routerMock.navigateTo).toBeCalledWith('loadWorkpad', {
-        id: workpadState.persistent.workpad.id,
-        page: 1,
-      });
-
-      jest.useRealTimers();
-    });
-
-    it('continues autoplaying', () => {
-      jest.useFakeTimers();
-      getState.mockReturnValue(autoplayState);
-      middleware(action);
-
-      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval * 2 + 1);
-      expect(routerMock.navigateTo).toBeCalledTimes(2);
-      jest.useRealTimers();
-    });
-
-    it('does not reset timer between middleware calls', () => {
-      jest.useFakeTimers();
-
-      getState.mockReturnValue(autoplayState);
-      middleware(action);
-
-      // Advance until right before timeout
-      jest.advanceTimersByTime(autoplayState.transient.autoplay.interval - 1);
-
-      // Run middleware again
-      middleware(action);
-
-      // Advance timer
-      jest.advanceTimersByTime(1);
-
-      expect(routerMock.navigateTo).toBeCalled();
-    });
-  });
-});
diff --git a/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts
deleted file mode 100644
index ba32457aab642..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/workpad_autoplay.ts
+++ /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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Middleware } from 'redux';
-import { State } from '../../../types';
-import { getFullscreen } from '../selectors/app';
-import { getInFlight } from '../selectors/resolved_args';
-import { getWorkpad, getPages, getSelectedPageIndex, getAutoplay } from '../selectors/workpad';
-// @ts-expect-error untyped local
-import { appUnload } from '../actions/app';
-// @ts-expect-error untyped local
-import { routerProvider } from '../../lib/router_provider';
-import { setAutoplayInterval } from '../../lib/app_state';
-import { createTimeInterval } from '../../lib/time_interval';
-
-export const workpadAutoplay: Middleware<{}, State> = ({ getState }) => (next) => {
-  let playTimeout: number | undefined;
-  let displayInterval = 0;
-
-  const router = routerProvider();
-
-  function updateWorkpad() {
-    if (displayInterval === 0) {
-      return;
-    }
-
-    // check the request in flight status
-    const inFlightActive = getInFlight(getState());
-
-    // only navigate if no requests are in-flight
-    if (!inFlightActive) {
-      // update the elements on the workpad
-      const workpadId = getWorkpad(getState()).id;
-      const pageIndex = getSelectedPageIndex(getState());
-      const pageCount = getPages(getState()).length;
-      const nextPage = Math.min(pageIndex + 1, pageCount - 1);
-
-      // go to start if on the last page
-      if (nextPage === pageIndex) {
-        router.navigateTo('loadWorkpad', { id: workpadId, page: 1 });
-      } else {
-        router.navigateTo('loadWorkpad', { id: workpadId, page: nextPage + 1 });
-      }
-    }
-
-    stopAutoUpdate();
-    startDelayedUpdate();
-  }
-
-  function stopAutoUpdate() {
-    clearTimeout(playTimeout); // cancel any pending update requests
-    playTimeout = undefined;
-  }
-
-  function startDelayedUpdate() {
-    if (!playTimeout) {
-      stopAutoUpdate();
-      playTimeout = window.setTimeout(() => {
-        updateWorkpad();
-      }, displayInterval);
-    }
-  }
-
-  return (action) => {
-    next(action);
-
-    const isFullscreen = getFullscreen(getState());
-    const autoplay = getAutoplay(getState());
-    const shouldPlay = isFullscreen && autoplay.enabled && autoplay.interval > 0;
-    displayInterval = autoplay.interval;
-
-    // update appState
-    if (autoplay.enabled) {
-      setAutoplayInterval(createTimeInterval(autoplay.interval));
-    } else {
-      setAutoplayInterval(null);
-    }
-
-    // if interval is larger than 0, start the delayed update
-    if (shouldPlay) {
-      startDelayedUpdate();
-    } else {
-      stopAutoUpdate();
-    }
-
-    if (action.type === appUnload.toString()) {
-      stopAutoUpdate();
-    }
-  };
-};
diff --git a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.test.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.test.ts
deleted file mode 100644
index 76a75e248efe9..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.test.ts
+++ /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.
- */
-
-jest.mock('../../lib/app_state');
-
-import { workpadRefresh } from './workpad_refresh';
-import { inFlightComplete } from '../actions/resolved_args';
-import { setRefreshInterval } from '../actions/workpad';
-import { setRefreshInterval as setAppStateRefreshInterval } from '../../lib/app_state';
-
-import { createTimeInterval } from '../../lib/time_interval';
-
-const next = jest.fn();
-const dispatch = jest.fn();
-const getState = jest.fn();
-
-const middleware = workpadRefresh({ dispatch, getState })(next);
-
-const refreshState = {
-  transient: {
-    refresh: {
-      interval: 5000,
-    },
-  },
-};
-
-const noRefreshState = {
-  transient: {
-    refresh: {
-      interval: 0,
-    },
-  },
-};
-
-const inFlightState = {
-  transient: {
-    refresh: {
-      interval: 5000,
-    },
-    inFlight: true,
-  },
-};
-
-describe('workpad refresh middleware', () => {
-  beforeEach(() => {
-    jest.resetAllMocks();
-  });
-
-  describe('onInflightComplete', () => {
-    it('refreshes if interval gt 0', () => {
-      jest.useFakeTimers();
-      getState.mockReturnValue(refreshState);
-
-      middleware(inFlightComplete());
-
-      jest.runAllTimers();
-
-      expect(dispatch).toHaveBeenCalled();
-    });
-
-    it('does not reset interval if another action occurs', () => {
-      jest.useFakeTimers();
-      getState.mockReturnValue(refreshState);
-
-      middleware(inFlightComplete());
-
-      jest.advanceTimersByTime(refreshState.transient.refresh.interval - 1);
-
-      expect(dispatch).not.toHaveBeenCalled();
-      middleware(inFlightComplete());
-
-      jest.advanceTimersByTime(1);
-
-      expect(dispatch).toHaveBeenCalled();
-    });
-
-    it('does not refresh if interval is 0', () => {
-      jest.useFakeTimers();
-      getState.mockReturnValue(noRefreshState);
-
-      middleware(inFlightComplete());
-
-      jest.runAllTimers();
-      expect(dispatch).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('setRefreshInterval', () => {
-    it('does nothing if refresh interval is unchanged', () => {
-      getState.mockReturnValue(refreshState);
-
-      jest.useFakeTimers();
-      const interval = 1;
-      middleware(setRefreshInterval(interval));
-      jest.runAllTimers();
-
-      expect(setAppStateRefreshInterval).not.toBeCalled();
-    });
-
-    it('sets the app refresh interval', () => {
-      getState.mockReturnValue(noRefreshState);
-      next.mockImplementation(() => {
-        getState.mockReturnValue(refreshState);
-      });
-
-      jest.useFakeTimers();
-      const interval = 1;
-      middleware(setRefreshInterval(interval));
-
-      expect(setAppStateRefreshInterval).toBeCalledWith(createTimeInterval(interval));
-      jest.runAllTimers();
-    });
-
-    it('starts a refresh for the new interval', () => {
-      getState.mockReturnValue(refreshState);
-      jest.useFakeTimers();
-
-      const interval = 1000;
-
-      middleware(inFlightComplete());
-
-      jest.runTimersToTime(refreshState.transient.refresh.interval - 1);
-      expect(dispatch).not.toBeCalled();
-
-      getState.mockReturnValue(noRefreshState);
-      next.mockImplementation(() => {
-        getState.mockReturnValue(refreshState);
-      });
-      middleware(setRefreshInterval(interval));
-      jest.runTimersToTime(1);
-
-      expect(dispatch).not.toBeCalled();
-
-      jest.runTimersToTime(interval);
-      expect(dispatch).toBeCalled();
-    });
-  });
-
-  describe('inFlight in progress', () => {
-    it('requeues the refresh when inflight is active', () => {
-      jest.useFakeTimers();
-      getState.mockReturnValue(inFlightState);
-
-      middleware(inFlightComplete());
-      jest.runTimersToTime(refreshState.transient.refresh.interval);
-
-      expect(dispatch).not.toBeCalled();
-
-      getState.mockReturnValue(refreshState);
-      jest.runAllTimers();
-
-      expect(dispatch).toBeCalled();
-    });
-  });
-});
diff --git a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts b/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts
deleted file mode 100644
index 026ac736f87b5..0000000000000
--- a/x-pack/plugins/canvas/public/state/middleware/workpad_refresh.ts
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Middleware } from 'redux';
-import { State } from '../../../types';
-// @ts-expect-error untyped local
-import { fetchAllRenderables } from '../actions/elements';
-import { setRefreshInterval } from '../actions/workpad';
-// @ts-expect-error untyped local
-import { appUnload } from '../actions/app';
-import { inFlightComplete } from '../actions/resolved_args';
-import { getInFlight } from '../selectors/resolved_args';
-import { getRefreshInterval } from '../selectors/workpad';
-import { setRefreshInterval as setAppStateRefreshInterval } from '../../lib/app_state';
-import { createTimeInterval } from '../../lib/time_interval';
-
-export const workpadRefresh: Middleware<{}, State> = ({ dispatch, getState }) => (next) => {
-  let refreshTimeout: number | undefined;
-  let refreshInterval = 0;
-
-  function updateWorkpad() {
-    cancelDelayedUpdate();
-
-    if (refreshInterval === 0) {
-      return;
-    }
-
-    // check the request in flight status
-    const inFlightActive = getInFlight(getState());
-    if (inFlightActive) {
-      // if requests are in-flight, start the refresh delay again
-      startDelayedUpdate();
-    } else {
-      // update the elements on the workpad
-      dispatch(fetchAllRenderables());
-    }
-  }
-
-  function cancelDelayedUpdate() {
-    clearTimeout(refreshTimeout);
-    refreshTimeout = undefined;
-  }
-
-  function startDelayedUpdate() {
-    if (!refreshTimeout) {
-      clearTimeout(refreshTimeout); // cancel any pending update requests
-      refreshTimeout = window.setTimeout(() => {
-        updateWorkpad();
-      }, refreshInterval);
-    }
-  }
-
-  return (action) => {
-    const previousRefreshInterval = getRefreshInterval(getState());
-    next(action);
-
-    refreshInterval = getRefreshInterval(getState());
-
-    // when in-flight requests are finished, update the workpad after a given delay
-    if (action.type === inFlightComplete.toString() && refreshInterval > 0) {
-      startDelayedUpdate();
-    } // create new update request
-
-    // This middleware creates or destroys an interval that will cause workpad elements to update
-    if (
-      action.type === setRefreshInterval.toString() &&
-      previousRefreshInterval !== refreshInterval
-    ) {
-      // update the refresh interval
-      refreshInterval = action.payload;
-
-      setAppStateRefreshInterval(createTimeInterval(refreshInterval));
-
-      // clear any pending timeout
-      cancelDelayedUpdate();
-
-      // if interval is larger than 0, start the delayed update
-      if (refreshInterval > 0) {
-        startDelayedUpdate();
-      }
-    }
-
-    if (action.type === appUnload.toString()) {
-      cancelDelayedUpdate();
-    }
-  };
-};
diff --git a/x-pack/plugins/canvas/public/state/reducers/pages.js b/x-pack/plugins/canvas/public/state/reducers/pages.js
index bec0019486d46..78ec0addd970e 100644
--- a/x-pack/plugins/canvas/public/state/reducers/pages.js
+++ b/x-pack/plugins/canvas/public/state/reducers/pages.js
@@ -9,7 +9,6 @@ import { handleActions } from 'redux-actions';
 import immutable from 'object-path-immutable';
 import { cloneSubgraphs } from '../../lib/clone_subgraphs';
 import { getId } from '../../lib/get_id';
-import { routerProvider } from '../../lib/router_provider';
 import { getDefaultPage } from '../defaults';
 import * as actions from '../actions/pages';
 import { getSelectedPageIndex } from '../selectors/workpad';
@@ -47,20 +46,19 @@ function clonePage(page) {
 
 export const pagesReducer = handleActions(
   {
-    [actions.addPage]: (workpadState, { payload }) => {
+    [actions.addPage]: (workpadState, { payload: { gotoPage } }) => {
       const { page: activePage } = workpadState;
-      const withNewPage = addPage(workpadState, payload, activePage);
+      const withNewPage = addPage(workpadState, undefined, activePage);
       const newState = setPageIndex(withNewPage, activePage + 1);
 
       // changes to the page require navigation
-      const router = routerProvider();
-      router.navigateTo('loadWorkpad', { id: newState.id, page: newState.page + 1 });
+      gotoPage(newState.page + 1);
 
       return newState;
     },
 
-    [actions.duplicatePage]: (workpadState, { payload }) => {
-      const srcPage = workpadState.pages.find((page) => page.id === payload);
+    [actions.duplicatePage]: (workpadState, { payload: { gotoPage, id } }) => {
+      const srcPage = workpadState.pages.find((page) => page.id === id);
 
       // if the page id is invalid, don't change the state
       if (!srcPage) {
@@ -73,8 +71,7 @@ export const pagesReducer = handleActions(
       const newState = setPageIndex(insertedWorkpadState, newPageIndex);
 
       // changes to the page require navigation
-      const router = routerProvider();
-      router.navigateTo('loadWorkpad', { id: newState.id, page: newPageIndex + 1 });
+      gotoPage(newPageIndex + 1);
 
       return newState;
     },
@@ -83,7 +80,7 @@ export const pagesReducer = handleActions(
       return setPageIndex(workpadState, payload);
     },
 
-    [actions.movePage]: (workpadState, { payload }) => {
+    [actions.movePage]: (workpadState, { payload: { gotoPage, ...payload } }) => {
       const { id, position } = payload;
       const pageIndex = getPageIndexById(workpadState, id);
       const newIndex = pageIndex + position;
@@ -108,38 +105,32 @@ export const pagesReducer = handleActions(
       newState = set(newState, 'page', newSelectedIndex);
 
       // changes to the page require navigation
-      const router = routerProvider();
-      router.navigateTo('loadWorkpad', { id: newState.id, page: newState.page + 1 });
+      gotoPage(newState.page + 1);
 
       return newState;
     },
 
-    [actions.removePage]: (workpadState, { payload }) => {
+    [actions.removePage]: (workpadState, { payload: { id, gotoPage } }) => {
       const curIndex = workpadState.page;
-      const delIndex = getPageIndexById(workpadState, payload);
+      const delIndex = getPageIndexById(workpadState, id);
       if (delIndex >= 0) {
         let newState = del(workpadState, `pages.${delIndex}`);
-        const router = routerProvider();
         const wasSelected = curIndex === delIndex;
         const wasOnlyPage = newState.pages.length === 0;
-        const newSelectedPage = curIndex >= delIndex ? curIndex - 1 : curIndex;
 
         // if we removed the only page, create a new empty one
         if (wasOnlyPage) {
           newState = addPage(newState);
         }
 
-        if (wasOnlyPage || wasSelected) {
-          // if we removed the only page or the selected one, select the first one
+        if (wasOnlyPage) {
           newState = set(newState, 'page', 0);
-        } else {
-          // set the adjusted selected page on new state
-          newState = set(newState, 'page', newSelectedPage);
+          gotoPage(1);
+        } else if (wasSelected || delIndex < curIndex) {
+          newState = set(newState, 'page', curIndex - 1);
+          gotoPage(curIndex);
         }
 
-        // changes to the page require navigation
-        router.navigateTo('loadWorkpad', { id: newState.id, page: newState.page + 1 });
-
         return newState;
       }
     },
diff --git a/x-pack/plugins/canvas/public/style/index.scss b/x-pack/plugins/canvas/public/style/index.scss
index 6c883b832737f..a79e07a7d0016 100644
--- a/x-pack/plugins/canvas/public/style/index.scss
+++ b/x-pack/plugins/canvas/public/style/index.scss
@@ -2,12 +2,10 @@
 @import 'hackery';
 @import 'main';
 
-// Canvas apps
-@import '../apps/home/home_app/home_app';
-@import '../apps/workpad/workpad_app/workpad_app';
-@import '../apps/export/export/export_app';
-
 // Canvas components
+@import '../components/home_app/home_app';
+@import '../components/workpad_app/workpad_app';
+@import '../components/export_app/export_app';
 @import '../components/arg_add/arg_add';
 @import '../components/arg_add_popover/arg_add_popover';
 @import '../components/arg_form/arg_form';
diff --git a/x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json b/x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
index 113fba5555376..be5bc213e59a4 100644
--- a/x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
+++ b/x-pack/plugins/canvas/server/sample_data/ecommerce_saved_objects.json
@@ -28,7 +28,7 @@
                 "height": 510,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" \n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"sum(maleCount) / count(maleCount)\" \n| revealImage origin=\"bottom\" image={asset \"asset-aaa14d64-2c1c-47f2-95c0-21306ee18cba\"} emptyImage={asset \"asset-960c8c6e-da72-412d-9d04-34a98cdb5760\"}"
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='MALE' THEN 1 else 0 END) as male_count from kibana_sample_data_ecommerce\"\n| math \"male_count / total_count\" \n| revealImage origin=\"bottom\" image={asset \"asset-aaa14d64-2c1c-47f2-95c0-21306ee18cba\"} emptyImage={asset \"asset-960c8c6e-da72-412d-9d04-34a98cdb5760\"}"
             },
             {
               "id": "element-4a3fef74-5d8c-4bbe-8f3f-fe55afdd4b60",
@@ -50,7 +50,7 @@
                 "height": 520,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\"\n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0}\n| math \"sum(maleCount) / count(maleCount)\"\n| revealImage origin=\"bottom\" image={asset \"asset-2f64bd10-953d-4163-90e9-a55e9ca4c52a\"} emptyImage={asset \"asset-3a26727a-b756-44be-a82c-273dd85bda09\"}",
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='FEMALE' THEN 1 else 0 END) as female_count from kibana_sample_data_ecommerce\"\n| math \"female_count / total_count\" \n| revealImage origin=\"bottom\" image={asset \"asset-2f64bd10-953d-4163-90e9-a55e9ca4c52a\"} emptyImage={asset \"asset-3a26727a-b756-44be-a82c-273dd85bda09\"}",
               "filter": null
             },
             {
@@ -194,7 +194,7 @@
                 "height": 56,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"femaleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"round(100 * sum(femaleCount) / count(femaleCount))\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}"
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='FEMALE' THEN 1 else 0 END) as female_count from kibana_sample_data_ecommerce\"\n| math \"round(100 * female_count / total_count)\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#eb6c66\" weight=\"normal\" underline=false italic=false}"
             },
             {
               "id": "element-9e0b6230-2bc9-4995-8207-043e3063faeb",
@@ -205,7 +205,7 @@
                 "height": 56,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"round(100 * sum(maleCount) / count(maleCount))\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#f8bd4a\" weight=\"normal\" underline=false italic=false}"
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='MALE' THEN 1 else 0 END) as male_count from kibana_sample_data_ecommerce\"\n| math \"round(100 * male_count / total_count)\" | markdown {context} \"%\" font={font family=\"Avenir\" size=48 align=\"center\" color=\"#f8bd4a\" weight=\"normal\" underline=false italic=false}"
             },
             {
               "id": "element-2185edff-ac50-4162-b583-3bfd6469e925",
@@ -216,7 +216,7 @@
                 "height": 721,
                 "angle": 0
               },
-              "expression": "filters | demodata | markdown \"\" | render containerStyle={containerStyle backgroundColor=\"#ede9e7\"}"
+              "expression": "markdown \"\" | render containerStyle={containerStyle backgroundColor=\"#ede9e7\"}"
             },
             {
               "id": "element-71b63f54-0961-4ed2-a85d-45584b48a631",
@@ -535,7 +535,7 @@
                 "height": 202,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" \n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"sum(maleCount) / count(maleCount)\" \n| revealImage origin=\"bottom\" image={asset \"asset-803ec373-2608-4f6f-8cf9-0dbb2f6437ce\"} emptyImage={asset \"asset-18070a2a-cd01-410a-ba89-a4505e2fbc5b\"}"
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='MALE' THEN 1 else 0 END) as male_count from kibana_sample_data_ecommerce\"\n| math \"male_count / total_count\" \n| revealImage origin=\"bottom\" image={asset \"asset-803ec373-2608-4f6f-8cf9-0dbb2f6437ce\"} emptyImage={asset \"asset-18070a2a-cd01-410a-ba89-a4505e2fbc5b\"}"
             },
             {
               "id": "element-2379c3ca-2c31-4948-8412-d14115500efc",
@@ -546,7 +546,7 @@
                 "height": 202,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" \n| mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"sum(maleCount) / count(maleCount)\" \n| revealImage origin=\"bottom\" image={asset \"asset-e644a484-4097-40b9-a08e-7250ba963059\"} emptyImage={asset \"asset-7e4f7119-b2d8-4527-9bd8-887cb25974e7\"}"
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='FEMALE' THEN 1 else 0 END) as female_count from kibana_sample_data_ecommerce\"\n| math \"female_count / total_count\" \n| revealImage origin=\"bottom\" image={asset \"asset-e644a484-4097-40b9-a08e-7250ba963059\"} emptyImage={asset \"asset-7e4f7119-b2d8-4527-9bd8-887cb25974e7\"}"
             },
             {
               "id": "element-3f52813f-7d0e-4ec7-9aad-c731b670d88d",
@@ -964,7 +964,7 @@
                 "height": 63,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"femaleCount\" exp={getCell \"customer_gender\" | if {compare to=\"FEMALE\"} then=1 else=0} | math \"round(100 * sum(femaleCount) / count(femaleCount))\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}"
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='FEMALE' THEN 1 else 0 END) as female_count from kibana_sample_data_ecommerce\"\n| math \"round(100 * female_count / total_count)\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#F05A24\" weight=\"bold\" underline=false italic=false}"
             },
             {
               "id": "element-86b06b67-893e-4555-ad38-7fba9ea3153b",
@@ -975,7 +975,7 @@
                 "height": 72,
                 "angle": 0
               },
-              "expression": "esdocs index=\"kibana_sample_data_ecommerce\" sort=\"order_date, desc\" fields=\"customer_gender\" | mapColumn \"maleCount\" exp={getCell \"customer_gender\" | if {compare to=\"MALE\"} then=1 else=0} | math \"round(100 * sum(maleCount) / count(maleCount))\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}"
+              "expression": "essql query=\"select COUNT(*) as total_count, SUM(CASE WHEN customer_gender='MALE' THEN 1 else 0 END) as male_count from kibana_sample_data_ecommerce\"\n| math \"round(100 * male_count / total_count)\" | markdown {context} font={font family=\"nexa bold, Avenir\" size=48 align=\"center\" color=\"#00A89C\" weight=\"bold\" underline=false italic=false}"
             },
             {
               "id": "element-507337d9-6e0e-4752-8770-6ebe88e9b3da",
diff --git a/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap
index 3bad27aab0cf5..1955af55e9853 100644
--- a/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/api/__snapshots__/shareable.test.tsx.snap
@@ -9,7 +9,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with default propertie
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with height specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-height=\\"350\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -21,7 +21,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with height specified
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with page specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-page=\\"0\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -33,7 +33,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with page specified 2`
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with width and height specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-width=\\"350\\" kbn-canvas-height=\\"350\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -45,7 +45,7 @@ exports[`Canvas Shareable Workpad API Placed successfully with width and height
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
 
 exports[`Canvas Shareable Workpad API Placed successfully with width specified 1`] = `"<div kbn-canvas-shareable=\\"canvas\\" kbn-canvas-width=\\"400\\" kbn-canvas-url=\\"workpad.json\\"></div>"`;
@@ -57,5 +57,5 @@ exports[`Canvas Shareable Workpad API Placed successfully with width specified 2
 </style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div><div class=\\"root\\" style=\\"height: 48px;\\"><div class=\\"root\\"><div class=\\"slideContainer\\"><div class=\\"root\\" style=\\"height: 100px; width: 150px;\\"><div class=\\"preview\\" style=\\"height: 720px; width: 1080px; transform: scale3d(0.1388888888888889, 0.1388888888888889, 1);\\"><div id=\\"page-7186b301-f8a7-4c65-8b89-38d68d31cfc4\\" class=\\"root\\" style=\\"height: 720px; width: 1080px; background: rgb(119, 119, 119);\\"><div class=\\"canvasPositionable canvasInteractable\\" style=\\"width: 1082px; height: 205.37748344370857px; margin-left: -541px; margin-top: -102.68874172185429px; position: absolute; transform: matrix3d(1,0,0,0,0,1,0,0,0,0,1,0,540,367,1,1);\\"><div class=\\"root\\"><div class=\\"container s2042575598\\" style=\\"overflow: hidden;\\"><style type=\\"text/css\\">.s2042575598 .canvasRenderEl h1 {
  font-size: 150px; text-align: center; color: #d3d3d3;
 }
-</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
+</style><div class=\\"content\\"><div class=\\"renderContainer\\"><div data-renderer=\\"markdown\\" class=\\"render\\"><div>markdown mock</div></div></div></div></div></div></div></div></div></div></div></div><div class=\\"bar\\" style=\\"bottom: 0px;\\"><div class=\\"euiFlexGroup euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem title\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"flex-shrink: 0;\\"><a class=\\"euiLink euiLink--primary\\" href=\\"https://www.elastic.co\\" rel=\\"\\" title=\\"Powered by Elastic.co\\"><span data-euiicon-type=\\"logoElastic\\"></span></a></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\" style=\\"min-width: 0; cursor: default;\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\"><div class=\\"eui-textTruncate\\">My Canvas Workpad</div></div></div></div></div></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiFlexGroup euiFlexGroup--gutterSmall euiFlexGroup--directionRow euiFlexGroup--responsive\\"><div class=\\"euiFlexGroup euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow euiFlexGroup--responsive\\" style=\\"margin: 0px 12px;\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsPrevPage\\" aria-label=\\"Previous Page\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button class=\\"euiButtonEmpty euiButtonEmpty--ghost euiButtonEmpty--small\\" type=\\"button\\" data-test-subj=\\"pageControlsCurrentPage\\"><span class=\\"euiButtonContent euiButtonEmpty__content\\"><span class=\\"euiButtonEmpty__text\\"><div class=\\"euiText euiText--small\\"><div class=\\"euiTextColor euiTextColor--ghost\\">Page 1</div></div></span></span></button></div><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><button disabled=\\"\\" class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" data-test-subj=\\"pageControlsNextPage\\" aria-label=\\"Next Page\\"><span data-euiicon-type=\\"arrowRight\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div><div class=\\"euiFlexGroup euiFlexGroup--alignItemsFlexEnd euiFlexGroup--justifyContentCenter euiFlexGroup--directionColumn euiFlexGroup--responsive\\"><div class=\\"euiFlexItem euiFlexItem--flexGrowZero\\"><div class=\\"euiPopover euiPopover--anchorUpRight\\" id=\\"settings\\"><div class=\\"euiPopover__anchor\\"><button class=\\"euiButtonIcon euiButtonIcon--ghost euiButtonIcon--empty euiButtonIcon--xSmall\\" type=\\"button\\" aria-label=\\"Settings\\"><span data-euiicon-type=\\"gear\\" class=\\"euiButtonIcon__icon\\" aria-hidden=\\"true\\" color=\\"inherit\\"></span></button></div></div></div></div></div></div></div></div></div></div></div>"
 `;
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot
index 3432e479bff97..d23371d0c3499 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/__stories__/__snapshots__/canvas.stories.storyshot
@@ -1383,6 +1383,7 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                     <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="arrowLeft"
                       size="m"
                     />
@@ -1433,6 +1434,7 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                     <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="arrowRight"
                       size="m"
                     />
@@ -1462,6 +1464,7 @@ exports[`Storyshots shareables/Canvas component 1`] = `
                         <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
+                          color="inherit"
                           data-euiicon-type="gear"
                           size="m"
                         />
@@ -2862,6 +2865,7 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                     <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="arrowLeft"
                       size="m"
                     />
@@ -2912,6 +2916,7 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                     <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="arrowRight"
                       size="m"
                     />
@@ -2941,6 +2946,7 @@ exports[`Storyshots shareables/Canvas contextual: austin 1`] = `
                         <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
+                          color="inherit"
                           data-euiicon-type="gear"
                           size="m"
                         />
@@ -3157,6 +3163,7 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                     <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="arrowLeft"
                       size="m"
                     />
@@ -3206,6 +3213,7 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                     <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="arrowRight"
                       size="m"
                     />
@@ -3235,6 +3243,7 @@ exports[`Storyshots shareables/Canvas contextual: hello 1`] = `
                         <span
                           aria-hidden="true"
                           className="euiButtonIcon__icon"
+                          color="inherit"
                           data-euiicon-type="gear"
                           size="m"
                         />
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot
index 2748e2ce5dd7a..57af8bcb4fecf 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/footer.stories.storyshot
@@ -1336,6 +1336,7 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                   <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowLeft"
                     size="m"
                   />
@@ -1386,6 +1387,7 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                   <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowRight"
                     size="m"
                   />
@@ -1415,6 +1417,7 @@ exports[`Storyshots shareables/Footer contextual: austin 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="gear"
                         size="m"
                       />
@@ -1585,6 +1588,7 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                   <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowLeft"
                     size="m"
                   />
@@ -1634,6 +1638,7 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                   <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowRight"
                     size="m"
                   />
@@ -1663,6 +1668,7 @@ exports[`Storyshots shareables/Footer contextual: hello 1`] = `
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="gear"
                         size="m"
                       />
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot
index 1b703a8a031f4..81b0ee9cca832 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/__stories__/__snapshots__/page_controls.stories.storyshot
@@ -31,6 +31,7 @@ exports[`Storyshots shareables/Footer/PageControls component 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="arrowLeft"
           size="m"
         />
@@ -81,6 +82,7 @@ exports[`Storyshots shareables/Footer/PageControls component 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="arrowRight"
           size="m"
         />
@@ -126,6 +128,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: austin 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="arrowLeft"
           size="m"
         />
@@ -176,6 +179,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: austin 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="arrowRight"
           size="m"
         />
@@ -221,6 +225,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: hello 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="arrowLeft"
           size="m"
         />
@@ -271,6 +276,7 @@ exports[`Storyshots shareables/Footer/PageControls contextual: hello 1`] = `
         <span
           aria-hidden="true"
           className="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="arrowRight"
           size="m"
         />
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
index eb8b648e4969a..621a6bb211fe9 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__snapshots__/settings.test.tsx.snap
@@ -53,6 +53,7 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="play"
                     />
                     <span
@@ -75,6 +76,7 @@ exports[`<Settings /> can navigate Autoplay Settings 1`] = `
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="boxesHorizontal"
                     />
                     <span
@@ -151,6 +153,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="play"
                     />
                     <span
@@ -173,6 +176,7 @@ exports[`<Settings /> can navigate Autoplay Settings 2`] = `
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="boxesHorizontal"
                     />
                     <span
@@ -401,6 +405,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="play"
                     />
                     <span
@@ -423,6 +428,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 1`] =
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="boxesHorizontal"
                     />
                     <span
@@ -499,6 +505,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="play"
                     />
                     <span
@@ -521,6 +528,7 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
                   >
                     <span
                       class="euiContextMenu__icon"
+                      color="inherit"
                       data-euiicon-type="boxesHorizontal"
                     />
                     <span
@@ -632,4 +640,4 @@ exports[`<Settings /> can navigate Toolbar Settings, closes when activated 2`] =
 </div>
 `;
 
-exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPopover__panel euiPopover__panel--top\\" tabindex=\\"0\\" aria-live=\\"off\\" role=\\"dialog\\" aria-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><p id=\\"generated-id\\" class=\\"euiScreenReaderOnly\\">You are in a dialog. To close this dialog, hit escape.</p><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiContextMenuPanelTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenuItem__text\\">Auto Play</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenuItem__text\\">Toolbar</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><span data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></span><span data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></span></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
+exports[`<Settings /> can navigate Toolbar Settings, closes when activated 3`] = `"<div><div data-eui=\\"EuiFocusTrap\\"><div class=\\"euiPanel euiPanel--borderRadiusMedium euiPanel--plain euiPanel--noShadow euiPopover__panel euiPopover__panel--top\\" tabindex=\\"0\\" aria-live=\\"off\\" role=\\"dialog\\" aria-modal=\\"true\\" aria-describedby=\\"generated-id\\" style=\\"top: -16px; left: -22px; z-index: 2000;\\"><div class=\\"euiPopover__panelArrow euiPopover__panelArrow--top\\" style=\\"left: 10px; top: 0px;\\"></div><p id=\\"generated-id\\" class=\\"euiScreenReaderOnly\\">You are in a dialog. To close this dialog, hit escape.</p><div><div class=\\"euiContextMenu\\" style=\\"height: 0px;\\"><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txOutLeft\\" tabindex=\\"0\\"><div class=\\"euiContextMenuPanelTitle\\"><span class=\\"euiContextMenu__itemLayout\\">Settings</span></div><div><div><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"play\\" class=\\"euiContextMenu__icon\\" color=\\"inherit\\"></span><span class=\\"euiContextMenuItem__text\\">Auto Play</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button><button class=\\"euiContextMenuItem\\" type=\\"button\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"boxesHorizontal\\" class=\\"euiContextMenu__icon\\" color=\\"inherit\\"></span><span class=\\"euiContextMenuItem__text\\">Toolbar</span><span data-euiicon-type=\\"arrowRight\\" class=\\"euiContextMenu__arrow\\"></span></span></button></div></div></div><div class=\\"euiContextMenuPanel euiContextMenu__panel euiContextMenuPanel-txInLeft\\" tabindex=\\"0\\"><button class=\\"euiContextMenuPanelTitle\\" type=\\"button\\" data-test-subj=\\"contextMenuPanelTitleButton\\"><span class=\\"euiContextMenu__itemLayout\\"><span data-euiicon-type=\\"arrowLeft\\" class=\\"euiContextMenu__icon\\"></span><span class=\\"euiContextMenu__text\\">Toolbar</span></span></button><div><div><div style=\\"padding: 16px;\\"><div class=\\"euiFormRow\\" id=\\"generated-id-row\\"><div class=\\"euiFormRow__fieldWrapper\\"><div class=\\"euiSwitch\\"><button id=\\"generated-id\\" aria-checked=\\"true\\" class=\\"euiSwitch__button\\" role=\\"switch\\" type=\\"button\\" aria-labelledby=\\"generated-id\\" data-test-subj=\\"hideToolbarSwitch\\" name=\\"toolbarHide\\" aria-describedby=\\"generated-id-help\\"><span class=\\"euiSwitch__body\\"><span class=\\"euiSwitch__thumb\\"></span><span class=\\"euiSwitch__track\\"><span data-euiicon-type=\\"cross\\" class=\\"euiSwitch__icon\\"></span><span data-euiicon-type=\\"check\\" class=\\"euiSwitch__icon euiSwitch__icon--checked\\"></span></span></span></button><span class=\\"euiSwitch__label\\" id=\\"generated-id\\">Hide Toolbar</span></div><div class=\\"euiFormHelpText euiFormRow__text\\" id=\\"generated-id-help\\">Hide the toolbar when the mouse is not within the Canvas?</div></div></div></div></div></div></div></div></div></div></div></div>"`;
diff --git a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot
index a522684a978cf..94e871f736fdb 100644
--- a/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot
+++ b/x-pack/plugins/canvas/shareable_runtime/components/footer/settings/__stories__/__snapshots__/settings.stories.storyshot
@@ -37,6 +37,7 @@ exports[`Storyshots shareables/Footer/Settings component 1`] = `
             <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="gear"
               size="m"
             />
@@ -85,6 +86,7 @@ exports[`Storyshots shareables/Footer/Settings contextual 1`] = `
             <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="gear"
               size="m"
             />
diff --git a/x-pack/plugins/canvas/storybook/decorators/router_decorator.tsx b/x-pack/plugins/canvas/storybook/decorators/router_decorator.tsx
index 253f7634ebf08..1d0dacac64b17 100644
--- a/x-pack/plugins/canvas/storybook/decorators/router_decorator.tsx
+++ b/x-pack/plugins/canvas/storybook/decorators/router_decorator.tsx
@@ -6,9 +6,8 @@
  */
 
 import React from 'react';
-
-import { RouterContext } from '../../public/components/router';
+import { MemoryRouter } from 'react-router-dom';
 
 export const routerContextDecorator = (story: Function) => (
-  <RouterContext.Provider value={{ navigateTo: () => {} }}>{story()}</RouterContext.Provider>
+  <MemoryRouter initialEntries={['/']}>{story()}</MemoryRouter>
 );
diff --git a/x-pack/plugins/canvas/types/renderers.ts b/x-pack/plugins/canvas/types/renderers.ts
index 72670da63a7a0..e840ebee43ed3 100644
--- a/x-pack/plugins/canvas/types/renderers.ts
+++ b/x-pack/plugins/canvas/types/renderers.ts
@@ -9,7 +9,7 @@ import { IInterpreterRenderHandlers } from 'src/plugins/expressions';
 
 type GenericRendererCallback = (callback: () => void) => void;
 
-export interface RendererHandlers extends IInterpreterRenderHandlers {
+export interface CanvasSpecificRendererHandlers {
   /** Handler to invoke when an element should be destroyed. */
   destroy: () => void;
   /** Get the id of the element being rendered.  Can be used as a unique ID in a render function */
@@ -30,6 +30,7 @@ export interface RendererHandlers extends IInterpreterRenderHandlers {
   setFilter: (filter: string) => void;
 }
 
+export type RendererHandlers = IInterpreterRenderHandlers & CanvasSpecificRendererHandlers;
 export interface RendererSpec<RendererConfig = {}> {
   /** The render type */
   name: string;
diff --git a/x-pack/plugins/canvas/types/strategy.ts b/x-pack/plugins/canvas/types/strategy.ts
index 1c94059f0c9ca..d7115a3e4372f 100644
--- a/x-pack/plugins/canvas/types/strategy.ts
+++ b/x-pack/plugins/canvas/types/strategy.ts
@@ -6,7 +6,7 @@
  */
 
 import { ApiResponse } from '@elastic/elasticsearch/lib/Transport';
-import { QuerySqlResponse } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
 import { IKibanaSearchRequest } from 'src/plugins/data/common';
 import { ExpressionValueFilter } from '.';
 export interface EssqlSearchStrategyRequest extends IKibanaSearchRequest {
@@ -27,5 +27,5 @@ export interface EssqlSearchStrategyResponse {
   }>;
   rows: any[];
 
-  rawResponse: ApiResponse<QuerySqlResponse>;
+  rawResponse: ApiResponse<estypes.SqlQueryResponse>;
 }
diff --git a/x-pack/plugins/cases/README.md b/x-pack/plugins/cases/README.md
index 5cb9d82436137..a1660911567da 100644
--- a/x-pack/plugins/cases/README.md
+++ b/x-pack/plugins/cases/README.md
@@ -14,6 +14,7 @@ Case management in Kibana
 ## Table of Contents
 
 - [Cases API](#cases-api)
+- [Cases Client API](#cases-client-api)
 - [Cases UI](#cases-ui)
 - [Case Action Type](#case-action-type) _feature in development, disabled by default_
 
@@ -21,6 +22,9 @@ Case management in Kibana
 ## Cases API
 [**Explore the API docs »**](https://www.elastic.co/guide/en/security/current/cases-api-overview.html)
 
+## Cases Client API
+[**Cases Client API docs**][cases-client-api-docs]
+
 ## Cases UI
 
 #### Embed Cases UI components in any Kibana plugin
@@ -263,4 +267,4 @@ For IBM Resilient connectors:
 [all-cases-modal-img]: images/all_cases_selector_modal.png
 [recent-cases-img]: images/recent_cases.png
 [case-view-img]: images/case_view.png
-
+[cases-client-api-docs]: docs/cases_client/cases_client_api.md
diff --git a/x-pack/plugins/cases/common/api/cases/case.ts b/x-pack/plugins/cases/common/api/cases/case.ts
index a2bba7dba4b39..b3f7952a61ee7 100644
--- a/x-pack/plugins/cases/common/api/cases/case.ts
+++ b/x-pack/plugins/cases/common/api/cases/case.ts
@@ -31,13 +31,38 @@ const SettingsRt = rt.type({
 });
 
 const CaseBasicRt = rt.type({
+  /**
+   * The description of the case
+   */
   description: rt.string,
+  /**
+   * The current status of the case (open, closed, in-progress)
+   */
   status: CaseStatusRt,
+  /**
+   * The identifying strings for filter a case
+   */
   tags: rt.array(rt.string),
+  /**
+   * The title of a case
+   */
   title: rt.string,
+  /**
+   * The type of a case (individual or collection)
+   */
   [caseTypeField]: CaseTypeRt,
+  /**
+   * The external system that the case can be synced with
+   */
   connector: CaseConnectorRt,
+  /**
+   * The alert sync settings
+   */
   settings: SettingsRt,
+  /**
+   * The plugin owner of the case
+   */
+  owner: rt.string,
 });
 
 const CaseExternalServiceBasicRt = rt.type({
@@ -73,11 +98,31 @@ export const CaseAttributesRt = rt.intersection([
 ]);
 
 const CasePostRequestNoTypeRt = rt.type({
+  /**
+   * Description of the case
+   */
   description: rt.string,
+  /**
+   * Identifiers for the case.
+   */
   tags: rt.array(rt.string),
+  /**
+   * Title of the case
+   */
   title: rt.string,
+  /**
+   * The external configuration for the case
+   */
   connector: CaseConnectorRt,
+  /**
+   * Sync settings for alerts
+   */
   settings: SettingsRt,
+  /**
+   * The owner here must match the string used when a plugin registers a feature with access to the cases plugin. The user
+   * creating this case must also be granted access to that plugin's feature.
+   */
+  owner: rt.string,
 });
 
 /**
@@ -95,23 +140,78 @@ export const CasesClientPostRequestRt = rt.type({
  * has all the necessary fields. CasesClientPostRequestRt is used for validation.
  */
 export const CasePostRequestRt = rt.intersection([
-  rt.partial({ type: CaseTypeRt }),
+  /**
+   * The case type: an individual case (one without children) or a collection case (one with children)
+   */
+  rt.partial({ [caseTypeField]: CaseTypeRt }),
   CasePostRequestNoTypeRt,
 ]);
 
 export const CasesFindRequestRt = rt.partial({
+  /**
+   * Type of a case (individual, or collection)
+   */
   type: CaseTypeRt,
+  /**
+   * Tags to filter by
+   */
   tags: rt.union([rt.array(rt.string), rt.string]),
+  /**
+   * The status of the case (open, closed, in-progress)
+   */
   status: CaseStatusRt,
+  /**
+   * The reporters to filter by
+   */
   reporters: rt.union([rt.array(rt.string), rt.string]),
+  /**
+   * Operator to use for the `search` field
+   */
   defaultSearchOperator: rt.union([rt.literal('AND'), rt.literal('OR')]),
+  /**
+   * The fields in the entity to return in the response
+   */
   fields: rt.array(rt.string),
+  /**
+   * The page of objects to return
+   */
   page: NumberFromString,
+  /**
+   * The number of objects to include in each page
+   */
   perPage: NumberFromString,
+  /**
+   * An Elasticsearch simple_query_string
+   */
   search: rt.string,
-  searchFields: rt.array(rt.string),
+  /**
+   * The fields to perform the simple_query_string parsed query against
+   */
+  searchFields: rt.union([rt.array(rt.string), rt.string]),
+  /**
+   * The field to use for sorting the found objects.
+   *
+   * This only supports, `create_at`, `closed_at`, and `status`
+   */
   sortField: rt.string,
+  /**
+   * The order to sort by
+   */
   sortOrder: rt.union([rt.literal('desc'), rt.literal('asc')]),
+  /**
+   * The owner(s) to filter by. The user making the request must have privileges to retrieve cases of that
+   * ownership or they will be ignored. If no owner is included, then all ownership types will be included in the response
+   * that the user has access to.
+   */
+  owner: rt.union([rt.array(rt.string), rt.string]),
+});
+
+export const CasesByAlertIDRequestRt = rt.partial({
+  /**
+   * The type of cases to retrieve given an alert ID. If no owner is provided, all cases
+   * that the user has access to will be returned.
+   */
+  owner: rt.union([rt.array(rt.string), rt.string]),
 });
 
 export const CaseResponseRt = rt.intersection([
@@ -141,6 +241,9 @@ export const CasesFindResponseRt = rt.intersection([
 
 export const CasePatchRequestRt = rt.intersection([
   rt.partial(CaseBasicRt.props),
+  /**
+   * The saved object ID and version
+   */
   rt.type({ id: rt.string, version: rt.string }),
 ]);
 
@@ -172,6 +275,16 @@ export const ExternalServiceResponseRt = rt.intersection([
   }),
 ]);
 
+export const AllTagsFindRequestRt = rt.partial({
+  /**
+   * The owner of the cases to retrieve the tags from. If no owner is provided the tags from all cases
+   * that the user has access to will be returned.
+   */
+  owner: rt.union([rt.array(rt.string), rt.string]),
+});
+
+export const AllReportersFindRequestRt = AllTagsFindRequestRt;
+
 export type CaseAttributes = rt.TypeOf<typeof CaseAttributesRt>;
 /**
  * This field differs from the CasePostRequest in that the post request's type field can be optional. This type requires
@@ -183,6 +296,7 @@ export type CasePostRequest = rt.TypeOf<typeof CasePostRequestRt>;
 export type CaseResponse = rt.TypeOf<typeof CaseResponseRt>;
 export type CasesResponse = rt.TypeOf<typeof CasesResponseRt>;
 export type CasesFindRequest = rt.TypeOf<typeof CasesFindRequestRt>;
+export type CasesByAlertIDRequest = rt.TypeOf<typeof CasesByAlertIDRequestRt>;
 export type CasesFindResponse = rt.TypeOf<typeof CasesFindResponseRt>;
 export type CasePatchRequest = rt.TypeOf<typeof CasePatchRequestRt>;
 export type CasesPatchRequest = rt.TypeOf<typeof CasesPatchRequestRt>;
@@ -194,3 +308,6 @@ export type ESCaseAttributes = Omit<CaseAttributes, 'connector'> & { connector:
 export type ESCasePatchRequest = Omit<CasePatchRequest, 'connector'> & {
   connector?: ESCaseConnector;
 };
+
+export type AllTagsFindRequest = rt.TypeOf<typeof AllTagsFindRequestRt>;
+export type AllReportersFindRequest = AllTagsFindRequest;
diff --git a/x-pack/plugins/cases/common/api/cases/comment.ts b/x-pack/plugins/cases/common/api/cases/comment.ts
index 8434e419ef75a..5bc8da95639c8 100644
--- a/x-pack/plugins/cases/common/api/cases/comment.ts
+++ b/x-pack/plugins/cases/common/api/cases/comment.ts
@@ -6,6 +6,7 @@
  */
 
 import * as rt from 'io-ts';
+import { SavedObjectFindOptionsRt } from '../saved_object';
 
 import { UserRT } from '../user';
 
@@ -42,6 +43,7 @@ export const CommentAttributesBasicRt = rt.type({
   ]),
   created_at: rt.string,
   created_by: UserRT,
+  owner: rt.string,
   pushed_at: rt.union([rt.string, rt.null]),
   pushed_by: rt.union([UserRT, rt.null]),
   updated_at: rt.union([rt.string, rt.null]),
@@ -57,6 +59,7 @@ export enum CommentType {
 export const ContextTypeUserRt = rt.type({
   comment: rt.string,
   type: rt.literal(CommentType.user),
+  owner: rt.string,
 });
 
 /**
@@ -72,6 +75,7 @@ export const AlertCommentRequestRt = rt.type({
     id: rt.union([rt.string, rt.null]),
     name: rt.union([rt.string, rt.null]),
   }),
+  owner: rt.string,
 });
 
 const AttributesTypeUserRt = rt.intersection([ContextTypeUserRt, CommentAttributesBasicRt]);
@@ -127,7 +131,17 @@ export const CommentsResponseRt = rt.type({
 
 export const AllCommentsResponseRt = rt.array(CommentResponseRt);
 
+export const FindQueryParamsRt = rt.partial({
+  ...SavedObjectFindOptionsRt.props,
+  /**
+   * If specified the attachments found will be associated to a sub case instead of a case object
+   */
+  subCaseId: rt.string,
+});
+
+export type FindQueryParams = rt.TypeOf<typeof FindQueryParamsRt>;
 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 CommentResponse = rt.TypeOf<typeof CommentResponseRt>;
diff --git a/x-pack/plugins/cases/common/api/cases/configure.ts b/x-pack/plugins/cases/common/api/cases/configure.ts
index b5a89efde1767..6c92702c523b4 100644
--- a/x-pack/plugins/cases/common/api/cases/configure.ts
+++ b/x-pack/plugins/cases/common/api/cases/configure.ts
@@ -13,14 +13,30 @@ import { CaseConnectorRt, ConnectorMappingsRt, ESCaseConnector } from '../connec
 // TODO: we will need to add this type rt.literal('close-by-third-party')
 const ClosureTypeRT = rt.union([rt.literal('close-by-user'), rt.literal('close-by-pushing')]);
 
-const CasesConfigureBasicRt = rt.type({
+const CasesConfigureBasicWithoutOwnerRt = rt.type({
+  /**
+   * The external connector
+   */
   connector: CaseConnectorRt,
+  /**
+   * Whether to close the case after it has been synced with the external system
+   */
   closure_type: ClosureTypeRT,
 });
 
+const CasesConfigureBasicRt = rt.intersection([
+  CasesConfigureBasicWithoutOwnerRt,
+  rt.type({
+    /**
+     * The plugin owner that manages this configuration
+     */
+    owner: rt.string,
+  }),
+]);
+
 export const CasesConfigureRequestRt = CasesConfigureBasicRt;
 export const CasesConfigurePatchRt = rt.intersection([
-  rt.partial(CasesConfigureBasicRt.props),
+  rt.partial(CasesConfigureBasicWithoutOwnerRt.props),
   rt.type({ version: rt.string }),
 ]);
 
@@ -38,18 +54,37 @@ export const CaseConfigureResponseRt = rt.intersection([
   CaseConfigureAttributesRt,
   ConnectorMappingsRt,
   rt.type({
+    id: rt.string,
     version: rt.string,
     error: rt.union([rt.string, rt.null]),
+    owner: rt.string,
   }),
 ]);
 
+export const GetConfigureFindRequestRt = rt.partial({
+  /**
+   * The configuration plugin owner to filter the search by. If this is left empty the results will include all configurations
+   * that the user has permissions to access
+   */
+  owner: rt.union([rt.array(rt.string), rt.string]),
+});
+
+export const CaseConfigureRequestParamsRt = rt.type({
+  configuration_id: rt.string,
+});
+
+export const CaseConfigurationsResponseRt = rt.array(CaseConfigureResponseRt);
+
 export type ClosureType = rt.TypeOf<typeof ClosureTypeRT>;
 export type CasesConfigure = rt.TypeOf<typeof CasesConfigureBasicRt>;
 export type CasesConfigureRequest = rt.TypeOf<typeof CasesConfigureRequestRt>;
 export type CasesConfigurePatch = rt.TypeOf<typeof CasesConfigurePatchRt>;
 export type CasesConfigureAttributes = rt.TypeOf<typeof CaseConfigureAttributesRt>;
 export type CasesConfigureResponse = rt.TypeOf<typeof CaseConfigureResponseRt>;
+export type CasesConfigurationsResponse = rt.TypeOf<typeof CaseConfigurationsResponseRt>;
 
 export type ESCasesConfigureAttributes = Omit<CasesConfigureAttributes, 'connector'> & {
   connector: ESCaseConnector;
 };
+
+export type GetConfigureFindRequest = rt.TypeOf<typeof GetConfigureFindRequestRt>;
diff --git a/x-pack/plugins/cases/common/api/cases/constants.ts b/x-pack/plugins/cases/common/api/cases/constants.ts
new file mode 100644
index 0000000000000..92755ec633ecc
--- /dev/null
+++ b/x-pack/plugins/cases/common/api/cases/constants.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.
+ */
+
+/**
+ * This field is used for authorization of the entities within the cases plugin. Each entity within Cases will have the owner field
+ * set to a string that represents the plugin that "owns" (i.e. the plugin that originally issued the POST request to
+ * create the entity) the entity.
+ *
+ * The Authorization class constructs a string composed of the operation being performed (createCase, getComment, etc),
+ * and the owner of the entity being acted upon or created. This string is then given to the Security plugin which
+ * checks to see if the user making the request has that particular string stored within it's privileges. If it does,
+ * then the operation succeeds, otherwise the operation fails.
+ *
+ * APIs that create/update an entity require that the owner field be passed in the body of the request.
+ * APIs that search for entities typically require that the owner be passed as a query parameter.
+ * APIs that specify an ID of an entity directly generally don't need to specify the owner field.
+ *
+ * For APIs that create/update an entity, the RBAC implementation checks to see if the user making the request has the
+ * correct privileges for performing that action (a create/update) for the specified owner.
+ * This check is done through the Security plugin's API.
+ *
+ * For APIs that search for entities, the RBAC implementation creates a filter for the saved objects query that limits
+ * the search to only owners that the user has access to. We also check that the objects returned by the saved objects
+ * API have the limited owner scope. If we find one that the user does not have permissions for, we throw a 403 error.
+ * The owner field that is passed in as a query parameter can be used to further limit the results. If a user attempts
+ * to pass an owner that they do not have access to, the owner is ignored.
+ *
+ * For APIs that retrieve/delete entities directly using their ID, the RBAC implementation requests the object first,
+ * and then checks to see if the user making the request has access to that operation and owner. If the user does, the
+ * operation continues, otherwise we throw a 403.
+ */
+export const OWNER_FIELD = 'owner';
diff --git a/x-pack/plugins/cases/common/api/cases/index.ts b/x-pack/plugins/cases/common/api/cases/index.ts
index 6e7fb818cb2b5..0f78ca9b35377 100644
--- a/x-pack/plugins/cases/common/api/cases/index.ts
+++ b/x-pack/plugins/cases/common/api/cases/index.ts
@@ -11,3 +11,4 @@ export * from './comment';
 export * from './status';
 export * from './user_actions';
 export * from './sub_case';
+export * from './constants';
diff --git a/x-pack/plugins/cases/common/api/cases/status.ts b/x-pack/plugins/cases/common/api/cases/status.ts
index 7286e19da9159..d37e68007a21d 100644
--- a/x-pack/plugins/cases/common/api/cases/status.ts
+++ b/x-pack/plugins/cases/common/api/cases/status.ts
@@ -27,4 +27,13 @@ export const CasesStatusResponseRt = rt.type({
   count_closed_cases: rt.number,
 });
 
+export const CasesStatusRequestRt = rt.partial({
+  /**
+   * The owner of the cases to retrieve the status stats from. If no owner is provided the stats for all cases
+   * that the user has access to will be returned.
+   */
+  owner: rt.union([rt.array(rt.string), rt.string]),
+});
+
 export type CasesStatusResponse = rt.TypeOf<typeof CasesStatusResponseRt>;
+export type CasesStatusRequest = rt.TypeOf<typeof CasesStatusRequestRt>;
diff --git a/x-pack/plugins/cases/common/api/cases/sub_case.ts b/x-pack/plugins/cases/common/api/cases/sub_case.ts
index c46f87c547d50..654b74276733b 100644
--- a/x-pack/plugins/cases/common/api/cases/sub_case.ts
+++ b/x-pack/plugins/cases/common/api/cases/sub_case.ts
@@ -14,6 +14,9 @@ import { CasesStatusResponseRt } from './status';
 import { CaseStatusRt } from './status';
 
 const SubCaseBasicRt = rt.type({
+  /**
+   * The status of the sub case (open, closed, in-progress)
+   */
   status: CaseStatusRt,
 });
 
@@ -26,19 +29,48 @@ export const SubCaseAttributesRt = rt.intersection([
     created_by: rt.union([UserRT, rt.null]),
     updated_at: rt.union([rt.string, rt.null]),
     updated_by: rt.union([UserRT, rt.null]),
+    owner: rt.string,
   }),
 ]);
 
 export const SubCasesFindRequestRt = rt.partial({
+  /**
+   * The status of the sub case (open, closed, in-progress)
+   */
   status: CaseStatusRt,
+  /**
+   * Operator to use for the `search` field
+   */
   defaultSearchOperator: rt.union([rt.literal('AND'), rt.literal('OR')]),
+  /**
+   * The fields in the entity to return in the response
+   */
   fields: rt.array(rt.string),
+  /**
+   * The page of objects to return
+   */
   page: NumberFromString,
+  /**
+   * The number of objects to include in each page
+   */
   perPage: NumberFromString,
+  /**
+   * An Elasticsearch simple_query_string
+   */
   search: rt.string,
+  /**
+   * The fields to perform the simple_query_string parsed query against
+   */
   searchFields: rt.array(rt.string),
+  /**
+   * The field to use for sorting the found objects.
+   */
   sortField: rt.string,
+  /**
+   * The order to sort by
+   */
   sortOrder: rt.union([rt.literal('desc'), rt.literal('asc')]),
+  owner: rt.string,
 });
 
 export const SubCaseResponseRt = rt.intersection([
@@ -78,3 +110,4 @@ export type SubCasesResponse = rt.TypeOf<typeof SubCasesResponseRt>;
 export type SubCasesFindResponse = rt.TypeOf<typeof SubCasesFindResponseRt>;
 export type SubCasePatchRequest = rt.TypeOf<typeof SubCasePatchRequestRt>;
 export type SubCasesPatchRequest = rt.TypeOf<typeof SubCasesPatchRequestRt>;
+export type SubCasesFindRequest = rt.TypeOf<typeof SubCasesFindRequestRt>;
diff --git a/x-pack/plugins/cases/common/api/cases/user_actions.ts b/x-pack/plugins/cases/common/api/cases/user_actions.ts
index 7188ee44efa93..03912c550d77a 100644
--- a/x-pack/plugins/cases/common/api/cases/user_actions.ts
+++ b/x-pack/plugins/cases/common/api/cases/user_actions.ts
@@ -6,6 +6,7 @@
  */
 
 import * as rt from 'io-ts';
+import { OWNER_FIELD } from './constants';
 
 import { UserRT } from '../user';
 
@@ -22,6 +23,7 @@ const UserActionFieldTypeRt = rt.union([
   rt.literal('status'),
   rt.literal('settings'),
   rt.literal('sub_case'),
+  rt.literal(OWNER_FIELD),
 ]);
 const UserActionFieldRt = rt.array(UserActionFieldTypeRt);
 const UserActionRt = rt.union([
@@ -40,6 +42,7 @@ const CaseUserActionBasicRT = rt.type({
   action_by: UserRT,
   new_value: rt.union([rt.string, rt.null]),
   old_value: rt.union([rt.string, rt.null]),
+  owner: rt.string,
 });
 
 const CaseUserActionResponseRT = rt.intersection([
@@ -58,6 +61,7 @@ export const CaseUserActionsResponseRt = rt.array(CaseUserActionResponseRT);
 
 export type CaseUserActionAttributes = rt.TypeOf<typeof CaseUserActionAttributesRt>;
 export type CaseUserActionsResponse = rt.TypeOf<typeof CaseUserActionsResponseRt>;
+export type CaseUserActionResponse = rt.TypeOf<typeof CaseUserActionResponseRT>;
 
 export type UserAction = rt.TypeOf<typeof UserActionRt>;
 export type UserActionField = rt.TypeOf<typeof UserActionFieldRt>;
diff --git a/x-pack/plugins/cases/common/api/connectors/mappings.ts b/x-pack/plugins/cases/common/api/connectors/mappings.ts
index 3d2013af47688..e0fdd2d7e62dc 100644
--- a/x-pack/plugins/cases/common/api/connectors/mappings.ts
+++ b/x-pack/plugins/cases/common/api/connectors/mappings.ts
@@ -31,6 +31,7 @@ export const ConnectorMappingsAttributesRT = rt.type({
 
 export const ConnectorMappingsRt = rt.type({
   mappings: rt.array(ConnectorMappingsAttributesRT),
+  owner: rt.string,
 });
 
 export type ConnectorMappingsAttributes = rt.TypeOf<typeof ConnectorMappingsAttributesRT>;
diff --git a/x-pack/plugins/cases/common/api/helpers.ts b/x-pack/plugins/cases/common/api/helpers.ts
index 7ac686ce5c8dd..4647be5a91747 100644
--- a/x-pack/plugins/cases/common/api/helpers.ts
+++ b/x-pack/plugins/cases/common/api/helpers.ts
@@ -14,6 +14,7 @@ import {
   SUB_CASES_URL,
   CASE_PUSH_URL,
   SUB_CASE_USER_ACTIONS_URL,
+  CASE_CONFIGURE_DETAILS_URL,
   CASE_ALERTS_URL,
 } from '../constants';
 
@@ -49,6 +50,10 @@ export const getCasePushUrl = (caseId: string, connectorId: string): string => {
   return CASE_PUSH_URL.replace('{case_id}', caseId).replace('{connector_id}', connectorId);
 };
 
+export const getCaseConfigurationDetailsUrl = (configureID: string): string => {
+  return CASE_CONFIGURE_DETAILS_URL.replace('{configuration_id}', configureID);
+};
+
 export const getCasesFromAlertsUrl = (alertId: string): string => {
   return CASE_ALERTS_URL.replace('{alert_id}', alertId);
 };
diff --git a/x-pack/plugins/cases/common/api/runtime_types.ts b/x-pack/plugins/cases/common/api/runtime_types.ts
index f608b7effe969..8817764e261d9 100644
--- a/x-pack/plugins/cases/common/api/runtime_types.ts
+++ b/x-pack/plugins/cases/common/api/runtime_types.ts
@@ -68,7 +68,9 @@ const getExcessProps = (props: rt.Props, r: Record<string, unknown>): string[] =
   return ex;
 };
 
-export function excess<C extends rt.InterfaceType<rt.Props>>(codec: C): C {
+export function excess<C extends rt.InterfaceType<rt.Props> | rt.PartialType<rt.Props>>(
+  codec: C
+): C {
   const r = new rt.InterfaceType(
     codec.name,
     codec.is,
diff --git a/x-pack/plugins/cases/common/api/saved_object.ts b/x-pack/plugins/cases/common/api/saved_object.ts
index e0ae4ee82c490..2ed6ec2acdfe4 100644
--- a/x-pack/plugins/cases/common/api/saved_object.ts
+++ b/x-pack/plugins/cases/common/api/saved_object.ts
@@ -23,16 +23,49 @@ export const NumberFromString = new rt.Type<number, string, unknown>(
 const ReferenceRt = rt.type({ id: rt.string, type: rt.string });
 
 export const SavedObjectFindOptionsRt = rt.partial({
+  /**
+   * The default operator to use for the simple_query_string
+   */
   defaultSearchOperator: rt.union([rt.literal('AND'), rt.literal('OR')]),
+  /**
+   * The operator for controlling the logic of the `hasReference` field
+   */
   hasReferenceOperator: rt.union([rt.literal('AND'), rt.literal('OR')]),
+  /**
+   * Filter by objects that have an association to another object
+   */
   hasReference: rt.union([rt.array(ReferenceRt), ReferenceRt]),
+  /**
+   * The fields to return in the attributes key of the response
+   */
   fields: rt.array(rt.string),
+  /**
+   * The filter is a KQL string with the caveat that if you filter with an attribute from your saved object type, it should look like that: savedObjectType.attributes.title: "myTitle". However, If you use a root attribute of a saved object such as updated_at, you will have to define your filter like that: savedObjectType.updated_at > 2018-12-22
+   */
   filter: rt.string,
+  /**
+   * The page of objects to return
+   */
   page: NumberFromString,
+  /**
+   * The number of objects to return for a page
+   */
   perPage: NumberFromString,
+  /**
+   * An Elasticsearch simple_query_string query that filters the objects in the response
+   */
   search: rt.string,
+  /**
+   * The fields to perform the simple_query_string parsed query against
+   */
   searchFields: rt.array(rt.string),
+  /**
+   * Sorts the response. Includes "root" and "type" fields. "root" fields exist for all saved objects, such as "updated_at". "type" fields are specific to an object type, such as fields returned in the attributes key of the response. When a single type is defined in the type parameter, the "root" and "type" fields are allowed, and validity checks are made in that order. When multiple types are defined in the type parameter, only "root" fields are allowed
+   */
   sortField: rt.string,
+  /**
+   * Order to sort the response
+   */
   sortOrder: rt.union([rt.literal('desc'), rt.literal('asc')]),
 });
 
diff --git a/x-pack/plugins/cases/common/constants.ts b/x-pack/plugins/cases/common/constants.ts
index 966305524c059..f0d3e8ccbcdea 100644
--- a/x-pack/plugins/cases/common/constants.ts
+++ b/x-pack/plugins/cases/common/constants.ts
@@ -9,6 +9,24 @@ export const DEFAULT_DATE_FORMAT_TZ = 'dateFormat:tz';
 
 export const APP_ID = 'cases';
 
+export const CASE_SAVED_OBJECT = 'cases';
+export const CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT = 'cases-connector-mappings';
+export const SUB_CASE_SAVED_OBJECT = 'cases-sub-case';
+export const CASE_USER_ACTION_SAVED_OBJECT = 'cases-user-actions';
+export const CASE_COMMENT_SAVED_OBJECT = 'cases-comments';
+export const CASE_CONFIGURE_SAVED_OBJECT = 'cases-configure';
+
+/**
+ * If more values are added here please also add them here: x-pack/test/case_api_integration/common/fixtures/plugins
+ */
+export const SAVED_OBJECT_TYPES = [
+  CASE_SAVED_OBJECT,
+  CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
+  CASE_USER_ACTION_SAVED_OBJECT,
+  CASE_COMMENT_SAVED_OBJECT,
+  CASE_CONFIGURE_SAVED_OBJECT,
+];
+
 /**
  * Case routes
  */
@@ -16,6 +34,7 @@ export const APP_ID = 'cases';
 export const CASES_URL = '/api/cases';
 export const CASE_DETAILS_URL = `${CASES_URL}/{case_id}`;
 export const CASE_CONFIGURE_URL = `${CASES_URL}/configure`;
+export const CASE_CONFIGURE_DETAILS_URL = `${CASES_URL}/configure/{configuration_id}`;
 export const CASE_CONFIGURE_CONNECTORS_URL = `${CASE_CONFIGURE_URL}/connectors`;
 
 export const SUB_CASES_PATCH_DEL_URL = `${CASES_URL}/sub_cases`;
@@ -57,7 +76,22 @@ export const SUPPORTED_CONNECTORS = [
 export const MAX_ALERTS_PER_SUB_CASE = 5000;
 export const MAX_GENERATED_ALERTS_PER_SUB_CASE = 50;
 
+/**
+ * This must be the same value that the security solution plugin uses to define the case kind when it registers the
+ * feature for the 7.13 migration only.
+ *
+ * This variable is being also used by test files and mocks.
+ */
+export const SECURITY_SOLUTION_OWNER = 'securitySolution';
+
 /**
  * This flag governs enabling the case as a connector feature. It is disabled by default as the feature is not complete.
  */
 export const ENABLE_CASE_CONNECTOR = false;
+
+if (ENABLE_CASE_CONNECTOR) {
+  SAVED_OBJECT_TYPES.push(SUB_CASE_SAVED_OBJECT);
+}
+
+export const MAX_DOCS_PER_PAGE = 10000;
+export const MAX_CONCURRENT_SEARCHES = 10;
diff --git a/x-pack/plugins/cases/common/ui/types.ts b/x-pack/plugins/cases/common/ui/types.ts
index 43e3453500b17..284f5e706292c 100644
--- a/x-pack/plugins/cases/common/ui/types.ts
+++ b/x-pack/plugins/cases/common/ui/types.ts
@@ -58,6 +58,7 @@ export interface CaseExternalService {
 
 interface BasicCase {
   id: string;
+  owner: string;
   closedAt: string | null;
   closedBy: ElasticUser | null;
   comments: Comment[];
@@ -129,7 +130,7 @@ export interface ElasticUser {
 
 export interface FetchCasesProps extends ApiProps {
   queryParams?: QueryParams;
-  filterOptions?: FilterOptions;
+  filterOptions?: FilterOptions & { owner: string[] };
 }
 
 export interface ApiProps {
diff --git a/x-pack/plugins/cases/docs/README.md b/x-pack/plugins/cases/docs/README.md
new file mode 100644
index 0000000000000..85482d98dc509
--- /dev/null
+++ b/x-pack/plugins/cases/docs/README.md
@@ -0,0 +1,37 @@
+# Cases Client API Docs
+
+This directory contains generated docs using `typedoc` for the cases client API that can be called from other server
+plugins. This README will describe how to generate a new version of these markdown docs in the event that new methods
+or parameters are added.
+
+## TypeDoc Info
+
+See more info at: <https://typedoc.org/>
+and: <https://www.npmjs.com/package/typedoc-plugin-markdown> for the markdown plugin
+
+## Install dependencies
+
+```bash
+yarn global add typedoc typedoc-plugin-markdown
+```
+
+## Generate the docs
+
+```bash
+cd x-pack/plugins/cases/docs
+npx typedoc --options cases_client_typedoc.json
+```
+
+After running the above commands the files in the `server` directory will be updated to match the new tsdocs.
+If additional markdown directory should be created we can create a new typedoc configuration file and adjust the `out`
+directory accordingly.
+
+## Troubleshooting
+
+If you run into tsc errors that seem unrelated to the cases plugin try executing these commands before running `typedoc`
+
+```bash
+cd <kibana root dir>
+npx yarn kbn bootstrap
+node scripts/build_ts_refs.js --clean --no-cache
+```
diff --git a/x-pack/plugins/cases/docs/cases_client/cases_client_api.md b/x-pack/plugins/cases/docs/cases_client/cases_client_api.md
new file mode 100644
index 0000000000000..d7e75af3142e6
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/cases_client_api.md
@@ -0,0 +1,22 @@
+Cases Client API Interface
+
+# Cases Client API Interface
+
+## Table of contents
+
+### Modules
+
+- [attachments/add](modules/attachments_add.md)
+- [attachments/client](modules/attachments_client.md)
+- [attachments/delete](modules/attachments_delete.md)
+- [attachments/get](modules/attachments_get.md)
+- [attachments/update](modules/attachments_update.md)
+- [cases/client](modules/cases_client.md)
+- [cases/get](modules/cases_get.md)
+- [cases/push](modules/cases_push.md)
+- [client](modules/client.md)
+- [configure/client](modules/configure_client.md)
+- [stats/client](modules/stats_client.md)
+- [sub\_cases/client](modules/sub_cases_client.md)
+- [typedoc\_interfaces](modules/typedoc_interfaces.md)
+- [user\_actions/client](modules/user_actions_client.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/classes/client.casesclient.md b/x-pack/plugins/cases/docs/cases_client/classes/client.casesclient.md
new file mode 100644
index 0000000000000..98e2f284da4a6
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/classes/client.casesclient.md
@@ -0,0 +1,178 @@
+[Cases Client API Interface](../cases_client_api.md) / [client](../modules/client.md) / CasesClient
+
+# Class: CasesClient
+
+[client](../modules/client.md).CasesClient
+
+Client wrapper that contains accessor methods for individual entities within the cases system.
+
+## Table of contents
+
+### Constructors
+
+- [constructor](client.casesclient.md#constructor)
+
+### Properties
+
+- [\_attachments](client.casesclient.md#_attachments)
+- [\_cases](client.casesclient.md#_cases)
+- [\_casesClientInternal](client.casesclient.md#_casesclientinternal)
+- [\_configure](client.casesclient.md#_configure)
+- [\_stats](client.casesclient.md#_stats)
+- [\_subCases](client.casesclient.md#_subcases)
+- [\_userActions](client.casesclient.md#_useractions)
+
+### Accessors
+
+- [attachments](client.casesclient.md#attachments)
+- [cases](client.casesclient.md#cases)
+- [configure](client.casesclient.md#configure)
+- [stats](client.casesclient.md#stats)
+- [subCases](client.casesclient.md#subcases)
+- [userActions](client.casesclient.md#useractions)
+
+## Constructors
+
+### constructor
+
+\+ **new CasesClient**(`args`: CasesClientArgs): [*CasesClient*](client.casesclient.md)
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `args` | CasesClientArgs |
+
+**Returns:** [*CasesClient*](client.casesclient.md)
+
+Defined in: [client.ts:28](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L28)
+
+## Properties
+
+### \_attachments
+
+• `Private` `Readonly` **\_attachments**: [*AttachmentsSubClient*](../interfaces/attachments_client.attachmentssubclient.md)
+
+Defined in: [client.ts:24](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L24)
+
+___
+
+### \_cases
+
+• `Private` `Readonly` **\_cases**: [*CasesSubClient*](../interfaces/cases_client.casessubclient.md)
+
+Defined in: [client.ts:23](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L23)
+
+___
+
+### \_casesClientInternal
+
+• `Private` `Readonly` **\_casesClientInternal**: *CasesClientInternal*
+
+Defined in: [client.ts:22](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L22)
+
+___
+
+### \_configure
+
+• `Private` `Readonly` **\_configure**: [*ConfigureSubClient*](../interfaces/configure_client.configuresubclient.md)
+
+Defined in: [client.ts:27](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L27)
+
+___
+
+### \_stats
+
+• `Private` `Readonly` **\_stats**: [*StatsSubClient*](../interfaces/stats_client.statssubclient.md)
+
+Defined in: [client.ts:28](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L28)
+
+___
+
+### \_subCases
+
+• `Private` `Readonly` **\_subCases**: [*SubCasesClient*](../interfaces/sub_cases_client.subcasesclient.md)
+
+Defined in: [client.ts:26](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L26)
+
+___
+
+### \_userActions
+
+• `Private` `Readonly` **\_userActions**: [*UserActionsSubClient*](../interfaces/user_actions_client.useractionssubclient.md)
+
+Defined in: [client.ts:25](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L25)
+
+## Accessors
+
+### attachments
+
+• get **attachments**(): [*AttachmentsSubClient*](../interfaces/attachments_client.attachmentssubclient.md)
+
+Retrieves an interface for interacting with attachments (comments) entities.
+
+**Returns:** [*AttachmentsSubClient*](../interfaces/attachments_client.attachmentssubclient.md)
+
+Defined in: [client.ts:50](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L50)
+
+___
+
+### cases
+
+• get **cases**(): [*CasesSubClient*](../interfaces/cases_client.casessubclient.md)
+
+Retrieves an interface for interacting with cases entities.
+
+**Returns:** [*CasesSubClient*](../interfaces/cases_client.casessubclient.md)
+
+Defined in: [client.ts:43](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L43)
+
+___
+
+### configure
+
+• get **configure**(): [*ConfigureSubClient*](../interfaces/configure_client.configuresubclient.md)
+
+Retrieves an interface for interacting with the configuration of external connectors for the plugin entities.
+
+**Returns:** [*ConfigureSubClient*](../interfaces/configure_client.configuresubclient.md)
+
+Defined in: [client.ts:76](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L76)
+
+___
+
+### stats
+
+• get **stats**(): [*StatsSubClient*](../interfaces/stats_client.statssubclient.md)
+
+Retrieves an interface for retrieving statistics related to the cases entities.
+
+**Returns:** [*StatsSubClient*](../interfaces/stats_client.statssubclient.md)
+
+Defined in: [client.ts:83](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L83)
+
+___
+
+### subCases
+
+• get **subCases**(): [*SubCasesClient*](../interfaces/sub_cases_client.subcasesclient.md)
+
+Retrieves an interface for interacting with the case as a connector entities.
+
+Currently this functionality is disabled and will throw an error if this function is called.
+
+**Returns:** [*SubCasesClient*](../interfaces/sub_cases_client.subcasesclient.md)
+
+Defined in: [client.ts:66](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L66)
+
+___
+
+### userActions
+
+• get **userActions**(): [*UserActionsSubClient*](../interfaces/user_actions_client.useractionssubclient.md)
+
+Retrieves an interface for interacting with the user actions associated with the plugin entities.
+
+**Returns:** [*UserActionsSubClient*](../interfaces/user_actions_client.useractionssubclient.md)
+
+Defined in: [client.ts:57](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/client.ts#L57)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_add.addargs.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_add.addargs.md
new file mode 100644
index 0000000000000..1bbca9167a5c2
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_add.addargs.md
@@ -0,0 +1,34 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/add](../modules/attachments_add.md) / AddArgs
+
+# Interface: AddArgs
+
+[attachments/add](../modules/attachments_add.md).AddArgs
+
+The arguments needed for creating a new attachment to a case.
+
+## Table of contents
+
+### Properties
+
+- [caseId](attachments_add.addargs.md#caseid)
+- [comment](attachments_add.addargs.md#comment)
+
+## Properties
+
+### caseId
+
+• **caseId**: *string*
+
+The case ID that this attachment will be associated with
+
+Defined in: [attachments/add.ts:308](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/add.ts#L308)
+
+___
+
+### comment
+
+• **comment**: { `comment`: *string* ; `owner`: *string* ; `type`: user  } \| { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  }
+
+The attachment values.
+
+Defined in: [attachments/add.ts:312](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/add.ts#L312)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_client.attachmentssubclient.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_client.attachmentssubclient.md
new file mode 100644
index 0000000000000..e9f65bcf9915a
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_client.attachmentssubclient.md
@@ -0,0 +1,147 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/client](../modules/attachments_client.md) / AttachmentsSubClient
+
+# Interface: AttachmentsSubClient
+
+[attachments/client](../modules/attachments_client.md).AttachmentsSubClient
+
+API for interacting with the attachments to a case.
+
+## Table of contents
+
+### Methods
+
+- [add](attachments_client.attachmentssubclient.md#add)
+- [delete](attachments_client.attachmentssubclient.md#delete)
+- [deleteAll](attachments_client.attachmentssubclient.md#deleteall)
+- [find](attachments_client.attachmentssubclient.md#find)
+- [get](attachments_client.attachmentssubclient.md#get)
+- [getAll](attachments_client.attachmentssubclient.md#getall)
+- [update](attachments_client.attachmentssubclient.md#update)
+
+## Methods
+
+### add
+
+▸ **add**(`params`: [*AddArgs*](attachments_add.addargs.md)): *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Adds an attachment to a case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | [*AddArgs*](attachments_add.addargs.md) |
+
+**Returns:** *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Defined in: [attachments/client.ts:25](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/client.ts#L25)
+
+___
+
+### delete
+
+▸ **delete**(`deleteArgs`: [*DeleteArgs*](attachments_delete.deleteargs.md)): *Promise*<void\>
+
+Deletes a single attachment for a specific case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `deleteArgs` | [*DeleteArgs*](attachments_delete.deleteargs.md) |
+
+**Returns:** *Promise*<void\>
+
+Defined in: [attachments/client.ts:33](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/client.ts#L33)
+
+___
+
+### deleteAll
+
+▸ **deleteAll**(`deleteAllArgs`: [*DeleteAllArgs*](attachments_delete.deleteallargs.md)): *Promise*<void\>
+
+Deletes all attachments associated with a single case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `deleteAllArgs` | [*DeleteAllArgs*](attachments_delete.deleteallargs.md) |
+
+**Returns:** *Promise*<void\>
+
+Defined in: [attachments/client.ts:29](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/client.ts#L29)
+
+___
+
+### find
+
+▸ **find**(`findArgs`: [*FindArgs*](attachments_get.findargs.md)): *Promise*<[*ICommentsResponse*](typedoc_interfaces.icommentsresponse.md)\>
+
+Retrieves all comments matching the search criteria.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `findArgs` | [*FindArgs*](attachments_get.findargs.md) |
+
+**Returns:** *Promise*<[*ICommentsResponse*](typedoc_interfaces.icommentsresponse.md)\>
+
+Defined in: [attachments/client.ts:37](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/client.ts#L37)
+
+___
+
+### get
+
+▸ **get**(`getArgs`: [*GetArgs*](attachments_get.getargs.md)): *Promise*<{ `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }\>
+
+Retrieves a single attachment for a case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `getArgs` | [*GetArgs*](attachments_get.getargs.md) |
+
+**Returns:** *Promise*<{ `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }\>
+
+Defined in: [attachments/client.ts:45](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/client.ts#L45)
+
+___
+
+### getAll
+
+▸ **getAll**(`getAllArgs`: [*GetAllArgs*](attachments_get.getallargs.md)): *Promise*<[*IAllCommentsResponse*](typedoc_interfaces.iallcommentsresponse.md)\>
+
+Gets all attachments for a single case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `getAllArgs` | [*GetAllArgs*](attachments_get.getallargs.md) |
+
+**Returns:** *Promise*<[*IAllCommentsResponse*](typedoc_interfaces.iallcommentsresponse.md)\>
+
+Defined in: [attachments/client.ts:41](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/client.ts#L41)
+
+___
+
+### update
+
+▸ **update**(`updateArgs`: [*UpdateArgs*](attachments_update.updateargs.md)): *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Updates a specific attachment.
+
+The request must include all fields for the attachment. Even the fields that are not changing.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `updateArgs` | [*UpdateArgs*](attachments_update.updateargs.md) |
+
+**Returns:** *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Defined in: [attachments/client.ts:51](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/client.ts#L51)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_delete.deleteallargs.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_delete.deleteallargs.md
new file mode 100644
index 0000000000000..26b00ac6e037e
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_delete.deleteallargs.md
@@ -0,0 +1,34 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/delete](../modules/attachments_delete.md) / DeleteAllArgs
+
+# Interface: DeleteAllArgs
+
+[attachments/delete](../modules/attachments_delete.md).DeleteAllArgs
+
+Parameters for deleting all comments of a case or sub case.
+
+## Table of contents
+
+### Properties
+
+- [caseID](attachments_delete.deleteallargs.md#caseid)
+- [subCaseID](attachments_delete.deleteallargs.md#subcaseid)
+
+## Properties
+
+### caseID
+
+• **caseID**: *string*
+
+The case ID to delete all attachments for
+
+Defined in: [attachments/delete.ts:26](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/delete.ts#L26)
+
+___
+
+### subCaseID
+
+• `Optional` **subCaseID**: *string*
+
+If specified the caseID will be ignored and this value will be used to find a sub case for deleting all the attachments
+
+Defined in: [attachments/delete.ts:30](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/delete.ts#L30)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_delete.deleteargs.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_delete.deleteargs.md
new file mode 100644
index 0000000000000..f9d4038eb417a
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_delete.deleteargs.md
@@ -0,0 +1,45 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/delete](../modules/attachments_delete.md) / DeleteArgs
+
+# Interface: DeleteArgs
+
+[attachments/delete](../modules/attachments_delete.md).DeleteArgs
+
+Parameters for deleting a single attachment of a case or sub case.
+
+## Table of contents
+
+### Properties
+
+- [attachmentID](attachments_delete.deleteargs.md#attachmentid)
+- [caseID](attachments_delete.deleteargs.md#caseid)
+- [subCaseID](attachments_delete.deleteargs.md#subcaseid)
+
+## Properties
+
+### attachmentID
+
+• **attachmentID**: *string*
+
+The attachment ID to delete
+
+Defined in: [attachments/delete.ts:44](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/delete.ts#L44)
+
+___
+
+### caseID
+
+• **caseID**: *string*
+
+The case ID to delete an attachment from
+
+Defined in: [attachments/delete.ts:40](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/delete.ts#L40)
+
+___
+
+### subCaseID
+
+• `Optional` **subCaseID**: *string*
+
+If specified the caseID will be ignored and this value will be used to find a sub case for deleting the attachment
+
+Defined in: [attachments/delete.ts:48](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/delete.ts#L48)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.findargs.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.findargs.md
new file mode 100644
index 0000000000000..dbbac0065be85
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.findargs.md
@@ -0,0 +1,51 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/get](../modules/attachments_get.md) / FindArgs
+
+# Interface: FindArgs
+
+[attachments/get](../modules/attachments_get.md).FindArgs
+
+Parameters for finding attachments of a case
+
+## Table of contents
+
+### Properties
+
+- [caseID](attachments_get.findargs.md#caseid)
+- [queryParams](attachments_get.findargs.md#queryparams)
+
+## Properties
+
+### caseID
+
+• **caseID**: *string*
+
+The case ID for finding associated attachments
+
+Defined in: [attachments/get.ts:48](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/get.ts#L48)
+
+___
+
+### queryParams
+
+• `Optional` **queryParams**: *object*
+
+Optional parameters for filtering the returned attachments
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `defaultSearchOperator` | *undefined* \| ``"AND"`` \| ``"OR"`` |
+| `fields` | *undefined* \| *string*[] |
+| `filter` | *undefined* \| *string* |
+| `hasReference` | *undefined* \| { `id`: *string* ; `type`: *string*  } \| { `id`: *string* ; `type`: *string*  }[] |
+| `hasReferenceOperator` | *undefined* \| ``"AND"`` \| ``"OR"`` |
+| `page` | *undefined* \| *number* |
+| `perPage` | *undefined* \| *number* |
+| `search` | *undefined* \| *string* |
+| `searchFields` | *undefined* \| *string*[] |
+| `sortField` | *undefined* \| *string* |
+| `sortOrder` | *undefined* \| ``"desc"`` \| ``"asc"`` |
+| `subCaseId` | *undefined* \| *string* |
+
+Defined in: [attachments/get.ts:52](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/get.ts#L52)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.getallargs.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.getallargs.md
new file mode 100644
index 0000000000000..dbd66291e22de
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.getallargs.md
@@ -0,0 +1,45 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/get](../modules/attachments_get.md) / GetAllArgs
+
+# Interface: GetAllArgs
+
+[attachments/get](../modules/attachments_get.md).GetAllArgs
+
+Parameters for retrieving all attachments of a case
+
+## Table of contents
+
+### Properties
+
+- [caseID](attachments_get.getallargs.md#caseid)
+- [includeSubCaseComments](attachments_get.getallargs.md#includesubcasecomments)
+- [subCaseID](attachments_get.getallargs.md#subcaseid)
+
+## Properties
+
+### caseID
+
+• **caseID**: *string*
+
+The case ID to retrieve all attachments for
+
+Defined in: [attachments/get.ts:62](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/get.ts#L62)
+
+___
+
+### includeSubCaseComments
+
+• `Optional` **includeSubCaseComments**: *boolean*
+
+Optionally include the attachments associated with a sub case
+
+Defined in: [attachments/get.ts:66](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/get.ts#L66)
+
+___
+
+### subCaseID
+
+• `Optional` **subCaseID**: *string*
+
+If included the case ID will be ignored and the attachments will be retrieved from the specified ID of the sub case
+
+Defined in: [attachments/get.ts:70](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/get.ts#L70)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.getargs.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.getargs.md
new file mode 100644
index 0000000000000..abfd4bb5958d3
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_get.getargs.md
@@ -0,0 +1,32 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/get](../modules/attachments_get.md) / GetArgs
+
+# Interface: GetArgs
+
+[attachments/get](../modules/attachments_get.md).GetArgs
+
+## Table of contents
+
+### Properties
+
+- [attachmentID](attachments_get.getargs.md#attachmentid)
+- [caseID](attachments_get.getargs.md#caseid)
+
+## Properties
+
+### attachmentID
+
+• **attachmentID**: *string*
+
+The ID of the attachment to retrieve
+
+Defined in: [attachments/get.ts:81](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/get.ts#L81)
+
+___
+
+### caseID
+
+• **caseID**: *string*
+
+The ID of the case to retrieve an attachment from
+
+Defined in: [attachments/get.ts:77](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/get.ts#L77)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_update.updateargs.md b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_update.updateargs.md
new file mode 100644
index 0000000000000..b571067175f62
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/attachments_update.updateargs.md
@@ -0,0 +1,45 @@
+[Cases Client API Interface](../cases_client_api.md) / [attachments/update](../modules/attachments_update.md) / UpdateArgs
+
+# Interface: UpdateArgs
+
+[attachments/update](../modules/attachments_update.md).UpdateArgs
+
+Parameters for updating a single attachment
+
+## Table of contents
+
+### Properties
+
+- [caseID](attachments_update.updateargs.md#caseid)
+- [subCaseID](attachments_update.updateargs.md#subcaseid)
+- [updateRequest](attachments_update.updateargs.md#updaterequest)
+
+## Properties
+
+### caseID
+
+• **caseID**: *string*
+
+The ID of the case that is associated with this attachment
+
+Defined in: [attachments/update.ts:29](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/update.ts#L29)
+
+___
+
+### subCaseID
+
+• `Optional` **subCaseID**: *string*
+
+The ID of a sub case, if specified a sub case will be searched for to perform the attachment update instead of on a case
+
+Defined in: [attachments/update.ts:37](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/update.ts#L37)
+
+___
+
+### updateRequest
+
+• **updateRequest**: { `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `id`: *string* ; `version`: *string*  }
+
+The full attachment request with the fields updated with appropriate values
+
+Defined in: [attachments/update.ts:33](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/attachments/update.ts#L33)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/cases_client.casessubclient.md b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_client.casessubclient.md
new file mode 100644
index 0000000000000..e7d7dea34d0ad
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_client.casessubclient.md
@@ -0,0 +1,189 @@
+[Cases Client API Interface](../cases_client_api.md) / [cases/client](../modules/cases_client.md) / CasesSubClient
+
+# Interface: CasesSubClient
+
+[cases/client](../modules/cases_client.md).CasesSubClient
+
+API for interacting with the cases entities.
+
+## Table of contents
+
+### Methods
+
+- [create](cases_client.casessubclient.md#create)
+- [delete](cases_client.casessubclient.md#delete)
+- [find](cases_client.casessubclient.md#find)
+- [get](cases_client.casessubclient.md#get)
+- [getCaseIDsByAlertID](cases_client.casessubclient.md#getcaseidsbyalertid)
+- [getReporters](cases_client.casessubclient.md#getreporters)
+- [getTags](cases_client.casessubclient.md#gettags)
+- [push](cases_client.casessubclient.md#push)
+- [update](cases_client.casessubclient.md#update)
+
+## Methods
+
+### create
+
+▸ **create**(`data`: [*ICasePostRequest*](typedoc_interfaces.icasepostrequest.md)): *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Creates a case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `data` | [*ICasePostRequest*](typedoc_interfaces.icasepostrequest.md) |
+
+**Returns:** *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Defined in: [cases/client.ts:48](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L48)
+
+___
+
+### delete
+
+▸ **delete**(`ids`: *string*[]): *Promise*<void\>
+
+Delete a case and all its comments.
+
+**`params`** ids an array of case IDs to delete
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `ids` | *string*[] |
+
+**Returns:** *Promise*<void\>
+
+Defined in: [cases/client.ts:72](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L72)
+
+___
+
+### find
+
+▸ **find**(`params`: [*ICasesFindRequest*](typedoc_interfaces.icasesfindrequest.md)): *Promise*<[*ICasesFindResponse*](typedoc_interfaces.icasesfindresponse.md)\>
+
+Returns cases that match the search criteria.
+
+If the `owner` field is left empty then all the cases that the user has access to will be returned.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | [*ICasesFindRequest*](typedoc_interfaces.icasesfindrequest.md) |
+
+**Returns:** *Promise*<[*ICasesFindResponse*](typedoc_interfaces.icasesfindresponse.md)\>
+
+Defined in: [cases/client.ts:54](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L54)
+
+___
+
+### get
+
+▸ **get**(`params`: [*GetParams*](cases_get.getparams.md)): *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Retrieves a single case with the specified ID.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | [*GetParams*](cases_get.getparams.md) |
+
+**Returns:** *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Defined in: [cases/client.ts:58](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L58)
+
+___
+
+### getCaseIDsByAlertID
+
+▸ **getCaseIDsByAlertID**(`params`: [*CaseIDsByAlertIDParams*](cases_get.caseidsbyalertidparams.md)): *Promise*<string[]\>
+
+Retrieves the case IDs given a single alert ID
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | [*CaseIDsByAlertIDParams*](cases_get.caseidsbyalertidparams.md) |
+
+**Returns:** *Promise*<string[]\>
+
+Defined in: [cases/client.ts:84](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L84)
+
+___
+
+### getReporters
+
+▸ **getReporters**(`params`: { `owner`: *undefined* \| *string* \| *string*[]  }): *Promise*<{ `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }[]\>
+
+Retrieves all the reporters across all accessible cases.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | *object* |
+| `params.owner` | *undefined* \| *string* \| *string*[] |
+
+**Returns:** *Promise*<{ `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }[]\>
+
+Defined in: [cases/client.ts:80](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L80)
+
+___
+
+### getTags
+
+▸ **getTags**(`params`: { `owner`: *undefined* \| *string* \| *string*[]  }): *Promise*<string[]\>
+
+Retrieves all the tags across all cases the user making the request has access to.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | *object* |
+| `params.owner` | *undefined* \| *string* \| *string*[] |
+
+**Returns:** *Promise*<string[]\>
+
+Defined in: [cases/client.ts:76](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L76)
+
+___
+
+### push
+
+▸ **push**(`args`: [*PushParams*](cases_push.pushparams.md)): *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Pushes a specific case to an external system.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `args` | [*PushParams*](cases_push.pushparams.md) |
+
+**Returns:** *Promise*<[*ICaseResponse*](typedoc_interfaces.icaseresponse.md)\>
+
+Defined in: [cases/client.ts:62](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L62)
+
+___
+
+### update
+
+▸ **update**(`cases`: [*ICasesPatchRequest*](typedoc_interfaces.icasespatchrequest.md)): *Promise*<[*ICasesResponse*](typedoc_interfaces.icasesresponse.md)\>
+
+Update the specified cases with the passed in values.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `cases` | [*ICasesPatchRequest*](typedoc_interfaces.icasespatchrequest.md) |
+
+**Returns:** *Promise*<[*ICasesResponse*](typedoc_interfaces.icasesresponse.md)\>
+
+Defined in: [cases/client.ts:66](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/client.ts#L66)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/cases_get.caseidsbyalertidparams.md b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_get.caseidsbyalertidparams.md
new file mode 100644
index 0000000000000..1b8abba1a4071
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_get.caseidsbyalertidparams.md
@@ -0,0 +1,40 @@
+[Cases Client API Interface](../cases_client_api.md) / [cases/get](../modules/cases_get.md) / CaseIDsByAlertIDParams
+
+# Interface: CaseIDsByAlertIDParams
+
+[cases/get](../modules/cases_get.md).CaseIDsByAlertIDParams
+
+Parameters for finding cases IDs using an alert ID
+
+## Table of contents
+
+### Properties
+
+- [alertID](cases_get.caseidsbyalertidparams.md#alertid)
+- [options](cases_get.caseidsbyalertidparams.md#options)
+
+## Properties
+
+### alertID
+
+• **alertID**: *string*
+
+The alert ID to search for
+
+Defined in: [cases/get.ts:47](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/get.ts#L47)
+
+___
+
+### options
+
+• **options**: *object*
+
+The filtering options when searching for associated cases.
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `owner` | *undefined* \| *string* \| *string*[] |
+
+Defined in: [cases/get.ts:51](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/get.ts#L51)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/cases_get.getparams.md b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_get.getparams.md
new file mode 100644
index 0000000000000..8c12b5533ac18
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_get.getparams.md
@@ -0,0 +1,45 @@
+[Cases Client API Interface](../cases_client_api.md) / [cases/get](../modules/cases_get.md) / GetParams
+
+# Interface: GetParams
+
+[cases/get](../modules/cases_get.md).GetParams
+
+The parameters for retrieving a case
+
+## Table of contents
+
+### Properties
+
+- [id](cases_get.getparams.md#id)
+- [includeComments](cases_get.getparams.md#includecomments)
+- [includeSubCaseComments](cases_get.getparams.md#includesubcasecomments)
+
+## Properties
+
+### id
+
+• **id**: *string*
+
+Case ID
+
+Defined in: [cases/get.ts:122](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/get.ts#L122)
+
+___
+
+### includeComments
+
+• `Optional` **includeComments**: *boolean*
+
+Whether to include the attachments for a case in the response
+
+Defined in: [cases/get.ts:126](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/get.ts#L126)
+
+___
+
+### includeSubCaseComments
+
+• `Optional` **includeSubCaseComments**: *boolean*
+
+Whether to include the attachments for all children of a case in the response
+
+Defined in: [cases/get.ts:130](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/get.ts#L130)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/cases_push.pushparams.md b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_push.pushparams.md
new file mode 100644
index 0000000000000..9f1810e4f0cc2
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/cases_push.pushparams.md
@@ -0,0 +1,34 @@
+[Cases Client API Interface](../cases_client_api.md) / [cases/push](../modules/cases_push.md) / PushParams
+
+# Interface: PushParams
+
+[cases/push](../modules/cases_push.md).PushParams
+
+Parameters for pushing a case to an external system
+
+## Table of contents
+
+### Properties
+
+- [caseId](cases_push.pushparams.md#caseid)
+- [connectorId](cases_push.pushparams.md#connectorid)
+
+## Properties
+
+### caseId
+
+• **caseId**: *string*
+
+The ID of a case
+
+Defined in: [cases/push.ts:53](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/push.ts#L53)
+
+___
+
+### connectorId
+
+• **connectorId**: *string*
+
+The ID of an external system to push to
+
+Defined in: [cases/push.ts:57](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/push.ts#L57)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/configure_client.configuresubclient.md b/x-pack/plugins/cases/docs/cases_client/interfaces/configure_client.configuresubclient.md
new file mode 100644
index 0000000000000..9b3827a57a9d3
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/configure_client.configuresubclient.md
@@ -0,0 +1,84 @@
+[Cases Client API Interface](../cases_client_api.md) / [configure/client](../modules/configure_client.md) / ConfigureSubClient
+
+# Interface: ConfigureSubClient
+
+[configure/client](../modules/configure_client.md).ConfigureSubClient
+
+This is the public API for interacting with the connector configuration for cases.
+
+## Table of contents
+
+### Methods
+
+- [create](configure_client.configuresubclient.md#create)
+- [get](configure_client.configuresubclient.md#get)
+- [getConnectors](configure_client.configuresubclient.md#getconnectors)
+- [update](configure_client.configuresubclient.md#update)
+
+## Methods
+
+### create
+
+▸ **create**(`configuration`: [*ICasesConfigureRequest*](typedoc_interfaces.icasesconfigurerequest.md)): *Promise*<[*ICasesConfigureResponse*](typedoc_interfaces.icasesconfigureresponse.md)\>
+
+Creates a configuration if one does not already exist. If one exists it is deleted and a new one is created.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `configuration` | [*ICasesConfigureRequest*](typedoc_interfaces.icasesconfigurerequest.md) |
+
+**Returns:** *Promise*<[*ICasesConfigureResponse*](typedoc_interfaces.icasesconfigureresponse.md)\>
+
+Defined in: [configure/client.ts:102](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/configure/client.ts#L102)
+
+___
+
+### get
+
+▸ **get**(`params`: { `owner`: *undefined* \| *string* \| *string*[]  }): *Promise*<{} \| [*ICasesConfigureResponse*](typedoc_interfaces.icasesconfigureresponse.md)\>
+
+Retrieves the external connector configuration for a particular case owner.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | *object* |
+| `params.owner` | *undefined* \| *string* \| *string*[] |
+
+**Returns:** *Promise*<{} \| [*ICasesConfigureResponse*](typedoc_interfaces.icasesconfigureresponse.md)\>
+
+Defined in: [configure/client.ts:84](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/configure/client.ts#L84)
+
+___
+
+### getConnectors
+
+▸ **getConnectors**(): *Promise*<FindActionResult[]\>
+
+Retrieves the valid external connectors supported by the cases plugin.
+
+**Returns:** *Promise*<FindActionResult[]\>
+
+Defined in: [configure/client.ts:88](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/configure/client.ts#L88)
+
+___
+
+### update
+
+▸ **update**(`configurationId`: *string*, `configurations`: [*ICasesConfigurePatch*](typedoc_interfaces.icasesconfigurepatch.md)): *Promise*<[*ICasesConfigureResponse*](typedoc_interfaces.icasesconfigureresponse.md)\>
+
+Updates a particular configuration with new values.
+
+#### Parameters
+
+| Name | Type | Description |
+| :------ | :------ | :------ |
+| `configurationId` | *string* | the ID of the configuration to update |
+| `configurations` | [*ICasesConfigurePatch*](typedoc_interfaces.icasesconfigurepatch.md) | the new configuration parameters |
+
+**Returns:** *Promise*<[*ICasesConfigureResponse*](typedoc_interfaces.icasesconfigureresponse.md)\>
+
+Defined in: [configure/client.ts:95](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/configure/client.ts#L95)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/stats_client.statssubclient.md b/x-pack/plugins/cases/docs/cases_client/interfaces/stats_client.statssubclient.md
new file mode 100644
index 0000000000000..7e01205395277
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/stats_client.statssubclient.md
@@ -0,0 +1,32 @@
+[Cases Client API Interface](../cases_client_api.md) / [stats/client](../modules/stats_client.md) / StatsSubClient
+
+# Interface: StatsSubClient
+
+[stats/client](../modules/stats_client.md).StatsSubClient
+
+Statistics API contract.
+
+## Table of contents
+
+### Methods
+
+- [getStatusTotalsByType](stats_client.statssubclient.md#getstatustotalsbytype)
+
+## Methods
+
+### getStatusTotalsByType
+
+▸ **getStatusTotalsByType**(`params`: { `owner`: *undefined* \| *string* \| *string*[]  }): *Promise*<{ `count_closed_cases`: *number* ; `count_in_progress_cases`: *number* ; `count_open_cases`: *number*  }\>
+
+Retrieves the total number of open, closed, and in-progress cases.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | *object* |
+| `params.owner` | *undefined* \| *string* \| *string*[] |
+
+**Returns:** *Promise*<{ `count_closed_cases`: *number* ; `count_in_progress_cases`: *number* ; `count_open_cases`: *number*  }\>
+
+Defined in: [stats/client.ts:34](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/stats/client.ts#L34)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/sub_cases_client.subcasesclient.md b/x-pack/plugins/cases/docs/cases_client/interfaces/sub_cases_client.subcasesclient.md
new file mode 100644
index 0000000000000..76df26524b7b0
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/sub_cases_client.subcasesclient.md
@@ -0,0 +1,89 @@
+[Cases Client API Interface](../cases_client_api.md) / [sub_cases/client](../modules/sub_cases_client.md) / SubCasesClient
+
+# Interface: SubCasesClient
+
+[sub_cases/client](../modules/sub_cases_client.md).SubCasesClient
+
+The API routes for interacting with sub cases.
+
+## Table of contents
+
+### Methods
+
+- [delete](sub_cases_client.subcasesclient.md#delete)
+- [find](sub_cases_client.subcasesclient.md#find)
+- [get](sub_cases_client.subcasesclient.md#get)
+- [update](sub_cases_client.subcasesclient.md#update)
+
+## Methods
+
+### delete
+
+▸ **delete**(`ids`: *string*[]): *Promise*<void\>
+
+Deletes the specified entities and their attachments.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `ids` | *string*[] |
+
+**Returns:** *Promise*<void\>
+
+Defined in: [sub_cases/client.ts:60](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/sub_cases/client.ts#L60)
+
+___
+
+### find
+
+▸ **find**(`findArgs`: FindArgs): *Promise*<[*ISubCasesFindResponse*](typedoc_interfaces.isubcasesfindresponse.md)\>
+
+Retrieves the sub cases matching the search criteria.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `findArgs` | FindArgs |
+
+**Returns:** *Promise*<[*ISubCasesFindResponse*](typedoc_interfaces.isubcasesfindresponse.md)\>
+
+Defined in: [sub_cases/client.ts:64](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/sub_cases/client.ts#L64)
+
+___
+
+### get
+
+▸ **get**(`getArgs`: GetArgs): *Promise*<[*ISubCaseResponse*](typedoc_interfaces.isubcaseresponse.md)\>
+
+Retrieves a single sub case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `getArgs` | GetArgs |
+
+**Returns:** *Promise*<[*ISubCaseResponse*](typedoc_interfaces.isubcaseresponse.md)\>
+
+Defined in: [sub_cases/client.ts:68](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/sub_cases/client.ts#L68)
+
+___
+
+### update
+
+▸ **update**(`subCases`: { `subCases`: { `status`: *undefined* \| open \| *any*[*any*] \| closed  } & { id: string; version: string; }[]  }): *Promise*<[*ISubCasesResponse*](typedoc_interfaces.isubcasesresponse.md)\>
+
+Updates the specified sub cases to the new values included in the request.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `subCases` | *object* |
+| `subCases.subCases` | { `status`: *undefined* \| open \| *any*[*any*] \| closed  } & { id: string; version: string; }[] |
+
+**Returns:** *Promise*<[*ISubCasesResponse*](typedoc_interfaces.isubcasesresponse.md)\>
+
+Defined in: [sub_cases/client.ts:72](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/sub_cases/client.ts#L72)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.iallcommentsresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.iallcommentsresponse.md
new file mode 100644
index 0000000000000..06322bb51e2ad
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.iallcommentsresponse.md
@@ -0,0 +1,11 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / IAllCommentsResponse
+
+# Interface: IAllCommentsResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).IAllCommentsResponse
+
+## Hierarchy
+
+- *AllCommentsResponse*
+
+  ↳ **IAllCommentsResponse**
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasepostrequest.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasepostrequest.md
new file mode 100644
index 0000000000000..70533a15fe616
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasepostrequest.md
@@ -0,0 +1,88 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasePostRequest
+
+# Interface: ICasePostRequest
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasePostRequest
+
+These are simply to make typedoc not attempt to expand the type aliases. If it attempts to expand them
+the docs are huge.
+
+## Hierarchy
+
+- *CasePostRequest*
+
+  ↳ **ICasePostRequest**
+
+## Table of contents
+
+### Properties
+
+- [connector](typedoc_interfaces.icasepostrequest.md#connector)
+- [description](typedoc_interfaces.icasepostrequest.md#description)
+- [owner](typedoc_interfaces.icasepostrequest.md#owner)
+- [settings](typedoc_interfaces.icasepostrequest.md#settings)
+- [tags](typedoc_interfaces.icasepostrequest.md#tags)
+- [title](typedoc_interfaces.icasepostrequest.md#title)
+- [type](typedoc_interfaces.icasepostrequest.md#type)
+
+## Properties
+
+### connector
+
+• **connector**: { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { issueType: string \| null; priority: string \| null; parent: string \| null; } ; `type`: jira  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { incidentTypes: string[] \| null; severityCode: string \| null; } ; `type`: resilient  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { impact: string \| null; severity: string \| null; urgency: string \| null; category: string \| null; subcategory: string \| null; } ; `type`: serviceNowITSM  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { category: string \| null; destIp: boolean \| null; malwareHash: boolean \| null; malwareUrl: boolean \| null; priority: string \| null; sourceIp: boolean \| null; subcategory: string \| null; } ; `type`: serviceNowSIR  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` ; `type`: none  }
+
+Inherited from: CasePostRequest.connector
+
+___
+
+### description
+
+• **description**: *string*
+
+Inherited from: CasePostRequest.description
+
+___
+
+### owner
+
+• **owner**: *string*
+
+Inherited from: CasePostRequest.owner
+
+___
+
+### settings
+
+• **settings**: *object*
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `syncAlerts` | *boolean* |
+
+Inherited from: CasePostRequest.settings
+
+___
+
+### tags
+
+• **tags**: *string*[]
+
+Inherited from: CasePostRequest.tags
+
+___
+
+### title
+
+• **title**: *string*
+
+Inherited from: CasePostRequest.title
+
+___
+
+### type
+
+• **type**: *undefined* \| collection \| individual
+
+Inherited from: CasePostRequest.type
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icaseresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icaseresponse.md
new file mode 100644
index 0000000000000..5db55e5552473
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icaseresponse.md
@@ -0,0 +1,228 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICaseResponse
+
+# Interface: ICaseResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICaseResponse
+
+## Hierarchy
+
+- *CaseResponse*
+
+  ↳ **ICaseResponse**
+
+## Table of contents
+
+### Properties
+
+- [closed\_at](typedoc_interfaces.icaseresponse.md#closed_at)
+- [closed\_by](typedoc_interfaces.icaseresponse.md#closed_by)
+- [comments](typedoc_interfaces.icaseresponse.md#comments)
+- [connector](typedoc_interfaces.icaseresponse.md#connector)
+- [created\_at](typedoc_interfaces.icaseresponse.md#created_at)
+- [created\_by](typedoc_interfaces.icaseresponse.md#created_by)
+- [description](typedoc_interfaces.icaseresponse.md#description)
+- [external\_service](typedoc_interfaces.icaseresponse.md#external_service)
+- [id](typedoc_interfaces.icaseresponse.md#id)
+- [owner](typedoc_interfaces.icaseresponse.md#owner)
+- [settings](typedoc_interfaces.icaseresponse.md#settings)
+- [status](typedoc_interfaces.icaseresponse.md#status)
+- [subCaseIds](typedoc_interfaces.icaseresponse.md#subcaseids)
+- [subCases](typedoc_interfaces.icaseresponse.md#subcases)
+- [tags](typedoc_interfaces.icaseresponse.md#tags)
+- [title](typedoc_interfaces.icaseresponse.md#title)
+- [totalAlerts](typedoc_interfaces.icaseresponse.md#totalalerts)
+- [totalComment](typedoc_interfaces.icaseresponse.md#totalcomment)
+- [type](typedoc_interfaces.icaseresponse.md#type)
+- [updated\_at](typedoc_interfaces.icaseresponse.md#updated_at)
+- [updated\_by](typedoc_interfaces.icaseresponse.md#updated_by)
+- [version](typedoc_interfaces.icaseresponse.md#version)
+
+## Properties
+
+### closed\_at
+
+• **closed\_at**: ``null`` \| *string*
+
+Inherited from: CaseResponse.closed\_at
+
+___
+
+### closed\_by
+
+• **closed\_by**: ``null`` \| { `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }
+
+Inherited from: CaseResponse.closed\_by
+
+___
+
+### comments
+
+• **comments**: *undefined* \| { `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }[]
+
+Inherited from: CaseResponse.comments
+
+___
+
+### connector
+
+• **connector**: { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { issueType: string \| null; priority: string \| null; parent: string \| null; } ; `type`: jira  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { incidentTypes: string[] \| null; severityCode: string \| null; } ; `type`: resilient  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { impact: string \| null; severity: string \| null; urgency: string \| null; category: string \| null; subcategory: string \| null; } ; `type`: serviceNowITSM  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { category: string \| null; destIp: boolean \| null; malwareHash: boolean \| null; malwareUrl: boolean \| null; priority: string \| null; sourceIp: boolean \| null; subcategory: string \| null; } ; `type`: serviceNowSIR  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` ; `type`: none  }
+
+Inherited from: CaseResponse.connector
+
+___
+
+### created\_at
+
+• **created\_at**: *string*
+
+Inherited from: CaseResponse.created\_at
+
+___
+
+### created\_by
+
+• **created\_by**: *object*
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `email` | *undefined* \| ``null`` \| *string* |
+| `full_name` | *undefined* \| ``null`` \| *string* |
+| `username` | *undefined* \| ``null`` \| *string* |
+
+Inherited from: CaseResponse.created\_by
+
+___
+
+### description
+
+• **description**: *string*
+
+Inherited from: CaseResponse.description
+
+___
+
+### external\_service
+
+• **external\_service**: ``null`` \| { `connector_id`: *string* ; `connector_name`: *string* ; `external_id`: *string* ; `external_title`: *string* ; `external_url`: *string*  } & { `pushed_at`: *string* ; `pushed_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  }
+
+Inherited from: CaseResponse.external\_service
+
+___
+
+### id
+
+• **id**: *string*
+
+Inherited from: CaseResponse.id
+
+___
+
+### owner
+
+• **owner**: *string*
+
+Inherited from: CaseResponse.owner
+
+___
+
+### settings
+
+• **settings**: *object*
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `syncAlerts` | *boolean* |
+
+Inherited from: CaseResponse.settings
+
+___
+
+### status
+
+• **status**: CaseStatuses
+
+Inherited from: CaseResponse.status
+
+___
+
+### subCaseIds
+
+• **subCaseIds**: *undefined* \| *string*[]
+
+Inherited from: CaseResponse.subCaseIds
+
+___
+
+### subCases
+
+• **subCases**: *undefined* \| { `status`: CaseStatuses  } & { `closed_at`: ``null`` \| *string* ; `closed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `created_at`: *string* ; `created_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `totalAlerts`: *number* ; `totalComment`: *number* ; `version`: *string*  } & { `comments`: *undefined* \| { `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }[]  }[]
+
+Inherited from: CaseResponse.subCases
+
+___
+
+### tags
+
+• **tags**: *string*[]
+
+Inherited from: CaseResponse.tags
+
+___
+
+### title
+
+• **title**: *string*
+
+Inherited from: CaseResponse.title
+
+___
+
+### totalAlerts
+
+• **totalAlerts**: *number*
+
+Inherited from: CaseResponse.totalAlerts
+
+___
+
+### totalComment
+
+• **totalComment**: *number*
+
+Inherited from: CaseResponse.totalComment
+
+___
+
+### type
+
+• **type**: CaseType
+
+Inherited from: CaseResponse.type
+
+___
+
+### updated\_at
+
+• **updated\_at**: ``null`` \| *string*
+
+Inherited from: CaseResponse.updated\_at
+
+___
+
+### updated\_by
+
+• **updated\_by**: ``null`` \| { `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }
+
+Inherited from: CaseResponse.updated\_by
+
+___
+
+### version
+
+• **version**: *string*
+
+Inherited from: CaseResponse.version
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigurepatch.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigurepatch.md
new file mode 100644
index 0000000000000..3854fda03fb6a
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigurepatch.md
@@ -0,0 +1,43 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasesConfigurePatch
+
+# Interface: ICasesConfigurePatch
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasesConfigurePatch
+
+## Hierarchy
+
+- *CasesConfigurePatch*
+
+  ↳ **ICasesConfigurePatch**
+
+## Table of contents
+
+### Properties
+
+- [closure\_type](typedoc_interfaces.icasesconfigurepatch.md#closure_type)
+- [connector](typedoc_interfaces.icasesconfigurepatch.md#connector)
+- [version](typedoc_interfaces.icasesconfigurepatch.md#version)
+
+## Properties
+
+### closure\_type
+
+• **closure\_type**: *undefined* \| ``"close-by-user"`` \| ``"close-by-pushing"``
+
+Inherited from: CasesConfigurePatch.closure\_type
+
+___
+
+### connector
+
+• **connector**: *undefined* \| { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { issueType: string \| null; priority: string \| null; parent: string \| null; } ; `type`: jira  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { incidentTypes: string[] \| null; severityCode: string \| null; } ; `type`: resilient  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { impact: string \| null; severity: string \| null; urgency: string \| null; category: string \| null; subcategory: string \| null; } ; `type`: serviceNowITSM  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { category: string \| null; destIp: boolean \| null; malwareHash: boolean \| null; malwareUrl: boolean \| null; priority: string \| null; sourceIp: boolean \| null; subcategory: string \| null; } ; `type`: serviceNowSIR  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` ; `type`: none  }
+
+Inherited from: CasesConfigurePatch.connector
+
+___
+
+### version
+
+• **version**: *string*
+
+Inherited from: CasesConfigurePatch.version
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigurerequest.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigurerequest.md
new file mode 100644
index 0000000000000..548e1a5c48f58
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigurerequest.md
@@ -0,0 +1,43 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasesConfigureRequest
+
+# Interface: ICasesConfigureRequest
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasesConfigureRequest
+
+## Hierarchy
+
+- *CasesConfigureRequest*
+
+  ↳ **ICasesConfigureRequest**
+
+## Table of contents
+
+### Properties
+
+- [closure\_type](typedoc_interfaces.icasesconfigurerequest.md#closure_type)
+- [connector](typedoc_interfaces.icasesconfigurerequest.md#connector)
+- [owner](typedoc_interfaces.icasesconfigurerequest.md#owner)
+
+## Properties
+
+### closure\_type
+
+• **closure\_type**: ``"close-by-user"`` \| ``"close-by-pushing"``
+
+Inherited from: CasesConfigureRequest.closure\_type
+
+___
+
+### connector
+
+• **connector**: { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { issueType: string \| null; priority: string \| null; parent: string \| null; } ; `type`: jira  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { incidentTypes: string[] \| null; severityCode: string \| null; } ; `type`: resilient  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { impact: string \| null; severity: string \| null; urgency: string \| null; category: string \| null; subcategory: string \| null; } ; `type`: serviceNowITSM  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { category: string \| null; destIp: boolean \| null; malwareHash: boolean \| null; malwareUrl: boolean \| null; priority: string \| null; sourceIp: boolean \| null; subcategory: string \| null; } ; `type`: serviceNowSIR  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` ; `type`: none  }
+
+Inherited from: CasesConfigureRequest.connector
+
+___
+
+### owner
+
+• **owner**: *string*
+
+Inherited from: CasesConfigureRequest.owner
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigureresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigureresponse.md
new file mode 100644
index 0000000000000..c493a4c6c0f0c
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesconfigureresponse.md
@@ -0,0 +1,123 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasesConfigureResponse
+
+# Interface: ICasesConfigureResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasesConfigureResponse
+
+## Hierarchy
+
+- *CasesConfigureResponse*
+
+  ↳ **ICasesConfigureResponse**
+
+## Table of contents
+
+### Properties
+
+- [closure\_type](typedoc_interfaces.icasesconfigureresponse.md#closure_type)
+- [connector](typedoc_interfaces.icasesconfigureresponse.md#connector)
+- [created\_at](typedoc_interfaces.icasesconfigureresponse.md#created_at)
+- [created\_by](typedoc_interfaces.icasesconfigureresponse.md#created_by)
+- [error](typedoc_interfaces.icasesconfigureresponse.md#error)
+- [id](typedoc_interfaces.icasesconfigureresponse.md#id)
+- [mappings](typedoc_interfaces.icasesconfigureresponse.md#mappings)
+- [owner](typedoc_interfaces.icasesconfigureresponse.md#owner)
+- [updated\_at](typedoc_interfaces.icasesconfigureresponse.md#updated_at)
+- [updated\_by](typedoc_interfaces.icasesconfigureresponse.md#updated_by)
+- [version](typedoc_interfaces.icasesconfigureresponse.md#version)
+
+## Properties
+
+### closure\_type
+
+• **closure\_type**: ``"close-by-user"`` \| ``"close-by-pushing"``
+
+Inherited from: CasesConfigureResponse.closure\_type
+
+___
+
+### connector
+
+• **connector**: { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { issueType: string \| null; priority: string \| null; parent: string \| null; } ; `type`: jira  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { incidentTypes: string[] \| null; severityCode: string \| null; } ; `type`: resilient  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { impact: string \| null; severity: string \| null; urgency: string \| null; category: string \| null; subcategory: string \| null; } ; `type`: serviceNowITSM  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { category: string \| null; destIp: boolean \| null; malwareHash: boolean \| null; malwareUrl: boolean \| null; priority: string \| null; sourceIp: boolean \| null; subcategory: string \| null; } ; `type`: serviceNowSIR  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` ; `type`: none  }
+
+Inherited from: CasesConfigureResponse.connector
+
+___
+
+### created\_at
+
+• **created\_at**: *string*
+
+Inherited from: CasesConfigureResponse.created\_at
+
+___
+
+### created\_by
+
+• **created\_by**: *object*
+
+#### Type declaration
+
+| Name | Type |
+| :------ | :------ |
+| `email` | *undefined* \| ``null`` \| *string* |
+| `full_name` | *undefined* \| ``null`` \| *string* |
+| `username` | *undefined* \| ``null`` \| *string* |
+
+Inherited from: CasesConfigureResponse.created\_by
+
+___
+
+### error
+
+• **error**: ``null`` \| *string*
+
+Inherited from: CasesConfigureResponse.error
+
+___
+
+### id
+
+• **id**: *string*
+
+Inherited from: CasesConfigureResponse.id
+
+___
+
+### mappings
+
+• **mappings**: { `action_type`: ``"append"`` \| ``"nothing"`` \| ``"overwrite"`` ; `source`: ``"description"`` \| ``"title"`` \| ``"comments"`` ; `target`: *string*  }[]
+
+Inherited from: CasesConfigureResponse.mappings
+
+___
+
+### owner
+
+• **owner**: *string*
+
+Inherited from: CasesConfigureResponse.owner
+
+___
+
+### updated\_at
+
+• **updated\_at**: ``null`` \| *string*
+
+Inherited from: CasesConfigureResponse.updated\_at
+
+___
+
+### updated\_by
+
+• **updated\_by**: ``null`` \| { `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }
+
+Inherited from: CasesConfigureResponse.updated\_by
+
+___
+
+### version
+
+• **version**: *string*
+
+Inherited from: CasesConfigureResponse.version
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesfindrequest.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesfindrequest.md
new file mode 100644
index 0000000000000..cb8ec7797677f
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesfindrequest.md
@@ -0,0 +1,133 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasesFindRequest
+
+# Interface: ICasesFindRequest
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasesFindRequest
+
+## Hierarchy
+
+- *CasesFindRequest*
+
+  ↳ **ICasesFindRequest**
+
+## Table of contents
+
+### Properties
+
+- [defaultSearchOperator](typedoc_interfaces.icasesfindrequest.md#defaultsearchoperator)
+- [fields](typedoc_interfaces.icasesfindrequest.md#fields)
+- [owner](typedoc_interfaces.icasesfindrequest.md#owner)
+- [page](typedoc_interfaces.icasesfindrequest.md#page)
+- [perPage](typedoc_interfaces.icasesfindrequest.md#perpage)
+- [reporters](typedoc_interfaces.icasesfindrequest.md#reporters)
+- [search](typedoc_interfaces.icasesfindrequest.md#search)
+- [searchFields](typedoc_interfaces.icasesfindrequest.md#searchfields)
+- [sortField](typedoc_interfaces.icasesfindrequest.md#sortfield)
+- [sortOrder](typedoc_interfaces.icasesfindrequest.md#sortorder)
+- [status](typedoc_interfaces.icasesfindrequest.md#status)
+- [tags](typedoc_interfaces.icasesfindrequest.md#tags)
+- [type](typedoc_interfaces.icasesfindrequest.md#type)
+
+## Properties
+
+### defaultSearchOperator
+
+• **defaultSearchOperator**: *undefined* \| ``"AND"`` \| ``"OR"``
+
+Inherited from: CasesFindRequest.defaultSearchOperator
+
+___
+
+### fields
+
+• **fields**: *undefined* \| *string*[]
+
+Inherited from: CasesFindRequest.fields
+
+___
+
+### owner
+
+• **owner**: *undefined* \| *string* \| *string*[]
+
+Inherited from: CasesFindRequest.owner
+
+___
+
+### page
+
+• **page**: *undefined* \| *number*
+
+Inherited from: CasesFindRequest.page
+
+___
+
+### perPage
+
+• **perPage**: *undefined* \| *number*
+
+Inherited from: CasesFindRequest.perPage
+
+___
+
+### reporters
+
+• **reporters**: *undefined* \| *string* \| *string*[]
+
+Inherited from: CasesFindRequest.reporters
+
+___
+
+### search
+
+• **search**: *undefined* \| *string*
+
+Inherited from: CasesFindRequest.search
+
+___
+
+### searchFields
+
+• **searchFields**: *undefined* \| *string* \| *string*[]
+
+Inherited from: CasesFindRequest.searchFields
+
+___
+
+### sortField
+
+• **sortField**: *undefined* \| *string*
+
+Inherited from: CasesFindRequest.sortField
+
+___
+
+### sortOrder
+
+• **sortOrder**: *undefined* \| ``"desc"`` \| ``"asc"``
+
+Inherited from: CasesFindRequest.sortOrder
+
+___
+
+### status
+
+• **status**: *undefined* \| open \| *any*[*any*] \| closed
+
+Inherited from: CasesFindRequest.status
+
+___
+
+### tags
+
+• **tags**: *undefined* \| *string* \| *string*[]
+
+Inherited from: CasesFindRequest.tags
+
+___
+
+### type
+
+• **type**: *undefined* \| collection \| individual
+
+Inherited from: CasesFindRequest.type
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesfindresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesfindresponse.md
new file mode 100644
index 0000000000000..9be5fd5743a8e
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesfindresponse.md
@@ -0,0 +1,79 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasesFindResponse
+
+# Interface: ICasesFindResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasesFindResponse
+
+## Hierarchy
+
+- *CasesFindResponse*
+
+  ↳ **ICasesFindResponse**
+
+## Table of contents
+
+### Properties
+
+- [cases](typedoc_interfaces.icasesfindresponse.md#cases)
+- [count\_closed\_cases](typedoc_interfaces.icasesfindresponse.md#count_closed_cases)
+- [count\_in\_progress\_cases](typedoc_interfaces.icasesfindresponse.md#count_in_progress_cases)
+- [count\_open\_cases](typedoc_interfaces.icasesfindresponse.md#count_open_cases)
+- [page](typedoc_interfaces.icasesfindresponse.md#page)
+- [per\_page](typedoc_interfaces.icasesfindresponse.md#per_page)
+- [total](typedoc_interfaces.icasesfindresponse.md#total)
+
+## Properties
+
+### cases
+
+• **cases**: { `connector`: { id: string; name: string; } & { type: ConnectorTypes.jira; fields: { issueType: string \| null; priority: string \| null; parent: string \| null; } \| null; } & { id: string; name: string; } & { type: ConnectorTypes.resilient; fields: { incidentTypes: string[] \| null; severityCode: string \| null; } \| null; } & { id: string; name: string; } & { type: ConnectorTypes.serviceNowITSM; fields: { impact: string \| null; severity: string \| null; urgency: string \| null; category: string \| null; subcategory: string \| null; } \| null; } & { id: string; name: string; } & { type: ConnectorTypes.serviceNowSIR; fields: { category: string \| null; destIp: boolean \| null; malwareHash: boolean \| null; malwareUrl: boolean \| null; priority: string \| null; sourceIp: boolean \| null; subcategory: string \| null; } \| null; } & { id: string; name: string; } & { type: ConnectorTypes.none; fields: null; } ; `description`: *string* ; `owner`: *string* ; `settings`: { syncAlerts: boolean; } ; `status`: CaseStatuses ; `tags`: *string*[] ; `title`: *string* ; `type`: CaseType  } & { `closed_at`: ``null`` \| *string* ; `closed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `external_service`: ``null`` \| { connector\_id: string; connector\_name: string; external\_id: string; external\_title: string; external\_url: string; } & { pushed\_at: string; pushed\_by: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `totalAlerts`: *number* ; `totalComment`: *number* ; `version`: *string*  } & { `comments`: *undefined* \| { `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }[] ; `subCaseIds`: *undefined* \| *string*[] ; `subCases`: *undefined* \| { `status`: CaseStatuses  } & { `closed_at`: ``null`` \| *string* ; `closed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `created_at`: *string* ; `created_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `totalAlerts`: *number* ; `totalComment`: *number* ; `version`: *string*  } & { comments?: ((({ comment: string; type: CommentType.user; owner: string; } & { associationType: AssociationType; created\_at: string; created\_by: { email: string \| null \| undefined; full\_name: string \| ... 1 more ... \| undefined; username: string \| ... 1 more ... \| undefined; }; ... 4 more ...; updated\_by: { ...; } ...[]  }[]
+
+Inherited from: CasesFindResponse.cases
+
+___
+
+### count\_closed\_cases
+
+• **count\_closed\_cases**: *number*
+
+Inherited from: CasesFindResponse.count\_closed\_cases
+
+___
+
+### count\_in\_progress\_cases
+
+• **count\_in\_progress\_cases**: *number*
+
+Inherited from: CasesFindResponse.count\_in\_progress\_cases
+
+___
+
+### count\_open\_cases
+
+• **count\_open\_cases**: *number*
+
+Inherited from: CasesFindResponse.count\_open\_cases
+
+___
+
+### page
+
+• **page**: *number*
+
+Inherited from: CasesFindResponse.page
+
+___
+
+### per\_page
+
+• **per\_page**: *number*
+
+Inherited from: CasesFindResponse.per\_page
+
+___
+
+### total
+
+• **total**: *number*
+
+Inherited from: CasesFindResponse.total
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasespatchrequest.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasespatchrequest.md
new file mode 100644
index 0000000000000..bfdb3b7315e55
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasespatchrequest.md
@@ -0,0 +1,25 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasesPatchRequest
+
+# Interface: ICasesPatchRequest
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasesPatchRequest
+
+## Hierarchy
+
+- *CasesPatchRequest*
+
+  ↳ **ICasesPatchRequest**
+
+## Table of contents
+
+### Properties
+
+- [cases](typedoc_interfaces.icasespatchrequest.md#cases)
+
+## Properties
+
+### cases
+
+• **cases**: { `connector`: *undefined* \| { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { issueType: string \| null; priority: string \| null; parent: string \| null; } ; `type`: jira  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { incidentTypes: string[] \| null; severityCode: string \| null; } ; `type`: resilient  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { impact: string \| null; severity: string \| null; urgency: string \| null; category: string \| null; subcategory: string \| null; } ; `type`: serviceNowITSM  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` \| { category: string \| null; destIp: boolean \| null; malwareHash: boolean \| null; malwareUrl: boolean \| null; priority: string \| null; sourceIp: boolean \| null; subcategory: string \| null; } ; `type`: serviceNowSIR  } & { `id`: *string* ; `name`: *string*  } & { `fields`: ``null`` ; `type`: none  } ; `description`: *undefined* \| *string* ; `owner`: *undefined* \| *string* ; `settings`: *undefined* \| { `syncAlerts`: *boolean*  } ; `status`: *undefined* \| open \| *any*[*any*] \| closed ; `tags`: *undefined* \| *string*[] ; `title`: *undefined* \| *string* ; `type`: *undefined* \| collection \| individual  } & { `id`: *string* ; `version`: *string*  }[]
+
+Inherited from: CasesPatchRequest.cases
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesresponse.md
new file mode 100644
index 0000000000000..2c9eed242d1fb
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icasesresponse.md
@@ -0,0 +1,11 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICasesResponse
+
+# Interface: ICasesResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICasesResponse
+
+## Hierarchy
+
+- *CasesResponse*
+
+  ↳ **ICasesResponse**
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icaseuseractionsresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icaseuseractionsresponse.md
new file mode 100644
index 0000000000000..0347711e331dc
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icaseuseractionsresponse.md
@@ -0,0 +1,11 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICaseUserActionsResponse
+
+# Interface: ICaseUserActionsResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICaseUserActionsResponse
+
+## Hierarchy
+
+- *CaseUserActionsResponse*
+
+  ↳ **ICaseUserActionsResponse**
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icommentsresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icommentsresponse.md
new file mode 100644
index 0000000000000..d34480b2c633c
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.icommentsresponse.md
@@ -0,0 +1,52 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ICommentsResponse
+
+# Interface: ICommentsResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ICommentsResponse
+
+## Hierarchy
+
+- *CommentsResponse*
+
+  ↳ **ICommentsResponse**
+
+## Table of contents
+
+### Properties
+
+- [comments](typedoc_interfaces.icommentsresponse.md#comments)
+- [page](typedoc_interfaces.icommentsresponse.md#page)
+- [per\_page](typedoc_interfaces.icommentsresponse.md#per_page)
+- [total](typedoc_interfaces.icommentsresponse.md#total)
+
+## Properties
+
+### comments
+
+• **comments**: { `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }[]
+
+Inherited from: CommentsResponse.comments
+
+___
+
+### page
+
+• **page**: *number*
+
+Inherited from: CommentsResponse.page
+
+___
+
+### per\_page
+
+• **per\_page**: *number*
+
+Inherited from: CommentsResponse.per\_page
+
+___
+
+### total
+
+• **total**: *number*
+
+Inherited from: CommentsResponse.total
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcaseresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcaseresponse.md
new file mode 100644
index 0000000000000..b33b280d2e753
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcaseresponse.md
@@ -0,0 +1,133 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ISubCaseResponse
+
+# Interface: ISubCaseResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ISubCaseResponse
+
+## Hierarchy
+
+- *SubCaseResponse*
+
+  ↳ **ISubCaseResponse**
+
+## Table of contents
+
+### Properties
+
+- [closed\_at](typedoc_interfaces.isubcaseresponse.md#closed_at)
+- [closed\_by](typedoc_interfaces.isubcaseresponse.md#closed_by)
+- [comments](typedoc_interfaces.isubcaseresponse.md#comments)
+- [created\_at](typedoc_interfaces.isubcaseresponse.md#created_at)
+- [created\_by](typedoc_interfaces.isubcaseresponse.md#created_by)
+- [id](typedoc_interfaces.isubcaseresponse.md#id)
+- [owner](typedoc_interfaces.isubcaseresponse.md#owner)
+- [status](typedoc_interfaces.isubcaseresponse.md#status)
+- [totalAlerts](typedoc_interfaces.isubcaseresponse.md#totalalerts)
+- [totalComment](typedoc_interfaces.isubcaseresponse.md#totalcomment)
+- [updated\_at](typedoc_interfaces.isubcaseresponse.md#updated_at)
+- [updated\_by](typedoc_interfaces.isubcaseresponse.md#updated_by)
+- [version](typedoc_interfaces.isubcaseresponse.md#version)
+
+## Properties
+
+### closed\_at
+
+• **closed\_at**: ``null`` \| *string*
+
+Inherited from: SubCaseResponse.closed\_at
+
+___
+
+### closed\_by
+
+• **closed\_by**: ``null`` \| { `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }
+
+Inherited from: SubCaseResponse.closed\_by
+
+___
+
+### comments
+
+• **comments**: *undefined* \| { `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }[]
+
+Inherited from: SubCaseResponse.comments
+
+___
+
+### created\_at
+
+• **created\_at**: *string*
+
+Inherited from: SubCaseResponse.created\_at
+
+___
+
+### created\_by
+
+• **created\_by**: ``null`` \| { `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }
+
+Inherited from: SubCaseResponse.created\_by
+
+___
+
+### id
+
+• **id**: *string*
+
+Inherited from: SubCaseResponse.id
+
+___
+
+### owner
+
+• **owner**: *string*
+
+Inherited from: SubCaseResponse.owner
+
+___
+
+### status
+
+• **status**: CaseStatuses
+
+Inherited from: SubCaseResponse.status
+
+___
+
+### totalAlerts
+
+• **totalAlerts**: *number*
+
+Inherited from: SubCaseResponse.totalAlerts
+
+___
+
+### totalComment
+
+• **totalComment**: *number*
+
+Inherited from: SubCaseResponse.totalComment
+
+___
+
+### updated\_at
+
+• **updated\_at**: ``null`` \| *string*
+
+Inherited from: SubCaseResponse.updated\_at
+
+___
+
+### updated\_by
+
+• **updated\_by**: ``null`` \| { `email`: *undefined* \| ``null`` \| *string* ; `full_name`: *undefined* \| ``null`` \| *string* ; `username`: *undefined* \| ``null`` \| *string*  }
+
+Inherited from: SubCaseResponse.updated\_by
+
+___
+
+### version
+
+• **version**: *string*
+
+Inherited from: SubCaseResponse.version
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcasesfindresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcasesfindresponse.md
new file mode 100644
index 0000000000000..35d63126f608a
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcasesfindresponse.md
@@ -0,0 +1,79 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ISubCasesFindResponse
+
+# Interface: ISubCasesFindResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ISubCasesFindResponse
+
+## Hierarchy
+
+- *SubCasesFindResponse*
+
+  ↳ **ISubCasesFindResponse**
+
+## Table of contents
+
+### Properties
+
+- [count\_closed\_cases](typedoc_interfaces.isubcasesfindresponse.md#count_closed_cases)
+- [count\_in\_progress\_cases](typedoc_interfaces.isubcasesfindresponse.md#count_in_progress_cases)
+- [count\_open\_cases](typedoc_interfaces.isubcasesfindresponse.md#count_open_cases)
+- [page](typedoc_interfaces.isubcasesfindresponse.md#page)
+- [per\_page](typedoc_interfaces.isubcasesfindresponse.md#per_page)
+- [subCases](typedoc_interfaces.isubcasesfindresponse.md#subcases)
+- [total](typedoc_interfaces.isubcasesfindresponse.md#total)
+
+## Properties
+
+### count\_closed\_cases
+
+• **count\_closed\_cases**: *number*
+
+Inherited from: SubCasesFindResponse.count\_closed\_cases
+
+___
+
+### count\_in\_progress\_cases
+
+• **count\_in\_progress\_cases**: *number*
+
+Inherited from: SubCasesFindResponse.count\_in\_progress\_cases
+
+___
+
+### count\_open\_cases
+
+• **count\_open\_cases**: *number*
+
+Inherited from: SubCasesFindResponse.count\_open\_cases
+
+___
+
+### page
+
+• **page**: *number*
+
+Inherited from: SubCasesFindResponse.page
+
+___
+
+### per\_page
+
+• **per\_page**: *number*
+
+Inherited from: SubCasesFindResponse.per\_page
+
+___
+
+### subCases
+
+• **subCases**: { `status`: CaseStatuses  } & { `closed_at`: ``null`` \| *string* ; `closed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `created_at`: *string* ; `created_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `totalAlerts`: *number* ; `totalComment`: *number* ; `version`: *string*  } & { `comments`: *undefined* \| { `comment`: *string* ; `owner`: *string* ; `type`: user  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  } & { `alertId`: *string* \| *string*[] ; `index`: *string* \| *string*[] ; `owner`: *string* ; `rule`: { id: string \| null; name: string \| null; } ; `type`: alert \| generatedAlert  } & { `associationType`: AssociationType ; `created_at`: *string* ; `created_by`: { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `owner`: *string* ; `pushed_at`: ``null`` \| *string* ; `pushed_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; } ; `updated_at`: ``null`` \| *string* ; `updated_by`: ``null`` \| { email: string \| null \| undefined; full\_name: string \| null \| undefined; username: string \| null \| undefined; }  } & { `id`: *string* ; `version`: *string*  }[]  }[]
+
+Inherited from: SubCasesFindResponse.subCases
+
+___
+
+### total
+
+• **total**: *number*
+
+Inherited from: SubCasesFindResponse.total
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcasesresponse.md b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcasesresponse.md
new file mode 100644
index 0000000000000..6ee45e59b53b5
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/typedoc_interfaces.isubcasesresponse.md
@@ -0,0 +1,11 @@
+[Cases Client API Interface](../cases_client_api.md) / [typedoc_interfaces](../modules/typedoc_interfaces.md) / ISubCasesResponse
+
+# Interface: ISubCasesResponse
+
+[typedoc_interfaces](../modules/typedoc_interfaces.md).ISubCasesResponse
+
+## Hierarchy
+
+- *SubCasesResponse*
+
+  ↳ **ISubCasesResponse**
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/user_actions_client.useractionget.md b/x-pack/plugins/cases/docs/cases_client/interfaces/user_actions_client.useractionget.md
new file mode 100644
index 0000000000000..2c0c084ab9b30
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/user_actions_client.useractionget.md
@@ -0,0 +1,34 @@
+[Cases Client API Interface](../cases_client_api.md) / [user_actions/client](../modules/user_actions_client.md) / UserActionGet
+
+# Interface: UserActionGet
+
+[user_actions/client](../modules/user_actions_client.md).UserActionGet
+
+Parameters for retrieving user actions for a particular case
+
+## Table of contents
+
+### Properties
+
+- [caseId](user_actions_client.useractionget.md#caseid)
+- [subCaseId](user_actions_client.useractionget.md#subcaseid)
+
+## Properties
+
+### caseId
+
+• **caseId**: *string*
+
+The ID of the case
+
+Defined in: [user_actions/client.ts:19](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/user_actions/client.ts#L19)
+
+___
+
+### subCaseId
+
+• `Optional` **subCaseId**: *string*
+
+If specified then a sub case will be used for finding all the user actions
+
+Defined in: [user_actions/client.ts:23](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/user_actions/client.ts#L23)
diff --git a/x-pack/plugins/cases/docs/cases_client/interfaces/user_actions_client.useractionssubclient.md b/x-pack/plugins/cases/docs/cases_client/interfaces/user_actions_client.useractionssubclient.md
new file mode 100644
index 0000000000000..f03667eccb858
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/interfaces/user_actions_client.useractionssubclient.md
@@ -0,0 +1,31 @@
+[Cases Client API Interface](../cases_client_api.md) / [user_actions/client](../modules/user_actions_client.md) / UserActionsSubClient
+
+# Interface: UserActionsSubClient
+
+[user_actions/client](../modules/user_actions_client.md).UserActionsSubClient
+
+API for interacting the actions performed by a user when interacting with the cases entities.
+
+## Table of contents
+
+### Methods
+
+- [getAll](user_actions_client.useractionssubclient.md#getall)
+
+## Methods
+
+### getAll
+
+▸ **getAll**(`clientArgs`: [*UserActionGet*](user_actions_client.useractionget.md)): *Promise*<[*ICaseUserActionsResponse*](typedoc_interfaces.icaseuseractionsresponse.md)\>
+
+Retrieves all user actions for a particular case.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `clientArgs` | [*UserActionGet*](user_actions_client.useractionget.md) |
+
+**Returns:** *Promise*<[*ICaseUserActionsResponse*](typedoc_interfaces.icaseuseractionsresponse.md)\>
+
+Defined in: [user_actions/client.ts:33](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/user_actions/client.ts#L33)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/attachments_add.md b/x-pack/plugins/cases/docs/cases_client/modules/attachments_add.md
new file mode 100644
index 0000000000000..d9ac6e6ce431b
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/attachments_add.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / attachments/add
+
+# Module: attachments/add
+
+## Table of contents
+
+### Interfaces
+
+- [AddArgs](../interfaces/attachments_add.addargs.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/attachments_client.md b/x-pack/plugins/cases/docs/cases_client/modules/attachments_client.md
new file mode 100644
index 0000000000000..47d96b98356e7
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/attachments_client.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / attachments/client
+
+# Module: attachments/client
+
+## Table of contents
+
+### Interfaces
+
+- [AttachmentsSubClient](../interfaces/attachments_client.attachmentssubclient.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/attachments_delete.md b/x-pack/plugins/cases/docs/cases_client/modules/attachments_delete.md
new file mode 100644
index 0000000000000..0e2cf420b6375
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/attachments_delete.md
@@ -0,0 +1,10 @@
+[Cases Client API Interface](../cases_client_api.md) / attachments/delete
+
+# Module: attachments/delete
+
+## Table of contents
+
+### Interfaces
+
+- [DeleteAllArgs](../interfaces/attachments_delete.deleteallargs.md)
+- [DeleteArgs](../interfaces/attachments_delete.deleteargs.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/attachments_get.md b/x-pack/plugins/cases/docs/cases_client/modules/attachments_get.md
new file mode 100644
index 0000000000000..99358d6683256
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/attachments_get.md
@@ -0,0 +1,11 @@
+[Cases Client API Interface](../cases_client_api.md) / attachments/get
+
+# Module: attachments/get
+
+## Table of contents
+
+### Interfaces
+
+- [FindArgs](../interfaces/attachments_get.findargs.md)
+- [GetAllArgs](../interfaces/attachments_get.getallargs.md)
+- [GetArgs](../interfaces/attachments_get.getargs.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/attachments_update.md b/x-pack/plugins/cases/docs/cases_client/modules/attachments_update.md
new file mode 100644
index 0000000000000..011fe531ede34
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/attachments_update.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / attachments/update
+
+# Module: attachments/update
+
+## Table of contents
+
+### Interfaces
+
+- [UpdateArgs](../interfaces/attachments_update.updateargs.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/cases_client.md b/x-pack/plugins/cases/docs/cases_client/modules/cases_client.md
new file mode 100644
index 0000000000000..c6e9cf17d9840
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/cases_client.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / cases/client
+
+# Module: cases/client
+
+## Table of contents
+
+### Interfaces
+
+- [CasesSubClient](../interfaces/cases_client.casessubclient.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/cases_get.md b/x-pack/plugins/cases/docs/cases_client/modules/cases_get.md
new file mode 100644
index 0000000000000..9e896881df17b
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/cases_get.md
@@ -0,0 +1,53 @@
+[Cases Client API Interface](../cases_client_api.md) / cases/get
+
+# Module: cases/get
+
+## Table of contents
+
+### Interfaces
+
+- [CaseIDsByAlertIDParams](../interfaces/cases_get.caseidsbyalertidparams.md)
+- [GetParams](../interfaces/cases_get.getparams.md)
+
+### Functions
+
+- [getReporters](cases_get.md#getreporters)
+- [getTags](cases_get.md#gettags)
+
+## Functions
+
+### getReporters
+
+▸ **getReporters**(`params`: AllReportersFindRequest, `clientArgs`: CasesClientArgs): *Promise*<User[]\>
+
+Retrieves the reporters from all the cases.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | AllReportersFindRequest |
+| `clientArgs` | CasesClientArgs |
+
+**Returns:** *Promise*<User[]\>
+
+Defined in: [cases/get.ts:279](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/get.ts#L279)
+
+___
+
+### getTags
+
+▸ **getTags**(`params`: AllTagsFindRequest, `clientArgs`: CasesClientArgs): *Promise*<string[]\>
+
+Retrieves the tags from all the cases.
+
+#### Parameters
+
+| Name | Type |
+| :------ | :------ |
+| `params` | AllTagsFindRequest |
+| `clientArgs` | CasesClientArgs |
+
+**Returns:** *Promise*<string[]\>
+
+Defined in: [cases/get.ts:217](https://github.com/jonathan-buttner/kibana/blob/2085a3b4480/x-pack/plugins/cases/server/client/cases/get.ts#L217)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/cases_push.md b/x-pack/plugins/cases/docs/cases_client/modules/cases_push.md
new file mode 100644
index 0000000000000..4be9df64bb420
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/cases_push.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / cases/push
+
+# Module: cases/push
+
+## Table of contents
+
+### Interfaces
+
+- [PushParams](../interfaces/cases_push.pushparams.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/client.md b/x-pack/plugins/cases/docs/cases_client/modules/client.md
new file mode 100644
index 0000000000000..7fb6b64253dd9
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/client.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / client
+
+# Module: client
+
+## Table of contents
+
+### Classes
+
+- [CasesClient](../classes/client.casesclient.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/configure_client.md b/x-pack/plugins/cases/docs/cases_client/modules/configure_client.md
new file mode 100644
index 0000000000000..7cfc43e3d0a88
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/configure_client.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / configure/client
+
+# Module: configure/client
+
+## Table of contents
+
+### Interfaces
+
+- [ConfigureSubClient](../interfaces/configure_client.configuresubclient.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/stats_client.md b/x-pack/plugins/cases/docs/cases_client/modules/stats_client.md
new file mode 100644
index 0000000000000..992a1a1ab501a
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/stats_client.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / stats/client
+
+# Module: stats/client
+
+## Table of contents
+
+### Interfaces
+
+- [StatsSubClient](../interfaces/stats_client.statssubclient.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/sub_cases_client.md b/x-pack/plugins/cases/docs/cases_client/modules/sub_cases_client.md
new file mode 100644
index 0000000000000..6bdf073566b1c
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/sub_cases_client.md
@@ -0,0 +1,9 @@
+[Cases Client API Interface](../cases_client_api.md) / sub_cases/client
+
+# Module: sub\_cases/client
+
+## Table of contents
+
+### Interfaces
+
+- [SubCasesClient](../interfaces/sub_cases_client.subcasesclient.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/typedoc_interfaces.md b/x-pack/plugins/cases/docs/cases_client/modules/typedoc_interfaces.md
new file mode 100644
index 0000000000000..4719d2a2719c0
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/typedoc_interfaces.md
@@ -0,0 +1,26 @@
+[Cases Client API Interface](../cases_client_api.md) / typedoc_interfaces
+
+# Module: typedoc\_interfaces
+
+This file defines simpler types for typedoc. This helps reduce the type alias expansion for the io-ts types because it
+can be very large. These types are equivalent to the io-ts aliases.
+
+## Table of contents
+
+### Interfaces
+
+- [IAllCommentsResponse](../interfaces/typedoc_interfaces.iallcommentsresponse.md)
+- [ICasePostRequest](../interfaces/typedoc_interfaces.icasepostrequest.md)
+- [ICaseResponse](../interfaces/typedoc_interfaces.icaseresponse.md)
+- [ICaseUserActionsResponse](../interfaces/typedoc_interfaces.icaseuseractionsresponse.md)
+- [ICasesConfigurePatch](../interfaces/typedoc_interfaces.icasesconfigurepatch.md)
+- [ICasesConfigureRequest](../interfaces/typedoc_interfaces.icasesconfigurerequest.md)
+- [ICasesConfigureResponse](../interfaces/typedoc_interfaces.icasesconfigureresponse.md)
+- [ICasesFindRequest](../interfaces/typedoc_interfaces.icasesfindrequest.md)
+- [ICasesFindResponse](../interfaces/typedoc_interfaces.icasesfindresponse.md)
+- [ICasesPatchRequest](../interfaces/typedoc_interfaces.icasespatchrequest.md)
+- [ICasesResponse](../interfaces/typedoc_interfaces.icasesresponse.md)
+- [ICommentsResponse](../interfaces/typedoc_interfaces.icommentsresponse.md)
+- [ISubCaseResponse](../interfaces/typedoc_interfaces.isubcaseresponse.md)
+- [ISubCasesFindResponse](../interfaces/typedoc_interfaces.isubcasesfindresponse.md)
+- [ISubCasesResponse](../interfaces/typedoc_interfaces.isubcasesresponse.md)
diff --git a/x-pack/plugins/cases/docs/cases_client/modules/user_actions_client.md b/x-pack/plugins/cases/docs/cases_client/modules/user_actions_client.md
new file mode 100644
index 0000000000000..b48e3faac2135
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client/modules/user_actions_client.md
@@ -0,0 +1,10 @@
+[Cases Client API Interface](../cases_client_api.md) / user_actions/client
+
+# Module: user\_actions/client
+
+## Table of contents
+
+### Interfaces
+
+- [UserActionGet](../interfaces/user_actions_client.useractionget.md)
+- [UserActionsSubClient](../interfaces/user_actions_client.useractionssubclient.md)
diff --git a/x-pack/plugins/cases/docs/cases_client_typedoc.json b/x-pack/plugins/cases/docs/cases_client_typedoc.json
new file mode 100644
index 0000000000000..5f67719b47574
--- /dev/null
+++ b/x-pack/plugins/cases/docs/cases_client_typedoc.json
@@ -0,0 +1,25 @@
+{
+  "entryPoints": [
+    "../server/client/client.ts",
+    "../server/client/typedoc_interfaces.ts",
+    "../server/client/attachments",
+    "../server/client/cases/client.ts",
+    "../server/client/cases/get.ts",
+    "../server/client/cases/push.ts",
+    "../server/client/configure/client.ts",
+    "../server/client/stats/client.ts",
+    "../server/client/sub_cases/client.ts",
+    "../server/client/user_actions/client.ts"
+  ],
+  "exclude": [
+    "**/mock.ts",
+    "../server/client/cases/+(mock.ts|utils.ts|utils.test.ts|types.ts)"
+  ],
+  "excludeExternals": true,
+  "out": "cases_client",
+  "theme": "markdown",
+  "plugin": "typedoc-plugin-markdown",
+  "entryDocument": "cases_client_api.md",
+  "readme": "none",
+  "name": "Cases Client API Interface"
+}
diff --git a/x-pack/plugins/cases/kibana.json b/x-pack/plugins/cases/kibana.json
index 4a534c29de804..c59800aaf9bcb 100644
--- a/x-pack/plugins/cases/kibana.json
+++ b/x-pack/plugins/cases/kibana.json
@@ -3,7 +3,7 @@
   "id": "cases",
   "kibanaVersion": "kibana",
   "extraPublicDirs": ["common"],
-  "requiredPlugins": ["actions", "esUiShared", "kibanaReact", "kibanaUtils", "triggersActionsUi"],
+  "requiredPlugins": ["actions", "esUiShared", "features", "kibanaReact", "kibanaUtils", "triggersActionsUi"],
   "optionalPlugins": [
     "spaces",
     "security"
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 cb90568982282..5246e09f6b0f3 100644
--- a/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
+++ b/x-pack/plugins/cases/public/common/lib/kibana/hooks.ts
@@ -104,29 +104,3 @@ export const useCurrentUser = (): AuthenticatedElasticUser | null => {
   }, [fetchUser]);
   return user;
 };
-
-export interface UseGetUserSavedObjectPermissions {
-  crud: boolean;
-  read: boolean;
-}
-
-export const useGetUserSavedObjectPermissions = () => {
-  const [
-    savedObjectsPermissions,
-    setSavedObjectsPermissions,
-  ] = useState<UseGetUserSavedObjectPermissions | null>(null);
-  const uiCapabilities = useKibana().services.application.capabilities;
-
-  useEffect(() => {
-    const capabilitiesCanUserCRUD: boolean =
-      typeof uiCapabilities.siem.crud === 'boolean' ? uiCapabilities.siem.crud : false;
-    const capabilitiesCanUserRead: boolean =
-      typeof uiCapabilities.siem.show === 'boolean' ? uiCapabilities.siem.show : false;
-    setSavedObjectsPermissions({
-      crud: capabilitiesCanUserCRUD,
-      read: capabilitiesCanUserRead,
-    });
-  }, [uiCapabilities]);
-
-  return savedObjectsPermissions;
-};
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 326163f6cdc03..ff03782447846 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
@@ -12,9 +12,15 @@ import { coreMock } from '../../../../../../../src/core/public/mocks';
 import { KibanaContextProvider } from '../../../../../../../src/plugins/kibana_react/public';
 import { StartServices } from '../../../types';
 import { EuiTheme } from '../../../../../../../src/plugins/kibana_react/common';
+import { securityMock } from '../../../../../security/public/mocks';
+import { triggersActionsUiMock } from '../../../../../triggers_actions_ui/public/mocks';
 
 export const createStartServicesMock = (): StartServices =>
-  (coreMock.createStart() as unknown) as StartServices;
+  (({
+    ...coreMock.createStart(),
+    security: securityMock.createStart(),
+    triggersActionsUi: triggersActionsUiMock.createStart(),
+  } as unknown) as StartServices);
 
 export const createWithKibanaMock = () => {
   const services = createStartServicesMock();
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 94ee5dd4f2743..9a08918a483a5 100644
--- a/x-pack/plugins/cases/public/common/mock/test_providers.tsx
+++ b/x-pack/plugins/cases/public/common/mock/test_providers.tsx
@@ -10,6 +10,8 @@ import { I18nProvider } from '@kbn/i18n/react';
 import React from 'react';
 import { BehaviorSubject } from 'rxjs';
 import { ThemeProvider } from 'styled-components';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
+import { OwnerProvider } from '../../components/owner_context';
 import {
   createKibanaContextProviderMock,
   createStartServicesMock,
@@ -29,7 +31,9 @@ const MockKibanaContextProvider = createKibanaContextProviderMock();
 const TestProvidersComponent: React.FC<Props> = ({ children }) => (
   <I18nProvider>
     <MockKibanaContextProvider>
-      <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>{children}</ThemeProvider>
+      <ThemeProvider theme={() => ({ eui: euiDarkVars, darkMode: true })}>
+        <OwnerProvider owner={[SECURITY_SOLUTION_OWNER]}>{children}</OwnerProvider>
+      </ThemeProvider>
     </MockKibanaContextProvider>
   </I18nProvider>
 );
diff --git a/x-pack/plugins/cases/public/common/translations.ts b/x-pack/plugins/cases/public/common/translations.ts
index 834bd1292ccdd..85cfb60b1d6b8 100644
--- a/x-pack/plugins/cases/public/common/translations.ts
+++ b/x-pack/plugins/cases/public/common/translations.ts
@@ -7,18 +7,18 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const SAVED_OBJECT_NO_PERMISSIONS_TITLE = i18n.translate(
-  'xpack.cases.caseSavedObjectNoPermissionsTitle',
+export const CASES_FEATURE_NO_PERMISSIONS_TITLE = i18n.translate(
+  'xpack.cases.caseFeatureNoPermissionsTitle',
   {
     defaultMessage: 'Kibana feature privileges required',
   }
 );
 
-export const SAVED_OBJECT_NO_PERMISSIONS_MSG = i18n.translate(
-  'xpack.cases.caseSavedObjectNoPermissionsMessage',
+export const CASES_FEATURE_NO_PERMISSIONS_MSG = i18n.translate(
+  'xpack.cases.caseFeatureNoPermissionsMessage',
   {
     defaultMessage:
-      'To view cases, you must have privileges for the Saved Object Management feature in the Kibana space. For more information, contact your Kibana administrator.',
+      'To view cases, you must have privileges for the Cases feature in the Kibana space. For more information, contact your Kibana administrator.',
   }
 );
 
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 d35a3dc6a7462..23a0fca48592f 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
@@ -13,7 +13,7 @@ import { noop } from 'lodash/fp';
 import { TestProviders } from '../../common/mock';
 import { Router, routeData, mockHistory, mockLocation } from '../__mock__/router';
 
-import { CommentRequest, CommentType } from '../../../common';
+import { CommentRequest, CommentType, SECURITY_SOLUTION_OWNER } from '../../../common';
 import { usePostComment } from '../../containers/use_post_comment';
 import { AddComment, AddCommentRefObject } from '.';
 import { CasesTimelineIntegrationProvider } from '../timeline_context';
@@ -44,6 +44,7 @@ const defaultPostComment = {
 const sampleData: CommentRequest = {
   comment: 'what a cool comment',
   type: CommentType.user,
+  owner: SECURITY_SOLUTION_OWNER,
 };
 
 describe('AddComment ', () => {
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 b4aadc85ad5a7..04104f0b9471d 100644
--- a/x-pack/plugins/cases/public/components/add_comment/index.tsx
+++ b/x-pack/plugins/cases/public/components/add_comment/index.tsx
@@ -18,6 +18,7 @@ import { Form, useForm, UseField, useFormData } from '../../common/shared_import
 import * as i18n from './translations';
 import { schema, AddCommentFormSchema } from './schema';
 import { InsertTimeline } from '../insert_timeline';
+import { useOwnerContext } from '../owner_context/use_owner_context';
 const MySpinner = styled(EuiLoadingSpinner)`
   position: absolute;
   top: 50%;
@@ -47,6 +48,7 @@ export const AddComment = React.memo(
       { caseId, disabled, onCommentPosted, onCommentSaving, showLoading = true, subCaseId },
       ref
     ) => {
+      const owner = useOwnerContext();
       const { isLoading, postComment } = usePostComment();
 
       const { form } = useForm<AddCommentFormSchema>({
@@ -78,13 +80,13 @@ export const AddComment = React.memo(
           }
           postComment({
             caseId,
-            data: { ...data, type: CommentType.user },
+            data: { ...data, type: CommentType.user, owner: owner[0] },
             updateCase: onCommentPosted,
             subCaseId,
           });
           reset();
         }
-      }, [caseId, onCommentPosted, onCommentSaving, postComment, reset, submit, subCaseId]);
+      }, [submit, onCommentSaving, postComment, caseId, owner, onCommentPosted, subCaseId, reset]);
 
       return (
         <span id="add-comment-permLink">
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.test.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.test.tsx
index 0e8d1da74b606..a0a5bb08ef770 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.test.tsx
@@ -14,7 +14,7 @@ import { useGetTags } from '../../containers/use_get_tags';
 import { useGetReporters } from '../../containers/use_get_reporters';
 import { useGetActionLicense } from '../../containers/use_get_action_license';
 import { StatusAll } from '../../containers/types';
-import { CaseStatuses } from '../../../common';
+import { CaseStatuses, SECURITY_SOLUTION_OWNER } from '../../../common';
 import { act } from 'react-dom/test-utils';
 
 jest.mock('../../containers/use_get_reporters');
@@ -32,6 +32,7 @@ const alertDataMock = {
   },
   index: 'index-id',
   alertId: 'alert-id',
+  owner: SECURITY_SOLUTION_OWNER,
 };
 
 describe('AllCasesGeneric ', () => {
diff --git a/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx b/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx
index 36527bd96700b..41509d9c0d135 100644
--- a/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/all_cases_generic.tsx
@@ -40,6 +40,7 @@ import { CasesTableFilters } from './table_filters';
 import { EuiBasicTableOnChange } from './types';
 
 import { CasesTable } from './table';
+
 const ProgressLoader = styled(EuiProgress)`
   ${({ $isShow }: { $isShow: boolean }) =>
     $isShow
@@ -81,6 +82,7 @@ export const AllCasesGeneric = React.memo<AllCasesGenericProps>(
     userCanCrud,
   }) => {
     const { actionLicense } = useGetActionLicense();
+
     const firstAvailableStatus = head(difference(caseStatuses, hiddenStatuses));
     const initialFilterOptions =
       !isEmpty(hiddenStatuses) && firstAvailableStatus ? { status: firstAvailableStatus } : {};
@@ -96,7 +98,7 @@ export const AllCasesGeneric = React.memo<AllCasesGenericProps>(
       setFilters,
       setQueryParams,
       setSelectedCases,
-    } = useGetCases({}, initialFilterOptions);
+    } = useGetCases({ initialFilterOptions });
 
     // Post Comment to Case
     const { postComment, isLoading: isCommentUpdating } = usePostComment();
diff --git a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
index 82db4a63115e4..5ed3215241de5 100644
--- a/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/index.test.tsx
@@ -13,7 +13,7 @@ import '../../common/mock/match_media';
 import { TestProviders } from '../../common/mock';
 import { casesStatus, useGetCasesMockState, collectionCase } from '../../containers/mock';
 
-import { CaseStatuses, CaseType, StatusAll } from '../../../common';
+import { CaseStatuses, CaseType, SECURITY_SOLUTION_OWNER, StatusAll } from '../../../common';
 import { getEmptyTagValue } from '../empty_value';
 import { useDeleteCases } from '../../containers/use_delete_cases';
 import { useGetCases } from '../../containers/use_get_cases';
@@ -53,6 +53,7 @@ describe('AllCasesGeneric', () => {
       onClick: jest.fn(),
     },
     userCanCrud: true,
+    owner: [SECURITY_SOLUTION_OWNER],
   };
 
   const dispatchResetIsDeleted = jest.fn();
@@ -815,6 +816,7 @@ describe('AllCasesGeneric', () => {
           },
         },
         id: '1',
+        owner: SECURITY_SOLUTION_OWNER,
         status: 'open',
         subCaseIds: [],
         tags: ['coke', 'pepsi'],
diff --git a/x-pack/plugins/cases/public/components/all_cases/index.tsx b/x-pack/plugins/cases/public/components/all_cases/index.tsx
index 2c506cd2da411..3d6c039aa001c 100644
--- a/x-pack/plugins/cases/public/components/all_cases/index.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/index.tsx
@@ -6,9 +6,11 @@
  */
 
 import React from 'react';
+import { Owner } from '../../types';
 import { CaseDetailsHrefSchema, CasesNavigation } from '../links';
+import { OwnerProvider } from '../owner_context';
 import { AllCasesGeneric } from './all_cases_generic';
-export interface AllCasesProps {
+export interface AllCasesProps extends Owner {
   caseDetailsNavigation: CasesNavigation<CaseDetailsHrefSchema, 'configurable'>; // if not passed, case name is not displayed as a link (Formerly dependant on isSelector)
   configureCasesNavigation: CasesNavigation; // if not passed, header with nav is not displayed (Formerly dependant on isSelector)
   createCaseNavigation: CasesNavigation;
@@ -16,7 +18,11 @@ export interface AllCasesProps {
 }
 
 export const AllCases: React.FC<AllCasesProps> = (props) => {
-  return <AllCasesGeneric {...props} />;
+  return (
+    <OwnerProvider owner={props.owner}>
+      <AllCasesGeneric {...props} />
+    </OwnerProvider>
+  );
 };
 
 // eslint-disable-next-line import/no-default-export
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.test.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.test.tsx
index 8793632bc1afb..2b34fd8b86e89 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.test.tsx
@@ -11,6 +11,7 @@ import { mount } from 'enzyme';
 import { AllCasesSelectorModal } from '.';
 import { TestProviders } from '../../../common/mock';
 import { AllCasesGeneric } from '../all_cases_generic';
+import { SECURITY_SOLUTION_OWNER } from '../../../../common';
 
 jest.mock('../../../methods');
 jest.mock('../all_cases_generic');
@@ -20,6 +21,7 @@ const defaultProps = {
   createCaseNavigation,
   onRowClick,
   userCanCrud: true,
+  owner: [SECURITY_SOLUTION_OWNER],
 };
 const updateCase = jest.fn();
 
@@ -59,6 +61,7 @@ describe('AllCasesSelectorModal', () => {
         },
         index: 'index-id',
         alertId: 'alert-id',
+        owner: SECURITY_SOLUTION_OWNER,
       },
       hiddenStatuses: [],
       updateCase,
diff --git a/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.tsx b/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.tsx
index d476d71d847a0..6e676ea58f14f 100644
--- a/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.tsx
+++ b/x-pack/plugins/cases/public/components/all_cases/selector_modal/index.tsx
@@ -17,8 +17,10 @@ import {
 import { CasesNavigation } from '../../links';
 import * as i18n from '../../../common/translations';
 import { AllCasesGeneric } from '../all_cases_generic';
+import { Owner } from '../../../types';
+import { OwnerProvider } from '../../owner_context';
 
-export interface AllCasesSelectorModalProps {
+export interface AllCasesSelectorModalProps extends Owner {
   alertData?: Omit<CommentRequestAlertType, 'type'>;
   createCaseNavigation: CasesNavigation;
   hiddenStatuses?: CaseStatusWithAllStatus[];
@@ -34,7 +36,7 @@ const Modal = styled(EuiModal)`
   `}
 `;
 
-export const AllCasesSelectorModal: React.FC<AllCasesSelectorModalProps> = ({
+const AllCasesSelectorModalComponent: React.FC<AllCasesSelectorModalProps> = ({
   alertData,
   createCaseNavigation,
   hiddenStatuses,
@@ -70,5 +72,13 @@ export const AllCasesSelectorModal: React.FC<AllCasesSelectorModalProps> = ({
     </Modal>
   ) : null;
 };
+
+export const AllCasesSelectorModal: React.FC<AllCasesSelectorModalProps> = React.memo((props) => {
+  return (
+    <OwnerProvider owner={props.owner}>
+      <AllCasesSelectorModalComponent {...props} />
+    </OwnerProvider>
+  );
+});
 // eslint-disable-next-line import/no-default-export
 export { AllCasesSelectorModal as default };
diff --git a/x-pack/plugins/cases/public/components/callout/helpers.tsx b/x-pack/plugins/cases/public/components/callout/helpers.tsx
index 2a7804579a57e..3409c5eb94245 100644
--- a/x-pack/plugins/cases/public/components/callout/helpers.tsx
+++ b/x-pack/plugins/cases/public/components/callout/helpers.tsx
@@ -13,8 +13,8 @@ import { ErrorMessage } from './types';
 
 export const savedObjectReadOnlyErrorMessage: ErrorMessage = {
   id: 'read-only-privileges-error',
-  title: i18n.READ_ONLY_SAVED_OBJECT_TITLE,
-  description: <>{i18n.READ_ONLY_SAVED_OBJECT_MSG}</>,
+  title: i18n.READ_ONLY_FEATURE_TITLE,
+  description: <>{i18n.READ_ONLY_FEATURE_MSG}</>,
   errorType: 'warning',
 };
 
diff --git a/x-pack/plugins/cases/public/components/callout/translations.ts b/x-pack/plugins/cases/public/components/callout/translations.ts
index 6d4b55603a06f..dca622e60c863 100644
--- a/x-pack/plugins/cases/public/components/callout/translations.ts
+++ b/x-pack/plugins/cases/public/components/callout/translations.ts
@@ -7,17 +7,14 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const READ_ONLY_SAVED_OBJECT_TITLE = i18n.translate('xpack.cases.readOnlySavedObjectTitle', {
+export const READ_ONLY_FEATURE_TITLE = i18n.translate('xpack.cases.readOnlyFeatureTitle', {
   defaultMessage: 'You cannot open new or update existing cases',
 });
 
-export const READ_ONLY_SAVED_OBJECT_MSG = i18n.translate(
-  'xpack.cases.readOnlySavedObjectDescription',
-  {
-    defaultMessage:
-      'You only have privileges to view cases. If you need to open and update cases, contact your Kibana administrator.',
-  }
-);
+export const READ_ONLY_FEATURE_MSG = i18n.translate('xpack.cases.readOnlyFeatureDescription', {
+  defaultMessage:
+    'You only have privileges to view cases. If you need to open and update cases, contact your Kibana administrator.',
+});
 
 export const DISMISS_CALLOUT = i18n.translate('xpack.cases.dismissErrorsPushServiceCallOutTitle', {
   defaultMessage: 'Dismiss',
diff --git a/x-pack/plugins/cases/public/components/case_action_bar/index.tsx b/x-pack/plugins/cases/public/components/case_action_bar/index.tsx
index 0f06dde6a86d1..a68ae4b3ca6a7 100644
--- a/x-pack/plugins/cases/public/components/case_action_bar/index.tsx
+++ b/x-pack/plugins/cases/public/components/case_action_bar/index.tsx
@@ -83,6 +83,7 @@ const CaseActionBarComponent: React.FC<CaseActionBarProps> = ({
                 <EuiDescriptionListDescription>
                   <StatusContextMenu
                     currentStatus={caseData.status}
+                    disabled={disabled || isLoading}
                     onStatusChanged={onStatusChanged}
                   />
                 </EuiDescriptionListDescription>
diff --git a/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.test.tsx b/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.test.tsx
index 29cca46d372f0..54cbbc5b6841f 100644
--- a/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.test.tsx
@@ -26,6 +26,18 @@ describe('SyncAlertsSwitch', () => {
     expect(wrapper.find(`[data-test-subj="case-view-status-dropdown"]`).exists()).toBeTruthy();
   });
 
+  it('it renders when disabled', async () => {
+    const wrapper = mount(
+      <StatusContextMenu
+        disabled={true}
+        currentStatus={CaseStatuses.open}
+        onStatusChanged={onStatusChanged}
+      />
+    );
+
+    expect(wrapper.find(`[data-test-subj="case-view-status-dropdown"]`).exists()).toBeTruthy();
+  });
+
   it('it renders the current status correctly', async () => {
     const wrapper = mount(
       <StatusContextMenu currentStatus={CaseStatuses.closed} onStatusChanged={onStatusChanged} />
diff --git a/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.tsx b/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.tsx
index 2922b797f9d40..65a220b65e403 100644
--- a/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.tsx
+++ b/x-pack/plugins/cases/public/components/case_action_bar/status_context_menu.tsx
@@ -13,16 +13,21 @@ import { Status } from '../status';
 
 interface Props {
   currentStatus: CaseStatuses;
+  disabled?: boolean;
   onStatusChanged: (status: CaseStatuses) => void;
 }
 
-const StatusContextMenuComponent: React.FC<Props> = ({ currentStatus, onStatusChanged }) => {
+const StatusContextMenuComponent: React.FC<Props> = ({
+  currentStatus,
+  onStatusChanged,
+  disabled = false,
+}) => {
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const closePopover = useCallback(() => setIsPopoverOpen(false), []);
   const openPopover = useCallback(() => setIsPopoverOpen(true), []);
   const popOverButton = useMemo(
-    () => <Status type={currentStatus} withArrow onClick={openPopover} />,
-    [currentStatus, openPopover]
+    () => <Status disabled={disabled} type={currentStatus} withArrow onClick={openPopover} />,
+    [disabled, currentStatus, openPopover]
   );
 
   const onContextMenuItemClick = useMemo(
diff --git a/x-pack/plugins/cases/public/components/case_view/helpers.test.tsx b/x-pack/plugins/cases/public/components/case_view/helpers.test.tsx
index f266c574c27da..bf5a9fe5d0a22 100644
--- a/x-pack/plugins/cases/public/components/case_view/helpers.test.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/helpers.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { AssociationType, CommentType } from '../../../common';
+import { AssociationType, CommentType, SECURITY_SOLUTION_OWNER } from '../../../common';
 import { Comment } from '../../containers/types';
 
 import { getManualAlertIdsWithNoRuleId } from './helpers';
@@ -28,6 +28,7 @@ const comments: Comment[] = [
     updatedAt: null,
     updatedBy: null,
     version: 'WzQ3LDFc',
+    owner: SECURITY_SOLUTION_OWNER,
   },
   {
     associationType: AssociationType.case,
@@ -46,6 +47,7 @@ const comments: Comment[] = [
     updatedAt: null,
     updatedBy: null,
     version: 'WzQ3LDFc',
+    owner: SECURITY_SOLUTION_OWNER,
   },
 ];
 
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 d13e3978ce618..f89218d5407eb 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
@@ -28,6 +28,7 @@ import { useConnectors } from '../../containers/configure/use_connectors';
 import { connectorsMock } from '../../containers/configure/mock';
 import { usePostPushToService } from '../../containers/use_post_push_to_service';
 import { CaseType, ConnectorTypes } from '../../../common';
+import { useKibana } from '../../common/lib/kibana';
 
 jest.mock('../../containers/use_update_case');
 jest.mock('../../containers/use_get_case_user_actions');
@@ -35,11 +36,13 @@ jest.mock('../../containers/use_get_case');
 jest.mock('../../containers/configure/use_connectors');
 jest.mock('../../containers/use_post_push_to_service');
 jest.mock('../user_action_tree/user_action_timestamp');
+jest.mock('../../common/lib/kibana');
 
 const useUpdateCaseMock = useUpdateCase as jest.Mock;
 const useGetCaseUserActionsMock = useGetCaseUserActions as jest.Mock;
 const useConnectorsMock = useConnectors as jest.Mock;
 const usePostPushToServiceMock = usePostPushToService as jest.Mock;
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 const alertsHit = [
   {
@@ -160,6 +163,10 @@ describe('CaseView ', () => {
       pushCaseToExternalService,
     }));
     useConnectorsMock.mockImplementation(() => ({ connectors: connectorsMock, loading: false }));
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow',
+      iconClass: 'logoSecurity',
+    });
   });
 
   it('should render CaseComponent', async () => {
diff --git a/x-pack/plugins/cases/public/components/case_view/index.tsx b/x-pack/plugins/cases/public/components/case_view/index.tsx
index 557f736c513b9..86b13ae5a863c 100644
--- a/x-pack/plugins/cases/public/components/case_view/index.tsx
+++ b/x-pack/plugins/cases/public/components/case_view/index.tsx
@@ -43,6 +43,7 @@ import { Ecs } from '../../../common';
 import { CasesTimelineIntegration, CasesTimelineIntegrationProvider } from '../timeline_context';
 import { useTimelineContext } from '../timeline_context/use_timeline_context';
 import { CasesNavigation } from '../links';
+import { OwnerProvider } from '../owner_context';
 
 const gutterTimeline = '70px'; // seems to be a timeline reference from the original file
 export interface CaseViewComponentProps {
@@ -450,6 +451,7 @@ export const CaseComponent = React.memo<CaseComponentProps>(
                   tags={caseData.tags}
                   onSubmit={onSubmitTags}
                   isLoading={isLoading && updateKey === 'tags'}
+                  owner={[caseData.owner]}
                 />
                 <EditConnector
                   caseFields={caseData.connector.fields}
@@ -509,22 +511,24 @@ export const CaseView = React.memo(
     return (
       data && (
         <CasesTimelineIntegrationProvider timelineIntegration={timelineIntegration}>
-          <CaseComponent
-            allCasesNavigation={allCasesNavigation}
-            caseData={data}
-            caseDetailsNavigation={caseDetailsNavigation}
-            caseId={caseId}
-            configureCasesNavigation={configureCasesNavigation}
-            getCaseDetailHrefWithCommentId={getCaseDetailHrefWithCommentId}
-            fetchCase={fetchCase}
-            onComponentInitialized={onComponentInitialized}
-            ruleDetailsNavigation={ruleDetailsNavigation}
-            showAlertDetails={showAlertDetails}
-            subCaseId={subCaseId}
-            updateCase={updateCase}
-            useFetchAlertData={useFetchAlertData}
-            userCanCrud={userCanCrud}
-          />
+          <OwnerProvider owner={[data.owner]}>
+            <CaseComponent
+              allCasesNavigation={allCasesNavigation}
+              caseData={data}
+              caseDetailsNavigation={caseDetailsNavigation}
+              caseId={caseId}
+              configureCasesNavigation={configureCasesNavigation}
+              getCaseDetailHrefWithCommentId={getCaseDetailHrefWithCommentId}
+              fetchCase={fetchCase}
+              onComponentInitialized={onComponentInitialized}
+              ruleDetailsNavigation={ruleDetailsNavigation}
+              showAlertDetails={showAlertDetails}
+              subCaseId={subCaseId}
+              updateCase={updateCase}
+              useFetchAlertData={useFetchAlertData}
+              userCanCrud={userCanCrud}
+            />
+          </OwnerProvider>
         </CasesTimelineIntegrationProvider>
       )
     );
diff --git a/x-pack/plugins/cases/public/components/configure_cases/__mock__/index.tsx b/x-pack/plugins/cases/public/components/configure_cases/__mock__/index.tsx
index e3abbeadd2d3c..6f02a209f22dc 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/__mock__/index.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/__mock__/index.tsx
@@ -45,6 +45,7 @@ export const useCaseConfigureResponse: ReturnUseCaseConfigure = {
   setCurrentConfiguration: jest.fn(),
   setMappings: jest.fn(),
   version: '',
+  id: '',
 };
 
 export const useConnectorsResponse: UseConnectorsResponse = {
diff --git a/x-pack/plugins/cases/public/components/configure_cases/button.tsx b/x-pack/plugins/cases/public/components/configure_cases/button.tsx
index 1830380be3765..8b3c78ee3aede 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/button.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/button.tsx
@@ -10,7 +10,6 @@ import React, { memo, useMemo } from 'react';
 import { CasesNavigation, LinkButton } from '../links';
 
 // TODO: Potentially move into links component?
-
 export interface ConfigureCaseButtonProps {
   configureCasesNavigation: CasesNavigation;
   isDisabled: boolean;
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx
index d5b9a885f2c6d..e5b1c66d01e1a 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors.test.tsx
@@ -13,6 +13,10 @@ import { TestProviders } from '../../common/mock';
 import { ConnectorsDropdown } from './connectors_dropdown';
 import { connectors } from './__mock__';
 import { ConnectorTypes } from '../../../common';
+import { useKibana } from '../../common/lib/kibana';
+
+jest.mock('../../common/lib/kibana');
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('Connectors', () => {
   let wrapper: ReactWrapper;
@@ -31,6 +35,10 @@ describe('Connectors', () => {
   };
 
   beforeAll(() => {
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: 'test',
+      iconClass: 'logoSecurity',
+    });
     wrapper = mount(<Connectors {...props} />, { wrappingComponent: TestProviders });
   });
 
diff --git a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx
index 86f80f772944a..141be31a093f1 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/connectors_dropdown.test.tsx
@@ -12,6 +12,10 @@ import { EuiSuperSelect } from '@elastic/eui';
 import { ConnectorsDropdown, Props } from './connectors_dropdown';
 import { TestProviders } from '../../common/mock';
 import { connectors } from './__mock__';
+import { useKibana } from '../../common/lib/kibana';
+
+jest.mock('../../common/lib/kibana');
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('ConnectorsDropdown', () => {
   let wrapper: ReactWrapper;
@@ -24,6 +28,10 @@ describe('ConnectorsDropdown', () => {
   };
 
   beforeAll(() => {
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow',
+      iconClass: 'logoSecurity',
+    });
     wrapper = mount(<ConnectorsDropdown {...props} />, { wrappingComponent: TestProviders });
   });
 
@@ -73,14 +81,7 @@ describe('ConnectorsDropdown', () => {
             >
               <Styled(EuiIcon)
                 size="m"
-                type={
-                  Object {
-                    "$$typeof": Symbol(react.lazy),
-                    "_ctor": [Function],
-                    "_result": null,
-                    "_status": -1,
-                  }
-                }
+                type="logoSecurity"
               />
             </EuiFlexItem>
             <EuiFlexItem>
@@ -103,14 +104,7 @@ describe('ConnectorsDropdown', () => {
             >
               <Styled(EuiIcon)
                 size="m"
-                type={
-                  Object {
-                    "$$typeof": Symbol(react.lazy),
-                    "_ctor": [Function],
-                    "_result": null,
-                    "_status": -1,
-                  }
-                }
+                type="logoSecurity"
               />
             </EuiFlexItem>
             <EuiFlexItem>
@@ -133,14 +127,7 @@ describe('ConnectorsDropdown', () => {
             >
               <Styled(EuiIcon)
                 size="m"
-                type={
-                  Object {
-                    "$$typeof": Symbol(react.lazy),
-                    "_ctor": [Function],
-                    "_result": null,
-                    "_status": -1,
-                  }
-                }
+                type="logoSecurity"
               />
             </EuiFlexItem>
             <EuiFlexItem>
@@ -163,14 +150,7 @@ describe('ConnectorsDropdown', () => {
             >
               <Styled(EuiIcon)
                 size="m"
-                type={
-                  Object {
-                    "$$typeof": Symbol(react.lazy),
-                    "_ctor": [Function],
-                    "_result": null,
-                    "_status": -1,
-                  }
-                }
+                type="logoSecurity"
               />
             </EuiFlexItem>
             <EuiFlexItem>
@@ -210,9 +190,13 @@ describe('ConnectorsDropdown', () => {
       wrappingComponent: TestProviders,
     });
 
-    expect(newWrapper.find('button span:not([data-euiicon-type])').at(1).text()).toBe(
-      'My Connector'
-    );
+    expect(
+      newWrapper
+        .find('[data-test-subj="dropdown-connectors"]')
+        .first()
+        .text()
+        .includes('My Connector, is selected')
+    ).toBeTruthy();
   });
 
   test('if the props hideConnectorServiceNowSir is true, the connector should not be part of the list of options  ', () => {
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 8c3a0f7ae1961..d26ec06d696fc 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
@@ -11,8 +11,8 @@ import styled from 'styled-components';
 
 import { ConnectorTypes } from '../../../common';
 import { ActionConnector } from '../../containers/configure/types';
-import { connectorsConfiguration } from '../connectors';
 import * as i18n from './translations';
+import { useKibana } from '../../common/lib/kibana';
 
 export interface Props {
   connectors: ActionConnector[];
@@ -65,6 +65,7 @@ const ConnectorsDropdownComponent: React.FC<Props> = ({
   appendAddConnectorButton = false,
   hideConnectorServiceNowSir = false,
 }) => {
+  const { triggersActionsUi } = useKibana().services;
   const connectorsAsOptions = useMemo(() => {
     const connectorsFormatted = connectors.reduce(
       (acc, connector) => {
@@ -80,7 +81,10 @@ const ConnectorsDropdownComponent: React.FC<Props> = ({
               <EuiFlexGroup gutterSize="none" alignItems="center" responsive={false}>
                 <EuiFlexItem grow={false}>
                   <EuiIconExtended
-                    type={connectorsConfiguration[connector.actionTypeId]?.logo ?? ''}
+                    type={
+                      triggersActionsUi.actionTypeRegistry.get(connector.actionTypeId)?.iconClass ??
+                      ''
+                    }
                     size={ICON_SIZE}
                   />
                 </EuiFlexItem>
diff --git a/x-pack/plugins/cases/public/components/configure_cases/field_mapping.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/field_mapping.test.tsx
index 8c2a66ad7ee53..73f48654b2299 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/field_mapping.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/field_mapping.test.tsx
@@ -12,6 +12,10 @@ import { FieldMapping, FieldMappingProps } from './field_mapping';
 import { mappings } from './__mock__';
 import { TestProviders } from '../../common/mock';
 import { FieldMappingRowStatic } from './field_mapping_row_static';
+import { useKibana } from '../../common/lib/kibana';
+
+jest.mock('../../common/lib/kibana');
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('FieldMappingRow', () => {
   let wrapper: ReactWrapper;
@@ -22,8 +26,13 @@ describe('FieldMappingRow', () => {
   };
 
   beforeAll(() => {
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow',
+      iconClass: 'logoSecurity',
+    });
     wrapper = mount(<FieldMapping {...props} />, { wrappingComponent: TestProviders });
   });
+
   test('it renders', () => {
     expect(
       wrapper.find('[data-test-subj="case-configure-field-mappings-row-wrapper"]').first().exists()
diff --git a/x-pack/plugins/cases/public/components/configure_cases/field_mapping.tsx b/x-pack/plugins/cases/public/components/configure_cases/field_mapping.tsx
index 7d5b72b583fae..b5ce978a1b481 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/field_mapping.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/field_mapping.tsx
@@ -13,7 +13,7 @@ import { FieldMappingRowStatic } from './field_mapping_row_static';
 import * as i18n from './translations';
 
 import { CaseConnectorMapping } from '../../containers/configure/types';
-import { connectorsConfiguration } from '../connectors';
+import { useKibana } from '../../common/lib/kibana';
 
 const FieldRowWrapper = styled.div`
   margin: 10px 0;
@@ -31,8 +31,10 @@ const FieldMappingComponent: React.FC<FieldMappingProps> = ({
   isLoading,
   mappings,
 }) => {
+  const { triggersActionsUi } = useKibana().services;
   const selectedConnector = useMemo(
-    () => connectorsConfiguration[connectorActionTypeId] ?? { fields: {} },
+    () => triggersActionsUi.actionTypeRegistry.get(connectorActionTypeId) ?? { fields: {} },
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [connectorActionTypeId]
   );
   return mappings.length ? (
@@ -45,7 +47,7 @@ const FieldMappingComponent: React.FC<FieldMappingProps> = ({
           </EuiFlexItem>
           <EuiFlexItem>
             <span className="euiFormLabel">
-              {i18n.FIELD_MAPPING_SECOND_COL(selectedConnector.name)}
+              {i18n.FIELD_MAPPING_SECOND_COL(selectedConnector.actionTypeTitle ?? '')}
             </span>
           </EuiFlexItem>
           <EuiFlexItem>
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 898d6cde19a77..7212a195f7911 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
@@ -7,18 +7,12 @@
 
 import React from 'react';
 import { ReactWrapper, mount } from 'enzyme';
+import { waitFor } from '@testing-library/react';
 
 import { ConfigureCases } from '.';
 import { TestProviders } from '../../common/mock';
 import { Connectors } from './connectors';
 import { ClosureOptions } from './closure_options';
-import {
-  ActionConnector,
-  ConnectorAddFlyout,
-  ConnectorEditFlyout,
-  TriggersAndActionsUIPublicPluginStart,
-} from '../../../../triggers_actions_ui/public';
-import { actionTypeRegistryMock } from '../../../../triggers_actions_ui/public/application/action_type_registry.mock';
 
 import { useKibana } from '../../common/lib/kibana';
 import { useConnectors } from '../../containers/configure/use_connectors';
@@ -32,7 +26,8 @@ import {
   useConnectorsResponse,
   useActionTypesResponse,
 } from './__mock__';
-import { ConnectorTypes } from '../../../common';
+import { ConnectorTypes, SECURITY_SOLUTION_OWNER } from '../../../common';
+import { actionTypeRegistryMock } from '../../../../triggers_actions_ui/public/application/action_type_registry.mock';
 
 jest.mock('../../common/lib/kibana');
 jest.mock('../../containers/configure/use_connectors');
@@ -46,52 +41,13 @@ const useGetUrlSearchMock = jest.fn();
 const useActionTypesMock = useActionTypes as jest.Mock;
 
 describe('ConfigureCases', () => {
+  beforeAll(() => {
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow',
+      iconClass: 'logoSecurity',
+    });
+  });
   beforeEach(() => {
-    useKibanaMock().services.triggersActionsUi = ({
-      actionTypeRegistry: actionTypeRegistryMock.create(),
-      getAddConnectorFlyout: jest.fn().mockImplementation(() => (
-        <ConnectorAddFlyout
-          onClose={() => {}}
-          actionTypeRegistry={actionTypeRegistryMock.create()}
-          actionTypes={[
-            {
-              id: '.servicenow',
-              name: 'servicenow',
-              enabled: true,
-              enabledInConfig: true,
-              enabledInLicense: true,
-              minimumLicenseRequired: 'gold',
-            },
-            {
-              id: '.jira',
-              name: 'jira',
-              enabled: true,
-              enabledInConfig: true,
-              enabledInLicense: true,
-              minimumLicenseRequired: 'gold',
-            },
-            {
-              id: '.resilient',
-              name: 'resilient',
-              enabled: true,
-              enabledInConfig: true,
-              enabledInLicense: true,
-              minimumLicenseRequired: 'gold',
-            },
-          ]}
-        />
-      )),
-      getEditConnectorFlyout: jest
-        .fn()
-        .mockImplementation(() => (
-          <ConnectorEditFlyout
-            onClose={() => {}}
-            actionTypeRegistry={actionTypeRegistryMock.create()}
-            initialConnector={connectors[1] as ActionConnector}
-          />
-        )),
-    } as unknown) as TriggersAndActionsUIPublicPluginStart;
-
     useActionTypesMock.mockImplementation(() => useActionTypesResponse);
   });
 
@@ -102,7 +58,9 @@ describe('ConfigureCases', () => {
       useConnectorsMock.mockImplementation(() => ({ ...useConnectorsResponse, connectors: [] }));
       useGetUrlSearchMock.mockImplementation(() => searchURL);
 
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
     });
 
     test('it renders the Connectors', () => {
@@ -114,13 +72,11 @@ describe('ConfigureCases', () => {
     });
 
     test('it does NOT render the ConnectorAddFlyout', () => {
-      // Components from triggersActionsUi  do not have a data-test-subj
-      expect(wrapper.find(ConnectorAddFlyout).exists()).toBeFalsy();
+      expect(wrapper.find('ConnectorAddFlyout').exists()).toBeFalsy();
     });
 
     test('it does NOT render the ConnectorEditFlyout', () => {
-      // Components from triggersActionsUi  do not have a data-test-subj
-      expect(wrapper.find(ConnectorEditFlyout).exists()).toBeFalsy();
+      expect(wrapper.find('ConnectorEditFlyout').exists()).toBeFalsy();
     });
 
     test('it does NOT render the EuiCallOut', () => {
@@ -155,7 +111,9 @@ describe('ConfigureCases', () => {
       }));
       useConnectorsMock.mockImplementation(() => ({ ...useConnectorsResponse, connectors: [] }));
       useGetUrlSearchMock.mockImplementation(() => searchURL);
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
     });
 
     test('it shows the warning callout when configuration is invalid', () => {
@@ -200,7 +158,9 @@ describe('ConfigureCases', () => {
       useConnectorsMock.mockImplementation(() => useConnectorsResponse);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
 
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
     });
 
     test('it renders with correct props', () => {
@@ -215,14 +175,17 @@ describe('ConfigureCases', () => {
       expect(wrapper.find(ClosureOptions).prop('closureTypeSelected')).toBe('close-by-user');
 
       // Flyouts
-      expect(wrapper.find(ConnectorAddFlyout).exists()).toBe(false);
-      expect(wrapper.find(ConnectorEditFlyout).exists()).toBe(false);
+      expect(wrapper.find('ConnectorAddFlyout').exists()).toBe(false);
+      expect(wrapper.find('ConnectorEditFlyout').exists()).toBe(false);
     });
 
     test('it disables correctly when the user cannot crud', () => {
-      const newWrapper = mount(<ConfigureCases userCanCrud={false} />, {
-        wrappingComponent: TestProviders,
-      });
+      const newWrapper = mount(
+        <ConfigureCases userCanCrud={false} owner={[SECURITY_SOLUTION_OWNER]} />,
+        {
+          wrappingComponent: TestProviders,
+        }
+      );
 
       expect(newWrapper.find('button[data-test-subj="dropdown-connectors"]').prop('disabled')).toBe(
         true
@@ -282,7 +245,9 @@ describe('ConfigureCases', () => {
       }));
 
       useGetUrlSearchMock.mockImplementation(() => searchURL);
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
     });
 
     test('it disables correctly Connector when loading connectors', () => {
@@ -315,7 +280,9 @@ describe('ConfigureCases', () => {
 
       useActionTypesMock.mockImplementation(() => ({ ...useActionTypesResponse, loading: true }));
 
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
       expect(wrapper.find(Connectors).prop('isLoading')).toBe(true);
     });
   });
@@ -337,7 +304,9 @@ describe('ConfigureCases', () => {
 
       useConnectorsMock.mockImplementation(() => useConnectorsResponse);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
     });
 
     test('it disables correctly Connector when saving configuration', () => {
@@ -378,7 +347,9 @@ describe('ConfigureCases', () => {
         ...useConnectorsResponse,
       }));
       useGetUrlSearchMock.mockImplementation(() => searchURL);
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
     });
 
     test('it hides the update connector button when loading the configuration', () => {
@@ -420,7 +391,9 @@ describe('ConfigureCases', () => {
       useConnectorsMock.mockImplementation(() => useConnectorsResponse);
       useGetUrlSearchMock.mockImplementation(() => searchURL);
 
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
     });
 
     test('it submits the configuration correctly when changing connector', () => {
@@ -462,7 +435,9 @@ describe('ConfigureCases', () => {
           },
         }));
 
-      wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+      wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+        wrappingComponent: TestProviders,
+      });
 
       wrapper.find('button[data-test-subj="dropdown-connectors"]').simulate('click');
       wrapper.update();
@@ -508,7 +483,9 @@ describe('closure options', () => {
     useConnectorsMock.mockImplementation(() => useConnectorsResponse);
     useGetUrlSearchMock.mockImplementation(() => searchURL);
 
-    wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+    wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+      wrappingComponent: TestProviders,
+    });
   });
 
   test('it submits the configuration correctly when changing closure type', () => {
@@ -554,36 +531,67 @@ describe('user interactions', () => {
     useGetUrlSearchMock.mockImplementation(() => searchURL);
   });
 
-  test('it show the add flyout when pressing the add connector button', () => {
-    const wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+  test('it show the add flyout when pressing the add connector button', async () => {
+    const wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+      wrappingComponent: TestProviders,
+    });
+
     wrapper.find('button[data-test-subj="dropdown-connectors"]').simulate('click');
-    wrapper.update();
     wrapper.find('button[data-test-subj="dropdown-connector-add-connector"]').simulate('click');
-    wrapper.update();
 
-    expect(wrapper.find(ConnectorAddFlyout).exists()).toBe(true);
-    expect(wrapper.find(ConnectorAddFlyout).prop('actionTypes')).toEqual([
-      expect.objectContaining({
-        id: '.servicenow',
-      }),
-      expect.objectContaining({
-        id: '.jira',
-      }),
-      expect.objectContaining({
-        id: '.resilient',
-      }),
-    ]);
+    await waitFor(() => {
+      wrapper.update();
+      expect(wrapper.find('ConnectorAddFlyout').exists()).toBe(true);
+      expect(wrapper.find('ConnectorAddFlyout').prop('actionTypes')).toEqual([
+        expect.objectContaining({
+          id: '.servicenow',
+        }),
+        expect.objectContaining({
+          id: '.jira',
+        }),
+        expect.objectContaining({
+          id: '.resilient',
+        }),
+        expect.objectContaining({
+          id: '.servicenow-sir',
+        }),
+      ]);
+    });
   });
 
-  test('it show the edit flyout when pressing the update connector button', () => {
-    const wrapper = mount(<ConfigureCases userCanCrud />, { wrappingComponent: TestProviders });
+  test('it show the edit flyout when pressing the update connector button', async () => {
+    const actionType = actionTypeRegistryMock.createMockActionTypeModel({
+      id: '.resilient',
+      validateConnector: () => {
+        return Promise.resolve({});
+      },
+      validateParams: () => {
+        const validationResult = { errors: {} };
+        return Promise.resolve(validationResult);
+      },
+      actionConnectorFields: null,
+    });
+
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest
+      .fn()
+      .mockReturnValue(actionType);
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.has = jest
+      .fn()
+      .mockReturnValue(true);
+
+    const wrapper = mount(<ConfigureCases userCanCrud owner={[SECURITY_SOLUTION_OWNER]} />, {
+      wrappingComponent: TestProviders,
+    });
     wrapper
       .find('button[data-test-subj="case-configure-update-selected-connector-button"]')
       .simulate('click');
-    wrapper.update();
 
-    expect(wrapper.find(ConnectorEditFlyout).exists()).toBe(true);
-    expect(wrapper.find(ConnectorEditFlyout).prop('initialConnector')).toEqual(connectors[1]);
+    await waitFor(() => {
+      wrapper.update();
+      expect(wrapper.find('ConnectorEditFlyout').exists()).toBe(true);
+      expect(wrapper.find('ConnectorEditFlyout').prop('initialConnector')).toEqual(connectors[1]);
+    });
+
     expect(
       wrapper.find('[data-test-subj="case-configure-action-bottom-bar"]').exists()
     ).toBeFalsy();
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 fdba148e5c61e..3ee4bc77cd237 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/index.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/index.tsx
@@ -31,6 +31,8 @@ import {
   normalizeCaseConnector,
 } from './utils';
 import * as i18n from './translations';
+import { Owner } from '../../types';
+import { OwnerProvider } from '../owner_context';
 
 const FormWrapper = styled.div`
   ${({ theme }) => css`
@@ -50,11 +52,11 @@ const FormWrapper = styled.div`
   `}
 `;
 
-export interface ConfigureCasesProps {
+export interface ConfigureCasesProps extends Owner {
   userCanCrud: boolean;
 }
 
-const ConfigureCasesComponent: React.FC<ConfigureCasesProps> = ({ userCanCrud }) => {
+const ConfigureCasesComponent: React.FC<Omit<ConfigureCasesProps, 'owner'>> = ({ userCanCrud }) => {
   const { triggersActionsUi } = useKibana().services;
 
   const [connectorIsValid, setConnectorIsValid] = useState(true);
@@ -223,6 +225,13 @@ const ConfigureCasesComponent: React.FC<ConfigureCasesProps> = ({ userCanCrud })
   );
 };
 
-export const ConfigureCases = React.memo(ConfigureCasesComponent);
+export const ConfigureCases: React.FC<ConfigureCasesProps> = React.memo((props) => {
+  return (
+    <OwnerProvider owner={props.owner}>
+      <ConfigureCasesComponent {...props} />
+    </OwnerProvider>
+  );
+});
+
 // eslint-disable-next-line import/no-default-export
 export default ConfigureCases;
diff --git a/x-pack/plugins/cases/public/components/configure_cases/mapping.test.tsx b/x-pack/plugins/cases/public/components/configure_cases/mapping.test.tsx
index 75b2410dde957..0a1da1219342e 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/mapping.test.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/mapping.test.tsx
@@ -11,6 +11,10 @@ import { mount } from 'enzyme';
 import { TestProviders } from '../../common/mock';
 import { Mapping, MappingProps } from './mapping';
 import { mappings } from './__mock__';
+import { useKibana } from '../../common/lib/kibana';
+
+jest.mock('../../common/lib/kibana');
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('Mapping', () => {
   const props: MappingProps = {
@@ -21,7 +25,12 @@ describe('Mapping', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: 'ServiceNow ITSM',
+      iconClass: 'logoSecurity',
+    });
   });
+
   test('it shows mapping form group', () => {
     const wrapper = mount(<Mapping {...props} />, { wrappingComponent: TestProviders });
     expect(wrapper.find('[data-test-subj="static-mappings"]').first().exists()).toBe(true);
diff --git a/x-pack/plugins/cases/public/components/configure_cases/mapping.tsx b/x-pack/plugins/cases/public/components/configure_cases/mapping.tsx
index 5ec6a33f48b6a..16c02606ae90b 100644
--- a/x-pack/plugins/cases/public/components/configure_cases/mapping.tsx
+++ b/x-pack/plugins/cases/public/components/configure_cases/mapping.tsx
@@ -14,7 +14,7 @@ import * as i18n from './translations';
 
 import { FieldMapping } from './field_mapping';
 import { CaseConnectorMapping } from '../../containers/configure/types';
-import { connectorsConfiguration } from '../connectors';
+import { useKibana } from '../../common/lib/kibana';
 
 export interface MappingProps {
   connectorActionTypeId: string;
@@ -27,21 +27,29 @@ const MappingComponent: React.FC<MappingProps> = ({
   isLoading,
   mappings,
 }) => {
-  const selectedConnector = useMemo(() => connectorsConfiguration[connectorActionTypeId], [
-    connectorActionTypeId,
-  ]);
+  const { triggersActionsUi } = useKibana().services;
+  const selectedConnector = useMemo(
+    () => triggersActionsUi.actionTypeRegistry.get(connectorActionTypeId),
+    [connectorActionTypeId, triggersActionsUi]
+  );
   const fieldMappingDesc: { desc: string; color: TextColor } = useMemo(
     () =>
       mappings.length > 0 || isLoading
-        ? { desc: i18n.FIELD_MAPPING_DESC(selectedConnector.name), color: 'subdued' }
-        : { desc: i18n.FIELD_MAPPING_DESC_ERR(selectedConnector.name), color: 'danger' },
-    [isLoading, mappings.length, selectedConnector.name]
+        ? {
+            desc: i18n.FIELD_MAPPING_DESC(selectedConnector.actionTypeTitle ?? ''),
+            color: 'subdued',
+          }
+        : {
+            desc: i18n.FIELD_MAPPING_DESC_ERR(selectedConnector.actionTypeTitle ?? ''),
+            color: 'danger',
+          },
+    [isLoading, mappings.length, selectedConnector.actionTypeTitle]
   );
   return (
     <EuiFlexGroup direction="column" gutterSize="none">
       <EuiFlexItem grow={false}>
         <EuiText size="xs">
-          <h4>{i18n.FIELD_MAPPING_TITLE(selectedConnector.name)}</h4>
+          <h4>{i18n.FIELD_MAPPING_TITLE(selectedConnector.actionTypeTitle ?? '')}</h4>
           <EuiTextColor data-test-subj="field-mapping-desc" color={fieldMappingDesc.color}>
             {fieldMappingDesc.desc}
           </EuiTextColor>
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 ec136989dd937..ea25fce2d4f7c 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
@@ -11,17 +11,23 @@ import { UseField, Form, useForm, FormHook } from '../../common/shared_imports';
 import { ConnectorSelector } from './form';
 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('../../common/lib/kibana');
 
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 const useFormMock = useForm as jest.Mock;
 
 describe('ConnectorSelector', () => {
   const formHookMock = getFormMock({ connectorId: connectorsMock[0].id });
 
   beforeEach(() => {
-    jest.resetAllMocks();
     useFormMock.mockImplementation(() => ({ form: formHookMock }));
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: 'test',
+      iconClass: 'logoSecurity',
+    });
   });
 
   it('it should render', async () => {
diff --git a/x-pack/plugins/cases/public/components/connectors/card.tsx b/x-pack/plugins/cases/public/components/connectors/card.tsx
index 82a508ccf3432..b27c7207e7b8a 100644
--- a/x-pack/plugins/cases/public/components/connectors/card.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/card.tsx
@@ -9,8 +9,8 @@ import React, { memo, useMemo } from 'react';
 import { EuiCard, EuiIcon, EuiLoadingSpinner } from '@elastic/eui';
 import styled from 'styled-components';
 
-import { connectorsConfiguration } from '.';
 import { ConnectorTypes } from '../../../common';
+import { useKibana } from '../../common/lib/kibana';
 
 interface ConnectorCardProps {
   connectorType: ConnectorTypes;
@@ -31,6 +31,8 @@ const ConnectorCardDisplay: React.FC<ConnectorCardProps> = ({
   listItems,
   isLoading,
 }) => {
+  const { triggersActionsUi } = useKibana().services;
+
   const description = useMemo(
     () => (
       <StyledText>
@@ -46,7 +48,13 @@ const ConnectorCardDisplay: React.FC<ConnectorCardProps> = ({
     [listItems]
   );
   const icon = useMemo(
-    () => <EuiIcon size="xl" type={connectorsConfiguration[`${connectorType}`]?.logo ?? ''} />,
+    () => (
+      <EuiIcon
+        size="xl"
+        type={triggersActionsUi.actionTypeRegistry.get(`${connectorType}`)?.iconClass ?? ''}
+      />
+    ),
+    // eslint-disable-next-line react-hooks/exhaustive-deps
     [connectorType]
   );
   return (
diff --git a/x-pack/plugins/cases/public/components/connectors/case/alert_fields.tsx b/x-pack/plugins/cases/public/components/connectors/case/alert_fields.tsx
index 0c44bcab70679..8fb34e0cdcbf5 100644
--- a/x-pack/plugins/cases/public/components/connectors/case/alert_fields.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/case/alert_fields.tsx
@@ -12,12 +12,13 @@ import styled from 'styled-components';
 import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 
 import { ActionParamsProps } from '../../../../../triggers_actions_ui/public/types';
-import { CommentType } from '../../../../common';
+import { CommentType, SECURITY_SOLUTION_OWNER } from '../../../../common';
 
 import { CaseActionParams } from './types';
 import { ExistingCase } from './existing_case';
 
 import * as i18n from './translations';
+import { OwnerProvider } from '../../owner_context';
 
 const Container = styled.div`
   ${({ theme }) => `
@@ -89,9 +90,15 @@ const CaseParamsFields: React.FunctionComponent<ActionParamsProps<CaseActionPara
     actionParams.subAction,
   ]);
 
+  /**
+   * TODO: When the case connector is enabled we need to figure out
+   * how we can pass the owner to this component
+   */
   return (
     <Container>
-      <ExistingCase onCaseChanged={onCaseChanged} selectedCase={selectedCase} />
+      <OwnerProvider owner={[SECURITY_SOLUTION_OWNER]}>
+        <ExistingCase onCaseChanged={onCaseChanged} selectedCase={selectedCase} />
+      </OwnerProvider>
       <EuiSpacer size="m" />
       <EuiCallOut size="s" title={i18n.CASE_CONNECTOR_CALL_OUT_TITLE} iconType="iInCircle">
         <p>{i18n.CASE_CONNECTOR_CALL_OUT_MSG}</p>
diff --git a/x-pack/plugins/cases/public/components/connectors/case/existing_case.tsx b/x-pack/plugins/cases/public/components/connectors/case/existing_case.tsx
index 22798843dd856..aafbfb8b43b78 100644
--- a/x-pack/plugins/cases/public/components/connectors/case/existing_case.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/case/existing_case.tsx
@@ -21,9 +21,12 @@ interface ExistingCaseProps {
 }
 
 const ExistingCaseComponent: React.FC<ExistingCaseProps> = ({ onCaseChanged, selectedCase }) => {
-  const { data: cases, loading: isLoadingCases, refetchCases } = useGetCases(DEFAULT_QUERY_PARAMS, {
-    ...DEFAULT_FILTER_OPTIONS,
-    onlyCollectionType: true,
+  const { data: cases, loading: isLoadingCases, refetchCases } = useGetCases({
+    initialQueryParams: DEFAULT_QUERY_PARAMS,
+    initialFilterOptions: {
+      ...DEFAULT_FILTER_OPTIONS,
+      onlyCollectionType: true,
+    },
   });
 
   const onCaseCreated = useCallback(
diff --git a/x-pack/plugins/cases/public/components/connectors/case/index.ts b/x-pack/plugins/cases/public/components/connectors/case/index.ts
index c2cf4980da7ec..8e6680cd65387 100644
--- a/x-pack/plugins/cases/public/components/connectors/case/index.ts
+++ b/x-pack/plugins/cases/public/components/connectors/case/index.ts
@@ -25,7 +25,7 @@ const validateParams = (actionParams: CaseActionParams) => {
     validationResult.errors.caseId.push(i18n.CASE_CONNECTOR_CASE_REQUIRED);
   }
 
-  return validationResult;
+  return Promise.resolve(validationResult);
 };
 
 export function getActionType(): ActionTypeModel {
@@ -34,7 +34,7 @@ export function getActionType(): ActionTypeModel {
     iconClass: 'securityAnalyticsApp',
     selectMessage: i18n.CASE_CONNECTOR_DESC,
     actionTypeTitle: i18n.CASE_CONNECTOR_TITLE,
-    validateConnector: () => ({ config: { errors: {} }, secrets: { errors: {} } }),
+    validateConnector: () => Promise.resolve({ config: { errors: {} }, secrets: { errors: {} } }),
     validateParams,
     actionConnectorFields: null,
     actionParamsFields: lazy(() => import('./alert_fields')),
diff --git a/x-pack/plugins/cases/public/components/connectors/config.ts b/x-pack/plugins/cases/public/components/connectors/config.ts
deleted file mode 100644
index e8d87511c7e17..0000000000000
--- a/x-pack/plugins/cases/public/components/connectors/config.ts
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  getResilientActionType,
-  getServiceNowITSMActionType,
-  getServiceNowSIRActionType,
-  getJiraActionType,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../../triggers_actions_ui/public/common';
-import { ConnectorConfiguration } from './types';
-
-const resilient = getResilientActionType();
-const serviceNowITSM = getServiceNowITSMActionType();
-const serviceNowSIR = getServiceNowSIRActionType();
-const jira = getJiraActionType();
-
-export const connectorsConfiguration: Record<string, ConnectorConfiguration> = {
-  '.servicenow': {
-    name: serviceNowITSM.actionTypeTitle ?? '',
-    logo: serviceNowITSM.iconClass,
-  },
-  '.servicenow-sir': {
-    name: serviceNowSIR.actionTypeTitle ?? '',
-    logo: serviceNowSIR.iconClass,
-  },
-  '.jira': {
-    name: jira.actionTypeTitle ?? '',
-    logo: jira.iconClass,
-  },
-  '.resilient': {
-    name: resilient.actionTypeTitle ?? '',
-    logo: resilient.iconClass,
-  },
-};
diff --git a/x-pack/plugins/cases/public/components/connectors/index.ts b/x-pack/plugins/cases/public/components/connectors/index.ts
index 71ba161eb63c9..2a7d59ca7b040 100644
--- a/x-pack/plugins/cases/public/components/connectors/index.ts
+++ b/x-pack/plugins/cases/public/components/connectors/index.ts
@@ -19,7 +19,6 @@ import {
 
 export { getActionType as getCaseConnectorUi } from './case';
 
-export * from './config';
 export * from './types';
 
 interface GetCaseConnectorsReturn {
diff --git a/x-pack/plugins/cases/public/components/connectors/jira/case_fields.test.tsx b/x-pack/plugins/cases/public/components/connectors/jira/case_fields.test.tsx
index 38a1e30616200..ae9245534c78a 100644
--- a/x-pack/plugins/cases/public/components/connectors/jira/case_fields.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/jira/case_fields.test.tsx
@@ -9,6 +9,7 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { omit } from 'lodash/fp';
 
+import { useKibana } from '../../../common/lib/kibana';
 import { connector, issues } from '../mock';
 import { useGetIssueTypes } from './use_get_issue_types';
 import { useGetFieldsByIssueType } from './use_get_fields_by_issue_type';
@@ -27,6 +28,7 @@ const useGetIssueTypesMock = useGetIssueTypes as jest.Mock;
 const useGetFieldsByIssueTypeMock = useGetFieldsByIssueType as jest.Mock;
 const useGetSingleIssueMock = useGetSingleIssue as jest.Mock;
 const useGetIssuesMock = useGetIssues as jest.Mock;
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 describe('Jira Fields', () => {
   const useGetIssueTypesResponse = {
@@ -87,6 +89,10 @@ describe('Jira Fields', () => {
     useGetIssueTypesMock.mockReturnValue(useGetIssueTypesResponse);
     useGetFieldsByIssueTypeMock.mockReturnValue(useGetFieldsByIssueTypeResponse);
     useGetSingleIssueMock.mockReturnValue(useGetSingleIssueResponse);
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.jira',
+      iconClass: 'logoSecurity',
+    });
     jest.clearAllMocks();
   });
 
@@ -144,6 +150,7 @@ describe('Jira Fields', () => {
       priority: 'High',
     });
   });
+
   test('it searches parent correctly', async () => {
     useGetFieldsByIssueTypeMock.mockReturnValue({
       ...useGetFieldsByIssueTypeResponse,
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx
index 9688ca191d672..b14842bbf1bbf 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_itsm_case_fields.test.tsx
@@ -10,6 +10,7 @@ import { waitFor, act } from '@testing-library/react';
 import { EuiSelect } from '@elastic/eui';
 import { mount } from 'enzyme';
 
+import { useKibana } from '../../../common/lib/kibana';
 import { connector, choices as mockChoices } from '../mock';
 import { Choice } from './types';
 import Fields from './servicenow_itsm_case_fields';
@@ -24,6 +25,8 @@ jest.mock('./use_get_choices', () => ({
   },
 }));
 
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
+
 describe('ServiceNowITSM Fields', () => {
   const fields = {
     severity: '1',
@@ -36,6 +39,10 @@ describe('ServiceNowITSM Fields', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow',
+      iconClass: 'logoSecurity',
+    });
   });
 
   it('all params fields are rendered - isEdit: true', () => {
diff --git a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx
index 4a5b34cd3c3cb..7d42c90a436f7 100644
--- a/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx
+++ b/x-pack/plugins/cases/public/components/connectors/servicenow/servicenow_sir_case_fields.test.tsx
@@ -10,6 +10,7 @@ import { mount } from 'enzyme';
 import { waitFor, act } from '@testing-library/react';
 import { EuiSelect } from '@elastic/eui';
 
+import { useKibana } from '../../../common/lib/kibana';
 import { connector, choices as mockChoices } from '../mock';
 import { Choice } from './types';
 import Fields from './servicenow_sir_case_fields';
@@ -24,6 +25,8 @@ jest.mock('./use_get_choices', () => ({
   },
 }));
 
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
+
 describe('ServiceNowSIR Fields', () => {
   const fields = {
     destIp: true,
@@ -38,6 +41,10 @@ describe('ServiceNowSIR Fields', () => {
 
   beforeEach(() => {
     jest.clearAllMocks();
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow-sir',
+      iconClass: 'logoSecurity',
+    });
   });
 
   it('all params fields are rendered - isEdit: true', () => {
diff --git a/x-pack/plugins/cases/public/components/connectors/types.ts b/x-pack/plugins/cases/public/components/connectors/types.ts
index 1657153ab645b..4eb97513b9f58 100644
--- a/x-pack/plugins/cases/public/components/connectors/types.ts
+++ b/x-pack/plugins/cases/public/components/connectors/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { IconType } from '@elastic/eui/src/components/icon/icon';
+import { IconType } from '@elastic/eui';
 import React from 'react';
 
 import {
diff --git a/x-pack/plugins/cases/public/components/create/connector.test.tsx b/x-pack/plugins/cases/public/components/create/connector.test.tsx
index 9eb475f54221d..b2a8838774b09 100644
--- a/x-pack/plugins/cases/public/components/create/connector.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/connector.test.tsx
@@ -25,6 +25,14 @@ jest.mock('../../common/lib/kibana', () => {
       services: {
         notifications: {},
         http: {},
+        triggersActionsUi: {
+          actionTypeRegistry: {
+            get: jest.fn().mockReturnValue({
+              actionTypeTitle: 'test',
+              iconClass: 'logoSecurity',
+            }),
+          },
+        },
       },
     }),
   };
diff --git a/x-pack/plugins/cases/public/components/create/flyout.test.tsx b/x-pack/plugins/cases/public/components/create/flyout.test.tsx
deleted file mode 100644
index 5187029ab60c7..0000000000000
--- a/x-pack/plugins/cases/public/components/create/flyout.test.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, { ReactNode } from 'react';
-import { mount } from 'enzyme';
-
-import { CreateCaseFlyout } from './flyout';
-import { TestProviders } from '../../common/mock';
-
-jest.mock('../create/form_context', () => {
-  return {
-    FormContext: ({
-      children,
-      onSuccess,
-    }: {
-      children: ReactNode;
-      onSuccess: ({ id }: { id: string }) => Promise<void>;
-    }) => {
-      return (
-        <>
-          <button
-            type="button"
-            data-test-subj="form-context-on-success"
-            onClick={async () => {
-              await onSuccess({ id: 'case-id' });
-            }}
-          >
-            {'submit'}
-          </button>
-          {children}
-        </>
-      );
-    },
-  };
-});
-
-jest.mock('../create/form', () => {
-  return {
-    CreateCaseForm: () => {
-      return <>{'form'}</>;
-    },
-  };
-});
-
-jest.mock('../create/submit_button', () => {
-  return {
-    SubmitCaseButton: () => {
-      return <>{'Submit'}</>;
-    },
-  };
-});
-
-const onCloseFlyout = jest.fn();
-const onSuccess = jest.fn();
-const defaultProps = {
-  onCloseFlyout,
-  onSuccess,
-};
-
-describe('CreateCaseFlyout', () => {
-  beforeEach(() => {
-    jest.resetAllMocks();
-  });
-
-  it('renders', () => {
-    const wrapper = mount(
-      <TestProviders>
-        <CreateCaseFlyout {...defaultProps} />
-      </TestProviders>
-    );
-
-    expect(wrapper.find(`[data-test-subj='create-case-flyout']`).exists()).toBeTruthy();
-  });
-
-  it('Closing modal calls onCloseCaseModal', () => {
-    const wrapper = mount(
-      <TestProviders>
-        <CreateCaseFlyout {...defaultProps} />
-      </TestProviders>
-    );
-
-    wrapper.find('.euiFlyout__closeButton').first().simulate('click');
-    expect(onCloseFlyout).toBeCalled();
-  });
-
-  it('pass the correct props to FormContext component', () => {
-    const wrapper = mount(
-      <TestProviders>
-        <CreateCaseFlyout {...defaultProps} />
-      </TestProviders>
-    );
-
-    const props = wrapper.find('FormContext').props();
-    expect(props).toEqual(
-      expect.objectContaining({
-        onSuccess,
-      })
-    );
-  });
-
-  it('onSuccess called when creating a case', () => {
-    const wrapper = mount(
-      <TestProviders>
-        <CreateCaseFlyout {...defaultProps} />
-      </TestProviders>
-    );
-
-    wrapper.find(`[data-test-subj='form-context-on-success']`).first().simulate('click');
-    expect(onSuccess).toHaveBeenCalledWith({ id: 'case-id' });
-  });
-});
diff --git a/x-pack/plugins/cases/public/components/create/flyout.tsx b/x-pack/plugins/cases/public/components/create/flyout.tsx
deleted file mode 100644
index 8ed09865e9eab..0000000000000
--- a/x-pack/plugins/cases/public/components/create/flyout.tsx
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { memo } from 'react';
-import styled from 'styled-components';
-import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eui';
-
-import { FormContext } from '../create/form_context';
-import { CreateCaseForm } from '../create/form';
-import { SubmitCaseButton } from '../create/submit_button';
-import { Case } from '../../containers/types';
-import * as i18n from '../../common/translations';
-
-export interface CreateCaseModalProps {
-  onCloseFlyout: () => void;
-  onSuccess: (theCase: Case) => Promise<void>;
-  afterCaseCreated?: (theCase: Case) => Promise<void>;
-}
-
-const Container = styled.div`
-  ${({ theme }) => `
-    margin-top: ${theme.eui.euiSize};
-    text-align: right;
-  `}
-`;
-
-const StyledFlyout = styled(EuiFlyout)`
-  ${({ theme }) => `
-    z-index: ${theme.eui.euiZModal};
-  `}
-`;
-
-// Adding bottom padding because timeline's
-// bottom bar gonna hide the submit button.
-const FormWrapper = styled.div`
-  padding-bottom: 50px;
-`;
-
-const CreateCaseFlyoutComponent: React.FC<CreateCaseModalProps> = ({
-  onSuccess,
-  afterCaseCreated,
-  onCloseFlyout,
-}) => {
-  return (
-    <StyledFlyout onClose={onCloseFlyout} data-test-subj="create-case-flyout">
-      <EuiFlyoutHeader hasBorder>
-        <EuiTitle size="m">
-          <h2>{i18n.CREATE_TITLE}</h2>
-        </EuiTitle>
-      </EuiFlyoutHeader>
-      <EuiFlyoutBody>
-        <FormWrapper>
-          <FormContext onSuccess={onSuccess} afterCaseCreated={afterCaseCreated}>
-            <CreateCaseForm withSteps={false} />
-            <Container>
-              <SubmitCaseButton />
-            </Container>
-          </FormContext>
-        </FormWrapper>
-      </EuiFlyoutBody>
-    </StyledFlyout>
-  );
-};
-
-export const CreateCaseFlyout = memo(CreateCaseFlyoutComponent);
-
-CreateCaseFlyout.displayName = 'CreateCaseFlyout';
diff --git a/x-pack/plugins/cases/public/components/create/form.test.tsx b/x-pack/plugins/cases/public/components/create/form.test.tsx
index 9e59924bdf483..5f3b778a7cafc 100644
--- a/x-pack/plugins/cases/public/components/create/form.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/form.test.tsx
@@ -15,6 +15,8 @@ import { useConnectors } from '../../containers/configure/use_connectors';
 import { connectorsMock } from '../../containers/mock';
 import { schema, FormProps } from './schema';
 import { CreateCaseForm } from './form';
+import { OwnerProvider } from '../owner_context';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
 
 jest.mock('../../containers/use_get_tags');
 jest.mock('../../containers/configure/use_connectors');
@@ -41,7 +43,11 @@ describe('CreateCaseForm', () => {
 
     globalForm = form;
 
-    return <Form form={form}>{children}</Form>;
+    return (
+      <OwnerProvider owner={[SECURITY_SOLUTION_OWNER]}>
+        <Form form={form}>{children}</Form>
+      </OwnerProvider>
+    );
   };
 
   beforeEach(() => {
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 9a8671c7fc571..e083f11ced777 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
@@ -10,7 +10,8 @@ import { mount, ReactWrapper } from 'enzyme';
 import { act, waitFor } from '@testing-library/react';
 import { EuiComboBox, EuiComboBoxOptionOption } from '@elastic/eui';
 
-import { ConnectorTypes } from '../../../common';
+import { ConnectorTypes, SECURITY_SOLUTION_OWNER } from '../../../common';
+import { useKibana } from '../../common/lib/kibana';
 import { TestProviders } from '../../common/mock';
 import { usePostCase } from '../../containers/use_post_case';
 import { usePostComment } from '../../containers/use_post_comment';
@@ -54,6 +55,7 @@ jest.mock('../connectors/jira/use_get_fields_by_issue_type');
 jest.mock('../connectors/jira/use_get_single_issue');
 jest.mock('../connectors/jira/use_get_issues');
 jest.mock('../connectors/servicenow/use_get_choices');
+jest.mock('../../common/lib/kibana');
 
 const useConnectorsMock = useConnectors as jest.Mock;
 const useCaseConfigureMock = useCaseConfigure as jest.Mock;
@@ -67,6 +69,7 @@ const useGetFieldsByIssueTypeMock = useGetFieldsByIssueType as jest.Mock;
 const useGetChoicesMock = useGetChoices as jest.Mock;
 const postCase = jest.fn();
 const pushCaseToExternalService = jest.fn();
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 const defaultPostCase = {
   isLoading: false,
@@ -77,6 +80,7 @@ const defaultPostCase = {
 const defaultCreateCaseForm = {
   isLoadingConnectors: false,
   connectors: [],
+  owner: SECURITY_SOLUTION_OWNER,
 };
 
 const defaultPostPushToService = {
@@ -129,7 +133,12 @@ describe('Create case', () => {
       tags: sampleTags,
       fetchTags,
     }));
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow',
+      iconClass: 'logoSecurity',
+    });
   });
+
   beforeEach(() => {
     jest.clearAllMocks();
   });
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 7ca3fe4b88c8d..8584892e1286c 100644
--- a/x-pack/plugins/cases/public/components/create/form_context.tsx
+++ b/x-pack/plugins/cases/public/components/create/form_context.tsx
@@ -21,6 +21,7 @@ import { useCaseConfigure } from '../../containers/configure/use_configure';
 import { Case } from '../../containers/types';
 import { CaseType, ConnectorTypes } from '../../../common';
 import { UsePostComment, usePostComment } from '../../containers/use_post_comment';
+import { useOwnerContext } from '../owner_context/use_owner_context';
 
 const initialCaseValue: FormProps = {
   description: '',
@@ -47,6 +48,7 @@ export const FormContext: React.FC<Props> = ({
   onSuccess,
 }) => {
   const { connectors, loading: isLoadingConnectors } = useConnectors();
+  const owner = useOwnerContext();
   const { connector: configurationConnector } = useCaseConfigure();
   const { postCase } = usePostCase();
   const { postComment } = usePostComment();
@@ -86,6 +88,7 @@ export const FormContext: React.FC<Props> = ({
           type: caseType,
           connector: connectorToUpdate,
           settings: { syncAlerts },
+          owner: owner[0],
         });
 
         if (afterCaseCreated && updatedCase) {
@@ -105,13 +108,14 @@ export const FormContext: React.FC<Props> = ({
       }
     },
     [
-      caseType,
       connectors,
       postCase,
-      postComment,
+      caseType,
+      owner,
+      afterCaseCreated,
       onSuccess,
+      postComment,
       pushCaseToExternalService,
-      afterCaseCreated,
     ]
   );
 
diff --git a/x-pack/plugins/cases/public/components/create/index.test.tsx b/x-pack/plugins/cases/public/components/create/index.test.tsx
index e82af8edc6337..350b971bb05fc 100644
--- a/x-pack/plugins/cases/public/components/create/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/index.test.tsx
@@ -29,6 +29,7 @@ import {
   useGetFieldsByIssueTypeResponse,
 } from './mock';
 import { CreateCase } from '.';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
 
 jest.mock('../../containers/api');
 jest.mock('../../containers/use_get_tags');
@@ -91,7 +92,7 @@ describe('CreateCase case', () => {
   it('it renders', async () => {
     const wrapper = mount(
       <TestProviders>
-        <CreateCase {...defaultProps} />
+        <CreateCase {...defaultProps} owner={[SECURITY_SOLUTION_OWNER]} />
       </TestProviders>
     );
 
@@ -102,7 +103,7 @@ describe('CreateCase case', () => {
   it('should call cancel on cancel click', async () => {
     const wrapper = mount(
       <TestProviders>
-        <CreateCase {...defaultProps} />
+        <CreateCase {...defaultProps} owner={[SECURITY_SOLUTION_OWNER]} />
       </TestProviders>
     );
 
@@ -113,7 +114,7 @@ describe('CreateCase case', () => {
   it('should redirect to new case when posting the case', async () => {
     const wrapper = mount(
       <TestProviders>
-        <CreateCase {...defaultProps} />
+        <CreateCase {...defaultProps} owner={[SECURITY_SOLUTION_OWNER]} />
       </TestProviders>
     );
 
diff --git a/x-pack/plugins/cases/public/components/create/index.tsx b/x-pack/plugins/cases/public/components/create/index.tsx
index a1de4d9730b9f..3362aa6af2078 100644
--- a/x-pack/plugins/cases/public/components/create/index.tsx
+++ b/x-pack/plugins/cases/public/components/create/index.tsx
@@ -20,6 +20,8 @@ import { CasesTimelineIntegration, CasesTimelineIntegrationProvider } from '../t
 import { fieldName as descriptionFieldName } from './description';
 import { InsertTimeline } from '../insert_timeline';
 import { UsePostComment } from '../../containers/use_post_comment';
+import { Owner } from '../../types';
+import { OwnerProvider } from '../owner_context';
 
 export const CommonUseField = getUseField({ component: Field });
 
@@ -29,7 +31,7 @@ const Container = styled.div`
   `}
 `;
 
-export interface CreateCaseProps {
+export interface CreateCaseProps extends Owner {
   afterCaseCreated?: (theCase: Case, postComment: UsePostComment['postComment']) => Promise<void>;
   caseType?: CaseType;
   hideConnectorServiceNowSir?: boolean;
@@ -39,7 +41,7 @@ export interface CreateCaseProps {
   withSteps?: boolean;
 }
 
-export const CreateCase = ({
+const CreateCaseComponent = ({
   afterCaseCreated,
   caseType,
   hideConnectorServiceNowSir,
@@ -47,7 +49,7 @@ export const CreateCase = ({
   onSuccess,
   timelineIntegration,
   withSteps,
-}: CreateCaseProps) => (
+}: Omit<CreateCaseProps, 'owner'>) => (
   <CasesTimelineIntegrationProvider timelineIntegration={timelineIntegration}>
     <FormContext
       afterCaseCreated={afterCaseCreated}
@@ -86,5 +88,12 @@ export const CreateCase = ({
   </CasesTimelineIntegrationProvider>
 );
 
+export const CreateCase: React.FC<CreateCaseProps> = React.memo((props) => {
+  return (
+    <OwnerProvider owner={props.owner}>
+      <CreateCaseComponent {...props} />
+    </OwnerProvider>
+  );
+});
 // eslint-disable-next-line import/no-default-export
 export { CreateCase as default };
diff --git a/x-pack/plugins/cases/public/components/create/mock.ts b/x-pack/plugins/cases/public/components/create/mock.ts
index eb40fa097d3cc..fb00f114f480c 100644
--- a/x-pack/plugins/cases/public/components/create/mock.ts
+++ b/x-pack/plugins/cases/public/components/create/mock.ts
@@ -5,7 +5,12 @@
  * 2.0.
  */
 
-import { CasePostRequest, CaseType, ConnectorTypes } from '../../../common';
+import {
+  CasePostRequest,
+  CaseType,
+  ConnectorTypes,
+  SECURITY_SOLUTION_OWNER,
+} from '../../../common';
 import { choices } from '../connectors/mock';
 
 export const sampleTags = ['coke', 'pepsi'];
@@ -23,6 +28,7 @@ export const sampleData: CasePostRequest = {
   settings: {
     syncAlerts: true,
   },
+  owner: SECURITY_SOLUTION_OWNER,
 };
 
 export const sampleConnectorData = { loading: false, connectors: [] };
diff --git a/x-pack/plugins/cases/public/components/create/schema.tsx b/x-pack/plugins/cases/public/components/create/schema.tsx
index 7ca1e2e061545..6e6d1a414280e 100644
--- a/x-pack/plugins/cases/public/components/create/schema.tsx
+++ b/x-pack/plugins/cases/public/components/create/schema.tsx
@@ -19,7 +19,7 @@ export const schemaTags = {
   labelAppend: OptionalFieldLabel,
 };
 
-export type FormProps = Omit<CasePostRequest, 'connector' | 'settings'> & {
+export type FormProps = Omit<CasePostRequest, 'connector' | 'settings' | 'owner'> & {
   connectorId: string;
   fields: ConnectorTypeFields['fields'];
   syncAlerts: boolean;
diff --git a/x-pack/plugins/cases/public/components/create/tags.test.tsx b/x-pack/plugins/cases/public/components/create/tags.test.tsx
index 2eddb83dcac29..6efbf1b8c7107 100644
--- a/x-pack/plugins/cases/public/components/create/tags.test.tsx
+++ b/x-pack/plugins/cases/public/components/create/tags.test.tsx
@@ -14,6 +14,8 @@ import { useForm, Form, FormHook } from '../../common/shared_imports';
 import { useGetTags } from '../../containers/use_get_tags';
 import { Tags } from './tags';
 import { schema, FormProps } from './schema';
+import { OwnerProvider } from '../owner_context';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
 
 jest.mock('../../containers/use_get_tags');
 const useGetTagsMock = useGetTags as jest.Mock;
@@ -31,7 +33,11 @@ describe('Tags', () => {
 
     globalForm = form;
 
-    return <Form form={form}>{children}</Form>;
+    return (
+      <OwnerProvider owner={[SECURITY_SOLUTION_OWNER]}>
+        <Form form={form}>{children}</Form>
+      </OwnerProvider>
+    );
   };
 
   beforeEach(() => {
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 3b6d4bd3f33f2..1385e8e8664c3 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
@@ -7,15 +7,18 @@
 
 import React from 'react';
 import { mount } from 'enzyme';
+import { waitFor } from '@testing-library/react';
 
 import { EditConnector } from './index';
 import { getFormMock, useFormMock } from '../__mock__/form';
 import { TestProviders } from '../../common/mock';
 import { connectorsMock } from '../../containers/configure/mock';
-import { waitFor } from '@testing-library/react';
 import { caseUserActions } from '../../containers/mock';
+import { useKibana } from '../../common/lib/kibana';
 
 jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
+jest.mock('../../common/lib/kibana');
+const useKibanaMock = useKibana as jest.Mocked<typeof useKibana>;
 
 const onSubmit = jest.fn();
 const defaultProps = {
@@ -33,8 +36,11 @@ describe('EditConnector ', () => {
   const formHookMock = getFormMock({ connectorId: sampleConnector });
   beforeEach(() => {
     jest.clearAllMocks();
-    jest.resetAllMocks();
     useFormMock.mockImplementation(() => ({ form: formHookMock }));
+    useKibanaMock().services.triggersActionsUi.actionTypeRegistry.get = jest.fn().mockReturnValue({
+      actionTypeTitle: '.servicenow',
+      iconClass: 'logoSecurity',
+    });
   });
 
   it('Renders no connector, and then edit', async () => {
diff --git a/x-pack/plugins/cases/public/components/edit_connector/index.tsx b/x-pack/plugins/cases/public/components/edit_connector/index.tsx
index 56f1a77fc407e..ad6b5a5e7cddf 100644
--- a/x-pack/plugins/cases/public/components/edit_connector/index.tsx
+++ b/x-pack/plugins/cases/public/components/edit_connector/index.tsx
@@ -202,6 +202,7 @@ export const EditConnector = React.memo(
         payload: true,
       });
     }, [dispatch]);
+
     return (
       <EuiText>
         <MyFlexGroup alignItems="center" gutterSize="xs" justifyContent="spaceBetween">
diff --git a/x-pack/plugins/cases/public/components/owner_context/index.tsx b/x-pack/plugins/cases/public/components/owner_context/index.tsx
new file mode 100644
index 0000000000000..5df7eeadd70d5
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/owner_context/index.tsx
@@ -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 React, { useState } from 'react';
+
+export const OwnerContext = React.createContext<string[]>([]);
+
+export const OwnerProvider: React.FC<{
+  owner: string[];
+}> = ({ children, owner }) => {
+  const [currentOwner] = useState(owner);
+
+  return <OwnerContext.Provider value={currentOwner}>{children}</OwnerContext.Provider>;
+};
diff --git a/x-pack/plugins/cases/public/components/owner_context/use_owner_context.ts b/x-pack/plugins/cases/public/components/owner_context/use_owner_context.ts
new file mode 100644
index 0000000000000..a443df1809315
--- /dev/null
+++ b/x-pack/plugins/cases/public/components/owner_context/use_owner_context.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 { useContext } from 'react';
+import { OwnerContext } from '.';
+
+export const useOwnerContext = () => {
+  const ownerContext = useContext(OwnerContext);
+
+  if (ownerContext.length === 0) {
+    throw new Error(
+      'useOwnerContext must be used within an OwnerProvider and not be an empty array'
+    );
+  }
+
+  return ownerContext;
+};
diff --git a/x-pack/plugins/cases/public/components/recent_cases/index.test.tsx b/x-pack/plugins/cases/public/components/recent_cases/index.test.tsx
index 933ea51bffac4..3a5cda489947a 100644
--- a/x-pack/plugins/cases/public/components/recent_cases/index.test.tsx
+++ b/x-pack/plugins/cases/public/components/recent_cases/index.test.tsx
@@ -12,7 +12,12 @@ import RecentCases from '.';
 import { TestProviders } from '../../common/mock';
 import { useGetCases } from '../../containers/use_get_cases';
 import { useGetCasesMockState } from '../../containers/mock';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
+import { useCurrentUser } from '../../common/lib/kibana/hooks';
+
 jest.mock('../../containers/use_get_cases');
+jest.mock('../../common/lib/kibana/hooks');
+
 configure({ testIdAttribute: 'data-test-subj' });
 const defaultProps = {
   allCasesNavigation: {
@@ -28,18 +33,29 @@ const defaultProps = {
     onClick: jest.fn(),
   },
   maxCasesToShow: 10,
+  owner: [SECURITY_SOLUTION_OWNER],
 };
+
 const setFilters = jest.fn();
 const mockData = {
   ...useGetCasesMockState,
   setFilters,
 };
+
 const useGetCasesMock = useGetCases as jest.Mock;
+const useCurrentUserMock = useCurrentUser as jest.Mock;
+
 describe('RecentCases', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     useGetCasesMock.mockImplementation(() => mockData);
+    useCurrentUserMock.mockResolvedValue({
+      email: 'elastic@elastic.co',
+      fullName: 'Elastic',
+      username: 'elastic',
+    });
   });
+
   it('is good at loading', () => {
     useGetCasesMock.mockImplementation(() => ({
       ...mockData,
@@ -52,6 +68,7 @@ describe('RecentCases', () => {
     );
     expect(getAllByTestId('loadingPlaceholders')).toHaveLength(3);
   });
+
   it('is good at rendering cases', () => {
     const { getAllByTestId } = render(
       <TestProviders>
@@ -60,22 +77,27 @@ describe('RecentCases', () => {
     );
     expect(getAllByTestId('case-details-link')).toHaveLength(5);
   });
+
   it('is good at rendering max cases', () => {
     render(
       <TestProviders>
         <RecentCases {...{ ...defaultProps, maxCasesToShow: 2 }} />
       </TestProviders>
     );
-    expect(useGetCasesMock).toBeCalledWith({ perPage: 2 });
+    expect(useGetCasesMock).toBeCalledWith({
+      initialQueryParams: { perPage: 2 },
+    });
   });
+
   it('updates filters', () => {
     const { getByTestId } = render(
       <TestProviders>
         <RecentCases {...defaultProps} />
       </TestProviders>
     );
-    const yo = getByTestId('myRecentlyReported');
-    userEvent.click(yo);
+
+    const element = getByTestId('myRecentlyReported');
+    userEvent.click(element);
     expect(setFilters).toHaveBeenCalled();
   });
 });
diff --git a/x-pack/plugins/cases/public/components/recent_cases/index.tsx b/x-pack/plugins/cases/public/components/recent_cases/index.tsx
index 05aff25d0dbd8..8a08a46487c8b 100644
--- a/x-pack/plugins/cases/public/components/recent_cases/index.tsx
+++ b/x-pack/plugins/cases/public/components/recent_cases/index.tsx
@@ -14,20 +14,22 @@ import { RecentCasesFilters } from './filters';
 import { RecentCasesComp } from './recent_cases';
 import { FilterMode as RecentCasesFilterMode } from './types';
 import { useCurrentUser } from '../../common/lib/kibana';
+import { Owner } from '../../types';
+import { OwnerProvider } from '../owner_context';
 
-export interface RecentCasesProps {
+export interface RecentCasesProps extends Owner {
   allCasesNavigation: CasesNavigation;
   caseDetailsNavigation: CasesNavigation<CaseDetailsHrefSchema, 'configurable'>;
   createCaseNavigation: CasesNavigation;
   maxCasesToShow: number;
 }
 
-const RecentCases = ({
+const RecentCasesComponent = ({
   allCasesNavigation,
   caseDetailsNavigation,
   createCaseNavigation,
   maxCasesToShow,
-}: RecentCasesProps) => {
+}: Omit<RecentCasesProps, 'owner'>) => {
   const currentUser = useCurrentUser();
   const [recentCasesFilterBy, setRecentCasesFilterBy] = useState<RecentCasesFilterMode>(
     'recentlyCreated'
@@ -48,6 +50,7 @@ const RecentCases = ({
         : {},
     [currentUser, recentCasesFilterBy]
   );
+
   return (
     <>
       <>
@@ -87,5 +90,13 @@ const RecentCases = ({
   );
 };
 
+export const RecentCases: React.FC<RecentCasesProps> = React.memo((props) => {
+  return (
+    <OwnerProvider owner={props.owner}>
+      <RecentCasesComponent {...props} />
+    </OwnerProvider>
+  );
+});
+
 // eslint-disable-next-line import/no-default-export
 export { RecentCases as default };
diff --git a/x-pack/plugins/cases/public/components/recent_cases/recent_cases.tsx b/x-pack/plugins/cases/public/components/recent_cases/recent_cases.tsx
index 12935e75c064f..5b4313530e490 100644
--- a/x-pack/plugins/cases/public/components/recent_cases/recent_cases.tsx
+++ b/x-pack/plugins/cases/public/components/recent_cases/recent_cases.tsx
@@ -32,6 +32,7 @@ export interface RecentCasesProps {
   createCaseNavigation: CasesNavigation;
   maxCasesToShow: number;
 }
+
 const usePrevious = (value: Partial<FilterOptions>) => {
   const ref = useRef();
   useEffect(() => {
@@ -46,7 +47,9 @@ export const RecentCasesComp = ({
   maxCasesToShow,
 }: RecentCasesProps) => {
   const previousFilterOptions = usePrevious(filterOptions);
-  const { data, loading, setFilters } = useGetCases({ perPage: maxCasesToShow });
+  const { data, loading, setFilters } = useGetCases({
+    initialQueryParams: { perPage: maxCasesToShow },
+  });
 
   useEffect(() => {
     if (previousFilterOptions !== undefined && !isEqual(previousFilterOptions, filterOptions)) {
diff --git a/x-pack/plugins/cases/public/components/status/status.test.tsx b/x-pack/plugins/cases/public/components/status/status.test.tsx
index 7cddbf5ca4a1d..4d13e57fbdee7 100644
--- a/x-pack/plugins/cases/public/components/status/status.test.tsx
+++ b/x-pack/plugins/cases/public/components/status/status.test.tsx
@@ -31,6 +31,30 @@ describe('Stats', () => {
     ).toBeTruthy();
   });
 
+  it('it renders with the pop over enabled by default', async () => {
+    const wrapper = mount(<Status type={CaseStatuses.open} withArrow={true} onClick={onClick} />);
+
+    expect(
+      wrapper
+        .find(`[data-test-subj="status-badge-open"] .euiBadge__iconButton`)
+        .first()
+        .prop('disabled')
+    ).toBe(false);
+  });
+
+  it('it renders with the pop over disabled when initialized disabled', async () => {
+    const wrapper = mount(
+      <Status disabled={true} type={CaseStatuses.open} withArrow={true} onClick={onClick} />
+    );
+
+    expect(
+      wrapper
+        .find(`[data-test-subj="status-badge-open"] .euiBadge__iconButton`)
+        .first()
+        .prop('disabled')
+    ).toBe(true);
+  });
+
   it('it calls onClick when pressing the badge', async () => {
     const wrapper = mount(<Status type={CaseStatuses.open} withArrow={true} onClick={onClick} />);
 
diff --git a/x-pack/plugins/cases/public/components/status/status.tsx b/x-pack/plugins/cases/public/components/status/status.tsx
index 03dca8642aed7..3b832ce155400 100644
--- a/x-pack/plugins/cases/public/components/status/status.tsx
+++ b/x-pack/plugins/cases/public/components/status/status.tsx
@@ -14,12 +14,18 @@ import * as i18n from './translations';
 import { CaseStatusWithAllStatus, StatusAll } from '../../../common';
 
 interface Props {
+  disabled?: boolean;
   type: CaseStatusWithAllStatus;
   withArrow?: boolean;
   onClick?: () => void;
 }
 
-const StatusComponent: React.FC<Props> = ({ type, withArrow = false, onClick = noop }) => {
+const StatusComponent: React.FC<Props> = ({
+  type,
+  disabled = false,
+  withArrow = false,
+  onClick = noop,
+}) => {
   const props = useMemo(
     () => ({
       color: type === StatusAll ? allCaseStatus[StatusAll].color : statuses[type].color,
@@ -34,6 +40,7 @@ const StatusComponent: React.FC<Props> = ({ type, withArrow = false, onClick = n
       iconOnClick={onClick}
       iconOnClickAriaLabel={i18n.STATUS_ICON_ARIA}
       data-test-subj={`status-badge-${type}`}
+      isDisabled={disabled}
     >
       {type === StatusAll ? allCaseStatus[StatusAll].label : statuses[type].label}
     </EuiBadge>
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 296c4ba0e893b..b3fbcd30d4e97 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
@@ -14,6 +14,7 @@ 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 { useGetTags } from '../../containers/use_get_tags';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
 
 jest.mock('../../../../../../src/plugins/es_ui_shared/static/forms/hook_form_lib/hooks/use_form');
 jest.mock('../../containers/use_get_tags');
@@ -37,6 +38,7 @@ const defaultProps = {
   isLoading: false,
   onSubmit,
   tags: [],
+  owner: [SECURITY_SOLUTION_OWNER],
 };
 
 describe('TagList ', () => {
diff --git a/x-pack/plugins/cases/public/components/tag_list/index.tsx b/x-pack/plugins/cases/public/components/tag_list/index.tsx
index 137d58932b6ef..f260593369679 100644
--- a/x-pack/plugins/cases/public/components/tag_list/index.tsx
+++ b/x-pack/plugins/cases/public/components/tag_list/index.tsx
@@ -32,6 +32,7 @@ interface TagListProps {
   isLoading: boolean;
   onSubmit: (a: string[]) => void;
   tags: string[];
+  owner: string[];
 }
 
 const MyFlexGroup = styled(EuiFlexGroup)`
@@ -44,7 +45,7 @@ const MyFlexGroup = styled(EuiFlexGroup)`
 `;
 
 export const TagList = React.memo(
-  ({ disabled = false, isLoading, onSubmit, tags }: TagListProps) => {
+  ({ disabled = false, isLoading, onSubmit, tags, owner }: TagListProps) => {
     const initialState = { tags };
     const { form } = useForm({
       defaultValue: initialState,
diff --git a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx
index 661a0eedfeae4..4c39b721cac47 100644
--- a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx
+++ b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.test.tsx
@@ -11,6 +11,7 @@ import { mount } from 'enzyme';
 import { CreateCaseModal } from './create_case_modal';
 import { TestProviders } from '../../common/mock';
 import { getCreateCaseLazy as getCreateCase } from '../../methods';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
 
 jest.mock('../../methods');
 const getCreateCaseMock = getCreateCase as jest.Mock;
@@ -20,6 +21,7 @@ const defaultProps = {
   isModalOpen: true,
   onCloseCaseModal,
   onSuccess,
+  owner: SECURITY_SOLUTION_OWNER,
 };
 
 describe('CreateCaseModal', () => {
diff --git a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx
index e78b432b3a27c..a4278e53ea341 100644
--- a/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx
+++ b/x-pack/plugins/cases/public/components/use_create_case_modal/create_case_modal.tsx
@@ -19,6 +19,7 @@ export interface CreateCaseModalProps {
   isModalOpen: boolean;
   onCloseCaseModal: () => void;
   onSuccess: (theCase: Case) => Promise<void>;
+  owner: string;
 }
 
 const CreateModalComponent: React.FC<CreateCaseModalProps> = ({
@@ -27,6 +28,7 @@ const CreateModalComponent: React.FC<CreateCaseModalProps> = ({
   isModalOpen,
   onCloseCaseModal,
   onSuccess,
+  owner,
 }) => {
   return isModalOpen ? (
     <EuiModal onClose={onCloseCaseModal} data-test-subj="create-case-modal">
@@ -40,6 +42,7 @@ const CreateModalComponent: React.FC<CreateCaseModalProps> = ({
           onCancel: onCloseCaseModal,
           onSuccess,
           withSteps: false,
+          owner: [owner],
         })}
       </EuiModalBody>
     </EuiModal>
diff --git a/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx b/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx
index 7ad85773a7917..09f8eb65b12b7 100644
--- a/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx
+++ b/x-pack/plugins/cases/public/components/use_create_case_modal/index.tsx
@@ -7,6 +7,7 @@
 
 import React, { useState, useCallback, useMemo } from 'react';
 import { Case, CaseType } from '../../../common';
+import { useOwnerContext } from '../owner_context/use_owner_context';
 import { CreateCaseModal } from './create_case_modal';
 
 export interface UseCreateCaseModalProps {
@@ -26,6 +27,7 @@ export const useCreateCaseModal = ({
   onCaseCreated,
   hideConnectorServiceNowSir = false,
 }: UseCreateCaseModalProps) => {
+  const owner = useOwnerContext();
   const [isModalOpen, setIsModalOpen] = useState<boolean>(false);
   const closeModal = useCallback(() => setIsModalOpen(false), []);
   const openModal = useCallback(() => setIsModalOpen(true), []);
@@ -46,12 +48,13 @@ export const useCreateCaseModal = ({
           isModalOpen={isModalOpen}
           onCloseCaseModal={closeModal}
           onSuccess={onSuccess}
+          owner={owner[0]}
         />
       ),
       isModalOpen,
       closeModal,
       openModal,
     }),
-    [caseType, closeModal, hideConnectorServiceNowSir, isModalOpen, onSuccess, openModal]
+    [caseType, closeModal, hideConnectorServiceNowSir, isModalOpen, onSuccess, openModal, owner]
   );
 };
diff --git a/x-pack/plugins/cases/public/containers/__mocks__/api.ts b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
index 4dbb10da95b2d..006ad3f7afe60 100644
--- a/x-pack/plugins/cases/public/containers/__mocks__/api.ts
+++ b/x-pack/plugins/cases/public/containers/__mocks__/api.ts
@@ -62,6 +62,7 @@ export const getCases = async ({
     reporters: [],
     status: CaseStatuses.open,
     tags: [],
+    owner: [],
   },
   queryParams = {
     page: 1,
diff --git a/x-pack/plugins/cases/public/containers/api.test.tsx b/x-pack/plugins/cases/public/containers/api.test.tsx
index 3e71a05df7cc1..afd6b51b5f35d 100644
--- a/x-pack/plugins/cases/public/containers/api.test.tsx
+++ b/x-pack/plugins/cases/public/containers/api.test.tsx
@@ -7,7 +7,7 @@
 
 import { KibanaServices } from '../common/lib/kibana';
 
-import { ConnectorTypes, CommentType, CaseStatuses } from '../../common';
+import { ConnectorTypes, CommentType, CaseStatuses, SECURITY_SOLUTION_OWNER } from '../../common';
 import { CASES_URL } from '../../common';
 
 import {
@@ -127,7 +127,7 @@ describe('Case Configuration API', () => {
     });
     test('check url, method, signal', async () => {
       await getCases({
-        filterOptions: DEFAULT_FILTER_OPTIONS,
+        filterOptions: { ...DEFAULT_FILTER_OPTIONS, owner: [SECURITY_SOLUTION_OWNER] },
         queryParams: DEFAULT_QUERY_PARAMS,
         signal: abortCtrl.signal,
       });
@@ -137,6 +137,7 @@ describe('Case Configuration API', () => {
           ...DEFAULT_QUERY_PARAMS,
           reporters: [],
           tags: [],
+          owner: [SECURITY_SOLUTION_OWNER],
         },
         signal: abortCtrl.signal,
       });
@@ -150,6 +151,7 @@ describe('Case Configuration API', () => {
           tags,
           status: CaseStatuses.open,
           search: 'hello',
+          owner: [SECURITY_SOLUTION_OWNER],
         },
         queryParams: DEFAULT_QUERY_PARAMS,
         signal: abortCtrl.signal,
@@ -162,6 +164,7 @@ describe('Case Configuration API', () => {
           tags: ['"coke"', '"pepsi"'],
           search: 'hello',
           status: CaseStatuses.open,
+          owner: [SECURITY_SOLUTION_OWNER],
         },
         signal: abortCtrl.signal,
       });
@@ -177,6 +180,7 @@ describe('Case Configuration API', () => {
           tags: weirdTags,
           status: CaseStatuses.open,
           search: 'hello',
+          owner: [SECURITY_SOLUTION_OWNER],
         },
         queryParams: DEFAULT_QUERY_PARAMS,
         signal: abortCtrl.signal,
@@ -189,6 +193,7 @@ describe('Case Configuration API', () => {
           tags: ['"("', '"\\"double\\""'],
           search: 'hello',
           status: CaseStatuses.open,
+          owner: [SECURITY_SOLUTION_OWNER],
         },
         signal: abortCtrl.signal,
       });
@@ -196,7 +201,7 @@ describe('Case Configuration API', () => {
 
     test('happy path', async () => {
       const resp = await getCases({
-        filterOptions: DEFAULT_FILTER_OPTIONS,
+        filterOptions: { ...DEFAULT_FILTER_OPTIONS, owner: [SECURITY_SOLUTION_OWNER] },
         queryParams: DEFAULT_QUERY_PARAMS,
         signal: abortCtrl.signal,
       });
@@ -210,15 +215,16 @@ describe('Case Configuration API', () => {
       fetchMock.mockResolvedValue(casesStatusSnake);
     });
     test('check url, method, signal', async () => {
-      await getCasesStatus(abortCtrl.signal);
+      await getCasesStatus(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
       expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/status`, {
         method: 'GET',
         signal: abortCtrl.signal,
+        query: { owner: [SECURITY_SOLUTION_OWNER] },
       });
     });
 
     test('happy path', async () => {
-      const resp = await getCasesStatus(abortCtrl.signal);
+      const resp = await getCasesStatus(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
       expect(resp).toEqual(casesStatus);
     });
   });
@@ -250,15 +256,18 @@ describe('Case Configuration API', () => {
     });
 
     test('check url, method, signal', async () => {
-      await getReporters(abortCtrl.signal);
+      await getReporters(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
       expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/reporters`, {
         method: 'GET',
         signal: abortCtrl.signal,
+        query: {
+          owner: [SECURITY_SOLUTION_OWNER],
+        },
       });
     });
 
     test('happy path', async () => {
-      const resp = await getReporters(abortCtrl.signal);
+      const resp = await getReporters(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
       expect(resp).toEqual(respReporters);
     });
   });
@@ -270,15 +279,18 @@ describe('Case Configuration API', () => {
     });
 
     test('check url, method, signal', async () => {
-      await getTags(abortCtrl.signal);
+      await getTags(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
       expect(fetchMock).toHaveBeenCalledWith(`${CASES_URL}/tags`, {
         method: 'GET',
         signal: abortCtrl.signal,
+        query: {
+          owner: [SECURITY_SOLUTION_OWNER],
+        },
       });
     });
 
     test('happy path', async () => {
-      const resp = await getTags(abortCtrl.signal);
+      const resp = await getTags(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
       expect(resp).toEqual(tags);
     });
   });
@@ -395,6 +407,7 @@ describe('Case Configuration API', () => {
       settings: {
         syncAlerts: true,
       },
+      owner: SECURITY_SOLUTION_OWNER,
     };
 
     test('check url, method, signal', async () => {
@@ -419,6 +432,7 @@ describe('Case Configuration API', () => {
     });
     const data = {
       comment: 'comment',
+      owner: SECURITY_SOLUTION_OWNER,
       type: CommentType.user as const,
     };
 
diff --git a/x-pack/plugins/cases/public/containers/api.ts b/x-pack/plugins/cases/public/containers/api.ts
index 75263d4d38978..66a4d174b0ffb 100644
--- a/x-pack/plugins/cases/public/containers/api.ts
+++ b/x-pack/plugins/cases/public/containers/api.ts
@@ -111,26 +111,32 @@ export const getSubCase = async (
   return convertToCamelCase<CaseResponse, Case>(decodeCaseResponse(response));
 };
 
-export const getCasesStatus = async (signal: AbortSignal): Promise<CasesStatus> => {
+export const getCasesStatus = async (
+  signal: AbortSignal,
+  owner: string[]
+): Promise<CasesStatus> => {
   const response = await KibanaServices.get().http.fetch<CasesStatusResponse>(CASE_STATUS_URL, {
     method: 'GET',
     signal,
+    query: { ...(owner.length > 0 ? { owner } : {}) },
   });
   return convertToCamelCase<CasesStatusResponse, CasesStatus>(decodeCasesStatusResponse(response));
 };
 
-export const getTags = async (signal: AbortSignal): Promise<string[]> => {
+export const getTags = async (signal: AbortSignal, owner: string[]): Promise<string[]> => {
   const response = await KibanaServices.get().http.fetch<string[]>(CASE_TAGS_URL, {
     method: 'GET',
     signal,
+    query: { ...(owner.length > 0 ? { owner } : {}) },
   });
   return response ?? [];
 };
 
-export const getReporters = async (signal: AbortSignal): Promise<User[]> => {
+export const getReporters = async (signal: AbortSignal, owner: string[]): Promise<User[]> => {
   const response = await KibanaServices.get().http.fetch<User[]>(CASE_REPORTERS_URL, {
     method: 'GET',
     signal,
+    query: { ...(owner.length > 0 ? { owner } : {}) },
   });
   return response ?? [];
 };
@@ -171,6 +177,7 @@ export const getCases = async ({
     reporters: [],
     status: StatusAll,
     tags: [],
+    owner: [],
   },
   queryParams = {
     page: 1,
@@ -186,6 +193,7 @@ export const getCases = async ({
     status: filterOptions.status,
     ...(filterOptions.search.length > 0 ? { search: filterOptions.search } : {}),
     ...(filterOptions.onlyCollectionType ? { type: CaseType.collection } : {}),
+    ...(filterOptions.owner.length > 0 ? { owner: filterOptions.owner } : {}),
     ...queryParams,
   };
   const response = await KibanaServices.get().http.fetch<CasesFindResponse>(`${CASES_URL}/_find`, {
diff --git a/x-pack/plugins/cases/public/containers/configure/api.test.ts b/x-pack/plugins/cases/public/containers/configure/api.test.ts
index ae749b4391776..ad13526b41d38 100644
--- a/x-pack/plugins/cases/public/containers/configure/api.test.ts
+++ b/x-pack/plugins/cases/public/containers/configure/api.test.ts
@@ -19,7 +19,7 @@ import {
   caseConfigurationResposeMock,
   caseConfigurationCamelCaseResponseMock,
 } from './mock';
-import { ConnectorTypes } from '../../../common';
+import { ConnectorTypes, SECURITY_SOLUTION_OWNER } from '../../../common';
 import { KibanaServices } from '../../common/lib/kibana';
 
 const abortCtrl = new AbortController();
@@ -53,25 +53,34 @@ describe('Case Configuration API', () => {
   describe('fetch configuration', () => {
     beforeEach(() => {
       fetchMock.mockClear();
-      fetchMock.mockResolvedValue(caseConfigurationResposeMock);
+      fetchMock.mockResolvedValue([caseConfigurationResposeMock]);
     });
 
     test('check url, method, signal', async () => {
-      await getCaseConfigure({ signal: abortCtrl.signal });
+      await getCaseConfigure({ signal: abortCtrl.signal, owner: [SECURITY_SOLUTION_OWNER] });
       expect(fetchMock).toHaveBeenCalledWith('/api/cases/configure', {
         method: 'GET',
         signal: abortCtrl.signal,
+        query: {
+          owner: [SECURITY_SOLUTION_OWNER],
+        },
       });
     });
 
     test('happy path', async () => {
-      const resp = await getCaseConfigure({ signal: abortCtrl.signal });
+      const resp = await getCaseConfigure({
+        signal: abortCtrl.signal,
+        owner: [SECURITY_SOLUTION_OWNER],
+      });
       expect(resp).toEqual(caseConfigurationCamelCaseResponseMock);
     });
 
     test('return null on empty response', async () => {
       fetchMock.mockResolvedValue({});
-      const resp = await getCaseConfigure({ signal: abortCtrl.signal });
+      const resp = await getCaseConfigure({
+        signal: abortCtrl.signal,
+        owner: [SECURITY_SOLUTION_OWNER],
+      });
       expect(resp).toBe(null);
     });
   });
@@ -86,7 +95,7 @@ describe('Case Configuration API', () => {
       await postCaseConfigure(caseConfigurationMock, abortCtrl.signal);
       expect(fetchMock).toHaveBeenCalledWith('/api/cases/configure', {
         body:
-          '{"connector":{"id":"123","name":"My connector","type":".jira","fields":null},"closure_type":"close-by-user"}',
+          '{"connector":{"id":"123","name":"My connector","type":".jira","fields":null},"owner":"securitySolution","closure_type":"close-by-user"}',
         method: 'POST',
         signal: abortCtrl.signal,
       });
@@ -106,13 +115,14 @@ describe('Case Configuration API', () => {
 
     test('check url, body, method, signal', async () => {
       await patchCaseConfigure(
+        '123',
         {
           connector: { id: '456', name: 'My Connector 2', type: ConnectorTypes.none, fields: null },
           version: 'WzHJ12',
         },
         abortCtrl.signal
       );
-      expect(fetchMock).toHaveBeenCalledWith('/api/cases/configure', {
+      expect(fetchMock).toHaveBeenCalledWith('/api/cases/configure/123', {
         body:
           '{"connector":{"id":"456","name":"My Connector 2","type":".none","fields":null},"version":"WzHJ12"}',
         method: 'PATCH',
@@ -122,6 +132,7 @@ describe('Case Configuration API', () => {
 
     test('happy path', async () => {
       const resp = await patchCaseConfigure(
+        '123',
         {
           connector: { id: '456', name: 'My Connector 2', type: ConnectorTypes.none, fields: null },
           version: 'WzHJ12',
diff --git a/x-pack/plugins/cases/public/containers/configure/api.ts b/x-pack/plugins/cases/public/containers/configure/api.ts
index ca8b7e3a05734..c972e2fc5c5fb 100644
--- a/x-pack/plugins/cases/public/containers/configure/api.ts
+++ b/x-pack/plugins/cases/public/containers/configure/api.ts
@@ -15,11 +15,17 @@ import {
   CasesConfigurePatch,
   CasesConfigureRequest,
   CasesConfigureResponse,
+  CasesConfigurationsResponse,
+  getCaseConfigurationDetailsUrl,
 } from '../../../common';
 import { KibanaServices } from '../../common/lib/kibana';
 
 import { ApiProps } from '../types';
-import { convertToCamelCase, decodeCaseConfigureResponse } from '../utils';
+import {
+  convertToCamelCase,
+  decodeCaseConfigurationsResponse,
+  decodeCaseConfigureResponse,
+} from '../utils';
 import { CaseConfigure } from './types';
 
 export const fetchConnectors = async ({ signal }: ApiProps): Promise<ActionConnector[]> => {
@@ -31,20 +37,27 @@ export const fetchConnectors = async ({ signal }: ApiProps): Promise<ActionConne
   return response;
 };
 
-export const getCaseConfigure = async ({ signal }: ApiProps): Promise<CaseConfigure | null> => {
-  const response = await KibanaServices.get().http.fetch<CasesConfigureResponse>(
+export const getCaseConfigure = async ({
+  signal,
+  owner,
+}: ApiProps & { owner: string[] }): Promise<CaseConfigure | null> => {
+  const response = await KibanaServices.get().http.fetch<CasesConfigurationsResponse>(
     CASE_CONFIGURE_URL,
     {
       method: 'GET',
       signal,
+      query: { ...(owner.length > 0 ? { owner } : {}) },
     }
   );
 
-  return !isEmpty(response)
-    ? convertToCamelCase<CasesConfigureResponse, CaseConfigure>(
-        decodeCaseConfigureResponse(response)
-      )
-    : null;
+  if (!isEmpty(response)) {
+    const decodedConfigs = decodeCaseConfigurationsResponse(response);
+    if (Array.isArray(decodedConfigs) && decodedConfigs.length > 0) {
+      return convertToCamelCase<CasesConfigureResponse, CaseConfigure>(decodedConfigs[0]);
+    }
+  }
+
+  return null;
 };
 
 export const getConnectorMappings = async ({ signal }: ApiProps): Promise<ActionConnector[]> => {
@@ -74,11 +87,12 @@ export const postCaseConfigure = async (
 };
 
 export const patchCaseConfigure = async (
+  id: string,
   caseConfiguration: CasesConfigurePatch,
   signal: AbortSignal
 ): Promise<CaseConfigure> => {
   const response = await KibanaServices.get().http.fetch<CasesConfigureResponse>(
-    CASE_CONFIGURE_URL,
+    getCaseConfigurationDetailsUrl(id),
     {
       method: 'PATCH',
       body: JSON.stringify(caseConfiguration),
diff --git a/x-pack/plugins/cases/public/containers/configure/mock.ts b/x-pack/plugins/cases/public/containers/configure/mock.ts
index 766452e3e58e7..833c2cfb3aa7c 100644
--- a/x-pack/plugins/cases/public/containers/configure/mock.ts
+++ b/x-pack/plugins/cases/public/containers/configure/mock.ts
@@ -11,6 +11,7 @@ import {
   CasesConfigureResponse,
   CasesConfigureRequest,
   ConnectorTypes,
+  SECURITY_SOLUTION_OWNER,
 } from '../../../common';
 import { CaseConfigure, CaseConnectorMapping } from './types';
 
@@ -113,9 +114,18 @@ export const actionTypesMock: ActionTypeConnector[] = [
     enabledInConfig: true,
     enabledInLicense: true,
   },
+  {
+    id: '.servicenow-sir',
+    name: 'ServiceNow SIR',
+    minimumLicenseRequired: 'platinum',
+    enabled: false,
+    enabledInConfig: true,
+    enabledInLicense: true,
+  },
 ];
 
 export const caseConfigurationResposeMock: CasesConfigureResponse = {
+  id: '123',
   created_at: '2020-04-06T13:03:18.657Z',
   created_by: { username: 'elastic', full_name: 'Elastic', email: 'elastic@elastic.co' },
   connector: {
@@ -129,6 +139,7 @@ export const caseConfigurationResposeMock: CasesConfigureResponse = {
   mappings: [],
   updated_at: '2020-04-06T14:03:18.657Z',
   updated_by: { username: 'elastic', full_name: 'Elastic', email: 'elastic@elastic.co' },
+  owner: SECURITY_SOLUTION_OWNER,
   version: 'WzHJ12',
 };
 
@@ -139,10 +150,12 @@ export const caseConfigurationMock: CasesConfigureRequest = {
     type: ConnectorTypes.jira,
     fields: null,
   },
+  owner: SECURITY_SOLUTION_OWNER,
   closure_type: 'close-by-user',
 };
 
 export const caseConfigurationCamelCaseResponseMock: CaseConfigure = {
+  id: '123',
   createdAt: '2020-04-06T13:03:18.657Z',
   createdBy: { username: 'elastic', fullName: 'Elastic', email: 'elastic@elastic.co' },
   connector: {
@@ -157,4 +170,5 @@ export const caseConfigurationCamelCaseResponseMock: CaseConfigure = {
   updatedAt: '2020-04-06T14:03:18.657Z',
   updatedBy: { username: 'elastic', fullName: 'Elastic', email: 'elastic@elastic.co' },
   version: 'WzHJ12',
+  owner: SECURITY_SOLUTION_OWNER,
 };
diff --git a/x-pack/plugins/cases/public/containers/configure/types.ts b/x-pack/plugins/cases/public/containers/configure/types.ts
index b021ae2163fa2..61c81a8ce97c1 100644
--- a/x-pack/plugins/cases/public/containers/configure/types.ts
+++ b/x-pack/plugins/cases/public/containers/configure/types.ts
@@ -34,6 +34,7 @@ export interface CaseConnectorMapping {
 }
 
 export interface CaseConfigure {
+  id: string;
   closureType: ClosureType;
   connector: CasesConfigure['connector'];
   createdAt: string;
@@ -43,4 +44,5 @@ export interface CaseConfigure {
   updatedAt: string;
   updatedBy: ElasticUser;
   version: string;
+  owner: string;
 }
diff --git a/x-pack/plugins/cases/public/containers/configure/use_configure.test.tsx b/x-pack/plugins/cases/public/containers/configure/use_configure.test.tsx
index 968afcc6ecfb3..d8d552ceb8b7a 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_configure.test.tsx
+++ b/x-pack/plugins/cases/public/containers/configure/use_configure.test.tsx
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
 import {
   initialState,
@@ -15,6 +16,7 @@ import {
 import { mappings, caseConfigurationCamelCaseResponseMock } from './mock';
 import * as api from './api';
 import { ConnectorTypes } from '../../../common';
+import { TestProviders } from '../../common/mock';
 
 const mockErrorToast = jest.fn();
 const mockSuccessToast = jest.fn();
@@ -49,8 +51,11 @@ describe('useConfigure', () => {
 
   test('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       expect(result.current).toEqual({
@@ -67,8 +72,11 @@ describe('useConfigure', () => {
 
   test('fetch case configuration', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -90,6 +98,7 @@ describe('useConfigure', () => {
         setCurrentConfiguration: result.current.setCurrentConfiguration,
         setMappings: result.current.setMappings,
         version: caseConfigurationCamelCaseResponseMock.version,
+        id: caseConfigurationCamelCaseResponseMock.id,
       });
     });
   });
@@ -98,8 +107,11 @@ describe('useConfigure', () => {
     const spyOnGetCaseConfigure = jest.spyOn(api, 'getCaseConfigure');
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -110,8 +122,11 @@ describe('useConfigure', () => {
 
   test('correctly sets mappings', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -123,8 +138,11 @@ describe('useConfigure', () => {
 
   test('set isLoading to true when fetching case configuration', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -136,8 +154,11 @@ describe('useConfigure', () => {
 
   test('persist case configuration', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -165,8 +186,11 @@ describe('useConfigure', () => {
     );
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -191,8 +215,11 @@ describe('useConfigure', () => {
     );
 
     await act(async () => {
-      const { waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -220,8 +247,11 @@ describe('useConfigure', () => {
     );
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -244,8 +274,11 @@ describe('useConfigure', () => {
     );
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -265,8 +298,11 @@ describe('useConfigure', () => {
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
 
       await waitForNextUpdate();
@@ -292,6 +328,7 @@ describe('useConfigure', () => {
       Promise.resolve({
         ...caseConfigurationCamelCaseResponseMock,
         version: '',
+        id: '',
       })
     );
     const spyOnPostCaseConfigure = jest.spyOn(api, 'postCaseConfigure');
@@ -300,8 +337,11 @@ describe('useConfigure', () => {
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(() =>
-        useCaseConfigure()
+      const { result, waitForNextUpdate } = renderHook<string, ReturnUseCaseConfigure>(
+        () => useCaseConfigure(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
 
       await waitForNextUpdate();
diff --git a/x-pack/plugins/cases/public/containers/configure/use_configure.tsx b/x-pack/plugins/cases/public/containers/configure/use_configure.tsx
index c4b3db5956cd7..d02a22bde408c 100644
--- a/x-pack/plugins/cases/public/containers/configure/use_configure.tsx
+++ b/x-pack/plugins/cases/public/containers/configure/use_configure.tsx
@@ -12,6 +12,7 @@ import * as i18n from './translations';
 import { ClosureType, CaseConfigure, CaseConnector, CaseConnectorMapping } from './types';
 import { ConnectorTypes } from '../../../common';
 import { useToasts } from '../../common/lib/kibana';
+import { useOwnerContext } from '../../components/owner_context/use_owner_context';
 
 export type ConnectorConfiguration = { connector: CaseConnector } & {
   closureType: CaseConfigure['closureType'];
@@ -24,6 +25,7 @@ export interface State extends ConnectorConfiguration {
   mappings: CaseConnectorMapping[];
   persistLoading: boolean;
   version: string;
+  id: string;
 }
 export type Action =
   | {
@@ -50,6 +52,10 @@ export type Action =
       type: 'setVersion';
       payload: string;
     }
+  | {
+      type: 'setID';
+      payload: string;
+    }
   | {
       type: 'setClosureType';
       closureType: ClosureType;
@@ -81,6 +87,11 @@ export const configureCasesReducer = (state: State, action: Action) => {
         ...state,
         version: action.payload,
       };
+    case 'setID':
+      return {
+        ...state,
+        id: action.payload,
+      };
     case 'setCurrentConfiguration': {
       return {
         ...state,
@@ -141,9 +152,11 @@ export const initialState: State = {
   mappings: [],
   persistLoading: false,
   version: '',
+  id: '',
 };
 
 export const useCaseConfigure = (): ReturnUseCaseConfigure => {
+  const owner = useOwnerContext();
   const [state, dispatch] = useReducer(configureCasesReducer, initialState);
   const toasts = useToasts();
   const setCurrentConfiguration = useCallback((configuration: ConnectorConfiguration) => {
@@ -202,6 +215,13 @@ export const useCaseConfigure = (): ReturnUseCaseConfigure => {
     });
   }, []);
 
+  const setID = useCallback((id: string) => {
+    dispatch({
+      payload: id,
+      type: 'setID',
+    });
+  }, []);
+
   const isCancelledRefetchRef = useRef(false);
   const abortCtrlRefetchRef = useRef(new AbortController());
 
@@ -215,7 +235,10 @@ export const useCaseConfigure = (): ReturnUseCaseConfigure => {
       abortCtrlRefetchRef.current = new AbortController();
 
       setLoading(true);
-      const res = await getCaseConfigure({ signal: abortCtrlRefetchRef.current.signal });
+      const res = await getCaseConfigure({
+        signal: abortCtrlRefetchRef.current.signal,
+        owner,
+      });
 
       if (!isCancelledRefetchRef.current) {
         if (res != null) {
@@ -224,6 +247,7 @@ export const useCaseConfigure = (): ReturnUseCaseConfigure => {
             setClosureType(res.closureType);
           }
           setVersion(res.version);
+          setID(res.id);
           setMappings(res.mappings);
 
           if (!state.firstLoad) {
@@ -274,8 +298,13 @@ export const useCaseConfigure = (): ReturnUseCaseConfigure => {
 
         const res =
           state.version.length === 0
-            ? await postCaseConfigure(connectorObj, abortCtrlPersistRef.current.signal)
+            ? await postCaseConfigure(
+                // The first owner will be used for case creation
+                { ...connectorObj, owner: owner[0] },
+                abortCtrlPersistRef.current.signal
+              )
             : await patchCaseConfigure(
+                state.id,
                 {
                   ...connectorObj,
                   version: state.version,
@@ -288,6 +317,7 @@ export const useCaseConfigure = (): ReturnUseCaseConfigure => {
             setClosureType(res.closureType);
           }
           setVersion(res.version);
+          setID(res.id);
           setMappings(res.mappings);
           if (setCurrentConfiguration != null) {
             setCurrentConfiguration({
@@ -321,14 +351,17 @@ export const useCaseConfigure = (): ReturnUseCaseConfigure => {
       }
     },
     [
-      setClosureType,
-      setConnector,
-      setCurrentConfiguration,
-      setMappings,
       setPersistLoading,
-      setVersion,
-      state.currentConfiguration.connector,
       state.version,
+      state.id,
+      state.currentConfiguration.connector,
+      owner,
+      setConnector,
+      setClosureType,
+      setVersion,
+      setID,
+      setMappings,
+      setCurrentConfiguration,
       toasts,
     ]
   );
diff --git a/x-pack/plugins/cases/public/containers/mock.ts b/x-pack/plugins/cases/public/containers/mock.ts
index 1e7cec29de56b..72fee3c602c4e 100644
--- a/x-pack/plugins/cases/public/containers/mock.ts
+++ b/x-pack/plugins/cases/public/containers/mock.ts
@@ -19,6 +19,7 @@ import {
   CommentResponse,
   CommentType,
   ConnectorTypes,
+  SECURITY_SOLUTION_OWNER,
   UserAction,
   UserActionField,
 } from '../../common';
@@ -47,6 +48,7 @@ export const basicComment: Comment = {
   id: basicCommentId,
   createdAt: basicCreatedAt,
   createdBy: elasticUser,
+  owner: SECURITY_SOLUTION_OWNER,
   pushedAt: null,
   pushedBy: null,
   updatedAt: null,
@@ -62,6 +64,7 @@ export const alertComment: Comment = {
   id: 'alert-comment-id',
   createdAt: basicCreatedAt,
   createdBy: elasticUser,
+  owner: SECURITY_SOLUTION_OWNER,
   pushedAt: null,
   pushedBy: null,
   rule: {
@@ -75,6 +78,7 @@ export const alertComment: Comment = {
 
 export const basicCase: Case = {
   type: CaseType.individual,
+  owner: SECURITY_SOLUTION_OWNER,
   closedAt: null,
   closedBy: null,
   id: basicCaseId,
@@ -105,6 +109,7 @@ export const basicCase: Case = {
 
 export const collectionCase: Case = {
   type: CaseType.collection,
+  owner: SECURITY_SOLUTION_OWNER,
   closedAt: null,
   closedBy: null,
   id: 'collection-id',
@@ -181,6 +186,7 @@ const basicAction = {
   newValue: 'what a cool value',
   caseId: basicCaseId,
   commentId: null,
+  owner: SECURITY_SOLUTION_OWNER,
 };
 
 export const cases: Case[] = [
@@ -230,6 +236,7 @@ export const basicCommentSnake: CommentResponse = {
   id: basicCommentId,
   created_at: basicCreatedAt,
   created_by: elasticUserSnake,
+  owner: SECURITY_SOLUTION_OWNER,
   pushed_at: null,
   pushed_by: null,
   updated_at: null,
@@ -254,6 +261,7 @@ export const basicCaseSnake: CaseResponse = {
   external_service: null,
   updated_at: basicUpdatedAt,
   updated_by: elasticUserSnake,
+  owner: SECURITY_SOLUTION_OWNER,
 } as CaseResponse;
 
 export const casesStatusSnake: CasesStatusResponse = {
@@ -311,6 +319,7 @@ const basicActionSnake = {
   new_value: 'what a cool value',
   case_id: basicCaseId,
   comment_id: null,
+  owner: SECURITY_SOLUTION_OWNER,
 };
 export const getUserActionSnake = (af: UserActionField, a: UserAction) => ({
   ...basicActionSnake,
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
index b07fec4984eb1..b3a6932c6971c 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases.test.tsx
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
-import { CaseStatuses } from '../../common';
+import { CaseStatuses, SECURITY_SOLUTION_OWNER } from '../../common';
 import {
   DEFAULT_FILTER_OPTIONS,
   DEFAULT_QUERY_PARAMS,
@@ -17,6 +18,7 @@ import {
 import { UpdateKey } from './types';
 import { allCases, basicCase } from './mock';
 import * as api from './api';
+import { TestProviders } from '../common/mock';
 
 jest.mock('./api');
 jest.mock('../common/lib/kibana');
@@ -30,7 +32,10 @@ describe('useGetCases', () => {
 
   it('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
+
       await waitForNextUpdate();
       expect(result.current).toEqual({
         data: initialData,
@@ -51,11 +56,13 @@ describe('useGetCases', () => {
   it('calls getCases with correct arguments', async () => {
     const spyOnGetCases = jest.spyOn(api, 'getCases');
     await act(async () => {
-      const { waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       expect(spyOnGetCases).toBeCalledWith({
-        filterOptions: DEFAULT_FILTER_OPTIONS,
+        filterOptions: { ...DEFAULT_FILTER_OPTIONS, owner: [SECURITY_SOLUTION_OWNER] },
         queryParams: DEFAULT_QUERY_PARAMS,
         signal: abortCtrl.signal,
       });
@@ -64,7 +71,9 @@ describe('useGetCases', () => {
 
   it('fetch cases', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       expect(result.current).toEqual({
@@ -82,6 +91,7 @@ describe('useGetCases', () => {
       });
     });
   });
+
   it('dispatch update case property', async () => {
     const spyOnPatchCase = jest.spyOn(api, 'patchCase');
     await act(async () => {
@@ -92,7 +102,9 @@ describe('useGetCases', () => {
         refetchCasesStatus: jest.fn(),
         version: '99999',
       };
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       result.current.dispatchUpdateCaseProperty(updateCase);
@@ -109,7 +121,9 @@ describe('useGetCases', () => {
   it('refetch cases', async () => {
     const spyOnGetCases = jest.spyOn(api, 'getCases');
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       result.current.refetchCases();
@@ -119,7 +133,9 @@ describe('useGetCases', () => {
 
   it('set isLoading to true when refetching case', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       result.current.refetchCases();
@@ -135,7 +151,9 @@ describe('useGetCases', () => {
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
 
@@ -154,6 +172,7 @@ describe('useGetCases', () => {
       });
     });
   });
+
   it('set filters', async () => {
     await act(async () => {
       const spyOnGetCases = jest.spyOn(api, 'getCases');
@@ -162,40 +181,61 @@ describe('useGetCases', () => {
         tags: ['new'],
         status: CaseStatuses.closed,
       };
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
+
       await waitForNextUpdate();
       await waitForNextUpdate();
       result.current.setFilters(newFilters);
       await waitForNextUpdate();
+
       expect(spyOnGetCases.mock.calls[1][0]).toEqual({
-        filterOptions: { ...DEFAULT_FILTER_OPTIONS, ...newFilters },
+        filterOptions: {
+          ...DEFAULT_FILTER_OPTIONS,
+          ...newFilters,
+          owner: [SECURITY_SOLUTION_OWNER],
+        },
         queryParams: DEFAULT_QUERY_PARAMS,
         signal: abortCtrl.signal,
       });
     });
   });
+
   it('set query params', async () => {
     await act(async () => {
       const spyOnGetCases = jest.spyOn(api, 'getCases');
       const newQueryParams = {
         page: 2,
       };
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
+
       await waitForNextUpdate();
       await waitForNextUpdate();
       result.current.setQueryParams(newQueryParams);
       await waitForNextUpdate();
+
       expect(spyOnGetCases.mock.calls[1][0]).toEqual({
-        filterOptions: DEFAULT_FILTER_OPTIONS,
-        queryParams: { ...DEFAULT_QUERY_PARAMS, ...newQueryParams },
+        filterOptions: { ...DEFAULT_FILTER_OPTIONS, owner: [SECURITY_SOLUTION_OWNER] },
+        queryParams: {
+          ...DEFAULT_QUERY_PARAMS,
+          ...newQueryParams,
+        },
         signal: abortCtrl.signal,
       });
     });
   });
+
   it('set selected cases', async () => {
     await act(async () => {
       const selectedCases = [basicCase];
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCases>(() => useGetCases(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       result.current.setSelectedCases(selectedCases);
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases.tsx b/x-pack/plugins/cases/public/containers/use_get_cases.tsx
index ec1abd6214926..b3aa374f5418e 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases.tsx
@@ -19,6 +19,7 @@ import {
 import { useToasts } from '../common/lib/kibana';
 import * as i18n from './translations';
 import { getCases, patchCase } from './api';
+import { useOwnerContext } from '../components/owner_context/use_owner_context';
 
 export interface UseGetCasesState {
   data: AllCases;
@@ -139,12 +140,19 @@ export interface UseGetCases extends UseGetCasesState {
 
 const empty = {};
 export const useGetCases = (
-  initialQueryParams: Partial<QueryParams> = empty,
-  initialFilterOptions: Partial<FilterOptions> = empty
+  params: {
+    initialQueryParams?: Partial<QueryParams>;
+    initialFilterOptions?: Partial<FilterOptions>;
+  } = {}
 ): UseGetCases => {
+  const owner = useOwnerContext();
+  const { initialQueryParams = empty, initialFilterOptions = empty } = params;
   const [state, dispatch] = useReducer(dataFetchReducer, {
     data: initialData,
-    filterOptions: { ...DEFAULT_FILTER_OPTIONS, ...initialFilterOptions },
+    filterOptions: {
+      ...DEFAULT_FILTER_OPTIONS,
+      ...initialFilterOptions,
+    },
     isError: false,
     loading: [],
     queryParams: { ...DEFAULT_QUERY_PARAMS, ...initialQueryParams },
@@ -177,7 +185,7 @@ export const useGetCases = (
         dispatch({ type: 'FETCH_INIT', payload: 'cases' });
 
         const response = await getCases({
-          filterOptions,
+          filterOptions: { ...filterOptions, owner },
           queryParams,
           signal: abortCtrlFetchCases.current.signal,
         });
@@ -200,7 +208,7 @@ export const useGetCases = (
         }
       }
     },
-    [toasts]
+    [owner, toasts]
   );
 
   const dispatchUpdateCaseProperty = useCallback(
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx
index f795d5cc60e71..b9047fdafee61 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases_status.test.tsx
@@ -5,10 +5,13 @@
  * 2.0.
  */
 
+import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useGetCasesStatus, UseGetCasesStatus } from './use_get_cases_status';
 import { casesStatus } from './mock';
 import * as api from './api';
+import { TestProviders } from '../common/mock';
+import { SECURITY_SOLUTION_OWNER } from '../../common';
 
 jest.mock('./api');
 jest.mock('../common/lib/kibana');
@@ -22,8 +25,11 @@ describe('useGetCasesStatus', () => {
 
   it('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(() =>
-        useGetCasesStatus()
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(
+        () => useGetCasesStatus(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       expect(result.current).toEqual({
@@ -40,19 +46,25 @@ describe('useGetCasesStatus', () => {
   it('calls getCasesStatus api', async () => {
     const spyOnGetCasesStatus = jest.spyOn(api, 'getCasesStatus');
     await act(async () => {
-      const { waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(() =>
-        useGetCasesStatus()
+      const { waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(
+        () => useGetCasesStatus(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
-      expect(spyOnGetCasesStatus).toBeCalledWith(abortCtrl.signal);
+      expect(spyOnGetCasesStatus).toBeCalledWith(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
     });
   });
 
   it('fetch reporters', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(() =>
-        useGetCasesStatus()
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(
+        () => useGetCasesStatus(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -74,8 +86,11 @@ describe('useGetCasesStatus', () => {
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(() =>
-        useGetCasesStatus()
+      const { result, waitForNextUpdate } = renderHook<string, UseGetCasesStatus>(
+        () => useGetCasesStatus(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
diff --git a/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx b/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx
index c3244bb38f151..909bc42345759 100644
--- a/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_cases_status.tsx
@@ -7,6 +7,7 @@
 
 import { useCallback, useEffect, useState, useRef } from 'react';
 
+import { useOwnerContext } from '../components/owner_context/use_owner_context';
 import { getCasesStatus } from './api';
 import * as i18n from './translations';
 import { CasesStatus } from './types';
@@ -30,6 +31,7 @@ export interface UseGetCasesStatus extends CasesStatusState {
 }
 
 export const useGetCasesStatus = (): UseGetCasesStatus => {
+  const owner = useOwnerContext();
   const [casesStatusState, setCasesStatusState] = useState<CasesStatusState>(initialData);
   const toasts = useToasts();
   const isCancelledRef = useRef(false);
@@ -45,7 +47,7 @@ export const useGetCasesStatus = (): UseGetCasesStatus => {
         isLoading: true,
       });
 
-      const response = await getCasesStatus(abortCtrlRef.current.signal);
+      const response = await getCasesStatus(abortCtrlRef.current.signal, owner);
 
       if (!isCancelledRef.current) {
         setCasesStatusState({
diff --git a/x-pack/plugins/cases/public/containers/use_get_reporters.test.tsx b/x-pack/plugins/cases/public/containers/use_get_reporters.test.tsx
index 8345ddf107872..692c5237f58bf 100644
--- a/x-pack/plugins/cases/public/containers/use_get_reporters.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_reporters.test.tsx
@@ -5,10 +5,13 @@
  * 2.0.
  */
 
+import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useGetReporters, UseGetReporters } from './use_get_reporters';
 import { reporters, respReporters } from './mock';
 import * as api from './api';
+import { TestProviders } from '../common/mock';
+import { SECURITY_SOLUTION_OWNER } from '../../common';
 
 jest.mock('./api');
 jest.mock('../common/lib/kibana');
@@ -22,8 +25,11 @@ describe('useGetReporters', () => {
 
   it('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(() =>
-        useGetReporters()
+      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(
+        () => useGetReporters(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       expect(result.current).toEqual({
@@ -39,17 +45,22 @@ describe('useGetReporters', () => {
   it('calls getReporters api', async () => {
     const spyOnGetReporters = jest.spyOn(api, 'getReporters');
     await act(async () => {
-      const { waitForNextUpdate } = renderHook<string, UseGetReporters>(() => useGetReporters());
+      const { waitForNextUpdate } = renderHook<string, UseGetReporters>(() => useGetReporters(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
-      expect(spyOnGetReporters).toBeCalledWith(abortCtrl.signal);
+      expect(spyOnGetReporters).toBeCalledWith(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
     });
   });
 
   it('fetch reporters', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(() =>
-        useGetReporters()
+      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(
+        () => useGetReporters(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -66,8 +77,11 @@ describe('useGetReporters', () => {
   it('refetch reporters', async () => {
     const spyOnGetReporters = jest.spyOn(api, 'getReporters');
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(() =>
-        useGetReporters()
+      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(
+        () => useGetReporters(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
@@ -83,8 +97,11 @@ describe('useGetReporters', () => {
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(() =>
-        useGetReporters()
+      const { result, waitForNextUpdate } = renderHook<string, UseGetReporters>(
+        () => useGetReporters(),
+        {
+          wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+        }
       );
       await waitForNextUpdate();
       await waitForNextUpdate();
diff --git a/x-pack/plugins/cases/public/containers/use_get_reporters.tsx b/x-pack/plugins/cases/public/containers/use_get_reporters.tsx
index a9d28de33cb41..b3c2eff2c8e01 100644
--- a/x-pack/plugins/cases/public/containers/use_get_reporters.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_reporters.tsx
@@ -12,6 +12,7 @@ import { User } from '../../common';
 import { getReporters } from './api';
 import * as i18n from './translations';
 import { useToasts } from '../common/lib/kibana';
+import { useOwnerContext } from '../components/owner_context/use_owner_context';
 
 interface ReportersState {
   reporters: string[];
@@ -32,6 +33,7 @@ export interface UseGetReporters extends ReportersState {
 }
 
 export const useGetReporters = (): UseGetReporters => {
+  const owner = useOwnerContext();
   const [reportersState, setReporterState] = useState<ReportersState>(initialData);
 
   const toasts = useToasts();
@@ -48,7 +50,7 @@ export const useGetReporters = (): UseGetReporters => {
         isLoading: true,
       });
 
-      const response = await getReporters(abortCtrlRef.current.signal);
+      const response = await getReporters(abortCtrlRef.current.signal, owner);
       const myReporters = response
         .map((r) => (r.full_name == null || isEmpty(r.full_name) ? r.username ?? '' : r.full_name))
         .filter((u) => !isEmpty(u));
@@ -78,7 +80,7 @@ export const useGetReporters = (): UseGetReporters => {
         });
       }
     }
-  }, [reportersState, toasts]);
+  }, [owner, reportersState, toasts]);
 
   useEffect(() => {
     fetchReporters();
diff --git a/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx b/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx
index 3fecfb51b958c..60d368aca0a04 100644
--- a/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_tags.test.tsx
@@ -5,10 +5,13 @@
  * 2.0.
  */
 
+import React from 'react';
 import { renderHook, act } from '@testing-library/react-hooks';
 import { useGetTags, UseGetTags } from './use_get_tags';
 import { tags } from './mock';
 import * as api from './api';
+import { TestProviders } from '../common/mock';
+import { SECURITY_SOLUTION_OWNER } from '../../common';
 
 jest.mock('./api');
 jest.mock('../common/lib/kibana');
@@ -22,7 +25,9 @@ describe('useGetTags', () => {
 
   it('init', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       expect(result.current).toEqual({
         tags: [],
@@ -36,16 +41,20 @@ describe('useGetTags', () => {
   it('calls getTags api', async () => {
     const spyOnGetTags = jest.spyOn(api, 'getTags');
     await act(async () => {
-      const { waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags());
+      const { waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
-      expect(spyOnGetTags).toBeCalledWith(abortCtrl.signal);
+      expect(spyOnGetTags).toBeCalledWith(abortCtrl.signal, [SECURITY_SOLUTION_OWNER]);
     });
   });
 
   it('fetch tags', async () => {
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       expect(result.current).toEqual({
@@ -60,7 +69,9 @@ describe('useGetTags', () => {
   it('refetch tags', async () => {
     const spyOnGetTags = jest.spyOn(api, 'getTags');
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
       result.current.fetchTags();
@@ -75,7 +86,9 @@ describe('useGetTags', () => {
     });
 
     await act(async () => {
-      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags());
+      const { result, waitForNextUpdate } = renderHook<string, UseGetTags>(() => useGetTags(), {
+        wrapper: ({ children }) => <TestProviders>{children}</TestProviders>,
+      });
       await waitForNextUpdate();
       await waitForNextUpdate();
 
diff --git a/x-pack/plugins/cases/public/containers/use_get_tags.tsx b/x-pack/plugins/cases/public/containers/use_get_tags.tsx
index 4368b025baa38..362e7ebf8fbf3 100644
--- a/x-pack/plugins/cases/public/containers/use_get_tags.tsx
+++ b/x-pack/plugins/cases/public/containers/use_get_tags.tsx
@@ -7,6 +7,7 @@
 
 import { useEffect, useReducer, useRef, useCallback } from 'react';
 import { useToasts } from '../common/lib/kibana';
+import { useOwnerContext } from '../components/owner_context/use_owner_context';
 import { getTags } from './api';
 import * as i18n from './translations';
 
@@ -52,6 +53,7 @@ const dataFetchReducer = (state: TagsState, action: Action): TagsState => {
 const initialData: string[] = [];
 
 export const useGetTags = (): UseGetTags => {
+  const owner = useOwnerContext();
   const [state, dispatch] = useReducer(dataFetchReducer, {
     isLoading: true,
     isError: false,
@@ -68,7 +70,7 @@ export const useGetTags = (): UseGetTags => {
       abortCtrlRef.current = new AbortController();
       dispatch({ type: 'FETCH_INIT' });
 
-      const response = await getTags(abortCtrlRef.current.signal);
+      const response = await getTags(abortCtrlRef.current.signal, owner);
 
       if (!isCancelledRef.current) {
         dispatch({ type: 'FETCH_SUCCESS', payload: response });
diff --git a/x-pack/plugins/cases/public/containers/use_post_case.test.tsx b/x-pack/plugins/cases/public/containers/use_post_case.test.tsx
index f7f7f1419c713..d2b638b4c846f 100644
--- a/x-pack/plugins/cases/public/containers/use_post_case.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_post_case.test.tsx
@@ -8,7 +8,7 @@
 import { renderHook, act } from '@testing-library/react-hooks';
 import { usePostCase, UsePostCase } from './use_post_case';
 import * as api from './api';
-import { ConnectorTypes } from '../../common';
+import { ConnectorTypes, SECURITY_SOLUTION_OWNER } from '../../common';
 import { basicCasePost } from './mock';
 
 jest.mock('./api');
@@ -29,6 +29,7 @@ describe('usePostCase', () => {
     settings: {
       syncAlerts: true,
     },
+    owner: SECURITY_SOLUTION_OWNER,
   };
   beforeEach(() => {
     jest.clearAllMocks();
diff --git a/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx b/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx
index 5b927f55c9e91..8a86d9becdfde 100644
--- a/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx
+++ b/x-pack/plugins/cases/public/containers/use_post_comment.test.tsx
@@ -7,7 +7,7 @@
 
 import { renderHook, act } from '@testing-library/react-hooks';
 
-import { CommentType } from '../../common';
+import { CommentType, SECURITY_SOLUTION_OWNER } from '../../common';
 import { usePostComment, UsePostComment } from './use_post_comment';
 import { basicCaseId, basicSubCaseId } from './mock';
 import * as api from './api';
@@ -20,6 +20,7 @@ describe('usePostComment', () => {
   const samplePost = {
     comment: 'a comment',
     type: CommentType.user as const,
+    owner: SECURITY_SOLUTION_OWNER,
   };
   const updateCaseCallback = jest.fn();
   beforeEach(() => {
diff --git a/x-pack/plugins/cases/public/containers/utils.ts b/x-pack/plugins/cases/public/containers/utils.ts
index 5ef30aa800f90..de67b1cfbd6fa 100644
--- a/x-pack/plugins/cases/public/containers/utils.ts
+++ b/x-pack/plugins/cases/public/containers/utils.ts
@@ -22,6 +22,8 @@ import {
   CasesStatusResponseRt,
   CasesStatusResponse,
   throwErrors,
+  CasesConfigurationsResponse,
+  CaseConfigurationsResponseRt,
   CasesConfigureResponse,
   CaseConfigureResponseRt,
   CaseUserActionsResponse,
@@ -92,6 +94,13 @@ export const decodeCasesResponse = (respCase?: CasesResponse) =>
 export const decodeCasesFindResponse = (respCases?: CasesFindResponse) =>
   pipe(CasesFindResponseRt.decode(respCases), fold(throwErrors(createToasterPlainError), identity));
 
+export const decodeCaseConfigurationsResponse = (respCase?: CasesConfigurationsResponse) => {
+  return pipe(
+    CaseConfigurationsResponseRt.decode(respCase),
+    fold(throwErrors(createToasterPlainError), identity)
+  );
+};
+
 export const decodeCaseConfigureResponse = (respCase?: CasesConfigureResponse) =>
   pipe(
     CaseConfigureResponseRt.decode(respCase),
diff --git a/x-pack/plugins/cases/public/methods/get_all_cases_selector_modal.tsx b/x-pack/plugins/cases/public/methods/get_all_cases_selector_modal.tsx
index b6caae39c284a..dbb466129c60b 100644
--- a/x-pack/plugins/cases/public/methods/get_all_cases_selector_modal.tsx
+++ b/x-pack/plugins/cases/public/methods/get_all_cases_selector_modal.tsx
@@ -8,10 +8,14 @@
 import React, { lazy, Suspense } from 'react';
 import { EuiLoadingSpinner } from '@elastic/eui';
 import { AllCasesSelectorModalProps } from '../components/all_cases/selector_modal';
+import { OwnerProvider } from '../components/owner_context';
+import { Owner } from '../types';
 
 const AllCasesSelectorModalLazy = lazy(() => import('../components/all_cases/selector_modal'));
-export const getAllCasesSelectorModalLazy = (props: AllCasesSelectorModalProps) => (
-  <Suspense fallback={<EuiLoadingSpinner />}>
-    <AllCasesSelectorModalLazy {...props} />
-  </Suspense>
+export const getAllCasesSelectorModalLazy = (props: AllCasesSelectorModalProps & Owner) => (
+  <OwnerProvider owner={props.owner}>
+    <Suspense fallback={<EuiLoadingSpinner />}>
+      <AllCasesSelectorModalLazy {...props} />
+    </Suspense>
+  </OwnerProvider>
 );
diff --git a/x-pack/plugins/cases/public/types.ts b/x-pack/plugins/cases/public/types.ts
index 269d1773b3404..2193832492aa2 100644
--- a/x-pack/plugins/cases/public/types.ts
+++ b/x-pack/plugins/cases/public/types.ts
@@ -39,6 +39,10 @@ export type StartServices = CoreStart &
     security: SecurityPluginSetup;
   };
 
+export interface Owner {
+  owner: string[];
+}
+
 export interface CasesUiStart {
   getAllCases: (props: AllCasesProps) => ReactElement<AllCasesProps>;
   getAllCasesSelectorModal: (
diff --git a/x-pack/plugins/cases/server/authorization/__snapshots__/audit_logger.test.ts.snap b/x-pack/plugins/cases/server/authorization/__snapshots__/audit_logger.test.ts.snap
new file mode 100644
index 0000000000000..7f5b8406b89f3
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/__snapshots__/audit_logger.test.ts.snap
@@ -0,0 +1,1765 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createCase" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to create cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createCase" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "message": "Failed attempt to create a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createCase" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User is creating cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createCase" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "message": "User is creating a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createComment" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to create cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createComment" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "message": "Failed attempt to create a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createComment" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User is creating cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createComment" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "message": "User is creating a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createConfiguration" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_configuration_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-configure",
+    },
+  },
+  "message": "Failed attempt to create cases-configure [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createConfiguration" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_configuration_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "message": "Failed attempt to create a case configuration as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createConfiguration" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_configuration_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-configure",
+    },
+  },
+  "message": "User is creating cases-configure [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "createConfiguration" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_configuration_create",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "creation",
+    ],
+  },
+  "message": "User is creating a case configuration as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteAllComments" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_delete_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to delete cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteAllComments" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_delete_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "message": "Failed attempt to delete a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteAllComments" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_delete_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User is deleting cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteAllComments" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_delete_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "message": "User is deleting a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteCase" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to delete cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteCase" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "message": "Failed attempt to delete a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteCase" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User is deleting cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteCase" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "message": "User is deleting a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteComment" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to delete cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteComment" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "message": "Failed attempt to delete a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteComment" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User is deleting cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "deleteComment" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_delete",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "deletion",
+    ],
+  },
+  "message": "User is deleting a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findCases" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to access cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findCases" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a cases as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findCases" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User has accessed cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findCases" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a cases as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findComments" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to access cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findComments" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findComments" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User has accessed cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findComments" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findConfigurations" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_configuration_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-configure",
+    },
+  },
+  "message": "Failed attempt to access cases-configure [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findConfigurations" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_configuration_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a case configurations as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findConfigurations" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_configuration_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-configure",
+    },
+  },
+  "message": "User has accessed cases-configure [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "findConfigurations" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_configuration_find",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a case configurations as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getAllComments" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_get_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to access cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getAllComments" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_get_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getAllComments" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_get_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User has accessed cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getAllComments" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_get_all",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCase" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to access cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCase" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCase" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User has accessed cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCase" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseIDsByAlertID" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_ids_by_alert_id_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to access cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseIDsByAlertID" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_ids_by_alert_id_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a cases as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseIDsByAlertID" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_ids_by_alert_id_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User has accessed cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseIDsByAlertID" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_ids_by_alert_id_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a cases as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseStatuses" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_find_statuses",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to access cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseStatuses" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_find_statuses",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a cases as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseStatuses" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_find_statuses",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User has accessed cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getCaseStatuses" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_find_statuses",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a cases as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getComment" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to access cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getComment" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getComment" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User has accessed cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getComment" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getReporters" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_reporters_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to access cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getReporters" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_reporters_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getReporters" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_reporters_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User has accessed cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getReporters" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_reporters_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getTags" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_tags_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to access cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getTags" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_tags_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getTags" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_tags_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User has accessed cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getTags" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_tags_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getUserActions" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_user_actions_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-user-actions",
+    },
+  },
+  "message": "Failed attempt to access cases-user-actions [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getUserActions" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_user_actions_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "Failed attempt to access a user actions as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getUserActions" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_user_actions_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-user-actions",
+    },
+  },
+  "message": "User has accessed cases-user-actions [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "getUserActions" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_user_actions_get",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "success",
+    "type": Array [
+      "access",
+    ],
+  },
+  "message": "User has accessed a user actions as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "pushCase" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_push",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to update cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "pushCase" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_push",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "Failed attempt to update a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "pushCase" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_push",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User is updating cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "pushCase" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_push",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "User is updating a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateCase" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases",
+    },
+  },
+  "message": "Failed attempt to update cases [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateCase" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "Failed attempt to update a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateCase" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases",
+    },
+  },
+  "message": "User is updating cases [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateCase" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "User is updating a case as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateComment" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-comments",
+    },
+  },
+  "message": "Failed attempt to update cases-comments [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateComment" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_comment_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "Failed attempt to update a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateComment" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-comments",
+    },
+  },
+  "message": "User is updating cases-comments [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateComment" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_comment_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "User is updating a comments as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateConfiguration" with an error and entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_configuration_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "1",
+      "type": "cases-configure",
+    },
+  },
+  "message": "Failed attempt to update cases-configure [id=1] as owner \\"awesome\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateConfiguration" with an error but no entity 1`] = `
+Object {
+  "error": Object {
+    "code": "Error",
+    "message": "an error",
+  },
+  "event": Object {
+    "action": "case_configuration_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "failure",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "Failed attempt to update a case configuration as any owners",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateConfiguration" without an error but with an entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_configuration_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "kibana": Object {
+    "saved_object": Object {
+      "id": "5",
+      "type": "cases-configure",
+    },
+  },
+  "message": "User is updating cases-configure [id=5] as owner \\"super\\"",
+}
+`;
+
+exports[`audit_logger log function event structure creates the correct audit event for operation: "updateConfiguration" without an error or entity 1`] = `
+Object {
+  "event": Object {
+    "action": "case_configuration_update",
+    "category": Array [
+      "database",
+    ],
+    "outcome": "unknown",
+    "type": Array [
+      "change",
+    ],
+  },
+  "message": "User is updating a case configuration as any owners",
+}
+`;
diff --git a/x-pack/plugins/cases/server/authorization/audit_logger.test.ts b/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
new file mode 100644
index 0000000000000..d54b5164b10b9
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/audit_logger.test.ts
@@ -0,0 +1,208 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { AuditLogger } from '../../../../plugins/security/server';
+import { Operations } from '.';
+import { AuthorizationAuditLogger } from './audit_logger';
+import { ReadOperations } from './types';
+
+describe('audit_logger', () => {
+  it('creates a failure message without any owners', () => {
+    expect(
+      AuthorizationAuditLogger.createFailureMessage({
+        owners: [],
+        operation: Operations.createCase,
+      })
+    ).toBe('Unauthorized to create case of any owner');
+  });
+
+  it('creates a failure message with owners', () => {
+    expect(
+      AuthorizationAuditLogger.createFailureMessage({
+        owners: ['a', 'b'],
+        operation: Operations.createCase,
+      })
+    ).toBe('Unauthorized to create case with owners: "a, b"');
+  });
+
+  describe('log function', () => {
+    const mockLogger: jest.Mocked<AuditLogger> = {
+      log: jest.fn(),
+    };
+
+    let logger: AuthorizationAuditLogger;
+
+    beforeEach(() => {
+      mockLogger.log.mockReset();
+      logger = new AuthorizationAuditLogger(mockLogger);
+    });
+
+    it('does not throw an error when the underlying audit logger is undefined', () => {
+      const authLogger = new AuthorizationAuditLogger();
+      jest.spyOn(authLogger, 'log');
+
+      expect(() => {
+        authLogger.log({
+          operation: Operations.createCase,
+          entity: {
+            owner: 'a',
+            id: '1',
+          },
+        });
+      }).not.toThrow();
+
+      expect(authLogger.log).toHaveBeenCalledTimes(1);
+    });
+
+    it('logs a message with a saved object ID in the message field', () => {
+      logger.log({
+        operation: Operations.createCase,
+        entity: {
+          owner: 'a',
+          id: '1',
+        },
+      });
+      expect(mockLogger.log.mock.calls[0][0]?.message).toContain('[id=1]');
+    });
+
+    it('creates the owner part of the message when no owners are specified', () => {
+      logger.log({
+        operation: Operations.createCase,
+      });
+
+      expect(mockLogger.log.mock.calls[0][0]?.message).toContain('as any owners');
+    });
+
+    it('creates the owner part of the message when an owner is specified', () => {
+      logger.log({
+        operation: Operations.createCase,
+        entity: {
+          owner: 'a',
+          id: '1',
+        },
+      });
+
+      expect(mockLogger.log.mock.calls[0][0]?.message).toContain('as owner "a"');
+    });
+
+    it('creates a failure message when passed an error', () => {
+      logger.log({
+        operation: Operations.createCase,
+        entity: {
+          owner: 'a',
+          id: '1',
+        },
+        error: new Error('error occurred'),
+      });
+
+      expect(mockLogger.log.mock.calls[0][0]?.message).toBe(
+        'Failed attempt to create cases [id=1] as owner "a"'
+      );
+
+      expect(mockLogger.log.mock.calls[0][0]?.event?.outcome).toBe('failure');
+    });
+
+    it('creates a write operation message', () => {
+      logger.log({
+        operation: Operations.createCase,
+        entity: {
+          owner: 'a',
+          id: '1',
+        },
+      });
+
+      expect(mockLogger.log.mock.calls[0][0]?.message).toBe(
+        'User is creating cases [id=1] as owner "a"'
+      );
+
+      expect(mockLogger.log.mock.calls[0][0]?.event?.outcome).toBe('unknown');
+    });
+
+    it('creates a read operation message', () => {
+      logger.log({
+        operation: Operations.getCase,
+        entity: {
+          owner: 'a',
+          id: '1',
+        },
+      });
+
+      expect(mockLogger.log.mock.calls[0][0]?.message).toBe(
+        'User has accessed cases [id=1] as owner "a"'
+      );
+
+      expect(mockLogger.log.mock.calls[0][0]?.event?.outcome).toBe('success');
+    });
+
+    describe('event structure', () => {
+      // I would have preferred to do these as match inline but that isn't supported because this is essentially a for loop
+      // for reference: https://github.com/facebook/jest/issues/9409#issuecomment-629272237
+
+      // This loops through all operation keys
+      it.each(Array.from(Object.keys(Operations)))(
+        `creates the correct audit event for operation: "%s" without an error or entity`,
+        (operationKey) => {
+          // forcing the cast here because using a string throws a type error
+          const key = operationKey as ReadOperations;
+          logger.log({
+            operation: Operations[key],
+          });
+          expect(mockLogger.log.mock.calls[0][0]).toMatchSnapshot();
+        }
+      );
+
+      // This loops through all operation keys
+      it.each(Array.from(Object.keys(Operations)))(
+        `creates the correct audit event for operation: "%s" with an error but no entity`,
+        (operationKey) => {
+          // forcing the cast here because using a string throws a type error
+          const key = operationKey as ReadOperations;
+          logger.log({
+            operation: Operations[key],
+            error: new Error('an error'),
+          });
+          expect(mockLogger.log.mock.calls[0][0]).toMatchSnapshot();
+        }
+      );
+
+      // This loops through all operation keys
+      it.each(Array.from(Object.keys(Operations)))(
+        `creates the correct audit event for operation: "%s" with an error and entity`,
+        (operationKey) => {
+          // forcing the cast here because using a string throws a type error
+          const key = operationKey as ReadOperations;
+          logger.log({
+            operation: Operations[key],
+            entity: {
+              owner: 'awesome',
+              id: '1',
+            },
+            error: new Error('an error'),
+          });
+          expect(mockLogger.log.mock.calls[0][0]).toMatchSnapshot();
+        }
+      );
+
+      // This loops through all operation keys
+      it.each(Array.from(Object.keys(Operations)))(
+        `creates the correct audit event for operation: "%s" without an error but with an entity`,
+        (operationKey) => {
+          // forcing the cast here because using a string throws a type error
+          const key = operationKey as ReadOperations;
+          logger.log({
+            operation: Operations[key],
+            entity: {
+              owner: 'super',
+              id: '5',
+            },
+          });
+          expect(mockLogger.log.mock.calls[0][0]).toMatchSnapshot();
+        }
+      );
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/server/authorization/audit_logger.ts b/x-pack/plugins/cases/server/authorization/audit_logger.ts
new file mode 100644
index 0000000000000..a59dfaaa4dabe
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/audit_logger.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 { EcsEventOutcome } from 'kibana/server';
+import { DATABASE_CATEGORY, ECS_OUTCOMES, isWriteOperation, OperationDetails } from '.';
+import { AuditEvent, AuditLogger } from '../../../security/server';
+import { OwnerEntity } from './types';
+
+interface CreateAuditMsgParams {
+  operation: OperationDetails;
+  entity?: OwnerEntity;
+  error?: Error;
+}
+
+/**
+ * Audit logger for authorization operations
+ */
+export class AuthorizationAuditLogger {
+  private readonly auditLogger?: AuditLogger;
+
+  constructor(logger?: AuditLogger) {
+    this.auditLogger = logger;
+  }
+
+  /**
+   * Creates an AuditEvent describing the state of a request.
+   */
+  private static createAuditMsg({ operation, error, entity }: CreateAuditMsgParams): AuditEvent {
+    const doc =
+      entity !== undefined
+        ? `${operation.savedObjectType} [id=${entity.id}]`
+        : `a ${operation.docType}`;
+
+    const ownerText = entity === undefined ? 'as any owners' : `as owner "${entity.owner}"`;
+
+    let message: string;
+    let outcome: EcsEventOutcome;
+
+    if (error) {
+      message = `Failed attempt to ${operation.verbs.present} ${doc} ${ownerText}`;
+      outcome = ECS_OUTCOMES.failure;
+    } else if (isWriteOperation(operation)) {
+      message = `User is ${operation.verbs.progressive} ${doc} ${ownerText}`;
+      outcome = ECS_OUTCOMES.unknown;
+    } else {
+      message = `User has ${operation.verbs.past} ${doc} ${ownerText}`;
+      outcome = ECS_OUTCOMES.success;
+    }
+
+    return {
+      message,
+      event: {
+        action: operation.action,
+        category: DATABASE_CATEGORY,
+        type: [operation.ecsType],
+        outcome,
+      },
+      ...(entity !== undefined && {
+        kibana: {
+          saved_object: { type: operation.savedObjectType, id: entity.id },
+        },
+      }),
+      ...(error !== undefined && {
+        error: {
+          code: error.name,
+          message: error.message,
+        },
+      }),
+    };
+  }
+
+  /**
+   * Creates a message to be passed to an Error or Boom.
+   */
+  public static createFailureMessage({
+    owners,
+    operation,
+  }: {
+    owners: string[];
+    operation: OperationDetails;
+  }) {
+    const ownerMsg = owners.length <= 0 ? 'of any owner' : `with owners: "${owners.join(', ')}"`;
+    /**
+     * This will take the form:
+     * `Unauthorized to create case with owners: "securitySolution, observability"`
+     * `Unauthorized to access cases of any owner`
+     */
+    return `Unauthorized to ${operation.verbs.present} ${operation.docType} ${ownerMsg}`;
+  }
+
+  /**
+   * Logs an audit event based on the status of an operation.
+   */
+  public log(auditMsgParams: CreateAuditMsgParams) {
+    this.auditLogger?.log(AuthorizationAuditLogger.createAuditMsg(auditMsgParams));
+  }
+}
diff --git a/x-pack/plugins/cases/server/authorization/authorization.test.ts b/x-pack/plugins/cases/server/authorization/authorization.test.ts
new file mode 100644
index 0000000000000..e602de565f294
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/authorization.test.ts
@@ -0,0 +1,977 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { securityMock } from '../../../../plugins/security/server/mocks';
+import { httpServerMock, loggingSystemMock } from '../../../../../src/core/server/mocks';
+import { featuresPluginMock } from '../../../../plugins/features/server/mocks';
+import { Authorization, Operations } from '.';
+import { Space } from '../../../spaces/server';
+import { AuthorizationAuditLogger } from './audit_logger';
+import { KibanaRequest } from 'kibana/server';
+import { KibanaFeature } from '../../../../plugins/features/common';
+import { AuditLogger, SecurityPluginStart } from '../../../security/server';
+import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
+
+describe('authorization', () => {
+  let request: KibanaRequest;
+  let mockLogger: jest.Mocked<AuditLogger>;
+
+  beforeEach(() => {
+    request = httpServerMock.createKibanaRequest();
+    mockLogger = {
+      log: jest.fn(),
+    };
+  });
+
+  describe('create', () => {
+    let securityStart: jest.Mocked<SecurityPluginStart>;
+    let featuresStart: jest.Mocked<FeaturesPluginStart>;
+
+    beforeEach(() => {
+      securityStart = securityMock.createStart();
+      featuresStart = featuresPluginMock.createStart();
+      featuresStart.getKibanaFeatures.mockReturnValue(([
+        { id: '1', cases: ['a'] },
+      ] as unknown) as KibanaFeature[]);
+    });
+
+    it('creates an Authorization object', async () => {
+      expect.assertions(2);
+
+      const getSpace = jest.fn();
+      const authPromise = Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace,
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      await expect(authPromise).resolves.toBeDefined();
+      await expect(authPromise).resolves.not.toThrow();
+    });
+
+    it('throws and error when a failure occurs', async () => {
+      expect.assertions(1);
+
+      const getSpace = jest.fn(async () => {
+        throw new Error('space error');
+      });
+
+      const authPromise = Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace,
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      await expect(authPromise).rejects.toThrow();
+    });
+  });
+
+  describe('ensureAuthorized', () => {
+    const feature = { id: '1', cases: ['a'] };
+
+    let securityStart: ReturnType<typeof securityMock.createStart>;
+    let featuresStart: jest.Mocked<FeaturesPluginStart>;
+    let auth: Authorization;
+
+    beforeEach(async () => {
+      securityStart = securityMock.createStart();
+      securityStart.authz.mode.useRbacForRequest.mockReturnValue(true);
+      securityStart.authz.checkPrivilegesDynamicallyWithRequest.mockReturnValue(
+        jest.fn(async () => ({ hasAllRequested: true }))
+      );
+
+      featuresStart = featuresPluginMock.createStart();
+      featuresStart.getKibanaFeatures.mockReturnValue(([feature] as unknown) as KibanaFeature[]);
+
+      auth = await Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(mockLogger),
+        logger: loggingSystemMock.createLogger(),
+      });
+    });
+
+    it('throws an error when the owner passed in is not included in the features when security is disabled', async () => {
+      expect.assertions(1);
+      securityStart.authz.mode.useRbacForRequest.mockReturnValue(false);
+
+      try {
+        await auth.ensureAuthorized({
+          entities: [{ id: '1', owner: 'b' }],
+          operation: Operations.createCase,
+        });
+      } catch (error) {
+        expect(error.message).toBe('Unauthorized to create case with owners: "b"');
+      }
+    });
+
+    it('throws an error when the owner passed in is not included in the features when security undefined', async () => {
+      expect.assertions(1);
+
+      auth = await Authorization.create({
+        request,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      try {
+        await auth.ensureAuthorized({
+          entities: [{ id: '1', owner: 'b' }],
+          operation: Operations.createCase,
+        });
+      } catch (error) {
+        expect(error.message).toBe('Unauthorized to create case with owners: "b"');
+      }
+    });
+
+    it('throws an error when the owner passed in is not included in the features when security is enabled', async () => {
+      expect.assertions(1);
+
+      try {
+        await auth.ensureAuthorized({
+          entities: [{ id: '1', owner: 'b' }],
+          operation: Operations.createCase,
+        });
+      } catch (error) {
+        expect(error.message).toBe('Unauthorized to create case with owners: "b"');
+      }
+    });
+
+    it('logs the error thrown when the passed in owner is not one of the features', async () => {
+      expect.assertions(2);
+
+      try {
+        await auth.ensureAuthorized({
+          entities: [
+            { id: '1', owner: 'b' },
+            { id: '5', owner: 'z' },
+          ],
+          operation: Operations.createCase,
+        });
+      } catch (error) {
+        expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`
+          Array [
+            Array [
+              Object {
+                "error": Object {
+                  "code": "Error",
+                  "message": "Unauthorized to create case with owners: \\"b, z\\"",
+                },
+                "event": Object {
+                  "action": "case_create",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "failure",
+                  "type": Array [
+                    "creation",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "1",
+                    "type": "cases",
+                  },
+                },
+                "message": "Failed attempt to create cases [id=1] as owner \\"b\\"",
+              },
+            ],
+            Array [
+              Object {
+                "error": Object {
+                  "code": "Error",
+                  "message": "Unauthorized to create case with owners: \\"b, z\\"",
+                },
+                "event": Object {
+                  "action": "case_create",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "failure",
+                  "type": Array [
+                    "creation",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "5",
+                    "type": "cases",
+                  },
+                },
+                "message": "Failed attempt to create cases [id=5] as owner \\"z\\"",
+              },
+            ],
+          ]
+        `);
+        expect(error.message).toBe('Unauthorized to create case with owners: "b, z"');
+      }
+    });
+
+    it('throws an error when the user does not have all the requested privileges', async () => {
+      expect.assertions(1);
+
+      securityStart.authz.checkPrivilegesDynamicallyWithRequest.mockReturnValue(
+        jest.fn(async () => ({ hasAllRequested: false }))
+      );
+
+      try {
+        await auth.ensureAuthorized({
+          entities: [{ id: '1', owner: 'a' }],
+          operation: Operations.createCase,
+        });
+      } catch (error) {
+        expect(error.message).toBe('Unauthorized to create case with owners: "a"');
+      }
+    });
+
+    it('throws an error when owner does not exist because it was from a disabled plugin', async () => {
+      expect.assertions(1);
+
+      auth = await Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace: jest.fn(async () => ({ disabledFeatures: [feature.id] } as Space)),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      try {
+        await auth.ensureAuthorized({
+          entities: [{ id: '100', owner: feature.cases[0] }],
+          operation: Operations.createCase,
+        });
+      } catch (error) {
+        expect(error.message).toBe(
+          `Unauthorized to create case with owners: "${feature.cases[0]}"`
+        );
+      }
+    });
+
+    it('does not throw an error when the user has the privileges needed', async () => {
+      expect.assertions(1);
+
+      featuresStart.getKibanaFeatures.mockReturnValue(([
+        feature,
+        { id: '2', cases: ['other-owner'] },
+      ] as unknown) as KibanaFeature[]);
+
+      auth = await Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      await expect(
+        auth.ensureAuthorized({
+          entities: [
+            { id: '100', owner: feature.cases[0] },
+            { id: '3', owner: 'other-owner' },
+          ],
+          operation: Operations.createCase,
+        })
+      ).resolves.not.toThrow();
+    });
+
+    it('does not throw an error when the user has the privileges needed with a feature specifying multiple owners', async () => {
+      expect.assertions(1);
+
+      featuresStart.getKibanaFeatures.mockReturnValue(([
+        { id: '2', cases: ['a', 'other-owner'] },
+      ] as unknown) as KibanaFeature[]);
+
+      auth = await Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      await expect(
+        auth.ensureAuthorized({
+          entities: [
+            { id: '100', owner: 'a' },
+            { id: '3', owner: 'other-owner' },
+          ],
+          operation: Operations.createCase,
+        })
+      ).resolves.not.toThrow();
+    });
+
+    it('logs a successful authorization when the user has the privileges needed with a feature specifying multiple owners', async () => {
+      expect.assertions(2);
+
+      featuresStart.getKibanaFeatures.mockReturnValue(([
+        { id: '2', cases: ['a', 'other-owner'] },
+      ] as unknown) as KibanaFeature[]);
+
+      auth = await Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(mockLogger),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      await expect(
+        auth.ensureAuthorized({
+          entities: [
+            { id: '100', owner: 'a' },
+            { id: '3', owner: 'other-owner' },
+          ],
+          operation: Operations.createCase,
+        })
+      ).resolves.not.toThrow();
+
+      expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            Object {
+              "event": Object {
+                "action": "case_create",
+                "category": Array [
+                  "database",
+                ],
+                "outcome": "unknown",
+                "type": Array [
+                  "creation",
+                ],
+              },
+              "kibana": Object {
+                "saved_object": Object {
+                  "id": "100",
+                  "type": "cases",
+                },
+              },
+              "message": "User is creating cases [id=100] as owner \\"a\\"",
+            },
+          ],
+          Array [
+            Object {
+              "event": Object {
+                "action": "case_create",
+                "category": Array [
+                  "database",
+                ],
+                "outcome": "unknown",
+                "type": Array [
+                  "creation",
+                ],
+              },
+              "kibana": Object {
+                "saved_object": Object {
+                  "id": "3",
+                  "type": "cases",
+                },
+              },
+              "message": "User is creating cases [id=3] as owner \\"other-owner\\"",
+            },
+          ],
+        ]
+      `);
+    });
+  });
+
+  describe('getAuthorizationFilter', () => {
+    const feature = { id: '1', cases: ['a', 'b'] };
+
+    let securityStart: ReturnType<typeof securityMock.createStart>;
+    let featuresStart: jest.Mocked<FeaturesPluginStart>;
+    let auth: Authorization;
+
+    beforeEach(async () => {
+      securityStart = securityMock.createStart();
+      securityStart.authz.mode.useRbacForRequest.mockReturnValue(true);
+      securityStart.authz.checkPrivilegesDynamicallyWithRequest.mockReturnValue(
+        jest.fn(async () => ({
+          hasAllRequested: true,
+          username: 'super',
+          privileges: { kibana: [] },
+        }))
+      );
+
+      featuresStart = featuresPluginMock.createStart();
+      featuresStart.getKibanaFeatures.mockReturnValue(([feature] as unknown) as KibanaFeature[]);
+
+      auth = await Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(mockLogger),
+        logger: loggingSystemMock.createLogger(),
+      });
+    });
+
+    it('throws and logs an error when there are no registered owners from plugins and security is enabled', async () => {
+      expect.assertions(2);
+
+      featuresStart.getKibanaFeatures.mockReturnValue([]);
+
+      auth = await Authorization.create({
+        request,
+        securityAuth: securityStart.authz,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(mockLogger),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      try {
+        await auth.getAuthorizationFilter(Operations.findCases);
+      } catch (error) {
+        expect(error.message).toBe('Unauthorized to access cases of any owner');
+      }
+
+      expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`
+        Array [
+          Array [
+            Object {
+              "error": Object {
+                "code": "Error",
+                "message": "Unauthorized to access cases of any owner",
+              },
+              "event": Object {
+                "action": "case_find",
+                "category": Array [
+                  "database",
+                ],
+                "outcome": "failure",
+                "type": Array [
+                  "access",
+                ],
+              },
+              "message": "Failed attempt to access a cases as any owners",
+            },
+          ],
+        ]
+      `);
+    });
+
+    it('does not throw an error or log when a feature owner exists and security is disabled', async () => {
+      expect.assertions(3);
+
+      auth = await Authorization.create({
+        request,
+        getSpace: jest.fn(),
+        features: featuresStart,
+        auditLogger: new AuthorizationAuditLogger(mockLogger),
+        logger: loggingSystemMock.createLogger(),
+      });
+
+      const helpersPromise = auth.getAuthorizationFilter(Operations.findCases);
+      await expect(helpersPromise).resolves.not.toThrow();
+      const helpers = await Promise.resolve(helpersPromise);
+      helpers.ensureSavedObjectsAreAuthorized([
+        { id: '1', owner: 'blah' },
+        { id: '2', owner: 'something-else' },
+      ]);
+
+      expect(helpers.filter).toBeUndefined();
+
+      expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`Array []`);
+    });
+
+    describe('hasAllRequested: true', () => {
+      it('logs and does not throw an error when passed the matching owners', async () => {
+        expect.assertions(3);
+
+        const helpersPromise = auth.getAuthorizationFilter(Operations.findCases);
+        await expect(helpersPromise).resolves.not.toThrow();
+        const helpers = await Promise.resolve(helpersPromise);
+        helpers.ensureSavedObjectsAreAuthorized([
+          { id: '1', owner: 'a' },
+          { id: '2', owner: 'b' },
+        ]);
+
+        expect(helpers.filter).toMatchInlineSnapshot(`
+          Object {
+            "arguments": Array [
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "a",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "b",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+            ],
+            "function": "or",
+            "type": "function",
+          }
+        `);
+
+        expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`
+          Array [
+            Array [
+              Object {
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "success",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "1",
+                    "type": "cases",
+                  },
+                },
+                "message": "User has accessed cases [id=1] as owner \\"a\\"",
+              },
+            ],
+            Array [
+              Object {
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "success",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "2",
+                    "type": "cases",
+                  },
+                },
+                "message": "User has accessed cases [id=2] as owner \\"b\\"",
+              },
+            ],
+          ]
+        `);
+      });
+
+      it('logs and throws an error when passed an invalid owner', async () => {
+        expect.assertions(4);
+
+        const helpersPromise = auth.getAuthorizationFilter(Operations.findCases);
+        await expect(helpersPromise).resolves.not.toThrow();
+        const helpers = await Promise.resolve(helpersPromise);
+        try {
+          helpers.ensureSavedObjectsAreAuthorized([
+            { id: '1', owner: 'a' },
+            // c is an invalid owner, because it was not registered by a feature
+            { id: '2', owner: 'c' },
+          ]);
+        } catch (error) {
+          expect(error.message).toBe('Unauthorized to access cases with owners: "c"');
+        }
+
+        expect(helpers.filter).toMatchInlineSnapshot(`
+          Object {
+            "arguments": Array [
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "a",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "b",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+            ],
+            "function": "or",
+            "type": "function",
+          }
+        `);
+
+        expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`
+          Array [
+            Array [
+              Object {
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "success",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "1",
+                    "type": "cases",
+                  },
+                },
+                "message": "User has accessed cases [id=1] as owner \\"a\\"",
+              },
+            ],
+            Array [
+              Object {
+                "error": Object {
+                  "code": "Error",
+                  "message": "Unauthorized to access cases with owners: \\"c\\"",
+                },
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "failure",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "2",
+                    "type": "cases",
+                  },
+                },
+                "message": "Failed attempt to access cases [id=2] as owner \\"c\\"",
+              },
+            ],
+          ]
+        `);
+      });
+    });
+
+    describe('hasAllRequested: false', () => {
+      beforeEach(async () => {
+        securityStart.authz.checkPrivilegesDynamicallyWithRequest.mockReturnValue(
+          jest.fn(async () => ({
+            hasAllRequested: false,
+            username: 'super',
+            privileges: {
+              kibana: [
+                {
+                  authorized: true,
+                  privilege: 'a:getCase',
+                },
+                {
+                  authorized: true,
+                  privilege: 'b:getCase',
+                },
+                {
+                  authorized: false,
+                  privilege: 'c:getCase',
+                },
+              ],
+            },
+          }))
+        );
+
+        (securityStart.authz.actions.cases.get as jest.MockedFunction<
+          typeof securityStart.authz.actions.cases.get
+        >).mockImplementation((owner, opName) => {
+          return `${owner}:${opName}`;
+        });
+
+        featuresStart.getKibanaFeatures.mockReturnValue(([
+          { id: 'a', cases: ['a', 'b', 'c'] },
+        ] as unknown) as KibanaFeature[]);
+
+        auth = await Authorization.create({
+          request,
+          securityAuth: securityStart.authz,
+          getSpace: jest.fn(),
+          features: featuresStart,
+          auditLogger: new AuthorizationAuditLogger(mockLogger),
+          logger: loggingSystemMock.createLogger(),
+        });
+      });
+
+      it('logs and does not throw an error when passed the matching owners', async () => {
+        expect.assertions(3);
+
+        const helpersPromise = auth.getAuthorizationFilter(Operations.findCases);
+        await expect(helpersPromise).resolves.not.toThrow();
+        const helpers = await Promise.resolve(helpersPromise);
+        helpers.ensureSavedObjectsAreAuthorized([
+          { id: '1', owner: 'a' },
+          { id: '2', owner: 'b' },
+        ]);
+
+        expect(helpers.filter).toMatchInlineSnapshot(`
+          Object {
+            "arguments": Array [
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "a",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "b",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+            ],
+            "function": "or",
+            "type": "function",
+          }
+        `);
+
+        expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`
+          Array [
+            Array [
+              Object {
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "success",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "1",
+                    "type": "cases",
+                  },
+                },
+                "message": "User has accessed cases [id=1] as owner \\"a\\"",
+              },
+            ],
+            Array [
+              Object {
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "success",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "2",
+                    "type": "cases",
+                  },
+                },
+                "message": "User has accessed cases [id=2] as owner \\"b\\"",
+              },
+            ],
+          ]
+        `);
+      });
+
+      it('logs and throws an error when passed an invalid owner', async () => {
+        expect.assertions(4);
+
+        const helpersPromise = auth.getAuthorizationFilter(Operations.findCases);
+        await expect(helpersPromise).resolves.not.toThrow();
+        const helpers = await Promise.resolve(helpersPromise);
+        try {
+          helpers.ensureSavedObjectsAreAuthorized([
+            { id: '1', owner: 'a' },
+            // c is an invalid owner, because it was not registered by a feature
+            { id: '2', owner: 'c' },
+          ]);
+        } catch (error) {
+          expect(error.message).toBe('Unauthorized to access cases with owners: "c"');
+        }
+
+        expect(helpers.filter).toMatchInlineSnapshot(`
+          Object {
+            "arguments": Array [
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "a",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+              Object {
+                "arguments": Array [
+                  Object {
+                    "type": "literal",
+                    "value": "cases.attributes.owner",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": "b",
+                  },
+                  Object {
+                    "type": "literal",
+                    "value": false,
+                  },
+                ],
+                "function": "is",
+                "type": "function",
+              },
+            ],
+            "function": "or",
+            "type": "function",
+          }
+        `);
+
+        expect(mockLogger.log.mock.calls).toMatchInlineSnapshot(`
+          Array [
+            Array [
+              Object {
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "success",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "1",
+                    "type": "cases",
+                  },
+                },
+                "message": "User has accessed cases [id=1] as owner \\"a\\"",
+              },
+            ],
+            Array [
+              Object {
+                "error": Object {
+                  "code": "Error",
+                  "message": "Unauthorized to access cases with owners: \\"c\\"",
+                },
+                "event": Object {
+                  "action": "case_find",
+                  "category": Array [
+                    "database",
+                  ],
+                  "outcome": "failure",
+                  "type": Array [
+                    "access",
+                  ],
+                },
+                "kibana": Object {
+                  "saved_object": Object {
+                    "id": "2",
+                    "type": "cases",
+                  },
+                },
+                "message": "Failed attempt to access cases [id=2] as owner \\"c\\"",
+              },
+            ],
+          ]
+        `);
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/server/authorization/authorization.ts b/x-pack/plugins/cases/server/authorization/authorization.ts
new file mode 100644
index 0000000000000..a363874857d56
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/authorization.ts
@@ -0,0 +1,251 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { KibanaRequest, Logger } from 'kibana/server';
+import Boom from '@hapi/boom';
+import { SecurityPluginStart } from '../../../security/server';
+import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
+import { AuthFilterHelpers, GetSpaceFn } from './types';
+import { getOwnersFilter } from './utils';
+import { AuthorizationAuditLogger, OperationDetails } from '.';
+import { createCaseError } from '../common';
+import { OwnerEntity } from './types';
+
+/**
+ * This class handles ensuring that the user making a request has the correct permissions
+ * for the API request.
+ */
+export class Authorization {
+  private readonly request: KibanaRequest;
+  private readonly securityAuth: SecurityPluginStart['authz'] | undefined;
+  private readonly featureCaseOwners: Set<string>;
+  private readonly auditLogger: AuthorizationAuditLogger;
+
+  private constructor({
+    request,
+    securityAuth,
+    caseOwners,
+    auditLogger,
+  }: {
+    request: KibanaRequest;
+    securityAuth?: SecurityPluginStart['authz'];
+    caseOwners: Set<string>;
+    auditLogger: AuthorizationAuditLogger;
+  }) {
+    this.request = request;
+    this.securityAuth = securityAuth;
+    this.featureCaseOwners = caseOwners;
+    this.auditLogger = auditLogger;
+  }
+
+  /**
+   * Creates an Authorization object.
+   */
+  static async create({
+    request,
+    securityAuth,
+    getSpace,
+    features,
+    auditLogger,
+    logger,
+  }: {
+    request: KibanaRequest;
+    securityAuth?: SecurityPluginStart['authz'];
+    getSpace: GetSpaceFn;
+    features: FeaturesPluginStart;
+    auditLogger: AuthorizationAuditLogger;
+    logger: Logger;
+  }): Promise<Authorization> {
+    // Since we need to do async operations, this static method handles that before creating the Auth class
+    let caseOwners: Set<string>;
+    try {
+      const disabledFeatures = new Set((await getSpace(request))?.disabledFeatures ?? []);
+
+      caseOwners = new Set(
+        features
+          .getKibanaFeatures()
+          // get all the features' cases owners that aren't disabled
+          .filter(({ id }) => !disabledFeatures.has(id))
+          .flatMap((feature) => feature.cases ?? [])
+      );
+    } catch (error) {
+      throw createCaseError({
+        message: `Failed to create Authorization class: ${error}`,
+        error,
+        logger,
+      });
+    }
+
+    return new Authorization({ request, securityAuth, caseOwners, auditLogger });
+  }
+
+  private shouldCheckAuthorization(): boolean {
+    return this.securityAuth?.mode?.useRbacForRequest(this.request) ?? false;
+  }
+
+  /**
+   * Checks that the user making the request for the passed in owners and operation has the correct authorization. This
+   * function will throw if the user is not authorized for the requested operation and owners.
+   *
+   * @param entities an array of entities describing the case owners in conjunction with the saved object ID attempting
+   *  to be authorized
+   * @param operation information describing the operation attempting to be authorized
+   */
+  public async ensureAuthorized({
+    entities,
+    operation,
+  }: {
+    entities: OwnerEntity[];
+    operation: OperationDetails;
+  }) {
+    const logSavedObjects = (error?: Error) => {
+      for (const entity of entities) {
+        this.auditLogger.log({ operation, error, entity });
+      }
+    };
+
+    try {
+      await this._ensureAuthorized(
+        entities.map((entity) => entity.owner),
+        operation
+      );
+    } catch (error) {
+      logSavedObjects(error);
+      throw error;
+    }
+
+    logSavedObjects();
+  }
+
+  /**
+   * Returns an object to filter the saved object find request to the authorized owners of an entity.
+   */
+  public async getAuthorizationFilter(operation: OperationDetails): Promise<AuthFilterHelpers> {
+    try {
+      return await this._getAuthorizationFilter(operation);
+    } catch (error) {
+      this.auditLogger.log({ error, operation });
+      throw error;
+    }
+  }
+
+  private async _ensureAuthorized(owners: string[], operation: OperationDetails) {
+    const { securityAuth } = this;
+    const areAllOwnersAvailable = owners.every((owner) => this.featureCaseOwners.has(owner));
+
+    if (securityAuth && this.shouldCheckAuthorization()) {
+      const requiredPrivileges: string[] = owners.map((owner) =>
+        securityAuth.actions.cases.get(owner, operation.name)
+      );
+
+      const checkPrivileges = securityAuth.checkPrivilegesDynamicallyWithRequest(this.request);
+      const { hasAllRequested } = await checkPrivileges({
+        kibana: requiredPrivileges,
+      });
+
+      if (!areAllOwnersAvailable) {
+        /**
+         * Under most circumstances this would have been caught by `checkPrivileges` as
+         * a user can't have Privileges to an unknown owner, but super users
+         * don't actually get "privilege checked" so the made up owner *will* return
+         * as Privileged.
+         * This check will ensure we don't accidentally let these through
+         */
+        throw Boom.forbidden(AuthorizationAuditLogger.createFailureMessage({ owners, operation }));
+      }
+
+      if (!hasAllRequested) {
+        throw Boom.forbidden(AuthorizationAuditLogger.createFailureMessage({ owners, operation }));
+      }
+    } else if (!areAllOwnersAvailable) {
+      throw Boom.forbidden(AuthorizationAuditLogger.createFailureMessage({ owners, operation }));
+    }
+
+    // else security is disabled so let the operation proceed
+  }
+
+  private async _getAuthorizationFilter(operation: OperationDetails): Promise<AuthFilterHelpers> {
+    const { securityAuth } = this;
+    if (securityAuth && this.shouldCheckAuthorization()) {
+      const { authorizedOwners } = await this.getAuthorizedOwners([operation]);
+
+      if (!authorizedOwners.length) {
+        throw Boom.forbidden(
+          AuthorizationAuditLogger.createFailureMessage({ owners: authorizedOwners, operation })
+        );
+      }
+
+      return {
+        filter: getOwnersFilter(operation.savedObjectType, authorizedOwners),
+        ensureSavedObjectsAreAuthorized: (entities: OwnerEntity[]) => {
+          for (const entity of entities) {
+            if (!authorizedOwners.includes(entity.owner)) {
+              const error = Boom.forbidden(
+                AuthorizationAuditLogger.createFailureMessage({
+                  operation,
+                  owners: [entity.owner],
+                })
+              );
+              this.auditLogger.log({ error, operation, entity });
+              throw error;
+            }
+
+            this.auditLogger.log({ operation, entity });
+          }
+        },
+      };
+    }
+
+    return {
+      ensureSavedObjectsAreAuthorized: (entities: OwnerEntity[]) => {},
+    };
+  }
+
+  private async getAuthorizedOwners(
+    operations: OperationDetails[]
+  ): Promise<{
+    username?: string;
+    hasAllRequested: boolean;
+    authorizedOwners: string[];
+  }> {
+    const { securityAuth, featureCaseOwners } = this;
+    if (securityAuth && this.shouldCheckAuthorization()) {
+      const checkPrivileges = securityAuth.checkPrivilegesDynamicallyWithRequest(this.request);
+      const requiredPrivileges = new Map<string, string>();
+
+      for (const owner of featureCaseOwners) {
+        for (const operation of operations) {
+          requiredPrivileges.set(securityAuth.actions.cases.get(owner, operation.name), owner);
+        }
+      }
+
+      const { hasAllRequested, username, privileges } = await checkPrivileges({
+        kibana: [...requiredPrivileges.keys()],
+      });
+
+      return {
+        hasAllRequested,
+        username,
+        authorizedOwners: hasAllRequested
+          ? Array.from(featureCaseOwners)
+          : privileges.kibana.reduce<string[]>((authorizedOwners, { authorized, privilege }) => {
+              if (authorized && requiredPrivileges.has(privilege)) {
+                const owner = requiredPrivileges.get(privilege)!;
+                authorizedOwners.push(owner);
+              }
+
+              return authorizedOwners;
+            }, []),
+      };
+    } else {
+      return {
+        hasAllRequested: true,
+        authorizedOwners: Array.from(featureCaseOwners),
+      };
+    }
+  }
+}
diff --git a/x-pack/plugins/cases/server/authorization/index.test.ts b/x-pack/plugins/cases/server/authorization/index.test.ts
new file mode 100644
index 0000000000000..ef2a5eed09eaa
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/index.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 { isWriteOperation, Operations } from '.';
+import { OperationDetails } from './types';
+
+describe('index tests', () => {
+  it('should identify a write operation', () => {
+    expect(isWriteOperation(Operations.createCase)).toBeTruthy();
+  });
+
+  it('should return false when the operation is not a write operation', () => {
+    expect(isWriteOperation(Operations.getCase)).toBeFalsy();
+  });
+
+  it('should not identify an invalid operation as a write operation', () => {
+    expect(isWriteOperation({ name: 'blah' } as OperationDetails)).toBeFalsy();
+  });
+});
diff --git a/x-pack/plugins/cases/server/authorization/index.ts b/x-pack/plugins/cases/server/authorization/index.ts
new file mode 100644
index 0000000000000..9a8b44a4a4f5d
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/index.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 { EcsEventCategory, EcsEventOutcome, EcsEventType } from 'kibana/server';
+import {
+  CASE_COMMENT_SAVED_OBJECT,
+  CASE_CONFIGURE_SAVED_OBJECT,
+  CASE_SAVED_OBJECT,
+  CASE_USER_ACTION_SAVED_OBJECT,
+} from '../../common/constants';
+import { Verbs, ReadOperations, WriteOperations, OperationDetails } from './types';
+
+export * from './authorization';
+export * from './audit_logger';
+export * from './types';
+
+const createVerbs: Verbs = {
+  present: 'create',
+  progressive: 'creating',
+  past: 'created',
+};
+
+const accessVerbs: Verbs = {
+  present: 'access',
+  progressive: 'accessing',
+  past: 'accessed',
+};
+
+const updateVerbs: Verbs = {
+  present: 'update',
+  progressive: 'updating',
+  past: 'updated',
+};
+
+const deleteVerbs: Verbs = {
+  present: 'delete',
+  progressive: 'deleting',
+  past: 'deleted',
+};
+
+const EVENT_TYPES: Record<string, EcsEventType> = {
+  creation: 'creation',
+  deletion: 'deletion',
+  change: 'change',
+  access: 'access',
+};
+
+/**
+ * These values need to match the respective values in this file: x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
+ * These are shared between find, get, get all, and delete/delete all
+ * There currently isn't a use case for a user to delete one comment but not all or differentiating between get, get all,
+ * and find operations from a privilege stand point.
+ */
+const DELETE_COMMENT_OPERATION = 'deleteComment';
+const ACCESS_COMMENT_OPERATION = 'getComment';
+const ACCESS_CASE_OPERATION = 'getCase';
+
+/**
+ * Database constant for ECS category for use for audit logging.
+ */
+export const DATABASE_CATEGORY: EcsEventCategory[] = ['database'];
+
+/**
+ * ECS Outcomes for audit logging.
+ */
+export const ECS_OUTCOMES: Record<string, EcsEventOutcome> = {
+  failure: 'failure',
+  success: 'success',
+  unknown: 'unknown',
+};
+
+/**
+ * Determines if the passed in operation was a write operation.
+ *
+ * @param operation an OperationDetails object describing the operation that occurred
+ * @returns true if the passed in operation was a write operation
+ */
+export function isWriteOperation(operation: OperationDetails): boolean {
+  return Object.values(WriteOperations).includes(operation.name as WriteOperations);
+}
+
+/**
+ * Definition of all APIs within the cases backend.
+ */
+export const Operations: Record<ReadOperations | WriteOperations, OperationDetails> = {
+  // case operations
+  [WriteOperations.CreateCase]: {
+    ecsType: EVENT_TYPES.creation,
+    name: WriteOperations.CreateCase,
+    action: 'case_create',
+    verbs: createVerbs,
+    docType: 'case',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  [WriteOperations.DeleteCase]: {
+    ecsType: EVENT_TYPES.deletion,
+    name: WriteOperations.DeleteCase,
+    action: 'case_delete',
+    verbs: deleteVerbs,
+    docType: 'case',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  [WriteOperations.UpdateCase]: {
+    ecsType: EVENT_TYPES.change,
+    name: WriteOperations.UpdateCase,
+    action: 'case_update',
+    verbs: updateVerbs,
+    docType: 'case',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  [WriteOperations.PushCase]: {
+    ecsType: EVENT_TYPES.change,
+    name: WriteOperations.PushCase,
+    action: 'case_push',
+    verbs: updateVerbs,
+    docType: 'case',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  [WriteOperations.CreateConfiguration]: {
+    ecsType: EVENT_TYPES.creation,
+    name: WriteOperations.CreateConfiguration,
+    action: 'case_configuration_create',
+    verbs: createVerbs,
+    docType: 'case configuration',
+    savedObjectType: CASE_CONFIGURE_SAVED_OBJECT,
+  },
+  [WriteOperations.UpdateConfiguration]: {
+    ecsType: EVENT_TYPES.change,
+    name: WriteOperations.UpdateConfiguration,
+    action: 'case_configuration_update',
+    verbs: updateVerbs,
+    docType: 'case configuration',
+    savedObjectType: CASE_CONFIGURE_SAVED_OBJECT,
+  },
+  [ReadOperations.FindConfigurations]: {
+    ecsType: EVENT_TYPES.access,
+    name: ReadOperations.FindConfigurations,
+    action: 'case_configuration_find',
+    verbs: accessVerbs,
+    docType: 'case configurations',
+    savedObjectType: CASE_CONFIGURE_SAVED_OBJECT,
+  },
+  [ReadOperations.GetCase]: {
+    ecsType: EVENT_TYPES.access,
+    name: ACCESS_CASE_OPERATION,
+    action: 'case_get',
+    verbs: accessVerbs,
+    docType: 'case',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  [ReadOperations.FindCases]: {
+    ecsType: EVENT_TYPES.access,
+    name: ACCESS_CASE_OPERATION,
+    action: 'case_find',
+    verbs: accessVerbs,
+    docType: 'cases',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  [ReadOperations.GetCaseIDsByAlertID]: {
+    ecsType: EVENT_TYPES.access,
+    name: ACCESS_CASE_OPERATION,
+    action: 'case_ids_by_alert_id_get',
+    verbs: accessVerbs,
+    docType: 'cases',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  [ReadOperations.GetTags]: {
+    ecsType: EVENT_TYPES.access,
+    name: ReadOperations.GetCase,
+    action: 'case_tags_get',
+    verbs: accessVerbs,
+    docType: 'case',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  [ReadOperations.GetReporters]: {
+    ecsType: EVENT_TYPES.access,
+    name: ReadOperations.GetReporters,
+    action: 'case_reporters_get',
+    verbs: accessVerbs,
+    docType: 'case',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  // comments operations
+  [WriteOperations.CreateComment]: {
+    ecsType: EVENT_TYPES.creation,
+    name: WriteOperations.CreateComment,
+    action: 'case_comment_create',
+    verbs: createVerbs,
+    docType: 'comments',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  [WriteOperations.DeleteAllComments]: {
+    ecsType: EVENT_TYPES.deletion,
+    name: DELETE_COMMENT_OPERATION,
+    action: 'case_comment_delete_all',
+    verbs: deleteVerbs,
+    docType: 'comments',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  [WriteOperations.DeleteComment]: {
+    ecsType: EVENT_TYPES.deletion,
+    name: DELETE_COMMENT_OPERATION,
+    action: 'case_comment_delete',
+    verbs: deleteVerbs,
+    docType: 'comments',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  [WriteOperations.UpdateComment]: {
+    ecsType: EVENT_TYPES.change,
+    name: WriteOperations.UpdateComment,
+    action: 'case_comment_update',
+    verbs: updateVerbs,
+    docType: 'comments',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  [ReadOperations.GetComment]: {
+    ecsType: EVENT_TYPES.access,
+    name: ACCESS_COMMENT_OPERATION,
+    action: 'case_comment_get',
+    verbs: accessVerbs,
+    docType: 'comments',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  [ReadOperations.GetAllComments]: {
+    ecsType: EVENT_TYPES.access,
+    name: ACCESS_COMMENT_OPERATION,
+    action: 'case_comment_get_all',
+    verbs: accessVerbs,
+    docType: 'comments',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  [ReadOperations.FindComments]: {
+    ecsType: EVENT_TYPES.access,
+    name: ACCESS_COMMENT_OPERATION,
+    action: 'case_comment_find',
+    verbs: accessVerbs,
+    docType: 'comments',
+    savedObjectType: CASE_COMMENT_SAVED_OBJECT,
+  },
+  // stats operations
+  [ReadOperations.GetCaseStatuses]: {
+    ecsType: EVENT_TYPES.access,
+    name: ACCESS_CASE_OPERATION,
+    action: 'case_find_statuses',
+    verbs: accessVerbs,
+    docType: 'cases',
+    savedObjectType: CASE_SAVED_OBJECT,
+  },
+  // user actions operations
+  [ReadOperations.GetUserActions]: {
+    ecsType: EVENT_TYPES.access,
+    name: ReadOperations.GetUserActions,
+    action: 'case_user_actions_get',
+    verbs: accessVerbs,
+    docType: 'user actions',
+    savedObjectType: CASE_USER_ACTION_SAVED_OBJECT,
+  },
+};
diff --git a/x-pack/plugins/cases/server/authorization/mock.ts b/x-pack/plugins/cases/server/authorization/mock.ts
new file mode 100644
index 0000000000000..555d3ac7a9991
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/mock.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { PublicMethodsOf } from '@kbn/utility-types';
+import { Authorization } from './authorization';
+
+type Schema = PublicMethodsOf<Authorization>;
+export type AuthorizationMock = jest.Mocked<Schema>;
+
+export const createAuthorizationMock = () => {
+  const mocked: AuthorizationMock = {
+    ensureAuthorized: jest.fn(),
+    getAuthorizationFilter: jest.fn(),
+  };
+  return mocked;
+};
diff --git a/x-pack/plugins/cases/server/authorization/types.ts b/x-pack/plugins/cases/server/authorization/types.ts
new file mode 100644
index 0000000000000..4651d45ab3b5f
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/types.ts
@@ -0,0 +1,119 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EcsEventType, KibanaRequest } from 'kibana/server';
+import { KueryNode } from 'src/plugins/data/common';
+import { Space } from '../../../spaces/server';
+
+/**
+ * The tenses for describing the action performed by a API route
+ */
+export interface Verbs {
+  present: string;
+  progressive: string;
+  past: string;
+}
+
+export type GetSpaceFn = (request: KibanaRequest) => Promise<Space | undefined>;
+
+/**
+ * Read operations for the cases APIs.
+ *
+ * NOTE: If you add a value here you'll likely also need to make changes here:
+ * x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
+ */
+export enum ReadOperations {
+  GetCase = 'getCase',
+  FindCases = 'findCases',
+  GetCaseIDsByAlertID = 'getCaseIDsByAlertID',
+  GetCaseStatuses = 'getCaseStatuses',
+  GetComment = 'getComment',
+  GetAllComments = 'getAllComments',
+  FindComments = 'findComments',
+  GetTags = 'getTags',
+  GetReporters = 'getReporters',
+  FindConfigurations = 'findConfigurations',
+  GetUserActions = 'getUserActions',
+}
+
+/**
+ * Write operations for the cases APIs.
+ *
+ * NOTE: If you add a value here you'll likely also need to make changes here:
+ * x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
+ */
+export enum WriteOperations {
+  CreateCase = 'createCase',
+  DeleteCase = 'deleteCase',
+  UpdateCase = 'updateCase',
+  PushCase = 'pushCase',
+  CreateComment = 'createComment',
+  DeleteAllComments = 'deleteAllComments',
+  DeleteComment = 'deleteComment',
+  UpdateComment = 'updateComment',
+  CreateConfiguration = 'createConfiguration',
+  UpdateConfiguration = 'updateConfiguration',
+}
+
+/**
+ * Defines the structure for a case API route.
+ */
+export interface OperationDetails {
+  /**
+   * The ECS event type that this operation should be audit logged as (creation, deletion, access, etc)
+   */
+  ecsType: EcsEventType;
+  /**
+   * The name of the operation to authorize against for the privilege check.
+   * These values need to match one of the operation strings defined here: x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.ts
+   */
+  name: string;
+  /**
+   * The ECS `event.action` field, should be in the form of <entity>_<operation> e.g comment_get, case_fined
+   */
+  action: string;
+  /**
+   * The verbs that are associated with this type of operation, these should line up with the event type e.g. creating, created, create etc
+   */
+  verbs: Verbs;
+  /**
+   * The readable name of the entity being operated on e.g. case, comment, configurations (make it plural if it reads better that way etc)
+   */
+  docType: string;
+  /**
+   * The actual saved object type of the entity e.g. cases, cases-comments
+   */
+  savedObjectType: string;
+}
+
+/**
+ * Describes an entity with the necessary fields to identify if the user is authorized to interact with the saved object
+ * returned from some find query.
+ */
+export interface OwnerEntity {
+  owner: string;
+  id: string;
+}
+
+/**
+ * Function callback for making sure the found saved objects are of the authorized owner
+ */
+export type EnsureSOAuthCallback = (entities: OwnerEntity[]) => void;
+
+/**
+ * Defines the helper methods and necessary information for authorizing the find API's request.
+ */
+export interface AuthFilterHelpers {
+  /**
+   * The owner filter to pass to the saved object client's find operation that is scoped to the authorized owners
+   */
+  filter?: KueryNode;
+  /**
+   * Utility function for checking that the returned entities are in fact authorized for the user making the request
+   */
+  ensureSavedObjectsAreAuthorized: EnsureSOAuthCallback;
+}
diff --git a/x-pack/plugins/cases/server/authorization/utils.test.ts b/x-pack/plugins/cases/server/authorization/utils.test.ts
new file mode 100644
index 0000000000000..3ebf6ee398e38
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/utils.test.ts
@@ -0,0 +1,297 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { nodeBuilder } from '../../../../../src/plugins/data/common';
+import { OWNER_FIELD } from '../../common';
+import {
+  combineFilterWithAuthorizationFilter,
+  ensureFieldIsSafeForQuery,
+  getOwnersFilter,
+  includeFieldsRequiredForAuthentication,
+} from './utils';
+
+describe('utils', () => {
+  describe('combineFilterWithAuthorizationFilter', () => {
+    it('returns undefined if neither a filter or authorizationFilter are passed', () => {
+      expect(combineFilterWithAuthorizationFilter()).toBeUndefined();
+    });
+
+    it('returns a single KueryNode when only a filter is passed in', () => {
+      const node = nodeBuilder.is('a', 'hello');
+      expect(combineFilterWithAuthorizationFilter(node)).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [
+            Object {
+              "type": "literal",
+              "value": "a",
+            },
+            Object {
+              "type": "literal",
+              "value": "hello",
+            },
+            Object {
+              "type": "literal",
+              "value": false,
+            },
+          ],
+          "function": "is",
+          "type": "function",
+        }
+      `);
+    });
+
+    it('returns a single KueryNode when only an authorizationFilter is passed in', () => {
+      const node = nodeBuilder.is('a', 'hello');
+      expect(combineFilterWithAuthorizationFilter(undefined, node)).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [
+            Object {
+              "type": "literal",
+              "value": "a",
+            },
+            Object {
+              "type": "literal",
+              "value": "hello",
+            },
+            Object {
+              "type": "literal",
+              "value": false,
+            },
+          ],
+          "function": "is",
+          "type": "function",
+        }
+      `);
+    });
+
+    it("returns a single KueryNode and'ing together the passed in parameters", () => {
+      const node = nodeBuilder.is('a', 'hello');
+      const node2 = nodeBuilder.is('b', 'hi');
+
+      expect(combineFilterWithAuthorizationFilter(node, node2)).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [
+            Object {
+              "arguments": Array [
+                Object {
+                  "type": "literal",
+                  "value": "a",
+                },
+                Object {
+                  "type": "literal",
+                  "value": "hello",
+                },
+                Object {
+                  "type": "literal",
+                  "value": false,
+                },
+              ],
+              "function": "is",
+              "type": "function",
+            },
+            Object {
+              "arguments": Array [
+                Object {
+                  "type": "literal",
+                  "value": "b",
+                },
+                Object {
+                  "type": "literal",
+                  "value": "hi",
+                },
+                Object {
+                  "type": "literal",
+                  "value": false,
+                },
+              ],
+              "function": "is",
+              "type": "function",
+            },
+          ],
+          "function": "and",
+          "type": "function",
+        }
+      `);
+    });
+
+    it("returns a single KueryNode and'ing together the passed in parameters in opposite order", () => {
+      const node = nodeBuilder.is('a', 'hello');
+      const node2 = nodeBuilder.is('b', 'hi');
+
+      expect(combineFilterWithAuthorizationFilter(node2, node)).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [
+            Object {
+              "arguments": Array [
+                Object {
+                  "type": "literal",
+                  "value": "b",
+                },
+                Object {
+                  "type": "literal",
+                  "value": "hi",
+                },
+                Object {
+                  "type": "literal",
+                  "value": false,
+                },
+              ],
+              "function": "is",
+              "type": "function",
+            },
+            Object {
+              "arguments": Array [
+                Object {
+                  "type": "literal",
+                  "value": "a",
+                },
+                Object {
+                  "type": "literal",
+                  "value": "hello",
+                },
+                Object {
+                  "type": "literal",
+                  "value": false,
+                },
+              ],
+              "function": "is",
+              "type": "function",
+            },
+          ],
+          "function": "and",
+          "type": "function",
+        }
+      `);
+    });
+  });
+
+  describe('includeFieldsRequiredForAuthentication', () => {
+    it('returns undefined when the fields parameter is not specified', () => {
+      expect(includeFieldsRequiredForAuthentication()).toBeUndefined();
+    });
+
+    it('returns an array with a single entry containing the owner field', () => {
+      expect(includeFieldsRequiredForAuthentication([])).toStrictEqual([OWNER_FIELD]);
+    });
+
+    it('returns an array without duplicates and including the owner field', () => {
+      expect(includeFieldsRequiredForAuthentication(['a', 'b', 'a'])).toStrictEqual([
+        'a',
+        'b',
+        OWNER_FIELD,
+      ]);
+    });
+  });
+
+  describe('ensureFieldIsSafeForQuery', () => {
+    it("throws an error if field contains character that aren't safe in a KQL query", () => {
+      expect(() => ensureFieldIsSafeForQuery('id', 'cases-*')).toThrowError(
+        `expected id not to include invalid character: *`
+      );
+
+      expect(() => ensureFieldIsSafeForQuery('id', '<=""')).toThrowError(
+        `expected id not to include invalid character: <=`
+      );
+
+      expect(() => ensureFieldIsSafeForQuery('id', '>=""')).toThrowError(
+        `expected id not to include invalid character: >=`
+      );
+
+      expect(() => ensureFieldIsSafeForQuery('id', '1 or caseid:123')).toThrowError(
+        `expected id not to include whitespace and invalid character: :`
+      );
+
+      expect(() => ensureFieldIsSafeForQuery('id', ') or caseid:123')).toThrowError(
+        `expected id not to include whitespace and invalid characters: ), :`
+      );
+
+      expect(() => ensureFieldIsSafeForQuery('id', 'some space')).toThrowError(
+        `expected id not to include whitespace`
+      );
+    });
+
+    it("doesn't throw an error if field is safe as part of a KQL query", () => {
+      expect(() => ensureFieldIsSafeForQuery('id', '123-0456-678')).not.toThrow();
+    });
+  });
+
+  describe('getOwnersFilter', () => {
+    it('returns undefined when the owners parameter is an empty array', () => {
+      expect(getOwnersFilter('a', [])).toBeUndefined();
+    });
+
+    it('constructs a KueryNode with only a single node', () => {
+      expect(getOwnersFilter('a', ['hello'])).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [
+            Object {
+              "type": "literal",
+              "value": "a.attributes.owner",
+            },
+            Object {
+              "type": "literal",
+              "value": "hello",
+            },
+            Object {
+              "type": "literal",
+              "value": false,
+            },
+          ],
+          "function": "is",
+          "type": "function",
+        }
+      `);
+    });
+
+    it("constructs a KueryNode or'ing together two filters", () => {
+      expect(getOwnersFilter('a', ['hello', 'hi'])).toMatchInlineSnapshot(`
+        Object {
+          "arguments": Array [
+            Object {
+              "arguments": Array [
+                Object {
+                  "type": "literal",
+                  "value": "a.attributes.owner",
+                },
+                Object {
+                  "type": "literal",
+                  "value": "hello",
+                },
+                Object {
+                  "type": "literal",
+                  "value": false,
+                },
+              ],
+              "function": "is",
+              "type": "function",
+            },
+            Object {
+              "arguments": Array [
+                Object {
+                  "type": "literal",
+                  "value": "a.attributes.owner",
+                },
+                Object {
+                  "type": "literal",
+                  "value": "hi",
+                },
+                Object {
+                  "type": "literal",
+                  "value": false,
+                },
+              ],
+              "function": "is",
+              "type": "function",
+            },
+          ],
+          "function": "or",
+          "type": "function",
+        }
+      `);
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/server/authorization/utils.ts b/x-pack/plugins/cases/server/authorization/utils.ts
new file mode 100644
index 0000000000000..19dc37d0c3fdf
--- /dev/null
+++ b/x-pack/plugins/cases/server/authorization/utils.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 { remove, uniq } from 'lodash';
+import { nodeBuilder, KueryNode } from '../../../../../src/plugins/data/common';
+import { OWNER_FIELD } from '../../common/api';
+
+export const getOwnersFilter = (
+  savedObjectType: string,
+  owners: string[]
+): KueryNode | undefined => {
+  if (owners.length <= 0) {
+    return;
+  }
+
+  return nodeBuilder.or(
+    owners.reduce<KueryNode[]>((query, owner) => {
+      ensureFieldIsSafeForQuery(OWNER_FIELD, owner);
+      query.push(nodeBuilder.is(`${savedObjectType}.attributes.${OWNER_FIELD}`, owner));
+      return query;
+    }, [])
+  );
+};
+
+export const combineFilterWithAuthorizationFilter = (
+  filter?: KueryNode,
+  authorizationFilter?: KueryNode
+) => {
+  if (!filter && !authorizationFilter) {
+    return;
+  }
+
+  const kueries = [
+    ...(filter !== undefined ? [filter] : []),
+    ...(authorizationFilter !== undefined ? [authorizationFilter] : []),
+  ];
+  return nodeBuilder.and(kueries);
+};
+
+export const ensureFieldIsSafeForQuery = (field: string, value: string): boolean => {
+  const invalid = value.match(/([>=<\*:()]+|\s+)/g);
+  if (invalid) {
+    const whitespace = remove(invalid, (chars) => chars.trim().length === 0);
+    const errors = [];
+    if (whitespace.length) {
+      errors.push(`whitespace`);
+    }
+    if (invalid.length) {
+      errors.push(`invalid character${invalid.length > 1 ? `s` : ``}: ${invalid?.join(`, `)}`);
+    }
+    throw new Error(`expected ${field} not to include ${errors.join(' and ')}`);
+  }
+  return true;
+};
+
+export const includeFieldsRequiredForAuthentication = (fields?: string[]): string[] | undefined => {
+  if (fields === undefined) {
+    return;
+  }
+  return uniq([...fields, OWNER_FIELD]);
+};
diff --git a/x-pack/plugins/cases/server/client/alerts/client.ts b/x-pack/plugins/cases/server/client/alerts/client.ts
new file mode 100644
index 0000000000000..19dc95982613f
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/alerts/client.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 { CaseStatuses } from '../../../common/api';
+import { AlertInfo } from '../../common';
+import { CasesClientGetAlertsResponse } from './types';
+import { get } from './get';
+import { updateStatus } from './update_status';
+import { CasesClientArgs } from '../types';
+
+/**
+ * Defines the fields necessary to update an alert's status.
+ */
+export interface UpdateAlertRequest {
+  id: string;
+  index: string;
+  status: CaseStatuses;
+}
+
+export interface AlertUpdateStatus {
+  alerts: UpdateAlertRequest[];
+}
+
+export interface AlertGet {
+  alertsInfo: AlertInfo[];
+}
+
+export interface AlertSubClient {
+  get(args: AlertGet): Promise<CasesClientGetAlertsResponse>;
+  updateStatus(args: AlertUpdateStatus): Promise<void>;
+}
+
+export const createAlertsSubClient = (clientArgs: CasesClientArgs): AlertSubClient => {
+  const alertsSubClient: AlertSubClient = {
+    get: (params: AlertGet) => get(params, clientArgs),
+    updateStatus: (params: AlertUpdateStatus) => updateStatus(params, clientArgs),
+  };
+
+  return Object.freeze(alertsSubClient);
+};
diff --git a/x-pack/plugins/cases/server/client/alerts/get.ts b/x-pack/plugins/cases/server/client/alerts/get.ts
index 88298450e499a..186f914aa2cd7 100644
--- a/x-pack/plugins/cases/server/client/alerts/get.ts
+++ b/x-pack/plugins/cases/server/client/alerts/get.ts
@@ -5,24 +5,19 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'kibana/server';
 import { AlertInfo } from '../../common';
-import { AlertServiceContract } from '../../services';
 import { CasesClientGetAlertsResponse } from './types';
+import { CasesClientArgs } from '..';
 
 interface GetParams {
-  alertsService: AlertServiceContract;
   alertsInfo: AlertInfo[];
-  scopedClusterClient: ElasticsearchClient;
-  logger: Logger;
 }
 
-export const get = async ({
-  alertsService,
-  alertsInfo,
-  scopedClusterClient,
-  logger,
-}: GetParams): Promise<CasesClientGetAlertsResponse> => {
+export const get = async (
+  { alertsInfo }: GetParams,
+  clientArgs: CasesClientArgs
+): Promise<CasesClientGetAlertsResponse> => {
+  const { alertsService, scopedClusterClient, logger } = clientArgs;
   if (alertsInfo.length === 0) {
     return [];
   }
diff --git a/x-pack/plugins/cases/server/client/alerts/update_status.test.ts b/x-pack/plugins/cases/server/client/alerts/update_status.test.ts
deleted file mode 100644
index d6456cb3183ef..0000000000000
--- a/x-pack/plugins/cases/server/client/alerts/update_status.test.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { CaseStatuses } from '../../../common';
-import { createMockSavedObjectsRepository } from '../../routes/api/__fixtures__';
-import { createCasesClientWithMockSavedObjectsClient } from '../mocks';
-
-describe('updateAlertsStatus', () => {
-  it('updates the status of the alert correctly', async () => {
-    const savedObjectsClient = createMockSavedObjectsRepository();
-
-    const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-    await casesClient.client.updateAlertsStatus({
-      alerts: [{ id: 'alert-id-1', index: '.siem-signals', status: CaseStatuses.closed }],
-    });
-
-    expect(casesClient.services.alertsService.updateAlertsStatus).toHaveBeenCalledWith({
-      logger: expect.anything(),
-      scopedClusterClient: expect.anything(),
-      alerts: [{ id: 'alert-id-1', index: '.siem-signals', status: CaseStatuses.closed }],
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/server/client/alerts/update_status.ts b/x-pack/plugins/cases/server/client/alerts/update_status.ts
index cd6f97273d6d7..3c7f60ecae15d 100644
--- a/x-pack/plugins/cases/server/client/alerts/update_status.ts
+++ b/x-pack/plugins/cases/server/client/alerts/update_status.ts
@@ -5,22 +5,17 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, Logger } from 'src/core/server';
-import { AlertServiceContract } from '../../services';
-import { UpdateAlertRequest } from '../types';
+import { UpdateAlertRequest } from './client';
+import { CasesClientArgs } from '..';
 
 interface UpdateAlertsStatusArgs {
-  alertsService: AlertServiceContract;
   alerts: UpdateAlertRequest[];
-  scopedClusterClient: ElasticsearchClient;
-  logger: Logger;
 }
 
-export const updateAlertsStatus = async ({
-  alertsService,
-  alerts,
-  scopedClusterClient,
-  logger,
-}: UpdateAlertsStatusArgs): Promise<void> => {
+export const updateStatus = async (
+  { alerts }: UpdateAlertsStatusArgs,
+  clientArgs: CasesClientArgs
+): Promise<void> => {
+  const { alertsService, scopedClusterClient, logger } = clientArgs;
   await alertsService.updateAlertsStatus({ alerts, scopedClusterClient, logger });
 };
diff --git a/x-pack/plugins/cases/server/client/attachments/add.ts b/x-pack/plugins/cases/server/client/attachments/add.ts
new file mode 100644
index 0000000000000..9008e0fc28dee
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/add.ts
@@ -0,0 +1,420 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 {
+  SavedObject,
+  SavedObjectsClientContract,
+  Logger,
+  SavedObjectsUtils,
+} from '../../../../../../src/core/server';
+import { nodeBuilder } from '../../../../../../src/plugins/data/common';
+
+import {
+  throwErrors,
+  CommentRequestRt,
+  CommentType,
+  CaseStatuses,
+  CaseType,
+  SubCaseAttributes,
+  CaseResponse,
+  User,
+  AlertCommentRequestRt,
+  CommentRequest,
+} from '../../../common';
+import {
+  buildCaseUserActionItem,
+  buildCommentUserActionItem,
+} from '../../services/user_actions/helpers';
+
+import { AttachmentService, CasesService, CaseUserActionService } from '../../services';
+import {
+  CommentableCase,
+  createAlertUpdateRequest,
+  isCommentRequestTypeGenAlert,
+} from '../../common';
+import { CasesClientArgs, CasesClientInternal } from '..';
+import { createCaseError } from '../../common/error';
+import {
+  ENABLE_CASE_CONNECTOR,
+  MAX_GENERATED_ALERTS_PER_SUB_CASE,
+  CASE_COMMENT_SAVED_OBJECT,
+} from '../../../common';
+
+import { decodeCommentRequest } from '../utils';
+import { Operations } from '../../authorization';
+
+async function getSubCase({
+  caseService,
+  unsecuredSavedObjectsClient,
+  caseId,
+  createdAt,
+  userActionService,
+  user,
+}: {
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  caseId: string;
+  createdAt: string;
+  userActionService: CaseUserActionService;
+  user: User;
+}): Promise<SavedObject<SubCaseAttributes>> {
+  const mostRecentSubCase = await caseService.getMostRecentSubCase(
+    unsecuredSavedObjectsClient,
+    caseId
+  );
+  if (mostRecentSubCase && mostRecentSubCase.attributes.status !== CaseStatuses.closed) {
+    const subCaseAlertsAttachement = await caseService.getAllSubCaseComments({
+      unsecuredSavedObjectsClient,
+      id: mostRecentSubCase.id,
+      options: {
+        fields: [],
+        filter: nodeBuilder.is(
+          `${CASE_COMMENT_SAVED_OBJECT}.attributes.type`,
+          CommentType.generatedAlert
+        ),
+        page: 1,
+        perPage: 1,
+      },
+    });
+
+    if (subCaseAlertsAttachement.total <= MAX_GENERATED_ALERTS_PER_SUB_CASE) {
+      return mostRecentSubCase;
+    }
+  }
+
+  const newSubCase = await caseService.createSubCase({
+    unsecuredSavedObjectsClient,
+    createdAt,
+    caseId,
+    createdBy: user,
+  });
+  await userActionService.bulkCreate({
+    unsecuredSavedObjectsClient,
+    actions: [
+      buildCaseUserActionItem({
+        action: 'create',
+        actionAt: createdAt,
+        actionBy: user,
+        caseId,
+        subCaseId: newSubCase.id,
+        fields: ['status', 'sub_case'],
+        newValue: JSON.stringify({ status: newSubCase.attributes.status }),
+        owner: newSubCase.attributes.owner,
+      }),
+    ],
+  });
+  return newSubCase;
+}
+
+const addGeneratedAlerts = async (
+  { caseId, comment }: AddArgs,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<CaseResponse> => {
+  const {
+    unsecuredSavedObjectsClient,
+    attachmentService,
+    caseService,
+    userActionService,
+    logger,
+    authorization,
+  } = clientArgs;
+
+  const query = pipe(
+    AlertCommentRequestRt.decode(comment),
+    fold(throwErrors(Boom.badRequest), identity)
+  );
+
+  decodeCommentRequest(comment);
+
+  // This function only supports adding generated alerts
+  if (comment.type !== CommentType.generatedAlert) {
+    throw Boom.internal('Attempting to add a non generated alert in the wrong context');
+  }
+
+  try {
+    const createdDate = new Date().toISOString();
+    const savedObjectID = SavedObjectsUtils.generateId();
+
+    await authorization.ensureAuthorized({
+      entities: [{ owner: comment.owner, id: savedObjectID }],
+      operation: Operations.createComment,
+    });
+
+    const caseInfo = await caseService.getCase({
+      unsecuredSavedObjectsClient,
+      id: caseId,
+    });
+
+    if (
+      query.type === CommentType.generatedAlert &&
+      caseInfo.attributes.type !== CaseType.collection
+    ) {
+      throw Boom.badRequest('Sub case style alert comment cannot be added to an individual case');
+    }
+
+    const userDetails: User = {
+      username: caseInfo.attributes.created_by?.username,
+      full_name: caseInfo.attributes.created_by?.full_name,
+      email: caseInfo.attributes.created_by?.email,
+    };
+
+    const subCase = await getSubCase({
+      caseService,
+      unsecuredSavedObjectsClient,
+      caseId,
+      createdAt: createdDate,
+      userActionService,
+      user: userDetails,
+    });
+
+    const commentableCase = new CommentableCase({
+      logger,
+      collection: caseInfo,
+      subCase,
+      unsecuredSavedObjectsClient,
+      caseService,
+      attachmentService,
+    });
+
+    const {
+      comment: newComment,
+      commentableCase: updatedCase,
+    } = await commentableCase.createComment({
+      createdDate,
+      user: userDetails,
+      commentReq: query,
+      id: savedObjectID,
+    });
+
+    if (
+      (newComment.attributes.type === CommentType.alert ||
+        newComment.attributes.type === CommentType.generatedAlert) &&
+      caseInfo.attributes.settings.syncAlerts
+    ) {
+      const alertsToUpdate = createAlertUpdateRequest({
+        comment: query,
+        status: subCase.attributes.status,
+      });
+      await casesClientInternal.alerts.updateStatus({
+        alerts: alertsToUpdate,
+      });
+    }
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: [
+        buildCommentUserActionItem({
+          action: 'create',
+          actionAt: createdDate,
+          actionBy: { ...userDetails },
+          caseId: updatedCase.caseId,
+          subCaseId: updatedCase.subCaseId,
+          commentId: newComment.id,
+          fields: ['comment'],
+          newValue: JSON.stringify(query),
+          owner: newComment.attributes.owner,
+        }),
+      ],
+    });
+
+    return updatedCase.encode();
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed while adding a generated alert to case id: ${caseId} error: ${error}`,
+      error,
+      logger,
+    });
+  }
+};
+
+async function getCombinedCase({
+  caseService,
+  attachmentService,
+  unsecuredSavedObjectsClient,
+  id,
+  logger,
+}: {
+  caseService: CasesService;
+  attachmentService: AttachmentService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  id: string;
+  logger: Logger;
+}): Promise<CommentableCase> {
+  const [casePromise, subCasePromise] = await Promise.allSettled([
+    caseService.getCase({
+      unsecuredSavedObjectsClient,
+      id,
+    }),
+    ...(ENABLE_CASE_CONNECTOR
+      ? [
+          caseService.getSubCase({
+            unsecuredSavedObjectsClient,
+            id,
+          }),
+        ]
+      : [Promise.reject('case connector feature is disabled')]),
+  ]);
+
+  if (subCasePromise.status === 'fulfilled') {
+    if (subCasePromise.value.references.length > 0) {
+      const caseValue = await caseService.getCase({
+        unsecuredSavedObjectsClient,
+        id: subCasePromise.value.references[0].id,
+      });
+      return new CommentableCase({
+        logger,
+        collection: caseValue,
+        subCase: subCasePromise.value,
+        caseService,
+        attachmentService,
+        unsecuredSavedObjectsClient,
+      });
+    } else {
+      throw Boom.badRequest('Sub case found without reference to collection');
+    }
+  }
+
+  if (casePromise.status === 'rejected') {
+    throw casePromise.reason;
+  } else {
+    return new CommentableCase({
+      logger,
+      collection: casePromise.value,
+      caseService,
+      attachmentService,
+      unsecuredSavedObjectsClient,
+    });
+  }
+}
+
+/**
+ * The arguments needed for creating a new attachment to a case.
+ */
+export interface AddArgs {
+  /**
+   * The case ID that this attachment will be associated with
+   */
+  caseId: string;
+  /**
+   * The attachment values.
+   */
+  comment: CommentRequest;
+}
+
+/**
+ * Create an attachment to a case.
+ *
+ * @ignore
+ */
+export const addComment = async (
+  addArgs: AddArgs,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<CaseResponse> => {
+  const { comment, caseId } = addArgs;
+  const query = pipe(
+    CommentRequestRt.decode(comment),
+    fold(throwErrors(Boom.badRequest), identity)
+  );
+
+  const {
+    unsecuredSavedObjectsClient,
+    caseService,
+    userActionService,
+    attachmentService,
+    user,
+    logger,
+    authorization,
+  } = clientArgs;
+
+  if (isCommentRequestTypeGenAlert(comment)) {
+    if (!ENABLE_CASE_CONNECTOR) {
+      throw Boom.badRequest(
+        'Attempting to add a generated alert when case connector feature is disabled'
+      );
+    }
+
+    return addGeneratedAlerts(addArgs, clientArgs, casesClientInternal);
+  }
+
+  decodeCommentRequest(comment);
+  try {
+    const savedObjectID = SavedObjectsUtils.generateId();
+
+    await authorization.ensureAuthorized({
+      operation: Operations.createComment,
+      entities: [{ owner: comment.owner, id: savedObjectID }],
+    });
+
+    const createdDate = new Date().toISOString();
+
+    const combinedCase = await getCombinedCase({
+      caseService,
+      attachmentService,
+      unsecuredSavedObjectsClient,
+      id: caseId,
+      logger,
+    });
+
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const { username, full_name, email } = user;
+    const userInfo: User = {
+      username,
+      full_name,
+      email,
+    };
+
+    const { comment: newComment, commentableCase: updatedCase } = await combinedCase.createComment({
+      createdDate,
+      user: userInfo,
+      commentReq: query,
+      id: savedObjectID,
+    });
+
+    if (newComment.attributes.type === CommentType.alert && updatedCase.settings.syncAlerts) {
+      const alertsToUpdate = createAlertUpdateRequest({
+        comment: query,
+        status: updatedCase.status,
+      });
+
+      await casesClientInternal.alerts.updateStatus({
+        alerts: alertsToUpdate,
+      });
+    }
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: [
+        buildCommentUserActionItem({
+          action: 'create',
+          actionAt: createdDate,
+          actionBy: { username, full_name, email },
+          caseId: updatedCase.caseId,
+          subCaseId: updatedCase.subCaseId,
+          commentId: newComment.id,
+          fields: ['comment'],
+          newValue: JSON.stringify(query),
+          owner: newComment.attributes.owner,
+        }),
+      ],
+    });
+
+    return updatedCase.encode();
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed while adding a comment 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
new file mode 100644
index 0000000000000..1f6945a9d0584
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/client.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CommentResponse } from '../../../common/api';
+
+import { CasesClientInternal } from '../client_internal';
+import { IAllCommentsResponse, ICaseResponse, ICommentsResponse } from '../typedoc_interfaces';
+import { CasesClientArgs } from '../types';
+import { AddArgs, addComment } from './add';
+import { DeleteAllArgs, deleteAll, DeleteArgs, deleteComment } from './delete';
+import { find, FindArgs, get, getAll, GetAllArgs, GetArgs } from './get';
+import { update, UpdateArgs } from './update';
+
+/**
+ * API for interacting with the attachments to a case.
+ */
+export interface AttachmentsSubClient {
+  /**
+   * Adds an attachment to a case.
+   */
+  add(params: AddArgs): Promise<ICaseResponse>;
+  /**
+   * Deletes all attachments associated with a single case.
+   */
+  deleteAll(deleteAllArgs: DeleteAllArgs): Promise<void>;
+  /**
+   * Deletes a single attachment for a specific case.
+   */
+  delete(deleteArgs: DeleteArgs): Promise<void>;
+  /**
+   * Retrieves all comments matching the search criteria.
+   */
+  find(findArgs: FindArgs): Promise<ICommentsResponse>;
+  /**
+   * Gets all attachments for a single case.
+   */
+  getAll(getAllArgs: GetAllArgs): Promise<IAllCommentsResponse>;
+  /**
+   * Retrieves a single attachment for a case.
+   */
+  get(getArgs: GetArgs): Promise<CommentResponse>;
+  /**
+   * Updates a specific attachment.
+   *
+   * The request must include all fields for the attachment. Even the fields that are not changing.
+   */
+  update(updateArgs: UpdateArgs): Promise<ICaseResponse>;
+}
+
+/**
+ * Creates an API object for interacting with attachments.
+ *
+ * @ignore
+ */
+export const createAttachmentsSubClient = (
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): AttachmentsSubClient => {
+  const attachmentSubClient: AttachmentsSubClient = {
+    add: (params: AddArgs) => addComment(params, clientArgs, casesClientInternal),
+    deleteAll: (deleteAllArgs: DeleteAllArgs) => deleteAll(deleteAllArgs, clientArgs),
+    delete: (deleteArgs: DeleteArgs) => deleteComment(deleteArgs, clientArgs),
+    find: (findArgs: FindArgs) => find(findArgs, clientArgs),
+    getAll: (getAllArgs: GetAllArgs) => getAll(getAllArgs, clientArgs),
+    get: (getArgs: GetArgs) => get(getArgs, clientArgs),
+    update: (updateArgs: UpdateArgs) => update(updateArgs, clientArgs),
+  };
+
+  return Object.freeze(attachmentSubClient);
+};
diff --git a/x-pack/plugins/cases/server/client/attachments/delete.ts b/x-pack/plugins/cases/server/client/attachments/delete.ts
new file mode 100644
index 0000000000000..89e12d7f7ea39
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/delete.ts
@@ -0,0 +1,206 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 pMap from 'p-map';
+
+import { SavedObject } from 'kibana/public';
+import {
+  CASE_SAVED_OBJECT,
+  MAX_CONCURRENT_SEARCHES,
+  SUB_CASE_SAVED_OBJECT,
+} from '../../../common/constants';
+import { AssociationType, CommentAttributes } from '../../../common/api';
+import { CasesClientArgs } from '../types';
+import { buildCommentUserActionItem } from '../../services/user_actions/helpers';
+import { createCaseError } from '../../common/error';
+import { checkEnabledCaseConnectorOrThrow } from '../../common';
+import { Operations } from '../../authorization';
+
+/**
+ * Parameters for deleting all comments of a case or sub case.
+ */
+export interface DeleteAllArgs {
+  /**
+   * The case ID to delete all attachments for
+   */
+  caseID: string;
+  /**
+   * If specified the caseID will be ignored and this value will be used to find a sub case for deleting all the attachments
+   */
+  subCaseID?: string;
+}
+
+/**
+ * Parameters for deleting a single attachment of a case or sub case.
+ */
+export interface DeleteArgs {
+  /**
+   * The case ID to delete an attachment from
+   */
+  caseID: string;
+  /**
+   * The attachment ID to delete
+   */
+  attachmentID: string;
+  /**
+   * If specified the caseID will be ignored and this value will be used to find a sub case for deleting the attachment
+   */
+  subCaseID?: string;
+}
+
+/**
+ * Delete all comments for a case or sub case.
+ *
+ * @ignore
+ */
+export async function deleteAll(
+  { caseID, subCaseID }: DeleteAllArgs,
+  clientArgs: CasesClientArgs
+): Promise<void> {
+  const {
+    user,
+    unsecuredSavedObjectsClient,
+    caseService,
+    attachmentService,
+    userActionService,
+    logger,
+    authorization,
+  } = clientArgs;
+
+  try {
+    checkEnabledCaseConnectorOrThrow(subCaseID);
+
+    const id = subCaseID ?? caseID;
+    const comments = await caseService.getCommentsByAssociation({
+      unsecuredSavedObjectsClient,
+      id,
+      associationType: subCaseID ? AssociationType.subCase : AssociationType.case,
+    });
+
+    if (comments.total <= 0) {
+      throw Boom.notFound(`No comments found for ${id}.`);
+    }
+
+    await authorization.ensureAuthorized({
+      operation: Operations.deleteAllComments,
+      entities: comments.saved_objects.map((comment) => ({
+        owner: comment.attributes.owner,
+        id: comment.id,
+      })),
+    });
+
+    const mapper = async (comment: SavedObject<CommentAttributes>) =>
+      attachmentService.delete({
+        unsecuredSavedObjectsClient,
+        attachmentId: comment.id,
+      });
+
+    // Ensuring we don't too many concurrent deletions running.
+    await pMap(comments.saved_objects, mapper, {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    });
+
+    const deleteDate = new Date().toISOString();
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: comments.saved_objects.map((comment) =>
+        buildCommentUserActionItem({
+          action: 'delete',
+          actionAt: deleteDate,
+          actionBy: user,
+          caseId: caseID,
+          subCaseId: subCaseID,
+          commentId: comment.id,
+          fields: ['comment'],
+          owner: comment.attributes.owner,
+        })
+      ),
+    });
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to delete all comments case id: ${caseID} sub case id: ${subCaseID}: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
+
+/**
+ * Deletes an attachment
+ *
+ * @ignore
+ */
+export async function deleteComment(
+  { caseID, attachmentID, subCaseID }: DeleteArgs,
+  clientArgs: CasesClientArgs
+) {
+  const {
+    user,
+    unsecuredSavedObjectsClient,
+    attachmentService,
+    userActionService,
+    logger,
+    authorization,
+  } = clientArgs;
+
+  try {
+    checkEnabledCaseConnectorOrThrow(subCaseID);
+
+    const deleteDate = new Date().toISOString();
+
+    const myComment = await attachmentService.get({
+      unsecuredSavedObjectsClient,
+      attachmentId: attachmentID,
+    });
+
+    if (myComment == null) {
+      throw Boom.notFound(`This comment ${attachmentID} does not exist anymore.`);
+    }
+
+    await authorization.ensureAuthorized({
+      entities: [{ owner: myComment.attributes.owner, id: myComment.id }],
+      operation: Operations.deleteComment,
+    });
+
+    const type = subCaseID ? SUB_CASE_SAVED_OBJECT : CASE_SAVED_OBJECT;
+    const id = subCaseID ?? caseID;
+
+    const caseRef = myComment.references.find((c) => c.type === type);
+    if (caseRef == null || (caseRef != null && caseRef.id !== id)) {
+      throw Boom.notFound(`This comment ${attachmentID} does not exist in ${id}.`);
+    }
+
+    await attachmentService.delete({
+      unsecuredSavedObjectsClient,
+      attachmentId: attachmentID,
+    });
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: [
+        buildCommentUserActionItem({
+          action: 'delete',
+          actionAt: deleteDate,
+          actionBy: user,
+          caseId: id,
+          subCaseId: subCaseID,
+          commentId: attachmentID,
+          fields: ['comment'],
+          owner: myComment.attributes.owner,
+        }),
+      ],
+    });
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to delete comment: ${caseID} comment id: ${attachmentID} sub case id: ${subCaseID}: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/attachments/get.ts b/x-pack/plugins/cases/server/client/attachments/get.ts
new file mode 100644
index 0000000000000..e15bdcc7c8c2b
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/get.ts
@@ -0,0 +1,251 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { SavedObjectsFindResponse } from 'kibana/server';
+import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
+
+import {
+  AllCommentsResponse,
+  AllCommentsResponseRt,
+  AssociationType,
+  CommentAttributes,
+  CommentResponse,
+  CommentResponseRt,
+  CommentsResponse,
+  CommentsResponseRt,
+  FindQueryParams,
+} from '../../../common/api';
+import {
+  checkEnabledCaseConnectorOrThrow,
+  defaultSortField,
+  transformComments,
+  flattenCommentSavedObject,
+  flattenCommentSavedObjects,
+} from '../../common';
+import { createCaseError } from '../../common/error';
+import { defaultPage, defaultPerPage } from '../../routes/api';
+import { CasesClientArgs } from '../types';
+import { combineFilters, stringToKueryNode } from '../utils';
+import { Operations } from '../../authorization';
+import { includeFieldsRequiredForAuthentication } from '../../authorization/utils';
+
+/**
+ * Parameters for finding attachments of a case
+ */
+export interface FindArgs {
+  /**
+   * The case ID for finding associated attachments
+   */
+  caseID: string;
+  /**
+   * Optional parameters for filtering the returned attachments
+   */
+  queryParams?: FindQueryParams;
+}
+
+/**
+ * Parameters for retrieving all attachments of a case
+ */
+export interface GetAllArgs {
+  /**
+   * The case ID to retrieve all attachments for
+   */
+  caseID: string;
+  /**
+   * Optionally include the attachments associated with a sub case
+   */
+  includeSubCaseComments?: boolean;
+  /**
+   * If included the case ID will be ignored and the attachments will be retrieved from the specified ID of the sub case
+   */
+  subCaseID?: string;
+}
+
+export interface GetArgs {
+  /**
+   * The ID of the case to retrieve an attachment from
+   */
+  caseID: string;
+  /**
+   * The ID of the attachment to retrieve
+   */
+  attachmentID: string;
+}
+
+/**
+ * Retrieves the attachments for a case entity. This support pagination.
+ *
+ * @ignore
+ */
+export async function find(
+  { caseID, queryParams }: FindArgs,
+  clientArgs: CasesClientArgs
+): Promise<CommentsResponse> {
+  const { unsecuredSavedObjectsClient, caseService, logger, authorization } = clientArgs;
+
+  try {
+    checkEnabledCaseConnectorOrThrow(queryParams?.subCaseId);
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(Operations.findComments);
+
+    const id = queryParams?.subCaseId ?? caseID;
+    const associationType = queryParams?.subCaseId ? AssociationType.subCase : AssociationType.case;
+    const { filter, ...queryWithoutFilter } = queryParams ?? {};
+
+    // if the fields property was defined, make sure we include the 'owner' field in the response
+    const fields = includeFieldsRequiredForAuthentication(queryWithoutFilter.fields);
+
+    // combine any passed in filter property and the filter for the appropriate owner
+    const combinedFilter = combineFilters([stringToKueryNode(filter), authorizationFilter]);
+
+    const args = queryParams
+      ? {
+          caseService,
+          unsecuredSavedObjectsClient,
+          id,
+          options: {
+            // We need this because the default behavior of getAllCaseComments is to return all the comments
+            // unless the page and/or perPage is specified. Since we're spreading the query after the request can
+            // still override this behavior.
+            page: defaultPage,
+            perPage: defaultPerPage,
+            sortField: 'created_at',
+            filter: combinedFilter,
+            ...queryWithoutFilter,
+            fields,
+          },
+          associationType,
+        }
+      : {
+          caseService,
+          unsecuredSavedObjectsClient,
+          id,
+          options: {
+            page: defaultPage,
+            perPage: defaultPerPage,
+            sortField: 'created_at',
+            filter: combinedFilter,
+          },
+          associationType,
+        };
+
+    const theComments = await caseService.getCommentsByAssociation(args);
+
+    ensureSavedObjectsAreAuthorized(
+      theComments.saved_objects.map((comment) => ({
+        owner: comment.attributes.owner,
+        id: comment.id,
+      }))
+    );
+
+    return CommentsResponseRt.encode(transformComments(theComments));
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to find comments case id: ${caseID}: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
+
+/**
+ * Retrieves a single attachment by its ID.
+ *
+ * @ignore
+ */
+export async function get(
+  { attachmentID, caseID }: GetArgs,
+  clientArgs: CasesClientArgs
+): Promise<CommentResponse> {
+  const { attachmentService, unsecuredSavedObjectsClient, logger, authorization } = clientArgs;
+
+  try {
+    const comment = await attachmentService.get({
+      unsecuredSavedObjectsClient,
+      attachmentId: attachmentID,
+    });
+
+    await authorization.ensureAuthorized({
+      entities: [{ owner: comment.attributes.owner, id: comment.id }],
+      operation: Operations.getComment,
+    });
+
+    return CommentResponseRt.encode(flattenCommentSavedObject(comment));
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to get comment case id: ${caseID} attachment id: ${attachmentID}: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
+
+/**
+ * Retrieves all the attachments for a case. The `includeSubCaseComments` can be used to include the sub case comments for
+ * collections. If the entity is a sub case, pass in the subCaseID.
+ *
+ * @ignore
+ */
+export async function getAll(
+  { caseID, includeSubCaseComments, subCaseID }: GetAllArgs,
+  clientArgs: CasesClientArgs
+): Promise<AllCommentsResponse> {
+  const { unsecuredSavedObjectsClient, caseService, logger, authorization } = clientArgs;
+
+  try {
+    let comments: SavedObjectsFindResponse<CommentAttributes>;
+
+    if (
+      !ENABLE_CASE_CONNECTOR &&
+      (subCaseID !== undefined || includeSubCaseComments !== undefined)
+    ) {
+      throw Boom.badRequest(
+        'The sub case id and include sub case comments fields are not supported when the case connector feature is disabled'
+      );
+    }
+
+    const { filter, ensureSavedObjectsAreAuthorized } = await authorization.getAuthorizationFilter(
+      Operations.getAllComments
+    );
+
+    if (subCaseID) {
+      comments = await caseService.getAllSubCaseComments({
+        unsecuredSavedObjectsClient,
+        id: subCaseID,
+        options: {
+          filter,
+          sortField: defaultSortField,
+        },
+      });
+    } else {
+      comments = await caseService.getAllCaseComments({
+        unsecuredSavedObjectsClient,
+        id: caseID,
+        includeSubCaseComments,
+        options: {
+          filter,
+          sortField: defaultSortField,
+        },
+      });
+    }
+
+    ensureSavedObjectsAreAuthorized(
+      comments.saved_objects.map((comment) => ({ id: comment.id, owner: comment.attributes.owner }))
+    );
+
+    return AllCommentsResponseRt.encode(flattenCommentSavedObjects(comments.saved_objects));
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to get all comments case id: ${caseID} include sub case comments: ${includeSubCaseComments} sub case id: ${subCaseID}: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/attachments/update.ts b/x-pack/plugins/cases/server/client/attachments/update.ts
new file mode 100644
index 0000000000000..c0566ff646814
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/attachments/update.ts
@@ -0,0 +1,207 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { pick } from 'lodash/fp';
+import Boom from '@hapi/boom';
+
+import { SavedObjectsClientContract, Logger } from 'kibana/server';
+import { checkEnabledCaseConnectorOrThrow, CommentableCase } from '../../common';
+import { buildCommentUserActionItem } from '../../services/user_actions/helpers';
+import { CASE_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../../common/constants';
+import { AttachmentService, CasesService } from '../../services';
+import { CaseResponse, CommentPatchRequest } from '../../../common/api';
+import { CasesClientArgs } from '..';
+import { decodeCommentRequest } from '../utils';
+import { createCaseError } from '../../common/error';
+import { Operations } from '../../authorization';
+
+/**
+ * Parameters for updating a single attachment
+ */
+export interface UpdateArgs {
+  /**
+   * The ID of the case that is associated with this attachment
+   */
+  caseID: string;
+  /**
+   * The full attachment request with the fields updated with appropriate values
+   */
+  updateRequest: CommentPatchRequest;
+  /**
+   * The ID of a sub case, if specified a sub case will be searched for to perform the attachment update instead of on a case
+   */
+  subCaseID?: string;
+}
+
+interface CombinedCaseParams {
+  attachmentService: AttachmentService;
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  caseID: string;
+  logger: Logger;
+  subCaseId?: string;
+}
+
+async function getCommentableCase({
+  attachmentService,
+  caseService,
+  unsecuredSavedObjectsClient,
+  caseID,
+  subCaseId,
+  logger,
+}: CombinedCaseParams) {
+  if (subCaseId) {
+    const [caseInfo, subCase] = await Promise.all([
+      caseService.getCase({
+        unsecuredSavedObjectsClient,
+        id: caseID,
+      }),
+      caseService.getSubCase({
+        unsecuredSavedObjectsClient,
+        id: subCaseId,
+      }),
+    ]);
+    return new CommentableCase({
+      attachmentService,
+      caseService,
+      collection: caseInfo,
+      subCase,
+      unsecuredSavedObjectsClient,
+      logger,
+    });
+  } else {
+    const caseInfo = await caseService.getCase({
+      unsecuredSavedObjectsClient,
+      id: caseID,
+    });
+    return new CommentableCase({
+      attachmentService,
+      caseService,
+      collection: caseInfo,
+      unsecuredSavedObjectsClient,
+      logger,
+    });
+  }
+}
+
+/**
+ * Update an attachment.
+ *
+ * @ignore
+ */
+export async function update(
+  { caseID, subCaseID, updateRequest: queryParams }: UpdateArgs,
+  clientArgs: CasesClientArgs
+): Promise<CaseResponse> {
+  const {
+    attachmentService,
+    caseService,
+    unsecuredSavedObjectsClient,
+    logger,
+    user,
+    userActionService,
+    authorization,
+  } = clientArgs;
+
+  try {
+    checkEnabledCaseConnectorOrThrow(subCaseID);
+
+    const {
+      id: queryCommentId,
+      version: queryCommentVersion,
+      ...queryRestAttributes
+    } = queryParams;
+
+    decodeCommentRequest(queryRestAttributes);
+
+    const commentableCase = await getCommentableCase({
+      attachmentService,
+      caseService,
+      unsecuredSavedObjectsClient,
+      caseID,
+      subCaseId: subCaseID,
+      logger,
+    });
+
+    const myComment = await attachmentService.get({
+      unsecuredSavedObjectsClient,
+      attachmentId: queryCommentId,
+    });
+
+    if (myComment == null) {
+      throw Boom.notFound(`This comment ${queryCommentId} does not exist anymore.`);
+    }
+
+    await authorization.ensureAuthorized({
+      entities: [{ owner: myComment.attributes.owner, id: myComment.id }],
+      operation: Operations.updateComment,
+    });
+
+    if (myComment.attributes.type !== queryRestAttributes.type) {
+      throw Boom.badRequest(`You cannot change the type of the comment.`);
+    }
+
+    if (myComment.attributes.owner !== queryRestAttributes.owner) {
+      throw Boom.badRequest(`You cannot change the owner of the comment.`);
+    }
+
+    const saveObjType = subCaseID ? SUB_CASE_SAVED_OBJECT : CASE_SAVED_OBJECT;
+
+    const caseRef = myComment.references.find((c) => c.type === saveObjType);
+    if (caseRef == null || (caseRef != null && caseRef.id !== commentableCase.id)) {
+      throw Boom.notFound(
+        `This comment ${queryCommentId} does not exist in ${commentableCase.id}).`
+      );
+    }
+
+    if (queryCommentVersion !== myComment.version) {
+      throw Boom.conflict(
+        'This case has been updated. Please refresh before saving additional updates.'
+      );
+    }
+
+    const updatedDate = new Date().toISOString();
+    const {
+      comment: updatedComment,
+      commentableCase: updatedCase,
+    } = await commentableCase.updateComment({
+      updateRequest: queryParams,
+      updatedAt: updatedDate,
+      user,
+    });
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: [
+        buildCommentUserActionItem({
+          action: 'update',
+          actionAt: updatedDate,
+          actionBy: user,
+          caseId: caseID,
+          subCaseId: subCaseID,
+          commentId: updatedComment.id,
+          fields: ['comment'],
+          newValue: JSON.stringify(queryRestAttributes),
+          oldValue: JSON.stringify(
+            // We are interested only in ContextBasicRt attributes
+            // myComment.attribute contains also CommentAttributesBasicRt attributes
+            pick(Object.keys(queryRestAttributes), myComment.attributes)
+          ),
+          owner: myComment.attributes.owner,
+        }),
+      ],
+    });
+
+    return await updatedCase.encode();
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to patch comment case id: ${caseID} sub case id: ${subCaseID}: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/cases/client.ts b/x-pack/plugins/cases/server/client/cases/client.ts
new file mode 100644
index 0000000000000..20670f331443b
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/cases/client.ts
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  CasePostRequest,
+  CasesPatchRequest,
+  CasesFindRequest,
+  User,
+  AllTagsFindRequest,
+  AllReportersFindRequest,
+} from '../../../common/api';
+import { CasesClient } from '../client';
+import { CasesClientInternal } from '../client_internal';
+import {
+  ICasePostRequest,
+  ICaseResponse,
+  ICasesFindRequest,
+  ICasesFindResponse,
+  ICasesPatchRequest,
+  ICasesResponse,
+} from '../typedoc_interfaces';
+import { CasesClientArgs } from '../types';
+import { create } from './create';
+import { deleteCases } from './delete';
+import { find } from './find';
+import {
+  CaseIDsByAlertIDParams,
+  get,
+  getCaseIDsByAlertID,
+  GetParams,
+  getReporters,
+  getTags,
+} from './get';
+import { push, PushParams } from './push';
+import { update } from './update';
+
+/**
+ * API for interacting with the cases entities.
+ */
+export interface CasesSubClient {
+  /**
+   * Creates a case.
+   */
+  create(data: ICasePostRequest): Promise<ICaseResponse>;
+  /**
+   * Returns cases that match the search criteria.
+   *
+   * If the `owner` field is left empty then all the cases that the user has access to will be returned.
+   */
+  find(params: ICasesFindRequest): Promise<ICasesFindResponse>;
+  /**
+   * Retrieves a single case with the specified ID.
+   */
+  get(params: GetParams): Promise<ICaseResponse>;
+  /**
+   * Pushes a specific case to an external system.
+   */
+  push(args: PushParams): Promise<ICaseResponse>;
+  /**
+   * Update the specified cases with the passed in values.
+   */
+  update(cases: ICasesPatchRequest): Promise<ICasesResponse>;
+  /**
+   * Delete a case and all its comments.
+   *
+   * @params ids an array of case IDs to delete
+   */
+  delete(ids: string[]): Promise<void>;
+  /**
+   * Retrieves all the tags across all cases the user making the request has access to.
+   */
+  getTags(params: AllTagsFindRequest): Promise<string[]>;
+  /**
+   * Retrieves all the reporters across all accessible cases.
+   */
+  getReporters(params: AllReportersFindRequest): Promise<User[]>;
+  /**
+   * Retrieves the case IDs given a single alert ID
+   */
+  getCaseIDsByAlertID(params: CaseIDsByAlertIDParams): Promise<string[]>;
+}
+
+/**
+ * Creates the interface for CRUD on cases objects.
+ *
+ * @ignore
+ */
+export const createCasesSubClient = (
+  clientArgs: CasesClientArgs,
+  casesClient: CasesClient,
+  casesClientInternal: CasesClientInternal
+): CasesSubClient => {
+  const casesSubClient: CasesSubClient = {
+    create: (data: CasePostRequest) => create(data, clientArgs),
+    find: (params: CasesFindRequest) => find(params, clientArgs),
+    get: (params: GetParams) => get(params, clientArgs),
+    push: (params: PushParams) => push(params, clientArgs, casesClient, casesClientInternal),
+    update: (cases: CasesPatchRequest) => update(cases, clientArgs, casesClientInternal),
+    delete: (ids: string[]) => deleteCases(ids, clientArgs),
+    getTags: (params: AllTagsFindRequest) => getTags(params, clientArgs),
+    getReporters: (params: AllReportersFindRequest) => getReporters(params, clientArgs),
+    getCaseIDsByAlertID: (params: CaseIDsByAlertIDParams) =>
+      getCaseIDsByAlertID(params, clientArgs),
+  };
+
+  return Object.freeze(casesSubClient);
+};
diff --git a/x-pack/plugins/cases/server/client/cases/create.test.ts b/x-pack/plugins/cases/server/client/cases/create.test.ts
deleted file mode 100644
index 9cbe2a448d3b4..0000000000000
--- a/x-pack/plugins/cases/server/client/cases/create.test.ts
+++ /dev/null
@@ -1,464 +0,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 { ConnectorTypes, CaseStatuses, CaseType, CasesClientPostRequest } from '../../../common';
-import { isCaseError } from '../../common/error';
-
-import {
-  createMockSavedObjectsRepository,
-  mockCaseConfigure,
-  mockCases,
-} from '../../routes/api/__fixtures__';
-import { createCasesClientWithMockSavedObjectsClient } from '../mocks';
-
-describe('create', () => {
-  beforeEach(async () => {
-    jest.restoreAllMocks();
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2019-11-25T21:54:48.952Z'),
-    }));
-  });
-
-  describe('happy path', () => {
-    test('it creates the case correctly', async () => {
-      const postCase: CasesClientPostRequest = {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        title: 'Super Bad Security Issue',
-        tags: ['defacement'],
-        type: CaseType.individual,
-        connector: {
-          id: '123',
-          name: 'Jira',
-          type: ConnectorTypes.jira,
-          fields: { issueType: 'Task', priority: 'High', parent: null },
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseConfigureSavedObject: mockCaseConfigure,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.create(postCase);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": Object {
-              "issueType": "Task",
-              "parent": null,
-              "priority": "High",
-            },
-            "id": "123",
-            "name": "Jira",
-            "type": ".jira",
-          },
-          "created_at": "2019-11-25T21:54:48.952Z",
-          "created_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "description": "This is a brand new case of a bad meanie defacing data",
-          "external_service": null,
-          "id": "mock-it",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "defacement",
-          ],
-          "title": "Super Bad Security Issue",
-          "totalAlerts": 0,
-          "totalComment": 0,
-          "type": "individual",
-          "updated_at": null,
-          "updated_by": null,
-          "version": "WzksMV0=",
-        }
-      `);
-
-      expect(
-        casesClient.services.userActionService.postUserActions.mock.calls[0][0].actions
-        // using a snapshot here so we don't have to update the text field manually each time it changes
-      ).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "attributes": Object {
-              "action": "create",
-              "action_at": "2019-11-25T21:54:48.952Z",
-              "action_by": Object {
-                "email": "d00d@awesome.com",
-                "full_name": "Awesome D00d",
-                "username": "awesome",
-              },
-              "action_field": Array [
-                "description",
-                "status",
-                "tags",
-                "title",
-                "connector",
-                "settings",
-              ],
-              "new_value": "{\\"type\\":\\"individual\\",\\"description\\":\\"This is a brand new case of a bad meanie defacing data\\",\\"title\\":\\"Super Bad Security Issue\\",\\"tags\\":[\\"defacement\\"],\\"connector\\":{\\"id\\":\\"123\\",\\"name\\":\\"Jira\\",\\"type\\":\\".jira\\",\\"fields\\":{\\"issueType\\":\\"Task\\",\\"priority\\":\\"High\\",\\"parent\\":null}},\\"settings\\":{\\"syncAlerts\\":true}}",
-              "old_value": null,
-            },
-            "references": Array [
-              Object {
-                "id": "mock-it",
-                "name": "associated-cases",
-                "type": "cases",
-              },
-            ],
-          },
-        ]
-      `);
-    });
-
-    test('it creates the case without connector in the configuration', async () => {
-      const postCase: CasesClientPostRequest = {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        title: 'Super Bad Security Issue',
-        tags: ['defacement'],
-        type: CaseType.individual,
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.create(postCase);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": null,
-            "id": "none",
-            "name": "none",
-            "type": ".none",
-          },
-          "created_at": "2019-11-25T21:54:48.952Z",
-          "created_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "description": "This is a brand new case of a bad meanie defacing data",
-          "external_service": null,
-          "id": "mock-it",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "defacement",
-          ],
-          "title": "Super Bad Security Issue",
-          "totalAlerts": 0,
-          "totalComment": 0,
-          "type": "individual",
-          "updated_at": null,
-          "updated_by": null,
-          "version": "WzksMV0=",
-        }
-      `);
-    });
-
-    test('Allow user to create case without authentication', async () => {
-      const postCase: CasesClientPostRequest = {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        title: 'Super Bad Security Issue',
-        tags: ['defacement'],
-        type: CaseType.individual,
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({
-        savedObjectsClient,
-        badAuth: true,
-      });
-      const res = await casesClient.client.create(postCase);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": null,
-            "id": "none",
-            "name": "none",
-            "type": ".none",
-          },
-          "created_at": "2019-11-25T21:54:48.952Z",
-          "created_by": Object {
-            "email": null,
-            "full_name": null,
-            "username": null,
-          },
-          "description": "This is a brand new case of a bad meanie defacing data",
-          "external_service": null,
-          "id": "mock-it",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "defacement",
-          ],
-          "title": "Super Bad Security Issue",
-          "totalAlerts": 0,
-          "totalComment": 0,
-          "type": "individual",
-          "updated_at": null,
-          "updated_by": null,
-          "version": "WzksMV0=",
-        }
-      `);
-    });
-  });
-
-  describe('unhappy path', () => {
-    test('it throws when missing title', async () => {
-      expect.assertions(3);
-      const postCase = {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        tags: ['defacement'],
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return (
-        casesClient.client
-          // @ts-expect-error
-          .create({ theCase: postCase })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          })
-      );
-    });
-
-    test('it throws when missing description', async () => {
-      expect.assertions(3);
-      const postCase = {
-        title: 'a title',
-        tags: ['defacement'],
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return (
-        casesClient.client
-          // @ts-expect-error
-          .create({ theCase: postCase })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          })
-      );
-    });
-
-    test('it throws when missing tags', async () => {
-      expect.assertions(3);
-      const postCase = {
-        title: 'a title',
-        description: 'This is a brand new case of a bad meanie defacing data',
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return (
-        casesClient.client
-          // @ts-expect-error
-          .create({ theCase: postCase })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          })
-      );
-    });
-
-    test('it throws when missing connector ', async () => {
-      expect.assertions(3);
-      const postCase = {
-        title: 'a title',
-        description: 'This is a brand new case of a bad meanie defacing data',
-        tags: ['defacement'],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return (
-        casesClient.client
-          // @ts-expect-error
-          .create({ theCase: postCase })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          })
-      );
-    });
-
-    test('it throws when connector missing the right fields', async () => {
-      expect.assertions(3);
-      const postCase = {
-        title: 'a title',
-        description: 'This is a brand new case of a bad meanie defacing data',
-        tags: ['defacement'],
-        connector: {
-          id: '123',
-          name: 'Jira',
-          type: ConnectorTypes.jira,
-          fields: {},
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return (
-        casesClient.client
-          // @ts-expect-error
-          .create({ theCase: postCase })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          })
-      );
-    });
-
-    test('it throws if you passing status for a new case', async () => {
-      expect.assertions(3);
-      const postCase = {
-        title: 'a title',
-        description: 'This is a brand new case of a bad meanie defacing data',
-        tags: ['defacement'],
-        type: CaseType.individual,
-        status: CaseStatuses.closed,
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client.create(postCase).catch((e) => {
-        expect(e).not.toBeNull();
-        expect(e.isBoom).toBe(true);
-        expect(e.output.statusCode).toBe(400);
-      });
-    });
-
-    it(`Returns an error if postNewCase throws`, async () => {
-      const postCase: CasesClientPostRequest = {
-        description: 'Throw an error',
-        title: 'Super Bad Security Issue',
-        tags: ['error'],
-        type: CaseType.individual,
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      };
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-
-      return casesClient.client.create(postCase).catch((e) => {
-        expect(e).not.toBeNull();
-        expect(isCaseError(e)).toBeTruthy();
-        const boomErr = e.boomify();
-        expect(boomErr.isBoom).toBe(true);
-        expect(boomErr.output.statusCode).toBe(400);
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/server/client/cases/create.ts b/x-pack/plugins/cases/server/client/cases/create.ts
index fae60743073c1..879edd5eb1b5c 100644
--- a/x-pack/plugins/cases/server/client/cases/create.ts
+++ b/x-pack/plugins/cases/server/client/cases/create.ts
@@ -10,8 +10,7 @@ import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
 import { identity } from 'fp-ts/lib/function';
 
-import { SavedObjectsClientContract, Logger } from 'src/core/server';
-import { flattenCaseSavedObject, transformNewCase } from '../../routes/api/utils';
+import { SavedObjectsUtils } from '../../../../../../src/core/server';
 
 import {
   throwErrors,
@@ -21,46 +20,42 @@ import {
   CasesClientPostRequestRt,
   CasePostRequest,
   CaseType,
-  User,
+  OWNER_FIELD,
 } from '../../../common';
 import { buildCaseUserActionItem } from '../../services/user_actions/helpers';
-import {
-  getConnectorFromConfiguration,
-  transformCaseConnectorToEsConnector,
-} from '../../routes/api/cases/helpers';
+import { getConnectorFromConfiguration } from '../utils';
 
-import {
-  CaseConfigureServiceSetup,
-  CaseServiceSetup,
-  CaseUserActionServiceSetup,
-} from '../../services';
 import { createCaseError } from '../../common/error';
+import { Operations } from '../../authorization';
 import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
-
-interface CreateCaseArgs {
-  caseConfigureService: CaseConfigureServiceSetup;
-  caseService: CaseServiceSetup;
-  user: User;
-  savedObjectsClient: SavedObjectsClientContract;
-  userActionService: CaseUserActionServiceSetup;
-  theCase: CasePostRequest;
-  logger: Logger;
-}
+import {
+  flattenCaseSavedObject,
+  transformCaseConnectorToEsConnector,
+  transformNewCase,
+} from '../../common';
+import { CasesClientArgs } from '..';
 
 /**
  * Creates a new case.
+ *
+ * @ignore
  */
-export const create = async ({
-  savedObjectsClient,
-  caseService,
-  caseConfigureService,
-  userActionService,
-  user,
-  theCase,
-  logger,
-}: CreateCaseArgs): Promise<CaseResponse> => {
+export const create = async (
+  data: CasePostRequest,
+  clientArgs: CasesClientArgs
+): Promise<CaseResponse> => {
+  const {
+    unsecuredSavedObjectsClient,
+    caseService,
+    caseConfigureService,
+    userActionService,
+    user,
+    logger,
+    authorization: auth,
+  } = clientArgs;
+
   // default to an individual case if the type is not defined.
-  const { type = CaseType.individual, ...nonTypeCaseFields } = theCase;
+  const { type = CaseType.individual, ...nonTypeCaseFields } = data;
 
   if (!ENABLE_CASE_CONNECTOR && type === CaseType.collection) {
     throw Boom.badRequest(
@@ -78,14 +73,23 @@ export const create = async ({
   );
 
   try {
+    const savedObjectID = SavedObjectsUtils.generateId();
+
+    await auth.ensureAuthorized({
+      operation: Operations.createCase,
+      entities: [{ owner: query.owner, id: savedObjectID }],
+    });
+
     // eslint-disable-next-line @typescript-eslint/naming-convention
     const { username, full_name, email } = user;
     const createdDate = new Date().toISOString();
-    const myCaseConfigure = await caseConfigureService.find({ client: savedObjectsClient });
+    const myCaseConfigure = await caseConfigureService.find({
+      unsecuredSavedObjectsClient,
+    });
     const caseConfigureConnector = getConnectorFromConfiguration(myCaseConfigure);
 
     const newCase = await caseService.postNewCase({
-      client: savedObjectsClient,
+      unsecuredSavedObjectsClient,
       attributes: transformNewCase({
         createdDate,
         newCase: query,
@@ -94,18 +98,20 @@ export const create = async ({
         email,
         connector: transformCaseConnectorToEsConnector(query.connector ?? caseConfigureConnector),
       }),
+      id: savedObjectID,
     });
 
-    await userActionService.postUserActions({
-      client: savedObjectsClient,
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
       actions: [
         buildCaseUserActionItem({
           action: 'create',
           actionAt: createdDate,
           actionBy: { username, full_name, email },
           caseId: newCase.id,
-          fields: ['description', 'status', 'tags', 'title', 'connector', 'settings'],
+          fields: ['description', 'status', 'tags', 'title', 'connector', 'settings', OWNER_FIELD],
           newValue: JSON.stringify(query),
+          owner: newCase.attributes.owner,
         }),
       ],
     });
diff --git a/x-pack/plugins/cases/server/client/cases/delete.ts b/x-pack/plugins/cases/server/client/cases/delete.ts
new file mode 100644
index 0000000000000..8e99e39ec473b
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/cases/delete.ts
@@ -0,0 +1,179 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 pMap from 'p-map';
+import { Boom } from '@hapi/boom';
+import { SavedObject, SavedObjectsClientContract, SavedObjectsFindResponse } from 'kibana/server';
+import { ENABLE_CASE_CONNECTOR, MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
+import { CasesClientArgs } from '..';
+import { createCaseError } from '../../common/error';
+import { AttachmentService, CasesService } from '../../services';
+import { buildCaseUserActionItem } from '../../services/user_actions/helpers';
+import { Operations, OwnerEntity } from '../../authorization';
+import { OWNER_FIELD, SubCaseAttributes, CommentAttributes } from '../../../common/api';
+
+async function deleteSubCases({
+  attachmentService,
+  caseService,
+  unsecuredSavedObjectsClient,
+  caseIds,
+}: {
+  attachmentService: AttachmentService;
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  caseIds: string[];
+}) {
+  const subCasesForCaseIds = await caseService.findSubCasesByCaseId({
+    unsecuredSavedObjectsClient,
+    ids: caseIds,
+  });
+
+  const subCaseIDs = subCasesForCaseIds.saved_objects.map((subCase) => subCase.id);
+  const commentsForSubCases = await caseService.getAllSubCaseComments({
+    unsecuredSavedObjectsClient,
+    id: subCaseIDs,
+  });
+
+  const commentMapper = (commentSO: SavedObject<CommentAttributes>) =>
+    attachmentService.delete({ unsecuredSavedObjectsClient, attachmentId: commentSO.id });
+
+  const subCasesMapper = (subCaseSO: SavedObject<SubCaseAttributes>) =>
+    caseService.deleteSubCase(unsecuredSavedObjectsClient, subCaseSO.id);
+
+  /**
+   * This shouldn't actually delete anything because
+   * all the comments should be deleted when comments are deleted
+   * per case ID. We also ensure that we don't too many concurrent deletions running.
+   */
+  await pMap(commentsForSubCases.saved_objects, commentMapper, {
+    concurrency: MAX_CONCURRENT_SEARCHES,
+  });
+
+  await pMap(subCasesForCaseIds.saved_objects, subCasesMapper, {
+    concurrency: MAX_CONCURRENT_SEARCHES,
+  });
+}
+
+/**
+ * Deletes the specified cases and their attachments.
+ *
+ * @ignore
+ */
+export async function deleteCases(ids: string[], clientArgs: CasesClientArgs): Promise<void> {
+  const {
+    unsecuredSavedObjectsClient,
+    caseService,
+    attachmentService,
+    user,
+    userActionService,
+    logger,
+    authorization,
+  } = clientArgs;
+  try {
+    const cases = await caseService.getCases({ unsecuredSavedObjectsClient, caseIds: ids });
+    const entities = new Map<string, OwnerEntity>();
+
+    for (const theCase of cases.saved_objects) {
+      // bulkGet can return an error.
+      if (theCase.error != null) {
+        throw createCaseError({
+          message: `Failed to delete cases ids: ${JSON.stringify(ids)}: ${theCase.error.error}`,
+          error: new Boom(theCase.error.message, { statusCode: theCase.error.statusCode }),
+          logger,
+        });
+      }
+      entities.set(theCase.id, { id: theCase.id, owner: theCase.attributes.owner });
+    }
+
+    await authorization.ensureAuthorized({
+      operation: Operations.deleteCase,
+      entities: Array.from(entities.values()),
+    });
+
+    const deleteCasesMapper = async (id: string) =>
+      caseService.deleteCase({
+        unsecuredSavedObjectsClient,
+        id,
+      });
+
+    // Ensuring we don't too many concurrent deletions running.
+    await pMap(ids, deleteCasesMapper, {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    });
+
+    const getCommentsMapper = async (id: string) =>
+      caseService.getAllCaseComments({
+        unsecuredSavedObjectsClient,
+        id,
+      });
+
+    // Ensuring we don't too many concurrent get running.
+    const comments = await pMap(ids, getCommentsMapper, {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    });
+
+    /**
+     * This is a nested pMap.Mapper.
+     * Each element of the comments array contains all comments of a particular case.
+     * For that reason we need first to create a map that iterate over all cases
+     * and return a pMap that deletes the comments for that case
+     */
+    const deleteCommentsMapper = async (commentRes: SavedObjectsFindResponse<CommentAttributes>) =>
+      pMap(commentRes.saved_objects, (comment) =>
+        attachmentService.delete({
+          unsecuredSavedObjectsClient,
+          attachmentId: comment.id,
+        })
+      );
+
+    // Ensuring we don't too many concurrent deletions running.
+    await pMap(comments, deleteCommentsMapper, {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    });
+
+    if (ENABLE_CASE_CONNECTOR) {
+      await deleteSubCases({
+        attachmentService,
+        caseService,
+        unsecuredSavedObjectsClient,
+        caseIds: ids,
+      });
+    }
+
+    const deleteDate = new Date().toISOString();
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: cases.saved_objects.map((caseInfo) =>
+        buildCaseUserActionItem({
+          action: 'delete',
+          actionAt: deleteDate,
+          actionBy: user,
+          caseId: caseInfo.id,
+          fields: [
+            'description',
+            'status',
+            'tags',
+            'title',
+            'connector',
+            'settings',
+            OWNER_FIELD,
+            'comment',
+            ...(ENABLE_CASE_CONNECTOR ? ['sub_case'] : []),
+          ],
+          owner: caseInfo.attributes.owner,
+        })
+      ),
+    });
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to delete cases ids: ${JSON.stringify(ids)}: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/cases/find.ts b/x-pack/plugins/cases/server/client/cases/find.ts
new file mode 100644
index 0000000000000..73eca5e7abb93
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/cases/find.ts
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 {
+  CasesFindResponse,
+  CasesFindRequest,
+  CasesFindRequestRt,
+  throwErrors,
+  caseStatuses,
+  CasesFindResponseRt,
+  excess,
+} from '../../../common/api';
+
+import { createCaseError } from '../../common/error';
+import { constructQueryOptions } from '../utils';
+import { includeFieldsRequiredForAuthentication } from '../../authorization/utils';
+import { Operations } from '../../authorization';
+import { transformCases } from '../../common';
+import { CasesClientArgs } from '..';
+
+/**
+ * Retrieves a case and optionally its comments and sub case comments.
+ *
+ * @ignore
+ */
+export const find = async (
+  params: CasesFindRequest,
+  clientArgs: CasesClientArgs
+): Promise<CasesFindResponse> => {
+  const { unsecuredSavedObjectsClient, caseService, authorization, logger } = clientArgs;
+
+  try {
+    const queryParams = pipe(
+      excess(CasesFindRequestRt).decode(params),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(Operations.findCases);
+
+    const queryArgs = {
+      tags: queryParams.tags,
+      reporters: queryParams.reporters,
+      sortByField: queryParams.sortField,
+      status: queryParams.status,
+      caseType: queryParams.type,
+      owner: queryParams.owner,
+    };
+
+    const caseQueries = constructQueryOptions({ ...queryArgs, authorizationFilter });
+    const cases = await caseService.findCasesGroupedByID({
+      unsecuredSavedObjectsClient,
+      caseOptions: {
+        ...queryParams,
+        ...caseQueries.case,
+        searchFields:
+          queryParams.searchFields != null
+            ? Array.isArray(queryParams.searchFields)
+              ? queryParams.searchFields
+              : [queryParams.searchFields]
+            : queryParams.searchFields,
+        fields: includeFieldsRequiredForAuthentication(queryParams.fields),
+      },
+      subCaseOptions: caseQueries.subCase,
+    });
+
+    ensureSavedObjectsAreAuthorized([...cases.casesMap.values()]);
+
+    // casesStatuses are bounded by us. No need to limit concurrent calls.
+    const [openCases, inProgressCases, closedCases] = await Promise.all([
+      ...caseStatuses.map((status) => {
+        const statusQuery = constructQueryOptions({ ...queryArgs, status, authorizationFilter });
+        return caseService.findCaseStatusStats({
+          unsecuredSavedObjectsClient,
+          caseOptions: statusQuery.case,
+          subCaseOptions: statusQuery.subCase,
+          ensureSavedObjectsAreAuthorized,
+        });
+      }),
+    ]);
+
+    return CasesFindResponseRt.encode(
+      transformCases({
+        casesMap: cases.casesMap,
+        page: cases.page,
+        perPage: cases.perPage,
+        total: cases.total,
+        countOpenCases: openCases,
+        countInProgressCases: inProgressCases,
+        countClosedCases: closedCases,
+      })
+    );
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to find cases: ${JSON.stringify(params)}: ${error}`,
+      error,
+      logger,
+    });
+  }
+};
diff --git a/x-pack/plugins/cases/server/client/cases/get.ts b/x-pack/plugins/cases/server/client/cases/get.ts
index 08fa96a3bbe6f..7a8100ad60ff3 100644
--- a/x-pack/plugins/cases/server/client/cases/get.ts
+++ b/x-pack/plugins/cases/server/client/cases/get.ts
@@ -4,57 +4,168 @@
  * 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 { SavedObjectsClientContract, Logger, SavedObject } from 'kibana/server';
-import { flattenCaseSavedObject } from '../../routes/api/utils';
-import { CaseResponseRt, CaseResponse, ESCaseAttributes } from '../../../common';
-import { CaseServiceSetup } from '../../services';
-import { countAlertsForID } from '../../common';
+import { SavedObject } from 'kibana/server';
+import {
+  CaseResponseRt,
+  CaseResponse,
+  ESCaseAttributes,
+  User,
+  UsersRt,
+  AllTagsFindRequest,
+  AllTagsFindRequestRt,
+  excess,
+  throwErrors,
+  AllReportersFindRequestRt,
+  AllReportersFindRequest,
+  CasesByAlertIDRequest,
+  CasesByAlertIDRequestRt,
+} from '../../../common/api';
+import { countAlertsForID, flattenCaseSavedObject } from '../../common';
 import { createCaseError } from '../../common/error';
 import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
+import { CasesClientArgs } from '..';
+import { Operations } from '../../authorization';
+import { combineAuthorizedAndOwnerFilter } from '../utils';
+import { CasesService } from '../../services';
 
-interface GetParams {
-  savedObjectsClient: SavedObjectsClientContract;
-  caseService: CaseServiceSetup;
+/**
+ * Parameters for finding cases IDs using an alert ID
+ */
+export interface CaseIDsByAlertIDParams {
+  /**
+   * The alert ID to search for
+   */
+  alertID: string;
+  /**
+   * The filtering options when searching for associated cases.
+   */
+  options: CasesByAlertIDRequest;
+}
+
+/**
+ * Case Client wrapper function for retrieving the case IDs that have a particular alert ID
+ * attached to them. This handles RBAC before calling the saved object API.
+ *
+ * @ignore
+ */
+export const getCaseIDsByAlertID = async (
+  { alertID, options }: CaseIDsByAlertIDParams,
+  clientArgs: CasesClientArgs
+): Promise<string[]> => {
+  const { unsecuredSavedObjectsClient, caseService, logger, authorization } = clientArgs;
+
+  try {
+    const queryParams = pipe(
+      excess(CasesByAlertIDRequestRt).decode(options),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(Operations.getCaseIDsByAlertID);
+
+    const filter = combineAuthorizedAndOwnerFilter(
+      queryParams.owner,
+      authorizationFilter,
+      Operations.getCaseIDsByAlertID.savedObjectType
+    );
+
+    const commentsWithAlert = await caseService.getCaseIdsByAlertId({
+      unsecuredSavedObjectsClient,
+      alertId: alertID,
+      filter,
+    });
+
+    ensureSavedObjectsAreAuthorized(
+      commentsWithAlert.saved_objects.map((comment) => ({
+        owner: comment.attributes.owner,
+        id: comment.id,
+      }))
+    );
+
+    return CasesService.getCaseIDsFromAlertAggs(commentsWithAlert);
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to get case IDs using alert ID: ${alertID} options: ${JSON.stringify(
+        options
+      )}: ${error}`,
+      error,
+      logger,
+    });
+  }
+};
+
+/**
+ * The parameters for retrieving a case
+ */
+export interface GetParams {
+  /**
+   * Case ID
+   */
   id: string;
+  /**
+   * Whether to include the attachments for a case in the response
+   */
   includeComments?: boolean;
+  /**
+   * Whether to include the attachments for all children of a case in the response
+   */
   includeSubCaseComments?: boolean;
-  logger: Logger;
 }
 
 /**
  * Retrieves a case and optionally its comments and sub case comments.
+ *
+ * @ignore
  */
-export const get = async ({
-  savedObjectsClient,
-  caseService,
-  id,
-  logger,
-  includeComments = false,
-  includeSubCaseComments = false,
-}: GetParams): Promise<CaseResponse> => {
+export const get = async (
+  { id, includeComments, includeSubCaseComments }: GetParams,
+  clientArgs: CasesClientArgs
+): Promise<CaseResponse> => {
+  const { unsecuredSavedObjectsClient, caseService, logger, authorization } = clientArgs;
+
   try {
+    if (!ENABLE_CASE_CONNECTOR && includeSubCaseComments) {
+      throw Boom.badRequest(
+        'The `includeSubCaseComments` is not supported when the case connector feature is disabled'
+      );
+    }
+
     let theCase: SavedObject<ESCaseAttributes>;
     let subCaseIds: string[] = [];
 
     if (ENABLE_CASE_CONNECTOR) {
       const [caseInfo, subCasesForCaseId] = await Promise.all([
         caseService.getCase({
-          client: savedObjectsClient,
+          unsecuredSavedObjectsClient,
           id,
         }),
-        caseService.findSubCasesByCaseId({ client: savedObjectsClient, ids: [id] }),
+        caseService.findSubCasesByCaseId({
+          unsecuredSavedObjectsClient,
+          ids: [id],
+        }),
       ]);
 
       theCase = caseInfo;
       subCaseIds = subCasesForCaseId.saved_objects.map((so) => so.id);
     } else {
       theCase = await caseService.getCase({
-        client: savedObjectsClient,
+        unsecuredSavedObjectsClient,
         id,
       });
     }
 
+    await authorization.ensureAuthorized({
+      operation: Operations.getCase,
+      entities: [{ owner: theCase.attributes.owner, id: theCase.id }],
+    });
+
     if (!includeComments) {
       return CaseResponseRt.encode(
         flattenCaseSavedObject({
@@ -63,8 +174,9 @@ export const get = async ({
         })
       );
     }
+
     const theComments = await caseService.getAllCaseComments({
-      client: savedObjectsClient,
+      unsecuredSavedObjectsClient,
       id,
       options: {
         sortField: 'created_at',
@@ -86,3 +198,108 @@ export const get = async ({
     throw createCaseError({ message: `Failed to get case id: ${id}: ${error}`, error, logger });
   }
 };
+
+/**
+ * Retrieves the tags from all the cases.
+ */
+
+export async function getTags(
+  params: AllTagsFindRequest,
+  clientArgs: CasesClientArgs
+): Promise<string[]> {
+  const { unsecuredSavedObjectsClient, caseService, logger, authorization } = clientArgs;
+
+  try {
+    const queryParams = pipe(
+      excess(AllTagsFindRequestRt).decode(params),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(Operations.findCases);
+
+    const filter = combineAuthorizedAndOwnerFilter(queryParams.owner, authorizationFilter);
+
+    const cases = await caseService.getTags({
+      unsecuredSavedObjectsClient,
+      filter,
+    });
+
+    const tags = new Set<string>();
+    const mappedCases: Array<{
+      owner: string;
+      id: string;
+    }> = [];
+
+    // Gather all necessary information in one pass
+    cases.saved_objects.forEach((theCase) => {
+      theCase.attributes.tags.forEach((tag) => tags.add(tag));
+      mappedCases.push({
+        id: theCase.id,
+        owner: theCase.attributes.owner,
+      });
+    });
+
+    ensureSavedObjectsAreAuthorized(mappedCases);
+
+    return [...tags.values()];
+  } catch (error) {
+    throw createCaseError({ message: `Failed to get tags: ${error}`, error, logger });
+  }
+}
+
+/**
+ * Retrieves the reporters from all the cases.
+ */
+export async function getReporters(
+  params: AllReportersFindRequest,
+  clientArgs: CasesClientArgs
+): Promise<User[]> {
+  const { unsecuredSavedObjectsClient, caseService, logger, authorization } = clientArgs;
+
+  try {
+    const queryParams = pipe(
+      excess(AllReportersFindRequestRt).decode(params),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(Operations.getReporters);
+
+    const filter = combineAuthorizedAndOwnerFilter(queryParams.owner, authorizationFilter);
+
+    const cases = await caseService.getReporters({
+      unsecuredSavedObjectsClient,
+      filter,
+    });
+
+    const reporters = new Map<string, User>();
+    const mappedCases: Array<{
+      owner: string;
+      id: string;
+    }> = [];
+
+    // Gather all necessary information in one pass
+    cases.saved_objects.forEach((theCase) => {
+      const user = theCase.attributes.created_by;
+      if (user.username != null) {
+        reporters.set(user.username, user);
+      }
+
+      mappedCases.push({
+        id: theCase.id,
+        owner: theCase.attributes.owner,
+      });
+    });
+
+    ensureSavedObjectsAreAuthorized(mappedCases);
+
+    return UsersRt.encode([...reporters.values()]);
+  } catch (error) {
+    throw createCaseError({ message: `Failed to get reporters: ${error}`, error, logger });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/cases/mock.ts b/x-pack/plugins/cases/server/client/cases/mock.ts
index 0e589b901c8d1..23db57c6d3097 100644
--- a/x-pack/plugins/cases/server/client/cases/mock.ts
+++ b/x-pack/plugins/cases/server/client/cases/mock.ts
@@ -12,6 +12,7 @@ import {
   CaseUserActionsResponse,
   AssociationType,
   CommentResponseAlertsType,
+  SECURITY_SOLUTION_OWNER,
 } from '../../../common';
 
 import { BasicParams } from './types';
@@ -39,6 +40,7 @@ export const comment: CommentResponse = {
     email: 'testemail@elastic.co',
     username: 'elastic',
   },
+  owner: SECURITY_SOLUTION_OWNER,
   pushed_at: null,
   pushed_by: null,
   updated_at: '2019-11-25T21:55:00.177Z',
@@ -66,6 +68,7 @@ export const commentAlert: CommentResponse = {
     email: 'testemail@elastic.co',
     username: 'elastic',
   },
+  owner: SECURITY_SOLUTION_OWNER,
   pushed_at: null,
   pushed_by: null,
   updated_at: '2019-11-25T21:55:00.177Z',
@@ -83,6 +86,7 @@ export const commentAlertMultipleIds: CommentResponseAlertsType = {
   alertId: ['alert-id-1', 'alert-id-2'],
   index: 'alert-index-1',
   type: CommentType.alert as const,
+  owner: SECURITY_SOLUTION_OWNER,
 };
 
 export const commentGeneratedAlert: CommentResponseAlertsType = {
@@ -132,6 +136,7 @@ export const userActions: CaseUserActionsResponse = [
     action_id: 'fd830c60-6646-11eb-a291-51bf6b175a53',
     case_id: 'fcdedd20-6646-11eb-a291-51bf6b175a53',
     comment_id: null,
+    owner: SECURITY_SOLUTION_OWNER,
   },
   {
     action_field: ['pushed'],
@@ -148,6 +153,7 @@ export const userActions: CaseUserActionsResponse = [
     action_id: '0a801750-6647-11eb-a291-51bf6b175a53',
     case_id: 'fcdedd20-6646-11eb-a291-51bf6b175a53',
     comment_id: null,
+    owner: SECURITY_SOLUTION_OWNER,
   },
   {
     action_field: ['comment'],
@@ -163,6 +169,7 @@ export const userActions: CaseUserActionsResponse = [
     action_id: '7373eb60-6647-11eb-a291-51bf6b175a53',
     case_id: 'fcdedd20-6646-11eb-a291-51bf6b175a53',
     comment_id: 'comment-alert-1',
+    owner: SECURITY_SOLUTION_OWNER,
   },
   {
     action_field: ['comment'],
@@ -178,6 +185,7 @@ export const userActions: CaseUserActionsResponse = [
     action_id: '7abc6410-6647-11eb-a291-51bf6b175a53',
     case_id: 'fcdedd20-6646-11eb-a291-51bf6b175a53',
     comment_id: 'comment-alert-2',
+    owner: SECURITY_SOLUTION_OWNER,
   },
   {
     action_field: ['pushed'],
@@ -194,6 +202,7 @@ export const userActions: CaseUserActionsResponse = [
     action_id: '9b91d8f0-6647-11eb-a291-51bf6b175a53',
     case_id: 'fcdedd20-6646-11eb-a291-51bf6b175a53',
     comment_id: null,
+    owner: SECURITY_SOLUTION_OWNER,
   },
   {
     action_field: ['comment'],
@@ -209,5 +218,6 @@ export const userActions: CaseUserActionsResponse = [
     action_id: '0818e5e0-6648-11eb-a291-51bf6b175a53',
     case_id: 'fcdedd20-6646-11eb-a291-51bf6b175a53',
     comment_id: 'comment-user-1',
+    owner: SECURITY_SOLUTION_OWNER,
   },
 ];
diff --git a/x-pack/plugins/cases/server/client/cases/push.ts b/x-pack/plugins/cases/server/client/cases/push.ts
index 92a9d2910d4a3..dd527122d0616 100644
--- a/x-pack/plugins/cases/server/client/cases/push.ts
+++ b/x-pack/plugins/cases/server/client/cases/push.ts
@@ -6,16 +6,7 @@
  */
 
 import Boom from '@hapi/boom';
-import {
-  SavedObjectsBulkUpdateResponse,
-  SavedObjectsClientContract,
-  SavedObjectsUpdateResponse,
-  Logger,
-  SavedObjectsFindResponse,
-  SavedObject,
-} from 'kibana/server';
-import { ActionResult, ActionsClient } from '../../../../actions/server';
-import { flattenCaseSavedObject, getAlertInfoFromComments } from '../../routes/api/utils';
+import { SavedObjectsFindResponse, SavedObject } from 'kibana/server';
 
 import {
   ActionConnector,
@@ -24,23 +15,16 @@ import {
   CaseStatuses,
   ExternalServiceResponse,
   ESCaseAttributes,
-  CommentAttributes,
-  CaseUserActionsResponse,
-  User,
   ESCasesConfigureAttributes,
   CaseType,
 } from '../../../common';
 import { buildCaseUserActionItem } from '../../services/user_actions/helpers';
 
 import { createIncident, getCommentContextFromAttributes } from './utils';
-import {
-  CaseConfigureServiceSetup,
-  CaseServiceSetup,
-  CaseUserActionServiceSetup,
-} from '../../services';
-import { CasesClientHandler } from '../client';
-import { createCaseError } from '../../common/error';
+import { createCaseError, flattenCaseSavedObject, getAlertInfoFromComments } from '../../common';
 import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
+import { CasesClient, CasesClientArgs, CasesClientInternal } from '..';
+import { Operations } from '../../authorization';
 
 /**
  * Returns true if the case should be closed based on the configuration settings and whether the case
@@ -58,130 +42,116 @@ function shouldCloseByPush(
   );
 }
 
-interface PushParams {
-  savedObjectsClient: SavedObjectsClientContract;
-  caseService: CaseServiceSetup;
-  caseConfigureService: CaseConfigureServiceSetup;
-  userActionService: CaseUserActionServiceSetup;
-  user: User;
+/**
+ * Parameters for pushing a case to an external system
+ */
+export interface PushParams {
+  /**
+   * The ID of a case
+   */
   caseId: string;
+  /**
+   * The ID of an external system to push to
+   */
   connectorId: string;
-  casesClient: CasesClientHandler;
-  actionsClient: ActionsClient;
-  logger: Logger;
 }
 
-export const push = async ({
-  savedObjectsClient,
-  caseService,
-  caseConfigureService,
-  userActionService,
-  casesClient,
-  actionsClient,
-  connectorId,
-  caseId,
-  user,
-  logger,
-}: PushParams): Promise<CaseResponse> => {
-  /* Start of push to external service */
-  let theCase: CaseResponse;
-  let connector: ActionResult;
-  let userActions: CaseUserActionsResponse;
-  let alerts;
-  let connectorMappings;
-  let externalServiceIncident;
+/**
+ * Push a case to an external service.
+ *
+ * @ignore
+ */
+export const push = async (
+  { connectorId, caseId }: PushParams,
+  clientArgs: CasesClientArgs,
+  casesClient: CasesClient,
+  casesClientInternal: CasesClientInternal
+): Promise<CaseResponse> => {
+  const {
+    unsecuredSavedObjectsClient,
+    attachmentService,
+    caseService,
+    caseConfigureService,
+    userActionService,
+    actionsClient,
+    user,
+    logger,
+    authorization,
+  } = clientArgs;
 
   try {
-    [theCase, connector, userActions] = await Promise.all([
-      casesClient.get({
+    /* Start of push to external service */
+    const [theCase, connector, userActions] = await Promise.all([
+      casesClient.cases.get({
         id: caseId,
         includeComments: true,
         includeSubCaseComments: ENABLE_CASE_CONNECTOR,
       }),
       actionsClient.get({ id: connectorId }),
-      casesClient.getUserActions({ caseId }),
+      casesClient.userActions.getAll({ caseId }),
     ]);
-  } catch (e) {
-    const message = `Error getting case and/or connector and/or user actions: ${e.message}`;
-    throw createCaseError({ message, error: e, logger });
-  }
 
-  // We need to change the logic when we support subcases
-  if (theCase?.status === CaseStatuses.closed) {
-    throw Boom.conflict(
-      `This case ${theCase.title} is closed. You can not pushed if the case is closed.`
-    );
-  }
+    await authorization.ensureAuthorized({
+      entities: [{ owner: theCase.owner, id: caseId }],
+      operation: Operations.pushCase,
+    });
 
-  const alertsInfo = getAlertInfoFromComments(theCase?.comments);
+    // We need to change the logic when we support subcases
+    if (theCase?.status === CaseStatuses.closed) {
+      throw Boom.conflict(
+        `The ${theCase.title} case is closed. Pushing a closed case is not allowed.`
+      );
+    }
 
-  try {
-    alerts = await casesClient.getAlerts({
+    const alertsInfo = getAlertInfoFromComments(theCase?.comments);
+
+    const alerts = await casesClientInternal.alerts.get({
       alertsInfo,
     });
-  } catch (e) {
-    throw createCaseError({
-      message: `Error getting alerts for case with id ${theCase.id}: ${e.message}`,
-      logger,
-      error: e,
-    });
-  }
 
-  try {
-    connectorMappings = await casesClient.getMappings({
-      actionsClient,
+    const connectorMappings = await casesClientInternal.configuration.getMappings({
       connectorId: connector.id,
       connectorType: connector.actionTypeId,
     });
-  } catch (e) {
-    const message = `Error getting mapping for connector with id ${connector.id}: ${e.message}`;
-    throw createCaseError({ message, error: e, logger });
-  }
 
-  try {
-    externalServiceIncident = await createIncident({
+    if (connectorMappings.length === 0) {
+      throw new Error('Connector mapping has not been created');
+    }
+
+    const externalServiceIncident = await createIncident({
       actionsClient,
       theCase,
       userActions,
       connector: connector as ActionConnector,
-      mappings: connectorMappings,
+      mappings: connectorMappings[0].attributes.mappings,
       alerts,
     });
-  } catch (e) {
-    const message = `Error creating incident for case with id ${theCase.id}: ${e.message}`;
-    throw createCaseError({ error: e, message, logger });
-  }
-
-  const pushRes = await actionsClient.execute({
-    actionId: connector?.id ?? '',
-    params: {
-      subAction: 'pushToService',
-      subActionParams: externalServiceIncident,
-    },
-  });
 
-  if (pushRes.status === 'error') {
-    throw Boom.failedDependency(
-      pushRes.serviceMessage ?? pushRes.message ?? 'Error pushing to service'
-    );
-  }
+    const pushRes = await actionsClient.execute({
+      actionId: connector?.id ?? '',
+      params: {
+        subAction: 'pushToService',
+        subActionParams: externalServiceIncident,
+      },
+    });
 
-  /* End of push to external service */
+    if (pushRes.status === 'error') {
+      throw Boom.failedDependency(
+        pushRes.serviceMessage ?? pushRes.message ?? 'Error pushing to service'
+      );
+    }
 
-  /* Start of update case with push information */
-  let myCase;
-  let myCaseConfigure;
-  let comments;
+    /* End of push to external service */
 
-  try {
-    [myCase, myCaseConfigure, comments] = await Promise.all([
+    /* Start of update case with push information */
+    const [myCase, myCaseConfigure, comments] = await Promise.all([
       caseService.getCase({
-        client: savedObjectsClient,
+        unsecuredSavedObjectsClient,
         id: caseId,
       }),
-      caseConfigureService.find({ client: savedObjectsClient }),
+      caseConfigureService.find({ unsecuredSavedObjectsClient }),
       caseService.getAllCaseComments({
-        client: savedObjectsClient,
+        unsecuredSavedObjectsClient,
         id: caseId,
         options: {
           fields: [],
@@ -191,35 +161,27 @@ export const push = async ({
         includeSubCaseComments: ENABLE_CASE_CONNECTOR,
       }),
     ]);
-  } catch (e) {
-    const message = `Error getting user and/or case and/or case configuration and/or case comments: ${e.message}`;
-    throw createCaseError({ error: e, message, logger });
-  }
 
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { username, full_name, email } = user;
-  const pushedDate = new Date().toISOString();
-  const externalServiceResponse = pushRes.data as ExternalServiceResponse;
+    // eslint-disable-next-line @typescript-eslint/naming-convention
+    const { username, full_name, email } = user;
+    const pushedDate = new Date().toISOString();
+    const externalServiceResponse = pushRes.data as ExternalServiceResponse;
 
-  const externalService = {
-    pushed_at: pushedDate,
-    pushed_by: { username, full_name, email },
-    connector_id: connector.id,
-    connector_name: connector.name,
-    external_id: externalServiceResponse.id,
-    external_title: externalServiceResponse.title,
-    external_url: externalServiceResponse.url,
-  };
+    const externalService = {
+      pushed_at: pushedDate,
+      pushed_by: { username, full_name, email },
+      connector_id: connector.id,
+      connector_name: connector.name,
+      external_id: externalServiceResponse.id,
+      external_title: externalServiceResponse.title,
+      external_url: externalServiceResponse.url,
+    };
 
-  let updatedCase: SavedObjectsUpdateResponse<ESCaseAttributes>;
-  let updatedComments: SavedObjectsBulkUpdateResponse<CommentAttributes>;
+    const shouldMarkAsClosed = shouldCloseByPush(myCaseConfigure, myCase);
 
-  const shouldMarkAsClosed = shouldCloseByPush(myCaseConfigure, myCase);
-
-  try {
-    [updatedCase, updatedComments] = await Promise.all([
+    const [updatedCase, updatedComments] = await Promise.all([
       caseService.patchCase({
-        client: savedObjectsClient,
+        unsecuredSavedObjectsClient,
         caseId,
         updatedAttributes: {
           ...(shouldMarkAsClosed
@@ -236,12 +198,12 @@ export const push = async ({
         version: myCase.version,
       }),
 
-      caseService.patchComments({
-        client: savedObjectsClient,
+      attachmentService.bulkUpdate({
+        unsecuredSavedObjectsClient,
         comments: comments.saved_objects
           .filter((comment) => comment.attributes.pushed_at == null)
           .map((comment) => ({
-            commentId: comment.id,
+            attachmentId: comment.id,
             updatedAttributes: {
               pushed_at: pushedDate,
               pushed_by: { username, full_name, email },
@@ -250,8 +212,8 @@ export const push = async ({
           })),
       }),
 
-      userActionService.postUserActions({
-        client: savedObjectsClient,
+      userActionService.bulkCreate({
+        unsecuredSavedObjectsClient,
         actions: [
           ...(shouldMarkAsClosed
             ? [
@@ -263,6 +225,7 @@ export const push = async ({
                   fields: ['status'],
                   newValue: CaseStatuses.closed,
                   oldValue: myCase.attributes.status,
+                  owner: myCase.attributes.owner,
                 }),
               ]
             : []),
@@ -273,38 +236,39 @@ export const push = async ({
             caseId,
             fields: ['pushed'],
             newValue: JSON.stringify(externalService),
+            owner: myCase.attributes.owner,
           }),
         ],
       }),
     ]);
-  } catch (e) {
-    const message = `Error updating case and/or comments and/or creating user action: ${e.message}`;
-    throw createCaseError({ error: e, message, logger });
-  }
-  /* End of update case with push information */
 
-  return CaseResponseRt.encode(
-    flattenCaseSavedObject({
-      savedObject: {
-        ...myCase,
-        ...updatedCase,
-        attributes: { ...myCase.attributes, ...updatedCase?.attributes },
-        references: myCase.references,
-      },
-      comments: comments.saved_objects.map((origComment) => {
-        const updatedComment = updatedComments.saved_objects.find((c) => c.id === origComment.id);
-        return {
-          ...origComment,
-          ...updatedComment,
-          attributes: {
-            ...origComment.attributes,
-            ...updatedComment?.attributes,
-            ...getCommentContextFromAttributes(origComment.attributes),
-          },
-          version: updatedComment?.version ?? origComment.version,
-          references: origComment?.references ?? [],
-        };
-      }),
-    })
-  );
+    /* End of update case with push information */
+
+    return CaseResponseRt.encode(
+      flattenCaseSavedObject({
+        savedObject: {
+          ...myCase,
+          ...updatedCase,
+          attributes: { ...myCase.attributes, ...updatedCase?.attributes },
+          references: myCase.references,
+        },
+        comments: comments.saved_objects.map((origComment) => {
+          const updatedComment = updatedComments.saved_objects.find((c) => c.id === origComment.id);
+          return {
+            ...origComment,
+            ...updatedComment,
+            attributes: {
+              ...origComment.attributes,
+              ...updatedComment?.attributes,
+              ...getCommentContextFromAttributes(origComment.attributes),
+            },
+            version: updatedComment?.version ?? origComment.version,
+            references: origComment?.references ?? [],
+          };
+        }),
+      })
+    );
+  } catch (error) {
+    throw createCaseError({ message: `Failed to push case: ${error}`, error, logger });
+  }
 };
diff --git a/x-pack/plugins/cases/server/client/cases/update.test.ts b/x-pack/plugins/cases/server/client/cases/update.test.ts
deleted file mode 100644
index 18b4e8d9d7b66..0000000000000
--- a/x-pack/plugins/cases/server/client/cases/update.test.ts
+++ /dev/null
@@ -1,768 +0,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 { ConnectorTypes, CasesPatchRequest, CaseStatuses } from '../../../common';
-import { isCaseError } from '../../common/error';
-import {
-  createMockSavedObjectsRepository,
-  mockCaseNoConnectorId,
-  mockCases,
-  mockCaseComments,
-} from '../../routes/api/__fixtures__';
-import { createCasesClientWithMockSavedObjectsClient } from '../mocks';
-
-describe('update', () => {
-  beforeEach(async () => {
-    jest.restoreAllMocks();
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2019-11-25T21:54:48.952Z'),
-    }));
-  });
-
-  describe('happy path', () => {
-    test('it closes the case correctly', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.update(patchCases);
-
-      expect(res).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "closed_at": "2019-11-25T21:54:48.952Z",
-            "closed_by": Object {
-              "email": "d00d@awesome.com",
-              "full_name": "Awesome D00d",
-              "username": "awesome",
-            },
-            "comments": Array [],
-            "connector": Object {
-              "fields": null,
-              "id": "none",
-              "name": "none",
-              "type": ".none",
-            },
-            "created_at": "2019-11-25T21:54:48.952Z",
-            "created_by": Object {
-              "email": "testemail@elastic.co",
-              "full_name": "elastic",
-              "username": "elastic",
-            },
-            "description": "This is a brand new case of a bad meanie defacing data",
-            "external_service": null,
-            "id": "mock-id-1",
-            "settings": Object {
-              "syncAlerts": true,
-            },
-            "status": "closed",
-            "subCaseIds": undefined,
-            "subCases": undefined,
-            "tags": Array [
-              "defacement",
-            ],
-            "title": "Super Bad Security Issue",
-            "totalAlerts": 0,
-            "totalComment": 0,
-            "type": "individual",
-            "updated_at": "2019-11-25T21:54:48.952Z",
-            "updated_by": Object {
-              "email": "d00d@awesome.com",
-              "full_name": "Awesome D00d",
-              "username": "awesome",
-            },
-            "version": "WzE3LDFd",
-          },
-        ]
-      `);
-
-      expect(
-        casesClient.services.userActionService.postUserActions.mock.calls[0][0].actions
-      ).toEqual([
-        {
-          attributes: {
-            action: 'update',
-            action_at: '2019-11-25T21:54:48.952Z',
-            action_by: {
-              email: 'd00d@awesome.com',
-              full_name: 'Awesome D00d',
-              username: 'awesome',
-            },
-            action_field: ['status'],
-            new_value: CaseStatuses.closed,
-            old_value: CaseStatuses.open,
-          },
-          references: [
-            {
-              id: 'mock-id-1',
-              name: 'associated-cases',
-              type: 'cases',
-            },
-          ],
-        },
-      ]);
-    });
-
-    test('it opens the case correctly', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses.open,
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: [
-          {
-            ...mockCases[0],
-            attributes: { ...mockCases[0].attributes, status: CaseStatuses.closed },
-          },
-          ...mockCases.slice(1),
-        ],
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.update(patchCases);
-
-      expect(res).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "closed_at": null,
-            "closed_by": null,
-            "comments": Array [],
-            "connector": Object {
-              "fields": null,
-              "id": "none",
-              "name": "none",
-              "type": ".none",
-            },
-            "created_at": "2019-11-25T21:54:48.952Z",
-            "created_by": Object {
-              "email": "testemail@elastic.co",
-              "full_name": "elastic",
-              "username": "elastic",
-            },
-            "description": "This is a brand new case of a bad meanie defacing data",
-            "external_service": null,
-            "id": "mock-id-1",
-            "settings": Object {
-              "syncAlerts": true,
-            },
-            "status": "open",
-            "subCaseIds": undefined,
-            "subCases": undefined,
-            "tags": Array [
-              "defacement",
-            ],
-            "title": "Super Bad Security Issue",
-            "totalAlerts": 0,
-            "totalComment": 0,
-            "type": "individual",
-            "updated_at": "2019-11-25T21:54:48.952Z",
-            "updated_by": Object {
-              "email": "d00d@awesome.com",
-              "full_name": "Awesome D00d",
-              "username": "awesome",
-            },
-            "version": "WzE3LDFd",
-          },
-        ]
-      `);
-    });
-
-    test('it change the status of case to in-progress correctly', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-4',
-            status: CaseStatuses['in-progress'],
-            version: 'WzUsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.update(patchCases);
-
-      expect(res).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "closed_at": null,
-            "closed_by": null,
-            "comments": Array [],
-            "connector": Object {
-              "fields": Object {
-                "issueType": "Task",
-                "parent": null,
-                "priority": "High",
-              },
-              "id": "123",
-              "name": "My connector",
-              "type": ".jira",
-            },
-            "created_at": "2019-11-25T22:32:17.947Z",
-            "created_by": Object {
-              "email": "testemail@elastic.co",
-              "full_name": "elastic",
-              "username": "elastic",
-            },
-            "description": "Oh no, a bad meanie going LOLBins all over the place!",
-            "external_service": null,
-            "id": "mock-id-4",
-            "settings": Object {
-              "syncAlerts": true,
-            },
-            "status": "in-progress",
-            "subCaseIds": undefined,
-            "subCases": undefined,
-            "tags": Array [
-              "LOLBins",
-            ],
-            "title": "Another bad one",
-            "totalAlerts": 0,
-            "totalComment": 0,
-            "type": "individual",
-            "updated_at": "2019-11-25T21:54:48.952Z",
-            "updated_by": Object {
-              "email": "d00d@awesome.com",
-              "full_name": "Awesome D00d",
-              "username": "awesome",
-            },
-            "version": "WzE3LDFd",
-          },
-        ]
-      `);
-    });
-
-    test('it updates a case without a connector.id', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-no-connector_id',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: [mockCaseNoConnectorId],
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.update(patchCases);
-
-      expect(res).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "closed_at": "2019-11-25T21:54:48.952Z",
-            "closed_by": Object {
-              "email": "d00d@awesome.com",
-              "full_name": "Awesome D00d",
-              "username": "awesome",
-            },
-            "comments": Array [],
-            "connector": Object {
-              "fields": null,
-              "id": "none",
-              "name": "none",
-              "type": ".none",
-            },
-            "created_at": "2019-11-25T21:54:48.952Z",
-            "created_by": Object {
-              "email": "testemail@elastic.co",
-              "full_name": "elastic",
-              "username": "elastic",
-            },
-            "description": "This is a brand new case of a bad meanie defacing data",
-            "external_service": null,
-            "id": "mock-no-connector_id",
-            "settings": Object {
-              "syncAlerts": true,
-            },
-            "status": "closed",
-            "subCaseIds": undefined,
-            "subCases": undefined,
-            "tags": Array [
-              "defacement",
-            ],
-            "title": "Super Bad Security Issue",
-            "totalAlerts": 0,
-            "totalComment": 0,
-            "updated_at": "2019-11-25T21:54:48.952Z",
-            "updated_by": Object {
-              "email": "d00d@awesome.com",
-              "full_name": "Awesome D00d",
-              "username": "awesome",
-            },
-            "version": "WzE3LDFd",
-          },
-        ]
-      `);
-    });
-
-    test('it updates the connector correctly', async () => {
-      const patchCases = ({
-        cases: [
-          {
-            id: 'mock-id-3',
-            connector: {
-              id: '456',
-              name: 'My connector 2',
-              type: ConnectorTypes.jira,
-              fields: { issueType: 'Bug', priority: 'Low', parent: null },
-            },
-            version: 'WzUsMV0=',
-          },
-        ],
-      } as unknown) as CasesPatchRequest;
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.update(patchCases);
-
-      expect(res).toMatchInlineSnapshot(`
-        Array [
-          Object {
-            "closed_at": null,
-            "closed_by": null,
-            "comments": Array [],
-            "connector": Object {
-              "fields": Object {
-                "issueType": "Bug",
-                "parent": null,
-                "priority": "Low",
-              },
-              "id": "456",
-              "name": "My connector 2",
-              "type": ".jira",
-            },
-            "created_at": "2019-11-25T22:32:17.947Z",
-            "created_by": Object {
-              "email": "testemail@elastic.co",
-              "full_name": "elastic",
-              "username": "elastic",
-            },
-            "description": "Oh no, a bad meanie going LOLBins all over the place!",
-            "external_service": null,
-            "id": "mock-id-3",
-            "settings": Object {
-              "syncAlerts": true,
-            },
-            "status": "open",
-            "subCaseIds": undefined,
-            "subCases": undefined,
-            "tags": Array [
-              "LOLBins",
-            ],
-            "title": "Another bad one",
-            "totalAlerts": 0,
-            "totalComment": 0,
-            "type": "individual",
-            "updated_at": "2019-11-25T21:54:48.952Z",
-            "updated_by": Object {
-              "email": "d00d@awesome.com",
-              "full_name": "Awesome D00d",
-              "username": "awesome",
-            },
-            "version": "WzE3LDFd",
-          },
-        ]
-      `);
-    });
-
-    test('it updates alert status when the status is updated and syncAlerts=true', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: [
-          {
-            ...mockCaseComments[3],
-            references: [
-              {
-                type: 'cases',
-                name: 'associated-cases',
-                id: 'mock-id-1',
-              },
-            ],
-          },
-        ],
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      casesClient.client.updateAlertsStatus = jest.fn();
-
-      await casesClient.client.update(patchCases);
-
-      expect(casesClient.client.updateAlertsStatus).toHaveBeenCalledWith({
-        alerts: [
-          {
-            id: 'test-id',
-            index: 'test-index',
-            status: 'closed',
-          },
-        ],
-      });
-    });
-
-    test('it does NOT updates alert status when the status is updated and syncAlerts=false', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: [
-          {
-            ...mockCases[0],
-            attributes: { ...mockCases[0].attributes, settings: { syncAlerts: false } },
-          },
-        ],
-        caseCommentSavedObject: [{ ...mockCaseComments[3] }],
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-
-      await casesClient.client.update(patchCases);
-
-      expect(casesClient.esClient.bulk).not.toHaveBeenCalled();
-    });
-
-    test('it updates alert status when syncAlerts is turned on', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            settings: { syncAlerts: true },
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: [
-          {
-            ...mockCases[0],
-            attributes: { ...mockCases[0].attributes, settings: { syncAlerts: false } },
-          },
-        ],
-        caseCommentSavedObject: [{ ...mockCaseComments[3] }],
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      casesClient.client.updateAlertsStatus = jest.fn();
-
-      await casesClient.client.update(patchCases);
-
-      expect(casesClient.client.updateAlertsStatus).toHaveBeenCalledWith({
-        alerts: [{ id: 'test-id', index: 'test-index', status: 'open' }],
-      });
-    });
-
-    test('it does NOT updates alert status when syncAlerts is turned off', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            settings: { syncAlerts: false },
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: [{ ...mockCaseComments[3] }],
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-
-      await casesClient.client.update(patchCases);
-
-      expect(casesClient.esClient.bulk).not.toHaveBeenCalled();
-    });
-
-    test('it updates alert status for multiple cases', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            settings: { syncAlerts: true },
-            version: 'WzAsMV0=',
-          },
-          {
-            id: 'mock-id-2',
-            status: CaseStatuses.closed,
-            version: 'WzQsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: [
-          {
-            ...mockCases[0],
-            attributes: { ...mockCases[0].attributes, settings: { syncAlerts: false } },
-          },
-          {
-            ...mockCases[1],
-          },
-        ],
-        caseCommentSavedObject: [
-          {
-            ...mockCaseComments[3],
-            references: [
-              {
-                type: 'cases',
-                name: 'associated-cases',
-                id: 'mock-id-1',
-              },
-            ],
-          },
-          {
-            ...mockCaseComments[4],
-            references: [
-              {
-                type: 'cases',
-                name: 'associated-cases',
-                id: 'mock-id-2',
-              },
-            ],
-          },
-        ],
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      casesClient.client.updateAlertsStatus = jest.fn();
-
-      await casesClient.client.update(patchCases);
-
-      expect(casesClient.client.updateAlertsStatus).toHaveBeenCalledWith({
-        alerts: [
-          { id: 'test-id', index: 'test-index', status: 'open' },
-          { id: 'test-id-2', index: 'test-index-2', status: 'closed' },
-        ],
-      });
-    });
-
-    test('it does NOT call updateAlertsStatus when there is no comments of type alerts', async () => {
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-
-      await casesClient.client.update(patchCases);
-
-      expect(casesClient.esClient.bulk).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('unhappy path', () => {
-    test('it throws when missing id', async () => {
-      expect.assertions(3);
-      const patchCases = {
-        cases: [
-          {
-            connector: {
-              id: 'none',
-              name: 'none',
-              type: ConnectorTypes.none,
-              fields: null,
-            },
-            version: 'WzUsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return (
-        casesClient.client
-          // @ts-expect-error
-          .update({ cases: patchCases })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          })
-      );
-    });
-
-    test('it throws when missing version', async () => {
-      expect.assertions(3);
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-3',
-            connector: {
-              id: 'none',
-              name: 'none',
-              type: ConnectorTypes.none,
-              fields: null,
-            },
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return (
-        casesClient.client
-          // @ts-expect-error
-          .update({ cases: patchCases })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          })
-      );
-    });
-
-    test('it throws when fields are identical', async () => {
-      expect.assertions(5);
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses.open,
-            version: 'WzAsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client.update(patchCases).catch((e) => {
-        expect(e).not.toBeNull();
-        expect(isCaseError(e)).toBeTruthy();
-        const boomErr = e.boomify();
-        expect(boomErr.isBoom).toBe(true);
-        expect(boomErr.output.statusCode).toBe(406);
-        expect(boomErr.message).toContain('All update fields are identical to current version.');
-      });
-    });
-
-    test('it throws when case does not exist', async () => {
-      expect.assertions(5);
-      const patchCases = {
-        cases: [
-          {
-            id: 'not-exists',
-            connector: {
-              id: 'none',
-              name: 'none',
-              type: ConnectorTypes.none,
-              fields: null,
-            },
-            version: 'WzUsMV0=',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client.update(patchCases).catch((e) => {
-        expect(e).not.toBeNull();
-        expect(isCaseError(e)).toBeTruthy();
-        const boomErr = e.boomify();
-        expect(boomErr.isBoom).toBe(true);
-        expect(boomErr.output.statusCode).toBe(404);
-        expect(boomErr.message).toContain(
-          'These cases not-exists do not exist. Please check you have the correct ids.'
-        );
-      });
-    });
-
-    test('it throws when cases conflicts', async () => {
-      expect.assertions(5);
-      const patchCases = {
-        cases: [
-          {
-            id: 'mock-id-1',
-            version: 'WzAsMV1=',
-            title: 'Super Bad Security Issue',
-          },
-        ],
-      };
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client.update(patchCases).catch((e) => {
-        expect(e).not.toBeNull();
-        expect(isCaseError(e)).toBeTruthy();
-        const boomErr = e.boomify();
-        expect(boomErr.isBoom).toBe(true);
-        expect(boomErr.output.statusCode).toBe(409);
-        expect(boomErr.message).toContain(
-          'These cases mock-id-1 has been updated. Please refresh before saving additional updates.'
-        );
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/server/client/cases/update.ts b/x-pack/plugins/cases/server/client/cases/update.ts
index b9926ff6cbb14..608c726f18531 100644
--- a/x-pack/plugins/cases/server/client/cases/update.ts
+++ b/x-pack/plugins/cases/server/client/cases/update.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import pMap from 'p-map';
 import Boom from '@hapi/boom';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { fold } from 'fp-ts/lib/Either';
@@ -15,12 +16,9 @@ import {
   SavedObjectsClientContract,
   SavedObjectsFindResponse,
   SavedObjectsFindResult,
-  Logger,
 } from 'kibana/server';
-import {
-  flattenCaseSavedObject,
-  isCommentRequestTypeAlertOrGenAlert,
-} from '../../routes/api/utils';
+
+import { nodeBuilder } from '../../../../../../src/plugins/data/common';
 
 import {
   throwErrors,
@@ -37,25 +35,29 @@ import {
   CasesPatchRequest,
   AssociationType,
   CommentAttributes,
-  User,
-} from '../../../common';
+} from '../../../common/api';
 import { buildCaseUserActions } from '../../services/user_actions/helpers';
-import {
-  getCaseToUpdate,
-  transformCaseConnectorToEsConnector,
-} from '../../routes/api/cases/helpers';
+import { getCaseToUpdate } from '../utils';
 
-import { CaseServiceSetup, CaseUserActionServiceSetup } from '../../services';
+import { CasesService } from '../../services';
 import {
   CASE_COMMENT_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
+  MAX_CONCURRENT_SEARCHES,
   SUB_CASE_SAVED_OBJECT,
-} from '../../saved_object_types';
-import { CasesClientHandler } from '..';
-import { createAlertUpdateRequest } from '../../common';
-import { UpdateAlertRequest } from '../types';
+} from '../../../common/constants';
+import {
+  createAlertUpdateRequest,
+  transformCaseConnectorToEsConnector,
+  flattenCaseSavedObject,
+  isCommentRequestTypeAlertOrGenAlert,
+} from '../../common';
 import { createCaseError } from '../../common/error';
 import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
+import { UpdateAlertRequest } from '../alerts/client';
+import { CasesClientInternal } from '../client_internal';
+import { CasesClientArgs } from '..';
+import { Operations, OwnerEntity } from '../../authorization';
 
 /**
  * Throws an error if any of the requests attempt to update a collection style cases' status field.
@@ -114,6 +116,18 @@ function throwIfUpdateType(requests: ESCasePatchRequest[]) {
   }
 }
 
+/**
+ * Throws an error if any of the requests attempt to update the owner of a case.
+ */
+function throwIfUpdateOwner(requests: ESCasePatchRequest[]) {
+  const requestsUpdatingOwner = requests.filter((req) => req.owner !== undefined);
+
+  if (requestsUpdatingOwner.length > 0) {
+    const ids = requestsUpdatingOwner.map((req) => req.id);
+    throw Boom.badRequest(`Updating the owner of a case  is not allowed ids: [${ids.join(', ')}]`);
+  }
+}
+
 /**
  * Throws an error if any of the requests attempt to update an individual style cases' type field to a collection
  * when alerts are attached to the case.
@@ -121,20 +135,26 @@ function throwIfUpdateType(requests: ESCasePatchRequest[]) {
 async function throwIfInvalidUpdateOfTypeWithAlerts({
   requests,
   caseService,
-  client,
+  unsecuredSavedObjectsClient,
 }: {
   requests: ESCasePatchRequest[];
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }) {
   const getAlertsForID = async (caseToUpdate: ESCasePatchRequest) => {
     const alerts = await caseService.getAllCaseComments({
-      client,
+      unsecuredSavedObjectsClient,
       id: caseToUpdate.id,
       options: {
         fields: [],
         // there should never be generated alerts attached to an individual case but we'll check anyway
-        filter: `${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.alert} OR ${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.generatedAlert}`,
+        filter: nodeBuilder.or([
+          nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.type`, CommentType.alert),
+          nodeBuilder.is(
+            `${CASE_COMMENT_SAVED_OBJECT}.attributes.type`,
+            CommentType.generatedAlert
+          ),
+        ]),
         page: 1,
         perPage: 1,
       },
@@ -144,9 +164,11 @@ async function throwIfInvalidUpdateOfTypeWithAlerts({
   };
 
   const requestsUpdatingTypeField = requests.filter((req) => req.type === CaseType.collection);
-  const casesAlertTotals = await Promise.all(
-    requestsUpdatingTypeField.map((caseToUpdate) => getAlertsForID(caseToUpdate))
-  );
+  const getAlertsMapper = async (caseToUpdate: ESCasePatchRequest) => getAlertsForID(caseToUpdate);
+  // Ensuring we don't too many concurrent get running.
+  const casesAlertTotals = await pMap(requestsUpdatingTypeField, getAlertsMapper, {
+    concurrency: MAX_CONCURRENT_SEARCHES,
+  });
 
   // grab the cases that have at least one alert comment attached to them
   const typeUpdateWithAlerts = casesAlertTotals.filter((caseInfo) => caseInfo.alerts.total > 0);
@@ -177,21 +199,24 @@ function getID(
 async function getAlertComments({
   casesToSync,
   caseService,
-  client,
+  unsecuredSavedObjectsClient,
 }: {
   casesToSync: ESCasePatchRequest[];
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }): Promise<SavedObjectsFindResponse<CommentAttributes>> {
   const idsOfCasesToSync = casesToSync.map((casePatchReq) => casePatchReq.id);
 
   // getAllCaseComments will by default get all the comments, unless page or perPage fields are set
   return caseService.getAllCaseComments({
-    client,
+    unsecuredSavedObjectsClient,
     id: idsOfCasesToSync,
     includeSubCaseComments: true,
     options: {
-      filter: `${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.alert} OR ${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.generatedAlert}`,
+      filter: nodeBuilder.or([
+        nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.type`, CommentType.alert),
+        nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.type`, CommentType.generatedAlert),
+      ]),
     },
   });
 }
@@ -203,11 +228,11 @@ async function getAlertComments({
 async function getSubCasesToStatus({
   totalAlerts,
   caseService,
-  client,
+  unsecuredSavedObjectsClient,
 }: {
   totalAlerts: SavedObjectsFindResponse<CommentAttributes>;
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }): Promise<Map<string, CaseStatuses>> {
   const subCasesToRetrieve = totalAlerts.saved_objects.reduce((acc, alertComment) => {
     if (
@@ -224,7 +249,7 @@ async function getSubCasesToStatus({
 
   const subCases = await caseService.getSubCases({
     ids: Array.from(subCasesToRetrieve.values()),
-    client,
+    unsecuredSavedObjectsClient,
   });
 
   return subCases.saved_objects.reduce((acc, subCase) => {
@@ -270,15 +295,15 @@ async function updateAlerts({
   casesWithStatusChangedAndSynced,
   casesMap,
   caseService,
-  client,
-  casesClient,
+  unsecuredSavedObjectsClient,
+  casesClientInternal,
 }: {
   casesWithSyncSettingChangedToOn: ESCasePatchRequest[];
   casesWithStatusChangedAndSynced: ESCasePatchRequest[];
   casesMap: Map<string, SavedObject<ESCaseAttributes>>;
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
-  casesClient: CasesClientHandler;
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  casesClientInternal: CasesClientInternal;
 }) {
   /**
    * It's possible that a case ID can appear multiple times in each array. I'm intentionally placing the status changes
@@ -302,11 +327,15 @@ async function updateAlerts({
   const totalAlerts = await getAlertComments({
     casesToSync,
     caseService,
-    client,
+    unsecuredSavedObjectsClient,
   });
 
   // get a map of sub case id to the sub case status
-  const subCasesToStatus = await getSubCasesToStatus({ totalAlerts, client, caseService });
+  const subCasesToStatus = await getSubCasesToStatus({
+    totalAlerts,
+    unsecuredSavedObjectsClient,
+    caseService,
+  });
 
   // create an array of requests that indicate the id, index, and status to update an alert
   const alertsToUpdate = totalAlerts.saved_objects.reduce(
@@ -326,28 +355,61 @@ async function updateAlerts({
     []
   );
 
-  await casesClient.updateAlertsStatus({ alerts: alertsToUpdate });
+  await casesClientInternal.alerts.updateStatus({ alerts: alertsToUpdate });
 }
 
-interface UpdateArgs {
-  savedObjectsClient: SavedObjectsClientContract;
-  caseService: CaseServiceSetup;
-  userActionService: CaseUserActionServiceSetup;
-  user: User;
-  casesClient: CasesClientHandler;
-  cases: CasesPatchRequest;
-  logger: Logger;
+function partitionPatchRequest(
+  casesMap: Map<string, SavedObject<ESCaseAttributes>>,
+  patchReqCases: CasePatchRequest[]
+): {
+  nonExistingCases: CasePatchRequest[];
+  conflictedCases: CasePatchRequest[];
+  // This will be a deduped array of case IDs with their corresponding owner
+  casesToAuthorize: OwnerEntity[];
+} {
+  const nonExistingCases: CasePatchRequest[] = [];
+  const conflictedCases: CasePatchRequest[] = [];
+  const casesToAuthorize: Map<string, OwnerEntity> = new Map<string, OwnerEntity>();
+
+  for (const reqCase of patchReqCases) {
+    const foundCase = casesMap.get(reqCase.id);
+
+    if (!foundCase || foundCase.error) {
+      nonExistingCases.push(reqCase);
+    } else if (foundCase.version !== reqCase.version) {
+      conflictedCases.push(reqCase);
+      // let's try to authorize the conflicted case even though we'll fail after afterwards just in case
+      casesToAuthorize.set(foundCase.id, { id: foundCase.id, owner: foundCase.attributes.owner });
+    } else {
+      casesToAuthorize.set(foundCase.id, { id: foundCase.id, owner: foundCase.attributes.owner });
+    }
+  }
+
+  return {
+    nonExistingCases,
+    conflictedCases,
+    casesToAuthorize: Array.from(casesToAuthorize.values()),
+  };
 }
 
-export const update = async ({
-  savedObjectsClient,
-  caseService,
-  userActionService,
-  user,
-  casesClient,
-  cases,
-  logger,
-}: UpdateArgs): Promise<CasesResponse> => {
+/**
+ * Updates the specified cases with new values
+ *
+ * @ignore
+ */
+export const update = async (
+  cases: CasesPatchRequest,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<CasesResponse> => {
+  const {
+    unsecuredSavedObjectsClient,
+    caseService,
+    userActionService,
+    user,
+    logger,
+    authorization,
+  } = clientArgs;
   const query = pipe(
     excess(CasesPatchRequestRt).decode(cases),
     fold(throwErrors(Boom.badRequest), identity)
@@ -355,19 +417,23 @@ export const update = async ({
 
   try {
     const myCases = await caseService.getCases({
-      client: savedObjectsClient,
+      unsecuredSavedObjectsClient,
       caseIds: query.cases.map((q) => q.id),
     });
 
-    let nonExistingCases: CasePatchRequest[] = [];
-    const conflictedCases = query.cases.filter((q) => {
-      const myCase = myCases.saved_objects.find((c) => c.id === q.id);
+    const casesMap = myCases.saved_objects.reduce((acc, so) => {
+      acc.set(so.id, so);
+      return acc;
+    }, new Map<string, SavedObject<ESCaseAttributes>>());
+
+    const { nonExistingCases, conflictedCases, casesToAuthorize } = partitionPatchRequest(
+      casesMap,
+      query.cases
+    );
 
-      if (myCase && myCase.error) {
-        nonExistingCases = [...nonExistingCases, q];
-        return false;
-      }
-      return myCase == null || myCase?.version !== q.version;
+    await authorization.ensureAuthorized({
+      entities: casesToAuthorize,
+      operation: Operations.updateCase,
     });
 
     if (nonExistingCases.length > 0) {
@@ -408,30 +474,27 @@ export const update = async ({
       throw Boom.notAcceptable('All update fields are identical to current version.');
     }
 
-    const casesMap = myCases.saved_objects.reduce((acc, so) => {
-      acc.set(so.id, so);
-      return acc;
-    }, new Map<string, SavedObject<ESCaseAttributes>>());
-
     if (!ENABLE_CASE_CONNECTOR) {
       throwIfUpdateType(updateFilterCases);
     }
 
+    throwIfUpdateOwner(updateFilterCases);
     throwIfUpdateStatusOfCollection(updateFilterCases, casesMap);
     throwIfUpdateTypeCollectionToIndividual(updateFilterCases, casesMap);
     await throwIfInvalidUpdateOfTypeWithAlerts({
       requests: updateFilterCases,
       caseService,
-      client: savedObjectsClient,
+      unsecuredSavedObjectsClient,
     });
 
     // eslint-disable-next-line @typescript-eslint/naming-convention
     const { username, full_name, email } = user;
     const updatedDt = new Date().toISOString();
     const updatedCases = await caseService.patchCases({
-      client: savedObjectsClient,
+      unsecuredSavedObjectsClient,
       cases: updateFilterCases.map((thisCase) => {
-        const { id: caseId, version, ...updateCaseAttributes } = thisCase;
+        // intentionally removing owner from the case so that we don't accidentally allow it to be updated
+        const { id: caseId, version, owner, ...updateCaseAttributes } = thisCase;
         let closedInfo = {};
         if (updateCaseAttributes.status && updateCaseAttributes.status === CaseStatuses.closed) {
           closedInfo = {
@@ -490,8 +553,8 @@ export const update = async ({
       casesWithStatusChangedAndSynced,
       casesWithSyncSettingChangedToOn,
       caseService,
-      client: savedObjectsClient,
-      casesClient,
+      unsecuredSavedObjectsClient,
+      casesClientInternal,
       casesMap,
     });
 
@@ -512,8 +575,8 @@ export const update = async ({
         });
       });
 
-    await userActionService.postUserActions({
-      client: savedObjectsClient,
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
       actions: buildCaseUserActions({
         originalCases: myCases.saved_objects,
         updatedCases: updatedCases.saved_objects,
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 c24812048376e..9f18fa4931e62 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.test.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.test.ts
@@ -6,7 +6,6 @@
  */
 
 import { actionsClientMock } from '../../../../actions/server/actions_client.mock';
-import { flattenCaseSavedObject } from '../../routes/api/utils';
 import { mockCases } from '../../routes/api/__fixtures__';
 
 import { BasicParams, ExternalServiceParams, Incident } from './types';
@@ -29,6 +28,8 @@ import {
   transformers,
   transformFields,
 } from './utils';
+import { flattenCaseSavedObject } from '../../common';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
 
 const formatComment = {
   commentId: commentObj.id,
@@ -701,6 +702,7 @@ describe('utils', () => {
             action_id: '9b91d8f0-6647-11eb-a291-51bf6b175a53',
             case_id: 'fcdedd20-6646-11eb-a291-51bf6b175a53',
             comment_id: null,
+            owner: SECURITY_SOLUTION_OWNER,
           },
         ]);
 
diff --git a/x-pack/plugins/cases/server/client/cases/utils.ts b/x-pack/plugins/cases/server/client/cases/utils.ts
index 9bfad7ddcec3c..ebcc5a07b4edd 100644
--- a/x-pack/plugins/cases/server/client/cases/utils.ts
+++ b/x-pack/plugins/cases/server/client/cases/utils.ts
@@ -38,7 +38,7 @@ import {
   TransformerArgs,
   TransformFieldsArgs,
 } from './types';
-import { getAlertIds } from '../../routes/api/utils';
+import { getAlertIds } from '../utils';
 
 interface CreateIncidentArgs {
   actionsClient: ActionsClient;
@@ -329,11 +329,13 @@ export const isCommentAlertType = (
 export const getCommentContextFromAttributes = (
   attributes: CommentAttributes
 ): CommentRequestUserType | CommentRequestAlertType => {
+  const owner = attributes.owner;
   switch (attributes.type) {
     case CommentType.user:
       return {
         type: CommentType.user,
         comment: attributes.comment,
+        owner,
       };
     case CommentType.generatedAlert:
     case CommentType.alert:
@@ -342,11 +344,13 @@ export const getCommentContextFromAttributes = (
         alertId: attributes.alertId,
         index: attributes.index,
         rule: attributes.rule,
+        owner,
       };
     default:
       return {
         type: CommentType.user,
         comment: '',
+        owner,
       };
   }
 };
diff --git a/x-pack/plugins/cases/server/client/client.ts b/x-pack/plugins/cases/server/client/client.ts
index d6d153f01e008..4b21b401f5b7b 100644
--- a/x-pack/plugins/cases/server/client/client.ts
+++ b/x-pack/plugins/cases/server/client/client.ts
@@ -5,259 +5,94 @@
  * 2.0.
  */
 
-import { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'src/core/server';
-import {
-  CasesClientFactoryArguments,
-  CasesClient,
-  ConfigureFields,
-  MappingsClient,
-  CasesClientUpdateAlertsStatus,
-  CasesClientAddComment,
-  CasesClientGet,
-  CasesClientGetUserActions,
-  CasesClientGetAlerts,
-  CasesClientPush,
-  CasesClientGetCasesByAlert,
-} from './types';
-import { create } from './cases/create';
-import { update } from './cases/update';
-import { addComment } from './comments/add';
-import { getFields } from './configure/get_fields';
-import { getMappings } from './configure/get_mappings';
-import { updateAlertsStatus } from './alerts/update_status';
-import {
-  CaseConfigureServiceSetup,
-  CaseServiceSetup,
-  ConnectorMappingsServiceSetup,
-  CaseUserActionServiceSetup,
-  AlertServiceContract,
-} from '../services';
-import { CasesPatchRequest, CasePostRequest, User } from '../../common';
-import { get } from './cases/get';
-import { get as getUserActions } from './user_actions/get';
-import { get as getAlerts } from './alerts/get';
-import { push } from './cases/push';
-import { createCaseError } from '../common/error';
+import { CasesClientArgs } from './types';
+import { CasesSubClient, createCasesSubClient } from './cases/client';
+import { AttachmentsSubClient, createAttachmentsSubClient } from './attachments/client';
+import { UserActionsSubClient, createUserActionsSubClient } from './user_actions/client';
+import { CasesClientInternal, createCasesClientInternal } from './client_internal';
+import { createSubCasesClient, SubCasesClient } from './sub_cases/client';
+import { ENABLE_CASE_CONNECTOR } from '../../common/constants';
+import { ConfigureSubClient, createConfigurationSubClient } from './configure/client';
+import { createStatsSubClient, StatsSubClient } from './stats/client';
 
 /**
- * This class is a pass through for common case functionality (like creating, get a case).
+ * Client wrapper that contains accessor methods for individual entities within the cases system.
  */
-export class CasesClientHandler implements CasesClient {
-  private readonly _scopedClusterClient: ElasticsearchClient;
-  private readonly _caseConfigureService: CaseConfigureServiceSetup;
-  private readonly _caseService: CaseServiceSetup;
-  private readonly _connectorMappingsService: ConnectorMappingsServiceSetup;
-  private readonly user: User;
-  private readonly _savedObjectsClient: SavedObjectsClientContract;
-  private readonly _userActionService: CaseUserActionServiceSetup;
-  private readonly _alertsService: AlertServiceContract;
-  private readonly logger: Logger;
+export class CasesClient {
+  private readonly _casesClientInternal: CasesClientInternal;
+  private readonly _cases: CasesSubClient;
+  private readonly _attachments: AttachmentsSubClient;
+  private readonly _userActions: UserActionsSubClient;
+  private readonly _subCases: SubCasesClient;
+  private readonly _configure: ConfigureSubClient;
+  private readonly _stats: StatsSubClient;
 
-  constructor(clientArgs: CasesClientFactoryArguments) {
-    this._scopedClusterClient = clientArgs.scopedClusterClient;
-    this._caseConfigureService = clientArgs.caseConfigureService;
-    this._caseService = clientArgs.caseService;
-    this._connectorMappingsService = clientArgs.connectorMappingsService;
-    this.user = clientArgs.user;
-    this._savedObjectsClient = clientArgs.savedObjectsClient;
-    this._userActionService = clientArgs.userActionService;
-    this._alertsService = clientArgs.alertsService;
-    this.logger = clientArgs.logger;
+  constructor(args: CasesClientArgs) {
+    this._casesClientInternal = createCasesClientInternal(args);
+    this._cases = createCasesSubClient(args, this, this._casesClientInternal);
+    this._attachments = createAttachmentsSubClient(args, this._casesClientInternal);
+    this._userActions = createUserActionsSubClient(args);
+    this._subCases = createSubCasesClient(args, this._casesClientInternal);
+    this._configure = createConfigurationSubClient(args, this._casesClientInternal);
+    this._stats = createStatsSubClient(args);
   }
 
-  public async create(caseInfo: CasePostRequest) {
-    try {
-      return create({
-        savedObjectsClient: this._savedObjectsClient,
-        caseService: this._caseService,
-        caseConfigureService: this._caseConfigureService,
-        userActionService: this._userActionService,
-        user: this.user,
-        theCase: caseInfo,
-        logger: this.logger,
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to create a new case using client: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
-  }
-
-  public async update(cases: CasesPatchRequest) {
-    try {
-      return update({
-        savedObjectsClient: this._savedObjectsClient,
-        caseService: this._caseService,
-        userActionService: this._userActionService,
-        user: this.user,
-        cases,
-        casesClient: this,
-        logger: this.logger,
-      });
-    } catch (error) {
-      const caseIDVersions = cases.cases.map((caseInfo) => ({
-        id: caseInfo.id,
-        version: caseInfo.version,
-      }));
-      throw createCaseError({
-        message: `Failed to update cases using client: ${JSON.stringify(caseIDVersions)}: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
-  }
-
-  public async addComment({ caseId, comment }: CasesClientAddComment) {
-    try {
-      return addComment({
-        savedObjectsClient: this._savedObjectsClient,
-        caseService: this._caseService,
-        userActionService: this._userActionService,
-        casesClient: this,
-        caseId,
-        comment,
-        user: this.user,
-        logger: this.logger,
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to add comment using client case id: ${caseId}: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
+  /**
+   * Retrieves an interface for interacting with cases entities.
+   */
+  public get cases() {
+    return this._cases;
   }
 
-  public async getFields(fields: ConfigureFields) {
-    try {
-      return getFields(fields);
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to retrieve fields using client: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
+  /**
+   * Retrieves an interface for interacting with attachments (comments) entities.
+   */
+  public get attachments() {
+    return this._attachments;
   }
 
-  public async getMappings(args: MappingsClient) {
-    try {
-      return getMappings({
-        ...args,
-        savedObjectsClient: this._savedObjectsClient,
-        connectorMappingsService: this._connectorMappingsService,
-        casesClient: this,
-        logger: this.logger,
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to get mappings using client: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
+  /**
+   * Retrieves an interface for interacting with the user actions associated with the plugin entities.
+   */
+  public get userActions() {
+    return this._userActions;
   }
 
-  public async updateAlertsStatus(args: CasesClientUpdateAlertsStatus) {
-    try {
-      return updateAlertsStatus({
-        ...args,
-        alertsService: this._alertsService,
-        scopedClusterClient: this._scopedClusterClient,
-        logger: this.logger,
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to update alerts status using client alerts: ${JSON.stringify(
-          args.alerts
-        )}: ${error}`,
-        error,
-        logger: this.logger,
-      });
+  /**
+   * Retrieves an interface for interacting with the case as a connector entities.
+   *
+   * Currently this functionality is disabled and will throw an error if this function is called.
+   */
+  public get subCases() {
+    if (!ENABLE_CASE_CONNECTOR) {
+      throw new Error('The case connector feature is disabled');
     }
+    return this._subCases;
   }
 
-  public async get(args: CasesClientGet) {
-    try {
-      return get({
-        ...args,
-        caseService: this._caseService,
-        savedObjectsClient: this._savedObjectsClient,
-        logger: this.logger,
-      });
-    } catch (error) {
-      this.logger.error(`Failed to get case using client id: ${args.id}: ${error}`);
-      throw error;
-    }
+  /**
+   * Retrieves an interface for interacting with the configuration of external connectors for the plugin entities.
+   */
+  public get configure() {
+    return this._configure;
   }
 
-  public async getUserActions(args: CasesClientGetUserActions) {
-    try {
-      return getUserActions({
-        ...args,
-        savedObjectsClient: this._savedObjectsClient,
-        userActionService: this._userActionService,
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to get user actions using client id: ${args.caseId}: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
-  }
-
-  public async getAlerts(args: CasesClientGetAlerts) {
-    try {
-      return getAlerts({
-        ...args,
-        alertsService: this._alertsService,
-        scopedClusterClient: this._scopedClusterClient,
-        logger: this.logger,
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to get alerts using client requested alerts: ${JSON.stringify(
-          args.alertsInfo
-        )}: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
-  }
-
-  public async push(args: CasesClientPush) {
-    try {
-      return push({
-        ...args,
-        savedObjectsClient: this._savedObjectsClient,
-        caseService: this._caseService,
-        userActionService: this._userActionService,
-        user: this.user,
-        casesClient: this,
-        caseConfigureService: this._caseConfigureService,
-        logger: this.logger,
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to push case using client id: ${args.caseId}: ${error}`,
-        error,
-        logger: this.logger,
-      });
-    }
-  }
-
-  public async getCaseIdsByAlertId(args: CasesClientGetCasesByAlert) {
-    try {
-      return this._caseService.getCaseIdsByAlertId({
-        client: this._savedObjectsClient,
-        alertId: args.alertId,
-      });
-    } catch (error) {
-      this.logger.error(`Failed to get case using alert id: ${args.alertId}: ${error}`);
-      throw error;
-    }
+  /**
+   * Retrieves an interface for retrieving statistics related to the cases entities.
+   */
+  public get stats() {
+    return this._stats;
   }
 }
+
+/**
+ * Creates a {@link CasesClient} for interacting with the cases entities
+ *
+ * @param args arguments for initializing the cases client
+ * @returns a {@link CasesClient}
+ *
+ * @ignore
+ */
+export const createCasesClient = (args: CasesClientArgs): CasesClient => {
+  return new CasesClient(args);
+};
diff --git a/x-pack/plugins/cases/server/client/client_internal.ts b/x-pack/plugins/cases/server/client/client_internal.ts
new file mode 100644
index 0000000000000..3623498223da7
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/client_internal.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 { CasesClientArgs } from './types';
+import { AlertSubClient, createAlertsSubClient } from './alerts/client';
+import {
+  InternalConfigureSubClient,
+  createInternalConfigurationSubClient,
+} from './configure/client';
+
+export class CasesClientInternal {
+  private readonly _alerts: AlertSubClient;
+  private readonly _configuration: InternalConfigureSubClient;
+
+  constructor(args: CasesClientArgs) {
+    this._alerts = createAlertsSubClient(args);
+    this._configuration = createInternalConfigurationSubClient(args, this);
+  }
+
+  public get alerts() {
+    return this._alerts;
+  }
+
+  public get configuration() {
+    return this._configuration;
+  }
+}
+
+export const createCasesClientInternal = (args: CasesClientArgs): CasesClientInternal => {
+  return new CasesClientInternal(args);
+};
diff --git a/x-pack/plugins/cases/server/client/comments/add.test.ts b/x-pack/plugins/cases/server/client/comments/add.test.ts
deleted file mode 100644
index bd04e0ea6ef14..0000000000000
--- a/x-pack/plugins/cases/server/client/comments/add.test.ts
+++ /dev/null
@@ -1,593 +0,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 { omit } from 'lodash/fp';
-import { CommentType } from '../../../common';
-import { isCaseError } from '../../common/error';
-import {
-  createMockSavedObjectsRepository,
-  mockCaseComments,
-  mockCases,
-} from '../../routes/api/__fixtures__';
-import { createCasesClientWithMockSavedObjectsClient } from '../mocks';
-
-type AlertComment = CommentType.alert | CommentType.generatedAlert;
-
-describe('addComment', () => {
-  beforeEach(async () => {
-    jest.restoreAllMocks();
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2020-10-23T21:54:48.952Z'),
-    }));
-  });
-
-  describe('happy path', () => {
-    test('it adds a comment correctly', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.addComment({
-        caseId: 'mock-id-1',
-        comment: {
-          comment: 'Wow, good luck catching that bad meanie!',
-          type: CommentType.user,
-        },
-      });
-
-      expect(res.id).toEqual('mock-id-1');
-      expect(res.totalComment).toEqual(res.comments!.length);
-      expect(res.comments![res.comments!.length - 1]).toMatchInlineSnapshot(`
-        Object {
-          "associationType": "case",
-          "comment": "Wow, good luck catching that bad meanie!",
-          "created_at": "2020-10-23T21:54:48.952Z",
-          "created_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "id": "mock-comment",
-          "pushed_at": null,
-          "pushed_by": null,
-          "type": "user",
-          "updated_at": null,
-          "updated_by": null,
-          "version": "WzksMV0=",
-        }
-      `);
-    });
-
-    test('it adds a comment of type alert correctly', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.addComment({
-        caseId: 'mock-id-1',
-        comment: {
-          type: CommentType.alert,
-          alertId: 'test-id',
-          index: 'test-index',
-          rule: {
-            id: 'test-rule1',
-            name: 'test-rule',
-          },
-        },
-      });
-
-      expect(res.id).toEqual('mock-id-1');
-      expect(res.totalComment).toEqual(res.comments!.length);
-      expect(res.comments![res.comments!.length - 1]).toMatchInlineSnapshot(`
-        Object {
-          "alertId": "test-id",
-          "associationType": "case",
-          "created_at": "2020-10-23T21:54:48.952Z",
-          "created_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "id": "mock-comment",
-          "index": "test-index",
-          "pushed_at": null,
-          "pushed_by": null,
-          "rule": Object {
-            "id": "test-rule1",
-            "name": "test-rule",
-          },
-          "type": "alert",
-          "updated_at": null,
-          "updated_by": null,
-          "version": "WzksMV0=",
-        }
-      `);
-    });
-
-    test('it updates the case correctly after adding a comment', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.addComment({
-        caseId: 'mock-id-1',
-        comment: {
-          comment: 'Wow, good luck catching that bad meanie!',
-          type: CommentType.user,
-        },
-      });
-
-      expect(res.updated_at).toEqual('2020-10-23T21:54:48.952Z');
-      expect(res.updated_by).toEqual({
-        email: 'd00d@awesome.com',
-        full_name: 'Awesome D00d',
-        username: 'awesome',
-      });
-    });
-
-    test('it creates a user action', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      await casesClient.client.addComment({
-        caseId: 'mock-id-1',
-        comment: {
-          comment: 'Wow, good luck catching that bad meanie!',
-          type: CommentType.user,
-        },
-      });
-
-      expect(
-        casesClient.services.userActionService.postUserActions.mock.calls[0][0].actions
-      ).toEqual([
-        {
-          attributes: {
-            action: 'create',
-            action_at: '2020-10-23T21:54:48.952Z',
-            action_by: {
-              email: 'd00d@awesome.com',
-              full_name: 'Awesome D00d',
-              username: 'awesome',
-            },
-            action_field: ['comment'],
-            new_value: '{"comment":"Wow, good luck catching that bad meanie!","type":"user"}',
-            old_value: null,
-          },
-          references: [
-            {
-              id: 'mock-id-1',
-              name: 'associated-cases',
-              type: 'cases',
-            },
-            {
-              id: 'mock-comment',
-              name: 'associated-cases-comments',
-              type: 'cases-comments',
-            },
-          ],
-        },
-      ]);
-    });
-
-    test('it allow user to create comments without authentications', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({
-        savedObjectsClient,
-        badAuth: true,
-      });
-      const res = await casesClient.client.addComment({
-        caseId: 'mock-id-1',
-        comment: {
-          comment: 'Wow, good luck catching that bad meanie!',
-          type: CommentType.user,
-        },
-      });
-
-      expect(res.id).toEqual('mock-id-1');
-      expect(res.comments![res.comments!.length - 1]).toMatchInlineSnapshot(`
-        Object {
-          "associationType": "case",
-          "comment": "Wow, good luck catching that bad meanie!",
-          "created_at": "2020-10-23T21:54:48.952Z",
-          "created_by": Object {
-            "email": null,
-            "full_name": null,
-            "username": null,
-          },
-          "id": "mock-comment",
-          "pushed_at": null,
-          "pushed_by": null,
-          "type": "user",
-          "updated_at": null,
-          "updated_by": null,
-          "version": "WzksMV0=",
-        }
-      `);
-    });
-
-    test('it update the status of the alert if the case is synced with alerts', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({
-        savedObjectsClient,
-        badAuth: true,
-      });
-
-      casesClient.client.updateAlertsStatus = jest.fn();
-
-      await casesClient.client.addComment({
-        caseId: 'mock-id-1',
-        comment: {
-          type: CommentType.alert,
-          alertId: 'test-alert',
-          index: 'test-index',
-          rule: {
-            id: 'test-rule1',
-            name: 'test-rule',
-          },
-        },
-      });
-
-      expect(casesClient.client.updateAlertsStatus).toHaveBeenCalledWith({
-        alerts: [{ id: 'test-alert', index: 'test-index', status: 'open' }],
-      });
-    });
-
-    test('it should NOT update the status of the alert if the case is NOT synced with alerts', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: [
-          {
-            ...mockCases[0],
-            attributes: { ...mockCases[0].attributes, settings: { syncAlerts: false } },
-          },
-        ],
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({
-        savedObjectsClient,
-        badAuth: true,
-      });
-
-      casesClient.client.updateAlertsStatus = jest.fn();
-
-      await casesClient.client.addComment({
-        caseId: 'mock-id-1',
-        comment: {
-          type: CommentType.alert,
-          alertId: 'test-alert',
-          index: 'test-index',
-          rule: {
-            id: 'test-rule1',
-            name: 'test-rule',
-          },
-        },
-      });
-
-      expect(casesClient.client.updateAlertsStatus).not.toHaveBeenCalled();
-    });
-  });
-
-  describe('unhappy path', () => {
-    test('it throws when missing type', async () => {
-      expect.assertions(3);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client
-        .addComment({
-          caseId: 'mock-id-1',
-          // @ts-expect-error
-          comment: {},
-        })
-        .catch((e) => {
-          expect(e).not.toBeNull();
-          expect(e.isBoom).toBe(true);
-          expect(e.output.statusCode).toBe(400);
-        });
-    });
-
-    test('it throws when missing attributes: type user', async () => {
-      expect.assertions(3);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const allRequestAttributes = {
-        type: CommentType.user,
-        comment: 'a comment',
-      };
-
-      ['comment'].forEach((attribute) => {
-        const requestAttributes = omit(attribute, allRequestAttributes);
-        return casesClient.client
-          .addComment({
-            caseId: 'mock-id-1',
-            // @ts-expect-error
-            comment: {
-              ...requestAttributes,
-            },
-          })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          });
-      });
-    });
-
-    test('it throws when excess attributes are provided: type user', async () => {
-      expect.assertions(6);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-
-      ['alertId', 'index'].forEach((attribute) => {
-        return casesClient.client
-          .addComment({
-            caseId: 'mock-id-1',
-            comment: {
-              [attribute]: attribute,
-              comment: 'a comment',
-              type: CommentType.user,
-            },
-          })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          });
-      });
-    });
-
-    test('it throws when missing attributes: type alert', async () => {
-      expect.assertions(6);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const allRequestAttributes = {
-        type: CommentType.alert,
-        index: 'test-index',
-        alertId: 'test-id',
-      };
-
-      ['alertId', 'index'].forEach((attribute) => {
-        const requestAttributes = omit(attribute, allRequestAttributes);
-        return casesClient.client
-          .addComment({
-            caseId: 'mock-id-1',
-            // @ts-expect-error
-            comment: {
-              ...requestAttributes,
-            },
-          })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          });
-      });
-    });
-
-    test('it throws when excess attributes are provided: type alert', async () => {
-      expect.assertions(3);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-
-      ['comment'].forEach((attribute) => {
-        return casesClient.client
-          .addComment({
-            caseId: 'mock-id-1',
-            comment: {
-              [attribute]: attribute,
-              type: CommentType.alert,
-              index: 'test-index',
-              alertId: 'test-id',
-              rule: {
-                id: 'test-rule1',
-                name: 'test-rule',
-              },
-            },
-          })
-          .catch((e) => {
-            expect(e).not.toBeNull();
-            expect(e.isBoom).toBe(true);
-            expect(e.output.statusCode).toBe(400);
-          });
-      });
-    });
-
-    test('it throws when the case does not exists', async () => {
-      expect.assertions(4);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client
-        .addComment({
-          caseId: 'not-exists',
-          comment: {
-            comment: 'Wow, good luck catching that bad meanie!',
-            type: CommentType.user,
-          },
-        })
-        .catch((e) => {
-          expect(e).not.toBeNull();
-          expect(isCaseError(e)).toBeTruthy();
-          const boomErr = e.boomify();
-          expect(boomErr.isBoom).toBe(true);
-          expect(boomErr.output.statusCode).toBe(404);
-        });
-    });
-
-    test('it throws when postNewCase throws', async () => {
-      expect.assertions(4);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client
-        .addComment({
-          caseId: 'mock-id-1',
-          comment: {
-            comment: 'Throw an error',
-            type: CommentType.user,
-          },
-        })
-        .catch((e) => {
-          expect(e).not.toBeNull();
-          expect(isCaseError(e)).toBeTruthy();
-          const boomErr = e.boomify();
-          expect(boomErr.isBoom).toBe(true);
-          expect(boomErr.output.statusCode).toBe(400);
-        });
-    });
-
-    test('it throws when the case is closed and the comment is of type alert', async () => {
-      expect.assertions(4);
-
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      });
-
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      return casesClient.client
-        .addComment({
-          caseId: 'mock-id-4',
-          comment: {
-            type: CommentType.alert,
-            alertId: 'test-alert',
-            index: 'test-index',
-            rule: {
-              id: 'test-rule1',
-              name: 'test-rule',
-            },
-          },
-        })
-        .catch((e) => {
-          expect(e).not.toBeNull();
-          expect(isCaseError(e)).toBeTruthy();
-          const boomErr = e.boomify();
-          expect(boomErr.isBoom).toBe(true);
-          expect(boomErr.output.statusCode).toBe(400);
-        });
-    });
-
-    describe('alert format', () => {
-      it.each([
-        ['1', ['index1', 'index2'], CommentType.alert],
-        [['1', '2'], 'index', CommentType.alert],
-        ['1', ['index1', 'index2'], CommentType.generatedAlert],
-        [['1', '2'], 'index', CommentType.generatedAlert],
-      ])(
-        'throws an error with an alert comment with contents id: %p indices: %p type: %s',
-        async (alertId, index, type) => {
-          expect.assertions(1);
-
-          const savedObjectsClient = createMockSavedObjectsRepository({
-            caseSavedObject: mockCases,
-            caseCommentSavedObject: mockCaseComments,
-          });
-
-          const casesClient = await createCasesClientWithMockSavedObjectsClient({
-            savedObjectsClient,
-          });
-          await expect(
-            casesClient.client.addComment({
-              caseId: 'mock-id-4',
-              comment: {
-                // casting because type must be either alert or generatedAlert but type is CommentType
-                type: type as AlertComment,
-                alertId,
-                index,
-                rule: {
-                  id: 'test-rule1',
-                  name: 'test-rule',
-                },
-              },
-            })
-          ).rejects.toThrow();
-        }
-      );
-
-      it.each([
-        ['1', ['index1'], CommentType.alert],
-        [['1', '2'], ['index', 'other-index'], CommentType.alert],
-      ])(
-        'does not throw an error with an alert comment with contents id: %p indices: %p type: %s',
-        async (alertId, index, type) => {
-          expect.assertions(1);
-
-          const savedObjectsClient = createMockSavedObjectsRepository({
-            caseSavedObject: mockCases,
-            caseCommentSavedObject: mockCaseComments,
-          });
-
-          const casesClient = await createCasesClientWithMockSavedObjectsClient({
-            savedObjectsClient,
-          });
-          await expect(
-            casesClient.client.addComment({
-              caseId: 'mock-id-1',
-              comment: {
-                // casting because type must be either alert or generatedAlert but type is CommentType
-                type: type as AlertComment,
-                alertId,
-                index,
-                rule: {
-                  id: 'test-rule1',
-                  name: 'test-rule',
-                },
-              },
-            })
-          ).resolves.not.toBeUndefined();
-        }
-      );
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/server/client/comments/add.ts b/x-pack/plugins/cases/server/client/comments/add.ts
deleted file mode 100644
index 376e0e2c8868e..0000000000000
--- a/x-pack/plugins/cases/server/client/comments/add.ts
+++ /dev/null
@@ -1,371 +0,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 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 { SavedObject, SavedObjectsClientContract, Logger } from 'src/core/server';
-import { decodeCommentRequest, isCommentRequestTypeGenAlert } from '../../routes/api/utils';
-
-import {
-  throwErrors,
-  CommentRequestRt,
-  CommentType,
-  CaseStatuses,
-  CaseType,
-  SubCaseAttributes,
-  CommentRequest,
-  CaseResponse,
-  User,
-  CommentRequestAlertType,
-  AlertCommentRequestRt,
-} from '../../../common';
-import {
-  buildCaseUserActionItem,
-  buildCommentUserActionItem,
-} from '../../services/user_actions/helpers';
-
-import { CaseServiceSetup, CaseUserActionServiceSetup } from '../../services';
-import { CommentableCase, createAlertUpdateRequest } from '../../common';
-import { CasesClientHandler } from '..';
-import { createCaseError } from '../../common/error';
-import { CASE_COMMENT_SAVED_OBJECT } from '../../saved_object_types';
-import { ENABLE_CASE_CONNECTOR, MAX_GENERATED_ALERTS_PER_SUB_CASE } from '../../../common';
-
-async function getSubCase({
-  caseService,
-  savedObjectsClient,
-  caseId,
-  createdAt,
-  userActionService,
-  user,
-}: {
-  caseService: CaseServiceSetup;
-  savedObjectsClient: SavedObjectsClientContract;
-  caseId: string;
-  createdAt: string;
-  userActionService: CaseUserActionServiceSetup;
-  user: User;
-}): Promise<SavedObject<SubCaseAttributes>> {
-  const mostRecentSubCase = await caseService.getMostRecentSubCase(savedObjectsClient, caseId);
-  if (mostRecentSubCase && mostRecentSubCase.attributes.status !== CaseStatuses.closed) {
-    const subCaseAlertsAttachement = await caseService.getAllSubCaseComments({
-      client: savedObjectsClient,
-      id: mostRecentSubCase.id,
-      options: {
-        fields: [],
-        filter: `${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.generatedAlert}`,
-        page: 1,
-        perPage: 1,
-      },
-    });
-
-    if (subCaseAlertsAttachement.total <= MAX_GENERATED_ALERTS_PER_SUB_CASE) {
-      return mostRecentSubCase;
-    }
-  }
-
-  const newSubCase = await caseService.createSubCase({
-    client: savedObjectsClient,
-    createdAt,
-    caseId,
-    createdBy: user,
-  });
-  await userActionService.postUserActions({
-    client: savedObjectsClient,
-    actions: [
-      buildCaseUserActionItem({
-        action: 'create',
-        actionAt: createdAt,
-        actionBy: user,
-        caseId,
-        subCaseId: newSubCase.id,
-        fields: ['status', 'sub_case'],
-        newValue: JSON.stringify({ status: newSubCase.attributes.status }),
-      }),
-    ],
-  });
-  return newSubCase;
-}
-
-interface AddCommentFromRuleArgs {
-  casesClient: CasesClientHandler;
-  caseId: string;
-  comment: CommentRequestAlertType;
-  savedObjectsClient: SavedObjectsClientContract;
-  caseService: CaseServiceSetup;
-  userActionService: CaseUserActionServiceSetup;
-  logger: Logger;
-}
-
-const addGeneratedAlerts = async ({
-  savedObjectsClient,
-  caseService,
-  userActionService,
-  casesClient,
-  caseId,
-  comment,
-  logger,
-}: AddCommentFromRuleArgs): Promise<CaseResponse> => {
-  const query = pipe(
-    AlertCommentRequestRt.decode(comment),
-    fold(throwErrors(Boom.badRequest), identity)
-  );
-
-  decodeCommentRequest(comment);
-
-  // This function only supports adding generated alerts
-  if (comment.type !== CommentType.generatedAlert) {
-    throw Boom.internal('Attempting to add a non generated alert in the wrong context');
-  }
-
-  try {
-    const createdDate = new Date().toISOString();
-
-    const caseInfo = await caseService.getCase({
-      client: savedObjectsClient,
-      id: caseId,
-    });
-
-    if (
-      query.type === CommentType.generatedAlert &&
-      caseInfo.attributes.type !== CaseType.collection
-    ) {
-      throw Boom.badRequest('Sub case style alert comment cannot be added to an individual case');
-    }
-
-    const userDetails: User = {
-      username: caseInfo.attributes.created_by?.username,
-      full_name: caseInfo.attributes.created_by?.full_name,
-      email: caseInfo.attributes.created_by?.email,
-    };
-
-    const subCase = await getSubCase({
-      caseService,
-      savedObjectsClient,
-      caseId,
-      createdAt: createdDate,
-      userActionService,
-      user: userDetails,
-    });
-
-    const commentableCase = new CommentableCase({
-      logger,
-      collection: caseInfo,
-      subCase,
-      soClient: savedObjectsClient,
-      service: caseService,
-    });
-
-    const {
-      comment: newComment,
-      commentableCase: updatedCase,
-    } = await commentableCase.createComment({ createdDate, user: userDetails, commentReq: query });
-
-    if (
-      (newComment.attributes.type === CommentType.alert ||
-        newComment.attributes.type === CommentType.generatedAlert) &&
-      caseInfo.attributes.settings.syncAlerts
-    ) {
-      const alertsToUpdate = createAlertUpdateRequest({
-        comment: query,
-        status: subCase.attributes.status,
-      });
-      await casesClient.updateAlertsStatus({
-        alerts: alertsToUpdate,
-      });
-    }
-
-    await userActionService.postUserActions({
-      client: savedObjectsClient,
-      actions: [
-        buildCommentUserActionItem({
-          action: 'create',
-          actionAt: createdDate,
-          actionBy: { ...userDetails },
-          caseId: updatedCase.caseId,
-          subCaseId: updatedCase.subCaseId,
-          commentId: newComment.id,
-          fields: ['comment'],
-          newValue: JSON.stringify(query),
-        }),
-      ],
-    });
-
-    return updatedCase.encode();
-  } catch (error) {
-    throw createCaseError({
-      message: `Failed while adding a generated alert to case id: ${caseId} error: ${error}`,
-      error,
-      logger,
-    });
-  }
-};
-
-async function getCombinedCase({
-  service,
-  client,
-  id,
-  logger,
-}: {
-  service: CaseServiceSetup;
-  client: SavedObjectsClientContract;
-  id: string;
-  logger: Logger;
-}): Promise<CommentableCase> {
-  const [casePromise, subCasePromise] = await Promise.allSettled([
-    service.getCase({
-      client,
-      id,
-    }),
-    ...(ENABLE_CASE_CONNECTOR
-      ? [
-          service.getSubCase({
-            client,
-            id,
-          }),
-        ]
-      : [Promise.reject('case connector feature is disabled')]),
-  ]);
-
-  if (subCasePromise.status === 'fulfilled') {
-    if (subCasePromise.value.references.length > 0) {
-      const caseValue = await service.getCase({
-        client,
-        id: subCasePromise.value.references[0].id,
-      });
-      return new CommentableCase({
-        logger,
-        collection: caseValue,
-        subCase: subCasePromise.value,
-        service,
-        soClient: client,
-      });
-    } else {
-      throw Boom.badRequest('Sub case found without reference to collection');
-    }
-  }
-
-  if (casePromise.status === 'rejected') {
-    throw casePromise.reason;
-  } else {
-    return new CommentableCase({
-      logger,
-      collection: casePromise.value,
-      service,
-      soClient: client,
-    });
-  }
-}
-
-interface AddCommentArgs {
-  casesClient: CasesClientHandler;
-  caseId: string;
-  comment: CommentRequest;
-  savedObjectsClient: SavedObjectsClientContract;
-  caseService: CaseServiceSetup;
-  userActionService: CaseUserActionServiceSetup;
-  user: User;
-  logger: Logger;
-}
-
-export const addComment = async ({
-  savedObjectsClient,
-  caseService,
-  userActionService,
-  casesClient,
-  caseId,
-  comment,
-  user,
-  logger,
-}: AddCommentArgs): Promise<CaseResponse> => {
-  const query = pipe(
-    CommentRequestRt.decode(comment),
-    fold(throwErrors(Boom.badRequest), identity)
-  );
-
-  if (isCommentRequestTypeGenAlert(comment)) {
-    if (!ENABLE_CASE_CONNECTOR) {
-      throw Boom.badRequest(
-        'Attempting to add a generated alert when case connector feature is disabled'
-      );
-    }
-
-    return addGeneratedAlerts({
-      caseId,
-      comment,
-      casesClient,
-      savedObjectsClient,
-      userActionService,
-      caseService,
-      logger,
-    });
-  }
-
-  decodeCommentRequest(comment);
-  try {
-    const createdDate = new Date().toISOString();
-
-    const combinedCase = await getCombinedCase({
-      service: caseService,
-      client: savedObjectsClient,
-      id: caseId,
-      logger,
-    });
-
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { username, full_name, email } = user;
-    const userInfo: User = {
-      username,
-      full_name,
-      email,
-    };
-
-    const { comment: newComment, commentableCase: updatedCase } = await combinedCase.createComment({
-      createdDate,
-      user: userInfo,
-      commentReq: query,
-    });
-
-    if (newComment.attributes.type === CommentType.alert && updatedCase.settings.syncAlerts) {
-      const alertsToUpdate = createAlertUpdateRequest({
-        comment: query,
-        status: updatedCase.status,
-      });
-
-      await casesClient.updateAlertsStatus({
-        alerts: alertsToUpdate,
-      });
-    }
-
-    await userActionService.postUserActions({
-      client: savedObjectsClient,
-      actions: [
-        buildCommentUserActionItem({
-          action: 'create',
-          actionAt: createdDate,
-          actionBy: { username, full_name, email },
-          caseId: updatedCase.caseId,
-          subCaseId: updatedCase.subCaseId,
-          commentId: newComment.id,
-          fields: ['comment'],
-          newValue: JSON.stringify(query),
-        }),
-      ],
-    });
-
-    return updatedCase.encode();
-  } catch (error) {
-    throw createCaseError({
-      message: `Failed while adding a comment to case id: ${caseId} error: ${error}`,
-      error,
-      logger,
-    });
-  }
-};
diff --git a/x-pack/plugins/cases/server/client/configure/client.ts b/x-pack/plugins/cases/server/client/configure/client.ts
new file mode 100644
index 0000000000000..d95667d5eee04
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/configure/client.ts
@@ -0,0 +1,471 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 pMap from 'p-map';
+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 {
+  SavedObject,
+  SavedObjectsFindResponse,
+  SavedObjectsUtils,
+} from '../../../../../../src/core/server';
+import { MAX_CONCURRENT_SEARCHES, SUPPORTED_CONNECTORS } from '../../../common/constants';
+import {
+  CaseConfigureResponseRt,
+  CasesConfigurePatch,
+  CasesConfigureRequest,
+  CasesConfigureResponse,
+  ConnectorMappingsAttributes,
+  excess,
+  GetConfigureFindRequest,
+  GetConfigureFindRequestRt,
+  GetFieldsResponse,
+  throwErrors,
+  CasesConfigurationsResponse,
+  CaseConfigurationsResponseRt,
+  CasesConfigurePatchRt,
+  ConnectorMappings,
+  ESCasesConfigureAttributes,
+} from '../../../common/api';
+import { createCaseError } from '../../common/error';
+import {
+  transformCaseConnectorToEsConnector,
+  transformESConnectorToCaseConnector,
+} from '../../common';
+import { CasesClientInternal } from '../client_internal';
+import { CasesClientArgs } from '../types';
+import { getFields } from './get_fields';
+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 {
+  ConfigurationGetFields,
+  MappingsArgs,
+  CreateMappingsArgs,
+  UpdateMappingsArgs,
+} from './types';
+import { createMappings } from './create_mappings';
+import { updateMappings } from './update_mappings';
+import {
+  ICasesConfigurePatch,
+  ICasesConfigureRequest,
+  ICasesConfigureResponse,
+} from '../typedoc_interfaces';
+
+/**
+ * Defines the internal helper functions.
+ *
+ * @ignore
+ */
+export interface InternalConfigureSubClient {
+  getFields(params: ConfigurationGetFields): Promise<GetFieldsResponse>;
+  getMappings(
+    params: MappingsArgs
+  ): Promise<SavedObjectsFindResponse<ConnectorMappings>['saved_objects']>;
+  createMappings(params: CreateMappingsArgs): Promise<ConnectorMappingsAttributes[]>;
+  updateMappings(params: UpdateMappingsArgs): Promise<ConnectorMappingsAttributes[]>;
+}
+
+/**
+ * This is the public API for interacting with the connector configuration for cases.
+ */
+export interface ConfigureSubClient {
+  /**
+   * Retrieves the external connector configuration for a particular case owner.
+   */
+  get(params: GetConfigureFindRequest): Promise<ICasesConfigureResponse | {}>;
+  /**
+   * Retrieves the valid external connectors supported by the cases plugin.
+   */
+  getConnectors(): Promise<FindActionResult[]>;
+  /**
+   * Updates a particular configuration with new values.
+   *
+   * @param configurationId the ID of the configuration to update
+   * @param configurations the new configuration parameters
+   */
+  update(
+    configurationId: string,
+    configurations: ICasesConfigurePatch
+  ): Promise<ICasesConfigureResponse>;
+  /**
+   * Creates a configuration if one does not already exist. If one exists it is deleted and a new one is created.
+   */
+  create(configuration: ICasesConfigureRequest): Promise<ICasesConfigureResponse>;
+}
+
+/**
+ * These functions should not be exposed on the plugin contract. They are for internal use to support the CRUD of
+ * configurations.
+ *
+ * @ignore
+ */
+export const createInternalConfigurationSubClient = (
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): InternalConfigureSubClient => {
+  const configureSubClient: InternalConfigureSubClient = {
+    getFields: (params: ConfigurationGetFields) => getFields(params, clientArgs),
+    getMappings: (params: MappingsArgs) => getMappings(params, clientArgs),
+    createMappings: (params: CreateMappingsArgs) =>
+      createMappings(params, clientArgs, casesClientInternal),
+    updateMappings: (params: UpdateMappingsArgs) =>
+      updateMappings(params, clientArgs, casesClientInternal),
+  };
+
+  return Object.freeze(configureSubClient);
+};
+
+/**
+ * Creates an API object for interacting with the configuration entities
+ *
+ * @ignore
+ */
+export const createConfigurationSubClient = (
+  clientArgs: CasesClientArgs,
+  casesInternalClient: CasesClientInternal
+): ConfigureSubClient => {
+  return Object.freeze({
+    get: (params: GetConfigureFindRequest) => get(params, clientArgs, casesInternalClient),
+    getConnectors: () => getConnectors(clientArgs),
+    update: (configurationId: string, configuration: CasesConfigurePatch) =>
+      update(configurationId, configuration, clientArgs, casesInternalClient),
+    create: (configuration: CasesConfigureRequest) =>
+      create(configuration, clientArgs, casesInternalClient),
+  });
+};
+
+async function get(
+  params: GetConfigureFindRequest,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<CasesConfigurationsResponse> {
+  const { unsecuredSavedObjectsClient, caseConfigureService, logger, authorization } = clientArgs;
+  try {
+    const queryParams = pipe(
+      excess(GetConfigureFindRequestRt).decode(params),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(Operations.findConfigurations);
+
+    const filter = combineAuthorizedAndOwnerFilter(
+      queryParams.owner,
+      authorizationFilter,
+      Operations.findConfigurations.savedObjectType
+    );
+
+    let error: string | null = null;
+    const myCaseConfigure = await caseConfigureService.find({
+      unsecuredSavedObjectsClient,
+      options: { filter },
+    });
+
+    ensureSavedObjectsAreAuthorized(
+      myCaseConfigure.saved_objects.map((configuration) => ({
+        id: configuration.id,
+        owner: configuration.attributes.owner,
+      }))
+    );
+
+    const configurations = await pMap(
+      myCaseConfigure.saved_objects,
+      async (configuration: SavedObject<ESCasesConfigureAttributes>) => {
+        const { connector, ...caseConfigureWithoutConnector } = configuration?.attributes ?? {
+          connector: null,
+        };
+
+        let mappings: SavedObjectsFindResponse<ConnectorMappings>['saved_objects'] = [];
+
+        if (connector != null) {
+          try {
+            mappings = await casesClientInternal.configuration.getMappings({
+              connectorId: connector.id,
+              connectorType: connector.type,
+            });
+          } catch (e) {
+            error = e.isBoom
+              ? e.output.payload.message
+              : `Failed to retrieve mapping for ${connector.name}`;
+          }
+        }
+
+        return {
+          ...caseConfigureWithoutConnector,
+          connector: transformESConnectorToCaseConnector(connector),
+          mappings: mappings.length > 0 ? mappings[0].attributes.mappings : [],
+          version: configuration.version ?? '',
+          error,
+          id: configuration.id,
+        };
+      }
+    );
+
+    return CaseConfigurationsResponseRt.encode(configurations);
+  } catch (error) {
+    throw createCaseError({ message: `Failed to get case configure: ${error}`, error, logger });
+  }
+}
+
+async function getConnectors({
+  actionsClient,
+  logger,
+}: CasesClientArgs): Promise<FindActionResult[]> {
+  const isConnectorSupported = (
+    action: FindActionResult,
+    actionTypes: Record<string, ActionType>
+  ): boolean =>
+    SUPPORTED_CONNECTORS.includes(action.actionTypeId) &&
+    actionTypes[action.actionTypeId]?.enabledInLicense;
+
+  try {
+    const actionTypes = (await actionsClient.listTypes()).reduce(
+      (types, type) => ({ ...types, [type.id]: type }),
+      {}
+    );
+
+    return (await actionsClient.getAll()).filter((action) =>
+      isConnectorSupported(action, actionTypes)
+    );
+  } catch (error) {
+    throw createCaseError({ message: `Failed to get connectors: ${error}`, error, logger });
+  }
+}
+
+async function update(
+  configurationId: string,
+  req: CasesConfigurePatch,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<CasesConfigureResponse> {
+  const {
+    caseConfigureService,
+    logger,
+    unsecuredSavedObjectsClient,
+    user,
+    authorization,
+  } = clientArgs;
+
+  try {
+    const request = pipe(
+      CasesConfigurePatchRt.decode(req),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const { version, ...queryWithoutVersion } = request;
+
+    /**
+     * Excess function does not supports union or intersection types.
+     * For that reason we need to check manually for excess properties
+     * in the partial attributes.
+     *
+     * The owner attribute should not be allowed.
+     */
+    pipe(
+      excess(CasesConfigurePatchRt.types[0]).decode(queryWithoutVersion),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const configuration = await caseConfigureService.get({
+      unsecuredSavedObjectsClient,
+      configurationId,
+    });
+
+    await authorization.ensureAuthorized({
+      operation: Operations.updateConfiguration,
+      entities: [{ owner: configuration.attributes.owner, id: configuration.id }],
+    });
+
+    if (version !== configuration.version) {
+      throw Boom.conflict(
+        'This configuration has been updated. Please refresh before saving additional updates.'
+      );
+    }
+
+    let error = null;
+    const updateDate = new Date().toISOString();
+    let mappings: ConnectorMappingsAttributes[] = [];
+    const { connector, ...queryWithoutVersionAndConnector } = queryWithoutVersion;
+
+    try {
+      const resMappings = await casesClientInternal.configuration.getMappings({
+        connectorId: connector != null ? connector.id : configuration.attributes.connector.id,
+        connectorType: connector != null ? connector.type : configuration.attributes.connector.type,
+      });
+      mappings = resMappings.length > 0 ? resMappings[0].attributes.mappings : [];
+
+      if (connector != null) {
+        if (resMappings.length !== 0) {
+          mappings = await casesClientInternal.configuration.updateMappings({
+            connectorId: connector.id,
+            connectorType: connector.type,
+            mappingId: resMappings[0].id,
+          });
+        } else {
+          mappings = await casesClientInternal.configuration.createMappings({
+            connectorId: connector.id,
+            connectorType: connector.type,
+            owner: configuration.attributes.owner,
+          });
+        }
+      }
+    } catch (e) {
+      error = e.isBoom
+        ? e.output.payload.message
+        : `Error connecting to ${
+            connector != null ? connector.name : configuration.attributes.connector.name
+          } instance`;
+    }
+
+    const patch = await caseConfigureService.patch({
+      unsecuredSavedObjectsClient,
+      configurationId: configuration.id,
+      updatedAttributes: {
+        ...queryWithoutVersionAndConnector,
+        ...(connector != null ? { connector: transformCaseConnectorToEsConnector(connector) } : {}),
+        updated_at: updateDate,
+        updated_by: user,
+      },
+    });
+
+    return CaseConfigureResponseRt.encode({
+      ...configuration.attributes,
+      ...patch.attributes,
+      connector: transformESConnectorToCaseConnector(
+        patch.attributes.connector ?? configuration.attributes.connector
+      ),
+      mappings,
+      version: patch.version ?? '',
+      error,
+      id: patch.id,
+    });
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to get patch configure in route: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
+
+async function create(
+  configuration: CasesConfigureRequest,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<CasesConfigureResponse> {
+  const {
+    unsecuredSavedObjectsClient,
+    caseConfigureService,
+    logger,
+    user,
+    authorization,
+  } = clientArgs;
+  try {
+    let error = null;
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(
+      /**
+       * The operation is createConfiguration because the procedure is part of
+       * the create route. The user should have all
+       * permissions to delete the results.
+       */
+      Operations.createConfiguration
+    );
+
+    const filter = combineAuthorizedAndOwnerFilter(
+      configuration.owner,
+      authorizationFilter,
+      Operations.createConfiguration.savedObjectType
+    );
+
+    const myCaseConfigure = await caseConfigureService.find({
+      unsecuredSavedObjectsClient,
+      options: { filter },
+    });
+
+    ensureSavedObjectsAreAuthorized(
+      myCaseConfigure.saved_objects.map((conf) => ({
+        id: conf.id,
+        owner: conf.attributes.owner,
+      }))
+    );
+
+    if (myCaseConfigure.saved_objects.length > 0) {
+      const deleteConfigurationMapper = async (c: SavedObject<ESCasesConfigureAttributes>) =>
+        caseConfigureService.delete({ unsecuredSavedObjectsClient, configurationId: c.id });
+
+      // Ensuring we don't too many concurrent deletions running.
+      await pMap(myCaseConfigure.saved_objects, deleteConfigurationMapper, {
+        concurrency: MAX_CONCURRENT_SEARCHES,
+      });
+    }
+
+    const savedObjectID = SavedObjectsUtils.generateId();
+
+    await authorization.ensureAuthorized({
+      operation: Operations.createConfiguration,
+      entities: [{ owner: configuration.owner, id: savedObjectID }],
+    });
+
+    const creationDate = new Date().toISOString();
+    let mappings: ConnectorMappingsAttributes[] = [];
+
+    try {
+      mappings = await casesClientInternal.configuration.createMappings({
+        connectorId: configuration.connector.id,
+        connectorType: configuration.connector.type,
+        owner: configuration.owner,
+      });
+    } catch (e) {
+      error = e.isBoom
+        ? e.output.payload.message
+        : `Error connecting to ${configuration.connector.name} instance`;
+    }
+
+    const post = await caseConfigureService.post({
+      unsecuredSavedObjectsClient,
+      attributes: {
+        ...configuration,
+        connector: transformCaseConnectorToEsConnector(configuration.connector),
+        created_at: creationDate,
+        created_by: user,
+        updated_at: null,
+        updated_by: null,
+      },
+      id: savedObjectID,
+    });
+
+    return CaseConfigureResponseRt.encode({
+      ...post.attributes,
+      // Reserve for future implementations
+      connector: transformESConnectorToCaseConnector(post.attributes.connector),
+      mappings,
+      version: post.version ?? '',
+      error,
+      id: post.id,
+    });
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to create case configuration: ${error}`,
+      error,
+      logger,
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/configure/create_mappings.ts b/x-pack/plugins/cases/server/client/configure/create_mappings.ts
new file mode 100644
index 0000000000000..b01f10d7a9e43
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/configure/create_mappings.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 { ConnectorMappingsAttributes, ConnectorTypes } from '../../../common/api';
+import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { createCaseError } from '../../common/error';
+import { CasesClientArgs, CasesClientInternal } from '..';
+import { CreateMappingsArgs } from './types';
+
+export const createMappings = async (
+  { connectorType, connectorId, owner }: CreateMappingsArgs,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<ConnectorMappingsAttributes[]> => {
+  const { unsecuredSavedObjectsClient, connectorMappingsService, logger } = clientArgs;
+
+  try {
+    if (connectorType === ConnectorTypes.none) {
+      return [];
+    }
+
+    const res = await casesClientInternal.configuration.getFields({
+      connectorId,
+      connectorType,
+    });
+
+    const theMapping = await connectorMappingsService.post({
+      unsecuredSavedObjectsClient,
+      attributes: {
+        mappings: res.defaultMappings,
+        owner,
+      },
+      references: [
+        {
+          type: ACTION_SAVED_OBJECT_TYPE,
+          name: `associated-${ACTION_SAVED_OBJECT_TYPE}`,
+          id: connectorId,
+        },
+      ],
+    });
+
+    return theMapping.attributes.mappings;
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to create mapping connector id: ${connectorId} type: ${connectorType}: ${error}`,
+      error,
+      logger,
+    });
+  }
+};
diff --git a/x-pack/plugins/cases/server/client/configure/get_fields.test.ts b/x-pack/plugins/cases/server/client/configure/get_fields.test.ts
deleted file mode 100644
index c474361293da4..0000000000000
--- a/x-pack/plugins/cases/server/client/configure/get_fields.test.ts
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ConnectorTypes } from '../../../common';
-
-import { createMockSavedObjectsRepository, mockCaseMappings } from '../../routes/api/__fixtures__';
-import { createCasesClientWithMockSavedObjectsClient } from '../mocks';
-import { actionsClientMock } from '../../../../actions/server/actions_client.mock';
-import { actionsErrResponse, mappings, mockGetFieldsResponse } from './mock';
-describe('get_fields', () => {
-  const execute = jest.fn().mockReturnValue(mockGetFieldsResponse);
-  const actionsMock = { ...actionsClientMock.create(), execute };
-  beforeEach(async () => {
-    jest.clearAllMocks();
-  });
-
-  describe('happy path', () => {
-    test('it gets fields', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseMappingsSavedObject: mockCaseMappings,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.getFields({
-        actionsClient: actionsMock,
-        connectorType: ConnectorTypes.jira,
-        connectorId: '123',
-      });
-      expect(res).toEqual({
-        fields: [
-          { id: 'summary', name: 'Summary', required: true, type: 'text' },
-          { id: 'description', name: 'Description', required: false, type: 'text' },
-        ],
-        defaultMappings: mappings[ConnectorTypes.jira],
-      });
-    });
-  });
-
-  describe('unhappy path', () => {
-    test('it throws error', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseMappingsSavedObject: mockCaseMappings,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      await casesClient.client
-        .getFields({
-          actionsClient: { ...actionsMock, execute: jest.fn().mockReturnValue(actionsErrResponse) },
-          connectorType: ConnectorTypes.jira,
-          connectorId: '123',
-        })
-        .catch((e) => {
-          expect(e).not.toBeNull();
-          expect(e.isBoom).toBe(true);
-          expect(e.output.statusCode).toBe(424);
-        });
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/server/client/configure/get_fields.ts b/x-pack/plugins/cases/server/client/configure/get_fields.ts
index 8d899f0df1a76..78627cfaca6ed 100644
--- a/x-pack/plugins/cases/server/client/configure/get_fields.ts
+++ b/x-pack/plugins/cases/server/client/configure/get_fields.ts
@@ -7,15 +7,20 @@
 
 import Boom from '@hapi/boom';
 
-import { GetFieldsResponse } from '../../../common';
-import { ConfigureFields } from '../types';
+import { GetFieldsResponse } from '../../../common/api';
 import { createDefaultMapping, formatFields } from './utils';
+import { CasesClientArgs } from '..';
 
-export const getFields = async ({
-  actionsClient,
-  connectorType,
-  connectorId,
-}: ConfigureFields): Promise<GetFieldsResponse> => {
+interface ConfigurationGetFields {
+  connectorId: string;
+  connectorType: string;
+}
+
+export const getFields = async (
+  { connectorType, connectorId }: ConfigurationGetFields,
+  clientArgs: CasesClientArgs
+): Promise<GetFieldsResponse> => {
+  const { actionsClient } = clientArgs;
   const results = await actionsClient.execute({
     actionId: connectorId,
     params: {
diff --git a/x-pack/plugins/cases/server/client/configure/get_mappings.test.ts b/x-pack/plugins/cases/server/client/configure/get_mappings.test.ts
deleted file mode 100644
index 8f75e60260873..0000000000000
--- a/x-pack/plugins/cases/server/client/configure/get_mappings.test.ts
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ConnectorTypes } from '../../../common';
-
-import {
-  createMockSavedObjectsRepository,
-  mockCaseMappingsResilient,
-  mockCaseMappingsBad,
-} from '../../routes/api/__fixtures__';
-import { createCasesClientWithMockSavedObjectsClient } from '../mocks';
-import { actionsClientMock } from '../../../../actions/server/actions_client.mock';
-import { mappings, mockGetFieldsResponse } from './mock';
-
-describe('get_mappings', () => {
-  const execute = jest.fn().mockReturnValue(mockGetFieldsResponse);
-  const actionsMock = { ...actionsClientMock.create(), execute };
-  beforeEach(async () => {
-    jest.restoreAllMocks();
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2019-11-25T21:54:48.952Z'),
-    }));
-  });
-
-  describe('happy path', () => {
-    test('it gets existing mappings', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseMappingsSavedObject: mockCaseMappingsResilient,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.getMappings({
-        actionsClient: actionsMock,
-        connectorType: ConnectorTypes.jira,
-        connectorId: '123',
-      });
-
-      expect(res).toEqual(mappings[ConnectorTypes.resilient]);
-    });
-    test('it creates new mappings', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseMappingsSavedObject: [],
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.getMappings({
-        actionsClient: actionsMock,
-        connectorType: ConnectorTypes.jira,
-        connectorId: '123',
-      });
-
-      expect(res).toEqual(mappings[ConnectorTypes.jira]);
-    });
-  });
-  describe('unhappy path', () => {
-    test('it gets existing mappings, but attributes object is empty so it creates new mappings', async () => {
-      const savedObjectsClient = createMockSavedObjectsRepository({
-        caseMappingsSavedObject: mockCaseMappingsBad,
-      });
-      const casesClient = await createCasesClientWithMockSavedObjectsClient({ savedObjectsClient });
-      const res = await casesClient.client.getMappings({
-        actionsClient: actionsMock,
-        connectorType: ConnectorTypes.jira,
-        connectorId: '123',
-      });
-
-      expect(res).toEqual(mappings[ConnectorTypes.jira]);
-    });
-  });
-});
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 b58a703455f6a..3489c06b1da5a 100644
--- a/x-pack/plugins/cases/server/client/configure/get_mappings.ts
+++ b/x-pack/plugins/cases/server/client/configure/get_mappings.ts
@@ -5,39 +5,26 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract, Logger } from 'src/core/server';
-import { ActionsClient } from '../../../../actions/server';
-import { ConnectorMappingsAttributes, ConnectorTypes } from '../../../common';
+import { SavedObjectsFindResponse } from 'kibana/server';
+import { ConnectorMappings, ConnectorTypes } from '../../../common/api';
 import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
-import { ConnectorMappingsServiceSetup } from '../../services';
-import { CasesClientHandler } from '..';
 import { createCaseError } from '../../common/error';
+import { CasesClientArgs } from '..';
+import { MappingsArgs } from './types';
 
-interface GetMappingsArgs {
-  savedObjectsClient: SavedObjectsClientContract;
-  connectorMappingsService: ConnectorMappingsServiceSetup;
-  actionsClient: ActionsClient;
-  casesClient: CasesClientHandler;
-  connectorType: string;
-  connectorId: string;
-  logger: Logger;
-}
+export const getMappings = async (
+  { connectorType, connectorId }: MappingsArgs,
+  clientArgs: CasesClientArgs
+): Promise<SavedObjectsFindResponse<ConnectorMappings>['saved_objects']> => {
+  const { unsecuredSavedObjectsClient, connectorMappingsService, logger } = clientArgs;
 
-export const getMappings = async ({
-  savedObjectsClient,
-  connectorMappingsService,
-  actionsClient,
-  casesClient,
-  connectorType,
-  connectorId,
-  logger,
-}: GetMappingsArgs): Promise<ConnectorMappingsAttributes[]> => {
   try {
     if (connectorType === ConnectorTypes.none) {
       return [];
     }
+
     const myConnectorMappings = await connectorMappingsService.find({
-      client: savedObjectsClient,
+      unsecuredSavedObjectsClient,
       options: {
         hasReference: {
           type: ACTION_SAVED_OBJECT_TYPE,
@@ -45,35 +32,8 @@ export const getMappings = async ({
         },
       },
     });
-    let theMapping;
-    // Create connector mappings if there are none
-    if (
-      myConnectorMappings.total === 0 ||
-      (myConnectorMappings.total > 0 &&
-        !myConnectorMappings.saved_objects[0].attributes.hasOwnProperty('mappings'))
-    ) {
-      const res = await casesClient.getFields({
-        actionsClient,
-        connectorId,
-        connectorType,
-      });
-      theMapping = await connectorMappingsService.post({
-        client: savedObjectsClient,
-        attributes: {
-          mappings: res.defaultMappings,
-        },
-        references: [
-          {
-            type: ACTION_SAVED_OBJECT_TYPE,
-            name: `associated-${ACTION_SAVED_OBJECT_TYPE}`,
-            id: connectorId,
-          },
-        ],
-      });
-    } else {
-      theMapping = myConnectorMappings.saved_objects[0];
-    }
-    return theMapping ? theMapping.attributes.mappings : [];
+
+    return myConnectorMappings.saved_objects;
   } catch (error) {
     throw createCaseError({
       message: `Failed to retrieve mapping connector id: ${connectorId} type: ${connectorType}: ${error}`,
diff --git a/x-pack/plugins/cases/server/client/configure/types.ts b/x-pack/plugins/cases/server/client/configure/types.ts
new file mode 100644
index 0000000000000..a34251690db48
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/configure/types.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.
+ */
+
+export interface MappingsArgs {
+  connectorType: string;
+  connectorId: string;
+}
+
+export interface CreateMappingsArgs extends MappingsArgs {
+  owner: string;
+}
+
+export interface UpdateMappingsArgs extends MappingsArgs {
+  mappingId: string;
+}
+
+export interface ConfigurationGetFields {
+  connectorId: string;
+  connectorType: string;
+}
diff --git a/x-pack/plugins/cases/server/client/configure/update_mappings.ts b/x-pack/plugins/cases/server/client/configure/update_mappings.ts
new file mode 100644
index 0000000000000..7eccf4cbbe582
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/configure/update_mappings.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 { ConnectorMappingsAttributes, ConnectorTypes } from '../../../common/api';
+import { ACTION_SAVED_OBJECT_TYPE } from '../../../../actions/server';
+import { createCaseError } from '../../common/error';
+import { CasesClientArgs, CasesClientInternal } from '..';
+import { UpdateMappingsArgs } from './types';
+
+export const updateMappings = async (
+  { connectorType, connectorId, mappingId }: UpdateMappingsArgs,
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): Promise<ConnectorMappingsAttributes[]> => {
+  const { unsecuredSavedObjectsClient, connectorMappingsService, logger } = clientArgs;
+
+  try {
+    if (connectorType === ConnectorTypes.none) {
+      return [];
+    }
+
+    const res = await casesClientInternal.configuration.getFields({
+      connectorId,
+      connectorType,
+    });
+
+    const theMapping = await connectorMappingsService.update({
+      unsecuredSavedObjectsClient,
+      mappingId,
+      attributes: {
+        mappings: res.defaultMappings,
+      },
+      references: [
+        {
+          type: ACTION_SAVED_OBJECT_TYPE,
+          name: `associated-${ACTION_SAVED_OBJECT_TYPE}`,
+          id: connectorId,
+        },
+      ],
+    });
+
+    return theMapping.attributes.mappings ?? [];
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to create mapping connector id: ${connectorId} type: ${connectorType}: ${error}`,
+      error,
+      logger,
+    });
+  }
+};
diff --git a/x-pack/plugins/cases/server/client/factory.ts b/x-pack/plugins/cases/server/client/factory.ts
new file mode 100644
index 0000000000000..4644efb61916f
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/factory.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  KibanaRequest,
+  SavedObjectsServiceStart,
+  Logger,
+  ElasticsearchClient,
+} from 'kibana/server';
+import { SecurityPluginSetup, SecurityPluginStart } from '../../../security/server';
+import { SAVED_OBJECT_TYPES } from '../../common/constants';
+import { Authorization } from '../authorization/authorization';
+import { GetSpaceFn } from '../authorization/types';
+import {
+  CaseConfigureService,
+  CasesService,
+  CaseUserActionService,
+  ConnectorMappingsService,
+  AttachmentService,
+  AlertService,
+} from '../services';
+import { PluginStartContract as FeaturesPluginStart } from '../../../features/server';
+import { PluginStartContract as ActionsPluginStart } from '../../../actions/server';
+import { AuthorizationAuditLogger } from '../authorization';
+import { CasesClient, createCasesClient } from '.';
+
+interface CasesClientFactoryArgs {
+  securityPluginSetup?: SecurityPluginSetup;
+  securityPluginStart?: SecurityPluginStart;
+  getSpace: GetSpaceFn;
+  featuresPluginStart: FeaturesPluginStart;
+  actionsPluginStart: ActionsPluginStart;
+}
+
+/**
+ * This class handles the logic for creating a CasesClient. We need this because some of the member variables
+ * can't be initialized until a plugin's start() method but we need to register the case context in the setup() method.
+ */
+export class CasesClientFactory {
+  private isInitialized = false;
+  private readonly logger: Logger;
+  private options?: CasesClientFactoryArgs;
+
+  constructor(logger: Logger) {
+    this.logger = logger;
+  }
+
+  /**
+   * This should be called by the plugin's start() method.
+   */
+  public initialize(options: CasesClientFactoryArgs) {
+    if (this.isInitialized) {
+      throw new Error('CasesClientFactory already initialized');
+    }
+    this.isInitialized = true;
+    this.options = options;
+  }
+
+  /**
+   * Creates a cases client for the current request. This request will be used to authorize the operations done through
+   * the client.
+   */
+  public async create({
+    request,
+    scopedClusterClient,
+    savedObjectsService,
+  }: {
+    request: KibanaRequest;
+    savedObjectsService: SavedObjectsServiceStart;
+    scopedClusterClient: ElasticsearchClient;
+  }): Promise<CasesClient> {
+    if (!this.isInitialized || !this.options) {
+      throw new Error('CasesClientFactory must be initialized before calling create');
+    }
+
+    const auditLogger = this.options.securityPluginSetup?.audit.asScoped(request);
+
+    const auth = await Authorization.create({
+      request,
+      securityAuth: this.options.securityPluginStart?.authz,
+      getSpace: this.options.getSpace,
+      features: this.options.featuresPluginStart,
+      auditLogger: new AuthorizationAuditLogger(auditLogger),
+      logger: this.logger,
+    });
+
+    const caseService = new CasesService(this.logger, this.options?.securityPluginStart?.authc);
+    const userInfo = caseService.getUser({ request });
+
+    return createCasesClient({
+      alertsService: new AlertService(),
+      scopedClusterClient,
+      unsecuredSavedObjectsClient: savedObjectsService.getScopedClient(request, {
+        includedHiddenTypes: SAVED_OBJECT_TYPES,
+        // this tells the security plugin to not perform SO authorization and audit logging since we are handling
+        // that manually using our Authorization class and audit logger.
+        excludedWrappers: ['security'],
+      }),
+      // We only want these fields from the userInfo object
+      user: { username: userInfo.username, email: userInfo.email, full_name: userInfo.full_name },
+      caseService,
+      caseConfigureService: new CaseConfigureService(this.logger),
+      connectorMappingsService: new ConnectorMappingsService(this.logger),
+      userActionService: new CaseUserActionService(this.logger),
+      attachmentService: new AttachmentService(this.logger),
+      logger: this.logger,
+      authorization: auth,
+      actionsClient: await this.options.actionsPluginStart.getActionsClientWithRequest(request),
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/index.test.ts b/x-pack/plugins/cases/server/client/index.test.ts
deleted file mode 100644
index cfb30d6d5bcb6..0000000000000
--- a/x-pack/plugins/cases/server/client/index.test.ts
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  elasticsearchServiceMock,
-  loggingSystemMock,
-  savedObjectsClientMock,
-} from '../../../../../src/core/server/mocks';
-import { nullUser } from '../common';
-import {
-  connectorMappingsServiceMock,
-  createCaseServiceMock,
-  createConfigureServiceMock,
-  createUserActionServiceMock,
-  createAlertServiceMock,
-} from '../services/mocks';
-
-jest.mock('./client');
-import { CasesClientHandler } from './client';
-import { createExternalCasesClient } from './index';
-
-const logger = loggingSystemMock.create().get('case');
-const esClient = elasticsearchServiceMock.createElasticsearchClient();
-const caseConfigureService = createConfigureServiceMock();
-const alertsService = createAlertServiceMock();
-const caseService = createCaseServiceMock();
-const connectorMappingsService = connectorMappingsServiceMock();
-const savedObjectsClient = savedObjectsClientMock.create();
-const userActionService = createUserActionServiceMock();
-
-describe('createExternalCasesClient()', () => {
-  test('it creates the client correctly', async () => {
-    createExternalCasesClient({
-      scopedClusterClient: esClient,
-      alertsService,
-      caseConfigureService,
-      caseService,
-      connectorMappingsService,
-      user: nullUser,
-      savedObjectsClient,
-      userActionService,
-      logger,
-    });
-    expect(CasesClientHandler).toHaveBeenCalledTimes(1);
-  });
-});
diff --git a/x-pack/plugins/cases/server/client/index.ts b/x-pack/plugins/cases/server/client/index.ts
index fd7cae0edd2ea..7904e65ca6276 100644
--- a/x-pack/plugins/cases/server/client/index.ts
+++ b/x-pack/plugins/cases/server/client/index.ts
@@ -5,16 +5,8 @@
  * 2.0.
  */
 
-import { CasesClientFactoryArguments, CasesClient } from './types';
-import { CasesClientHandler } from './client';
-
-export { CasesClientHandler } from './client';
-export { CasesClient } from './types';
-
-/**
- * Create a CasesClientHandler to external services (other plugins).
- */
-export const createExternalCasesClient = (clientArgs: CasesClientFactoryArguments): CasesClient => {
-  const client = new CasesClientHandler(clientArgs);
-  return client;
-};
+export { CasesClient } from './client';
+export { CasesClientInternal } from './client_internal';
+export { CasesClientArgs } from './types';
+export { createCasesClient } from './client';
+export { createCasesClientInternal } from './client_internal';
diff --git a/x-pack/plugins/cases/server/client/mocks.ts b/x-pack/plugins/cases/server/client/mocks.ts
index cb6ef678b6cc2..10b298995f87a 100644
--- a/x-pack/plugins/cases/server/client/mocks.ts
+++ b/x-pack/plugins/cases/server/client/mocks.ts
@@ -5,87 +5,111 @@
  * 2.0.
  */
 
-import { ElasticsearchClient } from 'kibana/server';
-import { DeeplyMockedKeys } from '@kbn/utility-types/target/jest';
-import { loggingSystemMock, elasticsearchServiceMock } from '../../../../../src/core/server/mocks';
-import {
-  AlertServiceContract,
-  CaseConfigureService,
-  CaseService,
-  CaseUserActionServiceSetup,
-  ConnectorMappingsService,
-} from '../services';
-import { CasesClient } from './types';
-import { authenticationMock } from '../routes/api/__fixtures__';
-import { createExternalCasesClient } from '.';
-
-export type CasesClientPluginContractMock = jest.Mocked<CasesClient>;
-export const createExternalCasesClientMock = (): CasesClientPluginContractMock => ({
-  addComment: jest.fn(),
-  create: jest.fn(),
-  get: jest.fn(),
-  push: jest.fn(),
-  getAlerts: jest.fn(),
-  getFields: jest.fn(),
-  getMappings: jest.fn(),
-  getUserActions: jest.fn(),
-  update: jest.fn(),
-  updateAlertsStatus: jest.fn(),
-  getCaseIdsByAlertId: jest.fn(),
-});
-
-export const createCasesClientWithMockSavedObjectsClient = async ({
-  savedObjectsClient,
-  badAuth = false,
-  omitFromContext = [],
-}: {
-  savedObjectsClient: any;
-  badAuth?: boolean;
-  omitFromContext?: string[];
-}): Promise<{
-  client: CasesClient;
-  services: {
-    userActionService: jest.Mocked<CaseUserActionServiceSetup>;
-    alertsService: jest.Mocked<AlertServiceContract>;
+import { PublicContract, PublicMethodsOf } from '@kbn/utility-types';
+
+import { CasesClient } from '.';
+import { AttachmentsSubClient } from './attachments/client';
+import { CasesSubClient } from './cases/client';
+import { ConfigureSubClient } from './configure/client';
+import { CasesClientFactory } from './factory';
+import { StatsSubClient } from './stats/client';
+import { SubCasesClient } from './sub_cases/client';
+import { UserActionsSubClient } from './user_actions/client';
+
+type CasesSubClientMock = jest.Mocked<CasesSubClient>;
+
+const createCasesSubClientMock = (): CasesSubClientMock => {
+  return {
+    create: jest.fn(),
+    find: jest.fn(),
+    get: jest.fn(),
+    push: jest.fn(),
+    update: jest.fn(),
+    delete: jest.fn(),
+    getTags: jest.fn(),
+    getReporters: jest.fn(),
+    getCaseIDsByAlertID: jest.fn(),
   };
-  esClient: DeeplyMockedKeys<ElasticsearchClient>;
-}> => {
-  const esClient = elasticsearchServiceMock.createElasticsearchClient();
-  const log = loggingSystemMock.create().get('case');
-
-  const auth = badAuth ? authenticationMock.createInvalid() : authenticationMock.create();
-  const caseService = new CaseService(log, auth);
-  const caseConfigureServicePlugin = new CaseConfigureService(log);
-  const connectorMappingsServicePlugin = new ConnectorMappingsService(log);
-
-  const caseConfigureService = await caseConfigureServicePlugin.setup();
-
-  const connectorMappingsService = await connectorMappingsServicePlugin.setup();
-  const userActionService = {
-    getUserActions: jest.fn(),
-    postUserActions: jest.fn(),
+};
+
+type AttachmentsSubClientMock = jest.Mocked<AttachmentsSubClient>;
+
+const createAttachmentsSubClientMock = (): AttachmentsSubClientMock => {
+  return {
+    add: jest.fn(),
+    deleteAll: jest.fn(),
+    delete: jest.fn(),
+    find: jest.fn(),
+    getAll: jest.fn(),
+    get: jest.fn(),
+    update: jest.fn(),
   };
+};
 
-  const alertsService = {
-    initialize: jest.fn(),
-    updateAlertsStatus: jest.fn(),
-    getAlerts: jest.fn(),
+type UserActionsSubClientMock = jest.Mocked<UserActionsSubClient>;
+
+const createUserActionsSubClientMock = (): UserActionsSubClientMock => {
+  return {
+    getAll: jest.fn(),
+  };
+};
+
+type SubCasesClientMock = jest.Mocked<SubCasesClient>;
+
+const createSubCasesClientMock = (): SubCasesClientMock => {
+  return {
+    delete: jest.fn(),
+    find: jest.fn(),
+    get: jest.fn(),
+    update: jest.fn(),
   };
+};
+
+type ConfigureSubClientMock = jest.Mocked<ConfigureSubClient>;
 
-  const casesClient = createExternalCasesClient({
-    savedObjectsClient,
-    user: auth.getCurrentUser(),
-    caseService,
-    caseConfigureService,
-    connectorMappingsService,
-    userActionService,
-    alertsService,
-    scopedClusterClient: esClient,
-    logger: log,
-  });
+const createConfigureSubClientMock = (): ConfigureSubClientMock => {
   return {
-    client: casesClient,
-    services: { userActionService, alertsService },
-    esClient,
+    get: jest.fn(),
+    getConnectors: jest.fn(),
+    update: jest.fn(),
+    create: jest.fn(),
   };
 };
+
+type StatsSubClientMock = jest.Mocked<StatsSubClient>;
+
+const createStatsSubClientMock = (): StatsSubClientMock => {
+  return {
+    getStatusTotalsByType: jest.fn(),
+  };
+};
+
+export interface CasesClientMock extends CasesClient {
+  cases: CasesSubClientMock;
+  attachments: AttachmentsSubClientMock;
+  userActions: UserActionsSubClientMock;
+  subCases: SubCasesClientMock;
+}
+
+export const createCasesClientMock = (): CasesClientMock => {
+  const client: PublicContract<CasesClient> = {
+    cases: createCasesSubClientMock(),
+    attachments: createAttachmentsSubClientMock(),
+    userActions: createUserActionsSubClientMock(),
+    subCases: createSubCasesClientMock(),
+    configure: createConfigureSubClientMock(),
+    stats: createStatsSubClientMock(),
+  };
+  return (client as unknown) as CasesClientMock;
+};
+
+export type CasesClientFactoryMock = jest.Mocked<CasesClientFactory>;
+
+export const createCasesClientFactory = (): CasesClientFactoryMock => {
+  const factory: PublicMethodsOf<CasesClientFactory> = {
+    initialize: jest.fn(),
+    create: jest.fn(),
+  };
+
+  return (factory as unknown) as CasesClientFactoryMock;
+};
diff --git a/x-pack/plugins/cases/server/client/stats/client.ts b/x-pack/plugins/cases/server/client/stats/client.ts
new file mode 100644
index 0000000000000..4fc8be4ccbfb2
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/stats/client.ts
@@ -0,0 +1,91 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { CasesClientArgs } from '..';
+import {
+  CasesStatusRequest,
+  CasesStatusResponse,
+  CasesStatusResponseRt,
+  caseStatuses,
+  throwErrors,
+  excess,
+  CasesStatusRequestRt,
+} from '../../../common/api';
+import { Operations } from '../../authorization';
+import { createCaseError } from '../../common/error';
+import { constructQueryOptions } from '../utils';
+
+/**
+ * Statistics API contract.
+ */
+export interface StatsSubClient {
+  /**
+   * Retrieves the total number of open, closed, and in-progress cases.
+   */
+  getStatusTotalsByType(params: CasesStatusRequest): Promise<CasesStatusResponse>;
+}
+
+/**
+ * Creates the interface for retrieving the number of open, closed, and in progress cases.
+ *
+ * @ignore
+ */
+export function createStatsSubClient(clientArgs: CasesClientArgs): StatsSubClient {
+  return Object.freeze({
+    getStatusTotalsByType: (params: CasesStatusRequest) =>
+      getStatusTotalsByType(params, clientArgs),
+  });
+}
+
+async function getStatusTotalsByType(
+  params: CasesStatusRequest,
+  clientArgs: CasesClientArgs
+): Promise<CasesStatusResponse> {
+  const { unsecuredSavedObjectsClient, caseService, logger, authorization } = clientArgs;
+
+  try {
+    const queryParams = pipe(
+      excess(CasesStatusRequestRt).decode(params),
+      fold(throwErrors(Boom.badRequest), identity)
+    );
+
+    const {
+      filter: authorizationFilter,
+      ensureSavedObjectsAreAuthorized,
+    } = await authorization.getAuthorizationFilter(Operations.getCaseStatuses);
+
+    // casesStatuses are bounded by us. No need to limit concurrent calls.
+    const [openCases, inProgressCases, closedCases] = await Promise.all([
+      ...caseStatuses.map((status) => {
+        const statusQuery = constructQueryOptions({
+          owner: queryParams.owner,
+          status,
+          authorizationFilter,
+        });
+        return caseService.findCaseStatusStats({
+          unsecuredSavedObjectsClient,
+          caseOptions: statusQuery.case,
+          subCaseOptions: statusQuery.subCase,
+          ensureSavedObjectsAreAuthorized,
+        });
+      }),
+    ]);
+
+    return CasesStatusResponseRt.encode({
+      count_open_cases: openCases,
+      count_in_progress_cases: inProgressCases,
+      count_closed_cases: closedCases,
+    });
+  } catch (error) {
+    throw createCaseError({ message: `Failed to get status stats: ${error}`, error, logger });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/sub_cases/client.ts b/x-pack/plugins/cases/server/client/sub_cases/client.ts
new file mode 100644
index 0000000000000..9a7dad77909e9
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/sub_cases/client.ts
@@ -0,0 +1,276 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 pMap from 'p-map';
+import Boom from '@hapi/boom';
+
+import { SavedObject } from 'kibana/server';
+import {
+  caseStatuses,
+  CommentAttributes,
+  SubCaseResponse,
+  SubCaseResponseRt,
+  SubCasesFindRequest,
+  SubCasesFindResponse,
+  SubCasesFindResponseRt,
+  SubCasesPatchRequest,
+} from '../../../common/api';
+import { CasesClientArgs, CasesClientInternal } from '..';
+import { countAlertsForID, flattenSubCaseSavedObject, transformSubCases } from '../../common';
+import { createCaseError } from '../../common/error';
+import { CASE_SAVED_OBJECT, MAX_CONCURRENT_SEARCHES } from '../../../common/constants';
+import { buildCaseUserActionItem } from '../../services/user_actions/helpers';
+import { constructQueryOptions } from '../utils';
+import { defaultPage, defaultPerPage } from '../../routes/api';
+import { update } from './update';
+import { ISubCaseResponse, ISubCasesFindResponse, ISubCasesResponse } from '../typedoc_interfaces';
+
+interface FindArgs {
+  /**
+   * The case ID for finding associated sub cases
+   */
+  caseID: string;
+  /**
+   * Options for filtering the returned sub cases
+   */
+  queryParams: SubCasesFindRequest;
+}
+
+interface GetArgs {
+  /**
+   * A flag to include the attachments with the results
+   */
+  includeComments: boolean;
+  /**
+   * The ID of the sub case to retrieve
+   */
+  id: string;
+}
+
+/**
+ * The API routes for interacting with sub cases.
+ *
+ * @public
+ */
+export interface SubCasesClient {
+  /**
+   * Deletes the specified entities and their attachments.
+   */
+  delete(ids: string[]): Promise<void>;
+  /**
+   * Retrieves the sub cases matching the search criteria.
+   */
+  find(findArgs: FindArgs): Promise<ISubCasesFindResponse>;
+  /**
+   * Retrieves a single sub case.
+   */
+  get(getArgs: GetArgs): Promise<ISubCaseResponse>;
+  /**
+   * Updates the specified sub cases to the new values included in the request.
+   */
+  update(subCases: SubCasesPatchRequest): Promise<ISubCasesResponse>;
+}
+
+/**
+ * Creates a client for handling the different exposed API routes for interacting with sub cases.
+ *
+ * @ignore
+ */
+export function createSubCasesClient(
+  clientArgs: CasesClientArgs,
+  casesClientInternal: CasesClientInternal
+): SubCasesClient {
+  return Object.freeze({
+    delete: (ids: string[]) => deleteSubCase(ids, clientArgs),
+    find: (findArgs: FindArgs) => find(findArgs, clientArgs),
+    get: (getArgs: GetArgs) => get(getArgs, clientArgs),
+    update: (subCases: SubCasesPatchRequest) =>
+      update({ subCases, clientArgs, casesClientInternal }),
+  });
+}
+
+async function deleteSubCase(ids: string[], clientArgs: CasesClientArgs): Promise<void> {
+  try {
+    const {
+      unsecuredSavedObjectsClient,
+      user,
+      userActionService,
+      caseService,
+      attachmentService,
+    } = clientArgs;
+
+    const [comments, subCases] = await Promise.all([
+      caseService.getAllSubCaseComments({ unsecuredSavedObjectsClient, id: ids }),
+      caseService.getSubCases({ unsecuredSavedObjectsClient, ids }),
+    ]);
+
+    const subCaseErrors = subCases.saved_objects.filter((subCase) => subCase.error !== undefined);
+
+    if (subCaseErrors.length > 0) {
+      throw Boom.notFound(
+        `These sub cases ${subCaseErrors
+          .map((c) => c.id)
+          .join(', ')} do not exist. Please check you have the correct ids.`
+      );
+    }
+
+    const subCaseIDToParentID = subCases.saved_objects.reduce((acc, subCase) => {
+      const parentID = subCase.references.find((ref) => ref.type === CASE_SAVED_OBJECT);
+      acc.set(subCase.id, parentID?.id);
+      return acc;
+    }, new Map<string, string | undefined>());
+
+    const deleteCommentMapper = async (comment: SavedObject<CommentAttributes>) =>
+      attachmentService.delete({ unsecuredSavedObjectsClient, attachmentId: comment.id });
+
+    const deleteSubCasesMapper = async (id: string) =>
+      caseService.deleteSubCase(unsecuredSavedObjectsClient, id);
+
+    // Ensuring we don't too many concurrent deletions running.
+    await pMap(comments.saved_objects, deleteCommentMapper, {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    });
+
+    await pMap(ids, deleteSubCasesMapper, {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    });
+
+    const deleteDate = new Date().toISOString();
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: subCases.saved_objects.map((subCase) =>
+        buildCaseUserActionItem({
+          action: 'delete',
+          actionAt: deleteDate,
+          actionBy: user,
+          // if for some reason the sub case didn't have a reference to its parent, we'll still log a user action
+          // but we won't have the case ID
+          caseId: subCaseIDToParentID.get(subCase.id) ?? '',
+          subCaseId: subCase.id,
+          fields: ['sub_case', 'comment', 'status'],
+          owner: subCase.attributes.owner,
+        })
+      ),
+    });
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to delete sub cases ids: ${JSON.stringify(ids)}: ${error}`,
+      error,
+      logger: clientArgs.logger,
+    });
+  }
+}
+
+async function find(
+  { caseID, queryParams }: FindArgs,
+  clientArgs: CasesClientArgs
+): Promise<SubCasesFindResponse> {
+  try {
+    const { unsecuredSavedObjectsClient, caseService } = clientArgs;
+
+    const ids = [caseID];
+    const { subCase: subCaseQueryOptions } = constructQueryOptions({
+      status: queryParams.status,
+      sortByField: queryParams.sortField,
+    });
+
+    const subCases = await caseService.findSubCasesGroupByCase({
+      unsecuredSavedObjectsClient,
+      ids,
+      options: {
+        sortField: 'created_at',
+        page: defaultPage,
+        perPage: defaultPerPage,
+        ...queryParams,
+        ...subCaseQueryOptions,
+      },
+    });
+
+    // casesStatuses are bounded by us. No need to limit concurrent calls.
+    const [open, inProgress, closed] = await Promise.all([
+      ...caseStatuses.map((status) => {
+        const { subCase: statusQueryOptions } = constructQueryOptions({
+          status,
+          sortByField: queryParams.sortField,
+        });
+        return caseService.findSubCaseStatusStats({
+          unsecuredSavedObjectsClient,
+          options: statusQueryOptions ?? {},
+          ids,
+        });
+      }),
+    ]);
+
+    return SubCasesFindResponseRt.encode(
+      transformSubCases({
+        page: subCases.page,
+        perPage: subCases.perPage,
+        total: subCases.total,
+        subCasesMap: subCases.subCasesMap,
+        open,
+        inProgress,
+        closed,
+      })
+    );
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to find sub cases for case id: ${caseID}: ${error}`,
+      error,
+      logger: clientArgs.logger,
+    });
+  }
+}
+
+async function get(
+  { includeComments, id }: GetArgs,
+  clientArgs: CasesClientArgs
+): Promise<SubCaseResponse> {
+  try {
+    const { unsecuredSavedObjectsClient, caseService } = clientArgs;
+
+    const subCase = await caseService.getSubCase({
+      unsecuredSavedObjectsClient,
+      id,
+    });
+
+    if (!includeComments) {
+      return SubCaseResponseRt.encode(
+        flattenSubCaseSavedObject({
+          savedObject: subCase,
+        })
+      );
+    }
+
+    const theComments = await caseService.getAllSubCaseComments({
+      unsecuredSavedObjectsClient,
+      id,
+      options: {
+        sortField: 'created_at',
+        sortOrder: 'asc',
+      },
+    });
+
+    return SubCaseResponseRt.encode(
+      flattenSubCaseSavedObject({
+        savedObject: subCase,
+        comments: theComments.saved_objects,
+        totalComment: theComments.total,
+        totalAlerts: countAlertsForID({
+          comments: theComments,
+          id,
+        }),
+      })
+    );
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to get sub case id: ${id}: ${error}`,
+      error,
+      logger: clientArgs.logger,
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/sub_cases/update.ts b/x-pack/plugins/cases/server/client/sub_cases/update.ts
new file mode 100644
index 0000000000000..b49d36d7a27d4
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/sub_cases/update.ts
@@ -0,0 +1,408 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 {
+  SavedObjectsClientContract,
+  SavedObject,
+  SavedObjectsFindResponse,
+  Logger,
+} from 'kibana/server';
+
+import { nodeBuilder } from '../../../../../../src/plugins/data/common';
+import { CasesService } from '../../services';
+import {
+  CaseStatuses,
+  SubCasesPatchRequest,
+  SubCasesPatchRequestRt,
+  CommentType,
+  excess,
+  throwErrors,
+  SubCasesResponse,
+  SubCasePatchRequest,
+  SubCaseAttributes,
+  ESCaseAttributes,
+  SubCaseResponse,
+  SubCasesResponseRt,
+  User,
+  CommentAttributes,
+} from '../../../common/api';
+import { CASE_COMMENT_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../../common/constants';
+import { getCaseToUpdate } from '../utils';
+import { buildSubCaseUserActions } from '../../services/user_actions/helpers';
+import {
+  createAlertUpdateRequest,
+  isCommentRequestTypeAlertOrGenAlert,
+  flattenSubCaseSavedObject,
+} from '../../common';
+import { createCaseError } from '../../common/error';
+import { UpdateAlertRequest } from '../../client/alerts/client';
+import { CasesClientArgs } from '../types';
+import { CasesClientInternal } from '../client_internal';
+
+function checkNonExistingOrConflict(
+  toUpdate: SubCasePatchRequest[],
+  fromStorage: Map<string, SavedObject<SubCaseAttributes>>
+) {
+  const nonExistingSubCases: SubCasePatchRequest[] = [];
+  const conflictedSubCases: SubCasePatchRequest[] = [];
+  for (const subCaseToUpdate of toUpdate) {
+    const bulkEntry = fromStorage.get(subCaseToUpdate.id);
+
+    if (bulkEntry && bulkEntry.error) {
+      nonExistingSubCases.push(subCaseToUpdate);
+    }
+
+    if (!bulkEntry || bulkEntry.version !== subCaseToUpdate.version) {
+      conflictedSubCases.push(subCaseToUpdate);
+    }
+  }
+
+  if (nonExistingSubCases.length > 0) {
+    throw Boom.notFound(
+      `These sub cases ${nonExistingSubCases
+        .map((c) => c.id)
+        .join(', ')} do not exist. Please check you have the correct ids.`
+    );
+  }
+
+  if (conflictedSubCases.length > 0) {
+    throw Boom.conflict(
+      `These sub cases ${conflictedSubCases
+        .map((c) => c.id)
+        .join(', ')} has been updated. Please refresh before saving additional updates.`
+    );
+  }
+}
+
+interface GetParentIDsResult {
+  ids: string[];
+  parentIDToSubID: Map<string, string[]>;
+}
+
+function getParentIDs({
+  subCasesMap,
+  subCaseIDs,
+}: {
+  subCasesMap: Map<string, SavedObject<SubCaseAttributes>>;
+  subCaseIDs: string[];
+}): GetParentIDsResult {
+  return subCaseIDs.reduce<GetParentIDsResult>(
+    (acc, id) => {
+      const subCase = subCasesMap.get(id);
+      if (subCase && subCase.references.length > 0) {
+        const parentID = subCase.references[0].id;
+        acc.ids.push(parentID);
+        let subIDs = acc.parentIDToSubID.get(parentID);
+        if (subIDs === undefined) {
+          subIDs = [];
+        }
+        subIDs.push(id);
+        acc.parentIDToSubID.set(parentID, subIDs);
+      }
+      return acc;
+    },
+    { ids: [], parentIDToSubID: new Map<string, string[]>() }
+  );
+}
+
+async function getParentCases({
+  caseService,
+  unsecuredSavedObjectsClient,
+  subCaseIDs,
+  subCasesMap,
+}: {
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  subCaseIDs: string[];
+  subCasesMap: Map<string, SavedObject<SubCaseAttributes>>;
+}): Promise<Map<string, SavedObject<ESCaseAttributes>>> {
+  const parentIDInfo = getParentIDs({ subCaseIDs, subCasesMap });
+
+  const parentCases = await caseService.getCases({
+    unsecuredSavedObjectsClient,
+    caseIds: parentIDInfo.ids,
+  });
+
+  const parentCaseErrors = parentCases.saved_objects.filter((so) => so.error !== undefined);
+
+  if (parentCaseErrors.length > 0) {
+    throw Boom.badRequest(
+      `Unable to find parent cases: ${parentCaseErrors
+        .map((c) => c.id)
+        .join(', ')} for sub cases: ${subCaseIDs.join(', ')}`
+    );
+  }
+
+  return parentCases.saved_objects.reduce((acc, so) => {
+    const subCaseIDsWithParent = parentIDInfo.parentIDToSubID.get(so.id);
+    subCaseIDsWithParent?.forEach((subCaseId) => {
+      acc.set(subCaseId, so);
+    });
+    return acc;
+  }, new Map<string, SavedObject<ESCaseAttributes>>());
+}
+
+function getValidUpdateRequests(
+  toUpdate: SubCasePatchRequest[],
+  subCasesMap: Map<string, SavedObject<SubCaseAttributes>>
+): SubCasePatchRequest[] {
+  const validatedSubCaseAttributes: SubCasePatchRequest[] = toUpdate.map((updateCase) => {
+    const currentCase = subCasesMap.get(updateCase.id);
+    return currentCase != null
+      ? getCaseToUpdate(currentCase.attributes, {
+          ...updateCase,
+        })
+      : { id: updateCase.id, version: updateCase.version };
+  });
+
+  return validatedSubCaseAttributes.filter((updateCase: SubCasePatchRequest) => {
+    const { id, version, ...updateCaseAttributes } = updateCase;
+    return Object.keys(updateCaseAttributes).length > 0;
+  });
+}
+
+/**
+ * Get the id from a reference in a comment for a sub case
+ */
+function getID(comment: SavedObject<CommentAttributes>): string | undefined {
+  return comment.references.find((ref) => ref.type === SUB_CASE_SAVED_OBJECT)?.id;
+}
+
+/**
+ * Get all the alert comments for a set of sub cases
+ */
+async function getAlertComments({
+  subCasesToSync,
+  caseService,
+  unsecuredSavedObjectsClient,
+}: {
+  subCasesToSync: SubCasePatchRequest[];
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+}): Promise<SavedObjectsFindResponse<CommentAttributes>> {
+  const ids = subCasesToSync.map((subCase) => subCase.id);
+  return caseService.getAllSubCaseComments({
+    unsecuredSavedObjectsClient,
+    id: ids,
+    options: {
+      filter: nodeBuilder.or([
+        nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.type`, CommentType.alert),
+        nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.type`, CommentType.generatedAlert),
+      ]),
+    },
+  });
+}
+
+/**
+ * Updates the status of alerts for the specified sub cases.
+ */
+async function updateAlerts({
+  caseService,
+  unsecuredSavedObjectsClient,
+  casesClientInternal,
+  logger,
+  subCasesToSync,
+}: {
+  caseService: CasesService;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  casesClientInternal: CasesClientInternal;
+  logger: Logger;
+  subCasesToSync: SubCasePatchRequest[];
+}) {
+  try {
+    const subCasesToSyncMap = subCasesToSync.reduce((acc, subCase) => {
+      acc.set(subCase.id, subCase);
+      return acc;
+    }, new Map<string, SubCasePatchRequest>());
+    // get all the alerts for all sub cases that need to be synced
+    const totalAlerts = await getAlertComments({
+      caseService,
+      unsecuredSavedObjectsClient,
+      subCasesToSync,
+    });
+    // create a map of the status (open, closed, etc) to alert info that needs to be updated
+    const alertsToUpdate = totalAlerts.saved_objects.reduce(
+      (acc: UpdateAlertRequest[], alertComment) => {
+        if (isCommentRequestTypeAlertOrGenAlert(alertComment.attributes)) {
+          const id = getID(alertComment);
+          const status =
+            id !== undefined
+              ? subCasesToSyncMap.get(id)?.status ?? CaseStatuses.open
+              : CaseStatuses.open;
+
+          acc.push(...createAlertUpdateRequest({ comment: alertComment.attributes, status }));
+        }
+        return acc;
+      },
+      []
+    );
+
+    await casesClientInternal.alerts.updateStatus({ alerts: alertsToUpdate });
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to update alert status while updating sub cases: ${JSON.stringify(
+        subCasesToSync
+      )}: ${error}`,
+      logger,
+      error,
+    });
+  }
+}
+
+/**
+ * Handles updating the fields in a sub case.
+ */
+export async function update({
+  subCases,
+  clientArgs,
+  casesClientInternal,
+}: {
+  subCases: SubCasesPatchRequest;
+  clientArgs: CasesClientArgs;
+  casesClientInternal: CasesClientInternal;
+}): Promise<SubCasesResponse> {
+  const query = pipe(
+    excess(SubCasesPatchRequestRt).decode(subCases),
+    fold(throwErrors(Boom.badRequest), identity)
+  );
+
+  try {
+    const { unsecuredSavedObjectsClient, user, caseService, userActionService } = clientArgs;
+
+    const bulkSubCases = await caseService.getSubCases({
+      unsecuredSavedObjectsClient,
+      ids: query.subCases.map((q) => q.id),
+    });
+
+    const subCasesMap = bulkSubCases.saved_objects.reduce((acc, so) => {
+      acc.set(so.id, so);
+      return acc;
+    }, new Map<string, SavedObject<SubCaseAttributes>>());
+
+    checkNonExistingOrConflict(query.subCases, subCasesMap);
+
+    const nonEmptySubCaseRequests = getValidUpdateRequests(query.subCases, subCasesMap);
+
+    if (nonEmptySubCaseRequests.length <= 0) {
+      throw Boom.notAcceptable('All update fields are identical to current version.');
+    }
+
+    const subIDToParentCase = await getParentCases({
+      unsecuredSavedObjectsClient,
+      caseService,
+      subCaseIDs: nonEmptySubCaseRequests.map((subCase) => subCase.id),
+      subCasesMap,
+    });
+
+    const updatedAt = new Date().toISOString();
+    const updatedCases = await caseService.patchSubCases({
+      unsecuredSavedObjectsClient,
+      subCases: nonEmptySubCaseRequests.map((thisCase) => {
+        const { id: subCaseId, version, ...updateSubCaseAttributes } = thisCase;
+        let closedInfo: { closed_at: string | null; closed_by: User | null } = {
+          closed_at: null,
+          closed_by: null,
+        };
+
+        if (
+          updateSubCaseAttributes.status &&
+          updateSubCaseAttributes.status === CaseStatuses.closed
+        ) {
+          closedInfo = {
+            closed_at: updatedAt,
+            closed_by: user,
+          };
+        } else if (
+          updateSubCaseAttributes.status &&
+          (updateSubCaseAttributes.status === CaseStatuses.open ||
+            updateSubCaseAttributes.status === CaseStatuses['in-progress'])
+        ) {
+          closedInfo = {
+            closed_at: null,
+            closed_by: null,
+          };
+        }
+        return {
+          subCaseId,
+          updatedAttributes: {
+            ...updateSubCaseAttributes,
+            ...closedInfo,
+            updated_at: updatedAt,
+            updated_by: user,
+          },
+          version,
+        };
+      }),
+    });
+
+    const subCasesToSyncAlertsFor = nonEmptySubCaseRequests.filter((subCaseToUpdate) => {
+      const storedSubCase = subCasesMap.get(subCaseToUpdate.id);
+      const parentCase = subIDToParentCase.get(subCaseToUpdate.id);
+      return (
+        storedSubCase !== undefined &&
+        subCaseToUpdate.status !== undefined &&
+        storedSubCase.attributes.status !== subCaseToUpdate.status &&
+        parentCase?.attributes.settings.syncAlerts
+      );
+    });
+
+    await updateAlerts({
+      caseService,
+      unsecuredSavedObjectsClient,
+      casesClientInternal,
+      subCasesToSync: subCasesToSyncAlertsFor,
+      logger: clientArgs.logger,
+    });
+
+    const returnUpdatedSubCases = updatedCases.saved_objects.reduce<SubCaseResponse[]>(
+      (acc, updatedSO) => {
+        const originalSubCase = subCasesMap.get(updatedSO.id);
+        if (originalSubCase) {
+          acc.push(
+            flattenSubCaseSavedObject({
+              savedObject: {
+                ...originalSubCase,
+                ...updatedSO,
+                attributes: { ...originalSubCase.attributes, ...updatedSO.attributes },
+                references: originalSubCase.references,
+                version: updatedSO.version ?? originalSubCase.version,
+              },
+            })
+          );
+        }
+        return acc;
+      },
+      []
+    );
+
+    await userActionService.bulkCreate({
+      unsecuredSavedObjectsClient,
+      actions: buildSubCaseUserActions({
+        originalSubCases: bulkSubCases.saved_objects,
+        updatedSubCases: updatedCases.saved_objects,
+        actionDate: updatedAt,
+        actionBy: user,
+      }),
+    });
+
+    return SubCasesResponseRt.encode(returnUpdatedSubCases);
+  } catch (error) {
+    const idVersions = query.subCases.map((subCase) => ({
+      id: subCase.id,
+      version: subCase.version,
+    }));
+    throw createCaseError({
+      message: `Failed to update sub cases: ${JSON.stringify(idVersions)}: ${error}`,
+      error,
+      logger: clientArgs.logger,
+    });
+  }
+}
diff --git a/x-pack/plugins/cases/server/client/typedoc_interfaces.ts b/x-pack/plugins/cases/server/client/typedoc_interfaces.ts
new file mode 100644
index 0000000000000..bf444ee9420ed
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/typedoc_interfaces.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.
+ */
+
+/**
+ * This file defines simpler types for typedoc. This helps reduce the type alias expansion for the io-ts types because it
+ * can be very large. These types are equivalent to the io-ts aliases.
+ * @module
+ */
+
+/* eslint-disable @typescript-eslint/no-empty-interface */
+
+import {
+  AllCommentsResponse,
+  CasePostRequest,
+  CaseResponse,
+  CasesConfigurePatch,
+  CasesConfigureRequest,
+  CasesConfigureResponse,
+  CasesFindRequest,
+  CasesFindResponse,
+  CasesPatchRequest,
+  CasesResponse,
+  CaseUserActionsResponse,
+  CommentsResponse,
+  SubCaseResponse,
+  SubCasesFindResponse,
+  SubCasesResponse,
+} from '../../common';
+
+/**
+ * These are simply to make typedoc not attempt to expand the type aliases. If it attempts to expand them
+ * the docs are huge.
+ */
+
+export interface ICasePostRequest extends CasePostRequest {}
+export interface ICasesFindRequest extends CasesFindRequest {}
+export interface ICasesPatchRequest extends CasesPatchRequest {}
+export interface ICaseResponse extends CaseResponse {}
+export interface ICasesResponse extends CasesResponse {}
+export interface ICasesFindResponse extends CasesFindResponse {}
+
+export interface ICasesConfigureResponse extends CasesConfigureResponse {}
+export interface ICasesConfigureRequest extends CasesConfigureRequest {}
+export interface ICasesConfigurePatch extends CasesConfigurePatch {}
+
+export interface ICommentsResponse extends CommentsResponse {}
+export interface IAllCommentsResponse extends AllCommentsResponse {}
+
+export interface ISubCasesFindResponse extends SubCasesFindResponse {}
+export interface ISubCaseResponse extends SubCaseResponse {}
+export interface ISubCasesResponse extends SubCasesResponse {}
+
+export interface ICaseUserActionsResponse extends CaseUserActionsResponse {}
diff --git a/x-pack/plugins/cases/server/client/types.ts b/x-pack/plugins/cases/server/client/types.ts
index ca4e8790bf2b0..f6b229b94800d 100644
--- a/x-pack/plugins/cases/server/client/types.ts
+++ b/x-pack/plugins/cases/server/client/types.ts
@@ -5,116 +5,34 @@
  * 2.0.
  */
 
+import type { PublicMethodsOf } from '@kbn/utility-types';
 import { ElasticsearchClient, SavedObjectsClientContract, Logger } from 'kibana/server';
-import { ActionsClient } from '../../../actions/server';
-import {
-  CasePostRequest,
-  CaseResponse,
-  CasesPatchRequest,
-  CasesResponse,
-  CaseStatuses,
-  CommentRequest,
-  ConnectorMappingsAttributes,
-  GetFieldsResponse,
-  CaseUserActionsResponse,
-  User,
-} from '../../common';
-import { AlertInfo } from '../common';
+import { User } from '../../common/api';
+import { Authorization } from '../authorization/authorization';
 import {
-  CaseConfigureServiceSetup,
-  CaseServiceSetup,
-  CaseUserActionServiceSetup,
   AlertServiceContract,
+  CaseConfigureService,
+  CasesService,
+  CaseUserActionService,
+  ConnectorMappingsService,
+  AttachmentService,
 } from '../services';
-import { ConnectorMappingsServiceSetup } from '../services/connector_mappings';
-import { CasesClientGetAlertsResponse } from './alerts/types';
-
-export interface CasesClientGet {
-  id: string;
-  includeComments?: boolean;
-  includeSubCaseComments?: boolean;
-}
-
-export interface CasesClientPush {
-  actionsClient: ActionsClient;
-  caseId: string;
-  connectorId: string;
-}
-
-export interface CasesClientAddComment {
-  caseId: string;
-  comment: CommentRequest;
-}
-
-export interface CasesClientUpdateAlertsStatus {
-  alerts: UpdateAlertRequest[];
-}
-
-export interface CasesClientGetAlerts {
-  alertsInfo: AlertInfo[];
-}
-
-export interface CasesClientGetUserActions {
-  caseId: string;
-  subCaseId?: string;
-}
-
-export interface MappingsClient {
-  actionsClient: ActionsClient;
-  connectorId: string;
-  connectorType: string;
-}
-
-export interface CasesClientFactoryArguments {
-  scopedClusterClient: ElasticsearchClient;
-  caseConfigureService: CaseConfigureServiceSetup;
-  caseService: CaseServiceSetup;
-  connectorMappingsService: ConnectorMappingsServiceSetup;
-  user: User;
-  savedObjectsClient: SavedObjectsClientContract;
-  userActionService: CaseUserActionServiceSetup;
-  alertsService: AlertServiceContract;
-  logger: Logger;
-}
-
-export interface ConfigureFields {
-  actionsClient: ActionsClient;
-  connectorId: string;
-  connectorType: string;
-}
-
-export interface CasesClientGetCasesByAlert {
-  alertId: string;
-}
-
-/**
- * Defines the fields necessary to update an alert's status.
- */
-export interface UpdateAlertRequest {
-  id: string;
-  index: string;
-  status: CaseStatuses;
-}
+import { ActionsClient } from '../../../actions/server';
 
 /**
- * This represents the interface that other plugins can access.
+ * Parameters for initializing a cases client
  */
-export interface CasesClient {
-  addComment(args: CasesClientAddComment): Promise<CaseResponse>;
-  create(theCase: CasePostRequest): Promise<CaseResponse>;
-  get(args: CasesClientGet): Promise<CaseResponse>;
-  getAlerts(args: CasesClientGetAlerts): Promise<CasesClientGetAlertsResponse>;
-  getFields(args: ConfigureFields): Promise<GetFieldsResponse>;
-  getMappings(args: MappingsClient): Promise<ConnectorMappingsAttributes[]>;
-  getUserActions(args: CasesClientGetUserActions): Promise<CaseUserActionsResponse>;
-  push(args: CasesClientPush): Promise<CaseResponse>;
-  update(args: CasesPatchRequest): Promise<CasesResponse>;
-  updateAlertsStatus(args: CasesClientUpdateAlertsStatus): Promise<void>;
-  getCaseIdsByAlertId(args: CasesClientGetCasesByAlert): Promise<string[]>;
-}
-
-export interface MappingsClient {
-  actionsClient: ActionsClient;
-  connectorId: string;
-  connectorType: string;
+export interface CasesClientArgs {
+  readonly scopedClusterClient: ElasticsearchClient;
+  readonly caseConfigureService: CaseConfigureService;
+  readonly caseService: CasesService;
+  readonly connectorMappingsService: ConnectorMappingsService;
+  readonly user: User;
+  readonly unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  readonly userActionService: CaseUserActionService;
+  readonly alertsService: AlertServiceContract;
+  readonly attachmentService: AttachmentService;
+  readonly logger: Logger;
+  readonly authorization: PublicMethodsOf<Authorization>;
+  readonly actionsClient: PublicMethodsOf<ActionsClient>;
 }
diff --git a/x-pack/plugins/cases/server/client/user_actions/client.ts b/x-pack/plugins/cases/server/client/user_actions/client.ts
new file mode 100644
index 0000000000000..1e2fe8d4f4fca
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/user_actions/client.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 { ICaseUserActionsResponse } from '../typedoc_interfaces';
+import { CasesClientArgs } from '../types';
+import { get } from './get';
+
+/**
+ * Parameters for retrieving user actions for a particular case
+ */
+export interface UserActionGet {
+  /**
+   * The ID of the case
+   */
+  caseId: string;
+  /**
+   * If specified then a sub case will be used for finding all the user actions
+   */
+  subCaseId?: string;
+}
+
+/**
+ * API for interacting the actions performed by a user when interacting with the cases entities.
+ */
+export interface UserActionsSubClient {
+  /**
+   * Retrieves all user actions for a particular case.
+   */
+  getAll(clientArgs: UserActionGet): Promise<ICaseUserActionsResponse>;
+}
+
+/**
+ * Creates an API object for interacting with the user action entities
+ *
+ * @ignore
+ */
+export const createUserActionsSubClient = (clientArgs: CasesClientArgs): UserActionsSubClient => {
+  const attachmentSubClient: UserActionsSubClient = {
+    getAll: (params: UserActionGet) => get(params, clientArgs),
+  };
+
+  return Object.freeze(attachmentSubClient);
+};
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 79b8ef25ab0f6..a0dddc79ef4b4 100644
--- a/x-pack/plugins/cases/server/client/user_actions/get.ts
+++ b/x-pack/plugins/cases/server/client/user_actions/get.ts
@@ -5,49 +5,63 @@
  * 2.0.
  */
 
-import { SavedObjectsClientContract } from 'kibana/server';
 import {
+  SUB_CASE_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
   CASE_COMMENT_SAVED_OBJECT,
-  SUB_CASE_SAVED_OBJECT,
-} from '../../saved_object_types';
-import { CaseUserActionsResponseRt, CaseUserActionsResponse } from '../../../common';
-import { CaseUserActionServiceSetup } from '../../services';
+} from '../../../common/constants';
+import { CaseUserActionsResponseRt, CaseUserActionsResponse } from '../../../common/api';
+import { createCaseError } from '../../common/error';
+import { checkEnabledCaseConnectorOrThrow } from '../../common';
+import { CasesClientArgs } from '..';
+import { Operations } from '../../authorization';
+import { UserActionGet } from './client';
+
+export const get = async (
+  { caseId, subCaseId }: UserActionGet,
+  clientArgs: CasesClientArgs
+): Promise<CaseUserActionsResponse> => {
+  const { unsecuredSavedObjectsClient, userActionService, logger, authorization } = clientArgs;
+
+  try {
+    checkEnabledCaseConnectorOrThrow(subCaseId);
 
-interface GetParams {
-  savedObjectsClient: SavedObjectsClientContract;
-  userActionService: CaseUserActionServiceSetup;
-  caseId: string;
-  subCaseId?: string;
-}
+    const userActions = await userActionService.getAll({
+      unsecuredSavedObjectsClient,
+      caseId,
+      subCaseId,
+    });
 
-export const get = async ({
-  savedObjectsClient,
-  userActionService,
-  caseId,
-  subCaseId,
-}: GetParams): Promise<CaseUserActionsResponse> => {
-  const userActions = await userActionService.getUserActions({
-    client: savedObjectsClient,
-    caseId,
-    subCaseId,
-  });
+    await authorization.ensureAuthorized({
+      entities: userActions.saved_objects.map((userAction) => ({
+        owner: userAction.attributes.owner,
+        id: userAction.id,
+      })),
+      operation: Operations.getUserActions,
+    });
 
-  return CaseUserActionsResponseRt.encode(
-    userActions.saved_objects.reduce<CaseUserActionsResponse>((acc, ua) => {
-      if (subCaseId == null && ua.references.some((uar) => uar.type === SUB_CASE_SAVED_OBJECT)) {
-        return acc;
-      }
-      return [
-        ...acc,
-        {
-          ...ua.attributes,
-          action_id: ua.id,
-          case_id: ua.references.find((r) => r.type === CASE_SAVED_OBJECT)?.id ?? '',
-          comment_id: ua.references.find((r) => r.type === CASE_COMMENT_SAVED_OBJECT)?.id ?? null,
-          sub_case_id: ua.references.find((r) => r.type === SUB_CASE_SAVED_OBJECT)?.id ?? '',
-        },
-      ];
-    }, [])
-  );
+    return CaseUserActionsResponseRt.encode(
+      userActions.saved_objects.reduce<CaseUserActionsResponse>((acc, ua) => {
+        if (subCaseId == null && ua.references.some((uar) => uar.type === SUB_CASE_SAVED_OBJECT)) {
+          return acc;
+        }
+        return [
+          ...acc,
+          {
+            ...ua.attributes,
+            action_id: ua.id,
+            case_id: ua.references.find((r) => r.type === CASE_SAVED_OBJECT)?.id ?? '',
+            comment_id: ua.references.find((r) => r.type === CASE_COMMENT_SAVED_OBJECT)?.id ?? null,
+            sub_case_id: ua.references.find((r) => r.type === SUB_CASE_SAVED_OBJECT)?.id ?? '',
+          },
+        ];
+      }, [])
+    );
+  } catch (error) {
+    throw createCaseError({
+      message: `Failed to retrieve user actions case id: ${caseId} sub case id: ${subCaseId}: ${error}`,
+      error,
+      logger,
+    });
+  }
 };
diff --git a/x-pack/plugins/cases/server/client/utils.test.ts b/x-pack/plugins/cases/server/client/utils.test.ts
new file mode 100644
index 0000000000000..c8ed1f4f0efa6
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/utils.test.ts
@@ -0,0 +1,329 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { SavedObjectsFindResponse } from 'kibana/server';
+import {
+  CaseConnector,
+  CaseType,
+  ConnectorTypes,
+  ESCaseConnector,
+  ESCasesConfigureAttributes,
+} from '../../common/api';
+import { mockCaseConfigure } from '../routes/api/__fixtures__';
+import { newCase } from '../routes/api/__mocks__/request_responses';
+import {
+  transformCaseConnectorToEsConnector,
+  transformESConnectorToCaseConnector,
+  transformNewCase,
+} from '../common';
+import { getConnectorFromConfiguration, sortToSnake } from './utils';
+
+describe('utils', () => {
+  const caseConnector: CaseConnector = {
+    id: '123',
+    name: 'Jira',
+    type: ConnectorTypes.jira,
+    fields: { issueType: 'Task', priority: 'High', parent: null },
+  };
+
+  const esCaseConnector: ESCaseConnector = {
+    id: '123',
+    name: 'Jira',
+    type: ConnectorTypes.jira,
+    fields: [
+      { key: 'issueType', value: 'Task' },
+      { key: 'priority', value: 'High' },
+      { key: 'parent', value: null },
+    ],
+  };
+
+  const caseConfigure: SavedObjectsFindResponse<ESCasesConfigureAttributes> = {
+    saved_objects: [{ ...mockCaseConfigure[0], score: 0 }],
+    total: 1,
+    per_page: 20,
+    page: 1,
+  };
+
+  describe('transformCaseConnectorToEsConnector', () => {
+    it('transform correctly', () => {
+      expect(transformCaseConnectorToEsConnector(caseConnector)).toEqual(esCaseConnector);
+    });
+
+    it('transform correctly with null attributes', () => {
+      // @ts-ignore this is case the connector does not exist for old cases object or configurations
+      expect(transformCaseConnectorToEsConnector(null)).toEqual({
+        id: 'none',
+        name: 'none',
+        type: ConnectorTypes.none,
+        fields: [],
+      });
+    });
+  });
+
+  describe('transformESConnectorToCaseConnector', () => {
+    it('transform correctly', () => {
+      expect(transformESConnectorToCaseConnector(esCaseConnector)).toEqual(caseConnector);
+    });
+
+    it('transform correctly with null attributes', () => {
+      // @ts-ignore this is case the connector does not exist for old cases object or configurations
+      expect(transformESConnectorToCaseConnector(null)).toEqual({
+        id: 'none',
+        name: 'none',
+        type: ConnectorTypes.none,
+        fields: null,
+      });
+    });
+  });
+
+  describe('getConnectorFromConfiguration', () => {
+    it('transform correctly', () => {
+      expect(getConnectorFromConfiguration(caseConfigure)).toEqual({
+        id: '789',
+        name: 'My connector 3',
+        type: ConnectorTypes.jira,
+        fields: null,
+      });
+    });
+
+    it('transform correctly with no connector', () => {
+      const caseConfigureNoConnector: SavedObjectsFindResponse<ESCasesConfigureAttributes> = {
+        ...caseConfigure,
+        saved_objects: [
+          {
+            ...mockCaseConfigure[0],
+            // @ts-ignore this is case the connector does not exist for old cases object or configurations
+            attributes: { ...mockCaseConfigure[0].attributes, connector: null },
+            score: 0,
+          },
+        ],
+      };
+
+      expect(getConnectorFromConfiguration(caseConfigureNoConnector)).toEqual({
+        id: 'none',
+        name: 'none',
+        type: ConnectorTypes.none,
+        fields: null,
+      });
+    });
+  });
+
+  describe('sortToSnake', () => {
+    it('it transforms status correctly', () => {
+      expect(sortToSnake('status')).toBe('status');
+    });
+
+    it('it transforms createdAt correctly', () => {
+      expect(sortToSnake('createdAt')).toBe('created_at');
+    });
+
+    it('it transforms created_at correctly', () => {
+      expect(sortToSnake('created_at')).toBe('created_at');
+    });
+
+    it('it transforms closedAt correctly', () => {
+      expect(sortToSnake('closedAt')).toBe('closed_at');
+    });
+
+    it('it transforms closed_at correctly', () => {
+      expect(sortToSnake('closed_at')).toBe('closed_at');
+    });
+
+    it('it transforms default correctly', () => {
+      expect(sortToSnake('not-exist')).toBe('created_at');
+    });
+  });
+
+  describe('transformNewCase', () => {
+    const connector: ESCaseConnector = {
+      id: '123',
+      name: 'My connector',
+      type: ConnectorTypes.jira,
+      fields: [
+        { key: 'issueType', value: 'Task' },
+        { key: 'priority', value: 'High' },
+        { key: 'parent', value: null },
+      ],
+    };
+    it('transform correctly', () => {
+      const myCase = {
+        newCase: { ...newCase, type: CaseType.individual },
+        connector,
+        createdDate: '2020-04-09T09:43:51.778Z',
+        email: 'elastic@elastic.co',
+        full_name: 'Elastic',
+        username: 'elastic',
+      };
+
+      const res = transformNewCase(myCase);
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "closed_at": null,
+          "closed_by": null,
+          "connector": Object {
+            "fields": Array [
+              Object {
+                "key": "issueType",
+                "value": "Task",
+              },
+              Object {
+                "key": "priority",
+                "value": "High",
+              },
+              Object {
+                "key": "parent",
+                "value": null,
+              },
+            ],
+            "id": "123",
+            "name": "My connector",
+            "type": ".jira",
+          },
+          "created_at": "2020-04-09T09:43:51.778Z",
+          "created_by": Object {
+            "email": "elastic@elastic.co",
+            "full_name": "Elastic",
+            "username": "elastic",
+          },
+          "description": "A description",
+          "external_service": null,
+          "owner": "securitySolution",
+          "settings": Object {
+            "syncAlerts": true,
+          },
+          "status": "open",
+          "tags": Array [
+            "new",
+            "case",
+          ],
+          "title": "My new case",
+          "type": "individual",
+          "updated_at": null,
+          "updated_by": null,
+        }
+      `);
+    });
+
+    it('transform correctly without optional fields', () => {
+      const myCase = {
+        newCase: { ...newCase, type: CaseType.individual },
+        connector,
+        createdDate: '2020-04-09T09:43:51.778Z',
+      };
+
+      const res = transformNewCase(myCase);
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "closed_at": null,
+          "closed_by": null,
+          "connector": Object {
+            "fields": Array [
+              Object {
+                "key": "issueType",
+                "value": "Task",
+              },
+              Object {
+                "key": "priority",
+                "value": "High",
+              },
+              Object {
+                "key": "parent",
+                "value": null,
+              },
+            ],
+            "id": "123",
+            "name": "My connector",
+            "type": ".jira",
+          },
+          "created_at": "2020-04-09T09:43:51.778Z",
+          "created_by": Object {
+            "email": undefined,
+            "full_name": undefined,
+            "username": undefined,
+          },
+          "description": "A description",
+          "external_service": null,
+          "owner": "securitySolution",
+          "settings": Object {
+            "syncAlerts": true,
+          },
+          "status": "open",
+          "tags": Array [
+            "new",
+            "case",
+          ],
+          "title": "My new case",
+          "type": "individual",
+          "updated_at": null,
+          "updated_by": null,
+        }
+      `);
+    });
+
+    it('transform correctly with optional fields as null', () => {
+      const myCase = {
+        newCase: { ...newCase, type: CaseType.individual },
+        connector,
+        createdDate: '2020-04-09T09:43:51.778Z',
+        email: null,
+        full_name: null,
+        username: null,
+      };
+
+      const res = transformNewCase(myCase);
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "closed_at": null,
+          "closed_by": null,
+          "connector": Object {
+            "fields": Array [
+              Object {
+                "key": "issueType",
+                "value": "Task",
+              },
+              Object {
+                "key": "priority",
+                "value": "High",
+              },
+              Object {
+                "key": "parent",
+                "value": null,
+              },
+            ],
+            "id": "123",
+            "name": "My connector",
+            "type": ".jira",
+          },
+          "created_at": "2020-04-09T09:43:51.778Z",
+          "created_by": Object {
+            "email": null,
+            "full_name": null,
+            "username": null,
+          },
+          "description": "A description",
+          "external_service": null,
+          "owner": "securitySolution",
+          "settings": Object {
+            "syncAlerts": true,
+          },
+          "status": "open",
+          "tags": Array [
+            "new",
+            "case",
+          ],
+          "title": "My new case",
+          "type": "individual",
+          "updated_at": null,
+          "updated_by": null,
+        }
+      `);
+    });
+  });
+});
diff --git a/x-pack/plugins/cases/server/client/utils.ts b/x-pack/plugins/cases/server/client/utils.ts
new file mode 100644
index 0000000000000..7ceb9cec60c39
--- /dev/null
+++ b/x-pack/plugins/cases/server/client/utils.ts
@@ -0,0 +1,479 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { badRequest } from '@hapi/boom';
+import { get, isPlainObject } from 'lodash';
+import deepEqual from 'fast-deep-equal';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { pipe } from 'fp-ts/lib/pipeable';
+
+import { SavedObjectsFindResponse } from 'kibana/server';
+import { nodeBuilder, KueryNode } from '../../../../../src/plugins/data/common';
+import { esKuery } from '../../../../../src/plugins/data/server';
+import {
+  CaseConnector,
+  ESCasesConfigureAttributes,
+  ConnectorTypes,
+  CaseStatuses,
+  CaseType,
+  CommentRequest,
+  throwErrors,
+  excess,
+  ContextTypeUserRt,
+  AlertCommentRequestRt,
+  OWNER_FIELD,
+} from '../../common/api';
+import { CASE_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../common/constants';
+import { combineFilterWithAuthorizationFilter } from '../authorization/utils';
+import {
+  getIDsAndIndicesAsArrays,
+  isCommentRequestTypeAlertOrGenAlert,
+  isCommentRequestTypeUser,
+  SavedObjectFindOptionsKueryNode,
+} from '../common';
+
+export const decodeCommentRequest = (comment: CommentRequest) => {
+  if (isCommentRequestTypeUser(comment)) {
+    pipe(excess(ContextTypeUserRt).decode(comment), fold(throwErrors(badRequest), identity));
+  } else if (isCommentRequestTypeAlertOrGenAlert(comment)) {
+    pipe(excess(AlertCommentRequestRt).decode(comment), fold(throwErrors(badRequest), identity));
+    const { ids, indices } = getIDsAndIndicesAsArrays(comment);
+
+    /**
+     * The alertId and index field must either be both of type string or they must both be string[] and be the same length.
+     * Having a one-to-one relationship between the id and index of an alert avoids accidentally updating or
+     * retrieving the wrong alert. Elasticsearch only guarantees that the _id (the field we use for alertId) to be
+     * unique within a single index. So if we attempt to update or get a specific alert across multiple indices we could
+     * update or receive the wrong one.
+     *
+     * Consider the situation where we have a alert1 with _id = '100' in index 'my-index-awesome' and also in index
+     *  'my-index-hi'.
+     * If we attempt to update the status of alert1 using an index pattern like `my-index-*` or even providing multiple
+     * indices, there's a chance we'll accidentally update too many alerts.
+     *
+     * This check doesn't enforce that the API request has the correct alert ID to index relationship it just guards
+     * against accidentally making a request like:
+     * {
+     *  alertId: [1,2,3],
+     *  index: awesome,
+     * }
+     *
+     * Instead this requires the requestor to provide:
+     * {
+     *  alertId: [1,2,3],
+     *  index: [awesome, awesome, awesome]
+     * }
+     *
+     * Ideally we'd change the format of the comment request to be an array of objects like:
+     * {
+     *  alerts: [{id: 1, index: awesome}, {id: 2, index: awesome}]
+     * }
+     *
+     * But we'd need to also implement a migration because the saved object document currently stores the id and index
+     * in separate fields.
+     */
+    if (ids.length !== indices.length) {
+      throw badRequest(
+        `Received an alert comment with ids and indices arrays of different lengths ids: ${JSON.stringify(
+          ids
+        )} indices: ${JSON.stringify(indices)}`
+      );
+    }
+  }
+};
+
+/**
+ * Return the alert IDs from the comment if it is an alert style comment. Otherwise return an empty array.
+ */
+export const getAlertIds = (comment: CommentRequest): string[] => {
+  if (isCommentRequestTypeAlertOrGenAlert(comment)) {
+    return Array.isArray(comment.alertId) ? comment.alertId : [comment.alertId];
+  }
+  return [];
+};
+
+export const addStatusFilter = ({
+  status,
+  appendFilter,
+  type = CASE_SAVED_OBJECT,
+}: {
+  status: CaseStatuses;
+  appendFilter?: KueryNode;
+  type?: string;
+}): KueryNode => {
+  const filters: KueryNode[] = [];
+  filters.push(nodeBuilder.is(`${type}.attributes.status`, status));
+
+  if (appendFilter) {
+    filters.push(appendFilter);
+  }
+
+  return filters.length > 1 ? nodeBuilder.and(filters) : filters[0];
+};
+
+interface FilterField {
+  filters?: string | string[];
+  field: string;
+  operator: 'and' | 'or';
+  type?: string;
+}
+
+export const buildFilter = ({
+  filters,
+  field,
+  operator,
+  type = CASE_SAVED_OBJECT,
+}: FilterField): KueryNode | undefined => {
+  if (filters === undefined) {
+    return;
+  }
+
+  const filtersAsArray = Array.isArray(filters) ? filters : [filters];
+
+  if (filtersAsArray.length === 0) {
+    return;
+  }
+
+  return nodeBuilder[operator](
+    filtersAsArray.map((filter) => nodeBuilder.is(`${type}.attributes.${field}`, filter))
+  );
+};
+
+/**
+ * Combines the authorized filters with the requested owners.
+ */
+export const combineAuthorizedAndOwnerFilter = (
+  owner?: string[] | string,
+  authorizationFilter?: KueryNode,
+  savedObjectType?: string
+): KueryNode | undefined => {
+  const ownerFilter = buildFilter({
+    filters: owner,
+    field: OWNER_FIELD,
+    operator: 'or',
+    type: savedObjectType,
+  });
+
+  return combineFilterWithAuthorizationFilter(ownerFilter, authorizationFilter);
+};
+
+/**
+ * Combines Kuery nodes and accepts an array with a mixture of undefined and KueryNodes. This will filter out the undefined
+ * filters and return a KueryNode with the filters and'd together.
+ */
+export function combineFilters(nodes: Array<KueryNode | undefined>): KueryNode | undefined {
+  const filters = nodes.filter((node): node is KueryNode => node !== undefined);
+  if (filters.length <= 0) {
+    return;
+  }
+  return nodeBuilder.and(filters);
+}
+
+/**
+ * Creates a KueryNode from a string expression. Returns undefined if the expression is undefined.
+ */
+export function stringToKueryNode(expression?: string): KueryNode | undefined {
+  if (!expression) {
+    return;
+  }
+
+  return esKuery.fromKueryExpression(expression);
+}
+
+/**
+ * Constructs the filters used for finding cases and sub cases.
+ * There are a few scenarios that this function tries to handle when constructing the filters used for finding cases
+ * and sub cases.
+ *
+ * Scenario 1:
+ *  Type == Individual
+ *  If the API request specifies that it wants only individual cases (aka not collections) then we need to add that
+ *  specific filter when call the saved objects find api. This will filter out any collection cases.
+ *
+ * Scenario 2:
+ *  Type == collection
+ *  If the API request specifies that it only wants collection cases (cases that have sub cases) then we need to add
+ *  the filter for collections AND we need to ignore any status filter for the case find call. This is because a
+ *  collection's status is no longer relevant when it has sub cases. The user cannot change the status for a collection
+ *  only for its sub cases. The status filter will be applied to the find request when looking for sub cases.
+ *
+ * Scenario 3:
+ *  No Type is specified
+ *  If the API request does not want to filter on type but instead get both collections and regular individual cases then
+ *  we need to find all cases that match the other filter criteria and sub cases. To do this we construct the following query:
+ *
+ *    ((status == some_status and type === individual) or type == collection) and (tags == blah) and (reporter == yo)
+ *  This forces us to honor the status request for individual cases but gets us ALL collection cases that match the other
+ *  filter criteria. When we search for sub cases we will use that status filter in that find call as well.
+ */
+export const constructQueryOptions = ({
+  tags,
+  reporters,
+  status,
+  sortByField,
+  caseType,
+  owner,
+  authorizationFilter,
+}: {
+  tags?: string | string[];
+  reporters?: string | string[];
+  status?: CaseStatuses;
+  sortByField?: string;
+  caseType?: CaseType;
+  owner?: string | string[];
+  authorizationFilter?: KueryNode;
+}): { case: SavedObjectFindOptionsKueryNode; subCase?: SavedObjectFindOptionsKueryNode } => {
+  const kueryNodeExists = (filter: KueryNode | null | undefined): filter is KueryNode =>
+    filter != null;
+
+  const tagsFilter = buildFilter({ filters: tags ?? [], field: 'tags', operator: 'or' });
+  const reportersFilter = buildFilter({
+    filters: reporters ?? [],
+    field: 'created_by.username',
+    operator: 'or',
+  });
+  const sortField = sortToSnake(sortByField);
+  const ownerFilter = buildFilter({ filters: owner ?? [], field: OWNER_FIELD, operator: 'or' });
+
+  switch (caseType) {
+    case CaseType.individual: {
+      // The cases filter will result in this structure "status === oh and (type === individual) and (tags === blah) and (reporter === yo)"
+      // The subCase filter will be undefined because we don't need to find sub cases if type === individual
+
+      // We do not want to support multiple type's being used, so force it to be a single filter value
+      const typeFilter = nodeBuilder.is(
+        `${CASE_SAVED_OBJECT}.attributes.type`,
+        CaseType.individual
+      );
+
+      const filters: KueryNode[] = [typeFilter, tagsFilter, reportersFilter, ownerFilter].filter(
+        kueryNodeExists
+      );
+
+      const caseFilters =
+        status != null
+          ? addStatusFilter({
+              status,
+              appendFilter: filters.length > 1 ? nodeBuilder.and(filters) : filters[0],
+            })
+          : undefined;
+
+      return {
+        case: {
+          filter: combineFilterWithAuthorizationFilter(caseFilters, authorizationFilter),
+          sortField,
+        },
+      };
+    }
+    case CaseType.collection: {
+      // The cases filter will result in this structure "(type == parent) and (tags == blah) and (reporter == yo)"
+      // The sub case filter will use the query.status if it exists
+      const typeFilter = nodeBuilder.is(
+        `${CASE_SAVED_OBJECT}.attributes.type`,
+        CaseType.collection
+      );
+
+      const filters: KueryNode[] = [typeFilter, tagsFilter, reportersFilter, ownerFilter].filter(
+        kueryNodeExists
+      );
+      const caseFilters = filters.length > 1 ? nodeBuilder.and(filters) : filters[0];
+      const subCaseFilters =
+        status != null ? addStatusFilter({ status, type: SUB_CASE_SAVED_OBJECT }) : undefined;
+
+      return {
+        case: {
+          filter: combineFilterWithAuthorizationFilter(caseFilters, authorizationFilter),
+          sortField,
+        },
+        subCase: {
+          filter: combineFilterWithAuthorizationFilter(subCaseFilters, authorizationFilter),
+          sortField,
+        },
+      };
+    }
+    default: {
+      /**
+       * In this scenario no type filter was sent, so we want to honor the status filter if one exists.
+       * To construct the filter and honor the status portion we need to find all individual cases that
+       * have that particular status. We also need to find cases that have sub cases but we want to ignore the
+       * case collection's status because it is not relevant. We only care about the status of the sub cases if the
+       * case is a collection.
+       *
+       * The cases filter will result in this structure "((status == open and type === individual) or type == parent) and (tags == blah) and (reporter == yo)"
+       * The sub case filter will use the query.status if it exists
+       */
+      const typeIndividual = nodeBuilder.is(
+        `${CASE_SAVED_OBJECT}.attributes.type`,
+        CaseType.individual
+      );
+      const typeParent = nodeBuilder.is(
+        `${CASE_SAVED_OBJECT}.attributes.type`,
+        CaseType.collection
+      );
+
+      const statusFilter =
+        status != null
+          ? nodeBuilder.and([addStatusFilter({ status }), typeIndividual])
+          : typeIndividual;
+      const statusAndType = nodeBuilder.or([statusFilter, typeParent]);
+
+      const filters: KueryNode[] = [statusAndType, tagsFilter, reportersFilter, ownerFilter].filter(
+        kueryNodeExists
+      );
+
+      const caseFilters = filters.length > 1 ? nodeBuilder.and(filters) : filters[0];
+      const subCaseFilters =
+        status != null ? addStatusFilter({ status, type: SUB_CASE_SAVED_OBJECT }) : undefined;
+
+      return {
+        case: {
+          filter: combineFilterWithAuthorizationFilter(caseFilters, authorizationFilter),
+          sortField,
+        },
+        subCase: {
+          filter: combineFilterWithAuthorizationFilter(subCaseFilters, authorizationFilter),
+          sortField,
+        },
+      };
+    }
+  }
+};
+
+interface CompareArrays {
+  addedItems: string[];
+  deletedItems: string[];
+}
+export const compareArrays = ({
+  originalValue,
+  updatedValue,
+}: {
+  originalValue: string[];
+  updatedValue: string[];
+}): CompareArrays => {
+  const result: CompareArrays = {
+    addedItems: [],
+    deletedItems: [],
+  };
+  originalValue.forEach((origVal) => {
+    if (!updatedValue.includes(origVal)) {
+      result.deletedItems = [...result.deletedItems, origVal];
+    }
+  });
+  updatedValue.forEach((updatedVal) => {
+    if (!originalValue.includes(updatedVal)) {
+      result.addedItems = [...result.addedItems, updatedVal];
+    }
+  });
+
+  return result;
+};
+
+export const isTwoArraysDifference = (
+  originalValue: unknown,
+  updatedValue: unknown
+): CompareArrays | null => {
+  if (
+    originalValue != null &&
+    updatedValue != null &&
+    Array.isArray(updatedValue) &&
+    Array.isArray(originalValue)
+  ) {
+    const compObj = compareArrays({ originalValue, updatedValue });
+    if (compObj.addedItems.length > 0 || compObj.deletedItems.length > 0) {
+      return compObj;
+    }
+  }
+  return null;
+};
+
+interface CaseWithIDVersion {
+  id: string;
+  version: string;
+  [key: string]: unknown;
+}
+
+export const getCaseToUpdate = (
+  currentCase: unknown,
+  queryCase: CaseWithIDVersion
+): CaseWithIDVersion =>
+  Object.entries(queryCase).reduce(
+    (acc, [key, value]) => {
+      const currentValue = get(currentCase, key);
+      if (Array.isArray(currentValue) && Array.isArray(value)) {
+        if (isTwoArraysDifference(value, currentValue)) {
+          return {
+            ...acc,
+            [key]: value,
+          };
+        }
+        return acc;
+      } else if (isPlainObject(currentValue) && isPlainObject(value)) {
+        if (!deepEqual(currentValue, value)) {
+          return {
+            ...acc,
+            [key]: value,
+          };
+        }
+
+        return acc;
+      } else if (currentValue != null && value !== currentValue) {
+        return {
+          ...acc,
+          [key]: value,
+        };
+      }
+      return acc;
+    },
+    { id: queryCase.id, version: queryCase.version }
+  );
+
+export const getNoneCaseConnector = () => ({
+  id: 'none',
+  name: 'none',
+  type: ConnectorTypes.none,
+  fields: null,
+});
+
+export const getConnectorFromConfiguration = (
+  caseConfigure: SavedObjectsFindResponse<ESCasesConfigureAttributes>
+): CaseConnector => {
+  let caseConnector = getNoneCaseConnector();
+  if (
+    caseConfigure.saved_objects.length > 0 &&
+    caseConfigure.saved_objects[0].attributes.connector
+  ) {
+    caseConnector = {
+      id: caseConfigure.saved_objects[0].attributes.connector.id,
+      name: caseConfigure.saved_objects[0].attributes.connector.name,
+      type: caseConfigure.saved_objects[0].attributes.connector.type,
+      fields: null,
+    };
+  }
+  return caseConnector;
+};
+
+enum SortFieldCase {
+  closedAt = 'closed_at',
+  createdAt = 'created_at',
+  status = 'status',
+}
+
+export const sortToSnake = (sortField: string | undefined): SortFieldCase => {
+  switch (sortField) {
+    case 'status':
+      return SortFieldCase.status;
+    case 'createdAt':
+    case 'created_at':
+      return SortFieldCase.createdAt;
+    case 'closedAt':
+    case 'closed_at':
+      return SortFieldCase.closedAt;
+    default:
+      return SortFieldCase.createdAt;
+  }
+};
diff --git a/x-pack/plugins/cases/server/common/error.ts b/x-pack/plugins/cases/server/common/error.ts
index 95b05fd612e60..1b53eb9fdb218 100644
--- a/x-pack/plugins/cases/server/common/error.ts
+++ b/x-pack/plugins/cases/server/common/error.ts
@@ -28,7 +28,7 @@ class CaseError extends Error {
    * and data from that.
    */
   public boomify(): Boom<unknown> {
-    const message = this.message ?? this.wrappedError?.message;
+    const message = this.wrappedError?.message ?? this.message;
     let statusCode = 500;
     let data: unknown | undefined;
 
diff --git a/x-pack/plugins/cases/server/common/index.ts b/x-pack/plugins/cases/server/common/index.ts
index b07ed5d4ae2d6..324c7e7ffd1a8 100644
--- a/x-pack/plugins/cases/server/common/index.ts
+++ b/x-pack/plugins/cases/server/common/index.ts
@@ -8,3 +8,4 @@
 export * from './models';
 export * from './utils';
 export * from './types';
+export * from './error';
diff --git a/x-pack/plugins/cases/server/common/models/commentable_case.ts b/x-pack/plugins/cases/server/common/models/commentable_case.ts
index 3daccf87bdc19..241278c77ab48 100644
--- a/x-pack/plugins/cases/server/common/models/commentable_case.ts
+++ b/x-pack/plugins/cases/server/common/models/commentable_case.ts
@@ -27,15 +27,19 @@ import {
   ESCaseAttributes,
   SubCaseAttributes,
   User,
-} from '../../../common';
-import { transformESConnectorToCaseConnector } from '../../routes/api/cases/helpers';
+} from '../../../common/api';
 import {
+  transformESConnectorToCaseConnector,
   flattenCommentSavedObjects,
   flattenSubCaseSavedObject,
   transformNewComment,
-} from '../../routes/api/utils';
-import { CASE_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../saved_object_types';
-import { CaseServiceSetup } from '../../services';
+} from '..';
+import {
+  CASE_SAVED_OBJECT,
+  MAX_DOCS_PER_PAGE,
+  SUB_CASE_SAVED_OBJECT,
+} from '../../../common/constants';
+import { AttachmentService, CasesService } from '../../services';
 import { createCaseError } from '../error';
 import { countAlertsForID } from '../index';
 
@@ -52,8 +56,9 @@ interface NewCommentResp {
 interface CommentableCaseParams {
   collection: SavedObject<ESCaseAttributes>;
   subCase?: SavedObject<SubCaseAttributes>;
-  soClient: SavedObjectsClientContract;
-  service: CaseServiceSetup;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  caseService: CasesService;
+  attachmentService: AttachmentService;
   logger: Logger;
 }
 
@@ -64,15 +69,24 @@ interface CommentableCaseParams {
 export class CommentableCase {
   private readonly collection: SavedObject<ESCaseAttributes>;
   private readonly subCase?: SavedObject<SubCaseAttributes>;
-  private readonly soClient: SavedObjectsClientContract;
-  private readonly service: CaseServiceSetup;
+  private readonly unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  private readonly caseService: CasesService;
+  private readonly attachmentService: AttachmentService;
   private readonly logger: Logger;
 
-  constructor({ collection, subCase, soClient, service, logger }: CommentableCaseParams) {
+  constructor({
+    collection,
+    subCase,
+    unsecuredSavedObjectsClient,
+    caseService,
+    attachmentService,
+    logger,
+  }: CommentableCaseParams) {
     this.collection = collection;
     this.subCase = subCase;
-    this.soClient = soClient;
-    this.service = service;
+    this.unsecuredSavedObjectsClient = unsecuredSavedObjectsClient;
+    this.caseService = caseService;
+    this.attachmentService = attachmentService;
     this.logger = logger;
   }
 
@@ -109,6 +123,10 @@ export class CommentableCase {
     return this.subCase?.id;
   }
 
+  private get owner(): string {
+    return this.collection.attributes.owner;
+  }
+
   private buildRefsToCase(): SavedObjectReference[] {
     const subCaseSOType = SUB_CASE_SAVED_OBJECT;
     const caseSOType = CASE_SAVED_OBJECT;
@@ -129,8 +147,8 @@ export class CommentableCase {
       let updatedSubCaseAttributes: SavedObject<SubCaseAttributes> | undefined;
 
       if (this.subCase) {
-        const updatedSubCase = await this.service.patchSubCase({
-          client: this.soClient,
+        const updatedSubCase = await this.caseService.patchSubCase({
+          unsecuredSavedObjectsClient: this.unsecuredSavedObjectsClient,
           subCaseId: this.subCase.id,
           updatedAttributes: {
             updated_at: date,
@@ -151,8 +169,8 @@ export class CommentableCase {
         };
       }
 
-      const updatedCase = await this.service.patchCase({
-        client: this.soClient,
+      const updatedCase = await this.caseService.patchCase({
+        unsecuredSavedObjectsClient: this.unsecuredSavedObjectsClient,
         caseId: this.collection.id,
         updatedAttributes: {
           updated_at: date,
@@ -172,8 +190,9 @@ export class CommentableCase {
           version: updatedCase.version ?? this.collection.version,
         },
         subCase: updatedSubCaseAttributes,
-        soClient: this.soClient,
-        service: this.service,
+        unsecuredSavedObjectsClient: this.unsecuredSavedObjectsClient,
+        caseService: this.caseService,
+        attachmentService: this.attachmentService,
         logger: this.logger,
       });
     } catch (error) {
@@ -201,9 +220,9 @@ export class CommentableCase {
       const { id, version, ...queryRestAttributes } = updateRequest;
 
       const [comment, commentableCase] = await Promise.all([
-        this.service.patchComment({
-          client: this.soClient,
-          commentId: id,
+        this.attachmentService.update({
+          unsecuredSavedObjectsClient: this.unsecuredSavedObjectsClient,
+          attachmentId: id,
           updatedAttributes: {
             ...queryRestAttributes,
             updated_at: updatedAt,
@@ -233,10 +252,12 @@ export class CommentableCase {
     createdDate,
     user,
     commentReq,
+    id,
   }: {
     createdDate: string;
     user: User;
     commentReq: CommentRequest;
+    id: string;
   }): Promise<NewCommentResp> {
     try {
       if (commentReq.type === CommentType.alert) {
@@ -249,9 +270,13 @@ export class CommentableCase {
         }
       }
 
+      if (commentReq.owner !== this.owner) {
+        throw Boom.badRequest('The owner field of the comment must match the case');
+      }
+
       const [comment, commentableCase] = await Promise.all([
-        this.service.postNewComment({
-          client: this.soClient,
+        this.attachmentService.create({
+          unsecuredSavedObjectsClient: this.unsecuredSavedObjectsClient,
           attributes: transformNewComment({
             associationType: this.subCase ? AssociationType.subCase : AssociationType.case,
             createdDate,
@@ -259,6 +284,7 @@ export class CommentableCase {
             ...user,
           }),
           references: this.buildRefsToCase(),
+          id,
         }),
         this.update({ date: createdDate, user }),
       ]);
@@ -287,23 +313,13 @@ export class CommentableCase {
 
   public async encode(): Promise<CaseResponse> {
     try {
-      const collectionCommentStats = await this.service.getAllCaseComments({
-        client: this.soClient,
-        id: this.collection.id,
-        options: {
-          fields: [],
-          page: 1,
-          perPage: 1,
-        },
-      });
-
-      const collectionComments = await this.service.getAllCaseComments({
-        client: this.soClient,
+      const collectionComments = await this.caseService.getAllCaseComments({
+        unsecuredSavedObjectsClient: this.unsecuredSavedObjectsClient,
         id: this.collection.id,
         options: {
           fields: [],
           page: 1,
-          perPage: collectionCommentStats.total,
+          perPage: MAX_DOCS_PER_PAGE,
         },
       });
 
@@ -313,12 +329,12 @@ export class CommentableCase {
       const caseResponse = {
         comments: flattenCommentSavedObjects(collectionComments.saved_objects),
         totalAlerts: collectionTotalAlerts,
-        ...this.formatCollectionForEncoding(collectionCommentStats.total),
+        ...this.formatCollectionForEncoding(collectionComments.total),
       };
 
       if (this.subCase) {
-        const subCaseComments = await this.service.getAllSubCaseComments({
-          client: this.soClient,
+        const subCaseComments = await this.caseService.getAllSubCaseComments({
+          unsecuredSavedObjectsClient: this.unsecuredSavedObjectsClient,
           id: this.subCase.id,
         });
         const totalAlerts =
diff --git a/x-pack/plugins/cases/server/common/types.ts b/x-pack/plugins/cases/server/common/types.ts
index b58d8ec0e849e..b99612f1b1cfe 100644
--- a/x-pack/plugins/cases/server/common/types.ts
+++ b/x-pack/plugins/cases/server/common/types.ts
@@ -5,6 +5,9 @@
  * 2.0.
  */
 
+import { KueryNode } from '../../../../../src/plugins/data/server';
+import { SavedObjectFindOptions } from '../../common/api';
+
 /**
  * This structure holds the alert ID and index from an alert comment
  */
@@ -12,3 +15,7 @@ export interface AlertInfo {
   id: string;
   index: string;
 }
+
+export type SavedObjectFindOptionsKueryNode = Omit<SavedObjectFindOptions, 'filter'> & {
+  filter?: KueryNode;
+};
diff --git a/x-pack/plugins/cases/server/common/utils.test.ts b/x-pack/plugins/cases/server/common/utils.test.ts
index df16fe4f0a67d..322e45094eda4 100644
--- a/x-pack/plugins/cases/server/common/utils.test.ts
+++ b/x-pack/plugins/cases/server/common/utils.test.ts
@@ -6,9 +6,30 @@
  */
 
 import { SavedObjectsFindResponse } from 'kibana/server';
-import { AssociationType, CommentAttributes, CommentRequest, CommentType } from '../../common';
-import { transformNewComment } from '../routes/api/utils';
-import { combineFilters, countAlerts, countAlertsForID, groupTotalAlertsByID } from './utils';
+import { SECURITY_SOLUTION_OWNER } from '../../common';
+import {
+  AssociationType,
+  CaseResponse,
+  CommentAttributes,
+  CommentRequest,
+  CommentType,
+} from '../../common/api';
+import {
+  mockCaseComments,
+  mockCases,
+  mockCaseNoConnectorId,
+} from '../routes/api/__fixtures__/mock_saved_objects';
+import {
+  flattenCaseSavedObject,
+  transformNewComment,
+  countAlerts,
+  countAlertsForID,
+  groupTotalAlertsByID,
+  transformCases,
+  transformComments,
+  flattenCommentSavedObjects,
+  flattenCommentSavedObject,
+} from './utils';
 
 interface CommentReference {
   ids: string[];
@@ -47,33 +68,613 @@ function createCommentFindResponse(
 }
 
 describe('common utils', () => {
-  describe('combineFilters', () => {
-    it("creates a filter string with two values and'd together", () => {
-      expect(combineFilters(['a', 'b'], 'AND')).toBe('(a AND b)');
+  describe('transformCases', () => {
+    it('transforms correctly', () => {
+      const casesMap = new Map<string, CaseResponse>(
+        mockCases.map((obj) => {
+          return [obj.id, flattenCaseSavedObject({ savedObject: obj, totalComment: 2 })];
+        })
+      );
+      const res = transformCases({
+        casesMap,
+        countOpenCases: 2,
+        countInProgressCases: 2,
+        countClosedCases: 2,
+        page: 1,
+        perPage: 10,
+        total: casesMap.size,
+      });
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "cases": Array [
+            Object {
+              "closed_at": null,
+              "closed_by": null,
+              "comments": Array [],
+              "connector": Object {
+                "fields": null,
+                "id": "none",
+                "name": "none",
+                "type": ".none",
+              },
+              "created_at": "2019-11-25T21:54:48.952Z",
+              "created_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "description": "This is a brand new case of a bad meanie defacing data",
+              "external_service": null,
+              "id": "mock-id-1",
+              "owner": "securitySolution",
+              "settings": Object {
+                "syncAlerts": true,
+              },
+              "status": "open",
+              "subCaseIds": undefined,
+              "subCases": undefined,
+              "tags": Array [
+                "defacement",
+              ],
+              "title": "Super Bad Security Issue",
+              "totalAlerts": 0,
+              "totalComment": 2,
+              "type": "individual",
+              "updated_at": "2019-11-25T21:54:48.952Z",
+              "updated_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "version": "WzAsMV0=",
+            },
+            Object {
+              "closed_at": null,
+              "closed_by": null,
+              "comments": Array [],
+              "connector": Object {
+                "fields": null,
+                "id": "none",
+                "name": "none",
+                "type": ".none",
+              },
+              "created_at": "2019-11-25T22:32:00.900Z",
+              "created_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "description": "Oh no, a bad meanie destroying data!",
+              "external_service": null,
+              "id": "mock-id-2",
+              "owner": "securitySolution",
+              "settings": Object {
+                "syncAlerts": true,
+              },
+              "status": "open",
+              "subCaseIds": undefined,
+              "subCases": undefined,
+              "tags": Array [
+                "Data Destruction",
+              ],
+              "title": "Damaging Data Destruction Detected",
+              "totalAlerts": 0,
+              "totalComment": 2,
+              "type": "individual",
+              "updated_at": "2019-11-25T22:32:00.900Z",
+              "updated_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "version": "WzQsMV0=",
+            },
+            Object {
+              "closed_at": null,
+              "closed_by": null,
+              "comments": Array [],
+              "connector": Object {
+                "fields": Object {
+                  "issueType": "Task",
+                  "parent": null,
+                  "priority": "High",
+                },
+                "id": "123",
+                "name": "My connector",
+                "type": ".jira",
+              },
+              "created_at": "2019-11-25T22:32:17.947Z",
+              "created_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "description": "Oh no, a bad meanie going LOLBins all over the place!",
+              "external_service": null,
+              "id": "mock-id-3",
+              "owner": "securitySolution",
+              "settings": Object {
+                "syncAlerts": true,
+              },
+              "status": "open",
+              "subCaseIds": undefined,
+              "subCases": undefined,
+              "tags": Array [
+                "LOLBins",
+              ],
+              "title": "Another bad one",
+              "totalAlerts": 0,
+              "totalComment": 2,
+              "type": "individual",
+              "updated_at": "2019-11-25T22:32:17.947Z",
+              "updated_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "version": "WzUsMV0=",
+            },
+            Object {
+              "closed_at": "2019-11-25T22:32:17.947Z",
+              "closed_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "comments": Array [],
+              "connector": Object {
+                "fields": Object {
+                  "issueType": "Task",
+                  "parent": null,
+                  "priority": "High",
+                },
+                "id": "123",
+                "name": "My connector",
+                "type": ".jira",
+              },
+              "created_at": "2019-11-25T22:32:17.947Z",
+              "created_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "description": "Oh no, a bad meanie going LOLBins all over the place!",
+              "external_service": null,
+              "id": "mock-id-4",
+              "owner": "securitySolution",
+              "settings": Object {
+                "syncAlerts": true,
+              },
+              "status": "closed",
+              "subCaseIds": undefined,
+              "subCases": undefined,
+              "tags": Array [
+                "LOLBins",
+              ],
+              "title": "Another bad one",
+              "totalAlerts": 0,
+              "totalComment": 2,
+              "type": "individual",
+              "updated_at": "2019-11-25T22:32:17.947Z",
+              "updated_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "version": "WzUsMV0=",
+            },
+          ],
+          "count_closed_cases": 2,
+          "count_in_progress_cases": 2,
+          "count_open_cases": 2,
+          "page": 1,
+          "per_page": 10,
+          "total": 4,
+        }
+      `);
     });
+  });
+
+  describe('flattenCaseSavedObject', () => {
+    it('flattens correctly', () => {
+      const myCase = { ...mockCases[2] };
+      const res = flattenCaseSavedObject({
+        savedObject: myCase,
+        totalComment: 2,
+      });
 
-    it('creates a filter string with three values or together', () => {
-      expect(combineFilters(['a', 'b', 'c'], 'OR')).toBe('(a OR b OR c)');
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "closed_at": null,
+          "closed_by": null,
+          "comments": Array [],
+          "connector": Object {
+            "fields": Object {
+              "issueType": "Task",
+              "parent": null,
+              "priority": "High",
+            },
+            "id": "123",
+            "name": "My connector",
+            "type": ".jira",
+          },
+          "created_at": "2019-11-25T22:32:17.947Z",
+          "created_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "description": "Oh no, a bad meanie going LOLBins all over the place!",
+          "external_service": null,
+          "id": "mock-id-3",
+          "owner": "securitySolution",
+          "settings": Object {
+            "syncAlerts": true,
+          },
+          "status": "open",
+          "subCaseIds": undefined,
+          "subCases": undefined,
+          "tags": Array [
+            "LOLBins",
+          ],
+          "title": "Another bad one",
+          "totalAlerts": 0,
+          "totalComment": 2,
+          "type": "individual",
+          "updated_at": "2019-11-25T22:32:17.947Z",
+          "updated_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "version": "WzUsMV0=",
+        }
+      `);
     });
 
-    it('ignores empty strings', () => {
-      expect(combineFilters(['', 'a', '', 'b'], 'AND')).toBe('(a AND b)');
+    it('flattens correctly without version', () => {
+      const myCase = { ...mockCases[2] };
+      myCase.version = undefined;
+      const res = flattenCaseSavedObject({
+        savedObject: myCase,
+        totalComment: 2,
+      });
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "closed_at": null,
+          "closed_by": null,
+          "comments": Array [],
+          "connector": Object {
+            "fields": Object {
+              "issueType": "Task",
+              "parent": null,
+              "priority": "High",
+            },
+            "id": "123",
+            "name": "My connector",
+            "type": ".jira",
+          },
+          "created_at": "2019-11-25T22:32:17.947Z",
+          "created_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "description": "Oh no, a bad meanie going LOLBins all over the place!",
+          "external_service": null,
+          "id": "mock-id-3",
+          "owner": "securitySolution",
+          "settings": Object {
+            "syncAlerts": true,
+          },
+          "status": "open",
+          "subCaseIds": undefined,
+          "subCases": undefined,
+          "tags": Array [
+            "LOLBins",
+          ],
+          "title": "Another bad one",
+          "totalAlerts": 0,
+          "totalComment": 2,
+          "type": "individual",
+          "updated_at": "2019-11-25T22:32:17.947Z",
+          "updated_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "version": "0",
+        }
+      `);
     });
 
-    it('returns an empty string if all filters are empty strings', () => {
-      expect(combineFilters(['', ''], 'OR')).toBe('');
+    it('flattens correctly with comments', () => {
+      const myCase = { ...mockCases[2] };
+      const comments = [{ ...mockCaseComments[0] }];
+      const res = flattenCaseSavedObject({
+        savedObject: myCase,
+        comments,
+        totalComment: 2,
+      });
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "closed_at": null,
+          "closed_by": null,
+          "comments": Array [
+            Object {
+              "associationType": "case",
+              "comment": "Wow, good luck catching that bad meanie!",
+              "created_at": "2019-11-25T21:55:00.177Z",
+              "created_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "id": "mock-comment-1",
+              "owner": "securitySolution",
+              "pushed_at": null,
+              "pushed_by": null,
+              "type": "user",
+              "updated_at": "2019-11-25T21:55:00.177Z",
+              "updated_by": Object {
+                "email": "testemail@elastic.co",
+                "full_name": "elastic",
+                "username": "elastic",
+              },
+              "version": "WzEsMV0=",
+            },
+          ],
+          "connector": Object {
+            "fields": Object {
+              "issueType": "Task",
+              "parent": null,
+              "priority": "High",
+            },
+            "id": "123",
+            "name": "My connector",
+            "type": ".jira",
+          },
+          "created_at": "2019-11-25T22:32:17.947Z",
+          "created_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "description": "Oh no, a bad meanie going LOLBins all over the place!",
+          "external_service": null,
+          "id": "mock-id-3",
+          "owner": "securitySolution",
+          "settings": Object {
+            "syncAlerts": true,
+          },
+          "status": "open",
+          "subCaseIds": undefined,
+          "subCases": undefined,
+          "tags": Array [
+            "LOLBins",
+          ],
+          "title": "Another bad one",
+          "totalAlerts": 0,
+          "totalComment": 2,
+          "type": "individual",
+          "updated_at": "2019-11-25T22:32:17.947Z",
+          "updated_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "version": "WzUsMV0=",
+        }
+      `);
     });
 
-    it('returns an empty string if the filters are undefined', () => {
-      expect(combineFilters(undefined, 'OR')).toBe('');
+    it('inserts missing connector', () => {
+      const extraCaseData = {
+        totalComment: 2,
+      };
+
+      const res = flattenCaseSavedObject({
+        // @ts-ignore this is to update old case saved objects to include connector
+        savedObject: mockCaseNoConnectorId,
+        ...extraCaseData,
+      });
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "closed_at": null,
+          "closed_by": null,
+          "comments": Array [],
+          "connector": Object {
+            "fields": null,
+            "id": "none",
+            "name": "none",
+            "type": ".none",
+          },
+          "created_at": "2019-11-25T21:54:48.952Z",
+          "created_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "description": "This is a brand new case of a bad meanie defacing data",
+          "external_service": null,
+          "id": "mock-no-connector_id",
+          "settings": Object {
+            "syncAlerts": true,
+          },
+          "status": "open",
+          "subCaseIds": undefined,
+          "subCases": undefined,
+          "tags": Array [
+            "defacement",
+          ],
+          "title": "Super Bad Security Issue",
+          "totalAlerts": 0,
+          "totalComment": 2,
+          "updated_at": "2019-11-25T21:54:48.952Z",
+          "updated_by": Object {
+            "email": "testemail@elastic.co",
+            "full_name": "elastic",
+            "username": "elastic",
+          },
+          "version": "WzAsMV0=",
+        }
+      `);
     });
+  });
 
-    it('returns a value without parenthesis when only a single filter is provided', () => {
-      expect(combineFilters(['a'], 'OR')).toBe('a');
+  describe('transformComments', () => {
+    it('transforms correctly', () => {
+      const comments = {
+        saved_objects: mockCaseComments.map((obj) => ({ ...obj, score: 1 })),
+        total: mockCaseComments.length,
+        per_page: 10,
+        page: 1,
+      };
+
+      const res = transformComments(comments);
+      expect(res).toEqual({
+        page: 1,
+        per_page: 10,
+        total: mockCaseComments.length,
+        comments: flattenCommentSavedObjects(comments.saved_objects),
+      });
+    });
+  });
+
+  describe('flattenCommentSavedObjects', () => {
+    it('flattens correctly', () => {
+      const comments = [{ ...mockCaseComments[0] }, { ...mockCaseComments[1] }];
+      const res = flattenCommentSavedObjects(comments);
+      expect(res).toEqual([
+        flattenCommentSavedObject(comments[0]),
+        flattenCommentSavedObject(comments[1]),
+      ]);
+    });
+  });
+
+  describe('flattenCommentSavedObject', () => {
+    it('flattens correctly', () => {
+      const comment = { ...mockCaseComments[0] };
+      const res = flattenCommentSavedObject(comment);
+      expect(res).toEqual({
+        id: comment.id,
+        version: comment.version,
+        ...comment.attributes,
+      });
+    });
+
+    it('flattens correctly without version', () => {
+      const comment = { ...mockCaseComments[0] };
+      comment.version = undefined;
+      const res = flattenCommentSavedObject(comment);
+      expect(res).toEqual({
+        id: comment.id,
+        version: '0',
+        ...comment.attributes,
+      });
+    });
+  });
+
+  describe('transformNewComment', () => {
+    it('transforms correctly', () => {
+      const comment = {
+        comment: 'A comment',
+        type: CommentType.user as const,
+        createdDate: '2020-04-09T09:43:51.778Z',
+        email: 'elastic@elastic.co',
+        full_name: 'Elastic',
+        username: 'elastic',
+        associationType: AssociationType.case,
+        owner: SECURITY_SOLUTION_OWNER,
+      };
+
+      const res = transformNewComment(comment);
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "associationType": "case",
+          "comment": "A comment",
+          "created_at": "2020-04-09T09:43:51.778Z",
+          "created_by": Object {
+            "email": "elastic@elastic.co",
+            "full_name": "Elastic",
+            "username": "elastic",
+          },
+          "owner": "securitySolution",
+          "pushed_at": null,
+          "pushed_by": null,
+          "type": "user",
+          "updated_at": null,
+          "updated_by": null,
+        }
+      `);
     });
 
-    it('returns a string without parenthesis when only a single non empty filter is provided', () => {
-      expect(combineFilters(['', ''], 'AND')).toBe('');
+    it('transform correctly without optional fields', () => {
+      const comment = {
+        comment: 'A comment',
+        type: CommentType.user as const,
+        createdDate: '2020-04-09T09:43:51.778Z',
+        owner: SECURITY_SOLUTION_OWNER,
+        associationType: AssociationType.case,
+      };
+
+      const res = transformNewComment(comment);
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "associationType": "case",
+          "comment": "A comment",
+          "created_at": "2020-04-09T09:43:51.778Z",
+          "created_by": Object {
+            "email": undefined,
+            "full_name": undefined,
+            "username": undefined,
+          },
+          "owner": "securitySolution",
+          "pushed_at": null,
+          "pushed_by": null,
+          "type": "user",
+          "updated_at": null,
+          "updated_by": null,
+        }
+      `);
+    });
+
+    it('transform correctly with optional fields as null', () => {
+      const comment = {
+        comment: 'A comment',
+        type: CommentType.user as const,
+        createdDate: '2020-04-09T09:43:51.778Z',
+        email: null,
+        full_name: null,
+        username: null,
+        owner: SECURITY_SOLUTION_OWNER,
+        associationType: AssociationType.case,
+      };
+
+      const res = transformNewComment(comment);
+
+      expect(res).toMatchInlineSnapshot(`
+        Object {
+          "associationType": "case",
+          "comment": "A comment",
+          "created_at": "2020-04-09T09:43:51.778Z",
+          "created_by": Object {
+            "email": null,
+            "full_name": null,
+            "username": null,
+          },
+          "owner": "securitySolution",
+          "pushed_at": null,
+          "pushed_by": null,
+          "type": "user",
+          "updated_at": null,
+          "updated_by": null,
+        }
+      `);
     });
   });
 
@@ -82,7 +683,10 @@ describe('common utils', () => {
       expect(
         countAlerts(
           createCommentFindResponse([
-            { ids: ['1'], comments: [{ comment: '', type: CommentType.user }] },
+            {
+              ids: ['1'],
+              comments: [{ comment: '', type: CommentType.user, owner: SECURITY_SOLUTION_OWNER }],
+            },
           ]).saved_objects[0]
         )
       ).toBe(0);
@@ -103,6 +707,7 @@ describe('common utils', () => {
                     id: 'rule-id-1',
                     name: 'rule-name-1',
                   },
+                  owner: SECURITY_SOLUTION_OWNER,
                 },
               ],
             },
@@ -126,6 +731,7 @@ describe('common utils', () => {
                     id: 'rule-id-1',
                     name: 'rule-name-1',
                   },
+                  owner: SECURITY_SOLUTION_OWNER,
                 },
               ],
             },
@@ -146,6 +752,7 @@ describe('common utils', () => {
                 {
                   alertId: ['a', 'b'],
                   index: '',
+                  owner: SECURITY_SOLUTION_OWNER,
                   type: CommentType.alert,
                   rule: {
                     id: 'rule-id-1',
@@ -154,6 +761,7 @@ describe('common utils', () => {
                 },
                 {
                   comment: '',
+                  owner: SECURITY_SOLUTION_OWNER,
                   type: CommentType.user,
                 },
               ],
@@ -173,6 +781,7 @@ describe('common utils', () => {
               ids: ['1'],
               comments: [
                 {
+                  owner: SECURITY_SOLUTION_OWNER,
                   alertId: ['a', 'b'],
                   index: '',
                   type: CommentType.alert,
@@ -187,6 +796,7 @@ describe('common utils', () => {
               ids: ['2'],
               comments: [
                 {
+                  owner: SECURITY_SOLUTION_OWNER,
                   comment: '',
                   type: CommentType.user,
                 },
@@ -210,6 +820,7 @@ describe('common utils', () => {
               ids: ['1', '2'],
               comments: [
                 {
+                  owner: SECURITY_SOLUTION_OWNER,
                   alertId: ['a', 'b'],
                   index: '',
                   type: CommentType.alert,
@@ -241,6 +852,7 @@ describe('common utils', () => {
               ids: ['1', '2'],
               comments: [
                 {
+                  owner: SECURITY_SOLUTION_OWNER,
                   alertId: ['a', 'b'],
                   index: '',
                   type: CommentType.alert,
diff --git a/x-pack/plugins/cases/server/common/utils.ts b/x-pack/plugins/cases/server/common/utils.ts
index d3bc3850e4210..7f38be2ba806d 100644
--- a/x-pack/plugins/cases/server/common/utils.ts
+++ b/x-pack/plugins/cases/server/common/utils.ts
@@ -4,11 +4,37 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import Boom from '@hapi/boom';
 
-import { SavedObjectsFindResult, SavedObjectsFindResponse } from 'kibana/server';
-import { CaseStatuses, CommentAttributes, CommentRequest, CommentType, User } from '../../common';
-import { UpdateAlertRequest } from '../client/types';
-import { getAlertInfoFromComments } from '../routes/api/utils';
+import { SavedObjectsFindResult, SavedObjectsFindResponse, SavedObject } from 'kibana/server';
+import { isEmpty } from 'lodash';
+import { AlertInfo } from '.';
+
+import {
+  AssociationType,
+  CaseConnector,
+  CaseResponse,
+  CasesClientPostRequest,
+  CasesFindResponse,
+  CaseStatuses,
+  CommentAttributes,
+  CommentRequest,
+  CommentRequestAlertType,
+  CommentRequestUserType,
+  CommentResponse,
+  CommentsResponse,
+  CommentType,
+  ConnectorTypeFields,
+  ESCaseAttributes,
+  ESCaseConnector,
+  ESConnectorFields,
+  SubCaseAttributes,
+  SubCaseResponse,
+  SubCasesFindResponse,
+  User,
+} from '../../common/api';
+import { ENABLE_CASE_CONNECTOR } from '../../common/constants';
+import { UpdateAlertRequest } from '../client/alerts/client';
 
 /**
  * Default sort field for querying saved objects.
@@ -20,6 +46,304 @@ export const defaultSortField = 'created_at';
  */
 export const nullUser: User = { username: null, full_name: null, email: null };
 
+export const transformNewCase = ({
+  connector,
+  createdDate,
+  email,
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  full_name,
+  newCase,
+  username,
+}: {
+  connector: ESCaseConnector;
+  createdDate: string;
+  email?: string | null;
+  full_name?: string | null;
+  newCase: CasesClientPostRequest;
+  username?: string | null;
+}): ESCaseAttributes => ({
+  ...newCase,
+  closed_at: null,
+  closed_by: null,
+  connector,
+  created_at: createdDate,
+  created_by: { email, full_name, username },
+  external_service: null,
+  status: CaseStatuses.open,
+  updated_at: null,
+  updated_by: null,
+});
+
+export const transformCases = ({
+  casesMap,
+  countOpenCases,
+  countInProgressCases,
+  countClosedCases,
+  page,
+  perPage,
+  total,
+}: {
+  casesMap: Map<string, CaseResponse>;
+  countOpenCases: number;
+  countInProgressCases: number;
+  countClosedCases: number;
+  page: number;
+  perPage: number;
+  total: number;
+}): CasesFindResponse => ({
+  page,
+  per_page: perPage,
+  total,
+  cases: Array.from(casesMap.values()),
+  count_open_cases: countOpenCases,
+  count_in_progress_cases: countInProgressCases,
+  count_closed_cases: countClosedCases,
+});
+
+export const transformSubCases = ({
+  subCasesMap,
+  open,
+  inProgress,
+  closed,
+  page,
+  perPage,
+  total,
+}: {
+  subCasesMap: Map<string, SubCaseResponse[]>;
+  open: number;
+  inProgress: number;
+  closed: number;
+  page: number;
+  perPage: number;
+  total: number;
+}): SubCasesFindResponse => ({
+  page,
+  per_page: perPage,
+  total,
+  // Squish all the entries in the map together as one array
+  subCases: Array.from(subCasesMap.values()).flat(),
+  count_open_cases: open,
+  count_in_progress_cases: inProgress,
+  count_closed_cases: closed,
+});
+
+export const flattenCaseSavedObject = ({
+  savedObject,
+  comments = [],
+  totalComment = comments.length,
+  totalAlerts = 0,
+  subCases,
+  subCaseIds,
+}: {
+  savedObject: SavedObject<ESCaseAttributes>;
+  comments?: Array<SavedObject<CommentAttributes>>;
+  totalComment?: number;
+  totalAlerts?: number;
+  subCases?: SubCaseResponse[];
+  subCaseIds?: string[];
+}): CaseResponse => ({
+  id: savedObject.id,
+  version: savedObject.version ?? '0',
+  comments: flattenCommentSavedObjects(comments),
+  totalComment,
+  totalAlerts,
+  ...savedObject.attributes,
+  connector: transformESConnectorToCaseConnector(savedObject.attributes.connector),
+  subCases,
+  subCaseIds: !isEmpty(subCaseIds) ? subCaseIds : undefined,
+});
+
+export const flattenSubCaseSavedObject = ({
+  savedObject,
+  comments = [],
+  totalComment = comments.length,
+  totalAlerts = 0,
+}: {
+  savedObject: SavedObject<SubCaseAttributes>;
+  comments?: Array<SavedObject<CommentAttributes>>;
+  totalComment?: number;
+  totalAlerts?: number;
+}): SubCaseResponse => ({
+  id: savedObject.id,
+  version: savedObject.version ?? '0',
+  comments: flattenCommentSavedObjects(comments),
+  totalComment,
+  totalAlerts,
+  ...savedObject.attributes,
+});
+
+export const transformComments = (
+  comments: SavedObjectsFindResponse<CommentAttributes>
+): CommentsResponse => ({
+  page: comments.page,
+  per_page: comments.per_page,
+  total: comments.total,
+  comments: flattenCommentSavedObjects(comments.saved_objects),
+});
+
+export const flattenCommentSavedObjects = (
+  savedObjects: Array<SavedObject<CommentAttributes>>
+): CommentResponse[] =>
+  savedObjects.reduce((acc: CommentResponse[], savedObject: SavedObject<CommentAttributes>) => {
+    return [...acc, flattenCommentSavedObject(savedObject)];
+  }, []);
+
+export const flattenCommentSavedObject = (
+  savedObject: SavedObject<CommentAttributes>
+): CommentResponse => ({
+  id: savedObject.id,
+  version: savedObject.version ?? '0',
+  ...savedObject.attributes,
+});
+
+export const transformCaseConnectorToEsConnector = (connector: CaseConnector): ESCaseConnector => ({
+  id: connector?.id ?? 'none',
+  name: connector?.name ?? 'none',
+  type: connector?.type ?? '.none',
+  fields:
+    connector?.fields != null
+      ? Object.entries(connector.fields).reduce<ESConnectorFields>(
+          (acc, [key, value]) => [
+            ...acc,
+            {
+              key,
+              value,
+            },
+          ],
+          []
+        )
+      : [],
+});
+
+export const transformESConnectorToCaseConnector = (connector?: ESCaseConnector): CaseConnector => {
+  const connectorTypeField = {
+    type: connector?.type ?? '.none',
+    fields:
+      connector && connector.fields != null && connector.fields.length > 0
+        ? connector.fields.reduce(
+            (fields, { key, value }) => ({
+              ...fields,
+              [key]: value,
+            }),
+            {}
+          )
+        : null,
+  } as ConnectorTypeFields;
+
+  return {
+    id: connector?.id ?? 'none',
+    name: connector?.name ?? 'none',
+    ...connectorTypeField,
+  };
+};
+
+export const getIDsAndIndicesAsArrays = (
+  comment: CommentRequestAlertType
+): { ids: string[]; indices: string[] } => {
+  return {
+    ids: Array.isArray(comment.alertId) ? comment.alertId : [comment.alertId],
+    indices: Array.isArray(comment.index) ? comment.index : [comment.index],
+  };
+};
+
+/**
+ * This functions extracts the ids and indices from an alert comment. It enforces that the alertId and index are either
+ * both strings or string arrays that are the same length. If they are arrays they represent a 1-to-1 mapping of
+ * id existing in an index at each position in the array. This is not ideal. Ideally an alert comment request would
+ * accept an array of objects like this: Array<{id: string; index: string; ruleName: string ruleID: string}> instead.
+ *
+ * To reformat the alert comment request requires a migration and a breaking API change.
+ */
+const getAndValidateAlertInfoFromComment = (comment: CommentRequest): AlertInfo[] => {
+  if (!isCommentRequestTypeAlertOrGenAlert(comment)) {
+    return [];
+  }
+
+  const { ids, indices } = getIDsAndIndicesAsArrays(comment);
+
+  if (ids.length !== indices.length) {
+    return [];
+  }
+
+  return ids.map((id, index) => ({ id, index: indices[index] }));
+};
+
+/**
+ * Builds an AlertInfo object accumulating the alert IDs and indices for the passed in alerts.
+ */
+export const getAlertInfoFromComments = (comments: CommentRequest[] | undefined): AlertInfo[] => {
+  if (comments === undefined) {
+    return [];
+  }
+
+  return comments.reduce((acc: AlertInfo[], comment) => {
+    const alertInfo = getAndValidateAlertInfoFromComment(comment);
+    acc.push(...alertInfo);
+    return acc;
+  }, []);
+};
+
+type NewCommentArgs = CommentRequest & {
+  associationType: AssociationType;
+  createdDate: string;
+  owner: string;
+  email?: string | null;
+  full_name?: string | null;
+  username?: string | null;
+};
+
+export const transformNewComment = ({
+  associationType,
+  createdDate,
+  email,
+  // eslint-disable-next-line @typescript-eslint/naming-convention
+  full_name,
+  username,
+  ...comment
+}: NewCommentArgs): CommentAttributes => {
+  return {
+    associationType,
+    ...comment,
+    created_at: createdDate,
+    created_by: { email, full_name, username },
+    pushed_at: null,
+    pushed_by: null,
+    updated_at: null,
+    updated_by: null,
+  };
+};
+
+/**
+ * A type narrowing function for user comments. Exporting so integration tests can use it.
+ */
+export const isCommentRequestTypeUser = (
+  context: CommentRequest
+): context is CommentRequestUserType => {
+  return context.type === CommentType.user;
+};
+
+/**
+ * A type narrowing function for alert comments. Exporting so integration tests can use it.
+ */
+export const isCommentRequestTypeAlertOrGenAlert = (
+  context: CommentRequest
+): context is CommentRequestAlertType => {
+  return context.type === CommentType.alert || context.type === CommentType.generatedAlert;
+};
+
+/**
+ * This is used to test if the posted comment is an generated alert. A generated alert will have one or many alerts.
+ * An alert is essentially an object with a _id field. This differs from a regular attached alert because the _id is
+ * passed directly in the request, it won't be in an object. Internally case will strip off the outer object and store
+ * both a generated and user attached alert in the same structure but this function is useful to determine which
+ * structure the new alert in the request has.
+ */
+export const isCommentRequestTypeGenAlert = (
+  context: CommentRequest
+): context is CommentRequestAlertType => {
+  return context.type === CommentType.generatedAlert;
+};
+
 /**
  * Adds the ids and indices to a map of statuses
  */
@@ -33,28 +357,6 @@ export function createAlertUpdateRequest({
   return getAlertInfoFromComments([comment]).map((alert) => ({ ...alert, status }));
 }
 
-/**
- * Combines multiple filter expressions using the specified operator and parenthesis if multiple expressions exist.
- * This will ignore empty string filters. If a single valid filter is found it will not wrap in parenthesis.
- *
- * @param filters an array of filters to combine using the specified operator
- * @param operator AND or OR
- */
-export const combineFilters = (filters: string[] | undefined, operator: 'OR' | 'AND'): string => {
-  const noEmptyStrings = filters?.filter((value) => value !== '');
-  const joinedExp = noEmptyStrings?.join(` ${operator} `);
-  // if undefined or an empty string
-  if (!joinedExp) {
-    return '';
-  } else if ((noEmptyStrings?.length ?? 0) > 1) {
-    // if there were multiple filters, wrap them in ()
-    return `(${joinedExp})`;
-  } else {
-    // return a single value not wrapped in ()
-    return joinedExp;
-  }
-};
-
 /**
  * Counts the total alert IDs within a single comment.
  */
@@ -113,3 +415,14 @@ export const countAlertsForID = ({
 }): number | undefined => {
   return groupTotalAlertsByID({ comments }).get(id);
 };
+
+/**
+ * If subCaseID is defined and the case connector feature is disabled this throws an error.
+ */
+export function checkEnabledCaseConnectorOrThrow(subCaseID: string | undefined) {
+  if (!ENABLE_CASE_CONNECTOR && subCaseID !== undefined) {
+    throw Boom.badRequest(
+      'The sub case parameters are not supported when the case connector feature is disabled'
+    );
+  }
+}
diff --git a/x-pack/plugins/cases/server/connectors/case/index.test.ts b/x-pack/plugins/cases/server/connectors/case/index.test.ts
index 2415569392125..7b8f57bf0d3bf 100644
--- a/x-pack/plugins/cases/server/connectors/case/index.test.ts
+++ b/x-pack/plugins/cases/server/connectors/case/index.test.ts
@@ -18,43 +18,33 @@ import {
   AssociationType,
   CaseResponse,
   CasesResponse,
-} from '../../../common';
-import {
-  connectorMappingsServiceMock,
-  createCaseServiceMock,
-  createConfigureServiceMock,
-  createUserActionServiceMock,
-  createAlertServiceMock,
-} from '../../services/mocks';
+} from '../../../common/api';
 import { CaseActionType, CaseActionTypeExecutorOptions, CaseExecutorParams } from './types';
 import { getActionType } from '.';
-import { createExternalCasesClientMock } from '../../client/mocks';
-
-const mockCasesClient = createExternalCasesClientMock();
 
-jest.mock('../../client', () => ({
-  createExternalCasesClient: () => mockCasesClient,
-}));
+import {
+  CasesClientMock,
+  createCasesClientFactory,
+  createCasesClientMock,
+} from '../../client/mocks';
+import { SECURITY_SOLUTION_OWNER } from '../../../common';
 
 const services = actionsMock.createServices();
 let caseActionType: CaseActionType;
 
 describe('case connector', () => {
+  let mockCasesClient: CasesClientMock;
+
   beforeEach(() => {
-    jest.resetAllMocks();
     const logger = loggingSystemMock.create().get() as jest.Mocked<Logger>;
-    const caseService = createCaseServiceMock();
-    const caseConfigureService = createConfigureServiceMock();
-    const connectorMappingsService = connectorMappingsServiceMock();
-    const userActionService = createUserActionServiceMock();
-    const alertsService = createAlertServiceMock();
+
+    mockCasesClient = createCasesClientMock();
+
+    const factory = createCasesClientFactory();
+    factory.create.mockReturnValue(Promise.resolve(mockCasesClient));
     caseActionType = getActionType({
       logger,
-      caseService,
-      caseConfigureService,
-      connectorMappingsService,
-      userActionService,
-      alertsService,
+      factory,
     });
   });
 
@@ -764,6 +754,7 @@ describe('case connector', () => {
             comment: {
               comment: 'a comment',
               type: CommentType.user,
+              owner: SECURITY_SOLUTION_OWNER,
             },
           },
         };
@@ -784,6 +775,7 @@ describe('case connector', () => {
                 id: null,
                 name: null,
               },
+              owner: SECURITY_SOLUTION_OWNER,
             },
           },
         };
@@ -912,6 +904,7 @@ describe('case connector', () => {
     }
   });
 
+  // Enable these when the actions framework provides a request and a saved objects service
   // ENABLE_CASE_CONNECTOR: enable these tests after the case connector feature is completed
   describe.skip('execute', () => {
     it('allows only supported sub-actions', async () => {
@@ -966,9 +959,10 @@ describe('case connector', () => {
           settings: {
             syncAlerts: true,
           },
+          owner: SECURITY_SOLUTION_OWNER,
         };
 
-        mockCasesClient.create.mockReturnValue(Promise.resolve(createReturn));
+        mockCasesClient.cases.create.mockReturnValue(Promise.resolve(createReturn));
 
         const actionId = 'some-id';
         const params: CaseExecutorParams = {
@@ -1004,7 +998,7 @@ describe('case connector', () => {
         const result = await caseActionType.executor(executorOptions);
 
         expect(result).toEqual({ actionId, status: 'ok', data: createReturn });
-        expect(mockCasesClient.create).toHaveBeenCalledWith({
+        expect(mockCasesClient.cases.create).toHaveBeenCalledWith({
           ...params.subActionParams,
           connector: {
             id: 'jira',
@@ -1062,10 +1056,11 @@ describe('case connector', () => {
             settings: {
               syncAlerts: true,
             },
+            owner: SECURITY_SOLUTION_OWNER,
           },
         ];
 
-        mockCasesClient.update.mockReturnValue(Promise.resolve(updateReturn));
+        mockCasesClient.cases.update.mockReturnValue(Promise.resolve(updateReturn));
 
         const actionId = 'some-id';
         const params: CaseExecutorParams = {
@@ -1093,7 +1088,7 @@ describe('case connector', () => {
         const result = await caseActionType.executor(executorOptions);
 
         expect(result).toEqual({ actionId, status: 'ok', data: updateReturn });
-        expect(mockCasesClient.update).toHaveBeenCalledWith({
+        expect(mockCasesClient.cases.update).toHaveBeenCalledWith({
           // Null values have been striped out.
           cases: [
             {
@@ -1113,7 +1108,6 @@ describe('case connector', () => {
           totalComment: 0,
           totalAlerts: 0,
           version: 'WzksMV0=',
-
           closed_at: null,
           closed_by: null,
           connector: { id: 'none', name: 'none', type: ConnectorTypes.none, fields: null },
@@ -1143,6 +1137,7 @@ describe('case connector', () => {
                 username: 'awesome',
               },
               id: 'mock-comment',
+              owner: SECURITY_SOLUTION_OWNER,
               pushed_at: null,
               pushed_by: null,
               updated_at: null,
@@ -1153,9 +1148,10 @@ describe('case connector', () => {
           settings: {
             syncAlerts: true,
           },
+          owner: SECURITY_SOLUTION_OWNER,
         };
 
-        mockCasesClient.addComment.mockReturnValue(Promise.resolve(commentReturn));
+        mockCasesClient.attachments.add.mockReturnValue(Promise.resolve(commentReturn));
 
         const actionId = 'some-id';
         const params: CaseExecutorParams = {
@@ -1165,6 +1161,7 @@ describe('case connector', () => {
             comment: {
               comment: 'a comment',
               type: CommentType.user,
+              owner: SECURITY_SOLUTION_OWNER,
             },
           },
         };
@@ -1180,7 +1177,7 @@ describe('case connector', () => {
         const result = await caseActionType.executor(executorOptions);
 
         expect(result).toEqual({ actionId, status: 'ok', data: commentReturn });
-        expect(mockCasesClient.addComment).toHaveBeenCalledWith({
+        expect(mockCasesClient.attachments.add).toHaveBeenCalledWith({
           caseId: 'case-id',
           comment: {
             comment: 'a comment',
diff --git a/x-pack/plugins/cases/server/connectors/case/index.ts b/x-pack/plugins/cases/server/connectors/case/index.ts
index be519f97f2343..4a706d8fcb52c 100644
--- a/x-pack/plugins/cases/server/connectors/case/index.ts
+++ b/x-pack/plugins/cases/server/connectors/case/index.ts
@@ -8,8 +8,12 @@
 import { curry } from 'lodash';
 import { Logger } from 'src/core/server';
 import { ActionTypeExecutorResult } from '../../../../actions/common';
-import { CasePatchRequest, CasePostRequest, CommentRequest, CommentType } from '../../../common';
-import { createExternalCasesClient } from '../../client';
+import {
+  CasePatchRequest,
+  CasePostRequest,
+  CommentRequest,
+  CommentType,
+} from '../../../common/api';
 import { CaseExecutorParamsSchema, CaseConfigurationSchema, CommentSchemaType } from './schema';
 import {
   CaseExecutorResponse,
@@ -20,21 +24,14 @@ import {
 import * as i18n from './translations';
 
 import { GetActionTypeParams, isCommentGeneratedAlert, separator } from '..';
-import { nullUser } from '../../common';
 import { createCaseError } from '../../common/error';
 import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
+import { CasesClient } from '../../client';
 
 const supportedSubActions: string[] = ['create', 'update', 'addComment'];
 
 // action type definition
-export function getActionType({
-  logger,
-  caseService,
-  caseConfigureService,
-  connectorMappingsService,
-  userActionService,
-  alertsService,
-}: GetActionTypeParams): CaseActionType {
+export function getActionType({ logger, factory }: GetActionTypeParams): CaseActionType {
   return {
     id: '.case',
     minimumLicenseRequired: 'basic',
@@ -44,26 +41,15 @@ export function getActionType({
       params: CaseExecutorParamsSchema,
     },
     executor: curry(executor)({
-      alertsService,
-      caseConfigureService,
-      caseService,
-      connectorMappingsService,
+      factory,
       logger,
-      userActionService,
     }),
   };
 }
 
 // action executor
 async function executor(
-  {
-    alertsService,
-    caseConfigureService,
-    caseService,
-    connectorMappingsService,
-    logger,
-    userActionService,
-  }: GetActionTypeParams,
+  { logger, factory }: GetActionTypeParams,
   execOptions: CaseActionTypeExecutorOptions
 ): Promise<ActionTypeExecutorResult<CaseExecutorResponse | {}>> {
   if (!ENABLE_CASE_CONNECTOR) {
@@ -72,23 +58,11 @@ async function executor(
     throw new Error(msg);
   }
 
-  const { actionId, params, services } = execOptions;
+  const { actionId, params } = execOptions;
   const { subAction, subActionParams } = params;
   let data: CaseExecutorResponse | null = null;
 
-  const { savedObjectsClient, scopedClusterClient } = services;
-  const casesClient = createExternalCasesClient({
-    savedObjectsClient,
-    scopedClusterClient,
-    // we might want the user information to be passed as part of the action request
-    user: nullUser,
-    caseService,
-    caseConfigureService,
-    connectorMappingsService,
-    userActionService,
-    alertsService,
-    logger,
-  });
+  let casesClient: CasesClient | undefined;
 
   if (!supportedSubActions.includes(subAction)) {
     const errorMessage = `[Action][Case] subAction ${subAction} not implemented.`;
@@ -96,54 +70,57 @@ async function executor(
     throw new Error(errorMessage);
   }
 
-  if (subAction === 'create') {
-    try {
-      data = await casesClient.create({
-        ...(subActionParams as CasePostRequest),
-      });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to create a case using connector: ${error}`,
-        error,
-        logger,
-      });
+  // When the actions framework provides the request and a way to retrieve the saved objects client with access to our
+  // hidden types then remove this outer if block and initialize the casesClient using the factory.
+  if (casesClient) {
+    if (subAction === 'create') {
+      try {
+        data = await casesClient.cases.create({
+          ...(subActionParams as CasePostRequest),
+        });
+      } catch (error) {
+        throw createCaseError({
+          message: `Failed to create a case using connector: ${error}`,
+          error,
+          logger,
+        });
+      }
     }
-  }
 
-  if (subAction === 'update') {
-    const updateParamsWithoutNullValues = Object.entries(subActionParams).reduce(
-      (acc, [key, value]) => ({
-        ...acc,
-        ...(value != null ? { [key]: value } : {}),
-      }),
-      {} as CasePatchRequest
-    );
+    if (subAction === 'update') {
+      const updateParamsWithoutNullValues = Object.entries(subActionParams).reduce(
+        (acc, [key, value]) => ({
+          ...acc,
+          ...(value != null ? { [key]: value } : {}),
+        }),
+        {} as CasePatchRequest
+      );
 
-    try {
-      data = await casesClient.update({ cases: [updateParamsWithoutNullValues] });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to update case using connector id: ${updateParamsWithoutNullValues?.id} version: ${updateParamsWithoutNullValues?.version}: ${error}`,
-        error,
-        logger,
-      });
+      try {
+        data = await casesClient.cases.update({ cases: [updateParamsWithoutNullValues] });
+      } catch (error) {
+        throw createCaseError({
+          message: `Failed to update case using connector id: ${updateParamsWithoutNullValues?.id} version: ${updateParamsWithoutNullValues?.version}: ${error}`,
+          error,
+          logger,
+        });
+      }
     }
-  }
 
-  if (subAction === 'addComment') {
-    const { caseId, comment } = subActionParams as ExecutorSubActionAddCommentParams;
-    try {
-      const formattedComment = transformConnectorComment(comment, logger);
-      data = await casesClient.addComment({ caseId, comment: formattedComment });
-    } catch (error) {
-      throw createCaseError({
-        message: `Failed to create comment using connector case id: ${caseId}: ${error}`,
-        error,
-        logger,
-      });
+    if (subAction === 'addComment') {
+      const { caseId, comment } = subActionParams as ExecutorSubActionAddCommentParams;
+      try {
+        const formattedComment = transformConnectorComment(comment, logger);
+        data = await casesClient.attachments.add({ caseId, comment: formattedComment });
+      } catch (error) {
+        throw createCaseError({
+          message: `Failed to create comment using connector case id: ${caseId}: ${error}`,
+          error,
+          logger,
+        });
+      }
     }
   }
-
   return { status: 'ok', data: data ?? {}, actionId };
 }
 
@@ -200,6 +177,7 @@ export const transformConnectorComment = (
         alertId: ids,
         index: indices,
         rule,
+        owner: comment.owner,
       };
     } catch (e) {
       throw createCaseError({
diff --git a/x-pack/plugins/cases/server/connectors/case/schema.ts b/x-pack/plugins/cases/server/connectors/case/schema.ts
index 803b01cbbdc57..596a5a4aae45e 100644
--- a/x-pack/plugins/cases/server/connectors/case/schema.ts
+++ b/x-pack/plugins/cases/server/connectors/case/schema.ts
@@ -15,11 +15,13 @@ export const CaseConfigurationSchema = schema.object({});
 const ContextTypeUserSchema = schema.object({
   type: schema.literal(CommentType.user),
   comment: schema.string(),
+  owner: schema.string(),
 });
 
 const ContextTypeAlertGroupSchema = schema.object({
   type: schema.literal(CommentType.generatedAlert),
   alerts: schema.string(),
+  owner: schema.string(),
 });
 
 export type ContextTypeGeneratedAlertType = typeof ContextTypeAlertGroupSchema.type;
@@ -33,6 +35,7 @@ const ContextTypeAlertSchema = schema.object({
     id: schema.nullable(schema.string()),
     name: schema.nullable(schema.string()),
   }),
+  owner: schema.string(),
 });
 
 export type ContextTypeAlertSchemaType = typeof ContextTypeAlertSchema.type;
diff --git a/x-pack/plugins/cases/server/connectors/index.ts b/x-pack/plugins/cases/server/connectors/index.ts
index ecf04e4f7b0f1..4b6f845a961f2 100644
--- a/x-pack/plugins/cases/server/connectors/index.ts
+++ b/x-pack/plugins/cases/server/connectors/index.ts
@@ -29,22 +29,14 @@ export { transformConnectorComment } from './case';
 export const separator = '__SEPARATOR__';
 
 export const registerConnectors = ({
-  actionsRegisterType,
+  registerActionType,
   logger,
-  caseService,
-  caseConfigureService,
-  connectorMappingsService,
-  userActionService,
-  alertsService,
+  factory,
 }: RegisterConnectorsArgs) => {
-  actionsRegisterType(
+  registerActionType(
     getCaseConnector({
       logger,
-      caseService,
-      caseConfigureService,
-      connectorMappingsService,
-      userActionService,
-      alertsService,
+      factory,
     })
   );
 };
diff --git a/x-pack/plugins/cases/server/connectors/types.ts b/x-pack/plugins/cases/server/connectors/types.ts
index fae1ec2976bc0..98cbe9683546b 100644
--- a/x-pack/plugins/cases/server/connectors/types.ts
+++ b/x-pack/plugins/cases/server/connectors/types.ts
@@ -6,22 +6,10 @@
  */
 
 import { Logger } from 'kibana/server';
-import {
-  ActionTypeConfig,
-  ActionTypeSecrets,
-  ActionTypeParams,
-  ActionType,
-  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
-} from '../../../actions/server/types';
-import { CaseResponse, ConnectorTypes } from '../../common';
+import { CaseResponse, ConnectorTypes } from '../../common/api';
 import { CasesClientGetAlertsResponse } from '../client/alerts/types';
-import {
-  CaseServiceSetup,
-  CaseConfigureServiceSetup,
-  CaseUserActionServiceSetup,
-  ConnectorMappingsServiceSetup,
-  AlertServiceContract,
-} from '../services';
+import { CasesClientFactory } from '../client/factory';
+import { RegisterActionType } from '../types';
 
 export {
   ContextTypeGeneratedAlertType,
@@ -31,22 +19,11 @@ export {
 
 export interface GetActionTypeParams {
   logger: Logger;
-  caseService: CaseServiceSetup;
-  caseConfigureService: CaseConfigureServiceSetup;
-  connectorMappingsService: ConnectorMappingsServiceSetup;
-  userActionService: CaseUserActionServiceSetup;
-  alertsService: AlertServiceContract;
+  factory: CasesClientFactory;
 }
 
 export interface RegisterConnectorsArgs extends GetActionTypeParams {
-  actionsRegisterType<
-    Config extends ActionTypeConfig = ActionTypeConfig,
-    Secrets extends ActionTypeSecrets = ActionTypeSecrets,
-    Params extends ActionTypeParams = ActionTypeParams,
-    ExecutorResultData = void
-  >(
-    actionType: ActionType<Config, Secrets, Params, ExecutorResultData>
-  ): void;
+  registerActionType: RegisterActionType;
 }
 
 export type FormatterConnectorTypes = Exclude<ConnectorTypes, ConnectorTypes.none>;
diff --git a/x-pack/plugins/cases/server/index.ts b/x-pack/plugins/cases/server/index.ts
index 40c823b42771f..0e4554572aad9 100644
--- a/x-pack/plugins/cases/server/index.ts
+++ b/x-pack/plugins/cases/server/index.ts
@@ -5,13 +5,7 @@
  * 2.0.
  */
 
-import {
-  KibanaRequest,
-  PluginConfigDescriptor,
-  PluginInitializerContext,
-  RequestHandlerContext,
-} from 'kibana/server';
-import { CasesClient } from './client';
+import { PluginConfigDescriptor, PluginInitializerContext } from 'kibana/server';
 export { CasesClient } from './client';
 import { ConfigType, ConfigSchema } from './config';
 import { CasePlugin } from './plugin';
@@ -26,9 +20,4 @@ export const config: PluginConfigDescriptor<ConfigType> = {
 export const plugin = (initializerContext: PluginInitializerContext) =>
   new CasePlugin(initializerContext);
 
-export interface PluginStartContract {
-  getCasesClientWithRequestAndContext(
-    context: RequestHandlerContext,
-    request: KibanaRequest
-  ): CasesClient;
-}
+export { PluginStartContract } from './plugin';
diff --git a/x-pack/plugins/cases/server/plugin.ts b/x-pack/plugins/cases/server/plugin.ts
index fda98356e181c..34cf71aff58ba 100644
--- a/x-pack/plugins/cases/server/plugin.ts
+++ b/x-pack/plugins/cases/server/plugin.ts
@@ -5,18 +5,15 @@
  * 2.0.
  */
 
-import {
-  IContextProvider,
-  KibanaRequest,
-  Logger,
-  PluginInitializerContext,
-  RequestHandlerContext,
-} from 'kibana/server';
+import { IContextProvider, KibanaRequest, Logger, PluginInitializerContext } from 'kibana/server';
 import { CoreSetup, CoreStart } from 'src/core/server';
 
-import { SecurityPluginSetup } from '../../security/server';
-import { PluginSetupContract as ActionsPluginSetup } from '../../actions/server';
-import { APP_ID, ENABLE_CASE_CONNECTOR } from '../common';
+import { SecurityPluginSetup, SecurityPluginStart } from '../../security/server';
+import {
+  PluginSetupContract as ActionsPluginSetup,
+  PluginStartContract as ActionsPluginStart,
+} from '../../actions/server';
+import { APP_ID, ENABLE_CASE_CONNECTOR } from '../common/constants';
 
 import { ConfigType } from './config';
 import { initCaseApi } from './routes/api';
@@ -28,41 +25,51 @@ import {
   caseUserActionSavedObjectType,
   subCaseSavedObjectType,
 } from './saved_object_types';
-import {
-  CaseConfigureService,
-  CaseConfigureServiceSetup,
-  CaseService,
-  CaseServiceSetup,
-  CaseUserActionService,
-  CaseUserActionServiceSetup,
-  ConnectorMappingsService,
-  ConnectorMappingsServiceSetup,
-  AlertService,
-  AlertServiceContract,
-} from './services';
-import { CasesClientHandler, createExternalCasesClient } from './client';
+
+import { CasesClient } from './client';
 import { registerConnectors } from './connectors';
 import type { CasesRequestHandlerContext } from './types';
+import { CasesClientFactory } from './client/factory';
+import { SpacesPluginStart } from '../../spaces/server';
+import { PluginStartContract as FeaturesPluginStart } from '../../features/server';
 
 function createConfig(context: PluginInitializerContext) {
   return context.config.get<ConfigType>();
 }
 
 export interface PluginsSetup {
-  security: SecurityPluginSetup;
+  security?: SecurityPluginSetup;
   actions: ActionsPluginSetup;
 }
 
+export interface PluginsStart {
+  security?: SecurityPluginStart;
+  features: FeaturesPluginStart;
+  spaces?: SpacesPluginStart;
+  actions: ActionsPluginStart;
+}
+
+/**
+ * Cases server exposed contract for interacting with cases entities.
+ */
+export interface PluginStartContract {
+  /**
+   * Returns a client which can be used to interact with the cases backend entities.
+   *
+   * @param request a KibanaRequest
+   * @returns a {@link CasesClient}
+   */
+  getCasesClientWithRequest(request: KibanaRequest): Promise<CasesClient>;
+}
+
 export class CasePlugin {
   private readonly log: Logger;
-  private caseConfigureService?: CaseConfigureServiceSetup;
-  private caseService?: CaseServiceSetup;
-  private connectorMappingsService?: ConnectorMappingsServiceSetup;
-  private userActionService?: CaseUserActionServiceSetup;
-  private alertsService?: AlertService;
+  private clientFactory: CasesClientFactory;
+  private securityPluginSetup?: SecurityPluginSetup;
 
   constructor(private readonly initializerContext: PluginInitializerContext) {
     this.log = this.initializerContext.logger.get();
+    this.clientFactory = new CasesClientFactory(this.log);
   }
 
   public async setup(core: CoreSetup, plugins: PluginsSetup) {
@@ -72,6 +79,8 @@ export class CasePlugin {
       return;
     }
 
+    this.securityPluginSetup = plugins.security;
+
     core.savedObjects.registerType(caseCommentSavedObjectType);
     core.savedObjects.registerType(caseConfigureSavedObjectType);
     core.savedObjects.registerType(caseConnectorMappingsSavedObjectType);
@@ -84,75 +93,54 @@ export class CasePlugin {
       )}] and plugins [${Object.keys(plugins)}]`
     );
 
-    this.caseService = new CaseService(
-      this.log,
-      plugins.security != null ? plugins.security.authc : undefined
-    );
-    this.caseConfigureService = await new CaseConfigureService(this.log).setup();
-    this.connectorMappingsService = await new ConnectorMappingsService(this.log).setup();
-    this.userActionService = await new CaseUserActionService(this.log).setup();
-    this.alertsService = new AlertService();
-
     core.http.registerRouteHandlerContext<CasesRequestHandlerContext, 'cases'>(
       APP_ID,
       this.createRouteHandlerContext({
         core,
-        caseService: this.caseService,
-        caseConfigureService: this.caseConfigureService,
-        connectorMappingsService: this.connectorMappingsService,
-        userActionService: this.userActionService,
-        alertsService: this.alertsService,
-        logger: this.log,
       })
     );
 
     const router = core.http.createRouter<CasesRequestHandlerContext>();
     initCaseApi({
       logger: this.log,
-      caseService: this.caseService,
-      caseConfigureService: this.caseConfigureService,
-      connectorMappingsService: this.connectorMappingsService,
-      userActionService: this.userActionService,
       router,
     });
 
     if (ENABLE_CASE_CONNECTOR) {
       core.savedObjects.registerType(subCaseSavedObjectType);
       registerConnectors({
-        actionsRegisterType: plugins.actions.registerType,
+        registerActionType: plugins.actions.registerType,
         logger: this.log,
-        caseService: this.caseService,
-        caseConfigureService: this.caseConfigureService,
-        connectorMappingsService: this.connectorMappingsService,
-        userActionService: this.userActionService,
-        alertsService: this.alertsService,
+        factory: this.clientFactory,
       });
     }
   }
 
-  public start(core: CoreStart) {
+  public start(core: CoreStart, plugins: PluginsStart): PluginStartContract {
     this.log.debug(`Starting Case Workflow`);
 
-    const getCasesClientWithRequestAndContext = async (
-      context: RequestHandlerContext,
-      request: KibanaRequest
-    ) => {
-      const user = await this.caseService!.getUser({ request });
-      return createExternalCasesClient({
-        scopedClusterClient: context.core.elasticsearch.client.asCurrentUser,
-        savedObjectsClient: core.savedObjects.getScopedClient(request),
-        user,
-        caseService: this.caseService!,
-        caseConfigureService: this.caseConfigureService!,
-        connectorMappingsService: this.connectorMappingsService!,
-        userActionService: this.userActionService!,
-        alertsService: this.alertsService!,
-        logger: this.log,
+    this.clientFactory.initialize({
+      securityPluginSetup: this.securityPluginSetup,
+      securityPluginStart: plugins.security,
+      getSpace: async (request: KibanaRequest) => {
+        return plugins.spaces?.spacesService.getActiveSpace(request);
+      },
+      featuresPluginStart: plugins.features,
+      actionsPluginStart: plugins.actions,
+    });
+
+    const client = core.elasticsearch.client;
+
+    const getCasesClientWithRequest = async (request: KibanaRequest): Promise<CasesClient> => {
+      return this.clientFactory.create({
+        request,
+        scopedClusterClient: client.asScoped(request).asCurrentUser,
+        savedObjectsService: core.savedObjects,
       });
     };
 
     return {
-      getCasesClientWithRequestAndContext,
+      getCasesClientWithRequest,
     };
   }
 
@@ -162,36 +150,18 @@ export class CasePlugin {
 
   private createRouteHandlerContext = ({
     core,
-    caseService,
-    caseConfigureService,
-    connectorMappingsService,
-    userActionService,
-    alertsService,
-    logger,
   }: {
     core: CoreSetup;
-    caseService: CaseServiceSetup;
-    caseConfigureService: CaseConfigureServiceSetup;
-    connectorMappingsService: ConnectorMappingsServiceSetup;
-    userActionService: CaseUserActionServiceSetup;
-    alertsService: AlertServiceContract;
-    logger: Logger;
   }): IContextProvider<CasesRequestHandlerContext, 'cases'> => {
     return async (context, request, response) => {
-      const [{ savedObjects }] = await core.getStartServices();
-      const user = await caseService.getUser({ request });
       return {
-        getCasesClient: () => {
-          return new CasesClientHandler({
+        getCasesClient: async () => {
+          const [{ savedObjects }] = await core.getStartServices();
+
+          return this.clientFactory.create({
+            request,
             scopedClusterClient: context.core.elasticsearch.client.asCurrentUser,
-            savedObjectsClient: savedObjects.getScopedClient(request),
-            caseService,
-            caseConfigureService,
-            connectorMappingsService,
-            userActionService,
-            alertsService,
-            user,
-            logger,
+            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 66d3ffe5f23d1..a9292229d5eea 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
@@ -16,7 +16,7 @@ function createAuthenticationMock({
   authc.getCurrentUser.mockReturnValue(
     currentUser !== undefined
       ? // if we pass in null then use the null user (has null for each field) this is the default behavior
-        // for the CaseService getUser method
+        // for the CasesService getUser method
         currentUser !== null
         ? currentUser
         : nullUser
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/create_mock_so_repository.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/create_mock_so_repository.ts
deleted file mode 100644
index a33226bcde899..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/create_mock_so_repository.ts
+++ /dev/null
@@ -1,305 +0,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 {
-  SavedObjectsClientContract,
-  SavedObjectsErrorHelpers,
-  SavedObjectsBulkGetObject,
-  SavedObjectsBulkUpdateObject,
-  SavedObjectsFindOptions,
-} from 'src/core/server';
-
-import {
-  CASE_COMMENT_SAVED_OBJECT,
-  CASE_SAVED_OBJECT,
-  CASE_CONFIGURE_SAVED_OBJECT,
-  CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
-  SUB_CASE_SAVED_OBJECT,
-  CASE_USER_ACTION_SAVED_OBJECT,
-} from '../../../saved_object_types';
-
-export const createMockSavedObjectsRepository = ({
-  caseSavedObject = [],
-  caseCommentSavedObject = [],
-  caseConfigureSavedObject = [],
-  caseMappingsSavedObject = [],
-  caseUserActionsSavedObject = [],
-}: {
-  caseSavedObject?: any[];
-  caseCommentSavedObject?: any[];
-  caseConfigureSavedObject?: any[];
-  caseMappingsSavedObject?: any[];
-  caseUserActionsSavedObject?: any[];
-} = {}) => {
-  const mockSavedObjectsClientContract = ({
-    bulkGet: jest.fn((objects: SavedObjectsBulkGetObject[]) => {
-      return {
-        saved_objects: objects.map(({ id, type }) => {
-          if (type === CASE_COMMENT_SAVED_OBJECT) {
-            const result = caseCommentSavedObject.filter((s) => s.id === id);
-            if (!result.length) {
-              throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-            }
-            return result;
-          }
-          const result = caseSavedObject.filter((s) => s.id === id);
-          if (!result.length) {
-            return {
-              id,
-              type,
-              error: {
-                statusCode: 404,
-                error: 'Not Found',
-                message: 'Saved object [cases/not-exist] not found',
-              },
-            };
-          }
-          return result[0];
-        }),
-      };
-    }),
-    bulkCreate: jest.fn(),
-    bulkUpdate: jest.fn((objects: Array<SavedObjectsBulkUpdateObject<unknown>>) => {
-      return {
-        saved_objects: objects.map(({ id, type, attributes }) => {
-          if (type === CASE_COMMENT_SAVED_OBJECT) {
-            if (!caseCommentSavedObject.find((s) => s.id === id)) {
-              throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-            }
-          } else if (type === CASE_SAVED_OBJECT) {
-            if (!caseSavedObject.find((s) => s.id === id)) {
-              throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-            }
-          }
-
-          return {
-            id,
-            type,
-            updated_at: '2019-11-22T22:50:55.191Z',
-            version: 'WzE3LDFd',
-            attributes,
-          };
-        }),
-      };
-    }),
-    get: jest.fn((type, id) => {
-      if (type === CASE_COMMENT_SAVED_OBJECT) {
-        const result = caseCommentSavedObject.filter((s) => s.id === id);
-        if (!result.length) {
-          throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-        }
-        return result[0];
-      } else if (type === CASE_SAVED_OBJECT) {
-        const result = caseSavedObject.filter((s) => s.id === id);
-        if (!result.length) {
-          throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-        }
-        return result[0];
-      } else {
-        throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-      }
-    }),
-    find: jest.fn((findArgs: SavedObjectsFindOptions) => {
-      // References can be an array so we need to loop through it looking for the bad-guy
-      const hasReferenceIncludeBadGuy = (args: SavedObjectsFindOptions) => {
-        const references = args.hasReference;
-        if (references) {
-          return Array.isArray(references)
-            ? references.some((ref) => ref.id === 'bad-guy')
-            : references.id === 'bad-guy';
-        } else {
-          return false;
-        }
-      };
-      if (hasReferenceIncludeBadGuy(findArgs)) {
-        throw SavedObjectsErrorHelpers.createBadRequestError('Error thrown for testing');
-      }
-
-      if (
-        (findArgs.type === CASE_CONFIGURE_SAVED_OBJECT &&
-          caseConfigureSavedObject[0] &&
-          caseConfigureSavedObject[0].id === 'throw-error-find') ||
-        (findArgs.type === CASE_SAVED_OBJECT &&
-          caseSavedObject[0] &&
-          caseSavedObject[0].id === 'throw-error-find')
-      ) {
-        throw SavedObjectsErrorHelpers.createGenericNotFoundError('Error thrown for testing');
-      }
-      if (findArgs.type === CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT && caseMappingsSavedObject[0]) {
-        return {
-          page: 1,
-          per_page: 5,
-          total: 1,
-          saved_objects: caseMappingsSavedObject,
-        };
-      }
-
-      if (findArgs.type === CASE_CONFIGURE_SAVED_OBJECT) {
-        return {
-          page: 1,
-          per_page: 5,
-          total: caseConfigureSavedObject.length,
-          saved_objects: caseConfigureSavedObject,
-        };
-      }
-
-      if (findArgs.type === CASE_COMMENT_SAVED_OBJECT) {
-        return {
-          page: 1,
-          per_page: 5,
-          total: caseCommentSavedObject.length,
-          saved_objects: caseCommentSavedObject,
-        };
-      }
-
-      // Currently not supporting sub cases in this mock library
-      if (findArgs.type === SUB_CASE_SAVED_OBJECT) {
-        return {
-          page: 1,
-          per_page: 0,
-          total: 0,
-          saved_objects: [],
-        };
-      }
-
-      if (findArgs.type === CASE_USER_ACTION_SAVED_OBJECT) {
-        return {
-          page: 1,
-          per_page: 5,
-          total: caseUserActionsSavedObject.length,
-          saved_objects: caseUserActionsSavedObject,
-        };
-      }
-
-      return {
-        page: 1,
-        per_page: 5,
-        total: caseSavedObject.length,
-        saved_objects: caseSavedObject,
-      };
-    }),
-    create: jest.fn((type, attributes, references) => {
-      if (attributes.description === 'Throw an error' || attributes.comment === 'Throw an error') {
-        throw SavedObjectsErrorHelpers.createBadRequestError('Error thrown for testing');
-      }
-
-      if (
-        type === CASE_CONFIGURE_SAVED_OBJECT &&
-        attributes.connector.id === 'throw-error-create'
-      ) {
-        throw SavedObjectsErrorHelpers.createBadRequestError('Error thrown for testing');
-      }
-
-      if (type === CASE_COMMENT_SAVED_OBJECT) {
-        const newCommentObj = {
-          type,
-          id: 'mock-comment',
-          attributes,
-          ...references,
-          updated_at: '2019-12-02T22:48:08.327Z',
-          version: 'WzksMV0=',
-        };
-        caseCommentSavedObject = [...caseCommentSavedObject, newCommentObj];
-        return newCommentObj;
-      }
-
-      if (type === CASE_CONFIGURE_SAVED_OBJECT) {
-        const newConfiguration = {
-          type,
-          id: 'mock-configuration',
-          attributes,
-          updated_at: '2020-04-09T09:43:51.778Z',
-          version: attributes.connector.id === 'no-version' ? undefined : 'WzksMV0=',
-        };
-
-        caseConfigureSavedObject = [newConfiguration];
-        return newConfiguration;
-      }
-
-      return {
-        type,
-        id: 'mock-it',
-        attributes,
-        references: [],
-        updated_at: '2019-12-02T22:48:08.327Z',
-        version: 'WzksMV0=',
-      };
-    }),
-    update: jest.fn((type, id, attributes) => {
-      if (type === CASE_COMMENT_SAVED_OBJECT) {
-        const foundComment = caseCommentSavedObject.findIndex((s: { id: string }) => s.id === id);
-        if (foundComment === -1) {
-          throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-        }
-        const comment = caseCommentSavedObject[foundComment];
-        caseCommentSavedObject.splice(foundComment, 1, {
-          ...comment,
-          id,
-          type,
-          updated_at: '2019-11-22T22:50:55.191Z',
-          version: 'WzE3LDFd',
-          attributes: {
-            ...comment.attributes,
-            ...attributes,
-          },
-        });
-      } else if (type === CASE_SAVED_OBJECT) {
-        if (!caseSavedObject.find((s) => s.id === id)) {
-          throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-        }
-      }
-
-      if (type === CASE_CONFIGURE_SAVED_OBJECT) {
-        return {
-          id,
-          type,
-          updated_at: '2019-11-22T22:50:55.191Z',
-          attributes,
-          version: attributes.connector?.id === 'no-version' ? undefined : 'WzE3LDFd',
-        };
-      }
-
-      return {
-        id,
-        type,
-        updated_at: '2019-11-22T22:50:55.191Z',
-        version: 'WzE3LDFd',
-        attributes,
-      };
-    }),
-    delete: jest.fn((type: string, id: string) => {
-      let result = caseSavedObject.filter((s) => s.id === id);
-
-      if (type === CASE_COMMENT_SAVED_OBJECT) {
-        result = caseCommentSavedObject.filter((s) => s.id === id);
-      }
-
-      if (type === CASE_CONFIGURE_SAVED_OBJECT) {
-        result = caseConfigureSavedObject.filter((s) => s.id === id);
-      }
-
-      if (type === CASE_COMMENT_SAVED_OBJECT && id === 'bad-guy') {
-        throw SavedObjectsErrorHelpers.createBadRequestError('Error thrown for testing');
-      }
-
-      if (!result.length) {
-        throw SavedObjectsErrorHelpers.createGenericNotFoundError(type, id);
-      }
-
-      if (
-        type === CASE_CONFIGURE_SAVED_OBJECT &&
-        caseConfigureSavedObject[0].id === 'throw-error-delete'
-      ) {
-        throw new Error('Error thrown for testing');
-      }
-      return {};
-    }),
-    deleteByNamespace: jest.fn(),
-  } as unknown) as jest.Mocked<SavedObjectsClientContract>;
-
-  return mockSavedObjectsClientContract;
-};
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/index.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/index.ts
index 1abd44aec1552..25f9b05471a0d 100644
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/index.ts
+++ b/x-pack/plugins/cases/server/routes/api/__fixtures__/index.ts
@@ -6,8 +6,4 @@
  */
 
 export * from './mock_saved_objects';
-export { createMockSavedObjectsRepository } from './create_mock_so_repository';
-export { createRouteContext } from './route_contexts';
 export { authenticationMock } from './authc_mock';
-export { createRoute } from './mock_router';
-export { createActionsClient } from './mock_actions_client';
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_actions_client.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_actions_client.ts
deleted file mode 100644
index d153c328cbb91..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_actions_client.ts
+++ /dev/null
@@ -1,34 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { SavedObjectsErrorHelpers } from 'src/core/server';
-import { actionsClientMock } from '../../../../../actions/server/mocks';
-import {
-  getActions,
-  getActionTypes,
-  getActionExecuteResults,
-} from '../__mocks__/request_responses';
-
-export const createActionsClient = () => {
-  const actionsMock = actionsClientMock.create();
-  actionsMock.getAll.mockImplementation(() => Promise.resolve(getActions()));
-  actionsMock.listTypes.mockImplementation(() => Promise.resolve(getActionTypes()));
-  actionsMock.get.mockImplementation(({ id }) => {
-    const actions = getActions();
-    const action = actions.find((a) => a.id === id);
-    if (action) {
-      return Promise.resolve(action);
-    } else {
-      return Promise.reject(SavedObjectsErrorHelpers.createGenericNotFoundError('action', id));
-    }
-  });
-  actionsMock.execute.mockImplementation(({ actionId }) =>
-    Promise.resolve(getActionExecuteResults(actionId))
-  );
-
-  return actionsMock;
-};
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_router.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_router.ts
deleted file mode 100644
index 18cce1b087e5d..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/mock_router.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 { loggingSystemMock, httpServiceMock } from '../../../../../../../src/core/server/mocks';
-import { CaseService, CaseConfigureService, ConnectorMappingsService } from '../../../services';
-import { authenticationMock } from '../__fixtures__';
-import { RouteDeps } from '../types';
-
-export const createRoute = async (
-  api: (deps: RouteDeps) => void,
-  method: 'get' | 'post' | 'delete' | 'patch',
-  badAuth = false
-) => {
-  const httpService = httpServiceMock.createSetupContract();
-  const router = httpService.createRouter();
-
-  const log = loggingSystemMock.create().get('cases');
-  const auth = badAuth ? authenticationMock.createInvalid() : authenticationMock.create();
-  const caseService = new CaseService(log, auth);
-  const caseConfigureServicePlugin = new CaseConfigureService(log);
-  const connectorMappingsServicePlugin = new ConnectorMappingsService(log);
-  const caseConfigureService = await caseConfigureServicePlugin.setup();
-  const connectorMappingsService = await connectorMappingsServicePlugin.setup();
-
-  api({
-    caseConfigureService,
-    caseService,
-    connectorMappingsService,
-    router,
-    userActionService: {
-      postUserActions: jest.fn(),
-      getUserActions: jest.fn(),
-    },
-    logger: log,
-  });
-
-  return router[method].mock.calls[0][1];
-};
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 0026ee9ce4827..bddceef8d782e 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
@@ -21,7 +21,8 @@ import {
 import {
   CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
   CASE_USER_ACTION_SAVED_OBJECT,
-} from '../../../saved_object_types';
+  SECURITY_SOLUTION_OWNER,
+} from '../../../../common/constants';
 import { mappings } from '../../../client/configure/mock';
 
 export const mockCases: Array<SavedObject<ESCaseAttributes>> = [
@@ -58,6 +59,7 @@ export const mockCases: Array<SavedObject<ESCaseAttributes>> = [
       settings: {
         syncAlerts: true,
       },
+      owner: SECURITY_SOLUTION_OWNER,
     },
     references: [],
     updated_at: '2019-11-25T21:54:48.952Z',
@@ -96,6 +98,7 @@ export const mockCases: Array<SavedObject<ESCaseAttributes>> = [
       settings: {
         syncAlerts: true,
       },
+      owner: SECURITY_SOLUTION_OWNER,
     },
     references: [],
     updated_at: '2019-11-25T22:32:00.900Z',
@@ -138,6 +141,7 @@ export const mockCases: Array<SavedObject<ESCaseAttributes>> = [
       settings: {
         syncAlerts: true,
       },
+      owner: SECURITY_SOLUTION_OWNER,
     },
     references: [],
     updated_at: '2019-11-25T22:32:17.947Z',
@@ -184,6 +188,7 @@ export const mockCases: Array<SavedObject<ESCaseAttributes>> = [
       settings: {
         syncAlerts: true,
       },
+      owner: SECURITY_SOLUTION_OWNER,
     },
     references: [],
     updated_at: '2019-11-25T22:32:17.947Z',
@@ -246,6 +251,7 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      owner: SECURITY_SOLUTION_OWNER,
       pushed_at: null,
       pushed_by: null,
       updated_at: '2019-11-25T21:55:00.177Z',
@@ -278,6 +284,7 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      owner: SECURITY_SOLUTION_OWNER,
       pushed_at: null,
       pushed_by: null,
       updated_at: '2019-11-25T21:55:14.633Z',
@@ -311,6 +318,7 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      owner: SECURITY_SOLUTION_OWNER,
       pushed_at: null,
       pushed_by: null,
       updated_at: '2019-11-25T22:32:30.608Z',
@@ -344,6 +352,7 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      owner: SECURITY_SOLUTION_OWNER,
       pushed_at: null,
       pushed_by: null,
       rule: {
@@ -381,6 +390,7 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      owner: SECURITY_SOLUTION_OWNER,
       pushed_at: null,
       pushed_by: null,
       rule: {
@@ -418,6 +428,7 @@ export const mockCaseComments: Array<SavedObject<CommentAttributes>> = [
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      owner: SECURITY_SOLUTION_OWNER,
       pushed_at: null,
       pushed_by: null,
       rule: {
@@ -467,6 +478,7 @@ export const mockCaseConfigure: Array<SavedObject<ESCasesConfigureAttributes>> =
         email: 'testemail@elastic.co',
         username: 'elastic',
       },
+      owner: SECURITY_SOLUTION_OWNER,
     },
     references: [],
     updated_at: '2020-04-09T09:43:51.778Z',
@@ -480,6 +492,7 @@ export const mockCaseMappings: Array<SavedObject<ConnectorMappings>> = [
     id: 'mock-mappings-1',
     attributes: {
       mappings: mappings[ConnectorTypes.jira],
+      owner: SECURITY_SOLUTION_OWNER,
     },
     references: [],
   },
@@ -491,6 +504,7 @@ export const mockCaseMappingsResilient: Array<SavedObject<ConnectorMappings>> =
     id: 'mock-mappings-1',
     attributes: {
       mappings: mappings[ConnectorTypes.resilient],
+      owner: SECURITY_SOLUTION_OWNER,
     },
     references: [],
   },
@@ -521,6 +535,7 @@ export const mockUserActions: Array<SavedObject<CaseUserActionAttributes>> = [
       new_value:
         '{"title":"A case","tags":["case"],"description":"Yeah!","connector":{"id":"connector-od","name":"My Connector","type":".servicenow-sir","fields":{"category":"Denial of Service","destIp":true,"malwareHash":true,"malwareUrl":true,"priority":"2","sourceIp":true,"subcategory":"45"}},"settings":{"syncAlerts":true}}',
       old_value: null,
+      owner: SECURITY_SOLUTION_OWNER,
     },
     version: 'WzYsMV0=',
     references: [],
@@ -540,6 +555,7 @@ export const mockUserActions: Array<SavedObject<CaseUserActionAttributes>> = [
       new_value:
         '{"type":"alert","alertId":"cec3da90fb37a44407145adf1593f3b0d5ad94c4654201f773d63b5d4706128e","index":".siem-signals-default-000008"}',
       old_value: null,
+      owner: SECURITY_SOLUTION_OWNER,
     },
     version: 'WzYsMV0=',
     references: [],
diff --git a/x-pack/plugins/cases/server/routes/api/__fixtures__/route_contexts.ts b/x-pack/plugins/cases/server/routes/api/__fixtures__/route_contexts.ts
deleted file mode 100644
index 42e8561c2ac54..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/__fixtures__/route_contexts.ts
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { elasticsearchServiceMock, loggingSystemMock } from 'src/core/server/mocks';
-import { createExternalCasesClient } from '../../../client';
-import {
-  AlertService,
-  CaseService,
-  CaseConfigureService,
-  ConnectorMappingsService,
-  CaseUserActionService,
-} from '../../../services';
-import { authenticationMock } from '../__fixtures__';
-import type { CasesRequestHandlerContext } from '../../../types';
-import { createActionsClient } from './mock_actions_client';
-
-export const createRouteContext = async (client: any, badAuth = false) => {
-  const actionsMock = createActionsClient();
-
-  const log = loggingSystemMock.create().get('case');
-  const esClient = elasticsearchServiceMock.createElasticsearchClient();
-
-  const authc = badAuth ? authenticationMock.createInvalid() : authenticationMock.create();
-
-  const caseService = new CaseService(log, authc);
-  const caseConfigureServicePlugin = new CaseConfigureService(log);
-  const connectorMappingsServicePlugin = new ConnectorMappingsService(log);
-  const caseUserActionsServicePlugin = new CaseUserActionService(log);
-
-  const caseConfigureService = await caseConfigureServicePlugin.setup();
-  const userActionService = await caseUserActionsServicePlugin.setup();
-  const alertsService = new AlertService();
-
-  const context = ({
-    core: {
-      savedObjects: {
-        client,
-      },
-    },
-    actions: { getActionsClient: () => actionsMock },
-    cases: {
-      getCasesClient: () => casesClient,
-    },
-  } as unknown) as CasesRequestHandlerContext;
-
-  const connectorMappingsService = await connectorMappingsServicePlugin.setup();
-  const casesClient = createExternalCasesClient({
-    savedObjectsClient: client,
-    user: authc.getCurrentUser(),
-    caseService,
-    caseConfigureService,
-    connectorMappingsService,
-    userActionService,
-    alertsService,
-    scopedClusterClient: esClient,
-    logger: log,
-  });
-
-  return { context, services: { userActionService } };
-};
diff --git a/x-pack/plugins/cases/server/routes/api/__mocks__/request_responses.ts b/x-pack/plugins/cases/server/routes/api/__mocks__/request_responses.ts
index 9df94cd0923c9..f3e6bcd7fc9ff 100644
--- a/x-pack/plugins/cases/server/routes/api/__mocks__/request_responses.ts
+++ b/x-pack/plugins/cases/server/routes/api/__mocks__/request_responses.ts
@@ -5,14 +5,7 @@
  * 2.0.
  */
 
-import {
-  ActionTypeConnector,
-  CasePostRequest,
-  CasesConfigureRequest,
-  ConnectorTypes,
-} from '../../../../common';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FindActionResult } from '../../../../../actions/server/types';
+import { SECURITY_SOLUTION_OWNER, CasePostRequest, ConnectorTypes } from '../../../../common';
 
 export const newCase: CasePostRequest = {
   title: 'My new case',
@@ -27,135 +20,5 @@ export const newCase: CasePostRequest = {
   settings: {
     syncAlerts: true,
   },
-};
-
-export const getActions = (): FindActionResult[] => [
-  {
-    id: 'e90075a5-c386-41e3-ae21-ba4e61510695',
-    actionTypeId: '.webhook',
-    name: 'Test',
-    config: {
-      method: 'post',
-      url: 'https://example.com',
-      headers: null,
-    },
-    isPreconfigured: false,
-    referencedByCount: 0,
-  },
-  {
-    id: '123',
-    actionTypeId: '.servicenow',
-    name: 'ServiceNow',
-    config: {
-      apiUrl: 'https://dev102283.service-now.com',
-    },
-    isPreconfigured: false,
-    referencedByCount: 0,
-  },
-  {
-    id: '456',
-    actionTypeId: '.jira',
-    name: 'Connector without isCaseOwned',
-    config: {
-      apiUrl: 'https://elastic.jira.com',
-    },
-    isPreconfigured: false,
-    referencedByCount: 0,
-  },
-  {
-    id: '789',
-    actionTypeId: '.resilient',
-    name: 'Connector without mapping',
-    config: {
-      apiUrl: 'https://elastic.resilient.com',
-    },
-    isPreconfigured: false,
-    referencedByCount: 0,
-  },
-  {
-    id: 'for-mock-case-id-3',
-    actionTypeId: '.jira',
-    name: 'For mock case id 3',
-    config: {
-      apiUrl: 'https://elastic.jira.com',
-    },
-    isPreconfigured: false,
-    referencedByCount: 0,
-  },
-];
-
-export const getActionTypes = (): ActionTypeConnector[] => [
-  {
-    id: '.email',
-    name: 'Email',
-    minimumLicenseRequired: 'gold',
-    enabled: true,
-    enabledInConfig: true,
-    enabledInLicense: true,
-  },
-  {
-    id: '.index',
-    name: 'Index',
-    minimumLicenseRequired: 'basic',
-    enabled: true,
-    enabledInConfig: true,
-    enabledInLicense: true,
-  },
-  {
-    id: '.servicenow',
-    name: 'ServiceNow',
-    minimumLicenseRequired: 'platinum',
-    enabled: false,
-    enabledInConfig: true,
-    enabledInLicense: true,
-  },
-  {
-    id: '.jira',
-    name: 'Jira',
-    minimumLicenseRequired: 'gold',
-    enabled: true,
-    enabledInConfig: true,
-    enabledInLicense: true,
-  },
-  {
-    id: '.resilient',
-    name: 'IBM Resilient',
-    minimumLicenseRequired: 'platinum',
-    enabled: false,
-    enabledInConfig: true,
-    enabledInLicense: true,
-  },
-];
-
-export const getActionExecuteResults = (actionId = '123') => ({
-  status: 'ok' as const,
-  data: {
-    title: 'RJ2-200',
-    id: '10663',
-    pushedDate: '2020-12-17T00:32:40.738Z',
-    url: 'https://siem-kibana.atlassian.net/browse/RJ2-200',
-    comments: [],
-  },
-  actionId,
-});
-
-export const newConfiguration: CasesConfigureRequest = {
-  connector: {
-    id: '456',
-    name: 'My connector 2',
-    type: ConnectorTypes.jira,
-    fields: null,
-  },
-  closure_type: 'close-by-pushing',
-};
-
-export const executePushResponse = {
-  status: 'ok',
-  data: {
-    title: 'RJ2-200',
-    id: '10663',
-    pushedDate: '2020-12-17T00:32:40.738Z',
-    url: 'https://siem-kibana.atlassian.net/browse/RJ2-200',
-    comments: [],
-  },
+  owner: SECURITY_SOLUTION_OWNER,
 };
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 1fc41874fe9d5..7a65229a2a07f 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
@@ -9,10 +9,11 @@ import { schema } from '@kbn/config-schema';
 import Boom from '@hapi/boom';
 
 import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
+import { escapeHatch, wrapError } from '../../utils';
 import { CASE_ALERTS_URL } from '../../../../../common/constants';
+import { CasesByAlertIDRequest } from '../../../../../common';
 
-export function initGetCaseIdsByAlertIdApi({ caseService, router, logger }: RouteDeps) {
+export function initGetCaseIdsByAlertIdApi({ router, logger }: RouteDeps) {
   router.get(
     {
       path: CASE_ALERTS_URL,
@@ -20,22 +21,20 @@ export function initGetCaseIdsByAlertIdApi({ caseService, router, logger }: Rout
         params: schema.object({
           alert_id: schema.string(),
         }),
+        query: escapeHatch,
       },
     },
     async (context, request, response) => {
       try {
-        const alertId = request.params.alert_id;
-        if (alertId == null || alertId === '') {
+        const alertID = request.params.alert_id;
+        if (alertID == null || alertID === '') {
           throw Boom.badRequest('The `alertId` is not valid');
         }
-        const client = context.core.savedObjects.client;
-        const caseIds = await caseService.getCaseIdsByAlertId({
-          client,
-          alertId,
-        });
+        const casesClient = await context.cases.getCasesClient();
+        const options = request.query as CasesByAlertIDRequest;
 
         return response.ok({
-          body: caseIds,
+          body: await casesClient.cases.getCaseIDsByAlertID({ alertID, options }),
         });
       } catch (error) {
         logger.error(
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_all_comments.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/delete_all_comments.ts
deleted file mode 100644
index 1e7e875a53df3..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_all_comments.ts
+++ /dev/null
@@ -1,89 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import Boom from '@hapi/boom';
-import { schema } from '@kbn/config-schema';
-import { buildCommentUserActionItem } from '../../../../services/user_actions/helpers';
-import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { AssociationType, CASE_COMMENTS_URL, ENABLE_CASE_CONNECTOR } from '../../../../../common';
-
-export function initDeleteAllCommentsApi({
-  caseService,
-  router,
-  userActionService,
-  logger,
-}: RouteDeps) {
-  router.delete(
-    {
-      path: CASE_COMMENTS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-        }),
-        query: schema.maybe(
-          schema.object({
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        if (!ENABLE_CASE_CONNECTOR && request.query?.subCaseId !== undefined) {
-          throw Boom.badRequest(
-            'The `subCaseId` is not supported when the case connector feature is disabled'
-          );
-        }
-
-        const client = context.core.savedObjects.client;
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { username, full_name, email } = await caseService.getUser({ request });
-        const deleteDate = new Date().toISOString();
-
-        const subCaseId = request.query?.subCaseId;
-        const id = subCaseId ?? request.params.case_id;
-        const comments = await caseService.getCommentsByAssociation({
-          client,
-          id,
-          associationType: subCaseId ? AssociationType.subCase : AssociationType.case,
-        });
-
-        await Promise.all(
-          comments.saved_objects.map((comment) =>
-            caseService.deleteComment({
-              client,
-              commentId: comment.id,
-            })
-          )
-        );
-
-        await userActionService.postUserActions({
-          client,
-          actions: comments.saved_objects.map((comment) =>
-            buildCommentUserActionItem({
-              action: 'delete',
-              actionAt: deleteDate,
-              actionBy: { username, full_name, email },
-              caseId: request.params.case_id,
-              subCaseId,
-              commentId: comment.id,
-              fields: ['comment'],
-            })
-          ),
-        });
-
-        return response.noContent();
-      } catch (error) {
-        logger.error(
-          `Failed to delete all comments in route case id: ${request.params.case_id} sub case id: ${request.query?.subCaseId}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.test.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.test.ts
deleted file mode 100644
index d0968c3232459..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.test.ts
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-  mockCaseComments,
-} from '../../__fixtures__';
-import { initDeleteCommentApi } from './delete_comment';
-import { CASE_COMMENT_DETAILS_URL } from '../../../../../common';
-
-describe('DELETE comment', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initDeleteCommentApi, 'delete');
-  });
-  it(`deletes the comment. responds with 204`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENT_DETAILS_URL,
-      method: 'delete',
-      params: {
-        case_id: 'mock-id-1',
-        comment_id: 'mock-comment-1',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(204);
-  });
-  it(`returns an error when thrown from deleteComment service`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENT_DETAILS_URL,
-      method: 'delete',
-      params: {
-        case_id: 'mock-id-1',
-        comment_id: 'bad-guy',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(404);
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.ts
deleted file mode 100644
index f8771f92c417f..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/delete_comment.ts
+++ /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 Boom from '@hapi/boom';
-import { schema } from '@kbn/config-schema';
-
-import { CASE_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../../../saved_object_types';
-import { buildCommentUserActionItem } from '../../../../services/user_actions/helpers';
-import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { CASE_COMMENT_DETAILS_URL, ENABLE_CASE_CONNECTOR } from '../../../../../common/constants';
-
-export function initDeleteCommentApi({
-  caseService,
-  router,
-  userActionService,
-  logger,
-}: RouteDeps) {
-  router.delete(
-    {
-      path: CASE_COMMENT_DETAILS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-          comment_id: schema.string(),
-        }),
-        query: schema.maybe(
-          schema.object({
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        if (!ENABLE_CASE_CONNECTOR && request.query?.subCaseId !== undefined) {
-          throw Boom.badRequest(
-            'The `subCaseId` is not supported when the case connector feature is disabled'
-          );
-        }
-
-        const client = context.core.savedObjects.client;
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { username, full_name, email } = await caseService.getUser({ request });
-        const deleteDate = new Date().toISOString();
-
-        const myComment = await caseService.getComment({
-          client,
-          commentId: request.params.comment_id,
-        });
-
-        if (myComment == null) {
-          throw Boom.notFound(`This comment ${request.params.comment_id} does not exist anymore.`);
-        }
-
-        const type = request.query?.subCaseId ? SUB_CASE_SAVED_OBJECT : CASE_SAVED_OBJECT;
-        const id = request.query?.subCaseId ?? request.params.case_id;
-
-        const caseRef = myComment.references.find((c) => c.type === type);
-        if (caseRef == null || (caseRef != null && caseRef.id !== id)) {
-          throw Boom.notFound(
-            `This comment ${request.params.comment_id} does not exist in ${id}).`
-          );
-        }
-
-        await caseService.deleteComment({
-          client,
-          commentId: request.params.comment_id,
-        });
-
-        await userActionService.postUserActions({
-          client,
-          actions: [
-            buildCommentUserActionItem({
-              action: 'delete',
-              actionAt: deleteDate,
-              actionBy: { username, full_name, email },
-              caseId: id,
-              subCaseId: request.query?.subCaseId,
-              commentId: request.params.comment_id,
-              fields: ['comment'],
-            }),
-          ],
-        });
-
-        return response.noContent();
-      } catch (error) {
-        logger.error(
-          `Failed to delete comment in route case id: ${request.params.case_id} comment id: ${request.params.comment_id} sub case id: ${request.query?.subCaseId}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/find_comments.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/find_comments.ts
deleted file mode 100644
index 654b8d532830a..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/find_comments.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import * as rt from 'io-ts';
-
-import { schema } from '@kbn/config-schema';
-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 {
-  AssociationType,
-  CommentsResponseRt,
-  SavedObjectFindOptionsRt,
-  throwErrors,
-} from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { escapeHatch, transformComments, wrapError } from '../../utils';
-import { CASE_COMMENTS_URL, ENABLE_CASE_CONNECTOR } from '../../../../../common';
-import { defaultPage, defaultPerPage } from '../..';
-
-const FindQueryParamsRt = rt.partial({
-  ...SavedObjectFindOptionsRt.props,
-  subCaseId: rt.string,
-});
-
-export function initFindCaseCommentsApi({ caseService, router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: `${CASE_COMMENTS_URL}/_find`,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-        }),
-        query: escapeHatch,
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const client = context.core.savedObjects.client;
-        const query = pipe(
-          FindQueryParamsRt.decode(request.query),
-          fold(throwErrors(Boom.badRequest), identity)
-        );
-
-        if (!ENABLE_CASE_CONNECTOR && query.subCaseId !== undefined) {
-          throw Boom.badRequest(
-            'The `subCaseId` is not supported when the case connector feature is disabled'
-          );
-        }
-
-        const id = query.subCaseId ?? request.params.case_id;
-        const associationType = query.subCaseId ? AssociationType.subCase : AssociationType.case;
-        const args = query
-          ? {
-              caseService,
-              client,
-              id,
-              options: {
-                // We need this because the default behavior of getAllCaseComments is to return all the comments
-                // unless the page and/or perPage is specified. Since we're spreading the query after the request can
-                // still override this behavior.
-                page: defaultPage,
-                perPage: defaultPerPage,
-                sortField: 'created_at',
-                ...query,
-              },
-              associationType,
-            }
-          : {
-              caseService,
-              client,
-              id,
-              options: {
-                page: defaultPage,
-                perPage: defaultPerPage,
-                sortField: 'created_at',
-              },
-              associationType,
-            };
-
-        const theComments = await caseService.getCommentsByAssociation(args);
-        return response.ok({ body: CommentsResponseRt.encode(transformComments(theComments)) });
-      } catch (error) {
-        logger.error(
-          `Failed to find comments in route case id: ${request.params.case_id}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/get_all_comment.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/get_all_comment.ts
deleted file mode 100644
index 580bb3163bb7d..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/get_all_comment.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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import Boom from '@hapi/boom';
-import { schema } from '@kbn/config-schema';
-
-import { SavedObjectsFindResponse } from 'kibana/server';
-import { AllCommentsResponseRt, CommentAttributes } from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { flattenCommentSavedObjects, wrapError } from '../../utils';
-import { CASE_COMMENTS_URL, ENABLE_CASE_CONNECTOR } from '../../../../../common';
-import { defaultSortField } from '../../../../common';
-
-export function initGetAllCommentsApi({ caseService, router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: CASE_COMMENTS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-        }),
-        query: schema.maybe(
-          schema.object({
-            includeSubCaseComments: schema.maybe(schema.boolean()),
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const client = context.core.savedObjects.client;
-        let comments: SavedObjectsFindResponse<CommentAttributes>;
-
-        if (
-          !ENABLE_CASE_CONNECTOR &&
-          (request.query?.subCaseId !== undefined ||
-            request.query?.includeSubCaseComments !== undefined)
-        ) {
-          throw Boom.badRequest(
-            'The `subCaseId` and `includeSubCaseComments` are not supported when the case connector feature is disabled'
-          );
-        }
-
-        if (request.query?.subCaseId) {
-          comments = await caseService.getAllSubCaseComments({
-            client,
-            id: request.query.subCaseId,
-            options: {
-              sortField: defaultSortField,
-            },
-          });
-        } else {
-          comments = await caseService.getAllCaseComments({
-            client,
-            id: request.params.case_id,
-            includeSubCaseComments: request.query?.includeSubCaseComments,
-            options: {
-              sortField: defaultSortField,
-            },
-          });
-        }
-
-        return response.ok({
-          body: AllCommentsResponseRt.encode(flattenCommentSavedObjects(comments.saved_objects)),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to get all comments in route case id: ${request.params.case_id} include sub case comments: ${request.query?.includeSubCaseComments} sub case id: ${request.query?.subCaseId}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/get_comment.test.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/get_comment.test.ts
deleted file mode 100644
index 46accdc58d460..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/get_comment.test.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCaseComments,
-  mockCases,
-} from '../../__fixtures__';
-import { flattenCommentSavedObject } from '../../utils';
-import { initGetCommentApi } from './get_comment';
-import { CASE_COMMENT_DETAILS_URL } from '../../../../../common';
-
-describe('GET comment', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initGetCommentApi, 'get');
-  });
-  it(`returns the comment`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENT_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'mock-id-1',
-        comment_id: 'mock-comment-1',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    const myPayload = mockCaseComments.find((s) => s.id === 'mock-comment-1');
-    expect(myPayload).not.toBeUndefined();
-    if (myPayload != null) {
-      expect(response.payload).toEqual(flattenCommentSavedObject(myPayload));
-    }
-  });
-  it(`returns an error when getComment throws`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENT_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'mock-id-1',
-        comment_id: 'not-real',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(404);
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/get_comment.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/get_comment.ts
deleted file mode 100644
index f86f733306043..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/get_comment.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 { schema } from '@kbn/config-schema';
-
-import { CommentResponseRt } from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { flattenCommentSavedObject, wrapError } from '../../utils';
-import { CASE_COMMENT_DETAILS_URL } from '../../../../../common';
-
-export function initGetCommentApi({ caseService, router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: CASE_COMMENT_DETAILS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-          comment_id: schema.string(),
-        }),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const client = context.core.savedObjects.client;
-
-        const comment = await caseService.getComment({
-          client,
-          commentId: request.params.comment_id,
-        });
-        return response.ok({
-          body: CommentResponseRt.encode(flattenCommentSavedObject(comment)),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to get comment in route case id: ${request.params.case_id} comment id: ${request.params.comment_id}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/patch_comment.test.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/patch_comment.test.ts
deleted file mode 100644
index 32a0133d455c2..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/patch_comment.test.ts
+++ /dev/null
@@ -1,378 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { omit } from 'lodash/fp';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCaseComments,
-  mockCases,
-} from '../../__fixtures__';
-import { initPatchCommentApi } from './patch_comment';
-import { CASE_COMMENTS_URL } from '../../../../../common';
-import { CommentType } from '../../../../../common';
-
-describe('PATCH comment', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initPatchCommentApi, 'patch');
-  });
-
-  it(`Patch a comment`, async () => {
-    const commentID = 'mock-comment-1';
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'patch',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        type: CommentType.user,
-        comment: 'Update my comment',
-        id: commentID,
-        version: 'WzEsMV0=',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    const updatedComment = response.payload.comments.find(
-      (comment: { id: string }) => comment.id === commentID
-    );
-    expect(updatedComment.comment).toEqual('Update my comment');
-  });
-
-  it(`Patch an alert`, async () => {
-    const commentID = 'mock-comment-4';
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'patch',
-      params: {
-        case_id: 'mock-id-4',
-      },
-      body: {
-        type: CommentType.alert,
-        alertId: 'new-id',
-        index: 'test-index',
-        rule: {
-          id: 'rule-id',
-          name: 'rule',
-        },
-        id: commentID,
-        version: 'WzYsMV0=',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    const updatedComment = response.payload.comments.find(
-      (comment: { id: string }) => comment.id === commentID
-    );
-    expect(updatedComment.alertId).toEqual('new-id');
-  });
-
-  it(`it throws when missing attributes: type user`, async () => {
-    const allRequestAttributes = {
-      type: CommentType.user,
-      comment: 'a comment',
-    };
-
-    for (const attribute of ['comment']) {
-      const requestAttributes = omit(attribute, allRequestAttributes);
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: requestAttributes,
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`it throws when excess attributes are provided: type user`, async () => {
-    for (const attribute of ['alertId', 'index']) {
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: {
-          [attribute]: attribute,
-          comment: 'a comment',
-          type: CommentType.user,
-        },
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`it throws when missing attributes: type alert`, async () => {
-    const allRequestAttributes = {
-      type: CommentType.alert,
-      index: 'test-index',
-      alertId: 'test-id',
-    };
-
-    for (const attribute of ['alertId', 'index']) {
-      const requestAttributes = omit(attribute, allRequestAttributes);
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: requestAttributes,
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`it throws when excess attributes are provided: type alert`, async () => {
-    for (const attribute of ['comment']) {
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: {
-          [attribute]: attribute,
-          type: CommentType.alert,
-          index: 'test-index',
-          alertId: 'test-id',
-        },
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`it fails to change the type of the comment`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'patch',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        type: CommentType.alert,
-        alertId: 'test-id',
-        index: 'test-index',
-        rule: {
-          id: 'rule-id',
-          name: 'rule',
-        },
-        id: 'mock-comment-1',
-        version: 'WzEsMV0=',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(400);
-    expect(response.payload.isBoom).toEqual(true);
-    expect(response.payload.message).toEqual('You cannot change the type of the comment.');
-  });
-
-  it(`Fails with 409 if version does not match`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'patch',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        type: CommentType.user,
-        id: 'mock-comment-1',
-        comment: 'Update my comment',
-        version: 'badv=',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(409);
-  });
-
-  it(`Returns an error if updateComment throws`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'patch',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        type: CommentType.user,
-        comment: 'Update my comment',
-        id: 'mock-comment-does-not-exist',
-        version: 'WzEsMV0=',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(404);
-    expect(response.payload.isBoom).toEqual(true);
-  });
-
-  describe('alert format', () => {
-    it.each([
-      ['1', ['index1', 'index2'], CommentType.alert, 'mock-comment-4'],
-      [['1', '2'], 'index', CommentType.alert, 'mock-comment-4'],
-      ['1', ['index1', 'index2'], CommentType.generatedAlert, 'mock-comment-6'],
-      [['1', '2'], 'index', CommentType.generatedAlert, 'mock-comment-6'],
-    ])(
-      'returns an error with an alert comment with contents id: %p indices: %p type: %s comment id: %s',
-      async (alertId, index, type, commentID) => {
-        const request = httpServerMock.createKibanaRequest({
-          path: CASE_COMMENTS_URL,
-          method: 'patch',
-          params: {
-            case_id: 'mock-id-4',
-          },
-          body: {
-            type,
-            alertId,
-            index,
-            rule: {
-              id: 'rule-id',
-              name: 'rule',
-            },
-            id: commentID,
-            version: 'WzYsMV0=',
-          },
-        });
-
-        const { context } = await createRouteContext(
-          createMockSavedObjectsRepository({
-            caseSavedObject: mockCases,
-            caseCommentSavedObject: mockCaseComments,
-          })
-        );
-
-        const response = await routeHandler(context, request, kibanaResponseFactory);
-        expect(response.status).toEqual(400);
-      }
-    );
-
-    it.each([
-      ['1', ['index1'], CommentType.alert],
-      [['1', '2'], ['index', 'other-index'], CommentType.alert],
-    ])(
-      'does not return an error with an alert comment with contents id: %p indices: %p type: %s',
-      async (alertId, index, type) => {
-        const request = httpServerMock.createKibanaRequest({
-          path: CASE_COMMENTS_URL,
-          method: 'patch',
-          params: {
-            case_id: 'mock-id-4',
-          },
-          body: {
-            type,
-            alertId,
-            index,
-            rule: {
-              id: 'rule-id',
-              name: 'rule',
-            },
-            id: 'mock-comment-4',
-            // this version is different than the one in mockCaseComments because it gets updated in place
-            version: 'WzE3LDFd',
-          },
-        });
-
-        const { context } = await createRouteContext(
-          createMockSavedObjectsRepository({
-            caseSavedObject: mockCases,
-            caseCommentSavedObject: mockCaseComments,
-          })
-        );
-
-        const response = await routeHandler(context, request, kibanaResponseFactory);
-        expect(response.status).toEqual(200);
-      }
-    );
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/patch_comment.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/patch_comment.ts
deleted file mode 100644
index 366fb887066f8..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/patch_comment.ts
+++ /dev/null
@@ -1,186 +0,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 { pick } from 'lodash/fp';
-import { pipe } from 'fp-ts/lib/pipeable';
-import { fold } from 'fp-ts/lib/Either';
-import { identity } from 'fp-ts/lib/function';
-import { schema } from '@kbn/config-schema';
-import Boom from '@hapi/boom';
-
-import { SavedObjectsClientContract, Logger } from 'kibana/server';
-import { CommentableCase } from '../../../../common';
-import { CommentPatchRequestRt, throwErrors, User } from '../../../../../common';
-import { CASE_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../../../saved_object_types';
-import { buildCommentUserActionItem } from '../../../../services/user_actions/helpers';
-import { RouteDeps } from '../../types';
-import { escapeHatch, wrapError, decodeCommentRequest } from '../../utils';
-import { CASE_COMMENTS_URL, ENABLE_CASE_CONNECTOR } from '../../../../../common';
-import { CaseServiceSetup } from '../../../../services';
-
-interface CombinedCaseParams {
-  service: CaseServiceSetup;
-  client: SavedObjectsClientContract;
-  caseID: string;
-  logger: Logger;
-  subCaseId?: string;
-}
-
-async function getCommentableCase({
-  service,
-  client,
-  caseID,
-  subCaseId,
-  logger,
-}: CombinedCaseParams) {
-  if (subCaseId) {
-    const [caseInfo, subCase] = await Promise.all([
-      service.getCase({
-        client,
-        id: caseID,
-      }),
-      service.getSubCase({
-        client,
-        id: subCaseId,
-      }),
-    ]);
-    return new CommentableCase({
-      collection: caseInfo,
-      service,
-      subCase,
-      soClient: client,
-      logger,
-    });
-  } else {
-    const caseInfo = await service.getCase({
-      client,
-      id: caseID,
-    });
-    return new CommentableCase({ collection: caseInfo, service, soClient: client, logger });
-  }
-}
-
-export function initPatchCommentApi({ caseService, router, userActionService, logger }: RouteDeps) {
-  router.patch(
-    {
-      path: CASE_COMMENTS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-        }),
-        query: schema.maybe(
-          schema.object({
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-        body: escapeHatch,
-      },
-    },
-    async (context, request, response) => {
-      try {
-        if (!ENABLE_CASE_CONNECTOR && request.query?.subCaseId !== undefined) {
-          throw Boom.badRequest(
-            'The `subCaseId` is not supported when the case connector feature is disabled'
-          );
-        }
-
-        const client = context.core.savedObjects.client;
-        const query = pipe(
-          CommentPatchRequestRt.decode(request.body),
-          fold(throwErrors(Boom.badRequest), identity)
-        );
-
-        const { id: queryCommentId, version: queryCommentVersion, ...queryRestAttributes } = query;
-        decodeCommentRequest(queryRestAttributes);
-
-        const commentableCase = await getCommentableCase({
-          service: caseService,
-          client,
-          caseID: request.params.case_id,
-          subCaseId: request.query?.subCaseId,
-          logger,
-        });
-
-        const myComment = await caseService.getComment({
-          client,
-          commentId: queryCommentId,
-        });
-
-        if (myComment == null) {
-          throw Boom.notFound(`This comment ${queryCommentId} does not exist anymore.`);
-        }
-
-        if (myComment.attributes.type !== queryRestAttributes.type) {
-          throw Boom.badRequest(`You cannot change the type of the comment.`);
-        }
-
-        const saveObjType = request.query?.subCaseId ? SUB_CASE_SAVED_OBJECT : CASE_SAVED_OBJECT;
-
-        const caseRef = myComment.references.find((c) => c.type === saveObjType);
-        if (caseRef == null || (caseRef != null && caseRef.id !== commentableCase.id)) {
-          throw Boom.notFound(
-            `This comment ${queryCommentId} does not exist in ${commentableCase.id}).`
-          );
-        }
-
-        if (queryCommentVersion !== myComment.version) {
-          throw Boom.conflict(
-            'This case has been updated. Please refresh before saving additional updates.'
-          );
-        }
-
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { username, full_name, email } = await caseService.getUser({ request });
-        const userInfo: User = {
-          username,
-          full_name,
-          email,
-        };
-
-        const updatedDate = new Date().toISOString();
-        const {
-          comment: updatedComment,
-          commentableCase: updatedCase,
-        } = await commentableCase.updateComment({
-          updateRequest: query,
-          updatedAt: updatedDate,
-          user: userInfo,
-        });
-
-        await userActionService.postUserActions({
-          client,
-          actions: [
-            buildCommentUserActionItem({
-              action: 'update',
-              actionAt: updatedDate,
-              actionBy: { username, full_name, email },
-              caseId: request.params.case_id,
-              subCaseId: request.query?.subCaseId,
-              commentId: updatedComment.id,
-              fields: ['comment'],
-              newValue: JSON.stringify(queryRestAttributes),
-              oldValue: JSON.stringify(
-                // We are interested only in ContextBasicRt attributes
-                // myComment.attribute contains also CommentAttributesBasicRt attributes
-                pick(Object.keys(queryRestAttributes), myComment.attributes)
-              ),
-            }),
-          ],
-        });
-
-        return response.ok({
-          body: await updatedCase.encode(),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to patch comment in route case id: ${request.params.case_id} sub case id: ${request.query?.subCaseId}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/post_comment.test.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/post_comment.test.ts
deleted file mode 100644
index 27d5c47d47399..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/post_comment.test.ts
+++ /dev/null
@@ -1,326 +0,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 { omit } from 'lodash/fp';
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-  mockCaseComments,
-} from '../../__fixtures__';
-import { initPostCommentApi } from './post_comment';
-import { CASE_COMMENTS_URL } from '../../../../../common';
-import { CommentType } from '../../../../../common';
-
-describe('POST comment', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initPostCommentApi, 'post');
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2019-11-25T21:54:48.952Z'),
-    }));
-  });
-
-  it(`Posts a new comment`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'post',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        comment: 'Wow, good luck catching that bad meanie!',
-        type: CommentType.user,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.comments[response.payload.comments.length - 1].id).toEqual(
-      'mock-comment'
-    );
-  });
-
-  it(`Posts a new comment of type alert`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'post',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        type: CommentType.alert,
-        alertId: 'test-id',
-        index: 'test-index',
-        rule: {
-          id: 'rule-id',
-          name: 'rule-name',
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.comments[response.payload.comments.length - 1].id).toEqual(
-      'mock-comment'
-    );
-  });
-
-  it(`it throws when missing type`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'post',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(400);
-    expect(response.payload.isBoom).toEqual(true);
-  });
-
-  it(`it throws when missing attributes: type user`, async () => {
-    const allRequestAttributes = {
-      type: CommentType.user,
-      comment: 'a comment',
-    };
-
-    for (const attribute of ['comment']) {
-      const requestAttributes = omit(attribute, allRequestAttributes);
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: requestAttributes,
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`it throws when excess attributes are provided: type user`, async () => {
-    for (const attribute of ['alertId', 'index']) {
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: {
-          [attribute]: attribute,
-          comment: 'a comment',
-          type: CommentType.user,
-        },
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`it throws when missing attributes: type alert`, async () => {
-    const allRequestAttributes = {
-      type: CommentType.alert,
-      index: 'test-index',
-      alertId: 'test-id',
-    };
-
-    for (const attribute of ['alertId', 'index']) {
-      const requestAttributes = omit(attribute, allRequestAttributes);
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: requestAttributes,
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`it throws when excess attributes are provided: type alert`, async () => {
-    for (const attribute of ['comment']) {
-      const request = httpServerMock.createKibanaRequest({
-        path: CASE_COMMENTS_URL,
-        method: 'post',
-        params: {
-          case_id: 'mock-id-1',
-        },
-        body: {
-          [attribute]: attribute,
-          type: CommentType.alert,
-          index: 'test-index',
-          alertId: 'test-id',
-        },
-      });
-
-      const { context } = await createRouteContext(
-        createMockSavedObjectsRepository({
-          caseSavedObject: mockCases,
-          caseCommentSavedObject: mockCaseComments,
-        })
-      );
-
-      const response = await routeHandler(context, request, kibanaResponseFactory);
-      expect(response.status).toEqual(400);
-      expect(response.payload.isBoom).toEqual(true);
-    }
-  });
-
-  it(`Returns an error if the case does not exist`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'post',
-      params: {
-        case_id: 'this-is-not-real',
-      },
-      body: {
-        comment: 'Wow, good luck catching that bad meanie!',
-        type: CommentType.user,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(404);
-    expect(response.payload.isBoom).toEqual(true);
-  });
-
-  it(`Returns an error if postNewCase throws`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'post',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        comment: 'Throw an error',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(400);
-    expect(response.payload.isBoom).toEqual(true);
-  });
-
-  it(`Allow user to create comments without authentications`, async () => {
-    routeHandler = await createRoute(initPostCommentApi, 'post', true);
-
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_COMMENTS_URL,
-      method: 'post',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      body: {
-        comment: 'Wow, good luck catching that bad meanie!',
-        type: CommentType.user,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      }),
-      true
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.comments[response.payload.comments.length - 1]).toMatchInlineSnapshot(`
-      Object {
-        "associationType": "case",
-        "comment": "Wow, good luck catching that bad meanie!",
-        "created_at": "2019-11-25T21:54:48.952Z",
-        "created_by": Object {
-          "email": null,
-          "full_name": null,
-          "username": null,
-        },
-        "id": "mock-comment",
-        "pushed_at": null,
-        "pushed_by": null,
-        "type": "user",
-        "updated_at": null,
-        "updated_by": null,
-        "version": "WzksMV0=",
-      }
-    `);
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/comments/post_comment.ts b/x-pack/plugins/cases/server/routes/api/cases/comments/post_comment.ts
deleted file mode 100644
index 8af4b86762d33..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/comments/post_comment.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import Boom from '@hapi/boom';
-import { schema } from '@kbn/config-schema';
-import { escapeHatch, wrapError } from '../../utils';
-import { RouteDeps } from '../../types';
-import { CASE_COMMENTS_URL, ENABLE_CASE_CONNECTOR, CommentRequest } from '../../../../../common';
-
-export function initPostCommentApi({ router, logger }: RouteDeps) {
-  router.post(
-    {
-      path: CASE_COMMENTS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-        }),
-        query: schema.maybe(
-          schema.object({
-            subCaseId: schema.maybe(schema.string()),
-          })
-        ),
-        body: escapeHatch,
-      },
-    },
-    async (context, request, response) => {
-      try {
-        if (!ENABLE_CASE_CONNECTOR && request.query?.subCaseId !== undefined) {
-          throw Boom.badRequest(
-            'The `subCaseId` is not supported when the case connector feature is disabled'
-          );
-        }
-
-        if (!context.cases) {
-          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
-        }
-
-        const casesClient = context.cases.getCasesClient();
-        const caseId = request.query?.subCaseId ?? request.params.case_id;
-        const comment = request.body as CommentRequest;
-
-        return response.ok({
-          body: await casesClient.addComment({ caseId, comment }),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to post comment in route case id: ${request.params.case_id} sub case id: ${request.query?.subCaseId}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/get_configure.test.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/get_configure.test.ts
deleted file mode 100644
index 626f53cdf4263..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/get_configure.test.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCaseConfigure,
-  mockCaseMappings,
-} from '../../__fixtures__';
-
-import { initGetCaseConfigure } from './get_configure';
-import { CASE_CONFIGURE_URL, ConnectorTypes } from '../../../../../common';
-import { mappings } from '../../../../client/configure/mock';
-import { CasesClient } from '../../../../client';
-
-describe('GET configuration', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initGetCaseConfigure, 'get');
-  });
-
-  it('returns the configuration', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual({
-      ...mockCaseConfigure[0].attributes,
-      error: null,
-      mappings: mappings[ConnectorTypes.jira],
-      version: mockCaseConfigure[0].version,
-    });
-  });
-
-  it('handles undefined version correctly', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: [{ ...mockCaseConfigure[0], version: undefined }],
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual({
-      connector: {
-        id: '789',
-        name: 'My connector 3',
-        type: '.jira',
-        fields: null,
-      },
-      closure_type: 'close-by-user',
-      created_at: '2020-04-09T09:43:51.778Z',
-      created_by: {
-        full_name: 'elastic',
-        email: 'testemail@elastic.co',
-        username: 'elastic',
-      },
-      error: null,
-      mappings: mappings[ConnectorTypes.jira],
-      updated_at: '2020-04-09T09:43:51.778Z',
-      updated_by: {
-        full_name: 'elastic',
-        email: 'testemail@elastic.co',
-        username: 'elastic',
-      },
-      version: '',
-    });
-  });
-
-  it('returns an empty object when there is no configuration', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: [],
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(200);
-
-    expect(res.payload).toEqual({});
-  });
-
-  it('returns an error if find throws an error', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: [{ ...mockCaseConfigure[0], id: 'throw-error-find' }],
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(404);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('returns an error when mappings request throws', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: [],
-      })
-    );
-    const mockThrowContext = {
-      ...context,
-      cases: {
-        ...context.cases,
-        getCasesClient: () =>
-          ({
-            ...context?.cases?.getCasesClient(),
-            getMappings: () => {
-              throw new Error();
-            },
-          } as CasesClient),
-      },
-    };
-
-    const res = await routeHandler(mockThrowContext, req, kibanaResponseFactory);
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual({
-      ...mockCaseConfigure[0].attributes,
-      error: 'Error connecting to My connector 3 instance',
-      mappings: [],
-      version: mockCaseConfigure[0].version,
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/get_configure.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/get_configure.ts
deleted file mode 100644
index 03ac3dd8b13b3..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/get_configure.ts
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import Boom from '@hapi/boom';
-import { CaseConfigureResponseRt, ConnectorMappingsAttributes } from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { CASE_CONFIGURE_URL } from '../../../../../common';
-import { transformESConnectorToCaseConnector } from '../helpers';
-
-export function initGetCaseConfigure({ caseConfigureService, router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: CASE_CONFIGURE_URL,
-      validate: false,
-    },
-    async (context, request, response) => {
-      try {
-        let error = null;
-        const client = context.core.savedObjects.client;
-
-        const myCaseConfigure = await caseConfigureService.find({ client });
-
-        const { connector, ...caseConfigureWithoutConnector } = myCaseConfigure.saved_objects[0]
-          ?.attributes ?? { connector: null };
-        let mappings: ConnectorMappingsAttributes[] = [];
-        if (connector != null) {
-          if (!context.cases) {
-            throw Boom.badRequest('RouteHandlerContext is not registered for cases');
-          }
-          const casesClient = context.cases.getCasesClient();
-          const actionsClient = context.actions?.getActionsClient();
-          if (actionsClient == null) {
-            throw Boom.notFound('Action client not found');
-          }
-          try {
-            mappings = await casesClient.getMappings({
-              actionsClient,
-              connectorId: connector.id,
-              connectorType: connector.type,
-            });
-          } catch (e) {
-            error = e.isBoom
-              ? e.output.payload.message
-              : `Error connecting to ${connector.name} instance`;
-          }
-        }
-
-        return response.ok({
-          body:
-            myCaseConfigure.saved_objects.length > 0
-              ? CaseConfigureResponseRt.encode({
-                  ...caseConfigureWithoutConnector,
-                  connector: transformESConnectorToCaseConnector(connector),
-                  mappings,
-                  version: myCaseConfigure.saved_objects[0].version ?? '',
-                  error,
-                })
-              : {},
-        });
-      } catch (error) {
-        logger.error(`Failed to get case configure in route: ${error}`);
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/get_connectors.test.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/get_connectors.test.ts
deleted file mode 100644
index 082adf7b4803f..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/get_connectors.test.ts
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCaseConfigure,
-  mockCaseMappings,
-} from '../../__fixtures__';
-
-import { initCaseConfigureGetActionConnector } from './get_connectors';
-import { CASE_CONFIGURE_CONNECTORS_URL } from '../../../../../common';
-import { getActions } from '../../__mocks__/request_responses';
-
-describe('GET connectors', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initCaseConfigureGetActionConnector, 'get');
-  });
-
-  it('returns case owned connectors', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: `${CASE_CONFIGURE_CONNECTORS_URL}/_find`,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(200);
-
-    const expected = getActions();
-    // The first connector returned by getActions is of type .webhook and we expect to be filtered
-    expected.shift();
-    expect(res.payload).toEqual(expected);
-  });
-
-  it('filters out connectors that are not enabled in license', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: `${CASE_CONFIGURE_CONNECTORS_URL}/_find`,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const actionsClient = context.actions.getActionsClient();
-    (actionsClient.listTypes as jest.Mock).mockImplementation(() =>
-      Promise.resolve([
-        {
-          id: '.servicenow',
-          name: 'ServiceNow',
-          minimumLicenseRequired: 'platinum',
-          enabled: false,
-          enabledInConfig: true,
-          // User does not have a platinum license
-          enabledInLicense: false,
-        },
-        {
-          id: '.jira',
-          name: 'Jira',
-          minimumLicenseRequired: 'gold',
-          enabled: true,
-          enabledInConfig: true,
-          enabledInLicense: true,
-        },
-        {
-          id: '.resilient',
-          name: 'IBM Resilient',
-          minimumLicenseRequired: 'platinum',
-          enabled: false,
-          enabledInConfig: true,
-          // User does not have a platinum license
-          enabledInLicense: false,
-        },
-      ])
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual([
-      {
-        id: '456',
-        actionTypeId: '.jira',
-        name: 'Connector without isCaseOwned',
-        config: {
-          apiUrl: 'https://elastic.jira.com',
-        },
-        isPreconfigured: false,
-        referencedByCount: 0,
-      },
-      {
-        id: 'for-mock-case-id-3',
-        actionTypeId: '.jira',
-        name: 'For mock case id 3',
-        config: {
-          apiUrl: 'https://elastic.jira.com',
-        },
-        isPreconfigured: false,
-        referencedByCount: 0,
-      },
-    ]);
-  });
-
-  it('it throws an error when actions client is null', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: `${CASE_CONFIGURE_CONNECTORS_URL}/_find`,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    // @ts-expect-error
-    context.actions = undefined;
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(404);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/get_connectors.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/get_connectors.ts
deleted file mode 100644
index 7aec7e4f086b4..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/get_connectors.ts
+++ /dev/null
@@ -1,57 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import Boom from '@hapi/boom';
-import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { ActionType } from '../../../../../../actions/common';
-// eslint-disable-next-line @kbn/eslint/no-restricted-paths
-import { FindActionResult } from '../../../../../../actions/server/types';
-
-import { CASE_CONFIGURE_CONNECTORS_URL, SUPPORTED_CONNECTORS } from '../../../../../common';
-
-const isConnectorSupported = (
-  action: FindActionResult,
-  actionTypes: Record<string, ActionType>
-): boolean =>
-  SUPPORTED_CONNECTORS.includes(action.actionTypeId) &&
-  actionTypes[action.actionTypeId]?.enabledInLicense;
-
-/*
- * Be aware that this api will only return 20 connectors
- */
-
-export function initCaseConfigureGetActionConnector({ router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: `${CASE_CONFIGURE_CONNECTORS_URL}/_find`,
-      validate: false,
-    },
-    async (context, request, response) => {
-      try {
-        const actionsClient = context.actions?.getActionsClient();
-
-        if (actionsClient == null) {
-          throw Boom.notFound('Action client not found');
-        }
-
-        const actionTypes = (await actionsClient.listTypes()).reduce(
-          (types, type) => ({ ...types, [type.id]: type }),
-          {}
-        );
-
-        const results = (await actionsClient.getAll()).filter((action) =>
-          isConnectorSupported(action, actionTypes)
-        );
-        return response.ok({ body: results });
-      } catch (error) {
-        logger.error(`Failed to get connectors in route: ${error}`);
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/patch_configure.test.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/patch_configure.test.ts
deleted file mode 100644
index c4e2b6af1cd6b..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/patch_configure.test.ts
+++ /dev/null
@@ -1,259 +0,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 { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCaseMappings,
-} from '../../__fixtures__';
-
-import { mockCaseConfigure } from '../../__fixtures__/mock_saved_objects';
-import { initPatchCaseConfigure } from './patch_configure';
-import { CASE_CONFIGURE_URL, ConnectorTypes } from '../../../../../common';
-import { CasesClient } from '../../../../client';
-
-describe('PATCH configuration', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-
-  beforeAll(async () => {
-    routeHandler = await createRoute(initPatchCaseConfigure, 'patch');
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2020-04-09T09:43:51.778Z'),
-    }));
-  });
-
-  it('patch configuration', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'patch',
-      body: {
-        closure_type: 'close-by-pushing',
-        version: mockCaseConfigure[0].version,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        ...mockCaseConfigure[0].attributes,
-        connector: { fields: null, id: '789', name: 'My connector 3', type: '.jira' },
-        closure_type: 'close-by-pushing',
-        updated_at: '2020-04-09T09:43:51.778Z',
-        updated_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
-        version: 'WzE3LDFd',
-      })
-    );
-  });
-
-  it('patch configuration without authentication', async () => {
-    routeHandler = await createRoute(initPatchCaseConfigure, 'patch', true);
-
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'patch',
-      body: {
-        closure_type: 'close-by-pushing',
-        version: mockCaseConfigure[0].version,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        ...mockCaseConfigure[0].attributes,
-        connector: { fields: null, id: '789', name: 'My connector 3', type: '.jira' },
-        closure_type: 'close-by-pushing',
-        updated_at: '2020-04-09T09:43:51.778Z',
-        updated_by: { email: null, full_name: null, username: null },
-        version: 'WzE3LDFd',
-      })
-    );
-  });
-
-  it('patch configuration - connector', async () => {
-    routeHandler = await createRoute(initPatchCaseConfigure, 'patch');
-
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'patch',
-      body: {
-        connector: {
-          id: 'connector-new',
-          name: 'New connector',
-          type: '.jira',
-          fields: null,
-        },
-        version: mockCaseConfigure[0].version,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        ...mockCaseConfigure[0].attributes,
-        connector: { id: 'connector-new', name: 'New connector', type: '.jira', fields: null },
-        closure_type: 'close-by-user',
-        updated_at: '2020-04-09T09:43:51.778Z',
-        updated_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
-        version: 'WzE3LDFd',
-      })
-    );
-  });
-
-  it('patch configuration with error message for getMappings throw', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'patch',
-      body: {
-        closure_type: 'close-by-pushing',
-        connector: {
-          id: 'connector-new',
-          name: 'New connector',
-          type: '.jira',
-          fields: null,
-        },
-        version: mockCaseConfigure[0].version,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: [],
-      })
-    );
-    const mockThrowContext = {
-      ...context,
-      cases: {
-        ...context.cases,
-        getCasesClient: () =>
-          ({
-            ...context?.cases?.getCasesClient(),
-            getMappings: () => {
-              throw new Error();
-            },
-          } as CasesClient),
-      },
-    };
-
-    const res = await routeHandler(mockThrowContext, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        mappings: [],
-        error: 'Error connecting to New connector instance',
-      })
-    );
-  });
-  it('throw error when configuration have not being created', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'patch',
-      body: {
-        closure_type: 'close-by-pushing',
-        version: mockCaseConfigure[0].version,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: [],
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(409);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('throw error when the versions are different', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'patch',
-      body: {
-        closure_type: 'close-by-pushing',
-        version: 'different-version',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(409);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('handles undefined version correctly', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'patch',
-      body: {
-        connector: {
-          id: 'no-version',
-          name: 'no version',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-        version: mockCaseConfigure[0].version,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        version: '',
-      })
-    );
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/patch_configure.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/patch_configure.ts
deleted file mode 100644
index 5fe38cf0efe48..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/patch_configure.ts
+++ /dev/null
@@ -1,120 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 {
-  CasesConfigurePatchRt,
-  CaseConfigureResponseRt,
-  throwErrors,
-  ConnectorMappingsAttributes,
-} from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { wrapError, escapeHatch } from '../../utils';
-import { CASE_CONFIGURE_URL } from '../../../../../common';
-import {
-  transformCaseConnectorToEsConnector,
-  transformESConnectorToCaseConnector,
-} from '../helpers';
-
-export function initPatchCaseConfigure({
-  caseConfigureService,
-  caseService,
-  router,
-  logger,
-}: RouteDeps) {
-  router.patch(
-    {
-      path: CASE_CONFIGURE_URL,
-      validate: {
-        body: escapeHatch,
-      },
-    },
-    async (context, request, response) => {
-      try {
-        let error = null;
-        const client = context.core.savedObjects.client;
-        const query = pipe(
-          CasesConfigurePatchRt.decode(request.body),
-          fold(throwErrors(Boom.badRequest), identity)
-        );
-
-        const myCaseConfigure = await caseConfigureService.find({ client });
-        const { version, connector, ...queryWithoutVersion } = query;
-        if (myCaseConfigure.saved_objects.length === 0) {
-          throw Boom.conflict(
-            'You can not patch this configuration since you did not created first with a post.'
-          );
-        }
-
-        if (version !== myCaseConfigure.saved_objects[0].version) {
-          throw Boom.conflict(
-            'This configuration has been updated. Please refresh before saving additional updates.'
-          );
-        }
-
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { username, full_name, email } = await caseService.getUser({ request });
-
-        const updateDate = new Date().toISOString();
-
-        let mappings: ConnectorMappingsAttributes[] = [];
-        if (connector != null) {
-          if (!context.cases) {
-            throw Boom.badRequest('RouteHandlerContext is not registered for cases');
-          }
-          const casesClient = context.cases.getCasesClient();
-          const actionsClient = context.actions?.getActionsClient();
-          if (actionsClient == null) {
-            throw Boom.notFound('Action client have not been found');
-          }
-          try {
-            mappings = await casesClient.getMappings({
-              actionsClient,
-              connectorId: connector.id,
-              connectorType: connector.type,
-            });
-          } catch (e) {
-            error = e.isBoom
-              ? e.output.payload.message
-              : `Error connecting to ${connector.name} instance`;
-          }
-        }
-        const patch = await caseConfigureService.patch({
-          client,
-          caseConfigureId: myCaseConfigure.saved_objects[0].id,
-          updatedAttributes: {
-            ...queryWithoutVersion,
-            ...(connector != null
-              ? { connector: transformCaseConnectorToEsConnector(connector) }
-              : {}),
-            updated_at: updateDate,
-            updated_by: { email, full_name, username },
-          },
-        });
-        return response.ok({
-          body: CaseConfigureResponseRt.encode({
-            ...myCaseConfigure.saved_objects[0].attributes,
-            ...patch.attributes,
-            connector: transformESConnectorToCaseConnector(
-              patch.attributes.connector ?? myCaseConfigure.saved_objects[0].attributes.connector
-            ),
-            mappings,
-            version: patch.version ?? '',
-            error,
-          }),
-        });
-      } catch (error) {
-        logger.error(`Failed to get patch configure in route: ${error}`);
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/post_configure.test.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/post_configure.test.ts
deleted file mode 100644
index 35b662078fe9c..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/post_configure.test.ts
+++ /dev/null
@@ -1,472 +0,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 { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCaseConfigure,
-  mockCaseMappings,
-} from '../../__fixtures__';
-
-import { initPostCaseConfigure } from './post_configure';
-import { newConfiguration } from '../../__mocks__/request_responses';
-import { CASE_CONFIGURE_URL, ConnectorTypes } from '../../../../../common';
-import { CasesClient } from '../../../../client';
-
-describe('POST configuration', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-
-  beforeAll(async () => {
-    routeHandler = await createRoute(initPostCaseConfigure, 'post');
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2020-04-09T09:43:51.778Z'),
-    }));
-  });
-
-  it('create configuration', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        connector: {
-          id: '456',
-          name: 'My connector 2',
-          type: '.jira',
-          fields: null,
-        },
-        closure_type: 'close-by-pushing',
-        created_at: '2020-04-09T09:43:51.778Z',
-        created_by: { email: 'd00d@awesome.com', full_name: 'Awesome D00d', username: 'awesome' },
-        updated_at: null,
-        updated_by: null,
-      })
-    );
-  });
-  it('create configuration with error message for getMappings throw', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: [],
-      })
-    );
-    const mockThrowContext = {
-      ...context,
-      cases: {
-        ...context.cases,
-        getCasesClient: () =>
-          ({
-            ...context?.cases?.getCasesClient(),
-            getMappings: () => {
-              throw new Error();
-            },
-          } as CasesClient),
-      },
-    };
-
-    const res = await routeHandler(mockThrowContext, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        mappings: [],
-        error: 'Error connecting to My connector 2 instance',
-      })
-    );
-  });
-
-  it('create configuration without authentication', async () => {
-    routeHandler = await createRoute(initPostCaseConfigure, 'post', true);
-
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        connector: {
-          id: '456',
-          name: 'My connector 2',
-          type: '.jira',
-          fields: null,
-        },
-        closure_type: 'close-by-pushing',
-        created_at: '2020-04-09T09:43:51.778Z',
-        created_by: { email: null, full_name: null, username: null },
-        updated_at: null,
-        updated_by: null,
-      })
-    );
-  });
-
-  it('throws when missing connector.id', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        connector: {
-          name: 'My connector 2',
-          type: '.jira',
-          fields: null,
-        },
-        closure_type: 'close-by-pushing',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('throws when missing connector.name', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        connector: {
-          id: '456',
-          type: '.jira',
-          fields: null,
-        },
-        closure_type: 'close-by-pushing',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('throws when missing connector.type', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        connector: {
-          id: '456',
-          name: 'My connector 2',
-          fields: null,
-        },
-        closure_type: 'close-by-pushing',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('throws when missing connector.fields', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        connector: {
-          id: '456',
-          name: 'My connector 2',
-          type: ConnectorTypes.none,
-        },
-        closure_type: 'close-by-pushing',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('throws when missing closure_type', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        connector: {
-          id: '456',
-          name: 'My connector 2',
-          type: '.jira',
-          fields: null,
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('it deletes the previous configuration', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const savedObjectRepository = createMockSavedObjectsRepository({
-      caseConfigureSavedObject: mockCaseConfigure,
-      caseMappingsSavedObject: mockCaseMappings,
-    });
-
-    const { context } = await createRouteContext(savedObjectRepository);
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(savedObjectRepository.delete.mock.calls[0][1]).toBe(mockCaseConfigure[0].id);
-  });
-
-  it('it does NOT delete when not found', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const savedObjectRepository = createMockSavedObjectsRepository({
-      caseConfigureSavedObject: [],
-      caseMappingsSavedObject: mockCaseMappings,
-    });
-
-    const { context } = await createRouteContext(savedObjectRepository);
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(savedObjectRepository.delete).not.toHaveBeenCalled();
-  });
-
-  it('it deletes all configuration', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const savedObjectRepository = createMockSavedObjectsRepository({
-      caseConfigureSavedObject: [
-        mockCaseConfigure[0],
-        { ...mockCaseConfigure[0], id: 'mock-configuration-2' },
-      ],
-      caseMappingsSavedObject: mockCaseMappings,
-    });
-
-    const { context } = await createRouteContext(savedObjectRepository);
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-
-    expect(res.status).toEqual(200);
-    expect(savedObjectRepository.delete.mock.calls[0][1]).toBe(mockCaseConfigure[0].id);
-    expect(savedObjectRepository.delete.mock.calls[1][1]).toBe('mock-configuration-2');
-  });
-
-  it('returns an error if find throws an error', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: [{ ...mockCaseConfigure[0], id: 'throw-error-find' }],
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(404);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('returns an error if delete throws an error', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: newConfiguration,
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: [{ ...mockCaseConfigure[0], id: 'throw-error-delete' }],
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(500);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('returns an error if post throws an error', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        connector: {
-          id: 'throw-error-create',
-          name: 'My connector 2',
-          fields: null,
-        },
-        closure_type: 'close-by-pushing',
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('handles undefined version correctly', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        ...newConfiguration,
-        connector: {
-          id: 'no-version',
-          name: 'no version',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(200);
-    expect(res.payload).toEqual(
-      expect.objectContaining({
-        version: '',
-      })
-    );
-  });
-
-  it('returns an error if fields are not null', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        ...newConfiguration,
-        connector: { id: 'not-null', name: 'not-null', type: ConnectorTypes.none, fields: {} },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-
-  it('returns an error if the type of the connector does not exists', async () => {
-    const req = httpServerMock.createKibanaRequest({
-      path: CASE_CONFIGURE_URL,
-      method: 'post',
-      body: {
-        ...newConfiguration,
-        connector: { id: 'not-exists', name: 'not-exist', type: '.not-exists', fields: null },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseMappingsSavedObject: mockCaseMappings,
-      })
-    );
-
-    const res = await routeHandler(context, req, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload.isBoom).toEqual(true);
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/configure/post_configure.ts b/x-pack/plugins/cases/server/routes/api/cases/configure/post_configure.ts
deleted file mode 100644
index 74ad02f47e178..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/configure/post_configure.ts
+++ /dev/null
@@ -1,109 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 {
-  CasesConfigureRequestRt,
-  CaseConfigureResponseRt,
-  throwErrors,
-  ConnectorMappingsAttributes,
-} from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { wrapError, escapeHatch } from '../../utils';
-import { CASE_CONFIGURE_URL } from '../../../../../common';
-import {
-  transformCaseConnectorToEsConnector,
-  transformESConnectorToCaseConnector,
-} from '../helpers';
-
-export function initPostCaseConfigure({
-  caseConfigureService,
-  caseService,
-  router,
-  logger,
-}: RouteDeps) {
-  router.post(
-    {
-      path: CASE_CONFIGURE_URL,
-      validate: {
-        body: escapeHatch,
-      },
-    },
-    async (context, request, response) => {
-      try {
-        let error = null;
-        if (!context.cases) {
-          throw Boom.badRequest('RouteHandlerContext is not registered for cases');
-        }
-        const casesClient = context.cases.getCasesClient();
-        const actionsClient = context.actions?.getActionsClient();
-        if (actionsClient == null) {
-          throw Boom.notFound('Action client not found');
-        }
-        const client = context.core.savedObjects.client;
-        const query = pipe(
-          CasesConfigureRequestRt.decode(request.body),
-          fold(throwErrors(Boom.badRequest), identity)
-        );
-
-        const myCaseConfigure = await caseConfigureService.find({ client });
-        if (myCaseConfigure.saved_objects.length > 0) {
-          await Promise.all(
-            myCaseConfigure.saved_objects.map((cc) =>
-              caseConfigureService.delete({ client, caseConfigureId: cc.id })
-            )
-          );
-        }
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { email, full_name, username } = await caseService.getUser({ request });
-
-        const creationDate = new Date().toISOString();
-        let mappings: ConnectorMappingsAttributes[] = [];
-        try {
-          mappings = await casesClient.getMappings({
-            actionsClient,
-            connectorId: query.connector.id,
-            connectorType: query.connector.type,
-          });
-        } catch (e) {
-          error = e.isBoom
-            ? e.output.payload.message
-            : `Error connecting to ${query.connector.name} instance`;
-        }
-        const post = await caseConfigureService.post({
-          client,
-          attributes: {
-            ...query,
-            connector: transformCaseConnectorToEsConnector(query.connector),
-            created_at: creationDate,
-            created_by: { email, full_name, username },
-            updated_at: null,
-            updated_by: null,
-          },
-        });
-
-        return response.ok({
-          body: CaseConfigureResponseRt.encode({
-            ...post.attributes,
-            // Reserve for future implementations
-            connector: transformESConnectorToCaseConnector(post.attributes.connector),
-            mappings,
-            version: post.version ?? '',
-            error,
-          }),
-        });
-      } catch (error) {
-        logger.error(`Failed to post case configure in route: ${error}`);
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/delete_cases.test.ts b/x-pack/plugins/cases/server/routes/api/cases/delete_cases.test.ts
deleted file mode 100644
index 7748a079ceb4d..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/delete_cases.test.ts
+++ /dev/null
@@ -1,114 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-  mockCasesErrorTriggerData,
-  mockCaseComments,
-} from '../__fixtures__';
-import { initDeleteCasesApi } from './delete_cases';
-import { CASES_URL } from '../../../../common';
-
-describe('DELETE case', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initDeleteCasesApi, 'delete');
-  });
-  it(`deletes the case. responds with 204`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'delete',
-      query: {
-        ids: ['mock-id-1'],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(204);
-  });
-  it(`returns an error when thrown from deleteCase service`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'delete',
-      query: {
-        ids: ['not-real'],
-      },
-    });
-
-    const mockSO = createMockSavedObjectsRepository({
-      caseSavedObject: mockCases,
-      caseCommentSavedObject: mockCaseComments,
-    });
-    // Adding this because the delete API needs to get all the cases first to determine if they are removable or not
-    // so it makes a call to bulkGet first
-    mockSO.bulkGet.mockImplementation(async () => ({ saved_objects: [] }));
-
-    const { context } = await createRouteContext(mockSO);
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(404);
-  });
-  it(`returns an error when thrown from getAllCaseComments service`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'delete',
-      query: {
-        ids: ['bad-guy'],
-      },
-    });
-
-    const mockSO = createMockSavedObjectsRepository({
-      caseSavedObject: mockCasesErrorTriggerData,
-      caseCommentSavedObject: mockCaseComments,
-    });
-
-    // Adding this because the delete API needs to get all the cases first to determine if they are removable or not
-    // so it makes a call to bulkGet first
-    mockSO.bulkGet.mockImplementation(async () => ({ saved_objects: [] }));
-
-    const { context } = await createRouteContext(mockSO);
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(400);
-  });
-  it(`returns an error when thrown from deleteComment service`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'delete',
-      query: {
-        ids: ['valid-id'],
-      },
-    });
-
-    const mockSO = createMockSavedObjectsRepository({
-      caseSavedObject: mockCasesErrorTriggerData,
-      caseCommentSavedObject: mockCasesErrorTriggerData,
-    });
-
-    // Adding this because the delete API needs to get all the cases first to determine if they are removable or not
-    // so it makes a call to bulkGet first
-    mockSO.bulkGet.mockImplementation(async () => ({ saved_objects: [] }));
-
-    const { context } = await createRouteContext(mockSO);
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(400);
-  });
-});
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 d0cfc03e69f7c..1784a434292cc 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
@@ -7,46 +7,11 @@
 
 import { schema } from '@kbn/config-schema';
 
-import { SavedObjectsClientContract } from 'src/core/server';
-import { buildCaseUserActionItem } from '../../../services/user_actions/helpers';
 import { RouteDeps } from '../types';
 import { wrapError } from '../utils';
-import { CASES_URL, ENABLE_CASE_CONNECTOR } from '../../../../common';
-import { CaseServiceSetup } from '../../../services';
+import { CASES_URL } from '../../../../common/constants';
 
-async function deleteSubCases({
-  caseService,
-  client,
-  caseIds,
-}: {
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
-  caseIds: string[];
-}) {
-  const subCasesForCaseIds = await caseService.findSubCasesByCaseId({ client, ids: caseIds });
-
-  const subCaseIDs = subCasesForCaseIds.saved_objects.map((subCase) => subCase.id);
-  const commentsForSubCases = await caseService.getAllSubCaseComments({
-    client,
-    id: subCaseIDs,
-  });
-
-  // This shouldn't actually delete anything because all the comments should be deleted when comments are deleted
-  // per case ID
-  await Promise.all(
-    commentsForSubCases.saved_objects.map((commentSO) =>
-      caseService.deleteComment({ client, commentId: commentSO.id })
-    )
-  );
-
-  await Promise.all(
-    subCasesForCaseIds.saved_objects.map((subCaseSO) =>
-      caseService.deleteSubCase(client, subCaseSO.id)
-    )
-  );
-}
-
-export function initDeleteCasesApi({ caseService, router, userActionService, logger }: RouteDeps) {
+export function initDeleteCasesApi({ router, logger }: RouteDeps) {
   router.delete(
     {
       path: CASES_URL,
@@ -58,66 +23,8 @@ export function initDeleteCasesApi({ caseService, router, userActionService, log
     },
     async (context, request, response) => {
       try {
-        const client = context.core.savedObjects.client;
-        await Promise.all(
-          request.query.ids.map((id) =>
-            caseService.deleteCase({
-              client,
-              id,
-            })
-          )
-        );
-        const comments = await Promise.all(
-          request.query.ids.map((id) =>
-            caseService.getAllCaseComments({
-              client,
-              id,
-            })
-          )
-        );
-
-        if (comments.some((c) => c.saved_objects.length > 0)) {
-          await Promise.all(
-            comments.map((c) =>
-              Promise.all(
-                c.saved_objects.map(({ id }) =>
-                  caseService.deleteComment({
-                    client,
-                    commentId: id,
-                  })
-                )
-              )
-            )
-          );
-        }
-
-        if (ENABLE_CASE_CONNECTOR) {
-          await deleteSubCases({ caseService, client, caseIds: request.query.ids });
-        }
-
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { username, full_name, email } = await caseService.getUser({ request });
-        const deleteDate = new Date().toISOString();
-
-        await userActionService.postUserActions({
-          client,
-          actions: request.query.ids.map((id) =>
-            buildCaseUserActionItem({
-              action: 'create',
-              actionAt: deleteDate,
-              actionBy: { username, full_name, email },
-              caseId: id,
-              fields: [
-                'comment',
-                'description',
-                'status',
-                'tags',
-                'title',
-                ...(ENABLE_CASE_CONNECTOR ? ['sub_case'] : []),
-              ],
-            })
-          ),
-        });
+        const client = await context.cases.getCasesClient();
+        await client.cases.delete(request.query.ids);
 
         return response.noContent();
       } catch (error) {
diff --git a/x-pack/plugins/cases/server/routes/api/cases/find_cases.test.ts b/x-pack/plugins/cases/server/routes/api/cases/find_cases.test.ts
deleted file mode 100644
index 75586896390fc..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/find_cases.test.ts
+++ /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 { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-} from '../__fixtures__';
-import { initFindCasesApi } from './find_cases';
-import { CASES_URL } from '../../../../common';
-import { mockCaseConfigure, mockCaseNoConnectorId } from '../__fixtures__/mock_saved_objects';
-
-describe('FIND all cases', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initFindCasesApi, 'get');
-  });
-
-  it(`gets all the cases`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: `${CASES_URL}/_find`,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.cases).toHaveLength(4);
-    // mockSavedObjectsRepository do not support filters and returns all cases every time.
-    expect(response.payload.count_open_cases).toEqual(4);
-    expect(response.payload.count_closed_cases).toEqual(4);
-    expect(response.payload.count_in_progress_cases).toEqual(4);
-  });
-
-  it(`has proper connector id on cases with configured connector`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: `${CASES_URL}/_find`,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.cases[2].connector.id).toEqual('123');
-  });
-
-  it(`adds 'none' connector id to cases without when 3rd party unconfigured`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: `${CASES_URL}/_find`,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: [mockCaseNoConnectorId],
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.cases[0].connector.id).toEqual('none');
-  });
-
-  it(`adds default connector id to cases without when 3rd party configured`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: `${CASES_URL}/_find`,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: [mockCaseNoConnectorId],
-        caseConfigureSavedObject: mockCaseConfigure,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.cases[0].connector.id).toEqual('none');
-  });
-});
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 77b1d6b23f912..1ded265a8b176 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
@@ -5,24 +5,12 @@
  * 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 {
-  CasesFindResponseRt,
-  CasesFindRequestRt,
-  throwErrors,
-  caseStatuses,
-} from '../../../../common';
-import { transformCases, wrapError, escapeHatch } from '../utils';
+import { CasesFindRequest } from '../../../../common/api';
+import { wrapError, escapeHatch } from '../utils';
 import { RouteDeps } from '../types';
-import { CASES_URL } from '../../../../common';
-import { constructQueryOptions } from './helpers';
+import { CASES_URL } from '../../../../common/constants';
 
-export function initFindCasesApi({ caseService, router, logger }: RouteDeps) {
+export function initFindCasesApi({ router, logger }: RouteDeps) {
   router.get(
     {
       path: `${CASES_URL}/_find`,
@@ -32,49 +20,14 @@ export function initFindCasesApi({ caseService, router, logger }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
-        const client = context.core.savedObjects.client;
-        const queryParams = pipe(
-          CasesFindRequestRt.decode(request.query),
-          fold(throwErrors(Boom.badRequest), identity)
-        );
-        const queryArgs = {
-          tags: queryParams.tags,
-          reporters: queryParams.reporters,
-          sortByField: queryParams.sortField,
-          status: queryParams.status,
-          caseType: queryParams.type,
-        };
-
-        const caseQueries = constructQueryOptions(queryArgs);
-        const cases = await caseService.findCasesGroupedByID({
-          client,
-          caseOptions: { ...queryParams, ...caseQueries.case },
-          subCaseOptions: caseQueries.subCase,
-        });
-
-        const [openCases, inProgressCases, closedCases] = await Promise.all([
-          ...caseStatuses.map((status) => {
-            const statusQuery = constructQueryOptions({ ...queryArgs, status });
-            return caseService.findCaseStatusStats({
-              client,
-              caseOptions: statusQuery.case,
-              subCaseOptions: statusQuery.subCase,
-            });
-          }),
-        ]);
+        if (!context.cases) {
+          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
+        }
+        const casesClient = await context.cases.getCasesClient();
+        const options = request.query as CasesFindRequest;
 
         return response.ok({
-          body: CasesFindResponseRt.encode(
-            transformCases({
-              casesMap: cases.casesMap,
-              page: cases.page,
-              perPage: cases.perPage,
-              total: cases.total,
-              countOpenCases: openCases,
-              countInProgressCases: inProgressCases,
-              countClosedCases: closedCases,
-            })
-          ),
+          body: await casesClient.cases.find({ ...options }),
         });
       } catch (error) {
         logger.error(`Failed to find cases in route: ${error}`);
diff --git a/x-pack/plugins/cases/server/routes/api/cases/get_case.test.ts b/x-pack/plugins/cases/server/routes/api/cases/get_case.test.ts
deleted file mode 100644
index 768bbca62f3fe..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/get_case.test.ts
+++ /dev/null
@@ -1,222 +0,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 { kibanaResponseFactory, RequestHandler, SavedObject } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import { ConnectorTypes, ESCaseAttributes } from '../../../../common';
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-  mockCasesErrorTriggerData,
-  mockCaseComments,
-  mockCaseNoConnectorId,
-  mockCaseConfigure,
-} from '../__fixtures__';
-import { flattenCaseSavedObject } from '../utils';
-import { initGetCaseApi } from './get_case';
-import { CASE_DETAILS_URL } from '../../../../common';
-
-describe('GET case', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initGetCaseApi, 'get');
-  });
-  it(`returns the case with empty case comments when includeComments is false`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      query: {
-        includeComments: false,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    const savedObject = (mockCases.find(
-      (s) => s.id === 'mock-id-1'
-    ) as unknown) as SavedObject<ESCaseAttributes>;
-    expect(response.status).toEqual(200);
-    expect(response.payload).toEqual(
-      flattenCaseSavedObject({
-        savedObject,
-      })
-    );
-    expect(response.payload.comments).toEqual([]);
-  });
-
-  it(`returns an error when thrown from getCase`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'abcdefg',
-      },
-      query: {
-        includeComments: false,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-
-    expect(response.status).toEqual(404);
-    expect(response.payload.isBoom).toEqual(true);
-  });
-
-  it(`returns the case with case comments when includeComments is true`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'mock-id-1',
-      },
-      query: {
-        includeComments: true,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-
-    expect(response.status).toEqual(200);
-    expect(response.payload.comments).toHaveLength(6);
-  });
-
-  it(`returns an error when thrown from getAllCaseComments`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'bad-guy',
-      },
-      query: {
-        includeComments: true,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCasesErrorTriggerData,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-
-    expect(response.status).toEqual(400);
-  });
-
-  it(`case w/o connector.id - returns the case with connector id when 3rd party unconfigured`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'mock-no-connector_id',
-      },
-      query: {
-        includeComments: false,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: [mockCaseNoConnectorId],
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-
-    expect(response.status).toEqual(200);
-    expect(response.payload.connector).toEqual({
-      fields: null,
-      id: 'none',
-      name: 'none',
-      type: ConnectorTypes.none,
-    });
-  });
-
-  it(`case w/o connector.id - returns the case with connector id when 3rd party configured`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'mock-no-connector_id',
-      },
-      query: {
-        includeComments: false,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: [mockCaseNoConnectorId],
-        caseConfigureSavedObject: mockCaseConfigure,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-
-    expect(response.status).toEqual(200);
-    expect(response.payload.connector).toEqual({
-      fields: null,
-      id: 'none',
-      name: 'none',
-      type: '.none',
-    });
-  });
-
-  it(`case w/ connector.id - returns the case with connector id when case already has connectorId`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_DETAILS_URL,
-      method: 'get',
-      params: {
-        case_id: 'mock-id-3',
-      },
-      query: {
-        includeComments: false,
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseConfigureSavedObject: mockCaseConfigure,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-
-    expect(response.status).toEqual(200);
-    expect(response.payload.connector).toEqual({
-      fields: { issueType: 'Task', priority: 'High', parent: null },
-      id: '123',
-      name: 'My connector',
-      type: '.jira',
-    });
-  });
-});
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 c69eae7fb1f94..9d26fbb90328c 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
@@ -7,10 +7,9 @@
 
 import { schema } from '@kbn/config-schema';
 
-import Boom from '@hapi/boom';
 import { RouteDeps } from '../types';
 import { wrapError } from '../utils';
-import { CASE_DETAILS_URL, ENABLE_CASE_CONNECTOR } from '../../../../common';
+import { CASE_DETAILS_URL } from '../../../../common/constants';
 
 export function initGetCaseApi({ router, logger }: RouteDeps) {
   router.get(
@@ -28,16 +27,11 @@ export function initGetCaseApi({ router, logger }: RouteDeps) {
     },
     async (context, request, response) => {
       try {
-        if (!ENABLE_CASE_CONNECTOR && request.query.includeSubCaseComments !== undefined) {
-          throw Boom.badRequest(
-            'The `subCaseId` is not supported when the case connector feature is disabled'
-          );
-        }
-        const casesClient = context.cases.getCasesClient();
+        const casesClient = await context.cases.getCasesClient();
         const id = request.params.case_id;
 
         return response.ok({
-          body: await casesClient.get({
+          body: await casesClient.cases.get({
             id,
             includeComments: request.query.includeComments,
             includeSubCaseComments: request.query.includeSubCaseComments,
diff --git a/x-pack/plugins/cases/server/routes/api/cases/helpers.test.ts b/x-pack/plugins/cases/server/routes/api/cases/helpers.test.ts
deleted file mode 100644
index a1d25aa295799..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/helpers.test.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { SavedObjectsFindResponse } from 'kibana/server';
-import {
-  CaseConnector,
-  ConnectorTypes,
-  ESCaseConnector,
-  ESCasesConfigureAttributes,
-} from '../../../../common';
-import { mockCaseConfigure } from '../__fixtures__';
-import {
-  transformCaseConnectorToEsConnector,
-  transformESConnectorToCaseConnector,
-  getConnectorFromConfiguration,
-} from './helpers';
-
-describe('helpers', () => {
-  const caseConnector: CaseConnector = {
-    id: '123',
-    name: 'Jira',
-    type: ConnectorTypes.jira,
-    fields: { issueType: 'Task', priority: 'High', parent: null },
-  };
-
-  const esCaseConnector: ESCaseConnector = {
-    id: '123',
-    name: 'Jira',
-    type: ConnectorTypes.jira,
-    fields: [
-      { key: 'issueType', value: 'Task' },
-      { key: 'priority', value: 'High' },
-      { key: 'parent', value: null },
-    ],
-  };
-
-  const caseConfigure: SavedObjectsFindResponse<ESCasesConfigureAttributes> = {
-    saved_objects: [{ ...mockCaseConfigure[0], score: 0 }],
-    total: 1,
-    per_page: 20,
-    page: 1,
-  };
-
-  describe('transformCaseConnectorToEsConnector', () => {
-    it('transform correctly', () => {
-      expect(transformCaseConnectorToEsConnector(caseConnector)).toEqual(esCaseConnector);
-    });
-
-    it('transform correctly with null attributes', () => {
-      // @ts-ignore this is case the connector does not exist for old cases object or configurations
-      expect(transformCaseConnectorToEsConnector(null)).toEqual({
-        id: 'none',
-        name: 'none',
-        type: ConnectorTypes.none,
-        fields: [],
-      });
-    });
-  });
-
-  describe('transformESConnectorToCaseConnector', () => {
-    it('transform correctly', () => {
-      expect(transformESConnectorToCaseConnector(esCaseConnector)).toEqual(caseConnector);
-    });
-
-    it('transform correctly with null attributes', () => {
-      // @ts-ignore this is case the connector does not exist for old cases object or configurations
-      expect(transformESConnectorToCaseConnector(null)).toEqual({
-        id: 'none',
-        name: 'none',
-        type: ConnectorTypes.none,
-        fields: null,
-      });
-    });
-  });
-
-  describe('getConnectorFromConfiguration', () => {
-    it('transform correctly', () => {
-      expect(getConnectorFromConfiguration(caseConfigure)).toEqual({
-        id: '789',
-        name: 'My connector 3',
-        type: ConnectorTypes.jira,
-        fields: null,
-      });
-    });
-
-    it('transform correctly with no connector', () => {
-      const caseConfigureNoConnector: SavedObjectsFindResponse<ESCasesConfigureAttributes> = {
-        ...caseConfigure,
-        saved_objects: [
-          {
-            ...mockCaseConfigure[0],
-            // @ts-ignore this is case the connector does not exist for old cases object or configurations
-            attributes: { ...mockCaseConfigure[0].attributes, connector: null },
-            score: 0,
-          },
-        ],
-      };
-
-      expect(getConnectorFromConfiguration(caseConfigureNoConnector)).toEqual({
-        id: 'none',
-        name: 'none',
-        type: ConnectorTypes.none,
-        fields: null,
-      });
-    });
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/helpers.ts b/x-pack/plugins/cases/server/routes/api/cases/helpers.ts
deleted file mode 100644
index 5f51c9b1f8d8c..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/helpers.ts
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { get, isPlainObject } from 'lodash';
-import deepEqual from 'fast-deep-equal';
-
-import { SavedObjectsFindResponse } from 'kibana/server';
-import {
-  CaseConnector,
-  CaseStatuses,
-  CaseType,
-  ConnectorTypeFields,
-  ConnectorTypes,
-  ESCaseConnector,
-  ESCasesConfigureAttributes,
-  ESConnectorFields,
-  SavedObjectFindOptions,
-} from '../../../../common';
-import { CASE_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../../saved_object_types';
-import { sortToSnake } from '../utils';
-import { combineFilters } from '../../../common';
-
-export const addStatusFilter = ({
-  status,
-  appendFilter,
-  type = CASE_SAVED_OBJECT,
-}: {
-  status?: CaseStatuses;
-  appendFilter?: string;
-  type?: string;
-}) => {
-  const filters: string[] = [];
-  if (status) {
-    filters.push(`${type}.attributes.status: ${status}`);
-  }
-
-  if (appendFilter) {
-    filters.push(appendFilter);
-  }
-  return combineFilters(filters, 'AND');
-};
-
-export const buildFilter = ({
-  filters,
-  field,
-  operator,
-  type = CASE_SAVED_OBJECT,
-}: {
-  filters: string | string[] | undefined;
-  field: string;
-  operator: 'OR' | 'AND';
-  type?: string;
-}): string => {
-  // if it is an empty string, empty array of strings, or undefined just return
-  if (!filters || filters.length <= 0) {
-    return '';
-  }
-
-  const arrayFilters = !Array.isArray(filters) ? [filters] : filters;
-
-  return combineFilters(
-    arrayFilters.map((filter) => `${type}.attributes.${field}: ${filter}`),
-    operator
-  );
-};
-
-/**
- * Constructs the filters used for finding cases and sub cases.
- * There are a few scenarios that this function tries to handle when constructing the filters used for finding cases
- * and sub cases.
- *
- * Scenario 1:
- *  Type == Individual
- *  If the API request specifies that it wants only individual cases (aka not collections) then we need to add that
- *  specific filter when call the saved objects find api. This will filter out any collection cases.
- *
- * Scenario 2:
- *  Type == collection
- *  If the API request specifies that it only wants collection cases (cases that have sub cases) then we need to add
- *  the filter for collections AND we need to ignore any status filter for the case find call. This is because a
- *  collection's status is no longer relevant when it has sub cases. The user cannot change the status for a collection
- *  only for its sub cases. The status filter will be applied to the find request when looking for sub cases.
- *
- * Scenario 3:
- *  No Type is specified
- *  If the API request does not want to filter on type but instead get both collections and regular individual cases then
- *  we need to find all cases that match the other filter criteria and sub cases. To do this we construct the following query:
- *
- *    ((status == some_status and type === individual) or type == collection) and (tags == blah) and (reporter == yo)
- *  This forces us to honor the status request for individual cases but gets us ALL collection cases that match the other
- *  filter criteria. When we search for sub cases we will use that status filter in that find call as well.
- */
-export const constructQueryOptions = ({
-  tags,
-  reporters,
-  status,
-  sortByField,
-  caseType,
-}: {
-  tags?: string | string[];
-  reporters?: string | string[];
-  status?: CaseStatuses;
-  sortByField?: string;
-  caseType?: CaseType;
-}): { case: SavedObjectFindOptions; subCase?: SavedObjectFindOptions } => {
-  const tagsFilter = buildFilter({ filters: tags, field: 'tags', operator: 'OR' });
-  const reportersFilter = buildFilter({
-    filters: reporters,
-    field: 'created_by.username',
-    operator: 'OR',
-  });
-  const sortField = sortToSnake(sortByField);
-
-  switch (caseType) {
-    case CaseType.individual: {
-      // The cases filter will result in this structure "status === oh and (type === individual) and (tags === blah) and (reporter === yo)"
-      // The subCase filter will be undefined because we don't need to find sub cases if type === individual
-
-      // We do not want to support multiple type's being used, so force it to be a single filter value
-      const typeFilter = `${CASE_SAVED_OBJECT}.attributes.type: ${CaseType.individual}`;
-      const caseFilters = addStatusFilter({
-        status,
-        appendFilter: combineFilters([tagsFilter, reportersFilter, typeFilter], 'AND'),
-      });
-      return {
-        case: {
-          filter: caseFilters,
-          sortField,
-        },
-      };
-    }
-    case CaseType.collection: {
-      // The cases filter will result in this structure "(type == parent) and (tags == blah) and (reporter == yo)"
-      // The sub case filter will use the query.status if it exists
-      const typeFilter = `${CASE_SAVED_OBJECT}.attributes.type: ${CaseType.collection}`;
-      const caseFilters = combineFilters([tagsFilter, reportersFilter, typeFilter], 'AND');
-
-      return {
-        case: {
-          filter: caseFilters,
-          sortField,
-        },
-        subCase: {
-          filter: addStatusFilter({ status, type: SUB_CASE_SAVED_OBJECT }),
-          sortField,
-        },
-      };
-    }
-    default: {
-      /**
-       * In this scenario no type filter was sent, so we want to honor the status filter if one exists.
-       * To construct the filter and honor the status portion we need to find all individual cases that
-       * have that particular status. We also need to find cases that have sub cases but we want to ignore the
-       * case collection's status because it is not relevant. We only care about the status of the sub cases if the
-       * case is a collection.
-       *
-       * The cases filter will result in this structure "((status == open and type === individual) or type == parent) and (tags == blah) and (reporter == yo)"
-       * The sub case filter will use the query.status if it exists
-       */
-      const typeIndividual = `${CASE_SAVED_OBJECT}.attributes.type: ${CaseType.individual}`;
-      const typeParent = `${CASE_SAVED_OBJECT}.attributes.type: ${CaseType.collection}`;
-
-      const statusFilter = combineFilters([addStatusFilter({ status }), typeIndividual], 'AND');
-      const statusAndType = combineFilters([statusFilter, typeParent], 'OR');
-      const caseFilters = combineFilters([statusAndType, tagsFilter, reportersFilter], 'AND');
-
-      return {
-        case: {
-          filter: caseFilters,
-          sortField,
-        },
-        subCase: {
-          filter: addStatusFilter({ status, type: SUB_CASE_SAVED_OBJECT }),
-          sortField,
-        },
-      };
-    }
-  }
-};
-
-interface CompareArrays {
-  addedItems: string[];
-  deletedItems: string[];
-}
-export const compareArrays = ({
-  originalValue,
-  updatedValue,
-}: {
-  originalValue: string[];
-  updatedValue: string[];
-}): CompareArrays => {
-  const result: CompareArrays = {
-    addedItems: [],
-    deletedItems: [],
-  };
-  originalValue.forEach((origVal) => {
-    if (!updatedValue.includes(origVal)) {
-      result.deletedItems = [...result.deletedItems, origVal];
-    }
-  });
-  updatedValue.forEach((updatedVal) => {
-    if (!originalValue.includes(updatedVal)) {
-      result.addedItems = [...result.addedItems, updatedVal];
-    }
-  });
-
-  return result;
-};
-
-export const isTwoArraysDifference = (
-  originalValue: unknown,
-  updatedValue: unknown
-): CompareArrays | null => {
-  if (
-    originalValue != null &&
-    updatedValue != null &&
-    Array.isArray(updatedValue) &&
-    Array.isArray(originalValue)
-  ) {
-    const compObj = compareArrays({ originalValue, updatedValue });
-    if (compObj.addedItems.length > 0 || compObj.deletedItems.length > 0) {
-      return compObj;
-    }
-  }
-  return null;
-};
-
-interface CaseWithIDVersion {
-  id: string;
-  version: string;
-  [key: string]: unknown;
-}
-
-export const getCaseToUpdate = (
-  currentCase: unknown,
-  queryCase: CaseWithIDVersion
-): CaseWithIDVersion =>
-  Object.entries(queryCase).reduce(
-    (acc, [key, value]) => {
-      const currentValue = get(currentCase, key);
-      if (Array.isArray(currentValue) && Array.isArray(value)) {
-        if (isTwoArraysDifference(value, currentValue)) {
-          return {
-            ...acc,
-            [key]: value,
-          };
-        }
-        return acc;
-      } else if (isPlainObject(currentValue) && isPlainObject(value)) {
-        if (!deepEqual(currentValue, value)) {
-          return {
-            ...acc,
-            [key]: value,
-          };
-        }
-
-        return acc;
-      } else if (currentValue != null && value !== currentValue) {
-        return {
-          ...acc,
-          [key]: value,
-        };
-      }
-      return acc;
-    },
-    { id: queryCase.id, version: queryCase.version }
-  );
-
-export const getNoneCaseConnector = () => ({
-  id: 'none',
-  name: 'none',
-  type: ConnectorTypes.none,
-  fields: null,
-});
-
-export const getConnectorFromConfiguration = (
-  caseConfigure: SavedObjectsFindResponse<ESCasesConfigureAttributes>
-): CaseConnector => {
-  let caseConnector = getNoneCaseConnector();
-  if (
-    caseConfigure.saved_objects.length > 0 &&
-    caseConfigure.saved_objects[0].attributes.connector
-  ) {
-    caseConnector = {
-      id: caseConfigure.saved_objects[0].attributes.connector.id,
-      name: caseConfigure.saved_objects[0].attributes.connector.name,
-      type: caseConfigure.saved_objects[0].attributes.connector.type,
-      fields: null,
-    };
-  }
-  return caseConnector;
-};
-
-export const transformCaseConnectorToEsConnector = (connector: CaseConnector): ESCaseConnector => ({
-  id: connector?.id ?? 'none',
-  name: connector?.name ?? 'none',
-  type: connector?.type ?? '.none',
-  fields:
-    connector?.fields != null
-      ? Object.entries(connector.fields).reduce<ESConnectorFields>(
-          (acc, [key, value]) => [
-            ...acc,
-            {
-              key,
-              value,
-            },
-          ],
-          []
-        )
-      : [],
-});
-
-export const transformESConnectorToCaseConnector = (connector?: ESCaseConnector): CaseConnector => {
-  const connectorTypeField = {
-    type: connector?.type ?? '.none',
-    fields:
-      connector && connector.fields != null && connector.fields.length > 0
-        ? connector.fields.reduce(
-            (fields, { key, value }) => ({
-              ...fields,
-              [key]: value,
-            }),
-            {}
-          )
-        : null,
-  } as ConnectorTypeFields;
-
-  return {
-    id: connector?.id ?? 'none',
-    name: connector?.name ?? 'none',
-    ...connectorTypeField,
-  };
-};
diff --git a/x-pack/plugins/cases/server/routes/api/cases/patch_cases.test.ts b/x-pack/plugins/cases/server/routes/api/cases/patch_cases.test.ts
deleted file mode 100644
index 96a891441ea5f..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/patch_cases.test.ts
+++ /dev/null
@@ -1,412 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-  mockCaseComments,
-} from '../__fixtures__';
-import { initPatchCasesApi } from './patch_cases';
-import { mockCaseConfigure, mockCaseNoConnectorId } from '../__fixtures__/mock_saved_objects';
-import { CaseStatuses } from '../../../../common';
-
-describe('PATCH cases', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initPatchCasesApi, 'patch');
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2019-11-25T21:54:48.952Z'),
-    }));
-  });
-
-  it(`Close a case`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "closed_at": "2019-11-25T21:54:48.952Z",
-          "closed_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "comments": Array [],
-          "connector": Object {
-            "fields": null,
-            "id": "none",
-            "name": "none",
-            "type": ".none",
-          },
-          "created_at": "2019-11-25T21:54:48.952Z",
-          "created_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "description": "This is a brand new case of a bad meanie defacing data",
-          "external_service": null,
-          "id": "mock-id-1",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "closed",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "defacement",
-          ],
-          "title": "Super Bad Security Issue",
-          "totalAlerts": 0,
-          "totalComment": 0,
-          "type": "individual",
-          "updated_at": "2019-11-25T21:54:48.952Z",
-          "updated_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "version": "WzE3LDFd",
-        },
-      ]
-    `);
-  });
-
-  it(`Open a case`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-4',
-            status: CaseStatuses.open,
-            version: 'WzUsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseConfigureSavedObject: mockCaseConfigure,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": Object {
-              "issueType": "Task",
-              "parent": null,
-              "priority": "High",
-            },
-            "id": "123",
-            "name": "My connector",
-            "type": ".jira",
-          },
-          "created_at": "2019-11-25T22:32:17.947Z",
-          "created_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "description": "Oh no, a bad meanie going LOLBins all over the place!",
-          "external_service": null,
-          "id": "mock-id-4",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "LOLBins",
-          ],
-          "title": "Another bad one",
-          "totalAlerts": 0,
-          "totalComment": 0,
-          "type": "individual",
-          "updated_at": "2019-11-25T21:54:48.952Z",
-          "updated_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "version": "WzE3LDFd",
-        },
-      ]
-    `);
-  });
-
-  it(`Change case to in-progress`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-1',
-            status: CaseStatuses['in-progress'],
-            version: 'WzAsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload).toMatchInlineSnapshot(`
-      Array [
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": null,
-            "id": "none",
-            "name": "none",
-            "type": ".none",
-          },
-          "created_at": "2019-11-25T21:54:48.952Z",
-          "created_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "description": "This is a brand new case of a bad meanie defacing data",
-          "external_service": null,
-          "id": "mock-id-1",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "in-progress",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "defacement",
-          ],
-          "title": "Super Bad Security Issue",
-          "totalAlerts": 0,
-          "totalComment": 0,
-          "type": "individual",
-          "updated_at": "2019-11-25T21:54:48.952Z",
-          "updated_by": Object {
-            "email": "d00d@awesome.com",
-            "full_name": "Awesome D00d",
-            "username": "awesome",
-          },
-          "version": "WzE3LDFd",
-        },
-      ]
-    `);
-  });
-
-  it(`Patches a case without a connector.id`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-no-connector_id',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: [mockCaseNoConnectorId],
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload[0].connector.id).toEqual('none');
-  });
-
-  it(`Patches a case with a connector.id`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-3',
-            status: CaseStatuses.closed,
-            version: 'WzUsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload[0].connector.id).toEqual('123');
-  });
-
-  it(`Change connector`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-3',
-            connector: {
-              id: '456',
-              name: 'My connector 2',
-              type: '.jira',
-              fields: { issueType: 'Bug', priority: 'Low', parent: null },
-            },
-            version: 'WzUsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload[0].connector).toEqual({
-      id: '456',
-      name: 'My connector 2',
-      type: '.jira',
-      fields: { issueType: 'Bug', priority: 'Low', parent: null },
-    });
-  });
-
-  it(`Fails with 409 if version does not match`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-1',
-            case: { status: CaseStatuses.closed },
-            version: 'badv=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(409);
-  });
-
-  it(`Fails with 406 if updated field is unchanged`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-1',
-            case: { status: CaseStatuses.open },
-            version: 'WzAsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseCommentSavedObject: mockCaseComments,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(406);
-  });
-
-  it(`Returns an error if updateCase throws`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: '/api/cases',
-      method: 'patch',
-      body: {
-        cases: [
-          {
-            id: 'mock-id-does-not-exist',
-            status: CaseStatuses.closed,
-            version: 'WzAsMV0=',
-          },
-        ],
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(404);
-    expect(response.payload.isBoom).toEqual(true);
-  });
-});
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 092f88c1a8a20..8c72dee719d05 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
@@ -24,11 +24,11 @@ export function initPatchCasesApi({ router, logger }: RouteDeps) {
           return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
         }
 
-        const casesClient = context.cases.getCasesClient();
+        const casesClient = await context.cases.getCasesClient();
         const cases = request.body as CasesPatchRequest;
 
         return response.ok({
-          body: await casesClient.update(cases),
+          body: await casesClient.cases.update(cases),
         });
       } catch (error) {
         logger.error(`Failed to patch cases in route: ${error}`);
diff --git a/x-pack/plugins/cases/server/routes/api/cases/post_case.test.ts b/x-pack/plugins/cases/server/routes/api/cases/post_case.test.ts
deleted file mode 100644
index 669d3a5e58874..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/post_case.test.ts
+++ /dev/null
@@ -1,231 +0,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 { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-} from '../__fixtures__';
-import { initPostCaseApi } from './post_case';
-import { CASES_URL } from '../../../../common';
-import { mockCaseConfigure } from '../__fixtures__/mock_saved_objects';
-import { ConnectorTypes, CaseStatuses } from '../../../../common';
-
-describe('POST cases', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  beforeAll(async () => {
-    routeHandler = await createRoute(initPostCaseApi, 'post');
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue('2019-11-25T21:54:48.952Z'),
-    }));
-  });
-
-  it(`Posts a new case, no connector configured`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'post',
-      body: {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        title: 'Super Bad Security Issue',
-        tags: ['defacement'],
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.id).toEqual('mock-it');
-    expect(response.payload.status).toEqual('open');
-    expect(response.payload.created_by.username).toEqual('awesome');
-    expect(response.payload.connector).toEqual({
-      id: 'none',
-      name: 'none',
-      type: ConnectorTypes.none,
-      fields: null,
-    });
-  });
-
-  it(`Posts a new case, connector provided`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'post',
-      body: {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        title: 'Super Bad Security Issue',
-        tags: ['defacement'],
-        connector: {
-          id: '123',
-          name: 'Jira',
-          type: '.jira',
-          fields: { issueType: 'Task', priority: 'High', parent: null },
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseConfigureSavedObject: mockCaseConfigure,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.connector).toEqual({
-      id: '123',
-      name: 'Jira',
-      type: '.jira',
-      fields: { issueType: 'Task', priority: 'High', parent: null },
-    });
-  });
-
-  it(`Error if you passing status for a new case`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'post',
-      body: {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        title: 'Super Bad Security Issue',
-        status: CaseStatuses.open,
-        tags: ['defacement'],
-        connector: null,
-        settings: {
-          syncAlerts: true,
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(400);
-  });
-
-  it(`Returns an error if postNewCase throws`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'post',
-      body: {
-        description: 'Throw an error',
-        title: 'Super Bad Security Issue',
-        tags: ['error'],
-        connector: null,
-        settings: {
-          syncAlerts: true,
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(400);
-    expect(response.payload.isBoom).toEqual(true);
-  });
-
-  it(`Allow user to create case without authentication`, async () => {
-    routeHandler = await createRoute(initPostCaseApi, 'post', true);
-
-    const request = httpServerMock.createKibanaRequest({
-      path: CASES_URL,
-      method: 'post',
-      body: {
-        description: 'This is a brand new case of a bad meanie defacing data',
-        title: 'Super Bad Security Issue',
-        tags: ['defacement'],
-        connector: {
-          id: 'none',
-          name: 'none',
-          type: ConnectorTypes.none,
-          fields: null,
-        },
-        settings: {
-          syncAlerts: true,
-        },
-      },
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseConfigureSavedObject: mockCaseConfigure,
-      }),
-      true
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload).toMatchInlineSnapshot(`
-      Object {
-        "closed_at": null,
-        "closed_by": null,
-        "comments": Array [],
-        "connector": Object {
-          "fields": null,
-          "id": "none",
-          "name": "none",
-          "type": ".none",
-        },
-        "created_at": "2019-11-25T21:54:48.952Z",
-        "created_by": Object {
-          "email": null,
-          "full_name": null,
-          "username": null,
-        },
-        "description": "This is a brand new case of a bad meanie defacing data",
-        "external_service": null,
-        "id": "mock-it",
-        "settings": Object {
-          "syncAlerts": true,
-        },
-        "status": "open",
-        "subCaseIds": undefined,
-        "subCases": undefined,
-        "tags": Array [
-          "defacement",
-        ],
-        "title": "Super Bad Security Issue",
-        "totalAlerts": 0,
-        "totalComment": 0,
-        "type": "individual",
-        "updated_at": null,
-        "updated_by": null,
-        "version": "WzksMV0=",
-      }
-    `);
-  });
-});
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 a7951a1a71344..cc5d2c98333c8 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
@@ -24,11 +24,11 @@ export function initPostCaseApi({ router, logger }: RouteDeps) {
         if (!context.cases) {
           return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
         }
-        const casesClient = context.cases.getCasesClient();
+        const casesClient = await context.cases.getCasesClient();
         const theCase = request.body as CasePostRequest;
 
         return response.ok({
-          body: await casesClient.create({ ...theCase }),
+          body: await casesClient.cases.create({ ...theCase }),
         });
       } catch (error) {
         logger.error(`Failed to post case in route: ${error}`);
diff --git a/x-pack/plugins/cases/server/routes/api/cases/push_case.test.ts b/x-pack/plugins/cases/server/routes/api/cases/push_case.test.ts
deleted file mode 100644
index 378d092c8be0b..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/push_case.test.ts
+++ /dev/null
@@ -1,466 +0,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 { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-  mockCaseConfigure,
-  mockCaseMappings,
-  mockUserActions,
-  mockCaseComments,
-} from '../__fixtures__';
-import { initPushCaseApi } from './push_case';
-import { CasesRequestHandlerContext } from '../../../types';
-import { getCasePushUrl } from '../../../../common';
-
-describe('Push case', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  const mockDate = '2019-11-25T21:54:48.952Z';
-  const caseId = 'mock-id-3';
-  const connectorId = '123';
-  const path = getCasePushUrl(caseId, connectorId);
-
-  beforeAll(async () => {
-    routeHandler = await createRoute(initPushCaseApi, 'post');
-    const spyOnDate = jest.spyOn(global, 'Date') as jest.SpyInstance<{}, []>;
-    spyOnDate.mockImplementation(() => ({
-      toISOString: jest.fn().mockReturnValue(mockDate),
-    }));
-  });
-
-  it(`Pushes a case`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.external_service).toEqual({
-      connector_id: connectorId,
-      connector_name: 'ServiceNow',
-      external_id: '10663',
-      external_title: 'RJ2-200',
-      external_url: 'https://siem-kibana.atlassian.net/browse/RJ2-200',
-      pushed_at: mockDate,
-      pushed_by: {
-        email: 'd00d@awesome.com',
-        full_name: 'Awesome D00d',
-        username: 'awesome',
-      },
-    });
-  });
-
-  it(`Pushes a case with comments`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-        caseCommentSavedObject: [mockCaseComments[0]],
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.comments[0].pushed_at).toEqual(mockDate);
-    expect(response.payload.comments[0].pushed_by).toEqual({
-      email: 'd00d@awesome.com',
-      full_name: 'Awesome D00d',
-      username: 'awesome',
-    });
-  });
-
-  it(`Filters comments with type alert correctly`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-        caseCommentSavedObject: [mockCaseComments[0], mockCaseComments[3]],
-      })
-    );
-
-    const casesClient = context.cases.getCasesClient();
-    casesClient.getAlerts = jest.fn().mockResolvedValue([]);
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(casesClient.getAlerts).toHaveBeenCalledWith({
-      alertsInfo: [{ id: 'test-id', index: 'test-index' }],
-    });
-  });
-
-  it(`Calls execute with correct arguments`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: 'for-mock-case-id-3',
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const actionsClient = context.actions.getActionsClient();
-
-    await routeHandler(context, request, kibanaResponseFactory);
-    expect(actionsClient.execute).toHaveBeenCalledWith({
-      actionId: 'for-mock-case-id-3',
-      params: {
-        subAction: 'pushToService',
-        subActionParams: {
-          incident: {
-            issueType: 'Task',
-            parent: null,
-            priority: 'High',
-            labels: ['LOLBins'],
-            summary: 'Another bad one',
-            description:
-              'Oh no, a bad meanie going LOLBins all over the place! (created at 2019-11-25T22:32:17.947Z by elastic)',
-            externalId: null,
-          },
-          comments: [],
-        },
-      },
-    });
-  });
-
-  it(`Pushes a case and closes when closure_type: 'close-by-pushing'`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseUserActionsSavedObject: mockUserActions,
-        caseConfigureSavedObject: [
-          {
-            ...mockCaseConfigure[0],
-            attributes: {
-              ...mockCaseConfigure[0].attributes,
-              closure_type: 'close-by-pushing',
-            },
-          },
-        ],
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(response.payload.closed_at).toEqual(mockDate);
-  });
-
-  it(`post the correct user action`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context, services } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    services.userActionService.postUserActions = jest.fn();
-    const postUserActions = services.userActionService.postUserActions as jest.Mock;
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(200);
-    expect(postUserActions.mock.calls[0][0].actions[0].attributes).toEqual({
-      action: 'push-to-service',
-      action_at: '2019-11-25T21:54:48.952Z',
-      action_by: {
-        email: 'd00d@awesome.com',
-        full_name: 'Awesome D00d',
-        username: 'awesome',
-      },
-      action_field: ['pushed'],
-      new_value:
-        '{"pushed_at":"2019-11-25T21:54:48.952Z","pushed_by":{"username":"awesome","full_name":"Awesome D00d","email":"d00d@awesome.com"},"connector_id":"123","connector_name":"ServiceNow","external_id":"10663","external_title":"RJ2-200","external_url":"https://siem-kibana.atlassian.net/browse/RJ2-200"}',
-      old_value: null,
-    });
-  });
-
-  it('Unhappy path - case id is missing', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const res = await routeHandler(context, request, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-  });
-
-  it('Unhappy path - connector id is missing', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const res = await routeHandler(context, request, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-  });
-
-  it('Unhappy path - case does not exists', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: 'not-exist',
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const res = await routeHandler(context, request, kibanaResponseFactory);
-    expect(res.status).toEqual(404);
-  });
-
-  it('Unhappy path - connector does not exists', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: 'not-exists',
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const res = await routeHandler(context, request, kibanaResponseFactory);
-    expect(res.status).toEqual(404);
-  });
-
-  it('Unhappy path - cannot push to a closed case', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: 'mock-id-4',
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const res = await routeHandler(context, request, kibanaResponseFactory);
-    expect(res.status).toEqual(409);
-    expect(res.payload.output.payload.message).toBe(
-      'This case Another bad one is closed. You can not pushed if the case is closed.'
-    );
-  });
-
-  it('Unhappy path - throws when external service returns an error', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const actionsClient = context.actions.getActionsClient();
-    (actionsClient.execute as jest.Mock).mockResolvedValue({
-      status: 'error',
-    });
-
-    const res = await routeHandler(context, request, kibanaResponseFactory);
-    expect(res.status).toEqual(424);
-    expect(res.payload.output.payload.message).toBe('Error pushing to service');
-  });
-
-  it('Unhappy path - context case missing', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const betterContext = ({
-      ...context,
-      cases: null,
-    } as unknown) as CasesRequestHandlerContext;
-
-    const res = await routeHandler(betterContext, request, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload).toEqual('RouteHandlerContext is not registered for cases');
-  });
-
-  it('Unhappy path - context actions missing', async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path,
-      method: 'post',
-      params: {
-        case_id: caseId,
-        connector_id: connectorId,
-      },
-      body: {},
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-        caseMappingsSavedObject: mockCaseMappings,
-        caseConfigureSavedObject: mockCaseConfigure,
-        caseUserActionsSavedObject: mockUserActions,
-      })
-    );
-
-    const betterContext = ({
-      ...context,
-      actions: null,
-    } as unknown) as CasesRequestHandlerContext;
-
-    const res = await routeHandler(betterContext, request, kibanaResponseFactory);
-    expect(res.status).toEqual(400);
-    expect(res.payload).toEqual('Action client not found');
-  });
-});
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 9bfb30e0d63ad..a49e1a99c418f 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
@@ -31,12 +31,7 @@ export function initPushCaseApi({ router, logger }: RouteDeps) {
           return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
         }
 
-        const casesClient = context.cases.getCasesClient();
-        const actionsClient = context.actions?.getActionsClient();
-
-        if (actionsClient == null) {
-          return response.badRequest({ body: 'Action client not found' });
-        }
+        const casesClient = await context.cases.getCasesClient();
 
         const params = pipe(
           CasePushRequestParamsRt.decode(request.params),
@@ -44,8 +39,7 @@ export function initPushCaseApi({ router, logger }: RouteDeps) {
         );
 
         return response.ok({
-          body: await casesClient.push({
-            actionsClient,
+          body: await casesClient.cases.push({
             caseId: params.case_id,
             connectorId: params.connector_id,
           }),
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 53fdc298ef267..a7a0e4f8bb141 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
@@ -5,24 +5,29 @@
  * 2.0.
  */
 
-import { UsersRt } from '../../../../../common';
 import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { CASE_REPORTERS_URL } from '../../../../../common';
+import { wrapError, escapeHatch } from '../../utils';
+import { CASE_REPORTERS_URL } from '../../../../../common/constants';
+import { AllReportersFindRequest } from '../../../../../common/api';
 
-export function initGetReportersApi({ caseService, router, logger }: RouteDeps) {
+export function initGetReportersApi({ router, logger }: RouteDeps) {
   router.get(
     {
       path: CASE_REPORTERS_URL,
-      validate: {},
+      validate: {
+        query: escapeHatch,
+      },
     },
     async (context, request, response) => {
       try {
-        const client = context.core.savedObjects.client;
-        const reporters = await caseService.getReporters({
-          client,
-        });
-        return response.ok({ body: UsersRt.encode(reporters) });
+        if (!context.cases) {
+          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
+        }
+
+        const client = await context.cases.getCasesClient();
+        const options = request.query as AllReportersFindRequest;
+
+        return response.ok({ body: await client.cases.getReporters({ ...options }) });
       } catch (error) {
         logger.error(`Failed to get reporters in route: ${error}`);
         return response.customError(wrapError(error));
diff --git a/x-pack/plugins/cases/server/routes/api/cases/status/get_status.test.ts b/x-pack/plugins/cases/server/routes/api/cases/status/get_status.test.ts
deleted file mode 100644
index 60ad0c60f944f..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/status/get_status.test.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
-import { httpServerMock } from 'src/core/server/mocks';
-
-import {
-  createMockSavedObjectsRepository,
-  createRoute,
-  createRouteContext,
-  mockCases,
-} from '../../__fixtures__';
-import { initGetCasesStatusApi } from './get_status';
-import { CASE_STATUS_URL } from '../../../../../common';
-import { CaseType } from '../../../../../common';
-
-describe('GET status', () => {
-  let routeHandler: RequestHandler<any, any, any>;
-  const findArgs = {
-    fields: [],
-    page: 1,
-    perPage: 1,
-    type: 'cases',
-    sortField: 'created_at',
-  };
-
-  beforeAll(async () => {
-    routeHandler = await createRoute(initGetCasesStatusApi, 'get');
-  });
-
-  it(`returns the status`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_STATUS_URL,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: mockCases,
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(context.core.savedObjects.client.find).toHaveBeenNthCalledWith(1, {
-      ...findArgs,
-      filter: `((cases.attributes.status: open AND cases.attributes.type: individual) OR cases.attributes.type: ${CaseType.collection})`,
-    });
-
-    expect(context.core.savedObjects.client.find).toHaveBeenNthCalledWith(2, {
-      ...findArgs,
-      filter: `((cases.attributes.status: in-progress AND cases.attributes.type: individual) OR cases.attributes.type: ${CaseType.collection})`,
-    });
-
-    expect(context.core.savedObjects.client.find).toHaveBeenNthCalledWith(3, {
-      ...findArgs,
-      filter: `((cases.attributes.status: closed AND cases.attributes.type: individual) OR cases.attributes.type: ${CaseType.collection})`,
-    });
-
-    expect(response.payload).toEqual({
-      count_open_cases: 4,
-      count_in_progress_cases: 4,
-      count_closed_cases: 4,
-    });
-  });
-
-  it(`returns an error when findCases throws`, async () => {
-    const request = httpServerMock.createKibanaRequest({
-      path: CASE_STATUS_URL,
-      method: 'get',
-    });
-
-    const { context } = await createRouteContext(
-      createMockSavedObjectsRepository({
-        caseSavedObject: [{ ...mockCases[0], id: 'throw-error-find' }],
-      })
-    );
-
-    const response = await routeHandler(context, request, kibanaResponseFactory);
-    expect(response.status).toEqual(404);
-  });
-});
diff --git a/x-pack/plugins/cases/server/routes/api/cases/status/get_status.ts b/x-pack/plugins/cases/server/routes/api/cases/status/get_status.ts
deleted file mode 100644
index 73642fdee0eac..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/status/get_status.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-
-import { CasesStatusResponseRt, caseStatuses } from '../../../../../common';
-import { CASE_STATUS_URL } from '../../../../../common';
-import { constructQueryOptions } from '../helpers';
-
-export function initGetCasesStatusApi({ caseService, router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: CASE_STATUS_URL,
-      validate: {},
-    },
-    async (context, request, response) => {
-      try {
-        const client = context.core.savedObjects.client;
-
-        const [openCases, inProgressCases, closedCases] = await Promise.all([
-          ...caseStatuses.map((status) => {
-            const statusQuery = constructQueryOptions({ status });
-            return caseService.findCaseStatusStats({
-              client,
-              caseOptions: statusQuery.case,
-              subCaseOptions: statusQuery.subCase,
-            });
-          }),
-        ]);
-
-        return response.ok({
-          body: CasesStatusResponseRt.encode({
-            count_open_cases: openCases,
-            count_in_progress_cases: inProgressCases,
-            count_closed_cases: closedCases,
-          }),
-        });
-      } catch (error) {
-        logger.error(`Failed to get status stats in route: ${error}`);
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/sub_case/delete_sub_cases.ts b/x-pack/plugins/cases/server/routes/api/cases/sub_case/delete_sub_cases.ts
deleted file mode 100644
index ef60c743ec822..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/sub_case/delete_sub_cases.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 Boom from '@hapi/boom';
-import { schema } from '@kbn/config-schema';
-import { buildCaseUserActionItem } from '../../../../services/user_actions/helpers';
-import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { SUB_CASES_PATCH_DEL_URL } from '../../../../../common';
-import { CASE_SAVED_OBJECT } from '../../../../saved_object_types';
-
-export function initDeleteSubCasesApi({
-  caseService,
-  router,
-  userActionService,
-  logger,
-}: RouteDeps) {
-  router.delete(
-    {
-      path: SUB_CASES_PATCH_DEL_URL,
-      validate: {
-        query: schema.object({
-          ids: schema.arrayOf(schema.string()),
-        }),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const client = context.core.savedObjects.client;
-
-        const [comments, subCases] = await Promise.all([
-          caseService.getAllSubCaseComments({ client, id: request.query.ids }),
-          caseService.getSubCases({ client, ids: request.query.ids }),
-        ]);
-
-        const subCaseErrors = subCases.saved_objects.filter(
-          (subCase) => subCase.error !== undefined
-        );
-
-        if (subCaseErrors.length > 0) {
-          throw Boom.notFound(
-            `These sub cases ${subCaseErrors
-              .map((c) => c.id)
-              .join(', ')} do not exist. Please check you have the correct ids.`
-          );
-        }
-
-        const subCaseIDToParentID = subCases.saved_objects.reduce((acc, subCase) => {
-          const parentID = subCase.references.find((ref) => ref.type === CASE_SAVED_OBJECT);
-          acc.set(subCase.id, parentID?.id);
-          return acc;
-        }, new Map<string, string | undefined>());
-
-        await Promise.all(
-          comments.saved_objects.map((comment) =>
-            caseService.deleteComment({ client, commentId: comment.id })
-          )
-        );
-
-        await Promise.all(request.query.ids.map((id) => caseService.deleteSubCase(client, id)));
-
-        // eslint-disable-next-line @typescript-eslint/naming-convention
-        const { username, full_name, email } = await caseService.getUser({ request });
-        const deleteDate = new Date().toISOString();
-
-        await userActionService.postUserActions({
-          client,
-          actions: request.query.ids.map((id) =>
-            buildCaseUserActionItem({
-              action: 'delete',
-              actionAt: deleteDate,
-              actionBy: { username, full_name, email },
-              // if for some reason the sub case didn't have a reference to its parent, we'll still log a user action
-              // but we won't have the case ID
-              caseId: subCaseIDToParentID.get(id) ?? '',
-              subCaseId: id,
-              fields: ['sub_case', 'comment', 'status'],
-            })
-          ),
-        });
-
-        return response.noContent();
-      } catch (error) {
-        logger.error(
-          `Failed to delete sub cases in route ids: ${JSON.stringify(request.query.ids)}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/sub_case/find_sub_cases.ts b/x-pack/plugins/cases/server/routes/api/cases/sub_case/find_sub_cases.ts
deleted file mode 100644
index e069ceda14df9..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/sub_case/find_sub_cases.ts
+++ /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 { schema } from '@kbn/config-schema';
-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 {
-  caseStatuses,
-  SubCasesFindRequestRt,
-  SubCasesFindResponseRt,
-  throwErrors,
-} from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { escapeHatch, transformSubCases, wrapError } from '../../utils';
-import { SUB_CASES_URL } from '../../../../../common';
-import { constructQueryOptions } from '../helpers';
-import { defaultPage, defaultPerPage } from '../..';
-
-export function initFindSubCasesApi({ caseService, router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: `${SUB_CASES_URL}/_find`,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-        }),
-        query: escapeHatch,
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const client = context.core.savedObjects.client;
-        const queryParams = pipe(
-          SubCasesFindRequestRt.decode(request.query),
-          fold(throwErrors(Boom.badRequest), identity)
-        );
-
-        const ids = [request.params.case_id];
-        const { subCase: subCaseQueryOptions } = constructQueryOptions({
-          status: queryParams.status,
-          sortByField: queryParams.sortField,
-        });
-
-        const subCases = await caseService.findSubCasesGroupByCase({
-          client,
-          ids,
-          options: {
-            sortField: 'created_at',
-            page: defaultPage,
-            perPage: defaultPerPage,
-            ...queryParams,
-            ...subCaseQueryOptions,
-          },
-        });
-
-        const [open, inProgress, closed] = await Promise.all([
-          ...caseStatuses.map((status) => {
-            const { subCase: statusQueryOptions } = constructQueryOptions({
-              status,
-              sortByField: queryParams.sortField,
-            });
-            return caseService.findSubCaseStatusStats({
-              client,
-              options: statusQueryOptions ?? {},
-              ids,
-            });
-          }),
-        ]);
-
-        return response.ok({
-          body: SubCasesFindResponseRt.encode(
-            transformSubCases({
-              page: subCases.page,
-              perPage: subCases.perPage,
-              total: subCases.total,
-              subCasesMap: subCases.subCasesMap,
-              open,
-              inProgress,
-              closed,
-            })
-          ),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to find sub cases in route case id: ${request.params.case_id}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/sub_case/get_sub_case.ts b/x-pack/plugins/cases/server/routes/api/cases/sub_case/get_sub_case.ts
deleted file mode 100644
index b5ebfb4de348b..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/sub_case/get_sub_case.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { schema } from '@kbn/config-schema';
-
-import { SubCaseResponseRt } from '../../../../../common';
-import { RouteDeps } from '../../types';
-import { flattenSubCaseSavedObject, wrapError } from '../../utils';
-import { SUB_CASE_DETAILS_URL } from '../../../../../common';
-import { countAlertsForID } from '../../../../common';
-
-export function initGetSubCaseApi({ caseService, router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: SUB_CASE_DETAILS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-          sub_case_id: schema.string(),
-        }),
-        query: schema.object({
-          includeComments: schema.boolean({ defaultValue: true }),
-        }),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const client = context.core.savedObjects.client;
-        const includeComments = request.query.includeComments;
-
-        const subCase = await caseService.getSubCase({
-          client,
-          id: request.params.sub_case_id,
-        });
-
-        if (!includeComments) {
-          return response.ok({
-            body: SubCaseResponseRt.encode(
-              flattenSubCaseSavedObject({
-                savedObject: subCase,
-              })
-            ),
-          });
-        }
-
-        const theComments = await caseService.getAllSubCaseComments({
-          client,
-          id: request.params.sub_case_id,
-          options: {
-            sortField: 'created_at',
-            sortOrder: 'asc',
-          },
-        });
-
-        return response.ok({
-          body: SubCaseResponseRt.encode(
-            flattenSubCaseSavedObject({
-              savedObject: subCase,
-              comments: theComments.saved_objects,
-              totalComment: theComments.total,
-              totalAlerts: countAlertsForID({
-                comments: theComments,
-                id: request.params.sub_case_id,
-              }),
-            })
-          ),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to get sub case in route case id: ${request.params.case_id} sub case id: ${request.params.sub_case_id} include comments: ${request.query?.includeComments}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
diff --git a/x-pack/plugins/cases/server/routes/api/cases/sub_case/patch_sub_cases.ts b/x-pack/plugins/cases/server/routes/api/cases/sub_case/patch_sub_cases.ts
deleted file mode 100644
index 0b142fb5279e5..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/sub_case/patch_sub_cases.ts
+++ /dev/null
@@ -1,448 +0,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 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 {
-  SavedObjectsClientContract,
-  KibanaRequest,
-  SavedObject,
-  SavedObjectsFindResponse,
-  Logger,
-} from 'kibana/server';
-
-import { CasesClient } from '../../../../client';
-import { CASE_COMMENT_SAVED_OBJECT, SUB_CASE_SAVED_OBJECT } from '../../../../saved_object_types';
-import { CaseServiceSetup, CaseUserActionServiceSetup } from '../../../../services';
-import {
-  CaseStatuses,
-  SubCasesPatchRequest,
-  SubCasesPatchRequestRt,
-  CommentType,
-  excess,
-  throwErrors,
-  SubCasesResponse,
-  SubCasePatchRequest,
-  SubCaseAttributes,
-  ESCaseAttributes,
-  SubCaseResponse,
-  SubCasesResponseRt,
-  User,
-  CommentAttributes,
-} from '../../../../../common';
-import { SUB_CASES_PATCH_DEL_URL } from '../../../../../common';
-import { RouteDeps } from '../../types';
-import {
-  escapeHatch,
-  flattenSubCaseSavedObject,
-  isCommentRequestTypeAlertOrGenAlert,
-  wrapError,
-} from '../../utils';
-import { getCaseToUpdate } from '../helpers';
-import { buildSubCaseUserActions } from '../../../../services/user_actions/helpers';
-import { createAlertUpdateRequest } from '../../../../common';
-import { UpdateAlertRequest } from '../../../../client/types';
-import { createCaseError } from '../../../../common/error';
-
-interface UpdateArgs {
-  client: SavedObjectsClientContract;
-  caseService: CaseServiceSetup;
-  userActionService: CaseUserActionServiceSetup;
-  request: KibanaRequest;
-  casesClient: CasesClient;
-  subCases: SubCasesPatchRequest;
-  logger: Logger;
-}
-
-function checkNonExistingOrConflict(
-  toUpdate: SubCasePatchRequest[],
-  fromStorage: Map<string, SavedObject<SubCaseAttributes>>
-) {
-  const nonExistingSubCases: SubCasePatchRequest[] = [];
-  const conflictedSubCases: SubCasePatchRequest[] = [];
-  for (const subCaseToUpdate of toUpdate) {
-    const bulkEntry = fromStorage.get(subCaseToUpdate.id);
-
-    if (bulkEntry && bulkEntry.error) {
-      nonExistingSubCases.push(subCaseToUpdate);
-    }
-
-    if (!bulkEntry || bulkEntry.version !== subCaseToUpdate.version) {
-      conflictedSubCases.push(subCaseToUpdate);
-    }
-  }
-
-  if (nonExistingSubCases.length > 0) {
-    throw Boom.notFound(
-      `These sub cases ${nonExistingSubCases
-        .map((c) => c.id)
-        .join(', ')} do not exist. Please check you have the correct ids.`
-    );
-  }
-
-  if (conflictedSubCases.length > 0) {
-    throw Boom.conflict(
-      `These sub cases ${conflictedSubCases
-        .map((c) => c.id)
-        .join(', ')} has been updated. Please refresh before saving additional updates.`
-    );
-  }
-}
-
-interface GetParentIDsResult {
-  ids: string[];
-  parentIDToSubID: Map<string, string[]>;
-}
-
-function getParentIDs({
-  subCasesMap,
-  subCaseIDs,
-}: {
-  subCasesMap: Map<string, SavedObject<SubCaseAttributes>>;
-  subCaseIDs: string[];
-}): GetParentIDsResult {
-  return subCaseIDs.reduce<GetParentIDsResult>(
-    (acc, id) => {
-      const subCase = subCasesMap.get(id);
-      if (subCase && subCase.references.length > 0) {
-        const parentID = subCase.references[0].id;
-        acc.ids.push(parentID);
-        let subIDs = acc.parentIDToSubID.get(parentID);
-        if (subIDs === undefined) {
-          subIDs = [];
-        }
-        subIDs.push(id);
-        acc.parentIDToSubID.set(parentID, subIDs);
-      }
-      return acc;
-    },
-    { ids: [], parentIDToSubID: new Map<string, string[]>() }
-  );
-}
-
-async function getParentCases({
-  caseService,
-  client,
-  subCaseIDs,
-  subCasesMap,
-}: {
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
-  subCaseIDs: string[];
-  subCasesMap: Map<string, SavedObject<SubCaseAttributes>>;
-}): Promise<Map<string, SavedObject<ESCaseAttributes>>> {
-  const parentIDInfo = getParentIDs({ subCaseIDs, subCasesMap });
-
-  const parentCases = await caseService.getCases({
-    client,
-    caseIds: parentIDInfo.ids,
-  });
-
-  const parentCaseErrors = parentCases.saved_objects.filter((so) => so.error !== undefined);
-
-  if (parentCaseErrors.length > 0) {
-    throw Boom.badRequest(
-      `Unable to find parent cases: ${parentCaseErrors
-        .map((c) => c.id)
-        .join(', ')} for sub cases: ${subCaseIDs.join(', ')}`
-    );
-  }
-
-  return parentCases.saved_objects.reduce((acc, so) => {
-    const subCaseIDsWithParent = parentIDInfo.parentIDToSubID.get(so.id);
-    subCaseIDsWithParent?.forEach((subCaseId) => {
-      acc.set(subCaseId, so);
-    });
-    return acc;
-  }, new Map<string, SavedObject<ESCaseAttributes>>());
-}
-
-function getValidUpdateRequests(
-  toUpdate: SubCasePatchRequest[],
-  subCasesMap: Map<string, SavedObject<SubCaseAttributes>>
-): SubCasePatchRequest[] {
-  const validatedSubCaseAttributes: SubCasePatchRequest[] = toUpdate.map((updateCase) => {
-    const currentCase = subCasesMap.get(updateCase.id);
-    return currentCase != null
-      ? getCaseToUpdate(currentCase.attributes, {
-          ...updateCase,
-        })
-      : { id: updateCase.id, version: updateCase.version };
-  });
-
-  return validatedSubCaseAttributes.filter((updateCase: SubCasePatchRequest) => {
-    const { id, version, ...updateCaseAttributes } = updateCase;
-    return Object.keys(updateCaseAttributes).length > 0;
-  });
-}
-
-/**
- * Get the id from a reference in a comment for a sub case
- */
-function getID(comment: SavedObject<CommentAttributes>): string | undefined {
-  return comment.references.find((ref) => ref.type === SUB_CASE_SAVED_OBJECT)?.id;
-}
-
-/**
- * Get all the alert comments for a set of sub cases
- */
-async function getAlertComments({
-  subCasesToSync,
-  caseService,
-  client,
-}: {
-  subCasesToSync: SubCasePatchRequest[];
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
-}): Promise<SavedObjectsFindResponse<CommentAttributes>> {
-  const ids = subCasesToSync.map((subCase) => subCase.id);
-  return caseService.getAllSubCaseComments({
-    client,
-    id: ids,
-    options: {
-      filter: `${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.alert} OR ${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.generatedAlert}`,
-    },
-  });
-}
-
-/**
- * Updates the status of alerts for the specified sub cases.
- */
-async function updateAlerts({
-  subCasesToSync,
-  caseService,
-  client,
-  casesClient,
-  logger,
-}: {
-  subCasesToSync: SubCasePatchRequest[];
-  caseService: CaseServiceSetup;
-  client: SavedObjectsClientContract;
-  casesClient: CasesClient;
-  logger: Logger;
-}) {
-  try {
-    const subCasesToSyncMap = subCasesToSync.reduce((acc, subCase) => {
-      acc.set(subCase.id, subCase);
-      return acc;
-    }, new Map<string, SubCasePatchRequest>());
-    // get all the alerts for all sub cases that need to be synced
-    const totalAlerts = await getAlertComments({ caseService, client, subCasesToSync });
-    // create a map of the status (open, closed, etc) to alert info that needs to be updated
-    const alertsToUpdate = totalAlerts.saved_objects.reduce(
-      (acc: UpdateAlertRequest[], alertComment) => {
-        if (isCommentRequestTypeAlertOrGenAlert(alertComment.attributes)) {
-          const id = getID(alertComment);
-          const status =
-            id !== undefined
-              ? subCasesToSyncMap.get(id)?.status ?? CaseStatuses.open
-              : CaseStatuses.open;
-
-          acc.push(...createAlertUpdateRequest({ comment: alertComment.attributes, status }));
-        }
-        return acc;
-      },
-      []
-    );
-
-    await casesClient.updateAlertsStatus({ alerts: alertsToUpdate });
-  } catch (error) {
-    throw createCaseError({
-      message: `Failed to update alert status while updating sub cases: ${JSON.stringify(
-        subCasesToSync
-      )}: ${error}`,
-      logger,
-      error,
-    });
-  }
-}
-
-async function update({
-  client,
-  caseService,
-  userActionService,
-  request,
-  casesClient,
-  subCases,
-  logger,
-}: UpdateArgs): Promise<SubCasesResponse> {
-  const query = pipe(
-    excess(SubCasesPatchRequestRt).decode(subCases),
-    fold(throwErrors(Boom.badRequest), identity)
-  );
-
-  try {
-    const bulkSubCases = await caseService.getSubCases({
-      client,
-      ids: query.subCases.map((q) => q.id),
-    });
-
-    const subCasesMap = bulkSubCases.saved_objects.reduce((acc, so) => {
-      acc.set(so.id, so);
-      return acc;
-    }, new Map<string, SavedObject<SubCaseAttributes>>());
-
-    checkNonExistingOrConflict(query.subCases, subCasesMap);
-
-    const nonEmptySubCaseRequests = getValidUpdateRequests(query.subCases, subCasesMap);
-
-    if (nonEmptySubCaseRequests.length <= 0) {
-      throw Boom.notAcceptable('All update fields are identical to current version.');
-    }
-
-    const subIDToParentCase = await getParentCases({
-      client,
-      caseService,
-      subCaseIDs: nonEmptySubCaseRequests.map((subCase) => subCase.id),
-      subCasesMap,
-    });
-
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { username, full_name, email } = await caseService.getUser({ request });
-    const updatedAt = new Date().toISOString();
-    const updatedCases = await caseService.patchSubCases({
-      client,
-      subCases: nonEmptySubCaseRequests.map((thisCase) => {
-        const { id: subCaseId, version, ...updateSubCaseAttributes } = thisCase;
-        let closedInfo: { closed_at: string | null; closed_by: User | null } = {
-          closed_at: null,
-          closed_by: null,
-        };
-
-        if (
-          updateSubCaseAttributes.status &&
-          updateSubCaseAttributes.status === CaseStatuses.closed
-        ) {
-          closedInfo = {
-            closed_at: updatedAt,
-            closed_by: { email, full_name, username },
-          };
-        } else if (
-          updateSubCaseAttributes.status &&
-          (updateSubCaseAttributes.status === CaseStatuses.open ||
-            updateSubCaseAttributes.status === CaseStatuses['in-progress'])
-        ) {
-          closedInfo = {
-            closed_at: null,
-            closed_by: null,
-          };
-        }
-        return {
-          subCaseId,
-          updatedAttributes: {
-            ...updateSubCaseAttributes,
-            ...closedInfo,
-            updated_at: updatedAt,
-            updated_by: { email, full_name, username },
-          },
-          version,
-        };
-      }),
-    });
-
-    const subCasesToSyncAlertsFor = nonEmptySubCaseRequests.filter((subCaseToUpdate) => {
-      const storedSubCase = subCasesMap.get(subCaseToUpdate.id);
-      const parentCase = subIDToParentCase.get(subCaseToUpdate.id);
-      return (
-        storedSubCase !== undefined &&
-        subCaseToUpdate.status !== undefined &&
-        storedSubCase.attributes.status !== subCaseToUpdate.status &&
-        parentCase?.attributes.settings.syncAlerts
-      );
-    });
-
-    await updateAlerts({
-      caseService,
-      client,
-      casesClient,
-      subCasesToSync: subCasesToSyncAlertsFor,
-      logger,
-    });
-
-    const returnUpdatedSubCases = updatedCases.saved_objects.reduce<SubCaseResponse[]>(
-      (acc, updatedSO) => {
-        const originalSubCase = subCasesMap.get(updatedSO.id);
-        if (originalSubCase) {
-          acc.push(
-            flattenSubCaseSavedObject({
-              savedObject: {
-                ...originalSubCase,
-                ...updatedSO,
-                attributes: { ...originalSubCase.attributes, ...updatedSO.attributes },
-                references: originalSubCase.references,
-                version: updatedSO.version ?? originalSubCase.version,
-              },
-            })
-          );
-        }
-        return acc;
-      },
-      []
-    );
-
-    await userActionService.postUserActions({
-      client,
-      actions: buildSubCaseUserActions({
-        originalSubCases: bulkSubCases.saved_objects,
-        updatedSubCases: updatedCases.saved_objects,
-        actionDate: updatedAt,
-        actionBy: { email, full_name, username },
-      }),
-    });
-
-    return SubCasesResponseRt.encode(returnUpdatedSubCases);
-  } catch (error) {
-    const idVersions = query.subCases.map((subCase) => ({
-      id: subCase.id,
-      version: subCase.version,
-    }));
-    throw createCaseError({
-      message: `Failed to update sub cases: ${JSON.stringify(idVersions)}: ${error}`,
-      error,
-      logger,
-    });
-  }
-}
-
-export function initPatchSubCasesApi({
-  router,
-  caseService,
-  userActionService,
-  logger,
-}: RouteDeps) {
-  router.patch(
-    {
-      path: SUB_CASES_PATCH_DEL_URL,
-      validate: {
-        body: escapeHatch,
-      },
-    },
-    async (context, request, response) => {
-      try {
-        const casesClient = context.cases.getCasesClient();
-        const subCases = request.body as SubCasesPatchRequest;
-
-        return response.ok({
-          body: await update({
-            request,
-            subCases,
-            casesClient,
-            client: context.core.savedObjects.client,
-            caseService,
-            userActionService,
-            logger,
-          }),
-        });
-      } catch (error) {
-        logger.error(`Failed to patch sub cases in route: ${error}`);
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
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 d70d6e0b57ee9..a62c3247b01df 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
@@ -6,23 +6,30 @@
  */
 
 import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { CASE_TAGS_URL } from '../../../../../common';
+import { wrapError, escapeHatch } from '../../utils';
+import { CASE_TAGS_URL } from '../../../../../common/constants';
+import { AllTagsFindRequest } from '../../../../../common/api';
 
-export function initGetTagsApi({ caseService, router }: RouteDeps) {
+export function initGetTagsApi({ router, logger }: RouteDeps) {
   router.get(
     {
       path: CASE_TAGS_URL,
-      validate: {},
+      validate: {
+        query: escapeHatch,
+      },
     },
     async (context, request, response) => {
       try {
-        const client = context.core.savedObjects.client;
-        const tags = await caseService.getTags({
-          client,
-        });
-        return response.ok({ body: tags });
+        if (!context.cases) {
+          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
+        }
+
+        const client = await context.cases.getCasesClient();
+        const options = request.query as AllTagsFindRequest;
+
+        return response.ok({ body: await client.cases.getTags({ ...options }) });
       } catch (error) {
+        logger.error(`Failed to retrieve tags in route: ${error}`);
         return response.customError(wrapError(error));
       }
     }
diff --git a/x-pack/plugins/cases/server/routes/api/cases/user_actions/get_all_user_actions.ts b/x-pack/plugins/cases/server/routes/api/cases/user_actions/get_all_user_actions.ts
deleted file mode 100644
index 48393b6af34ae..0000000000000
--- a/x-pack/plugins/cases/server/routes/api/cases/user_actions/get_all_user_actions.ts
+++ /dev/null
@@ -1,78 +0,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 { schema } from '@kbn/config-schema';
-
-import { RouteDeps } from '../../types';
-import { wrapError } from '../../utils';
-import { CASE_USER_ACTIONS_URL, SUB_CASE_USER_ACTIONS_URL } from '../../../../../common';
-
-export function initGetAllCaseUserActionsApi({ router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: CASE_USER_ACTIONS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-        }),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        if (!context.cases) {
-          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
-        }
-
-        const casesClient = context.cases.getCasesClient();
-        const caseId = request.params.case_id;
-
-        return response.ok({
-          body: await casesClient.getUserActions({ caseId }),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to retrieve case user actions in route case id: ${request.params.case_id}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
-
-export function initGetAllSubCaseUserActionsApi({ router, logger }: RouteDeps) {
-  router.get(
-    {
-      path: SUB_CASE_USER_ACTIONS_URL,
-      validate: {
-        params: schema.object({
-          case_id: schema.string(),
-          sub_case_id: schema.string(),
-        }),
-      },
-    },
-    async (context, request, response) => {
-      try {
-        if (!context.cases) {
-          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
-        }
-
-        const casesClient = context.cases.getCasesClient();
-        const caseId = request.params.case_id;
-        const subCaseId = request.params.sub_case_id;
-
-        return response.ok({
-          body: await casesClient.getUserActions({ caseId, subCaseId }),
-        });
-      } catch (error) {
-        logger.error(
-          `Failed to retrieve sub case user actions in route case id: ${request.params.case_id} sub case id: ${request.params.sub_case_id}: ${error}`
-        );
-        return response.customError(wrapError(error));
-      }
-    }
-  );
-}
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
new file mode 100644
index 0000000000000..a41d4683af2d0
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/comments/delete_all_comments.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 { schema } from '@kbn/config-schema';
+import { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+import { CASE_COMMENTS_URL } from '../../../../common/constants';
+
+export function initDeleteAllCommentsApi({ router, logger }: RouteDeps) {
+  router.delete(
+    {
+      path: CASE_COMMENTS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+        query: schema.maybe(
+          schema.object({
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+
+        await client.attachments.deleteAll({
+          caseID: request.params.case_id,
+          subCaseID: request.query?.subCaseId,
+        });
+
+        return response.noContent();
+      } catch (error) {
+        logger.error(
+          `Failed to delete all comments in route case id: ${request.params.case_id} sub case id: ${request.query?.subCaseId}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..f145fc62efc8a
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/comments/delete_comment.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+import { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+import { CASE_COMMENT_DETAILS_URL } from '../../../../common/constants';
+
+export function initDeleteCommentApi({ router, logger }: RouteDeps) {
+  router.delete(
+    {
+      path: CASE_COMMENT_DETAILS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+          comment_id: schema.string(),
+        }),
+        query: schema.maybe(
+          schema.object({
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+        await client.attachments.delete({
+          attachmentID: request.params.comment_id,
+          subCaseID: request.query?.subCaseId,
+          caseID: request.params.case_id,
+        });
+
+        return response.noContent();
+      } catch (error) {
+        logger.error(
+          `Failed to delete comment in route case id: ${request.params.case_id} comment id: ${request.params.comment_id} sub case id: ${request.query?.subCaseId}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..a758805deb6ef
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/comments/find_comments.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 { schema } from '@kbn/config-schema';
+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 { FindQueryParamsRt, throwErrors, excess } from '../../../../common/api';
+import { RouteDeps } from '../types';
+import { escapeHatch, wrapError } from '../utils';
+import { CASE_COMMENTS_URL } from '../../../../common/constants';
+
+export function initFindCaseCommentsApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: `${CASE_COMMENTS_URL}/_find`,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+        query: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const query = pipe(
+          excess(FindQueryParamsRt).decode(request.query),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const client = await context.cases.getCasesClient();
+        return response.ok({
+          body: await client.attachments.find({
+            caseID: request.params.case_id,
+            queryParams: query,
+          }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to find comments in route case id: ${request.params.case_id}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..b916e22c6b0ed
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/comments/get_all_comment.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { schema } from '@kbn/config-schema';
+
+import { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+import { CASE_COMMENTS_URL } from '../../../../common/constants';
+
+export function initGetAllCommentsApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: CASE_COMMENTS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+        query: schema.maybe(
+          schema.object({
+            includeSubCaseComments: schema.maybe(schema.boolean()),
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+
+        return response.ok({
+          body: await client.attachments.getAll({
+            caseID: request.params.case_id,
+            includeSubCaseComments: request.query?.includeSubCaseComments,
+            subCaseID: request.query?.subCaseId,
+          }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to get all comments in route case id: ${request.params.case_id} include sub case comments: ${request.query?.includeSubCaseComments} sub case id: ${request.query?.subCaseId}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..09805c00cb10a
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/comments/get_comment.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 { schema } from '@kbn/config-schema';
+
+import { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+import { CASE_COMMENT_DETAILS_URL } from '../../../../common/constants';
+
+export function initGetCommentApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: CASE_COMMENT_DETAILS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+          comment_id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+
+        return response.ok({
+          body: await client.attachments.get({
+            attachmentID: request.params.comment_id,
+            caseID: request.params.case_id,
+          }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to get comment in route case id: ${request.params.case_id} comment id: ${request.params.comment_id}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..aecdeb46756c0
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/comments/patch_comment.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { pipe } from 'fp-ts/lib/pipeable';
+import { fold } from 'fp-ts/lib/Either';
+import { identity } from 'fp-ts/lib/function';
+import { schema } from '@kbn/config-schema';
+import Boom from '@hapi/boom';
+
+import { RouteDeps } from '../types';
+import { escapeHatch, wrapError } from '../utils';
+import { CASE_COMMENTS_URL } from '../../../../common/constants';
+import { CommentPatchRequestRt, throwErrors } from '../../../../common/api';
+
+export function initPatchCommentApi({ router, logger }: RouteDeps) {
+  router.patch(
+    {
+      path: CASE_COMMENTS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+        query: schema.maybe(
+          schema.object({
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
+        body: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const query = pipe(
+          CommentPatchRequestRt.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const client = await context.cases.getCasesClient();
+
+        return response.ok({
+          body: await client.attachments.update({
+            caseID: request.params.case_id,
+            subCaseID: request.query?.subCaseId,
+            updateRequest: query,
+          }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to patch comment in route case id: ${request.params.case_id} sub case id: ${request.query?.subCaseId}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..1919aef7b72b4
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/comments/post_comment.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import Boom from '@hapi/boom';
+import { schema } from '@kbn/config-schema';
+import { escapeHatch, wrapError } from '../utils';
+import { RouteDeps } from '../types';
+import { CASE_COMMENTS_URL, ENABLE_CASE_CONNECTOR } from '../../../../common/constants';
+import { CommentRequest } from '../../../../common/api';
+
+export function initPostCommentApi({ router, logger }: RouteDeps) {
+  router.post(
+    {
+      path: CASE_COMMENTS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+        query: schema.maybe(
+          schema.object({
+            subCaseId: schema.maybe(schema.string()),
+          })
+        ),
+        body: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        if (!ENABLE_CASE_CONNECTOR && request.query?.subCaseId !== undefined) {
+          throw Boom.badRequest(
+            'The `subCaseId` is not supported when the case connector feature is disabled'
+          );
+        }
+
+        if (!context.cases) {
+          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
+        }
+
+        const casesClient = await context.cases.getCasesClient();
+        const caseId = request.query?.subCaseId ?? request.params.case_id;
+        const comment = request.body as CommentRequest;
+
+        return response.ok({
+          body: await casesClient.attachments.add({ caseId, comment }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to post comment in route case id: ${request.params.case_id} sub case id: ${request.query?.subCaseId}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..8222ac8fe5690
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/configure/get_configure.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 { RouteDeps } from '../types';
+import { escapeHatch, wrapError } from '../utils';
+import { CASE_CONFIGURE_URL } from '../../../../common/constants';
+import { GetConfigureFindRequest } from '../../../../common/api';
+
+export function initGetCaseConfigure({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: CASE_CONFIGURE_URL,
+      validate: {
+        query: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+        const options = request.query as GetConfigureFindRequest;
+
+        return response.ok({
+          body: await client.configure.get({ ...options }),
+        });
+      } catch (error) {
+        logger.error(`Failed to get case configure in route: ${error}`);
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..46c110bbb8ba5
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/configure/get_connectors.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 { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+
+import { CASE_CONFIGURE_CONNECTORS_URL } from '../../../../common/constants';
+
+/*
+ * Be aware that this api will only return 20 connectors
+ */
+export function initCaseConfigureGetActionConnector({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: `${CASE_CONFIGURE_CONNECTORS_URL}/_find`,
+      validate: false,
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+
+        return response.ok({ body: await client.configure.getConnectors() });
+      } catch (error) {
+        logger.error(`Failed to get connectors in route: ${error}`);
+        return response.customError(wrapError(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
new file mode 100644
index 0000000000000..49288c72eadee
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/configure/patch_configure.ts
@@ -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 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 {
+  CaseConfigureRequestParamsRt,
+  throwErrors,
+  CasesConfigurePatch,
+  excess,
+} from '../../../../common/api';
+import { RouteDeps } from '../types';
+import { wrapError, escapeHatch } from '../utils';
+import { CASE_CONFIGURE_DETAILS_URL } from '../../../../common/constants';
+
+export function initPatchCaseConfigure({ router, logger }: RouteDeps) {
+  router.patch(
+    {
+      path: CASE_CONFIGURE_DETAILS_URL,
+      validate: {
+        params: escapeHatch,
+        body: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const params = pipe(
+          excess(CaseConfigureRequestParamsRt).decode(request.params),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const client = await context.cases.getCasesClient();
+        const configuration = request.body as CasesConfigurePatch;
+
+        return response.ok({
+          body: await client.configure.update(params.configuration_id, configuration),
+        });
+      } catch (error) {
+        logger.error(`Failed to get patch configure in route: ${error}`);
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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
new file mode 100644
index 0000000000000..fe8ffedbc85f6
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/configure/post_configure.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 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 { CasesConfigureRequestRt, throwErrors } from '../../../../common/api';
+import { RouteDeps } from '../types';
+import { wrapError, escapeHatch } from '../utils';
+import { CASE_CONFIGURE_URL } from '../../../../common/constants';
+
+export function initPostCaseConfigure({ router, logger }: RouteDeps) {
+  router.post(
+    {
+      path: CASE_CONFIGURE_URL,
+      validate: {
+        body: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const query = pipe(
+          CasesConfigureRequestRt.decode(request.body),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const client = await context.cases.getCasesClient();
+
+        return response.ok({
+          body: await client.configure.create(query),
+        });
+      } catch (error) {
+        logger.error(`Failed to post case configure in route: ${error}`);
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/cases/server/routes/api/index.ts b/x-pack/plugins/cases/server/routes/api/index.ts
index a1635254dd09b..51652408d583b 100644
--- a/x-pack/plugins/cases/server/routes/api/index.ts
+++ b/x-pack/plugins/cases/server/routes/api/index.ts
@@ -12,31 +12,31 @@ import { initPatchCasesApi } from './cases/patch_cases';
 import { initPostCaseApi } from './cases/post_case';
 import { initPushCaseApi } from './cases/push_case';
 import { initGetReportersApi } from './cases/reporters/get_reporters';
-import { initGetCasesStatusApi } from './cases/status/get_status';
+import { initGetCasesStatusApi } from './stats/get_status';
 import { initGetTagsApi } from './cases/tags/get_tags';
 import {
   initGetAllCaseUserActionsApi,
   initGetAllSubCaseUserActionsApi,
-} from './cases/user_actions/get_all_user_actions';
+} from './user_actions/get_all_user_actions';
 
-import { initDeleteCommentApi } from './cases/comments/delete_comment';
-import { initDeleteAllCommentsApi } from './cases/comments/delete_all_comments';
-import { initFindCaseCommentsApi } from './cases/comments/find_comments';
-import { initGetAllCommentsApi } from './cases/comments/get_all_comment';
-import { initGetCommentApi } from './cases/comments/get_comment';
-import { initPatchCommentApi } from './cases/comments/patch_comment';
-import { initPostCommentApi } from './cases/comments/post_comment';
+import { initDeleteCommentApi } from './comments/delete_comment';
+import { initDeleteAllCommentsApi } from './comments/delete_all_comments';
+import { initFindCaseCommentsApi } from './comments/find_comments';
+import { initGetAllCommentsApi } from './comments/get_all_comment';
+import { initGetCommentApi } from './comments/get_comment';
+import { initPatchCommentApi } from './comments/patch_comment';
+import { initPostCommentApi } from './comments/post_comment';
 
-import { initCaseConfigureGetActionConnector } from './cases/configure/get_connectors';
-import { initGetCaseConfigure } from './cases/configure/get_configure';
-import { initPatchCaseConfigure } from './cases/configure/patch_configure';
-import { initPostCaseConfigure } from './cases/configure/post_configure';
+import { initCaseConfigureGetActionConnector } from './configure/get_connectors';
+import { initGetCaseConfigure } from './configure/get_configure';
+import { initPatchCaseConfigure } from './configure/patch_configure';
+import { initPostCaseConfigure } from './configure/post_configure';
 
 import { RouteDeps } from './types';
-import { initGetSubCaseApi } from './cases/sub_case/get_sub_case';
-import { initPatchSubCasesApi } from './cases/sub_case/patch_sub_cases';
-import { initFindSubCasesApi } from './cases/sub_case/find_sub_cases';
-import { initDeleteSubCasesApi } from './cases/sub_case/delete_sub_cases';
+import { initGetSubCaseApi } from './sub_case/get_sub_case';
+import { initPatchSubCasesApi } from './sub_case/patch_sub_cases';
+import { initFindSubCasesApi } from './sub_case/find_sub_cases';
+import { initDeleteSubCasesApi } from './sub_case/delete_sub_cases';
 import { ENABLE_CASE_CONNECTOR } from '../../../common/constants';
 import { initGetCaseIdsByAlertIdApi } from './cases/alerts/get_cases';
 
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
new file mode 100644
index 0000000000000..7fef5f59e2459
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/stats/get_status.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 { RouteDeps } from '../types';
+import { escapeHatch, wrapError } from '../utils';
+
+import { CASE_STATUS_URL } from '../../../../common/constants';
+import { CasesStatusRequest } from '../../../../common';
+
+export function initGetCasesStatusApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: CASE_STATUS_URL,
+      validate: { query: escapeHatch },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+        return response.ok({
+          body: await client.stats.getStatusTotalsByType(request.query as CasesStatusRequest),
+        });
+      } catch (error) {
+        logger.error(`Failed to get status stats in route: ${error}`);
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/cases/server/routes/api/sub_case/delete_sub_cases.ts b/x-pack/plugins/cases/server/routes/api/sub_case/delete_sub_cases.ts
new file mode 100644
index 0000000000000..11b68b70390fe
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/sub_case/delete_sub_cases.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 { schema } from '@kbn/config-schema';
+import { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+import { SUB_CASES_PATCH_DEL_URL } from '../../../../common/constants';
+
+export function initDeleteSubCasesApi({ router, logger }: RouteDeps) {
+  router.delete(
+    {
+      path: SUB_CASES_PATCH_DEL_URL,
+      validate: {
+        query: schema.object({
+          ids: schema.arrayOf(schema.string()),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+        await client.subCases.delete(request.query.ids);
+
+        return response.noContent();
+      } catch (error) {
+        logger.error(
+          `Failed to delete sub cases in route ids: ${JSON.stringify(request.query.ids)}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/cases/server/routes/api/sub_case/find_sub_cases.ts b/x-pack/plugins/cases/server/routes/api/sub_case/find_sub_cases.ts
new file mode 100644
index 0000000000000..e062f2238439e
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/sub_case/find_sub_cases.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 { schema } from '@kbn/config-schema';
+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 { SubCasesFindRequestRt, throwErrors } from '../../../../common/api';
+import { RouteDeps } from '../types';
+import { escapeHatch, wrapError } from '../utils';
+import { SUB_CASES_URL } from '../../../../common/constants';
+
+export function initFindSubCasesApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: `${SUB_CASES_URL}/_find`,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+        query: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const queryParams = pipe(
+          SubCasesFindRequestRt.decode(request.query),
+          fold(throwErrors(Boom.badRequest), identity)
+        );
+
+        const client = await context.cases.getCasesClient();
+        return response.ok({
+          body: await client.subCases.find({
+            caseID: request.params.case_id,
+            queryParams,
+          }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to find sub cases in route case id: ${request.params.case_id}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/cases/server/routes/api/sub_case/get_sub_case.ts b/x-pack/plugins/cases/server/routes/api/sub_case/get_sub_case.ts
new file mode 100644
index 0000000000000..db3e29f5ed96e
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/sub_case/get_sub_case.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 { schema } from '@kbn/config-schema';
+
+import { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+import { SUB_CASE_DETAILS_URL } from '../../../../common/constants';
+
+export function initGetSubCaseApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: SUB_CASE_DETAILS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+          sub_case_id: schema.string(),
+        }),
+        query: schema.object({
+          includeComments: schema.boolean({ defaultValue: true }),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const client = await context.cases.getCasesClient();
+
+        return response.ok({
+          body: await client.subCases.get({
+            id: request.params.sub_case_id,
+            includeComments: request.query.includeComments,
+          }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to get sub case in route case id: ${request.params.case_id} sub case id: ${request.params.sub_case_id} include comments: ${request.query?.includeComments}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/cases/server/routes/api/sub_case/patch_sub_cases.ts b/x-pack/plugins/cases/server/routes/api/sub_case/patch_sub_cases.ts
new file mode 100644
index 0000000000000..1fb260453d188
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/sub_case/patch_sub_cases.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 { SubCasesPatchRequest } from '../../../../common/api';
+import { SUB_CASES_PATCH_DEL_URL } from '../../../../common/constants';
+import { RouteDeps } from '../types';
+import { escapeHatch, wrapError } from '../utils';
+
+export function initPatchSubCasesApi({ router, logger }: RouteDeps) {
+  router.patch(
+    {
+      path: SUB_CASES_PATCH_DEL_URL,
+      validate: {
+        body: escapeHatch,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const casesClient = await context.cases.getCasesClient();
+        const subCases = request.body as SubCasesPatchRequest;
+        return response.ok({
+          body: await casesClient.subCases.update(subCases),
+        });
+      } catch (error) {
+        logger.error(`Failed to patch sub cases in route: ${error}`);
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/cases/server/routes/api/types.ts b/x-pack/plugins/cases/server/routes/api/types.ts
index 6ce40e01c7752..9211aee5606a6 100644
--- a/x-pack/plugins/cases/server/routes/api/types.ts
+++ b/x-pack/plugins/cases/server/routes/api/types.ts
@@ -7,30 +7,13 @@
 
 import type { Logger } from 'kibana/server';
 
-import type {
-  CaseConfigureServiceSetup,
-  CaseServiceSetup,
-  CaseUserActionServiceSetup,
-  ConnectorMappingsServiceSetup,
-} from '../../services';
-
 import type { CasesRouter } from '../../types';
 
 export interface RouteDeps {
-  caseConfigureService: CaseConfigureServiceSetup;
-  caseService: CaseServiceSetup;
-  connectorMappingsService: ConnectorMappingsServiceSetup;
   router: CasesRouter;
-  userActionService: CaseUserActionServiceSetup;
   logger: Logger;
 }
 
-export enum SortFieldCase {
-  closedAt = 'closed_at',
-  createdAt = 'created_at',
-  status = 'status',
-}
-
 export interface TotalCommentByCase {
   caseId: string;
   totalComments: number;
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
new file mode 100644
index 0000000000000..5944ff6176d78
--- /dev/null
+++ b/x-pack/plugins/cases/server/routes/api/user_actions/get_all_user_actions.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 { schema } from '@kbn/config-schema';
+
+import { RouteDeps } from '../types';
+import { wrapError } from '../utils';
+import { CASE_USER_ACTIONS_URL, SUB_CASE_USER_ACTIONS_URL } from '../../../../common/constants';
+
+export function initGetAllCaseUserActionsApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: CASE_USER_ACTIONS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        if (!context.cases) {
+          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
+        }
+
+        const casesClient = await context.cases.getCasesClient();
+        const caseId = request.params.case_id;
+
+        return response.ok({
+          body: await casesClient.userActions.getAll({ caseId }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to retrieve case user actions in route case id: ${request.params.case_id}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
+
+export function initGetAllSubCaseUserActionsApi({ router, logger }: RouteDeps) {
+  router.get(
+    {
+      path: SUB_CASE_USER_ACTIONS_URL,
+      validate: {
+        params: schema.object({
+          case_id: schema.string(),
+          sub_case_id: schema.string(),
+        }),
+      },
+    },
+    async (context, request, response) => {
+      try {
+        if (!context.cases) {
+          return response.badRequest({ body: 'RouteHandlerContext is not registered for cases' });
+        }
+
+        const casesClient = await context.cases.getCasesClient();
+        const caseId = request.params.case_id;
+        const subCaseId = request.params.sub_case_id;
+
+        return response.ok({
+          body: await casesClient.userActions.getAll({ caseId, subCaseId }),
+        });
+      } catch (error) {
+        logger.error(
+          `Failed to retrieve sub case user actions in route case id: ${request.params.case_id} sub case id: ${request.params.sub_case_id}: ${error}`
+        );
+        return response.customError(wrapError(error));
+      }
+    }
+  );
+}
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 2df17e3abacfa..3fce38b27446e 100644
--- a/x-pack/plugins/cases/server/routes/api/utils.test.ts
+++ b/x-pack/plugins/cases/server/routes/api/utils.test.ts
@@ -5,314 +5,10 @@
  * 2.0.
  */
 
-import {
-  transformNewCase,
-  transformNewComment,
-  wrapError,
-  transformCases,
-  flattenCaseSavedObject,
-  flattenCommentSavedObjects,
-  transformComments,
-  flattenCommentSavedObject,
-  sortToSnake,
-} from './utils';
-import { newCase } from './__mocks__/request_responses';
+import { wrapError } from './utils';
 import { isBoom, boomify } from '@hapi/boom';
-import {
-  mockCases,
-  mockCaseComments,
-  mockCaseNoConnectorId,
-} from './__fixtures__/mock_saved_objects';
-import {
-  ConnectorTypes,
-  ESCaseConnector,
-  CommentType,
-  AssociationType,
-  CaseType,
-  CaseResponse,
-} from '../../../common';
 
 describe('Utils', () => {
-  describe('transformNewCase', () => {
-    const connector: ESCaseConnector = {
-      id: '123',
-      name: 'My connector',
-      type: ConnectorTypes.jira,
-      fields: [
-        { key: 'issueType', value: 'Task' },
-        { key: 'priority', value: 'High' },
-        { key: 'parent', value: null },
-      ],
-    };
-    it('transform correctly', () => {
-      const myCase = {
-        newCase: { ...newCase, type: CaseType.individual },
-        connector,
-        createdDate: '2020-04-09T09:43:51.778Z',
-        email: 'elastic@elastic.co',
-        full_name: 'Elastic',
-        username: 'elastic',
-      };
-
-      const res = transformNewCase(myCase);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "connector": Object {
-            "fields": Array [
-              Object {
-                "key": "issueType",
-                "value": "Task",
-              },
-              Object {
-                "key": "priority",
-                "value": "High",
-              },
-              Object {
-                "key": "parent",
-                "value": null,
-              },
-            ],
-            "id": "123",
-            "name": "My connector",
-            "type": ".jira",
-          },
-          "created_at": "2020-04-09T09:43:51.778Z",
-          "created_by": Object {
-            "email": "elastic@elastic.co",
-            "full_name": "Elastic",
-            "username": "elastic",
-          },
-          "description": "A description",
-          "external_service": null,
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "tags": Array [
-            "new",
-            "case",
-          ],
-          "title": "My new case",
-          "type": "individual",
-          "updated_at": null,
-          "updated_by": null,
-        }
-      `);
-    });
-
-    it('transform correctly without optional fields', () => {
-      const myCase = {
-        newCase: { ...newCase, type: CaseType.individual },
-        connector,
-        createdDate: '2020-04-09T09:43:51.778Z',
-      };
-
-      const res = transformNewCase(myCase);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "connector": Object {
-            "fields": Array [
-              Object {
-                "key": "issueType",
-                "value": "Task",
-              },
-              Object {
-                "key": "priority",
-                "value": "High",
-              },
-              Object {
-                "key": "parent",
-                "value": null,
-              },
-            ],
-            "id": "123",
-            "name": "My connector",
-            "type": ".jira",
-          },
-          "created_at": "2020-04-09T09:43:51.778Z",
-          "created_by": Object {
-            "email": undefined,
-            "full_name": undefined,
-            "username": undefined,
-          },
-          "description": "A description",
-          "external_service": null,
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "tags": Array [
-            "new",
-            "case",
-          ],
-          "title": "My new case",
-          "type": "individual",
-          "updated_at": null,
-          "updated_by": null,
-        }
-      `);
-    });
-
-    it('transform correctly with optional fields as null', () => {
-      const myCase = {
-        newCase: { ...newCase, type: CaseType.individual },
-        connector,
-        createdDate: '2020-04-09T09:43:51.778Z',
-        email: null,
-        full_name: null,
-        username: null,
-      };
-
-      const res = transformNewCase(myCase);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "connector": Object {
-            "fields": Array [
-              Object {
-                "key": "issueType",
-                "value": "Task",
-              },
-              Object {
-                "key": "priority",
-                "value": "High",
-              },
-              Object {
-                "key": "parent",
-                "value": null,
-              },
-            ],
-            "id": "123",
-            "name": "My connector",
-            "type": ".jira",
-          },
-          "created_at": "2020-04-09T09:43:51.778Z",
-          "created_by": Object {
-            "email": null,
-            "full_name": null,
-            "username": null,
-          },
-          "description": "A description",
-          "external_service": null,
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "tags": Array [
-            "new",
-            "case",
-          ],
-          "title": "My new case",
-          "type": "individual",
-          "updated_at": null,
-          "updated_by": null,
-        }
-      `);
-    });
-  });
-
-  describe('transformNewComment', () => {
-    it('transforms correctly', () => {
-      const comment = {
-        comment: 'A comment',
-        type: CommentType.user as const,
-        createdDate: '2020-04-09T09:43:51.778Z',
-        email: 'elastic@elastic.co',
-        full_name: 'Elastic',
-        username: 'elastic',
-        associationType: AssociationType.case,
-      };
-
-      const res = transformNewComment(comment);
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "associationType": "case",
-          "comment": "A comment",
-          "created_at": "2020-04-09T09:43:51.778Z",
-          "created_by": Object {
-            "email": "elastic@elastic.co",
-            "full_name": "Elastic",
-            "username": "elastic",
-          },
-          "pushed_at": null,
-          "pushed_by": null,
-          "type": "user",
-          "updated_at": null,
-          "updated_by": null,
-        }
-      `);
-    });
-
-    it('transform correctly without optional fields', () => {
-      const comment = {
-        comment: 'A comment',
-        type: CommentType.user as const,
-        createdDate: '2020-04-09T09:43:51.778Z',
-        associationType: AssociationType.case,
-      };
-
-      const res = transformNewComment(comment);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "associationType": "case",
-          "comment": "A comment",
-          "created_at": "2020-04-09T09:43:51.778Z",
-          "created_by": Object {
-            "email": undefined,
-            "full_name": undefined,
-            "username": undefined,
-          },
-          "pushed_at": null,
-          "pushed_by": null,
-          "type": "user",
-          "updated_at": null,
-          "updated_by": null,
-        }
-      `);
-    });
-
-    it('transform correctly with optional fields as null', () => {
-      const comment = {
-        comment: 'A comment',
-        type: CommentType.user as const,
-        createdDate: '2020-04-09T09:43:51.778Z',
-        email: null,
-        full_name: null,
-        username: null,
-        associationType: AssociationType.case,
-      };
-
-      const res = transformNewComment(comment);
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "associationType": "case",
-          "comment": "A comment",
-          "created_at": "2020-04-09T09:43:51.778Z",
-          "created_by": Object {
-            "email": null,
-            "full_name": null,
-            "username": null,
-          },
-          "pushed_at": null,
-          "pushed_by": null,
-          "type": "user",
-          "updated_at": null,
-          "updated_by": null,
-        }
-      `);
-    });
-  });
-
   describe('wrapError', () => {
     it('wraps an error', () => {
       const error = new Error('Something happened');
@@ -358,532 +54,4 @@ describe('Utils', () => {
       expect(res.headers).toEqual({});
     });
   });
-
-  describe('transformCases', () => {
-    it('transforms correctly', () => {
-      const casesMap = new Map<string, CaseResponse>(
-        mockCases.map((obj) => {
-          return [obj.id, flattenCaseSavedObject({ savedObject: obj, totalComment: 2 })];
-        })
-      );
-      const res = transformCases({
-        casesMap,
-        countOpenCases: 2,
-        countInProgressCases: 2,
-        countClosedCases: 2,
-        page: 1,
-        perPage: 10,
-        total: casesMap.size,
-      });
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "cases": Array [
-            Object {
-              "closed_at": null,
-              "closed_by": null,
-              "comments": Array [],
-              "connector": Object {
-                "fields": null,
-                "id": "none",
-                "name": "none",
-                "type": ".none",
-              },
-              "created_at": "2019-11-25T21:54:48.952Z",
-              "created_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "description": "This is a brand new case of a bad meanie defacing data",
-              "external_service": null,
-              "id": "mock-id-1",
-              "settings": Object {
-                "syncAlerts": true,
-              },
-              "status": "open",
-              "subCaseIds": undefined,
-              "subCases": undefined,
-              "tags": Array [
-                "defacement",
-              ],
-              "title": "Super Bad Security Issue",
-              "totalAlerts": 0,
-              "totalComment": 2,
-              "type": "individual",
-              "updated_at": "2019-11-25T21:54:48.952Z",
-              "updated_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "version": "WzAsMV0=",
-            },
-            Object {
-              "closed_at": null,
-              "closed_by": null,
-              "comments": Array [],
-              "connector": Object {
-                "fields": null,
-                "id": "none",
-                "name": "none",
-                "type": ".none",
-              },
-              "created_at": "2019-11-25T22:32:00.900Z",
-              "created_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "description": "Oh no, a bad meanie destroying data!",
-              "external_service": null,
-              "id": "mock-id-2",
-              "settings": Object {
-                "syncAlerts": true,
-              },
-              "status": "open",
-              "subCaseIds": undefined,
-              "subCases": undefined,
-              "tags": Array [
-                "Data Destruction",
-              ],
-              "title": "Damaging Data Destruction Detected",
-              "totalAlerts": 0,
-              "totalComment": 2,
-              "type": "individual",
-              "updated_at": "2019-11-25T22:32:00.900Z",
-              "updated_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "version": "WzQsMV0=",
-            },
-            Object {
-              "closed_at": null,
-              "closed_by": null,
-              "comments": Array [],
-              "connector": Object {
-                "fields": Object {
-                  "issueType": "Task",
-                  "parent": null,
-                  "priority": "High",
-                },
-                "id": "123",
-                "name": "My connector",
-                "type": ".jira",
-              },
-              "created_at": "2019-11-25T22:32:17.947Z",
-              "created_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "description": "Oh no, a bad meanie going LOLBins all over the place!",
-              "external_service": null,
-              "id": "mock-id-3",
-              "settings": Object {
-                "syncAlerts": true,
-              },
-              "status": "open",
-              "subCaseIds": undefined,
-              "subCases": undefined,
-              "tags": Array [
-                "LOLBins",
-              ],
-              "title": "Another bad one",
-              "totalAlerts": 0,
-              "totalComment": 2,
-              "type": "individual",
-              "updated_at": "2019-11-25T22:32:17.947Z",
-              "updated_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "version": "WzUsMV0=",
-            },
-            Object {
-              "closed_at": "2019-11-25T22:32:17.947Z",
-              "closed_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "comments": Array [],
-              "connector": Object {
-                "fields": Object {
-                  "issueType": "Task",
-                  "parent": null,
-                  "priority": "High",
-                },
-                "id": "123",
-                "name": "My connector",
-                "type": ".jira",
-              },
-              "created_at": "2019-11-25T22:32:17.947Z",
-              "created_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "description": "Oh no, a bad meanie going LOLBins all over the place!",
-              "external_service": null,
-              "id": "mock-id-4",
-              "settings": Object {
-                "syncAlerts": true,
-              },
-              "status": "closed",
-              "subCaseIds": undefined,
-              "subCases": undefined,
-              "tags": Array [
-                "LOLBins",
-              ],
-              "title": "Another bad one",
-              "totalAlerts": 0,
-              "totalComment": 2,
-              "type": "individual",
-              "updated_at": "2019-11-25T22:32:17.947Z",
-              "updated_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "version": "WzUsMV0=",
-            },
-          ],
-          "count_closed_cases": 2,
-          "count_in_progress_cases": 2,
-          "count_open_cases": 2,
-          "page": 1,
-          "per_page": 10,
-          "total": 4,
-        }
-      `);
-    });
-  });
-
-  describe('flattenCaseSavedObject', () => {
-    it('flattens correctly', () => {
-      const myCase = { ...mockCases[2] };
-      const res = flattenCaseSavedObject({
-        savedObject: myCase,
-        totalComment: 2,
-      });
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": Object {
-              "issueType": "Task",
-              "parent": null,
-              "priority": "High",
-            },
-            "id": "123",
-            "name": "My connector",
-            "type": ".jira",
-          },
-          "created_at": "2019-11-25T22:32:17.947Z",
-          "created_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "description": "Oh no, a bad meanie going LOLBins all over the place!",
-          "external_service": null,
-          "id": "mock-id-3",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "LOLBins",
-          ],
-          "title": "Another bad one",
-          "totalAlerts": 0,
-          "totalComment": 2,
-          "type": "individual",
-          "updated_at": "2019-11-25T22:32:17.947Z",
-          "updated_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "version": "WzUsMV0=",
-        }
-      `);
-    });
-
-    it('flattens correctly without version', () => {
-      const myCase = { ...mockCases[2] };
-      myCase.version = undefined;
-      const res = flattenCaseSavedObject({
-        savedObject: myCase,
-        totalComment: 2,
-      });
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": Object {
-              "issueType": "Task",
-              "parent": null,
-              "priority": "High",
-            },
-            "id": "123",
-            "name": "My connector",
-            "type": ".jira",
-          },
-          "created_at": "2019-11-25T22:32:17.947Z",
-          "created_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "description": "Oh no, a bad meanie going LOLBins all over the place!",
-          "external_service": null,
-          "id": "mock-id-3",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "LOLBins",
-          ],
-          "title": "Another bad one",
-          "totalAlerts": 0,
-          "totalComment": 2,
-          "type": "individual",
-          "updated_at": "2019-11-25T22:32:17.947Z",
-          "updated_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "version": "0",
-        }
-      `);
-    });
-
-    it('flattens correctly with comments', () => {
-      const myCase = { ...mockCases[2] };
-      const comments = [{ ...mockCaseComments[0] }];
-      const res = flattenCaseSavedObject({
-        savedObject: myCase,
-        comments,
-        totalComment: 2,
-      });
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [
-            Object {
-              "associationType": "case",
-              "comment": "Wow, good luck catching that bad meanie!",
-              "created_at": "2019-11-25T21:55:00.177Z",
-              "created_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "id": "mock-comment-1",
-              "pushed_at": null,
-              "pushed_by": null,
-              "type": "user",
-              "updated_at": "2019-11-25T21:55:00.177Z",
-              "updated_by": Object {
-                "email": "testemail@elastic.co",
-                "full_name": "elastic",
-                "username": "elastic",
-              },
-              "version": "WzEsMV0=",
-            },
-          ],
-          "connector": Object {
-            "fields": Object {
-              "issueType": "Task",
-              "parent": null,
-              "priority": "High",
-            },
-            "id": "123",
-            "name": "My connector",
-            "type": ".jira",
-          },
-          "created_at": "2019-11-25T22:32:17.947Z",
-          "created_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "description": "Oh no, a bad meanie going LOLBins all over the place!",
-          "external_service": null,
-          "id": "mock-id-3",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "LOLBins",
-          ],
-          "title": "Another bad one",
-          "totalAlerts": 0,
-          "totalComment": 2,
-          "type": "individual",
-          "updated_at": "2019-11-25T22:32:17.947Z",
-          "updated_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "version": "WzUsMV0=",
-        }
-      `);
-    });
-
-    it('inserts missing connector', () => {
-      const extraCaseData = {
-        totalComment: 2,
-      };
-
-      const res = flattenCaseSavedObject({
-        // @ts-ignore this is to update old case saved objects to include connector
-        savedObject: mockCaseNoConnectorId,
-        ...extraCaseData,
-      });
-
-      expect(res).toMatchInlineSnapshot(`
-        Object {
-          "closed_at": null,
-          "closed_by": null,
-          "comments": Array [],
-          "connector": Object {
-            "fields": null,
-            "id": "none",
-            "name": "none",
-            "type": ".none",
-          },
-          "created_at": "2019-11-25T21:54:48.952Z",
-          "created_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "description": "This is a brand new case of a bad meanie defacing data",
-          "external_service": null,
-          "id": "mock-no-connector_id",
-          "settings": Object {
-            "syncAlerts": true,
-          },
-          "status": "open",
-          "subCaseIds": undefined,
-          "subCases": undefined,
-          "tags": Array [
-            "defacement",
-          ],
-          "title": "Super Bad Security Issue",
-          "totalAlerts": 0,
-          "totalComment": 2,
-          "updated_at": "2019-11-25T21:54:48.952Z",
-          "updated_by": Object {
-            "email": "testemail@elastic.co",
-            "full_name": "elastic",
-            "username": "elastic",
-          },
-          "version": "WzAsMV0=",
-        }
-      `);
-    });
-  });
-
-  describe('transformComments', () => {
-    it('transforms correctly', () => {
-      const comments = {
-        saved_objects: mockCaseComments.map((obj) => ({ ...obj, score: 1 })),
-        total: mockCaseComments.length,
-        per_page: 10,
-        page: 1,
-      };
-
-      const res = transformComments(comments);
-      expect(res).toEqual({
-        page: 1,
-        per_page: 10,
-        total: mockCaseComments.length,
-        comments: flattenCommentSavedObjects(comments.saved_objects),
-      });
-    });
-  });
-
-  describe('flattenCommentSavedObjects', () => {
-    it('flattens correctly', () => {
-      const comments = [{ ...mockCaseComments[0] }, { ...mockCaseComments[1] }];
-      const res = flattenCommentSavedObjects(comments);
-      expect(res).toEqual([
-        flattenCommentSavedObject(comments[0]),
-        flattenCommentSavedObject(comments[1]),
-      ]);
-    });
-  });
-
-  describe('flattenCommentSavedObject', () => {
-    it('flattens correctly', () => {
-      const comment = { ...mockCaseComments[0] };
-      const res = flattenCommentSavedObject(comment);
-      expect(res).toEqual({
-        id: comment.id,
-        version: comment.version,
-        ...comment.attributes,
-      });
-    });
-
-    it('flattens correctly without version', () => {
-      const comment = { ...mockCaseComments[0] };
-      comment.version = undefined;
-      const res = flattenCommentSavedObject(comment);
-      expect(res).toEqual({
-        id: comment.id,
-        version: '0',
-        ...comment.attributes,
-      });
-    });
-  });
-
-  describe('sortToSnake', () => {
-    it('it transforms status correctly', () => {
-      expect(sortToSnake('status')).toBe('status');
-    });
-
-    it('it transforms createdAt correctly', () => {
-      expect(sortToSnake('createdAt')).toBe('created_at');
-    });
-
-    it('it transforms created_at correctly', () => {
-      expect(sortToSnake('created_at')).toBe('created_at');
-    });
-
-    it('it transforms closedAt correctly', () => {
-      expect(sortToSnake('closedAt')).toBe('closed_at');
-    });
-
-    it('it transforms closed_at correctly', () => {
-      expect(sortToSnake('closed_at')).toBe('closed_at');
-    });
-
-    it('it transforms default correctly', () => {
-      expect(sortToSnake('not-exist')).toBe('created_at');
-    });
-  });
 });
diff --git a/x-pack/plugins/cases/server/routes/api/utils.ts b/x-pack/plugins/cases/server/routes/api/utils.ts
index 9234472c13f5d..f7a77a5dbf391 100644
--- a/x-pack/plugins/cases/server/routes/api/utils.ts
+++ b/x-pack/plugins/cases/server/routes/api/utils.ts
@@ -5,180 +5,12 @@
  * 2.0.
  */
 
-import { isEmpty } from 'lodash';
-import { badRequest, Boom, boomify, isBoom } from '@hapi/boom';
-import { fold } from 'fp-ts/lib/Either';
-import { identity } from 'fp-ts/lib/function';
-import { pipe } from 'fp-ts/lib/pipeable';
-import { schema } from '@kbn/config-schema';
-import {
-  CustomHttpResponseOptions,
-  ResponseError,
-  SavedObject,
-  SavedObjectsFindResponse,
-} from 'kibana/server';
-
-import {
-  CaseResponse,
-  CasesFindResponse,
-  CommentResponse,
-  CommentsResponse,
-  CommentAttributes,
-  ESCaseConnector,
-  ESCaseAttributes,
-  CommentRequest,
-  ContextTypeUserRt,
-  CommentRequestUserType,
-  CommentRequestAlertType,
-  CommentType,
-  excess,
-  throwErrors,
-  CaseStatuses,
-  CasesClientPostRequest,
-  AssociationType,
-  SubCaseAttributes,
-  SubCaseResponse,
-  SubCasesFindResponse,
-  User,
-  AlertCommentRequestRt,
-} from '../../../common';
-import { transformESConnectorToCaseConnector } from './cases/helpers';
+import { Boom, boomify, isBoom } from '@hapi/boom';
 
-import { SortFieldCase } from './types';
-import { AlertInfo } from '../../common';
+import { schema } from '@kbn/config-schema';
+import { CustomHttpResponseOptions, ResponseError } from 'kibana/server';
 import { isCaseError } from '../../common/error';
 
-export const transformNewSubCase = ({
-  createdAt,
-  createdBy,
-}: {
-  createdAt: string;
-  createdBy: User;
-}): SubCaseAttributes => {
-  return {
-    closed_at: null,
-    closed_by: null,
-    created_at: createdAt,
-    created_by: createdBy,
-    status: CaseStatuses.open,
-    updated_at: null,
-    updated_by: null,
-  };
-};
-
-export const transformNewCase = ({
-  connector,
-  createdDate,
-  email,
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  full_name,
-  newCase,
-  username,
-}: {
-  connector: ESCaseConnector;
-  createdDate: string;
-  email?: string | null;
-  full_name?: string | null;
-  newCase: CasesClientPostRequest;
-  username?: string | null;
-}): ESCaseAttributes => ({
-  ...newCase,
-  closed_at: null,
-  closed_by: null,
-  connector,
-  created_at: createdDate,
-  created_by: { email, full_name, username },
-  external_service: null,
-  status: CaseStatuses.open,
-  updated_at: null,
-  updated_by: null,
-});
-
-type NewCommentArgs = CommentRequest & {
-  associationType: AssociationType;
-  createdDate: string;
-  email?: string | null;
-  full_name?: string | null;
-  username?: string | null;
-};
-
-/**
- * Return the alert IDs from the comment if it is an alert style comment. Otherwise return an empty array.
- */
-export const getAlertIds = (comment: CommentRequest): string[] => {
-  if (isCommentRequestTypeAlertOrGenAlert(comment)) {
-    return Array.isArray(comment.alertId) ? comment.alertId : [comment.alertId];
-  }
-  return [];
-};
-
-const getIDsAndIndicesAsArrays = (
-  comment: CommentRequestAlertType
-): { ids: string[]; indices: string[] } => {
-  return {
-    ids: Array.isArray(comment.alertId) ? comment.alertId : [comment.alertId],
-    indices: Array.isArray(comment.index) ? comment.index : [comment.index],
-  };
-};
-
-/**
- * This functions extracts the ids and indices from an alert comment. It enforces that the alertId and index are either
- * both strings or string arrays that are the same length. If they are arrays they represent a 1-to-1 mapping of
- * id existing in an index at each position in the array. This is not ideal. Ideally an alert comment request would
- * accept an array of objects like this: Array<{id: string; index: string; ruleName: string ruleID: string}> instead.
- *
- * To reformat the alert comment request requires a migration and a breaking API change.
- */
-const getAndValidateAlertInfoFromComment = (comment: CommentRequest): AlertInfo[] => {
-  if (!isCommentRequestTypeAlertOrGenAlert(comment)) {
-    return [];
-  }
-
-  const { ids, indices } = getIDsAndIndicesAsArrays(comment);
-
-  if (ids.length !== indices.length) {
-    return [];
-  }
-
-  return ids.map((id, index) => ({ id, index: indices[index] }));
-};
-
-/**
- * Builds an AlertInfo object accumulating the alert IDs and indices for the passed in alerts.
- */
-export const getAlertInfoFromComments = (comments: CommentRequest[] | undefined): AlertInfo[] => {
-  if (comments === undefined) {
-    return [];
-  }
-
-  return comments.reduce((acc: AlertInfo[], comment) => {
-    const alertInfo = getAndValidateAlertInfoFromComment(comment);
-    acc.push(...alertInfo);
-    return acc;
-  }, []);
-};
-
-export const transformNewComment = ({
-  associationType,
-  createdDate,
-  email,
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  full_name,
-  username,
-  ...comment
-}: NewCommentArgs): CommentAttributes => {
-  return {
-    associationType,
-    ...comment,
-    created_at: createdDate,
-    created_by: { email, full_name, username },
-    pushed_at: null,
-    pushed_by: null,
-    updated_at: null,
-    updated_by: null,
-  };
-};
-
 /**
  * Transforms an error into the correct format for a kibana response.
  */
@@ -199,222 +31,4 @@ export function wrapError(error: any): CustomHttpResponseOptions<ResponseError>
   };
 }
 
-export const transformCases = ({
-  casesMap,
-  countOpenCases,
-  countInProgressCases,
-  countClosedCases,
-  page,
-  perPage,
-  total,
-}: {
-  casesMap: Map<string, CaseResponse>;
-  countOpenCases: number;
-  countInProgressCases: number;
-  countClosedCases: number;
-  page: number;
-  perPage: number;
-  total: number;
-}): CasesFindResponse => ({
-  page,
-  per_page: perPage,
-  total,
-  cases: Array.from(casesMap.values()),
-  count_open_cases: countOpenCases,
-  count_in_progress_cases: countInProgressCases,
-  count_closed_cases: countClosedCases,
-});
-
-export const transformSubCases = ({
-  subCasesMap,
-  open,
-  inProgress,
-  closed,
-  page,
-  perPage,
-  total,
-}: {
-  subCasesMap: Map<string, SubCaseResponse[]>;
-  open: number;
-  inProgress: number;
-  closed: number;
-  page: number;
-  perPage: number;
-  total: number;
-}): SubCasesFindResponse => ({
-  page,
-  per_page: perPage,
-  total,
-  // Squish all the entries in the map together as one array
-  subCases: Array.from(subCasesMap.values()).flat(),
-  count_open_cases: open,
-  count_in_progress_cases: inProgress,
-  count_closed_cases: closed,
-});
-
-export const flattenCaseSavedObject = ({
-  savedObject,
-  comments = [],
-  totalComment = comments.length,
-  totalAlerts = 0,
-  subCases,
-  subCaseIds,
-}: {
-  savedObject: SavedObject<ESCaseAttributes>;
-  comments?: Array<SavedObject<CommentAttributes>>;
-  totalComment?: number;
-  totalAlerts?: number;
-  subCases?: SubCaseResponse[];
-  subCaseIds?: string[];
-}): CaseResponse => ({
-  id: savedObject.id,
-  version: savedObject.version ?? '0',
-  comments: flattenCommentSavedObjects(comments),
-  totalComment,
-  totalAlerts,
-  ...savedObject.attributes,
-  connector: transformESConnectorToCaseConnector(savedObject.attributes.connector),
-  subCases,
-  subCaseIds: !isEmpty(subCaseIds) ? subCaseIds : undefined,
-});
-
-export const flattenSubCaseSavedObject = ({
-  savedObject,
-  comments = [],
-  totalComment = comments.length,
-  totalAlerts = 0,
-}: {
-  savedObject: SavedObject<SubCaseAttributes>;
-  comments?: Array<SavedObject<CommentAttributes>>;
-  totalComment?: number;
-  totalAlerts?: number;
-}): SubCaseResponse => ({
-  id: savedObject.id,
-  version: savedObject.version ?? '0',
-  comments: flattenCommentSavedObjects(comments),
-  totalComment,
-  totalAlerts,
-  ...savedObject.attributes,
-});
-
-export const transformComments = (
-  comments: SavedObjectsFindResponse<CommentAttributes>
-): CommentsResponse => ({
-  page: comments.page,
-  per_page: comments.per_page,
-  total: comments.total,
-  comments: flattenCommentSavedObjects(comments.saved_objects),
-});
-
-export const flattenCommentSavedObjects = (
-  savedObjects: Array<SavedObject<CommentAttributes>>
-): CommentResponse[] =>
-  savedObjects.reduce((acc: CommentResponse[], savedObject: SavedObject<CommentAttributes>) => {
-    return [...acc, flattenCommentSavedObject(savedObject)];
-  }, []);
-
-export const flattenCommentSavedObject = (
-  savedObject: SavedObject<CommentAttributes>
-): CommentResponse => ({
-  id: savedObject.id,
-  version: savedObject.version ?? '0',
-  ...savedObject.attributes,
-});
-
-export const sortToSnake = (sortField: string | undefined): SortFieldCase => {
-  switch (sortField) {
-    case 'status':
-      return SortFieldCase.status;
-    case 'createdAt':
-    case 'created_at':
-      return SortFieldCase.createdAt;
-    case 'closedAt':
-    case 'closed_at':
-      return SortFieldCase.closedAt;
-    default:
-      return SortFieldCase.createdAt;
-  }
-};
-
 export const escapeHatch = schema.object({}, { unknowns: 'allow' });
-
-/**
- * A type narrowing function for user comments. Exporting so integration tests can use it.
- */
-export const isCommentRequestTypeUser = (
-  context: CommentRequest
-): context is CommentRequestUserType => {
-  return context.type === CommentType.user;
-};
-
-/**
- * A type narrowing function for alert comments. Exporting so integration tests can use it.
- */
-export const isCommentRequestTypeAlertOrGenAlert = (
-  context: CommentRequest
-): context is CommentRequestAlertType => {
-  return context.type === CommentType.alert || context.type === CommentType.generatedAlert;
-};
-
-/**
- * This is used to test if the posted comment is an generated alert. A generated alert will have one or many alerts.
- * An alert is essentially an object with a _id field. This differs from a regular attached alert because the _id is
- * passed directly in the request, it won't be in an object. Internally case will strip off the outer object and store
- * both a generated and user attached alert in the same structure but this function is useful to determine which
- * structure the new alert in the request has.
- */
-export const isCommentRequestTypeGenAlert = (
-  context: CommentRequest
-): context is CommentRequestAlertType => {
-  return context.type === CommentType.generatedAlert;
-};
-
-export const decodeCommentRequest = (comment: CommentRequest) => {
-  if (isCommentRequestTypeUser(comment)) {
-    pipe(excess(ContextTypeUserRt).decode(comment), fold(throwErrors(badRequest), identity));
-  } else if (isCommentRequestTypeAlertOrGenAlert(comment)) {
-    pipe(excess(AlertCommentRequestRt).decode(comment), fold(throwErrors(badRequest), identity));
-    const { ids, indices } = getIDsAndIndicesAsArrays(comment);
-
-    /**
-     * The alertId and index field must either be both of type string or they must both be string[] and be the same length.
-     * Having a one-to-one relationship between the id and index of an alert avoids accidentally updating or
-     * retrieving the wrong alert. Elasticsearch only guarantees that the _id (the field we use for alertId) to be
-     * unique within a single index. So if we attempt to update or get a specific alert across multiple indices we could
-     * update or receive the wrong one.
-     *
-     * Consider the situation where we have a alert1 with _id = '100' in index 'my-index-awesome' and also in index
-     *  'my-index-hi'.
-     * If we attempt to update the status of alert1 using an index pattern like `my-index-*` or even providing multiple
-     * indices, there's a chance we'll accidentally update too many alerts.
-     *
-     * This check doesn't enforce that the API request has the correct alert ID to index relationship it just guards
-     * against accidentally making a request like:
-     * {
-     *  alertId: [1,2,3],
-     *  index: awesome,
-     * }
-     *
-     * Instead this requires the requestor to provide:
-     * {
-     *  alertId: [1,2,3],
-     *  index: [awesome, awesome, awesome]
-     * }
-     *
-     * Ideally we'd change the format of the comment request to be an array of objects like:
-     * {
-     *  alerts: [{id: 1, index: awesome}, {id: 2, index: awesome}]
-     * }
-     *
-     * But we'd need to also implement a migration because the saved object document currently stores the id and index
-     * in separate fields.
-     */
-    if (ids.length !== indices.length) {
-      throw badRequest(
-        `Received an alert comment with ids and indices arrays of different lengths ids: ${JSON.stringify(
-          ids
-        )} indices: ${JSON.stringify(indices)}`
-      );
-    }
-  }
-};
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 5f413ea27c4a7..2a260a9bcf2ae 100644
--- a/x-pack/plugins/cases/server/saved_object_types/cases.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/cases.ts
@@ -6,13 +6,12 @@
  */
 
 import { SavedObjectsType } from 'src/core/server';
+import { CASE_SAVED_OBJECT } from '../../common/constants';
 import { caseMigrations } from './migrations';
 
-export const CASE_SAVED_OBJECT = 'cases';
-
 export const caseSavedObjectType: SavedObjectsType = {
   name: CASE_SAVED_OBJECT,
-  hidden: false,
+  hidden: true,
   namespaceType: 'single',
   mappings: {
     properties: {
@@ -109,6 +108,9 @@ export const caseSavedObjectType: SavedObjectsType = {
           },
         },
       },
+      owner: {
+        type: 'keyword',
+      },
       title: {
         type: 'keyword',
       },
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 a4fdc24b6e4ee..2ba6e2562a549 100644
--- a/x-pack/plugins/cases/server/saved_object_types/comments.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/comments.ts
@@ -6,13 +6,12 @@
  */
 
 import { SavedObjectsType } from 'src/core/server';
+import { CASE_COMMENT_SAVED_OBJECT } from '../../common/constants';
 import { commentsMigrations } from './migrations';
 
-export const CASE_COMMENT_SAVED_OBJECT = 'cases-comments';
-
 export const caseCommentSavedObjectType: SavedObjectsType = {
   name: CASE_COMMENT_SAVED_OBJECT,
-  hidden: false,
+  hidden: true,
   namespaceType: 'single',
   mappings: {
     properties: {
@@ -22,6 +21,9 @@ export const caseCommentSavedObjectType: SavedObjectsType = {
       comment: {
         type: 'text',
       },
+      owner: {
+        type: 'keyword',
+      },
       type: {
         type: 'keyword',
       },
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 8944e0678f59c..98a60ac395987 100644
--- a/x-pack/plugins/cases/server/saved_object_types/configure.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/configure.ts
@@ -6,13 +6,12 @@
  */
 
 import { SavedObjectsType } from 'src/core/server';
+import { CASE_CONFIGURE_SAVED_OBJECT } from '../../common/constants';
 import { configureMigrations } from './migrations';
 
-export const CASE_CONFIGURE_SAVED_OBJECT = 'cases-configure';
-
 export const caseConfigureSavedObjectType: SavedObjectsType = {
   name: CASE_CONFIGURE_SAVED_OBJECT,
-  hidden: false,
+  hidden: true,
   namespaceType: 'single',
   mappings: {
     properties: {
@@ -58,6 +57,9 @@ export const caseConfigureSavedObjectType: SavedObjectsType = {
       closure_type: {
         type: 'keyword',
       },
+      owner: {
+        type: 'keyword',
+      },
       updated_at: {
         type: 'date',
       },
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 df469108fac0b..16aba01616c3d 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
@@ -6,12 +6,12 @@
  */
 
 import { SavedObjectsType } from 'src/core/server';
-
-export const CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT = 'cases-connector-mappings';
+import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../common/constants';
+import { connectorMappingsMigrations } from './migrations';
 
 export const caseConnectorMappingsSavedObjectType: SavedObjectsType = {
   name: CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
-  hidden: false,
+  hidden: true,
   namespaceType: 'single',
   mappings: {
     properties: {
@@ -28,6 +28,10 @@ export const caseConnectorMappingsSavedObjectType: SavedObjectsType = {
           },
         },
       },
+      owner: {
+        type: 'keyword',
+      },
     },
   },
+  migrations: connectorMappingsMigrations,
 };
diff --git a/x-pack/plugins/cases/server/saved_object_types/index.ts b/x-pack/plugins/cases/server/saved_object_types/index.ts
index 91f104335df8b..1c6bcf6ca710a 100644
--- a/x-pack/plugins/cases/server/saved_object_types/index.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/index.ts
@@ -5,12 +5,9 @@
  * 2.0.
  */
 
-export { caseSavedObjectType, CASE_SAVED_OBJECT } from './cases';
-export { subCaseSavedObjectType, SUB_CASE_SAVED_OBJECT } from './sub_case';
-export { caseConfigureSavedObjectType, CASE_CONFIGURE_SAVED_OBJECT } from './configure';
-export { caseCommentSavedObjectType, CASE_COMMENT_SAVED_OBJECT } from './comments';
-export { caseUserActionSavedObjectType, CASE_USER_ACTION_SAVED_OBJECT } from './user_actions';
-export {
-  caseConnectorMappingsSavedObjectType,
-  CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
-} from './connector_mappings';
+export { caseSavedObjectType } from './cases';
+export { subCaseSavedObjectType } from './sub_case';
+export { caseConfigureSavedObjectType } from './configure';
+export { caseCommentSavedObjectType } from './comments';
+export { caseUserActionSavedObjectType } from './user_actions';
+export { caseConnectorMappingsSavedObjectType } from './connector_mappings';
diff --git a/x-pack/plugins/cases/server/saved_object_types/migrations.ts b/x-pack/plugins/cases/server/saved_object_types/migrations.ts
index 8bbc481124870..3d0bab68cf458 100644
--- a/x-pack/plugins/cases/server/saved_object_types/migrations.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/migrations.ts
@@ -14,7 +14,8 @@ import {
   CaseType,
   AssociationType,
   ESConnectorFields,
-} from '../../common';
+} from '../../common/api';
+import { SECURITY_SOLUTION_OWNER } from '../../common/constants';
 
 interface UnsanitizedCaseConnector {
   connector_id: string;
@@ -59,6 +60,21 @@ interface SanitizedCaseType {
   type: string;
 }
 
+interface SanitizedCaseOwner {
+  owner: string;
+}
+
+const addOwnerToSO = <T = Record<string, unknown>>(
+  doc: SavedObjectUnsanitizedDoc<T>
+): SavedObjectSanitizedDoc<SanitizedCaseOwner> => ({
+  ...doc,
+  attributes: {
+    ...doc.attributes,
+    owner: SECURITY_SOLUTION_OWNER,
+  },
+  references: doc.references || [],
+});
+
 export const caseMigrations = {
   '7.10.0': (
     doc: SavedObjectUnsanitizedDoc<UnsanitizedCaseConnector>
@@ -113,6 +129,11 @@ export const caseMigrations = {
       references: doc.references || [],
     };
   },
+  '7.14.0': (
+    doc: SavedObjectUnsanitizedDoc<Record<string, unknown>>
+  ): SavedObjectSanitizedDoc<SanitizedCaseOwner> => {
+    return addOwnerToSO(doc);
+  },
 };
 
 export const configureMigrations = {
@@ -135,6 +156,11 @@ export const configureMigrations = {
       references: doc.references || [],
     };
   },
+  '7.14.0': (
+    doc: SavedObjectUnsanitizedDoc<Record<string, unknown>>
+  ): SavedObjectSanitizedDoc<SanitizedCaseOwner> => {
+    return addOwnerToSO(doc);
+  },
 };
 
 export const userActionsMigrations = {
@@ -176,6 +202,11 @@ export const userActionsMigrations = {
       references: doc.references || [],
     };
   },
+  '7.14.0': (
+    doc: SavedObjectUnsanitizedDoc<Record<string, unknown>>
+  ): SavedObjectSanitizedDoc<SanitizedCaseOwner> => {
+    return addOwnerToSO(doc);
+  },
 };
 
 interface UnsanitizedComment {
@@ -226,4 +257,25 @@ export const commentsMigrations = {
       references: doc.references || [],
     };
   },
+  '7.14.0': (
+    doc: SavedObjectUnsanitizedDoc<Record<string, unknown>>
+  ): SavedObjectSanitizedDoc<SanitizedCaseOwner> => {
+    return addOwnerToSO(doc);
+  },
+};
+
+export const connectorMappingsMigrations = {
+  '7.14.0': (
+    doc: SavedObjectUnsanitizedDoc<Record<string, unknown>>
+  ): SavedObjectSanitizedDoc<SanitizedCaseOwner> => {
+    return addOwnerToSO(doc);
+  },
+};
+
+export const subCasesMigrations = {
+  '7.14.0': (
+    doc: SavedObjectUnsanitizedDoc<Record<string, unknown>>
+  ): SavedObjectSanitizedDoc<SanitizedCaseOwner> => {
+    return addOwnerToSO(doc);
+  },
 };
diff --git a/x-pack/plugins/cases/server/saved_object_types/sub_case.ts b/x-pack/plugins/cases/server/saved_object_types/sub_case.ts
index da89b19346e4e..471dfebe74ae1 100644
--- a/x-pack/plugins/cases/server/saved_object_types/sub_case.ts
+++ b/x-pack/plugins/cases/server/saved_object_types/sub_case.ts
@@ -6,12 +6,12 @@
  */
 
 import { SavedObjectsType } from 'src/core/server';
-
-export const SUB_CASE_SAVED_OBJECT = 'cases-sub-case';
+import { SUB_CASE_SAVED_OBJECT } from '../../common/constants';
+import { subCasesMigrations } from './migrations';
 
 export const subCaseSavedObjectType: SavedObjectsType = {
   name: SUB_CASE_SAVED_OBJECT,
-  hidden: false,
+  hidden: true,
   namespaceType: 'single',
   mappings: {
     properties: {
@@ -47,6 +47,9 @@ export const subCaseSavedObjectType: SavedObjectsType = {
           },
         },
       },
+      owner: {
+        type: 'keyword',
+      },
       status: {
         type: 'keyword',
       },
@@ -68,4 +71,5 @@ export const subCaseSavedObjectType: SavedObjectsType = {
       },
     },
   },
+  migrations: subCasesMigrations,
 };
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 745dc10e5aac9..55a79f56f84da 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
@@ -6,13 +6,12 @@
  */
 
 import { SavedObjectsType } from 'src/core/server';
+import { CASE_USER_ACTION_SAVED_OBJECT } from '../../common/constants';
 import { userActionsMigrations } from './migrations';
 
-export const CASE_USER_ACTION_SAVED_OBJECT = 'cases-user-actions';
-
 export const caseUserActionSavedObjectType: SavedObjectsType = {
   name: CASE_USER_ACTION_SAVED_OBJECT,
-  hidden: false,
+  hidden: true,
   namespaceType: 'single',
   mappings: {
     properties: {
@@ -44,6 +43,9 @@ export const caseUserActionSavedObjectType: SavedObjectsType = {
       old_value: {
         type: 'text',
       },
+      owner: {
+        type: 'keyword',
+      },
     },
   },
   migrations: userActionsMigrations,
diff --git a/x-pack/plugins/cases/server/scripts/sub_cases/index.ts b/x-pack/plugins/cases/server/scripts/sub_cases/index.ts
index 56f842c10e8f5..edabe9c4d4a1f 100644
--- a/x-pack/plugins/cases/server/scripts/sub_cases/index.ts
+++ b/x-pack/plugins/cases/server/scripts/sub_cases/index.ts
@@ -8,7 +8,14 @@
 import yargs from 'yargs';
 import { ToolingLog } from '@kbn/dev-utils';
 import { KbnClient } from '@kbn/test';
-import { CaseResponse, CaseType, CommentType, ConnectorTypes, CASES_URL } from '../../../common';
+import {
+  CaseResponse,
+  CaseType,
+  CommentType,
+  ConnectorTypes,
+  CASES_URL,
+  SECURITY_SOLUTION_OWNER,
+} from '../../../common';
 import { ActionResult, ActionTypeExecutorResult } from '../../../../actions/common';
 import { ContextTypeGeneratedAlertType, createAlertsString } from '../../connectors';
 
@@ -101,6 +108,7 @@ async function handleGenGroupAlerts(argv: any) {
 
     console.log('Case id: ', caseID);
     const comment: ContextTypeGeneratedAlertType = {
+      owner: SECURITY_SOLUTION_OWNER,
       type: CommentType.generatedAlert,
       alerts: createAlertsString(
         argv.ids.map((id: string) => ({
diff --git a/x-pack/plugins/cases/server/services/alerts/index.ts b/x-pack/plugins/cases/server/services/alerts/index.ts
index 81afaf5363e1f..e7b331138d73c 100644
--- a/x-pack/plugins/cases/server/services/alerts/index.ts
+++ b/x-pack/plugins/cases/server/services/alerts/index.ts
@@ -10,10 +10,10 @@ import { isEmpty } from 'lodash';
 import type { PublicMethodsOf } from '@kbn/utility-types';
 
 import { ElasticsearchClient, Logger } from 'kibana/server';
-import { MAX_ALERTS_PER_SUB_CASE } from '../../../common';
-import { UpdateAlertRequest } from '../../client/types';
+import { MAX_ALERTS_PER_SUB_CASE } from '../../../common/constants';
 import { AlertInfo } from '../../common';
 import { createCaseError } from '../../common/error';
+import { UpdateAlertRequest } from '../../client/alerts/client';
 
 export type AlertServiceContract = PublicMethodsOf<AlertService>;
 
diff --git a/x-pack/plugins/cases/server/services/attachments/index.ts b/x-pack/plugins/cases/server/services/attachments/index.ts
new file mode 100644
index 0000000000000..077f00a571fa7
--- /dev/null
+++ b/x-pack/plugins/cases/server/services/attachments/index.ts
@@ -0,0 +1,130 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { Logger, SavedObject, SavedObjectReference } from 'kibana/server';
+
+import {
+  CommentAttributes as AttachmentAttributes,
+  CommentPatchAttributes as AttachmentPatchAttributes,
+} from '../../../common/api';
+import { CASE_COMMENT_SAVED_OBJECT } from '../../../common/constants';
+import { ClientArgs } from '..';
+
+interface GetAttachmentArgs extends ClientArgs {
+  attachmentId: string;
+}
+
+interface CreateAttachmentArgs extends ClientArgs {
+  attributes: AttachmentAttributes;
+  references: SavedObjectReference[];
+  id: string;
+}
+
+interface UpdateArgs {
+  attachmentId: string;
+  updatedAttributes: AttachmentPatchAttributes;
+  version?: string;
+}
+
+type UpdateAttachmentArgs = UpdateArgs & ClientArgs;
+
+interface BulkUpdateAttachmentArgs extends ClientArgs {
+  comments: UpdateArgs[];
+}
+
+export class AttachmentService {
+  constructor(private readonly log: Logger) {}
+
+  public async get({
+    unsecuredSavedObjectsClient,
+    attachmentId,
+  }: GetAttachmentArgs): Promise<SavedObject<AttachmentAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET attachment ${attachmentId}`);
+      return await unsecuredSavedObjectsClient.get<AttachmentAttributes>(
+        CASE_COMMENT_SAVED_OBJECT,
+        attachmentId
+      );
+    } catch (error) {
+      this.log.error(`Error on GET attachment ${attachmentId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async delete({ unsecuredSavedObjectsClient, attachmentId }: GetAttachmentArgs) {
+    try {
+      this.log.debug(`Attempting to DELETE attachment ${attachmentId}`);
+      return await unsecuredSavedObjectsClient.delete(CASE_COMMENT_SAVED_OBJECT, attachmentId);
+    } catch (error) {
+      this.log.error(`Error on DELETE attachment ${attachmentId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async create({
+    unsecuredSavedObjectsClient,
+    attributes,
+    references,
+    id,
+  }: CreateAttachmentArgs) {
+    try {
+      this.log.debug(`Attempting to POST a new comment`);
+      return await unsecuredSavedObjectsClient.create<AttachmentAttributes>(
+        CASE_COMMENT_SAVED_OBJECT,
+        attributes,
+        {
+          references,
+          id,
+        }
+      );
+    } catch (error) {
+      this.log.error(`Error on POST a new comment: ${error}`);
+      throw error;
+    }
+  }
+
+  public async update({
+    unsecuredSavedObjectsClient,
+    attachmentId,
+    updatedAttributes,
+    version,
+  }: UpdateAttachmentArgs) {
+    try {
+      this.log.debug(`Attempting to UPDATE comment ${attachmentId}`);
+      return await unsecuredSavedObjectsClient.update<AttachmentAttributes>(
+        CASE_COMMENT_SAVED_OBJECT,
+        attachmentId,
+        updatedAttributes,
+        { version }
+      );
+    } catch (error) {
+      this.log.error(`Error on UPDATE comment ${attachmentId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async bulkUpdate({ unsecuredSavedObjectsClient, comments }: BulkUpdateAttachmentArgs) {
+    try {
+      this.log.debug(
+        `Attempting to UPDATE comments ${comments.map((c) => c.attachmentId).join(', ')}`
+      );
+      return await unsecuredSavedObjectsClient.bulkUpdate<AttachmentAttributes>(
+        comments.map((c) => ({
+          type: CASE_COMMENT_SAVED_OBJECT,
+          id: c.attachmentId,
+          attributes: c.updatedAttributes,
+          version: c.version,
+        }))
+      );
+    } catch (error) {
+      this.log.error(
+        `Error on UPDATE comments ${comments.map((c) => c.attachmentId).join(', ')}: ${error}`
+      );
+      throw error;
+    }
+  }
+}
diff --git a/x-pack/plugins/cases/server/services/cases/index.ts b/x-pack/plugins/cases/server/services/cases/index.ts
new file mode 100644
index 0000000000000..fd0a5e878bfb9
--- /dev/null
+++ b/x-pack/plugins/cases/server/services/cases/index.ts
@@ -0,0 +1,1139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 pMap from 'p-map';
+import {
+  KibanaRequest,
+  Logger,
+  SavedObject,
+  SavedObjectsClientContract,
+  SavedObjectsFindResponse,
+  SavedObjectsBulkResponse,
+  SavedObjectsFindResult,
+} from 'kibana/server';
+
+import type { estypes } from '@elastic/elasticsearch';
+import { nodeBuilder, KueryNode } from '../../../../../../src/plugins/data/common';
+
+import { SecurityPluginSetup } from '../../../../security/server';
+import {
+  ESCaseAttributes,
+  CommentAttributes,
+  User,
+  SubCaseAttributes,
+  AssociationType,
+  SubCaseResponse,
+  CommentType,
+  CaseType,
+  CaseResponse,
+  caseTypeField,
+  CasesFindRequest,
+  CaseStatuses,
+  OWNER_FIELD,
+  GetCaseIdsByAlertIdAggs,
+} from '../../../common/api';
+import {
+  defaultSortField,
+  flattenCaseSavedObject,
+  flattenSubCaseSavedObject,
+  groupTotalAlertsByID,
+  SavedObjectFindOptionsKueryNode,
+} from '../../common';
+import {
+  ENABLE_CASE_CONNECTOR,
+  MAX_CONCURRENT_SEARCHES,
+  MAX_DOCS_PER_PAGE,
+} from '../../../common/constants';
+import { defaultPage, defaultPerPage } from '../../routes/api';
+import {
+  CASE_SAVED_OBJECT,
+  CASE_COMMENT_SAVED_OBJECT,
+  SUB_CASE_SAVED_OBJECT,
+} from '../../../common/constants';
+import { ClientArgs } from '..';
+import { combineFilters } from '../../client/utils';
+import { includeFieldsRequiredForAuthentication } from '../../authorization/utils';
+import { EnsureSOAuthCallback } from '../../authorization';
+
+interface GetCaseIdsByAlertIdArgs extends ClientArgs {
+  alertId: string;
+  filter?: KueryNode;
+}
+
+interface PushedArgs {
+  pushed_at: string;
+  pushed_by: User;
+}
+
+interface GetCaseArgs extends ClientArgs {
+  id: string;
+}
+
+interface GetCasesArgs extends ClientArgs {
+  caseIds: string[];
+}
+
+interface GetSubCasesArgs extends ClientArgs {
+  ids: string[];
+}
+
+interface FindCommentsArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  id: string | string[];
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+interface FindCaseCommentsArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  id: string | string[];
+  options?: SavedObjectFindOptionsKueryNode;
+  includeSubCaseComments?: boolean;
+}
+
+interface FindSubCaseCommentsArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  id: string | string[];
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+interface FindCasesArgs extends ClientArgs {
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+interface FindSubCasesByIDArgs extends FindCasesArgs {
+  ids: string[];
+}
+
+interface FindSubCasesStatusStats {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  options: SavedObjectFindOptionsKueryNode;
+  ids: string[];
+}
+
+interface PostCaseArgs extends ClientArgs {
+  attributes: ESCaseAttributes;
+  id: string;
+}
+
+interface CreateSubCaseArgs extends ClientArgs {
+  createdAt: string;
+  caseId: string;
+  createdBy: User;
+}
+
+interface PatchCase {
+  caseId: string;
+  updatedAttributes: Partial<ESCaseAttributes & PushedArgs>;
+  version?: string;
+}
+type PatchCaseArgs = PatchCase & ClientArgs;
+
+interface PatchCasesArgs extends ClientArgs {
+  cases: PatchCase[];
+}
+
+interface PatchSubCase {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  subCaseId: string;
+  updatedAttributes: Partial<SubCaseAttributes>;
+  version?: string;
+}
+
+interface PatchSubCases {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  subCases: Array<Omit<PatchSubCase, 'unsecuredSavedObjectsClient'>>;
+}
+
+interface GetUserArgs {
+  request: KibanaRequest;
+}
+
+interface SubCasesMapWithPageInfo {
+  subCasesMap: Map<string, SubCaseResponse[]>;
+  page: number;
+  perPage: number;
+  total: number;
+}
+
+interface CaseCommentStats {
+  commentTotals: Map<string, number>;
+  alertTotals: Map<string, number>;
+}
+
+interface FindCommentsByAssociationArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  id: string | string[];
+  associationType: AssociationType;
+  options?: SavedObjectFindOptionsKueryNode;
+}
+
+interface Collection {
+  case: SavedObjectsFindResult<ESCaseAttributes>;
+  subCases?: SubCaseResponse[];
+}
+
+interface CasesMapWithPageInfo {
+  casesMap: Map<string, CaseResponse>;
+  page: number;
+  perPage: number;
+  total: number;
+}
+
+type FindCaseOptions = CasesFindRequest & SavedObjectFindOptionsKueryNode;
+
+interface GetTagsArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  filter?: KueryNode;
+}
+
+interface GetReportersArgs {
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
+  filter?: KueryNode;
+}
+
+const transformNewSubCase = ({
+  createdAt,
+  createdBy,
+  owner,
+}: {
+  createdAt: string;
+  createdBy: User;
+  owner: string;
+}): SubCaseAttributes => {
+  return {
+    closed_at: null,
+    closed_by: null,
+    created_at: createdAt,
+    created_by: createdBy,
+    status: CaseStatuses.open,
+    updated_at: null,
+    updated_by: null,
+    owner,
+  };
+};
+
+export class CasesService {
+  constructor(
+    private readonly log: Logger,
+    private readonly authentication?: SecurityPluginSetup['authc']
+  ) {}
+
+  private buildCaseIdsAggs = (
+    size: number = 100
+  ): Record<string, estypes.AggregationsAggregationContainer> => ({
+    references: {
+      nested: {
+        path: `${CASE_COMMENT_SAVED_OBJECT}.references`,
+      },
+      aggregations: {
+        caseIds: {
+          terms: {
+            field: `${CASE_COMMENT_SAVED_OBJECT}.references.id`,
+            size,
+          },
+        },
+      },
+    },
+  });
+
+  public async getCaseIdsByAlertId({
+    unsecuredSavedObjectsClient,
+    alertId,
+    filter,
+  }: GetCaseIdsByAlertIdArgs): Promise<
+    SavedObjectsFindResponse<CommentAttributes, GetCaseIdsByAlertIdAggs>
+  > {
+    try {
+      this.log.debug(`Attempting to GET all cases for alert id ${alertId}`);
+      const combinedFilter = combineFilters([
+        nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.alertId`, alertId),
+        filter,
+      ]);
+
+      const response = await unsecuredSavedObjectsClient.find<
+        CommentAttributes,
+        GetCaseIdsByAlertIdAggs
+      >({
+        type: CASE_COMMENT_SAVED_OBJECT,
+        fields: includeFieldsRequiredForAuthentication(),
+        page: 1,
+        perPage: 1,
+        sortField: defaultSortField,
+        aggs: this.buildCaseIdsAggs(MAX_DOCS_PER_PAGE),
+        filter: combinedFilter,
+      });
+      return response;
+    } catch (error) {
+      this.log.error(`Error on GET all cases for alert id ${alertId}: ${error}`);
+      throw error;
+    }
+  }
+
+  /**
+   * Extracts the case IDs from the alert aggregation
+   */
+  public static getCaseIDsFromAlertAggs(
+    result: SavedObjectsFindResponse<CommentAttributes, GetCaseIdsByAlertIdAggs>
+  ): string[] {
+    return result.aggregations?.references.caseIds.buckets.map((b) => b.key) ?? [];
+  }
+
+  /**
+   * Returns a map of all cases combined with their sub cases if they are collections.
+   */
+  public async findCasesGroupedByID({
+    unsecuredSavedObjectsClient,
+    caseOptions,
+    subCaseOptions,
+  }: {
+    unsecuredSavedObjectsClient: SavedObjectsClientContract;
+    caseOptions: FindCaseOptions;
+    subCaseOptions?: SavedObjectFindOptionsKueryNode;
+  }): Promise<CasesMapWithPageInfo> {
+    const cases = await this.findCases({
+      unsecuredSavedObjectsClient,
+      options: caseOptions,
+    });
+
+    const subCasesResp = ENABLE_CASE_CONNECTOR
+      ? await this.findSubCasesGroupByCase({
+          unsecuredSavedObjectsClient,
+          options: subCaseOptions,
+          ids: cases.saved_objects
+            .filter((caseInfo) => caseInfo.attributes.type === CaseType.collection)
+            .map((caseInfo) => caseInfo.id),
+        })
+      : { subCasesMap: new Map<string, SubCaseResponse[]>(), page: 0, perPage: 0 };
+
+    const casesMap = cases.saved_objects.reduce((accMap, caseInfo) => {
+      const subCasesForCase = subCasesResp.subCasesMap.get(caseInfo.id);
+
+      /**
+       * If this case is an individual add it to the return map
+       * If it is a collection and it has sub cases add it to the return map
+       * If it is a collection and it does not have sub cases, check and see if we're filtering on a status,
+       *  if we're filtering on a status then exclude the empty collection from the results
+       *  if we're not filtering on a status then include the empty collection (that way we can display all the collections
+       *  when the UI isn't doing any filtering)
+       */
+      if (
+        caseInfo.attributes.type === CaseType.individual ||
+        subCasesForCase !== undefined ||
+        !caseOptions.status
+      ) {
+        accMap.set(caseInfo.id, { case: caseInfo, subCases: subCasesForCase });
+      }
+      return accMap;
+    }, new Map<string, Collection>());
+
+    /**
+     * One potential optimization here is to get all comment stats for individual cases, parent cases, and sub cases
+     * in a single request. This can be done because comments that are for sub cases have a reference to both the sub case
+     * and the parent. The associationType field allows us to determine which type of case the comment is attached to.
+     *
+     * So we could use the ids for all the valid cases (individual cases and parents with sub cases) to grab everything.
+     * Once we have it we can build the maps.
+     *
+     * Currently we get all comment stats for all sub cases in one go and we get all comment stats for cases (individual and parent)
+     * in another request (the one below this comment).
+     */
+    const totalCommentsForCases = await this.getCaseCommentStats({
+      unsecuredSavedObjectsClient,
+      ids: Array.from(casesMap.keys()),
+      associationType: AssociationType.case,
+    });
+
+    const casesWithComments = new Map<string, CaseResponse>();
+    for (const [id, caseInfo] of casesMap.entries()) {
+      casesWithComments.set(
+        id,
+        flattenCaseSavedObject({
+          savedObject: caseInfo.case,
+          totalComment: totalCommentsForCases.commentTotals.get(id) ?? 0,
+          totalAlerts: totalCommentsForCases.alertTotals.get(id) ?? 0,
+          subCases: caseInfo.subCases,
+        })
+      );
+    }
+
+    return {
+      casesMap: casesWithComments,
+      page: cases.page,
+      perPage: cases.per_page,
+      total: cases.total,
+    };
+  }
+
+  /**
+   * Retrieves the number of cases that exist with a given status (open, closed, etc).
+   * This also counts sub cases. Parent cases are excluded from the statistics.
+   */
+  public async findCaseStatusStats({
+    unsecuredSavedObjectsClient,
+    caseOptions,
+    subCaseOptions,
+    ensureSavedObjectsAreAuthorized,
+  }: {
+    unsecuredSavedObjectsClient: SavedObjectsClientContract;
+    caseOptions: SavedObjectFindOptionsKueryNode;
+    ensureSavedObjectsAreAuthorized: EnsureSOAuthCallback;
+    subCaseOptions?: SavedObjectFindOptionsKueryNode;
+  }): Promise<number> {
+    /**
+     * This could be made more performant. What we're doing here is retrieving all cases
+     * that match the API request's filters instead of just counts. This is because we need to grab
+     * the ids for the parent cases that match those filters. Then we use those IDS to count how many
+     * sub cases those parents have to calculate the total amount of cases that are open, closed, or in-progress.
+     *
+     * Another solution would be to store ALL filterable fields on both a case and sub case. That we could do a single
+     * query for each type to calculate the totals using the filters. This has drawbacks though:
+     *
+     * We'd have to sync up the parent case's editable attributes with the sub case any time they were change to avoid
+     * them getting out of sync and causing issues when we do these types of stats aggregations. This would result in a lot
+     * of update requests if the user is editing their case details often. Which could potentially cause conflict failures.
+     *
+     * Another option is to prevent the ability from update the parent case's details all together once it's created. A user
+     * could instead modify the sub case details directly. This could be weird though because individual sub cases for the same
+     * parent would have different titles, tags, etc.
+     *
+     * Another potential issue with this approach is when you push a case and all its sub case information. If the sub cases
+     * don't have the same title and tags, we'd need to account for that as well.
+     */
+    const cases = await this.findCases({
+      unsecuredSavedObjectsClient,
+      options: {
+        ...caseOptions,
+        fields: includeFieldsRequiredForAuthentication([caseTypeField]),
+        page: 1,
+        perPage: MAX_DOCS_PER_PAGE,
+      },
+    });
+
+    // make sure that the retrieved cases were correctly filtered by owner
+    ensureSavedObjectsAreAuthorized(
+      cases.saved_objects.map((caseInfo) => ({ id: caseInfo.id, owner: caseInfo.attributes.owner }))
+    );
+
+    const caseIds = cases.saved_objects
+      .filter((caseInfo) => caseInfo.attributes.type === CaseType.collection)
+      .map((caseInfo) => caseInfo.id);
+
+    let subCasesTotal = 0;
+
+    if (ENABLE_CASE_CONNECTOR && subCaseOptions) {
+      subCasesTotal = await this.findSubCaseStatusStats({
+        unsecuredSavedObjectsClient,
+        options: subCaseOptions,
+        ids: caseIds,
+      });
+    }
+
+    const total =
+      cases.saved_objects.filter((caseInfo) => caseInfo.attributes.type !== CaseType.collection)
+        .length + subCasesTotal;
+
+    return total;
+  }
+
+  /**
+   * Retrieves the comments attached to a case or sub case.
+   */
+  public async getCommentsByAssociation({
+    unsecuredSavedObjectsClient,
+    id,
+    associationType,
+    options,
+  }: FindCommentsByAssociationArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
+    if (associationType === AssociationType.subCase) {
+      return this.getAllSubCaseComments({
+        unsecuredSavedObjectsClient,
+        id,
+        options,
+      });
+    } else {
+      return this.getAllCaseComments({
+        unsecuredSavedObjectsClient,
+        id,
+        options,
+      });
+    }
+  }
+
+  /**
+   * Returns the number of total comments and alerts for a case (or sub case)
+   */
+  public async getCaseCommentStats({
+    unsecuredSavedObjectsClient,
+    ids,
+    associationType,
+  }: {
+    unsecuredSavedObjectsClient: SavedObjectsClientContract;
+    ids: string[];
+    associationType: AssociationType;
+  }): Promise<CaseCommentStats> {
+    if (ids.length <= 0) {
+      return {
+        commentTotals: new Map<string, number>(),
+        alertTotals: new Map<string, number>(),
+      };
+    }
+
+    const refType =
+      associationType === AssociationType.case ? CASE_SAVED_OBJECT : SUB_CASE_SAVED_OBJECT;
+
+    const getCommentsMapper = async (id: string) =>
+      this.getCommentsByAssociation({
+        unsecuredSavedObjectsClient,
+        associationType,
+        id,
+        options: { page: 1, perPage: 1 },
+      });
+
+    // Ensuring we don't too many concurrent get running.
+    const allComments = await pMap(ids, getCommentsMapper, {
+      concurrency: MAX_CONCURRENT_SEARCHES,
+    });
+
+    const alerts = await this.getCommentsByAssociation({
+      unsecuredSavedObjectsClient,
+      associationType,
+      id: ids,
+      options: {
+        filter: nodeBuilder.or([
+          nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.type`, CommentType.alert),
+          nodeBuilder.is(
+            `${CASE_COMMENT_SAVED_OBJECT}.attributes.type`,
+            CommentType.generatedAlert
+          ),
+        ]),
+      },
+    });
+
+    const getID = (comments: SavedObjectsFindResponse<unknown>) => {
+      return comments.saved_objects.length > 0
+        ? comments.saved_objects[0].references.find((ref) => ref.type === refType)?.id
+        : undefined;
+    };
+
+    const groupedComments = allComments.reduce((acc, comments) => {
+      const id = getID(comments);
+      if (id) {
+        acc.set(id, comments.total);
+      }
+      return acc;
+    }, new Map<string, number>());
+
+    const groupedAlerts = groupTotalAlertsByID({ comments: alerts });
+    return { commentTotals: groupedComments, alertTotals: groupedAlerts };
+  }
+
+  /**
+   * Returns all the sub cases for a set of case IDs. Comment statistics are also returned.
+   */
+  public async findSubCasesGroupByCase({
+    unsecuredSavedObjectsClient,
+    options,
+    ids,
+  }: {
+    unsecuredSavedObjectsClient: SavedObjectsClientContract;
+    options?: SavedObjectFindOptionsKueryNode;
+    ids: string[];
+  }): Promise<SubCasesMapWithPageInfo> {
+    const getCaseID = (subCase: SavedObjectsFindResult<SubCaseAttributes>): string | undefined => {
+      return subCase.references.length > 0 ? subCase.references[0].id : undefined;
+    };
+
+    const emptyResponse = {
+      subCasesMap: new Map<string, SubCaseResponse[]>(),
+      page: 0,
+      perPage: 0,
+      total: 0,
+    };
+
+    if (!options) {
+      return emptyResponse;
+    }
+
+    if (ids.length <= 0) {
+      return emptyResponse;
+    }
+
+    const subCases = await this.findSubCases({
+      unsecuredSavedObjectsClient,
+      options: {
+        ...options,
+        hasReference: ids.map((id) => {
+          return {
+            id,
+            type: CASE_SAVED_OBJECT,
+          };
+        }),
+      },
+    });
+
+    const subCaseComments = await this.getCaseCommentStats({
+      unsecuredSavedObjectsClient,
+      ids: subCases.saved_objects.map((subCase) => subCase.id),
+      associationType: AssociationType.subCase,
+    });
+
+    const subCasesMap = subCases.saved_objects.reduce((accMap, subCase) => {
+      const parentCaseID = getCaseID(subCase);
+      if (parentCaseID) {
+        const subCaseFromMap = accMap.get(parentCaseID);
+
+        if (subCaseFromMap === undefined) {
+          const subCasesForID = [
+            flattenSubCaseSavedObject({
+              savedObject: subCase,
+              totalComment: subCaseComments.commentTotals.get(subCase.id) ?? 0,
+              totalAlerts: subCaseComments.alertTotals.get(subCase.id) ?? 0,
+            }),
+          ];
+          accMap.set(parentCaseID, subCasesForID);
+        } else {
+          subCaseFromMap.push(
+            flattenSubCaseSavedObject({
+              savedObject: subCase,
+              totalComment: subCaseComments.commentTotals.get(subCase.id) ?? 0,
+              totalAlerts: subCaseComments.alertTotals.get(subCase.id) ?? 0,
+            })
+          );
+        }
+      }
+      return accMap;
+    }, new Map<string, SubCaseResponse[]>());
+
+    return { subCasesMap, page: subCases.page, perPage: subCases.per_page, total: subCases.total };
+  }
+
+  /**
+   * Calculates the number of sub cases for a given set of options for a set of case IDs.
+   */
+  public async findSubCaseStatusStats({
+    unsecuredSavedObjectsClient,
+    options,
+    ids,
+  }: FindSubCasesStatusStats): Promise<number> {
+    if (ids.length <= 0) {
+      return 0;
+    }
+
+    const subCases = await this.findSubCases({
+      unsecuredSavedObjectsClient,
+      options: {
+        ...options,
+        page: 1,
+        perPage: 1,
+        fields: [],
+        hasReference: ids.map((id) => {
+          return {
+            id,
+            type: CASE_SAVED_OBJECT,
+          };
+        }),
+      },
+    });
+
+    return subCases.total;
+  }
+
+  public async createSubCase({
+    unsecuredSavedObjectsClient,
+    createdAt,
+    caseId,
+    createdBy,
+  }: CreateSubCaseArgs): Promise<SavedObject<SubCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to POST a new sub case`);
+      return unsecuredSavedObjectsClient.create<SubCaseAttributes>(
+        SUB_CASE_SAVED_OBJECT,
+        // ENABLE_CASE_CONNECTOR: populate the owner field correctly
+        transformNewSubCase({ createdAt, createdBy, owner: '' }),
+        {
+          references: [
+            {
+              type: CASE_SAVED_OBJECT,
+              name: `associated-${CASE_SAVED_OBJECT}`,
+              id: caseId,
+            },
+          ],
+        }
+      );
+    } catch (error) {
+      this.log.error(`Error on POST a new sub case for id ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async getMostRecentSubCase(
+    unsecuredSavedObjectsClient: SavedObjectsClientContract,
+    caseId: string
+  ) {
+    try {
+      this.log.debug(`Attempting to find most recent sub case for caseID: ${caseId}`);
+      const subCases = await unsecuredSavedObjectsClient.find<SubCaseAttributes>({
+        perPage: 1,
+        sortField: 'created_at',
+        sortOrder: 'desc',
+        type: SUB_CASE_SAVED_OBJECT,
+        hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
+      });
+      if (subCases.saved_objects.length <= 0) {
+        return;
+      }
+
+      return subCases.saved_objects[0];
+    } catch (error) {
+      this.log.error(`Error finding the most recent sub case for case: ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async deleteSubCase(unsecuredSavedObjectsClient: SavedObjectsClientContract, id: string) {
+    try {
+      this.log.debug(`Attempting to DELETE sub case ${id}`);
+      return await unsecuredSavedObjectsClient.delete(SUB_CASE_SAVED_OBJECT, id);
+    } catch (error) {
+      this.log.error(`Error on DELETE sub case ${id}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async deleteCase({ unsecuredSavedObjectsClient, id: caseId }: GetCaseArgs) {
+    try {
+      this.log.debug(`Attempting to DELETE case ${caseId}`);
+      return await unsecuredSavedObjectsClient.delete(CASE_SAVED_OBJECT, caseId);
+    } catch (error) {
+      this.log.error(`Error on DELETE case ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async getCase({
+    unsecuredSavedObjectsClient,
+    id: caseId,
+  }: GetCaseArgs): Promise<SavedObject<ESCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET case ${caseId}`);
+      return await unsecuredSavedObjectsClient.get<ESCaseAttributes>(CASE_SAVED_OBJECT, caseId);
+    } catch (error) {
+      this.log.error(`Error on GET case ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+  public async getSubCase({
+    unsecuredSavedObjectsClient,
+    id,
+  }: GetCaseArgs): Promise<SavedObject<SubCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET sub case ${id}`);
+      return await unsecuredSavedObjectsClient.get<SubCaseAttributes>(SUB_CASE_SAVED_OBJECT, id);
+    } catch (error) {
+      this.log.error(`Error on GET sub case ${id}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async getSubCases({
+    unsecuredSavedObjectsClient,
+    ids,
+  }: GetSubCasesArgs): Promise<SavedObjectsBulkResponse<SubCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET sub cases ${ids.join(', ')}`);
+      return await unsecuredSavedObjectsClient.bulkGet<SubCaseAttributes>(
+        ids.map((id) => ({ type: SUB_CASE_SAVED_OBJECT, id }))
+      );
+    } catch (error) {
+      this.log.error(`Error on GET cases ${ids.join(', ')}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async getCases({
+    unsecuredSavedObjectsClient,
+    caseIds,
+  }: GetCasesArgs): Promise<SavedObjectsBulkResponse<ESCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET cases ${caseIds.join(', ')}`);
+      return await unsecuredSavedObjectsClient.bulkGet<ESCaseAttributes>(
+        caseIds.map((caseId) => ({ type: CASE_SAVED_OBJECT, id: caseId }))
+      );
+    } catch (error) {
+      this.log.error(`Error on GET cases ${caseIds.join(', ')}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async findCases({
+    unsecuredSavedObjectsClient,
+    options,
+  }: FindCasesArgs): Promise<SavedObjectsFindResponse<ESCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to find cases`);
+      return await unsecuredSavedObjectsClient.find<ESCaseAttributes>({
+        sortField: defaultSortField,
+        ...options,
+        type: CASE_SAVED_OBJECT,
+      });
+    } catch (error) {
+      this.log.error(`Error on find cases: ${error}`);
+      throw error;
+    }
+  }
+
+  public async findSubCases({
+    unsecuredSavedObjectsClient,
+    options,
+  }: FindCasesArgs): Promise<SavedObjectsFindResponse<SubCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to find sub cases`);
+      // if the page or perPage options are set then respect those instead of trying to
+      // grab all sub cases
+      if (options?.page !== undefined || options?.perPage !== undefined) {
+        return unsecuredSavedObjectsClient.find<SubCaseAttributes>({
+          sortField: defaultSortField,
+          ...options,
+          type: SUB_CASE_SAVED_OBJECT,
+        });
+      }
+
+      return unsecuredSavedObjectsClient.find<SubCaseAttributes>({
+        page: 1,
+        perPage: MAX_DOCS_PER_PAGE,
+        sortField: defaultSortField,
+        ...options,
+        type: SUB_CASE_SAVED_OBJECT,
+      });
+    } catch (error) {
+      this.log.error(`Error on find sub cases: ${error}`);
+      throw error;
+    }
+  }
+
+  /**
+   * Find sub cases using a collection's ID. This would try to retrieve the maximum amount of sub cases
+   * by default.
+   *
+   * @param id the saved object ID of the parent collection to find sub cases for.
+   */
+  public async findSubCasesByCaseId({
+    unsecuredSavedObjectsClient,
+    ids,
+    options,
+  }: FindSubCasesByIDArgs): Promise<SavedObjectsFindResponse<SubCaseAttributes>> {
+    if (ids.length <= 0) {
+      return {
+        total: 0,
+        saved_objects: [],
+        page: options?.page ?? defaultPage,
+        per_page: options?.perPage ?? defaultPerPage,
+      };
+    }
+
+    try {
+      this.log.debug(`Attempting to GET sub cases for case collection id ${ids.join(', ')}`);
+      return this.findSubCases({
+        unsecuredSavedObjectsClient,
+        options: {
+          ...options,
+          hasReference: ids.map((id) => ({
+            type: CASE_SAVED_OBJECT,
+            id,
+          })),
+        },
+      });
+    } catch (error) {
+      this.log.error(
+        `Error on GET all sub cases for case collection id ${ids.join(', ')}: ${error}`
+      );
+      throw error;
+    }
+  }
+
+  private asArray(id: string | string[] | undefined): string[] {
+    if (id === undefined) {
+      return [];
+    } else if (Array.isArray(id)) {
+      return id;
+    } else {
+      return [id];
+    }
+  }
+
+  private async getAllComments({
+    unsecuredSavedObjectsClient,
+    id,
+    options,
+  }: FindCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET all comments internal for id ${JSON.stringify(id)}`);
+      if (options?.page !== undefined || options?.perPage !== undefined) {
+        return unsecuredSavedObjectsClient.find<CommentAttributes>({
+          type: CASE_COMMENT_SAVED_OBJECT,
+          sortField: defaultSortField,
+          ...options,
+        });
+      }
+
+      return unsecuredSavedObjectsClient.find<CommentAttributes>({
+        type: CASE_COMMENT_SAVED_OBJECT,
+        page: 1,
+        perPage: MAX_DOCS_PER_PAGE,
+        sortField: defaultSortField,
+        ...options,
+      });
+    } catch (error) {
+      this.log.error(`Error on GET all comments internal for ${JSON.stringify(id)}: ${error}`);
+      throw error;
+    }
+  }
+
+  /**
+   * Default behavior is to retrieve all comments that adhere to a given filter (if one is included).
+   * to override this pass in the either the page or perPage options.
+   *
+   * @param includeSubCaseComments is a flag to indicate that sub case comments should be included as well, by default
+   *  sub case comments are excluded. If the `filter` field is included in the options, it will override this behavior
+   */
+  public async getAllCaseComments({
+    unsecuredSavedObjectsClient,
+    id,
+    options,
+    includeSubCaseComments = false,
+  }: FindCaseCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
+    try {
+      const refs = this.asArray(id).map((caseID) => ({ type: CASE_SAVED_OBJECT, id: caseID }));
+      if (refs.length <= 0) {
+        return {
+          saved_objects: [],
+          total: 0,
+          per_page: options?.perPage ?? defaultPerPage,
+          page: options?.page ?? defaultPage,
+        };
+      }
+
+      let filter: KueryNode | undefined;
+      if (!includeSubCaseComments) {
+        // if other filters were passed in then combine them to filter out sub case comments
+        const associationTypeFilter = nodeBuilder.is(
+          `${CASE_COMMENT_SAVED_OBJECT}.attributes.associationType`,
+          AssociationType.case
+        );
+
+        filter =
+          options?.filter != null
+            ? nodeBuilder.and([options.filter, associationTypeFilter])
+            : associationTypeFilter;
+      }
+
+      this.log.debug(`Attempting to GET all comments for case caseID ${JSON.stringify(id)}`);
+      return await this.getAllComments({
+        unsecuredSavedObjectsClient,
+        id,
+        options: {
+          hasReferenceOperator: 'OR',
+          hasReference: refs,
+          filter,
+          ...options,
+        },
+      });
+    } catch (error) {
+      this.log.error(`Error on GET all comments for case ${JSON.stringify(id)}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async getAllSubCaseComments({
+    unsecuredSavedObjectsClient,
+    id,
+    options,
+  }: FindSubCaseCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
+    try {
+      const refs = this.asArray(id).map((caseID) => ({ type: SUB_CASE_SAVED_OBJECT, id: caseID }));
+      if (refs.length <= 0) {
+        return {
+          saved_objects: [],
+          total: 0,
+          per_page: options?.perPage ?? defaultPerPage,
+          page: options?.page ?? defaultPage,
+        };
+      }
+
+      this.log.debug(`Attempting to GET all comments for sub case caseID ${JSON.stringify(id)}`);
+      return await this.getAllComments({
+        unsecuredSavedObjectsClient,
+        id,
+        options: {
+          hasReferenceOperator: 'OR',
+          hasReference: refs,
+          ...options,
+        },
+      });
+    } catch (error) {
+      this.log.error(`Error on GET all comments for sub case ${JSON.stringify(id)}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async getReporters({
+    unsecuredSavedObjectsClient,
+    filter,
+  }: GetReportersArgs): Promise<SavedObjectsFindResponse<ESCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET all reporters`);
+
+      return await unsecuredSavedObjectsClient.find<ESCaseAttributes>({
+        type: CASE_SAVED_OBJECT,
+        fields: ['created_by', OWNER_FIELD],
+        page: 1,
+        perPage: MAX_DOCS_PER_PAGE,
+        filter,
+      });
+    } catch (error) {
+      this.log.error(`Error on GET all reporters: ${error}`);
+      throw error;
+    }
+  }
+
+  public async getTags({
+    unsecuredSavedObjectsClient,
+    filter,
+  }: GetTagsArgs): Promise<SavedObjectsFindResponse<ESCaseAttributes>> {
+    try {
+      this.log.debug(`Attempting to GET all cases`);
+
+      return await unsecuredSavedObjectsClient.find<ESCaseAttributes>({
+        type: CASE_SAVED_OBJECT,
+        fields: ['tags', OWNER_FIELD],
+        page: 1,
+        perPage: MAX_DOCS_PER_PAGE,
+        filter,
+      });
+    } catch (error) {
+      this.log.error(`Error on GET tags: ${error}`);
+      throw error;
+    }
+  }
+
+  public getUser({ request }: GetUserArgs) {
+    try {
+      this.log.debug(`Attempting to authenticate a user`);
+      if (this.authentication != null) {
+        const user = this.authentication.getCurrentUser(request);
+        if (!user) {
+          return {
+            username: null,
+            full_name: null,
+            email: null,
+          };
+        }
+        return user;
+      }
+      return {
+        username: null,
+        full_name: null,
+        email: null,
+      };
+    } catch (error) {
+      this.log.error(`Error on GET user: ${error}`);
+      throw error;
+    }
+  }
+
+  public async postNewCase({ unsecuredSavedObjectsClient, attributes, id }: PostCaseArgs) {
+    try {
+      this.log.debug(`Attempting to POST a new case`);
+      return await unsecuredSavedObjectsClient.create<ESCaseAttributes>(
+        CASE_SAVED_OBJECT,
+        attributes,
+        { id }
+      );
+    } catch (error) {
+      this.log.error(`Error on POST a new case: ${error}`);
+      throw error;
+    }
+  }
+
+  public async patchCase({
+    unsecuredSavedObjectsClient,
+    caseId,
+    updatedAttributes,
+    version,
+  }: PatchCaseArgs) {
+    try {
+      this.log.debug(`Attempting to UPDATE case ${caseId}`);
+      return await unsecuredSavedObjectsClient.update<ESCaseAttributes>(
+        CASE_SAVED_OBJECT,
+        caseId,
+        { ...updatedAttributes },
+        { version }
+      );
+    } catch (error) {
+      this.log.error(`Error on UPDATE case ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async patchCases({ unsecuredSavedObjectsClient, cases }: PatchCasesArgs) {
+    try {
+      this.log.debug(`Attempting to UPDATE case ${cases.map((c) => c.caseId).join(', ')}`);
+      return await unsecuredSavedObjectsClient.bulkUpdate<ESCaseAttributes>(
+        cases.map((c) => ({
+          type: CASE_SAVED_OBJECT,
+          id: c.caseId,
+          attributes: c.updatedAttributes,
+          version: c.version,
+        }))
+      );
+    } catch (error) {
+      this.log.error(`Error on UPDATE case ${cases.map((c) => c.caseId).join(', ')}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async patchSubCase({
+    unsecuredSavedObjectsClient,
+    subCaseId,
+    updatedAttributes,
+    version,
+  }: PatchSubCase) {
+    try {
+      this.log.debug(`Attempting to UPDATE sub case ${subCaseId}`);
+      return await unsecuredSavedObjectsClient.update<SubCaseAttributes>(
+        SUB_CASE_SAVED_OBJECT,
+        subCaseId,
+        { ...updatedAttributes },
+        { version }
+      );
+    } catch (error) {
+      this.log.error(`Error on UPDATE sub case ${subCaseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async patchSubCases({ unsecuredSavedObjectsClient, subCases }: PatchSubCases) {
+    try {
+      this.log.debug(
+        `Attempting to UPDATE sub case ${subCases.map((c) => c.subCaseId).join(', ')}`
+      );
+      return await unsecuredSavedObjectsClient.bulkUpdate<SubCaseAttributes>(
+        subCases.map((c) => ({
+          type: SUB_CASE_SAVED_OBJECT,
+          id: c.subCaseId,
+          attributes: c.updatedAttributes,
+          version: c.version,
+        }))
+      );
+    } catch (error) {
+      this.log.error(
+        `Error on UPDATE sub case ${subCases.map((c) => c.subCaseId).join(', ')}: ${error}`
+      );
+      throw error;
+    }
+  }
+}
diff --git a/x-pack/plugins/cases/server/services/configure/index.ts b/x-pack/plugins/cases/server/services/configure/index.ts
index 0ca63bce2d1d0..745e64d9016f9 100644
--- a/x-pack/plugins/cases/server/services/configure/index.ts
+++ b/x-pack/plugins/cases/server/services/configure/index.ts
@@ -5,96 +5,108 @@
  * 2.0.
  */
 
-import {
-  Logger,
-  SavedObject,
-  SavedObjectsClientContract,
-  SavedObjectsFindResponse,
-  SavedObjectsUpdateResponse,
-} from 'kibana/server';
+import { Logger, SavedObjectsClientContract } from 'kibana/server';
 
-import { ESCasesConfigureAttributes, SavedObjectFindOptions } from '../../../common';
-import { CASE_CONFIGURE_SAVED_OBJECT } from '../../saved_object_types';
+import { SavedObjectFindOptionsKueryNode } from '../../common';
+import { ESCasesConfigureAttributes } from '../../../common/api';
+import { CASE_CONFIGURE_SAVED_OBJECT } from '../../../common/constants';
 
 interface ClientArgs {
-  client: SavedObjectsClientContract;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }
 
 interface GetCaseConfigureArgs extends ClientArgs {
-  caseConfigureId: string;
+  configurationId: string;
 }
 interface FindCaseConfigureArgs extends ClientArgs {
-  options?: SavedObjectFindOptions;
+  options?: SavedObjectFindOptionsKueryNode;
 }
 
 interface PostCaseConfigureArgs extends ClientArgs {
   attributes: ESCasesConfigureAttributes;
+  id: string;
 }
 
 interface PatchCaseConfigureArgs extends ClientArgs {
-  caseConfigureId: string;
+  configurationId: string;
   updatedAttributes: Partial<ESCasesConfigureAttributes>;
 }
 
-export interface CaseConfigureServiceSetup {
-  delete(args: GetCaseConfigureArgs): Promise<{}>;
-  get(args: GetCaseConfigureArgs): Promise<SavedObject<ESCasesConfigureAttributes>>;
-  find(args: FindCaseConfigureArgs): Promise<SavedObjectsFindResponse<ESCasesConfigureAttributes>>;
-  patch(
-    args: PatchCaseConfigureArgs
-  ): Promise<SavedObjectsUpdateResponse<ESCasesConfigureAttributes>>;
-  post(args: PostCaseConfigureArgs): Promise<SavedObject<ESCasesConfigureAttributes>>;
-}
-
 export class CaseConfigureService {
   constructor(private readonly log: Logger) {}
-  public setup = async (): Promise<CaseConfigureServiceSetup> => ({
-    delete: async ({ client, caseConfigureId }: GetCaseConfigureArgs) => {
-      try {
-        this.log.debug(`Attempting to DELETE case configure ${caseConfigureId}`);
-        return await client.delete(CASE_CONFIGURE_SAVED_OBJECT, caseConfigureId);
-      } catch (error) {
-        this.log.debug(`Error on DELETE case configure ${caseConfigureId}: ${error}`);
-        throw error;
-      }
-    },
-    get: async ({ client, caseConfigureId }: GetCaseConfigureArgs) => {
-      try {
-        this.log.debug(`Attempting to GET case configuration ${caseConfigureId}`);
-        return await client.get(CASE_CONFIGURE_SAVED_OBJECT, caseConfigureId);
-      } catch (error) {
-        this.log.debug(`Error on GET case configuration ${caseConfigureId}: ${error}`);
-        throw error;
-      }
-    },
-    find: async ({ client, options }: FindCaseConfigureArgs) => {
-      try {
-        this.log.debug(`Attempting to find all case configuration`);
-        return await client.find({ ...options, type: CASE_CONFIGURE_SAVED_OBJECT });
-      } catch (error) {
-        this.log.debug(`Attempting to find all case configuration`);
-        throw error;
-      }
-    },
-    post: async ({ client, attributes }: PostCaseConfigureArgs) => {
-      try {
-        this.log.debug(`Attempting to POST a new case configuration`);
-        return await client.create(CASE_CONFIGURE_SAVED_OBJECT, { ...attributes });
-      } catch (error) {
-        this.log.debug(`Error on POST a new case configuration: ${error}`);
-        throw error;
-      }
-    },
-    patch: async ({ client, caseConfigureId, updatedAttributes }: PatchCaseConfigureArgs) => {
-      try {
-        this.log.debug(`Attempting to UPDATE case configuration ${caseConfigureId}`);
-        return await client.update(CASE_CONFIGURE_SAVED_OBJECT, caseConfigureId, {
+
+  public async delete({ unsecuredSavedObjectsClient, configurationId }: GetCaseConfigureArgs) {
+    try {
+      this.log.debug(`Attempting to DELETE case configure ${configurationId}`);
+      return await unsecuredSavedObjectsClient.delete(CASE_CONFIGURE_SAVED_OBJECT, configurationId);
+    } catch (error) {
+      this.log.debug(`Error on DELETE case configure ${configurationId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async get({ unsecuredSavedObjectsClient, configurationId }: GetCaseConfigureArgs) {
+    try {
+      this.log.debug(`Attempting to GET case configuration ${configurationId}`);
+      return await unsecuredSavedObjectsClient.get<ESCasesConfigureAttributes>(
+        CASE_CONFIGURE_SAVED_OBJECT,
+        configurationId
+      );
+    } catch (error) {
+      this.log.debug(`Error on GET case configuration ${configurationId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async find({ unsecuredSavedObjectsClient, options }: FindCaseConfigureArgs) {
+    try {
+      this.log.debug(`Attempting to find all case configuration`);
+      return await unsecuredSavedObjectsClient.find<ESCasesConfigureAttributes>({
+        ...options,
+        // Get the latest configuration
+        sortField: 'created_at',
+        sortOrder: 'desc',
+        type: CASE_CONFIGURE_SAVED_OBJECT,
+      });
+    } catch (error) {
+      this.log.debug(`Attempting to find all case configuration`);
+      throw error;
+    }
+  }
+
+  public async post({ unsecuredSavedObjectsClient, attributes, id }: PostCaseConfigureArgs) {
+    try {
+      this.log.debug(`Attempting to POST a new case configuration`);
+      return await unsecuredSavedObjectsClient.create<ESCasesConfigureAttributes>(
+        CASE_CONFIGURE_SAVED_OBJECT,
+        {
+          ...attributes,
+        },
+        { id }
+      );
+    } catch (error) {
+      this.log.debug(`Error on POST a new case configuration: ${error}`);
+      throw error;
+    }
+  }
+
+  public async patch({
+    unsecuredSavedObjectsClient,
+    configurationId,
+    updatedAttributes,
+  }: PatchCaseConfigureArgs) {
+    try {
+      this.log.debug(`Attempting to UPDATE case configuration ${configurationId}`);
+      return await unsecuredSavedObjectsClient.update<ESCasesConfigureAttributes>(
+        CASE_CONFIGURE_SAVED_OBJECT,
+        configurationId,
+        {
           ...updatedAttributes,
-        });
-      } catch (error) {
-        this.log.debug(`Error on UPDATE case configuration ${caseConfigureId}: ${error}`);
-        throw error;
-      }
-    },
-  });
+        }
+      );
+    } catch (error) {
+      this.log.debug(`Error on UPDATE case configuration ${configurationId}: ${error}`);
+      throw error;
+    }
+  }
 }
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 82f37190b4ecc..e3ac5b4c55cf3 100644
--- a/x-pack/plugins/cases/server/services/connector_mappings/index.ts
+++ b/x-pack/plugins/cases/server/services/connector_mappings/index.ts
@@ -5,22 +5,17 @@
  * 2.0.
  */
 
-import {
-  Logger,
-  SavedObject,
-  SavedObjectReference,
-  SavedObjectsClientContract,
-  SavedObjectsFindResponse,
-} from 'kibana/server';
+import { Logger, SavedObjectReference, SavedObjectsClientContract } from 'kibana/server';
 
-import { ConnectorMappings, SavedObjectFindOptions } from '../../../common';
-import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../saved_object_types';
+import { ConnectorMappings } from '../../../common/api';
+import { CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT } from '../../../common/constants';
+import { SavedObjectFindOptionsKueryNode } from '../../common';
 
 interface ClientArgs {
-  client: SavedObjectsClientContract;
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }
 interface FindConnectorMappingsArgs extends ClientArgs {
-  options?: SavedObjectFindOptions;
+  options?: SavedObjectFindOptionsKueryNode;
 }
 
 interface PostConnectorMappingsArgs extends ClientArgs {
@@ -28,33 +23,67 @@ interface PostConnectorMappingsArgs extends ClientArgs {
   references: SavedObjectReference[];
 }
 
-export interface ConnectorMappingsServiceSetup {
-  find(args: FindConnectorMappingsArgs): Promise<SavedObjectsFindResponse<ConnectorMappings>>;
-  post(args: PostConnectorMappingsArgs): Promise<SavedObject<ConnectorMappings>>;
+interface UpdateConnectorMappingsArgs extends ClientArgs {
+  mappingId: string;
+  attributes: Partial<ConnectorMappings>;
+  references: SavedObjectReference[];
 }
 
 export class ConnectorMappingsService {
   constructor(private readonly log: Logger) {}
-  public setup = async (): Promise<ConnectorMappingsServiceSetup> => ({
-    find: async ({ client, options }: FindConnectorMappingsArgs) => {
-      try {
-        this.log.debug(`Attempting to find all connector mappings`);
-        return await client.find({ ...options, type: CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT });
-      } catch (error) {
-        this.log.error(`Attempting to find all connector mappings: ${error}`);
-        throw error;
-      }
-    },
-    post: async ({ client, attributes, references }: PostConnectorMappingsArgs) => {
-      try {
-        this.log.debug(`Attempting to POST a new connector mappings`);
-        return await client.create(CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT, attributes, {
+
+  public async find({ unsecuredSavedObjectsClient, options }: FindConnectorMappingsArgs) {
+    try {
+      this.log.debug(`Attempting to find all connector mappings`);
+      return await unsecuredSavedObjectsClient.find<ConnectorMappings>({
+        ...options,
+        type: CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
+      });
+    } catch (error) {
+      this.log.error(`Attempting to find all connector mappings: ${error}`);
+      throw error;
+    }
+  }
+
+  public async post({
+    unsecuredSavedObjectsClient,
+    attributes,
+    references,
+  }: PostConnectorMappingsArgs) {
+    try {
+      this.log.debug(`Attempting to POST a new connector mappings`);
+      return await unsecuredSavedObjectsClient.create<ConnectorMappings>(
+        CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
+        attributes,
+        {
+          references,
+        }
+      );
+    } catch (error) {
+      this.log.error(`Error on POST a new connector mappings: ${error}`);
+      throw error;
+    }
+  }
+
+  public async update({
+    unsecuredSavedObjectsClient,
+    mappingId,
+    attributes,
+    references,
+  }: UpdateConnectorMappingsArgs) {
+    try {
+      this.log.debug(`Attempting to UPDATE connector mappings ${mappingId}`);
+      return await unsecuredSavedObjectsClient.update<ConnectorMappings>(
+        CASE_CONNECTOR_MAPPINGS_SAVED_OBJECT,
+        mappingId,
+        attributes,
+        {
           references,
-        });
-      } catch (error) {
-        this.log.error(`Error on POST a new connector mappings: ${error}`);
-        throw error;
-      }
-    },
-  });
+        }
+      );
+    } catch (error) {
+      this.log.error(`Error on UPDATE connector mappings ${mappingId}: ${error}`);
+      throw error;
+    }
+  }
 }
diff --git a/x-pack/plugins/cases/server/services/index.ts b/x-pack/plugins/cases/server/services/index.ts
index 11b8cef6ab5a5..09895d9392441 100644
--- a/x-pack/plugins/cases/server/services/index.ts
+++ b/x-pack/plugins/cases/server/services/index.ts
@@ -5,1198 +5,15 @@
  * 2.0.
  */
 
-import { AggregationContainer } from '@elastic/elasticsearch/api/types';
-import {
-  KibanaRequest,
-  Logger,
-  SavedObject,
-  SavedObjectsClientContract,
-  SavedObjectsFindResponse,
-  SavedObjectsUpdateResponse,
-  SavedObjectReference,
-  SavedObjectsBulkUpdateResponse,
-  SavedObjectsBulkResponse,
-  SavedObjectsFindResult,
-} from 'kibana/server';
-import { nodeBuilder } from '../../../../../src/plugins/data/common';
+import { SavedObjectsClientContract } from 'kibana/server';
 
-import { AuthenticatedUser, SecurityPluginSetup } from '../../../security/server';
-import {
-  ENABLE_CASE_CONNECTOR,
-  ESCaseAttributes,
-  CommentAttributes,
-  SavedObjectFindOptions,
-  User,
-  CommentPatchAttributes,
-  SubCaseAttributes,
-  AssociationType,
-  SubCaseResponse,
-  CommentType,
-  CaseType,
-  CaseResponse,
-  caseTypeField,
-  CasesFindRequest,
-  GetCaseIdsByAlertIdAggs,
-} from '../../common';
-import { combineFilters, defaultSortField, groupTotalAlertsByID } from '../common';
-import { defaultPage, defaultPerPage } from '../routes/api';
-import {
-  flattenCaseSavedObject,
-  flattenSubCaseSavedObject,
-  transformNewSubCase,
-} from '../routes/api/utils';
-import {
-  CASE_SAVED_OBJECT,
-  CASE_COMMENT_SAVED_OBJECT,
-  SUB_CASE_SAVED_OBJECT,
-} from '../saved_object_types';
-import { readReporters } from './reporters/read_reporters';
-import { readTags } from './tags/read_tags';
-
-export { CaseConfigureService, CaseConfigureServiceSetup } from './configure';
-export { CaseUserActionService, CaseUserActionServiceSetup } from './user_actions';
-export { ConnectorMappingsService, ConnectorMappingsServiceSetup } from './connector_mappings';
+export { CasesService } from './cases';
+export { CaseConfigureService } from './configure';
+export { CaseUserActionService } from './user_actions';
+export { ConnectorMappingsService } from './connector_mappings';
 export { AlertService, AlertServiceContract } from './alerts';
+export { AttachmentService } from './attachments';
 
 export interface ClientArgs {
-  client: SavedObjectsClientContract;
-}
-
-interface PushedArgs {
-  pushed_at: string;
-  pushed_by: User;
-}
-
-interface GetCaseArgs extends ClientArgs {
-  id: string;
-}
-
-interface GetCasesArgs extends ClientArgs {
-  caseIds: string[];
-}
-
-interface GetSubCasesArgs extends ClientArgs {
-  ids: string[];
-}
-
-interface FindCommentsArgs {
-  client: SavedObjectsClientContract;
-  id: string | string[];
-  options?: SavedObjectFindOptions;
-}
-
-interface FindCaseCommentsArgs {
-  client: SavedObjectsClientContract;
-  id: string | string[];
-  options?: SavedObjectFindOptions;
-  includeSubCaseComments?: boolean;
-}
-
-interface FindSubCaseCommentsArgs {
-  client: SavedObjectsClientContract;
-  id: string | string[];
-  options?: SavedObjectFindOptions;
-}
-
-interface FindCasesArgs extends ClientArgs {
-  options?: SavedObjectFindOptions;
-}
-
-interface FindSubCasesByIDArgs extends FindCasesArgs {
-  ids: string[];
-}
-
-interface FindSubCasesStatusStats {
-  client: SavedObjectsClientContract;
-  options: SavedObjectFindOptions;
-  ids: string[];
-}
-
-interface GetCommentArgs extends ClientArgs {
-  commentId: string;
-}
-
-interface GetCaseIdsByAlertIdArgs extends ClientArgs {
-  alertId: string;
-}
-
-interface PostCaseArgs extends ClientArgs {
-  attributes: ESCaseAttributes;
-}
-
-interface CreateSubCaseArgs extends ClientArgs {
-  createdAt: string;
-  caseId: string;
-  createdBy: User;
-}
-
-interface PostCommentArgs extends ClientArgs {
-  attributes: CommentAttributes;
-  references: SavedObjectReference[];
-}
-
-interface PatchCase {
-  caseId: string;
-  updatedAttributes: Partial<ESCaseAttributes & PushedArgs>;
-  version?: string;
-}
-type PatchCaseArgs = PatchCase & ClientArgs;
-
-interface PatchCasesArgs extends ClientArgs {
-  cases: PatchCase[];
-}
-
-interface PatchComment {
-  commentId: string;
-  updatedAttributes: CommentPatchAttributes;
-  version?: string;
-}
-
-type UpdateCommentArgs = PatchComment & ClientArgs;
-
-interface PatchComments extends ClientArgs {
-  comments: PatchComment[];
-}
-
-interface PatchSubCase {
-  client: SavedObjectsClientContract;
-  subCaseId: string;
-  updatedAttributes: Partial<SubCaseAttributes>;
-  version?: string;
-}
-
-interface PatchSubCases {
-  client: SavedObjectsClientContract;
-  subCases: Array<Omit<PatchSubCase, 'client'>>;
-}
-
-interface GetUserArgs {
-  request: KibanaRequest;
-}
-
-interface SubCasesMapWithPageInfo {
-  subCasesMap: Map<string, SubCaseResponse[]>;
-  page: number;
-  perPage: number;
-  total: number;
-}
-
-interface CaseCommentStats {
-  commentTotals: Map<string, number>;
-  alertTotals: Map<string, number>;
-}
-
-interface FindCommentsByAssociationArgs {
-  client: SavedObjectsClientContract;
-  id: string | string[];
-  associationType: AssociationType;
-  options?: SavedObjectFindOptions;
-}
-
-interface Collection {
-  case: SavedObjectsFindResult<ESCaseAttributes>;
-  subCases?: SubCaseResponse[];
-}
-
-interface CasesMapWithPageInfo {
-  casesMap: Map<string, CaseResponse>;
-  page: number;
-  perPage: number;
-  total: number;
-}
-
-type FindCaseOptions = CasesFindRequest & SavedObjectFindOptions;
-
-export interface CaseServiceSetup {
-  deleteCase(args: GetCaseArgs): Promise<{}>;
-  deleteComment(args: GetCommentArgs): Promise<{}>;
-  deleteSubCase(client: SavedObjectsClientContract, id: string): Promise<{}>;
-  findCases(args: FindCasesArgs): Promise<SavedObjectsFindResponse<ESCaseAttributes>>;
-  findSubCases(args: FindCasesArgs): Promise<SavedObjectsFindResponse<SubCaseAttributes>>;
-  findSubCasesByCaseId(
-    args: FindSubCasesByIDArgs
-  ): Promise<SavedObjectsFindResponse<SubCaseAttributes>>;
-  getAllCaseComments(
-    args: FindCaseCommentsArgs
-  ): Promise<SavedObjectsFindResponse<CommentAttributes>>;
-  getAllSubCaseComments(
-    args: FindSubCaseCommentsArgs
-  ): Promise<SavedObjectsFindResponse<CommentAttributes>>;
-  getCase(args: GetCaseArgs): Promise<SavedObject<ESCaseAttributes>>;
-  getSubCase(args: GetCaseArgs): Promise<SavedObject<SubCaseAttributes>>;
-  getSubCases(args: GetSubCasesArgs): Promise<SavedObjectsBulkResponse<SubCaseAttributes>>;
-  getCases(args: GetCasesArgs): Promise<SavedObjectsBulkResponse<ESCaseAttributes>>;
-  getComment(args: GetCommentArgs): Promise<SavedObject<CommentAttributes>>;
-  getCaseIdsByAlertId(args: GetCaseIdsByAlertIdArgs): Promise<string[]>;
-  getTags(args: ClientArgs): Promise<string[]>;
-  getReporters(args: ClientArgs): Promise<User[]>;
-  getUser(args: GetUserArgs): Promise<AuthenticatedUser | User>;
-  postNewCase(args: PostCaseArgs): Promise<SavedObject<ESCaseAttributes>>;
-  postNewComment(args: PostCommentArgs): Promise<SavedObject<CommentAttributes>>;
-  patchCase(args: PatchCaseArgs): Promise<SavedObjectsUpdateResponse<ESCaseAttributes>>;
-  patchCases(args: PatchCasesArgs): Promise<SavedObjectsBulkUpdateResponse<ESCaseAttributes>>;
-  patchComment(args: UpdateCommentArgs): Promise<SavedObjectsUpdateResponse<CommentAttributes>>;
-  patchComments(args: PatchComments): Promise<SavedObjectsBulkUpdateResponse<CommentAttributes>>;
-  getMostRecentSubCase(
-    client: SavedObjectsClientContract,
-    caseId: string
-  ): Promise<SavedObject<SubCaseAttributes> | undefined>;
-  createSubCase(args: CreateSubCaseArgs): Promise<SavedObject<SubCaseAttributes>>;
-  patchSubCase(args: PatchSubCase): Promise<SavedObjectsUpdateResponse<SubCaseAttributes>>;
-  patchSubCases(args: PatchSubCases): Promise<SavedObjectsBulkUpdateResponse<SubCaseAttributes>>;
-  findSubCaseStatusStats(args: FindSubCasesStatusStats): Promise<number>;
-  getCommentsByAssociation(
-    args: FindCommentsByAssociationArgs
-  ): Promise<SavedObjectsFindResponse<CommentAttributes>>;
-  getCaseCommentStats(args: {
-    client: SavedObjectsClientContract;
-    ids: string[];
-    associationType: AssociationType;
-  }): Promise<CaseCommentStats>;
-  findSubCasesGroupByCase(args: {
-    client: SavedObjectsClientContract;
-    options?: SavedObjectFindOptions;
-    ids: string[];
-  }): Promise<SubCasesMapWithPageInfo>;
-  findCaseStatusStats(args: {
-    client: SavedObjectsClientContract;
-    caseOptions: SavedObjectFindOptions;
-    subCaseOptions?: SavedObjectFindOptions;
-  }): Promise<number>;
-  findCasesGroupedByID(args: {
-    client: SavedObjectsClientContract;
-    caseOptions: SavedObjectFindOptions;
-    subCaseOptions?: SavedObjectFindOptions;
-  }): Promise<CasesMapWithPageInfo>;
-}
-
-export class CaseService implements CaseServiceSetup {
-  constructor(
-    private readonly log: Logger,
-    private readonly authentication?: SecurityPluginSetup['authc']
-  ) {}
-
-  /**
-   * Returns a map of all cases combined with their sub cases if they are collections.
-   */
-  public async findCasesGroupedByID({
-    client,
-    caseOptions,
-    subCaseOptions,
-  }: {
-    client: SavedObjectsClientContract;
-    caseOptions: FindCaseOptions;
-    subCaseOptions?: SavedObjectFindOptions;
-  }): Promise<CasesMapWithPageInfo> {
-    const cases = await this.findCases({
-      client,
-      options: caseOptions,
-    });
-
-    const subCasesResp = ENABLE_CASE_CONNECTOR
-      ? await this.findSubCasesGroupByCase({
-          client,
-          options: subCaseOptions,
-          ids: cases.saved_objects
-            .filter((caseInfo) => caseInfo.attributes.type === CaseType.collection)
-            .map((caseInfo) => caseInfo.id),
-        })
-      : { subCasesMap: new Map<string, SubCaseResponse[]>(), page: 0, perPage: 0 };
-
-    const casesMap = cases.saved_objects.reduce((accMap, caseInfo) => {
-      const subCasesForCase = subCasesResp.subCasesMap.get(caseInfo.id);
-
-      /**
-       * If this case is an individual add it to the return map
-       * If it is a collection and it has sub cases add it to the return map
-       * If it is a collection and it does not have sub cases, check and see if we're filtering on a status,
-       *  if we're filtering on a status then exclude the empty collection from the results
-       *  if we're not filtering on a status then include the empty collection (that way we can display all the collections
-       *  when the UI isn't doing any filtering)
-       */
-      if (
-        caseInfo.attributes.type === CaseType.individual ||
-        subCasesForCase !== undefined ||
-        !caseOptions.status
-      ) {
-        accMap.set(caseInfo.id, { case: caseInfo, subCases: subCasesForCase });
-      }
-      return accMap;
-    }, new Map<string, Collection>());
-
-    /**
-     * One potential optimization here is to get all comment stats for individual cases, parent cases, and sub cases
-     * in a single request. This can be done because comments that are for sub cases have a reference to both the sub case
-     * and the parent. The associationType field allows us to determine which type of case the comment is attached to.
-     *
-     * So we could use the ids for all the valid cases (individual cases and parents with sub cases) to grab everything.
-     * Once we have it we can build the maps.
-     *
-     * Currently we get all comment stats for all sub cases in one go and we get all comment stats for cases (individual and parent)
-     * in another request (the one below this comment).
-     */
-    const totalCommentsForCases = await this.getCaseCommentStats({
-      client,
-      ids: Array.from(casesMap.keys()),
-      associationType: AssociationType.case,
-    });
-
-    const casesWithComments = new Map<string, CaseResponse>();
-    for (const [id, caseInfo] of casesMap.entries()) {
-      casesWithComments.set(
-        id,
-        flattenCaseSavedObject({
-          savedObject: caseInfo.case,
-          totalComment: totalCommentsForCases.commentTotals.get(id) ?? 0,
-          totalAlerts: totalCommentsForCases.alertTotals.get(id) ?? 0,
-          subCases: caseInfo.subCases,
-        })
-      );
-    }
-
-    return {
-      casesMap: casesWithComments,
-      page: cases.page,
-      perPage: cases.per_page,
-      total: cases.total,
-    };
-  }
-
-  /**
-   * Retrieves the number of cases that exist with a given status (open, closed, etc).
-   * This also counts sub cases. Parent cases are excluded from the statistics.
-   */
-  public async findCaseStatusStats({
-    client,
-    caseOptions,
-    subCaseOptions,
-  }: {
-    client: SavedObjectsClientContract;
-    caseOptions: SavedObjectFindOptions;
-    subCaseOptions?: SavedObjectFindOptions;
-  }): Promise<number> {
-    const casesStats = await this.findCases({
-      client,
-      options: {
-        ...caseOptions,
-        fields: [],
-        page: 1,
-        perPage: 1,
-      },
-    });
-
-    /**
-     * This could be made more performant. What we're doing here is retrieving all cases
-     * that match the API request's filters instead of just counts. This is because we need to grab
-     * the ids for the parent cases that match those filters. Then we use those IDS to count how many
-     * sub cases those parents have to calculate the total amount of cases that are open, closed, or in-progress.
-     *
-     * Another solution would be to store ALL filterable fields on both a case and sub case. That we could do a single
-     * query for each type to calculate the totals using the filters. This has drawbacks though:
-     *
-     * We'd have to sync up the parent case's editable attributes with the sub case any time they were change to avoid
-     * them getting out of sync and causing issues when we do these types of stats aggregations. This would result in a lot
-     * of update requests if the user is editing their case details often. Which could potentially cause conflict failures.
-     *
-     * Another option is to prevent the ability from update the parent case's details all together once it's created. A user
-     * could instead modify the sub case details directly. This could be weird though because individual sub cases for the same
-     * parent would have different titles, tags, etc.
-     *
-     * Another potential issue with this approach is when you push a case and all its sub case information. If the sub cases
-     * don't have the same title and tags, we'd need to account for that as well.
-     */
-    const cases = await this.findCases({
-      client,
-      options: {
-        ...caseOptions,
-        fields: [caseTypeField],
-        page: 1,
-        perPage: casesStats.total,
-      },
-    });
-
-    const caseIds = cases.saved_objects
-      .filter((caseInfo) => caseInfo.attributes.type === CaseType.collection)
-      .map((caseInfo) => caseInfo.id);
-
-    let subCasesTotal = 0;
-
-    if (ENABLE_CASE_CONNECTOR && subCaseOptions) {
-      subCasesTotal = await this.findSubCaseStatusStats({
-        client,
-        options: subCaseOptions,
-        ids: caseIds,
-      });
-    }
-
-    const total =
-      cases.saved_objects.filter((caseInfo) => caseInfo.attributes.type !== CaseType.collection)
-        .length + subCasesTotal;
-
-    return total;
-  }
-
-  /**
-   * Retrieves the comments attached to a case or sub case.
-   */
-  public async getCommentsByAssociation({
-    client,
-    id,
-    associationType,
-    options,
-  }: FindCommentsByAssociationArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
-    if (associationType === AssociationType.subCase) {
-      return this.getAllSubCaseComments({
-        client,
-        id,
-        options,
-      });
-    } else {
-      return this.getAllCaseComments({
-        client,
-        id,
-        options,
-      });
-    }
-  }
-
-  /**
-   * Returns the number of total comments and alerts for a case (or sub case)
-   */
-  public async getCaseCommentStats({
-    client,
-    ids,
-    associationType,
-  }: {
-    client: SavedObjectsClientContract;
-    ids: string[];
-    associationType: AssociationType;
-  }): Promise<CaseCommentStats> {
-    if (ids.length <= 0) {
-      return {
-        commentTotals: new Map<string, number>(),
-        alertTotals: new Map<string, number>(),
-      };
-    }
-
-    const refType =
-      associationType === AssociationType.case ? CASE_SAVED_OBJECT : SUB_CASE_SAVED_OBJECT;
-
-    const allComments = await Promise.all(
-      ids.map((id) =>
-        this.getCommentsByAssociation({
-          client,
-          associationType,
-          id,
-          options: { page: 1, perPage: 1 },
-        })
-      )
-    );
-
-    const alerts = await this.getCommentsByAssociation({
-      client,
-      associationType,
-      id: ids,
-      options: {
-        filter: `(${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.alert} OR ${CASE_COMMENT_SAVED_OBJECT}.attributes.type: ${CommentType.generatedAlert})`,
-      },
-    });
-
-    const getID = (comments: SavedObjectsFindResponse<unknown>) => {
-      return comments.saved_objects.length > 0
-        ? comments.saved_objects[0].references.find((ref) => ref.type === refType)?.id
-        : undefined;
-    };
-
-    const groupedComments = allComments.reduce((acc, comments) => {
-      const id = getID(comments);
-      if (id) {
-        acc.set(id, comments.total);
-      }
-      return acc;
-    }, new Map<string, number>());
-
-    const groupedAlerts = groupTotalAlertsByID({ comments: alerts });
-    return { commentTotals: groupedComments, alertTotals: groupedAlerts };
-  }
-
-  /**
-   * Returns all the sub cases for a set of case IDs. Comment statistics are also returned.
-   */
-  public async findSubCasesGroupByCase({
-    client,
-    options,
-    ids,
-  }: {
-    client: SavedObjectsClientContract;
-    options?: SavedObjectFindOptions;
-    ids: string[];
-  }): Promise<SubCasesMapWithPageInfo> {
-    const getCaseID = (subCase: SavedObjectsFindResult<SubCaseAttributes>): string | undefined => {
-      return subCase.references.length > 0 ? subCase.references[0].id : undefined;
-    };
-
-    const emptyResponse = {
-      subCasesMap: new Map<string, SubCaseResponse[]>(),
-      page: 0,
-      perPage: 0,
-      total: 0,
-    };
-
-    if (!options) {
-      return emptyResponse;
-    }
-
-    if (ids.length <= 0) {
-      return emptyResponse;
-    }
-
-    const subCases = await this.findSubCases({
-      client,
-      options: {
-        ...options,
-        hasReference: ids.map((id) => {
-          return {
-            id,
-            type: CASE_SAVED_OBJECT,
-          };
-        }),
-      },
-    });
-
-    const subCaseComments = await this.getCaseCommentStats({
-      client,
-      ids: subCases.saved_objects.map((subCase) => subCase.id),
-      associationType: AssociationType.subCase,
-    });
-
-    const subCasesMap = subCases.saved_objects.reduce((accMap, subCase) => {
-      const parentCaseID = getCaseID(subCase);
-      if (parentCaseID) {
-        const subCaseFromMap = accMap.get(parentCaseID);
-
-        if (subCaseFromMap === undefined) {
-          const subCasesForID = [
-            flattenSubCaseSavedObject({
-              savedObject: subCase,
-              totalComment: subCaseComments.commentTotals.get(subCase.id) ?? 0,
-              totalAlerts: subCaseComments.alertTotals.get(subCase.id) ?? 0,
-            }),
-          ];
-          accMap.set(parentCaseID, subCasesForID);
-        } else {
-          subCaseFromMap.push(
-            flattenSubCaseSavedObject({
-              savedObject: subCase,
-              totalComment: subCaseComments.commentTotals.get(subCase.id) ?? 0,
-              totalAlerts: subCaseComments.alertTotals.get(subCase.id) ?? 0,
-            })
-          );
-        }
-      }
-      return accMap;
-    }, new Map<string, SubCaseResponse[]>());
-
-    return { subCasesMap, page: subCases.page, perPage: subCases.per_page, total: subCases.total };
-  }
-
-  /**
-   * Calculates the number of sub cases for a given set of options for a set of case IDs.
-   */
-  public async findSubCaseStatusStats({
-    client,
-    options,
-    ids,
-  }: FindSubCasesStatusStats): Promise<number> {
-    if (ids.length <= 0) {
-      return 0;
-    }
-
-    const subCases = await this.findSubCases({
-      client,
-      options: {
-        ...options,
-        page: 1,
-        perPage: 1,
-        fields: [],
-        hasReference: ids.map((id) => {
-          return {
-            id,
-            type: CASE_SAVED_OBJECT,
-          };
-        }),
-      },
-    });
-
-    return subCases.total;
-  }
-
-  public async createSubCase({
-    client,
-    createdAt,
-    caseId,
-    createdBy,
-  }: CreateSubCaseArgs): Promise<SavedObject<SubCaseAttributes>> {
-    try {
-      this.log.debug(`Attempting to POST a new sub case`);
-      return client.create(SUB_CASE_SAVED_OBJECT, transformNewSubCase({ createdAt, createdBy }), {
-        references: [
-          {
-            type: CASE_SAVED_OBJECT,
-            name: `associated-${CASE_SAVED_OBJECT}`,
-            id: caseId,
-          },
-        ],
-      });
-    } catch (error) {
-      this.log.error(`Error on POST a new sub case for id ${caseId}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async getMostRecentSubCase(client: SavedObjectsClientContract, caseId: string) {
-    try {
-      this.log.debug(`Attempting to find most recent sub case for caseID: ${caseId}`);
-      const subCases: SavedObjectsFindResponse<SubCaseAttributes> = await client.find({
-        perPage: 1,
-        sortField: 'created_at',
-        sortOrder: 'desc',
-        type: SUB_CASE_SAVED_OBJECT,
-        hasReference: { type: CASE_SAVED_OBJECT, id: caseId },
-      });
-      if (subCases.saved_objects.length <= 0) {
-        return;
-      }
-
-      return subCases.saved_objects[0];
-    } catch (error) {
-      this.log.error(`Error finding the most recent sub case for case: ${caseId}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async deleteSubCase(client: SavedObjectsClientContract, id: string) {
-    try {
-      this.log.debug(`Attempting to DELETE sub case ${id}`);
-      return await client.delete(SUB_CASE_SAVED_OBJECT, id);
-    } catch (error) {
-      this.log.error(`Error on DELETE sub case ${id}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async deleteCase({ client, id: caseId }: GetCaseArgs) {
-    try {
-      this.log.debug(`Attempting to DELETE case ${caseId}`);
-      return await client.delete(CASE_SAVED_OBJECT, caseId);
-    } catch (error) {
-      this.log.error(`Error on DELETE case ${caseId}: ${error}`);
-      throw error;
-    }
-  }
-  public async deleteComment({ client, commentId }: GetCommentArgs) {
-    try {
-      this.log.debug(`Attempting to GET comment ${commentId}`);
-      return await client.delete(CASE_COMMENT_SAVED_OBJECT, commentId);
-    } catch (error) {
-      this.log.error(`Error on GET comment ${commentId}: ${error}`);
-      throw error;
-    }
-  }
-  public async getCase({
-    client,
-    id: caseId,
-  }: GetCaseArgs): Promise<SavedObject<ESCaseAttributes>> {
-    try {
-      this.log.debug(`Attempting to GET case ${caseId}`);
-      return await client.get(CASE_SAVED_OBJECT, caseId);
-    } catch (error) {
-      this.log.error(`Error on GET case ${caseId}: ${error}`);
-      throw error;
-    }
-  }
-  public async getSubCase({ client, id }: GetCaseArgs): Promise<SavedObject<SubCaseAttributes>> {
-    try {
-      this.log.debug(`Attempting to GET sub case ${id}`);
-      return await client.get(SUB_CASE_SAVED_OBJECT, id);
-    } catch (error) {
-      this.log.error(`Error on GET sub case ${id}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async getSubCases({
-    client,
-    ids,
-  }: GetSubCasesArgs): Promise<SavedObjectsBulkResponse<SubCaseAttributes>> {
-    try {
-      this.log.debug(`Attempting to GET sub cases ${ids.join(', ')}`);
-      return await client.bulkGet(ids.map((id) => ({ type: SUB_CASE_SAVED_OBJECT, id })));
-    } catch (error) {
-      this.log.error(`Error on GET cases ${ids.join(', ')}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async getCases({
-    client,
-    caseIds,
-  }: GetCasesArgs): Promise<SavedObjectsBulkResponse<ESCaseAttributes>> {
-    try {
-      this.log.debug(`Attempting to GET cases ${caseIds.join(', ')}`);
-      return await client.bulkGet(
-        caseIds.map((caseId) => ({ type: CASE_SAVED_OBJECT, id: caseId }))
-      );
-    } catch (error) {
-      this.log.error(`Error on GET cases ${caseIds.join(', ')}: ${error}`);
-      throw error;
-    }
-  }
-  public async getComment({
-    client,
-    commentId,
-  }: GetCommentArgs): Promise<SavedObject<CommentAttributes>> {
-    try {
-      this.log.debug(`Attempting to GET comment ${commentId}`);
-      return await client.get(CASE_COMMENT_SAVED_OBJECT, commentId);
-    } catch (error) {
-      this.log.error(`Error on GET comment ${commentId}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async findCases({
-    client,
-    options,
-  }: FindCasesArgs): Promise<SavedObjectsFindResponse<ESCaseAttributes>> {
-    try {
-      this.log.debug(`Attempting to find cases`);
-      return await client.find({
-        sortField: defaultSortField,
-        ...options,
-        type: CASE_SAVED_OBJECT,
-      });
-    } catch (error) {
-      this.log.error(`Error on find cases: ${error}`);
-      throw error;
-    }
-  }
-
-  public async findSubCases({
-    client,
-    options,
-  }: FindCasesArgs): Promise<SavedObjectsFindResponse<SubCaseAttributes>> {
-    try {
-      this.log.debug(`Attempting to find sub cases`);
-      // if the page or perPage options are set then respect those instead of trying to
-      // grab all sub cases
-      if (options?.page !== undefined || options?.perPage !== undefined) {
-        return client.find({
-          sortField: defaultSortField,
-          ...options,
-          type: SUB_CASE_SAVED_OBJECT,
-        });
-      }
-
-      const stats = await client.find({
-        fields: [],
-        page: 1,
-        perPage: 1,
-        sortField: defaultSortField,
-        ...options,
-        type: SUB_CASE_SAVED_OBJECT,
-      });
-      return client.find({
-        page: 1,
-        perPage: stats.total,
-        sortField: defaultSortField,
-        ...options,
-        type: SUB_CASE_SAVED_OBJECT,
-      });
-    } catch (error) {
-      this.log.error(`Error on find sub cases: ${error}`);
-      throw error;
-    }
-  }
-
-  /**
-   * Find sub cases using a collection's ID. This would try to retrieve the maximum amount of sub cases
-   * by default.
-   *
-   * @param id the saved object ID of the parent collection to find sub cases for.
-   */
-  public async findSubCasesByCaseId({
-    client,
-    ids,
-    options,
-  }: FindSubCasesByIDArgs): Promise<SavedObjectsFindResponse<SubCaseAttributes>> {
-    if (ids.length <= 0) {
-      return {
-        total: 0,
-        saved_objects: [],
-        page: options?.page ?? defaultPage,
-        per_page: options?.perPage ?? defaultPerPage,
-      };
-    }
-
-    try {
-      this.log.debug(`Attempting to GET sub cases for case collection id ${ids.join(', ')}`);
-      return this.findSubCases({
-        client,
-        options: {
-          ...options,
-          hasReference: ids.map((id) => ({
-            type: CASE_SAVED_OBJECT,
-            id,
-          })),
-        },
-      });
-    } catch (error) {
-      this.log.error(
-        `Error on GET all sub cases for case collection id ${ids.join(', ')}: ${error}`
-      );
-      throw error;
-    }
-  }
-
-  private asArray(id: string | string[] | undefined): string[] {
-    if (id === undefined) {
-      return [];
-    } else if (Array.isArray(id)) {
-      return id;
-    } else {
-      return [id];
-    }
-  }
-
-  private async getAllComments({
-    client,
-    id,
-    options,
-  }: FindCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
-    try {
-      this.log.debug(`Attempting to GET all comments for id ${JSON.stringify(id)}`);
-      if (options?.page !== undefined || options?.perPage !== undefined) {
-        return client.find({
-          type: CASE_COMMENT_SAVED_OBJECT,
-          sortField: defaultSortField,
-          ...options,
-        });
-      }
-      // get the total number of comments that are in ES then we'll grab them all in one go
-      const stats = await client.find({
-        type: CASE_COMMENT_SAVED_OBJECT,
-        fields: [],
-        page: 1,
-        perPage: 1,
-        sortField: defaultSortField,
-        // spread the options after so the caller can override the default behavior if they want
-        ...options,
-      });
-
-      return client.find({
-        type: CASE_COMMENT_SAVED_OBJECT,
-        page: 1,
-        perPage: stats.total,
-        sortField: defaultSortField,
-        ...options,
-      });
-    } catch (error) {
-      this.log.error(`Error on GET all comments for ${JSON.stringify(id)}: ${error}`);
-      throw error;
-    }
-  }
-
-  private buildCaseIdsAggs = (size: number = 100): Record<string, AggregationContainer> => ({
-    references: {
-      nested: {
-        path: `${CASE_COMMENT_SAVED_OBJECT}.references`,
-      },
-      aggregations: {
-        caseIds: {
-          terms: {
-            field: `${CASE_COMMENT_SAVED_OBJECT}.references.id`,
-            size,
-          },
-        },
-      },
-    },
-  });
-
-  public async getCaseIdsByAlertId({
-    client,
-    alertId,
-  }: GetCaseIdsByAlertIdArgs): Promise<string[]> {
-    try {
-      this.log.debug(`Attempting to GET all cases for alert id ${alertId}`);
-
-      let response = await client.find<CommentAttributes, GetCaseIdsByAlertIdAggs>({
-        type: CASE_COMMENT_SAVED_OBJECT,
-        fields: [],
-        page: 1,
-        perPage: 1,
-        sortField: defaultSortField,
-        aggs: this.buildCaseIdsAggs(),
-        filter: nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.alertId`, alertId),
-      });
-      if (response.total > 100) {
-        response = await client.find<CommentAttributes, GetCaseIdsByAlertIdAggs>({
-          type: CASE_COMMENT_SAVED_OBJECT,
-          fields: [],
-          page: 1,
-          perPage: 1,
-          sortField: defaultSortField,
-          aggs: this.buildCaseIdsAggs(response.total),
-          filter: nodeBuilder.is(`${CASE_COMMENT_SAVED_OBJECT}.attributes.alertId`, alertId),
-        });
-      }
-      return response.aggregations?.references.caseIds.buckets.map((b) => b.key) ?? [];
-    } catch (error) {
-      this.log.error(`Error on GET all cases for alert id ${alertId}: ${error}`);
-      throw error;
-    }
-  }
-
-  /**
-   * Default behavior is to retrieve all comments that adhere to a given filter (if one is included).
-   * to override this pass in the either the page or perPage options.
-   *
-   * @param includeSubCaseComments is a flag to indicate that sub case comments should be included as well, by default
-   *  sub case comments are excluded. If the `filter` field is included in the options, it will override this behavior
-   */
-  public async getAllCaseComments({
-    client,
-    id,
-    options,
-    includeSubCaseComments = false,
-  }: FindCaseCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
-    try {
-      const refs = this.asArray(id).map((caseID) => ({ type: CASE_SAVED_OBJECT, id: caseID }));
-      if (refs.length <= 0) {
-        return {
-          saved_objects: [],
-          total: 0,
-          per_page: options?.perPage ?? defaultPerPage,
-          page: options?.page ?? defaultPage,
-        };
-      }
-
-      let filter: string | undefined;
-      if (!includeSubCaseComments) {
-        // if other filters were passed in then combine them to filter out sub case comments
-        filter = combineFilters(
-          [
-            options?.filter ?? '',
-            `${CASE_COMMENT_SAVED_OBJECT}.attributes.associationType: ${AssociationType.case}`,
-          ],
-          'AND'
-        );
-      }
-
-      this.log.debug(`Attempting to GET all comments for case caseID ${JSON.stringify(id)}`);
-      return this.getAllComments({
-        client,
-        id,
-        options: {
-          hasReferenceOperator: 'OR',
-          hasReference: refs,
-          filter,
-          ...options,
-        },
-      });
-    } catch (error) {
-      this.log.error(`Error on GET all comments for case ${JSON.stringify(id)}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async getAllSubCaseComments({
-    client,
-    id,
-    options,
-  }: FindSubCaseCommentsArgs): Promise<SavedObjectsFindResponse<CommentAttributes>> {
-    try {
-      const refs = this.asArray(id).map((caseID) => ({ type: SUB_CASE_SAVED_OBJECT, id: caseID }));
-      if (refs.length <= 0) {
-        return {
-          saved_objects: [],
-          total: 0,
-          per_page: options?.perPage ?? defaultPerPage,
-          page: options?.page ?? defaultPage,
-        };
-      }
-
-      this.log.debug(`Attempting to GET all comments for sub case caseID ${JSON.stringify(id)}`);
-      return this.getAllComments({
-        client,
-        id,
-        options: {
-          hasReferenceOperator: 'OR',
-          hasReference: refs,
-          ...options,
-        },
-      });
-    } catch (error) {
-      this.log.error(`Error on GET all comments for sub case ${JSON.stringify(id)}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async getReporters({ client }: ClientArgs) {
-    try {
-      this.log.debug(`Attempting to GET all reporters`);
-      return await readReporters({ client });
-    } catch (error) {
-      this.log.error(`Error on GET all reporters: ${error}`);
-      throw error;
-    }
-  }
-  public async getTags({ client }: ClientArgs) {
-    try {
-      this.log.debug(`Attempting to GET all cases`);
-      return await readTags({ client });
-    } catch (error) {
-      this.log.error(`Error on GET cases: ${error}`);
-      throw error;
-    }
-  }
-
-  public async getUser({ request }: GetUserArgs) {
-    try {
-      this.log.debug(`Attempting to authenticate a user`);
-      if (this.authentication != null) {
-        const user = this.authentication.getCurrentUser(request);
-        if (!user) {
-          return {
-            username: null,
-            full_name: null,
-            email: null,
-          };
-        }
-        return user;
-      }
-      return {
-        username: null,
-        full_name: null,
-        email: null,
-      };
-    } catch (error) {
-      this.log.error(`Error on GET cases: ${error}`);
-      throw error;
-    }
-  }
-  public async postNewCase({ client, attributes }: PostCaseArgs) {
-    try {
-      this.log.debug(`Attempting to POST a new case`);
-      return await client.create(CASE_SAVED_OBJECT, { ...attributes });
-    } catch (error) {
-      this.log.error(`Error on POST a new case: ${error}`);
-      throw error;
-    }
-  }
-  public async postNewComment({ client, attributes, references }: PostCommentArgs) {
-    try {
-      this.log.debug(`Attempting to POST a new comment`);
-      return await client.create(CASE_COMMENT_SAVED_OBJECT, attributes, { references });
-    } catch (error) {
-      this.log.error(`Error on POST a new comment: ${error}`);
-      throw error;
-    }
-  }
-  public async patchCase({ client, caseId, updatedAttributes, version }: PatchCaseArgs) {
-    try {
-      this.log.debug(`Attempting to UPDATE case ${caseId}`);
-      return await client.update(CASE_SAVED_OBJECT, caseId, { ...updatedAttributes }, { version });
-    } catch (error) {
-      this.log.error(`Error on UPDATE case ${caseId}: ${error}`);
-      throw error;
-    }
-  }
-  public async patchCases({ client, cases }: PatchCasesArgs) {
-    try {
-      this.log.debug(`Attempting to UPDATE case ${cases.map((c) => c.caseId).join(', ')}`);
-      return await client.bulkUpdate(
-        cases.map((c) => ({
-          type: CASE_SAVED_OBJECT,
-          id: c.caseId,
-          attributes: c.updatedAttributes,
-          version: c.version,
-        }))
-      );
-    } catch (error) {
-      this.log.error(`Error on UPDATE case ${cases.map((c) => c.caseId).join(', ')}: ${error}`);
-      throw error;
-    }
-  }
-  public async patchComment({ client, commentId, updatedAttributes, version }: UpdateCommentArgs) {
-    try {
-      this.log.debug(`Attempting to UPDATE comment ${commentId}`);
-      return await client.update(
-        CASE_COMMENT_SAVED_OBJECT,
-        commentId,
-        {
-          ...updatedAttributes,
-        },
-        { version }
-      );
-    } catch (error) {
-      this.log.error(`Error on UPDATE comment ${commentId}: ${error}`);
-      throw error;
-    }
-  }
-  public async patchComments({ client, comments }: PatchComments) {
-    try {
-      this.log.debug(
-        `Attempting to UPDATE comments ${comments.map((c) => c.commentId).join(', ')}`
-      );
-      return await client.bulkUpdate(
-        comments.map((c) => ({
-          type: CASE_COMMENT_SAVED_OBJECT,
-          id: c.commentId,
-          attributes: c.updatedAttributes,
-          version: c.version,
-        }))
-      );
-    } catch (error) {
-      this.log.error(
-        `Error on UPDATE comments ${comments.map((c) => c.commentId).join(', ')}: ${error}`
-      );
-      throw error;
-    }
-  }
-  public async patchSubCase({ client, subCaseId, updatedAttributes, version }: PatchSubCase) {
-    try {
-      this.log.debug(`Attempting to UPDATE sub case ${subCaseId}`);
-      return await client.update(
-        SUB_CASE_SAVED_OBJECT,
-        subCaseId,
-        { ...updatedAttributes },
-        { version }
-      );
-    } catch (error) {
-      this.log.error(`Error on UPDATE sub case ${subCaseId}: ${error}`);
-      throw error;
-    }
-  }
-
-  public async patchSubCases({ client, subCases }: PatchSubCases) {
-    try {
-      this.log.debug(
-        `Attempting to UPDATE sub case ${subCases.map((c) => c.subCaseId).join(', ')}`
-      );
-      return await client.bulkUpdate(
-        subCases.map((c) => ({
-          type: SUB_CASE_SAVED_OBJECT,
-          id: c.subCaseId,
-          attributes: c.updatedAttributes,
-          version: c.version,
-        }))
-      );
-    } catch (error) {
-      this.log.error(
-        `Error on UPDATE sub case ${subCases.map((c) => c.subCaseId).join(', ')}: ${error}`
-      );
-      throw error;
-    }
-  }
+  unsecuredSavedObjectsClient: SavedObjectsClientContract;
 }
diff --git a/x-pack/plugins/cases/server/services/mocks.ts b/x-pack/plugins/cases/server/services/mocks.ts
index d67a297508b14..ce9aec942220a 100644
--- a/x-pack/plugins/cases/server/services/mocks.ts
+++ b/x-pack/plugins/cases/server/services/mocks.ts
@@ -5,75 +5,107 @@
  * 2.0.
  */
 
+import { PublicMethodsOf } from '@kbn/utility-types';
 import {
   AlertServiceContract,
-  CaseConfigureServiceSetup,
-  CaseServiceSetup,
-  CaseUserActionServiceSetup,
-  ConnectorMappingsServiceSetup,
+  CaseConfigureService,
+  CasesService,
+  CaseUserActionService,
+  ConnectorMappingsService,
+  AttachmentService,
 } from '.';
 
-export type CaseServiceMock = jest.Mocked<CaseServiceSetup>;
-export type CaseConfigureServiceMock = jest.Mocked<CaseConfigureServiceSetup>;
-export type ConnectorMappingsServiceMock = jest.Mocked<ConnectorMappingsServiceSetup>;
-export type CaseUserActionServiceMock = jest.Mocked<CaseUserActionServiceSetup>;
+export type CaseServiceMock = jest.Mocked<CasesService>;
+export type CaseConfigureServiceMock = jest.Mocked<CaseConfigureService>;
+export type ConnectorMappingsServiceMock = jest.Mocked<ConnectorMappingsService>;
+export type CaseUserActionServiceMock = jest.Mocked<CaseUserActionService>;
 export type AlertServiceMock = jest.Mocked<AlertServiceContract>;
+export type AttachmentServiceMock = jest.Mocked<AttachmentService>;
 
-export const createCaseServiceMock = (): CaseServiceMock => ({
-  createSubCase: jest.fn(),
-  deleteCase: jest.fn(),
-  deleteComment: jest.fn(),
-  deleteSubCase: jest.fn(),
-  findCases: jest.fn(),
-  findSubCases: jest.fn(),
-  findSubCasesByCaseId: jest.fn(),
-  getAllCaseComments: jest.fn(),
-  getAllSubCaseComments: jest.fn(),
-  getCase: jest.fn(),
-  getCases: jest.fn(),
-  getCaseIdsByAlertId: jest.fn(),
-  getComment: jest.fn(),
-  getMostRecentSubCase: jest.fn(),
-  getSubCase: jest.fn(),
-  getSubCases: jest.fn(),
-  getTags: jest.fn(),
-  getReporters: jest.fn(),
-  getUser: jest.fn(),
-  postNewCase: jest.fn(),
-  postNewComment: jest.fn(),
-  patchCase: jest.fn(),
-  patchCases: jest.fn(),
-  patchComment: jest.fn(),
-  patchComments: jest.fn(),
-  patchSubCase: jest.fn(),
-  patchSubCases: jest.fn(),
-  findSubCaseStatusStats: jest.fn(),
-  getCommentsByAssociation: jest.fn(),
-  getCaseCommentStats: jest.fn(),
-  findSubCasesGroupByCase: jest.fn(),
-  findCaseStatusStats: jest.fn(),
-  findCasesGroupedByID: jest.fn(),
-});
+export const createCaseServiceMock = (): CaseServiceMock => {
+  const service: PublicMethodsOf<CasesService> = {
+    createSubCase: jest.fn(),
+    deleteCase: jest.fn(),
+    deleteSubCase: jest.fn(),
+    findCases: jest.fn(),
+    findSubCases: jest.fn(),
+    findSubCasesByCaseId: jest.fn(),
+    getAllCaseComments: jest.fn(),
+    getAllSubCaseComments: jest.fn(),
+    getCase: jest.fn(),
+    getCases: jest.fn(),
+    getCaseIdsByAlertId: jest.fn(),
+    getMostRecentSubCase: jest.fn(),
+    getSubCase: jest.fn(),
+    getSubCases: jest.fn(),
+    getTags: jest.fn(),
+    getReporters: jest.fn(),
+    getUser: jest.fn(),
+    postNewCase: jest.fn(),
+    patchCase: jest.fn(),
+    patchCases: jest.fn(),
+    patchSubCase: jest.fn(),
+    patchSubCases: jest.fn(),
+    findSubCaseStatusStats: jest.fn(),
+    getCommentsByAssociation: jest.fn(),
+    getCaseCommentStats: jest.fn(),
+    findSubCasesGroupByCase: jest.fn(),
+    findCaseStatusStats: jest.fn(),
+    findCasesGroupedByID: jest.fn(),
+  };
 
-export const createConfigureServiceMock = (): CaseConfigureServiceMock => ({
-  delete: jest.fn(),
-  get: jest.fn(),
-  find: jest.fn(),
-  patch: jest.fn(),
-  post: jest.fn(),
-});
+  // the cast here is required because jest.Mocked tries to include private members and would throw an error
+  return (service as unknown) as CaseServiceMock;
+};
 
-export const connectorMappingsServiceMock = (): ConnectorMappingsServiceMock => ({
-  find: jest.fn(),
-  post: jest.fn(),
-});
+export const createConfigureServiceMock = (): CaseConfigureServiceMock => {
+  const service: PublicMethodsOf<CaseConfigureService> = {
+    delete: jest.fn(),
+    get: jest.fn(),
+    find: jest.fn(),
+    patch: jest.fn(),
+    post: jest.fn(),
+  };
 
-export const createUserActionServiceMock = (): CaseUserActionServiceMock => ({
-  getUserActions: jest.fn(),
-  postUserActions: jest.fn(),
-});
+  // the cast here is required because jest.Mocked tries to include private members and would throw an error
+  return (service as unknown) as CaseConfigureServiceMock;
+};
+
+export const connectorMappingsServiceMock = (): ConnectorMappingsServiceMock => {
+  const service: PublicMethodsOf<ConnectorMappingsService> = {
+    find: jest.fn(),
+    post: jest.fn(),
+    update: jest.fn(),
+  };
+
+  // the cast here is required because jest.Mocked tries to include private members and would throw an error
+  return (service as unknown) as ConnectorMappingsServiceMock;
+};
+
+export const createUserActionServiceMock = (): CaseUserActionServiceMock => {
+  const service: PublicMethodsOf<CaseUserActionService> = {
+    getAll: jest.fn(),
+    bulkCreate: jest.fn(),
+  };
+
+  // the cast here is required because jest.Mocked tries to include private members and would throw an error
+  return (service as unknown) as CaseUserActionServiceMock;
+};
 
 export const createAlertServiceMock = (): AlertServiceMock => ({
   updateAlertsStatus: jest.fn(),
   getAlerts: jest.fn(),
 });
+
+export const createAttachmentServiceMock = (): AttachmentServiceMock => {
+  const service: PublicMethodsOf<AttachmentService> = {
+    get: jest.fn(),
+    delete: jest.fn(),
+    create: jest.fn(),
+    update: jest.fn(),
+    bulkUpdate: jest.fn(),
+  };
+
+  // the cast here is required because jest.Mocked tries to include private members and would throw an error
+  return (service as unknown) as AttachmentServiceMock;
+};
diff --git a/x-pack/plugins/cases/server/services/reporters/read_reporters.ts b/x-pack/plugins/cases/server/services/reporters/read_reporters.ts
deleted file mode 100644
index b47fa185ff78e..0000000000000
--- a/x-pack/plugins/cases/server/services/reporters/read_reporters.ts
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { SavedObject, SavedObjectsClientContract } from 'kibana/server';
-
-import { CaseAttributes, User } from '../../../common';
-import { CASE_SAVED_OBJECT } from '../../saved_object_types';
-
-export const convertToReporters = (caseObjects: Array<SavedObject<CaseAttributes>>): User[] =>
-  caseObjects.reduce<User[]>((accum, caseObj) => {
-    if (
-      caseObj &&
-      caseObj.attributes &&
-      caseObj.attributes.created_by &&
-      caseObj.attributes.created_by.username &&
-      !accum.some((item) => item.username === caseObj.attributes.created_by.username)
-    ) {
-      return [...accum, caseObj.attributes.created_by];
-    } else {
-      return accum;
-    }
-  }, []);
-
-export const readReporters = async ({
-  client,
-}: {
-  client: SavedObjectsClientContract;
-  perPage?: number;
-}): Promise<User[]> => {
-  const firstReporters = await client.find({
-    type: CASE_SAVED_OBJECT,
-    fields: ['created_by'],
-    page: 1,
-    perPage: 1,
-  });
-  const reporters = await client.find<CaseAttributes>({
-    type: CASE_SAVED_OBJECT,
-    fields: ['created_by'],
-    page: 1,
-    perPage: firstReporters.total,
-  });
-  return convertToReporters(reporters.saved_objects);
-};
diff --git a/x-pack/plugins/cases/server/services/tags/read_tags.ts b/x-pack/plugins/cases/server/services/tags/read_tags.ts
deleted file mode 100644
index a00b0b6f26fb7..0000000000000
--- a/x-pack/plugins/cases/server/services/tags/read_tags.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 { SavedObject, SavedObjectsClientContract } from 'kibana/server';
-
-import { CaseAttributes } from '../../../common';
-import { CASE_SAVED_OBJECT } from '../../saved_object_types';
-
-export const convertToTags = (tagObjects: Array<SavedObject<CaseAttributes>>): string[] =>
-  tagObjects.reduce<string[]>((accum, tagObj) => {
-    if (tagObj && tagObj.attributes && tagObj.attributes.tags) {
-      return [...accum, ...tagObj.attributes.tags];
-    } else {
-      return accum;
-    }
-  }, []);
-
-export const convertTagsToSet = (tagObjects: Array<SavedObject<CaseAttributes>>): Set<string> => {
-  return new Set(convertToTags(tagObjects));
-};
-
-// Note: This is doing an in-memory aggregation of the tags by calling each of the case
-// records in batches of this const setting and uses the fields to try to get the least
-// amount of data per record back. If saved objects at some point supports aggregations
-// then this should be replaced with a an aggregation call.
-// Ref: https://www.elastic.co/guide/en/kibana/master/saved-objects-api.html
-export const readTags = async ({
-  client,
-}: {
-  client: SavedObjectsClientContract;
-  perPage?: number;
-}): Promise<string[]> => {
-  const tags = await readRawTags({ client });
-  return tags;
-};
-
-export const readRawTags = async ({
-  client,
-}: {
-  client: SavedObjectsClientContract;
-}): Promise<string[]> => {
-  const firstTags = await client.find({
-    type: CASE_SAVED_OBJECT,
-    fields: ['tags'],
-    page: 1,
-    perPage: 1,
-  });
-  const tags = await client.find<CaseAttributes>({
-    type: CASE_SAVED_OBJECT,
-    fields: ['tags'],
-    page: 1,
-    perPage: firstTags.total,
-  });
-
-  return Array.from(convertTagsToSet(tags.saved_objects));
-};
diff --git a/x-pack/plugins/cases/server/services/user_actions/helpers.ts b/x-pack/plugins/cases/server/services/user_actions/helpers.ts
index be32717039d9d..664a9041491a1 100644
--- a/x-pack/plugins/cases/server/services/user_actions/helpers.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/helpers.ts
@@ -17,17 +17,16 @@ import {
   User,
   UserActionFieldType,
   SubCaseAttributes,
-} from '../../../common';
-import {
-  isTwoArraysDifference,
-  transformESConnectorToCaseConnector,
-} from '../../routes/api/cases/helpers';
+  OWNER_FIELD,
+} from '../../../common/api';
+import { isTwoArraysDifference } from '../../client/utils';
 import { UserActionItem } from '.';
 import {
   CASE_SAVED_OBJECT,
   CASE_COMMENT_SAVED_OBJECT,
   SUB_CASE_SAVED_OBJECT,
-} from '../../saved_object_types';
+} from '../../../common/constants';
+import { transformESConnectorToCaseConnector } from '../../common';
 
 export const transformNewUserAction = ({
   actionField,
@@ -36,6 +35,7 @@ export const transformNewUserAction = ({
   email,
   // eslint-disable-next-line @typescript-eslint/naming-convention
   full_name,
+  owner,
   newValue = null,
   oldValue = null,
   username,
@@ -43,6 +43,7 @@ export const transformNewUserAction = ({
   actionField: UserActionField;
   action: UserAction;
   actionAt: string;
+  owner: string;
   email?: string | null;
   full_name?: string | null;
   newValue?: string | null;
@@ -55,6 +56,7 @@ export const transformNewUserAction = ({
   action_by: { email, full_name, username },
   new_value: newValue,
   old_value: oldValue,
+  owner,
 });
 
 interface BuildCaseUserAction {
@@ -62,6 +64,7 @@ interface BuildCaseUserAction {
   actionAt: string;
   actionBy: User;
   caseId: string;
+  owner: string;
   fields: UserActionField | unknown[];
   newValue?: string | unknown;
   oldValue?: string | unknown;
@@ -82,11 +85,13 @@ export const buildCommentUserActionItem = ({
   newValue,
   oldValue,
   subCaseId,
+  owner,
 }: BuildCommentUserActionItem): UserActionItem => ({
   attributes: transformNewUserAction({
     actionField: fields as UserActionField,
     action,
     actionAt,
+    owner,
     ...actionBy,
     newValue: newValue as string,
     oldValue: oldValue as string,
@@ -123,11 +128,13 @@ export const buildCaseUserActionItem = ({
   newValue,
   oldValue,
   subCaseId,
+  owner,
 }: BuildCaseUserAction): UserActionItem => ({
   attributes: transformNewUserAction({
     actionField: fields as UserActionField,
     action,
     actionAt,
+    owner,
     ...actionBy,
     newValue: newValue as string,
     oldValue: oldValue as string,
@@ -159,6 +166,7 @@ const userActionFieldsAllowed: UserActionField = [
   'status',
   'settings',
   'sub_case',
+  OWNER_FIELD,
 ];
 
 interface CaseSubIDs {
@@ -181,7 +189,14 @@ interface Getters {
   getCaseAndSubID: GetCaseAndSubID;
 }
 
-const buildGenericCaseUserActions = <T>({
+interface OwnerEntity {
+  owner: string;
+}
+
+/**
+ * The entity associated with the user action must contain an owner field
+ */
+const buildGenericCaseUserActions = <T extends OwnerEntity>({
   actionDate,
   actionBy,
   originalCases,
@@ -222,6 +237,7 @@ const buildGenericCaseUserActions = <T>({
                 fields: [field],
                 newValue: updatedValue,
                 oldValue: origValue,
+                owner: originalItem.attributes.owner,
               }),
             ];
           } else if (Array.isArray(origValue) && Array.isArray(updatedValue)) {
@@ -237,6 +253,7 @@ const buildGenericCaseUserActions = <T>({
                   subCaseId,
                   fields: [field],
                   newValue: compareValues.addedItems.join(', '),
+                  owner: originalItem.attributes.owner,
                 }),
               ];
             }
@@ -252,6 +269,7 @@ const buildGenericCaseUserActions = <T>({
                   subCaseId,
                   fields: [field],
                   newValue: compareValues.deletedItems.join(', '),
+                  owner: originalItem.attributes.owner,
                 }),
               ];
             }
@@ -271,6 +289,7 @@ const buildGenericCaseUserActions = <T>({
                 fields: [field],
                 newValue: JSON.stringify(updatedValue),
                 oldValue: JSON.stringify(origValue),
+                owner: originalItem.attributes.owner,
               }),
             ];
           }
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 a038d843a5331..2c20bf808ad4e 100644
--- a/x-pack/plugins/cases/server/services/user_actions/index.ts
+++ b/x-pack/plugins/cases/server/services/user_actions/index.ts
@@ -5,19 +5,15 @@
  * 2.0.
  */
 
-import {
-  SavedObjectsFindResponse,
-  Logger,
-  SavedObjectsBulkResponse,
-  SavedObjectReference,
-} from 'kibana/server';
+import { Logger, SavedObjectReference } from 'kibana/server';
 
 import { CaseUserActionAttributes } from '../../../common';
 import {
   CASE_USER_ACTION_SAVED_OBJECT,
   CASE_SAVED_OBJECT,
   SUB_CASE_SAVED_OBJECT,
-} from '../../saved_object_types';
+  MAX_DOCS_PER_PAGE,
+} from '../../../common/constants';
 import { ClientArgs } from '..';
 
 interface GetCaseUserActionArgs extends ClientArgs {
@@ -34,52 +30,37 @@ interface PostCaseUserActionArgs extends ClientArgs {
   actions: UserActionItem[];
 }
 
-export interface CaseUserActionServiceSetup {
-  getUserActions(
-    args: GetCaseUserActionArgs
-  ): Promise<SavedObjectsFindResponse<CaseUserActionAttributes>>;
-  postUserActions(
-    args: PostCaseUserActionArgs
-  ): Promise<SavedObjectsBulkResponse<CaseUserActionAttributes>>;
-}
-
 export class CaseUserActionService {
   constructor(private readonly log: Logger) {}
-  public setup = async (): Promise<CaseUserActionServiceSetup> => ({
-    getUserActions: async ({ client, caseId, subCaseId }: GetCaseUserActionArgs) => {
-      try {
-        const id = subCaseId ?? caseId;
-        const type = subCaseId ? SUB_CASE_SAVED_OBJECT : CASE_SAVED_OBJECT;
-        const caseUserActionInfo = await client.find({
-          type: CASE_USER_ACTION_SAVED_OBJECT,
-          fields: [],
-          hasReference: { type, id },
-          page: 1,
-          perPage: 1,
-        });
-        return await client.find({
-          type: CASE_USER_ACTION_SAVED_OBJECT,
-          hasReference: { type, id },
-          page: 1,
-          perPage: caseUserActionInfo.total,
-          sortField: 'action_at',
-          sortOrder: 'asc',
-        });
-      } catch (error) {
-        this.log.error(`Error on GET case user action case id: ${caseId}: ${error}`);
-        throw error;
-      }
-    },
-    postUserActions: async ({ client, actions }: PostCaseUserActionArgs) => {
-      try {
-        this.log.debug(`Attempting to POST a new case user action`);
-        return await client.bulkCreate(
-          actions.map((action) => ({ type: CASE_USER_ACTION_SAVED_OBJECT, ...action }))
-        );
-      } catch (error) {
-        this.log.error(`Error on POST a new case user action: ${error}`);
-        throw error;
-      }
-    },
-  });
+
+  public async getAll({ unsecuredSavedObjectsClient, caseId, subCaseId }: GetCaseUserActionArgs) {
+    try {
+      const id = subCaseId ?? caseId;
+      const type = subCaseId ? SUB_CASE_SAVED_OBJECT : CASE_SAVED_OBJECT;
+
+      return await unsecuredSavedObjectsClient.find<CaseUserActionAttributes>({
+        type: CASE_USER_ACTION_SAVED_OBJECT,
+        hasReference: { type, id },
+        page: 1,
+        perPage: MAX_DOCS_PER_PAGE,
+        sortField: 'action_at',
+        sortOrder: 'asc',
+      });
+    } catch (error) {
+      this.log.error(`Error on GET case user action case id: ${caseId}: ${error}`);
+      throw error;
+    }
+  }
+
+  public async bulkCreate({ unsecuredSavedObjectsClient, actions }: PostCaseUserActionArgs) {
+    try {
+      this.log.debug(`Attempting to POST a new case user action`);
+      return await unsecuredSavedObjectsClient.bulkCreate<CaseUserActionAttributes>(
+        actions.map((action) => ({ type: CASE_USER_ACTION_SAVED_OBJECT, ...action }))
+      );
+    } catch (error) {
+      this.log.error(`Error on POST a new case user action: ${error}`);
+      throw error;
+    }
+  }
 }
diff --git a/x-pack/plugins/cases/server/types.ts b/x-pack/plugins/cases/server/types.ts
index 420890c6f80fe..c3b8e0a273221 100644
--- a/x-pack/plugins/cases/server/types.ts
+++ b/x-pack/plugins/cases/server/types.ts
@@ -6,11 +6,17 @@
  */
 
 import type { IRouter, RequestHandlerContext } from 'src/core/server';
-import type { ActionsApiRequestHandlerContext } from '../../actions/server';
+import {
+  ActionTypeConfig,
+  ActionTypeSecrets,
+  ActionTypeParams,
+  ActionType,
+  // eslint-disable-next-line @kbn/eslint/no-restricted-paths
+} from '../../actions/server/types';
 import { CasesClient } from './client';
 
 export interface CaseRequestContext {
-  getCasesClient: () => CasesClient;
+  getCasesClient: () => Promise<CasesClient>;
 }
 
 /**
@@ -18,10 +24,18 @@ export interface CaseRequestContext {
  */
 export interface CasesRequestHandlerContext extends RequestHandlerContext {
   cases: CaseRequestContext;
-  actions: ActionsApiRequestHandlerContext;
 }
 
 /**
  * @internal
  */
 export type CasesRouter = IRouter<CasesRequestHandlerContext>;
+
+export type RegisterActionType = <
+  Config extends ActionTypeConfig = ActionTypeConfig,
+  Secrets extends ActionTypeSecrets = ActionTypeSecrets,
+  Params extends ActionTypeParams = ActionTypeParams,
+  ExecutorResultData = void
+>(
+  actionType: ActionType<Config, Secrets, Params, ExecutorResultData>
+) => void;
diff --git a/x-pack/plugins/cross_cluster_replication/README.md b/x-pack/plugins/cross_cluster_replication/README.md
index 9c500950c20df..3522499c7356a 100644
--- a/x-pack/plugins/cross_cluster_replication/README.md
+++ b/x-pack/plugins/cross_cluster_replication/README.md
@@ -4,10 +4,11 @@
 
 You can run a local cluster and simulate a remote cluster within a single Kibana directory.
 
-1. Start your "local" cluster by running `yarn es snapshot --license=trial` and `yarn start` to start Kibana.
-2. Start your "remote" cluster by running `yarn es snapshot --license=trial -E cluster.name=europe -E transport.port=9400` in a separate terminal tab.
-3. Index a document into your remote cluster by running `curl -X PUT http://elastic:changeme@localhost:9201/my-leader-index --data '{"settings":{"number_of_shards":1,"soft_deletes.enabled":true}}' --header "Content-Type: application/json"`.
-Note that these settings are required for testing auto-follow pattern conflicts errors (see below).
+1. Ensure Kibana isn't running so it doesn't load up any data into your cluster. Run `yarn es snapshot --license=trial` to install a fresh snapshot. Wait for ES to finish setting up.
+2. Create a "remote" copy of your ES snapshot by running: `cp -R .es/8.0.0 .es/8.0.0-2`.
+4. Start your "remote" cluster by running `.es/8.0.0-2/bin/elasticsearch -E cluster.name=europe -E transport.port=9400`.
+4. Run `yarn start` to start Kibana.
+5. Index a document into your remote cluster by running `curl -X PUT http://elastic:changeme@localhost:9201/my-leader-index --data '{"settings":{"number_of_shards":1,"soft_deletes.enabled":true}}' --header "Content-Type: application/json"`. Note that these settings are required for testing auto-follow pattern conflicts errors (see below).
 
 Now you can create follower indices and auto-follow patterns to replicate the `my-leader-index`
 index on the remote cluster that's available at `127.0.0.1:9400`.
diff --git a/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js b/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js
index 1bf54d32f934f..c12c4dfb5a704 100644
--- a/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js
+++ b/x-pack/plugins/cross_cluster_replication/public/app/components/section_error.js
@@ -11,21 +11,19 @@ import { EuiCallOut, EuiSpacer } from '@elastic/eui';
 export function SectionError(props) {
   const { title, error, ...rest } = props;
   const data = error.body ? error.body : error;
-  const {
-    error: errorString,
-    attributes, // wrapEsError() on the server add a "cause" array
-    message,
-  } = data;
+  const { error: errorString, attributes, message } = data;
 
   return (
     <EuiCallOut title={title} color="danger" iconType="alert" {...rest}>
       <div>{message || errorString}</div>
-      {attributes && attributes.cause && (
+      {attributes?.error?.root_cause && (
         <Fragment>
           <EuiSpacer size="m" />
           <ul>
-            {attributes.cause.map((message, i) => (
-              <li key={i}>{message}</li>
+            {attributes.error.root_cause.map(({ type, reason }, i) => (
+              <li key={i}>
+                {type}: {reason}
+              </li>
             ))}
           </ul>
         </Fragment>
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 67b1576e98592..d060fb83832c6 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
@@ -79,24 +79,24 @@ export class AutoFollowPatternEdit extends PureComponent {
         params: { id: name },
       },
     } = this.props;
+
     const title = i18n.translate(
       'xpack.crossClusterReplication.autoFollowPatternEditForm.loadingErrorTitle',
       {
         defaultMessage: 'Error loading auto-follow pattern',
       }
     );
+
     const errorMessage =
-      error.status === 404
+      error.body.statusCode === 404
         ? {
-            data: {
-              error: i18n.translate(
-                'xpack.crossClusterReplication.autoFollowPatternEditForm.loadingErrorMessage',
-                {
-                  defaultMessage: `The auto-follow pattern '{name}' does not exist.`,
-                  values: { name },
-                }
-              ),
-            },
+            error: i18n.translate(
+              'xpack.crossClusterReplication.autoFollowPatternEditForm.loadingErrorMessage',
+              {
+                defaultMessage: `The auto-follow pattern '{name}' does not exist.`,
+                values: { name },
+              }
+            ),
           }
         : error;
 
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 8d6e47d4004b6..41b09a398b1f2 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
@@ -121,24 +121,24 @@ export class FollowerIndexEdit extends PureComponent {
         params: { id: name },
       },
     } = this.props;
+
     const title = i18n.translate(
       'xpack.crossClusterReplication.followerIndexEditForm.loadingErrorTitle',
       {
         defaultMessage: 'Error loading follower index',
       }
     );
+
     const errorMessage =
-      error.status === 404
+      error.body.statusCode === 404
         ? {
-            data: {
-              error: i18n.translate(
-                'xpack.crossClusterReplication.followerIndexEditForm.loadingErrorMessage',
-                {
-                  defaultMessage: `The follower index '{name}' does not exist.`,
-                  values: { name },
-                }
-              ),
-            },
+            error: i18n.translate(
+              'xpack.crossClusterReplication.followerIndexEditForm.loadingErrorMessage',
+              {
+                defaultMessage: `The follower index '{name}' does not exist.`,
+                values: { name },
+              }
+            ),
           }
         : error;
 
diff --git a/x-pack/plugins/cross_cluster_replication/server/client/elasticsearch_ccr.ts b/x-pack/plugins/cross_cluster_replication/server/client/elasticsearch_ccr.ts
deleted file mode 100644
index 67bdc0e998213..0000000000000
--- a/x-pack/plugins/cross_cluster_replication/server/client/elasticsearch_ccr.ts
+++ /dev/null
@@ -1,199 +0,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 const elasticsearchJsPlugin = (Client: any, config: any, components: any) => {
-  const ca = components.clientAction.factory;
-
-  Client.prototype.ccr = components.clientAction.namespaceFactory();
-  const ccr = Client.prototype.ccr.prototype;
-
-  ccr.permissions = ca({
-    urls: [
-      {
-        fmt: '/_security/user/_has_privileges',
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ccr.autoFollowPatterns = ca({
-    urls: [
-      {
-        fmt: '/_ccr/auto_follow',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ccr.autoFollowPattern = ca({
-    urls: [
-      {
-        fmt: '/_ccr/auto_follow/<%=id%>',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'GET',
-  });
-
-  ccr.saveAutoFollowPattern = ca({
-    urls: [
-      {
-        fmt: '/_ccr/auto_follow/<%=id%>',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'PUT',
-  });
-
-  ccr.deleteAutoFollowPattern = ca({
-    urls: [
-      {
-        fmt: '/_ccr/auto_follow/<%=id%>',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'DELETE',
-  });
-
-  ccr.pauseAutoFollowPattern = ca({
-    urls: [
-      {
-        fmt: '/_ccr/auto_follow/<%=id%>/pause',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ccr.resumeAutoFollowPattern = ca({
-    urls: [
-      {
-        fmt: '/_ccr/auto_follow/<%=id%>/resume',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ccr.info = ca({
-    urls: [
-      {
-        fmt: '/<%=id%>/_ccr/info',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'GET',
-  });
-
-  ccr.stats = ca({
-    urls: [
-      {
-        fmt: '/_ccr/stats',
-      },
-    ],
-    method: 'GET',
-  });
-
-  ccr.followerIndexStats = ca({
-    urls: [
-      {
-        fmt: '/<%=id%>/_ccr/stats',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'GET',
-  });
-
-  ccr.saveFollowerIndex = ca({
-    urls: [
-      {
-        fmt: '/<%=name%>/_ccr/follow',
-        req: {
-          name: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'PUT',
-  });
-
-  ccr.pauseFollowerIndex = ca({
-    urls: [
-      {
-        fmt: '/<%=id%>/_ccr/pause_follow',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-
-  ccr.resumeFollowerIndex = ca({
-    urls: [
-      {
-        fmt: '/<%=id%>/_ccr/resume_follow',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    needBody: true,
-    method: 'POST',
-  });
-
-  ccr.unfollowLeaderIndex = ca({
-    urls: [
-      {
-        fmt: '/<%=id%>/_ccr/unfollow',
-        req: {
-          id: {
-            type: 'string',
-          },
-        },
-      },
-    ],
-    method: 'POST',
-  });
-};
diff --git a/x-pack/plugins/cross_cluster_replication/server/lib/format_es_error.ts b/x-pack/plugins/cross_cluster_replication/server/lib/format_es_error.ts
deleted file mode 100644
index a20ec5c6fd51b..0000000000000
--- a/x-pack/plugins/cross_cluster_replication/server/lib/format_es_error.ts
+++ /dev/null
@@ -1,78 +0,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.
- */
-
-function extractCausedByChain(
-  causedBy: Record<string, any> = {},
-  accumulator: string[] = []
-): string[] {
-  const { reason, caused_by } = causedBy; // eslint-disable-line @typescript-eslint/naming-convention
-
-  if (reason) {
-    accumulator.push(reason);
-  }
-
-  if (caused_by) {
-    return extractCausedByChain(caused_by, accumulator);
-  }
-
-  return accumulator;
-}
-
-/**
- * Wraps an error thrown by the ES JS client into a Boom error response and returns it
- *
- * @param err Object Error thrown by ES JS client
- * @param statusCodeToMessageMap Object Optional map of HTTP status codes => error messages
- */
-export function wrapEsError(
-  err: any,
-  statusCodeToMessageMap: Record<string, string> = {}
-): { message: string; body?: { cause?: string[] }; statusCode: number } {
-  const { statusCode, response } = err;
-
-  const {
-    error: {
-      root_cause = [], // eslint-disable-line @typescript-eslint/naming-convention
-      caused_by = undefined, // eslint-disable-line @typescript-eslint/naming-convention
-    } = {},
-  } = JSON.parse(response);
-
-  // If no custom message if specified for the error's status code, just
-  // wrap the error as a Boom error response and return it
-  if (!statusCodeToMessageMap[statusCode]) {
-    // The caused_by chain has the most information so use that if it's available. If not then
-    // settle for the root_cause.
-    const causedByChain = extractCausedByChain(caused_by);
-    const defaultCause = root_cause.length ? extractCausedByChain(root_cause[0]) : undefined;
-
-    return {
-      message: err.message,
-      statusCode,
-      body: {
-        cause: causedByChain.length ? causedByChain : defaultCause,
-      },
-    };
-  }
-
-  // Otherwise, use the custom message to create a Boom error response and
-  // return it
-  const message = statusCodeToMessageMap[statusCode];
-  return { message, statusCode };
-}
-
-export function formatEsError(err: any): any {
-  const { statusCode, message, body } = wrapEsError(err);
-  return {
-    statusCode,
-    body: {
-      message,
-      attributes: {
-        cause: body?.cause,
-      },
-    },
-  };
-}
diff --git a/x-pack/plugins/cross_cluster_replication/server/plugin.ts b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
index e3a1de1dbfaba..c371602df249c 100644
--- a/x-pack/plugins/cross_cluster_replication/server/plugin.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/plugin.ts
@@ -10,7 +10,6 @@ import { first } from 'rxjs/operators';
 import {
   CoreSetup,
   CoreStart,
-  ILegacyCustomClusterClient,
   Plugin,
   Logger,
   PluginInitializerContext,
@@ -19,20 +18,12 @@ import {
 
 import { Index } from '../../index_management/server';
 import { PLUGIN } from '../common/constants';
-import { SetupDependencies, StartDependencies, CcrRequestHandlerContext } from './types';
+import { SetupDependencies, StartDependencies } from './types';
 import { registerApiRoutes } from './routes';
-import { elasticsearchJsPlugin } from './client/elasticsearch_ccr';
 import { CrossClusterReplicationConfig } from './config';
-import { License, isEsError } from './shared_imports';
-import { formatEsError } from './lib/format_es_error';
-
-async function getCustomEsClient(getStartServices: CoreSetup['getStartServices']) {
-  const [core] = await getStartServices();
-  // Extend the elasticsearchJs client with additional endpoints.
-  const esClientConfig = { plugins: [elasticsearchJsPlugin] };
-  return core.elasticsearch.legacy.createClient('crossClusterReplication', esClientConfig);
-}
+import { License, handleEsError } from './shared_imports';
 
+// TODO replace deprecated ES client after Index Management is updated
 const ccrDataEnricher = async (indicesList: Index[], callWithRequest: LegacyAPICaller) => {
   if (!indicesList?.length) {
     return indicesList;
@@ -66,7 +57,6 @@ export class CrossClusterReplicationServerPlugin implements Plugin<void, void, a
   private readonly config$: Observable<CrossClusterReplicationConfig>;
   private readonly license: License;
   private readonly logger: Logger;
-  private ccrEsClient?: ILegacyCustomClusterClient;
 
   constructor(initializerContext: PluginInitializerContext) {
     this.logger = initializerContext.logger.get();
@@ -114,22 +104,11 @@ export class CrossClusterReplicationServerPlugin implements Plugin<void, void, a
       ],
     });
 
-    http.registerRouteHandlerContext<CcrRequestHandlerContext, 'crossClusterReplication'>(
-      'crossClusterReplication',
-      async (ctx, request) => {
-        this.ccrEsClient = this.ccrEsClient ?? (await getCustomEsClient(getStartServices));
-        return {
-          client: this.ccrEsClient.asScoped(request),
-        };
-      }
-    );
-
     registerApiRoutes({
       router: http.createRouter(),
       license: this.license,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
   }
@@ -142,9 +121,5 @@ export class CrossClusterReplicationServerPlugin implements Plugin<void, void, a
     });
   }
 
-  stop() {
-    if (this.ccrEsClient) {
-      this.ccrEsClient.close();
-    }
-  }
+  stop() {}
 }
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 7038ffd3393d3..f778dc3eedd1a 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
 import { registerCreateRoute } from './register_create_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Create auto-follow pattern', () => {
 
     registerCreateRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,8 +33,10 @@ describe('[CCR API] Create auto-follow pattern', () => {
 
   it('should throw a 409 conflict error if id already exists', async () => {
     const routeContextMock = mockRouteContext({
-      // Fail the uniqueness check.
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce(true),
+      ccr: {
+        // Fail the uniqueness check.
+        getAutoFollowPattern: jest.fn().mockResolvedValueOnce(true),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -54,11 +52,11 @@ describe('[CCR API] Create auto-follow pattern', () => {
 
   it('should return 200 status when the id does not exist', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
+      ccr: {
         // Pass the uniqueness check.
-        .mockRejectedValueOnce({ statusCode: 404 })
-        .mockResolvedValueOnce(true),
+        getAutoFollowPattern: jest.fn().mockRejectedValueOnce({ statusCode: 404 }),
+        putAutoFollowPattern: jest.fn().mockResolvedValueOnce(true),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 608e369828de6..dd1481b45f875 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
@@ -17,7 +17,7 @@ import { RouteDependencies } from '../../../types';
 export const registerCreateRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const bodySchema = schema.object({
     id: schema.string(),
@@ -34,6 +34,7 @@ export const registerCreateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id, ...rest } = request.body;
       const body = serializeAutoFollowPattern(rest as AutoFollowPattern);
 
@@ -42,36 +43,29 @@ export const registerCreateRoute = ({
        * the same id does not exist.
        */
       try {
-        await context.crossClusterReplication!.client.callAsCurrentUser('ccr.autoFollowPattern', {
-          id,
-        });
+        await client.asCurrentUser.ccr.getAutoFollowPattern({ name: id });
+
         // If we get here it means that an auto-follow pattern with the same id exists
         return response.conflict({
           body: `An auto-follow pattern with the name "${id}" already exists.`,
         });
-      } catch (err) {
-        if (err.statusCode !== 404) {
-          if (isEsError(err)) {
-            return response.customError(formatEsError(err));
-          }
-          // Case: default
-          throw err;
+      } catch (error) {
+        if (error.statusCode !== 404) {
+          return handleEsError({ error, response });
         }
       }
 
       try {
+        const { body: responseBody } = await client.asCurrentUser.ccr.putAutoFollowPattern({
+          name: id,
+          body,
+        });
+
         return response.ok({
-          body: await context.crossClusterReplication!.client.callAsCurrentUser(
-            'ccr.saveAutoFollowPattern',
-            { id, body }
-          ),
+          body: responseBody,
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 617ef3b5af875..6469b4a2ce576 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense, mockError } from '../test_lib';
 import { registerDeleteRoute } from './register_delete_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Delete auto-follow pattern(s)', () => {
 
     registerDeleteRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,7 +33,9 @@ describe('[CCR API] Delete auto-follow pattern(s)', () => {
 
   it('deletes a single item', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        deleteAutoFollowPattern: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -51,11 +49,13 @@ describe('[CCR API] Delete auto-follow pattern(s)', () => {
 
   it('deletes multiple items', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        deleteAutoFollowPattern: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -69,10 +69,12 @@ describe('[CCR API] Delete auto-follow pattern(s)', () => {
 
   it('returns partial errors', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockRejectedValueOnce({ response: { error: {} } }),
+      ccr: {
+        deleteAutoFollowPattern: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockRejectedValueOnce(mockError),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 868e847bd6bf4..63ade6d1bd070 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
@@ -16,7 +16,7 @@ import { RouteDependencies } from '../../../types';
 export const registerDeleteRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({
     id: schema.string(),
@@ -30,29 +30,22 @@ export const registerDeleteRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
       const itemsDeleted: string[] = [];
       const errors: Array<{ id: string; error: any }> = [];
 
-      const formatError = (err: any) => {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        return response.customError({ statusCode: 500, body: err });
-      };
-
       await Promise.all(
         ids.map((_id) =>
-          context
-            .crossClusterReplication!.client.callAsCurrentUser('ccr.deleteAutoFollowPattern', {
-              id: _id,
+          client.asCurrentUser.ccr
+            .deleteAutoFollowPattern({
+              name: _id,
             })
             .then(() => itemsDeleted.push(_id))
-            .catch((err: any) => {
-              errors.push({ id: _id, error: formatError(err) });
+            .catch((error: any) => {
+              errors.push({ id: _id, error: handleEsError({ error, response }) });
             })
         )
       );
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 ec008e1507c3a..7b694cfe77efd 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
 import { registerFetchRoute } from './register_fetch_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Fetch all auto-follow patterns', () => {
 
     registerFetchRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,21 +33,25 @@ describe('[CCR API] Fetch all auto-follow patterns', () => {
 
   it('deserializes the response from Elasticsearch', async () => {
     const ccrAutoFollowPatternResponseMock = {
-      patterns: [
-        {
-          name: 'autoFollowPattern',
-          pattern: {
-            active: true,
-            remote_cluster: 'remoteCluster',
-            leader_index_patterns: ['leader*'],
-            follow_index_pattern: 'follow',
+      body: {
+        patterns: [
+          {
+            name: 'autoFollowPattern',
+            pattern: {
+              active: true,
+              remote_cluster: 'remoteCluster',
+              leader_index_patterns: ['leader*'],
+              follow_index_pattern: 'follow',
+            },
           },
-        },
-      ],
+        ],
+      },
     };
 
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce(ccrAutoFollowPatternResponseMock),
+      ccr: {
+        getAutoFollowPattern: jest.fn().mockResolvedValueOnce(ccrAutoFollowPatternResponseMock),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest();
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 632fdb03dd588..98ce37d1054bc 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerFetchRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   router.get(
     {
@@ -23,21 +23,20 @@ export const registerFetchRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
+
       try {
-        const result = await context.crossClusterReplication!.client.callAsCurrentUser(
-          'ccr.autoFollowPatterns'
-        );
+        const {
+          body: { patterns },
+        } = await client.asCurrentUser.ccr.getAutoFollowPattern();
         return response.ok({
           body: {
-            patterns: deserializeListAutoFollowPatterns(result.patterns),
+            // @ts-expect-error Once #98266 is merged, test this again.
+            patterns: deserializeListAutoFollowPatterns(patterns),
           },
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 d76c77752b115..61fdd6e57ab7a 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
 import { registerGetRoute } from './register_get_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Get one auto-follow pattern', () => {
 
     registerGetRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,21 +33,25 @@ describe('[CCR API] Get one auto-follow pattern', () => {
 
   it('should return a single resource even though ES returns an array with 1 item', async () => {
     const ccrAutoFollowPatternResponseMock = {
-      patterns: [
-        {
-          name: 'autoFollowPattern',
-          pattern: {
-            active: true,
-            remote_cluster: 'remoteCluster',
-            leader_index_patterns: ['leader*'],
-            follow_index_pattern: 'follow',
+      body: {
+        patterns: [
+          {
+            name: 'autoFollowPattern',
+            pattern: {
+              active: true,
+              remote_cluster: 'remoteCluster',
+              leader_index_patterns: ['leader*'],
+              follow_index_pattern: 'follow',
+            },
           },
-        },
-      ],
+        ],
+      },
     };
 
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce(ccrAutoFollowPatternResponseMock),
+      ccr: {
+        getAutoFollowPattern: jest.fn().mockResolvedValueOnce(ccrAutoFollowPatternResponseMock),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest();
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 3529fe313dbb1..bc452982df63e 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
@@ -17,7 +17,7 @@ import { RouteDependencies } from '../../../types';
 export const registerGetRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({
     id: schema.string(),
@@ -31,24 +31,22 @@ export const registerGetRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
 
       try {
-        const result = await context.crossClusterReplication!.client.callAsCurrentUser(
-          'ccr.autoFollowPattern',
-          { id }
-        );
-        const autoFollowPattern = result.patterns[0];
+        const result = await client.asCurrentUser.ccr.getAutoFollowPattern({
+          name: id,
+        });
+
+        const autoFollowPattern = result.body.patterns[0];
 
         return response.ok({
+          // @ts-expect-error Once #98266 is merged, test this again.
           body: deserializeAutoFollowPattern(autoFollowPattern),
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 7a90e4086cbd7..f74da91047ce7 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense, mockError } from '../test_lib';
 import { registerPauseRoute } from './register_pause_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Pause auto-follow pattern(s)', () => {
 
     registerPauseRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,7 +33,9 @@ describe('[CCR API] Pause auto-follow pattern(s)', () => {
 
   it('pauses a single item', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        pauseAutoFollowPattern: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -51,11 +49,13 @@ describe('[CCR API] Pause auto-follow pattern(s)', () => {
 
   it('pauses multiple items', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        pauseAutoFollowPattern: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -69,10 +69,12 @@ describe('[CCR API] Pause auto-follow pattern(s)', () => {
 
   it('returns partial errors', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockRejectedValueOnce({ response: { error: {} } }),
+      ccr: {
+        pauseAutoFollowPattern: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockRejectedValueOnce(mockError),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 a9aa94cdf4f29..1428e33dee660 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerPauseRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({
     id: schema.string(),
@@ -29,29 +29,22 @@ export const registerPauseRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
       const itemsPaused: string[] = [];
       const errors: Array<{ id: string; error: any }> = [];
 
-      const formatError = (err: any) => {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        return response.customError({ statusCode: 500, body: err });
-      };
-
       await Promise.all(
         ids.map((_id) =>
-          context
-            .crossClusterReplication!.client.callAsCurrentUser('ccr.pauseAutoFollowPattern', {
-              id: _id,
+          client.asCurrentUser.ccr
+            .pauseAutoFollowPattern({
+              name: _id,
             })
             .then(() => itemsPaused.push(_id))
-            .catch((err) => {
-              errors.push({ id: _id, error: formatError(err) });
+            .catch((error) => {
+              errors.push({ id: _id, error: handleEsError({ error, response }) });
             })
         )
       );
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 904642d292e3c..1837f1c17b384 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense, mockError } from '../test_lib';
 import { registerResumeRoute } from './register_resume_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Resume auto-follow pattern(s)', () => {
 
     registerResumeRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,7 +33,9 @@ describe('[CCR API] Resume auto-follow pattern(s)', () => {
 
   it('resumes a single item', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        resumeAutoFollowPattern: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -51,11 +49,13 @@ describe('[CCR API] Resume auto-follow pattern(s)', () => {
 
   it('resumes multiple items', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        resumeAutoFollowPattern: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -69,10 +69,12 @@ describe('[CCR API] Resume auto-follow pattern(s)', () => {
 
   it('returns partial errors', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockRejectedValueOnce({ response: { error: {} } }),
+      ccr: {
+        resumeAutoFollowPattern: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockRejectedValueOnce(mockError),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 1c6396d0b3502..912ecd689054d 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerResumeRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({
     id: schema.string(),
@@ -29,29 +29,22 @@ export const registerResumeRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
       const itemsResumed: string[] = [];
       const errors: Array<{ id: string; error: any }> = [];
 
-      const formatError = (err: any) => {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        return response.customError({ statusCode: 500, body: err });
-      };
-
       await Promise.all(
         ids.map((_id: string) =>
-          context
-            .crossClusterReplication!.client.callAsCurrentUser('ccr.resumeAutoFollowPattern', {
-              id: _id,
+          client.asCurrentUser.ccr
+            .resumeAutoFollowPattern({
+              name: _id,
             })
             .then(() => itemsResumed.push(_id))
-            .catch((err) => {
-              errors.push({ id: _id, error: formatError(err) });
+            .catch((error) => {
+              errors.push({ id: _id, error: handleEsError({ error, response }) });
             })
         )
       );
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 66f4ddb950ef0..5ada82049632b 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
 import { registerUpdateRoute } from './register_update_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Update auto-follow pattern', () => {
 
     registerUpdateRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,8 +33,10 @@ describe('[CCR API] Update auto-follow pattern', () => {
 
   it('should serialize the payload before sending it to Elasticsearch', async () => {
     const routeContextMock = mockRouteContext({
-      // Just echo back what we send so we can inspect it.
-      callAsCurrentUser: jest.fn().mockImplementation((endpoint, payload) => payload),
+      ccr: {
+        // Just echo back what we send so we can inspect it.
+        putAutoFollowPattern: jest.fn().mockImplementation((payload) => ({ body: payload })),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -53,7 +51,7 @@ describe('[CCR API] Update auto-follow pattern', () => {
     const response = await routeHandler(routeContextMock, request, kibanaResponseFactory);
 
     expect(response.payload).toEqual({
-      id: 'foo',
+      name: 'foo',
       body: {
         remote_cluster: 'bar1',
         leader_index_patterns: ['bar2'],
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 a3e7c3544ca37..81aaa59725e3a 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
@@ -17,7 +17,7 @@ import { RouteDependencies } from '../../../types';
 export const registerUpdateRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({
     id: schema.string(),
@@ -39,22 +39,21 @@ export const registerUpdateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
       const body = serializeAutoFollowPattern(request.body as AutoFollowPattern);
 
       try {
+        const { body: responseBody } = await client.asCurrentUser.ccr.putAutoFollowPattern({
+          name: id,
+          body,
+        });
+
         return response.ok({
-          body: await context.crossClusterReplication!.client.callAsCurrentUser(
-            'ccr.saveAutoFollowPattern',
-            { id, body }
-          ),
+          body: responseBody,
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 130adb2e0b989..600924e145039 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
@@ -14,7 +14,7 @@ import { RouteDependencies } from '../../../types';
 export const registerPermissionsRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   router.get(
     {
@@ -22,6 +22,8 @@ export const registerPermissionsRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
+
       if (!license.isEsSecurityEnabled) {
         // If security has been disabled in elasticsearch.yml. we'll just let the user use CCR
         // because permissions are irrelevant.
@@ -35,9 +37,8 @@ export const registerPermissionsRoute = ({
 
       try {
         const {
-          has_all_requested: hasPermission,
-          cluster,
-        } = await context.crossClusterReplication!.client.callAsCurrentUser('ccr.permissions', {
+          body: { has_all_requested: hasPermission, cluster },
+        } = await client.asCurrentUser.security.hasPrivileges({
           body: {
             cluster: ['manage', 'manage_ccr'],
           },
@@ -59,12 +60,8 @@ export const registerPermissionsRoute = ({
             missingClusterPrivileges,
           },
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 6636f6b1c5acc..fa8f792afc419 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerStatsRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   router.get(
     {
@@ -23,20 +23,19 @@ export const registerStatsRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
+
       try {
         const {
-          auto_follow_stats: autoFollowStats,
-        } = await context.crossClusterReplication!.client.callAsCurrentUser('ccr.stats');
+          body: { auto_follow_stats: autoFollowStats },
+        } = await client.asCurrentUser.ccr.stats();
 
         return response.ok({
+          // @ts-expect-error Once #98266 is merged, test this again.
           body: deserializeAutoFollowStats(autoFollowStats),
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 44cb62776856d..8de168e8a17d1 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
 import { registerCreateRoute } from './register_create_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Create follower index', () => {
 
     registerCreateRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,7 +33,9 @@ describe('[CCR API] Create follower index', () => {
 
   it('should return 200 status when follower index is created', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        follow: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 f44e5a749baad..9ddbf76cceed2 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
@@ -18,7 +18,7 @@ import { RouteDependencies } from '../../../types';
 export const registerCreateRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const bodySchema = schema.object({
     name: schema.string(),
@@ -44,22 +44,21 @@ export const registerCreateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { name, ...rest } = request.body;
       const body = removeEmptyFields(serializeFollowerIndex(rest as FollowerIndex));
 
       try {
+        const { body: responseBody } = await client.asCurrentUser.ccr.follow({
+          index: name,
+          body,
+        });
+
         return response.ok({
-          body: await context.crossClusterReplication!.client.callAsCurrentUser(
-            'ccr.saveFollowerIndex',
-            { name, body }
-          ),
+          body: responseBody,
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 b668cea06f90f..e4063e1e64df5 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
 import { registerFetchRoute } from './register_fetch_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Fetch all follower indices', () => {
 
     registerFetchRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,73 +33,77 @@ describe('[CCR API] Fetch all follower indices', () => {
 
   it('deserializes the response from Elasticsearch', async () => {
     const ccrInfoMockResponse = {
-      follower_indices: [
-        {
-          follower_index: 'followerIndexName',
-          remote_cluster: 'remoteCluster',
-          leader_index: 'leaderIndex',
-          status: 'active',
-          parameters: {
-            max_read_request_operation_count: 1,
-            max_outstanding_read_requests: 1,
-            max_read_request_size: '1b',
-            max_write_request_operation_count: 1,
-            max_write_request_size: '1b',
-            max_outstanding_write_requests: 1,
-            max_write_buffer_count: 1,
-            max_write_buffer_size: '1b',
-            max_retry_delay: '1s',
-            read_poll_timeout: '1s',
+      body: {
+        follower_indices: [
+          {
+            follower_index: 'followerIndexName',
+            remote_cluster: 'remoteCluster',
+            leader_index: 'leaderIndex',
+            status: 'active',
+            parameters: {
+              max_read_request_operation_count: 1,
+              max_outstanding_read_requests: 1,
+              max_read_request_size: '1b',
+              max_write_request_operation_count: 1,
+              max_write_request_size: '1b',
+              max_outstanding_write_requests: 1,
+              max_write_buffer_count: 1,
+              max_write_buffer_size: '1b',
+              max_retry_delay: '1s',
+              read_poll_timeout: '1s',
+            },
           },
-        },
-      ],
+        ],
+      },
     };
 
     // These stats correlate to the above follower indices.
     const ccrStatsMockResponse = {
-      follow_stats: {
-        indices: [
-          {
-            index: 'followerIndexName',
-            shards: [
-              {
-                shard_id: 1,
-                leader_index: 'leaderIndex',
-                leader_global_checkpoint: 1,
-                leader_max_seq_no: 1,
-                follower_global_checkpoint: 1,
-                follower_max_seq_no: 1,
-                last_requested_seq_no: 1,
-                outstanding_read_requests: 1,
-                outstanding_write_requests: 1,
-                write_buffer_operation_count: 1,
-                write_buffer_size_in_bytes: 1,
-                follower_mapping_version: 1,
-                follower_settings_version: 1,
-                total_read_time_millis: 1,
-                total_read_remote_exec_time_millis: 1,
-                successful_read_requests: 1,
-                failed_read_requests: 1,
-                operations_read: 1,
-                bytes_read: 1,
-                total_write_time_millis: 1,
-                successful_write_requests: 1,
-                failed_write_requests: 1,
-                operations_written: 1,
-                read_exceptions: 1,
-                time_since_last_read_millis: 1,
-              },
-            ],
-          },
-        ],
+      body: {
+        follow_stats: {
+          indices: [
+            {
+              index: 'followerIndexName',
+              shards: [
+                {
+                  shard_id: 1,
+                  leader_index: 'leaderIndex',
+                  leader_global_checkpoint: 1,
+                  leader_max_seq_no: 1,
+                  follower_global_checkpoint: 1,
+                  follower_max_seq_no: 1,
+                  last_requested_seq_no: 1,
+                  outstanding_read_requests: 1,
+                  outstanding_write_requests: 1,
+                  write_buffer_operation_count: 1,
+                  write_buffer_size_in_bytes: 1,
+                  follower_mapping_version: 1,
+                  follower_settings_version: 1,
+                  total_read_time_millis: 1,
+                  total_read_remote_exec_time_millis: 1,
+                  successful_read_requests: 1,
+                  failed_read_requests: 1,
+                  operations_read: 1,
+                  bytes_read: 1,
+                  total_write_time_millis: 1,
+                  successful_write_requests: 1,
+                  failed_write_requests: 1,
+                  operations_written: 1,
+                  read_exceptions: 1,
+                  time_since_last_read_millis: 1,
+                },
+              ],
+            },
+          ],
+        },
       },
     };
 
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce(ccrInfoMockResponse)
-        .mockResolvedValueOnce(ccrStatsMockResponse),
+      ccr: {
+        followInfo: jest.fn().mockResolvedValueOnce(ccrInfoMockResponse),
+        stats: jest.fn().mockResolvedValueOnce(ccrStatsMockResponse),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest();
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 c72706cf5d10d..b4d7ead75e830 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerFetchRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   router.get(
     {
@@ -23,16 +23,18 @@ export const registerFetchRoute = ({
       validate: false,
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
+
       try {
         const {
-          follower_indices: followerIndices,
-        } = await context.crossClusterReplication!.client.callAsCurrentUser('ccr.info', {
-          id: '_all',
-        });
+          body: { follower_indices: followerIndices },
+        } = await client.asCurrentUser.ccr.followInfo({ index: '_all' });
 
         const {
-          follow_stats: { indices: followerIndicesStats },
-        } = await context.crossClusterReplication!.client.callAsCurrentUser('ccr.stats');
+          body: {
+            follow_stats: { indices: followerIndicesStats },
+          },
+        } = await client.asCurrentUser.ccr.stats();
 
         const followerIndicesStatsMap = followerIndicesStats.reduce((map: any, stats: any) => {
           map[stats.index] = stats;
@@ -51,12 +53,8 @@ export const registerFetchRoute = ({
             indices: deserializeListFollowerIndices(collatedFollowerIndices),
           },
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 f5d3ecdd09e8d..493703ca6de27 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
 import { registerGetRoute } from './register_get_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Get one follower index', () => {
 
     registerGetRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,71 +33,75 @@ describe('[CCR API] Get one follower index', () => {
 
   it('should return a single resource even though ES returns an array with 1 item', async () => {
     const ccrInfoMockResponse = {
-      follower_indices: [
-        {
-          follower_index: 'followerIndexName',
-          remote_cluster: 'remoteCluster',
-          leader_index: 'leaderIndex',
-          status: 'active',
-          parameters: {
-            max_read_request_operation_count: 1,
-            max_outstanding_read_requests: 1,
-            max_read_request_size: '1b',
-            max_write_request_operation_count: 1,
-            max_write_request_size: '1b',
-            max_outstanding_write_requests: 1,
-            max_write_buffer_count: 1,
-            max_write_buffer_size: '1b',
-            max_retry_delay: '1s',
-            read_poll_timeout: '1s',
+      body: {
+        follower_indices: [
+          {
+            follower_index: 'followerIndexName',
+            remote_cluster: 'remoteCluster',
+            leader_index: 'leaderIndex',
+            status: 'active',
+            parameters: {
+              max_read_request_operation_count: 1,
+              max_outstanding_read_requests: 1,
+              max_read_request_size: '1b',
+              max_write_request_operation_count: 1,
+              max_write_request_size: '1b',
+              max_outstanding_write_requests: 1,
+              max_write_buffer_count: 1,
+              max_write_buffer_size: '1b',
+              max_retry_delay: '1s',
+              read_poll_timeout: '1s',
+            },
           },
-        },
-      ],
+        ],
+      },
     };
 
     // These stats correlate to the above follower indices.
     const ccrFollowerIndexStatsMockResponse = {
-      indices: [
-        {
-          index: 'followerIndexName',
-          shards: [
-            {
-              shard_id: 1,
-              leader_index: 'leaderIndex',
-              leader_global_checkpoint: 1,
-              leader_max_seq_no: 1,
-              follower_global_checkpoint: 1,
-              follower_max_seq_no: 1,
-              last_requested_seq_no: 1,
-              outstanding_read_requests: 1,
-              outstanding_write_requests: 1,
-              write_buffer_operation_count: 1,
-              write_buffer_size_in_bytes: 1,
-              follower_mapping_version: 1,
-              follower_settings_version: 1,
-              total_read_time_millis: 1,
-              total_read_remote_exec_time_millis: 1,
-              successful_read_requests: 1,
-              failed_read_requests: 1,
-              operations_read: 1,
-              bytes_read: 1,
-              total_write_time_millis: 1,
-              successful_write_requests: 1,
-              failed_write_requests: 1,
-              operations_written: 1,
-              read_exceptions: 1,
-              time_since_last_read_millis: 1,
-            },
-          ],
-        },
-      ],
+      body: {
+        indices: [
+          {
+            index: 'followerIndexName',
+            shards: [
+              {
+                shard_id: 1,
+                leader_index: 'leaderIndex',
+                leader_global_checkpoint: 1,
+                leader_max_seq_no: 1,
+                follower_global_checkpoint: 1,
+                follower_max_seq_no: 1,
+                last_requested_seq_no: 1,
+                outstanding_read_requests: 1,
+                outstanding_write_requests: 1,
+                write_buffer_operation_count: 1,
+                write_buffer_size_in_bytes: 1,
+                follower_mapping_version: 1,
+                follower_settings_version: 1,
+                total_read_time_millis: 1,
+                total_read_remote_exec_time_millis: 1,
+                successful_read_requests: 1,
+                failed_read_requests: 1,
+                operations_read: 1,
+                bytes_read: 1,
+                total_write_time_millis: 1,
+                successful_write_requests: 1,
+                failed_write_requests: 1,
+                operations_written: 1,
+                read_exceptions: 1,
+                time_since_last_read_millis: 1,
+              },
+            ],
+          },
+        ],
+      },
     };
 
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce(ccrInfoMockResponse)
-        .mockResolvedValueOnce(ccrFollowerIndexStatsMockResponse),
+      ccr: {
+        followInfo: jest.fn().mockResolvedValueOnce(ccrInfoMockResponse),
+        followStats: jest.fn().mockResolvedValueOnce(ccrFollowerIndexStatsMockResponse),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 cdcfff97e645d..21cb9e08a6160 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
@@ -16,7 +16,7 @@ import { RouteDependencies } from '../../../types';
 export const registerGetRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({
     id: schema.string(),
@@ -30,12 +30,13 @@ export const registerGetRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
 
       try {
         const {
-          follower_indices: followerIndices,
-        } = await context.crossClusterReplication!.client.callAsCurrentUser('ccr.info', { id });
+          body: { follower_indices: followerIndices },
+        } = await client.asCurrentUser.ccr.followInfo({ index: id });
 
         const followerIndexInfo = followerIndices && followerIndices[0];
 
@@ -48,31 +49,26 @@ export const registerGetRoute = ({
         // If this follower is paused, skip call to ES stats api since it will return 404
         if (followerIndexInfo.status === 'paused') {
           return response.ok({
+            // @ts-expect-error Once #98266 is merged, test this again.
             body: deserializeFollowerIndex({
               ...followerIndexInfo,
             }),
           });
         } else {
           const {
-            indices: followerIndicesStats,
-          } = await context.crossClusterReplication!.client.callAsCurrentUser(
-            'ccr.followerIndexStats',
-            { id }
-          );
+            body: { indices: followerIndicesStats },
+          } = await client.asCurrentUser.ccr.followStats({ index: id });
 
           return response.ok({
+            // @ts-expect-error Once #98266 is merged, test this again.
             body: deserializeFollowerIndex({
               ...followerIndexInfo,
               ...(followerIndicesStats ? followerIndicesStats[0] : {}),
             }),
           });
         }
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 2c6854390ba5f..920de2777ad2e 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense, mockError } from '../test_lib';
 import { registerPauseRoute } from './register_pause_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Pause follower index/indices', () => {
 
     registerPauseRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,7 +33,9 @@ describe('[CCR API] Pause follower index/indices', () => {
 
   it('pauses a single item', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        pauseFollow: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -51,11 +49,13 @@ describe('[CCR API] Pause follower index/indices', () => {
 
   it('pauses multiple items', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        pauseFollow: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -69,10 +69,12 @@ describe('[CCR API] Pause follower index/indices', () => {
 
   it('returns partial errors', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockRejectedValueOnce({ response: { error: {} } }),
+      ccr: {
+        pauseFollow: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockRejectedValueOnce(mockError),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 2e4e71278df0e..6c888e0a6e8bd 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerPauseRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({ id: schema.string() });
 
@@ -27,29 +27,20 @@ export const registerPauseRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
       const itemsPaused: string[] = [];
       const errors: Array<{ id: string; error: any }> = [];
 
-      const formatError = (err: any) => {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        return response.customError({ statusCode: 500, body: err });
-      };
-
       await Promise.all(
         ids.map((_id: string) =>
-          context
-            .crossClusterReplication!.client.callAsCurrentUser('ccr.pauseFollowerIndex', {
-              id: _id,
-            })
+          client.asCurrentUser.ccr
+            .pauseFollow({ index: _id })
             .then(() => itemsPaused.push(_id))
-            .catch((err) => {
-              errors.push({ id: _id, error: formatError(err) });
+            .catch((error) => {
+              errors.push({ id: _id, error: handleEsError({ error, response }) });
             })
         )
       );
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 3040bc822bf2f..1cd54a898dc39 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense, mockError } from '../test_lib';
 import { registerResumeRoute } from './register_resume_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Resume follower index/indices', () => {
 
     registerResumeRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,7 +33,9 @@ describe('[CCR API] Resume follower index/indices', () => {
 
   it('resumes a single item', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        resumeFollow: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -51,11 +49,13 @@ describe('[CCR API] Resume follower index/indices', () => {
 
   it('resumes multiple items', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        resumeFollow: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -69,10 +69,12 @@ describe('[CCR API] Resume follower index/indices', () => {
 
   it('returns partial errors', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockRejectedValueOnce({ response: { error: {} } }),
+      ccr: {
+        resumeFollow: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true })
+          .mockRejectedValueOnce(mockError),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 34f204f3b64b9..206de7d62fb38 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerResumeRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({ id: schema.string() });
 
@@ -27,29 +27,20 @@ export const registerResumeRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
       const itemsResumed: string[] = [];
       const errors: Array<{ id: string; error: any }> = [];
 
-      const formatError = (err: any) => {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        return response.customError({ statusCode: 500, body: err });
-      };
-
       await Promise.all(
         ids.map((_id: string) =>
-          context
-            .crossClusterReplication!.client.callAsCurrentUser('ccr.resumeFollowerIndex', {
-              id: _id,
-            })
+          client.asCurrentUser.ccr
+            .resumeFollow({ index: _id })
             .then(() => itemsResumed.push(_id))
-            .catch((err) => {
-              errors.push({ id: _id, error: formatError(err) });
+            .catch((error) => {
+              errors.push({ id: _id, error: handleEsError({ error, response }) });
             })
         )
       );
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 b4dfca3046512..8ef9c84594a46 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
@@ -8,9 +8,8 @@
 import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
 import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
 
-import { isEsError, License } from '../../../shared_imports';
-import { formatEsError } from '../../../lib/format_es_error';
-import { mockRouteContext } from '../test_lib';
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense, mockError } from '../test_lib';
 import { registerUnfollowRoute } from './register_unfollow_route';
 
 const httpService = httpServiceMock.createSetupContract();
@@ -23,12 +22,9 @@ describe('[CCR API] Unfollow follower index/indices', () => {
 
     registerUnfollowRoute({
       router,
-      license: {
-        guardApiRoute: (route: any) => route,
-      } as License,
+      license: mockLicense,
       lib: {
-        isEsError,
-        formatEsError,
+        handleEsError,
       },
     });
 
@@ -37,12 +33,14 @@ describe('[CCR API] Unfollow follower index/indices', () => {
 
   it('unfollows a single item', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        pauseFollow: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+        unfollow: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
+      indices: {
+        close: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+        open: jest.fn().mockResolvedValueOnce({ acknowledge: true }),
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -56,23 +54,30 @@ describe('[CCR API] Unfollow follower index/indices', () => {
 
   it('unfollows multiple items', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        // a
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        // b
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        // c
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true }),
+      ccr: {
+        pauseFollow: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true }) // a
+          .mockResolvedValueOnce({ acknowledge: true }) // b
+          .mockResolvedValueOnce({ acknowledge: true }), // c
+        unfollow: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true }) // a
+          .mockResolvedValueOnce({ acknowledge: true }) // b
+          .mockResolvedValueOnce({ acknowledge: true }), // c
+      },
+      indices: {
+        close: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true }) // a
+          .mockResolvedValueOnce({ acknowledge: true }) // b
+          .mockResolvedValueOnce({ acknowledge: true }), // c
+        open: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true }) // a
+          .mockResolvedValueOnce({ acknowledge: true }) // b
+          .mockResolvedValueOnce({ acknowledge: true }), // c
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
@@ -86,16 +91,20 @@ describe('[CCR API] Unfollow follower index/indices', () => {
 
   it('returns partial errors', async () => {
     const routeContextMock = mockRouteContext({
-      callAsCurrentUser: jest
-        .fn()
-        // a
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockResolvedValueOnce({ acknowledge: true })
-        // b
-        .mockResolvedValueOnce({ acknowledge: true })
-        .mockRejectedValueOnce({ response: { error: {} } }),
+      ccr: {
+        pauseFollow: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true }) // a
+          .mockResolvedValueOnce({ acknowledge: true }), // B
+        unfollow: jest.fn().mockResolvedValueOnce({ acknowledge: true }), // a
+      },
+      indices: {
+        close: jest
+          .fn()
+          .mockResolvedValueOnce({ acknowledge: true }) // a
+          .mockRejectedValueOnce(mockError), // b
+        open: jest.fn().mockResolvedValueOnce({ acknowledge: true }), // a
+      },
     });
 
     const request = httpServerMock.createKibanaRequest({
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 848408e14662f..e240a10df0684 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
@@ -15,7 +15,7 @@ import { RouteDependencies } from '../../../types';
 export const registerUnfollowRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({ id: schema.string() });
 
@@ -27,6 +27,7 @@ export const registerUnfollowRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
       const ids = id.split(',');
 
@@ -34,52 +35,34 @@ export const registerUnfollowRoute = ({
       const itemsNotOpen: string[] = [];
       const errors: Array<{ id: string; error: any }> = [];
 
-      const formatError = (err: any) => {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        return response.customError({ statusCode: 500, body: err });
-      };
-
       await Promise.all(
         ids.map(async (_id: string) => {
           try {
             // Try to pause follower, let it fail silently since it may already be paused
             try {
-              await context.crossClusterReplication!.client.callAsCurrentUser(
-                'ccr.pauseFollowerIndex',
-                { id: _id }
-              );
+              await client.asCurrentUser.ccr.pauseFollow({ index: _id });
             } catch (e) {
               // Swallow errors
             }
 
             // Close index
-            await context.crossClusterReplication!.client.callAsCurrentUser('indices.close', {
-              index: _id,
-            });
+            await client.asCurrentUser.indices.close({ index: _id });
 
             // Unfollow leader
-            await context.crossClusterReplication!.client.callAsCurrentUser(
-              'ccr.unfollowLeaderIndex',
-              { id: _id }
-            );
+            await client.asCurrentUser.ccr.unfollow({ index: _id });
 
             // Try to re-open the index, store failures in a separate array to surface warnings in the UI
             // This will allow users to query their index normally after unfollowing
             try {
-              await context.crossClusterReplication!.client.callAsCurrentUser('indices.open', {
-                index: _id,
-              });
+              await client.asCurrentUser.indices.open({ index: _id });
             } catch (e) {
               itemsNotOpen.push(_id);
             }
 
             // Push success
             itemsUnfollowed.push(_id);
-          } catch (err) {
-            errors.push({ id: _id, error: formatError(err) });
+          } catch (error) {
+            errors.push({ id: _id, error: handleEsError({ error, response }) });
           }
         })
       );
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
new file mode 100644
index 0000000000000..92b9c3dded08e
--- /dev/null
+++ b/x-pack/plugins/cross_cluster_replication/server/routes/api/follower_index/register_update_route.test.ts
@@ -0,0 +1,79 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { httpServiceMock, httpServerMock } from 'src/core/server/mocks';
+import { kibanaResponseFactory, RequestHandler } from 'src/core/server';
+
+import { handleEsError } from '../../../shared_imports';
+import { mockRouteContext, mockLicense } from '../test_lib';
+import { registerUpdateRoute } from './register_update_route';
+
+const httpService = httpServiceMock.createSetupContract();
+
+describe('[CCR API] Update follower index', () => {
+  let routeHandler: RequestHandler<any, any, any>;
+
+  beforeEach(() => {
+    const router = httpService.createRouter();
+
+    registerUpdateRoute({
+      router,
+      license: mockLicense,
+      lib: {
+        handleEsError,
+      },
+    });
+
+    routeHandler = router.put.mock.calls[0][1];
+  });
+
+  it('should serialize the payload before sending it to Elasticsearch', async () => {
+    const routeContextMock = mockRouteContext({
+      ccr: {
+        followInfo: jest
+          .fn()
+          .mockResolvedValueOnce({ body: { follower_indices: [{ status: 'paused' }] } }),
+        // Just echo back what we send so we can inspect it.
+        resumeFollow: jest.fn().mockImplementation((payload) => ({ body: payload })),
+      },
+    });
+
+    const request = httpServerMock.createKibanaRequest({
+      params: { id: 'foo' },
+      body: {
+        maxReadRequestOperationCount: 1,
+        maxOutstandingReadRequests: 1,
+        maxReadRequestSize: '1b',
+        maxWriteRequestOperationCount: 1,
+        maxWriteRequestSize: '1b',
+        maxOutstandingWriteRequests: 1,
+        maxWriteBufferCount: 1,
+        maxWriteBufferSize: '1b',
+        maxRetryDelay: '1s',
+        readPollTimeout: '1s',
+      },
+    });
+
+    const response = await routeHandler(routeContextMock, request, kibanaResponseFactory);
+
+    expect(response.payload).toEqual({
+      index: 'foo',
+      body: {
+        max_outstanding_read_requests: 1,
+        max_outstanding_write_requests: 1,
+        max_read_request_operation_count: 1,
+        max_read_request_size: '1b',
+        max_retry_delay: '1s',
+        max_write_buffer_count: 1,
+        max_write_buffer_size: '1b',
+        max_write_request_operation_count: 1,
+        max_write_request_size: '1b',
+        read_poll_timeout: '1s',
+      },
+    });
+  });
+});
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 933d13a0a223c..5029c8be96043 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
@@ -18,7 +18,7 @@ import { RouteDependencies } from '../../../types';
 export const registerUpdateRoute = ({
   router,
   license,
-  lib: { isEsError, formatEsError },
+  lib: { handleEsError },
 }: RouteDependencies) => {
   const paramsSchema = schema.object({ id: schema.string() });
 
@@ -44,13 +44,14 @@ export const registerUpdateRoute = ({
       },
     },
     license.guardApiRoute(async (context, request, response) => {
+      const { client } = context.core.elasticsearch;
       const { id } = request.params;
 
       // We need to first pause the follower and then resume it by passing the advanced settings
       try {
         const {
-          follower_indices: followerIndices,
-        } = await context.crossClusterReplication.client.callAsCurrentUser('ccr.info', { id });
+          body: { follower_indices: followerIndices },
+        } = await client.asCurrentUser.ccr.followInfo({ index: id });
 
         const followerIndexInfo = followerIndices && followerIndices[0];
 
@@ -63,12 +64,7 @@ export const registerUpdateRoute = ({
 
         // Pause follower if not already paused
         if (!isPaused) {
-          await context.crossClusterReplication!.client.callAsCurrentUser(
-            'ccr.pauseFollowerIndex',
-            {
-              id,
-            }
-          );
+          await client.asCurrentUser.ccr.pauseFollow({ index: id });
         }
 
         // Resume follower
@@ -76,18 +72,16 @@ export const registerUpdateRoute = ({
           serializeAdvancedSettings(request.body as FollowerIndexAdvancedSettings)
         );
 
+        const { body: responseBody } = await client.asCurrentUser.ccr.resumeFollow({
+          index: id,
+          body,
+        });
+
         return response.ok({
-          body: await context.crossClusterReplication!.client.callAsCurrentUser(
-            'ccr.resumeFollowerIndex',
-            { id, body }
-          ),
+          body: responseBody,
         });
-      } catch (err) {
-        if (isEsError(err)) {
-          return response.customError(formatEsError(err));
-        }
-        // Case: default
-        throw err;
+      } catch (error) {
+        return handleEsError({ error, response });
       }
     })
   );
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 e2aa8a478e916..3a5a317797933 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
@@ -6,19 +6,24 @@
  */
 
 import { RequestHandlerContext } from 'src/core/server';
+import { License } from '../../shared_imports';
 
-export function mockRouteContext({
-  callAsCurrentUser,
-}: {
-  callAsCurrentUser: any;
-}): RequestHandlerContext {
+export function mockRouteContext(mockedFunctions: unknown): RequestHandlerContext {
   const routeContextMock = ({
-    crossClusterReplication: {
-      client: {
-        callAsCurrentUser,
+    core: {
+      elasticsearch: {
+        client: {
+          asCurrentUser: mockedFunctions,
+        },
       },
     },
   } as unknown) as RequestHandlerContext;
 
   return routeContextMock;
 }
+
+export const mockLicense = {
+  guardApiRoute: (route: any) => route,
+} as License;
+
+export const mockError = { name: 'ResponseError', statusCode: 400 };
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 4252a2a5c32d4..e9e3ed72aed64 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 { isEsError } from '../../../../src/plugins/es_ui_shared/server';
+export { handleEsError } from '../../../../src/plugins/es_ui_shared/server';
 export { License } from '../../license_api_guard/server';
diff --git a/x-pack/plugins/cross_cluster_replication/server/types.ts b/x-pack/plugins/cross_cluster_replication/server/types.ts
index 7314fda70027f..18d2c45039eba 100644
--- a/x-pack/plugins/cross_cluster_replication/server/types.ts
+++ b/x-pack/plugins/cross_cluster_replication/server/types.ts
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import { IRouter, ILegacyScopedClusterClient, RequestHandlerContext } from 'src/core/server';
+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 { License, isEsError } from './shared_imports';
-import { formatEsError } from './lib/format_es_error';
+import { License, handleEsError } from './shared_imports';
 
 export interface SetupDependencies {
   licensing: LicensingPluginSetup;
@@ -25,24 +24,9 @@ export interface StartDependencies {
 }
 
 export interface RouteDependencies {
-  router: CcrPluginRouter;
+  router: IRouter;
   license: License;
   lib: {
-    isEsError: typeof isEsError;
-    formatEsError: typeof formatEsError;
+    handleEsError: typeof handleEsError;
   };
 }
-
-/**
- * @internal
- */
-export interface CcrRequestHandlerContext extends RequestHandlerContext {
-  crossClusterReplication: {
-    client: ILegacyScopedClusterClient;
-  };
-}
-
-/**
- * @internal
- */
-type CcrPluginRouter = IRouter<CcrRequestHandlerContext>;
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 4d97092209c67..42ff270ed44a0 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
@@ -97,11 +97,11 @@ describe('Background Search Session Management Table', () => {
 
       expect(table.find('thead th').map((node) => node.text())).toMatchInlineSnapshot(`
         Array [
-          "AppClick to sort in ascending order",
-          "NameClick to sort in ascending order",
-          "StatusClick to sort in ascending order",
-          "CreatedClick to unsort",
-          "ExpirationClick to sort in ascending order",
+          "App",
+          "Name",
+          "Status",
+          "Created",
+          "Expiration",
         ]
       `);
     });
diff --git a/x-pack/plugins/data_visualizer/README.md b/x-pack/plugins/data_visualizer/README.md
new file mode 100644
index 0000000000000..2bd11b369e785
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/README.md
@@ -0,0 +1 @@
+The data_visualizer plugin enables you to explore the fields in your data.
\ No newline at end of file
diff --git a/x-pack/plugins/data_visualizer/common/constants.ts b/x-pack/plugins/data_visualizer/common/constants.ts
new file mode 100644
index 0000000000000..7e0fe65632ae3
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/constants.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.
+ */
+
+export const UI_SETTING_MAX_FILE_SIZE = 'fileUpload:maxFileSize';
+
+export const MB = Math.pow(2, 20);
+export const MAX_FILE_SIZE = '100MB';
+export const MAX_FILE_SIZE_BYTES = 104857600; // 100MB
+
+export const ABSOLUTE_MAX_FILE_SIZE_BYTES = 1073741274; // 1GB
+export const FILE_SIZE_DISPLAY_FORMAT = '0,0.[0] b';
+
+// Value to use in the Elasticsearch index mapping meta data to identify the
+// index as having been created by the File Data Visualizer.
+export const INDEX_META_DATA_CREATED_BY = 'file-data-visualizer';
+
+export const JOB_FIELD_TYPES = {
+  BOOLEAN: 'boolean',
+  DATE: 'date',
+  GEO_POINT: 'geo_point',
+  GEO_SHAPE: 'geo_shape',
+  IP: 'ip',
+  KEYWORD: 'keyword',
+  NUMBER: 'number',
+  TEXT: 'text',
+  UNKNOWN: 'unknown',
+} as const;
+
+export const OMIT_FIELDS: string[] = ['_source', '_type', '_index', '_id', '_version', '_score'];
diff --git a/x-pack/plugins/file_data_visualizer/common/index.ts b/x-pack/plugins/data_visualizer/common/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/common/index.ts
rename to x-pack/plugins/data_visualizer/common/index.ts
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
new file mode 100644
index 0000000000000..36e8fe14b7002
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/types/field_request_config.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { JobFieldType } from './index';
+
+export interface Percentile {
+  percent: number;
+  minValue: number;
+  maxValue: number;
+}
+
+export interface FieldRequestConfig {
+  fieldName?: string;
+  type: JobFieldType;
+  cardinality: number;
+}
+
+export interface DocumentCountBuckets {
+  [key: string]: number;
+}
+
+export interface DocumentCounts {
+  buckets?: DocumentCountBuckets;
+  interval?: number;
+}
+
+export interface FieldVisStats {
+  cardinality?: number;
+  count?: number;
+  sampleCount?: number;
+  trueCount?: number;
+  falseCount?: number;
+  earliest?: number;
+  latest?: number;
+  documentCounts?: {
+    buckets?: DocumentCountBuckets;
+    interval?: number;
+  };
+  avg?: number;
+  distribution?: {
+    percentiles: Percentile[];
+    maxPercentile: number;
+    minPercentile: 0;
+  };
+  fieldName?: string;
+  isTopValuesSampled?: boolean;
+  max?: number;
+  median?: number;
+  min?: number;
+  topValues?: Array<{ key: number | string; doc_count: number }>;
+  topValuesSampleSize?: number;
+  topValuesSamplerShardSize?: number;
+  examples?: Array<string | object>;
+  timeRangeEarliest?: number;
+  timeRangeLatest?: number;
+}
diff --git a/x-pack/plugins/data_visualizer/common/types/index.ts b/x-pack/plugins/data_visualizer/common/types/index.ts
new file mode 100644
index 0000000000000..8b51142e19129
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/types/index.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 { SimpleSavedObject } from 'kibana/public';
+export type { JobFieldType } from './job_field_type';
+export type {
+  FieldRequestConfig,
+  DocumentCountBuckets,
+  DocumentCounts,
+  FieldVisStats,
+  Percentile,
+} from './field_request_config';
+export type InputData = any[];
+
+export interface DataVisualizerTableState {
+  pageSize: number;
+  pageIndex: number;
+  sortField: string;
+  sortDirection: string;
+  visibleFieldTypes: string[];
+  visibleFieldNames: string[];
+  showDistributions: boolean;
+}
+
+export type SavedSearchSavedObject = SimpleSavedObject<any>;
diff --git a/x-pack/plugins/data_visualizer/common/types/indices.ts b/x-pack/plugins/data_visualizer/common/types/indices.ts
new file mode 100644
index 0000000000000..c80b89b4e84c7
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/types/indices.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { estypes } from '@elastic/elasticsearch';
+
+export interface IndicesOptions {
+  allow_no_indices?: boolean;
+  expand_wildcards?: estypes.ExpandWildcards;
+  ignore_unavailable?: boolean;
+}
diff --git a/x-pack/plugins/data_visualizer/common/types/job_field_type.ts b/x-pack/plugins/data_visualizer/common/types/job_field_type.ts
new file mode 100644
index 0000000000000..ecb6ade035695
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/types/job_field_type.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { JOB_FIELD_TYPES } from '../constants';
+export type JobFieldType = typeof JOB_FIELD_TYPES[keyof typeof JOB_FIELD_TYPES];
diff --git a/x-pack/plugins/data_visualizer/common/types/time_field_request.ts b/x-pack/plugins/data_visualizer/common/types/time_field_request.ts
new file mode 100644
index 0000000000000..efc5a58138ae9
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/types/time_field_request.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 interface GetTimeFieldRangeResponse {
+  success: boolean;
+  start: { epoch: number; string: string };
+  end: { epoch: number; string: string };
+}
diff --git a/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts b/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.ts
new file mode 100644
index 0000000000000..bccd40ed43b0c
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/utils/datafeed_utils.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 { estypes } from '@elastic/elasticsearch';
+
+export type Datafeed = estypes.MlDatafeed;
+export type Aggregation = Record<string, estypes.AggregationsAggregationContainer>;
+
+export function getAggregations<T>(obj: any): T | undefined {
+  if (obj?.aggregations !== undefined) return obj.aggregations;
+  if (obj?.aggs !== undefined) return obj.aggs;
+  return undefined;
+}
+
+export const getDatafeedAggregations = (
+  datafeedConfig: Partial<Datafeed> | undefined
+): Aggregation | undefined => {
+  return getAggregations<Aggregation>(datafeedConfig);
+};
diff --git a/x-pack/plugins/data_visualizer/common/utils/object_utils.ts b/x-pack/plugins/data_visualizer/common/utils/object_utils.ts
new file mode 100644
index 0000000000000..537ee9202b4de
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/utils/object_utils.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.
+ */
+
+/*
+ * A type guard to check record like object structures.
+ *
+ * Examples:
+ * - `isPopulatedObject({...})`
+ *      Limits type to Record<string, unknown>
+ *
+ * - `isPopulatedObject({...}, ['attribute'])`
+ *      Limits type to Record<'attribute', unknown>
+ *
+ * - `isPopulatedObject<keyof MyInterface>({...})`
+ *      Limits type to a record with keys of the given interface.
+ *      Note that you might want to add keys from the interface to the
+ *      array of requiredAttributes to satisfy runtime requirements.
+ *      Otherwise you'd just satisfy TS requirements but might still
+ *      run into runtime issues.
+ */
+export const isPopulatedObject = <U extends string = string>(
+  arg: unknown,
+  requiredAttributes: U[] = []
+): arg is Record<U, unknown> => {
+  return (
+    typeof arg === 'object' &&
+    arg !== null &&
+    Object.keys(arg).length > 0 &&
+    (requiredAttributes.length === 0 ||
+      requiredAttributes.every((d) => ({}.hasOwnProperty.call(arg, d))))
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/common/utils/query_utils.ts b/x-pack/plugins/data_visualizer/common/utils/query_utils.ts
new file mode 100644
index 0000000000000..d2785072f419d
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/utils/query_utils.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 { estypes } from '@elastic/elasticsearch';
+/*
+ * Contains utility functions for building and processing queries.
+ */
+
+// Builds the base filter criteria used in queries,
+// adding criteria for the time range and an optional query.
+export function buildBaseFilterCriteria(
+  timeFieldName?: string,
+  earliestMs?: number,
+  latestMs?: number,
+  query?: object
+) {
+  const filterCriteria = [];
+  if (timeFieldName && earliestMs && latestMs) {
+    filterCriteria.push({
+      range: {
+        [timeFieldName]: {
+          gte: earliestMs,
+          lte: latestMs,
+          format: 'epoch_millis',
+        },
+      },
+    });
+  }
+
+  if (query) {
+    filterCriteria.push(query);
+  }
+
+  return filterCriteria;
+}
+
+// Wraps the supplied aggregations in a sampler aggregation.
+// A supplied samplerShardSize (the shard_size parameter of the sampler aggregation)
+// of less than 1 indicates no sampling, and the aggs are returned as-is.
+export function buildSamplerAggregation(
+  aggs: any,
+  samplerShardSize: number
+): Record<string, estypes.AggregationsAggregationContainer> {
+  if (samplerShardSize < 1) {
+    return aggs;
+  }
+
+  return {
+    sample: {
+      sampler: {
+        shard_size: samplerShardSize,
+      },
+      aggs,
+    },
+  };
+}
+
+// Returns the path of aggregations in the elasticsearch response, as an array,
+// depending on whether sampling is being used.
+// A supplied samplerShardSize (the shard_size parameter of the sampler aggregation)
+// of less than 1 indicates no sampling, and an empty array is returned.
+export function getSamplerAggregationsResponsePath(samplerShardSize: number): string[] {
+  return samplerShardSize > 0 ? ['sample'] : [];
+}
+
+// Returns a name which is safe to use in elasticsearch aggregations for the supplied
+// field name. Aggregation names must be alpha-numeric and can only contain '_' and '-' characters,
+// so if the supplied field names contains disallowed characters, the provided index
+// identifier is used to return a safe 'dummy' name in the format 'field_index' e.g. field_0, field_1
+export function getSafeAggregationName(fieldName: string, index: number): string {
+  return fieldName.match(/^[a-zA-Z0-9-_.]+$/) ? fieldName : `field_${index}`;
+}
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
new file mode 100644
index 0000000000000..fbe4ae5c6faf1
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/utils/runtime_field_utils.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { estypes } from '@elastic/elasticsearch';
+import { isPopulatedObject } from './object_utils';
+import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common';
+
+type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
+
+export function isRuntimeField(arg: unknown): arg is estypes.MappingRuntimeField {
+  return (
+    ((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) ||
+      (isPopulatedObject(arg, ['type', 'script']) &&
+        Object.keys(arg).length === 2 &&
+        (typeof arg.script === 'string' ||
+          (isPopulatedObject(arg.script, ['source']) &&
+            Object.keys(arg.script).length === 1 &&
+            typeof arg.script.source === 'string')))) &&
+    RUNTIME_FIELD_TYPES.includes(arg.type as RuntimeType)
+  );
+}
+
+export function isRuntimeMappings(arg: unknown): arg is estypes.MappingRuntimeFields {
+  return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d));
+}
diff --git a/x-pack/plugins/data_visualizer/common/utils/string_utils.ts b/x-pack/plugins/data_visualizer/common/utils/string_utils.ts
new file mode 100644
index 0000000000000..94515e4dd95e9
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/common/utils/string_utils.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.
+ */
+
+/**
+ * Creates a deterministic number based hash out of a string.
+ */
+export function stringHash(str: string): number {
+  let hash = 0;
+  let chr = 0;
+  if (str.length === 0) {
+    return hash;
+  }
+  for (let i = 0; i < str.length; i++) {
+    chr = str.charCodeAt(i);
+    hash = (hash << 5) - hash + chr; // eslint-disable-line no-bitwise
+    hash |= 0; // eslint-disable-line no-bitwise
+  }
+  return hash < 0 ? hash * -2 : hash;
+}
diff --git a/x-pack/plugins/data_visualizer/jest.config.js b/x-pack/plugins/data_visualizer/jest.config.js
new file mode 100644
index 0000000000000..1c4974471bd79
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/jest.config.js
@@ -0,0 +1,12 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+module.exports = {
+  preset: '@kbn/test',
+  rootDir: '../../..',
+  roots: ['<rootDir>/x-pack/plugins/data_visualizer'],
+};
diff --git a/x-pack/plugins/data_visualizer/kibana.json b/x-pack/plugins/data_visualizer/kibana.json
new file mode 100644
index 0000000000000..b024a52e64721
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/kibana.json
@@ -0,0 +1,30 @@
+{
+  "id": "dataVisualizer",
+  "version": "8.0.0",
+  "kibanaVersion": "kibana",
+  "server": true,
+  "ui": true,
+  "requiredPlugins": [
+    "data",
+    "usageCollection",
+    "embeddable",
+    "share",
+    "discover",
+    "fileUpload"
+  ],
+  "optionalPlugins": [
+    "security",
+    "maps",
+    "home",
+    "lens"
+  ],
+  "requiredBundles": [
+    "home",
+    "kibanaReact",
+    "maps",
+    "esUiShared"
+  ],
+  "extraPublicDirs": [
+    "common"
+  ]
+}
diff --git a/x-pack/plugins/data_visualizer/public/api/index.ts b/x-pack/plugins/data_visualizer/public/api/index.ts
new file mode 100644
index 0000000000000..746b43ac86e30
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/api/index.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 { lazyLoadModules } from '../lazy_load_bundle';
+import type { FileDataVisualizerSpec, IndexDataVisualizerSpec } from '../application';
+
+export async function getFileDataVisualizerComponent(): Promise<FileDataVisualizerSpec> {
+  const modules = await lazyLoadModules();
+  return modules.FileDataVisualizer;
+}
+export async function getIndexDataVisualizerComponent(): Promise<IndexDataVisualizerSpec> {
+  const modules = await lazyLoadModules();
+  return modules.IndexDataVisualizer;
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/_index.scss b/x-pack/plugins/data_visualizer/public/application/_index.scss
new file mode 100644
index 0000000000000..9d38869d6d61c
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/_index.scss
@@ -0,0 +1,2 @@
+@import 'common/components/index';
+@import 'file_data_visualizer/index';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss
new file mode 100644
index 0000000000000..f57abbbe6396b
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/_index.scss
@@ -0,0 +1,4 @@
+@import 'embedded_map/index';
+@import 'experimental_badge/index';
+@import 'stats_table/index';
+@import 'top_values/top_values';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_field_label.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_field_label.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_field_label.tsx
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
similarity index 86%
rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
index fddab3edc3ec0..e77dc853fdc52 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_form.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_form.tsx
@@ -29,7 +29,7 @@ import {
   removeCombinedFieldsFromMappings,
   removeCombinedFieldsFromPipeline,
 } from './utils';
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 interface Props {
   mappingsString: string;
@@ -110,7 +110,7 @@ export class CombinedFieldsForm extends Component<Props, State> {
       return JSON.parse(this.props.mappingsString);
     } catch (error) {
       throw new Error(
-        i18n.translate('xpack.fileDataVisualizer.combinedFieldsForm.mappingsParseError', {
+        i18n.translate('xpack.dataVisualizer.combinedFieldsForm.mappingsParseError', {
           defaultMessage: 'Error parsing mappings: {error}',
           values: { error: error.message },
         })
@@ -123,7 +123,7 @@ export class CombinedFieldsForm extends Component<Props, State> {
       return JSON.parse(this.props.pipelineString);
     } catch (error) {
       throw new Error(
-        i18n.translate('xpack.fileDataVisualizer.combinedFieldsForm.pipelineParseError', {
+        i18n.translate('xpack.dataVisualizer.combinedFieldsForm.pipelineParseError', {
           defaultMessage: 'Error parsing pipeline: {error}',
           values: { error: error.message },
         })
@@ -149,9 +149,12 @@ export class CombinedFieldsForm extends Component<Props, State> {
   };
 
   render() {
-    const geoPointLabel = i18n.translate('xpack.fileDataVisualizer.geoPointCombinedFieldLabel', {
-      defaultMessage: 'Add geo point field',
-    });
+    const geoPointLabel = i18n.translate(
+      'xpack.dataVisualizer.file.geoPointForm.combinedFieldLabel',
+      {
+        defaultMessage: 'Add geo point field',
+      }
+    );
     const panels = [
       {
         id: 0,
@@ -176,7 +179,7 @@ export class CombinedFieldsForm extends Component<Props, State> {
     ];
     return (
       <EuiFormRow
-        label={i18n.translate('xpack.fileDataVisualizer.combinedFieldsLabel', {
+        label={i18n.translate('xpack.dataVisualizer.combinedFieldsLabel', {
           defaultMessage: 'Combined fields',
         })}
       >
@@ -192,15 +195,12 @@ export class CombinedFieldsForm extends Component<Props, State> {
                     iconType="trash"
                     color="danger"
                     onClick={this.removeCombinedField.bind(null, idx)}
-                    title={i18n.translate('xpack.fileDataVisualizer.removeCombinedFieldsLabel', {
+                    title={i18n.translate('xpack.dataVisualizer.removeCombinedFieldsLabel', {
+                      defaultMessage: 'Remove combined field',
+                    })}
+                    aria-label={i18n.translate('xpack.dataVisualizer.removeCombinedFieldsLabel', {
                       defaultMessage: 'Remove combined field',
                     })}
-                    aria-label={i18n.translate(
-                      'xpack.fileDataVisualizer.removeCombinedFieldsLabel',
-                      {
-                        defaultMessage: 'Remove combined field',
-                      }
-                    )}
                   />
                 </EuiFlexItem>
               )}
@@ -216,7 +216,7 @@ export class CombinedFieldsForm extends Component<Props, State> {
                 isDisabled={this.props.isDisabled}
               >
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.addCombinedFieldsLabel"
+                  id="xpack.dataVisualizer.addCombinedFieldsLabel"
                   defaultMessage="Add combined field"
                 />
               </EuiButtonEmpty>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx
similarity index 84%
rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx
index 978383f8e5e10..a7296c372afe4 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/combined_fields_read_only_form.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/combined_fields_read_only_form.tsx
@@ -20,10 +20,10 @@ export function CombinedFieldsReadOnlyForm({
 }) {
   return combinedFields.length ? (
     <EuiFormRow
-      label={i18n.translate('xpack.fileDataVisualizer.combinedFieldsReadOnlyLabel', {
+      label={i18n.translate('xpack.dataVisualizer.combinedFieldsReadOnlyLabel', {
         defaultMessage: 'Combined fields',
       })}
-      helpText={i18n.translate('xpack.fileDataVisualizer.combinedFieldsReadOnlyHelpTextLabel', {
+      helpText={i18n.translate('xpack.dataVisualizer.combinedFieldsReadOnlyHelpTextLabel', {
         defaultMessage: 'Edit combined fields in advanced tab',
       })}
     >
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
similarity index 90%
rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
index 578d22384be33..f6cfcc32e733a 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/geo_point.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/geo_point.tsx
@@ -29,7 +29,7 @@ import {
   getFieldNames,
   getNameCollisionMsg,
 } from './utils';
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 interface Props {
   addCombinedField: (combinedField: CombinedField) => void;
@@ -119,7 +119,7 @@ export class GeoPointForm extends Component<Props, State> {
     return (
       <Fragment>
         <EuiFormRow
-          label={i18n.translate('xpack.fileDataVisualizer.geoPointForm.latFieldLabel', {
+          label={i18n.translate('xpack.dataVisualizer.file.geoPointForm.latFieldLabel', {
             defaultMessage: 'Latitude field',
           })}
         >
@@ -131,7 +131,7 @@ export class GeoPointForm extends Component<Props, State> {
         </EuiFormRow>
 
         <EuiFormRow
-          label={i18n.translate('xpack.fileDataVisualizer.geoPointForm.lonFieldLabel', {
+          label={i18n.translate('xpack.dataVisualizer.file.geoPointForm.lonFieldLabel', {
             defaultMessage: 'Longitude field',
           })}
         >
@@ -143,7 +143,7 @@ export class GeoPointForm extends Component<Props, State> {
         </EuiFormRow>
 
         <EuiFormRow
-          label={i18n.translate('xpack.fileDataVisualizer.geoPointForm.geoPointFieldLabel', {
+          label={i18n.translate('xpack.dataVisualizer.file.geoPointForm.geoPointFieldLabel', {
             defaultMessage: 'Geo point field',
           })}
           isInvalid={this.state.geoPointFieldError !== ''}
@@ -154,7 +154,7 @@ export class GeoPointForm extends Component<Props, State> {
             onChange={this.onGeoPointFieldChange}
             isInvalid={this.state.geoPointFieldError !== ''}
             aria-label={i18n.translate(
-              'xpack.fileDataVisualizer.geoPointForm.geoPointFieldAriaLabel',
+              'xpack.dataVisualizer.file.geoPointForm.geoPointFieldAriaLabel',
               {
                 defaultMessage: 'Geo point field, required field',
               }
@@ -179,7 +179,7 @@ export class GeoPointForm extends Component<Props, State> {
             onClick={this.onSubmit}
           >
             <FormattedMessage
-              id="xpack.fileDataVisualizer.geoPointForm.submitButtonLabel"
+              id="xpack.dataVisualizer.file.geoPointForm.submitButtonLabel"
               defaultMessage="Add"
             />
           </EuiButton>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/types.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/types.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/types.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/types.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.test.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.test.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.test.ts
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
new file mode 100644
index 0000000000000..e021de5e5beca
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/combined_fields/utils.ts
@@ -0,0 +1,175 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { cloneDeep } from 'lodash';
+import uuid from 'uuid/v4';
+import { CombinedField } from './types';
+import {
+  FindFileStructureResponse,
+  IngestPipeline,
+  Mappings,
+} from '../../../../../../file_upload/common';
+
+const COMMON_LAT_NAMES = ['latitude', 'lat'];
+const COMMON_LON_NAMES = ['longitude', 'long', 'lon'];
+
+export function getDefaultCombinedFields(results: FindFileStructureResponse) {
+  const combinedFields: CombinedField[] = [];
+  const geoPointField = getGeoPointField(results);
+  if (geoPointField) {
+    combinedFields.push(geoPointField);
+  }
+  return combinedFields;
+}
+
+export function addCombinedFieldsToMappings(
+  mappings: Mappings,
+  combinedFields: CombinedField[]
+): Mappings {
+  const updatedMappings = { ...mappings };
+  combinedFields.forEach((combinedField) => {
+    updatedMappings.properties[combinedField.combinedFieldName] = {
+      type: combinedField.mappingType,
+    };
+  });
+  return updatedMappings;
+}
+
+export function removeCombinedFieldsFromMappings(
+  mappings: Mappings,
+  combinedFields: CombinedField[]
+) {
+  const updatedMappings = { ...mappings };
+  combinedFields.forEach((combinedField) => {
+    delete updatedMappings.properties[combinedField.combinedFieldName];
+  });
+  return updatedMappings;
+}
+
+export function addCombinedFieldsToPipeline(
+  pipeline: IngestPipeline,
+  combinedFields: CombinedField[]
+) {
+  const updatedPipeline = cloneDeep(pipeline);
+  combinedFields.forEach((combinedField) => {
+    updatedPipeline.processors.push({
+      set: {
+        field: combinedField.combinedFieldName,
+        value: combinedField.fieldNames
+          .map((fieldName) => {
+            return `{{${fieldName}}}`;
+          })
+          .join(combinedField.delimiter),
+      },
+    });
+  });
+  return updatedPipeline;
+}
+
+export function removeCombinedFieldsFromPipeline(
+  pipeline: IngestPipeline,
+  combinedFields: CombinedField[]
+) {
+  return {
+    ...pipeline,
+    processors: pipeline.processors.filter((processor) => {
+      return 'set' in processor
+        ? !combinedFields.some((combinedField) => {
+            return processor.set.field === combinedField.combinedFieldName;
+          })
+        : true;
+    }),
+  };
+}
+
+export function isWithinLatRange(
+  fieldName: string,
+  fieldStats: FindFileStructureResponse['field_stats']
+) {
+  return (
+    fieldName in fieldStats &&
+    'max_value' in fieldStats[fieldName] &&
+    fieldStats[fieldName]!.max_value! <= 90 &&
+    'min_value' in fieldStats[fieldName] &&
+    fieldStats[fieldName]!.min_value! >= -90
+  );
+}
+
+export function isWithinLonRange(
+  fieldName: string,
+  fieldStats: FindFileStructureResponse['field_stats']
+) {
+  return (
+    fieldName in fieldStats &&
+    'max_value' in fieldStats[fieldName] &&
+    fieldStats[fieldName]!.max_value! <= 180 &&
+    'min_value' in fieldStats[fieldName] &&
+    fieldStats[fieldName]!.min_value! >= -180
+  );
+}
+
+export function createGeoPointCombinedField(
+  latField: string,
+  lonField: string,
+  geoPointField: string
+): CombinedField {
+  return {
+    mappingType: 'geo_point',
+    delimiter: ',',
+    combinedFieldName: geoPointField,
+    fieldNames: [latField, lonField],
+  };
+}
+
+export function getNameCollisionMsg(name: string) {
+  return i18n.translate('xpack.dataVisualizer.nameCollisionMsg', {
+    defaultMessage: '"{name}" already exists, please provide a unique name',
+    values: { name },
+  });
+}
+
+export function getFieldNames(results: FindFileStructureResponse): string[] {
+  return results.column_names !== undefined
+    ? results.column_names
+    : Object.keys(results.field_stats);
+}
+
+function getGeoPointField(results: FindFileStructureResponse) {
+  const fieldNames = getFieldNames(results);
+
+  const latField = fieldNames.find((columnName) => {
+    return (
+      COMMON_LAT_NAMES.includes(columnName.toLowerCase()) &&
+      isWithinLatRange(columnName, results.field_stats)
+    );
+  });
+
+  const lonField = fieldNames.find((columnName) => {
+    return (
+      COMMON_LON_NAMES.includes(columnName.toLowerCase()) &&
+      isWithinLonRange(columnName, results.field_stats)
+    );
+  });
+
+  if (!latField || !lonField) {
+    return null;
+  }
+
+  const combinedFieldNames = [
+    'location',
+    'point_location',
+    `${latField}_${lonField}`,
+    `location_${uuid()}`,
+  ];
+  // Use first combinedFieldNames that does not have a naming collision
+  const geoPointField = combinedFieldNames.find((name) => {
+    return !fieldNames.includes(name);
+  });
+
+  return geoPointField ? createGeoPointCombinedField(latField, lonField, geoPointField) : null;
+}
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
new file mode 100644
index 0000000000000..f6f53f40d6b9e
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/date_picker_wrapper.tsx
@@ -0,0 +1,172 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useCallback, useEffect, useMemo, useState } from 'react';
+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 { useUrlState } from '../../util/url_state';
+import { useDataVisualizerKibana } from '../../../kibana_context';
+import { dataVisualizerTimefilterRefresh$ } from '../../../index_data_visualizer/services/timefilter_refresh_service';
+
+interface TimePickerQuickRange {
+  from: string;
+  to: string;
+  display: string;
+}
+
+interface Duration {
+  start: string;
+  end: string;
+}
+
+interface RefreshInterval {
+  pause: boolean;
+  value: number;
+}
+
+function getRecentlyUsedRangesFactory(timeHistory: TimeHistoryContract) {
+  return function (): Duration[] {
+    return (
+      timeHistory.get()?.map(({ from, to }: TimeRange) => {
+        return {
+          start: from,
+          end: to,
+        };
+      }) ?? []
+    );
+  };
+}
+
+function updateLastRefresh(timeRange: OnRefreshProps) {
+  dataVisualizerTimefilterRefresh$.next({ lastRefresh: Date.now(), timeRange });
+}
+
+export const DatePickerWrapper: FC = () => {
+  const { services } = useDataVisualizerKibana();
+  const config = services.uiSettings;
+  const { timefilter, history } = services.data.query.timefilter;
+
+  const [globalState, setGlobalState] = useUrlState('_g');
+  const getRecentlyUsedRanges = getRecentlyUsedRangesFactory(history);
+
+  const refreshInterval: RefreshInterval =
+    globalState?.refreshInterval ?? timefilter.getRefreshInterval();
+
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  const setRefreshInterval = useCallback(
+    debounce((refreshIntervalUpdate: RefreshInterval) => {
+      setGlobalState('refreshInterval', refreshIntervalUpdate, true);
+    }, 200),
+    [setGlobalState]
+  );
+
+  const [time, setTime] = useState(timefilter.getTime());
+  const [recentlyUsedRanges, setRecentlyUsedRanges] = useState(getRecentlyUsedRanges());
+  const [isAutoRefreshSelectorEnabled, setIsAutoRefreshSelectorEnabled] = useState(
+    timefilter.isAutoRefreshSelectorEnabled()
+  );
+  const [isTimeRangeSelectorEnabled, setIsTimeRangeSelectorEnabled] = useState(
+    timefilter.isTimeRangeSelectorEnabled()
+  );
+
+  const dateFormat = config.get('dateFormat');
+  const timePickerQuickRanges = config.get<TimePickerQuickRange[]>(
+    UI_SETTINGS.TIMEPICKER_QUICK_RANGES
+  );
+
+  const commonlyUsedRanges = useMemo(
+    () =>
+      timePickerQuickRanges.map(({ from, to, display }) => ({
+        start: from,
+        end: to,
+        label: display,
+      })),
+    [timePickerQuickRanges]
+  );
+
+  useEffect(() => {
+    const subscriptions = new Subscription();
+    const refreshIntervalUpdate$ = timefilter.getRefreshIntervalUpdate$();
+    if (refreshIntervalUpdate$ !== undefined) {
+      subscriptions.add(
+        refreshIntervalUpdate$.subscribe((r) => {
+          setRefreshInterval(timefilter.getRefreshInterval());
+        })
+      );
+    }
+    const timeUpdate$ = timefilter.getTimeUpdate$();
+    if (timeUpdate$ !== undefined) {
+      subscriptions.add(
+        timeUpdate$.subscribe((v) => {
+          setTime(timefilter.getTime());
+        })
+      );
+    }
+    const enabledUpdated$ = timefilter.getEnabledUpdated$();
+    if (enabledUpdated$ !== undefined) {
+      subscriptions.add(
+        enabledUpdated$.subscribe((w) => {
+          setIsAutoRefreshSelectorEnabled(timefilter.isAutoRefreshSelectorEnabled());
+          setIsTimeRangeSelectorEnabled(timefilter.isTimeRangeSelectorEnabled());
+        })
+      );
+    }
+
+    return function cleanup() {
+      subscriptions.unsubscribe();
+    };
+  }, [setRefreshInterval, timefilter]);
+
+  function updateFilter({ start, end }: Duration) {
+    const newTime = { from: start, to: end };
+    // Update timefilter for controllers listening for changes
+    timefilter.setTime(newTime);
+    setTime(newTime);
+    setRecentlyUsedRanges(getRecentlyUsedRanges());
+  }
+
+  function updateInterval({
+    isPaused: pause,
+    refreshInterval: value,
+  }: {
+    isPaused: boolean;
+    refreshInterval: number;
+  }) {
+    setRefreshInterval({ pause, value });
+  }
+
+  /**
+   * Enforce pause when it's set to false with 0 refresh interval.
+   */
+  const isPaused = refreshInterval.pause || (!refreshInterval.pause && !refreshInterval.value);
+
+  return isAutoRefreshSelectorEnabled || isTimeRangeSelectorEnabled ? (
+    <div className="mlNavigationMenu__datePickerWrapper">
+      <EuiSuperDatePicker
+        start={time.from}
+        end={time.to}
+        isPaused={isPaused}
+        isAutoRefreshOnly={!isTimeRangeSelectorEnabled}
+        refreshInterval={refreshInterval.value}
+        onTimeChange={updateFilter}
+        onRefresh={updateLastRefresh}
+        onRefreshChange={updateInterval}
+        recentlyUsedRanges={recentlyUsedRanges}
+        dateFormat={dateFormat}
+        commonlyUsedRanges={commonlyUsedRanges}
+      />
+    </div>
+  ) : null;
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/index.ts
new file mode 100644
index 0000000000000..232f6c65d2b64
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/date_picker_wrapper/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 { DatePickerWrapper } from './date_picker_wrapper';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/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
similarity index 87%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/document_count_chart.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/document_count_chart.tsx
index 4c8740cc76b6f..34faed01f613e 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/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
@@ -41,9 +41,12 @@ export const DocumentCountChart: FC<Props> = ({
   timeRangeLatest,
   interval,
 }) => {
-  const seriesName = i18n.translate('xpack.ml.fieldDataCard.documentCountChart.seriesLabel', {
-    defaultMessage: 'document count',
-  });
+  const seriesName = i18n.translate(
+    'xpack.dataVisualizer.dataGrid.field.documentCountChart.seriesLabel',
+    {
+      defaultMessage: 'document count',
+    }
+  );
 
   const xDomain = {
     min: timeRangeEarliest,
@@ -65,10 +68,11 @@ export const DocumentCountChart: FC<Props> = ({
       ];
     }
     return chartPoints;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [chartPoints, timeRangeEarliest, timeRangeLatest, interval]);
 
   return (
-    <div style={{ width: width ?? '100%' }} data-test-subj="mlFieldDataDocumentCountChart">
+    <div style={{ width: width ?? '100%' }} data-test-subj="dataVisualizerDocumentCountChart">
       <Chart
         size={{
           width: '100%',
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/document_count_chart/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_chart/index.ts
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx
similarity index 85%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx
index 588d85f24a023..d49dbdc7cb446 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/document_count_content.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/document_count_content.tsx
@@ -6,9 +6,9 @@
  */
 
 import React, { FC } from 'react';
-import { DocumentCountChart, DocumentCountChartPoint } from '../document_count_chart';
-import { TotalCountHeader } from '../../total_count_header';
-import { FieldVisConfig, FileBasedFieldVisConfig } from '../../../../stats_table/types';
+import { DocumentCountChart, DocumentCountChartPoint } from './document_count_chart';
+import { FieldVisConfig, FileBasedFieldVisConfig } from '../stats_table/types';
+import { TotalCountHeader } from './total_count_header';
 
 export interface Props {
   config?: FieldVisConfig | FileBasedFieldVisConfig;
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/index.ts
new file mode 100644
index 0000000000000..696bc71274441
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_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 { DocumentCountContent } from './document_count_content';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/total_count_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx
similarity index 75%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/total_count_header.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx
index 24a89ec070fe7..387af8b695f94 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/total_count_header.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/document_count_content/total_count_header.tsx
@@ -12,15 +12,15 @@ import React from 'react';
 export const TotalCountHeader = ({ totalCount }: { totalCount: number }) => {
   return (
     <EuiFlexItem>
-      <EuiText size="s" data-test-subj="mlDataVisualizerTotalDocCountHeader">
+      <EuiText size="s" data-test-subj="dataVisualizerTotalDocCountHeader">
         <FormattedMessage
-          id="xpack.ml.datavisualizer.searchPanel.totalDocCountLabel"
+          id="xpack.dataVisualizer.searchPanel.totalDocCountLabel"
           defaultMessage="Total documents: {strongTotalCount}"
           values={{
             strongTotalCount: (
-              <strong data-test-subj="mlDataVisualizerTotalDocCount">
+              <strong data-test-subj="dataVisualizerTotalDocCount">
                 <FormattedMessage
-                  id="xpack.ml.datavisualizer.searchPanel.totalDocCountNumber"
+                  id="xpack.dataVisualizer.searchPanel.totalDocCountNumber"
                   defaultMessage="{totalCount, plural, one {#} other {#}}"
                   values={{ totalCount }}
                 />
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_embedded_map.scss b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_embedded_map.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_embedded_map.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
similarity index 89%
rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
index 42bc5ebf61227..29131b4a3372a 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/embedded_map.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/embedded_map.tsx
@@ -8,22 +8,22 @@
 import React, { useEffect, useRef, useState } from 'react';
 
 import { htmlIdGenerator } from '@elastic/eui';
-import { LayerDescriptor } from '../../../../../maps/common/descriptor_types';
-import { INITIAL_LOCATION } from '../../../../../maps/common/constants';
+import { LayerDescriptor } from '../../../../../../maps/common/descriptor_types';
+import { INITIAL_LOCATION } from '../../../../../../maps/common/constants';
 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 '../../../../../../maps/public/embeddable';
+import { MAP_SAVED_OBJECT_TYPE, RenderTooltipContentParams } from '../../../../../../maps/public';
 import {
   EmbeddableFactory,
   ErrorEmbeddable,
   isErrorEmbeddable,
   ViewMode,
-} from '../../../../../../../src/plugins/embeddable/public';
-import { useFileDataVisualizerKibana } from '../../kibana_context';
+} from '../../../../../../../../src/plugins/embeddable/public';
+import { useDataVisualizerKibana } from '../../../kibana_context';
 
 export function EmbeddedMapComponent({
   layerList,
@@ -41,7 +41,7 @@ export function EmbeddedMapComponent({
 
   const {
     services: { embeddable: embeddablePlugin, maps: mapsPlugin },
-  } = useFileDataVisualizerKibana();
+  } = useDataVisualizerKibana();
 
   const factory:
     | EmbeddableFactory<MapEmbeddableInput, MapEmbeddableOutput, MapEmbeddable>
@@ -76,10 +76,6 @@ export function EmbeddedMapComponent({
         attributes: { title: '' },
         filters: [],
         hidePanelTitles: true,
-        refreshConfig: {
-          value: 0,
-          pause: false,
-        },
         viewMode: ViewMode.VIEW,
         isLayerTOCOpen: false,
         hideFilterActions: true,
@@ -147,7 +143,7 @@ export function EmbeddedMapComponent({
 
   return (
     <div
-      data-test-subj="mlEmbeddedMapContent"
+      data-test-subj="dataVisualizerEmbeddedMapContent"
       className="embeddedMapContent"
       ref={embeddableRoot}
     />
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/embedded_map/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/embedded_map/index.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx
new file mode 100644
index 0000000000000..296820479437c
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/examples_list.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+
+import { EuiListGroup, EuiListGroupItem } from '@elastic/eui';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header';
+interface Props {
+  examples: Array<string | object>;
+}
+
+export const ExamplesList: FC<Props> = ({ examples }) => {
+  if (examples === undefined || examples === null || !Array.isArray(examples)) {
+    return null;
+  }
+  let examplesContent;
+  if (examples.length === 0) {
+    examplesContent = (
+      <FormattedMessage
+        id="xpack.dataVisualizer.dataGrid.field.examplesList.noExamplesMessage"
+        defaultMessage="No examples were obtained for this field"
+      />
+    );
+  } else {
+    examplesContent = examples.map((example, i) => {
+      return (
+        <EuiListGroupItem
+          className="fieldDataCard__codeContent"
+          size="s"
+          key={`example_${i}`}
+          label={typeof example === 'string' ? example : JSON.stringify(example)}
+        />
+      );
+    });
+  }
+
+  return (
+    <div data-test-subj="dataVisualizerFieldDataExamplesList">
+      <ExpandedRowFieldHeader>
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.field.examplesList.title"
+          defaultMessage="{numExamples, plural, one {Value} other {Examples}}"
+          values={{
+            numExamples: examples.length,
+          }}
+        />
+      </ExpandedRowFieldHeader>
+      <EuiListGroup showToolTips={true} maxWidth={'s'} gutterSize={'none'} flush={true}>
+        {examplesContent}
+      </EuiListGroup>
+    </div>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/examples_list/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/examples_list/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/examples_list/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx
similarity index 92%
rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx
index 620bcfef8ff6c..4517d62ec2aa1 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/file_based_expanded_row.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/file_based_expanded_row.tsx
@@ -16,7 +16,7 @@ import {
   NumberContent,
 } from '../stats_table/components/field_data_expanded_row';
 import { GeoPointContent } from './geo_point_content/geo_point_content';
-import { JOB_FIELD_TYPES } from '../../../../common';
+import { JOB_FIELD_TYPES } from '../../../../../common';
 import type { FileBasedFieldVisConfig } from '../stats_table/types/field_vis_config';
 
 export const FileBasedDataVisualizerExpandedRow = ({ item }: { item: FileBasedFieldVisConfig }) => {
@@ -54,7 +54,7 @@ export const FileBasedDataVisualizerExpandedRow = ({ item }: { item: FileBasedFi
   return (
     <div
       className="dataVisualizerFieldExpandedRow"
-      data-test-subj={`mlDataVisualizerFieldExpandedRow-${fieldName}`}
+      data-test-subj={`dataVisualizerFieldExpandedRow-${fieldName}`}
     >
       {getCardContent()}
     </div>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/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
similarity index 96%
rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/format_utils.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/format_utils.ts
index 69e361aba9bca..ddc9255b4834d 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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
@@ -8,7 +8,7 @@
 import { Feature, Point } from 'geojson';
 import { euiPaletteColorBlind } from '@elastic/eui';
 import { DEFAULT_GEO_REGEX } from './geo_point_content';
-import { SOURCE_TYPES } from '../../../../../../maps/common/constants';
+import { SOURCE_TYPES } from '../../../../../../../maps/common/constants';
 
 export const convertWKTGeoToLonLat = (
   value: string | number
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx
new file mode 100644
index 0000000000000..b732e542658b5
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/geo_point_content.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useMemo } from 'react';
+
+import { EuiFlexItem } from '@elastic/eui';
+import { Feature, Point } from 'geojson';
+import type { FieldDataRowProps } from '../../stats_table/types/field_data_row';
+import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats';
+import { EmbeddedMapComponent } from '../../embedded_map';
+import { convertWKTGeoToLonLat, getGeoPointsLayer } from './format_utils';
+import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content';
+import { ExamplesList } from '../../examples_list';
+
+export const DEFAULT_GEO_REGEX = RegExp('(?<lat>.+) (?<lon>.+)');
+
+export const GeoPointContent: FC<FieldDataRowProps> = ({ config }) => {
+  const formattedResults = useMemo(() => {
+    const { stats } = config;
+
+    if (stats === undefined || stats.topValues === undefined) return null;
+    if (Array.isArray(stats.topValues)) {
+      const geoPointsFeatures: Array<Feature<Point>> = [];
+
+      // reformatting the top values from POINT (-2.359207 51.37837) to (-2.359207, 51.37837)
+      const formattedExamples = [];
+
+      for (let i = 0; i < stats.topValues.length; i++) {
+        const value = stats.topValues[i];
+        const coordinates = convertWKTGeoToLonLat(value.key);
+        if (coordinates) {
+          const formattedGeoPoint = `(${coordinates.lat}, ${coordinates.lon})`;
+          formattedExamples.push(coordinates);
+
+          geoPointsFeatures.push({
+            type: 'Feature',
+            id: `fileDataVisualizer-${config.fieldName}-${i}`,
+            geometry: {
+              type: 'Point',
+              coordinates: [coordinates.lat, coordinates.lon],
+            },
+            properties: {
+              value: formattedGeoPoint,
+              count: value.doc_count,
+            },
+          });
+        }
+      }
+
+      if (geoPointsFeatures.length > 0) {
+        return {
+          examples: formattedExamples,
+          layerList: [getGeoPointsLayer(geoPointsFeatures)],
+        };
+      }
+    }
+  }, [config]);
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerGeoPointContent'}>
+      <DocumentStatsTable config={config} />
+      {formattedResults && Array.isArray(formattedResults.examples) && (
+        <EuiFlexItem>
+          <ExamplesList examples={formattedResults.examples} />
+        </EuiFlexItem>
+      )}
+      {formattedResults && Array.isArray(formattedResults.layerList) && (
+        <EuiFlexItem
+          className={'dataVisualizerMapWrapper'}
+          data-test-subj={'dataVisualizerEmbeddedMap'}
+        >
+          <EmbeddedMapComponent layerList={formattedResults.layerList} />
+        </EuiFlexItem>
+      )}
+    </ExpandedRowContent>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content/index.ts
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
new file mode 100644
index 0000000000000..b4c8c3c22f5a9
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/geo_point_content_with_map.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, { FC, useEffect, useState } from 'react';
+import { EuiFlexItem } from '@elastic/eui';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+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';
+import { ExamplesList } from '../../examples_list';
+import { FieldVisConfig } from '../../stats_table/types';
+import { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types';
+import { useDataVisualizerKibana } from '../../../../kibana_context';
+import { JOB_FIELD_TYPES } from '../../../../../../common';
+import { ES_GEO_FIELD_TYPE } from '../../../../../../../maps/common';
+import { EmbeddedMapComponent } from '../../embedded_map';
+
+export const GeoPointContentWithMap: FC<{
+  config: FieldVisConfig;
+  indexPattern: IndexPattern | undefined;
+  combinedQuery: CombinedQuery;
+}> = ({ config, indexPattern, combinedQuery }) => {
+  const { stats } = config;
+  const [layerList, setLayerList] = useState<LayerDescriptor[]>([]);
+  const {
+    services: { maps: mapsPlugin },
+  } = useDataVisualizerKibana();
+
+  // Update the layer list  with updated geo points upon refresh
+  useEffect(() => {
+    async function updateIndexPatternSearchLayer() {
+      if (
+        indexPattern?.id !== undefined &&
+        config !== undefined &&
+        config.fieldName !== undefined &&
+        (config.type === JOB_FIELD_TYPES.GEO_POINT || config.type === JOB_FIELD_TYPES.GEO_SHAPE)
+      ) {
+        const params = {
+          indexPatternId: indexPattern.id,
+          geoFieldName: config.fieldName,
+          geoFieldType: config.type as ES_GEO_FIELD_TYPE,
+          query: {
+            query: combinedQuery.searchString,
+            language: combinedQuery.searchQueryLanguage,
+          },
+        };
+        const searchLayerDescriptor = mapsPlugin
+          ? await mapsPlugin.createLayerDescriptors.createESSearchSourceLayerDescriptor(params)
+          : null;
+        if (searchLayerDescriptor) {
+          setLayerList([...layerList, searchLayerDescriptor]);
+        }
+      }
+    }
+    updateIndexPatternSearchLayer();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [indexPattern, combinedQuery, config, mapsPlugin]);
+
+  if (stats?.examples === undefined) return null;
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerIndexBasedMapContent'}>
+      <DocumentStatsTable config={config} />
+
+      <EuiFlexItem style={{ maxWidth: '50%' }}>
+        <ExamplesList examples={stats.examples} />
+      </EuiFlexItem>
+      <EuiFlexItem className={'dataVisualizerMapWrapper'}>
+        <EmbeddedMapComponent layerList={layerList} />
+      </EuiFlexItem>
+    </ExpandedRowContent>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/index.ts
new file mode 100644
index 0000000000000..c40fcfa38fb17
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/geo_point_content_with_map/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 { GeoPointContentWithMap } from './geo_point_content_with_map';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index.ts
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
new file mode 100644
index 0000000000000..6406012a0540b
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/expanded_row/index_based_expanded_row.tsx
@@ -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 React from 'react';
+import { GeoPointContentWithMap } from './geo_point_content_with_map';
+import { JOB_FIELD_TYPES } from '../../../../../common';
+import {
+  BooleanContent,
+  DateContent,
+  IpContent,
+  KeywordContent,
+  NumberContent,
+  OtherContent,
+  TextContent,
+} from '../stats_table/components/field_data_expanded_row';
+import { NotInDocsContent } from '../not_in_docs_content';
+import { FieldVisConfig } from '../stats_table/types';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { CombinedQuery } from '../../../index_data_visualizer/types/combined_query';
+import { LoadingIndicator } from '../loading_indicator';
+
+export const IndexBasedDataVisualizerExpandedRow = ({
+  item,
+  indexPattern,
+  combinedQuery,
+}: {
+  item: FieldVisConfig;
+  indexPattern: IndexPattern | undefined;
+  combinedQuery: CombinedQuery;
+}) => {
+  const config = item;
+  const { loading, type, existsInDocs, fieldName } = config;
+
+  function getCardContent() {
+    if (existsInDocs === false) {
+      return <NotInDocsContent />;
+    }
+
+    switch (type) {
+      case JOB_FIELD_TYPES.NUMBER:
+        return <NumberContent config={config} />;
+
+      case JOB_FIELD_TYPES.BOOLEAN:
+        return <BooleanContent config={config} />;
+
+      case JOB_FIELD_TYPES.DATE:
+        return <DateContent config={config} />;
+
+      case JOB_FIELD_TYPES.GEO_POINT:
+      case JOB_FIELD_TYPES.GEO_SHAPE:
+        return (
+          <GeoPointContentWithMap
+            config={config}
+            indexPattern={indexPattern}
+            combinedQuery={combinedQuery}
+          />
+        );
+
+      case JOB_FIELD_TYPES.IP:
+        return <IpContent config={config} />;
+
+      case JOB_FIELD_TYPES.KEYWORD:
+        return <KeywordContent config={config} />;
+
+      case JOB_FIELD_TYPES.TEXT:
+        return <TextContent config={config} />;
+
+      default:
+        return <OtherContent config={config} />;
+    }
+  }
+
+  return (
+    <div
+      className="dataVisualizerFieldExpandedRow"
+      data-test-subj={`dataVisualizerFieldExpandedRow-${fieldName}`}
+    >
+      {loading === true ? <LoadingIndicator /> : getCardContent()}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_experimental_badge.scss b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_experimental_badge.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_experimental_badge.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx
similarity index 90%
rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx
index a067cb198914e..9c39ee54a2a86 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/experimental_badge.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/experimental_badge.tsx
@@ -17,7 +17,7 @@ export const ExperimentalBadge: FC<{ tooltipContent: string }> = ({ tooltipConte
         className="experimental-badge"
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.experimentalBadge.experimentalLabel"
+            id="xpack.dataVisualizer.experimentalBadge.experimentalLabel"
             defaultMessage="Experimental"
           />
         }
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/experimental_badge/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/experimental_badge/index.ts
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/field_count_panel.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx
similarity index 78%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/field_count_panel.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx
index 9ff3d81fc3918..c79ed4ade7092 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/field_count_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/field_count_panel.tsx
@@ -8,14 +8,11 @@
 import { EuiFlexGroup, EuiFlexItem, EuiSwitch } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { FC } from 'react';
-import {
-  MetricFieldsCount,
-  TotalFieldsCount,
-} from '../../../stats_table/components/field_count_stats';
 import type {
-  TotalFieldsCountProps,
   MetricFieldsCountProps,
-} from '../../../stats_table/components/field_count_stats';
+  TotalFieldsCountProps,
+} from '../stats_table/components/field_count_stats';
+import { MetricFieldsCount, TotalFieldsCount } from '../stats_table/components/field_count_stats';
 
 interface Props extends TotalFieldsCountProps, MetricFieldsCountProps {
   showEmptyFields: boolean;
@@ -32,16 +29,16 @@ export const FieldCountPanel: FC<Props> = ({
       alignItems="center"
       gutterSize="xs"
       style={{ marginLeft: 4 }}
-      data-test-subj="mlDataVisualizerFieldCountPanel"
+      data-test-subj="dataVisualizerFieldCountPanel"
     >
       <TotalFieldsCount fieldsCountStats={fieldsCountStats} />
       <MetricFieldsCount metricsStats={metricsStats} />
       <EuiFlexItem>
         <EuiSwitch
-          data-test-subj="mlDataVisualizerShowEmptyFieldsSwitch"
+          data-test-subj="dataVisualizerShowEmptyFieldsSwitch"
           label={
             <FormattedMessage
-              id="xpack.ml.dataVisualizer.searchPanel.showEmptyFields"
+              id="xpack.dataVisualizer.searchPanel.showEmptyFields"
               defaultMessage="Show empty fields"
             />
           }
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/index.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_count_panel/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_count_panel/index.ts
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
new file mode 100644
index 0000000000000..414c72c33f057
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/actions.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 { i18n } from '@kbn/i18n';
+import { Action } from '@elastic/eui/src/components/basic_table/action_types';
+import { getCompatibleLensDataType, getLensAttributes } from './lens_utils';
+import { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
+import { FieldVisConfig } from '../../stats_table/types';
+import { LensPublicStart } from '../../../../../../../lens/public';
+export function getActions(
+  indexPattern: IndexPattern,
+  lensPlugin: LensPublicStart,
+  combinedQuery: CombinedQuery
+): Array<Action<FieldVisConfig>> {
+  const canUseLensEditor = lensPlugin.canUseEditor();
+  return [
+    {
+      name: i18n.translate('xpack.dataVisualizer.index.dataGrid.exploreInLensTitle', {
+        defaultMessage: 'Explore in Lens',
+      }),
+      description: i18n.translate('xpack.dataVisualizer.index.dataGrid.exploreInLensDescription', {
+        defaultMessage: 'Explore in Lens',
+      }),
+      type: 'icon',
+      icon: 'lensApp',
+      available: (item: FieldVisConfig) =>
+        getCompatibleLensDataType(item.type) !== undefined && canUseLensEditor,
+      onClick: (item: FieldVisConfig) => {
+        const lensAttributes = getLensAttributes(indexPattern, combinedQuery, item);
+        if (lensAttributes) {
+          lensPlugin.navigateToPrefilledEditor({
+            id: `dataVisualizer-${item.fieldName}`,
+            attributes: lensAttributes,
+          });
+        }
+      },
+      'data-test-subj': 'dataVisualizerActionViewInLensButton',
+    },
+  ];
+}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/index.ts
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/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
similarity index 83%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/lens_utils.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/action_menu/lens_utils.ts
index 9690fd1b6c473..4d90defc668a4 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/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
@@ -6,25 +6,28 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { ML_JOB_FIELD_TYPES } from '../../../../../../../common/constants/field_types';
-import type { TypedLensByValueInput } from '../../../../../../../../lens/public';
-import type { FieldVisConfig } from '../../../../stats_table/types';
-import type { IndexPatternColumn, XYLayerConfig } from '../../../../../../../../lens/public';
-import type { CombinedQuery } from '../../../common';
-import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns';
+import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import type { CombinedQuery } from '../../../../index_data_visualizer/types/combined_query';
+import type {
+  IndexPatternColumn,
+  TypedLensByValueInput,
+  XYLayerConfig,
+} from '../../../../../../../lens/public';
+import { FieldVisConfig } from '../../stats_table/types';
+import { JOB_FIELD_TYPES } from '../../../../../../common';
 interface ColumnsAndLayer {
   columns: Record<string, IndexPatternColumn>;
   layer: XYLayerConfig;
 }
 
-const TOP_VALUES_LABEL = i18n.translate('xpack.ml.dataVisualizer.lensChart.topValuesLabel', {
+const TOP_VALUES_LABEL = i18n.translate('xpack.dataVisualizer.index.lensChart.topValuesLabel', {
   defaultMessage: 'Top values',
 });
-const COUNT = i18n.translate('xpack.ml.dataVisualizer.lensChart.countLabel', {
+const COUNT = i18n.translate('xpack.dataVisualizer.index.lensChart.countLabel', {
   defaultMessage: 'Count',
 });
 
-export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IIndexPattern) {
+export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IndexPattern) {
   // if index has no timestamp field
   if (defaultIndexPattern.timeFieldName === undefined) {
     const columns: Record<string, IndexPatternColumn> = {
@@ -62,7 +65,7 @@ export function getNumberSettings(item: FieldVisConfig, defaultIndexPattern: IIn
     col2: {
       dataType: 'number',
       isBucketed: false,
-      label: i18n.translate('xpack.ml.dataVisualizer.lensChart.averageOfLabel', {
+      label: i18n.translate('xpack.dataVisualizer.index.lensChart.averageOfLabel', {
         defaultMessage: 'Average of {fieldName}',
         values: { fieldName: item.fieldName },
       }),
@@ -186,19 +189,19 @@ export function getBooleanSettings(item: FieldVisConfig) {
 export function getCompatibleLensDataType(type: FieldVisConfig['type']): string | undefined {
   let lensType: string | undefined;
   switch (type) {
-    case ML_JOB_FIELD_TYPES.KEYWORD:
+    case JOB_FIELD_TYPES.KEYWORD:
       lensType = 'string';
       break;
-    case ML_JOB_FIELD_TYPES.DATE:
+    case JOB_FIELD_TYPES.DATE:
       lensType = 'date';
       break;
-    case ML_JOB_FIELD_TYPES.NUMBER:
+    case JOB_FIELD_TYPES.NUMBER:
       lensType = 'number';
       break;
-    case ML_JOB_FIELD_TYPES.IP:
+    case JOB_FIELD_TYPES.IP:
       lensType = 'ip';
       break;
-    case ML_JOB_FIELD_TYPES.BOOLEAN:
+    case JOB_FIELD_TYPES.BOOLEAN:
       lensType = 'string';
       break;
     default:
@@ -210,20 +213,20 @@ export function getCompatibleLensDataType(type: FieldVisConfig['type']): string
 function getColumnsAndLayer(
   fieldType: FieldVisConfig['type'],
   item: FieldVisConfig,
-  defaultIndexPattern: IIndexPattern
+  defaultIndexPattern: IndexPattern
 ): ColumnsAndLayer | undefined {
   if (item.fieldName === undefined) return;
 
-  if (fieldType === ML_JOB_FIELD_TYPES.DATE) {
+  if (fieldType === JOB_FIELD_TYPES.DATE) {
     return getDateSettings(item);
   }
-  if (fieldType === ML_JOB_FIELD_TYPES.NUMBER) {
+  if (fieldType === JOB_FIELD_TYPES.NUMBER) {
     return getNumberSettings(item, defaultIndexPattern);
   }
-  if (fieldType === ML_JOB_FIELD_TYPES.IP || fieldType === ML_JOB_FIELD_TYPES.KEYWORD) {
+  if (fieldType === JOB_FIELD_TYPES.IP || fieldType === JOB_FIELD_TYPES.KEYWORD) {
     return getKeywordSettings(item);
   }
-  if (fieldType === ML_JOB_FIELD_TYPES.BOOLEAN) {
+  if (fieldType === JOB_FIELD_TYPES.BOOLEAN) {
     return getBooleanSettings(item);
   }
 }
@@ -231,7 +234,7 @@ function getColumnsAndLayer(
 // currently only supports the following types:
 // 'document' | 'string' | 'number' | 'date' | 'boolean' | 'ip'
 export function getLensAttributes(
-  defaultIndexPattern: IIndexPattern | undefined,
+  defaultIndexPattern: IndexPattern | undefined,
   combinedQuery: CombinedQuery,
   item: FieldVisConfig
 ): TypedLensByValueInput['attributes'] | undefined {
@@ -244,7 +247,7 @@ export function getLensAttributes(
 
   return {
     visualizationType: 'lnsXY',
-    title: i18n.translate('xpack.ml.dataVisualizer.lensChart.chartTitle', {
+    title: i18n.translate('xpack.dataVisualizer.index.lensChart.chartTitle', {
       defaultMessage: 'Lens for {fieldName}',
       values: { fieldName: item.fieldName },
     }),
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/index.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.tsx
new file mode 100644
index 0000000000000..08d2d42c6c027
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_data_row/number_content_preview.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 React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { FileBasedFieldVisConfig } from '../stats_table/types';
+
+export const FileBasedNumberContentPreview = ({ config }: { config: FileBasedFieldVisConfig }) => {
+  const stats = config.stats;
+  if (
+    stats === undefined ||
+    stats.min === undefined ||
+    stats.median === undefined ||
+    stats.max === undefined
+  )
+    return null;
+  return (
+    <EuiFlexGroup direction={'column'} gutterSize={'xs'}>
+      <EuiFlexGroup gutterSize="xs">
+        <EuiFlexItem>
+          <b>
+            <FormattedMessage id="xpack.dataVisualizer.fieldStats.minTitle" defaultMessage="min" />
+          </b>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <b>
+            <FormattedMessage
+              id="xpack.dataVisualizer.fieldStats.medianTitle"
+              defaultMessage="median"
+            />
+          </b>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <b>
+            <FormattedMessage id="xpack.dataVisualizer.fieldStats.maxTitle" defaultMessage="max" />
+          </b>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiFlexGroup gutterSize="xs">
+        <EuiFlexItem>{stats.min}</EuiFlexItem>
+        <EuiFlexItem>{stats.median}</EuiFlexItem>
+        <EuiFlexItem>{stats.max}</EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx
similarity index 91%
rename from x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx
index 466722adc7179..88b4cd406b33c 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/field_names_filter.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/field_names_filter.tsx
@@ -26,7 +26,7 @@ export const DataVisualizerFieldNamesFilter: FC<Props> = ({
 }) => {
   const fieldNameTitle = useMemo(
     () =>
-      i18n.translate('xpack.fileDataVisualizer.fieldNameSelect', {
+      i18n.translate('xpack.dataVisualizer.fieldNameSelect', {
         defaultMessage: 'Field name',
       }),
     []
@@ -42,7 +42,7 @@ export const DataVisualizerFieldNamesFilter: FC<Props> = ({
       options={options}
       onChange={setVisibleFieldNames}
       checkedOptions={visibleFieldNames}
-      dataTestSubj={'mlDataVisualizerFieldNameSelect'}
+      dataTestSubj={'dataVisualizerFieldNameSelect'}
     />
   );
 };
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/field_names_filter/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_names_filter/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx
new file mode 100644
index 0000000000000..6b7c9eafc8c3e
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.test.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { mount, shallow } from 'enzyme';
+
+import { FieldTypeIcon } from './field_type_icon';
+import { JOB_FIELD_TYPES } from '../../../../../common';
+
+describe('FieldTypeIcon', () => {
+  test(`render component when type matches a field type`, () => {
+    const typeIconComponent = shallow(
+      <FieldTypeIcon type={JOB_FIELD_TYPES.KEYWORD} tooltipEnabled={true} needsAria={false} />
+    );
+    expect(typeIconComponent).toMatchSnapshot();
+  });
+
+  test(`render with tooltip and test hovering`, () => {
+    // Use fake timers so we don't have to wait for the EuiToolTip timeout
+    jest.useFakeTimers();
+
+    const typeIconComponent = mount(
+      <FieldTypeIcon type={JOB_FIELD_TYPES.KEYWORD} tooltipEnabled={true} needsAria={false} />
+    );
+    const container = typeIconComponent.find({ 'data-test-subj': 'fieldTypeIcon' });
+
+    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1);
+
+    container.simulate('mouseover');
+
+    // Run the timers so the EuiTooltip will be visible
+    jest.runAllTimers();
+
+    typeIconComponent.update();
+    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(2);
+
+    container.simulate('mouseout');
+
+    // Run the timers so the EuiTooltip will be hidden again
+    jest.runAllTimers();
+
+    typeIconComponent.update();
+    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1);
+
+    // Clearing all mocks will also reset fake timers.
+    jest.clearAllMocks();
+  });
+});
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx
new file mode 100644
index 0000000000000..50823006db3b6
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/field_type_icon.tsx
@@ -0,0 +1,130 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { EuiToken, EuiToolTip } from '@elastic/eui';
+
+import { i18n } from '@kbn/i18n';
+
+import { getJobTypeAriaLabel } from '../../util/field_types_utils';
+import { JOB_FIELD_TYPES } from '../../../../../common';
+import type { JobFieldType } from '../../../../../common';
+
+interface FieldTypeIconProps {
+  tooltipEnabled: boolean;
+  type: JobFieldType;
+  fieldName?: string;
+  needsAria: boolean;
+}
+
+interface FieldTypeIconContainerProps {
+  ariaLabel: string | null;
+  iconType: string;
+  color: string;
+  needsAria: boolean;
+  [key: string]: any;
+}
+
+export const FieldTypeIcon: FC<FieldTypeIconProps> = ({
+  tooltipEnabled = false,
+  type,
+  fieldName,
+  needsAria = true,
+}) => {
+  const ariaLabel = getJobTypeAriaLabel(type);
+
+  let iconType = 'questionInCircle';
+  let color = 'euiColorVis6';
+
+  switch (type) {
+    // Set icon types and colors
+    case JOB_FIELD_TYPES.BOOLEAN:
+      iconType = 'tokenBoolean';
+      color = 'euiColorVis5';
+      break;
+    case JOB_FIELD_TYPES.DATE:
+      iconType = 'tokenDate';
+      color = 'euiColorVis7';
+      break;
+    case JOB_FIELD_TYPES.GEO_POINT:
+    case JOB_FIELD_TYPES.GEO_SHAPE:
+      iconType = 'tokenGeo';
+      color = 'euiColorVis8';
+      break;
+    case JOB_FIELD_TYPES.TEXT:
+      iconType = 'document';
+      color = 'euiColorVis9';
+      break;
+    case JOB_FIELD_TYPES.IP:
+      iconType = 'tokenIP';
+      color = 'euiColorVis3';
+      break;
+    case JOB_FIELD_TYPES.KEYWORD:
+      iconType = 'tokenText';
+      color = 'euiColorVis0';
+      break;
+    case JOB_FIELD_TYPES.NUMBER:
+      iconType = 'tokenNumber';
+      color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2';
+      break;
+    case JOB_FIELD_TYPES.UNKNOWN:
+      // Use defaults
+      break;
+  }
+
+  const containerProps = {
+    ariaLabel,
+    iconType,
+    color,
+    needsAria,
+  };
+
+  if (tooltipEnabled === true) {
+    // wrap the inner component inside <span> because EuiToolTip doesn't seem
+    // to support having another component directly inside the tooltip anchor
+    // see https://github.com/elastic/eui/issues/839
+    return (
+      <EuiToolTip
+        position="left"
+        content={i18n.translate('xpack.dataVisualizer.fieldTypeIcon.fieldTypeTooltip', {
+          defaultMessage: '{type} type',
+          values: { type },
+        })}
+      >
+        <FieldTypeIconContainer {...containerProps} />
+      </EuiToolTip>
+    );
+  }
+
+  return <FieldTypeIconContainer {...containerProps} />;
+};
+
+// If the tooltip is used, it will apply its events to its first inner child.
+// To pass on its properties we apply `rest` to the outer `span` element.
+const FieldTypeIconContainer: FC<FieldTypeIconContainerProps> = ({
+  ariaLabel,
+  iconType,
+  color,
+  needsAria,
+  ...rest
+}) => {
+  const wrapperProps: { className: string; 'aria-label'?: string } = {
+    className: 'field-type-icon',
+  };
+  if (needsAria && ariaLabel) {
+    wrapperProps['aria-label'] = ariaLabel;
+  }
+
+  return (
+    <span data-test-subj="fieldTypeIcon" {...rest}>
+      <span {...wrapperProps}>
+        <EuiToken iconType={iconType} shape="square" size="s" color={color} />
+      </span>
+    </span>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_type_icon/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx
similarity index 94%
rename from x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx
index 8c5602bc625f8..152926ad84ba7 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/field_types_filter.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/field_types_filter.tsx
@@ -14,7 +14,7 @@ import type {
   FileBasedUnknownFieldVisConfig,
 } from '../stats_table/types/field_vis_config';
 import { FieldTypeIcon } from '../field_type_icon';
-import { JOB_FIELD_TYPES } from '../../../../common';
+import { JOB_FIELD_TYPES } from '../../../../../common';
 
 const JOB_FIELD_TYPES_OPTIONS = {
   [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' },
@@ -41,7 +41,7 @@ export const DataVisualizerFieldTypesFilter: FC<Props> = ({
 }) => {
   const fieldNameTitle = useMemo(
     () =>
-      i18n.translate('xpack.fileDataVisualizer.fieldTypeSelect', {
+      i18n.translate('xpack.dataVisualizer.fieldTypeSelect', {
         defaultMessage: 'Field type',
       }),
     []
@@ -87,7 +87,7 @@ export const DataVisualizerFieldTypesFilter: FC<Props> = ({
       options={options}
       onChange={setVisibleFieldTypes}
       checkedOptions={visibleFieldTypes}
-      dataTestSubj={'mlDataVisualizerFieldTypeSelect'}
+      dataTestSubj={'dataVisualizerFieldTypeSelect'}
     />
   );
 };
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/field_types_filter/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/field_types_filter/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
similarity index 96%
rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
index f45071d6e96b5..f80ccd42919e2 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/create_fields.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/create_fields.ts
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 import { getFieldNames, getSupportedFieldType } from './get_field_names';
 import { FileBasedFieldVisConfig } from '../stats_table/types';
-import { JOB_FIELD_TYPES } from '../../../../common';
+import { JOB_FIELD_TYPES } from '../../../../../common';
 import { roundToDecimalPlace } from '../utils';
 
 export function createFields(results: FindFileStructureResponse) {
diff --git a/x-pack/plugins/file_data_visualizer/public/application/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
similarity index 93%
rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/fields_stats_grid.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/fields_stats_grid.tsx
index 3b5b1bbf81dba..f1c164768d6e7 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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,8 +7,8 @@
 
 import React, { useMemo, FC, useState } from 'react';
 import { EuiFlexGroup, EuiSpacer } from '@elastic/eui';
-import type { FindFileStructureResponse } from '../../../../../file_upload/common';
-import type { DataVisualizerTableState } from '../../../../common';
+import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import type { DataVisualizerTableState } from '../../../../../common';
 import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table';
 import type { FileBasedFieldVisConfig } from '../stats_table/types/field_vis_config';
 import { FileBasedDataVisualizerExpandedRow } from '../expanded_row';
@@ -85,14 +85,14 @@ export const FieldsStatsGrid: FC<Props> = ({ results }) => {
         alignItems="center"
         gutterSize="xs"
         style={{ marginLeft: 4 }}
-        data-test-subj="mlDataVisualizerFieldCountPanel"
+        data-test-subj="dataVisualizerFieldCountPanel"
       >
         <TotalFieldsCount fieldsCountStats={fieldsCountStats} />
         <MetricFieldsCount metricsStats={metricsStats} />
 
         <EuiFlexGroup
           gutterSize="xs"
-          data-test-subj="mlDataVisualizerFieldCountPanel"
+          data-test-subj="dataVisualizerFieldCountPanel"
           justifyContent={'flexEnd'}
         >
           <DataVisualizerFieldNamesFilter
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts
similarity index 95%
rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts
index 0120b17452558..6c164233bdbc1 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/filter_fields.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/filter_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { JOB_FIELD_TYPES } from '../../../../common';
+import { JOB_FIELD_TYPES } from '../../../../../common';
 import type {
   FileBasedFieldVisConfig,
   FileBasedUnknownFieldVisConfig,
diff --git a/x-pack/plugins/file_data_visualizer/public/application/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
similarity index 85%
rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/get_field_names.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/get_field_names.ts
index 83c517dfe965e..6ca6421bbd124 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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,10 +6,10 @@
  */
 
 import { difference } from 'lodash';
-import { ES_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
-import type { FindFileStructureResponse } from '../../../../../file_upload/common';
-import type { JobFieldType } from '../../../../common';
-import { JOB_FIELD_TYPES } from '../../../../common';
+import { ES_FIELD_TYPES } from '../../../../../../../../src/plugins/data/common';
+import type { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import type { JobFieldType } from '../../../../../common';
+import { JOB_FIELD_TYPES } from '../../../../../common';
 export function getFieldNames(results: FindFileStructureResponse) {
   const { mappings, field_stats: fieldStats, column_names: columnNames } = results;
 
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/fields_stats_grid/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/fields_stats_grid/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
similarity index 92%
rename from x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config.ts
index 1cbb177c86442..54dfbe72c3c7f 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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 '../../../../../../file_upload/common';
 
 export function createFilebeatConfig(
   index: string,
@@ -36,7 +36,7 @@ export function createFilebeatConfig(
 }
 
 function getPaths() {
-  const txt = i18n.translate('xpack.fileDataVisualizer.fileBeatConfig.paths', {
+  const txt = i18n.translate('xpack.dataVisualizer.fileBeatConfig.paths', {
     defaultMessage: 'add path to your files here',
   });
   return ['  paths:', `  - '<${txt}>'`];
diff --git a/x-pack/plugins/file_data_visualizer/public/application/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
similarity index 84%
rename from x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/filebeat_config_flyout.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/filebeat_config_flyout.tsx
index c2b7e18059769..238cdcc2f8d9e 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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
@@ -22,8 +22,8 @@ import {
   EuiCopy,
 } from '@elastic/eui';
 import { createFilebeatConfig } from './filebeat_config';
-import { useFileDataVisualizerKibana } from '../../kibana_context'; // copy context?
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { useDataVisualizerKibana } from '../../../kibana_context'; // copy context?
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 export enum EDITOR_MODE {
   HIDDEN,
@@ -48,7 +48,7 @@ export const FilebeatConfigFlyout: FC<Props> = ({
   const [username, setUsername] = useState<string | null>(null);
   const {
     services: { security },
-  } = useFileDataVisualizerKibana();
+  } = useDataVisualizerKibana();
 
   useEffect(() => {
     if (security !== undefined) {
@@ -75,7 +75,7 @@ export const FilebeatConfigFlyout: FC<Props> = ({
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty iconType="cross" onClick={closeFlyout} flush="left">
               <FormattedMessage
-                id="xpack.fileDataVisualizer.fileBeatConfigFlyout.closeButton"
+                id="xpack.dataVisualizer.fileBeatConfigFlyout.closeButton"
                 defaultMessage="Close"
               />
             </EuiButtonEmpty>
@@ -85,7 +85,7 @@ export const FilebeatConfigFlyout: FC<Props> = ({
               {(copy) => (
                 <EuiButton onClick={copy}>
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.fileBeatConfigFlyout.copyButton"
+                    id="xpack.dataVisualizer.fileBeatConfigFlyout.copyButton"
                     defaultMessage="Copy to clipboard"
                   />
                 </EuiButton>
@@ -108,7 +108,7 @@ const Contents: FC<{
       <EuiTitle size="s">
         <h5>
           <FormattedMessage
-            id="xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTitle"
+            id="xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTitle"
             defaultMessage="Filebeat configuration"
           />
         </h5>
@@ -116,14 +116,14 @@ const Contents: FC<{
       <EuiSpacer size="s" />
       <p>
         <FormattedMessage
-          id="xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTopText1"
+          id="xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText1"
           defaultMessage="Additional data can be uploaded to the {index} index using Filebeat."
           values={{ index: <EuiCode>{index}</EuiCode> }}
         />
       </p>
       <p>
         <FormattedMessage
-          id="xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTopText2"
+          id="xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText2"
           defaultMessage="Modify {filebeatYml} to set the connection information:"
           values={{ filebeatYml: <EuiCode>filebeat.yml</EuiCode> }}
         />
@@ -137,7 +137,7 @@ const Contents: FC<{
       <p>
         {username === null ? (
           <FormattedMessage
-            id="xpack.fileDataVisualizer.resultsLinks.fileBeatConfigBottomTextNoUsername"
+            id="xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomTextNoUsername"
             defaultMessage="Where {esUrl} is the URL of Elasticsearch."
             values={{
               esUrl: <EuiCode>{'<es_url>'}</EuiCode>,
@@ -145,7 +145,7 @@ const Contents: FC<{
           />
         ) : (
           <FormattedMessage
-            id="xpack.fileDataVisualizer.resultsLinks.fileBeatConfigBottomText"
+            id="xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomText"
             defaultMessage="Where {password} is the password of the {user} user, {esUrl} is the URL of Elasticsearch."
             values={{
               user: <EuiCode>{username}</EuiCode>,
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/filebeat_config_flyout/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/filebeat_config_flyout/index.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.tsx
new file mode 100644
index 0000000000000..9aa19b511b79a
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/help_menu.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, { FC, useEffect } from 'react';
+import { i18n } from '@kbn/i18n';
+import { useDataVisualizerKibana } from '../../../kibana_context';
+
+interface HelpMenuProps {
+  docLink: string;
+}
+
+// Component for adding a documentation link to the help menu
+export const HelpMenu: FC<HelpMenuProps> = React.memo(({ docLink }) => {
+  const { chrome } = useDataVisualizerKibana().services;
+
+  useEffect(() => {
+    chrome.setHelpExtension({
+      appName: i18n.translate('xpack.dataVisualizer.chrome.help.appName', {
+        defaultMessage: 'Data Visualizer',
+      }),
+      links: [
+        {
+          href: docLink,
+          linkType: 'documentation',
+        },
+      ],
+    });
+  }, [chrome, docLink]);
+
+  return null;
+});
+
+HelpMenu.displayName = 'HelpMenu';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/index.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/index.tsx
new file mode 100644
index 0000000000000..dd4339173ffd4
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/help_menu/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 { HelpMenu } from './help_menu';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/link_card/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/link_card/index.ts
new file mode 100644
index 0000000000000..3a046defde582
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/link_card/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 { LinkCard } from './link_card';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/link_card/link_card.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/link_card/link_card.tsx
new file mode 100644
index 0000000000000..4076169b9e1fe
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/link_card/link_card.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 React, { FC, ReactElement } from 'react';
+
+import {
+  EuiIcon,
+  IconType,
+  EuiText,
+  EuiTitle,
+  EuiFlexItem,
+  EuiFlexGroup,
+  EuiPanel,
+  EuiLink,
+} from '@elastic/eui';
+
+interface Props {
+  icon: IconType | ReactElement;
+  iconAreaLabel?: string;
+  title: any;
+  description: any;
+  href?: string;
+  onClick?: () => void;
+  isDisabled?: boolean;
+  'data-test-subj'?: string;
+}
+
+// Component for rendering a card which links to the Create Job page, displaying an
+// icon, card title, description and link.
+export const LinkCard: FC<Props> = ({
+  icon,
+  iconAreaLabel,
+  title,
+  description,
+  onClick,
+  href,
+  isDisabled,
+  'data-test-subj': dateTestSubj,
+}) => {
+  const linkHrefAndOnClickProps = {
+    ...(href ? { href } : {}),
+    ...(onClick ? { onClick } : {}),
+  };
+  return (
+    <EuiPanel style={{ cursor: isDisabled ? 'not-allowed' : undefined }}>
+      <EuiLink
+        style={{
+          display: 'block',
+          pointerEvents: isDisabled ? 'none' : undefined,
+          background: 'transparent',
+          outline: 'none',
+        }}
+        data-test-subj={dateTestSubj}
+        color="subdued"
+        {...linkHrefAndOnClickProps}
+      >
+        <EuiFlexGroup gutterSize="l" responsive={true}>
+          <EuiFlexItem grow={false} style={{ paddingTop: '8px' }}>
+            {typeof icon === 'string' ? (
+              <EuiIcon size="xl" type={icon} aria-label={iconAreaLabel} />
+            ) : (
+              icon
+            )}
+          </EuiFlexItem>
+          <EuiFlexItem>
+            <EuiTitle size="s">
+              <h3>{title}</h3>
+            </EuiTitle>
+            <EuiText color="subdued">
+              <p>{description}</p>
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiLink>
+    </EuiPanel>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/index.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/index.ts
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/loading_indicator.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx
similarity index 86%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/loading_indicator.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx
index 846bb518b6656..07733aaa54cc8 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/loading_indicator/loading_indicator.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/loading_indicator/loading_indicator.tsx
@@ -10,7 +10,6 @@ import React, { FC, Fragment } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiLoadingSpinner, EuiSpacer, EuiText } from '@elastic/eui';
 
 import { FormattedMessage } from '@kbn/i18n/react';
-
 export const LoadingIndicator: FC = () => (
   <Fragment>
     <EuiSpacer size="xxl" />
@@ -22,7 +21,10 @@ export const LoadingIndicator: FC = () => (
     <EuiFlexGroup justifyContent="spaceAround">
       <EuiFlexItem grow={false}>
         <EuiText color="subdued">
-          <FormattedMessage id="xpack.ml.fieldDataCard.loadingLabel" defaultMessage="Loading" />
+          <FormattedMessage
+            id="xpack.dataVisualizer.dataGrid.field.loadingLabel"
+            defaultMessage="Loading"
+          />
         </EuiText>
       </EuiFlexItem>
     </EuiFlexGroup>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx
similarity index 98%
rename from x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx
index 2093b61a7ef4d..caa58009fda5d 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/multi_select_picker/multi_select_picker.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/multi_select_picker/multi_select_picker.tsx
@@ -32,7 +32,7 @@ const NoFilterItems = () => {
         <EuiSpacer size="xs" />
         <p>
           <FormattedMessage
-            id="xpack.fileDataVisualizer.multiSelectPicker.NoFiltersFoundMessage"
+            id="xpack.dataVisualizer.multiSelectPicker.NoFiltersFoundMessage"
             defaultMessage="No filters found"
           />
         </p>
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/index.ts
new file mode 100644
index 0000000000000..0c5e54b846bb8
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_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 { NotInDocsContent } from './not_in_docs_context';
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.tsx
new file mode 100644
index 0000000000000..e4fd3b96405df
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/not_in_docs_content/not_in_docs_context.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 React, { FC, Fragment } from 'react';
+import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+
+export const NotInDocsContent: FC = () => (
+  <Fragment>
+    <EuiSpacer size="xxl" />
+    <EuiText textAlign="center">
+      <EuiIcon type="alert" />
+    </EuiText>
+
+    <EuiSpacer size="s" />
+    <EuiText textAlign="center">
+      <FormattedMessage
+        id="xpack.dataVisualizer.dataGrid.field.fieldNotInDocsLabel"
+        defaultMessage="This field does not appear in any documents for the selected time range"
+      />
+    </EuiText>
+  </Fragment>
+);
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/results_links/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/results_links/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
similarity index 90%
rename from x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
index db9fa8d8d51d9..a674446397db9 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/results_links/results_links.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/results_links/results_links.tsx
@@ -12,11 +12,11 @@ import { EuiFlexGroup, EuiFlexItem, EuiCard, EuiIcon } from '@elastic/eui';
 import {
   DISCOVER_APP_URL_GENERATOR,
   DiscoverUrlGeneratorState,
-} from '../../../../../../../src/plugins/discover/public';
-import { TimeRange, RefreshInterval } from '../../../../../../../src/plugins/data/public';
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
-import type { FileUploadPluginStart } from '../../../../../file_upload/public';
-import { useFileDataVisualizerKibana } from '../../kibana_context';
+} from '../../../../../../../../src/plugins/discover/public';
+import { TimeRange, RefreshInterval } from '../../../../../../../../src/plugins/data/public';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
+import type { FileUploadPluginStart } from '../../../../../../file_upload/public';
+import { useDataVisualizerKibana } from '../../../kibana_context';
 
 interface Props {
   fieldStats: FindFileStructureResponse['field_stats'];
@@ -44,7 +44,7 @@ export const ResultsLinks: FC<Props> = ({
 }) => {
   const {
     services: { fileUpload },
-  } = useFileDataVisualizerKibana();
+  } = useDataVisualizerKibana();
 
   const [duration, setDuration] = useState({
     from: 'now-30m',
@@ -63,7 +63,7 @@ export const ResultsLinks: FC<Props> = ({
         urlGenerators: { getUrlGenerator },
       },
     },
-  } = useFileDataVisualizerKibana();
+  } = useDataVisualizerKibana();
 
   useEffect(() => {
     let unmounted = false;
@@ -176,7 +176,7 @@ export const ResultsLinks: FC<Props> = ({
             icon={<EuiIcon size="xxl" type={`discoverApp`} />}
             title={
               <FormattedMessage
-                id="xpack.fileDataVisualizer.resultsLinks.viewIndexInDiscoverTitle"
+                id="xpack.dataVisualizer.file.resultsLinks.viewIndexInDiscoverTitle"
                 defaultMessage="View index in Discover"
               />
             }
@@ -192,7 +192,7 @@ export const ResultsLinks: FC<Props> = ({
             icon={<EuiIcon size="xxl" type={`managementApp`} />}
             title={
               <FormattedMessage
-                id="xpack.fileDataVisualizer.resultsLinks.indexManagementTitle"
+                id="xpack.dataVisualizer.file.resultsLinks.indexManagementTitle"
                 defaultMessage="Index Management"
               />
             }
@@ -208,7 +208,7 @@ export const ResultsLinks: FC<Props> = ({
             icon={<EuiIcon size="xxl" type={`managementApp`} />}
             title={
               <FormattedMessage
-                id="xpack.fileDataVisualizer.resultsLinks.indexPatternManagementTitle"
+                id="xpack.dataVisualizer.file.resultsLinks.indexPatternManagementTitle"
                 defaultMessage="Index Pattern Management"
               />
             }
@@ -223,7 +223,7 @@ export const ResultsLinks: FC<Props> = ({
           data-test-subj="fileDataVisFilebeatConfigLink"
           title={
             <FormattedMessage
-              id="xpack.fileDataVisualizer.resultsLinks.fileBeatConfig"
+              id="xpack.dataVisualizer.file.resultsLinks.fileBeatConfig"
               defaultMessage="Create Filebeat configuration"
             />
           }
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_field_data_row.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_field_data_row.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_field_data_row.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_field_data_row.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/expanded_row_field_header/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/expanded_row_field_header/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/index.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.tsx
new file mode 100644
index 0000000000000..7996e6366c497
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/metric_fields_count.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 { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { FC } from 'react';
+
+export interface MetricFieldsStats {
+  visibleMetricsCount: number;
+  totalMetricFieldsCount: number;
+}
+export interface MetricFieldsCountProps {
+  metricsStats?: MetricFieldsStats;
+}
+
+export const MetricFieldsCount: FC<MetricFieldsCountProps> = ({ metricsStats }) => {
+  if (
+    !metricsStats ||
+    metricsStats.visibleMetricsCount === undefined ||
+    metricsStats.totalMetricFieldsCount === undefined
+  )
+    return null;
+  return (
+    <>
+      {metricsStats && (
+        <EuiFlexGroup
+          gutterSize="s"
+          alignItems="center"
+          className="dataVisualizerFieldCountContainer"
+          data-test-subj="dataVisualizerMetricFieldsSummary"
+        >
+          <EuiFlexItem grow={false}>
+            <EuiText>
+              <h5>
+                <FormattedMessage
+                  id="xpack.dataVisualizer.searchPanel.numberFieldsLabel"
+                  defaultMessage="Number fields"
+                />
+              </h5>
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiNotificationBadge
+              color="subdued"
+              size="m"
+              data-test-subj="dataVisualizerVisibleMetricFieldsCount"
+            >
+              <strong>{metricsStats.visibleMetricsCount}</strong>
+            </EuiNotificationBadge>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiText color="subdued" size="s" data-test-subj="dataVisualizerMetricFieldsCount">
+              <FormattedMessage
+                id="xpack.dataVisualizer.searchPanel.ofFieldsTotal"
+                defaultMessage="of {totalCount} total"
+                values={{ totalCount: metricsStats.totalMetricFieldsCount }}
+              />
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx
new file mode 100644
index 0000000000000..8e9e3e59f1281
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_count_stats/total_fields_count.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { FC } from 'react';
+
+export interface TotalFieldsStats {
+  visibleFieldsCount: number;
+  totalFieldsCount: number;
+}
+
+export interface TotalFieldsCountProps {
+  fieldsCountStats?: TotalFieldsStats;
+}
+
+export const TotalFieldsCount: FC<TotalFieldsCountProps> = ({ fieldsCountStats }) => {
+  if (
+    !fieldsCountStats ||
+    fieldsCountStats.visibleFieldsCount === undefined ||
+    fieldsCountStats.totalFieldsCount === undefined
+  )
+    return null;
+
+  return (
+    <EuiFlexGroup
+      gutterSize="s"
+      alignItems="center"
+      className="dataVisualizerFieldCountContainer"
+      data-test-subj="dataVisualizerFieldsSummary"
+    >
+      <EuiFlexItem grow={false}>
+        <EuiText>
+          <h5>
+            <FormattedMessage
+              id="xpack.dataVisualizer.searchPanel.allFieldsLabel"
+              defaultMessage="All fields"
+            />
+          </h5>
+        </EuiText>
+      </EuiFlexItem>
+
+      <EuiFlexItem grow={false}>
+        <EuiNotificationBadge
+          color="subdued"
+          size="m"
+          data-test-subj="dataVisualizerVisibleFieldsCount"
+        >
+          <strong>{fieldsCountStats.visibleFieldsCount}</strong>
+        </EuiNotificationBadge>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiText color="subdued" size="s" data-test-subj="dataVisualizerTotalFieldsCount">
+          <FormattedMessage
+            id="xpack.dataVisualizer.searchPanel.ofFieldsTotal"
+            defaultMessage="of {totalCount} total"
+            values={{ totalCount: fieldsCountStats.totalFieldsCount }}
+          />
+        </EuiText>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_number_content.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/_number_content.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/_number_content.scss
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx
new file mode 100644
index 0000000000000..2869b5030f81b
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/boolean_content.tsx
@@ -0,0 +1,145 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, ReactNode, useMemo } from 'react';
+import { EuiBasicTable, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import { Axis, BarSeries, Chart, Settings } from '@elastic/charts';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import type { FieldDataRowProps } from '../../types/field_data_row';
+import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
+import { getTFPercentage } from '../../utils';
+import { roundToDecimalPlace } from '../../../utils';
+import { useDataVizChartTheme } from '../../hooks';
+import { DocumentStatsTable } from './document_stats';
+import { ExpandedRowContent } from './expanded_row_content';
+
+function getPercentLabel(value: number): string {
+  if (value === 0) {
+    return '0%';
+  }
+  if (value >= 0.1) {
+    return `${roundToDecimalPlace(value)}%`;
+  } else {
+    return '< 0.1%';
+  }
+}
+
+function getFormattedValue(value: number, totalCount: number): string {
+  const percentage = (value / totalCount) * 100;
+  return `${value} (${getPercentLabel(percentage)})`;
+}
+
+const BOOLEAN_DISTRIBUTION_CHART_HEIGHT = 100;
+
+export const BooleanContent: FC<FieldDataRowProps> = ({ config }) => {
+  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
+  const formattedPercentages = useMemo(() => getTFPercentage(config), [config]);
+  const theme = useDataVizChartTheme();
+  if (!formattedPercentages) return null;
+
+  const { trueCount, falseCount, count } = formattedPercentages;
+  const summaryTableItems = [
+    {
+      function: 'true',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.trueCountLabel"
+          defaultMessage="true"
+        />
+      ),
+      value: getFormattedValue(trueCount, count),
+    },
+    {
+      function: 'false',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.falseCountLabel"
+          defaultMessage="false"
+        />
+      ),
+      value: getFormattedValue(falseCount, count),
+    },
+  ];
+  const summaryTableColumns = [
+    {
+      name: '',
+      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
+      width: '75px',
+    },
+    {
+      field: 'value',
+      name: '',
+      render: (v: string) => <strong>{v}</strong>,
+    },
+  ];
+
+  const summaryTableTitle = i18n.translate(
+    'xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.summaryTableTitle',
+    {
+      defaultMessage: 'Summary',
+    }
+  );
+
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerBooleanContent'}>
+      <DocumentStatsTable config={config} />
+
+      <EuiFlexItem className={'dataVisualizerSummaryTableWrapper'}>
+        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
+        <EuiBasicTable
+          className={'dataVisualizerSummaryTable'}
+          compressed
+          items={summaryTableItems}
+          columns={summaryTableColumns}
+          tableCaption={summaryTableTitle}
+        />
+      </EuiFlexItem>
+
+      <EuiFlexItem>
+        <ExpandedRowFieldHeader>
+          <FormattedMessage
+            id="xpack.dataVisualizer.dataGrid.field.cardBoolean.valuesLabel"
+            defaultMessage="Values"
+          />
+        </ExpandedRowFieldHeader>
+        <EuiSpacer size="xs" />
+        <Chart renderer="canvas" size={{ height: BOOLEAN_DISTRIBUTION_CHART_HEIGHT }}>
+          <Axis id="bottom" position="bottom" showOverlappingTicks />
+          <Axis
+            id="left2"
+            title="Left axis"
+            hide={true}
+            tickFormat={(d: any) => getFormattedValue(d, count)}
+          />
+
+          <Settings showLegend={false} theme={theme} />
+          <BarSeries
+            id={config.fieldName || fieldFormat}
+            data={[
+              {
+                x: 'true',
+                count: formattedPercentages.trueCount,
+              },
+              {
+                x: 'false',
+                count: formattedPercentages.falseCount,
+              },
+            ]}
+            splitSeriesAccessors={['x']}
+            stackAccessors={['x']}
+            xAccessor="x"
+            xScaleType="ordinal"
+            yAccessors={['count']}
+            yScaleType="linear"
+          />
+        </Chart>
+      </EuiFlexItem>
+    </ExpandedRowContent>
+  );
+};
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
new file mode 100644
index 0000000000000..6bd4de22beca4
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
@@ -0,0 +1,126 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useMemo } from 'react';
+import { EuiFlexItem, EuiSpacer, EuiText, htmlIdGenerator } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import {
+  FIELD_ORIGIN,
+  SOURCE_TYPES,
+  STYLE_TYPE,
+  COLOR_MAP_TYPE,
+} from '../../../../../../../../maps/common/constants';
+import { EMSTermJoinConfig } from '../../../../../../../../maps/public';
+import { VectorLayerDescriptor } from '../../../../../../../../maps/common/descriptor_types';
+import { EmbeddedMapComponent } from '../../../embedded_map';
+import { FieldVisStats } from '../../../../../../../common/types';
+
+export const getChoroplethTopValuesLayer = (
+  fieldName: string,
+  topValues: Array<{ key: any; doc_count: number }>,
+  { layerId, field }: EMSTermJoinConfig
+): VectorLayerDescriptor => {
+  return {
+    id: htmlIdGenerator()(),
+    label: i18n.translate('xpack.dataVisualizer.choroplethMap.topValuesCount', {
+      defaultMessage: 'Top values count for {fieldName}',
+      values: { fieldName },
+    }),
+    joins: [
+      {
+        // Left join is the id from the type of field (e.g. world_countries)
+        leftField: field,
+        right: {
+          id: 'anomaly_count',
+          type: SOURCE_TYPES.TABLE_SOURCE,
+          __rows: topValues,
+          __columns: [
+            {
+              name: 'key',
+              type: 'string',
+            },
+            {
+              name: 'doc_count',
+              type: 'number',
+            },
+          ],
+          // Right join/term is the field in the doc you’re trying to join it to (foreign key - e.g. US)
+          term: 'key',
+        },
+      },
+    ],
+    sourceDescriptor: {
+      type: 'EMS_FILE',
+      id: layerId,
+    },
+    style: {
+      type: 'VECTOR',
+      // @ts-ignore missing style properties. Remove once 'VectorLayerDescriptor' type is updated
+      properties: {
+        icon: { type: STYLE_TYPE.STATIC, options: { value: 'marker' } },
+        fillColor: {
+          type: STYLE_TYPE.DYNAMIC,
+          options: {
+            color: 'Blue to Red',
+            colorCategory: 'palette_0',
+            fieldMetaOptions: { isEnabled: true, sigma: 3 },
+            type: COLOR_MAP_TYPE.ORDINAL,
+            field: {
+              name: 'doc_count',
+              origin: FIELD_ORIGIN.JOIN,
+            },
+            useCustomColorRamp: false,
+          },
+        },
+        lineColor: {
+          type: STYLE_TYPE.DYNAMIC,
+          options: { fieldMetaOptions: { isEnabled: true } },
+        },
+        lineWidth: { type: STYLE_TYPE.STATIC, options: { size: 1 } },
+      },
+      isTimeAware: true,
+    },
+    type: 'VECTOR',
+  };
+};
+
+interface Props {
+  stats: FieldVisStats | undefined;
+  suggestion: EMSTermJoinConfig;
+}
+
+export const ChoroplethMap: FC<Props> = ({ stats, suggestion }) => {
+  const { fieldName, isTopValuesSampled, topValues, topValuesSamplerShardSize } = stats!;
+
+  const layerList: VectorLayerDescriptor[] = useMemo(
+    () => [getChoroplethTopValuesLayer(fieldName || '', topValues || [], suggestion)],
+    [suggestion, fieldName, topValues]
+  );
+
+  return (
+    <EuiFlexItem data-test-subj={'fileDataVisualizerChoroplethMapTopValues'}>
+      <div style={{ width: '100%', minHeight: 300 }}>
+        <EmbeddedMapComponent layerList={layerList} />
+      </div>
+      {isTopValuesSampled === true && (
+        <>
+          <EuiSpacer size="xs" />
+          <EuiText size="xs" textAlign={'left'}>
+            <FormattedMessage
+              id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.choroplethMapTopValues.calculatedFromSampleDescription"
+              defaultMessage="Calculated from sample of {topValuesSamplerShardSize} documents per shard"
+              values={{
+                topValuesSamplerShardSize,
+              }}
+            />
+          </EuiText>
+        </>
+      )}
+    </EuiFlexItem>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx
new file mode 100644
index 0000000000000..4adb76575dd48
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/date_content.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, ReactNode } from 'react';
+import { EuiBasicTable, EuiFlexItem } from '@elastic/eui';
+// @ts-ignore
+import { formatDate } from '@elastic/eui/lib/services/format';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { i18n } from '@kbn/i18n';
+import type { FieldDataRowProps } from '../../types/field_data_row';
+import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
+import { DocumentStatsTable } from './document_stats';
+import { ExpandedRowContent } from './expanded_row_content';
+const TIME_FORMAT = 'MMM D YYYY, HH:mm:ss.SSS';
+interface SummaryTableItem {
+  function: string;
+  display: ReactNode;
+  value: number | string | undefined | null;
+}
+
+export const DateContent: FC<FieldDataRowProps> = ({ config }) => {
+  const { stats } = config;
+  if (stats === undefined) return null;
+
+  const { earliest, latest } = stats;
+
+  const summaryTableTitle = i18n.translate(
+    'xpack.dataVisualizer.dataGrid.field.cardDate.summaryTableTitle',
+    {
+      defaultMessage: 'Summary',
+    }
+  );
+  const summaryTableItems = [
+    {
+      function: 'earliest',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.field.cardDate.earliestLabel"
+          defaultMessage="earliest"
+        />
+      ),
+      value: typeof earliest === 'string' ? earliest : formatDate(earliest, TIME_FORMAT),
+    },
+    {
+      function: 'latest',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.field.cardDate.latestLabel"
+          defaultMessage="latest"
+        />
+      ),
+      value: typeof latest === 'string' ? latest : formatDate(latest, TIME_FORMAT),
+    },
+  ];
+  const summaryTableColumns = [
+    {
+      name: '',
+      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
+      width: '75px',
+    },
+    {
+      field: 'value',
+      name: '',
+      render: (v: string) => <strong>{v}</strong>,
+    },
+  ];
+
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerDateContent'}>
+      <DocumentStatsTable config={config} />
+      <EuiFlexItem className={'dataVisualizerSummaryTableWrapper'}>
+        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
+        <EuiBasicTable<SummaryTableItem>
+          className={'dataVisualizerSummaryTable'}
+          data-test-subj={'dataVisualizerDateSummaryTable'}
+          compressed
+          items={summaryTableItems}
+          columns={summaryTableColumns}
+          tableCaption={summaryTableTitle}
+          tableLayout="auto"
+        />
+      </EuiFlexItem>
+    </ExpandedRowContent>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx
new file mode 100644
index 0000000000000..f4ed74193d90a
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/document_stats.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import React, { FC, ReactNode } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiBasicTable, EuiFlexItem } from '@elastic/eui';
+import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
+import { FieldDataRowProps } from '../../types';
+import { roundToDecimalPlace } from '../../../utils';
+
+const metaTableColumns = [
+  {
+    name: '',
+    render: (metaItem: { display: ReactNode }) => metaItem.display,
+    width: '75px',
+  },
+  {
+    field: 'value',
+    name: '',
+    render: (v: string) => <strong>{v}</strong>,
+  },
+];
+
+const metaTableTitle = i18n.translate(
+  'xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.metaTableTitle',
+  {
+    defaultMessage: 'Documents stats',
+  }
+);
+
+export const DocumentStatsTable: FC<FieldDataRowProps> = ({ config }) => {
+  if (
+    config?.stats === undefined ||
+    config.stats.cardinality === undefined ||
+    config.stats.count === undefined ||
+    config.stats.sampleCount === undefined
+  )
+    return null;
+  const { cardinality, count, sampleCount } = config.stats;
+  const metaTableItems = [
+    {
+      function: 'count',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.countLabel"
+          defaultMessage="count"
+        />
+      ),
+      value: count,
+    },
+    {
+      function: 'percentage',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.percentageLabel"
+          defaultMessage="percentage"
+        />
+      ),
+      value: `${roundToDecimalPlace((count / sampleCount) * 100)}%`,
+    },
+    {
+      function: 'distinctValues',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.distinctValueLabel"
+          defaultMessage="distinct values"
+        />
+      ),
+      value: cardinality,
+    },
+  ];
+
+  return (
+    <EuiFlexItem
+      data-test-subj={'dataVisualizerDocumentStatsContent'}
+      className={'dataVisualizerSummaryTableWrapper'}
+    >
+      <ExpandedRowFieldHeader>{metaTableTitle}</ExpandedRowFieldHeader>
+      <EuiBasicTable
+        className={'dataVisualizerSummaryTable'}
+        compressed
+        items={metaTableItems}
+        columns={metaTableColumns}
+        tableCaption={metaTableTitle}
+      />
+    </EuiFlexItem>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/index.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx
new file mode 100644
index 0000000000000..77cf5fad5cca8
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/ip_content.tsx
@@ -0,0 +1,27 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+import type { FieldDataRowProps } from '../../types/field_data_row';
+import { TopValues } from '../../../top_values';
+import { DocumentStatsTable } from './document_stats';
+import { ExpandedRowContent } from './expanded_row_content';
+
+export const IpContent: FC<FieldDataRowProps> = ({ config }) => {
+  const { stats } = config;
+  if (stats === undefined) return null;
+  const { count, sampleCount, cardinality } = stats;
+  if (count === undefined || sampleCount === undefined || cardinality === undefined) return null;
+  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
+
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerIPContent'}>
+      <DocumentStatsTable config={config} />
+      <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" />
+    </ExpandedRowContent>
+  );
+};
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
new file mode 100644
index 0000000000000..22fe8244ef760
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
@@ -0,0 +1,59 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useCallback, useEffect, useState } from 'react';
+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';
+import { ChoroplethMap } from './choropleth_map';
+
+const COMMON_EMS_LAYER_IDS = [
+  'world_countries',
+  'administrative_regions_lvl2',
+  'usa_zip_codes',
+  'usa_states',
+];
+
+export const KeywordContent: FC<FieldDataRowProps> = ({ config }) => {
+  const [EMSSuggestion, setEMSSuggestion] = useState<EMSTermJoinConfig | null | undefined>();
+  const { stats, fieldName } = config;
+  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
+  const {
+    services: { maps: mapsPlugin },
+  } = useDataVisualizerKibana();
+
+  const loadEMSTermSuggestions = useCallback(async () => {
+    if (!mapsPlugin) return;
+    const suggestion: EMSTermJoinConfig | null = await mapsPlugin.suggestEMSTermJoinConfig({
+      emsLayerIds: COMMON_EMS_LAYER_IDS,
+      sampleValues: Array.isArray(stats?.topValues)
+        ? stats?.topValues.map((value) => value.key)
+        : [],
+      sampleValuesColumnName: fieldName || '',
+    });
+    setEMSSuggestion(suggestion);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [fieldName]);
+
+  useEffect(
+    function getInitialEMSTermSuggestion() {
+      loadEMSTermSuggestions();
+    },
+    [loadEMSTermSuggestions]
+  );
+
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerKeywordContent'}>
+      <DocumentStatsTable config={config} />
+      <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" />
+      {EMSSuggestion && stats && <ChoroplethMap stats={stats} suggestion={EMSSuggestion} />}
+    </ExpandedRowContent>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx
new file mode 100644
index 0000000000000..ef3ac5a267346
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/number_content.tsx
@@ -0,0 +1,154 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, ReactNode, useEffect, useState } from 'react';
+import { EuiBasicTable, EuiFlexItem, EuiText } from '@elastic/eui';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import type { FieldDataRowProps } from '../../types/field_data_row';
+import { kibanaFieldFormat, numberAsOrdinal } from '../../../utils';
+import {
+  MetricDistributionChart,
+  MetricDistributionChartData,
+  buildChartDataFromStats,
+} from '../metric_distribution_chart';
+import { TopValues } from '../../../top_values';
+import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
+import { DocumentStatsTable } from './document_stats';
+import { ExpandedRowContent } from './expanded_row_content';
+
+const METRIC_DISTRIBUTION_CHART_WIDTH = 325;
+const METRIC_DISTRIBUTION_CHART_HEIGHT = 200;
+
+interface SummaryTableItem {
+  function: string;
+  display: ReactNode;
+  value: number | string | undefined | null;
+}
+
+export const NumberContent: FC<FieldDataRowProps> = ({ config }) => {
+  const { stats } = config;
+
+  useEffect(() => {
+    const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH);
+    setDistributionChartData(chartData);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  const defaultChartData: MetricDistributionChartData[] = [];
+  const [distributionChartData, setDistributionChartData] = useState(defaultChartData);
+
+  if (stats === undefined) return null;
+  const { min, median, max, distribution } = stats;
+  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
+
+  const summaryTableItems = [
+    {
+      function: 'min',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.minLabel"
+          defaultMessage="min"
+        />
+      ),
+      value: kibanaFieldFormat(min, fieldFormat),
+    },
+    {
+      function: 'median',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.medianLabel"
+          defaultMessage="median"
+        />
+      ),
+      value: kibanaFieldFormat(median, fieldFormat),
+    },
+    {
+      function: 'max',
+      display: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.maxLabel"
+          defaultMessage="max"
+        />
+      ),
+      value: kibanaFieldFormat(max, fieldFormat),
+    },
+  ];
+  const summaryTableColumns = [
+    {
+      name: '',
+      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
+      width: '75px',
+    },
+    {
+      field: 'value',
+      name: '',
+      render: (v: string) => <strong>{v}</strong>,
+    },
+  ];
+
+  const summaryTableTitle = i18n.translate(
+    'xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.summaryTableTitle',
+    {
+      defaultMessage: 'Summary',
+    }
+  );
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerNumberContent'}>
+      <DocumentStatsTable config={config} />
+      <EuiFlexItem className={'dataVisualizerSummaryTableWrapper'}>
+        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
+        <EuiBasicTable<SummaryTableItem>
+          className={'dataVisualizerSummaryTable'}
+          compressed
+          items={summaryTableItems}
+          columns={summaryTableColumns}
+          tableCaption={summaryTableTitle}
+          data-test-subj={'dataVisualizerNumberSummaryTable'}
+        />
+      </EuiFlexItem>
+
+      {stats && (
+        <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" compressed={true} />
+      )}
+      {distribution && (
+        <EuiFlexItem data-test-subj={'dataVisualizerFieldDataMetricDistribution'}>
+          <EuiFlexItem grow={false}>
+            <ExpandedRowFieldHeader>
+              <FormattedMessage
+                id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.distributionTitle"
+                defaultMessage="Distribution"
+              />
+            </ExpandedRowFieldHeader>
+          </EuiFlexItem>
+
+          <EuiFlexItem className={'metricDistributionChartContainer'}>
+            <MetricDistributionChart
+              width={METRIC_DISTRIBUTION_CHART_WIDTH}
+              height={METRIC_DISTRIBUTION_CHART_HEIGHT}
+              chartData={distributionChartData}
+              fieldFormat={fieldFormat}
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiText size="xs">
+              <FormattedMessage
+                id="xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.displayingPercentilesLabel"
+                defaultMessage="Displaying {minPercent} - {maxPercent} percentiles"
+                values={{
+                  minPercent: numberAsOrdinal(distribution.minPercentile),
+                  maxPercent: numberAsOrdinal(distribution.maxPercentile),
+                }}
+              />
+            </EuiText>
+          </EuiFlexItem>
+        </EuiFlexItem>
+      )}
+    </ExpandedRowContent>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.tsx
new file mode 100644
index 0000000000000..98d5cb2ec0fc9
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/other_content.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 React, { FC } from 'react';
+import { EuiFlexItem } from '@elastic/eui';
+import type { FieldDataRowProps } from '../../types/field_data_row';
+import { ExamplesList } from '../../../examples_list';
+import { DocumentStatsTable } from './document_stats';
+import { ExpandedRowContent } from './expanded_row_content';
+
+export const OtherContent: FC<FieldDataRowProps> = ({ config }) => {
+  const { stats } = config;
+  if (stats === undefined) return null;
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerOtherContent'}>
+      <DocumentStatsTable config={config} />
+      {Array.isArray(stats.examples) && (
+        <EuiFlexItem>
+          <ExamplesList examples={stats.examples} />
+        </EuiFlexItem>
+      )}
+    </ExpandedRowContent>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx
new file mode 100644
index 0000000000000..700a715a33396
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_expanded_row/text_content.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, Fragment } from 'react';
+import { EuiCallOut, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+
+import type { FieldDataRowProps } from '../../types/field_data_row';
+import { ExamplesList } from '../../../examples_list';
+import { ExpandedRowContent } from './expanded_row_content';
+
+export const TextContent: FC<FieldDataRowProps> = ({ config }) => {
+  const { stats } = config;
+  if (stats === undefined) return null;
+
+  const { examples } = stats;
+  if (examples === undefined) return null;
+
+  const numExamples = examples.length;
+
+  return (
+    <ExpandedRowContent dataTestSubj={'dataVisualizerTextContent'}>
+      <EuiFlexItem>
+        {numExamples > 0 && <ExamplesList examples={examples} />}
+        {numExamples === 0 && (
+          <Fragment>
+            <EuiSpacer size="xl" />
+            <EuiCallOut
+              title={i18n.translate(
+                'xpack.dataVisualizer.dataGrid.fieldText.noExamplesForFieldsTitle',
+                {
+                  defaultMessage: 'No examples were obtained for this field',
+                }
+              )}
+              iconType="alert"
+            >
+              <FormattedMessage
+                id="xpack.dataVisualizer.dataGrid.fieldText.fieldNotPresentDescription"
+                defaultMessage="This field was not present in the {sourceParam} field of documents queried."
+                values={{
+                  sourceParam: <span className="fieldDataCard__codeContent">_source</span>,
+                }}
+              />
+
+              <EuiSpacer size="s" />
+
+              <FormattedMessage
+                id="xpack.dataVisualizer.dataGrid.fieldText.fieldMayBePopulatedDescription"
+                defaultMessage="It may be populated, for example, using a {copyToParam} parameter in the document mapping, or be pruned from the {sourceParam} field after indexing through the use of {includesParam} and {excludesParam} parameters."
+                values={{
+                  copyToParam: <span className="fieldDataCard__codeContent">copy_to</span>,
+                  sourceParam: <span className="fieldDataCard__codeContent">_source</span>,
+                  includesParam: <span className="fieldDataCard__codeContent">includes</span>,
+                  excludesParam: <span className="fieldDataCard__codeContent">excludes</span>,
+                }}
+              />
+            </EuiCallOut>
+          </Fragment>
+        )}
+      </EuiFlexItem>
+    </ExpandedRowContent>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/_index.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/_index.scss
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx
new file mode 100644
index 0000000000000..ceb2e6f241682
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/boolean_content_preview.tsx
@@ -0,0 +1,42 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useMemo } from 'react';
+import type { EuiDataGridColumn } from '@elastic/eui/src/components/datagrid/data_grid_types';
+import { getTFPercentage } from '../../utils';
+import { ColumnChart } from './column_chart';
+import type { OrdinalChartData } from './field_histograms';
+import type { FieldDataRowProps } from '../../types';
+
+export const BooleanContentPreview: FC<FieldDataRowProps> = ({ config }) => {
+  const chartData = useMemo(() => {
+    const results = getTFPercentage(config);
+    if (results) {
+      const data = [
+        { key: 'true', key_as_string: 'true', doc_count: results.trueCount },
+        { key: 'false', key_as_string: 'false', doc_count: results.falseCount },
+      ];
+      return { id: config.fieldName, cardinality: 2, data, type: 'boolean' } as OrdinalChartData;
+    }
+  }, [config]);
+  if (!chartData || config.fieldName === undefined) return null;
+
+  const columnType: EuiDataGridColumn = {
+    id: config.fieldName,
+    schema: undefined,
+  };
+  const dataTestSubj = `dataVisualizerDataGridChart-${config.fieldName}`;
+
+  return (
+    <ColumnChart
+      dataTestSubj={dataTestSubj}
+      chartData={chartData}
+      columnType={columnType}
+      hideLabel={true}
+    />
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.scss b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/column_chart.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/column_chart.tsx
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/distinct_values.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/distinct_values.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/distinct_values.tsx
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/document_stats.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/document_stats.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/document_stats.tsx
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/field_histograms.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/field_histograms.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/field_histograms.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/index.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.tsx
new file mode 100644
index 0000000000000..651e41b0cbea8
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/number_content_preview.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, { FC, useEffect, useState } from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
+import classNames from 'classnames';
+import {
+  MetricDistributionChart,
+  MetricDistributionChartData,
+  buildChartDataFromStats,
+} from '../metric_distribution_chart';
+import { FieldVisConfig } from '../../types';
+import { kibanaFieldFormat, formatSingleValue } from '../../../utils';
+
+const METRIC_DISTRIBUTION_CHART_WIDTH = 150;
+const METRIC_DISTRIBUTION_CHART_HEIGHT = 80;
+
+export interface NumberContentPreviewProps {
+  config: FieldVisConfig;
+}
+
+export const IndexBasedNumberContentPreview: FC<NumberContentPreviewProps> = ({ config }) => {
+  const { stats, fieldFormat, fieldName } = config;
+  const defaultChartData: MetricDistributionChartData[] = [];
+  const [distributionChartData, setDistributionChartData] = useState(defaultChartData);
+  const [legendText, setLegendText] = useState<{ min: number; max: number } | undefined>();
+  const dataTestSubj = `dataVisualizerDataGridChart-${fieldName}`;
+  useEffect(() => {
+    const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH);
+    if (
+      Array.isArray(chartData) &&
+      chartData[0].x !== undefined &&
+      chartData[chartData.length - 1].x !== undefined
+    ) {
+      setDistributionChartData(chartData);
+      setLegendText({
+        min: formatSingleValue(chartData[0].x),
+        max: formatSingleValue(chartData[chartData.length - 1].x),
+      });
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, []);
+
+  return (
+    <div data-test-subj={dataTestSubj}>
+      <div className="dataGridChart__histogram" data-test-subj={`${dataTestSubj}-histogram`}>
+        <MetricDistributionChart
+          width={METRIC_DISTRIBUTION_CHART_WIDTH}
+          height={METRIC_DISTRIBUTION_CHART_HEIGHT}
+          chartData={distributionChartData}
+          fieldFormat={fieldFormat}
+          hideXAxis={true}
+        />
+      </div>
+      <div className={'dataGridChart__legend'} data-test-subj={`${dataTestSubj}-legend`}>
+        {legendText && (
+          <>
+            <EuiSpacer size="s" />
+            <EuiFlexGroup direction={'row'} data-test-subj={`${dataTestSubj}-legend`}>
+              <EuiFlexItem className={'dataGridChart__legend'}>
+                {kibanaFieldFormat(legendText.min, fieldFormat)}
+              </EuiFlexItem>
+              <EuiFlexItem
+                className={classNames('dataGridChart__legend', 'dataGridChart__legend--numeric')}
+              >
+                {kibanaFieldFormat(legendText.max, fieldFormat)}
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </>
+        )}
+      </div>
+    </div>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.tsx
new file mode 100644
index 0000000000000..4e5af381906bf
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/top_values_preview.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, { FC } from 'react';
+import { EuiDataGridColumn } from '@elastic/eui';
+import { ChartData, OrdinalDataItem } from './field_histograms';
+import { ColumnChart } from './column_chart';
+import type { FieldDataRowProps } from '../../types/field_data_row';
+
+export const TopValuesPreview: FC<FieldDataRowProps> = ({ config }) => {
+  const { stats } = config;
+  if (stats === undefined) return null;
+  const { topValues, cardinality } = stats;
+  if (cardinality === undefined || topValues === undefined || config.fieldName === undefined)
+    return null;
+
+  const data: OrdinalDataItem[] = topValues.map((d) => ({
+    ...d,
+    key: d.key.toString(),
+  }));
+  const chartData: ChartData = {
+    cardinality,
+    data,
+    id: config.fieldName,
+    type: 'ordinal',
+  };
+  const columnType: EuiDataGridColumn = {
+    id: config.fieldName,
+    schema: undefined,
+  };
+  return (
+    <ColumnChart
+      chartData={chartData}
+      columnType={columnType}
+      dataTestSubj={`dataVisualizerDataGridChart-${config.fieldName}`}
+      hideLabel={true}
+      maxChartColumns={10}
+    />
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/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
similarity index 98%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.test.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.test.tsx
index 2c92c366b2d73..aff4d6d62c6c8 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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 '../../../../../../../../../../src/plugins/data/public';
 
 import {
   isNumericChartData,
diff --git a/x-pack/plugins/file_data_visualizer/public/application/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
similarity index 92%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/use_column_chart.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/field_data_row/use_column_chart.tsx
index bd1df7f32c375..2bcf1854235d2 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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 '../../../../../../../../../../src/plugins/data/public';
 
 import {
   isNumericChartData,
@@ -81,13 +81,13 @@ export const getLegendText = (
   maxChartColumns = MAX_CHART_COLUMNS
 ): LegendText => {
   if (chartData.type === 'unsupported') {
-    return i18n.translate('xpack.fileDataVisualizer.dataGridChart.histogramNotAvailable', {
+    return i18n.translate('xpack.dataVisualizer.dataGridChart.histogramNotAvailable', {
       defaultMessage: 'Chart not supported.',
     });
   }
 
   if (chartData.data.length === 0) {
-    return i18n.translate('xpack.fileDataVisualizer.dataGridChart.notEnoughData', {
+    return i18n.translate('xpack.dataVisualizer.dataGridChart.notEnoughData', {
       defaultMessage: `0 documents contain field.`,
     });
   }
@@ -106,14 +106,14 @@ export const getLegendText = (
   }
 
   if (isOrdinalChartData(chartData) && chartData.cardinality <= maxChartColumns) {
-    return i18n.translate('xpack.fileDataVisualizer.dataGridChart.singleCategoryLegend', {
+    return i18n.translate('xpack.dataVisualizer.dataGridChart.singleCategoryLegend', {
       defaultMessage: `{cardinality, plural, one {# category} other {# categories}}`,
       values: { cardinality: chartData.cardinality },
     });
   }
 
   if (isOrdinalChartData(chartData) && chartData.cardinality > maxChartColumns) {
-    return i18n.translate('xpack.fileDataVisualizer.dataGridChart.topCategoriesLegend', {
+    return i18n.translate('xpack.dataVisualizer.dataGridChart.topCategoriesLegend', {
       defaultMessage: `top {maxChartColumns} of {cardinality} categories`,
       values: { cardinality: chartData.cardinality, maxChartColumns },
     });
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/index.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx
new file mode 100644
index 0000000000000..2c4739206d47f
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC } from 'react';
+
+import { i18n } from '@kbn/i18n';
+
+import {
+  AreaSeries,
+  Axis,
+  Chart,
+  CurveType,
+  Position,
+  ScaleType,
+  Settings,
+  TooltipValue,
+  TooltipValueFormatter,
+} from '@elastic/charts';
+
+import { MetricDistributionChartTooltipHeader } from './metric_distribution_chart_tooltip_header';
+import { kibanaFieldFormat } from '../../../utils';
+import { useDataVizChartTheme } from '../../hooks';
+
+interface ChartTooltipValue extends TooltipValue {
+  skipHeader?: boolean;
+}
+
+export interface MetricDistributionChartData {
+  x: number;
+  y: number;
+  dataMin: number;
+  dataMax: number;
+  percent: number;
+}
+
+interface Props {
+  width: number;
+  height: number;
+  chartData: MetricDistributionChartData[];
+  fieldFormat?: any; // Kibana formatter for field being viewed
+  hideXAxis?: boolean;
+}
+
+const SPEC_ID = 'metric_distribution';
+
+export const MetricDistributionChart: FC<Props> = ({
+  width,
+  height,
+  chartData,
+  fieldFormat,
+  hideXAxis,
+}) => {
+  // This value is shown to label the y axis values in the tooltip.
+  // Ideally we wouldn't show these values at all in the tooltip,
+  // but this is not yet possible with Elastic charts.
+  const seriesName = i18n.translate(
+    'xpack.dataVisualizer.dataGrid.field.metricDistributionChart.seriesName',
+    {
+      defaultMessage: 'distribution',
+    }
+  );
+
+  const theme = useDataVizChartTheme();
+
+  const headerFormatter: TooltipValueFormatter = (tooltipData: ChartTooltipValue) => {
+    const xValue = tooltipData.value;
+    const chartPoint: MetricDistributionChartData | undefined = chartData.find(
+      (data) => data.x === xValue
+    );
+
+    return (
+      <MetricDistributionChartTooltipHeader
+        chartPoint={chartPoint}
+        maxWidth={width / 2}
+        fieldFormat={fieldFormat}
+      />
+    );
+  };
+
+  return (
+    <div data-test-subj="dataVisualizerFieldDataMetricDistributionChart">
+      <Chart size={{ width, height }}>
+        <Settings theme={theme} tooltip={{ headerFormatter }} />
+        <Axis
+          id="bottom"
+          position={Position.Bottom}
+          tickFormat={(d) => kibanaFieldFormat(d, fieldFormat)}
+          hide={hideXAxis === true}
+        />
+        <Axis id="left" position={Position.Left} tickFormat={(d) => d.toFixed(3)} hide={true} />
+        <AreaSeries
+          id={SPEC_ID}
+          name={seriesName}
+          xScaleType={ScaleType.Linear}
+          yScaleType={ScaleType.Linear}
+          xAccessor="x"
+          yAccessors={['y']}
+          data={chartData.length > 0 ? chartData : [{ x: 0, y: 0 }]}
+          curve={CurveType.CURVE_STEP_AFTER}
+        />
+      </Chart>
+    </div>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx
new file mode 100644
index 0000000000000..fd3bcdf4fb79b
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { MetricDistributionChartData } from './metric_distribution_chart';
+import { kibanaFieldFormat } from '../../../utils';
+
+interface Props {
+  chartPoint: MetricDistributionChartData | undefined;
+  maxWidth: number;
+  fieldFormat?: any; // Kibana formatter for field being viewed
+}
+
+export const MetricDistributionChartTooltipHeader: FC<Props> = ({
+  chartPoint,
+  maxWidth,
+  fieldFormat,
+}) => {
+  if (chartPoint === undefined) {
+    return null;
+  }
+
+  return (
+    <div style={{ maxWidth }}>
+      {chartPoint.dataMax > chartPoint.dataMin ? (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueBetweenLabel"
+          defaultMessage="{percent}% of documents have values between {minValFormatted} and {maxValFormatted}"
+          values={{
+            percent: chartPoint.percent,
+            minValFormatted: kibanaFieldFormat(chartPoint.dataMin, fieldFormat),
+            maxValFormatted: kibanaFieldFormat(chartPoint.dataMax, fieldFormat),
+          }}
+        />
+      ) : (
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueEqualLabel"
+          defaultMessage="{percent}% of documents have a value of {valFormatted}"
+          values={{
+            percent: chartPoint.percent,
+            valFormatted: kibanaFieldFormat(chartPoint.dataMin, fieldFormat),
+          }}
+        />
+      )}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx
new file mode 100644
index 0000000000000..afadc5c5ae4a4
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/data_visualizer_stats_table.tsx
@@ -0,0 +1,271 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, useState } from 'react';
+
+import {
+  CENTER_ALIGNMENT,
+  EuiBasicTableColumn,
+  EuiButtonIcon,
+  EuiFlexItem,
+  EuiIcon,
+  EuiInMemoryTable,
+  EuiText,
+  HorizontalAlignment,
+  LEFT_ALIGNMENT,
+  RIGHT_ALIGNMENT,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { EuiTableComputedColumnType } from '@elastic/eui/src/components/basic_table/table_types';
+import { JOB_FIELD_TYPES, JobFieldType, DataVisualizerTableState } from '../../../../../common';
+import { FieldTypeIcon } from '../field_type_icon';
+import { DocumentStat } from './components/field_data_row/document_stats';
+import { DistinctValues } from './components/field_data_row/distinct_values';
+import { IndexBasedNumberContentPreview } from './components/field_data_row/number_content_preview';
+
+import { useTableSettings } from './use_table_settings';
+import { TopValuesPreview } from './components/field_data_row/top_values_preview';
+import {
+  FieldVisConfig,
+  FileBasedFieldVisConfig,
+  isIndexBasedFieldVisConfig,
+} from './types/field_vis_config';
+import { FileBasedNumberContentPreview } from '../field_data_row';
+import { BooleanContentPreview } from './components/field_data_row';
+
+const FIELD_NAME = 'fieldName';
+
+export type ItemIdToExpandedRowMap = Record<string, JSX.Element>;
+
+type DataVisualizerTableItem = FieldVisConfig | FileBasedFieldVisConfig;
+interface DataVisualizerTableProps<T> {
+  items: T[];
+  pageState: DataVisualizerTableState;
+  updatePageState: (update: DataVisualizerTableState) => void;
+  getItemIdToExpandedRowMap: (itemIds: string[], items: T[]) => ItemIdToExpandedRowMap;
+  extendedColumns?: Array<EuiBasicTableColumn<T>>;
+}
+
+export const DataVisualizerTable = <T extends DataVisualizerTableItem>({
+  items,
+  pageState,
+  updatePageState,
+  getItemIdToExpandedRowMap,
+  extendedColumns,
+}: DataVisualizerTableProps<T>) => {
+  const [expandedRowItemIds, setExpandedRowItemIds] = useState<string[]>([]);
+  const [expandAll, toggleExpandAll] = useState<boolean>(false);
+
+  const { onTableChange, pagination, sorting } = useTableSettings<T>(
+    items,
+    pageState,
+    updatePageState
+  );
+  const showDistributions: boolean =
+    ('showDistributions' in pageState && pageState.showDistributions) ?? true;
+  const toggleShowDistribution = () => {
+    updatePageState({
+      ...pageState,
+      showDistributions: !showDistributions,
+    });
+  };
+
+  function toggleDetails(item: DataVisualizerTableItem) {
+    if (item.fieldName === undefined) return;
+    const index = expandedRowItemIds.indexOf(item.fieldName);
+    if (index !== -1) {
+      expandedRowItemIds.splice(index, 1);
+    } else {
+      expandedRowItemIds.push(item.fieldName);
+    }
+
+    // spread to a new array otherwise the component wouldn't re-render
+    setExpandedRowItemIds([...expandedRowItemIds]);
+  }
+
+  const columns = useMemo(() => {
+    const expanderColumn: EuiTableComputedColumnType<DataVisualizerTableItem> = {
+      name: (
+        <EuiButtonIcon
+          data-test-subj={`dataVisualizerToggleDetailsForAllRowsButton ${
+            expandAll ? 'expanded' : 'collapsed'
+          }`}
+          onClick={() => toggleExpandAll(!expandAll)}
+          aria-label={
+            !expandAll
+              ? i18n.translate('xpack.dataVisualizer.dataGrid.expandDetailsForAllAriaLabel', {
+                  defaultMessage: 'Expand details for all fields',
+                })
+              : i18n.translate('xpack.dataVisualizer.dataGrid.collapseDetailsForAllAriaLabel', {
+                  defaultMessage: 'Collapse details for all fields',
+                })
+          }
+          iconType={expandAll ? 'arrowUp' : 'arrowDown'}
+        />
+      ),
+      align: RIGHT_ALIGNMENT,
+      width: '40px',
+      isExpander: true,
+      render: (item: DataVisualizerTableItem) => {
+        if (item.fieldName === undefined) return null;
+        const direction = expandedRowItemIds.includes(item.fieldName) ? 'arrowUp' : 'arrowDown';
+        return (
+          <EuiButtonIcon
+            data-test-subj={`dataVisualizerDetailsToggle-${item.fieldName}-${direction}`}
+            onClick={() => toggleDetails(item)}
+            aria-label={
+              expandedRowItemIds.includes(item.fieldName)
+                ? i18n.translate('xpack.dataVisualizer.dataGrid.rowCollapse', {
+                    defaultMessage: 'Hide details for {fieldName}',
+                    values: { fieldName: item.fieldName },
+                  })
+                : i18n.translate('xpack.dataVisualizer.dataGrid.rowExpand', {
+                    defaultMessage: 'Show details for {fieldName}',
+                    values: { fieldName: item.fieldName },
+                  })
+            }
+            iconType={direction}
+          />
+        );
+      },
+      'data-test-subj': 'dataVisualizerTableColumnDetailsToggle',
+    };
+
+    const baseColumns = [
+      expanderColumn,
+      {
+        field: 'type',
+        name: i18n.translate('xpack.dataVisualizer.dataGrid.typeColumnName', {
+          defaultMessage: 'Type',
+        }),
+        render: (fieldType: JobFieldType) => {
+          return <FieldTypeIcon type={fieldType} tooltipEnabled={true} needsAria={true} />;
+        },
+        width: '75px',
+        sortable: true,
+        align: CENTER_ALIGNMENT as HorizontalAlignment,
+        'data-test-subj': 'dataVisualizerTableColumnType',
+      },
+      {
+        field: 'fieldName',
+        name: i18n.translate('xpack.dataVisualizer.dataGrid.nameColumnName', {
+          defaultMessage: 'Name',
+        }),
+        sortable: true,
+        truncateText: true,
+        render: (fieldName: string) => (
+          <EuiText size="s">
+            <b>{fieldName}</b>
+          </EuiText>
+        ),
+        align: LEFT_ALIGNMENT as HorizontalAlignment,
+        'data-test-subj': 'dataVisualizerTableColumnName',
+      },
+      {
+        field: 'docCount',
+        name: i18n.translate('xpack.dataVisualizer.dataGrid.documentsCountColumnName', {
+          defaultMessage: 'Documents (%)',
+        }),
+        render: (value: number | undefined, item: DataVisualizerTableItem) => (
+          <DocumentStat config={item} />
+        ),
+        sortable: (item: DataVisualizerTableItem) => item?.stats?.count,
+        align: LEFT_ALIGNMENT as HorizontalAlignment,
+        'data-test-subj': 'dataVisualizerTableColumnDocumentsCount',
+      },
+      {
+        field: 'stats.cardinality',
+        name: i18n.translate('xpack.dataVisualizer.dataGrid.distinctValuesColumnName', {
+          defaultMessage: 'Distinct values',
+        }),
+        render: (cardinality?: number) => <DistinctValues cardinality={cardinality} />,
+        sortable: true,
+        align: LEFT_ALIGNMENT as HorizontalAlignment,
+        'data-test-subj': 'dataVisualizerTableColumnDistinctValues',
+      },
+      {
+        name: (
+          <div style={{ display: 'flex', alignItems: 'center' }}>
+            <EuiIcon type={'visBarVertical'} style={{ paddingRight: 4 }} />
+            {i18n.translate('xpack.dataVisualizer.dataGrid.distributionsColumnName', {
+              defaultMessage: 'Distributions',
+            })}
+            <EuiButtonIcon
+              style={{ marginLeft: 4 }}
+              size={'s'}
+              iconType={showDistributions ? 'eye' : 'eyeClosed'}
+              onClick={() => toggleShowDistribution()}
+              aria-label={i18n.translate(
+                'xpack.dataVisualizer.dataGrid.showDistributionsAriaLabel',
+                {
+                  defaultMessage: 'Show distributions',
+                }
+              )}
+            />
+          </div>
+        ),
+        render: (item: DataVisualizerTableItem) => {
+          if (item === undefined || showDistributions === false) return null;
+          if (
+            (item.type === JOB_FIELD_TYPES.KEYWORD || item.type === JOB_FIELD_TYPES.IP) &&
+            item.stats?.topValues !== undefined
+          ) {
+            return <TopValuesPreview config={item} />;
+          }
+
+          if (item.type === JOB_FIELD_TYPES.NUMBER) {
+            if (isIndexBasedFieldVisConfig(item) && item.stats?.distribution !== undefined) {
+              return <IndexBasedNumberContentPreview config={item} />;
+            } else {
+              return <FileBasedNumberContentPreview config={item} />;
+            }
+          }
+
+          if (item.type === JOB_FIELD_TYPES.BOOLEAN) {
+            return <BooleanContentPreview config={item} />;
+          }
+
+          return null;
+        },
+        align: LEFT_ALIGNMENT as HorizontalAlignment,
+        'data-test-subj': 'dataVisualizerTableColumnDistribution',
+      },
+    ];
+    return extendedColumns ? [...baseColumns, ...extendedColumns] : baseColumns;
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [expandAll, showDistributions, updatePageState, extendedColumns]);
+
+  const itemIdToExpandedRowMap = useMemo(() => {
+    let itemIds = expandedRowItemIds;
+    if (expandAll) {
+      itemIds = items.map((i) => i[FIELD_NAME]).filter((f) => f !== undefined) as string[];
+    }
+    return getItemIdToExpandedRowMap(itemIds, items);
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [expandAll, items, expandedRowItemIds]);
+
+  return (
+    <EuiFlexItem data-test-subj="dataVisualizerTableContainer">
+      <EuiInMemoryTable<T>
+        className={'dataVisualizer'}
+        items={items}
+        itemId={FIELD_NAME}
+        columns={columns}
+        pagination={pagination}
+        sorting={sorting}
+        isExpandable={true}
+        itemIdToExpandedRowMap={itemIdToExpandedRowMap}
+        isSelectable={false}
+        onTableChange={onTableChange}
+        data-test-subj={'dataVisualizerTable'}
+        rowProps={(item) => ({
+          'data-test-subj': `dataVisualizerRow row-${item.fieldName}`,
+        })}
+      />
+    </EuiFlexItem>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/color_range_legend.tsx b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/color_range_legend.tsx
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/color_range_legend.tsx
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.test.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.test.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts
similarity index 82%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts
index e24134507e3a9..b1d26a5437b44 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_color_range.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_color_range.ts
@@ -12,7 +12,7 @@ import euiThemeDark from '@elastic/eui/dist/eui_theme_dark.json';
 
 import { i18n } from '@kbn/i18n';
 
-import { useFileDataVisualizerKibana } from '../../../kibana_context';
+import { useDataVisualizerKibana } from '../../../../kibana_context';
 
 /**
  * Custom color scale factory that takes the amount of feature influencers
@@ -51,22 +51,19 @@ export enum COLOR_RANGE_SCALE {
 export const colorRangeScaleOptions = [
   {
     value: COLOR_RANGE_SCALE.LINEAR,
-    text: i18n.translate('xpack.fileDataVisualizer.components.colorRangeLegend.linearScaleLabel', {
+    text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.linearScaleLabel', {
       defaultMessage: 'Linear',
     }),
   },
   {
     value: COLOR_RANGE_SCALE.INFLUENCER,
-    text: i18n.translate(
-      'xpack.fileDataVisualizer.components.colorRangeLegend.influencerScaleLabel',
-      {
-        defaultMessage: 'Influencer custom scale',
-      }
-    ),
+    text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.influencerScaleLabel', {
+      defaultMessage: 'Influencer custom scale',
+    }),
   },
   {
     value: COLOR_RANGE_SCALE.SQRT,
-    text: i18n.translate('xpack.fileDataVisualizer.components.colorRangeLegend.sqrtScaleLabel', {
+    text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.sqrtScaleLabel', {
       defaultMessage: 'Sqrt',
     }),
   },
@@ -86,26 +83,20 @@ export enum COLOR_RANGE {
 export const colorRangeOptions = [
   {
     value: COLOR_RANGE.BLUE,
-    text: i18n.translate(
-      'xpack.fileDataVisualizer.components.colorRangeLegend.blueColorRangeLabel',
-      {
-        defaultMessage: 'Blue',
-      }
-    ),
+    text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.blueColorRangeLabel', {
+      defaultMessage: 'Blue',
+    }),
   },
   {
     value: COLOR_RANGE.RED,
-    text: i18n.translate(
-      'xpack.fileDataVisualizer.components.colorRangeLegend.redColorRangeLabel',
-      {
-        defaultMessage: 'Red',
-      }
-    ),
+    text: i18n.translate('xpack.dataVisualizer.components.colorRangeLegend.redColorRangeLabel', {
+      defaultMessage: 'Red',
+    }),
   },
   {
     value: COLOR_RANGE.RED_GREEN,
     text: i18n.translate(
-      'xpack.fileDataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel',
+      'xpack.dataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel',
       {
         defaultMessage: 'Red - Green',
       }
@@ -114,7 +105,7 @@ export const colorRangeOptions = [
   {
     value: COLOR_RANGE.GREEN_RED,
     text: i18n.translate(
-      'xpack.fileDataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel',
+      'xpack.dataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel',
       {
         defaultMessage: 'Green - Red',
       }
@@ -123,7 +114,7 @@ export const colorRangeOptions = [
   {
     value: COLOR_RANGE.YELLOW_GREEN_BLUE,
     text: i18n.translate(
-      'xpack.fileDataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel',
+      'xpack.dataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel',
       {
         defaultMessage: 'Yellow - Green - Blue',
       }
@@ -211,7 +202,7 @@ export type EuiThemeType = typeof euiThemeLight | typeof euiThemeDark;
 export function useCurrentEuiTheme() {
   const {
     services: { uiSettings },
-  } = useFileDataVisualizerKibana();
+  } = useDataVisualizerKibana();
   return useMemo(
     () => ({ euiTheme: uiSettings.get('theme:darkMode') ? euiThemeDark : euiThemeLight }),
     [uiSettings]
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_data_viz_chart_theme.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/hooks/use_data_viz_chart_theme.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/hooks/use_data_viz_chart_theme.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/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
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_data_row.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_data_row.ts
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts
new file mode 100644
index 0000000000000..d58497f6cd7cc
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/field_vis_config.ts
@@ -0,0 +1,58 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { Percentile, JobFieldType, FieldVisStats } from '../../../../../../common/types';
+
+export interface MetricFieldVisStats {
+  avg?: number;
+  distribution?: {
+    percentiles: Percentile[];
+    maxPercentile: number;
+    minPercentile: 0;
+  };
+  max?: number;
+  median?: number;
+  min?: number;
+}
+
+// The internal representation of the configuration used to build the visuals
+// which display the field information.
+export interface FieldVisConfig {
+  type: JobFieldType;
+  fieldName?: string;
+  existsInDocs: boolean;
+  aggregatable: boolean;
+  loading: boolean;
+  stats?: FieldVisStats;
+  fieldFormat?: any;
+  isUnsupportedType?: boolean;
+}
+
+export interface FileBasedFieldVisConfig {
+  type: JobFieldType;
+  fieldName?: string;
+  stats?: FieldVisStats;
+  format?: string;
+}
+
+export interface FileBasedUnknownFieldVisConfig {
+  fieldName: string;
+  type: 'text' | 'unknown';
+  stats: { mean: number; count: number; sampleCount: number; cardinality: number };
+}
+
+export function isFileBasedFieldVisConfig(
+  field: FieldVisConfig | FileBasedFieldVisConfig
+): field is FileBasedFieldVisConfig {
+  return !field.hasOwnProperty('existsInDocs');
+}
+
+export function isIndexBasedFieldVisConfig(
+  field: FieldVisConfig | FileBasedFieldVisConfig
+): field is FieldVisConfig {
+  return field.hasOwnProperty('existsInDocs');
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/index.ts
new file mode 100644
index 0000000000000..171d029482e27
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/types/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { FieldDataRowProps } from './field_data_row';
+export {
+  FieldVisConfig,
+  FileBasedFieldVisConfig,
+  MetricFieldVisStats,
+  isFileBasedFieldVisConfig,
+  isIndexBasedFieldVisConfig,
+} from './field_vis_config';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/use_table_settings.ts
similarity index 96%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/use_table_settings.ts
index e2ff18a8001aa..3fbf333bdc876 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/use_table_settings.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/use_table_settings.ts
@@ -8,7 +8,7 @@
 import { Direction, EuiBasicTableProps, Pagination, PropertySort } from '@elastic/eui';
 import { useCallback, useMemo } from 'react';
 
-import { DataVisualizerTableState } from '../../../../common';
+import { DataVisualizerTableState } from '../../../../../common';
 
 const PAGE_SIZE_OPTIONS = [10, 25, 50];
 
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/utils.ts b/x-pack/plugins/data_visualizer/public/application/common/components/stats_table/utils.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/stats_table/utils.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/stats_table/utils.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/_top_values.scss b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/_top_values.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/top_values/_top_values.scss
rename to x-pack/plugins/data_visualizer/public/application/common/components/top_values/_top_values.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/top_values/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/top_values/index.ts
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
new file mode 100644
index 0000000000000..7a20b054462a6
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/top_values/top_values.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, Fragment } from 'react';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiProgress,
+  EuiSpacer,
+  EuiText,
+  EuiToolTip,
+} from '@elastic/eui';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import classNames from 'classnames';
+import { roundToDecimalPlace, kibanaFieldFormat } from '../utils';
+import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header';
+import { FieldVisStats } from '../../../../../common/types';
+
+interface Props {
+  stats: FieldVisStats | undefined;
+  fieldFormat?: any;
+  barColor?: 'primary' | 'secondary' | 'danger' | 'subdued' | 'accent';
+  compressed?: boolean;
+}
+
+function getPercentLabel(docCount: number, topValuesSampleSize: number): string {
+  const percent = (100 * docCount) / topValuesSampleSize;
+  if (percent >= 0.1) {
+    return `${roundToDecimalPlace(percent, 1)}%`;
+  } else {
+    return '< 0.1%';
+  }
+}
+
+export const TopValues: FC<Props> = ({ stats, fieldFormat, barColor, compressed }) => {
+  if (stats === undefined) return null;
+  const {
+    topValues,
+    topValuesSampleSize,
+    topValuesSamplerShardSize,
+    count,
+    isTopValuesSampled,
+  } = stats;
+  const progressBarMax = isTopValuesSampled === true ? topValuesSampleSize : count;
+  return (
+    <EuiFlexItem data-test-subj={'dataVisualizerFieldDataTopValues'}>
+      <ExpandedRowFieldHeader>
+        <FormattedMessage
+          id="xpack.dataVisualizer.dataGrid.field.topValuesLabel"
+          defaultMessage="Top values"
+        />
+      </ExpandedRowFieldHeader>
+
+      <div
+        data-test-subj="dataVisualizerFieldDataTopValuesContent"
+        className={'fieldDataTopValuesContainer'}
+      >
+        {Array.isArray(topValues) &&
+          topValues.map((value) => (
+            <EuiFlexGroup gutterSize="xs" alignItems="center" key={value.key}>
+              <EuiFlexItem
+                grow={false}
+                className={classNames(
+                  'eui-textTruncate',
+                  'topValuesValueLabelContainer',
+                  `topValuesValueLabelContainer--${compressed === true ? 'small' : 'large'}`
+                )}
+              >
+                <EuiToolTip content={kibanaFieldFormat(value.key, fieldFormat)} position="right">
+                  <EuiText size="xs" textAlign={'right'} color="subdued">
+                    {kibanaFieldFormat(value.key, fieldFormat)}
+                  </EuiText>
+                </EuiToolTip>
+              </EuiFlexItem>
+              <EuiFlexItem data-test-subj="dataVisualizerFieldDataTopValueBar">
+                <EuiProgress
+                  value={value.doc_count}
+                  max={progressBarMax}
+                  color={barColor}
+                  size="m"
+                />
+              </EuiFlexItem>
+              {progressBarMax !== undefined && (
+                <EuiFlexItem
+                  grow={false}
+                  className={classNames('eui-textTruncate', 'topValuesPercentLabelContainer')}
+                >
+                  <EuiText size="xs" textAlign="left" color="subdued">
+                    {getPercentLabel(value.doc_count, progressBarMax)}
+                  </EuiText>
+                </EuiFlexItem>
+              )}
+            </EuiFlexGroup>
+          ))}
+        {isTopValuesSampled === true && (
+          <Fragment>
+            <EuiSpacer size="xs" />
+            <EuiText size="xs" textAlign={'left'}>
+              <FormattedMessage
+                id="xpack.dataVisualizer.dataGrid.field.topValues.calculatedFromSampleDescription"
+                defaultMessage="Calculated from sample of {topValuesSamplerShardSize} documents per shard"
+                values={{
+                  topValuesSamplerShardSize,
+                }}
+              />
+            </EuiText>
+          </Fragment>
+        )}
+      </div>
+    </EuiFlexItem>
+  );
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/format_value.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/format_value.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/format_value.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/format_value.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/index.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/index.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/kibana_field_format.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/kibana_field_format.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/kibana_field_format.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.test.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.test.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/number_as_ordinal.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/number_as_ordinal.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.test.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.test.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.test.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.ts b/x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/utils/round_to_decimal_place.ts
rename to x-pack/plugins/data_visualizer/public/application/common/components/utils/round_to_decimal_place.ts
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
new file mode 100644
index 0000000000000..4396809da64bb
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/components/utils/utils.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { isEqual } from 'lodash';
+import { AnalysisResult, InputOverrides, MB } from '../../../../../../file_upload/common';
+
+export const DEFAULT_LINES_TO_SAMPLE = 1000;
+const UPLOAD_SIZE_MB = 5;
+
+const overrideDefaults = {
+  timestampFormat: undefined,
+  timestampField: undefined,
+  format: undefined,
+  delimiter: undefined,
+  quote: undefined,
+  hasHeaderRow: undefined,
+  charset: undefined,
+  columnNames: undefined,
+  shouldTrimFields: undefined,
+  grokPattern: undefined,
+  linesToSample: undefined,
+};
+
+export function readFile(file: File) {
+  return new Promise((resolve, reject) => {
+    if (file && file.size) {
+      const reader = new FileReader();
+      reader.readAsArrayBuffer(file);
+
+      reader.onload = (() => {
+        return () => {
+          const decoder = new TextDecoder();
+          const data = reader.result;
+          if (data === null || typeof data === 'string') {
+            return reject();
+          }
+          const size = UPLOAD_SIZE_MB * MB;
+          const fileContents = decoder.decode(data.slice(0, size));
+
+          if (fileContents === '') {
+            reject();
+          } else {
+            resolve({ fileContents, data });
+          }
+        };
+      })();
+    } else {
+      reject();
+    }
+  });
+}
+
+export function createUrlOverrides(overrides: InputOverrides, originalSettings: InputOverrides) {
+  const formattedOverrides: InputOverrides = {};
+  for (const o in overrideDefaults) {
+    if (overrideDefaults.hasOwnProperty(o)) {
+      let value = overrides[o];
+      if (
+        (Array.isArray(value) && isEqual(value, originalSettings[o])) ||
+        value === undefined ||
+        value === originalSettings[o]
+      ) {
+        value = '';
+      }
+
+      const snakeCaseO = o.replace(/([A-Z])/g, ($1) => `_${$1.toLowerCase()}`);
+      formattedOverrides[snakeCaseO] = value;
+    }
+  }
+
+  if (formattedOverrides.format === '' && originalSettings.format === 'delimited') {
+    if (
+      formattedOverrides.should_trim_fields !== '' ||
+      formattedOverrides.has_header_row !== '' ||
+      formattedOverrides.delimiter !== '' ||
+      formattedOverrides.quote !== '' ||
+      formattedOverrides.column_names !== ''
+    ) {
+      formattedOverrides.format = originalSettings.format;
+    }
+
+    if (Array.isArray(formattedOverrides.column_names)) {
+      formattedOverrides.column_names = formattedOverrides.column_names.join();
+    }
+  }
+
+  if (formattedOverrides.format === '' && originalSettings.format === 'semi_structured_text') {
+    if (formattedOverrides.grok_pattern !== '') {
+      formattedOverrides.format = originalSettings.format;
+    }
+  }
+
+  if (formattedOverrides.format === 'ndjson' || originalSettings.format === 'ndjson') {
+    formattedOverrides.should_trim_fields = '';
+    formattedOverrides.has_header_row = '';
+    formattedOverrides.delimiter = '';
+    formattedOverrides.quote = '';
+    formattedOverrides.column_names = '';
+  }
+
+  if (formattedOverrides.lines_to_sample === '') {
+    formattedOverrides.lines_to_sample = overrides.linesToSample;
+  }
+
+  return formattedOverrides;
+}
+
+export function processResults({ results, overrides }: AnalysisResult) {
+  const timestampFormat =
+    results.java_timestamp_formats !== undefined && results.java_timestamp_formats.length
+      ? results.java_timestamp_formats[0]
+      : undefined;
+
+  const linesToSample =
+    overrides !== undefined && overrides.lines_to_sample !== undefined
+      ? overrides.lines_to_sample
+      : DEFAULT_LINES_TO_SAMPLE;
+
+  return {
+    format: results.format,
+    delimiter: results.delimiter,
+    timestampField: results.timestamp_field,
+    timestampFormat,
+    quote: results.quote,
+    hasHeaderRow: results.has_header_row,
+    shouldTrimFields: results.should_trim_fields,
+    charset: results.charset,
+    columnNames: results.column_names,
+    grokPattern: results.grok_pattern,
+    linesToSample,
+  };
+}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.test.ts
similarity index 95%
rename from x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts
rename to x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.test.ts
index 6f81c0bf4e7d3..5c0867c7a0745 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.test.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { JOB_FIELD_TYPES } from '../../../common';
+import { JOB_FIELD_TYPES } from '../../../../common';
 import { getJobTypeAriaLabel, jobTypeAriaLabels } from './field_types_utils';
 
 describe('field type utils', () => {
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
new file mode 100644
index 0000000000000..e0a6c8ebf85c9
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/field_types_utils.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 { i18n } from '@kbn/i18n';
+import { JOB_FIELD_TYPES } from '../../../../common';
+import type { IndexPatternField } from '../../../../../../../src/plugins/data/common/index_patterns/fields';
+import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
+
+export const jobTypeAriaLabels = {
+  BOOLEAN: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.booleanTypeAriaLabel', {
+    defaultMessage: 'boolean type',
+  }),
+  DATE: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.dateTypeAriaLabel', {
+    defaultMessage: 'date type',
+  }),
+  GEO_POINT: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.geoPointTypeAriaLabel', {
+    defaultMessage: '{geoPointParam} type',
+    values: {
+      geoPointParam: 'geo point',
+    },
+  }),
+  IP: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.ipTypeAriaLabel', {
+    defaultMessage: 'ip type',
+  }),
+  KEYWORD: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.keywordTypeAriaLabel', {
+    defaultMessage: 'keyword type',
+  }),
+  NUMBER: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.numberTypeAriaLabel', {
+    defaultMessage: 'number type',
+  }),
+  TEXT: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.textTypeAriaLabel', {
+    defaultMessage: 'text type',
+  }),
+  UNKNOWN: i18n.translate('xpack.dataVisualizer.fieldTypeIcon.unknownTypeAriaLabel', {
+    defaultMessage: 'unknown type',
+  }),
+};
+
+export const getJobTypeAriaLabel = (type: string) => {
+  const requestedFieldType = Object.keys(JOB_FIELD_TYPES).find(
+    (k) => JOB_FIELD_TYPES[k as keyof typeof JOB_FIELD_TYPES] === type
+  );
+  if (requestedFieldType === undefined) {
+    return null;
+  }
+  return jobTypeAriaLabels[requestedFieldType as keyof typeof jobTypeAriaLabels];
+};
+
+// convert kibana types to ML Job types
+// this is needed because kibana types only have string and not text and keyword.
+// and we can't use ES_FIELD_TYPES because it has no NUMBER type
+export function kbnTypeToJobType(field: IndexPatternField) {
+  // Return undefined if not one of the supported data visualizer field types.
+  let type;
+  switch (field.type) {
+    case KBN_FIELD_TYPES.STRING:
+      type = field.aggregatable ? JOB_FIELD_TYPES.KEYWORD : JOB_FIELD_TYPES.TEXT;
+      break;
+    case KBN_FIELD_TYPES.NUMBER:
+      type = JOB_FIELD_TYPES.NUMBER;
+      break;
+    case KBN_FIELD_TYPES.DATE:
+      type = JOB_FIELD_TYPES.DATE;
+      break;
+    case KBN_FIELD_TYPES.IP:
+      type = JOB_FIELD_TYPES.IP;
+      break;
+    case KBN_FIELD_TYPES.BOOLEAN:
+      type = JOB_FIELD_TYPES.BOOLEAN;
+      break;
+    case KBN_FIELD_TYPES.GEO_POINT:
+      type = JOB_FIELD_TYPES.GEO_POINT;
+      break;
+    case KBN_FIELD_TYPES.GEO_SHAPE:
+      type = JOB_FIELD_TYPES.GEO_SHAPE;
+      break;
+
+    default:
+      break;
+  }
+
+  return type;
+}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts b/x-pack/plugins/data_visualizer/public/application/common/util/get_max_bytes.ts
similarity index 89%
rename from x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts
rename to x-pack/plugins/data_visualizer/public/application/common/util/get_max_bytes.ts
index 821a94bf5166d..e4f8e69470c8b 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/util/get_max_bytes.ts
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/get_max_bytes.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getPluginsStart } from '../../kibana_services';
+import { getPluginsStart } from '../../../kibana_services';
 
 // expose the fileUpload plugin's getMaxBytesFormatted for use in ML
 // so ML doesn't need to depend on the fileUpload plugin for this one function
diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.test.ts b/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.test.ts
new file mode 100644
index 0000000000000..a1608960a91bc
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.test.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 { parseInterval } from './parse_interval';
+
+describe('ML parse interval util', () => {
+  test('should correctly parse an interval containing a valid unit and value', () => {
+    expect(parseInterval('1d')!.as('d')).toBe(1);
+    expect(parseInterval('2y')!.as('y')).toBe(2);
+    expect(parseInterval('5M')!.as('M')).toBe(5);
+    expect(parseInterval('5m')!.as('m')).toBe(5);
+    expect(parseInterval('250ms')!.as('ms')).toBe(250);
+    expect(parseInterval('100s')!.as('s')).toBe(100);
+    expect(parseInterval('23d')!.as('d')).toBe(23);
+    expect(parseInterval('52w')!.as('w')).toBe(52);
+    expect(parseInterval('0s')!.as('s')).toBe(0);
+    expect(parseInterval('0s')!.as('h')).toBe(0);
+  });
+
+  test('should correctly handle zero value intervals', () => {
+    expect(parseInterval('0h')!.as('h')).toBe(0);
+    expect(parseInterval('0d')).toBe(null);
+  });
+
+  test('should return null for an invalid interval', () => {
+    expect(parseInterval('')).toBe(null);
+    expect(parseInterval('234asdf')).toBe(null);
+    expect(parseInterval('m')).toBe(null);
+    expect(parseInterval('1.5h')).toBe(null);
+  });
+
+  test('should correctly check for whether the interval units are valid Elasticsearch time units', () => {
+    expect(parseInterval('100s', true)!.as('s')).toBe(100);
+    expect(parseInterval('5m', true)!.as('m')).toBe(5);
+    expect(parseInterval('24h', true)!.as('h')).toBe(24);
+    expect(parseInterval('7d', true)!.as('d')).toBe(7);
+    expect(parseInterval('1w', true)).toBe(null);
+    expect(parseInterval('1M', true)).toBe(null);
+    expect(parseInterval('1y', true)).toBe(null);
+  });
+});
diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.ts b/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.ts
new file mode 100644
index 0000000000000..6ca280dc12ebd
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/parse_interval.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 { duration, Duration, unitOfTime } from 'moment';
+import dateMath from '@elastic/datemath';
+
+type SupportedUnits = unitOfTime.Base;
+
+// Assume interval is in the form (value)(unit), such as "1h"
+const INTERVAL_STRING_RE = new RegExp('^([0-9]*)\\s*(' + dateMath.units.join('|') + ')$');
+
+// moment.js is only designed to allow fractional values between 0 and 1
+// for units of hour or less.
+const SUPPORT_ZERO_DURATION_UNITS: SupportedUnits[] = ['ms', 's', 'm', 'h'];
+
+// List of time units which are supported for use in Elasticsearch durations
+// (such as anomaly detection job bucket spans)
+// See https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units
+const SUPPORT_ES_DURATION_UNITS: SupportedUnits[] = ['ms', 's', 'm', 'h', 'd'];
+
+// Parses an interval String, such as 7d, 1h or 30m to a moment duration.
+// Optionally carries out an additional check that the interval is supported as a
+// time unit by Elasticsearch, as units greater than 'd' for example cannot be used
+// for anomaly detection job bucket spans.
+// Differs from the Kibana ui/utils/parse_interval in the following ways:
+// 1. A value-less interval such as 'm' is not allowed - in line with the ML back-end
+// not accepting such interval Strings for the bucket span of a job.
+// 2.  Zero length durations 0ms, 0s, 0m and 0h are accepted as-is.
+// Note that when adding or subtracting fractional durations, moment is only designed
+// to work with units less than 'day'.
+// 3. Fractional intervals e.g. 1.5h or 4.5d are not allowed, in line with the behaviour
+// of the Elasticsearch date histogram aggregation.
+export function parseInterval(
+  interval: string | number,
+  checkValidEsUnit = false
+): Duration | null {
+  const matches = String(interval).trim().match(INTERVAL_STRING_RE);
+  if (!Array.isArray(matches) || matches.length < 3) {
+    return null;
+  }
+
+  try {
+    const value = parseInt(matches[1], 10);
+    const unit = matches[2] as SupportedUnits;
+
+    // In line with moment.js, only allow zero value intervals when the unit is less than 'day'.
+    // And check for isNaN as e.g. valueless 'm' will pass the regex test,
+    // plus an optional check that the unit is not w/M/y which are not fully supported by ES.
+    if (
+      isNaN(value) ||
+      (value < 1 && SUPPORT_ZERO_DURATION_UNITS.indexOf(unit) === -1) ||
+      (checkValidEsUnit === true && SUPPORT_ES_DURATION_UNITS.indexOf(unit) === -1)
+    ) {
+      return null;
+    }
+
+    return duration(value, unit);
+  } catch (e) {
+    return null;
+  }
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/common/util/url_state.tsx b/x-pack/plugins/data_visualizer/public/application/common/util/url_state.tsx
new file mode 100644
index 0000000000000..8ee517e60e6d8
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/common/util/url_state.tsx
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { parse } from 'query-string';
+import { createContext, useCallback, useContext, useMemo } from 'react';
+// @ts-ignore
+import { decode } from 'rison-node';
+
+export interface Dictionary<TValue> {
+  [id: string]: TValue;
+}
+
+// duplicate of ml/object_utils
+export const getNestedProperty = (
+  obj: Record<string, any>,
+  accessor: string,
+  defaultValue?: any
+) => {
+  const value = accessor.split('.').reduce((o, i) => o?.[i], obj);
+
+  if (value === undefined) return defaultValue;
+
+  return value;
+};
+
+export type Accessor = '_a' | '_g';
+export type SetUrlState = (
+  accessor: Accessor,
+  attribute: string | Dictionary<any>,
+  value?: any,
+  replaceState?: boolean
+) => void;
+export interface UrlState {
+  searchString: string;
+  setUrlState: SetUrlState;
+}
+
+/**
+ * Set of URL query parameters that require the rison serialization.
+ */
+const risonSerializedParams = new Set(['_a', '_g']);
+
+/**
+ * Checks if the URL query parameter requires rison serialization.
+ * @param queryParam
+ */
+export function isRisonSerializationRequired(queryParam: string): boolean {
+  return risonSerializedParams.has(queryParam);
+}
+
+export function parseUrlState(search: string): Dictionary<any> {
+  const urlState: Dictionary<any> = {};
+  const parsedQueryString = parse(search, { sort: false });
+
+  try {
+    Object.keys(parsedQueryString).forEach((a) => {
+      if (isRisonSerializationRequired(a)) {
+        urlState[a] = decode(parsedQueryString[a] as string);
+      } else {
+        urlState[a] = parsedQueryString[a];
+      }
+    });
+  } catch (error) {
+    // eslint-disable-next-line no-console
+    console.error('Could not read url state', error);
+  }
+
+  return urlState;
+}
+
+// Compared to the original appState/globalState,
+// this no longer makes use of fetch/save methods.
+// - Reading from `location.search` is the successor of `fetch`.
+// - `history.push()` is the successor of `save`.
+// - The exposed state and set call make use of the above and make sure that
+//   different urlStates(e.g. `_a` / `_g`) don't overwrite each other.
+// This uses a context to be able to maintain only one instance
+// of the url state. It gets passed down with `UrlStateProvider`
+// and can be used via `useUrlState`.
+export const dataVisualizerUrlStateStore = createContext<UrlState>({
+  searchString: '',
+  setUrlState: () => {},
+});
+
+export const { Provider } = dataVisualizerUrlStateStore;
+
+export const useUrlState = (accessor: Accessor) => {
+  const { searchString, setUrlState: setUrlStateContext } = useContext(dataVisualizerUrlStateStore);
+
+  const urlState = useMemo(() => {
+    const fullUrlState = parseUrlState(searchString);
+    if (typeof fullUrlState === 'object') {
+      return fullUrlState[accessor];
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [searchString]);
+
+  const setUrlState = useCallback(
+    (attribute: string | Dictionary<any>, value?: any, replaceState?: boolean) => {
+      setUrlStateContext(accessor, attribute, value, replaceState);
+    },
+    [accessor, setUrlStateContext]
+  );
+  return [urlState, setUrlState];
+};
+
+export type AppStateKey = 'DATA_VISUALIZER_INDEX_VIEWER';
+
+/**
+ * Hook for managing the URL state of the page.
+ */
+export const usePageUrlState = <PageUrlState extends {}>(
+  pageKey: AppStateKey,
+  defaultState?: PageUrlState
+): [PageUrlState, (update: Partial<PageUrlState>, replaceState?: boolean) => void] => {
+  const [appState, setAppState] = useUrlState('_a');
+  const pageState = appState?.[pageKey];
+
+  const resultPageState: PageUrlState = useMemo(() => {
+    return {
+      ...(defaultState ?? {}),
+      ...(pageState ?? {}),
+    };
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [pageState]);
+
+  const onStateUpdate = useCallback(
+    (update: Partial<PageUrlState>, replaceState?: boolean) => {
+      setAppState(
+        pageKey,
+        {
+          ...resultPageState,
+          ...update,
+        },
+        replaceState
+      );
+    },
+    [pageKey, resultPageState, setAppState]
+  );
+
+  return useMemo(() => {
+    return [resultPageState, onStateUpdate];
+  }, [resultPageState, onStateUpdate]);
+};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/_index.scss
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/_index.scss
new file mode 100644
index 0000000000000..1973f51e0a59e
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/_index.scss
@@ -0,0 +1,7 @@
+@import 'analysis_summary/index';
+@import 'edit_flyout/index';
+@import 'file_contents/index';
+@import 'import_summary/index';
+@import 'file_data_visualizer_view/index';
+@import 'results_view/index';
+@import 'about_panel/index';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_about_panel.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/_about_panel.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_about_panel.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/_about_panel.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/about_panel.tsx
similarity index 87%
rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/about_panel.tsx
index e4f59c492fa1c..a176450250ba9 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/about_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/about_panel.tsx
@@ -30,7 +30,7 @@ interface Props {
 
 export const AboutPanel: FC<Props> = ({ onFilePickerChange }) => {
   return (
-    <EuiPage restrictWidth={1000} data-test-subj="mlPageFileDataVisualizerUpload">
+    <EuiPage restrictWidth={1000} data-test-subj="dataVisualizerPageFileUpload">
       <EuiPageBody>
         <EuiPageContent className="file-datavisualizer-about-panel__content">
           <EuiFlexGroup gutterSize="xl">
@@ -43,7 +43,7 @@ export const AboutPanel: FC<Props> = ({ onFilePickerChange }) => {
                 <EuiFilePicker
                   id="filePicker"
                   initialPromptText={i18n.translate(
-                    'xpack.fileDataVisualizer.aboutPanel.selectOrDragAndDropFileDescription',
+                    'xpack.dataVisualizer.file.aboutPanel.selectOrDragAndDropFileDescription',
                     {
                       defaultMessage: 'Select or drag and drop a file',
                     }
@@ -63,14 +63,14 @@ export const AboutPanel: FC<Props> = ({ onFilePickerChange }) => {
 
 export const LoadingPanel: FC = () => {
   return (
-    <EuiPage restrictWidth={400} data-test-subj="mlPageFileDataVisLoading">
+    <EuiPage restrictWidth={400} data-test-subj="dataVisualizerPageFileLoading">
       <EuiPageBody>
         <EuiPageContent className="file-datavisualizer-about-panel__content" paddingSize="l">
           <div style={{ textAlign: 'center' }}>
             <EuiTitle size="s">
               <h1 role="alert">
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.aboutPanel.analyzingDataTitle"
+                  id="xpack.dataVisualizer.file.aboutPanel.analyzingDataTitle"
                   defaultMessage="Analyzing data"
                 />
               </h1>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx
similarity index 81%
rename from x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx
index 684b6dadcb290..86b869fe06fa1 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/about_panel/welcome_content.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/about_panel/welcome_content.tsx
@@ -19,13 +19,13 @@ import {
   EuiTitle,
 } from '@elastic/eui';
 
-import { ExperimentalBadge } from '../experimental_badge';
+import { ExperimentalBadge } from '../../../common/components/experimental_badge';
 
-import { useFileDataVisualizerKibana } from '../../kibana_context';
+import { useDataVisualizerKibana } from '../../../kibana_context';
 
 export const WelcomeContent: FC = () => {
   const toolTipContent = i18n.translate(
-    'xpack.fileDataVisualizer.welcomeContent.experimentalFeatureTooltip',
+    'xpack.dataVisualizer.file.welcomeContent.experimentalFeatureTooltip',
     {
       defaultMessage: "Experimental feature. We'd love to hear your feedback.",
     }
@@ -35,7 +35,7 @@ export const WelcomeContent: FC = () => {
     services: {
       fileUpload: { getMaxBytesFormatted },
     },
-  } = useFileDataVisualizerKibana();
+  } = useDataVisualizerKibana();
   const maxFileSize = getMaxBytesFormatted();
 
   return (
@@ -47,7 +47,7 @@ export const WelcomeContent: FC = () => {
         <EuiTitle size="m">
           <h1>
             <FormattedMessage
-              id="xpack.fileDataVisualizer.welcomeContent.visualizeDataFromLogFileTitle"
+              id="xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileTitle"
               defaultMessage="Visualize data from a log file&nbsp;{experimentalBadge}"
               values={{
                 experimentalBadge: <ExperimentalBadge tooltipContent={toolTipContent} />,
@@ -59,7 +59,7 @@ export const WelcomeContent: FC = () => {
         <EuiText>
           <p>
             <FormattedMessage
-              id="xpack.fileDataVisualizer.welcomeContent.visualizeDataFromLogFileDescription"
+              id="xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileDescription"
               defaultMessage="The File Data Visualizer helps you understand the fields and metrics in a log file.
               Upload your file, analyze its data, and then choose whether to import the data into an Elasticsearch index."
             />
@@ -69,7 +69,7 @@ export const WelcomeContent: FC = () => {
         <EuiText>
           <p>
             <FormattedMessage
-              id="xpack.fileDataVisualizer.welcomeContent.supportedFileFormatDescription"
+              id="xpack.dataVisualizer.file.welcomeContent.supportedFileFormatDescription"
               defaultMessage="The File Data Visualizer supports these file formats:"
             />
           </p>
@@ -83,7 +83,7 @@ export const WelcomeContent: FC = () => {
             <EuiText>
               <p>
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.welcomeContent.delimitedTextFilesDescription"
+                  id="xpack.dataVisualizer.file.welcomeContent.delimitedTextFilesDescription"
                   defaultMessage="Delimited text files, such as CSV and TSV"
                 />
               </p>
@@ -99,7 +99,7 @@ export const WelcomeContent: FC = () => {
             <EuiText>
               <p>
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.welcomeContent.newlineDelimitedJsonDescription"
+                  id="xpack.dataVisualizer.file.welcomeContent.newlineDelimitedJsonDescription"
                   defaultMessage="Newline-delimited JSON"
                 />
               </p>
@@ -115,7 +115,7 @@ export const WelcomeContent: FC = () => {
             <EuiText>
               <p>
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.welcomeContent.logFilesWithCommonFormatDescription"
+                  id="xpack.dataVisualizer.file.welcomeContent.logFilesWithCommonFormatDescription"
                   defaultMessage="Log files with a common format for the timestamp"
                 />
               </p>
@@ -126,7 +126,7 @@ export const WelcomeContent: FC = () => {
         <EuiText>
           <p>
             <FormattedMessage
-              id="xpack.fileDataVisualizer.welcomeContent.uploadedFilesAllowedSizeDescription"
+              id="xpack.dataVisualizer.file.welcomeContent.uploadedFilesAllowedSizeDescription"
               defaultMessage="You can upload files up to {maxFileSize}."
               values={{ maxFileSize }}
             />
@@ -136,7 +136,7 @@ export const WelcomeContent: FC = () => {
         <EuiText>
           <p>
             <FormattedMessage
-              id="xpack.fileDataVisualizer.welcomeContent.experimentalFeatureDescription"
+              id="xpack.dataVisualizer.file.welcomeContent.experimentalFeatureDescription"
               defaultMessage="This feature is experimental. Got feedback? Please create an issue in&nbsp;{githubLink}."
               values={{
                 githubLink: (
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_analysis_summary.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_analysis_summary.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_analysis_summary.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/analysis_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
similarity index 80%
rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/analysis_summary.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/analysis_summary.tsx
index 58177ea34286c..2fd4151f71ecf 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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 { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 export const AnalysisSummary: FC<{ results: FindFileStructureResponse }> = ({ results }) => {
   const items = createDisplayItems(results);
@@ -19,7 +19,7 @@ export const AnalysisSummary: FC<{ results: FindFileStructureResponse }> = ({ re
       <EuiTitle size="s">
         <h2>
           <FormattedMessage
-            id="xpack.fileDataVisualizer.analysisSummary.summaryTitle"
+            id="xpack.dataVisualizer.file.analysisSummary.summaryTitle"
             defaultMessage="Summary"
           />
         </h2>
@@ -37,7 +37,7 @@ function createDisplayItems(results: FindFileStructureResponse) {
     {
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.analysisSummary.analyzedLinesNumberTitle"
+          id="xpack.dataVisualizer.file.analysisSummary.analyzedLinesNumberTitle"
           defaultMessage="Number of lines analyzed"
         />
       ),
@@ -53,7 +53,7 @@ function createDisplayItems(results: FindFileStructureResponse) {
     items.push({
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.analysisSummary.formatTitle"
+          id="xpack.dataVisualizer.file.analysisSummary.formatTitle"
           defaultMessage="Format"
         />
       ),
@@ -64,7 +64,7 @@ function createDisplayItems(results: FindFileStructureResponse) {
       items.push({
         title: (
           <FormattedMessage
-            id="xpack.fileDataVisualizer.analysisSummary.delimiterTitle"
+            id="xpack.dataVisualizer.file.analysisSummary.delimiterTitle"
             defaultMessage="Delimiter"
           />
         ),
@@ -74,7 +74,7 @@ function createDisplayItems(results: FindFileStructureResponse) {
       items.push({
         title: (
           <FormattedMessage
-            id="xpack.fileDataVisualizer.analysisSummary.hasHeaderRowTitle"
+            id="xpack.dataVisualizer.file.analysisSummary.hasHeaderRowTitle"
             defaultMessage="Has header row"
           />
         ),
@@ -87,7 +87,7 @@ function createDisplayItems(results: FindFileStructureResponse) {
     items.push({
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.analysisSummary.grokPatternTitle"
+          id="xpack.dataVisualizer.file.analysisSummary.grokPatternTitle"
           defaultMessage="Grok pattern"
         />
       ),
@@ -99,7 +99,7 @@ function createDisplayItems(results: FindFileStructureResponse) {
     items.push({
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.analysisSummary.timeFieldTitle"
+          id="xpack.dataVisualizer.file.analysisSummary.timeFieldTitle"
           defaultMessage="Time field"
         />
       ),
@@ -111,7 +111,7 @@ function createDisplayItems(results: FindFileStructureResponse) {
     items.push({
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.analysisSummary.timeFormatTitle"
+          id="xpack.dataVisualizer.file.analysisSummary.timeFormatTitle"
           defaultMessage="Time {timestampFormats, plural, zero {format} one {format} other {formats}}"
           values={{
             timestampFormats: results.java_timestamp_formats.length,
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/analysis_summary/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/analysis_summary/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx
similarity index 81%
rename from x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx
index 30ce7a4c67f99..fb8ba63af36dc 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/bottom_bar.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/bottom_bar.tsx
@@ -16,7 +16,7 @@ import {
   EuiToolTip,
 } from '@elastic/eui';
 
-import { MODE as DATAVISUALIZER_MODE } from '../file_datavisualizer_view/constants';
+import { MODE as DATAVISUALIZER_MODE } from '../file_data_visualizer_view/constants';
 
 interface BottomBarProps {
   mode: DATAVISUALIZER_MODE;
@@ -39,7 +39,7 @@ export const BottomBar: FC<BottomBarProps> = ({ mode, onChangeMode, onCancel, di
               content={
                 disableImport ? (
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.bottomBar.missingImportPrivilegesMessage"
+                    id="xpack.dataVisualizer.file.bottomBar.missingImportPrivilegesMessage"
                     defaultMessage="You require the ingest_admin role to enable data importing"
                   />
                 ) : null
@@ -49,10 +49,10 @@ export const BottomBar: FC<BottomBarProps> = ({ mode, onChangeMode, onCancel, di
                 fill
                 isDisabled={disableImport}
                 onClick={() => onChangeMode(DATAVISUALIZER_MODE.IMPORT)}
-                data-test-subj="mlFileDataVisOpenImportPageButton"
+                data-test-subj="dataVisualizerFileOpenImportPageButton"
               >
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.bottomBar.readMode.importButtonLabel"
+                  id="xpack.dataVisualizer.file.bottomBar.readMode.importButtonLabel"
                   defaultMessage="Import"
                 />
               </EuiButton>
@@ -61,7 +61,7 @@ export const BottomBar: FC<BottomBarProps> = ({ mode, onChangeMode, onCancel, di
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty color="ghost" onClick={() => onCancel()}>
               <FormattedMessage
-                id="xpack.fileDataVisualizer.bottomBar.readMode.cancelButtonLabel"
+                id="xpack.dataVisualizer.file.bottomBar.readMode.cancelButtonLabel"
                 defaultMessage="Cancel"
               />
             </EuiButtonEmpty>
@@ -76,7 +76,7 @@ export const BottomBar: FC<BottomBarProps> = ({ mode, onChangeMode, onCancel, di
           <EuiFlexItem grow={false}>
             <EuiButton color="ghost" onClick={() => onChangeMode(DATAVISUALIZER_MODE.READ)}>
               <FormattedMessage
-                id="xpack.fileDataVisualizer.bottomBar.backButtonLabel"
+                id="xpack.dataVisualizer.file.bottomBar.backButtonLabel"
                 defaultMessage="Back"
               />
             </EuiButton>
@@ -84,7 +84,7 @@ export const BottomBar: FC<BottomBarProps> = ({ mode, onChangeMode, onCancel, di
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty color="ghost" onClick={() => onCancel()}>
               <FormattedMessage
-                id="xpack.fileDataVisualizer.bottomBar.cancelButtonLabel"
+                id="xpack.dataVisualizer.file.bottomBar.cancelButtonLabel"
                 defaultMessage="Cancel"
               />
             </EuiButtonEmpty>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/bottom_bar/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/bottom_bar/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
similarity index 96%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
index 00dd652457daf..8b69f7d742489 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/__snapshots__/overrides.test.js.snap
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/__snapshots__/overrides.test.js.snap
@@ -13,7 +13,7 @@ exports[`Overrides render overrides 1`] = `
     label={
       <FormattedMessage
         defaultMessage="Number of lines to sample"
-        id="xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleFormRowLabel"
+        id="xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleFormRowLabel"
         values={Object {}}
       />
     }
@@ -33,7 +33,7 @@ exports[`Overrides render overrides 1`] = `
     label={
       <FormattedMessage
         defaultMessage="Data format"
-        id="xpack.fileDataVisualizer.editFlyout.overrides.dataFormatFormRowLabel"
+        id="xpack.dataVisualizer.file.editFlyout.overrides.dataFormatFormRowLabel"
         values={Object {}}
       />
     }
@@ -94,7 +94,7 @@ exports[`Overrides render overrides 1`] = `
     label={
       <FormattedMessage
         defaultMessage="Timestamp format"
-        id="xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatFormRowLabel"
+        id="xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatFormRowLabel"
         values={Object {}}
       />
     }
@@ -335,7 +335,7 @@ exports[`Overrides render overrides 1`] = `
     label={
       <FormattedMessage
         defaultMessage="Time field"
-        id="xpack.fileDataVisualizer.editFlyout.overrides.timeFieldFormRowLabel"
+        id="xpack.dataVisualizer.file.editFlyout.overrides.timeFieldFormRowLabel"
         values={Object {}}
       />
     }
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_edit_flyout.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_edit_flyout.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_edit_flyout.scss
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss
new file mode 100644
index 0000000000000..28489c50f19b4
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/_index.scss
@@ -0,0 +1 @@
+@import 'edit_flyout';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js
similarity index 91%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js
index 7cdee6f823bd6..cc6f5c45b3105 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/edit_flyout.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/edit_flyout.js
@@ -69,7 +69,7 @@ export class EditFlyout extends Component {
               <EuiTitle>
                 <h2>
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.editFlyout.overrideSettingsTitle"
+                    id="xpack.dataVisualizer.file.editFlyout.overrideSettingsTitle"
                     defaultMessage="Override settings"
                   />
                 </h2>
@@ -96,7 +96,7 @@ export class EditFlyout extends Component {
                 <EuiFlexItem grow={false}>
                   <EuiButtonEmpty iconType="cross" onClick={closeEditFlyout} flush="left">
                     <FormattedMessage
-                      id="xpack.fileDataVisualizer.editFlyout.closeOverrideSettingsButtonLabel"
+                      id="xpack.dataVisualizer.file.editFlyout.closeOverrideSettingsButtonLabel"
                       defaultMessage="Close"
                     />
                   </EuiButtonEmpty>
@@ -108,7 +108,7 @@ export class EditFlyout extends Component {
                     fill
                   >
                     <FormattedMessage
-                      id="xpack.fileDataVisualizer.editFlyout.applyOverrideSettingsButtonLabel"
+                      id="xpack.dataVisualizer.file.editFlyout.applyOverrideSettingsButtonLabel"
                       defaultMessage="Apply"
                     />
                   </EuiButton>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/index.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/index.js
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/index.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/index.js
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/option_lists.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/option_lists.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/option_lists.js
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/options.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/options/options.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/options/options.js
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
similarity index 91%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
index cb0839b335a97..b7eb790d2cf4e 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.js
@@ -31,7 +31,7 @@ import {
   // getCharsetOptions,
 } from './options';
 import { isTimestampFormatValid } from './overrides_validation';
-import { withKibana } from '../../../../../../../src/plugins/kibana_react/public';
+import { withKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 
 import { TIMESTAMP_OPTIONS, CUSTOM_DROPDOWN_OPTION } from './options/option_lists';
 
@@ -52,7 +52,7 @@ class OverridesUI extends Component {
   }
 
   linesToSampleErrors = i18n.translate(
-    'xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleErrorMessage',
+    'xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleErrorMessage',
     {
       defaultMessage: 'Value must be greater than {min} and less than or equal to {max}',
       values: {
@@ -63,7 +63,7 @@ class OverridesUI extends Component {
   );
 
   customTimestampFormatErrors = i18n.translate(
-    'xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatErrorMessage',
+    'xpack.dataVisualizer.file.editFlyout.overrides.customTimestampFormatErrorMessage',
     {
       defaultMessage: `Timestamp format must be a combination of these Java date/time formats:
       yy, yyyy, M, MM, MMM, MMMM, d, dd, EEE, EEEE, H, HH, h, mm, ss, S through SSSSSSSSS, a, XX, XXX, zzz`,
@@ -274,9 +274,12 @@ class OverridesUI extends Component {
     const timestampFormatHelp = (
       <EuiText size="xs">
         <EuiLink href={docsUrl} target="_blank">
-          {i18n.translate('xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatHelpText', {
-            defaultMessage: 'See more on accepted formats',
-          })}
+          {i18n.translate(
+            'xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatHelpText',
+            {
+              defaultMessage: 'See more on accepted formats',
+            }
+          )}
         </EuiLink>
       </EuiText>
     );
@@ -288,7 +291,7 @@ class OverridesUI extends Component {
           isInvalid={linesToSampleValid === false}
           label={
             <FormattedMessage
-              id="xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleFormRowLabel"
+              id="xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleFormRowLabel"
               defaultMessage="Number of lines to sample"
             />
           }
@@ -303,7 +306,7 @@ class OverridesUI extends Component {
         <EuiFormRow
           label={
             <FormattedMessage
-              id="xpack.fileDataVisualizer.editFlyout.overrides.dataFormatFormRowLabel"
+              id="xpack.dataVisualizer.file.editFlyout.overrides.dataFormatFormRowLabel"
               defaultMessage="Data format"
             />
           }
@@ -321,7 +324,7 @@ class OverridesUI extends Component {
             <EuiFormRow
               label={
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.editFlyout.overrides.delimiterFormRowLabel"
+                  id="xpack.dataVisualizer.file.editFlyout.overrides.delimiterFormRowLabel"
                   defaultMessage="Delimiter"
                 />
               }
@@ -338,7 +341,7 @@ class OverridesUI extends Component {
               <EuiFormRow
                 label={
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.editFlyout.overrides.customDelimiterFormRowLabel"
+                    id="xpack.dataVisualizer.file.editFlyout.overrides.customDelimiterFormRowLabel"
                     defaultMessage="Custom delimiter"
                   />
                 }
@@ -350,7 +353,7 @@ class OverridesUI extends Component {
             <EuiFormRow
               label={
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.editFlyout.overrides.quoteCharacterFormRowLabel"
+                  id="xpack.dataVisualizer.file.editFlyout.overrides.quoteCharacterFormRowLabel"
                   defaultMessage="Quote character"
                 />
               }
@@ -369,7 +372,7 @@ class OverridesUI extends Component {
                 id={'hasHeaderRow'}
                 label={
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.editFlyout.overrides.hasHeaderRowLabel"
+                    id="xpack.dataVisualizer.file.editFlyout.overrides.hasHeaderRowLabel"
                     defaultMessage="Has header row"
                   />
                 }
@@ -383,7 +386,7 @@ class OverridesUI extends Component {
                 id={'shouldTrimFields'}
                 label={
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.editFlyout.overrides.trimFieldsLabel"
+                    id="xpack.dataVisualizer.file.editFlyout.overrides.trimFieldsLabel"
                     defaultMessage="Should trim fields"
                   />
                 }
@@ -398,7 +401,7 @@ class OverridesUI extends Component {
             <EuiFormRow
               label={
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.editFlyout.overrides.grokPatternFormRowLabel"
+                  id="xpack.dataVisualizer.file.editFlyout.overrides.grokPatternFormRowLabel"
                   defaultMessage="Grok pattern"
                 />
               }
@@ -415,7 +418,7 @@ class OverridesUI extends Component {
           helpText={timestampFormatHelp}
           label={
             <FormattedMessage
-              id="xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatFormRowLabel"
+              id="xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatFormRowLabel"
               defaultMessage="Timestamp format"
             />
           }
@@ -434,7 +437,7 @@ class OverridesUI extends Component {
             isInvalid={timestampFormatValid === false}
             label={
               <FormattedMessage
-                id="xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatFormRowLabel"
+                id="xpack.dataVisualizer.file.editFlyout.overrides.customTimestampFormatFormRowLabel"
                 defaultMessage="Custom timestamp format"
               />
             }
@@ -450,7 +453,7 @@ class OverridesUI extends Component {
         <EuiFormRow
           label={
             <FormattedMessage
-              id="xpack.fileDataVisualizer.editFlyout.overrides.timeFieldFormRowLabel"
+              id="xpack.dataVisualizer.file.editFlyout.overrides.timeFieldFormRowLabel"
               defaultMessage="Time field"
             />
           }
@@ -480,7 +483,7 @@ class OverridesUI extends Component {
             <EuiTitle size="s">
               <h3>
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.editFlyout.overrides.editFieldNamesTitle"
+                  id="xpack.dataVisualizer.file.editFlyout.overrides.editFieldNamesTitle"
                   defaultMessage="Edit field names"
                 />
               </h3>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
similarity index 95%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
index 8e11d5150359d..03679a2a65e65 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides.test.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides.test.js
@@ -10,7 +10,7 @@ import React from 'react';
 
 import { Overrides } from './overrides';
 
-jest.mock('../../../../../../../src/plugins/kibana_react/public', () => ({
+jest.mock('../../../../../../../../src/plugins/kibana_react/public', () => ({
   withKibana: (comp) => {
     return comp;
   },
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js
similarity index 90%
rename from x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js
index c833d55351b6d..281131892e1e6 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/overrides_validation.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/edit_flyout/overrides_validation.js
@@ -41,7 +41,7 @@ export function isTimestampFormatValid(timestampFormat) {
   if (timestampFormat.indexOf('?') >= 0) {
     result.isValid = false;
     result.errorMessage = i18n.translate(
-      'xpack.fileDataVisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage',
+      'xpack.dataVisualizer.file.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage',
       {
         defaultMessage:
           'Timestamp format {timestampFormat} not supported because it contains a question mark character ({fieldPlaceholder})',
@@ -86,7 +86,7 @@ export function isTimestampFormatValid(timestampFormat) {
           result.isValid = false;
 
           result.errorMessage = i18n.translate(
-            'xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage',
+            'xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterValidationErrorMessage',
             {
               defaultMessage:
                 'Letter { length, plural, one { {lg} } other { group {lg} } } in {format} is not supported',
@@ -101,7 +101,7 @@ export function isTimestampFormatValid(timestampFormat) {
           if (curChar === 'S') {
             // disable exceeds maximum line length error so i18n check passes
             result.errorMessage = i18n.translate(
-              'xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage',
+              'xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterSValidationErrorMessage',
               {
                 defaultMessage:
                   'Letter { length, plural, one { {lg} } other { group {lg} } } in {format} is not supported because it is not preceded by ss and a separator from {sep}', // eslint-disable-line
@@ -128,7 +128,7 @@ export function isTimestampFormatValid(timestampFormat) {
   if (prevLetterGroup == null) {
     result.isValid = false;
     result.errorMessage = i18n.translate(
-      'xpack.fileDataVisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage',
+      'xpack.dataVisualizer.file.editFlyout.overrides.timestampEmptyValidationErrorMessage',
       {
         defaultMessage: 'No time format letter groups in timestamp format {timestampFormat}',
         values: {
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
similarity index 87%
rename from x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/explanation_flyout.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/explanation_flyout.tsx
index 606bab514ac9f..9898dd53ec66a 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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 '../../../../../../file_upload/common';
 
 interface Props {
   results: FindFileStructureResponse;
@@ -34,7 +34,7 @@ export const ExplanationFlyout: FC<Props> = ({ results, closeFlyout }) => {
         <EuiTitle size="m">
           <h2>
             <FormattedMessage
-              id="xpack.fileDataVisualizer.explanationFlyout.title"
+              id="xpack.dataVisualizer.file.explanationFlyout.title"
               defaultMessage="Analysis explanation"
             />
           </h2>
@@ -48,7 +48,7 @@ export const ExplanationFlyout: FC<Props> = ({ results, closeFlyout }) => {
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty iconType="cross" onClick={closeFlyout} flush="left">
               <FormattedMessage
-                id="xpack.fileDataVisualizer.explanationFlyout.closeButton"
+                id="xpack.dataVisualizer.file.explanationFlyout.closeButton"
                 defaultMessage="Close"
               />
             </EuiButtonEmpty>
@@ -63,7 +63,7 @@ const Content: FC<{ explanation: string[] }> = ({ explanation }) => (
   <>
     <EuiText size={'s'}>
       <FormattedMessage
-        id="xpack.fileDataVisualizer.explanationFlyout.content"
+        id="xpack.dataVisualizer.file.explanationFlyout.content"
         defaultMessage="The logical steps that have produced the analysis results."
       />
 
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/explanation_flyout/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/explanation_flyout/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_file_contents.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_file_contents.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_file_contents.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/_index.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/_index.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx
similarity index 91%
rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx
index fa54cf9cbc05c..9588cad9f72f7 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/file_contents.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/file_contents.tsx
@@ -31,7 +31,7 @@ export const FileContents: FC<Props> = ({ data, format, numberOfLines }) => {
       <EuiTitle size="s">
         <h2>
           <FormattedMessage
-            id="xpack.fileDataVisualizer.fileContents.fileContentsTitle"
+            id="xpack.dataVisualizer.file.fileContents.fileContentsTitle"
             defaultMessage="File contents"
           />
         </h2>
@@ -39,7 +39,7 @@ export const FileContents: FC<Props> = ({ data, format, numberOfLines }) => {
 
       <div>
         <FormattedMessage
-          id="xpack.fileDataVisualizer.fileContents.firstLinesDescription"
+          id="xpack.dataVisualizer.file.fileContents.firstLinesDescription"
           defaultMessage="First {numberOfLines, plural, zero {# line} one {# line} other {# lines}}"
           values={{
             numberOfLines,
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_contents/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/file_contents/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_contents/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_file_datavisualizer_view.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_file_datavisualizer_view.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_file_data_visualizer_view.scss
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss
new file mode 100644
index 0000000000000..8bbc5bd609e7c
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/_index.scss
@@ -0,0 +1 @@
+@import 'file_data_visualizer_view';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/constants.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/constants.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/constants.ts
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
new file mode 100644
index 0000000000000..e36f1040447e7
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_data_visualizer_view.js
@@ -0,0 +1,385 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { FormattedMessage } from '@kbn/i18n/react';
+import React, { Component } from 'react';
+
+import { EuiSpacer } from '@elastic/eui';
+
+import { isEqual } from 'lodash';
+
+import { AboutPanel, LoadingPanel } from '../about_panel';
+import { BottomBar } from '../bottom_bar';
+import { ResultsView } from '../results_view';
+import { FileCouldNotBeRead, FileTooLarge } from './file_error_callouts';
+import { EditFlyout } from '../edit_flyout';
+import { ExplanationFlyout } from '../explanation_flyout';
+import { ImportView } from '../import_view';
+import {
+  DEFAULT_LINES_TO_SAMPLE,
+  readFile,
+  createUrlOverrides,
+  processResults,
+} from '../../../common/components/utils';
+
+import { MODE } from './constants';
+
+export class FileDataVisualizerView extends Component {
+  constructor(props) {
+    super(props);
+
+    this.state = {
+      files: {},
+      fileName: '',
+      fileContents: '',
+      data: [],
+      fileSize: 0,
+      fileTooLarge: false,
+      fileCouldNotBeRead: false,
+      serverError: null,
+      loading: false,
+      loaded: false,
+      results: undefined,
+      explanation: undefined,
+      mode: MODE.READ,
+      isEditFlyoutVisible: false,
+      isExplanationFlyoutVisible: false,
+      bottomBarVisible: false,
+      hasPermissionToImport: false,
+    };
+
+    this.overrides = {};
+    this.previousOverrides = {};
+    this.originalSettings = {
+      linesToSample: DEFAULT_LINES_TO_SAMPLE,
+    };
+
+    this.savedObjectsClient = props.savedObjectsClient;
+    this.maxFileUploadBytes = props.fileUpload.getMaxBytes();
+  }
+
+  async componentDidMount() {
+    // check the user has the correct permission to import data.
+    // note, calling hasImportPermission with no arguments just checks the
+    // cluster privileges, the user will still need index privileges to create and ingest
+    const hasPermissionToImport = await this.props.fileUpload.hasImportPermission({
+      checkCreateIndexPattern: false,
+      checkHasManagePipeline: true,
+    });
+    this.setState({ hasPermissionToImport });
+  }
+
+  onFilePickerChange = (files) => {
+    this.overrides = {};
+
+    this.setState(
+      {
+        loading: files.length > 0,
+        bottomBarVisible: files.length > 0,
+        loaded: false,
+        fileName: '',
+        fileContents: '',
+        data: [],
+        fileSize: 0,
+        fileTooLarge: false,
+        fileCouldNotBeRead: false,
+        serverError: null,
+        results: undefined,
+        explanation: undefined,
+      },
+      () => {
+        if (files.length) {
+          this.loadFile(files[0]);
+        }
+      }
+    );
+  };
+
+  async loadFile(file) {
+    if (file.size <= this.maxFileUploadBytes) {
+      try {
+        const { data, fileContents } = await readFile(file);
+        this.setState({
+          data,
+          fileContents,
+          fileName: file.name,
+          fileSize: file.size,
+        });
+
+        await this.analyzeFile(fileContents);
+      } catch (error) {
+        this.setState({
+          loaded: false,
+          loading: false,
+          fileCouldNotBeRead: true,
+        });
+      }
+    } else {
+      this.setState({
+        loaded: false,
+        loading: false,
+        fileTooLarge: true,
+        fileName: file.name,
+        fileSize: file.size,
+      });
+    }
+  }
+
+  async analyzeFile(fileContents, overrides, isRetry = false) {
+    try {
+      const resp = await this.props.fileUpload.analyzeFile(fileContents, overrides);
+      const serverSettings = processResults(resp);
+      const serverOverrides = resp.overrides;
+
+      this.previousOverrides = overrides;
+      this.overrides = {};
+
+      if (serverSettings.format === 'xml') {
+        throw {
+          message: (
+            <FormattedMessage
+              id="xpack.dataVisualizer.file.xmlNotCurrentlySupportedErrorMessage"
+              defaultMessage="XML not currently supported"
+            />
+          ),
+        };
+      }
+
+      if (serverOverrides === undefined) {
+        // if no overrides were used, store all the settings returned from the endpoint
+        this.originalSettings = serverSettings;
+      } else {
+        Object.keys(serverOverrides).forEach((o) => {
+          const camelCaseO = o.replace(/_\w/g, (m) => m[1].toUpperCase());
+          this.overrides[camelCaseO] = serverOverrides[o];
+        });
+
+        // check to see if the settings from the server which haven't been overridden have changed.
+        // e.g. changing the name of the time field which is also the time field
+        // will cause the timestamp_field setting to change.
+        // if any have changed, update the originalSettings value
+        Object.keys(serverSettings).forEach((o) => {
+          const value = serverSettings[o];
+          if (
+            this.overrides[o] === undefined &&
+            ((Array.isArray(value) && isEqual(value, this.originalSettings[o]) === false) ||
+              value !== this.originalSettings[o])
+          ) {
+            this.originalSettings[o] = value;
+          }
+        });
+      }
+
+      this.setState({
+        results: resp.results,
+        explanation: resp.explanation,
+        loaded: true,
+        loading: false,
+        fileCouldNotBeRead: isRetry,
+      });
+    } catch (error) {
+      this.setState({
+        results: undefined,
+        explanation: undefined,
+        loaded: false,
+        loading: false,
+        fileCouldNotBeRead: true,
+        serverError: error,
+      });
+
+      // reload the results with the previous overrides
+      if (isRetry === false) {
+        this.setState({
+          loading: true,
+          loaded: false,
+        });
+        this.analyzeFile(fileContents, this.previousOverrides, true);
+      }
+    }
+  }
+
+  closeEditFlyout = () => {
+    this.setState({ isEditFlyoutVisible: false });
+    this.showBottomBar();
+  };
+
+  showEditFlyout = () => {
+    this.setState({ isEditFlyoutVisible: true });
+    this.hideBottomBar();
+  };
+
+  closeExplanationFlyout = () => {
+    this.setState({ isExplanationFlyoutVisible: false });
+    this.showBottomBar();
+  };
+
+  showExplanationFlyout = () => {
+    this.setState({ isExplanationFlyoutVisible: true });
+    this.hideBottomBar();
+  };
+
+  showBottomBar = () => {
+    this.setState({ bottomBarVisible: true });
+  };
+
+  hideBottomBar = () => {
+    this.setState({ bottomBarVisible: false });
+  };
+
+  setOverrides = (overrides) => {
+    this.setState(
+      {
+        loading: true,
+        loaded: false,
+      },
+      () => {
+        const formattedOverrides = createUrlOverrides(overrides, this.originalSettings);
+        this.analyzeFile(this.state.fileContents, formattedOverrides);
+      }
+    );
+  };
+
+  changeMode = (mode) => {
+    this.setState({ mode });
+  };
+
+  onCancel = () => {
+    this.overrides = {};
+    this.previousOverrides = {};
+    this.originalSettings = {
+      linesToSample: DEFAULT_LINES_TO_SAMPLE,
+    };
+    this.changeMode(MODE.READ);
+    this.onFilePickerChange([]);
+  };
+
+  render() {
+    const {
+      loading,
+      loaded,
+      results,
+      explanation,
+      fileContents,
+      data,
+      fileName,
+      fileSize,
+      fileTooLarge,
+      fileCouldNotBeRead,
+      serverError,
+      mode,
+      isEditFlyoutVisible,
+      isExplanationFlyoutVisible,
+      bottomBarVisible,
+      hasPermissionToImport,
+    } = this.state;
+
+    const fields =
+      results !== undefined && results.field_stats !== undefined
+        ? Object.keys(results.field_stats)
+        : [];
+
+    return (
+      <div>
+        {mode === MODE.READ && (
+          <>
+            {!loading && !loaded && <AboutPanel onFilePickerChange={this.onFilePickerChange} />}
+
+            {loading && <LoadingPanel />}
+
+            {fileTooLarge && (
+              <FileTooLarge fileSize={fileSize} maxFileSize={this.maxFileUploadBytes} />
+            )}
+
+            {fileCouldNotBeRead && loading === false && (
+              <>
+                <FileCouldNotBeRead
+                  error={serverError}
+                  loaded={loaded}
+                  showEditFlyout={this.showEditFlyout}
+                />
+                <EuiSpacer size="l" />
+              </>
+            )}
+
+            {loaded && (
+              <ResultsView
+                results={results}
+                explanation={explanation}
+                fileName={fileName}
+                data={fileContents}
+                showEditFlyout={this.showEditFlyout}
+                showExplanationFlyout={this.showExplanationFlyout}
+                disableButtons={isEditFlyoutVisible || isExplanationFlyoutVisible}
+              />
+            )}
+            <EditFlyout
+              setOverrides={this.setOverrides}
+              closeEditFlyout={this.closeEditFlyout}
+              isFlyoutVisible={isEditFlyoutVisible}
+              originalSettings={this.originalSettings}
+              overrides={this.overrides}
+              fields={fields}
+            />
+
+            {isExplanationFlyoutVisible && (
+              <ExplanationFlyout results={results} closeFlyout={this.closeExplanationFlyout} />
+            )}
+
+            {bottomBarVisible && loaded && (
+              <>
+                <BottomBar
+                  mode={MODE.READ}
+                  onChangeMode={this.changeMode}
+                  onCancel={this.onCancel}
+                  disableImport={hasPermissionToImport === false}
+                />
+                <BottomPadding />
+              </>
+            )}
+          </>
+        )}
+        {mode === MODE.IMPORT && (
+          <>
+            <ImportView
+              results={results}
+              fileName={fileName}
+              fileContents={fileContents}
+              data={data}
+              indexPatterns={this.props.indexPatterns}
+              showBottomBar={this.showBottomBar}
+              hideBottomBar={this.hideBottomBar}
+              savedObjectsClient={this.savedObjectsClient}
+              fileUpload={this.props.fileUpload}
+            />
+
+            {bottomBarVisible && (
+              <>
+                <BottomBar
+                  mode={MODE.IMPORT}
+                  onChangeMode={this.changeMode}
+                  onCancel={this.onCancel}
+                />
+                <BottomPadding />
+              </>
+            )}
+          </>
+        )}
+      </div>
+    );
+  }
+}
+
+function BottomPadding() {
+  // padding for the BottomBar
+  return (
+    <>
+      <EuiSpacer size="m" />
+      <EuiSpacer size="l" />
+      <EuiSpacer size="l" />
+    </>
+  );
+}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_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
similarity index 80%
rename from x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_error_callouts.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/file_error_callouts.tsx
index b932dee35ebb8..7b6378e34e78e 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_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 { FILE_SIZE_DISPLAY_FORMAT } from '../../../../common';
-import { FindFileStructureErrorResponse } from '../../../../../file_upload/common';
+import { FILE_SIZE_DISPLAY_FORMAT } from '../../../../../common';
+import { FindFileStructureErrorResponse } from '../../../../../../file_upload/common';
 
 interface FileTooLargeProps {
   fileSize: number;
@@ -31,7 +31,7 @@ export const FileTooLarge: FC<FileTooLargeProps> = ({ fileSize, maxFileSize }) =
     errorText = (
       <p>
         <FormattedMessage
-          id="xpack.fileDataVisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage"
+          id="xpack.dataVisualizer.file.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage"
           defaultMessage="The size of the file you selected for upload is {fileSizeFormatted} which
           exceeds the maximum permitted size of {maxFileSizeFormatted}"
           values={{
@@ -46,7 +46,7 @@ export const FileTooLarge: FC<FileTooLargeProps> = ({ fileSize, maxFileSize }) =
     errorText = (
       <p>
         <FormattedMessage
-          id="xpack.fileDataVisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage"
+          id="xpack.dataVisualizer.file.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage"
           defaultMessage="The size of the file you selected for upload exceeds the maximum
           permitted size of {maxFileSizeFormatted} by {diffFormatted}"
           values={{
@@ -62,13 +62,13 @@ export const FileTooLarge: FC<FileTooLargeProps> = ({ fileSize, maxFileSize }) =
     <EuiCallOut
       title={
         <FormattedMessage
-          id="xpack.fileDataVisualizer.fileErrorCallouts.fileSizeTooLargeTitle"
+          id="xpack.dataVisualizer.file.fileErrorCallouts.fileSizeTooLargeTitle"
           defaultMessage="File size is too large"
         />
       }
       color="danger"
       iconType="cross"
-      data-test-subj="mlFileUploadErrorCallout fileTooLarge"
+      data-test-subj="dataVisualizerFileUploadErrorCallout fileTooLarge"
     >
       {errorText}
     </EuiCallOut>
@@ -92,24 +92,24 @@ export const FileCouldNotBeRead: FC<FileCouldNotBeReadProps> = ({
       <EuiCallOut
         title={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.fileErrorCallouts.fileCouldNotBeReadTitle"
+            id="xpack.dataVisualizer.file.fileErrorCallouts.fileCouldNotBeReadTitle"
             defaultMessage="File structure cannot be determined"
           />
         }
         color="danger"
         iconType="cross"
-        data-test-subj="mlFileUploadErrorCallout fileCouldNotBeRead"
+        data-test-subj="dataVisualizerFileUploadErrorCallout fileCouldNotBeRead"
       >
         {loaded === false && (
           <>
             <FormattedMessage
-              id="xpack.fileDataVisualizer.fileErrorCallouts.applyOverridesDescription"
+              id="xpack.dataVisualizer.file.fileErrorCallouts.applyOverridesDescription"
               defaultMessage="If you know something about this data, such as the file format or timestamp format, adding initial overrides may help us to infer the rest of the structure."
             />
             <br />
             <EuiButtonEmpty onClick={showEditFlyout} flush="left" size="xs">
               <FormattedMessage
-                id="xpack.fileDataVisualizer.fileErrorCallouts.overrideButton"
+                id="xpack.dataVisualizer.file.fileErrorCallouts.overrideButton"
                 defaultMessage="Apply override settings"
               />
             </EuiButtonEmpty>
@@ -122,7 +122,7 @@ export const FileCouldNotBeRead: FC<FileCouldNotBeReadProps> = ({
           <>
             <EuiSpacer size="s" />
             <FormattedMessage
-              id="xpack.fileDataVisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription"
+              id="xpack.dataVisualizer.file.fileErrorCallouts.revertingToPreviousSettingsDescription"
               defaultMessage="Reverting to previous settings"
             />
           </>
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js
new file mode 100644
index 0000000000000..6a6130460fa40
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/file_data_visualizer_view/index.js
@@ -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 { FileDataVisualizerView } from './file_data_visualizer_view';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx
similarity index 81%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx
index 5a6f78a1a3068..1a54b844574c5 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/errors.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/errors.tsx
@@ -38,56 +38,56 @@ function title(statuses: Statuses) {
     case statuses.readStatus:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.readingFileErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.readingFileErrorMessage"
           defaultMessage="Error reading file"
         />
       );
     case statuses.parseJSONStatus:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.parsingJSONErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.parsingJSONErrorMessage"
           defaultMessage="Error parsing JSON"
         />
       );
     case statuses.indexCreatedStatus:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.creatingIndexErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.creatingIndexErrorMessage"
           defaultMessage="Error creating index"
         />
       );
     case statuses.ingestPipelineCreatedStatus:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.creatingIngestPipelineErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.creatingIngestPipelineErrorMessage"
           defaultMessage="Error creating ingest pipeline"
         />
       );
     case statuses.uploadStatus:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.uploadingDataErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.uploadingDataErrorMessage"
           defaultMessage="Error uploading data"
         />
       );
     case statuses.indexPatternCreatedStatus:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.creatingIndexPatternErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.creatingIndexPatternErrorMessage"
           defaultMessage="Error creating index pattern"
         />
       );
     case statuses.permissionCheckStatus:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.checkingPermissionErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.checkingPermissionErrorMessage"
           defaultMessage="Import permissions error"
         />
       );
     default:
       return (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importErrors.defaultErrorMessage"
+          id="xpack.dataVisualizer.file.importErrors.defaultErrorMessage"
           defaultMessage="Error"
         />
       );
@@ -105,7 +105,7 @@ const ImportError: FC<{ error: any }> = ({ error }) => {
           id="more"
           buttonContent={
             <FormattedMessage
-              id="xpack.fileDataVisualizer.importErrors.moreButtonLabel"
+              id="xpack.dataVisualizer.file.importErrors.moreButtonLabel"
               defaultMessage="More"
             />
           }
@@ -151,7 +151,7 @@ function toString(error: any): ImportError {
   }
 
   return {
-    msg: i18n.translate('xpack.fileDataVisualizer.importErrors.unknownErrorMessage', {
+    msg: i18n.translate('xpack.dataVisualizer.file.importErrors.unknownErrorMessage', {
       defaultMessage: 'Unknown error',
     }),
   };
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_errors/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_errors/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_errors/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx
similarity index 81%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx
index 8296a4885bf2c..a058afca84c76 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/import_progress.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/import_progress.tsx
@@ -80,31 +80,31 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
   }
 
   let processFileTitle = i18n.translate(
-    'xpack.fileDataVisualizer.importProgress.processFileTitle',
+    'xpack.dataVisualizer.file.importProgress.processFileTitle',
     {
       defaultMessage: 'Process file',
     }
   );
   let createIndexTitle = i18n.translate(
-    'xpack.fileDataVisualizer.importProgress.createIndexTitle',
+    'xpack.dataVisualizer.file.importProgress.createIndexTitle',
     {
       defaultMessage: 'Create index',
     }
   );
   let createIngestPipelineTitle = i18n.translate(
-    'xpack.fileDataVisualizer.importProgress.createIngestPipelineTitle',
+    'xpack.dataVisualizer.file.importProgress.createIngestPipelineTitle',
     {
       defaultMessage: 'Create ingest pipeline',
     }
   );
   let uploadingDataTitle = i18n.translate(
-    'xpack.fileDataVisualizer.importProgress.uploadDataTitle',
+    'xpack.dataVisualizer.file.importProgress.uploadDataTitle',
     {
       defaultMessage: 'Upload data',
     }
   );
   let createIndexPatternTitle = i18n.translate(
-    'xpack.fileDataVisualizer.importProgress.createIndexPatternTitle',
+    'xpack.dataVisualizer.file.importProgress.createIndexPatternTitle',
     {
       defaultMessage: 'Create index pattern',
     }
@@ -113,7 +113,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
   const creatingIndexStatus = (
     <p>
       <FormattedMessage
-        id="xpack.fileDataVisualizer.importProgress.stepTwoCreatingIndexDescription"
+        id="xpack.dataVisualizer.file.importProgress.stepTwoCreatingIndexDescription"
         defaultMessage="Creating index"
       />
     </p>
@@ -122,7 +122,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
   const creatingIndexAndIngestPipelineStatus = (
     <p>
       <FormattedMessage
-        id="xpack.fileDataVisualizer.importProgress.stepTwoCreatingIndexIngestPipelineDescription"
+        id="xpack.dataVisualizer.file.importProgress.stepTwoCreatingIndexIngestPipelineDescription"
         defaultMessage="Creating index and ingest pipeline"
       />
     </p>
@@ -130,7 +130,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
 
   if (completedStep >= 0) {
     processFileTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.processingFileTitle',
+      'xpack.dataVisualizer.file.importProgress.processingFileTitle',
       {
         defaultMessage: 'Processing file',
       }
@@ -138,7 +138,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
     statusInfo = (
       <p>
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importProgress.processingImportedFileDescription"
+          id="xpack.dataVisualizer.file.importProgress.processingImportedFileDescription"
           defaultMessage="Processing file for import"
         />
       </p>
@@ -146,13 +146,13 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
   }
   if (completedStep >= 1) {
     processFileTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.fileProcessedTitle',
+      'xpack.dataVisualizer.file.importProgress.fileProcessedTitle',
       {
         defaultMessage: 'File processed',
       }
     );
     createIndexTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.creatingIndexTitle',
+      'xpack.dataVisualizer.file.importProgress.creatingIndexTitle',
       {
         defaultMessage: 'Creating index',
       }
@@ -161,11 +161,14 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
       createPipeline === true ? creatingIndexAndIngestPipelineStatus : creatingIndexStatus;
   }
   if (completedStep >= 2) {
-    createIndexTitle = i18n.translate('xpack.fileDataVisualizer.importProgress.indexCreatedTitle', {
-      defaultMessage: 'Index created',
-    });
+    createIndexTitle = i18n.translate(
+      'xpack.dataVisualizer.file.importProgress.indexCreatedTitle',
+      {
+        defaultMessage: 'Index created',
+      }
+    );
     createIngestPipelineTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.creatingIngestPipelineTitle',
+      'xpack.dataVisualizer.file.importProgress.creatingIngestPipelineTitle',
       {
         defaultMessage: 'Creating ingest pipeline',
       }
@@ -175,13 +178,13 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
   }
   if (completedStep >= 3) {
     createIngestPipelineTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.ingestPipelineCreatedTitle',
+      'xpack.dataVisualizer.file.importProgress.ingestPipelineCreatedTitle',
       {
         defaultMessage: 'Ingest pipeline created',
       }
     );
     uploadingDataTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.uploadingDataTitle',
+      'xpack.dataVisualizer.file.importProgress.uploadingDataTitle',
       {
         defaultMessage: 'Uploading data',
       }
@@ -190,14 +193,14 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
   }
   if (completedStep >= 4) {
     uploadingDataTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.dataUploadedTitle',
+      'xpack.dataVisualizer.file.importProgress.dataUploadedTitle',
       {
         defaultMessage: 'Data uploaded',
       }
     );
     if (createIndexPattern === true) {
       createIndexPatternTitle = i18n.translate(
-        'xpack.fileDataVisualizer.importProgress.creatingIndexPatternTitle',
+        'xpack.dataVisualizer.file.importProgress.creatingIndexPatternTitle',
         {
           defaultMessage: 'Creating index pattern',
         }
@@ -205,7 +208,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
       statusInfo = (
         <p>
           <FormattedMessage
-            id="xpack.fileDataVisualizer.importProgress.creatingIndexPatternDescription"
+            id="xpack.dataVisualizer.file.importProgress.creatingIndexPatternDescription"
             defaultMessage="Creating index pattern"
           />
         </p>
@@ -216,7 +219,7 @@ export const ImportProgress: FC<{ statuses: Statuses }> = ({ statuses }) => {
   }
   if (completedStep >= 5) {
     createIndexPatternTitle = i18n.translate(
-      'xpack.fileDataVisualizer.importProgress.indexPatternCreatedTitle',
+      'xpack.dataVisualizer.file.importProgress.indexPatternCreatedTitle',
       {
         defaultMessage: 'Index pattern created',
       }
@@ -290,7 +293,7 @@ const UploadFunctionProgress: FC<{ progress: number }> = ({ progress }) => {
     <React.Fragment>
       <p>
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importProgress.uploadingDataDescription"
+          id="xpack.dataVisualizer.file.importProgress.uploadingDataDescription"
           defaultMessage="Uploading data"
         />
       </p>
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_progress/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_progress/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_progress/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
similarity index 87%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/advanced.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/advanced.tsx
index acb6415e93f9b..a60b291d7e723 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/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 { CombinedField, CombinedFieldsForm } from '../combined_fields';
+import { CombinedField, CombinedFieldsForm } from '../../../common/components/combined_fields';
 import { JsonEditor, EDITOR_MODE } from '../json_editor';
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 const EDITOR_HEIGHT = '300px';
 
 interface Props {
@@ -69,7 +69,7 @@ export const AdvancedSettings: FC<Props> = ({
       <EuiFormRow
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.advancedImportSettings.indexNameLabel"
+            id="xpack.dataVisualizer.file.advancedImportSettings.indexNameLabel"
             defaultMessage="Index name"
           />
         }
@@ -78,7 +78,7 @@ export const AdvancedSettings: FC<Props> = ({
       >
         <EuiFieldText
           placeholder={i18n.translate(
-            'xpack.fileDataVisualizer.advancedImportSettings.indexNamePlaceholder',
+            'xpack.dataVisualizer.file.advancedImportSettings.indexNamePlaceholder',
             {
               defaultMessage: 'index name',
             }
@@ -88,7 +88,7 @@ export const AdvancedSettings: FC<Props> = ({
           onChange={onIndexChange}
           isInvalid={indexNameError !== ''}
           aria-label={i18n.translate(
-            'xpack.fileDataVisualizer.advancedImportSettings.indexNameAriaLabel',
+            'xpack.dataVisualizer.file.advancedImportSettings.indexNameAriaLabel',
             {
               defaultMessage: 'Index name, required field',
             }
@@ -102,7 +102,7 @@ export const AdvancedSettings: FC<Props> = ({
         id="createIndexPattern"
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.advancedImportSettings.createIndexPatternLabel"
+            id="xpack.dataVisualizer.file.advancedImportSettings.createIndexPatternLabel"
             defaultMessage="Create index pattern"
           />
         }
@@ -116,7 +116,7 @@ export const AdvancedSettings: FC<Props> = ({
       <EuiFormRow
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.advancedImportSettings.indexPatternNameLabel"
+            id="xpack.dataVisualizer.file.advancedImportSettings.indexPatternNameLabel"
             defaultMessage="Index pattern name"
           />
         }
@@ -184,7 +184,7 @@ const IndexSettings: FC<JsonEditorProps> = ({ initialized, data, onChange }) =>
       <EuiFormRow
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.advancedImportSettings.indexSettingsLabel"
+            id="xpack.dataVisualizer.file.advancedImportSettings.indexSettingsLabel"
             defaultMessage="Index settings"
           />
         }
@@ -209,7 +209,7 @@ const Mappings: FC<JsonEditorProps> = ({ initialized, data, onChange }) => {
       <EuiFormRow
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.advancedImportSettings.mappingsLabel"
+            id="xpack.dataVisualizer.file.advancedImportSettings.mappingsLabel"
             defaultMessage="Mappings"
           />
         }
@@ -234,7 +234,7 @@ const IngestPipeline: FC<JsonEditorProps> = ({ initialized, data, onChange }) =>
       <EuiFormRow
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.advancedImportSettings.ingestPipelineLabel"
+            id="xpack.dataVisualizer.file.advancedImportSettings.ingestPipelineLabel"
             defaultMessage="Ingest pipeline"
           />
         }
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/import_settings.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
similarity index 91%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/import_settings.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
index 90383acd7e6c5..4e36dc42b54a5 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/import_settings.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/import_settings.tsx
@@ -12,8 +12,8 @@ import { EuiTabbedContent, EuiSpacer } from '@elastic/eui';
 
 import { SimpleSettings } from './simple';
 import { AdvancedSettings } from './advanced';
-import { CombinedField } from '../combined_fields';
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { CombinedField } from '../../../common/components/combined_fields';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 interface Props {
   index: string;
@@ -59,7 +59,7 @@ export const ImportSettings: FC<Props> = ({
   const tabs = [
     {
       id: 'simple-settings',
-      name: i18n.translate('xpack.fileDataVisualizer.importSettings.simpleTabName', {
+      name: i18n.translate('xpack.dataVisualizer.file.importSettings.simpleTabName', {
         defaultMessage: 'Simple',
       }),
       content: (
@@ -80,7 +80,7 @@ export const ImportSettings: FC<Props> = ({
     },
     {
       id: 'advanced-settings',
-      name: i18n.translate('xpack.fileDataVisualizer.importSettings.advancedTabName', {
+      name: i18n.translate('xpack.dataVisualizer.file.importSettings.advancedTabName', {
         defaultMessage: 'Advanced',
       }),
       content: (
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx
similarity index 77%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx
index 2751b37cd3256..02f33c49b77c4 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_settings/simple.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_settings/simple.tsx
@@ -10,7 +10,10 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React, { FC } from 'react';
 
 import { EuiFieldText, EuiFormRow, EuiCheckbox, EuiSpacer } from '@elastic/eui';
-import { CombinedField, CombinedFieldsReadOnlyForm } from '../combined_fields';
+import {
+  CombinedField,
+  CombinedFieldsReadOnlyForm,
+} from '../../../common/components/combined_fields';
 
 interface Props {
   index: string;
@@ -36,7 +39,7 @@ export const SimpleSettings: FC<Props> = ({
       <EuiFormRow
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.simpleImportSettings.indexNameFormRowLabel"
+            id="xpack.dataVisualizer.file.simpleImportSettings.indexNameFormRowLabel"
             defaultMessage="Index name"
           />
         }
@@ -45,7 +48,7 @@ export const SimpleSettings: FC<Props> = ({
       >
         <EuiFieldText
           placeholder={i18n.translate(
-            'xpack.fileDataVisualizer.simpleImportSettings.indexNamePlaceholder',
+            'xpack.dataVisualizer.file.simpleImportSettings.indexNamePlaceholder',
             {
               defaultMessage: 'index name',
             }
@@ -55,12 +58,12 @@ export const SimpleSettings: FC<Props> = ({
           onChange={onIndexChange}
           isInvalid={indexNameError !== ''}
           aria-label={i18n.translate(
-            'xpack.fileDataVisualizer.simpleImportSettings.indexNameAriaLabel',
+            'xpack.dataVisualizer.file.simpleImportSettings.indexNameAriaLabel',
             {
               defaultMessage: 'Index name, required field',
             }
           )}
-          data-test-subj="mlFileDataVisIndexNameInput"
+          data-test-subj="dataVisualizerFileIndexNameInput"
         />
       </EuiFormRow>
 
@@ -70,14 +73,14 @@ export const SimpleSettings: FC<Props> = ({
         id="createIndexPattern"
         label={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.simpleImportSettings.createIndexPatternLabel"
+            id="xpack.dataVisualizer.file.simpleImportSettings.createIndexPatternLabel"
             defaultMessage="Create index pattern"
           />
         }
         checked={createIndexPattern === true}
         disabled={initialized === true}
         onChange={onCreateIndexPatternChange}
-        data-test-subj="mlFileDataVisCreateIndexPatternCheckbox"
+        data-test-subj="dataVisualizerFileCreateIndexPatternCheckbox"
       />
 
       <EuiSpacer size="m" />
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_import_sumary.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_import_sumary.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_import_summary.scss
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss
new file mode 100644
index 0000000000000..117e04733ed09
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/_index.scss
@@ -0,0 +1 @@
+@import 'import_summary';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx
similarity index 95%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx
index c8f62021b7bae..184403ce22893 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/failures.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/failures.tsx
@@ -51,7 +51,7 @@ export class Failures extends Component<Props, State> {
         id="failureList"
         buttonContent={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.importSummary.failedDocumentsButtonLabel"
+            id="xpack.dataVisualizer.file.importSummary.failedDocumentsButtonLabel"
             defaultMessage="Failed documents"
           />
         }
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx
similarity index 83%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx
index f981b1fdf9f23..1d8217d8df223 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/import_summary.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/import_summary.tsx
@@ -45,13 +45,13 @@ export const ImportSummary: FC<Props> = ({
       <EuiCallOut
         title={
           <FormattedMessage
-            id="xpack.fileDataVisualizer.importSummary.importCompleteTitle"
+            id="xpack.dataVisualizer.file.importSummary.importCompleteTitle"
             defaultMessage="Import complete"
           />
         }
         color="success"
         iconType="check"
-        data-test-subj="mlFileImportSuccessCallout"
+        data-test-subj="dataVisualizerFileImportSuccessCallout"
       >
         <EuiDescriptionList type="column" listItems={items} className="import-summary-list" />
       </EuiCallOut>
@@ -62,7 +62,7 @@ export const ImportSummary: FC<Props> = ({
           <EuiCallOut
             title={
               <FormattedMessage
-                id="xpack.fileDataVisualizer.importSummary.documentsCouldNotBeImportedTitle"
+                id="xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedTitle"
                 defaultMessage="Some documents could not be imported"
               />
             }
@@ -71,7 +71,7 @@ export const ImportSummary: FC<Props> = ({
           >
             <p>
               <FormattedMessage
-                id="xpack.fileDataVisualizer.importSummary.documentsCouldNotBeImportedDescription"
+                id="xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedDescription"
                 defaultMessage="{importFailuresLength} out of {docCount} documents could not be imported.
                 This could be due to lines not matching the Grok pattern."
                 values={{
@@ -102,7 +102,7 @@ function createDisplayItems(
     {
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importSummary.indexTitle"
+          id="xpack.dataVisualizer.file.importSummary.indexTitle"
           defaultMessage="Index"
         />
       ),
@@ -111,7 +111,7 @@ function createDisplayItems(
     {
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importSummary.documentsIngestedTitle"
+          id="xpack.dataVisualizer.file.importSummary.documentsIngestedTitle"
           defaultMessage="Documents ingested"
         />
       ),
@@ -123,7 +123,7 @@ function createDisplayItems(
     items.splice(1, 0, {
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importSummary.ingestPipelineTitle"
+          id="xpack.dataVisualizer.file.importSummary.ingestPipelineTitle"
           defaultMessage="Ingest pipeline"
         />
       ),
@@ -135,7 +135,7 @@ function createDisplayItems(
     items.splice(1, 0, {
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importSummary.indexPatternTitle"
+          id="xpack.dataVisualizer.file.importSummary.indexPatternTitle"
           defaultMessage="Index pattern"
         />
       ),
@@ -147,7 +147,7 @@ function createDisplayItems(
     items.push({
       title: (
         <FormattedMessage
-          id="xpack.fileDataVisualizer.importSummary.failedDocumentsTitle"
+          id="xpack.dataVisualizer.file.importSummary.failedDocumentsTitle"
           defaultMessage="Failed documents"
         />
       ),
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_summary/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_summary/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js
similarity index 93%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js
index 0eaba4c033910..74a3638f555d0 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_view/import_view.js
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/import_view.js
@@ -20,8 +20,8 @@ import {
 
 import { i18n } from '@kbn/i18n';
 import { debounce } from 'lodash';
-import { ResultsLinks } from '../results_links';
-import { FilebeatConfigFlyout } from '../filebeat_config_flyout';
+import { ResultsLinks } from '../../../common/components/results_links';
+import { FilebeatConfigFlyout } from '../../../common/components/filebeat_config_flyout';
 import { ImportProgress, IMPORT_STATUS } from '../import_progress';
 import { ImportErrors } from '../import_errors';
 import { ImportSummary } from '../import_summary';
@@ -30,8 +30,8 @@ import {
   addCombinedFieldsToPipeline,
   addCombinedFieldsToMappings,
   getDefaultCombinedFields,
-} from '../combined_fields';
-import { ExperimentalBadge } from '../experimental_badge';
+} from '../../../common/components/combined_fields';
+import { ExperimentalBadge } from '../../../common/components/experimental_badge';
 
 const DEFAULT_TIME_FIELD = '@timestamp';
 const DEFAULT_INDEX_SETTINGS = { number_of_shards: 1 };
@@ -129,7 +129,7 @@ export class ImportView extends Component {
             })) === false
           ) {
             errors.push(
-              i18n.translate('xpack.fileDataVisualizer.importView.importPermissionError', {
+              i18n.translate('xpack.dataVisualizer.file.importView.importPermissionError', {
                 defaultMessage:
                   'You do not have permission to create or import data into index {index}.',
                 values: {
@@ -169,7 +169,7 @@ export class ImportView extends Component {
                 } catch (error) {
                   success = false;
                   const parseError = i18n.translate(
-                    'xpack.fileDataVisualizer.importView.parseSettingsError',
+                    'xpack.dataVisualizer.file.importView.parseSettingsError',
                     {
                       defaultMessage: 'Error parsing settings:',
                     }
@@ -182,7 +182,7 @@ export class ImportView extends Component {
                 } catch (error) {
                   success = false;
                   const parseError = i18n.translate(
-                    'xpack.fileDataVisualizer.importView.parseMappingsError',
+                    'xpack.dataVisualizer.file.importView.parseMappingsError',
                     {
                       defaultMessage: 'Error parsing mappings:',
                     }
@@ -197,7 +197,7 @@ export class ImportView extends Component {
                 } catch (error) {
                   success = false;
                   const parseError = i18n.translate(
-                    'xpack.fileDataVisualizer.importView.parsePipelineError',
+                    'xpack.dataVisualizer.file.importView.parsePipelineError',
                     {
                       defaultMessage: 'Error parsing ingest pipeline:',
                     }
@@ -354,7 +354,7 @@ export class ImportView extends Component {
     const exists = await this.props.fileUpload.checkIndexExists(index);
     const indexNameError = exists ? (
       <FormattedMessage
-        id="xpack.fileDataVisualizer.importView.indexNameAlreadyExistsErrorMessage"
+        id="xpack.dataVisualizer.file.importView.indexNameAlreadyExistsErrorMessage"
         defaultMessage="Index name already exists"
       />
     ) : (
@@ -495,7 +495,7 @@ export class ImportView extends Component {
       checkingValidIndex === true;
 
     return (
-      <EuiPage data-test-subj="mlPageFileDataVisImport">
+      <EuiPage data-test-subj="dataVisualizerPageFileImport">
         <EuiPageBody>
           <EuiPageContentHeader>
             <EuiTitle>
@@ -503,18 +503,18 @@ export class ImportView extends Component {
             </EuiTitle>
           </EuiPageContentHeader>
           <EuiSpacer size="m" />
-          <EuiPanel data-test-subj="mlFileDataVisImportSettingsPanel">
+          <EuiPanel data-test-subj="dataVisualizerFileImportSettingsPanel">
             <EuiTitle size="s">
               <h2>
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.importView.importDataTitle"
+                  id="xpack.dataVisualizer.file.importView.importDataTitle"
                   defaultMessage="Import data"
                 />
                 &nbsp;
                 <ExperimentalBadge
                   tooltipContent={
                     <FormattedMessage
-                      id="xpack.fileDataVisualizer.importView.experimentalFeatureTooltip"
+                      id="xpack.dataVisualizer.file.importView.experimentalFeatureTooltip"
                       defaultMessage="Experimental feature. We'd love to hear your feedback."
                     />
                   }
@@ -552,10 +552,10 @@ export class ImportView extends Component {
                 isLoading={importing}
                 iconSide="right"
                 fill
-                data-test-subj="mlFileDataVisImportButton"
+                data-test-subj="dataVisualizerFileImportButton"
               >
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.importView.importButtonLabel"
+                  id="xpack.dataVisualizer.file.importView.importButtonLabel"
                   defaultMessage="Import"
                 />
               </EuiButton>
@@ -564,7 +564,7 @@ export class ImportView extends Component {
             {initialized === true && importing === false && (
               <EuiButton onClick={this.clickReset}>
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.importView.resetButtonLabel"
+                  id="xpack.dataVisualizer.file.importView.resetButtonLabel"
                   defaultMessage="Reset"
                 />
               </EuiButton>
@@ -696,7 +696,7 @@ function isIndexNameValid(name) {
   ) {
     return (
       <FormattedMessage
-        id="xpack.fileDataVisualizer.importView.indexNameContainsIllegalCharactersErrorMessage"
+        id="xpack.dataVisualizer.file.importView.indexNameContainsIllegalCharactersErrorMessage"
         defaultMessage="Index name contains illegal characters"
       />
     );
@@ -713,7 +713,7 @@ function isIndexPatternNameValid(name, indexPatternNames, index) {
   if (indexPatternNames.find((i) => i === name)) {
     return (
       <FormattedMessage
-        id="xpack.fileDataVisualizer.importView.indexPatternNameAlreadyExistsErrorMessage"
+        id="xpack.dataVisualizer.file.importView.indexPatternNameAlreadyExistsErrorMessage"
         defaultMessage="Index pattern name already exists"
       />
     );
@@ -729,7 +729,7 @@ function isIndexPatternNameValid(name, indexPatternNames, index) {
     // name should match index
     return (
       <FormattedMessage
-        id="xpack.fileDataVisualizer.importView.indexPatternDoesNotMatchIndexNameErrorMessage"
+        id="xpack.dataVisualizer.file.importView.indexPatternDoesNotMatchIndexNameErrorMessage"
         defaultMessage="Index pattern does not match index name"
       />
     );
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_view/index.js b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/index.js
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/import_view/index.js
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/import_view/index.js
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/json_editor/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx
similarity index 94%
rename from x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx
index d429f8dada6ec..283e146abd00d 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/json_editor/json_editor.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/json_editor/json_editor.tsx
@@ -8,7 +8,7 @@
 import React, { FC } from 'react';
 
 import { EuiCodeEditor, EuiCodeEditorProps } from '@elastic/eui';
-import { expandLiteralStrings, XJsonMode } from '../../shared_imports';
+import { expandLiteralStrings, XJsonMode } from '../../../shared_imports';
 
 export const EDITOR_MODE = { TEXT: 'text', JSON: 'json', XJSON: new XJsonMode() };
 
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss
new file mode 100644
index 0000000000000..31f819d4f08bd
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_index.scss
@@ -0,0 +1 @@
+@import 'results_view';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_results_view.scss b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/results_view/_results_view.scss
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/_results_view.scss
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/components/results_view/index.ts
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/index.ts
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
similarity index 75%
rename from x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx
rename to x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
index e2d21f242e4ef..ed2743fcc41d6 100644
--- a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/results_view.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/components/results_view/results_view.tsx
@@ -20,11 +20,11 @@ import {
   EuiFlexGroup,
   EuiFlexItem,
 } from '@elastic/eui';
-import { FindFileStructureResponse } from '../../../../../file_upload/common';
+import { FindFileStructureResponse } from '../../../../../../file_upload/common';
 
 import { FileContents } from '../file_contents';
 import { AnalysisSummary } from '../analysis_summary';
-import { FieldsStatsGrid } from '../fields_stats_grid';
+import { FieldsStatsGrid } from '../../../common/components/fields_stats_grid';
 
 interface Props {
   data: string;
@@ -44,16 +44,16 @@ export const ResultsView: FC<Props> = ({
   disableButtons,
 }) => {
   return (
-    <EuiPage data-test-subj="mlPageFileDataVisResults">
+    <EuiPage data-test-subj="dataVisualizerPageFileResults">
       <EuiPageBody>
         <EuiPageContentHeader>
           <EuiTitle>
-            <h1 data-test-subj="mlFileDataVisResultsTitle">{fileName}</h1>
+            <h1 data-test-subj="dataVisualizerFileResultsTitle">{fileName}</h1>
           </EuiTitle>
         </EuiPageContentHeader>
         <EuiSpacer size="m" />
         <div className="results">
-          <EuiPanel data-test-subj="mlFileDataVisFileContentPanel">
+          <EuiPanel data-test-subj="dataVisualizerFileFileContentPanel">
             <FileContents
               data={data}
               format={results.format}
@@ -63,7 +63,7 @@ export const ResultsView: FC<Props> = ({
 
           <EuiSpacer size="m" />
 
-          <EuiPanel data-test-subj="mlFileDataVisSummaryPanel">
+          <EuiPanel data-test-subj="dataVisualizerFileSummaryPanel">
             <AnalysisSummary results={results} />
 
             <EuiSpacer size="m" />
@@ -72,7 +72,7 @@ export const ResultsView: FC<Props> = ({
               <EuiFlexItem grow={false}>
                 <EuiButton onClick={() => showEditFlyout()} disabled={disableButtons}>
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.resultsView.overrideSettingsButtonLabel"
+                    id="xpack.dataVisualizer.file.resultsView.overrideSettingsButtonLabel"
                     defaultMessage="Override settings"
                   />
                 </EuiButton>
@@ -80,7 +80,7 @@ export const ResultsView: FC<Props> = ({
               <EuiFlexItem grow={false}>
                 <EuiButtonEmpty onClick={() => showExplanationFlyout()} disabled={disableButtons}>
                   <FormattedMessage
-                    id="xpack.fileDataVisualizer.resultsView.analysisExplanationButtonLabel"
+                    id="xpack.dataVisualizer.file.resultsView.analysisExplanationButtonLabel"
                     defaultMessage="Analysis explanation"
                   />
                 </EuiButtonEmpty>
@@ -90,11 +90,11 @@ export const ResultsView: FC<Props> = ({
 
           <EuiSpacer size="m" />
 
-          <EuiPanel data-test-subj="mlFileDataVisFileStatsPanel">
+          <EuiPanel data-test-subj="dataVisualizerFileFileStatsPanel">
             <EuiTitle size="s">
-              <h2 data-test-subj="mlFileDataVisStatsTitle">
+              <h2 data-test-subj="dataVisualizerFileStatsTitle">
                 <FormattedMessage
-                  id="xpack.fileDataVisualizer.resultsView.fileStatsName"
+                  id="xpack.dataVisualizer.file.resultsView.fileStatsName"
                   defaultMessage="File stats"
                 />
               </h2>
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
new file mode 100644
index 0000000000000..b3f7e8531ebf5
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/file_data_visualizer.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.
+ */
+import '../_index.scss';
+import React, { FC } from 'react';
+import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { getCoreStart, getPluginsStart } from '../../kibana_services';
+
+// @ts-ignore
+import { FileDataVisualizerView } from './components/file_data_visualizer_view/index';
+
+export type FileDataVisualizerSpec = typeof FileDataVisualizer;
+export const FileDataVisualizer: FC = () => {
+  const coreStart = getCoreStart();
+  const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart();
+  const services = {
+    data,
+    maps,
+    embeddable,
+    share,
+    security,
+    fileUpload,
+    ...coreStart,
+  };
+
+  return (
+    <KibanaContextProvider services={{ ...services }}>
+      <FileDataVisualizerView
+        indexPatterns={data.indexPatterns}
+        savedObjectsClient={coreStart.savedObjects.client}
+        http={coreStart.http}
+        fileUpload={fileUpload}
+      />
+    </KibanaContextProvider>
+  );
+};
+
+// exporting as default so it can be used with React.lazy
+// eslint-disable-next-line import/no-default-export
+export default FileDataVisualizer;
diff --git a/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/index.ts b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/index.ts
new file mode 100644
index 0000000000000..ca87d73b6a758
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/file_data_visualizer/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 { FileDataVisualizer, FileDataVisualizerSpec } from './file_data_visualizer';
diff --git a/x-pack/plugins/data_visualizer/public/application/index.ts b/x-pack/plugins/data_visualizer/public/application/index.ts
new file mode 100644
index 0000000000000..6229f61be85e9
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { FileDataVisualizer, FileDataVisualizerSpec } from './file_data_visualizer';
+export {
+  IndexDataVisualizer,
+  IndexDataVisualizerSpec,
+  IndexDataVisualizerViewProps,
+} from './index_data_visualizer';
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
new file mode 100644
index 0000000000000..4b208b0a59ef1
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/actions_panel.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, { FC, useState, useEffect } from 'react';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import { EuiSpacer, EuiTitle } from '@elastic/eui';
+import {
+  DISCOVER_APP_URL_GENERATOR,
+  DiscoverUrlGeneratorState,
+} from '../../../../../../../../src/plugins/discover/public';
+import type { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns';
+import { useDataVisualizerKibana } from '../../../kibana_context';
+import { useUrlState } from '../../../common/util/url_state';
+import { LinkCard } from '../../../common/components/link_card';
+
+interface Props {
+  indexPattern: IndexPattern;
+  searchString?: string | { [key: string]: any };
+  searchQueryLanguage?: string;
+}
+
+// @todo: Add back create job card in a follow up PR
+export const ActionsPanel: FC<Props> = ({ indexPattern, searchString, searchQueryLanguage }) => {
+  const [globalState] = useUrlState('_g');
+
+  const [discoverLink, setDiscoverLink] = useState('');
+  const {
+    services: {
+      application: { capabilities },
+      share: {
+        urlGenerators: { getUrlGenerator },
+      },
+    },
+  } = useDataVisualizerKibana();
+
+  useEffect(() => {
+    let unmounted = false;
+
+    const indexPatternId = indexPattern.id;
+    const getDiscoverUrl = async (): Promise<void> => {
+      const isDiscoverAvailable = capabilities.discover?.show ?? false;
+      if (!isDiscoverAvailable) {
+        return;
+      }
+
+      const state: DiscoverUrlGeneratorState = {
+        indexPatternId,
+      };
+      if (searchString && searchQueryLanguage !== undefined) {
+        state.query = { query: searchString, language: searchQueryLanguage };
+      }
+      if (globalState?.time) {
+        state.timeRange = globalState.time;
+      }
+      if (globalState?.refreshInterval) {
+        state.refreshInterval = globalState.refreshInterval;
+      }
+
+      let discoverUrlGenerator;
+      try {
+        discoverUrlGenerator = getUrlGenerator(DISCOVER_APP_URL_GENERATOR);
+      } catch (error) {
+        // ignore error thrown when url generator is not available
+        return;
+      }
+
+      const discoverUrl = await discoverUrlGenerator.createUrl(state);
+      if (!unmounted) {
+        setDiscoverLink(discoverUrl);
+      }
+    };
+
+    getDiscoverUrl();
+    return () => {
+      unmounted = true;
+    };
+  }, [indexPattern, searchString, searchQueryLanguage, globalState, capabilities, getUrlGenerator]);
+
+  // Note we use display:none for the DataRecognizer section as it needs to be
+  // passed the recognizerResults object, and then run the recognizer check which
+  // controls whether the recognizer section is ultimately displayed.
+  return (
+    <div data-test-subj="dataVisualizerActionsPanel">
+      {discoverLink && (
+        <>
+          <EuiTitle size="s">
+            <h2>
+              <FormattedMessage
+                id="xpack.dataVisualizer.index.actionsPanel.exploreTitle"
+                defaultMessage="Explore your data"
+              />
+            </h2>
+          </EuiTitle>
+          <EuiSpacer size="m" />
+          <LinkCard
+            href={discoverLink}
+            icon="discoverApp"
+            description={i18n.translate(
+              'xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription',
+              {
+                defaultMessage: 'Explore the documents in your index.',
+              }
+            )}
+            title={
+              <FormattedMessage
+                id="xpack.dataVisualizer.index.actionsPanel.discoverAppTitle"
+                defaultMessage="Discover"
+              />
+            }
+            data-test-subj="dataVisualizerViewInDiscoverCard"
+          />
+        </>
+      )}
+    </div>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/index.ts
rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/actions_panel/index.ts
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
new file mode 100644
index 0000000000000..59f00bf00c270
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector.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 React, { FC } from 'react';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { Query, IndexPattern, TimefilterContract } from 'src/plugins/data/public';
+import { EuiButton } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { setFullTimeRange } from './full_time_range_selector_service';
+import { useDataVisualizerKibana } from '../../../kibana_context';
+
+interface Props {
+  timefilter: TimefilterContract;
+  indexPattern: IndexPattern;
+  disabled: boolean;
+  query?: Query;
+  callback?: (a: any) => void;
+}
+
+// Component for rendering a button which automatically sets the range of the time filter
+// to the time range of data in the index(es) mapped to the supplied Kibana index pattern or query.
+export const FullTimeRangeSelector: FC<Props> = ({
+  timefilter,
+  indexPattern,
+  query,
+  disabled,
+  callback,
+}) => {
+  const {
+    services: {
+      notifications: { toasts },
+    },
+  } = useDataVisualizerKibana();
+
+  // wrapper around setFullTimeRange to allow for the calling of the optional callBack prop
+  async function setRange(i: IndexPattern, q?: Query) {
+    try {
+      const fullTimeRange = await setFullTimeRange(timefilter, i, q);
+      if (typeof callback === 'function') {
+        callback(fullTimeRange);
+      }
+    } catch (e) {
+      toasts.addDanger(
+        i18n.translate(
+          'xpack.dataVisualizer.index.fullTimeRangeSelector.errorSettingTimeRangeNotification',
+          {
+            defaultMessage: 'An error occurred setting the time range.',
+          }
+        )
+      );
+    }
+  }
+  return (
+    <EuiButton
+      isDisabled={disabled}
+      onClick={() => setRange(indexPattern, query)}
+      data-test-subj="dataVisualizerButtonUseFullData"
+    >
+      <FormattedMessage
+        id="xpack.dataVisualizer.index.fullTimeRangeSelector.useFullDataButtonLabel"
+        defaultMessage="Use full {indexPatternTitle} data"
+        values={{
+          indexPatternTitle: indexPattern.title,
+        }}
+      />
+    </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
new file mode 100644
index 0000000000000..198079c6ec9de
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/full_time_range_selector_service.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 moment from 'moment';
+import { estypes } from '@elastic/elasticsearch';
+import { Query, TimefilterContract } from 'src/plugins/data/public';
+import dateMath from '@elastic/datemath';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
+import { isPopulatedObject } from '../../../../../common/utils/object_utils';
+import { getTimeFieldRange } from '../../services/time_field_range';
+import { GetTimeFieldRangeResponse } from '../../../../../common/types/time_field_request';
+
+export interface TimeRange {
+  from: number;
+  to: number;
+}
+
+export async function setFullTimeRange(
+  timefilter: TimefilterContract,
+  indexPattern: IndexPattern,
+  query?: Query
+): Promise<GetTimeFieldRangeResponse> {
+  const runtimeMappings = indexPattern.getComputedFields()
+    .runtimeFields as estypes.MappingRuntimeFields;
+  const resp = await getTimeFieldRange({
+    index: indexPattern.title,
+    timeFieldName: indexPattern.timeFieldName,
+    query,
+    ...(isPopulatedObject(runtimeMappings) ? { runtimeMappings } : {}),
+  });
+  timefilter.setTime({
+    from: moment(resp.start.epoch).toISOString(),
+    to: moment(resp.end.epoch).toISOString(),
+  });
+  return resp;
+}
+
+export function getTimeFilterRange(timefilter: TimefilterContract): TimeRange {
+  const fromMoment = dateMath.parse(timefilter.getTime().from);
+  const toMoment = dateMath.parse(timefilter.getTime().to);
+  const from = fromMoment !== undefined ? fromMoment.valueOf() : 0;
+  const to = toMoment !== undefined ? toMoment.valueOf() : 0;
+
+  return {
+    to,
+    from,
+  };
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx
new file mode 100644
index 0000000000000..c79df59ee3f69
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/full_time_range_selector/index.tsx
@@ -0,0 +1,9 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { FullTimeRangeSelector } from './full_time_range_selector';
+export { getTimeFilterRange, TimeRange } from './full_time_range_selector_service';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index.ts
new file mode 100644
index 0000000000000..bcdef0966039d
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export {
+  IndexDataVisualizerViewProps,
+  IndexDataVisualizerView,
+} from './index_data_visualizer_view';
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
new file mode 100644
index 0000000000000..12441bcfbbb23
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/index_data_visualizer_view/index_data_visualizer_view.tsx
@@ -0,0 +1,855 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, Fragment, useEffect, useMemo, useState, useCallback } from 'react';
+import { merge } from 'rxjs';
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiPage,
+  EuiPageBody,
+  EuiPageContentBody,
+  EuiPageContentHeader,
+  EuiPageContentHeaderSection,
+  EuiPanel,
+  EuiSpacer,
+  EuiTitle,
+} from '@elastic/eui';
+import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { Required } from 'utility-types';
+import { i18n } from '@kbn/i18n';
+import {
+  IndexPatternField,
+  KBN_FIELD_TYPES,
+  UI_SETTINGS,
+  Query,
+  IndexPattern,
+} from '../../../../../../../../src/plugins/data/public';
+import { FullTimeRangeSelector } from '../full_time_range_selector';
+import { usePageUrlState, useUrlState } from '../../../common/util/url_state';
+import {
+  DataVisualizerTable,
+  ItemIdToExpandedRowMap,
+} from '../../../common/components/stats_table';
+import { FieldVisConfig } from '../../../common/components/stats_table/types';
+import type {
+  MetricFieldsStats,
+  TotalFieldsStats,
+} from '../../../common/components/stats_table/components/field_count_stats';
+import { OverallStats } from '../../types/overall_stats';
+import { getActions } from '../../../common/components/field_data_row/action_menu';
+import { IndexBasedDataVisualizerExpandedRow } from '../../../common/components/expanded_row/index_based_expanded_row';
+import { DATA_VISUALIZER_INDEX_VIEWER } from '../../constants/index_data_visualizer_viewer';
+import { DataVisualizerIndexBasedAppState } from '../../types/index_data_visualizer_state';
+import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../types/combined_query';
+import {
+  FieldRequestConfig,
+  JobFieldType,
+  SavedSearchSavedObject,
+} from '../../../../../common/types';
+import { useDataVisualizerKibana } from '../../../kibana_context';
+import { FieldCountPanel } from '../../../common/components/field_count_panel';
+import { DocumentCountContent } from '../../../common/components/document_count_content';
+import { DataLoader } from '../../data_loader/data_loader';
+import { JOB_FIELD_TYPES } from '../../../../../common';
+import { useTimefilter } from '../../hooks/use_time_filter';
+import { kbnTypeToJobType } from '../../../common/util/field_types_utils';
+import { SearchPanel } from '../search_panel';
+import { ActionsPanel } from '../actions_panel';
+import { DatePickerWrapper } from '../../../common/components/date_picker_wrapper';
+import { dataVisualizerTimefilterRefresh$ } from '../../services/timefilter_refresh_service';
+import { HelpMenu } from '../../../common/components/help_menu';
+import { TimeBuckets } from '../../services/time_buckets';
+import { extractSearchData } from '../../utils/saved_search_utils';
+
+interface DataVisualizerPageState {
+  overallStats: OverallStats;
+  metricConfigs: FieldVisConfig[];
+  totalMetricFieldCount: number;
+  populatedMetricFieldCount: number;
+  metricsLoaded: boolean;
+  nonMetricConfigs: FieldVisConfig[];
+  nonMetricsLoaded: boolean;
+  documentCountStats?: FieldVisConfig;
+}
+
+const defaultSearchQuery = {
+  match_all: {},
+};
+
+function getDefaultPageState(): DataVisualizerPageState {
+  return {
+    overallStats: {
+      totalCount: 0,
+      aggregatableExistsFields: [],
+      aggregatableNotExistsFields: [],
+      nonAggregatableExistsFields: [],
+      nonAggregatableNotExistsFields: [],
+    },
+    metricConfigs: [],
+    totalMetricFieldCount: 0,
+    populatedMetricFieldCount: 0,
+    metricsLoaded: false,
+    nonMetricConfigs: [],
+    nonMetricsLoaded: false,
+    documentCountStats: undefined,
+  };
+}
+export const getDefaultDataVisualizerListState = (): Required<DataVisualizerIndexBasedAppState> => ({
+  pageIndex: 0,
+  pageSize: 10,
+  sortField: 'fieldName',
+  sortDirection: 'asc',
+  visibleFieldTypes: [],
+  visibleFieldNames: [],
+  samplerShardSize: 5000,
+  searchString: '',
+  searchQuery: defaultSearchQuery,
+  searchQueryLanguage: SEARCH_QUERY_LANGUAGE.KUERY,
+  showDistributions: true,
+  showAllFields: false,
+  showEmptyFields: false,
+});
+
+export interface IndexDataVisualizerViewProps {
+  currentIndexPattern: IndexPattern;
+  currentSavedSearch: SavedSearchSavedObject | null;
+}
+const restorableDefaults = getDefaultDataVisualizerListState();
+
+export const IndexDataVisualizerView: FC<IndexDataVisualizerViewProps> = (dataVisualizerProps) => {
+  const {
+    services: { lens: lensPlugin, docLinks, notifications, uiSettings },
+  } = useDataVisualizerKibana();
+  const { toasts } = notifications;
+
+  const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState(
+    DATA_VISUALIZER_INDEX_VIEWER,
+    restorableDefaults
+  );
+  const [globalState, setGlobalState] = useUrlState('_g');
+
+  const [currentSavedSearch, setCurrentSavedSearch] = useState(
+    dataVisualizerProps.currentSavedSearch
+  );
+
+  const { currentIndexPattern } = dataVisualizerProps;
+
+  useEffect(() => {
+    if (dataVisualizerProps?.currentSavedSearch !== undefined) {
+      setCurrentSavedSearch(dataVisualizerProps?.currentSavedSearch);
+    }
+  }, [dataVisualizerProps?.currentSavedSearch]);
+
+  const getTimeBuckets = useCallback(() => {
+    return new TimeBuckets({
+      [UI_SETTINGS.HISTOGRAM_MAX_BARS]: uiSettings.get(UI_SETTINGS.HISTOGRAM_MAX_BARS),
+      [UI_SETTINGS.HISTOGRAM_BAR_TARGET]: uiSettings.get(UI_SETTINGS.HISTOGRAM_BAR_TARGET),
+      dateFormat: uiSettings.get('dateFormat'),
+      'dateFormat:scaled': uiSettings.get('dateFormat:scaled'),
+    });
+  }, [uiSettings]);
+
+  const timefilter = useTimefilter({
+    timeRangeSelector: currentIndexPattern?.timeFieldName !== undefined,
+    autoRefreshSelector: true,
+  });
+
+  const dataLoader = useMemo(() => new DataLoader(currentIndexPattern, toasts), [
+    currentIndexPattern,
+    toasts,
+  ]);
+
+  useEffect(() => {
+    if (globalState?.time !== undefined) {
+      timefilter.setTime({
+        from: globalState.time.from,
+        to: globalState.time.to,
+      });
+    }
+  }, [globalState, timefilter]);
+
+  useEffect(() => {
+    if (globalState?.refreshInterval !== undefined) {
+      timefilter.setRefreshInterval(globalState.refreshInterval);
+    }
+  }, [globalState, timefilter]);
+
+  const [lastRefresh, setLastRefresh] = useState(0);
+
+  useEffect(() => {
+    if (!currentIndexPattern.isTimeBased()) {
+      toasts.addWarning({
+        title: i18n.translate(
+          'xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationTitle',
+          {
+            defaultMessage: 'The index pattern {indexPatternTitle} is not based on a time series',
+            values: { indexPatternTitle: currentIndexPattern.title },
+          }
+        ),
+        text: i18n.translate(
+          'xpack.dataVisualizer.index.indexPatternNotBasedOnTimeSeriesNotificationDescription',
+          {
+            defaultMessage: 'Anomaly detection only runs over time-based indices',
+          }
+        ),
+      });
+    }
+  }, [currentIndexPattern, toasts]);
+
+  // Obtain the list of non metric field types which appear in the index pattern.
+  let indexedFieldTypes: JobFieldType[] = [];
+  const indexPatternFields: IndexPatternField[] = currentIndexPattern.fields;
+  indexPatternFields.forEach((field) => {
+    if (field.scripted !== true) {
+      const dataVisualizerType: JobFieldType | undefined = kbnTypeToJobType(field);
+      if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) {
+        indexedFieldTypes.push(dataVisualizerType);
+      }
+    }
+  });
+  indexedFieldTypes = indexedFieldTypes.sort();
+
+  const defaults = getDefaultPageState();
+
+  const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => {
+    const searchData = extractSearchData(
+      currentSavedSearch,
+      currentIndexPattern,
+      uiSettings.get(UI_SETTINGS.QUERY_STRING_OPTIONS)
+    );
+
+    if (searchData === undefined || dataVisualizerListState.searchString !== '') {
+      return {
+        searchQuery: dataVisualizerListState.searchQuery,
+        searchString: dataVisualizerListState.searchString,
+        searchQueryLanguage: dataVisualizerListState.searchQueryLanguage,
+      };
+    } else {
+      return {
+        searchQuery: searchData.searchQuery,
+        searchString: searchData.searchString,
+        searchQueryLanguage: searchData.queryLanguage,
+      };
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [currentSavedSearch, currentIndexPattern, dataVisualizerListState]);
+
+  const setSearchParams = (searchParams: {
+    searchQuery: Query['query'];
+    searchString: Query['query'];
+    queryLanguage: SearchQueryLanguage;
+  }) => {
+    // When the user loads saved search and then clear or modify the query
+    // we should remove the saved search and replace it with the index pattern id
+    if (currentSavedSearch !== null) {
+      setCurrentSavedSearch(null);
+    }
+
+    setDataVisualizerListState({
+      ...dataVisualizerListState,
+      searchQuery: searchParams.searchQuery,
+      searchString: searchParams.searchString,
+      searchQueryLanguage: searchParams.queryLanguage,
+    });
+  };
+
+  const samplerShardSize =
+    dataVisualizerListState.samplerShardSize ?? restorableDefaults.samplerShardSize;
+  const setSamplerShardSize = (value: number) => {
+    setDataVisualizerListState({ ...dataVisualizerListState, samplerShardSize: value });
+  };
+
+  const visibleFieldTypes =
+    dataVisualizerListState.visibleFieldTypes ?? restorableDefaults.visibleFieldTypes;
+  const setVisibleFieldTypes = (values: string[]) => {
+    setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldTypes: values });
+  };
+
+  const visibleFieldNames =
+    dataVisualizerListState.visibleFieldNames ?? restorableDefaults.visibleFieldNames;
+  const setVisibleFieldNames = (values: string[]) => {
+    setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldNames: values });
+  };
+
+  const showEmptyFields =
+    dataVisualizerListState.showEmptyFields ?? restorableDefaults.showEmptyFields;
+  const toggleShowEmptyFields = () => {
+    setDataVisualizerListState({
+      ...dataVisualizerListState,
+      showEmptyFields: !dataVisualizerListState.showEmptyFields,
+    });
+  };
+
+  const [overallStats, setOverallStats] = useState(defaults.overallStats);
+
+  const [documentCountStats, setDocumentCountStats] = useState(defaults.documentCountStats);
+  const [metricConfigs, setMetricConfigs] = useState(defaults.metricConfigs);
+  const [metricsLoaded, setMetricsLoaded] = useState(defaults.metricsLoaded);
+  const [metricsStats, setMetricsStats] = useState<undefined | MetricFieldsStats>();
+
+  const [nonMetricConfigs, setNonMetricConfigs] = useState(defaults.nonMetricConfigs);
+  const [nonMetricsLoaded, setNonMetricsLoaded] = useState(defaults.nonMetricsLoaded);
+
+  useEffect(() => {
+    const timeUpdateSubscription = merge(
+      timefilter.getTimeUpdate$(),
+      dataVisualizerTimefilterRefresh$
+    ).subscribe(() => {
+      setGlobalState({
+        time: timefilter.getTime(),
+        refreshInterval: timefilter.getRefreshInterval(),
+      });
+      setLastRefresh(Date.now());
+    });
+    return () => {
+      timeUpdateSubscription.unsubscribe();
+    };
+  });
+
+  useEffect(() => {
+    loadOverallStats();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [searchQuery, samplerShardSize, lastRefresh]);
+
+  useEffect(() => {
+    createMetricCards();
+    createNonMetricCards();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [overallStats, showEmptyFields]);
+
+  useEffect(() => {
+    loadMetricFieldStats();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [metricConfigs]);
+
+  useEffect(() => {
+    loadNonMetricFieldStats();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [nonMetricConfigs]);
+
+  useEffect(() => {
+    createMetricCards();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [metricsLoaded]);
+
+  useEffect(() => {
+    createNonMetricCards();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [nonMetricsLoaded]);
+
+  async function loadOverallStats() {
+    const tf = timefilter as any;
+    let earliest;
+    let latest;
+
+    const activeBounds = tf.getActiveBounds();
+
+    if (currentIndexPattern.timeFieldName !== undefined && activeBounds === undefined) {
+      return;
+    }
+
+    if (currentIndexPattern.timeFieldName !== undefined) {
+      earliest = activeBounds.min.valueOf();
+      latest = activeBounds.max.valueOf();
+    }
+
+    try {
+      const allStats = await dataLoader.loadOverallData(
+        searchQuery,
+        samplerShardSize,
+        earliest,
+        latest
+      );
+      setOverallStats(allStats);
+    } catch (err) {
+      dataLoader.displayError(err);
+    }
+  }
+
+  async function loadMetricFieldStats() {
+    // Only request data for fields that exist in documents.
+    if (metricConfigs.length === 0) {
+      return;
+    }
+
+    const configsToLoad = metricConfigs.filter(
+      (config) => config.existsInDocs === true && config.loading === true
+    );
+    if (configsToLoad.length === 0) {
+      return;
+    }
+
+    // Pass the field name, type and cardinality in the request.
+    // Top values will be obtained on a sample if cardinality > 100000.
+    const existMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => {
+      const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 };
+      if (config.stats !== undefined && config.stats.cardinality !== undefined) {
+        props.cardinality = config.stats.cardinality;
+      }
+      return props;
+    });
+
+    // Obtain the interval to use for date histogram aggregations
+    // (such as the document count chart). Aim for 75 bars.
+    const buckets = getTimeBuckets();
+
+    const tf = timefilter as any;
+    let earliest: number | undefined;
+    let latest: number | undefined;
+    if (currentIndexPattern.timeFieldName !== undefined) {
+      earliest = tf.getActiveBounds().min.valueOf();
+      latest = tf.getActiveBounds().max.valueOf();
+    }
+
+    const bounds = tf.getActiveBounds();
+    const BAR_TARGET = 75;
+    buckets.setInterval('auto');
+    buckets.setBounds(bounds);
+    buckets.setBarTarget(BAR_TARGET);
+    const aggInterval = buckets.getInterval();
+
+    try {
+      const metricFieldStats = await dataLoader.loadFieldStats(
+        searchQuery,
+        samplerShardSize,
+        earliest,
+        latest,
+        existMetricFields,
+        aggInterval.asMilliseconds()
+      );
+
+      // Add the metric stats to the existing stats in the corresponding config.
+      const configs: FieldVisConfig[] = [];
+      metricConfigs.forEach((config) => {
+        const configWithStats = { ...config };
+        if (config.fieldName !== undefined) {
+          configWithStats.stats = {
+            ...configWithStats.stats,
+            ...metricFieldStats.find(
+              (fieldStats: any) => fieldStats.fieldName === config.fieldName
+            ),
+          };
+          configWithStats.loading = false;
+          configs.push(configWithStats);
+        } else {
+          // Document count card.
+          configWithStats.stats = metricFieldStats.find(
+            (fieldStats: any) => fieldStats.fieldName === undefined
+          );
+
+          if (configWithStats.stats !== undefined) {
+            // Add earliest / latest of timefilter for setting x axis domain.
+            configWithStats.stats.timeRangeEarliest = earliest;
+            configWithStats.stats.timeRangeLatest = latest;
+          }
+          setDocumentCountStats(configWithStats);
+        }
+      });
+
+      setMetricConfigs(configs);
+    } catch (err) {
+      dataLoader.displayError(err);
+    }
+  }
+
+  async function loadNonMetricFieldStats() {
+    // Only request data for fields that exist in documents.
+    if (nonMetricConfigs.length === 0) {
+      return;
+    }
+
+    const configsToLoad = nonMetricConfigs.filter(
+      (config) => config.existsInDocs === true && config.loading === true
+    );
+    if (configsToLoad.length === 0) {
+      return;
+    }
+
+    // Pass the field name, type and cardinality in the request.
+    // Top values will be obtained on a sample if cardinality > 100000.
+    const existNonMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => {
+      const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 };
+      if (config.stats !== undefined && config.stats.cardinality !== undefined) {
+        props.cardinality = config.stats.cardinality;
+      }
+      return props;
+    });
+
+    const tf = timefilter as any;
+    let earliest;
+    let latest;
+    if (currentIndexPattern.timeFieldName !== undefined) {
+      earliest = tf.getActiveBounds().min.valueOf();
+      latest = tf.getActiveBounds().max.valueOf();
+    }
+
+    try {
+      const nonMetricFieldStats = await dataLoader.loadFieldStats(
+        searchQuery,
+        samplerShardSize,
+        earliest,
+        latest,
+        existNonMetricFields
+      );
+
+      // Add the field stats to the existing stats in the corresponding config.
+      const configs: FieldVisConfig[] = [];
+      nonMetricConfigs.forEach((config) => {
+        const configWithStats = { ...config };
+        if (config.fieldName !== undefined) {
+          configWithStats.stats = {
+            ...configWithStats.stats,
+            ...nonMetricFieldStats.find(
+              (fieldStats: any) => fieldStats.fieldName === config.fieldName
+            ),
+          };
+        }
+        configWithStats.loading = false;
+        configs.push(configWithStats);
+      });
+
+      setNonMetricConfigs(configs);
+    } catch (err) {
+      dataLoader.displayError(err);
+    }
+  }
+
+  const createMetricCards = useCallback(() => {
+    const configs: FieldVisConfig[] = [];
+    const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || [];
+
+    const allMetricFields = indexPatternFields.filter((f) => {
+      return (
+        f.type === KBN_FIELD_TYPES.NUMBER &&
+        f.displayName !== undefined &&
+        dataLoader.isDisplayField(f.displayName) === true
+      );
+    });
+    const metricExistsFields = allMetricFields.filter((f) => {
+      return aggregatableExistsFields.find((existsF) => {
+        return existsF.fieldName === f.displayName;
+      });
+    });
+
+    // Add a config for 'document count', identified by no field name if indexpattern is time based.
+    if (currentIndexPattern.timeFieldName !== undefined) {
+      configs.push({
+        type: JOB_FIELD_TYPES.NUMBER,
+        existsInDocs: true,
+        loading: true,
+        aggregatable: true,
+      });
+    }
+
+    if (metricsLoaded === false) {
+      setMetricsLoaded(true);
+      return;
+    }
+
+    let aggregatableFields: any[] = overallStats.aggregatableExistsFields;
+    if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) {
+      aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields);
+    }
+
+    const metricFieldsToShow =
+      metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields;
+
+    metricFieldsToShow.forEach((field) => {
+      const fieldData = aggregatableFields.find((f) => {
+        return f.fieldName === field.displayName;
+      });
+
+      const metricConfig: FieldVisConfig = {
+        ...(fieldData ? fieldData : {}),
+        fieldFormat: currentIndexPattern.getFormatterForField(field),
+        type: JOB_FIELD_TYPES.NUMBER,
+        loading: true,
+        aggregatable: true,
+      };
+
+      configs.push(metricConfig);
+    });
+
+    setMetricsStats({
+      totalMetricFieldsCount: allMetricFields.length,
+      visibleMetricsCount: metricFieldsToShow.length,
+    });
+    setMetricConfigs(configs);
+  }, [
+    currentIndexPattern,
+    dataLoader,
+    indexPatternFields,
+    metricsLoaded,
+    overallStats,
+    showEmptyFields,
+  ]);
+
+  const createNonMetricCards = useCallback(() => {
+    const allNonMetricFields = indexPatternFields.filter((f) => {
+      return (
+        f.type !== KBN_FIELD_TYPES.NUMBER &&
+        f.displayName !== undefined &&
+        dataLoader.isDisplayField(f.displayName) === true
+      );
+    });
+    // Obtain the list of all non-metric fields which appear in documents
+    // (aggregatable or not aggregatable).
+    const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields.
+    let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats.
+    const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || [];
+    const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || [];
+
+    allNonMetricFields.forEach((f) => {
+      const checkAggregatableField = aggregatableExistsFields.find(
+        (existsField) => existsField.fieldName === f.displayName
+      );
+
+      if (checkAggregatableField !== undefined) {
+        populatedNonMetricFields.push(f);
+        nonMetricFieldData.push(checkAggregatableField);
+      } else {
+        const checkNonAggregatableField = nonAggregatableExistsFields.find(
+          (existsField) => existsField.fieldName === f.displayName
+        );
+
+        if (checkNonAggregatableField !== undefined) {
+          populatedNonMetricFields.push(f);
+          nonMetricFieldData.push(checkNonAggregatableField);
+        }
+      }
+    });
+
+    if (nonMetricsLoaded === false) {
+      setNonMetricsLoaded(true);
+      return;
+    }
+
+    if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) {
+      // Combine the field data obtained from Elasticsearch into a single array.
+      nonMetricFieldData = nonMetricFieldData.concat(
+        overallStats.aggregatableNotExistsFields,
+        overallStats.nonAggregatableNotExistsFields
+      );
+    }
+
+    const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields;
+
+    const configs: FieldVisConfig[] = [];
+
+    nonMetricFieldsToShow.forEach((field) => {
+      const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName);
+
+      const nonMetricConfig = {
+        ...fieldData,
+        fieldFormat: currentIndexPattern.getFormatterForField(field),
+        aggregatable: field.aggregatable,
+        scripted: field.scripted,
+        loading: fieldData.existsInDocs,
+      };
+
+      // Map the field type from the Kibana index pattern to the field type
+      // used in the data visualizer.
+      const dataVisualizerType = kbnTypeToJobType(field);
+      if (dataVisualizerType !== undefined) {
+        nonMetricConfig.type = dataVisualizerType;
+      } else {
+        // Add a flag to indicate that this is one of the 'other' Kibana
+        // field types that do not yet have a specific card type.
+        nonMetricConfig.type = field.type;
+        nonMetricConfig.isUnsupportedType = true;
+      }
+
+      configs.push(nonMetricConfig);
+    });
+
+    setNonMetricConfigs(configs);
+  }, [
+    currentIndexPattern,
+    dataLoader,
+    indexPatternFields,
+    nonMetricsLoaded,
+    overallStats,
+    showEmptyFields,
+  ]);
+
+  const wizardPanelWidth = '280px';
+
+  const configs = useMemo(() => {
+    let combinedConfigs = [...nonMetricConfigs, ...metricConfigs];
+    if (visibleFieldTypes && visibleFieldTypes.length > 0) {
+      combinedConfigs = combinedConfigs.filter(
+        (config) => visibleFieldTypes.findIndex((field) => field === config.type) > -1
+      );
+    }
+    if (visibleFieldNames && visibleFieldNames.length > 0) {
+      combinedConfigs = combinedConfigs.filter(
+        (config) => visibleFieldNames.findIndex((field) => field === config.fieldName) > -1
+      );
+    }
+
+    return combinedConfigs;
+  }, [nonMetricConfigs, metricConfigs, visibleFieldTypes, visibleFieldNames]);
+
+  const fieldsCountStats: TotalFieldsStats | undefined = useMemo(() => {
+    let _visibleFieldsCount = 0;
+    let _totalFieldsCount = 0;
+    Object.keys(overallStats).forEach((key) => {
+      const fieldsGroup = overallStats[key as keyof OverallStats];
+      if (Array.isArray(fieldsGroup) && fieldsGroup.length > 0) {
+        _totalFieldsCount += fieldsGroup.length;
+      }
+    });
+
+    if (showEmptyFields === true) {
+      _visibleFieldsCount = _totalFieldsCount;
+    } else {
+      _visibleFieldsCount =
+        overallStats.aggregatableExistsFields.length +
+        overallStats.nonAggregatableExistsFields.length;
+    }
+    return { visibleFieldsCount: _visibleFieldsCount, totalFieldsCount: _totalFieldsCount };
+  }, [overallStats, showEmptyFields]);
+
+  const getItemIdToExpandedRowMap = useCallback(
+    function (itemIds: string[], items: FieldVisConfig[]): ItemIdToExpandedRowMap {
+      return itemIds.reduce((m: ItemIdToExpandedRowMap, fieldName: string) => {
+        const item = items.find((fieldVisConfig) => fieldVisConfig.fieldName === fieldName);
+        if (item !== undefined) {
+          m[fieldName] = (
+            <IndexBasedDataVisualizerExpandedRow
+              item={item}
+              indexPattern={currentIndexPattern}
+              combinedQuery={{ searchQueryLanguage, searchString }}
+            />
+          );
+        }
+        return m;
+      }, {} as ItemIdToExpandedRowMap);
+    },
+    [currentIndexPattern, searchQueryLanguage, searchString]
+  );
+
+  // Inject custom action column for the index based visualizer
+  const extendedColumns = useMemo(() => {
+    if (lensPlugin === undefined) {
+      // eslint-disable-next-line no-console
+      console.error('Lens plugin not available');
+      return;
+    }
+    const actionColumn: EuiTableActionsColumnType<FieldVisConfig> = {
+      name: (
+        <FormattedMessage
+          id="xpack.dataVisualizer.index.dataGrid.actionsColumnLabel"
+          defaultMessage="Actions"
+        />
+      ),
+      actions: getActions(currentIndexPattern, lensPlugin, { searchQueryLanguage, searchString }),
+      width: '100px',
+    };
+
+    return [actionColumn];
+  }, [currentIndexPattern, lensPlugin, searchQueryLanguage, searchString]);
+
+  const helpLink = docLinks.links.ml.guide;
+  return (
+    <Fragment>
+      <EuiPage data-test-subj="dataVisualizerIndexPage">
+        <EuiPageBody>
+          <EuiFlexGroup gutterSize="m">
+            <EuiFlexItem>
+              <EuiPageContentHeader>
+                <EuiPageContentHeaderSection>
+                  <EuiTitle size="l">
+                    <h1>{currentIndexPattern.title}</h1>
+                  </EuiTitle>
+                </EuiPageContentHeaderSection>
+                <EuiPageContentHeaderSection data-test-subj="dataVisualizerTimeRangeSelectorSection">
+                  <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
+                    {currentIndexPattern.timeFieldName !== undefined && (
+                      <EuiFlexItem grow={false}>
+                        <FullTimeRangeSelector
+                          indexPattern={currentIndexPattern}
+                          query={undefined}
+                          disabled={false}
+                          timefilter={timefilter}
+                        />
+                      </EuiFlexItem>
+                    )}
+                    <EuiFlexItem grow={false}>
+                      <DatePickerWrapper />
+                    </EuiFlexItem>
+                  </EuiFlexGroup>
+                </EuiPageContentHeaderSection>
+              </EuiPageContentHeader>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiSpacer size="m" />
+          <EuiPageContentBody>
+            <EuiFlexGroup gutterSize="m">
+              <EuiFlexItem>
+                <EuiPanel>
+                  {overallStats?.totalCount !== undefined && (
+                    <EuiFlexItem grow={true}>
+                      <DocumentCountContent
+                        config={documentCountStats}
+                        totalCount={overallStats.totalCount}
+                      />
+                    </EuiFlexItem>
+                  )}
+                  <EuiSpacer size={'m'} />
+
+                  <SearchPanel
+                    indexPattern={currentIndexPattern}
+                    searchString={searchString}
+                    searchQuery={searchQuery}
+                    searchQueryLanguage={searchQueryLanguage}
+                    setSearchParams={setSearchParams}
+                    samplerShardSize={samplerShardSize}
+                    setSamplerShardSize={setSamplerShardSize}
+                    overallStats={overallStats}
+                    indexedFieldTypes={indexedFieldTypes}
+                    setVisibleFieldTypes={setVisibleFieldTypes}
+                    visibleFieldTypes={visibleFieldTypes}
+                    visibleFieldNames={visibleFieldNames}
+                    setVisibleFieldNames={setVisibleFieldNames}
+                    showEmptyFields={showEmptyFields}
+                  />
+                  <EuiSpacer size={'l'} />
+                  <FieldCountPanel
+                    showEmptyFields={showEmptyFields}
+                    toggleShowEmptyFields={toggleShowEmptyFields}
+                    fieldsCountStats={fieldsCountStats}
+                    metricsStats={metricsStats}
+                  />
+                  <EuiSpacer size={'m'} />
+                  <DataVisualizerTable<FieldVisConfig>
+                    items={configs}
+                    pageState={dataVisualizerListState}
+                    updatePageState={setDataVisualizerListState}
+                    getItemIdToExpandedRowMap={getItemIdToExpandedRowMap}
+                    extendedColumns={extendedColumns}
+                  />
+                </EuiPanel>
+              </EuiFlexItem>
+              <EuiFlexItem grow={false} style={{ width: wizardPanelWidth }}>
+                <ActionsPanel
+                  indexPattern={currentIndexPattern}
+                  searchQueryLanguage={searchQueryLanguage}
+                  searchString={searchString}
+                />
+              </EuiFlexItem>
+            </EuiFlexGroup>
+          </EuiPageContentBody>
+        </EuiPageBody>
+      </EuiPage>
+
+      <HelpMenu docLink={helpLink} />
+    </Fragment>
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_name_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx
similarity index 82%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_name_filter.tsx
rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx
index ab8f36761a116..634bf25dbc8a0 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_name_filter.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_name_filter.tsx
@@ -7,8 +7,8 @@
 
 import React, { FC, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
-import { Option, MultiSelectPicker } from '../../../../components/multi_select_picker';
-import type { OverallStats } from '../../../../../../common/types/datavisualizer';
+import { Option, MultiSelectPicker } from '../../../common/components/multi_select_picker';
+import { OverallStats } from '../../types/overall_stats';
 
 interface Props {
   overallStats: OverallStats;
@@ -41,11 +41,11 @@ export const DataVisualizerFieldNamesFilter: FC<Props> = ({
       });
     }
     return options;
-  }, [overallStats]);
+  }, [overallStats, showEmptyFields]);
 
   const fieldNameTitle = useMemo(
     () =>
-      i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldNameSelect', {
+      i18n.translate('xpack.dataVisualizer.index.fieldNameSelect', {
         defaultMessage: 'Field name',
       }),
     []
@@ -57,7 +57,7 @@ export const DataVisualizerFieldNamesFilter: FC<Props> = ({
       options={items}
       onChange={setVisibleFieldNames}
       checkedOptions={visibleFieldNames}
-      dataTestSubj={'mlDataVisualizerFieldNameSelect'}
+      dataTestSubj={'dataVisualizerFieldNameSelect'}
     />
   );
 };
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx
new file mode 100644
index 0000000000000..4f9de09dc670e
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/field_type_filter.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useMemo } from 'react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { JOB_FIELD_TYPES, JobFieldType } from '../../../../../common';
+import { FieldTypeIcon } from '../../../common/components/field_type_icon';
+import { MultiSelectPicker, Option } from '../../../common/components/multi_select_picker';
+
+const ML_JOB_FIELD_TYPES_OPTIONS = {
+  [JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' },
+  [JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' },
+  [JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' },
+  [JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' },
+  [JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' },
+  [JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' },
+  [JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' },
+  [JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' },
+  [JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' },
+};
+
+export const DatavisualizerFieldTypeFilter: FC<{
+  indexedFieldTypes: JobFieldType[];
+  setVisibleFieldTypes(q: string[]): void;
+  visibleFieldTypes: string[];
+}> = ({ indexedFieldTypes, setVisibleFieldTypes, visibleFieldTypes }) => {
+  const options: Option[] = useMemo(() => {
+    return indexedFieldTypes.map((indexedFieldName) => {
+      const item = ML_JOB_FIELD_TYPES_OPTIONS[indexedFieldName];
+
+      return {
+        value: indexedFieldName,
+        name: (
+          <EuiFlexGroup>
+            <EuiFlexItem grow={true}> {item.name}</EuiFlexItem>
+            {indexedFieldName && (
+              <EuiFlexItem grow={false}>
+                <FieldTypeIcon
+                  type={indexedFieldName}
+                  fieldName={item.name}
+                  tooltipEnabled={false}
+                  needsAria={true}
+                />
+              </EuiFlexItem>
+            )}
+          </EuiFlexGroup>
+        ),
+      };
+    });
+  }, [indexedFieldTypes]);
+  const fieldTypeTitle = useMemo(
+    () =>
+      i18n.translate('xpack.dataVisualizer.index.fieldTypeSelect', {
+        defaultMessage: 'Field type',
+      }),
+    []
+  );
+  return (
+    <MultiSelectPicker
+      title={fieldTypeTitle}
+      options={options}
+      onChange={setVisibleFieldTypes}
+      checkedOptions={visibleFieldTypes}
+      dataTestSubj={'dataVisualizerFieldTypeSelect'}
+    />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts
similarity index 100%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/index.ts
rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/index.ts
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
similarity index 85%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
index 1988ac39d0a90..8694e1c952dcc 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/search_panel.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/search_panel.tsx
@@ -5,30 +5,25 @@
  * 2.0.
  */
 
-import React, { FC, useState } from 'react';
-
+import React, { FC, useEffect, useState } from 'react';
 import { EuiCode, EuiFlexItem, EuiFlexGroup, EuiInputPopover } from '@elastic/eui';
-
 import { i18n } from '@kbn/i18n';
-
-import { IndexPattern } from '../../../../../../../../../src/plugins/data/public';
-
-import {
-  SEARCH_QUERY_LANGUAGE,
-  ErrorMessage,
-  SearchQueryLanguage,
-} from '../../../../../../common/constants/search';
-
 import {
   esKuery,
   esQuery,
   Query,
   QueryStringInput,
-} from '../../../../../../../../../src/plugins/data/public';
+} from '../../../../../../../../src/plugins/data/public';
 import { ShardSizeFilter } from './shard_size_select';
 import { DataVisualizerFieldNamesFilter } from './field_name_filter';
 import { DatavisualizerFieldTypeFilter } from './field_type_filter';
-import { MlJobFieldType } from '../../../../../../common/types/field_types';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { JobFieldType } from '../../../../../common/types';
+import {
+  ErrorMessage,
+  SEARCH_QUERY_LANGUAGE,
+  SearchQueryLanguage,
+} from '../../types/combined_query';
 
 interface Props {
   indexPattern: IndexPattern;
@@ -38,7 +33,7 @@ interface Props {
   samplerShardSize: number;
   setSamplerShardSize(s: number): void;
   overallStats: any;
-  indexedFieldTypes: MlJobFieldType[];
+  indexedFieldTypes: JobFieldType[];
   setVisibleFieldTypes(q: string[]): void;
   visibleFieldTypes: string[];
   setVisibleFieldNames(q: string[]): void;
@@ -77,6 +72,13 @@ export const SearchPanel: FC<Props> = ({
   });
   const [errorMessage, setErrorMessage] = useState<ErrorMessage | undefined>(undefined);
 
+  useEffect(() => {
+    setSearchInput({
+      query: searchString || '',
+      language: searchQueryLanguage,
+    });
+  }, [searchQueryLanguage, searchString]);
+
   const searchHandler = (query: Query) => {
     let filterQuery;
     try {
@@ -103,7 +105,7 @@ export const SearchPanel: FC<Props> = ({
   const searchChangeHandler = (query: Query) => setSearchInput(query);
 
   return (
-    <EuiFlexGroup gutterSize="m" alignItems="center" data-test-subj="mlDataVisualizerSearchPanel">
+    <EuiFlexGroup gutterSize="m" alignItems="center" data-test-subj="dataVisualizerSearchPanel">
       <EuiFlexItem>
         <EuiInputPopover
           style={{ maxWidth: '100%' }}
@@ -116,13 +118,13 @@ export const SearchPanel: FC<Props> = ({
               onChange={searchChangeHandler}
               onSubmit={searchHandler}
               placeholder={i18n.translate(
-                'xpack.ml.datavisualizer.searchPanel.queryBarPlaceholderText',
+                'xpack.dataVisualizer.searchPanel.queryBarPlaceholderText',
                 {
                   defaultMessage: 'Search… (e.g. status:200 AND extension:"PHP")',
                 }
               )}
               disableAutoFocus={true}
-              dataTestSubj="mlDataVisualizerQueryInput"
+              dataTestSubj="dataVisualizerQueryInput"
               languageSwitcherPopoverAnchorPosition="rightDown"
             />
           }
@@ -130,7 +132,7 @@ export const SearchPanel: FC<Props> = ({
         >
           <EuiCode>
             {i18n.translate(
-              'xpack.ml.datavisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar',
+              'xpack.dataVisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar',
               {
                 defaultMessage: 'Invalid query',
               }
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/shard_size_select.tsx b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx
similarity index 77%
rename from x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/shard_size_select.tsx
rename to x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx
index 5351d3467020f..85f3d2b596105 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/shard_size_select.tsx
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/components/search_panel/shard_size_select.tsx
@@ -20,17 +20,17 @@ const searchSizeOptions = [1000, 5000, 10000, 100000, -1].map((v) => {
     value: String(v),
     inputDisplay:
       v > 0 ? (
-        <span data-test-subj={`mlDataVisualizerShardSizeOption ${v}`}>
+        <span data-test-subj={`dataVisualizerShardSizeOption ${v}`}>
           <FormattedMessage
-            id="xpack.ml.datavisualizer.searchPanel.sampleSizeOptionLabel"
+            id="xpack.dataVisualizer.searchPanel.sampleSizeOptionLabel"
             defaultMessage="Sample size (per shard): {wrappedValue}"
             values={{ wrappedValue: <b>{v}</b> }}
           />
         </span>
       ) : (
-        <span data-test-subj={`mlDataVisualizerShardSizeOption all`}>
+        <span data-test-subj={`dataVisualizerShardSizeOption all`}>
           <FormattedMessage
-            id="xpack.ml.datavisualizer.searchPanel.allOptionLabel"
+            id="xpack.dataVisualizer.searchPanel.allOptionLabel"
             defaultMessage="Search all"
           />
         </span>
@@ -46,15 +46,15 @@ export const ShardSizeFilter: FC<Props> = ({ samplerShardSize, setSamplerShardSi
           options={searchSizeOptions}
           valueOfSelected={String(samplerShardSize)}
           onChange={(value) => setSamplerShardSize(+value)}
-          aria-label={i18n.translate('xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel', {
+          aria-label={i18n.translate('xpack.dataVisualizer.searchPanel.sampleSizeAriaLabel', {
             defaultMessage: 'Select number of documents to sample',
           })}
-          data-test-subj="mlDataVisualizerShardSizeSelect"
+          data-test-subj="dataVisualizerShardSizeSelect"
         />
       </EuiFlexItem>
       <EuiFlexItem grow={false}>
         <EuiIconTip
-          content={i18n.translate('xpack.ml.datavisualizer.searchPanel.queryBarPlaceholder', {
+          content={i18n.translate('xpack.dataVisualizer.searchPanel.queryBarPlaceholder', {
             defaultMessage:
               'Selecting a smaller sample size will reduce query run times and the load on the cluster.',
           })}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.ts
new file mode 100644
index 0000000000000..cd12706d0bc9b
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/constants/index_data_visualizer_viewer.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 const DATA_VISUALIZER_INDEX_VIEWER = 'DATA_VISUALIZER_INDEX_VIEWER';
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
new file mode 100644
index 0000000000000..3cb0d4d672f48
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/data_loader/data_loader.ts
@@ -0,0 +1,143 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// Maximum number of examples to obtain for text type fields.
+import { CoreSetup } from 'kibana/public';
+import { estypes } from '@elastic/elasticsearch';
+import { i18n } from '@kbn/i18n';
+import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { KBN_FIELD_TYPES } from '../../../../../../../src/plugins/data/common';
+import { OMIT_FIELDS } from '../../../../common/constants';
+import { FieldRequestConfig } from '../../../../common/types';
+import { getVisualizerFieldStats, getVisualizerOverallStats } from '../services/visualizer_stats';
+
+type IndexPatternTitle = string;
+type SavedSearchQuery = Record<string, any> | null | undefined;
+
+const MAX_EXAMPLES_DEFAULT: number = 10;
+
+export class DataLoader {
+  private _indexPattern: IndexPattern;
+  private _runtimeMappings: estypes.MappingRuntimeFields;
+  private _indexPatternTitle: IndexPatternTitle = '';
+  private _maxExamples: number = MAX_EXAMPLES_DEFAULT;
+  private _toastNotifications: CoreSetup['notifications']['toasts'];
+
+  constructor(
+    indexPattern: IndexPattern,
+    toastNotifications: CoreSetup['notifications']['toasts']
+  ) {
+    this._indexPattern = indexPattern;
+    this._runtimeMappings = this._indexPattern.getComputedFields()
+      .runtimeFields as estypes.MappingRuntimeFields;
+    this._indexPatternTitle = indexPattern.title;
+    this._toastNotifications = toastNotifications;
+  }
+
+  async loadOverallData(
+    query: string | SavedSearchQuery,
+    samplerShardSize: number,
+    earliest: number | undefined,
+    latest: number | undefined
+  ): Promise<any> {
+    const aggregatableFields: string[] = [];
+    const nonAggregatableFields: string[] = [];
+    this._indexPattern.fields.forEach((field) => {
+      const fieldName = field.displayName !== undefined ? field.displayName : field.name;
+      if (this.isDisplayField(fieldName) === true) {
+        if (field.aggregatable === true && field.type !== KBN_FIELD_TYPES.GEO_SHAPE) {
+          aggregatableFields.push(fieldName);
+        } else {
+          nonAggregatableFields.push(fieldName);
+        }
+      }
+    });
+
+    // Need to find:
+    // 1. List of aggregatable fields that do exist in docs
+    // 2. List of aggregatable fields that do not exist in docs
+    // 3. List of non-aggregatable fields that do exist in docs.
+    // 4. List of non-aggregatable fields that do not exist in docs.
+    const stats = await getVisualizerOverallStats({
+      indexPatternTitle: this._indexPatternTitle,
+      query,
+      timeFieldName: this._indexPattern.timeFieldName,
+      samplerShardSize,
+      earliest,
+      latest,
+      aggregatableFields,
+      nonAggregatableFields,
+      runtimeMappings: this._runtimeMappings,
+    });
+
+    return stats;
+  }
+
+  async loadFieldStats(
+    query: string | SavedSearchQuery,
+    samplerShardSize: number,
+    earliest: number | undefined,
+    latest: number | undefined,
+    fields: FieldRequestConfig[],
+    interval?: number
+  ): Promise<any[]> {
+    const stats = await getVisualizerFieldStats({
+      indexPatternTitle: this._indexPatternTitle,
+      query,
+      timeFieldName: this._indexPattern.timeFieldName,
+      earliest,
+      latest,
+      samplerShardSize,
+      interval,
+      fields,
+      maxExamples: this._maxExamples,
+      runtimeMappings: this._runtimeMappings,
+    });
+
+    return stats;
+  }
+
+  displayError(err: any) {
+    if (err.statusCode === 500) {
+      this._toastNotifications.addError(err, {
+        title: i18n.translate('xpack.dataVisualizer.index.dataLoader.internalServerErrorMessage', {
+          defaultMessage:
+            'Error loading data in index {index}. {message}. ' +
+            'The request may have timed out. Try using a smaller sample size or narrowing the time range.',
+          values: {
+            index: this._indexPattern.title,
+            message: err.message,
+          },
+        }),
+      });
+    } else {
+      this._toastNotifications.addError(err, {
+        title: i18n.translate('xpack.dataVisualizer.index.errorLoadingDataMessage.', {
+          defaultMessage: 'Error loading data in index {index}. {message}',
+          values: {
+            index: this._indexPattern.title,
+            message: err.message,
+          },
+        }),
+      });
+    }
+  }
+
+  public set maxExamples(max: number) {
+    this._maxExamples = max;
+  }
+
+  public get maxExamples(): number {
+    return this._maxExamples;
+  }
+
+  // Returns whether the field with the specified name should be displayed,
+  // as certain fields such as _id and _source should be omitted from the view.
+  public isDisplayField(fieldName: string): boolean {
+    return !OMIT_FIELDS.includes(fieldName);
+  }
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.ts
new file mode 100644
index 0000000000000..132d03c81c0e6
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/hooks/use_time_filter.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 { useEffect } from 'react';
+import { useDataVisualizerKibana } from '../../kibana_context';
+
+interface UseTimefilterOptions {
+  timeRangeSelector?: boolean;
+  autoRefreshSelector?: boolean;
+}
+
+export const useTimefilter = ({
+  timeRangeSelector,
+  autoRefreshSelector,
+}: UseTimefilterOptions = {}) => {
+  const { services } = useDataVisualizerKibana();
+  const { timefilter } = services.data.query.timefilter;
+
+  useEffect(() => {
+    if (timeRangeSelector === true) {
+      timefilter.enableTimeRangeSelector();
+    } else if (timeRangeSelector === false) {
+      timefilter.disableTimeRangeSelector();
+    }
+
+    if (autoRefreshSelector === true) {
+      timefilter.enableAutoRefreshSelector();
+    } else if (autoRefreshSelector === false) {
+      timefilter.disableAutoRefreshSelector();
+    }
+  }, [timeRangeSelector, autoRefreshSelector, timefilter]);
+
+  return timefilter;
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index.ts
new file mode 100644
index 0000000000000..77b6f9b5ab18c
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { IndexDataVisualizer, IndexDataVisualizerSpec } from './index_data_visualizer';
+export type { IndexDataVisualizerViewProps } from './components/index_data_visualizer_view';
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
new file mode 100644
index 0000000000000..82a9b93b31a71
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/index_data_visualizer.tsx
@@ -0,0 +1,200 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../_index.scss';
+import React, { FC, useCallback, useEffect, useState } from 'react';
+import { useHistory, useLocation } from 'react-router-dom';
+import { parse, stringify } from 'query-string';
+import { isEqual } from 'lodash';
+// @ts-ignore
+import { encode } from 'rison-node';
+import { SimpleSavedObject } from 'kibana/public';
+import { i18n } from '@kbn/i18n';
+import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { getCoreStart, getPluginsStart } from '../../kibana_services';
+import {
+  IndexDataVisualizerViewProps,
+  IndexDataVisualizerView,
+} from './components/index_data_visualizer_view';
+import {
+  Accessor,
+  Provider as UrlStateContextProvider,
+  Dictionary,
+  parseUrlState,
+  SetUrlState,
+  getNestedProperty,
+  isRisonSerializationRequired,
+} from '../common/util/url_state';
+import { useDataVisualizerKibana } from '../kibana_context';
+import { IndexPattern } from '../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+
+export type IndexDataVisualizerSpec = typeof IndexDataVisualizer;
+
+export interface DataVisualizerUrlStateContextProviderProps {
+  IndexDataVisualizerComponent: FC<IndexDataVisualizerViewProps>;
+}
+
+export const DataVisualizerUrlStateContextProvider: FC<DataVisualizerUrlStateContextProviderProps> = ({
+  IndexDataVisualizerComponent,
+}) => {
+  const {
+    services: {
+      data: { indexPatterns },
+      savedObjects: { client: savedObjectsClient },
+      notifications: { toasts },
+    },
+  } = useDataVisualizerKibana();
+  const history = useHistory();
+
+  const [currentIndexPattern, setCurrentIndexPattern] = useState<IndexPattern | undefined>(
+    undefined
+  );
+  const [currentSavedSearch, setCurrentSavedSearch] = useState<SimpleSavedObject<unknown> | null>(
+    null
+  );
+  const { search: searchString } = useLocation();
+
+  useEffect(() => {
+    const prevSearchString = searchString;
+    const parsedQueryString = parse(prevSearchString, { sort: false });
+
+    const getIndexPattern = async () => {
+      if (typeof parsedQueryString?.index === 'string') {
+        const indexPattern = await indexPatterns.get(parsedQueryString.index);
+        setCurrentIndexPattern(indexPattern);
+      }
+
+      if (typeof parsedQueryString?.savedSearchId === 'string') {
+        const savedSearchId = parsedQueryString.savedSearchId;
+        try {
+          const savedSearch = await savedObjectsClient.get('search', savedSearchId);
+          const indexPatternId = savedSearch.references.find((ref) => ref.type === 'index-pattern')
+            ?.id;
+          if (indexPatternId !== undefined) {
+            try {
+              const indexPattern = await indexPatterns.get(indexPatternId);
+              setCurrentIndexPattern(indexPattern);
+            } catch (e) {
+              toasts.addError(e, {
+                title: i18n.translate('xpack.dataVisualizer.index.indexPatternErrorMessage', {
+                  defaultMessage: 'Error finding index pattern',
+                }),
+              });
+            }
+          }
+          setCurrentSavedSearch(savedSearch);
+        } catch (e) {
+          toasts.addError(e, {
+            title: i18n.translate('xpack.dataVisualizer.index.savedSearchErrorMessage', {
+              defaultMessage: 'Error retrieving saved search {savedSearchId}',
+              values: { savedSearchId },
+            }),
+          });
+        }
+      }
+    };
+    getIndexPattern();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [savedObjectsClient, toasts, indexPatterns]);
+
+  const setUrlState: SetUrlState = useCallback(
+    (
+      accessor: Accessor,
+      attribute: string | Dictionary<any>,
+      value?: any,
+      replaceState?: boolean
+    ) => {
+      const prevSearchString = searchString;
+      const urlState = parseUrlState(prevSearchString);
+      const parsedQueryString = parse(prevSearchString, { sort: false });
+
+      if (!Object.prototype.hasOwnProperty.call(urlState, accessor)) {
+        urlState[accessor] = {};
+      }
+
+      if (typeof attribute === 'string') {
+        if (isEqual(getNestedProperty(urlState, `${accessor}.${attribute}`), value)) {
+          return prevSearchString;
+        }
+
+        urlState[accessor][attribute] = value;
+      } else {
+        const attributes = attribute;
+        Object.keys(attributes).forEach((a) => {
+          urlState[accessor][a] = attributes[a];
+        });
+      }
+
+      try {
+        const oldLocationSearchString = stringify(parsedQueryString, {
+          sort: false,
+          encode: false,
+        });
+
+        Object.keys(urlState).forEach((a) => {
+          if (isRisonSerializationRequired(a)) {
+            parsedQueryString[a] = encode(urlState[a]);
+          } else {
+            parsedQueryString[a] = urlState[a];
+          }
+        });
+        const newLocationSearchString = stringify(parsedQueryString, {
+          sort: false,
+          encode: false,
+        });
+
+        if (oldLocationSearchString !== newLocationSearchString) {
+          const newSearchString = stringify(parsedQueryString, { sort: false });
+          if (replaceState) {
+            history.replace({ search: newSearchString });
+          } else {
+            history.push({ search: newSearchString });
+          }
+        }
+      } catch (error) {
+        // eslint-disable-next-line no-console
+        console.error('Could not save url state', error);
+      }
+    },
+    [history, searchString]
+  );
+
+  return (
+    <UrlStateContextProvider value={{ searchString, setUrlState }}>
+      {currentIndexPattern ? (
+        <IndexDataVisualizerComponent
+          currentIndexPattern={currentIndexPattern}
+          currentSavedSearch={currentSavedSearch}
+        />
+      ) : (
+        <div />
+      )}
+    </UrlStateContextProvider>
+  );
+};
+
+export const IndexDataVisualizer: FC = () => {
+  const coreStart = getCoreStart();
+  const { data, maps, embeddable, share, security, fileUpload, lens } = getPluginsStart();
+  const services = {
+    data,
+    maps,
+    embeddable,
+    share,
+    security,
+    fileUpload,
+    lens,
+    ...coreStart,
+  };
+
+  return (
+    <KibanaContextProvider services={{ ...services }}>
+      <DataVisualizerUrlStateContextProvider
+        IndexDataVisualizerComponent={IndexDataVisualizerView}
+      />
+    </KibanaContextProvider>
+  );
+};
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.ts
new file mode 100644
index 0000000000000..9a5410918a099
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.d.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 { Moment } from 'moment';
+
+export interface TimeRangeBounds {
+  min?: Moment;
+  max?: Moment;
+}
+
+export declare interface TimeBucketsInterval {
+  asMilliseconds: () => number;
+  asSeconds: () => number;
+  expression: string;
+}
+
+export interface TimeBucketsConfig {
+  'histogram:maxBars': number;
+  'histogram:barTarget': number;
+  dateFormat: string;
+  'dateFormat:scaled': string[][];
+}
+
+export declare class TimeBuckets {
+  constructor(timeBucketsConfig: TimeBucketsConfig);
+  public setBarTarget(barTarget: number): void;
+  public setMaxBars(maxBars: number): void;
+  public setInterval(interval: string): void;
+  public setBounds(bounds: TimeRangeBounds): void;
+  public getBounds(): { min: any; max: any };
+  public getInterval(): TimeBucketsInterval;
+  public getScaledDateFormat(): string;
+}
+
+export declare function getTimeBucketsFromCache(): InstanceType<typeof TimeBuckets>;
+
+export declare function getBoundsRoundedToInterval(
+  bounds: TimeRangeBounds,
+  interval: TimeBucketsInterval,
+  inclusiveEnd?: boolean
+): Required<TimeRangeBounds>;
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js
new file mode 100644
index 0000000000000..6a68ebeef7c30
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_buckets.js
@@ -0,0 +1,515 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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_FORMAT_IDS, UI_SETTINGS } from '../../../../../../../src/plugins/data/common';
+import { ary, assign, isPlainObject, isString, sortBy } from 'lodash';
+import moment from 'moment';
+import dateMath from '@elastic/datemath';
+import { parseInterval } from '../../common/util/parse_interval';
+
+const { duration: d } = moment;
+
+export function timeBucketsCalcAutoIntervalProvider() {
+  // Note there is a current issue with Kibana (Kibana issue #9184)
+  // which means we can't round to, for example, 2 week or 3 week buckets,
+  // so there is a large gap between the 1 week and 1 month rule.
+  const roundingRules = [
+    [d(500, 'ms'), d(100, 'ms')],
+    [d(5, 'second'), d(1, 'second')],
+    [d(10, 'second'), d(5, 'second')],
+    [d(15, 'second'), d(10, 'second')],
+    [d(30, 'second'), d(15, 'second')],
+    [d(1, 'minute'), d(30, 'second')],
+    [d(5, 'minute'), d(1, 'minute')],
+    [d(10, 'minute'), d(5, 'minute')],
+    [d(15, 'minute'), d(10, 'minute')],
+    [d(30, 'minute'), d(10, 'minute')],
+    [d(1, 'hour'), d(30, 'minute')],
+    [d(2, 'hour'), d(1, 'hour')],
+    [d(4, 'hour'), d(2, 'hour')],
+    [d(6, 'hour'), d(4, 'hour')],
+    [d(8, 'hour'), d(6, 'hour')],
+    [d(12, 'hour'), d(8, 'hour')],
+    [d(24, 'hour'), d(12, 'hour')],
+    [d(2, 'd'), d(1, 'd')],
+    [d(4, 'd'), d(2, 'd')],
+    [d(1, 'week'), d(4, 'd')],
+    //[ d(2, 'week'), d(1, 'week') ],
+    //[ d(1, 'month'), d(2, 'week') ],
+    [d(1, 'month'), d(1, 'week')],
+    [d(1, 'year'), d(1, 'month')],
+    [Infinity, d(1, 'year')],
+  ];
+
+  const revRoundingRules = roundingRules.slice(0).reverse();
+
+  function find(rules, check, last) {
+    function pick(buckets, duration) {
+      const target = duration / buckets;
+      let lastResp;
+
+      for (let i = 0; i < rules.length; i++) {
+        const rule = rules[i];
+        const resp = check(rule[0], rule[1], target);
+
+        if (resp == null) {
+          if (!last) {
+            continue;
+          }
+          if (lastResp) {
+            return lastResp;
+          }
+          break;
+        }
+
+        if (!last) {
+          return resp;
+        }
+        lastResp = resp;
+      }
+
+      // fallback to just a number of milliseconds, ensure ms is >= 1
+      const ms = Math.max(Math.floor(target), 1);
+      return moment.duration(ms, 'ms');
+    }
+
+    return function (buckets, duration) {
+      const interval = pick(buckets, duration);
+      if (interval) {
+        return moment.duration(interval._data);
+      }
+    };
+  }
+
+  return {
+    near: find(
+      revRoundingRules,
+      function near(upperBound, lowerBound, target) {
+        // upperBound - first duration in rule
+        // lowerBound - second duration in rule
+        // target - target interval in milliseconds.
+        if (upperBound > target) {
+          if (upperBound === Infinity) {
+            return lowerBound;
+          }
+
+          const boundMs = upperBound.asMilliseconds();
+          const intervalMs = lowerBound.asMilliseconds();
+          const retInterval =
+            Math.abs(boundMs - target) <= Math.abs(intervalMs) ? upperBound : lowerBound;
+          return retInterval;
+        }
+      },
+      true
+    ),
+
+    lessThan: find(revRoundingRules, function (upperBound, lowerBound, target) {
+      // upperBound - first duration in rule
+      // lowerBound - second duration in rule
+      // target - target interval in milliseconds. Must not return intervals less than this duration.
+      if (lowerBound < target) {
+        return upperBound !== Infinity ? upperBound : lowerBound;
+      }
+    }),
+
+    atLeast: find(revRoundingRules, function atLeast(upperBound, lowerBound, target) {
+      // Unmodified from Kibana ui/time_buckets/calc_auto_interval.js.
+      if (lowerBound <= target) {
+        return lowerBound;
+      }
+    }),
+  };
+}
+
+const unitsDesc = dateMath.unitsDesc;
+
+// Index of the list of time interval units at which larger units (i.e. weeks, months, years) need
+// need to be converted to multiples of the largest unit supported in ES aggregation intervals (i.e. days).
+// Note that similarly the largest interval supported for ML bucket spans is 'd'.
+const timeUnitsMaxSupportedIndex = unitsDesc.indexOf('w');
+
+const calcAuto = timeBucketsCalcAutoIntervalProvider();
+
+/**
+ * Helper object for wrapping the concept of an "Interval", which
+ * describes a timespan that will separate buckets of time,
+ * for example the interval between points on a time series chart.
+ */
+export function TimeBuckets(timeBucketsConfig, fieldFormats) {
+  this._timeBucketsConfig = timeBucketsConfig;
+  this._fieldFormats = fieldFormats;
+  this.barTarget = this._timeBucketsConfig[UI_SETTINGS.HISTOGRAM_BAR_TARGET];
+  this.maxBars = this._timeBucketsConfig[UI_SETTINGS.HISTOGRAM_MAX_BARS];
+}
+
+/**
+ * Set the target number of bars.
+ *
+ * @param {number} bt - target number of bars (buckets).
+ *
+ * @returns {undefined}
+ */
+TimeBuckets.prototype.setBarTarget = function (bt) {
+  this.barTarget = bt;
+};
+
+/**
+ * Set the maximum number of bars.
+ *
+ * @param {number} mb - maximum number of bars (buckets).
+ *
+ * @returns {undefined}
+ */
+TimeBuckets.prototype.setMaxBars = function (mb) {
+  this.maxBars = mb;
+};
+
+/**
+ * Set the bounds that these buckets are expected to cover.
+ * This is required to support interval "auto" as well
+ * as interval scaling.
+ *
+ * @param {object} input - an object with properties min and max,
+ *                       representing the edges for the time span
+ *                       we should cover
+ *
+ * @returns {undefined}
+ */
+TimeBuckets.prototype.setBounds = function (input) {
+  if (!input) return this.clearBounds();
+
+  let bounds;
+  if (isPlainObject(input)) {
+    // accept the response from timefilter.getActiveBounds()
+    bounds = [input.min, input.max];
+  } else {
+    bounds = Array.isArray(input) ? input : [];
+  }
+
+  const moments = sortBy(bounds.map(ary(moment, 1)), Number);
+
+  const valid = moments.length === 2 && moments.every(isValidMoment);
+  if (!valid) {
+    this.clearBounds();
+    throw new Error('invalid bounds set: ' + input);
+  }
+
+  this._lb = moments.shift();
+  this._ub = moments.pop();
+  if (this.getDuration().asSeconds() < 0) {
+    throw new TypeError('Intervals must be positive');
+  }
+};
+
+/**
+ * Clear the stored bounds
+ *
+ * @return {undefined}
+ */
+TimeBuckets.prototype.clearBounds = function () {
+  this._lb = this._ub = null;
+};
+
+/**
+ * Check to see if we have received bounds yet
+ *
+ * @return {Boolean}
+ */
+TimeBuckets.prototype.hasBounds = function () {
+  return isValidMoment(this._ub) && isValidMoment(this._lb);
+};
+
+/**
+ * Return the current bounds, if we have any.
+ *
+ * Note that this does not clone the bounds, so editing them may have unexpected side-effects.
+ * Always call bounds.min.clone() before editing.
+ *
+ * @return {object|undefined} - If bounds are not defined, this
+ *                      returns undefined, else it returns the bounds
+ *                      for these buckets. This object has two props,
+ *                      min and max. Each property will be a moment()
+ *                      object
+ */
+TimeBuckets.prototype.getBounds = function () {
+  if (!this.hasBounds()) return;
+  return {
+    min: this._lb,
+    max: this._ub,
+  };
+};
+
+/**
+ * Get a moment duration object representing
+ * the distance between the bounds, if the bounds
+ * are set.
+ *
+ * @return {moment.duration|undefined}
+ */
+TimeBuckets.prototype.getDuration = function () {
+  if (!this.hasBounds()) return;
+  return moment.duration(this._ub - this._lb, 'ms');
+};
+
+/**
+ * Update the interval at which buckets should be
+ * generated.
+ *
+ * Input can be one of the following:
+ *  - "auto"
+ *  - an interval String, such as 7d, 1h or 30m which can be parsed to a moment duration using ml/common/util/parse_interval
+ *  - a moment.duration object.
+ *
+ * @param {string|moment.duration} input - see desc
+ */
+TimeBuckets.prototype.setInterval = function (input) {
+  // Preserve the original units because they're lost when the interval is converted to a
+  // moment duration object.
+  this.originalInterval = input;
+
+  let interval = input;
+
+  if (!interval || interval === 'auto') {
+    this._i = 'auto';
+    return;
+  }
+
+  if (isString(interval)) {
+    input = interval;
+    interval = parseInterval(interval);
+    if (+interval === 0) {
+      interval = null;
+    }
+  }
+
+  // If the value wasn't converted to a duration, and isn't already a duration, we have a problem
+  if (!moment.isDuration(interval)) {
+    throw new TypeError('"' + input + '" is not a valid interval.');
+  }
+
+  this._i = interval;
+};
+
+/**
+ * Get the interval for the buckets. If the
+ * number of buckets created by the interval set
+ * is larger than config:histogram:maxBars then the
+ * interval will be scaled up. If the number of buckets
+ * created is less than one, the interval is scaled back.
+ *
+ * The interval object returned is a moment.duration
+ * object that has been decorated with the following
+ * properties.
+ *
+ * interval.description: a text description of the interval.
+ *   designed to be used list "field per {{ desc }}".
+ *     - "minute"
+ *     - "10 days"
+ *     - "3 years"
+ *
+ * interval.expr: the elasticsearch expression that creates this
+ *   interval. If the interval does not properly form an elasticsearch
+ *   expression it will be forced into one.
+ *
+ * interval.scaled: the interval was adjusted to
+ *   accommodate the maxBars setting.
+ *
+ * interval.scale: the number that y-values should be
+ *   multiplied by
+ *
+ * interval.scaleDescription: a description that reflects
+ *   the values which will be produced by using the
+ *   interval.scale.
+ *
+ *
+ * @return {[type]} [description]
+ */
+TimeBuckets.prototype.getInterval = function () {
+  const self = this;
+  const duration = self.getDuration();
+  return decorateInterval(maybeScaleInterval(readInterval()), duration);
+
+  // either pull the interval from state or calculate the auto-interval
+  function readInterval() {
+    const interval = self._i;
+    if (moment.isDuration(interval)) return interval;
+    return calcAuto.near(self.barTarget, duration);
+  }
+
+  // check to see if the interval should be scaled, and scale it if so
+  function maybeScaleInterval(interval) {
+    if (!self.hasBounds()) return interval;
+
+    const maxLength = self.maxBars;
+    const approxLen = duration / interval;
+    let scaled;
+
+    // If the number of buckets we got back from using the barTarget is less than
+    // maxBars, than use the lessThan rule to try and get closer to maxBars.
+    if (approxLen > maxLength) {
+      scaled = calcAuto.lessThan(maxLength, duration);
+    } else {
+      return interval;
+    }
+
+    if (+scaled === +interval) return interval;
+
+    decorateInterval(interval, duration);
+    return assign(scaled, {
+      preScaled: interval,
+      scale: interval / scaled,
+      scaled: true,
+    });
+  }
+};
+
+/**
+ * Returns an interval which in the last step of calculation is rounded to
+ * the closest multiple of the supplied divisor (in seconds).
+ *
+ * @return {moment.duration|undefined}
+ */
+TimeBuckets.prototype.getIntervalToNearestMultiple = function (divisorSecs) {
+  const interval = this.getInterval();
+  const intervalSecs = interval.asSeconds();
+
+  const remainder = intervalSecs % divisorSecs;
+  if (remainder === 0) {
+    return interval;
+  }
+
+  // Create a new interval which is a multiple of the supplied divisor (not zero).
+  let nearestMultiple =
+    remainder > divisorSecs / 2 ? intervalSecs + divisorSecs - remainder : intervalSecs - remainder;
+  nearestMultiple = nearestMultiple === 0 ? divisorSecs : nearestMultiple;
+  const nearestMultipleInt = moment.duration(nearestMultiple, 'seconds');
+  decorateInterval(nearestMultipleInt, this.getDuration());
+
+  // Check to see if the new interval is scaled compared to the original.
+  const preScaled = interval.preScaled;
+  if (preScaled !== undefined && preScaled < nearestMultipleInt) {
+    nearestMultipleInt.preScaled = preScaled;
+    nearestMultipleInt.scale = preScaled / nearestMultipleInt;
+    nearestMultipleInt.scaled = true;
+  }
+
+  return nearestMultipleInt;
+};
+
+/**
+ * Get a date format string that will represent dates that
+ * progress at our interval.
+ *
+ * Since our interval can be as small as 1ms, the default
+ * date format is usually way too much. with `dateFormat:scaled`
+ * users can modify how dates are formatted within series
+ * produced by TimeBuckets
+ *
+ * @return {string}
+ */
+TimeBuckets.prototype.getScaledDateFormat = function () {
+  const interval = this.getInterval();
+  const rules = this._timeBucketsConfig['dateFormat:scaled'];
+
+  for (let i = rules.length - 1; i >= 0; i--) {
+    const rule = rules[i];
+    if (!rule[0] || interval >= moment.duration(rule[0])) {
+      return rule[1];
+    }
+  }
+
+  return this._timeBucketsConfig.dateFormat;
+};
+
+TimeBuckets.prototype.getScaledDateFormatter = function () {
+  const fieldFormats = this._fieldFormats;
+  const DateFieldFormat = fieldFormats.getType(FIELD_FORMAT_IDS.DATE);
+  return new DateFieldFormat(
+    {
+      pattern: this.getScaledDateFormat(),
+    },
+    // getConfig
+    this._timeBucketsConfig
+  );
+};
+
+// Appends some TimeBuckets specific properties to the moment.js duration interval.
+// Uses the originalDuration from which the time bucket was created to calculate the overflow
+// property (i.e. difference between the supplied duration and the calculated bucket interval).
+function decorateInterval(interval, originalDuration) {
+  const esInterval = calcEsInterval(interval);
+  interval.esValue = esInterval.value;
+  interval.esUnit = esInterval.unit;
+  interval.expression = esInterval.expression;
+  interval.overflow =
+    originalDuration > interval ? moment.duration(interval - originalDuration) : false;
+
+  const prettyUnits = moment.normalizeUnits(esInterval.unit);
+  if (esInterval.value === 1) {
+    interval.description = prettyUnits;
+  } else {
+    interval.description = `${esInterval.value} ${prettyUnits}s`;
+  }
+
+  return interval;
+}
+
+function isValidMoment(m) {
+  return m && 'isValid' in m && m.isValid();
+}
+
+export function getBoundsRoundedToInterval(bounds, interval, inclusiveEnd = false) {
+  // Returns new bounds, created by flooring the min of the provided bounds to the start of
+  // the specified interval (a moment duration), and rounded upwards (Math.ceil) to 1ms before
+  // the start of the next interval (Kibana dashboards search >= bounds min, and <= bounds max,
+  // so we subtract 1ms off the max to avoid querying start of the new Elasticsearch aggregation bucket).
+  const intervalMs = interval.asMilliseconds();
+  const adjustedMinMs = Math.floor(bounds.min.valueOf() / intervalMs) * intervalMs;
+  let adjustedMaxMs = Math.ceil(bounds.max.valueOf() / intervalMs) * intervalMs;
+
+  // Don't include the start ms of the next bucket unless specified..
+  if (inclusiveEnd === false) {
+    adjustedMaxMs = adjustedMaxMs - 1;
+  }
+  return { min: moment(adjustedMinMs), max: moment(adjustedMaxMs) };
+}
+
+export function calcEsInterval(duration) {
+  // Converts a moment.duration into an Elasticsearch compatible interval expression,
+  // and provides associated metadata.
+
+  // Note this was a copy of Kibana's original ui/time_buckets/calc_es_interval,
+  // but with the definition of a 'large' unit changed from 'M' to 'w',
+  // bringing it into line with the time units supported by Elasticsearch
+  for (let i = 0; i < unitsDesc.length; i++) {
+    const unit = unitsDesc[i];
+    const val = duration.as(unit);
+    // find a unit that rounds neatly
+    if (val >= 1 && Math.floor(val) === val) {
+      // Apart from for date histograms, ES only supports time units up to 'd',
+      // meaning we can't for example use 'w' for job bucket spans.
+      // See https://www.elastic.co/guide/en/elasticsearch/reference/current/common-options.html#time-units
+      // So keep going until we get out of the "large" units.
+      if (i <= timeUnitsMaxSupportedIndex) {
+        continue;
+      }
+
+      return {
+        value: val,
+        unit: unit,
+        expression: val + unit,
+      };
+    }
+  }
+
+  const ms = duration.as('ms');
+  return {
+    value: ms,
+    unit: 'ms',
+    expression: ms + 'ms',
+  };
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.ts
new file mode 100644
index 0000000000000..87d4a3b7fb711
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/time_field_range.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 { estypes } from '@elastic/elasticsearch';
+import { lazyLoadModules } from '../../../lazy_load_bundle';
+import { GetTimeFieldRangeResponse } from '../../../../common/types/time_field_request';
+import { Query } from '../../../../../../../src/plugins/data/common/query';
+
+export async function getTimeFieldRange({
+  index,
+  timeFieldName,
+  query,
+  runtimeMappings,
+}: {
+  index: string;
+  timeFieldName?: string;
+  query?: Query;
+  runtimeMappings?: estypes.MappingRuntimeFields;
+}) {
+  const body = JSON.stringify({ index, timeFieldName, query, runtimeMappings });
+  const fileUploadModules = await lazyLoadModules();
+
+  return await fileUploadModules.getHttp().fetch<GetTimeFieldRangeResponse>({
+    path: `/internal/file_upload/time_field_range`,
+    method: 'POST',
+    body,
+  });
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.ts
new file mode 100644
index 0000000000000..49ef9107c3ece
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/timefilter_refresh_service.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 { Subject } from 'rxjs';
+import { Required } from 'utility-types';
+
+export interface Refresh {
+  lastRefresh: number;
+  timeRange?: { start: string; end: string };
+}
+
+export const dataVisualizerTimefilterRefresh$ = new Subject<Required<Refresh>>();
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts
new file mode 100644
index 0000000000000..8db267a1dc837
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/services/visualizer_stats.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { estypes } from '@elastic/elasticsearch';
+import { lazyLoadModules } from '../../../lazy_load_bundle';
+import type { DocumentCounts, FieldRequestConfig, FieldVisStats } from '../../../../common/types';
+import { OverallStats } from '../types/overall_stats';
+
+export function basePath() {
+  return '/internal/data_visualizer';
+}
+
+export async function getVisualizerOverallStats({
+  indexPatternTitle,
+  query,
+  timeFieldName,
+  earliest,
+  latest,
+  samplerShardSize,
+  aggregatableFields,
+  nonAggregatableFields,
+  runtimeMappings,
+}: {
+  indexPatternTitle: string;
+  query: any;
+  timeFieldName?: string;
+  earliest?: number;
+  latest?: number;
+  samplerShardSize?: number;
+  aggregatableFields: string[];
+  nonAggregatableFields: string[];
+  runtimeMappings?: estypes.MappingRuntimeFields;
+}) {
+  const body = JSON.stringify({
+    query,
+    timeFieldName,
+    earliest,
+    latest,
+    samplerShardSize,
+    aggregatableFields,
+    nonAggregatableFields,
+    runtimeMappings,
+  });
+
+  const fileUploadModules = await lazyLoadModules();
+  return await fileUploadModules.getHttp().fetch<OverallStats>({
+    path: `${basePath()}/get_overall_stats/${indexPatternTitle}`,
+    method: 'POST',
+    body,
+  });
+}
+
+export async function getVisualizerFieldStats({
+  indexPatternTitle,
+  query,
+  timeFieldName,
+  earliest,
+  latest,
+  samplerShardSize,
+  interval,
+  fields,
+  maxExamples,
+  runtimeMappings,
+}: {
+  indexPatternTitle: string;
+  query: any;
+  timeFieldName?: string;
+  earliest?: number;
+  latest?: number;
+  samplerShardSize?: number;
+  interval?: number;
+  fields?: FieldRequestConfig[];
+  maxExamples?: number;
+  runtimeMappings?: estypes.MappingRuntimeFields;
+}) {
+  const body = JSON.stringify({
+    query,
+    timeFieldName,
+    earliest,
+    latest,
+    samplerShardSize,
+    interval,
+    fields,
+    maxExamples,
+    runtimeMappings,
+  });
+
+  const fileUploadModules = await lazyLoadModules();
+  return await fileUploadModules.getHttp().fetch<[DocumentCounts, FieldVisStats]>({
+    path: `${basePath()}/get_field_stats/${indexPatternTitle}`,
+    method: 'POST',
+    body,
+  });
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/combined_query.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/combined_query.ts
new file mode 100644
index 0000000000000..734a47d7f01b0
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/combined_query.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.
+ */
+
+export const SEARCH_QUERY_LANGUAGE = {
+  KUERY: 'kuery',
+  LUCENE: 'lucene',
+} as const;
+
+export type SearchQueryLanguage = typeof SEARCH_QUERY_LANGUAGE[keyof typeof SEARCH_QUERY_LANGUAGE];
+
+export interface CombinedQuery {
+  searchString: string | { [key: string]: any };
+  searchQueryLanguage: string;
+}
+
+export interface ErrorMessage {
+  query: string;
+  message: string;
+}
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
new file mode 100644
index 0000000000000..7cd1c2bb3ce09
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/index_data_visualizer_state.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Query } from '../../../../../../../src/plugins/data/common/query';
+import { SearchQueryLanguage } from './combined_query';
+
+export interface ListingPageUrlState {
+  pageSize: number;
+  pageIndex: number;
+  sortField: string;
+  sortDirection: string;
+  queryText?: string;
+}
+export interface DataVisualizerIndexBasedAppState extends Omit<ListingPageUrlState, 'queryText'> {
+  searchString?: Query['query'];
+  searchQuery?: Query['query'];
+  searchQueryLanguage?: SearchQueryLanguage;
+  visibleFieldTypes?: string[];
+  visibleFieldNames?: string[];
+  samplerShardSize?: number;
+  showDistributions?: boolean;
+  showAllFields?: boolean;
+  showEmptyFields?: boolean;
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/overall_stats.ts
new file mode 100644
index 0000000000000..2672dc69ac29a
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/types/overall_stats.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.
+ */
+
+export interface AggregatableField {
+  fieldName: string;
+  stats: {
+    cardinality?: number;
+    count?: number;
+    sampleCount?: number;
+  };
+  existsInDocs: boolean;
+}
+
+export type NonAggregatableField = Omit<AggregatableField, 'stats'>;
+
+export interface OverallStats {
+  totalCount: number;
+  aggregatableExistsFields: AggregatableField[];
+  aggregatableNotExistsFields: NonAggregatableField[];
+  nonAggregatableExistsFields: AggregatableField[];
+  nonAggregatableNotExistsFields: NonAggregatableField[];
+}
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
new file mode 100644
index 0000000000000..a04795ceb9d7d
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/index_data_visualizer/utils/saved_search_utils.ts
@@ -0,0 +1,119 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { cloneDeep } from 'lodash';
+import { IUiSettingsClient } from 'kibana/public';
+import { SavedSearchSavedObject } from '../../../../common/types';
+import { IndexPattern } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
+import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../types/combined_query';
+import { esKuery, esQuery, Query } from '../../../../../../../src/plugins/data/public';
+
+export function getQueryFromSavedSearch(savedSearch: SavedSearchSavedObject) {
+  const search = savedSearch.attributes.kibanaSavedObjectMeta as { searchSourceJSON: string };
+  return JSON.parse(search.searchSourceJSON) as {
+    query: Query;
+    filter: any[];
+  };
+}
+
+/**
+ * Extract query data from the saved search object.
+ */
+export function extractSearchData(
+  savedSearch: SavedSearchSavedObject | null,
+  currentIndexPattern: IndexPattern,
+  queryStringOptions: Record<string, any> | string
+) {
+  if (!savedSearch) {
+    return undefined;
+  }
+
+  const { query: extractedQuery } = getQueryFromSavedSearch(savedSearch);
+  const queryLanguage = extractedQuery.language as SearchQueryLanguage;
+  const qryString = extractedQuery.query;
+  let qry;
+  if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) {
+    const ast = esKuery.fromKueryExpression(qryString);
+    qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern);
+  } else {
+    qry = esQuery.luceneStringToDsl(qryString);
+    esQuery.decorateQuery(qry, queryStringOptions);
+  }
+  return {
+    searchQuery: qry,
+    searchString: qryString,
+    queryLanguage,
+  };
+}
+
+const DEFAULT_QUERY = {
+  bool: {
+    must: [
+      {
+        match_all: {},
+      },
+    ],
+  },
+};
+
+export function getDefaultDatafeedQuery() {
+  return cloneDeep(DEFAULT_QUERY);
+}
+
+export function createSearchItems(
+  kibanaConfig: IUiSettingsClient,
+  indexPattern: IndexPattern | undefined,
+  savedSearch: SavedSearchSavedObject | null
+) {
+  // query is only used by the data visualizer as it needs
+  // a lucene query_string.
+  // Using a blank query will cause match_all:{} to be used
+  // when passed through luceneStringToDsl
+  let query: Query = {
+    query: '',
+    language: 'lucene',
+  };
+
+  let combinedQuery: any = getDefaultDatafeedQuery();
+  if (savedSearch !== null) {
+    const data = getQueryFromSavedSearch(savedSearch);
+
+    query = data.query;
+    const filter = data.filter;
+
+    const filters = Array.isArray(filter) ? filter : [];
+
+    if (query.language === SEARCH_QUERY_LANGUAGE.KUERY) {
+      const ast = esKuery.fromKueryExpression(query.query);
+      if (query.query !== '') {
+        combinedQuery = esKuery.toElasticsearchQuery(ast, indexPattern);
+      }
+      const filterQuery = esQuery.buildQueryFromFilters(filters, indexPattern);
+
+      if (Array.isArray(combinedQuery.bool.filter) === false) {
+        combinedQuery.bool.filter =
+          combinedQuery.bool.filter === undefined ? [] : [combinedQuery.bool.filter];
+      }
+
+      if (Array.isArray(combinedQuery.bool.must_not) === false) {
+        combinedQuery.bool.must_not =
+          combinedQuery.bool.must_not === undefined ? [] : [combinedQuery.bool.must_not];
+      }
+
+      combinedQuery.bool.filter = [...combinedQuery.bool.filter, ...filterQuery.filter];
+      combinedQuery.bool.must_not = [...combinedQuery.bool.must_not, ...filterQuery.must_not];
+    } else {
+      const esQueryConfigs = esQuery.getEsQueryConfig(kibanaConfig);
+      combinedQuery = esQuery.buildEsQuery(indexPattern, [query], filters, esQueryConfigs);
+    }
+  }
+
+  return {
+    query,
+    combinedQuery,
+  };
+}
diff --git a/x-pack/plugins/data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/data_visualizer/public/application/kibana_context.ts
new file mode 100644
index 0000000000000..f7ce13d2fd48d
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/application/kibana_context.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CoreStart } from 'kibana/public';
+import { useKibana } from '../../../../../src/plugins/kibana_react/public';
+import type { DataVisualizerStartDependencies } from '../plugin';
+
+export type StartServices = CoreStart & DataVisualizerStartDependencies;
+export const useDataVisualizerKibana = () => useKibana<StartServices>();
diff --git a/x-pack/plugins/file_data_visualizer/public/application/shared_imports.ts b/x-pack/plugins/data_visualizer/public/application/shared_imports.ts
similarity index 100%
rename from x-pack/plugins/file_data_visualizer/public/application/shared_imports.ts
rename to x-pack/plugins/data_visualizer/public/application/shared_imports.ts
diff --git a/x-pack/plugins/data_visualizer/public/index.ts b/x-pack/plugins/data_visualizer/public/index.ts
new file mode 100644
index 0000000000000..b0a622dfe490b
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/index.ts
@@ -0,0 +1,16 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DataVisualizerPlugin } from './plugin';
+
+export function plugin() {
+  return new DataVisualizerPlugin();
+}
+
+export { DataVisualizerPluginStart } from './plugin';
+
+export type { IndexDataVisualizerViewProps } from './application';
diff --git a/x-pack/plugins/data_visualizer/public/kibana_services.ts b/x-pack/plugins/data_visualizer/public/kibana_services.ts
new file mode 100644
index 0000000000000..458d3aca9e525
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/kibana_services.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 { CoreStart } from 'kibana/public';
+import { DataVisualizerStartDependencies } from './plugin';
+
+let coreStart: CoreStart;
+let pluginsStart: DataVisualizerStartDependencies;
+export function setStartServices(core: CoreStart, plugins: DataVisualizerStartDependencies) {
+  coreStart = core;
+  pluginsStart = plugins;
+}
+
+export const getCoreStart = () => coreStart;
+export const getPluginsStart = () => pluginsStart;
diff --git a/x-pack/plugins/data_visualizer/public/lazy_load_bundle/component_wrapper.tsx b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/component_wrapper.tsx
new file mode 100644
index 0000000000000..028c0a402039d
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/component_wrapper.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, { FC } from 'react';
+
+const FileDataVisualizerComponent = React.lazy(
+  () => import('../application/file_data_visualizer/file_data_visualizer')
+);
+
+export const FileDataVisualizerWrapper: FC = () => {
+  return (
+    <React.Suspense fallback={<div />}>
+      <FileDataVisualizerComponent />
+    </React.Suspense>
+  );
+};
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
new file mode 100644
index 0000000000000..57f0872d62589
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/index.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 { HttpSetup } from 'src/core/public';
+import type { FileDataVisualizerSpec, IndexDataVisualizerSpec } from '../application';
+import { getCoreStart } from '../kibana_services';
+
+let loadModulesPromise: Promise<LazyLoadedModules>;
+
+interface LazyLoadedModules {
+  FileDataVisualizer: FileDataVisualizerSpec;
+  IndexDataVisualizer: IndexDataVisualizerSpec;
+  getHttp: () => HttpSetup;
+}
+
+export async function lazyLoadModules(): Promise<LazyLoadedModules> {
+  if (typeof loadModulesPromise !== 'undefined') {
+    return loadModulesPromise;
+  }
+
+  loadModulesPromise = new Promise(async (resolve) => {
+    const lazyImports = await import('./lazy');
+
+    resolve({
+      ...lazyImports,
+      getHttp: () => getCoreStart().http,
+    });
+  });
+  return loadModulesPromise;
+}
diff --git a/x-pack/plugins/data_visualizer/public/lazy_load_bundle/lazy/index.ts b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/lazy/index.ts
new file mode 100644
index 0000000000000..a895a0eb98385
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/lazy_load_bundle/lazy/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export {
+  FileDataVisualizer,
+  IndexDataVisualizer,
+  FileDataVisualizerSpec,
+  IndexDataVisualizerSpec,
+} from '../../application';
diff --git a/x-pack/plugins/data_visualizer/public/plugin.ts b/x-pack/plugins/data_visualizer/public/plugin.ts
new file mode 100644
index 0000000000000..66109de1b1463
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/plugin.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CoreSetup, CoreStart } from 'kibana/public';
+import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
+import type { SharePluginStart } from '../../../../src/plugins/share/public';
+import { Plugin } from '../../../../src/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 { MapsStartApi } from '../../maps/public';
+import type { SecurityPluginSetup } from '../../security/public';
+import type { LensPublicStart } from '../../lens/public';
+import { getFileDataVisualizerComponent, getIndexDataVisualizerComponent } from './api';
+import { getMaxBytesFormatted } from './application/common/util/get_max_bytes';
+import { registerHomeAddData, registerHomeFeatureCatalogue } from './register_home';
+
+export interface DataVisualizerSetupDependencies {
+  home?: HomePublicPluginSetup;
+}
+export interface DataVisualizerStartDependencies {
+  data: DataPublicPluginStart;
+  fileUpload: FileUploadPluginStart;
+  maps: MapsStartApi;
+  embeddable: EmbeddableStart;
+  security?: SecurityPluginSetup;
+  share: SharePluginStart;
+  lens?: LensPublicStart;
+}
+
+export type DataVisualizerPluginSetup = ReturnType<DataVisualizerPlugin['setup']>;
+export type DataVisualizerPluginStart = ReturnType<DataVisualizerPlugin['start']>;
+
+export class DataVisualizerPlugin
+  implements
+    Plugin<
+      DataVisualizerPluginSetup,
+      DataVisualizerPluginStart,
+      DataVisualizerSetupDependencies,
+      DataVisualizerStartDependencies
+    > {
+  public setup(core: CoreSetup, plugins: DataVisualizerSetupDependencies) {
+    if (plugins.home) {
+      registerHomeAddData(plugins.home);
+      registerHomeFeatureCatalogue(plugins.home);
+    }
+  }
+
+  public start(core: CoreStart, plugins: DataVisualizerStartDependencies) {
+    setStartServices(core, plugins);
+    return {
+      getFileDataVisualizerComponent,
+      getIndexDataVisualizerComponent,
+      getMaxBytesFormatted,
+    };
+  }
+}
diff --git a/x-pack/plugins/data_visualizer/public/register_home.ts b/x-pack/plugins/data_visualizer/public/register_home.ts
new file mode 100644
index 0000000000000..3e8973784433c
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/public/register_home.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 { i18n } from '@kbn/i18n';
+import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public';
+import { FeatureCatalogueCategory } from '../../../../src/plugins/home/public';
+import { FileDataVisualizerWrapper } from './lazy_load_bundle/component_wrapper';
+
+const FILE_DATA_VIS_TAB_ID = 'fileDataViz';
+
+export function registerHomeAddData(home: HomePublicPluginSetup) {
+  home.addData.registerAddDataTab({
+    id: FILE_DATA_VIS_TAB_ID,
+    name: i18n.translate('xpack.dataVisualizer.file.embeddedTabTitle', {
+      defaultMessage: 'Upload file',
+    }),
+    component: FileDataVisualizerWrapper,
+  });
+}
+
+export function registerHomeFeatureCatalogue(home: HomePublicPluginSetup) {
+  home.featureCatalogue.register({
+    id: `file_data_visualizer`,
+    title: i18n.translate('xpack.dataVisualizer.title', {
+      defaultMessage: 'Upload a file',
+    }),
+    description: i18n.translate('xpack.dataVisualizer.description', {
+      defaultMessage: 'Import your own CSV, NDJSON, or log file.',
+    }),
+    icon: 'document',
+    path: `/app/home#/tutorial_directory/${FILE_DATA_VIS_TAB_ID}`,
+    showOnHomePage: true,
+    category: FeatureCatalogueCategory.DATA,
+    order: 520,
+  });
+}
diff --git a/x-pack/plugins/data_visualizer/server/index.ts b/x-pack/plugins/data_visualizer/server/index.ts
new file mode 100644
index 0000000000000..f88303829c558
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/index.ts
@@ -0,0 +1,11 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { PluginInitializerContext } from 'kibana/server';
+import { DataVisualizerPlugin } from './plugin';
+
+export const plugin = (initializerContext: PluginInitializerContext) => new DataVisualizerPlugin();
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts
new file mode 100644
index 0000000000000..ca7287394b8e3
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/check_fields_exist.ts
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { estypes } from '@elastic/elasticsearch';
+import { get } from 'lodash';
+import { IScopedClusterClient } from 'kibana/server';
+import { AggCardinality, Aggs, FieldData } from '../../types';
+import {
+  buildBaseFilterCriteria,
+  buildSamplerAggregation,
+  getSafeAggregationName,
+  getSamplerAggregationsResponsePath,
+} from '../../../common/utils/query_utils';
+import { getDatafeedAggregations } from '../../../common/utils/datafeed_utils';
+import { isPopulatedObject } from '../../../common/utils/object_utils';
+
+export const checkAggregatableFieldsExist = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  aggregatableFields: string[],
+  samplerShardSize: number,
+  timeFieldName: string | undefined,
+  earliestMs?: number,
+  latestMs?: number,
+  datafeedConfig?: estypes.MlDatafeed,
+  runtimeMappings?: estypes.MappingRuntimeFields
+) => {
+  const { asCurrentUser } = client;
+
+  const index = indexPatternTitle;
+  const size = 0;
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+  const datafeedAggregations = getDatafeedAggregations(datafeedConfig);
+
+  // Value count aggregation faster way of checking if field exists than using
+  // filter aggregation with exists query.
+  const aggs: Aggs = datafeedAggregations !== undefined ? { ...datafeedAggregations } : {};
+
+  // Combine runtime fields from the index pattern as well as the datafeed
+  const combinedRuntimeMappings: estypes.MappingRuntimeFields = {
+    ...(isPopulatedObject(runtimeMappings) ? runtimeMappings : {}),
+    ...(isPopulatedObject(datafeedConfig) && isPopulatedObject(datafeedConfig.runtime_mappings)
+      ? datafeedConfig.runtime_mappings
+      : {}),
+  };
+
+  aggregatableFields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field, i);
+    aggs[`${safeFieldName}_count`] = {
+      filter: { exists: { field } },
+    };
+
+    let cardinalityField: AggCardinality;
+    if (datafeedConfig?.script_fields?.hasOwnProperty(field)) {
+      cardinalityField = aggs[`${safeFieldName}_cardinality`] = {
+        cardinality: { script: datafeedConfig?.script_fields[field].script },
+      };
+    } else {
+      cardinalityField = {
+        cardinality: { field },
+      };
+    }
+    aggs[`${safeFieldName}_cardinality`] = cardinalityField;
+  });
+
+  const searchBody = {
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    ...(isPopulatedObject(aggs) ? { aggs: buildSamplerAggregation(aggs, samplerShardSize) } : {}),
+    ...(isPopulatedObject(combinedRuntimeMappings)
+      ? { runtime_mappings: combinedRuntimeMappings }
+      : {}),
+  };
+
+  const { body } = await asCurrentUser.search({
+    index,
+    track_total_hits: true,
+    size,
+    body: searchBody,
+  });
+
+  const aggregations = body.aggregations;
+  // @ts-expect-error incorrect search response type
+  const totalCount = body.hits.total.value;
+  const stats = {
+    totalCount,
+    aggregatableExistsFields: [] as FieldData[],
+    aggregatableNotExistsFields: [] as FieldData[],
+  };
+
+  const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
+  const sampleCount =
+    samplerShardSize > 0 ? get(aggregations, ['sample', 'doc_count'], 0) : totalCount;
+  aggregatableFields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field, i);
+    const count = get(aggregations, [...aggsPath, `${safeFieldName}_count`, 'doc_count'], 0);
+    if (count > 0) {
+      const cardinality = get(
+        aggregations,
+        [...aggsPath, `${safeFieldName}_cardinality`, 'value'],
+        0
+      );
+      stats.aggregatableExistsFields.push({
+        fieldName: field,
+        existsInDocs: true,
+        stats: {
+          sampleCount,
+          count,
+          cardinality,
+        },
+      });
+    } else {
+      if (
+        datafeedConfig?.script_fields?.hasOwnProperty(field) ||
+        datafeedConfig?.runtime_mappings?.hasOwnProperty(field)
+      ) {
+        const cardinality = get(
+          aggregations,
+          [...aggsPath, `${safeFieldName}_cardinality`, 'value'],
+          0
+        );
+        stats.aggregatableExistsFields.push({
+          fieldName: field,
+          existsInDocs: true,
+          stats: {
+            sampleCount,
+            count,
+            cardinality,
+          },
+        });
+      } else {
+        stats.aggregatableNotExistsFields.push({
+          fieldName: field,
+          existsInDocs: false,
+        });
+      }
+    }
+  });
+
+  return stats;
+};
+
+export const checkNonAggregatableFieldExists = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  field: string,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  runtimeMappings?: estypes.MappingRuntimeFields
+) => {
+  const { asCurrentUser } = client;
+  const index = indexPatternTitle;
+  const size = 0;
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+
+  const searchBody = {
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+  };
+  filterCriteria.push({ exists: { field } });
+
+  const { body } = await asCurrentUser.search({
+    index,
+    size,
+    body: searchBody,
+  });
+  // @ts-expect-error incorrect search response type
+  return body.hits.total.value > 0;
+};
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/constants.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/constants.ts
new file mode 100644
index 0000000000000..91bd394aee797
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/constants.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const SAMPLER_TOP_TERMS_THRESHOLD = 100000;
+export const SAMPLER_TOP_TERMS_SHARD_SIZE = 5000;
+export const AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE = 200;
+export const FIELDS_REQUEST_BATCH_SIZE = 10;
+
+export const MAX_CHART_COLUMNS = 20;
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts
new file mode 100644
index 0000000000000..27c09c889deb7
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/data_visualizer.ts
@@ -0,0 +1,475 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { IScopedClusterClient } from 'kibana/server';
+import { each, last } from 'lodash';
+import { estypes } from '@elastic/elasticsearch';
+import { JOB_FIELD_TYPES } from '../../../common';
+import type {
+  BatchStats,
+  FieldData,
+  HistogramField,
+  Field,
+  DocumentCountStats,
+  FieldExamples,
+} from '../../types';
+import { getHistogramsForFields } from './get_histogram_for_fields';
+import {
+  checkAggregatableFieldsExist,
+  checkNonAggregatableFieldExists,
+} from './check_fields_exist';
+import { AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE, FIELDS_REQUEST_BATCH_SIZE } from './constants';
+import { getFieldExamples } from './get_field_examples';
+import {
+  getBooleanFieldsStats,
+  getDateFieldsStats,
+  getDocumentCountStats,
+  getNumericFieldsStats,
+  getStringFieldsStats,
+} from './get_fields_stats';
+
+export class DataVisualizer {
+  private _client: IScopedClusterClient;
+
+  constructor(client: IScopedClusterClient) {
+    this._client = client;
+  }
+
+  // Obtains overall stats on the fields in the supplied index pattern, returning an object
+  // containing the total document count, and four arrays showing which of the supplied
+  // aggregatable and non-aggregatable fields do or do not exist in documents.
+  // Sampling will be used if supplied samplerShardSize > 0.
+  async getOverallStats(
+    indexPatternTitle: string,
+    query: object,
+    aggregatableFields: string[],
+    nonAggregatableFields: string[],
+    samplerShardSize: number,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ) {
+    const stats = {
+      totalCount: 0,
+      aggregatableExistsFields: [] as FieldData[],
+      aggregatableNotExistsFields: [] as FieldData[],
+      nonAggregatableExistsFields: [] as FieldData[],
+      nonAggregatableNotExistsFields: [] as FieldData[],
+    };
+
+    // To avoid checking for the existence of too many aggregatable fields in one request,
+    // split the check into multiple batches (max 200 fields per request).
+    const batches: string[][] = [[]];
+    each(aggregatableFields, (field) => {
+      let lastArray: string[] = last(batches) as string[];
+      if (lastArray.length === AGGREGATABLE_EXISTS_REQUEST_BATCH_SIZE) {
+        lastArray = [];
+        batches.push(lastArray);
+      }
+      lastArray.push(field);
+    });
+
+    await Promise.all(
+      batches.map(async (fields) => {
+        const batchStats = await this.checkAggregatableFieldsExist(
+          indexPatternTitle,
+          query,
+          fields,
+          samplerShardSize,
+          timeFieldName,
+          earliestMs,
+          latestMs,
+          undefined,
+          runtimeMappings
+        );
+
+        // Total count will be returned with each batch of fields. Just overwrite.
+        stats.totalCount = batchStats.totalCount;
+
+        // Add to the lists of fields which do and do not exist.
+        stats.aggregatableExistsFields.push(...batchStats.aggregatableExistsFields);
+        stats.aggregatableNotExistsFields.push(...batchStats.aggregatableNotExistsFields);
+      })
+    );
+
+    await Promise.all(
+      nonAggregatableFields.map(async (field) => {
+        const existsInDocs = await this.checkNonAggregatableFieldExists(
+          indexPatternTitle,
+          query,
+          field,
+          timeFieldName,
+          earliestMs,
+          latestMs,
+          runtimeMappings
+        );
+
+        const fieldData: FieldData = {
+          fieldName: field,
+          existsInDocs,
+          stats: {},
+        };
+
+        if (existsInDocs === true) {
+          stats.nonAggregatableExistsFields.push(fieldData);
+        } else {
+          stats.nonAggregatableNotExistsFields.push(fieldData);
+        }
+      })
+    );
+
+    return stats;
+  }
+
+  // Obtains binned histograms for supplied list of fields. The statistics for each field in the
+  // returned array depend on the type of the field (keyword, number, date etc).
+  // Sampling will be used if supplied samplerShardSize > 0.
+  async getHistogramsForFields(
+    indexPatternTitle: string,
+    query: any,
+    fields: HistogramField[],
+    samplerShardSize: number,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ): Promise<any> {
+    return await getHistogramsForFields(
+      this._client,
+      indexPatternTitle,
+      query,
+      fields,
+      samplerShardSize,
+      runtimeMappings
+    );
+  }
+
+  // Obtains statistics for supplied list of fields. The statistics for each field in the
+  // returned array depend on the type of the field (keyword, number, date etc).
+  // Sampling will be used if supplied samplerShardSize > 0.
+  async getStatsForFields(
+    indexPatternTitle: string,
+    query: any,
+    fields: Field[],
+    samplerShardSize: number,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    intervalMs: number | undefined,
+    maxExamples: number,
+    runtimeMappings: estypes.MappingRuntimeFields
+  ): Promise<BatchStats[]> {
+    // Batch up fields by type, getting stats for multiple fields at a time.
+    const batches: Field[][] = [];
+    const batchedFields: { [key: string]: Field[][] } = {};
+    each(fields, (field) => {
+      if (field.fieldName === undefined) {
+        // undefined fieldName is used for a document count request.
+        // getDocumentCountStats requires timeField - don't add to batched requests if not defined
+        if (timeFieldName !== undefined) {
+          batches.push([field]);
+        }
+      } else {
+        const fieldType = field.type;
+        if (batchedFields[fieldType] === undefined) {
+          batchedFields[fieldType] = [[]];
+        }
+        let lastArray: Field[] = last(batchedFields[fieldType]) as Field[];
+        if (lastArray.length === FIELDS_REQUEST_BATCH_SIZE) {
+          lastArray = [];
+          batchedFields[fieldType].push(lastArray);
+        }
+        lastArray.push(field);
+      }
+    });
+
+    each(batchedFields, (lists) => {
+      batches.push(...lists);
+    });
+
+    let results: BatchStats[] = [];
+    await Promise.all(
+      batches.map(async (batch) => {
+        let batchStats: BatchStats[] = [];
+        const first = batch[0];
+        switch (first.type) {
+          case JOB_FIELD_TYPES.NUMBER:
+            // undefined fieldName is used for a document count request.
+            if (first.fieldName !== undefined) {
+              batchStats = await this.getNumericFieldsStats(
+                indexPatternTitle,
+                query,
+                batch,
+                samplerShardSize,
+                timeFieldName,
+                earliestMs,
+                latestMs,
+                runtimeMappings
+              );
+            } else {
+              // Will only ever be one document count card,
+              // so no value in batching up the single request.
+              if (intervalMs !== undefined) {
+                const stats = await this.getDocumentCountStats(
+                  indexPatternTitle,
+                  query,
+                  timeFieldName,
+                  earliestMs,
+                  latestMs,
+                  intervalMs,
+                  runtimeMappings
+                );
+                batchStats.push(stats);
+              }
+            }
+            break;
+          case JOB_FIELD_TYPES.KEYWORD:
+          case JOB_FIELD_TYPES.IP:
+            batchStats = await this.getStringFieldsStats(
+              indexPatternTitle,
+              query,
+              batch,
+              samplerShardSize,
+              timeFieldName,
+              earliestMs,
+              latestMs,
+              runtimeMappings
+            );
+            break;
+          case JOB_FIELD_TYPES.DATE:
+            batchStats = await this.getDateFieldsStats(
+              indexPatternTitle,
+              query,
+              batch,
+              samplerShardSize,
+              timeFieldName,
+              earliestMs,
+              latestMs,
+              runtimeMappings
+            );
+            break;
+          case JOB_FIELD_TYPES.BOOLEAN:
+            batchStats = await this.getBooleanFieldsStats(
+              indexPatternTitle,
+              query,
+              batch,
+              samplerShardSize,
+              timeFieldName,
+              earliestMs,
+              latestMs,
+              runtimeMappings
+            );
+            break;
+          case JOB_FIELD_TYPES.TEXT:
+          default:
+            // Use an exists filter on the the field name to get
+            // examples of the field, so cannot batch up.
+            await Promise.all(
+              batch.map(async (field) => {
+                const stats = await this.getFieldExamples(
+                  indexPatternTitle,
+                  query,
+                  field.fieldName,
+                  timeFieldName,
+                  earliestMs,
+                  latestMs,
+                  maxExamples,
+                  runtimeMappings
+                );
+                batchStats.push(stats);
+              })
+            );
+            break;
+        }
+
+        results = [...results, ...batchStats];
+      })
+    );
+
+    return results;
+  }
+
+  async checkAggregatableFieldsExist(
+    indexPatternTitle: string,
+    query: any,
+    aggregatableFields: string[],
+    samplerShardSize: number,
+    timeFieldName: string | undefined,
+    earliestMs?: number,
+    latestMs?: number,
+    datafeedConfig?: estypes.MlDatafeed,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ) {
+    return await checkAggregatableFieldsExist(
+      this._client,
+      indexPatternTitle,
+      query,
+      aggregatableFields,
+      samplerShardSize,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      datafeedConfig,
+      runtimeMappings
+    );
+  }
+
+  async checkNonAggregatableFieldExists(
+    indexPatternTitle: string,
+    query: any,
+    field: string,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ) {
+    return await checkNonAggregatableFieldExists(
+      this._client,
+      indexPatternTitle,
+      query,
+      field,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      runtimeMappings
+    );
+  }
+
+  async getDocumentCountStats(
+    indexPatternTitle: string,
+    query: any,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    intervalMs: number,
+    runtimeMappings: estypes.MappingRuntimeFields
+  ): Promise<DocumentCountStats> {
+    return await getDocumentCountStats(
+      this._client,
+      indexPatternTitle,
+      query,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      intervalMs,
+      runtimeMappings
+    );
+  }
+
+  async getNumericFieldsStats(
+    indexPatternTitle: string,
+    query: object,
+    fields: Field[],
+    samplerShardSize: number,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ) {
+    return await getNumericFieldsStats(
+      this._client,
+      indexPatternTitle,
+      query,
+      fields,
+      samplerShardSize,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      runtimeMappings
+    );
+  }
+
+  async getStringFieldsStats(
+    indexPatternTitle: string,
+    query: object,
+    fields: Field[],
+    samplerShardSize: number,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ) {
+    return await getStringFieldsStats(
+      this._client,
+      indexPatternTitle,
+      query,
+      fields,
+      samplerShardSize,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      runtimeMappings
+    );
+  }
+
+  async getDateFieldsStats(
+    indexPatternTitle: string,
+    query: object,
+    fields: Field[],
+    samplerShardSize: number,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ) {
+    return await getDateFieldsStats(
+      this._client,
+      indexPatternTitle,
+      query,
+      fields,
+      samplerShardSize,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      runtimeMappings
+    );
+  }
+
+  async getBooleanFieldsStats(
+    indexPatternTitle: string,
+    query: object,
+    fields: Field[],
+    samplerShardSize: number,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ) {
+    return await getBooleanFieldsStats(
+      this._client,
+      indexPatternTitle,
+      query,
+      fields,
+      samplerShardSize,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      runtimeMappings
+    );
+  }
+
+  async getFieldExamples(
+    indexPatternTitle: string,
+    query: any,
+    field: string,
+    timeFieldName: string | undefined,
+    earliestMs: number | undefined,
+    latestMs: number | undefined,
+    maxExamples: number,
+    runtimeMappings?: estypes.MappingRuntimeFields
+  ): Promise<FieldExamples> {
+    return await getFieldExamples(
+      this._client,
+      indexPatternTitle,
+      query,
+      field,
+      timeFieldName,
+      earliestMs,
+      latestMs,
+      maxExamples,
+      runtimeMappings
+    );
+  }
+}
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.ts
new file mode 100644
index 0000000000000..69476e254068f
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_field_examples.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 { estypes } from '@elastic/elasticsearch';
+import { get } from 'lodash';
+import { IScopedClusterClient } from 'kibana/server';
+import { buildBaseFilterCriteria } from '../../../common/utils/query_utils';
+import { isPopulatedObject } from '../../../common/utils/object_utils';
+import { FieldExamples } from '../../types/chart_data';
+
+export const getFieldExamples = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  field: string,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  maxExamples: number,
+  runtimeMappings?: estypes.MappingRuntimeFields
+): Promise<FieldExamples> => {
+  const { asCurrentUser } = client;
+
+  const index = indexPatternTitle;
+
+  // Request at least 100 docs so that we have a chance of obtaining
+  // 'maxExamples' of the field.
+  const size = Math.max(100, maxExamples);
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+
+  // Use an exists filter to return examples of the field.
+  filterCriteria.push({
+    exists: { field },
+  });
+
+  const searchBody = {
+    fields: [field],
+    _source: false,
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+  };
+
+  const { body } = await asCurrentUser.search({
+    index,
+    size,
+    body: searchBody,
+  });
+  const stats = {
+    fieldName: field,
+    examples: [] as any[],
+  };
+  // @ts-expect-error incorrect search response type
+  if (body.hits.total.value > 0) {
+    const hits = body.hits.hits;
+    for (let i = 0; i < hits.length; i++) {
+      // Use lodash get() to support field names containing dots.
+      const doc: object[] | undefined = get(hits[i].fields, field);
+      // the results from fields query is always an array
+      if (Array.isArray(doc) && doc.length > 0) {
+        const example = doc[0];
+        if (example !== undefined && stats.examples.indexOf(example) === -1) {
+          stats.examples.push(example);
+          if (stats.examples.length === maxExamples) {
+            break;
+          }
+        }
+      }
+    }
+  }
+
+  return stats;
+};
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts
new file mode 100644
index 0000000000000..6968aa97ab938
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_fields_stats.ts
@@ -0,0 +1,478 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { estypes } from '@elastic/elasticsearch';
+import { each, find, get } from 'lodash';
+import { IScopedClusterClient } from 'kibana/server';
+import {
+  Aggs,
+  BooleanFieldStats,
+  Bucket,
+  DateFieldStats,
+  DocumentCountStats,
+  Field,
+  NumericFieldStats,
+  StringFieldStats,
+} from '../../types';
+import {
+  buildBaseFilterCriteria,
+  buildSamplerAggregation,
+  getSafeAggregationName,
+  getSamplerAggregationsResponsePath,
+} from '../../../common/utils/query_utils';
+import { isPopulatedObject } from '../../../common/utils/object_utils';
+import { processDistributionData } from './process_distribution_data';
+import { SAMPLER_TOP_TERMS_SHARD_SIZE, SAMPLER_TOP_TERMS_THRESHOLD } from './constants';
+
+export const getDocumentCountStats = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  intervalMs: number,
+  runtimeMappings: estypes.MappingRuntimeFields
+): Promise<DocumentCountStats> => {
+  const { asCurrentUser } = client;
+
+  const index = indexPatternTitle;
+  const size = 0;
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+
+  // Don't use the sampler aggregation as this can lead to some potentially
+  // confusing date histogram results depending on the date range of data amongst shards.
+
+  const aggs = {
+    eventRate: {
+      date_histogram: {
+        field: timeFieldName,
+        fixed_interval: `${intervalMs}ms`,
+        min_doc_count: 1,
+      },
+    },
+  };
+
+  const searchBody = {
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    aggs,
+    ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+  };
+
+  const { body } = await asCurrentUser.search({
+    index,
+    size,
+    body: searchBody,
+  });
+
+  const buckets: { [key: string]: number } = {};
+  const dataByTimeBucket: Array<{ key: string; doc_count: number }> = get(
+    body,
+    ['aggregations', 'eventRate', 'buckets'],
+    []
+  );
+  each(dataByTimeBucket, (dataForTime) => {
+    const time = dataForTime.key;
+    buckets[time] = dataForTime.doc_count;
+  });
+
+  return {
+    documentCounts: {
+      interval: intervalMs,
+      buckets,
+    },
+  };
+};
+
+export const getNumericFieldsStats = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: object,
+  fields: Field[],
+  samplerShardSize: number,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  runtimeMappings?: estypes.MappingRuntimeFields
+) => {
+  const { asCurrentUser } = client;
+  const index = indexPatternTitle;
+  const size = 0;
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+
+  // Build the percents parameter which defines the percentiles to query
+  // for the metric distribution data.
+  // Use a fixed percentile spacing of 5%.
+  const MAX_PERCENT = 100;
+  const PERCENTILE_SPACING = 5;
+  let count = 0;
+  const percents = Array.from(
+    Array(MAX_PERCENT / PERCENTILE_SPACING),
+    () => (count += PERCENTILE_SPACING)
+  );
+
+  const aggs: { [key: string]: any } = {};
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+    aggs[`${safeFieldName}_field_stats`] = {
+      filter: { exists: { field: field.fieldName } },
+      aggs: {
+        actual_stats: {
+          stats: { field: field.fieldName },
+        },
+      },
+    };
+    aggs[`${safeFieldName}_percentiles`] = {
+      percentiles: {
+        field: field.fieldName,
+        percents,
+        keyed: false,
+      },
+    };
+
+    const top = {
+      terms: {
+        field: field.fieldName,
+        size: 10,
+        order: {
+          _count: 'desc',
+        },
+      },
+    };
+
+    // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation
+    // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1).
+    if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) {
+      aggs[`${safeFieldName}_top`] = {
+        sampler: {
+          shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE,
+        },
+        aggs: {
+          top,
+        },
+      };
+    } else {
+      aggs[`${safeFieldName}_top`] = top;
+    }
+  });
+
+  const searchBody = {
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    aggs: buildSamplerAggregation(aggs, samplerShardSize),
+    ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+  };
+
+  const { body } = await asCurrentUser.search({
+    index,
+    size,
+    body: searchBody,
+  });
+  const aggregations = body.aggregations;
+  const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
+  const batchStats: NumericFieldStats[] = [];
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+    const docCount = get(
+      aggregations,
+      [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'],
+      0
+    );
+    const fieldStatsResp = get(
+      aggregations,
+      [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'],
+      {}
+    );
+
+    const topAggsPath = [...aggsPath, `${safeFieldName}_top`];
+    if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) {
+      topAggsPath.push('top');
+    }
+
+    const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []);
+
+    const stats: NumericFieldStats = {
+      fieldName: field.fieldName,
+      count: docCount,
+      min: get(fieldStatsResp, 'min', 0),
+      max: get(fieldStatsResp, 'max', 0),
+      avg: get(fieldStatsResp, 'avg', 0),
+      isTopValuesSampled: field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0,
+      topValues,
+      topValuesSampleSize: topValues.reduce(
+        (acc, curr) => acc + curr.doc_count,
+        get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0)
+      ),
+      topValuesSamplerShardSize:
+        field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD
+          ? SAMPLER_TOP_TERMS_SHARD_SIZE
+          : samplerShardSize,
+    };
+
+    if (stats.count > 0) {
+      const percentiles = get(
+        aggregations,
+        [...aggsPath, `${safeFieldName}_percentiles`, 'values'],
+        []
+      );
+      const medianPercentile: { value: number; key: number } | undefined = find(percentiles, {
+        key: 50,
+      });
+      stats.median = medianPercentile !== undefined ? medianPercentile!.value : 0;
+      stats.distribution = processDistributionData(percentiles, PERCENTILE_SPACING, stats.min);
+    }
+
+    batchStats.push(stats);
+  });
+
+  return batchStats;
+};
+
+export const getStringFieldsStats = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: object,
+  fields: Field[],
+  samplerShardSize: number,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  runtimeMappings?: estypes.MappingRuntimeFields
+) => {
+  const { asCurrentUser } = client;
+
+  const index = indexPatternTitle;
+  const size = 0;
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+
+  const aggs: Aggs = {};
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+    const top = {
+      terms: {
+        field: field.fieldName,
+        size: 10,
+        order: {
+          _count: 'desc',
+        },
+      },
+    };
+
+    // If cardinality >= SAMPLE_TOP_TERMS_THRESHOLD, run the top terms aggregation
+    // in a sampler aggregation, even if no sampling has been specified (samplerShardSize < 1).
+    if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) {
+      aggs[`${safeFieldName}_top`] = {
+        sampler: {
+          shard_size: SAMPLER_TOP_TERMS_SHARD_SIZE,
+        },
+        aggs: {
+          top,
+        },
+      };
+    } else {
+      aggs[`${safeFieldName}_top`] = top;
+    }
+  });
+
+  const searchBody = {
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    aggs: buildSamplerAggregation(aggs, samplerShardSize),
+    ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+  };
+
+  const { body } = await asCurrentUser.search({
+    index,
+    size,
+    body: searchBody,
+  });
+  const aggregations = body.aggregations;
+  const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
+  const batchStats: StringFieldStats[] = [];
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+
+    const topAggsPath = [...aggsPath, `${safeFieldName}_top`];
+    if (samplerShardSize < 1 && field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD) {
+      topAggsPath.push('top');
+    }
+
+    const topValues: Bucket[] = get(aggregations, [...topAggsPath, 'buckets'], []);
+
+    const stats = {
+      fieldName: field.fieldName,
+      isTopValuesSampled: field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD || samplerShardSize > 0,
+      topValues,
+      topValuesSampleSize: topValues.reduce(
+        (acc, curr) => acc + curr.doc_count,
+        get(aggregations, [...topAggsPath, 'sum_other_doc_count'], 0)
+      ),
+      topValuesSamplerShardSize:
+        field.cardinality >= SAMPLER_TOP_TERMS_THRESHOLD
+          ? SAMPLER_TOP_TERMS_SHARD_SIZE
+          : samplerShardSize,
+    };
+
+    batchStats.push(stats);
+  });
+
+  return batchStats;
+};
+
+export const getDateFieldsStats = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: object,
+  fields: Field[],
+  samplerShardSize: number,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  runtimeMappings?: estypes.MappingRuntimeFields
+) => {
+  const { asCurrentUser } = client;
+
+  const index = indexPatternTitle;
+  const size = 0;
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+
+  const aggs: Aggs = {};
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+    aggs[`${safeFieldName}_field_stats`] = {
+      filter: { exists: { field: field.fieldName } },
+      aggs: {
+        actual_stats: {
+          stats: { field: field.fieldName },
+        },
+      },
+    };
+  });
+
+  const searchBody = {
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    aggs: buildSamplerAggregation(aggs, samplerShardSize),
+    ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+  };
+
+  const { body } = await asCurrentUser.search({
+    index,
+    size,
+    body: searchBody,
+  });
+  const aggregations = body.aggregations;
+  const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
+  const batchStats: DateFieldStats[] = [];
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+    const docCount = get(
+      aggregations,
+      [...aggsPath, `${safeFieldName}_field_stats`, 'doc_count'],
+      0
+    );
+    const fieldStatsResp = get(
+      aggregations,
+      [...aggsPath, `${safeFieldName}_field_stats`, 'actual_stats'],
+      {}
+    );
+    batchStats.push({
+      fieldName: field.fieldName,
+      count: docCount,
+      earliest: get(fieldStatsResp, 'min', 0),
+      latest: get(fieldStatsResp, 'max', 0),
+    });
+  });
+
+  return batchStats;
+};
+
+export const getBooleanFieldsStats = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: object,
+  fields: Field[],
+  samplerShardSize: number,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  runtimeMappings?: estypes.MappingRuntimeFields
+) => {
+  const { asCurrentUser } = client;
+
+  const index = indexPatternTitle;
+  const size = 0;
+  const filterCriteria = buildBaseFilterCriteria(timeFieldName, earliestMs, latestMs, query);
+
+  const aggs: Aggs = {};
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+    aggs[`${safeFieldName}_value_count`] = {
+      filter: { exists: { field: field.fieldName } },
+    };
+    aggs[`${safeFieldName}_values`] = {
+      terms: {
+        field: field.fieldName,
+        size: 2,
+      },
+    };
+  });
+
+  const searchBody = {
+    query: {
+      bool: {
+        filter: filterCriteria,
+      },
+    },
+    aggs: buildSamplerAggregation(aggs, samplerShardSize),
+    ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+  };
+
+  const { body } = await asCurrentUser.search({
+    index,
+    size,
+    body: searchBody,
+  });
+  const aggregations = body.aggregations;
+  const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
+  const batchStats: BooleanFieldStats[] = [];
+  fields.forEach((field, i) => {
+    const safeFieldName = getSafeAggregationName(field.fieldName, i);
+    const stats: BooleanFieldStats = {
+      fieldName: field.fieldName,
+      count: get(aggregations, [...aggsPath, `${safeFieldName}_value_count`, 'doc_count'], 0),
+      trueCount: 0,
+      falseCount: 0,
+    };
+
+    const valueBuckets: Array<{ [key: string]: number }> = get(
+      aggregations,
+      [...aggsPath, `${safeFieldName}_values`, 'buckets'],
+      []
+    );
+    valueBuckets.forEach((bucket) => {
+      stats[`${bucket.key_as_string}Count`] = bucket.doc_count;
+    });
+
+    batchStats.push(stats);
+  });
+
+  return batchStats;
+};
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts
new file mode 100644
index 0000000000000..b8f6e2f538180
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/get_histogram_for_fields.ts
@@ -0,0 +1,188 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { IScopedClusterClient } from 'kibana/server';
+import { estypes } from '@elastic/elasticsearch';
+import { get } from 'lodash';
+import { ChartData, ChartRequestAgg, HistogramField, NumericColumnStatsMap } from '../../types';
+import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { stringHash } from '../../../common/utils/string_utils';
+import {
+  buildSamplerAggregation,
+  getSamplerAggregationsResponsePath,
+} from '../../../common/utils/query_utils';
+import { isPopulatedObject } from '../../../common/utils/object_utils';
+import { MAX_CHART_COLUMNS } from './constants';
+
+export const getAggIntervals = async (
+  { asCurrentUser }: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  fields: HistogramField[],
+  samplerShardSize: number,
+  runtimeMappings?: estypes.MappingRuntimeFields
+): Promise<NumericColumnStatsMap> => {
+  const numericColumns = fields.filter((field) => {
+    return field.type === KBN_FIELD_TYPES.NUMBER || field.type === KBN_FIELD_TYPES.DATE;
+  });
+
+  if (numericColumns.length === 0) {
+    return {};
+  }
+
+  const minMaxAggs = numericColumns.reduce((aggs, c) => {
+    const id = stringHash(c.fieldName);
+    aggs[id] = {
+      stats: {
+        field: c.fieldName,
+      },
+    };
+    return aggs;
+  }, {} as Record<string, object>);
+
+  const { body } = await asCurrentUser.search({
+    index: indexPatternTitle,
+    size: 0,
+    body: {
+      query,
+      aggs: buildSamplerAggregation(minMaxAggs, samplerShardSize),
+      size: 0,
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+    },
+  });
+
+  const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
+  const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations;
+
+  return Object.keys(aggregations).reduce((p, aggName) => {
+    const stats = [aggregations[aggName].min, aggregations[aggName].max];
+    if (!stats.includes(null)) {
+      const delta = aggregations[aggName].max - aggregations[aggName].min;
+
+      let aggInterval = 1;
+
+      if (delta > MAX_CHART_COLUMNS || delta <= 1) {
+        aggInterval = delta / (MAX_CHART_COLUMNS - 1);
+      }
+
+      p[aggName] = { interval: aggInterval, min: stats[0], max: stats[1] };
+    }
+
+    return p;
+  }, {} as NumericColumnStatsMap);
+};
+
+export const getHistogramsForFields = async (
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  fields: HistogramField[],
+  samplerShardSize: number,
+  runtimeMappings?: estypes.MappingRuntimeFields
+) => {
+  const { asCurrentUser } = client;
+  const aggIntervals = await getAggIntervals(
+    client,
+    indexPatternTitle,
+    query,
+    fields,
+    samplerShardSize,
+    runtimeMappings
+  );
+
+  const chartDataAggs = fields.reduce((aggs, field) => {
+    const fieldName = field.fieldName;
+    const fieldType = field.type;
+    const id = stringHash(fieldName);
+    if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) {
+      if (aggIntervals[id] !== undefined) {
+        aggs[`${id}_histogram`] = {
+          histogram: {
+            field: fieldName,
+            interval: aggIntervals[id].interval !== 0 ? aggIntervals[id].interval : 1,
+          },
+        };
+      }
+    } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) {
+      if (fieldType === KBN_FIELD_TYPES.STRING) {
+        aggs[`${id}_cardinality`] = {
+          cardinality: {
+            field: fieldName,
+          },
+        };
+      }
+      aggs[`${id}_terms`] = {
+        terms: {
+          field: fieldName,
+          size: MAX_CHART_COLUMNS,
+        },
+      };
+    }
+    return aggs;
+  }, {} as Record<string, ChartRequestAgg>);
+
+  if (Object.keys(chartDataAggs).length === 0) {
+    return [];
+  }
+
+  const { body } = await asCurrentUser.search({
+    index: indexPatternTitle,
+    size: 0,
+    body: {
+      query,
+      aggs: buildSamplerAggregation(chartDataAggs, samplerShardSize),
+      size: 0,
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
+    },
+  });
+
+  const aggsPath = getSamplerAggregationsResponsePath(samplerShardSize);
+  const aggregations = aggsPath.length > 0 ? get(body.aggregations, aggsPath) : body.aggregations;
+
+  const chartsData: ChartData[] = fields.map(
+    (field): ChartData => {
+      const fieldName = field.fieldName;
+      const fieldType = field.type;
+      const id = stringHash(field.fieldName);
+
+      if (fieldType === KBN_FIELD_TYPES.NUMBER || fieldType === KBN_FIELD_TYPES.DATE) {
+        if (aggIntervals[id] === undefined) {
+          return {
+            type: 'numeric',
+            data: [],
+            interval: 0,
+            stats: [0, 0],
+            id: fieldName,
+          };
+        }
+
+        return {
+          data: aggregations[`${id}_histogram`].buckets,
+          interval: aggIntervals[id].interval,
+          stats: [aggIntervals[id].min, aggIntervals[id].max],
+          type: 'numeric',
+          id: fieldName,
+        };
+      } else if (fieldType === KBN_FIELD_TYPES.STRING || fieldType === KBN_FIELD_TYPES.BOOLEAN) {
+        return {
+          type: fieldType === KBN_FIELD_TYPES.STRING ? 'ordinal' : 'boolean',
+          cardinality:
+            fieldType === KBN_FIELD_TYPES.STRING ? aggregations[`${id}_cardinality`].value : 2,
+          data: aggregations[`${id}_terms`].buckets,
+          id: fieldName,
+        };
+      }
+
+      return {
+        type: 'unsupported',
+        id: fieldName,
+      };
+    }
+  );
+
+  return chartsData;
+};
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/index.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/index.ts
new file mode 100644
index 0000000000000..a29957b159b7e
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/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 * from './data_visualizer';
diff --git a/x-pack/plugins/data_visualizer/server/models/data_visualizer/process_distribution_data.ts b/x-pack/plugins/data_visualizer/server/models/data_visualizer/process_distribution_data.ts
new file mode 100644
index 0000000000000..4e40c2baaf701
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/models/data_visualizer/process_distribution_data.ts
@@ -0,0 +1,108 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { last } from 'lodash';
+import { Distribution } from '../../types';
+
+export const processDistributionData = (
+  percentiles: Array<{ value: number }>,
+  percentileSpacing: number,
+  minValue: number
+): Distribution => {
+  const distribution: Distribution = { percentiles: [], minPercentile: 0, maxPercentile: 100 };
+  if (percentiles.length === 0) {
+    return distribution;
+  }
+
+  let percentileBuckets: Array<{ value: number }> = [];
+  let lowerBound = minValue;
+  if (lowerBound >= 0) {
+    // By default return results for 0 - 90% percentiles.
+    distribution.minPercentile = 0;
+    distribution.maxPercentile = 90;
+    percentileBuckets = percentiles.slice(0, percentiles.length - 2);
+
+    // Look ahead to the last percentiles and process these too if
+    // they don't add more than 50% to the value range.
+    const lastValue = (last(percentileBuckets) as any).value;
+    const upperBound = lowerBound + 1.5 * (lastValue - lowerBound);
+    const filteredLength = percentileBuckets.length;
+    for (let i = filteredLength; i < percentiles.length; i++) {
+      if (percentiles[i].value < upperBound) {
+        percentileBuckets.push(percentiles[i]);
+        distribution.maxPercentile += percentileSpacing;
+      } else {
+        break;
+      }
+    }
+  } else {
+    // By default return results for 5 - 95% percentiles.
+    const dataMin = lowerBound;
+    lowerBound = percentiles[0].value;
+    distribution.minPercentile = 5;
+    distribution.maxPercentile = 95;
+    percentileBuckets = percentiles.slice(1, percentiles.length - 1);
+
+    // Add in 0-5 and 95-100% if they don't add more
+    // than 25% to the value range at either end.
+    const lastValue: number = (last(percentileBuckets) as any).value;
+    const maxDiff = 0.25 * (lastValue - lowerBound);
+    if (lowerBound - dataMin < maxDiff) {
+      percentileBuckets.splice(0, 0, percentiles[0]);
+      distribution.minPercentile = 0;
+      lowerBound = dataMin;
+    }
+
+    if (percentiles[percentiles.length - 1].value - lastValue < maxDiff) {
+      percentileBuckets.push(percentiles[percentiles.length - 1]);
+      distribution.maxPercentile = 100;
+    }
+  }
+
+  // Combine buckets with the same value.
+  const totalBuckets = percentileBuckets.length;
+  let lastBucketValue = lowerBound;
+  let numEqualValueBuckets = 0;
+  for (let i = 0; i < totalBuckets; i++) {
+    const bucket = percentileBuckets[i];
+
+    // Results from the percentiles aggregation can have precision rounding
+    // artifacts e.g returning 200 and 200.000000000123, so check for equality
+    // around double floating point precision i.e. 15 sig figs.
+    if (bucket.value.toPrecision(15) !== lastBucketValue.toPrecision(15)) {
+      // Create a bucket for any 'equal value' buckets which had a value <= last bucket
+      if (numEqualValueBuckets > 0) {
+        distribution.percentiles.push({
+          percent: numEqualValueBuckets * percentileSpacing,
+          minValue: lastBucketValue,
+          maxValue: lastBucketValue,
+        });
+      }
+
+      distribution.percentiles.push({
+        percent: percentileSpacing,
+        minValue: lastBucketValue,
+        maxValue: bucket.value,
+      });
+
+      lastBucketValue = bucket.value;
+      numEqualValueBuckets = 0;
+    } else {
+      numEqualValueBuckets++;
+      if (i === totalBuckets - 1) {
+        // If at the last bucket, create a final bucket for the equal value buckets.
+        distribution.percentiles.push({
+          percent: numEqualValueBuckets * percentileSpacing,
+          minValue: lastBucketValue,
+          maxValue: lastBucketValue,
+        });
+      }
+    }
+  }
+
+  return distribution;
+};
diff --git a/x-pack/plugins/data_visualizer/server/plugin.ts b/x-pack/plugins/data_visualizer/server/plugin.ts
new file mode 100644
index 0000000000000..4ae695b05b81f
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/plugin.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { CoreSetup, CoreStart, Plugin } from 'src/core/server';
+import { StartDeps, SetupDeps } from './types';
+import { dataVisualizerRoutes } from './routes';
+
+export class DataVisualizerPlugin implements Plugin {
+  constructor() {}
+
+  async setup(coreSetup: CoreSetup<StartDeps, unknown>, plugins: SetupDeps) {
+    dataVisualizerRoutes(coreSetup);
+  }
+
+  start(core: CoreStart) {}
+}
diff --git a/x-pack/plugins/data_visualizer/server/routes/index.ts b/x-pack/plugins/data_visualizer/server/routes/index.ts
new file mode 100644
index 0000000000000..892f6cbd77361
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/routes/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 { dataVisualizerRoutes } from './routes';
diff --git a/x-pack/plugins/data_visualizer/server/routes/routes.ts b/x-pack/plugins/data_visualizer/server/routes/routes.ts
new file mode 100644
index 0000000000000..13a0031a25dfd
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/routes/routes.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 { CoreSetup, IScopedClusterClient } from 'kibana/server';
+import { estypes } from '@elastic/elasticsearch';
+import {
+  dataVisualizerFieldHistogramsSchema,
+  dataVisualizerFieldStatsSchema,
+  dataVisualizerOverallStatsSchema,
+  indexPatternTitleSchema,
+} from './schemas';
+import type { Field, StartDeps, HistogramField } from '../types';
+import { DataVisualizer } from '../models/data_visualizer';
+import { wrapError } from '../utils/error_wrapper';
+
+function getOverallStats(
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: object,
+  aggregatableFields: string[],
+  nonAggregatableFields: string[],
+  samplerShardSize: number,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  runtimeMappings: estypes.MappingRuntimeFields
+) {
+  const dv = new DataVisualizer(client);
+  return dv.getOverallStats(
+    indexPatternTitle,
+    query,
+    aggregatableFields,
+    nonAggregatableFields,
+    samplerShardSize,
+    timeFieldName,
+    earliestMs,
+    latestMs,
+    runtimeMappings
+  );
+}
+
+function getStatsForFields(
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  fields: Field[],
+  samplerShardSize: number,
+  timeFieldName: string | undefined,
+  earliestMs: number | undefined,
+  latestMs: number | undefined,
+  interval: number | undefined,
+  maxExamples: number,
+  runtimeMappings: estypes.MappingRuntimeFields
+) {
+  const dv = new DataVisualizer(client);
+  return dv.getStatsForFields(
+    indexPatternTitle,
+    query,
+    fields,
+    samplerShardSize,
+    timeFieldName,
+    earliestMs,
+    latestMs,
+    interval,
+    maxExamples,
+    runtimeMappings
+  );
+}
+
+function getHistogramsForFields(
+  client: IScopedClusterClient,
+  indexPatternTitle: string,
+  query: any,
+  fields: HistogramField[],
+  samplerShardSize: number,
+  runtimeMappings: estypes.MappingRuntimeFields
+) {
+  const dv = new DataVisualizer(client);
+  return dv.getHistogramsForFields(
+    indexPatternTitle,
+    query,
+    fields,
+    samplerShardSize,
+    runtimeMappings
+  );
+}
+/**
+ * Routes for the index data visualizer.
+ */
+export function dataVisualizerRoutes(coreSetup: CoreSetup<StartDeps, unknown>) {
+  const router = coreSetup.http.createRouter();
+
+  /**
+   * @apiGroup DataVisualizer
+   *
+   * @api {post} /internal/data_visualizer/get_field_histograms/:indexPatternTitle Get histograms for fields
+   * @apiName GetHistogramsForFields
+   * @apiDescription Returns the histograms on a list fields in the specified index pattern.
+   *
+   * @apiSchema (params) indexPatternTitleSchema
+   * @apiSchema (body) dataVisualizerFieldHistogramsSchema
+   *
+   * @apiSuccess {Object} fieldName histograms by field, keyed on the name of the field.
+   */
+  router.post(
+    {
+      path: '/internal/data_visualizer/get_field_histograms/{indexPatternTitle}',
+      validate: {
+        params: indexPatternTitleSchema,
+        body: dataVisualizerFieldHistogramsSchema,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const {
+          params: { indexPatternTitle },
+          body: { query, fields, samplerShardSize, runtimeMappings },
+        } = request;
+
+        const results = await getHistogramsForFields(
+          context.core.elasticsearch.client,
+          indexPatternTitle,
+          query,
+          fields,
+          samplerShardSize,
+          runtimeMappings
+        );
+
+        return response.ok({
+          body: results,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    }
+  );
+
+  /**
+   * @apiGroup DataVisualizer
+   *
+   * @api {post} /internal/data_visualizer/get_field_stats/:indexPatternTitle Get stats for fields
+   * @apiName GetStatsForFields
+   * @apiDescription Returns the stats on individual fields in the specified index pattern.
+   *
+   * @apiSchema (params) indexPatternTitleSchema
+   * @apiSchema (body) dataVisualizerFieldStatsSchema
+   *
+   * @apiSuccess {Object} fieldName stats by field, keyed on the name of the field.
+   */
+  router.post(
+    {
+      path: '/internal/data_visualizer/get_field_stats/{indexPatternTitle}',
+      validate: {
+        params: indexPatternTitleSchema,
+        body: dataVisualizerFieldStatsSchema,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const {
+          params: { indexPatternTitle },
+          body: {
+            query,
+            fields,
+            samplerShardSize,
+            timeFieldName,
+            earliest,
+            latest,
+            interval,
+            maxExamples,
+            runtimeMappings,
+          },
+        } = request;
+        const results = await getStatsForFields(
+          context.core.elasticsearch.client,
+          indexPatternTitle,
+          query,
+          fields,
+          samplerShardSize,
+          timeFieldName,
+          earliest,
+          latest,
+          interval,
+          maxExamples,
+          runtimeMappings
+        );
+
+        return response.ok({
+          body: results,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    }
+  );
+
+  /**
+   * @apiGroup DataVisualizer
+   *
+   * @api {post} /internal/data_visualizer/get_overall_stats/:indexPatternTitle Get overall stats
+   * @apiName GetOverallStats
+   * @apiDescription Returns the top level overall stats for the specified index pattern.
+   *
+   * @apiSchema (params) indexPatternTitleSchema
+   * @apiSchema (body) dataVisualizerOverallStatsSchema
+   *
+   * @apiSuccess {number} totalCount total count of documents.
+   * @apiSuccess {Object} aggregatableExistsFields stats on aggregatable fields that exist in documents.
+   * @apiSuccess {Object} aggregatableNotExistsFields stats on aggregatable fields that do not exist in documents.
+   * @apiSuccess {Object} nonAggregatableExistsFields stats on non-aggregatable fields that exist in documents.
+   * @apiSuccess {Object} nonAggregatableNotExistsFields stats on non-aggregatable fields that do not exist in documents.
+   */
+  router.post(
+    {
+      path: '/internal/data_visualizer/get_overall_stats/{indexPatternTitle}',
+      validate: {
+        params: indexPatternTitleSchema,
+        body: dataVisualizerOverallStatsSchema,
+      },
+    },
+    async (context, request, response) => {
+      try {
+        const {
+          params: { indexPatternTitle },
+          body: {
+            query,
+            aggregatableFields,
+            nonAggregatableFields,
+            samplerShardSize,
+            timeFieldName,
+            earliest,
+            latest,
+            runtimeMappings,
+          },
+        } = request;
+
+        const results = await getOverallStats(
+          context.core.elasticsearch.client,
+          indexPatternTitle,
+          query,
+          aggregatableFields,
+          nonAggregatableFields,
+          samplerShardSize,
+          timeFieldName,
+          earliest,
+          latest,
+          runtimeMappings
+        );
+
+        return response.ok({
+          body: results,
+        });
+      } catch (e) {
+        return response.customError(wrapError(e));
+      }
+    }
+  );
+}
diff --git a/x-pack/plugins/data_visualizer/server/routes/schemas/index.ts b/x-pack/plugins/data_visualizer/server/routes/schemas/index.ts
new file mode 100644
index 0000000000000..156336feef29e
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/routes/schemas/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 * from './index_data_visualizer_schemas';
diff --git a/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts b/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.ts
new file mode 100644
index 0000000000000..0f145081d8cec
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/routes/schemas/index_data_visualizer_schemas.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 { schema } from '@kbn/config-schema';
+import { isRuntimeField } from '../../../common/utils/runtime_field_utils';
+
+export const runtimeMappingsSchema = schema.object(
+  {},
+  {
+    unknowns: 'allow',
+    validate: (v: object) => {
+      if (Object.values(v).some((o) => !isRuntimeField(o))) {
+        return 'Invalid runtime field';
+      }
+    },
+  }
+);
+
+export const indexPatternTitleSchema = schema.object({
+  /** Title of the index pattern for which to return stats. */
+  indexPatternTitle: schema.string(),
+});
+
+export const dataVisualizerFieldHistogramsSchema = schema.object({
+  /** Query to match documents in the index. */
+  query: schema.any(),
+  /** The fields to return histogram data. */
+  fields: schema.arrayOf(schema.any()),
+  /** Number of documents to be collected in the sample processed on each shard, or -1 for no sampling. */
+  samplerShardSize: schema.number(),
+  /** Optional search time runtime fields */
+  runtimeMappings: runtimeMappingsSchema,
+});
+
+export const dataVisualizerFieldStatsSchema = schema.object({
+  /** Query to match documents in the index. */
+  query: schema.any(),
+  fields: schema.arrayOf(schema.any()),
+  /** Number of documents to be collected in the sample processed on each shard, or -1 for no sampling. */
+  samplerShardSize: schema.number(),
+  /** Name of the time field in the index (optional). */
+  timeFieldName: schema.maybe(schema.string()),
+  /** Earliest timestamp for search, as epoch ms (optional). */
+  earliest: schema.maybe(schema.number()),
+  /** Latest timestamp for search, as epoch ms (optional). */
+  latest: schema.maybe(schema.number()),
+  /** Aggregation interval, in milliseconds, to use for obtaining document counts over time (optional). */
+  interval: schema.maybe(schema.number()),
+  /** Maximum number of examples to return for text type fields.  */
+  maxExamples: schema.number(),
+  /** Optional search time runtime fields */
+  runtimeMappings: runtimeMappingsSchema,
+});
+
+export const dataVisualizerOverallStatsSchema = schema.object({
+  /** Query to match documents in the index. */
+  query: schema.any(),
+  /** Names of aggregatable fields for which to return stats. */
+  aggregatableFields: schema.arrayOf(schema.string()),
+  /** Names of non-aggregatable fields for which to return stats. */
+  nonAggregatableFields: schema.arrayOf(schema.string()),
+  /** Number of documents to be collected in the sample processed on each shard, or -1 for no sampling. */
+  samplerShardSize: schema.number(),
+  /** Name of the time field in the index (optional). */
+  timeFieldName: schema.maybe(schema.string()),
+  /** Earliest timestamp for search, as epoch ms (optional). */
+  earliest: schema.maybe(schema.number()),
+  /** Latest timestamp for search, as epoch ms (optional). */
+  latest: schema.maybe(schema.number()),
+  /** Optional search time runtime fields */
+  runtimeMappings: runtimeMappingsSchema,
+});
diff --git a/x-pack/plugins/data_visualizer/server/types/chart_data.ts b/x-pack/plugins/data_visualizer/server/types/chart_data.ts
new file mode 100644
index 0000000000000..99c23cf88b5ba
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/types/chart_data.ts
@@ -0,0 +1,168 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export interface FieldData {
+  fieldName: string;
+  existsInDocs: boolean;
+  stats?: {
+    sampleCount?: number;
+    count?: number;
+    cardinality?: number;
+  };
+}
+
+export interface Field {
+  fieldName: string;
+  type: string;
+  cardinality: number;
+}
+
+export interface HistogramField {
+  fieldName: string;
+  type: string;
+}
+
+export interface Distribution {
+  percentiles: any[];
+  minPercentile: number;
+  maxPercentile: number;
+}
+
+export interface Aggs {
+  [key: string]: any;
+}
+
+export interface Bucket {
+  doc_count: number;
+}
+
+export interface NumericFieldStats {
+  fieldName: string;
+  count: number;
+  min: number;
+  max: number;
+  avg: number;
+  isTopValuesSampled: boolean;
+  topValues: Bucket[];
+  topValuesSampleSize: number;
+  topValuesSamplerShardSize: number;
+  median?: number;
+  distribution?: Distribution;
+}
+
+export interface StringFieldStats {
+  fieldName: string;
+  isTopValuesSampled: boolean;
+  topValues: Bucket[];
+  topValuesSampleSize: number;
+  topValuesSamplerShardSize: number;
+}
+
+export interface DateFieldStats {
+  fieldName: string;
+  count: number;
+  earliest: number;
+  latest: number;
+}
+
+export interface BooleanFieldStats {
+  fieldName: string;
+  count: number;
+  trueCount: number;
+  falseCount: number;
+  [key: string]: number | string;
+}
+
+export interface DocumentCountStats {
+  documentCounts: {
+    interval: number;
+    buckets: { [key: string]: number };
+  };
+}
+
+export interface FieldExamples {
+  fieldName: string;
+  examples: any[];
+}
+
+export interface NumericColumnStats {
+  interval: number;
+  min: number;
+  max: number;
+}
+export type NumericColumnStatsMap = Record<string, NumericColumnStats>;
+
+export interface AggHistogram {
+  histogram: {
+    field: string;
+    interval: number;
+  };
+}
+
+export interface AggTerms {
+  terms: {
+    field: string;
+    size: number;
+  };
+}
+
+export interface NumericDataItem {
+  key: number;
+  key_as_string?: string;
+  doc_count: number;
+}
+
+export interface NumericChartData {
+  data: NumericDataItem[];
+  id: string;
+  interval: number;
+  stats: [number, number];
+  type: 'numeric';
+}
+
+export interface OrdinalDataItem {
+  key: string;
+  key_as_string?: string;
+  doc_count: number;
+}
+
+export interface OrdinalChartData {
+  type: 'ordinal' | 'boolean';
+  cardinality: number;
+  data: OrdinalDataItem[];
+  id: string;
+}
+
+export interface UnsupportedChartData {
+  id: string;
+  type: 'unsupported';
+}
+
+export interface FieldAggCardinality {
+  field: string;
+  percent?: any;
+}
+
+export interface ScriptAggCardinality {
+  script: any;
+}
+
+export interface AggCardinality {
+  cardinality: FieldAggCardinality | ScriptAggCardinality;
+}
+
+export type ChartRequestAgg = AggHistogram | AggCardinality | AggTerms;
+
+export type ChartData = NumericChartData | OrdinalChartData | UnsupportedChartData;
+
+export type BatchStats =
+  | NumericFieldStats
+  | StringFieldStats
+  | BooleanFieldStats
+  | DateFieldStats
+  | DocumentCountStats
+  | FieldExamples;
diff --git a/x-pack/plugins/data_visualizer/server/types/deps.ts b/x-pack/plugins/data_visualizer/server/types/deps.ts
new file mode 100644
index 0000000000000..fe982b1fa5e1a
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/types/deps.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 { SecurityPluginStart } from '../../../security/server';
+import type { UsageCollectionSetup } from '../../../../../src/plugins/usage_collection/server';
+
+export interface StartDeps {
+  security?: SecurityPluginStart;
+}
+export interface SetupDeps {
+  usageCollection: UsageCollectionSetup;
+}
diff --git a/x-pack/plugins/data_visualizer/server/types/index.ts b/x-pack/plugins/data_visualizer/server/types/index.ts
new file mode 100644
index 0000000000000..e0379b514de32
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/types/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 * from './deps';
+export * from './chart_data';
diff --git a/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts b/x-pack/plugins/data_visualizer/server/utils/error_wrapper.ts
new file mode 100644
index 0000000000000..e0e6e263128e9
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/server/utils/error_wrapper.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 { CustomHttpResponseOptions, ResponseError } from 'kibana/server';
+import { boomify, isBoom } from '@hapi/boom';
+
+export function wrapError(error: any): CustomHttpResponseOptions<ResponseError> {
+  const boom = isBoom(error)
+    ? error
+    : boomify(error, { statusCode: error.status ?? error.statusCode });
+  const statusCode = boom.output.statusCode;
+  return {
+    body: {
+      message: boom,
+      ...(statusCode !== 500 && error.body ? { attributes: { body: error.body } } : {}),
+    },
+    headers: boom.output.headers as { [key: string]: string },
+    statusCode,
+  };
+}
diff --git a/x-pack/plugins/data_visualizer/tsconfig.json b/x-pack/plugins/data_visualizer/tsconfig.json
new file mode 100644
index 0000000000000..7c60002c3c630
--- /dev/null
+++ b/x-pack/plugins/data_visualizer/tsconfig.json
@@ -0,0 +1,21 @@
+{
+  "extends": "../../../tsconfig.base.json",
+  "compilerOptions": {
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true
+  },
+  "include": ["common/**/*", "public/**/*", "server/**/*"],
+  "references": [
+    { "path": "../../../src/core/tsconfig.json" },
+    { "path": "../../../src/plugins/data/tsconfig.json" },
+    { "path": "../../../src/plugins/usage_collection/tsconfig.json" },
+    { "path": "../security/tsconfig.json" },
+    { "path": "../file_upload/tsconfig.json" },
+    { "path": "../lens/tsconfig.json" },
+    { "path": "../maps/tsconfig.json" },
+    { "path": "../../../src/plugins/embeddable/tsconfig.json" }
+  ]
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/index.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/index.ts
deleted file mode 100644
index 4e3a344b52e46..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/index.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { mockHistory, mockLocation } from './react_router_history.mock';
-export { mockKibanaValues } from './kibana_logic.mock';
-export { mockLicensingValues } from './licensing_logic.mock';
-export { mockHttpValues } from './http_logic.mock';
-export { mockTelemetryActions } from './telemetry_logic.mock';
-export {
-  mockFlashMessagesValues,
-  mockFlashMessagesActions,
-  mockFlashMessageHelpers,
-} from './flash_messages_logic.mock';
-export {
-  mockAllValues,
-  mockAllActions,
-  setMockValues,
-  setMockActions,
-  LogicMounter,
-} from './kea.mock';
-
-export { mountAsync } from './mount_async.mock';
-export { mountWithIntl } from './mount_with_i18n.mock';
-export { shallowWithIntl } from './shallow_with_i18n.mock';
-export { rerender } from './enzyme_rerender.mock';
-// Note: shallow_useeffect must be imported directly as a file
-
-export { expectedAsyncError } from './expected_async_error';
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea.mock.ts
deleted file mode 100644
index 4ebb9edd20c0e..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea.mock.ts
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/**
- * Combine all shared mock values/actions into a single obj
- *
- * NOTE: These variable names MUST start with 'mock*' in order for
- * Jest to accept its use within a jest.mock()
- */
-import { mockFlashMessagesValues, mockFlashMessagesActions } from './flash_messages_logic.mock';
-import { mockHttpValues } from './http_logic.mock';
-import { mockKibanaValues } from './kibana_logic.mock';
-import { mockLicensingValues } from './licensing_logic.mock';
-import { mockTelemetryActions } from './telemetry_logic.mock';
-
-export const mockAllValues = {
-  ...mockKibanaValues,
-  ...mockLicensingValues,
-  ...mockHttpValues,
-  ...mockFlashMessagesValues,
-};
-export const mockAllActions = {
-  ...mockTelemetryActions,
-  ...mockFlashMessagesActions,
-};
-
-/**
- * Import this file directly to mock useValues with a set of default values for all shared logic files.
- * Example usage:
- *
- * import '../../../__mocks__/kea'; // Must come before kea's import, adjust relative path as needed
- */
-jest.mock('kea', () => ({
-  ...(jest.requireActual('kea') as object),
-  useValues: jest.fn(() => ({ ...mockAllValues })),
-  useActions: jest.fn(() => ({ ...mockAllActions })),
-}));
-
-/**
- * React component helpers
- *
- * Call this function to override a specific set of Kea values while retaining all other defaults
- *
- * Example usage:
- *
- * import { setMockValues } from '../../../__mocks__/kea.mock';
- * import { SomeComponent } from './';
- *
- * it('some test', () => {
- *   setMockValues({ someValue: 'hello' });
- *   shallow(<SomeComponent />);
- * });
- */
-import { useValues, useActions } from 'kea';
-
-export const setMockValues = (values: object) => {
-  (useValues as jest.Mock).mockImplementation(() => ({ ...mockAllValues, ...values }));
-};
-export const setMockActions = (actions: object) => {
-  (useActions as jest.Mock).mockImplementation(() => ({ ...mockAllActions, ...actions }));
-};
-
-/**
- * Kea logic helpers
- *
- * Call this function to mount a logic file and optionally override default values.
- * Automatically DRYs out a lot of cruft for us, such as resetting context, creating the
- * nested defaults path obj (see https://kea.js.org/docs/api/context#resetcontext), and
- * returning an unmount function
- *
- * Example usage:
- *
- * import { LogicMounter } from '../../../__mocks__/kea.mock';
- * import { SomeLogic } from './';
- *
- * const { mount, unmount } = new LogicMounter(SomeLogic);
- *
- * it('some test', () => {
- *   mount({ someValue: 'hello' }, { someProp: 'world' });
- *   unmount();
- * });
- */
-import { resetContext, LogicWrapper } from 'kea';
-
-type LogicFile = LogicWrapper<any>;
-
-export class LogicMounter {
-  private logicFile: LogicFile;
-  private unmountFn!: Function;
-
-  constructor(logicFile: LogicFile) {
-    this.logicFile = logicFile;
-  }
-
-  // Reset context with optional default value overrides
-  public resetContext = (values?: object, props?: object) => {
-    if (!values || !Object.keys(values).length) {
-      resetContext({});
-    } else {
-      let { path, key } = this.logicFile.inputs[0];
-
-      // For keyed logic files, both key and path should be functions
-      if (this.logicFile._isKeaWithKey) {
-        key = key(props);
-        path = path(key);
-      }
-
-      // Generate the correct nested defaults obj based on the file path
-      // example path: ['x', 'y', 'z']
-      // example defaults: { x: { y: { z: values } } }
-      const defaults = path.reduceRight(
-        (value: object, name: string) => ({ [name]: value }),
-        values
-      );
-      resetContext({ defaults });
-    }
-  };
-
-  // Automatically reset context & mount the logic file
-  public mount = (values?: object, props?: object) => {
-    this.resetContext(values, props);
-
-    const logicWithProps = this.logicFile.build(props);
-    this.unmountFn = logicWithProps.mount();
-
-    return logicWithProps;
-    // NOTE: Unlike kea's mount(), this returns the current
-    // built logic instance with props, NOT the unmount fn
-  };
-
-  // Also add unmount as a class method that can be destructured on init without becoming stale later
-  public unmount = () => {
-    this.unmountFn();
-  };
-
-  /**
-   * Some tests (e.g. async tests, tests that expect thrown errors) need to access
-   * listener functions directly instead of calling `SomeLogic.actions.someListener`,
-   * due to how Kea invokes/wraps action fns by design.
-   *
-   * Example usage:
-   *
-   * const { mount, getListeners } = new LogicMounter(SomeLogic);
-   *
-   * it('some test', async () => {
-   *   mount();
-   *   const { someListener } = getListeners({ values: { someMockValue: false } });
-   *
-   *   const mockBreakpoint = jest.fn();
-   *   await someListener({ someMockArgument: true }, mockBreakpoint);
-   * });
-   */
-  public getListeners = (listenersArgs: object = {}) => {
-    const { listeners } = this.logicFile.inputs[0];
-
-    return typeof listeners === 'function'
-      ? listeners(listenersArgs) // e.g., listeners({ values, actions, props }) => ({ ... })
-      : listeners; // handles simpler logic files that just define listeners: { ... }
-  };
-}
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/flash_messages_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/flash_messages_logic.mock.ts
similarity index 86%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/flash_messages_logic.mock.ts
rename to x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/flash_messages_logic.mock.ts
index 17e22e6f23daf..36a10fd234bfe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/flash_messages_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/flash_messages_logic.mock.ts
@@ -15,6 +15,7 @@ export const mockFlashMessagesActions = {
   clearFlashMessages: jest.fn(),
   setQueuedMessages: jest.fn(),
   clearQueuedMessages: jest.fn(),
+  dismissToastMessage: jest.fn(),
 };
 
 export const mockFlashMessageHelpers = {
@@ -28,8 +29,8 @@ export const mockFlashMessageHelpers = {
   flashErrorToast: jest.fn(),
 };
 
-jest.mock('../shared/flash_messages', () => ({
-  ...(jest.requireActual('../shared/flash_messages') as object),
+jest.mock('../../shared/flash_messages', () => ({
+  ...(jest.requireActual('../../shared/flash_messages') as object),
   ...mockFlashMessageHelpers,
   FlashMessagesLogic: {
     values: mockFlashMessagesValues,
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/hooks.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/hooks.mock.ts
new file mode 100644
index 0000000000000..ce21fd08f180a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/hooks.mock.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.
+ */
+
+/**
+ * Combine all shared mock values/actions into a single obj
+ *
+ * NOTE: These variable names MUST start with 'mock*' in order for
+ * Jest to accept its use within a jest.mock()
+ */
+import { mockFlashMessagesValues, mockFlashMessagesActions } from './flash_messages_logic.mock';
+import { mockHttpValues } from './http_logic.mock';
+import { mockKibanaValues } from './kibana_logic.mock';
+import { mockLicensingValues } from './licensing_logic.mock';
+import { mockTelemetryActions } from './telemetry_logic.mock';
+
+export const mockAllValues = {
+  ...mockKibanaValues,
+  ...mockLicensingValues,
+  ...mockHttpValues,
+  ...mockFlashMessagesValues,
+};
+export const mockAllActions = {
+  ...mockTelemetryActions,
+  ...mockFlashMessagesActions,
+};
+
+/**
+ * Import this file directly to mock useValues with a set of default values for all shared logic files.
+ * Example usage:
+ *
+ * import '../../../__mocks__/kea_logic'; // Must come before kea's import, adjust relative path as needed
+ */
+jest.mock('kea', () => ({
+  ...(jest.requireActual('kea') as object),
+  useValues: jest.fn(() => ({ ...mockAllValues })),
+  useActions: jest.fn(() => ({ ...mockAllActions })),
+}));
+
+/**
+ * React component helpers
+ *
+ * Call this function to override a specific set of Kea values while retaining all other defaults
+ *
+ * Example usage:
+ *
+ * import { setMockValues } from '../../../__mocks__/kea_logic';
+ * import { SomeComponent } from './';
+ *
+ * it('some test', () => {
+ *   setMockValues({ someValue: 'hello' });
+ *   shallow(<SomeComponent />);
+ * });
+ */
+import { useValues, useActions } from 'kea';
+
+export const setMockValues = (values: object) => {
+  (useValues as jest.Mock).mockImplementation(() => ({ ...mockAllValues, ...values }));
+};
+export const setMockActions = (actions: object) => {
+  (useActions as jest.Mock).mockImplementation(() => ({ ...mockAllActions, ...actions }));
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/http_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
similarity index 92%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/http_logic.mock.ts
rename to x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
index 5399646a7b414..e60f5a1a8ba12 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/http_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/http_logic.mock.ts
@@ -13,6 +13,6 @@ export const mockHttpValues = {
   readOnlyMode: false,
 };
 
-jest.mock('../shared/http', () => ({
+jest.mock('../../shared/http', () => ({
   HttpLogic: { values: mockHttpValues },
 }));
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/index.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/index.ts
new file mode 100644
index 0000000000000..81901e6d0e103
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/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.
+ */
+
+export { mockKibanaValues } from './kibana_logic.mock';
+export { mockLicensingValues } from './licensing_logic.mock';
+export { mockHttpValues } from './http_logic.mock';
+export { mockTelemetryActions } from './telemetry_logic.mock';
+export {
+  mockFlashMessagesValues,
+  mockFlashMessagesActions,
+  mockFlashMessageHelpers,
+} from './flash_messages_logic.mock';
+export { mockAllValues, mockAllActions, setMockValues, setMockActions } from './hooks.mock';
+
+export { LogicMounter } from './logic_mounter.test_helper';
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kibana_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
similarity index 79%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/kibana_logic.mock.ts
rename to x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/kibana_logic.mock.ts
index 1ebd61df388c5..ebb6f8c4fe5aa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/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 { mockHistory } from './react_router_history.mock';
+import { chartPluginMock } from '../../../../../../../src/plugins/charts/public/mocks';
 
-import { chartPluginMock } from '../../../../../../src/plugins/charts/public/mocks';
+import { mockHistory } from '../react_router/state.mock';
 
 export const mockKibanaValues = {
   config: { host: 'http://localhost:3002' },
@@ -24,6 +24,6 @@ export const mockKibanaValues = {
   renderHeaderActions: jest.fn(),
 };
 
-jest.mock('../shared/kibana', () => ({
+jest.mock('../../shared/kibana', () => ({
   KibanaLogic: { values: mockKibanaValues },
 }));
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/licensing_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
similarity index 79%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/licensing_logic.mock.ts
rename to x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/licensing_logic.mock.ts
index d39ba56cdc1c1..2cea6061b63ab 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/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 '../../../../../licensing/public/mocks';
 
 export const mockLicensingValues = {
   license: licensingMock.createLicense(),
@@ -13,6 +13,6 @@ export const mockLicensingValues = {
   hasGoldLicense: false,
 };
 
-jest.mock('../shared/licensing', () => ({
+jest.mock('../../shared/licensing', () => ({
   LicensingLogic: { values: mockLicensingValues },
 }));
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/logic_mounter.test_helper.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/logic_mounter.test_helper.ts
new file mode 100644
index 0000000000000..08867fe944d15
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/logic_mounter.test_helper.ts
@@ -0,0 +1,103 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * Call this function to mount a logic file and optionally override default values.
+ * Automatically DRYs out a lot of cruft for us, such as resetting context, creating the
+ * nested defaults path obj (see https://kea.js.org/docs/api/context#resetcontext), and
+ * returning an unmount function
+ *
+ * Example usage:
+ *
+ * import { LogicMounter } from '../../../__mocks__/kea_logic';
+ * import { SomeLogic } from './';
+ *
+ * const { mount, unmount } = new LogicMounter(SomeLogic);
+ *
+ * it('some test', () => {
+ *   mount({ someValue: 'hello' }, { someProp: 'world' });
+ *   unmount();
+ * });
+ */
+import { resetContext, LogicWrapper } from 'kea';
+
+type LogicFile = LogicWrapper<any>;
+
+export class LogicMounter {
+  private logicFile: LogicFile;
+  private unmountFn!: Function;
+
+  constructor(logicFile: LogicFile) {
+    this.logicFile = logicFile;
+  }
+
+  // Reset context with optional default value overrides
+  public resetContext = (values?: object, props?: object) => {
+    if (!values || !Object.keys(values).length) {
+      resetContext({});
+    } else {
+      let { path, key } = this.logicFile.inputs[0];
+
+      // For keyed logic files, both key and path should be functions
+      if (this.logicFile._isKeaWithKey) {
+        key = key(props);
+        path = path(key);
+      }
+
+      // Generate the correct nested defaults obj based on the file path
+      // example path: ['x', 'y', 'z']
+      // example defaults: { x: { y: { z: values } } }
+      const defaults = path.reduceRight(
+        (value: object, name: string) => ({ [name]: value }),
+        values
+      );
+      resetContext({ defaults });
+    }
+  };
+
+  // Automatically reset context & mount the logic file
+  public mount = (values?: object, props?: object) => {
+    this.resetContext(values, props);
+
+    const logicWithProps = this.logicFile.build(props);
+    this.unmountFn = logicWithProps.mount();
+
+    return logicWithProps;
+    // NOTE: Unlike kea's mount(), this returns the current
+    // built logic instance with props, NOT the unmount fn
+  };
+
+  // Also add unmount as a class method that can be destructured on init without becoming stale later
+  public unmount = () => {
+    this.unmountFn();
+  };
+
+  /**
+   * Some tests (e.g. async tests, tests that expect thrown errors) need to access
+   * listener functions directly instead of calling `SomeLogic.actions.someListener`,
+   * due to how Kea invokes/wraps action fns by design.
+   *
+   * Example usage:
+   *
+   * const { mount, getListeners } = new LogicMounter(SomeLogic);
+   *
+   * it('some test', async () => {
+   *   mount();
+   *   const { someListener } = getListeners({ values: { someMockValue: false } });
+   *
+   *   const mockBreakpoint = jest.fn();
+   *   await someListener({ someMockArgument: true }, mockBreakpoint);
+   * });
+   */
+  public getListeners = (listenersArgs: object = {}) => {
+    const { listeners } = this.logicFile.inputs[0];
+
+    return typeof listeners === 'function'
+      ? listeners(listenersArgs) // e.g., listeners({ values, actions, props }) => ({ ... })
+      : listeners; // handles simpler logic files that just define listeners: { ... }
+  };
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/telemetry_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/telemetry_logic.mock.ts
similarity index 82%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/telemetry_logic.mock.ts
rename to x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/telemetry_logic.mock.ts
index 01b2e7cf103fb..fbc1537e733e7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/telemetry_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/kea_logic/telemetry_logic.mock.ts
@@ -12,7 +12,7 @@ export const mockTelemetryActions = {
   sendWorkplaceSearchTelemetry: jest.fn(),
 };
 
-jest.mock('../shared/telemetry', () => ({
-  ...(jest.requireActual('../shared/telemetry') as object),
+jest.mock('../../shared/telemetry', () => ({
+  ...(jest.requireActual('../../shared/telemetry') as object),
   TelemetryLogic: { actions: mockTelemetryActions },
 }));
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_async.mock.tsx b/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_async.mock.tsx
deleted file mode 100644
index 886effcd54057..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_async.mock.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { mountWithIntl } from './mount_with_i18n.mock';
-
-import React from 'react';
-
-import { mount, ReactWrapper } from 'enzyme';
-import { act } from 'react-dom/test-utils';
-
-/**
- * This helper is intended for components that have async effects
- * (e.g. http fetches) on mount. It mostly adds act/update boilerplate
- * that's needed for the wrapper to play nice with Enzyme/Jest
- *
- * Example usage:
- *
- * const wrapper = mountAsync(<Component />);
- */
-
-interface Options {
-  i18n?: boolean;
-}
-
-export const mountAsync = async (
-  children: React.ReactElement,
-  options: Options
-): Promise<ReactWrapper> => {
-  let wrapper: ReactWrapper | undefined;
-
-  // We get a lot of act() warning/errors in the terminal without this.
-  // TBH, I don't fully understand why since Enzyme's mount is supposed to
-  // have act() baked in - could be because of the wrapping context provider?
-  await act(async () => {
-    wrapper = options.i18n ? mountWithIntl(children) : mount(children);
-  });
-  if (wrapper) {
-    wrapper.update(); // This seems to be required for the DOM to actually update
-
-    return wrapper;
-  } else {
-    throw new Error('Could not mount wrapper');
-  }
-};
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/hooks.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/hooks.mock.ts
new file mode 100644
index 0000000000000..5e867da7607fe
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/hooks.mock.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 { mockHistory, mockLocation } from './state.mock';
+
+export const mockUseHistory = jest.fn(() => mockHistory);
+export const mockUseLocation = jest.fn(() => mockLocation);
+export const mockUseParams = jest.fn(() => ({}));
+export const mockUseRouteMatch = jest.fn(() => true);
+
+jest.mock('react-router-dom', () => {
+  const originalModule = jest.requireActual('react-router-dom');
+  return {
+    ...originalModule,
+    useHistory: mockUseHistory,
+    useLocation: mockUseLocation,
+    useParams: mockUseParams,
+    useRouteMatch: mockUseRouteMatch,
+    // Note: RR's generatePath() opinionatedly encodeURI()s paths (although this doesn't actually
+    // show up/affect the final browser URL). Since we already have a generateEncodedPath helper &
+    // RR is removing this behavior in history 5.0+, I'm mocking tests to remove the extra encoding
+    // for now to make reading generateEncodedPath URLs a little less of a pain
+    generatePath: jest.fn((path, params) => decodeURI(originalModule.generatePath(path, params))),
+  };
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/index.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/index.ts
new file mode 100644
index 0000000000000..0bf83135407b3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/index.ts
@@ -0,0 +1,13 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// State and hooks are stored in separate mock files for when a file needs to
+// import a basic history mock without automatically jest.mock()ing all of React Router
+export * from './state.mock';
+export * from './hooks.mock';
+
+// For example usage, @see public/applications/shared/react_router_helpers/eui_link.test.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/state.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/state.mock.ts
new file mode 100644
index 0000000000000..0ce8673530b00
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router/state.mock.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/**
+ * NOTE: These variable names MUST start with 'mock*' in order for
+ * Jest to accept its use within a jest.mock()
+ */
+
+export const mockHistory = {
+  createHref: jest.fn(({ pathname }) => `/app/enterprise_search${pathname}`),
+  push: jest.fn(),
+  location: {
+    pathname: '/current-path',
+  },
+  listen: jest.fn(() => jest.fn()),
+} as any;
+
+export const mockLocation = {
+  key: 'someKey',
+  pathname: '/current-path',
+  search: '?query=something',
+  hash: '#hash',
+  state: {},
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router_history.mock.ts b/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router_history.mock.ts
deleted file mode 100644
index 8f0c63d46c8e7..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/__mocks__/react_router_history.mock.ts
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/**
- * NOTE: These variable names MUST start with 'mock*' in order for
- * Jest to accept its use within a jest.mock()
- */
-export const mockHistory = {
-  createHref: jest.fn(({ pathname }) => `/app/enterprise_search${pathname}`),
-  push: jest.fn(),
-  location: {
-    pathname: '/current-path',
-  },
-  listen: jest.fn(() => jest.fn()),
-} as any;
-export const mockLocation = {
-  key: 'someKey',
-  pathname: '/current-path',
-  search: '?query=something',
-  hash: '#hash',
-  state: {},
-};
-
-jest.mock('react-router-dom', () => {
-  const originalModule = jest.requireActual('react-router-dom');
-  return {
-    ...originalModule,
-    useHistory: jest.fn(() => mockHistory),
-    useLocation: jest.fn(() => mockLocation),
-    useParams: jest.fn(() => ({})),
-    useRouteMatch: jest.fn(() => null),
-    // Note: RR's generatePath() opinionatedly encodeURI()s paths (although this doesn't actually
-    // show up/affect the final browser URL). Since we already have a generateEncodedPath helper &
-    // RR is removing this behavior in history 5.0+, I'm mocking tests to remove the extra encoding
-    // for now to make reading generateEncodedPath URLs a little less of a pain
-    generatePath: jest.fn((path, params) => decodeURI(originalModule.generatePath(path, params))),
-  };
-});
-
-/**
- * For example usage, @see public/applications/shared/react_router_helpers/eui_link.test.tsx
- */
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/__mocks__/engine_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/__mocks__/engine_logic.mock.ts
index d16391089120a..23d638d5f25f3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/__mocks__/engine_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/__mocks__/engine_logic.mock.ts
@@ -12,6 +12,7 @@ import { generateEncodedPath } from '../utils/encode_path_params';
 export const mockEngineValues = {
   engineName: 'some-engine',
   engine: {} as EngineDetails,
+  searchKey: 'search-abc123',
 };
 
 export const mockEngineActions = {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.test.ts
index f6497e5f5266b..7b08e82a4cf20 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/app_logic.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../common/__mocks__';
-import { LogicMounter } from '../__mocks__';
+import { LogicMounter } from '../__mocks__/kea_logic';
 
 import { AppLogic } from './app_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.test.tsx
index 291df04746418..9832915f19e9e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/analytics_layout.test.tsx
@@ -6,16 +6,16 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import '../../../__mocks__/react_router_history.mock';
-import { mockKibanaValues, setMockValues, setMockActions, rerender } from '../../../__mocks__';
+import { mockKibanaValues, setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
+import { mockUseParams } from '../../../__mocks__/react_router';
 
 import React from 'react';
-import { useParams } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
 import { FlashMessages } from '../../../shared/flash_messages';
 import { Loading } from '../../../shared/loading';
+import { rerender } from '../../../test_helpers';
 import { LogRetentionCallout } from '../log_retention';
 
 import { AnalyticsLayout } from './analytics_layout';
@@ -63,7 +63,7 @@ describe('AnalyticsLayout', () => {
 
   describe('data loading', () => {
     it('loads query data for query details pages', () => {
-      (useParams as jest.Mock).mockReturnValueOnce({ query: 'test' });
+      mockUseParams.mockReturnValueOnce({ query: 'test' });
       shallow(<AnalyticsLayout isQueryView title="" />);
 
       expect(actions.loadQueryData).toHaveBeenCalledWith('test');
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 3359143ad3672..921a0892bb890 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
@@ -10,7 +10,7 @@ import {
   mockKibanaValues,
   mockHttpValues,
   mockFlashMessageHelpers,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 
 jest.mock('../engine', () => ({
   EngineLogic: { values: { engineName: 'test-engine' } },
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 51238d62bdac7..8a5d2cbf89c4a 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockKibanaValues } from '../../../../__mocks__';
+import { mockKibanaValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_header.test.tsx
index 952c4c2517a0e..5269ea9110065 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_header.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, mockKibanaValues } from '../../../../__mocks__';
+import { setMockValues, mockKibanaValues } from '../../../../__mocks__/kea_logic';
 
 import React, { ReactElement } from 'react';
 
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 89fa5b4cc4b73..de04a21d48a23 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
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { mockKibanaValues } from '../../../../__mocks__';
+import { mockKibanaValues } from '../../../../__mocks__/kea_logic';
+import '../../../../__mocks__/react_router';
 import '../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
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 624cc57e1eb22..e25e4d8c16bb2 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
@@ -5,13 +5,16 @@
  * 2.0.
  */
 
-import { mountWithIntl } from '../../../../../__mocks__';
+import '../../../../../__mocks__/kea_logic';
+import '../../../../../__mocks__/react_router';
 import '../../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
 
 import { EuiBasicTable, EuiBadge, EuiEmptyPrompt } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../../test_helpers';
+
 import { runActionColumnTests } from './test_helpers/shared_columns_tests';
 
 import { AnalyticsTable } from './';
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 cc8f13299c57f..00cb12060822e 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
@@ -5,13 +5,16 @@
  * 2.0.
  */
 
-import { mountWithIntl } from '../../../../../__mocks__';
+import '../../../../../__mocks__/kea_logic';
+import '../../../../../__mocks__/react_router';
 import '../../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
 
 import { EuiBasicTable, EuiLink, EuiBadge, EuiEmptyPrompt } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../../test_helpers';
+
 import { QueryClicksTable } from './';
 
 describe('QueryClicksTable', () => {
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 6021363183098..6ec89751a62e9 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
@@ -5,13 +5,16 @@
  * 2.0.
  */
 
-import { mountWithIntl } from '../../../../../__mocks__';
+import '../../../../../__mocks__/kea_logic';
+import '../../../../../__mocks__/react_router';
 import '../../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
 
 import { EuiBasicTable, EuiBadge, EuiEmptyPrompt } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../../test_helpers';
+
 import { runActionColumnTests } from './test_helpers/shared_columns_tests';
 
 import { RecentQueriesTable } from './';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/test_helpers/shared_columns_tests.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/test_helpers/shared_columns_tests.tsx
index 95af7b52487d4..cb3d340debd04 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/test_helpers/shared_columns_tests.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/components/analytics_tables/test_helpers/shared_columns_tests.tsx
@@ -9,7 +9,7 @@ import {
   mockHttpValues,
   mockKibanaValues,
   mockFlashMessageHelpers,
-} from '../../../../../../__mocks__';
+} from '../../../../../../__mocks__/kea_logic';
 import '../../../../../__mocks__/engine_logic.mock';
 
 import { ReactWrapper } from 'enzyme';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.test.tsx
index 688d5dec1a958..8496be6223764 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/analytics/views/analytics.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 import '../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
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 978f11ddfd5cd..a942918fa9c62 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
@@ -5,11 +5,10 @@
  * 2.0.
  */
 
-import '../../../../__mocks__/react_router_history.mock';
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
+import { mockUseParams } from '../../../../__mocks__/react_router';
 
 import React from 'react';
-import { useParams } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
@@ -24,7 +23,7 @@ describe('QueryDetail', () => {
   const mockBreadcrumbs = ['Engines', 'some-engine', 'Analytics'];
 
   beforeEach(() => {
-    (useParams as jest.Mock).mockReturnValue({ query: 'some-query' });
+    mockUseParams.mockReturnValue({ query: 'some-query' });
 
     setMockValues({
       totalQueriesForQuery: 100,
@@ -50,7 +49,7 @@ describe('QueryDetail', () => {
   });
 
   it('renders empty "" search titles correctly', () => {
-    (useParams as jest.Mock).mockReturnValue({ query: '""' });
+    mockUseParams.mockReturnValue({ query: '""' });
     const wrapper = shallow(<QueryDetail breadcrumbs={mockBreadcrumbs} />);
 
     expect(wrapper.find(AnalyticsLayout).prop('title')).toEqual('""');
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 21d515a7b9795..20a25db3a7adf 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 46b2b37958435..98362e42c5536 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 83212160d1350..dfbda1c68ca84 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 dfc5b9c93ab64..60e33660f87d7 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 fb967ca06b387..b4c9f0fb40f71 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.test.tsx
index 6bebeee80465c..3ff22479f4013 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/api_logs/api_log/api_log_flyout.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import { mockApiLog } from '../__mocks__/api_log.mock';
 
 import React from 'react';
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 2b7ca7510e8e1..e0d7c30bd0141 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter } from '../../../../__mocks__';
+import { LogicMounter } from '../../../../__mocks__/kea_logic';
 import { mockApiLog } from '../__mocks__/api_log.mock';
 
 import { ApiLogLogic } from './';
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 cb29d92030ad7..c2a11ec06fa6a 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions, rerender } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 import '../../../__mocks__/shallow_useeffect.mock';
 import '../../__mocks__/engine_logic.mock';
 
@@ -16,6 +16,7 @@ import { shallow } from 'enzyme';
 import { EuiPageHeader } from '@elastic/eui';
 
 import { Loading } from '../../../shared/loading';
+import { rerender } from '../../../test_helpers';
 import { LogRetentionCallout, LogRetentionTooltip } from '../log_retention';
 
 import { ApiLogsTable, NewApiEventsPrompt } from './components';
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 2eda4c6323fa5..5af5dca3e97dc 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
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues, mockFlashMessageHelpers } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
 import { mockApiLog } from './__mocks__/api_log.mock';
 import '../../__mocks__/engine_logic.mock';
 
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 780c198a9fac5..2a00cc6eb42bb 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions, mountWithIntl } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 // NOTE: We're mocking FormattedRelative here because it (currently) has
 // console warn issues, and it allows us to skip mocking dates
@@ -21,6 +21,7 @@ import { shallow } from 'enzyme';
 import { EuiBasicTable, EuiBadge, EuiHealth, EuiButtonEmpty, EuiEmptyPrompt } from '@elastic/eui';
 
 import { DEFAULT_META } from '../../../../shared/constants';
+import { mountWithIntl } from '../../../../test_helpers';
 
 import { ApiLogsTable } from './';
 
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 91d1962cd91db..5fd1d12f24842 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/assets/bg_crawler_landing.png b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/assets/bg_crawler_landing.png
new file mode 100644
index 0000000000000..e1f14ac26f353
Binary files /dev/null and b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/assets/bg_crawler_landing.png differ
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/constants.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/constants.ts
index 0c1bf051747b5..7e95bf8fb8e45 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/constants.ts
@@ -9,5 +9,5 @@ import { i18n } from '@kbn/i18n';
 
 export const CRAWLER_TITLE = i18n.translate(
   'xpack.enterpriseSearch.appSearch.engine.crawler.title',
-  { defaultMessage: 'Crawler' }
+  { defaultMessage: 'Web Crawler' }
 );
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.scss b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.scss
new file mode 100644
index 0000000000000..3ace4064008b6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.scss
@@ -0,0 +1,13 @@
+.crawlerLanding {
+  &__panel {
+    overflow: hidden;
+    background-image: url('./assets/bg_crawler_landing.png');
+    background-size: 45%;
+    background-repeat: no-repeat;
+    background-position: right -2rem;
+  }
+
+  &__wrapper {
+    max-width: 50rem;
+  }
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.test.tsx
new file mode 100644
index 0000000000000..045fd9ee7be1b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.test.tsx
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { setMockValues } from '../../../__mocks__/kea_logic';
+import { mockEngineValues } from '../../__mocks__';
+
+import React from 'react';
+
+import { shallow, ShallowWrapper } from 'enzyme';
+
+import { docLinks } from '../../../shared/doc_links';
+
+import { CrawlerLanding } from './crawler_landing';
+
+describe('CrawlerLanding', () => {
+  let wrapper: ShallowWrapper;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues({ ...mockEngineValues });
+    wrapper = shallow(<CrawlerLanding />);
+  });
+
+  it('contains an external documentation link', () => {
+    const externalDocumentationLink = wrapper.find('[data-test-subj="CrawlerDocumentationLink"]');
+
+    expect(externalDocumentationLink.prop('href')).toBe(
+      `${docLinks.appSearchBase}/web-crawler.html`
+    );
+  });
+
+  it('contains a link to standalone App Search', () => {
+    const externalDocumentationLink = wrapper.find('[data-test-subj="CrawlerStandaloneLink"]');
+
+    expect(externalDocumentationLink.prop('href')).toBe('/as/engines/some-engine/crawler');
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx
new file mode 100644
index 0000000000000..a2993b4d86d5a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_landing.tsx
@@ -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 React from 'react';
+
+import {
+  EuiButton,
+  EuiLink,
+  EuiPageHeader,
+  EuiPanel,
+  EuiSpacer,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { getAppSearchUrl } from '../../../shared/enterprise_search_url';
+import { DOCS_PREFIX, ENGINE_CRAWLER_PATH } from '../../routes';
+import { generateEnginePath } from '../engine';
+
+import './crawler_landing.scss';
+import { CRAWLER_TITLE } from '.';
+
+export const CrawlerLanding: React.FC = () => (
+  <div data-test-subj="CrawlerLanding" className="crawlerLanding">
+    <EuiPageHeader pageTitle={CRAWLER_TITLE} />
+    <EuiSpacer />
+    <EuiPanel grow paddingSize="l" className="crawlerLanding__panel">
+      <div className="crawlerLanding__wrapper">
+        <EuiTitle size="s">
+          <h2>
+            {i18n.translate('xpack.enterpriseSearch.appSearch.engine.crawler.landingPage.title', {
+              defaultMessage: 'Setup the Web Crawler',
+            })}
+          </h2>
+        </EuiTitle>
+        <EuiSpacer />
+        <EuiText>
+          <p>
+            {i18n.translate(
+              'xpack.enterpriseSearch.appSearch.engine.crawler.landingPage.description',
+              {
+                defaultMessage:
+                  "Easily index your website's content. To get started, enter your domain name, provide optional entry points and crawl rules, and we will handle the rest.",
+              }
+            )}{' '}
+            <EuiLink
+              target="_blank"
+              href={`${DOCS_PREFIX}/web-crawler.html`}
+              data-test-subj="CrawlerDocumentationLink"
+            >
+              {i18n.translate(
+                'xpack.enterpriseSearch.appSearch.engine.crawler.landingPage.documentationLinkLabel',
+                {
+                  defaultMessage: 'Learn more about the web crawler.',
+                }
+              )}
+            </EuiLink>
+          </p>
+        </EuiText>
+        <EuiSpacer />
+        <EuiButton
+          iconType="popout"
+          fill
+          color="primary"
+          href={getAppSearchUrl(generateEnginePath(ENGINE_CRAWLER_PATH))}
+          target="_blank"
+          data-test-subj="CrawlerStandaloneLink"
+        >
+          {i18n.translate(
+            'xpack.enterpriseSearch.appSearch.engine.crawler.landingPage.standaloneLinkLabel',
+            {
+              defaultMessage: 'Configure the web crawler',
+            }
+          )}
+        </EuiButton>
+        <EuiSpacer size="xl" />
+      </div>
+    </EuiPanel>
+  </div>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview.test.tsx
new file mode 100644
index 0000000000000..cc3fa21f73309
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview.test.tsx
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
+import '../../../__mocks__/shallow_useeffect.mock';
+
+import React from 'react';
+
+import { shallow, ShallowWrapper } from 'enzyme';
+
+import { EuiCode } from '@elastic/eui';
+
+import { Loading } from '../../../shared/loading';
+import { rerender } from '../../../test_helpers';
+
+import { CrawlerOverview } from './crawler_overview';
+
+const actions = {
+  fetchCrawlerData: jest.fn(),
+};
+
+const values = {
+  dataLoading: false,
+  domains: [],
+};
+
+describe('CrawlerOverview', () => {
+  let wrapper: ShallowWrapper;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues(values);
+    setMockActions(actions);
+    wrapper = shallow(<CrawlerOverview />);
+  });
+
+  it('renders', () => {
+    expect(wrapper.find(EuiCode)).toHaveLength(1);
+  });
+
+  it('calls fetchCrawlerData on page load', () => {
+    expect(actions.fetchCrawlerData).toHaveBeenCalledTimes(1);
+  });
+
+  // TODO after DomainsTable is built in a future PR
+  // it('contains a DomainsTable', () => {})
+
+  // TODO after CrawlRequestsTable is built in a future PR
+  // it('containss a CrawlRequestsTable,() => {})
+
+  // TODO after AddDomainForm is built in a future PR
+  // it('contains an AddDomainForm' () => {})
+
+  // TODO after empty state is added in a future PR
+  // it('has an empty state',  () => {} )
+
+  it('shows an empty state when data is loading', () => {
+    setMockValues({ dataLoading: true });
+    rerender(wrapper);
+
+    expect(wrapper.find(Loading)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview.tsx
new file mode 100644
index 0000000000000..5eeaaaef69605
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview.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 React, { useEffect } from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import { EuiCode, EuiPageHeader } from '@elastic/eui';
+
+import { FlashMessages } from '../../../shared/flash_messages';
+
+import { Loading } from '../../../shared/loading';
+
+import { CRAWLER_TITLE } from './constants';
+import { CrawlerOverviewLogic } from './crawler_overview_logic';
+
+export const CrawlerOverview: React.FC = () => {
+  const { dataLoading, domains } = useValues(CrawlerOverviewLogic);
+
+  const { fetchCrawlerData } = useActions(CrawlerOverviewLogic);
+
+  useEffect(() => {
+    fetchCrawlerData();
+  }, []);
+
+  if (dataLoading) {
+    return <Loading />;
+  }
+
+  return (
+    <>
+      <EuiPageHeader pageTitle={CRAWLER_TITLE} />
+      <FlashMessages />
+      <EuiCode language="json">{JSON.stringify(domains, null, 2)}</EuiCode>
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.test.ts
new file mode 100644
index 0000000000000..f23322337766a
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.test.ts
@@ -0,0 +1,125 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
+import '../../__mocks__/engine_logic.mock';
+
+import { nextTick } from '@kbn/test/jest';
+
+import { CrawlerOverviewLogic } from './crawler_overview_logic';
+import { CrawlerPolicies, CrawlerRules, CrawlRule } from './types';
+
+const DEFAULT_VALUES = {
+  dataLoading: true,
+  domains: [],
+};
+
+const DEFAULT_CRAWL_RULE: CrawlRule = {
+  id: '-',
+  policy: CrawlerPolicies.allow,
+  rule: CrawlerRules.regex,
+  pattern: '.*',
+};
+
+describe('CrawlerOverviewLogic', () => {
+  const { mount } = new LogicMounter(CrawlerOverviewLogic);
+  const { http } = mockHttpValues;
+  const { flashAPIErrors } = mockFlashMessageHelpers;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    mount();
+  });
+
+  it('has expected default values', () => {
+    expect(CrawlerOverviewLogic.values).toEqual(DEFAULT_VALUES);
+  });
+
+  describe('actions', () => {
+    describe('onFetchCrawlerData', () => {
+      const crawlerData = {
+        domains: [
+          {
+            id: '507f1f77bcf86cd799439011',
+            createdOn: 'Mon, 31 Aug 2020 17:00:00 +0000',
+            url: 'moviedatabase.com',
+            documentCount: 13,
+            sitemaps: [],
+            entryPoints: [],
+            crawlRules: [],
+            defaultCrawlRule: DEFAULT_CRAWL_RULE,
+          },
+        ],
+      };
+
+      beforeEach(() => {
+        CrawlerOverviewLogic.actions.onFetchCrawlerData(crawlerData);
+      });
+
+      it('should set all received data as top-level values', () => {
+        expect(CrawlerOverviewLogic.values.domains).toEqual(crawlerData.domains);
+      });
+
+      it('should set dataLoading to false', () => {
+        expect(CrawlerOverviewLogic.values.dataLoading).toEqual(false);
+      });
+    });
+  });
+
+  describe('listeners', () => {
+    describe('fetchCrawlerData', () => {
+      it('calls onFetchCrawlerData with retrieved data that has been converted from server to client', async () => {
+        jest.spyOn(CrawlerOverviewLogic.actions, 'onFetchCrawlerData');
+
+        http.get.mockReturnValue(
+          Promise.resolve({
+            domains: [
+              {
+                id: '507f1f77bcf86cd799439011',
+                name: 'moviedatabase.com',
+                created_on: 'Mon, 31 Aug 2020 17:00:00 +0000',
+                document_count: 13,
+                sitemaps: [],
+                entry_points: [],
+                crawl_rules: [],
+              },
+            ],
+          })
+        );
+        CrawlerOverviewLogic.actions.fetchCrawlerData();
+        await nextTick();
+
+        expect(http.get).toHaveBeenCalledWith('/api/app_search/engines/some-engine/crawler');
+        expect(CrawlerOverviewLogic.actions.onFetchCrawlerData).toHaveBeenCalledWith({
+          domains: [
+            {
+              id: '507f1f77bcf86cd799439011',
+              createdOn: 'Mon, 31 Aug 2020 17:00:00 +0000',
+              url: 'moviedatabase.com',
+              documentCount: 13,
+              sitemaps: [],
+              entryPoints: [],
+              crawlRules: [],
+            },
+          ],
+        });
+      });
+
+      it('calls flashApiErrors when there is an error', async () => {
+        http.get.mockReturnValue(Promise.reject('error'));
+        CrawlerOverviewLogic.actions.fetchCrawlerData();
+        await nextTick();
+
+        expect(flashAPIErrors).toHaveBeenCalledWith('error');
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.ts
new file mode 100644
index 0000000000000..6f04ade5962eb
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_overview_logic.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 { kea, MakeLogicType } from 'kea';
+
+import { flashAPIErrors } from '../../../shared/flash_messages';
+
+import { HttpLogic } from '../../../shared/http';
+import { EngineLogic } from '../engine';
+
+import { CrawlerData, CrawlerDataFromServer, CrawlerDomain } from './types';
+import { crawlerDataServerToClient } from './utils';
+
+interface CrawlerOverviewValues {
+  dataLoading: boolean;
+  domains: CrawlerDomain[];
+}
+
+interface CrawlerOverviewActions {
+  fetchCrawlerData(): void;
+  onFetchCrawlerData(data: CrawlerData): { data: CrawlerData };
+}
+
+export const CrawlerOverviewLogic = kea<
+  MakeLogicType<CrawlerOverviewValues, CrawlerOverviewActions>
+>({
+  path: ['enterprise_search', 'app_search', 'crawler', 'crawler_overview'],
+  actions: {
+    fetchCrawlerData: true,
+    onFetchCrawlerData: (data) => ({ data }),
+  },
+  reducers: {
+    dataLoading: [
+      true,
+      {
+        onFetchCrawlerData: () => false,
+      },
+    ],
+    domains: [
+      [],
+      {
+        onFetchCrawlerData: (_, { data: { domains } }) => domains,
+      },
+    ],
+  },
+  listeners: ({ actions }) => ({
+    fetchCrawlerData: async () => {
+      const { http } = HttpLogic.values;
+      const { engineName } = EngineLogic.values;
+
+      try {
+        const response = await http.get(`/api/app_search/engines/${engineName}/crawler`);
+        const crawlerData = crawlerDataServerToClient(response as CrawlerDataFromServer);
+        actions.onFetchCrawlerData(crawlerData);
+      } catch (e) {
+        flashAPIErrors(e);
+      }
+    },
+  }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_router.test.tsx
new file mode 100644
index 0000000000000..c11c656333010
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_router.test.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { setMockValues } from '../../../__mocks__/kea_logic';
+import { mockEngineValues } from '../../__mocks__';
+
+import React from 'react';
+import { Switch } from 'react-router-dom';
+
+import { shallow } from 'enzyme';
+
+import { CrawlerLanding } from './crawler_landing';
+import { CrawlerOverview } from './crawler_overview';
+import { CrawlerRouter } from './crawler_router';
+
+describe('CrawlerRouter', () => {
+  const OLD_ENV = process.env;
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues({ ...mockEngineValues });
+  });
+
+  afterEach(() => {
+    process.env = OLD_ENV;
+  });
+
+  it('renders a landing page by default', () => {
+    const wrapper = shallow(<CrawlerRouter />);
+
+    expect(wrapper.find(Switch)).toHaveLength(1);
+    expect(wrapper.find(CrawlerLanding)).toHaveLength(1);
+  });
+
+  it('renders a crawler overview in dev', () => {
+    process.env.NODE_ENV = 'development';
+    const wrapper = shallow(<CrawlerRouter />);
+
+    expect(wrapper.find(CrawlerOverview)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_router.tsx
new file mode 100644
index 0000000000000..926c45b437937
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/crawler_router.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 React from 'react';
+import { Route, Switch } from 'react-router-dom';
+
+import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
+
+import { getEngineBreadcrumbs } from '../engine';
+
+import { CRAWLER_TITLE } from './constants';
+import { CrawlerLanding } from './crawler_landing';
+import { CrawlerOverview } from './crawler_overview';
+
+export const CrawlerRouter: React.FC = () => {
+  return (
+    <Switch>
+      <Route>
+        <SetPageChrome trail={getEngineBreadcrumbs([CRAWLER_TITLE])} />
+        {process.env.NODE_ENV === 'development' ? <CrawlerOverview /> : <CrawlerLanding />}
+      </Route>
+    </Switch>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/index.ts
index edb7e43aee35e..58fb0a7cebb1a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/index.ts
@@ -6,3 +6,4 @@
  */
 
 export { CRAWLER_TITLE } from './constants';
+export { CrawlerRouter } from './crawler_router';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
new file mode 100644
index 0000000000000..f895e8f01e399
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/types.ts
@@ -0,0 +1,67 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export enum CrawlerPolicies {
+  allow = 'allow',
+  deny = 'deny',
+}
+
+export enum CrawlerRules {
+  beginsWith = 'begins',
+  endsWith = 'ends',
+  contains = 'contains',
+  regex = 'regex',
+}
+
+export interface CrawlRule {
+  id: string;
+  policy: CrawlerPolicies;
+  rule: CrawlerRules;
+  pattern: string;
+}
+
+export interface EntryPoint {
+  id: string;
+  value: string;
+}
+
+export interface Sitemap {
+  id: string;
+  url: string;
+}
+
+export interface CrawlerDomain {
+  createdOn: string;
+  documentCount: number;
+  id: string;
+  lastCrawl?: string;
+  url: string;
+  crawlRules: CrawlRule[];
+  defaultCrawlRule?: CrawlRule;
+  entryPoints: EntryPoint[];
+  sitemaps: Sitemap[];
+}
+
+export interface CrawlerDomainFromServer {
+  id: string;
+  name: string;
+  created_on: string;
+  last_visited_at?: string;
+  document_count: number;
+  crawl_rules: CrawlRule[];
+  default_crawl_rule?: CrawlRule;
+  entry_points: EntryPoint[];
+  sitemaps: Sitemap[];
+}
+
+export interface CrawlerData {
+  domains: CrawlerDomain[];
+}
+
+export interface CrawlerDataFromServer {
+  domains: CrawlerDomainFromServer[];
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.test.ts
new file mode 100644
index 0000000000000..6e2dd7c826b70
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.test.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 { CrawlerPolicies, CrawlerRules, CrawlRule, CrawlerDomainFromServer } from './types';
+
+import { crawlerDomainServerToClient, crawlerDataServerToClient } from './utils';
+
+const DEFAULT_CRAWL_RULE: CrawlRule = {
+  id: '-',
+  policy: CrawlerPolicies.allow,
+  rule: CrawlerRules.regex,
+  pattern: '.*',
+};
+
+describe('crawlerDomainServerToClient', () => {
+  it('converts the API payload into properties matching our code style', () => {
+    const id = '507f1f77bcf86cd799439011';
+    const name = 'moviedatabase.com';
+
+    const defaultServerPayload = {
+      id,
+      name,
+      created_on: 'Mon, 31 Aug 2020 17:00:00 +0000',
+      document_count: 13,
+      sitemaps: [],
+      entry_points: [],
+      crawl_rules: [],
+    };
+
+    const defaultClientPayload = {
+      id,
+      createdOn: 'Mon, 31 Aug 2020 17:00:00 +0000',
+      url: name,
+      documentCount: 13,
+      sitemaps: [],
+      entryPoints: [],
+      crawlRules: [],
+    };
+
+    expect(crawlerDomainServerToClient(defaultServerPayload)).toStrictEqual(defaultClientPayload);
+    expect(
+      crawlerDomainServerToClient({
+        ...defaultServerPayload,
+        last_visited_at: 'Mon, 31 Aug 2020 17:00:00 +0000',
+      })
+    ).toStrictEqual({ ...defaultClientPayload, lastCrawl: 'Mon, 31 Aug 2020 17:00:00 +0000' });
+    expect(
+      crawlerDomainServerToClient({
+        ...defaultServerPayload,
+        default_crawl_rule: DEFAULT_CRAWL_RULE,
+      })
+    ).toStrictEqual({ ...defaultClientPayload, defaultCrawlRule: DEFAULT_CRAWL_RULE });
+  });
+});
+
+describe('crawlerDataServerToClient', () => {
+  it('converts all domains from the server form to their client form', () => {
+    const domains: CrawlerDomainFromServer[] = [
+      {
+        id: 'x',
+        name: 'moviedatabase.com',
+        document_count: 13,
+        created_on: 'Mon, 31 Aug 2020 17:00:00 +0000',
+        sitemaps: [],
+        entry_points: [],
+        crawl_rules: [],
+        default_crawl_rule: DEFAULT_CRAWL_RULE,
+      },
+      {
+        id: 'y',
+        name: 'swiftype.com',
+        last_visited_at: 'Mon, 31 Aug 2020 17:00:00 +0000',
+        document_count: 40,
+        created_on: 'Mon, 31 Aug 2020 17:00:00 +0000',
+        sitemaps: [],
+        entry_points: [],
+        crawl_rules: [],
+      },
+    ];
+
+    const output = crawlerDataServerToClient({
+      domains,
+    });
+
+    expect(output.domains).toHaveLength(2);
+    expect(output.domains[0]).toEqual(crawlerDomainServerToClient(domains[0]));
+    expect(output.domains[1]).toEqual(crawlerDomainServerToClient(domains[1]));
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.ts
new file mode 100644
index 0000000000000..e89c549261fca
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/crawler/utils.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 {
+  CrawlerDomain,
+  CrawlerDomainFromServer,
+  CrawlerData,
+  CrawlerDataFromServer,
+} from './types';
+
+export function crawlerDomainServerToClient(payload: CrawlerDomainFromServer): CrawlerDomain {
+  const {
+    id,
+    name,
+    sitemaps,
+    created_on: createdOn,
+    last_visited_at: lastCrawl,
+    document_count: documentCount,
+    crawl_rules: crawlRules,
+    default_crawl_rule: defaultCrawlRule,
+    entry_points: entryPoints,
+  } = payload;
+
+  const clientPayload: CrawlerDomain = {
+    id,
+    url: name,
+    documentCount,
+    createdOn,
+    crawlRules,
+    sitemaps,
+    entryPoints,
+  };
+
+  if (lastCrawl) {
+    clientPayload.lastCrawl = lastCrawl;
+  }
+
+  if (defaultCrawlRule) {
+    clientPayload.defaultCrawlRule = defaultCrawlRule;
+  }
+
+  return clientPayload;
+}
+
+export function crawlerDataServerToClient(payload: CrawlerDataFromServer): CrawlerData {
+  const { domains } = payload;
+
+  return {
+    domains: domains.map((domain) => crawlerDomainServerToClient(domain)),
+  };
+}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.test.tsx
index 3785873461f16..286658c011002 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 import { unmountHandler } from '../../../__mocks__/shallow_useeffect.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/body.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/body.test.tsx
index 595bc1bcbb828..1ca6c0ce82855 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/body.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/body.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.test.tsx
index 23e85b92bb8b4..d3312b5a1e369 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/footer.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_engine_access.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_engine_access.test.tsx
index 7247deb09f12b..d39ffb2bea206 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_engine_access.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/form_components/key_engine_access.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions, rerender } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -13,6 +13,8 @@ import { shallow } from 'enzyme';
 
 import { EuiRadio, EuiCheckbox } from '@elastic/eui';
 
+import { rerender } from '../../../../../test_helpers';
+
 import { FormKeyEngineAccess, EngineSelection } from './key_engine_access';
 
 describe('FormKeyEngineAccess', () => {
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 d54d0c89c90cb..a206cdef4a737 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 cf45576d691cf..6f52a27dd628d 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 5de2c7fda53ca..9cd518be2aaa5 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/header.test.tsx
index 8ee7f810c1fa5..019a6c7043fb0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_flyout/header.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 9932b8ca227b0..b86c1c592c4cd 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 274bda56a2fc1..13dd77da40931 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_logic.test.ts
index bf84b03e7603e..7192488e49746 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/credentials/credentials_logic.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
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 ad4ba100145d9..937acfd84ce83 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
@@ -5,12 +5,11 @@
  * 2.0.
  */
 
-import '../../../../__mocks__/react_router_history.mock';
 import '../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues, rerender } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
+import { mockUseParams } from '../../../../__mocks__/react_router';
 
 import React from 'react';
-import { useParams } from 'react-router-dom';
 
 import { shallow, ShallowWrapper } from 'enzyme';
 
@@ -18,6 +17,7 @@ import { EuiPageHeader } from '@elastic/eui';
 
 import { SetAppSearchChrome as SetPageChrome } from '../../../../shared/kibana_chrome';
 import { Loading } from '../../../../shared/loading';
+import { rerender } from '../../../../test_helpers';
 
 jest.mock('./curation_logic', () => ({ CurationLogic: jest.fn() }));
 import { CurationLogic } from './curation_logic';
@@ -71,18 +71,18 @@ describe('Curation', () => {
   });
 
   it('initializes CurationLogic with a curationId prop from URL param', () => {
-    (useParams as jest.Mock).mockReturnValueOnce({ curationId: 'hello-world' });
+    mockUseParams.mockReturnValueOnce({ curationId: 'hello-world' });
     shallow(<Curation {...props} />);
 
     expect(CurationLogic).toHaveBeenCalledWith({ curationId: 'hello-world' });
   });
 
   it('calls loadCuration on page load & whenever the curationId URL param changes', () => {
-    (useParams as jest.Mock).mockReturnValueOnce({ curationId: 'cur-123456789' });
+    mockUseParams.mockReturnValueOnce({ curationId: 'cur-123456789' });
     const wrapper = shallow(<Curation {...props} />);
     expect(actions.loadCuration).toHaveBeenCalledTimes(1);
 
-    (useParams as jest.Mock).mockReturnValueOnce({ curationId: 'cur-987654321' });
+    mockUseParams.mockReturnValueOnce({ curationId: 'cur-987654321' });
     rerender(wrapper);
     expect(actions.loadCuration).toHaveBeenCalledTimes(2);
   });
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 17f7cd7cd154e..db387f581b92e 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
@@ -10,7 +10,7 @@ import {
   mockHttpValues,
   mockKibanaValues,
   mockFlashMessageHelpers,
-} from '../../../../__mocks__';
+} from '../../../../__mocks__/kea_logic';
 import '../../../__mocks__/engine_logic.mock';
 
 import { nextTick } from '@kbn/test/jest';
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 7ffa45c285320..c2377d0109494 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 2a83ecfcada44..0624d0063e57d 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 7240a443b76e9..e0c6de973666c 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 65e8dbc96b636..f27c7ef959b50 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 7fe992cdd96e2..1ff34c5875a0c 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 19fc7e1784d3d..53cefdd00c670 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../../__mocks__';
+import { setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 e12267d0eb136..71469e4e3f8cb 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -17,7 +17,7 @@ import { CurationResult, AddResultFlyout } from './';
 
 describe('AddResultFlyout', () => {
   const values = {
-    dataLoading: false,
+    searchDataLoading: false,
     searchQuery: '',
     searchResults: [],
     promotedIds: [],
@@ -48,7 +48,7 @@ describe('AddResultFlyout', () => {
 
   describe('search input', () => {
     it('renders isLoading state correctly', () => {
-      setMockValues({ ...values, dataLoading: true });
+      setMockValues({ ...values, searchDataLoading: true });
       const wrapper = shallow(<AddResultFlyout />);
 
       expect(wrapper.find(EuiFieldSearch).prop('isLoading')).toEqual(true);
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 6363919e32cc9..a20e4e137f899 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
@@ -24,6 +24,7 @@ import { i18n } from '@kbn/i18n';
 
 import { FlashMessages } from '../../../../../shared/flash_messages';
 
+import { SearchLogic } from '../../../search';
 import {
   RESULT_ACTIONS_DIRECTIONS,
   PROMOTE_DOCUMENT_ACTION,
@@ -36,8 +37,10 @@ import { CurationLogic } from '../curation_logic';
 import { AddResultLogic, CurationResult } from './';
 
 export const AddResultFlyout: React.FC = () => {
-  const { searchQuery, searchResults, dataLoading } = useValues(AddResultLogic);
-  const { search, closeFlyout } = useActions(AddResultLogic);
+  const searchLogic = SearchLogic({ id: 'add-results-flyout' });
+  const { searchQuery, searchResults, searchDataLoading } = useValues(searchLogic);
+  const { closeFlyout } = useActions(AddResultLogic);
+  const { search } = useActions(searchLogic);
 
   const { promotedIds, hiddenIds } = useValues(CurationLogic);
   const { addPromotedId, removePromotedId, addHiddenId, removeHiddenId } = useActions(
@@ -63,7 +66,7 @@ export const AddResultFlyout: React.FC = () => {
           <EuiFieldSearch
             value={searchQuery}
             onChange={(e) => search(e.target.value)}
-            isLoading={dataLoading}
+            isLoading={searchDataLoading}
             placeholder={i18n.translate(
               'xpack.enterpriseSearch.appSearch.engine.curations.addResult.searchPlaceholder',
               { defaultMessage: 'Search engine documents' }
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 a722ab96fc574..f1013fa4a6dfb 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
@@ -5,31 +5,16 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues, mockFlashMessageHelpers } from '../../../../../__mocks__';
+import { LogicMounter } from '../../../../../__mocks__/kea_logic';
 import '../../../../__mocks__/engine_logic.mock';
 
-import { nextTick } from '@kbn/test/jest';
-
 import { AddResultLogic } from './';
 
 describe('AddResultLogic', () => {
   const { mount } = new LogicMounter(AddResultLogic);
-  const { http } = mockHttpValues;
-  const { flashAPIErrors } = mockFlashMessageHelpers;
-
-  const MOCK_SEARCH_RESPONSE = {
-    results: [
-      { id: { raw: 'document-1' }, _meta: { id: 'document-1', engine: 'some-engine' } },
-      { id: { raw: 'document-2' }, _meta: { id: 'document-2', engine: 'some-engine' } },
-      { id: { raw: 'document-3' }, _meta: { id: 'document-3', engine: 'some-engine' } },
-    ],
-  };
 
   const DEFAULT_VALUES = {
     isFlyoutOpen: false,
-    dataLoading: false,
-    searchQuery: '',
-    searchResults: [],
   };
 
   beforeEach(() => {
@@ -51,7 +36,6 @@ describe('AddResultLogic', () => {
         expect(AddResultLogic.values).toEqual({
           ...DEFAULT_VALUES,
           isFlyoutOpen: true,
-          searchQuery: '',
         });
       });
     });
@@ -68,67 +52,5 @@ describe('AddResultLogic', () => {
         });
       });
     });
-
-    describe('search', () => {
-      it('sets searchQuery & dataLoading to true', () => {
-        mount({ searchQuery: '', dataLoading: false });
-
-        AddResultLogic.actions.search('hello world');
-
-        expect(AddResultLogic.values).toEqual({
-          ...DEFAULT_VALUES,
-          searchQuery: 'hello world',
-          dataLoading: true,
-        });
-      });
-    });
-
-    describe('onSearch', () => {
-      it('sets searchResults & dataLoading to false', () => {
-        mount({ searchResults: [], dataLoading: true });
-
-        AddResultLogic.actions.onSearch(MOCK_SEARCH_RESPONSE);
-
-        expect(AddResultLogic.values).toEqual({
-          ...DEFAULT_VALUES,
-          searchResults: MOCK_SEARCH_RESPONSE.results,
-          dataLoading: false,
-        });
-      });
-    });
-  });
-
-  describe('listeners', () => {
-    describe('search', () => {
-      beforeAll(() => jest.useFakeTimers());
-      afterAll(() => jest.useRealTimers());
-
-      it('should make a GET API call with a search query', async () => {
-        http.get.mockReturnValueOnce(Promise.resolve(MOCK_SEARCH_RESPONSE));
-        mount();
-        jest.spyOn(AddResultLogic.actions, 'onSearch');
-
-        AddResultLogic.actions.search('hello world');
-        jest.runAllTimers();
-        await nextTick();
-
-        expect(http.get).toHaveBeenCalledWith(
-          '/api/app_search/engines/some-engine/curation_search',
-          { query: { query: 'hello world' } }
-        );
-        expect(AddResultLogic.actions.onSearch).toHaveBeenCalledWith(MOCK_SEARCH_RESPONSE);
-      });
-
-      it('handles errors', async () => {
-        http.get.mockReturnValueOnce(Promise.reject('error'));
-        mount();
-
-        AddResultLogic.actions.search('test');
-        jest.runAllTimers();
-        await nextTick();
-
-        expect(flashAPIErrors).toHaveBeenCalledWith('error');
-      });
-    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.ts
index 808f4c86971ee..bcf18aa9625d7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/curation/results/add_result_logic.ts
@@ -7,24 +7,13 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { flashAPIErrors } from '../../../../../shared/flash_messages';
-import { HttpLogic } from '../../../../../shared/http';
-
-import { EngineLogic } from '../../../engine';
-import { Result } from '../../../result/types';
-
 interface AddResultValues {
   isFlyoutOpen: boolean;
-  dataLoading: boolean;
-  searchQuery: string;
-  searchResults: Result[];
 }
 
 interface AddResultActions {
   openFlyout(): void;
   closeFlyout(): void;
-  search(query: string): { query: string };
-  onSearch({ results }: { results: Result[] }): { results: Result[] };
 }
 
 export const AddResultLogic = kea<MakeLogicType<AddResultValues, AddResultActions>>({
@@ -32,8 +21,6 @@ export const AddResultLogic = kea<MakeLogicType<AddResultValues, AddResultAction
   actions: () => ({
     openFlyout: true,
     closeFlyout: true,
-    search: (query) => ({ query }),
-    onSearch: ({ results }) => ({ results }),
   }),
   reducers: () => ({
     isFlyoutOpen: [
@@ -43,42 +30,5 @@ export const AddResultLogic = kea<MakeLogicType<AddResultValues, AddResultAction
         closeFlyout: () => false,
       },
     ],
-    dataLoading: [
-      false,
-      {
-        search: () => true,
-        onSearch: () => false,
-      },
-    ],
-    searchQuery: [
-      '',
-      {
-        search: (_, { query }) => query,
-        openFlyout: () => '',
-      },
-    ],
-    searchResults: [
-      [],
-      {
-        onSearch: (_, { results }) => results,
-      },
-    ],
-  }),
-  listeners: ({ actions }) => ({
-    search: async ({ query }, breakpoint) => {
-      await breakpoint(250);
-
-      const { http } = HttpLogic.values;
-      const { engineName } = EngineLogic.values;
-
-      try {
-        const response = await http.get(`/api/app_search/engines/${engineName}/curation_search`, {
-          query: { query },
-        });
-        actions.onSearch(response);
-      } catch (e) {
-        flashAPIErrors(e);
-      }
-    },
   }),
 });
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 460c0f4dfa44c..67a26f2ecd4b6 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd';
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 c1031fc20bc15..f00f744f730ab 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
@@ -10,7 +10,7 @@ import {
   mockHttpValues,
   mockKibanaValues,
   mockFlashMessageHelpers,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 import '../../__mocks__/engine_logic.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.test.tsx
index 258d0ec6231fc..ad306dfc73080 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/curations/views/curation_creation.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 1be21c97c623b..bcc402d6eea27 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
@@ -5,12 +5,7 @@
  * 2.0.
  */
 
-import {
-  mountWithIntl,
-  mockKibanaValues,
-  setMockActions,
-  setMockValues,
-} from '../../../../__mocks__';
+import { mockKibanaValues, setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import '../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
@@ -20,6 +15,7 @@ import { shallow, ReactWrapper } from 'enzyme';
 import { EuiPageHeader, EuiBasicTable } from '@elastic/eui';
 
 import { Loading } from '../../../../shared/loading';
+import { mountWithIntl } from '../../../../test_helpers';
 import { EmptyState } from '../components';
 
 import { Curations, CurationsTable } from './curations';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.test.tsx
index 34afa9d1e39ed..b0cf40713142a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/api_code_example.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../__mocks__/enterprise_search_url.mock';
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.test.tsx
index 8b5b36094fbc6..863e87a28f40e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/paste_json_text.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions, rerender } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -13,6 +13,8 @@ import { shallow } from 'enzyme';
 
 import { EuiTextArea, EuiButtonEmpty, EuiButton } from '@elastic/eui';
 
+import { rerender } from '../../../../test_helpers';
+
 import { Errors } from '../creation_response_components';
 
 import { PasteJsonText, FlyoutHeader, FlyoutBody, FlyoutFooter } from './paste_json_text';
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 739580d039a36..1087e3d927559 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.test.tsx
index 7dc8952a18688..9b8820434fad8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_mode_components/upload_json_file.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions, rerender } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -13,6 +13,8 @@ import { shallow } from 'enzyme';
 
 import { EuiFilePicker, EuiButtonEmpty, EuiButton } from '@elastic/eui';
 
+import { rerender } from '../../../../test_helpers';
+
 import { Errors } from '../creation_response_components';
 
 import { UploadJsonFile, FlyoutHeader, FlyoutBody, FlyoutFooter } from './upload_json_file';
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 f03989aeaf5a3..3a3e7fd66d314 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 f53f94322879c..39608c6e8f81d 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.test.tsx
index 7eb9f3f46036d..7843b8bbf907b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/creation_response_components/summary_sections.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 7cbcc6b17e047..f293a0050eac9 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../__mocks__/kea_logic';
 import '../../__mocks__/engine_logic.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.test.tsx
index 66995b8d20dfe..3dc5d445930ba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/document_creation/document_creation_flyout.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 2c6cadf9a8ece..a75cb78536783 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues } from '../../../__mocks__';
+import { LogicMounter, mockHttpValues } from '../../../__mocks__/kea_logic';
 
 import dedent from 'dedent';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.test.tsx
index a6ccdc180b415..e9b74a56d0e50 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/components/document_creation_button.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail.test.tsx
index c4563b4357134..4aade8e61b085 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail.test.tsx
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
+import { mockUseParams } from '../../../__mocks__/react_router';
 import { unmountHandler } from '../../../__mocks__/shallow_useeffect.mock';
-import '../../../__mocks__/react_router_history.mock';
 import '../../__mocks__/engine_logic.mock';
 
 import React from 'react';
-import { useParams } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
@@ -39,7 +38,7 @@ describe('DocumentDetail', () => {
     setMockValues(values);
     setMockActions(actions);
 
-    (useParams as jest.Mock).mockImplementationOnce(() => ({
+    mockUseParams.mockImplementationOnce(() => ({
       documentId: '1',
     }));
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts
index 565c3069788c0..a258dcd970c74 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/document_detail_logic.test.ts
@@ -10,7 +10,7 @@ import {
   mockHttpValues,
   mockKibanaValues,
   mockFlashMessageHelpers,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 import { mockEngineValues } from '../../__mocks__';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx
index 88f5b6a1c49e6..143ad3f55ff2f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 import '../../__mocks__/engine_logic.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents_logic.test.ts
index c1d30a3cdd401..29b2c835f8260 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/documents_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter } from '../../../__mocks__/kea.mock';
+import { LogicMounter } from '../../../__mocks__/kea_logic';
 
 import { DocumentsLogic } from './documents_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/customization_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/customization_modal.test.tsx
index 332c5b822eb6d..536698ffe28f3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/customization_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/customization_modal.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 e5f2978e5ba92..a4d1a92ee45a4 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
@@ -6,7 +6,7 @@
  */
 
 import '../../../../__mocks__/enterprise_search_url.mock';
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx
index ea111402309b4..44a6da51ec8d6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/documents/search_experience/search_experience_content.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 import { setMockSearchContextState } from './__mocks__/hooks.mock';
 
 import React from 'react';
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 5435450f1bfdb..2b60193d4f7d3 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
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues } from '../../../__mocks__';
+import { LogicMounter, mockHttpValues } from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
+import { ApiTokenTypes } from '../credentials/constants';
+
 import { EngineTypes } from './types';
 
 import { EngineLogic } from './';
@@ -47,6 +49,7 @@ describe('EngineLogic', () => {
     hasSchemaConflicts: false,
     hasUnconfirmedSchemaFields: false,
     engineNotFound: false,
+    searchKey: '',
   };
 
   beforeEach(() => {
@@ -263,5 +266,57 @@ describe('EngineLogic', () => {
         });
       });
     });
+
+    describe('searchKey', () => {
+      it('should select the first available search key for this engine', () => {
+        const engine = {
+          ...mockEngineData,
+          apiTokens: [
+            {
+              key: 'private-123xyz',
+              name: 'privateKey',
+              type: ApiTokenTypes.Private,
+            },
+            {
+              key: 'search-123xyz',
+              name: 'searchKey',
+              type: ApiTokenTypes.Search,
+            },
+            {
+              key: 'search-8910abc',
+              name: 'searchKey2',
+              type: ApiTokenTypes.Search,
+            },
+          ],
+        };
+        mount({ engine });
+
+        expect(EngineLogic.values).toEqual({
+          ...DEFAULT_VALUES,
+          engine,
+          searchKey: 'search-123xyz',
+        });
+      });
+
+      it('should return an empty string if none are available', () => {
+        const engine = {
+          ...mockEngineData,
+          apiTokens: [
+            {
+              key: 'private-123xyz',
+              name: 'privateKey',
+              type: ApiTokenTypes.Private,
+            },
+          ],
+        };
+        mount({ engine });
+
+        expect(EngineLogic.values).toEqual({
+          ...DEFAULT_VALUES,
+          engine,
+          searchKey: '',
+        });
+      });
+    });
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
index 8fbf45bc85e52..5cbe89b364859 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_logic.ts
@@ -8,6 +8,8 @@
 import { kea, MakeLogicType } from 'kea';
 
 import { HttpLogic } from '../../../shared/http';
+import { ApiTokenTypes } from '../credentials/constants';
+import { ApiToken } from '../credentials/types';
 
 import { EngineDetails, EngineTypes } from './types';
 
@@ -21,6 +23,7 @@ interface EngineValues {
   hasSchemaConflicts: boolean;
   hasUnconfirmedSchemaFields: boolean;
   engineNotFound: boolean;
+  searchKey: string;
 }
 
 interface EngineActions {
@@ -87,6 +90,14 @@ export const EngineLogic = kea<MakeLogicType<EngineValues, EngineActions>>({
       () => [selectors.engine],
       (engine) => engine?.unconfirmedFields?.length > 0,
     ],
+    searchKey: [
+      () => [selectors.engine],
+      (engine: Partial<EngineDetails>) => {
+        const isSearchKey = (token: ApiToken) => token.type === ApiTokenTypes.Search;
+        const searchKey = (engine.apiTokens || []).find(isSearchKey);
+        return searchKey?.key || '';
+      },
+    ],
   }),
   listeners: ({ actions, values }) => ({
     initializeEngine: async () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx
index d913e3921bf1b..c2b0a6a50fd06 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_nav.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, rerender } from '../../../__mocks__';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 import { mockEngineValues } from '../../__mocks__';
 
 import React from 'react';
@@ -14,6 +14,8 @@ import { shallow } from 'enzyme';
 
 import { EuiBadge, EuiIcon } from '@elastic/eui';
 
+import { rerender } from '../../../test_helpers';
+
 import { EngineNav } from './engine_nav';
 
 describe('EngineNav', () => {
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 4738209cee4a2..0edf01bada938 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
@@ -12,7 +12,6 @@ import { useValues } from 'kea';
 import { EuiText, EuiBadge, EuiIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 
-import { getAppSearchUrl } from '../../../shared/enterprise_search_url';
 import { SideNavLink, SideNavItem } from '../../../shared/layout';
 import { AppLogic } from '../../app_logic';
 import {
@@ -170,8 +169,7 @@ export const EngineNav: React.FC = () => {
       )}
       {canViewEngineCrawler && !isMetaEngine && (
         <SideNavLink
-          isExternal
-          to={getAppSearchUrl(generateEnginePath(ENGINE_CRAWLER_PATH))}
+          to={generateEnginePath(ENGINE_CRAWLER_PATH)}
           data-test-subj="EngineCrawlerLink"
         >
           {CRAWLER_TITLE}
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
index 39055e772bcf9..b74c31adca438 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine/engine_router.test.tsx
@@ -5,19 +5,24 @@
  * 2.0.
  */
 
-import '../../../__mocks__/react_router_history.mock';
-import { mockFlashMessageHelpers, setMockValues, setMockActions } from '../../../__mocks__';
+import {
+  mockFlashMessageHelpers,
+  setMockValues,
+  setMockActions,
+} from '../../../__mocks__/kea_logic';
+import { mockUseParams } from '../../../__mocks__/react_router';
 import { unmountHandler } from '../../../__mocks__/shallow_useeffect.mock';
 import { mockEngineValues } from '../../__mocks__';
 
 import React from 'react';
-import { Switch, Redirect, useParams } from 'react-router-dom';
+import { Switch, Redirect } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
 import { Loading } from '../../../shared/loading';
 import { AnalyticsRouter } from '../analytics';
 import { ApiLogs } from '../api_logs';
+import { CrawlerRouter } from '../crawler';
 import { CurationsRouter } from '../curations';
 import { Documents, DocumentDetail } from '../documents';
 import { EngineOverview } from '../engine_overview';
@@ -42,7 +47,7 @@ describe('EngineRouter', () => {
   beforeEach(() => {
     setMockValues(values);
     setMockActions(actions);
-    (useParams as jest.Mock).mockReturnValue({ engineName: 'some-engine' });
+    mockUseParams.mockReturnValue({ engineName: 'some-engine' });
   });
 
   describe('useEffect', () => {
@@ -86,7 +91,7 @@ describe('EngineRouter', () => {
   // any route views as they would be rendering with the wrong data.
   it('renders a loading component if the engine stored in state is stale', () => {
     setMockValues({ ...values, engineName: 'some-engine' });
-    (useParams as jest.Mock).mockReturnValue({ engineName: 'some-new-engine' });
+    mockUseParams.mockReturnValue({ engineName: 'some-new-engine' });
     const wrapper = shallow(<EngineRouter />);
     expect(wrapper.find(Loading)).toHaveLength(1);
   });
@@ -168,4 +173,11 @@ describe('EngineRouter', () => {
 
     expect(wrapper.find(SourceEngines)).toHaveLength(1);
   });
+
+  it('renders a crawler view', () => {
+    setMockValues({ ...values, myRole: { canViewEngineCrawler: true } });
+    const wrapper = shallow(<EngineRouter />);
+
+    expect(wrapper.find(CrawlerRouter)).toHaveLength(1);
+  });
 });
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 387f8cf1b9837..40cc2ef0368c0 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
@@ -23,7 +23,7 @@ import {
   ENGINE_DOCUMENTS_PATH,
   ENGINE_DOCUMENT_DETAIL_PATH,
   ENGINE_SCHEMA_PATH,
-  // ENGINE_CRAWLER_PATH,
+  ENGINE_CRAWLER_PATH,
   META_ENGINE_SOURCE_ENGINES_PATH,
   ENGINE_RELEVANCE_TUNING_PATH,
   ENGINE_SYNONYMS_PATH,
@@ -34,6 +34,7 @@ import {
 } from '../../routes';
 import { AnalyticsRouter } from '../analytics';
 import { ApiLogs } from '../api_logs';
+import { CrawlerRouter } from '../crawler';
 import { CurationsRouter } from '../curations';
 import { DocumentDetail, Documents } from '../documents';
 import { EngineOverview } from '../engine_overview';
@@ -52,7 +53,7 @@ export const EngineRouter: React.FC = () => {
       canViewEngineAnalytics,
       canViewEngineDocuments,
       canViewEngineSchema,
-      // canViewEngineCrawler,
+      canViewEngineCrawler,
       canViewMetaEngineSourceEngines,
       canManageEngineRelevanceTuning,
       canManageEngineSynonyms,
@@ -143,6 +144,11 @@ export const EngineRouter: React.FC = () => {
           <SourceEngines />
         </Route>
       )}
+      {canViewEngineCrawler && (
+        <Route path={ENGINE_CRAWLER_PATH}>
+          <CrawlerRouter />
+        </Route>
+      )}
       <Route>
         <SetPageChrome trail={getEngineBreadcrumbs()} />
         <EngineOverview />
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 9d1bbafc82662..b91e33d1c8a92 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation_logic.test.ts
index 6d5c4480e45f6..1e87b3ef21f03 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_creation/engine_creation_logic.test.ts
@@ -10,7 +10,7 @@ import {
   mockHttpValues,
   mockKibanaValues,
   mockFlashMessageHelpers,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/recent_api_logs.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/recent_api_logs.test.tsx
index 6f3ec806a438d..1281d8f23a7eb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/recent_api_logs.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/recent_api_logs.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 import '../../../../__mocks__/shallow_useeffect.mock';
 import '../../../__mocks__/engine_logic.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.test.tsx
index 74ce770205ffe..b20b71487307d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_charts.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 import '../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.test.tsx
index 7fcda61073c5b..28a63c5d36842 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engine_overview/components/total_stats.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 d2d69de72c110..a3b2f4cfd8b9f 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
@@ -6,7 +6,7 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions } from '../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 b790edef43cc4..c9c1defd46032 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
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues, mockFlashMessageHelpers } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
 
 jest.mock('../engine', () => ({
   EngineLogic: { values: { engineName: 'some-engine' } },
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 222041c9f85a3..159a986096ae2 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
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import '../../../../__mocks__/kea.mock';
-import { setMockValues, mockTelemetryActions } from '../../../../__mocks__';
+import { setMockValues, mockTelemetryActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/header.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/header.test.tsx
index 8cb26713cb840..9b245a468b083 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/header.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/header.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../__mocks__/enterprise_search_url.mock';
-import { mockTelemetryActions } from '../../../../__mocks__';
+import { mockTelemetryActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.test.tsx
index 5d91c724068e7..1ddf6e40ce1ff 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engine_link_helpers.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockKibanaValues, mockTelemetryActions } from '../../../../../__mocks__';
+import { mockKibanaValues, mockTelemetryActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.test.tsx
index 8d3b4b2a5e6ca..b9369d019a2f8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/engines_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mountWithIntl, setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 import '../../../../../__mocks__/enterprise_search_url.mock';
 import './__mocks__/engines_logic.mock';
 
@@ -15,6 +15,8 @@ import { shallow } from 'enzyme';
 
 import { EuiBasicTable } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../../test_helpers';
+
 import { EngineDetails } from '../../../engine/types';
 
 import { EnginesTable } from './engines_table';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.test.tsx
index 430539c10bbf3..fb258e1e3be8c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mountWithIntl, setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 import '../../../../../__mocks__/enterprise_search_url.mock';
 import './__mocks__/engines_logic.mock';
 
@@ -15,6 +15,8 @@ import { shallow } from 'enzyme';
 
 import { EuiBasicTable } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../../test_helpers';
+
 import { EngineDetails } from '../../../engine/types';
 
 import { MetaEnginesTable } from './meta_engines_table';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_expanded_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_expanded_row.test.tsx
index dcaa1a2b7c246..26c8c0fddcd11 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_expanded_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_expanded_row.test.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { mountWithIntl } from '../../../../../__mocks__';
-
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
 import { EuiBasicTable, EuiHealth } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../../test_helpers';
+
 import { EngineDetails } from '../../../engine/types';
 
 import { MetaEnginesTableExpandedRow } from './meta_engines_table_expanded_row';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_logic.test.ts
index de1902c7cf748..3c0b9c4dc33f6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/engines/components/tables/meta_engines_table_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter } from '../../../../../__mocks__';
+import { LogicMounter } from '../../../../../__mocks__/kea_logic';
 import { mockRecursivelyFetchEngines } from '../../../../__mocks__/recursively_fetch_engines.mock';
 
 import { EngineDetails } from '../../../engine/types';
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 97e2057cea2d9..b46dfa7e19dd9 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
@@ -5,13 +5,15 @@
  * 2.0.
  */
 
-import { setMockValues, rerender } from '../../../../../../__mocks__';
+import { setMockValues } from '../../../../../../__mocks__/kea_logic';
 import '../__mocks__/engines_logic.mock';
 
 import { ShallowWrapper } from 'enzyme';
 
 import { EuiBasicTable, EuiButtonIcon } from '@elastic/eui';
 
+import { rerender } from '../../../../../../test_helpers';
+
 import { EnginesLogic } from '../../../../engines';
 
 import * as engineLinkHelpers from '../engine_link_helpers';
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 a67e5bb9ae7dc..eb95d1ce148da 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
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues, mockFlashMessageHelpers } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
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 b326a7d3ee075..27fe65fe518eb 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
@@ -6,12 +6,14 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions, rerender } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
 import { shallow, ShallowWrapper } from 'enzyme';
 
+import { rerender } from '../../../test_helpers';
+
 import { LoadingState, EmptyState } from './components';
 import { EnginesTable } from './components/tables/engines_table';
 import { MetaEnginesTable } from './components/tables/meta_engines_table';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.test.tsx
index 21fc2b235d83c..d25e6ab27b099 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.test.tsx
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../__mocks__';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiButtonEmpty } from '@elastic/eui';
+import { QueryTesterButton } from '../query_tester';
 
 import { KibanaHeaderActions } from './kibana_header_actions';
 
@@ -27,7 +27,7 @@ describe('KibanaHeaderActions', () => {
 
   it('renders', () => {
     const wrapper = shallow(<KibanaHeaderActions />);
-    expect(wrapper.find(EuiButtonEmpty).exists()).toBe(true);
+    expect(wrapper.find(QueryTesterButton).exists()).toBe(true);
   });
 
   it('does not render a "Query Tester" button if there is no engine available', () => {
@@ -35,6 +35,6 @@ describe('KibanaHeaderActions', () => {
       engineName: '',
     });
     const wrapper = shallow(<KibanaHeaderActions />);
-    expect(wrapper.find(EuiButtonEmpty).exists()).toBe(false);
+    expect(wrapper.find(QueryTesterButton).exists()).toBe(false);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.tsx
index b2e810962df02..e23c8ff8f0f0c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/layout/kibana_header_actions.tsx
@@ -9,10 +9,10 @@ import React from 'react';
 
 import { useValues } from 'kea';
 
-import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
 import { EngineLogic } from '../engine';
+import { QueryTesterButton } from '../query_tester';
 
 export const KibanaHeaderActions: React.FC = () => {
   const { engineName } = useValues(EngineLogic);
@@ -21,11 +21,7 @@ export const KibanaHeaderActions: React.FC = () => {
     <EuiFlexGroup gutterSize="s">
       {engineName && (
         <EuiFlexItem>
-          <EuiButtonEmpty iconType="beaker" size="s">
-            {i18n.translate('xpack.enterpriseSearch.appSearch.engine.queryTesterButtonLabel', {
-              defaultMessage: 'Query tester',
-            })}
-          </EuiButtonEmpty>
+          <QueryTesterButton />
         </EuiFlexItem>
       )}
     </EuiFlexGroup>
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx
index 5d61929770299..b9d3dbd9ee412 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/library/library.tsx
@@ -5,6 +5,8 @@
  * 2.0.
  */
 
+/* istanbul ignore file */
+
 import React, { useState } from 'react';
 
 import {
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 fe022391d76b4..c6ccdc78b16f3 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
@@ -6,7 +6,7 @@
  */
 
 import '../../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions, mountWithIntl } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -14,7 +14,9 @@ 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 './';
 
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 6b5693e4c301e..db5f058b28015 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
@@ -6,7 +6,7 @@
  */
 
 import '../../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 57f3f46fed92e..4e2382c23edbd 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
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues, mockFlashMessageHelpers } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
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 cd71e37108927..ab221879367b3 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
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
-import { setMockValues, mountWithIntl } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
+import { mountWithIntl } from '../../../../test_helpers';
+
 import { LogRetentionOptions } from '../types';
 
 import { LogRetentionMessage } from './';
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 a30f5bf77efad..fe7ea2d959289 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
@@ -6,7 +6,7 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation_logic.test.ts
index d8968316d1b72..137a8afc5c4fe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/meta_engine_creation/meta_engine_creation_logic.test.ts
@@ -10,7 +10,7 @@ import {
   mockHttpValues,
   mockFlashMessageHelpers,
   mockKibanaValues,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
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 0b6f8b4a6d3d4..3b8e1c96ff504 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
@@ -5,13 +5,15 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues, rerender } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 import '../../../__mocks__/shallow_useeffect.mock';
 
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
+import { rerender } from '../../../test_helpers';
+
 import { InputRow } from './input_row';
 
 jest.mock('./multi_input_rows_logic', () => ({
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows_logic.test.ts
index 0e2d28a6fc3e1..de439349bd15f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/multi_input_rows/multi_input_rows_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter } from '../../../__mocks__';
+import { LogicMounter } from '../../../__mocks__/kea_logic';
 
 import { Logic } from 'kea';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/i18n.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/i18n.ts
new file mode 100644
index 0000000000000..a1b1f6769beaf
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/i18n.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 { i18n } from '@kbn/i18n';
+
+export const QUERY_TESTER_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.engine.queryTesterTitle',
+  {
+    defaultMessage: 'Query tester',
+  }
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/index.ts
new file mode 100644
index 0000000000000..b2b8ad0dd1255
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { QueryTesterFlyout } from './query_tester_flyout';
+export { QueryTesterButton } from './query_tester_button';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester.test.tsx
new file mode 100644
index 0000000000000..a9e2b7129c781
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester.test.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
+
+import React from 'react';
+
+import { shallow } from 'enzyme';
+
+import { EuiEmptyPrompt, EuiFieldSearch } from '@elastic/eui';
+
+import { SchemaType } from '../../../shared/schema/types';
+import { Result } from '../result';
+
+import { QueryTester } from './query_tester';
+
+describe('QueryTester', () => {
+  const values = {
+    searchQuery: 'foo',
+    searchResults: [{ id: { raw: '1' } }, { id: { raw: '2' } }, { id: { raw: '3' } }],
+    searchDataLoading: false,
+    engine: {
+      schema: {
+        foo: SchemaType.Text,
+      },
+    },
+  };
+
+  const actions = {
+    search: jest.fn(),
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+    setMockValues(values);
+    setMockActions(actions);
+  });
+
+  it('renders with a search box and results', () => {
+    const wrapper = shallow(<QueryTester />);
+    expect(wrapper.find(EuiFieldSearch).prop('value')).toBe('foo');
+    expect(wrapper.find(EuiFieldSearch).prop('isLoading')).toBe(false);
+    expect(wrapper.find(Result)).toHaveLength(3);
+  });
+
+  it('will update the search term in state when the user updates the search box', () => {
+    const wrapper = shallow(<QueryTester />);
+    wrapper.find(EuiFieldSearch).simulate('change', { target: { value: 'bar' } });
+    expect(actions.search).toHaveBeenCalledWith('bar');
+  });
+
+  it('will render an empty prompt when there are no results', () => {
+    setMockValues({
+      ...values,
+      searchResults: [],
+    });
+    const wrapper = shallow(<QueryTester />);
+    wrapper.find(EuiFieldSearch).simulate('change', { target: { value: 'bar' } });
+    expect(wrapper.find(Result)).toHaveLength(0);
+    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester.tsx
new file mode 100644
index 0000000000000..374b6bd1a77b3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester.tsx
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { useActions, useValues } from 'kea';
+
+import { EuiEmptyPrompt, EuiFieldSearch, EuiSpacer } from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+
+import { EngineLogic } from '../engine';
+import { Result } from '../result';
+import { SearchLogic } from '../search';
+
+export const QueryTester: React.FC = () => {
+  const logic = SearchLogic({ id: 'query-tester' });
+  const { searchQuery, searchResults, searchDataLoading } = useValues(logic);
+  const { search } = useActions(logic);
+  const { engine } = useValues(EngineLogic);
+
+  return (
+    <>
+      <EuiFieldSearch
+        value={searchQuery}
+        onChange={(e) => search(e.target.value)}
+        isLoading={searchDataLoading}
+        placeholder={i18n.translate(
+          'xpack.enterpriseSearch.appSearch.engine.queryTester.searchPlaceholder',
+          { defaultMessage: 'Search engine documents' }
+        )}
+        fullWidth
+        autoFocus
+      />
+      <EuiSpacer />
+      {searchResults.length > 0 ? (
+        searchResults.map((result) => {
+          const id = result.id.raw;
+
+          return (
+            <React.Fragment key={id}>
+              <Result
+                isMetaEngine={false}
+                key={id}
+                result={result}
+                schemaForTypeHighlights={engine.schema}
+                showScore
+              />
+              <EuiSpacer size="m" />
+            </React.Fragment>
+          );
+        })
+      ) : (
+        <EuiEmptyPrompt
+          body={i18n.translate(
+            'xpack.enterpriseSearch.appSearch.engine.curations.addResult.searchEmptyDescription',
+            { defaultMessage: 'No matching content found.' }
+          )}
+        />
+      )}
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_button.test.tsx
new file mode 100644
index 0000000000000..4d2c3286ff516
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_button.test.tsx
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { EuiButtonEmpty } from '@elastic/eui';
+
+import { QueryTesterFlyout, QueryTesterButton } from '.';
+
+describe('QueryTesterButton', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  it('renders', () => {
+    const wrapper = shallow(<QueryTesterButton />);
+    expect(wrapper.find(EuiButtonEmpty).exists()).toBe(true);
+    expect(wrapper.find(QueryTesterFlyout).exists()).toBe(false);
+  });
+
+  it('will render a QueryTesterFlyout when pressed and close on QueryTesterFlyout close', () => {
+    const wrapper = shallow(<QueryTesterButton />);
+    wrapper.find(EuiButtonEmpty).simulate('click');
+    expect(wrapper.find(QueryTesterFlyout).exists()).toBe(true);
+
+    wrapper.find(QueryTesterFlyout).simulate('close');
+    expect(wrapper.find(QueryTesterFlyout).exists()).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_button.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_button.tsx
new file mode 100644
index 0000000000000..89381914b6db6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_button.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, { useState } from 'react';
+
+import { EuiButtonEmpty } from '@elastic/eui';
+
+import { QUERY_TESTER_TITLE } from './i18n';
+
+import { QueryTesterFlyout } from '.';
+
+export const QueryTesterButton: React.FC = () => {
+  const [isQueryTesterOpen, setIsQueryTesterOpen] = useState(false);
+  return (
+    <>
+      <EuiButtonEmpty
+        iconType="beaker"
+        size="s"
+        onClick={() => setIsQueryTesterOpen(!isQueryTesterOpen)}
+      >
+        {QUERY_TESTER_TITLE}
+      </EuiButtonEmpty>
+      {isQueryTesterOpen && <QueryTesterFlyout onClose={() => setIsQueryTesterOpen(false)} />}
+    </>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_flyout.test.tsx
new file mode 100644
index 0000000000000..8c25589f04639
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_flyout.test.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { EuiFlyout } from '@elastic/eui';
+
+import { QueryTester } from './query_tester';
+import { QueryTesterFlyout } from './query_tester_flyout';
+
+describe('QueryTesterFlyout', () => {
+  const onClose = jest.fn();
+
+  it('renders', () => {
+    const wrapper = shallow(<QueryTesterFlyout onClose={onClose} />);
+    expect(wrapper.find(QueryTester).exists()).toBe(true);
+    expect(wrapper.find(EuiFlyout).prop('onClose')).toEqual(onClose);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_flyout.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_flyout.tsx
new file mode 100644
index 0000000000000..d419bef472de3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/query_tester/query_tester_flyout.tsx
@@ -0,0 +1,32 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { EuiFlyout, EuiFlyoutBody, EuiFlyoutHeader, EuiTitle } from '@elastic/eui';
+
+import { QUERY_TESTER_TITLE } from './i18n';
+import { QueryTester } from './query_tester';
+
+interface Props {
+  onClose: () => void;
+}
+
+export const QueryTesterFlyout: React.FC<Props> = ({ onClose }) => {
+  return (
+    <EuiFlyout onClose={onClose} aria-labelledby="queryTesterFlyoutTitle" ownFocus>
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2 id="queryTesterFlyoutTitle">{QUERY_TESTER_TITLE}</h2>
+        </EuiTitle>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        <QueryTester />
+      </EuiFlyoutBody>
+    </EuiFlyout>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/boost_item_content.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/boost_item_content.test.tsx
index e21f46c6748dd..794c644f3d40b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/boost_item_content.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/boost_item_content.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/functional_boost_form.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/functional_boost_form.test.tsx
index feb4328e5adea..4a540e09287ed 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/functional_boost_form.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/functional_boost_form.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/proximity_boost_form.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/proximity_boost_form.test.tsx
index 0ed914abb3ab5..776a21c5acb1b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/proximity_boost_form.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/proximity_boost_form.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.test.tsx
index 6f9284891e711..292be35055e37 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boost_item_content/value_boost_form.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boosts.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boosts.test.tsx
index c82efa906f676..a7c7002fbf273 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boosts.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/boosts/boosts.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.test.tsx
index 574d2ae02af99..092740ac5d3cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../__mocks__/kea.mock';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 import '../../../__mocks__/shallow_useeffect.mock';
 import '../../__mocks__/engine_logic.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.test.tsx
index 8ab706f5953fb..8384d07938678 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_callouts.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../__mocks__/engine_logic.mock';
-import { setMockValues } from '../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_form.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_form.test.tsx
index a1a241b8856a5..d4052f23cfca4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_form.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_form.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/text_search_toggle.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/text_search_toggle.test.tsx
index f2d4f9c20a58d..85cf4af7a7b76 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/text_search_toggle.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/text_search_toggle.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/weight_slider.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/weight_slider.test.tsx
index 21a112a4ea988..49c02ef8e94f2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/weight_slider.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_form/relevance_tuning_item_content/weight_slider.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../../__mocks__/kea.mock';
+import { setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_layout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_layout.test.tsx
index 6f4333d94919b..20b1a16879234 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_layout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_layout.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../__mocks__/kea.mock';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 import '../../__mocks__/engine_logic.mock';
 
 import React from 'react';
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 97030e08e2a9f..1d143ed0ca938 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
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 import { mockEngineValues, mockEngineActions } from '../../__mocks__';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_preview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_preview.test.tsx
index ec6458a14b346..b39faa6029436 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_preview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/relevance_tuning/relevance_tuning_preview.test.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { setMockActions, setMockValues } from '../../../__mocks__/kea.mock';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx
index 333cefecb99c8..1e361f113d883 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result/result.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockKibanaValues } from '../../../__mocks__';
+import { mockKibanaValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 import { DraggableProvidedDragHandleProps } from 'react-beautiful-dnd';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/query_performance/query_performance.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/query_performance/query_performance.test.tsx
index 0c62b783a47ff..604d94f915439 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/query_performance/query_performance.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/query_performance/query_performance.test.tsx
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings.test.tsx
index dd99dc6c505da..ec521b4959535 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 import '../../../__mocks__/shallow_useeffect.mock';
 import '../../__mocks__/engine_logic.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_logic.test.ts
index 6522d84aef156..5ce6fd9328917 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_logic.test.ts
@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
-
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 import { mockEngineValues } from '../../__mocks__';
 
 import { omit } from 'lodash';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/disabled_fields_body.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/disabled_fields_body.test.tsx
index db87ac20a4223..580bb4db76389 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/disabled_fields_body.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/disabled_fields_body.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/non_text_fields_body.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/non_text_fields_body.test.tsx
index c99b8644812b9..8abb716183a9f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/non_text_fields_body.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/non_text_fields_body.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/result_settings_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/result_settings_table.test.tsx
index 151d436e59ea2..332b4a31895f4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/result_settings_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/result_settings_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.test.tsx
index 7be58a387fa69..6f2f4c9f9acbf 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/result_settings_table/text_fields_body.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response.test.tsx
index e324150a2d52a..964e466582d60 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response_logic.test.ts
index 11f8a1089af9b..426934b95388e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/result_settings/sample_response/sample_response_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues } from '../../../../__mocks__';
+import { LogicMounter, mockHttpValues } from '../../../../__mocks__/kea_logic';
 import '../../../__mocks__/engine_logic.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts
index 2f9ff707f9631..df1e19e264c75 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/constants.ts
@@ -9,23 +9,6 @@ import { i18n } from '@kbn/i18n';
 
 import { AdvanceRoleType } from '../../types';
 
-export const SAVE_ROLE_MAPPING = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.roleMapping.saveRoleMappingButtonLabel',
-  { defaultMessage: 'Save role mapping' }
-);
-export const UPDATE_ROLE_MAPPING = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.roleMapping.updateRoleMappingButtonLabel',
-  { defaultMessage: 'Update role mapping' }
-);
-
-export const EMPTY_ROLE_MAPPINGS_BODY = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.roleMapping.emptyRoleMappingsBody',
-  {
-    defaultMessage:
-      'All users who successfully authenticate will be assigned the Owner role and have access to all engines. Add a new role to override the default.',
-  }
-);
-
 export const DELETE_ROLE_MAPPING_MESSAGE = i18n.translate(
   'xpack.enterpriseSearch.appSearch.deleteRoleMappingMessage',
   {
@@ -126,74 +109,71 @@ export const ADMIN_ROLE_TYPE_DESCRIPTION = i18n.translate(
   }
 );
 
-export const ADVANCED_ROLE_SELECTORS_TITLE = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.advancedRoleSelectorsTitle',
+export const ENGINE_REQUIRED_ERROR = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.engineRequiredError',
   {
-    defaultMessage: 'Full or limited engine access',
+    defaultMessage: 'At least one assigned engine is required.',
   }
 );
 
-export const ROLE_TITLE = i18n.translate('xpack.enterpriseSearch.appSearch.roleTitle', {
-  defaultMessage: 'Role',
-});
-
-export const FULL_ENGINE_ACCESS_TITLE = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.fullEngineAccessTitle',
+export const ALL_ENGINES_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.allEnginesLabel',
   {
-    defaultMessage: 'Full engine access',
+    defaultMessage: 'Assign to all engines',
   }
 );
 
-export const FULL_ENGINE_ACCESS_DESCRIPTION = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.fullEngineAccessDescription',
+export const ALL_ENGINES_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.allEnginesDescription',
   {
-    defaultMessage: 'Access to all current and future engines.',
+    defaultMessage:
+      'Assigning to all engines includes all current and future engines as created and administered at a later date.',
   }
 );
 
-export const LIMITED_ENGINE_ACCESS_TITLE = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.limitedEngineAccessTitle',
+export const SPECIFIC_ENGINES_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.specificEnginesLabel',
   {
-    defaultMessage: 'Limited engine access',
+    defaultMessage: 'Assign to specific engines',
   }
 );
 
-export const LIMITED_ENGINE_ACCESS_DESCRIPTION = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.limitedEngineAccessDescription',
+export const SPECIFIC_ENGINES_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.specificEnginesDescription',
   {
-    defaultMessage: 'Limit user access to specific engines:',
+    defaultMessage: 'Assign to a select set of engines statically.',
   }
 );
 
-export const ENGINE_ACCESS_TITLE = i18n.translate(
-  'xpack.enterpriseSearch.appSearch.engineAccessTitle',
+export const ENGINE_ASSIGNMENT_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.appSearch.engineAssignmentLabel',
   {
-    defaultMessage: 'Engine access',
+    defaultMessage: 'Engine assignment',
   }
 );
 
 export const ADVANCED_ROLE_TYPES = [
   {
-    type: 'dev',
+    id: 'dev',
     description: DEV_ROLE_TYPE_DESCRIPTION,
   },
   {
-    type: 'editor',
+    id: 'editor',
     description: EDITOR_ROLE_TYPE_DESCRIPTION,
   },
   {
-    type: 'analyst',
+    id: 'analyst',
     description: ANALYST_ROLE_TYPE_DESCRIPTION,
   },
 ] as AdvanceRoleType[];
 
 export const STANDARD_ROLE_TYPES = [
   {
-    type: 'owner',
+    id: 'owner',
     description: OWNER_ROLE_TYPE_DESCRIPTION,
   },
   {
-    type: 'admin',
+    id: 'admin',
     description: ADMIN_ROLE_TYPE_DESCRIPTION,
   },
 ] as AdvanceRoleType[];
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/index.ts
index ce4b1de6e399d..19062cf44c17a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { RoleMappingsRouter } from './role_mappings_router';
+export { RoleMappings } from './role_mappings';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.test.tsx
index f50fc21d5ba58..0b7d4255fc323 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.test.tsx
@@ -5,25 +5,24 @@
  * 2.0.
  */
 
+import '../../../__mocks__/react_router';
 import '../../../__mocks__/shallow_useeffect.mock';
 import { DEFAULT_INITIAL_APP_DATA } from '../../../../../common/__mocks__';
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 import { engines } from '../../__mocks__/engines.mock';
 
 import React from 'react';
 
+import { waitFor } from '@testing-library/dom';
 import { shallow } from 'enzyme';
 
-import { EuiCheckbox } from '@elastic/eui';
+import { EuiComboBox, EuiComboBoxOptionOption, EuiRadioGroup } from '@elastic/eui';
 
-import { Loading } from '../../../shared/loading';
-import {
-  AttributeSelector,
-  DeleteMappingCallout,
-  RoleSelector,
-} from '../../../shared/role_mapping';
+import { AttributeSelector, RoleSelector, RoleMappingFlyout } from '../../../shared/role_mapping';
 import { asRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
 
+import { STANDARD_ROLE_TYPES } from './constants';
+
 import { RoleMapping } from './role_mapping';
 
 describe('RoleMapping', () => {
@@ -60,6 +59,7 @@ describe('RoleMapping', () => {
     myRole: {
       availableRoleTypes: mockRole.ability.availableRoleTypes,
     },
+    roleMappingErrors: [],
   };
 
   beforeEach(() => {
@@ -68,39 +68,56 @@ describe('RoleMapping', () => {
   });
 
   it('renders', () => {
+    setMockValues({ ...mockValues, roleMapping: asRoleMapping });
     const wrapper = shallow(<RoleMapping />);
 
     expect(wrapper.find(AttributeSelector)).toHaveLength(1);
-    expect(wrapper.find(RoleSelector)).toHaveLength(5);
+    expect(wrapper.find(RoleSelector)).toHaveLength(1);
   });
 
-  it('returns Loading when loading', () => {
-    setMockValues({ ...mockValues, dataLoading: true });
+  it('only passes standard role options for non-advanced roles', () => {
+    setMockValues({ ...mockValues, hasAdvancedRoles: false });
     const wrapper = shallow(<RoleMapping />);
 
-    expect(wrapper.find(Loading)).toHaveLength(1);
+    expect(wrapper.find(RoleSelector).prop('roleOptions')).toHaveLength(STANDARD_ROLE_TYPES.length);
   });
 
-  it('renders DeleteMappingCallout for existing mapping', () => {
-    setMockValues({ ...mockValues, roleMapping: asRoleMapping });
+  it('sets initial selected state when accessAllEngines is true', () => {
+    setMockValues({ ...mockValues, accessAllEngines: true });
     const wrapper = shallow(<RoleMapping />);
 
-    expect(wrapper.find(DeleteMappingCallout)).toHaveLength(1);
+    expect(wrapper.find(EuiRadioGroup).prop('idSelected')).toBe('all');
   });
 
-  it('hides DeleteMappingCallout for new mapping', () => {
-    const wrapper = shallow(<RoleMapping isNew />);
+  it('handles all/specific engines radio change', () => {
+    const wrapper = shallow(<RoleMapping />);
+    const radio = wrapper.find(EuiRadioGroup);
+    radio.simulate('change', { target: { checked: false } });
 
-    expect(wrapper.find(DeleteMappingCallout)).toHaveLength(0);
+    expect(actions.handleAccessAllEnginesChange).toHaveBeenCalledWith(false);
+  });
+
+  it('handles engine checkbox click', async () => {
+    const wrapper = shallow(<RoleMapping />);
+    await waitFor(() =>
+      ((wrapper.find(EuiComboBox).props() as unknown) as {
+        onChange: (a: EuiComboBoxOptionOption[]) => void;
+      }).onChange([{ label: engines[0].name, value: engines[0].name }])
+    );
+    wrapper.update();
+
+    expect(actions.handleEngineSelectionChange).toHaveBeenCalledWith([engines[0].name]);
   });
 
-  it('handles engine checkbox click', () => {
+  it('enables flyout when attribute value is valid', () => {
+    setMockValues({
+      ...mockValues,
+      attributeValue: 'foo',
+      attributeName: 'role',
+      accessAllEngines: true,
+    });
     const wrapper = shallow(<RoleMapping />);
-    wrapper
-      .find(EuiCheckbox)
-      .first()
-      .simulate('change', { target: { checked: true } });
 
-    expect(actions.handleEngineSelectionChange).toHaveBeenCalledWith(engines[0].name, true);
+    expect(wrapper.find(RoleMappingFlyout).prop('disabled')).toBe(false);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
index 610ceae8856f2..7962734f86e2d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mapping.tsx
@@ -5,65 +5,43 @@
  * 2.0.
  */
 
-import React, { useEffect } from 'react';
-
-import { useParams } from 'react-router-dom';
+import React from 'react';
 
 import { useActions, useValues } from 'kea';
 
 import {
-  EuiButton,
-  EuiCheckbox,
-  EuiFlexGroup,
-  EuiFlexItem,
+  EuiComboBox,
+  EuiForm,
   EuiFormRow,
-  EuiPageContentBody,
-  EuiPageHeader,
-  EuiPanel,
-  EuiRadio,
+  EuiHorizontalRule,
+  EuiRadioGroup,
   EuiSpacer,
-  EuiTitle,
 } from '@elastic/eui';
 
-import { FlashMessages } from '../../../shared/flash_messages';
-import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { Loading } from '../../../shared/loading';
 import {
   AttributeSelector,
-  DeleteMappingCallout,
   RoleSelector,
+  RoleOptionLabel,
+  RoleMappingFlyout,
 } from '../../../shared/role_mapping';
-import {
-  ROLE_MAPPINGS_TITLE,
-  ADD_ROLE_MAPPING_TITLE,
-  MANAGE_ROLE_MAPPING_TITLE,
-} from '../../../shared/role_mapping/constants';
 import { AppLogic } from '../../app_logic';
+import { AdvanceRoleType } from '../../types';
 
 import { roleHasScopedEngines } from '../../utils/role/has_scoped_engines';
-import { Engine } from '../engine/types';
 
 import {
-  SAVE_ROLE_MAPPING,
-  UPDATE_ROLE_MAPPING,
   ADVANCED_ROLE_TYPES,
   STANDARD_ROLE_TYPES,
-  ADVANCED_ROLE_SELECTORS_TITLE,
-  ROLE_TITLE,
-  FULL_ENGINE_ACCESS_TITLE,
-  FULL_ENGINE_ACCESS_DESCRIPTION,
-  LIMITED_ENGINE_ACCESS_TITLE,
-  LIMITED_ENGINE_ACCESS_DESCRIPTION,
-  ENGINE_ACCESS_TITLE,
+  ENGINE_REQUIRED_ERROR,
+  ALL_ENGINES_LABEL,
+  ALL_ENGINES_DESCRIPTION,
+  SPECIFIC_ENGINES_LABEL,
+  SPECIFIC_ENGINES_DESCRIPTION,
+  ENGINE_ASSIGNMENT_LABEL,
 } from './constants';
 import { RoleMappingsLogic } from './role_mappings_logic';
 
-interface RoleMappingProps {
-  isNew?: boolean;
-}
-
-export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
-  const { roleId } = useParams() as { roleId: string };
+export const RoleMapping: React.FC = () => {
   const { myRole } = useValues(AppLogic);
 
   const {
@@ -71,12 +49,10 @@ export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
     handleAttributeSelectorChange,
     handleAttributeValueChange,
     handleAuthProviderChange,
-    handleDeleteMapping,
     handleEngineSelectionChange,
     handleRoleChange,
     handleSaveMapping,
-    initializeRoleMapping,
-    resetState,
+    closeRoleMappingFlyout,
   } = useActions(RoleMappingsLogic);
 
   const {
@@ -86,7 +62,6 @@ export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
     attributes,
     availableAuthProviders,
     availableEngines,
-    dataLoading,
     elasticsearchRoles,
     hasAdvancedRoles,
     multipleAuthProvidersConfig,
@@ -94,67 +69,55 @@ export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
     roleType,
     selectedEngines,
     selectedAuthProviders,
+    selectedOptions,
+    roleMappingErrors,
   } = useValues(RoleMappingsLogic);
 
-  useEffect(() => {
-    initializeRoleMapping(roleId);
-    return resetState;
-  }, []);
-
-  if (dataLoading) return <Loading />;
-
-  const SAVE_ROLE_MAPPING_LABEL = isNew ? SAVE_ROLE_MAPPING : UPDATE_ROLE_MAPPING;
-  const TITLE = isNew ? ADD_ROLE_MAPPING_TITLE : MANAGE_ROLE_MAPPING_TITLE;
-
-  const saveRoleMappingButton = (
-    <EuiButton onClick={handleSaveMapping} fill>
-      {SAVE_ROLE_MAPPING_LABEL}
-    </EuiButton>
-  );
-
-  const engineSelector = (engine: Engine) => (
-    <EuiCheckbox
-      key={engine.name}
-      name={engine.name}
-      id={`engine_option_${engine.name}`}
-      checked={selectedEngines.has(engine.name)}
-      onChange={(e) => {
-        handleEngineSelectionChange(engine.name, e.target.checked);
-      }}
-      label={engine.name}
-    />
-  );
-
-  const advancedRoleSelectors = (
-    <>
-      <EuiSpacer />
-      <EuiTitle size="xs">
-        <h4>{ADVANCED_ROLE_SELECTORS_TITLE}</h4>
-      </EuiTitle>
-      <EuiSpacer />
-      {ADVANCED_ROLE_TYPES.map(({ type, description }) => (
-        <RoleSelector
-          key={type}
-          disabled={!myRole.availableRoleTypes.includes(type)}
-          roleType={roleType}
-          roleTypeOption={type}
-          description={description}
-          onChange={handleRoleChange}
+  const isNew = !roleMapping;
+  const hasEngineAssignment = selectedEngines.size > 0 || accessAllEngines;
+  const attributeValueInvalid = attributeName !== 'role' && !attributeValue;
+
+  const mapRoleOptions = ({ id, description }: AdvanceRoleType) => ({
+    id,
+    description,
+    disabled: !myRole.availableRoleTypes.includes(id),
+  });
+
+  const standardRoleOptions = STANDARD_ROLE_TYPES.map(mapRoleOptions);
+  const advancedRoleOptions = ADVANCED_ROLE_TYPES.map(mapRoleOptions);
+
+  const roleOptions = hasAdvancedRoles
+    ? [...standardRoleOptions, ...advancedRoleOptions]
+    : standardRoleOptions;
+
+  const engineOptions = [
+    {
+      id: 'all',
+      label: <RoleOptionLabel label={ALL_ENGINES_LABEL} description={ALL_ENGINES_DESCRIPTION} />,
+    },
+    {
+      id: 'specific',
+      label: (
+        <RoleOptionLabel
+          label={SPECIFIC_ENGINES_LABEL}
+          description={SPECIFIC_ENGINES_DESCRIPTION}
         />
-      ))}
-    </>
-  );
+      ),
+    },
+  ];
 
   return (
-    <>
-      <SetPageChrome trail={[ROLE_MAPPINGS_TITLE, TITLE]} />
-      <EuiPageHeader rightSideItems={[saveRoleMappingButton]} pageTitle={TITLE} />
-      <EuiSpacer />
-      <EuiPageContentBody>
-        <FlashMessages />
+    <RoleMappingFlyout
+      disabled={attributeValueInvalid || !hasEngineAssignment}
+      isNew={isNew}
+      closeRoleMappingFlyout={closeRoleMappingFlyout}
+      handleSaveMapping={handleSaveMapping}
+    >
+      <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
         <AttributeSelector
           attributeName={attributeName}
           attributeValue={attributeValue}
+          attributeValueInvalid={attributeValueInvalid}
           attributes={attributes}
           availableAuthProviders={availableAuthProviders}
           elasticsearchRoles={elasticsearchRoles}
@@ -165,83 +128,43 @@ export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
           handleAuthProviderChange={handleAuthProviderChange}
           multipleAuthProvidersConfig={multipleAuthProvidersConfig}
         />
-        <EuiSpacer />
-        <EuiFlexGroup alignItems="stretch">
-          <EuiFlexItem>
-            <EuiPanel hasShadow={false} color="subdued" paddingSize="l">
-              <EuiTitle size="s">
-                <h3>{ROLE_TITLE}</h3>
-              </EuiTitle>
-              <EuiSpacer />
-              <EuiTitle size="xs">
-                <h4>{FULL_ENGINE_ACCESS_TITLE}</h4>
-              </EuiTitle>
-              <EuiSpacer />
-              {STANDARD_ROLE_TYPES.map(({ type, description }) => (
-                <RoleSelector
-                  key={type}
-                  roleType={roleType}
-                  onChange={handleRoleChange}
-                  roleTypeOption={type}
-                  description={description}
-                />
-              ))}
-              {hasAdvancedRoles && advancedRoleSelectors}
-            </EuiPanel>
-          </EuiFlexItem>
-          {hasAdvancedRoles && (
-            <EuiFlexItem>
-              <EuiPanel hasShadow={false} color="subdued" paddingSize="l">
-                <EuiTitle size="s">
-                  <h3>{ENGINE_ACCESS_TITLE}</h3>
-                </EuiTitle>
-                <EuiSpacer />
-                <EuiFormRow>
-                  <EuiRadio
-                    id="accessAllEngines"
-                    disabled={!roleHasScopedEngines(roleType)}
-                    checked={accessAllEngines}
-                    onChange={handleAccessAllEnginesChange}
-                    label={
-                      <>
-                        <EuiTitle size="xs">
-                          <h4>{FULL_ENGINE_ACCESS_TITLE}</h4>
-                        </EuiTitle>
-                        <p>{FULL_ENGINE_ACCESS_DESCRIPTION}</p>
-                      </>
-                    }
-                  />
-                </EuiFormRow>
-                <EuiFormRow>
-                  <>
-                    <EuiRadio
-                      id="selectEngines"
-                      disabled={!roleHasScopedEngines(roleType)}
-                      checked={!accessAllEngines}
-                      onChange={handleAccessAllEnginesChange}
-                      label={
-                        <>
-                          <EuiTitle size="xs">
-                            <h4>{LIMITED_ENGINE_ACCESS_TITLE}</h4>
-                          </EuiTitle>
-                          <p>{LIMITED_ENGINE_ACCESS_DESCRIPTION}</p>
-                        </>
-                      }
-                    />
-                    {!accessAllEngines && (
-                      <div className="engines-list">
-                        {availableEngines.map((engine) => engineSelector(engine))}
-                      </div>
-                    )}
-                  </>
-                </EuiFormRow>
-              </EuiPanel>
-            </EuiFlexItem>
-          )}
-        </EuiFlexGroup>
-        <EuiSpacer />
-        {roleMapping && <DeleteMappingCallout handleDeleteMapping={handleDeleteMapping} />}
-      </EuiPageContentBody>
-    </>
+        <EuiSpacer size="m" />
+        <RoleSelector
+          roleType={roleType}
+          roleOptions={roleOptions}
+          onChange={handleRoleChange}
+          label="Role"
+        />
+
+        {hasAdvancedRoles && (
+          <>
+            <EuiHorizontalRule />
+            <EuiFormRow>
+              <EuiRadioGroup
+                options={engineOptions}
+                disabled={!roleHasScopedEngines(roleType)}
+                idSelected={accessAllEngines ? 'all' : 'specific'}
+                onChange={(id) => handleAccessAllEnginesChange(id === 'all')}
+                legend={{
+                  children: <span>{ENGINE_ASSIGNMENT_LABEL}</span>,
+                }}
+              />
+            </EuiFormRow>
+            <EuiFormRow isInvalid={!hasEngineAssignment} error={[ENGINE_REQUIRED_ERROR]}>
+              <EuiComboBox
+                data-test-subj="enginesSelect"
+                selectedOptions={selectedOptions}
+                options={availableEngines.map(({ name }) => ({ label: name, value: name }))}
+                onChange={(options) => {
+                  handleEngineSelectionChange(options.map(({ value }) => value as string));
+                }}
+                fullWidth
+                isDisabled={accessAllEngines || !roleHasScopedEngines(roleType)}
+              />
+            </EuiFormRow>
+          </>
+        )}
+      </EuiForm>
+    </RoleMappingFlyout>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx
index c6da903e20912..d7ce8053c71f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.test.tsx
@@ -6,22 +6,23 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiEmptyPrompt } from '@elastic/eui';
-
 import { Loading } from '../../../shared/loading';
-import { RoleMappingsTable } from '../../../shared/role_mapping';
+import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
 import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
 
+import { RoleMapping } from './role_mapping';
 import { RoleMappings } from './role_mappings';
 
 describe('RoleMappings', () => {
   const initializeRoleMappings = jest.fn();
+  const initializeRoleMapping = jest.fn();
+  const handleDeleteMapping = jest.fn();
   const mockValues = {
     roleMappings: [wsRoleMapping],
     dataLoading: false,
@@ -31,6 +32,8 @@ describe('RoleMappings', () => {
   beforeEach(() => {
     setMockActions({
       initializeRoleMappings,
+      initializeRoleMapping,
+      handleDeleteMapping,
     });
     setMockValues(mockValues);
   });
@@ -48,10 +51,17 @@ describe('RoleMappings', () => {
     expect(wrapper.find(Loading)).toHaveLength(1);
   });
 
-  it('renders empty state', () => {
-    setMockValues({ ...mockValues, roleMappings: [] });
+  it('renders RoleMapping flyout', () => {
+    setMockValues({ ...mockValues, roleMappingFlyoutOpen: true });
+    const wrapper = shallow(<RoleMappings />);
+
+    expect(wrapper.find(RoleMapping)).toHaveLength(1);
+  });
+
+  it('handles onClick', () => {
     const wrapper = shallow(<RoleMappings />);
+    wrapper.find(RoleMappingsHeading).prop('onClick')();
 
-    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+    expect(initializeRoleMapping).toHaveBeenCalled();
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
index 86e2e51d29a7d..78d0a5cbc8638 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings.tsx
@@ -9,33 +9,29 @@ import React, { useEffect } from 'react';
 
 import { useActions, useValues } from 'kea';
 
-import {
-  EuiEmptyPrompt,
-  EuiPageContent,
-  EuiPageContentBody,
-  EuiPageHeader,
-  EuiPanel,
-} from '@elastic/eui';
-
 import { FlashMessages } from '../../../shared/flash_messages';
 import { SetAppSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { Loading } from '../../../shared/loading';
-import { AddRoleMappingButton, RoleMappingsTable } from '../../../shared/role_mapping';
-import {
-  EMPTY_ROLE_MAPPINGS_TITLE,
-  ROLE_MAPPINGS_TITLE,
-  ROLE_MAPPINGS_DESCRIPTION,
-} from '../../../shared/role_mapping/constants';
-
-import { ROLE_MAPPING_NEW_PATH } from '../../routes';
+import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
+import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants';
 
-import { ROLE_MAPPINGS_ENGINE_ACCESS_HEADING, EMPTY_ROLE_MAPPINGS_BODY } from './constants';
+import { ROLE_MAPPINGS_ENGINE_ACCESS_HEADING } from './constants';
+import { RoleMapping } from './role_mapping';
 import { RoleMappingsLogic } from './role_mappings_logic';
-import { generateRoleMappingPath } from './utils';
 
 export const RoleMappings: React.FC = () => {
-  const { initializeRoleMappings, resetState } = useActions(RoleMappingsLogic);
-  const { roleMappings, multipleAuthProvidersConfig, dataLoading } = useValues(RoleMappingsLogic);
+  const {
+    initializeRoleMappings,
+    initializeRoleMapping,
+    handleDeleteMapping,
+    resetState,
+  } = useActions(RoleMappingsLogic);
+  const {
+    roleMappings,
+    multipleAuthProvidersConfig,
+    dataLoading,
+    roleMappingFlyoutOpen,
+  } = useValues(RoleMappingsLogic);
 
   useEffect(() => {
     initializeRoleMappings();
@@ -44,40 +40,26 @@ export const RoleMappings: React.FC = () => {
 
   if (dataLoading) return <Loading />;
 
-  const addMappingButton = <AddRoleMappingButton path={ROLE_MAPPING_NEW_PATH} />;
-
-  const roleMappingEmptyState = (
-    <EuiPanel paddingSize="l" color="subdued" hasBorder={false}>
-      <EuiEmptyPrompt
-        iconType="usersRolesApp"
-        title={<h2>{EMPTY_ROLE_MAPPINGS_TITLE}</h2>}
-        body={<p>{EMPTY_ROLE_MAPPINGS_BODY}</p>}
-        actions={addMappingButton}
+  const roleMappingsSection = (
+    <>
+      <RoleMappingsHeading productName="App Search" onClick={() => initializeRoleMapping()} />
+      <RoleMappingsTable
+        roleMappings={roleMappings}
+        accessItemKey="engines"
+        accessHeader={ROLE_MAPPINGS_ENGINE_ACCESS_HEADING}
+        initializeRoleMapping={initializeRoleMapping}
+        shouldShowAuthProvider={multipleAuthProvidersConfig}
+        handleDeleteMapping={handleDeleteMapping}
       />
-    </EuiPanel>
-  );
-
-  const roleMappingsTable = (
-    <RoleMappingsTable
-      roleMappings={roleMappings}
-      accessItemKey="engines"
-      accessHeader={ROLE_MAPPINGS_ENGINE_ACCESS_HEADING}
-      addMappingButton={addMappingButton}
-      getRoleMappingPath={generateRoleMappingPath}
-      shouldShowAuthProvider={multipleAuthProvidersConfig}
-    />
+    </>
   );
 
   return (
     <>
       <SetPageChrome trail={[ROLE_MAPPINGS_TITLE]} />
-      <EuiPageHeader pageTitle={ROLE_MAPPINGS_TITLE} description={ROLE_MAPPINGS_DESCRIPTION} />
-      <EuiPageContent hasShadow={false} hasBorder={roleMappings.length > 0}>
-        <EuiPageContentBody>
-          <FlashMessages />
-          {roleMappings.length === 0 ? roleMappingEmptyState : roleMappingsTable}
-        </EuiPageContentBody>
-      </EuiPageContent>
+      {roleMappingFlyoutOpen && <RoleMapping />}
+      <FlashMessages />
+      {roleMappingsSection}
     </>
   );
 };
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 ada17fc9a732a..87e6ee62460fa 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
@@ -5,28 +5,36 @@
  * 2.0.
  */
 
-import { mockFlashMessageHelpers, mockHttpValues, mockKibanaValues } from '../../../__mocks__';
-import { LogicMounter } from '../../../__mocks__/kea.mock';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 
 import { engines } from '../../__mocks__/engines.mock';
 
 import { nextTick } from '@kbn/test/jest';
 
 import { asRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
-import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
+import { ANY_AUTH_PROVIDER, ROLE_MAPPING_NOT_FOUND } from '../../../shared/role_mapping/constants';
 
 import { RoleMappingsLogic } from './role_mappings_logic';
 
 describe('RoleMappingsLogic', () => {
   const { http } = mockHttpValues;
-  const { navigateToUrl } = mockKibanaValues;
-  const { clearFlashMessages, flashAPIErrors, setSuccessMessage } = mockFlashMessageHelpers;
+  const {
+    clearFlashMessages,
+    flashAPIErrors,
+    setSuccessMessage,
+    setErrorMessage,
+  } = mockFlashMessageHelpers;
   const { mount } = new LogicMounter(RoleMappingsLogic);
   const DEFAULT_VALUES = {
     attributes: [],
     availableAuthProviders: [],
     elasticsearchRoles: [],
     roleMapping: null,
+    roleMappingFlyoutOpen: false,
     roleMappings: [],
     roleType: 'owner',
     attributeValue: '',
@@ -38,6 +46,8 @@ describe('RoleMappingsLogic', () => {
     selectedEngines: new Set(),
     accessAllEngines: true,
     selectedAuthProviders: [ANY_AUTH_PROVIDER],
+    selectedOptions: [],
+    roleMappingErrors: [],
   };
 
   const mappingsServerProps = { multipleAuthProvidersConfig: true, roleMappings: [asRoleMapping] };
@@ -87,6 +97,10 @@ describe('RoleMappingsLogic', () => {
           attributeValue: 'superuser',
           elasticsearchRoles: mappingServerProps.elasticsearchRoles,
           selectedEngines: new Set(engines.map((e) => e.name)),
+          selectedOptions: [
+            { label: engines[0].name, value: engines[0].name },
+            { label: engines[1].name, value: engines[1].name },
+          ],
         });
       });
 
@@ -134,21 +148,21 @@ describe('RoleMappingsLogic', () => {
       });
 
       it('handles adding an engine to selected engines', () => {
-        RoleMappingsLogic.actions.handleEngineSelectionChange(otherEngine.name, true);
+        RoleMappingsLogic.actions.handleEngineSelectionChange([engine.name, otherEngine.name]);
 
         expect(RoleMappingsLogic.values.selectedEngines).toEqual(
           new Set([engine.name, otherEngine.name])
         );
       });
       it('handles removing an engine from selected engines', () => {
-        RoleMappingsLogic.actions.handleEngineSelectionChange(otherEngine.name, false);
+        RoleMappingsLogic.actions.handleEngineSelectionChange([engine.name]);
 
         expect(RoleMappingsLogic.values.selectedEngines).toEqual(new Set([engine.name]));
       });
     });
 
     it('handleAccessAllEnginesChange', () => {
-      RoleMappingsLogic.actions.handleAccessAllEnginesChange();
+      RoleMappingsLogic.actions.handleAccessAllEnginesChange(false);
 
       expect(RoleMappingsLogic.values).toEqual({
         ...DEFAULT_VALUES,
@@ -250,6 +264,25 @@ describe('RoleMappingsLogic', () => {
       expect(RoleMappingsLogic.values).toEqual(DEFAULT_VALUES);
       expect(clearFlashMessages).toHaveBeenCalled();
     });
+
+    it('openRoleMappingFlyout', () => {
+      mount(mappingServerProps);
+      RoleMappingsLogic.actions.openRoleMappingFlyout();
+
+      expect(RoleMappingsLogic.values.roleMappingFlyoutOpen).toEqual(true);
+      expect(clearFlashMessages).toHaveBeenCalled();
+    });
+
+    it('closeRoleMappingFlyout', () => {
+      mount({
+        ...mappingServerProps,
+        roleMappingFlyoutOpen: true,
+      });
+      RoleMappingsLogic.actions.closeRoleMappingFlyout();
+
+      expect(RoleMappingsLogic.values.roleMappingFlyoutOpen).toEqual(false);
+      expect(clearFlashMessages).toHaveBeenCalled();
+    });
   });
 
   describe('listeners', () => {
@@ -302,12 +335,12 @@ describe('RoleMappingsLogic', () => {
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
       });
 
-      it('redirects when there is a 404 status', async () => {
+      it('shows error when there is a 404 status', async () => {
         http.get.mockReturnValue(Promise.reject({ status: 404 }));
         RoleMappingsLogic.actions.initializeRoleMapping();
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(setErrorMessage).toHaveBeenCalledWith(ROLE_MAPPING_NOT_FOUND);
       });
     });
 
@@ -322,8 +355,12 @@ describe('RoleMappingsLogic', () => {
         engines: [],
       };
 
-      it('calls API and navigates when new mapping', async () => {
+      it('calls API and refreshes list when new mapping', async () => {
         mount(mappingsServerProps);
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
 
         http.post.mockReturnValue(Promise.resolve(mappingServerProps));
         RoleMappingsLogic.actions.handleSaveMapping();
@@ -333,11 +370,15 @@ describe('RoleMappingsLogic', () => {
         });
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
-      it('calls API and navigates when existing mapping', async () => {
+      it('calls API and refreshes list when existing mapping', async () => {
         mount(mappingServerProps);
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
 
         http.put.mockReturnValue(Promise.resolve(mappingServerProps));
         RoleMappingsLogic.actions.handleSaveMapping();
@@ -347,7 +388,7 @@ describe('RoleMappingsLogic', () => {
         });
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
         expect(setSuccessMessage).toHaveBeenCalled();
       });
 
@@ -373,16 +414,30 @@ describe('RoleMappingsLogic', () => {
       });
 
       it('handles error', async () => {
-        http.post.mockReturnValue(Promise.reject('this is an error'));
+        const setRoleMappingErrorsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setRoleMappingErrors'
+        );
+
+        http.post.mockReturnValue(
+          Promise.reject({
+            body: {
+              attributes: {
+                errors: ['this is an error'],
+              },
+            },
+          })
+        );
         RoleMappingsLogic.actions.handleSaveMapping();
         await nextTick();
 
-        expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
+        expect(setRoleMappingErrorsSpy).toHaveBeenCalledWith(['this is an error']);
       });
     });
 
     describe('handleDeleteMapping', () => {
       let confirmSpy: any;
+      const roleMappingId = 'r1';
 
       beforeEach(() => {
         confirmSpy = jest.spyOn(window, 'confirm');
@@ -393,30 +448,26 @@ describe('RoleMappingsLogic', () => {
         confirmSpy.mockRestore();
       });
 
-      it('returns when no mapping', () => {
-        RoleMappingsLogic.actions.handleDeleteMapping();
-
-        expect(http.delete).not.toHaveBeenCalled();
-      });
-
-      it('calls API and navigates', async () => {
+      it('calls API and refreshes list', async () => {
         mount(mappingServerProps);
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         http.delete.mockReturnValue(Promise.resolve({}));
-        RoleMappingsLogic.actions.handleDeleteMapping();
+        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
 
-        expect(http.delete).toHaveBeenCalledWith(
-          `/api/app_search/role_mappings/${asRoleMapping.id}`
-        );
+        expect(http.delete).toHaveBeenCalledWith(`/api/app_search/role_mappings/${roleMappingId}`);
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
         expect(setSuccessMessage).toHaveBeenCalled();
       });
 
       it('handles error', async () => {
         mount(mappingServerProps);
         http.delete.mockReturnValue(Promise.reject('this is an error'));
-        RoleMappingsLogic.actions.handleDeleteMapping();
+        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
         await nextTick();
 
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
@@ -425,7 +476,7 @@ describe('RoleMappingsLogic', () => {
       it('will do nothing if not confirmed', () => {
         mount(mappingServerProps);
         jest.spyOn(window, 'confirm').mockReturnValueOnce(false);
-        RoleMappingsLogic.actions.handleDeleteMapping();
+        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
 
         expect(http.delete).not.toHaveBeenCalled();
       });
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 00b944d91cbcb..863e6746dbe95 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
@@ -7,16 +7,17 @@
 
 import { kea, MakeLogicType } from 'kea';
 
+import { EuiComboBoxOptionOption } from '@elastic/eui';
+
 import {
   clearFlashMessages,
   flashAPIErrors,
   setSuccessMessage,
+  setErrorMessage,
 } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
-import { KibanaLogic } from '../../../shared/kibana';
-import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
+import { ANY_AUTH_PROVIDER, ROLE_MAPPING_NOT_FOUND } from '../../../shared/role_mapping/constants';
 import { AttributeName } from '../../../shared/types';
-import { ROLE_MAPPINGS_PATH } from '../../routes';
 import { ASRoleMapping, RoleTypes } from '../../types';
 import { roleHasScopedEngines } from '../../utils/role/has_scoped_engines';
 import { Engine } from '../engine/types';
@@ -49,28 +50,25 @@ const getFirstAttributeValue = (roleMapping: ASRoleMapping) =>
   Object.entries(roleMapping.rules)[0][1] as AttributeName;
 
 interface RoleMappingsActions {
-  handleAccessAllEnginesChange(): void;
+  handleAccessAllEnginesChange(selected: boolean): { selected: boolean };
   handleAuthProviderChange(value: string[]): { value: string[] };
   handleAttributeSelectorChange(
     value: AttributeName,
     firstElasticsearchRole: string
   ): { value: AttributeName; firstElasticsearchRole: string };
   handleAttributeValueChange(value: string): { value: string };
-  handleDeleteMapping(): void;
-  handleEngineSelectionChange(
-    engineName: string,
-    selected: boolean
-  ): {
-    engineName: string;
-    selected: boolean;
-  };
+  handleDeleteMapping(roleMappingId: string): { roleMappingId: string };
+  handleEngineSelectionChange(engineNames: string[]): { engineNames: string[] };
   handleRoleChange(roleType: RoleTypes): { roleType: RoleTypes };
   handleSaveMapping(): void;
-  initializeRoleMapping(roleId?: string): { roleId?: string };
+  initializeRoleMapping(roleMappingId?: string): { roleMappingId?: string };
   initializeRoleMappings(): void;
   resetState(): void;
   setRoleMappingData(data: RoleMappingServerDetails): RoleMappingServerDetails;
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
+  openRoleMappingFlyout(): void;
+  closeRoleMappingFlyout(): void;
+  setRoleMappingErrors(errors: string[]): { errors: string[] };
 }
 
 interface RoleMappingsValues {
@@ -89,6 +87,9 @@ interface RoleMappingsValues {
   roleType: RoleTypes;
   selectedAuthProviders: string[];
   selectedEngines: Set<string>;
+  roleMappingFlyoutOpen: boolean;
+  selectedOptions: EuiComboBoxOptionOption[];
+  roleMappingErrors: string[];
 }
 
 export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappingsActions>>({
@@ -96,23 +97,23 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
   actions: {
     setRoleMappingsData: (data: RoleMappingsServerDetails) => data,
     setRoleMappingData: (data: RoleMappingServerDetails) => data,
+    setRoleMappingErrors: (errors: string[]) => ({ errors }),
     handleAuthProviderChange: (value: string) => ({ value }),
     handleRoleChange: (roleType: RoleTypes) => ({ roleType }),
-    handleEngineSelectionChange: (engineName: string, selected: boolean) => ({
-      engineName,
-      selected,
-    }),
+    handleEngineSelectionChange: (engineNames: string[]) => ({ engineNames }),
     handleAttributeSelectorChange: (value: string, firstElasticsearchRole: string) => ({
       value,
       firstElasticsearchRole,
     }),
     handleAttributeValueChange: (value: string) => ({ value }),
-    handleAccessAllEnginesChange: true,
+    handleAccessAllEnginesChange: (selected: boolean) => ({ selected }),
     resetState: true,
     initializeRoleMappings: true,
-    initializeRoleMapping: (roleId) => ({ roleId }),
-    handleDeleteMapping: true,
+    initializeRoleMapping: (roleMappingId) => ({ roleMappingId }),
+    handleDeleteMapping: (roleMappingId: string) => ({ roleMappingId }),
     handleSaveMapping: true,
+    openRoleMappingFlyout: true,
+    closeRoleMappingFlyout: false,
   },
   reducers: {
     dataLoading: [
@@ -169,6 +170,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       {
         setRoleMappingData: (_, { roleMapping }) => roleMapping || null,
         resetState: () => null,
+        closeRoleMappingFlyout: () => null,
       },
     ],
     roleType: [
@@ -185,7 +187,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         setRoleMappingData: (_, { roleMapping }) =>
           roleMapping ? roleMapping.accessAllEngines : true,
         handleRoleChange: (_, { roleType }) => !roleHasScopedEngines(roleType),
-        handleAccessAllEnginesChange: (accessAllEngines) => !accessAllEngines,
+        handleAccessAllEnginesChange: (_, { selected }) => selected,
       },
     ],
     attributeValue: [
@@ -197,6 +199,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           value === 'role' ? firstElasticsearchRole : '',
         handleAttributeValueChange: (_, { value }) => value,
         resetState: () => '',
+        closeRoleMappingFlyout: () => '',
       },
     ],
     attributeName: [
@@ -206,6 +209,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           roleMapping ? getFirstAttributeName(roleMapping) : 'username',
         handleAttributeSelectorChange: (_, { value }) => value,
         resetState: () => 'username',
+        closeRoleMappingFlyout: () => 'username',
       },
     ],
     selectedEngines: [
@@ -214,13 +218,9 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         setRoleMappingData: (_, { roleMapping }) =>
           roleMapping ? new Set(roleMapping.engines.map((engine) => engine.name)) : new Set(),
         handleAccessAllEnginesChange: () => new Set(),
-        handleEngineSelectionChange: (engines, { engineName, selected }) => {
-          const newSelectedEngineNames = new Set(engines as Set<string>);
-          if (selected) {
-            newSelectedEngineNames.add(engineName);
-          } else {
-            newSelectedEngineNames.delete(engineName);
-          }
+        handleEngineSelectionChange: (_, { engineNames }) => {
+          const newSelectedEngineNames = new Set() as Set<string>;
+          engineNames.forEach((engineName) => newSelectedEngineNames.add(engineName));
 
           return newSelectedEngineNames;
         },
@@ -250,7 +250,35 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           roleMapping ? roleMapping.authProvider : [ANY_AUTH_PROVIDER],
       },
     ],
+    roleMappingFlyoutOpen: [
+      false,
+      {
+        openRoleMappingFlyout: () => true,
+        closeRoleMappingFlyout: () => false,
+        initializeRoleMappings: () => false,
+        initializeRoleMapping: () => true,
+      },
+    ],
+    roleMappingErrors: [
+      [],
+      {
+        setRoleMappingErrors: (_, { errors }) => errors,
+        handleSaveMapping: () => [],
+        closeRoleMappingFlyout: () => [],
+      },
+    ],
   },
+  selectors: ({ selectors }) => ({
+    selectedOptions: [
+      () => [selectors.selectedEngines, selectors.availableEngines],
+      (selectedEngines, availableEngines) => {
+        const selectedNames = Array.from(selectedEngines.values());
+        return availableEngines
+          .filter(({ name }: { name: string }) => selectedNames.includes(name))
+          .map(({ name }: { name: string }) => ({ label: name, value: name }));
+      },
+    ],
+  }),
   listeners: ({ actions, values }) => ({
     initializeRoleMappings: async () => {
       const { http } = HttpLogic.values;
@@ -263,33 +291,31 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         flashAPIErrors(e);
       }
     },
-    initializeRoleMapping: async ({ roleId }) => {
+    initializeRoleMapping: async ({ roleMappingId }) => {
       const { http } = HttpLogic.values;
-      const { navigateToUrl } = KibanaLogic.values;
-      const route = roleId
-        ? `/api/app_search/role_mappings/${roleId}`
+      const route = roleMappingId
+        ? `/api/app_search/role_mappings/${roleMappingId}`
         : '/api/app_search/role_mappings/new';
 
       try {
         const response = await http.get(route);
         actions.setRoleMappingData(response);
       } catch (e) {
-        navigateToUrl(ROLE_MAPPINGS_PATH);
-        flashAPIErrors(e);
+        if (e.status === 404) {
+          setErrorMessage(ROLE_MAPPING_NOT_FOUND);
+        } else {
+          flashAPIErrors(e);
+        }
       }
     },
-    handleDeleteMapping: async () => {
-      const { roleMapping } = values;
-      if (!roleMapping) return;
-
+    handleDeleteMapping: async ({ roleMappingId }) => {
       const { http } = HttpLogic.values;
-      const { navigateToUrl } = KibanaLogic.values;
-      const route = `/api/app_search/role_mappings/${roleMapping.id}`;
+      const route = `/api/app_search/role_mappings/${roleMappingId}`;
 
       if (window.confirm(DELETE_ROLE_MAPPING_MESSAGE)) {
         try {
           await http.delete(route);
-          navigateToUrl(ROLE_MAPPINGS_PATH);
+          actions.initializeRoleMappings();
           setSuccessMessage(ROLE_MAPPING_DELETED_MESSAGE);
         } catch (e) {
           flashAPIErrors(e);
@@ -298,7 +324,6 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     },
     handleSaveMapping: async () => {
       const { http } = HttpLogic.values;
-      const { navigateToUrl } = KibanaLogic.values;
 
       const {
         attributeName,
@@ -330,14 +355,20 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
 
       try {
         await request;
-        navigateToUrl(ROLE_MAPPINGS_PATH);
+        actions.initializeRoleMappings();
         setSuccessMessage(SUCCESS_MESSAGE);
       } catch (e) {
-        flashAPIErrors(e);
+        actions.setRoleMappingErrors(e?.body?.attributes?.errors);
       }
     },
     resetState: () => {
       clearFlashMessages();
     },
+    closeRoleMappingFlyout: () => {
+      clearFlashMessages();
+    },
+    openRoleMappingFlyout: () => {
+      clearFlashMessages();
+    },
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_router.test.tsx
deleted file mode 100644
index e9fc40ba1dbb4..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_router.test.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { Route, Switch } from 'react-router-dom';
-
-import { shallow } from 'enzyme';
-
-import { RoleMapping } from './role_mapping';
-import { RoleMappings } from './role_mappings';
-import { RoleMappingsRouter } from './role_mappings_router';
-
-describe('RoleMappingsRouter', () => {
-  it('renders', () => {
-    const wrapper = shallow(<RoleMappingsRouter />);
-
-    expect(wrapper.find(Switch)).toHaveLength(1);
-    expect(wrapper.find(Route)).toHaveLength(3);
-    expect(wrapper.find(RoleMapping)).toHaveLength(2);
-    expect(wrapper.find(RoleMappings)).toHaveLength(1);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_router.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_router.tsx
deleted file mode 100644
index 7aa8b4067d9e5..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/role_mappings_router.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { Route, Switch } from 'react-router-dom';
-
-import { ROLE_MAPPING_NEW_PATH, ROLE_MAPPING_PATH, ROLE_MAPPINGS_PATH } from '../../routes';
-
-import { RoleMapping } from './role_mapping';
-import { RoleMappings } from './role_mappings';
-
-export const RoleMappingsRouter: React.FC = () => (
-  <Switch>
-    <Route exact path={ROLE_MAPPING_NEW_PATH}>
-      <RoleMapping isNew />
-    </Route>
-    <Route exact path={ROLE_MAPPINGS_PATH}>
-      <RoleMappings />
-    </Route>
-    <Route path={ROLE_MAPPING_PATH}>
-      <RoleMapping />
-    </Route>
-  </Switch>
-);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/utils.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/utils.test.ts
deleted file mode 100644
index e72f2b90758ac..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/utils.test.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { generateRoleMappingPath } from './utils';
-
-describe('generateRoleMappingPath', () => {
-  it('generates paths with roleId filled', () => {
-    const roleId = 'role123';
-
-    expect(generateRoleMappingPath(roleId)).toEqual(`/role_mappings/${roleId}`);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/utils.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/utils.ts
deleted file mode 100644
index 109d3de1b86db..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/role_mappings/utils.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { ROLE_MAPPING_PATH } from '../../routes';
-import { generateEncodedPath } from '../../utils/encode_path_params';
-
-export const generateRoleMappingPath = (roleId: string) =>
-  generateEncodedPath(ROLE_MAPPING_PATH, { roleId });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta.test.tsx
index 992afe4356a07..ac25e887c2de0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../__mocks__/enterprise_search_url.mock';
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta_logic.test.ts
index 740c4df697d68..3400361144ca4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/sample_engine_creation_cta/sample_engine_creation_cta_logic.test.ts
@@ -10,7 +10,7 @@ import {
   mockHttpValues,
   mockKibanaValues,
   mockFlashMessageHelpers,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
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 eb40d70e13ff8..5d2b5c8a8eacf 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 7d377d5a92714..e4235336b1d4b 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 5bb08a6c8859a..e259e67dd2e4e 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import '../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
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 c8b0bb7ddbac5..366558556c6f9 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 1755fbea5fb7b..e76ab60005231 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
@@ -5,13 +5,12 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
-import '../../../../__mocks__/react_router_history.mock';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
+import { mockUseParams } from '../../../../__mocks__/react_router';
 import '../../../../__mocks__/shallow_useeffect.mock';
 import '../../../__mocks__/engine_logic.mock';
 
 import React from 'react';
-import { useParams } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
@@ -38,7 +37,7 @@ describe('ReindexJob', () => {
   };
 
   beforeEach(() => {
-    (useParams as jest.Mock).mockReturnValueOnce({ reindexJobId: 'abc1234567890' });
+    mockUseParams.mockReturnValueOnce({ reindexJobId: 'abc1234567890' });
     setMockValues(values);
     setMockActions(actions);
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job_logic.test.ts
index b872ad3c914c6..f01c735aeca8e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/reindex_job/reindex_job_logic.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../../__mocks__/kea_logic';
 import '../../../__mocks__/engine_logic.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_base_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_base_logic.test.ts
index 2f5788278aa0b..684780d72a275 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_base_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_base_logic.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 import '../../__mocks__/engine_logic.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_logic.test.ts
index 123f62af4eeba..7687296cf9f83 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_logic.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 import { mockEngineActions } from '../../__mocks__/engine_logic.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_meta_engine_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_meta_engine_logic.test.ts
index f265fb2d74113..4e56b26902142 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_meta_engine_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/schema/schema_meta_engine_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter } from '../../../__mocks__';
+import { LogicMounter } from '../../../__mocks__/kea_logic';
 
 import { SchemaType } from '../../../shared/schema/types';
 
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 13a94c666509b..f1713c36045e9 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, rerender } from '../../../__mocks__';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 import '../../__mocks__/engine_logic.mock';
 
 import React from 'react';
@@ -13,6 +13,8 @@ import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
+import { rerender } from '../../../test_helpers';
+
 import { ReindexJob } from './reindex_job';
 import { Schema, MetaEngineSchema } from './views';
 
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 b1322c148b577..1d677ad08db43 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import '../../../../__mocks__/shallow_useeffect.mock';
 
 import React from 'react';
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 23d1480e5dca9..91ec8eda55fc3 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import '../../../../__mocks__/shallow_useeffect.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/index.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/index.ts
new file mode 100644
index 0000000000000..68cad7b0a0c77
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/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 { SearchLogic } from './search_logic';
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/search_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/search_logic.test.ts
new file mode 100644
index 0000000000000..c0d81f87e3e02
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/search_logic.test.ts
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import '../../__mocks__/engine_logic.mock';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
+
+import { nextTick } from '@kbn/test/jest';
+
+import { SearchLogic } from './search_logic';
+
+describe('SearchLogic', () => {
+  const { mount } = new LogicMounter(SearchLogic);
+  const { http } = mockHttpValues;
+  const { flashAPIErrors } = mockFlashMessageHelpers;
+
+  const MOCK_SEARCH_RESPONSE = {
+    results: [
+      { id: { raw: 'document-1' }, _meta: { id: 'document-1', engine: 'some-engine' } },
+      { id: { raw: 'document-2' }, _meta: { id: 'document-2', engine: 'some-engine' } },
+      { id: { raw: 'document-3' }, _meta: { id: 'document-3', engine: 'some-engine' } },
+    ],
+  };
+
+  const DEFAULT_VALUES = {
+    searchDataLoading: false,
+    searchQuery: '',
+    searchResults: [],
+  };
+
+  beforeEach(() => {
+    jest.clearAllMocks();
+  });
+
+  const mountLogic = (values: object = {}) => mount(values, { id: '1' });
+
+  it('has expected default values', () => {
+    const logic = mountLogic();
+    expect(logic.values).toEqual(DEFAULT_VALUES);
+  });
+
+  describe('actions', () => {
+    describe('search', () => {
+      it('sets searchQuery & searchDataLoading to true', () => {
+        const logic = mountLogic({ searchQuery: '', searchDataLoading: false });
+
+        logic.actions.search('hello world');
+
+        expect(logic.values).toEqual({
+          ...DEFAULT_VALUES,
+          searchQuery: 'hello world',
+          searchDataLoading: true,
+        });
+      });
+    });
+
+    describe('onSearch', () => {
+      it('sets searchResults & searchDataLoading to false', () => {
+        const logic = mountLogic({ searchResults: [], searchDataLoading: true });
+
+        logic.actions.onSearch(MOCK_SEARCH_RESPONSE);
+
+        expect(logic.values).toEqual({
+          ...DEFAULT_VALUES,
+          searchResults: MOCK_SEARCH_RESPONSE.results,
+          searchDataLoading: false,
+        });
+      });
+    });
+  });
+
+  describe('listeners', () => {
+    describe('search', () => {
+      beforeAll(() => jest.useFakeTimers());
+      afterAll(() => jest.useRealTimers());
+
+      it('should make a GET API call with a search query', async () => {
+        http.get.mockReturnValueOnce(Promise.resolve(MOCK_SEARCH_RESPONSE));
+        const logic = mountLogic();
+        jest.spyOn(logic.actions, 'onSearch');
+
+        logic.actions.search('hello world');
+        jest.runAllTimers();
+        await nextTick();
+
+        expect(http.get).toHaveBeenCalledWith('/api/app_search/engines/some-engine/search', {
+          query: { query: 'hello world' },
+        });
+        expect(logic.actions.onSearch).toHaveBeenCalledWith(MOCK_SEARCH_RESPONSE);
+      });
+
+      it('handles errors', async () => {
+        http.get.mockReturnValueOnce(Promise.reject('error'));
+        const logic = mountLogic();
+
+        logic.actions.search('test');
+        jest.runAllTimers();
+        await nextTick();
+
+        expect(flashAPIErrors).toHaveBeenCalledWith('error');
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/search_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/search_logic.ts
new file mode 100644
index 0000000000000..d9b7d575ae0e1
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search/search_logic.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 { kea, MakeLogicType } from 'kea';
+
+import { flashAPIErrors } from '../../../shared/flash_messages';
+
+import { HttpLogic } from '../../../shared/http';
+import { EngineLogic } from '../engine';
+
+import { Result } from '../result/types';
+
+interface SearchValues {
+  searchDataLoading: boolean;
+  searchQuery: string;
+  searchResults: Result[];
+}
+
+interface SearchActions {
+  search(query: string): { query: string };
+  onSearch({ results }: { results: Result[] }): { results: Result[] };
+}
+
+export const SearchLogic = kea<MakeLogicType<SearchValues, SearchActions>>({
+  key: (props) => props.id,
+  path: (key: string) => ['enterprise_search', 'app_search', 'search_logic', key],
+  actions: () => ({
+    search: (query) => ({ query }),
+    onSearch: ({ results }) => ({ results }),
+  }),
+  reducers: () => ({
+    searchDataLoading: [
+      false,
+      {
+        search: () => true,
+        onSearch: () => false,
+      },
+    ],
+    searchQuery: [
+      '',
+      {
+        search: (_, { query }) => query,
+      },
+    ],
+    searchResults: [
+      [],
+      {
+        onSearch: (_, { results }) => results,
+      },
+    ],
+  }),
+  listeners: ({ actions }) => ({
+    search: async ({ query }, breakpoint) => {
+      await breakpoint(250);
+
+      const { http } = HttpLogic.values;
+      const { engineName } = EngineLogic.values;
+
+      try {
+        const response = await http.get(`/api/app_search/engines/${engineName}/search`, {
+          query: { query },
+        });
+        actions.onSearch(response);
+      } catch (e) {
+        flashAPIErrors(e);
+      }
+    },
+  }),
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.test.tsx
index b015c2dec6c0a..944c99f7c61c2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.test.tsx
@@ -9,11 +9,13 @@ jest.mock('../utils', () => ({
   generatePreviewUrl: jest.fn(),
 }));
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
-import { shallow } from 'enzyme';
+import { shallow, ShallowWrapper } from 'enzyme';
+
+import { EuiForm } from '@elastic/eui';
 
 import { ActiveField } from '../types';
 import { generatePreviewUrl } from '../utils';
@@ -29,6 +31,7 @@ describe('SearchUIForm', () => {
     urlField: 'url',
     facetFields: ['category'],
     sortFields: ['size'],
+    dataLoading: false,
   };
   const actions = {
     onActiveFieldChange: jest.fn(),
@@ -43,10 +46,6 @@ describe('SearchUIForm', () => {
     setMockActions(actions);
   });
 
-  beforeEach(() => {
-    jest.clearAllMocks();
-  });
-
   it('renders', () => {
     const wrapper = shallow(<SearchUIForm />);
     expect(wrapper.find('[data-test-subj="selectTitle"]').exists()).toBe(true);
@@ -56,6 +55,7 @@ describe('SearchUIForm', () => {
   });
 
   describe('title field', () => {
+    beforeEach(() => jest.clearAllMocks());
     const subject = () => shallow(<SearchUIForm />).find('[data-test-subj="selectTitle"]');
 
     it('renders with its value set from state', () => {
@@ -84,6 +84,7 @@ describe('SearchUIForm', () => {
   });
 
   describe('url field', () => {
+    beforeEach(() => jest.clearAllMocks());
     const subject = () => shallow(<SearchUIForm />).find('[data-test-subj="selectUrl"]');
 
     it('renders with its value set from state', () => {
@@ -112,6 +113,7 @@ describe('SearchUIForm', () => {
   });
 
   describe('filters field', () => {
+    beforeEach(() => jest.clearAllMocks());
     const subject = () => shallow(<SearchUIForm />).find('[data-test-subj="selectFilters"]');
 
     it('renders with its value set from state', () => {
@@ -145,6 +147,7 @@ describe('SearchUIForm', () => {
   });
 
   describe('sorts field', () => {
+    beforeEach(() => jest.clearAllMocks());
     const subject = () => shallow(<SearchUIForm />).find('[data-test-subj="selectSort"]');
 
     it('renders with its value set from state', () => {
@@ -177,26 +180,61 @@ describe('SearchUIForm', () => {
     });
   });
 
-  it('includes a link to generate the preview', () => {
-    (generatePreviewUrl as jest.Mock).mockReturnValue('http://www.example.com?foo=bar');
+  describe('generate preview button', () => {
+    let wrapper: ShallowWrapper;
 
-    setMockValues({
-      ...values,
-      urlField: 'foo',
-      titleField: 'bar',
-      facetFields: ['baz'],
-      sortFields: ['qux'],
+    beforeAll(() => {
+      jest.clearAllMocks();
+      (generatePreviewUrl as jest.Mock).mockReturnValue('http://www.example.com?foo=bar');
+      setMockValues({
+        ...values,
+        urlField: 'foo',
+        titleField: 'bar',
+        facetFields: ['baz'],
+        sortFields: ['qux'],
+        searchKey: 'search-123abc',
+      });
+      wrapper = shallow(<SearchUIForm />);
+    });
+
+    it('should be a submit button', () => {
+      expect(wrapper.find('[data-test-subj="generateSearchUiPreview"]').prop('type')).toBe(
+        'submit'
+      );
+    });
+
+    it('should be wrapped in a form configured to POST to the preview screen in a new tab', () => {
+      const form = wrapper.find(EuiForm);
+      expect(generatePreviewUrl).toHaveBeenCalledWith({
+        urlField: 'foo',
+        titleField: 'bar',
+        facets: ['baz'],
+        sortFields: ['qux'],
+      });
+      expect(form.prop('action')).toBe('http://www.example.com?foo=bar');
+      expect(form.prop('target')).toBe('_blank');
+      expect(form.prop('method')).toBe('POST');
+      expect(form.prop('component')).toBe('form');
     });
 
-    const subject = () =>
-      shallow(<SearchUIForm />).find('[data-test-subj="generateSearchUiPreview"]');
+    it('should include a searchKey in that form POST', () => {
+      const form = wrapper.find(EuiForm);
+      const hiddenInput = form.find('input[type="hidden"]');
+      expect(hiddenInput.prop('id')).toBe('searchKey');
+      expect(hiddenInput.prop('value')).toBe('search-123abc');
+    });
+  });
 
-    expect(subject().prop('href')).toBe('http://www.example.com?foo=bar');
-    expect(generatePreviewUrl).toHaveBeenCalledWith({
-      urlField: 'foo',
-      titleField: 'bar',
-      facets: ['baz'],
-      sortFields: ['qux'],
+  it('should disable everything while data is loading', () => {
+    setMockValues({
+      ...values,
+      dataLoading: true,
     });
+    const wrapper = shallow(<SearchUIForm />);
+    expect(wrapper.find('[data-test-subj="selectTitle"]').prop('disabled')).toBe(true);
+    expect(wrapper.find('[data-test-subj="selectFilters"]').prop('isDisabled')).toBe(true);
+    expect(wrapper.find('[data-test-subj="selectSort"]').prop('isDisabled')).toBe(true);
+    expect(wrapper.find('[data-test-subj="selectUrl"]').prop('disabled')).toBe(true);
+    expect(wrapper.find('[data-test-subj="generateSearchUiPreview"]').prop('disabled')).toBe(true);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.tsx
index 15bd699be721c..b795a46268237 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_form.tsx
@@ -11,6 +11,7 @@ import { useValues, useActions } from 'kea';
 
 import { EuiForm, EuiFormRow, EuiSelect, EuiComboBox, EuiButton } from '@elastic/eui';
 
+import { EngineLogic } from '../../engine';
 import {
   TITLE_FIELD_LABEL,
   TITLE_FIELD_HELP_TEXT,
@@ -27,7 +28,9 @@ import { ActiveField } from '../types';
 import { generatePreviewUrl } from '../utils';
 
 export const SearchUIForm: React.FC = () => {
+  const { searchKey } = useValues(EngineLogic);
   const {
+    dataLoading,
     validFields,
     validSortFields,
     validFacetFields,
@@ -70,9 +73,11 @@ export const SearchUIForm: React.FC = () => {
   const selectedFacetOptions = formatMultiOptions(facetFields);
 
   return (
-    <EuiForm>
+    <EuiForm component="form" action={previewHref} target="_blank" method="POST">
+      <input type="hidden" id="searchKey" name="searchKey" value={searchKey} />
       <EuiFormRow label={TITLE_FIELD_LABEL} helpText={TITLE_FIELD_HELP_TEXT} fullWidth>
         <EuiSelect
+          disabled={dataLoading}
           options={optionFields}
           value={selectedTitleOption && selectedTitleOption.value}
           onChange={(e) => onTitleFieldChange(e.target.value)}
@@ -85,6 +90,7 @@ export const SearchUIForm: React.FC = () => {
       </EuiFormRow>
       <EuiFormRow label={FILTER_FIELD_LABEL} helpText={FILTER_FIELD_HELP_TEXT} fullWidth>
         <EuiComboBox
+          isDisabled={dataLoading}
           options={facetOptionFields}
           selectedOptions={selectedFacetOptions}
           onChange={(newValues) => onFacetFieldsChange(newValues.map((field) => field.value!))}
@@ -96,6 +102,7 @@ export const SearchUIForm: React.FC = () => {
       </EuiFormRow>
       <EuiFormRow label={SORT_FIELD_LABEL} helpText={SORT_FIELD_HELP_TEXT} fullWidth>
         <EuiComboBox
+          isDisabled={dataLoading}
           options={sortOptionFields}
           selectedOptions={selectedSortOptions}
           onChange={(newValues) => onSortFieldsChange(newValues.map((field) => field.value!))}
@@ -108,6 +115,7 @@ export const SearchUIForm: React.FC = () => {
 
       <EuiFormRow label={URL_FIELD_LABEL} helpText={URL_FIELD_HELP_TEXT} fullWidth>
         <EuiSelect
+          disabled={dataLoading}
           options={optionFields}
           value={selectedURLOption && selectedURLOption.value}
           onChange={(e) => onUrlFieldChange(e.target.value)}
@@ -119,8 +127,8 @@ export const SearchUIForm: React.FC = () => {
         />
       </EuiFormRow>
       <EuiButton
-        href={previewHref}
-        target="_blank"
+        disabled={dataLoading}
+        type="submit"
         fill
         iconType="popout"
         iconSide="right"
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_graphic.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_graphic.test.tsx
index 0326cef9a2455..056543fb5e748 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_graphic.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/components/search_ui_graphic.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/i18n.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/i18n.ts
index dfdc1d1db4c39..e26df0bd89832 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/i18n.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/i18n.ts
@@ -7,6 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { CREDENTIALS_TITLE } from '../credentials';
+
 export const SEARCH_UI_TITLE = i18n.translate(
   'xpack.enterpriseSearch.appSearch.engine.searchUI.title',
   { defaultMessage: 'Search UI' }
@@ -48,3 +50,9 @@ export const GENERATE_PREVIEW_BUTTON_LABEL = i18n.translate(
   'xpack.enterpriseSearch.appSearch.engine.searchUI.generatePreviewButtonLabel',
   { defaultMessage: 'Generate search experience' }
 );
+export const NO_SEARCH_KEY_ERROR = (engineName: string) =>
+  i18n.translate('xpack.enterpriseSearch.appSearch.engine.searchUI.noSearchKeyErrorMessage', {
+    defaultMessage:
+      "It looks like you don't have any Public Search Keys with access to the '{engineName}' engine. Please visit the {credentialsTitle} page to set one up.",
+    values: { engineName, credentialsTitle: CREDENTIALS_TITLE },
+  });
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 34c0669cc476e..edec376dd3edd 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
@@ -8,7 +8,7 @@
 import '../../../__mocks__/shallow_useeffect.mock';
 import '../../__mocks__/engine_logic.mock';
 
-import { setMockActions } from '../../../__mocks__';
+import { setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 2191c633131bb..f615f9a4e2c72 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
@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
-
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 import { mockEngineValues } from '../../__mocks__';
 
 import { nextTick } from '@kbn/test/jest';
@@ -18,7 +21,7 @@ import { SearchUILogic } from './';
 describe('SearchUILogic', () => {
   const { mount } = new LogicMounter(SearchUILogic);
   const { http } = mockHttpValues;
-  const { flashAPIErrors } = mockFlashMessageHelpers;
+  const { flashAPIErrors, setErrorMessage } = mockFlashMessageHelpers;
 
   const DEFAULT_VALUES = {
     dataLoading: true,
@@ -35,6 +38,7 @@ describe('SearchUILogic', () => {
   beforeEach(() => {
     jest.clearAllMocks();
     mockEngineValues.engineName = 'engine1';
+    mockEngineValues.searchKey = 'search-abc123';
   });
 
   it('has expected default values', () => {
@@ -155,6 +159,17 @@ describe('SearchUILogic', () => {
         });
       });
 
+      it('will short circuit the call if there is no searchKey available for this engine', async () => {
+        mockEngineValues.searchKey = '';
+        mount();
+
+        SearchUILogic.actions.loadFieldData();
+
+        expect(setErrorMessage).toHaveBeenCalledWith(
+          "It looks like you don't have any Public Search Keys with access to the 'engine1' engine. Please visit the Credentials page to set one up."
+        );
+      });
+
       it('handles errors', async () => {
         http.get.mockReturnValueOnce(Promise.reject('error'));
         mount();
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.ts
index c9e2e5623d9fd..096365f57ea36 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/search_ui_logic.ts
@@ -7,10 +7,12 @@
 
 import { kea, MakeLogicType } from 'kea';
 
-import { flashAPIErrors } from '../../../shared/flash_messages';
+import { flashAPIErrors, setErrorMessage } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
 import { EngineLogic } from '../engine';
 
+import { NO_SEARCH_KEY_ERROR } from './i18n';
+
 import { ActiveField } from './types';
 
 interface InitialFieldValues {
@@ -84,7 +86,12 @@ export const SearchUILogic = kea<MakeLogicType<SearchUIValues, SearchUIActions>>
   listeners: ({ actions }) => ({
     loadFieldData: async () => {
       const { http } = HttpLogic.values;
-      const { engineName } = EngineLogic.values;
+      const { searchKey, engineName } = EngineLogic.values;
+
+      if (!searchKey) {
+        setErrorMessage(NO_SEARCH_KEY_ERROR(engineName));
+        return;
+      }
 
       const url = `/api/app_search/engines/${engineName}/search_ui/field_config`;
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.test.ts
index 8d99ffc514b3f..9a005649e7dc9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.test.ts
@@ -33,7 +33,7 @@ describe('generatePreviewUrl', () => {
         empty2: [''], // Empty fields should be stripped
       })
     ).toEqual(
-      'http://localhost:3002/as/engines/national-parks-demo/reference_application/preview?facets[]=baz&facets[]=qux&sortFields[]=quux&sortFields[]=quuz&titleField=foo&urlField=bar'
+      'http://localhost:3002/as/engines/national-parks-demo/search_experience/preview?facets[]=baz&facets[]=qux&sortFields[]=quux&sortFields[]=quuz&titleField=foo&urlField=bar'
     );
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.ts
index 72d90514ea0a0..6c57df0d66a2a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/search_ui/utils.ts
@@ -15,7 +15,7 @@ export const generatePreviewUrl = (query: ParsedQuery) => {
   return queryString.stringifyUrl(
     {
       query,
-      url: getAppSearchUrl(`/engines/${engineName}/reference_application/preview`),
+      url: getAppSearchUrl(`/engines/${engineName}/search_experience/preview`),
     },
     { arrayFormat: 'bracket', skipEmptyString: true }
   );
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.test.tsx
index 494517a438372..fc20a9dbc5519 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_confirmation_modal.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.test.tsx
index aee23e61e76fe..3f6bbe4307b57 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/settings/log_retention/log_retention_panel.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_button.test.tsx
index 43a4682849c78..fb214b267038f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_button.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_button.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_modal.test.tsx
index 19c2f72ed6f52..b02a21ac45aed 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/add_source_engines_modal.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/source_engines_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/source_engines_table.test.tsx
index 895c7ab35e86a..7638db403191a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/source_engines_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/components/source_engines_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mountWithIntl, setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -13,6 +13,8 @@ import { shallow } from 'enzyme';
 
 import { EuiInMemoryTable, EuiButtonIcon } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../test_helpers';
+
 import { SourceEnginesTable } from './source_engines_table';
 
 describe('SourceEnginesTable', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines.test.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines.test.tsx
index 8cfcaeec97b87..9d2fe653150c3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 import '../../../__mocks__/shallow_useeffect.mock';
 import '../../__mocks__/engine_logic.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines_logic.test.ts
index 49886f1257a58..c39a25276a43c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/components/source_engines/source_engines_logic.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 import { mockRecursivelyFetchEngines } from '../../__mocks__';
 import '../../__mocks__/engine_logic.mock';
 
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 ccb28a86d67c9..7a1ba289865ee 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 dc2c6424bc2f9..15b74d1cdbca9 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 7fb3745eb158e..c8f65c4bdbc6c 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions, rerender } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 import '../../../__mocks__/shallow_useeffect.mock';
 import '../../__mocks__/engine_logic.mock';
 
@@ -16,6 +16,7 @@ import { shallow } from 'enzyme';
 import { EuiPageHeader, EuiButton, EuiPagination } from '@elastic/eui';
 
 import { Loading } from '../../../shared/loading';
+import { rerender } from '../../../test_helpers';
 
 import { SynonymCard, SynonymModal, EmptyState } from './components';
 
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 037f3d1e6912a..630a069d0c5e8 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
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues, mockFlashMessageHelpers } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
 import '../../__mocks__/engine_logic.mock';
 
 import { nextTick } from '@kbn/test/jest';
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 287d46c2dec75..4d8ff80326715 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
@@ -6,19 +6,21 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../common/__mocks__';
-import { setMockValues, rerender } from '../__mocks__';
+import { setMockValues } from '../__mocks__/kea_logic';
+import { mockUseRouteMatch } from '../__mocks__/react_router';
 import '../__mocks__/shallow_useeffect.mock';
 import '../__mocks__/enterprise_search_url.mock';
-import '../__mocks__/react_router_history.mock';
 
 import React from 'react';
 
-import { Redirect, useRouteMatch } from 'react-router-dom';
+import { Redirect } from 'react-router-dom';
 
 import { shallow, ShallowWrapper } from 'enzyme';
 
 import { Layout, SideNav, SideNavLink } from '../shared/layout';
 
+import { rerender } from '../test_helpers';
+
 jest.mock('./app_logic', () => ({ AppLogic: jest.fn() }));
 import { AppLogic } from './app_logic';
 
@@ -26,8 +28,9 @@ import { EngineRouter, EngineNav } from './components/engine';
 import { EngineCreation } from './components/engine_creation';
 import { EnginesOverview } from './components/engines';
 import { ErrorConnecting } from './components/error_connecting';
+import { Library } from './components/library';
 import { MetaEngineCreation } from './components/meta_engine_creation';
-import { RoleMappingsRouter } from './components/role_mappings';
+import { RoleMappings } from './components/role_mappings';
 import { SetupGuide } from './components/setup_guide';
 
 import { AppSearch, AppSearchUnconfigured, AppSearchConfigured, AppSearchNav } from './';
@@ -105,13 +108,13 @@ describe('AppSearchConfigured', () => {
       it('renders RoleMappings when canViewRoleMappings is true', () => {
         setMockValues({ myRole: { canViewRoleMappings: true } });
         rerender(wrapper);
-        expect(wrapper.find(RoleMappingsRouter)).toHaveLength(1);
+        expect(wrapper.find(RoleMappings)).toHaveLength(1);
       });
 
       it('does not render RoleMappings when user canViewRoleMappings is false', () => {
         setMockValues({ myRole: { canManageEngines: false } });
         rerender(wrapper);
-        expect(wrapper.find(RoleMappingsRouter)).toHaveLength(0);
+        expect(wrapper.find(RoleMappings)).toHaveLength(0);
       });
     });
 
@@ -147,6 +150,28 @@ describe('AppSearchConfigured', () => {
       });
     });
   });
+
+  describe('library', () => {
+    it('renders a library page in development', () => {
+      const OLD_ENV = process.env.NODE_ENV;
+      process.env.NODE_ENV = 'development';
+
+      rerender(wrapper);
+
+      expect(wrapper.find(Library)).toHaveLength(1);
+      process.env.NODE_ENV = OLD_ENV;
+    });
+
+    it("doesn't in production", () => {
+      const OLD_ENV = process.env.NODE_ENV;
+      process.env.NODE_ENV = 'production';
+
+      rerender(wrapper);
+
+      expect(wrapper.find(Library)).toHaveLength(0);
+      process.env.NODE_ENV = OLD_ENV;
+    });
+  });
 });
 
 describe('AppSearchNav', () => {
@@ -161,14 +186,14 @@ describe('AppSearchNav', () => {
     const getEnginesLink = (wrapper: ShallowWrapper) => wrapper.find(SideNavLink).dive();
 
     it('does not render the engine subnav on top-level routes', () => {
-      (useRouteMatch as jest.Mock).mockReturnValueOnce(false);
+      mockUseRouteMatch.mockReturnValueOnce(false);
       const wrapper = shallow(<AppSearchNav />);
 
       expect(getEnginesLink(wrapper).find(EngineNav)).toHaveLength(0);
     });
 
     it('renders the engine subnav if currently on an engine route', () => {
-      (useRouteMatch as jest.Mock).mockReturnValueOnce(true);
+      mockUseRouteMatch.mockReturnValueOnce(true);
       const wrapper = shallow(<AppSearchNav />);
 
       expect(getEnginesLink(wrapper).find(EngineNav)).toHaveLength(1);
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
index 9b59e0e19a5da..a491efcb234dc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/index.tsx
@@ -28,7 +28,7 @@ import { ErrorConnecting } from './components/error_connecting';
 import { KibanaHeaderActions } from './components/layout/kibana_header_actions';
 import { Library } from './components/library';
 import { MetaEngineCreation } from './components/meta_engine_creation';
-import { RoleMappingsRouter } from './components/role_mappings';
+import { RoleMappings } from './components/role_mappings';
 import { Settings, SETTINGS_TITLE } from './components/settings';
 import { SetupGuide } from './components/setup_guide';
 import {
@@ -112,7 +112,7 @@ export const AppSearchConfigured: React.FC<Required<InitialAppData>> = (props) =
             </Route>
             {canViewRoleMappings && (
               <Route path={ROLE_MAPPINGS_PATH}>
-                <RoleMappingsRouter />
+                <RoleMappings />
               </Route>
             )}
             {canManageEngines && (
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
index 872db3e149b60..c8fb009fb31da 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/routes.ts
@@ -16,8 +16,6 @@ export const SETTINGS_PATH = '/settings';
 export const CREDENTIALS_PATH = '/credentials';
 
 export const ROLE_MAPPINGS_PATH = '/role_mappings';
-export const ROLE_MAPPING_PATH = `${ROLE_MAPPINGS_PATH}/:roleId`;
-export const ROLE_MAPPING_NEW_PATH = `${ROLE_MAPPINGS_PATH}/new`;
 
 export const ENGINES_PATH = '/engines';
 export const ENGINE_CREATION_PATH = '/engine_creation';
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 88863e83f9b67..f7464d1861265 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
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import '../../../__mocks__/react_router_history.mock';
-import { useParams } from 'react-router-dom';
+import { mockUseParams } from '../../../__mocks__/react_router';
 
 import { encodePathParams, generateEncodedPath, useDecodedParams } from './';
 
@@ -38,7 +37,7 @@ describe('generateEncodedPath', () => {
 
 describe('useDecodedParams', () => {
   it('decodeURIComponent()s all object values from useParams()', () => {
-    (useParams as jest.Mock).mockReturnValue({
+    mockUseParams.mockReturnValue({
       someValue: 'hello%20world%3F%3F%3F',
       anotherValue: 'test!%40%23%24%25%5E%26*%5B%5D%2F%7C%3B%3A%22%3C%3E~%60',
     });
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 5137a60ffe59d..47d1fe6b69d56 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
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import { mountWithIntl } from '../../../__mocks__';
-
 import React from 'react';
 
+import { mountWithIntl } from '../../../test_helpers';
+
 import { FormattedDateTime } from './';
 
 describe('FormattedDateTime', () => {
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 104f98e45a5f5..a73dd075115ee 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
+import { mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/types.ts b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/types.ts
index 8aa58d08b96dd..f125a9dd13aa5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/app_search/utils/role/types.ts
@@ -52,6 +52,6 @@ export interface ASRoleMapping extends RoleMapping {
 }
 
 export interface AdvanceRoleType {
-  type: RoleTypes;
+  id: RoleTypes;
   description: string;
 }
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.test.tsx
index 26892f7cec7ae..0c77a0fbf6f5a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/license_callout/license_callout.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../__mocks__';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx
index 8631e6e2a51d4..9d54a9f1725e9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_card/product_card.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, mockTelemetryActions } from '../../../__mocks__';
+import { setMockValues, mockTelemetryActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
index 9c0f7c2bac94b..90e16fe2d22fa 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/product_selector/product_selector.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../__mocks__/kea.mock';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.test.tsx
index 2ed2f9e43e9c4..72958acacb034 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/components/trial_callout/trial_callout.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../__mocks__';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.test.tsx b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.test.tsx
index 2d8dbd55f4366..fbb3e58f198a7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/enterprise_search/index.test.tsx
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
-import { setMockValues, rerender } from '../__mocks__';
+import { setMockValues } from '../__mocks__/kea_logic';
 
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
+import { rerender } from '../test_helpers';
+
 import { ErrorConnecting } from './components/error_connecting';
 import { ProductSelector } from './components/product_selector';
 import { SetupGuide } from './components/setup_guide';
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 d9d31f5a45d4b..e8f0816de5225 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import '../../__mocks__/kea.mock';
+import '../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx
index 289dcc0137cb8..6f4f3853fa8c9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../__mocks__/kea.mock';
+import { setMockValues, setMockActions } from '../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts
index c7dc658dada74..19e236ac122f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/flash_messages_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockKibanaValues } from '../../__mocks__/kibana_logic.mock';
+import { mockKibanaValues } from '../../__mocks__/kea_logic/kibana_logic.mock';
 
 import { resetContext } from 'kea';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.test.ts
index b6b0e23ce7d6a..b361e796b4f43 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/handle_api_errors.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import '../../__mocks__/kibana_logic.mock';
+import '../../__mocks__/kea_logic/kibana_logic.mock';
 
 import { FlashMessagesLogic } from './flash_messages_logic';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/set_message_helpers.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/set_message_helpers.test.ts
index d22be32e038cb..6d56c7b202797 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/set_message_helpers.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/flash_messages/set_message_helpers.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import '../../__mocks__/kibana_logic.mock';
+import '../../__mocks__/kea_logic/kibana_logic.mock';
 
 import { FlashMessagesLogic } from './flash_messages_logic';
 import {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.test.ts
index a5f54d16b2fad..4cc907c3de9e4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana/kibana_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockKibanaValues } from '../../__mocks__';
+import { mockKibanaValues } from '../../__mocks__/kea_logic';
 
 import { resetContext } from 'kea';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
index c05c4dcbdddc0..f5d10ba4bc00f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/kibana_chrome/generate_breadcrumbs.test.ts
@@ -5,7 +5,8 @@
  * 2.0.
  */
 
-import { setMockValues, mockKibanaValues, mockHistory } from '../../__mocks__';
+import { setMockValues, mockKibanaValues } from '../../__mocks__/kea_logic';
+import { mockHistory } from '../../__mocks__/react_router';
 
 jest.mock('../react_router_helpers', () => ({
   letBrowserHandleEvent: jest.fn(() => false),
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 c9743e6824018..d396aba895587 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
@@ -6,7 +6,8 @@
  */
 
 import '../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, mockKibanaValues, mockHistory } from '../../__mocks__';
+import { setMockValues, mockKibanaValues } from '../../__mocks__/kea_logic';
+import { mockHistory } from '../../__mocks__/react_router';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx
index 451b49738029d..244037d6e1382 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/layout/side_nav.test.tsx
@@ -5,10 +5,9 @@
  * 2.0.
  */
 
-import '../../__mocks__/react_router_history.mock';
+import { mockLocation } from '../../__mocks__/react_router';
 
 import React from 'react';
-import { useLocation } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
@@ -63,7 +62,7 @@ describe('SideNavLink', () => {
   });
 
   it('sets an active class if the current path matches the nav link', () => {
-    (useLocation as jest.Mock).mockImplementationOnce(() => ({ pathname: '/test/' }));
+    mockLocation.pathname = '/test/';
 
     const wrapper = shallow(<SideNavLink to="/test">Link</SideNavLink>);
 
@@ -71,7 +70,7 @@ describe('SideNavLink', () => {
   });
 
   it('sets an active class if the current path is / and the link isRoot', () => {
-    (useLocation as jest.Mock).mockImplementationOnce(() => ({ pathname: '/' }));
+    mockLocation.pathname = '/';
 
     const wrapper = shallow(
       <SideNavLink to="/test" isRoot>
@@ -111,7 +110,7 @@ describe('SideNavLink', () => {
 
   describe('shouldShowActiveForSubroutes', () => {
     it("won't set an active class when route is a subroute of 'to'", () => {
-      (useLocation as jest.Mock).mockImplementationOnce(() => ({ pathname: '/documents/1234' }));
+      mockLocation.pathname = '/documents/1234';
 
       const wrapper = shallow(
         <SideNavLink to="/documents" isRoot>
@@ -123,7 +122,7 @@ describe('SideNavLink', () => {
     });
 
     it('sets an active class if the current path is a subRoute of "to", and shouldShowActiveForSubroutes is true', () => {
-      (useLocation as jest.Mock).mockImplementationOnce(() => ({ pathname: '/documents/1234' }));
+      mockLocation.pathname = '/documents/1234';
 
       const wrapper = shallow(
         <SideNavLink to="/documents" isRoot shouldShowActiveForSubroutes>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
index 7e75b2b47bb7a..1561224a26e42 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/not_found/not_found.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../__mocks__/kea.mock';
+import { setMockValues } from '../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 fe2973cfdee32..2ffe87279d44f 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockHistory } from '../../__mocks__';
+import { mockHistory } from '../../__mocks__/react_router';
 
 import { httpServiceMock } from 'src/core/public/mocks';
 
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 75639ffeb9d6b..7fded20cdd87e 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,9 +5,8 @@
  * 2.0.
  */
 
-import '../../__mocks__/kea.mock';
-
-import { mockKibanaValues, mockHistory } from '../../__mocks__';
+import { mockKibanaValues } from '../../__mocks__/kea_logic';
+import { mockHistory } from '../../__mocks__/react_router';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/add_role_mapping_button.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/add_role_mapping_button.test.tsx
deleted file mode 100644
index a02f6c43225c0..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/add_role_mapping_button.test.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { EuiButtonTo } from '../react_router_helpers';
-
-import { AddRoleMappingButton } from './add_role_mapping_button';
-
-describe('AddRoleMappingButton', () => {
-  it('renders', () => {
-    const wrapper = shallow(<AddRoleMappingButton path="/foo" />);
-
-    expect(wrapper.find(EuiButtonTo)).toHaveLength(1);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/add_role_mapping_button.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/add_role_mapping_button.tsx
deleted file mode 100644
index 097302e0aa5f1..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/add_role_mapping_button.tsx
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { EuiButtonTo } from '../react_router_helpers';
-
-import { ADD_ROLE_MAPPING_BUTTON } from './constants';
-
-interface Props {
-  path: string;
-}
-
-export const AddRoleMappingButton: React.FC<Props> = ({ path }) => (
-  <EuiButtonTo to={path} fill>
-    {ADD_ROLE_MAPPING_BUTTON}
-  </EuiButtonTo>
-);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx
index 504acf9ae1c6a..d19d090b6e706 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.test.tsx
@@ -23,6 +23,7 @@ const handleAuthProviderChange = jest.fn();
 const baseProps = {
   attributeName: 'username' as AttributeName,
   attributeValue: 'Something',
+  attributeValueInvalid: false,
   attributes: ['a', 'b', 'c'],
   availableAuthProviders: ['ees_saml', 'kbn_saml'],
   selectedAuthProviders: ['ees_saml'],
@@ -114,6 +115,14 @@ describe('AttributeSelector', () => {
       expect(handleAuthProviderChange).toHaveBeenCalledWith(['kbn_saml']);
     });
 
+    it('should call the "handleAuthProviderChange" prop with fallback when a value not present', () => {
+      const wrapper = shallow(<AttributeSelector {...baseProps} />);
+      const select = findAuthProvidersSelect(wrapper);
+      select.simulate('change', [{ label: 'kbn_saml' }]);
+
+      expect(handleAuthProviderChange).toHaveBeenCalledWith(['']);
+    });
+
     it('should call the "handleAttributeSelectorChange" prop when a value is selected', () => {
       const wrapper = shallow(<AttributeSelector {...baseProps} />);
       const select = wrapper.find('[data-test-subj="ExternalAttributeSelect"]');
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx
index 0ee093ed934c9..bedb6b3df90f2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/attribute_selector.tsx
@@ -11,13 +11,8 @@ import {
   EuiComboBox,
   EuiComboBoxOptionOption,
   EuiFieldText,
-  EuiFlexGroup,
-  EuiFlexItem,
   EuiFormRow,
-  EuiPanel,
   EuiSelect,
-  EuiSpacer,
-  EuiTitle,
 } from '@elastic/eui';
 
 import { AttributeName, AttributeExamples } from '../types';
@@ -25,17 +20,18 @@ import { AttributeName, AttributeExamples } from '../types';
 import {
   ANY_AUTH_PROVIDER,
   ANY_AUTH_PROVIDER_OPTION_LABEL,
+  ATTRIBUTE_VALUE_LABEL,
+  ATTRIBUTE_VALUE_ERROR,
   AUTH_ANY_PROVIDER_LABEL,
   AUTH_INDIVIDUAL_PROVIDER_LABEL,
-  ATTRIBUTE_SELECTOR_TITLE,
   AUTH_PROVIDER_LABEL,
   EXTERNAL_ATTRIBUTE_LABEL,
-  ATTRIBUTE_VALUE_LABEL,
 } from './constants';
 
 interface Props {
   attributeName: AttributeName;
   attributeValue?: string;
+  attributeValueInvalid: boolean;
   attributes: string[];
   selectedAuthProviders?: string[];
   availableAuthProviders?: string[];
@@ -89,6 +85,7 @@ const getSelectedOptions = (selectedAuthProviders: string[], availableAuthProvid
 export const AttributeSelector: React.FC<Props> = ({
   attributeName,
   attributeValue = '',
+  attributeValueInvalid,
   attributes,
   availableAuthProviders,
   selectedAuthProviders = [ANY_AUTH_PROVIDER],
@@ -100,80 +97,70 @@ export const AttributeSelector: React.FC<Props> = ({
   handleAuthProviderChange = () => null,
 }) => {
   return (
-    <EuiPanel data-test-subj="AttributeSelector" hasShadow={false} color="subdued" paddingSize="l">
-      <EuiTitle size="s">
-        <h3>{ATTRIBUTE_SELECTOR_TITLE}</h3>
-      </EuiTitle>
-      <EuiSpacer />
+    <div data-test-subj="AttributeSelector">
       {availableAuthProviders && multipleAuthProvidersConfig && (
-        <EuiFlexGroup alignItems="stretch">
-          <EuiFlexItem>
-            <EuiFormRow label={AUTH_PROVIDER_LABEL} fullWidth>
-              <EuiComboBox
-                data-test-subj="AuthProviderSelect"
-                selectedOptions={getSelectedOptions(selectedAuthProviders, availableAuthProviders)}
-                options={getAuthProviderOptions(availableAuthProviders)}
-                onChange={(options) => {
-                  handleAuthProviderChange(options.map((o) => (o as ChildOption).value));
-                }}
-                fullWidth
-                isDisabled={disabled}
-              />
-            </EuiFormRow>
-          </EuiFlexItem>
-          <EuiFlexItem />
-        </EuiFlexGroup>
+        <EuiFormRow label={AUTH_PROVIDER_LABEL} fullWidth>
+          <EuiComboBox
+            data-test-subj="AuthProviderSelect"
+            selectedOptions={getSelectedOptions(selectedAuthProviders, availableAuthProviders)}
+            options={getAuthProviderOptions(availableAuthProviders)}
+            onChange={(options) => {
+              handleAuthProviderChange(options.map((o) => o.value || ''));
+            }}
+            fullWidth
+            isDisabled={disabled}
+          />
+        </EuiFormRow>
       )}
-      <EuiFlexGroup alignItems="stretch">
-        <EuiFlexItem>
-          <EuiFormRow label={EXTERNAL_ATTRIBUTE_LABEL} fullWidth>
-            <EuiSelect
-              name="external-attribute"
-              data-test-subj="ExternalAttributeSelect"
-              value={attributeName}
-              required
-              options={attributes.map((attribute) => ({ value: attribute, text: attribute }))}
-              onChange={(e) => {
-                handleAttributeSelectorChange(e.target.value, elasticsearchRoles[0]);
-              }}
-              fullWidth
-              disabled={disabled}
-            />
-          </EuiFormRow>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFormRow label={ATTRIBUTE_VALUE_LABEL} fullWidth>
-            {attributeName === 'role' ? (
-              <EuiSelect
-                value={attributeValue}
-                name="elasticsearch-role"
-                data-test-subj="ElasticsearchRoleSelect"
-                required
-                options={elasticsearchRoles.map((elasticsearchRole) => ({
-                  value: elasticsearchRole,
-                  text: elasticsearchRole,
-                }))}
-                onChange={(e) => {
-                  handleAttributeValueChange(e.target.value);
-                }}
-                fullWidth
-                disabled={disabled}
-              />
-            ) : (
-              <EuiFieldText
-                value={attributeValue}
-                name="attribute-value"
-                placeholder={attributeValueExamples[attributeName]}
-                onChange={(e) => {
-                  handleAttributeValueChange(e.target.value);
-                }}
-                fullWidth
-                disabled={disabled}
-              />
-            )}
-          </EuiFormRow>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiPanel>
+      <EuiFormRow label={EXTERNAL_ATTRIBUTE_LABEL} fullWidth>
+        <EuiSelect
+          name="external-attribute"
+          data-test-subj="ExternalAttributeSelect"
+          value={attributeName}
+          required
+          options={attributes.map((attribute) => ({ value: attribute, text: attribute }))}
+          onChange={(e) => {
+            handleAttributeSelectorChange(e.target.value, elasticsearchRoles[0]);
+          }}
+          fullWidth
+          disabled={disabled}
+        />
+      </EuiFormRow>
+      <EuiFormRow
+        label={ATTRIBUTE_VALUE_LABEL}
+        fullWidth
+        isInvalid={attributeValueInvalid}
+        error={[ATTRIBUTE_VALUE_ERROR]}
+      >
+        {attributeName === 'role' ? (
+          <EuiSelect
+            value={attributeValue}
+            name="elasticsearch-role"
+            data-test-subj="ElasticsearchRoleSelect"
+            required
+            options={elasticsearchRoles.map((elasticsearchRole) => ({
+              value: elasticsearchRole,
+              text: elasticsearchRole,
+            }))}
+            onChange={(e) => {
+              handleAttributeValueChange(e.target.value);
+            }}
+            fullWidth
+            disabled={disabled}
+          />
+        ) : (
+          <EuiFieldText
+            value={attributeValue}
+            name="attribute-value"
+            placeholder={attributeValueExamples[attributeName]}
+            onChange={(e) => {
+              handleAttributeValueChange(e.target.value);
+            }}
+            fullWidth
+            disabled={disabled}
+          />
+        )}
+      </EuiFormRow>
+    </div>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
index a172fbae18d8f..be0c860627f79 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/constants.ts
@@ -7,6 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { ProductName } from '../types';
+
 export const ANY_AUTH_PROVIDER = '*';
 
 export const ANY_AUTH_PROVIDER_OPTION_LABEL = i18n.translate(
@@ -73,6 +75,13 @@ export const ATTRIBUTE_VALUE_LABEL = i18n.translate(
   }
 );
 
+export const ATTRIBUTE_VALUE_ERROR = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.attributeValueError',
+  {
+    defaultMessage: 'Attribute value is required',
+  }
+);
+
 export const DELETE_ROLE_MAPPING_TITLE = i18n.translate(
   'xpack.enterpriseSearch.roleMapping.deleteRoleMappingTitle',
   {
@@ -97,7 +106,7 @@ export const DELETE_ROLE_MAPPING_BUTTON = i18n.translate(
 export const FILTER_ROLE_MAPPINGS_PLACEHOLDER = i18n.translate(
   'xpack.enterpriseSearch.roleMapping.filterRoleMappingsPlaceholder',
   {
-    defaultMessage: 'Filter roles...',
+    defaultMessage: 'Filter role mappings',
   }
 );
 
@@ -118,17 +127,76 @@ export const MANAGE_ROLE_MAPPING_TITLE = i18n.translate(
   { defaultMessage: 'Manage role mapping' }
 );
 
-export const EMPTY_ROLE_MAPPINGS_TITLE = i18n.translate(
-  'xpack.enterpriseSearch.roleMapping.emptyRoleMappingsTitle',
+export const ROLE_MAPPING_NOT_FOUND = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.notFoundMessage',
   {
-    defaultMessage: 'No role mappings yet',
+    defaultMessage: 'No matching Role mapping found.',
   }
 );
 
-export const ROLE_MAPPINGS_DESCRIPTION = i18n.translate(
-  'xpack.enterpriseSearch.roleMapping.roleMappingsDescription',
+export const ROLE_MAPPING_FLYOUT_CREATE_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.flyoutCreateTitle',
   {
-    defaultMessage:
-      'Define role mappings for elasticsearch-native and elasticsearch-saml authentication.',
+    defaultMessage: 'Create a role mapping',
+  }
+);
+
+export const ROLE_MAPPING_FLYOUT_UPDATE_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.flyoutUpdateTitle',
+  {
+    defaultMessage: 'Update role mapping',
+  }
+);
+
+export const ROLE_MAPPING_FLYOUT_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.flyoutDescription',
+  {
+    defaultMessage: 'Assign roles and permissions based on user attributes',
+  }
+);
+
+export const ROLE_MAPPING_FLYOUT_CREATE_BUTTON = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.roleMappingFlyoutCreateButton',
+  {
+    defaultMessage: 'Create mapping',
+  }
+);
+
+export const ROLE_MAPPING_FLYOUT_UPDATE_BUTTON = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.roleMappingFlyoutUpdateButton',
+  {
+    defaultMessage: 'Update mapping',
   }
 );
+
+export const SAVE_ROLE_MAPPING = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.saveRoleMappingButtonLabel',
+  { defaultMessage: 'Save role mapping' }
+);
+
+export const UPDATE_ROLE_MAPPING = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.updateRoleMappingButtonLabel',
+  { defaultMessage: 'Update role mapping' }
+);
+
+export const ROLE_MAPPINGS_HEADING_TITLE = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.roleMappingsHeadingTitle',
+  { defaultMessage: 'Role mappings' }
+);
+
+export const ROLE_MAPPINGS_HEADING_DESCRIPTION = (productName: ProductName) =>
+  i18n.translate('xpack.enterpriseSearch.roleMapping.roleMappingsHeadingDescription', {
+    defaultMessage:
+      'Role mappings provide an interface to associate native or SAML-governed role attributes with {productName} permissions.',
+    values: { productName },
+  });
+
+export const ROLE_MAPPINGS_HEADING_DOCS_LINK = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.roleMappingsHeadingDocsLink',
+  { defaultMessage: 'Learn more about role mappings' }
+);
+
+export const ROLE_MAPPINGS_HEADING_BUTTON = i18n.translate(
+  'xpack.enterpriseSearch.roleMapping.roleMappingsHeadingButton',
+  { defaultMessage: 'Create a new role mapping' }
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/delete_mapping_callout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/delete_mapping_callout.test.tsx
deleted file mode 100644
index c7556ee20e26a..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/delete_mapping_callout.test.tsx
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { EuiButton, EuiCallOut } from '@elastic/eui';
-
-import { DeleteMappingCallout } from './delete_mapping_callout';
-
-describe('DeleteMappingCallout', () => {
-  const handleDeleteMapping = jest.fn();
-  it('renders', () => {
-    const wrapper = shallow(<DeleteMappingCallout handleDeleteMapping={handleDeleteMapping} />);
-
-    expect(wrapper.find(EuiCallOut)).toHaveLength(1);
-    expect(wrapper.find(EuiButton).prop('onClick')).toEqual(handleDeleteMapping);
-  });
-
-  it('handles button click', () => {
-    const wrapper = shallow(<DeleteMappingCallout handleDeleteMapping={handleDeleteMapping} />);
-    wrapper.find(EuiButton).simulate('click');
-
-    expect(handleDeleteMapping).toHaveBeenCalled();
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/delete_mapping_callout.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/delete_mapping_callout.tsx
deleted file mode 100644
index cb3c27038c566..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/delete_mapping_callout.tsx
+++ /dev/null
@@ -1,29 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { EuiButton, EuiCallOut } from '@elastic/eui';
-
-import {
-  DELETE_ROLE_MAPPING_TITLE,
-  DELETE_ROLE_MAPPING_DESCRIPTION,
-  DELETE_ROLE_MAPPING_BUTTON,
-} from './constants';
-
-interface Props {
-  handleDeleteMapping(): void;
-}
-
-export const DeleteMappingCallout: React.FC<Props> = ({ handleDeleteMapping }) => (
-  <EuiCallOut color="danger" iconType="alert" title={DELETE_ROLE_MAPPING_TITLE}>
-    <p>{DELETE_ROLE_MAPPING_DESCRIPTION}</p>
-    <EuiButton color="danger" fill onClick={handleDeleteMapping}>
-      {DELETE_ROLE_MAPPING_BUTTON}
-    </EuiButton>
-  </EuiCallOut>
-);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
index e6320dbb7feef..0f9362157f50a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/index.ts
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
-export { AddRoleMappingButton } from './add_role_mapping_button';
 export { AttributeSelector } from './attribute_selector';
-export { DeleteMappingCallout } from './delete_mapping_callout';
 export { RoleMappingsTable } from './role_mappings_table';
+export { RoleOptionLabel } from './role_option_label';
 export { RoleSelector } from './role_selector';
+export { RoleMappingFlyout } from './role_mapping_flyout';
+export { RoleMappingsHeading } from './role_mappings_heading';
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
new file mode 100644
index 0000000000000..c0973bb2c9504
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.test.tsx
@@ -0,0 +1,64 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { EuiFlyout } from '@elastic/eui';
+
+import {
+  ROLE_MAPPING_FLYOUT_CREATE_TITLE,
+  ROLE_MAPPING_FLYOUT_UPDATE_TITLE,
+  ROLE_MAPPING_FLYOUT_CREATE_BUTTON,
+  ROLE_MAPPING_FLYOUT_UPDATE_BUTTON,
+} from './constants';
+import { RoleMappingFlyout } from './role_mapping_flyout';
+
+describe('RoleMappingFlyout', () => {
+  const closeRoleMappingFlyout = jest.fn();
+  const handleSaveMapping = jest.fn();
+
+  const props = {
+    isNew: true,
+    disabled: false,
+    closeRoleMappingFlyout,
+    handleSaveMapping,
+  };
+
+  it('renders for new mapping', () => {
+    const wrapper = shallow(
+      <RoleMappingFlyout {...props}>
+        <div />
+      </RoleMappingFlyout>
+    );
+
+    expect(wrapper.find(EuiFlyout)).toHaveLength(1);
+    expect(wrapper.find('[data-test-subj="FlyoutTitle"]').prop('children')).toEqual(
+      ROLE_MAPPING_FLYOUT_CREATE_TITLE
+    );
+    expect(wrapper.find('[data-test-subj="FlyoutButton"]').prop('children')).toEqual(
+      ROLE_MAPPING_FLYOUT_CREATE_BUTTON
+    );
+  });
+
+  it('renders for existing mapping', () => {
+    const wrapper = shallow(
+      <RoleMappingFlyout {...props} isNew={false}>
+        <div />
+      </RoleMappingFlyout>
+    );
+
+    expect(wrapper.find(EuiFlyout)).toHaveLength(1);
+    expect(wrapper.find('[data-test-subj="FlyoutTitle"]').prop('children')).toEqual(
+      ROLE_MAPPING_FLYOUT_UPDATE_TITLE
+    );
+    expect(wrapper.find('[data-test-subj="FlyoutButton"]').prop('children')).toEqual(
+      ROLE_MAPPING_FLYOUT_UPDATE_BUTTON
+    );
+  });
+});
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
new file mode 100644
index 0000000000000..bae991fef3655
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mapping_flyout.tsx
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import {
+  EuiButton,
+  EuiButtonEmpty,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutFooter,
+  EuiFlyoutHeader,
+  EuiPortal,
+  EuiText,
+  EuiTitle,
+  EuiSpacer,
+} from '@elastic/eui';
+
+import { CANCEL_BUTTON_LABEL } from '../../shared/constants/actions';
+
+import {
+  ROLE_MAPPING_FLYOUT_CREATE_TITLE,
+  ROLE_MAPPING_FLYOUT_UPDATE_TITLE,
+  ROLE_MAPPING_FLYOUT_DESCRIPTION,
+  ROLE_MAPPING_FLYOUT_CREATE_BUTTON,
+  ROLE_MAPPING_FLYOUT_UPDATE_BUTTON,
+} from './constants';
+
+interface Props {
+  children: React.ReactNode;
+  isNew: boolean;
+  disabled: boolean;
+  closeRoleMappingFlyout(): void;
+  handleSaveMapping(): void;
+}
+
+export const RoleMappingFlyout: React.FC<Props> = ({
+  children,
+  isNew,
+  disabled,
+  closeRoleMappingFlyout,
+  handleSaveMapping,
+}) => (
+  <EuiPortal>
+    <EuiFlyout
+      ownFocus
+      onClose={closeRoleMappingFlyout}
+      size="s"
+      aria-labelledby="flyoutLargeTitle"
+    >
+      <EuiFlyoutHeader hasBorder>
+        <EuiTitle size="m">
+          <h2 id="flyoutLargeTitle" data-test-subj="FlyoutTitle">
+            {isNew ? ROLE_MAPPING_FLYOUT_CREATE_TITLE : ROLE_MAPPING_FLYOUT_UPDATE_TITLE}
+          </h2>
+        </EuiTitle>
+        <EuiText size="xs">
+          <p>{ROLE_MAPPING_FLYOUT_DESCRIPTION}</p>
+        </EuiText>
+      </EuiFlyoutHeader>
+      <EuiFlyoutBody>
+        {children}
+        <EuiSpacer />
+      </EuiFlyoutBody>
+      <EuiFlyoutFooter>
+        <EuiFlexGroup justifyContent="spaceBetween">
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty onClick={closeRoleMappingFlyout}>{CANCEL_BUTTON_LABEL}</EuiButtonEmpty>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButton
+              disabled={disabled}
+              onClick={handleSaveMapping}
+              fill
+              data-test-subj="FlyoutButton"
+            >
+              {isNew ? ROLE_MAPPING_FLYOUT_CREATE_BUTTON : ROLE_MAPPING_FLYOUT_UPDATE_BUTTON}
+            </EuiButton>
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlyoutFooter>
+    </EuiFlyout>
+  </EuiPortal>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.test.tsx
new file mode 100644
index 0000000000000..f0bf86fb306c6
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.test.tsx
@@ -0,0 +1,25 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { EuiTitle, EuiLink, EuiButton, EuiText } from '@elastic/eui';
+
+import { RoleMappingsHeading } from './role_mappings_heading';
+
+describe('RoleMappingsHeading', () => {
+  it('renders ', () => {
+    const wrapper = shallow(<RoleMappingsHeading productName="App Search" onClick={jest.fn()} />);
+
+    expect(wrapper.find(EuiTitle)).toHaveLength(1);
+    expect(wrapper.find(EuiText)).toHaveLength(1);
+    expect(wrapper.find(EuiLink)).toHaveLength(1);
+    expect(wrapper.find(EuiButton)).toHaveLength(1);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.tsx
new file mode 100644
index 0000000000000..b2143c6ff4402
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_heading.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 React from 'react';
+
+import {
+  EuiButton,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiLink,
+  EuiSpacer,
+  EuiText,
+  EuiTitle,
+} from '@elastic/eui';
+
+import { ProductName } from '../types';
+
+import {
+  ROLE_MAPPINGS_HEADING_TITLE,
+  ROLE_MAPPINGS_HEADING_DESCRIPTION,
+  ROLE_MAPPINGS_HEADING_DOCS_LINK,
+  ROLE_MAPPINGS_HEADING_BUTTON,
+} from './constants';
+
+interface Props {
+  productName: ProductName;
+  onClick(): void;
+}
+
+// TODO: Replace EuiLink href with acutal docs link when available
+const ROLE_MAPPINGS_DOCS_HREF = '#TODO';
+
+export const RoleMappingsHeading: React.FC<Props> = ({ productName, onClick }) => (
+  <>
+    <EuiFlexGroup justifyContent="spaceBetween">
+      <EuiFlexItem>
+        <EuiTitle>
+          <h2>{ROLE_MAPPINGS_HEADING_TITLE}</h2>
+        </EuiTitle>
+        <EuiSpacer size="xs" />
+        <EuiText color="subdued">
+          <p>
+            {ROLE_MAPPINGS_HEADING_DESCRIPTION(productName)}{' '}
+            <EuiLink external href={ROLE_MAPPINGS_DOCS_HREF} target="_blank">
+              {ROLE_MAPPINGS_HEADING_DOCS_LINK}
+            </EuiLink>
+          </p>
+        </EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiButton fill onClick={onClick}>
+          {ROLE_MAPPINGS_HEADING_BUTTON}
+        </EuiButton>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+    <EuiSpacer />
+  </>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
index e1c43dca581fe..5ec84db478bc3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.test.tsx
@@ -18,7 +18,8 @@ import { ALL_LABEL, ANY_AUTH_PROVIDER_OPTION_LABEL } from './constants';
 import { RoleMappingsTable } from './role_mappings_table';
 
 describe('RoleMappingsTable', () => {
-  const getRoleMappingPath = jest.fn();
+  const initializeRoleMapping = jest.fn();
+  const handleDeleteMapping = jest.fn();
   const roleMappings = [
     {
       ...wsRoleMapping,
@@ -36,7 +37,8 @@ describe('RoleMappingsTable', () => {
     roleMappings,
     addMappingButton: <button />,
     shouldShowAuthProvider: true,
-    getRoleMappingPath,
+    initializeRoleMapping,
+    handleDeleteMapping,
   };
 
   it('renders', () => {
@@ -63,6 +65,20 @@ describe('RoleMappingsTable', () => {
     expect(wrapper.find(EuiTableRow)).toHaveLength(0);
   });
 
+  it('handles manage click', () => {
+    const wrapper = shallow(<RoleMappingsTable {...props} />);
+    wrapper.find('[data-test-subj="ManageButton"]').simulate('click');
+
+    expect(initializeRoleMapping).toHaveBeenCalled();
+  });
+
+  it('handles delete click', () => {
+    const wrapper = shallow(<RoleMappingsTable {...props} />);
+    wrapper.find('[data-test-subj="DeleteButton"]').simulate('click');
+
+    expect(handleDeleteMapping).toHaveBeenCalled();
+  });
+
   it('handles input change with special chars', () => {
     const wrapper = shallow(<RoleMappingsTable {...props} />);
     const input = wrapper.find(EuiFieldSearch);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
index a5f6fb368c96f..f185e9ffb418e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_mappings_table.tsx
@@ -8,9 +8,8 @@
 import React, { Fragment, useState } from 'react';
 
 import {
+  EuiButtonIcon,
   EuiFieldSearch,
-  EuiFlexGroup,
-  EuiFlexItem,
   EuiIconTip,
   EuiSpacer,
   EuiTable,
@@ -25,8 +24,7 @@ import { i18n } from '@kbn/i18n';
 
 import { ASRoleMapping } from '../../app_search/types';
 import { WSRoleMapping } from '../../workplace_search/types';
-import { MANAGE_BUTTON_LABEL } from '../constants';
-import { EuiLinkTo } from '../react_router_helpers';
+import { MANAGE_BUTTON_LABEL, DELETE_BUTTON_LABEL } from '../constants';
 import { RoleRules } from '../types';
 
 import './role_mappings_table.scss';
@@ -54,10 +52,10 @@ interface Props {
   accessItemKey: 'groups' | 'engines';
   accessHeader: string;
   roleMappings: Array<ASRoleMapping | WSRoleMapping>;
-  addMappingButton: React.ReactNode;
   accessAllEngines?: boolean;
   shouldShowAuthProvider?: boolean;
-  getRoleMappingPath(roleId: string): string;
+  initializeRoleMapping(roleMappingId: string): void;
+  handleDeleteMapping(roleMappingId: string): void;
 }
 
 const MAX_CELL_WIDTH = 24;
@@ -71,9 +69,9 @@ export const RoleMappingsTable: React.FC<Props> = ({
   accessItemKey,
   accessHeader,
   roleMappings,
-  addMappingButton,
-  getRoleMappingPath,
   shouldShowAuthProvider,
+  initializeRoleMapping,
+  handleDeleteMapping,
 }) => {
   const [filterValue, updateValue] = useState('');
 
@@ -96,18 +94,30 @@ export const RoleMappingsTable: React.FC<Props> = ({
   const getFirstAttributeName = (rules: RoleRules): string => Object.entries(rules)[0][0];
   const getFirstAttributeValue = (rules: RoleRules): string => Object.entries(rules)[0][1];
 
+  const rowActions = (id: string) => (
+    <>
+      <EuiButtonIcon
+        onClick={() => initializeRoleMapping(id)}
+        iconType="pencil"
+        aria-label={MANAGE_BUTTON_LABEL}
+        data-test-subj="ManageButton"
+      />{' '}
+      <EuiButtonIcon
+        onClick={() => handleDeleteMapping(id)}
+        iconType="trash"
+        aria-label={DELETE_BUTTON_LABEL}
+        data-test-subj="DeleteButton"
+      />
+    </>
+  );
+
   return (
     <>
-      <EuiFlexGroup justifyContent="spaceBetween">
-        <EuiFlexItem>
-          <EuiFieldSearch
-            value={filterValue}
-            placeholder={FILTER_ROLE_MAPPINGS_PLACEHOLDER}
-            onChange={(e) => updateValue(e.target.value)}
-          />
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>{addMappingButton}</EuiFlexItem>
-      </EuiFlexGroup>
+      <EuiFieldSearch
+        value={filterValue}
+        placeholder={FILTER_ROLE_MAPPINGS_PLACEHOLDER}
+        onChange={(e) => updateValue(e.target.value)}
+      />
       <EuiSpacer />
       {filteredResults.length > 0 ? (
         <EuiTable className="roleMappingsTable">
@@ -155,7 +165,7 @@ export const RoleMappingsTable: React.FC<Props> = ({
                     </EuiTableRowCell>
                   )}
                   <EuiTableRowCell align="right">
-                    {id && <EuiLinkTo to={getRoleMappingPath(id)}>{MANAGE_BUTTON_LABEL}</EuiLinkTo>}
+                    {id && rowActions(id)}
                     {toolTip && <EuiIconTip position="left" content={toolTip.content} />}
                   </EuiTableRowCell>
                 </EuiTableRow>
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_option_label.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_option_label.test.tsx
new file mode 100644
index 0000000000000..7a998f20e4d8d
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_option_label.test.tsx
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { EuiText, EuiSpacer } from '@elastic/eui';
+
+import { RoleOptionLabel } from './role_option_label';
+
+describe('RoleOptionLabel', () => {
+  it('renders with capitalized label ', () => {
+    const wrapper = shallow(<RoleOptionLabel label="foO" description="bar" />);
+
+    expect(wrapper.find(EuiText)).toHaveLength(2);
+    expect(wrapper.find(EuiText).first().prop('children')).toBe('Foo');
+    expect(wrapper.find(EuiSpacer)).toHaveLength(2);
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_option_label.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_option_label.tsx
new file mode 100644
index 0000000000000..69d29c59dcd66
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_option_label.tsx
@@ -0,0 +1,26 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { EuiSpacer, EuiText } from '@elastic/eui';
+
+interface Props {
+  label: string;
+  description: string;
+}
+
+export const RoleOptionLabel: React.FC<Props> = ({ label, description }) => (
+  <>
+    <EuiText size="s">{label.charAt(0).toUpperCase() + label.toLowerCase().slice(1)}</EuiText>
+    <EuiSpacer size="xs" />
+    <EuiText size="xs">
+      <p>{description}</p>
+    </EuiText>
+    <EuiSpacer size="s" />
+  </>
+);
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.test.tsx
index c34a8939801ea..3f3c4abb04470 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.test.tsx
@@ -9,46 +9,38 @@ import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiRadio } from '@elastic/eui';
+import { EuiRadioGroup } from '@elastic/eui';
 
 import { RoleSelector } from './role_selector';
 
 describe('RoleSelector', () => {
   const onChange = jest.fn();
+  const roleOptions = [
+    {
+      id: 'user',
+      description: 'User',
+    },
+  ];
 
   const props = {
     disabled: false,
-    disabledText: 'Disabled',
     roleType: 'user',
-    roleTypeOption: 'option',
-    description: 'This a thing',
+    roleOptions,
+    label: 'This a thing',
     onChange,
   };
 
   it('renders', () => {
     const wrapper = shallow(<RoleSelector {...props} />);
 
-    expect(wrapper.find(EuiRadio)).toHaveLength(1);
+    expect(wrapper.find(EuiRadioGroup)).toHaveLength(1);
   });
 
   it('calls method on change', () => {
     const wrapper = shallow(<RoleSelector {...props} />);
-    const radio = wrapper.find(EuiRadio);
+    const radio = wrapper.find(EuiRadioGroup);
     radio.simulate('change', { target: { value: 'bar' } });
 
     expect(onChange).toHaveBeenCalled();
   });
-
-  it('renders callout when disabled', () => {
-    const wrapper = shallow(<RoleSelector {...props} disabled />);
-
-    expect(wrapper.find(EuiRadio).prop('checked')).toEqual(false);
-  });
-
-  it('sets checked attribute on radio when option matched type', () => {
-    const wrapper = shallow(<RoleSelector {...props} roleTypeOption="user" />);
-    const radio = wrapper.find(EuiRadio);
-
-    expect(radio.prop('checked')).toEqual(true);
-  });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.tsx
index 9eef1a4e5d303..82780010632fe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/role_mapping/role_selector.tsx
@@ -7,45 +7,43 @@
 
 import React from 'react';
 
-import { startCase } from 'lodash';
+import { EuiFormRow, EuiRadioGroup } from '@elastic/eui';
 
-import { EuiFormRow, EuiRadio, EuiSpacer, EuiText, EuiTitle } from '@elastic/eui';
+import { RoleOptionLabel } from './role_option_label';
+
+interface RoleOption {
+  id: string;
+  description: string;
+  disabled?: boolean;
+}
 
 interface Props {
   disabled?: boolean;
-  disabledText?: string;
   roleType?: string;
-  roleTypeOption: string;
-  description: string;
-  onChange(roleTypeOption: string): void;
+  roleOptions: RoleOption[];
+  label: string;
+  onChange(id: string): void;
 }
 
-export const RoleSelector: React.FC<Props> = ({
-  disabled,
-  roleType,
-  roleTypeOption,
-  description,
-  onChange,
-}) => (
-  <EuiFormRow>
-    <EuiRadio
-      disabled={disabled}
-      id={roleTypeOption}
-      checked={roleTypeOption === roleType}
-      onChange={() => {
-        onChange(roleTypeOption);
-      }}
-      label={
-        <>
-          <EuiTitle size="xs">
-            <h4 className="usersLayout__users--roletype">{startCase(roleTypeOption)}</h4>
-          </EuiTitle>
-          <EuiSpacer size="xs" />
-          <EuiText size="s">
-            <p>{description}</p>
-          </EuiText>
-        </>
-      }
-    />
-  </EuiFormRow>
-);
+export const RoleSelector: React.FC<Props> = ({ label, roleType, roleOptions, onChange }) => {
+  const options = roleOptions.map(({ id, description, disabled }) => ({
+    id,
+    label: <RoleOptionLabel label={id} description={description} />,
+    disabled,
+  }));
+
+  return (
+    <EuiFormRow>
+      <EuiRadioGroup
+        options={options}
+        idSelected={roleOptions.filter((r) => r.id === roleType)[0].id}
+        onChange={(id) => {
+          onChange(id);
+        }}
+        legend={{
+          children: <span>{label}</span>,
+        }}
+      />
+    </EuiFormRow>
+  );
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/cloud/instructions.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/cloud/instructions.test.tsx
index 0136f9745c322..58b6bc8a6c485 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/cloud/instructions.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/cloud/instructions.test.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { mountWithIntl } from '../../../__mocks__';
-
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
 import { EuiSteps, EuiLink } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../test_helpers';
+
 import { CloudSetupInstructions } from './instructions';
 
 describe('CloudSetupInstructions', () => {
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/instructions.test.tsx b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/instructions.test.tsx
index fd31ca720b82b..9f65e6b599a98 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/instructions.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/setup_guide/instructions.test.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { mountWithIntl } from '../../__mocks__';
-
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
 import { EuiSteps, EuiLink } from '@elastic/eui';
 
+import { mountWithIntl } from '../../test_helpers';
+
 import { SetupInstructions } from './instructions';
 
 describe('SetupInstructions', () => {
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 90ddddd7d20aa..e33b9d29689c4 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, rerender } from '../../__mocks__';
+import { setMockValues } from '../../__mocks__/kea_logic';
 
 import React from 'react';
 
@@ -13,6 +13,8 @@ import { shallow, ShallowWrapper } from 'enzyme';
 
 import { EuiIcon } from '@elastic/eui';
 
+import { rerender } from '../../test_helpers';
+
 import { CloudSetupInstructions } from './cloud/instructions';
 import { SetupInstructions } from './instructions';
 
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 5fc8074d0a4d7..bd9b7fb5bfbe3 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
@@ -6,7 +6,7 @@
  */
 
 import '../../__mocks__/shallow_useeffect.mock';
-import { mockTelemetryActions } from '../../__mocks__';
+import { mockTelemetryActions } from '../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/telemetry_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/telemetry_logic.test.ts
index e516daedc1ba6..d80750d068f2b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/telemetry_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/telemetry/telemetry_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues } from '../../__mocks__';
+import { LogicMounter, mockHttpValues } from '../../__mocks__/kea_logic';
 
 import { JSON_HEADER as headers } from '../../../../common/constants';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
index 2cdadc1c6b0d3..f450ca556ebe2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/shared/types.ts
@@ -35,3 +35,5 @@ export interface RoleMapping {
     content: string;
   };
 }
+
+export type ProductName = 'App Search' | 'Workplace Search';
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/enzyme_rerender.mock.ts b/x-pack/plugins/enterprise_search/public/applications/test_helpers/enzyme_rerender.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/enzyme_rerender.mock.ts
rename to x-pack/plugins/enterprise_search/public/applications/test_helpers/enzyme_rerender.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/expected_async_error.ts b/x-pack/plugins/enterprise_search/public/applications/test_helpers/expected_async_error.ts
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/expected_async_error.ts
rename to x-pack/plugins/enterprise_search/public/applications/test_helpers/expected_async_error.ts
diff --git a/x-pack/plugins/enterprise_search/public/applications/test_helpers/index.ts b/x-pack/plugins/enterprise_search/public/applications/test_helpers/index.ts
new file mode 100644
index 0000000000000..e34ff763637b5
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/test_helpers/index.ts
@@ -0,0 +1,15 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+// Enzyme helpers
+export { mountAsync } from './mount_async';
+export { mountWithIntl } from './mount_with_i18n';
+export { shallowWithIntl } from './shallow_with_i18n';
+export { rerender } from './enzyme_rerender';
+
+// Misc
+export { expectedAsyncError } from './expected_async_error';
diff --git a/x-pack/plugins/enterprise_search/public/applications/test_helpers/mount_async.tsx b/x-pack/plugins/enterprise_search/public/applications/test_helpers/mount_async.tsx
new file mode 100644
index 0000000000000..cd66c0ae85a91
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/public/applications/test_helpers/mount_async.tsx
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+
+import { mount, ReactWrapper } from 'enzyme';
+import { act } from 'react-dom/test-utils';
+
+import { mountWithIntl } from './mount_with_i18n';
+
+/**
+ * This helper is intended for components that have async effects
+ * (e.g. http fetches) on mount. It mostly adds act/update boilerplate
+ * that's needed for the wrapper to play nice with Enzyme/Jest
+ *
+ * Example usage:
+ *
+ * const wrapper = mountAsync(<Component />);
+ */
+
+interface Options {
+  i18n?: boolean;
+}
+
+export const mountAsync = async (
+  children: React.ReactElement,
+  options: Options
+): Promise<ReactWrapper> => {
+  let wrapper: ReactWrapper | undefined;
+
+  // We get a lot of act() warning/errors in the terminal without this.
+  // TBH, I don't fully understand why since Enzyme's mount is supposed to
+  // have act() baked in - could be because of the wrapping context provider?
+  await act(async () => {
+    wrapper = options.i18n ? mountWithIntl(children) : mount(children);
+  });
+  if (wrapper) {
+    wrapper.update(); // This seems to be required for the DOM to actually update
+
+    return wrapper;
+  } else {
+    throw new Error('Could not mount wrapper');
+  }
+};
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_with_i18n.mock.tsx b/x-pack/plugins/enterprise_search/public/applications/test_helpers/mount_with_i18n.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/mount_with_i18n.mock.tsx
rename to x-pack/plugins/enterprise_search/public/applications/test_helpers/mount_with_i18n.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/__mocks__/shallow_with_i18n.mock.tsx b/x-pack/plugins/enterprise_search/public/applications/test_helpers/shallow_with_i18n.tsx
similarity index 100%
rename from x-pack/plugins/enterprise_search/public/applications/__mocks__/shallow_with_i18n.mock.tsx
rename to x-pack/plugins/enterprise_search/public/applications/test_helpers/shallow_with_i18n.tsx
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
index 34e67acc870ee..b2cc835da4ecd 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/app_logic.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../common/__mocks__';
-import { LogicMounter } from '../__mocks__';
+import { LogicMounter } from '../__mocks__/kea_logic';
 
 import { AppLogic } from './app_logic';
 
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 e8035f01a9405..9df11ab2308da 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 0bced6a7fc4e0..e605e914df061 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
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import '../../../../__mocks__/kea.mock';
-import { mockTelemetryActions } from '../../../../__mocks__';
+import { mockTelemetryActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 2c2859e8f4427..fb0ea82220640 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
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import '../__mocks__/react_router';
 import '../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions, mockKibanaValues } from '../__mocks__';
+import { setMockValues, setMockActions, mockKibanaValues } from '../__mocks__/kea_logic';
 
 import React from 'react';
 import { Redirect } from 'react-router-dom';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
index 54085a9cd4467..ba5fb7c9d377d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/index.tsx
@@ -37,7 +37,7 @@ import { ErrorState } from './views/error_state';
 import { GroupsRouter } from './views/groups';
 import { GroupSubNav } from './views/groups/components/group_sub_nav';
 import { Overview } from './views/overview';
-import { RoleMappingsRouter } from './views/role_mappings';
+import { RoleMappings } from './views/role_mappings';
 import { Security } from './views/security';
 import { SettingsRouter } from './views/settings';
 import { SettingsSubNav } from './views/settings/components/settings_sub_nav';
@@ -123,7 +123,7 @@ export const WorkplaceSearchConfigured: React.FC<InitialAppData> = (props) => {
       </Route>
       <Route path={ROLE_MAPPINGS_PATH}>
         <Layout navigation={<WorkplaceSearchNav />} restrictWidth readOnlyMode={readOnlyMode}>
-          <RoleMappingsRouter />
+          <RoleMappings />
         </Layout>
       </Route>
       <Route path={SECURITY_PATH}>
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
index 7d3e19dfe626a..a5a3d6b491bb9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.test.tsx
@@ -16,12 +16,10 @@ import {
   getGroupPath,
   getGroupSourcePrioritizationPath,
   getReindexJobRoute,
-  getRoleMappingPath,
   getSourcesPath,
   GROUPS_PATH,
   SOURCES_PATH,
   PERSONAL_SOURCES_PATH,
-  ROLE_MAPPINGS_PATH,
   SOURCE_DETAILS_PATH,
 } from './routes';
 
@@ -52,12 +50,6 @@ describe('getGroupPath', () => {
   });
 });
 
-describe('getRoleMappingPath', () => {
-  it('should format path', () => {
-    expect(getRoleMappingPath('123')).toEqual(`${ROLE_MAPPINGS_PATH}/123`);
-  });
-});
-
 describe('getGroupSourcePrioritizationPath', () => {
   it('should format path', () => {
     expect(getGroupSourcePrioritizationPath('123')).toEqual(
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
index 0a6b6ef89b2a4..5e5d6e2c82b31 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/routes.ts
@@ -50,8 +50,6 @@ export const ENT_SEARCH_LICENSE_MANAGEMENT = `${docLinks.enterpriseSearchBase}/l
 export const PERSONAL_PATH = '/p';
 
 export const ROLE_MAPPINGS_PATH = '/role_mappings';
-export const ROLE_MAPPING_PATH = `${ROLE_MAPPINGS_PATH}/:roleId`;
-export const ROLE_MAPPING_NEW_PATH = `${ROLE_MAPPINGS_PATH}/new`;
 
 export const USERS_PATH = '/users';
 export const SECURITY_PATH = '/security';
@@ -135,4 +133,3 @@ export const getReindexJobRoute = (
   isOrganization: boolean
 ) =>
   getSourcesPath(generatePath(REINDEX_JOB_PATH, { sourceId, activeReindexJobId }), isOrganization);
-export const getRoleMappingPath = (roleId: string) => generatePath(ROLE_MAPPING_PATH, { roleId });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx
index 0ee872f7cfe8a..92cbfcf6eeafe 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source.test.tsx
@@ -6,7 +6,11 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { mockKibanaValues, setMockActions, setMockValues } from '../../../../../__mocks__';
+import {
+  mockKibanaValues,
+  setMockActions,
+  setMockValues,
+} from '../../../../../__mocks__/kea_logic';
 import { sourceConfigData } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx
index 90da349ea4f27..6bf71cd73ec35 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_list.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic';
 import {
   contentSources,
   configuredSources,
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts
index b52b354a6b115..fcaa847c47f3e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/add_source_logic.test.ts
@@ -10,7 +10,7 @@ import {
   mockFlashMessageHelpers,
   mockHttpValues,
   mockKibanaValues,
-} from '../../../../../__mocks__';
+} from '../../../../../__mocks__/kea_logic';
 import { sourceConfigData } from '../../../../__mocks__/content_sources.mock';
 
 import { nextTick } from '@kbn/test/jest';
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 fcb55f24ddb03..26a3d38f247ea 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
@@ -6,7 +6,7 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 import { mergedAvailableSources } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.test.tsx
index 099989255bf47..6c0d87b7696ec 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_custom.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_oauth.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_oauth.test.tsx
index 533dfcda70db1..332456cae99ad 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_oauth.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/configure_oauth.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
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 d6b427630e48e..d8696118d7f4e 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
@@ -6,7 +6,7 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/reauthenticate.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/reauthenticate.test.tsx
index c38ab167b18de..b826b8b42232e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/reauthenticate.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/reauthenticate.test.tsx
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import '../../../../../__mocks__/react_router';
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.test.tsx
index c0f7f1139cb73..32e1c59c56293 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/save_config.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../../__mocks__/kea_logic';
 import { sourceConfigData } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.test.tsx
index cd8ba37695ac6..6afac428f2866 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/add_source/source_features.test.tsx
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
-import { mountAsync, setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
 import { EuiPanel } from '@elastic/eui';
 
+import { mountWithIntl } from '../../../../../test_helpers';
+
 import { staticSourceData } from '../../source_data';
 
 import { SourceFeatures } from './source_features';
@@ -26,7 +28,7 @@ describe('SourceFeatures', () => {
 
   it('renders hasPlatinumLicense & isOrganization', async () => {
     setMockValues({ hasPlatinumLicense: true, isOrganization: true });
-    const wrapper = await mountAsync(<SourceFeatures {...props} />, { i18n: true });
+    const wrapper = await mountWithIntl(<SourceFeatures {...props} />);
 
     expect(wrapper.find('FeaturesRouter[featureId="SyncFrequency"]')).toHaveLength(1);
     expect(wrapper.find('FeaturesRouter[featureId="SyncedItems"]')).toHaveLength(1);
@@ -34,7 +36,7 @@ describe('SourceFeatures', () => {
 
   it('renders !hasPlatinumLicense & isOrganization', async () => {
     setMockValues({ hasPlatinumLicense: false, isOrganization: true });
-    const wrapper = await mountAsync(<SourceFeatures {...props} />, { i18n: true });
+    const wrapper = await mountWithIntl(<SourceFeatures {...props} />);
 
     expect(wrapper.find('FeaturesRouter[featureId="SyncFrequency"]')).toHaveLength(1);
     expect(wrapper.find('FeaturesRouter[featureId="SyncedItems"]')).toHaveLength(1);
@@ -43,7 +45,7 @@ describe('SourceFeatures', () => {
 
   it('renders hasPlatinumLicense & !isOrganization', async () => {
     setMockValues({ hasPlatinumLicense: true, isOrganization: false });
-    const wrapper = await mountAsync(<SourceFeatures {...props} />, { i18n: true });
+    const wrapper = await mountWithIntl(<SourceFeatures {...props} />);
 
     expect(wrapper.find('FeaturesRouter[featureId="Private"]')).toHaveLength(1);
     expect(wrapper.find('FeaturesRouter[featureId="SyncedItems"]')).toHaveLength(1);
@@ -52,7 +54,7 @@ describe('SourceFeatures', () => {
 
   it('renders !hasPlatinumLicense & !isOrganization', async () => {
     setMockValues({ hasPlatinumLicense: false, isOrganization: false });
-    const wrapper = await mountAsync(<SourceFeatures {...props} />, { i18n: true });
+    const wrapper = await mountWithIntl(<SourceFeatures {...props} />);
 
     expect(wrapper.find('IncludedFeatures').find(EuiPanel)).toHaveLength(0);
   });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.test.tsx
index 54be43596a431..aa5cec385738d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_logic.test.ts
index 5a6ef5ba5990f..10c715c80b3d6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_logic.test.ts
@@ -10,7 +10,7 @@ import {
   mockFlashMessageHelpers,
   mockHttpValues,
   mockKibanaValues,
-} from '../../../../../__mocks__';
+} from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.test.tsx
index f04afe60aa49d..7f4e566022ab4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/display_settings_router.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.test.tsx
index 15e1fe0ed417c..82a421d85df01 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_result_detail_card.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.test.tsx
index 6f90c1045ae31..7139ea30be137 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_search_result_group.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.test.tsx
index 49845e79d86aa..a38e0ce82490d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/example_standout_result.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues } from '../../../../../__mocks__';
+import { setMockValues } from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.test.tsx
index fe7bced843841..7d828549178e0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/field_editor_modal.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.test.tsx
index 768573ce80fee..f400527c6c003 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/result_detail.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 /**
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.test.tsx
index 28de0006f162f..cc0378b4b70db 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/display_settings/search_results.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 import { exampleResult } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx
index a30f1bfbd596a..f2cf5f50b813b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/overview.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 import { fullContentSources } from '../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.test.tsx
index 6b656fbdc6ddb..178c9125ee437 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 import { mostRecentIndexJob } from '../../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_change_errors.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_change_errors.test.tsx
index f600d089c6e06..fdb729b59b097 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_change_errors.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_change_errors.test.tsx
@@ -5,12 +5,11 @@
  * 2.0.
  */
 
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
+import { mockUseParams } from '../../../../../__mocks__/react_router';
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
-
 import React from 'react';
-import { useParams } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
 
@@ -27,7 +26,7 @@ describe('SchemaChangeErrors', () => {
     setMockValues({ fieldCoercionErrors, serverSchema });
     setMockActions({ initializeSchemaFieldErrors: jest.fn() });
 
-    (useParams as jest.Mock).mockImplementationOnce(() => ({
+    mockUseParams.mockImplementationOnce(() => ({
       activeReindexJobId: '1',
       sourceId: '123',
     }));
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.test.tsx
index 9996e58e819b2..c2c364763e2eb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_fields_table.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts
index 650909c0b5a82..fd1a574b3438f 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/schema/schema_logic.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../../../__mocks__/kea_logic';
 import { mostRecentIndexJob } from '../../../../__mocks__/content_sources.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_added.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_added.test.tsx
index 9eecc41aa1778..a182c2697fe90 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_added.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_added.test.tsx
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import '../../../../__mocks__/react_router';
 import '../../../../__mocks__/shallow_useeffect.mock';
-
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 import { useLocation } from 'react-router-dom';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.test.tsx
index 8aa644827709a..4bcc4b16166d1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_content.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import { fullContentSources, contentItems } from '../../../__mocks__/content_sources.mock';
 import { meta } from '../../../__mocks__/meta.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
index b2a4488b04107..74f32cc22c2a8 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_settings.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import { fullContentSources, sourceConfigData } from '../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.test.tsx
index 59f3bfb0a5611..25c389419d731 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/components/source_sub_nav.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/organization_sources.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/organization_sources.test.tsx
index b986658f19fb3..9df91406c4b7b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/organization_sources.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/organization_sources.test.tsx
@@ -6,8 +6,7 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-
-import { setMockValues, setMockActions } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 import { contentSources } from '../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.test.tsx
index e6f19ff13b3cc..08f560c984344 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources_layout.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources_layout.test.tsx
index 7558eb1e4e662..6af439814b891 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources_layout.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/private_sources_layout.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues } from '../../../__mocks__';
+import { setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
index 2cf867446b7fb..03f46830fafc3 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_logic.test.ts
@@ -10,12 +10,12 @@ import {
   mockFlashMessageHelpers,
   mockHttpValues,
   mockKibanaValues,
-  expectedAsyncError,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 import { fullContentSources, contentItems } from '../../__mocks__/content_sources.mock';
 import { meta } from '../../__mocks__/meta.mock';
 
 import { DEFAULT_META } from '../../../shared/constants';
+import { expectedAsyncError } from '../../../test_helpers';
 
 jest.mock('../../app_logic', () => ({
   AppLogic: { values: { isOrganization: true } },
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx
index dda3eeea54926..783fc434fe8e5 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/source_router.test.tsx
@@ -7,13 +7,12 @@
 
 import '../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../__mocks__';
-import { mockLocation } from '../../../__mocks__/react_router_history.mock';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
+import { mockLocation, mockUseParams } from '../../../__mocks__/react_router';
 import { unmountHandler } from '../../../__mocks__/shallow_useeffect.mock';
 import { contentSources } from '../../__mocks__/content_sources.mock';
 
 import React from 'react';
-import { useParams } from 'react-router-dom';
 import { Route, Switch } from 'react-router-dom';
 
 import { shallow } from 'enzyme';
@@ -46,7 +45,7 @@ describe('SourceRouter', () => {
       resetSourceState,
     });
     setMockValues({ ...mockValues });
-    (useParams as jest.Mock).mockImplementationOnce(() => ({
+    mockUseParams.mockImplementationOnce(() => ({
       sourceId: contentSource.id,
     }));
   });
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 13844f51b2319..74d3faca5994b 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
@@ -9,10 +9,11 @@ import {
   LogicMounter,
   mockFlashMessageHelpers,
   mockHttpValues,
-  expectedAsyncError,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 import { configuredSources, contentSources } from '../../__mocks__/content_sources.mock';
 
+import { expectedAsyncError } from '../../../test_helpers';
+
 jest.mock('../../app_logic', () => ({
   AppLogic: { values: { isOrganization: true } },
 }));
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 eac1bd7d3ea27..3ba5161e5a3e3 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
@@ -5,9 +5,9 @@
  * 2.0.
  */
 
+import '../../../__mocks__/react_router';
 import '../../../__mocks__/shallow_useeffect.mock';
-
-import { setMockValues, setMockActions } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 import { Route, Switch, Redirect } from 'react-router-dom';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_view.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_view.test.tsx
index 06d7ecff50299..507e66bdf0332 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_view.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/content_sources/sources_view.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.test.tsx
index 784544b0001fa..7468f9c937943 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/add_group_modal.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/clear_filters_link.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/clear_filters_link.test.tsx
index 9118bc5e7adf3..dd4b22c6ca62c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/clear_filters_link.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/clear_filters_link.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.test.tsx
index 1813b766b9875..dc7e635d8fa6b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/filterable_users_popover.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions } from '../../../../__mocks__';
+import { setMockActions } from '../../../../__mocks__/kea_logic';
 import { users } from '../../../__mocks__/users.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_manager_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_manager_modal.test.tsx
index 7c39414f158ef..5619698335b30 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_manager_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_manager_modal.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 import { contentSources } from '../../../__mocks__/content_sources.mock';
 import { groups } from '../../../__mocks__/groups.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.test.tsx
index 8d5714fd05792..7f60b8d8584ba 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_overview.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { groups } from '../../../__mocks__/groups.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
index 205eafd69cd10..7915482a45b2a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 import { groups } from '../../../__mocks__/groups.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row_users_dropdown.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row_users_dropdown.test.tsx
index e75b325a4eae9..1116c625be07a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row_users_dropdown.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_row_users_dropdown.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { users } from '../../../__mocks__/users.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.test.tsx
index 4a9244486bf30..0faeb1df5398c 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_source_prioritization.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { groups } from '../../../__mocks__/groups.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_sub_nav.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_sub_nav.test.tsx
index e4dde81949bfa..263ec5f1b27c0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_sub_nav.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_sub_nav.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx
index a6376d7653627..0dde2f5eaf7f7 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/group_users_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 import { groups } from '../../../__mocks__/groups.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx
index f60a13ec296d5..d11b830a8fc4b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/groups_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { groups } from '../../../__mocks__/groups.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/manage_users_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/manage_users_modal.test.tsx
index 49d51dfc7254c..5256155979e4d 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/manage_users_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/manage_users_modal.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { users } from '../../../__mocks__/users.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.test.tsx
index dd72850a06ad9..02f0b53af97cc 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/shared_sources_modal.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { groups } from '../../../__mocks__/groups.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_sources_dropdown.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_sources_dropdown.test.tsx
index 1e2a57da9ad2e..4150604fb8079 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_sources_dropdown.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_sources_dropdown.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { contentSources } from '../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.test.tsx
index e472563862015..93e5ad69964ca 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filter_users_dropdown.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 import { users } from '../../../__mocks__/users.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx
index bcc58c394b516..83a20efe5257e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/components/table_filters.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockActions, setMockValues } from '../../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts
index 9f12e8f202d50..2c9ca642f2283 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_logic.test.ts
@@ -10,7 +10,7 @@ import {
   mockKibanaValues,
   mockFlashMessageHelpers,
   mockHttpValues,
-} from '../../../__mocks__';
+} from '../../../__mocks__/kea_logic';
 import { groups } from '../../__mocks__/groups.mock';
 import { mockGroupValues } from './__mocks__/group_logic.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.test.tsx
index 0b218f2496154..4c13dbce3ef1e 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/group_router.test.tsx
@@ -5,8 +5,9 @@
  * 2.0.
  */
 
+import '../../../__mocks__/react_router';
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 import { groups } from '../../__mocks__/groups.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx
index 54f8580a8eab9..2929fa0ff1d61 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 import { groups } from '../../__mocks__/groups.mock';
 import { meta } from '../../__mocks__/meta.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts
index bb6e7c0c76faf..c4a860368ff8b 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_logic.test.ts
@@ -5,7 +5,11 @@
  * 2.0.
  */
 
-import { LogicMounter, mockFlashMessageHelpers, mockHttpValues } from '../../../__mocks__';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 import { contentSources } from '../../__mocks__/content_sources.mock';
 import { groups } from '../../__mocks__/groups.mock';
 import { users } from '../../__mocks__/users.mock';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_router.test.tsx
index 0295605eddd4d..66204f74f51f1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/groups/groups_router.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions } from '../../../__mocks__';
+import { setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 import { Route, Switch } from 'react-router-dom';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
index 787354974cb31..9aaa6253ea0ab 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/__mocks__/overview_logic.mock.ts
@@ -6,7 +6,7 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../../../../../common/__mocks__';
-import { setMockValues as setMockKeaValues, setMockActions } from '../../../../__mocks__/kea.mock';
+import { setMockValues as setMockKeaValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 const { workplaceSearch: mockAppValues } = DEFAULT_INITIAL_APP_DATA;
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.test.tsx
index 2b9dc98b03567..382eb676f8708 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_card.test.tsx
@@ -5,9 +5,8 @@
  * 2.0.
  */
 
-import '../../../__mocks__/kea.mock';
 import '../../../__mocks__/enterprise_search_url.mock';
-import { mockTelemetryActions } from '../../../__mocks__';
+import { mockTelemetryActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
index 5059533519a6f..01e5245c597eb 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/onboarding_steps.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockTelemetryActions } from '../../../__mocks__';
+import { mockTelemetryActions } from '../../../__mocks__/kea_logic';
 import { setMockValues } from './__mocks__';
 import './__mocks__/overview_logic.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
index 19c893bec81ea..f4fa1dab89810 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview.test.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import '../../../__mocks__/react_router_history.mock';
 import './__mocks__/overview_logic.mock';
 import { mockActions, setMockValues } from './__mocks__';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
index 75a41216ffbb7..090715e14309a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/overview_logic.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LogicMounter, mockHttpValues } from '../../../__mocks__';
+import { LogicMounter, mockHttpValues } from '../../../__mocks__/kea_logic';
 import { mockOverviewValues } from './__mocks__';
 
 import { OverviewLogic } from './overview_logic';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx
index 3a925f011cc18..0cb3f77c681a1 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/overview/recent_activity.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockTelemetryActions } from '../../../__mocks__';
+import { mockTelemetryActions } from '../../../__mocks__/kea_logic';
 import { setMockValues } from './__mocks__';
 import './__mocks__/overview_logic.mock';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts
index b4355ba7aa586..92c8b7827b9b6 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/constants.ts
@@ -59,38 +59,52 @@ export const USER_ROLE_TYPE_DESCRIPTION = i18n.translate(
   }
 );
 
-export const GROUP_ASSIGNMENT_TITLE = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentTitle',
+export const GROUP_ASSIGNMENT_INVALID_ERROR = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentInvalidError',
+  {
+    defaultMessage: 'At least one assigned group is required.',
+  }
+);
+
+export const GROUP_ASSIGNMENT_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentLabel',
   {
     defaultMessage: 'Group assignment',
   }
 );
 
-export const GROUP_ASSIGNMENT_INVALID_ERROR = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentInvalidError',
+export const ROLE_MAPPINGS_TABLE_HEADER = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.roleMapping.roleMappingsTableHeader',
   {
-    defaultMessage: 'At least one assigned group is required.',
+    defaultMessage: 'Group Access',
   }
 );
 
-export const GROUP_ASSIGNMENT_ALL_GROUPS_LABEL = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentAllGroupsLabel',
+export const ALL_GROUPS_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.roleMapping.allGroupsLabel',
   {
-    defaultMessage: 'Include in all groups, including future groups',
+    defaultMessage: 'Assign to all groups',
   }
 );
 
-export const EMPTY_ROLE_MAPPINGS_BODY = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.roleMapping.emptyRoleMappingsBody',
+export const ALL_GROUPS_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.roleMapping.allGroupsDescription',
   {
     defaultMessage:
-      'New team members are assigned the admin role by default. An admin can access everything. Create a new role to override the default.',
+      'Assigning to all groups includes all current and future groups as created and administered at a later date.',
   }
 );
 
-export const ROLE_MAPPINGS_TABLE_HEADER = i18n.translate(
-  'xpack.enterpriseSearch.workplaceSearch.roleMapping.roleMappingsTableHeader',
+export const SPECIFIC_GROUPS_LABEL = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.roleMapping.specificGroupsLabel',
   {
-    defaultMessage: 'Group Access',
+    defaultMessage: 'Assign to specific groups',
+  }
+);
+
+export const SPECIFIC_GROUPS_DESCRIPTION = i18n.translate(
+  'xpack.enterpriseSearch.workplaceSearch.roleMapping.specificGroupsDescription',
+  {
+    defaultMessage: 'Assign to a select set of groups statically.',
   }
 );
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/index.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/index.ts
index ce4b1de6e399d..19062cf44c17a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/index.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { RoleMappingsRouter } from './role_mappings_router';
+export { RoleMappings } from './role_mappings';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.test.tsx
index 4742b741c9640..619a931864500 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.test.tsx
@@ -5,21 +5,18 @@
  * 2.0.
  */
 
+import '../../../__mocks__/react_router';
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
+import { waitFor } from '@testing-library/dom';
 import { shallow } from 'enzyme';
 
-import { EuiCheckbox } from '@elastic/eui';
+import { EuiComboBox, EuiComboBoxOptionOption, EuiRadioGroup } from '@elastic/eui';
 
-import { Loading } from '../../../shared/loading';
-import {
-  AttributeSelector,
-  DeleteMappingCallout,
-  RoleSelector,
-} from '../../../shared/role_mapping';
+import { AttributeSelector, RoleSelector, RoleMappingFlyout } from '../../../shared/role_mapping';
 import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
 
 import { RoleMapping } from './role_mapping';
@@ -60,6 +57,7 @@ describe('RoleMapping', () => {
     availableAuthProviders: [],
     multipleAuthProvidersConfig: true,
     selectedAuthProviders: [],
+    roleMappingErrors: [],
   };
 
   beforeEach(() => {
@@ -80,42 +78,49 @@ describe('RoleMapping', () => {
   });
 
   it('renders', () => {
+    setMockValues({ ...mockValues, roleMapping: wsRoleMapping });
     const wrapper = shallow(<RoleMapping />);
 
     expect(wrapper.find(AttributeSelector)).toHaveLength(1);
-    expect(wrapper.find(RoleSelector)).toHaveLength(2);
+    expect(wrapper.find(RoleSelector)).toHaveLength(1);
   });
 
-  it('returns Loading when loading', () => {
-    setMockValues({ ...mockValues, dataLoading: true });
+  it('sets initial selected state when includeInAllGroups is true', () => {
+    setMockValues({ ...mockValues, includeInAllGroups: true });
     const wrapper = shallow(<RoleMapping />);
 
-    expect(wrapper.find(Loading)).toHaveLength(1);
+    expect(wrapper.find(EuiRadioGroup).prop('idSelected')).toBe('all');
   });
 
-  it('hides DeleteMappingCallout for new mapping', () => {
-    const wrapper = shallow(<RoleMapping isNew />);
+  it('handles all/specific groups radio change', () => {
+    const wrapper = shallow(<RoleMapping />);
+    const radio = wrapper.find(EuiRadioGroup);
+    radio.simulate('change', { target: { checked: false } });
 
-    expect(wrapper.find(DeleteMappingCallout)).toHaveLength(0);
+    expect(handleAllGroupsSelectionChange).toHaveBeenCalledWith(false);
   });
 
-  it('handles group checkbox click', () => {
+  it('handles group checkbox click', async () => {
     const wrapper = shallow(<RoleMapping />);
-    wrapper
-      .find(EuiCheckbox)
-      .first()
-      .simulate('change', { target: { checked: true } });
-
-    expect(handleGroupSelectionChange).toHaveBeenCalledWith(groups[0].id, true);
+    await waitFor(() =>
+      ((wrapper.find(EuiComboBox).props() as unknown) as {
+        onChange: (a: EuiComboBoxOptionOption[]) => void;
+      }).onChange([{ label: groups[0].name, value: groups[0].name }])
+    );
+    wrapper.update();
+
+    expect(handleGroupSelectionChange).toHaveBeenCalledWith([groups[0].name]);
   });
 
-  it('handles all groups checkbox click', () => {
+  it('enables flyout when attribute value is valid', () => {
+    setMockValues({
+      ...mockValues,
+      attributeValue: 'foo',
+      attributeName: 'role',
+      includeInAllGroups: true,
+    });
     const wrapper = shallow(<RoleMapping />);
-    wrapper
-      .find(EuiCheckbox)
-      .last()
-      .simulate('change', { target: { checked: true } });
 
-    expect(handleAllGroupsSelectionChange).toHaveBeenCalledWith(true);
+    expect(wrapper.find(RoleMappingFlyout).prop('disabled')).toBe(false);
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
index fb366883601a6..e2f24ce392c39 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mapping.tsx
@@ -5,91 +5,85 @@
  * 2.0.
  */
 
-import React, { useEffect } from 'react';
-
-import { useParams } from 'react-router-dom';
+import React from 'react';
 
 import { useActions, useValues } from 'kea';
 
 import {
-  EuiButton,
-  EuiCheckbox,
-  EuiFlexGroup,
-  EuiFlexItem,
+  EuiComboBox,
+  EuiForm,
   EuiFormRow,
-  EuiPanel,
+  EuiHorizontalRule,
+  EuiRadioGroup,
   EuiSpacer,
-  EuiTitle,
 } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
 
-import { FlashMessages } from '../../../shared/flash_messages';
-import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { Loading } from '../../../shared/loading';
 import {
   AttributeSelector,
-  DeleteMappingCallout,
   RoleSelector,
+  RoleOptionLabel,
+  RoleMappingFlyout,
 } from '../../../shared/role_mapping';
-import {
-  ROLE_LABEL,
-  ROLE_MAPPINGS_TITLE,
-  ADD_ROLE_MAPPING_TITLE,
-  MANAGE_ROLE_MAPPING_TITLE,
-} from '../../../shared/role_mapping/constants';
-import { ViewContentHeader } from '../../components/shared/view_content_header';
+
 import { Role } from '../../types';
 
 import {
   ADMIN_ROLE_TYPE_DESCRIPTION,
   USER_ROLE_TYPE_DESCRIPTION,
-  GROUP_ASSIGNMENT_TITLE,
   GROUP_ASSIGNMENT_INVALID_ERROR,
-  GROUP_ASSIGNMENT_ALL_GROUPS_LABEL,
+  GROUP_ASSIGNMENT_LABEL,
+  ALL_GROUPS_LABEL,
+  ALL_GROUPS_DESCRIPTION,
+  SPECIFIC_GROUPS_LABEL,
+  SPECIFIC_GROUPS_DESCRIPTION,
 } from './constants';
 
 import { RoleMappingsLogic } from './role_mappings_logic';
 
 interface RoleType {
-  type: Role;
+  id: Role;
   description: string;
 }
 
-const roleTypes = [
+const roleOptions = [
   {
-    type: 'admin',
+    id: 'admin',
     description: ADMIN_ROLE_TYPE_DESCRIPTION,
   },
   {
-    type: 'user',
+    id: 'user',
     description: USER_ROLE_TYPE_DESCRIPTION,
   },
 ] as RoleType[];
 
-interface RoleMappingProps {
-  isNew?: boolean;
-}
+const groupOptions = [
+  {
+    id: 'all',
+    label: <RoleOptionLabel label={ALL_GROUPS_LABEL} description={ALL_GROUPS_DESCRIPTION} />,
+  },
+  {
+    id: 'specific',
+    label: (
+      <RoleOptionLabel label={SPECIFIC_GROUPS_LABEL} description={SPECIFIC_GROUPS_DESCRIPTION} />
+    ),
+  },
+];
 
-export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
-  const { roleId } = useParams() as { roleId: string };
+export const RoleMapping: React.FC = () => {
   const {
-    initializeRoleMappings,
-    initializeRoleMapping,
     handleSaveMapping,
     handleGroupSelectionChange,
     handleAllGroupsSelectionChange,
     handleAttributeValueChange,
     handleAttributeSelectorChange,
-    handleDeleteMapping,
     handleRoleChange,
     handleAuthProviderChange,
-    resetState,
+    closeRoleMappingFlyout,
   } = useActions(RoleMappingsLogic);
 
   const {
     attributes,
     elasticsearchRoles,
-    dataLoading,
     roleType,
     attributeValue,
     attributeName,
@@ -99,43 +93,28 @@ export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
     availableAuthProviders,
     multipleAuthProvidersConfig,
     selectedAuthProviders,
+    selectedOptions,
+    roleMapping,
+    roleMappingErrors,
   } = useValues(RoleMappingsLogic);
 
-  useEffect(() => {
-    initializeRoleMappings();
-    initializeRoleMapping(roleId);
-    return resetState;
-  }, [roleId]);
-
-  if (dataLoading) return <Loading />;
+  const isNew = !roleMapping;
 
   const hasGroupAssignment = selectedGroups.size > 0 || includeInAllGroups;
-
-  const TITLE = isNew ? ADD_ROLE_MAPPING_TITLE : MANAGE_ROLE_MAPPING_TITLE;
-  const SAVE_ROLE_MAPPING_LABEL = i18n.translate(
-    'xpack.enterpriseSearch.workplaceSearch.roleMapping.saveRoleMappingButtonMessage',
-    {
-      defaultMessage: '{operation} role mapping',
-      values: { operation: isNew ? 'Save' : 'Update' },
-    }
-  );
-
-  const saveRoleMappingButton = (
-    <EuiButton disabled={!hasGroupAssignment} onClick={handleSaveMapping} fill>
-      {SAVE_ROLE_MAPPING_LABEL}
-    </EuiButton>
-  );
+  const attributeValueInvalid = attributeName !== 'role' && !attributeValue;
 
   return (
-    <>
-      <SetPageChrome trail={[ROLE_MAPPINGS_TITLE, TITLE]} />
-      <ViewContentHeader title={SAVE_ROLE_MAPPING_LABEL} action={saveRoleMappingButton} />
-      <EuiSpacer size="l" />
-      <div>
-        <FlashMessages />
+    <RoleMappingFlyout
+      disabled={attributeValueInvalid || !hasGroupAssignment}
+      isNew={isNew}
+      closeRoleMappingFlyout={closeRoleMappingFlyout}
+      handleSaveMapping={handleSaveMapping}
+    >
+      <EuiForm isInvalid={roleMappingErrors.length > 0} error={roleMappingErrors}>
         <AttributeSelector
           attributeName={attributeName}
           attributeValue={attributeValue}
+          attributeValueInvalid={attributeValueInvalid}
           attributes={attributes}
           elasticsearchRoles={elasticsearchRoles}
           disabled={!isNew}
@@ -146,70 +125,37 @@ export const RoleMapping: React.FC<RoleMappingProps> = ({ isNew }) => {
           multipleAuthProvidersConfig={multipleAuthProvidersConfig}
           handleAuthProviderChange={handleAuthProviderChange}
         />
-        <EuiSpacer />
-        <EuiFlexGroup alignItems="stretch">
-          <EuiFlexItem>
-            <EuiPanel hasShadow={false} color="subdued" paddingSize="l">
-              <EuiTitle size="s">
-                <h3>{ROLE_LABEL}</h3>
-              </EuiTitle>
-              <EuiSpacer />
-              {roleTypes.map(({ type, description }) => (
-                <RoleSelector
-                  key={type}
-                  roleType={roleType}
-                  onChange={handleRoleChange}
-                  roleTypeOption={type}
-                  description={description}
-                />
-              ))}
-            </EuiPanel>
-          </EuiFlexItem>
-          <EuiFlexItem>
-            <EuiPanel hasShadow={false} color="subdued" paddingSize="l">
-              <EuiTitle size="s">
-                <h3>{GROUP_ASSIGNMENT_TITLE}</h3>
-              </EuiTitle>
-              <EuiSpacer />
-              <div>
-                <EuiFormRow
-                  isInvalid={!hasGroupAssignment}
-                  error={[GROUP_ASSIGNMENT_INVALID_ERROR]}
-                >
-                  <>
-                    {availableGroups.map(({ id, name }) => (
-                      <EuiCheckbox
-                        key={id}
-                        name={name}
-                        id={id}
-                        checked={selectedGroups.has(id)}
-                        onChange={(e) => {
-                          handleGroupSelectionChange(id, e.target.checked);
-                        }}
-                        label={name}
-                        disabled={includeInAllGroups}
-                      />
-                    ))}
-                    <EuiSpacer />
-                    <EuiCheckbox
-                      key="allGroups"
-                      name="allGroups"
-                      id="allGroups"
-                      checked={includeInAllGroups}
-                      onChange={(e) => {
-                        handleAllGroupsSelectionChange(e.target.checked);
-                      }}
-                      label={GROUP_ASSIGNMENT_ALL_GROUPS_LABEL}
-                    />
-                  </>
-                </EuiFormRow>
-              </div>
-            </EuiPanel>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiSpacer />
-        {!isNew && <DeleteMappingCallout handleDeleteMapping={handleDeleteMapping} />}
-      </div>
-    </>
+        <EuiSpacer size="m" />
+        <RoleSelector
+          roleOptions={roleOptions}
+          roleType={roleType}
+          onChange={handleRoleChange}
+          label="Role"
+        />
+        <EuiHorizontalRule />
+        <EuiFormRow>
+          <EuiRadioGroup
+            options={groupOptions}
+            idSelected={includeInAllGroups ? 'all' : 'specific'}
+            onChange={(id) => handleAllGroupsSelectionChange(id === 'all')}
+            legend={{
+              children: <span>{GROUP_ASSIGNMENT_LABEL}</span>,
+            }}
+          />
+        </EuiFormRow>
+        <EuiFormRow isInvalid={!hasGroupAssignment} error={[GROUP_ASSIGNMENT_INVALID_ERROR]}>
+          <EuiComboBox
+            data-test-subj="groupsSelect"
+            selectedOptions={selectedOptions}
+            options={availableGroups.map(({ name, id }) => ({ label: name, value: id }))}
+            onChange={(options) => {
+              handleGroupSelectionChange(options.map(({ value }) => value as string));
+            }}
+            fullWidth
+            isDisabled={includeInAllGroups}
+          />
+        </EuiFormRow>
+      </EuiForm>
+    </RoleMappingFlyout>
   );
 };
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx
index c6da903e20912..d7ce8053c71f0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.test.tsx
@@ -6,22 +6,23 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockActions, setMockValues } from '../../../__mocks__';
+import { setMockActions, setMockValues } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
 import { shallow } from 'enzyme';
 
-import { EuiEmptyPrompt } from '@elastic/eui';
-
 import { Loading } from '../../../shared/loading';
-import { RoleMappingsTable } from '../../../shared/role_mapping';
+import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
 import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
 
+import { RoleMapping } from './role_mapping';
 import { RoleMappings } from './role_mappings';
 
 describe('RoleMappings', () => {
   const initializeRoleMappings = jest.fn();
+  const initializeRoleMapping = jest.fn();
+  const handleDeleteMapping = jest.fn();
   const mockValues = {
     roleMappings: [wsRoleMapping],
     dataLoading: false,
@@ -31,6 +32,8 @@ describe('RoleMappings', () => {
   beforeEach(() => {
     setMockActions({
       initializeRoleMappings,
+      initializeRoleMapping,
+      handleDeleteMapping,
     });
     setMockValues(mockValues);
   });
@@ -48,10 +51,17 @@ describe('RoleMappings', () => {
     expect(wrapper.find(Loading)).toHaveLength(1);
   });
 
-  it('renders empty state', () => {
-    setMockValues({ ...mockValues, roleMappings: [] });
+  it('renders RoleMapping flyout', () => {
+    setMockValues({ ...mockValues, roleMappingFlyoutOpen: true });
+    const wrapper = shallow(<RoleMappings />);
+
+    expect(wrapper.find(RoleMapping)).toHaveLength(1);
+  });
+
+  it('handles onClick', () => {
     const wrapper = shallow(<RoleMappings />);
+    wrapper.find(RoleMappingsHeading).prop('onClick')();
 
-    expect(wrapper.find(EuiEmptyPrompt)).toHaveLength(1);
+    expect(initializeRoleMapping).toHaveBeenCalled();
   });
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
index 9ec0dfc0acefc..46c426c3dad2a 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings.tsx
@@ -9,28 +9,28 @@ import React, { useEffect } from 'react';
 
 import { useActions, useValues } from 'kea';
 
-import { EuiEmptyPrompt, EuiPanel } from '@elastic/eui';
-
 import { FlashMessages } from '../../../shared/flash_messages';
 import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
 import { Loading } from '../../../shared/loading';
-import { AddRoleMappingButton, RoleMappingsTable } from '../../../shared/role_mapping';
-import {
-  EMPTY_ROLE_MAPPINGS_TITLE,
-  ROLE_MAPPINGS_TITLE,
-  ROLE_MAPPINGS_DESCRIPTION,
-} from '../../../shared/role_mapping/constants';
-import { ViewContentHeader } from '../../components/shared/view_content_header';
-import { getRoleMappingPath, ROLE_MAPPING_NEW_PATH } from '../../routes';
+import { RoleMappingsTable, RoleMappingsHeading } from '../../../shared/role_mapping';
+import { ROLE_MAPPINGS_TITLE } from '../../../shared/role_mapping/constants';
 
-import { EMPTY_ROLE_MAPPINGS_BODY, ROLE_MAPPINGS_TABLE_HEADER } from './constants';
+import { ROLE_MAPPINGS_TABLE_HEADER } from './constants';
 
+import { RoleMapping } from './role_mapping';
 import { RoleMappingsLogic } from './role_mappings_logic';
 
 export const RoleMappings: React.FC = () => {
-  const { initializeRoleMappings } = useActions(RoleMappingsLogic);
+  const { initializeRoleMappings, initializeRoleMapping, handleDeleteMapping } = useActions(
+    RoleMappingsLogic
+  );
 
-  const { roleMappings, dataLoading, multipleAuthProvidersConfig } = useValues(RoleMappingsLogic);
+  const {
+    roleMappings,
+    dataLoading,
+    multipleAuthProvidersConfig,
+    roleMappingFlyoutOpen,
+  } = useValues(RoleMappingsLogic);
 
   useEffect(() => {
     initializeRoleMappings();
@@ -38,36 +38,26 @@ export const RoleMappings: React.FC = () => {
 
   if (dataLoading) return <Loading />;
 
-  const addMappingButton = <AddRoleMappingButton path={ROLE_MAPPING_NEW_PATH} />;
-  const emptyPrompt = (
-    <EuiPanel paddingSize="l" color="subdued" hasBorder={false}>
-      <EuiEmptyPrompt
-        iconType="usersRolesApp"
-        title={<h2>{EMPTY_ROLE_MAPPINGS_TITLE}</h2>}
-        body={<p>{EMPTY_ROLE_MAPPINGS_BODY}</p>}
-        actions={addMappingButton}
+  const roleMappingsSection = (
+    <>
+      <RoleMappingsHeading productName="Workplace Search" onClick={() => initializeRoleMapping()} />
+      <RoleMappingsTable
+        roleMappings={roleMappings}
+        accessItemKey="groups"
+        accessHeader={ROLE_MAPPINGS_TABLE_HEADER}
+        shouldShowAuthProvider={multipleAuthProvidersConfig}
+        initializeRoleMapping={initializeRoleMapping}
+        handleDeleteMapping={handleDeleteMapping}
       />
-    </EuiPanel>
-  );
-  const roleMappingsTable = (
-    <RoleMappingsTable
-      roleMappings={roleMappings}
-      accessItemKey="groups"
-      accessHeader={ROLE_MAPPINGS_TABLE_HEADER}
-      addMappingButton={addMappingButton}
-      getRoleMappingPath={getRoleMappingPath}
-      shouldShowAuthProvider={multipleAuthProvidersConfig}
-    />
+    </>
   );
 
   return (
     <>
       <SetPageChrome trail={[ROLE_MAPPINGS_TITLE]} />
-      <ViewContentHeader title={ROLE_MAPPINGS_TITLE} description={ROLE_MAPPINGS_DESCRIPTION} />
-      <div>
-        <FlashMessages />
-        {roleMappings.length === 0 ? emptyPrompt : roleMappingsTable}
-      </div>
+      {roleMappingFlyoutOpen && <RoleMapping />}
+      <FlashMessages />
+      {roleMappingsSection}
     </>
   );
 };
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 3c9cf01bbb4a9..716cb8ebb6d47 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
@@ -5,28 +5,31 @@
  * 2.0.
  */
 
-import { mockFlashMessageHelpers, mockHttpValues, mockKibanaValues } from '../../../__mocks__';
-import { LogicMounter } from '../../../__mocks__/kea.mock';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+} from '../../../__mocks__/kea_logic';
 
 import { groups } from '../../__mocks__/groups.mock';
 
 import { nextTick } from '@kbn/test/jest';
 
 import { wsRoleMapping } from '../../../shared/role_mapping/__mocks__/roles';
-import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
+import { ANY_AUTH_PROVIDER, ROLE_MAPPING_NOT_FOUND } from '../../../shared/role_mapping/constants';
 
 import { RoleMappingsLogic } from './role_mappings_logic';
 
 describe('RoleMappingsLogic', () => {
   const { http } = mockHttpValues;
-  const { navigateToUrl } = mockKibanaValues;
-  const { clearFlashMessages, flashAPIErrors } = mockFlashMessageHelpers;
+  const { clearFlashMessages, flashAPIErrors, setErrorMessage } = mockFlashMessageHelpers;
   const { mount } = new LogicMounter(RoleMappingsLogic);
   const defaultValues = {
     attributes: [],
     availableAuthProviders: [],
     elasticsearchRoles: [],
     roleMapping: null,
+    roleMappingFlyoutOpen: false,
     roleMappings: [],
     roleType: 'admin',
     attributeValue: '',
@@ -37,6 +40,8 @@ describe('RoleMappingsLogic', () => {
     selectedGroups: new Set(),
     includeInAllGroups: false,
     selectedAuthProviders: [ANY_AUTH_PROVIDER],
+    selectedOptions: [],
+    roleMappingErrors: [],
   };
   const roleGroup = {
     id: '123',
@@ -92,6 +97,7 @@ describe('RoleMappingsLogic', () => {
         expect(RoleMappingsLogic.values.selectedGroups).toEqual(
           new Set([wsRoleMapping.groups[0].id])
         );
+        expect(RoleMappingsLogic.values.selectedOptions).toEqual([]);
       });
 
       it('sets default group with new role mapping', () => {
@@ -121,10 +127,13 @@ describe('RoleMappingsLogic', () => {
         },
       });
 
-      RoleMappingsLogic.actions.handleGroupSelectionChange(otherGroup.id, true);
+      RoleMappingsLogic.actions.handleGroupSelectionChange([group.id, otherGroup.id]);
       expect(RoleMappingsLogic.values.selectedGroups).toEqual(new Set([group.id, otherGroup.id]));
+      expect(RoleMappingsLogic.values.selectedOptions).toEqual([
+        { label: roleGroup.name, value: roleGroup.id },
+      ]);
 
-      RoleMappingsLogic.actions.handleGroupSelectionChange(otherGroup.id, false);
+      RoleMappingsLogic.actions.handleGroupSelectionChange([group.id]);
       expect(RoleMappingsLogic.values.selectedGroups).toEqual(new Set([group.id]));
     });
 
@@ -223,6 +232,25 @@ describe('RoleMappingsLogic', () => {
       expect(RoleMappingsLogic.values.attributeName).toEqual('username');
       expect(clearFlashMessages).toHaveBeenCalled();
     });
+
+    it('openRoleMappingFlyout', () => {
+      mount(mappingServerProps);
+      RoleMappingsLogic.actions.openRoleMappingFlyout();
+
+      expect(RoleMappingsLogic.values.roleMappingFlyoutOpen).toEqual(true);
+      expect(clearFlashMessages).toHaveBeenCalled();
+    });
+
+    it('closeRoleMappingFlyout', () => {
+      mount({
+        ...mappingServerProps,
+        roleMappingFlyoutOpen: true,
+      });
+      RoleMappingsLogic.actions.closeRoleMappingFlyout();
+
+      expect(RoleMappingsLogic.values.roleMappingFlyoutOpen).toEqual(false);
+      expect(clearFlashMessages).toHaveBeenCalled();
+    });
   });
 
   describe('listeners', () => {
@@ -275,17 +303,21 @@ describe('RoleMappingsLogic', () => {
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
       });
 
-      it('redirects when there is a 404 status', async () => {
+      it('shows error when there is a 404 status', async () => {
         http.get.mockReturnValue(Promise.reject({ status: 404 }));
         RoleMappingsLogic.actions.initializeRoleMapping();
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(setErrorMessage).toHaveBeenCalledWith(ROLE_MAPPING_NOT_FOUND);
       });
     });
 
     describe('handleSaveMapping', () => {
-      it('calls API and navigates when new mapping', async () => {
+      it('calls API and refreshes list when new mapping', async () => {
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         RoleMappingsLogic.actions.setRoleMappingsData(mappingsServerProps);
 
         http.post.mockReturnValue(Promise.resolve(mappingServerProps));
@@ -304,10 +336,14 @@ describe('RoleMappingsLogic', () => {
         });
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
-      it('calls API and navigates when existing mapping', async () => {
+      it('calls API and refreshes list when existing mapping', async () => {
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         RoleMappingsLogic.actions.setRoleMappingData(mappingServerProps);
 
         http.put.mockReturnValue(Promise.resolve(mappingServerProps));
@@ -329,20 +365,34 @@ describe('RoleMappingsLogic', () => {
         );
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
       it('handles error', async () => {
-        http.post.mockReturnValue(Promise.reject('this is an error'));
+        const setRoleMappingErrorsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'setRoleMappingErrors'
+        );
+
+        http.post.mockReturnValue(
+          Promise.reject({
+            body: {
+              attributes: {
+                errors: ['this is an error'],
+              },
+            },
+          })
+        );
         RoleMappingsLogic.actions.handleSaveMapping();
         await nextTick();
 
-        expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
+        expect(setRoleMappingErrorsSpy).toHaveBeenCalledWith(['this is an error']);
       });
     });
 
     describe('handleDeleteMapping', () => {
       let confirmSpy: any;
+      const roleMappingId = 'r1';
 
       beforeEach(() => {
         confirmSpy = jest.spyOn(window, 'confirm');
@@ -353,29 +403,27 @@ describe('RoleMappingsLogic', () => {
         confirmSpy.mockRestore();
       });
 
-      it('returns when no mapping', () => {
-        RoleMappingsLogic.actions.handleDeleteMapping();
-
-        expect(http.delete).not.toHaveBeenCalled();
-      });
-
-      it('calls API and navigates', async () => {
+      it('calls API and refreshes list', async () => {
+        const initializeRoleMappingsSpy = jest.spyOn(
+          RoleMappingsLogic.actions,
+          'initializeRoleMappings'
+        );
         RoleMappingsLogic.actions.setRoleMappingData(mappingServerProps);
         http.delete.mockReturnValue(Promise.resolve({}));
-        RoleMappingsLogic.actions.handleDeleteMapping();
+        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
 
         expect(http.delete).toHaveBeenCalledWith(
-          `/api/workplace_search/org/role_mappings/${wsRoleMapping.id}`
+          `/api/workplace_search/org/role_mappings/${roleMappingId}`
         );
         await nextTick();
 
-        expect(navigateToUrl).toHaveBeenCalled();
+        expect(initializeRoleMappingsSpy).toHaveBeenCalled();
       });
 
       it('handles error', async () => {
         RoleMappingsLogic.actions.setRoleMappingData(mappingServerProps);
         http.delete.mockReturnValue(Promise.reject('this is an error'));
-        RoleMappingsLogic.actions.handleDeleteMapping();
+        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
         await nextTick();
 
         expect(flashAPIErrors).toHaveBeenCalledWith('this is an error');
@@ -384,7 +432,7 @@ describe('RoleMappingsLogic', () => {
       it('will do nothing if not confirmed', async () => {
         RoleMappingsLogic.actions.setRoleMappingData(mappingServerProps);
         window.confirm = () => false;
-        RoleMappingsLogic.actions.handleDeleteMapping();
+        RoleMappingsLogic.actions.handleDeleteMapping(roleMappingId);
 
         expect(http.delete).not.toHaveBeenCalled();
         await nextTick();
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 0df7f0ba37569..aee780ac18971 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
@@ -7,16 +7,17 @@
 
 import { kea, MakeLogicType } from 'kea';
 
+import { EuiComboBoxOptionOption } from '@elastic/eui';
+
 import {
   clearFlashMessages,
   flashAPIErrors,
   setSuccessMessage,
+  setErrorMessage,
 } from '../../../shared/flash_messages';
 import { HttpLogic } from '../../../shared/http';
-import { KibanaLogic } from '../../../shared/kibana';
-import { ANY_AUTH_PROVIDER } from '../../../shared/role_mapping/constants';
+import { ANY_AUTH_PROVIDER, ROLE_MAPPING_NOT_FOUND } from '../../../shared/role_mapping/constants';
 import { AttributeName } from '../../../shared/types';
-import { ROLE_MAPPINGS_PATH } from '../../routes';
 import { RoleGroup, WSRoleMapping, Role } from '../../types';
 
 import {
@@ -54,18 +55,18 @@ interface RoleMappingsActions {
     firstElasticsearchRole: string
   ): { value: AttributeName; firstElasticsearchRole: string };
   handleAttributeValueChange(value: string): { value: string };
-  handleDeleteMapping(): void;
-  handleGroupSelectionChange(
-    groupId: string,
-    selected: boolean
-  ): { groupId: string; selected: boolean };
+  handleDeleteMapping(roleMappingId: string): { roleMappingId: string };
+  handleGroupSelectionChange(groupIds: string[]): { groupIds: string[] };
   handleRoleChange(roleType: Role): { roleType: Role };
   handleSaveMapping(): void;
-  initializeRoleMapping(roleId?: string): { roleId?: string };
+  initializeRoleMapping(roleMappingId?: string): { roleMappingId?: string };
   initializeRoleMappings(): void;
   resetState(): void;
   setRoleMappingData(data: RoleMappingServerDetails): RoleMappingServerDetails;
   setRoleMappingsData(data: RoleMappingsServerDetails): RoleMappingsServerDetails;
+  openRoleMappingFlyout(): void;
+  closeRoleMappingFlyout(): void;
+  setRoleMappingErrors(errors: string[]): { errors: string[] };
 }
 
 interface RoleMappingsValues {
@@ -83,6 +84,9 @@ interface RoleMappingsValues {
   roleType: Role;
   selectedAuthProviders: string[];
   selectedGroups: Set<string>;
+  roleMappingFlyoutOpen: boolean;
+  selectedOptions: EuiComboBoxOptionOption[];
+  roleMappingErrors: string[];
 }
 
 export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappingsActions>>({
@@ -90,9 +94,10 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
   actions: {
     setRoleMappingsData: (data: RoleMappingsServerDetails) => data,
     setRoleMappingData: (data: RoleMappingServerDetails) => data,
+    setRoleMappingErrors: (errors: string[]) => ({ errors }),
     handleAuthProviderChange: (value: string[]) => ({ value }),
     handleRoleChange: (roleType: Role) => ({ roleType }),
-    handleGroupSelectionChange: (groupId: string, selected: boolean) => ({ groupId, selected }),
+    handleGroupSelectionChange: (groupIds: string[]) => ({ groupIds }),
     handleAttributeSelectorChange: (value: string, firstElasticsearchRole: string) => ({
       value,
       firstElasticsearchRole,
@@ -101,9 +106,11 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     handleAllGroupsSelectionChange: (selected: boolean) => ({ selected }),
     resetState: true,
     initializeRoleMappings: true,
-    initializeRoleMapping: (roleId?: string) => ({ roleId }),
-    handleDeleteMapping: true,
+    initializeRoleMapping: (roleMappingId?: string) => ({ roleMappingId }),
+    handleDeleteMapping: (roleMappingId: string) => ({ roleMappingId }),
     handleSaveMapping: true,
+    openRoleMappingFlyout: true,
+    closeRoleMappingFlyout: false,
   },
   reducers: {
     dataLoading: [
@@ -152,6 +159,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
       {
         setRoleMappingData: (_, { roleMapping }) => roleMapping || null,
         resetState: () => null,
+        closeRoleMappingFlyout: () => null,
       },
     ],
     roleType: [
@@ -178,6 +186,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           value === 'role' ? firstElasticsearchRole : '',
         handleAttributeValueChange: (_, { value }) => value,
         resetState: () => '',
+        closeRoleMappingFlyout: () => '',
       },
     ],
     attributeName: [
@@ -187,6 +196,7 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           roleMapping ? getFirstAttributeName(roleMapping) : 'username',
         handleAttributeSelectorChange: (_, { value }) => value,
         resetState: () => 'username',
+        closeRoleMappingFlyout: () => 'username',
       },
     ],
     selectedGroups: [
@@ -200,13 +210,10 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
                   .filter((group) => group.name === DEFAULT_GROUP_NAME)
                   .map((group) => group.id)
               ),
-        handleGroupSelectionChange: (groups, { groupId, selected }) => {
-          const newSelectedGroupNames = new Set(groups as Set<string>);
-          if (selected) {
-            newSelectedGroupNames.add(groupId);
-          } else {
-            newSelectedGroupNames.delete(groupId);
-          }
+        handleGroupSelectionChange: (_, { groupIds }) => {
+          const newSelectedGroupNames = new Set() as Set<string>;
+          groupIds.forEach((groupId) => newSelectedGroupNames.add(groupId));
+
           return newSelectedGroupNames;
         },
       },
@@ -234,7 +241,35 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
           roleMapping ? roleMapping.authProvider : [ANY_AUTH_PROVIDER],
       },
     ],
+    roleMappingFlyoutOpen: [
+      false,
+      {
+        openRoleMappingFlyout: () => true,
+        closeRoleMappingFlyout: () => false,
+        initializeRoleMappings: () => false,
+        initializeRoleMapping: () => true,
+      },
+    ],
+    roleMappingErrors: [
+      [],
+      {
+        setRoleMappingErrors: (_, { errors }) => errors,
+        handleSaveMapping: () => [],
+        closeRoleMappingFlyout: () => [],
+      },
+    ],
   },
+  selectors: ({ selectors }) => ({
+    selectedOptions: [
+      () => [selectors.selectedGroups, selectors.availableGroups],
+      (selectedGroups, availableGroups) => {
+        const selectedIds = Array.from(selectedGroups.values());
+        return availableGroups
+          .filter(({ id }: { id: string }) => selectedIds.includes(id))
+          .map(({ id, name }: { id: string; name: string }) => ({ label: name, value: id }));
+      },
+    ],
+  }),
   listeners: ({ actions, values }) => ({
     initializeRoleMappings: async () => {
       const { http } = HttpLogic.values;
@@ -247,11 +282,10 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         flashAPIErrors(e);
       }
     },
-    initializeRoleMapping: async ({ roleId }) => {
+    initializeRoleMapping: async ({ roleMappingId }) => {
       const { http } = HttpLogic.values;
-      const { navigateToUrl } = KibanaLogic.values;
-      const route = roleId
-        ? `/api/workplace_search/org/role_mappings/${roleId}`
+      const route = roleMappingId
+        ? `/api/workplace_search/org/role_mappings/${roleMappingId}`
         : '/api/workplace_search/org/role_mappings/new';
 
       try {
@@ -259,23 +293,20 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
         actions.setRoleMappingData(response);
       } catch (e) {
         if (e.status === 404) {
-          navigateToUrl(ROLE_MAPPINGS_PATH);
+          setErrorMessage(ROLE_MAPPING_NOT_FOUND);
+        } else {
+          flashAPIErrors(e);
         }
-        flashAPIErrors(e);
       }
     },
-    handleDeleteMapping: async () => {
-      const { roleMapping } = values;
-      if (!roleMapping) return;
-
+    handleDeleteMapping: async ({ roleMappingId }) => {
       const { http } = HttpLogic.values;
-      const { navigateToUrl } = KibanaLogic.values;
-      const route = `/api/workplace_search/org/role_mappings/${roleMapping.id}`;
+      const route = `/api/workplace_search/org/role_mappings/${roleMappingId}`;
 
       if (window.confirm(DELETE_ROLE_MAPPING_MESSAGE)) {
         try {
           await http.delete(route);
-          navigateToUrl(ROLE_MAPPINGS_PATH);
+          actions.initializeRoleMappings();
           setSuccessMessage(ROLE_MAPPING_DELETED_MESSAGE);
         } catch (e) {
           flashAPIErrors(e);
@@ -284,7 +315,6 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
     },
     handleSaveMapping: async () => {
       const { http } = HttpLogic.values;
-      const { navigateToUrl } = KibanaLogic.values;
       const {
         attributeName,
         attributeValue,
@@ -315,14 +345,20 @@ export const RoleMappingsLogic = kea<MakeLogicType<RoleMappingsValues, RoleMappi
 
       try {
         await request;
-        navigateToUrl(ROLE_MAPPINGS_PATH);
+        actions.initializeRoleMappings();
         setSuccessMessage(SUCCESS_MESSAGE);
       } catch (e) {
-        flashAPIErrors(e);
+        actions.setRoleMappingErrors(e?.body?.attributes?.errors);
       }
     },
     resetState: () => {
       clearFlashMessages();
     },
+    closeRoleMappingFlyout: () => {
+      clearFlashMessages();
+    },
+    openRoleMappingFlyout: () => {
+      clearFlashMessages();
+    },
   }),
 });
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_router.test.tsx
deleted file mode 100644
index e9fc40ba1dbb4..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_router.test.tsx
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { Route, Switch } from 'react-router-dom';
-
-import { shallow } from 'enzyme';
-
-import { RoleMapping } from './role_mapping';
-import { RoleMappings } from './role_mappings';
-import { RoleMappingsRouter } from './role_mappings_router';
-
-describe('RoleMappingsRouter', () => {
-  it('renders', () => {
-    const wrapper = shallow(<RoleMappingsRouter />);
-
-    expect(wrapper.find(Switch)).toHaveLength(1);
-    expect(wrapper.find(Route)).toHaveLength(3);
-    expect(wrapper.find(RoleMapping)).toHaveLength(2);
-    expect(wrapper.find(RoleMappings)).toHaveLength(1);
-  });
-});
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_router.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_router.tsx
deleted file mode 100644
index fa5ab12c8afc0..0000000000000
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/role_mappings/role_mappings_router.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 from 'react';
-
-import { Route, Switch } from 'react-router-dom';
-
-import { SetWorkplaceSearchChrome as SetPageChrome } from '../../../shared/kibana_chrome';
-import { NAV } from '../../constants';
-import { ROLE_MAPPING_NEW_PATH, ROLE_MAPPING_PATH, ROLE_MAPPINGS_PATH } from '../../routes';
-
-import { RoleMapping } from './role_mapping';
-import { RoleMappings } from './role_mappings';
-
-export const RoleMappingsRouter: React.FC = () => (
-  <>
-    <SetPageChrome trail={[NAV.ROLE_MAPPINGS]} />
-    <Switch>
-      <Route exact path={ROLE_MAPPING_NEW_PATH}>
-        <RoleMapping isNew />
-      </Route>
-      <Route exact path={ROLE_MAPPINGS_PATH}>
-        <RoleMappings />
-      </Route>
-      <Route path={ROLE_MAPPING_PATH}>
-        <RoleMapping />
-      </Route>
-    </Switch>
-  </>
-);
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/components/private_sources_table.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/components/private_sources_table.test.tsx
index 4f7160ba631f1..65f9ac9cbb0f9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/components/private_sources_table.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/components/private_sources_table.test.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { setMockValues } from '../../../../__mocks__';
+import { setMockValues } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx
index 346994ac557f9..c9720eb6c1c04 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import '../../../__mocks__/shallow_useeffect.mock';
-import { setMockValues, setMockActions } from '../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security_logic.test.ts
index 02d8fdd3c30e4..ecb97cea528b9 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/security/security_logic.test.ts
@@ -5,8 +5,11 @@
  * 2.0.
  */
 
-import { mockHttpValues, mockFlashMessageHelpers } from '../../../__mocks__';
-import { LogicMounter } from '../../../__mocks__/kea.mock';
+import {
+  LogicMounter,
+  mockHttpValues,
+  mockFlashMessageHelpers,
+} from '../../../__mocks__/kea_logic';
 
 import { nextTick } from '@kbn/test/jest';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/connectors.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/connectors.test.tsx
index 13ef86a21a208..e95dd60ae6089 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/connectors.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/connectors.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import { configuredSources } from '../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/customize.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/customize.test.tsx
index ed05829d9e082..15d0db4c415d0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/customize.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/customize.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 
 import React from 'react';
 
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/oauth_application.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/oauth_application.test.tsx
index 55a58610e0ed6..3c0cae212caa4 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/oauth_application.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/oauth_application.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import { oauthApplication } from '../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.test.tsx
index ed9f715fd6916..c9b458e8d3535 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/components/source_config.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockValues, setMockActions } from '../../../../__mocks__';
+import { setMockValues, setMockActions } from '../../../../__mocks__/kea_logic';
 import { sourceConfigData } from '../../../__mocks__/content_sources.mock';
 
 import React from 'react';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_logic.test.ts b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_logic.test.ts
index a57c2c1f9ad44..0aef84ccf20e2 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_logic.test.ts
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_logic.test.ts
@@ -5,8 +5,12 @@
  * 2.0.
  */
 
-import { mockFlashMessageHelpers, mockHttpValues, mockKibanaValues } from '../../../__mocks__';
-import { LogicMounter } from '../../../__mocks__/kea.mock';
+import {
+  LogicMounter,
+  mockFlashMessageHelpers,
+  mockHttpValues,
+  mockKibanaValues,
+} from '../../../__mocks__/kea_logic';
 import { configuredSources, oauthApplication } from '../../__mocks__/content_sources.mock';
 
 import { nextTick } from '@kbn/test/jest';
diff --git a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx
index 3c0dee2a874ae..6a9104ceefde0 100644
--- a/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx
+++ b/x-pack/plugins/enterprise_search/public/applications/workplace_search/views/settings/settings_router.test.tsx
@@ -7,7 +7,7 @@
 
 import '../../../__mocks__/shallow_useeffect.mock';
 
-import { setMockActions } from '../../../__mocks__';
+import { setMockActions } from '../../../__mocks__/kea_logic';
 
 import React from 'react';
 import { Route, Redirect, Switch } from 'react-router-dom';
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/http_agent.mock.ts b/x-pack/plugins/enterprise_search/server/__mocks__/http_agent.mock.ts
new file mode 100644
index 0000000000000..1e9b04674b582
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/http_agent.mock.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export const mockHttpAgent = jest.fn();
+
+jest.mock('../lib/enterprise_search_http_agent', () => ({
+  entSearchHttpAgent: {
+    getHttpAgent: () => mockHttpAgent,
+  },
+}));
diff --git a/x-pack/plugins/enterprise_search/server/__mocks__/index.ts b/x-pack/plugins/enterprise_search/server/__mocks__/index.ts
index c36acd2b57647..c59a5a8f67e32 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/index.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/index.ts
@@ -12,3 +12,5 @@ export {
   mockRequestHandler,
   mockDependencies,
 } from './routerDependencies.mock';
+
+export { mockHttpAgent } from './http_agent.mock';
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 50ff082858fc8..08be1a134ae02 100644
--- a/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
+++ b/x-pack/plugins/enterprise_search/server/__mocks__/routerDependencies.mock.ts
@@ -23,6 +23,7 @@ export const mockConfig = {
   host: 'http://localhost:3002',
   accessCheckTimeout: 5000,
   accessCheckTimeoutWarning: 300,
+  ssl: {},
 } as ConfigType;
 
 /**
diff --git a/x-pack/plugins/enterprise_search/server/index.ts b/x-pack/plugins/enterprise_search/server/index.ts
index c4552b9134eae..ecd068c8bdbd9 100644
--- a/x-pack/plugins/enterprise_search/server/index.ts
+++ b/x-pack/plugins/enterprise_search/server/index.ts
@@ -19,6 +19,15 @@ export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
   accessCheckTimeout: schema.number({ defaultValue: 5000 }),
   accessCheckTimeoutWarning: schema.number({ defaultValue: 300 }),
+  ssl: schema.object({
+    certificateAuthorities: schema.maybe(
+      schema.oneOf([schema.arrayOf(schema.string(), { minSize: 1 }), schema.string()])
+    ),
+    verificationMode: schema.oneOf(
+      [schema.literal('none'), schema.literal('certificate'), schema.literal('full')],
+      { defaultValue: 'full' }
+    ),
+  }),
 });
 
 export type ConfigType = TypeOf<typeof configSchema>;
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 66f2bf78e0c9c..50bac793ee696 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,6 +6,7 @@
  */
 
 import { DEFAULT_INITIAL_APP_DATA } from '../../common/__mocks__';
+import '../__mocks__/http_agent.mock.ts';
 
 jest.mock('node-fetch');
 import fetch from 'node-fetch';
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 0f2faf1fd8a3a..8cce01d1932ee 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
@@ -16,6 +16,8 @@ import { stripTrailingSlash } from '../../common/strip_slashes';
 import { InitialAppData } from '../../common/types';
 import { ConfigType } from '../index';
 
+import { entSearchHttpAgent } from './enterprise_search_http_agent';
+
 interface Params {
   request: KibanaRequest;
   config: ConfigType;
@@ -54,10 +56,13 @@ export const callEnterpriseSearchConfigAPI = async ({
 
   try {
     const enterpriseSearchUrl = encodeURI(`${config.host}${ENDPOINT}`);
-    const response = await fetch(enterpriseSearchUrl, {
+    const options = {
       headers: { Authorization: request.headers.authorization as string },
       signal: controller.signal,
-    });
+      agent: entSearchHttpAgent.getHttpAgent(),
+    };
+
+    const response = await fetch(enterpriseSearchUrl, options);
     const data = await response.json();
 
     warnMismatchedVersions(data?.version?.number, log);
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
new file mode 100644
index 0000000000000..f4bdfd8d2cb0f
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.test.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+jest.mock('fs', () => ({ readFileSync: jest.fn() }));
+import { readFileSync } from 'fs';
+
+import http from 'http';
+import https from 'https';
+
+import { ConfigType } from '../';
+
+import { entSearchHttpAgent } from './enterprise_search_http_agent';
+
+describe('entSearchHttpAgent', () => {
+  describe('initializeHttpAgent', () => {
+    it('creates an https.Agent when host URL is using HTTPS', () => {
+      entSearchHttpAgent.initializeHttpAgent({
+        host: 'https://example.org',
+        ssl: {},
+      } as ConfigType);
+      expect(entSearchHttpAgent.getHttpAgent()).toBeInstanceOf(https.Agent);
+    });
+
+    it('creates an http.Agent when host URL is using HTTP', () => {
+      entSearchHttpAgent.initializeHttpAgent({
+        host: 'http://example.org',
+        ssl: {},
+      } as ConfigType);
+      expect(entSearchHttpAgent.getHttpAgent()).toBeInstanceOf(http.Agent);
+    });
+
+    describe('fallbacks', () => {
+      it('initializes a http.Agent when host URL is invalid', () => {
+        entSearchHttpAgent.initializeHttpAgent({
+          host: '##!notarealurl#$',
+          ssl: {},
+        } as ConfigType);
+        expect(entSearchHttpAgent.getHttpAgent()).toBeInstanceOf(http.Agent);
+      });
+
+      it('should be an http.Agent when host URL is empty', () => {
+        entSearchHttpAgent.initializeHttpAgent({
+          host: undefined,
+          ssl: {},
+        } as ConfigType);
+        expect(entSearchHttpAgent.getHttpAgent()).toBeInstanceOf(http.Agent);
+      });
+    });
+  });
+
+  describe('loadCertificateAuthorities', () => {
+    describe('happy path', () => {
+      beforeEach(() => {
+        jest.clearAllMocks();
+        (readFileSync as jest.Mock).mockImplementation((path: string) => `content-of-${path}`);
+      });
+
+      it('reads certificate authorities when ssl.certificateAuthorities is a string', () => {
+        const certs = entSearchHttpAgent.loadCertificateAuthorities('some-path');
+        expect(readFileSync).toHaveBeenCalledTimes(1);
+        expect(certs).toEqual(['content-of-some-path']);
+      });
+
+      it('reads certificate authorities when ssl.certificateAuthorities is an array', () => {
+        const certs = entSearchHttpAgent.loadCertificateAuthorities(['some-path', 'another-path']);
+        expect(readFileSync).toHaveBeenCalledTimes(2);
+        expect(certs).toEqual(['content-of-some-path', 'content-of-another-path']);
+      });
+
+      it('does not read anything when ssl.certificateAuthorities is empty', () => {
+        const certs = entSearchHttpAgent.loadCertificateAuthorities(undefined);
+        expect(readFileSync).toHaveBeenCalledTimes(0);
+        expect(certs).toEqual([]);
+      });
+    });
+
+    describe('error handling', () => {
+      beforeEach(() => {
+        const realFs = jest.requireActual('fs');
+        (readFileSync as jest.Mock).mockImplementation((path: string) => realFs.readFileSync(path));
+      });
+
+      it('throws if certificateAuthorities is invalid', () => {
+        expect(() => entSearchHttpAgent.loadCertificateAuthorities('/invalid/ca')).toThrow(
+          "ENOENT: no such file or directory, open '/invalid/ca'"
+        );
+      });
+    });
+  });
+
+  describe('getAgentOptions', () => {
+    it('verificationMode: none', () => {
+      expect(entSearchHttpAgent.getAgentOptions('none')).toEqual({
+        rejectUnauthorized: false,
+      });
+    });
+
+    it('verificationMode: certificate', () => {
+      expect(entSearchHttpAgent.getAgentOptions('certificate')).toEqual({
+        rejectUnauthorized: true,
+        checkServerIdentity: expect.any(Function),
+      });
+
+      const { checkServerIdentity } = entSearchHttpAgent.getAgentOptions('certificate') as any;
+      expect(checkServerIdentity()).toEqual(undefined);
+    });
+
+    it('verificationMode: full', () => {
+      expect(entSearchHttpAgent.getAgentOptions('full')).toEqual({
+        rejectUnauthorized: true,
+      });
+    });
+  });
+});
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
new file mode 100644
index 0000000000000..89210def248b3
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_http_agent.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 { readFileSync } from 'fs';
+import http from 'http';
+import https from 'https';
+import { PeerCertificate } from 'tls';
+
+import { ConfigType } from '../';
+
+export type HttpAgent = http.Agent | https.Agent;
+interface AgentOptions {
+  rejectUnauthorized?: boolean;
+  checkServerIdentity?: ((host: string, cert: PeerCertificate) => Error | undefined) | undefined;
+}
+
+/*
+ * Returns an HTTP agent to be used for requests to Enterprise Search APIs
+ */
+class EnterpriseSearchHttpAgent {
+  public httpAgent: HttpAgent = new http.Agent();
+
+  getHttpAgent() {
+    return this.httpAgent;
+  }
+
+  initializeHttpAgent(config: ConfigType) {
+    if (!config.host) return;
+
+    try {
+      const parsedHost = new URL(config.host);
+      if (parsedHost.protocol === 'https:') {
+        this.httpAgent = new https.Agent({
+          ca: this.loadCertificateAuthorities(config.ssl.certificateAuthorities),
+          ...this.getAgentOptions(config.ssl.verificationMode),
+        });
+      }
+    } catch {
+      // Ignore URL parsing errors and fall back to the HTTP agent
+    }
+  }
+
+  /*
+   * Loads custom CA certificate files and returns all certificates as an array
+   * This is a potentially expensive operation & why this helper is a class
+   * initialized once on plugin init
+   */
+  loadCertificateAuthorities(certificates: string | string[] | undefined): string[] {
+    if (!certificates) return [];
+
+    const paths = Array.isArray(certificates) ? certificates : [certificates];
+    return paths.map((path) => readFileSync(path, 'utf8'));
+  }
+
+  /*
+   * Convert verificationMode to rejectUnauthorized for more consistent config settings
+   * with the rest of Kibana
+   * @see https://github.com/elastic/kibana/blob/master/x-pack/plugins/actions/server/builtin_action_types/lib/get_node_tls_options.ts
+   */
+  getAgentOptions(verificationMode: 'full' | 'certificate' | 'none') {
+    const agentOptions: AgentOptions = {};
+
+    switch (verificationMode) {
+      case 'none':
+        agentOptions.rejectUnauthorized = false;
+        break;
+      case 'certificate':
+        agentOptions.rejectUnauthorized = true;
+        agentOptions.checkServerIdentity = () => undefined;
+        break;
+      case 'full':
+      default:
+        agentOptions.rejectUnauthorized = true;
+        break;
+    }
+
+    return agentOptions;
+  }
+}
+
+export const entSearchHttpAgent = new EnterpriseSearchHttpAgent();
diff --git a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
index 3223471e4fc1a..6ebf46abd39d3 100644
--- a/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
+++ b/x-pack/plugins/enterprise_search/server/lib/enterprise_search_request_handler.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { mockConfig, mockLogger } from '../__mocks__';
+import { mockConfig, mockLogger, mockHttpAgent } from '../__mocks__';
 
 import {
   ENTERPRISE_SEARCH_KIBANA_COOKIE,
@@ -476,6 +476,7 @@ const EnterpriseSearchAPI = {
       headers: { Authorization: 'Basic 123', ...JSON_HEADER },
       method: 'GET',
       body: undefined,
+      agent: mockHttpAgent,
       ...expectedParams,
     });
   },
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 2fc0a13f2ff72..597f7524808e9 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
@@ -16,13 +16,15 @@ import {
   Logger,
 } from 'src/core/server';
 
+import { ConfigType } from '../';
+
 import {
   ENTERPRISE_SEARCH_KIBANA_COOKIE,
   JSON_HEADER,
   READ_ONLY_MODE_HEADER,
 } from '../../common/constants';
 
-import { ConfigType } from '../index';
+import { entSearchHttpAgent } from './enterprise_search_http_agent';
 
 interface ConstructorDependencies {
   config: ConfigType;
@@ -77,12 +79,15 @@ export class EnterpriseSearchRequestHandler {
         const url = encodeURI(this.enterpriseSearchUrl) + encodedPath + queryString;
 
         // Set up API options
-        const { method } = request.route;
-        const headers = { Authorization: request.headers.authorization as string, ...JSON_HEADER };
-        const body = this.getBodyAsString(request.body as object | Buffer);
+        const options = {
+          method: request.route.method as string,
+          headers: { Authorization: request.headers.authorization as string, ...JSON_HEADER },
+          body: this.getBodyAsString(request.body as object | Buffer),
+          agent: entSearchHttpAgent.getHttpAgent(),
+        };
 
         // Call the Enterprise Search API
-        const apiResponse = await fetch(url, { method, headers, body });
+        const apiResponse = await fetch(url, options);
 
         // Handle response headers
         this.setResponseHeaders(apiResponse);
diff --git a/x-pack/plugins/enterprise_search/server/plugin.ts b/x-pack/plugins/enterprise_search/server/plugin.ts
index 1b9659899097d..04bd304ee679f 100644
--- a/x-pack/plugins/enterprise_search/server/plugin.ts
+++ b/x-pack/plugins/enterprise_search/server/plugin.ts
@@ -31,6 +31,7 @@ import { registerTelemetryUsageCollector as registerESTelemetryUsageCollector }
 import { registerTelemetryUsageCollector as registerWSTelemetryUsageCollector } from './collectors/workplace_search/telemetry';
 
 import { checkAccess } from './lib/check_access';
+import { entSearchHttpAgent } from './lib/enterprise_search_http_agent';
 import {
   EnterpriseSearchRequestHandler,
   IEnterpriseSearchRequestHandler,
@@ -81,6 +82,11 @@ export class EnterpriseSearchPlugin implements Plugin {
     const config = this.config;
     const log = this.logger;
 
+    /*
+     * Initialize config.ssl.certificateAuthorities file(s) - required for all API calls (+ access checks)
+     */
+    entSearchHttpAgent.initializeHttpAgent(config);
+
     /**
      * Register space/feature control
      */
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/crawler.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/crawler.test.ts
new file mode 100644
index 0000000000000..626a107b6942b
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/crawler.test.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { mockDependencies, mockRequestHandler, MockRouter } from '../../__mocks__';
+
+import { registerCrawlerRoutes } from './crawler';
+
+describe('crawler routes', () => {
+  describe('GET /api/app_search/engines/{name}/crawler', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({
+        method: 'get',
+        path: '/api/app_search/engines/{name}/crawler',
+      });
+
+      registerCrawlerRoutes({
+        ...mockDependencies,
+        router: mockRouter.router,
+      });
+    });
+
+    it('creates a request to enterprise search', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/api/as/v0/engines/:name/crawler',
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/crawler.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/crawler.ts
new file mode 100644
index 0000000000000..15b8340b07d4e
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/crawler.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 { schema } from '@kbn/config-schema';
+
+import { RouteDependencies } from '../../plugin';
+
+export function registerCrawlerRoutes({
+  router,
+  enterpriseSearchRequestHandler,
+}: RouteDependencies) {
+  router.get(
+    {
+      path: '/api/app_search/engines/{name}/crawler',
+      validate: {
+        params: schema.object({
+          name: schema.string(),
+        }),
+      },
+    },
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/api/as/v0/engines/:name/crawler',
+    })
+  );
+}
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/curations.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/curations.test.ts
index 045d3d12e8bcf..08e123a98cd31 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/curations.test.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/curations.test.ts
@@ -229,39 +229,4 @@ describe('curations routes', () => {
       });
     });
   });
-
-  describe('GET /api/app_search/engines/{engineName}/curation_search', () => {
-    let mockRouter: MockRouter;
-
-    beforeEach(() => {
-      jest.clearAllMocks();
-      mockRouter = new MockRouter({
-        method: 'get',
-        path: '/api/app_search/engines/{engineName}/curation_search',
-      });
-
-      registerCurationsRoutes({
-        ...mockDependencies,
-        router: mockRouter.router,
-      });
-    });
-
-    it('creates a request handler', () => {
-      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
-        path: '/api/as/v1/engines/:engineName/search.json',
-      });
-    });
-
-    describe('validates', () => {
-      it('required query param', () => {
-        const request = { query: { query: 'some query' } };
-        mockRouter.shouldValidate(request);
-      });
-
-      it('missing query', () => {
-        const request = { query: {} };
-        mockRouter.shouldThrow(request);
-      });
-    });
-  });
 });
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts
index 18de4580318a2..2442b61c632c1 100644
--- a/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/index.ts
@@ -9,6 +9,7 @@ import { RouteDependencies } from '../../plugin';
 
 import { registerAnalyticsRoutes } from './analytics';
 import { registerApiLogsRoutes } from './api_logs';
+import { registerCrawlerRoutes } from './crawler';
 import { registerCredentialsRoutes } from './credentials';
 import { registerCurationsRoutes } from './curations';
 import { registerDocumentsRoutes, registerDocumentRoutes } from './documents';
@@ -17,6 +18,7 @@ import { registerOnboardingRoutes } from './onboarding';
 import { registerResultSettingsRoutes } from './result_settings';
 import { registerRoleMappingsRoutes } from './role_mappings';
 import { registerSchemaRoutes } from './schema';
+import { registerSearchRoutes } from './search';
 import { registerSearchSettingsRoutes } from './search_settings';
 import { registerSearchUIRoutes } from './search_ui';
 import { registerSettingsRoutes } from './settings';
@@ -31,6 +33,7 @@ export const registerAppSearchRoutes = (dependencies: RouteDependencies) => {
   registerDocumentsRoutes(dependencies);
   registerDocumentRoutes(dependencies);
   registerSchemaRoutes(dependencies);
+  registerSearchRoutes(dependencies);
   registerSourceEnginesRoutes(dependencies);
   registerCurationsRoutes(dependencies);
   registerSynonymsRoutes(dependencies);
@@ -40,4 +43,5 @@ export const registerAppSearchRoutes = (dependencies: RouteDependencies) => {
   registerResultSettingsRoutes(dependencies);
   registerApiLogsRoutes(dependencies);
   registerOnboardingRoutes(dependencies);
+  registerCrawlerRoutes(dependencies);
 };
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/search.test.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/search.test.ts
new file mode 100644
index 0000000000000..9262dd9e574ad
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/search.test.ts
@@ -0,0 +1,35 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { MockRouter, mockRequestHandler, mockDependencies } from '../../__mocks__';
+
+import { registerSearchRoutes } from './search';
+
+describe('search routes', () => {
+  describe('GET /api/app_search/engines/{engineName}/search', () => {
+    let mockRouter: MockRouter;
+
+    beforeEach(() => {
+      jest.clearAllMocks();
+      mockRouter = new MockRouter({
+        method: 'get',
+        path: '/api/app_search/engines/{engineName}/schema',
+      });
+
+      registerSearchRoutes({
+        ...mockDependencies,
+        router: mockRouter.router,
+      });
+    });
+
+    it('creates a request handler', () => {
+      expect(mockRequestHandler.createRequest).toHaveBeenCalledWith({
+        path: '/api/as/v1/engines/:engineName/search.json',
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/enterprise_search/server/routes/app_search/search.ts b/x-pack/plugins/enterprise_search/server/routes/app_search/search.ts
new file mode 100644
index 0000000000000..016f71e7e65b8
--- /dev/null
+++ b/x-pack/plugins/enterprise_search/server/routes/app_search/search.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.
+ */
+
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { RouteDependencies } from '../../plugin';
+
+export function registerSearchRoutes({
+  router,
+  enterpriseSearchRequestHandler,
+}: RouteDependencies) {
+  router.get(
+    {
+      path: '/api/app_search/engines/{engineName}/search',
+      validate: {
+        params: schema.object({
+          engineName: schema.string(),
+        }),
+        query: schema.object({
+          query: schema.string(),
+        }),
+      },
+    },
+    enterpriseSearchRequestHandler.createRequest({
+      path: '/api/as/v1/engines/:engineName/search.json',
+    })
+  );
+}
diff --git a/x-pack/plugins/event_log/generated/mappings.json b/x-pack/plugins/event_log/generated/mappings.json
index f2515d0a6a8fb..da04db1086aa8 100644
--- a/x-pack/plugins/event_log/generated/mappings.json
+++ b/x-pack/plugins/event_log/generated/mappings.json
@@ -275,6 +275,10 @@
                         "type": {
                             "type": "keyword",
                             "ignore_above": 1024
+                        },
+                        "type_id": {
+                            "type": "keyword",
+                            "ignore_above": 1024
                         }
                     }
                 }
diff --git a/x-pack/plugins/event_log/generated/schemas.ts b/x-pack/plugins/event_log/generated/schemas.ts
index 31d8b7201cfc6..a13b304e8adab 100644
--- a/x-pack/plugins/event_log/generated/schemas.ts
+++ b/x-pack/plugins/event_log/generated/schemas.ts
@@ -116,6 +116,7 @@ export const EventSchema = schema.maybe(
               namespace: ecsString(),
               id: ecsString(),
               type: ecsString(),
+              type_id: ecsString(),
             })
           )
         ),
diff --git a/x-pack/plugins/event_log/scripts/mappings.js b/x-pack/plugins/event_log/scripts/mappings.js
index a7e5f4ae6cb1e..f2020e76b46ba 100644
--- a/x-pack/plugins/event_log/scripts/mappings.js
+++ b/x-pack/plugins/event_log/scripts/mappings.js
@@ -60,6 +60,10 @@ exports.EcsCustomPropertyMappings = {
             type: 'keyword',
             ignore_above: 1024,
           },
+          type_id: {
+            type: 'keyword',
+            ignore_above: 1024,
+          },
         },
       },
     },
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 dd6ac6350d6e3..e42e24e4b47d4 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
@@ -240,7 +240,7 @@ export class ClusterClientAdapter<TDoc extends { body: AliasAny; index: string }
       });
       throw err;
     }
-    const musts: estypes.QueryContainer[] = [
+    const musts: estypes.QueryDslQueryContainer[] = [
       {
         nested: {
           path: 'kibana.saved_objects',
diff --git a/x-pack/plugins/features/common/feature_kibana_privileges.ts b/x-pack/plugins/features/common/feature_kibana_privileges.ts
index 166ce5b62a067..cb403ce673f11 100644
--- a/x-pack/plugins/features/common/feature_kibana_privileges.ts
+++ b/x-pack/plugins/features/common/feature_kibana_privileges.ts
@@ -127,6 +127,34 @@ export interface FeatureKibanaPrivileges {
       read?: readonly string[];
     };
   };
+
+  /**
+   * If your feature requires access to specific owners of cases (aka plugins that have created cases), then specify your access needs here. The values here should
+   * be unique identifiers for the owners of cases you want access to.
+   */
+  cases?: {
+    /**
+     * List of case owners which users should have full read/write access to when granted this privilege.
+     * @example
+     * ```ts
+     *  {
+     *    all: ['securitySolution']
+     *  }
+     * ```
+     */
+    all?: readonly string[];
+    /**
+     * List of case owners which users should have read-only access to when granted this privilege.
+     * @example
+     * ```ts
+     *  {
+     *    read: ['securitySolution']
+     *  }
+     * ```
+     */
+    read?: readonly string[];
+  };
+
   /**
    * If your feature requires access to specific saved objects, then specify your access needs here.
    */
diff --git a/x-pack/plugins/features/common/kibana_feature.ts b/x-pack/plugins/features/common/kibana_feature.ts
index 7c9f930c106b0..089389c7bc7fa 100644
--- a/x-pack/plugins/features/common/kibana_feature.ts
+++ b/x-pack/plugins/features/common/kibana_feature.ts
@@ -98,6 +98,11 @@ export interface KibanaFeatureConfig {
    */
   alerting?: readonly string[];
 
+  /**
+   * If your feature grants access to specific case types, you can specify them here to control visibility based on the current space.
+   */
+  cases?: readonly string[];
+
   /**
    * Feature privilege definition.
    *
@@ -183,6 +188,10 @@ export class KibanaFeature {
     return this.config.alerting;
   }
 
+  public get cases() {
+    return this.config.cases;
+  }
+
   public get excludeFromBasePrivileges() {
     return this.config.excludeFromBasePrivileges ?? false;
   }
diff --git a/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
index 64be725e02bbe..e1e5776d87c75 100644
--- a/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
+++ b/x-pack/plugins/features/server/__snapshots__/oss_features.test.ts.snap
@@ -528,6 +528,10 @@ Array [
         "dashboards",
         "kibana",
       ],
+      "cases": Object {
+        "all": Array [],
+        "read": Array [],
+      },
       "catalogue": Array [
         "dashboard",
       ],
@@ -673,6 +677,10 @@ Array [
         "discover",
         "kibana",
       ],
+      "cases": Object {
+        "all": Array [],
+        "read": Array [],
+      },
       "catalogue": Array [
         "discover",
       ],
@@ -915,6 +923,10 @@ Array [
         "lens",
         "kibana",
       ],
+      "cases": Object {
+        "all": Array [],
+        "read": Array [],
+      },
       "catalogue": Array [
         "visualize",
       ],
@@ -1044,6 +1056,10 @@ Array [
         "dashboards",
         "kibana",
       ],
+      "cases": Object {
+        "all": Array [],
+        "read": Array [],
+      },
       "catalogue": Array [
         "dashboard",
       ],
@@ -1189,6 +1205,10 @@ Array [
         "discover",
         "kibana",
       ],
+      "cases": Object {
+        "all": Array [],
+        "read": Array [],
+      },
       "catalogue": Array [
         "discover",
       ],
@@ -1431,6 +1451,10 @@ Array [
         "lens",
         "kibana",
       ],
+      "cases": Object {
+        "all": Array [],
+        "read": Array [],
+      },
       "catalogue": Array [
         "visualize",
       ],
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 75e6eaa402091..6275d6aa9dce9 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
@@ -55,6 +55,10 @@ describe('featurePrivilegeIterator', () => {
               read: [],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -76,6 +80,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -113,6 +120,10 @@ describe('featurePrivilegeIterator', () => {
               read: [],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -137,6 +148,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -170,6 +184,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type-alerts'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -191,6 +209,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -229,6 +250,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type-alerts'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -261,6 +286,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -282,6 +311,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -311,6 +343,10 @@ describe('featurePrivilegeIterator', () => {
                       all: ['alerting-all-sub-type'],
                     },
                   },
+                  cases: {
+                    all: ['cases-all-sub-type'],
+                    read: ['cases-read-sub-type'],
+                  },
                   ui: ['ui-sub-type'],
                 },
               ],
@@ -349,6 +385,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -373,6 +413,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -405,6 +448,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -426,6 +473,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -455,6 +505,10 @@ describe('featurePrivilegeIterator', () => {
                       all: ['alerting-all-sub-type'],
                     },
                   },
+                  cases: {
+                    all: ['cases-all-sub-type'],
+                    read: ['cases-read-sub-type'],
+                  },
                   ui: ['ui-sub-type'],
                 },
               ],
@@ -493,6 +547,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -517,6 +575,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -549,6 +610,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -570,6 +635,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -600,6 +668,10 @@ describe('featurePrivilegeIterator', () => {
                       all: ['alerting-all-sub-type'],
                     },
                   },
+                  cases: {
+                    all: ['cases-all-sub-type'],
+                    read: ['cases-read-sub-type'],
+                  },
                   ui: ['ui-sub-type'],
                 },
               ],
@@ -641,6 +713,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type', 'cases-all-sub-type'],
+            read: ['cases-read-type', 'cases-read-sub-type'],
+          },
           ui: ['ui-action', 'ui-sub-type'],
         },
       },
@@ -668,6 +744,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-sub-type'],
+            read: ['cases-read-type', 'cases-read-sub-type'],
+          },
           ui: ['ui-action', 'ui-sub-type'],
         },
       },
@@ -702,6 +782,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -723,6 +807,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -752,6 +839,9 @@ describe('featurePrivilegeIterator', () => {
                       all: ['alerting-read-type'],
                     },
                   },
+                  cases: {
+                    read: ['cases-read-type'],
+                  },
                   ui: ['ui-action'],
                 },
               ],
@@ -792,6 +882,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -818,6 +912,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            all: [],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -850,6 +948,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -871,6 +973,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -901,6 +1006,10 @@ describe('featurePrivilegeIterator', () => {
                       all: ['alerting-all-sub-type'],
                     },
                   },
+                  cases: {
+                    all: ['cases-all-sub-type'],
+                    read: ['cases-read-sub-type'],
+                  },
                   ui: ['ui-sub-type'],
                 },
               ],
@@ -942,6 +1051,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type', 'cases-all-sub-type'],
+            read: ['cases-read-type', 'cases-read-sub-type'],
+          },
           ui: ['ui-action', 'ui-sub-type'],
         },
       },
@@ -966,6 +1079,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -998,6 +1114,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -1019,6 +1139,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -1050,6 +1173,10 @@ describe('featurePrivilegeIterator', () => {
                       all: ['alerting-all-sub-type'],
                     },
                   },
+                  cases: {
+                    all: ['cases-all-sub-type'],
+                    read: ['cases-read-sub-type'],
+                  },
                   ui: ['ui-sub-type'],
                 },
               ],
@@ -1088,6 +1215,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -1112,6 +1243,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -1168,6 +1302,10 @@ describe('featurePrivilegeIterator', () => {
                       read: ['alerting-read-sub-type'],
                     },
                   },
+                  cases: {
+                    all: ['cases-all-sub-type'],
+                    read: ['cases-read-sub-type'],
+                  },
                   ui: ['ui-sub-type'],
                 },
               ],
@@ -1209,6 +1347,10 @@ describe('featurePrivilegeIterator', () => {
               read: [],
             },
           },
+          cases: {
+            all: ['cases-all-sub-type'],
+            read: ['cases-read-sub-type'],
+          },
           ui: ['ui-sub-type'],
         },
       },
@@ -1236,6 +1378,10 @@ describe('featurePrivilegeIterator', () => {
               read: [],
             },
           },
+          cases: {
+            all: ['cases-all-sub-type'],
+            read: ['cases-read-sub-type'],
+          },
           ui: ['ui-sub-type'],
         },
       },
@@ -1268,6 +1414,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
         read: {
@@ -1289,6 +1439,9 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -1347,6 +1500,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-another-read-type'],
             },
           },
+          cases: {
+            all: ['cases-all-type'],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
@@ -1373,6 +1530,10 @@ describe('featurePrivilegeIterator', () => {
               read: ['alerting-read-type'],
             },
           },
+          cases: {
+            all: [],
+            read: ['cases-read-type'],
+          },
           ui: ['ui-action'],
         },
       },
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 b58f72b0fadc0..8843423ed3c43 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
@@ -131,6 +131,11 @@ function mergeWithSubFeatures(
         ),
       },
     };
+
+    mergedConfig.cases = {
+      all: mergeArrays(mergedConfig.cases?.all ?? [], subFeaturePrivilege.cases?.all ?? []),
+      read: mergeArrays(mergedConfig.cases?.read ?? [], subFeaturePrivilege.cases?.read ?? []),
+    };
   }
   return mergedConfig;
 }
diff --git a/x-pack/plugins/features/server/feature_registry.test.ts b/x-pack/plugins/features/server/feature_registry.test.ts
index 8e7ed45f33f50..984d76a17d159 100644
--- a/x-pack/plugins/features/server/feature_registry.test.ts
+++ b/x-pack/plugins/features/server/feature_registry.test.ts
@@ -1228,6 +1228,180 @@ describe('FeatureRegistry', () => {
       );
     });
 
+    it(`prevents privileges from specifying cases entries that don't exist at the root level`, () => {
+      const feature: KibanaFeatureConfig = {
+        id: 'test-feature',
+        name: 'Test Feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        cases: ['bar'],
+        privileges: {
+          all: {
+            cases: {
+              all: ['foo', 'bar'],
+              read: ['baz'],
+            },
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+            app: [],
+          },
+          read: {
+            cases: { read: ['foo', 'bar', 'baz'] },
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+            app: [],
+          },
+        },
+      };
+
+      const featureRegistry = new FeatureRegistry();
+
+      expect(() =>
+        featureRegistry.registerKibanaFeature(feature)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Feature privilege test-feature.all has unknown cases entries: foo, baz"`
+      );
+    });
+
+    it(`prevents features from specifying cases entries that don't exist at the privilege level`, () => {
+      const feature: KibanaFeatureConfig = {
+        id: 'test-feature',
+        name: 'Test Feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        cases: ['foo', 'bar', 'baz'],
+        privileges: {
+          all: {
+            cases: { all: ['foo'] },
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+            app: [],
+          },
+          read: {
+            cases: { all: ['foo'] },
+            savedObject: {
+              all: [],
+              read: [],
+            },
+            ui: [],
+            app: [],
+          },
+        },
+        subFeatures: [
+          {
+            name: 'my sub feature',
+            privilegeGroups: [
+              {
+                groupType: 'independent',
+                privileges: [
+                  {
+                    id: 'cool-sub-feature-privilege',
+                    name: 'cool privilege',
+                    includeIn: 'none',
+                    savedObject: {
+                      all: [],
+                      read: [],
+                    },
+                    ui: [],
+                    cases: { all: ['bar'] },
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      };
+
+      const featureRegistry = new FeatureRegistry();
+
+      expect(() =>
+        featureRegistry.registerKibanaFeature(feature)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Feature test-feature specifies cases entries which are not granted to any privileges: baz"`
+      );
+    });
+
+    it(`prevents reserved privileges from specifying cases entries that don't exist at the root level`, () => {
+      const feature: KibanaFeatureConfig = {
+        id: 'test-feature',
+        name: 'Test Feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        cases: ['bar'],
+        privileges: null,
+        reserved: {
+          description: 'something',
+          privileges: [
+            {
+              id: 'reserved',
+              privilege: {
+                cases: { all: ['foo', 'bar', 'baz'] },
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: [],
+                app: [],
+              },
+            },
+          ],
+        },
+      };
+
+      const featureRegistry = new FeatureRegistry();
+
+      expect(() =>
+        featureRegistry.registerKibanaFeature(feature)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Feature privilege test-feature.reserved has unknown cases entries: foo, baz"`
+      );
+    });
+
+    it(`prevents features from specifying cases entries that don't exist at the reserved privilege level`, () => {
+      const feature: KibanaFeatureConfig = {
+        id: 'test-feature',
+        name: 'Test Feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        cases: ['foo', 'bar', 'baz'],
+        privileges: null,
+        reserved: {
+          description: 'something',
+          privileges: [
+            {
+              id: 'reserved',
+              privilege: {
+                cases: { all: ['foo', 'bar'] },
+                savedObject: {
+                  all: [],
+                  read: [],
+                },
+                ui: [],
+                app: [],
+              },
+            },
+          ],
+        },
+      };
+
+      const featureRegistry = new FeatureRegistry();
+
+      expect(() =>
+        featureRegistry.registerKibanaFeature(feature)
+      ).toThrowErrorMatchingInlineSnapshot(
+        `"Feature test-feature specifies cases entries which are not granted to any privileges: baz"`
+      );
+    });
+
     it(`prevents privileges from specifying management sections that don't exist at the root level`, () => {
       const feature: KibanaFeatureConfig = {
         id: 'test-feature',
diff --git a/x-pack/plugins/features/server/feature_schema.ts b/x-pack/plugins/features/server/feature_schema.ts
index 00272efc8aa78..96d79982afcf1 100644
--- a/x-pack/plugins/features/server/feature_schema.ts
+++ b/x-pack/plugins/features/server/feature_schema.ts
@@ -63,6 +63,7 @@ const managementSchema = schema.recordOf(
 );
 const catalogueSchema = listOfCapabilitiesSchema;
 const alertingSchema = schema.arrayOf(schema.string());
+const casesSchema = schema.arrayOf(schema.string());
 
 const appCategorySchema = schema.object({
   id: schema.string(),
@@ -94,6 +95,12 @@ const kibanaPrivilegeSchema = schema.object({
       ),
     })
   ),
+  cases: schema.maybe(
+    schema.object({
+      all: schema.maybe(casesSchema),
+      read: schema.maybe(casesSchema),
+    })
+  ),
   savedObject: schema.object({
     all: schema.arrayOf(schema.string()),
     read: schema.arrayOf(schema.string()),
@@ -130,6 +137,12 @@ const kibanaIndependentSubFeaturePrivilegeSchema = schema.object({
       ),
     })
   ),
+  cases: schema.maybe(
+    schema.object({
+      all: schema.maybe(casesSchema),
+      read: schema.maybe(casesSchema),
+    })
+  ),
   api: schema.maybe(schema.arrayOf(schema.string())),
   app: schema.maybe(schema.arrayOf(schema.string())),
   savedObject: schema.object({
@@ -187,6 +200,7 @@ const kibanaFeatureSchema = schema.object({
   management: schema.maybe(managementSchema),
   catalogue: schema.maybe(catalogueSchema),
   alerting: schema.maybe(alertingSchema),
+  cases: schema.maybe(casesSchema),
   privileges: schema.oneOf([
     schema.literal(null),
     schema.object({
@@ -252,7 +266,7 @@ export function validateKibanaFeature(feature: KibanaFeatureConfig) {
   kibanaFeatureSchema.validate(feature);
 
   // the following validation can't be enforced by the Joi schema, since it'd require us looking "up" the object graph for the list of valid value, which they explicitly forbid.
-  const { app = [], management = {}, catalogue = [], alerting = [] } = feature;
+  const { app = [], management = {}, catalogue = [], alerting = [], cases = [] } = feature;
 
   const unseenApps = new Set(app);
 
@@ -267,6 +281,8 @@ export function validateKibanaFeature(feature: KibanaFeatureConfig) {
 
   const unseenAlertTypes = new Set(alerting);
 
+  const unseenCasesTypes = new Set(cases);
+
   function validateAppEntry(privilegeId: string, entry: readonly string[] = []) {
     entry.forEach((privilegeApp) => unseenApps.delete(privilegeApp));
 
@@ -310,6 +326,23 @@ export function validateKibanaFeature(feature: KibanaFeatureConfig) {
     }
   }
 
+  function validateCasesEntry(privilegeId: string, entry: FeatureKibanaPrivileges['cases']) {
+    const all = entry?.all ?? [];
+    const read = entry?.read ?? [];
+
+    all.forEach((privilegeCasesTypes) => unseenCasesTypes.delete(privilegeCasesTypes));
+    read.forEach((privilegeCasesTypes) => unseenCasesTypes.delete(privilegeCasesTypes));
+
+    const unknownCasesEntries = difference([...all, ...read], cases);
+    if (unknownCasesEntries.length > 0) {
+      throw new Error(
+        `Feature privilege ${
+          feature.id
+        }.${privilegeId} has unknown cases entries: ${unknownCasesEntries.join(', ')}`
+      );
+    }
+  }
+
   function validateManagementEntry(
     privilegeId: string,
     managementEntry: Record<string, readonly string[]> = {}
@@ -371,6 +404,7 @@ export function validateKibanaFeature(feature: KibanaFeatureConfig) {
 
     validateManagementEntry(privilegeId, privilegeDefinition.management);
     validateAlertingEntry(privilegeId, privilegeDefinition.alerting);
+    validateCasesEntry(privilegeId, privilegeDefinition.cases);
   });
 
   const subFeatureEntries = feature.subFeatures ?? [];
@@ -381,6 +415,7 @@ export function validateKibanaFeature(feature: KibanaFeatureConfig) {
         validateCatalogueEntry(subFeaturePrivilege.id, subFeaturePrivilege.catalogue);
         validateManagementEntry(subFeaturePrivilege.id, subFeaturePrivilege.management);
         validateAlertingEntry(subFeaturePrivilege.id, subFeaturePrivilege.alerting);
+        validateCasesEntry(subFeaturePrivilege.id, subFeaturePrivilege.cases);
       });
     });
   });
@@ -431,6 +466,16 @@ export function validateKibanaFeature(feature: KibanaFeatureConfig) {
       ).join(',')}`
     );
   }
+
+  if (unseenCasesTypes.size > 0) {
+    throw new Error(
+      `Feature ${
+        feature.id
+      } specifies cases entries which are not granted to any privileges: ${Array.from(
+        unseenCasesTypes.values()
+      ).join(',')}`
+    );
+  }
 }
 
 export function validateElasticsearchFeature(feature: ElasticsearchFeatureConfig) {
diff --git a/x-pack/plugins/file_data_visualizer/common/constants.ts b/x-pack/plugins/file_data_visualizer/common/constants.ts
deleted file mode 100644
index 819549a7eb4e6..0000000000000
--- a/x-pack/plugins/file_data_visualizer/common/constants.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.
- */
-
-export const UI_SETTING_MAX_FILE_SIZE = 'fileUpload:maxFileSize';
-
-export const MB = Math.pow(2, 20);
-export const MAX_FILE_SIZE = '100MB';
-export const MAX_FILE_SIZE_BYTES = 104857600; // 100MB
-
-export const ABSOLUTE_MAX_FILE_SIZE_BYTES = 1073741274; // 1GB
-export const FILE_SIZE_DISPLAY_FORMAT = '0,0.[0] b';
-
-// Value to use in the Elasticsearch index mapping meta data to identify the
-// index as having been created by the File Data Visualizer.
-export const INDEX_META_DATA_CREATED_BY = 'file-data-visualizer';
-
-export const JOB_FIELD_TYPES = {
-  BOOLEAN: 'boolean',
-  DATE: 'date',
-  GEO_POINT: 'geo_point',
-  GEO_SHAPE: 'geo_shape',
-  IP: 'ip',
-  KEYWORD: 'keyword',
-  NUMBER: 'number',
-  TEXT: 'text',
-  UNKNOWN: 'unknown',
-} as const;
diff --git a/x-pack/plugins/file_data_visualizer/common/types.ts b/x-pack/plugins/file_data_visualizer/common/types.ts
deleted file mode 100644
index edfe8b3575c8d..0000000000000
--- a/x-pack/plugins/file_data_visualizer/common/types.ts
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { JOB_FIELD_TYPES } from './constants';
-
-export type InputData = any[];
-
-export type JobFieldType = typeof JOB_FIELD_TYPES[keyof typeof JOB_FIELD_TYPES];
-
-export interface DataVisualizerTableState {
-  pageSize: number;
-  pageIndex: number;
-  sortField: string;
-  sortDirection: string;
-  visibleFieldTypes: string[];
-  visibleFieldNames: string[];
-  showDistributions: boolean;
-}
diff --git a/x-pack/plugins/file_data_visualizer/jest.config.js b/x-pack/plugins/file_data_visualizer/jest.config.js
deleted file mode 100644
index 90d4cfb81f11f..0000000000000
--- a/x-pack/plugins/file_data_visualizer/jest.config.js
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-module.exports = {
-  preset: '@kbn/test',
-  rootDir: '../../..',
-  roots: ['<rootDir>/x-pack/plugins/file_data_visualizer'],
-};
diff --git a/x-pack/plugins/file_data_visualizer/kibana.json b/x-pack/plugins/file_data_visualizer/kibana.json
deleted file mode 100644
index 721352cff7c95..0000000000000
--- a/x-pack/plugins/file_data_visualizer/kibana.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "id": "fileDataVisualizer",
-  "version": "8.0.0",
-  "kibanaVersion": "kibana",
-  "server": true,
-  "ui": true,
-  "requiredPlugins": [
-    "data",
-    "usageCollection",
-    "embeddable",
-    "share",
-    "discover",
-    "fileUpload"
-  ],
-  "optionalPlugins": [
-    "security",
-    "maps"
-  ],
-  "requiredBundles": [
-    "kibanaReact",
-    "maps",
-    "esUiShared"
-  ],
-  "extraPublicDirs": [
-    "common"
-  ]
-}
diff --git a/x-pack/plugins/file_data_visualizer/public/api/index.ts b/x-pack/plugins/file_data_visualizer/public/api/index.ts
deleted file mode 100644
index 13efd80133349..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/api/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { lazyLoadModules } from '../lazy_load_bundle';
-import { FileDataVisualizer } from '../application';
-
-export async function getFileDataVisualizerComponent(): Promise<typeof FileDataVisualizer> {
-  const modules = await lazyLoadModules();
-  return modules.FileDataVisualizer;
-}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss
deleted file mode 100644
index a47f3712cbb64..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/_index.scss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import 'about_panel/index';
-@import 'analysis_summary/index';
-@import 'edit_flyout/index';
-@import 'embedded_map/index';
-@import 'experimental_badge/index';
-@import 'file_contents/index';
-@import 'file_datavisualizer_view/index';
-@import 'import_summary/index';
-@import 'results_view/index';
-@import 'stats_table/index';
-@import 'top_values/top_values';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts
deleted file mode 100644
index efd166d4821c5..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/combined_fields/utils.ts
+++ /dev/null
@@ -1,175 +0,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 { cloneDeep } from 'lodash';
-import uuid from 'uuid/v4';
-import { CombinedField } from './types';
-import {
-  FindFileStructureResponse,
-  IngestPipeline,
-  Mappings,
-} from '../../../../../file_upload/common';
-
-const COMMON_LAT_NAMES = ['latitude', 'lat'];
-const COMMON_LON_NAMES = ['longitude', 'long', 'lon'];
-
-export function getDefaultCombinedFields(results: FindFileStructureResponse) {
-  const combinedFields: CombinedField[] = [];
-  const geoPointField = getGeoPointField(results);
-  if (geoPointField) {
-    combinedFields.push(geoPointField);
-  }
-  return combinedFields;
-}
-
-export function addCombinedFieldsToMappings(
-  mappings: Mappings,
-  combinedFields: CombinedField[]
-): Mappings {
-  const updatedMappings = { ...mappings };
-  combinedFields.forEach((combinedField) => {
-    updatedMappings.properties[combinedField.combinedFieldName] = {
-      type: combinedField.mappingType,
-    };
-  });
-  return updatedMappings;
-}
-
-export function removeCombinedFieldsFromMappings(
-  mappings: Mappings,
-  combinedFields: CombinedField[]
-) {
-  const updatedMappings = { ...mappings };
-  combinedFields.forEach((combinedField) => {
-    delete updatedMappings.properties[combinedField.combinedFieldName];
-  });
-  return updatedMappings;
-}
-
-export function addCombinedFieldsToPipeline(
-  pipeline: IngestPipeline,
-  combinedFields: CombinedField[]
-) {
-  const updatedPipeline = cloneDeep(pipeline);
-  combinedFields.forEach((combinedField) => {
-    updatedPipeline.processors.push({
-      set: {
-        field: combinedField.combinedFieldName,
-        value: combinedField.fieldNames
-          .map((fieldName) => {
-            return `{{${fieldName}}}`;
-          })
-          .join(combinedField.delimiter),
-      },
-    });
-  });
-  return updatedPipeline;
-}
-
-export function removeCombinedFieldsFromPipeline(
-  pipeline: IngestPipeline,
-  combinedFields: CombinedField[]
-) {
-  return {
-    ...pipeline,
-    processors: pipeline.processors.filter((processor) => {
-      return 'set' in processor
-        ? !combinedFields.some((combinedField) => {
-            return processor.set.field === combinedField.combinedFieldName;
-          })
-        : true;
-    }),
-  };
-}
-
-export function isWithinLatRange(
-  fieldName: string,
-  fieldStats: FindFileStructureResponse['field_stats']
-) {
-  return (
-    fieldName in fieldStats &&
-    'max_value' in fieldStats[fieldName] &&
-    fieldStats[fieldName]!.max_value! <= 90 &&
-    'min_value' in fieldStats[fieldName] &&
-    fieldStats[fieldName]!.min_value! >= -90
-  );
-}
-
-export function isWithinLonRange(
-  fieldName: string,
-  fieldStats: FindFileStructureResponse['field_stats']
-) {
-  return (
-    fieldName in fieldStats &&
-    'max_value' in fieldStats[fieldName] &&
-    fieldStats[fieldName]!.max_value! <= 180 &&
-    'min_value' in fieldStats[fieldName] &&
-    fieldStats[fieldName]!.min_value! >= -180
-  );
-}
-
-export function createGeoPointCombinedField(
-  latField: string,
-  lonField: string,
-  geoPointField: string
-): CombinedField {
-  return {
-    mappingType: 'geo_point',
-    delimiter: ',',
-    combinedFieldName: geoPointField,
-    fieldNames: [latField, lonField],
-  };
-}
-
-export function getNameCollisionMsg(name: string) {
-  return i18n.translate('xpack.fileDataVisualizer.nameCollisionMsg', {
-    defaultMessage: '"{name}" already exists, please provide a unique name',
-    values: { name },
-  });
-}
-
-export function getFieldNames(results: FindFileStructureResponse): string[] {
-  return results.column_names !== undefined
-    ? results.column_names
-    : Object.keys(results.field_stats);
-}
-
-function getGeoPointField(results: FindFileStructureResponse) {
-  const fieldNames = getFieldNames(results);
-
-  const latField = fieldNames.find((columnName) => {
-    return (
-      COMMON_LAT_NAMES.includes(columnName.toLowerCase()) &&
-      isWithinLatRange(columnName, results.field_stats)
-    );
-  });
-
-  const lonField = fieldNames.find((columnName) => {
-    return (
-      COMMON_LON_NAMES.includes(columnName.toLowerCase()) &&
-      isWithinLonRange(columnName, results.field_stats)
-    );
-  });
-
-  if (!latField || !lonField) {
-    return null;
-  }
-
-  const combinedFieldNames = [
-    'location',
-    'point_location',
-    `${latField}_${lonField}`,
-    `location_${uuid()}`,
-  ];
-  // Use first combinedFieldNames that does not have a naming collision
-  const geoPointField = combinedFieldNames.find((name) => {
-    return !fieldNames.includes(name);
-  });
-
-  return geoPointField ? createGeoPointCombinedField(latField, lonField, geoPointField) : null;
-}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss
deleted file mode 100644
index 9558e46aad556..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/edit_flyout/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'edit_flyout'
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx
deleted file mode 100644
index 1c533075af27b..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/examples_list/examples_list.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-
-import { EuiListGroup, EuiListGroupItem } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header';
-interface Props {
-  examples: Array<string | object>;
-}
-
-export const ExamplesList: FC<Props> = ({ examples }) => {
-  if (examples === undefined || examples === null || !Array.isArray(examples)) {
-    return null;
-  }
-  let examplesContent;
-  if (examples.length === 0) {
-    examplesContent = (
-      <FormattedMessage
-        id="xpack.fileDataVisualizer.fieldDataCard.examplesList.noExamplesMessage"
-        defaultMessage="No examples were obtained for this field"
-      />
-    );
-  } else {
-    examplesContent = examples.map((example, i) => {
-      return (
-        <EuiListGroupItem
-          className="fieldDataCard__codeContent"
-          size="s"
-          key={`example_${i}`}
-          label={typeof example === 'string' ? example : JSON.stringify(example)}
-        />
-      );
-    });
-  }
-
-  return (
-    <div data-test-subj="mlFieldDataExamplesList">
-      <ExpandedRowFieldHeader>
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCard.examplesList.title"
-          defaultMessage="{numExamples, plural, one {Value} other {Examples}}"
-          values={{
-            numExamples: examples.length,
-          }}
-        />
-      </ExpandedRowFieldHeader>
-      <EuiListGroup showToolTips={true} maxWidth={'s'} gutterSize={'none'} flush={true}>
-        {examplesContent}
-      </EuiListGroup>
-    </div>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.tsx
deleted file mode 100644
index c395b06059e8f..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/expanded_row/geo_point_content/geo_point_content.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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useMemo } from 'react';
-
-import { EuiFlexItem } from '@elastic/eui';
-import { Feature, Point } from 'geojson';
-import type { FieldDataRowProps } from '../../stats_table/types/field_data_row';
-import { DocumentStatsTable } from '../../stats_table/components/field_data_expanded_row/document_stats';
-import { EmbeddedMapComponent } from '../../embedded_map';
-import { convertWKTGeoToLonLat, getGeoPointsLayer } from './format_utils';
-import { ExpandedRowContent } from '../../stats_table/components/field_data_expanded_row/expanded_row_content';
-import { ExamplesList } from '../../examples_list';
-
-export const DEFAULT_GEO_REGEX = RegExp('(?<lat>.+) (?<lon>.+)');
-
-export const GeoPointContent: FC<FieldDataRowProps> = ({ config }) => {
-  const formattedResults = useMemo(() => {
-    const { stats } = config;
-
-    if (stats === undefined || stats.topValues === undefined) return null;
-    if (Array.isArray(stats.topValues)) {
-      const geoPointsFeatures: Array<Feature<Point>> = [];
-
-      // reformatting the top values from POINT (-2.359207 51.37837) to (-2.359207, 51.37837)
-      const formattedExamples = [];
-
-      for (let i = 0; i < stats.topValues.length; i++) {
-        const value = stats.topValues[i];
-        const coordinates = convertWKTGeoToLonLat(value.key);
-        if (coordinates) {
-          const formattedGeoPoint = `(${coordinates.lat}, ${coordinates.lon})`;
-          formattedExamples.push(coordinates);
-
-          geoPointsFeatures.push({
-            type: 'Feature',
-            id: `fileDataVisualizer-${config.fieldName}-${i}`,
-            geometry: {
-              type: 'Point',
-              coordinates: [coordinates.lat, coordinates.lon],
-            },
-            properties: {
-              value: formattedGeoPoint,
-              count: value.doc_count,
-            },
-          });
-        }
-      }
-
-      if (geoPointsFeatures.length > 0) {
-        return {
-          examples: formattedExamples,
-          layerList: [getGeoPointsLayer(geoPointsFeatures)],
-        };
-      }
-    }
-  }, [config]);
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVGeoPointContent'}>
-      <DocumentStatsTable config={config} />
-      {formattedResults && Array.isArray(formattedResults.examples) && (
-        <EuiFlexItem>
-          <ExamplesList examples={formattedResults.examples} />
-        </EuiFlexItem>
-      )}
-      {formattedResults && Array.isArray(formattedResults.layerList) && (
-        <EuiFlexItem
-          className={'dataVisualizerMapWrapper'}
-          data-test-subj={'mlDataVisualizerEmbeddedMap'}
-        >
-          <EmbeddedMapComponent layerList={formattedResults.layerList} />
-        </EuiFlexItem>
-      )}
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.tsx
deleted file mode 100644
index c02976cdb3853..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/field_data_row/number_content_preview.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 { FormattedMessage } from '@kbn/i18n/react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { FileBasedFieldVisConfig } from '../stats_table/types';
-
-export const FileBasedNumberContentPreview = ({ config }: { config: FileBasedFieldVisConfig }) => {
-  const stats = config.stats;
-  if (
-    stats === undefined ||
-    stats.min === undefined ||
-    stats.median === undefined ||
-    stats.max === undefined
-  )
-    return null;
-  return (
-    <EuiFlexGroup direction={'column'} gutterSize={'xs'}>
-      <EuiFlexGroup gutterSize="xs">
-        <EuiFlexItem>
-          <b>
-            <FormattedMessage
-              id="xpack.fileDataVisualizer.fieldStatsCard.minTitle"
-              defaultMessage="min"
-            />
-          </b>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <b>
-            <FormattedMessage
-              id="xpack.fileDataVisualizer.fieldStatsCard.medianTitle"
-              defaultMessage="median"
-            />
-          </b>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <b>
-            <FormattedMessage
-              id="xpack.fileDataVisualizer.fieldStatsCard.maxTitle"
-              defaultMessage="max"
-            />
-          </b>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiFlexGroup gutterSize="xs">
-        <EuiFlexItem>{stats.min}</EuiFlexItem>
-        <EuiFlexItem>{stats.median}</EuiFlexItem>
-        <EuiFlexItem>{stats.max}</EuiFlexItem>
-      </EuiFlexGroup>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx
deleted file mode 100644
index d1321ad8f9f4d..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.test.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { mount, shallow } from 'enzyme';
-
-import { FieldTypeIcon } from './field_type_icon';
-import { JOB_FIELD_TYPES } from '../../../../common';
-
-describe('FieldTypeIcon', () => {
-  test(`render component when type matches a field type`, () => {
-    const typeIconComponent = shallow(
-      <FieldTypeIcon type={JOB_FIELD_TYPES.KEYWORD} tooltipEnabled={true} needsAria={false} />
-    );
-    expect(typeIconComponent).toMatchSnapshot();
-  });
-
-  test(`render with tooltip and test hovering`, () => {
-    // Use fake timers so we don't have to wait for the EuiToolTip timeout
-    jest.useFakeTimers();
-
-    const typeIconComponent = mount(
-      <FieldTypeIcon type={JOB_FIELD_TYPES.KEYWORD} tooltipEnabled={true} needsAria={false} />
-    );
-    const container = typeIconComponent.find({ 'data-test-subj': 'fieldTypeIcon' });
-
-    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1);
-
-    container.simulate('mouseover');
-
-    // Run the timers so the EuiTooltip will be visible
-    jest.runAllTimers();
-
-    typeIconComponent.update();
-    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(2);
-
-    container.simulate('mouseout');
-
-    // Run the timers so the EuiTooltip will be hidden again
-    jest.runAllTimers();
-
-    typeIconComponent.update();
-    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1);
-
-    // Clearing all mocks will also reset fake timers.
-    jest.clearAllMocks();
-  });
-});
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx
deleted file mode 100644
index 2dd7ff635bacd..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/field_type_icon/field_type_icon.tsx
+++ /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 React, { FC } from 'react';
-
-import { EuiToken, EuiToolTip } from '@elastic/eui';
-
-import { i18n } from '@kbn/i18n';
-
-import { getJobTypeAriaLabel } from '../../util/field_types_utils';
-import { JOB_FIELD_TYPES } from '../../../../common';
-import type { JobFieldType } from '../../../../common';
-
-interface FieldTypeIconProps {
-  tooltipEnabled: boolean;
-  type: JobFieldType;
-  fieldName?: string;
-  needsAria: boolean;
-}
-
-interface FieldTypeIconContainerProps {
-  ariaLabel: string | null;
-  iconType: string;
-  color: string;
-  needsAria: boolean;
-  [key: string]: any;
-}
-
-export const FieldTypeIcon: FC<FieldTypeIconProps> = ({
-  tooltipEnabled = false,
-  type,
-  fieldName,
-  needsAria = true,
-}) => {
-  const ariaLabel = getJobTypeAriaLabel(type);
-
-  let iconType = 'questionInCircle';
-  let color = 'euiColorVis6';
-
-  switch (type) {
-    // Set icon types and colors
-    case JOB_FIELD_TYPES.BOOLEAN:
-      iconType = 'tokenBoolean';
-      color = 'euiColorVis5';
-      break;
-    case JOB_FIELD_TYPES.DATE:
-      iconType = 'tokenDate';
-      color = 'euiColorVis7';
-      break;
-    case JOB_FIELD_TYPES.GEO_POINT:
-    case JOB_FIELD_TYPES.GEO_SHAPE:
-      iconType = 'tokenGeo';
-      color = 'euiColorVis8';
-      break;
-    case JOB_FIELD_TYPES.TEXT:
-      iconType = 'document';
-      color = 'euiColorVis9';
-      break;
-    case JOB_FIELD_TYPES.IP:
-      iconType = 'tokenIP';
-      color = 'euiColorVis3';
-      break;
-    case JOB_FIELD_TYPES.KEYWORD:
-      iconType = 'tokenText';
-      color = 'euiColorVis0';
-      break;
-    case JOB_FIELD_TYPES.NUMBER:
-      iconType = 'tokenNumber';
-      color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2';
-      break;
-    case JOB_FIELD_TYPES.UNKNOWN:
-      // Use defaults
-      break;
-  }
-
-  const containerProps = {
-    ariaLabel,
-    iconType,
-    color,
-    needsAria,
-  };
-
-  if (tooltipEnabled === true) {
-    // wrap the inner component inside <span> because EuiToolTip doesn't seem
-    // to support having another component directly inside the tooltip anchor
-    // see https://github.com/elastic/eui/issues/839
-    return (
-      <EuiToolTip
-        position="left"
-        content={i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.fieldTypeTooltip', {
-          defaultMessage: '{type} type',
-          values: { type },
-        })}
-      >
-        <FieldTypeIconContainer {...containerProps} />
-      </EuiToolTip>
-    );
-  }
-
-  return <FieldTypeIconContainer {...containerProps} />;
-};
-
-// If the tooltip is used, it will apply its events to its first inner child.
-// To pass on its properties we apply `rest` to the outer `span` element.
-const FieldTypeIconContainer: FC<FieldTypeIconContainerProps> = ({
-  ariaLabel,
-  iconType,
-  color,
-  needsAria,
-  ...rest
-}) => {
-  const wrapperProps: { className: string; 'aria-label'?: string } = {
-    className: 'field-type-icon',
-  };
-  if (needsAria && ariaLabel) {
-    wrapperProps['aria-label'] = ariaLabel;
-  }
-
-  return (
-    <span data-test-subj="fieldTypeIcon" {...rest}>
-      <span {...wrapperProps}>
-        <EuiToken iconType={iconType} shape="square" size="s" color={color} />
-      </span>
-    </span>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_index.scss
deleted file mode 100644
index c1191ad270e4c..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'file_datavisualizer_view';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_datavisualizer_view.js b/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_datavisualizer_view.js
deleted file mode 100644
index 2b774a906dba9..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/file_datavisualizer_view.js
+++ /dev/null
@@ -1,380 +0,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 { FormattedMessage } from '@kbn/i18n/react';
-import React, { Component } from 'react';
-
-import { EuiSpacer } from '@elastic/eui';
-
-import { isEqual } from 'lodash';
-
-import { AboutPanel, LoadingPanel } from '../about_panel';
-import { BottomBar } from '../bottom_bar';
-import { ResultsView } from '../results_view';
-import { FileCouldNotBeRead, FileTooLarge } from './file_error_callouts';
-import { EditFlyout } from '../edit_flyout';
-import { ExplanationFlyout } from '../explanation_flyout';
-import { ImportView } from '../import_view';
-import { DEFAULT_LINES_TO_SAMPLE, readFile, createUrlOverrides, processResults } from '../utils';
-
-import { MODE } from './constants';
-
-export class FileDataVisualizerView extends Component {
-  constructor(props) {
-    super(props);
-
-    this.state = {
-      files: {},
-      fileName: '',
-      fileContents: '',
-      data: [],
-      fileSize: 0,
-      fileTooLarge: false,
-      fileCouldNotBeRead: false,
-      serverError: null,
-      loading: false,
-      loaded: false,
-      results: undefined,
-      explanation: undefined,
-      mode: MODE.READ,
-      isEditFlyoutVisible: false,
-      isExplanationFlyoutVisible: false,
-      bottomBarVisible: false,
-      hasPermissionToImport: false,
-    };
-
-    this.overrides = {};
-    this.previousOverrides = {};
-    this.originalSettings = {
-      linesToSample: DEFAULT_LINES_TO_SAMPLE,
-    };
-
-    this.savedObjectsClient = props.savedObjectsClient;
-    this.maxFileUploadBytes = props.fileUpload.getMaxBytes();
-  }
-
-  async componentDidMount() {
-    // check the user has the correct permission to import data.
-    // note, calling hasImportPermission with no arguments just checks the
-    // cluster privileges, the user will still need index privileges to create and ingest
-    const hasPermissionToImport = await this.props.fileUpload.hasImportPermission({
-      checkCreateIndexPattern: false,
-      checkHasManagePipeline: true,
-    });
-    this.setState({ hasPermissionToImport });
-  }
-
-  onFilePickerChange = (files) => {
-    this.overrides = {};
-
-    this.setState(
-      {
-        loading: files.length > 0,
-        bottomBarVisible: files.length > 0,
-        loaded: false,
-        fileName: '',
-        fileContents: '',
-        data: [],
-        fileSize: 0,
-        fileTooLarge: false,
-        fileCouldNotBeRead: false,
-        serverError: null,
-        results: undefined,
-        explanation: undefined,
-      },
-      () => {
-        if (files.length) {
-          this.loadFile(files[0]);
-        }
-      }
-    );
-  };
-
-  async loadFile(file) {
-    if (file.size <= this.maxFileUploadBytes) {
-      try {
-        const { data, fileContents } = await readFile(file);
-        this.setState({
-          data,
-          fileContents,
-          fileName: file.name,
-          fileSize: file.size,
-        });
-
-        await this.analyzeFile(fileContents);
-      } catch (error) {
-        this.setState({
-          loaded: false,
-          loading: false,
-          fileCouldNotBeRead: true,
-        });
-      }
-    } else {
-      this.setState({
-        loaded: false,
-        loading: false,
-        fileTooLarge: true,
-        fileName: file.name,
-        fileSize: file.size,
-      });
-    }
-  }
-
-  async analyzeFile(fileContents, overrides, isRetry = false) {
-    try {
-      const resp = await this.props.fileUpload.analyzeFile(fileContents, overrides);
-      const serverSettings = processResults(resp);
-      const serverOverrides = resp.overrides;
-
-      this.previousOverrides = overrides;
-      this.overrides = {};
-
-      if (serverSettings.format === 'xml') {
-        throw {
-          message: (
-            <FormattedMessage
-              id="xpack.fileDataVisualizer.fileDatavisualizerView.xmlNotCurrentlySupportedErrorMessage"
-              defaultMessage="XML not currently supported"
-            />
-          ),
-        };
-      }
-
-      if (serverOverrides === undefined) {
-        // if no overrides were used, store all the settings returned from the endpoint
-        this.originalSettings = serverSettings;
-      } else {
-        Object.keys(serverOverrides).forEach((o) => {
-          const camelCaseO = o.replace(/_\w/g, (m) => m[1].toUpperCase());
-          this.overrides[camelCaseO] = serverOverrides[o];
-        });
-
-        // check to see if the settings from the server which haven't been overridden have changed.
-        // e.g. changing the name of the time field which is also the time field
-        // will cause the timestamp_field setting to change.
-        // if any have changed, update the originalSettings value
-        Object.keys(serverSettings).forEach((o) => {
-          const value = serverSettings[o];
-          if (
-            this.overrides[o] === undefined &&
-            ((Array.isArray(value) && isEqual(value, this.originalSettings[o]) === false) ||
-              value !== this.originalSettings[o])
-          ) {
-            this.originalSettings[o] = value;
-          }
-        });
-      }
-
-      this.setState({
-        results: resp.results,
-        explanation: resp.explanation,
-        loaded: true,
-        loading: false,
-        fileCouldNotBeRead: isRetry,
-      });
-    } catch (error) {
-      this.setState({
-        results: undefined,
-        explanation: undefined,
-        loaded: false,
-        loading: false,
-        fileCouldNotBeRead: true,
-        serverError: error,
-      });
-
-      // reload the results with the previous overrides
-      if (isRetry === false) {
-        this.setState({
-          loading: true,
-          loaded: false,
-        });
-        this.analyzeFile(fileContents, this.previousOverrides, true);
-      }
-    }
-  }
-
-  closeEditFlyout = () => {
-    this.setState({ isEditFlyoutVisible: false });
-    this.showBottomBar();
-  };
-
-  showEditFlyout = () => {
-    this.setState({ isEditFlyoutVisible: true });
-    this.hideBottomBar();
-  };
-
-  closeExplanationFlyout = () => {
-    this.setState({ isExplanationFlyoutVisible: false });
-    this.showBottomBar();
-  };
-
-  showExplanationFlyout = () => {
-    this.setState({ isExplanationFlyoutVisible: true });
-    this.hideBottomBar();
-  };
-
-  showBottomBar = () => {
-    this.setState({ bottomBarVisible: true });
-  };
-
-  hideBottomBar = () => {
-    this.setState({ bottomBarVisible: false });
-  };
-
-  setOverrides = (overrides) => {
-    this.setState(
-      {
-        loading: true,
-        loaded: false,
-      },
-      () => {
-        const formattedOverrides = createUrlOverrides(overrides, this.originalSettings);
-        this.analyzeFile(this.state.fileContents, formattedOverrides);
-      }
-    );
-  };
-
-  changeMode = (mode) => {
-    this.setState({ mode });
-  };
-
-  onCancel = () => {
-    this.overrides = {};
-    this.previousOverrides = {};
-    this.originalSettings = {
-      linesToSample: DEFAULT_LINES_TO_SAMPLE,
-    };
-    this.changeMode(MODE.READ);
-    this.onFilePickerChange([]);
-  };
-
-  render() {
-    const {
-      loading,
-      loaded,
-      results,
-      explanation,
-      fileContents,
-      data,
-      fileName,
-      fileSize,
-      fileTooLarge,
-      fileCouldNotBeRead,
-      serverError,
-      mode,
-      isEditFlyoutVisible,
-      isExplanationFlyoutVisible,
-      bottomBarVisible,
-      hasPermissionToImport,
-    } = this.state;
-
-    const fields =
-      results !== undefined && results.field_stats !== undefined
-        ? Object.keys(results.field_stats)
-        : [];
-
-    return (
-      <div>
-        {mode === MODE.READ && (
-          <>
-            {!loading && !loaded && <AboutPanel onFilePickerChange={this.onFilePickerChange} />}
-
-            {loading && <LoadingPanel />}
-
-            {fileTooLarge && (
-              <FileTooLarge fileSize={fileSize} maxFileSize={this.maxFileUploadBytes} />
-            )}
-
-            {fileCouldNotBeRead && loading === false && (
-              <>
-                <FileCouldNotBeRead
-                  error={serverError}
-                  loaded={loaded}
-                  showEditFlyout={this.showEditFlyout}
-                />
-                <EuiSpacer size="l" />
-              </>
-            )}
-
-            {loaded && (
-              <ResultsView
-                results={results}
-                explanation={explanation}
-                fileName={fileName}
-                data={fileContents}
-                showEditFlyout={this.showEditFlyout}
-                showExplanationFlyout={this.showExplanationFlyout}
-                disableButtons={isEditFlyoutVisible || isExplanationFlyoutVisible}
-              />
-            )}
-            <EditFlyout
-              setOverrides={this.setOverrides}
-              closeEditFlyout={this.closeEditFlyout}
-              isFlyoutVisible={isEditFlyoutVisible}
-              originalSettings={this.originalSettings}
-              overrides={this.overrides}
-              fields={fields}
-            />
-
-            {isExplanationFlyoutVisible && (
-              <ExplanationFlyout results={results} closeFlyout={this.closeExplanationFlyout} />
-            )}
-
-            {bottomBarVisible && loaded && (
-              <>
-                <BottomBar
-                  mode={MODE.READ}
-                  onChangeMode={this.changeMode}
-                  onCancel={this.onCancel}
-                  disableImport={hasPermissionToImport === false}
-                />
-                <BottomPadding />
-              </>
-            )}
-          </>
-        )}
-        {mode === MODE.IMPORT && (
-          <>
-            <ImportView
-              results={results}
-              fileName={fileName}
-              fileContents={fileContents}
-              data={data}
-              indexPatterns={this.props.indexPatterns}
-              showBottomBar={this.showBottomBar}
-              hideBottomBar={this.hideBottomBar}
-              savedObjectsClient={this.savedObjectsClient}
-              fileUpload={this.props.fileUpload}
-            />
-
-            {bottomBarVisible && (
-              <>
-                <BottomBar
-                  mode={MODE.IMPORT}
-                  onChangeMode={this.changeMode}
-                  onCancel={this.onCancel}
-                />
-                <BottomPadding />
-              </>
-            )}
-          </>
-        )}
-      </div>
-    );
-  }
-}
-
-function BottomPadding() {
-  // padding for the BottomBar
-  return (
-    <>
-      <EuiSpacer size="m" />
-      <EuiSpacer size="l" />
-      <EuiSpacer size="l" />
-    </>
-  );
-}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js b/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js
deleted file mode 100644
index c3004f8a1ac3f..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/file_datavisualizer_view/index.js
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FileDataVisualizerView } from './file_datavisualizer_view';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss
deleted file mode 100644
index 663e2db018921..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/import_summary/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'import_sumary'
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss b/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss
deleted file mode 100644
index af3737cf017de..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/results_view/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'results_view'
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx
deleted file mode 100644
index 93582a7cef9ed..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/metric_fields_count.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { FC } from 'react';
-
-export interface MetricFieldsStats {
-  visibleMetricsCount: number;
-  totalMetricFieldsCount: number;
-}
-export interface MetricFieldsCountProps {
-  metricsStats?: MetricFieldsStats;
-}
-
-export const MetricFieldsCount: FC<MetricFieldsCountProps> = ({ metricsStats }) => {
-  if (
-    !metricsStats ||
-    metricsStats.visibleMetricsCount === undefined ||
-    metricsStats.totalMetricFieldsCount === undefined
-  )
-    return null;
-  return (
-    <>
-      {metricsStats && (
-        <EuiFlexGroup
-          gutterSize="s"
-          alignItems="center"
-          className="dataVisualizerFieldCountContainer"
-          data-test-subj="mlDataVisualizerMetricFieldsSummary"
-        >
-          <EuiFlexItem grow={false}>
-            <EuiText>
-              <h5>
-                <FormattedMessage
-                  id="xpack.fileDataVisualizer.searchPanel.numberFieldsLabel"
-                  defaultMessage="Number fields"
-                />
-              </h5>
-            </EuiText>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiNotificationBadge
-              color="subdued"
-              size="m"
-              data-test-subj="mlDataVisualizerVisibleMetricFieldsCount"
-            >
-              <strong>{metricsStats.visibleMetricsCount}</strong>
-            </EuiNotificationBadge>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiText color="subdued" size="s" data-test-subj="mlDataVisualizerMetricFieldsCount">
-              <FormattedMessage
-                id="xpack.fileDataVisualizer.searchPanel.ofFieldsTotal"
-                defaultMessage="of {totalCount} total"
-                values={{ totalCount: metricsStats.totalMetricFieldsCount }}
-              />
-            </EuiText>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx
deleted file mode 100644
index 9d554c7025d80..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_count_stats/total_fields_count.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { FC } from 'react';
-
-export interface TotalFieldsStats {
-  visibleFieldsCount: number;
-  totalFieldsCount: number;
-}
-
-export interface TotalFieldsCountProps {
-  fieldsCountStats?: TotalFieldsStats;
-}
-
-export const TotalFieldsCount: FC<TotalFieldsCountProps> = ({ fieldsCountStats }) => {
-  if (
-    !fieldsCountStats ||
-    fieldsCountStats.visibleFieldsCount === undefined ||
-    fieldsCountStats.totalFieldsCount === undefined
-  )
-    return null;
-
-  return (
-    <EuiFlexGroup
-      gutterSize="s"
-      alignItems="center"
-      className="dataVisualizerFieldCountContainer"
-      data-test-subj="mlDataVisualizerFieldsSummary"
-    >
-      <EuiFlexItem grow={false}>
-        <EuiText>
-          <h5>
-            <FormattedMessage
-              id="xpack.fileDataVisualizer.searchPanel.allFieldsLabel"
-              defaultMessage="All fields"
-            />
-          </h5>
-        </EuiText>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiNotificationBadge
-          color="subdued"
-          size="m"
-          data-test-subj="mlDataVisualizerVisibleFieldsCount"
-        >
-          <strong>{fieldsCountStats.visibleFieldsCount}</strong>
-        </EuiNotificationBadge>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiText color="subdued" size="s" data-test-subj="mlDataVisualizerTotalFieldsCount">
-          <FormattedMessage
-            id="xpack.fileDataVisualizer.searchPanel.ofFieldsTotal"
-            defaultMessage="of {totalCount} total"
-            values={{ totalCount: fieldsCountStats.totalFieldsCount }}
-          />
-        </EuiText>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx
deleted file mode 100644
index 7c9ddcdab29c8..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/boolean_content.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, ReactNode, useMemo } from 'react';
-import { EuiBasicTable, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { Axis, BarSeries, Chart, Settings } from '@elastic/charts';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { getTFPercentage } from '../../utils';
-import { roundToDecimalPlace } from '../../../utils';
-import { useDataVizChartTheme } from '../../hooks';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-function getPercentLabel(value: number): string {
-  if (value === 0) {
-    return '0%';
-  }
-  if (value >= 0.1) {
-    return `${roundToDecimalPlace(value)}%`;
-  } else {
-    return '< 0.1%';
-  }
-}
-
-function getFormattedValue(value: number, totalCount: number): string {
-  const percentage = (value / totalCount) * 100;
-  return `${value} (${getPercentLabel(percentage)})`;
-}
-
-const BOOLEAN_DISTRIBUTION_CHART_HEIGHT = 100;
-
-export const BooleanContent: FC<FieldDataRowProps> = ({ config }) => {
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-  const formattedPercentages = useMemo(() => getTFPercentage(config), [config]);
-  const theme = useDataVizChartTheme();
-  if (!formattedPercentages) return null;
-
-  const { trueCount, falseCount, count } = formattedPercentages;
-  const summaryTableItems = [
-    {
-      function: 'true',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.trueCountLabel"
-          defaultMessage="true"
-        />
-      ),
-      value: getFormattedValue(trueCount, count),
-    },
-    {
-      function: 'false',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.falseCountLabel"
-          defaultMessage="false"
-        />
-      ),
-      value: getFormattedValue(falseCount, count),
-    },
-  ];
-  const summaryTableColumns = [
-    {
-      name: '',
-      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
-      width: '75px',
-    },
-    {
-      field: 'value',
-      name: '',
-      render: (v: string) => <strong>{v}</strong>,
-    },
-  ];
-
-  const summaryTableTitle = i18n.translate(
-    'xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.summaryTableTitle',
-    {
-      defaultMessage: 'Summary',
-    }
-  );
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVBooleanContent'}>
-      <DocumentStatsTable config={config} />
-
-      <EuiFlexItem className={'dataVisualizerSummaryTableWrapper'}>
-        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
-        <EuiBasicTable
-          className={'dataVisualizerSummaryTable'}
-          compressed
-          items={summaryTableItems}
-          columns={summaryTableColumns}
-          tableCaption={summaryTableTitle}
-        />
-      </EuiFlexItem>
-
-      <EuiFlexItem>
-        <ExpandedRowFieldHeader>
-          <FormattedMessage
-            id="xpack.fileDataVisualizer.fieldDataCard.cardBoolean.valuesLabel"
-            defaultMessage="Values"
-          />
-        </ExpandedRowFieldHeader>
-        <EuiSpacer size="xs" />
-        <Chart renderer="canvas" size={{ height: BOOLEAN_DISTRIBUTION_CHART_HEIGHT }}>
-          <Axis id="bottom" position="bottom" showOverlappingTicks />
-          <Axis
-            id="left2"
-            title="Left axis"
-            hide={true}
-            tickFormat={(d: any) => getFormattedValue(d, count)}
-          />
-
-          <Settings showLegend={false} theme={theme} />
-          <BarSeries
-            id={config.fieldName || fieldFormat}
-            data={[
-              {
-                x: 'true',
-                count: formattedPercentages.trueCount,
-              },
-              {
-                x: 'false',
-                count: formattedPercentages.falseCount,
-              },
-            ]}
-            splitSeriesAccessors={['x']}
-            stackAccessors={['x']}
-            xAccessor="x"
-            xScaleType="ordinal"
-            yAccessors={['count']}
-            yScaleType="linear"
-          />
-        </Chart>
-      </EuiFlexItem>
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
deleted file mode 100644
index acbb77a7e0cac..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/choropleth_map.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useMemo } from 'react';
-import { EuiFlexItem, EuiSpacer, EuiText, htmlIdGenerator } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  FIELD_ORIGIN,
-  SOURCE_TYPES,
-  STYLE_TYPE,
-  COLOR_MAP_TYPE,
-} from '../../../../../../../maps/common/constants';
-import { EMSTermJoinConfig } from '../../../../../../../maps/public';
-import { FieldVisStats } from '../../types';
-import { VectorLayerDescriptor } from '../../../../../../../maps/common/descriptor_types';
-import { EmbeddedMapComponent } from '../../../embedded_map';
-
-export const getChoroplethTopValuesLayer = (
-  fieldName: string,
-  topValues: Array<{ key: any; doc_count: number }>,
-  { layerId, field }: EMSTermJoinConfig
-): VectorLayerDescriptor => {
-  return {
-    id: htmlIdGenerator()(),
-    label: i18n.translate('xpack.fileDataVisualizer.choroplethMap.topValuesCount', {
-      defaultMessage: 'Top values count for {fieldName}',
-      values: { fieldName },
-    }),
-    joins: [
-      {
-        // Left join is the id from the type of field (e.g. world_countries)
-        leftField: field,
-        right: {
-          id: 'anomaly_count',
-          type: SOURCE_TYPES.TABLE_SOURCE,
-          __rows: topValues,
-          __columns: [
-            {
-              name: 'key',
-              type: 'string',
-            },
-            {
-              name: 'doc_count',
-              type: 'number',
-            },
-          ],
-          // Right join/term is the field in the doc you’re trying to join it to (foreign key - e.g. US)
-          term: 'key',
-        },
-      },
-    ],
-    sourceDescriptor: {
-      type: 'EMS_FILE',
-      id: layerId,
-    },
-    style: {
-      type: 'VECTOR',
-      // @ts-ignore missing style properties. Remove once 'VectorLayerDescriptor' type is updated
-      properties: {
-        icon: { type: STYLE_TYPE.STATIC, options: { value: 'marker' } },
-        fillColor: {
-          type: STYLE_TYPE.DYNAMIC,
-          options: {
-            color: 'Blue to Red',
-            colorCategory: 'palette_0',
-            fieldMetaOptions: { isEnabled: true, sigma: 3 },
-            type: COLOR_MAP_TYPE.ORDINAL,
-            field: {
-              name: 'doc_count',
-              origin: FIELD_ORIGIN.JOIN,
-            },
-            useCustomColorRamp: false,
-          },
-        },
-        lineColor: {
-          type: STYLE_TYPE.DYNAMIC,
-          options: { fieldMetaOptions: { isEnabled: true } },
-        },
-        lineWidth: { type: STYLE_TYPE.STATIC, options: { size: 1 } },
-      },
-      isTimeAware: true,
-    },
-    type: 'VECTOR',
-  };
-};
-
-interface Props {
-  stats: FieldVisStats | undefined;
-  suggestion: EMSTermJoinConfig;
-}
-
-export const ChoroplethMap: FC<Props> = ({ stats, suggestion }) => {
-  const { fieldName, isTopValuesSampled, topValues, topValuesSamplerShardSize } = stats!;
-
-  const layerList: VectorLayerDescriptor[] = useMemo(
-    () => [getChoroplethTopValuesLayer(fieldName || '', topValues || [], suggestion)],
-    [suggestion, fieldName, topValues]
-  );
-
-  return (
-    <EuiFlexItem data-test-subj={'fileDataVisualizerChoroplethMapTopValues'}>
-      <div style={{ width: '100%', minHeight: 300 }}>
-        <EmbeddedMapComponent layerList={layerList} />
-      </div>
-      {isTopValuesSampled === true && (
-        <>
-          <EuiSpacer size="xs" />
-          <EuiText size="xs" textAlign={'left'}>
-            <FormattedMessage
-              id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.choroplethMapTopValues.calculatedFromSampleDescription"
-              defaultMessage="Calculated from sample of {topValuesSamplerShardSize} documents per shard"
-              values={{
-                topValuesSamplerShardSize,
-              }}
-            />
-          </EuiText>
-        </>
-      )}
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx
deleted file mode 100644
index cf34417ad9bbd..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/date_content.tsx
+++ /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 React, { FC, ReactNode } from 'react';
-import { EuiBasicTable, EuiFlexItem } from '@elastic/eui';
-// @ts-ignore
-import { formatDate } from '@elastic/eui/lib/services/format';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import { i18n } from '@kbn/i18n';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-const TIME_FORMAT = 'MMM D YYYY, HH:mm:ss.SSS';
-interface SummaryTableItem {
-  function: string;
-  display: ReactNode;
-  value: number | string | undefined | null;
-}
-
-export const DateContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-
-  const { earliest, latest } = stats;
-
-  const summaryTableTitle = i18n.translate(
-    'xpack.fileDataVisualizer.fieldDataCard.cardDate.summaryTableTitle',
-    {
-      defaultMessage: 'Summary',
-    }
-  );
-  const summaryTableItems = [
-    {
-      function: 'earliest',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCard.cardDate.earliestLabel"
-          defaultMessage="earliest"
-        />
-      ),
-      value: typeof earliest === 'string' ? earliest : formatDate(earliest, TIME_FORMAT),
-    },
-    {
-      function: 'latest',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCard.cardDate.latestLabel"
-          defaultMessage="latest"
-        />
-      ),
-      value: typeof latest === 'string' ? latest : formatDate(latest, TIME_FORMAT),
-    },
-  ];
-  const summaryTableColumns = [
-    {
-      name: '',
-      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
-      width: '75px',
-    },
-    {
-      field: 'value',
-      name: '',
-      render: (v: string) => <strong>{v}</strong>,
-    },
-  ];
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVDateContent'}>
-      <DocumentStatsTable config={config} />
-      <EuiFlexItem className={'dataVisualizerSummaryTableWrapper'}>
-        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
-        <EuiBasicTable<SummaryTableItem>
-          className={'dataVisualizerSummaryTable'}
-          data-test-subj={'mlDateSummaryTable'}
-          compressed
-          items={summaryTableItems}
-          columns={summaryTableColumns}
-          tableCaption={summaryTableTitle}
-          tableLayout="auto"
-        />
-      </EuiFlexItem>
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx
deleted file mode 100644
index f3ac0d94aa255..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/document_stats.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { FC, ReactNode } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiBasicTable, EuiFlexItem } from '@elastic/eui';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { FieldDataRowProps } from '../../types';
-import { roundToDecimalPlace } from '../../../utils';
-
-const metaTableColumns = [
-  {
-    name: '',
-    render: (metaItem: { display: ReactNode }) => metaItem.display,
-    width: '75px',
-  },
-  {
-    field: 'value',
-    name: '',
-    render: (v: string) => <strong>{v}</strong>,
-  },
-];
-
-const metaTableTitle = i18n.translate(
-  'xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle',
-  {
-    defaultMessage: 'Documents stats',
-  }
-);
-
-export const DocumentStatsTable: FC<FieldDataRowProps> = ({ config }) => {
-  if (
-    config?.stats === undefined ||
-    config.stats.cardinality === undefined ||
-    config.stats.count === undefined ||
-    config.stats.sampleCount === undefined
-  )
-    return null;
-  const { cardinality, count, sampleCount } = config.stats;
-  const metaTableItems = [
-    {
-      function: 'count',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.countLabel"
-          defaultMessage="count"
-        />
-      ),
-      value: count,
-    },
-    {
-      function: 'percentage',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.percentageLabel"
-          defaultMessage="percentage"
-        />
-      ),
-      value: `${roundToDecimalPlace((count / sampleCount) * 100)}%`,
-    },
-    {
-      function: 'distinctValues',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.distinctValueLabel"
-          defaultMessage="distinct values"
-        />
-      ),
-      value: cardinality,
-    },
-  ];
-
-  return (
-    <EuiFlexItem
-      data-test-subj={'mlDVDocumentStatsContent'}
-      className={'dataVisualizerSummaryTableWrapper'}
-    >
-      <ExpandedRowFieldHeader>{metaTableTitle}</ExpandedRowFieldHeader>
-      <EuiBasicTable
-        className={'dataVisualizerSummaryTable'}
-        compressed
-        items={metaTableItems}
-        columns={metaTableColumns}
-        tableCaption={metaTableTitle}
-      />
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx
deleted file mode 100644
index 07adf3103b78e..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/ip_content.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { TopValues } from '../../../top_values';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-export const IpContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-  const { count, sampleCount, cardinality } = stats;
-  if (count === undefined || sampleCount === undefined || cardinality === undefined) return null;
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVIPContent'}>
-      <DocumentStatsTable config={config} />
-      <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" />
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
deleted file mode 100644
index 6448883bfce73..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/keyword_content.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useCallback, useEffect, useState } from 'react';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { TopValues } from '../../../top_values';
-import { EMSTermJoinConfig } from '../../../../../../../maps/public';
-import { useFileDataVisualizerKibana } from '../../../../kibana_context';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-import { ChoroplethMap } from './choropleth_map';
-
-const COMMON_EMS_LAYER_IDS = [
-  'world_countries',
-  'administrative_regions_lvl2',
-  'usa_zip_codes',
-  'usa_states',
-];
-
-export const KeywordContent: FC<FieldDataRowProps> = ({ config }) => {
-  const [EMSSuggestion, setEMSSuggestion] = useState<EMSTermJoinConfig | null | undefined>();
-  const { stats, fieldName } = config;
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-  const {
-    services: { maps: mapsPlugin },
-  } = useFileDataVisualizerKibana();
-
-  const loadEMSTermSuggestions = useCallback(async () => {
-    if (!mapsPlugin) return;
-    const suggestion: EMSTermJoinConfig | null = await mapsPlugin.suggestEMSTermJoinConfig({
-      emsLayerIds: COMMON_EMS_LAYER_IDS,
-      sampleValues: Array.isArray(stats?.topValues)
-        ? stats?.topValues.map((value) => value.key)
-        : [],
-      sampleValuesColumnName: fieldName || '',
-    });
-    setEMSSuggestion(suggestion);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [fieldName]);
-
-  useEffect(
-    function getInitialEMSTermSuggestion() {
-      loadEMSTermSuggestions();
-    },
-    [loadEMSTermSuggestions]
-  );
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVKeywordContent'}>
-      <DocumentStatsTable config={config} />
-      <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" />
-      {EMSSuggestion && stats && <ChoroplethMap stats={stats} suggestion={EMSSuggestion} />}
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx
deleted file mode 100644
index e83eecb64d02e..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/number_content.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, ReactNode, useEffect, useState } from 'react';
-import { EuiBasicTable, EuiFlexItem, EuiText } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { kibanaFieldFormat, numberAsOrdinal } from '../../../utils';
-import {
-  MetricDistributionChart,
-  MetricDistributionChartData,
-  buildChartDataFromStats,
-} from '../metric_distribution_chart';
-import { TopValues } from '../../../top_values';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-const METRIC_DISTRIBUTION_CHART_WIDTH = 325;
-const METRIC_DISTRIBUTION_CHART_HEIGHT = 200;
-
-interface SummaryTableItem {
-  function: string;
-  display: ReactNode;
-  value: number | string | undefined | null;
-}
-
-export const NumberContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-
-  useEffect(() => {
-    const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH);
-    setDistributionChartData(chartData);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  const defaultChartData: MetricDistributionChartData[] = [];
-  const [distributionChartData, setDistributionChartData] = useState(defaultChartData);
-
-  if (stats === undefined) return null;
-  const { min, median, max, distribution } = stats;
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-
-  const summaryTableItems = [
-    {
-      function: 'min',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.minLabel"
-          defaultMessage="min"
-        />
-      ),
-      value: kibanaFieldFormat(min, fieldFormat),
-    },
-    {
-      function: 'median',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.medianLabel"
-          defaultMessage="median"
-        />
-      ),
-      value: kibanaFieldFormat(median, fieldFormat),
-    },
-    {
-      function: 'max',
-      display: (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.maxLabel"
-          defaultMessage="max"
-        />
-      ),
-      value: kibanaFieldFormat(max, fieldFormat),
-    },
-  ];
-  const summaryTableColumns = [
-    {
-      name: '',
-      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
-      width: '75px',
-    },
-    {
-      field: 'value',
-      name: '',
-      render: (v: string) => <strong>{v}</strong>,
-    },
-  ];
-
-  const summaryTableTitle = i18n.translate(
-    'xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.summaryTableTitle',
-    {
-      defaultMessage: 'Summary',
-    }
-  );
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVNumberContent'}>
-      <DocumentStatsTable config={config} />
-      <EuiFlexItem className={'dataVisualizerSummaryTableWrapper'}>
-        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
-        <EuiBasicTable<SummaryTableItem>
-          className={'dataVisualizerSummaryTable'}
-          compressed
-          items={summaryTableItems}
-          columns={summaryTableColumns}
-          tableCaption={summaryTableTitle}
-          data-test-subj={'mlNumberSummaryTable'}
-        />
-      </EuiFlexItem>
-
-      {stats && (
-        <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" compressed={true} />
-      )}
-      {distribution && (
-        <EuiFlexItem data-test-subj={'mlMetricDistribution'}>
-          <EuiFlexItem grow={false}>
-            <ExpandedRowFieldHeader>
-              <FormattedMessage
-                id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.distributionTitle"
-                defaultMessage="Distribution"
-              />
-            </ExpandedRowFieldHeader>
-          </EuiFlexItem>
-
-          <EuiFlexItem className={'metricDistributionChartContainer'}>
-            <MetricDistributionChart
-              width={METRIC_DISTRIBUTION_CHART_WIDTH}
-              height={METRIC_DISTRIBUTION_CHART_HEIGHT}
-              chartData={distributionChartData}
-              fieldFormat={fieldFormat}
-            />
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiText size="xs">
-              <FormattedMessage
-                id="xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.displayingPercentilesLabel"
-                defaultMessage="Displaying {minPercent} - {maxPercent} percentiles"
-                values={{
-                  minPercent: numberAsOrdinal(distribution.minPercentile),
-                  maxPercent: numberAsOrdinal(distribution.maxPercentile),
-                }}
-              />
-            </EuiText>
-          </EuiFlexItem>
-        </EuiFlexItem>
-      )}
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.tsx
deleted file mode 100644
index cb1605331551e..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/other_content.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, { FC } from 'react';
-import { EuiFlexItem } from '@elastic/eui';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExamplesList } from '../../../examples_list';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-export const OtherContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVOtherContent'}>
-      <DocumentStatsTable config={config} />
-      {Array.isArray(stats.examples) && (
-        <EuiFlexItem>
-          <ExamplesList examples={stats.examples} />
-        </EuiFlexItem>
-      )}
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx
deleted file mode 100644
index b399f952b4d9d..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_expanded_row/text_content.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, Fragment } from 'react';
-import { EuiCallOut, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExamplesList } from '../../../examples_list';
-import { ExpandedRowContent } from './expanded_row_content';
-
-export const TextContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-
-  const { examples } = stats;
-  if (examples === undefined) return null;
-
-  const numExamples = examples.length;
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVTextContent'}>
-      <EuiFlexItem>
-        {numExamples > 0 && <ExamplesList examples={examples} />}
-        {numExamples === 0 && (
-          <Fragment>
-            <EuiSpacer size="xl" />
-            <EuiCallOut
-              title={i18n.translate(
-                'xpack.fileDataVisualizer.fieldDataCard.cardText.noExamplesForFieldsTitle',
-                {
-                  defaultMessage: 'No examples were obtained for this field',
-                }
-              )}
-              iconType="alert"
-            >
-              <FormattedMessage
-                id="xpack.fileDataVisualizer.fieldDataCard.cardText.fieldNotPresentDescription"
-                defaultMessage="This field was not present in the {sourceParam} field of documents queried."
-                values={{
-                  sourceParam: <span className="fieldDataCard__codeContent">_source</span>,
-                }}
-              />
-
-              <EuiSpacer size="s" />
-
-              <FormattedMessage
-                id="xpack.fileDataVisualizer.fieldDataCard.cardText.fieldMayBePopulatedDescription"
-                defaultMessage="It may be populated, for example, using a {copyToParam} parameter in the document mapping, or be pruned from the {sourceParam} field after indexing through the use of {includesParam} and {excludesParam} parameters."
-                values={{
-                  copyToParam: <span className="fieldDataCard__codeContent">copy_to</span>,
-                  sourceParam: <span className="fieldDataCard__codeContent">_source</span>,
-                  includesParam: <span className="fieldDataCard__codeContent">includes</span>,
-                  excludesParam: <span className="fieldDataCard__codeContent">excludes</span>,
-                }}
-              />
-            </EuiCallOut>
-          </Fragment>
-        )}
-      </EuiFlexItem>
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx
deleted file mode 100644
index c6c28da0baf04..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/boolean_content_preview.tsx
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useMemo } from 'react';
-// import { EuiDataGridColumn } from '@elastic/eui';
-import { OrdinalChartData } from './field_histograms';
-// import { ColumnChart } from '../../../../../../components/data_grid/column_chart'; // TODO copy component
-import { FieldDataRowProps } from '../../types';
-import { getTFPercentage } from '../../utils';
-
-export const BooleanContentPreview: FC<FieldDataRowProps> = ({ config }) => {
-  const chartData = useMemo(() => {
-    const results = getTFPercentage(config);
-    if (results) {
-      const data = [
-        { key: 'true', key_as_string: 'true', doc_count: results.trueCount },
-        { key: 'false', key_as_string: 'false', doc_count: results.falseCount },
-      ];
-      return { id: config.fieldName, cardinality: 2, data, type: 'boolean' } as OrdinalChartData;
-    }
-  }, [config]);
-  if (!chartData || config.fieldName === undefined) return null;
-
-  // const columnType: EuiDataGridColumn = {
-  //   id: config.fieldName,
-  //   schema: undefined,
-  // };
-  // const dataTestSubj = `mlDataGridChart-${config.fieldName}`;
-
-  return (
-    <></>
-    // <ColumnChart
-    //   dataTestSubj={dataTestSubj}
-    //   chartData={chartData}
-    //   columnType={columnType}
-    //   hideLabel={true}
-    // />
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx
deleted file mode 100644
index 00150bdfe8b7a..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/number_content_preview.tsx
+++ /dev/null
@@ -1,78 +0,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, { FC, useEffect, useState } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import classNames from 'classnames';
-import {
-  MetricDistributionChart,
-  MetricDistributionChartData,
-  buildChartDataFromStats,
-} from '../metric_distribution_chart';
-import { FieldVisConfig } from '../../types';
-import { kibanaFieldFormat, formatSingleValue } from '../../../utils';
-
-const METRIC_DISTRIBUTION_CHART_WIDTH = 150;
-const METRIC_DISTRIBUTION_CHART_HEIGHT = 80;
-
-export interface NumberContentPreviewProps {
-  config: FieldVisConfig;
-}
-
-export const IndexBasedNumberContentPreview: FC<NumberContentPreviewProps> = ({ config }) => {
-  const { stats, fieldFormat, fieldName } = config;
-  const defaultChartData: MetricDistributionChartData[] = [];
-  const [distributionChartData, setDistributionChartData] = useState(defaultChartData);
-  const [legendText, setLegendText] = useState<{ min: number; max: number } | undefined>();
-  const dataTestSubj = `mlDataGridChart-${fieldName}`;
-  useEffect(() => {
-    const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH);
-    if (
-      Array.isArray(chartData) &&
-      chartData[0].x !== undefined &&
-      chartData[chartData.length - 1].x !== undefined
-    ) {
-      setDistributionChartData(chartData);
-      setLegendText({
-        min: formatSingleValue(chartData[0].x),
-        max: formatSingleValue(chartData[chartData.length - 1].x),
-      });
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, []);
-
-  return (
-    <div data-test-subj={dataTestSubj}>
-      <div className="dataGridChart__histogram" data-test-subj={`${dataTestSubj}-histogram`}>
-        <MetricDistributionChart
-          width={METRIC_DISTRIBUTION_CHART_WIDTH}
-          height={METRIC_DISTRIBUTION_CHART_HEIGHT}
-          chartData={distributionChartData}
-          fieldFormat={fieldFormat}
-          hideXAxis={true}
-        />
-      </div>
-      <div className={'dataGridChart__legend'} data-test-subj={`${dataTestSubj}-legend`}>
-        {legendText && (
-          <>
-            <EuiSpacer size="s" />
-            <EuiFlexGroup direction={'row'} data-test-subj={`${dataTestSubj}-legend`}>
-              <EuiFlexItem className={'dataGridChart__legend'}>
-                {kibanaFieldFormat(legendText.min, fieldFormat)}
-              </EuiFlexItem>
-              <EuiFlexItem
-                className={classNames('dataGridChart__legend', 'dataGridChart__legend--numeric')}
-              >
-                {kibanaFieldFormat(legendText.max, fieldFormat)}
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </>
-        )}
-      </div>
-    </div>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx
deleted file mode 100644
index 63b15fdf30b3b..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/field_data_row/top_values_preview.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-import { EuiDataGridColumn } from '@elastic/eui';
-import { ChartData, OrdinalDataItem } from './field_histograms';
-import { ColumnChart } from './column_chart';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-
-export const TopValuesPreview: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-  const { topValues, cardinality } = stats;
-  if (cardinality === undefined || topValues === undefined || config.fieldName === undefined)
-    return null;
-
-  const data: OrdinalDataItem[] = topValues.map((d) => ({
-    ...d,
-    key: d.key.toString(),
-  }));
-  const chartData: ChartData = {
-    cardinality,
-    data,
-    id: config.fieldName,
-    type: 'ordinal',
-  };
-  const columnType: EuiDataGridColumn = {
-    id: config.fieldName,
-    schema: undefined,
-  };
-  return (
-    <ColumnChart
-      chartData={chartData}
-      columnType={columnType}
-      dataTestSubj={`mlDataGridChart-${config.fieldName}`}
-      hideLabel={true}
-      maxChartColumns={10}
-    />
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx
deleted file mode 100644
index caa560488d499..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-
-import { i18n } from '@kbn/i18n';
-
-import {
-  AreaSeries,
-  Axis,
-  Chart,
-  CurveType,
-  Position,
-  ScaleType,
-  Settings,
-  TooltipValue,
-  TooltipValueFormatter,
-} from '@elastic/charts';
-
-import { MetricDistributionChartTooltipHeader } from './metric_distribution_chart_tooltip_header';
-import { kibanaFieldFormat } from '../../../utils';
-import { useDataVizChartTheme } from '../../hooks';
-
-interface ChartTooltipValue extends TooltipValue {
-  skipHeader?: boolean;
-}
-
-export interface MetricDistributionChartData {
-  x: number;
-  y: number;
-  dataMin: number;
-  dataMax: number;
-  percent: number;
-}
-
-interface Props {
-  width: number;
-  height: number;
-  chartData: MetricDistributionChartData[];
-  fieldFormat?: any; // Kibana formatter for field being viewed
-  hideXAxis?: boolean;
-}
-
-const SPEC_ID = 'metric_distribution';
-
-export const MetricDistributionChart: FC<Props> = ({
-  width,
-  height,
-  chartData,
-  fieldFormat,
-  hideXAxis,
-}) => {
-  // This value is shown to label the y axis values in the tooltip.
-  // Ideally we wouldn't show these values at all in the tooltip,
-  // but this is not yet possible with Elastic charts.
-  const seriesName = i18n.translate(
-    'xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.seriesName',
-    {
-      defaultMessage: 'distribution',
-    }
-  );
-
-  const theme = useDataVizChartTheme();
-
-  const headerFormatter: TooltipValueFormatter = (tooltipData: ChartTooltipValue) => {
-    const xValue = tooltipData.value;
-    const chartPoint: MetricDistributionChartData | undefined = chartData.find(
-      (data) => data.x === xValue
-    );
-
-    return (
-      <MetricDistributionChartTooltipHeader
-        chartPoint={chartPoint}
-        maxWidth={width / 2}
-        fieldFormat={fieldFormat}
-      />
-    );
-  };
-
-  return (
-    <div data-test-subj="mlFieldDataMetricDistributionChart">
-      <Chart size={{ width, height }}>
-        <Settings theme={theme} tooltip={{ headerFormatter }} />
-        <Axis
-          id="bottom"
-          position={Position.Bottom}
-          tickFormat={(d) => kibanaFieldFormat(d, fieldFormat)}
-          hide={hideXAxis === true}
-        />
-        <Axis id="left" position={Position.Left} tickFormat={(d) => d.toFixed(3)} hide={true} />
-        <AreaSeries
-          id={SPEC_ID}
-          name={seriesName}
-          xScaleType={ScaleType.Linear}
-          yScaleType={ScaleType.Linear}
-          xAccessor="x"
-          yAccessors={['y']}
-          data={chartData.length > 0 ? chartData : [{ x: 0, y: 0 }]}
-          curve={CurveType.CURVE_STEP_AFTER}
-        />
-      </Chart>
-    </div>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx
deleted file mode 100644
index 9fd613ac96b8e..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { MetricDistributionChartData } from './metric_distribution_chart';
-import { kibanaFieldFormat } from '../../../utils';
-
-interface Props {
-  chartPoint: MetricDistributionChartData | undefined;
-  maxWidth: number;
-  fieldFormat?: any; // Kibana formatter for field being viewed
-}
-
-export const MetricDistributionChartTooltipHeader: FC<Props> = ({
-  chartPoint,
-  maxWidth,
-  fieldFormat,
-}) => {
-  if (chartPoint === undefined) {
-    return null;
-  }
-
-  return (
-    <div style={{ maxWidth }}>
-      {chartPoint.dataMax > chartPoint.dataMin ? (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.tooltipValueBetweenLabel"
-          defaultMessage="{percent}% of documents have values between {minValFormatted} and {maxValFormatted}"
-          values={{
-            percent: chartPoint.percent,
-            minValFormatted: kibanaFieldFormat(chartPoint.dataMin, fieldFormat),
-            maxValFormatted: kibanaFieldFormat(chartPoint.dataMax, fieldFormat),
-          }}
-        />
-      ) : (
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.tooltipValueEqualLabel"
-          defaultMessage="{percent}% of documents have a value of {valFormatted}"
-          values={{
-            percent: chartPoint.percent,
-            valFormatted: kibanaFieldFormat(chartPoint.dataMin, fieldFormat),
-          }}
-        />
-      )}
-    </div>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx
deleted file mode 100644
index bfa40c487a2ac..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/data_visualizer_stats_table.tsx
+++ /dev/null
@@ -1,284 +0,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, { useMemo, useState } from 'react';
-
-import {
-  CENTER_ALIGNMENT,
-  EuiBasicTableColumn,
-  EuiButtonIcon,
-  EuiFlexItem,
-  EuiIcon,
-  EuiInMemoryTable,
-  EuiText,
-  HorizontalAlignment,
-  LEFT_ALIGNMENT,
-  RIGHT_ALIGNMENT,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { EuiTableComputedColumnType } from '@elastic/eui/src/components/basic_table/table_types';
-import { JOB_FIELD_TYPES, JobFieldType, DataVisualizerTableState } from '../../../../common';
-import { FieldTypeIcon } from '../field_type_icon';
-import { DocumentStat } from './components/field_data_row/document_stats';
-import { DistinctValues } from './components/field_data_row/distinct_values';
-import { IndexBasedNumberContentPreview } from './components/field_data_row/number_content_preview';
-
-import { useTableSettings } from './use_table_settings';
-import { TopValuesPreview } from './components/field_data_row/top_values_preview';
-import {
-  FieldVisConfig,
-  FileBasedFieldVisConfig,
-  isIndexBasedFieldVisConfig,
-} from './types/field_vis_config';
-import { FileBasedNumberContentPreview } from '../field_data_row';
-import { BooleanContentPreview } from './components/field_data_row';
-
-const FIELD_NAME = 'fieldName';
-
-export type ItemIdToExpandedRowMap = Record<string, JSX.Element>;
-
-type DataVisualizerTableItem = FieldVisConfig | FileBasedFieldVisConfig;
-interface DataVisualizerTableProps<T> {
-  items: T[];
-  pageState: DataVisualizerTableState;
-  updatePageState: (update: DataVisualizerTableState) => void;
-  getItemIdToExpandedRowMap: (itemIds: string[], items: T[]) => ItemIdToExpandedRowMap;
-  extendedColumns?: Array<EuiBasicTableColumn<T>>;
-}
-
-export const DataVisualizerTable = <T extends DataVisualizerTableItem>({
-  items,
-  pageState,
-  updatePageState,
-  getItemIdToExpandedRowMap,
-  extendedColumns,
-}: DataVisualizerTableProps<T>) => {
-  const [expandedRowItemIds, setExpandedRowItemIds] = useState<string[]>([]);
-  const [expandAll, toggleExpandAll] = useState<boolean>(false);
-
-  const { onTableChange, pagination, sorting } = useTableSettings<T>(
-    items,
-    pageState,
-    updatePageState
-  );
-  const showDistributions: boolean =
-    ('showDistributions' in pageState && pageState.showDistributions) ?? true;
-  const toggleShowDistribution = () => {
-    updatePageState({
-      ...pageState,
-      showDistributions: !showDistributions,
-    });
-  };
-
-  function toggleDetails(item: DataVisualizerTableItem) {
-    if (item.fieldName === undefined) return;
-    const index = expandedRowItemIds.indexOf(item.fieldName);
-    if (index !== -1) {
-      expandedRowItemIds.splice(index, 1);
-    } else {
-      expandedRowItemIds.push(item.fieldName);
-    }
-
-    // spread to a new array otherwise the component wouldn't re-render
-    setExpandedRowItemIds([...expandedRowItemIds]);
-  }
-
-  const columns = useMemo(() => {
-    const expanderColumn: EuiTableComputedColumnType<DataVisualizerTableItem> = {
-      name: (
-        <EuiButtonIcon
-          data-test-subj={`mlToggleDetailsForAllRowsButton ${expandAll ? 'expanded' : 'collapsed'}`}
-          onClick={() => toggleExpandAll(!expandAll)}
-          aria-label={
-            !expandAll
-              ? i18n.translate(
-                  'xpack.fileDataVisualizer.datavisualizer.dataGrid.expandDetailsForAllAriaLabel',
-                  {
-                    defaultMessage: 'Expand details for all fields',
-                  }
-                )
-              : i18n.translate(
-                  'xpack.fileDataVisualizer.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel',
-                  {
-                    defaultMessage: 'Collapse details for all fields',
-                  }
-                )
-          }
-          iconType={expandAll ? 'arrowUp' : 'arrowDown'}
-        />
-      ),
-      align: RIGHT_ALIGNMENT,
-      width: '40px',
-      isExpander: true,
-      render: (item: DataVisualizerTableItem) => {
-        if (item.fieldName === undefined) return null;
-        const direction = expandedRowItemIds.includes(item.fieldName) ? 'arrowUp' : 'arrowDown';
-        return (
-          <EuiButtonIcon
-            data-test-subj={`mlDataVisualizerDetailsToggle-${item.fieldName}-${direction}`}
-            onClick={() => toggleDetails(item)}
-            aria-label={
-              expandedRowItemIds.includes(item.fieldName)
-                ? i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.rowCollapse', {
-                    defaultMessage: 'Hide details for {fieldName}',
-                    values: { fieldName: item.fieldName },
-                  })
-                : i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.rowExpand', {
-                    defaultMessage: 'Show details for {fieldName}',
-                    values: { fieldName: item.fieldName },
-                  })
-            }
-            iconType={direction}
-          />
-        );
-      },
-      'data-test-subj': 'mlDataVisualizerTableColumnDetailsToggle',
-    };
-
-    const baseColumns = [
-      expanderColumn,
-      {
-        field: 'type',
-        name: i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.typeColumnName', {
-          defaultMessage: 'Type',
-        }),
-        render: (fieldType: JobFieldType) => {
-          return <FieldTypeIcon type={fieldType} tooltipEnabled={true} needsAria={true} />;
-        },
-        width: '75px',
-        sortable: true,
-        align: CENTER_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnType',
-      },
-      {
-        field: 'fieldName',
-        name: i18n.translate('xpack.fileDataVisualizer.datavisualizer.dataGrid.nameColumnName', {
-          defaultMessage: 'Name',
-        }),
-        sortable: true,
-        truncateText: true,
-        render: (fieldName: string) => (
-          <EuiText size="s">
-            <b>{fieldName}</b>
-          </EuiText>
-        ),
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnName',
-      },
-      {
-        field: 'docCount',
-        name: i18n.translate(
-          'xpack.fileDataVisualizer.datavisualizer.dataGrid.documentsCountColumnName',
-          {
-            defaultMessage: 'Documents (%)',
-          }
-        ),
-        render: (value: number | undefined, item: DataVisualizerTableItem) => (
-          <DocumentStat config={item} />
-        ),
-        sortable: (item: DataVisualizerTableItem) => item?.stats?.count,
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnDocumentsCount',
-      },
-      {
-        field: 'stats.cardinality',
-        name: i18n.translate(
-          'xpack.fileDataVisualizer.datavisualizer.dataGrid.distinctValuesColumnName',
-          {
-            defaultMessage: 'Distinct values',
-          }
-        ),
-        render: (cardinality?: number) => <DistinctValues cardinality={cardinality} />,
-        sortable: true,
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnDistinctValues',
-      },
-      {
-        name: (
-          <div style={{ display: 'flex', alignItems: 'center' }}>
-            <EuiIcon type={'visBarVertical'} style={{ paddingRight: 4 }} />
-            {i18n.translate(
-              'xpack.fileDataVisualizer.datavisualizer.dataGrid.distributionsColumnName',
-              {
-                defaultMessage: 'Distributions',
-              }
-            )}
-            <EuiButtonIcon
-              style={{ marginLeft: 4 }}
-              size={'s'}
-              iconType={showDistributions ? 'eye' : 'eyeClosed'}
-              onClick={() => toggleShowDistribution()}
-              aria-label={i18n.translate(
-                'xpack.fileDataVisualizer.datavisualizer.dataGrid.showDistributionsAriaLabel',
-                {
-                  defaultMessage: 'Show distributions',
-                }
-              )}
-            />
-          </div>
-        ),
-        render: (item: DataVisualizerTableItem) => {
-          if (item === undefined || showDistributions === false) return null;
-          if (
-            (item.type === JOB_FIELD_TYPES.KEYWORD || item.type === JOB_FIELD_TYPES.IP) &&
-            item.stats?.topValues !== undefined
-          ) {
-            return <TopValuesPreview config={item} />;
-          }
-
-          if (item.type === JOB_FIELD_TYPES.NUMBER) {
-            if (isIndexBasedFieldVisConfig(item) && item.stats?.distribution !== undefined) {
-              return <IndexBasedNumberContentPreview config={item} />;
-            } else {
-              return <FileBasedNumberContentPreview config={item} />;
-            }
-          }
-
-          if (item.type === JOB_FIELD_TYPES.BOOLEAN) {
-            return <BooleanContentPreview config={item} />;
-          }
-
-          return null;
-        },
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnDistribution',
-      },
-    ];
-    return extendedColumns ? [...baseColumns, ...extendedColumns] : baseColumns;
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [expandAll, showDistributions, updatePageState, extendedColumns]);
-
-  const itemIdToExpandedRowMap = useMemo(() => {
-    let itemIds = expandedRowItemIds;
-    if (expandAll) {
-      itemIds = items.map((i) => i[FIELD_NAME]).filter((f) => f !== undefined) as string[];
-    }
-    return getItemIdToExpandedRowMap(itemIds, items);
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [expandAll, items, expandedRowItemIds]);
-
-  return (
-    <EuiFlexItem data-test-subj="mlDataVisualizerTableContainer">
-      <EuiInMemoryTable<T>
-        className={'dataVisualizer'}
-        items={items}
-        itemId={FIELD_NAME}
-        columns={columns}
-        pagination={pagination}
-        sorting={sorting}
-        isExpandable={true}
-        itemIdToExpandedRowMap={itemIdToExpandedRowMap}
-        isSelectable={false}
-        onTableChange={onTableChange}
-        data-test-subj={'mlDataVisualizerTable'}
-        rowProps={(item) => ({
-          'data-test-subj': `mlDataVisualizerRow row-${item.fieldName}`,
-        })}
-      />
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts
deleted file mode 100644
index e9ef0cd75e286..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/field_vis_config.ts
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { JobFieldType } from '../../../../../common';
-
-export interface Percentile {
-  percent: number;
-  minValue: number;
-  maxValue: number;
-}
-
-export interface MetricFieldVisStats {
-  avg?: number;
-  distribution?: {
-    percentiles: Percentile[];
-    maxPercentile: number;
-    minPercentile: 0;
-  };
-  max?: number;
-  median?: number;
-  min?: number;
-}
-
-interface DocumentCountBuckets {
-  [key: string]: number;
-}
-
-export interface FieldVisStats {
-  cardinality?: number;
-  count?: number;
-  sampleCount?: number;
-  trueCount?: number;
-  falseCount?: number;
-  earliest?: number;
-  latest?: number;
-  documentCounts?: {
-    buckets?: DocumentCountBuckets;
-  };
-  avg?: number;
-  distribution?: {
-    percentiles: Percentile[];
-    maxPercentile: number;
-    minPercentile: 0;
-  };
-  fieldName?: string;
-  isTopValuesSampled?: boolean;
-  max?: number;
-  median?: number;
-  min?: number;
-  topValues?: Array<{ key: number | string; doc_count: number }>;
-  topValuesSampleSize?: number;
-  topValuesSamplerShardSize?: number;
-  examples?: Array<string | object>;
-  timeRangeEarliest?: number;
-  timeRangeLatest?: number;
-}
-
-// The internal representation of the configuration used to build the visuals
-// which display the field information.
-export interface FieldVisConfig {
-  type: JobFieldType;
-  fieldName?: string;
-  existsInDocs: boolean;
-  aggregatable: boolean;
-  loading: boolean;
-  stats?: FieldVisStats;
-  fieldFormat?: any;
-  isUnsupportedType?: boolean;
-}
-
-export interface FileBasedFieldVisConfig {
-  type: JobFieldType;
-  fieldName?: string;
-  stats?: FieldVisStats;
-  format?: string;
-}
-
-export interface FileBasedUnknownFieldVisConfig {
-  fieldName: string;
-  type: 'text' | 'unknown';
-  stats: { mean: number; count: number; sampleCount: number; cardinality: number };
-}
-
-export function isFileBasedFieldVisConfig(
-  field: FieldVisConfig | FileBasedFieldVisConfig
-): field is FileBasedFieldVisConfig {
-  return !field.hasOwnProperty('existsInDocs');
-}
-
-export function isIndexBasedFieldVisConfig(
-  field: FieldVisConfig | FileBasedFieldVisConfig
-): field is FieldVisConfig {
-  return field.hasOwnProperty('existsInDocs');
-}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts b/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts
deleted file mode 100644
index 161829461aa26..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/stats_table/types/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FieldDataRowProps } from './field_data_row';
-export {
-  FieldVisConfig,
-  FileBasedFieldVisConfig,
-  FieldVisStats,
-  MetricFieldVisStats,
-  isFileBasedFieldVisConfig,
-  isIndexBasedFieldVisConfig,
-} from './field_vis_config';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.tsx b/x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.tsx
deleted file mode 100644
index c1815fad41de8..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/top_values/top_values.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, { FC, Fragment } from 'react';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiProgress,
-  EuiSpacer,
-  EuiText,
-  EuiToolTip,
-} from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import classNames from 'classnames';
-import { roundToDecimalPlace, kibanaFieldFormat } from '../utils';
-import { ExpandedRowFieldHeader } from '../stats_table/components/expanded_row_field_header';
-import { FieldVisStats } from '../stats_table/types';
-
-interface Props {
-  stats: FieldVisStats | undefined;
-  fieldFormat?: any;
-  barColor?: 'primary' | 'secondary' | 'danger' | 'subdued' | 'accent';
-  compressed?: boolean;
-}
-
-function getPercentLabel(docCount: number, topValuesSampleSize: number): string {
-  const percent = (100 * docCount) / topValuesSampleSize;
-  if (percent >= 0.1) {
-    return `${roundToDecimalPlace(percent, 1)}%`;
-  } else {
-    return '< 0.1%';
-  }
-}
-
-export const TopValues: FC<Props> = ({ stats, fieldFormat, barColor, compressed }) => {
-  if (stats === undefined) return null;
-  const {
-    topValues,
-    topValuesSampleSize,
-    topValuesSamplerShardSize,
-    count,
-    isTopValuesSampled,
-  } = stats;
-  const progressBarMax = isTopValuesSampled === true ? topValuesSampleSize : count;
-  return (
-    <EuiFlexItem data-test-subj={'mlTopValues'}>
-      <ExpandedRowFieldHeader>
-        <FormattedMessage
-          id="xpack.fileDataVisualizer.fieldDataCard.topValuesLabel"
-          defaultMessage="Top values"
-        />
-      </ExpandedRowFieldHeader>
-
-      <div data-test-subj="mlFieldDataTopValues" className={'fieldDataTopValuesContainer'}>
-        {Array.isArray(topValues) &&
-          topValues.map((value) => (
-            <EuiFlexGroup gutterSize="xs" alignItems="center" key={value.key}>
-              <EuiFlexItem
-                grow={false}
-                className={classNames(
-                  'eui-textTruncate',
-                  'topValuesValueLabelContainer',
-                  `topValuesValueLabelContainer--${compressed === true ? 'small' : 'large'}`
-                )}
-              >
-                <EuiToolTip content={kibanaFieldFormat(value.key, fieldFormat)} position="right">
-                  <EuiText size="xs" textAlign={'right'} color="subdued">
-                    {kibanaFieldFormat(value.key, fieldFormat)}
-                  </EuiText>
-                </EuiToolTip>
-              </EuiFlexItem>
-              <EuiFlexItem data-test-subj="mlFieldDataTopValueBar">
-                <EuiProgress
-                  value={value.doc_count}
-                  max={progressBarMax}
-                  color={barColor}
-                  size="m"
-                />
-              </EuiFlexItem>
-              {progressBarMax !== undefined && (
-                <EuiFlexItem
-                  grow={false}
-                  className={classNames('eui-textTruncate', 'topValuesPercentLabelContainer')}
-                >
-                  <EuiText size="xs" textAlign="left" color="subdued">
-                    {getPercentLabel(value.doc_count, progressBarMax)}
-                  </EuiText>
-                </EuiFlexItem>
-              )}
-            </EuiFlexGroup>
-          ))}
-        {isTopValuesSampled === true && (
-          <Fragment>
-            <EuiSpacer size="xs" />
-            <EuiText size="xs" textAlign={'left'}>
-              <FormattedMessage
-                id="xpack.fileDataVisualizer.fieldDataCard.topValues.calculatedFromSampleDescription"
-                defaultMessage="Calculated from sample of {topValuesSamplerShardSize} documents per shard"
-                values={{
-                  topValuesSamplerShardSize,
-                }}
-              />
-            </EuiText>
-          </Fragment>
-        )}
-      </div>
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts b/x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts
deleted file mode 100644
index 1d47e633188c5..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/components/utils/utils.ts
+++ /dev/null
@@ -1,136 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { isEqual } from 'lodash';
-import { AnalysisResult, InputOverrides, MB } from '../../../../../file_upload/common';
-
-export const DEFAULT_LINES_TO_SAMPLE = 1000;
-const UPLOAD_SIZE_MB = 5;
-
-const overrideDefaults = {
-  timestampFormat: undefined,
-  timestampField: undefined,
-  format: undefined,
-  delimiter: undefined,
-  quote: undefined,
-  hasHeaderRow: undefined,
-  charset: undefined,
-  columnNames: undefined,
-  shouldTrimFields: undefined,
-  grokPattern: undefined,
-  linesToSample: undefined,
-};
-
-export function readFile(file: File) {
-  return new Promise((resolve, reject) => {
-    if (file && file.size) {
-      const reader = new FileReader();
-      reader.readAsArrayBuffer(file);
-
-      reader.onload = (() => {
-        return () => {
-          const decoder = new TextDecoder();
-          const data = reader.result;
-          if (data === null || typeof data === 'string') {
-            return reject();
-          }
-          const size = UPLOAD_SIZE_MB * MB;
-          const fileContents = decoder.decode(data.slice(0, size));
-
-          if (fileContents === '') {
-            reject();
-          } else {
-            resolve({ fileContents, data });
-          }
-        };
-      })();
-    } else {
-      reject();
-    }
-  });
-}
-
-export function createUrlOverrides(overrides: InputOverrides, originalSettings: InputOverrides) {
-  const formattedOverrides: InputOverrides = {};
-  for (const o in overrideDefaults) {
-    if (overrideDefaults.hasOwnProperty(o)) {
-      let value = overrides[o];
-      if (
-        (Array.isArray(value) && isEqual(value, originalSettings[o])) ||
-        value === undefined ||
-        value === originalSettings[o]
-      ) {
-        value = '';
-      }
-
-      const snakeCaseO = o.replace(/([A-Z])/g, ($1) => `_${$1.toLowerCase()}`);
-      formattedOverrides[snakeCaseO] = value;
-    }
-  }
-
-  if (formattedOverrides.format === '' && originalSettings.format === 'delimited') {
-    if (
-      formattedOverrides.should_trim_fields !== '' ||
-      formattedOverrides.has_header_row !== '' ||
-      formattedOverrides.delimiter !== '' ||
-      formattedOverrides.quote !== '' ||
-      formattedOverrides.column_names !== ''
-    ) {
-      formattedOverrides.format = originalSettings.format;
-    }
-
-    if (Array.isArray(formattedOverrides.column_names)) {
-      formattedOverrides.column_names = formattedOverrides.column_names.join();
-    }
-  }
-
-  if (formattedOverrides.format === '' && originalSettings.format === 'semi_structured_text') {
-    if (formattedOverrides.grok_pattern !== '') {
-      formattedOverrides.format = originalSettings.format;
-    }
-  }
-
-  if (formattedOverrides.format === 'ndjson' || originalSettings.format === 'ndjson') {
-    formattedOverrides.should_trim_fields = '';
-    formattedOverrides.has_header_row = '';
-    formattedOverrides.delimiter = '';
-    formattedOverrides.quote = '';
-    formattedOverrides.column_names = '';
-  }
-
-  if (formattedOverrides.lines_to_sample === '') {
-    formattedOverrides.lines_to_sample = overrides.linesToSample;
-  }
-
-  return formattedOverrides;
-}
-
-export function processResults({ results, overrides }: AnalysisResult) {
-  const timestampFormat =
-    results.java_timestamp_formats !== undefined && results.java_timestamp_formats.length
-      ? results.java_timestamp_formats[0]
-      : undefined;
-
-  const linesToSample =
-    overrides !== undefined && overrides.lines_to_sample !== undefined
-      ? overrides.lines_to_sample
-      : DEFAULT_LINES_TO_SAMPLE;
-
-  return {
-    format: results.format,
-    delimiter: results.delimiter,
-    timestampField: results.timestamp_field,
-    timestampFormat,
-    quote: results.quote,
-    hasHeaderRow: results.has_header_row,
-    shouldTrimFields: results.should_trim_fields,
-    charset: results.charset,
-    columnNames: results.column_names,
-    grokPattern: results.grok_pattern,
-    linesToSample,
-  };
-}
diff --git a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx b/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx
deleted file mode 100644
index f291076557bb8..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/file_datavisualizer.tsx
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-import './_index.scss';
-import React, { FC } from 'react';
-import { KibanaContextProvider } from '../../../../../src/plugins/kibana_react/public';
-import { getCoreStart, getPluginsStart } from '../kibana_services';
-
-// @ts-ignore
-import { FileDataVisualizerView } from './components/file_datavisualizer_view/index';
-
-export const FileDataVisualizer: FC = () => {
-  const coreStart = getCoreStart();
-  const { data, maps, embeddable, share, security, fileUpload } = getPluginsStart();
-  const services = { data, maps, embeddable, share, security, fileUpload, ...coreStart };
-
-  return (
-    <KibanaContextProvider services={{ ...services }}>
-      <FileDataVisualizerView
-        indexPatterns={data.indexPatterns}
-        savedObjectsClient={coreStart.savedObjects.client}
-        http={coreStart.http}
-        fileUpload={fileUpload}
-      />
-    </KibanaContextProvider>
-  );
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/application/index.ts b/x-pack/plugins/file_data_visualizer/public/application/index.ts
deleted file mode 100644
index dba820519af94..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FileDataVisualizer } from './file_datavisualizer';
diff --git a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts b/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts
deleted file mode 100644
index 6752c322d42e3..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/kibana_context.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { CoreStart } from 'kibana/public';
-import { useKibana } from '../../../../../src/plugins/kibana_react/public';
-import type { FileDataVisualizerStartDependencies } from '../plugin';
-
-export type StartServices = CoreStart & FileDataVisualizerStartDependencies;
-export const useFileDataVisualizerKibana = () => useKibana<StartServices>();
diff --git a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts b/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts
deleted file mode 100644
index 76a5f6ac20117..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/application/util/field_types_utils.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-import { JOB_FIELD_TYPES } from '../../../common';
-
-export const jobTypeAriaLabels = {
-  BOOLEAN: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.booleanTypeAriaLabel', {
-    defaultMessage: 'boolean type',
-  }),
-  DATE: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.dateTypeAriaLabel', {
-    defaultMessage: 'date type',
-  }),
-  GEO_POINT: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.geoPointTypeAriaLabel', {
-    defaultMessage: '{geoPointParam} type',
-    values: {
-      geoPointParam: 'geo point',
-    },
-  }),
-  IP: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.ipTypeAriaLabel', {
-    defaultMessage: 'ip type',
-  }),
-  KEYWORD: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.keywordTypeAriaLabel', {
-    defaultMessage: 'keyword type',
-  }),
-  NUMBER: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.numberTypeAriaLabel', {
-    defaultMessage: 'number type',
-  }),
-  TEXT: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.textTypeAriaLabel', {
-    defaultMessage: 'text type',
-  }),
-  UNKNOWN: i18n.translate('xpack.fileDataVisualizer.fieldTypeIcon.unknownTypeAriaLabel', {
-    defaultMessage: 'unknown type',
-  }),
-};
-
-export const getJobTypeAriaLabel = (type: string) => {
-  const requestedFieldType = Object.keys(JOB_FIELD_TYPES).find(
-    (k) => JOB_FIELD_TYPES[k as keyof typeof JOB_FIELD_TYPES] === type
-  );
-  if (requestedFieldType === undefined) {
-    return null;
-  }
-  return jobTypeAriaLabels[requestedFieldType as keyof typeof jobTypeAriaLabels];
-};
diff --git a/x-pack/plugins/file_data_visualizer/public/index.ts b/x-pack/plugins/file_data_visualizer/public/index.ts
deleted file mode 100644
index 64a81936dbbde..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { FileDataVisualizerPlugin } from './plugin';
-
-export function plugin() {
-  return new FileDataVisualizerPlugin();
-}
-
-export { FileDataVisualizerPluginStart } from './plugin';
diff --git a/x-pack/plugins/file_data_visualizer/public/kibana_services.ts b/x-pack/plugins/file_data_visualizer/public/kibana_services.ts
deleted file mode 100644
index 6a5fe85c72477..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/kibana_services.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { CoreStart } from 'kibana/public';
-import { FileDataVisualizerStartDependencies } from './plugin';
-
-let coreStart: CoreStart;
-let pluginsStart: FileDataVisualizerStartDependencies;
-export function setStartServices(core: CoreStart, plugins: FileDataVisualizerStartDependencies) {
-  coreStart = core;
-  pluginsStart = plugins;
-}
-
-export const getCoreStart = () => coreStart;
-export const getPluginsStart = () => pluginsStart;
diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts
deleted file mode 100644
index 99dbb6d3746ce..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/index.ts
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { HttpSetup } from 'src/core/public';
-import { FileDataVisualizer } from '../application';
-import { getCoreStart } from '../kibana_services';
-
-let loadModulesPromise: Promise<LazyLoadedModules>;
-
-interface LazyLoadedModules {
-  FileDataVisualizer: typeof FileDataVisualizer;
-  getHttp: () => HttpSetup;
-}
-
-export async function lazyLoadModules(): Promise<LazyLoadedModules> {
-  if (typeof loadModulesPromise !== 'undefined') {
-    return loadModulesPromise;
-  }
-
-  loadModulesPromise = new Promise(async (resolve) => {
-    const lazyImports = await import('./lazy');
-
-    resolve({
-      ...lazyImports,
-      getHttp: () => getCoreStart().http,
-    });
-  });
-  return loadModulesPromise;
-}
diff --git a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts b/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts
deleted file mode 100644
index 4229b95f3aaad..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/lazy_load_bundle/lazy/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FileDataVisualizer } from '../../application';
diff --git a/x-pack/plugins/file_data_visualizer/public/plugin.ts b/x-pack/plugins/file_data_visualizer/public/plugin.ts
deleted file mode 100644
index a94c0fce45cd4..0000000000000
--- a/x-pack/plugins/file_data_visualizer/public/plugin.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { CoreStart } from 'kibana/public';
-import type { EmbeddableStart } from '../../../../src/plugins/embeddable/public';
-import type { SharePluginStart } from '../../../../src/plugins/share/public';
-import { Plugin } from '../../../../src/core/public';
-
-import { setStartServices } from './kibana_services';
-import { DataPublicPluginStart } from '../../../../src/plugins/data/public';
-import type { FileUploadPluginStart } from '../../file_upload/public';
-import type { MapsStartApi } from '../../maps/public';
-import type { SecurityPluginSetup } from '../../security/public';
-import { getFileDataVisualizerComponent } from './api';
-import { getMaxBytesFormatted } from './application/util/get_max_bytes';
-
-// eslint-disable-next-line @typescript-eslint/no-empty-interface
-export interface FileDataVisualizerSetupDependencies {}
-export interface FileDataVisualizerStartDependencies {
-  data: DataPublicPluginStart;
-  fileUpload: FileUploadPluginStart;
-  maps: MapsStartApi;
-  embeddable: EmbeddableStart;
-  security?: SecurityPluginSetup;
-  share: SharePluginStart;
-}
-
-export type FileDataVisualizerPluginSetup = ReturnType<FileDataVisualizerPlugin['setup']>;
-export type FileDataVisualizerPluginStart = ReturnType<FileDataVisualizerPlugin['start']>;
-
-export class FileDataVisualizerPlugin
-  implements
-    Plugin<
-      FileDataVisualizerPluginSetup,
-      FileDataVisualizerPluginStart,
-      FileDataVisualizerSetupDependencies,
-      FileDataVisualizerStartDependencies
-    > {
-  public setup() {}
-
-  public start(core: CoreStart, plugins: FileDataVisualizerStartDependencies) {
-    setStartServices(core, plugins);
-    return { getFileDataVisualizerComponent, getMaxBytesFormatted };
-  }
-}
diff --git a/x-pack/plugins/file_data_visualizer/server/index.ts b/x-pack/plugins/file_data_visualizer/server/index.ts
deleted file mode 100644
index 43067dbe99d0d..0000000000000
--- a/x-pack/plugins/file_data_visualizer/server/index.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { FileDataVisualizerPlugin } from './plugin';
-
-export const plugin = () => new FileDataVisualizerPlugin();
diff --git a/x-pack/plugins/file_data_visualizer/server/plugin.ts b/x-pack/plugins/file_data_visualizer/server/plugin.ts
deleted file mode 100644
index f6893b7edaa53..0000000000000
--- a/x-pack/plugins/file_data_visualizer/server/plugin.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Plugin } from 'src/core/server';
-
-export class FileDataVisualizerPlugin implements Plugin {
-  setup() {}
-  start() {}
-}
diff --git a/x-pack/plugins/file_data_visualizer/tsconfig.json b/x-pack/plugins/file_data_visualizer/tsconfig.json
deleted file mode 100644
index 2d668bcaa2045..0000000000000
--- a/x-pack/plugins/file_data_visualizer/tsconfig.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "extends": "../../../tsconfig.base.json",
-  "compilerOptions": {
-    "composite": true,
-    "outDir": "./target/types",
-    "emitDeclarationOnly": true,
-    "declaration": true,
-    "declarationMap": true
-  },
-  "include": ["common/**/*", "public/**/*", "server/**/*"],
-  "references": [
-    { "path": "../../../src/core/tsconfig.json" },
-    { "path": "../../../src/plugins/data/tsconfig.json" },
-    { "path": "../../../src/plugins/usage_collection/tsconfig.json" },
-    { "path": "../security/tsconfig.json" },
-    { "path": "../file_upload/tsconfig.json" },
-    { "path": "../maps/tsconfig.json" },
-    { "path": "../../../src/plugins/embeddable/tsconfig.json" },
-  ]
-}
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 66a428128cbe1..0e8358f1671d0 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
@@ -5,11 +5,15 @@
  * 2.0.
  */
 import { IScopedClusterClient } from 'kibana/server';
+import { estypes } from '@elastic/elasticsearch';
+import { isPopulatedObject } from './utils/runtime_field_utils';
+
 export async function getTimeFieldRange(
   client: IScopedClusterClient,
   index: string[] | string,
   timeFieldName: string,
-  query: any
+  query: any,
+  runtimeMappings?: estypes.MappingRuntimeFields
 ): Promise<{
   success: boolean;
   start: { epoch: number; string: string };
@@ -36,6 +40,7 @@ export async function getTimeFieldRange(
           },
         },
       },
+      ...(isPopulatedObject(runtimeMappings) ? { runtime_mappings: runtimeMappings } : {}),
     },
   });
 
diff --git a/x-pack/plugins/file_upload/server/plugin.ts b/x-pack/plugins/file_upload/server/plugin.ts
index aaf21ed2aa2ec..c729afec92f94 100644
--- a/x-pack/plugins/file_upload/server/plugin.ts
+++ b/x-pack/plugins/file_upload/server/plugin.ts
@@ -10,14 +10,9 @@ import { CoreSetup, CoreStart, Logger, Plugin, PluginInitializerContext } from '
 import { schema } from '@kbn/config-schema';
 import { fileUploadRoutes } from './routes';
 import { initFileUploadTelemetry } from './telemetry';
-import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
 import { UI_SETTING_MAX_FILE_SIZE, MAX_FILE_SIZE } from '../common';
-import { StartDeps } from './types';
 import { setupCapabilities } from './capabilities';
-
-interface SetupDeps {
-  usageCollection: UsageCollectionSetup;
-}
+import { StartDeps, SetupDeps } from './types';
 
 export class FileUploadPlugin implements Plugin {
   private readonly _logger: Logger;
diff --git a/x-pack/plugins/file_upload/server/routes.ts b/x-pack/plugins/file_upload/server/routes.ts
index 3033f8300712c..bd3aa2688c735 100644
--- a/x-pack/plugins/file_upload/server/routes.ts
+++ b/x-pack/plugins/file_upload/server/routes.ts
@@ -21,7 +21,12 @@ import { getTimeFieldRange } from './get_time_field_range';
 import { analyzeFile } from './analyze_file';
 
 import { updateTelemetry } from './telemetry';
-import { importFileBodySchema, importFileQuerySchema, analyzeFileQuerySchema } from './schemas';
+import {
+  importFileBodySchema,
+  importFileQuerySchema,
+  analyzeFileQuerySchema,
+  runtimeMappingsSchema,
+} from './schemas';
 import { StartDeps } from './types';
 import { checkFileUploadPrivileges } from './check_privileges';
 
@@ -219,6 +224,7 @@ export function fileUploadRoutes(coreSetup: CoreSetup<StartDeps, unknown>, logge
           timeFieldName: schema.string(),
           /** Query to match documents in the index(es). */
           query: schema.maybe(schema.any()),
+          runtimeMappings: schema.maybe(runtimeMappingsSchema),
         }),
       },
       options: {
@@ -227,12 +233,13 @@ export function fileUploadRoutes(coreSetup: CoreSetup<StartDeps, unknown>, logge
     },
     async (context, request, response) => {
       try {
-        const { index, timeFieldName, query } = request.body;
+        const { index, timeFieldName, query, runtimeMappings } = request.body;
         const resp = await getTimeFieldRange(
           context.core.elasticsearch.client,
           index,
           timeFieldName,
-          query
+          query,
+          runtimeMappings
         );
 
         return response.ok({
diff --git a/x-pack/plugins/file_upload/server/schemas.ts b/x-pack/plugins/file_upload/server/schemas.ts
index a0d54cf9ec553..baf7ed864f2e6 100644
--- a/x-pack/plugins/file_upload/server/schemas.ts
+++ b/x-pack/plugins/file_upload/server/schemas.ts
@@ -6,6 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import { isRuntimeField } from './utils/runtime_field_utils';
 
 export const analyzeFileQuerySchema = schema.object({
   charset: schema.maybe(schema.string()),
@@ -40,3 +41,15 @@ export const importFileBodySchema = schema.object({
     pipeline: schema.maybe(schema.any()),
   }),
 });
+
+export const runtimeMappingsSchema = schema.object(
+  {},
+  {
+    unknowns: 'allow',
+    validate: (v: object) => {
+      if (Object.values(v).some((o) => !isRuntimeField(o))) {
+        return 'Invalid runtime field';
+      }
+    },
+  }
+);
diff --git a/x-pack/plugins/file_upload/server/types.ts b/x-pack/plugins/file_upload/server/types.ts
index d23661ebae711..241abadaf750f 100644
--- a/x-pack/plugins/file_upload/server/types.ts
+++ b/x-pack/plugins/file_upload/server/types.ts
@@ -6,7 +6,12 @@
  */
 
 import { SecurityPluginStart } from '../..//security/server';
+import { UsageCollectionSetup } from '../../../../src/plugins/usage_collection/server';
 
 export interface StartDeps {
   security?: SecurityPluginStart;
 }
+
+export interface SetupDeps {
+  usageCollection: UsageCollectionSetup;
+}
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
new file mode 100644
index 0000000000000..921741110d2a3
--- /dev/null
+++ b/x-pack/plugins/file_upload/server/utils/runtime_field_utils.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 { estypes } from '@elastic/elasticsearch';
+import { RUNTIME_FIELD_TYPES } from '../../../../../src/plugins/data/common/index_patterns';
+
+type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
+
+export const isPopulatedObject = <U extends string = string>(
+  arg: unknown,
+  requiredAttributes: U[] = []
+): arg is Record<U, unknown> => {
+  return (
+    typeof arg === 'object' &&
+    arg !== null &&
+    Object.keys(arg).length > 0 &&
+    (requiredAttributes.length === 0 ||
+      requiredAttributes.every((d) => ({}.hasOwnProperty.call(arg, d))))
+  );
+};
+
+export function isRuntimeField(arg: unknown): arg is estypes.MappingRuntimeField {
+  return (
+    ((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) ||
+      (isPopulatedObject(arg, ['type', 'script']) &&
+        Object.keys(arg).length === 2 &&
+        (typeof arg.script === 'string' ||
+          (isPopulatedObject(arg.script, ['source']) &&
+            Object.keys(arg.script).length === 1 &&
+            typeof arg.script.source === 'string')))) &&
+    RUNTIME_FIELD_TYPES.includes(arg.type as RuntimeType)
+  );
+}
+
+export function isRuntimeMappings(arg: unknown): arg is estypes.MappingRuntimeFields {
+  return isPopulatedObject(arg) && Object.values(arg).every((d) => isRuntimeField(d));
+}
diff --git a/x-pack/plugins/fleet/common/constants/plugin.ts b/x-pack/plugins/fleet/common/constants/plugin.ts
index 86175d4cd24bc..ee0e1e5caeae4 100644
--- a/x-pack/plugins/fleet/common/constants/plugin.ts
+++ b/x-pack/plugins/fleet/common/constants/plugin.ts
@@ -6,3 +6,4 @@
  */
 
 export const PLUGIN_ID = 'fleet';
+export const INTEGRATIONS_PLUGIN_ID = 'integrations';
diff --git a/x-pack/plugins/fleet/common/types/index.ts b/x-pack/plugins/fleet/common/types/index.ts
index 7117973baa139..95f91165aaf94 100644
--- a/x-pack/plugins/fleet/common/types/index.ts
+++ b/x-pack/plugins/fleet/common/types/index.ts
@@ -16,7 +16,7 @@ export interface FleetConfigType {
   agents: {
     enabled: boolean;
     elasticsearch: {
-      host?: string;
+      hosts?: string[];
       ca_sha256?: string;
     };
     fleet_server?: {
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 753100f622556..a9393abcc57ef 100644
--- a/x-pack/plugins/fleet/common/types/models/agent_policy.ts
+++ b/x-pack/plugins/fleet/common/types/models/agent_policy.ts
@@ -61,9 +61,9 @@ export interface FullAgentPolicyInput {
 }
 
 export interface FullAgentPolicyOutputPermissions {
-  [role: string]: {
-    cluster: string[];
-    indices: Array<{
+  [packagePolicyName: string]: {
+    cluster?: string[];
+    indices?: Array<{
       names: string[];
       privileges: string[];
     }>;
diff --git a/x-pack/plugins/fleet/common/types/models/epm.ts b/x-pack/plugins/fleet/common/types/models/epm.ts
index 5551453b8975c..0ef9f8b7ace36 100644
--- a/x-pack/plugins/fleet/common/types/models/epm.ts
+++ b/x-pack/plugins/fleet/common/types/models/epm.ts
@@ -276,6 +276,7 @@ export enum RegistryDataStreamKeys {
   ingest_pipeline = 'ingest_pipeline',
   elasticsearch = 'elasticsearch',
   dataset_is_prefix = 'dataset_is_prefix',
+  permissions = 'permissions',
 }
 
 export interface RegistryDataStream {
@@ -291,6 +292,7 @@ export interface RegistryDataStream {
   [RegistryDataStreamKeys.ingest_pipeline]?: string;
   [RegistryDataStreamKeys.elasticsearch]?: RegistryElasticsearch;
   [RegistryDataStreamKeys.dataset_is_prefix]?: boolean;
+  [RegistryDataStreamKeys.permissions]?: RegistryDataStreamPermissions;
 }
 
 export interface RegistryElasticsearch {
@@ -298,6 +300,11 @@ export interface RegistryElasticsearch {
   'index_template.mappings'?: object;
 }
 
+export interface RegistryDataStreamPermissions {
+  cluster?: string[];
+  indices?: string[];
+}
+
 export type RegistryVarType = 'integer' | 'bool' | 'password' | 'text' | 'yaml' | 'string';
 export enum RegistryVarsEntryKeys {
   name = 'name',
diff --git a/x-pack/plugins/fleet/dev_docs/fleet_ui_extensions.md b/x-pack/plugins/fleet/dev_docs/fleet_ui_extensions.md
index a3d82356af14f..88ca0da6c7339 100644
--- a/x-pack/plugins/fleet/dev_docs/fleet_ui_extensions.md
+++ b/x-pack/plugins/fleet/dev_docs/fleet_ui_extensions.md
@@ -44,7 +44,7 @@ export class Plugin {
 
 > The code above lives in `x-pack/plugins/security_solution/public/plugin.tsx`
 
-For a list of supported Fleet UI extensions, see the `UIExtensionPoint` and associated Union types defined here: `x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts`.
+For a list of supported Fleet UI extensions, see the `UIExtensionPoint` and associated Union types defined here: `x-pack/plugins/fleet/public/types/ui_extensions.ts`.
 
 
 
@@ -81,4 +81,4 @@ const LinkToAgentEnroll = () => {
 }
 ```
 
-For a list of supported Fleet pages, see the type `AnyIntraAppRouteState` and its associated Union types in `x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts`
+For a list of supported Fleet pages, see the type `AnyIntraAppRouteState` and its associated Union types in `x-pack/plugins/fleet/public/types/intra_app_route_state.ts`
diff --git a/x-pack/plugins/fleet/public/applications/fleet/app.tsx b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
index 5327d4b7cc4a4..1398e121c6870 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/app.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/app.tsx
@@ -20,29 +20,31 @@ import type { FleetConfigType, FleetStartServices } from '../../plugin';
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
 import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
 
+import { PackageInstallProvider } from '../integrations/hooks';
+
 import {
   ConfigContext,
   FleetStatusProvider,
+  IntraAppStateProvider,
   KibanaVersionContext,
   sendGetPermissionsCheck,
   sendSetup,
   useBreadcrumbs,
   useConfig,
   useStartServices,
+  UIExtensionsContext,
 } from './hooks';
 import { Error, Loading } from './components';
-import { IntraAppStateProvider } from './hooks/use_intra_app_state';
-import { PackageInstallProvider } from './sections/epm/hooks';
-import { PAGE_ROUTING_PATHS } from './constants';
+import type { UIExtensionsStorage } from './types';
+
+import { FLEET_ROUTING_PATHS } from './constants';
 import { DefaultLayout, WithoutHeaderLayout } from './layouts';
-import { EPMApp } from './sections/epm';
 import { AgentPolicyApp } from './sections/agent_policy';
 import { DataStreamApp } from './sections/data_stream';
 import { FleetApp } from './sections/agents';
 import { IngestManagerOverview } from './sections/overview';
 import { ProtectedRoute } from './index';
-import type { UIExtensionsStorage } from './types';
-import { UIExtensionsContext } from './hooks/use_ui_extension';
+import { CreatePackagePolicyPage } from './sections/agent_policy/create_package_policy_page';
 
 const ErrorLayout = ({ children }: { children: JSX.Element }) => (
   <EuiErrorBoundary>
@@ -236,31 +238,31 @@ export const AppRoutes = memo(() => {
 
   return (
     <Switch>
-      <Route path={PAGE_ROUTING_PATHS.integrations}>
-        <DefaultLayout section="epm">
-          <EPMApp />
-        </DefaultLayout>
-      </Route>
-      <Route path={PAGE_ROUTING_PATHS.policies}>
+      <Route path={FLEET_ROUTING_PATHS.policies}>
         <DefaultLayout section="agent_policy">
           <AgentPolicyApp />
         </DefaultLayout>
       </Route>
-      <Route path={PAGE_ROUTING_PATHS.data_streams}>
+      <Route path={FLEET_ROUTING_PATHS.data_streams}>
         <DefaultLayout section="data_stream">
           <DataStreamApp />
         </DefaultLayout>
       </Route>
-      <ProtectedRoute path={PAGE_ROUTING_PATHS.fleet} isAllowed={agents.enabled}>
+      <ProtectedRoute path={FLEET_ROUTING_PATHS.fleet} isAllowed={agents.enabled}>
         <DefaultLayout section="fleet">
           <FleetApp />
         </DefaultLayout>
       </ProtectedRoute>
-      <Route exact path={PAGE_ROUTING_PATHS.overview}>
+      <Route exact path={FLEET_ROUTING_PATHS.overview}>
         <DefaultLayout section="overview">
           <IngestManagerOverview />
         </DefaultLayout>
       </Route>
+      <Route path={FLEET_ROUTING_PATHS.add_integration_to_policy}>
+        <DefaultLayout showNav={false}>
+          <CreatePackagePolicyPage />
+        </DefaultLayout>
+      </Route>
       <Redirect to="/" />
     </Switch>
   );
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/index.ts b/x-pack/plugins/fleet/public/applications/fleet/components/index.ts
index 1c3f8047e95fb..ac5a78a4ea709 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/index.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/components/index.ts
@@ -5,12 +5,7 @@
  * 2.0.
  */
 
-export { Loading } from './loading';
-export { Error } from './error';
-export { Header, HeaderProps } from './header';
-export { AlphaMessaging } from './alpha_messaging';
-export { PackageIcon } from './package_icon';
-export { ContextMenuActions } from './context_menu_actions';
-export { SearchBar } from './search_bar';
-export * from './settings_flyout';
-export * from './link_and_revision';
+export * from '../../../components';
+
+export * from './enrollment_instructions';
+export * from './search_bar';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/index.tsx
deleted file mode 100644
index ea2e795d5fabb..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/index.tsx
+++ /dev/null
@@ -1,417 +0,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, useCallback } from 'react';
-import { i18n } from '@kbn/i18n';
-import {
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutHeader,
-  EuiTitle,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiButtonEmpty,
-  EuiSpacer,
-  EuiButton,
-  EuiFlyoutFooter,
-  EuiForm,
-  EuiFormRow,
-  EuiCode,
-  EuiCodeEditor,
-  EuiLink,
-  EuiPanel,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiText } from '@elastic/eui';
-import { safeLoad } from 'js-yaml';
-
-import {
-  useComboInput,
-  useStartServices,
-  useGetSettings,
-  useInput,
-  sendPutSettings,
-} from '../../hooks';
-import { useGetOutputs, sendPutOutput } from '../../hooks/use_request/outputs';
-import { isDiffPathProtocol } from '../../../../../common/';
-
-import { SettingsConfirmModal } from './confirm_modal';
-import type { SettingsConfirmModalProps } from './confirm_modal';
-import { HostsInput } from './hosts_input';
-
-import 'brace/mode/yaml';
-import 'brace/theme/textmate';
-
-const URL_REGEX = /^(https?):\/\/[^\s$.?#].[^\s]*$/gm;
-
-interface Props {
-  onClose: () => void;
-}
-
-function isSameArrayValue(arrayA: string[] = [], arrayB: string[] = []) {
-  return arrayA.length === arrayB.length && arrayA.every((val, index) => val === arrayB[index]);
-}
-
-function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
-  const [isLoading, setIsloading] = React.useState(false);
-  const { notifications } = useStartServices();
-
-  const fleetServerHostsInput = useComboInput('fleetServerHostsComboBox', [], (value) => {
-    if (value.length === 0) {
-      return [
-        {
-          message: i18n.translate('xpack.fleet.settings.fleetServerHostsEmptyError', {
-            defaultMessage: 'At least one URL is required',
-          }),
-        },
-      ];
-    }
-
-    const res: Array<{ message: string; index: number }> = [];
-    value.forEach((val, idx) => {
-      if (!val.match(URL_REGEX)) {
-        res.push({
-          message: i18n.translate('xpack.fleet.settings.fleetServerHostsError', {
-            defaultMessage: 'Invalid URL',
-          }),
-          index: idx,
-        });
-      }
-    });
-    if (res.length) {
-      return res;
-    }
-
-    if (value.length && isDiffPathProtocol(value)) {
-      return [
-        {
-          message: i18n.translate(
-            'xpack.fleet.settings.fleetServerHostsDifferentPathOrProtocolError',
-            {
-              defaultMessage: 'Protocol and path must be the same for each URL',
-            }
-          ),
-        },
-      ];
-    }
-  });
-
-  const elasticsearchUrlInput = useComboInput('esHostsComboxBox', [], (value) => {
-    const res: Array<{ message: string; index: number }> = [];
-    value.forEach((val, idx) => {
-      if (!val.match(URL_REGEX)) {
-        res.push({
-          message: i18n.translate('xpack.fleet.settings.elasticHostError', {
-            defaultMessage: 'Invalid URL',
-          }),
-          index: idx,
-        });
-      }
-    });
-    if (res.length) {
-      return res;
-    }
-  });
-
-  const additionalYamlConfigInput = useInput('', (value) => {
-    try {
-      safeLoad(value);
-      return;
-    } catch (error) {
-      return [
-        i18n.translate('xpack.fleet.settings.invalidYamlFormatErrorMessage', {
-          defaultMessage: 'Invalid YAML: {reason}',
-          values: { reason: error.message },
-        }),
-      ];
-    }
-  });
-
-  const validate = useCallback(() => {
-    if (
-      !fleetServerHostsInput.validate() ||
-      !elasticsearchUrlInput.validate() ||
-      !additionalYamlConfigInput.validate()
-    ) {
-      return false;
-    }
-
-    return true;
-  }, [fleetServerHostsInput, elasticsearchUrlInput, additionalYamlConfigInput]);
-
-  return {
-    isLoading,
-    validate,
-    submit: async () => {
-      try {
-        setIsloading(true);
-        if (!outputId) {
-          throw new Error('Unable to load outputs');
-        }
-        const outputResponse = await sendPutOutput(outputId, {
-          hosts: elasticsearchUrlInput.value,
-          config_yaml: additionalYamlConfigInput.value,
-        });
-        if (outputResponse.error) {
-          throw outputResponse.error;
-        }
-        const settingsResponse = await sendPutSettings({
-          fleet_server_hosts: fleetServerHostsInput.value,
-        });
-        if (settingsResponse.error) {
-          throw settingsResponse.error;
-        }
-        notifications.toasts.addSuccess(
-          i18n.translate('xpack.fleet.settings.success.message', {
-            defaultMessage: 'Settings saved',
-          })
-        );
-        setIsloading(false);
-        onSuccess();
-      } catch (error) {
-        setIsloading(false);
-        notifications.toasts.addError(error, {
-          title: 'Error',
-        });
-      }
-    },
-    inputs: {
-      fleetServerHosts: fleetServerHostsInput,
-      elasticsearchUrl: elasticsearchUrlInput,
-      additionalYamlConfig: additionalYamlConfigInput,
-    },
-  };
-}
-
-export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
-  const settingsRequest = useGetSettings();
-  const settings = settingsRequest?.data?.item;
-  const outputsRequest = useGetOutputs();
-  const output = outputsRequest.data?.items?.[0];
-  const { inputs, submit, validate, isLoading } = useSettingsForm(output?.id, onClose);
-
-  const [isConfirmModalVisible, setConfirmModalVisible] = React.useState(false);
-
-  const onSubmit = useCallback(() => {
-    if (validate()) {
-      setConfirmModalVisible(true);
-    }
-  }, [validate, setConfirmModalVisible]);
-
-  const onConfirm = useCallback(() => {
-    setConfirmModalVisible(false);
-    submit();
-  }, [submit]);
-
-  const onConfirmModalClose = useCallback(() => {
-    setConfirmModalVisible(false);
-  }, [setConfirmModalVisible]);
-
-  useEffect(() => {
-    if (output) {
-      inputs.elasticsearchUrl.setValue(output.hosts || []);
-      inputs.additionalYamlConfig.setValue(output.config_yaml || '');
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [output]);
-
-  useEffect(() => {
-    if (settings) {
-      inputs.fleetServerHosts.setValue([...settings.fleet_server_hosts]);
-    }
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [settings]);
-
-  const isUpdated = React.useMemo(() => {
-    if (!settings || !output) {
-      return false;
-    }
-    return (
-      !isSameArrayValue(settings.fleet_server_hosts, inputs.fleetServerHosts.value) ||
-      !isSameArrayValue(output.hosts, inputs.elasticsearchUrl.value) ||
-      (output.config_yaml || '') !== inputs.additionalYamlConfig.value
-    );
-  }, [settings, inputs, output]);
-
-  const changes = React.useMemo(() => {
-    if (!settings || !output || !isConfirmModalVisible) {
-      return [];
-    }
-
-    const tmpChanges: SettingsConfirmModalProps['changes'] = [];
-    if (!isSameArrayValue(output.hosts, inputs.elasticsearchUrl.value)) {
-      tmpChanges.push(
-        {
-          type: 'elasticsearch',
-          direction: 'removed',
-          urls: output.hosts || [],
-        },
-        {
-          type: 'elasticsearch',
-          direction: 'added',
-          urls: inputs.elasticsearchUrl.value,
-        }
-      );
-    }
-
-    if (!isSameArrayValue(settings.fleet_server_hosts, inputs.fleetServerHosts.value)) {
-      tmpChanges.push(
-        {
-          type: 'fleet_server',
-          direction: 'removed',
-          urls: settings.fleet_server_hosts,
-        },
-        {
-          type: 'fleet_server',
-          direction: 'added',
-          urls: inputs.fleetServerHosts.value,
-        }
-      );
-    }
-
-    return tmpChanges;
-  }, [settings, inputs, output, isConfirmModalVisible]);
-
-  const body = settings && (
-    <EuiForm>
-      <EuiText color="subdued" size="s">
-        <FormattedMessage
-          id="xpack.fleet.settings.globalOutputDescription"
-          defaultMessage="These settings are applied globally to the {outputs} section of all agent policies and affect all enrolled agents."
-          values={{
-            outputs: <EuiCode>outputs</EuiCode>,
-          }}
-        />
-      </EuiText>
-      <EuiSpacer size="m" />
-      <EuiPanel hasShadow={false} hasBorder={true}>
-        <HostsInput
-          {...inputs.fleetServerHosts.props}
-          label={i18n.translate('xpack.fleet.settings.fleetServerHostsLabel', {
-            defaultMessage: 'Fleet Server hosts',
-          })}
-          helpText={
-            <FormattedMessage
-              id="xpack.fleet.settings.fleetServerHostsHelpTect"
-              defaultMessage="Specify the URLs that your agents will use to connect to a Fleet Server. If multiple URLs exist, Fleet shows the first provided URL for enrollment purposes. Refer to the {link}."
-              values={{
-                link: (
-                  <EuiLink
-                    href="https://www.elastic.co/guide/en/fleet/current/fleet-settings.html#fleet-server-hosts-setting"
-                    target="_blank"
-                    external
-                  >
-                    <FormattedMessage
-                      id="xpack.fleet.settings.userGuideLink"
-                      defaultMessage="Fleet User Guide"
-                    />
-                  </EuiLink>
-                ),
-              }}
-            />
-          }
-        />
-      </EuiPanel>
-      <EuiSpacer size="m" />
-      <EuiPanel hasShadow={false} hasBorder={true}>
-        <HostsInput
-          {...inputs.elasticsearchUrl.props}
-          label={i18n.translate('xpack.fleet.settings.elasticsearchUrlLabel', {
-            defaultMessage: 'Elasticsearch hosts',
-          })}
-          helpText={i18n.translate('xpack.fleet.settings.elasticsearchUrlsHelpTect', {
-            defaultMessage: 'Specify the Elasticsearch URLs where agents send data.',
-          })}
-        />
-      </EuiPanel>
-      <EuiSpacer size="m" />
-      <EuiPanel hasShadow={false} hasBorder={true}>
-        <EuiFormRow
-          {...inputs.additionalYamlConfig.formRowProps}
-          label={i18n.translate('xpack.fleet.settings.additionalYamlConfig', {
-            defaultMessage: 'Elasticsearch output configuration (YAML)',
-          })}
-          fullWidth
-        >
-          <EuiCodeEditor
-            width="100%"
-            mode="yaml"
-            theme="textmate"
-            placeholder="# YAML settings here will be added to the Elasticsearch output section of each policy"
-            setOptions={{
-              minLines: 10,
-              maxLines: 30,
-              tabSize: 2,
-              showGutter: false,
-              showPrintMargin: false,
-            }}
-            {...inputs.additionalYamlConfig.props}
-            onChange={inputs.additionalYamlConfig.setValue}
-          />
-        </EuiFormRow>
-      </EuiPanel>
-    </EuiForm>
-  );
-
-  return (
-    <>
-      {isConfirmModalVisible && (
-        <SettingsConfirmModal
-          changes={changes}
-          onConfirm={onConfirm}
-          onClose={onConfirmModalClose}
-        />
-      )}
-      <EuiFlyout onClose={onClose} size="m">
-        <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerSettingsFlyoutTitle">
-          <EuiTitle size="m">
-            <h2 id="IngestManagerSettingsFlyoutTitle">
-              <FormattedMessage
-                id="xpack.fleet.settings.flyoutTitle"
-                defaultMessage="Fleet settings"
-              />
-            </h2>
-          </EuiTitle>
-        </EuiFlyoutHeader>
-        <EuiFlyoutBody>{body}</EuiFlyoutBody>
-        <EuiFlyoutFooter>
-          <EuiFlexGroup justifyContent="spaceBetween">
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty onClick={onClose} flush="left">
-                <FormattedMessage
-                  id="xpack.fleet.settings.cancelButtonLabel"
-                  defaultMessage="Cancel"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButton
-                disabled={!isUpdated}
-                onClick={onSubmit}
-                isLoading={isLoading}
-                color="primary"
-                fill
-              >
-                {isLoading ? (
-                  <FormattedMessage
-                    id="xpack.fleet.settings.saveButtonLoadingLabel"
-                    defaultMessage="Applying settings..."
-                  />
-                ) : (
-                  <FormattedMessage
-                    id="xpack.fleet.settings.saveButtonLabel"
-                    defaultMessage="Save and apply settings"
-                  />
-                )}
-              </EuiButton>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlyoutFooter>
-      </EuiFlyout>
-    </>
-  );
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/constants/index.ts b/x-pack/plugins/fleet/public/applications/fleet/constants/index.ts
index bbf14dcae45fc..aafaac157034a 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/constants/index.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/constants/index.ts
@@ -5,21 +5,4 @@
  * 2.0.
  */
 
-export {
-  PLUGIN_ID,
-  EPM_API_ROUTES,
-  AGENT_API_ROUTES,
-  SO_SEARCH_LIMIT,
-  AGENT_POLICY_SAVED_OBJECT_TYPE,
-  AGENT_SAVED_OBJECT_TYPE,
-  ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
-  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
-  FLEET_SERVER_PACKAGE,
-  // Fleet Server index
-  AGENTS_INDEX,
-  ENROLLMENT_API_KEYS_INDEX,
-} from '../../../../common';
-
-export * from './page_paths';
-
-export const INDEX_NAME = '.kibana';
+export * from '../../../constants';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts b/x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts
deleted file mode 100644
index 27df7a4ebf11d..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/constants/page_paths.ts
+++ /dev/null
@@ -1,104 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export type StaticPage =
-  | 'base'
-  | 'overview'
-  | 'integrations'
-  | 'integrations_all'
-  | 'integrations_installed'
-  | 'policies'
-  | 'policies_list'
-  | 'fleet'
-  | 'fleet_enrollment_tokens'
-  | 'data_streams';
-
-export type DynamicPage =
-  | 'integration_details_overview'
-  | 'integration_details_policies'
-  | 'integration_details_settings'
-  | 'integration_details_custom'
-  | 'integration_policy_edit'
-  | 'policy_details'
-  | 'add_integration_from_policy'
-  | 'add_integration_to_policy'
-  | 'edit_integration'
-  | 'fleet_agent_list'
-  | 'fleet_agent_details';
-
-export type Page = StaticPage | DynamicPage;
-
-export interface DynamicPagePathValues {
-  [key: string]: string;
-}
-
-export const BASE_PATH = '/app/fleet';
-
-// If routing paths are changed here, please also check to see if
-// `pagePathGetters()`, below, needs any modifications
-export const PAGE_ROUTING_PATHS = {
-  overview: '/',
-  integrations: '/integrations/:tabId?',
-  integrations_all: '/integrations',
-  integrations_installed: '/integrations/installed',
-  integration_details: '/integrations/detail/:pkgkey/:panel?',
-  integration_details_overview: '/integrations/detail/:pkgkey/overview',
-  integration_details_policies: '/integrations/detail/:pkgkey/policies',
-  integration_details_settings: '/integrations/detail/:pkgkey/settings',
-  integration_details_custom: '/integrations/detail/:pkgkey/custom',
-  integration_policy_edit: '/integrations/edit-integration/:packagePolicyId',
-  policies: '/policies',
-  policies_list: '/policies',
-  policy_details: '/policies/:policyId/:tabId?',
-  policy_details_settings: '/policies/:policyId/settings',
-  add_integration_from_policy: '/policies/:policyId/add-integration',
-  add_integration_to_policy: '/integrations/:pkgkey/add-integration/:integration?',
-  edit_integration: '/policies/:policyId/edit-integration/:packagePolicyId',
-  fleet: '/fleet',
-  fleet_agent_list: '/fleet/agents',
-  fleet_agent_details: '/fleet/agents/:agentId/:tabId?',
-  fleet_agent_details_logs: '/fleet/agents/:agentId/logs',
-  fleet_enrollment_tokens: '/fleet/enrollment-tokens',
-  data_streams: '/data-streams',
-};
-
-export const pagePathGetters: {
-  [key in StaticPage]: () => string;
-} &
-  {
-    [key in DynamicPage]: (values: DynamicPagePathValues) => string;
-  } = {
-  base: () => '/',
-  overview: () => '/',
-  integrations: () => '/integrations',
-  integrations_all: () => '/integrations',
-  integrations_installed: () => '/integrations/installed',
-  integration_details_overview: ({ pkgkey, integration }) =>
-    `/integrations/detail/${pkgkey}/overview${integration ? `?integration=${integration}` : ''}`,
-  integration_details_policies: ({ pkgkey, integration }) =>
-    `/integrations/detail/${pkgkey}/policies${integration ? `?integration=${integration}` : ''}`,
-  integration_details_settings: ({ pkgkey, integration }) =>
-    `/integrations/detail/${pkgkey}/settings${integration ? `?integration=${integration}` : ''}`,
-  integration_details_custom: ({ pkgkey, integration }) =>
-    `/integrations/detail/${pkgkey}/custom${integration ? `?integration=${integration}` : ''}`,
-  integration_policy_edit: ({ packagePolicyId }) =>
-    `/integrations/edit-integration/${packagePolicyId}`,
-  policies: () => '/policies',
-  policies_list: () => '/policies',
-  policy_details: ({ policyId, tabId }) => `/policies/${policyId}${tabId ? `/${tabId}` : ''}`,
-  add_integration_from_policy: ({ policyId }) => `/policies/${policyId}/add-integration`,
-  add_integration_to_policy: ({ pkgkey, integration }) =>
-    `/integrations/${pkgkey}/add-integration${integration ? `/${integration}` : ''}`,
-  edit_integration: ({ policyId, packagePolicyId }) =>
-    `/policies/${policyId}/edit-integration/${packagePolicyId}`,
-  fleet: () => '/fleet',
-  fleet_agent_list: ({ kuery }) => `/fleet/agents${kuery ? `?kuery=${kuery}` : ''}`,
-  fleet_agent_details: ({ agentId, tabId, logQuery }) =>
-    `/fleet/agents/${agentId}${tabId ? `/${tabId}` : ''}${logQuery ? `?_q=${logQuery}` : ''}`,
-  fleet_enrollment_tokens: () => '/fleet/enrollment-tokens',
-  data_streams: () => '/data-streams',
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/index.ts b/x-pack/plugins/fleet/public/applications/fleet/hooks/index.ts
index f7176de302fde..7cf16b1b7ae90 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/index.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/hooks/index.ts
@@ -5,21 +5,6 @@
  * 2.0.
  */
 
-export { useCapabilities } from './use_capabilities';
-export { useStartServices } from './use_core';
-export { useConfig, ConfigContext } from './use_config';
-export { useKibanaVersion, KibanaVersionContext } from './use_kibana_version';
-export { licenseService, useLicense } from './use_license';
+export * from '../../../hooks';
+
 export { useBreadcrumbs } from './use_breadcrumbs';
-export { useLink } from './use_link';
-export { useKibanaLink } from './use_kibana_link';
-export { usePackageIconType, UsePackageIconType } from './use_package_icon_type';
-export { usePagination, Pagination, PAGE_SIZE_OPTIONS } from './use_pagination';
-export { useUrlPagination } from './use_url_pagination';
-export { useSorting } from './use_sorting';
-export { useDebounce } from './use_debounce';
-export { useUrlModal } from './use_url_modal';
-export * from './use_request';
-export * from './use_input';
-export * from './use_url_params';
-export * from './use_fleet_status';
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 e10f53741dba9..eeb8f18d17d4f 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
@@ -9,19 +9,33 @@ import { i18n } from '@kbn/i18n';
 import type { ChromeBreadcrumb } from 'src/core/public';
 
 import type { Page, DynamicPagePathValues } from '../constants';
-import { BASE_PATH, pagePathGetters } from '../constants';
+import { FLEET_BASE_PATH, INTEGRATIONS_BASE_PATH, pagePathGetters } from '../constants';
 
-import { useStartServices } from './use_core';
+import { useStartServices } from './';
 
-const BASE_BREADCRUMB: ChromeBreadcrumb = {
-  href: pagePathGetters.overview(),
+interface AdditionalBreadcrumbOptions {
+  useIntegrationsBasePath: boolean;
+}
+
+type Breadcrumb = ChromeBreadcrumb & Partial<AdditionalBreadcrumbOptions>;
+
+const BASE_BREADCRUMB: Breadcrumb = {
+  href: pagePathGetters.overview()[1],
   text: i18n.translate('xpack.fleet.breadcrumbs.appTitle', {
     defaultMessage: 'Fleet',
   }),
 };
 
+const INTEGRATIONS_BASE_BREADCRUMB: Breadcrumb = {
+  href: pagePathGetters.integrations()[1],
+  text: i18n.translate('xpack.fleet.breadcrumbs.integrationsAppTitle', {
+    defaultMessage: 'Integrations',
+  }),
+  useIntegrationsBasePath: true,
+};
+
 const breadcrumbGetters: {
-  [key in Page]?: (values: DynamicPagePathValues) => ChromeBreadcrumb[];
+  [key in Page]?: (values: DynamicPagePathValues) => Breadcrumb[];
 } = {
   base: () => [BASE_BREADCRUMB],
   overview: () => [
@@ -32,66 +46,7 @@ const breadcrumbGetters: {
       }),
     },
   ],
-  integrations: () => [
-    BASE_BREADCRUMB,
-    {
-      text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
-        defaultMessage: 'Integrations',
-      }),
-    },
-  ],
-  integrations_all: () => [
-    BASE_BREADCRUMB,
-    {
-      href: pagePathGetters.integrations(),
-      text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
-        defaultMessage: 'Integrations',
-      }),
-    },
-    {
-      text: i18n.translate('xpack.fleet.breadcrumbs.allIntegrationsPageTitle', {
-        defaultMessage: 'All',
-      }),
-    },
-  ],
-  integrations_installed: () => [
-    BASE_BREADCRUMB,
-    {
-      href: pagePathGetters.integrations(),
-      text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
-        defaultMessage: 'Integrations',
-      }),
-    },
-    {
-      text: i18n.translate('xpack.fleet.breadcrumbs.installedIntegrationsPageTitle', {
-        defaultMessage: 'Installed',
-      }),
-    },
-  ],
-  integration_details_overview: ({ pkgTitle }) => [
-    BASE_BREADCRUMB,
-    {
-      href: pagePathGetters.integrations(),
-      text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
-        defaultMessage: 'Integrations',
-      }),
-    },
-    { text: pkgTitle },
-  ],
-  integration_policy_edit: ({ pkgTitle, pkgkey, policyName }) => [
-    BASE_BREADCRUMB,
-    {
-      href: pagePathGetters.integrations(),
-      text: i18n.translate('xpack.fleet.breadcrumbs.integrationPageTitle', {
-        defaultMessage: 'Integration',
-      }),
-    },
-    {
-      href: pagePathGetters.integration_details_policies({ pkgkey }),
-      text: pkgTitle,
-    },
-    { text: policyName },
-  ],
+
   policies: () => [
     BASE_BREADCRUMB,
     {
@@ -111,7 +66,7 @@ const breadcrumbGetters: {
   policy_details: ({ policyName }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.policies(),
+      href: pagePathGetters.policies()[1],
       text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
         defaultMessage: 'Policies',
       }),
@@ -121,13 +76,13 @@ const breadcrumbGetters: {
   add_integration_from_policy: ({ policyName, policyId }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.policies(),
+      href: pagePathGetters.policies()[1],
       text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
         defaultMessage: 'Policies',
       }),
     },
     {
-      href: pagePathGetters.policy_details({ policyId }),
+      href: pagePathGetters.policy_details({ policyId })[1],
       text: policyName,
     },
     {
@@ -137,16 +92,11 @@ const breadcrumbGetters: {
     },
   ],
   add_integration_to_policy: ({ pkgTitle, pkgkey }) => [
-    BASE_BREADCRUMB,
-    {
-      href: pagePathGetters.integrations(),
-      text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
-        defaultMessage: 'Integrations',
-      }),
-    },
+    INTEGRATIONS_BASE_BREADCRUMB,
     {
-      href: pagePathGetters.integration_details_overview({ pkgkey }),
+      href: pagePathGetters.integration_details_overview({ pkgkey })[1],
       text: pkgTitle,
+      useIntegrationsBasePath: true,
     },
     {
       text: i18n.translate('xpack.fleet.breadcrumbs.addPackagePolicyPageTitle', {
@@ -157,13 +107,13 @@ const breadcrumbGetters: {
   edit_integration: ({ policyName, policyId }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.policies(),
+      href: pagePathGetters.policies()[1],
       text: i18n.translate('xpack.fleet.breadcrumbs.policiesPageTitle', {
         defaultMessage: 'Policies',
       }),
     },
     {
-      href: pagePathGetters.policy_details({ policyId }),
+      href: pagePathGetters.policy_details({ policyId })[1],
       text: policyName,
     },
     {
@@ -191,7 +141,7 @@ const breadcrumbGetters: {
   fleet_agent_details: ({ agentHost }) => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.fleet(),
+      href: pagePathGetters.fleet()[1],
       text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', {
         defaultMessage: 'Agents',
       }),
@@ -201,7 +151,7 @@ const breadcrumbGetters: {
   fleet_enrollment_tokens: () => [
     BASE_BREADCRUMB,
     {
-      href: pagePathGetters.fleet(),
+      href: pagePathGetters.fleet()[1],
       text: i18n.translate('xpack.fleet.breadcrumbs.agentsPageTitle', {
         defaultMessage: 'Agents',
       }),
@@ -224,10 +174,16 @@ const breadcrumbGetters: {
 
 export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
   const { chrome, http } = useStartServices();
-  const breadcrumbs: ChromeBreadcrumb[] =
+  const breadcrumbs =
     breadcrumbGetters[page]?.(values).map((breadcrumb) => ({
       ...breadcrumb,
-      href: breadcrumb.href ? http.basePath.prepend(`${BASE_PATH}#${breadcrumb.href}`) : undefined,
+      href: breadcrumb.href
+        ? http.basePath.prepend(
+            `${breadcrumb.useIntegrationsBasePath ? INTEGRATIONS_BASE_PATH : FLEET_BASE_PATH}#${
+              breadcrumb.href
+            }`
+          )
+        : undefined,
     })) || [];
   const docTitle: string[] = [...breadcrumbs]
     .reverse()
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_link.ts b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_link.ts
deleted file mode 100644
index 5c31f6fc4158e..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_link.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { BASE_PATH, pagePathGetters, PLUGIN_ID } from '../constants';
-import type { StaticPage, DynamicPage, DynamicPagePathValues } from '../constants';
-
-import { useStartServices } from './';
-
-const getPath = (page: StaticPage | DynamicPage, values: DynamicPagePathValues = {}): string => {
-  return values ? pagePathGetters[page](values) : pagePathGetters[page as StaticPage]();
-};
-
-export const useLink = () => {
-  const core = useStartServices();
-  return {
-    getPath,
-    getAssetsPath: (path: string) =>
-      core.http.basePath.prepend(`/plugins/${PLUGIN_ID}/assets/${path}`),
-    getHref: (page: StaticPage | DynamicPage, values?: DynamicPagePathValues) => {
-      const path = getPath(page, values);
-      return core.http.basePath.prepend(`${BASE_PATH}#${path}`);
-    },
-  };
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/index.ts b/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/index.ts
deleted file mode 100644
index 23358e0397e11..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/index.ts
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { setHttpClient, sendRequest, useRequest } from './use_request';
-export * from './agent_policy';
-export * from './package_policy';
-export * from './data_stream';
-export * from './agents';
-export * from './enrollment_api_keys';
-export * from './epm';
-export * from './outputs';
-export * from './settings';
-export * from './setup';
-export * from './app';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx
index 4ff5243483a3a..49836e9ed4ca6 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/layouts/default.tsx
@@ -22,6 +22,7 @@ import { AlphaMessaging, SettingFlyout } from '../components';
 import { useLink, useConfig, useUrlModal } from '../hooks';
 
 interface Props {
+  showNav?: boolean;
   showSettings?: boolean;
   section?: Section;
   children?: React.ReactNode;
@@ -54,6 +55,7 @@ const Nav = styled.nav`
 `;
 
 export const DefaultLayout: React.FunctionComponent<Props> = ({
+  showNav = true,
   showSettings = true,
   section,
   children,
@@ -76,74 +78,70 @@ export const DefaultLayout: React.FunctionComponent<Props> = ({
 
       <Container>
         <Wrapper>
-          <Nav>
-            <EuiFlexGroup gutterSize="l" alignItems="center">
-              <EuiFlexItem>
-                <EuiTabs display="condensed">
-                  <EuiTab isSelected={section === 'overview'} href={getHref('overview')}>
-                    <FormattedMessage
-                      id="xpack.fleet.appNavigation.overviewLinkText"
-                      defaultMessage="Overview"
-                    />
-                  </EuiTab>
-                  <EuiTab isSelected={section === 'epm'} href={getHref('integrations_all')}>
-                    <FormattedMessage
-                      id="xpack.fleet.appNavigation.epmLinkText"
-                      defaultMessage="Integrations"
-                    />
-                  </EuiTab>
-                  <EuiTab isSelected={section === 'agent_policy'} href={getHref('policies_list')}>
-                    <FormattedMessage
-                      id="xpack.fleet.appNavigation.policiesLinkText"
-                      defaultMessage="Policies"
-                    />
-                  </EuiTab>
-                  <EuiTab
-                    isSelected={section === 'fleet'}
-                    href={getHref('fleet')}
-                    disabled={!agents?.enabled}
-                  >
-                    <FormattedMessage
-                      id="xpack.fleet.appNavigation.agentsLinkText"
-                      defaultMessage="Agents"
-                    />
-                  </EuiTab>
-                  <EuiTab isSelected={section === 'data_stream'} href={getHref('data_streams')}>
-                    <FormattedMessage
-                      id="xpack.fleet.appNavigation.dataStreamsLinkText"
-                      defaultMessage="Data streams"
-                    />
-                  </EuiTab>
-                </EuiTabs>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false}>
-                <EuiFlexGroup gutterSize="s" direction="row">
-                  <EuiFlexItem>
-                    <EuiButtonEmpty
-                      iconType="popout"
-                      href="https://ela.st/fleet-feedback"
-                      target="_blank"
+          {showNav ? (
+            <Nav>
+              <EuiFlexGroup gutterSize="l" alignItems="center">
+                <EuiFlexItem>
+                  <EuiTabs display="condensed">
+                    <EuiTab isSelected={section === 'overview'} href={getHref('overview')}>
+                      <FormattedMessage
+                        id="xpack.fleet.appNavigation.overviewLinkText"
+                        defaultMessage="Overview"
+                      />
+                    </EuiTab>
+                    <EuiTab isSelected={section === 'agent_policy'} href={getHref('policies_list')}>
+                      <FormattedMessage
+                        id="xpack.fleet.appNavigation.policiesLinkText"
+                        defaultMessage="Policies"
+                      />
+                    </EuiTab>
+                    <EuiTab
+                      isSelected={section === 'fleet'}
+                      href={getHref('fleet')}
+                      disabled={!agents?.enabled}
                     >
                       <FormattedMessage
-                        id="xpack.fleet.appNavigation.sendFeedbackButton"
-                        defaultMessage="Send feedback"
+                        id="xpack.fleet.appNavigation.agentsLinkText"
+                        defaultMessage="Agents"
+                      />
+                    </EuiTab>
+                    <EuiTab isSelected={section === 'data_stream'} href={getHref('data_streams')}>
+                      <FormattedMessage
+                        id="xpack.fleet.appNavigation.dataStreamsLinkText"
+                        defaultMessage="Data streams"
                       />
-                    </EuiButtonEmpty>
-                  </EuiFlexItem>
-                  {showSettings ? (
+                    </EuiTab>
+                  </EuiTabs>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiFlexGroup gutterSize="s" direction="row">
                     <EuiFlexItem>
-                      <EuiButtonEmpty iconType="gear" href={getModalHref('settings')}>
+                      <EuiButtonEmpty
+                        iconType="popout"
+                        href="https://ela.st/fleet-feedback"
+                        target="_blank"
+                      >
                         <FormattedMessage
-                          id="xpack.fleet.appNavigation.settingsButton"
-                          defaultMessage="Fleet settings"
+                          id="xpack.fleet.appNavigation.sendFeedbackButton"
+                          defaultMessage="Send feedback"
                         />
                       </EuiButtonEmpty>
                     </EuiFlexItem>
-                  ) : null}
-                </EuiFlexGroup>
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </Nav>
+                    {showSettings ? (
+                      <EuiFlexItem>
+                        <EuiButtonEmpty iconType="gear" href={getModalHref('settings')}>
+                          <FormattedMessage
+                            id="xpack.fleet.appNavigation.settingsButton"
+                            defaultMessage="Fleet settings"
+                          />
+                        </EuiButtonEmpty>
+                      </EuiFlexItem>
+                    ) : null}
+                  </EuiFlexGroup>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </Nav>
+          ) : null}
           {children}
         </Wrapper>
         <AlphaMessaging />
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx
index cf84a29b84d44..71cb8d3aeeb36 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/layouts/index.tsx
@@ -5,6 +5,6 @@
  * 2.0.
  */
 
+export * from '../../../layouts';
+
 export { DefaultLayout } from './default';
-export { WithHeaderLayout, WithHeaderLayoutProps } from './with_header';
-export { WithoutHeaderLayout } from './without_header';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/create_test_renderer.tsx b/x-pack/plugins/fleet/public/applications/fleet/mock/create_test_renderer.tsx
deleted file mode 100644
index c1fa1422fa8ab..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/mock/create_test_renderer.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 type { History } from 'history';
-import { createMemoryHistory, createHashHistory } from 'history';
-import React, { memo } from 'react';
-import type { RenderOptions, RenderResult } from '@testing-library/react';
-import { render as reactRender, act } from '@testing-library/react';
-
-import { ScopedHistory } from '../../../../../../../src/core/public';
-import { FleetAppContext } from '../app';
-import type { FleetConfigType } from '../../../plugin';
-import type { UIExtensionsStorage } from '../types';
-
-import { createConfigurationMock } from './plugin_configuration';
-import { createStartMock } from './plugin_interfaces';
-import { createStartServices } from './fleet_start_services';
-import type { MockedFleetStart, MockedFleetStartServices } from './types';
-
-type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
-
-/**
- * Test Renderer that includes mocked services and interfaces used during Fleet applicaiton rendering.
- * Any of the properties in this interface can be manipulated prior to `render()` if wanting to customize
- * the rendering context.
- */
-export interface TestRenderer {
-  /** History instance currently used by the Fleet UI Hash Router */
-  history: History<any>;
-  /** history instance provided to the Fleet plugin during application `mount()` */
-  mountHistory: ScopedHistory;
-  startServices: MockedFleetStartServices;
-  config: FleetConfigType;
-  /** The Interface returned by the Fleet plugin `start()` phase */
-  startInterface: MockedFleetStart;
-  kibanaVersion: string;
-  AppWrapper: React.FC<any>;
-  render: UiRender;
-}
-
-export const createTestRendererMock = (): TestRenderer => {
-  const basePath = '/mock';
-  const extensions: UIExtensionsStorage = {};
-  const startServices = createStartServices(basePath);
-  const testRendererMocks: TestRenderer = {
-    history: createHashHistory(),
-    mountHistory: new ScopedHistory(createMemoryHistory({ initialEntries: [basePath] }), basePath),
-    startServices,
-    config: createConfigurationMock(),
-    startInterface: createStartMock(extensions),
-    kibanaVersion: '8.0.0',
-    AppWrapper: memo(({ children }) => {
-      return (
-        <FleetAppContext
-          basepath={basePath}
-          startServices={testRendererMocks.startServices}
-          config={testRendererMocks.config}
-          history={testRendererMocks.mountHistory}
-          kibanaVersion={testRendererMocks.kibanaVersion}
-          extensions={extensions}
-          routerHistory={testRendererMocks.history}
-        >
-          {children}
-        </FleetAppContext>
-      );
-    }),
-    render: (ui, options) => {
-      let renderResponse: RenderResult;
-      act(() => {
-        renderResponse = reactRender(ui, {
-          wrapper: testRendererMocks.AppWrapper,
-          ...options,
-        });
-      });
-      return renderResponse!;
-    },
-  };
-
-  return testRendererMocks;
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_dependencies.ts b/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_dependencies.ts
deleted file mode 100644
index d7725830afb41..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_dependencies.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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { dataPluginMock } from '../../../../../../../src/plugins/data/public/mocks';
-import { licensingMock } from '../../../../../licensing/public/mocks';
-import { homePluginMock } from '../../../../../../../src/plugins/home/public/mocks';
-
-import type { MockedFleetSetupDeps, MockedFleetStartDeps } from './types';
-
-export const createSetupDepsMock = (): MockedFleetSetupDeps => {
-  return {
-    licensing: licensingMock.createSetup(),
-    data: dataPluginMock.createSetupContract(),
-    home: homePluginMock.createSetupContract(),
-  };
-};
-
-export const createStartDepsMock = (): MockedFleetStartDeps => {
-  return {
-    data: dataPluginMock.createStartContract(),
-  };
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/types.ts b/x-pack/plugins/fleet/public/applications/fleet/mock/types.ts
deleted file mode 100644
index b1a1ddc4a582f..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/mock/types.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 type { MockedKeys } from '@kbn/utility-types/jest';
-
-import type {
-  FleetSetupDeps,
-  FleetStart,
-  FleetStartDeps,
-  FleetStartServices,
-} from '../../../plugin';
-
-export type MockedFleetStartServices = MockedKeys<FleetStartServices>;
-
-export type MockedFleetSetupDeps = MockedKeys<FleetSetupDeps>;
-
-export type MockedFleetStartDeps = MockedKeys<FleetStartDeps>;
-
-export type MockedFleetStart = MockedKeys<FleetStart>;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/index.ts b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/index.ts
index c65157697cc86..09282a7de7cb9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/index.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/components/index.ts
@@ -5,12 +5,14 @@
  * 2.0.
  */
 
+// TODO: Does this need to be re-exported here?
+export { LinkedAgentCount } from '../../../components';
+
 export { AgentPolicyForm, agentPolicyFormValidation } from './agent_policy_form';
 export { AgentPolicyCopyProvider } from './agent_policy_copy_provider';
 export { AgentPolicyDeleteProvider } from './agent_policy_delete_provider';
 export { PackagePolicyDeleteProvider } from './package_policy_delete_provider';
 export { AgentPolicyYamlFlyout } from './agent_policy_yaml_flyout';
-export { LinkedAgentCount } from '../../../components/linked_agent_count';
 export { ConfirmDeployAgentPolicyModal } from './confirm_deploy_modal';
 export { DangerEuiContextMenuItem } from './danger_eui_context_menu_item';
 export { AgentPolicyActionMenu } from './actions_menu';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/layout.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/layout.tsx
index 4aaf5343638be..d2bc49bdf00e0 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/layout.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/layout.tsx
@@ -20,7 +20,7 @@ import {
 
 import { WithHeaderLayout } from '../../../../layouts';
 import type { AgentPolicy, PackageInfo } from '../../../../types';
-import { PackageIcon } from '../../../../components/package_icon';
+import { PackageIcon } from '../../../../components';
 import type { CreatePackagePolicyFrom } from '../types';
 
 export const CreatePackagePolicyPageLayout: React.FunctionComponent<{
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/multi_text_input.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/multi_text_input.test.tsx
new file mode 100644
index 0000000000000..9c8325446678d
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/multi_text_input.test.tsx
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { fireEvent, act } from '@testing-library/react';
+
+import { createFleetTestRendererMock } from '../../../../../../mock';
+
+import { MultiTextInput } from './multi_text_input';
+
+function renderInput(value = ['value1']) {
+  const renderer = createFleetTestRendererMock();
+  const mockOnChange = jest.fn();
+
+  const utils = renderer.render(<MultiTextInput value={value} onChange={mockOnChange} />);
+
+  return { utils, mockOnChange };
+}
+
+test('it should allow to add a new value', async () => {
+  const { utils, mockOnChange } = renderInput();
+
+  const addRowEl = await utils.findByText('Add row');
+  fireEvent.click(addRowEl);
+
+  expect(mockOnChange).toHaveBeenCalledWith(['value1']);
+
+  const inputEl = await utils.findByDisplayValue('');
+  expect(inputEl).toBeDefined();
+
+  fireEvent.change(inputEl, { target: { value: 'value2' } });
+
+  expect(mockOnChange).toHaveBeenCalledWith(['value1', 'value2']);
+});
+
+test('it should not show the delete button if there only one row', async () => {
+  const { utils } = renderInput(['value1']);
+
+  await act(async () => {
+    const deleteRowEl = await utils.container.querySelector('[aria-label="Delete row"]');
+    expect(deleteRowEl).toBeNull();
+  });
+});
+
+test('it should allow to update  existing value', async () => {
+  const { utils, mockOnChange } = renderInput(['value1', 'value2']);
+
+  const inputEl = await utils.findByDisplayValue('value1');
+  expect(inputEl).toBeDefined();
+
+  fireEvent.change(inputEl, { target: { value: 'value1updated' } });
+
+  expect(mockOnChange).toHaveBeenCalledWith(['value1updated', 'value2']);
+});
+
+test('it should allow to remove a row', async () => {
+  const { utils, mockOnChange } = renderInput(['value1', 'value2']);
+
+  await act(async () => {
+    const deleteRowEl = await utils.container.querySelector('[aria-label="Delete row"]');
+    if (!deleteRowEl) {
+      throw new Error('Delete row button not found');
+    }
+    fireEvent.click(deleteRowEl);
+  });
+
+  expect(mockOnChange).toHaveBeenCalledWith(['value2']);
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/multi_text_input.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/multi_text_input.tsx
new file mode 100644
index 0000000000000..e4e724199b493
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/components/multi_text_input.tsx
@@ -0,0 +1,170 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, useState, useEffect } from 'react';
+import type { FunctionComponent, ChangeEvent } from 'react';
+
+import {
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButtonEmpty,
+  EuiFieldText,
+  EuiButtonIcon,
+  EuiSpacer,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+interface Props {
+  value: string[];
+  onChange: (newValue: string[]) => void;
+  onBlur?: () => void;
+  errors?: Array<{ message: string; index?: number }>;
+  isInvalid?: boolean;
+  isDisabled?: boolean;
+}
+
+interface RowProps {
+  index: number;
+  value: string;
+  onChange: (index: number, value: string) => void;
+  onDelete: (index: number) => void;
+  onBlur?: () => void;
+  autoFocus?: boolean;
+  isDisabled?: boolean;
+  showDeleteButton?: boolean;
+}
+
+const Row: FunctionComponent<RowProps> = ({
+  index,
+  value,
+  onChange,
+  onDelete,
+  onBlur,
+  autoFocus,
+  isDisabled,
+  showDeleteButton,
+}) => {
+  const onDeleteHandler = useCallback(() => {
+    onDelete(index);
+  }, [onDelete, index]);
+
+  const onChangeHandler = useCallback(
+    (e: ChangeEvent<HTMLInputElement>) => {
+      onChange(index, e.target.value);
+    },
+    [onChange, index]
+  );
+
+  return (
+    <EuiFlexGroup alignItems="center" gutterSize="none" responsive={false}>
+      <EuiFlexItem>
+        <EuiFieldText
+          fullWidth
+          value={value}
+          onChange={onChangeHandler}
+          autoFocus={autoFocus}
+          disabled={isDisabled}
+          onBlur={onBlur}
+        />
+      </EuiFlexItem>
+      {showDeleteButton && (
+        <EuiFlexItem grow={false}>
+          <EuiButtonIcon
+            color="text"
+            onClick={onDeleteHandler}
+            iconType="cross"
+            disabled={isDisabled}
+            aria-label={i18n.translate('xpack.fleet.multiTextInput.deleteRowButton', {
+              defaultMessage: 'Delete row',
+            })}
+          />
+        </EuiFlexItem>
+      )}
+    </EuiFlexGroup>
+  );
+};
+
+function defaultValue(value: string[]) {
+  return value.length > 0 ? value : [''];
+}
+
+export const MultiTextInput: FunctionComponent<Props> = ({
+  value,
+  onChange,
+  onBlur,
+  isInvalid,
+  isDisabled,
+  errors,
+}) => {
+  const [autoFocus, setAutoFocus] = useState(false);
+  const [rows, setRows] = useState(() => defaultValue(value));
+  const [previousRows, setPreviousRows] = useState(rows);
+
+  useEffect(() => {
+    if (previousRows === rows) {
+      return;
+    }
+    setPreviousRows(rows);
+    if (rows[rows.length - 1] === '') {
+      onChange(rows.slice(0, rows.length - 1));
+    } else {
+      onChange(rows);
+    }
+  }, [onChange, previousRows, rows]);
+
+  const onDeleteHandler = useCallback(
+    (idx: number) => {
+      setRows([...rows.slice(0, idx), ...rows.slice(idx + 1)]);
+    },
+    [rows]
+  );
+
+  const onChangeHandler = useCallback(
+    (idx: number, newValue: string) => {
+      const newRows = [...rows];
+      newRows[idx] = newValue;
+      setRows(newRows);
+    },
+    [rows]
+  );
+
+  const addRowHandler = useCallback(() => {
+    setAutoFocus(true);
+    setRows([...rows, '']);
+  }, [rows]);
+
+  return (
+    <>
+      <EuiFlexGroup gutterSize="s" direction="column">
+        {rows.map((row, idx) => (
+          <EuiFlexItem key={idx}>
+            <Row
+              index={idx}
+              onChange={onChangeHandler}
+              onDelete={onDeleteHandler}
+              onBlur={onBlur}
+              value={row}
+              autoFocus={autoFocus}
+              isDisabled={isDisabled}
+              showDeleteButton={rows.length > 1}
+            />
+          </EuiFlexItem>
+        ))}
+      </EuiFlexGroup>
+      <EuiSpacer size="m" />
+      <EuiButtonEmpty
+        disabled={isDisabled}
+        size="xs"
+        flush="left"
+        iconType="plusInCircle"
+        onClick={addRowHandler}
+      >
+        <FormattedMessage id="xpack.fleet.multiTextInput.addRow" defaultMessage="Add row" />
+      </EuiButtonEmpty>
+    </>
+  );
+};
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 7841e8bb62452..eed94de97113d 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
@@ -12,7 +12,6 @@ import {
   EuiFormRow,
   EuiSwitch,
   EuiFieldText,
-  EuiComboBox,
   EuiText,
   EuiCodeEditor,
   EuiTextArea,
@@ -23,6 +22,7 @@ import type { RegistryVarsEntry } from '../../../../types';
 
 import 'brace/mode/yaml';
 import 'brace/theme/textmate';
+import { MultiTextInput } from './multi_text_input';
 
 export const PackagePolicyInputVarField: React.FunctionComponent<{
   varDef: RegistryVarsEntry;
@@ -41,16 +41,9 @@ export const PackagePolicyInputVarField: React.FunctionComponent<{
   const field = useMemo(() => {
     if (multi) {
       return (
-        <EuiComboBox
-          noSuggestions
-          isInvalid={isInvalid}
-          selectedOptions={value.map((val: string) => ({ label: val }))}
-          onCreateOption={(newVal: any) => {
-            onChange([...value, newVal]);
-          }}
-          onChange={(newVals: any[]) => {
-            onChange(newVals.map((val) => val.label));
-          }}
+        <MultiTextInput
+          value={value}
+          onChange={onChange}
           onBlur={() => setIsDirty(true)}
           isDisabled={frozen}
         />
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 11c672aa0596d..a624d8ced9180 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
@@ -9,26 +9,27 @@ import { Route } from 'react-router-dom';
 import React from 'react';
 import { act } from 'react-test-renderer';
 
-import type { MockedFleetStartServices, TestRenderer } from '../../../mock';
-import { createTestRendererMock } from '../../../mock';
-import { PAGE_ROUTING_PATHS, pagePathGetters, PLUGIN_ID } from '../../../constants';
+import type { MockedFleetStartServices, TestRenderer } from '../../../../../mock';
+import { createFleetTestRendererMock } from '../../../../../mock';
+import { FLEET_ROUTING_PATHS, pagePathGetters, PLUGIN_ID } from '../../../constants';
 import type { CreatePackagePolicyRouteState } from '../../../types';
 
 import { CreatePackagePolicyPage } from './index';
 
 describe('when on the package policy create page', () => {
-  const createPageUrlPath = pagePathGetters.add_integration_to_policy({ pkgkey: 'nginx-0.3.7' });
+  const createPageUrlPath = pagePathGetters.add_integration_to_policy({ pkgkey: 'nginx-0.3.7' })[1];
+
   let testRenderer: TestRenderer;
   let renderResult: ReturnType<typeof testRenderer.render>;
   const render = () =>
     (renderResult = testRenderer.render(
-      <Route path={PAGE_ROUTING_PATHS.add_integration_to_policy}>
+      <Route path={FLEET_ROUTING_PATHS.add_integration_to_policy}>
         <CreatePackagePolicyPage />
       </Route>
     ));
 
   beforeEach(() => {
-    testRenderer = createTestRendererMock();
+    testRenderer = createFleetTestRendererMock();
     mockApiCalls(testRenderer.startServices.http);
     testRenderer.history.push(createPageUrlPath);
   });
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
index 55861726af466..6563918a5efb2 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/index.tsx
@@ -39,12 +39,11 @@ import {
 } from '../../../hooks';
 import { Loading } from '../../../components';
 import { ConfirmDeployAgentPolicyModal } from '../components';
-import { useIntraAppState } from '../../../hooks/use_intra_app_state';
-import { useUIExtension } from '../../../hooks/use_ui_extension';
-import { ExtensionWrapper } from '../../../components/extension_wrapper';
+import { useIntraAppState, useUIExtension } from '../../../hooks';
+import { ExtensionWrapper } from '../../../components';
 import type { PackagePolicyEditExtensionComponentProps } from '../../../types';
 import { PLUGIN_ID } from '../../../../../../common/constants';
-import { pkgKeyFromPackageInfo } from '../../../services/pkg_key_from_package_info';
+import { pkgKeyFromPackageInfo } from '../../../services';
 
 import { CreatePackagePolicyPageLayout } from './components';
 import type { CreatePackagePolicyFrom, PackagePolicyFormState } from './types';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
index 26a31a1394f78..380e49a1d8dd9 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_define_package_policy.tsx
@@ -27,9 +27,8 @@ import type {
   NewPackagePolicy,
   RegistryVarsEntry,
 } from '../../../types';
-import { packageToPackagePolicy } from '../../../services';
+import { packageToPackagePolicy, pkgKeyFromPackageInfo } from '../../../services';
 import { Loading } from '../../../components';
-import { pkgKeyFromPackageInfo } from '../../../services/pkg_key_from_package_info';
 
 import { isAdvancedVar } from './services';
 import type { PackagePolicyValidationResults } from './services';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_select_package.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_select_package.tsx
index 80faba37e9a43..50c63274b5e85 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_select_package.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/create_package_policy_page/step_select_package.tsx
@@ -10,7 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiSelectable, EuiSpacer } from '@elastic/eui';
 
-import { Error } from '../../../components';
+import { Error, PackageIcon } from '../../../components';
 import type { AgentPolicy, PackageInfo, PackagePolicy, GetPackagesResponse } from '../../../types';
 import {
   useGetOneAgentPolicy,
@@ -18,8 +18,7 @@ import {
   useGetLimitedPackages,
   sendGetPackageInfoByKey,
 } from '../../../hooks';
-import { PackageIcon } from '../../../components/package_icon';
-import { pkgKeyFromPackageInfo } from '../../../services/pkg_key_from_package_info';
+import { pkgKeyFromPackageInfo } from '../../../services';
 
 export const StepSelectPackage: React.FunctionComponent<{
   agentPolicyId: string;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/hooks/use_agent_status.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/hooks/use_agent_status.tsx
index 1147e9cf254fa..4a92e44436fcd 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/hooks/use_agent_status.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/hooks/use_agent_status.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 
+import type { UseRequestConfig } from '../../../../hooks';
 import { useRequest } from '../../../../hooks';
 import type { GetAgentStatusResponse } from '../../../../types';
 import { agentRouteService } from '../../../../services';
-import type { UseRequestConfig } from '../../../../hooks/use_request/use_request';
 
 type RequestOptions = Pick<Partial<UseRequestConfig>, 'pollIntervalMs'>;
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
index e96ef83224013..7138abb081a77 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/details_page/index.tsx
@@ -26,18 +26,18 @@ import type { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab'
 import styled from 'styled-components';
 
 import type { AgentPolicy, AgentPolicyDetailsDeployAgentAction } from '../../../types';
-import { PAGE_ROUTING_PATHS } from '../../../constants';
+import { FLEET_ROUTING_PATHS } from '../../../constants';
 import {
   useGetOneAgentPolicy,
   useLink,
   useBreadcrumbs,
   useStartServices,
   useFleetStatus,
+  useIntraAppState,
 } from '../../../hooks';
 import { Loading, Error } from '../../../components';
 import { WithHeaderLayout } from '../../../layouts';
 import { LinkedAgentCount, AgentPolicyActionMenu } from '../components';
-import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 
 import { AgentPolicyRefreshContext, useGetAgentStatus, AgentStatusRefreshContext } from './hooks';
 import { PackagePoliciesView, SettingsView } from './components';
@@ -327,13 +327,13 @@ const AgentPolicyDetailsContent: React.FunctionComponent<{ agentPolicy: AgentPol
   return (
     <Switch>
       <Route
-        path={PAGE_ROUTING_PATHS.policy_details_settings}
+        path={FLEET_ROUTING_PATHS.policy_details_settings}
         render={() => {
           return <SettingsView agentPolicy={agentPolicy} />;
         }}
       />
       <Route
-        path={PAGE_ROUTING_PATHS.policy_details}
+        path={FLEET_ROUTING_PATHS.policy_details}
         render={() => {
           return <PackagePoliciesView agentPolicy={agentPolicy} />;
         }}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
index 3b9b5696ff7bd..fb3603aaef7f4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/edit_package_policy_page/index.tsx
@@ -24,13 +24,14 @@ import {
   useBreadcrumbs,
   useStartServices,
   useConfig,
+  useUIExtension,
   sendUpdatePackagePolicy,
   sendGetAgentStatus,
   sendGetOneAgentPolicy,
   sendGetOnePackagePolicy,
   sendGetPackageInfoByKey,
 } from '../../../hooks';
-import { Loading, Error } from '../../../components';
+import { Loading, Error, ExtensionWrapper } from '../../../components';
 import { ConfirmDeployAgentPolicyModal } from '../components';
 import { CreatePackagePolicyPageLayout } from '../create_package_policy_page/components';
 import type { PackagePolicyValidationResults } from '../create_package_policy_page/services';
@@ -41,11 +42,9 @@ import type {
 } from '../create_package_policy_page/types';
 import { StepConfigurePackagePolicy } from '../create_package_policy_page/step_configure_package';
 import { StepDefinePackagePolicy } from '../create_package_policy_page/step_define_package_policy';
-import { useUIExtension } from '../../../hooks/use_ui_extension';
-import { ExtensionWrapper } from '../../../components/extension_wrapper';
 import type { GetOnePackagePolicyResponse } from '../../../../../../common/types/rest_spec';
 import type { PackagePolicyEditExtensionComponentProps } from '../../../types';
-import { pkgKeyFromPackageInfo } from '../../../services/pkg_key_from_package_info';
+import { pkgKeyFromPackageInfo } from '../../../services';
 
 export const EditPackagePolicyPage = memo(() => {
   const {
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx
index 345a4b4afa935..c0ec811ce2bcd 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agent_policy/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { HashRouter as Router, Switch, Route } from 'react-router-dom';
 
-import { PAGE_ROUTING_PATHS } from '../../constants';
+import { FLEET_ROUTING_PATHS } from '../../constants';
 import { useBreadcrumbs } from '../../hooks';
 
 import { AgentPolicyListPage } from './list_page';
@@ -22,16 +22,16 @@ export const AgentPolicyApp: React.FunctionComponent = () => {
   return (
     <Router>
       <Switch>
-        <Route path={PAGE_ROUTING_PATHS.edit_integration}>
+        <Route path={FLEET_ROUTING_PATHS.edit_integration}>
           <EditPackagePolicyPage />
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.add_integration_from_policy}>
+        <Route path={FLEET_ROUTING_PATHS.add_integration_from_policy}>
           <CreatePackagePolicyPage />
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.policy_details}>
+        <Route path={FLEET_ROUTING_PATHS.policy_details}>
           <AgentPolicyDetailsPage />
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.policies_list}>
+        <Route path={FLEET_ROUTING_PATHS.policies_list}>
           <AgentPolicyListPage />
         </Route>
       </Switch>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx
index 56b99f645f97c..dd6611d581e89 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/agent_details_page/index.tsx
@@ -23,7 +23,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiIconTip } from '@elastic/eui';
 
 import type { Agent, AgentPolicy, AgentDetailsReassignPolicyAction } from '../../../types';
-import { PAGE_ROUTING_PATHS } from '../../../constants';
+import { FLEET_ROUTING_PATHS } from '../../../constants';
 import { Loading, Error } from '../../../components';
 import {
   useGetOneAgent,
@@ -32,10 +32,10 @@ import {
   useBreadcrumbs,
   useStartServices,
   useKibanaVersion,
+  useIntraAppState,
 } from '../../../hooks';
 import { WithHeaderLayout } from '../../../layouts';
 import { AgentHealth } from '../components';
-import { useIntraAppState } from '../../../hooks/use_intra_app_state';
 import { isAgentUpgradeable } from '../../../services';
 
 import { AgentRefreshContext } from './hooks';
@@ -309,13 +309,13 @@ const AgentDetailsPageContent: React.FunctionComponent<{
   return (
     <Switch>
       <Route
-        path={PAGE_ROUTING_PATHS.fleet_agent_details_logs}
+        path={FLEET_ROUTING_PATHS.fleet_agent_details_logs}
         render={() => {
           return <AgentLogs agent={agent} />;
         }}
       />
       <Route
-        path={PAGE_ROUTING_PATHS.fleet_agent_details}
+        path={FLEET_ROUTING_PATHS.fleet_agent_details}
         render={() => {
           return <AgentDetailsContent agent={agent} agentPolicy={agentPolicy} />;
         }}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/agent_policy_selection.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/agent_policy_selection.tsx
index bcedb23b32d5d..4edc1121b1091 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/agent_policy_selection.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/agent_policy_selection.tsx
@@ -8,21 +8,25 @@
 import React, { useState, useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
-import { EuiSelect, EuiSpacer, EuiText, EuiButtonEmpty } from '@elastic/eui';
+import { EuiButtonEmpty, EuiButton, EuiCallOut, EuiSelect, EuiSpacer, EuiText } from '@elastic/eui';
 
 import { SO_SEARCH_LIMIT } from '../../../../constants';
 import type { AgentPolicy, GetEnrollmentAPIKeysResponse } from '../../../../types';
-import { sendGetEnrollmentAPIKeys, useStartServices } from '../../../../hooks';
+import {
+  sendGetEnrollmentAPIKeys,
+  useStartServices,
+  sendCreateEnrollmentAPIKey,
+} from '../../../../hooks';
 import { AgentPolicyPackageBadges } from '../agent_policy_package_badges';
 
 type Props = {
   agentPolicies?: AgentPolicy[];
-  onAgentPolicyChange?: (key: string) => void;
+  onAgentPolicyChange?: (key?: string) => void;
   excludeFleetServer?: boolean;
 } & (
   | {
       withKeySelection: true;
-      onKeyChange?: (key: string) => void;
+      onKeyChange?: (key?: string) => void;
     }
   | {
       withKeySelection: false;
@@ -38,6 +42,8 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
   const [enrollmentAPIKeys, setEnrollmentAPIKeys] = useState<GetEnrollmentAPIKeysResponse['list']>(
     []
   );
+  const [isLoadingEnrollmentKey, setIsLoadingEnrollmentKey] = useState(false);
+
   const [selectedState, setSelectedState] = useState<{
     agentPolicyId?: string;
     enrollmentAPIKeyId?: string;
@@ -45,7 +51,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
 
   useEffect(
     function triggerOnAgentPolicyChangeEffect() {
-      if (onAgentPolicyChange && selectedState.agentPolicyId) {
+      if (onAgentPolicyChange) {
         onAgentPolicyChange(selectedState.agentPolicyId);
       }
     },
@@ -58,7 +64,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
         return;
       }
 
-      if (selectedState.enrollmentAPIKeyId) {
+      if (onKeyChange) {
         onKeyChange(selectedState.enrollmentAPIKeyId);
       }
     },
@@ -94,6 +100,7 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
         return;
       }
       if (!selectedState.agentPolicyId) {
+        setIsAuthenticationSettingsOpen(true);
         setEnrollmentAPIKeys([]);
         return;
       }
@@ -204,28 +211,89 @@ export const EnrollmentStepAgentPolicy: React.FC<Props> = (props) => {
           {isAuthenticationSettingsOpen && (
             <>
               <EuiSpacer size="m" />
-              <EuiSelect
-                fullWidth
-                options={enrollmentAPIKeys.map((key) => ({
-                  value: key.id,
-                  text: key.name,
-                }))}
-                value={selectedState.enrollmentAPIKeyId || undefined}
-                prepend={
-                  <EuiText>
+              {enrollmentAPIKeys.length && selectedState.enrollmentAPIKeyId ? (
+                <EuiSelect
+                  fullWidth
+                  options={enrollmentAPIKeys.map((key) => ({
+                    value: key.id,
+                    text: key.name,
+                  }))}
+                  value={selectedState.enrollmentAPIKeyId || undefined}
+                  prepend={
+                    <EuiText>
+                      <FormattedMessage
+                        id="xpack.fleet.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel"
+                        defaultMessage="Enrollment token"
+                      />
+                    </EuiText>
+                  }
+                  onChange={(e) => {
+                    setSelectedState({
+                      ...selectedState,
+                      enrollmentAPIKeyId: e.target.value,
+                    });
+                  }}
+                />
+              ) : (
+                <EuiCallOut
+                  color="warning"
+                  title={i18n.translate(
+                    'xpack.fleet.enrollmentStepAgentPolicy.noEnrollmentTokensForSelectedPolicyCallout',
+                    {
+                      defaultMessage:
+                        'There are no enrollment tokens for the selected agent policy',
+                    }
+                  )}
+                >
+                  <div className="eui-textBreakWord">
+                    <FormattedMessage
+                      id="xpack.fleet.agentEnrenrollmentStepAgentPolicyollment.noEnrollmentTokensForSelectedPolicyCalloutDescription"
+                      defaultMessage="You must create and enrollment token in order to enroll agents with this policy"
+                    />
+                  </div>
+                  <EuiSpacer size="m" />
+                  <EuiButton
+                    iconType="plusInCircle"
+                    isLoading={isLoadingEnrollmentKey}
+                    fill
+                    onClick={() => {
+                      setIsLoadingEnrollmentKey(true);
+                      if (selectedState.agentPolicyId) {
+                        sendCreateEnrollmentAPIKey({ policy_id: selectedState.agentPolicyId })
+                          .then((res) => {
+                            if (res.error) {
+                              throw res.error;
+                            }
+                            setIsLoadingEnrollmentKey(false);
+                            if (res.data?.item) {
+                              setEnrollmentAPIKeys([res.data.item]);
+                              setSelectedState({
+                                ...selectedState,
+                                enrollmentAPIKeyId: res.data.item.id,
+                              });
+                              notifications.toasts.addSuccess(
+                                i18n.translate('xpack.fleet.newEnrollmentKey.keyCreatedToasts', {
+                                  defaultMessage: 'Enrollment token created',
+                                })
+                              );
+                            }
+                          })
+                          .catch((error) => {
+                            setIsLoadingEnrollmentKey(false);
+                            notifications.toasts.addError(error, {
+                              title: 'Error',
+                            });
+                          });
+                      }
+                    }}
+                  >
                     <FormattedMessage
-                      id="xpack.fleet.enrollmentStepAgentPolicy.enrollmentTokenSelectLabel"
-                      defaultMessage="Enrollment token"
+                      id="xpack.fleet.enrollmentStepAgentPolicy.setUpAgentsLink"
+                      defaultMessage="Create enrollment token"
                     />
-                  </EuiText>
-                }
-                onChange={(e) => {
-                  setSelectedState({
-                    ...selectedState,
-                    enrollmentAPIKeyId: e.target.value,
-                  });
-                }}
-              />
+                  </EuiButton>
+                </EuiCallOut>
+              )}
             </>
           )}
         </>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx
index 0158af2d78470..df1630abfab47 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/managed_instructions.tsx
@@ -18,6 +18,8 @@ import {
   useLink,
   useFleetStatus,
 } from '../../../../hooks';
+import { NewEnrollmentTokenModal } from '../../enrollment_token_list_page/components/new_enrollment_key_modal';
+
 import { ManualInstructions } from '../../../../components/enrollment_instructions';
 import {
   FleetServerRequirementPage,
@@ -99,7 +101,7 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
         title: i18n.translate('xpack.fleet.agentEnrollment.stepEnrollAndRunAgentTitle', {
           defaultMessage: 'Enroll and start the Elastic Agent',
         }),
-        children: apiKey.data && (
+        children: selectedAPIKeyId && apiKey.data && (
           <ManualInstructions apiKey={apiKey.data.item} fleetServerHosts={fleetServerHosts} />
         ),
       });
@@ -107,12 +109,18 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
     return baseSteps;
   }, [
     agentPolicies,
+    selectedAPIKeyId,
     apiKey.data,
     isFleetServerPolicySelected,
     settings.data?.item?.fleet_server_hosts,
     fleetServerInstructions,
   ]);
 
+  const [isModalOpen, setModalOpen] = useState(false);
+  const closeModal = () => {
+    setModalOpen(false);
+  };
+
   return (
     <>
       {fleetStatus.isReady ? (
@@ -125,6 +133,10 @@ export const ManagedInstructions = React.memo<Props>(({ agentPolicies }) => {
           </EuiText>
           <EuiSpacer size="l" />
           <EuiSteps steps={steps} />
+
+          {isModalOpen && (
+            <NewEnrollmentTokenModal agentPolicies={agentPolicies} onClose={closeModal} />
+          )}
         </>
       ) : fleetStatus.missingRequirements?.length === 1 &&
         fleetStatus.missingRequirements[0] === 'fleet_server' ? (
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx
index 6a446e888a19f..8ba0098b3d277 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_enrollment_flyout/steps.tsx
@@ -54,8 +54,8 @@ export const AgentPolicySelectionStep = ({
   excludeFleetServer,
 }: {
   agentPolicies?: AgentPolicy[];
-  setSelectedAPIKeyId?: (key: string) => void;
-  setSelectedPolicyId?: (policyId: string) => void;
+  setSelectedAPIKeyId?: (key?: string) => void;
+  setSelectedPolicyId?: (policyId?: string) => void;
   setIsFleetServerPolicySelected?: (selected: boolean) => void;
   excludeFleetServer?: boolean;
 }) => {
@@ -67,11 +67,11 @@ export const AgentPolicySelectionStep = ({
     : [];
 
   const onAgentPolicyChange = useCallback(
-    async (policyId: string) => {
+    async (policyId?: string) => {
       if (setSelectedPolicyId) {
         setSelectedPolicyId(policyId);
       }
-      if (setIsFleetServerPolicySelected) {
+      if (policyId && setIsFleetServerPolicySelected) {
         const agentPolicyRequest = await sendGetOneAgentPolicy(policyId);
         if (
           agentPolicyRequest.data?.item &&
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_policy_package_badges.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_policy_package_badges.tsx
index 89ac1b4f43b5f..605888349ab4e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_policy_package_badges.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/agent_policy_package_badges.tsx
@@ -14,7 +14,7 @@ import { FLEET_SERVER_PACKAGE } from '../../../../../../common/constants';
 
 import type { PackagePolicy, PackagePolicyPackage } from '../../../types';
 import { useGetOneAgentPolicy } from '../../../hooks';
-import { PackageIcon } from '../../../components/package_icon';
+import { PackageIcon } from '../../../components';
 
 interface Props {
   agentPolicyId: string;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx
index f31ee70da21bb..40642587c1a38 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/components/list_layout.tsx
@@ -11,7 +11,7 @@ import { EuiText, EuiFlexGroup, EuiFlexItem, EuiButton, EuiPortal } from '@elast
 import type { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
 import { useRouteMatch } from 'react-router-dom';
 
-import { PAGE_ROUTING_PATHS } from '../../../constants';
+import { FLEET_ROUTING_PATHS } from '../../../constants';
 import { WithHeaderLayout } from '../../../layouts';
 import { useCapabilities, useLink, useGetAgentPolicies } from '../../../hooks';
 import { AgentEnrollmentFlyout } from '../components';
@@ -71,7 +71,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
         ([
           {
             name: <FormattedMessage id="xpack.fleet.listTabs.agentTitle" defaultMessage="Agents" />,
-            isSelected: routeMatch.path === PAGE_ROUTING_PATHS.fleet_agent_list,
+            isSelected: routeMatch.path === FLEET_ROUTING_PATHS.fleet_agent_list,
             href: getHref('fleet_agent_list'),
           },
           {
@@ -81,7 +81,7 @@ export const ListLayout: React.FunctionComponent<{}> = ({ children }) => {
                 defaultMessage="Enrollment tokens"
               />
             ),
-            isSelected: routeMatch.path === PAGE_ROUTING_PATHS.fleet_enrollment_tokens,
+            isSelected: routeMatch.path === FLEET_ROUTING_PATHS.fleet_enrollment_tokens,
             href: getHref('fleet_enrollment_tokens'),
           },
         ] as unknown) as EuiTabProps[]
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
deleted file mode 100644
index 7fae295d0d5b4..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/components/new_enrollment_key_flyout.tsx
+++ /dev/null
@@ -1,164 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useState } from 'react';
-import { i18n } from '@kbn/i18n';
-import {
-  EuiFlyout,
-  EuiFlyoutBody,
-  EuiFlyoutHeader,
-  EuiTitle,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiButtonEmpty,
-  EuiButton,
-  EuiFlyoutFooter,
-  EuiForm,
-  EuiFormRow,
-  EuiFieldText,
-  EuiSelect,
-} from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import type { AgentPolicy } from '../../../../types';
-import { useInput, useStartServices, sendRequest } from '../../../../hooks';
-import { enrollmentAPIKeyRouteService } from '../../../../services';
-
-function useCreateApiKeyForm(
-  policyIdDefaultValue: string | undefined,
-  onSuccess: (keyId: string) => void
-) {
-  const { notifications } = useStartServices();
-  const [isLoading, setIsLoading] = useState(false);
-  const apiKeyNameInput = useInput('');
-  const policyIdInput = useInput(policyIdDefaultValue);
-
-  const onSubmit = async (event: React.FormEvent) => {
-    event.preventDefault();
-    setIsLoading(true);
-    try {
-      const res = await sendRequest({
-        method: 'post',
-        path: enrollmentAPIKeyRouteService.getCreatePath(),
-        body: JSON.stringify({
-          name: apiKeyNameInput.value,
-          policy_id: policyIdInput.value,
-        }),
-      });
-      if (res.error) {
-        throw res.error;
-      }
-      policyIdInput.clear();
-      apiKeyNameInput.clear();
-      setIsLoading(false);
-      onSuccess(res.data.item.id);
-      notifications.toasts.addSuccess(
-        i18n.translate('xpack.fleet.newEnrollmentKey.keyCreatedToasts', {
-          defaultMessage: 'Enrollment token created.',
-        })
-      );
-    } catch (err) {
-      notifications.toasts.addError(err as Error, {
-        title: 'Error',
-      });
-      setIsLoading(false);
-    }
-  };
-
-  return {
-    isLoading,
-    onSubmit,
-    policyIdInput,
-    apiKeyNameInput,
-  };
-}
-
-interface Props {
-  onClose: () => void;
-  agentPolicies: AgentPolicy[];
-}
-
-export const NewEnrollmentTokenFlyout: React.FunctionComponent<Props> = ({
-  onClose,
-  agentPolicies = [],
-}) => {
-  const policyIdDefaultValue = agentPolicies.find((agentPolicy) => agentPolicy.is_default)?.id;
-  const form = useCreateApiKeyForm(policyIdDefaultValue, () => {
-    onClose();
-  });
-
-  const body = (
-    <EuiForm>
-      <form onSubmit={form.onSubmit}>
-        <EuiFormRow
-          label={i18n.translate('xpack.fleet.newEnrollmentKey.nameLabel', {
-            defaultMessage: 'Name',
-          })}
-        >
-          <EuiFieldText
-            required={true}
-            name="name"
-            autoComplete="off"
-            {...form.apiKeyNameInput.props}
-          />
-        </EuiFormRow>
-
-        <EuiFormRow
-          label={i18n.translate('xpack.fleet.newEnrollmentKey.policyLabel', {
-            defaultMessage: 'Policy',
-          })}
-        >
-          <EuiSelect
-            required={true}
-            defaultValue={policyIdDefaultValue}
-            {...form.policyIdInput.props}
-            options={agentPolicies
-              .filter((agentPolicy) => !agentPolicy.is_managed)
-              .map((agentPolicy) => ({
-                value: agentPolicy.id,
-                text: agentPolicy.name,
-              }))}
-          />
-        </EuiFormRow>
-        <EuiButton type="submit" fill isLoading={form.isLoading}>
-          <FormattedMessage
-            id="xpack.fleet.newEnrollmentKey.submitButton"
-            defaultMessage="Create enrollment token"
-          />
-        </EuiButton>
-      </form>
-    </EuiForm>
-  );
-
-  return (
-    <EuiFlyout onClose={onClose} size="l" maxWidth={640}>
-      <EuiFlyoutHeader hasBorder aria-labelledby="FleetNewEnrollmentKeyFlyoutTitle">
-        <EuiTitle size="m">
-          <h2 id="FleetNewEnrollmentKeyFlyoutTitle">
-            <FormattedMessage
-              id="xpack.fleet.newEnrollmentKey.flyoutTitle"
-              defaultMessage="Create enrollment token"
-            />
-          </h2>
-        </EuiTitle>
-      </EuiFlyoutHeader>
-      <EuiFlyoutBody>{body}</EuiFlyoutBody>
-      <EuiFlyoutFooter>
-        <EuiFlexGroup justifyContent="spaceBetween">
-          <EuiFlexItem grow={false}>
-            <EuiButtonEmpty onClick={onClose} flush="left">
-              <FormattedMessage
-                id="xpack.fleet.newEnrollmentKey.cancelButtonLabel"
-                defaultMessage="Cancel"
-              />
-            </EuiButtonEmpty>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiFlyoutFooter>
-    </EuiFlyout>
-  );
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/components/new_enrollment_key_modal.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/components/new_enrollment_key_modal.tsx
new file mode 100644
index 0000000000000..29e130f5583ab
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/components/new_enrollment_key_modal.tsx
@@ -0,0 +1,139 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { EuiConfirmModal, EuiForm, EuiFormRow, EuiFieldText, EuiSelect } from '@elastic/eui';
+
+import type { AgentPolicy, EnrollmentAPIKey } from '../../../../types';
+import { useInput, useStartServices, sendCreateEnrollmentAPIKey } from '../../../../hooks';
+
+function useCreateApiKeyForm(
+  policyIdDefaultValue: string | undefined,
+  onSuccess: (key: EnrollmentAPIKey) => void,
+  onError: (error: Error) => void
+) {
+  const [isLoading, setIsLoading] = useState(false);
+  const apiKeyNameInput = useInput('');
+  const policyIdInput = useInput(policyIdDefaultValue);
+
+  const onSubmit = async (event: React.FormEvent) => {
+    event.preventDefault();
+    setIsLoading(true);
+    try {
+      const res = await sendCreateEnrollmentAPIKey({
+        name: apiKeyNameInput.value,
+        policy_id: policyIdInput.value,
+      });
+
+      if (res.error) {
+        throw res.error;
+      }
+      policyIdInput.clear();
+      apiKeyNameInput.clear();
+      setIsLoading(false);
+      if (res.data?.item) {
+        onSuccess(res.data.item);
+      }
+    } catch (error) {
+      setIsLoading(false);
+      onError(error);
+    }
+  };
+
+  return {
+    isLoading,
+    onSubmit,
+    policyIdInput,
+    apiKeyNameInput,
+  };
+}
+
+interface Props {
+  onClose: (key?: EnrollmentAPIKey) => void;
+  agentPolicies?: AgentPolicy[];
+}
+
+export const NewEnrollmentTokenModal: React.FunctionComponent<Props> = ({
+  onClose,
+  agentPolicies = [],
+}) => {
+  const { notifications } = useStartServices();
+  const policyIdDefaultValue = agentPolicies.find((agentPolicy) => agentPolicy.is_default)?.id;
+  const form = useCreateApiKeyForm(
+    policyIdDefaultValue,
+    (key: EnrollmentAPIKey) => {
+      onClose(key);
+      notifications.toasts.addSuccess(
+        i18n.translate('xpack.fleet.newEnrollmentKey.keyCreatedToasts', {
+          defaultMessage: 'Enrollment token created',
+        })
+      );
+    },
+    (error: Error) => {
+      notifications.toasts.addError(error, {
+        title: 'Error',
+      });
+    }
+  );
+
+  const body = (
+    <EuiForm>
+      <form onSubmit={form.onSubmit}>
+        <EuiFormRow
+          label={i18n.translate('xpack.fleet.newEnrollmentKey.nameLabel', {
+            defaultMessage: 'Name',
+          })}
+        >
+          <EuiFieldText
+            required={true}
+            name="name"
+            autoComplete="off"
+            {...form.apiKeyNameInput.props}
+          />
+        </EuiFormRow>
+
+        <EuiFormRow
+          label={i18n.translate('xpack.fleet.newEnrollmentKey.policyLabel', {
+            defaultMessage: 'Policy',
+          })}
+        >
+          <EuiSelect
+            required={true}
+            defaultValue={policyIdDefaultValue}
+            {...form.policyIdInput.props}
+            options={agentPolicies
+              .filter((agentPolicy) => !agentPolicy.is_managed)
+              .map((agentPolicy) => ({
+                value: agentPolicy.id,
+                text: agentPolicy.name,
+              }))}
+          />
+        </EuiFormRow>
+      </form>
+    </EuiForm>
+  );
+
+  return (
+    <EuiConfirmModal
+      isLoading={form.isLoading}
+      title={i18n.translate('xpack.fleet.newEnrollmentKey.modalTitle', {
+        defaultMessage: 'Create enrollment token',
+      })}
+      onCancel={() => onClose()}
+      cancelButtonText={i18n.translate('xpack.fleet.newEnrollmentKey.cancelButtonLabel', {
+        defaultMessage: 'Cancel',
+      })}
+      onConfirm={form.onSubmit}
+      confirmButtonText={i18n.translate('xpack.fleet.newEnrollmentKey.submitButton', {
+        defaultMessage: 'Create enrollment token',
+      })}
+    >
+      {body}
+    </EuiConfirmModal>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
index 6d141b0c9ebf1..66e0c338dbbbc 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/enrollment_token_list_page/index.tsx
@@ -34,7 +34,7 @@ import {
 import type { EnrollmentAPIKey, GetAgentPoliciesResponseItem } from '../../../types';
 import { SearchBar } from '../../../components/search_bar';
 
-import { NewEnrollmentTokenFlyout } from './components/new_enrollment_key_flyout';
+import { NewEnrollmentTokenModal } from './components/new_enrollment_key_modal';
 import { ConfirmEnrollmentTokenDelete } from './components/confirm_delete_modal';
 
 const ApiKeyField: React.FunctionComponent<{ apiKeyId: string }> = ({ apiKeyId }) => {
@@ -156,7 +156,7 @@ const DeleteButton: React.FunctionComponent<{ apiKey: EnrollmentAPIKey; refresh:
 
 export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
   useBreadcrumbs('fleet_enrollment_tokens');
-  const [flyoutOpen, setFlyoutOpen] = useState(false);
+  const [isModalOpen, setModalOpen] = useState(false);
   const [search, setSearch] = useState('');
   const { pagination, setPagination, pageSizeOptions } = usePagination();
 
@@ -270,11 +270,11 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
 
   return (
     <>
-      {flyoutOpen && (
-        <NewEnrollmentTokenFlyout
+      {isModalOpen && (
+        <NewEnrollmentTokenModal
           agentPolicies={agentPolicies}
-          onClose={() => {
-            setFlyoutOpen(false);
+          onClose={(key?: EnrollmentAPIKey) => {
+            setModalOpen(false);
             enrollmentAPIKeysRequest.resendRequest();
           }}
         />
@@ -301,7 +301,7 @@ export const EnrollmentTokenListPage: React.FunctionComponent<{}> = () => {
           />
         </EuiFlexItem>
         <EuiFlexItem grow={false}>
-          <EuiButton iconType="plusInCircle" onClick={() => setFlyoutOpen(true)}>
+          <EuiButton iconType="plusInCircle" onClick={() => setModalOpen(true)}>
             <FormattedMessage
               id="xpack.fleet.enrollmentTokensList.newKeyButton"
               defaultMessage="Create enrollment token"
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx
index 56eb4072c3847..dcb33e7662dc4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/agents/index.tsx
@@ -9,7 +9,7 @@ import React, { useCallback, useEffect, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { HashRouter as Router, Route, Switch, Redirect } from 'react-router-dom';
 
-import { PAGE_ROUTING_PATHS } from '../../constants';
+import { FLEET_ROUTING_PATHS } from '../../constants';
 import { Loading, Error } from '../../components';
 import {
   useConfig,
@@ -111,14 +111,14 @@ export const FleetApp: React.FunctionComponent = () => {
     <Router>
       <Switch>
         <Route
-          path={PAGE_ROUTING_PATHS.fleet}
+          path={FLEET_ROUTING_PATHS.fleet}
           exact={true}
-          render={() => <Redirect to={PAGE_ROUTING_PATHS.fleet_agent_list} />}
+          render={() => <Redirect to={FLEET_ROUTING_PATHS.fleet_agent_list} />}
         />
-        <Route path={PAGE_ROUTING_PATHS.fleet_agent_details}>
+        <Route path={FLEET_ROUTING_PATHS.fleet_agent_details}>
           <AgentDetailsPage />
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.fleet_agent_list}>
+        <Route path={FLEET_ROUTING_PATHS.fleet_agent_list}>
           <ListLayout>
             {fleetServerModalVisible && (
               <FleetServerUpgradeModal onClose={onCloseFleetServerModal} />
@@ -130,7 +130,7 @@ export const FleetApp: React.FunctionComponent = () => {
             )}
           </ListLayout>
         </Route>
-        <Route path={PAGE_ROUTING_PATHS.fleet_enrollment_tokens}>
+        <Route path={FLEET_ROUTING_PATHS.fleet_enrollment_tokens}>
           <ListLayout>
             <EnrollmentTokenListPage />
           </ListLayout>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx
index fb6078ce73b70..bc3a0229284db 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/index.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { HashRouter as Router, Route, Switch } from 'react-router-dom';
 
-import { PAGE_ROUTING_PATHS } from '../../constants';
+import { FLEET_ROUTING_PATHS } from '../../constants';
 
 import { DataStreamListPage } from './list_page';
 
@@ -16,7 +16,7 @@ export const DataStreamApp: React.FunctionComponent = () => {
   return (
     <Router>
       <Switch>
-        <Route path={PAGE_ROUTING_PATHS.data_streams}>
+        <Route path={FLEET_ROUTING_PATHS.data_streams}>
           <DataStreamListPage />
         </Route>
       </Switch>
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx
index f8518dc2a8668..e805fb8f6f64e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/data_stream/list_page/index.tsx
@@ -22,7 +22,7 @@ import { FormattedMessage, FormattedDate } from '@kbn/i18n/react';
 import type { DataStream } from '../../../types';
 import { WithHeaderLayout } from '../../../layouts';
 import { useGetDataStreams, useStartServices, usePagination, useBreadcrumbs } from '../../../hooks';
-import { PackageIcon } from '../../../components/package_icon';
+import { PackageIcon } from '../../../components';
 
 import { DataStreamRowActions } from './components/data_stream_row_actions';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/index.tsx
deleted file mode 100644
index 45f189afe350a..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/index.tsx
+++ /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.
- */
-
-export { useLinks } from './use_links';
-export { useLocalSearch, searchIdField } from './use_local_search';
-export {
-  PackageInstallProvider,
-  useUninstallPackage,
-  useGetPackageInstallStatus,
-  useInstallPackage,
-  useSetPackageInstallStatus,
-} from './use_package_install';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/index.tsx
deleted file mode 100644
index cb94ddf3ddf2a..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/index.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { Switch, Route } from 'react-router-dom';
-
-import { PAGE_ROUTING_PATHS } from '../../constants';
-import { useBreadcrumbs } from '../../hooks';
-import { CreatePackagePolicyPage } from '../agent_policy/create_package_policy_page';
-
-import { EPMHomePage } from './screens/home';
-import { Detail } from './screens/detail';
-import { Policy } from './screens/policy';
-
-export const EPMApp: React.FunctionComponent = () => {
-  useBreadcrumbs('integrations');
-
-  return (
-    <Switch>
-      <Route path={PAGE_ROUTING_PATHS.add_integration_to_policy}>
-        <CreatePackagePolicyPage />
-      </Route>
-      <Route path={PAGE_ROUTING_PATHS.integration_policy_edit}>
-        <Policy />
-      </Route>
-      <Route path={PAGE_ROUTING_PATHS.integration_details}>
-        <Detail />
-      </Route>
-      <Route path={PAGE_ROUTING_PATHS.integrations}>
-        <EPMHomePage />
-      </Route>
-    </Switch>
-  );
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.test.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.test.tsx
deleted file mode 100644
index a8e9ddf1c8f78..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.test.tsx
+++ /dev/null
@@ -1,790 +0,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, { lazy, memo } from 'react';
-import { Route } from 'react-router-dom';
-import { act, cleanup } from '@testing-library/react';
-
-import { PAGE_ROUTING_PATHS, pagePathGetters } from '../../../../constants';
-import type {
-  GetAgentPoliciesResponse,
-  GetFleetStatusResponse,
-  GetInfoResponse,
-  GetPackagePoliciesResponse,
-  GetStatsResponse,
-} from '../../../../../../../common/types/rest_spec';
-import type {
-  DetailViewPanelName,
-  KibanaAssetType,
-} from '../../../../../../../common/types/models';
-import {
-  agentPolicyRouteService,
-  epmRouteService,
-  fleetSetupRouteService,
-  packagePolicyRouteService,
-} from '../../../../../../../common/services';
-import type { MockedFleetStartServices, TestRenderer } from '../../../../mock';
-import { createTestRendererMock } from '../../../../mock';
-
-import { Detail } from './index';
-
-describe('when on integration detail', () => {
-  const pkgkey = 'nginx-0.3.7';
-  const detailPageUrlPath = pagePathGetters.integration_details_overview({ pkgkey });
-  let testRenderer: TestRenderer;
-  let renderResult: ReturnType<typeof testRenderer.render>;
-  let mockedApi: MockedApi<EpmPackageDetailsResponseProvidersMock>;
-  const render = () =>
-    (renderResult = testRenderer.render(
-      <Route path={PAGE_ROUTING_PATHS.integration_details}>
-        <Detail />
-      </Route>
-    ));
-
-  beforeEach(() => {
-    testRenderer = createTestRendererMock();
-    mockedApi = mockApiCalls(testRenderer.startServices.http);
-    testRenderer.history.push(detailPageUrlPath);
-  });
-
-  afterEach(() => {
-    cleanup();
-    window.location.hash = '#/';
-  });
-
-  describe('and the package is installed', () => {
-    beforeEach(() => render());
-
-    it('should display agent policy usage count', async () => {
-      await mockedApi.waitForApi();
-      expect(renderResult.queryByTestId('agentPolicyCount')).not.toBeNull();
-    });
-
-    it('should show the Policies tab', async () => {
-      await mockedApi.waitForApi();
-      expect(renderResult.queryByTestId('tab-policies')).not.toBeNull();
-    });
-  });
-
-  describe('and the package is not installed', () => {
-    beforeEach(() => {
-      const unInstalledPackage = mockedApi.responseProvider.epmGetInfo();
-      unInstalledPackage.response.status = 'not_installed';
-      mockedApi.responseProvider.epmGetInfo.mockReturnValue(unInstalledPackage);
-      render();
-    });
-
-    it('should NOT display agent policy usage count', async () => {
-      await mockedApi.waitForApi();
-      expect(renderResult.queryByTestId('agentPolicyCount')).toBeNull();
-    });
-
-    it('should NOT the Policies tab', async () => {
-      await mockedApi.waitForApi();
-      expect(renderResult.queryByTestId('tab-policies')).toBeNull();
-    });
-  });
-
-  describe('and a custom UI extension is NOT registered', () => {
-    beforeEach(() => render());
-
-    it('should show overview and settings tabs', () => {
-      const tabs: DetailViewPanelName[] = ['overview', 'settings'];
-      for (const tab of tabs) {
-        expect(renderResult.getByTestId(`tab-${tab}`));
-      }
-    });
-
-    it('should not show a custom tab', () => {
-      expect(renderResult.queryByTestId('tab-custom')).toBeNull();
-    });
-
-    it('should redirect if custom url is accessed', () => {
-      act(() => {
-        testRenderer.history.push(
-          pagePathGetters.integration_details_custom({ pkgkey: 'nginx-0.3.7' })
-        );
-      });
-      expect(testRenderer.history.location.pathname).toEqual(detailPageUrlPath);
-    });
-  });
-
-  describe('and a custom UI extension is registered', () => {
-    // Because React Lazy components are loaded async (Promise), we setup this "watcher" Promise
-    // that is `resolved` once the lazy components actually renders.
-    let lazyComponentWasRendered: Promise<void>;
-
-    beforeEach(() => {
-      let setWasRendered: () => void;
-      lazyComponentWasRendered = new Promise((resolve) => {
-        setWasRendered = resolve;
-      });
-
-      const CustomComponent = lazy(async () => {
-        return {
-          default: memo(() => {
-            setWasRendered();
-            return <div data-test-subj="custom-hello">hello</div>;
-          }),
-        };
-      });
-
-      testRenderer.startInterface.registerExtension({
-        package: 'nginx',
-        view: 'package-detail-custom',
-        component: CustomComponent,
-      });
-
-      render();
-    });
-
-    afterEach(() => {
-      // @ts-ignore
-      lazyComponentWasRendered = undefined;
-    });
-
-    it('should display "custom" tab in navigation', () => {
-      expect(renderResult.getByTestId('tab-custom'));
-    });
-
-    it('should display custom content when tab is clicked', async () => {
-      act(() => {
-        testRenderer.history.push(
-          pagePathGetters.integration_details_custom({ pkgkey: 'nginx-0.3.7' })
-        );
-      });
-      await lazyComponentWasRendered;
-      expect(renderResult.getByTestId('custom-hello'));
-    });
-  });
-
-  describe('and the Add integration button is clicked', () => {
-    beforeEach(() => render());
-
-    it('should link to the create page', () => {
-      const addButton = renderResult.getByTestId('addIntegrationPolicyButton') as HTMLAnchorElement;
-      expect(addButton.href).toEqual(
-        'http://localhost/mock/app/fleet#/integrations/nginx-0.3.7/add-integration'
-      );
-    });
-
-    it('should link to create page with route state for return trip', () => {
-      const addButton = renderResult.getByTestId('addIntegrationPolicyButton') as HTMLAnchorElement;
-      act(() => addButton.click());
-      expect(testRenderer.history.location.state).toEqual({
-        onCancelNavigateTo: [
-          'fleet',
-          {
-            path: '#/integrations/detail/nginx-0.3.7/overview',
-          },
-        ],
-        onCancelUrl: '#/integrations/detail/nginx-0.3.7/overview',
-        onSaveNavigateTo: [
-          'fleet',
-          {
-            path: '#/integrations/detail/nginx-0.3.7/overview',
-          },
-        ],
-      });
-    });
-  });
-
-  describe('and on the Policies Tab', () => {
-    const policiesTabURLPath = pagePathGetters.integration_details_policies({ pkgkey });
-    beforeEach(() => {
-      testRenderer.history.push(policiesTabURLPath);
-      render();
-    });
-
-    it('should display policies list', () => {
-      const table = renderResult.getByTestId('integrationPolicyTable');
-      expect(table).not.toBeNull();
-    });
-
-    it('should link to integration policy detail when an integration policy is clicked', async () => {
-      await mockedApi.waitForApi();
-      const firstPolicy = renderResult.getAllByTestId(
-        'integrationNameLink'
-      )[0] as HTMLAnchorElement;
-      expect(firstPolicy.href).toEqual(
-        'http://localhost/mock/app/fleet#/integrations/edit-integration/e8a37031-2907-44f6-89d2-98bd493f60dc'
-      );
-    });
-
-    it('should NOT show link for agent count if it is zero', async () => {
-      await mockedApi.waitForApi();
-      const firstRowAgentCount = renderResult.getAllByTestId('rowAgentCount')[0];
-      expect(firstRowAgentCount.textContent).toEqual('0');
-      expect(firstRowAgentCount.tagName).not.toEqual('A');
-    });
-
-    it('should show link for agent count if greater than zero', async () => {
-      await mockedApi.waitForApi();
-      const secondRowAgentCount = renderResult.getAllByTestId('rowAgentCount')[1];
-      expect(secondRowAgentCount.textContent).toEqual('100');
-      expect(secondRowAgentCount.tagName).toEqual('A');
-    });
-  });
-});
-
-interface MockedApi<
-  R extends Record<string, jest.MockedFunction<any>> = Record<string, jest.MockedFunction<any>>
-> {
-  /** Will return a promise that resolves when triggered APIs are complete */
-  waitForApi: () => Promise<void>;
-  /** A object containing the list of API response provider functions that are used by the mocked API */
-  responseProvider: R;
-}
-
-interface EpmPackageDetailsResponseProvidersMock {
-  epmGetInfo: jest.MockedFunction<() => GetInfoResponse>;
-  epmGetFile: jest.MockedFunction<() => string>;
-  epmGetStats: jest.MockedFunction<() => GetStatsResponse>;
-  fleetSetup: jest.MockedFunction<() => GetFleetStatusResponse>;
-  packagePolicyList: jest.MockedFunction<() => GetPackagePoliciesResponse>;
-  agentPolicyList: jest.MockedFunction<() => GetAgentPoliciesResponse>;
-}
-
-const mockApiCalls = (
-  http: MockedFleetStartServices['http']
-): MockedApi<EpmPackageDetailsResponseProvidersMock> => {
-  let inflightApiCalls = 0;
-  const apiDoneListeners: Array<() => void> = [];
-  const markApiCallAsHandled = async () => {
-    inflightApiCalls++;
-    await new Promise((r) => setTimeout(r, 1));
-    inflightApiCalls--;
-
-    // If no more pending API calls, then notify listeners
-    if (inflightApiCalls === 0 && apiDoneListeners.length > 0) {
-      apiDoneListeners.splice(0).forEach((listener) => listener());
-    }
-  };
-
-  // @ts-ignore
-  const epmPackageResponse: GetInfoResponse = {
-    response: {
-      name: 'nginx',
-      title: 'Nginx',
-      version: '0.3.7',
-      release: 'experimental',
-      description: 'Nginx Integration',
-      type: 'integration',
-      download: '/epr/nginx/nginx-0.3.7.zip',
-      path: '/package/nginx/0.3.7',
-      icons: [
-        {
-          src: '/img/logo_nginx.svg',
-          path: '/package/nginx/0.3.7/img/logo_nginx.svg',
-          title: 'logo nginx',
-          size: '32x32',
-          type: 'image/svg+xml',
-        },
-      ],
-      format_version: '1.0.0',
-      readme: '/package/nginx/0.3.7/docs/README.md',
-      license: 'basic',
-      categories: ['web', 'security'],
-      conditions: { 'kibana.version': '^7.9.0' },
-      screenshots: [
-        {
-          src: '/img/kibana-nginx.png',
-          path: '/package/nginx/0.3.7/img/kibana-nginx.png',
-          title: 'kibana nginx',
-          size: '1218x1266',
-          type: 'image/png',
-        },
-        {
-          src: '/img/metricbeat-nginx.png',
-          path: '/package/nginx/0.3.7/img/metricbeat-nginx.png',
-          title: 'metricbeat nginx',
-          size: '2560x2100',
-          type: 'image/png',
-        },
-      ],
-      assets: {
-        kibana: {
-          dashboard: [
-            {
-              pkgkey: 'nginx-0.3.7',
-              service: 'kibana',
-              type: 'dashboard' as KibanaAssetType,
-              file: 'nginx-023d2930-f1a5-11e7-a9ef-93c69af7b129.json',
-            },
-          ],
-          search: [
-            {
-              pkgkey: 'nginx-0.3.7',
-              service: 'kibana',
-              type: 'search' as KibanaAssetType,
-              file: 'nginx-6d9e66d0-a1f0-11e7-928f-5dbe6f6f5519.json',
-            },
-          ],
-          visualization: [
-            {
-              pkgkey: 'nginx-0.3.7',
-              service: 'kibana',
-              type: 'visualization' as KibanaAssetType,
-              file: 'nginx-0dd6f320-a29f-11e7-928f-5dbe6f6f5519.json',
-            },
-          ],
-        },
-      },
-      policy_templates: [
-        {
-          name: 'nginx',
-          title: 'Nginx logs and metrics',
-          description: 'Collect logs and metrics from Nginx instances',
-          inputs: [
-            {
-              type: 'logfile',
-              title: 'Collect logs from Nginx instances',
-              description: 'Collecting Nginx access, error and ingress controller logs',
-            },
-            {
-              type: 'nginx/metrics',
-              vars: [
-                {
-                  name: 'hosts',
-                  type: 'text',
-                  title: 'Hosts',
-                  multi: true,
-                  required: true,
-                  show_user: true,
-                  default: ['http://127.0.0.1:80'],
-                },
-              ],
-              title: 'Collect metrics from Nginx instances',
-              description: 'Collecting Nginx stub status metrics',
-            },
-          ],
-          multiple: true,
-        },
-      ],
-      data_streams: [
-        {
-          type: 'logs',
-          dataset: 'nginx.access',
-          title: 'Nginx access logs',
-          release: 'experimental',
-          ingest_pipeline: 'default',
-          streams: [
-            {
-              input: 'logfile',
-              vars: [
-                {
-                  name: 'paths',
-                  type: 'text',
-                  title: 'Paths',
-                  multi: true,
-                  required: true,
-                  show_user: true,
-                  default: ['/var/log/nginx/access.log*'],
-                },
-              ],
-              template_path: 'stream.yml.hbs',
-              title: 'Nginx access logs',
-              description: 'Collect Nginx access logs',
-              enabled: true,
-            },
-          ],
-          package: 'nginx',
-          path: 'access',
-        },
-        {
-          type: 'logs',
-          dataset: 'nginx.error',
-          title: 'Nginx error logs',
-          release: 'experimental',
-          ingest_pipeline: 'default',
-          streams: [
-            {
-              input: 'logfile',
-              vars: [
-                {
-                  name: 'paths',
-                  type: 'text',
-                  title: 'Paths',
-                  multi: true,
-                  required: true,
-                  show_user: true,
-                  default: ['/var/log/nginx/error.log*'],
-                },
-              ],
-              template_path: 'stream.yml.hbs',
-              title: 'Nginx error logs',
-              description: 'Collect Nginx error logs',
-              enabled: true,
-            },
-          ],
-          package: 'nginx',
-          path: 'error',
-        },
-        {
-          type: 'logs',
-          dataset: 'nginx.ingress_controller',
-          title: 'Nginx ingress_controller logs',
-          release: 'experimental',
-          ingest_pipeline: 'default',
-          streams: [
-            {
-              input: 'logfile',
-              vars: [
-                {
-                  name: 'paths',
-                  type: 'text',
-                  title: 'Paths',
-                  multi: true,
-                  required: true,
-                  show_user: true,
-                  default: ['/var/log/nginx/ingress.log*'],
-                },
-              ],
-              template_path: 'stream.yml.hbs',
-              title: 'Nginx ingress controller logs',
-              description: 'Collect Nginx ingress controller logs',
-              enabled: false,
-            },
-          ],
-          package: 'nginx',
-          path: 'ingress_controller',
-        },
-        {
-          type: 'metrics',
-          dataset: 'nginx.stubstatus',
-          title: 'Nginx stubstatus metrics',
-          release: 'experimental',
-          streams: [
-            {
-              input: 'nginx/metrics',
-              vars: [
-                {
-                  name: 'period',
-                  type: 'text',
-                  title: 'Period',
-                  multi: false,
-                  required: true,
-                  show_user: true,
-                  default: '10s',
-                },
-                {
-                  name: 'server_status_path',
-                  type: 'text',
-                  title: 'Server Status Path',
-                  multi: false,
-                  required: true,
-                  show_user: false,
-                  default: '/nginx_status',
-                },
-              ],
-              template_path: 'stream.yml.hbs',
-              title: 'Nginx stub status metrics',
-              description: 'Collect Nginx stub status metrics',
-              enabled: true,
-            },
-          ],
-          package: 'nginx',
-          path: 'stubstatus',
-        },
-      ],
-      owner: { github: 'elastic/integrations-services' },
-      latestVersion: '0.3.7',
-      removable: true,
-      status: 'installed',
-    },
-  } as GetInfoResponse;
-
-  const packageReadMe = `
-# Nginx Integration
-
-This integration periodically fetches metrics from [Nginx](https://nginx.org/) servers. It can parse access and error
-logs created by the HTTP server.
-
-## Compatibility
-
-The Nginx \`stubstatus\` metrics was tested with Nginx 1.9 and are expected to work with all version >= 1.9.
-The logs were tested with version 1.10.
-On Windows, the module was tested with Nginx installed from the Chocolatey repository.
-`;
-
-  const agentsSetupResponse: GetFleetStatusResponse = { isReady: true, missing_requirements: [] };
-
-  const packagePoliciesResponse: GetPackagePoliciesResponse = {
-    items: [
-      {
-        id: 'e8a37031-2907-44f6-89d2-98bd493f60dc',
-        version: 'WzgzMiwxXQ==',
-        name: 'nginx-1',
-        description: '',
-        namespace: 'default',
-        policy_id: '521c1b70-3976-11eb-ad1c-3baa423084d9',
-        enabled: true,
-        output_id: '',
-        inputs: [
-          {
-            type: 'logfile',
-            enabled: true,
-            streams: [
-              {
-                enabled: true,
-                data_stream: { type: 'logs', dataset: 'nginx.access' },
-                vars: { paths: { value: ['/var/log/nginx/access.log*'], type: 'text' } },
-                id: 'logfile-nginx.access-e8a37031-2907-44f6-89d2-98bd493f60dc',
-                compiled_stream: {
-                  paths: ['/var/log/nginx/access.log*'],
-                  exclude_files: ['.gz$'],
-                  processors: [{ add_locale: null }],
-                },
-              },
-              {
-                enabled: true,
-                data_stream: { type: 'logs', dataset: 'nginx.error' },
-                vars: { paths: { value: ['/var/log/nginx/error.log*'], type: 'text' } },
-                id: 'logfile-nginx.error-e8a37031-2907-44f6-89d2-98bd493f60dc',
-                compiled_stream: {
-                  paths: ['/var/log/nginx/error.log*'],
-                  exclude_files: ['.gz$'],
-                  multiline: {
-                    pattern: '^\\d{4}\\/\\d{2}\\/\\d{2} ',
-                    negate: true,
-                    match: 'after',
-                  },
-                  processors: [{ add_locale: null }],
-                },
-              },
-              {
-                enabled: false,
-                data_stream: { type: 'logs', dataset: 'nginx.ingress_controller' },
-                vars: { paths: { value: ['/var/log/nginx/ingress.log*'], type: 'text' } },
-                id: 'logfile-nginx.ingress_controller-e8a37031-2907-44f6-89d2-98bd493f60dc',
-              },
-            ],
-          },
-          {
-            type: 'nginx/metrics',
-            enabled: true,
-            streams: [
-              {
-                enabled: true,
-                data_stream: { type: 'metrics', dataset: 'nginx.stubstatus' },
-                vars: {
-                  period: { value: '10s', type: 'text' },
-                  server_status_path: { value: '/nginx_status', type: 'text' },
-                },
-                id: 'nginx/metrics-nginx.stubstatus-e8a37031-2907-44f6-89d2-98bd493f60dc',
-                compiled_stream: {
-                  metricsets: ['stubstatus'],
-                  hosts: ['http://127.0.0.1:80'],
-                  period: '10s',
-                  server_status_path: '/nginx_status',
-                },
-              },
-            ],
-            vars: { hosts: { value: ['http://127.0.0.1:80'], type: 'text' } },
-          },
-        ],
-        package: { name: 'nginx', title: 'Nginx', version: '0.3.7' },
-        revision: 1,
-        created_at: '2020-12-09T13:46:31.013Z',
-        created_by: 'elastic',
-        updated_at: '2020-12-09T13:46:31.013Z',
-        updated_by: 'elastic',
-      },
-      {
-        id: 'e3t37031-2907-44f6-89d2-5555555555',
-        version: 'WrrrMiwxXQ==',
-        name: 'nginx-2',
-        description: '',
-        namespace: 'default',
-        policy_id: '125c1b70-3976-11eb-ad1c-3baa423085y6',
-        enabled: true,
-        output_id: '',
-        inputs: [
-          {
-            type: 'logfile',
-            enabled: true,
-            streams: [
-              {
-                enabled: true,
-                data_stream: { type: 'logs', dataset: 'nginx.access' },
-                vars: { paths: { value: ['/var/log/nginx/access.log*'], type: 'text' } },
-                id: 'logfile-nginx.access-e8a37031-2907-44f6-89d2-98bd493f60dc',
-                compiled_stream: {
-                  paths: ['/var/log/nginx/access.log*'],
-                  exclude_files: ['.gz$'],
-                  processors: [{ add_locale: null }],
-                },
-              },
-              {
-                enabled: true,
-                data_stream: { type: 'logs', dataset: 'nginx.error' },
-                vars: { paths: { value: ['/var/log/nginx/error.log*'], type: 'text' } },
-                id: 'logfile-nginx.error-e8a37031-2907-44f6-89d2-98bd493f60dc',
-                compiled_stream: {
-                  paths: ['/var/log/nginx/error.log*'],
-                  exclude_files: ['.gz$'],
-                  multiline: {
-                    pattern: '^\\d{4}\\/\\d{2}\\/\\d{2} ',
-                    negate: true,
-                    match: 'after',
-                  },
-                  processors: [{ add_locale: null }],
-                },
-              },
-              {
-                enabled: false,
-                data_stream: { type: 'logs', dataset: 'nginx.ingress_controller' },
-                vars: { paths: { value: ['/var/log/nginx/ingress.log*'], type: 'text' } },
-                id: 'logfile-nginx.ingress_controller-e8a37031-2907-44f6-89d2-98bd493f60dc',
-              },
-            ],
-          },
-          {
-            type: 'nginx/metrics',
-            enabled: true,
-            streams: [
-              {
-                enabled: true,
-                data_stream: { type: 'metrics', dataset: 'nginx.stubstatus' },
-                vars: {
-                  period: { value: '10s', type: 'text' },
-                  server_status_path: { value: '/nginx_status', type: 'text' },
-                },
-                id: 'nginx/metrics-nginx.stubstatus-e8a37031-2907-44f6-89d2-98bd493f60dc',
-                compiled_stream: {
-                  metricsets: ['stubstatus'],
-                  hosts: ['http://127.0.0.1:80'],
-                  period: '10s',
-                  server_status_path: '/nginx_status',
-                },
-              },
-            ],
-            vars: { hosts: { value: ['http://127.0.0.1:80'], type: 'text' } },
-          },
-        ],
-        package: { name: 'nginx', title: 'Nginx', version: '0.3.7' },
-        revision: 3,
-        created_at: '2020-12-09T13:46:31.013Z',
-        created_by: 'elastic',
-        updated_at: '2020-12-09T13:46:31.013Z',
-        updated_by: 'elastic',
-      },
-    ],
-    total: 2,
-    page: 1,
-    perPage: 20,
-  };
-
-  const agentPoliciesResponse: GetAgentPoliciesResponse = {
-    items: [
-      {
-        id: '521c1b70-3976-11eb-ad1c-3baa423084d9',
-        name: 'Default',
-        namespace: 'default',
-        description: 'Default agent policy created by Kibana',
-        status: 'active',
-        package_policies: [
-          '4d09bd78-b0ad-4238-9fa3-d87d3c887c73',
-          '2babac18-eb8e-4ce4-b53b-4b7c5f507019',
-          'e8a37031-2907-44f6-89d2-98bd493f60dc',
-        ],
-        is_default: true,
-        is_managed: false,
-        monitoring_enabled: ['logs', 'metrics'],
-        revision: 6,
-        updated_at: '2020-12-09T13:46:31.840Z',
-        updated_by: 'elastic',
-        agents: 0,
-      },
-      {
-        id: '125c1b70-3976-11eb-ad1c-3baa423085y6',
-        name: 'EU Healthy agents',
-        namespace: 'default',
-        description: 'Protect EU from COVID',
-        status: 'active',
-        package_policies: ['e8a37031-2907-44f6-89d2-98bd493f60cd'],
-        is_default: false,
-        is_managed: false,
-        monitoring_enabled: ['logs', 'metrics'],
-        revision: 2,
-        updated_at: '2020-12-09T13:46:31.840Z',
-        updated_by: 'elastic',
-        agents: 100,
-      },
-    ],
-    total: 2,
-    page: 1,
-    perPage: 100,
-  };
-
-  const epmGetStatsResponse: GetStatsResponse = {
-    response: {
-      agent_policy_count: 2,
-    },
-  };
-
-  const mockedApiInterface: MockedApi<EpmPackageDetailsResponseProvidersMock> = {
-    waitForApi() {
-      return new Promise((resolve) => {
-        if (inflightApiCalls > 0) {
-          apiDoneListeners.push(resolve);
-        } else {
-          resolve();
-        }
-      });
-    },
-    responseProvider: {
-      epmGetInfo: jest.fn().mockReturnValue(epmPackageResponse),
-      epmGetFile: jest.fn().mockReturnValue(packageReadMe),
-      epmGetStats: jest.fn().mockReturnValue(epmGetStatsResponse),
-      fleetSetup: jest.fn().mockReturnValue(agentsSetupResponse),
-      packagePolicyList: jest.fn().mockReturnValue(packagePoliciesResponse),
-      agentPolicyList: jest.fn().mockReturnValue(agentPoliciesResponse),
-    },
-  };
-
-  http.get.mockImplementation(async (path) => {
-    if (typeof path === 'string') {
-      if (path === epmRouteService.getInfoPath(`nginx-0.3.7`)) {
-        markApiCallAsHandled();
-        return mockedApiInterface.responseProvider.epmGetInfo();
-      }
-
-      if (path === epmRouteService.getFilePath('/package/nginx/0.3.7/docs/README.md')) {
-        markApiCallAsHandled();
-        return mockedApiInterface.responseProvider.epmGetFile();
-      }
-
-      if (path === fleetSetupRouteService.getFleetSetupPath()) {
-        markApiCallAsHandled();
-        return mockedApiInterface.responseProvider.fleetSetup();
-      }
-
-      if (path === packagePolicyRouteService.getListPath()) {
-        markApiCallAsHandled();
-        return mockedApiInterface.responseProvider.packagePolicyList();
-      }
-
-      if (path === agentPolicyRouteService.getListPath()) {
-        markApiCallAsHandled();
-        return mockedApiInterface.responseProvider.agentPolicyList();
-      }
-
-      if (path === epmRouteService.getStatsPath('nginx')) {
-        markApiCallAsHandled();
-        return mockedApiInterface.responseProvider.epmGetStats();
-      }
-
-      const err = new Error(`API [GET ${path}] is not MOCKED!`);
-      // eslint-disable-next-line no-console
-      console.error(err);
-      throw err;
-    }
-  });
-
-  return mockedApiInterface;
-};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.tsx
deleted file mode 100644
index 05d2f53688655..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.tsx
+++ /dev/null
@@ -1,436 +0,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 { ReactEventHandler } from 'react';
-import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { Redirect, Route, Switch, useHistory, useLocation, useParams } from 'react-router-dom';
-import styled from 'styled-components';
-import {
-  EuiBetaBadge,
-  EuiButton,
-  EuiButtonEmpty,
-  EuiDescriptionList,
-  EuiDescriptionListDescription,
-  EuiDescriptionListTitle,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSpacer,
-  EuiText,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import semverLt from 'semver/functions/lt';
-
-import { useUIExtension } from '../../../../hooks/use_ui_extension';
-import { PAGE_ROUTING_PATHS, PLUGIN_ID } from '../../../../constants';
-import { useCapabilities, useGetPackageInfoByKey, useLink } from '../../../../hooks';
-import { pkgKeyFromPackageInfo } from '../../../../services/pkg_key_from_package_info';
-import type {
-  CreatePackagePolicyRouteState,
-  DetailViewPanelName,
-  PackageInfo,
-} from '../../../../types';
-import { InstallStatus } from '../../../../types';
-import { Error, Loading } from '../../../../components';
-import { useBreadcrumbs } from '../../../../hooks';
-import type { WithHeaderLayoutProps } from '../../../../layouts';
-import { WithHeaderLayout } from '../../../../layouts';
-import { RELEASE_BADGE_DESCRIPTION, RELEASE_BADGE_LABEL } from '../../components/release_badge';
-import { useGetPackageInstallStatus, useSetPackageInstallStatus } from '../../hooks';
-
-import { IntegrationAgentPolicyCount, UpdateIcon, IconPanel, LoadingIconPanel } from './components';
-import { OverviewPage } from './overview';
-import { PackagePoliciesPage } from './policies';
-import { SettingsPage } from './settings';
-import { CustomViewPage } from './custom';
-import './index.scss';
-
-export interface DetailParams {
-  pkgkey: string;
-  panel?: DetailViewPanelName;
-}
-
-const Divider = styled.div`
-  width: 0;
-  height: 100%;
-  border-left: ${(props) => props.theme.eui.euiBorderThin};
-`;
-
-// Allows child text to be truncated
-const FlexItemWithMinWidth = styled(EuiFlexItem)`
-  min-width: 0px;
-`;
-
-function Breadcrumbs({ packageTitle }: { packageTitle: string }) {
-  useBreadcrumbs('integration_details_overview', { pkgTitle: packageTitle });
-  return null;
-}
-
-export function Detail() {
-  const { pkgkey, panel } = useParams<DetailParams>();
-  const { getHref, getPath } = useLink();
-  const hasWriteCapabilites = useCapabilities().write;
-  const history = useHistory();
-  const { pathname, search, hash } = useLocation();
-  const queryParams = useMemo(() => new URLSearchParams(search), [search]);
-  const integration = useMemo(() => queryParams.get('integration'), [queryParams]);
-
-  // Package info state
-  const [packageInfo, setPackageInfo] = useState<PackageInfo | null>(null);
-  const setPackageInstallStatus = useSetPackageInstallStatus();
-  const getPackageInstallStatus = useGetPackageInstallStatus();
-
-  const packageInstallStatus = useMemo(() => {
-    if (packageInfo === null || !packageInfo.name) {
-      return undefined;
-    }
-    return getPackageInstallStatus(packageInfo.name).status;
-  }, [packageInfo, getPackageInstallStatus]);
-
-  const updateAvailable =
-    packageInfo &&
-    'savedObject' in packageInfo &&
-    packageInfo.savedObject &&
-    semverLt(packageInfo.savedObject.attributes.version, packageInfo.latestVersion);
-
-  // Fetch package info
-  const { data: packageInfoData, error: packageInfoError, isLoading } = useGetPackageInfoByKey(
-    pkgkey
-  );
-
-  const showCustomTab =
-    useUIExtension(packageInfoData?.response.name ?? '', 'package-detail-custom') !== undefined;
-
-  // Track install status state
-  useEffect(() => {
-    if (packageInfoData?.response) {
-      const packageInfoResponse = packageInfoData.response;
-      setPackageInfo(packageInfoResponse);
-
-      let installedVersion;
-      const { name } = packageInfoData.response;
-      if ('savedObject' in packageInfoResponse) {
-        installedVersion = packageInfoResponse.savedObject.attributes.version;
-      }
-      const status: InstallStatus = packageInfoResponse?.status as any;
-      if (name) {
-        setPackageInstallStatus({ name, status, version: installedVersion || null });
-      }
-    }
-  }, [packageInfoData, setPackageInstallStatus, setPackageInfo]);
-
-  const integrationInfo = useMemo(
-    () =>
-      integration
-        ? packageInfo?.policy_templates?.find(
-            (policyTemplate) => policyTemplate.name === integration
-          )
-        : undefined,
-    [integration, packageInfo]
-  );
-
-  const headerLeftContent = useMemo(
-    () => (
-      <EuiFlexGroup direction="column" gutterSize="m">
-        <EuiFlexItem>
-          {/* Allows button to break out of full width */}
-          <div>
-            <EuiButtonEmpty
-              iconType="arrowLeft"
-              size="xs"
-              flush="left"
-              href={getHref('integrations_all')}
-            >
-              <FormattedMessage
-                id="xpack.fleet.epm.browseAllButtonText"
-                defaultMessage="Browse all integrations"
-              />
-            </EuiButtonEmpty>
-          </div>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFlexGroup gutterSize="l">
-            <EuiFlexItem grow={false}>
-              {isLoading || !packageInfo ? (
-                <LoadingIconPanel />
-              ) : (
-                <IconPanel
-                  packageName={packageInfo.name}
-                  integrationName={integrationInfo?.name}
-                  version={packageInfo.version}
-                  icons={integrationInfo?.icons || packageInfo.icons}
-                />
-              )}
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiFlexGroup alignItems="center" gutterSize="m">
-                <FlexItemWithMinWidth grow={false}>
-                  <EuiText>
-                    {/* Render space in place of package name while package info loads to prevent layout from jumping around */}
-                    <h1>{integrationInfo?.title || packageInfo?.title || '\u00A0'}</h1>
-                  </EuiText>
-                </FlexItemWithMinWidth>
-                {packageInfo?.release && packageInfo.release !== 'ga' ? (
-                  <EuiFlexItem grow={false}>
-                    <EuiBetaBadge
-                      label={RELEASE_BADGE_LABEL[packageInfo.release]}
-                      tooltipContent={RELEASE_BADGE_DESCRIPTION[packageInfo.release]}
-                    />
-                  </EuiFlexItem>
-                ) : null}
-              </EuiFlexGroup>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-    ),
-    [getHref, integrationInfo, isLoading, packageInfo]
-  );
-
-  const handleAddIntegrationPolicyClick = useCallback<ReactEventHandler>(
-    (ev) => {
-      ev.preventDefault();
-
-      // The object below, given to `createHref` is explicitly accessing keys of `location` in order
-      // to ensure that dependencies to this `useCallback` is set correctly (because `location` is mutable)
-      const currentPath = history.createHref({
-        pathname,
-        search,
-        hash,
-      });
-      const redirectToPath: CreatePackagePolicyRouteState['onSaveNavigateTo'] &
-        CreatePackagePolicyRouteState['onCancelNavigateTo'] = [
-        PLUGIN_ID,
-        {
-          path: currentPath,
-        },
-      ];
-      const redirectBackRouteState: CreatePackagePolicyRouteState = {
-        onSaveNavigateTo: redirectToPath,
-        onCancelNavigateTo: redirectToPath,
-        onCancelUrl: currentPath,
-      };
-
-      history.push({
-        pathname: getPath('add_integration_to_policy', {
-          pkgkey,
-          ...(integration ? { integration } : {}),
-        }),
-        state: redirectBackRouteState,
-      });
-    },
-    [getPath, history, hash, pathname, search, pkgkey, integration]
-  );
-
-  const headerRightContent = useMemo(
-    () =>
-      packageInfo ? (
-        <>
-          <EuiSpacer size="l" />
-          <EuiFlexGroup justifyContent="flexEnd" direction="row">
-            {[
-              {
-                label: i18n.translate('xpack.fleet.epm.versionLabel', {
-                  defaultMessage: 'Version',
-                }),
-                content: (
-                  <EuiFlexGroup gutterSize="s">
-                    <EuiFlexItem>{packageInfo.version}</EuiFlexItem>
-                    {updateAvailable ? (
-                      <EuiFlexItem>
-                        <UpdateIcon />
-                      </EuiFlexItem>
-                    ) : null}
-                  </EuiFlexGroup>
-                ),
-              },
-              ...(packageInstallStatus === 'installed'
-                ? [
-                    { isDivider: true },
-                    {
-                      label: i18n.translate('xpack.fleet.epm.usedByLabel', {
-                        defaultMessage: 'Agent policies',
-                      }),
-                      'data-test-subj': 'agentPolicyCount',
-                      content: <IntegrationAgentPolicyCount packageName={packageInfo.name} />,
-                    },
-                  ]
-                : []),
-              { isDivider: true },
-              {
-                content: (
-                  // eslint-disable-next-line @elastic/eui/href-or-on-click
-                  <EuiButton
-                    fill
-                    isDisabled={!hasWriteCapabilites}
-                    iconType="plusInCircle"
-                    href={getHref('add_integration_to_policy', {
-                      pkgkey,
-                      ...(integration ? { integration } : {}),
-                    })}
-                    onClick={handleAddIntegrationPolicyClick}
-                    data-test-subj="addIntegrationPolicyButton"
-                  >
-                    <FormattedMessage
-                      id="xpack.fleet.epm.addPackagePolicyButtonText"
-                      defaultMessage="Add {packageName}"
-                      values={{
-                        packageName: integrationInfo?.title || packageInfo.title,
-                      }}
-                    />
-                  </EuiButton>
-                ),
-              },
-            ].map((item, index) => (
-              <EuiFlexItem grow={false} key={index} data-test-subj={item['data-test-subj']}>
-                {item.isDivider ?? false ? (
-                  <Divider />
-                ) : item.label ? (
-                  <EuiDescriptionList className="eui-textRight" compressed textStyle="reverse">
-                    <EuiDescriptionListTitle>{item.label}</EuiDescriptionListTitle>
-                    <EuiDescriptionListDescription>{item.content}</EuiDescriptionListDescription>
-                  </EuiDescriptionList>
-                ) : (
-                  item.content
-                )}
-              </EuiFlexItem>
-            ))}
-          </EuiFlexGroup>
-        </>
-      ) : undefined,
-    [
-      getHref,
-      handleAddIntegrationPolicyClick,
-      hasWriteCapabilites,
-      integration,
-      integrationInfo,
-      packageInfo,
-      packageInstallStatus,
-      pkgkey,
-      updateAvailable,
-    ]
-  );
-
-  const headerTabs = useMemo<WithHeaderLayoutProps['tabs']>(() => {
-    if (!packageInfo) {
-      return [];
-    }
-    const packageInfoKey = pkgKeyFromPackageInfo(packageInfo);
-
-    const tabs: WithHeaderLayoutProps['tabs'] = [
-      {
-        id: 'overview',
-        name: (
-          <FormattedMessage
-            id="xpack.fleet.epm.packageDetailsNav.overviewLinkText"
-            defaultMessage="Overview"
-          />
-        ),
-        isSelected: panel === 'overview',
-        'data-test-subj': `tab-overview`,
-        href: getHref('integration_details_overview', {
-          pkgkey: packageInfoKey,
-          ...(integration ? { integration } : {}),
-        }),
-      },
-    ];
-
-    if (packageInstallStatus === InstallStatus.installed) {
-      tabs.push({
-        id: 'policies',
-        name: (
-          <FormattedMessage
-            id="xpack.fleet.epm.packageDetailsNav.packagePoliciesLinkText"
-            defaultMessage="Policies"
-          />
-        ),
-        isSelected: panel === 'policies',
-        'data-test-subj': `tab-policies`,
-        href: getHref('integration_details_policies', {
-          pkgkey: packageInfoKey,
-          ...(integration ? { integration } : {}),
-        }),
-      });
-    }
-
-    tabs.push({
-      id: 'settings',
-      name: (
-        <FormattedMessage
-          id="xpack.fleet.epm.packageDetailsNav.settingsLinkText"
-          defaultMessage="Settings"
-        />
-      ),
-      isSelected: panel === 'settings',
-      'data-test-subj': `tab-settings`,
-      href: getHref('integration_details_settings', {
-        pkgkey: packageInfoKey,
-        ...(integration ? { integration } : {}),
-      }),
-    });
-
-    if (showCustomTab) {
-      tabs.push({
-        id: 'custom',
-        name: (
-          <FormattedMessage
-            id="xpack.fleet.epm.packageDetailsNav.packageCustomLinkText"
-            defaultMessage="Advanced"
-          />
-        ),
-        isSelected: panel === 'custom',
-        'data-test-subj': `tab-custom`,
-        href: getHref('integration_details_custom', {
-          pkgkey: packageInfoKey,
-          ...(integration ? { integration } : {}),
-        }),
-      });
-    }
-
-    return tabs;
-  }, [packageInfo, panel, getHref, integration, packageInstallStatus, showCustomTab]);
-
-  return (
-    <WithHeaderLayout
-      leftColumn={headerLeftContent}
-      rightColumn={headerRightContent}
-      rightColumnGrow={false}
-      tabs={headerTabs}
-      tabsClassName="fleet__epm__shiftNavTabs"
-    >
-      {integrationInfo ? <Breadcrumbs packageTitle={integrationInfo.title} /> : null}
-      {packageInfoError ? (
-        <Error
-          title={
-            <FormattedMessage
-              id="xpack.fleet.epm.loadingIntegrationErrorTitle"
-              defaultMessage="Error loading integration details"
-            />
-          }
-          error={packageInfoError}
-        />
-      ) : isLoading || !packageInfo ? (
-        <Loading />
-      ) : (
-        <Switch>
-          <Route path={PAGE_ROUTING_PATHS.integration_details_overview}>
-            <OverviewPage packageInfo={packageInfo} integrationInfo={integrationInfo} />
-          </Route>
-          <Route path={PAGE_ROUTING_PATHS.integration_details_settings}>
-            <SettingsPage packageInfo={packageInfo} />
-          </Route>
-          <Route path={PAGE_ROUTING_PATHS.integration_details_policies}>
-            <PackagePoliciesPage name={packageInfo.name} version={packageInfo.version} />
-          </Route>
-          <Route path={PAGE_ROUTING_PATHS.integration_details_custom}>
-            <CustomViewPage packageInfo={packageInfo} />
-          </Route>
-          <Redirect to={PAGE_ROUTING_PATHS.integration_details_overview} />
-        </Switch>
-      )}
-    </WithHeaderLayout>
-  );
-}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/index.tsx
deleted file mode 100644
index 922628e7b68b1..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/index.tsx
+++ /dev/null
@@ -1,231 +0,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, useMemo } from 'react';
-import { useRouteMatch, Switch, Route, useLocation, useHistory } from 'react-router-dom';
-import semverLt from 'semver/functions/lt';
-import type { Props as EuiTabProps } from '@elastic/eui/src/components/tabs/tab';
-import { i18n } from '@kbn/i18n';
-
-import { installationStatuses } from '../../../../../../../common/constants';
-import { PAGE_ROUTING_PATHS } from '../../../../constants';
-import { useLink, useGetCategories, useGetPackages, useBreadcrumbs } from '../../../../hooks';
-import { doesPackageHaveIntegrations } from '../../../../services';
-import { WithHeaderLayout } from '../../../../layouts';
-import type { CategorySummaryItem, PackageList } from '../../../../types';
-import { PackageListGrid } from '../../components/package_list_grid';
-
-import { CategoryFacets } from './category_facets';
-import { HeroCopy, HeroImage } from './header';
-
-export const EPMHomePage: React.FC = memo(() => {
-  const {
-    params: { tabId },
-  } = useRouteMatch<{ tabId?: string }>();
-  const { getHref } = useLink();
-
-  return (
-    <WithHeaderLayout
-      leftColumn={<HeroCopy />}
-      rightColumn={<HeroImage />}
-      tabs={
-        ([
-          {
-            id: 'all_packages',
-            name: i18n.translate('xpack.fleet.epmList.allTabText', {
-              defaultMessage: 'All integrations',
-            }),
-            href: getHref('integrations_all'),
-            isSelected: tabId !== 'installed',
-          },
-          {
-            id: 'installed_packages',
-            name: i18n.translate('xpack.fleet.epmList.installedTabText', {
-              defaultMessage: 'Installed integrations',
-            }),
-            href: getHref('integrations_installed'),
-            isSelected: tabId === 'installed',
-          },
-        ] as unknown) as EuiTabProps[]
-      }
-    >
-      <Switch>
-        <Route path={PAGE_ROUTING_PATHS.integrations_installed}>
-          <InstalledPackages />
-        </Route>
-        <Route path={PAGE_ROUTING_PATHS.integrations_all}>
-          <AvailablePackages />
-        </Route>
-      </Switch>
-    </WithHeaderLayout>
-  );
-});
-
-// Packages can export multiple integrations, aka `policy_templates`
-// In the case where packages ship >1 `policy_templates`, we flatten out the
-// list of packages by bringing all integrations to top-level so that
-// each integration is displayed as its own tile
-const packageListToIntegrationsList = (packages: PackageList): PackageList => {
-  return packages.reduce((acc: PackageList, pkg) => {
-    const { policy_templates: policyTemplates = [], ...restOfPackage } = pkg;
-    return [
-      ...acc,
-      restOfPackage,
-      ...(doesPackageHaveIntegrations(pkg)
-        ? policyTemplates.map((integration) => {
-            const { name, title, description, icons } = integration;
-            return {
-              ...restOfPackage,
-              id: `${restOfPackage}-${name}`,
-              integration: name,
-              title,
-              description,
-              icons: icons || restOfPackage.icons,
-            };
-          })
-        : []),
-    ];
-  }, []);
-};
-
-const InstalledPackages: React.FC = memo(() => {
-  useBreadcrumbs('integrations_installed');
-  const { data: allPackages, isLoading: isLoadingPackages } = useGetPackages({
-    experimental: true,
-  });
-  const [selectedCategory, setSelectedCategory] = useState('');
-
-  const allInstalledPackages = useMemo(
-    () =>
-      (allPackages?.response || []).filter((pkg) => pkg.status === installationStatuses.Installed),
-    [allPackages?.response]
-  );
-
-  const updatablePackages = useMemo(
-    () =>
-      allInstalledPackages.filter(
-        (item) =>
-          'savedObject' in item && semverLt(item.savedObject.attributes.version, item.version)
-      ),
-    [allInstalledPackages]
-  );
-
-  const title = useMemo(
-    () =>
-      i18n.translate('xpack.fleet.epmList.installedTitle', {
-        defaultMessage: 'Installed integrations',
-      }),
-    []
-  );
-
-  const categories = useMemo(
-    () => [
-      {
-        id: '',
-        title: i18n.translate('xpack.fleet.epmList.allFilterLinkText', {
-          defaultMessage: 'All',
-        }),
-        count: allInstalledPackages.length,
-      },
-      {
-        id: 'updates_available',
-        title: i18n.translate('xpack.fleet.epmList.updatesAvailableFilterLinkText', {
-          defaultMessage: 'Updates available',
-        }),
-        count: updatablePackages.length,
-      },
-    ],
-    [allInstalledPackages.length, updatablePackages.length]
-  );
-
-  const controls = useMemo(
-    () => (
-      <CategoryFacets
-        categories={categories}
-        selectedCategory={selectedCategory}
-        onCategoryChange={({ id }: CategorySummaryItem) => setSelectedCategory(id)}
-      />
-    ),
-    [categories, selectedCategory]
-  );
-
-  return (
-    <PackageListGrid
-      isLoading={isLoadingPackages}
-      controls={controls}
-      title={title}
-      list={selectedCategory === 'updates_available' ? updatablePackages : allInstalledPackages}
-    />
-  );
-});
-
-const AvailablePackages: React.FC = memo(() => {
-  useBreadcrumbs('integrations_all');
-  const history = useHistory();
-  const queryParams = new URLSearchParams(useLocation().search);
-  const initialCategory = queryParams.get('category') || '';
-  const [selectedCategory, setSelectedCategory] = useState(initialCategory);
-  const { data: allPackagesRes, isLoading: isLoadingAllPackages } = useGetPackages();
-  const { data: categoryPackagesRes, isLoading: isLoadingCategoryPackages } = useGetPackages({
-    category: selectedCategory,
-  });
-  const { data: categoriesRes, isLoading: isLoadingCategories } = useGetCategories({
-    include_policy_templates: true,
-  });
-  const packages = useMemo(
-    () => packageListToIntegrationsList(categoryPackagesRes?.response || []),
-    [categoryPackagesRes]
-  );
-
-  const title = useMemo(
-    () =>
-      i18n.translate('xpack.fleet.epmList.allTitle', {
-        defaultMessage: 'Browse by category',
-      }),
-    []
-  );
-
-  const categories = useMemo(
-    () => [
-      {
-        id: '',
-        title: i18n.translate('xpack.fleet.epmList.allPackagesFilterLinkText', {
-          defaultMessage: 'All',
-        }),
-        count: allPackagesRes?.response?.length || 0,
-      },
-      ...(categoriesRes ? categoriesRes.response : []),
-    ],
-    [allPackagesRes?.response?.length, categoriesRes]
-  );
-
-  const controls = categories ? (
-    <CategoryFacets
-      isLoading={isLoadingCategories || isLoadingAllPackages}
-      categories={categories}
-      selectedCategory={selectedCategory}
-      onCategoryChange={({ id }: CategorySummaryItem) => {
-        // clear category query param in the url
-        if (queryParams.get('category')) {
-          history.push({});
-        }
-        setSelectedCategory(id);
-      }}
-    />
-  ) : null;
-
-  return (
-    <PackageListGrid
-      isLoading={isLoadingCategoryPackages}
-      title={title}
-      controls={controls}
-      list={packages}
-      setSelectedCategory={setSelectedCategory}
-      showMissingIntegrationMessage
-    />
-  );
-});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/policy/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/policy/index.tsx
deleted file mode 100644
index b8963b8e39514..0000000000000
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/policy/index.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, { memo } from 'react';
-import { useRouteMatch } from 'react-router-dom';
-
-import { EditPackagePolicyForm } from '../../../agent_policy/edit_package_policy_page';
-
-export const Policy = memo(() => {
-  const {
-    params: { packagePolicyId },
-  } = useRouteMatch<{ packagePolicyId: string }>();
-
-  return <EditPackagePolicyForm packagePolicyId={packagePolicyId} from="package-edit" />;
-});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx b/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx
index 712f69bf25e1d..810334e2df9ce 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx
+++ b/x-pack/plugins/fleet/public/applications/fleet/sections/index.tsx
@@ -6,9 +6,8 @@
  */
 
 export { IngestManagerOverview } from './overview';
-export { EPMApp } from './epm';
 export { AgentPolicyApp } from './agent_policy';
 export { DataStreamApp } from './data_stream';
 export { FleetApp } from './agents';
 
-export type Section = 'overview' | 'epm' | 'agent_policy' | 'fleet' | 'data_stream';
+export type Section = 'overview' | 'agent_policy' | 'fleet' | 'data_stream';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/services/index.ts b/x-pack/plugins/fleet/public/applications/fleet/services/index.ts
index 07fb04628ea2e..434e1addfdfa2 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/services/index.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/services/index.ts
@@ -5,29 +5,4 @@
  * 2.0.
  */
 
-export { getFlattenedObject } from '@kbn/std';
-
-export {
-  AgentStatusKueryHelper,
-  agentPolicyRouteService,
-  packagePolicyRouteService,
-  dataStreamRouteService,
-  fleetSetupRouteService,
-  agentRouteService,
-  enrollmentAPIKeyRouteService,
-  epmRouteService,
-  setupRouteService,
-  outputRoutesService,
-  settingsRoutesService,
-  appRoutesService,
-  packageToPackagePolicy,
-  packageToPackagePolicyInputs,
-  storedPackagePoliciesToAgentInputs,
-  fullAgentPolicyToYaml,
-  isPackageLimited,
-  doesAgentPolicyAlreadyIncludePackage,
-  isValidNamespace,
-  LicenseService,
-  isAgentUpgradeable,
-  doesPackageHaveIntegrations,
-} from '../../../../common';
+export * from '../../../services';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/types/index.ts b/x-pack/plugins/fleet/public/applications/fleet/types/index.ts
index ea9bab2fb74e5..287b3f08566df 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/types/index.ts
+++ b/x-pack/plugins/fleet/public/applications/fleet/types/index.ts
@@ -5,125 +5,4 @@
  * 2.0.
  */
 
-export {
-  // utility function
-  entries,
-  // Object types
-  Agent,
-  AgentMetadata,
-  AgentPolicy,
-  NewAgentPolicy,
-  SimplifiedAgentStatus,
-  EnrollmentAPIKey,
-  PackagePolicy,
-  NewPackagePolicy,
-  UpdatePackagePolicy,
-  PackagePolicyInput,
-  NewPackagePolicyInput,
-  PackagePolicyInputStream,
-  NewPackagePolicyInputStream,
-  PackagePolicyConfigRecord,
-  PackagePolicyConfigRecordEntry,
-  PackagePolicyPackage,
-  Output,
-  DataStream,
-  // API schema - misc setup, status
-  GetFleetStatusResponse,
-  // API schemas - Agent policy
-  GetAgentPoliciesRequest,
-  GetAgentPoliciesResponse,
-  GetAgentPoliciesResponseItem,
-  GetOneAgentPolicyResponse,
-  GetFullAgentPolicyResponse,
-  CreateAgentPolicyRequest,
-  CreateAgentPolicyResponse,
-  UpdateAgentPolicyRequest,
-  UpdateAgentPolicyResponse,
-  CopyAgentPolicyRequest,
-  CopyAgentPolicyResponse,
-  DeleteAgentPolicyRequest,
-  DeleteAgentPolicyResponse,
-  // API schemas - Package policy
-  CreatePackagePolicyRequest,
-  CreatePackagePolicyResponse,
-  UpdatePackagePolicyRequest,
-  UpdatePackagePolicyResponse,
-  GetPackagePoliciesResponse,
-  // API schemas - Data streams
-  GetDataStreamsResponse,
-  // API schemas - Agents
-  GetAgentsResponse,
-  GetAgentsRequest,
-  GetOneAgentResponse,
-  PostAgentUnenrollRequest,
-  PostAgentUnenrollResponse,
-  PostBulkAgentUnenrollRequest,
-  PostBulkAgentUnenrollResponse,
-  PostAgentUpgradeRequest,
-  PostBulkAgentUpgradeRequest,
-  PostAgentUpgradeResponse,
-  PostBulkAgentUpgradeResponse,
-  GetAgentStatusRequest,
-  GetAgentStatusResponse,
-  PutAgentReassignRequest,
-  PutAgentReassignResponse,
-  PostBulkAgentReassignRequest,
-  PostBulkAgentReassignResponse,
-  PostNewAgentActionResponse,
-  PostNewAgentActionRequest,
-  // API schemas - Enrollment API Keys
-  GetEnrollmentAPIKeysResponse,
-  GetEnrollmentAPIKeysRequest,
-  GetOneEnrollmentAPIKeyResponse,
-  // API schemas - Outputs
-  GetOutputsResponse,
-  PutOutputRequest,
-  PutOutputResponse,
-  // API schemas - Settings
-  GetSettingsResponse,
-  PutSettingsRequest,
-  PutSettingsResponse,
-  // API schemas - app
-  CheckPermissionsResponse,
-  GenerateServiceTokenResponse,
-  // EPM types
-  AssetReference,
-  AssetsGroupedByServiceByType,
-  AssetType,
-  AssetTypeToParts,
-  CategoryId,
-  CategorySummaryItem,
-  CategorySummaryList,
-  ElasticsearchAssetType,
-  KibanaAssetType,
-  PackageInfo,
-  RegistryVarsEntry,
-  RegistryInput,
-  RegistryStream,
-  RegistryPolicyTemplate,
-  PackageList,
-  PackageListItem,
-  PackagesGroupedByStatus,
-  RequirementsByServiceName,
-  RequirementVersion,
-  ScreenshotItem,
-  ServiceName,
-  GetCategoriesRequest,
-  GetCategoriesResponse,
-  GetPackagesRequest,
-  GetPackagesResponse,
-  GetLimitedPackagesResponse,
-  GetInfoResponse,
-  InstallPackageResponse,
-  DeletePackageResponse,
-  DetailViewPanelName,
-  InstallStatus,
-  InstallationStatus,
-  Installable,
-  RegistryRelease,
-  PackageSpecCategory,
-} from '../../../../common';
-
-export * from './intra_app_route_state';
-
-export * from './ui_extensions';
+export * from '../../../types';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/app.tsx b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
new file mode 100644
index 0000000000000..dab369f330f45
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/app.tsx
@@ -0,0 +1,230 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, useEffect, useState } from 'react';
+import type { AppMountParameters } from 'kibana/public';
+import { EuiCode, EuiEmptyPrompt, EuiErrorBoundary, EuiPanel } from '@elastic/eui';
+import type { History } from 'history';
+import { createHashHistory } from 'history';
+import { Router, Redirect, Route, Switch } from 'react-router-dom';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
+import styled from 'styled-components';
+import useObservable from 'react-use/lib/useObservable';
+
+import {
+  ConfigContext,
+  FleetStatusProvider,
+  KibanaVersionContext,
+  sendGetPermissionsCheck,
+  sendSetup,
+} from '../../hooks';
+
+import type { FleetConfigType, FleetStartServices } from '../../plugin';
+
+import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
+import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
+
+import { INTEGRATIONS_ROUTING_PATHS } from './constants';
+
+import { Error, Loading } from './components';
+
+import type { UIExtensionsStorage } from './types';
+
+import { EPMApp } from './sections/epm';
+import { DefaultLayout, WithoutHeaderLayout } from './layouts';
+import { PackageInstallProvider } from './hooks';
+import { useBreadcrumbs, IntraAppStateProvider, UIExtensionsContext } from './hooks';
+
+const ErrorLayout = ({ children }: { children: JSX.Element }) => (
+  <EuiErrorBoundary>
+    <DefaultLayout>
+      <WithoutHeaderLayout>{children}</WithoutHeaderLayout>
+    </DefaultLayout>
+  </EuiErrorBoundary>
+);
+
+const Panel = styled(EuiPanel)`
+  max-width: 500px;
+  margin-right: auto;
+  margin-left: auto;
+`;
+
+export const WithPermissionsAndSetup: React.FC = memo(({ children }) => {
+  useBreadcrumbs('integrations');
+
+  const [isPermissionsLoading, setIsPermissionsLoading] = useState<boolean>(false);
+  const [permissionsError, setPermissionsError] = useState<string>();
+  const [isInitialized, setIsInitialized] = useState(false);
+  const [initializationError, setInitializationError] = useState<Error | null>(null);
+
+  useEffect(() => {
+    (async () => {
+      setPermissionsError(undefined);
+      setIsInitialized(false);
+      setInitializationError(null);
+      try {
+        setIsPermissionsLoading(true);
+        const permissionsResponse = await sendGetPermissionsCheck();
+        setIsPermissionsLoading(false);
+        if (permissionsResponse.data?.success) {
+          try {
+            const setupResponse = await sendSetup();
+            if (setupResponse.error) {
+              setInitializationError(setupResponse.error);
+            }
+          } catch (err) {
+            setInitializationError(err);
+          }
+          setIsInitialized(true);
+        } else {
+          setPermissionsError(permissionsResponse.data?.error || 'REQUEST_ERROR');
+        }
+      } catch (err) {
+        setPermissionsError('REQUEST_ERROR');
+      }
+    })();
+  }, []);
+
+  if (isPermissionsLoading || permissionsError) {
+    return (
+      <ErrorLayout>
+        {isPermissionsLoading ? (
+          <Loading />
+        ) : permissionsError === 'REQUEST_ERROR' ? (
+          <Error
+            title={
+              <FormattedMessage
+                id="xpack.fleet.permissionsRequestErrorMessageTitle"
+                defaultMessage="Unable to check permissions"
+              />
+            }
+            error={i18n.translate('xpack.fleet.permissionsRequestErrorMessageDescription', {
+              defaultMessage: 'There was a problem checking Fleet permissions',
+            })}
+          />
+        ) : (
+          <Panel>
+            <EuiEmptyPrompt
+              iconType="securityApp"
+              title={
+                <h2>
+                  {permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
+                    <FormattedMessage
+                      id="xpack.fleet.permissionDeniedErrorTitle"
+                      defaultMessage="Permission denied"
+                    />
+                  ) : (
+                    <FormattedMessage
+                      id="xpack.fleet.securityRequiredErrorTitle"
+                      defaultMessage="Security is not enabled"
+                    />
+                  )}
+                </h2>
+              }
+              body={
+                <p>
+                  {permissionsError === 'MISSING_SUPERUSER_ROLE' ? (
+                    <FormattedMessage
+                      id="xpack.fleet.integrationsPermissionDeniedErrorMessage"
+                      defaultMessage="You are not authorized to access Integrations. Integrations requires {roleName} privileges."
+                      values={{ roleName: <EuiCode>superuser</EuiCode> }}
+                    />
+                  ) : (
+                    <FormattedMessage
+                      id="xpack.fleet.integrationsSecurityRequiredErrorMessage"
+                      defaultMessage="You must enable security in Kibana and Elasticsearch to use Integrations."
+                    />
+                  )}
+                </p>
+              }
+            />
+          </Panel>
+        )}
+      </ErrorLayout>
+    );
+  }
+
+  if (!isInitialized || initializationError) {
+    return (
+      <ErrorLayout>
+        {initializationError ? (
+          <Error
+            title={
+              <FormattedMessage
+                id="xpack.fleet.initializationErrorMessageTitle"
+                defaultMessage="Unable to initialize Fleet"
+              />
+            }
+            error={initializationError}
+          />
+        ) : (
+          <Loading />
+        )}
+      </ErrorLayout>
+    );
+  }
+
+  return <>{children}</>;
+});
+
+/**
+ * Fleet Application context all the way down to the Router, but with no permissions or setup checks
+ * and no routes defined
+ */
+export const IntegrationsAppContext: React.FC<{
+  basepath: string;
+  startServices: FleetStartServices;
+  config: FleetConfigType;
+  history: AppMountParameters['history'];
+  kibanaVersion: string;
+  extensions: UIExtensionsStorage;
+  /** For testing purposes only */
+  routerHistory?: History<any>;
+}> = memo(
+  ({ children, startServices, config, history, kibanaVersion, extensions, routerHistory }) => {
+    const isDarkMode = useObservable<boolean>(startServices.uiSettings.get$('theme:darkMode'));
+    const [routerHistoryInstance] = useState(routerHistory || createHashHistory());
+
+    return (
+      <startServices.i18n.Context>
+        <KibanaContextProvider services={{ ...startServices }}>
+          <EuiErrorBoundary>
+            <ConfigContext.Provider value={config}>
+              <KibanaVersionContext.Provider value={kibanaVersion}>
+                <EuiThemeProvider darkMode={isDarkMode}>
+                  <UIExtensionsContext.Provider value={extensions}>
+                    <FleetStatusProvider>
+                      <IntraAppStateProvider kibanaScopedHistory={history}>
+                        <Router history={routerHistoryInstance}>
+                          <PackageInstallProvider notifications={startServices.notifications}>
+                            {children}
+                          </PackageInstallProvider>
+                        </Router>
+                      </IntraAppStateProvider>
+                    </FleetStatusProvider>
+                  </UIExtensionsContext.Provider>
+                </EuiThemeProvider>
+              </KibanaVersionContext.Provider>
+            </ConfigContext.Provider>
+          </EuiErrorBoundary>
+        </KibanaContextProvider>
+      </startServices.i18n.Context>
+    );
+  }
+);
+
+export const AppRoutes = memo(() => {
+  return (
+    <Switch>
+      <Route path={INTEGRATIONS_ROUTING_PATHS.integrations}>
+        <EPMApp />
+      </Route>
+      <Redirect to={INTEGRATIONS_ROUTING_PATHS.integrations_all} />
+    </Switch>
+  );
+});
diff --git a/x-pack/plugins/fleet/public/applications/integrations/components/index.ts b/x-pack/plugins/fleet/public/applications/integrations/components/index.ts
new file mode 100644
index 0000000000000..727ecb1c991ea
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/components/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+export * from '../../../components';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/constants.tsx b/x-pack/plugins/fleet/public/applications/integrations/constants.tsx
new file mode 100644
index 0000000000000..403a47f4b94b2
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/constants.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 type { IconType } from '@elastic/eui';
+
+import type { AssetType, ServiceName } from '../../types';
+import { ElasticsearchAssetType, KibanaAssetType } from '../../types';
+
+export * from '../../constants';
+
+// only allow Kibana assets for the kibana key, ES asssets for elasticsearch, etc
+type ServiceNameToAssetTypes = Record<Extract<ServiceName, 'kibana'>, KibanaAssetType[]> &
+  Record<Extract<ServiceName, 'elasticsearch'>, ElasticsearchAssetType[]>;
+
+export const DisplayedAssets: ServiceNameToAssetTypes = {
+  kibana: Object.values(KibanaAssetType),
+  elasticsearch: Object.values(ElasticsearchAssetType),
+};
+
+export const AssetTitleMap: Record<AssetType, string> = {
+  dashboard: 'Dashboard',
+  ilm_policy: 'ILM Policy',
+  ingest_pipeline: 'Ingest Pipeline',
+  transform: 'Transform',
+  index_pattern: 'Index Pattern',
+  index_template: 'Index Template',
+  component_template: 'Component Template',
+  search: 'Saved Search',
+  visualization: 'Visualization',
+  input: 'Agent input',
+  map: 'Map',
+  data_stream_ilm_policy: 'Data Stream ILM Policy',
+  lens: 'Lens',
+  security_rule: 'Security Rule',
+  ml_module: 'ML Module',
+};
+
+export const ServiceTitleMap: Record<ServiceName, string> = {
+  kibana: 'Kibana',
+  elasticsearch: 'Elasticsearch',
+};
+
+export const AssetIcons: Record<KibanaAssetType, IconType> = {
+  dashboard: 'dashboardApp',
+  index_pattern: 'indexPatternApp',
+  search: 'searchProfilerApp',
+  visualization: 'visualizeApp',
+  map: 'emsApp',
+  lens: 'lensApp',
+  security_rule: 'securityApp',
+  ml_module: 'mlApp',
+};
+
+export const ServiceIcons: Record<ServiceName, IconType> = {
+  elasticsearch: 'logoElasticsearch',
+  kibana: 'logoKibana',
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/hooks/index.ts b/x-pack/plugins/fleet/public/applications/integrations/hooks/index.ts
new file mode 100644
index 0000000000000..7f758e3c472c1
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/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 '../../../hooks';
+
+export { useBreadcrumbs } from './use_breadcrumbs';
+export { useLinks } from './use_links';
+export * from './use_local_search';
+export * from './use_package_install';
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
new file mode 100644
index 0000000000000..5c1745be0c9e4
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_breadcrumbs.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import { i18n } from '@kbn/i18n';
+import type { ChromeBreadcrumb } from 'src/core/public';
+
+import type { Page, DynamicPagePathValues } from '../constants';
+import { INTEGRATIONS_BASE_PATH, pagePathGetters } from '../constants';
+
+import { useStartServices } from './index';
+
+const BASE_BREADCRUMB: ChromeBreadcrumb = {
+  href: pagePathGetters.integrations()[1],
+  text: i18n.translate('xpack.fleet.breadcrumbs.integrationsAppTitle', {
+    defaultMessage: 'Integrations',
+  }),
+};
+
+const breadcrumbGetters: {
+  [key in Page]?: (values: DynamicPagePathValues) => ChromeBreadcrumb[];
+} = {
+  integrations: () => [
+    BASE_BREADCRUMB,
+    {
+      text: i18n.translate('xpack.fleet.breadcrumbs.integrationsPageTitle', {
+        defaultMessage: 'Integrations',
+      }),
+    },
+  ],
+  integrations_all: () => [
+    BASE_BREADCRUMB,
+    {
+      text: i18n.translate('xpack.fleet.breadcrumbs.allIntegrationsPageTitle', {
+        defaultMessage: 'Browse',
+      }),
+    },
+  ],
+  integrations_installed: () => [
+    BASE_BREADCRUMB,
+    {
+      text: i18n.translate('xpack.fleet.breadcrumbs.installedIntegrationsPageTitle', {
+        defaultMessage: 'Manage',
+      }),
+    },
+  ],
+  integration_details_overview: ({ pkgTitle }) => [BASE_BREADCRUMB, { text: pkgTitle }],
+  integration_policy_edit: ({ pkgTitle, pkgkey, policyName }) => [
+    BASE_BREADCRUMB,
+    {
+      href: pagePathGetters.integration_details_policies({ pkgkey })[1],
+      text: pkgTitle,
+    },
+    { text: policyName },
+  ],
+};
+
+export function useBreadcrumbs(page: Page, values: DynamicPagePathValues = {}) {
+  const { chrome, http } = useStartServices();
+  const breadcrumbs: ChromeBreadcrumb[] =
+    breadcrumbGetters[page]?.(values).map((breadcrumb) => ({
+      ...breadcrumb,
+      href: breadcrumb.href
+        ? http.basePath.prepend(`${INTEGRATIONS_BASE_PATH}#${breadcrumb.href}`)
+        : undefined,
+    })) || [];
+  const docTitle: string[] = [...breadcrumbs]
+    .reverse()
+    .map((breadcrumb) => breadcrumb.text as string);
+  chrome.docTitle.change(docTitle);
+  chrome.setBreadcrumbs(breadcrumbs);
+}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_links.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_links.tsx
similarity index 93%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_links.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/hooks/use_links.tsx
index 08bc53e4eea7f..ae9387a0606e4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_links.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_links.tsx
@@ -8,11 +8,7 @@
 import { useStartServices } from '../../../hooks/use_core';
 import { PLUGIN_ID } from '../../../constants';
 import { epmRouteService } from '../../../services';
-import type {
-  PackageSpecIcon,
-  PackageSpecScreenshot,
-  RegistryImage,
-} from '../../../../../../common';
+import type { PackageSpecIcon, PackageSpecScreenshot, RegistryImage } from '../../../../common';
 
 const removeRelativePath = (relativePath: string): string =>
   new URL(relativePath, 'http://example.com').pathname;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_local_search.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_local_search.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_local_search.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/hooks/use_local_search.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_package_install.tsx b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
similarity index 98%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_package_install.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
index 4f8242fe42613..342d6b54c2613 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/hooks/use_package_install.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/hooks/use_package_install.tsx
@@ -11,7 +11,7 @@ import { useHistory } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n/react';
 import type { NotificationsStart } from 'src/core/public';
 
-import { toMountPoint } from '../../../../../../../../../src/plugins/kibana_react/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
new file mode 100644
index 0000000000000..da8959a019ce5
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/index.tsx
@@ -0,0 +1,93 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { Redirect, Route } from 'react-router-dom';
+import type { RouteProps } from 'react-router-dom';
+
+import type { CoreStart, AppMountParameters } from 'src/core/public';
+
+import type { FleetConfigType, FleetStartServices } from '../../plugin';
+import { licenseService } from '../../hooks';
+import type { UIExtensionsStorage } from '../../types';
+
+import { AppRoutes, IntegrationsAppContext, WithPermissionsAndSetup } from './app';
+
+export interface ProtectedRouteProps extends RouteProps {
+  isAllowed?: boolean;
+  restrictedPath?: string;
+}
+
+export const ProtectedRoute: React.FunctionComponent<ProtectedRouteProps> = ({
+  isAllowed = false,
+  restrictedPath = '/',
+  ...routeProps
+}: ProtectedRouteProps) => {
+  return isAllowed ? <Route {...routeProps} /> : <Redirect to={{ pathname: restrictedPath }} />;
+};
+
+interface IntegrationsAppProps {
+  basepath: string;
+  startServices: FleetStartServices;
+  config: FleetConfigType;
+  history: AppMountParameters['history'];
+  kibanaVersion: string;
+  extensions: UIExtensionsStorage;
+}
+const IntegrationsApp = ({
+  basepath,
+  startServices,
+  config,
+  history,
+  kibanaVersion,
+  extensions,
+}: IntegrationsAppProps) => {
+  return (
+    <IntegrationsAppContext
+      basepath={basepath}
+      startServices={startServices}
+      config={config}
+      history={history}
+      kibanaVersion={kibanaVersion}
+      extensions={extensions}
+    >
+      <WithPermissionsAndSetup>
+        <AppRoutes />
+      </WithPermissionsAndSetup>
+    </IntegrationsAppContext>
+  );
+};
+
+export function renderApp(
+  startServices: FleetStartServices,
+  { element, appBasePath, history }: AppMountParameters,
+  config: FleetConfigType,
+  kibanaVersion: string,
+  extensions: UIExtensionsStorage
+) {
+  ReactDOM.render(
+    <IntegrationsApp
+      basepath={appBasePath}
+      startServices={startServices}
+      config={config}
+      history={history}
+      kibanaVersion={kibanaVersion}
+      extensions={extensions}
+    />,
+    element
+  );
+
+  return () => {
+    ReactDOM.unmountComponentAtNode(element);
+  };
+}
+
+export const teardownIntegrations = (coreStart: CoreStart) => {
+  coreStart.chrome.docTitle.reset();
+  coreStart.chrome.setBreadcrumbs([]);
+  licenseService.stop();
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
new file mode 100644
index 0000000000000..4c1ff4972b89e
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/default.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { memo } from 'react';
+import { EuiText, EuiBetaBadge } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+import { useLink } from '../../../hooks';
+import type { Section } from '../sections';
+
+import { HeroImage } from '../sections/epm/screens/home/header';
+
+import { WithHeaderLayout } from './';
+
+interface Props {
+  section?: Section;
+  children?: React.ReactNode;
+}
+
+export const DefaultLayout: React.FunctionComponent<Props> = memo(({ section, children }) => {
+  const { getHref } = useLink();
+
+  return (
+    <WithHeaderLayout
+      rightColumn={<HeroImage />}
+      leftColumn={
+        <EuiText>
+          <h1>
+            <FormattedMessage id="xpack.fleet.integrationsAppTitle" defaultMessage="Integrations" />{' '}
+            <EuiBetaBadge
+              label={<FormattedMessage id="xpack.fleet.betaLabel" defaultMessage="Beta" />}
+              tooltipContent={
+                <FormattedMessage
+                  id="xpack.fleet.integrationsBetaDescription"
+                  defaultMessage="Fleet is not recommended for production environments."
+                />
+              }
+            />
+          </h1>
+        </EuiText>
+      }
+      tabs={[
+        {
+          name: (
+            <FormattedMessage
+              id="xpack.fleet.appNavigation.integrationsAllLinkText"
+              defaultMessage="Browse"
+            />
+          ),
+          isSelected: section === 'browse',
+          href: getHref('integrations_all'),
+        },
+        {
+          name: (
+            <FormattedMessage
+              id="xpack.fleet.appNavigation.integrationsInstalledLinkText"
+              defaultMessage="Manage"
+            />
+          ),
+          isSelected: section === 'manage',
+          href: getHref('integrations_installed'),
+        },
+      ]}
+    >
+      {children}
+    </WithHeaderLayout>
+  );
+});
diff --git a/x-pack/plugins/fleet/public/applications/integrations/layouts/index.ts b/x-pack/plugins/fleet/public/applications/integrations/layouts/index.ts
new file mode 100644
index 0000000000000..71cb8d3aeeb36
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/layouts/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 '../../../layouts';
+
+export { DefaultLayout } from './default';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/assets_facet_group.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/assets_facet_group.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/assets_facet_group.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/assets_facet_group.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/icons.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/icons.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/icons.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/icons.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/package_card.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
similarity index 96%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/package_card.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
index be76f05b0f5a1..c12e67fdb5718 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/package_card.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_card.tsx
@@ -11,7 +11,7 @@ import { EuiCard } from '@elastic/eui';
 
 import type { PackageListItem } from '../../../types';
 import { useLink } from '../../../hooks';
-import { PackageIcon } from '../../../components/package_icon';
+import { PackageIcon } from '../../../components';
 
 import { RELEASE_BADGE_LABEL, RELEASE_BADGE_DESCRIPTION } from './release_badge';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/package_list_grid.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
similarity index 98%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/package_list_grid.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
index d4d2b481950f6..7e56c25c2bbe7 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/package_list_grid.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/package_list_grid.tsx
@@ -24,7 +24,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import { Loading } from '../../../components';
 import type { PackageList } from '../../../types';
-import { useLocalSearch, searchIdField } from '../hooks';
+import { useLocalSearch, searchIdField } from '../../../hooks';
 
 import { PackageCard } from './package_card';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/release_badge.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/release_badge.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/release_badge.ts
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/release_badge.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/requirements.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/requirements.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/requirements.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/requirements.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/version.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/version.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/components/version.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/components/version.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/constants.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/constants.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/constants.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/constants.tsx
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/index.tsx
new file mode 100644
index 0000000000000..07fd657a01708
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/index.tsx
@@ -0,0 +1,34 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { Switch, Route } from 'react-router-dom';
+
+import { INTEGRATIONS_ROUTING_PATHS } from '../../constants';
+import { useBreadcrumbs } from '../../hooks';
+
+import { EPMHomePage } from './screens/home';
+import { Detail } from './screens/detail';
+import { Policy } from './screens/policy';
+
+export const EPMApp: React.FunctionComponent = () => {
+  useBreadcrumbs('integrations');
+
+  return (
+    <Switch>
+      <Route path={INTEGRATIONS_ROUTING_PATHS.integration_policy_edit}>
+        <Policy />
+      </Route>
+      <Route path={INTEGRATIONS_ROUTING_PATHS.integration_details}>
+        <Detail />
+      </Route>
+      <Route path={INTEGRATIONS_ROUTING_PATHS.integrations}>
+        <EPMHomePage />
+      </Route>
+    </Switch>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/icon_panel.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/icon_panel.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/icon_panel.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/icon_panel.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/index.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/index.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/index.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/integration_agent_policy_count.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/integration_agent_policy_count.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/integration_agent_policy_count.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/integration_agent_policy_count.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/update_icon.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/update_icon.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/components/update_icon.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/components/update_icon.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/custom/custom.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom/custom.tsx
similarity index 79%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/custom/custom.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom/custom.tsx
index 6f76acbe187c6..ef8d21236c670 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/custom/custom.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom/custom.tsx
@@ -8,11 +8,10 @@ import React, { memo, useMemo } from 'react';
 import { Redirect } from 'react-router-dom';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { useUIExtension } from '../../../../../hooks/use_ui_extension';
-import { useLink } from '../../../../../hooks';
+import { useLink, useUIExtension } from '../../../../../hooks';
 import type { PackageInfo } from '../../../../../types';
-import { pkgKeyFromPackageInfo } from '../../../../../services/pkg_key_from_package_info';
-import { ExtensionWrapper } from '../../../../../components/extension_wrapper';
+import { pkgKeyFromPackageInfo } from '../../../../../services';
+import { ExtensionWrapper } from '../../../../../components';
 
 interface Props {
   packageInfo: PackageInfo;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/custom/index.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom/index.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/custom/index.ts
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/custom/index.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.scss b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.scss
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/index.scss
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.scss
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
new file mode 100644
index 0000000000000..3477335321a2c
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.test.tsx
@@ -0,0 +1,770 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, { lazy, memo } from 'react';
+import { Route } from 'react-router-dom';
+import { act, cleanup } from '@testing-library/react';
+
+import { INTEGRATIONS_ROUTING_PATHS, pagePathGetters } from '../../../../constants';
+import type {
+  GetAgentPoliciesResponse,
+  GetFleetStatusResponse,
+  GetInfoResponse,
+  GetPackagePoliciesResponse,
+  GetStatsResponse,
+} from '../../../../../../../common/types/rest_spec';
+import type {
+  DetailViewPanelName,
+  KibanaAssetType,
+} from '../../../../../../../common/types/models';
+import {
+  agentPolicyRouteService,
+  epmRouteService,
+  fleetSetupRouteService,
+  packagePolicyRouteService,
+} from '../../../../../../../common/services';
+import type { MockedFleetStartServices, TestRenderer } from '../../../../../../mock';
+import { createIntegrationsTestRendererMock } from '../../../../../../mock';
+
+import { Detail } from './index';
+
+describe('when on integration detail', () => {
+  const pkgkey = 'nginx-0.3.7';
+  const detailPageUrlPath = pagePathGetters.integration_details_overview({ pkgkey })[1];
+  let testRenderer: TestRenderer;
+  let renderResult: ReturnType<typeof testRenderer.render>;
+  let mockedApi: MockedApi<EpmPackageDetailsResponseProvidersMock>;
+  const render = () =>
+    (renderResult = testRenderer.render(
+      <Route path={INTEGRATIONS_ROUTING_PATHS.integration_details}>
+        <Detail />
+      </Route>
+    ));
+
+  beforeEach(() => {
+    testRenderer = createIntegrationsTestRendererMock();
+    mockedApi = mockApiCalls(testRenderer.startServices.http);
+    testRenderer.history.push(detailPageUrlPath);
+  });
+
+  afterEach(() => {
+    cleanup();
+    window.location.hash = '#/';
+  });
+
+  describe('and the package is installed', () => {
+    beforeEach(() => render());
+
+    it('should display agent policy usage count', async () => {
+      await mockedApi.waitForApi();
+      expect(renderResult.queryByTestId('agentPolicyCount')).not.toBeNull();
+    });
+
+    it('should show the Policies tab', async () => {
+      await mockedApi.waitForApi();
+      expect(renderResult.queryByTestId('tab-policies')).not.toBeNull();
+    });
+  });
+
+  describe('and the package is not installed', () => {
+    beforeEach(() => {
+      const unInstalledPackage = mockedApi.responseProvider.epmGetInfo();
+      unInstalledPackage.response.status = 'not_installed';
+      mockedApi.responseProvider.epmGetInfo.mockReturnValue(unInstalledPackage);
+      render();
+    });
+
+    it('should NOT display agent policy usage count', async () => {
+      await mockedApi.waitForApi();
+      expect(renderResult.queryByTestId('agentPolicyCount')).toBeNull();
+    });
+
+    it('should NOT the Policies tab', async () => {
+      await mockedApi.waitForApi();
+      expect(renderResult.queryByTestId('tab-policies')).toBeNull();
+    });
+  });
+
+  describe('and a custom UI extension is NOT registered', () => {
+    beforeEach(() => render());
+
+    it('should show overview and settings tabs', () => {
+      const tabs: DetailViewPanelName[] = ['overview', 'settings'];
+      for (const tab of tabs) {
+        expect(renderResult.getByTestId(`tab-${tab}`));
+      }
+    });
+
+    it('should not show a custom tab', () => {
+      expect(renderResult.queryByTestId('tab-custom')).toBeNull();
+    });
+
+    it('should redirect if custom url is accessed', () => {
+      act(() => {
+        testRenderer.history.push(
+          pagePathGetters.integration_details_custom({ pkgkey: 'nginx-0.3.7' })[1]
+        );
+      });
+      expect(testRenderer.history.location.pathname).toEqual('/detail/nginx-0.3.7/overview');
+    });
+  });
+
+  describe('and a custom UI extension is registered', () => {
+    // Because React Lazy components are loaded async (Promise), we setup this "watcher" Promise
+    // that is `resolved` once the lazy components actually renders.
+    let lazyComponentWasRendered: Promise<void>;
+
+    beforeEach(() => {
+      let setWasRendered: () => void;
+      lazyComponentWasRendered = new Promise((resolve) => {
+        setWasRendered = resolve;
+      });
+
+      const CustomComponent = lazy(async () => {
+        return {
+          default: memo(() => {
+            setWasRendered();
+            return <div data-test-subj="custom-hello">hello</div>;
+          }),
+        };
+      });
+
+      testRenderer.startInterface.registerExtension({
+        package: 'nginx',
+        view: 'package-detail-custom',
+        component: CustomComponent,
+      });
+
+      render();
+    });
+
+    afterEach(() => {
+      // @ts-ignore
+      lazyComponentWasRendered = undefined;
+    });
+
+    it('should display "custom" tab in navigation', () => {
+      expect(renderResult.getByTestId('tab-custom'));
+    });
+
+    it('should display custom content when tab is clicked', async () => {
+      act(() => {
+        testRenderer.history.push(
+          pagePathGetters.integration_details_custom({ pkgkey: 'nginx-0.3.7' })[1]
+        );
+      });
+      await lazyComponentWasRendered;
+      expect(renderResult.getByTestId('custom-hello'));
+    });
+  });
+
+  describe('and the Add integration button is clicked', () => {
+    beforeEach(() => render());
+
+    it('should link to the create page', () => {
+      const addButton = renderResult.getByTestId('addIntegrationPolicyButton') as HTMLAnchorElement;
+      expect(addButton.href).toEqual(
+        'http://localhost/mock/app/fleet#/integrations/nginx-0.3.7/add-integration'
+      );
+    });
+  });
+
+  describe('and on the Policies Tab', () => {
+    const policiesTabURLPath = pagePathGetters.integration_details_policies({ pkgkey })[1];
+    beforeEach(() => {
+      testRenderer.history.push(policiesTabURLPath);
+      render();
+    });
+
+    it('should display policies list', () => {
+      const table = renderResult.getByTestId('integrationPolicyTable');
+      expect(table).not.toBeNull();
+    });
+
+    it('should link to integration policy detail when an integration policy is clicked', async () => {
+      await mockedApi.waitForApi();
+      const firstPolicy = renderResult.getAllByTestId(
+        'integrationNameLink'
+      )[0] as HTMLAnchorElement;
+      expect(firstPolicy.href).toEqual(
+        'http://localhost/mock/app/integrations#/edit-integration/e8a37031-2907-44f6-89d2-98bd493f60dc'
+      );
+    });
+
+    it('should NOT show link for agent count if it is zero', async () => {
+      await mockedApi.waitForApi();
+      const firstRowAgentCount = renderResult.getAllByTestId('rowAgentCount')[0];
+      expect(firstRowAgentCount.textContent).toEqual('0');
+      expect(firstRowAgentCount.tagName).not.toEqual('A');
+    });
+
+    it('should show link for agent count if greater than zero', async () => {
+      await mockedApi.waitForApi();
+      const secondRowAgentCount = renderResult.getAllByTestId('rowAgentCount')[1];
+      expect(secondRowAgentCount.textContent).toEqual('100');
+      expect(secondRowAgentCount.tagName).toEqual('A');
+    });
+  });
+});
+
+interface MockedApi<
+  R extends Record<string, jest.MockedFunction<any>> = Record<string, jest.MockedFunction<any>>
+> {
+  /** Will return a promise that resolves when triggered APIs are complete */
+  waitForApi: () => Promise<void>;
+  /** A object containing the list of API response provider functions that are used by the mocked API */
+  responseProvider: R;
+}
+
+interface EpmPackageDetailsResponseProvidersMock {
+  epmGetInfo: jest.MockedFunction<() => GetInfoResponse>;
+  epmGetFile: jest.MockedFunction<() => string>;
+  epmGetStats: jest.MockedFunction<() => GetStatsResponse>;
+  fleetSetup: jest.MockedFunction<() => GetFleetStatusResponse>;
+  packagePolicyList: jest.MockedFunction<() => GetPackagePoliciesResponse>;
+  agentPolicyList: jest.MockedFunction<() => GetAgentPoliciesResponse>;
+}
+
+const mockApiCalls = (
+  http: MockedFleetStartServices['http']
+): MockedApi<EpmPackageDetailsResponseProvidersMock> => {
+  let inflightApiCalls = 0;
+  const apiDoneListeners: Array<() => void> = [];
+  const markApiCallAsHandled = async () => {
+    inflightApiCalls++;
+    await new Promise((r) => setTimeout(r, 1));
+    inflightApiCalls--;
+
+    // If no more pending API calls, then notify listeners
+    if (inflightApiCalls === 0 && apiDoneListeners.length > 0) {
+      apiDoneListeners.splice(0).forEach((listener) => listener());
+    }
+  };
+
+  // @ts-ignore
+  const epmPackageResponse: GetInfoResponse = {
+    response: {
+      name: 'nginx',
+      title: 'Nginx',
+      version: '0.3.7',
+      release: 'experimental',
+      description: 'Nginx Integration',
+      type: 'integration',
+      download: '/epr/nginx/nginx-0.3.7.zip',
+      path: '/package/nginx/0.3.7',
+      icons: [
+        {
+          src: '/img/logo_nginx.svg',
+          path: '/package/nginx/0.3.7/img/logo_nginx.svg',
+          title: 'logo nginx',
+          size: '32x32',
+          type: 'image/svg+xml',
+        },
+      ],
+      format_version: '1.0.0',
+      readme: '/package/nginx/0.3.7/docs/README.md',
+      license: 'basic',
+      categories: ['web', 'security'],
+      conditions: { 'kibana.version': '^7.9.0' },
+      screenshots: [
+        {
+          src: '/img/kibana-nginx.png',
+          path: '/package/nginx/0.3.7/img/kibana-nginx.png',
+          title: 'kibana nginx',
+          size: '1218x1266',
+          type: 'image/png',
+        },
+        {
+          src: '/img/metricbeat-nginx.png',
+          path: '/package/nginx/0.3.7/img/metricbeat-nginx.png',
+          title: 'metricbeat nginx',
+          size: '2560x2100',
+          type: 'image/png',
+        },
+      ],
+      assets: {
+        kibana: {
+          dashboard: [
+            {
+              pkgkey: 'nginx-0.3.7',
+              service: 'kibana',
+              type: 'dashboard' as KibanaAssetType,
+              file: 'nginx-023d2930-f1a5-11e7-a9ef-93c69af7b129.json',
+            },
+          ],
+          search: [
+            {
+              pkgkey: 'nginx-0.3.7',
+              service: 'kibana',
+              type: 'search' as KibanaAssetType,
+              file: 'nginx-6d9e66d0-a1f0-11e7-928f-5dbe6f6f5519.json',
+            },
+          ],
+          visualization: [
+            {
+              pkgkey: 'nginx-0.3.7',
+              service: 'kibana',
+              type: 'visualization' as KibanaAssetType,
+              file: 'nginx-0dd6f320-a29f-11e7-928f-5dbe6f6f5519.json',
+            },
+          ],
+        },
+      },
+      policy_templates: [
+        {
+          name: 'nginx',
+          title: 'Nginx logs and metrics',
+          description: 'Collect logs and metrics from Nginx instances',
+          inputs: [
+            {
+              type: 'logfile',
+              title: 'Collect logs from Nginx instances',
+              description: 'Collecting Nginx access, error and ingress controller logs',
+            },
+            {
+              type: 'nginx/metrics',
+              vars: [
+                {
+                  name: 'hosts',
+                  type: 'text',
+                  title: 'Hosts',
+                  multi: true,
+                  required: true,
+                  show_user: true,
+                  default: ['http://127.0.0.1:80'],
+                },
+              ],
+              title: 'Collect metrics from Nginx instances',
+              description: 'Collecting Nginx stub status metrics',
+            },
+          ],
+          multiple: true,
+        },
+      ],
+      data_streams: [
+        {
+          type: 'logs',
+          dataset: 'nginx.access',
+          title: 'Nginx access logs',
+          release: 'experimental',
+          ingest_pipeline: 'default',
+          streams: [
+            {
+              input: 'logfile',
+              vars: [
+                {
+                  name: 'paths',
+                  type: 'text',
+                  title: 'Paths',
+                  multi: true,
+                  required: true,
+                  show_user: true,
+                  default: ['/var/log/nginx/access.log*'],
+                },
+              ],
+              template_path: 'stream.yml.hbs',
+              title: 'Nginx access logs',
+              description: 'Collect Nginx access logs',
+              enabled: true,
+            },
+          ],
+          package: 'nginx',
+          path: 'access',
+        },
+        {
+          type: 'logs',
+          dataset: 'nginx.error',
+          title: 'Nginx error logs',
+          release: 'experimental',
+          ingest_pipeline: 'default',
+          streams: [
+            {
+              input: 'logfile',
+              vars: [
+                {
+                  name: 'paths',
+                  type: 'text',
+                  title: 'Paths',
+                  multi: true,
+                  required: true,
+                  show_user: true,
+                  default: ['/var/log/nginx/error.log*'],
+                },
+              ],
+              template_path: 'stream.yml.hbs',
+              title: 'Nginx error logs',
+              description: 'Collect Nginx error logs',
+              enabled: true,
+            },
+          ],
+          package: 'nginx',
+          path: 'error',
+        },
+        {
+          type: 'logs',
+          dataset: 'nginx.ingress_controller',
+          title: 'Nginx ingress_controller logs',
+          release: 'experimental',
+          ingest_pipeline: 'default',
+          streams: [
+            {
+              input: 'logfile',
+              vars: [
+                {
+                  name: 'paths',
+                  type: 'text',
+                  title: 'Paths',
+                  multi: true,
+                  required: true,
+                  show_user: true,
+                  default: ['/var/log/nginx/ingress.log*'],
+                },
+              ],
+              template_path: 'stream.yml.hbs',
+              title: 'Nginx ingress controller logs',
+              description: 'Collect Nginx ingress controller logs',
+              enabled: false,
+            },
+          ],
+          package: 'nginx',
+          path: 'ingress_controller',
+        },
+        {
+          type: 'metrics',
+          dataset: 'nginx.stubstatus',
+          title: 'Nginx stubstatus metrics',
+          release: 'experimental',
+          streams: [
+            {
+              input: 'nginx/metrics',
+              vars: [
+                {
+                  name: 'period',
+                  type: 'text',
+                  title: 'Period',
+                  multi: false,
+                  required: true,
+                  show_user: true,
+                  default: '10s',
+                },
+                {
+                  name: 'server_status_path',
+                  type: 'text',
+                  title: 'Server Status Path',
+                  multi: false,
+                  required: true,
+                  show_user: false,
+                  default: '/nginx_status',
+                },
+              ],
+              template_path: 'stream.yml.hbs',
+              title: 'Nginx stub status metrics',
+              description: 'Collect Nginx stub status metrics',
+              enabled: true,
+            },
+          ],
+          package: 'nginx',
+          path: 'stubstatus',
+        },
+      ],
+      owner: { github: 'elastic/integrations-services' },
+      latestVersion: '0.3.7',
+      removable: true,
+      status: 'installed',
+    },
+  } as GetInfoResponse;
+
+  const packageReadMe = `
+# Nginx Integration
+
+This integration periodically fetches metrics from [Nginx](https://nginx.org/) servers. It can parse access and error
+logs created by the HTTP server.
+
+## Compatibility
+
+The Nginx \`stubstatus\` metrics was tested with Nginx 1.9 and are expected to work with all version >= 1.9.
+The logs were tested with version 1.10.
+On Windows, the module was tested with Nginx installed from the Chocolatey repository.
+`;
+
+  const agentsSetupResponse: GetFleetStatusResponse = { isReady: true, missing_requirements: [] };
+
+  const packagePoliciesResponse: GetPackagePoliciesResponse = {
+    items: [
+      {
+        id: 'e8a37031-2907-44f6-89d2-98bd493f60dc',
+        version: 'WzgzMiwxXQ==',
+        name: 'nginx-1',
+        description: '',
+        namespace: 'default',
+        policy_id: '521c1b70-3976-11eb-ad1c-3baa423084d9',
+        enabled: true,
+        output_id: '',
+        inputs: [
+          {
+            type: 'logfile',
+            enabled: true,
+            streams: [
+              {
+                enabled: true,
+                data_stream: { type: 'logs', dataset: 'nginx.access' },
+                vars: { paths: { value: ['/var/log/nginx/access.log*'], type: 'text' } },
+                id: 'logfile-nginx.access-e8a37031-2907-44f6-89d2-98bd493f60dc',
+                compiled_stream: {
+                  paths: ['/var/log/nginx/access.log*'],
+                  exclude_files: ['.gz$'],
+                  processors: [{ add_locale: null }],
+                },
+              },
+              {
+                enabled: true,
+                data_stream: { type: 'logs', dataset: 'nginx.error' },
+                vars: { paths: { value: ['/var/log/nginx/error.log*'], type: 'text' } },
+                id: 'logfile-nginx.error-e8a37031-2907-44f6-89d2-98bd493f60dc',
+                compiled_stream: {
+                  paths: ['/var/log/nginx/error.log*'],
+                  exclude_files: ['.gz$'],
+                  multiline: {
+                    pattern: '^\\d{4}\\/\\d{2}\\/\\d{2} ',
+                    negate: true,
+                    match: 'after',
+                  },
+                  processors: [{ add_locale: null }],
+                },
+              },
+              {
+                enabled: false,
+                data_stream: { type: 'logs', dataset: 'nginx.ingress_controller' },
+                vars: { paths: { value: ['/var/log/nginx/ingress.log*'], type: 'text' } },
+                id: 'logfile-nginx.ingress_controller-e8a37031-2907-44f6-89d2-98bd493f60dc',
+              },
+            ],
+          },
+          {
+            type: 'nginx/metrics',
+            enabled: true,
+            streams: [
+              {
+                enabled: true,
+                data_stream: { type: 'metrics', dataset: 'nginx.stubstatus' },
+                vars: {
+                  period: { value: '10s', type: 'text' },
+                  server_status_path: { value: '/nginx_status', type: 'text' },
+                },
+                id: 'nginx/metrics-nginx.stubstatus-e8a37031-2907-44f6-89d2-98bd493f60dc',
+                compiled_stream: {
+                  metricsets: ['stubstatus'],
+                  hosts: ['http://127.0.0.1:80'],
+                  period: '10s',
+                  server_status_path: '/nginx_status',
+                },
+              },
+            ],
+            vars: { hosts: { value: ['http://127.0.0.1:80'], type: 'text' } },
+          },
+        ],
+        package: { name: 'nginx', title: 'Nginx', version: '0.3.7' },
+        revision: 1,
+        created_at: '2020-12-09T13:46:31.013Z',
+        created_by: 'elastic',
+        updated_at: '2020-12-09T13:46:31.013Z',
+        updated_by: 'elastic',
+      },
+      {
+        id: 'e3t37031-2907-44f6-89d2-5555555555',
+        version: 'WrrrMiwxXQ==',
+        name: 'nginx-2',
+        description: '',
+        namespace: 'default',
+        policy_id: '125c1b70-3976-11eb-ad1c-3baa423085y6',
+        enabled: true,
+        output_id: '',
+        inputs: [
+          {
+            type: 'logfile',
+            enabled: true,
+            streams: [
+              {
+                enabled: true,
+                data_stream: { type: 'logs', dataset: 'nginx.access' },
+                vars: { paths: { value: ['/var/log/nginx/access.log*'], type: 'text' } },
+                id: 'logfile-nginx.access-e8a37031-2907-44f6-89d2-98bd493f60dc',
+                compiled_stream: {
+                  paths: ['/var/log/nginx/access.log*'],
+                  exclude_files: ['.gz$'],
+                  processors: [{ add_locale: null }],
+                },
+              },
+              {
+                enabled: true,
+                data_stream: { type: 'logs', dataset: 'nginx.error' },
+                vars: { paths: { value: ['/var/log/nginx/error.log*'], type: 'text' } },
+                id: 'logfile-nginx.error-e8a37031-2907-44f6-89d2-98bd493f60dc',
+                compiled_stream: {
+                  paths: ['/var/log/nginx/error.log*'],
+                  exclude_files: ['.gz$'],
+                  multiline: {
+                    pattern: '^\\d{4}\\/\\d{2}\\/\\d{2} ',
+                    negate: true,
+                    match: 'after',
+                  },
+                  processors: [{ add_locale: null }],
+                },
+              },
+              {
+                enabled: false,
+                data_stream: { type: 'logs', dataset: 'nginx.ingress_controller' },
+                vars: { paths: { value: ['/var/log/nginx/ingress.log*'], type: 'text' } },
+                id: 'logfile-nginx.ingress_controller-e8a37031-2907-44f6-89d2-98bd493f60dc',
+              },
+            ],
+          },
+          {
+            type: 'nginx/metrics',
+            enabled: true,
+            streams: [
+              {
+                enabled: true,
+                data_stream: { type: 'metrics', dataset: 'nginx.stubstatus' },
+                vars: {
+                  period: { value: '10s', type: 'text' },
+                  server_status_path: { value: '/nginx_status', type: 'text' },
+                },
+                id: 'nginx/metrics-nginx.stubstatus-e8a37031-2907-44f6-89d2-98bd493f60dc',
+                compiled_stream: {
+                  metricsets: ['stubstatus'],
+                  hosts: ['http://127.0.0.1:80'],
+                  period: '10s',
+                  server_status_path: '/nginx_status',
+                },
+              },
+            ],
+            vars: { hosts: { value: ['http://127.0.0.1:80'], type: 'text' } },
+          },
+        ],
+        package: { name: 'nginx', title: 'Nginx', version: '0.3.7' },
+        revision: 3,
+        created_at: '2020-12-09T13:46:31.013Z',
+        created_by: 'elastic',
+        updated_at: '2020-12-09T13:46:31.013Z',
+        updated_by: 'elastic',
+      },
+    ],
+    total: 2,
+    page: 1,
+    perPage: 20,
+  };
+
+  const agentPoliciesResponse: GetAgentPoliciesResponse = {
+    items: [
+      {
+        id: '521c1b70-3976-11eb-ad1c-3baa423084d9',
+        name: 'Default',
+        namespace: 'default',
+        description: 'Default agent policy created by Kibana',
+        status: 'active',
+        package_policies: [
+          '4d09bd78-b0ad-4238-9fa3-d87d3c887c73',
+          '2babac18-eb8e-4ce4-b53b-4b7c5f507019',
+          'e8a37031-2907-44f6-89d2-98bd493f60dc',
+        ],
+        is_default: true,
+        is_managed: false,
+        monitoring_enabled: ['logs', 'metrics'],
+        revision: 6,
+        updated_at: '2020-12-09T13:46:31.840Z',
+        updated_by: 'elastic',
+        agents: 0,
+      },
+      {
+        id: '125c1b70-3976-11eb-ad1c-3baa423085y6',
+        name: 'EU Healthy agents',
+        namespace: 'default',
+        description: 'Protect EU from COVID',
+        status: 'active',
+        package_policies: ['e8a37031-2907-44f6-89d2-98bd493f60cd'],
+        is_default: false,
+        is_managed: false,
+        monitoring_enabled: ['logs', 'metrics'],
+        revision: 2,
+        updated_at: '2020-12-09T13:46:31.840Z',
+        updated_by: 'elastic',
+        agents: 100,
+      },
+    ],
+    total: 2,
+    page: 1,
+    perPage: 100,
+  };
+
+  const epmGetStatsResponse: GetStatsResponse = {
+    response: {
+      agent_policy_count: 2,
+    },
+  };
+
+  const mockedApiInterface: MockedApi<EpmPackageDetailsResponseProvidersMock> = {
+    waitForApi() {
+      return new Promise((resolve) => {
+        if (inflightApiCalls > 0) {
+          apiDoneListeners.push(resolve);
+        } else {
+          resolve();
+        }
+      });
+    },
+    responseProvider: {
+      epmGetInfo: jest.fn().mockReturnValue(epmPackageResponse),
+      epmGetFile: jest.fn().mockReturnValue(packageReadMe),
+      epmGetStats: jest.fn().mockReturnValue(epmGetStatsResponse),
+      fleetSetup: jest.fn().mockReturnValue(agentsSetupResponse),
+      packagePolicyList: jest.fn().mockReturnValue(packagePoliciesResponse),
+      agentPolicyList: jest.fn().mockReturnValue(agentPoliciesResponse),
+    },
+  };
+
+  http.get.mockImplementation(async (path: any) => {
+    if (typeof path === 'string') {
+      if (path === epmRouteService.getInfoPath(`nginx-0.3.7`)) {
+        markApiCallAsHandled();
+        return mockedApiInterface.responseProvider.epmGetInfo();
+      }
+
+      if (path === epmRouteService.getFilePath('/package/nginx/0.3.7/docs/README.md')) {
+        markApiCallAsHandled();
+        return mockedApiInterface.responseProvider.epmGetFile();
+      }
+
+      if (path === fleetSetupRouteService.getFleetSetupPath()) {
+        markApiCallAsHandled();
+        return mockedApiInterface.responseProvider.fleetSetup();
+      }
+
+      if (path === packagePolicyRouteService.getListPath()) {
+        markApiCallAsHandled();
+        return mockedApiInterface.responseProvider.packagePolicyList();
+      }
+
+      if (path === agentPolicyRouteService.getListPath()) {
+        markApiCallAsHandled();
+        return mockedApiInterface.responseProvider.agentPolicyList();
+      }
+
+      if (path === epmRouteService.getStatsPath('nginx')) {
+        markApiCallAsHandled();
+        return mockedApiInterface.responseProvider.epmGetStats();
+      }
+
+      const err = new Error(`API [GET ${path}] is not MOCKED!`);
+      // eslint-disable-next-line no-console
+      console.error(err);
+      throw err;
+    }
+  });
+
+  return mockedApiInterface;
+};
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx
new file mode 100644
index 0000000000000..68736455b818f
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/index.tsx
@@ -0,0 +1,452 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { ReactEventHandler } from 'react';
+import React, { useCallback, useEffect, useMemo, useState } from 'react';
+import { Redirect, Route, Switch, useLocation, useParams, useHistory } from 'react-router-dom';
+import styled from 'styled-components';
+import {
+  EuiBetaBadge,
+  EuiButton,
+  EuiButtonEmpty,
+  EuiDescriptionList,
+  EuiDescriptionListDescription,
+  EuiDescriptionListTitle,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiText,
+} from '@elastic/eui';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import semverLt from 'semver/functions/lt';
+
+import {
+  useGetPackageInstallStatus,
+  useSetPackageInstallStatus,
+  useUIExtension,
+  useBreadcrumbs,
+  useStartServices,
+} from '../../../../hooks';
+import {
+  PLUGIN_ID,
+  INTEGRATIONS_PLUGIN_ID,
+  INTEGRATIONS_ROUTING_PATHS,
+  pagePathGetters,
+} from '../../../../constants';
+import { useCapabilities, useGetPackageInfoByKey, useLink } from '../../../../hooks';
+import { pkgKeyFromPackageInfo } from '../../../../services';
+import type {
+  CreatePackagePolicyRouteState,
+  DetailViewPanelName,
+  PackageInfo,
+} from '../../../../types';
+import { InstallStatus } from '../../../../types';
+import { Error, Loading } from '../../../../components';
+import type { WithHeaderLayoutProps } from '../../../../layouts';
+import { WithHeaderLayout } from '../../../../layouts';
+import { RELEASE_BADGE_DESCRIPTION, RELEASE_BADGE_LABEL } from '../../components/release_badge';
+
+import { IntegrationAgentPolicyCount, UpdateIcon, IconPanel, LoadingIconPanel } from './components';
+import { OverviewPage } from './overview';
+import { PackagePoliciesPage } from './policies';
+import { SettingsPage } from './settings';
+import { CustomViewPage } from './custom';
+import './index.scss';
+
+export interface DetailParams {
+  pkgkey: string;
+  panel?: DetailViewPanelName;
+}
+
+const Divider = styled.div`
+  width: 0;
+  height: 100%;
+  border-left: ${(props) => props.theme.eui.euiBorderThin};
+`;
+
+// Allows child text to be truncated
+const FlexItemWithMinWidth = styled(EuiFlexItem)`
+  min-width: 0px;
+`;
+
+function Breadcrumbs({ packageTitle }: { packageTitle: string }) {
+  useBreadcrumbs('integration_details_overview', { pkgTitle: packageTitle });
+  return null;
+}
+
+export function Detail() {
+  const { pkgkey, panel } = useParams<DetailParams>();
+  const { getHref } = useLink();
+  const hasWriteCapabilites = useCapabilities().write;
+  const history = useHistory();
+  const { pathname, search, hash } = useLocation();
+  const queryParams = useMemo(() => new URLSearchParams(search), [search]);
+  const integration = useMemo(() => queryParams.get('integration'), [queryParams]);
+  const services = useStartServices();
+
+  // Package info state
+  const [packageInfo, setPackageInfo] = useState<PackageInfo | null>(null);
+  const setPackageInstallStatus = useSetPackageInstallStatus();
+  const getPackageInstallStatus = useGetPackageInstallStatus();
+
+  const packageInstallStatus = useMemo(() => {
+    if (packageInfo === null || !packageInfo.name) {
+      return undefined;
+    }
+    return getPackageInstallStatus(packageInfo.name).status;
+  }, [packageInfo, getPackageInstallStatus]);
+
+  const updateAvailable =
+    packageInfo &&
+    'savedObject' in packageInfo &&
+    packageInfo.savedObject &&
+    semverLt(packageInfo.savedObject.attributes.version, packageInfo.latestVersion);
+
+  // Fetch package info
+  const { data: packageInfoData, error: packageInfoError, isLoading } = useGetPackageInfoByKey(
+    pkgkey
+  );
+
+  const showCustomTab =
+    useUIExtension(packageInfoData?.response.name ?? '', 'package-detail-custom') !== undefined;
+
+  // Track install status state
+  useEffect(() => {
+    if (packageInfoData?.response) {
+      const packageInfoResponse = packageInfoData.response;
+      setPackageInfo(packageInfoResponse);
+
+      let installedVersion;
+      const { name } = packageInfoData.response;
+      if ('savedObject' in packageInfoResponse) {
+        installedVersion = packageInfoResponse.savedObject.attributes.version;
+      }
+      const status: InstallStatus = packageInfoResponse?.status as any;
+      if (name) {
+        setPackageInstallStatus({ name, status, version: installedVersion || null });
+      }
+    }
+  }, [packageInfoData, setPackageInstallStatus, setPackageInfo]);
+
+  const integrationInfo = useMemo(
+    () =>
+      integration
+        ? packageInfo?.policy_templates?.find(
+            (policyTemplate) => policyTemplate.name === integration
+          )
+        : undefined,
+    [integration, packageInfo]
+  );
+
+  const headerLeftContent = useMemo(
+    () => (
+      <EuiFlexGroup direction="column" gutterSize="m">
+        <EuiFlexItem>
+          {/* Allows button to break out of full width */}
+          <div>
+            <EuiButtonEmpty
+              iconType="arrowLeft"
+              size="xs"
+              flush="left"
+              href={getHref('integrations_all')}
+            >
+              <FormattedMessage
+                id="xpack.fleet.epm.browseAllButtonText"
+                defaultMessage="Browse all integrations"
+              />
+            </EuiButtonEmpty>
+          </div>
+        </EuiFlexItem>
+        <EuiFlexItem>
+          <EuiFlexGroup gutterSize="l">
+            <EuiFlexItem grow={false}>
+              {isLoading || !packageInfo ? (
+                <LoadingIconPanel />
+              ) : (
+                <IconPanel
+                  packageName={packageInfo.name}
+                  integrationName={integrationInfo?.name}
+                  version={packageInfo.version}
+                  icons={integrationInfo?.icons || packageInfo.icons}
+                />
+              )}
+            </EuiFlexItem>
+            <EuiFlexItem>
+              <EuiFlexGroup alignItems="center" gutterSize="m">
+                <FlexItemWithMinWidth grow={false}>
+                  <EuiText>
+                    {/* Render space in place of package name while package info loads to prevent layout from jumping around */}
+                    <h1>{integrationInfo?.title || packageInfo?.title || '\u00A0'}</h1>
+                  </EuiText>
+                </FlexItemWithMinWidth>
+                {packageInfo?.release && packageInfo.release !== 'ga' ? (
+                  <EuiFlexItem grow={false}>
+                    <EuiBetaBadge
+                      label={RELEASE_BADGE_LABEL[packageInfo.release]}
+                      tooltipContent={RELEASE_BADGE_DESCRIPTION[packageInfo.release]}
+                    />
+                  </EuiFlexItem>
+                ) : null}
+              </EuiFlexGroup>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    ),
+    [getHref, integrationInfo, isLoading, packageInfo]
+  );
+
+  const handleAddIntegrationPolicyClick = useCallback<ReactEventHandler>(
+    (ev) => {
+      ev.preventDefault();
+
+      // The object below, given to `createHref` is explicitly accessing keys of `location` in order
+      // to ensure that dependencies to this `useCallback` is set correctly (because `location` is mutable)
+      const currentPath = history.createHref({
+        pathname,
+        search,
+        hash,
+      });
+      const redirectToPath: CreatePackagePolicyRouteState['onSaveNavigateTo'] &
+        CreatePackagePolicyRouteState['onCancelNavigateTo'] = [
+        INTEGRATIONS_PLUGIN_ID,
+        {
+          path: currentPath,
+        },
+      ];
+      const redirectBackRouteState: CreatePackagePolicyRouteState = {
+        onSaveNavigateTo: redirectToPath,
+        onCancelNavigateTo: redirectToPath,
+        onCancelUrl: currentPath,
+      };
+
+      const path = pagePathGetters.add_integration_to_policy({
+        pkgkey,
+        ...(integration ? { integration } : {}),
+      })[1];
+
+      services.application.navigateToApp(PLUGIN_ID, {
+        // Necessary because of Fleet's HashRouter. Can be changed when
+        // https://github.com/elastic/kibana/issues/96134 is resolved
+        path: `#${path}`,
+        state: redirectBackRouteState,
+      });
+    },
+    [history, hash, pathname, search, pkgkey, integration, services.application]
+  );
+
+  const headerRightContent = useMemo(
+    () =>
+      packageInfo ? (
+        <>
+          <EuiSpacer size="l" />
+          <EuiFlexGroup justifyContent="flexEnd" direction="row">
+            {[
+              {
+                label: i18n.translate('xpack.fleet.epm.versionLabel', {
+                  defaultMessage: 'Version',
+                }),
+                content: (
+                  <EuiFlexGroup gutterSize="s">
+                    <EuiFlexItem>{packageInfo.version}</EuiFlexItem>
+                    {updateAvailable ? (
+                      <EuiFlexItem>
+                        <UpdateIcon />
+                      </EuiFlexItem>
+                    ) : null}
+                  </EuiFlexGroup>
+                ),
+              },
+              ...(packageInstallStatus === 'installed'
+                ? [
+                    { isDivider: true },
+                    {
+                      label: i18n.translate('xpack.fleet.epm.usedByLabel', {
+                        defaultMessage: 'Agent policies',
+                      }),
+                      'data-test-subj': 'agentPolicyCount',
+                      content: <IntegrationAgentPolicyCount packageName={packageInfo.name} />,
+                    },
+                  ]
+                : []),
+              { isDivider: true },
+              {
+                content: (
+                  // eslint-disable-next-line @elastic/eui/href-or-on-click
+                  <EuiButton
+                    fill
+                    isDisabled={!hasWriteCapabilites}
+                    iconType="plusInCircle"
+                    href={getHref('add_integration_to_policy', {
+                      pkgkey,
+                      ...(integration ? { integration } : {}),
+                    })}
+                    onClick={handleAddIntegrationPolicyClick}
+                    data-test-subj="addIntegrationPolicyButton"
+                  >
+                    <FormattedMessage
+                      id="xpack.fleet.epm.addPackagePolicyButtonText"
+                      defaultMessage="Add {packageName}"
+                      values={{
+                        packageName: integrationInfo?.title || packageInfo.title,
+                      }}
+                    />
+                  </EuiButton>
+                ),
+              },
+            ].map((item, index) => (
+              <EuiFlexItem grow={false} key={index} data-test-subj={item['data-test-subj']}>
+                {item.isDivider ?? false ? (
+                  <Divider />
+                ) : item.label ? (
+                  <EuiDescriptionList className="eui-textRight" compressed textStyle="reverse">
+                    <EuiDescriptionListTitle>{item.label}</EuiDescriptionListTitle>
+                    <EuiDescriptionListDescription>{item.content}</EuiDescriptionListDescription>
+                  </EuiDescriptionList>
+                ) : (
+                  item.content
+                )}
+              </EuiFlexItem>
+            ))}
+          </EuiFlexGroup>
+        </>
+      ) : undefined,
+    [
+      getHref,
+      handleAddIntegrationPolicyClick,
+      hasWriteCapabilites,
+      integration,
+      integrationInfo,
+      packageInfo,
+      packageInstallStatus,
+      pkgkey,
+      updateAvailable,
+    ]
+  );
+
+  const headerTabs = useMemo<WithHeaderLayoutProps['tabs']>(() => {
+    if (!packageInfo) {
+      return [];
+    }
+    const packageInfoKey = pkgKeyFromPackageInfo(packageInfo);
+
+    const tabs: WithHeaderLayoutProps['tabs'] = [
+      {
+        id: 'overview',
+        name: (
+          <FormattedMessage
+            id="xpack.fleet.epm.packageDetailsNav.overviewLinkText"
+            defaultMessage="Overview"
+          />
+        ),
+        isSelected: panel === 'overview',
+        'data-test-subj': `tab-overview`,
+        href: getHref('integration_details_overview', {
+          pkgkey: packageInfoKey,
+          ...(integration ? { integration } : {}),
+        }),
+      },
+    ];
+
+    if (packageInstallStatus === InstallStatus.installed) {
+      tabs.push({
+        id: 'policies',
+        name: (
+          <FormattedMessage
+            id="xpack.fleet.epm.packageDetailsNav.packagePoliciesLinkText"
+            defaultMessage="Policies"
+          />
+        ),
+        isSelected: panel === 'policies',
+        'data-test-subj': `tab-policies`,
+        href: getHref('integration_details_policies', {
+          pkgkey: packageInfoKey,
+          ...(integration ? { integration } : {}),
+        }),
+      });
+    }
+
+    tabs.push({
+      id: 'settings',
+      name: (
+        <FormattedMessage
+          id="xpack.fleet.epm.packageDetailsNav.settingsLinkText"
+          defaultMessage="Settings"
+        />
+      ),
+      isSelected: panel === 'settings',
+      'data-test-subj': `tab-settings`,
+      href: getHref('integration_details_settings', {
+        pkgkey: packageInfoKey,
+        ...(integration ? { integration } : {}),
+      }),
+    });
+
+    if (showCustomTab) {
+      tabs.push({
+        id: 'custom',
+        name: (
+          <FormattedMessage
+            id="xpack.fleet.epm.packageDetailsNav.packageCustomLinkText"
+            defaultMessage="Advanced"
+          />
+        ),
+        isSelected: panel === 'custom',
+        'data-test-subj': `tab-custom`,
+        href: getHref('integration_details_custom', {
+          pkgkey: packageInfoKey,
+          ...(integration ? { integration } : {}),
+        }),
+      });
+    }
+
+    return tabs;
+  }, [packageInfo, panel, getHref, integration, packageInstallStatus, showCustomTab]);
+
+  return (
+    <WithHeaderLayout
+      leftColumn={headerLeftContent}
+      rightColumn={headerRightContent}
+      rightColumnGrow={false}
+      tabs={headerTabs}
+      tabsClassName="fleet__epm__shiftNavTabs"
+    >
+      {integrationInfo || packageInfo ? (
+        <Breadcrumbs packageTitle={integrationInfo?.title || packageInfo?.title || ''} />
+      ) : null}
+      {packageInfoError ? (
+        <Error
+          title={
+            <FormattedMessage
+              id="xpack.fleet.epm.loadingIntegrationErrorTitle"
+              defaultMessage="Error loading integration details"
+            />
+          }
+          error={packageInfoError}
+        />
+      ) : isLoading || !packageInfo ? (
+        <Loading />
+      ) : (
+        <Switch>
+          <Route path={INTEGRATIONS_ROUTING_PATHS.integration_details_overview}>
+            <OverviewPage packageInfo={packageInfo} integrationInfo={integrationInfo} />
+          </Route>
+          <Route path={INTEGRATIONS_ROUTING_PATHS.integration_details_settings}>
+            <SettingsPage packageInfo={packageInfo} />
+          </Route>
+          <Route path={INTEGRATIONS_ROUTING_PATHS.integration_details_policies}>
+            <PackagePoliciesPage name={packageInfo.name} version={packageInfo.version} />
+          </Route>
+          <Route path={INTEGRATIONS_ROUTING_PATHS.integration_details_custom}>
+            <CustomViewPage packageInfo={packageInfo} />
+          </Route>
+          <Redirect to={INTEGRATIONS_ROUTING_PATHS.integration_details_overview} />
+        </Switch>
+      )}
+    </WithHeaderLayout>
+  );
+}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/details.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/details.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/details.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/index.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/index.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/index.ts
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/index.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/markdown_renderers.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/markdown_renderers.tsx
similarity index 91%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/markdown_renderers.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/markdown_renderers.tsx
index 47c327b17c241..cbc2f7b5f7888 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/markdown_renderers.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/markdown_renderers.tsx
@@ -60,8 +60,10 @@ export const markdownRenderers = {
     </EuiLink>
   ),
   code: ({ language, value }: { language: string; value: string }) => {
+    // Old packages are using `$json`, which is not valid any more with the move to prism.js
+    const parsedLang = language === '$json' ? 'json' : language;
     return (
-      <EuiCodeBlock language={language} isCopyable>
+      <EuiCodeBlock language={parsedLang} isCopyable>
         {value}
       </EuiCodeBlock>
     );
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/overview.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/overview.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/overview.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/overview.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/readme.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/readme.tsx
similarity index 94%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/readme.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/readme.tsx
index d92b4ce598fd2..240b3c7bf7442 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/readme.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/readme.tsx
@@ -9,8 +9,7 @@ import { EuiLoadingContent, EuiText } from '@elastic/eui';
 import React, { Fragment, useEffect, useState } from 'react';
 import ReactMarkdown from 'react-markdown';
 
-import { useLinks } from '../../../hooks';
-import { sendGetFileByPath } from '../../../../../hooks';
+import { useLinks, sendGetFileByPath } from '../../../../../hooks';
 
 import { markdownRenderers } from './markdown_renderers';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/screenshots.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/screenshots.tsx
similarity index 98%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/screenshots.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/screenshots.tsx
index 6df3a082ecb93..a2a765cf41165 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/overview/screenshots.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/overview/screenshots.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiText, EuiPagination } from '@elastic/eui';
 
 import type { ScreenshotItem } from '../../../../../types';
-import { useLinks } from '../../../hooks';
+import { useLinks } from '../../../../../hooks';
 
 interface ScreenshotProps {
   images: ScreenshotItem[];
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/index.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/index.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/index.ts
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/index.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/package_policies.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
similarity index 96%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/package_policies.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
index b14551098e688..d5dce6334762c 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/package_policies.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/package_policies.tsx
@@ -13,11 +13,10 @@ import { i18n } from '@kbn/i18n';
 import { FormattedRelative, FormattedMessage } from '@kbn/i18n/react';
 
 import { InstallStatus } from '../../../../../types';
-import { useLink, useUrlPagination } from '../../../../../hooks';
+import { useLink, useUrlPagination, useGetPackageInstallStatus } from '../../../../../hooks';
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../constants';
 import { AgentPolicySummaryLine } from '../../../../../components';
-import { LinkedAgentCount } from '../../../../../components/linked_agent_count';
-import { useGetPackageInstallStatus } from '../../../hooks';
+import { LinkedAgentCount } from '../../../../../components';
 
 import type { PackagePolicyAndAgentPolicy } from './use_package_policies_with_agent_policy';
 import { usePackagePoliciesWithAgentPolicy } from './use_package_policies_with_agent_policy';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/persona.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/persona.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/persona.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/persona.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/use_package_policies_with_agent_policy.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/use_package_policies_with_agent_policy.ts
similarity index 95%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/use_package_policies_with_agent_policy.ts
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/use_package_policies_with_agent_policy.ts
index f32047860717c..aae43a1acd568 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/policies/use_package_policies_with_agent_policy.ts
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/policies/use_package_policies_with_agent_policy.ts
@@ -15,9 +15,8 @@ import type {
 } from '../../../../../types';
 import { agentPolicyRouteService } from '../../../../../services';
 import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../constants';
-import { useGetPackagePolicies } from '../../../../../hooks';
-import { useConditionalRequest } from '../../../../../hooks/use_request/use_request';
-import type { SendConditionalRequestConfig } from '../../../../../hooks/use_request/use_request';
+import { useGetPackagePolicies, useConditionalRequest } from '../../../../../hooks';
+import type { SendConditionalRequestConfig } from '../../../../../hooks';
 
 export interface PackagePolicyEnriched extends PackagePolicy {
   _agentPolicy: GetAgentPoliciesResponseItem | undefined;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/confirm_package_install.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/confirm_package_install.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_install.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/confirm_package_uninstall.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/index.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/index.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/index.ts
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/index.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/installation_button.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/installation_button.tsx
similarity index 96%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/installation_button.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/installation_button.tsx
index 5edb695188a2d..8cf8466e6d9b0 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/installation_button.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/installation_button.tsx
@@ -11,8 +11,12 @@ import { FormattedMessage } from '@kbn/i18n/react';
 
 import type { PackageInfo } from '../../../../../types';
 import { InstallStatus } from '../../../../../types';
-import { useCapabilities } from '../../../../../hooks';
-import { useUninstallPackage, useGetPackageInstallStatus, useInstallPackage } from '../../../hooks';
+import {
+  useCapabilities,
+  useUninstallPackage,
+  useGetPackageInstallStatus,
+  useInstallPackage,
+} from '../../../../../hooks';
 
 import { ConfirmPackageUninstall } from './confirm_package_uninstall';
 import { ConfirmPackageInstall } from './confirm_package_install';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/settings.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
similarity index 98%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/settings.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
index f01364fc78157..995423ea91f96 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/detail/settings/settings.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/detail/settings/settings.tsx
@@ -14,9 +14,8 @@ import { EuiTitle, EuiFlexGroup, EuiFlexItem, EuiText, EuiSpacer } from '@elasti
 
 import type { PackageInfo } from '../../../../../types';
 import { InstallStatus } from '../../../../../types';
-import { useGetPackagePolicies } from '../../../../../hooks';
+import { useGetPackagePolicies, useGetPackageInstallStatus } from '../../../../../hooks';
 import { PACKAGE_POLICY_SAVED_OBJECT_TYPE } from '../../../../../constants';
-import { useGetPackageInstallStatus } from '../../../hooks';
 import { UpdateIcon } from '../components';
 
 import { InstallationButton } from './installation_button';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/category_facets.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/category_facets.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/category_facets.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/category_facets.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/header.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/header.tsx
similarity index 94%
rename from x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/header.tsx
rename to x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/header.tsx
index 54ee34e9021a5..55d058a2d7900 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/sections/epm/screens/home/header.tsx
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/header.tsx
@@ -11,8 +11,7 @@ import styled from 'styled-components';
 import { EuiFlexGroup, EuiFlexItem, EuiImage, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { useLinks } from '../../hooks';
-import { useStartServices } from '../../../../hooks';
+import { useLinks, useStartServices } from '../../../../hooks';
 
 export const HeroCopy = memo(() => {
   return (
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
new file mode 100644
index 0000000000000..6c635d5d0c9c0
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/home/index.tsx
@@ -0,0 +1,201 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, useMemo } from 'react';
+import { Switch, Route, useLocation, useHistory } from 'react-router-dom';
+import semverLt from 'semver/functions/lt';
+import { i18n } from '@kbn/i18n';
+
+import { installationStatuses } from '../../../../../../../common/constants';
+import { INTEGRATIONS_ROUTING_PATHS } from '../../../../constants';
+import { useGetCategories, useGetPackages, useBreadcrumbs } from '../../../../hooks';
+import { doesPackageHaveIntegrations } from '../../../../services';
+import { DefaultLayout } from '../../../../layouts';
+import type { CategorySummaryItem, PackageList } from '../../../../types';
+import { PackageListGrid } from '../../components/package_list_grid';
+
+import { CategoryFacets } from './category_facets';
+
+export const EPMHomePage: React.FC = memo(() => {
+  return (
+    <DefaultLayout>
+      <Switch>
+        <Route path={INTEGRATIONS_ROUTING_PATHS.integrations_installed}>
+          <InstalledPackages />
+        </Route>
+        <Route path={INTEGRATIONS_ROUTING_PATHS.integrations_all}>
+          <AvailablePackages />
+        </Route>
+      </Switch>
+    </DefaultLayout>
+  );
+});
+
+// Packages can export multiple integrations, aka `policy_templates`
+// In the case where packages ship >1 `policy_templates`, we flatten out the
+// list of packages by bringing all integrations to top-level so that
+// each integration is displayed as its own tile
+const packageListToIntegrationsList = (packages: PackageList): PackageList => {
+  return packages.reduce((acc: PackageList, pkg) => {
+    const { policy_templates: policyTemplates = [], ...restOfPackage } = pkg;
+    return [
+      ...acc,
+      restOfPackage,
+      ...(doesPackageHaveIntegrations(pkg)
+        ? policyTemplates.map((integration) => {
+            const { name, title, description, icons } = integration;
+            return {
+              ...restOfPackage,
+              id: `${restOfPackage}-${name}`,
+              integration: name,
+              title,
+              description,
+              icons: icons || restOfPackage.icons,
+            };
+          })
+        : []),
+    ];
+  }, []);
+};
+
+const InstalledPackages: React.FC = memo(() => {
+  useBreadcrumbs('integrations_installed');
+  const { data: allPackages, isLoading: isLoadingPackages } = useGetPackages({
+    experimental: true,
+  });
+  const [selectedCategory, setSelectedCategory] = useState('');
+
+  const allInstalledPackages = useMemo(
+    () =>
+      (allPackages?.response || []).filter((pkg) => pkg.status === installationStatuses.Installed),
+    [allPackages?.response]
+  );
+
+  const updatablePackages = useMemo(
+    () =>
+      allInstalledPackages.filter(
+        (item) =>
+          'savedObject' in item && semverLt(item.savedObject.attributes.version, item.version)
+      ),
+    [allInstalledPackages]
+  );
+
+  const title = useMemo(
+    () =>
+      i18n.translate('xpack.fleet.epmList.installedTitle', {
+        defaultMessage: 'Installed integrations',
+      }),
+    []
+  );
+
+  const categories = useMemo(
+    () => [
+      {
+        id: '',
+        title: i18n.translate('xpack.fleet.epmList.allFilterLinkText', {
+          defaultMessage: 'All',
+        }),
+        count: allInstalledPackages.length,
+      },
+      {
+        id: 'updates_available',
+        title: i18n.translate('xpack.fleet.epmList.updatesAvailableFilterLinkText', {
+          defaultMessage: 'Updates available',
+        }),
+        count: updatablePackages.length,
+      },
+    ],
+    [allInstalledPackages.length, updatablePackages.length]
+  );
+
+  const controls = useMemo(
+    () => (
+      <CategoryFacets
+        categories={categories}
+        selectedCategory={selectedCategory}
+        onCategoryChange={({ id }: CategorySummaryItem) => setSelectedCategory(id)}
+      />
+    ),
+    [categories, selectedCategory]
+  );
+
+  return (
+    <PackageListGrid
+      isLoading={isLoadingPackages}
+      controls={controls}
+      title={title}
+      list={selectedCategory === 'updates_available' ? updatablePackages : allInstalledPackages}
+    />
+  );
+});
+
+const AvailablePackages: React.FC = memo(() => {
+  useBreadcrumbs('integrations_all');
+  const history = useHistory();
+  const queryParams = new URLSearchParams(useLocation().search);
+  const initialCategory = queryParams.get('category') || '';
+  const [selectedCategory, setSelectedCategory] = useState(initialCategory);
+  const { data: allPackagesRes, isLoading: isLoadingAllPackages } = useGetPackages();
+  const { data: categoryPackagesRes, isLoading: isLoadingCategoryPackages } = useGetPackages({
+    category: selectedCategory,
+  });
+  const { data: categoriesRes, isLoading: isLoadingCategories } = useGetCategories({
+    include_policy_templates: true,
+  });
+  const packages = useMemo(
+    () => packageListToIntegrationsList(categoryPackagesRes?.response || []),
+    [categoryPackagesRes]
+  );
+
+  const title = useMemo(
+    () =>
+      i18n.translate('xpack.fleet.epmList.allTitle', {
+        defaultMessage: 'Browse by category',
+      }),
+    []
+  );
+
+  const categories = useMemo(
+    () => [
+      {
+        id: '',
+        title: i18n.translate('xpack.fleet.epmList.allPackagesFilterLinkText', {
+          defaultMessage: 'All',
+        }),
+        count: allPackagesRes?.response?.length || 0,
+      },
+      ...(categoriesRes ? categoriesRes.response : []),
+    ],
+    [allPackagesRes?.response?.length, categoriesRes]
+  );
+
+  const controls = categories ? (
+    <CategoryFacets
+      isLoading={isLoadingCategories || isLoadingAllPackages}
+      categories={categories}
+      selectedCategory={selectedCategory}
+      onCategoryChange={({ id }: CategorySummaryItem) => {
+        // clear category query param in the url
+        if (queryParams.get('category')) {
+          history.push({});
+        }
+        setSelectedCategory(id);
+      }}
+    />
+  ) : null;
+
+  return (
+    <PackageListGrid
+      isLoading={isLoadingCategoryPackages}
+      title={title}
+      controls={controls}
+      list={packages}
+      setSelectedCategory={setSelectedCategory}
+      showMissingIntegrationMessage
+    />
+  );
+});
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/policy/index.tsx b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/policy/index.tsx
new file mode 100644
index 0000000000000..cb95634de4c07
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/epm/screens/policy/index.tsx
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo } from 'react';
+import { useRouteMatch } from 'react-router-dom';
+
+// TODO: Needs to be moved
+import { EditPackagePolicyForm } from '../../../../../fleet/sections/agent_policy/edit_package_policy_page';
+
+export const Policy = memo(() => {
+  const {
+    params: { packagePolicyId },
+  } = useRouteMatch<{ packagePolicyId: string }>();
+
+  return <EditPackagePolicyForm packagePolicyId={packagePolicyId} from="package-edit" />;
+});
diff --git a/x-pack/plugins/fleet/public/applications/integrations/sections/index.ts b/x-pack/plugins/fleet/public/applications/integrations/sections/index.ts
new file mode 100644
index 0000000000000..caa399a6cb885
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/sections/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 type Section = 'manage' | 'browse';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/services/index.ts b/x-pack/plugins/fleet/public/applications/integrations/services/index.ts
new file mode 100644
index 0000000000000..dffc2027c19a7
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/services/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+export * from '../../../services';
diff --git a/x-pack/plugins/fleet/public/applications/integrations/types/index.ts b/x-pack/plugins/fleet/public/applications/integrations/types/index.ts
new file mode 100644
index 0000000000000..87e3ed4da55ea
--- /dev/null
+++ b/x-pack/plugins/fleet/public/applications/integrations/types/index.ts
@@ -0,0 +1,7 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+export * from '../../../types';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/alpha_flyout.tsx b/x-pack/plugins/fleet/public/components/alpha_flyout.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/alpha_flyout.tsx
rename to x-pack/plugins/fleet/public/components/alpha_flyout.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/alpha_messaging.tsx b/x-pack/plugins/fleet/public/components/alpha_messaging.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/alpha_messaging.tsx
rename to x-pack/plugins/fleet/public/components/alpha_messaging.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/context_menu_actions.tsx b/x-pack/plugins/fleet/public/components/context_menu_actions.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/context_menu_actions.tsx
rename to x-pack/plugins/fleet/public/components/context_menu_actions.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/error.tsx b/x-pack/plugins/fleet/public/components/error.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/error.tsx
rename to x-pack/plugins/fleet/public/components/error.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/extension_wrapper.tsx b/x-pack/plugins/fleet/public/components/extension_wrapper.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/extension_wrapper.tsx
rename to x-pack/plugins/fleet/public/components/extension_wrapper.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/header.tsx b/x-pack/plugins/fleet/public/components/header.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/header.tsx
rename to x-pack/plugins/fleet/public/components/header.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/index.tsx b/x-pack/plugins/fleet/public/components/home_integration/index.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/home_integration/index.tsx
rename to x-pack/plugins/fleet/public/components/home_integration/index.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_header_link.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
similarity index 95%
rename from x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_header_link.tsx
rename to x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
index 106df8a9afb1d..819fa03e2b6de 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_header_link.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_header_link.tsx
@@ -10,7 +10,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButtonEmpty } from '@elastic/eui';
 import type { TutorialDirectoryHeaderLinkComponent } from 'src/plugins/home/public';
 
-import { RedirectAppLinks } from '../../../../../../../../src/plugins/kibana_react/public';
+import { RedirectAppLinks } from '../../../../../../src/plugins/kibana_react/public';
 import { useLink, useCapabilities, useStartServices } from '../../hooks';
 
 import { tutorialDirectoryNoticeState$ } from './tutorial_directory_notice';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_notice.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_notice.tsx
similarity index 98%
rename from x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_notice.tsx
rename to x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_notice.tsx
index 4e8123a4fadec..5e4357d95235b 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_directory_notice.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_directory_notice.tsx
@@ -20,7 +20,7 @@ import {
 } from '@elastic/eui';
 import type { TutorialDirectoryNoticeComponent } from 'src/plugins/home/public';
 
-import { RedirectAppLinks } from '../../../../../../../../src/plugins/kibana_react/public';
+import { RedirectAppLinks } from '../../../../../../src/plugins/kibana_react/public';
 import {
   sendPutSettings,
   useGetSettings,
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_module_notice.tsx b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
similarity index 97%
rename from x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_module_notice.tsx
rename to x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
index 51870b482c3f2..f5b76de46e3a4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/home_integration/tutorial_module_notice.tsx
+++ b/x-pack/plugins/fleet/public/components/home_integration/tutorial_module_notice.tsx
@@ -11,7 +11,7 @@ import { EuiText, EuiLink, EuiSpacer } from '@elastic/eui';
 import type { TutorialModuleNoticeComponent } from 'src/plugins/home/public';
 
 import { useGetPackages, useLink, useCapabilities } from '../../hooks';
-import { pkgKeyFromPackageInfo } from '../../services/pkg_key_from_package_info';
+import { pkgKeyFromPackageInfo } from '../../services';
 
 const TutorialModuleNotice: TutorialModuleNoticeComponent = memo(({ moduleName }) => {
   const { getHref } = useLink();
diff --git a/x-pack/plugins/fleet/public/components/index.ts b/x-pack/plugins/fleet/public/components/index.ts
new file mode 100644
index 0000000000000..6db18c0e73a14
--- /dev/null
+++ b/x-pack/plugins/fleet/public/components/index.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+export { Loading } from './loading';
+export { Error } from './error';
+export { PackageIcon } from './package_icon';
+export { ContextMenuActions } from './context_menu_actions';
+export { LinkedAgentCount } from './linked_agent_count';
+export { ExtensionWrapper } from './extension_wrapper';
+export { AlphaMessaging } from './alpha_messaging';
+export { AlphaFlyout } from './alpha_flyout';
+export { HeaderProps, Header } from './header';
+export * from './link_and_revision';
+export * from './settings_flyout';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/link_and_revision.tsx b/x-pack/plugins/fleet/public/components/link_and_revision.tsx
similarity index 97%
rename from x-pack/plugins/fleet/public/applications/fleet/components/link_and_revision.tsx
rename to x-pack/plugins/fleet/public/components/link_and_revision.tsx
index 41ef63b23b564..dd36e4b1e239c 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/link_and_revision.tsx
+++ b/x-pack/plugins/fleet/public/components/link_and_revision.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import type { CSSProperties } from 'react';
 import React, { memo } from 'react';
 
-import type { AgentPolicy } from '../../../../common/types';
+import type { AgentPolicy } from '../../common/types';
 import { useLink } from '../hooks';
 const MIN_WIDTH: CSSProperties = { minWidth: 0 };
 const NO_WRAP_WHITE_SPACE: CSSProperties = { whiteSpace: 'nowrap' };
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/linked_agent_count.tsx b/x-pack/plugins/fleet/public/components/linked_agent_count.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/linked_agent_count.tsx
rename to x-pack/plugins/fleet/public/components/linked_agent_count.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/loading.tsx b/x-pack/plugins/fleet/public/components/loading.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/loading.tsx
rename to x-pack/plugins/fleet/public/components/loading.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/package_icon.tsx b/x-pack/plugins/fleet/public/components/package_icon.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/package_icon.tsx
rename to x-pack/plugins/fleet/public/components/package_icon.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/confirm_modal.tsx b/x-pack/plugins/fleet/public/components/settings_flyout/confirm_modal.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/confirm_modal.tsx
rename to x-pack/plugins/fleet/public/components/settings_flyout/confirm_modal.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/hosts_input.test.tsx b/x-pack/plugins/fleet/public/components/settings_flyout/hosts_input.test.tsx
similarity index 82%
rename from x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/hosts_input.test.tsx
rename to x-pack/plugins/fleet/public/components/settings_flyout/hosts_input.test.tsx
index 27bf5af72fb61..bd475acbb4feb 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/hosts_input.test.tsx
+++ b/x-pack/plugins/fleet/public/components/settings_flyout/hosts_input.test.tsx
@@ -8,12 +8,12 @@
 import React from 'react';
 import { fireEvent, act } from '@testing-library/react';
 
-import { createTestRendererMock } from '../../mock';
+import { createFleetTestRendererMock } from '../../mock';
 
 import { HostsInput } from './hosts_input';
 
 function renderInput(value = ['http://host1.com']) {
-  const renderer = createTestRendererMock();
+  const renderer = createFleetTestRendererMock();
   const mockOnChange = jest.fn();
 
   const utils = renderer.render(
@@ -66,3 +66,12 @@ test('it should allow to update existing host with multiple hosts', async () =>
   fireEvent.change(inputEl, { target: { value: 'http://newhost.com' } });
   expect(mockOnChange).toHaveBeenCalledWith(['http://newhost.com', 'http://host2.com']);
 });
+
+test('it should render an input if there is not hosts', async () => {
+  const { utils, mockOnChange } = renderInput([]);
+
+  const inputEl = await utils.findByDisplayValue('');
+  expect(inputEl).toBeDefined();
+  fireEvent.change(inputEl, { target: { value: 'http://newhost.com' } });
+  expect(mockOnChange).toHaveBeenCalledWith(['http://newhost.com']);
+});
diff --git a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/hosts_input.tsx b/x-pack/plugins/fleet/public/components/settings_flyout/hosts_input.tsx
similarity index 96%
rename from x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/hosts_input.tsx
rename to x-pack/plugins/fleet/public/components/settings_flyout/hosts_input.tsx
index 0e5f9a5e028b5..c99cad93b7ec6 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/components/settings_flyout/hosts_input.tsx
+++ b/x-pack/plugins/fleet/public/components/settings_flyout/hosts_input.tsx
@@ -27,7 +27,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 '../../../../../../src/plugins/kibana_react/common';
 
 interface Props {
   id: string;
@@ -132,7 +132,7 @@ const SortableTextField: FunctionComponent<SortableTextFieldProps> = React.memo(
 
 export const HostsInput: FunctionComponent<Props> = ({
   id,
-  value,
+  value: valueFromProps,
   onChange,
   helpText,
   label,
@@ -140,6 +140,10 @@ export const HostsInput: FunctionComponent<Props> = ({
   errors,
 }) => {
   const [autoFocus, setAutoFocus] = useState(false);
+  const value = useMemo(() => {
+    return valueFromProps.length ? valueFromProps : [''];
+  }, [valueFromProps]);
+
   const rows = useMemo(
     () =>
       value.map((host, idx) => ({
diff --git a/x-pack/plugins/fleet/public/components/settings_flyout/index.tsx b/x-pack/plugins/fleet/public/components/settings_flyout/index.tsx
new file mode 100644
index 0000000000000..6e09310823b32
--- /dev/null
+++ b/x-pack/plugins/fleet/public/components/settings_flyout/index.tsx
@@ -0,0 +1,418 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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, useCallback } from 'react';
+import { i18n } from '@kbn/i18n';
+import {
+  EuiFlyout,
+  EuiFlyoutBody,
+  EuiFlyoutHeader,
+  EuiTitle,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiButtonEmpty,
+  EuiSpacer,
+  EuiButton,
+  EuiFlyoutFooter,
+  EuiForm,
+  EuiFormRow,
+  EuiCode,
+  EuiCodeEditor,
+  EuiLink,
+  EuiPanel,
+} from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiText } from '@elastic/eui';
+import { safeLoad } from 'js-yaml';
+
+import {
+  useComboInput,
+  useStartServices,
+  useGetSettings,
+  useInput,
+  sendPutSettings,
+  useGetOutputs,
+  sendPutOutput,
+} from '../../hooks';
+import { isDiffPathProtocol } from '../../../common';
+
+import { SettingsConfirmModal } from './confirm_modal';
+import type { SettingsConfirmModalProps } from './confirm_modal';
+import { HostsInput } from './hosts_input';
+
+import 'brace/mode/yaml';
+import 'brace/theme/textmate';
+
+const URL_REGEX = /^(https?):\/\/[^\s$.?#].[^\s]*$/gm;
+
+interface Props {
+  onClose: () => void;
+}
+
+function isSameArrayValue(arrayA: string[] = [], arrayB: string[] = []) {
+  return arrayA.length === arrayB.length && arrayA.every((val, index) => val === arrayB[index]);
+}
+
+function useSettingsForm(outputId: string | undefined, onSuccess: () => void) {
+  const [isLoading, setIsloading] = React.useState(false);
+  const { notifications } = useStartServices();
+
+  const fleetServerHostsInput = useComboInput('fleetServerHostsComboBox', [], (value) => {
+    if (value.length === 0) {
+      return [
+        {
+          message: i18n.translate('xpack.fleet.settings.fleetServerHostsEmptyError', {
+            defaultMessage: 'At least one URL is required',
+          }),
+        },
+      ];
+    }
+
+    const res: Array<{ message: string; index: number }> = [];
+    value.forEach((val, idx) => {
+      if (!val.match(URL_REGEX)) {
+        res.push({
+          message: i18n.translate('xpack.fleet.settings.fleetServerHostsError', {
+            defaultMessage: 'Invalid URL',
+          }),
+          index: idx,
+        });
+      }
+    });
+    if (res.length) {
+      return res;
+    }
+
+    if (value.length && isDiffPathProtocol(value)) {
+      return [
+        {
+          message: i18n.translate(
+            'xpack.fleet.settings.fleetServerHostsDifferentPathOrProtocolError',
+            {
+              defaultMessage: 'Protocol and path must be the same for each URL',
+            }
+          ),
+        },
+      ];
+    }
+  });
+
+  const elasticsearchUrlInput = useComboInput('esHostsComboxBox', [], (value) => {
+    const res: Array<{ message: string; index: number }> = [];
+    value.forEach((val, idx) => {
+      if (!val.match(URL_REGEX)) {
+        res.push({
+          message: i18n.translate('xpack.fleet.settings.elasticHostError', {
+            defaultMessage: 'Invalid URL',
+          }),
+          index: idx,
+        });
+      }
+    });
+    if (res.length) {
+      return res;
+    }
+  });
+
+  const additionalYamlConfigInput = useInput('', (value) => {
+    try {
+      safeLoad(value);
+      return;
+    } catch (error) {
+      return [
+        i18n.translate('xpack.fleet.settings.invalidYamlFormatErrorMessage', {
+          defaultMessage: 'Invalid YAML: {reason}',
+          values: { reason: error.message },
+        }),
+      ];
+    }
+  });
+
+  const validate = useCallback(() => {
+    if (
+      !fleetServerHostsInput.validate() ||
+      !elasticsearchUrlInput.validate() ||
+      !additionalYamlConfigInput.validate()
+    ) {
+      return false;
+    }
+
+    return true;
+  }, [fleetServerHostsInput, elasticsearchUrlInput, additionalYamlConfigInput]);
+
+  return {
+    isLoading,
+    validate,
+    submit: async () => {
+      try {
+        setIsloading(true);
+        if (!outputId) {
+          throw new Error('Unable to load outputs');
+        }
+        const outputResponse = await sendPutOutput(outputId, {
+          hosts: elasticsearchUrlInput.value,
+          config_yaml: additionalYamlConfigInput.value,
+        });
+        if (outputResponse.error) {
+          throw outputResponse.error;
+        }
+        const settingsResponse = await sendPutSettings({
+          fleet_server_hosts: fleetServerHostsInput.value,
+        });
+        if (settingsResponse.error) {
+          throw settingsResponse.error;
+        }
+        notifications.toasts.addSuccess(
+          i18n.translate('xpack.fleet.settings.success.message', {
+            defaultMessage: 'Settings saved',
+          })
+        );
+        setIsloading(false);
+        onSuccess();
+      } catch (error) {
+        setIsloading(false);
+        notifications.toasts.addError(error, {
+          title: 'Error',
+        });
+      }
+    },
+    inputs: {
+      fleetServerHosts: fleetServerHostsInput,
+      elasticsearchUrl: elasticsearchUrlInput,
+      additionalYamlConfig: additionalYamlConfigInput,
+    },
+  };
+}
+
+export const SettingFlyout: React.FunctionComponent<Props> = ({ onClose }) => {
+  const settingsRequest = useGetSettings();
+  const settings = settingsRequest?.data?.item;
+  const outputsRequest = useGetOutputs();
+  const output = outputsRequest.data?.items?.[0];
+  const { inputs, submit, validate, isLoading } = useSettingsForm(output?.id, onClose);
+
+  const [isConfirmModalVisible, setConfirmModalVisible] = React.useState(false);
+
+  const onSubmit = useCallback(() => {
+    if (validate()) {
+      setConfirmModalVisible(true);
+    }
+  }, [validate, setConfirmModalVisible]);
+
+  const onConfirm = useCallback(() => {
+    setConfirmModalVisible(false);
+    submit();
+  }, [submit]);
+
+  const onConfirmModalClose = useCallback(() => {
+    setConfirmModalVisible(false);
+  }, [setConfirmModalVisible]);
+
+  useEffect(() => {
+    if (output) {
+      inputs.elasticsearchUrl.setValue(output.hosts || []);
+      inputs.additionalYamlConfig.setValue(output.config_yaml || '');
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [output]);
+
+  useEffect(() => {
+    if (settings) {
+      inputs.fleetServerHosts.setValue([...settings.fleet_server_hosts]);
+    }
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [settings]);
+
+  const isUpdated = React.useMemo(() => {
+    if (!settings || !output) {
+      return false;
+    }
+    return (
+      !isSameArrayValue(settings.fleet_server_hosts, inputs.fleetServerHosts.value) ||
+      !isSameArrayValue(output.hosts, inputs.elasticsearchUrl.value) ||
+      (output.config_yaml || '') !== inputs.additionalYamlConfig.value
+    );
+  }, [settings, inputs, output]);
+
+  const changes = React.useMemo(() => {
+    if (!settings || !output || !isConfirmModalVisible) {
+      return [];
+    }
+
+    const tmpChanges: SettingsConfirmModalProps['changes'] = [];
+    if (!isSameArrayValue(output.hosts, inputs.elasticsearchUrl.value)) {
+      tmpChanges.push(
+        {
+          type: 'elasticsearch',
+          direction: 'removed',
+          urls: output.hosts || [],
+        },
+        {
+          type: 'elasticsearch',
+          direction: 'added',
+          urls: inputs.elasticsearchUrl.value,
+        }
+      );
+    }
+
+    if (!isSameArrayValue(settings.fleet_server_hosts, inputs.fleetServerHosts.value)) {
+      tmpChanges.push(
+        {
+          type: 'fleet_server',
+          direction: 'removed',
+          urls: settings.fleet_server_hosts,
+        },
+        {
+          type: 'fleet_server',
+          direction: 'added',
+          urls: inputs.fleetServerHosts.value,
+        }
+      );
+    }
+
+    return tmpChanges;
+  }, [settings, inputs, output, isConfirmModalVisible]);
+
+  const body = settings && (
+    <EuiForm>
+      <EuiText color="subdued" size="s">
+        <FormattedMessage
+          id="xpack.fleet.settings.globalOutputDescription"
+          defaultMessage="These settings are applied globally to the {outputs} section of all agent policies and affect all enrolled agents."
+          values={{
+            outputs: <EuiCode>outputs</EuiCode>,
+          }}
+        />
+      </EuiText>
+      <EuiSpacer size="m" />
+      <EuiPanel hasShadow={false} hasBorder={true}>
+        <HostsInput
+          {...inputs.fleetServerHosts.props}
+          label={i18n.translate('xpack.fleet.settings.fleetServerHostsLabel', {
+            defaultMessage: 'Fleet Server hosts',
+          })}
+          helpText={
+            <FormattedMessage
+              id="xpack.fleet.settings.fleetServerHostsHelpTect"
+              defaultMessage="Specify the URLs that your agents will use to connect to a Fleet Server. If multiple URLs exist, Fleet shows the first provided URL for enrollment purposes. Refer to the {link}."
+              values={{
+                link: (
+                  <EuiLink
+                    href="https://www.elastic.co/guide/en/fleet/current/fleet-settings.html#fleet-server-hosts-setting"
+                    target="_blank"
+                    external
+                  >
+                    <FormattedMessage
+                      id="xpack.fleet.settings.userGuideLink"
+                      defaultMessage="Fleet User Guide"
+                    />
+                  </EuiLink>
+                ),
+              }}
+            />
+          }
+        />
+      </EuiPanel>
+      <EuiSpacer size="m" />
+      <EuiPanel hasShadow={false} hasBorder={true}>
+        <HostsInput
+          {...inputs.elasticsearchUrl.props}
+          label={i18n.translate('xpack.fleet.settings.elasticsearchUrlLabel', {
+            defaultMessage: 'Elasticsearch hosts',
+          })}
+          helpText={i18n.translate('xpack.fleet.settings.elasticsearchUrlsHelpTect', {
+            defaultMessage: 'Specify the Elasticsearch URLs where agents send data.',
+          })}
+        />
+      </EuiPanel>
+      <EuiSpacer size="m" />
+      <EuiPanel hasShadow={false} hasBorder={true}>
+        <EuiFormRow
+          {...inputs.additionalYamlConfig.formRowProps}
+          label={i18n.translate('xpack.fleet.settings.additionalYamlConfig', {
+            defaultMessage: 'Elasticsearch output configuration (YAML)',
+          })}
+          fullWidth
+        >
+          <EuiCodeEditor
+            width="100%"
+            mode="yaml"
+            theme="textmate"
+            placeholder="# YAML settings here will be added to the Elasticsearch output section of each policy"
+            setOptions={{
+              minLines: 10,
+              maxLines: 30,
+              tabSize: 2,
+              showGutter: false,
+              showPrintMargin: false,
+            }}
+            {...inputs.additionalYamlConfig.props}
+            onChange={inputs.additionalYamlConfig.setValue}
+          />
+        </EuiFormRow>
+      </EuiPanel>
+    </EuiForm>
+  );
+
+  return (
+    <>
+      {isConfirmModalVisible && (
+        <SettingsConfirmModal
+          changes={changes}
+          onConfirm={onConfirm}
+          onClose={onConfirmModalClose}
+        />
+      )}
+      <EuiFlyout onClose={onClose} size="m">
+        <EuiFlyoutHeader hasBorder aria-labelledby="IngestManagerSettingsFlyoutTitle">
+          <EuiTitle size="m">
+            <h2 id="IngestManagerSettingsFlyoutTitle">
+              <FormattedMessage
+                id="xpack.fleet.settings.flyoutTitle"
+                defaultMessage="Fleet settings"
+              />
+            </h2>
+          </EuiTitle>
+        </EuiFlyoutHeader>
+        <EuiFlyoutBody>{body}</EuiFlyoutBody>
+        <EuiFlyoutFooter>
+          <EuiFlexGroup justifyContent="spaceBetween">
+            <EuiFlexItem grow={false}>
+              <EuiButtonEmpty onClick={onClose} flush="left">
+                <FormattedMessage
+                  id="xpack.fleet.settings.cancelButtonLabel"
+                  defaultMessage="Cancel"
+                />
+              </EuiButtonEmpty>
+            </EuiFlexItem>
+            <EuiFlexItem grow={false}>
+              <EuiButton
+                disabled={!isUpdated}
+                onClick={onSubmit}
+                isLoading={isLoading}
+                color="primary"
+                fill
+              >
+                {isLoading ? (
+                  <FormattedMessage
+                    id="xpack.fleet.settings.saveButtonLoadingLabel"
+                    defaultMessage="Applying settings..."
+                  />
+                ) : (
+                  <FormattedMessage
+                    id="xpack.fleet.settings.saveButtonLabel"
+                    defaultMessage="Save and apply settings"
+                  />
+                )}
+              </EuiButton>
+            </EuiFlexItem>
+          </EuiFlexGroup>
+        </EuiFlyoutFooter>
+      </EuiFlyout>
+    </>
+  );
+};
diff --git a/x-pack/plugins/fleet/public/constants/index.ts b/x-pack/plugins/fleet/public/constants/index.ts
new file mode 100644
index 0000000000000..a7cc2726eace1
--- /dev/null
+++ b/x-pack/plugins/fleet/public/constants/index.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.
+ */
+
+export {
+  PLUGIN_ID,
+  INTEGRATIONS_PLUGIN_ID,
+  EPM_API_ROUTES,
+  AGENT_API_ROUTES,
+  SO_SEARCH_LIMIT,
+  AGENT_POLICY_SAVED_OBJECT_TYPE,
+  AGENT_SAVED_OBJECT_TYPE,
+  ENROLLMENT_API_KEYS_SAVED_OBJECT_TYPE,
+  PACKAGE_POLICY_SAVED_OBJECT_TYPE,
+  FLEET_SERVER_PACKAGE,
+  // Fleet Server index
+  AGENTS_INDEX,
+  ENROLLMENT_API_KEYS_INDEX,
+} from '../../common/constants';
+
+export * from './page_paths';
+
+export const INDEX_NAME = '.kibana';
diff --git a/x-pack/plugins/fleet/public/constants/page_paths.ts b/x-pack/plugins/fleet/public/constants/page_paths.ts
new file mode 100644
index 0000000000000..4ff71cf162e22
--- /dev/null
+++ b/x-pack/plugins/fleet/public/constants/page_paths.ts
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export type StaticPage =
+  | 'base'
+  | 'overview'
+  | 'integrations'
+  | 'integrations_all'
+  | 'integrations_installed'
+  | 'policies'
+  | 'policies_list'
+  | 'fleet'
+  | 'fleet_enrollment_tokens'
+  | 'data_streams';
+
+export type DynamicPage =
+  | 'integration_details_overview'
+  | 'integration_details_policies'
+  | 'integration_details_settings'
+  | 'integration_details_custom'
+  | 'integration_policy_edit'
+  | 'policy_details'
+  | 'add_integration_from_policy'
+  | 'add_integration_to_policy'
+  | 'edit_integration'
+  | 'fleet_agent_list'
+  | 'fleet_agent_details';
+
+export type Page = StaticPage | DynamicPage;
+
+export interface DynamicPagePathValues {
+  [key: string]: string;
+}
+
+export const FLEET_BASE_PATH = '/app/fleet';
+export const INTEGRATIONS_BASE_PATH = '/app/integrations';
+
+// If routing paths are changed here, please also check to see if
+// `pagePathGetters()`, below, needs any modifications
+export const FLEET_ROUTING_PATHS = {
+  overview: '/',
+  policies: '/policies',
+  policies_list: '/policies',
+  policy_details: '/policies/:policyId/:tabId?',
+  policy_details_settings: '/policies/:policyId/settings',
+  add_integration_from_policy: '/policies/:policyId/add-integration',
+  add_integration_to_policy: '/integrations/:pkgkey/add-integration/:integration?',
+  edit_integration: '/policies/:policyId/edit-integration/:packagePolicyId',
+  fleet: '/fleet',
+  fleet_agent_list: '/fleet/agents',
+  fleet_agent_details: '/fleet/agents/:agentId/:tabId?',
+  fleet_agent_details_logs: '/fleet/agents/:agentId/logs',
+  fleet_enrollment_tokens: '/fleet/enrollment-tokens',
+  data_streams: '/data-streams',
+};
+
+export const INTEGRATIONS_ROUTING_PATHS = {
+  integrations: '/:tabId',
+  integrations_all: '/browse',
+  integrations_installed: '/installed',
+  integration_details: '/detail/:pkgkey/:panel?',
+  integration_details_overview: '/detail/:pkgkey/overview',
+  integration_details_policies: '/detail/:pkgkey/policies',
+  integration_details_settings: '/detail/:pkgkey/settings',
+  integration_details_custom: '/detail/:pkgkey/custom',
+  integration_policy_edit: '/edit-integration/:packagePolicyId',
+};
+
+export const pagePathGetters: {
+  [key in StaticPage]: () => [string, string];
+} &
+  {
+    [key in DynamicPage]: (values: DynamicPagePathValues) => [string, string];
+  } = {
+  base: () => [FLEET_BASE_PATH, '/'],
+  overview: () => [FLEET_BASE_PATH, '/'],
+  integrations: () => [INTEGRATIONS_BASE_PATH, '/'],
+  integrations_all: () => [INTEGRATIONS_BASE_PATH, '/browse'],
+  integrations_installed: () => [INTEGRATIONS_BASE_PATH, '/installed'],
+  integration_details_overview: ({ pkgkey, integration }) => [
+    INTEGRATIONS_BASE_PATH,
+    `/detail/${pkgkey}/overview${integration ? `?integration=${integration}` : ''}`,
+  ],
+  integration_details_policies: ({ pkgkey, integration }) => [
+    INTEGRATIONS_BASE_PATH,
+    `/detail/${pkgkey}/policies${integration ? `?integration=${integration}` : ''}`,
+  ],
+  integration_details_settings: ({ pkgkey, integration }) => [
+    INTEGRATIONS_BASE_PATH,
+    `/detail/${pkgkey}/settings${integration ? `?integration=${integration}` : ''}`,
+  ],
+  integration_details_custom: ({ pkgkey, integration }) => [
+    INTEGRATIONS_BASE_PATH,
+    `/detail/${pkgkey}/custom${integration ? `?integration=${integration}` : ''}`,
+  ],
+  integration_policy_edit: ({ packagePolicyId }) => [
+    INTEGRATIONS_BASE_PATH,
+    `/edit-integration/${packagePolicyId}`,
+  ],
+  policies: () => [FLEET_BASE_PATH, '/policies'],
+  policies_list: () => [FLEET_BASE_PATH, '/policies'],
+  policy_details: ({ policyId, tabId }) => [
+    FLEET_BASE_PATH,
+    `/policies/${policyId}${tabId ? `/${tabId}` : ''}`,
+  ],
+  add_integration_from_policy: ({ policyId }) => [
+    FLEET_BASE_PATH,
+    `/policies/${policyId}/add-integration`,
+  ],
+  add_integration_to_policy: ({ pkgkey, integration }) => [
+    FLEET_BASE_PATH,
+    `/integrations/${pkgkey}/add-integration${integration ? `/${integration}` : ''}`,
+  ],
+  edit_integration: ({ policyId, packagePolicyId }) => [
+    FLEET_BASE_PATH,
+    `/policies/${policyId}/edit-integration/${packagePolicyId}`,
+  ],
+  fleet: () => [FLEET_BASE_PATH, '/fleet'],
+  fleet_agent_list: ({ kuery }) => [
+    FLEET_BASE_PATH,
+    `/fleet/agents${kuery ? `?kuery=${kuery}` : ''}`,
+  ],
+  fleet_agent_details: ({ agentId, tabId, logQuery }) => [
+    FLEET_BASE_PATH,
+    `/fleet/agents/${agentId}${tabId ? `/${tabId}` : ''}${logQuery ? `?_q=${logQuery}` : ''}`,
+  ],
+  fleet_enrollment_tokens: () => [FLEET_BASE_PATH, '/fleet/enrollment-tokens'],
+  data_streams: () => [FLEET_BASE_PATH, '/data-streams'],
+};
diff --git a/x-pack/plugins/fleet/public/hooks/index.ts b/x-pack/plugins/fleet/public/hooks/index.ts
new file mode 100644
index 0000000000000..0b413f72094d9
--- /dev/null
+++ b/x-pack/plugins/fleet/public/hooks/index.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.
+ */
+
+export { useCapabilities } from './use_capabilities';
+export { useStartServices } from './use_core';
+export { useConfig, ConfigContext } from './use_config';
+export { useKibanaVersion, KibanaVersionContext } from './use_kibana_version';
+export { licenseService, useLicense } from './use_license';
+export { useLink } from './use_link';
+export { useKibanaLink } from './use_kibana_link';
+export { usePackageIconType, UsePackageIconType } from './use_package_icon_type';
+export { usePagination, Pagination, PAGE_SIZE_OPTIONS } from './use_pagination';
+export { useUrlPagination } from './use_url_pagination';
+export { useSorting } from './use_sorting';
+export { useDebounce } from './use_debounce';
+export { useUrlModal } from './use_url_modal';
+export * from './use_request';
+export * from './use_input';
+export * from './use_url_params';
+export * from './use_fleet_status';
+export * from './use_ui_extension';
+export * from './use_intra_app_state';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_capabilities.ts b/x-pack/plugins/fleet/public/hooks/use_capabilities.ts
similarity index 88%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_capabilities.ts
rename to x-pack/plugins/fleet/public/hooks/use_capabilities.ts
index a0449ee8ab0cd..2da74f61ebe00 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_capabilities.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_capabilities.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useStartServices } from './';
+import { useStartServices } from './use_core';
 
 export function useCapabilities() {
   const core = useStartServices();
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_config.ts b/x-pack/plugins/fleet/public/hooks/use_config.ts
similarity index 90%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_config.ts
rename to x-pack/plugins/fleet/public/hooks/use_config.ts
index b72860efcc9ec..db86ed66bba60 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_config.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_config.ts
@@ -7,7 +7,7 @@
 
 import React, { useContext } from 'react';
 
-import type { FleetConfigType } from '../../../plugin';
+import type { FleetConfigType } from '../plugin';
 
 export const ConfigContext = React.createContext<FleetConfigType | null>(null);
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_core.ts b/x-pack/plugins/fleet/public/hooks/use_core.ts
similarity index 77%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_core.ts
rename to x-pack/plugins/fleet/public/hooks/use_core.ts
index 30b3a5da94e1c..be4a21a094bd4 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_core.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_core.ts
@@ -5,8 +5,8 @@
  * 2.0.
  */
 
-import type { FleetStartServices } from '../../../plugin';
-import { useKibana } from '../../../../../../../src/plugins/kibana_react/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/applications/fleet/hooks/use_debounce.tsx b/x-pack/plugins/fleet/public/hooks/use_debounce.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_debounce.tsx
rename to x-pack/plugins/fleet/public/hooks/use_debounce.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_fleet_status.tsx b/x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_fleet_status.tsx
rename to x-pack/plugins/fleet/public/hooks/use_fleet_status.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_input.ts b/x-pack/plugins/fleet/public/hooks/use_input.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_input.ts
rename to x-pack/plugins/fleet/public/hooks/use_input.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_intra_app_state.tsx b/x-pack/plugins/fleet/public/hooks/use_intra_app_state.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_intra_app_state.tsx
rename to x-pack/plugins/fleet/public/hooks/use_intra_app_state.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_kibana_link.ts b/x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_kibana_link.ts
rename to x-pack/plugins/fleet/public/hooks/use_kibana_link.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_kibana_version.ts b/x-pack/plugins/fleet/public/hooks/use_kibana_version.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_kibana_version.ts
rename to x-pack/plugins/fleet/public/hooks/use_kibana_version.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_license.ts b/x-pack/plugins/fleet/public/hooks/use_license.ts
similarity index 83%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_license.ts
rename to x-pack/plugins/fleet/public/hooks/use_license.ts
index fece509ed7485..f5b16c5f3aafc 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_license.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_license.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { LicenseService } from '../../../../common/services/license';
+import { LicenseService } from '../../common/services';
 
 export const licenseService = new LicenseService();
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_link.ts b/x-pack/plugins/fleet/public/hooks/use_link.ts
new file mode 100644
index 0000000000000..6917e0f5c3b8e
--- /dev/null
+++ b/x-pack/plugins/fleet/public/hooks/use_link.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 { pagePathGetters, PLUGIN_ID } from '../constants';
+import type { StaticPage, DynamicPage, DynamicPagePathValues } from '../constants';
+
+import { useStartServices } from './';
+
+const getSeparatePaths = (
+  page: StaticPage | DynamicPage,
+  values: DynamicPagePathValues = {}
+): [string, string] => {
+  return values ? pagePathGetters[page](values) : pagePathGetters[page as StaticPage]();
+};
+
+export const useLink = () => {
+  const core = useStartServices();
+  return {
+    getPath: (page: StaticPage | DynamicPage, values: DynamicPagePathValues = {}): string => {
+      return getSeparatePaths(page, values)[1];
+    },
+    getAssetsPath: (path: string) =>
+      core.http.basePath.prepend(`/plugins/${PLUGIN_ID}/assets/${path}`),
+    getHref: (page: StaticPage | DynamicPage, values?: DynamicPagePathValues) => {
+      const [basePath, path] = getSeparatePaths(page, values);
+      return core.http.basePath.prepend(`${basePath}#${path}`);
+    },
+  };
+};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_package_icon_type.ts b/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
similarity index 93%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_package_icon_type.ts
rename to x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
index 5701dd100bfed..c194d9914acff 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_package_icon_type.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_package_icon_type.ts
@@ -9,7 +9,9 @@ import { useEffect, useState } from 'react';
 import { ICON_TYPES } from '@elastic/eui';
 
 import type { PackageInfo, PackageListItem } from '../types';
-import { useLinks } from '../sections/epm/hooks';
+
+// TODO: Determine whether this can be relocated
+import { useLinks as useEPMLinks } from '../applications/integrations/hooks';
 
 import { sendGetPackageInfoByKey } from './index';
 
@@ -32,7 +34,7 @@ export const usePackageIconType = ({
   icons: paramIcons,
   tryApi = false,
 }: UsePackageIconType) => {
-  const { toPackageImage } = useLinks();
+  const { toPackageImage } = useEPMLinks();
   const [iconList, setIconList] = useState<UsePackageIconType['icons']>();
   const [iconType, setIconType] = useState<string>(''); // FIXME: use `empty` icon during initialization - see: https://github.com/elastic/kibana/issues/60622
   const cacheKey = `${packageName}-${version}${integrationName ? `-${integrationName}` : ''}`;
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_pagination.tsx b/x-pack/plugins/fleet/public/hooks/use_pagination.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_pagination.tsx
rename to x-pack/plugins/fleet/public/hooks/use_pagination.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/agent_policy.ts b/x-pack/plugins/fleet/public/hooks/use_request/agent_policy.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/agent_policy.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/agent_policy.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/agents.ts b/x-pack/plugins/fleet/public/hooks/use_request/agents.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/agents.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/agents.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/app.ts b/x-pack/plugins/fleet/public/hooks/use_request/app.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/app.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/app.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/data_stream.ts b/x-pack/plugins/fleet/public/hooks/use_request/data_stream.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/data_stream.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/data_stream.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/enrollment_api_keys.ts b/x-pack/plugins/fleet/public/hooks/use_request/enrollment_api_keys.ts
similarity index 87%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/enrollment_api_keys.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/enrollment_api_keys.ts
index 601d54ec56c46..7b3ddaada8001 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/enrollment_api_keys.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/enrollment_api_keys.ts
@@ -11,6 +11,8 @@ import type {
   GetOneEnrollmentAPIKeyResponse,
   GetEnrollmentAPIKeysResponse,
   GetEnrollmentAPIKeysRequest,
+  PostEnrollmentAPIKeyRequest,
+  PostEnrollmentAPIKeyResponse,
 } from '../../types';
 
 import { useRequest, sendRequest, useConditionalRequest } from './use_request';
@@ -65,3 +67,11 @@ export function useGetEnrollmentAPIKeys(
     ...options,
   });
 }
+
+export function sendCreateEnrollmentAPIKey(body: PostEnrollmentAPIKeyRequest['body']) {
+  return sendRequest<PostEnrollmentAPIKeyResponse>({
+    method: 'post',
+    path: enrollmentAPIKeyRouteService.getCreatePath(),
+    body,
+  });
+}
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/epm.ts b/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
similarity index 97%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/epm.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/epm.ts
index 3f3d2299fdebf..e209c50de057a 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/epm.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/epm.ts
@@ -16,7 +16,7 @@ import type {
   InstallPackageResponse,
   DeletePackageResponse,
 } from '../../types';
-import type { GetStatsResponse } from '../../../../../common';
+import type { GetStatsResponse } from '../../../common';
 
 import { useRequest, sendRequest } from './use_request';
 
diff --git a/x-pack/plugins/fleet/public/hooks/use_request/index.ts b/x-pack/plugins/fleet/public/hooks/use_request/index.ts
new file mode 100644
index 0000000000000..2973d2dcd3fc8
--- /dev/null
+++ b/x-pack/plugins/fleet/public/hooks/use_request/index.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.
+ */
+
+export * from './use_request';
+export * from './agent_policy';
+export * from './package_policy';
+export * from './data_stream';
+export * from './agents';
+export * from './enrollment_api_keys';
+export * from './epm';
+export * from './outputs';
+export * from './settings';
+export * from './setup';
+export * from './app';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/outputs.ts b/x-pack/plugins/fleet/public/hooks/use_request/outputs.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/outputs.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/outputs.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/package_policy.ts b/x-pack/plugins/fleet/public/hooks/use_request/package_policy.ts
similarity index 97%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/package_policy.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/package_policy.ts
index 89eab44a14461..5057b6f51b2c5 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/package_policy.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/package_policy.ts
@@ -18,7 +18,7 @@ import type {
   GetPackagePoliciesRequest,
   GetPackagePoliciesResponse,
   GetOnePackagePolicyResponse,
-} from '../../../../../common/types/rest_spec';
+} from '../../../common/types/rest_spec';
 
 import { sendRequest, useRequest } from './use_request';
 
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/settings.ts b/x-pack/plugins/fleet/public/hooks/use_request/settings.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/settings.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/settings.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/setup.ts b/x-pack/plugins/fleet/public/hooks/use_request/setup.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/setup.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/setup.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/use_request.ts b/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
similarity index 92%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/use_request.ts
rename to x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
index b42c6e68fb499..138c291a7226e 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_request/use_request.ts
+++ b/x-pack/plugins/fleet/public/hooks/use_request/use_request.ts
@@ -11,16 +11,16 @@ import type { HttpSetup } from 'src/core/public';
 import {
   sendRequest as _sendRequest,
   useRequest as _useRequest,
-} from '../../../../../../../../src/plugins/es_ui_shared/public';
+} from '../../../../../../src/plugins/es_ui_shared/public';
 import type {
   SendRequestConfig,
   SendRequestResponse,
   UseRequestConfig,
-} from '../../../../../../../../src/plugins/es_ui_shared/public';
+} from '../../../../../../src/plugins/es_ui_shared/public';
 
 let httpClient: HttpSetup;
 
-export type { UseRequestConfig } from '../../../../../../../../src/plugins/es_ui_shared/public';
+export type { UseRequestConfig } from '../../../../../../src/plugins/es_ui_shared/public';
 
 /**
  * @internal
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_sorting.tsx b/x-pack/plugins/fleet/public/hooks/use_sorting.tsx
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_sorting.tsx
rename to x-pack/plugins/fleet/public/hooks/use_sorting.tsx
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_ui_extension.ts b/x-pack/plugins/fleet/public/hooks/use_ui_extension.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_ui_extension.ts
rename to x-pack/plugins/fleet/public/hooks/use_ui_extension.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_url_modal.ts b/x-pack/plugins/fleet/public/hooks/use_url_modal.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_url_modal.ts
rename to x-pack/plugins/fleet/public/hooks/use_url_modal.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_url_pagination.ts b/x-pack/plugins/fleet/public/hooks/use_url_pagination.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_url_pagination.ts
rename to x-pack/plugins/fleet/public/hooks/use_url_pagination.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/hooks/use_url_params.ts b/x-pack/plugins/fleet/public/hooks/use_url_params.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/hooks/use_url_params.ts
rename to x-pack/plugins/fleet/public/hooks/use_url_params.ts
diff --git a/x-pack/plugins/fleet/public/index.ts b/x-pack/plugins/fleet/public/index.ts
index 0304b7b56181c..f563f008dbeb6 100644
--- a/x-pack/plugins/fleet/public/index.ts
+++ b/x-pack/plugins/fleet/public/index.ts
@@ -15,9 +15,9 @@ export const plugin = (initializerContext: PluginInitializerContext) => {
   return new FleetPlugin(initializerContext);
 };
 
-export type { NewPackagePolicy } from './applications/fleet/types';
-export * from './applications/fleet/types/intra_app_route_state';
-export * from './applications/fleet/types/ui_extensions';
+export type { NewPackagePolicy } from './types';
+export * from './types/intra_app_route_state';
+export * from './types/ui_extensions';
 
-export { pagePathGetters } from './applications/fleet/constants';
-export { pkgKeyFromPackageInfo } from './applications/fleet/services/pkg_key_from_package_info';
+export { pagePathGetters } from './constants';
+export { pkgKeyFromPackageInfo } from './services';
diff --git a/x-pack/plugins/fleet/public/layouts/index.ts b/x-pack/plugins/fleet/public/layouts/index.ts
new file mode 100644
index 0000000000000..e6e366654a866
--- /dev/null
+++ b/x-pack/plugins/fleet/public/layouts/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { WithHeaderLayout, WithHeaderLayoutProps } from './with_header';
+export { WithoutHeaderLayout } from './without_header';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/with_header.tsx b/x-pack/plugins/fleet/public/layouts/with_header.tsx
similarity index 90%
rename from x-pack/plugins/fleet/public/applications/fleet/layouts/with_header.tsx
rename to x-pack/plugins/fleet/public/layouts/with_header.tsx
index bb561ab82acaa..71f9b598c6428 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/layouts/with_header.tsx
+++ b/x-pack/plugins/fleet/public/layouts/with_header.tsx
@@ -5,13 +5,13 @@
  * 2.0.
  */
 
-import React, { Fragment } from 'react';
+import React from 'react';
 import { EuiPageBody, EuiSpacer } from '@elastic/eui';
 
 import type { HeaderProps } from '../components';
 import { Header } from '../components';
 
-import { Page, ContentWrapper } from './without_header';
+import { Page, ContentWrapper, Wrapper } from './without_header';
 
 export interface WithHeaderLayoutProps extends HeaderProps {
   restrictWidth?: number;
@@ -27,7 +27,7 @@ export const WithHeaderLayout: React.FC<WithHeaderLayoutProps> = ({
   'data-test-subj': dataTestSubj,
   ...rest
 }) => (
-  <Fragment>
+  <Wrapper>
     <Header
       maxWidth={restrictHeaderWidth}
       data-test-subj={dataTestSubj ? `${dataTestSubj}_header` : undefined}
@@ -44,5 +44,5 @@ export const WithHeaderLayout: React.FC<WithHeaderLayoutProps> = ({
         </ContentWrapper>
       </EuiPageBody>
     </Page>
-  </Fragment>
+  </Wrapper>
 );
diff --git a/x-pack/plugins/fleet/public/applications/fleet/layouts/without_header.tsx b/x-pack/plugins/fleet/public/layouts/without_header.tsx
similarity index 84%
rename from x-pack/plugins/fleet/public/applications/fleet/layouts/without_header.tsx
rename to x-pack/plugins/fleet/public/layouts/without_header.tsx
index 38b6198e088c5..220ee592d7d07 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/layouts/without_header.tsx
+++ b/x-pack/plugins/fleet/public/layouts/without_header.tsx
@@ -5,16 +5,19 @@
  * 2.0.
  */
 
-import React, { Fragment } from 'react';
+import React from 'react';
 import styled from 'styled-components';
 import { EuiPage, EuiPageBody, EuiSpacer } from '@elastic/eui';
 
+export const Wrapper = styled.div`
+  background-color: ${(props) => props.theme.eui.euiColorEmptyShade};
+`;
+
 export const Page = styled(EuiPage)`
   background: ${(props) => props.theme.eui.euiColorEmptyShade};
   width: 100%;
   align-self: center;
-  margin-left: 0;
-  margin-right: 0;
+  margin: auto;
   flex: 1;
 `;
 
@@ -28,7 +31,7 @@ interface Props {
 }
 
 export const WithoutHeaderLayout: React.FC<Props> = ({ restrictWidth, children }) => (
-  <Fragment>
+  <Wrapper>
     <Page restrictWidth={restrictWidth || 1200}>
       <EuiPageBody>
         <ContentWrapper>
@@ -37,5 +40,5 @@ export const WithoutHeaderLayout: React.FC<Props> = ({ restrictWidth, children }
         </ContentWrapper>
       </EuiPageBody>
     </Page>
-  </Fragment>
+  </Wrapper>
 );
diff --git a/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
new file mode 100644
index 0000000000000..71c9650709ee2
--- /dev/null
+++ b/x-pack/plugins/fleet/public/mock/create_test_renderer.tsx
@@ -0,0 +1,126 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import type { History } from 'history';
+import { createMemoryHistory, createHashHistory } from 'history';
+import React, { memo } from 'react';
+import type { RenderOptions, RenderResult } from '@testing-library/react';
+import { render as reactRender, act } from '@testing-library/react';
+
+import { ScopedHistory } from '../../../../../src/core/public';
+import { FleetAppContext } from '../applications/fleet/app';
+import { IntegrationsAppContext } from '../applications/integrations/app';
+import type { FleetConfigType } from '../plugin';
+import type { UIExtensionsStorage } from '../types';
+
+import { createConfigurationMock } from './plugin_configuration';
+import { createStartMock } from './plugin_interfaces';
+import { createStartServices } from './fleet_start_services';
+import type { MockedFleetStart, MockedFleetStartServices } from './types';
+
+type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
+
+/**
+ * Test Renderer that includes mocked services and interfaces used during Fleet applicaiton rendering.
+ * Any of the properties in this interface can be manipulated prior to `render()` if wanting to customize
+ * the rendering context.
+ */
+export interface TestRenderer {
+  /** History instance currently used by the Fleet UI Hash Router */
+  history: History<any>;
+  /** history instance provided to the Fleet plugin during application `mount()` */
+  mountHistory: ScopedHistory;
+  startServices: MockedFleetStartServices;
+  config: FleetConfigType;
+  /** The Interface returned by the Fleet plugin `start()` phase */
+  startInterface: MockedFleetStart;
+  kibanaVersion: string;
+  AppWrapper: React.FC<any>;
+  render: UiRender;
+}
+
+export const createFleetTestRendererMock = (): TestRenderer => {
+  const basePath = '/mock';
+  const extensions: UIExtensionsStorage = {};
+  const startServices = createStartServices(basePath);
+  const testRendererMocks: TestRenderer = {
+    history: createHashHistory(),
+    mountHistory: new ScopedHistory(createMemoryHistory({ initialEntries: [basePath] }), basePath),
+    startServices,
+    config: createConfigurationMock(),
+    startInterface: createStartMock(extensions),
+    kibanaVersion: '8.0.0',
+    AppWrapper: memo(({ children }) => {
+      return (
+        <FleetAppContext
+          basepath={basePath}
+          startServices={testRendererMocks.startServices}
+          config={testRendererMocks.config}
+          history={testRendererMocks.mountHistory}
+          kibanaVersion={testRendererMocks.kibanaVersion}
+          extensions={extensions}
+          routerHistory={testRendererMocks.history}
+        >
+          {children}
+        </FleetAppContext>
+      );
+    }),
+    render: (ui, options) => {
+      let renderResponse: RenderResult;
+      act(() => {
+        renderResponse = reactRender(ui, {
+          wrapper: testRendererMocks.AppWrapper,
+          ...options,
+        });
+      });
+      return renderResponse!;
+    },
+  };
+
+  return testRendererMocks;
+};
+
+export const createIntegrationsTestRendererMock = (): TestRenderer => {
+  const basePath = '/mock';
+  const extensions: UIExtensionsStorage = {};
+  const startServices = createStartServices(basePath);
+  const testRendererMocks: TestRenderer = {
+    history: createHashHistory(),
+    mountHistory: new ScopedHistory(createMemoryHistory({ initialEntries: [basePath] }), basePath),
+    startServices,
+    config: createConfigurationMock(),
+    startInterface: createStartMock(extensions),
+    kibanaVersion: '8.0.0',
+    AppWrapper: memo(({ children }) => {
+      return (
+        <IntegrationsAppContext
+          basepath={basePath}
+          startServices={testRendererMocks.startServices}
+          config={testRendererMocks.config}
+          history={testRendererMocks.mountHistory}
+          kibanaVersion={testRendererMocks.kibanaVersion}
+          extensions={extensions}
+          routerHistory={testRendererMocks.history}
+        >
+          {children}
+        </IntegrationsAppContext>
+      );
+    }),
+    render: (ui, options) => {
+      let renderResponse: RenderResult;
+      act(() => {
+        renderResponse = reactRender(ui, {
+          wrapper: testRendererMocks.AppWrapper,
+          ...options,
+        });
+      });
+      return renderResponse!;
+    },
+  };
+
+  return testRendererMocks;
+};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/fleet_start_services.tsx b/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
similarity index 89%
rename from x-pack/plugins/fleet/public/applications/fleet/mock/fleet_start_services.tsx
rename to x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
index ab75962c344df..675eaaa1905ea 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/mock/fleet_start_services.tsx
+++ b/x-pack/plugins/fleet/public/mock/fleet_start_services.tsx
@@ -9,9 +9,9 @@ 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 '../../../../../src/core/public/mocks';
+import type { IStorage } from '../../../../../src/plugins/kibana_utils/public';
+import { Storage } from '../../../../../src/plugins/kibana_utils/public';
 import { setHttpClient } from '../hooks/use_request';
 
 import { createStartDepsMock } from './plugin_dependencies';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/index.ts b/x-pack/plugins/fleet/public/mock/index.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/mock/index.ts
rename to x-pack/plugins/fleet/public/mock/index.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_configuration.ts b/x-pack/plugins/fleet/public/mock/plugin_configuration.ts
similarity index 87%
rename from x-pack/plugins/fleet/public/applications/fleet/mock/plugin_configuration.ts
rename to x-pack/plugins/fleet/public/mock/plugin_configuration.ts
index 7f0b71de779dc..097b6aa98c067 100644
--- a/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_configuration.ts
+++ b/x-pack/plugins/fleet/public/mock/plugin_configuration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import type { FleetConfigType } from '../../../plugin';
+import type { FleetConfigType } from '../plugin';
 
 export const createConfigurationMock = (): FleetConfigType => {
   return {
@@ -15,7 +15,7 @@ export const createConfigurationMock = (): FleetConfigType => {
     agents: {
       enabled: true,
       elasticsearch: {
-        host: '',
+        hosts: [''],
         ca_sha256: '',
       },
     },
diff --git a/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts b/x-pack/plugins/fleet/public/mock/plugin_dependencies.ts
new file mode 100644
index 0000000000000..16fa34e2d0b3d
--- /dev/null
+++ b/x-pack/plugins/fleet/public/mock/plugin_dependencies.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 { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
+import { licensingMock } from '../../../licensing/public/mocks';
+import { homePluginMock } from '../../../../../src/plugins/home/public/mocks';
+
+import type { MockedFleetSetupDeps, MockedFleetStartDeps } from './types';
+
+export const createSetupDepsMock = (): MockedFleetSetupDeps => {
+  return {
+    licensing: licensingMock.createSetup(),
+    data: dataPluginMock.createSetupContract(),
+    home: homePluginMock.createSetupContract(),
+  };
+};
+
+export const createStartDepsMock = (): MockedFleetStartDeps => {
+  return {
+    data: dataPluginMock.createStartContract(),
+  };
+};
diff --git a/x-pack/plugins/fleet/public/applications/fleet/mock/plugin_interfaces.ts b/x-pack/plugins/fleet/public/mock/plugin_interfaces.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/mock/plugin_interfaces.ts
rename to x-pack/plugins/fleet/public/mock/plugin_interfaces.ts
diff --git a/x-pack/plugins/fleet/public/mock/types.ts b/x-pack/plugins/fleet/public/mock/types.ts
new file mode 100644
index 0000000000000..5071eb71fece1
--- /dev/null
+++ b/x-pack/plugins/fleet/public/mock/types.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 { MockedKeys } from '@kbn/utility-types/jest';
+
+import type { FleetSetupDeps, FleetStart, FleetStartDeps, FleetStartServices } from '../plugin';
+
+export type MockedFleetStartServices = MockedKeys<FleetStartServices>;
+
+export type MockedFleetSetupDeps = MockedKeys<FleetSetupDeps>;
+
+export type MockedFleetStartDeps = MockedKeys<FleetStartDeps>;
+
+export type MockedFleetStart = MockedKeys<FleetStart>;
diff --git a/x-pack/plugins/fleet/public/mocks.ts b/x-pack/plugins/fleet/public/mocks.ts
index 305b229e1adb2..92b002a437649 100644
--- a/x-pack/plugins/fleet/public/mocks.ts
+++ b/x-pack/plugins/fleet/public/mocks.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { createStartMock } from './applications/fleet/mock';
+import { createStartMock } from './mock';
 
 export const fleetMock = {
   createStartMock,
diff --git a/x-pack/plugins/fleet/public/plugin.ts b/x-pack/plugins/fleet/public/plugin.ts
index f7951191f8914..f9515ca925a4a 100644
--- a/x-pack/plugins/fleet/public/plugin.ts
+++ b/x-pack/plugins/fleet/public/plugin.ts
@@ -24,24 +24,21 @@ import type { HomePublicPluginSetup } from '../../../../src/plugins/home/public'
 import { Storage } from '../../../../src/plugins/kibana_utils/public';
 import type { LicensingPluginSetup } from '../../licensing/public';
 import type { CloudSetup } from '../../cloud/public';
-import { PLUGIN_ID, setupRouteService, appRoutesService } from '../common';
+import { PLUGIN_ID, INTEGRATIONS_PLUGIN_ID, setupRouteService, appRoutesService } from '../common';
 import type { CheckPermissionsResponse, PostIngestSetupResponse } from '../common';
 
 import type { FleetConfigType } from '../common/types';
 
-import { BASE_PATH } from './applications/fleet/constants';
-import { licenseService } from './applications/fleet/hooks/use_license';
-import { setHttpClient } from './applications/fleet/hooks/use_request/use_request';
+import { FLEET_BASE_PATH } from './constants';
+import { licenseService } from './hooks';
+import { setHttpClient } from './hooks/use_request';
 import {
   TutorialDirectoryNotice,
   TutorialDirectoryHeaderLink,
   TutorialModuleNotice,
-} from './applications/fleet/components/home_integration';
-import { createExtensionRegistrationCallback } from './applications/fleet/services/ui_extensions';
-import type {
-  UIExtensionRegistrationCallback,
-  UIExtensionsStorage,
-} from './applications/fleet/types';
+} from './components/home_integration';
+import { createExtensionRegistrationCallback } from './services/ui_extensions';
+import type { UIExtensionRegistrationCallback, UIExtensionsStorage } from './types';
 
 export { FleetConfigType } from '../common/types';
 
@@ -96,6 +93,36 @@ export class FleetPlugin implements Plugin<FleetSetup, FleetStart, FleetSetupDep
     // Set up license service
     licenseService.start(deps.licensing.license$);
 
+    // Register Integrations app
+    core.application.register({
+      id: INTEGRATIONS_PLUGIN_ID,
+      category: DEFAULT_APP_CATEGORIES.management,
+      title: i18n.translate('xpack.fleet.integrationsAppTitle', {
+        defaultMessage: 'Integrations',
+      }),
+      order: 9019,
+      euiIconType: 'logoElastic',
+      mount: async (params: AppMountParameters) => {
+        const [coreStartServices, startDepsServices] = (await core.getStartServices()) as [
+          CoreStart,
+          FleetStartDeps,
+          FleetStart
+        ];
+        const startServices: FleetStartServices = {
+          ...coreStartServices,
+          ...startDepsServices,
+          storage: this.storage,
+        };
+        const { renderApp, teardownIntegrations } = await import('./applications/integrations');
+        const unmount = renderApp(startServices, params, config, kibanaVersion, extensions);
+
+        return () => {
+          unmount();
+          teardownIntegrations(startServices);
+        };
+      },
+    });
+
     // Register main Fleet app
     core.application.register({
       id: PLUGIN_ID,
@@ -156,7 +183,7 @@ export class FleetPlugin implements Plugin<FleetSetup, FleetStart, FleetSetupDep
         }),
         icon: 'indexManagementApp',
         showOnHomePage: true,
-        path: BASE_PATH,
+        path: FLEET_BASE_PATH,
         category: FeatureCatalogueCategory.DATA,
         order: 510,
       });
diff --git a/x-pack/plugins/fleet/public/services/index.ts b/x-pack/plugins/fleet/public/services/index.ts
new file mode 100644
index 0000000000000..4575efe963705
--- /dev/null
+++ b/x-pack/plugins/fleet/public/services/index.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.
+ */
+
+export { getFlattenedObject } from '@kbn/std';
+
+export {
+  AgentStatusKueryHelper,
+  agentPolicyRouteService,
+  packagePolicyRouteService,
+  dataStreamRouteService,
+  fleetSetupRouteService,
+  agentRouteService,
+  enrollmentAPIKeyRouteService,
+  epmRouteService,
+  setupRouteService,
+  outputRoutesService,
+  settingsRoutesService,
+  appRoutesService,
+  packageToPackagePolicy,
+  packageToPackagePolicyInputs,
+  storedPackagePoliciesToAgentInputs,
+  fullAgentPolicyToYaml,
+  isPackageLimited,
+  doesAgentPolicyAlreadyIncludePackage,
+  isValidNamespace,
+  LicenseService,
+  isAgentUpgradeable,
+  doesPackageHaveIntegrations,
+} from '../../common';
+
+export * from './pkg_key_from_package_info';
+export * from './ui_extensions';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/services/pkg_key_from_package_info.ts b/x-pack/plugins/fleet/public/services/pkg_key_from_package_info.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/services/pkg_key_from_package_info.ts
rename to x-pack/plugins/fleet/public/services/pkg_key_from_package_info.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/services/ui_extensions.test.ts b/x-pack/plugins/fleet/public/services/ui_extensions.test.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/services/ui_extensions.test.ts
rename to x-pack/plugins/fleet/public/services/ui_extensions.test.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/services/ui_extensions.ts b/x-pack/plugins/fleet/public/services/ui_extensions.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/services/ui_extensions.ts
rename to x-pack/plugins/fleet/public/services/ui_extensions.ts
diff --git a/x-pack/plugins/fleet/public/types/index.ts b/x-pack/plugins/fleet/public/types/index.ts
new file mode 100644
index 0000000000000..f21552d68e77b
--- /dev/null
+++ b/x-pack/plugins/fleet/public/types/index.ts
@@ -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.
+ */
+
+export {
+  // utility function
+  entries,
+  // Object types
+  Agent,
+  AgentMetadata,
+  AgentPolicy,
+  NewAgentPolicy,
+  SimplifiedAgentStatus,
+  EnrollmentAPIKey,
+  PackagePolicy,
+  NewPackagePolicy,
+  UpdatePackagePolicy,
+  PackagePolicyInput,
+  NewPackagePolicyInput,
+  PackagePolicyInputStream,
+  NewPackagePolicyInputStream,
+  PackagePolicyConfigRecord,
+  PackagePolicyConfigRecordEntry,
+  PackagePolicyPackage,
+  Output,
+  DataStream,
+  // API schema - misc setup, status
+  GetFleetStatusResponse,
+  // API schemas - Agent policy
+  GetAgentPoliciesRequest,
+  GetAgentPoliciesResponse,
+  GetAgentPoliciesResponseItem,
+  GetOneAgentPolicyResponse,
+  GetFullAgentPolicyResponse,
+  CreateAgentPolicyRequest,
+  CreateAgentPolicyResponse,
+  UpdateAgentPolicyRequest,
+  UpdateAgentPolicyResponse,
+  CopyAgentPolicyRequest,
+  CopyAgentPolicyResponse,
+  DeleteAgentPolicyRequest,
+  DeleteAgentPolicyResponse,
+  // API schemas - Package policy
+  CreatePackagePolicyRequest,
+  CreatePackagePolicyResponse,
+  UpdatePackagePolicyRequest,
+  UpdatePackagePolicyResponse,
+  GetPackagePoliciesResponse,
+  // API schemas - Data streams
+  GetDataStreamsResponse,
+  // API schemas - Agents
+  GetAgentsResponse,
+  GetAgentsRequest,
+  GetOneAgentResponse,
+  PostAgentUnenrollRequest,
+  PostAgentUnenrollResponse,
+  PostBulkAgentUnenrollRequest,
+  PostBulkAgentUnenrollResponse,
+  PostAgentUpgradeRequest,
+  PostBulkAgentUpgradeRequest,
+  PostAgentUpgradeResponse,
+  PostBulkAgentUpgradeResponse,
+  GetAgentStatusRequest,
+  GetAgentStatusResponse,
+  PutAgentReassignRequest,
+  PutAgentReassignResponse,
+  PostBulkAgentReassignRequest,
+  PostBulkAgentReassignResponse,
+  PostNewAgentActionResponse,
+  PostNewAgentActionRequest,
+  // API schemas - Enrollment API Keys
+  GetEnrollmentAPIKeysResponse,
+  GetEnrollmentAPIKeysRequest,
+  GetOneEnrollmentAPIKeyResponse,
+  PostEnrollmentAPIKeyRequest,
+  PostEnrollmentAPIKeyResponse,
+  // API schemas - Outputs
+  GetOutputsResponse,
+  PutOutputRequest,
+  PutOutputResponse,
+  // API schemas - Settings
+  GetSettingsResponse,
+  PutSettingsRequest,
+  PutSettingsResponse,
+  // API schemas - app
+  CheckPermissionsResponse,
+  GenerateServiceTokenResponse,
+  // EPM types
+  AssetReference,
+  AssetsGroupedByServiceByType,
+  AssetType,
+  AssetTypeToParts,
+  CategoryId,
+  CategorySummaryItem,
+  CategorySummaryList,
+  ElasticsearchAssetType,
+  KibanaAssetType,
+  PackageInfo,
+  RegistryVarsEntry,
+  RegistryInput,
+  RegistryStream,
+  RegistryPolicyTemplate,
+  PackageList,
+  PackageListItem,
+  PackagesGroupedByStatus,
+  RequirementsByServiceName,
+  RequirementVersion,
+  ScreenshotItem,
+  ServiceName,
+  GetCategoriesRequest,
+  GetCategoriesResponse,
+  GetPackagesRequest,
+  GetPackagesResponse,
+  GetLimitedPackagesResponse,
+  GetInfoResponse,
+  InstallPackageResponse,
+  DeletePackageResponse,
+  DetailViewPanelName,
+  InstallStatus,
+  InstallationStatus,
+  Installable,
+  RegistryRelease,
+  PackageSpecCategory,
+} from '../../common';
+
+export * from './intra_app_route_state';
+
+export * from './ui_extensions';
diff --git a/x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts b/x-pack/plugins/fleet/public/types/intra_app_route_state.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/types/intra_app_route_state.ts
rename to x-pack/plugins/fleet/public/types/intra_app_route_state.ts
diff --git a/x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts b/x-pack/plugins/fleet/public/types/ui_extensions.ts
similarity index 100%
rename from x-pack/plugins/fleet/public/applications/fleet/types/ui_extensions.ts
rename to x-pack/plugins/fleet/public/types/ui_extensions.ts
diff --git a/x-pack/plugins/fleet/server/collectors/agent_collectors.ts b/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
index 0eb392e784334..6a9a4cd9ba83c 100644
--- a/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
+++ b/x-pack/plugins/fleet/server/collectors/agent_collectors.ts
@@ -5,8 +5,7 @@
  * 2.0.
  */
 
-import type { SavedObjectsClient } from 'kibana/server';
-import type { ElasticsearchClient } from 'kibana/server';
+import type { SavedObjectsClient, ElasticsearchClient } from 'kibana/server';
 
 import type { FleetConfigType } from '../../common/types';
 import * as AgentService from '../services/agents';
@@ -18,6 +17,7 @@ export interface AgentUsage {
   unhealthy: number;
   offline: number;
   total_all_statuses: number;
+  updating: number;
 }
 
 export const getAgentUsage = async (
@@ -33,6 +33,7 @@ export const getAgentUsage = async (
       unhealthy: 0,
       offline: 0,
       total_all_statuses: 0,
+      updating: 0,
     };
   }
 
@@ -42,6 +43,7 @@ export const getAgentUsage = async (
     online,
     error,
     offline,
+    updating,
   } = await AgentService.getAgentStatusForAgentPolicy(soClient, esClient);
   return {
     total_enrolled: total,
@@ -49,5 +51,6 @@ export const getAgentUsage = async (
     unhealthy: error,
     offline,
     total_all_statuses: total + inactive,
+    updating,
   };
 };
diff --git a/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts b/x-pack/plugins/fleet/server/collectors/fleet_server_collector.ts
new file mode 100644
index 0000000000000..d861b211b8848
--- /dev/null
+++ b/x-pack/plugins/fleet/server/collectors/fleet_server_collector.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 type { SavedObjectsClient, ElasticsearchClient } from 'kibana/server';
+
+import { packagePolicyService, settingsService } from '../services';
+import { getAgentStatusForAgentPolicy } from '../services/agents';
+import { isFleetServerSetup } from '../services/fleet_server';
+
+const DEFAULT_USAGE = {
+  total_all_statuses: 0,
+  total_enrolled: 0,
+  healthy: 0,
+  unhealthy: 0,
+  offline: 0,
+  updating: 0,
+  num_host_urls: 0,
+};
+
+export interface FleetServerUsage {
+  total_enrolled: number;
+  healthy: number;
+  unhealthy: number;
+  offline: number;
+  updating: number;
+  total_all_statuses: number;
+  num_host_urls: number;
+}
+
+export const getFleetServerUsage = async (
+  soClient?: SavedObjectsClient,
+  esClient?: ElasticsearchClient
+): Promise<any> => {
+  if (!soClient || !esClient || !(await isFleetServerSetup())) {
+    return DEFAULT_USAGE;
+  }
+
+  const numHostsUrls =
+    (await settingsService.getSettings(soClient)).fleet_server_hosts?.length ?? 0;
+
+  // Find all policies with Fleet server than query agent status
+
+  let hasMore = true;
+  const policyIds = new Set<string>();
+  let page = 1;
+  while (hasMore) {
+    const res = await packagePolicyService.list(soClient, {
+      page: page++,
+      perPage: 20,
+      kuery: 'ingest-package-policies.package.name:fleet_server',
+    });
+
+    for (const item of res.items) {
+      policyIds.add(item.policy_id);
+    }
+
+    if (res.items.length === 0) {
+      hasMore = false;
+    }
+  }
+
+  if (policyIds.size === 0) {
+    return DEFAULT_USAGE;
+  }
+
+  const { total, inactive, online, error, updating, offline } = await getAgentStatusForAgentPolicy(
+    soClient,
+    esClient,
+    undefined,
+    Array.from(policyIds)
+      .map((policyId) => `(policy_id:"${policyId}")`)
+      .join(' or ')
+  );
+
+  return {
+    total_enrolled: total,
+    healthy: online,
+    unhealthy: error,
+    offline,
+    updating,
+    total_all_statuses: total + inactive,
+    num_host_urls: numHostsUrls,
+  };
+};
diff --git a/x-pack/plugins/fleet/server/collectors/register.ts b/x-pack/plugins/fleet/server/collectors/register.ts
index 842bb95fe813f..a097d423e7dd2 100644
--- a/x-pack/plugins/fleet/server/collectors/register.ts
+++ b/x-pack/plugins/fleet/server/collectors/register.ts
@@ -16,11 +16,14 @@ import type { AgentUsage } from './agent_collectors';
 import { getInternalClients } from './helpers';
 import { getPackageUsage } from './package_collectors';
 import type { PackageUsage } from './package_collectors';
+import { getFleetServerUsage } from './fleet_server_collector';
+import type { FleetServerUsage } from './fleet_server_collector';
 
 interface Usage {
   agents_enabled: boolean;
   agents: AgentUsage;
   packages: PackageUsage[];
+  fleet_server: FleetServerUsage;
 }
 
 export function registerFleetUsageCollector(
@@ -43,6 +46,7 @@ export function registerFleetUsageCollector(
       return {
         agents_enabled: getIsAgentsEnabled(config),
         agents: await getAgentUsage(config, soClient, esClient),
+        fleet_server: await getFleetServerUsage(soClient, esClient),
         packages: await getPackageUsage(soClient),
       };
     },
@@ -67,6 +71,12 @@ export function registerFleetUsageCollector(
             description: 'The total number of enrolled agents in an unhealthy state',
           },
         },
+        updating: {
+          type: 'long',
+          _meta: {
+            description: 'The total number of enrolled agents in an updating state',
+          },
+        },
         offline: {
           type: 'long',
           _meta: {
@@ -80,6 +90,51 @@ export function registerFleetUsageCollector(
           },
         },
       },
+      fleet_server: {
+        total_enrolled: {
+          type: 'long',
+          _meta: {
+            description: 'The total number of enrolled Fleet Server agents, in any state',
+          },
+        },
+        total_all_statuses: {
+          type: 'long',
+          _meta: {
+            description:
+              'The total number of Fleet Server agents in any state, both enrolled and inactive.',
+          },
+        },
+        healthy: {
+          type: 'long',
+          _meta: {
+            description: 'The total number of enrolled Fleet Server agents in a healthy state.',
+          },
+        },
+        unhealthy: {
+          type: 'long',
+          _meta: {
+            description: 'The total number of enrolled Fleet Server agents in an unhealthy state',
+          },
+        },
+        updating: {
+          type: 'long',
+          _meta: {
+            description: 'The total number of enrolled Fleet Server agents in an updating state',
+          },
+        },
+        offline: {
+          type: 'long',
+          _meta: {
+            description: 'The total number of enrolled Fleet Server agents currently offline',
+          },
+        },
+        num_host_urls: {
+          type: 'long',
+          _meta: {
+            description: 'The number of Fleet Server hosts configured in Fleet settings.',
+          },
+        },
+      },
       packages: {
         type: 'array',
         items: {
diff --git a/x-pack/plugins/fleet/server/index.ts b/x-pack/plugins/fleet/server/index.ts
index e83617413b744..0a886ffedbd6c 100644
--- a/x-pack/plugins/fleet/server/index.ts
+++ b/x-pack/plugins/fleet/server/index.ts
@@ -41,6 +41,23 @@ export const config: PluginConfigDescriptor = {
     unused('agents.pollingRequestTimeout'),
     unused('agents.tlsCheckDisabled'),
     unused('agents.fleetServerEnabled'),
+    (fullConfig, fromPath, addDeprecation) => {
+      const oldValue = fullConfig?.xpack?.fleet?.agents?.elasticsearch?.host;
+      if (oldValue) {
+        delete fullConfig.xpack.fleet.agents.elasticsearch.host;
+        fullConfig.xpack.fleet.agents.elasticsearch.hosts = [oldValue];
+        addDeprecation({
+          message: `Config key [xpack.fleet.agents.elasticsearch.host] is deprecated and replaced by [xpack.fleet.agents.elasticsearch.hosts]`,
+          correctiveActions: {
+            manualSteps: [
+              `Use [xpack.fleet.agents.elasticsearch.hosts] with an array of host instead.`,
+            ],
+          },
+        });
+      }
+
+      return fullConfig;
+    },
   ],
   schema: schema.object({
     enabled: schema.boolean({ defaultValue: true }),
@@ -49,7 +66,7 @@ export const config: PluginConfigDescriptor = {
     agents: schema.object({
       enabled: schema.boolean({ defaultValue: true }),
       elasticsearch: schema.object({
-        host: schema.maybe(schema.string()),
+        hosts: schema.maybe(schema.arrayOf(schema.uri({ scheme: ['http', 'https'] }))),
         ca_sha256: schema.maybe(schema.string()),
       }),
       fleet_server: schema.maybe(
diff --git a/x-pack/plugins/fleet/server/plugin.ts b/x-pack/plugins/fleet/server/plugin.ts
index 0fdc6ef651ed1..f933965effebf 100644
--- a/x-pack/plugins/fleet/server/plugin.ts
+++ b/x-pack/plugins/fleet/server/plugin.ts
@@ -36,6 +36,7 @@ import type {
   NewPackagePolicy,
   UpdatePackagePolicy,
 } from '../common';
+import { INTEGRATIONS_PLUGIN_ID } from '../common';
 import type { CloudSetup } from '../../cloud/server';
 
 import {
@@ -225,12 +226,12 @@ export class FleetPlugin
         id: PLUGIN_ID,
         name: 'Fleet',
         category: DEFAULT_APP_CATEGORIES.management,
-        app: [PLUGIN_ID, 'kibana'],
+        app: [PLUGIN_ID, INTEGRATIONS_PLUGIN_ID, 'kibana'],
         catalogue: ['fleet'],
         privileges: {
           all: {
             api: [`${PLUGIN_ID}-read`, `${PLUGIN_ID}-all`],
-            app: [PLUGIN_ID, 'kibana'],
+            app: [PLUGIN_ID, INTEGRATIONS_PLUGIN_ID, 'kibana'],
             catalogue: ['fleet'],
             savedObject: {
               all: allSavedObjectTypes,
@@ -240,7 +241,7 @@ export class FleetPlugin
           },
           read: {
             api: [`${PLUGIN_ID}-read`],
-            app: [PLUGIN_ID, 'kibana'],
+            app: [PLUGIN_ID, INTEGRATIONS_PLUGIN_ID, 'kibana'],
             catalogue: ['fleet'], // TODO: check if this is actually available to read user
             savedObject: {
               all: [],
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 b408d0908e768..b80ddfe8e7c9b 100644
--- a/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
+++ b/x-pack/plugins/fleet/server/routes/data_streams/handlers.ts
@@ -33,7 +33,7 @@ interface ESDataStreamInfo {
   };
   status: string;
   template: string;
-  ilm_policy: string;
+  ilm_policy?: string;
   hidden: boolean;
 }
 
diff --git a/x-pack/plugins/fleet/server/services/agent_policy.ts b/x-pack/plugins/fleet/server/services/agent_policy.ts
index 62b4578ab87b2..2a6036d99281e 100644
--- a/x-pack/plugins/fleet/server/services/agent_policy.ts
+++ b/x-pack/plugins/fleet/server/services/agent_policy.ts
@@ -47,6 +47,10 @@ import type {
   Output,
 } from '../../common';
 import { AgentPolicyNameExistsError, HostedAgentPolicyRestrictionRelatedError } from '../errors';
+import {
+  storedPackagePoliciesToAgentPermissions,
+  DEFAULT_PERMISSIONS,
+} from '../services/package_policies_to_agent_permissions';
 
 import { getPackageInfo } from './epm/packages';
 import { getAgentsByKuery } from './agents';
@@ -745,30 +749,49 @@ class AgentPolicyService {
           }),
     };
 
+    const permissions = (await storedPackagePoliciesToAgentPermissions(
+      soClient,
+      agentPolicy.package_policies
+    )) || { _fallback: DEFAULT_PERMISSIONS };
+
+    permissions._elastic_agent_checks = {
+      cluster: DEFAULT_PERMISSIONS.cluster,
+    };
+
+    // TODO fetch this from the elastic agent package
+    const monitoringOutput = fullAgentPolicy.agent?.monitoring.use_output;
+    const monitoringNamespace = fullAgentPolicy.agent?.monitoring.namespace;
+    if (
+      fullAgentPolicy.agent?.monitoring.enabled &&
+      monitoringNamespace &&
+      monitoringOutput &&
+      fullAgentPolicy.outputs[monitoringOutput]?.type === 'elasticsearch'
+    ) {
+      const names: string[] = [];
+      if (fullAgentPolicy.agent.monitoring.logs) {
+        names.push(`logs-elastic_agent.*-${monitoringNamespace}`);
+      }
+      if (fullAgentPolicy.agent.monitoring.metrics) {
+        names.push(`metrics-elastic_agent.*-${monitoringNamespace}`);
+      }
+
+      permissions._elastic_agent_checks.indices = [
+        {
+          names,
+          privileges: ['auto_configure', 'create_doc'],
+        },
+      ];
+    }
+
     // Only add permissions if output.type is "elasticsearch"
     fullAgentPolicy.output_permissions = Object.keys(fullAgentPolicy.outputs).reduce<
       NonNullable<FullAgentPolicy['output_permissions']>
-    >((permissions, outputName) => {
+    >((outputPermissions, outputName) => {
       const output = fullAgentPolicy.outputs[outputName];
       if (output && output.type === 'elasticsearch') {
-        permissions[outputName] = {};
-        permissions[outputName]._fallback = {
-          cluster: ['monitor'],
-          indices: [
-            {
-              names: [
-                'logs-*',
-                'metrics-*',
-                'traces-*',
-                '.logs-endpoint.diagnostic.collection-*',
-                'synthetics-*',
-              ],
-              privileges: ['auto_configure', 'create_doc'],
-            },
-          ],
-        };
+        outputPermissions[outputName] = permissions;
       }
-      return permissions;
+      return outputPermissions;
     }, {});
 
     // only add settings if not in standalone
diff --git a/x-pack/plugins/fleet/server/services/agents/crud.ts b/x-pack/plugins/fleet/server/services/agents/crud.ts
index b8ce7c36e507f..33f2a5cb120c8 100644
--- a/x-pack/plugins/fleet/server/services/agents/crud.ts
+++ b/x-pack/plugins/fleet/server/services/agents/crud.ts
@@ -140,7 +140,7 @@ export async function getAgentsByKuery(
 
   return {
     agents,
-    total: (res.body.hits.total as estypes.TotalHits).value,
+    total: (res.body.hits.total as estypes.SearchTotalHits).value,
     page,
     perPage,
   };
@@ -212,11 +212,11 @@ export async function getAgentById(esClient: ElasticsearchClient, agentId: strin
 
 export function isAgentDocument(
   maybeDocument: any
-): maybeDocument is estypes.MultiGetHit<FleetServerAgent> {
+): maybeDocument is estypes.MgetHit<FleetServerAgent> {
   return '_id' in maybeDocument && '_source' in maybeDocument;
 }
 
-export type ESAgentDocumentResult = estypes.MultiGetHit<FleetServerAgent>;
+export type ESAgentDocumentResult = estypes.MgetHit<FleetServerAgent>;
 export async function getAgentDocuments(
   esClient: ElasticsearchClient,
   agentIds: string[]
diff --git a/x-pack/plugins/fleet/server/services/agents/helpers.ts b/x-pack/plugins/fleet/server/services/agents/helpers.ts
index c4273a57ddffd..822a2a9df98d5 100644
--- a/x-pack/plugins/fleet/server/services/agents/helpers.ts
+++ b/x-pack/plugins/fleet/server/services/agents/helpers.ts
@@ -11,7 +11,7 @@ import type { SearchHit } from '../../../../../../typings/elasticsearch';
 import type { Agent, AgentSOAttributes, FleetServerAgent } from '../../types';
 
 type FleetServerAgentESResponse =
-  | estypes.MultiGetHit<FleetServerAgent>
+  | estypes.MgetHit<FleetServerAgent>
   | estypes.SearchResponse<FleetServerAgent>['hits']['hits'][0]
   | SearchHit<FleetServerAgent>;
 
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 63085b7729c4b..a87432c639249 100644
--- a/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/reassign.test.ts
@@ -85,7 +85,7 @@ describe('reassignAgents (plural)', () => {
     // calls ES update with correct values
     const calledWith = esClient.bulk.mock.calls[0][0];
     // only 1 are regular and bulk write two line per update
-    expect(calledWith.body.length).toBe(2);
+    expect(calledWith.body?.length).toBe(2);
     // @ts-expect-error
     expect(calledWith.body[0].update._id).toEqual(agentInRegularDoc._id);
   });
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 33f12dc52dc00..3621bc5025ab3 100644
--- a/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
+++ b/x-pack/plugins/fleet/server/services/agents/unenroll.test.ts
@@ -94,11 +94,11 @@ describe('unenrollAgents (plural)', () => {
     // calls ES update with correct values
     const calledWith = esClient.bulk.mock.calls[1][0];
     const ids = calledWith?.body
-      .filter((i: any) => i.update !== undefined)
+      ?.filter((i: any) => i.update !== undefined)
       .map((i: any) => i.update._id);
-    const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+    const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
     expect(ids).toEqual(idsToUnenroll);
-    for (const doc of docs) {
+    for (const doc of docs!) {
       expect(doc).toHaveProperty('unenrollment_started_at');
     }
   });
@@ -112,11 +112,11 @@ describe('unenrollAgents (plural)', () => {
     const onlyRegular = [agentInRegularDoc._id, agentInRegularDoc2._id];
     const calledWith = esClient.bulk.mock.calls[1][0];
     const ids = calledWith?.body
-      .filter((i: any) => i.update !== undefined)
+      ?.filter((i: any) => i.update !== undefined)
       .map((i: any) => i.update._id);
-    const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+    const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
     expect(ids).toEqual(onlyRegular);
-    for (const doc of docs) {
+    for (const doc of docs!) {
       expect(doc).toHaveProperty('unenrollment_started_at');
     }
   });
@@ -150,11 +150,11 @@ describe('unenrollAgents (plural)', () => {
     const onlyRegular = [agentInRegularDoc._id, agentInRegularDoc2._id];
     const calledWith = esClient.bulk.mock.calls[0][0];
     const ids = calledWith?.body
-      .filter((i: any) => i.update !== undefined)
+      ?.filter((i: any) => i.update !== undefined)
       .map((i: any) => i.update._id);
-    const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+    const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
     expect(ids).toEqual(onlyRegular);
-    for (const doc of docs) {
+    for (const doc of docs!) {
       expect(doc).toHaveProperty('unenrolled_at');
     }
   });
@@ -167,11 +167,11 @@ describe('unenrollAgents (plural)', () => {
     // calls ES update with correct values
     const calledWith = esClient.bulk.mock.calls[1][0];
     const ids = calledWith?.body
-      .filter((i: any) => i.update !== undefined)
+      ?.filter((i: any) => i.update !== undefined)
       .map((i: any) => i.update._id);
-    const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+    const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
     expect(ids).toEqual(idsToUnenroll);
-    for (const doc of docs) {
+    for (const doc of docs!) {
       expect(doc).toHaveProperty('unenrollment_started_at');
     }
   });
@@ -205,11 +205,11 @@ describe('unenrollAgents (plural)', () => {
     // calls ES update with correct values
     const calledWith = esClient.bulk.mock.calls[0][0];
     const ids = calledWith?.body
-      .filter((i: any) => i.update !== undefined)
+      ?.filter((i: any) => i.update !== undefined)
       .map((i: any) => i.update._id);
-    const docs = calledWith?.body.filter((i: any) => i.doc).map((i: any) => i.doc);
+    const docs = calledWith?.body?.filter((i: any) => i.doc).map((i: any) => i.doc);
     expect(ids).toEqual(idsToUnenroll);
-    for (const doc of docs) {
+    for (const doc of docs!) {
       expect(doc).toHaveProperty('unenrolled_at');
     }
   });
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 511a0abecbc18..f9aab997f063c 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
@@ -197,7 +197,6 @@ export async function generateEnrollmentAPIKey(
     .createApiKey({
       body: {
         name,
-        // @ts-expect-error Metadata in api keys
         metadata: {
           managed_by: 'fleet',
           managed: true,
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 2db6009270a3b..dde6459addcbc 100644
--- a/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
+++ b/x-pack/plugins/fleet/server/services/epm/archive/storage.ts
@@ -224,24 +224,20 @@ export const getEsPackage = async (
       );
       const dataStreamManifest = safeLoad(soResDataStreamManifest.attributes.data_utf8);
       const {
-        title: dataStreamTitle,
-        release,
         ingest_pipeline: ingestPipeline,
-        type,
         dataset,
         streams: manifestStreams,
+        ...dataStreamManifestProps
       } = dataStreamManifest;
       const streams = parseAndVerifyStreams(manifestStreams, dataStreamPath);
 
       dataStreams.push({
         dataset: dataset || `${pkgName}.${dataStreamPath}`,
-        title: dataStreamTitle,
-        release,
         package: pkgName,
         ingest_pipeline: ingestPipeline || 'default',
         path: dataStreamPath,
-        type,
         streams,
+        ...dataStreamManifestProps,
       });
     })
   );
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/final_pipeline.ts b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/final_pipeline.ts
new file mode 100644
index 0000000000000..4c0484c058abf
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/ingest_pipeline/final_pipeline.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.
+ */
+
+export const FINAL_PIPELINE_ID = '.fleet_final_pipeline';
+
+export const FINAL_PIPELINE = `---
+description: >
+  Final pipeline for processing all incoming Fleet Agent documents.
+processors:
+  - set:
+      description: Add time when event was ingested.
+      field: event.ingested
+      value: '{{{_ingest.timestamp}}}'
+  - remove:
+      description: Remove any pre-existing untrusted values.
+      field:
+        - event.agent_id_status
+        - _security
+      ignore_missing: true
+  - set_security_user:
+      field: _security
+      properties:
+        - authentication_type
+        - username
+        - realm
+        - api_key
+  - script:
+      description: >
+        Add event.agent_id_status based on the API key metadata and the
+        agent.id contained in the event.
+      tag: agent-id-status
+      source: |-
+        boolean is_user_trusted(def ctx, def users) {
+          if (ctx?._security?.username == null) {
+            return false;
+          }
+
+          def user = null;
+          for (def item : users) {
+            if (item?.username == ctx._security.username) {
+              user = item;
+              break;
+            }
+          }
+
+          if (user == null || user?.realm == null || ctx?._security?.realm?.name == null) {
+            return false;
+          }
+
+          if (ctx._security.realm.name != user.realm) {
+            return false;
+          }
+
+          return true;
+        }
+
+        String verified(def ctx, def params) {
+          // Agents only use API keys.
+          if (ctx?._security?.authentication_type == null || ctx._security.authentication_type != 'API_KEY') {
+            return "no_api_key";
+          }
+
+          // Verify the API key owner before trusting any metadata it contains.
+          if (!is_user_trusted(ctx, params.trusted_users)) {
+            return "untrusted_user";
+          }
+
+          // API keys created by Fleet include metadata about the agent they were issued to.
+          if (ctx?._security?.api_key?.metadata?.agent_id == null || ctx?.agent?.id == null) {
+            return "missing_metadata";
+          }
+
+          // The API key can only be used represent the agent.id it was issued to.
+          if (ctx._security.api_key.metadata.agent_id != ctx.agent.id) {
+            // Potential masquerade attempt.
+            return "agent_id_mismatch";
+          }
+
+          return "verified";
+        }
+
+        if (ctx?.event == null) {
+          ctx.event = [:];
+        }
+
+        ctx.event.agent_id_status = verified(ctx, params);
+      params:
+        # List of users responsible for creating Fleet output API keys.
+        trusted_users:
+          - username: elastic
+            realm: reserved
+  - remove:
+      field: _security
+      ignore_missing: true
+on_failure:
+  - remove:
+      field: _security
+      ignore_missing: true
+      ignore_failure: true
+  - append:
+      field: error.message
+      value:
+        - 'failed in Fleet agent final_pipeline: {{ _ingest.on_failure_message }}'`;
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 ac5aca7ab1c14..1d212f188120f 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
@@ -16,6 +16,7 @@ import { saveInstalledEsRefs } from '../../packages/install';
 import { getInstallationObject } from '../../packages';
 
 import { deletePipelineRefs } from './remove';
+import { FINAL_PIPELINE, FINAL_PIPELINE_ID } from './final_pipeline';
 
 interface RewriteSubstitution {
   source: string;
@@ -185,6 +186,28 @@ async function installPipeline({
   return { id: pipeline.nameForInstallation, type: ElasticsearchAssetType.ingestPipeline };
 }
 
+export async function ensureFleetFinalPipelineIsInstalled(esClient: ElasticsearchClient) {
+  const esClientRequestOptions: TransportRequestOptions = {
+    ignore: [404],
+  };
+  const res = await esClient.ingest.getPipeline({ id: FINAL_PIPELINE_ID }, esClientRequestOptions);
+
+  if (res.statusCode === 404) {
+    await esClient.ingest.putPipeline(
+      // @ts-ignore pipeline is define in yaml
+      { id: FINAL_PIPELINE_ID, body: FINAL_PIPELINE },
+      {
+        headers: {
+          // pipeline is YAML
+          'Content-Type': 'application/yaml',
+          // but we want JSON responses (to extract error messages, status code, or other metadata)
+          Accept: 'application/json',
+        },
+      }
+    );
+  }
+}
+
 const isDirectory = ({ path }: ArchiveEntry) => path.endsWith('/');
 
 const isDataStreamPipeline = (path: string, dataStreamDataset: string) => {
diff --git a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
index 65eec939d5850..acf8ae742bf8f 100644
--- a/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
+++ b/x-pack/plugins/fleet/server/services/epm/elasticsearch/template/__snapshots__/template.test.ts.snap
@@ -25,7 +25,8 @@ exports[`EPM template tests loading base.yml: base.yml 1`] = `
           "default_field": [
             "long.nested.foo"
           ]
-        }
+        },
+        "final_pipeline": ".fleet_final_pipeline"
       }
     },
     "mappings": {
@@ -139,7 +140,8 @@ exports[`EPM template tests loading coredns.logs.yml: coredns.logs.yml 1`] = `
             "coredns.response.code",
             "coredns.response.flags"
           ]
-        }
+        },
+        "final_pipeline": ".fleet_final_pipeline"
       }
     },
     "mappings": {
@@ -281,7 +283,8 @@ exports[`EPM template tests loading system.yml: system.yml 1`] = `
             "system.users.scope",
             "system.users.remote_host"
           ]
-        }
+        },
+        "final_pipeline": ".fleet_final_pipeline"
       }
     },
     "mappings": {
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 8c58238588b2f..552e486552a78 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
@@ -142,6 +142,7 @@ describe('EPM install', () => {
 
   it('tests installPackage remove the aliases property if the property existed', async () => {
     const esClient = elasticsearchServiceMock.createClusterClient().asInternalUser;
+    // @ts-expect-error not full interface
     esClient.indices.getIndexTemplate.mockImplementation(() =>
       elasticsearchServiceMock.createSuccessTransportRequestPromise({
         index_templates: [
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 9e8277eb6171f..d202dab54f5bd 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
@@ -183,6 +183,7 @@ function putComponentTemplate(
     };
 
     return {
+      // @ts-expect-error body expected to be ClusterPutComponentTemplateRequest
       clusterPromise: esClient.cluster.putComponentTemplate(esClientParams, { ignore: [404] }),
       name,
     };
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 dcc685bb270b4..ae7bff618dba2 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
@@ -611,6 +611,96 @@ describe('EPM template', () => {
     expect(JSON.stringify(mappings)).toEqual(JSON.stringify(constantKeywordMapping));
   });
 
+  it('processes meta fields', () => {
+    const metaFieldLiteralYaml = `
+- name: fieldWithMetas
+  type: integer
+  unit: byte
+  metric_type: gauge
+  `;
+    const metaFieldMapping = {
+      properties: {
+        fieldWithMetas: {
+          type: 'long',
+          meta: {
+            metric_type: 'gauge',
+            unit: 'byte',
+          },
+        },
+      },
+    };
+    const fields: Field[] = safeLoad(metaFieldLiteralYaml);
+    const processedFields = processFields(fields);
+    const mappings = generateMappings(processedFields);
+    expect(JSON.stringify(mappings)).toEqual(JSON.stringify(metaFieldMapping));
+  });
+
+  it('processes meta fields with only one meta value', () => {
+    const metaFieldLiteralYaml = `
+- name: fieldWithMetas
+  type: integer
+  metric_type: gauge
+  `;
+    const metaFieldMapping = {
+      properties: {
+        fieldWithMetas: {
+          type: 'long',
+          meta: {
+            metric_type: 'gauge',
+          },
+        },
+      },
+    };
+    const fields: Field[] = safeLoad(metaFieldLiteralYaml);
+    const processedFields = processFields(fields);
+    const mappings = generateMappings(processedFields);
+    expect(JSON.stringify(mappings)).toEqual(JSON.stringify(metaFieldMapping));
+  });
+
+  it('processes grouped meta fields', () => {
+    const metaFieldLiteralYaml = `
+- name: groupWithMetas
+  type: group
+  unit: byte
+  metric_type: gauge
+  fields:
+    - name: fieldA
+      type: integer
+      unit: byte
+      metric_type: gauge
+    - name: fieldB
+      type: integer
+      unit: byte
+      metric_type: gauge
+  `;
+    const metaFieldMapping = {
+      properties: {
+        groupWithMetas: {
+          properties: {
+            fieldA: {
+              type: 'long',
+              meta: {
+                metric_type: 'gauge',
+                unit: 'byte',
+              },
+            },
+            fieldB: {
+              type: 'long',
+              meta: {
+                metric_type: 'gauge',
+                unit: 'byte',
+              },
+            },
+          },
+        },
+      },
+    };
+    const fields: Field[] = safeLoad(metaFieldLiteralYaml);
+    const processedFields = processFields(fields);
+    const mappings = generateMappings(processedFields);
+    expect(JSON.stringify(mappings)).toEqual(JSON.stringify(metaFieldMapping));
+  });
+
   it('tests priority and index pattern for data stream without dataset_is_prefix', () => {
     const dataStreamDatasetIsPrefixUnset = {
       type: 'metrics',
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 f6ca1dfc99f4e..07d0df021c827 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
@@ -16,6 +16,7 @@ import type {
 } from '../../../../types';
 import { appContextService } from '../../../';
 import { getRegistryDataStreamAssetBaseName } from '../index';
+import { FINAL_PIPELINE_ID } from '../ingest_pipeline/final_pipeline';
 
 interface Properties {
   [key: string]: any;
@@ -42,6 +43,8 @@ const DATASET_IS_PREFIX_TEMPLATE_PRIORITY = 150;
 const QUERY_DEFAULT_FIELD_TYPES = ['keyword', 'text'];
 const QUERY_DEFAULT_FIELD_LIMIT = 1024;
 
+const META_PROP_KEYS = ['metric_type', 'unit'];
+
 /**
  * getTemplate retrieves the default template but overwrites the index pattern with the given value.
  *
@@ -84,6 +87,11 @@ export function getTemplate({
   if (pipelineName) {
     template.template.settings.index.default_pipeline = pipelineName;
   }
+  if (template.template.settings.index.final_pipeline) {
+    throw new Error(`Error template for ${templateIndexPattern} contains a final_pipeline`);
+  }
+  template.template.settings.index.final_pipeline = FINAL_PIPELINE_ID;
+
   return template;
 }
 
@@ -162,6 +170,22 @@ export function generateMappings(fields: Field[]): IndexTemplateMappings {
         default:
           fieldProps.type = type;
       }
+
+      const fieldHasMetaProps = META_PROP_KEYS.some((key) => key in field);
+      if (fieldHasMetaProps) {
+        switch (type) {
+          case 'group':
+          case 'group-nested':
+            break;
+          default: {
+            const meta = {};
+            if ('metric_type' in field) Reflect.set(meta, 'metric_type', field.metric_type);
+            if ('unit' in field) Reflect.set(meta, 'unit', field.unit);
+            fieldProps.meta = meta;
+          }
+        }
+      }
+
       props[field.name] = fieldProps;
     });
   }
@@ -503,7 +527,6 @@ const updateExistingDataStream = async ({
     await esClient.indices.putMapping({
       index: dataStreamName,
       body: mappings,
-      // @ts-expect-error @elastic/elasticsearch doesn't declare it on PutMappingRequest
       write_index_only: true,
     });
     // if update fails, rollover data stream
@@ -525,7 +548,7 @@ const updateExistingDataStream = async ({
   try {
     await esClient.indices.putSettings({
       index: dataStreamName,
-      body: { index: { default_pipeline: settings.index.default_pipeline } },
+      body: { settings: { default_pipeline: settings.index.default_pipeline } },
     });
   } catch (err) {
     throw new Error(`could not update index template settings for ${dataStreamName}`);
diff --git a/x-pack/plugins/fleet/server/services/epm/fields/field.ts b/x-pack/plugins/fleet/server/services/epm/fields/field.ts
index addcaf20cd146..b8839b88bb78c 100644
--- a/x-pack/plugins/fleet/server/services/epm/fields/field.ts
+++ b/x-pack/plugins/fleet/server/services/epm/fields/field.ts
@@ -34,6 +34,10 @@ export interface Field {
   include_in_parent?: boolean;
   include_in_root?: boolean;
 
+  // Meta fields
+  metric_type?: string;
+  unit?: string;
+
   // Kibana specific
   analyzed?: boolean;
   count?: number;
diff --git a/x-pack/plugins/fleet/server/services/output.test.ts b/x-pack/plugins/fleet/server/services/output.test.ts
new file mode 100644
index 0000000000000..26e3955607ada
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/output.test.ts
@@ -0,0 +1,85 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { outputService } from './output';
+
+import { appContextService } from './app_context';
+
+jest.mock('./app_context');
+
+const mockedAppContextService = appContextService as jest.Mocked<typeof appContextService>;
+
+const CLOUD_ID =
+  'dXMtZWFzdC0xLmF3cy5mb3VuZC5pbyRjZWM2ZjI2MWE3NGJmMjRjZTMzYmI4ODExYjg0Mjk0ZiRjNmMyY2E2ZDA0MjI0OWFmMGNjN2Q3YTllOTYyNTc0Mw==';
+
+const CONFIG_WITH_ES_HOSTS = {
+  enabled: true,
+  agents: {
+    enabled: true,
+    elasticsearch: {
+      hosts: ['http://host1.com'],
+    },
+  },
+};
+
+const CONFIG_WITHOUT_ES_HOSTS = {
+  enabled: true,
+  agents: {
+    enabled: true,
+    elasticsearch: {},
+  },
+};
+
+describe('Output Service', () => {
+  describe('getDefaultESHosts', () => {
+    afterEach(() => {
+      mockedAppContextService.getConfig.mockReset();
+      mockedAppContextService.getConfig.mockReset();
+    });
+    it('Should use cloud ID as the source of truth for ES hosts', () => {
+      // @ts-expect-error
+      mockedAppContextService.getCloud.mockReturnValue({
+        isCloudEnabled: true,
+        cloudId: CLOUD_ID,
+      });
+
+      mockedAppContextService.getConfig.mockReturnValue(CONFIG_WITH_ES_HOSTS);
+
+      const hosts = outputService.getDefaultESHosts();
+
+      expect(hosts).toEqual([
+        'https://cec6f261a74bf24ce33bb8811b84294f.us-east-1.aws.found.io:443',
+      ]);
+    });
+
+    it('Should use the value from the config if not in cloud', () => {
+      // @ts-expect-error
+      mockedAppContextService.getCloud.mockReturnValue({
+        isCloudEnabled: false,
+      });
+
+      mockedAppContextService.getConfig.mockReturnValue(CONFIG_WITH_ES_HOSTS);
+
+      const hosts = outputService.getDefaultESHosts();
+
+      expect(hosts).toEqual(['http://host1.com']);
+    });
+
+    it('Should use the default value if there is no config', () => {
+      // @ts-expect-error
+      mockedAppContextService.getCloud.mockReturnValue({
+        isCloudEnabled: false,
+      });
+
+      mockedAppContextService.getConfig.mockReturnValue(CONFIG_WITHOUT_ES_HOSTS);
+
+      const hosts = outputService.getDefaultESHosts();
+
+      expect(hosts).toEqual(['http://localhost:9200']);
+    });
+  });
+});
diff --git a/x-pack/plugins/fleet/server/services/output.ts b/x-pack/plugins/fleet/server/services/output.ts
index b3857ba5c0ef3..0c7b086f78fdf 100644
--- a/x-pack/plugins/fleet/server/services/output.ts
+++ b/x-pack/plugins/fleet/server/services/output.ts
@@ -16,6 +16,8 @@ import { normalizeHostsForAgents } from './hosts_utils';
 
 const SAVED_OBJECT_TYPE = OUTPUT_SAVED_OBJECT_TYPE;
 
+const DEFAULT_ES_HOSTS = ['http://localhost:9200'];
+
 class OutputService {
   public async getDefaultOutput(soClient: SavedObjectsClientContract) {
     return await soClient.find<OutputSOAttributes>({
@@ -27,17 +29,11 @@ class OutputService {
 
   public async ensureDefaultOutput(soClient: SavedObjectsClientContract) {
     const outputs = await this.getDefaultOutput(soClient);
-    const cloud = appContextService.getCloud();
-    const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
-    const cloudUrl = cloudId && decodeCloudId(cloudId)?.elasticsearchUrl;
-    const flagsUrl = appContextService.getConfig()!.agents.elasticsearch.host;
-    const defaultUrl = 'http://localhost:9200';
-    const defaultOutputUrl = cloudUrl || flagsUrl || defaultUrl;
 
     if (!outputs.saved_objects.length) {
       const newDefaultOutput = {
         ...DEFAULT_OUTPUT,
-        hosts: [defaultOutputUrl],
+        hosts: this.getDefaultESHosts(),
         ca_sha256: appContextService.getConfig()!.agents.elasticsearch.ca_sha256,
       } as NewOutput;
 
@@ -50,6 +46,20 @@ class OutputService {
     };
   }
 
+  public getDefaultESHosts(): string[] {
+    const cloud = appContextService.getCloud();
+    const cloudId = cloud?.isCloudEnabled && cloud.cloudId;
+    const cloudUrl = cloudId && decodeCloudId(cloudId)?.elasticsearchUrl;
+    const cloudHosts = cloudUrl ? [cloudUrl] : undefined;
+    const flagHosts =
+      appContextService.getConfig()!.agents?.elasticsearch?.hosts &&
+      appContextService.getConfig()!.agents.elasticsearch.hosts?.length
+        ? appContextService.getConfig()!.agents.elasticsearch.hosts
+        : undefined;
+
+    return cloudHosts || flagHosts || DEFAULT_ES_HOSTS;
+  }
+
   public async getDefaultOutputId(soClient: SavedObjectsClientContract) {
     const outputs = await this.getDefaultOutput(soClient);
 
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
new file mode 100644
index 0000000000000..39759a6fc9e9c
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.test.ts
@@ -0,0 +1,341 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+jest.mock('./epm/packages');
+import type { SavedObjectsClientContract } from 'kibana/server';
+
+import { savedObjectsClientMock } from '../../../../../src/core/server/mocks';
+import type { PackagePolicy, RegistryDataStream } from '../types';
+
+import { getPackageInfo } from './epm/packages';
+import {
+  getDataStreamPermissions,
+  storedPackagePoliciesToAgentPermissions,
+} from './package_policies_to_agent_permissions';
+
+const getPackageInfoMock = getPackageInfo as jest.MockedFunction<typeof getPackageInfo>;
+
+describe('storedPackagePoliciesToAgentPermissions()', () => {
+  let soClient: jest.Mocked<SavedObjectsClientContract>;
+  beforeEach(() => {
+    soClient = savedObjectsClientMock.create();
+  });
+
+  it('Returns `undefined` if there are no package policies', async () => {
+    const permissions = await storedPackagePoliciesToAgentPermissions(soClient, []);
+    expect(permissions).toBeUndefined();
+  });
+
+  it('Returns the default permissions for string package policies', async () => {
+    const permissions = await storedPackagePoliciesToAgentPermissions(soClient, ['foo']);
+    expect(permissions).toMatchObject({
+      _fallback: {
+        cluster: ['monitor'],
+        indices: [
+          {
+            names: [
+              'logs-*',
+              'metrics-*',
+              'traces-*',
+              'synthetics-*',
+              '.logs-endpoint.diagnostic.collection-*',
+            ],
+            privileges: ['auto_configure', 'create_doc'],
+          },
+        ],
+      },
+    });
+  });
+
+  it('Returns the default permissions if a package policy does not have a package', async () => {
+    const permissions = await storedPackagePoliciesToAgentPermissions(soClient, [
+      { name: 'foo', package: undefined } as PackagePolicy,
+    ]);
+
+    expect(permissions).toMatchObject({
+      foo: {
+        cluster: ['monitor'],
+        indices: [
+          {
+            names: [
+              'logs-*',
+              'metrics-*',
+              'traces-*',
+              'synthetics-*',
+              '.logs-endpoint.diagnostic.collection-*',
+            ],
+            privileges: ['auto_configure', 'create_doc'],
+          },
+        ],
+      },
+    });
+  });
+
+  it('Returns the permissions for the enabled inputs', async () => {
+    getPackageInfoMock.mockResolvedValueOnce({
+      name: 'test-package',
+      version: '0.0.0',
+      latestVersion: '0.0.0',
+      release: 'experimental',
+      format_version: '1.0.0',
+      title: 'Test Package',
+      description: '',
+      icons: [],
+      owner: { github: '' },
+      status: 'not_installed',
+      assets: {
+        kibana: {
+          dashboard: [],
+          visualization: [],
+          search: [],
+          index_pattern: [],
+          map: [],
+          lens: [],
+          security_rule: [],
+          ml_module: [],
+        },
+        elasticsearch: {
+          component_template: [],
+          ingest_pipeline: [],
+          ilm_policy: [],
+          transform: [],
+          index_template: [],
+          data_stream_ilm_policy: [],
+        },
+      },
+      data_streams: [
+        {
+          type: 'logs',
+          dataset: 'some-logs',
+          title: '',
+          release: '',
+          package: 'test-package',
+          path: '',
+          ingest_pipeline: '',
+          streams: [{ input: 'test-logs', title: 'Test Logs', template_path: '' }],
+        },
+        {
+          type: 'metrics',
+          dataset: 'some-metrics',
+          title: '',
+          release: '',
+          package: 'test-package',
+          path: '',
+          ingest_pipeline: '',
+          streams: [{ input: 'test-metrics', title: 'Test Logs', template_path: '' }],
+        },
+      ],
+    });
+
+    const packagePolicies: PackagePolicy[] = [
+      {
+        id: '12345',
+        name: 'test-policy',
+        namespace: 'test',
+        enabled: true,
+        package: { name: 'test-package', version: '0.0.0', title: 'Test Package' },
+        inputs: [
+          {
+            type: 'test-logs',
+            enabled: true,
+            streams: [
+              {
+                id: 'test-logs',
+                enabled: true,
+                data_stream: { type: 'logs', dataset: 'some-logs' },
+              },
+            ],
+          },
+          {
+            type: 'test-metrics',
+            enabled: false,
+            streams: [
+              {
+                id: 'test-logs',
+                enabled: false,
+                data_stream: { type: 'metrics', dataset: 'some-metrics' },
+              },
+            ],
+          },
+        ],
+        created_at: '',
+        updated_at: '',
+        created_by: '',
+        updated_by: '',
+        revision: 1,
+        policy_id: '',
+        output_id: '',
+      },
+    ];
+
+    const permissions = await storedPackagePoliciesToAgentPermissions(soClient, packagePolicies);
+    expect(permissions).toMatchObject({
+      'test-policy': {
+        indices: [
+          {
+            names: ['logs-some-logs-test'],
+            privileges: ['auto_configure', 'create_doc'],
+          },
+        ],
+      },
+    });
+  });
+
+  it('Returns the dataset for the compiled data_streams', async () => {
+    getPackageInfoMock.mockResolvedValueOnce({
+      name: 'test-package',
+      version: '0.0.0',
+      latestVersion: '0.0.0',
+      release: 'experimental',
+      format_version: '1.0.0',
+      title: 'Test Package',
+      description: '',
+      icons: [],
+      owner: { github: '' },
+      status: 'not_installed',
+      assets: {
+        kibana: {
+          dashboard: [],
+          visualization: [],
+          search: [],
+          index_pattern: [],
+          map: [],
+          lens: [],
+          security_rule: [],
+          ml_module: [],
+        },
+        elasticsearch: {
+          component_template: [],
+          ingest_pipeline: [],
+          ilm_policy: [],
+          transform: [],
+          index_template: [],
+          data_stream_ilm_policy: [],
+        },
+      },
+      data_streams: [
+        {
+          type: 'logs',
+          dataset: 'some-logs',
+          title: '',
+          release: '',
+          package: 'test-package',
+          path: '',
+          ingest_pipeline: '',
+          streams: [{ input: 'test-logs', title: 'Test Logs', template_path: '' }],
+        },
+      ],
+    });
+
+    const packagePolicies: PackagePolicy[] = [
+      {
+        id: '12345',
+        name: 'test-policy',
+        namespace: 'test',
+        enabled: true,
+        package: { name: 'test-package', version: '0.0.0', title: 'Test Package' },
+        inputs: [
+          {
+            type: 'test-logs',
+            enabled: true,
+            streams: [
+              {
+                id: 'test-logs',
+                enabled: true,
+                data_stream: { type: 'logs', dataset: 'some-logs' },
+                compiled_stream: { data_stream: { dataset: 'compiled' } },
+              },
+            ],
+          },
+        ],
+        created_at: '',
+        updated_at: '',
+        created_by: '',
+        updated_by: '',
+        revision: 1,
+        policy_id: '',
+        output_id: '',
+      },
+    ];
+
+    const permissions = await storedPackagePoliciesToAgentPermissions(soClient, packagePolicies);
+    expect(permissions).toMatchObject({
+      'test-policy': {
+        indices: [
+          {
+            names: ['logs-compiled-test'],
+            privileges: ['auto_configure', 'create_doc'],
+          },
+        ],
+      },
+    });
+  });
+});
+
+describe('getDataStreamPermissions()', () => {
+  it('returns defaults for a datastream with no permissions', () => {
+    const dataStream = { type: 'logs', dataset: 'test' } as RegistryDataStream;
+    const permissions = getDataStreamPermissions(dataStream);
+
+    expect(permissions).toMatchObject({
+      names: ['logs-test-*'],
+      privileges: ['auto_configure', 'create_doc'],
+    });
+  });
+
+  it('adds the namespace to the index name', () => {
+    const dataStream = { type: 'logs', dataset: 'test' } as RegistryDataStream;
+    const permissions = getDataStreamPermissions(dataStream, 'namespace');
+
+    expect(permissions).toMatchObject({
+      names: ['logs-test-namespace'],
+      privileges: ['auto_configure', 'create_doc'],
+    });
+  });
+
+  it('appends a wildcard if dataset is prefix', () => {
+    const dataStream = {
+      type: 'logs',
+      dataset: 'test',
+      dataset_is_prefix: true,
+    } as RegistryDataStream;
+    const permissions = getDataStreamPermissions(dataStream, 'namespace');
+
+    expect(permissions).toMatchObject({
+      names: ['logs-test.*-namespace'],
+      privileges: ['auto_configure', 'create_doc'],
+    });
+  });
+
+  it('prepends a dot if datastream is hidden', () => {
+    const dataStream = {
+      type: 'logs',
+      dataset: 'test',
+      hidden: true,
+    } as RegistryDataStream;
+    const permissions = getDataStreamPermissions(dataStream, 'namespace');
+
+    expect(permissions).toMatchObject({
+      names: ['.logs-test-namespace'],
+      privileges: ['auto_configure', 'create_doc'],
+    });
+  });
+
+  it('uses custom permissions if they are present in the datastream', () => {
+    const dataStream = {
+      type: 'logs',
+      dataset: 'test',
+      permissions: { indices: ['read', 'write'] },
+    } as RegistryDataStream;
+    const permissions = getDataStreamPermissions(dataStream, 'namespace');
+
+    expect(permissions).toMatchObject({
+      names: ['logs-test-namespace'],
+      privileges: ['read', 'write'],
+    });
+  });
+});
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
new file mode 100644
index 0000000000000..bd73b88e7c893
--- /dev/null
+++ b/x-pack/plugins/fleet/server/services/package_policies_to_agent_permissions.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 type { SavedObjectsClientContract } from 'kibana/server';
+
+import type { FullAgentPolicyOutputPermissions, RegistryDataStreamPermissions } from '../../common';
+import { getPackageInfo } from '../../server/services/epm/packages';
+
+import type { PackagePolicy } from '../types';
+
+export const DEFAULT_PERMISSIONS = {
+  cluster: ['monitor'],
+  indices: [
+    {
+      names: [
+        'logs-*',
+        'metrics-*',
+        'traces-*',
+        'synthetics-*',
+        '.logs-endpoint.diagnostic.collection-*',
+      ],
+      privileges: ['auto_configure', 'create_doc'],
+    },
+  ],
+};
+
+export async function storedPackagePoliciesToAgentPermissions(
+  soClient: SavedObjectsClientContract,
+  packagePolicies: string[] | PackagePolicy[]
+): Promise<FullAgentPolicyOutputPermissions | undefined> {
+  if (packagePolicies.length === 0) {
+    return;
+  }
+
+  // I'm not sure what permissions to return for this case, so let's return the defaults
+  if (typeof packagePolicies[0] === 'string') {
+    return { _fallback: DEFAULT_PERMISSIONS };
+  }
+
+  const permissionEntries = (packagePolicies as PackagePolicy[]).map<Promise<[string, any]>>(
+    async (packagePolicy) => {
+      if (!packagePolicy.package) {
+        return [packagePolicy.name, DEFAULT_PERMISSIONS];
+      }
+
+      const pkg = await getPackageInfo({
+        savedObjectsClient: soClient,
+        pkgName: packagePolicy.package.name,
+        pkgVersion: packagePolicy.package.version,
+      });
+
+      if (!pkg.data_streams || pkg.data_streams.length === 0) {
+        return [packagePolicy.name, undefined];
+      }
+
+      let dataStreamsForPermissions: DataStreamMeta[];
+
+      switch (pkg.name) {
+        case 'endpoint':
+          // - Endpoint doesn't store the `data_stream` metadata in
+          // `packagePolicy.inputs`, so we will use _all_ data_streams from the
+          // package.
+          dataStreamsForPermissions = pkg.data_streams;
+          break;
+
+        case 'apm':
+          // - APM doesn't store the `data_stream` metadata in
+          //   `packagePolicy.inputs`, so we will use _all_ data_streams from
+          //   the package.
+          dataStreamsForPermissions = pkg.data_streams;
+          break;
+
+        default:
+          // - Normal packages store some of the `data_stream` metadata in
+          //   `packagePolicy.inputs[].streams[].data_stream`
+          // - The rest of the metadata needs to be fetched from the
+          //   `data_stream` object in the package. The link is
+          //   `packagePolicy.inputs[].type == pkg.data_streams.streams[].input`
+          // - Some packages (custom logs) have a compiled dataset, stored in
+          //   `input.streams.compiled_stream.data_stream.dataset`
+          dataStreamsForPermissions = packagePolicy.inputs
+            .filter((i) => i.enabled)
+            .flatMap((input) => {
+              if (!input.streams) {
+                return [];
+              }
+
+              const dataStreams_: DataStreamMeta[] = [];
+
+              input.streams
+                .filter((s) => s.enabled)
+                .forEach((stream) => {
+                  if (!('data_stream' in stream)) {
+                    return;
+                  }
+
+                  const ds = {
+                    type: stream.data_stream.type,
+                    dataset:
+                      stream.compiled_stream?.data_stream?.dataset ?? stream.data_stream.dataset,
+                  };
+
+                  dataStreams_.push(ds);
+                });
+
+              return dataStreams_;
+            });
+      }
+
+      return [
+        packagePolicy.name,
+        {
+          indices: dataStreamsForPermissions.map((ds) =>
+            getDataStreamPermissions(ds, packagePolicy.namespace)
+          ),
+        },
+      ];
+    }
+  );
+
+  return Object.fromEntries(await Promise.all(permissionEntries));
+}
+
+interface DataStreamMeta {
+  type: string;
+  dataset: string;
+  dataset_is_prefix?: boolean;
+  hidden?: boolean;
+  permissions?: RegistryDataStreamPermissions;
+}
+
+export function getDataStreamPermissions(dataStream: DataStreamMeta, namespace: string = '*') {
+  let index = `${dataStream.type}-${dataStream.dataset}`;
+
+  if (dataStream.dataset_is_prefix) {
+    index = `${index}.*`;
+  }
+
+  if (dataStream.hidden) {
+    index = `.${index}`;
+  }
+
+  index += `-${namespace}`;
+
+  return {
+    names: [index],
+    privileges: dataStream.permissions?.indices || ['auto_configure', 'create_doc'],
+  };
+}
diff --git a/x-pack/plugins/fleet/server/services/package_policy.ts b/x-pack/plugins/fleet/server/services/package_policy.ts
index 19ff55fbf2e73..02f9731421ba0 100644
--- a/x-pack/plugins/fleet/server/services/package_policy.ts
+++ b/x-pack/plugins/fleet/server/services/package_policy.ts
@@ -108,9 +108,10 @@ class PackagePolicyService {
       else {
         const [, packageInfo] = await Promise.all([
           ensureInstalledPackage({
+            esClient,
             savedObjectsClient: soClient,
             pkgName: packagePolicy.package.name,
-            esClient,
+            pkgVersion: packagePolicy.package.version,
           }),
           pkgInfoPromise,
         ]);
diff --git a/x-pack/plugins/fleet/server/services/setup.ts b/x-pack/plugins/fleet/server/services/setup.ts
index 28deec8a89028..7f4219799e511 100644
--- a/x-pack/plugins/fleet/server/services/setup.ts
+++ b/x-pack/plugins/fleet/server/services/setup.ts
@@ -20,6 +20,7 @@ import { settingsService } from '.';
 import { awaitIfPending } from './setup_utils';
 import { ensureAgentActionPolicyChangeExists } from './agents';
 import { awaitIfFleetServerSetupPending } from './fleet_server';
+import { ensureFleetFinalPipelineIsInstalled } from './epm/elasticsearch/ingest_pipeline/install';
 
 export interface SetupStatus {
   isInitialized: boolean;
@@ -42,6 +43,8 @@ async function createSetupSideEffects(
     settingsService.settingsSetup(soClient),
   ]);
 
+  await ensureFleetFinalPipelineIsInstalled(esClient);
+
   await awaitIfFleetServerSetupPending();
 
   const { agentPolicies: policiesOrUndefined, packages: packagesOrUndefined } =
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 cbf311cac4e3b..3735cfffeaa71 100644
--- a/x-pack/plugins/fleet/server/types/models/package_policy.ts
+++ b/x-pack/plugins/fleet/server/types/models/package_policy.ts
@@ -82,6 +82,7 @@ const PackagePolicyBaseSchema = {
 
 export const NewPackagePolicySchema = schema.object({
   ...PackagePolicyBaseSchema,
+  id: schema.maybe(schema.string()),
   force: schema.maybe(schema.boolean()),
 });
 
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 2d555f38d16d1..a686f416292df 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
@@ -28,6 +28,7 @@ const createApp = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
   appRoute: '/app/app1',
   status: AppStatus.accessible,
   navLinkStatus: AppNavLinkStatus.visible,
+  searchable: true,
   chromeless: false,
   keywords: props.keywords || [],
   deepLinks: [],
@@ -163,7 +164,7 @@ describe('applicationResultProvider', () => {
       expect(getAppResultsMock).toHaveBeenCalledWith('term', [expectApp('app1')]);
     });
 
-    it('ignores apps with non-visible navlink', async () => {
+    it('does not ignore apps with non-visible navlink', async () => {
       application.applications$ = of(
         createAppMap([
           createApp({ id: 'app1', title: 'App 1', navLinkStatus: AppNavLinkStatus.visible }),
@@ -178,7 +179,11 @@ describe('applicationResultProvider', () => {
       const provider = createApplicationResultProvider(Promise.resolve(application));
       await provider.find({ term: 'term' }, defaultOption).toPromise();
 
-      expect(getAppResultsMock).toHaveBeenCalledWith('term', [expectApp('app1')]);
+      expect(getAppResultsMock).toHaveBeenCalledWith('term', [
+        expectApp('app1'),
+        expectApp('disabled'),
+        expectApp('hidden'),
+      ]);
     });
 
     it('ignores chromeless apps', async () => {
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 999f7bcbb266f..ba5dfbb603da0 100644
--- a/x-pack/plugins/global_search_providers/public/providers/application.ts
+++ b/x-pack/plugins/global_search_providers/public/providers/application.ts
@@ -20,8 +20,8 @@ export const createApplicationResultProvider = (
     mergeMap((application) => application.applications$),
     map((apps) =>
       [...apps.values()].filter(
-        // only include non-chromeless enabled apps with visible navLinks
-        (app) => app.status === 0 && app.navLinkStatus === 1 && app.chromeless !== true
+        // only include non-chromeless enabled apps
+        (app) => app.status === 0 && app.chromeless !== true
       )
     ),
     shareReplay(1)
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 251dd84395aa0..3db9fcc336852 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
@@ -25,6 +25,7 @@ const createApp = (props: Partial<PublicAppInfo> = {}): PublicAppInfo => ({
   appRoute: '/app/app1',
   status: AppStatus.accessible,
   navLinkStatus: AppNavLinkStatus.visible,
+  searchable: true,
   chromeless: false,
   keywords: [],
   deepLinks: [],
@@ -44,6 +45,11 @@ describe('getAppResults', () => {
     const apps = [
       createApp({ id: 'dashboard', title: 'dashboard' }),
       createApp({ id: 'visualize', title: 'visualize' }),
+      createApp({
+        id: 'dashboard_not_searchable',
+        title: 'dashboard not searchable',
+        searchable: false,
+      }),
     ];
 
     const results = getAppResults('dashboard', apps);
@@ -63,6 +69,7 @@ describe('getAppResults', () => {
             deepLinks: [],
             keywords: [],
             navLinkStatus: AppNavLinkStatus.hidden,
+            searchable: true,
           },
           {
             id: 'sub2',
@@ -76,10 +83,12 @@ describe('getAppResults', () => {
                 deepLinks: [],
                 keywords: [],
                 navLinkStatus: AppNavLinkStatus.hidden,
+                searchable: true,
               },
             ],
             keywords: [],
-            navLinkStatus: AppNavLinkStatus.hidden,
+            navLinkStatus: AppNavLinkStatus.visible,
+            searchable: false,
           },
         ],
         keywords: [],
@@ -88,11 +97,9 @@ describe('getAppResults', () => {
 
     const results = getAppResults('App 1', apps);
 
-    expect(results.length).toBe(4);
     expect(results.map(({ title }) => title)).toEqual([
       'App 1',
       'App 1 / Sub1',
-      'App 1 / Sub2',
       'App 1 / Sub2 / Sub2Sub1',
     ]);
   });
@@ -108,6 +115,7 @@ describe('getAppResults', () => {
             deepLinks: [],
             keywords: [],
             navLinkStatus: AppNavLinkStatus.hidden,
+            searchable: true,
           },
         ],
         keywords: [],
@@ -135,6 +143,7 @@ describe('getAppResults', () => {
             deepLinks: [],
             keywords: [],
             navLinkStatus: AppNavLinkStatus.hidden,
+            searchable: true,
           },
           {
             id: 'sub2',
@@ -148,10 +157,12 @@ describe('getAppResults', () => {
                 deepLinks: [],
                 keywords: ['TwoOne'],
                 navLinkStatus: AppNavLinkStatus.hidden,
+                searchable: true,
               },
             ],
             keywords: ['two'],
             navLinkStatus: AppNavLinkStatus.hidden,
+            searchable: true,
           },
         ],
         keywords: [],
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 3ae1a082cdebf..136b0d6076e69 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
@@ -118,18 +118,22 @@ export const appToResult = (appLink: AppLink, score: number): GlobalSearchProvid
 const flattenDeepLinks = (app: PublicAppInfo, deepLink?: PublicAppDeepLinkInfo): AppLink[] => {
   if (!deepLink) {
     return [
-      {
-        id: app.id,
-        app,
-        path: app.appRoute,
-        subLinkTitles: [],
-        keywords: app?.keywords ?? [],
-      },
+      ...(app.searchable
+        ? [
+            {
+              id: app.id,
+              app,
+              path: app.appRoute,
+              subLinkTitles: [],
+              keywords: app?.keywords ?? [],
+            },
+          ]
+        : []),
       ...app.deepLinks.flatMap((appDeepLink) => flattenDeepLinks(app, appDeepLink)),
     ];
   }
   return [
-    ...(deepLink.path
+    ...(deepLink.path && deepLink.searchable
       ? [
           {
             id: `${app.id}-${deepLink.id}`,
diff --git a/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html b/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
index 4e0c13442d267..b2363ffbaa641 100644
--- a/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
+++ b/x-pack/plugins/graph/public/angular/templates/listing_ng_wrapper.html
@@ -9,4 +9,5 @@
   initial-filter="initialFilter"
   initialPageSize="initialPageSize"
   core-start="coreStart"
+  class="kbnAppWrapper"
 ></graph-listing>
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 6c2c79baafe0a..7fa63404a4abd 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
@@ -86,8 +86,8 @@ function GuidancePanelComponent(props: GuidancePanelProps) {
 
   const kibana = useKibana<IDataPluginServices>();
   const { services, overlays } = kibana;
-  const { savedObjects, uiSettings, chrome, application } = services;
-  if (!overlays || !chrome || !application) return null;
+  const { savedObjects, uiSettings, application } = services;
+  if (!overlays || !application) return null;
 
   const onOpenDatasourcePicker = () => {
     openSourceModal({ overlays, savedObjects, uiSettings }, onIndexPatternSelected);
@@ -149,8 +149,9 @@ function GuidancePanelComponent(props: GuidancePanelProps) {
   );
 
   if (noIndexPatterns) {
-    const managementUrl = chrome.navLinks.get('kibana:stack_management')!.url;
-    const indexPatternUrl = `${managementUrl}/kibana/indexPatterns`;
+    const indexPatternUrl = application.getUrlForApp('management', {
+      path: '/kibana/indexPatterns',
+    });
     const sampleDataUrl = `${application.getUrlForApp('home')}#/tutorial_directory/sampleData`;
     content = (
       <EuiPanel paddingSize="none">
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
index 69d8eee8d9124..6254a6512efb5 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/extend_index_management.test.tsx.snap
@@ -289,12 +289,14 @@ exports[`extend index management ilm summary extension should return extension w
         <EuiIcon
           aria-hidden="true"
           className="euiCallOutHeader__icon"
+          color="inherit"
           size="m"
           type="cross"
         >
           <span
             aria-hidden="true"
             className="euiCallOutHeader__icon"
+            color="inherit"
             data-euiicon-type="cross"
             size="m"
           />
@@ -367,6 +369,7 @@ exports[`extend index management ilm summary extension should return extension w
                     <EuiButtonContent
                       className="euiButtonEmpty__content"
                       iconSide="left"
+                      iconSize="m"
                       textProps={
                         Object {
                           "className": "euiButtonEmpty__text",
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
index 98e0e7e41b236..8d839e196916b 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/__snapshots__/policy_table.test.tsx.snap
@@ -98,6 +98,7 @@ exports[`policy table should show empty state when there are not any policies 1`
         >
           <span
             class="euiButtonContent__icon"
+            color="inherit"
             data-euiicon-type="plusInCircle"
           />
           <span
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.tsx
index 77b0372e24994..b99d828b8bbd0 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.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { registerTestBed, TestBed, TestBedConfig } from '@kbn/test/jest';
-import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public/context';
+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';
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 36f04be3b30b1..18af96dd2804b 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
@@ -5,15 +5,17 @@
  * 2.0.
  */
 
+import { act } from 'react-dom/test-utils';
+
+import { getDefaultHotPhasePolicy, POLICY_NAME } from '../edit_policy/constants';
+import { setupEnvironment } from '../helpers';
+
 import {
   AppTestBed,
   getDoubleEncodedPolicyEditPath,
   getEncodedPolicyEditPath,
   setup,
 } from './app.helpers';
-import { setupEnvironment } from '../helpers/setup_environment';
-import { getDefaultHotPhasePolicy, POLICY_NAME } from '../edit_policy/constants';
-import { act } from 'react-dom/test-utils';
 
 const SPECIAL_CHARS_NAME = 'test?#$+=&@:';
 const PERCENT_SIGN_NAME = 'test%';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
index 67a978bb08471..6f1c58b2e9b18 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/edit_policy.helpers.tsx
@@ -5,19 +5,28 @@
  * 2.0.
  */
 
-import { act } from 'react-dom/test-utils';
 import { TestBedConfig } from '@kbn/test/jest';
-
 import { AppServicesContext } from '../../../public/types';
 
+import { Phase } from '../../../common/types';
+
 import {
-  Phase,
-  createEnablePhaseAction,
   createNodeAllocationActions,
   createFormToggleAction,
   createFormSetValueAction,
   setReplicas,
-  savePolicy,
+  createSearchableSnapshotActions,
+  createTogglePhaseAction,
+  createSavePolicyAction,
+  createErrorsActions,
+  createRolloverActions,
+  createSetWaitForSnapshotAction,
+  createMinAgeActions,
+  createShrinkActions,
+  createFreezeActions,
+  createForceMergeActions,
+  createReadonlyActions,
+  createIndexPriorityActions,
 } from '../helpers';
 import { initTestBed } from './init_test_bed';
 
@@ -30,242 +39,57 @@ export const setup = async (arg?: {
 }) => {
   const testBed = await initTestBed(arg);
 
-  const { find, component, form, exists } = testBed;
-
-  const createFormCheckboxAction = (dataTestSubject: string) => async (checked: boolean) => {
-    await act(async () => {
-      form.selectCheckBox(dataTestSubject, checked);
-    });
-    component.update();
-  };
-
-  const setWaitForSnapshotPolicy = async (snapshotPolicyName: string) => {
-    act(() => {
-      find('snapshotPolicyCombobox').simulate('change', [{ label: snapshotPolicyName }]);
-    });
-    component.update();
-  };
-
-  const toggleDefaultRollover = createFormToggleAction(testBed, 'useDefaultRolloverSwitch');
-
-  const toggleRollover = createFormToggleAction(testBed, 'rolloverSwitch');
-
-  const setMaxPrimaryShardSize = async (value: string, units?: string) => {
-    await act(async () => {
-      find('hot-selectedMaxPrimaryShardSize').simulate('change', { target: { value } });
-      if (units) {
-        find('hot-selectedMaxPrimaryShardSize.select').simulate('change', {
-          target: { value: units },
-        });
-      }
-    });
-    component.update();
-  };
-
-  const setMaxSize = async (value: string, units?: string) => {
-    await act(async () => {
-      find('hot-selectedMaxSizeStored').simulate('change', { target: { value } });
-      if (units) {
-        find('hot-selectedMaxSizeStoredUnits.select').simulate('change', {
-          target: { value: units },
-        });
-      }
-    });
-    component.update();
-  };
-
-  const setMaxDocs = createFormSetValueAction(testBed, 'hot-selectedMaxDocuments');
-
-  const setMaxAge = async (value: string, units?: string) => {
-    await act(async () => {
-      find('hot-selectedMaxAge').simulate('change', { target: { value } });
-      if (units) {
-        find('hot-selectedMaxAgeUnits.select').simulate('change', { target: { value: units } });
-      }
-    });
-    component.update();
-  };
-
-  const createForceMergeActions = (phase: Phase) => {
-    const toggleSelector = `${phase}-forceMergeSwitch`;
-    return {
-      forceMergeFieldExists: () => exists(toggleSelector),
-      toggleForceMerge: createFormToggleAction(testBed, toggleSelector),
-      setForcemergeSegmentsCount: createFormSetValueAction(
-        testBed,
-        `${phase}-selectedForceMergeSegments`
-      ),
-      setBestCompression: createFormCheckboxAction(`${phase}-bestCompression`),
-    };
-  };
-
-  const createIndexPriorityActions = (phase: Phase) => {
-    const toggleSelector = `${phase}-indexPrioritySwitch`;
-    return {
-      indexPriorityExists: () => exists(toggleSelector),
-      toggleIndexPriority: createFormToggleAction(testBed, toggleSelector),
-      setIndexPriority: createFormSetValueAction(testBed, `${phase}-indexPriority`),
-    };
-  };
-
-  const createMinAgeActions = (phase: Phase) => {
-    return {
-      hasMinAgeInput: () => exists(`${phase}-selectedMinimumAge`),
-      setMinAgeValue: createFormSetValueAction(testBed, `${phase}-selectedMinimumAge`),
-      setMinAgeUnits: createFormSetValueAction(testBed, `${phase}-selectedMinimumAgeUnits`),
-      hasRolloverTipOnMinAge: () => exists(`${phase}-rolloverMinAgeInputIconTip`),
-    };
-  };
-
-  const createShrinkActions = (phase: Phase) => {
-    const toggleSelector = `${phase}-shrinkSwitch`;
-    return {
-      shrinkExists: () => exists(toggleSelector),
-      toggleShrink: createFormToggleAction(testBed, toggleSelector),
-      setShrink: createFormSetValueAction(testBed, `${phase}-primaryShardCount`),
-    };
-  };
-
-  const createSetFreeze = (phase: Phase) =>
-    createFormToggleAction(testBed, `${phase}-freezeSwitch`);
-  const createFreezeExists = (phase: Phase) => () => exists(`${phase}-freezeSwitch`);
-
-  const createReadonlyActions = (phase: Phase) => {
-    const toggleSelector = `${phase}-readonlySwitch`;
-    return {
-      readonlyExists: () => exists(toggleSelector),
-      toggleReadonly: createFormToggleAction(testBed, toggleSelector),
-    };
-  };
-
-  const createSearchableSnapshotActions = (phase: Phase) => {
-    const fieldSelector = `searchableSnapshotField-${phase}`;
-    const licenseCalloutSelector = `${fieldSelector}.searchableSnapshotDisabledDueToLicense`;
-    const toggleSelector = `${fieldSelector}.searchableSnapshotToggle`;
-
-    const toggleSearchableSnapshot = createFormToggleAction(testBed, toggleSelector);
-    return {
-      searchableSnapshotDisabled: () =>
-        exists(licenseCalloutSelector) && find(licenseCalloutSelector).props().disabled === true,
-      searchableSnapshotsExists: () => exists(fieldSelector),
-      findSearchableSnapshotToggle: () => find(toggleSelector),
-      searchableSnapshotDisabledDueToLicense: () =>
-        exists(`${fieldSelector}.searchableSnapshotDisabledDueToLicense`),
-      toggleSearchableSnapshot,
-      setSearchableSnapshot: async (value: string) => {
-        if (!exists(`searchableSnapshotField-${phase}.searchableSnapshotCombobox`)) {
-          await toggleSearchableSnapshot(true);
-        }
-        act(() => {
-          find(`searchableSnapshotField-${phase}.searchableSnapshotCombobox`).simulate('change', [
-            { label: value },
-          ]);
-        });
-        component.update();
-      },
-    };
-  };
-
-  const enableDeletePhase = async (isEnabled: boolean) => {
-    const buttonSelector = isEnabled ? 'enableDeletePhaseButton' : 'disableDeletePhaseButton';
-    await act(async () => {
-      find(buttonSelector).simulate('click');
-    });
-    component.update();
-  };
-
-  const hasRolloverSettingRequiredCallout = (): boolean => exists('rolloverSettingsRequired');
-
-  const expectErrorMessages = (expectedMessages: string[]) => {
-    const errorMessages = component.find('.euiFormErrorText');
-    expect(errorMessages.length).toBe(expectedMessages.length);
-    expectedMessages.forEach((expectedErrorMessage) => {
-      let foundErrorMessage;
-      for (let i = 0; i < errorMessages.length; i++) {
-        if (errorMessages.at(i).text() === expectedErrorMessage) {
-          foundErrorMessage = true;
-        }
-      }
-      expect(foundErrorMessage).toBe(true);
-    });
-  };
-
-  /*
-   * We rely on a setTimeout (dedounce) to display error messages under the form fields.
-   * This handler runs all the timers so we can assert for errors in our tests.
-   */
-  const runTimers = () => {
-    act(() => {
-      jest.runAllTimers();
-    });
-    component.update();
-  };
+  const { exists } = testBed;
 
   return {
     ...testBed,
-    runTimers,
     actions: {
-      saveAsNewPolicy: createFormToggleAction(testBed, 'saveAsNewSwitch'),
+      togglePhase: createTogglePhaseAction(testBed),
+      savePolicy: createSavePolicyAction(testBed),
+      toggleSaveAsNewPolicy: createFormToggleAction(testBed, 'saveAsNewSwitch'),
       setPolicyName: createFormSetValueAction(testBed, 'policyNameField'),
-      setWaitForSnapshotPolicy,
-      savePolicy: () => savePolicy(testBed),
-      hasGlobalErrorCallout: () => exists('policyFormErrorsCallout'),
-      expectErrorMessages,
+      errors: {
+        ...createErrorsActions(testBed),
+      },
       timeline: {
-        hasHotPhase: () => exists('ilmTimelineHotPhase'),
-        hasWarmPhase: () => exists('ilmTimelineWarmPhase'),
-        hasColdPhase: () => exists('ilmTimelineColdPhase'),
-        hasFrozenPhase: () => exists('ilmTimelineFrozenPhase'),
-        hasDeletePhase: () => exists('ilmTimelineDeletePhase'),
+        hasPhase: (phase: Phase) => exists(`ilmTimelinePhase-${phase}`),
+      },
+      rollover: {
+        ...createRolloverActions(testBed),
       },
       hot: {
-        setMaxSize,
-        setMaxDocs,
-        setMaxAge,
-        setMaxPrimaryShardSize,
-        toggleRollover,
-        toggleDefaultRollover,
-        hasRolloverSettingRequiredCallout,
-        hasErrorIndicator: () => exists('phaseErrorIndicator-hot'),
-        ...createForceMergeActions('hot'),
-        ...createIndexPriorityActions('hot'),
-        ...createShrinkActions('hot'),
-        ...createReadonlyActions('hot'),
-        ...createSearchableSnapshotActions('hot'),
+        ...createForceMergeActions(testBed, 'hot'),
+        ...createIndexPriorityActions(testBed, 'hot'),
+        ...createShrinkActions(testBed, 'hot'),
+        ...createReadonlyActions(testBed, 'hot'),
+        ...createSearchableSnapshotActions(testBed, 'hot'),
       },
       warm: {
-        enable: createEnablePhaseAction(testBed, 'warm'),
-        ...createMinAgeActions('warm'),
+        ...createMinAgeActions(testBed, 'warm'),
         setReplicas: (value: string) => setReplicas(testBed, 'warm', value),
-        hasErrorIndicator: () => exists('phaseErrorIndicator-warm'),
-        ...createShrinkActions('warm'),
-        ...createForceMergeActions('warm'),
-        ...createReadonlyActions('warm'),
-        ...createIndexPriorityActions('warm'),
+        ...createShrinkActions(testBed, 'warm'),
+        ...createForceMergeActions(testBed, 'warm'),
+        ...createReadonlyActions(testBed, 'warm'),
+        ...createIndexPriorityActions(testBed, 'warm'),
         ...createNodeAllocationActions(testBed, 'warm'),
       },
       cold: {
-        enable: createEnablePhaseAction(testBed, 'cold'),
-        ...createMinAgeActions('cold'),
+        ...createMinAgeActions(testBed, 'cold'),
         setReplicas: (value: string) => setReplicas(testBed, 'cold', value),
-        setFreeze: createSetFreeze('cold'),
-        freezeExists: createFreezeExists('cold'),
-        ...createReadonlyActions('cold'),
-        hasErrorIndicator: () => exists('phaseErrorIndicator-cold'),
-        ...createIndexPriorityActions('cold'),
-        ...createSearchableSnapshotActions('cold'),
+        ...createFreezeActions(testBed, 'cold'),
+        ...createReadonlyActions(testBed, 'cold'),
+        ...createIndexPriorityActions(testBed, 'cold'),
+        ...createSearchableSnapshotActions(testBed, 'cold'),
         ...createNodeAllocationActions(testBed, 'cold'),
       },
       frozen: {
-        enable: createEnablePhaseAction(testBed, 'frozen'),
-        ...createMinAgeActions('frozen'),
-        hasErrorIndicator: () => exists('phaseErrorIndicator-frozen'),
-        ...createSearchableSnapshotActions('frozen'),
+        ...createMinAgeActions(testBed, 'frozen'),
+        ...createSearchableSnapshotActions(testBed, 'frozen'),
       },
       delete: {
-        isShown: () => exists('delete-phaseContent'),
-        enable: enableDeletePhase,
-        ...createMinAgeActions('delete'),
+        isShown: () => exists('delete-phase'),
+        ...createMinAgeActions(testBed, 'delete'),
+        setWaitForSnapshotPolicy: createSetWaitForSnapshotAction(testBed),
       },
     },
   };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts
index dfb7411eb941f..e5e4267b6270c 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/cold_phase.test.ts
@@ -8,7 +8,6 @@
 import { act } from 'react-dom/test-utils';
 import { setupEnvironment } from '../../helpers/setup_environment';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { getDefaultHotPhasePolicy } from '../constants';
 
 describe('<EditPolicy /> cold phase', () => {
   let testBed: EditPolicyTestBed;
@@ -24,16 +23,7 @@ describe('<EditPolicy /> cold phase', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: { data: ['node1'] },
-      nodesByAttributes: { 'attribute:true': ['node1'] },
-      isUsingDeprecatedDataRoleConfig: true,
-    });
-    httpRequestsMockHelpers.setNodesDetails('attribute:true', [
-      { nodeId: 'testNodeId', stats: { name: 'testNodeName', host: 'testHost' } },
-    ]);
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
@@ -46,7 +36,7 @@ describe('<EditPolicy /> cold phase', () => {
   test('shows timing only when enabled', async () => {
     const { actions } = testBed;
     expect(actions.cold.hasMinAgeInput()).toBeFalsy();
-    await actions.cold.enable(true);
+    await actions.togglePhase('cold');
     expect(actions.cold.hasMinAgeInput()).toBeTruthy();
   });
 });
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 0d49024ac6d67..0c24101461f24 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
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
+import { act } from 'react-dom/test-utils';
+import { API_BASE_PATH } from '../../../../common/constants';
+import { setupEnvironment } from '../../helpers';
+import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 import {
   DELETE_PHASE_POLICY,
   getDefaultHotPhasePolicy,
   NEW_SNAPSHOT_POLICY_NAME,
   SNAPSHOT_POLICY_NAME,
 } from '../constants';
-import { act } from 'react-dom/test-utils';
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { API_BASE_PATH } from '../../../../common/constants';
-import { setupEnvironment } from '../../helpers/setup_environment';
 
 describe('<EditPolicy /> delete phase', () => {
   let testBed: EditPolicyTestBed;
@@ -50,8 +50,10 @@ describe('<EditPolicy /> delete phase', () => {
     component.update();
 
     expect(actions.delete.isShown()).toBeFalsy();
-    await actions.delete.enable(true);
+    await actions.togglePhase('delete');
     expect(actions.delete.isShown()).toBeTruthy();
+    await actions.togglePhase('delete');
+    expect(actions.delete.isShown()).toBeFalsy();
   });
 
   test('shows timing after it was enabled', async () => {
@@ -65,7 +67,7 @@ describe('<EditPolicy /> delete phase', () => {
     component.update();
 
     expect(actions.delete.hasMinAgeInput()).toBeFalsy();
-    await actions.delete.enable(true);
+    await actions.togglePhase('delete');
     expect(actions.delete.hasMinAgeInput()).toBeTruthy();
   });
 
@@ -81,7 +83,7 @@ describe('<EditPolicy /> delete phase', () => {
     test('updates snapshot policy name', async () => {
       const { actions } = testBed;
 
-      await actions.setWaitForSnapshotPolicy(NEW_SNAPSHOT_POLICY_NAME);
+      await actions.delete.setWaitForSnapshotPolicy(NEW_SNAPSHOT_POLICY_NAME);
       await actions.savePolicy();
 
       const expected = {
@@ -109,7 +111,7 @@ describe('<EditPolicy /> delete phase', () => {
     test('shows a callout when the input is not an existing policy', async () => {
       const { actions } = testBed;
 
-      await actions.setWaitForSnapshotPolicy('my_custom_policy');
+      await actions.delete.setWaitForSnapshotPolicy('my_custom_policy');
       expect(testBed.find('noPoliciesCallout').exists()).toBeFalsy();
       expect(testBed.find('policiesErrorCallout').exists()).toBeFalsy();
       expect(testBed.find('customPolicyCallout').exists()).toBeTruthy();
@@ -118,7 +120,7 @@ describe('<EditPolicy /> delete phase', () => {
     test('removes the action if field is empty', async () => {
       const { actions } = testBed;
 
-      await actions.setWaitForSnapshotPolicy('');
+      await actions.delete.setWaitForSnapshotPolicy('');
       await actions.savePolicy();
 
       const expected = {
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 3103a4198fc3b..982377e2a0365 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,9 +8,8 @@
 import { act } from 'react-dom/test-utils';
 
 import { licensingMock } from '../../../../../licensing/public/mocks';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { getDefaultHotPhasePolicy } from '../constants';
 
 describe('<EditPolicy /> frozen phase', () => {
   let testBed: EditPolicyTestBed;
@@ -26,16 +25,7 @@ describe('<EditPolicy /> frozen phase', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: { data: ['node1'] },
-      nodesByAttributes: { 'attribute:true': ['node1'] },
-      isUsingDeprecatedDataRoleConfig: true,
-    });
-    httpRequestsMockHelpers.setNodesDetails('attribute:true', [
-      { nodeId: 'testNodeId', stats: { name: 'testNodeName', host: 'testHost' } },
-    ]);
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
@@ -50,19 +40,13 @@ describe('<EditPolicy /> frozen phase', () => {
 
     expect(exists('frozen-phase')).toBe(true);
     expect(actions.frozen.hasMinAgeInput()).toBeFalsy();
-    await actions.frozen.enable(true);
+    await actions.togglePhase('frozen');
     expect(actions.frozen.hasMinAgeInput()).toBeTruthy();
   });
 
   describe('on non-enterprise license', () => {
     beforeEach(async () => {
-      httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-      httpRequestsMockHelpers.setListNodes({
-        isUsingDeprecatedDataRoleConfig: false,
-        nodesByAttributes: { test: ['123'] },
-        nodesByRoles: { data: ['123'] },
-      });
-      httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['my-repo'] });
+      httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
         testBed = await setup({
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 ba376f9cddd93..9741ee87bda10 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
@@ -8,7 +8,7 @@
 import { TestBedConfig } from '@kbn/test/jest';
 
 import { AppServicesContext } from '../../../../../public/types';
-import { createEnablePhaseAction, createNodeAllocationActions } from '../../../helpers';
+import { createTogglePhaseAction, createNodeAllocationActions } from '../../../helpers';
 import { initTestBed } from '../../init_test_bed';
 
 type SetupReturn = ReturnType<typeof setupCloudNodeAllocation>;
@@ -24,12 +24,11 @@ export const setupCloudNodeAllocation = async (arg?: {
   return {
     ...testBed,
     actions: {
+      togglePhase: createTogglePhaseAction(testBed),
       warm: {
-        enable: createEnablePhaseAction(testBed, 'warm'),
         ...createNodeAllocationActions(testBed, 'warm'),
       },
       cold: {
-        enable: createEnablePhaseAction(testBed, 'cold'),
         ...createNodeAllocationActions(testBed, 'cold'),
       },
     },
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 06b667f666808..136865329eb50 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
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../../helpers/setup_environment';
+import { setupEnvironment } from '../../../helpers';
 import {
   CloudNodeAllocationTestBed,
   setupCloudNodeAllocation,
@@ -67,7 +67,7 @@ describe('<EditPolicy /> node allocation cloud-aware behavior', () => {
       const { actions, component, exists } = testBed;
 
       component.update();
-      await actions.warm.enable(true);
+      await actions.togglePhase('warm');
       expect(component.find('.euiLoadingSpinner').exists()).toBeFalsy();
 
       // Assert that default, custom and 'none' options exist
@@ -91,7 +91,7 @@ describe('<EditPolicy /> node allocation cloud-aware behavior', () => {
         const { actions, component, exists, find } = testBed;
 
         component.update();
-        await actions.warm.enable(true);
+        await actions.togglePhase('warm');
         expect(component.find('.euiLoadingSpinner').exists()).toBeFalsy();
 
         // Assert that custom and 'none' options exist
@@ -115,7 +115,7 @@ describe('<EditPolicy /> node allocation cloud-aware behavior', () => {
         testBed.component.update();
 
         const { actions, component, exists, find } = testBed;
-        await actions.warm.enable(true);
+        await actions.togglePhase('warm');
         expect(component.find('.euiLoadingSpinner').exists()).toBeFalsy();
 
         await actions.warm.openNodeAttributesSection();
@@ -137,8 +137,8 @@ describe('<EditPolicy /> node allocation cloud-aware behavior', () => {
         testBed.component.update();
 
         const { actions, component, exists } = testBed;
-        await actions.warm.enable(true);
-        await actions.cold.enable(true);
+        await actions.togglePhase('warm');
+        await actions.togglePhase('cold');
         expect(component.find('.euiLoadingSpinner').exists()).toBeFalsy();
 
         expect(exists('cloudDataTierCallout')).toBeFalsy();
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 52593e67df768..9848915f8feb9 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,7 +5,7 @@
  * 2.0.
  */
 
-import { createEnablePhaseAction, createNodeAllocationActions } from '../../../helpers';
+import { createNodeAllocationActions, createTogglePhaseAction } from '../../../helpers';
 import { initTestBed } from '../../init_test_bed';
 
 type SetupReturn = ReturnType<typeof setupColdPhaseNodeAllocation>;
@@ -18,7 +18,7 @@ export const setupColdPhaseNodeAllocation = async () => {
   return {
     ...testBed,
     actions: {
-      enable: createEnablePhaseAction(testBed, 'cold'),
+      toggleColdPhase: () => createTogglePhaseAction(testBed)('cold'),
       ...createNodeAllocationActions(testBed, 'cold'),
     },
   };
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 f833c8e316117..e2093e04b7779 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
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../../helpers/setup_environment';
+import { setupEnvironment } from '../../../helpers';
 import { NodeAllocationTestBed, setupColdPhaseNodeAllocation } from './cold_phase.helpers';
 
 describe('<EditPolicy /> node allocation in the cold phase', () => {
@@ -56,7 +56,7 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
     const { actions, component } = testBed;
 
     component.update();
-    await actions.enable(true);
+    await actions.toggleColdPhase();
 
     expect(actions.isAllocationLoading()).toBeFalsy();
     expect(actions.hasWillUseFallbackTierNotice()).toBeFalsy();
@@ -67,7 +67,7 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
       server.respondImmediately = false;
 
       const { actions } = testBed;
-      await actions.enable(true);
+      await actions.toggleColdPhase();
 
       expect(actions.isAllocationLoading()).toBeTruthy();
       expect(actions.hasDataTierAllocationControls()).toBeTruthy();
@@ -83,7 +83,7 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
     describe('and some are defined', () => {
       test('shows the node attributes input', async () => {
         const { actions } = testBed;
-        await actions.enable(true);
+        await actions.toggleColdPhase();
 
         expect(actions.isAllocationLoading()).toBeFalsy();
         await actions.setDataAllocation('node_attrs');
@@ -95,7 +95,7 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
       test('shows view node attributes link when an attribute is selected and shows flyout when clicked', async () => {
         const { actions } = testBed;
 
-        await actions.enable(true);
+        await actions.toggleColdPhase();
 
         expect(actions.isAllocationLoading()).toBeFalsy();
         await actions.setDataAllocation('node_attrs');
@@ -116,7 +116,7 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
         await setup();
         const { actions, component } = testBed;
         component.update();
-        await actions.enable(true);
+        await actions.toggleColdPhase();
 
         expect(actions.isAllocationLoading()).toBeFalsy();
         await actions.setDataAllocation('node_attrs');
@@ -186,7 +186,7 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
       const { actions, component } = testBed;
 
       component.update();
-      await actions.enable(true);
+      await actions.toggleColdPhase();
 
       expect(actions.isAllocationLoading()).toBeFalsy();
       expect(actions.hasNoTiersAvailableNotice()).toBeTruthy();
@@ -213,7 +213,7 @@ describe('<EditPolicy /> node allocation in the cold phase', () => {
         const { actions, component } = testBed;
 
         component.update();
-        await actions.enable(true);
+        await actions.toggleColdPhase();
 
         expect(actions.isAllocationLoading()).toBeFalsy();
         expect(actions.hasWillUseFallbackTierNotice()).toBeTruthy();
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 8dd5a75ac0d22..6b6db2da5946d 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,7 +5,7 @@
  * 2.0.
  */
 
-import { createNodeAllocationActions, savePolicy, setReplicas } from '../../../helpers';
+import { createNodeAllocationActions, createSavePolicyAction, setReplicas } from '../../../helpers';
 import { initTestBed } from '../../init_test_bed';
 
 type SetupReturn = ReturnType<typeof setupGeneralNodeAllocation>;
@@ -19,7 +19,7 @@ export const setupGeneralNodeAllocation = async () => {
     ...testBed,
     actions: {
       ...createNodeAllocationActions(testBed, 'warm'),
-      savePolicy: () => savePolicy(testBed),
+      savePolicy: createSavePolicyAction(testBed),
       setReplicas: (value: string) => setReplicas(testBed, 'warm', value),
     },
   };
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 d45e1cfe9567b..cac6c174b769e 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,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../../helpers/setup_environment';
+import { setupEnvironment } from '../../../helpers';
 import {
   GeneralNodeAllocationTestBed,
   setupGeneralNodeAllocation,
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 e39629da79cd8..5c576ebf74ccb 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,7 +5,7 @@
  * 2.0.
  */
 
-import { createNodeAllocationActions, createEnablePhaseAction } from '../../../helpers';
+import { createNodeAllocationActions, createTogglePhaseAction } from '../../../helpers';
 import { initTestBed } from '../../init_test_bed';
 
 type SetupReturn = ReturnType<typeof setupWarmPhaseNodeAllocation>;
@@ -18,7 +18,7 @@ export const setupWarmPhaseNodeAllocation = async () => {
   return {
     ...testBed,
     actions: {
-      enable: createEnablePhaseAction(testBed, 'warm'),
+      togglePhase: () => createTogglePhaseAction(testBed)('warm'),
       ...createNodeAllocationActions(testBed, 'warm'),
     },
   };
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 0ab18c6e05736..8d4d0afcf052d 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
@@ -6,7 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../../helpers/setup_environment';
+import { setupEnvironment } from '../../../helpers';
 import { NodeAllocationTestBed, setupWarmPhaseNodeAllocation } from './warm_phase.helpers';
 
 describe('<EditPolicy /> node allocation in the warm phase', () => {
@@ -56,7 +56,7 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
     const { actions, component } = testBed;
 
     component.update();
-    await actions.enable(true);
+    await actions.togglePhase();
 
     expect(actions.isAllocationLoading()).toBeFalsy();
     expect(actions.hasDefaultAllocationBehaviorNotice()).toBeFalsy();
@@ -67,7 +67,7 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
       server.respondImmediately = false;
 
       const { actions } = testBed;
-      await actions.enable(true);
+      await actions.togglePhase();
 
       expect(actions.isAllocationLoading()).toBeTruthy();
       expect(actions.hasDataTierAllocationControls()).toBeTruthy();
@@ -83,7 +83,7 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
     describe('and some are defined', () => {
       test('shows the node attributes input', async () => {
         const { actions } = testBed;
-        await actions.enable(true);
+        await actions.togglePhase();
 
         expect(actions.isAllocationLoading()).toBeFalsy();
         await actions.setDataAllocation('node_attrs');
@@ -94,7 +94,7 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
 
       test('shows view node attributes link when an attribute is selected and shows flyout when clicked', async () => {
         const { actions } = testBed;
-        await actions.enable(true);
+        await actions.togglePhase();
 
         expect(actions.isAllocationLoading()).toBeFalsy();
         await actions.setDataAllocation('node_attrs');
@@ -115,7 +115,7 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
         await setup();
         const { actions, component } = testBed;
         component.update();
-        await actions.enable(true);
+        await actions.togglePhase();
 
         expect(actions.isAllocationLoading()).toBeFalsy();
         await actions.setDataAllocation('node_attrs');
@@ -185,7 +185,7 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
       const { actions, component } = testBed;
 
       component.update();
-      await actions.enable(true);
+      await actions.togglePhase();
 
       expect(actions.isAllocationLoading()).toBeFalsy();
       expect(actions.hasNoTiersAvailableNotice()).toBeTruthy();
@@ -202,7 +202,7 @@ describe('<EditPolicy /> node allocation in the warm phase', () => {
       const { actions, component } = testBed;
 
       component.update();
-      await actions.enable(true);
+      await actions.togglePhase();
 
       expect(actions.isAllocationLoading()).toBeFalsy();
       expect(actions.hasWillUseFallbackTierNotice()).toBeTruthy();
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 fbd0152e19cc4..1cb895e9ac86a 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
@@ -6,9 +6,8 @@
  */
 
 import { act } from 'react-dom/test-utils';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { setupEnvironment } from '../../helpers/setup_environment';
-import { getDefaultHotPhasePolicy } from '../constants';
 
 describe('<EditPolicy /> request flyout', () => {
   let testBed: EditPolicyTestBed;
@@ -24,7 +23,7 @@ describe('<EditPolicy /> request flyout', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
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 ad4d67826b1ed..8e9586e52577b 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
@@ -5,11 +5,10 @@
  * 2.0.
  */
 
-import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { setupEnvironment } from '../../helpers/setup_environment';
-import { getDefaultHotPhasePolicy } from '../constants';
 import { act } from 'react-dom/test-utils';
 import { licensingMock } from '../../../../../licensing/public/mocks';
+import { setupEnvironment } from '../../helpers';
+import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 
 describe('<EditPolicy /> rollover', () => {
   let testBed: EditPolicyTestBed;
@@ -20,14 +19,7 @@ describe('<EditPolicy /> rollover', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
-    httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['abc'] });
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: {},
-      nodesByAttributes: { test: ['123'] },
-      isUsingDeprecatedDataRoleConfig: false,
-    });
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup({
@@ -48,8 +40,8 @@ describe('<EditPolicy /> rollover', () => {
 
   test('hides forcemerge when rollover is disabled', async () => {
     const { actions } = testBed;
-    await actions.hot.toggleDefaultRollover(false);
-    await actions.hot.toggleRollover(false);
+    await actions.rollover.toggleDefault();
+    await actions.rollover.toggle();
     expect(actions.hot.forceMergeFieldExists()).toBeFalsy();
   });
 
@@ -60,8 +52,8 @@ describe('<EditPolicy /> rollover', () => {
 
   test('hides shrink input when rollover is disabled', async () => {
     const { actions } = testBed;
-    await actions.hot.toggleDefaultRollover(false);
-    await actions.hot.toggleRollover(false);
+    await actions.rollover.toggleDefault();
+    await actions.rollover.toggle();
     expect(actions.hot.shrinkExists()).toBeFalsy();
   });
 
@@ -72,16 +64,16 @@ describe('<EditPolicy /> rollover', () => {
 
   test('hides readonly input when rollover is disabled', async () => {
     const { actions } = testBed;
-    await actions.hot.toggleDefaultRollover(false);
-    await actions.hot.toggleRollover(false);
+    await actions.rollover.toggleDefault();
+    await actions.rollover.toggle();
     expect(actions.hot.readonlyExists()).toBeFalsy();
   });
 
   test('hides and disables searchable snapshot field', async () => {
     const { actions } = testBed;
-    await actions.hot.toggleDefaultRollover(false);
-    await actions.hot.toggleRollover(false);
-    await actions.cold.enable(true);
+    await actions.rollover.toggleDefault();
+    await actions.rollover.toggle();
+    await actions.togglePhase('cold');
 
     expect(actions.hot.searchableSnapshotsExists()).toBeFalsy();
   });
@@ -89,10 +81,10 @@ describe('<EditPolicy /> rollover', () => {
   test('shows rollover tip on minimum age', async () => {
     const { actions } = testBed;
 
-    await actions.warm.enable(true);
-    await actions.cold.enable(true);
-    await actions.frozen.enable(true);
-    await actions.delete.enable(true);
+    await actions.togglePhase('warm');
+    await actions.togglePhase('cold');
+    await actions.togglePhase('frozen');
+    await actions.togglePhase('delete');
 
     expect(actions.warm.hasRolloverTipOnMinAge()).toBeTruthy();
     expect(actions.cold.hasRolloverTipOnMinAge()).toBeTruthy();
@@ -102,13 +94,13 @@ describe('<EditPolicy /> rollover', () => {
 
   test('hiding rollover tip on minimum age', async () => {
     const { actions } = testBed;
-    await actions.hot.toggleDefaultRollover(false);
-    await actions.hot.toggleRollover(false);
+    await actions.rollover.toggleDefault();
+    await actions.rollover.toggle();
 
-    await actions.warm.enable(true);
-    await actions.cold.enable(true);
-    await actions.frozen.enable(true);
-    await actions.delete.enable(true);
+    await actions.togglePhase('warm');
+    await actions.togglePhase('cold');
+    await actions.togglePhase('frozen');
+    await actions.togglePhase('delete');
 
     expect(actions.warm.hasRolloverTipOnMinAge()).toBeFalsy();
     expect(actions.cold.hasRolloverTipOnMinAge()).toBeFalsy();
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 ede40521deb97..d400966cdae38 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
@@ -7,7 +7,7 @@
 
 import { act } from 'react-dom/test-utils';
 import { licensingMock } from '../../../../../licensing/public/mocks';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { setupEnvironment } from '../../helpers';
 import { getDefaultHotPhasePolicy } from '../constants';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 
@@ -20,13 +20,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: {},
-      nodesByAttributes: { test: ['123'] },
-      isUsingDeprecatedDataRoleConfig: false,
-    });
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
@@ -39,8 +33,8 @@ describe('<EditPolicy /> searchable snapshots', () => {
   test('enabling searchable snapshot should hide force merge, freeze, readonly and shrink in subsequent phases', async () => {
     const { actions } = testBed;
 
-    await actions.warm.enable(true);
-    await actions.cold.enable(true);
+    await actions.togglePhase('warm');
+    await actions.togglePhase('cold');
 
     expect(actions.warm.forceMergeFieldExists()).toBeTruthy();
     expect(actions.warm.shrinkExists()).toBeTruthy();
@@ -62,9 +56,9 @@ describe('<EditPolicy /> searchable snapshots', () => {
 
   test('disabling rollover toggle, but enabling default rollover', async () => {
     const { actions } = testBed;
-    await actions.hot.toggleDefaultRollover(false);
-    await actions.hot.toggleRollover(false);
-    await actions.hot.toggleDefaultRollover(true);
+    await actions.rollover.toggleDefault();
+    await actions.rollover.toggle();
+    await actions.rollover.toggleDefault();
 
     expect(actions.hot.forceMergeFieldExists()).toBeTruthy();
     expect(actions.hot.shrinkExists()).toBeTruthy();
@@ -76,10 +70,10 @@ describe('<EditPolicy /> searchable snapshots', () => {
 
     const repository = 'myRepo';
     await actions.hot.setSearchableSnapshot(repository);
-    await actions.cold.enable(true);
+    await actions.togglePhase('cold');
     await actions.cold.setMinAgeValue('10');
-    await actions.cold.toggleSearchableSnapshot(true);
-    await actions.frozen.enable(true);
+    await actions.cold.toggleSearchableSnapshot();
+    await actions.togglePhase('frozen');
     await actions.frozen.setMinAgeValue('15');
 
     await actions.savePolicy();
@@ -97,10 +91,10 @@ describe('<EditPolicy /> searchable snapshots', () => {
     const { actions } = testBed;
 
     await actions.hot.setSearchableSnapshot('myRepo');
-    await actions.cold.enable(true);
+    await actions.togglePhase('cold');
     await actions.cold.setMinAgeValue('10');
-    await actions.cold.toggleSearchableSnapshot(true);
-    await actions.frozen.enable(true);
+    await actions.cold.toggleSearchableSnapshot();
+    await actions.togglePhase('frozen');
     await actions.frozen.setMinAgeValue('15');
 
     // We update the repository in one phase
@@ -137,7 +131,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
 
       test('defaults searchable snapshot to true on cloud', async () => {
         const { find, actions } = testBed;
-        await actions.cold.enable(true);
+        await actions.togglePhase('cold');
         expect(
           find('searchableSnapshotField-cold.searchableSnapshotToggle').props()['aria-checked']
         ).toBe(true);
@@ -164,9 +158,9 @@ describe('<EditPolicy /> searchable snapshots', () => {
 
       test('correctly sets snapshot repository default to "found-snapshots"', async () => {
         const { actions } = testBed;
-        await actions.cold.enable(true);
+        await actions.togglePhase('cold');
         await actions.cold.setMinAgeValue('10');
-        await actions.cold.toggleSearchableSnapshot(true);
+        await actions.cold.toggleSearchableSnapshot();
         await actions.savePolicy();
         const latestRequest = server.requests[server.requests.length - 1];
         expect(latestRequest.method).toBe('POST');
@@ -208,7 +202,7 @@ describe('<EditPolicy /> searchable snapshots', () => {
       expect(actions.cold.searchableSnapshotsExists()).toBeFalsy();
       expect(actions.frozen.searchableSnapshotsExists()).toBeFalsy();
 
-      await actions.cold.enable(true);
+      await actions.togglePhase('cold');
 
       // Still hidden in hot
       expect(actions.hot.searchableSnapshotsExists()).toBeFalsy();
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 a6cce7fdfaca0..a4f2a24bcee8b 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
@@ -6,8 +6,7 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../helpers/setup_environment';
-import { getDefaultHotPhasePolicy } from '../constants';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 
 describe('<EditPolicy /> timeline', () => {
@@ -19,13 +18,7 @@ describe('<EditPolicy /> timeline', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: {},
-      nodesByAttributes: { test: ['123'] },
-      isUsingDeprecatedDataRoleConfig: false,
-    });
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
@@ -38,27 +31,27 @@ describe('<EditPolicy /> timeline', () => {
   test('showing all phases on the timeline', async () => {
     const { actions } = testBed;
     // This is how the default policy should look
-    expect(actions.timeline.hasHotPhase()).toBe(true);
-    expect(actions.timeline.hasWarmPhase()).toBe(false);
-    expect(actions.timeline.hasColdPhase()).toBe(false);
-    expect(actions.timeline.hasDeletePhase()).toBe(false);
-
-    await actions.warm.enable(true);
-    expect(actions.timeline.hasHotPhase()).toBe(true);
-    expect(actions.timeline.hasWarmPhase()).toBe(true);
-    expect(actions.timeline.hasColdPhase()).toBe(false);
-    expect(actions.timeline.hasDeletePhase()).toBe(false);
-
-    await actions.cold.enable(true);
-    expect(actions.timeline.hasHotPhase()).toBe(true);
-    expect(actions.timeline.hasWarmPhase()).toBe(true);
-    expect(actions.timeline.hasColdPhase()).toBe(true);
-    expect(actions.timeline.hasDeletePhase()).toBe(false);
-
-    await actions.delete.enable(true);
-    expect(actions.timeline.hasHotPhase()).toBe(true);
-    expect(actions.timeline.hasWarmPhase()).toBe(true);
-    expect(actions.timeline.hasColdPhase()).toBe(true);
-    expect(actions.timeline.hasDeletePhase()).toBe(true);
+    expect(actions.timeline.hasPhase('hot')).toBe(true);
+    expect(actions.timeline.hasPhase('warm')).toBe(false);
+    expect(actions.timeline.hasPhase('cold')).toBe(false);
+    expect(actions.timeline.hasPhase('delete')).toBe(false);
+
+    await actions.togglePhase('warm');
+    expect(actions.timeline.hasPhase('hot')).toBe(true);
+    expect(actions.timeline.hasPhase('warm')).toBe(true);
+    expect(actions.timeline.hasPhase('cold')).toBe(false);
+    expect(actions.timeline.hasPhase('delete')).toBe(false);
+
+    await actions.togglePhase('cold');
+    expect(actions.timeline.hasPhase('hot')).toBe(true);
+    expect(actions.timeline.hasPhase('warm')).toBe(true);
+    expect(actions.timeline.hasPhase('cold')).toBe(true);
+    expect(actions.timeline.hasPhase('delete')).toBe(false);
+
+    await actions.togglePhase('delete');
+    expect(actions.timeline.hasPhase('hot')).toBe(true);
+    expect(actions.timeline.hasPhase('warm')).toBe(true);
+    expect(actions.timeline.hasPhase('cold')).toBe(true);
+    expect(actions.timeline.hasPhase('delete')).toBe(true);
   });
 });
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts
index 2252f8d1f5fa8..ae9f306483820 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/edit_policy/features/warm_phase.test.ts
@@ -6,9 +6,8 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { getDefaultHotPhasePolicy } from '../constants';
 
 describe('<EditPolicy /> warm phase', () => {
   let testBed: EditPolicyTestBed;
@@ -24,16 +23,7 @@ describe('<EditPolicy /> warm phase', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: { data: ['node1'] },
-      nodesByAttributes: { 'attribute:true': ['node1'] },
-      isUsingDeprecatedDataRoleConfig: true,
-    });
-    httpRequestsMockHelpers.setNodesDetails('attribute:true', [
-      { nodeId: 'testNodeId', stats: { name: 'testNodeName', host: 'testHost' } },
-    ]);
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
@@ -46,7 +36,7 @@ describe('<EditPolicy /> warm phase', () => {
   test('shows timing only when enabled', async () => {
     const { actions } = testBed;
     expect(actions.warm.hasMinAgeInput()).toBeFalsy();
-    await actions.warm.enable(true);
+    await actions.togglePhase('warm');
     expect(actions.warm.hasMinAgeInput()).toBeTruthy();
   });
 });
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 455a7bd442167..9a14571c6ec3b 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
@@ -7,12 +7,11 @@
 
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 
 describe('<EditPolicy /> cold phase validation', () => {
   let testBed: EditPolicyTestBed;
-  let runTimers: () => void;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -42,9 +41,7 @@ describe('<EditPolicy /> cold phase validation', () => {
     const { component, actions } = testBed;
     component.update();
     await actions.setPolicyName('mypolicy');
-    await actions.cold.enable(true);
-
-    ({ runTimers } = testBed);
+    await actions.togglePhase('cold');
   });
 
   describe('replicas', () => {
@@ -53,9 +50,9 @@ describe('<EditPolicy /> cold phase validation', () => {
 
       await actions.cold.setReplicas('-1');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
     });
 
     test(`allows 0 for replicas`, async () => {
@@ -63,9 +60,9 @@ describe('<EditPolicy /> cold phase validation', () => {
 
       await actions.cold.setReplicas('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([]);
+      actions.errors.expectMessages([]);
     });
   });
 
@@ -75,9 +72,9 @@ describe('<EditPolicy /> cold phase validation', () => {
 
       await actions.cold.setIndexPriority('-1');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
     });
 
     test(`allows 0 for index priority`, async () => {
@@ -85,9 +82,9 @@ describe('<EditPolicy /> cold phase validation', () => {
 
       await actions.cold.setIndexPriority('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([]);
+      actions.errors.expectMessages([]);
     });
   });
 });
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 86cf4ab5a4858..0a047714bd345 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
@@ -6,13 +6,11 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../helpers/setup_environment';
-import { getDefaultHotPhasePolicy } from '../constants';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 
 describe('<EditPolicy /> error indicators', () => {
   let testBed: EditPolicyTestBed;
-  let runTimers: () => void;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -25,13 +23,7 @@ describe('<EditPolicy /> error indicators', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: {},
-      nodesByAttributes: { test: ['123'] },
-      isUsingDeprecatedDataRoleConfig: false,
-    });
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
@@ -39,8 +31,6 @@ describe('<EditPolicy /> error indicators', () => {
 
     const { component } = testBed;
     component.update();
-
-    ({ runTimers } = testBed);
   });
   test('shows phase error indicators correctly', async () => {
     // This test simulates a user configuring a policy phase by phase. The flow is the following:
@@ -56,99 +46,98 @@ describe('<EditPolicy /> error indicators', () => {
     const { actions } = testBed;
 
     // 0. No validation issues
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(false);
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(false);
 
     // 1. Hot phase validation issue
-    await actions.hot.toggleForceMerge(true);
+    await actions.hot.toggleForceMerge();
     await actions.hot.setForcemergeSegmentsCount('-22');
-    runTimers();
-    expect(actions.hot.hasErrorIndicator()).toBe(true);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(false);
+    actions.errors.waitForValidation();
+    expect(actions.errors.havePhaseCallout('hot')).toBe(true);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(false);
 
     // 2. Warm phase validation issue
-    await actions.warm.enable(true);
-    await actions.warm.toggleForceMerge(true);
+    await actions.togglePhase('warm');
+    await actions.warm.toggleForceMerge();
     await actions.warm.setForcemergeSegmentsCount('-22');
-    runTimers();
-    expect(actions.hot.hasErrorIndicator()).toBe(true);
-    expect(actions.warm.hasErrorIndicator()).toBe(true);
-    expect(actions.cold.hasErrorIndicator()).toBe(false);
+    actions.errors.waitForValidation();
+    expect(actions.errors.havePhaseCallout('hot')).toBe(true);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(true);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(false);
 
     // 3. Cold phase validation issue
-    await actions.cold.enable(true);
+    await actions.togglePhase('cold');
     await actions.cold.setReplicas('-33');
-    runTimers();
-    expect(actions.hot.hasErrorIndicator()).toBe(true);
-    expect(actions.warm.hasErrorIndicator()).toBe(true);
-    expect(actions.cold.hasErrorIndicator()).toBe(true);
+    actions.errors.waitForValidation();
+    expect(actions.errors.havePhaseCallout('hot')).toBe(true);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(true);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(true);
 
     // 4. Fix validation issue in hot
     await actions.hot.setForcemergeSegmentsCount('1');
-    runTimers();
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(true);
-    expect(actions.cold.hasErrorIndicator()).toBe(true);
+    actions.errors.waitForValidation();
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(true);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(true);
 
     // 5. Fix validation issue in warm
     await actions.warm.setForcemergeSegmentsCount('1');
-    runTimers();
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(true);
+    actions.errors.waitForValidation();
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(true);
 
     // 6. Fix validation issue in cold
     await actions.cold.setReplicas('1');
-    runTimers();
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(false);
+    actions.errors.waitForValidation();
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(false);
   });
 
   test('global error callout should show, after clicking the "Save" button, if there are any form errors', async () => {
     const { actions } = testBed;
 
-    expect(actions.hasGlobalErrorCallout()).toBe(false);
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(false);
+    expect(actions.errors.haveGlobalCallout()).toBe(false);
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(false);
 
-    await actions.saveAsNewPolicy(true);
+    await actions.toggleSaveAsNewPolicy();
     await actions.setPolicyName('');
-    runTimers();
+    actions.errors.waitForValidation();
     await actions.savePolicy();
 
-    expect(actions.hasGlobalErrorCallout()).toBe(true);
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(false);
+    expect(actions.errors.haveGlobalCallout()).toBe(true);
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(false);
   });
 
-  test('clears all error indicators if last erroring field is unmounted', async () => {
+  test('clears all error indicators if last erring field is unmounted', async () => {
     const { actions } = testBed;
 
-    await actions.cold.enable(true);
+    await actions.togglePhase('cold');
     await actions.cold.setMinAgeValue('7');
     // introduce validation error
     await actions.cold.setSearchableSnapshot('');
-    runTimers();
 
     await actions.savePolicy();
-    runTimers();
+    actions.errors.waitForValidation();
 
-    expect(actions.hasGlobalErrorCallout()).toBe(true);
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(true);
+    expect(actions.errors.haveGlobalCallout()).toBe(true);
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(true);
 
     // unmount the field
-    await actions.cold.toggleSearchableSnapshot(false);
+    await actions.cold.toggleSearchableSnapshot();
 
-    expect(actions.hasGlobalErrorCallout()).toBe(false);
-    expect(actions.hot.hasErrorIndicator()).toBe(false);
-    expect(actions.warm.hasErrorIndicator()).toBe(false);
-    expect(actions.cold.hasErrorIndicator()).toBe(false);
+    expect(actions.errors.haveGlobalCallout()).toBe(false);
+    expect(actions.errors.havePhaseCallout('hot')).toBe(false);
+    expect(actions.errors.havePhaseCallout('warm')).toBe(false);
+    expect(actions.errors.havePhaseCallout('cold')).toBe(false);
   });
 });
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 46fbf69fbcad5..296b128eb8f52 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
@@ -7,12 +7,12 @@
 
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 
 describe('<EditPolicy /> hot phase validation', () => {
   let testBed: EditPolicyTestBed;
-  let runTimers: () => void;
+  let actions: EditPolicyTestBed['actions'];
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -30,190 +30,159 @@ describe('<EditPolicy /> hot phase validation', () => {
       testBed = await setup();
     });
 
-    const { component, actions } = testBed;
+    const { component } = testBed;
     component.update();
+    ({ actions } = testBed);
     await actions.setPolicyName('mypolicy');
-
-    ({ runTimers } = testBed);
   });
 
   describe('rollover', () => {
     test(`doesn't allow no max primary shard size, no max index size, no max age, no max docs`, async () => {
-      const { actions } = testBed;
-
-      await actions.hot.toggleDefaultRollover(false);
-      expect(actions.hot.hasRolloverSettingRequiredCallout()).toBeFalsy();
+      await actions.rollover.toggleDefault();
+      expect(actions.rollover.hasSettingRequiredCallout()).toBeFalsy();
 
-      await actions.hot.setMaxPrimaryShardSize('');
-      await actions.hot.setMaxAge('');
-      await actions.hot.setMaxDocs('');
-      await actions.hot.setMaxSize('');
+      await actions.rollover.setMaxPrimaryShardSize('');
+      await actions.rollover.setMaxAge('');
+      await actions.rollover.setMaxDocs('');
+      await actions.rollover.setMaxSize('');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      expect(actions.hot.hasRolloverSettingRequiredCallout()).toBeTruthy();
+      expect(actions.rollover.hasSettingRequiredCallout()).toBeTruthy();
     });
 
     test(`doesn't allow -1 for max primary shard size`, async () => {
-      const { actions } = testBed;
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxPrimaryShardSize('-1');
 
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxPrimaryShardSize('-1');
+      actions.errors.waitForValidation();
 
-      runTimers();
-
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow 0 for max primary shard size`, async () => {
-      const { actions } = testBed;
-
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxPrimaryShardSize('0');
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxPrimaryShardSize('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow -1 for max size`, async () => {
-      const { actions } = testBed;
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxSize('-1');
 
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxSize('-1');
+      actions.errors.waitForValidation();
 
-      runTimers();
-
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow 0 for max size`, async () => {
-      const { actions } = testBed;
-
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxSize('0');
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxSize('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow -1 for max age`, async () => {
-      const { actions } = testBed;
-
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxAge('-1');
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxAge('-1');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow 0 for max age`, async () => {
-      const { actions } = testBed;
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxAge('0');
 
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxAge('0');
+      actions.errors.waitForValidation();
 
-      runTimers();
-
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow decimals for max age`, async () => {
-      const { actions } = testBed;
-
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxAge('5.5');
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxAge('5.5');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.integerRequired]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.integerRequired]);
     });
 
     test(`doesn't allow -1 for max docs`, async () => {
-      const { actions } = testBed;
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxDocs('-1');
 
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxDocs('-1');
+      actions.errors.waitForValidation();
 
-      runTimers();
-
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow 0 for max docs`, async () => {
-      const { actions } = testBed;
-
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxDocs('0');
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxDocs('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
 
     test(`doesn't allow decimals for max docs`, async () => {
-      const { actions } = testBed;
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxDocs('5.5');
 
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxDocs('5.5');
+      actions.errors.waitForValidation();
 
-      runTimers();
-
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.integerRequired]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.integerRequired]);
     });
   });
 
   describe('forcemerge', () => {
     test(`doesn't allow 0 for forcemerge`, async () => {
-      const { actions } = testBed;
-      await actions.hot.toggleForceMerge(true);
+      await actions.hot.toggleForceMerge();
       await actions.hot.setForcemergeSegmentsCount('0');
-      runTimers();
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.waitForValidation();
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
     test(`doesn't allow -1 for forcemerge`, async () => {
-      const { actions } = testBed;
-      await actions.hot.toggleForceMerge(true);
+      await actions.hot.toggleForceMerge();
       await actions.hot.setForcemergeSegmentsCount('-1');
-      runTimers();
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.waitForValidation();
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
   });
 
   describe('shrink', () => {
     test(`doesn't allow 0 for shrink`, async () => {
-      const { actions } = testBed;
-      await actions.hot.toggleShrink(true);
+      await actions.hot.toggleShrink();
       await actions.hot.setShrink('0');
-      runTimers();
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.waitForValidation();
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
     test(`doesn't allow -1 for shrink`, async () => {
-      const { actions } = testBed;
-      await actions.hot.toggleShrink(true);
+      await actions.hot.toggleShrink();
       await actions.hot.setShrink('-1');
-      runTimers();
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.waitForValidation();
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
   });
 
   describe('index priority', () => {
     test(`doesn't allow -1 for index priority`, async () => {
-      const { actions } = testBed;
-
       await actions.hot.setIndexPriority('-1');
-      runTimers();
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
+      actions.errors.waitForValidation();
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
     });
 
     test(`allows 0 for index priority`, async () => {
-      const { actions } = testBed;
-
       await actions.hot.setIndexPriority('0');
-      runTimers();
-      actions.expectErrorMessages([]);
+      actions.errors.waitForValidation();
+      actions.errors.expectMessages([]);
     });
   });
 });
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 0acb425b1d975..08b794466da49 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
@@ -7,13 +7,13 @@
 
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 import { getGeneratedPolicies } from '../constants';
 
 describe('<EditPolicy /> policy name validation', () => {
   let testBed: EditPolicyTestBed;
-  let runTimers: () => void;
+  let actions: EditPolicyTestBed['actions'];
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -34,28 +34,24 @@ describe('<EditPolicy /> policy name validation', () => {
 
     const { component } = testBed;
     component.update();
-
-    ({ runTimers } = testBed);
+    ({ actions } = testBed);
   });
 
   test(`doesn't allow empty policy name`, async () => {
-    const { actions } = testBed;
     await actions.savePolicy();
-    actions.expectErrorMessages([i18nTexts.editPolicy.errors.policyNameRequiredMessage]);
+    actions.errors.expectMessages([i18nTexts.editPolicy.errors.policyNameRequiredMessage]);
   });
 
   test(`doesn't allow policy name with space`, async () => {
-    const { actions } = testBed;
     await actions.setPolicyName('my policy');
-    runTimers();
-    actions.expectErrorMessages([i18nTexts.editPolicy.errors.policyNameContainsInvalidChars]);
+    actions.errors.waitForValidation();
+    actions.errors.expectMessages([i18nTexts.editPolicy.errors.policyNameContainsInvalidChars]);
   });
 
   test(`doesn't allow policy name that is already used`, async () => {
-    const { actions } = testBed;
     await actions.setPolicyName('testy0');
-    runTimers();
-    actions.expectErrorMessages([i18nTexts.editPolicy.errors.policyNameAlreadyUsedErrorMessage]);
+    actions.errors.waitForValidation();
+    actions.errors.expectMessages([i18nTexts.editPolicy.errors.policyNameAlreadyUsedErrorMessage]);
   });
 
   test(`doesn't allow to save as new policy but using the same name`, async () => {
@@ -69,31 +65,28 @@ describe('<EditPolicy /> policy name validation', () => {
         },
       });
     });
-    const { component, actions } = testBed;
+    const { component } = testBed;
     component.update();
+    ({ actions } = testBed);
 
-    ({ runTimers } = testBed);
-
-    await actions.saveAsNewPolicy(true);
-    runTimers();
+    await actions.toggleSaveAsNewPolicy();
+    actions.errors.waitForValidation();
     await actions.savePolicy();
-    actions.expectErrorMessages([
+    actions.errors.expectMessages([
       i18nTexts.editPolicy.errors.policyNameMustBeDifferentErrorMessage,
     ]);
   });
 
   test(`doesn't allow policy name with comma`, async () => {
-    const { actions } = testBed;
     await actions.setPolicyName('my,policy');
-    runTimers();
-    actions.expectErrorMessages([i18nTexts.editPolicy.errors.policyNameContainsInvalidChars]);
+    actions.errors.waitForValidation();
+    actions.errors.expectMessages([i18nTexts.editPolicy.errors.policyNameContainsInvalidChars]);
   });
 
   test(`doesn't allow policy name starting with underscore`, async () => {
-    const { actions } = testBed;
     await actions.setPolicyName('_mypolicy');
-    runTimers();
-    actions.expectErrorMessages([
+    actions.errors.waitForValidation();
+    actions.errors.expectMessages([
       i18nTexts.editPolicy.errors.policyNameStartsWithUnderscoreErrorMessage,
     ]);
   });
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 c0b30efe150c4..ac11e8a162e02 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
@@ -8,12 +8,13 @@
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
 
+import { PhaseWithTiming } from '../../../../common/types';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { setupEnvironment } from '../../helpers/setup_environment';
 
 describe('<EditPolicy /> timing validation', () => {
   let testBed: EditPolicyTestBed;
-  let runTimers: () => void;
+  let actions: EditPolicyTestBed['actions'];
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -26,27 +27,17 @@ describe('<EditPolicy /> timing validation', () => {
   });
 
   beforeEach(async () => {
+    httpRequestsMockHelpers.setDefaultResponses();
     httpRequestsMockHelpers.setLoadPolicies([]);
 
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: { data: ['node1'] },
-      nodesByAttributes: { 'attribute:true': ['node1'] },
-      isUsingDeprecatedDataRoleConfig: false,
-    });
-
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
-
-    httpRequestsMockHelpers.setListSnapshotRepos({ repositories: ['my-repo'] });
-
     await act(async () => {
       testBed = await setup();
     });
 
-    const { component, actions } = testBed;
+    const { component } = testBed;
     component.update();
+    ({ actions } = testBed);
     await actions.setPolicyName('mypolicy');
-
-    ({ runTimers } = testBed);
   });
 
   [
@@ -79,66 +70,68 @@ describe('<EditPolicy /> timing validation', () => {
     ['warm', 'cold', 'delete', 'frozen'].forEach((phase: string) => {
       const { name, value, error } = testConfig;
       test(`${phase}: ${name}`, async () => {
-        const { actions } = testBed;
-        await actions[phase as 'warm' | 'cold' | 'delete' | 'frozen'].enable(true);
+        await actions.togglePhase(phase as PhaseWithTiming);
         // 1. We first set as dummy value to have a starting min_age value
-        await actions[phase as 'warm' | 'cold' | 'delete' | 'frozen'].setMinAgeValue('111');
+        await actions[phase as PhaseWithTiming].setMinAgeValue('111');
         // 2. At this point we are sure there will be a change of value and that any validation
         // will be displayed under the field.
-        await actions[phase as 'warm' | 'cold' | 'delete' | 'frozen'].setMinAgeValue(value);
+        await actions[phase as PhaseWithTiming].setMinAgeValue(value);
 
-        runTimers();
+        actions.errors.waitForValidation();
 
-        actions.expectErrorMessages(error);
+        actions.errors.expectMessages(error);
       });
     });
   });
 
   test('should validate that min_age is equal or greater than previous phase min_age', async () => {
-    const { actions, form } = testBed;
-    await actions.warm.enable(true);
-    await actions.cold.enable(true);
-    await actions.frozen.enable(true);
-    await actions.delete.enable(true);
+    await actions.togglePhase('warm');
+    await actions.togglePhase('cold');
+    await actions.togglePhase('frozen');
+    await actions.togglePhase('delete');
 
     await actions.warm.setMinAgeValue('10');
 
     await actions.cold.setMinAgeValue('9');
-    runTimers();
-    expect(form.getErrorsMessages('cold-phase')).toEqual([
-      'Must be greater or equal than the warm phase value (10d)',
-    ]);
+    actions.errors.waitForValidation();
+    actions.errors.expectMessages(
+      ['Must be greater or equal than the warm phase value (10d)'],
+      'cold'
+    );
 
     await actions.frozen.setMinAgeValue('8');
-    runTimers();
-    expect(form.getErrorsMessages('frozen-phase')).toEqual([
-      'Must be greater or equal than the cold phase value (9d)',
-    ]);
+    actions.errors.waitForValidation();
+    actions.errors.expectMessages(
+      ['Must be greater or equal than the cold phase value (9d)'],
+      'frozen'
+    );
 
     await actions.delete.setMinAgeValue('7');
-    runTimers();
-    expect(form.getErrorsMessages('delete-phaseContent')).toEqual([
-      'Must be greater or equal than the frozen phase value (8d)',
-    ]);
+    actions.errors.waitForValidation();
+    actions.errors.expectMessages(
+      ['Must be greater or equal than the frozen phase value (8d)'],
+      'delete'
+    );
 
     // Disable the warm phase
-    await actions.warm.enable(false);
+    await actions.togglePhase('warm');
 
     // No more error for the cold phase
-    expect(form.getErrorsMessages('cold-phase')).toEqual([]);
+    actions.errors.expectMessages([], 'cold');
 
     // Change to smaller unit for cold phase
     await actions.cold.setMinAgeUnits('h');
 
     // No more error for the frozen phase...
-    expect(form.getErrorsMessages('frozen-phase')).toEqual([]);
+    actions.errors.expectMessages([], 'frozen');
     // ...but the delete phase has still the error
-    expect(form.getErrorsMessages('delete-phaseContent')).toEqual([
-      'Must be greater or equal than the frozen phase value (8d)',
-    ]);
+    actions.errors.expectMessages(
+      ['Must be greater or equal than the frozen phase value (8d)'],
+      'delete'
+    );
 
     await actions.delete.setMinAgeValue('9');
     // No more error for the delete phase
-    expect(form.getErrorsMessages('delete-phaseContent')).toEqual([]);
+    actions.errors.expectMessages([], 'delete');
   });
 });
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 bfb263e204de9..bef99ea8cb891 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
@@ -7,12 +7,11 @@
 
 import { act } from 'react-dom/test-utils';
 import { i18nTexts } from '../../../../public/application/sections/edit_policy/i18n_texts';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { setupEnvironment } from '../../helpers';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
 
 describe('<EditPolicy /> warm phase validation', () => {
   let testBed: EditPolicyTestBed;
-  let runTimers: () => void;
   const { server, httpRequestsMockHelpers } = setupEnvironment();
 
   beforeAll(() => {
@@ -25,15 +24,8 @@ describe('<EditPolicy /> warm phase validation', () => {
   });
 
   beforeEach(async () => {
+    httpRequestsMockHelpers.setDefaultResponses();
     httpRequestsMockHelpers.setLoadPolicies([]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: { data: ['node1'] },
-      nodesByAttributes: { 'attribute:true': ['node1'] },
-      isUsingDeprecatedDataRoleConfig: true,
-    });
-    httpRequestsMockHelpers.setNodesDetails('attribute:true', [
-      { nodeId: 'testNodeId', stats: { name: 'testNodeName', host: 'testHost' } },
-    ]);
 
     await act(async () => {
       testBed = await setup();
@@ -42,98 +34,88 @@ describe('<EditPolicy /> warm phase validation', () => {
     const { component, actions } = testBed;
     component.update();
     await actions.setPolicyName('mypolicy');
-    await actions.warm.enable(true);
-
-    ({ runTimers } = testBed);
+    await actions.togglePhase('warm');
   });
 
   describe('replicas', () => {
     test(`doesn't allow -1 for replicas`, async () => {
       const { actions } = testBed;
-
       await actions.warm.setReplicas('-1');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
     });
 
     test(`allows 0 for replicas`, async () => {
       const { actions } = testBed;
-
       await actions.warm.setReplicas('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([]);
+      actions.errors.expectMessages([]);
     });
   });
 
   describe('shrink', () => {
     test(`doesn't allow 0 for shrink`, async () => {
       const { actions } = testBed;
-
-      await actions.warm.toggleShrink(true);
+      await actions.warm.toggleShrink();
       await actions.warm.setShrink('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
     test(`doesn't allow -1 for shrink`, async () => {
       const { actions } = testBed;
-
-      await actions.warm.toggleShrink(true);
+      await actions.warm.toggleShrink();
       await actions.warm.setShrink('-1');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
   });
 
   describe('forcemerge', () => {
     test(`doesn't allow 0 for forcemerge`, async () => {
       const { actions } = testBed;
-
-      await actions.warm.toggleForceMerge(true);
+      await actions.warm.toggleForceMerge();
       await actions.warm.setForcemergeSegmentsCount('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
     test(`doesn't allow -1 for forcemerge`, async () => {
       const { actions } = testBed;
-
-      await actions.warm.toggleForceMerge(true);
+      await actions.warm.toggleForceMerge();
       await actions.warm.setForcemergeSegmentsCount('-1');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.numberGreatThan0Required]);
     });
   });
 
   describe('index priority', () => {
     test(`doesn't allow -1 for index priority`, async () => {
       const { actions } = testBed;
-
       await actions.warm.setIndexPriority('-1');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
+      actions.errors.expectMessages([i18nTexts.editPolicy.errors.nonNegativeNumberRequired]);
     });
 
     test(`allows 0 for index priority`, async () => {
       const { actions } = testBed;
-
       await actions.warm.setIndexPriority('0');
 
-      runTimers();
+      actions.errors.waitForValidation();
 
-      actions.expectErrorMessages([]);
+      actions.errors.expectMessages([]);
     });
   });
 });
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 15d89c988f729..8c345cf784f9f 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,14 +6,14 @@
  */
 
 import { act } from 'react-dom/test-utils';
-import { setupEnvironment } from '../../helpers/setup_environment';
+import { licensingMock } from '../../../../../licensing/public/mocks';
+import { setupEnvironment } from '../../helpers';
 import {
   getDefaultHotPhasePolicy,
   POLICY_WITH_INCLUDE_EXCLUDE,
   POLICY_WITH_KNOWN_AND_UNKNOWN_FIELDS,
 } from '../constants';
 import { EditPolicyTestBed, setup } from '../edit_policy.helpers';
-import { licensingMock } from '../../../../../licensing/public/mocks';
 
 describe('<EditPolicy /> serialization', () => {
   let testBed: EditPolicyTestBed;
@@ -24,13 +24,7 @@ describe('<EditPolicy /> serialization', () => {
   });
 
   beforeEach(async () => {
-    httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-    httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
-    httpRequestsMockHelpers.setListNodes({
-      nodesByRoles: {},
-      nodesByAttributes: { test: ['123'] },
-      isUsingDeprecatedDataRoleConfig: false,
-    });
+    httpRequestsMockHelpers.setDefaultResponses();
 
     await act(async () => {
       testBed = await setup();
@@ -57,9 +51,9 @@ describe('<EditPolicy /> serialization', () => {
       component.update();
 
       // Set max docs to test whether we keep the unknown fields in that object after serializing
-      await actions.hot.setMaxDocs('1000');
+      await actions.rollover.setMaxDocs('1000');
       // Remove the delete phase to ensure that we also correctly remove data
-      await actions.delete.enable(false);
+      await actions.togglePhase('delete');
       await actions.savePolicy();
 
       const latestRequest = server.requests[server.requests.length - 1];
@@ -170,17 +164,17 @@ describe('<EditPolicy /> serialization', () => {
     test('setting all values', async () => {
       const { actions } = testBed;
 
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.setMaxSize('123', 'mb');
-      await actions.hot.setMaxDocs('123');
-      await actions.hot.setMaxAge('123', 'h');
-      await actions.hot.toggleForceMerge(true);
+      await actions.rollover.toggleDefault();
+      await actions.rollover.setMaxSize('123', 'mb');
+      await actions.rollover.setMaxDocs('123');
+      await actions.rollover.setMaxAge('123', 'h');
+      await actions.hot.toggleForceMerge();
       await actions.hot.setForcemergeSegmentsCount('123');
       await actions.hot.setBestCompression(true);
-      await actions.hot.toggleShrink(true);
+      await actions.hot.toggleShrink();
       await actions.hot.setShrink('2');
-      await actions.hot.toggleReadonly(true);
-      await actions.hot.toggleIndexPriority(true);
+      await actions.hot.toggleReadonly();
+      await actions.hot.toggleIndexPriority();
       await actions.hot.setIndexPriority('123');
 
       await actions.savePolicy();
@@ -232,8 +226,8 @@ describe('<EditPolicy /> serialization', () => {
 
     test('disabling rollover', async () => {
       const { actions } = testBed;
-      await actions.hot.toggleDefaultRollover(false);
-      await actions.hot.toggleRollover(false);
+      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);
@@ -246,13 +240,7 @@ describe('<EditPolicy /> serialization', () => {
 
   describe('warm phase', () => {
     beforeEach(async () => {
-      httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-      httpRequestsMockHelpers.setListNodes({
-        nodesByRoles: {},
-        nodesByAttributes: { test: ['123'] },
-        isUsingDeprecatedDataRoleConfig: false,
-      });
-      httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+      httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
         testBed = await setup();
@@ -264,7 +252,7 @@ describe('<EditPolicy /> serialization', () => {
 
     test('default values', async () => {
       const { actions } = testBed;
-      await actions.warm.enable(true);
+      await actions.togglePhase('warm');
       await actions.warm.setMinAgeValue('11');
       await actions.savePolicy();
       const latestRequest = server.requests[server.requests.length - 1];
@@ -283,17 +271,17 @@ describe('<EditPolicy /> serialization', () => {
 
     test('setting all values', async () => {
       const { actions } = testBed;
-      await actions.warm.enable(true);
+      await actions.togglePhase('warm');
       await actions.warm.setMinAgeValue('11');
       await actions.warm.setDataAllocation('node_attrs');
       await actions.warm.setSelectedNodeAttribute('test:123');
       await actions.warm.setReplicas('123');
-      await actions.warm.toggleShrink(true);
+      await actions.warm.toggleShrink();
       await actions.warm.setShrink('123');
-      await actions.warm.toggleForceMerge(true);
+      await actions.warm.toggleForceMerge();
       await actions.warm.setForcemergeSegmentsCount('123');
       await actions.warm.setBestCompression(true);
-      await actions.warm.toggleReadonly(true);
+      await actions.warm.toggleReadonly();
       await actions.warm.setIndexPriority('123');
       await actions.savePolicy();
       const latestRequest = server.requests[server.requests.length - 1];
@@ -384,13 +372,7 @@ describe('<EditPolicy /> serialization', () => {
 
   describe('cold phase', () => {
     beforeEach(async () => {
-      httpRequestsMockHelpers.setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
-      httpRequestsMockHelpers.setListNodes({
-        nodesByRoles: {},
-        nodesByAttributes: { test: ['123'] },
-        isUsingDeprecatedDataRoleConfig: false,
-      });
-      httpRequestsMockHelpers.setLoadSnapshotPolicies([]);
+      httpRequestsMockHelpers.setDefaultResponses();
 
       await act(async () => {
         testBed = await setup();
@@ -403,7 +385,7 @@ describe('<EditPolicy /> serialization', () => {
     test('default values', async () => {
       const { actions } = testBed;
 
-      await actions.cold.enable(true);
+      await actions.togglePhase('cold');
       await actions.cold.setMinAgeValue('11');
       await actions.savePolicy();
       const latestRequest = server.requests[server.requests.length - 1];
@@ -423,14 +405,14 @@ describe('<EditPolicy /> serialization', () => {
     test('setting all values, excluding searchable snapshot', async () => {
       const { actions } = testBed;
 
-      await actions.cold.enable(true);
+      await actions.togglePhase('cold');
       await actions.cold.setMinAgeValue('123');
       await actions.cold.setMinAgeUnits('s');
       await actions.cold.setDataAllocation('node_attrs');
       await actions.cold.setSelectedNodeAttribute('test:123');
       await actions.cold.setReplicas('123');
-      await actions.cold.setFreeze(true);
-      await actions.cold.toggleReadonly(true);
+      await actions.cold.setFreeze();
+      await actions.cold.toggleReadonly();
       await actions.cold.setIndexPriority('123');
 
       await actions.savePolicy();
@@ -474,7 +456,7 @@ describe('<EditPolicy /> serialization', () => {
     // Setting searchable snapshot field disables setting replicas so we test this separately
     test('setting searchable snapshot', async () => {
       const { actions } = testBed;
-      await actions.cold.enable(true);
+      await actions.togglePhase('cold');
       await actions.cold.setMinAgeValue('10');
       await actions.cold.setSearchableSnapshot('my-repo');
       await actions.savePolicy();
@@ -489,7 +471,7 @@ describe('<EditPolicy /> serialization', () => {
   describe('frozen phase', () => {
     test('default value', async () => {
       const { actions } = testBed;
-      await actions.frozen.enable(true);
+      await actions.togglePhase('frozen');
       await actions.frozen.setMinAgeValue('13');
       await actions.frozen.setSearchableSnapshot('myRepo');
 
@@ -551,8 +533,8 @@ describe('<EditPolicy /> serialization', () => {
   describe('delete phase', () => {
     test('default value', async () => {
       const { actions } = testBed;
-      await actions.delete.enable(true);
-      await actions.setWaitForSnapshotPolicy('test');
+      await actions.togglePhase('delete');
+      await actions.delete.setWaitForSnapshotPolicy('test');
       await actions.savePolicy();
       const latestRequest = server.requests[server.requests.length - 1];
       const entirePolicy = JSON.parse(JSON.parse(latestRequest.requestBody).body);
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.ts
new file mode 100644
index 0000000000000..a92747a95a2ca
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/errors_actions.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 { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+
+const createWaitForValidationAction = (testBed: TestBed) => () => {
+  const { component } = testBed;
+  act(() => {
+    jest.runAllTimers();
+  });
+  component.update();
+};
+
+const createExpectMessagesAction = (testBed: TestBed) => (
+  expectedMessages: string[],
+  phase?: Phase
+) => {
+  const { form } = testBed;
+  if (phase) {
+    expect(form.getErrorsMessages(`${phase}-phase`)).toEqual(expectedMessages);
+  } else {
+    expect(form.getErrorsMessages()).toEqual(expectedMessages);
+  }
+};
+
+export const createErrorsActions = (testBed: TestBed) => {
+  const { exists } = testBed;
+  return {
+    waitForValidation: createWaitForValidationAction(testBed),
+    haveGlobalCallout: () => exists('policyFormErrorsCallout'),
+    havePhaseCallout: (phase: Phase) => exists(`phaseErrorIndicator-${phase}`),
+    expectMessages: createExpectMessagesAction(testBed),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.ts
new file mode 100644
index 0000000000000..a7e4983165bac
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/forcemerge_actions.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 { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAction } from './form_toggle_action';
+import { createFormSetValueAction } from './form_set_value_action';
+
+const createFormCheckboxAction = (testBed: TestBed, dataTestSubject: string) => async (
+  checked: boolean
+) => {
+  const { form, component } = testBed;
+  await act(async () => {
+    form.selectCheckBox(dataTestSubject, checked);
+  });
+  component.update();
+};
+
+export const createForceMergeActions = (testBed: TestBed, phase: Phase) => {
+  const { exists } = testBed;
+  const toggleSelector = `${phase}-forceMergeSwitch`;
+  return {
+    forceMergeFieldExists: () => exists(toggleSelector),
+    toggleForceMerge: createFormToggleAction(testBed, toggleSelector),
+    setForcemergeSegmentsCount: createFormSetValueAction(
+      testBed,
+      `${phase}-selectedForceMergeSegments`
+    ),
+    setBestCompression: createFormCheckboxAction(testBed, `${phase}-bestCompression`),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_form_set_value_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_set_value_action.ts
similarity index 100%
rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_form_set_value_action.ts
rename to x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_set_value_action.ts
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_action.ts
new file mode 100644
index 0000000000000..6bf47f5d513f6
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/form_toggle_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.
+ */
+
+import { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
+
+export const createFormToggleAction = (testBed: TestBed, dataTestSubject: string) => async () => {
+  const { form, component } = testBed;
+
+  await act(async () => {
+    form.toggleEuiSwitch(dataTestSubject);
+  });
+
+  component.update();
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/freeze_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/freeze_actions.ts
new file mode 100644
index 0000000000000..ad3d9d3bfbcb8
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/freeze_actions.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 { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAction } from './form_toggle_action';
+
+export const createFreezeActions = (testBed: TestBed, phase: Phase) => {
+  const { exists } = testBed;
+  return {
+    setFreeze: createFormToggleAction(testBed, `${phase}-freezeSwitch`),
+    freezeExists: (): boolean => exists(`${phase}-freezeSwitch`),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index.ts
new file mode 100644
index 0000000000000..7366bf2f35c70
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { createNodeAllocationActions } from './node_allocation_actions';
+export { createTogglePhaseAction } from './toggle_phase_action';
+export { setReplicas } from './set_replicas_action';
+export { createSavePolicyAction } from './save_policy_action';
+export { createFormToggleAction } from './form_toggle_action';
+export { createFormSetValueAction } from './form_set_value_action';
+export { createSearchableSnapshotActions } from './searchable_snapshot_actions';
+export { createErrorsActions } from './errors_actions';
+export { createRolloverActions } from './rollover_actions';
+export { createSetWaitForSnapshotAction } from './set_wait_for_snapshot_action';
+export { createMinAgeActions } from './min_age_actions';
+export { createForceMergeActions } from './forcemerge_actions';
+export { createReadonlyActions } from './readonly_actions';
+export { createIndexPriorityActions } from './index_priority_actions';
+export { createShrinkActions } from './shrink_actions';
+export { createFreezeActions } from './freeze_actions';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.ts
new file mode 100644
index 0000000000000..3b48da2a0c69f
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/index_priority_actions.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 { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAction } from './form_toggle_action';
+import { createFormSetValueAction } from './form_set_value_action';
+
+export const createIndexPriorityActions = (testBed: TestBed, phase: Phase) => {
+  const { exists } = testBed;
+  const toggleSelector = `${phase}-indexPrioritySwitch`;
+  return {
+    indexPriorityExists: () => exists(toggleSelector),
+    toggleIndexPriority: createFormToggleAction(testBed, toggleSelector),
+    setIndexPriority: createFormSetValueAction(testBed, `${phase}-indexPriority`),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/min_age_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/min_age_actions.ts
new file mode 100644
index 0000000000000..551474c8b16e6
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/min_age_actions.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormSetValueAction } from './form_set_value_action';
+
+export const createMinAgeActions = (testBed: TestBed, phase: Phase) => {
+  const { exists } = testBed;
+  return {
+    hasMinAgeInput: () => exists(`${phase}-selectedMinimumAge`),
+    setMinAgeValue: createFormSetValueAction(testBed, `${phase}-selectedMinimumAge`),
+    setMinAgeUnits: createFormSetValueAction(testBed, `${phase}-selectedMinimumAgeUnits`),
+    hasRolloverTipOnMinAge: () => exists(`${phase}-rolloverMinAgeInputIconTip`),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/node_allocation_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/node_allocation_actions.ts
new file mode 100644
index 0000000000000..7c0f8fea7299d
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/node_allocation_actions.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { TestBed } from '@kbn/test/jest';
+
+import { DataTierAllocationType } from '../../../../public/application/sections/edit_policy/types';
+import { Phase } from '../../../../common/types';
+import { createFormSetValueAction } from './form_set_value_action';
+
+export const createNodeAllocationActions = (testBed: TestBed, phase: Phase) => {
+  const { component, find, exists } = testBed;
+
+  const controlsSelector = `${phase}-dataTierAllocationControls`;
+  const dataTierSelector = `${controlsSelector}.dataTierSelect`;
+  const nodeAttrsSelector = `${phase}-selectedNodeAttrs`;
+
+  const openNodeAttributesSection = async () => {
+    await act(async () => {
+      find(dataTierSelector).simulate('click');
+    });
+    component.update();
+  };
+
+  const isAllocationLoading = () => find(`${phase}-phase.allocationLoadingSpinner`).exists();
+  const hasDefaultToDataNodesNotice = () => exists(`${phase}-phase.defaultToDataNodesNotice`);
+  const hasDefaultToDataTiersNotice = () => exists(`${phase}-phase.defaultToDataTiersNotice`);
+  const hasDefaultAllocationBehaviorNotice = () =>
+    hasDefaultToDataNodesNotice() && hasDefaultToDataTiersNotice();
+  const hasNoTiersAvailableNotice = () => exists(`${phase}-phase.noTiersAvailableNotice`);
+  const hasNoTiersAvailableUsingNodeAttributesNotice = () =>
+    exists(`${phase}-phase.noTiersAvailableUsingNodeAttributesNotice`);
+  const hasWillUseFallbackTierNotice = () => exists(`${phase}-phase.willUseFallbackTierNotice`);
+  const hasWillUseFallbackTierUsingNodeAttributesNotice = () =>
+    exists(`${phase}-phase.willUseFallbackTierUsingNodeAttributesNotice`);
+  const getWillUseFallbackTierNoticeText = () =>
+    find(`${phase}-phase.willUseFallbackTierNotice`).text();
+
+  return {
+    hasDataTierAllocationControls: () => exists(controlsSelector),
+    openNodeAttributesSection,
+    hasNodeAttributesSelect: (): boolean => exists(nodeAttrsSelector),
+    getNodeAttributesSelectOptions: () => find(nodeAttrsSelector).find('option'),
+    setDataAllocation: async (value: DataTierAllocationType) => {
+      await openNodeAttributesSection();
+
+      await act(async () => {
+        switch (value) {
+          case 'node_roles':
+            find(`${controlsSelector}.defaultDataAllocationOption`).simulate('click');
+            break;
+          case 'node_attrs':
+            find(`${controlsSelector}.customDataAllocationOption`).simulate('click');
+            break;
+          default:
+            find(`${controlsSelector}.noneDataAllocationOption`).simulate('click');
+        }
+      });
+      component.update();
+    },
+    setSelectedNodeAttribute: createFormSetValueAction(testBed, nodeAttrsSelector),
+    isAllocationLoading,
+    hasDefaultToDataNodesNotice,
+    hasDefaultToDataTiersNotice,
+    hasDefaultAllocationBehaviorNotice,
+    hasNoTiersAvailableNotice,
+    hasNoTiersAvailableUsingNodeAttributesNotice,
+    hasWillUseFallbackTierNotice,
+    hasWillUseFallbackTierUsingNodeAttributesNotice,
+    getWillUseFallbackTierNoticeText,
+    hasNodeDetailsFlyout: () => exists(`${phase}-viewNodeDetailsFlyoutButton`),
+    openNodeDetailsFlyout: async () => {
+      await act(async () => {
+        find(`${phase}-viewNodeDetailsFlyoutButton`).simulate('click');
+      });
+      component.update();
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/readonly_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/readonly_actions.ts
new file mode 100644
index 0000000000000..b76143eccf1f2
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/readonly_actions.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 { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAction } from './form_toggle_action';
+
+export const createReadonlyActions = (testBed: TestBed, phase: Phase) => {
+  const { exists } = testBed;
+  const toggleSelector = `${phase}-readonlySwitch`;
+  return {
+    readonlyExists: () => exists(toggleSelector),
+    toggleReadonly: createFormToggleAction(testBed, toggleSelector),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.ts
new file mode 100644
index 0000000000000..daf4db7fab278
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/rollover_actions.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 { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
+import { createFormToggleAction } from './form_toggle_action';
+import { createFormSetValueAction } from './form_set_value_action';
+
+const createSetPrimaryShardSizeAction = (testBed: TestBed) => async (
+  value: string,
+  units?: string
+) => {
+  const { find, component } = testBed;
+  await act(async () => {
+    find('hot-selectedMaxPrimaryShardSize').simulate('change', { target: { value } });
+    if (units) {
+      find('hot-selectedMaxPrimaryShardSize.select').simulate('change', {
+        target: { value: units },
+      });
+    }
+  });
+  component.update();
+};
+
+const createSetMaxAgeAction = (testBed: TestBed) => async (value: string, units?: string) => {
+  const { find, component } = testBed;
+  await act(async () => {
+    find('hot-selectedMaxAge').simulate('change', { target: { value } });
+    if (units) {
+      find('hot-selectedMaxAgeUnits.select').simulate('change', { target: { value: units } });
+    }
+  });
+  component.update();
+};
+
+const createSetMaxSizeAction = (testBed: TestBed) => async (value: string, units?: string) => {
+  const { find, component } = testBed;
+  await act(async () => {
+    find('hot-selectedMaxSizeStored').simulate('change', { target: { value } });
+    if (units) {
+      find('hot-selectedMaxSizeStoredUnits.select').simulate('change', {
+        target: { value: units },
+      });
+    }
+  });
+  component.update();
+};
+
+export const createRolloverActions = (testBed: TestBed) => {
+  const { exists } = testBed;
+  return {
+    toggle: createFormToggleAction(testBed, 'rolloverSwitch'),
+    toggleDefault: createFormToggleAction(testBed, 'useDefaultRolloverSwitch'),
+    setMaxPrimaryShardSize: createSetPrimaryShardSizeAction(testBed),
+    setMaxDocs: createFormSetValueAction(testBed, 'hot-selectedMaxDocuments'),
+    setMaxAge: createSetMaxAgeAction(testBed),
+    setMaxSize: createSetMaxSizeAction(testBed),
+    hasSettingRequiredCallout: (): boolean => exists('rolloverSettingsRequired'),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/save_policy_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/save_policy_action.ts
similarity index 86%
rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/save_policy_action.ts
rename to x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/save_policy_action.ts
index 37ce4f84f03ba..3fcd1205b6e1a 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/save_policy_action.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/save_policy_action.ts
@@ -8,7 +8,7 @@
 import { act } from 'react-dom/test-utils';
 import { TestBed } from '@kbn/test/jest';
 
-export const savePolicy = async (testBed: TestBed) => {
+export const createSavePolicyAction = (testBed: TestBed) => async () => {
   const { find, component } = testBed;
 
   await act(async () => {
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/searchable_snapshot_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/searchable_snapshot_actions.ts
new file mode 100644
index 0000000000000..f1a64c3943511
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/searchable_snapshot_actions.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 { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAction } from './form_toggle_action';
+
+export const createSearchableSnapshotActions = (testBed: TestBed, phase: Phase) => {
+  const { exists, find, component } = testBed;
+  const fieldSelector = `searchableSnapshotField-${phase}`;
+  const licenseCalloutSelector = `${fieldSelector}.searchableSnapshotDisabledDueToLicense`;
+  const toggleSelector = `${fieldSelector}.searchableSnapshotToggle`;
+
+  const toggleSearchableSnapshot = createFormToggleAction(testBed, toggleSelector);
+  return {
+    searchableSnapshotDisabledDueToLicense: () =>
+      exists(licenseCalloutSelector) && find(toggleSelector).props().disabled === true,
+    searchableSnapshotsExists: () => exists(fieldSelector),
+    toggleSearchableSnapshot,
+    setSearchableSnapshot: async (value: string) => {
+      if (!exists(`searchableSnapshotField-${phase}.searchableSnapshotCombobox`)) {
+        await toggleSearchableSnapshot();
+      }
+      act(() => {
+        find(`searchableSnapshotField-${phase}.searchableSnapshotCombobox`).simulate('change', [
+          { label: value },
+        ]);
+      });
+      component.update();
+    },
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/set_replicas_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_replicas_action.ts
similarity index 76%
rename from x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/set_replicas_action.ts
rename to x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_replicas_action.ts
index 049c1a205cbd4..b07d7783379fb 100644
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/set_replicas_action.ts
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_replicas_action.ts
@@ -7,15 +7,15 @@
 
 import { TestBed } from '@kbn/test/jest';
 
-import { Phase } from './types';
-import { createFormToggleAction } from './create_form_toggle_action';
-import { createFormSetValueAction } from './create_form_set_value_action';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAction } from './form_toggle_action';
+import { createFormSetValueAction } from './form_set_value_action';
 
 export const setReplicas = async (testBed: TestBed, phase: Phase, value: string) => {
   const { exists } = testBed;
 
   if (!exists(`${phase}-selectedReplicaCount`)) {
-    await createFormToggleAction(testBed, `${phase}-setReplicasSwitch`)(true);
+    await createFormToggleAction(testBed, `${phase}-setReplicasSwitch`)();
   }
   await createFormSetValueAction(testBed, `${phase}-selectedReplicaCount`)(value);
 };
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_wait_for_snapshot_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_wait_for_snapshot_action.ts
new file mode 100644
index 0000000000000..a0bc9da8d3063
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/set_wait_for_snapshot_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.
+ */
+
+import { act } from 'react-dom/test-utils';
+import { TestBed } from '@kbn/test/jest';
+
+export const createSetWaitForSnapshotAction = (testBed: TestBed) => async (
+  snapshotPolicyName: string
+) => {
+  const { find, component } = testBed;
+  act(() => {
+    find('snapshotPolicyCombobox').simulate('change', [{ label: snapshotPolicyName }]);
+  });
+  component.update();
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.ts
new file mode 100644
index 0000000000000..0531850384124
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/shrink_actions.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 { TestBed } from '@kbn/test/jest';
+import { Phase } from '../../../../common/types';
+import { createFormToggleAction } from './form_toggle_action';
+import { createFormSetValueAction } from './form_set_value_action';
+
+export const createShrinkActions = (testBed: TestBed, phase: Phase) => {
+  const { exists } = testBed;
+  const toggleSelector = `${phase}-shrinkSwitch`;
+  return {
+    shrinkExists: () => exists(toggleSelector),
+    toggleShrink: createFormToggleAction(testBed, toggleSelector),
+    setShrink: createFormSetValueAction(testBed, `${phase}-primaryShardCount`),
+  };
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/toggle_phase_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/toggle_phase_action.ts
new file mode 100644
index 0000000000000..a0bed0e1644e6
--- /dev/null
+++ b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/actions/toggle_phase_action.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 { TestBed } from '@kbn/test/jest';
+import { act } from 'react-dom/test-utils';
+
+import { Phase } from '../../../../common/types';
+
+const toggleDeletePhase = async (testBed: TestBed) => {
+  const { find, component } = testBed;
+
+  let button = find('disableDeletePhaseButton');
+  if (!button.length) {
+    button = find('enableDeletePhaseButton');
+  }
+  if (!button.length) {
+    throw new Error(`Button to enable/disable delete phase was not found.`);
+  }
+
+  await act(async () => {
+    button.simulate('click');
+  });
+  component.update();
+};
+
+const togglePhase = async (testBed: TestBed, phase: Phase) => {
+  const { form, component } = testBed;
+  await act(async () => {
+    form.toggleEuiSwitch(`enablePhaseSwitch-${phase}`);
+  });
+
+  component.update();
+};
+
+export const createTogglePhaseAction = (testBed: TestBed) => async (phase: Phase) => {
+  if (phase === 'delete') {
+    await toggleDeletePhase(testBed);
+  } else {
+    await togglePhase(testBed, phase);
+  }
+};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_enable_phase_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_enable_phase_action.ts
deleted file mode 100644
index e0988daf52192..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_enable_phase_action.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { TestBed } from '@kbn/test/jest';
-
-import { Phase } from './types';
-import { createFormToggleAction } from './create_form_toggle_action';
-
-export const createEnablePhaseAction = (testBed: TestBed, phase: Phase) => {
-  return createFormToggleAction(testBed, `enablePhaseSwitch-${phase}`);
-};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_form_toggle_action.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_form_toggle_action.ts
deleted file mode 100644
index 579bb661871da..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_form_toggle_action.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.
- */
-
-import { act } from 'react-dom/test-utils';
-import { TestBed } from '@kbn/test/jest';
-
-export const createFormToggleAction = (testBed: TestBed, dataTestSubject: string) => async (
-  checked: boolean
-) => {
-  const { form, component } = testBed;
-
-  await act(async () => {
-    form.toggleEuiSwitch(dataTestSubject, checked);
-  });
-
-  component.update();
-};
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_node_allocation_actions.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_node_allocation_actions.ts
deleted file mode 100644
index 416a2afa54d54..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/create_node_allocation_actions.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 { act } from 'react-dom/test-utils';
-import { TestBed } from '@kbn/test/jest';
-
-import { Phase } from './types';
-import { DataTierAllocationType } from '../../../public/application/sections/edit_policy/types';
-import { createFormSetValueAction } from './create_form_set_value_action';
-
-export const createNodeAllocationActions = (testBed: TestBed, phase: Phase) => {
-  const { component, find, exists } = testBed;
-
-  const controlsSelector = `${phase}-dataTierAllocationControls`;
-  const dataTierSelector = `${controlsSelector}.dataTierSelect`;
-  const nodeAttrsSelector = `${phase}-selectedNodeAttrs`;
-
-  const openNodeAttributesSection = async () => {
-    await act(async () => {
-      find(dataTierSelector).simulate('click');
-    });
-    component.update();
-  };
-
-  const isAllocationLoading = () => find(`${phase}-phase.allocationLoadingSpinner`).exists();
-  const hasDefaultToDataNodesNotice = () => exists(`${phase}-phase.defaultToDataNodesNotice`);
-  const hasDefaultToDataTiersNotice = () => exists(`${phase}-phase.defaultToDataTiersNotice`);
-  const hasDefaultAllocationBehaviorNotice = () =>
-    hasDefaultToDataNodesNotice() && hasDefaultToDataTiersNotice();
-  const hasNoTiersAvailableNotice = () => exists(`${phase}-phase.noTiersAvailableNotice`);
-  const hasNoTiersAvailableUsingNodeAttributesNotice = () =>
-    exists(`${phase}-phase.noTiersAvailableUsingNodeAttributesNotice`);
-  const hasWillUseFallbackTierNotice = () => exists(`${phase}-phase.willUseFallbackTierNotice`);
-  const hasWillUseFallbackTierUsingNodeAttributesNotice = () =>
-    exists(`${phase}-phase.willUseFallbackTierUsingNodeAttributesNotice`);
-  const getWillUseFallbackTierNoticeText = () =>
-    find(`${phase}-phase.willUseFallbackTierNotice`).text();
-
-  return {
-    hasDataTierAllocationControls: () => exists(controlsSelector),
-    openNodeAttributesSection,
-    hasNodeAttributesSelect: (): boolean => exists(nodeAttrsSelector),
-    getNodeAttributesSelectOptions: () => find(nodeAttrsSelector).find('option'),
-    setDataAllocation: async (value: DataTierAllocationType) => {
-      await openNodeAttributesSection();
-
-      await act(async () => {
-        switch (value) {
-          case 'node_roles':
-            find(`${controlsSelector}.defaultDataAllocationOption`).simulate('click');
-            break;
-          case 'node_attrs':
-            find(`${controlsSelector}.customDataAllocationOption`).simulate('click');
-            break;
-          default:
-            find(`${controlsSelector}.noneDataAllocationOption`).simulate('click');
-        }
-      });
-      component.update();
-    },
-    setSelectedNodeAttribute: createFormSetValueAction(testBed, nodeAttrsSelector),
-    isAllocationLoading,
-    hasDefaultToDataNodesNotice,
-    hasDefaultToDataTiersNotice,
-    hasDefaultAllocationBehaviorNotice,
-    hasNoTiersAvailableNotice,
-    hasNoTiersAvailableUsingNodeAttributesNotice,
-    hasWillUseFallbackTierNotice,
-    hasWillUseFallbackTierUsingNodeAttributesNotice,
-    getWillUseFallbackTierNoticeText,
-    hasNodeDetailsFlyout: () => exists(`${phase}-viewNodeDetailsFlyoutButton`),
-    openNodeDetailsFlyout: async () => {
-      await act(async () => {
-        find(`${phase}-viewNodeDetailsFlyoutButton`).simulate('click');
-      });
-      component.update();
-    },
-  };
-};
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 6ef2b4c231ce1..ccb57cb1067e2 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
@@ -12,6 +12,7 @@ import {
   ListSnapshotReposResponse,
   NodesDetailsResponse,
 } from '../../../common/types';
+import { getDefaultHotPhasePolicy } from '../edit_policy/constants';
 
 export const init = () => {
   const server = fakeServer.create();
@@ -68,11 +69,23 @@ const registerHttpRequestMockHelpers = (server: SinonFakeServer) => {
     ]);
   };
 
+  const setDefaultResponses = () => {
+    setLoadPolicies([getDefaultHotPhasePolicy('my_policy')]);
+    setLoadSnapshotPolicies([]);
+    setListSnapshotRepos({ repositories: ['abc'] });
+    setListNodes({
+      nodesByRoles: {},
+      nodesByAttributes: { test: ['123'] },
+      isUsingDeprecatedDataRoleConfig: false,
+    });
+  };
+
   return {
     setLoadPolicies,
     setLoadSnapshotPolicies,
     setListNodes,
     setNodesDetails,
     setListSnapshotRepos,
+    setDefaultResponses,
   };
 };
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 1388cf97d4e22..f9cd1f27b72be 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
@@ -5,11 +5,6 @@
  * 2.0.
  */
 
-export { Phase } from './types';
+export * from './actions';
 
-export { createNodeAllocationActions } from './create_node_allocation_actions';
-export { createEnablePhaseAction } from './create_enable_phase_action';
-export { setReplicas } from './set_replicas_action';
-export { savePolicy } from './save_policy_action';
-export { createFormToggleAction } from './create_form_toggle_action';
-export { createFormSetValueAction } from './create_form_set_value_action';
+export { setupEnvironment } from './setup_environment';
diff --git a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/types.ts b/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/types.ts
deleted file mode 100644
index 644ada96a9f05..0000000000000
--- a/x-pack/plugins/index_lifecycle_management/__jest__/client_integration/helpers/types.ts
+++ /dev/null
@@ -1,10 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { Phases } from '../../../common/types';
-
-export type Phase = keyof Phases;
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 385751f31d5bc..b08f87e5a172b 100644
--- a/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
+++ b/x-pack/plugins/index_lifecycle_management/common/types/policies.ts
@@ -7,8 +7,14 @@
 
 import { Index as IndexInterface } from '../../../index_management/common/types';
 
+export type Phase = keyof Phases;
+
 export type PhaseWithAllocation = 'warm' | 'cold';
 
+export type PhaseWithTiming = keyof Omit<Phases, 'hot'>;
+
+export type PhaseExceptDelete = keyof Omit<Phases, 'delete'>;
+
 export interface SerializedPolicy {
   name: string;
   phases: Phases;
@@ -22,8 +28,6 @@ export interface Phases {
   delete?: SerializedDeletePhase;
 }
 
-export type PhasesExceptDelete = keyof Omit<Phases, 'delete'>;
-
 export interface PolicyFromES {
   modified_date: string;
   name: string;
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phase_footer/phase_footer.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phase_footer/phase_footer.tsx
index 22422ceab8a04..0428c2939050d 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phase_footer/phase_footer.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phase_footer/phase_footer.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 
 import { EuiText, EuiButtonGroup, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 
-import { PhasesExceptDelete } from '../../../../../../common/types';
+import { PhaseExceptDelete } from '../../../../../../common/types';
 
 import { usePhaseTimings } from '../../form';
 
@@ -32,7 +32,7 @@ const keepDataLabel = i18n.translate(
 );
 
 interface Props {
-  phase: PhasesExceptDelete;
+  phase: PhaseExceptDelete;
 }
 
 export const PhaseFooter: FunctionComponent<Props> = ({ phase }) => {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
index 7b613757fa474..4b4962cc7c3a4 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/delete_phase/delete_phase.tsx
@@ -73,7 +73,7 @@ export const DeletePhase: FunctionComponent = () => {
     <>
       <EuiSpacer />
       <EuiComment
-        data-test-subj="delete-phaseContent"
+        data-test-subj="delete-phase"
         username={phaseTitle}
         actions={<MinAgeField phase={'delete'} />}
         className="ilmDeletePhase ilmPhase"
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase.tsx
index 040baf3625eb8..f5ab67c0b3ee7 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/phase/phase.tsx
@@ -20,7 +20,7 @@ import {
 import { get } from 'lodash';
 import { FormattedMessage } from '@kbn/i18n/react';
 
-import { PhasesExceptDelete } from '../../../../../../../common/types';
+import { PhaseExceptDelete } from '../../../../../../../common/types';
 import { ToggleField, useFormData } from '../../../../../../shared_imports';
 import { i18nTexts } from '../../../i18n_texts';
 import { FormInternal } from '../../../types';
@@ -33,7 +33,7 @@ import { PhaseErrorIndicator } from './phase_error_indicator';
 import './phase.scss';
 
 interface Props {
-  phase: PhasesExceptDelete;
+  phase: PhaseExceptDelete;
   /**
    * Settings that should always be visible on the phase when it is enabled.
    */
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
index 47d2aa6ba92df..0f5288df36119 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/index_priority_field.tsx
@@ -10,15 +10,16 @@ import React, { FunctionComponent, useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiSpacer, EuiTextColor } from '@elastic/eui';
 
-import { NumericField } from '../../../../../../shared_imports';
+import { PhaseExceptDelete } from '../../../../../../../common/types';
 
+import { NumericField } from '../../../../../../shared_imports';
 import { useEditPolicyContext } from '../../../edit_policy_context';
-import { UseField } from '../../../form';
 
+import { UseField } from '../../../form';
 import { LearnMoreLink, DescribedFormRow } from '../..';
 
 interface Props {
-  phase: 'hot' | 'warm' | 'cold' | 'frozen';
+  phase: PhaseExceptDelete;
 }
 
 export const IndexPriorityField: FunctionComponent<Props> = ({ phase }) => {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
index 136a37140cca7..ad92ef2d44479 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/min_age_field.tsx
@@ -21,13 +21,12 @@ import {
   EuiIconTip,
 } from '@elastic/eui';
 
+import { PhaseWithTiming } from '../../../../../../../../common/types';
 import { getFieldValidityAndErrorMessage, useFormData } from '../../../../../../../shared_imports';
 import { UseField, useConfiguration, useGlobalFields } from '../../../../form';
 import { getPhaseMinAgeInMilliseconds } from '../../../../lib';
 import { getUnitsAriaLabelForPhase, getTimingLabelForPhase } from './util';
 
-type PhaseWithMinAgeAction = 'warm' | 'cold' | 'delete';
-
 const i18nTexts = {
   daysOptionLabel: i18n.translate('xpack.indexLifecycleMgmt.editPolicy.daysOptionLabel', {
     defaultMessage: 'days',
@@ -77,7 +76,7 @@ const i18nTexts = {
 };
 
 interface Props {
-  phase: PhaseWithMinAgeAction;
+  phase: PhaseWithTiming;
 }
 
 export const MinAgeField: FunctionComponent<Props> = ({ phase }): React.ReactElement => {
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/util.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/util.ts
index a626a0a62f551..5f1b98c6dbda2 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/util.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/phases/shared_fields/min_age_field/util.ts
@@ -6,12 +6,9 @@
  */
 
 import { i18n } from '@kbn/i18n';
-import { Phases } from '../../../../../../../../common/types';
+import { PhaseWithTiming } from '../../../../../../../../common/types';
 
-type PhaseWithMinAgeAction = 'warm' | 'cold' | 'delete';
-
-export function getUnitsAriaLabelForPhase(phase: keyof Phases) {
-  // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
+export function getUnitsAriaLabelForPhase(phase: PhaseWithTiming) {
   switch (phase) {
     case 'warm':
       return i18n.translate(
@@ -29,6 +26,14 @@ export function getUnitsAriaLabelForPhase(phase: keyof Phases) {
         }
       );
 
+    case 'frozen':
+      return i18n.translate(
+        'xpack.indexLifecycleMgmt.editPolicy.phaseFrozen.minimumAgeUnitsAriaLabel',
+        {
+          defaultMessage: 'Units for timing of frozen phase',
+        }
+      );
+
     case 'delete':
       return i18n.translate(
         'xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeUnitsAriaLabel',
@@ -38,8 +43,7 @@ export function getUnitsAriaLabelForPhase(phase: keyof Phases) {
       );
   }
 }
-export function getTimingLabelForPhase(phase: PhaseWithMinAgeAction) {
-  // NOTE: Hot phase isn't necessary, because indices begin in the hot phase.
+export function getTimingLabelForPhase(phase: PhaseWithTiming) {
   switch (phase) {
     case 'warm':
       return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseWarm.minimumAgeLabel', {
@@ -51,6 +55,11 @@ export function getTimingLabelForPhase(phase: PhaseWithMinAgeAction) {
         defaultMessage: 'Timing for cold phase',
       });
 
+    case 'frozen':
+      return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseFrozen.minimumAgeLabel', {
+        defaultMessage: 'Timing for frozen phase',
+      });
+
     case 'delete':
       return i18n.translate('xpack.indexLifecycleMgmt.editPolicy.phaseDelete.minimumAgeLabel', {
         defaultMessage: 'Timing for delete phase',
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx
index 8a0028dcb8b19..de5c258ab82fa 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/components/timeline/timeline.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import React, { FunctionComponent, memo } from 'react';
 import { EuiFlexGroup, EuiFlexItem, EuiTitle, EuiText, EuiIconTip } from '@elastic/eui';
 
-import { PhasesExceptDelete } from '../../../../../../common/types';
+import { PhaseExceptDelete } from '../../../../../../common/types';
 
 import {
   calculateRelativeFromAbsoluteMilliseconds,
@@ -136,7 +136,7 @@ export const Timeline: FunctionComponent<Props> = memo(
 
     const widths = calculateWidths(phaseAgeInMilliseconds);
 
-    const getDurationInPhaseContent = (phase: PhasesExceptDelete): string | React.ReactNode =>
+    const getDurationInPhaseContent = (phase: PhaseExceptDelete): string | React.ReactNode =>
       phaseAgeInMilliseconds.phases[phase] === Infinity ? (
         <InfinityIcon color="subdued" aria-label={i18nTexts.foreverIcon.ariaLabel} />
       ) : null;
@@ -178,7 +178,7 @@ export const Timeline: FunctionComponent<Props> = memo(
                 <div className="ilmTimeline__phasesContainer">
                   {/* These are the actual color bars for the timeline */}
                   <div
-                    data-test-subj="ilmTimelineHotPhase"
+                    data-test-subj="ilmTimelinePhase-hot"
                     className="ilmTimeline__phasesContainer__phase ilmTimeline__hotPhase"
                   >
                     <div className="ilmTimeline__colorBar ilmTimeline__hotPhase__colorBar" />
@@ -189,7 +189,7 @@ export const Timeline: FunctionComponent<Props> = memo(
                   </div>
                   {exists(phaseAgeInMilliseconds.phases.warm) && (
                     <div
-                      data-test-subj="ilmTimelineWarmPhase"
+                      data-test-subj="ilmTimelinePhase-warm"
                       className="ilmTimeline__phasesContainer__phase ilmTimeline__warmPhase"
                     >
                       <div className="ilmTimeline__colorBar ilmTimeline__warmPhase__colorBar" />
@@ -201,7 +201,7 @@ export const Timeline: FunctionComponent<Props> = memo(
                   )}
                   {exists(phaseAgeInMilliseconds.phases.cold) && (
                     <div
-                      data-test-subj="ilmTimelineColdPhase"
+                      data-test-subj="ilmTimelinePhase-cold"
                       className="ilmTimeline__phasesContainer__phase ilmTimeline__coldPhase"
                     >
                       <div className="ilmTimeline__colorBar ilmTimeline__coldPhase__colorBar" />
@@ -213,7 +213,7 @@ export const Timeline: FunctionComponent<Props> = memo(
                   )}
                   {exists(phaseAgeInMilliseconds.phases.frozen) && (
                     <div
-                      data-test-subj="ilmTimelineFrozenPhase"
+                      data-test-subj="ilmTimelinePhase-frozen"
                       className="ilmTimeline__phasesContainer__phase ilmTimeline__frozenPhase"
                     >
                       <div className="ilmTimeline__colorBar ilmTimeline__frozenPhase__colorBar" />
@@ -228,7 +228,7 @@ export const Timeline: FunctionComponent<Props> = memo(
               {hasDeletePhase && (
                 <EuiFlexItem grow={false}>
                   <div
-                    data-test-subj="ilmTimelineDeletePhase"
+                    data-test-subj="ilmTimelinePhase-delete"
                     className="ilmTimeline__deleteIconContainer"
                   >
                     <EuiIconTip type="trash" content={i18nTexts.deleteIcon.toolTipContent} />
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
index f24d350432d80..c26f54cbb6f5a 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/schema.ts
@@ -7,10 +7,10 @@
 
 import { i18n } from '@kbn/i18n';
 
+import { PhaseExceptDelete, PhaseWithTiming } from '../../../../../common/types';
 import { FormSchema, fieldValidators } from '../../../../shared_imports';
 import { defaultIndexPriority } from '../../../constants';
 import { ROLLOVER_FORM_PATHS, CLOUD_DEFAULT_REPO } from '../constants';
-import { MinAgePhase } from '../types';
 import { i18nTexts } from '../i18n_texts';
 import {
   ifExistsNumberGreaterThanZero,
@@ -107,8 +107,8 @@ const numberOfShardsField = {
   serializer: serializers.stringToNumber,
 };
 
-const getPriorityField = (phase: 'hot' | 'warm' | 'cold' | 'frozen') => ({
-  defaultValue: defaultIndexPriority[phase] as any,
+const getPriorityField = (phase: PhaseExceptDelete) => ({
+  defaultValue: defaultIndexPriority[phase],
   label: i18nTexts.editPolicy.indexPriorityFieldLabel,
   validations: [
     {
@@ -119,7 +119,7 @@ const getPriorityField = (phase: 'hot' | 'warm' | 'cold' | 'frozen') => ({
   serializer: serializers.stringToNumber,
 });
 
-const getMinAgeField = (phase: MinAgePhase, defaultValue?: string) => ({
+const getMinAgeField = (phase: PhaseWithTiming, defaultValue?: string) => ({
   defaultValue,
   // By passing an empty array we make sure to *not* trigger the validation when the field value changes.
   // The validation will be triggered when the millisecond variant (in the _meta) is updated (in sync)
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/validations.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/validations.ts
index b39b3f3cd4226..892e40f80f4b8 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/validations.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/form/validations.ts
@@ -16,8 +16,8 @@ import {
 import { ROLLOVER_FORM_PATHS } from '../constants';
 
 import { i18nTexts } from '../i18n_texts';
-import { PolicyFromES } from '../../../../../common/types';
-import { FormInternal, MinAgePhase } from '../types';
+import { PhaseWithTiming, PolicyFromES } from '../../../../../common/types';
+import { FormInternal } from '../types';
 
 const { numberGreaterThanField, containsCharsField, emptyField, startsWithField } = fieldValidators;
 
@@ -164,7 +164,7 @@ export const createPolicyNameValidations = ({
  * For example, the user can't define '5 days' for cold phase if the
  * warm phase is set to '10 days'.
  */
-export const minAgeGreaterThanPreviousPhase = (phase: MinAgePhase) => ({
+export const minAgeGreaterThanPreviousPhase = (phase: PhaseWithTiming) => ({
   formData,
 }: {
   formData: Record<string, number>;
@@ -173,7 +173,7 @@ export const minAgeGreaterThanPreviousPhase = (phase: MinAgePhase) => ({
     return;
   }
 
-  const getValueFor = (_phase: MinAgePhase) => {
+  const getValueFor = (_phase: PhaseWithTiming) => {
     const milli = formData[`_meta.${_phase}.minAgeToMilliSeconds`];
 
     const esFormat =
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
index 9d55f542db4c4..71e2741c27cdc 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/lib/absolute_timing_to_relative_timing.ts
@@ -22,17 +22,16 @@
 
 import moment from 'moment';
 
-import { splitSizeAndUnits } from '../../../lib/policies';
+import { Phase, PhaseWithTiming } from '../../../../../common/types';
 
-import { FormInternal, MinAgePhase } from '../types';
+import { splitSizeAndUnits } from '../../../lib/policies';
+import { FormInternal } from '../types';
 
 /* -===- Private functions and types -===- */
 
-type Phase = 'hot' | MinAgePhase;
-
 const phaseOrder: Phase[] = ['hot', 'warm', 'cold', 'frozen', 'delete'];
 
-const getMinAge = (phase: MinAgePhase, formData: FormInternal) => ({
+const getMinAge = (phase: PhaseWithTiming, formData: FormInternal) => ({
   min_age: formData.phases?.[phase]?.min_age
     ? formData.phases[phase]!.min_age! + formData._meta[phase].minAgeUnit
     : '0ms',
diff --git a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts
index 987cbbcfde45b..ba7d31cf6da49 100644
--- a/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts
+++ b/x-pack/plugins/index_lifecycle_management/public/application/sections/edit_policy/types.ts
@@ -18,8 +18,6 @@ export interface MinAgeField {
   minAgeToMilliSeconds: number;
 }
 
-export type MinAgePhase = 'warm' | 'cold' | 'frozen' | 'delete';
-
 export interface ForcemergeFields {
   bestCompression: boolean;
 }
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 77f14decc5642..a18459d5d21b9 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
@@ -24,7 +24,6 @@ async function addLifecyclePolicy(
     },
   };
 
-  // @ts-expect-error @elastic/elasticsearch UpdateIndexSettingsRequest does not support index property
   return client.indices.putSettings({ index: indexName, body });
 }
 
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 4d467a807109a..823b36e63a873 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
@@ -80,6 +80,7 @@ async function updateIndexTemplate(
   if (isLegacy) {
     return client.indices.putTemplate({ name: templateName, body: indexTemplate });
   }
+  // @ts-expect-error Type 'IndexSettings' is not assignable to type 'IndicesIndexSettings'.
   return client.indices.putIndexTemplate({ name: templateName, body: indexTemplate });
 }
 
diff --git a/x-pack/plugins/index_management/public/application/sections/home/home.tsx b/x-pack/plugins/index_management/public/application/sections/home/home.tsx
index 12ccf089b85fb..003aa045f9591 100644
--- a/x-pack/plugins/index_management/public/application/sections/home/home.tsx
+++ b/x-pack/plugins/index_management/public/application/sections/home/home.tsx
@@ -8,17 +8,7 @@
 import React, { useEffect } from 'react';
 import { Route, RouteComponentProps, Switch } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  EuiButtonEmpty,
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPageBody,
-  EuiPageContent,
-  EuiSpacer,
-  EuiTab,
-  EuiTabs,
-  EuiTitle,
-} from '@elastic/eui';
+import { EuiButtonEmpty, EuiPageHeader, EuiSpacer } from '@elastic/eui';
 import { documentationService } from '../../services/documentation';
 import { DataStreamList } from './data_stream_list';
 import { IndexList } from './index_list';
@@ -93,73 +83,59 @@ export const IndexManagementHome: React.FunctionComponent<RouteComponentProps<Ma
   }, []);
 
   return (
-    <EuiPageBody>
-      <EuiPageContent>
-        <EuiTitle size="l">
-          <EuiFlexGroup alignItems="center">
-            <EuiFlexItem grow={true}>
-              <h1 data-test-subj="appTitle">
-                <FormattedMessage
-                  id="xpack.idxMgmt.home.appTitle"
-                  defaultMessage="Index Management"
-                />
-              </h1>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                href={documentationService.getIdxMgmtDocumentationLink()}
-                target="_blank"
-                iconType="help"
-                data-test-subj="documentationLink"
-              >
-                <FormattedMessage
-                  id="xpack.idxMgmt.home.idxMgmtDocsLinkText"
-                  defaultMessage="Index Management docs"
-                />
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiTitle>
+    <>
+      <EuiPageHeader
+        pageTitle={
+          <span data-test-subj="appTitle">
+            <FormattedMessage id="xpack.idxMgmt.home.appTitle" defaultMessage="Index Management" />
+          </span>
+        }
+        bottomBorder
+        rightSideItems={[
+          <EuiButtonEmpty
+            href={documentationService.getIdxMgmtDocumentationLink()}
+            target="_blank"
+            iconType="help"
+            data-test-subj="documentationLink"
+          >
+            <FormattedMessage
+              id="xpack.idxMgmt.home.idxMgmtDocsLinkText"
+              defaultMessage="Index Management docs"
+            />
+          </EuiButtonEmpty>,
+        ]}
+        tabs={tabs.map((tab) => ({
+          onClick: () => onSectionChange(tab.id),
+          isSelected: tab.id === section,
+          key: tab.id,
+          'data-test-subj': `${tab.id}Tab`,
+          label: tab.name,
+        }))}
+      />
 
-        <EuiSpacer size="m" />
+      <EuiSpacer size="l" />
 
-        <EuiTabs>
-          {tabs.map((tab) => (
-            <EuiTab
-              onClick={() => onSectionChange(tab.id)}
-              isSelected={tab.id === section}
-              key={tab.id}
-              data-test-subj={`${tab.id}Tab`}
-            >
-              {tab.name}
-            </EuiTab>
-          ))}
-        </EuiTabs>
-
-        <EuiSpacer size="m" />
-
-        <Switch>
-          <Route
-            exact
-            path={[`/${Section.DataStreams}`, `/${Section.DataStreams}/:dataStreamName?`]}
-            component={DataStreamList}
-          />
-          <Route exact path={`/${Section.Indices}`} component={IndexList} />
-          <Route
-            exact
-            path={[`/${Section.IndexTemplates}`, `/${Section.IndexTemplates}/:templateName?`]}
-            component={TemplateList}
-          />
-          <Route
-            exact
-            path={[
-              `/${Section.ComponentTemplates}`,
-              `/${Section.ComponentTemplates}/:componentTemplateName?`,
-            ]}
-            component={ComponentTemplateList}
-          />
-        </Switch>
-      </EuiPageContent>
-    </EuiPageBody>
+      <Switch>
+        <Route
+          exact
+          path={[`/${Section.DataStreams}`, `/${Section.DataStreams}/:dataStreamName?`]}
+          component={DataStreamList}
+        />
+        <Route exact path={`/${Section.Indices}`} component={IndexList} />
+        <Route
+          exact
+          path={[`/${Section.IndexTemplates}`, `/${Section.IndexTemplates}/:templateName?`]}
+          component={TemplateList}
+        />
+        <Route
+          exact
+          path={[
+            `/${Section.ComponentTemplates}`,
+            `/${Section.ComponentTemplates}/:componentTemplateName?`,
+          ]}
+          component={ComponentTemplateList}
+        />
+      </Switch>
+    </>
   );
 };
diff --git a/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts b/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
index 77c7947ce22c3..ee831d9a98eb9 100644
--- a/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
+++ b/x-pack/plugins/infra/common/log_sources/resolved_log_source_configuration.ts
@@ -22,7 +22,7 @@ export interface ResolvedLogSourceConfiguration {
   tiebreakerField: string;
   messageField: string[];
   fields: IndexPattern['fields'];
-  runtimeMappings: estypes.RuntimeFields;
+  runtimeMappings: estypes.MappingRuntimeFields;
   columns: LogSourceColumnConfiguration[];
 }
 
@@ -103,12 +103,12 @@ const resolveKibanaIndexPatternReference = async (
 };
 
 // this might take other sources of runtime fields into account in the future
-const resolveRuntimeMappings = (indexPattern: IndexPattern): estypes.RuntimeFields => {
+const resolveRuntimeMappings = (indexPattern: IndexPattern): estypes.MappingRuntimeFields => {
   const { runtimeFields } = indexPattern.getComputedFields();
 
   const runtimeMappingsFromIndexPattern = (Object.entries(runtimeFields) as ObjectEntries<
     typeof runtimeFields
-  >).reduce<estypes.RuntimeFields>(
+  >).reduce<estypes.MappingRuntimeFields>(
     (accumulatedMappings, [runtimeFieldName, runtimeFieldSpec]) => ({
       ...accumulatedMappings,
       [runtimeFieldName]: {
diff --git a/x-pack/plugins/infra/common/typed_json.ts b/x-pack/plugins/infra/common/typed_json.ts
index b14de38c47eac..5b7bbdcfbc07b 100644
--- a/x-pack/plugins/infra/common/typed_json.ts
+++ b/x-pack/plugins/infra/common/typed_json.ts
@@ -11,6 +11,7 @@ import { JsonArray, JsonObject, JsonValue } from '../../../../src/plugins/kibana
 export { JsonArray, JsonObject, JsonValue };
 
 export const jsonScalarRT = rt.union([rt.null, rt.boolean, rt.number, rt.string]);
+export type JsonScalar = rt.TypeOf<typeof jsonScalarRT>;
 
 export const jsonValueRT: rt.Type<JsonValue> = rt.recursion('JsonValue', () =>
   rt.union([jsonScalarRT, jsonArrayRT, jsonObjectRT])
diff --git a/x-pack/plugins/infra/public/components/auto_sizer.tsx b/x-pack/plugins/infra/public/components/auto_sizer.tsx
index f8d79ea70e12c..81cce22dad6fd 100644
--- a/x-pack/plugins/infra/public/components/auto_sizer.tsx
+++ b/x-pack/plugins/infra/public/components/auto_sizer.tsx
@@ -56,7 +56,7 @@ export class AutoSizer extends React.PureComponent<AutoSizerProps, AutoSizerStat
     if (this.props.detectAnyWindowResize) {
       window.addEventListener('resize', this.updateMeasurement);
     }
-    this.resizeObserver = new ResizeObserver((entries) => {
+    this.resizeObserver = new ResizeObserver((entries: ResizeObserverEntry[]) => {
       entries.forEach((entry) => {
         if (entry.target === this.element) {
           this.measure(entry);
diff --git a/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx b/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
index 7f1636b00d24e..87419a9bfbe78 100644
--- a/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
+++ b/x-pack/plugins/infra/public/components/log_stream/log_stream.stories.mdx
@@ -3,10 +3,11 @@ import { defer, of, Subject } from 'rxjs';
 import { delay } from 'rxjs/operators';
 
 import { I18nProvider } from '@kbn/i18n/react';
+import { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/public';
 import { EuiThemeProvider } from '../../../../../../src/plugins/kibana_react/common';
 import { KibanaContextProvider } from '../../../../../../src/plugins/kibana_react/public';
-
 import { LOG_ENTRIES_SEARCH_STRATEGY } from '../../../common/search_strategies/log_entries/log_entries';
+import { createIndexPatternMock, createIndexPatternsMock } from '../../hooks/use_kibana_index_patterns.mock';
 import { DEFAULT_SOURCE_CONFIGURATION } from '../../test_utils/source_configuration';
 import { generateFakeEntries, ENTRIES_EMPTY } from '../../test_utils/entries';
 
@@ -18,6 +19,45 @@ export const startTimestamp = 1595145600000;
 export const endTimestamp = startTimestamp + 15 * 60 * 1000;
 
 export const dataMock = {
+  indexPatterns: createIndexPatternsMock(500, [
+    createIndexPatternMock({
+      id: 'some-test-id',
+      title: 'mock-index-pattern-*',
+      timeFieldName: '@timestamp',
+      fields: [
+        {
+          name: '@timestamp',
+          type: KBN_FIELD_TYPES.DATE,
+          searchable: true,
+          aggregatable: true,
+        },
+        {
+          name: 'event.dataset',
+          type: KBN_FIELD_TYPES.STRING,
+          searchable: true,
+          aggregatable: true,
+        },
+        {
+          name: 'host.name',
+          type: KBN_FIELD_TYPES.STRING,
+          searchable: true,
+          aggregatable: true,
+        },
+        {
+          name: 'log.level',
+          type: KBN_FIELD_TYPES.STRING,
+          searchable: true,
+          aggregatable: true,
+        },
+        {
+          name: 'message',
+          type: KBN_FIELD_TYPES.STRING,
+          searchable: true,
+          aggregatable: true,
+        },
+      ],
+    })
+  ]),
   search: {
     search: ({ params }, options) => {
       return defer(() => {
@@ -68,10 +108,16 @@ export const dataMock = {
 };
 
 
-export const fetch = function (url, params) {
+export const fetch = async function (url, params) {
   switch (url) {
     case '/api/infra/log_source_configurations/default':
       return DEFAULT_SOURCE_CONFIGURATION;
+    case '/api/infra/log_source_configurations/default/status':
+      return {
+        data: {
+          logIndexStatus: 'available',
+        }
+      };
     default:
       return {};
   }
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_fields_table.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_fields_table.tsx
index 3b19a3eb0902c..d061866cf24a8 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_fields_table.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_fields_table.tsx
@@ -7,21 +7,37 @@
 
 import { EuiBasicTableColumn, EuiInMemoryTable } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import * as rt from 'io-ts';
 import React, { useMemo } from 'react';
+import { Query } from '../../../../../../../src/plugins/data/public';
 import { LogEntryField } from '../../../../common/log_entry';
 import { LogEntry } from '../../../../common/search_strategies/log_entries/log_entry';
 import { TimeKey } from '../../../../common/time';
+import { JsonScalar, jsonScalarRT } from '../../../../common/typed_json';
 import { FieldValue } from '../log_text_stream/field_value';
 
 export const LogEntryFieldsTable: React.FC<{
   logEntry: LogEntry;
-  onSetFieldFilter?: (filter: string, logEntryId: string, timeKey?: TimeKey) => void;
+  onSetFieldFilter?: (filter: Query, logEntryId: string, timeKey?: TimeKey) => void;
 }> = ({ logEntry, onSetFieldFilter }) => {
   const createSetFilterHandler = useMemo(
     () =>
       onSetFieldFilter
         ? (field: LogEntryField) => () => {
-            onSetFieldFilter?.(`${field.field}:"${field.value}"`, logEntry.id, logEntry.cursor);
+            if (!rt.array(jsonScalarRT).is(field.value)) {
+              return;
+            }
+
+            onSetFieldFilter?.(
+              {
+                language: 'kuery',
+                query: `${escapeKueryLiteral(field.field)}:${field.value
+                  .map(escapeKueryLiteral)
+                  .join(' OR ')}`,
+              },
+              logEntry.id,
+              logEntry.cursor
+            );
           }
         : undefined,
     [logEntry, onSetFieldFilter]
@@ -98,3 +114,8 @@ const setFilterButtonLabel = i18n.translate('xpack.infra.logFlyout.filterAriaLab
 const setFilterButtonDescription = i18n.translate('xpack.infra.logFlyout.setFilterTooltip', {
   defaultMessage: 'View event with filter',
 });
+
+const escapeKueryLiteral = (unquotedLiteral: JsonScalar): JsonScalar =>
+  typeof unquotedLiteral === 'string'
+    ? `"${unquotedLiteral.replace(/"/g, '\\"')}"`
+    : unquotedLiteral;
diff --git a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
index dcd36d73dd0bb..a296b7063282a 100644
--- a/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
+++ b/x-pack/plugins/infra/public/components/logging/log_entry_flyout/log_entry_flyout.tsx
@@ -18,6 +18,7 @@ import {
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React, { useEffect } from 'react';
+import type { Query } from '../../../../../../../src/plugins/data/public';
 import { TimeKey } from '../../../../common/time';
 import { useLogEntry } from '../../../containers/logs/log_entry';
 import { CenteredEuiFlyoutBody } from '../../centered_flyout_body';
@@ -29,7 +30,7 @@ import { LogEntryFieldsTable } from './log_entry_fields_table';
 export interface LogEntryFlyoutProps {
   logEntryId: string | null | undefined;
   onCloseFlyout: () => void;
-  onSetFieldFilter?: (filter: string, logEntryId: string, timeKey?: TimeKey) => void;
+  onSetFieldFilter?: (filter: Query, logEntryId: string, timeKey?: TimeKey) => void;
   sourceId: string | null | undefined;
 }
 
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 9eadc3035588d..9de6e574ecb5b 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
@@ -19,7 +19,7 @@ interface RequestArgs {
   timestampField: string;
   startTime: number;
   endTime: number;
-  runtimeMappings: estypes.RuntimeFields;
+  runtimeMappings: estypes.MappingRuntimeFields;
 }
 
 export const callValidateDatasetsAPI = async (requestArgs: RequestArgs, fetch: HttpHandler) => {
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 f9eb7609e00f3..a211fecc807fa 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
@@ -20,7 +20,7 @@ import { decodeOrThrow } from '../../../../../common/runtime_types';
 interface RequestArgs {
   indices: string[];
   fields: ValidationIndicesFieldSpecification[];
-  runtimeMappings: estypes.RuntimeFields;
+  runtimeMappings: estypes.MappingRuntimeFields;
 }
 
 export const callValidateIndicesAPI = async (requestArgs: RequestArgs, fetch: HttpHandler) => {
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 36371b080ee45..4ae99b95cfff8 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
@@ -47,7 +47,7 @@ export interface ModuleDescriptor<JobType extends string> {
   validateSetupIndices: (
     indices: string[],
     timestampField: string,
-    runtimeMappings: estypes.RuntimeFields,
+    runtimeMappings: estypes.MappingRuntimeFields,
     fetch: HttpHandler
   ) => Promise<ValidationIndicesResponsePayload>;
   validateSetupDatasets: (
@@ -55,7 +55,7 @@ export interface ModuleDescriptor<JobType extends string> {
     timestampField: string,
     startTime: number,
     endTime: number,
-    runtimeMappings: estypes.RuntimeFields,
+    runtimeMappings: estypes.MappingRuntimeFields,
     fetch: HttpHandler
   ) => Promise<ValidateLogEntryDatasetsResponsePayload>;
 }
@@ -65,5 +65,5 @@ export interface ModuleSourceConfiguration {
   sourceId: string;
   spaceId: string;
   timestampField: string;
-  runtimeMappings: estypes.RuntimeFields;
+  runtimeMappings: estypes.MappingRuntimeFields;
 }
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 981b7b496b435..af2bd1802042a 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
@@ -136,7 +136,7 @@ const cleanUpModule = async (spaceId: string, sourceId: string, fetch: HttpHandl
 const validateSetupIndices = async (
   indices: string[],
   timestampField: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   fetch: HttpHandler
 ) => {
   return await callValidateIndicesAPI(
@@ -167,7 +167,7 @@ const validateSetupDatasets = async (
   timestampField: string,
   startTime: number,
   endTime: number,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   fetch: HttpHandler
 ) => {
   return await callValidateDatasetsAPI(
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx
index a2ad5cd4f56c4..86e8e75dc3d41 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_categories/use_log_entry_categories_module.tsx
@@ -26,7 +26,7 @@ export const useLogEntryCategoriesModule = ({
   sourceId: string;
   spaceId: string;
   timestampField: string;
-  runtimeMappings: estypes.RuntimeFields;
+  runtimeMappings: estypes.MappingRuntimeFields;
 }) => {
   const sourceConfiguration: ModuleSourceConfiguration = useMemo(
     () => ({
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 345f221f11c1f..9704afd80e9ea 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
@@ -128,7 +128,7 @@ const cleanUpModule = async (spaceId: string, sourceId: string, fetch: HttpHandl
 const validateSetupIndices = async (
   indices: string[],
   timestampField: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   fetch: HttpHandler
 ) => {
   return await callValidateIndicesAPI(
@@ -155,7 +155,7 @@ const validateSetupDatasets = async (
   timestampField: string,
   startTime: number,
   endTime: number,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   fetch: HttpHandler
 ) => {
   return await callValidateDatasetsAPI(
diff --git a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx
index b451cad1c8753..0df5d9b446dbe 100644
--- a/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx
+++ b/x-pack/plugins/infra/public/containers/logs/log_analysis/modules/log_entry_rate/use_log_entry_rate_module.tsx
@@ -25,7 +25,7 @@ export const useLogEntryRateModule = ({
   sourceId: string;
   spaceId: string;
   timestampField: string;
-  runtimeMappings: estypes.RuntimeFields;
+  runtimeMappings: estypes.MappingRuntimeFields;
 }) => {
   const sourceConfiguration: ModuleSourceConfiguration = useMemo(
     () => ({
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 dbf032415cb99..9d3a611cff88d 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
@@ -21,7 +21,7 @@ import { Pick2 } from '../../common/utility_types';
 
 type MockIndexPattern = Pick<
   IndexPattern,
-  'id' | 'title' | 'type' | 'getTimeField' | 'isTimeBased' | 'getFieldByName'
+  'id' | 'title' | 'type' | 'getTimeField' | 'isTimeBased' | 'getFieldByName' | 'getComputedFields'
 >;
 export type MockIndexPatternSpec = Pick<
   IIndexPattern,
@@ -35,23 +35,7 @@ export const MockIndexPatternsKibanaContextProvider: React.FC<{
   mockIndexPatterns: MockIndexPatternSpec[];
 }> = ({ asyncDelay, children, mockIndexPatterns }) => {
   const indexPatterns = useMemo(
-    () =>
-      createIndexPatternsMock(
-        asyncDelay,
-        mockIndexPatterns.map(({ id, title, type = undefined, fields, timeFieldName }) => {
-          const indexPatternFields = fields.map((fieldSpec) => new IndexPatternField(fieldSpec));
-
-          return {
-            id,
-            title,
-            type,
-            getTimeField: () => indexPatternFields.find(({ name }) => name === timeFieldName),
-            isTimeBased: () => timeFieldName != null,
-            getFieldByName: (fieldName) =>
-              indexPatternFields.find(({ name }) => name === fieldName),
-          };
-        })
-      ),
+    () => createIndexPatternsMock(asyncDelay, mockIndexPatterns.map(createIndexPatternMock)),
     [asyncDelay, mockIndexPatterns]
   );
 
@@ -71,7 +55,7 @@ export const MockIndexPatternsKibanaContextProvider: React.FC<{
   );
 };
 
-const createIndexPatternsMock = (
+export const createIndexPatternsMock = (
   asyncDelay: number,
   indexPatterns: MockIndexPattern[]
 ): {
@@ -93,3 +77,36 @@ const createIndexPatternsMock = (
     },
   };
 };
+
+export const createIndexPatternMock = ({
+  id,
+  title,
+  type = undefined,
+  fields,
+  timeFieldName,
+}: MockIndexPatternSpec): MockIndexPattern => {
+  const indexPatternFields = fields.map((fieldSpec) => new IndexPatternField(fieldSpec));
+
+  return {
+    id,
+    title,
+    type,
+    getTimeField: () => indexPatternFields.find(({ name }) => name === timeFieldName),
+    isTimeBased: () => timeFieldName != null,
+    getFieldByName: (fieldName) => indexPatternFields.find(({ name }) => name === fieldName),
+    getComputedFields: () => ({
+      docvalueFields: [],
+      runtimeFields: indexPatternFields.reduce((accumulatedRuntimeFields, field) => {
+        if (field.runtimeField != null) {
+          return {
+            ...accumulatedRuntimeFields,
+            [field.name]: field.runtimeField,
+          };
+        }
+        return accumulatedRuntimeFields;
+      }, {}),
+      scriptFields: {},
+      storedFields: [],
+    }),
+  };
+};
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 54617d025652b..0741423fd3886 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
@@ -10,9 +10,11 @@ import moment from 'moment';
 import { stringify } from 'query-string';
 import React, { useCallback, useMemo } from 'react';
 import { encode, RisonValue } from 'rison-node';
+import type { Query } from '../../../../../../../src/plugins/data/public';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { useTrackPageview } from '../../../../../observability/public';
+import { isJobStatusWithResults } from '../../../../common/log_analysis';
 import { TimeKey } from '../../../../common/time';
 import {
   CategoryJobNoticesSection,
@@ -27,10 +29,9 @@ import { useLogEntryRateModuleContext } from '../../../containers/logs/log_analy
 import { useLogEntryFlyoutContext } from '../../../containers/logs/log_flyout';
 import { useLogSourceContext } from '../../../containers/logs/log_source';
 import { AnomaliesResults } from './sections/anomalies';
-import { useLogEntryAnomaliesResults } from './use_log_entry_anomalies_results';
 import { useDatasetFiltering } from './use_dataset_filtering';
+import { useLogEntryAnomaliesResults } from './use_log_entry_anomalies_results';
 import { useLogAnalysisResultsUrlState } from './use_log_entry_rate_results_url_state';
-import { isJobStatusWithResults } from '../../../../common/log_analysis';
 
 export const SORT_DEFAULTS = {
   direction: 'desc' as const,
@@ -102,7 +103,7 @@ export const LogEntryRateResultsContent: React.FunctionComponent = () => {
   } = useLogEntryFlyoutContext();
 
   const linkToLogStream = useCallback(
-    (filter: string, id: string, timeKey?: TimeKey) => {
+    (filterQuery: Query, id: string, timeKey?: TimeKey) => {
       const params = {
         logPosition: encode({
           end: moment(timeRange.value.endTime).format('YYYY-MM-DDTHH:mm:ss.SSSZ'),
@@ -113,10 +114,7 @@ export const LogEntryRateResultsContent: React.FunctionComponent = () => {
         flyoutOptions: encode({
           surroundingLogsId: id,
         }),
-        logFilter: encode({
-          expression: filter,
-          kind: 'kuery',
-        }),
+        logFilter: encode(filterQuery),
       };
 
       navigateToApp?.('logs', { path: `/stream?${stringify(params)}` });
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 664cccb552202..165a5a03bcc6e 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
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
-import React, { useContext, useCallback, useMemo, useEffect } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 import usePrevious from 'react-use/lib/usePrevious';
-import { LogEntry } from '../../../../common/log_entry';
+import type { Query } from '../../../../../../../src/plugins/data/public';
 import { euiStyled } from '../../../../../../../src/plugins/kibana_react/common';
+import { LogEntry } from '../../../../common/log_entry';
+import { TimeKey } from '../../../../common/time';
 import { AutoSizer } from '../../../components/auto_sizer';
 import { LogEntryFlyout } from '../../../components/logging/log_entry_flyout';
 import { LogMinimap } from '../../../components/logging/log_minimap';
@@ -23,14 +25,14 @@ import {
 import { LogHighlightsState } from '../../../containers/logs/log_highlights';
 import { LogPositionState } from '../../../containers/logs/log_position';
 import { useLogSourceContext } from '../../../containers/logs/log_source';
+import { useLogStreamContext } from '../../../containers/logs/log_stream';
 import { WithSummary } from '../../../containers/logs/log_summary';
 import { LogViewConfiguration } from '../../../containers/logs/log_view_configuration';
 import { ViewLogInContext } from '../../../containers/logs/view_log_in_context';
 import { WithLogTextviewUrlState } from '../../../containers/logs/with_log_textview';
+import { datemathToEpochMillis, isValidDatemath } from '../../../utils/datemath';
 import { LogsToolbar } from './page_toolbar';
 import { PageViewLogInContext } from './page_view_log_in_context';
-import { useLogStreamContext } from '../../../containers/logs/log_stream';
-import { datemathToEpochMillis, isValidDatemath } from '../../../utils/datemath';
 
 const PAGE_THRESHOLD = 2;
 
@@ -190,7 +192,7 @@ export const LogsPageLogsContent: React.FunctionComponent = () => {
   );
 
   const setFilter = useCallback(
-    (filter, flyoutItemId, timeKey) => {
+    (filter: Query, flyoutItemId: string, timeKey: TimeKey | undefined | null) => {
       applyLogFilterQuery(filter);
       if (timeKey) {
         jumpToTargetPosition(timeKey);
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 0a657b5242427..dd1023e7f0185 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
@@ -19,6 +19,7 @@ import {
   TooltipValue,
   niceTimeFormatter,
   ElementClickListener,
+  GeometryValue,
   RectAnnotation,
   RectAnnotationDatum,
 } from '@elastic/charts';
@@ -141,7 +142,8 @@ export const Timeline: React.FC<Props> = ({ interval, yAxisFormatter, isVisible
   const onClickPoint: ElementClickListener = useCallback(
     ([[geometryValue]]) => {
       if (!Array.isArray(geometryValue)) {
-        const { x: timestamp } = geometryValue;
+        // casting to GeometryValue as we are using cartesian charts
+        const { x: timestamp } = geometryValue as GeometryValue;
         jumpToTime(timestamp);
         stopAutoReload();
       }
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 d3ea162781b5d..2aede2f6aad16 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
@@ -161,7 +161,7 @@ export class KibanaFramework {
         apiResult = elasticsearch.client.asCurrentUser.msearch({
           ...params,
           ...frozenIndicesParams,
-        } as estypes.MultiSearchRequest);
+        } as estypes.MsearchRequest);
         break;
       case 'fieldCaps':
         apiResult = elasticsearch.client.asCurrentUser.fieldCaps({
diff --git a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
index 1c1edb3ea8328..ffabd7ba65f03 100644
--- a/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
+++ b/x-pack/plugins/infra/server/lib/alerting/log_threshold/log_threshold_executor.test.ts
@@ -24,7 +24,7 @@ import {
   GroupedSearchQueryResponse,
 } from '../../../../common/alerting/logs/log_threshold/types';
 import { alertsMock } from '../../../../../alerting/server/mocks';
-import { estypes } from '@elastic/elasticsearch';
+import type { estypes } from '@elastic/elasticsearch';
 
 // Mocks //
 const numericField = {
@@ -70,7 +70,7 @@ const baseAlertParams: Pick<AlertParams, 'count' | 'timeSize' | 'timeUnit'> = {
 const TIMESTAMP_FIELD = '@timestamp';
 const FILEBEAT_INDEX = 'filebeat-*';
 
-const runtimeMappings: estypes.RuntimeFields = {
+const runtimeMappings: estypes.MappingRuntimeFields = {
   runtime_field: {
     type: 'keyword',
     script: {
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 3e910e5dfbf46..a537801202217 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
@@ -113,7 +113,7 @@ async function executeAlert(
   alertParams: CountAlertParams,
   timestampField: string,
   indexPattern: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   esClient: ElasticsearchClient,
   alertInstanceFactory: LogThresholdAlertServices['alertInstanceFactory']
 ) {
@@ -144,7 +144,7 @@ async function executeRatioAlert(
   alertParams: RatioAlertParams,
   timestampField: string,
   indexPattern: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   esClient: ElasticsearchClient,
   alertInstanceFactory: LogThresholdAlertServices['alertInstanceFactory']
 ) {
@@ -198,7 +198,7 @@ const getESQuery = (
   alertParams: Omit<AlertParams, 'criteria'> & { criteria: CountCriteria },
   timestampField: string,
   indexPattern: string,
-  runtimeMappings: estypes.RuntimeFields
+  runtimeMappings: estypes.MappingRuntimeFields
 ) => {
   return hasGroupBy(alertParams)
     ? getGroupedESQuery(alertParams, timestampField, indexPattern, runtimeMappings)
@@ -433,7 +433,7 @@ export const getGroupedESQuery = (
   params: Pick<AlertParams, 'timeSize' | 'timeUnit' | 'groupBy'> & { criteria: CountCriteria },
   timestampField: string,
   index: string,
-  runtimeMappings: estypes.RuntimeFields
+  runtimeMappings: estypes.MappingRuntimeFields
 ): estypes.SearchRequest | undefined => {
   const { groupBy } = params;
 
@@ -493,7 +493,7 @@ export const getUngroupedESQuery = (
   params: Pick<AlertParams, 'timeSize' | 'timeUnit'> & { criteria: CountCriteria },
   timestampField: string,
   index: string,
-  runtimeMappings: estypes.RuntimeFields
+  runtimeMappings: estypes.MappingRuntimeFields
 ): object => {
   const { rangeFilter, mustFilters, mustNotFilters } = buildFiltersFromCriteria(
     params,
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 387143ef9f9c4..ad8650bbb0fb6 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
@@ -277,7 +277,7 @@ export class InfraLogEntriesDomain {
     indexName: string,
     startTime: number,
     endTime: number,
-    runtimeMappings: estypes.RuntimeFields
+    runtimeMappings: estypes.MappingRuntimeFields
   ) {
     let datasetBuckets: LogEntryDatasetBucket[] = [];
     let afterLatestBatchKey: CompositeDatasetKey | undefined;
diff --git a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts
index 18e04aaf063d4..3431f3bfb0c8c 100644
--- a/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts
+++ b/x-pack/plugins/infra/server/lib/domains/log_entries_domain/queries/log_entry_datasets.ts
@@ -15,7 +15,7 @@ export const createLogEntryDatasetsQuery = (
   timestampField: string,
   startTime: number,
   endTime: number,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   size: number,
   afterKey?: CompositeDatasetKey
 ) => ({
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 716ab400c0123..3210f01116f76 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
@@ -387,7 +387,7 @@ export async function fetchLogEntryExamples(
   context: InfraPluginRequestHandlerContext & { infra: Required<InfraRequestHandlerContext> },
   sourceId: string,
   indices: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   timestampField: string,
   tiebreakerField: string,
   startTime: number,
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 aea946ae87e74..7739f39cb5624 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 { estypes } from '@elastic/elasticsearch';
-import type { ILegacyScopedClusterClient } from 'src/core/server';
+import type { ElasticsearchClient } from 'src/core/server';
 import {
   compareDatasetsByMaximumAnomalyScore,
   getJobId,
@@ -136,7 +136,7 @@ export async function getLogEntryCategoryDatasets(
 
 export async function getLogEntryCategoryExamples(
   context: {
-    core: { elasticsearch: { legacy: { client: ILegacyScopedClusterClient } } };
+    core: { elasticsearch: { client: { asCurrentUser: ElasticsearchClient } } };
     infra: {
       mlAnomalyDetectors: MlAnomalyDetectors;
       mlSystem: MlSystem;
@@ -402,9 +402,9 @@ async function fetchTopLogEntryCategoryHistograms(
 }
 
 async function fetchLogEntryCategoryExamples(
-  requestContext: { core: { elasticsearch: { legacy: { client: ILegacyScopedClusterClient } } } },
+  requestContext: { core: { elasticsearch: { client: { asCurrentUser: ElasticsearchClient } } } },
   indices: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   timestampField: string,
   tiebreakerField: string,
   startTime: number,
@@ -417,19 +417,20 @@ async function fetchLogEntryCategoryExamples(
   const {
     hits: { hits },
   } = decodeOrThrow(logEntryCategoryExamplesResponseRT)(
-    await requestContext.core.elasticsearch.legacy.client.callAsCurrentUser(
-      'search',
-      createLogEntryCategoryExamplesQuery(
-        indices,
-        runtimeMappings,
-        timestampField,
-        tiebreakerField,
-        startTime,
-        endTime,
-        categoryQuery,
-        exampleCount
+    (
+      await requestContext.core.elasticsearch.client.asCurrentUser.search(
+        createLogEntryCategoryExamplesQuery(
+          indices,
+          runtimeMappings,
+          timestampField,
+          tiebreakerField,
+          startTime,
+          endTime,
+          categoryQuery,
+          exampleCount
+        )
       )
-    )
+    ).body
   );
 
   const esSearchSpan = finalizeEsSearchSpan();
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts
index f06dcd43a9156..0fef7dedfff0b 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_category_examples.ts
@@ -12,7 +12,7 @@ import { defaultRequestParameters } from './common';
 
 export const createLogEntryCategoryExamplesQuery = (
   indices: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   timestampField: string,
   tiebreakerField: string,
   startTime: number,
diff --git a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts
index 1e8cbe247dd50..ee339c9c6eb7e 100644
--- a/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts
+++ b/x-pack/plugins/infra/server/lib/log_analysis/queries/log_entry_examples.ts
@@ -13,7 +13,7 @@ import { defaultRequestParameters } from './common';
 
 export const createLogEntryExamplesQuery = (
   indices: string,
-  runtimeMappings: estypes.RuntimeFields,
+  runtimeMappings: estypes.MappingRuntimeFields,
   timestampField: string,
   tiebreakerField: string,
   startTime: number,
diff --git a/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts b/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts
index 950ecc98619ee..ef789c1b41349 100644
--- a/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts
+++ b/x-pack/plugins/infra/server/routes/log_analysis/validation/datasets.ts
@@ -43,7 +43,7 @@ export const initValidateLogAnalysisDatasetsRoute = ({
               indexName,
               startTime,
               endTime,
-              runtimeMappings as estypes.RuntimeFields
+              runtimeMappings as estypes.MappingRuntimeFields
             );
 
             return {
diff --git a/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts b/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts
index 6df17dbfd7bfd..9022195dce85d 100644
--- a/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/queries/log_entries.ts
@@ -29,7 +29,7 @@ export const createGetLogEntriesQuery = (
   timestampField: string,
   tiebreakerField: string,
   fields: string[],
-  runtimeMappings?: estypes.RuntimeFields,
+  runtimeMappings?: estypes.MappingRuntimeFields,
   query?: JsonObject,
   highlightTerm?: string
 ): estypes.AsyncSearchSubmitRequest => {
@@ -52,8 +52,8 @@ export const createGetLogEntriesQuery = (
           ],
         },
       },
-      // @ts-expect-error @elastic/elasticsearch doesn't declare body.fields on AsyncSearchSubmitRequest
       fields,
+      // @ts-expect-error @elastic/elasticsearch doesn't declare "runtime_mappings" property
       runtime_mappings: runtimeMappings,
       _source: false,
       ...createSortClause(sortDirection, timestampField, tiebreakerField),
diff --git a/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts b/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts
index 6bef317d96ada..8da2f1d685db3 100644
--- a/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts
+++ b/x-pack/plugins/infra/server/services/log_entries/queries/log_entry.ts
@@ -18,7 +18,7 @@ export const createGetLogEntryQuery = (
   logEntryId: string,
   timestampField: string,
   tiebreakerField: string,
-  runtimeMappings?: estypes.RuntimeFields
+  runtimeMappings?: estypes.MappingRuntimeFields
 ): estypes.AsyncSearchSubmitRequest => ({
   index: logEntryIndex,
   terminate_after: 1,
@@ -31,8 +31,8 @@ export const createGetLogEntryQuery = (
         values: [logEntryId],
       },
     },
-    // @ts-expect-error @elastic/elasticsearch doesn't declare body.fields on AsyncSearchSubmitRequest
     fields: ['*'],
+    // @ts-expect-error @elastic/elasticsearch doesn't declare "runtime_mappings" property
     runtime_mappings: runtimeMappings,
     sort: [{ [timestampField]: 'desc' }, { [tiebreakerField]: 'desc' }],
     _source: false,
diff --git a/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts b/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts
index 5360e2713aee1..d2669e7c0012b 100644
--- a/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts
+++ b/x-pack/plugins/ingest_pipelines/common/lib/pipeline_serialization.ts
@@ -5,10 +5,12 @@
  * 2.0.
  */
 
-import { Pipeline as ESPipeline } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
 import { Pipeline, Processor } from '../types';
 
-export function deserializePipelines(pipelinesByName: { [key: string]: ESPipeline }): Pipeline[] {
+export function deserializePipelines(pipelinesByName: {
+  [key: string]: estypes.IngestPipeline;
+}): Pipeline[] {
   const pipelineNames: string[] = Object.keys(pipelinesByName);
 
   const deserializedPipelines = pipelineNames.map<Pipeline>((name: string) => {
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 9dd0d6cc72de1..c00f09b2d2b06 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
@@ -154,6 +154,10 @@ type TestSubject =
   | 'separatorValueField.input'
   | 'quoteValueField.input'
   | 'emptyValueField.input'
+  | 'valueFieldInput'
+  | 'mediaTypeSelectorField'
+  | 'ignoreEmptyField.input'
+  | 'overrideField.input'
   | 'fieldsValueField.input'
   | 'saltValueField.input'
   | 'methodsValueField'
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
new file mode 100644
index 0000000000000..d7351c9dbf65f
--- /dev/null
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/__jest__/processors/set.test.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 { act } from 'react-dom/test-utils';
+import { setup, SetupResult, getProcessorValue } from './processor.helpers';
+
+// Default parameter values automatically added to the set processor when saved
+const defaultSetParameters = {
+  value: '',
+  if: undefined,
+  tag: undefined,
+  override: undefined,
+  media_type: undefined,
+  description: undefined,
+  ignore_missing: undefined,
+  ignore_failure: undefined,
+  ignore_empty_value: undefined,
+};
+
+const SET_TYPE = 'set';
+
+describe('Processor: Set', () => {
+  let onUpdate: jest.Mock;
+  let testBed: SetupResult;
+
+  beforeAll(() => {
+    jest.useFakeTimers();
+  });
+
+  afterAll(() => {
+    jest.useRealTimers();
+  });
+
+  beforeEach(async () => {
+    onUpdate = jest.fn();
+
+    await act(async () => {
+      testBed = await setup({
+        value: {
+          processors: [],
+        },
+        onFlyoutOpen: jest.fn(),
+        onUpdate,
+      });
+    });
+
+    testBed.component.update();
+
+    // Open flyout to add new processor
+    testBed.actions.addProcessor();
+    // Add type (the other fields are not visible until a type is selected)
+    await testBed.actions.addProcessorType(SET_TYPE);
+  });
+
+  test('prevents form submission if required fields are not provided', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+    } = testBed;
+
+    // Click submit button with only the type defined
+    await saveNewProcessor();
+
+    // Expect form error as "field" is required parameter
+    expect(form.getErrorsMessages()).toEqual(['A field value is required.']);
+  });
+
+  test('saves with default parameter value', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+    } = testBed;
+
+    // Add "field" value (required)
+    form.setInputValue('fieldNameField.input', 'field_1');
+    // Save the field
+    await saveNewProcessor();
+
+    const processors = getProcessorValue(onUpdate, SET_TYPE);
+    expect(processors[0][SET_TYPE]).toEqual({
+      ...defaultSetParameters,
+      field: 'field_1',
+    });
+  });
+
+  test('should allow to set mediaType when value is a template snippet', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+      exists,
+    } = testBed;
+
+    // Add "field" value (required)
+    form.setInputValue('fieldNameField.input', 'field_1');
+
+    // Shouldnt be able to set mediaType if value is not a template string
+    form.setInputValue('valueFieldInput', 'hello');
+    expect(exists('mediaTypeSelectorField')).toBe(false);
+
+    // Set value to a template snippet and media_type to a non-default value
+    form.setInputValue('valueFieldInput', '{{{hello}}}');
+    form.setSelectValue('mediaTypeSelectorField', 'text/plain');
+
+    // Save the field with new changes
+    await saveNewProcessor();
+
+    const processors = getProcessorValue(onUpdate, SET_TYPE);
+    expect(processors[0][SET_TYPE]).toEqual({
+      ...defaultSetParameters,
+      field: 'field_1',
+      value: '{{{hello}}}',
+      media_type: 'text/plain',
+    });
+  });
+
+  test('allows optional parameters to be set', async () => {
+    const {
+      actions: { saveNewProcessor },
+      form,
+    } = testBed;
+
+    // Add "field" value (required)
+    form.setInputValue('fieldNameField.input', 'field_1');
+
+    // Set optional parameteres
+    form.setInputValue('valueFieldInput', '{{{hello}}}');
+    form.toggleEuiSwitch('overrideField.input');
+    form.toggleEuiSwitch('ignoreEmptyField.input');
+
+    // Save the field with new changes
+    await saveNewProcessor();
+
+    const processors = getProcessorValue(onUpdate, SET_TYPE);
+    expect(processors[0][SET_TYPE]).toEqual({
+      ...defaultSetParameters,
+      field: 'field_1',
+      value: '{{{hello}}}',
+      ignore_empty_value: true,
+      override: false,
+    });
+  });
+});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/set.tsx b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/set.tsx
index 89ca373b9e653..fda34f8700b33 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/set.tsx
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/components/processor_form/processors/set.tsx
@@ -10,7 +10,15 @@ import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiCode } from '@elastic/eui';
 
-import { FIELD_TYPES, ToggleField, UseField, Field } from '../../../../../../shared_imports';
+import {
+  FIELD_TYPES,
+  useFormData,
+  SelectField,
+  ToggleField,
+  UseField,
+  Field,
+} from '../../../../../../shared_imports';
+import { hasTemplateSnippet } from '../../../utils';
 
 import { FieldsConfig, to, from } from './shared';
 
@@ -35,6 +43,20 @@ const fieldsConfig: FieldsConfig = {
       />
     ),
   },
+  mediaType: {
+    type: FIELD_TYPES.SELECT,
+    defaultValue: 'application/json',
+    serializer: from.undefinedIfValue('application/json'),
+    label: i18n.translate('xpack.ingestPipelines.pipelineEditor.setForm.mediaTypeFieldLabel', {
+      defaultMessage: 'Media Type',
+    }),
+    helpText: (
+      <FormattedMessage
+        id="xpack.ingestPipelines.pipelineEditor.setForm.mediaTypeHelpText"
+        defaultMessage="Media type for encoding value."
+      />
+    ),
+  },
   /* Optional fields config */
   override: {
     type: FIELD_TYPES.TOGGLE,
@@ -83,6 +105,8 @@ const fieldsConfig: FieldsConfig = {
  * Disambiguate name from the Set data structure
  */
 export const SetProcessor: FunctionComponent = () => {
+  const [{ fields }] = useFormData({ watch: 'fields.value' });
+
   return (
     <>
       <FieldNameField
@@ -102,12 +126,45 @@ export const SetProcessor: FunctionComponent = () => {
         path="fields.value"
       />
 
-      <UseField config={fieldsConfig.override} component={ToggleField} path="fields.override" />
+      {hasTemplateSnippet(fields?.value) && (
+        <UseField
+          componentProps={{
+            euiFieldProps: {
+              'data-test-subj': 'mediaTypeSelectorField',
+              options: [
+                {
+                  value: 'application/json',
+                  text: 'application/json',
+                },
+                {
+                  value: 'text/plain',
+                  text: 'text/plain',
+                },
+                {
+                  value: 'application/x-www-form-urlencoded',
+                  text: 'application/x-www-form-urlencoded',
+                },
+              ],
+            },
+          }}
+          config={fieldsConfig.mediaType}
+          component={SelectField}
+          path="fields.media_type"
+        />
+      )}
+
+      <UseField
+        config={fieldsConfig.override}
+        component={ToggleField}
+        path="fields.override"
+        data-test-subj="overrideField"
+      />
 
       <UseField
         config={fieldsConfig.ignore_empty_value}
         component={ToggleField}
         path="fields.ignore_empty_value"
+        data-test-subj="ignoreEmptyField"
       />
     </>
   );
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.test.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.test.ts
index 6f21285398e1f..6e367a83bf8d4 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.test.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getValue, setValue } from './utils';
+import { getValue, setValue, hasTemplateSnippet } from './utils';
 
 describe('get and set values', () => {
   const testObject = Object.freeze([{ onFailure: [{ onFailure: 1 }] }]);
@@ -35,3 +35,19 @@ describe('get and set values', () => {
     });
   });
 });
+
+describe('template snippets', () => {
+  it('knows when a string contains an invalid template snippet', () => {
+    expect(hasTemplateSnippet('')).toBe(false);
+    expect(hasTemplateSnippet('{}')).toBe(false);
+    expect(hasTemplateSnippet('{{{}}}')).toBe(false);
+    expect(hasTemplateSnippet('{{hello}}')).toBe(false);
+  });
+
+  it('knows when a string contains a valid template snippet', () => {
+    expect(hasTemplateSnippet('{{{hello}}}')).toBe(true);
+    expect(hasTemplateSnippet('hello{{{world}}}')).toBe(true);
+    expect(hasTemplateSnippet('{{{hello}}}world')).toBe(true);
+    expect(hasTemplateSnippet('{{{hello.world}}}')).toBe(true);
+  });
+});
diff --git a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.ts b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.ts
index e07b9eba90622..1259dbd5a9b91 100644
--- a/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.ts
+++ b/x-pack/plugins/ingest_pipelines/public/application/components/pipeline_editor/utils.ts
@@ -102,3 +102,20 @@ export const checkIfSamePath = (pathA: ProcessorSelector, pathB: ProcessorSelect
   if (pathA.length !== pathB.length) return false;
   return pathA.join('.') === pathB.join('.');
 };
+
+/*
+ * Given a string it checks if it contains a valid mustache template snippet.
+ *
+ * Note: This allows strings with spaces such as: {{{hello world}}}. I figured we
+ * should use .+ instead of \S (disallow all whitespaces) because the backend seems
+ * to allow spaces inside the template snippet anyway.
+ *
+ * See: https://www.elastic.co/guide/en/elasticsearch/reference/master/ingest.html#template-snippets
+ */
+export const hasTemplateSnippet = (str: string = '') => {
+  // Matches when:
+  //  * contains a {{{
+  //  * Followed by all strings of length >= 1
+  //  * And followed by }}}
+  return /{{{.+}}}/.test(str);
+};
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 f697a38e21561..c133b9237102a 100644
--- a/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
+++ b/x-pack/plugins/ingest_pipelines/server/routes/api/simulate.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { SimulatePipelineDocument } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { schema } from '@kbn/config-schema';
 
 import { API_BASE_PATH } from '../../../common/constants';
@@ -38,7 +38,7 @@ export const registerSimulateRoute = ({
           verbose,
           body: {
             pipeline,
-            docs: documents as SimulatePipelineDocument[],
+            docs: documents as estypes.IngestSimulatePipelineDocument[],
           },
         });
 
diff --git a/x-pack/plugins/lens/public/assets/chart_heatmap.tsx b/x-pack/plugins/lens/public/assets/chart_heatmap.tsx
new file mode 100644
index 0000000000000..7da242f82eb60
--- /dev/null
+++ b/x-pack/plugins/lens/public/assets/chart_heatmap.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 { EuiIconProps } from '@elastic/eui';
+import React from 'react';
+
+export const LensIconChartHeatmap = ({ 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="lensChartIcon__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="lensChartIcon__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>
+);
diff --git a/x-pack/plugins/lens/public/async_services.ts b/x-pack/plugins/lens/public/async_services.ts
index fb3ba62405904..b0ecc412c357f 100644
--- a/x-pack/plugins/lens/public/async_services.ts
+++ b/x-pack/plugins/lens/public/async_services.ts
@@ -18,6 +18,7 @@ export * from './datatable_visualization/datatable_visualization';
 export * from './metric_visualization/metric_visualization';
 export * from './pie_visualization/pie_visualization';
 export * from './xy_visualization/xy_visualization';
+export * from './heatmap_visualization/heatmap_visualization';
 
 export * from './indexpattern_datasource/indexpattern';
 
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 88948e9a7615b..49003af28f3f1 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
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { EuiButtonGroup } from '@elastic/eui';
+import { EuiButtonGroup, EuiComboBox, EuiFieldText } from '@elastic/eui';
 import { FramePublicAPI, VisualizationDimensionEditorProps } from '../../types';
 import { DatatableVisualizationState } from '../visualization';
 import { createMockDatasource, createMockFramePublicAPI } from '../../editor_frame_service/mocks';
@@ -212,4 +212,64 @@ describe('data table dimension editor', () => {
 
     expect(instance.find(PalettePanelContainer).exists()).toBe(true);
   });
+
+  it('should show the summary field for non numeric columns', () => {
+    const instance = mountWithIntl(<TableDimensionEditor {...props} />);
+    expect(instance.find('[data-test-subj="lnsDatatable_summaryrow_function"]').exists()).toBe(
+      false
+    );
+    expect(instance.find('[data-test-subj="lnsDatatable_summaryrow_label"]').exists()).toBe(false);
+  });
+
+  it('should set the summary row function default to "none"', () => {
+    frame.activeData!.first.columns[0].meta.type = 'number';
+    const instance = mountWithIntl(<TableDimensionEditor {...props} />);
+    expect(
+      instance
+        .find('[data-test-subj="lnsDatatable_summaryrow_function"]')
+        .find(EuiComboBox)
+        .prop('selectedOptions')
+    ).toEqual([{ value: 'none', label: 'None' }]);
+
+    expect(instance.find('[data-test-subj="lnsDatatable_summaryrow_label"]').exists()).toBe(false);
+  });
+
+  it('should show the summary row label input ony when summary row is different from "none"', () => {
+    frame.activeData!.first.columns[0].meta.type = 'number';
+    state.columns[0].summaryRow = 'sum';
+    const instance = mountWithIntl(<TableDimensionEditor {...props} />);
+    expect(
+      instance
+        .find('[data-test-subj="lnsDatatable_summaryrow_function"]')
+        .find(EuiComboBox)
+        .prop('selectedOptions')
+    ).toEqual([{ value: 'sum', label: 'Sum' }]);
+
+    expect(
+      instance
+        .find('[data-test-subj="lnsDatatable_summaryrow_label"]')
+        .find(EuiFieldText)
+        .prop('value')
+    ).toBe('Sum');
+  });
+
+  it("should show the correct summary row name when user's changes summary label", () => {
+    frame.activeData!.first.columns[0].meta.type = 'number';
+    state.columns[0].summaryRow = 'sum';
+    state.columns[0].summaryLabel = 'MySum';
+    const instance = mountWithIntl(<TableDimensionEditor {...props} />);
+    expect(
+      instance
+        .find('[data-test-subj="lnsDatatable_summaryrow_function"]')
+        .find(EuiComboBox)
+        .prop('selectedOptions')
+    ).toEqual([{ value: 'sum', label: 'Sum' }]);
+
+    expect(
+      instance
+        .find('[data-test-subj="lnsDatatable_summaryrow_label"]')
+        .find(EuiFieldText)
+        .prop('value')
+    ).toBe('MySum');
+  });
 });
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 76c47a9c743c5..6c39a04ae1504 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { i18n } from '@kbn/i18n';
 import {
   EuiFormRow,
@@ -16,10 +16,12 @@ import {
   EuiFlexItem,
   EuiFlexGroup,
   EuiButtonEmpty,
+  EuiFieldText,
+  EuiComboBox,
 } from '@elastic/eui';
 import { PaletteRegistry } from 'src/plugins/charts/public';
 import { VisualizationDimensionEditorProps } from '../../types';
-import { DatatableVisualizationState } from '../visualization';
+import { ColumnState, DatatableVisualizationState } from '../visualization';
 import { getOriginalId } from '../transpose_helpers';
 import {
   CustomizablePalette,
@@ -27,14 +29,22 @@ import {
   defaultPaletteParams,
   FIXED_PROGRESSION,
   getStopsForFixedMode,
+  useDebouncedValue,
 } from '../../shared_components/';
 import { PalettePanelContainer } from './palette_panel_container';
 import { findMinMaxByColumnId } from './shared_utils';
 import './dimension_editor.scss';
+import {
+  getDefaultSummaryLabel,
+  getFinalSummaryConfiguration,
+  getSummaryRowOptions,
+} from '../summary';
+import { isNumericField } from '../utils';
 
 const idPrefix = htmlIdGenerator()();
 
 type ColumnType = DatatableVisualizationState['columns'][number];
+type SummaryRowType = Extract<ColumnState['summaryRow'], string>;
 
 function updateColumnWith(
   state: DatatableVisualizationState,
@@ -58,6 +68,24 @@ export function TableDimensionEditor(
   const { state, setState, frame, accessor } = props;
   const column = state.columns.find(({ columnId }) => accessor === columnId);
   const [isPaletteOpen, setIsPaletteOpen] = useState(false);
+  const onSummaryLabelChangeToDebounce = useCallback(
+    (newSummaryLabel: string | undefined) => {
+      setState({
+        ...state,
+        columns: updateColumnWith(state, accessor, { summaryLabel: newSummaryLabel }),
+      });
+    },
+    [accessor, setState, state]
+  );
+  const { inputValue: summaryLabel, handleInputChange: onSummaryLabelChange } = useDebouncedValue<
+    string | undefined
+  >(
+    {
+      onChange: onSummaryLabelChangeToDebounce,
+      value: column?.summaryLabel,
+    },
+    { allowEmptyString: true } // empty string is a valid label for this feature
+  );
 
   if (!column) return null;
   if (column.isTransposed) return null;
@@ -65,13 +93,16 @@ export function TableDimensionEditor(
   const currentData = frame.activeData?.[state.layerId];
 
   // either read config state or use same logic as chart itself
-  const isNumericField =
-    currentData?.columns.find((col) => col.id === accessor || getOriginalId(col.id) === accessor)
-      ?.meta.type === 'number';
-
-  const currentAlignment = column?.alignment || (isNumericField ? 'right' : 'left');
+  const isNumeric = isNumericField(currentData, accessor);
+  const currentAlignment = column?.alignment || (isNumeric ? 'right' : 'left');
   const currentColorMode = column?.colorMode || 'none';
   const hasDynamicColoring = currentColorMode !== 'none';
+  // when switching from one operation to another, make sure to keep the configuration consistent
+  const { summaryRow, summaryLabel: fallbackSummaryLabel } = getFinalSummaryConfiguration(
+    accessor,
+    column,
+    currentData
+  );
 
   const visibleColumnsCount = state.columns.filter((c) => !c.hidden).length;
 
@@ -175,7 +206,61 @@ export function TableDimensionEditor(
           />
         </EuiFormRow>
       )}
-      {isNumericField && (
+      {isNumeric && (
+        <>
+          <EuiFormRow
+            fullWidth
+            label={i18n.translate('xpack.lens.table.summaryRow.label', {
+              defaultMessage: 'Summary Row',
+            })}
+            display="columnCompressed"
+          >
+            <EuiComboBox
+              fullWidth
+              compressed
+              isClearable={false}
+              data-test-subj="lnsDatatable_summaryrow_function"
+              placeholder={i18n.translate('xpack.lens.indexPattern.fieldPlaceholder', {
+                defaultMessage: 'Field',
+              })}
+              options={getSummaryRowOptions()}
+              selectedOptions={[
+                {
+                  label: getDefaultSummaryLabel(summaryRow),
+                  value: summaryRow,
+                },
+              ]}
+              singleSelection={{ asPlainText: true }}
+              onChange={(choices) => {
+                const newValue = choices[0].value as SummaryRowType;
+                setState({
+                  ...state,
+                  columns: updateColumnWith(state, accessor, { summaryRow: newValue }),
+                });
+              }}
+            />
+          </EuiFormRow>
+          {summaryRow !== 'none' && (
+            <EuiFormRow
+              display="columnCompressed"
+              fullWidth
+              label={i18n.translate('xpack.lens.table.summaryRow.customlabel', {
+                defaultMessage: 'Summary label',
+              })}
+            >
+              <EuiFieldText
+                compressed
+                data-test-subj="lnsDatatable_summaryrow_label"
+                value={summaryLabel ?? fallbackSummaryLabel}
+                onChange={(e) => {
+                  onSummaryLabelChange(e.target.value);
+                }}
+              />
+            </EuiFormRow>
+          )}
+        </>
+      )}
+      {isNumeric && (
         <>
           <EuiFormRow
             display="columnCompressed"
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 509969c2b71ec..0ec6f832cd642 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
@@ -539,4 +539,106 @@ describe('DatatableComponent', () => {
       c: { min: 3, max: 3 },
     });
   });
+
+  test('it does render a summary footer if at least one column has it configured', () => {
+    const { data, args } = sampleArgs();
+
+    const wrapper = mountWithIntl(
+      <DatatableComponent
+        data={data}
+        args={{
+          ...args,
+          columns: [
+            ...args.columns.slice(0, 2),
+            {
+              columnId: 'c',
+              type: 'lens_datatable_column',
+              summaryRow: 'sum',
+              summaryLabel: 'Sum',
+              summaryRowValue: 3,
+            },
+          ],
+          sortingColumnId: 'b',
+          sortingDirection: 'desc',
+        }}
+        formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
+        dispatchEvent={onDispatchEvent}
+        getType={jest.fn()}
+        renderMode="display"
+        paletteService={chartPluginMock.createPaletteRegistry()}
+        uiSettings={({ get: jest.fn() } as unknown) as IUiSettingsClient}
+      />
+    );
+    expect(wrapper.find('[data-test-subj="lnsDataTable-footer-a"]').exists()).toEqual(false);
+    expect(wrapper.find('[data-test-subj="lnsDataTable-footer-c"]').first().text()).toEqual(
+      'Sum: 3'
+    );
+  });
+
+  test('it does render a summary footer with just the raw value for empty label', () => {
+    const { data, args } = sampleArgs();
+
+    const wrapper = mountWithIntl(
+      <DatatableComponent
+        data={data}
+        args={{
+          ...args,
+          columns: [
+            ...args.columns.slice(0, 2),
+            {
+              columnId: 'c',
+              type: 'lens_datatable_column',
+              summaryRow: 'sum',
+              summaryLabel: '',
+              summaryRowValue: 3,
+            },
+          ],
+          sortingColumnId: 'b',
+          sortingDirection: 'desc',
+        }}
+        formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
+        dispatchEvent={onDispatchEvent}
+        getType={jest.fn()}
+        renderMode="display"
+        paletteService={chartPluginMock.createPaletteRegistry()}
+        uiSettings={({ get: jest.fn() } as unknown) as IUiSettingsClient}
+      />
+    );
+
+    expect(wrapper.find('[data-test-subj="lnsDataTable-footer-c"]').first().text()).toEqual('3');
+  });
+
+  test('it does not render the summary row if the only column with summary is hidden', () => {
+    const { data, args } = sampleArgs();
+
+    const wrapper = mountWithIntl(
+      <DatatableComponent
+        data={data}
+        args={{
+          ...args,
+          columns: [
+            ...args.columns.slice(0, 2),
+            {
+              columnId: 'c',
+              type: 'lens_datatable_column',
+              summaryRow: 'sum',
+              summaryLabel: '',
+              summaryRowValue: 3,
+              hidden: true,
+            },
+          ],
+          sortingColumnId: 'b',
+          sortingDirection: 'desc',
+        }}
+        formatFactory={() => ({ convert: (x) => x } as IFieldFormat)}
+        dispatchEvent={onDispatchEvent}
+        getType={jest.fn()}
+        renderMode="display"
+        paletteService={chartPluginMock.createPaletteRegistry()}
+        uiSettings={({ get: jest.fn() } as unknown) as IUiSettingsClient}
+      />
+    );
+
+    expect(wrapper.find('[data-test-subj="lnsDataTable-footer-c"]').exists()).toBe(false);
+  });
 });
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 e6fcf3f321f7f..cd990149fdaf5 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
@@ -43,6 +43,7 @@ import {
 } from './table_actions';
 import { findMinMaxByColumnId } from './shared_utils';
 import { CUSTOM_PALETTE } from '../../shared_components/coloring/constants';
+import { getFinalSummaryConfiguration } from '../summary';
 
 export const DataContext = React.createContext<DataContextType>({});
 
@@ -286,6 +287,40 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
     [onEditAction, sortBy, sortDirection]
   );
 
+  const renderSummaryRow = useMemo(() => {
+    const columnsWithSummary = columnConfig.columns
+      .filter((col) => !!col.columnId && !col.hidden)
+      .map((config) => ({
+        columnId: config.columnId,
+        summaryRowValue: config.summaryRowValue,
+        ...getFinalSummaryConfiguration(config.columnId, config, firstTable),
+      }))
+      .filter(({ summaryRow }) => summaryRow !== 'none');
+
+    if (columnsWithSummary.length) {
+      const summaryLookup = Object.fromEntries(
+        columnsWithSummary.map(({ summaryRowValue, summaryLabel, columnId }) => [
+          columnId,
+          summaryLabel === '' ? `${summaryRowValue}` : `${summaryLabel}: ${summaryRowValue}`,
+        ])
+      );
+      return ({ columnId }: { columnId: string }) => {
+        const currentAlignment = alignments && alignments[columnId];
+        const alignmentClassName = `lnsTableCell--${currentAlignment}`;
+        const columnName =
+          columns.find(({ id }) => id === columnId)?.displayAsText?.replace(/ /g, '-') || columnId;
+        return summaryLookup[columnId] != null ? (
+          <div
+            className={`lnsTableCell ${alignmentClassName}`}
+            data-test-subj={`lnsDataTable-footer-${columnName}`}
+          >
+            {summaryLookup[columnId]}
+          </div>
+        ) : null;
+      };
+    }
+  }, [columnConfig.columns, alignments, firstTable, columns]);
+
   if (isEmpty) {
     return <EmptyPlaceholder icon={LensIconChartDatatable} />;
   }
@@ -323,6 +358,7 @@ export const DatatableComponent = (props: DatatableRenderProps) => {
           sorting={sorting}
           onColumnResize={onColumnResize}
           toolbarVisibility={false}
+          renderFooterCellValue={renderSummaryRow}
         />
       </DataContext.Provider>
     </VisualizationContainer>
diff --git a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
index 2d5f4aea98856..79a541b0288ab 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/expression.tsx
@@ -28,10 +28,12 @@ import { ColumnState } from './visualization';
 import type { FormatFactory, ILensInterpreterRenderHandlers, LensMultiTable } from '../types';
 import type { DatatableRender } from './components/types';
 import { transposeTable } from './transpose_helpers';
+import { computeSummaryRowForColumn } from './summary';
 
 export type ColumnConfigArg = Omit<ColumnState, 'palette'> & {
   type: 'lens_datatable_column';
   palette?: PaletteOutput<CustomPaletteState>;
+  summaryRowValue?: unknown;
 };
 
 export interface Args {
@@ -116,6 +118,16 @@ export const getDatatable = ({
       return memo;
     }, {});
 
+    const columnsWithSummary = args.columns.filter((c) => c.summaryRow);
+    for (const column of columnsWithSummary) {
+      column.summaryRowValue = computeSummaryRowForColumn(
+        column,
+        firstTable,
+        formatters,
+        formatFactory({ id: 'number' })
+      );
+    }
+
     if (sortBy && columnsReverseLookup[sortBy] && sortDirection !== 'none') {
       // Sort on raw values for these types, while use the formatted value for the rest
       const sortingCriteria = getSortingCriteria(
@@ -173,6 +185,8 @@ export const datatableColumn: ExpressionFunctionDefinition<
       types: ['palette'],
       help: '',
     },
+    summaryRow: { types: ['string'], help: '' },
+    summaryLabel: { types: ['string'], help: '' },
   },
   fn: function fn(input: unknown, args: ColumnState) {
     return {
diff --git a/x-pack/plugins/lens/public/datatable_visualization/summary.test.ts b/x-pack/plugins/lens/public/datatable_visualization/summary.test.ts
new file mode 100644
index 0000000000000..f92c83fbbfdc8
--- /dev/null
+++ b/x-pack/plugins/lens/public/datatable_visualization/summary.test.ts
@@ -0,0 +1,125 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { IFieldFormat } from 'src/plugins/data/public';
+import { Datatable } from 'src/plugins/expressions';
+import { computeSummaryRowForColumn, getFinalSummaryConfiguration } from './summary';
+
+describe('Summary row helpers', () => {
+  const mockNumericTable: Datatable = {
+    type: 'datatable',
+    columns: [{ id: 'myColumn', name: 'My Column', meta: { type: 'number' } }],
+    rows: [{ myColumn: 45 }],
+  };
+
+  const mockNumericTableWithArray: Datatable = {
+    type: 'datatable',
+    columns: [{ id: 'myColumn', name: 'My Column', meta: { type: 'number' } }],
+    rows: [{ myColumn: [45, 90] }],
+  };
+
+  const mockNonNumericTable: Datatable = {
+    type: 'datatable',
+    columns: [{ id: 'myColumn', name: 'My Column', meta: { type: 'string' } }],
+    rows: [{ myColumn: 'myString' }],
+  };
+
+  const defaultFormatter = { convert: (x) => x } as IFieldFormat;
+  const customNumericFormatter = { convert: (x: number) => x.toFixed(2) } as IFieldFormat;
+
+  describe('getFinalSummaryConfiguration', () => {
+    it('should return the base configuration for an unconfigured column', () => {
+      expect(getFinalSummaryConfiguration('myColumn', {}, mockNumericTable)).toEqual({
+        summaryRow: 'none',
+        summaryLabel: 'None',
+      });
+    });
+
+    it('should return the right configuration for a partially configured column', () => {
+      expect(
+        getFinalSummaryConfiguration('myColumn', { summaryRow: 'sum' }, mockNumericTable)
+      ).toEqual({
+        summaryRow: 'sum',
+        summaryLabel: 'Sum',
+      });
+    });
+
+    it('should return the base configuration for a transitioned invalid column', () => {
+      expect(
+        getFinalSummaryConfiguration('myColumn', { summaryRow: 'sum' }, mockNumericTableWithArray)
+      ).toEqual({
+        summaryRow: 'sum',
+        summaryLabel: 'Sum',
+      });
+    });
+
+    it('should return the base configuration for a non numeric column', () => {
+      expect(
+        getFinalSummaryConfiguration('myColumn', { summaryRow: 'sum' }, mockNonNumericTable)
+      ).toEqual({
+        summaryRow: 'none',
+        summaryLabel: 'None',
+      });
+    });
+  });
+
+  describe('computeSummaryRowForColumn', () => {
+    for (const op of ['avg', 'sum', 'min', 'max'] as const) {
+      it(`should return formatted value for a ${op} summary function`, () => {
+        expect(
+          computeSummaryRowForColumn(
+            { summaryRow: op, columnId: 'myColumn', type: 'lens_datatable_column' },
+            mockNumericTable,
+            {
+              myColumn: customNumericFormatter,
+            },
+            defaultFormatter
+          )
+        ).toBe('45.00');
+      });
+    }
+
+    it('should ignore the column formatter, rather return the raw value for count operation', () => {
+      expect(
+        computeSummaryRowForColumn(
+          { summaryRow: 'count', columnId: 'myColumn', type: 'lens_datatable_column' },
+          mockNumericTable,
+          {
+            myColumn: customNumericFormatter,
+          },
+          defaultFormatter
+        )
+      ).toBe(1);
+    });
+
+    it('should only count non-null/empty values', () => {
+      expect(
+        computeSummaryRowForColumn(
+          { summaryRow: 'count', columnId: 'myColumn', type: 'lens_datatable_column' },
+          { ...mockNumericTable, rows: [...mockNumericTable.rows, { myColumn: null }] },
+          {
+            myColumn: customNumericFormatter,
+          },
+          defaultFormatter
+        )
+      ).toBe(1);
+    });
+
+    it('should count numeric arrays as valid and distinct values', () => {
+      expect(
+        computeSummaryRowForColumn(
+          { summaryRow: 'count', columnId: 'myColumn', type: 'lens_datatable_column' },
+          mockNumericTableWithArray,
+          {
+            myColumn: defaultFormatter,
+          },
+          defaultFormatter
+        )
+      ).toBe(2);
+    });
+  });
+});
diff --git a/x-pack/plugins/lens/public/datatable_visualization/summary.ts b/x-pack/plugins/lens/public/datatable_visualization/summary.ts
new file mode 100644
index 0000000000000..6c267445aab76
--- /dev/null
+++ b/x-pack/plugins/lens/public/datatable_visualization/summary.ts
@@ -0,0 +1,127 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { FieldFormat } from 'src/plugins/data/public';
+import { Datatable } from 'src/plugins/expressions/public';
+import { ColumnConfigArg } from './datatable_visualization';
+import { getOriginalId } from './transpose_helpers';
+import { isNumericField } from './utils';
+
+type SummaryRowType = Extract<ColumnConfigArg['summaryRow'], string>;
+
+export function getFinalSummaryConfiguration(
+  columnId: string,
+  columnArgs: Pick<ColumnConfigArg, 'summaryRow' | 'summaryLabel'> | undefined,
+  table: Datatable | undefined
+) {
+  const isNumeric = isNumericField(table, columnId);
+
+  const summaryRow = isNumeric ? columnArgs?.summaryRow || 'none' : 'none';
+  const summaryLabel = columnArgs?.summaryLabel ?? getDefaultSummaryLabel(summaryRow);
+
+  return {
+    summaryRow,
+    summaryLabel,
+  };
+}
+
+export function getDefaultSummaryLabel(type: SummaryRowType) {
+  return getSummaryRowOptions().find(({ value }) => type === value)!.label!;
+}
+
+export function getSummaryRowOptions(): Array<{
+  value: SummaryRowType;
+  label: string;
+  'data-test-subj': string;
+}> {
+  return [
+    {
+      value: 'none',
+      label: i18n.translate('xpack.lens.table.summaryRow.none', {
+        defaultMessage: 'None',
+      }),
+      'data-test-subj': 'lns-datatable-summary-none',
+    },
+    {
+      value: 'count',
+      label: i18n.translate('xpack.lens.table.summaryRow.count', {
+        defaultMessage: 'Value count',
+      }),
+      'data-test-subj': 'lns-datatable-summary-count',
+    },
+    {
+      value: 'sum',
+      label: i18n.translate('xpack.lens.table.summaryRow.sum', {
+        defaultMessage: 'Sum',
+      }),
+      'data-test-subj': 'lns-datatable-summary-sum',
+    },
+    {
+      value: 'avg',
+      label: i18n.translate('xpack.lens.table.summaryRow.average', {
+        defaultMessage: 'Average',
+      }),
+      'data-test-subj': 'lns-datatable-summary-avg',
+    },
+    {
+      value: 'min',
+      label: i18n.translate('xpack.lens.table.summaryRow.minimum', {
+        defaultMessage: 'Minimum',
+      }),
+      'data-test-subj': 'lns-datatable-summary-min',
+    },
+    {
+      value: 'max',
+      label: i18n.translate('xpack.lens.table.summaryRow.maximum', {
+        defaultMessage: 'Maximum',
+      }),
+      'data-test-subj': 'lns-datatable-summary-max',
+    },
+  ];
+}
+
+export function computeSummaryRowForColumn(
+  columnArgs: ColumnConfigArg,
+  table: Datatable,
+  formatters: Record<string, FieldFormat>,
+  defaultFormatter: FieldFormat
+) {
+  const summaryValue = computeFinalValue(columnArgs.summaryRow, columnArgs.columnId, table.rows);
+  // ignore the coluymn formatter for the count case
+  if (columnArgs.summaryRow === 'count') {
+    return defaultFormatter.convert(summaryValue);
+  }
+  return formatters[getOriginalId(columnArgs.columnId)].convert(summaryValue);
+}
+
+function computeFinalValue(
+  type: ColumnConfigArg['summaryRow'],
+  columnId: string,
+  rows: Datatable['rows']
+) {
+  // flatten the row structure, to easier handle numeric arrays
+  const validRows = rows.filter((v) => v[columnId] != null).flatMap((v) => v[columnId]);
+  const count = validRows.length;
+  const sum = validRows.reduce<number>((partialSum: number, value: number) => {
+    return partialSum + value;
+  }, 0);
+  switch (type) {
+    case 'sum':
+      return sum;
+    case 'count':
+      return count;
+    case 'avg':
+      return sum / count;
+    case 'min':
+      return Math.min(...validRows);
+    case 'max':
+      return Math.max(...validRows);
+    default:
+      throw Error('No summary function found');
+  }
+}
diff --git a/x-pack/plugins/lens/public/datatable_visualization/utils.ts b/x-pack/plugins/lens/public/datatable_visualization/utils.ts
new file mode 100644
index 0000000000000..64fdee233e830
--- /dev/null
+++ b/x-pack/plugins/lens/public/datatable_visualization/utils.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 { Datatable } from 'src/plugins/expressions/public';
+import { getOriginalId } from './transpose_helpers';
+
+function isValidNumber(value: unknown): boolean {
+  return typeof value === 'number' || value == null;
+}
+
+export function isNumericField(currentData: Datatable | undefined, accessor: string) {
+  const isNumeric =
+    currentData?.columns.find((col) => col.id === accessor || getOriginalId(col.id) === accessor)
+      ?.meta.type === 'number';
+
+  return (
+    isNumeric &&
+    currentData?.rows.every((row) => {
+      const val = row[accessor];
+      return isValidNumber(val) || (Array.isArray(val) && val.every(isValidNumber));
+    })
+  );
+}
diff --git a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
index efde4160019e7..e48cb1b28c084 100644
--- a/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/datatable_visualization/visualization.tsx
@@ -23,6 +23,7 @@ import { TableDimensionEditor } from './components/dimension_editor';
 import { CUSTOM_PALETTE } from '../shared_components/coloring/constants';
 import { CustomPaletteParams } from '../shared_components/coloring/types';
 import { getStopsForFixedMode } from '../shared_components';
+import { getDefaultSummaryLabel } from './summary';
 
 export interface ColumnState {
   columnId: string;
@@ -38,6 +39,8 @@ export interface ColumnState {
   alignment?: 'left' | 'right' | 'center';
   palette?: PaletteOutput<CustomPaletteParams>;
   colorMode?: 'none' | 'cell' | 'text';
+  summaryRow?: 'none' | 'sum' | 'avg' | 'count' | 'min' | 'max';
+  summaryLabel?: string;
 }
 
 export interface SortingState {
@@ -358,6 +361,8 @@ export const getDatatableVisualization = ({
                 reverse: false, // managed at UI level
               };
 
+              const hasNoSummaryRow = column.summaryRow == null || column.summaryRow === 'none';
+
               return {
                 type: 'expression',
                 chain: [
@@ -376,6 +381,10 @@ export const getDatatableVisualization = ({
                       alignment: typeof column.alignment === 'undefined' ? [] : [column.alignment],
                       colorMode: [column.colorMode ?? 'none'],
                       palette: [paletteService.get(CUSTOM_PALETTE).toExpression(paletteParams)],
+                      summaryRow: hasNoSummaryRow ? [] : [column.summaryRow!],
+                      summaryLabel: hasNoSummaryRow
+                        ? []
+                        : [column.summaryLabel ?? getDefaultSummaryLabel(column.summaryRow!)],
                     },
                   },
                 ],
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 e171c457c541e..3936fb9e1a1b1 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
@@ -119,6 +119,25 @@ describe('ConfigPanel', () => {
     expect(component.find(LayerPanel).exists()).toBe(false);
   });
 
+  it('allow datasources and visualizations to use setters', () => {
+    const props = getDefaultProps();
+    const component = mountWithIntl(<LayerPanels {...props} />);
+    const { updateDatasource, updateAll } = component.find(LayerPanel).props();
+
+    const updater = () => 'updated';
+    updateDatasource('ds1', updater);
+    expect(props.dispatch).toHaveBeenCalledTimes(1);
+    expect(props.dispatch.mock.calls[0][0].updater(props.datasourceStates.ds1.state)).toEqual(
+      'updated'
+    );
+
+    updateAll('ds1', updater, props.visualizationState);
+    expect(props.dispatch).toHaveBeenCalledTimes(2);
+    expect(props.dispatch.mock.calls[0][0].updater(props.datasourceStates.ds1.state)).toEqual(
+      'updated'
+    );
+  });
+
   describe('focus behavior when adding or removing layers', () => {
     it('should focus the only layer when resetting the layer', () => {
       const component = mountWithIntl(<LayerPanels {...getDefaultProps()} />, {
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx
index d52fd29e7233a..c1ab2b4586ab3 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/config_panel.tsx
@@ -63,7 +63,8 @@ export function LayerPanels(
     () => (datasourceId: string, newState: unknown) => {
       dispatch({
         type: 'UPDATE_DATASOURCE_STATE',
-        updater: () => newState,
+        updater: (prevState: unknown) =>
+          typeof newState === 'function' ? newState(prevState) : newState,
         datasourceId,
         clearStagedPreview: false,
       });
@@ -76,12 +77,16 @@ export function LayerPanels(
         type: 'UPDATE_STATE',
         subType: 'UPDATE_ALL_STATES',
         updater: (prevState) => {
+          const updatedDatasourceState =
+            typeof newDatasourceState === 'function'
+              ? newDatasourceState(prevState.datasourceStates[datasourceId].state)
+              : newDatasourceState;
           return {
             ...prevState,
             datasourceStates: {
               ...prevState.datasourceStates,
               [datasourceId]: {
-                state: newDatasourceState,
+                state: updatedDatasourceState,
                 isLoading: false,
               },
             },
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
index a8d610f2740de..b14d391c2c969 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/dimension_container.tsx
@@ -44,15 +44,6 @@ export function DimensionContainer({
     setFocusTrapIsEnabled(false);
   }, [handleClose]);
 
-  useEffect(() => {
-    if (isOpen) {
-      // without setTimeout here the flyout pushes content when animating
-      setTimeout(() => {
-        setFocusTrapIsEnabled(true);
-      }, 255);
-    }
-  }, [isOpen]);
-
   const closeOnEscape = useCallback(
     (event: KeyboardEvent) => {
       if (event.key === keys.ESCAPE) {
@@ -83,6 +74,13 @@ export function DimensionContainer({
             role="dialog"
             aria-labelledby="lnsDimensionContainerTitle"
             className="lnsDimensionContainer euiFlyout"
+            onAnimationEnd={() => {
+              if (isOpen) {
+                // EuiFocusTrap interferes with animating elements with absolute position:
+                // running this onAnimationEnd, otherwise the flyout pushes content when animating
+                setFocusTrapIsEnabled(true);
+              }
+            }}
           >
             <EuiFlyoutHeader hasBorder className="lnsDimensionContainer__header">
               <EuiFlexGroup
diff --git a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.ts b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.ts
index dd95770655d1a..7d8a373192ee5 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.ts
+++ b/x-pack/plugins/lens/public/editor_frame_service/editor_frame/config_panel/layer_actions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import _ from 'lodash';
+import { mapValues } from 'lodash';
 import { EditorFrameState } from '../state_management';
 import { Datasource, Visualization } from '../../../types';
 
@@ -35,7 +35,7 @@ export function removeLayer(opts: RemoveLayerOptions): EditorFrameState {
 
   return {
     ...state,
-    datasourceStates: _.mapValues(state.datasourceStates, (datasourceState, datasourceId) => {
+    datasourceStates: mapValues(state.datasourceStates, (datasourceState, datasourceId) => {
       const datasource = datasourceMap[datasourceId!];
       return {
         ...datasourceState,
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 e5acd2a2f47fd..0c2eb4f39d895 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
@@ -7,7 +7,7 @@
 
 import './suggestion_panel.scss';
 
-import _, { camelCase } from 'lodash';
+import { camelCase, pick } from 'lodash';
 import React, { useState, useEffect, useMemo, useRef } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
@@ -442,7 +442,7 @@ function getPreviewExpression(
   ) {
     const datasource = datasources[visualizableState.datasourceId];
     const datasourceState = visualizableState.datasourceState;
-    const updatedLayerApis: Record<string, DatasourcePublicAPI> = _.pick(
+    const updatedLayerApis: Record<string, DatasourcePublicAPI> = 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 9f4b60b6d3c67..3fafa8b37a42f 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
@@ -11,6 +11,10 @@
   color: $euiTextSubduedColor;
 }
 
+.lnsChartSwitch__append {
+  display: inline-flex;
+}
+
 // Targeting img as this won't target normal EuiIcon's only the custom svgs's
 img.lnsChartSwitch__chartIcon { // stylelint-disable-line selector-no-qualifying-type
   // The large icons aren't square so max out the width to fill the height
@@ -19,4 +23,4 @@ img.lnsChartSwitch__chartIcon { // stylelint-disable-line selector-no-qualifying
 
 .lnsChartSwitch__search {
   width: 7 * $euiSizeXXL;
-}
\ No newline at end of file
+}
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 5538dd26d0323..ba0e09bdd894c 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
@@ -16,6 +16,7 @@ import {
   EuiSelectable,
   EuiIconTip,
   EuiSelectableOption,
+  EuiBadge,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -286,6 +287,7 @@ export const ChartSwitch = memo(function ChartSwitch(props: Props) {
                 .map(
                   (v): SelectableEntry => ({
                     'aria-label': v.fullLabel || v.label,
+                    className: 'lnsChartSwitch__option',
                     isGroupLabel: false,
                     key: `${v.visualizationId}:${v.id}`,
                     value: `${v.visualizationId}:${v.id}`,
@@ -295,22 +297,45 @@ export const ChartSwitch = memo(function ChartSwitch(props: Props) {
                       <EuiIcon className="lnsChartSwitch__chartIcon" type={v.icon || 'empty'} />
                     ),
                     append:
-                      v.selection.dataLoss !== 'nothing' ? (
-                        <EuiIconTip
-                          aria-label={i18n.translate('xpack.lens.chartSwitch.dataLossLabel', {
-                            defaultMessage: 'Warning',
-                          })}
-                          type="alert"
-                          color="warning"
-                          content={i18n.translate('xpack.lens.chartSwitch.dataLossDescription', {
-                            defaultMessage:
-                              'Selecting this chart type will result in a partial loss of currently applied configuration selections.',
-                          })}
-                          iconProps={{
-                            className: 'lnsChartSwitch__chartIcon',
-                            'data-test-subj': `lnsChartSwitchPopoverAlert_${v.id}`,
-                          }}
-                        />
+                      v.selection.dataLoss !== 'nothing' || v.showBetaBadge ? (
+                        <EuiFlexGroup
+                          gutterSize="xs"
+                          responsive={false}
+                          className="lnsChartSwitch__append"
+                        >
+                          {v.selection.dataLoss !== 'nothing' ? (
+                            <EuiFlexItem grow={false}>
+                              <EuiIconTip
+                                aria-label={i18n.translate('xpack.lens.chartSwitch.dataLossLabel', {
+                                  defaultMessage: 'Warning',
+                                })}
+                                type="alert"
+                                color="warning"
+                                content={i18n.translate(
+                                  'xpack.lens.chartSwitch.dataLossDescription',
+                                  {
+                                    defaultMessage:
+                                      'Selecting this chart type will result in a partial loss of currently applied configuration selections.',
+                                  }
+                                )}
+                                iconProps={{
+                                  className: 'lnsChartSwitch__chartIcon',
+                                  'data-test-subj': `lnsChartSwitchPopoverAlert_${v.id}`,
+                                }}
+                              />
+                            </EuiFlexItem>
+                          ) : null}
+                          {v.showBetaBadge ? (
+                            <EuiFlexItem grow={false}>
+                              <EuiBadge color="hollow">
+                                <FormattedMessage
+                                  id="xpack.lens.chartSwitch.betaLabel"
+                                  defaultMessage="Beta"
+                                />
+                              </EuiBadge>
+                            </EuiFlexItem>
+                          ) : null}
+                        </EuiFlexGroup>
                       ) : null,
                     // Apparently checked: null is not valid for TS
                     ...(subVisualizationId === v.id && { checked: 'on' }),
@@ -363,6 +388,7 @@ export const ChartSwitch = memo(function ChartSwitch(props: Props) {
           </EuiFlexGroup>
         </EuiPopoverTitle>
         <EuiSelectable
+          className="lnsChartSwitch__options"
           height={computeListHeight(visualizationTypes, MAX_LIST_HEIGHT)}
           searchable
           singleSelection
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 94065f316340c..45abbf120042d 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
@@ -18,6 +18,8 @@ import {
   EuiButtonEmpty,
   EuiLink,
   EuiPageContentBody,
+  EuiButton,
+  EuiSpacer,
 } from '@elastic/eui';
 import { CoreStart, ApplicationStart } from 'kibana/public';
 import {
@@ -80,7 +82,11 @@ export interface WorkspacePanelProps {
 }
 
 interface WorkspaceState {
-  expressionBuildError?: Array<{ shortMessage: string; longMessage: string }>;
+  expressionBuildError?: Array<{
+    shortMessage: string;
+    longMessage: string;
+    fixAction?: { label: string; newState: (framePublicAPI: FramePublicAPI) => Promise<unknown> };
+  }>;
   expandError: boolean;
 }
 
@@ -335,6 +341,7 @@ export const InnerWorkspacePanel = React.memo(function InnerWorkspacePanel({
         localState={{ ...localState, configurationValidationError, missingRefsErrors }}
         ExpressionRendererComponent={ExpressionRendererComponent}
         application={core.application}
+        activeDatasourceId={activeDatasourceId}
       />
     );
   };
@@ -398,6 +405,7 @@ export const VisualizationWrapper = ({
   ExpressionRendererComponent,
   dispatch,
   application,
+  activeDatasourceId,
 }: {
   expression: string | null | undefined;
   framePublicAPI: FramePublicAPI;
@@ -406,11 +414,16 @@ export const VisualizationWrapper = ({
   dispatch: (action: Action) => void;
   setLocalState: (dispatch: (prevState: WorkspaceState) => WorkspaceState) => void;
   localState: WorkspaceState & {
-    configurationValidationError?: Array<{ shortMessage: string; longMessage: string }>;
+    configurationValidationError?: Array<{
+      shortMessage: string;
+      longMessage: string;
+      fixAction?: { label: string; newState: (framePublicAPI: FramePublicAPI) => Promise<unknown> };
+    }>;
     missingRefsErrors?: Array<{ shortMessage: string; longMessage: string }>;
   };
   ExpressionRendererComponent: ReactExpressionRendererType;
   application: ApplicationStart;
+  activeDatasourceId: string | null;
 }) => {
   const context: ExecutionContextSearch = useMemo(
     () => ({
@@ -440,6 +453,41 @@ export const VisualizationWrapper = ({
     [dispatchLens]
   );
 
+  function renderFixAction(
+    validationError:
+      | {
+          shortMessage: string;
+          longMessage: string;
+          fixAction?:
+            | { label: string; newState: (framePublicAPI: FramePublicAPI) => Promise<unknown> }
+            | undefined;
+        }
+      | undefined
+  ) {
+    return (
+      validationError &&
+      validationError.fixAction &&
+      activeDatasourceId && (
+        <>
+          <EuiButton
+            data-test-subj="errorFixAction"
+            onClick={async () => {
+              const newState = await validationError.fixAction?.newState(framePublicAPI);
+              dispatch({
+                type: 'UPDATE_DATASOURCE_STATE',
+                datasourceId: activeDatasourceId,
+                updater: newState,
+              });
+            }}
+          >
+            {validationError.fixAction.label}
+          </EuiButton>
+          <EuiSpacer />
+        </>
+      )
+    );
+  }
+
   if (localState.configurationValidationError?.length) {
     let showExtraErrors = null;
     let showExtraErrorsAction = null;
@@ -448,14 +496,17 @@ export const VisualizationWrapper = ({
       if (localState.expandError) {
         showExtraErrors = localState.configurationValidationError
           .slice(1)
-          .map(({ longMessage }) => (
-            <p
-              key={longMessage}
-              className="eui-textBreakWord"
-              data-test-subj="configuration-failure-error"
-            >
-              {longMessage}
-            </p>
+          .map((validationError) => (
+            <>
+              <p
+                key={validationError.longMessage}
+                className="eui-textBreakWord"
+                data-test-subj="configuration-failure-error"
+              >
+                {validationError.longMessage}
+              </p>
+              {renderFixAction(validationError)}
+            </>
           ));
       } else {
         showExtraErrorsAction = (
@@ -487,6 +538,7 @@ export const VisualizationWrapper = ({
                 <p className="eui-textBreakWord" data-test-subj="configuration-failure-error">
                   {localState.configurationValidationError[0].longMessage}
                 </p>
+                {renderFixAction(localState.configurationValidationError?.[0])}
 
                 {showExtraErrors}
               </>
@@ -546,6 +598,7 @@ export const VisualizationWrapper = ({
   }
 
   if (localState.expressionBuildError?.length) {
+    const firstError = localState.expressionBuildError[0];
     return (
       <EuiFlexGroup>
         <EuiFlexItem>
@@ -559,7 +612,7 @@ export const VisualizationWrapper = ({
                   />
                 </p>
 
-                <p>{localState.expressionBuildError[0].longMessage}</p>
+                <p>{firstError.longMessage}</p>
               </>
             }
             iconColor="danger"
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 85f7601d8fb29..ec12e9e400203 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
@@ -60,9 +60,20 @@ export function WorkspacePanelWrapper({
     },
     [dispatch, activeVisualization]
   );
-  const warningMessages =
-    activeVisualization?.getWarningMessages &&
-    activeVisualization.getWarningMessages(visualizationState, framePublicAPI);
+  const warningMessages: React.ReactNode[] = [];
+  if (activeVisualization?.getWarningMessages) {
+    warningMessages.push(
+      ...(activeVisualization.getWarningMessages(visualizationState, framePublicAPI) || [])
+    );
+  }
+  Object.entries(datasourceStates).forEach(([datasourceId, datasourceState]) => {
+    const datasource = datasourceMap[datasourceId];
+    if (!datasourceState.isLoading && datasource.getWarningMessages) {
+      warningMessages.push(
+        ...(datasource.getWarningMessages(datasourceState.state, framePublicAPI) || [])
+      );
+    }
+  });
   return (
     <>
       <div>
diff --git a/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx b/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx
index 3c4412813bb83..89a04f3820169 100644
--- a/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx
+++ b/x-pack/plugins/lens/public/editor_frame_service/embeddable/embeddable.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import _ from 'lodash';
+import { isEqual, uniqBy } from 'lodash';
 import React from 'react';
 import { render, unmountComponentAtNode } from 'react-dom';
 import {
@@ -23,7 +23,7 @@ import { Subscription } from 'rxjs';
 import { toExpression, Ast } from '@kbn/interpreter/common';
 import { DefaultInspectorAdapters, RenderMode } from 'src/plugins/expressions';
 import { map, distinctUntilChanged, skip } from 'rxjs/operators';
-import isEqual from 'fast-deep-equal';
+import fastIsEqual from 'fast-deep-equal';
 import { UsageCollectionSetup } from 'src/plugins/usage_collection/public';
 import { METRIC_TYPE } from '@kbn/analytics';
 import {
@@ -161,7 +161,7 @@ export class Embeddable
       input$
         .pipe(
           map((input) => input.enhancements?.dynamicActions),
-          distinctUntilChanged((a, b) => isEqual(a, b)),
+          distinctUntilChanged((a, b) => fastIsEqual(a, b)),
           skip(1)
         )
         .subscribe((input) => {
@@ -195,7 +195,7 @@ export class Embeddable
       input$
         .pipe(
           distinctUntilChanged((a, b) =>
-            isEqual(
+            fastIsEqual(
               ['attributes' in a && a.attributes, 'savedObjectId' in a && a.savedObjectId],
               ['attributes' in b && b.attributes, 'savedObjectId' in b && b.savedObjectId]
             )
@@ -214,7 +214,7 @@ export class Embeddable
         .pipe(map(() => this.getInput()))
         .pipe(
           distinctUntilChanged((a, b) =>
-            isEqual(
+            fastIsEqual(
               [a.filters, a.query, a.timeRange, a.searchSessionId],
               [b.filters, b.query, b.timeRange, b.searchSessionId]
             )
@@ -283,9 +283,9 @@ export class Embeddable
       ? containerState.filters.filter((filter) => !filter.meta.disabled)
       : undefined;
     if (
-      !_.isEqual(containerState.timeRange, this.externalSearchContext.timeRange) ||
-      !_.isEqual(containerState.query, this.externalSearchContext.query) ||
-      !_.isEqual(cleanedFilters, this.externalSearchContext.filters) ||
+      !isEqual(containerState.timeRange, this.externalSearchContext.timeRange) ||
+      !isEqual(containerState.query, this.externalSearchContext.query) ||
+      !isEqual(cleanedFilters, this.externalSearchContext.filters) ||
       this.externalSearchContext.searchSessionId !== containerState.searchSessionId
     ) {
       this.externalSearchContext = {
@@ -446,7 +446,7 @@ export class Embeddable
       return;
     }
     const responses = await Promise.allSettled(
-      _.uniqBy(
+      uniqBy(
         this.savedVis.references.filter(({ type }) => type === 'index-pattern'),
         'id'
       ).map(({ id }) => this.deps.indexPatternService.get(id))
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
new file mode 100644
index 0000000000000..3048f3b3db580
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/chart_component.tsx
@@ -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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { FC, useEffect, useState } from 'react';
+import {
+  Chart,
+  ElementClickListener,
+  Heatmap,
+  HeatmapBrushEvent,
+  HeatmapElementEvent,
+  HeatmapSpec,
+  ScaleType,
+  Settings,
+} from '@elastic/charts';
+import { euiPaletteForTemperature } from '@elastic/eui';
+import { VisualizationContainer } from '../visualization_container';
+import { HeatmapRenderProps } from './types';
+import './index.scss';
+import { LensBrushEvent, LensFilterEvent } from '../types';
+import { desanitizeFilterContext } from '../utils';
+import { EmptyPlaceholder } from '../shared_components';
+import { LensIconChartHeatmap } from '../assets/chart_heatmap';
+
+declare global {
+  interface Window {
+    /**
+     * Flag used to enable debugState on elastic charts
+     */
+    _echDebugStateFlag?: boolean;
+  }
+}
+
+export const HeatmapComponent: FC<HeatmapRenderProps> = ({
+  data,
+  args,
+  timeZone,
+  formatFactory,
+  chartsThemeService,
+  onClickValue,
+  onSelectRange,
+}) => {
+  const chartTheme = chartsThemeService.useChartsTheme();
+  const isDarkTheme = chartsThemeService.useDarkMode();
+
+  const tableId = Object.keys(data.tables)[0];
+  const table = data.tables[tableId];
+
+  const xAxisColumnIndex = table.columns.findIndex((v) => v.id === args.xAccessor);
+  const yAxisColumnIndex = table.columns.findIndex((v) => v.id === args.yAccessor);
+
+  const xAxisColumn = table.columns[xAxisColumnIndex];
+  const yAxisColumn = table.columns[yAxisColumnIndex];
+  const valueColumn = table.columns.find((v) => v.id === args.valueAccessor);
+
+  if (!xAxisColumn || !valueColumn) {
+    // Chart is not ready
+    return null;
+  }
+
+  let chartData = table.rows.filter((v) => typeof v[args.valueAccessor!] === 'number');
+
+  if (!yAxisColumn) {
+    // required for tooltip
+    chartData = chartData.map((row) => {
+      return {
+        ...row,
+        unifiedY: '',
+      };
+    });
+  }
+
+  const xAxisMeta = xAxisColumn.meta;
+  const isTimeBasedSwimLane = xAxisMeta.type === 'date';
+
+  // Fallback to the ordinal scale type when a single row of data is provided.
+  // Related issue https://github.com/elastic/elastic-charts/issues/1184
+  const xScaleType =
+    isTimeBasedSwimLane && chartData.length > 1 ? ScaleType.Time : ScaleType.Ordinal;
+
+  const xValuesFormatter = formatFactory(xAxisMeta.params);
+  const valueFormatter = formatFactory(valueColumn.meta.params);
+
+  const onElementClick = ((e: HeatmapElementEvent[]) => {
+    const cell = e[0][0];
+    const { x, y } = cell.datum;
+
+    const xAxisFieldName = xAxisColumn.meta.field;
+    const timeFieldName = isTimeBasedSwimLane ? xAxisFieldName : '';
+
+    const points = [
+      {
+        row: table.rows.findIndex((r) => r[xAxisColumn.id] === x),
+        column: xAxisColumnIndex,
+        value: x,
+      },
+      ...(yAxisColumn
+        ? [
+            {
+              row: table.rows.findIndex((r) => r[yAxisColumn.id] === y),
+              column: yAxisColumnIndex,
+              value: y,
+            },
+          ]
+        : []),
+    ];
+
+    const context: LensFilterEvent['data'] = {
+      data: points.map((point) => ({
+        row: point.row,
+        column: point.column,
+        value: point.value,
+        table,
+      })),
+      timeFieldName,
+    };
+    onClickValue(desanitizeFilterContext(context));
+  }) as ElementClickListener;
+
+  const onBrushEnd = (e: HeatmapBrushEvent) => {
+    const { x, y } = e;
+
+    const xAxisFieldName = xAxisColumn.meta.field;
+    const timeFieldName = isTimeBasedSwimLane ? xAxisFieldName : '';
+
+    if (isTimeBasedSwimLane) {
+      const context: LensBrushEvent['data'] = {
+        range: x as number[],
+        table,
+        column: xAxisColumnIndex,
+        timeFieldName,
+      };
+      onSelectRange(context);
+    } else {
+      const points: Array<{ row: number; column: number; value: string | number }> = [];
+
+      if (yAxisColumn) {
+        (y as string[]).forEach((v) => {
+          points.push({
+            row: table.rows.findIndex((r) => r[yAxisColumn.id] === v),
+            column: yAxisColumnIndex,
+            value: v,
+          });
+        });
+      }
+
+      (x as string[]).forEach((v) => {
+        points.push({
+          row: table.rows.findIndex((r) => r[xAxisColumn.id] === v),
+          column: xAxisColumnIndex,
+          value: v,
+        });
+      });
+
+      const context: LensFilterEvent['data'] = {
+        data: points.map((point) => ({
+          row: point.row,
+          column: point.column,
+          value: point.value,
+          table,
+        })),
+        timeFieldName,
+      };
+      onClickValue(desanitizeFilterContext(context));
+    }
+  };
+
+  const config: HeatmapSpec['config'] = {
+    onBrushEnd,
+    grid: {
+      stroke: {
+        width:
+          args.gridConfig.strokeWidth ?? chartTheme.axes?.gridLine?.horizontal?.strokeWidth ?? 1,
+        color:
+          args.gridConfig.strokeColor ?? chartTheme.axes?.gridLine?.horizontal?.stroke ?? '#D3DAE6',
+      },
+      cellHeight: {
+        max: 'fill',
+        min: 1,
+      },
+    },
+    cell: {
+      maxWidth: 'fill',
+      maxHeight: 'fill',
+      label: {
+        visible: args.gridConfig.isCellLabelVisible ?? false,
+      },
+      border: {
+        strokeWidth: 0,
+      },
+    },
+    yAxisLabel: {
+      visible: !!yAxisColumn && args.gridConfig.isYAxisLabelVisible,
+      // eui color subdued
+      fill: chartTheme.axes?.tickLabel?.fill ?? '#6a717d',
+      padding: yAxisColumn?.name ? 8 : 0,
+      name: yAxisColumn?.name ?? '',
+      ...(yAxisColumn
+        ? {
+            formatter: (v: number | string) => formatFactory(yAxisColumn.meta.params).convert(v),
+          }
+        : {}),
+    },
+    xAxisLabel: {
+      visible: args.gridConfig.isXAxisLabelVisible,
+      // eui color subdued
+      fill: chartTheme.axes?.tickLabel?.fill ?? `#6a717d`,
+      formatter: (v: number | string) => xValuesFormatter.convert(v),
+      name: xAxisColumn.name,
+    },
+    brushMask: {
+      fill: isDarkTheme ? 'rgb(30,31,35,80%)' : 'rgb(247,247,247,50%)',
+    },
+    brushArea: {
+      stroke: isDarkTheme ? 'rgb(255, 255, 255)' : 'rgb(105, 112, 125)',
+    },
+    timeZone,
+  };
+
+  if (!chartData || !chartData.length) {
+    return <EmptyPlaceholder icon={LensIconChartHeatmap} />;
+  }
+
+  const colorPalette = euiPaletteForTemperature(5);
+
+  return (
+    <Chart>
+      <Settings
+        onElementClick={onElementClick}
+        showLegend={args.legend.isVisible}
+        legendPosition={args.legend.position}
+        debugState={window._echDebugStateFlag ?? false}
+      />
+      <Heatmap
+        id={tableId}
+        name={valueColumn.name}
+        colorScale={ScaleType.Quantize}
+        colors={colorPalette}
+        data={chartData}
+        xAccessor={args.xAccessor}
+        yAccessor={args.yAccessor || 'unifiedY'}
+        valueAccessor={args.valueAccessor}
+        valueFormatter={(v: number) => valueFormatter.convert(v)}
+        xScaleType={xScaleType}
+        ySortPredicate="dataIndex"
+        config={config}
+        xSortPredicate="dataIndex"
+      />
+    </Chart>
+  );
+};
+
+const MemoizedChart = React.memo(HeatmapComponent);
+
+export function HeatmapChartReportable(props: HeatmapRenderProps) {
+  const [state, setState] = useState({
+    isReady: false,
+  });
+
+  // It takes a cycle for the XY chart to render. This prevents
+  // reporting from printing a blank chart placeholder.
+  useEffect(() => {
+    setState({ isReady: true });
+  }, [setState]);
+
+  return (
+    <VisualizationContainer
+      className="lnsHeatmapExpression__container"
+      isReady={state.isReady}
+      reportTitle={props.args.title}
+      reportDescription={props.args.description}
+    >
+      <MemoizedChart {...props} />
+    </VisualizationContainer>
+  );
+}
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/constants.ts b/x-pack/plugins/lens/public/heatmap_visualization/constants.ts
new file mode 100644
index 0000000000000..ee1be917f5bfd
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/constants.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 { i18n } from '@kbn/i18n';
+import { LensIconChartHeatmap } from '../assets/chart_heatmap';
+
+export const LENS_HEATMAP_RENDERER = 'lens_heatmap_renderer';
+
+export const LENS_HEATMAP_ID = 'lnsHeatmap';
+
+const groupLabel = i18n.translate('xpack.lens.heatmap.groupLabel', {
+  defaultMessage: 'Heatmap',
+});
+
+export const CHART_SHAPES = {
+  HEATMAP: 'heatmap',
+} as const;
+
+export const CHART_NAMES = {
+  heatmap: {
+    shapeType: CHART_SHAPES.HEATMAP,
+    icon: LensIconChartHeatmap,
+    label: i18n.translate('xpack.lens.heatmap.heatmapLabel', {
+      defaultMessage: 'Heatmap',
+    }),
+    groupLabel,
+  },
+};
+
+export const GROUP_ID = {
+  X: 'x',
+  Y: 'y',
+  CELL: 'cell',
+} as const;
+
+export const FUNCTION_NAME = 'lens_heatmap';
+
+export const LEGEND_FUNCTION = 'lens_heatmap_legendConfig';
+
+export const HEATMAP_GRID_FUNCTION = 'lens_heatmap_grid';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/expression.tsx b/x-pack/plugins/lens/public/heatmap_visualization/expression.tsx
new file mode 100644
index 0000000000000..f0521dadf88bf
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/expression.tsx
@@ -0,0 +1,275 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { I18nProvider } from '@kbn/i18n/react';
+import ReactDOM from 'react-dom';
+import React from 'react';
+import { Position } from '@elastic/charts';
+import {
+  ExpressionFunctionDefinition,
+  IInterpreterRenderHandlers,
+} from '../../../../../src/plugins/expressions';
+import { FormatFactory, LensBrushEvent, LensFilterEvent, LensMultiTable } from '../types';
+import {
+  FUNCTION_NAME,
+  HEATMAP_GRID_FUNCTION,
+  LEGEND_FUNCTION,
+  LENS_HEATMAP_RENDERER,
+} from './constants';
+import type {
+  HeatmapExpressionArgs,
+  HeatmapExpressionProps,
+  HeatmapGridConfig,
+  HeatmapGridConfigResult,
+  HeatmapRender,
+  LegendConfigResult,
+} from './types';
+import { HeatmapLegendConfig } from './types';
+import { ChartsPluginSetup, PaletteRegistry } from '../../../../../src/plugins/charts/public';
+import { HeatmapChartReportable } from './chart_component';
+
+export const heatmapGridConfig: ExpressionFunctionDefinition<
+  typeof HEATMAP_GRID_FUNCTION,
+  null,
+  HeatmapGridConfig,
+  HeatmapGridConfigResult
+> = {
+  name: HEATMAP_GRID_FUNCTION,
+  aliases: [],
+  type: HEATMAP_GRID_FUNCTION,
+  help: `Configure the heatmap layout `,
+  inputTypes: ['null'],
+  args: {
+    // grid
+    strokeWidth: {
+      types: ['number'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.strokeWidth.help', {
+        defaultMessage: 'Specifies the grid stroke width',
+      }),
+      required: false,
+    },
+    strokeColor: {
+      types: ['string'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.strokeColor.help', {
+        defaultMessage: 'Specifies the grid stroke color',
+      }),
+      required: false,
+    },
+    cellHeight: {
+      types: ['number'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.cellHeight.help', {
+        defaultMessage: 'Specifies the grid cell height',
+      }),
+      required: false,
+    },
+    cellWidth: {
+      types: ['number'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.cellWidth.help', {
+        defaultMessage: 'Specifies the grid cell width',
+      }),
+      required: false,
+    },
+    // cells
+    isCellLabelVisible: {
+      types: ['boolean'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.isCellLabelVisible.help', {
+        defaultMessage: 'Specifies whether or not the cell label is visible.',
+      }),
+    },
+    // Y-axis
+    isYAxisLabelVisible: {
+      types: ['boolean'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.isYAxisLabelVisible.help', {
+        defaultMessage: 'Specifies whether or not the Y-axis labels are visible.',
+      }),
+    },
+    yAxisLabelWidth: {
+      types: ['number'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.yAxisLabelWidth.help', {
+        defaultMessage: 'Specifies the width of the Y-axis labels.',
+      }),
+      required: false,
+    },
+    yAxisLabelColor: {
+      types: ['string'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.yAxisLabelColor.help', {
+        defaultMessage: 'Specifies the color of the Y-axis labels.',
+      }),
+      required: false,
+    },
+    // X-axis
+    isXAxisLabelVisible: {
+      types: ['boolean'],
+      help: i18n.translate('xpack.lens.heatmapChart.config.isXAxisLabelVisible.help', {
+        defaultMessage: 'Specifies whether or not the X-axis labels are visible.',
+      }),
+    },
+  },
+  fn(input, args) {
+    return {
+      type: HEATMAP_GRID_FUNCTION,
+      ...args,
+    };
+  },
+};
+
+/**
+ * TODO check if it's possible to make a shared function
+ * based on the XY chart
+ */
+export const heatmapLegendConfig: ExpressionFunctionDefinition<
+  typeof LEGEND_FUNCTION,
+  null,
+  HeatmapLegendConfig,
+  LegendConfigResult
+> = {
+  name: LEGEND_FUNCTION,
+  aliases: [],
+  type: LEGEND_FUNCTION,
+  help: `Configure the heatmap chart's legend`,
+  inputTypes: ['null'],
+  args: {
+    isVisible: {
+      types: ['boolean'],
+      help: i18n.translate('xpack.lens.heatmapChart.legend.isVisible.help', {
+        defaultMessage: 'Specifies whether or not the legend is visible.',
+      }),
+    },
+    position: {
+      types: ['string'],
+      options: [Position.Top, Position.Right, Position.Bottom, Position.Left],
+      help: i18n.translate('xpack.lens.heatmapChart.legend.position.help', {
+        defaultMessage: 'Specifies the legend position.',
+      }),
+    },
+  },
+  fn(input, args) {
+    return {
+      type: LEGEND_FUNCTION,
+      ...args,
+    };
+  },
+};
+
+export const heatmap: ExpressionFunctionDefinition<
+  typeof FUNCTION_NAME,
+  LensMultiTable,
+  HeatmapExpressionArgs,
+  HeatmapRender
+> = {
+  name: FUNCTION_NAME,
+  type: 'render',
+  help: i18n.translate('xpack.lens.heatmap.expressionHelpLabel', {
+    defaultMessage: 'Heatmap renderer',
+  }),
+  args: {
+    title: {
+      types: ['string'],
+      help: i18n.translate('xpack.lens.heatmap.titleLabel', {
+        defaultMessage: 'Title',
+      }),
+    },
+    description: {
+      types: ['string'],
+      help: '',
+    },
+    xAccessor: {
+      types: ['string'],
+      help: '',
+    },
+    yAccessor: {
+      types: ['string'],
+      help: '',
+    },
+    valueAccessor: {
+      types: ['string'],
+      help: '',
+    },
+    shape: {
+      types: ['string'],
+      help: '',
+    },
+    palette: {
+      default: `{theme "palette" default={system_palette name="default"} }`,
+      help: '',
+      types: ['palette'],
+    },
+    legend: {
+      types: [LEGEND_FUNCTION],
+      help: i18n.translate('xpack.lens.heatmapChart.legend.help', {
+        defaultMessage: 'Configure the chart legend.',
+      }),
+    },
+    gridConfig: {
+      types: [HEATMAP_GRID_FUNCTION],
+      help: i18n.translate('xpack.lens.heatmapChart.gridConfig.help', {
+        defaultMessage: 'Configure the heatmap layout.',
+      }),
+    },
+  },
+  inputTypes: ['lens_multitable'],
+  fn(data: LensMultiTable, args: HeatmapExpressionArgs) {
+    return {
+      type: 'render',
+      as: LENS_HEATMAP_RENDERER,
+      value: {
+        data,
+        args,
+      },
+    };
+  },
+};
+
+export const getHeatmapRenderer = (dependencies: {
+  formatFactory: Promise<FormatFactory>;
+  chartsThemeService: ChartsPluginSetup['theme'];
+  paletteService: PaletteRegistry;
+  timeZone: string;
+}) => ({
+  name: LENS_HEATMAP_RENDERER,
+  displayName: i18n.translate('xpack.lens.heatmap.visualizationName', {
+    defaultMessage: 'Heatmap',
+  }),
+  help: '',
+  validate: () => undefined,
+  reuseDomNode: true,
+  render: async (
+    domNode: Element,
+    config: HeatmapExpressionProps,
+    handlers: IInterpreterRenderHandlers
+  ) => {
+    const formatFactory = await dependencies.formatFactory;
+    const onClickValue = (data: LensFilterEvent['data']) => {
+      handlers.event({ name: 'filter', data });
+    };
+    const onSelectRange = (data: LensBrushEvent['data']) => {
+      handlers.event({ name: 'brush', data });
+    };
+
+    ReactDOM.render(
+      <I18nProvider>
+        {
+          <HeatmapChartReportable
+            {...config}
+            onClickValue={onClickValue}
+            onSelectRange={onSelectRange}
+            timeZone={dependencies.timeZone}
+            formatFactory={formatFactory}
+            chartsThemeService={dependencies.chartsThemeService}
+          />
+        }
+      </I18nProvider>,
+      domNode,
+      () => {
+        handlers.done();
+      }
+    );
+
+    handlers.onDestroy(() => ReactDOM.unmountComponentAtNode(domNode));
+  },
+});
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/heatmap_visualization.ts b/x-pack/plugins/lens/public/heatmap_visualization/heatmap_visualization.ts
new file mode 100644
index 0000000000000..894b003b4b371
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/heatmap_visualization.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 './expression';
+export * from './types';
+export * from './visualization';
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/index.scss b/x-pack/plugins/lens/public/heatmap_visualization/index.scss
new file mode 100644
index 0000000000000..e72356b1a3d7e
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/index.scss
@@ -0,0 +1,8 @@
+.lnsHeatmapExpression__container {
+  height: 100%;
+  width: 100%;
+  // the FocusTrap is adding extra divs which are making the visualization redraw twice
+  // with a visible glitch. This make the chart library resilient to this extra reflow
+  overflow-x: hidden;
+
+}
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/index.ts b/x-pack/plugins/lens/public/heatmap_visualization/index.ts
new file mode 100644
index 0000000000000..4599bd8d2a208
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/index.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 { CoreSetup } from 'kibana/public';
+import { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
+import { EditorFrameSetup, FormatFactory } from '../types';
+import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+import { getTimeZone } from '../utils';
+
+export interface HeatmapVisualizationPluginSetupPlugins {
+  expressions: ExpressionsSetup;
+  formatFactory: Promise<FormatFactory>;
+  editorFrame: EditorFrameSetup;
+  charts: ChartsPluginSetup;
+}
+
+export class HeatmapVisualization {
+  constructor() {}
+
+  setup(
+    core: CoreSetup,
+    { expressions, formatFactory, editorFrame, charts }: HeatmapVisualizationPluginSetupPlugins
+  ) {
+    editorFrame.registerVisualization(async () => {
+      const timeZone = getTimeZone(core.uiSettings);
+
+      const {
+        getHeatmapVisualization,
+        heatmap,
+        heatmapLegendConfig,
+        heatmapGridConfig,
+        getHeatmapRenderer,
+      } = await import('../async_services');
+      const palettes = await charts.palettes.getPalettes();
+
+      expressions.registerFunction(() => heatmap);
+      expressions.registerFunction(() => heatmapLegendConfig);
+      expressions.registerFunction(() => heatmapGridConfig);
+
+      expressions.registerRenderer(
+        getHeatmapRenderer({
+          formatFactory,
+          chartsThemeService: charts.theme,
+          paletteService: palettes,
+          timeZone,
+        })
+      );
+      return getHeatmapVisualization({ paletteService: palettes });
+    });
+  }
+}
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/suggestions.test.ts b/x-pack/plugins/lens/public/heatmap_visualization/suggestions.test.ts
new file mode 100644
index 0000000000000..c11078be6c8b9
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/suggestions.test.ts
@@ -0,0 +1,330 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { getSuggestions } from './suggestions';
+import { HeatmapVisualizationState } from './types';
+import { HEATMAP_GRID_FUNCTION, LEGEND_FUNCTION } from './constants';
+import { Position } from '@elastic/charts';
+
+describe('heatmap suggestions', () => {
+  describe('rejects suggestions', () => {
+    test('when currently active and unchanged data', () => {
+      expect(
+        getSuggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [],
+            changeType: 'unchanged',
+          },
+          state: {
+            shape: 'heatmap',
+            layerId: 'first',
+          } as HeatmapVisualizationState,
+          keptLayerIds: ['first'],
+        })
+      ).toHaveLength(0);
+    });
+
+    test('when there are 3 or more buckets', () => {
+      expect(
+        getSuggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [
+              {
+                columnId: 'date-column-01',
+                operation: {
+                  isBucketed: true,
+                  dataType: 'date',
+                  scale: 'interval',
+                  label: 'Date',
+                },
+              },
+              {
+                columnId: 'date-column-02',
+                operation: {
+                  isBucketed: true,
+                  dataType: 'date',
+                  scale: 'interval',
+                  label: 'Date',
+                },
+              },
+              {
+                columnId: 'another-bucket-column',
+                operation: {
+                  isBucketed: true,
+                  dataType: 'string',
+                  scale: 'ratio',
+                  label: 'Bucket',
+                },
+              },
+              {
+                columnId: 'metric-column',
+                operation: {
+                  isBucketed: false,
+                  dataType: 'number',
+                  scale: 'ratio',
+                  label: 'Metric',
+                },
+              },
+            ],
+            changeType: 'initial',
+          },
+          state: {
+            layerId: 'first',
+          } as HeatmapVisualizationState,
+          keptLayerIds: ['first'],
+        })
+      ).toEqual([]);
+    });
+
+    test('when currently active with partial configuration and not extended change type', () => {
+      expect(
+        getSuggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [],
+            changeType: 'initial',
+          },
+          state: {
+            shape: 'heatmap',
+            layerId: 'first',
+            xAccessor: 'some-field',
+          } as HeatmapVisualizationState,
+          keptLayerIds: ['first'],
+        })
+      ).toHaveLength(0);
+    });
+  });
+
+  describe('hides suggestions', () => {
+    test('when table is reduced', () => {
+      expect(
+        getSuggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [],
+            changeType: 'reduced',
+          },
+          state: {
+            layerId: 'first',
+          } as HeatmapVisualizationState,
+          keptLayerIds: ['first'],
+        })
+      ).toEqual([
+        {
+          state: {
+            layerId: 'first',
+            shape: 'heatmap',
+            gridConfig: {
+              type: HEATMAP_GRID_FUNCTION,
+              isCellLabelVisible: false,
+              isYAxisLabelVisible: true,
+              isXAxisLabelVisible: true,
+            },
+            legend: {
+              isVisible: true,
+              position: Position.Right,
+              type: LEGEND_FUNCTION,
+            },
+          },
+          title: 'Heatmap',
+          hide: true,
+          previewIcon: 'empty',
+          score: 0,
+        },
+      ]);
+    });
+    test('for tables with a single bucket dimension', () => {
+      expect(
+        getSuggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [
+              {
+                columnId: 'test-column',
+                operation: {
+                  isBucketed: true,
+                  dataType: 'date',
+                  scale: 'interval',
+                  label: 'Date',
+                },
+              },
+            ],
+            changeType: 'reduced',
+          },
+          state: {
+            layerId: 'first',
+          } as HeatmapVisualizationState,
+          keptLayerIds: ['first'],
+        })
+      ).toEqual([
+        {
+          state: {
+            layerId: 'first',
+            shape: 'heatmap',
+            xAccessor: 'test-column',
+            gridConfig: {
+              type: HEATMAP_GRID_FUNCTION,
+              isCellLabelVisible: false,
+              isYAxisLabelVisible: true,
+              isXAxisLabelVisible: true,
+            },
+            legend: {
+              isVisible: true,
+              position: Position.Right,
+              type: LEGEND_FUNCTION,
+            },
+          },
+          title: 'Heatmap',
+          hide: true,
+          previewIcon: 'empty',
+          score: 0.3,
+        },
+      ]);
+    });
+  });
+
+  describe('shows suggestions', () => {
+    test('when at least one axis and value accessor are available', () => {
+      expect(
+        getSuggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [
+              {
+                columnId: 'date-column',
+                operation: {
+                  isBucketed: true,
+                  dataType: 'date',
+                  scale: 'interval',
+                  label: 'Date',
+                },
+              },
+              {
+                columnId: 'metric-column',
+                operation: {
+                  isBucketed: false,
+                  dataType: 'number',
+                  scale: 'ratio',
+                  label: 'Metric',
+                },
+              },
+            ],
+            changeType: 'initial',
+          },
+          state: {
+            layerId: 'first',
+          } as HeatmapVisualizationState,
+          keptLayerIds: ['first'],
+        })
+      ).toEqual([
+        {
+          state: {
+            layerId: 'first',
+            shape: 'heatmap',
+            xAccessor: 'date-column',
+            valueAccessor: 'metric-column',
+            gridConfig: {
+              type: HEATMAP_GRID_FUNCTION,
+              isCellLabelVisible: false,
+              isYAxisLabelVisible: true,
+              isXAxisLabelVisible: true,
+            },
+            legend: {
+              isVisible: true,
+              position: Position.Right,
+              type: LEGEND_FUNCTION,
+            },
+          },
+          title: 'Heatmap',
+          // Temp hide all suggestions while heatmap is in beta
+          hide: true,
+          previewIcon: 'empty',
+          score: 0.6,
+        },
+      ]);
+    });
+
+    test('when complete configuration has been resolved', () => {
+      expect(
+        getSuggestions({
+          table: {
+            layerId: 'first',
+            isMultiRow: true,
+            columns: [
+              {
+                columnId: 'date-column',
+                operation: {
+                  isBucketed: true,
+                  dataType: 'date',
+                  scale: 'interval',
+                  label: 'Date',
+                },
+              },
+              {
+                columnId: 'metric-column',
+                operation: {
+                  isBucketed: false,
+                  dataType: 'number',
+                  scale: 'ratio',
+                  label: 'Metric',
+                },
+              },
+              {
+                columnId: 'group-column',
+                operation: {
+                  isBucketed: true,
+                  dataType: 'string',
+                  scale: 'ratio',
+                  label: 'Group',
+                },
+              },
+            ],
+            changeType: 'initial',
+          },
+          state: {
+            layerId: 'first',
+          } as HeatmapVisualizationState,
+          keptLayerIds: ['first'],
+        })
+      ).toEqual([
+        {
+          state: {
+            layerId: 'first',
+            shape: 'heatmap',
+            xAccessor: 'date-column',
+            yAccessor: 'group-column',
+            valueAccessor: 'metric-column',
+            gridConfig: {
+              type: HEATMAP_GRID_FUNCTION,
+              isCellLabelVisible: false,
+              isYAxisLabelVisible: true,
+              isXAxisLabelVisible: true,
+            },
+            legend: {
+              isVisible: true,
+              position: Position.Right,
+              type: LEGEND_FUNCTION,
+            },
+          },
+          title: 'Heatmap',
+          // Temp hide all suggestions while heatmap is in beta
+          hide: true,
+          previewIcon: 'empty',
+          score: 0.9,
+        },
+      ]);
+    });
+  });
+});
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/suggestions.ts b/x-pack/plugins/lens/public/heatmap_visualization/suggestions.ts
new file mode 100644
index 0000000000000..5cddebe2cc230
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/suggestions.ts
@@ -0,0 +1,106 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { partition } from 'lodash';
+import { Position } from '@elastic/charts';
+import { i18n } from '@kbn/i18n';
+import { Visualization } from '../types';
+import { HeatmapVisualizationState } from './types';
+import { CHART_SHAPES, HEATMAP_GRID_FUNCTION, LEGEND_FUNCTION } from './constants';
+
+export const getSuggestions: Visualization<HeatmapVisualizationState>['getSuggestions'] = ({
+  table,
+  state,
+  keptLayerIds,
+}) => {
+  if (
+    state?.shape === CHART_SHAPES.HEATMAP &&
+    (state.xAccessor || state.yAccessor || state.valueAccessor) &&
+    table.changeType !== 'extended'
+  ) {
+    return [];
+  }
+
+  const isUnchanged = state && table.changeType === 'unchanged';
+
+  if (
+    isUnchanged ||
+    keptLayerIds.length > 1 ||
+    (keptLayerIds.length && table.layerId !== keptLayerIds[0])
+  ) {
+    return [];
+  }
+
+  /**
+   * The score gets increased based on the config completion.
+   */
+  let score = 0;
+
+  const [groups, metrics] = partition(table.columns, (col) => col.operation.isBucketed);
+
+  if (groups.length >= 3) {
+    return [];
+  }
+
+  const isSingleBucketDimension = groups.length === 1 && metrics.length === 0;
+
+  /**
+   * Hide for:
+   * - reduced and reorder tables
+   * - tables with just a single bucket dimension
+   */
+  const hide =
+    table.changeType === 'reduced' || table.changeType === 'reorder' || isSingleBucketDimension;
+
+  const newState: HeatmapVisualizationState = {
+    shape: CHART_SHAPES.HEATMAP,
+    layerId: table.layerId,
+    legend: {
+      isVisible: state?.legend?.isVisible ?? true,
+      position: state?.legend?.position ?? Position.Right,
+      type: LEGEND_FUNCTION,
+    },
+    gridConfig: {
+      type: HEATMAP_GRID_FUNCTION,
+      isCellLabelVisible: false,
+      isYAxisLabelVisible: true,
+      isXAxisLabelVisible: true,
+    },
+  };
+
+  const numberMetric = metrics.find((m) => m.operation.dataType === 'number');
+
+  if (numberMetric) {
+    score += 0.3;
+    newState.valueAccessor = numberMetric.columnId;
+  }
+
+  const [histogram, ordinal] = partition(groups, (g) => g.operation.scale === 'interval');
+
+  newState.xAccessor = histogram[0]?.columnId || ordinal[0]?.columnId;
+  newState.yAccessor = groups.find((g) => g.columnId !== newState.xAccessor)?.columnId;
+
+  if (newState.xAccessor) {
+    score += 0.3;
+  }
+  if (newState.yAccessor) {
+    score += 0.3;
+  }
+
+  return [
+    {
+      state: newState,
+      title: i18n.translate('xpack.lens.heatmap.heatmapLabel', {
+        defaultMessage: 'Heatmap',
+      }),
+      // Temp hide all suggestions while heatmap is in beta
+      hide: true || hide,
+      previewIcon: 'empty',
+      score: Number(score.toFixed(1)),
+    },
+  ];
+};
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
new file mode 100644
index 0000000000000..6fd863ba91936
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/toolbar_component.tsx
@@ -0,0 +1,74 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo } from 'react';
+import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { Position } from '@elastic/charts';
+import { i18n } from '@kbn/i18n';
+import { VisualizationToolbarProps } from '../types';
+import { LegendSettingsPopover } from '../shared_components';
+import { HeatmapVisualizationState } from './types';
+
+const legendOptions: Array<{ id: string; value: 'auto' | 'show' | 'hide'; label: string }> = [
+  {
+    id: `heatmap_legend_show`,
+    value: 'show',
+    label: i18n.translate('xpack.lens.heatmapChart.legendVisibility.show', {
+      defaultMessage: 'Show',
+    }),
+  },
+  {
+    id: `heatmap_legend_hide`,
+    value: 'hide',
+    label: i18n.translate('xpack.lens.heatmapChart.legendVisibility.hide', {
+      defaultMessage: 'Hide',
+    }),
+  },
+];
+
+export const HeatmapToolbar = memo(
+  (props: VisualizationToolbarProps<HeatmapVisualizationState>) => {
+    const { state, setState } = props;
+
+    const legendMode = state.legend.isVisible ? 'show' : 'hide';
+
+    return (
+      <EuiFlexGroup gutterSize="m" justifyContent="spaceBetween">
+        <EuiFlexItem>
+          <EuiFlexGroup gutterSize="none" responsive={false}>
+            <LegendSettingsPopover
+              groupPosition={'none'}
+              legendOptions={legendOptions}
+              mode={legendMode}
+              onDisplayChange={(optionId) => {
+                const newMode = legendOptions.find(({ id }) => id === optionId)!.value;
+                if (newMode === 'show') {
+                  setState({
+                    ...state,
+                    legend: { ...state.legend, isVisible: true },
+                  });
+                } else if (newMode === 'hide') {
+                  setState({
+                    ...state,
+                    legend: { ...state.legend, isVisible: false },
+                  });
+                }
+              }}
+              position={state?.legend.position}
+              onPositionChange={(id) => {
+                setState({
+                  ...state,
+                  legend: { ...state.legend, position: id as Position },
+                });
+              }}
+            />
+          </EuiFlexGroup>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    );
+  }
+);
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/types.ts b/x-pack/plugins/lens/public/heatmap_visualization/types.ts
new file mode 100644
index 0000000000000..734fe7f5be754
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/types.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Position } from '@elastic/charts';
+import { PaletteOutput } from '../../../../../src/plugins/charts/common';
+import { FormatFactory, LensBrushEvent, LensFilterEvent, LensMultiTable } from '../types';
+import {
+  CHART_SHAPES,
+  HEATMAP_GRID_FUNCTION,
+  LEGEND_FUNCTION,
+  LENS_HEATMAP_RENDERER,
+} from './constants';
+import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
+
+export type ChartShapes = typeof CHART_SHAPES[keyof typeof CHART_SHAPES];
+
+export interface SharedHeatmapLayerState {
+  shape: ChartShapes;
+  xAccessor?: string;
+  yAccessor?: string;
+  valueAccessor?: string;
+  legend: LegendConfigResult;
+  gridConfig: HeatmapGridConfigResult;
+}
+
+export type HeatmapLayerState = SharedHeatmapLayerState & {
+  layerId: string;
+};
+
+export type HeatmapVisualizationState = HeatmapLayerState & {
+  palette?: PaletteOutput;
+};
+
+export type HeatmapExpressionArgs = SharedHeatmapLayerState & {
+  title?: string;
+  description?: string;
+  palette: PaletteOutput;
+};
+
+export interface HeatmapRender {
+  type: 'render';
+  as: typeof LENS_HEATMAP_RENDERER;
+  value: HeatmapExpressionProps;
+}
+
+export interface HeatmapExpressionProps {
+  data: LensMultiTable;
+  args: HeatmapExpressionArgs;
+}
+
+export type HeatmapRenderProps = HeatmapExpressionProps & {
+  timeZone: string;
+  formatFactory: FormatFactory;
+  chartsThemeService: ChartsPluginSetup['theme'];
+  onClickValue: (data: LensFilterEvent['data']) => void;
+  onSelectRange: (data: LensBrushEvent['data']) => void;
+};
+
+export interface HeatmapLegendConfig {
+  /**
+   * Flag whether the legend should be shown. If there is just a single series, it will be hidden
+   */
+  isVisible: boolean;
+  /**
+   * Position of the legend relative to the chart
+   */
+  position: Position;
+}
+
+export type LegendConfigResult = HeatmapLegendConfig & { type: typeof LEGEND_FUNCTION };
+
+export interface HeatmapGridConfig {
+  // grid
+  strokeWidth?: number;
+  strokeColor?: string;
+  cellHeight?: number;
+  cellWidth?: number;
+  // cells
+  isCellLabelVisible: boolean;
+  // Y-axis
+  isYAxisLabelVisible: boolean;
+  yAxisLabelWidth?: number;
+  yAxisLabelColor?: string;
+  // X-axis
+  isXAxisLabelVisible: boolean;
+}
+
+export type HeatmapGridConfigResult = HeatmapGridConfig & { type: typeof HEATMAP_GRID_FUNCTION };
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts b/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
new file mode 100644
index 0000000000000..3ed82bef06105
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/visualization.test.ts
@@ -0,0 +1,486 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 {
+  filterOperationsAxis,
+  getHeatmapVisualization,
+  isCellValueSupported,
+} from './visualization';
+import { createMockDatasource, createMockFramePublicAPI } from '../editor_frame_service/mocks';
+import {
+  CHART_SHAPES,
+  FUNCTION_NAME,
+  GROUP_ID,
+  HEATMAP_GRID_FUNCTION,
+  LEGEND_FUNCTION,
+} from './constants';
+import { Position } from '@elastic/charts';
+import { HeatmapVisualizationState } from './types';
+import { DatasourcePublicAPI, Operation } from '../types';
+
+function exampleState(): HeatmapVisualizationState {
+  return {
+    layerId: 'test-layer',
+    legend: {
+      isVisible: true,
+      position: Position.Right,
+      type: LEGEND_FUNCTION,
+    },
+    gridConfig: {
+      type: HEATMAP_GRID_FUNCTION,
+      isCellLabelVisible: false,
+      isYAxisLabelVisible: true,
+      isXAxisLabelVisible: true,
+    },
+    shape: CHART_SHAPES.HEATMAP,
+  };
+}
+
+describe('heatmap', () => {
+  let frame: ReturnType<typeof createMockFramePublicAPI>;
+
+  beforeEach(() => {
+    frame = createMockFramePublicAPI();
+  });
+
+  describe('#intialize', () => {
+    test('returns a default state', () => {
+      expect(getHeatmapVisualization({}).initialize(frame)).toEqual({
+        layerId: '',
+        title: 'Empty Heatmap chart',
+        shape: CHART_SHAPES.HEATMAP,
+        legend: {
+          isVisible: true,
+          position: Position.Right,
+          type: LEGEND_FUNCTION,
+        },
+        gridConfig: {
+          type: HEATMAP_GRID_FUNCTION,
+          isCellLabelVisible: false,
+          isYAxisLabelVisible: true,
+          isXAxisLabelVisible: true,
+        },
+      });
+    });
+
+    test('returns persisted state', () => {
+      expect(getHeatmapVisualization({}).initialize(frame, exampleState())).toEqual(exampleState());
+    });
+  });
+
+  describe('#getConfiguration', () => {
+    beforeEach(() => {
+      const mockDatasource = createMockDatasource('testDatasource');
+
+      mockDatasource.publicAPIMock.getOperationForColumnId.mockReturnValue({
+        dataType: 'string',
+        label: 'MyOperation',
+      } as Operation);
+
+      frame.datasourceLayers = {
+        first: mockDatasource.publicAPIMock,
+      };
+    });
+
+    test('resolves configuration from complete state', () => {
+      const state: HeatmapVisualizationState = {
+        ...exampleState(),
+        layerId: 'first',
+        xAccessor: 'x-accessor',
+        yAccessor: 'y-accessor',
+        valueAccessor: 'v-accessor',
+      };
+
+      expect(
+        getHeatmapVisualization({}).getConfiguration({ state, frame, layerId: 'first' })
+      ).toEqual({
+        groups: [
+          {
+            layerId: 'first',
+            groupId: GROUP_ID.X,
+            groupLabel: 'Horizontal axis',
+            accessors: [{ columnId: 'x-accessor' }],
+            filterOperations: filterOperationsAxis,
+            supportsMoreColumns: false,
+            required: true,
+            dataTestSubj: 'lnsHeatmap_xDimensionPanel',
+          },
+          {
+            layerId: 'first',
+            groupId: GROUP_ID.Y,
+            groupLabel: 'Vertical axis',
+            accessors: [{ columnId: 'y-accessor' }],
+            filterOperations: filterOperationsAxis,
+            supportsMoreColumns: false,
+            required: false,
+            dataTestSubj: 'lnsHeatmap_yDimensionPanel',
+          },
+          {
+            layerId: 'first',
+            groupId: GROUP_ID.CELL,
+            groupLabel: 'Cell value',
+            accessors: [{ columnId: 'v-accessor' }],
+            filterOperations: isCellValueSupported,
+            supportsMoreColumns: false,
+            required: true,
+            dataTestSubj: 'lnsHeatmap_cellPanel',
+          },
+        ],
+      });
+    });
+
+    test('resolves configuration from partial state', () => {
+      const state: HeatmapVisualizationState = {
+        ...exampleState(),
+        layerId: 'first',
+        xAccessor: 'x-accessor',
+      };
+
+      expect(
+        getHeatmapVisualization({}).getConfiguration({ state, frame, layerId: 'first' })
+      ).toEqual({
+        groups: [
+          {
+            layerId: 'first',
+            groupId: GROUP_ID.X,
+            groupLabel: 'Horizontal axis',
+            accessors: [{ columnId: 'x-accessor' }],
+            filterOperations: filterOperationsAxis,
+            supportsMoreColumns: false,
+            required: true,
+            dataTestSubj: 'lnsHeatmap_xDimensionPanel',
+          },
+          {
+            layerId: 'first',
+            groupId: GROUP_ID.Y,
+            groupLabel: 'Vertical axis',
+            accessors: [],
+            filterOperations: filterOperationsAxis,
+            supportsMoreColumns: true,
+            required: false,
+            dataTestSubj: 'lnsHeatmap_yDimensionPanel',
+          },
+          {
+            layerId: 'first',
+            groupId: GROUP_ID.CELL,
+            groupLabel: 'Cell value',
+            accessors: [],
+            filterOperations: isCellValueSupported,
+            supportsMoreColumns: true,
+            required: true,
+            dataTestSubj: 'lnsHeatmap_cellPanel',
+          },
+        ],
+      });
+    });
+  });
+
+  describe('#setDimension', () => {
+    test('set dimension correctly', () => {
+      const prevState: HeatmapVisualizationState = {
+        ...exampleState(),
+        xAccessor: 'x-accessor',
+        yAccessor: 'y-accessor',
+      };
+      expect(
+        getHeatmapVisualization({}).setDimension({
+          prevState,
+          layerId: 'first',
+          columnId: 'new-x-accessor',
+          groupId: 'x',
+        })
+      ).toEqual({
+        ...prevState,
+        xAccessor: 'new-x-accessor',
+      });
+    });
+  });
+
+  describe('#removeDimension', () => {
+    test('removes dimension correctly', () => {
+      const prevState: HeatmapVisualizationState = {
+        ...exampleState(),
+        xAccessor: 'x-accessor',
+        yAccessor: 'y-accessor',
+      };
+      expect(
+        getHeatmapVisualization({}).removeDimension({
+          prevState,
+          layerId: 'first',
+          columnId: 'x-accessor',
+        })
+      ).toEqual({
+        ...exampleState(),
+        yAccessor: 'y-accessor',
+      });
+    });
+  });
+
+  describe('#toExpression', () => {
+    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+
+    beforeEach(() => {
+      const mockDatasource = createMockDatasource('testDatasource');
+
+      mockDatasource.publicAPIMock.getOperationForColumnId.mockReturnValue({
+        dataType: 'string',
+        label: 'MyOperation',
+      } as Operation);
+
+      datasourceLayers = {
+        first: mockDatasource.publicAPIMock,
+      };
+    });
+
+    test('creates an expression based on state and attributes', () => {
+      const state: HeatmapVisualizationState = {
+        ...exampleState(),
+        layerId: 'first',
+        xAccessor: 'x-accessor',
+        valueAccessor: 'value-accessor',
+      };
+      const attributes = {
+        title: 'Test',
+      };
+
+      expect(getHeatmapVisualization({}).toExpression(state, datasourceLayers, attributes)).toEqual(
+        {
+          type: 'expression',
+          chain: [
+            {
+              type: 'function',
+              function: FUNCTION_NAME,
+              arguments: {
+                title: ['Test'],
+                description: [''],
+                xAccessor: ['x-accessor'],
+                yAccessor: [''],
+                valueAccessor: ['value-accessor'],
+                legend: [
+                  {
+                    type: 'expression',
+                    chain: [
+                      {
+                        type: 'function',
+                        function: LEGEND_FUNCTION,
+                        arguments: {
+                          isVisible: [true],
+                          position: [Position.Right],
+                        },
+                      },
+                    ],
+                  },
+                ],
+                gridConfig: [
+                  {
+                    type: 'expression',
+                    chain: [
+                      {
+                        type: 'function',
+                        function: HEATMAP_GRID_FUNCTION,
+                        arguments: {
+                          // grid
+                          strokeWidth: [],
+                          strokeColor: [],
+                          cellHeight: [],
+                          cellWidth: [],
+                          // cells
+                          isCellLabelVisible: [false],
+                          // Y-axis
+                          isYAxisLabelVisible: [true],
+                          yAxisLabelWidth: [],
+                          yAxisLabelColor: [],
+                          // X-axis
+                          isXAxisLabelVisible: [true],
+                        },
+                      },
+                    ],
+                  },
+                ],
+              },
+            },
+          ],
+        }
+      );
+    });
+
+    test('returns null with a missing value accessor', () => {
+      const state: HeatmapVisualizationState = {
+        ...exampleState(),
+        layerId: 'first',
+        xAccessor: 'x-accessor',
+      };
+      const attributes = {
+        title: 'Test',
+      };
+
+      expect(getHeatmapVisualization({}).toExpression(state, datasourceLayers, attributes)).toEqual(
+        null
+      );
+    });
+  });
+
+  describe('#toPreviewExpression', () => {
+    let datasourceLayers: Record<string, DatasourcePublicAPI>;
+
+    beforeEach(() => {
+      const mockDatasource = createMockDatasource('testDatasource');
+
+      mockDatasource.publicAPIMock.getOperationForColumnId.mockReturnValue({
+        dataType: 'string',
+        label: 'MyOperation',
+      } as Operation);
+
+      datasourceLayers = {
+        first: mockDatasource.publicAPIMock,
+      };
+    });
+
+    test('creates a preview expression based on state and attributes', () => {
+      const state: HeatmapVisualizationState = {
+        ...exampleState(),
+        layerId: 'first',
+        xAccessor: 'x-accessor',
+      };
+
+      expect(getHeatmapVisualization({}).toPreviewExpression!(state, datasourceLayers)).toEqual({
+        type: 'expression',
+        chain: [
+          {
+            type: 'function',
+            function: FUNCTION_NAME,
+            arguments: {
+              title: [''],
+              description: [''],
+              xAccessor: ['x-accessor'],
+              yAccessor: [''],
+              valueAccessor: [''],
+              legend: [
+                {
+                  type: 'expression',
+                  chain: [
+                    {
+                      type: 'function',
+                      function: LEGEND_FUNCTION,
+                      arguments: {
+                        isVisible: [false],
+                        position: [],
+                      },
+                    },
+                  ],
+                },
+              ],
+              gridConfig: [
+                {
+                  type: 'expression',
+                  chain: [
+                    {
+                      type: 'function',
+                      function: HEATMAP_GRID_FUNCTION,
+                      arguments: {
+                        // grid
+                        strokeWidth: [1],
+                        // cells
+                        isCellLabelVisible: [false],
+                        // Y-axis
+                        isYAxisLabelVisible: [false],
+                        // X-axis
+                        isXAxisLabelVisible: [false],
+                      },
+                    },
+                  ],
+                },
+              ],
+            },
+          },
+        ],
+      });
+    });
+  });
+
+  describe('#getErrorMessages', () => {
+    test('should not return an error when chart has empty configuration', () => {
+      const mockState = {
+        shape: CHART_SHAPES.HEATMAP,
+      } as HeatmapVisualizationState;
+      expect(getHeatmapVisualization({}).getErrorMessages(mockState)).toEqual(undefined);
+    });
+
+    test('should return an error when the X accessor is missing', () => {
+      const mockState = {
+        shape: CHART_SHAPES.HEATMAP,
+        valueAccessor: 'v-accessor',
+      } as HeatmapVisualizationState;
+      expect(getHeatmapVisualization({}).getErrorMessages(mockState)).toEqual([
+        {
+          longMessage: 'Configuration for the horizontal axis is missing.',
+          shortMessage: 'Missing Horizontal axis.',
+        },
+      ]);
+    });
+  });
+
+  describe('#getWarningMessages', () => {
+    beforeEach(() => {
+      const mockDatasource = createMockDatasource('testDatasource');
+
+      mockDatasource.publicAPIMock.getOperationForColumnId.mockReturnValue({
+        dataType: 'string',
+        label: 'MyOperation',
+      } as Operation);
+
+      frame.datasourceLayers = {
+        first: mockDatasource.publicAPIMock,
+      };
+    });
+
+    test('should not return warning messages when the layer it not configured', () => {
+      const mockState = {
+        shape: CHART_SHAPES.HEATMAP,
+        valueAccessor: 'v-accessor',
+      } as HeatmapVisualizationState;
+      expect(getHeatmapVisualization({}).getWarningMessages!(mockState, frame)).toEqual(undefined);
+    });
+
+    test('should not return warning messages when the data table is empty', () => {
+      frame.activeData = {
+        first: {
+          type: 'datatable',
+          rows: [],
+          columns: [],
+        },
+      };
+      const mockState = {
+        shape: CHART_SHAPES.HEATMAP,
+        valueAccessor: 'v-accessor',
+        layerId: 'first',
+      } as HeatmapVisualizationState;
+      expect(getHeatmapVisualization({}).getWarningMessages!(mockState, frame)).toEqual(undefined);
+    });
+
+    test('should return a warning message when cell value data contains arrays', () => {
+      frame.activeData = {
+        first: {
+          type: 'datatable',
+          rows: [
+            {
+              'v-accessor': [1, 2, 3],
+            },
+          ],
+          columns: [],
+        },
+      };
+
+      const mockState = {
+        shape: CHART_SHAPES.HEATMAP,
+        valueAccessor: 'v-accessor',
+        layerId: 'first',
+      } as HeatmapVisualizationState;
+      expect(getHeatmapVisualization({}).getWarningMessages!(mockState, frame)).toHaveLength(1);
+    });
+  });
+});
diff --git a/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx b/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
new file mode 100644
index 0000000000000..54f9c70824831
--- /dev/null
+++ b/x-pack/plugins/lens/public/heatmap_visualization/visualization.tsx
@@ -0,0 +1,415 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 'react-dom';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
+import { Ast } from '@kbn/interpreter/common';
+import { Position } from '@elastic/charts';
+import { PaletteRegistry } from '../../../../../src/plugins/charts/public';
+import { OperationMetadata, Visualization } from '../types';
+import { HeatmapVisualizationState } from './types';
+import { getSuggestions } from './suggestions';
+import {
+  CHART_NAMES,
+  CHART_SHAPES,
+  FUNCTION_NAME,
+  GROUP_ID,
+  HEATMAP_GRID_FUNCTION,
+  LEGEND_FUNCTION,
+  LENS_HEATMAP_ID,
+} from './constants';
+import { HeatmapToolbar } from './toolbar_component';
+import { LensIconChartHeatmap } from '../assets/chart_heatmap';
+
+const groupLabelForBar = i18n.translate('xpack.lens.heatmapVisualization.heatmapGroupLabel', {
+  defaultMessage: 'Heatmap',
+});
+
+interface HeatmapVisualizationDeps {
+  paletteService?: PaletteRegistry;
+}
+
+function getAxisName(axis: 'x' | 'y') {
+  const vertical = i18n.translate('xpack.lens.heatmap.verticalAxisLabel', {
+    defaultMessage: 'Vertical axis',
+  });
+  const horizontal = i18n.translate('xpack.lens.heatmap.horizontalAxisLabel', {
+    defaultMessage: 'Horizontal axis',
+  });
+  if (axis === 'x') {
+    return horizontal;
+  }
+  return vertical;
+}
+
+export const isBucketed = (op: OperationMetadata) => op.isBucketed && op.scale === 'ordinal';
+const isNumericMetric = (op: OperationMetadata) => op.dataType === 'number';
+
+export const filterOperationsAxis = (op: OperationMetadata) =>
+  isBucketed(op) || op.scale === 'interval';
+
+export const isCellValueSupported = (op: OperationMetadata) => {
+  return !isBucketed(op) && (op.scale === 'ordinal' || op.scale === 'ratio') && isNumericMetric(op);
+};
+
+function getInitialState(): Omit<HeatmapVisualizationState, 'layerId'> {
+  return {
+    shape: CHART_SHAPES.HEATMAP,
+    legend: {
+      isVisible: true,
+      position: Position.Right,
+      type: LEGEND_FUNCTION,
+    },
+    gridConfig: {
+      type: HEATMAP_GRID_FUNCTION,
+      isCellLabelVisible: false,
+      isYAxisLabelVisible: true,
+      isXAxisLabelVisible: true,
+    },
+  };
+}
+
+export const getHeatmapVisualization = ({
+  paletteService,
+}: HeatmapVisualizationDeps): Visualization<HeatmapVisualizationState> => ({
+  id: LENS_HEATMAP_ID,
+
+  visualizationTypes: [
+    {
+      id: 'heatmap',
+      icon: LensIconChartHeatmap,
+      label: i18n.translate('xpack.lens.heatmapVisualization.heatmapLabel', {
+        defaultMessage: 'Heatmap',
+      }),
+      groupLabel: groupLabelForBar,
+      showBetaBadge: true,
+    },
+  ],
+
+  getVisualizationTypeId(state) {
+    return state.shape;
+  },
+
+  getLayerIds(state) {
+    return [state.layerId];
+  },
+
+  clearLayer(state) {
+    const newState = { ...state };
+    delete newState.valueAccessor;
+    delete newState.xAccessor;
+    delete newState.yAccessor;
+    return newState;
+  },
+
+  switchVisualizationType: (visualizationTypeId, state) => {
+    return {
+      ...state,
+      shape: visualizationTypeId as typeof CHART_SHAPES.HEATMAP,
+    };
+  },
+
+  getDescription(state) {
+    return CHART_NAMES.heatmap;
+  },
+
+  initialize(frame, state, mainPalette) {
+    return (
+      state || {
+        layerId: frame.addNewLayer(),
+        title: 'Empty Heatmap chart',
+        ...getInitialState(),
+      }
+    );
+  },
+
+  getSuggestions,
+
+  getConfiguration({ state, frame, layerId }) {
+    const datasourceLayer = frame.datasourceLayers[layerId];
+
+    const originalOrder = datasourceLayer.getTableSpec().map(({ columnId }) => columnId);
+    if (!originalOrder) {
+      return { groups: [] };
+    }
+
+    return {
+      groups: [
+        {
+          layerId: state.layerId,
+          groupId: GROUP_ID.X,
+          groupLabel: getAxisName(GROUP_ID.X),
+          accessors: state.xAccessor ? [{ columnId: state.xAccessor }] : [],
+          filterOperations: filterOperationsAxis,
+          supportsMoreColumns: !state.xAccessor,
+          required: true,
+          dataTestSubj: 'lnsHeatmap_xDimensionPanel',
+        },
+        {
+          layerId: state.layerId,
+          groupId: GROUP_ID.Y,
+          groupLabel: getAxisName(GROUP_ID.Y),
+          accessors: state.yAccessor ? [{ columnId: state.yAccessor }] : [],
+          filterOperations: filterOperationsAxis,
+          supportsMoreColumns: !state.yAccessor,
+          required: false,
+          dataTestSubj: 'lnsHeatmap_yDimensionPanel',
+        },
+        {
+          layerId: state.layerId,
+          groupId: GROUP_ID.CELL,
+          groupLabel: i18n.translate('xpack.lens.heatmap.cellValueLabel', {
+            defaultMessage: 'Cell value',
+          }),
+          accessors: state.valueAccessor ? [{ columnId: state.valueAccessor }] : [],
+          filterOperations: isCellValueSupported,
+          supportsMoreColumns: !state.valueAccessor,
+          required: true,
+          dataTestSubj: 'lnsHeatmap_cellPanel',
+        },
+      ],
+    };
+  },
+
+  setDimension({ prevState, layerId, columnId, groupId, previousColumn }) {
+    const update: Partial<HeatmapVisualizationState> = {};
+    if (groupId === GROUP_ID.X) {
+      update.xAccessor = columnId;
+    }
+    if (groupId === GROUP_ID.Y) {
+      update.yAccessor = columnId;
+    }
+    if (groupId === GROUP_ID.CELL) {
+      update.valueAccessor = columnId;
+    }
+    return {
+      ...prevState,
+      ...update,
+    };
+  },
+
+  removeDimension({ prevState, layerId, columnId }) {
+    const update = { ...prevState };
+
+    if (prevState.valueAccessor === columnId) {
+      delete update.valueAccessor;
+    }
+    if (prevState.xAccessor === columnId) {
+      delete update.xAccessor;
+    }
+    if (prevState.yAccessor === columnId) {
+      delete update.yAccessor;
+    }
+
+    return update;
+  },
+
+  renderToolbar(domElement, props) {
+    render(
+      <I18nProvider>
+        <HeatmapToolbar {...props} />
+      </I18nProvider>,
+      domElement
+    );
+  },
+
+  toExpression(state, datasourceLayers, attributes): Ast | null {
+    const datasource = datasourceLayers[state.layerId];
+
+    const originalOrder = datasource.getTableSpec().map(({ columnId }) => columnId);
+    // When we add a column it could be empty, and therefore have no order
+
+    if (!originalOrder || !state.valueAccessor) {
+      return null;
+    }
+
+    return {
+      type: 'expression',
+      chain: [
+        {
+          type: 'function',
+          function: FUNCTION_NAME,
+          arguments: {
+            title: [attributes?.title ?? ''],
+            description: [attributes?.description ?? ''],
+            xAccessor: [state.xAccessor ?? ''],
+            yAccessor: [state.yAccessor ?? ''],
+            valueAccessor: [state.valueAccessor ?? ''],
+            legend: [
+              {
+                type: 'expression',
+                chain: [
+                  {
+                    type: 'function',
+                    function: LEGEND_FUNCTION,
+                    arguments: {
+                      isVisible: [state.legend.isVisible],
+                      position: [state.legend.position],
+                    },
+                  },
+                ],
+              },
+            ],
+            gridConfig: [
+              {
+                type: 'expression',
+                chain: [
+                  {
+                    type: 'function',
+                    function: HEATMAP_GRID_FUNCTION,
+                    arguments: {
+                      // grid
+                      strokeWidth: state.gridConfig.strokeWidth
+                        ? [state.gridConfig.strokeWidth]
+                        : [],
+                      strokeColor: state.gridConfig.strokeColor
+                        ? [state.gridConfig.strokeColor]
+                        : [],
+                      cellHeight: state.gridConfig.cellHeight ? [state.gridConfig.cellHeight] : [],
+                      cellWidth: state.gridConfig.cellWidth ? [state.gridConfig.cellWidth] : [],
+                      // cells
+                      isCellLabelVisible: [state.gridConfig.isCellLabelVisible],
+                      // Y-axis
+                      isYAxisLabelVisible: [state.gridConfig.isYAxisLabelVisible],
+                      yAxisLabelWidth: state.gridConfig.yAxisLabelWidth
+                        ? [state.gridConfig.yAxisLabelWidth]
+                        : [],
+                      yAxisLabelColor: state.gridConfig.yAxisLabelColor
+                        ? [state.gridConfig.yAxisLabelColor]
+                        : [],
+                      // X-axis
+                      isXAxisLabelVisible: state.gridConfig.isXAxisLabelVisible
+                        ? [state.gridConfig.isXAxisLabelVisible]
+                        : [],
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        },
+      ],
+    };
+  },
+
+  toPreviewExpression(state, datasourceLayers): Ast | null {
+    const datasource = datasourceLayers[state.layerId];
+
+    const originalOrder = datasource.getTableSpec().map(({ columnId }) => columnId);
+    // When we add a column it could be empty, and therefore have no order
+
+    if (!originalOrder) {
+      return null;
+    }
+
+    return {
+      type: 'expression',
+      chain: [
+        {
+          type: 'function',
+          function: FUNCTION_NAME,
+          arguments: {
+            title: [''],
+            description: [''],
+            xAccessor: [state.xAccessor ?? ''],
+            yAccessor: [state.yAccessor ?? ''],
+            valueAccessor: [state.valueAccessor ?? ''],
+            legend: [
+              {
+                type: 'expression',
+                chain: [
+                  {
+                    type: 'function',
+                    function: LEGEND_FUNCTION,
+                    arguments: {
+                      isVisible: [false],
+                      position: [],
+                    },
+                  },
+                ],
+              },
+            ],
+            gridConfig: [
+              {
+                type: 'expression',
+                chain: [
+                  {
+                    type: 'function',
+                    function: HEATMAP_GRID_FUNCTION,
+                    arguments: {
+                      // grid
+                      strokeWidth: [1],
+                      // cells
+                      isCellLabelVisible: [false],
+                      // Y-axis
+                      isYAxisLabelVisible: [false],
+                      // X-axis
+                      isXAxisLabelVisible: [false],
+                    },
+                  },
+                ],
+              },
+            ],
+          },
+        },
+      ],
+    };
+  },
+
+  getErrorMessages(state) {
+    if (!state.yAccessor && !state.xAccessor && !state.valueAccessor) {
+      // nothing configured yet
+      return;
+    }
+
+    const errors: ReturnType<Visualization['getErrorMessages']> = [];
+
+    if (!state.xAccessor) {
+      errors.push({
+        shortMessage: i18n.translate(
+          'xpack.lens.heatmapVisualization.missingXAccessorShortMessage',
+          {
+            defaultMessage: 'Missing Horizontal axis.',
+          }
+        ),
+        longMessage: i18n.translate('xpack.lens.heatmapVisualization.missingXAccessorLongMessage', {
+          defaultMessage: 'Configuration for the horizontal axis is missing.',
+        }),
+      });
+    }
+
+    return errors.length ? errors : undefined;
+  },
+
+  getWarningMessages(state, frame) {
+    if (!state?.layerId || !frame.activeData || !state.valueAccessor) {
+      return;
+    }
+
+    const rows = frame.activeData[state.layerId] && frame.activeData[state.layerId].rows;
+    if (!rows) {
+      return;
+    }
+
+    const hasArrayValues = rows.some((row) => Array.isArray(row[state.valueAccessor!]));
+
+    const datasource = frame.datasourceLayers[state.layerId];
+    const operation = datasource.getOperationForColumnId(state.valueAccessor);
+
+    return hasArrayValues
+      ? [
+          <FormattedMessage
+            id="xpack.lens.heatmapVisualization.arrayValuesWarningMessage"
+            defaultMessage="{label} contains array values. Your visualization may not render as expected."
+            values={{ label: <strong>{operation?.label}</strong> }}
+          />,
+        ]
+      : undefined;
+  },
+});
diff --git a/x-pack/plugins/lens/public/index.ts b/x-pack/plugins/lens/public/index.ts
index fcfed9b9f1fc5..0fdd3bf426232 100644
--- a/x-pack/plugins/lens/public/index.ts
+++ b/x-pack/plugins/lens/public/index.ts
@@ -20,6 +20,7 @@ export type {
   ValueLabelConfig,
   YAxisMode,
   XYCurveType,
+  YConfig,
 } from './xy_visualization/types';
 export type { DataType, OperationMetadata } from './types';
 export type {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/advanced_options.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/advanced_options.tsx
index ea5eb14d9c20e..252772903809f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/advanced_options.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/advanced_options.tsx
@@ -20,9 +20,7 @@ export function AdvancedOptions(props: {
 }) {
   const [popoverOpen, setPopoverOpen] = useState(false);
   const popoverOptions = props.options.filter((option) => option.showInPopover);
-  const inlineOptions = props.options
-    .filter((option) => option.inlineElement)
-    .map((option) => React.cloneElement(option.inlineElement!, { key: option.dataTestSubj }));
+  const inlineOptions = props.options.filter((option) => option.inlineElement);
 
   return (
     <>
@@ -74,7 +72,12 @@ export function AdvancedOptions(props: {
       {inlineOptions.length > 0 && (
         <>
           <EuiSpacer size="s" />
-          {inlineOptions}
+          {inlineOptions.map((option, index) => (
+            <React.Fragment key={option.dataTestSubj}>
+              {option.inlineElement}
+              {index !== inlineOptions.length - 1 && <EuiSpacer size="s" />}
+            </React.Fragment>
+          ))}
         </>
       )}
     </>
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 8e26713630281..2ae7b9403a46d 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
@@ -6,7 +6,6 @@
  */
 
 import './dimension_editor.scss';
-import _ from 'lodash';
 import React, { useState, useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import {
@@ -44,6 +43,7 @@ import { ReferenceEditor } from './reference_editor';
 import { setTimeScaling, TimeScaling } from './time_scaling';
 import { defaultFilter, Filtering, setFilter } from './filtering';
 import { AdvancedOptions } from './advanced_options';
+import { setTimeShift, TimeShift } from './time_shift';
 import { useDebouncedValue } from '../../shared_components';
 
 const operationPanels = getOperationDisplay();
@@ -101,15 +101,26 @@ export function DimensionEditor(props: DimensionEditorProps) {
   };
   const { fieldByOperation, operationWithoutField } = operationSupportMatrix;
 
-  const setStateWrapper = (layer: IndexPatternLayer) => {
-    const hasIncompleteColumns = Boolean(layer.incompleteColumns?.[columnId]);
+  const setStateWrapper = (
+    setter: IndexPatternLayer | ((prevLayer: IndexPatternLayer) => IndexPatternLayer)
+  ) => {
+    const hypotheticalLayer = typeof setter === 'function' ? setter(state.layers[layerId]) : setter;
+    const hasIncompleteColumns = Boolean(hypotheticalLayer.incompleteColumns?.[columnId]);
     const prevOperationType =
-      operationDefinitionMap[state.layers[layerId].columns[columnId]?.operationType]?.input;
-    setState(mergeLayer({ state, layerId, newLayer: layer }), {
-      shouldReplaceDimension: Boolean(layer.columns[columnId]),
-      // clear the dimension if there's an incomplete column pending && previous operation was a fullReference operation
-      shouldRemoveDimension: Boolean(hasIncompleteColumns && prevOperationType === 'fullReference'),
-    });
+      operationDefinitionMap[hypotheticalLayer.columns[columnId]?.operationType]?.input;
+    setState(
+      (prevState) => {
+        const layer = typeof setter === 'function' ? setter(prevState.layers[layerId]) : setter;
+        return mergeLayer({ state: prevState, layerId, newLayer: layer });
+      },
+      {
+        shouldReplaceDimension: Boolean(hypotheticalLayer.columns[columnId]),
+        // clear the dimension if there's an incomplete column pending && previous operation was a fullReference operation
+        shouldRemoveDimension: Boolean(
+          hasIncompleteColumns && prevOperationType === 'fullReference'
+        ),
+      }
+    );
   };
 
   const selectedOperationDefinition =
@@ -132,6 +143,7 @@ export function DimensionEditor(props: DimensionEditorProps) {
   }, [fieldByOperation, operationWithoutField]);
 
   const [filterByOpenInitially, setFilterByOpenInitally] = useState(false);
+  const [timeShiftedFocused, setTimeShiftFocused] = useState(false);
 
   // Operations are compatible if they match inputs. They are always compatible in
   // the empty state. Field-based operations are not compatible with field-less operations.
@@ -338,8 +350,19 @@ export function DimensionEditor(props: DimensionEditorProps) {
                   key={index}
                   layer={state.layers[layerId]}
                   columnId={referenceId}
-                  updateLayer={(newLayer: IndexPatternLayer) => {
-                    setState(mergeLayer({ state, layerId, newLayer }));
+                  updateLayer={(
+                    setter:
+                      | IndexPatternLayer
+                      | ((prevLayer: IndexPatternLayer) => IndexPatternLayer)
+                  ) => {
+                    setState(
+                      mergeLayer({
+                        state,
+                        layerId,
+                        newLayer:
+                          typeof setter === 'function' ? setter(state.layers[layerId]) : setter,
+                      })
+                    );
                   }}
                   validation={validation}
                   currentIndexPattern={currentIndexPattern}
@@ -485,6 +508,38 @@ export function DimensionEditor(props: DimensionEditorProps) {
                     />
                   ) : null,
               },
+              {
+                title: i18n.translate('xpack.lens.indexPattern.timeShift.label', {
+                  defaultMessage: 'Time shift',
+                }),
+                dataTestSubj: 'indexPattern-time-shift-enable',
+                onClick: () => {
+                  setTimeShiftFocused(true);
+                  setStateWrapper(setTimeShift(columnId, state.layers[layerId], ''));
+                },
+                showInPopover: Boolean(
+                  operationDefinitionMap[selectedColumn.operationType].shiftable &&
+                    selectedColumn.timeShift === undefined &&
+                    (currentIndexPattern.timeFieldName ||
+                      Object.values(state.layers[layerId].columns).some(
+                        (col) => col.operationType === 'date_histogram'
+                      ))
+                ),
+                inlineElement:
+                  operationDefinitionMap[selectedColumn.operationType].shiftable &&
+                  selectedColumn.timeShift !== undefined ? (
+                    <TimeShift
+                      indexPattern={currentIndexPattern}
+                      selectedColumn={selectedColumn}
+                      columnId={columnId}
+                      layer={state.layers[layerId]}
+                      updateLayer={setStateWrapper}
+                      isFocused={timeShiftedFocused}
+                      activeData={props.activeData}
+                      layerId={layerId}
+                    />
+                  ) : null,
+              },
             ]}
           />
         )}
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 333caf259fe2f..03db6141b917f 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
@@ -33,6 +33,9 @@ import { OperationMetadata } from '../../types';
 import { DateHistogramIndexPatternColumn } from '../operations/definitions/date_histogram';
 import { getFieldByNameFactory } from '../pure_helpers';
 import { Filtering } from './filtering';
+import { TimeShift } from './time_shift';
+import { DimensionEditor } from './dimension_editor';
+import { AdvancedOptions } from './advanced_options';
 
 jest.mock('../loader');
 jest.mock('../query_input', () => ({
@@ -169,7 +172,9 @@ describe('IndexPatternDimensionEditorPanel', () => {
 
     setState = jest.fn().mockImplementation((newState) => {
       if (wrapper instanceof ReactWrapper) {
-        wrapper.setProps({ state: newState });
+        wrapper.setProps({
+          state: typeof newState === 'function' ? newState(wrapper.prop('state')) : newState,
+        });
       }
     });
 
@@ -495,26 +500,27 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([option]);
     });
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...initialState,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col1: expect.objectContaining({
-                operationType: 'max',
-                sourceField: 'memory',
-                params: { format: { id: 'bytes' } },
-                // Other parts of this don't matter for this test
-              }),
-            },
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](defaultProps.state)).toEqual({
+      ...initialState,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col1: expect.objectContaining({
+              operationType: 'max',
+              sourceField: 'memory',
+              params: { format: { id: 'bytes' } },
+              // Other parts of this don't matter for this test
+            }),
           },
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should switch operations when selecting a field that requires another operation', () => {
@@ -529,25 +535,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([option]);
     });
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col1: expect.objectContaining({
-                operationType: 'terms',
-                sourceField: 'source',
-                // Other parts of this don't matter for this test
-              }),
-            },
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](defaultProps.state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col1: expect.objectContaining({
+              operationType: 'terms',
+              sourceField: 'source',
+              // Other parts of this don't matter for this test
+            }),
           },
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should keep the field when switching to another operation compatible for this field', () => {
@@ -562,26 +569,27 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-min"]').simulate('click');
     });
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col1: expect.objectContaining({
-                operationType: 'min',
-                sourceField: 'bytes',
-                params: { format: { id: 'bytes' } },
-                // Other parts of this don't matter for this test
-              }),
-            },
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col1: expect.objectContaining({
+              operationType: 'min',
+              sourceField: 'bytes',
+              params: { format: { id: 'bytes' } },
+              // Other parts of this don't matter for this test
+            }),
           },
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should not set the state if selecting the currently active operation', () => {
@@ -635,23 +643,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-min"]').simulate('click');
     });
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col1: expect.objectContaining({
-                label: 'Minimum of bytes',
-              }),
-            },
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col1: expect.objectContaining({
+              label: 'Minimum of bytes',
+            }),
           },
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should keep the label on operation change if it is custom', () => {
@@ -672,24 +681,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-min"]').simulate('click');
     });
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col1: expect.objectContaining({
-                label: 'Custom label',
-                customLabel: true,
-              }),
-            },
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col1: expect.objectContaining({
+              label: 'Custom label',
+              customLabel: true,
+            }),
           },
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should remove customLabel flag if label is set to default', () => {
@@ -740,23 +750,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
           .simulate('click');
       });
 
-      expect(setState).toHaveBeenCalledWith(
-        {
-          ...state,
-          layers: {
-            first: {
-              ...state.layers.first,
-              columns: {
-                ...state.layers.first.columns,
-              },
-              incompleteColumns: {
-                col1: { operationType: 'terms' },
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](state)).toEqual({
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+            },
+            incompleteColumns: {
+              col1: { operationType: 'terms' },
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should show error message in invalid state', () => {
@@ -865,20 +876,22 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper = mount(<IndexPatternDimensionEditorComponent {...defaultProps} columnId={'col2'} />);
 
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');
-      expect(setState).toHaveBeenCalledWith(
-        {
-          ...state,
-          layers: {
-            first: {
-              ...state.layers.first,
-              incompleteColumns: {
-                col2: { operationType: 'average' },
-              },
+
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: false },
+      ]);
+      expect(setState.mock.calls[0][0](state)).toEqual({
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            incompleteColumns: {
+              col2: { operationType: 'average' },
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: false }
-      );
+      });
 
       const comboBox = wrapper
         .find(EuiComboBox)
@@ -890,26 +903,23 @@ describe('IndexPatternDimensionEditorPanel', () => {
         comboBox.prop('onChange')!([options![1].options![2]]);
       });
 
-      expect(setState).toHaveBeenLastCalledWith(
-        {
-          ...state,
-          layers: {
-            first: {
-              ...state.layers.first,
-              columns: {
-                ...state.layers.first.columns,
-                col2: expect.objectContaining({
-                  sourceField: 'source',
-                  operationType: 'terms',
-                  // Other parts of this don't matter for this test
-                }),
-              },
-              columnOrder: ['col2', 'col1'],
+      expect(setState.mock.calls[1][0](state)).toEqual({
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col2: expect.objectContaining({
+                sourceField: 'source',
+                operationType: 'terms',
+                // Other parts of this don't matter for this test
+              }),
             },
+            columnOrder: ['col2', 'col1'],
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should clean up when transitioning from incomplete reference-based operations to field operation', () => {
@@ -936,20 +946,21 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .simulate('click');
 
       // Now check that the dimension gets cleaned up on state update
-      expect(setState).toHaveBeenCalledWith(
-        {
-          ...state,
-          layers: {
-            first: {
-              ...state.layers.first,
-              incompleteColumns: {
-                col2: { operationType: 'average' },
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: false },
+      ]);
+      expect(setState.mock.calls[0][0](state)).toEqual({
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            incompleteColumns: {
+              col2: { operationType: 'average' },
             },
           },
         },
-        { shouldRemoveDimension: true, shouldReplaceDimension: false }
-      );
+      });
     });
 
     it('should select the Records field when count is selected', () => {
@@ -973,7 +984,7 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .find('button[data-test-subj="lns-indexPatternDimension-count incompatible"]')
         .simulate('click');
 
-      const newColumnState = setState.mock.calls[0][0].layers.first.columns.col2;
+      const newColumnState = setState.mock.calls[0][0](state).layers.first.columns.col2;
       expect(newColumnState.operationType).toEqual('count');
       expect(newColumnState.sourceField).toEqual('Records');
     });
@@ -1030,24 +1041,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
         comboBox.prop('onChange')!([option]);
       });
 
-      expect(setState).toHaveBeenLastCalledWith(
-        {
-          ...state,
-          layers: {
-            first: {
-              ...state.layers.first,
-              columns: {
-                ...state.layers.first.columns,
-                col1: expect.objectContaining({
-                  sourceField: 'source',
-                  operationType: 'terms',
-                }),
-              },
+      expect(setState.mock.calls.length).toEqual(2);
+      expect(setState.mock.calls[1]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[1][0](state)).toEqual({
+        ...state,
+        layers: {
+          first: {
+            ...state.layers.first,
+            columns: {
+              ...state.layers.first.columns,
+              col1: expect.objectContaining({
+                sourceField: 'source',
+                operationType: 'terms',
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
   });
 
@@ -1130,24 +1143,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .find('[data-test-subj="indexPattern-time-scaling-enable"]')
         .hostNodes()
         .simulate('click');
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  timeScale: 's',
-                  label: 'Count of records per second',
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeScale: 's',
+                label: 'Count of records per second',
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should carry over time scaling to other operation if possible', () => {
@@ -1161,24 +1175,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper
         .find('button[data-test-subj="lns-indexPatternDimension-count incompatible"]')
         .simulate('click');
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  timeScale: 'h',
-                  label: 'Count of records per hour',
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeScale: 'h',
+                label: 'Count of records per hour',
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should not carry over time scaling if the other operation does not support it', () => {
@@ -1190,24 +1205,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
       });
       wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
       wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  timeScale: undefined,
-                  label: 'Average of bytes',
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeScale: undefined,
+                label: 'Average of bytes',
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should allow to change time scaling', () => {
@@ -1223,24 +1239,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .prop('onChange')!(({
         target: { value: 'h' },
       } as unknown) as ChangeEvent<HTMLSelectElement>);
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  timeScale: 'h',
-                  label: 'Count of records per hour',
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeScale: 'h',
+                label: 'Count of records per hour',
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should not adjust label if it is custom', () => {
@@ -1252,24 +1269,25 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .prop('onChange')!(({
         target: { value: 'h' },
       } as unknown) as ChangeEvent<HTMLSelectElement>);
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  timeScale: 'h',
-                  label: 'My label',
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeScale: 'h',
+                label: 'My label',
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should allow to remove time scaling', () => {
@@ -1282,28 +1300,29 @@ describe('IndexPatternDimensionEditorPanel', () => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         {} as any
       );
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  timeScale: undefined,
-                  label: 'Count of records',
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeScale: undefined,
+                label: 'Count of records',
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
   });
 
-  describe('filtering', () => {
+  describe('time shift', () => {
     function getProps(colOverrides: Partial<IndexPatternColumn>) {
       return {
         ...defaultProps,
@@ -1332,13 +1351,203 @@ describe('IndexPatternDimensionEditorPanel', () => {
       };
     }
 
-    it('should not show custom options if time scaling is not available', () => {
-      wrapper = mount(
-        <IndexPatternDimensionEditorComponent
-          {...getProps({
-            operationType: 'terms',
-            sourceField: 'bytes',
-            params: {
+    it('should not show custom options if time shift is not available', () => {
+      const props = {
+        ...defaultProps,
+        state: getStateWithColumns({
+          col2: {
+            dataType: 'number',
+            isBucketed: false,
+            label: 'Count of records',
+            operationType: 'count',
+            sourceField: 'Records',
+          } as IndexPatternColumn,
+        }),
+        columnId: 'col2',
+      };
+      wrapper = shallow(
+        <IndexPatternDimensionEditorComponent
+          {...props}
+          state={{
+            ...props.state,
+            indexPatterns: {
+              '1': {
+                ...props.state.indexPatterns['1'],
+                timeFieldName: undefined,
+              },
+            },
+          }}
+        />
+      );
+      expect(
+        wrapper
+          .find(DimensionEditor)
+          .dive()
+          .find(AdvancedOptions)
+          .dive()
+          .find('[data-test-subj="indexPattern-time-shift-enable"]')
+      ).toHaveLength(0);
+    });
+
+    it('should show custom options if time shift is available', () => {
+      wrapper = shallow(<IndexPatternDimensionEditorComponent {...getProps({})} />);
+      expect(
+        wrapper
+          .find(DimensionEditor)
+          .dive()
+          .find(AdvancedOptions)
+          .dive()
+          .find('[data-test-subj="indexPattern-time-shift-enable"]')
+      ).toHaveLength(1);
+    });
+
+    it('should show current time shift if set', () => {
+      wrapper = mount(<IndexPatternDimensionEditorComponent {...getProps({ timeShift: '1d' })} />);
+      expect(wrapper.find(TimeShift).find(EuiComboBox).prop('selectedOptions')[0].value).toEqual(
+        '1d'
+      );
+    });
+
+    it('should allow to set time shift initially', () => {
+      const props = getProps({});
+      wrapper = shallow(<IndexPatternDimensionEditorComponent {...props} />);
+      wrapper
+        .find(DimensionEditor)
+        .dive()
+        .find(AdvancedOptions)
+        .dive()
+        .find('[data-test-subj="indexPattern-time-shift-enable"]')
+        .prop('onClick')!({} as MouseEvent);
+      expect((props.setState as jest.Mock).mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeShift: '',
+              }),
+            },
+          },
+        },
+      });
+    });
+
+    it('should carry over time shift to other operation if possible', () => {
+      const props = getProps({
+        timeShift: '1d',
+        sourceField: 'bytes',
+        operationType: 'sum',
+        label: 'Sum of bytes per hour',
+      });
+      wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
+      wrapper
+        .find('button[data-test-subj="lns-indexPatternDimension-count incompatible"]')
+        .simulate('click');
+      expect((props.setState as jest.Mock).mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeShift: '1d',
+              }),
+            },
+          },
+        },
+      });
+    });
+
+    it('should allow to change time shift', () => {
+      const props = getProps({
+        timeShift: '1d',
+      });
+      wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
+      wrapper.find(TimeShift).find(EuiComboBox).prop('onCreateOption')!('1h', []);
+      expect((props.setState as jest.Mock).mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeShift: '1h',
+              }),
+            },
+          },
+        },
+      });
+    });
+
+    it('should allow to time shift', () => {
+      const props = getProps({
+        timeShift: '1h',
+      });
+      wrapper = mount(<IndexPatternDimensionEditorComponent {...props} />);
+      wrapper
+        .find('[data-test-subj="indexPattern-time-shift-remove"]')
+        .find(EuiButtonIcon)
+        .prop('onClick')!(
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        {} as any
+      );
+      expect((props.setState as jest.Mock).mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                timeShift: undefined,
+              }),
+            },
+          },
+        },
+      });
+    });
+  });
+
+  describe('filtering', () => {
+    function getProps(colOverrides: Partial<IndexPatternColumn>) {
+      return {
+        ...defaultProps,
+        state: getStateWithColumns({
+          datecolumn: {
+            dataType: 'date',
+            isBucketed: true,
+            label: '',
+            customLabel: true,
+            operationType: 'date_histogram',
+            sourceField: 'ts',
+            params: {
+              interval: '1d',
+            },
+          },
+          col2: {
+            dataType: 'number',
+            isBucketed: false,
+            label: 'Count of records',
+            operationType: 'count',
+            sourceField: 'Records',
+            ...colOverrides,
+          } as IndexPatternColumn,
+        }),
+        columnId: 'col2',
+      };
+    }
+
+    it('should not show custom options if time scaling is not available', () => {
+      wrapper = mount(
+        <IndexPatternDimensionEditorComponent
+          {...getProps({
+            operationType: 'terms',
+            sourceField: 'bytes',
+            params: {
               orderDirection: 'asc',
               orderBy: { type: 'alphabetical' },
               size: 5,
@@ -1384,26 +1593,27 @@ describe('IndexPatternDimensionEditorPanel', () => {
         .find('[data-test-subj="indexPattern-filter-by-enable"]')
         .hostNodes()
         .simulate('click');
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  filter: {
-                    language: 'kuery',
-                    query: '',
-                  },
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                filter: {
+                  language: 'kuery',
+                  query: '',
+                },
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should carry over filter to other operation if possible', () => {
@@ -1417,23 +1627,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
       wrapper
         .find('button[data-test-subj="lns-indexPatternDimension-count incompatible"]')
         .simulate('click');
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  filter: { language: 'kuery', query: 'a: b' },
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                filter: { language: 'kuery', query: 'a: b' },
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should allow to change filter', () => {
@@ -1445,23 +1656,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
         language: 'kuery',
         query: 'c: d',
       });
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  filter: { language: 'kuery', query: 'c: d' },
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                filter: { language: 'kuery', query: 'c: d' },
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
 
     it('should allow to remove filter', () => {
@@ -1476,23 +1688,24 @@ describe('IndexPatternDimensionEditorPanel', () => {
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         {} as any
       );
-      expect(props.setState).toHaveBeenCalledWith(
-        {
-          ...props.state,
-          layers: {
-            first: {
-              ...props.state.layers.first,
-              columns: {
-                ...props.state.layers.first.columns,
-                col2: expect.objectContaining({
-                  filter: undefined,
-                }),
-              },
+      expect(setState.mock.calls[0]).toEqual([
+        expect.any(Function),
+        { shouldRemoveDimension: false, shouldReplaceDimension: true },
+      ]);
+      expect(setState.mock.calls[0][0](props.state)).toEqual({
+        ...props.state,
+        layers: {
+          first: {
+            ...props.state.layers.first,
+            columns: {
+              ...props.state.layers.first.columns,
+              col2: expect.objectContaining({
+                filter: undefined,
+              }),
             },
           },
         },
-        { shouldRemoveDimension: false, shouldReplaceDimension: true }
-      );
+      });
     });
   });
 
@@ -1530,22 +1743,23 @@ describe('IndexPatternDimensionEditorPanel', () => {
 
     wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            incompleteColumns: {
-              col2: {
-                operationType: 'average',
-              },
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: false },
+    ]);
+    expect(setState.mock.calls[0][0](defaultProps.state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          incompleteColumns: {
+            col2: {
+              operationType: 'average',
             },
           },
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: false }
-    );
+    });
 
     const comboBox = wrapper
       .find(EuiComboBox)
@@ -1556,26 +1770,23 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([options![1].options![0]]);
     });
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columnOrder: ['col1', 'col2'],
-            columns: {
-              ...state.layers.first.columns,
-              col2: expect.objectContaining({
-                operationType: 'average',
-                sourceField: 'bytes',
-              }),
-            },
-            incompleteColumns: {},
+    expect(setState.mock.calls[1][0](defaultProps.state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columnOrder: ['col1', 'col2'],
+          columns: {
+            ...state.layers.first.columns,
+            col2: expect.objectContaining({
+              operationType: 'average',
+              sourceField: 'bytes',
+            }),
           },
+          incompleteColumns: {},
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should select operation directly if only one field is possible', () => {
@@ -1599,26 +1810,27 @@ describe('IndexPatternDimensionEditorPanel', () => {
 
     wrapper.find('button[data-test-subj="lns-indexPatternDimension-average"]').simulate('click');
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...initialState,
-        layers: {
-          first: {
-            ...initialState.layers.first,
-            columns: {
-              ...initialState.layers.first.columns,
-              col2: expect.objectContaining({
-                sourceField: 'bytes',
-                operationType: 'average',
-                // Other parts of this don't matter for this test
-              }),
-            },
-            columnOrder: ['col1', 'col2'],
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](initialState)).toEqual({
+      ...initialState,
+      layers: {
+        first: {
+          ...initialState.layers.first,
+          columns: {
+            ...initialState.layers.first.columns,
+            col2: expect.objectContaining({
+              sourceField: 'bytes',
+              operationType: 'average',
+              // Other parts of this don't matter for this test
+            }),
           },
+          columnOrder: ['col1', 'col2'],
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should select operation directly if only document is possible', () => {
@@ -1626,25 +1838,26 @@ describe('IndexPatternDimensionEditorPanel', () => {
 
     wrapper.find('button[data-test-subj="lns-indexPatternDimension-count"]').simulate('click');
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col2: expect.objectContaining({
-                operationType: 'count',
-                // Other parts of this don't matter for this test
-              }),
-            },
-            columnOrder: ['col1', 'col2'],
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col2: expect.objectContaining({
+              operationType: 'count',
+              // Other parts of this don't matter for this test
+            }),
           },
+          columnOrder: ['col1', 'col2'],
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should indicate compatible fields when selecting the operation first', () => {
@@ -1762,26 +1975,27 @@ describe('IndexPatternDimensionEditorPanel', () => {
       comboBox.prop('onChange')!([option]);
     });
 
-    expect(setState).toHaveBeenCalledWith(
-      {
-        ...state,
-        layers: {
-          first: {
-            ...state.layers.first,
-            columns: {
-              ...state.layers.first.columns,
-              col2: expect.objectContaining({
-                operationType: 'range',
-                sourceField: 'bytes',
-                // Other parts of this don't matter for this test
-              }),
-            },
-            columnOrder: ['col1', 'col2'],
+    expect(setState.mock.calls[0]).toEqual([
+      expect.any(Function),
+      { shouldRemoveDimension: false, shouldReplaceDimension: true },
+    ]);
+    expect(setState.mock.calls[0][0](defaultProps.state)).toEqual({
+      ...state,
+      layers: {
+        first: {
+          ...state.layers.first,
+          columns: {
+            ...state.layers.first.columns,
+            col2: expect.objectContaining({
+              operationType: 'range',
+              sourceField: 'bytes',
+              // Other parts of this don't matter for this test
+            }),
           },
+          columnOrder: ['col1', 'col2'],
         },
       },
-      { shouldRemoveDimension: false, shouldReplaceDimension: true }
-    );
+    });
   });
 
   it('should use helper function when changing the function', () => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
index b80d90ba78b1d..db0a42047a1b8 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/field_select.tsx
@@ -6,7 +6,7 @@
  */
 
 import './field_select.scss';
-import _ from 'lodash';
+import { partition } from 'lodash';
 import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import {
@@ -68,7 +68,7 @@ export function FieldSelect({
       return !currentOperationType || operationByField[fieldName]!.has(currentOperationType);
     }
 
-    const [specialFields, normalFields] = _.partition(
+    const [specialFields, normalFields] = partition(
       fields,
       (field) => currentIndexPattern.getFieldByName(field)?.type === 'document'
     );
@@ -121,11 +121,11 @@ export function FieldSelect({
         }));
     }
 
-    const [metaFields, nonMetaFields] = _.partition(
+    const [metaFields, nonMetaFields] = partition(
       normalFields,
       (field) => currentIndexPattern.getFieldByName(field)?.meta
     );
-    const [availableFields, emptyFields] = _.partition(nonMetaFields, containsData);
+    const [availableFields, emptyFields] = partition(nonMetaFields, containsData);
 
     const constructFieldsOptions = (fieldsArr: string[], label: string) =>
       fieldsArr.length > 0 && {
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 65bc23b4eb1ca..68705ebf2d157 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
@@ -114,7 +114,7 @@ export function Filtering({
             }
           >
             <QueryInput
-              indexPattern={indexPattern}
+              indexPatternTitle={indexPattern.title}
               data-test-subj="indexPattern-filter-by-input"
               value={selectedColumn.filter || defaultFilter}
               onChange={(newQuery) => {
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/operation_support.ts b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/operation_support.ts
index 801b1b17a1831..504aa0912f9cc 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/operation_support.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/operation_support.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import _ from 'lodash';
 import { DatasourceDimensionDropProps } from '../../types';
 import { OperationType } from '../indexpattern';
 import { memoizedGetAvailableOperationsByMetadata } from '../operations';
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 e02a014935458..c473be05ba315 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
@@ -6,7 +6,6 @@
  */
 
 import './dimension_editor.scss';
-import _ from 'lodash';
 import React, { useMemo } from 'react';
 import { i18n } from '@kbn/i18n';
 import {
@@ -44,7 +43,9 @@ export interface ReferenceEditorProps {
   selectionStyle: 'full' | 'field' | 'hidden';
   validation: RequiredReference;
   columnId: string;
-  updateLayer: (newLayer: IndexPatternLayer) => void;
+  updateLayer: (
+    setter: IndexPatternLayer | ((prevLayer: IndexPatternLayer) => IndexPatternLayer)
+  ) => void;
   currentIndexPattern: IndexPattern;
   existingFields: IndexPatternPrivateState['existingFields'];
   dateRange: DateRange;
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_scaling.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_scaling.tsx
index bf5b64bf3d615..61e5da5931e88 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_scaling.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_scaling.tsx
@@ -27,7 +27,13 @@ export function setTimeScaling(
   const currentColumn = layer.columns[columnId];
   const label = currentColumn.customLabel
     ? currentColumn.label
-    : adjustTimeScaleLabelSuffix(currentColumn.label, currentColumn.timeScale, timeScale);
+    : adjustTimeScaleLabelSuffix(
+        currentColumn.label,
+        currentColumn.timeScale,
+        timeScale,
+        currentColumn.timeShift,
+        currentColumn.timeShift
+      );
   return {
     ...layer,
     columns: {
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
new file mode 100644
index 0000000000000..0ac02c15b34a5
--- /dev/null
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/dimension_panel/time_shift.tsx
@@ -0,0 +1,394 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { EuiButtonIcon } from '@elastic/eui';
+import { EuiFormRow, EuiFlexItem, EuiFlexGroup } from '@elastic/eui';
+import { EuiComboBox } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { uniq } from 'lodash';
+import { i18n } from '@kbn/i18n';
+import React, { useEffect, useRef, useState } from 'react';
+import { Query } from 'src/plugins/data/public';
+import { search } from '../../../../../../src/plugins/data/public';
+import { parseTimeShift } from '../../../../../../src/plugins/data/common';
+import {
+  adjustTimeScaleLabelSuffix,
+  IndexPatternColumn,
+  operationDefinitionMap,
+} from '../operations';
+import { IndexPattern, IndexPatternLayer, IndexPatternPrivateState } from '../types';
+import { IndexPatternDimensionEditorProps } from './dimension_panel';
+import { FramePublicAPI } from '../../types';
+
+// to do: get the language from uiSettings
+export const defaultFilter: Query = {
+  query: '',
+  language: 'kuery',
+};
+
+export function setTimeShift(
+  columnId: string,
+  layer: IndexPatternLayer,
+  timeShift: string | undefined
+) {
+  const trimmedTimeShift = timeShift?.trim();
+  const currentColumn = layer.columns[columnId];
+  const label = currentColumn.customLabel
+    ? currentColumn.label
+    : adjustTimeScaleLabelSuffix(
+        currentColumn.label,
+        currentColumn.timeScale,
+        currentColumn.timeScale,
+        currentColumn.timeShift,
+        trimmedTimeShift
+      );
+  return {
+    ...layer,
+    columns: {
+      ...layer.columns,
+      [columnId]: {
+        ...layer.columns[columnId],
+        label,
+        timeShift: trimmedTimeShift,
+      },
+    },
+  };
+}
+
+const timeShiftOptions = [
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.hour', {
+      defaultMessage: '1 hour (1h)',
+    }),
+    value: '1h',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.3hours', {
+      defaultMessage: '3 hours (3h)',
+    }),
+    value: '3h',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.6hours', {
+      defaultMessage: '6 hours (6h)',
+    }),
+    value: '6h',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.12hours', {
+      defaultMessage: '12 hours (12h)',
+    }),
+    value: '12h',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.day', {
+      defaultMessage: '1 day (1d)',
+    }),
+    value: '1d',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.week', {
+      defaultMessage: '1 week (1w)',
+    }),
+    value: '1w',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.month', {
+      defaultMessage: '1 month (1M)',
+    }),
+    value: '1M',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.3months', {
+      defaultMessage: '3 months (3M)',
+    }),
+    value: '3M',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.6months', {
+      defaultMessage: '6 months (6M)',
+    }),
+    value: '6M',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.year', {
+      defaultMessage: '1 year (1y)',
+    }),
+    value: '1y',
+  },
+  {
+    label: i18n.translate('xpack.lens.indexPattern.timeShift.previous', {
+      defaultMessage: 'Previous',
+    }),
+    value: 'previous',
+  },
+];
+
+export function TimeShift({
+  selectedColumn,
+  columnId,
+  layer,
+  updateLayer,
+  indexPattern,
+  isFocused,
+  activeData,
+  layerId,
+}: {
+  selectedColumn: IndexPatternColumn;
+  indexPattern: IndexPattern;
+  columnId: string;
+  layer: IndexPatternLayer;
+  updateLayer: (newLayer: IndexPatternLayer) => void;
+  isFocused: boolean;
+  activeData: IndexPatternDimensionEditorProps['activeData'];
+  layerId: string;
+}) {
+  const focusSetRef = useRef(false);
+  const [localValue, setLocalValue] = useState(selectedColumn.timeShift);
+  useEffect(() => {
+    setLocalValue(selectedColumn.timeShift);
+  }, [selectedColumn.timeShift]);
+  const selectedOperation = operationDefinitionMap[selectedColumn.operationType];
+  if (!selectedOperation.shiftable || selectedColumn.timeShift === undefined) {
+    return null;
+  }
+
+  let dateHistogramInterval: null | moment.Duration = null;
+  const dateHistogramColumn = layer.columnOrder.find(
+    (colId) => layer.columns[colId].operationType === 'date_histogram'
+  );
+  if (!dateHistogramColumn && !indexPattern.timeFieldName) {
+    return null;
+  }
+  if (dateHistogramColumn && activeData && activeData[layerId] && activeData[layerId]) {
+    const column = activeData[layerId].columns.find((col) => col.id === dateHistogramColumn);
+    if (column) {
+      dateHistogramInterval = search.aggs.parseInterval(
+        search.aggs.getDateHistogramMetaDataByDatatableColumn(column)?.interval || ''
+      );
+    }
+  }
+
+  function isValueTooSmall(parsedValue: ReturnType<typeof parseTimeShift>) {
+    return (
+      dateHistogramInterval &&
+      parsedValue &&
+      typeof parsedValue === 'object' &&
+      parsedValue.asMilliseconds() < dateHistogramInterval.asMilliseconds()
+    );
+  }
+
+  function isValueNotMultiple(parsedValue: ReturnType<typeof parseTimeShift>) {
+    return (
+      dateHistogramInterval &&
+      parsedValue &&
+      typeof parsedValue === 'object' &&
+      !Number.isInteger(parsedValue.asMilliseconds() / dateHistogramInterval.asMilliseconds())
+    );
+  }
+
+  const parsedLocalValue = localValue && parseTimeShift(localValue);
+  const isLocalValueInvalid = Boolean(parsedLocalValue === 'invalid');
+  const localValueTooSmall = parsedLocalValue && isValueTooSmall(parsedLocalValue);
+  const localValueNotMultiple = parsedLocalValue && isValueNotMultiple(parsedLocalValue);
+
+  function getSelectedOption() {
+    if (!localValue) return [];
+    const goodPick = timeShiftOptions.filter(({ value }) => value === localValue);
+    if (goodPick.length > 0) return goodPick;
+    return [
+      {
+        value: localValue,
+        label: localValue,
+      },
+    ];
+  }
+
+  return (
+    <div
+      ref={(r) => {
+        if (r && isFocused) {
+          const timeShiftInput = r.querySelector('[data-test-subj="comboBoxSearchInput"]');
+          if (!focusSetRef.current && timeShiftInput instanceof HTMLInputElement) {
+            focusSetRef.current = true;
+            timeShiftInput.focus();
+          }
+        }
+      }}
+    >
+      <EuiFormRow
+        display="columnCompressed"
+        fullWidth
+        label={i18n.translate('xpack.lens.indexPattern.timeShift.label', {
+          defaultMessage: 'Time shift',
+        })}
+        helpText={i18n.translate('xpack.lens.indexPattern.timeShift.help', {
+          defaultMessage: 'Enter the time shift number and unit',
+        })}
+        error={
+          (localValueTooSmall &&
+            i18n.translate('xpack.lens.indexPattern.timeShift.tooSmallHelp', {
+              defaultMessage:
+                'Time shift should to be larger than the date histogram interval. Either increase time shift or specify smaller interval in date histogram',
+            })) ||
+          (localValueNotMultiple &&
+            i18n.translate('xpack.lens.indexPattern.timeShift.noMultipleHelp', {
+              defaultMessage:
+                'Time shift should be a multiple of the date histogram interval. Either adjust time shift or date histogram interval',
+            }))
+        }
+        isInvalid={Boolean(isLocalValueInvalid || localValueTooSmall || localValueNotMultiple)}
+      >
+        <EuiFlexGroup gutterSize="s" alignItems="center">
+          <EuiFlexItem>
+            <EuiComboBox
+              fullWidth
+              compressed
+              isClearable={false}
+              data-test-subj="indexPattern-dimension-time-shift"
+              placeholder={i18n.translate('xpack.lens.indexPattern.timeShiftPlaceholder', {
+                defaultMessage: 'Time shift (e.g. 1d)',
+              })}
+              options={timeShiftOptions.filter(({ value }) => {
+                const parsedValue = parseTimeShift(value);
+                return (
+                  parsedValue && !isValueTooSmall(parsedValue) && !isValueNotMultiple(parsedValue)
+                );
+              })}
+              selectedOptions={getSelectedOption()}
+              singleSelection={{ asPlainText: true }}
+              isInvalid={isLocalValueInvalid}
+              onCreateOption={(val) => {
+                const parsedVal = parseTimeShift(val);
+                if (parsedVal !== 'invalid') {
+                  updateLayer(setTimeShift(columnId, layer, val));
+                } else {
+                  setLocalValue(val);
+                }
+              }}
+              onChange={(choices) => {
+                if (choices.length === 0) {
+                  updateLayer(setTimeShift(columnId, layer, ''));
+                  setLocalValue('');
+                  return;
+                }
+
+                const choice = choices[0].value as string;
+                const parsedVal = parseTimeShift(choice);
+                if (parsedVal !== 'invalid') {
+                  updateLayer(setTimeShift(columnId, layer, choice));
+                } else {
+                  setLocalValue(choice);
+                }
+              }}
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButtonIcon
+              data-test-subj="indexPattern-time-shift-remove"
+              color="danger"
+              aria-label={i18n.translate('xpack.lens.timeShift.removeLabel', {
+                defaultMessage: 'Remove time shift',
+              })}
+              onClick={() => {
+                updateLayer(setTimeShift(columnId, layer, undefined));
+              }}
+              iconType="cross"
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFormRow>
+    </div>
+  );
+}
+
+export function getTimeShiftWarningMessages(
+  state: IndexPatternPrivateState,
+  { activeData }: FramePublicAPI
+) {
+  if (!state) return;
+  const warningMessages: React.ReactNode[] = [];
+  Object.entries(state.layers).forEach(([layerId, layer]) => {
+    let dateHistogramInterval: null | string = null;
+    const dateHistogramColumn = layer.columnOrder.find(
+      (colId) => layer.columns[colId].operationType === 'date_histogram'
+    );
+    if (!dateHistogramColumn) {
+      return;
+    }
+    if (dateHistogramColumn && activeData && activeData[layerId]) {
+      const column = activeData[layerId].columns.find((col) => col.id === dateHistogramColumn);
+      if (column) {
+        dateHistogramInterval =
+          search.aggs.getDateHistogramMetaDataByDatatableColumn(column)?.interval || null;
+      }
+    }
+    if (dateHistogramInterval === null) {
+      return;
+    }
+    const shiftInterval = search.aggs.parseInterval(dateHistogramInterval)!.asMilliseconds();
+    let timeShifts: number[] = [];
+    const timeShiftMap: Record<number, string[]> = {};
+    Object.entries(layer.columns).forEach(([columnId, column]) => {
+      if (column.isBucketed) return;
+      let duration: number = 0;
+      if (column.timeShift) {
+        const parsedTimeShift = parseTimeShift(column.timeShift);
+        if (parsedTimeShift === 'previous' || parsedTimeShift === 'invalid') {
+          return;
+        }
+        duration = parsedTimeShift.asMilliseconds();
+      }
+      timeShifts.push(duration);
+      if (!timeShiftMap[duration]) {
+        timeShiftMap[duration] = [];
+      }
+      timeShiftMap[duration].push(columnId);
+    });
+    timeShifts = uniq(timeShifts);
+
+    if (timeShifts.length < 2) {
+      return;
+    }
+
+    timeShifts.forEach((timeShift) => {
+      if (timeShift === 0) return;
+      if (timeShift < shiftInterval) {
+        timeShiftMap[timeShift].forEach((columnId) => {
+          warningMessages.push(
+            <FormattedMessage
+              key={`small-${columnId}`}
+              id="xpack.lens.indexPattern.timeShiftSmallWarning"
+              defaultMessage="{label} uses a time shift of {columnTimeShift} which is smaller than the date histogram interval of {interval}. To prevent mismatched data, use a multiple of {interval} as time shift."
+              values={{
+                label: <strong>{layer.columns[columnId].label}</strong>,
+                interval: <strong>{dateHistogramInterval}</strong>,
+                columnTimeShift: <strong>{layer.columns[columnId].timeShift}</strong>,
+              }}
+            />
+          );
+        });
+      } else if (!Number.isInteger(timeShift / shiftInterval)) {
+        timeShiftMap[timeShift].forEach((columnId) => {
+          warningMessages.push(
+            <FormattedMessage
+              key={`multiple-${columnId}`}
+              id="xpack.lens.indexPattern.timeShiftMultipleWarning"
+              defaultMessage="{label} uses a time shift of {columnTimeShift} which is not a multiple of the date histogram interval of {interval}. To prevent mismatched data, use a multiple of {interval} as time shift."
+              values={{
+                label: <strong>{layer.columns[columnId].label}</strong>,
+                interval: dateHistogramInterval,
+                columnTimeShift: layer.columns[columnId].timeShift!,
+              }}
+            />
+          );
+        });
+      }
+    });
+  });
+  return warningMessages;
+}
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 81dff1da57809..64b0bdd7ca2a6 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.test.ts
@@ -7,7 +7,7 @@
 
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { getIndexPatternDatasource, IndexPatternColumn } from './indexpattern';
-import { DatasourcePublicAPI, Operation, Datasource } from '../types';
+import { DatasourcePublicAPI, Operation, Datasource, FramePublicAPI } from '../types';
 import { coreMock } from 'src/core/public/mocks';
 import { IndexPatternPersistedState, IndexPatternPrivateState } from './types';
 import { dataPluginMock } from '../../../../../src/plugins/data/public/mocks';
@@ -18,6 +18,7 @@ import { operationDefinitionMap, getErrorMessages } from './operations';
 import { createMockedFullReference } from './operations/mocks';
 import { indexPatternFieldEditorPluginMock } from 'src/plugins/index_pattern_field_editor/public/mocks';
 import { uiActionsPluginMock } from '../../../../../src/plugins/ui_actions/public/mocks';
+import React from 'react';
 
 jest.mock('./loader');
 jest.mock('../id_generator');
@@ -500,6 +501,43 @@ describe('IndexPattern Data Source', () => {
       expect(ast.chain[0].arguments.timeFields).toEqual(['timestamp', 'another_datefield']);
     });
 
+    it('should pass time shift parameter to metric agg functions', async () => {
+      const queryBaseState: IndexPatternBaseState = {
+        currentIndexPatternId: '1',
+        layers: {
+          first: {
+            indexPatternId: '1',
+            columnOrder: ['col2', 'col1'],
+            columns: {
+              col1: {
+                label: 'Count of records',
+                dataType: 'number',
+                isBucketed: false,
+                sourceField: 'Records',
+                operationType: 'count',
+                timeShift: '1d',
+              },
+              col2: {
+                label: 'Date',
+                dataType: 'date',
+                isBucketed: true,
+                operationType: 'date_histogram',
+                sourceField: 'timestamp',
+                params: {
+                  interval: 'auto',
+                },
+              },
+            },
+          },
+        },
+      };
+
+      const state = enrichBaseState(queryBaseState);
+
+      const ast = indexPatternDatasource.toExpression(state, 'first') as Ast;
+      expect((ast.chain[0].arguments.aggs[1] as Ast).chain[0].arguments.timeShift).toEqual(['1d']);
+    });
+
     it('should wrap filtered metrics in filtered metric aggregation', async () => {
       const queryBaseState: IndexPatternBaseState = {
         currentIndexPatternId: '1',
@@ -1267,6 +1305,135 @@ describe('IndexPattern Data Source', () => {
     });
   });
 
+  describe('#getWarningMessages', () => {
+    it('should return mismatched time shifts', () => {
+      const state: IndexPatternPrivateState = {
+        indexPatternRefs: [],
+        existingFields: {},
+        isFirstExistenceFetch: false,
+        indexPatterns: expectedIndexPatterns,
+        layers: {
+          first: {
+            indexPatternId: '1',
+            columnOrder: ['col1', 'col2', 'col3', 'col4', 'col5', 'col6'],
+            columns: {
+              col1: {
+                operationType: 'date_histogram',
+                params: {
+                  interval: '12h',
+                },
+                label: '',
+                dataType: 'date',
+                isBucketed: true,
+                sourceField: 'timestamp',
+              },
+              col2: {
+                operationType: 'count',
+                label: '',
+                dataType: 'number',
+                isBucketed: false,
+                sourceField: 'records',
+              },
+              col3: {
+                operationType: 'count',
+                timeShift: '1h',
+                label: '',
+                dataType: 'number',
+                isBucketed: false,
+                sourceField: 'records',
+              },
+              col4: {
+                operationType: 'count',
+                timeShift: '13h',
+                label: '',
+                dataType: 'number',
+                isBucketed: false,
+                sourceField: 'records',
+              },
+              col5: {
+                operationType: 'count',
+                timeShift: '1w',
+                label: '',
+                dataType: 'number',
+                isBucketed: false,
+                sourceField: 'records',
+              },
+              col6: {
+                operationType: 'count',
+                timeShift: 'previous',
+                label: '',
+                dataType: 'number',
+                isBucketed: false,
+                sourceField: 'records',
+              },
+            },
+          },
+        },
+        currentIndexPatternId: '1',
+      };
+      const warnings = indexPatternDatasource.getWarningMessages!(state, ({
+        activeData: {
+          first: {
+            type: 'datatable',
+            rows: [],
+            columns: [
+              {
+                id: 'col1',
+                name: 'col1',
+                meta: {
+                  type: 'date',
+                  source: 'esaggs',
+                  sourceParams: {
+                    type: 'date_histogram',
+                    params: {
+                      used_interval: '12h',
+                    },
+                  },
+                },
+              },
+            ],
+          },
+        },
+      } as unknown) as FramePublicAPI);
+      expect(warnings!.length).toBe(2);
+      expect((warnings![0] as React.ReactElement).props.id).toEqual(
+        'xpack.lens.indexPattern.timeShiftSmallWarning'
+      );
+      expect((warnings![1] as React.ReactElement).props.id).toEqual(
+        'xpack.lens.indexPattern.timeShiftMultipleWarning'
+      );
+    });
+
+    it('should prepend each error with its layer number on multi-layer chart', () => {
+      (getErrorMessages as jest.Mock).mockClear();
+      (getErrorMessages as jest.Mock).mockReturnValueOnce(['error 1', 'error 2']);
+      const state: IndexPatternPrivateState = {
+        indexPatternRefs: [],
+        existingFields: {},
+        isFirstExistenceFetch: false,
+        indexPatterns: expectedIndexPatterns,
+        layers: {
+          first: {
+            indexPatternId: '1',
+            columnOrder: [],
+            columns: {},
+          },
+          second: {
+            indexPatternId: '1',
+            columnOrder: [],
+            columns: {},
+          },
+        },
+        currentIndexPatternId: '1',
+      };
+      expect(indexPatternDatasource.getErrorMessages(state)).toEqual([
+        { longMessage: 'Layer 1 error: error 1', shortMessage: '' },
+        { longMessage: 'Layer 1 error: error 2', shortMessage: '' },
+      ]);
+      expect(getErrorMessages).toHaveBeenCalledTimes(2);
+    });
+  });
+
   describe('#updateStateOnCloseDimension', () => {
     it('should not update when there are no incomplete columns', () => {
       expect(
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
index 8fb0994c42fb9..7cb49de15c066 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern.tsx
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import _ from 'lodash';
 import React from 'react';
 import { render } from 'react-dom';
 import { I18nProvider } from '@kbn/i18n/react';
@@ -56,6 +55,7 @@ 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 { getTimeShiftWarningMessages } from './dimension_panel/time_shift';
 
 export { OperationType, IndexPatternColumn, deleteColumn } from './operations';
 
@@ -408,13 +408,20 @@ export function getIndexPatternDatasource({
       }
 
       // Forward the indexpattern as well, as it is required by some operationType checks
-      const layerErrors = Object.values(state.layers).map((layer) =>
-        (getErrorMessages(layer, state.indexPatterns[layer.indexPatternId]) ?? []).map(
-          (message) => ({
-            shortMessage: '', // Not displayed currently
-            longMessage: message,
-          })
-        )
+      const layerErrors = Object.entries(state.layers).map(([layerId, layer]) =>
+        (
+          getErrorMessages(
+            layer,
+            state.indexPatterns[layer.indexPatternId],
+            state,
+            layerId,
+            core
+          ) ?? []
+        ).map((message) => ({
+          shortMessage: '', // Not displayed currently
+          longMessage: typeof message === 'string' ? message : message.message,
+          fixAction: typeof message === 'object' ? message.fixAction : undefined,
+        }))
       );
 
       // Single layer case, no need to explain more
@@ -450,6 +457,7 @@ export function getIndexPatternDatasource({
       });
       return messages.length ? messages : undefined;
     },
+    getWarningMessages: getTimeShiftWarningMessages,
     checkIntegrity: (state) => {
       const ids = Object.values(state.layers || {}).map(({ indexPatternId }) => indexPatternId);
       return ids.filter((id) => !state.indexPatterns[id]);
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 bde07c182555e..803ba9f5bae5d 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/indexpattern_suggestions.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import _ from 'lodash';
+import { flatten, minBy, pick, mapValues } from 'lodash';
 import { i18n } from '@kbn/i18n';
 import { generateId } from '../id_generator';
 import { DatasourceSuggestion, TableChangeType } from '../types';
@@ -58,9 +58,9 @@ function buildSuggestion({
   // It's fairly easy to accidentally introduce a mismatch between
   // columnOrder and columns, so this is a safeguard to ensure the
   // two match up.
-  const layers = _.mapValues(updatedState.layers, (layer) => ({
+  const layers = mapValues(updatedState.layers, (layer) => ({
     ...layer,
-    columns: _.pick(layer.columns, layer.columnOrder) as Record<string, IndexPatternColumn>,
+    columns: pick(layer.columns, layer.columnOrder) as Record<string, IndexPatternColumn>,
   }));
 
   const columnOrder = layers[layerId].columnOrder;
@@ -111,7 +111,7 @@ export function getDatasourceSuggestionsForField(
     // The field we're suggesting on matches an existing layer. In this case we find the layer with
     // the fewest configured columns and try to add the field to this table. If this layer does not
     // contain any layers yet, behave as if there is no layer.
-    const mostEmptyLayerId = _.minBy(
+    const mostEmptyLayerId = minBy(
       layerIds,
       (layerId) => state.layers[layerId].columnOrder.length
     ) as string;
@@ -386,7 +386,7 @@ export function getDatasourceSuggestionsFromCurrentState(
       ]);
   }
 
-  return _.flatten(
+  return flatten(
     Object.entries(state.layers || {})
       .filter(([_id, layer]) => layer.columnOrder.length && layer.indexPatternId)
       .map(([layerId, layer]) => {
@@ -586,7 +586,7 @@ function createSimplifiedTableSuggestions(state: IndexPatternPrivateState, layer
     availableReferenceColumns,
   ] = getExistingColumnGroups(layer);
 
-  return _.flatten(
+  return flatten(
     availableBucketedColumns.map((_col, index) => {
       // build suggestions with fewer buckets
       const bucketedColumns = availableBucketedColumns.slice(0, index + 1);
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 d3913728cb64e..192f3d3c0c535 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.test.ts
@@ -6,7 +6,7 @@
  */
 
 import { HttpHandler } from 'kibana/public';
-import _ from 'lodash';
+import { last } from 'lodash';
 import {
   loadInitialState,
   loadIndexPatterns,
@@ -841,7 +841,7 @@ describe('loader', () => {
     it('should call once for each index pattern', async () => {
       const setState = jest.fn();
       const fetchJson = (jest.fn((path: string) => {
-        const indexPatternTitle = _.last(path.split('/'));
+        const indexPatternTitle = last(path.split('/'));
         return {
           indexPatternTitle,
           existingFieldNames: ['field_1', 'field_2'].map(
@@ -891,7 +891,7 @@ describe('loader', () => {
       const setState = jest.fn();
       const showNoDataPopover = jest.fn();
       const fetchJson = (jest.fn((path: string) => {
-        const indexPatternTitle = _.last(path.split('/'));
+        const indexPatternTitle = last(path.split('/'));
         return {
           indexPatternTitle,
           existingFieldNames:
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
index 0eb661e92bb1d..2921251babe7f 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/loader.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import _ from 'lodash';
+import { uniq, mapValues } from 'lodash';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { HttpSetup, SavedObjectReference } from 'kibana/public';
 import { InitializationOptions, StateSetter } from '../types';
@@ -227,7 +227,7 @@ export async function loadInitialState({
   const state =
     persistedState && references ? injectReferences(persistedState, references) : undefined;
 
-  const requiredPatterns: string[] = _.uniq(
+  const requiredPatterns: string[] = uniq(
     state
       ? Object.values(state.layers)
           .map((l) => l.indexPatternId)
@@ -312,7 +312,7 @@ export async function changeIndexPattern({
     setState((s) => ({
       ...s,
       layers: isSingleEmptyLayer(state.layers)
-        ? _.mapValues(state.layers, (layer) => updateLayerIndexPattern(layer, indexPatterns[id]))
+        ? mapValues(state.layers, (layer) => updateLayerIndexPattern(layer, indexPatterns[id]))
         : state.layers,
       indexPatterns: {
         ...s.indexPatterns,
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
index e71b26b9d4cd9..4545e42b2ff99 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/mocks.ts
@@ -71,7 +71,7 @@ export const createMockedIndexPatternWithoutType = (
       searchable: true,
       aggregatable: true,
       scripted: true,
-      lang: 'painless',
+      lang: 'painless' as const,
       script: '1234',
     },
   ].filter(({ type }) => type !== typeToFilter);
@@ -145,7 +145,7 @@ export const createMockedIndexPattern = (): IndexPattern => {
       searchable: true,
       aggregatable: true,
       scripted: true,
-      lang: 'painless',
+      lang: 'painless' as const,
       script: '1234',
     },
   ];
@@ -183,7 +183,7 @@ export const createMockedRestrictedIndexPattern = () => {
       searchable: true,
       scripted: true,
       esTypes: ['keyword'],
-      lang: 'painless',
+      lang: 'painless' as const,
       script: '1234',
     },
   ];
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/counter_rate.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/counter_rate.tsx
index fc9504f003198..823ec3eb58a92 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/counter_rate.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/counter_rate.tsx
@@ -70,7 +70,8 @@ export const counterRateOperation: OperationDefinition<
       ref && 'sourceField' in ref
         ? indexPattern.getFieldByName(ref.sourceField)?.displayName
         : undefined,
-      column.timeScale
+      column.timeScale,
+      column.timeShift
     );
   },
   toExpression: (layer, columnId) => {
@@ -84,7 +85,8 @@ export const counterRateOperation: OperationDefinition<
         metric && 'sourceField' in metric
           ? indexPattern.getFieldByName(metric.sourceField)?.displayName
           : undefined,
-        timeScale
+        timeScale,
+        previousColumn?.timeShift
       ),
       dataType: 'number',
       operationType: 'counter_rate',
@@ -92,6 +94,7 @@ export const counterRateOperation: OperationDefinition<
       scale: 'ratio',
       references: referenceIds,
       timeScale,
+      timeShift: previousColumn?.timeShift,
       filter: getFilter(previousColumn, columnParams),
       params: getFormatFromPreviousColumn(previousColumn),
     };
@@ -118,4 +121,5 @@ export const counterRateOperation: OperationDefinition<
   },
   timeScalingMode: 'mandatory',
   filterable: true,
+  shiftable: true,
 };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/cumulative_sum.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/cumulative_sum.tsx
index 2adb9a1376f60..c4f01e27be886 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/cumulative_sum.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/cumulative_sum.tsx
@@ -13,11 +13,12 @@ import {
   getErrorsForDateReference,
   dateBasedOperationToExpression,
   hasDateField,
+  buildLabelFunction,
 } from './utils';
 import { OperationDefinition } from '..';
 import { getFormatFromPreviousColumn, getFilter } from '../helpers';
 
-const ofName = (name?: string) => {
+const ofName = buildLabelFunction((name?: string) => {
   return i18n.translate('xpack.lens.indexPattern.cumulativeSumOf', {
     defaultMessage: 'Cumulative sum of {name}',
     values: {
@@ -28,7 +29,7 @@ const ofName = (name?: string) => {
         }),
     },
   });
-};
+});
 
 export type CumulativeSumIndexPatternColumn = FormattedIndexPatternColumn &
   ReferenceBasedIndexPatternColumn & {
@@ -67,7 +68,9 @@ export const cumulativeSumOperation: OperationDefinition<
     return ofName(
       ref && 'sourceField' in ref
         ? indexPattern.getFieldByName(ref.sourceField)?.displayName
-        : undefined
+        : undefined,
+      undefined,
+      column.timeShift
     );
   },
   toExpression: (layer, columnId) => {
@@ -79,12 +82,15 @@ export const cumulativeSumOperation: OperationDefinition<
       label: ofName(
         ref && 'sourceField' in ref
           ? indexPattern.getFieldByName(ref.sourceField)?.displayName
-          : undefined
+          : undefined,
+        undefined,
+        previousColumn?.timeShift
       ),
       dataType: 'number',
       operationType: 'cumulative_sum',
       isBucketed: false,
       scale: 'ratio',
+      timeShift: previousColumn?.timeShift,
       filter: getFilter(previousColumn, columnParams),
       references: referenceIds,
       params: getFormatFromPreviousColumn(previousColumn),
@@ -111,4 +117,5 @@ export const cumulativeSumOperation: OperationDefinition<
     )?.join(', ');
   },
   filterable: true,
+  shiftable: true,
 };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/differences.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/differences.tsx
index 06555a9b41c2f..7c48b5742b8db 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/differences.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/differences.tsx
@@ -66,7 +66,7 @@ export const derivativeOperation: OperationDefinition<
     }
   },
   getDefaultLabel: (column, indexPattern, columns) => {
-    return ofName(columns[column.references[0]]?.label, column.timeScale);
+    return ofName(columns[column.references[0]]?.label, column.timeScale, column.timeShift);
   },
   toExpression: (layer, columnId) => {
     return dateBasedOperationToExpression(layer, columnId, 'derivative');
@@ -74,7 +74,7 @@ export const derivativeOperation: OperationDefinition<
   buildColumn: ({ referenceIds, previousColumn, layer }, columnParams) => {
     const ref = layer.columns[referenceIds[0]];
     return {
-      label: ofName(ref?.label, previousColumn?.timeScale),
+      label: ofName(ref?.label, previousColumn?.timeScale, previousColumn?.timeShift),
       dataType: 'number',
       operationType: OPERATION_NAME,
       isBucketed: false,
@@ -82,6 +82,7 @@ export const derivativeOperation: OperationDefinition<
       references: referenceIds,
       timeScale: previousColumn?.timeScale,
       filter: getFilter(previousColumn, columnParams),
+      timeShift: previousColumn?.timeShift,
       params: getFormatFromPreviousColumn(previousColumn),
     };
   },
@@ -108,4 +109,5 @@ export const derivativeOperation: OperationDefinition<
   },
   timeScalingMode: 'optional',
   filterable: true,
+  shiftable: true,
 };
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/moving_average.tsx b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/moving_average.tsx
index 0e74ef6b85c80..a3d0241d4887e 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/moving_average.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/moving_average.tsx
@@ -76,7 +76,7 @@ export const movingAverageOperation: OperationDefinition<
     }
   },
   getDefaultLabel: (column, indexPattern, columns) => {
-    return ofName(columns[column.references[0]]?.label, column.timeScale);
+    return ofName(columns[column.references[0]]?.label, column.timeScale, column.timeShift);
   },
   toExpression: (layer, columnId) => {
     return dateBasedOperationToExpression(layer, columnId, 'moving_average', {
@@ -90,7 +90,7 @@ export const movingAverageOperation: OperationDefinition<
     const metric = layer.columns[referenceIds[0]];
     const { window = WINDOW_DEFAULT_VALUE } = columnParams;
     return {
-      label: ofName(metric?.label, previousColumn?.timeScale),
+      label: ofName(metric?.label, previousColumn?.timeScale, previousColumn?.timeShift),
       dataType: 'number',
       operationType: 'moving_average',
       isBucketed: false,
@@ -98,6 +98,7 @@ export const movingAverageOperation: OperationDefinition<
       references: referenceIds,
       timeScale: previousColumn?.timeScale,
       filter: getFilter(previousColumn, columnParams),
+      timeShift: previousColumn?.timeShift,
       params: {
         window,
         ...getFormatFromPreviousColumn(previousColumn),
@@ -129,6 +130,7 @@ export const movingAverageOperation: OperationDefinition<
   },
   timeScalingMode: 'optional',
   filterable: true,
+  shiftable: true,
 };
 
 function MovingAverageParamEditor({
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/utils.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/utils.ts
index 59dbf74c11480..1f4f097c6a7fb 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/utils.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/definitions/calculations/utils.ts
@@ -16,10 +16,11 @@ import { operationDefinitionMap } from '..';
 
 export const buildLabelFunction = (ofName: (name?: string) => string) => (
   name?: string,
-  timeScale?: TimeScaleUnit
+  timeScale?: TimeScaleUnit,
+  timeShift?: string
 ) => {
   const rawLabel = ofName(name);
-  return adjustTimeScaleLabelSuffix(rawLabel, undefined, timeScale);
+  return adjustTimeScaleLabelSuffix(rawLabel, undefined, timeScale, undefined, timeShift);
 };
 
 /**
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 e77357a6f441a..1911af0a6f679 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
@@ -17,6 +17,7 @@ import {
   getSafeName,
   getFilter,
 } from './helpers';
+import { adjustTimeScaleLabelSuffix } from '../time_scale_utils';
 
 const supportedTypes = new Set([
   'string',
@@ -33,13 +34,19 @@ const SCALE = 'ratio';
 const OPERATION_TYPE = 'unique_count';
 const IS_BUCKETED = false;
 
-function ofName(name: string) {
-  return i18n.translate('xpack.lens.indexPattern.cardinalityOf', {
-    defaultMessage: 'Unique count of {name}',
-    values: {
-      name,
-    },
-  });
+function ofName(name: string, timeShift: string | undefined) {
+  return adjustTimeScaleLabelSuffix(
+    i18n.translate('xpack.lens.indexPattern.cardinalityOf', {
+      defaultMessage: 'Unique count of {name}',
+      values: {
+        name,
+      },
+    }),
+    undefined,
+    undefined,
+    undefined,
+    timeShift
+  );
 }
 
 export interface CardinalityIndexPatternColumn
@@ -76,21 +83,19 @@ export const cardinalityOperation: OperationDefinition<CardinalityIndexPatternCo
     );
   },
   filterable: true,
-
-  operationParams: [
-    { name: 'kql', type: 'string', required: false },
-    { name: 'lucene', type: 'string', required: false },
-  ],
-  getDefaultLabel: (column, indexPattern) => ofName(getSafeName(column.sourceField, indexPattern)),
+  shiftable: true,
+  getDefaultLabel: (column, indexPattern) =>
+    ofName(getSafeName(column.sourceField, indexPattern), column.timeShift),
   buildColumn({ field, previousColumn }, columnParams) {
     return {
-      label: ofName(field.displayName),
+      label: ofName(field.displayName, previousColumn?.timeShift),
       dataType: 'number',
       operationType: OPERATION_TYPE,
       scale: SCALE,
       sourceField: field.name,
       isBucketed: IS_BUCKETED,
       filter: getFilter(previousColumn, columnParams),
+      timeShift: previousColumn?.timeShift,
       params: getFormatFromPreviousColumn(previousColumn),
     };
   },
@@ -100,12 +105,14 @@ export const cardinalityOperation: OperationDefinition<CardinalityIndexPatternCo
       enabled: true,
       schema: 'metric',
       field: column.sourceField,
+      // time shift is added to wrapping aggFilteredMetric if filter is set
+      timeShift: column.filter ? undefined : column.timeShift,
     }).toAst();
   },
   onFieldChange: (oldColumn, field) => {
     return {
       ...oldColumn,
-      label: ofName(field.displayName),
+      label: ofName(field.displayName, oldColumn.timeShift),
       sourceField: field.name,
     };
   },
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 aa6b8675333c5..ae606a5851665 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
@@ -16,6 +16,7 @@ export interface BaseIndexPatternColumn extends Operation {
   customLabel?: boolean;
   timeScale?: TimeScaleUnit;
   filter?: Query;
+  timeShift?: string;
 }
 
 // Formatting can optionally be added to any column
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 fd474ea04a165..7bf463a2095ad 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
@@ -38,7 +38,13 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn, 'field
   onFieldChange: (oldColumn, field) => {
     return {
       ...oldColumn,
-      label: adjustTimeScaleLabelSuffix(field.displayName, undefined, oldColumn.timeScale),
+      label: adjustTimeScaleLabelSuffix(
+        field.displayName,
+        undefined,
+        oldColumn.timeScale,
+        undefined,
+        oldColumn.timeShift
+      ),
       sourceField: field.name,
     };
   },
@@ -51,10 +57,23 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn, 'field
       };
     }
   },
-  getDefaultLabel: (column) => adjustTimeScaleLabelSuffix(countLabel, undefined, column.timeScale),
+  getDefaultLabel: (column) =>
+    adjustTimeScaleLabelSuffix(
+      countLabel,
+      undefined,
+      column.timeScale,
+      undefined,
+      column.timeShift
+    ),
   buildColumn({ field, previousColumn }, columnParams) {
     return {
-      label: adjustTimeScaleLabelSuffix(countLabel, undefined, previousColumn?.timeScale),
+      label: adjustTimeScaleLabelSuffix(
+        countLabel,
+        undefined,
+        previousColumn?.timeScale,
+        undefined,
+        previousColumn?.timeShift
+      ),
       dataType: 'number',
       operationType: 'count',
       isBucketed: false,
@@ -62,6 +81,7 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn, 'field
       sourceField: field.name,
       timeScale: previousColumn?.timeScale,
       filter: getFilter(previousColumn, columnParams),
+      timeShift: previousColumn?.timeShift,
       params:
         previousColumn?.dataType === 'number' &&
         previousColumn.params &&
@@ -82,6 +102,8 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn, 'field
       id: columnId,
       enabled: true,
       schema: 'metric',
+      // time shift is added to wrapping aggFilteredMetric if filter is set
+      timeShift: column.filter ? undefined : column.timeShift,
     }).toAst();
   },
   isTransferable: () => {
@@ -89,4 +111,5 @@ export const countOperation: OperationDefinition<CountIndexPatternColumn, 'field
   },
   timeScalingMode: 'optional',
   filterable: true,
+  shiftable: true,
 };
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 affb84484c820..a645079c7b9f8 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,7 +23,7 @@ import {
   EuiTextColor,
 } from '@elastic/eui';
 import { updateColumnParam } from '../layer_helpers';
-import { OperationDefinition } from './index';
+import { OperationDefinition, ParamEditorProps } from './index';
 import { FieldBasedIndexPatternColumn } from './column_types';
 import {
   AggFunctionsMapping,
@@ -35,6 +35,7 @@ import {
 import { buildExpressionFunction } from '../../../../../../../src/plugins/expressions/public';
 import { getInvalidFieldMessage, getSafeName } from './helpers';
 import { HelpPopover, HelpPopoverButton } from '../../help_popover';
+import { IndexPatternLayer } from '../../types';
 
 const { isValidInterval } = search.aggs;
 const autoInterval = 'auto';
@@ -48,6 +49,28 @@ export interface DateHistogramIndexPatternColumn extends FieldBasedIndexPatternC
   };
 }
 
+function getMultipleDateHistogramsErrorMessage(layer: IndexPatternLayer, columnId: string) {
+  const usesTimeShift = Object.values(layer.columns).some(
+    (col) => col.timeShift && col.timeShift !== ''
+  );
+  if (!usesTimeShift) {
+    return undefined;
+  }
+  const dateHistograms = layer.columnOrder.filter(
+    (colId) => layer.columns[colId].operationType === 'date_histogram'
+  );
+  if (dateHistograms.length < 2) {
+    return undefined;
+  }
+  return i18n.translate('xpack.lens.indexPattern.multipleDateHistogramsError', {
+    defaultMessage:
+      '"{dimensionLabel}" is not the only date histogram. When using time shifts, make sure to only use one date histogram.',
+    values: {
+      dimensionLabel: layer.columns[columnId].label,
+    },
+  });
+}
+
 export const dateHistogramOperation: OperationDefinition<
   DateHistogramIndexPatternColumn,
   'field'
@@ -60,7 +83,13 @@ export const dateHistogramOperation: OperationDefinition<
   priority: 5, // Highest priority level used
   operationParams: [{ name: 'interval', type: 'string', required: false }],
   getErrorMessage: (layer, columnId, indexPattern) =>
-    getInvalidFieldMessage(layer.columns[columnId] as FieldBasedIndexPatternColumn, indexPattern),
+    [
+      ...(getInvalidFieldMessage(
+        layer.columns[columnId] as FieldBasedIndexPatternColumn,
+        indexPattern
+      ) || []),
+      getMultipleDateHistogramsErrorMessage(layer, columnId) || '',
+    ].filter(Boolean),
   getHelpMessage: (props) => <AutoDateHistogramPopover {...props} />,
   getPossibleOperationForField: ({ aggregationRestrictions, aggregatable, type }) => {
     if (
@@ -150,7 +179,15 @@ export const dateHistogramOperation: OperationDefinition<
       extended_bounds: JSON.stringify({}),
     }).toAst();
   },
-  paramEditor: ({ layer, columnId, currentColumn, updateLayer, dateRange, data, indexPattern }) => {
+  paramEditor: function ParamEditor({
+    layer,
+    columnId,
+    currentColumn,
+    updateLayer,
+    dateRange,
+    data,
+    indexPattern,
+  }: ParamEditorProps<DateHistogramIndexPatternColumn>) {
     const field = currentColumn && indexPattern.getFieldByName(currentColumn.sourceField);
     const intervalIsRestricted =
       field!.aggregationRestrictions && field!.aggregationRestrictions.date_histogram;
@@ -225,10 +262,11 @@ export const dateHistogramOperation: OperationDefinition<
                       disabled={calendarOnlyIntervals.has(interval.unit)}
                       isInvalid={!isValid}
                       onChange={(e) => {
-                        setInterval({
+                        const newInterval = {
                           ...interval,
                           value: e.target.value,
-                        });
+                        };
+                        setInterval(newInterval);
                       }}
                     />
                   </EuiFlexItem>
@@ -238,10 +276,11 @@ export const dateHistogramOperation: OperationDefinition<
                       data-test-subj="lensDateHistogramUnit"
                       value={interval.unit}
                       onChange={(e) => {
-                        setInterval({
+                        const newInterval = {
                           ...interval,
                           unit: e.target.value,
-                        });
+                        };
+                        setInterval(newInterval);
                       }}
                       isInvalid={!isValid}
                       options={[
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 6d1cc3254ca7e..1c2e64735ca16 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,6 +13,7 @@ import { createMockedIndexPattern } from '../../../mocks';
 import { FilterPopover } from './filter_popover';
 import { LabelInput } from '../shared_components';
 import { QueryInput } from '../../../query_input';
+import { QueryStringInput } from '../../../../../../../../src/plugins/data/public';
 
 jest.mock('.', () => ({
   isQueryValid: () => true,
@@ -32,13 +33,25 @@ const defaultProps = {
   ),
   initiallyOpen: true,
 };
+jest.mock('../../../../../../../../src/plugins/data/public', () => ({
+  QueryStringInput: () => {
+    return 'QueryStringInput';
+  },
+}));
 
 describe('filter popover', () => {
-  jest.mock('../../../../../../../../src/plugins/data/public', () => ({
-    QueryStringInput: () => {
-      return 'QueryStringInput';
-    },
-  }));
+  it('passes correct props to QueryStringInput', () => {
+    const instance = mount(<FilterPopover {...defaultProps} />);
+    instance.update();
+    expect(instance.find(QueryStringInput).props()).toEqual(
+      expect.objectContaining({
+        dataTestSubj: 'indexPattern-filters-queryStringInput',
+        indexPatterns: ['my-fake-index-pattern'],
+        isInvalid: false,
+        query: { language: 'kuery', query: 'bytes >= 1' },
+      })
+    );
+  });
   it('should be open if is open by creation', () => {
     const instance = mount(<FilterPopover {...defaultProps} />);
     instance.update();
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 f5428bf24348f..bfb0cffece57c 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
@@ -75,7 +75,7 @@ export const FilterPopover = ({
       <QueryInput
         isInvalid={!isQueryValid(filter.input, indexPattern)}
         value={filter.input}
-        indexPattern={indexPattern}
+        indexPatternTitle={indexPattern.title}
         onChange={setFilterQuery}
         onSubmit={() => {
           if (inputRef.current) inputRef.current.focus();
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 6772432664d8c..164415c1a1f6f 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,7 +5,7 @@
  * 2.0.
  */
 
-import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
+import { IUiSettingsClient, SavedObjectsClientContract, HttpSetup, CoreStart } from 'kibana/public';
 import { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { termsOperation, TermsIndexPatternColumn } from './terms';
 import { filtersOperation, FiltersIndexPatternColumn } from './filters';
@@ -42,13 +42,14 @@ import {
   FormulaIndexPatternColumn,
 } from './formula';
 import { lastValueOperation, LastValueIndexPatternColumn } from './last_value';
-import { OperationMetadata } from '../../../types';
+import { FramePublicAPI, OperationMetadata } from '../../../types';
 import type { BaseIndexPatternColumn, ReferenceBasedIndexPatternColumn } from './column_types';
 import { IndexPattern, IndexPatternField, IndexPatternLayer } from '../../types';
 import { DateRange } from '../../../../common';
 import { ExpressionAstFunction } from '../../../../../../../src/plugins/expressions/public';
 import { DataPublicPluginStart } from '../../../../../../../src/plugins/data/public';
 import { RangeIndexPatternColumn, rangeOperation } from './ranges';
+import { IndexPatternDimensionEditorProps } from '../../dimension_panel';
 
 /**
  * A union type of all available column types. If a column is of an unknown type somewhere
@@ -149,7 +150,9 @@ export { formulaOperation } from './formula/formula';
 export interface ParamEditorProps<C> {
   currentColumn: C;
   layer: IndexPatternLayer;
-  updateLayer: (newLayer: IndexPatternLayer) => void;
+  updateLayer: (
+    setter: IndexPatternLayer | ((prevLayer: IndexPatternLayer) => IndexPatternLayer)
+  ) => void;
   columnId: string;
   indexPattern: IndexPattern;
   uiSettings: IUiSettingsClient;
@@ -158,6 +161,7 @@ export interface ParamEditorProps<C> {
   http: HttpSetup;
   dateRange: DateRange;
   data: DataPublicPluginStart;
+  activeData?: IndexPatternDimensionEditorProps['activeData'];
   operationDefinitionMap: Record<string, GenericOperationDefinition>;
 }
 
@@ -238,7 +242,22 @@ interface BaseOperationDefinitionProps<C extends BaseIndexPatternColumn> {
     columnId: string,
     indexPattern: IndexPattern,
     operationDefinitionMap?: Record<string, GenericOperationDefinition>
-  ) => string[] | undefined;
+  ) =>
+    | Array<
+        | string
+        | {
+            message: string;
+            fixAction?: {
+              label: string;
+              newState: (
+                core: CoreStart,
+                frame: FramePublicAPI,
+                layerId: string
+              ) => Promise<IndexPatternLayer>;
+            };
+          }
+      >
+    | undefined;
 
   /*
    * Flag whether this operation can be scaled by time unit if a date histogram is available.
@@ -253,6 +272,7 @@ interface BaseOperationDefinitionProps<C extends BaseIndexPatternColumn> {
    * autocomplete.
    */
   filterable?: boolean;
+  shiftable?: boolean;
 
   getHelpMessage?: (props: HelpProps<C>) => React.ReactNode;
   /*
@@ -364,12 +384,27 @@ interface FieldBasedOperationDefinition<C extends BaseIndexPatternColumn> {
    * - Requires a date histogram operation somewhere before it in order
    * - Missing references
    */
-  getErrorMessage: (
+  getErrorMessage?: (
     layer: IndexPatternLayer,
     columnId: string,
     indexPattern: IndexPattern,
     operationDefinitionMap?: Record<string, GenericOperationDefinition>
-  ) => string[] | undefined;
+  ) =>
+    | Array<
+        | string
+        | {
+            message: string;
+            fixAction?: {
+              label: string;
+              newState: (
+                core: CoreStart,
+                frame: FramePublicAPI,
+                layerId: string
+              ) => Promise<IndexPatternLayer>;
+            };
+          }
+      >
+    | undefined;
 }
 
 export interface RequiredReference {
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 4632d262c441d..bde80accfbc67 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
@@ -21,14 +21,21 @@ import {
   getSafeName,
   getFilter,
 } from './helpers';
+import { adjustTimeScaleLabelSuffix } from '../time_scale_utils';
 
-function ofName(name: string) {
-  return i18n.translate('xpack.lens.indexPattern.lastValueOf', {
-    defaultMessage: 'Last value of {name}',
-    values: {
-      name,
-    },
-  });
+function ofName(name: string, timeShift: string | undefined) {
+  return adjustTimeScaleLabelSuffix(
+    i18n.translate('xpack.lens.indexPattern.lastValueOf', {
+      defaultMessage: 'Last value of {name}',
+      values: {
+        name,
+      },
+    }),
+    undefined,
+    undefined,
+    undefined,
+    timeShift
+  );
 }
 
 const supportedTypes = new Set(['string', 'boolean', 'number', 'ip']);
@@ -96,7 +103,8 @@ export const lastValueOperation: OperationDefinition<LastValueIndexPatternColumn
   displayName: i18n.translate('xpack.lens.indexPattern.lastValue', {
     defaultMessage: 'Last value',
   }),
-  getDefaultLabel: (column, indexPattern) => ofName(getSafeName(column.sourceField, indexPattern)),
+  getDefaultLabel: (column, indexPattern) =>
+    ofName(getSafeName(column.sourceField, indexPattern), column.timeShift),
   input: 'field',
   onFieldChange: (oldColumn, field) => {
     const newParams = { ...oldColumn.params };
@@ -107,7 +115,7 @@ export const lastValueOperation: OperationDefinition<LastValueIndexPatternColumn
     return {
       ...oldColumn,
       dataType: field.type as DataType,
-      label: ofName(field.displayName),
+      label: ofName(field.displayName, oldColumn.timeShift),
       sourceField: field.name,
       params: newParams,
       scale: field.type === 'string' ? 'ordinal' : 'ratio',
@@ -160,13 +168,14 @@ export const lastValueOperation: OperationDefinition<LastValueIndexPatternColumn
     }
 
     return {
-      label: ofName(field.displayName),
+      label: ofName(field.displayName, previousColumn?.timeShift),
       dataType: field.type as DataType,
       operationType: 'last_value',
       isBucketed: false,
       scale: field.type === 'string' ? 'ordinal' : 'ratio',
       sourceField: field.name,
       filter: getFilter(previousColumn, columnParams),
+      timeShift: previousColumn?.timeShift,
       params: {
         sortField,
         ...getFormatFromPreviousColumn(previousColumn),
@@ -174,6 +183,7 @@ export const lastValueOperation: OperationDefinition<LastValueIndexPatternColumn
     };
   },
   filterable: true,
+  shiftable: true,
   toEsAggsFn: (column, columnId) => {
     return buildExpressionFunction<AggFunctionsMapping['aggTopHit']>('aggTopHit', {
       id: columnId,
@@ -184,6 +194,8 @@ export const lastValueOperation: OperationDefinition<LastValueIndexPatternColumn
       size: 1,
       sortOrder: 'desc',
       sortField: column.params.sortField,
+      // time shift is added to wrapping aggFilteredMetric if filter is set
+      timeShift: column.filter ? undefined : column.timeShift,
     }).toAst();
   },
 
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 725ef93203a43..54a3ff0eb8bdb 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
@@ -54,10 +54,13 @@ function buildMetricOperation<T extends MetricColumn<string>>({
 }) {
   const labelLookup = (name: string, column?: BaseIndexPatternColumn) => {
     const label = ofName(name);
-    if (!optionalTimeScaling) {
-      return label;
-    }
-    return adjustTimeScaleLabelSuffix(label, undefined, column?.timeScale);
+    return adjustTimeScaleLabelSuffix(
+      label,
+      undefined,
+      optionalTimeScaling ? column?.timeScale : undefined,
+      undefined,
+      column?.timeShift
+    );
   };
 
   return {
@@ -104,6 +107,7 @@ function buildMetricOperation<T extends MetricColumn<string>>({
         scale: 'ratio',
         timeScale: optionalTimeScaling ? previousColumn?.timeScale : undefined,
         filter: getFilter(previousColumn, columnParams),
+        timeShift: previousColumn?.timeShift,
         params: getFormatFromPreviousColumn(previousColumn),
       } as T;
     },
@@ -120,11 +124,14 @@ function buildMetricOperation<T extends MetricColumn<string>>({
         enabled: true,
         schema: 'metric',
         field: column.sourceField,
+        // time shift is added to wrapping aggFilteredMetric if filter is set
+        timeShift: column.filter ? undefined : column.timeShift,
       }).toAst();
     },
     getErrorMessage: (layer, columnId, indexPattern) =>
       getInvalidFieldMessage(layer.columns[columnId] as FieldBasedIndexPatternColumn, indexPattern),
     filterable: true,
+    shiftable: true,
   } as OperationDefinition<T, 'field'>;
 }
 
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 4c09ae4ed8c47..aa8f951d46b4f 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
@@ -19,6 +19,7 @@ import {
   getFilter,
 } from './helpers';
 import { FieldBasedIndexPatternColumn } from './column_types';
+import { adjustTimeScaleLabelSuffix } from '../time_scale_utils';
 import { useDebounceWithOptions } from '../../../shared_components';
 
 export interface PercentileIndexPatternColumn extends FieldBasedIndexPatternColumn {
@@ -34,12 +35,18 @@ export interface PercentileIndexPatternColumn extends FieldBasedIndexPatternColu
   };
 }
 
-function ofName(name: string, percentile: number) {
-  return i18n.translate('xpack.lens.indexPattern.percentileOf', {
-    defaultMessage:
-      '{percentile, selectordinal, one {#st} two {#nd} few {#rd} other {#th}} percentile of {name}',
-    values: { name, percentile },
-  });
+function ofName(name: string, percentile: number, timeShift: string | undefined) {
+  return adjustTimeScaleLabelSuffix(
+    i18n.translate('xpack.lens.indexPattern.percentileOf', {
+      defaultMessage:
+        '{percentile, selectordinal, one {#st} two {#nd} few {#rd} other {#th}} percentile of {name}',
+      values: { name, percentile },
+    }),
+    undefined,
+    undefined,
+    undefined,
+    timeShift
+  );
 }
 
 const DEFAULT_PERCENTILE_VALUE = 95;
@@ -54,6 +61,7 @@ export const percentileOperation: OperationDefinition<PercentileIndexPatternColu
   input: 'field',
   operationParams: [{ name: 'percentile', type: 'number', required: false }],
   filterable: true,
+  shiftable: true,
   getPossibleOperationForField: ({ aggregationRestrictions, aggregatable, type: fieldType }) => {
     if (supportedFieldTypes.includes(fieldType) && aggregatable && !aggregationRestrictions) {
       return {
@@ -74,7 +82,11 @@ export const percentileOperation: OperationDefinition<PercentileIndexPatternColu
     );
   },
   getDefaultLabel: (column, indexPattern, columns) =>
-    ofName(getSafeName(column.sourceField, indexPattern), column.params.percentile),
+    ofName(
+      getSafeName(column.sourceField, indexPattern),
+      column.params.percentile,
+      column.timeShift
+    ),
   buildColumn: ({ field, previousColumn, indexPattern }, columnParams) => {
     const existingPercentileParam =
       previousColumn?.operationType === 'percentile' &&
@@ -84,13 +96,18 @@ export const percentileOperation: OperationDefinition<PercentileIndexPatternColu
     const newPercentileParam =
       columnParams?.percentile ?? (existingPercentileParam || DEFAULT_PERCENTILE_VALUE);
     return {
-      label: ofName(getSafeName(field.name, indexPattern), newPercentileParam),
+      label: ofName(
+        getSafeName(field.name, indexPattern),
+        newPercentileParam,
+        previousColumn?.timeShift
+      ),
       dataType: 'number',
       operationType: 'percentile',
       sourceField: field.name,
       isBucketed: false,
       scale: 'ratio',
       filter: getFilter(previousColumn, columnParams),
+      timeShift: previousColumn?.timeShift,
       params: {
         percentile: newPercentileParam,
         ...getFormatFromPreviousColumn(previousColumn),
@@ -100,7 +117,7 @@ export const percentileOperation: OperationDefinition<PercentileIndexPatternColu
   onFieldChange: (oldColumn, field) => {
     return {
       ...oldColumn,
-      label: ofName(field.displayName, oldColumn.params.percentile),
+      label: ofName(field.displayName, oldColumn.params.percentile, oldColumn.timeShift),
       sourceField: field.name,
     };
   },
@@ -113,6 +130,8 @@ export const percentileOperation: OperationDefinition<PercentileIndexPatternColu
         schema: 'metric',
         field: column.sourceField,
         percentile: column.params.percentile,
+        // time shift is added to wrapping aggFilteredMetric if filter is set
+        timeShift: column.filter ? undefined : column.timeShift,
       }
     ).toAst();
   },
@@ -146,7 +165,8 @@ export const percentileOperation: OperationDefinition<PercentileIndexPatternColu
                 : ofName(
                     indexPattern.getFieldByName(currentColumn.sourceField)?.displayName ||
                       currentColumn.sourceField,
-                    inputValueAsNumber
+                    inputValueAsNumber,
+                    currentColumn.timeShift
                   ),
               params: {
                 ...currentColumn.params,
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 52adf83752363..8248976ab8452 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
@@ -16,15 +16,23 @@ import {
   EuiAccordion,
   EuiIconTip,
 } from '@elastic/eui';
-import { AggFunctionsMapping } from '../../../../../../../../src/plugins/data/public';
+import { uniq } from 'lodash';
+import { CoreStart } from 'kibana/public';
+import { FieldStatsResponse } from '../../../../../common';
+import {
+  AggFunctionsMapping,
+  esQuery,
+  IIndexPattern,
+} from '../../../../../../../../src/plugins/data/public';
 import { buildExpressionFunction } from '../../../../../../../../src/plugins/expressions/public';
 import { updateColumnParam, isReferenced } from '../../layer_helpers';
-import { DataType } from '../../../../types';
-import { OperationDefinition } from '../index';
+import { DataType, FramePublicAPI } from '../../../../types';
+import { FiltersIndexPatternColumn, OperationDefinition, operationDefinitionMap } from '../index';
 import { FieldBasedIndexPatternColumn } from '../column_types';
 import { ValuesInput } from './values_input';
 import { getInvalidFieldMessage } from '../helpers';
-import type { IndexPatternLayer } from '../../../types';
+import type { IndexPatternLayer, IndexPattern } from '../../../types';
+import { defaultLabel } from '../filters';
 
 function ofName(name?: string) {
   return i18n.translate('xpack.lens.indexPattern.termsOf', {
@@ -50,6 +58,103 @@ function isSortableByColumn(layer: IndexPatternLayer, columnId: string) {
   );
 }
 
+function getDisallowedTermsMessage(
+  layer: IndexPatternLayer,
+  columnId: string,
+  indexPattern: IndexPattern
+) {
+  const hasMultipleShifts =
+    uniq(
+      Object.values(layer.columns)
+        .filter((col) => operationDefinitionMap[col.operationType].shiftable)
+        .map((col) => col.timeShift || '')
+    ).length > 1;
+  if (!hasMultipleShifts) {
+    return undefined;
+  }
+  return {
+    message: i18n.translate('xpack.lens.indexPattern.termsWithMultipleShifts', {
+      defaultMessage:
+        'In a single layer, you are unable to combine metrics with different time shifts and dynamic top values. Use the same time shift value for all metrics, or use filters instead of top values.',
+    }),
+    fixAction: {
+      label: i18n.translate('xpack.lens.indexPattern.termsWithMultipleShiftsFixActionLabel', {
+        defaultMessage: 'Use filters',
+      }),
+      newState: async (core: CoreStart, frame: FramePublicAPI, layerId: string) => {
+        const currentColumn = layer.columns[columnId] as TermsIndexPatternColumn;
+        const fieldName = currentColumn.sourceField;
+        const activeDataFieldNameMatch =
+          frame.activeData?.[layerId].columns.find(({ id }) => id === columnId)?.meta.field ===
+          fieldName;
+        let currentTerms = uniq(
+          frame.activeData?.[layerId].rows
+            .map((row) => row[columnId] as string)
+            .filter((term) => typeof term === 'string' && term !== '__other__') || []
+        );
+        if (!activeDataFieldNameMatch || currentTerms.length === 0) {
+          const response: FieldStatsResponse<string | number> = await core.http.post(
+            `/api/lens/index_stats/${indexPattern.id}/field`,
+            {
+              body: JSON.stringify({
+                fieldName,
+                dslQuery: esQuery.buildEsQuery(
+                  indexPattern as IIndexPattern,
+                  frame.query,
+                  frame.filters,
+                  esQuery.getEsQueryConfig(core.uiSettings)
+                ),
+                fromDate: frame.dateRange.fromDate,
+                toDate: frame.dateRange.toDate,
+                size: currentColumn.params.size,
+              }),
+            }
+          );
+          currentTerms = response.topValues?.buckets.map(({ key }) => String(key)) || [];
+        }
+        return {
+          ...layer,
+          columns: {
+            ...layer.columns,
+            [columnId]: {
+              label: i18n.translate('xpack.lens.indexPattern.pinnedTopValuesLabel', {
+                defaultMessage: 'Filters of {field}',
+                values: {
+                  field: fieldName,
+                },
+              }),
+              customLabel: true,
+              isBucketed: layer.columns[columnId].isBucketed,
+              dataType: 'string',
+              operationType: 'filters',
+              params: {
+                filters:
+                  currentTerms.length > 0
+                    ? currentTerms.map((term) => ({
+                        input: {
+                          query: `${fieldName}: "${term}"`,
+                          language: 'kuery',
+                        },
+                        label: term,
+                      }))
+                    : [
+                        {
+                          input: {
+                            query: '*',
+                            language: 'kuery',
+                          },
+                          label: defaultLabel,
+                        },
+                      ],
+              },
+            } as FiltersIndexPatternColumn,
+          },
+        };
+      },
+    },
+  };
+}
+
 const DEFAULT_SIZE = 3;
 const supportedTypes = new Set(['string', 'boolean', 'number', 'ip']);
 
@@ -90,7 +195,13 @@ export const termsOperation: OperationDefinition<TermsIndexPatternColumn, 'field
     }
   },
   getErrorMessage: (layer, columnId, indexPattern) =>
-    getInvalidFieldMessage(layer.columns[columnId] as FieldBasedIndexPatternColumn, indexPattern),
+    [
+      ...(getInvalidFieldMessage(
+        layer.columns[columnId] as FieldBasedIndexPatternColumn,
+        indexPattern
+      ) || []),
+      getDisallowedTermsMessage(layer, columnId, indexPattern) || '',
+    ].filter(Boolean),
   isTransferable: (column, newIndexPattern) => {
     const newField = newIndexPattern.getFieldByName(column.sourceField);
 
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 aab957c8ecebe..b272d1703377c 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
@@ -9,7 +9,12 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { shallow, mount } from 'enzyme';
 import { EuiFieldNumber, EuiSelect, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
-import type { IUiSettingsClient, SavedObjectsClientContract, HttpSetup } from 'kibana/public';
+import type {
+  IUiSettingsClient,
+  SavedObjectsClientContract,
+  HttpSetup,
+  CoreStart,
+} from 'kibana/public';
 import type { IStorageWrapper } from 'src/plugins/kibana_utils/public';
 import { dataPluginMock } from '../../../../../../../../src/plugins/data/public/mocks';
 import { createMockedIndexPattern } from '../../../mocks';
@@ -17,6 +22,7 @@ import { ValuesInput } from './values_input';
 import type { TermsIndexPatternColumn } from '.';
 import { termsOperation } from '../index';
 import { IndexPattern, IndexPatternLayer } from '../../../types';
+import { FramePublicAPI } from '../../../../types';
 
 const uiSettingsMock = {} as IUiSettingsClient;
 
@@ -986,8 +992,8 @@ describe('terms', () => {
         indexPatternId: '',
       };
     });
-    it('returns undefined if sourceField exists in index pattern', () => {
-      expect(termsOperation.getErrorMessage!(layer, 'col1', indexPattern)).toEqual(undefined);
+    it('returns empty array', () => {
+      expect(termsOperation.getErrorMessage!(layer, 'col1', indexPattern)).toEqual([]);
     });
     it('returns error message if the sourceField does not exist in index pattern', () => {
       layer = {
@@ -1003,5 +1009,102 @@ describe('terms', () => {
         'Field notExisting was not found',
       ]);
     });
+
+    describe('time shift error', () => {
+      beforeEach(() => {
+        layer = {
+          ...layer,
+          columnOrder: ['col1', 'col2', 'col3'],
+          columns: {
+            ...layer.columns,
+            col2: {
+              dataType: 'number',
+              isBucketed: false,
+              operationType: 'count',
+              label: 'Count',
+              sourceField: 'document',
+            },
+            col3: {
+              dataType: 'number',
+              isBucketed: false,
+              operationType: 'count',
+              label: 'Count',
+              sourceField: 'document',
+              timeShift: '1d',
+            },
+          },
+        };
+      });
+      it('returns error message if two time shifts are used together with terms', () => {
+        expect(termsOperation.getErrorMessage!(layer, 'col1', indexPattern)).toEqual([
+          expect.objectContaining({
+            message:
+              'In a single layer, you are unable to combine metrics with different time shifts and dynamic top values. Use the same time shift value for all metrics, or use filters instead of top values.',
+          }),
+        ]);
+      });
+      it('returns fix action which calls field information endpoint and creates a pinned top values', async () => {
+        const errorMessage = termsOperation.getErrorMessage!(layer, 'col1', indexPattern)![0];
+        const fixAction = (typeof errorMessage === 'object'
+          ? errorMessage.fixAction!.newState
+          : undefined)!;
+        const coreMock = ({
+          uiSettings: {
+            get: () => undefined,
+          },
+          http: {
+            post: jest.fn(() =>
+              Promise.resolve({
+                topValues: {
+                  buckets: [
+                    {
+                      key: 'A',
+                    },
+                    {
+                      key: 'B',
+                    },
+                  ],
+                },
+              })
+            ),
+          },
+        } as unknown) as CoreStart;
+        const newLayer = await fixAction(
+          coreMock,
+          ({
+            query: { language: 'kuery', query: 'a: b' },
+            filters: [],
+            dateRange: {
+              fromDate: '2020',
+              toDate: '2021',
+            },
+          } as unknown) as FramePublicAPI,
+          'first'
+        );
+        expect(newLayer.columns.col1).toEqual(
+          expect.objectContaining({
+            operationType: 'filters',
+            params: {
+              filters: [
+                {
+                  input: {
+                    language: 'kuery',
+                    query: 'bytes: "A"',
+                  },
+                  label: 'A',
+                },
+                {
+                  input: {
+                    language: 'kuery',
+                    query: 'bytes: "B"',
+                  },
+                  label: 'B',
+                },
+              ],
+            },
+          })
+        );
+      });
+    });
   });
 });
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 4dd56d2de1144..38bc84ae9af35 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
@@ -965,6 +965,41 @@ describe('state_helpers', () => {
         );
       });
 
+      it('should not carry over label when operation and field change at the same time', () => {
+        expect(
+          replaceColumn({
+            layer: {
+              indexPatternId: '1',
+              columnOrder: ['col1'],
+              columns: {
+                col1: {
+                  label: 'My custom label',
+                  customLabel: true,
+                  dataType: 'date',
+                  isBucketed: true,
+
+                  // Private
+                  operationType: 'date_histogram',
+                  sourceField: 'timestamp',
+                  params: {
+                    interval: 'h',
+                  },
+                },
+              },
+            },
+            indexPattern,
+            columnId: 'col1',
+            op: 'terms',
+            field: indexPattern.fields[4],
+            visualizationGroups: [],
+          }).columns.col1
+        ).toEqual(
+          expect.objectContaining({
+            label: 'Top values of source',
+          })
+        );
+      });
+
       it('should carry over label on operation switch when customLabel flag on previousColumn is set', () => {
         expect(
           replaceColumn({
@@ -2589,7 +2624,10 @@ describe('state_helpers', () => {
             col1: { operationType: 'average' },
           },
         },
-        indexPattern
+        indexPattern,
+        {},
+        '1',
+        {}
       );
       expect(mock).toHaveBeenCalled();
       expect(errors).toHaveLength(1);
@@ -2608,7 +2646,10 @@ describe('state_helpers', () => {
               { operationType: 'testReference', references: [] },
           },
         },
-        indexPattern
+        indexPattern,
+        {},
+        '1',
+        {}
       );
       expect(mock).toHaveBeenCalled();
       expect(errors).toHaveLength(1);
@@ -2637,7 +2678,10 @@ describe('state_helpers', () => {
             col1: { operationType: 'testIncompleteReference' },
           },
         },
-        indexPattern
+        indexPattern,
+        {},
+        '1',
+        {}
       );
       expect(savedRef).toHaveBeenCalled();
       expect(incompleteRef).not.toHaveBeenCalled();
@@ -2659,7 +2703,10 @@ describe('state_helpers', () => {
               { operationType: 'testReference', references: [] },
           },
         },
-        indexPattern
+        indexPattern,
+        {},
+        '1',
+        {}
       );
       expect(mock).toHaveBeenCalledWith(
         {
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 bc4a61eda3969..56fbb8edef5b4 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
@@ -5,9 +5,13 @@
  * 2.0.
  */
 
-import _, { partition } from 'lodash';
-import { getSortScoreByPriority } from './operations';
-import type { OperationMetadata, VisualizationDimensionGroupConfig } from '../../types';
+import { partition, mapValues, pickBy } from 'lodash';
+import { CoreStart } from 'kibana/public';
+import type {
+  FramePublicAPI,
+  OperationMetadata,
+  VisualizationDimensionGroupConfig,
+} from '../../types';
 import {
   operationDefinitionMap,
   operationDefinitions,
@@ -15,7 +19,13 @@ import {
   IndexPatternColumn,
   RequiredReference,
 } from './definitions';
-import type { IndexPattern, IndexPatternField, IndexPatternLayer } from '../types';
+import type {
+  IndexPattern,
+  IndexPatternField,
+  IndexPatternLayer,
+  IndexPatternPrivateState,
+} from '../types';
+import { getSortScoreByPriority } from './operations';
 import { generateId } from '../../id_generator';
 import { ReferenceBasedIndexPatternColumn } from './definitions/column_types';
 import { FormulaIndexPatternColumn, regenerateLayerFromAst } from './definitions/formula';
@@ -674,6 +684,7 @@ function applyReferenceTransition({
             // drop the filter for the referenced column because the wrapping operation
             // is filterable as well and will handle it one level higher.
             filter: operationDefinition.filterable ? undefined : previousColumn.filter,
+            timeShift: operationDefinition.shiftable ? undefined : previousColumn.timeShift,
           },
         },
       };
@@ -827,12 +838,14 @@ function applyReferenceTransition({
   );
 }
 
-function copyCustomLabel(
-  newColumn: IndexPatternColumn,
-  previousOptions: { customLabel?: boolean; label: string }
-) {
+function copyCustomLabel(newColumn: IndexPatternColumn, previousOptions: IndexPatternColumn) {
   const adjustedColumn = { ...newColumn };
-  if (previousOptions.customLabel) {
+  const operationChanged = newColumn.operationType !== previousOptions.operationType;
+  const fieldChanged =
+    ('sourceField' in newColumn && newColumn.sourceField) !==
+    ('sourceField' in previousOptions && previousOptions.sourceField);
+  // only copy custom label if either used operation or used field stayed the same
+  if (previousOptions.customLabel && (!operationChanged || !fieldChanged)) {
     adjustedColumn.customLabel = true;
     adjustedColumn.label = previousOptions.label;
   }
@@ -1071,7 +1084,7 @@ export function getColumnOrder(layer: IndexPatternLayer): string[] {
     }
   });
 
-  const [aggregations, metrics] = _.partition(entries, ([, col]) => col.isBucketed);
+  const [aggregations, metrics] = partition(entries, ([, col]) => col.isBucketed);
 
   return aggregations.map(([id]) => id).concat(metrics.map(([id]) => id));
 }
@@ -1110,10 +1123,10 @@ export function updateLayerIndexPattern(
   layer: IndexPatternLayer,
   newIndexPattern: IndexPattern
 ): IndexPatternLayer {
-  const keptColumns: IndexPatternLayer['columns'] = _.pickBy(layer.columns, (column) => {
+  const keptColumns: IndexPatternLayer['columns'] = pickBy(layer.columns, (column) => {
     return isColumnTransferable(column, newIndexPattern, layer);
   });
-  const newColumns: IndexPatternLayer['columns'] = _.mapValues(keptColumns, (column) => {
+  const newColumns: IndexPatternLayer['columns'] = mapValues(keptColumns, (column) => {
     const operationDefinition = operationDefinitionMap[column.operationType];
     return operationDefinition.transfer
       ? operationDefinition.transfer(column, newIndexPattern)
@@ -1135,20 +1148,65 @@ export function updateLayerIndexPattern(
  * - All columns have complete references
  * - All column references are valid
  * - All prerequisites are met
+ * - If timeshift is used, terms go before date histogram
+ * - If timeshift is used, only a single date histogram can be used
  */
 export function getErrorMessages(
   layer: IndexPatternLayer,
-  indexPattern: IndexPattern
-): string[] | undefined {
-  const errors: string[] = Object.entries(layer.columns)
+  indexPattern: IndexPattern,
+  state: IndexPatternPrivateState,
+  layerId: string,
+  core: CoreStart
+):
+  | Array<
+      | string
+      | {
+          message: string;
+          fixAction?: {
+            label: string;
+            newState: (frame: FramePublicAPI) => Promise<IndexPatternPrivateState>;
+          };
+        }
+    >
+  | undefined {
+  const errors = Object.entries(layer.columns)
     .flatMap(([columnId, column]) => {
       const def = operationDefinitionMap[column.operationType];
       if (def.getErrorMessage) {
         return def.getErrorMessage(layer, columnId, indexPattern, operationDefinitionMap);
       }
     })
+    .map((errorMessage) => {
+      if (typeof errorMessage !== 'object') {
+        return errorMessage;
+      }
+      return {
+        ...errorMessage,
+        fixAction: errorMessage.fixAction
+          ? {
+              ...errorMessage.fixAction,
+              newState: async (frame: FramePublicAPI) => ({
+                ...state,
+                layers: {
+                  ...state.layers,
+                  [layerId]: await errorMessage.fixAction!.newState(core, frame, layerId),
+                },
+              }),
+            }
+          : undefined,
+      };
+    })
     // remove the undefined values
-    .filter((v: string | undefined): v is string => v != null);
+    .filter((v) => v != null) as Array<
+    | string
+    | {
+        message: string;
+        fixAction?: {
+          label: string;
+          newState: (framePublicAPI: FramePublicAPI) => Promise<IndexPatternPrivateState>;
+        };
+      }
+  >;
 
   return errors.length ? errors : undefined;
 }
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.test.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.test.ts
index d53940aa585fd..152fcaa457c3b 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.test.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.test.ts
@@ -15,29 +15,84 @@ export const DEFAULT_TIME_SCALE = 's' as TimeScaleUnit;
 describe('time scale utils', () => {
   describe('adjustTimeScaleLabelSuffix', () => {
     it('should should remove existing suffix', () => {
-      expect(adjustTimeScaleLabelSuffix('abc per second', 's', undefined)).toEqual('abc');
-      expect(adjustTimeScaleLabelSuffix('abc per hour', 'h', undefined)).toEqual('abc');
+      expect(
+        adjustTimeScaleLabelSuffix('abc per second', 's', undefined, undefined, undefined)
+      ).toEqual('abc');
+      expect(
+        adjustTimeScaleLabelSuffix('abc per hour', 'h', undefined, undefined, undefined)
+      ).toEqual('abc');
+      expect(adjustTimeScaleLabelSuffix('abc -3d', undefined, undefined, '3d', undefined)).toEqual(
+        'abc'
+      );
+      expect(
+        adjustTimeScaleLabelSuffix('abc per hour -3d', 'h', undefined, '3d', undefined)
+      ).toEqual('abc');
     });
 
     it('should add suffix', () => {
-      expect(adjustTimeScaleLabelSuffix('abc', undefined, 's')).toEqual('abc per second');
-      expect(adjustTimeScaleLabelSuffix('abc', undefined, 'd')).toEqual('abc per day');
+      expect(adjustTimeScaleLabelSuffix('abc', undefined, 's', undefined, undefined)).toEqual(
+        'abc per second'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc', undefined, 'd', undefined, undefined)).toEqual(
+        'abc per day'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc', undefined, undefined, undefined, '12h')).toEqual(
+        'abc -12h'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc', undefined, 'h', undefined, '12h')).toEqual(
+        'abc per hour -12h'
+      );
+    });
+
+    it('should add and remove at the same time', () => {
+      expect(adjustTimeScaleLabelSuffix('abc per hour', 'h', undefined, undefined, '1d')).toEqual(
+        'abc -1d'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc -1d', undefined, 'h', '1d', undefined)).toEqual(
+        'abc per hour'
+      );
     });
 
     it('should change suffix', () => {
-      expect(adjustTimeScaleLabelSuffix('abc per second', 's', 'd')).toEqual('abc per day');
-      expect(adjustTimeScaleLabelSuffix('abc per day', 'd', 's')).toEqual('abc per second');
+      expect(adjustTimeScaleLabelSuffix('abc per second', 's', 'd', undefined, undefined)).toEqual(
+        'abc per day'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc per day', 'd', 's', undefined, undefined)).toEqual(
+        'abc per second'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc per day -3h', 'd', 's', '3h', '3h')).toEqual(
+        'abc per second -3h'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc per day -3h', 'd', 'd', '3h', '4h')).toEqual(
+        'abc per day -4h'
+      );
     });
 
     it('should keep current state', () => {
-      expect(adjustTimeScaleLabelSuffix('abc', undefined, undefined)).toEqual('abc');
-      expect(adjustTimeScaleLabelSuffix('abc per day', 'd', 'd')).toEqual('abc per day');
+      expect(adjustTimeScaleLabelSuffix('abc', undefined, undefined, undefined, undefined)).toEqual(
+        'abc'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc per day', 'd', 'd', undefined, undefined)).toEqual(
+        'abc per day'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc -1h', undefined, undefined, '1h', '1h')).toEqual(
+        'abc -1h'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc per day -1h', 'd', 'd', '1h', '1h')).toEqual(
+        'abc per day -1h'
+      );
     });
 
     it('should not fail on inconsistent input', () => {
-      expect(adjustTimeScaleLabelSuffix('abc', 's', undefined)).toEqual('abc');
-      expect(adjustTimeScaleLabelSuffix('abc', 's', 'd')).toEqual('abc per day');
-      expect(adjustTimeScaleLabelSuffix('abc per day', 's', undefined)).toEqual('abc per day');
+      expect(adjustTimeScaleLabelSuffix('abc', 's', undefined, undefined, undefined)).toEqual(
+        'abc'
+      );
+      expect(adjustTimeScaleLabelSuffix('abc', 's', 'd', undefined, undefined)).toEqual(
+        'abc per day'
+      );
+      expect(
+        adjustTimeScaleLabelSuffix('abc per day', 's', undefined, undefined, undefined)
+      ).toEqual('abc per day');
     });
   });
 
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.ts b/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.ts
index 07806a32665dd..a0b61060b9f3a 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/operations/time_scale_utils.ts
@@ -12,24 +12,36 @@ import type { IndexPatternColumn } from './definitions';
 
 export const DEFAULT_TIME_SCALE = 's' as TimeScaleUnit;
 
+function getSuffix(scale: TimeScaleUnit | undefined, shift: string | undefined) {
+  return (
+    (shift || scale ? ' ' : '') +
+    (scale ? unitSuffixesLong[scale] : '') +
+    (shift && scale ? ' ' : '') +
+    (shift ? `-${shift}` : '')
+  );
+}
+
 export function adjustTimeScaleLabelSuffix(
   oldLabel: string,
   previousTimeScale: TimeScaleUnit | undefined,
-  newTimeScale: TimeScaleUnit | undefined
+  newTimeScale: TimeScaleUnit | undefined,
+  previousShift: string | undefined,
+  newShift: string | undefined
 ) {
   let cleanedLabel = oldLabel;
   // remove added suffix if column had a time scale previously
-  if (previousTimeScale) {
-    const suffixPosition = oldLabel.lastIndexOf(` ${unitSuffixesLong[previousTimeScale]}`);
+  if (previousTimeScale || previousShift) {
+    const suffix = getSuffix(previousTimeScale, previousShift);
+    const suffixPosition = oldLabel.lastIndexOf(suffix);
     if (suffixPosition !== -1) {
       cleanedLabel = oldLabel.substring(0, suffixPosition);
     }
   }
-  if (!newTimeScale) {
+  if (!newTimeScale && !newShift) {
     return cleanedLabel;
   }
   // add new suffix if column has a time scale now
-  return `${cleanedLabel} ${unitSuffixesLong[newTimeScale]}`;
+  return `${cleanedLabel}${getSuffix(newTimeScale, newShift)}`;
 }
 
 export function adjustTimeScaleOnOtherColumnChange<T extends IndexPatternColumn>(
@@ -54,6 +66,12 @@ export function adjustTimeScaleOnOtherColumnChange<T extends IndexPatternColumn>
   return {
     ...column,
     timeScale: undefined,
-    label: adjustTimeScaleLabelSuffix(column.label, column.timeScale, undefined),
+    label: adjustTimeScaleLabelSuffix(
+      column.label,
+      column.timeScale,
+      undefined,
+      column.timeShift,
+      column.timeShift
+    ),
   };
 }
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 6c2b62f96eaec..a67199a9d3432 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/query_input.tsx
@@ -7,21 +7,20 @@
 
 import React from 'react';
 import { i18n } from '@kbn/i18n';
-import { IndexPattern } from './types';
 import { QueryStringInput, Query } from '../../../../../src/plugins/data/public';
 import { useDebouncedValue } from '../shared_components';
 
 export const QueryInput = ({
   value,
   onChange,
-  indexPattern,
+  indexPatternTitle,
   isInvalid,
   onSubmit,
   disableAutoFocus,
 }: {
   value: Query;
   onChange: (input: Query) => void;
-  indexPattern: IndexPattern;
+  indexPatternTitle: string;
   isInvalid: boolean;
   onSubmit: () => void;
   disableAutoFocus?: boolean;
@@ -35,7 +34,7 @@ export const QueryInput = ({
       disableAutoFocus={disableAutoFocus}
       isInvalid={isInvalid}
       bubbleSubmitEvent={false}
-      indexPatterns={[indexPattern]}
+      indexPatterns={[indexPatternTitle]}
       query={inputValue}
       onChange={handleInputChange}
       onSubmit={() => {
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 430e139a85cca..49bec5f58c29c 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/to_expression.ts
@@ -54,6 +54,22 @@ function getExpressionForLayer(
         }
       });
     }
+
+    if (
+      'references' in column &&
+      rootDef.shiftable &&
+      rootDef.input === 'fullReference' &&
+      column.timeShift
+    ) {
+      // inherit time shift to all referenced operations
+      column.references.forEach((referenceColumnId) => {
+        const referencedColumn = columns[referenceColumnId];
+        const referenceDef = operationDefinitionMap[column.operationType];
+        if (referenceDef.shiftable) {
+          columns[referenceColumnId] = { ...referencedColumn, timeShift: column.timeShift };
+        }
+      });
+    }
   });
 
   const columnEntries = columnOrder.map((colId) => [colId, columns[colId]] as const);
@@ -106,6 +122,7 @@ function getExpressionForLayer(
                 }),
               ]),
               customMetric: buildExpression({ type: 'expression', chain: [aggAst] }),
+              timeShift: col.timeShift,
             }
           ).toAst();
         }
diff --git a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
index 23c7adb86d34f..a9e24c70ab8ac 100644
--- a/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
+++ b/x-pack/plugins/lens/public/indexpattern_datasource/utils.ts
@@ -61,14 +61,14 @@ export function isColumnInvalid(
     'references' in column &&
     Boolean(getReferencesErrors(layer, column, indexPattern).filter(Boolean).length);
 
-  return (
-    !!operationDefinition.getErrorMessage?.(
-      layer,
-      columnId,
-      indexPattern,
-      operationDefinitionMap
-    ) || referencesHaveErrors
+  const operationErrorMessages = operationDefinition.getErrorMessage?.(
+    layer,
+    columnId,
+    indexPattern,
+    operationDefinitionMap
   );
+
+  return (operationErrorMessages && operationErrorMessages.length > 0) || referencesHaveErrors;
 }
 
 function getReferencesErrors(
diff --git a/x-pack/plugins/lens/public/metric_visualization/auto_scale.tsx b/x-pack/plugins/lens/public/metric_visualization/auto_scale.tsx
index cc9c10b678374..9047937093134 100644
--- a/x-pack/plugins/lens/public/metric_visualization/auto_scale.tsx
+++ b/x-pack/plugins/lens/public/metric_visualization/auto_scale.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import _ from 'lodash';
+import { throttle } from 'lodash';
 import { EuiResizeObserver } from '@elastic/eui';
 
 interface Props extends React.HTMLAttributes<HTMLDivElement> {
@@ -26,7 +26,7 @@ export class AutoScale extends React.Component<Props, State> {
   constructor(props: Props) {
     super(props);
 
-    this.scale = _.throttle(() => {
+    this.scale = throttle(() => {
       const scale = computeScale(this.parent, this.child, this.props.minScale);
 
       // Prevent an infinite render loop
diff --git a/x-pack/plugins/lens/public/pie_visualization/visualization.tsx b/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
index f413b122d913c..6e04d1a4ff958 100644
--- a/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/pie_visualization/visualization.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { render } from 'react-dom';
 import { i18n } from '@kbn/i18n';
-import { I18nProvider } from '@kbn/i18n/react';
+import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import { PaletteRegistry } from 'src/plugins/charts/public';
 import { Visualization, OperationMetadata, AccessorConfig } from '../types';
 import { toExpression, toPreviewExpression } from './to_expression';
@@ -265,10 +265,15 @@ export const getPieVisualization = ({
       }
     }
     return metricColumnsWithArrayValues.map((label) => (
-      <>
-        <strong>{label}</strong> contains array values. Your visualization may not render as
-        expected.
-      </>
+      <FormattedMessage
+        key={label}
+        id="xpack.lens.pie.arrayValues"
+        defaultMessage="{label} contains array values. Your visualization may not render as
+        expected."
+        values={{
+          label: <strong>{label}</strong>,
+        }}
+      />
     ));
   },
 
diff --git a/x-pack/plugins/lens/public/plugin.ts b/x-pack/plugins/lens/public/plugin.ts
index 99e7199c2d802..fe225dba6f256 100644
--- a/x-pack/plugins/lens/public/plugin.ts
+++ b/x-pack/plugins/lens/public/plugin.ts
@@ -54,6 +54,7 @@ import {
   EmbeddableComponentProps,
   getEmbeddableComponent,
 } from './editor_frame_service/embeddable/embeddable_component';
+import { HeatmapVisualization } from './heatmap_visualization';
 
 export interface LensPluginSetupDependencies {
   urlForwarding: UrlForwardingSetup;
@@ -119,6 +120,7 @@ export class LensPlugin {
   private xyVisualization: XyVisualization;
   private metricVisualization: MetricVisualization;
   private pieVisualization: PieVisualization;
+  private heatmapVisualization: HeatmapVisualization;
 
   private stopReportManager?: () => void;
 
@@ -129,6 +131,7 @@ export class LensPlugin {
     this.xyVisualization = new XyVisualization();
     this.metricVisualization = new MetricVisualization();
     this.pieVisualization = new PieVisualization();
+    this.heatmapVisualization = new HeatmapVisualization();
   }
 
   setup(
@@ -178,6 +181,7 @@ export class LensPlugin {
     this.datatableVisualization.setup(core, dependencies);
     this.metricVisualization.setup(core, dependencies);
     this.pieVisualization.setup(core, dependencies);
+    this.heatmapVisualization.setup(core, dependencies);
 
     visualizations.registerAlias(getLensAliasConfig());
 
diff --git a/x-pack/plugins/lens/public/shared_components/coloring/color_stops.test.tsx b/x-pack/plugins/lens/public/shared_components/coloring/color_stops.test.tsx
index 54c7f3cef90fe..574d7fa7719ae 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/color_stops.test.tsx
+++ b/x-pack/plugins/lens/public/shared_components/coloring/color_stops.test.tsx
@@ -11,6 +11,19 @@ import React from 'react';
 import { act } from 'react-dom/test-utils';
 import { CustomStops, CustomStopsProps } from './color_stops';
 
+// mocking random id generator function
+jest.mock('@elastic/eui', () => {
+  const original = jest.requireActual('@elastic/eui');
+
+  return {
+    ...original,
+    htmlIdGenerator: (fn: unknown) => {
+      let counter = 0;
+      return () => counter++;
+    },
+  };
+});
+
 describe('Color Stops component', () => {
   let props: CustomStopsProps;
   beforeEach(() => {
diff --git a/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.test.tsx b/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.test.tsx
index 28ba28a5801e4..4cca87d647904 100644
--- a/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.test.tsx
+++ b/x-pack/plugins/lens/public/shared_components/coloring/palette_configuration.test.tsx
@@ -15,6 +15,19 @@ import { CustomPaletteParams } from './types';
 import { applyPaletteParams } from './utils';
 import { CustomizablePalette } from './palette_configuration';
 
+// mocking random id generator function
+jest.mock('@elastic/eui', () => {
+  const original = jest.requireActual('@elastic/eui');
+
+  return {
+    ...original,
+    htmlIdGenerator: (fn: unknown) => {
+      let counter = 0;
+      return () => counter++;
+    },
+  };
+});
+
 describe('palette utilities', () => {
   const paletteRegistry = chartPluginMock.createPaletteRegistry();
   describe('applyPaletteParams', () => {
diff --git a/x-pack/plugins/lens/public/shared_components/debounced_value.test.ts b/x-pack/plugins/lens/public/shared_components/debounced_value.test.ts
new file mode 100644
index 0000000000000..7aa93fcad95e9
--- /dev/null
+++ b/x-pack/plugins/lens/public/shared_components/debounced_value.test.ts
@@ -0,0 +1,55 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { useDebouncedValue } from './debounced_value';
+
+jest.mock('lodash', () => {
+  const original = jest.requireActual('lodash');
+
+  return {
+    ...original,
+    debounce: (fn: unknown) => fn,
+  };
+});
+
+describe('useDebouncedValue', () => {
+  it('should update upstream value changes', () => {
+    const onChangeMock = jest.fn();
+    const { result } = renderHook(() => useDebouncedValue({ value: 'a', onChange: onChangeMock }));
+
+    act(() => {
+      result.current.handleInputChange('b');
+    });
+
+    expect(onChangeMock).toHaveBeenCalledWith('b');
+  });
+
+  it('should fallback to initial value with empty string (by default)', () => {
+    const onChangeMock = jest.fn();
+    const { result } = renderHook(() => useDebouncedValue({ value: 'a', onChange: onChangeMock }));
+
+    act(() => {
+      result.current.handleInputChange('');
+    });
+
+    expect(onChangeMock).toHaveBeenCalledWith('a');
+  });
+
+  it('should allow empty input to be updated', () => {
+    const onChangeMock = jest.fn();
+    const { result } = renderHook(() =>
+      useDebouncedValue({ value: 'a', onChange: onChangeMock }, { allowEmptyString: true })
+    );
+
+    act(() => {
+      result.current.handleInputChange('');
+    });
+
+    expect(onChangeMock).toHaveBeenCalledWith('');
+  });
+});
diff --git a/x-pack/plugins/lens/public/shared_components/debounced_value.ts b/x-pack/plugins/lens/public/shared_components/debounced_value.ts
index 1f8ba0fa765b2..5525f6b16b316 100644
--- a/x-pack/plugins/lens/public/shared_components/debounced_value.ts
+++ b/x-pack/plugins/lens/public/shared_components/debounced_value.ts
@@ -13,15 +13,19 @@ import { debounce } from 'lodash';
  * are in flight because the user is currently modifying the value.
  */
 
-export const useDebouncedValue = <T>({
-  onChange,
-  value,
-}: {
-  onChange: (val: T) => void;
-  value: T;
-}) => {
+export const useDebouncedValue = <T>(
+  {
+    onChange,
+    value,
+  }: {
+    onChange: (val: T) => void;
+    value: T;
+  },
+  { allowEmptyString }: { allowEmptyString?: boolean } = {}
+) => {
   const [inputValue, setInputValue] = useState(value);
   const unflushedChanges = useRef(false);
+  const shouldUpdateWithEmptyString = Boolean(allowEmptyString);
 
   // Save the initial value
   const initialValue = useRef(value);
@@ -45,7 +49,10 @@ export const useDebouncedValue = <T>({
 
   const handleInputChange = (val: T) => {
     setInputValue(val);
-    onChangeDebounced(val || initialValue.current);
+    const valueToUpload = shouldUpdateWithEmptyString
+      ? val ?? initialValue.current
+      : val || initialValue.current;
+    onChangeDebounced(valueToUpload);
   };
 
   return { inputValue, handleInputChange, initialValue: initialValue.current };
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 7acd5669b4ba5..e86a81ba66203 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
@@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
 import { EuiFormRow, EuiButtonGroup, EuiSwitch, EuiSwitchEvent } from '@elastic/eui';
 import { Position } from '@elastic/charts';
 import { ToolbarPopover } from '../shared_components';
+import { ToolbarButtonProps } from '../../../../../src/plugins/kibana_react/public';
 
 export interface LegendSettingsPopoverProps {
   /**
@@ -44,6 +45,22 @@ export interface LegendSettingsPopoverProps {
    * Callback on nested switch status change
    */
   onNestedLegendChange?: (event: EuiSwitchEvent) => void;
+  /**
+   * value in legend status
+   */
+  valueInLegend?: boolean;
+  /**
+   * Callback on value in legend status change
+   */
+  onValueInLegendChange?: (event: EuiSwitchEvent) => void;
+  /**
+   * If true, value in legend switch is rendered
+   */
+  renderValueInLegendSwitch?: boolean;
+  /**
+   * Button group position
+   */
+  groupPosition?: ToolbarButtonProps['groupPosition'];
 }
 
 const toggleButtonsIcons = [
@@ -86,6 +103,10 @@ export const LegendSettingsPopover: React.FunctionComponent<LegendSettingsPopove
   renderNestedLegendSwitch,
   nestedLegend,
   onNestedLegendChange = () => {},
+  valueInLegend,
+  onValueInLegendChange = () => {},
+  renderValueInLegendSwitch,
+  groupPosition = 'right',
 }) => {
   return (
     <ToolbarPopover
@@ -93,7 +114,7 @@ export const LegendSettingsPopover: React.FunctionComponent<LegendSettingsPopove
         defaultMessage: 'Legend',
       })}
       type="legend"
-      groupPosition="right"
+      groupPosition={groupPosition}
       buttonDataTestSubj="lnsLegendButton"
     >
       <EuiFormRow
@@ -155,6 +176,26 @@ export const LegendSettingsPopover: React.FunctionComponent<LegendSettingsPopove
           />
         </EuiFormRow>
       )}
+      {renderValueInLegendSwitch && (
+        <EuiFormRow
+          display="columnCompressedSwitch"
+          label={i18n.translate('xpack.lens.shared.valueInLegendLabel', {
+            defaultMessage: 'Show value',
+          })}
+        >
+          <EuiSwitch
+            compressed
+            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}
+          />
+        </EuiFormRow>
+      )}
     </ToolbarPopover>
   );
 };
diff --git a/x-pack/plugins/lens/public/state_management/external_context_middleware.ts b/x-pack/plugins/lens/public/state_management/external_context_middleware.ts
index 35d0f7cf197ed..0743dce73eb33 100644
--- a/x-pack/plugins/lens/public/state_management/external_context_middleware.ts
+++ b/x-pack/plugins/lens/public/state_management/external_context_middleware.ts
@@ -6,7 +6,7 @@
  */
 
 import { delay, finalize, switchMap, tap } from 'rxjs/operators';
-import _, { debounce } from 'lodash';
+import { debounce, isEqual } from 'lodash';
 import { Dispatch, MiddlewareAPI, PayloadAction } from '@reduxjs/toolkit';
 import { trackUiEvent } from '../lens_ui_telemetry';
 
@@ -44,7 +44,7 @@ function subscribeToExternalContext(
 
   const dispatchFromExternal = (searchSessionId = search.session.start()) => {
     const globalFilters = filterManager.getFilters();
-    const filters = _.isEqual(getState().app.filters, globalFilters)
+    const filters = isEqual(getState().app.filters, globalFilters)
       ? null
       : { filters: globalFilters };
     dispatch(
diff --git a/x-pack/plugins/lens/public/types.ts b/x-pack/plugins/lens/public/types.ts
index 984fbf5555949..3394616618672 100644
--- a/x-pack/plugins/lens/public/types.ts
+++ b/x-pack/plugins/lens/public/types.ts
@@ -224,8 +224,18 @@ export interface Datasource<T = unknown, P = unknown> {
   getPublicAPI: (props: PublicAPIProps<T>) => DatasourcePublicAPI;
   getErrorMessages: (
     state: T,
-    layersGroups?: Record<string, VisualizationDimensionGroupConfig[]>
-  ) => Array<{ shortMessage: string; longMessage: string }> | undefined;
+    layersGroups?: Record<string, VisualizationDimensionGroupConfig[]>,
+    dateRange?: {
+      fromDate: string;
+      toDate: string;
+    }
+  ) =>
+    | Array<{
+        shortMessage: string;
+        longMessage: string;
+        fixAction?: { label: string; newState: () => Promise<T> };
+      }>
+    | undefined;
   /**
    * uniqueLabels of dimensions exposed for aria-labels of dragged dimensions
    */
@@ -234,6 +244,10 @@ export interface Datasource<T = unknown, P = unknown> {
    * Check the internal state integrity and returns a list of missing references
    */
   checkIntegrity: (state: T) => string[];
+  /**
+   * The frame calls this function to display warnings about visualization
+   */
+  getWarningMessages?: (state: T, frame: FramePublicAPI) => React.ReactNode[] | undefined;
 }
 
 /**
@@ -546,6 +560,10 @@ export interface VisualizationType {
    * Higher number means higher priority. When omitted defaults to 0
    */
   sortPriority?: number;
+  /**
+   * Indicates if visualization is in the beta stage.
+   */
+  showBetaBadge?: boolean;
 }
 
 export interface Visualization<T = unknown> {
@@ -673,7 +691,12 @@ export interface Visualization<T = unknown> {
   getErrorMessages: (
     state: T,
     datasourceLayers?: Record<string, DatasourcePublicAPI>
-  ) => Array<{ shortMessage: string; longMessage: string }> | undefined;
+  ) =>
+    | Array<{
+        shortMessage: string;
+        longMessage: string;
+      }>
+    | undefined;
 
   /**
    * The frame calls this function to display warnings about visualization
diff --git a/x-pack/plugins/lens/public/utils.ts b/x-pack/plugins/lens/public/utils.ts
index c1aab4c18f529..2706fe977c68e 100644
--- a/x-pack/plugins/lens/public/utils.ts
+++ b/x-pack/plugins/lens/public/utils.ts
@@ -7,6 +7,8 @@
 
 import { i18n } from '@kbn/i18n';
 import { IndexPattern, IndexPatternsContract, TimefilterContract } from 'src/plugins/data/public';
+import { IUiSettingsClient } from 'kibana/public';
+import moment from 'moment-timezone';
 import { LensFilterEvent } from './types';
 
 /** replaces the value `(empty) to empty string for proper filtering` */
@@ -63,6 +65,7 @@ export const getResolvedDateRange = function (timefilter: TimefilterContract) {
 export function containsDynamicMath(dateMathString: string) {
   return dateMathString.includes('now');
 }
+
 export const TIME_LAG_PERCENTAGE_LIMIT = 0.02;
 
 export async function getAllIndexPatterns(
@@ -79,3 +82,12 @@ export async function getAllIndexPatterns(
   // return also the rejected ids in case we want to show something later on
   return { indexPatterns: fullfilled.map((response) => response.value), rejectedIds };
 }
+
+export function getTimeZone(uiSettings: IUiSettingsClient) {
+  const configuredTimeZone = uiSettings.get('dateFormat:tz');
+  if (configuredTimeZone === 'Browser') {
+    return moment.tz.guess();
+  }
+
+  return configuredTimeZone;
+}
diff --git a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap
index 08b3393fafe48..ac8f089d46487 100644
--- a/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap
+++ b/x-pack/plugins/lens/public/xy_visualization/__snapshots__/to_expression.test.ts.snap
@@ -157,6 +157,9 @@ Object {
         "valueLabels": Array [
           "hide",
         ],
+        "valuesInLegend": Array [
+          false,
+        ],
         "xTitle": Array [
           "",
         ],
diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx
index 3fab88248d4a5..ee1f66063ad1d 100644
--- a/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/expression.test.tsx
@@ -265,6 +265,7 @@ const createArgsWithLayers = (layers: LayerArgs[] = [sampleLayer]): XYArgs => ({
     position: Position.Top,
   },
   valueLabels: 'hide',
+  valuesInLegend: false,
   axisTitlesVisibilitySettings: {
     type: 'lens_xy_axisTitlesVisibilityConfig',
     x: true,
@@ -839,6 +840,36 @@ describe('xy_expression', () => {
       expect(component.find(Settings).prop('xDomain')).toEqual({ minInterval: 101 });
     });
 
+    test('disabled legend extra by default', () => {
+      const { data, args } = sampleArgs();
+      const component = shallow(<XYChart {...defaultProps} data={data} args={args} />);
+      expect(component.find(Settings).at(0).prop('showLegendExtra')).toEqual(false);
+    });
+
+    test('ignores legend extra for ordinal chart', () => {
+      const { data, args } = sampleArgs();
+      const component = shallow(
+        <XYChart {...defaultProps} data={data} args={{ ...args, valuesInLegend: true }} />
+      );
+      expect(component.find(Settings).at(0).prop('showLegendExtra')).toEqual(false);
+    });
+
+    test('shows legend extra for histogram chart', () => {
+      const { args } = sampleArgs();
+      const component = shallow(
+        <XYChart
+          {...defaultProps}
+          data={dateHistogramData}
+          args={{
+            ...args,
+            layers: [dateHistogramLayer],
+            valuesInLegend: true,
+          }}
+        />
+      );
+      expect(component.find(Settings).at(0).prop('showLegendExtra')).toEqual(true);
+    });
+
     test('it renders bar', () => {
       const { data, args } = sampleArgs();
       const component = shallow(
diff --git a/x-pack/plugins/lens/public/xy_visualization/expression.tsx b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
index 608971d281981..4cd2b55e8d424 100644
--- a/x-pack/plugins/lens/public/xy_visualization/expression.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/expression.tsx
@@ -209,6 +209,13 @@ export const xyChart: ExpressionFunctionDefinition<
         defaultMessage: 'Hide endzone markers for partial data',
       }),
     },
+    valuesInLegend: {
+      types: ['boolean'],
+      default: false,
+      help: i18n.translate('xpack.lens.xyChart.valuesInLegend.help', {
+        defaultMessage: 'Show values in legend',
+      }),
+    },
   },
   fn(data: LensMultiTable, args: XYArgs) {
     return {
@@ -222,7 +229,7 @@ export const xyChart: ExpressionFunctionDefinition<
   },
 };
 
-export async function calculateMinInterval({ args: { layers }, data }: XYChartProps) {
+export function calculateMinInterval({ args: { layers }, data }: XYChartProps) {
   const filteredLayers = getFilteredLayers(layers, data);
   if (filteredLayers.length === 0) return;
   const isTimeViz = data.dateRange && filteredLayers.every((l) => l.xScaleType === 'time');
@@ -280,7 +287,7 @@ export const getXyChartRenderer = (dependencies: {
           chartsThemeService={dependencies.chartsThemeService}
           paletteService={dependencies.paletteService}
           timeZone={dependencies.timeZone}
-          minInterval={await calculateMinInterval(config)}
+          minInterval={calculateMinInterval(config)}
           onClickValue={onClickValue}
           onSelectRange={onSelectRange}
           renderMode={handlers.getRenderMode()}
@@ -365,6 +372,7 @@ export function XYChart({
     hideEndzones,
     yLeftExtent,
     yRightExtent,
+    valuesInLegend,
   } = args;
   const chartTheme = chartsThemeService.useChartsTheme();
   const chartBaseTheme = chartsThemeService.useChartsBaseTheme();
@@ -602,7 +610,6 @@ export function XYChart({
             : legend.isVisible
         }
         legendPosition={legend.position}
-        showLegendExtra={false}
         theme={{
           ...chartTheme,
           barSeriesStyle: {
@@ -622,6 +629,7 @@ export function XYChart({
         xDomain={xDomain}
         onBrushEnd={renderMode !== 'noInteractivity' ? brushHandler : undefined}
         onElementClick={renderMode !== 'noInteractivity' ? clickHandler : undefined}
+        showLegendExtra={isHistogramViz && valuesInLegend}
       />
 
       <Axis
diff --git a/x-pack/plugins/lens/public/xy_visualization/index.ts b/x-pack/plugins/lens/public/xy_visualization/index.ts
index bb9893bd058b5..f29d0f9280246 100644
--- a/x-pack/plugins/lens/public/xy_visualization/index.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/index.ts
@@ -5,12 +5,12 @@
  * 2.0.
  */
 
-import { CoreSetup, IUiSettingsClient } from 'kibana/public';
-import moment from 'moment-timezone';
+import { CoreSetup } from 'kibana/public';
 import { ExpressionsSetup } from '../../../../../src/plugins/expressions/public';
 import { EditorFrameSetup, FormatFactory } from '../types';
 import { ChartsPluginSetup } from '../../../../../src/plugins/charts/public';
 import { LensPluginStartDependencies } from '../plugin';
+import { getTimeZone } from '../utils';
 
 export interface XyVisualizationPluginSetupPlugins {
   expressions: ExpressionsSetup;
@@ -19,15 +19,6 @@ export interface XyVisualizationPluginSetupPlugins {
   charts: ChartsPluginSetup;
 }
 
-function getTimeZone(uiSettings: IUiSettingsClient) {
-  const configuredTimeZone = uiSettings.get('dateFormat:tz');
-  if (configuredTimeZone === 'Browser') {
-    return moment.tz.guess();
-  }
-
-  return configuredTimeZone;
-}
-
 export class XyVisualization {
   constructor() {}
 
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 269f10159892f..1982ea095d2ee 100644
--- a/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/to_expression.ts
@@ -244,6 +244,7 @@ export const buildExpression = (
           ],
           valueLabels: [state?.valueLabels || 'hide'],
           hideEndzones: [state?.hideEndzones || false],
+          valuesInLegend: [state?.valuesInLegend || false],
           layers: validLayers.map((layer) => {
             const columnToLabel = getColumnToLabelMap(layer, datasourceLayers[layer.layerId]);
 
diff --git a/x-pack/plugins/lens/public/xy_visualization/types.ts b/x-pack/plugins/lens/public/xy_visualization/types.ts
index 531b034b53242..244898eda91ec 100644
--- a/x-pack/plugins/lens/public/xy_visualization/types.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/types.ts
@@ -466,6 +466,7 @@ export interface XYArgs {
   curveType?: XYCurveType;
   fillOpacity?: number;
   hideEndzones?: boolean;
+  valuesInLegend?: boolean;
 }
 
 export type XYCurveType = 'LINEAR' | 'CURVE_MONOTONE_X';
@@ -488,6 +489,7 @@ export interface XYState {
   curveType?: XYCurveType;
   fillOpacity?: number;
   hideEndzones?: boolean;
+  valuesInLegend?: boolean;
 }
 
 export type State = XYState;
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 8fbc8e8b2ef7a..f2840b6d3844b 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.test.ts
@@ -52,7 +52,7 @@ describe('xy_visualization', () => {
       };
     }
 
-    it('should show mixed xy chart when multilple series types', () => {
+    it('should show mixed xy chart when multiple series types', () => {
       const desc = xyVisualization.getDescription(mixedState('bar', 'line'));
 
       expect(desc.label).toEqual('Mixed XY');
@@ -332,7 +332,7 @@ describe('xy_visualization', () => {
       expect(options.map((o) => o.groupId)).toEqual(['x', 'y', 'breakdown']);
     });
 
-    it('should return the correct labels for the 3 dimensios', () => {
+    it('should return the correct labels for the 3 dimensions', () => {
       const options = xyVisualization.getConfiguration({
         state: exampleState(),
         frame,
@@ -345,7 +345,7 @@ describe('xy_visualization', () => {
       ]);
     });
 
-    it('should return the correct labels for the 3 dimensios for a horizontal chart', () => {
+    it('should return the correct labels for the 3 dimensions for a horizontal chart', () => {
       const initialState = exampleState();
       const state = {
         ...initialState,
@@ -929,12 +929,17 @@ describe('xy_visualization', () => {
       );
       expect(warningMessages).toHaveLength(1);
       expect(warningMessages && warningMessages[0]).toMatchInlineSnapshot(`
-        <React.Fragment>
-          <strong>
-            Label B
-          </strong>
-           contains array values. Your visualization may not render as expected.
-        </React.Fragment>
+        <FormattedMessage
+          defaultMessage="{label} contains array values. Your visualization may not render as expected."
+          id="xpack.lens.xyVisualization.arrayValues"
+          values={
+            Object {
+              "label": <strong>
+                Label B
+              </strong>,
+            }
+          }
+        />
       `);
     });
   });
diff --git a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
index fa9d46be11d68..ad2c9fd713985 100644
--- a/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/visualization.tsx
@@ -9,7 +9,7 @@ import React from 'react';
 import { uniq } from 'lodash';
 import { render } from 'react-dom';
 import { Position } from '@elastic/charts';
-import { I18nProvider } from '@kbn/i18n/react';
+import { FormattedMessage, I18nProvider } from '@kbn/i18n/react';
 import { i18n } from '@kbn/i18n';
 import { PaletteRegistry } from 'src/plugins/charts/public';
 import { DataPublicPluginStart } from 'src/plugins/data/public';
@@ -439,10 +439,15 @@ export const getXyVisualization = ({
       }
     }
     return accessorsWithArrayValues.map((label) => (
-      <>
-        <strong>{label}</strong> contains array values. Your visualization may not render as
-        expected.
-      </>
+      <FormattedMessage
+        key={label}
+        id="xpack.lens.xyVisualization.arrayValues"
+        defaultMessage="{label} contains array values. Your visualization may not render as
+        expected."
+        values={{
+          label: <strong>{label}</strong>,
+        }}
+      />
     ));
   },
 });
diff --git a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
index 48f0cacf75938..b3d1f8f062b73 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_config_panel.tsx
@@ -227,6 +227,15 @@ export const XyToolbar = memo(function XyToolbar(props: VisualizationToolbarProp
     });
   };
 
+  const nonOrdinalXAxis = state?.layers.every(
+    (layer) =>
+      !layer.xAccessor ||
+      getScaleType(
+        props.frame.datasourceLayers[layer.layerId].getOperationForColumnId(layer.xAccessor),
+        ScaleType.Linear
+      ) !== 'ordinal'
+  );
+
   // only allow changing endzone visibility if it could show up theoretically (if it's a time viz)
   const onChangeEndzoneVisiblity = state?.layers.every(
     (layer) =>
@@ -323,6 +332,14 @@ export const XyToolbar = memo(function XyToolbar(props: VisualizationToolbarProp
                 legend: { ...state.legend, position: id as Position },
               });
             }}
+            renderValueInLegendSwitch={nonOrdinalXAxis}
+            valueInLegend={state?.valuesInLegend}
+            onValueInLegendChange={() => {
+              setState({
+                ...state,
+                valuesInLegend: !state.valuesInLegend,
+              });
+            }}
           />
         </EuiFlexGroup>
       </EuiFlexItem>
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 aff33778258fe..a494d51f51681 100644
--- a/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
+++ b/x-pack/plugins/lens/public/xy_visualization/xy_suggestions.ts
@@ -529,6 +529,7 @@ function buildSuggestion({
     yTitle: currentState?.yTitle,
     yRightTitle: currentState?.yRightTitle,
     hideEndzones: currentState?.hideEndzones,
+    valuesInLegend: currentState?.valuesInLegend,
     yLeftExtent: currentState?.yLeftExtent,
     yRightExtent: currentState?.yRightExtent,
     axisTitlesVisibilitySettings: currentState?.axisTitlesVisibilitySettings || {
diff --git a/x-pack/plugins/lens/server/embeddable/lens_embeddable_factory.test.ts b/x-pack/plugins/lens/server/embeddable/lens_embeddable_factory.test.ts
new file mode 100644
index 0000000000000..9ce405804bde1
--- /dev/null
+++ b/x-pack/plugins/lens/server/embeddable/lens_embeddable_factory.test.ts
@@ -0,0 +1,24 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import semverGte from 'semver/functions/gte';
+import { lensEmbeddableFactory } from './lens_embeddable_factory';
+import { migrations } from '../migrations/saved_object_migrations';
+
+describe('saved object migrations and embeddable migrations', () => {
+  test('should have same versions registered (>7.13.0)', () => {
+    const savedObjectMigrationVersions = Object.keys(migrations).filter((version) => {
+      return semverGte(version, '7.13.1');
+    });
+    const embeddableMigrationVersions = lensEmbeddableFactory()?.migrations;
+    if (embeddableMigrationVersions) {
+      expect(savedObjectMigrationVersions.sort()).toEqual(
+        Object.keys(embeddableMigrationVersions).sort()
+      );
+    }
+  });
+});
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 57d8ebf678d61..703b946149e26 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.test.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.test.ts
@@ -79,7 +79,7 @@ describe('existingFields', () => {
     const result = existingFields(
       [
         {
-          // @ts-expect-error _mymeta is not defined on estypes.Hit
+          // @ts-expect-error _mymeta is not defined on estypes.SearchHit
           _mymeta: 'abc',
           ...searchResults({ bar: ['scriptvalue'] }),
         },
diff --git a/x-pack/plugins/lens/server/routes/existing_fields.ts b/x-pack/plugins/lens/server/routes/existing_fields.ts
index d775113d83ff7..f35b0a7f23179 100644
--- a/x-pack/plugins/lens/server/routes/existing_fields.ts
+++ b/x-pack/plugins/lens/server/routes/existing_fields.ts
@@ -28,7 +28,7 @@ export interface Field {
   name: string;
   isScript: boolean;
   isMeta: boolean;
-  lang?: string;
+  lang?: estypes.ScriptLanguage;
   script?: string;
   runtimeField?: RuntimeField;
 }
@@ -201,10 +201,9 @@ async function fetchIndexPatternStats({
         _source: false,
         runtime_mappings: runtimeFields.reduce((acc, field) => {
           if (!field.runtimeField) return acc;
-          // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
           acc[field.name] = field.runtimeField;
           return acc;
-        }, {} as Record<string, estypes.RuntimeField>),
+        }, {} as Record<string, estypes.MappingRuntimeField>),
         script_fields: scriptedFields.reduce((acc, field) => {
           acc[field.name] = {
             script: {
@@ -233,7 +232,7 @@ async function fetchIndexPatternStats({
 /**
  * Exported only for unit tests.
  */
-export function existingFields(docs: estypes.Hit[], fields: Field[]): string[] {
+export function existingFields(docs: estypes.SearchHit[], fields: Field[]): string[] {
   const missingFields = new Set(fields);
 
   for (const doc of docs) {
diff --git a/x-pack/plugins/lens/server/routes/field_stats.ts b/x-pack/plugins/lens/server/routes/field_stats.ts
index 6cddd2c60f416..ef1043ddd3583 100644
--- a/x-pack/plugins/lens/server/routes/field_stats.ts
+++ b/x-pack/plugins/lens/server/routes/field_stats.ts
@@ -31,6 +31,7 @@ export async function initFieldsRoute(setup: CoreSetup<PluginStartContract>) {
             fromDate: schema.string(),
             toDate: schema.string(),
             fieldName: schema.string(),
+            size: schema.maybe(schema.number()),
           },
           { unknowns: 'allow' }
         ),
@@ -38,7 +39,7 @@ export async function initFieldsRoute(setup: CoreSetup<PluginStartContract>) {
     },
     async (context, req, res) => {
       const requestClient = context.core.elasticsearch.client.asCurrentUser;
-      const { fromDate, toDate, fieldName, dslQuery } = req.body;
+      const { fromDate, toDate, fieldName, dslQuery, size } = req.body;
 
       const [{ savedObjects, elasticsearch }, { data }] = await setup.getStartServices();
       const savedObjectsClient = savedObjects.getScopedClient(req);
@@ -78,14 +79,13 @@ export async function initFieldsRoute(setup: CoreSetup<PluginStartContract>) {
           },
         };
 
-        const search = async (aggs: Record<string, estypes.AggregationContainer>) => {
+        const search = async (aggs: Record<string, estypes.AggregationsAggregationContainer>) => {
           const { body: result } = await requestClient.search({
             index: indexPattern.title,
             track_total_hits: true,
             body: {
               query,
               aggs,
-              // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
               runtime_mappings: field.runtimeField ? { [fieldName]: field.runtimeField } : {},
             },
             size: 0,
@@ -112,7 +112,7 @@ export async function initFieldsRoute(setup: CoreSetup<PluginStartContract>) {
         }
 
         return res.ok({
-          body: await getStringSamples(search, field),
+          body: await getStringSamples(search, field, size),
         });
       } catch (e) {
         if (e instanceof SavedObjectNotFound) {
@@ -135,7 +135,9 @@ export async function initFieldsRoute(setup: CoreSetup<PluginStartContract>) {
 }
 
 export async function getNumberHistogram(
-  aggSearchWithBody: (aggs: Record<string, estypes.AggregationContainer>) => Promise<unknown>,
+  aggSearchWithBody: (
+    aggs: Record<string, estypes.AggregationsAggregationContainer>
+  ) => Promise<unknown>,
   field: IFieldType,
   useTopHits = true
 ): Promise<FieldStatsResponse> {
@@ -244,8 +246,9 @@ export async function getNumberHistogram(
 }
 
 export async function getStringSamples(
-  aggSearchWithBody: (aggs: Record<string, estypes.AggregationContainer>) => unknown,
-  field: IFieldType
+  aggSearchWithBody: (aggs: Record<string, estypes.AggregationsAggregationContainer>) => unknown,
+  field: IFieldType,
+  size = 10
 ): Promise<FieldStatsResponse> {
   const fieldRef = getFieldRef(field);
 
@@ -257,7 +260,7 @@ export async function getStringSamples(
         top_values: {
           terms: {
             ...fieldRef,
-            size: 10,
+            size,
           },
         },
       },
@@ -283,7 +286,7 @@ export async function getStringSamples(
 
 // This one is not sampled so that it returns the full date range
 export async function getDateHistogram(
-  aggSearchWithBody: (aggs: Record<string, estypes.AggregationContainer>) => unknown,
+  aggSearchWithBody: (aggs: Record<string, estypes.AggregationsAggregationContainer>) => unknown,
   field: IFieldType,
   range: { fromDate: string; toDate: string }
 ): Promise<FieldStatsResponse> {
@@ -330,7 +333,7 @@ function getFieldRef(field: IFieldType) {
   return field.scripted
     ? {
         script: {
-          lang: field.lang as string,
+          lang: field.lang!,
           source: field.script as string,
         },
       }
diff --git a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
index c785ed7c99bda..9f89179d207e0 100644
--- a/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
+++ b/x-pack/plugins/license_management/__jest__/__snapshots__/upload_license.test.tsx.snap
@@ -348,6 +348,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                     <span
                                       aria-hidden="true"
                                       class="euiButtonIcon__icon"
+                                      color="inherit"
                                       data-euiicon-type="cross"
                                     />
                                   </button>
@@ -463,12 +464,14 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                       <EuiIcon
                                         aria-hidden="true"
                                         className="euiButtonIcon__icon"
+                                        color="inherit"
                                         size="m"
                                         type="cross"
                                       >
                                         <span
                                           aria-hidden="true"
                                           className="euiButtonIcon__icon"
+                                          color="inherit"
                                           data-euiicon-type="cross"
                                           size="m"
                                         />
@@ -561,6 +564,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                           <EuiButtonContent
                                             className="euiButtonEmpty__content"
                                             iconSide="left"
+                                            iconSize="m"
                                             textProps={
                                               Object {
                                                 "className": "euiButtonEmpty__text",
@@ -836,6 +840,7 @@ exports[`UploadLicense should display a modal when license requires acknowledgem
                                   <EuiButtonContent
                                     className="euiButtonEmpty__content"
                                     iconSide="left"
+                                    iconSize="m"
                                     textProps={
                                       Object {
                                         "className": "euiButtonEmpty__text",
@@ -1565,6 +1570,7 @@ exports[`UploadLicense should display an error when ES says license is expired 1
                                   <EuiButtonContent
                                     className="euiButtonEmpty__content"
                                     iconSide="left"
+                                    iconSize="m"
                                     textProps={
                                       Object {
                                         "className": "euiButtonEmpty__text",
@@ -2294,6 +2300,7 @@ exports[`UploadLicense should display an error when ES says license is invalid 1
                                   <EuiButtonContent
                                     className="euiButtonEmpty__content"
                                     iconSide="left"
+                                    iconSize="m"
                                     textProps={
                                       Object {
                                         "className": "euiButtonEmpty__text",
@@ -3023,6 +3030,7 @@ exports[`UploadLicense should display an error when submitting invalid JSON 1`]
                                   <EuiButtonContent
                                     className="euiButtonEmpty__content"
                                     iconSide="left"
+                                    iconSize="m"
                                     textProps={
                                       Object {
                                         "className": "euiButtonEmpty__text",
@@ -3752,6 +3760,7 @@ exports[`UploadLicense should display error when ES returns error 1`] = `
                                   <EuiButtonContent
                                     className="euiButtonEmpty__content"
                                     iconSide="left"
+                                    iconSize="m"
                                     textProps={
                                       Object {
                                         "className": "euiButtonEmpty__text",
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 803cc34ed2a12..29bfdf8bf1d13 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
@@ -76,7 +76,7 @@ export const findListItem = async ({
 
     const { body: respose } = await esClient.count({
       body: {
-        // @ts-expect-error GetQueryFilterReturn is not assignable to QueryContainer
+        // @ts-expect-error GetQueryFilterReturn is not assignable to QueryDslQueryContainer
         query,
       },
       ignore_unavailable: true,
@@ -89,7 +89,7 @@ export const findListItem = async ({
       // to explicitly define the type <T>.
       const { body: response } = await esClient.search<SearchEsListItemSchema>({
         body: {
-          // @ts-expect-error GetQueryFilterReturn is not assignable to QueryContainer
+          // @ts-expect-error GetQueryFilterReturn is not assignable to QueryDslQueryContainer
           query,
           search_after: scroll.searchAfter,
           sort: getSortWithTieBreaker({ sortField, sortOrder }),
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 1c7a5fe60b995..ae28428d80a5c 100644
--- a/x-pack/plugins/lists/server/services/lists/find_list.ts
+++ b/x-pack/plugins/lists/server/services/lists/find_list.ts
@@ -65,7 +65,7 @@ export const findList = async ({
 
   const { body: totalCount } = await esClient.count({
     body: {
-      // @ts-expect-error GetQueryFilterReturn is not compatible with QueryContainer
+      // @ts-expect-error GetQueryFilterReturn is not compatible with QueryDslQueryContainer
       query,
     },
     ignore_unavailable: true,
@@ -78,7 +78,7 @@ export const findList = async ({
     // to explicitly define the type <T>.
     const { body: response } = await esClient.search<SearchEsListSchema>({
       body: {
-        // @ts-expect-error GetQueryFilterReturn is not compatible with QueryContainer
+        // @ts-expect-error GetQueryFilterReturn is not compatible with QueryDslQueryContainer
         query,
         search_after: scroll.searchAfter,
         sort: getSortWithTieBreaker({ sortField, sortOrder }),
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 4ddd3f1c73315..e34b3080dd33b 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
@@ -46,7 +46,7 @@ export const getSearchAfterScroll = async <T>({
     const { body: response } = await esClient.search<TieBreaker<T>>({
       body: {
         _source: getSourceWithTieBreaker({ sortField }),
-        // @ts-expect-error Filter is not assignale to QueryContainer
+        // @ts-expect-error Filter is not assignale to QueryDslQueryContainer
         query,
         search_after: newSearchAfter,
         sort: getSortWithTieBreaker({ sortField, sortOrder }),
diff --git a/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts b/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts
index dbcec20d3d8a8..8a513483f5b5e 100644
--- a/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts
+++ b/x-pack/plugins/lists/server/services/utils/get_sort_with_tie_breaker.ts
@@ -13,7 +13,7 @@ export const getSortWithTieBreaker = ({
 }: {
   sortField: SortFieldOrUndefined;
   sortOrder: SortOrderOrUndefined;
-}): estypes.SortCombinations[] => {
+}): estypes.SearchSortCombinations[] => {
   const ascOrDesc = sortOrder ?? ('asc' as const);
   if (sortField != null) {
     return [{ [sortField]: ascOrDesc, tie_breaker_id: 'asc' as const }];
diff --git a/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts b/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
index 585eeeb118110..79db56f9a7fe9 100644
--- a/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
+++ b/x-pack/plugins/lists/server/services/utils/transform_elastic_to_list_item.ts
@@ -20,7 +20,7 @@ export interface TransformElasticToListItemOptions {
 }
 
 export interface TransformElasticHitToListItemOptions {
-  hits: Array<estypes.Hit<SearchEsListItemSchema>>;
+  hits: Array<estypes.SearchHit<SearchEsListItemSchema>>;
   type: Type;
 }
 
diff --git a/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts b/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts
index 1e1afc33394f3..10c1d1ba24ae0 100755
--- a/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts
+++ b/x-pack/plugins/logstash/server/models/cluster/cluster.test.ts
@@ -13,7 +13,7 @@ describe('cluster', () => {
     describe('fromUpstreamJSON factory method', () => {
       const upstreamJSON = {
         cluster_uuid: 'S-S4NNZDRV-g9c-JrIhx6A',
-      } as estypes.RootNodeInfoResponse;
+      } as estypes.InfoResponse;
 
       it('returns correct Cluster instance', () => {
         const cluster = Cluster.fromUpstreamJSON(upstreamJSON);
diff --git a/x-pack/plugins/logstash/server/models/cluster/cluster.ts b/x-pack/plugins/logstash/server/models/cluster/cluster.ts
index 88789a2d29c89..2982284879c47 100755
--- a/x-pack/plugins/logstash/server/models/cluster/cluster.ts
+++ b/x-pack/plugins/logstash/server/models/cluster/cluster.ts
@@ -24,7 +24,7 @@ export class Cluster {
   }
 
   // generate Pipeline object from elasticsearch response
-  static fromUpstreamJSON(upstreamCluster: estypes.RootNodeInfoResponse) {
+  static fromUpstreamJSON(upstreamCluster: estypes.InfoResponse) {
     const uuid = upstreamCluster.cluster_uuid;
     return new Cluster({ uuid });
   }
diff --git a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
index 102434ffda161..7cead3815e7af 100644
--- a/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
+++ b/x-pack/plugins/maps/common/descriptor_types/map_descriptor.ts
@@ -11,7 +11,7 @@ import { ReactNode } from 'react';
 import { GeoJsonProperties } from 'geojson';
 import { Geometry } from 'geojson';
 import { Query } from '../../../../../src/plugins/data/common';
-import { DRAW_TYPE, ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../constants';
+import { DRAW_TYPE, ES_SPATIAL_RELATIONS } from '../constants';
 
 export type MapExtent = {
   minLon: number;
@@ -24,11 +24,6 @@ export type MapQuery = Query & {
   queryLastTriggeredAt?: string;
 };
 
-export type MapRefreshConfig = {
-  isPaused: boolean;
-  interval: number;
-};
-
 export type MapCenter = {
   lat: number;
   lon: number;
@@ -70,9 +65,6 @@ export type DrawState = {
   actionId: string;
   drawType: DRAW_TYPE;
   filterLabel?: string; // point radius filter alias
-  geoFieldName?: string;
-  geoFieldType?: ES_GEO_FIELD_TYPE;
   geometryLabel?: string;
-  indexPatternId?: string;
   relation?: ES_SPATIAL_RELATIONS;
 };
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.test.js b/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.test.js
index c2ca952c3e8c9..e6b27e78fd36b 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.test.js
+++ b/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.test.js
@@ -9,9 +9,7 @@ import {
   hitsToGeoJson,
   geoPointToGeometry,
   geoShapeToGeometry,
-  createExtentFilter,
   roundCoordinates,
-  extractFeaturesFromFilters,
   makeESBbox,
   scaleBounds,
 } from './elasticsearch_geo_utils';
@@ -388,94 +386,6 @@ describe('geoShapeToGeometry', () => {
   });
 });
 
-describe('createExtentFilter', () => {
-  it('should return elasticsearch geo_bounding_box filter', () => {
-    const mapExtent = {
-      maxLat: 39,
-      maxLon: -83,
-      minLat: 35,
-      minLon: -89,
-    };
-    const filter = createExtentFilter(mapExtent, [geoFieldName]);
-    expect(filter.geo_bounding_box).toEqual({
-      location: {
-        top_left: [-89, 39],
-        bottom_right: [-83, 35],
-      },
-    });
-  });
-
-  it('should clamp longitudes to -180 to 180 and latitudes to -90 to 90', () => {
-    const mapExtent = {
-      maxLat: 120,
-      maxLon: 200,
-      minLat: -100,
-      minLon: -190,
-    };
-    const filter = createExtentFilter(mapExtent, [geoFieldName]);
-    expect(filter.geo_bounding_box).toEqual({
-      location: {
-        top_left: [-180, 89],
-        bottom_right: [180, -89],
-      },
-    });
-  });
-
-  it('should make left longitude greater than right longitude when area crosses 180 meridian east to west', () => {
-    const mapExtent = {
-      maxLat: 39,
-      maxLon: 200,
-      minLat: 35,
-      minLon: 100,
-    };
-    const filter = createExtentFilter(mapExtent, [geoFieldName]);
-    const leftLon = filter.geo_bounding_box.location.top_left[0];
-    const rightLon = filter.geo_bounding_box.location.bottom_right[0];
-    expect(leftLon).toBeGreaterThan(rightLon);
-    expect(filter.geo_bounding_box).toEqual({
-      location: {
-        top_left: [100, 39],
-        bottom_right: [-160, 35],
-      },
-    });
-  });
-
-  it('should make left longitude greater than right longitude when area crosses 180 meridian west to east', () => {
-    const mapExtent = {
-      maxLat: 39,
-      maxLon: -100,
-      minLat: 35,
-      minLon: -200,
-    };
-    const filter = createExtentFilter(mapExtent, [geoFieldName]);
-    const leftLon = filter.geo_bounding_box.location.top_left[0];
-    const rightLon = filter.geo_bounding_box.location.bottom_right[0];
-    expect(leftLon).toBeGreaterThan(rightLon);
-    expect(filter.geo_bounding_box).toEqual({
-      location: {
-        top_left: [160, 39],
-        bottom_right: [-100, 35],
-      },
-    });
-  });
-
-  it('should clamp longitudes to -180 to 180 when longitude wraps globe', () => {
-    const mapExtent = {
-      maxLat: 39,
-      maxLon: 209,
-      minLat: 35,
-      minLon: -191,
-    };
-    const filter = createExtentFilter(mapExtent, [geoFieldName]);
-    expect(filter.geo_bounding_box).toEqual({
-      location: {
-        top_left: [-180, 39],
-        bottom_right: [180, 35],
-      },
-    });
-  });
-});
-
 describe('roundCoordinates', () => {
   it('should set coordinates precision', () => {
     const coordinates = [
@@ -492,134 +402,6 @@ describe('roundCoordinates', () => {
   });
 });
 
-describe('extractFeaturesFromFilters', () => {
-  it('should ignore non-spatial filers', () => {
-    const phraseFilter = {
-      meta: {
-        alias: null,
-        disabled: false,
-        index: '90943e30-9a47-11e8-b64d-95841ca0b247',
-        key: 'machine.os',
-        negate: false,
-        params: {
-          query: 'ios',
-        },
-        type: 'phrase',
-      },
-      query: {
-        match_phrase: {
-          'machine.os': 'ios',
-        },
-      },
-    };
-    expect(extractFeaturesFromFilters([phraseFilter])).toEqual([]);
-  });
-
-  it('should convert geo_distance filter to feature', () => {
-    const spatialFilter = {
-      geo_distance: {
-        distance: '1096km',
-        'geo.coordinates': [-89.87125, 53.49454],
-      },
-      meta: {
-        alias: 'geo.coordinates within 1096km of -89.87125,53.49454',
-        disabled: false,
-        index: '90943e30-9a47-11e8-b64d-95841ca0b247',
-        key: 'geo.coordinates',
-        negate: false,
-        type: 'spatial_filter',
-        value: '',
-      },
-    };
-
-    const features = extractFeaturesFromFilters([spatialFilter]);
-    expect(features[0].geometry.coordinates[0][0]).toEqual([-89.87125, 63.35109118642093]);
-    expect(features[0].properties).toEqual({
-      filter: 'geo.coordinates within 1096km of -89.87125,53.49454',
-    });
-  });
-
-  it('should convert geo_shape filter to feature', () => {
-    const spatialFilter = {
-      geo_shape: {
-        'geo.coordinates': {
-          relation: 'INTERSECTS',
-          shape: {
-            coordinates: [
-              [
-                [-101.21639, 48.1413],
-                [-101.21639, 41.84905],
-                [-90.95149, 41.84905],
-                [-90.95149, 48.1413],
-                [-101.21639, 48.1413],
-              ],
-            ],
-            type: 'Polygon',
-          },
-        },
-        ignore_unmapped: true,
-      },
-      meta: {
-        alias: 'geo.coordinates in bounds',
-        disabled: false,
-        index: '90943e30-9a47-11e8-b64d-95841ca0b247',
-        key: 'geo.coordinates',
-        negate: false,
-        type: 'spatial_filter',
-        value: '',
-      },
-    };
-
-    expect(extractFeaturesFromFilters([spatialFilter])).toEqual([
-      {
-        type: 'Feature',
-        geometry: {
-          type: 'Polygon',
-          coordinates: [
-            [
-              [-101.21639, 48.1413],
-              [-101.21639, 41.84905],
-              [-90.95149, 41.84905],
-              [-90.95149, 48.1413],
-              [-101.21639, 48.1413],
-            ],
-          ],
-        },
-        properties: {
-          filter: 'geo.coordinates in bounds',
-        },
-      },
-    ]);
-  });
-
-  it('should ignore geo_shape filter with pre-index shape', () => {
-    const spatialFilter = {
-      geo_shape: {
-        'geo.coordinates': {
-          indexed_shape: {
-            id: 's5gldXEBkTB2HMwpC8y0',
-            index: 'world_countries_v1',
-            path: 'coordinates',
-          },
-          relation: 'INTERSECTS',
-        },
-        ignore_unmapped: true,
-      },
-      meta: {
-        alias: 'geo.coordinates in multipolygon',
-        disabled: false,
-        index: '90943e30-9a47-11e8-b64d-95841ca0b247',
-        key: 'geo.coordinates',
-        negate: false,
-        type: 'spatial_filter',
-        value: '',
-      },
-    };
-
-    expect(extractFeaturesFromFilters([spatialFilter])).toEqual([]);
-  });
-});
-
 describe('makeESBbox', () => {
   it('Should invert Y-axis', () => {
     const bbox = makeESBbox({
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.ts b/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.ts
index e47afce77f779..8033f8d187fd5 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_util/elasticsearch_geo_utils.ts
@@ -16,61 +16,13 @@ import { BBox } from '@turf/helpers';
 import {
   DECIMAL_DEGREES_PRECISION,
   ES_GEO_FIELD_TYPE,
-  ES_SPATIAL_RELATIONS,
   GEO_JSON_TYPE,
   POLYGON_COORDINATES_EXTERIOR_INDEX,
   LON_INDEX,
   LAT_INDEX,
 } from '../constants';
-import { getEsSpatialRelationLabel } from '../i18n_getters';
-import { Filter, FilterMeta, FILTERS } from '../../../../../src/plugins/data/common';
 import { MapExtent } from '../descriptor_types';
-
-const SPATIAL_FILTER_TYPE = FILTERS.SPATIAL_FILTER;
-
-type Coordinates = Position | Position[] | Position[][] | Position[][][];
-
-// Elasticsearch stores more then just GeoJSON.
-// 1) geometry.type as lower case string
-// 2) circle and envelope types
-interface ESGeometry {
-  type: string;
-  coordinates: Coordinates;
-}
-
-export interface ESBBox {
-  top_left: number[];
-  bottom_right: number[];
-}
-
-interface GeoShapeQueryBody {
-  shape?: Polygon;
-  relation?: ES_SPATIAL_RELATIONS;
-  indexed_shape?: PreIndexedShape;
-}
-
-// Index signature explicitly states that anything stored in an object using a string conforms to the structure
-// problem is that Elasticsearch signature also allows for other string keys to conform to other structures, like 'ignore_unmapped'
-// Use intersection type to exclude certain properties from the index signature
-// https://basarat.gitbook.io/typescript/type-system/index-signatures#excluding-certain-properties-from-the-index-signature
-type GeoShapeQuery = { ignore_unmapped: boolean } & { [geoFieldName: string]: GeoShapeQueryBody };
-
-export type GeoFilter = Filter & {
-  geo_bounding_box?: {
-    [geoFieldName: string]: ESBBox;
-  };
-  geo_distance?: {
-    distance: string;
-    [geoFieldName: string]: Position | { lat: number; lon: number } | string;
-  };
-  geo_shape?: GeoShapeQuery;
-};
-
-export interface PreIndexedShape {
-  index: string;
-  id: string | number;
-  path: string;
-}
+import { Coordinates, ESBBox, ESGeometry } from './types';
 
 function ensureGeoField(type: string) {
   const expectedTypes = [ES_GEO_FIELD_TYPE.GEO_POINT, ES_GEO_FIELD_TYPE.GEO_SHAPE];
@@ -349,136 +301,6 @@ export function makeESBbox({ maxLat, maxLon, minLat, minLon }: MapExtent): ESBBo
   return esBbox;
 }
 
-export function createExtentFilter(mapExtent: MapExtent, geoFieldNames: string[]): GeoFilter {
-  const esBbox = makeESBbox(mapExtent);
-  return geoFieldNames.length === 1
-    ? {
-        geo_bounding_box: {
-          [geoFieldNames[0]]: esBbox,
-        },
-        meta: {
-          alias: null,
-          disabled: false,
-          negate: false,
-          key: geoFieldNames[0],
-        },
-      }
-    : {
-        query: {
-          bool: {
-            should: geoFieldNames.map((geoFieldName) => {
-              return {
-                bool: {
-                  must: [
-                    {
-                      exists: {
-                        field: geoFieldName,
-                      },
-                    },
-                    {
-                      geo_bounding_box: {
-                        [geoFieldName]: esBbox,
-                      },
-                    },
-                  ],
-                },
-              };
-            }),
-          },
-        },
-        meta: {
-          alias: null,
-          disabled: false,
-          negate: false,
-        },
-      };
-}
-
-export function createSpatialFilterWithGeometry({
-  preIndexedShape,
-  geometry,
-  geometryLabel,
-  indexPatternId,
-  geoFieldName,
-  relation = ES_SPATIAL_RELATIONS.INTERSECTS,
-}: {
-  preIndexedShape?: PreIndexedShape | null;
-  geometry: Polygon;
-  geometryLabel: string;
-  indexPatternId: string;
-  geoFieldName: string;
-  relation: ES_SPATIAL_RELATIONS;
-}): GeoFilter {
-  const meta: FilterMeta = {
-    type: SPATIAL_FILTER_TYPE,
-    negate: false,
-    index: indexPatternId,
-    key: geoFieldName,
-    alias: `${geoFieldName} ${getEsSpatialRelationLabel(relation)} ${geometryLabel}`,
-    disabled: false,
-  };
-
-  const shapeQuery: GeoShapeQueryBody = {
-    relation,
-  };
-  if (preIndexedShape) {
-    shapeQuery.indexed_shape = preIndexedShape;
-  } else {
-    shapeQuery.shape = geometry;
-  }
-
-  return {
-    meta,
-    // Currently no way to create an object with exclude property from index signature
-    // typescript error for "ignore_unmapped is not assignable to type 'GeoShapeQueryBody'" expected"
-    // @ts-expect-error
-    geo_shape: {
-      ignore_unmapped: true,
-      [geoFieldName]: shapeQuery,
-    },
-  };
-}
-
-export function createDistanceFilterWithMeta({
-  alias,
-  distanceKm,
-  geoFieldName,
-  indexPatternId,
-  point,
-}: {
-  alias: string;
-  distanceKm: number;
-  geoFieldName: string;
-  indexPatternId: string;
-  point: Position;
-}): GeoFilter {
-  const meta: FilterMeta = {
-    type: SPATIAL_FILTER_TYPE,
-    negate: false,
-    index: indexPatternId,
-    key: geoFieldName,
-    alias: alias
-      ? alias
-      : i18n.translate('xpack.maps.es_geo_utils.distanceFilterAlias', {
-          defaultMessage: '{geoFieldName} within {distanceKm}km of {pointLabel}',
-          values: {
-            distanceKm,
-            geoFieldName,
-            pointLabel: point.join(', '),
-          },
-        }),
-    disabled: false,
-  };
-
-  return {
-    geo_distance: {
-      distance: `${distanceKm}km`,
-      [geoFieldName]: point,
-    },
-    meta,
-  };
-}
-
 export function roundCoordinates(coordinates: Coordinates): void {
   for (let i = 0; i < coordinates.length; i++) {
     const value = coordinates[i];
@@ -549,44 +371,6 @@ export function clamp(val: number, min: number, max: number): number {
   }
 }
 
-export function extractFeaturesFromFilters(filters: GeoFilter[]): Feature[] {
-  const features: Feature[] = [];
-  filters
-    .filter((filter) => {
-      return filter.meta.key && filter.meta.type === SPATIAL_FILTER_TYPE;
-    })
-    .forEach((filter) => {
-      const geoFieldName = filter.meta.key!;
-      let geometry;
-      if (filter.geo_distance && filter.geo_distance[geoFieldName]) {
-        const distanceSplit = filter.geo_distance.distance.split('km');
-        const distance = parseFloat(distanceSplit[0]);
-        const circleFeature = turfCircle(filter.geo_distance[geoFieldName], distance);
-        geometry = circleFeature.geometry;
-      } else if (
-        filter.geo_shape &&
-        filter.geo_shape[geoFieldName] &&
-        filter.geo_shape[geoFieldName].shape
-      ) {
-        geometry = filter.geo_shape[geoFieldName].shape;
-      } else {
-        // do not know how to convert spatial filter to geometry
-        // this includes pre-indexed shapes
-        return;
-      }
-
-      features.push({
-        type: 'Feature',
-        geometry,
-        properties: {
-          filter: filter.meta.alias,
-        },
-      });
-    });
-
-  return features;
-}
-
 export function scaleBounds(bounds: MapExtent, scaleFactor: number): MapExtent {
   const width = bounds.maxLon - bounds.minLon;
   const height = bounds.maxLat - bounds.minLat;
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/index.ts b/x-pack/plugins/maps/common/elasticsearch_util/index.ts
index 24dd56b217401..7073a4201f7a5 100644
--- a/x-pack/plugins/maps/common/elasticsearch_util/index.ts
+++ b/x-pack/plugins/maps/common/elasticsearch_util/index.ts
@@ -8,4 +8,6 @@
 export * from './es_agg_utils';
 export * from './convert_to_geojson';
 export * from './elasticsearch_geo_utils';
+export * from './spatial_filter_utils';
+export * from './types';
 export { isTotalHitsGreaterThan, TotalHits } from './total_hits';
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/spatial_filter_utils.test.ts b/x-pack/plugins/maps/common/elasticsearch_util/spatial_filter_utils.test.ts
new file mode 100644
index 0000000000000..d828aca4a1a00
--- /dev/null
+++ b/x-pack/plugins/maps/common/elasticsearch_util/spatial_filter_utils.test.ts
@@ -0,0 +1,534 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { Polygon } from 'geojson';
+import {
+  createDistanceFilterWithMeta,
+  createExtentFilter,
+  createSpatialFilterWithGeometry,
+  extractFeaturesFromFilters,
+} from './spatial_filter_utils';
+
+const geoFieldName = 'location';
+
+describe('createExtentFilter', () => {
+  it('should return elasticsearch geo_bounding_box filter', () => {
+    const mapExtent = {
+      maxLat: 39,
+      maxLon: -83,
+      minLat: 35,
+      minLon: -89,
+    };
+    const filter = createExtentFilter(mapExtent, [geoFieldName]);
+    expect(filter.geo_bounding_box).toEqual({
+      location: {
+        top_left: [-89, 39],
+        bottom_right: [-83, 35],
+      },
+    });
+  });
+
+  it('should clamp longitudes to -180 to 180 and latitudes to -90 to 90', () => {
+    const mapExtent = {
+      maxLat: 120,
+      maxLon: 200,
+      minLat: -100,
+      minLon: -190,
+    };
+    const filter = createExtentFilter(mapExtent, [geoFieldName]);
+    expect(filter.geo_bounding_box).toEqual({
+      location: {
+        top_left: [-180, 89],
+        bottom_right: [180, -89],
+      },
+    });
+  });
+
+  it('should make left longitude greater than right longitude when area crosses 180 meridian east to west', () => {
+    const mapExtent = {
+      maxLat: 39,
+      maxLon: 200,
+      minLat: 35,
+      minLon: 100,
+    };
+    const filter = createExtentFilter(mapExtent, [geoFieldName]);
+    expect(filter.geo_bounding_box).toEqual({
+      location: {
+        top_left: [100, 39],
+        bottom_right: [-160, 35],
+      },
+    });
+  });
+
+  it('should make left longitude greater than right longitude when area crosses 180 meridian west to east', () => {
+    const mapExtent = {
+      maxLat: 39,
+      maxLon: -100,
+      minLat: 35,
+      minLon: -200,
+    };
+    const filter = createExtentFilter(mapExtent, [geoFieldName]);
+    expect(filter.geo_bounding_box).toEqual({
+      location: {
+        top_left: [160, 39],
+        bottom_right: [-100, 35],
+      },
+    });
+  });
+
+  it('should clamp longitudes to -180 to 180 when longitude wraps globe', () => {
+    const mapExtent = {
+      maxLat: 39,
+      maxLon: 209,
+      minLat: 35,
+      minLon: -191,
+    };
+    const filter = createExtentFilter(mapExtent, [geoFieldName]);
+    expect(filter.geo_bounding_box).toEqual({
+      location: {
+        top_left: [-180, 39],
+        bottom_right: [180, 35],
+      },
+    });
+  });
+
+  it('should support multiple geo fields', () => {
+    const mapExtent = {
+      maxLat: 39,
+      maxLon: -83,
+      minLat: 35,
+      minLon: -89,
+    };
+    expect(createExtentFilter(mapExtent, [geoFieldName, 'myOtherLocation'])).toEqual({
+      meta: {
+        alias: null,
+        disabled: false,
+        isMultiIndex: true,
+        negate: false,
+      },
+      query: {
+        bool: {
+          should: [
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'location',
+                    },
+                  },
+                  {
+                    geo_bounding_box: {
+                      location: {
+                        top_left: [-89, 39],
+                        bottom_right: [-83, 35],
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'myOtherLocation',
+                    },
+                  },
+                  {
+                    geo_bounding_box: {
+                      myOtherLocation: {
+                        top_left: [-89, 39],
+                        bottom_right: [-83, 35],
+                      },
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    });
+  });
+});
+
+describe('createSpatialFilterWithGeometry', () => {
+  it('should build filter for single field', () => {
+    const spatialFilter = createSpatialFilterWithGeometry({
+      geometry: {
+        coordinates: [
+          [
+            [-101.21639, 48.1413],
+            [-101.21639, 41.84905],
+            [-90.95149, 41.84905],
+            [-90.95149, 48.1413],
+            [-101.21639, 48.1413],
+          ],
+        ],
+        type: 'Polygon',
+      },
+      geometryLabel: 'myShape',
+      geoFieldNames: ['geo.coordinates'],
+    });
+    expect(spatialFilter).toEqual({
+      meta: {
+        alias: 'intersects myShape',
+        disabled: false,
+        key: 'geo.coordinates',
+        negate: false,
+        type: 'spatial_filter',
+      },
+      geo_shape: {
+        'geo.coordinates': {
+          relation: 'INTERSECTS',
+          shape: {
+            coordinates: [
+              [
+                [-101.21639, 48.1413],
+                [-101.21639, 41.84905],
+                [-90.95149, 41.84905],
+                [-90.95149, 48.1413],
+                [-101.21639, 48.1413],
+              ],
+            ],
+            type: 'Polygon',
+          },
+        },
+        ignore_unmapped: true,
+      },
+    });
+  });
+
+  it('should build filter for multiple field', () => {
+    const spatialFilter = createSpatialFilterWithGeometry({
+      geometry: {
+        coordinates: [
+          [
+            [-101.21639, 48.1413],
+            [-101.21639, 41.84905],
+            [-90.95149, 41.84905],
+            [-90.95149, 48.1413],
+            [-101.21639, 48.1413],
+          ],
+        ],
+        type: 'Polygon',
+      },
+      geometryLabel: 'myShape',
+      geoFieldNames: ['geo.coordinates', 'location'],
+    });
+    expect(spatialFilter).toEqual({
+      meta: {
+        alias: 'intersects myShape',
+        disabled: false,
+        isMultiIndex: true,
+        key: undefined,
+        negate: false,
+        type: 'spatial_filter',
+      },
+      query: {
+        bool: {
+          should: [
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'geo.coordinates',
+                    },
+                  },
+                  {
+                    geo_shape: {
+                      'geo.coordinates': {
+                        relation: 'INTERSECTS',
+                        shape: {
+                          coordinates: [
+                            [
+                              [-101.21639, 48.1413],
+                              [-101.21639, 41.84905],
+                              [-90.95149, 41.84905],
+                              [-90.95149, 48.1413],
+                              [-101.21639, 48.1413],
+                            ],
+                          ],
+                          type: 'Polygon',
+                        },
+                      },
+                      ignore_unmapped: true,
+                    },
+                  },
+                ],
+              },
+            },
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'location',
+                    },
+                  },
+                  {
+                    geo_shape: {
+                      location: {
+                        relation: 'INTERSECTS',
+                        shape: {
+                          coordinates: [
+                            [
+                              [-101.21639, 48.1413],
+                              [-101.21639, 41.84905],
+                              [-90.95149, 41.84905],
+                              [-90.95149, 48.1413],
+                              [-101.21639, 48.1413],
+                            ],
+                          ],
+                          type: 'Polygon',
+                        },
+                      },
+                      ignore_unmapped: true,
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    });
+  });
+});
+
+describe('createDistanceFilterWithMeta', () => {
+  it('should build filter for single field', () => {
+    const spatialFilter = createDistanceFilterWithMeta({
+      point: [120, 30],
+      distanceKm: 1000,
+      geoFieldNames: ['geo.coordinates'],
+    });
+    expect(spatialFilter).toEqual({
+      meta: {
+        alias: 'within 1000km of 120, 30',
+        disabled: false,
+        key: 'geo.coordinates',
+        negate: false,
+        type: 'spatial_filter',
+      },
+      geo_distance: {
+        distance: '1000km',
+        'geo.coordinates': [120, 30],
+      },
+    });
+  });
+
+  it('should build filter for multiple field', () => {
+    const spatialFilter = createDistanceFilterWithMeta({
+      point: [120, 30],
+      distanceKm: 1000,
+      geoFieldNames: ['geo.coordinates', 'location'],
+    });
+    expect(spatialFilter).toEqual({
+      meta: {
+        alias: 'within 1000km of 120, 30',
+        disabled: false,
+        isMultiIndex: true,
+        key: undefined,
+        negate: false,
+        type: 'spatial_filter',
+      },
+      query: {
+        bool: {
+          should: [
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'geo.coordinates',
+                    },
+                  },
+                  {
+                    geo_distance: {
+                      distance: '1000km',
+                      'geo.coordinates': [120, 30],
+                    },
+                  },
+                ],
+              },
+            },
+            {
+              bool: {
+                must: [
+                  {
+                    exists: {
+                      field: 'location',
+                    },
+                  },
+                  {
+                    geo_distance: {
+                      distance: '1000km',
+                      location: [120, 30],
+                    },
+                  },
+                ],
+              },
+            },
+          ],
+        },
+      },
+    });
+  });
+});
+
+describe('extractFeaturesFromFilters', () => {
+  it('should ignore non-spatial filers', () => {
+    const phraseFilter = {
+      meta: {
+        alias: null,
+        disabled: false,
+        index: '90943e30-9a47-11e8-b64d-95841ca0b247',
+        key: 'machine.os',
+        negate: false,
+        params: {
+          query: 'ios',
+        },
+        type: 'phrase',
+      },
+      query: {
+        match_phrase: {
+          'machine.os': 'ios',
+        },
+      },
+    };
+    expect(extractFeaturesFromFilters([phraseFilter])).toEqual([]);
+  });
+
+  it('should convert single field geo_distance filter to feature', () => {
+    const spatialFilter = createDistanceFilterWithMeta({
+      point: [-89.87125, 53.49454],
+      distanceKm: 1096,
+      geoFieldNames: ['geo.coordinates', 'location'],
+    });
+
+    const features = extractFeaturesFromFilters([spatialFilter]);
+    expect((features[0].geometry as Polygon).coordinates[0][0]).toEqual([
+      -89.87125,
+      63.35109118642093,
+    ]);
+    expect(features[0].properties).toEqual({
+      filter: 'within 1096km of -89.87125, 53.49454',
+    });
+  });
+
+  it('should convert multi field geo_distance filter to feature', () => {
+    const spatialFilter = createDistanceFilterWithMeta({
+      point: [-89.87125, 53.49454],
+      distanceKm: 1096,
+      geoFieldNames: ['geo.coordinates', 'location'],
+    });
+
+    const features = extractFeaturesFromFilters([spatialFilter]);
+    expect((features[0].geometry as Polygon).coordinates[0][0]).toEqual([
+      -89.87125,
+      63.35109118642093,
+    ]);
+    expect(features[0].properties).toEqual({
+      filter: 'within 1096km of -89.87125, 53.49454',
+    });
+  });
+
+  it('should convert single field geo_shape filter to feature', () => {
+    const spatialFilter = createSpatialFilterWithGeometry({
+      geometry: {
+        coordinates: [
+          [
+            [-101.21639, 48.1413],
+            [-101.21639, 41.84905],
+            [-90.95149, 41.84905],
+            [-90.95149, 48.1413],
+            [-101.21639, 48.1413],
+          ],
+        ],
+        type: 'Polygon',
+      },
+      geometryLabel: 'myShape',
+      geoFieldNames: ['geo.coordinates'],
+    });
+    expect(extractFeaturesFromFilters([spatialFilter])).toEqual([
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Polygon',
+          coordinates: [
+            [
+              [-101.21639, 48.1413],
+              [-101.21639, 41.84905],
+              [-90.95149, 41.84905],
+              [-90.95149, 48.1413],
+              [-101.21639, 48.1413],
+            ],
+          ],
+        } as Polygon,
+        properties: {
+          filter: 'intersects myShape',
+        },
+      },
+    ]);
+  });
+
+  it('should convert multi field geo_shape filter to feature', () => {
+    const spatialFilter = createSpatialFilterWithGeometry({
+      geometry: {
+        coordinates: [
+          [
+            [-101.21639, 48.1413],
+            [-101.21639, 41.84905],
+            [-90.95149, 41.84905],
+            [-90.95149, 48.1413],
+            [-101.21639, 48.1413],
+          ],
+        ],
+        type: 'Polygon',
+      },
+      geometryLabel: 'myShape',
+      geoFieldNames: ['geo.coordinates', 'location'],
+    });
+    expect(extractFeaturesFromFilters([spatialFilter])).toEqual([
+      {
+        type: 'Feature',
+        geometry: {
+          type: 'Polygon',
+          coordinates: [
+            [
+              [-101.21639, 48.1413],
+              [-101.21639, 41.84905],
+              [-90.95149, 41.84905],
+              [-90.95149, 48.1413],
+              [-101.21639, 48.1413],
+            ],
+          ],
+        } as Polygon,
+        properties: {
+          filter: 'intersects myShape',
+        },
+      },
+    ]);
+  });
+
+  it('should ignore geo_shape filter with pre-index shape', () => {
+    const spatialFilter = createSpatialFilterWithGeometry({
+      preIndexedShape: {
+        index: 'world_countries_v1',
+        id: 's5gldXEBkTB2HMwpC8y0',
+        path: 'coordinates',
+      },
+      geometryLabel: 'myShape',
+      geoFieldNames: ['geo.coordinates'],
+    });
+    expect(extractFeaturesFromFilters([spatialFilter])).toEqual([]);
+  });
+});
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/spatial_filter_utils.ts b/x-pack/plugins/maps/common/elasticsearch_util/spatial_filter_utils.ts
new file mode 100644
index 0000000000000..70df9e9646f50
--- /dev/null
+++ b/x-pack/plugins/maps/common/elasticsearch_util/spatial_filter_utils.ts
@@ -0,0 +1,221 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+import { Feature, Geometry, Polygon, Position } from 'geojson';
+// @ts-expect-error
+import turfCircle from '@turf/circle';
+import { FilterMeta, FILTERS } from '../../../../../src/plugins/data/common';
+import { MapExtent } from '../descriptor_types';
+import { ES_SPATIAL_RELATIONS } from '../constants';
+import { getEsSpatialRelationLabel } from '../i18n_getters';
+import { GeoFilter, GeoShapeQueryBody, PreIndexedShape } from './types';
+import { makeESBbox } from './elasticsearch_geo_utils';
+
+const SPATIAL_FILTER_TYPE = FILTERS.SPATIAL_FILTER;
+
+// wrapper around boiler plate code for creating bool.should clause with nested bool.must clauses
+// ensuring geoField exists prior to running geoField query
+// This allows for writing a single geo filter that spans multiple indices with different geo fields.
+function createMultiGeoFieldFilter(
+  geoFieldNames: string[],
+  meta: FilterMeta,
+  createGeoFilter: (geoFieldName: string) => Omit<GeoFilter, 'meta'>
+): GeoFilter {
+  if (geoFieldNames.length === 0) {
+    throw new Error('Unable to create filter, geo fields not provided');
+  }
+
+  if (geoFieldNames.length === 1) {
+    const geoFilter = createGeoFilter(geoFieldNames[0]);
+    return {
+      meta: {
+        ...meta,
+        key: geoFieldNames[0],
+      },
+      ...geoFilter,
+    };
+  }
+
+  return {
+    meta: {
+      ...meta,
+      key: undefined,
+      isMultiIndex: true,
+    },
+    query: {
+      bool: {
+        should: geoFieldNames.map((geoFieldName) => {
+          return {
+            bool: {
+              must: [
+                {
+                  exists: {
+                    field: geoFieldName,
+                  },
+                },
+                createGeoFilter(geoFieldName),
+              ],
+            },
+          };
+        }),
+      },
+    },
+  };
+}
+
+export function createExtentFilter(mapExtent: MapExtent, geoFieldNames: string[]): GeoFilter {
+  const esBbox = makeESBbox(mapExtent);
+  function createGeoFilter(geoFieldName: string) {
+    return {
+      geo_bounding_box: {
+        [geoFieldName]: esBbox,
+      },
+    };
+  }
+
+  const meta: FilterMeta = {
+    alias: null,
+    disabled: false,
+    negate: false,
+  };
+
+  return createMultiGeoFieldFilter(geoFieldNames, meta, createGeoFilter);
+}
+
+export function createSpatialFilterWithGeometry({
+  preIndexedShape,
+  geometry,
+  geometryLabel,
+  geoFieldNames,
+  relation = ES_SPATIAL_RELATIONS.INTERSECTS,
+}: {
+  preIndexedShape?: PreIndexedShape | null;
+  geometry?: Polygon;
+  geometryLabel: string;
+  geoFieldNames: string[];
+  relation?: ES_SPATIAL_RELATIONS;
+}): GeoFilter {
+  const meta: FilterMeta = {
+    type: SPATIAL_FILTER_TYPE,
+    negate: false,
+    key: geoFieldNames.length === 1 ? geoFieldNames[0] : undefined,
+    alias: `${getEsSpatialRelationLabel(relation)} ${geometryLabel}`,
+    disabled: false,
+  };
+
+  function createGeoFilter(geoFieldName: string) {
+    const shapeQuery: GeoShapeQueryBody = {
+      relation,
+    };
+    if (preIndexedShape) {
+      shapeQuery.indexed_shape = preIndexedShape;
+    } else if (geometry) {
+      shapeQuery.shape = geometry;
+    } else {
+      throw new Error('Must supply either preIndexedShape or geometry, you did not supply either');
+    }
+
+    return {
+      geo_shape: {
+        ignore_unmapped: true,
+        [geoFieldName]: shapeQuery,
+      },
+    };
+  }
+
+  // Currently no way to create an object with exclude property from index signature
+  // typescript error for "ignore_unmapped is not assignable to type 'GeoShapeQueryBody'" expected"
+  // @ts-expect-error
+  return createMultiGeoFieldFilter(geoFieldNames, meta, createGeoFilter);
+}
+
+export function createDistanceFilterWithMeta({
+  alias,
+  distanceKm,
+  geoFieldNames,
+  point,
+}: {
+  alias?: string;
+  distanceKm: number;
+  geoFieldNames: string[];
+  point: Position;
+}): GeoFilter {
+  const meta: FilterMeta = {
+    type: SPATIAL_FILTER_TYPE,
+    negate: false,
+    alias: alias
+      ? alias
+      : i18n.translate('xpack.maps.es_geo_utils.distanceFilterAlias', {
+          defaultMessage: 'within {distanceKm}km of {pointLabel}',
+          values: {
+            distanceKm,
+            pointLabel: point.join(', '),
+          },
+        }),
+    disabled: false,
+  };
+
+  function createGeoFilter(geoFieldName: string) {
+    return {
+      geo_distance: {
+        distance: `${distanceKm}km`,
+        [geoFieldName]: point,
+      },
+    };
+  }
+
+  return createMultiGeoFieldFilter(geoFieldNames, meta, createGeoFilter);
+}
+
+function extractGeometryFromFilter(geoFieldName: string, filter: GeoFilter): Geometry | undefined {
+  if (filter.geo_distance && filter.geo_distance[geoFieldName]) {
+    const distanceSplit = filter.geo_distance.distance.split('km');
+    const distance = parseFloat(distanceSplit[0]);
+    const circleFeature = turfCircle(filter.geo_distance[geoFieldName], distance);
+    return circleFeature.geometry;
+  }
+
+  if (filter.geo_shape && filter.geo_shape[geoFieldName] && filter.geo_shape[geoFieldName].shape) {
+    return filter.geo_shape[geoFieldName].shape;
+  }
+}
+
+export function extractFeaturesFromFilters(filters: GeoFilter[]): Feature[] {
+  const features: Feature[] = [];
+  filters
+    .filter((filter) => {
+      return filter.meta.type === SPATIAL_FILTER_TYPE;
+    })
+    .forEach((filter) => {
+      let geometry: Geometry | undefined;
+      if (filter.meta.isMultiIndex) {
+        const geoFieldName = filter?.query?.bool?.should?.[0]?.bool?.must?.[0]?.exists?.field;
+        const spatialClause = filter?.query?.bool?.should?.[0]?.bool?.must?.[1];
+        if (geoFieldName && spatialClause) {
+          geometry = extractGeometryFromFilter(geoFieldName, spatialClause);
+        }
+      } else {
+        const geoFieldName = filter.meta.key;
+        if (geoFieldName) {
+          geometry = extractGeometryFromFilter(geoFieldName, filter);
+        }
+      }
+
+      if (geometry) {
+        features.push({
+          type: 'Feature',
+          geometry,
+          properties: {
+            filter: filter.meta.alias,
+          },
+        });
+      }
+    });
+
+  return features;
+}
diff --git a/x-pack/plugins/maps/common/elasticsearch_util/types.ts b/x-pack/plugins/maps/common/elasticsearch_util/types.ts
new file mode 100644
index 0000000000000..bbb508ce69275
--- /dev/null
+++ b/x-pack/plugins/maps/common/elasticsearch_util/types.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Polygon, Position } from 'geojson';
+import { Filter } from '../../../../../src/plugins/data/common';
+import { ES_SPATIAL_RELATIONS } from '../constants';
+
+export type Coordinates = Position | Position[] | Position[][] | Position[][][];
+
+// Elasticsearch stores more then just GeoJSON.
+// 1) geometry.type as lower case string
+// 2) circle and envelope types
+export interface ESGeometry {
+  type: string;
+  coordinates: Coordinates;
+}
+
+export interface ESBBox {
+  top_left: number[];
+  bottom_right: number[];
+}
+
+export interface GeoShapeQueryBody {
+  shape?: Polygon;
+  relation?: ES_SPATIAL_RELATIONS;
+  indexed_shape?: PreIndexedShape;
+}
+
+// Index signature explicitly states that anything stored in an object using a string conforms to the structure
+// problem is that Elasticsearch signature also allows for other string keys to conform to other structures, like 'ignore_unmapped'
+// Use intersection type to exclude certain properties from the index signature
+// https://basarat.gitbook.io/typescript/type-system/index-signatures#excluding-certain-properties-from-the-index-signature
+type GeoShapeQuery = { ignore_unmapped: boolean } & { [geoFieldName: string]: GeoShapeQueryBody };
+
+export type GeoFilter = Filter & {
+  geo_bounding_box?: {
+    [geoFieldName: string]: ESBBox;
+  };
+  geo_distance?: {
+    distance: string;
+    [geoFieldName: string]: Position | { lat: number; lon: number } | string;
+  };
+  geo_shape?: GeoShapeQuery;
+};
+
+export interface PreIndexedShape {
+  index: string;
+  id: string | number;
+  path: string;
+}
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 6b57da132e895..a2a811a8a4223 100644
--- a/x-pack/plugins/maps/public/actions/data_request_actions.ts
+++ b/x-pack/plugins/maps/public/actions/data_request_actions.ts
@@ -123,7 +123,7 @@ function getDataRequestContext(
       dispatch(endDataLoad(layerId, dataId, requestToken, data, meta)),
     onLoadError: (dataId: string, requestToken: symbol, errorMessage: string) =>
       dispatch(onDataLoadError(layerId, dataId, requestToken, errorMessage)),
-    updateSourceData: (newData: unknown) => {
+    updateSourceData: (newData: object) => {
       dispatch(updateSourceDataRequest(layerId, newData));
     },
     isRequestStillActive: (dataId: string, requestToken: symbol) => {
@@ -316,7 +316,7 @@ function onDataLoadError(
   };
 }
 
-export function updateSourceDataRequest(layerId: string, newData: unknown) {
+export function updateSourceDataRequest(layerId: string, newData: object) {
   return (dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) => {
     dispatch({
       type: UPDATE_SOURCE_DATA_REQUEST,
diff --git a/x-pack/plugins/maps/public/actions/map_action_constants.ts b/x-pack/plugins/maps/public/actions/map_action_constants.ts
index 497a5b7c29065..a4924bc52eb88 100644
--- a/x-pack/plugins/maps/public/actions/map_action_constants.ts
+++ b/x-pack/plugins/maps/public/actions/map_action_constants.ts
@@ -23,12 +23,10 @@ export const LAYER_DATA_LOAD_ERROR = 'LAYER_DATA_LOAD_ERROR';
 export const UPDATE_SOURCE_DATA_REQUEST = 'UPDATE_SOURCE_DATA_REQUEST';
 export const SET_JOINS = 'SET_JOINS';
 export const SET_QUERY = 'SET_QUERY';
-export const TRIGGER_REFRESH_TIMER = 'TRIGGER_REFRESH_TIMER';
 export const UPDATE_LAYER_PROP = 'UPDATE_LAYER_PROP';
 export const UPDATE_LAYER_STYLE = 'UPDATE_LAYER_STYLE';
 export const SET_LAYER_STYLE_META = 'SET_LAYER_STYLE_META';
 export const UPDATE_SOURCE_PROP = 'UPDATE_SOURCE_PROP';
-export const SET_REFRESH_CONFIG = 'SET_REFRESH_CONFIG';
 export const SET_MOUSE_COORDINATES = 'SET_MOUSE_COORDINATES';
 export const CLEAR_MOUSE_COORDINATES = 'CLEAR_MOUSE_COORDINATES';
 export const SET_GOTO = 'SET_GOTO';
diff --git a/x-pack/plugins/maps/public/actions/map_actions.ts b/x-pack/plugins/maps/public/actions/map_actions.ts
index 32e17376acaa7..42ce96d102d7e 100644
--- a/x-pack/plugins/maps/public/actions/map_actions.ts
+++ b/x-pack/plugins/maps/public/actions/map_actions.ts
@@ -38,10 +38,8 @@ import {
   SET_MOUSE_COORDINATES,
   SET_OPEN_TOOLTIPS,
   SET_QUERY,
-  SET_REFRESH_CONFIG,
   SET_SCROLL_ZOOM,
   TRACK_MAP_SETTINGS,
-  TRIGGER_REFRESH_TIMER,
   UPDATE_DRAW_STATE,
   UPDATE_MAP_SETTING,
 } from './map_action_constants';
@@ -53,7 +51,6 @@ import {
   MapCenter,
   MapCenterAndZoom,
   MapExtent,
-  MapRefreshConfig,
   Timeslice,
 } from '../../common/descriptor_types';
 import { INITIAL_LOCATION } from '../../common/constants';
@@ -276,7 +273,7 @@ export function setQuery({
         queryLastTriggeredAt: forceRefresh ? generateQueryTimestamp() : prevTriggeredAt,
       },
       filters: filters ? filters : getFilters(getState()),
-      searchSessionId,
+      searchSessionId: searchSessionId ? searchSessionId : getSearchSessionId(getState()),
       searchSessionMapBuffer,
     };
 
@@ -307,31 +304,6 @@ export function setQuery({
   };
 }
 
-export function setRefreshConfig({ isPaused, interval }: MapRefreshConfig) {
-  return {
-    type: SET_REFRESH_CONFIG,
-    isPaused,
-    interval,
-  };
-}
-
-export function triggerRefreshTimer() {
-  return async (
-    dispatch: ThunkDispatch<MapStoreState, void, AnyAction>,
-    getState: () => MapStoreState
-  ) => {
-    dispatch({
-      type: TRIGGER_REFRESH_TIMER,
-    });
-
-    if (getMapSettings(getState()).autoFitToDataBounds) {
-      dispatch(autoFitToBounds());
-    } else {
-      await dispatch(syncDataForAllLayers());
-    }
-  };
-}
-
 export function updateDrawState(drawState: DrawState | null) {
   return (dispatch: Dispatch) => {
     if (drawState !== null) {
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 c798f05df9813..f5df741759cb3 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
@@ -65,5 +65,14 @@ export function getPointFilterExpression(hasJoins: boolean): unknown[] {
 }
 
 export function getCentroidFilterExpression(hasJoins: boolean): unknown[] {
-  return getFilterExpression(['==', ['get', KBN_IS_CENTROID_FEATURE], true], hasJoins);
+  const filters: unknown[] = [
+    EXCLUDE_TOO_MANY_FEATURES_BOX,
+    ['==', ['get', KBN_IS_CENTROID_FEATURE], true],
+  ];
+
+  if (hasJoins) {
+    filters.push(['==', ['get', FEATURE_VISIBLE_PROPERTY_NAME], true]);
+  }
+
+  return ['all', ...filters];
 }
diff --git a/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap b/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
index ccbe4667b78ea..80238bf3a4d17 100644
--- a/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
+++ b/x-pack/plugins/maps/public/components/__snapshots__/geometry_filter_form.test.js.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`should not show "within" relation when filter geometry is not closed 1`] = `
+exports[`render 1`] = `
 <EuiForm>
   <EuiFormRow
     describedByIds={Array []}
@@ -17,27 +17,6 @@ exports[`should not show "within" relation when filter geometry is not closed 1`
       value="My shape"
     />
   </EuiFormRow>
-  <MultiIndexGeoFieldSelect
-    fields={
-      Array [
-        Object {
-          "geoFieldName": "my geo field",
-          "geoFieldType": "geo_shape",
-          "indexPatternId": 1,
-          "indexPatternTitle": "My index",
-        },
-      ]
-    }
-    onChange={[Function]}
-    selectedField={
-      Object {
-        "geoFieldName": "my geo field",
-        "geoFieldType": "geo_shape",
-        "indexPatternId": 1,
-        "indexPatternTitle": "My index",
-      }
-    }
-  />
   <EuiFormRow
     describedByIds={Array []}
     display="rowCompressed"
@@ -60,92 +39,9 @@ exports[`should not show "within" relation when filter geometry is not closed 1`
             "text": "disjoint",
             "value": "DISJOINT",
           },
-        ]
-      }
-      value="INTERSECTS"
-    />
-  </EuiFormRow>
-  <ActionSelect
-    onChange={[Function]}
-    value="ACTION_GLOBAL_APPLY_FILTER"
-  />
-  <EuiSpacer
-    size="m"
-  />
-  <EuiTextAlign
-    textAlign="right"
-  >
-    <EuiButton
-      fill={true}
-      isDisabled={false}
-      onClick={[Function]}
-      size="s"
-    >
-      Create filter
-    </EuiButton>
-  </EuiTextAlign>
-</EuiForm>
-`;
-
-exports[`should render error message 1`] = `
-<EuiForm>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="rowCompressed"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label="Geometry label"
-    labelType="label"
-  >
-    <EuiFieldText
-      compressed={true}
-      onChange={[Function]}
-      value="My shape"
-    />
-  </EuiFormRow>
-  <MultiIndexGeoFieldSelect
-    fields={
-      Array [
-        Object {
-          "geoFieldName": "my geo field",
-          "geoFieldType": "geo_point",
-          "indexPatternId": 1,
-          "indexPatternTitle": "My index",
-        },
-      ]
-    }
-    onChange={[Function]}
-    selectedField={
-      Object {
-        "geoFieldName": "my geo field",
-        "geoFieldType": "geo_point",
-        "indexPatternId": 1,
-        "indexPatternTitle": "My index",
-      }
-    }
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="rowCompressed"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label="Spatial relation"
-    labelType="label"
-  >
-    <EuiSelect
-      compressed={true}
-      onChange={[Function]}
-      options={
-        Array [
-          Object {
-            "text": "intersects",
-            "value": "INTERSECTS",
-          },
           Object {
-            "text": "disjoint",
-            "value": "DISJOINT",
+            "text": "within",
+            "value": "WITHIN",
           },
         ]
       }
@@ -159,9 +55,6 @@ exports[`should render error message 1`] = `
   <EuiSpacer
     size="m"
   />
-  <EuiFormErrorText>
-    Simulated error
-  </EuiFormErrorText>
   <EuiTextAlign
     textAlign="right"
   >
@@ -177,7 +70,7 @@ exports[`should render error message 1`] = `
 </EuiForm>
 `;
 
-exports[`should render relation select when geo field is geo_shape 1`] = `
+exports[`should render error message 1`] = `
 <EuiForm>
   <EuiFormRow
     describedByIds={Array []}
@@ -194,27 +87,6 @@ exports[`should render relation select when geo field is geo_shape 1`] = `
       value="My shape"
     />
   </EuiFormRow>
-  <MultiIndexGeoFieldSelect
-    fields={
-      Array [
-        Object {
-          "geoFieldName": "my geo field",
-          "geoFieldType": "geo_shape",
-          "indexPatternId": 1,
-          "indexPatternTitle": "My index",
-        },
-      ]
-    }
-    onChange={[Function]}
-    selectedField={
-      Object {
-        "geoFieldName": "my geo field",
-        "geoFieldType": "geo_shape",
-        "indexPatternId": 1,
-        "indexPatternTitle": "My index",
-      }
-    }
-  />
   <EuiFormRow
     describedByIds={Array []}
     display="rowCompressed"
@@ -253,93 +125,9 @@ exports[`should render relation select when geo field is geo_shape 1`] = `
   <EuiSpacer
     size="m"
   />
-  <EuiTextAlign
-    textAlign="right"
-  >
-    <EuiButton
-      fill={true}
-      isDisabled={false}
-      onClick={[Function]}
-      size="s"
-    >
-      Create filter
-    </EuiButton>
-  </EuiTextAlign>
-</EuiForm>
-`;
-
-exports[`should render relation select without "within"-relation when geo field is geo_point 1`] = `
-<EuiForm>
-  <EuiFormRow
-    describedByIds={Array []}
-    display="rowCompressed"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label="Geometry label"
-    labelType="label"
-  >
-    <EuiFieldText
-      compressed={true}
-      onChange={[Function]}
-      value="My shape"
-    />
-  </EuiFormRow>
-  <MultiIndexGeoFieldSelect
-    fields={
-      Array [
-        Object {
-          "geoFieldName": "my geo field",
-          "geoFieldType": "geo_point",
-          "indexPatternId": 1,
-          "indexPatternTitle": "My index",
-        },
-      ]
-    }
-    onChange={[Function]}
-    selectedField={
-      Object {
-        "geoFieldName": "my geo field",
-        "geoFieldType": "geo_point",
-        "indexPatternId": 1,
-        "indexPatternTitle": "My index",
-      }
-    }
-  />
-  <EuiFormRow
-    describedByIds={Array []}
-    display="rowCompressed"
-    fullWidth={false}
-    hasChildLabel={true}
-    hasEmptyLabelSpace={false}
-    label="Spatial relation"
-    labelType="label"
-  >
-    <EuiSelect
-      compressed={true}
-      onChange={[Function]}
-      options={
-        Array [
-          Object {
-            "text": "intersects",
-            "value": "INTERSECTS",
-          },
-          Object {
-            "text": "disjoint",
-            "value": "DISJOINT",
-          },
-        ]
-      }
-      value="INTERSECTS"
-    />
-  </EuiFormRow>
-  <ActionSelect
-    onChange={[Function]}
-    value="ACTION_GLOBAL_APPLY_FILTER"
-  />
-  <EuiSpacer
-    size="m"
-  />
+  <EuiFormErrorText>
+    Simulated error
+  </EuiFormErrorText>
   <EuiTextAlign
     textAlign="right"
   >
diff --git a/x-pack/plugins/maps/public/components/distance_filter_form.tsx b/x-pack/plugins/maps/public/components/distance_filter_form.tsx
index 14ae6b11b85c8..b5fdcbc46b932 100644
--- a/x-pack/plugins/maps/public/components/distance_filter_form.tsx
+++ b/x-pack/plugins/maps/public/components/distance_filter_form.tsx
@@ -16,47 +16,28 @@ import {
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
-import { MultiIndexGeoFieldSelect } from './multi_index_geo_field_select';
-import { GeoFieldWithIndex } from './geo_field_with_index';
 import { ActionSelect } from './action_select';
 import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/data/public';
 
 interface Props {
   className?: string;
   buttonLabel: string;
-  geoFields: GeoFieldWithIndex[];
   getFilterActions?: () => Promise<Action[]>;
   getActionContext?: () => ActionExecutionContext;
-  onSubmit: ({
-    actionId,
-    filterLabel,
-    indexPatternId,
-    geoFieldName,
-  }: {
-    actionId: string;
-    filterLabel: string;
-    indexPatternId: string;
-    geoFieldName: string;
-  }) => void;
+  onSubmit: ({ actionId, filterLabel }: { actionId: string; filterLabel: string }) => void;
 }
 
 interface State {
   actionId: string;
-  selectedField: GeoFieldWithIndex | undefined;
   filterLabel: string;
 }
 
 export class DistanceFilterForm extends Component<Props, State> {
   state: State = {
     actionId: ACTION_GLOBAL_APPLY_FILTER,
-    selectedField: this.props.geoFields.length ? this.props.geoFields[0] : undefined,
     filterLabel: '',
   };
 
-  _onGeoFieldChange = (selectedField: GeoFieldWithIndex | undefined) => {
-    this.setState({ selectedField });
-  };
-
   _onFilterLabelChange = (e: ChangeEvent<HTMLInputElement>) => {
     this.setState({
       filterLabel: e.target.value,
@@ -68,14 +49,9 @@ export class DistanceFilterForm extends Component<Props, State> {
   };
 
   _onSubmit = () => {
-    if (!this.state.selectedField) {
-      return;
-    }
     this.props.onSubmit({
       actionId: this.state.actionId,
       filterLabel: this.state.filterLabel,
-      indexPatternId: this.state.selectedField.indexPatternId,
-      geoFieldName: this.state.selectedField.geoFieldName,
     });
   };
 
@@ -95,12 +71,6 @@ export class DistanceFilterForm extends Component<Props, State> {
           />
         </EuiFormRow>
 
-        <MultiIndexGeoFieldSelect
-          selectedField={this.state.selectedField}
-          fields={this.props.geoFields}
-          onChange={this._onGeoFieldChange}
-        />
-
         <ActionSelect
           getFilterActions={this.props.getFilterActions}
           getActionContext={this.props.getActionContext}
@@ -111,7 +81,7 @@ export class DistanceFilterForm extends Component<Props, State> {
         <EuiSpacer size="m" />
 
         <EuiTextAlign textAlign="right">
-          <EuiButton size="s" fill onClick={this._onSubmit} isDisabled={!this.state.selectedField}>
+          <EuiButton size="s" fill onClick={this._onSubmit}>
             {this.props.buttonLabel}
           </EuiButton>
         </EuiTextAlign>
diff --git a/x-pack/plugins/maps/public/components/geo_field_with_index.ts b/x-pack/plugins/maps/public/components/geo_field_with_index.ts
deleted file mode 100644
index 5273bff44f8d7..0000000000000
--- a/x-pack/plugins/maps/public/components/geo_field_with_index.ts
+++ /dev/null
@@ -1,19 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-/* eslint-disable @typescript-eslint/consistent-type-definitions */
-
-// Maps can contain geo fields from multiple index patterns. GeoFieldWithIndex is used to:
-// 1) Combine the geo field along with associated index pattern state.
-// 2) Package asynchronously looked up state via getIndexPatternService() to avoid
-// PITA of looking up async state in downstream react consumers.
-export type GeoFieldWithIndex = {
-  geoFieldName: string;
-  geoFieldType: string;
-  indexPatternTitle: string;
-  indexPatternId: string;
-};
diff --git a/x-pack/plugins/maps/public/components/geometry_filter_form.js b/x-pack/plugins/maps/public/components/geometry_filter_form.js
index 624d3b60fe14b..2e13f63b79883 100644
--- a/x-pack/plugins/maps/public/components/geometry_filter_form.js
+++ b/x-pack/plugins/maps/public/components/geometry_filter_form.js
@@ -18,16 +18,14 @@ import {
   EuiFormErrorText,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../../common/constants';
+import { ES_SPATIAL_RELATIONS } from '../../common/constants';
 import { getEsSpatialRelationLabel } from '../../common/i18n_getters';
-import { MultiIndexGeoFieldSelect } from './multi_index_geo_field_select';
 import { ActionSelect } from './action_select';
 import { ACTION_GLOBAL_APPLY_FILTER } from '../../../../../src/plugins/data/public';
 
 export class GeometryFilterForm extends Component {
   static propTypes = {
     buttonLabel: PropTypes.string.isRequired,
-    geoFields: PropTypes.array.isRequired,
     getFilterActions: PropTypes.func,
     getActionContext: PropTypes.func,
     intitialGeometryLabel: PropTypes.string.isRequired,
@@ -42,15 +40,10 @@ export class GeometryFilterForm extends Component {
 
   state = {
     actionId: ACTION_GLOBAL_APPLY_FILTER,
-    selectedField: this.props.geoFields.length ? this.props.geoFields[0] : undefined,
     geometryLabel: this.props.intitialGeometryLabel,
     relation: ES_SPATIAL_RELATIONS.INTERSECTS,
   };
 
-  _onGeoFieldChange = (selectedField) => {
-    this.setState({ selectedField });
-  };
-
   _onGeometryLabelChange = (e) => {
     this.setState({
       geometryLabel: e.target.value,
@@ -71,29 +64,12 @@ export class GeometryFilterForm extends Component {
     this.props.onSubmit({
       actionId: this.state.actionId,
       geometryLabel: this.state.geometryLabel,
-      indexPatternId: this.state.selectedField.indexPatternId,
-      geoFieldName: this.state.selectedField.geoFieldName,
       relation: this.state.relation,
     });
   };
 
   _renderRelationInput() {
-    // relationship only used when filtering geo_shape fields
-    if (!this.state.selectedField) {
-      return null;
-    }
-
-    const spatialRelations =
-      this.props.isFilterGeometryClosed &&
-      this.state.selectedField.geoFieldType !== ES_GEO_FIELD_TYPE.GEO_POINT
-        ? Object.values(ES_SPATIAL_RELATIONS)
-        : Object.values(ES_SPATIAL_RELATIONS).filter((relation) => {
-            // - cannot filter by "within"-relation when filtering geometry is not closed
-            // - do not distinguish between intersects/within for filtering for points since they are equivalent
-            return relation !== ES_SPATIAL_RELATIONS.WITHIN;
-          });
-
-    const options = spatialRelations.map((relation) => {
+    const options = Object.values(ES_SPATIAL_RELATIONS).map((relation) => {
       return {
         value: relation,
         text: getEsSpatialRelationLabel(relation),
@@ -137,12 +113,6 @@ export class GeometryFilterForm extends Component {
           />
         </EuiFormRow>
 
-        <MultiIndexGeoFieldSelect
-          selectedField={this.state.selectedField}
-          fields={this.props.geoFields}
-          onChange={this._onGeoFieldChange}
-        />
-
         {this._renderRelationInput()}
 
         <ActionSelect
@@ -161,7 +131,7 @@ export class GeometryFilterForm extends Component {
             size="s"
             fill
             onClick={this._onSubmit}
-            isDisabled={!this.state.geometryLabel || !this.state.selectedField}
+            isDisabled={!this.state.geometryLabel}
             isLoading={this.props.isLoading}
           >
             {this.props.buttonLabel}
diff --git a/x-pack/plugins/maps/public/components/geometry_filter_form.test.js b/x-pack/plugins/maps/public/components/geometry_filter_form.test.js
index d981caf944ab9..3ce79782788b0 100644
--- a/x-pack/plugins/maps/public/components/geometry_filter_form.test.js
+++ b/x-pack/plugins/maps/public/components/geometry_filter_form.test.js
@@ -16,76 +16,14 @@ const defaultProps = {
   onSubmit: () => {},
 };
 
-test('should render relation select without "within"-relation when geo field is geo_point', async () => {
-  const component = shallow(
-    <GeometryFilterForm
-      {...defaultProps}
-      geoFields={[
-        {
-          geoFieldName: 'my geo field',
-          geoFieldType: 'geo_point',
-          indexPatternTitle: 'My index',
-          indexPatternId: 1,
-        },
-      ]}
-    />
-  );
-
-  expect(component).toMatchSnapshot();
-});
-
-test('should render relation select when geo field is geo_shape', async () => {
-  const component = shallow(
-    <GeometryFilterForm
-      {...defaultProps}
-      geoFields={[
-        {
-          geoFieldName: 'my geo field',
-          geoFieldType: 'geo_shape',
-          indexPatternTitle: 'My index',
-          indexPatternId: 1,
-        },
-      ]}
-    />
-  );
-
-  expect(component).toMatchSnapshot();
-});
-
-test('should not show "within" relation when filter geometry is not closed', async () => {
-  const component = shallow(
-    <GeometryFilterForm
-      {...defaultProps}
-      geoFields={[
-        {
-          geoFieldName: 'my geo field',
-          geoFieldType: 'geo_shape',
-          indexPatternTitle: 'My index',
-          indexPatternId: 1,
-        },
-      ]}
-      isFilterGeometryClosed={false}
-    />
-  );
+test('render', async () => {
+  const component = shallow(<GeometryFilterForm {...defaultProps} />);
 
   expect(component).toMatchSnapshot();
 });
 
 test('should render error message', async () => {
-  const component = shallow(
-    <GeometryFilterForm
-      {...defaultProps}
-      geoFields={[
-        {
-          geoFieldName: 'my geo field',
-          geoFieldType: 'geo_point',
-          indexPatternTitle: 'My index',
-          indexPatternId: 1,
-        },
-      ]}
-      errorMsg="Simulated error"
-    />
-  );
+  const component = shallow(<GeometryFilterForm {...defaultProps} errorMsg="Simulated error" />);
 
   expect(component).toMatchSnapshot();
 });
diff --git a/x-pack/plugins/maps/public/components/multi_index_geo_field_select.tsx b/x-pack/plugins/maps/public/components/multi_index_geo_field_select.tsx
deleted file mode 100644
index 564b84ae84300..0000000000000
--- a/x-pack/plugins/maps/public/components/multi_index_geo_field_select.tsx
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { EuiFormRow, EuiSuperSelect, EuiTextColor, EuiText } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { GeoFieldWithIndex } from './geo_field_with_index';
-
-const OPTION_ID_DELIMITER = '/';
-
-function createOptionId(geoField: GeoFieldWithIndex): string {
-  // Namespace field with indexPatterId to avoid collisions between field names
-  return `${geoField.indexPatternId}${OPTION_ID_DELIMITER}${geoField.geoFieldName}`;
-}
-
-function splitOptionId(optionId: string) {
-  const split = optionId.split(OPTION_ID_DELIMITER);
-  return {
-    indexPatternId: split[0],
-    geoFieldName: split[1],
-  };
-}
-
-interface Props {
-  fields: GeoFieldWithIndex[];
-  onChange: (newSelectedField: GeoFieldWithIndex | undefined) => void;
-  selectedField: GeoFieldWithIndex | undefined;
-}
-
-export function MultiIndexGeoFieldSelect({ fields, onChange, selectedField }: Props) {
-  function onFieldSelect(selectedOptionId: string) {
-    const { indexPatternId, geoFieldName } = splitOptionId(selectedOptionId);
-
-    const newSelectedField = fields.find((field) => {
-      return field.indexPatternId === indexPatternId && field.geoFieldName === geoFieldName;
-    });
-    onChange(newSelectedField);
-  }
-
-  const options = fields.map((geoField: GeoFieldWithIndex) => {
-    return {
-      inputDisplay: (
-        <EuiText size="s">
-          <EuiTextColor color="subdued">
-            <small>{geoField.indexPatternTitle}</small>
-          </EuiTextColor>
-          <br />
-          {geoField.geoFieldName}
-        </EuiText>
-      ),
-      value: createOptionId(geoField),
-    };
-  });
-
-  return (
-    <EuiFormRow
-      className="mapGeometryFilter__geoFieldSuperSelectWrapper"
-      label={i18n.translate('xpack.maps.multiIndexFieldSelect.fieldLabel', {
-        defaultMessage: 'Filtering field',
-      })}
-      display="rowCompressed"
-    >
-      <EuiSuperSelect
-        className="mapGeometryFilter__geoFieldSuperSelect"
-        options={options}
-        valueOfSelected={selectedField ? createOptionId(selectedField) : ''}
-        onChange={onFieldSelect}
-        hasDividers={true}
-        fullWidth={true}
-        compressed={true}
-        itemClassName="mapGeometryFilter__geoFieldItem"
-      />
-    </EuiFormRow>
-  );
-}
diff --git a/x-pack/plugins/maps/public/connected_components/map_container/index.ts b/x-pack/plugins/maps/public/connected_components/map_container/index.ts
index 408137b6f23b3..4831cd60474b9 100644
--- a/x-pack/plugins/maps/public/connected_components/map_container/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/map_container/index.ts
@@ -10,11 +10,10 @@ import { ThunkDispatch } from 'redux-thunk';
 import { connect } from 'react-redux';
 import { MapContainer } from './map_container';
 import { getFlyoutDisplay, getIsFullScreen } from '../../selectors/ui_selectors';
-import { triggerRefreshTimer, cancelAllInFlightRequests, exitFullScreen } from '../../actions';
+import { cancelAllInFlightRequests, exitFullScreen } from '../../actions';
 import {
   areLayersLoaded,
   getLayerList,
-  getRefreshConfig,
   getMapInitError,
   getMapSettings,
   getQueryableUniqueIndexPatternIds,
@@ -27,7 +26,6 @@ function mapStateToProps(state: MapStoreState) {
     areLayersLoaded: areLayersLoaded(state),
     flyoutDisplay: getFlyoutDisplay(state),
     isFullScreen: getIsFullScreen(state),
-    refreshConfig: getRefreshConfig(state),
     mapInitError: getMapInitError(state),
     indexPatternIds: getQueryableUniqueIndexPatternIds(state),
     settings: getMapSettings(state),
@@ -37,7 +35,6 @@ function mapStateToProps(state: MapStoreState) {
 
 function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) {
   return {
-    triggerRefreshTimer: () => dispatch(triggerRefreshTimer()),
     exitFullScreen: () => {
       dispatch(exitFullScreen());
       getCoreChrome().setIsVisible(true);
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 02374932a4c70..788094ee1ab5c 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
@@ -20,16 +20,12 @@ import { ToolbarOverlay } from '../toolbar_overlay';
 import { EditLayerPanel } from '../edit_layer_panel';
 import { AddLayerPanel } from '../add_layer_panel';
 import { ExitFullScreenButton } from '../../../../../../src/plugins/kibana_react/public';
-import { getIndexPatternsFromIds } from '../../index_pattern_util';
-import { ES_GEO_FIELD_TYPE, RawValue } from '../../../common/constants';
-import { indexPatterns as indexPatternsUtils } from '../../../../../../src/plugins/data/public';
+import { RawValue } from '../../../common/constants';
 import { FLYOUT_STATE } from '../../reducers/ui';
 import { MapSettings } from '../../reducers/map';
 import { MapSettingsPanel } from '../map_settings_panel';
 import { registerLayerWizards } from '../../classes/layers/load_layer_wizards';
 import { RenderToolTipContent } from '../../classes/tooltips/tooltip_property';
-import { GeoFieldWithIndex } from '../../components/geo_field_with_index';
-import { MapRefreshConfig } from '../../../common/descriptor_types';
 import { ILayer } from '../../classes/layers/layer';
 
 const RENDER_COMPLETE_EVENT = 'renderComplete';
@@ -46,9 +42,7 @@ export interface Props {
   isFullScreen: boolean;
   indexPatternIds: string[];
   mapInitError: string | null | undefined;
-  refreshConfig: MapRefreshConfig;
   renderTooltipContent?: RenderToolTipContent;
-  triggerRefreshTimer: () => void;
   title?: string;
   description?: string;
   settings: MapSettings;
@@ -58,7 +52,6 @@ export interface Props {
 interface State {
   isInitialLoadRenderTimeoutComplete: boolean;
   domId: string;
-  geoFields: GeoFieldWithIndex[];
   showFitToBoundsButton: boolean;
   showTimesliderButton: boolean;
 }
@@ -66,44 +59,32 @@ interface State {
 export class MapContainer extends Component<Props, State> {
   private _isMounted: boolean = false;
   private _isInitalLoadRenderTimerStarted: boolean = false;
-  private _prevIndexPatternIds: string[] = [];
-  private _refreshTimerId: number | null = null;
-  private _prevIsPaused: boolean | null = null;
-  private _prevInterval: number | null = null;
 
   state: State = {
     isInitialLoadRenderTimeoutComplete: false,
     domId: uuid(),
-    geoFields: [],
     showFitToBoundsButton: false,
     showTimesliderButton: false,
   };
 
   componentDidMount() {
     this._isMounted = true;
-    this._setRefreshTimer();
     this._loadShowFitToBoundsButton();
     this._loadShowTimesliderButton();
     registerLayerWizards();
   }
 
   componentDidUpdate() {
-    this._setRefreshTimer();
     this._loadShowFitToBoundsButton();
     this._loadShowTimesliderButton();
     if (this.props.areLayersLoaded && !this._isInitalLoadRenderTimerStarted) {
       this._isInitalLoadRenderTimerStarted = true;
       this._startInitialLoadRenderTimer();
     }
-
-    if (!!this.props.addFilters) {
-      this._loadGeoFields(this.props.indexPatternIds);
-    }
   }
 
   componentWillUnmount() {
     this._isMounted = false;
-    this._clearRefreshTimer();
     this.props.cancelAllInFlightRequests();
   }
 
@@ -151,67 +132,6 @@ export class MapContainer extends Component<Props, State> {
     }
   }
 
-  async _loadGeoFields(nextIndexPatternIds: string[]) {
-    if (_.isEqual(nextIndexPatternIds, this._prevIndexPatternIds)) {
-      // all ready loaded index pattern ids
-      return;
-    }
-
-    this._prevIndexPatternIds = nextIndexPatternIds;
-
-    const geoFields: GeoFieldWithIndex[] = [];
-    const indexPatterns = await getIndexPatternsFromIds(nextIndexPatternIds);
-    indexPatterns.forEach((indexPattern) => {
-      indexPattern.fields.forEach((field) => {
-        if (
-          indexPattern.id &&
-          !indexPatternsUtils.isNestedField(field) &&
-          (field.type === ES_GEO_FIELD_TYPE.GEO_POINT || field.type === ES_GEO_FIELD_TYPE.GEO_SHAPE)
-        ) {
-          geoFields.push({
-            geoFieldName: field.name,
-            geoFieldType: field.type,
-            indexPatternTitle: indexPattern.title,
-            indexPatternId: indexPattern.id,
-          });
-        }
-      });
-    });
-
-    if (!this._isMounted) {
-      return;
-    }
-
-    this.setState({ geoFields });
-  }
-
-  _setRefreshTimer = () => {
-    const { isPaused, interval } = this.props.refreshConfig;
-
-    if (this._prevIsPaused === isPaused && this._prevInterval === interval) {
-      // refreshConfig is the same, nothing to do
-      return;
-    }
-
-    this._prevIsPaused = isPaused;
-    this._prevInterval = interval;
-
-    this._clearRefreshTimer();
-
-    if (!isPaused && interval > 0) {
-      this._refreshTimerId = window.setInterval(() => {
-        this.props.triggerRefreshTimer();
-      }, interval);
-    }
-  };
-
-  _clearRefreshTimer = () => {
-    if (this._refreshTimerId) {
-      window.clearInterval(this._refreshTimerId);
-      this._refreshTimerId = null;
-    }
-  };
-
   // Mapbox does not provide any feedback when rendering is complete.
   // Temporary solution is just to wait set period of time after data has loaded.
   _startInitialLoadRenderTimer = () => {
@@ -289,13 +209,11 @@ export class MapContainer extends Component<Props, State> {
             getFilterActions={getFilterActions}
             getActionContext={getActionContext}
             onSingleValueTrigger={onSingleValueTrigger}
-            geoFields={this.state.geoFields}
             renderTooltipContent={renderTooltipContent}
           />
           {!this.props.settings.hideToolbarOverlay && (
             <ToolbarOverlay
               addFilters={addFilters}
-              geoFields={this.state.geoFields}
               getFilterActions={getFilterActions}
               getActionContext={getActionContext}
               showFitToBoundsButton={this.state.showFitToBoundsButton}
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx
index 5fad291a5367f..6de2d39aedfdd 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/draw_filter_control.tsx
@@ -29,16 +29,12 @@ export interface Props {
   drawState?: DrawState;
   isDrawingFilter: boolean;
   mbMap: MbMap;
+  geoFieldNames: string[];
 }
 
 export class DrawFilterControl extends Component<Props, {}> {
   _onDraw = async (e: { features: Feature[] }) => {
-    if (
-      !e.features.length ||
-      !this.props.drawState ||
-      !this.props.drawState.geoFieldName ||
-      !this.props.drawState.indexPatternId
-    ) {
+    if (!e.features.length || !this.props.drawState || !this.props.geoFieldNames.length) {
       return;
     }
 
@@ -61,8 +57,7 @@ export class DrawFilterControl extends Component<Props, {}> {
       filter = createDistanceFilterWithMeta({
         alias: this.props.drawState.filterLabel ? this.props.drawState.filterLabel : '',
         distanceKm,
-        geoFieldName: this.props.drawState.geoFieldName,
-        indexPatternId: this.props.drawState.indexPatternId,
+        geoFieldNames: this.props.geoFieldNames,
         point: [
           _.round(circle.properties.center[0], precision),
           _.round(circle.properties.center[1], precision),
@@ -78,8 +73,7 @@ export class DrawFilterControl extends Component<Props, {}> {
           this.props.drawState.drawType === DRAW_TYPE.BOUNDS
             ? getBoundingBoxGeometry(geometry)
             : geometry,
-        indexPatternId: this.props.drawState.indexPatternId,
-        geoFieldName: this.props.drawState.geoFieldName,
+        geoFieldNames: this.props.geoFieldNames,
         geometryLabel: this.props.drawState.geometryLabel ? this.props.drawState.geometryLabel : '',
         relation: this.props.drawState.relation
           ? this.props.drawState.relation
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/index.ts b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/index.ts
index 17f4d919fb7e0..58ad530093557 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/draw_control/draw_filter_control/index.ts
@@ -10,13 +10,18 @@ import { ThunkDispatch } from 'redux-thunk';
 import { connect } from 'react-redux';
 import { DrawFilterControl } from './draw_filter_control';
 import { updateDrawState } from '../../../../actions';
-import { getDrawState, isDrawingFilter } from '../../../../selectors/map_selectors';
+import {
+  getDrawState,
+  isDrawingFilter,
+  getGeoFieldNames,
+} from '../../../../selectors/map_selectors';
 import { MapStoreState } from '../../../../reducers/store';
 
 function mapStateToProps(state: MapStoreState) {
   return {
     isDrawingFilter: isDrawingFilter(state),
     drawState: getDrawState(state),
+    geoFieldNames: getGeoFieldNames(state),
   };
 }
 
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 877de10e11383..9d8bce083c292 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
@@ -43,7 +43,6 @@ import {
   // @ts-expect-error
 } from './utils';
 import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public';
-import { GeoFieldWithIndex } from '../../components/geo_field_with_index';
 import { RenderToolTipContent } from '../../classes/tooltips/tooltip_property';
 import { MapExtentState } from '../../actions';
 import { TileStatusTracker } from './tile_status_tracker';
@@ -68,7 +67,6 @@ export interface Props {
   getFilterActions?: () => Promise<Action[]>;
   getActionContext?: () => ActionExecutionContext;
   onSingleValueTrigger?: (actionId: string, key: string, value: RawValue) => void;
-  geoFields: GeoFieldWithIndex[];
   renderTooltipContent?: RenderToolTipContent;
   setAreTilesLoaded: (layerId: string, areTilesLoaded: boolean) => void;
 }
@@ -432,7 +430,6 @@ export class MBMap extends Component<Props, State> {
           getFilterActions={this.props.getFilterActions}
           getActionContext={this.props.getActionContext}
           onSingleValueTrigger={this.props.onSingleValueTrigger}
-          geoFields={this.props.geoFields}
           renderTooltipContent={this.props.renderTooltipContent}
         />
       ) : null;
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 04e564943fa39..5f26715c86004 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
@@ -21,7 +21,6 @@ import {
 import { ES_SPATIAL_RELATIONS, GEO_JSON_TYPE } from '../../../../../common/constants';
 // @ts-expect-error
 import { GeometryFilterForm } from '../../../../components/geometry_filter_form';
-import { GeoFieldWithIndex } from '../../../../components/geo_field_with_index';
 
 // over estimated and imprecise value to ensure filter has additional room for any meta keys added when filter is mapped.
 const META_OVERHEAD = 100;
@@ -29,11 +28,11 @@ const META_OVERHEAD = 100;
 interface Props {
   onClose: () => void;
   geometry: Geometry;
-  geoFields: GeoFieldWithIndex[];
   addFilters: (filters: Filter[], actionId: string) => Promise<void>;
   getFilterActions?: () => Promise<Action[]>;
   getActionContext?: () => ActionExecutionContext;
   loadPreIndexedShape: () => Promise<PreIndexedShape | null>;
+  geoFieldNames: string[];
 }
 
 interface State {
@@ -77,13 +76,9 @@ export class FeatureGeometryFilterForm extends Component<Props, State> {
 
   _createFilter = async ({
     geometryLabel,
-    indexPatternId,
-    geoFieldName,
     relation,
   }: {
     geometryLabel: string;
-    indexPatternId: string;
-    geoFieldName: string;
     relation: ES_SPATIAL_RELATIONS;
   }) => {
     this.setState({ errorMsg: undefined });
@@ -97,8 +92,7 @@ export class FeatureGeometryFilterForm extends Component<Props, State> {
       preIndexedShape,
       geometry: this.props.geometry as Polygon,
       geometryLabel,
-      indexPatternId,
-      geoFieldName,
+      geoFieldNames: this.props.geoFieldNames,
       relation,
     });
 
@@ -130,7 +124,6 @@ export class FeatureGeometryFilterForm extends Component<Props, State> {
             defaultMessage: 'Create filter',
           }
         )}
-        geoFields={this.props.geoFields}
         getFilterActions={this.props.getFilterActions}
         getActionContext={this.props.getActionContext}
         intitialGeometryLabel={this.props.geometry.type.toLowerCase()}
diff --git a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/index.ts b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/index.ts
index 28510815d1a2e..2861c80306526 100644
--- a/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/mb_map/tooltip_control/index.ts
@@ -20,6 +20,7 @@ import {
   getLayerList,
   getOpenTooltips,
   getHasLockedTooltips,
+  getGeoFieldNames,
   isDrawingFilter,
 } from '../../../selectors/map_selectors';
 import { MapStoreState } from '../../../reducers/store';
@@ -30,6 +31,7 @@ function mapStateToProps(state: MapStoreState) {
     hasLockedTooltips: getHasLockedTooltips(state),
     isDrawingFilter: isDrawingFilter(state),
     openTooltips: getOpenTooltips(state),
+    geoFieldNames: getGeoFieldNames(state),
   };
 }
 
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 ac6e3cfcccf4e..a11000a48866f 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
@@ -77,7 +77,7 @@ const defaultProps = {
   layerList: [mockLayer],
   isDrawingFilter: false,
   addFilters: async () => {},
-  geoFields: [],
+  geoFieldNames: [],
   openTooltips: [],
   hasLockedTooltips: false,
 };
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 09dd9ee4f51d9..e9af9dcc89e07 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
@@ -20,7 +20,6 @@ import { Geometry } from 'geojson';
 import { Filter } from 'src/plugins/data/public';
 import { ActionExecutionContext, Action } from 'src/plugins/ui_actions/public';
 import {
-  ES_GEO_FIELD_TYPE,
   FEATURE_ID_PROPERTY_NAME,
   GEO_JSON_TYPE,
   LON_INDEX,
@@ -37,7 +36,6 @@ import { FeatureGeometryFilterForm } from './features_tooltip';
 import { EXCLUDE_TOO_MANY_FEATURES_BOX } from '../../../classes/util/mb_filter_expressions';
 import { ILayer } from '../../../classes/layers/layer';
 import { IVectorLayer } from '../../../classes/layers/vector_layer';
-import { GeoFieldWithIndex } from '../../../components/geo_field_with_index';
 import { RenderToolTipContent } from '../../../classes/tooltips/tooltip_property';
 
 function justifyAnchorLocation(
@@ -70,7 +68,7 @@ export interface Props {
   closeOnHoverTooltip: () => void;
   getActionContext?: () => ActionExecutionContext;
   getFilterActions?: () => Promise<Action[]>;
-  geoFields: GeoFieldWithIndex[];
+  geoFieldNames: string[];
   hasLockedTooltips: boolean;
   isDrawingFilter: boolean;
   layerList: ILayer[];
@@ -163,8 +161,10 @@ export class TooltipControl extends Component<Props, {}> {
     const actions = [];
 
     const geometry = this._getFeatureGeometry({ layerId, featureId });
-    const geoFieldsForFeature = this._filterGeoFieldsByFeatureGeometry(geometry);
-    if (geometry && geoFieldsForFeature.length && this.props.addFilters) {
+    const isPolygon =
+      geometry &&
+      (geometry.type === GEO_JSON_TYPE.POLYGON || geometry.type === GEO_JSON_TYPE.MULTI_POLYGON);
+    if (isPolygon && this.props.geoFieldNames.length && this.props.addFilters) {
       actions.push({
         label: i18n.translate('xpack.maps.tooltip.action.filterByGeometryLabel', {
           defaultMessage: 'Filter by geometry',
@@ -175,8 +175,8 @@ export class TooltipControl extends Component<Props, {}> {
             onClose={() => {
               this.props.closeOnClickTooltip(tooltipId);
             }}
-            geometry={geometry}
-            geoFields={geoFieldsForFeature}
+            geometry={geometry!}
+            geoFieldNames={this.props.geoFieldNames}
             addFilters={this.props.addFilters}
             getFilterActions={this.props.getFilterActions}
             getActionContext={this.props.getActionContext}
@@ -191,29 +191,6 @@ export class TooltipControl extends Component<Props, {}> {
     return actions;
   }
 
-  _filterGeoFieldsByFeatureGeometry(geometry: Geometry | null) {
-    if (!geometry) {
-      return [];
-    }
-
-    // line geometry can only create filters for geo_shape fields.
-    if (
-      geometry.type === GEO_JSON_TYPE.LINE_STRING ||
-      geometry.type === GEO_JSON_TYPE.MULTI_LINE_STRING
-    ) {
-      return this.props.geoFields.filter(({ geoFieldType }) => {
-        return geoFieldType === ES_GEO_FIELD_TYPE.GEO_SHAPE;
-      });
-    }
-
-    // TODO support geo distance filters for points
-    if (geometry.type === GEO_JSON_TYPE.POINT || geometry.type === GEO_JSON_TYPE.MULTI_POINT) {
-      return [];
-    }
-
-    return this.props.geoFields;
-  }
-
   _getTooltipFeatures(
     mbFeatures: MapboxGeoJSONFeature[],
     isLocked: boolean,
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/__snapshots__/toolbar_overlay.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/__snapshots__/toolbar_overlay.test.tsx.snap
index 168a070b07744..245cf6e5b2a48 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/__snapshots__/toolbar_overlay.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/__snapshots__/toolbar_overlay.test.tsx.snap
@@ -29,18 +29,7 @@ exports[`Should show all controls 1`] = `
     <Connect(FitToData) />
   </EuiFlexItem>
   <EuiFlexItem>
-    <Connect(ToolsControl)
-      geoFields={
-        Array [
-          Object {
-            "geoFieldName": "myGeoFieldName",
-            "geoFieldType": "geo_point",
-            "indexPatternId": "1",
-            "indexPatternTitle": "myIndex",
-          },
-        ]
-      }
-    />
+    <Connect(ToolsControl) />
   </EuiFlexItem>
   <EuiFlexItem>
     <Connect(TimesliderToggleButton) />
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/index.ts b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/index.ts
index d1008edfd572d..7d176c13da049 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/index.ts
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/index.ts
@@ -5,4 +5,16 @@
  * 2.0.
  */
 
-export { ToolbarOverlay } from './toolbar_overlay';
+import { connect } from 'react-redux';
+import { MapStoreState } from '../../reducers/store';
+import { getGeoFieldNames } from '../../selectors/map_selectors';
+import { ToolbarOverlay } from './toolbar_overlay';
+
+function mapStateToProps(state: MapStoreState) {
+  return {
+    showToolsControl: getGeoFieldNames(state).length !== 0,
+  };
+}
+
+const connected = connect(mapStateToProps)(ToolbarOverlay);
+export { connected as ToolbarOverlay };
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.test.tsx b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.test.tsx
index 28b5ab9c78f40..9efbd82fe390a 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.test.tsx
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/toolbar_overlay.test.tsx
@@ -21,22 +21,20 @@ import { ToolbarOverlay } from './toolbar_overlay';
 
 test('Should only show set view control', async () => {
   const component = shallow(
-    <ToolbarOverlay geoFields={[]} showFitToBoundsButton={false} showTimesliderButton={false} />
+    <ToolbarOverlay
+      showToolsControl={false}
+      showFitToBoundsButton={false}
+      showTimesliderButton={false}
+    />
   );
   expect(component).toMatchSnapshot();
 });
 
 test('Should show all controls', async () => {
-  const geoFieldWithIndex = {
-    geoFieldName: 'myGeoFieldName',
-    geoFieldType: 'geo_point',
-    indexPatternTitle: 'myIndex',
-    indexPatternId: '1',
-  };
   const component = shallow(
     <ToolbarOverlay
       addFilters={async (filters: Filter[], actionId: string) => {}}
-      geoFields={[geoFieldWithIndex]}
+      showToolsControl={true}
       showFitToBoundsButton={true}
       showTimesliderButton={true}
     />
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 41c6c1f7c4a7c..2b35793218969 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
@@ -13,11 +13,10 @@ import { SetViewControl } from './set_view_control';
 import { ToolsControl } from './tools_control';
 import { FitToData } from './fit_to_data';
 import { TimesliderToggleButton } from './timeslider_toggle_button';
-import { GeoFieldWithIndex } from '../../components/geo_field_with_index';
 
 export interface Props {
   addFilters?: ((filters: Filter[], actionId: string) => Promise<void>) | null;
-  geoFields: GeoFieldWithIndex[];
+  showToolsControl: boolean;
   getFilterActions?: () => Promise<Action[]>;
   getActionContext?: () => ActionExecutionContext;
   showFitToBoundsButton: boolean;
@@ -26,10 +25,9 @@ export interface Props {
 
 export function ToolbarOverlay(props: Props) {
   const toolsButton =
-    props.addFilters && props.geoFields.length ? (
+    props.addFilters && props.showToolsControl ? (
       <EuiFlexItem>
         <ToolsControl
-          geoFields={props.geoFields}
           getFilterActions={props.getFilterActions}
           getActionContext={props.getActionContext}
         />
diff --git a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
index b6d217d690764..aa5c6aa42c77d 100644
--- a/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
+++ b/x-pack/plugins/maps/public/connected_components/toolbar_overlay/tools_control/__snapshots__/tools_control.test.tsx.snap
@@ -56,16 +56,6 @@ exports[`Should render cancel button when drawing 1`] = `
               "content": <GeometryFilterForm
                 buttonLabel="Draw shape"
                 className="mapDrawControl__geometryFilterForm"
-                geoFields={
-                  Array [
-                    Object {
-                      "geoFieldName": "location",
-                      "geoFieldType": "geo_point",
-                      "indexPatternId": "1",
-                      "indexPatternTitle": "my_index",
-                    },
-                  ]
-                }
                 intitialGeometryLabel="shape"
                 isFilterGeometryClosed={true}
                 onSubmit={[Function]}
@@ -77,16 +67,6 @@ exports[`Should render cancel button when drawing 1`] = `
               "content": <GeometryFilterForm
                 buttonLabel="Draw bounds"
                 className="mapDrawControl__geometryFilterForm"
-                geoFields={
-                  Array [
-                    Object {
-                      "geoFieldName": "location",
-                      "geoFieldType": "geo_point",
-                      "indexPatternId": "1",
-                      "indexPatternTitle": "my_index",
-                    },
-                  ]
-                }
                 intitialGeometryLabel="bounds"
                 isFilterGeometryClosed={true}
                 onSubmit={[Function]}
@@ -98,16 +78,6 @@ exports[`Should render cancel button when drawing 1`] = `
               "content": <DistanceFilterForm
                 buttonLabel="Draw distance"
                 className="mapDrawControl__geometryFilterForm"
-                geoFields={
-                  Array [
-                    Object {
-                      "geoFieldName": "location",
-                      "geoFieldType": "geo_point",
-                      "indexPatternId": "1",
-                      "indexPatternTitle": "my_index",
-                    },
-                  ]
-                }
                 onSubmit={[Function]}
               />,
               "id": 3,
@@ -187,16 +157,6 @@ exports[`renders 1`] = `
           "content": <GeometryFilterForm
             buttonLabel="Draw shape"
             className="mapDrawControl__geometryFilterForm"
-            geoFields={
-              Array [
-                Object {
-                  "geoFieldName": "location",
-                  "geoFieldType": "geo_point",
-                  "indexPatternId": "1",
-                  "indexPatternTitle": "my_index",
-                },
-              ]
-            }
             intitialGeometryLabel="shape"
             isFilterGeometryClosed={true}
             onSubmit={[Function]}
@@ -208,16 +168,6 @@ exports[`renders 1`] = `
           "content": <GeometryFilterForm
             buttonLabel="Draw bounds"
             className="mapDrawControl__geometryFilterForm"
-            geoFields={
-              Array [
-                Object {
-                  "geoFieldName": "location",
-                  "geoFieldType": "geo_point",
-                  "indexPatternId": "1",
-                  "indexPatternTitle": "my_index",
-                },
-              ]
-            }
             intitialGeometryLabel="bounds"
             isFilterGeometryClosed={true}
             onSubmit={[Function]}
@@ -229,16 +179,6 @@ exports[`renders 1`] = `
           "content": <DistanceFilterForm
             buttonLabel="Draw distance"
             className="mapDrawControl__geometryFilterForm"
-            geoFields={
-              Array [
-                Object {
-                  "geoFieldName": "location",
-                  "geoFieldType": "geo_point",
-                  "indexPatternId": "1",
-                  "indexPatternTitle": "my_index",
-                },
-              ]
-            }
             onSubmit={[Function]}
           />,
           "id": 3,
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 6779fe945137e..9ea20914c6422 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
@@ -22,7 +22,6 @@ import { DRAW_TYPE, ES_GEO_FIELD_TYPE, ES_SPATIAL_RELATIONS } from '../../../../
 // @ts-expect-error
 import { GeometryFilterForm } from '../../../components/geometry_filter_form';
 import { DistanceFilterForm } from '../../../components/distance_filter_form';
-import { GeoFieldWithIndex } from '../../../components/geo_field_with_index';
 import { DrawState } from '../../../../common/descriptor_types';
 
 const DRAW_SHAPE_LABEL = i18n.translate('xpack.maps.toolbarOverlay.drawShapeLabel', {
@@ -54,7 +53,6 @@ const DRAW_DISTANCE_LABEL_SHORT = i18n.translate(
 
 export interface Props {
   cancelDraw: () => void;
-  geoFields: GeoFieldWithIndex[];
   initiateDraw: (drawState: DrawState) => void;
   isDrawingFilter: boolean;
   getFilterActions?: () => Promise<Action[]>;
@@ -98,9 +96,6 @@ export class ToolsControl extends Component<Props, State> {
   _initiateBoundsDraw = (options: {
     actionId: string;
     geometryLabel: string;
-    indexPatternId: string;
-    geoFieldName: string;
-    geoFieldType: ES_GEO_FIELD_TYPE;
     relation: ES_SPATIAL_RELATIONS;
   }) => {
     this.props.initiateDraw({
@@ -110,12 +105,7 @@ export class ToolsControl extends Component<Props, State> {
     this._closePopover();
   };
 
-  _initiateDistanceDraw = (options: {
-    actionId: string;
-    filterLabel: string;
-    indexPatternId: string;
-    geoFieldName: string;
-  }) => {
+  _initiateDistanceDraw = (options: { actionId: string; filterLabel: string }) => {
     this.props.initiateDraw({
       drawType: DRAW_TYPE.DISTANCE,
       ...options,
@@ -154,7 +144,6 @@ export class ToolsControl extends Component<Props, State> {
           <GeometryFilterForm
             className="mapDrawControl__geometryFilterForm"
             buttonLabel={DRAW_SHAPE_LABEL_SHORT}
-            geoFields={this.props.geoFields}
             getFilterActions={this.props.getFilterActions}
             getActionContext={this.props.getActionContext}
             intitialGeometryLabel={i18n.translate(
@@ -174,7 +163,6 @@ export class ToolsControl extends Component<Props, State> {
           <GeometryFilterForm
             className="mapDrawControl__geometryFilterForm"
             buttonLabel={DRAW_BOUNDS_LABEL_SHORT}
-            geoFields={this.props.geoFields}
             getFilterActions={this.props.getFilterActions}
             getActionContext={this.props.getActionContext}
             intitialGeometryLabel={i18n.translate(
@@ -194,7 +182,6 @@ export class ToolsControl extends Component<Props, State> {
           <DistanceFilterForm
             className="mapDrawControl__geometryFilterForm"
             buttonLabel={DRAW_DISTANCE_LABEL_SHORT}
-            geoFields={this.props.geoFields}
             getFilterActions={this.props.getFilterActions}
             getActionContext={this.props.getActionContext}
             onSubmit={this._initiateDistanceDraw}
diff --git a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
index f9eae1c90a164..5a477754683e6 100644
--- a/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
+++ b/x-pack/plugins/maps/public/embeddable/map_embeddable.tsx
@@ -26,14 +26,12 @@ import {
   TimeRange,
   Filter,
   Query,
-  RefreshInterval,
 } from '../../../../../src/plugins/data/public';
 import { createExtentFilter } from '../../common/elasticsearch_util';
 import {
   replaceLayerList,
   setMapSettings,
   setQuery,
-  setRefreshConfig,
   disableScrollZoom,
   setReadOnly,
 } from '../actions';
@@ -106,7 +104,6 @@ export class MapEmbeddable
   private _prevMapExtent?: MapExtent;
   private _prevTimeRange?: TimeRange;
   private _prevQuery?: Query;
-  private _prevRefreshConfig?: RefreshInterval;
   private _prevFilters: Filter[] = [];
   private _prevSyncColors?: boolean;
   private _prevSearchSessionId?: string;
@@ -171,9 +168,6 @@ export class MapEmbeddable
     this._dispatchSetQuery({
       forceRefresh: false,
     });
-    if (this.input.refreshConfig) {
-      this._dispatchSetRefreshConfig(this.input.refreshConfig);
-    }
 
     this._unsubscribeFromStore = this._savedMap.getStore().subscribe(() => {
       this._handleStoreChanges();
@@ -260,10 +254,6 @@ export class MapEmbeddable
       });
     }
 
-    if (this.input.refreshConfig && !_.isEqual(this.input.refreshConfig, this._prevRefreshConfig)) {
-      this._dispatchSetRefreshConfig(this.input.refreshConfig);
-    }
-
     if (this.input.syncColors !== this._prevSyncColors) {
       this._dispatchSetChartsPaletteServiceGetColor(this.input.syncColors);
     }
@@ -318,16 +308,6 @@ export class MapEmbeddable
     );
   }
 
-  _dispatchSetRefreshConfig(refreshConfig: RefreshInterval) {
-    this._prevRefreshConfig = refreshConfig;
-    this._savedMap.getStore().dispatch(
-      setRefreshConfig({
-        isPaused: refreshConfig.pause,
-        interval: refreshConfig.value,
-      })
-    );
-  }
-
   async _dispatchSetChartsPaletteServiceGetColor(syncColors?: boolean) {
     this._prevSyncColors = syncColors;
     const chartsPaletteServiceGetColor = syncColors
@@ -461,7 +441,6 @@ export class MapEmbeddable
     this._prevMapExtent = mapExtent;
 
     const mapExtentFilter = createExtentFilter(mapExtent, geoFieldNames);
-    mapExtentFilter.meta.isMultiIndex = true;
     mapExtentFilter.meta.controlledBy = this._controlledBy;
     mapExtentFilter.meta.alias = i18n.translate('xpack.maps.embeddable.boundsFilterLabel', {
       defaultMessage: 'Map bounds at center: {lat}, {lon}, zoom: {zoom}',
diff --git a/x-pack/plugins/maps/public/embeddable/types.ts b/x-pack/plugins/maps/public/embeddable/types.ts
index 79a70f3786fe6..dfd87bca19ac3 100644
--- a/x-pack/plugins/maps/public/embeddable/types.ts
+++ b/x-pack/plugins/maps/public/embeddable/types.ts
@@ -11,7 +11,7 @@ import {
   EmbeddableOutput,
   SavedObjectEmbeddableInput,
 } from '../../../../../src/plugins/embeddable/public';
-import { RefreshInterval, Query, Filter, TimeRange } from '../../../../../src/plugins/data/common';
+import { Query, Filter, TimeRange } from '../../../../../src/plugins/data/common';
 import { MapCenterAndZoom, MapExtent } from '../../common/descriptor_types';
 import { MapSavedObjectAttributes } from '../../common/map_saved_object_type';
 import { MapSettings } from '../reducers/map';
@@ -21,7 +21,6 @@ export interface MapEmbeddableConfig {
 }
 
 interface MapEmbeddableState {
-  refreshConfig?: RefreshInterval;
   isLayerTOCOpen?: boolean;
   openTOCDetails?: string[];
   mapCenter?: MapCenterAndZoom;
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 637f06f1d2e81..18a3fd3d6c150 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
@@ -38,7 +38,7 @@ export function startDataRequest(
 export function updateSourceDataRequest(
   state: MapState,
   layerId: string,
-  newData?: object
+  newData: object
 ): MapState {
   const dataRequest = getDataRequest(state, layerId, SOURCE_DATA_REQUEST_ID);
   return dataRequest ? setDataRequest(state, layerId, { ...dataRequest, data: newData }) : state;
diff --git a/x-pack/plugins/maps/public/reducers/map/map.ts b/x-pack/plugins/maps/public/reducers/map/map.ts
index 591215efcddae..e259e97bf260f 100644
--- a/x-pack/plugins/maps/public/reducers/map/map.ts
+++ b/x-pack/plugins/maps/public/reducers/map/map.ts
@@ -27,8 +27,6 @@ import {
   SET_LAYER_STYLE_META,
   SET_JOINS,
   UPDATE_SOURCE_PROP,
-  SET_REFRESH_CONFIG,
-  TRIGGER_REFRESH_TIMER,
   SET_MOUSE_COORDINATES,
   CLEAR_MOUSE_COORDINATES,
   SET_GOTO,
@@ -76,7 +74,6 @@ export const DEFAULT_MAP_STATE: MapState = {
     timeslice: undefined,
     query: undefined,
     filters: [],
-    refreshConfig: undefined,
     refreshTimerLastTriggeredAt: undefined,
     drawState: undefined,
   },
@@ -87,7 +84,7 @@ export const DEFAULT_MAP_STATE: MapState = {
   __rollbackSettings: null,
 };
 
-export function map(state: MapState = DEFAULT_MAP_STATE, action: any) {
+export function map(state: MapState = DEFAULT_MAP_STATE, action: Record<string, any>) {
   switch (action.type) {
     case UPDATE_DRAW_STATE:
       return {
@@ -186,7 +183,7 @@ export function map(state: MapState = DEFAULT_MAP_STATE, action: any) {
         ],
       };
     case UPDATE_SOURCE_DATA_REQUEST:
-      return updateSourceDataRequest(state, action);
+      return updateSourceDataRequest(state, action.layerId, action.newData);
     case LAYER_DATA_LOAD_STARTED:
       return startDataRequest(
         state,
@@ -239,26 +236,6 @@ export function map(state: MapState = DEFAULT_MAP_STATE, action: any) {
           searchSessionMapBuffer,
         },
       };
-    case SET_REFRESH_CONFIG:
-      const { isPaused, interval } = action;
-      return {
-        ...state,
-        mapState: {
-          ...state.mapState,
-          refreshConfig: {
-            isPaused,
-            interval,
-          },
-        },
-      };
-    case TRIGGER_REFRESH_TIMER:
-      return {
-        ...state,
-        mapState: {
-          ...state.mapState,
-          refreshTimerLastTriggeredAt: new Date().toISOString(),
-        },
-      };
     case SET_SELECTED_LAYER:
       const selectedMatch = state.layerList.find((layer) => layer.id === action.selectedLayerId);
       return { ...state, selectedLayerId: selectedMatch ? action.selectedLayerId : null };
diff --git a/x-pack/plugins/maps/public/reducers/map/types.ts b/x-pack/plugins/maps/public/reducers/map/types.ts
index e8dd7261e3dd3..b0a87f4fb10bd 100644
--- a/x-pack/plugins/maps/public/reducers/map/types.ts
+++ b/x-pack/plugins/maps/public/reducers/map/types.ts
@@ -14,7 +14,6 @@ import {
   MapCenter,
   MapExtent,
   MapQuery,
-  MapRefreshConfig,
   Timeslice,
   TooltipState,
 } from '../../../common/descriptor_types';
@@ -35,7 +34,6 @@ export type MapContext = {
   timeslice?: Timeslice;
   query?: MapQuery;
   filters: Filter[];
-  refreshConfig?: MapRefreshConfig;
   refreshTimerLastTriggeredAt?: string;
   drawState?: DrawState;
   searchSessionId?: string;
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 62e645198ba30..951e4d25ab53f 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
@@ -15,15 +15,13 @@ import {
   getFilters,
   getQuery,
   getQueryableUniqueIndexPatternIds,
-  getRefreshConfig,
   getTimeFilters,
   hasDirtyState,
 } from '../../../selectors/map_selectors';
-import { setQuery, setRefreshConfig, enableFullScreen, openMapSettings } from '../../../actions';
+import { setQuery, enableFullScreen, openMapSettings } from '../../../actions';
 import { FLYOUT_STATE } from '../../../reducers/ui';
 import { getInspectorAdapters } from '../../../reducers/non_serializable_instances';
 import { MapStoreState } from '../../../reducers/store';
-import { MapRefreshConfig } from '../../../../common/descriptor_types';
 
 function mapStateToProps(state: MapStoreState) {
   return {
@@ -33,7 +31,6 @@ function mapStateToProps(state: MapStoreState) {
     inspectorAdapters: getInspectorAdapters(state),
     nextIndexPatternIds: getQueryableUniqueIndexPatternIds(state),
     flyoutDisplay: getFlyoutDisplay(state),
-    refreshConfig: getRefreshConfig(state),
     filters: getFilters(state),
     query: getQuery(state),
     timeFilters: getTimeFilters(state),
@@ -42,16 +39,18 @@ function mapStateToProps(state: MapStoreState) {
 
 function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyAction>) {
   return {
-    dispatchSetQuery: ({
+    setQuery: ({
       forceRefresh,
       filters,
       query,
       timeFilters,
+      searchSessionId,
     }: {
       filters?: Filter[];
       query?: Query;
       timeFilters?: TimeRange;
       forceRefresh?: boolean;
+      searchSessionId?: string;
     }) => {
       dispatch(
         setQuery({
@@ -59,11 +58,10 @@ function mapDispatchToProps(dispatch: ThunkDispatch<MapStoreState, void, AnyActi
           query,
           timeFilters,
           forceRefresh,
+          searchSessionId,
         })
       );
     },
-    setRefreshConfig: (refreshConfig: MapRefreshConfig) =>
-      dispatch(setRefreshConfig(refreshConfig)),
     enableFullScreen: () => dispatch(enableFullScreen()),
     openMapSettings: () => dispatch(openMapSettings()),
   };
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 21b50aba440f5..0dfff5a2c221e 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
@@ -7,6 +7,7 @@
 
 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';
@@ -16,6 +17,7 @@ import {
   getCoreChrome,
   getMapsCapabilities,
   getNavigation,
+  getTimeFilter,
   getToasts,
 } from '../../../kibana_services';
 import {
@@ -39,7 +41,7 @@ import {
 import { MapContainer } from '../../../connected_components/map_container';
 import { getIndexPatternsFromIds } from '../../../index_pattern_util';
 import { getTopNavConfig } from '../top_nav_config';
-import { MapRefreshConfig, MapQuery } from '../../../../common/descriptor_types';
+import { MapQuery } from '../../../../common/descriptor_types';
 import { goToSpecifiedPath } from '../../../render_app';
 import { MapSavedObjectAttributes } from '../../../../common/map_saved_object_type';
 import { getExistingMapPath, APP_ID } from '../../../../common/constants';
@@ -51,6 +53,12 @@ import {
   unsavedChangesTitle,
   unsavedChangesWarning,
 } from '../saved_map';
+import { waitUntilTimeLayersLoad$ } from './wait_until_time_layers_load';
+
+interface MapRefreshConfig {
+  isPaused: boolean;
+  interval: number;
+}
 
 export interface Props {
   savedMap: SavedMap;
@@ -64,20 +72,20 @@ export interface Props {
   openMapSettings: () => void;
   inspectorAdapters: Adapters;
   nextIndexPatternIds: string[];
-  dispatchSetQuery: ({
+  setQuery: ({
     forceRefresh,
     filters,
     query,
     timeFilters,
+    searchSessionId,
   }: {
     filters?: Filter[];
     query?: Query;
     timeFilters?: TimeRange;
     forceRefresh?: boolean;
+    searchSessionId?: string;
   }) => void;
   timeFilters: TimeRange;
-  refreshConfig: MapRefreshConfig;
-  setRefreshConfig: (refreshConfig: MapRefreshConfig) => void;
   isSaveDisabled: boolean;
   query: MapQuery | undefined;
   setHeaderActionMenu: AppMountParameters['setHeaderActionMenu'];
@@ -87,9 +95,12 @@ export interface State {
   initialized: boolean;
   indexPatterns: IndexPattern[];
   savedQuery?: SavedQuery;
+  isRefreshPaused: boolean;
+  refreshInterval: number;
 }
 
 export class MapApp extends React.Component<Props, State> {
+  _autoRefreshSubscription: Subscription | null = null;
   _globalSyncUnsubscribe: (() => void) | null = null;
   _globalSyncChangeMonitorSubscription: Subscription | null = null;
   _appSyncUnsubscribe: (() => void) | null = null;
@@ -102,12 +113,26 @@ export class MapApp extends React.Component<Props, State> {
     this.state = {
       indexPatterns: [],
       initialized: false,
+      isRefreshPaused: true,
+      refreshInterval: 0,
     };
   }
 
   componentDidMount() {
     this._isMounted = true;
 
+    this._autoRefreshSubscription = getTimeFilter()
+      .getAutoRefreshFetch$()
+      .pipe(
+        tap(() => {
+          this.props.setQuery({ forceRefresh: true });
+        }),
+        switchMap((done) =>
+          waitUntilTimeLayersLoad$(this.props.savedMap.getStore()).pipe(finalize(done))
+        )
+      )
+      .subscribe();
+
     this._globalSyncUnsubscribe = startGlobalStateSyncing();
     this._appSyncUnsubscribe = startAppStateSyncing(this._appStateManager);
     this._globalSyncChangeMonitorSubscription = getData().query.state$.subscribe(
@@ -137,6 +162,9 @@ export class MapApp extends React.Component<Props, State> {
   componentWillUnmount() {
     this._isMounted = false;
 
+    if (this._autoRefreshSubscription) {
+      this._autoRefreshSubscription.unsubscribe();
+    }
     if (this._globalSyncUnsubscribe) {
       this._globalSyncUnsubscribe();
     }
@@ -198,7 +226,7 @@ export class MapApp extends React.Component<Props, State> {
       filterManager.setFilters(filters);
     }
 
-    this.props.dispatchSetQuery({
+    this.props.setQuery({
       forceRefresh,
       filters: filterManager.getFilters(),
       query,
@@ -264,14 +292,16 @@ export class MapApp extends React.Component<Props, State> {
     });
   };
 
-  // mapRefreshConfig: MapRefreshConfig
-  _onRefreshConfigChange(mapRefreshConfig: MapRefreshConfig) {
-    this.props.setRefreshConfig(mapRefreshConfig);
+  _onRefreshConfigChange({ isPaused, interval }: MapRefreshConfig) {
+    this.setState({
+      isRefreshPaused: isPaused,
+      refreshInterval: interval,
+    });
     updateGlobalState(
       {
         refreshInterval: {
-          pause: mapRefreshConfig.isPaused,
-          value: mapRefreshConfig.interval,
+          pause: isPaused,
+          value: interval,
         },
       },
       !this.state.initialized
@@ -370,8 +400,8 @@ export class MapApp extends React.Component<Props, State> {
         onFiltersUpdated={this._onFiltersChange}
         dateRangeFrom={this.props.timeFilters.from}
         dateRangeTo={this.props.timeFilters.to}
-        isRefreshPaused={this.props.refreshConfig.isPaused}
-        refreshInterval={this.props.refreshConfig.interval}
+        isRefreshPaused={this.state.isRefreshPaused}
+        refreshInterval={this.state.refreshInterval}
         onRefreshChange={({
           isPaused,
           refreshInterval,
diff --git a/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.ts
new file mode 100644
index 0000000000000..7e08e49863fdf
--- /dev/null
+++ b/x-pack/plugins/maps/public/routes/map_page/map_app/wait_until_time_layers_load.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 { from } from 'rxjs';
+import { debounceTime, first, switchMap } from 'rxjs/operators';
+import { getLayerList } from '../../../selectors/map_selectors';
+import { MapStore } from '../../../reducers/store';
+
+export function waitUntilTimeLayersLoad$(store: MapStore) {
+  // @ts-expect-error
+  const reduxState$ = from(store);
+  return reduxState$.pipe(
+    debounceTime(300),
+    // using switchMap since switchMap will discard promise from previous state iterations in progress
+    switchMap(async (state) => {
+      const promises = getLayerList(state).map(async (layer) => {
+        return {
+          isFilteredByGlobalTime: await layer.isFilteredByGlobalTime(),
+          layer,
+        };
+      });
+      const layersWithMeta = await Promise.all(promises);
+      return layersWithMeta;
+    }),
+    first((layersWithMeta) => {
+      const areTimeLayersStillLoading = layersWithMeta
+        .filter(({ isFilteredByGlobalTime }) => isFilteredByGlobalTime)
+        .some(({ layer }) => layer.isLayerLoading());
+      return !areTimeLayersStillLoading;
+    })
+  );
+}
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 0786c47d44c8e..f7e0012fdd9c2 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
@@ -16,7 +16,6 @@ import {
   getMapZoom,
   getMapCenter,
   getLayerListRaw,
-  getRefreshConfig,
   getQuery,
   getFilters,
   getMapSettings,
@@ -39,6 +38,7 @@ import {
   getToasts,
   getIsAllowByValueEmbeddables,
   getSavedObjectsTagging,
+  getTimeFilter,
 } from '../../../kibana_services';
 import { goToSpecifiedPath } from '../../../render_app';
 import { LayerDescriptor } from '../../../../common/descriptor_types';
@@ -394,7 +394,10 @@ export class SavedMap {
       zoom: getMapZoom(state),
       center: getMapCenter(state),
       timeFilters: getTimeFilters(state),
-      refreshConfig: getRefreshConfig(state),
+      refreshConfig: {
+        isPaused: getTimeFilter().getRefreshInterval().pause,
+        interval: getTimeFilter().getRefreshInterval().value,
+      },
       query: _.omit(getQuery(state), 'queryLastTriggeredAt'),
       filters: getFilters(state),
       settings: getMapSettings(state),
diff --git a/x-pack/plugins/maps/public/selectors/map_selectors.ts b/x-pack/plugins/maps/public/selectors/map_selectors.ts
index 5be14737cff15..dc70db99c3bc7 100644
--- a/x-pack/plugins/maps/public/selectors/map_selectors.ts
+++ b/x-pack/plugins/maps/public/selectors/map_selectors.ts
@@ -45,7 +45,6 @@ import {
   MapCenter,
   MapExtent,
   MapQuery,
-  MapRefreshConfig,
   TooltipState,
   VectorLayerDescriptor,
 } from '../../common/descriptor_types';
@@ -201,18 +200,6 @@ export const isDrawingFilter = ({ map }: MapStoreState): boolean => {
   return !!map.mapState.drawState;
 };
 
-export const getRefreshConfig = ({ map }: MapStoreState): MapRefreshConfig => {
-  if (map.mapState.refreshConfig) {
-    return map.mapState.refreshConfig;
-  }
-
-  const refreshInterval = getTimeFilter().getRefreshInterval();
-  return {
-    isPaused: refreshInterval.pause,
-    interval: refreshInterval.value,
-  };
-};
-
 export const getRefreshTimerLastTriggeredAt = ({ map }: MapStoreState): string | undefined =>
   map.mapState.refreshTimerLastTriggeredAt;
 
diff --git a/x-pack/plugins/maps/server/embeddable_migrations.test.ts b/x-pack/plugins/maps/server/embeddable_migrations.test.ts
new file mode 100644
index 0000000000000..306f716d5171d
--- /dev/null
+++ b/x-pack/plugins/maps/server/embeddable_migrations.test.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import semverGte from 'semver/functions/gte';
+import { embeddableMigrations } from './embeddable_migrations';
+// @ts-ignore
+import { savedObjectMigrations } from './saved_objects/saved_object_migrations';
+
+describe('saved object migrations and embeddable migrations', () => {
+  test('should have same versions registered (>7.12)', () => {
+    const savedObjectMigrationVersions = Object.keys(savedObjectMigrations).filter((version) => {
+      return semverGte(version, '7.13.0');
+    });
+    const embeddableMigrationVersions = Object.keys(embeddableMigrations);
+    expect(savedObjectMigrationVersions.sort()).toEqual(embeddableMigrationVersions.sort());
+  });
+});
diff --git a/x-pack/plugins/maps/server/embeddable_migrations.ts b/x-pack/plugins/maps/server/embeddable_migrations.ts
new file mode 100644
index 0000000000000..4bf39dc1f999c
--- /dev/null
+++ b/x-pack/plugins/maps/server/embeddable_migrations.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 { SerializableState } from '../../../../src/plugins/kibana_utils/common';
+import { MapSavedObjectAttributes } from '../common/map_saved_object_type';
+import { moveAttribution } from '../common/migrations/move_attribution';
+
+/*
+ * Embeddables such as Maps, Lens, and Visualize can be embedded by value or by reference on a dashboard.
+ * To ensure that any migrations (>7.12) are run correctly in both cases,
+ * the migration function must be registered as both a saved object migration and an embeddable migration
+
+ * This is the embeddable migration registry.
+ */
+export const embeddableMigrations = {
+  '7.14.0': (state: SerializableState) => {
+    return {
+      ...state,
+      attributes: moveAttribution(state as { attributes: MapSavedObjectAttributes }),
+    } as SerializableState;
+  },
+};
diff --git a/x-pack/plugins/maps/server/mvt/get_tile.ts b/x-pack/plugins/maps/server/mvt/get_tile.ts
index 95b8e043e0ce4..776d316440a56 100644
--- a/x-pack/plugins/maps/server/mvt/get_tile.ts
+++ b/x-pack/plugins/maps/server/mvt/get_tile.ts
@@ -218,7 +218,7 @@ export async function getTile({
 
       // Todo: pass in epochMillies-fields
       const featureCollection = hitsToGeoJson(
-        // @ts-expect-error hitsToGeoJson should be refactored to accept estypes.Hit
+        // @ts-expect-error hitsToGeoJson should be refactored to accept estypes.SearchHit
         documentsResponse.rawResponse.hits.hits,
         (hit: Record<string, unknown>) => {
           return flattenHit(geometryFieldName, hit);
diff --git a/x-pack/plugins/maps/server/plugin.ts b/x-pack/plugins/maps/server/plugin.ts
index f0c8a051f8f79..c753297932037 100644
--- a/x-pack/plugins/maps/server/plugin.ts
+++ b/x-pack/plugins/maps/server/plugin.ts
@@ -37,6 +37,8 @@ import { HomeServerPluginSetup } from '../../../../src/plugins/home/server';
 import { MapsEmsPluginSetup } from '../../../../src/plugins/maps_ems/server';
 import { EMSSettings } from '../common/ems_settings';
 import { PluginStart as DataPluginStart } from '../../../../src/plugins/data/server';
+import { EmbeddableSetup } from '../../../../src/plugins/embeddable/server';
+import { embeddableMigrations } from './embeddable_migrations';
 
 interface SetupDeps {
   features: FeaturesPluginSetupContract;
@@ -44,6 +46,7 @@ interface SetupDeps {
   home: HomeServerPluginSetup;
   licensing: LicensingPluginSetup;
   mapsEms: MapsEmsPluginSetup;
+  embeddable: EmbeddableSetup;
 }
 
 export interface StartDeps {
@@ -214,6 +217,11 @@ export class MapsPlugin implements Plugin {
     core.savedObjects.registerType(mapSavedObjects);
     registerMapsUsageCollector(usageCollection, currentConfig);
 
+    plugins.embeddable.registerEmbeddableFactory({
+      id: MAP_SAVED_OBJECT_TYPE,
+      migrations: embeddableMigrations,
+    });
+
     return {
       config: config$,
     };
diff --git a/x-pack/plugins/maps/server/saved_objects/map.ts b/x-pack/plugins/maps/server/saved_objects/map.ts
index f4091db66d3da..78f70e27b2b7b 100644
--- a/x-pack/plugins/maps/server/saved_objects/map.ts
+++ b/x-pack/plugins/maps/server/saved_objects/map.ts
@@ -8,7 +8,7 @@
 import { SavedObjectsType } from 'src/core/server';
 import { APP_ICON, getExistingMapPath } from '../../common/constants';
 // @ts-ignore
-import { migrations } from './migrations';
+import { savedObjectMigrations } from './saved_object_migrations';
 
 export const mapSavedObjects: SavedObjectsType = {
   name: 'map',
@@ -39,5 +39,5 @@ export const mapSavedObjects: SavedObjectsType = {
       };
     },
   },
-  migrations: migrations.map,
+  migrations: savedObjectMigrations,
 };
diff --git a/x-pack/plugins/maps/server/saved_objects/migrations.js b/x-pack/plugins/maps/server/saved_objects/migrations.js
deleted file mode 100644
index d10e22722970a..0000000000000
--- a/x-pack/plugins/maps/server/saved_objects/migrations.js
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { extractReferences } from '../../common/migrations/references';
-import { emsRasterTileToEmsVectorTile } from '../../common/migrations/ems_raster_tile_to_ems_vector_tile';
-import { topHitsTimeToSort } from '../../common/migrations/top_hits_time_to_sort';
-import { moveApplyGlobalQueryToSources } from '../../common/migrations/move_apply_global_query';
-import { addFieldMetaOptions } from '../../common/migrations/add_field_meta_options';
-import { migrateSymbolStyleDescriptor } from '../../common/migrations/migrate_symbol_style_descriptor';
-import { migrateUseTopHitsToScalingType } from '../../common/migrations/scaling_type';
-import { migrateJoinAggKey } from '../../common/migrations/join_agg_key';
-import { removeBoundsFromSavedObject } from '../../common/migrations/remove_bounds';
-import { setDefaultAutoFitToBounds } from '../../common/migrations/set_default_auto_fit_to_bounds';
-import { addTypeToTermJoin } from '../../common/migrations/add_type_to_termjoin';
-import { moveAttribution } from '../../common/migrations/move_attribution';
-
-export const migrations = {
-  map: {
-    '7.2.0': (doc) => {
-      const { attributes, references } = extractReferences(doc);
-
-      return {
-        ...doc,
-        attributes,
-        references,
-      };
-    },
-    '7.4.0': (doc) => {
-      const attributes = emsRasterTileToEmsVectorTile(doc);
-
-      return {
-        ...doc,
-        attributes,
-      };
-    },
-    '7.5.0': (doc) => {
-      const attributes = topHitsTimeToSort(doc);
-
-      return {
-        ...doc,
-        attributes,
-      };
-    },
-    '7.6.0': (doc) => {
-      const attributesPhase1 = moveApplyGlobalQueryToSources(doc);
-      const attributesPhase2 = addFieldMetaOptions({ attributes: attributesPhase1 });
-
-      return {
-        ...doc,
-        attributes: attributesPhase2,
-      };
-    },
-    '7.7.0': (doc) => {
-      const attributesPhase1 = migrateSymbolStyleDescriptor(doc);
-      const attributesPhase2 = migrateUseTopHitsToScalingType({ attributes: attributesPhase1 });
-
-      return {
-        ...doc,
-        attributes: attributesPhase2,
-      };
-    },
-    '7.8.0': (doc) => {
-      const attributes = migrateJoinAggKey(doc);
-
-      return {
-        ...doc,
-        attributes,
-      };
-    },
-    '7.9.0': (doc) => {
-      const attributes = removeBoundsFromSavedObject(doc);
-
-      return {
-        ...doc,
-        attributes,
-      };
-    },
-    '7.10.0': (doc) => {
-      const attributes = setDefaultAutoFitToBounds(doc);
-
-      return {
-        ...doc,
-        attributes,
-      };
-    },
-    '7.12.0': (doc) => {
-      const attributes = addTypeToTermJoin(doc);
-
-      return {
-        ...doc,
-        attributes,
-      };
-    },
-    '7.14.0': (doc) => {
-      const attributes = moveAttribution(doc);
-
-      return {
-        ...doc,
-        attributes,
-      };
-    },
-  },
-};
diff --git a/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.js b/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.js
new file mode 100644
index 0000000000000..8866ebb6b3de3
--- /dev/null
+++ b/x-pack/plugins/maps/server/saved_objects/saved_object_migrations.js
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { extractReferences } from '../../common/migrations/references';
+import { emsRasterTileToEmsVectorTile } from '../../common/migrations/ems_raster_tile_to_ems_vector_tile';
+import { topHitsTimeToSort } from '../../common/migrations/top_hits_time_to_sort';
+import { moveApplyGlobalQueryToSources } from '../../common/migrations/move_apply_global_query';
+import { addFieldMetaOptions } from '../../common/migrations/add_field_meta_options';
+import { migrateSymbolStyleDescriptor } from '../../common/migrations/migrate_symbol_style_descriptor';
+import { migrateUseTopHitsToScalingType } from '../../common/migrations/scaling_type';
+import { migrateJoinAggKey } from '../../common/migrations/join_agg_key';
+import { removeBoundsFromSavedObject } from '../../common/migrations/remove_bounds';
+import { setDefaultAutoFitToBounds } from '../../common/migrations/set_default_auto_fit_to_bounds';
+import { addTypeToTermJoin } from '../../common/migrations/add_type_to_termjoin';
+import { moveAttribution } from '../../common/migrations/move_attribution';
+
+/*
+ * Embeddables such as Maps, Lens, and Visualize can be embedded by value or by reference on a dashboard.
+ * To ensure that any migrations (>7.12) are run correctly in both cases,
+ * the migration function must be registered as both a saved object migration and an embeddable migration
+
+ * This is the saved object migration registry.
+ */
+export const savedObjectMigrations = {
+  '7.2.0': (doc) => {
+    const { attributes, references } = extractReferences(doc);
+
+    return {
+      ...doc,
+      attributes,
+      references,
+    };
+  },
+  '7.4.0': (doc) => {
+    const attributes = emsRasterTileToEmsVectorTile(doc);
+
+    return {
+      ...doc,
+      attributes,
+    };
+  },
+  '7.5.0': (doc) => {
+    const attributes = topHitsTimeToSort(doc);
+
+    return {
+      ...doc,
+      attributes,
+    };
+  },
+  '7.6.0': (doc) => {
+    const attributesPhase1 = moveApplyGlobalQueryToSources(doc);
+    const attributesPhase2 = addFieldMetaOptions({ attributes: attributesPhase1 });
+
+    return {
+      ...doc,
+      attributes: attributesPhase2,
+    };
+  },
+  '7.7.0': (doc) => {
+    const attributesPhase1 = migrateSymbolStyleDescriptor(doc);
+    const attributesPhase2 = migrateUseTopHitsToScalingType({ attributes: attributesPhase1 });
+
+    return {
+      ...doc,
+      attributes: attributesPhase2,
+    };
+  },
+  '7.8.0': (doc) => {
+    const attributes = migrateJoinAggKey(doc);
+
+    return {
+      ...doc,
+      attributes,
+    };
+  },
+  '7.9.0': (doc) => {
+    const attributes = removeBoundsFromSavedObject(doc);
+
+    return {
+      ...doc,
+      attributes,
+    };
+  },
+  '7.10.0': (doc) => {
+    const attributes = setDefaultAutoFitToBounds(doc);
+
+    return {
+      ...doc,
+      attributes,
+    };
+  },
+  '7.12.0': (doc) => {
+    const attributes = addTypeToTermJoin(doc);
+
+    return {
+      ...doc,
+      attributes,
+    };
+  },
+  '7.14.0': (doc) => {
+    const attributes = moveAttribution(doc);
+
+    return {
+      ...doc,
+      attributes,
+    };
+  },
+};
diff --git a/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts b/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts
index d5b5648757e8b..f5a46ec04611d 100644
--- a/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts
+++ b/x-pack/plugins/metrics_entities/server/routes/post_transforms.ts
@@ -37,9 +37,9 @@ export const postTransforms = (router: IRouter): void => {
         auto_start: autoStart = false,
         settings: {
           max_page_search_size: maxPageSearchSize = 500,
-          docs_per_second: docsPerSecond = null,
+          docs_per_second: docsPerSecond = undefined,
         } = {
-          docsPerSecond: null,
+          docsPerSecond: undefined,
           maxPageSearchSize: 500,
         },
         frequency = '1m',
diff --git a/x-pack/plugins/metrics_entities/server/services/install_transforms.ts b/x-pack/plugins/metrics_entities/server/services/install_transforms.ts
index d0a81955ca184..eec4f8d555356 100644
--- a/x-pack/plugins/metrics_entities/server/services/install_transforms.ts
+++ b/x-pack/plugins/metrics_entities/server/services/install_transforms.ts
@@ -27,7 +27,7 @@ interface CreateTransformOptions {
   frequency: string;
   logger: Logger;
   query: object;
-  docsPerSecond: number | null;
+  docsPerSecond: number | undefined;
   maxPageSearchSize: number;
   sync: {
     time: {
diff --git a/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts b/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts
index 1ae9f0d7a2f53..def26c5342ef9 100644
--- a/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts
+++ b/x-pack/plugins/metrics_entities/server/services/metrics_entities_client_types.ts
@@ -21,7 +21,7 @@ export interface PostTransformsOptions {
   autoStart: boolean;
   frequency: string;
   indices: string[];
-  docsPerSecond: number | null;
+  docsPerSecond: number | undefined;
   maxPageSearchSize: number;
   prefix: string;
   query: object;
diff --git a/x-pack/plugins/metrics_entities/server/services/post_transforms.ts b/x-pack/plugins/metrics_entities/server/services/post_transforms.ts
index 1850047ae1e9d..f14f53d78f10e 100644
--- a/x-pack/plugins/metrics_entities/server/services/post_transforms.ts
+++ b/x-pack/plugins/metrics_entities/server/services/post_transforms.ts
@@ -20,7 +20,7 @@ interface PostTransformsOptions {
   autoStart: boolean;
   frequency: string;
   indices: string[];
-  docsPerSecond: number | null;
+  docsPerSecond: number | undefined;
   kibanaVersion: string;
   maxPageSearchSize: number;
   query: object;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts
index 440f4c6e55fb8..e1a3f6044587b 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed.ts
@@ -9,15 +9,10 @@ import { estypes } from '@elastic/elasticsearch';
 
 export type DatafeedId = string;
 
-export type Datafeed = estypes.Datafeed;
+export type Datafeed = estypes.MlDatafeed;
 
-export type ChunkingConfig = estypes.ChunkingConfig;
+export type ChunkingConfig = estypes.MlChunkingConfig;
 
-export type Aggregation = Record<string, estypes.AggregationContainer>;
+export type Aggregation = Record<string, estypes.AggregationsAggregationContainer>;
 
-// export type IndicesOptions = estypes.IndicesOptions;
-export interface IndicesOptions {
-  allow_no_indices?: boolean;
-  expand_wildcards?: estypes.ExpandWildcards;
-  ignore_unavailable?: boolean;
-}
+export type IndicesOptions = estypes.MlDatafeedIndicesOptions;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts
index dd0d3a5001f84..4e23d97c0d145 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/datafeed_stats.ts
@@ -7,4 +7,4 @@
 
 import { estypes } from '@elastic/elasticsearch';
 
-export type DatafeedStats = estypes.DatafeedStats;
+export type DatafeedStats = estypes.MlDatafeedStats;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
index 68544e7cb828f..2ef1d824180ad 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job.ts
@@ -10,23 +10,23 @@ import { estypes } from '@elastic/elasticsearch';
 export type JobId = string;
 export type BucketSpan = string;
 
-export type Job = estypes.Job;
+export type Job = estypes.MlJob;
 
-export type AnalysisConfig = estypes.AnalysisConfig;
+export type AnalysisConfig = estypes.MlAnalysisConfig;
 
-export type Detector = estypes.Detector;
+export type Detector = estypes.MlDetector;
 
-export type AnalysisLimits = estypes.AnalysisLimits;
+export type AnalysisLimits = estypes.MlAnalysisLimits;
 
-export type DataDescription = estypes.DataDescription;
+export type DataDescription = estypes.MlDataDescription;
 
-export type ModelPlotConfig = estypes.ModelPlotConfig;
+export type ModelPlotConfig = estypes.MlModelPlotConfig;
 
-export type CustomRule = estypes.DetectionRule;
+export type CustomRule = estypes.MlDetectionRule;
 
 export interface PerPartitionCategorization {
   enabled?: boolean;
   stop_on_warn?: boolean;
 }
 
-export type CustomSettings = estypes.CustomSettings;
+export type CustomSettings = estypes.MlCustomSettings;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts
index a53f1f2486699..5fc8b423a5ac2 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/job_stats.ts
@@ -7,23 +7,14 @@
 
 import { estypes } from '@elastic/elasticsearch';
 
-export type JobStats = estypes.JobStats & {
-  model_size_stats: ModelSizeStats;
-  timing_stats: TimingStats;
-};
+export type JobStats = estypes.MlJobStats;
 
-export type DataCounts = estypes.DataCounts;
+export type DataCounts = estypes.MlDataCounts;
 
-export type ModelSizeStats = estypes.ModelSizeStats & {
-  model_bytes_exceeded: number;
-  model_bytes_memory_limit: number;
-  peak_model_bytes?: number;
-};
+export type ModelSizeStats = estypes.MlModelSizeStats;
 
-export type TimingStats = estypes.TimingStats & {
-  total_bucket_processing_time_ms: number;
-};
+export type TimingStats = estypes.MlTimingStats;
 
-export type ForecastsStats = estypes.JobForecastStatistics;
+export type ForecastsStats = estypes.MlJobForecastStatistics;
 
-export type Node = estypes.DiscoveryNode;
+export type Node = estypes.MlDiscoveryNode;
diff --git a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts
index f844c42f4ca6e..0bb2162994c37 100644
--- a/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts
+++ b/x-pack/plugins/ml/common/types/anomaly_detection_jobs/model_snapshot.ts
@@ -5,18 +5,6 @@
  * 2.0.
  */
 
-import { JobId } from './job';
-import { ModelSizeStats } from './job_stats';
+import { estypes } from '@elastic/elasticsearch';
 
-export interface ModelSnapshot {
-  job_id: JobId;
-  min_version: string;
-  timestamp: number;
-  description: string;
-  snapshot_id: string;
-  snapshot_doc_count: number;
-  model_size_stats: ModelSizeStats;
-  latest_record_time_stamp: number;
-  latest_result_time_stamp: number;
-  retain: boolean;
-}
+export type ModelSnapshot = estypes.MlModelSnapshot;
diff --git a/x-pack/plugins/ml/common/types/data_frame_analytics.ts b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
index ff5069e7d59ad..3305eeaaf4794 100644
--- a/x-pack/plugins/ml/common/types/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/common/types/data_frame_analytics.ts
@@ -76,7 +76,7 @@ export interface DataFrameAnalyticsConfig {
   };
   source: {
     index: IndexName | IndexName[];
-    query?: estypes.QueryContainer;
+    query?: estypes.QueryDslQueryContainer;
     runtime_mappings?: RuntimeMappings;
   };
   analysis: AnalysisConfig;
diff --git a/x-pack/plugins/ml/common/types/datavisualizer.ts b/x-pack/plugins/ml/common/types/datavisualizer.ts
deleted file mode 100644
index b2c1409471658..0000000000000
--- a/x-pack/plugins/ml/common/types/datavisualizer.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export interface AggregatableField {
-  fieldName: string;
-  stats: {
-    cardinality?: number;
-    count?: number;
-    sampleCount?: number;
-  };
-  existsInDocs: boolean;
-}
-
-export type NonAggregatableField = Omit<AggregatableField, 'stats'>;
-export interface OverallStats {
-  totalCount: number;
-  aggregatableExistsFields: AggregatableField[];
-  aggregatableNotExistsFields: NonAggregatableField[];
-  nonAggregatableExistsFields: AggregatableField[];
-  nonAggregatableNotExistsFields: NonAggregatableField[];
-}
diff --git a/x-pack/plugins/ml/common/types/es_client.ts b/x-pack/plugins/ml/common/types/es_client.ts
index 249b3c150a082..67adda6b24c18 100644
--- a/x-pack/plugins/ml/common/types/es_client.ts
+++ b/x-pack/plugins/ml/common/types/es_client.ts
@@ -13,13 +13,15 @@ import type { JsonObject } from '../../../../../src/plugins/kibana_utils/common'
 
 import { isPopulatedObject } from '../util/object_utils';
 
-export function isMultiBucketAggregate(arg: unknown): arg is estypes.MultiBucketAggregate {
+export function isMultiBucketAggregate(
+  arg: unknown
+): arg is estypes.AggregationsMultiBucketAggregate {
   return isPopulatedObject(arg, ['buckets']);
 }
 
 export const ES_CLIENT_TOTAL_HITS_RELATION: Record<
-  Uppercase<estypes.TotalHitsRelation>,
-  estypes.TotalHitsRelation
+  Uppercase<estypes.SearchTotalHitsRelation>,
+  estypes.SearchTotalHitsRelation
 > = {
   EQ: 'eq',
   GTE: 'gte',
diff --git a/x-pack/plugins/ml/common/types/fields.ts b/x-pack/plugins/ml/common/types/fields.ts
index cf017192353e9..33a4a94e539b8 100644
--- a/x-pack/plugins/ml/common/types/fields.ts
+++ b/x-pack/plugins/ml/common/types/fields.ts
@@ -28,7 +28,7 @@ export interface Field {
   aggregatable?: boolean;
   aggIds?: AggId[];
   aggs?: Aggregation[];
-  runtimeField?: estypes.RuntimeField;
+  runtimeField?: estypes.MappingRuntimeField;
 }
 
 export interface Aggregation {
@@ -112,4 +112,4 @@ export interface AggCardinality {
 
 export type RollupFields = Record<FieldId, [Record<'agg', ES_AGGREGATION>]>;
 
-export type RuntimeMappings = estypes.RuntimeFields;
+export type RuntimeMappings = estypes.MappingRuntimeFields;
diff --git a/x-pack/plugins/ml/common/types/ml_url_generator.ts b/x-pack/plugins/ml/common/types/ml_url_generator.ts
index 2b05f231e509f..9c7145c848264 100644
--- a/x-pack/plugins/ml/common/types/ml_url_generator.ts
+++ b/x-pack/plugins/ml/common/types/ml_url_generator.ts
@@ -5,11 +5,7 @@
  * 2.0.
  */
 
-import type {
-  Query,
-  RefreshInterval,
-  TimeRange,
-} from '../../../../../src/plugins/data/common/query';
+import type { RefreshInterval, TimeRange } from '../../../../../src/plugins/data/common/query';
 import type { JobId } from './anomaly_detection_jobs/job';
 import { ML_PAGES } from '../constants/ml_url_generator';
 import type { DataFrameAnalysisConfigType } from './data_frame_analytics';
@@ -44,24 +40,6 @@ export interface MlGenericUrlPageState extends MlIndexBasedSearchState {
   [key: string]: any;
 }
 
-export interface DataVisualizerIndexBasedAppState extends Omit<ListingPageUrlState, 'queryText'> {
-  searchString?: Query['query'];
-  searchQuery?: Query['query'];
-  searchQueryLanguage?: SearchQueryLanguage;
-  visibleFieldTypes?: string[];
-  visibleFieldNames?: string[];
-  samplerShardSize?: number;
-  showDistributions?: boolean;
-  showAllFields?: boolean;
-  showEmptyFields?: boolean;
-}
-
-export interface DataVisualizerFileBasedAppState extends Omit<ListingPageUrlState, 'queryText'> {
-  visibleFieldTypes?: string[];
-  visibleFieldNames?: string[];
-  showDistributions?: boolean;
-}
-
 export type MlGenericUrlState = MLPageState<
   | typeof ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER
   | typeof ML_PAGES.ANOMALY_DETECTION_CREATE_JOB
diff --git a/x-pack/plugins/ml/common/util/job_utils.ts b/x-pack/plugins/ml/common/util/job_utils.ts
index e7608af553f60..2cb803af38579 100644
--- a/x-pack/plugins/ml/common/util/job_utils.ts
+++ b/x-pack/plugins/ml/common/util/job_utils.ts
@@ -78,7 +78,7 @@ export function isMappableJob(job: CombinedJob, detectorIndex: number): boolean
  * if composite is defined.
  * @param buckets
  */
-export function hasValidComposite(buckets: estypes.AggregationContainer) {
+export function hasValidComposite(buckets: estypes.AggregationsAggregationContainer) {
   if (
     isPopulatedObject(buckets, ['composite']) &&
     isPopulatedObject(buckets.composite, ['sources']) &&
@@ -157,7 +157,7 @@ export function isSourceDataChartableForDetector(job: CombinedJob, detectorIndex
           }
           // if fieldName is an aggregated field under nested terms using bucket_script
           const aggregations =
-            getAggregations<estypes.AggregationContainer>(aggs[aggBucketsName]) ?? {};
+            getAggregations<estypes.AggregationsAggregationContainer>(aggs[aggBucketsName]) ?? {};
           const foundField = findAggField(aggregations, dtr.field_name, false);
           if (foundField?.bucket_script !== undefined) {
             return false;
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 7be2a3ec8c9e1..1fcf8e2e72b15 100644
--- a/x-pack/plugins/ml/common/util/runtime_field_utils.ts
+++ b/x-pack/plugins/ml/common/util/runtime_field_utils.ts
@@ -11,7 +11,7 @@ import type { RuntimeMappings } from '../types/fields';
 
 type RuntimeType = typeof RUNTIME_FIELD_TYPES[number];
 
-export function isRuntimeField(arg: unknown): arg is estypes.RuntimeField {
+export function isRuntimeField(arg: unknown): arg is estypes.MappingRuntimeField {
   return (
     ((isPopulatedObject(arg, ['type']) && Object.keys(arg).length === 1) ||
       (isPopulatedObject(arg, ['type', 'script']) &&
diff --git a/x-pack/plugins/ml/kibana.json b/x-pack/plugins/ml/kibana.json
index 6804b3f52b52a..f34172765e1dd 100644
--- a/x-pack/plugins/ml/kibana.json
+++ b/x-pack/plugins/ml/kibana.json
@@ -10,13 +10,12 @@
     "data",
     "cloud",
     "features",
-    "fileDataVisualizer",
+    "dataVisualizer",
     "licensing",
     "share",
     "embeddable",
     "uiActions",
     "kibanaLegacy",
-    "indexPatternManagement",
     "discover",
     "triggersActionsUi"
   ],
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 ad47e84319e4a..0907cce832bf8 100644
--- a/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
+++ b/x-pack/plugins/ml/public/__mocks__/ml_start_deps.ts
@@ -24,5 +24,5 @@ export const createMlStartDepsMock = () => ({
   maps: jest.fn(),
   lens: lensPluginMock.createStartContract(),
   triggersActionsUi: triggersActionsUiMock.createStart(),
-  fileDataVisualizer: jest.fn(),
+  dataVisualizer: jest.fn(),
 });
diff --git a/x-pack/plugins/ml/public/application/_index.scss b/x-pack/plugins/ml/public/application/_index.scss
index da1c226a665f6..fb61a2a16c19d 100644
--- a/x-pack/plugins/ml/public/application/_index.scss
+++ b/x-pack/plugins/ml/public/application/_index.scss
@@ -9,7 +9,6 @@
 
   // Sub applications
   @import 'data_frame_analytics/index';
-  @import 'datavisualizer/index';
   @import 'explorer/index'; // SASSTODO: This file needs to be rewritten
   @import 'jobs/index'; // SASSTODO: This collection of sass files has multiple problems
   @import 'overview/index';
@@ -22,7 +21,6 @@
   @import 'components/color_range_legend/index';
   @import 'components/controls/index';
   @import 'components/entity_cell/index';
-  @import 'components/field_title_bar/index';
   @import 'components/influencers_list/index';
   @import 'components/items_grid/index';
   @import 'components/job_selector/index';
diff --git a/x-pack/plugins/ml/public/application/app.tsx b/x-pack/plugins/ml/public/application/app.tsx
index e2fbcc77f2767..f16a7c561ac5d 100644
--- a/x-pack/plugins/ml/public/application/app.tsx
+++ b/x-pack/plugins/ml/public/application/app.tsx
@@ -82,7 +82,7 @@ const App: FC<AppProps> = ({ coreStart, deps, appMountParams }) => {
     embeddable: deps.embeddable,
     maps: deps.maps,
     triggersActionsUi: deps.triggersActionsUi,
-    fileDataVisualizer: deps.fileDataVisualizer,
+    dataVisualizer: deps.dataVisualizer,
     ...coreStart,
   };
 
@@ -125,7 +125,7 @@ export const renderApp = (
     security: deps.security,
     urlGenerators: deps.share.urlGenerators,
     maps: deps.maps,
-    fileDataVisualizer: deps.fileDataVisualizer,
+    dataVisualizer: deps.dataVisualizer,
   });
 
   appMountParams.onAppLeave((actions) => actions.default());
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 24a3cfb70d18d..a64594e86a757 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
@@ -181,7 +181,7 @@ export const getDataGridSchemasFromFieldTypes = (fieldTypes: FieldTypes, results
 export const NON_AGGREGATABLE = 'non-aggregatable';
 
 export const getDataGridSchemaFromESFieldType = (
-  fieldType: ES_FIELD_TYPES | undefined | estypes.RuntimeField['type']
+  fieldType: ES_FIELD_TYPES | undefined | estypes.MappingRuntimeField['type']
 ): string | undefined => {
   // Built-in values are ['boolean', 'currency', 'datetime', 'numeric', 'json']
   // To fall back to the default string schema it needs to be undefined.
diff --git a/x-pack/plugins/ml/public/application/components/data_grid/types.ts b/x-pack/plugins/ml/public/application/components/data_grid/types.ts
index 865e09e72b40c..9dcd6abb432b3 100644
--- a/x-pack/plugins/ml/public/application/components/data_grid/types.ts
+++ b/x-pack/plugins/ml/public/application/components/data_grid/types.ts
@@ -27,7 +27,7 @@ export type DataGridItem = Record<string, any>;
 
 // `undefined` is used to indicate a non-initialized state.
 export type ChartsVisible = boolean | undefined;
-export type RowCountRelation = estypes.TotalHitsRelation | undefined;
+export type RowCountRelation = estypes.SearchTotalHitsRelation | undefined;
 
 export type IndexPagination = Pick<EuiDataGridPaginationProps, 'pageIndex' | 'pageSize'>;
 
diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/_field_title_bar.scss b/x-pack/plugins/ml/public/application/components/field_title_bar/_field_title_bar.scss
deleted file mode 100644
index 77d95653638ac..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_title_bar/_field_title_bar.scss
+++ /dev/null
@@ -1,28 +0,0 @@
-.ml-field-title-bar {
-  @include euiFontSizeM;
-  font-family: Roboto Mono, serif;
-  font-style: normal;
-  font-weight: bold;
-  font-size: $euiFontSizeS;
-  border-radius: $euiBorderRadius $euiBorderRadius 0 0;
-  padding: $euiSizeXS;
-  margin: (-$euiSize) (-$euiSize) 0 (-$euiSize);
-  border-top: 3px solid;
-  text-align: center;
-
-  .field-type-icon {
-    vertical-align: middle;
-    margin-bottom: -$euiSizeXS;
-    display: inline-block;
-  }
-
-  .field-name {
-    @include euiTextTruncate;
-
-    vertical-align: middle;
-    padding-right: $euiSizeS;
-    max-width: 290px; // SASSTODO: Calculate value
-    display: inline-block;
-    margin-left: $euiSizeS;
-  }
-}
diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/_index.scss b/x-pack/plugins/ml/public/application/components/field_title_bar/_index.scss
deleted file mode 100644
index d12cf5d008c44..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_title_bar/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'field_title_bar';
\ No newline at end of file
diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.test.tsx b/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.test.tsx
deleted file mode 100644
index 20fd024fdef86..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.test.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { mountWithIntl } from '@kbn/test/jest';
-
-import React from 'react';
-
-import { FieldTitleBar } from './field_title_bar';
-import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types';
-
-describe('FieldTitleBar', () => {
-  test(`card prop is an empty object`, () => {
-    const props = {
-      card: {
-        type: ML_JOB_FIELD_TYPES.NUMBER,
-        existsInDocs: true,
-        loading: false,
-        aggregatable: true,
-      },
-    };
-
-    const wrapper = mountWithIntl(<FieldTitleBar {...props} />);
-
-    const fieldName = wrapper.find({ className: 'field-name' }).text();
-    expect(fieldName).toEqual('document count');
-
-    const hasClassName = wrapper.find('EuiText').hasClass('document_count');
-    expect(hasClassName).toBeTruthy();
-  });
-
-  test(`card.isUnsupportedType is true`, () => {
-    const props = {
-      card: {
-        type: ML_JOB_FIELD_TYPES.UNKNOWN,
-        fieldName: 'foo',
-        existsInDocs: true,
-        loading: false,
-        aggregatable: true,
-        isUnsupportedType: true,
-      },
-    };
-
-    const wrapper = mountWithIntl(<FieldTitleBar {...props} />);
-
-    const fieldName = wrapper.find({ className: 'field-name' }).text();
-    expect(fieldName).toEqual(props.card.fieldName);
-
-    const hasClassName = wrapper.find('EuiText').hasClass('type-other');
-    expect(hasClassName).toBeTruthy();
-  });
-
-  test(`card.fieldName and card.type is set`, () => {
-    const props = {
-      card: {
-        type: ML_JOB_FIELD_TYPES.KEYWORD,
-        fieldName: 'bar',
-        existsInDocs: true,
-        loading: false,
-        aggregatable: true,
-      },
-    };
-
-    const wrapper = mountWithIntl(<FieldTitleBar {...props} />);
-
-    const fieldName = wrapper.find({ className: 'field-name' }).text();
-    expect(fieldName).toEqual(props.card.fieldName);
-
-    const hasClassName = wrapper.find('EuiText').hasClass(props.card.type);
-    expect(hasClassName).toBeTruthy();
-  });
-
-  test(`tooltip hovering`, () => {
-    // Use fake timers so we don't have to wait for the EuiToolTip timeout
-    jest.useFakeTimers();
-
-    const props = {
-      card: {
-        type: ML_JOB_FIELD_TYPES.KEYWORD,
-        fieldName: 'bar',
-        existsInDocs: true,
-        loading: false,
-        aggregatable: true,
-      },
-    };
-    const wrapper = mountWithIntl(<FieldTitleBar {...props} />);
-    const container = wrapper.find({ className: 'field-name' });
-
-    expect(wrapper.find('EuiToolTip').children()).toHaveLength(2);
-
-    container.simulate('mouseover');
-
-    // Run the timers so the EuiTooltip will be visible
-    jest.runAllTimers();
-
-    wrapper.update();
-    expect(wrapper.find('EuiToolTip').children()).toHaveLength(3);
-
-    container.simulate('mouseout');
-
-    // Run the timers so the EuiTooltip will be hidden again
-    jest.runAllTimers();
-
-    wrapper.update();
-    expect(wrapper.find('EuiToolTip').children()).toHaveLength(2);
-
-    // Clearing all mocks will also reset fake timers.
-    jest.clearAllMocks();
-  });
-});
diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.tsx b/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.tsx
deleted file mode 100644
index 85971b66a687f..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_title_bar/field_title_bar.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-
-import { EuiText, EuiToolTip } from '@elastic/eui';
-
-import { i18n } from '@kbn/i18n';
-
-import { FieldTypeIcon } from '../field_type_icon';
-import { getMLJobTypeAriaLabel } from '../../util/field_types_utils';
-import {
-  FieldVisConfig,
-  FileBasedFieldVisConfig,
-  isIndexBasedFieldVisConfig,
-} from '../../datavisualizer/stats_table/types/field_vis_config';
-
-interface Props {
-  card: FieldVisConfig | FileBasedFieldVisConfig;
-}
-
-export const FieldTitleBar: FC<Props> = ({ card }) => {
-  const fieldName =
-    card.fieldName ||
-    i18n.translate('xpack.ml.fieldTitleBar.documentCountLabel', {
-      defaultMessage: 'document count',
-    });
-  const cardTitleAriaLabel = [fieldName];
-
-  const classNames = ['ml-field-title-bar'];
-
-  if (card.fieldName === undefined) {
-    classNames.push('document_count');
-  } else if (isIndexBasedFieldVisConfig(card) && card.isUnsupportedType === true) {
-    classNames.push('type-other');
-  } else {
-    classNames.push(card.type);
-  }
-
-  if (isIndexBasedFieldVisConfig(card) && card.isUnsupportedType !== true) {
-    // All the supported field types have aria labels.
-    cardTitleAriaLabel.unshift(getMLJobTypeAriaLabel(card.type)!);
-  }
-
-  return (
-    <EuiText className={classNames.join(' ')}>
-      <FieldTypeIcon
-        type={card.type}
-        fieldName={card.fieldName}
-        tooltipEnabled={true}
-        needsAria={false}
-      />
-      <EuiToolTip position="left" content={fieldName}>
-        <div className="field-name" tabIndex={0} aria-label={`${cardTitleAriaLabel.join(', ')}`}>
-          {fieldName}
-        </div>
-      </EuiToolTip>
-    </EuiText>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/components/field_title_bar/index.ts b/x-pack/plugins/ml/public/application/components/field_title_bar/index.ts
deleted file mode 100644
index 9c2be066c1052..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_title_bar/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FieldTitleBar } from './field_title_bar';
diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap b/x-pack/plugins/ml/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap
deleted file mode 100644
index 769ebdeba9955..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_type_icon/__snapshots__/field_type_icon.test.tsx.snap
+++ /dev/null
@@ -1,16 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`FieldTypeIcon render component when type matches a field type 1`] = `
-<EuiToolTip
-  content="keyword type"
-  delay="regular"
-  position="left"
->
-  <FieldTypeIconContainer
-    ariaLabel="keyword type"
-    color="euiColorVis0"
-    iconType="tokenText"
-    needsAria={false}
-  />
-</EuiToolTip>
-`;
diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.test.tsx b/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.test.tsx
deleted file mode 100644
index 4a8b067710c95..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.test.tsx
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { mount, shallow } from 'enzyme';
-
-import { FieldTypeIcon } from './field_type_icon';
-import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types';
-
-describe('FieldTypeIcon', () => {
-  test(`render component when type matches a field type`, () => {
-    const typeIconComponent = shallow(
-      <FieldTypeIcon type={ML_JOB_FIELD_TYPES.KEYWORD} tooltipEnabled={true} needsAria={false} />
-    );
-    expect(typeIconComponent).toMatchSnapshot();
-  });
-
-  test(`render with tooltip and test hovering`, () => {
-    // Use fake timers so we don't have to wait for the EuiToolTip timeout
-    jest.useFakeTimers();
-
-    const typeIconComponent = mount(
-      <FieldTypeIcon type={ML_JOB_FIELD_TYPES.KEYWORD} tooltipEnabled={true} needsAria={false} />
-    );
-    const container = typeIconComponent.find({ 'data-test-subj': 'mlFieldTypeIcon' });
-
-    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1);
-
-    container.simulate('mouseover');
-
-    // Run the timers so the EuiTooltip will be visible
-    jest.runAllTimers();
-
-    typeIconComponent.update();
-    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(2);
-
-    container.simulate('mouseout');
-
-    // Run the timers so the EuiTooltip will be hidden again
-    jest.runAllTimers();
-
-    typeIconComponent.update();
-    expect(typeIconComponent.find('EuiToolTip').children()).toHaveLength(1);
-
-    // Clearing all mocks will also reset fake timers.
-    jest.clearAllMocks();
-  });
-});
diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.tsx b/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.tsx
deleted file mode 100644
index 79ab210ce1dfe..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_type_icon/field_type_icon.tsx
+++ /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 React, { FC } from 'react';
-
-import { EuiToken, EuiToolTip } from '@elastic/eui';
-
-import { i18n } from '@kbn/i18n';
-
-import { getMLJobTypeAriaLabel } from '../../util/field_types_utils';
-import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types';
-import type { MlJobFieldType } from '../../../../common/types/field_types';
-
-interface FieldTypeIconProps {
-  tooltipEnabled: boolean;
-  type: MlJobFieldType;
-  fieldName?: string;
-  needsAria: boolean;
-}
-
-interface FieldTypeIconContainerProps {
-  ariaLabel: string | null;
-  iconType: string;
-  color: string;
-  needsAria: boolean;
-  [key: string]: any;
-}
-
-export const FieldTypeIcon: FC<FieldTypeIconProps> = ({
-  tooltipEnabled = false,
-  type,
-  fieldName,
-  needsAria = true,
-}) => {
-  const ariaLabel = getMLJobTypeAriaLabel(type);
-
-  let iconType = 'questionInCircle';
-  let color = 'euiColorVis6';
-
-  switch (type) {
-    // Set icon types and colors
-    case ML_JOB_FIELD_TYPES.BOOLEAN:
-      iconType = 'tokenBoolean';
-      color = 'euiColorVis5';
-      break;
-    case ML_JOB_FIELD_TYPES.DATE:
-      iconType = 'tokenDate';
-      color = 'euiColorVis7';
-      break;
-    case ML_JOB_FIELD_TYPES.GEO_POINT:
-    case ML_JOB_FIELD_TYPES.GEO_SHAPE:
-      iconType = 'tokenGeo';
-      color = 'euiColorVis8';
-      break;
-    case ML_JOB_FIELD_TYPES.TEXT:
-      iconType = 'document';
-      color = 'euiColorVis9';
-      break;
-    case ML_JOB_FIELD_TYPES.IP:
-      iconType = 'tokenIP';
-      color = 'euiColorVis3';
-      break;
-    case ML_JOB_FIELD_TYPES.KEYWORD:
-      iconType = 'tokenText';
-      color = 'euiColorVis0';
-      break;
-    case ML_JOB_FIELD_TYPES.NUMBER:
-      iconType = 'tokenNumber';
-      color = fieldName !== undefined ? 'euiColorVis1' : 'euiColorVis2';
-      break;
-    case ML_JOB_FIELD_TYPES.UNKNOWN:
-      // Use defaults
-      break;
-  }
-
-  const containerProps = {
-    ariaLabel,
-    iconType,
-    color,
-    needsAria,
-  };
-
-  if (tooltipEnabled === true) {
-    // wrap the inner component inside <span> because EuiToolTip doesn't seem
-    // to support having another component directly inside the tooltip anchor
-    // see https://github.com/elastic/eui/issues/839
-    return (
-      <EuiToolTip
-        position="left"
-        content={i18n.translate('xpack.ml.fieldTypeIcon.fieldTypeTooltip', {
-          defaultMessage: '{type} type',
-          values: { type },
-        })}
-      >
-        <FieldTypeIconContainer {...containerProps} />
-      </EuiToolTip>
-    );
-  }
-
-  return <FieldTypeIconContainer {...containerProps} />;
-};
-
-// If the tooltip is used, it will apply its events to its first inner child.
-// To pass on its properties we apply `rest` to the outer `span` element.
-const FieldTypeIconContainer: FC<FieldTypeIconContainerProps> = ({
-  ariaLabel,
-  iconType,
-  color,
-  needsAria,
-  ...rest
-}) => {
-  const wrapperProps: { className: string; 'aria-label'?: string } = {
-    className: 'field-type-icon',
-  };
-  if (needsAria && ariaLabel) {
-    wrapperProps['aria-label'] = ariaLabel;
-  }
-
-  return (
-    <span data-test-subj="mlFieldTypeIcon" {...rest}>
-      <span {...wrapperProps}>
-        <EuiToken iconType={iconType} shape="square" size="s" color={color} />
-      </span>
-    </span>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/components/field_type_icon/index.ts b/x-pack/plugins/ml/public/application/components/field_type_icon/index.ts
deleted file mode 100644
index fa825e447be30..0000000000000
--- a/x-pack/plugins/ml/public/application/components/field_type_icon/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FieldTypeIcon } from './field_type_icon';
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 0ca5389f1d423..394df03f46567 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
@@ -77,10 +77,6 @@ export function MlEmbeddedMapComponent({
         attributes: { title: '' },
         filters: [],
         hidePanelTitles: true,
-        refreshConfig: {
-          value: 0,
-          pause: false,
-        },
         viewMode: ViewMode.VIEW,
         isLayerTOCOpen: false,
         hideFilterActions: true,
diff --git a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
index 15979751f40d6..a9217d884fd32 100644
--- a/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
+++ b/x-pack/plugins/ml/public/application/components/model_snapshots/revert_model_snapshot_flyout/chart_loader.ts
@@ -31,7 +31,6 @@ export function chartLoaderProvider(mlResultsService: MlResultsService) {
       job.data_counts.latest_record_timestamp,
       intervalMs,
       job.datafeed_config.runtime_mappings,
-      // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
       job.datafeed_config.indices_options
     );
     if (resp.error !== undefined) {
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 b69a8a9b7867a..841f0d03fa21c 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
@@ -18,7 +18,7 @@ import { MlServicesContext } from '../../app';
 import { IStorageWrapper } from '../../../../../../../src/plugins/kibana_utils/public';
 import type { EmbeddableStart } from '../../../../../../../src/plugins/embeddable/public';
 import type { MapsStartApi } from '../../../../../maps/public';
-import type { FileDataVisualizerPluginStart } from '../../../../../file_data_visualizer/public';
+import type { DataVisualizerPluginStart } from '../../../../../data_visualizer/public';
 import type { LensPublicStart } from '../../../../../lens/public';
 import { TriggersAndActionsUIPublicPluginStart } from '../../../../../triggers_actions_ui/public';
 
@@ -31,7 +31,7 @@ interface StartPlugins {
   maps?: MapsStartApi;
   lens?: LensPublicStart;
   triggersActionsUi?: TriggersAndActionsUIPublicPluginStart;
-  fileDataVisualizer?: FileDataVisualizerPluginStart;
+  dataVisualizer?: DataVisualizerPluginStart;
 }
 export type StartServices = CoreStart &
   StartPlugins & {
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 88f403cdf0c44..920f56b376747 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
@@ -67,7 +67,7 @@ export const getIndexData = async (
         setRowCount(typeof resp.hits.total === 'number' ? resp.hits.total : resp.hits.total.value);
         setRowCountRelation(
           typeof resp.hits.total === 'number'
-            ? ('eq' as estypes.TotalHitsRelation)
+            ? ('eq' as estypes.SearchTotalHitsRelation)
             : resp.hits.total.relation
         );
         setTableItems(
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 79986e8ddb098..72853ec23fd36 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
@@ -18,7 +18,7 @@ export const CATEGORICAL_TYPES = new Set(['ip', 'keyword']);
 // Regression supports numeric fields. Classification supports categorical, numeric, and boolean.
 export const shouldAddAsDepVarOption = (
   fieldId: string,
-  fieldType: ES_FIELD_TYPES | estypes.RuntimeField['type'],
+  fieldType: ES_FIELD_TYPES | estypes.MappingRuntimeField['type'],
   jobType: AnalyticsJobType
 ) => {
   if (fieldId === EVENT_RATE_FIELD_ID) return false;
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 f3b51acf093ad..ddf88ce79ab5b 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
@@ -45,7 +45,9 @@ interface MLEuiDataGridColumn extends EuiDataGridColumn {
 function getRuntimeFieldColumns(runtimeMappings: RuntimeMappings) {
   return Object.keys(runtimeMappings).map((id) => {
     const field = runtimeMappings[id];
-    const schema = getDataGridSchemaFromESFieldType(field.type as estypes.RuntimeField['type']);
+    const schema = getDataGridSchemaFromESFieldType(
+      field.type as estypes.MappingRuntimeField['type']
+    );
     return { id, schema, isExpandable: schema !== 'boolean', isRuntimeFieldColumn: true };
   });
 }
@@ -194,7 +196,7 @@ export const useIndexData = (
         setRowCount(typeof resp.hits.total === 'number' ? resp.hits.total : resp.hits.total.value);
         setRowCountRelation(
           typeof resp.hits.total === 'number'
-            ? ('eq' as estypes.TotalHitsRelation)
+            ? ('eq' as estypes.SearchTotalHitsRelation)
             : resp.hits.total.relation
         );
         setTableItems(docs);
diff --git a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts
index 5ac7b00e8af67..993aadd3f810f 100644
--- a/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts
+++ b/x-pack/plugins/ml/public/application/data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings.ts
@@ -8,10 +8,6 @@
 import { Direction, EuiBasicTableProps, Pagination, PropertySort } from '@elastic/eui';
 import { useCallback, useMemo } from 'react';
 import { ListingPageUrlState } from '../../../../../../../common/types/common';
-import {
-  DataVisualizerFileBasedAppState,
-  DataVisualizerIndexBasedAppState,
-} from '../../../../../../../common/types/ml_url_generator';
 
 const PAGE_SIZE_OPTIONS = [10, 25, 50];
 
@@ -42,10 +38,7 @@ interface UseTableSettingsReturnValue<T> {
 
 export function useTableSettings<TypeOfItem>(
   items: TypeOfItem[],
-  pageState:
-    | ListingPageUrlState
-    | DataVisualizerIndexBasedAppState
-    | DataVisualizerFileBasedAppState,
+  pageState: ListingPageUrlState,
   updatePageState: (update: Partial<ListingPageUrlState>) => void
 ): UseTableSettingsReturnValue<TypeOfItem> {
   const { pageIndex, pageSize, sortField, sortDirection } = pageState;
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/_index.scss
deleted file mode 100644
index c02883c573ead..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/_index.scss
+++ /dev/null
@@ -1,2 +0,0 @@
-@import 'index_based/index';
-@import 'stats_table/index';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
index 5f9127740709f..3b3b1af30610d 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
+++ b/x-pack/plugins/ml/public/application/datavisualizer/datavisualizer_selector.tsx
@@ -56,7 +56,7 @@ export const DatavisualizerSelector: FC = () => {
       licenseManagement,
       http: { basePath },
       docLinks,
-      fileDataVisualizer,
+      dataVisualizer,
     },
   } = useMlKibana();
 
@@ -68,12 +68,12 @@ export const DatavisualizerSelector: FC = () => {
     licenseManagement.enabled === true &&
     isFullLicense() === false;
 
-  if (fileDataVisualizer === undefined) {
+  if (dataVisualizer === undefined) {
     // eslint-disable-next-line no-console
     console.error('File data visualizer plugin not available');
     return null;
   }
-  const maxFileSize = fileDataVisualizer.getMaxBytesFormatted();
+  const maxFileSize = dataVisualizer.getMaxBytesFormatted();
 
   return (
     <Fragment>
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 3b4cfbf33fbfc..0e9eeda51f786 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
@@ -15,13 +15,13 @@ import { useMlKibana } from '../../contexts/kibana';
 export const FileDataVisualizerPage: FC = () => {
   useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false });
   const {
-    services: { docLinks, fileDataVisualizer },
+    services: { docLinks, dataVisualizer },
   } = useMlKibana();
   const [FileDataVisualizer, setFileDataVisualizer] = useState<FC<{}> | null>(null);
 
   useEffect(() => {
-    if (fileDataVisualizer !== undefined) {
-      const { getFileDataVisualizerComponent } = fileDataVisualizer;
+    if (dataVisualizer !== undefined) {
+      const { getFileDataVisualizerComponent } = dataVisualizer;
       getFileDataVisualizerComponent().then(setFileDataVisualizer);
     }
   }, []);
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/index_based/_index.scss
deleted file mode 100644
index 95a523753dfca..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'components/field_data_row/index';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts
deleted file mode 100644
index 7723277959b1f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/combined_query.ts
+++ /dev/null
@@ -1,11 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export interface CombinedQuery {
-  searchString: string | { [key: string]: any };
-  searchQueryLanguage: string;
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts
deleted file mode 100644
index fe99a63432793..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/common/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FieldHistogramRequestConfig, FieldRequestConfig } from './request';
-export type { CombinedQuery } from './combined_query';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
deleted file mode 100644
index ca393c2d8ce72..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/actions_panel/actions_panel.tsx
+++ /dev/null
@@ -1,215 +0,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, { FC, useState, useEffect } from 'react';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import { EuiSpacer, EuiTitle, EuiFlexGroup } from '@elastic/eui';
-import { LinkCard } from '../../../../components/link_card';
-import { DataRecognizer } from '../../../../components/data_recognizer';
-import { ML_PAGES } from '../../../../../../common/constants/ml_url_generator';
-import {
-  DISCOVER_APP_URL_GENERATOR,
-  DiscoverUrlGeneratorState,
-} from '../../../../../../../../../src/plugins/discover/public';
-import { useMlKibana, useMlLink } from '../../../../contexts/kibana';
-import { isFullLicense } from '../../../../license';
-import { checkPermission } from '../../../../capabilities/check_capabilities';
-import { mlNodesAvailable } from '../../../../ml_nodes_check';
-import { useUrlState } from '../../../../util/url_state';
-import type { IIndexPattern } from '../../../../../../../../../src/plugins/data/common';
-
-interface Props {
-  indexPattern: IIndexPattern;
-  searchString?: string | { [key: string]: any };
-  searchQueryLanguage?: string;
-}
-
-export const ActionsPanel: FC<Props> = ({ indexPattern, searchString, searchQueryLanguage }) => {
-  const [recognizerResultsCount, setRecognizerResultsCount] = useState(0);
-  const [discoverLink, setDiscoverLink] = useState('');
-  const {
-    services: {
-      application: { capabilities },
-      share: {
-        urlGenerators: { getUrlGenerator },
-      },
-    },
-  } = useMlKibana();
-  const [globalState] = useUrlState('_g');
-
-  const recognizerResults = {
-    count: 0,
-    onChange() {
-      setRecognizerResultsCount(recognizerResults.count);
-    },
-  };
-  const mlAvailable = isFullLicense() && checkPermission('canCreateJob') && mlNodesAvailable();
-  const showCreateAnomalyDetectionJob = mlAvailable && indexPattern.timeFieldName !== undefined;
-
-  const createJobLink = useMlLink({
-    page: ML_PAGES.ANOMALY_DETECTION_CREATE_JOB_ADVANCED,
-    pageState: { index: indexPattern.id },
-  });
-
-  const createDataFrameAnalyticsLink = useMlLink({
-    page: ML_PAGES.DATA_FRAME_ANALYTICS_CREATE_JOB,
-    pageState: { index: indexPattern.id },
-  });
-
-  useEffect(() => {
-    let unmounted = false;
-
-    const indexPatternId = indexPattern.id;
-    const getDiscoverUrl = async (): Promise<void> => {
-      const isDiscoverAvailable = capabilities.discover?.show ?? false;
-      if (!isDiscoverAvailable) {
-        return;
-      }
-
-      const state: DiscoverUrlGeneratorState = {
-        indexPatternId,
-      };
-      if (searchString && searchQueryLanguage !== undefined) {
-        state.query = { query: searchString, language: searchQueryLanguage };
-      }
-      if (globalState?.time) {
-        state.timeRange = globalState.time;
-      }
-      if (globalState?.refreshInterval) {
-        state.refreshInterval = globalState.refreshInterval;
-      }
-
-      let discoverUrlGenerator;
-      try {
-        discoverUrlGenerator = getUrlGenerator(DISCOVER_APP_URL_GENERATOR);
-      } catch (error) {
-        // ignore error thrown when url generator is not available
-        return;
-      }
-
-      const discoverUrl = await discoverUrlGenerator.createUrl(state);
-      if (!unmounted) {
-        setDiscoverLink(discoverUrl);
-      }
-    };
-
-    getDiscoverUrl();
-    return () => {
-      unmounted = true;
-    };
-  }, [indexPattern, searchString, searchQueryLanguage, globalState]);
-
-  // Note we use display:none for the DataRecognizer section as it needs to be
-  // passed the recognizerResults object, and then run the recognizer check which
-  // controls whether the recognizer section is ultimately displayed.
-  return (
-    <div data-test-subj="mlDataVisualizerActionsPanel">
-      {mlAvailable && (
-        <>
-          <EuiTitle size="s">
-            <h2>
-              <FormattedMessage
-                id="xpack.ml.datavisualizer.actionsPanel.createJobTitle"
-                defaultMessage="Create job"
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer size="s" />
-          {showCreateAnomalyDetectionJob && (
-            <>
-              <div hidden={recognizerResultsCount === 0}>
-                <EuiSpacer size="m" />
-                <EuiFlexGroup gutterSize="l" responsive={true} wrap={true}>
-                  <DataRecognizer
-                    indexPattern={indexPattern}
-                    savedSearch={null}
-                    results={recognizerResults}
-                  />
-                </EuiFlexGroup>
-                <EuiSpacer size="l" />
-              </div>
-              <EuiSpacer size="m" />
-              <LinkCard
-                href={createJobLink}
-                icon="createAdvancedJob"
-                title={i18n.translate('xpack.ml.datavisualizer.actionsPanel.advancedTitle', {
-                  defaultMessage: 'Advanced anomaly detection',
-                })}
-                description={i18n.translate(
-                  'xpack.ml.datavisualizer.actionsPanel.advancedDescription',
-                  {
-                    defaultMessage:
-                      'Create a job with the full range of options for more advanced use cases.',
-                  }
-                )}
-                data-test-subj="mlDataVisualizerCreateAdvancedJobCard"
-              />
-              <EuiSpacer size="m" />
-            </>
-          )}
-        </>
-      )}
-      {mlAvailable && indexPattern.id !== undefined && createDataFrameAnalyticsLink && (
-        <>
-          <EuiSpacer size="m" />
-          <LinkCard
-            href={createDataFrameAnalyticsLink}
-            icon="classificationJob"
-            description={i18n.translate(
-              'xpack.ml.datavisualizer.actionsPanel.dataframeTypesDescription',
-              {
-                defaultMessage:
-                  'Create outlier detection, regression, or classification analytics.',
-              }
-            )}
-            title={
-              <FormattedMessage
-                id="xpack.ml.datavisualizer.actionsPanel.dataframeAnalyticsTitle"
-                defaultMessage="Data frame analytics"
-              />
-            }
-            data-test-subj="mlDataVisualizerCreateDataFrameAnalyticsCard"
-          />
-          <EuiSpacer size="m" />
-        </>
-      )}
-
-      {discoverLink && (
-        <>
-          <EuiTitle size="s">
-            <h2>
-              <FormattedMessage
-                id="xpack.ml.datavisualizer.actionsPanel.exploreTitle"
-                defaultMessage="Explore your data"
-              />
-            </h2>
-          </EuiTitle>
-          <EuiSpacer size="m" />
-          <LinkCard
-            href={discoverLink}
-            icon="discoverApp"
-            description={i18n.translate(
-              'xpack.ml.datavisualizer.actionsPanel.viewIndexInDiscoverDescription',
-              {
-                defaultMessage: 'Explore the documents in your index.',
-              }
-            )}
-            title={
-              <FormattedMessage
-                id="xpack.ml.datavisualizer.actionsPanel.discoverAppTitle"
-                defaultMessage="Discover"
-              />
-            }
-            data-test-subj="mlDataVisualizerViewInDiscoverCard"
-          />
-        </>
-      )}
-    </div>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx
deleted file mode 100644
index bd8eb09128d1d..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/expanded_row.tsx
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-
-import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types';
-import { LoadingIndicator } from '../field_data_row/loading_indicator';
-import { NotInDocsContent } from '../field_data_row/content_types';
-import {
-  BooleanContent,
-  DateContent,
-  IpContent,
-  KeywordContent,
-  NumberContent,
-  OtherContent,
-  TextContent,
-} from '../../../stats_table/components/field_data_expanded_row';
-import { GeoPointContent } from './geo_point_content';
-import type { CombinedQuery } from '../../common';
-import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
-import type { FieldVisConfig } from '../../../stats_table/types';
-
-export const IndexBasedDataVisualizerExpandedRow = ({
-  item,
-  indexPattern,
-  combinedQuery,
-}: {
-  item: FieldVisConfig;
-  indexPattern: IndexPattern | undefined;
-  combinedQuery: CombinedQuery;
-}) => {
-  const config = item;
-  const { loading, type, existsInDocs, fieldName } = config;
-
-  function getCardContent() {
-    if (existsInDocs === false) {
-      return <NotInDocsContent />;
-    }
-
-    switch (type) {
-      case ML_JOB_FIELD_TYPES.NUMBER:
-        return <NumberContent config={config} />;
-
-      case ML_JOB_FIELD_TYPES.BOOLEAN:
-        return <BooleanContent config={config} />;
-
-      case ML_JOB_FIELD_TYPES.DATE:
-        return <DateContent config={config} />;
-
-      case ML_JOB_FIELD_TYPES.GEO_POINT:
-      case ML_JOB_FIELD_TYPES.GEO_SHAPE:
-        return (
-          <GeoPointContent
-            config={config}
-            indexPattern={indexPattern}
-            combinedQuery={combinedQuery}
-          />
-        );
-
-      case ML_JOB_FIELD_TYPES.IP:
-        return <IpContent config={config} />;
-
-      case ML_JOB_FIELD_TYPES.KEYWORD:
-        return <KeywordContent config={config} />;
-
-      case ML_JOB_FIELD_TYPES.TEXT:
-        return <TextContent config={config} />;
-
-      default:
-        return <OtherContent config={config} />;
-    }
-  }
-
-  return (
-    <div
-      className="mlDataVisualizerFieldExpandedRow"
-      data-test-subj={`mlDataVisualizerFieldExpandedRow-${fieldName}`}
-    >
-      {loading === true ? <LoadingIndicator /> : getCardContent()}
-    </div>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx
deleted file mode 100644
index 646a81b127bcc..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/geo_point_content.tsx
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useEffect, useState } from 'react';
-
-import { EuiFlexItem } from '@elastic/eui';
-import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list';
-import { MlEmbeddedMapComponent } from '../../../../components/ml_embedded_map';
-import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types';
-import { ES_GEO_FIELD_TYPE } from '../../../../../../../maps/common/constants';
-import { useMlKibana } from '../../../../contexts/kibana';
-import { DocumentStatsTable } from '../../../stats_table/components/field_data_expanded_row/document_stats';
-import { ExpandedRowContent } from '../../../stats_table/components/field_data_expanded_row/expanded_row_content';
-import type { CombinedQuery } from '../../common';
-import type { IndexPattern } from '../../../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
-import type { LayerDescriptor } from '../../../../../../../maps/common/descriptor_types';
-import type { FieldVisConfig } from '../../../stats_table/types';
-
-export const GeoPointContent: FC<{
-  config: FieldVisConfig;
-  indexPattern: IndexPattern | undefined;
-  combinedQuery: CombinedQuery;
-}> = ({ config, indexPattern, combinedQuery }) => {
-  const { stats } = config;
-  const [layerList, setLayerList] = useState<LayerDescriptor[]>([]);
-  const {
-    services: { maps: mapsPlugin },
-  } = useMlKibana();
-
-  // Update the layer list  with updated geo points upon refresh
-  useEffect(() => {
-    async function updateIndexPatternSearchLayer() {
-      if (
-        indexPattern?.id !== undefined &&
-        config !== undefined &&
-        config.fieldName !== undefined &&
-        (config.type === ML_JOB_FIELD_TYPES.GEO_POINT ||
-          config.type === ML_JOB_FIELD_TYPES.GEO_SHAPE)
-      ) {
-        const params = {
-          indexPatternId: indexPattern.id,
-          geoFieldName: config.fieldName,
-          geoFieldType: config.type as ES_GEO_FIELD_TYPE,
-          query: {
-            query: combinedQuery.searchString,
-            language: combinedQuery.searchQueryLanguage,
-          },
-        };
-        const searchLayerDescriptor = mapsPlugin
-          ? await mapsPlugin.createLayerDescriptors.createESSearchSourceLayerDescriptor(params)
-          : null;
-        if (searchLayerDescriptor) {
-          setLayerList([...layerList, searchLayerDescriptor]);
-        }
-      }
-    }
-    updateIndexPatternSearchLayer();
-  }, [indexPattern, config.fieldName, combinedQuery]);
-
-  if (stats?.examples === undefined) return null;
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVIndexBasedMapContent'}>
-      <DocumentStatsTable config={config} />
-
-      <EuiFlexItem style={{ maxWidth: '50%' }}>
-        <ExamplesList examples={stats.examples} />
-      </EuiFlexItem>
-      <EuiFlexItem className={'mlDataVisualizerMapWrapper'}>
-        <MlEmbeddedMapComponent layerList={layerList} />
-      </EuiFlexItem>
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/index.ts
deleted file mode 100644
index d251dc7b6d333..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/expanded_row/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { IndexBasedDataVisualizerExpandedRow } from './expanded_row';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/_index.scss
deleted file mode 100644
index 38327dc51bd97..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/_index.scss
+++ /dev/null
@@ -1 +0,0 @@
-@import 'top_values/top_values';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts
deleted file mode 100644
index 57675927ce816..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/action_menu/actions.ts
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-import { Action } from '@elastic/eui/src/components/basic_table/action_types';
-import { getCompatibleLensDataType, getLensAttributes } from './lens_utils';
-import type { CombinedQuery } from '../../../common';
-import type { IIndexPattern } from '../../../../../../../../../../src/plugins/data/common/index_patterns';
-import type { LensPublicStart } from '../../../../../../../../lens/public';
-import type { FieldVisConfig } from '../../../../stats_table/types';
-
-export function getActions(
-  indexPattern: IIndexPattern,
-  lensPlugin: LensPublicStart,
-  combinedQuery: CombinedQuery
-): Array<Action<FieldVisConfig>> {
-  const canUseLensEditor = lensPlugin.canUseEditor();
-  return [
-    {
-      name: i18n.translate('xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensTitle', {
-        defaultMessage: 'Explore in Lens',
-      }),
-      description: i18n.translate(
-        'xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensDescription',
-        {
-          defaultMessage: 'Explore in Lens',
-        }
-      ),
-      type: 'icon',
-      icon: 'lensApp',
-      available: (item: FieldVisConfig) =>
-        getCompatibleLensDataType(item.type) !== undefined && canUseLensEditor,
-      onClick: (item: FieldVisConfig) => {
-        const lensAttributes = getLensAttributes(indexPattern, combinedQuery, item);
-        if (lensAttributes) {
-          lensPlugin.navigateToPrefilledEditor({
-            id: `ml-dataVisualizer-${item.fieldName}`,
-            attributes: lensAttributes,
-          });
-        }
-      },
-      'data-test-subj': 'mlActionButtonViewInLens',
-    },
-  ];
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/choropleth_map.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/choropleth_map.tsx
deleted file mode 100644
index 8b7cbf83f7996..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/choropleth_map.tsx
+++ /dev/null
@@ -1,126 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useMemo } from 'react';
-import { EuiFlexItem, EuiSpacer, EuiText, htmlIdGenerator } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  FIELD_ORIGIN,
-  SOURCE_TYPES,
-  STYLE_TYPE,
-  COLOR_MAP_TYPE,
-} from '../../../../../../../../maps/common/constants';
-import { EMSTermJoinConfig } from '../../../../../../../../maps/public';
-import { FieldVisStats } from '../../../../stats_table/types';
-import { VectorLayerDescriptor } from '../../../../../../../../maps/common/descriptor_types';
-import { MlEmbeddedMapComponent } from '../../../../../components/ml_embedded_map';
-
-export const getChoroplethTopValuesLayer = (
-  fieldName: string,
-  topValues: Array<{ key: any; doc_count: number }>,
-  { layerId, field }: EMSTermJoinConfig
-): VectorLayerDescriptor => {
-  return {
-    id: htmlIdGenerator()(),
-    label: i18n.translate('xpack.ml.dataviz.choroplethMap.topValuesCount', {
-      defaultMessage: 'Top values count for {fieldName}',
-      values: { fieldName },
-    }),
-    joins: [
-      {
-        // Left join is the id from the type of field (e.g. world_countries)
-        leftField: field,
-        right: {
-          id: 'anomaly_count',
-          type: SOURCE_TYPES.TABLE_SOURCE,
-          __rows: topValues,
-          __columns: [
-            {
-              name: 'key',
-              type: 'string',
-            },
-            {
-              name: 'doc_count',
-              type: 'number',
-            },
-          ],
-          // Right join/term is the field in the doc you’re trying to join it to (foreign key - e.g. US)
-          term: 'key',
-        },
-      },
-    ],
-    sourceDescriptor: {
-      type: 'EMS_FILE',
-      id: layerId,
-    },
-    style: {
-      type: 'VECTOR',
-      // @ts-ignore missing style properties. Remove once 'VectorLayerDescriptor' type is updated
-      properties: {
-        icon: { type: STYLE_TYPE.STATIC, options: { value: 'marker' } },
-        fillColor: {
-          type: STYLE_TYPE.DYNAMIC,
-          options: {
-            color: 'Blue to Red',
-            colorCategory: 'palette_0',
-            fieldMetaOptions: { isEnabled: true, sigma: 3 },
-            type: COLOR_MAP_TYPE.ORDINAL,
-            field: {
-              name: 'doc_count',
-              origin: FIELD_ORIGIN.JOIN,
-            },
-            useCustomColorRamp: false,
-          },
-        },
-        lineColor: {
-          type: STYLE_TYPE.DYNAMIC,
-          options: { fieldMetaOptions: { isEnabled: true } },
-        },
-        lineWidth: { type: STYLE_TYPE.STATIC, options: { size: 1 } },
-      },
-      isTimeAware: true,
-    },
-    type: 'VECTOR',
-  };
-};
-
-interface Props {
-  stats: FieldVisStats | undefined;
-  suggestion: EMSTermJoinConfig;
-}
-
-export const ChoroplethMap: FC<Props> = ({ stats, suggestion }) => {
-  const { fieldName, isTopValuesSampled, topValues, topValuesSamplerShardSize } = stats!;
-
-  const layerList: VectorLayerDescriptor[] = useMemo(
-    () => [getChoroplethTopValuesLayer(fieldName || '', topValues || [], suggestion)],
-    [suggestion, stats]
-  );
-
-  return (
-    <EuiFlexItem data-test-subj={'mlChoroplethMapTopValues'}>
-      <div style={{ width: '100%', minHeight: 300 }}>
-        <MlEmbeddedMapComponent layerList={layerList} />
-      </div>
-      {isTopValuesSampled === true && (
-        <>
-          <EuiSpacer size="xs" />
-          <EuiText size="xs" textAlign={'left'}>
-            <FormattedMessage
-              id="xpack.ml.fieldDataCard.choroplethMapTopValues.calculatedFromSampleDescription"
-              defaultMessage="Calculated from sample of {topValuesSamplerShardSize} documents per shard"
-              values={{
-                topValuesSamplerShardSize,
-              }}
-            />
-          </EuiText>
-        </>
-      )}
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/index.ts
deleted file mode 100644
index 6159b5e2ad9bb..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/choropleth_map/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { ChoroplethMap } from './choropleth_map';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/index.ts
deleted file mode 100644
index e827e4390705c..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { DocumentCountContent } from './document_count_content';
-export { NotInDocsContent } from './not_in_docs_content';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/not_in_docs_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/not_in_docs_content.tsx
deleted file mode 100644
index e3bb4323ce6a8..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/content_types/not_in_docs_content.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, { FC, Fragment } from 'react';
-import { EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-
-export const NotInDocsContent: FC = () => (
-  <Fragment>
-    <EuiSpacer size="xxl" />
-    <EuiText textAlign="center">
-      <EuiIcon type="alert" />
-    </EuiText>
-
-    <EuiSpacer size="s" />
-    <EuiText textAlign="center">
-      <FormattedMessage
-        id="xpack.ml.fieldDataCard.fieldNotInDocsLabel"
-        defaultMessage="This field does not appear in any documents for the selected time range"
-      />
-    </EuiText>
-  </Fragment>
-);
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx
deleted file mode 100644
index 7804c4bddf266..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/examples_list.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-
-import { EuiListGroup, EuiListGroupItem } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { ExpandedRowFieldHeader } from '../../../../stats_table/components/expanded_row_field_header';
-interface Props {
-  examples: Array<string | object>;
-}
-
-export const ExamplesList: FC<Props> = ({ examples }) => {
-  if (examples === undefined || examples === null || !Array.isArray(examples)) {
-    return null;
-  }
-  let examplesContent;
-  if (examples.length === 0) {
-    examplesContent = (
-      <FormattedMessage
-        id="xpack.ml.fieldDataCard.examplesList.noExamplesMessage"
-        defaultMessage="No examples were obtained for this field"
-      />
-    );
-  } else {
-    examplesContent = examples.map((example, i) => {
-      return (
-        <EuiListGroupItem
-          className="mlFieldDataCard__codeContent"
-          size="s"
-          key={`example_${i}`}
-          label={typeof example === 'string' ? example : JSON.stringify(example)}
-        />
-      );
-    });
-  }
-
-  return (
-    <div data-test-subj="mlFieldDataExamplesList">
-      <ExpandedRowFieldHeader>
-        <FormattedMessage
-          id="xpack.ml.fieldDataCard.examplesList.title"
-          defaultMessage="{numExamples, plural, one {Value} other {Examples}}"
-          values={{
-            numExamples: examples.length,
-          }}
-        />
-      </ExpandedRowFieldHeader>
-      <EuiListGroup showToolTips={true} maxWidth={'s'} gutterSize={'none'} flush={true}>
-        {examplesContent}
-      </EuiListGroup>
-    </div>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/index.ts
deleted file mode 100644
index 966c844987002..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/examples_list/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { ExamplesList } from './examples_list';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/_top_values.scss b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/_top_values.scss
deleted file mode 100644
index 75ee6aef1b7eb..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/_top_values.scss
+++ /dev/null
@@ -1,19 +0,0 @@
-.mlFieldDataTopValuesContainer {
-  padding-top: $euiSizeXS;
-}
-
-.mlTopValuesValueLabelContainer {
-  margin-right: $euiSizeM;
-  &.mlTopValuesValueLabelContainer--small {
-    width:70px;
-  }
-
-  &.mlTopValuesValueLabelContainer--large {
-    width: 200px;
-  }
-}
-
-.mlTopValuesPercentLabelContainer {
-  margin-left: $euiSizeM;
-  width:70px;
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/index.ts
deleted file mode 100644
index c006b37fe2794..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { TopValues } from './top_values';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx
deleted file mode 100644
index 2d423b9dbb751..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/field_data_row/top_values/top_values.tsx
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, Fragment } from 'react';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiProgress,
-  EuiSpacer,
-  EuiText,
-  EuiToolTip,
-} from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import classNames from 'classnames';
-import { kibanaFieldFormat } from '../../../../../formatters/kibana_field_format';
-import { roundToDecimalPlace } from '../../../../../formatters/round_to_decimal_place';
-import { ExpandedRowFieldHeader } from '../../../../stats_table/components/expanded_row_field_header';
-import { FieldVisStats } from '../../../../stats_table/types';
-
-interface Props {
-  stats: FieldVisStats | undefined;
-  fieldFormat?: any;
-  barColor?: 'primary' | 'secondary' | 'danger' | 'subdued' | 'accent';
-  compressed?: boolean;
-}
-
-function getPercentLabel(docCount: number, topValuesSampleSize: number): string {
-  const percent = (100 * docCount) / topValuesSampleSize;
-  if (percent >= 0.1) {
-    return `${roundToDecimalPlace(percent, 1)}%`;
-  } else {
-    return '< 0.1%';
-  }
-}
-
-export const TopValues: FC<Props> = ({ stats, fieldFormat, barColor, compressed }) => {
-  if (stats === undefined) return null;
-  const {
-    topValues,
-    topValuesSampleSize,
-    topValuesSamplerShardSize,
-    count,
-    isTopValuesSampled,
-  } = stats;
-  const progressBarMax = isTopValuesSampled === true ? topValuesSampleSize : count;
-  return (
-    <EuiFlexItem data-test-subj={'mlTopValues'}>
-      <ExpandedRowFieldHeader>
-        <FormattedMessage id="xpack.ml.fieldDataCard.topValuesLabel" defaultMessage="Top values" />
-      </ExpandedRowFieldHeader>
-
-      <div data-test-subj="mlFieldDataTopValues" className={'mlFieldDataTopValuesContainer'}>
-        {Array.isArray(topValues) &&
-          topValues.map((value) => (
-            <EuiFlexGroup gutterSize="xs" alignItems="center" key={value.key}>
-              <EuiFlexItem
-                grow={false}
-                className={classNames(
-                  'eui-textTruncate',
-                  'mlTopValuesValueLabelContainer',
-                  `mlTopValuesValueLabelContainer--${compressed === true ? 'small' : 'large'}`
-                )}
-              >
-                <EuiToolTip content={kibanaFieldFormat(value.key, fieldFormat)} position="right">
-                  <EuiText size="xs" textAlign={'right'} color="subdued">
-                    {kibanaFieldFormat(value.key, fieldFormat)}
-                  </EuiText>
-                </EuiToolTip>
-              </EuiFlexItem>
-              <EuiFlexItem data-test-subj="mlFieldDataTopValueBar">
-                <EuiProgress
-                  value={value.doc_count}
-                  max={progressBarMax}
-                  color={barColor}
-                  size="m"
-                />
-              </EuiFlexItem>
-              {progressBarMax !== undefined && (
-                <EuiFlexItem
-                  grow={false}
-                  className={classNames('eui-textTruncate', 'mlTopValuesPercentLabelContainer')}
-                >
-                  <EuiText size="xs" textAlign="left" color="subdued">
-                    {getPercentLabel(value.doc_count, progressBarMax)}
-                  </EuiText>
-                </EuiFlexItem>
-              )}
-            </EuiFlexGroup>
-          ))}
-        {isTopValuesSampled === true && (
-          <Fragment>
-            <EuiSpacer size="xs" />
-            <EuiText size="xs" textAlign={'left'}>
-              <FormattedMessage
-                id="xpack.ml.fieldDataCard.topValues.calculatedFromSampleDescription"
-                defaultMessage="Calculated from sample of {topValuesSamplerShardSize} documents per shard"
-                values={{
-                  topValuesSamplerShardSize,
-                }}
-              />
-            </EuiText>
-          </Fragment>
-        )}
-      </div>
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx
deleted file mode 100644
index 15ddf00c4e1d3..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/search_panel/field_type_filter.tsx
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useMemo } from 'react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { Option, MultiSelectPicker } from '../../../../components/multi_select_picker';
-import { FieldTypeIcon } from '../../../../components/field_type_icon';
-import { ML_JOB_FIELD_TYPES } from '../../../../../../common/constants/field_types';
-import type { MlJobFieldType } from '../../../../../../common/types/field_types';
-
-const ML_JOB_FIELD_TYPES_OPTIONS = {
-  [ML_JOB_FIELD_TYPES.BOOLEAN]: { name: 'Boolean', icon: 'tokenBoolean' },
-  [ML_JOB_FIELD_TYPES.DATE]: { name: 'Date', icon: 'tokenDate' },
-  [ML_JOB_FIELD_TYPES.GEO_POINT]: { name: 'Geo point', icon: 'tokenGeo' },
-  [ML_JOB_FIELD_TYPES.GEO_SHAPE]: { name: 'Geo shape', icon: 'tokenGeo' },
-  [ML_JOB_FIELD_TYPES.IP]: { name: 'IP address', icon: 'tokenIP' },
-  [ML_JOB_FIELD_TYPES.KEYWORD]: { name: 'Keyword', icon: 'tokenKeyword' },
-  [ML_JOB_FIELD_TYPES.NUMBER]: { name: 'Number', icon: 'tokenNumber' },
-  [ML_JOB_FIELD_TYPES.TEXT]: { name: 'Text', icon: 'tokenString' },
-  [ML_JOB_FIELD_TYPES.UNKNOWN]: { name: 'Unknown' },
-};
-
-export const DatavisualizerFieldTypeFilter: FC<{
-  indexedFieldTypes: MlJobFieldType[];
-  setVisibleFieldTypes(q: string[]): void;
-  visibleFieldTypes: string[];
-}> = ({ indexedFieldTypes, setVisibleFieldTypes, visibleFieldTypes }) => {
-  const options: Option[] = useMemo(() => {
-    return indexedFieldTypes.map((indexedFieldName) => {
-      const item = ML_JOB_FIELD_TYPES_OPTIONS[indexedFieldName];
-
-      return {
-        value: indexedFieldName,
-        name: (
-          <EuiFlexGroup>
-            <EuiFlexItem grow={true}> {item.name}</EuiFlexItem>
-            {indexedFieldName && (
-              <EuiFlexItem grow={false}>
-                <FieldTypeIcon
-                  type={indexedFieldName}
-                  fieldName={item.name}
-                  tooltipEnabled={false}
-                  needsAria={true}
-                />
-              </EuiFlexItem>
-            )}
-          </EuiFlexGroup>
-        ),
-      };
-    });
-  }, [indexedFieldTypes]);
-  const fieldTypeTitle = useMemo(
-    () =>
-      i18n.translate('xpack.ml.dataVisualizer.indexBased.fieldTypeSelect', {
-        defaultMessage: 'Field type',
-      }),
-    []
-  );
-  return (
-    <MultiSelectPicker
-      title={fieldTypeTitle}
-      options={options}
-      onChange={setVisibleFieldTypes}
-      checkedOptions={visibleFieldTypes}
-      dataTestSubj={'mlDataVisualizerFieldTypeSelect'}
-    />
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/index.ts
deleted file mode 100644
index 167988782ba51..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/components/total_count_header/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { TotalCountHeader } from './total_count_header';
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 0da7d3d6b63d8..a5fabc12c83df 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,11 +5,9 @@
  * 2.0.
  */
 
-import { i18n } from '@kbn/i18n';
-
 import { CoreSetup } from 'src/core/public';
 
-import { IndexPattern, KBN_FIELD_TYPES } from '../../../../../../../../src/plugins/data/public';
+import { IndexPattern } from '../../../../../../../../src/plugins/data/public';
 
 import { SavedSearchQuery } from '../../../contexts/ml';
 import { OMIT_FIELDS } from '../../../../../common/constants/field_types';
@@ -17,12 +15,8 @@ import { IndexPatternTitle } from '../../../../../common/types/kibana';
 import { DEFAULT_SAMPLER_SHARD_SIZE } from '../../../../../common/constants/field_histograms';
 
 import { ml } from '../../../services/ml_api_service';
-import { FieldHistogramRequestConfig, FieldRequestConfig } from '../common';
+import { FieldHistogramRequestConfig } from '../common/request';
 import { RuntimeMappings } from '../../../../../common/types/fields';
-import {
-  ToastNotificationService,
-  toastNotificationServiceProvider,
-} from '../../../services/toast_notification_service';
 
 // Maximum number of examples to obtain for text type fields.
 const MAX_EXAMPLES_DEFAULT: number = 10;
@@ -32,79 +26,14 @@ export class DataLoader {
   private _runtimeMappings: RuntimeMappings;
   private _indexPatternTitle: IndexPatternTitle = '';
   private _maxExamples: number = MAX_EXAMPLES_DEFAULT;
-  private _toastNotificationsService: ToastNotificationService;
 
   constructor(
     indexPattern: IndexPattern,
-    toastNotifications: CoreSetup['notifications']['toasts']
+    toastNotifications?: CoreSetup['notifications']['toasts']
   ) {
     this._indexPattern = indexPattern;
     this._runtimeMappings = this._indexPattern.getComputedFields().runtimeFields as RuntimeMappings;
     this._indexPatternTitle = indexPattern.title;
-    this._toastNotificationsService = toastNotificationServiceProvider(toastNotifications);
-  }
-
-  async loadOverallData(
-    query: string | SavedSearchQuery,
-    samplerShardSize: number,
-    earliest: number | undefined,
-    latest: number | undefined
-  ): Promise<any> {
-    const aggregatableFields: string[] = [];
-    const nonAggregatableFields: string[] = [];
-    this._indexPattern.fields.forEach((field) => {
-      const fieldName = field.displayName !== undefined ? field.displayName : field.name;
-      if (this.isDisplayField(fieldName) === true) {
-        if (field.aggregatable === true && field.type !== KBN_FIELD_TYPES.GEO_SHAPE) {
-          aggregatableFields.push(fieldName);
-        } else {
-          nonAggregatableFields.push(fieldName);
-        }
-      }
-    });
-
-    // Need to find:
-    // 1. List of aggregatable fields that do exist in docs
-    // 2. List of aggregatable fields that do not exist in docs
-    // 3. List of non-aggregatable fields that do exist in docs.
-    // 4. List of non-aggregatable fields that do not exist in docs.
-    const stats = await ml.getVisualizerOverallStats({
-      indexPatternTitle: this._indexPatternTitle,
-      query,
-      timeFieldName: this._indexPattern.timeFieldName,
-      samplerShardSize,
-      earliest,
-      latest,
-      aggregatableFields,
-      nonAggregatableFields,
-      runtimeMappings: this._runtimeMappings,
-    });
-
-    return stats;
-  }
-
-  async loadFieldStats(
-    query: string | SavedSearchQuery,
-    samplerShardSize: number,
-    earliest: number | undefined,
-    latest: number | undefined,
-    fields: FieldRequestConfig[],
-    interval?: number
-  ): Promise<any[]> {
-    const stats = await ml.getVisualizerFieldStats({
-      indexPatternTitle: this._indexPatternTitle,
-      query,
-      timeFieldName: this._indexPattern.timeFieldName,
-      earliest,
-      latest,
-      samplerShardSize,
-      interval,
-      fields,
-      maxExamples: this._maxExamples,
-      runtimeMappings: this._runtimeMappings,
-    });
-
-    return stats;
   }
 
   async loadFieldHistograms(
@@ -124,34 +53,6 @@ export class DataLoader {
     return stats;
   }
 
-  displayError(err: any) {
-    if (err.statusCode === 500) {
-      this._toastNotificationsService.displayErrorToast(
-        err,
-        i18n.translate('xpack.ml.datavisualizer.dataLoader.internalServerErrorMessage', {
-          defaultMessage:
-            'Error loading data in index {index}. {message}. ' +
-            'The request may have timed out. Try using a smaller sample size or narrowing the time range.',
-          values: {
-            index: this._indexPattern.title,
-            message: err.message,
-          },
-        })
-      );
-    } else {
-      this._toastNotificationsService.displayErrorToast(
-        err,
-        i18n.translate('xpack.ml.datavisualizer.page.errorLoadingDataMessage', {
-          defaultMessage: 'Error loading data in index {index}. {message}',
-          values: {
-            index: this._indexPattern.title,
-            message: err.message,
-          },
-        })
-      );
-    }
-  }
-
   public set maxExamples(max: number) {
     this._maxExamples = max;
   }
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts
index 99a826236c34f..1216e3f7f4c17 100644
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index.ts
@@ -5,4 +5,4 @@
  * 2.0.
  */
 
-export { Page } from './page';
+export { IndexDataVisualizerPage } from './index_data_visualizer';
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
new file mode 100644
index 0000000000000..af803d32e5139
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/datavisualizer/index_based/index_data_visualizer.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, { FC, Fragment, useEffect, useState } from 'react';
+import { useMlKibana, useTimefilter } from '../../contexts/kibana';
+import { NavigationMenu } from '../../components/navigation_menu';
+import { HelpMenu } from '../../components/help_menu';
+import type { IndexDataVisualizerViewProps } from '../../../../../data_visualizer/public';
+export const IndexDataVisualizerPage: FC = () => {
+  useTimefilter({ timeRangeSelector: false, autoRefreshSelector: false });
+  const {
+    services: { docLinks, dataVisualizer },
+  } = useMlKibana();
+  const [
+    IndexDataVisualizer,
+    setIndexDataVisualizer,
+  ] = useState<FC<IndexDataVisualizerViewProps> | null>(null);
+
+  useEffect(() => {
+    if (dataVisualizer !== undefined) {
+      const { getIndexDataVisualizerComponent } = dataVisualizer;
+      getIndexDataVisualizerComponent().then(setIndexDataVisualizer);
+    }
+  }, []);
+  return IndexDataVisualizer ? (
+    <Fragment>
+      <NavigationMenu tabId="datavisualizer" />
+      {IndexDataVisualizer}
+      <HelpMenu docLink={docLinks.links.ml.guide} />
+    </Fragment>
+  ) : (
+    <Fragment />
+  );
+};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx b/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx
deleted file mode 100644
index 19a4cb7b87c0f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/index_based/page.tsx
+++ /dev/null
@@ -1,810 +0,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, { FC, Fragment, useEffect, useMemo, useState, useCallback } from 'react';
-import { merge } from 'rxjs';
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiPage,
-  EuiPageBody,
-  EuiPageContentBody,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
-  EuiPanel,
-  EuiSpacer,
-  EuiTitle,
-} from '@elastic/eui';
-import { EuiTableActionsColumnType } from '@elastic/eui/src/components/basic_table/table_types';
-import { FormattedMessage } from '@kbn/i18n/react';
-import {
-  IFieldType,
-  KBN_FIELD_TYPES,
-  esQuery,
-  esKuery,
-  UI_SETTINGS,
-  Query,
-} from '../../../../../../../src/plugins/data/public';
-import { SavedSearchSavedObject } from '../../../../common/types/kibana';
-import { NavigationMenu } from '../../components/navigation_menu';
-import { DatePickerWrapper } from '../../components/navigation_menu/date_picker_wrapper';
-import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types';
-import { SEARCH_QUERY_LANGUAGE, SearchQueryLanguage } from '../../../../common/constants/search';
-import { FullTimeRangeSelector } from '../../components/full_time_range_selector';
-import { mlTimefilterRefresh$ } from '../../services/timefilter_refresh_service';
-import { useMlContext } from '../../contexts/ml';
-import { kbnTypeToMLJobType } from '../../util/field_types_utils';
-import { useNotifications, useTimefilter } from '../../contexts/kibana';
-import { timeBasedIndexCheck, getQueryFromSavedSearch } from '../../util/index_utils';
-import { getTimeBucketsFromCache } from '../../util/time_buckets';
-import { usePageUrlState, useUrlState } from '../../util/url_state';
-import { ActionsPanel } from './components/actions_panel';
-import { SearchPanel } from './components/search_panel';
-import { DocumentCountContent } from './components/field_data_row/content_types/document_count_content';
-import { DataVisualizerTable, ItemIdToExpandedRowMap } from '../stats_table';
-import { FieldCountPanel } from './components/field_count_panel';
-import { ML_PAGES } from '../../../../common/constants/ml_url_generator';
-import { DataLoader } from './data_loader';
-import type { FieldRequestConfig } from './common';
-import type { DataVisualizerIndexBasedAppState } from '../../../../common/types/ml_url_generator';
-import type { OverallStats } from '../../../../common/types/datavisualizer';
-import { MlJobFieldType } from '../../../../common/types/field_types';
-import { HelpMenu } from '../../components/help_menu';
-import { useMlKibana } from '../../contexts/kibana';
-import { IndexBasedDataVisualizerExpandedRow } from './components/expanded_row';
-import { FieldVisConfig } from '../stats_table/types';
-import type {
-  MetricFieldsStats,
-  TotalFieldsStats,
-} from '../stats_table/components/field_count_stats';
-import { getActions } from './components/field_data_row/action_menu/actions';
-
-interface DataVisualizerPageState {
-  overallStats: OverallStats;
-  metricConfigs: FieldVisConfig[];
-  totalMetricFieldCount: number;
-  populatedMetricFieldCount: number;
-  metricsLoaded: boolean;
-  nonMetricConfigs: FieldVisConfig[];
-  nonMetricsLoaded: boolean;
-  documentCountStats?: FieldVisConfig;
-}
-
-const defaultSearchQuery = {
-  match_all: {},
-};
-
-function getDefaultPageState(): DataVisualizerPageState {
-  return {
-    overallStats: {
-      totalCount: 0,
-      aggregatableExistsFields: [],
-      aggregatableNotExistsFields: [],
-      nonAggregatableExistsFields: [],
-      nonAggregatableNotExistsFields: [],
-    },
-    metricConfigs: [],
-    totalMetricFieldCount: 0,
-    populatedMetricFieldCount: 0,
-    metricsLoaded: false,
-    nonMetricConfigs: [],
-    nonMetricsLoaded: false,
-    documentCountStats: undefined,
-  };
-}
-export const getDefaultDataVisualizerListState = (): Required<DataVisualizerIndexBasedAppState> => ({
-  pageIndex: 0,
-  pageSize: 10,
-  sortField: 'fieldName',
-  sortDirection: 'asc',
-  visibleFieldTypes: [],
-  visibleFieldNames: [],
-  samplerShardSize: 5000,
-  searchString: '',
-  searchQuery: defaultSearchQuery,
-  searchQueryLanguage: SEARCH_QUERY_LANGUAGE.KUERY,
-  showDistributions: true,
-  showAllFields: false,
-  showEmptyFields: false,
-});
-
-export const Page: FC = () => {
-  const mlContext = useMlContext();
-  const restorableDefaults = getDefaultDataVisualizerListState();
-  const {
-    services: { lens: lensPlugin, docLinks },
-  } = useMlKibana();
-
-  const [dataVisualizerListState, setDataVisualizerListState] = usePageUrlState(
-    ML_PAGES.DATA_VISUALIZER_INDEX_VIEWER,
-    restorableDefaults
-  );
-  const [currentSavedSearch, setCurrentSavedSearch] = useState(mlContext.currentSavedSearch);
-
-  const { combinedQuery, currentIndexPattern, kibanaConfig } = mlContext;
-  const timefilter = useTimefilter({
-    timeRangeSelector: currentIndexPattern.timeFieldName !== undefined,
-    autoRefreshSelector: true,
-  });
-
-  const { toasts } = useNotifications();
-  const dataLoader = useMemo(() => new DataLoader(currentIndexPattern, toasts), [
-    currentIndexPattern,
-  ]);
-
-  const [globalState, setGlobalState] = useUrlState('_g');
-  useEffect(() => {
-    if (globalState?.time !== undefined) {
-      timefilter.setTime({
-        from: globalState.time.from,
-        to: globalState.time.to,
-      });
-    }
-  }, [globalState?.time?.from, globalState?.time?.to]);
-  useEffect(() => {
-    if (globalState?.refreshInterval !== undefined) {
-      timefilter.setRefreshInterval(globalState.refreshInterval);
-    }
-  }, [globalState?.refreshInterval?.pause, globalState?.refreshInterval?.value]);
-
-  const [lastRefresh, setLastRefresh] = useState(0);
-
-  useEffect(() => {
-    timeBasedIndexCheck(currentIndexPattern, true);
-  }, []);
-
-  // Obtain the list of non metric field types which appear in the index pattern.
-  let indexedFieldTypes: MlJobFieldType[] = [];
-  const indexPatternFields: IFieldType[] = currentIndexPattern.fields;
-  indexPatternFields.forEach((field) => {
-    if (field.scripted !== true) {
-      const dataVisualizerType: MlJobFieldType | undefined = kbnTypeToMLJobType(field);
-      if (dataVisualizerType !== undefined && !indexedFieldTypes.includes(dataVisualizerType)) {
-        indexedFieldTypes.push(dataVisualizerType);
-      }
-    }
-  });
-  indexedFieldTypes = indexedFieldTypes.sort();
-
-  const defaults = getDefaultPageState();
-
-  const { searchQueryLanguage, searchString, searchQuery } = useMemo(() => {
-    const searchData = extractSearchData(currentSavedSearch);
-    if (searchData === undefined || dataVisualizerListState.searchString !== '') {
-      return {
-        searchQuery: dataVisualizerListState.searchQuery,
-        searchString: dataVisualizerListState.searchString,
-        searchQueryLanguage: dataVisualizerListState.searchQueryLanguage,
-      };
-    } else {
-      return {
-        searchQuery: searchData.searchQuery,
-        searchString: searchData.searchString,
-        searchQueryLanguage: searchData.queryLanguage,
-      };
-    }
-  }, [currentSavedSearch, dataVisualizerListState]);
-
-  const setSearchParams = (searchParams: {
-    searchQuery: Query['query'];
-    searchString: Query['query'];
-    queryLanguage: SearchQueryLanguage;
-  }) => {
-    // When the user loads saved search and then clear or modify the query
-    // we should remove the saved search and replace it with the index pattern id
-    if (currentSavedSearch !== null) {
-      setCurrentSavedSearch(null);
-    }
-
-    setDataVisualizerListState({
-      ...dataVisualizerListState,
-      searchQuery: searchParams.searchQuery,
-      searchString: searchParams.searchString,
-      searchQueryLanguage: searchParams.queryLanguage,
-    });
-  };
-
-  const samplerShardSize =
-    dataVisualizerListState.samplerShardSize ?? restorableDefaults.samplerShardSize;
-  const setSamplerShardSize = (value: number) => {
-    setDataVisualizerListState({ ...dataVisualizerListState, samplerShardSize: value });
-  };
-
-  const visibleFieldTypes =
-    dataVisualizerListState.visibleFieldTypes ?? restorableDefaults.visibleFieldTypes;
-  const setVisibleFieldTypes = (values: string[]) => {
-    setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldTypes: values });
-  };
-
-  const visibleFieldNames =
-    dataVisualizerListState.visibleFieldNames ?? restorableDefaults.visibleFieldNames;
-  const setVisibleFieldNames = (values: string[]) => {
-    setDataVisualizerListState({ ...dataVisualizerListState, visibleFieldNames: values });
-  };
-
-  const showEmptyFields =
-    dataVisualizerListState.showEmptyFields ?? restorableDefaults.showEmptyFields;
-  const toggleShowEmptyFields = () => {
-    setDataVisualizerListState({
-      ...dataVisualizerListState,
-      showEmptyFields: !dataVisualizerListState.showEmptyFields,
-    });
-  };
-
-  const [overallStats, setOverallStats] = useState(defaults.overallStats);
-
-  const [documentCountStats, setDocumentCountStats] = useState(defaults.documentCountStats);
-  const [metricConfigs, setMetricConfigs] = useState(defaults.metricConfigs);
-  const [metricsLoaded, setMetricsLoaded] = useState(defaults.metricsLoaded);
-  const [metricsStats, setMetricsStats] = useState<undefined | MetricFieldsStats>();
-
-  const [nonMetricConfigs, setNonMetricConfigs] = useState(defaults.nonMetricConfigs);
-  const [nonMetricsLoaded, setNonMetricsLoaded] = useState(defaults.nonMetricsLoaded);
-
-  useEffect(() => {
-    const timeUpdateSubscription = merge(
-      timefilter.getTimeUpdate$(),
-      mlTimefilterRefresh$
-    ).subscribe(() => {
-      setGlobalState({
-        time: timefilter.getTime(),
-        refreshInterval: timefilter.getRefreshInterval(),
-      });
-      setLastRefresh(Date.now());
-    });
-    return () => {
-      timeUpdateSubscription.unsubscribe();
-    };
-  });
-
-  useEffect(() => {
-    loadOverallStats();
-  }, [searchQuery, samplerShardSize, lastRefresh]);
-
-  useEffect(() => {
-    createMetricCards();
-    createNonMetricCards();
-  }, [overallStats, showEmptyFields]);
-
-  useEffect(() => {
-    loadMetricFieldStats();
-  }, [metricConfigs]);
-
-  useEffect(() => {
-    loadNonMetricFieldStats();
-  }, [nonMetricConfigs]);
-
-  useEffect(() => {
-    createMetricCards();
-  }, [metricsLoaded]);
-
-  useEffect(() => {
-    createNonMetricCards();
-  }, [nonMetricsLoaded]);
-
-  /**
-   * Extract query data from the saved search object.
-   */
-  function extractSearchData(savedSearch: SavedSearchSavedObject | null) {
-    if (!savedSearch) {
-      return undefined;
-    }
-
-    const { query } = getQueryFromSavedSearch(savedSearch);
-    const queryLanguage = query.language as SearchQueryLanguage;
-    const qryString = query.query;
-    let qry;
-    if (queryLanguage === SEARCH_QUERY_LANGUAGE.KUERY) {
-      const ast = esKuery.fromKueryExpression(qryString);
-      qry = esKuery.toElasticsearchQuery(ast, currentIndexPattern);
-    } else {
-      qry = esQuery.luceneStringToDsl(qryString);
-      esQuery.decorateQuery(qry, kibanaConfig.get(UI_SETTINGS.QUERY_STRING_OPTIONS));
-    }
-
-    return {
-      searchQuery: qry,
-      searchString: qryString,
-      queryLanguage,
-    };
-  }
-
-  async function loadOverallStats() {
-    const tf = timefilter as any;
-    let earliest;
-    let latest;
-
-    const activeBounds = tf.getActiveBounds();
-
-    if (currentIndexPattern.timeFieldName !== undefined && activeBounds === undefined) {
-      return;
-    }
-
-    if (currentIndexPattern.timeFieldName !== undefined) {
-      earliest = activeBounds.min.valueOf();
-      latest = activeBounds.max.valueOf();
-    }
-
-    try {
-      const allStats = await dataLoader.loadOverallData(
-        searchQuery,
-        samplerShardSize,
-        earliest,
-        latest
-      );
-      setOverallStats(allStats);
-    } catch (err) {
-      dataLoader.displayError(err);
-    }
-  }
-
-  async function loadMetricFieldStats() {
-    // Only request data for fields that exist in documents.
-    if (metricConfigs.length === 0) {
-      return;
-    }
-
-    const configsToLoad = metricConfigs.filter(
-      (config) => config.existsInDocs === true && config.loading === true
-    );
-    if (configsToLoad.length === 0) {
-      return;
-    }
-
-    // Pass the field name, type and cardinality in the request.
-    // Top values will be obtained on a sample if cardinality > 100000.
-    const existMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => {
-      const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 };
-      if (config.stats !== undefined && config.stats.cardinality !== undefined) {
-        props.cardinality = config.stats.cardinality;
-      }
-      return props;
-    });
-
-    // Obtain the interval to use for date histogram aggregations
-    // (such as the document count chart). Aim for 75 bars.
-    const buckets = getTimeBucketsFromCache();
-
-    const tf = timefilter as any;
-    let earliest: number | undefined;
-    let latest: number | undefined;
-    if (currentIndexPattern.timeFieldName !== undefined) {
-      earliest = tf.getActiveBounds().min.valueOf();
-      latest = tf.getActiveBounds().max.valueOf();
-    }
-
-    const bounds = tf.getActiveBounds();
-    const BAR_TARGET = 75;
-    buckets.setInterval('auto');
-    buckets.setBounds(bounds);
-    buckets.setBarTarget(BAR_TARGET);
-    const aggInterval = buckets.getInterval();
-
-    try {
-      const metricFieldStats = await dataLoader.loadFieldStats(
-        searchQuery,
-        samplerShardSize,
-        earliest,
-        latest,
-        existMetricFields,
-        aggInterval.asMilliseconds()
-      );
-
-      // Add the metric stats to the existing stats in the corresponding config.
-      const configs: FieldVisConfig[] = [];
-      metricConfigs.forEach((config) => {
-        const configWithStats = { ...config };
-        if (config.fieldName !== undefined) {
-          configWithStats.stats = {
-            ...configWithStats.stats,
-            ...metricFieldStats.find(
-              (fieldStats: any) => fieldStats.fieldName === config.fieldName
-            ),
-          };
-          configWithStats.loading = false;
-          configs.push(configWithStats);
-        } else {
-          // Document count card.
-          configWithStats.stats = metricFieldStats.find(
-            (fieldStats: any) => fieldStats.fieldName === undefined
-          );
-
-          if (configWithStats.stats !== undefined) {
-            // Add earliest / latest of timefilter for setting x axis domain.
-            configWithStats.stats.timeRangeEarliest = earliest;
-            configWithStats.stats.timeRangeLatest = latest;
-          }
-          setDocumentCountStats(configWithStats);
-        }
-      });
-
-      setMetricConfigs(configs);
-    } catch (err) {
-      dataLoader.displayError(err);
-    }
-  }
-
-  async function loadNonMetricFieldStats() {
-    // Only request data for fields that exist in documents.
-    if (nonMetricConfigs.length === 0) {
-      return;
-    }
-
-    const configsToLoad = nonMetricConfigs.filter(
-      (config) => config.existsInDocs === true && config.loading === true
-    );
-    if (configsToLoad.length === 0) {
-      return;
-    }
-
-    // Pass the field name, type and cardinality in the request.
-    // Top values will be obtained on a sample if cardinality > 100000.
-    const existNonMetricFields: FieldRequestConfig[] = configsToLoad.map((config) => {
-      const props = { fieldName: config.fieldName, type: config.type, cardinality: 0 };
-      if (config.stats !== undefined && config.stats.cardinality !== undefined) {
-        props.cardinality = config.stats.cardinality;
-      }
-      return props;
-    });
-
-    const tf = timefilter as any;
-    let earliest;
-    let latest;
-    if (currentIndexPattern.timeFieldName !== undefined) {
-      earliest = tf.getActiveBounds().min.valueOf();
-      latest = tf.getActiveBounds().max.valueOf();
-    }
-
-    try {
-      const nonMetricFieldStats = await dataLoader.loadFieldStats(
-        searchQuery,
-        samplerShardSize,
-        earliest,
-        latest,
-        existNonMetricFields
-      );
-
-      // Add the field stats to the existing stats in the corresponding config.
-      const configs: FieldVisConfig[] = [];
-      nonMetricConfigs.forEach((config) => {
-        const configWithStats = { ...config };
-        if (config.fieldName !== undefined) {
-          configWithStats.stats = {
-            ...configWithStats.stats,
-            ...nonMetricFieldStats.find(
-              (fieldStats: any) => fieldStats.fieldName === config.fieldName
-            ),
-          };
-        }
-        configWithStats.loading = false;
-        configs.push(configWithStats);
-      });
-
-      setNonMetricConfigs(configs);
-    } catch (err) {
-      dataLoader.displayError(err);
-    }
-  }
-
-  function createMetricCards() {
-    const configs: FieldVisConfig[] = [];
-    const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || [];
-
-    const allMetricFields = indexPatternFields.filter((f) => {
-      return (
-        f.type === KBN_FIELD_TYPES.NUMBER &&
-        f.displayName !== undefined &&
-        dataLoader.isDisplayField(f.displayName) === true
-      );
-    });
-    const metricExistsFields = allMetricFields.filter((f) => {
-      return aggregatableExistsFields.find((existsF) => {
-        return existsF.fieldName === f.displayName;
-      });
-    });
-
-    // Add a config for 'document count', identified by no field name if indexpattern is time based.
-    if (currentIndexPattern.timeFieldName !== undefined) {
-      configs.push({
-        type: ML_JOB_FIELD_TYPES.NUMBER,
-        existsInDocs: true,
-        loading: true,
-        aggregatable: true,
-      });
-    }
-
-    if (metricsLoaded === false) {
-      setMetricsLoaded(true);
-      return;
-    }
-
-    let aggregatableFields: any[] = overallStats.aggregatableExistsFields;
-    if (allMetricFields.length !== metricExistsFields.length && metricsLoaded === true) {
-      aggregatableFields = aggregatableFields.concat(overallStats.aggregatableNotExistsFields);
-    }
-
-    const metricFieldsToShow =
-      metricsLoaded === true && showEmptyFields === true ? allMetricFields : metricExistsFields;
-
-    metricFieldsToShow.forEach((field) => {
-      const fieldData = aggregatableFields.find((f) => {
-        return f.fieldName === field.displayName;
-      });
-
-      const metricConfig: FieldVisConfig = {
-        ...(fieldData ? fieldData : {}),
-        fieldFormat: currentIndexPattern.getFormatterForField(field),
-        type: ML_JOB_FIELD_TYPES.NUMBER,
-        loading: true,
-        aggregatable: true,
-      };
-
-      configs.push(metricConfig);
-    });
-
-    setMetricsStats({
-      totalMetricFieldsCount: allMetricFields.length,
-      visibleMetricsCount: metricFieldsToShow.length,
-    });
-    setMetricConfigs(configs);
-  }
-
-  function createNonMetricCards() {
-    const allNonMetricFields = indexPatternFields.filter((f) => {
-      return (
-        f.type !== KBN_FIELD_TYPES.NUMBER &&
-        f.displayName !== undefined &&
-        dataLoader.isDisplayField(f.displayName) === true
-      );
-    });
-    // Obtain the list of all non-metric fields which appear in documents
-    // (aggregatable or not aggregatable).
-    const populatedNonMetricFields: any[] = []; // Kibana index pattern non metric fields.
-    let nonMetricFieldData: any[] = []; // Basic non metric field data loaded from requesting overall stats.
-    const aggregatableExistsFields: any[] = overallStats.aggregatableExistsFields || [];
-    const nonAggregatableExistsFields: any[] = overallStats.nonAggregatableExistsFields || [];
-
-    allNonMetricFields.forEach((f) => {
-      const checkAggregatableField = aggregatableExistsFields.find(
-        (existsField) => existsField.fieldName === f.displayName
-      );
-
-      if (checkAggregatableField !== undefined) {
-        populatedNonMetricFields.push(f);
-        nonMetricFieldData.push(checkAggregatableField);
-      } else {
-        const checkNonAggregatableField = nonAggregatableExistsFields.find(
-          (existsField) => existsField.fieldName === f.displayName
-        );
-
-        if (checkNonAggregatableField !== undefined) {
-          populatedNonMetricFields.push(f);
-          nonMetricFieldData.push(checkNonAggregatableField);
-        }
-      }
-    });
-
-    if (nonMetricsLoaded === false) {
-      setNonMetricsLoaded(true);
-      return;
-    }
-
-    if (allNonMetricFields.length !== nonMetricFieldData.length && showEmptyFields === true) {
-      // Combine the field data obtained from Elasticsearch into a single array.
-      nonMetricFieldData = nonMetricFieldData.concat(
-        overallStats.aggregatableNotExistsFields,
-        overallStats.nonAggregatableNotExistsFields
-      );
-    }
-
-    const nonMetricFieldsToShow = showEmptyFields ? allNonMetricFields : populatedNonMetricFields;
-
-    const configs: FieldVisConfig[] = [];
-
-    nonMetricFieldsToShow.forEach((field) => {
-      const fieldData = nonMetricFieldData.find((f) => f.fieldName === field.displayName);
-
-      const nonMetricConfig = {
-        ...fieldData,
-        fieldFormat: currentIndexPattern.getFormatterForField(field),
-        aggregatable: field.aggregatable,
-        scripted: field.scripted,
-        loading: fieldData.existsInDocs,
-      };
-
-      // Map the field type from the Kibana index pattern to the field type
-      // used in the data visualizer.
-      const dataVisualizerType = kbnTypeToMLJobType(field);
-      if (dataVisualizerType !== undefined) {
-        nonMetricConfig.type = dataVisualizerType;
-      } else {
-        // Add a flag to indicate that this is one of the 'other' Kibana
-        // field types that do not yet have a specific card type.
-        nonMetricConfig.type = field.type;
-        nonMetricConfig.isUnsupportedType = true;
-      }
-
-      configs.push(nonMetricConfig);
-    });
-
-    setNonMetricConfigs(configs);
-  }
-
-  const wizardPanelWidth = '280px';
-
-  const configs = useMemo(() => {
-    let combinedConfigs = [...nonMetricConfigs, ...metricConfigs];
-    if (visibleFieldTypes && visibleFieldTypes.length > 0) {
-      combinedConfigs = combinedConfigs.filter(
-        (config) => visibleFieldTypes.findIndex((field) => field === config.type) > -1
-      );
-    }
-    if (visibleFieldNames && visibleFieldNames.length > 0) {
-      combinedConfigs = combinedConfigs.filter(
-        (config) => visibleFieldNames.findIndex((field) => field === config.fieldName) > -1
-      );
-    }
-
-    return combinedConfigs;
-  }, [nonMetricConfigs, metricConfigs, visibleFieldTypes, visibleFieldNames]);
-
-  const fieldsCountStats: TotalFieldsStats | undefined = useMemo(() => {
-    let _visibleFieldsCount = 0;
-    let _totalFieldsCount = 0;
-    Object.keys(overallStats).forEach((key) => {
-      const fieldsGroup = overallStats[key as keyof OverallStats];
-      if (Array.isArray(fieldsGroup) && fieldsGroup.length > 0) {
-        _totalFieldsCount += fieldsGroup.length;
-      }
-    });
-
-    if (showEmptyFields === true) {
-      _visibleFieldsCount = _totalFieldsCount;
-    } else {
-      _visibleFieldsCount =
-        overallStats.aggregatableExistsFields.length +
-        overallStats.nonAggregatableExistsFields.length;
-    }
-    return { visibleFieldsCount: _visibleFieldsCount, totalFieldsCount: _totalFieldsCount };
-  }, [overallStats, showEmptyFields]);
-
-  const getItemIdToExpandedRowMap = useCallback(
-    function (itemIds: string[], items: FieldVisConfig[]): ItemIdToExpandedRowMap {
-      return itemIds.reduce((m: ItemIdToExpandedRowMap, fieldName: string) => {
-        const item = items.find((fieldVisConfig) => fieldVisConfig.fieldName === fieldName);
-        if (item !== undefined) {
-          m[fieldName] = (
-            <IndexBasedDataVisualizerExpandedRow
-              item={item}
-              indexPattern={currentIndexPattern}
-              combinedQuery={{ searchQueryLanguage, searchString }}
-            />
-          );
-        }
-        return m;
-      }, {} as ItemIdToExpandedRowMap);
-    },
-    [currentIndexPattern, searchQuery]
-  );
-
-  // Inject custom action column for the index based visualizer
-  const extendedColumns = useMemo(() => {
-    if (lensPlugin === undefined) {
-      // eslint-disable-next-line no-console
-      console.error('Lens plugin not available');
-      return;
-    }
-    const actionColumn: EuiTableActionsColumnType<FieldVisConfig> = {
-      name: (
-        <FormattedMessage
-          id="xpack.ml.dataVisualizer.indexBasedDataGrid.actionsColumnLabel"
-          defaultMessage="Actions"
-        />
-      ),
-      actions: getActions(currentIndexPattern, lensPlugin, { searchQueryLanguage, searchString }),
-      width: '100px',
-    };
-
-    return [actionColumn];
-  }, [currentIndexPattern, lensPlugin, searchQueryLanguage, searchString]);
-
-  const helpLink = docLinks.links.ml.guide;
-  return (
-    <Fragment>
-      <NavigationMenu tabId="datavisualizer" />
-      <EuiPage data-test-subj="mlPageIndexDataVisualizer">
-        <EuiPageBody>
-          <EuiFlexGroup gutterSize="m">
-            <EuiFlexItem>
-              <EuiPageContentHeader>
-                <EuiPageContentHeaderSection>
-                  <EuiTitle size="l">
-                    <h1>{currentIndexPattern.title}</h1>
-                  </EuiTitle>
-                </EuiPageContentHeaderSection>
-                <EuiPageContentHeaderSection data-test-subj="mlDataVisualizerTimeRangeSelectorSection">
-                  <EuiFlexGroup alignItems="center" justifyContent="flexEnd" gutterSize="s">
-                    {currentIndexPattern.timeFieldName !== undefined && (
-                      <EuiFlexItem grow={false}>
-                        <FullTimeRangeSelector
-                          indexPattern={currentIndexPattern}
-                          query={combinedQuery}
-                          disabled={false}
-                        />
-                      </EuiFlexItem>
-                    )}
-                    <EuiFlexItem grow={false}>
-                      <DatePickerWrapper />
-                    </EuiFlexItem>
-                  </EuiFlexGroup>
-                </EuiPageContentHeaderSection>
-              </EuiPageContentHeader>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-          <EuiSpacer size="m" />
-          <EuiPageContentBody>
-            <EuiFlexGroup gutterSize="m">
-              <EuiFlexItem>
-                <EuiPanel>
-                  {overallStats?.totalCount !== undefined && (
-                    <EuiFlexItem grow={true}>
-                      <DocumentCountContent
-                        config={documentCountStats}
-                        totalCount={overallStats.totalCount}
-                      />
-                    </EuiFlexItem>
-                  )}
-                  <EuiSpacer size={'m'} />
-
-                  <SearchPanel
-                    indexPattern={currentIndexPattern}
-                    searchString={searchString}
-                    searchQuery={searchQuery}
-                    searchQueryLanguage={searchQueryLanguage}
-                    setSearchParams={setSearchParams}
-                    samplerShardSize={samplerShardSize}
-                    setSamplerShardSize={setSamplerShardSize}
-                    overallStats={overallStats}
-                    indexedFieldTypes={indexedFieldTypes}
-                    setVisibleFieldTypes={setVisibleFieldTypes}
-                    visibleFieldTypes={visibleFieldTypes}
-                    visibleFieldNames={visibleFieldNames}
-                    setVisibleFieldNames={setVisibleFieldNames}
-                    showEmptyFields={showEmptyFields}
-                  />
-                  <EuiSpacer size={'l'} />
-                  <FieldCountPanel
-                    showEmptyFields={showEmptyFields}
-                    toggleShowEmptyFields={toggleShowEmptyFields}
-                    fieldsCountStats={fieldsCountStats}
-                    metricsStats={metricsStats}
-                  />
-                  <EuiSpacer size={'m'} />
-                  <DataVisualizerTable<FieldVisConfig>
-                    items={configs}
-                    pageState={dataVisualizerListState}
-                    updatePageState={setDataVisualizerListState}
-                    getItemIdToExpandedRowMap={getItemIdToExpandedRowMap}
-                    extendedColumns={extendedColumns}
-                  />
-                </EuiPanel>
-              </EuiFlexItem>
-              <EuiFlexItem grow={false} style={{ width: wizardPanelWidth }}>
-                <ActionsPanel
-                  indexPattern={currentIndexPattern}
-                  searchQueryLanguage={searchQueryLanguage}
-                  searchString={searchString}
-                />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </EuiPageContentBody>
-        </EuiPageBody>
-      </EuiPage>
-      <HelpMenu docLink={helpLink} />
-    </Fragment>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_field_data_row.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_field_data_row.scss
deleted file mode 100644
index 1832b0f78b895..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_field_data_row.scss
+++ /dev/null
@@ -1,86 +0,0 @@
-.mlFieldDataCard {
-  height: 420px;
-  box-shadow: none;
-  border-color: $euiBorderColor;
-
-  // Note the names of these styles need to match the type of the field they are displaying.
-  .boolean {
-    color: $euiColorVis5;
-    border-color: $euiColorVis5;
-  }
-
-  .date {
-    color: $euiColorVis7;
-    border-color: $euiColorVis7;
-  }
-
-  .document_count {
-    color: $euiColorVis2;
-    border-color: $euiColorVis2;
-  }
-
-  .geo_point {
-    color: $euiColorVis8;
-    border-color: $euiColorVis8;
-  }
-
-  .ip {
-    color: $euiColorVis3;
-    border-color: $euiColorVis3;
-  }
-
-  .keyword {
-    color: $euiColorVis0;
-    border-color: $euiColorVis0;
-  }
-
-  .number {
-    color: $euiColorVis1;
-    border-color: $euiColorVis1;
-  }
-
-  .text {
-    color: $euiColorVis9;
-    border-color: $euiColorVis9;
-  }
-
-  .type-other,
-  .unknown {
-    color: $euiColorVis6;
-    border-color: $euiColorVis6;
-  }
-
-  .mlFieldDataCard__content {
-    @include euiFontSizeS;
-    height: 385px;
-    overflow: hidden;
-  }
-
-  .mlFieldDataCard__codeContent {
-    @include euiCodeFont;
-  }
-
-  .mlFieldDataCard__geoContent {
-    z-index: auto;
-    flex: 1;
-    display: flex;
-    flex-direction: column;
-    height: 100%;
-    position: relative;
-    .embPanel__content {
-      display: flex;
-      flex: 1 1 100%;
-      z-index: 1;
-      min-height: 0; // Absolute must for Firefox to scroll contents
-    }
-  }
-
-  .mlFieldDataCard__stats {
-    padding: $euiSizeS $euiSizeS 0 $euiSizeS;
-    text-align: center;
-  }
-
-  .mlFieldDataCard__valuesTitle {
-    text-transform: uppercase;
-  }
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_index.scss
deleted file mode 100644
index 9e838c180713f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/_index.scss
+++ /dev/null
@@ -1,56 +0,0 @@
-@import 'components/field_data_expanded_row/index';
-@import 'components/field_count_stats/index';
-@import 'components/field_data_row/index';
-
-.mlDataVisualizerFieldExpandedRow {
-  padding-left: $euiSize * 4;
-  width: 100%;
-
-  .mlFieldDataCard__valuesTitle {
-    text-transform: uppercase;
-    text-align: left;
-    color: $euiColorDarkShade;
-    font-weight: bold;
-    padding-bottom: $euiSizeS;
-  }
-
-  .mlFieldDataCard__codeContent {
-    @include euiCodeFont;
-  }
-}
-
-.mlDataVisualizer {
-  .euiTableRow > .euiTableRowCell {
-    border-bottom: 0;
-    border-top: $euiBorderThin;
-
-  }
-  .euiTableRow-isExpandedRow {
-
-    .euiTableRowCell {
-      background-color: $euiColorEmptyShade !important;
-      border-top: 0;
-      border-bottom: $euiBorderThin;
-      &:hover {
-        background-color: $euiColorEmptyShade !important;
-      }
-    }
-  }
-  .mlDataVisualizerSummaryTable {
-    max-width: 350px;
-    min-width: 250px;
-    .euiTableRow > .euiTableRowCell {
-      border-bottom: 0;
-    }
-    .euiTableHeaderCell {
-      display: none;
-    }
-  }
-  .mlDataVisualizerSummaryTableWrapper {
-    max-width: 300px;
-  }
-  .mlDataVisualizerMapWrapper {
-    min-height: 300px;
-    min-width: 600px;
-  }
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx
deleted file mode 100644
index 6c82e103a831f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/expanded_row_field_header.tsx
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiText } from '@elastic/eui';
-import React from 'react';
-
-export const ExpandedRowFieldHeader = ({ children }: { children: React.ReactNode }) => (
-  <EuiText size="xs" color={'subdued'} className={'mlFieldDataCard__valuesTitle'}>
-    {children}
-  </EuiText>
-);
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/index.ts
deleted file mode 100644
index a92fa7f1e0659..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/expanded_row_field_header/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { ExpandedRowFieldHeader } from './expanded_row_field_header';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/_index.scss
deleted file mode 100644
index 7154d0da2c09c..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.mlDataVisualizerFieldCountContainer {
-  max-width: 300px;
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/index.ts
deleted file mode 100644
index d841ee2959f62..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/index.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { TotalFieldsCount, TotalFieldsCountProps, TotalFieldsStats } from './total_fields_count';
-export {
-  MetricFieldsCount,
-  MetricFieldsCountProps,
-  MetricFieldsStats,
-} from './metric_fields_count';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/metric_fields_count.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/metric_fields_count.tsx
deleted file mode 100644
index dae22cf6daab8..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/metric_fields_count.tsx
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { FC } from 'react';
-
-export interface MetricFieldsStats {
-  visibleMetricsCount: number;
-  totalMetricFieldsCount: number;
-}
-export interface MetricFieldsCountProps {
-  metricsStats?: MetricFieldsStats;
-}
-
-export const MetricFieldsCount: FC<MetricFieldsCountProps> = ({ metricsStats }) => {
-  if (
-    !metricsStats ||
-    metricsStats.visibleMetricsCount === undefined ||
-    metricsStats.totalMetricFieldsCount === undefined
-  )
-    return null;
-  return (
-    <>
-      {metricsStats && (
-        <EuiFlexGroup
-          gutterSize="s"
-          alignItems="center"
-          className="mlDataVisualizerFieldCountContainer"
-          data-test-subj="mlDataVisualizerMetricFieldsSummary"
-        >
-          <EuiFlexItem grow={false}>
-            <EuiText>
-              <h5>
-                <FormattedMessage
-                  id="xpack.ml.dataVisualizer.searchPanel.numberFieldsLabel"
-                  defaultMessage="Number fields"
-                />
-              </h5>
-            </EuiText>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiNotificationBadge
-              color="subdued"
-              size="m"
-              data-test-subj="mlDataVisualizerVisibleMetricFieldsCount"
-            >
-              <strong>{metricsStats.visibleMetricsCount}</strong>
-            </EuiNotificationBadge>
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiText color="subdued" size="s" data-test-subj="mlDataVisualizerMetricFieldsCount">
-              <FormattedMessage
-                id="xpack.ml.dataVisualizer.searchPanel.ofFieldsTotal"
-                defaultMessage="of {totalCount} total"
-                values={{ totalCount: metricsStats.totalMetricFieldsCount }}
-              />
-            </EuiText>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      )}
-    </>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/total_fields_count.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/total_fields_count.tsx
deleted file mode 100644
index aacd7172903f5..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_count_stats/total_fields_count.tsx
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiNotificationBadge, EuiText } from '@elastic/eui';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { FC } from 'react';
-
-export interface TotalFieldsStats {
-  visibleFieldsCount: number;
-  totalFieldsCount: number;
-}
-
-export interface TotalFieldsCountProps {
-  fieldsCountStats?: TotalFieldsStats;
-}
-
-export const TotalFieldsCount: FC<TotalFieldsCountProps> = ({ fieldsCountStats }) => {
-  if (
-    !fieldsCountStats ||
-    fieldsCountStats.visibleFieldsCount === undefined ||
-    fieldsCountStats.totalFieldsCount === undefined
-  )
-    return null;
-
-  return (
-    <EuiFlexGroup
-      gutterSize="s"
-      alignItems="center"
-      className="mlDataVisualizerFieldCountContainer"
-      data-test-subj="mlDataVisualizerFieldsSummary"
-    >
-      <EuiFlexItem grow={false}>
-        <EuiText>
-          <h5>
-            <FormattedMessage
-              id="xpack.ml.dataVisualizer.searchPanel.allFieldsLabel"
-              defaultMessage="All fields"
-            />
-          </h5>
-        </EuiText>
-      </EuiFlexItem>
-
-      <EuiFlexItem grow={false}>
-        <EuiNotificationBadge
-          color="subdued"
-          size="m"
-          data-test-subj="mlDataVisualizerVisibleFieldsCount"
-        >
-          <strong>{fieldsCountStats.visibleFieldsCount}</strong>
-        </EuiNotificationBadge>
-      </EuiFlexItem>
-      <EuiFlexItem grow={false}>
-        <EuiText color="subdued" size="s" data-test-subj="mlDataVisualizerTotalFieldsCount">
-          <FormattedMessage
-            id="xpack.ml.dataVisualizer.searchPanel.ofFieldsTotal"
-            defaultMessage="of {totalCount} total"
-            values={{ totalCount: fieldsCountStats.totalFieldsCount }}
-          />
-        </EuiText>
-      </EuiFlexItem>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_index.scss
deleted file mode 100644
index 799beec093cca..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_index.scss
+++ /dev/null
@@ -1,7 +0,0 @@
-@import 'number_content';
-
-.mlDataVisualizerExpandedRow {
-  @include euiBreakpoint('xs', 's', 'm') {
-    flex-direction: column;
-  }
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_number_content.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_number_content.scss
deleted file mode 100644
index 066f405b39cd6..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/_number_content.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-.mlMetricDistributionChartContainer {
-  padding-top: $euiSizeXS;
-  width: 100%;
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/boolean_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/boolean_content.tsx
deleted file mode 100644
index 6a09e968aa19f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/boolean_content.tsx
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, ReactNode, useMemo } from 'react';
-import { EuiBasicTable, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import { Axis, BarSeries, Chart, Settings } from '@elastic/charts';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { getTFPercentage } from '../../utils';
-import { roundToDecimalPlace } from '../../../../formatters/round_to_decimal_place';
-import { useDataVizChartTheme } from '../../hooks';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-function getPercentLabel(value: number): string {
-  if (value === 0) {
-    return '0%';
-  }
-  if (value >= 0.1) {
-    return `${roundToDecimalPlace(value)}%`;
-  } else {
-    return '< 0.1%';
-  }
-}
-
-function getFormattedValue(value: number, totalCount: number): string {
-  const percentage = (value / totalCount) * 100;
-  return `${value} (${getPercentLabel(percentage)})`;
-}
-
-const BOOLEAN_DISTRIBUTION_CHART_HEIGHT = 100;
-
-export const BooleanContent: FC<FieldDataRowProps> = ({ config }) => {
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-  const formattedPercentages = useMemo(() => getTFPercentage(config), [config]);
-  const theme = useDataVizChartTheme();
-  if (!formattedPercentages) return null;
-
-  const { trueCount, falseCount, count } = formattedPercentages;
-  const summaryTableItems = [
-    {
-      function: 'true',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.booleanContent.trueCountLabel"
-          defaultMessage="true"
-        />
-      ),
-      value: getFormattedValue(trueCount, count),
-    },
-    {
-      function: 'false',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.booleanContent.falseCountLabel"
-          defaultMessage="false"
-        />
-      ),
-      value: getFormattedValue(falseCount, count),
-    },
-  ];
-  const summaryTableColumns = [
-    {
-      name: '',
-      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
-      width: '75px',
-    },
-    {
-      field: 'value',
-      name: '',
-      render: (v: string) => <strong>{v}</strong>,
-    },
-  ];
-
-  const summaryTableTitle = i18n.translate(
-    'xpack.ml.fieldDataCardExpandedRow.booleanContent.summaryTableTitle',
-    {
-      defaultMessage: 'Summary',
-    }
-  );
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVBooleanContent'}>
-      <DocumentStatsTable config={config} />
-
-      <EuiFlexItem className={'mlDataVisualizerSummaryTableWrapper'}>
-        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
-        <EuiBasicTable
-          className={'mlDataVisualizerSummaryTable'}
-          compressed
-          items={summaryTableItems}
-          columns={summaryTableColumns}
-          tableCaption={summaryTableTitle}
-        />
-      </EuiFlexItem>
-
-      <EuiFlexItem>
-        <ExpandedRowFieldHeader>
-          <FormattedMessage
-            id="xpack.ml.fieldDataCard.cardBoolean.valuesLabel"
-            defaultMessage="Values"
-          />
-        </ExpandedRowFieldHeader>
-        <EuiSpacer size="xs" />
-        <Chart renderer="canvas" size={{ height: BOOLEAN_DISTRIBUTION_CHART_HEIGHT }}>
-          <Axis id="bottom" position="bottom" showOverlappingTicks />
-          <Axis
-            id="left2"
-            title="Left axis"
-            hide={true}
-            tickFormat={(d: any) => getFormattedValue(d, count)}
-          />
-
-          <Settings showLegend={false} theme={theme} />
-          <BarSeries
-            id={config.fieldName || fieldFormat}
-            data={[
-              {
-                x: 'true',
-                count: formattedPercentages.trueCount,
-              },
-              {
-                x: 'false',
-                count: formattedPercentages.falseCount,
-              },
-            ]}
-            splitSeriesAccessors={['x']}
-            stackAccessors={['x']}
-            xAccessor="x"
-            xScaleType="ordinal"
-            yAccessors={['count']}
-            yScaleType="linear"
-          />
-        </Chart>
-      </EuiFlexItem>
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/date_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/date_content.tsx
deleted file mode 100644
index ad773ba5a3b16..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/date_content.tsx
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, ReactNode } from 'react';
-import { EuiBasicTable, EuiFlexItem } from '@elastic/eui';
-// @ts-ignore
-import { formatDate } from '@elastic/eui/lib/services/format';
-import { FormattedMessage } from '@kbn/i18n/react';
-
-import { i18n } from '@kbn/i18n';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-const TIME_FORMAT = 'MMM D YYYY, HH:mm:ss.SSS';
-interface SummaryTableItem {
-  function: string;
-  display: ReactNode;
-  value: number | string | undefined | null;
-}
-
-export const DateContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-
-  const { earliest, latest } = stats;
-
-  const summaryTableTitle = i18n.translate('xpack.ml.fieldDataCard.cardDate.summaryTableTitle', {
-    defaultMessage: 'Summary',
-  });
-  const summaryTableItems = [
-    {
-      function: 'earliest',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCard.cardDate.earliestLabel"
-          defaultMessage="earliest"
-        />
-      ),
-      value: typeof earliest === 'string' ? earliest : formatDate(earliest, TIME_FORMAT),
-    },
-    {
-      function: 'latest',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCard.cardDate.latestLabel"
-          defaultMessage="latest"
-        />
-      ),
-      value: typeof latest === 'string' ? latest : formatDate(latest, TIME_FORMAT),
-    },
-  ];
-  const summaryTableColumns = [
-    {
-      name: '',
-      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
-      width: '75px',
-    },
-    {
-      field: 'value',
-      name: '',
-      render: (v: string) => <strong>{v}</strong>,
-    },
-  ];
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVDateContent'}>
-      <DocumentStatsTable config={config} />
-      <EuiFlexItem className={'mlDataVisualizerSummaryTableWrapper'}>
-        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
-        <EuiBasicTable<SummaryTableItem>
-          className={'mlDataVisualizerSummaryTable'}
-          data-test-subj={'mlDateSummaryTable'}
-          compressed
-          items={summaryTableItems}
-          columns={summaryTableColumns}
-          tableCaption={summaryTableTitle}
-          tableLayout="auto"
-        />
-      </EuiFlexItem>
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/document_stats.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/document_stats.tsx
deleted file mode 100644
index c5b68975d9d31..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/document_stats.tsx
+++ /dev/null
@@ -1,93 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import React, { FC, ReactNode } from 'react';
-import { i18n } from '@kbn/i18n';
-import { EuiBasicTable, EuiFlexItem } from '@elastic/eui';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { FieldDataRowProps } from '../../types';
-import { roundToDecimalPlace } from '../../../../formatters/round_to_decimal_place';
-
-const metaTableColumns = [
-  {
-    name: '',
-    render: (metaItem: { display: ReactNode }) => metaItem.display,
-    width: '75px',
-  },
-  {
-    field: 'value',
-    name: '',
-    render: (v: string) => <strong>{v}</strong>,
-  },
-];
-
-const metaTableTitle = i18n.translate(
-  'xpack.ml.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle',
-  {
-    defaultMessage: 'Documents stats',
-  }
-);
-
-export const DocumentStatsTable: FC<FieldDataRowProps> = ({ config }) => {
-  if (
-    config?.stats === undefined ||
-    config.stats.cardinality === undefined ||
-    config.stats.count === undefined ||
-    config.stats.sampleCount === undefined
-  )
-    return null;
-  const { cardinality, count, sampleCount } = config.stats;
-  const metaTableItems = [
-    {
-      function: 'count',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.documentStatsTable.countLabel"
-          defaultMessage="count"
-        />
-      ),
-      value: count,
-    },
-    {
-      function: 'percentage',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.documentStatsTable.percentageLabel"
-          defaultMessage="percentage"
-        />
-      ),
-      value: `${roundToDecimalPlace((count / sampleCount) * 100)}%`,
-    },
-    {
-      function: 'distinctValues',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.documentStatsTable.distinctValueLabel"
-          defaultMessage="distinct values"
-        />
-      ),
-      value: cardinality,
-    },
-  ];
-
-  return (
-    <EuiFlexItem
-      data-test-subj={'mlDVDocumentStatsContent'}
-      className={'mlDataVisualizerSummaryTableWrapper'}
-    >
-      <ExpandedRowFieldHeader>{metaTableTitle}</ExpandedRowFieldHeader>
-      <EuiBasicTable
-        className={'mlDataVisualizerSummaryTable'}
-        compressed
-        items={metaTableItems}
-        columns={metaTableColumns}
-        tableCaption={metaTableTitle}
-      />
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/expanded_row_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
deleted file mode 100644
index 8e14945b32a7f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/expanded_row_content.tsx
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, ReactNode } from 'react';
-import { EuiFlexGroup } from '@elastic/eui';
-
-interface Props {
-  children: ReactNode;
-  dataTestSubj: string;
-}
-export const ExpandedRowContent: FC<Props> = ({ children, dataTestSubj }) => {
-  return (
-    <EuiFlexGroup
-      data-test-subj={dataTestSubj}
-      gutterSize={'xl'}
-      className={'mlDataVisualizerExpandedRow'}
-    >
-      {children}
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts
deleted file mode 100644
index d35b0ae9688cf..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/index.ts
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { BooleanContent } from './boolean_content';
-export { DateContent } from './date_content';
-export { KeywordContent } from './keyword_content';
-export { IpContent } from './ip_content';
-export { NumberContent } from './number_content';
-export { OtherContent } from './other_content';
-export { TextContent } from './text_content';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/ip_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/ip_content.tsx
deleted file mode 100644
index 23c7d721a9ab5..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/ip_content.tsx
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { TopValues } from '../../../index_based/components/field_data_row/top_values';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-export const IpContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-  const { count, sampleCount, cardinality } = stats;
-  if (count === undefined || sampleCount === undefined || cardinality === undefined) return null;
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVIPContent'}>
-      <DocumentStatsTable config={config} />
-      <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" />
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/keyword_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/keyword_content.tsx
deleted file mode 100644
index 9239632a3f909..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/keyword_content.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useEffect, useState } from 'react';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { TopValues } from '../../../index_based/components/field_data_row/top_values';
-import { ChoroplethMap } from '../../../index_based/components/field_data_row/choropleth_map';
-import { useMlKibana } from '../../../../../application/contexts/kibana';
-import { EMSTermJoinConfig } from '../../../../../../../maps/public';
-import { COMMON_EMS_LAYER_IDS } from '../../../../../../common/constants/embeddable_map';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-export const KeywordContent: FC<FieldDataRowProps> = ({ config }) => {
-  const [EMSSuggestion, setEMSSuggestion] = useState<EMSTermJoinConfig | null | undefined>();
-  const { stats, fieldName } = config;
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-  const {
-    services: { maps: mapsPlugin },
-  } = useMlKibana();
-
-  const loadEMSTermSuggestions = async () => {
-    if (!mapsPlugin) return;
-    const suggestion: EMSTermJoinConfig | null = await mapsPlugin.suggestEMSTermJoinConfig({
-      emsLayerIds: COMMON_EMS_LAYER_IDS,
-      sampleValues: Array.isArray(stats?.topValues)
-        ? stats?.topValues.map((value) => value.key)
-        : [],
-      sampleValuesColumnName: fieldName || '',
-    });
-    setEMSSuggestion(suggestion);
-  };
-
-  useEffect(
-    function getInitialEMSTermSuggestion() {
-      loadEMSTermSuggestions();
-    },
-    [config?.fieldName]
-  );
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVKeywordContent'}>
-      <DocumentStatsTable config={config} />
-      {EMSSuggestion && stats && <ChoroplethMap stats={stats} suggestion={EMSSuggestion} />}
-      {EMSSuggestion === null && (
-        <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" />
-      )}
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/number_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/number_content.tsx
deleted file mode 100644
index 9d091292f4502..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/number_content.tsx
+++ /dev/null
@@ -1,154 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, ReactNode, useEffect, useState } from 'react';
-import { EuiBasicTable, EuiFlexItem, EuiText } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format';
-import { numberAsOrdinal } from '../../../../formatters/number_as_ordinal';
-import {
-  MetricDistributionChart,
-  MetricDistributionChartData,
-  buildChartDataFromStats,
-} from '../metric_distribution_chart';
-import { TopValues } from '../../../index_based/components/field_data_row/top_values';
-import { ExpandedRowFieldHeader } from '../expanded_row_field_header';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-const METRIC_DISTRIBUTION_CHART_WIDTH = 325;
-const METRIC_DISTRIBUTION_CHART_HEIGHT = 200;
-
-interface SummaryTableItem {
-  function: string;
-  display: ReactNode;
-  value: number | string | undefined | null;
-}
-
-export const NumberContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-
-  useEffect(() => {
-    const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH);
-    setDistributionChartData(chartData);
-  }, []);
-
-  const defaultChartData: MetricDistributionChartData[] = [];
-  const [distributionChartData, setDistributionChartData] = useState(defaultChartData);
-
-  if (stats === undefined) return null;
-  const { min, median, max, distribution } = stats;
-  const fieldFormat = 'fieldFormat' in config ? config.fieldFormat : undefined;
-
-  const summaryTableItems = [
-    {
-      function: 'min',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.numberContent.minLabel"
-          defaultMessage="min"
-        />
-      ),
-      value: kibanaFieldFormat(min, fieldFormat),
-    },
-    {
-      function: 'median',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.numberContent.medianLabel"
-          defaultMessage="median"
-        />
-      ),
-      value: kibanaFieldFormat(median, fieldFormat),
-    },
-    {
-      function: 'max',
-      display: (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCardExpandedRow.numberContent.maxLabel"
-          defaultMessage="max"
-        />
-      ),
-      value: kibanaFieldFormat(max, fieldFormat),
-    },
-  ];
-  const summaryTableColumns = [
-    {
-      name: '',
-      render: (summaryItem: { display: ReactNode }) => summaryItem.display,
-      width: '75px',
-    },
-    {
-      field: 'value',
-      name: '',
-      render: (v: string) => <strong>{v}</strong>,
-    },
-  ];
-
-  const summaryTableTitle = i18n.translate(
-    'xpack.ml.fieldDataCardExpandedRow.numberContent.summaryTableTitle',
-    {
-      defaultMessage: 'Summary',
-    }
-  );
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVNumberContent'}>
-      <DocumentStatsTable config={config} />
-      <EuiFlexItem className={'mlDataVisualizerSummaryTableWrapper'}>
-        <ExpandedRowFieldHeader>{summaryTableTitle}</ExpandedRowFieldHeader>
-        <EuiBasicTable<SummaryTableItem>
-          className={'mlDataVisualizerSummaryTable'}
-          compressed
-          items={summaryTableItems}
-          columns={summaryTableColumns}
-          tableCaption={summaryTableTitle}
-          data-test-subj={'mlNumberSummaryTable'}
-        />
-      </EuiFlexItem>
-
-      {stats && (
-        <TopValues stats={stats} fieldFormat={fieldFormat} barColor="secondary" compressed={true} />
-      )}
-      {distribution && (
-        <EuiFlexItem data-test-subj={'mlMetricDistribution'}>
-          <EuiFlexItem grow={false}>
-            <ExpandedRowFieldHeader>
-              <FormattedMessage
-                id="xpack.ml.fieldDataCardExpandedRow.numberContent.distributionTitle"
-                defaultMessage="Distribution"
-              />
-            </ExpandedRowFieldHeader>
-          </EuiFlexItem>
-
-          <EuiFlexItem className={'mlMetricDistributionChartContainer'}>
-            <MetricDistributionChart
-              width={METRIC_DISTRIBUTION_CHART_WIDTH}
-              height={METRIC_DISTRIBUTION_CHART_HEIGHT}
-              chartData={distributionChartData}
-              fieldFormat={fieldFormat}
-            />
-          </EuiFlexItem>
-          <EuiFlexItem grow={false}>
-            <EuiText size="xs">
-              <FormattedMessage
-                id="xpack.ml.fieldDataCardExpandedRow.numberContent.displayingPercentilesLabel"
-                defaultMessage="Displaying {minPercent} - {maxPercent} percentiles"
-                values={{
-                  minPercent: numberAsOrdinal(distribution.minPercentile),
-                  maxPercent: numberAsOrdinal(distribution.maxPercentile),
-                }}
-              />
-            </EuiText>
-          </EuiFlexItem>
-        </EuiFlexItem>
-      )}
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/other_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/other_content.tsx
deleted file mode 100644
index 0734048e2bc2a..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/other_content.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, { FC } from 'react';
-import { EuiFlexItem } from '@elastic/eui';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list';
-import { DocumentStatsTable } from './document_stats';
-import { ExpandedRowContent } from './expanded_row_content';
-
-export const OtherContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVOtherContent'}>
-      <DocumentStatsTable config={config} />
-      {Array.isArray(stats.examples) && (
-        <EuiFlexItem>
-          <ExamplesList examples={stats.examples} />
-        </EuiFlexItem>
-      )}
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/text_content.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/text_content.tsx
deleted file mode 100644
index bbef29a9154af..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_expanded_row/text_content.tsx
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, Fragment } from 'react';
-import { EuiCallOut, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-
-import { FormattedMessage } from '@kbn/i18n/react';
-import { i18n } from '@kbn/i18n';
-
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { ExamplesList } from '../../../index_based/components/field_data_row/examples_list';
-import { ExpandedRowContent } from './expanded_row_content';
-
-export const TextContent: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-
-  const { examples } = stats;
-  if (examples === undefined) return null;
-
-  const numExamples = examples.length;
-
-  return (
-    <ExpandedRowContent dataTestSubj={'mlDVTextContent'}>
-      <EuiFlexItem>
-        {numExamples > 0 && <ExamplesList examples={examples} />}
-        {numExamples === 0 && (
-          <Fragment>
-            <EuiSpacer size="xl" />
-            <EuiCallOut
-              title={i18n.translate('xpack.ml.fieldDataCard.cardText.noExamplesForFieldsTitle', {
-                defaultMessage: 'No examples were obtained for this field',
-              })}
-              iconType="alert"
-            >
-              <FormattedMessage
-                id="xpack.ml.fieldDataCard.cardText.fieldNotPresentDescription"
-                defaultMessage="This field was not present in the {sourceParam} field of documents queried."
-                values={{
-                  sourceParam: <span className="mlFieldDataCard__codeContent">_source</span>,
-                }}
-              />
-
-              <EuiSpacer size="s" />
-
-              <FormattedMessage
-                id="xpack.ml.fieldDataCard.cardText.fieldMayBePopulatedDescription"
-                defaultMessage="It may be populated, for example, using a {copyToParam} parameter in the document mapping, or be pruned from the {sourceParam} field after indexing through the use of {includesParam} and {excludesParam} parameters."
-                values={{
-                  copyToParam: <span className="mlFieldDataCard__codeContent">copy_to</span>,
-                  sourceParam: <span className="mlFieldDataCard__codeContent">_source</span>,
-                  includesParam: <span className="mlFieldDataCard__codeContent">includes</span>,
-                  excludesParam: <span className="mlFieldDataCard__codeContent">excludes</span>,
-                }}
-              />
-            </EuiCallOut>
-          </Fragment>
-        )}
-      </EuiFlexItem>
-    </ExpandedRowContent>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/_index.scss b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/_index.scss
deleted file mode 100644
index 27483feb573b8..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/_index.scss
+++ /dev/null
@@ -1,3 +0,0 @@
-.mlDataVisualizerColumnHeaderIcon {
-  max-width: $euiSizeM;
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/boolean_content_preview.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/boolean_content_preview.tsx
deleted file mode 100644
index 70adbbe85bc58..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/boolean_content_preview.tsx
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useMemo } from 'react';
-import { EuiDataGridColumn } from '@elastic/eui';
-import { OrdinalChartData } from '../../../../../../common/types/field_histograms';
-import { ColumnChart } from '../../../../components/data_grid/column_chart';
-import { FieldDataRowProps } from '../../types';
-import { getTFPercentage } from '../../utils';
-
-export const BooleanContentPreview: FC<FieldDataRowProps> = ({ config }) => {
-  const chartData = useMemo(() => {
-    const results = getTFPercentage(config);
-    if (results) {
-      const data = [
-        { key: 'true', key_as_string: 'true', doc_count: results.trueCount },
-        { key: 'false', key_as_string: 'false', doc_count: results.falseCount },
-      ];
-      return { id: config.fieldName, cardinality: 2, data, type: 'boolean' } as OrdinalChartData;
-    }
-  }, [config]);
-  if (!chartData || config.fieldName === undefined) return null;
-
-  const columnType: EuiDataGridColumn = {
-    id: config.fieldName,
-    schema: undefined,
-  };
-  const dataTestSubj = `mlDataGridChart-${config.fieldName}`;
-
-  return (
-    <ColumnChart
-      dataTestSubj={dataTestSubj}
-      chartData={chartData}
-      columnType={columnType}
-      hideLabel={true}
-    />
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/distinct_values.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/distinct_values.tsx
deleted file mode 100644
index acbe081599c62..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/distinct_values.tsx
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
-
-import React from 'react';
-
-export const DistinctValues = ({ cardinality }: { cardinality?: number }) => {
-  if (cardinality === undefined) return null;
-  return (
-    <EuiFlexGroup alignItems={'center'}>
-      <EuiFlexItem className={'mlDataVisualizerColumnHeaderIcon'}>
-        <EuiIcon type="database" size={'s'} />
-      </EuiFlexItem>
-      <EuiText size={'s'}>
-        <b>{cardinality}</b>
-      </EuiText>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/document_stats.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/document_stats.tsx
deleted file mode 100644
index 58afea0848154..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/document_stats.tsx
+++ /dev/null
@@ -1,33 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { EuiFlexGroup, EuiFlexItem, EuiIcon, EuiText } from '@elastic/eui';
-
-import React from 'react';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-import { roundToDecimalPlace } from '../../../../formatters/round_to_decimal_place';
-
-export const DocumentStat = ({ config }: FieldDataRowProps) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-
-  const { count, sampleCount } = stats;
-  if (count === undefined || sampleCount === undefined) return null;
-
-  const docsPercent = roundToDecimalPlace((count / sampleCount) * 100);
-
-  return (
-    <EuiFlexGroup alignItems={'center'}>
-      <EuiFlexItem className={'mlDataVisualizerColumnHeaderIcon'}>
-        <EuiIcon type="document" size={'s'} />
-      </EuiFlexItem>
-      <EuiText size={'s'}>
-        <b>{count}</b> ({docsPercent}%)
-      </EuiText>
-    </EuiFlexGroup>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/index.ts
deleted file mode 100644
index e4c0cc80eeb35..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { BooleanContentPreview } from './boolean_content_preview';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/number_content_preview.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/number_content_preview.tsx
deleted file mode 100644
index e9f04e9e59668..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/number_content_preview.tsx
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC, useEffect, useState } from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import classNames from 'classnames';
-import {
-  MetricDistributionChart,
-  MetricDistributionChartData,
-  buildChartDataFromStats,
-} from '../metric_distribution_chart';
-import { formatSingleValue } from '../../../../formatters/format_value';
-import { FieldVisConfig } from '../../types';
-import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format';
-
-const METRIC_DISTRIBUTION_CHART_WIDTH = 150;
-const METRIC_DISTRIBUTION_CHART_HEIGHT = 80;
-
-export interface NumberContentPreviewProps {
-  config: FieldVisConfig;
-}
-
-export const IndexBasedNumberContentPreview: FC<NumberContentPreviewProps> = ({ config }) => {
-  const { stats, fieldFormat, fieldName } = config;
-  const defaultChartData: MetricDistributionChartData[] = [];
-  const [distributionChartData, setDistributionChartData] = useState(defaultChartData);
-  const [legendText, setLegendText] = useState<{ min: number; max: number } | undefined>();
-  const dataTestSubj = `mlDataGridChart-${fieldName}`;
-  useEffect(() => {
-    const chartData = buildChartDataFromStats(stats, METRIC_DISTRIBUTION_CHART_WIDTH);
-    if (
-      Array.isArray(chartData) &&
-      chartData[0].x !== undefined &&
-      chartData[chartData.length - 1].x !== undefined
-    ) {
-      setDistributionChartData(chartData);
-      setLegendText({
-        min: formatSingleValue(chartData[0].x),
-        max: formatSingleValue(chartData[chartData.length - 1].x),
-      });
-    }
-  }, []);
-
-  return (
-    <div data-test-subj={dataTestSubj}>
-      <div className="mlDataGridChart__histogram" data-test-subj={`${dataTestSubj}-histogram`}>
-        <MetricDistributionChart
-          width={METRIC_DISTRIBUTION_CHART_WIDTH}
-          height={METRIC_DISTRIBUTION_CHART_HEIGHT}
-          chartData={distributionChartData}
-          fieldFormat={fieldFormat}
-          hideXAxis={true}
-        />
-      </div>
-      <div className={'mlDataGridChart__legend'} data-test-subj={`${dataTestSubj}-legend`}>
-        {legendText && (
-          <>
-            <EuiSpacer size="s" />
-            <EuiFlexGroup direction={'row'} data-test-subj={`${dataTestSubj}-legend`}>
-              <EuiFlexItem className={'mlDataGridChart__legend'}>
-                {kibanaFieldFormat(legendText.min, fieldFormat)}
-              </EuiFlexItem>
-              <EuiFlexItem
-                className={classNames(
-                  'mlDataGridChart__legend',
-                  'mlDataGridChart__legend--numeric'
-                )}
-              >
-                {kibanaFieldFormat(legendText.max, fieldFormat)}
-              </EuiFlexItem>
-            </EuiFlexGroup>
-          </>
-        )}
-      </div>
-    </div>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/top_values_preview.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/top_values_preview.tsx
deleted file mode 100644
index 07a2eae95c890..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/field_data_row/top_values_preview.tsx
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { FC } from 'react';
-import { EuiDataGridColumn } from '@elastic/eui';
-import { ChartData, OrdinalDataItem } from '../../../../../../common/types/field_histograms';
-import { ColumnChart } from '../../../../components/data_grid/column_chart';
-import type { FieldDataRowProps } from '../../types/field_data_row';
-
-export const TopValuesPreview: FC<FieldDataRowProps> = ({ config }) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-  const { topValues, cardinality } = stats;
-  if (cardinality === undefined || topValues === undefined || config.fieldName === undefined)
-    return null;
-
-  const data: OrdinalDataItem[] = topValues.map((d) => ({
-    ...d,
-    key: d.key.toString(),
-  }));
-  const chartData: ChartData = {
-    cardinality,
-    data,
-    id: config.fieldName,
-    type: 'ordinal',
-  };
-  const columnType: EuiDataGridColumn = {
-    id: config.fieldName,
-    schema: undefined,
-  };
-  return (
-    <ColumnChart
-      chartData={chartData}
-      columnType={columnType}
-      dataTestSubj={`mlDataGridChart-${config.fieldName}`}
-      hideLabel={true}
-      maxChartColumns={10}
-    />
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/index.ts
deleted file mode 100644
index 72947f2953cb8..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/index.ts
+++ /dev/null
@@ -1,9 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { MetricDistributionChart, MetricDistributionChartData } from './metric_distribution_chart';
-export { buildChartDataFromStats } from './metric_distribution_chart_data_builder';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx
deleted file mode 100644
index 4d9042dc74834..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart.tsx
+++ /dev/null
@@ -1,101 +0,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, { FC } from 'react';
-
-import { i18n } from '@kbn/i18n';
-
-import {
-  AreaSeries,
-  Axis,
-  Chart,
-  CurveType,
-  Position,
-  ScaleType,
-  Settings,
-  TooltipValueFormatter,
-} from '@elastic/charts';
-
-import { MetricDistributionChartTooltipHeader } from './metric_distribution_chart_tooltip_header';
-import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format';
-import type { ChartTooltipValue } from '../../../../components/chart_tooltip/chart_tooltip_service';
-import { useDataVizChartTheme } from '../../hooks';
-
-export interface MetricDistributionChartData {
-  x: number;
-  y: number;
-  dataMin: number;
-  dataMax: number;
-  percent: number;
-}
-
-interface Props {
-  width: number;
-  height: number;
-  chartData: MetricDistributionChartData[];
-  fieldFormat?: any; // Kibana formatter for field being viewed
-  hideXAxis?: boolean;
-}
-
-const SPEC_ID = 'metric_distribution';
-
-export const MetricDistributionChart: FC<Props> = ({
-  width,
-  height,
-  chartData,
-  fieldFormat,
-  hideXAxis,
-}) => {
-  // This value is shown to label the y axis values in the tooltip.
-  // Ideally we wouldn't show these values at all in the tooltip,
-  // but this is not yet possible with Elastic charts.
-  const seriesName = i18n.translate('xpack.ml.fieldDataCard.metricDistributionChart.seriesName', {
-    defaultMessage: 'distribution',
-  });
-
-  const theme = useDataVizChartTheme();
-
-  const headerFormatter: TooltipValueFormatter = (tooltipData: ChartTooltipValue) => {
-    const xValue = tooltipData.value;
-    const chartPoint: MetricDistributionChartData | undefined = chartData.find(
-      (data) => data.x === xValue
-    );
-
-    return (
-      <MetricDistributionChartTooltipHeader
-        chartPoint={chartPoint}
-        maxWidth={width / 2}
-        fieldFormat={fieldFormat}
-      />
-    );
-  };
-
-  return (
-    <div data-test-subj="mlFieldDataMetricDistributionChart">
-      <Chart size={{ width, height }}>
-        <Settings theme={theme} tooltip={{ headerFormatter }} />
-        <Axis
-          id="bottom"
-          position={Position.Bottom}
-          tickFormat={(d) => kibanaFieldFormat(d, fieldFormat)}
-          hide={hideXAxis === true}
-        />
-        <Axis id="left" position={Position.Left} tickFormat={(d) => d.toFixed(3)} hide={true} />
-        <AreaSeries
-          id={SPEC_ID}
-          name={seriesName}
-          xScaleType={ScaleType.Linear}
-          yScaleType={ScaleType.Linear}
-          xAccessor="x"
-          yAccessors={['y']}
-          data={chartData.length > 0 ? chartData : [{ x: 0, y: 0 }]}
-          curve={CurveType.CURVE_STEP_AFTER}
-        />
-      </Chart>
-    </div>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx
deleted file mode 100644
index a65b6bdc7458f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_data_builder.tsx
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-const METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH = 3; // Minimum bar width, in pixels.
-const METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR = 20; // Max bar height relative to median bar height.
-
-import { MetricDistributionChartData } from './metric_distribution_chart';
-
-interface DistributionPercentile {
-  minValue: number;
-  maxValue: number;
-  percent: number;
-}
-
-interface DistributionChartBar {
-  x0: number;
-  x1: number;
-  y: number;
-  dataMin: number;
-  dataMax: number;
-  percent: number;
-  isMinWidth: boolean;
-}
-
-export function buildChartDataFromStats(
-  stats: any,
-  chartWidth: number
-): MetricDistributionChartData[] {
-  // Process the raw percentiles data so it is in a suitable format for plotting in the metric distribution chart.
-  let chartData: MetricDistributionChartData[] = [];
-
-  const distribution = stats.distribution;
-  if (distribution === undefined) {
-    return chartData;
-  }
-
-  const percentiles: DistributionPercentile[] = distribution.percentiles;
-  if (percentiles.length === 0) {
-    return chartData;
-  }
-
-  // Adjust x axis min and max if there is a single bar.
-  const minX = percentiles[0].minValue;
-  const maxX = percentiles[percentiles.length - 1].maxValue;
-
-  let xAxisMin: number = minX;
-  let xAxisMax: number = maxX;
-  if (maxX === minX) {
-    if (minX !== 0) {
-      xAxisMin = 0;
-      xAxisMax = 2 * minX;
-    } else {
-      xAxisMax = 1;
-    }
-  }
-
-  // Adjust the right hand x coordinates so that each bar is at least METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH.
-  const minBarWidth =
-    (METRIC_DISTRIBUTION_CHART_MIN_BAR_WIDTH / chartWidth) * (xAxisMax - xAxisMin);
-  const processedData: DistributionChartBar[] = [];
-  let lastBar: DistributionChartBar;
-  percentiles.forEach((data, index) => {
-    if (index === 0) {
-      const bar: DistributionChartBar = {
-        x0: data.minValue,
-        x1: Math.max(data.minValue + minBarWidth, data.maxValue),
-        y: 0, // Set below
-        dataMin: data.minValue,
-        dataMax: data.maxValue,
-        percent: data.percent,
-        isMinWidth: false,
-      };
-
-      // Scale the height of the bar according to the range of data values in the bar.
-      bar.y =
-        (data.percent / (bar.x1 - bar.x0)) *
-        Math.max(1, minBarWidth / Math.max(data.maxValue - data.minValue, 0.5 * minBarWidth));
-      bar.isMinWidth = data.maxValue <= data.minValue + minBarWidth;
-      processedData.push(bar);
-      lastBar = bar;
-    } else {
-      if (lastBar.isMinWidth === false || data.maxValue > lastBar.x1) {
-        const bar = {
-          x0: lastBar.x1,
-          x1: Math.max(lastBar.x1 + minBarWidth, data.maxValue),
-          y: 0, // Set below
-          dataMin: data.minValue,
-          dataMax: data.maxValue,
-          percent: data.percent,
-          isMinWidth: false,
-        };
-
-        // Scale the height of the bar according to the range of data values in the bar.
-        bar.y =
-          (data.percent / (bar.x1 - bar.x0)) *
-          Math.max(1, minBarWidth / Math.max(data.maxValue - data.minValue, 0.5 * minBarWidth));
-        bar.isMinWidth = data.maxValue <= lastBar.x1 + minBarWidth;
-        processedData.push(bar);
-        lastBar = bar;
-      } else {
-        // Combine bars which are less than minBarWidth apart.
-        lastBar.percent = lastBar.percent + data.percent;
-        lastBar.y = lastBar.percent / (lastBar.x1 - lastBar.x0);
-        lastBar.dataMax = data.maxValue;
-      }
-    }
-  });
-
-  if (maxX !== minX) {
-    xAxisMax = processedData[processedData.length - 1].x1;
-  }
-
-  // Adjust the maximum bar height to be (METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR * median bar height).
-  let barHeights = processedData.map((data) => data.y);
-  barHeights = barHeights.sort((a, b) => a - b);
-
-  let maxBarHeight = 0;
-  const processedDataLength = processedData.length;
-  if (Math.abs(processedDataLength % 2) === 1) {
-    maxBarHeight =
-      METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR *
-      barHeights[Math.floor(processedDataLength / 2)];
-  } else {
-    maxBarHeight =
-      (METRIC_DISTRIBUTION_CHART_MAX_BAR_HEIGHT_FACTOR *
-        (barHeights[Math.floor(processedDataLength / 2) - 1] +
-          barHeights[Math.floor(processedDataLength / 2)])) /
-      2;
-  }
-
-  processedData.forEach((data) => {
-    data.y = Math.min(data.y, maxBarHeight);
-  });
-
-  // Convert the data to the format used by the chart.
-  chartData = processedData.map((data) => {
-    const { x0, y, dataMin, dataMax, percent } = data;
-    return { x: x0, y, dataMin, dataMax, percent };
-  });
-
-  // Add a final point to drop the curve back to the y axis.
-  const last = processedData[processedData.length - 1];
-  chartData.push({
-    x: last.x1,
-    y: 0,
-    dataMin: last.dataMin,
-    dataMax: last.dataMax,
-    percent: last.percent,
-  });
-
-  return chartData;
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx
deleted file mode 100644
index 3144676a46c83..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/components/metric_distribution_chart/metric_distribution_chart_tooltip_header.tsx
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 { MetricDistributionChartData } from './metric_distribution_chart';
-import { kibanaFieldFormat } from '../../../../formatters/kibana_field_format';
-
-interface Props {
-  chartPoint: MetricDistributionChartData | undefined;
-  maxWidth: number;
-  fieldFormat?: any; // Kibana formatter for field being viewed
-}
-
-export const MetricDistributionChartTooltipHeader: FC<Props> = ({
-  chartPoint,
-  maxWidth,
-  fieldFormat,
-}) => {
-  if (chartPoint === undefined) {
-    return null;
-  }
-
-  return (
-    <div style={{ maxWidth }}>
-      {chartPoint.dataMax > chartPoint.dataMin ? (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCard.metricDistributionChart.tooltipValueBetweenLabel"
-          defaultMessage="{percent}% of documents have values between {minValFormatted} and {maxValFormatted}"
-          values={{
-            percent: chartPoint.percent,
-            minValFormatted: kibanaFieldFormat(chartPoint.dataMin, fieldFormat),
-            maxValFormatted: kibanaFieldFormat(chartPoint.dataMax, fieldFormat),
-          }}
-        />
-      ) : (
-        <FormattedMessage
-          id="xpack.ml.fieldDataCard.metricDistributionChart.tooltipValueEqualLabel"
-          defaultMessage="{percent}% of documents have a value of {valFormatted}"
-          values={{
-            percent: chartPoint.percent,
-            valFormatted: kibanaFieldFormat(chartPoint.dataMin, fieldFormat),
-          }}
-        />
-      )}
-    </div>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx
deleted file mode 100644
index 2003d07efca82..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/data_visualizer_stats_table.tsx
+++ /dev/null
@@ -1,270 +0,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, { useMemo, useState } from 'react';
-
-import {
-  CENTER_ALIGNMENT,
-  EuiBasicTableColumn,
-  EuiButtonIcon,
-  EuiFlexItem,
-  EuiIcon,
-  EuiInMemoryTable,
-  EuiText,
-  HorizontalAlignment,
-  LEFT_ALIGNMENT,
-  RIGHT_ALIGNMENT,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { EuiTableComputedColumnType } from '@elastic/eui/src/components/basic_table/table_types';
-import { ML_JOB_FIELD_TYPES } from '../../../../common/constants/field_types';
-import { FieldTypeIcon } from '../../components/field_type_icon';
-import { DocumentStat } from './components/field_data_row/document_stats';
-import { DistinctValues } from './components/field_data_row/distinct_values';
-import { IndexBasedNumberContentPreview } from './components/field_data_row/number_content_preview';
-import {
-  DataVisualizerFileBasedAppState,
-  DataVisualizerIndexBasedAppState,
-} from '../../../../common/types/ml_url_generator';
-import { useTableSettings } from '../../data_frame_analytics/pages/analytics_management/components/analytics_list/use_table_settings';
-import { TopValuesPreview } from './components/field_data_row/top_values_preview';
-import type { MlJobFieldType } from '../../../../common/types/field_types';
-import {
-  FieldVisConfig,
-  FileBasedFieldVisConfig,
-  isIndexBasedFieldVisConfig,
-} from './types/field_vis_config';
-import { BooleanContentPreview } from './components/field_data_row';
-
-const FIELD_NAME = 'fieldName';
-
-export type ItemIdToExpandedRowMap = Record<string, JSX.Element>;
-
-type DataVisualizerTableItem = FieldVisConfig | FileBasedFieldVisConfig;
-interface DataVisualizerTableProps<T> {
-  items: T[];
-  pageState: DataVisualizerIndexBasedAppState | DataVisualizerFileBasedAppState;
-  updatePageState: (
-    update: Partial<DataVisualizerIndexBasedAppState | DataVisualizerFileBasedAppState>
-  ) => void;
-  getItemIdToExpandedRowMap: (itemIds: string[], items: T[]) => ItemIdToExpandedRowMap;
-  extendedColumns?: Array<EuiBasicTableColumn<T>>;
-}
-
-export const DataVisualizerTable = <T extends DataVisualizerTableItem>({
-  items,
-  pageState,
-  updatePageState,
-  getItemIdToExpandedRowMap,
-  extendedColumns,
-}: DataVisualizerTableProps<T>) => {
-  const [expandedRowItemIds, setExpandedRowItemIds] = useState<string[]>([]);
-  const [expandAll, toggleExpandAll] = useState<boolean>(false);
-
-  const { onTableChange, pagination, sorting } = useTableSettings<T>(
-    items,
-    pageState,
-    updatePageState
-  );
-  const showDistributions: boolean =
-    ('showDistributions' in pageState && pageState.showDistributions) ?? true;
-  const toggleShowDistribution = () => {
-    updatePageState({
-      ...pageState,
-      showDistributions: !showDistributions,
-    });
-  };
-
-  function toggleDetails(item: DataVisualizerTableItem) {
-    if (item.fieldName === undefined) return;
-    const index = expandedRowItemIds.indexOf(item.fieldName);
-    if (index !== -1) {
-      expandedRowItemIds.splice(index, 1);
-    } else {
-      expandedRowItemIds.push(item.fieldName);
-    }
-
-    // spread to a new array otherwise the component wouldn't re-render
-    setExpandedRowItemIds([...expandedRowItemIds]);
-  }
-
-  const columns = useMemo(() => {
-    const expanderColumn: EuiTableComputedColumnType<DataVisualizerTableItem> = {
-      name: (
-        <EuiButtonIcon
-          data-test-subj={`mlToggleDetailsForAllRowsButton ${expandAll ? 'expanded' : 'collapsed'}`}
-          onClick={() => toggleExpandAll(!expandAll)}
-          aria-label={
-            !expandAll
-              ? i18n.translate('xpack.ml.datavisualizer.dataGrid.expandDetailsForAllAriaLabel', {
-                  defaultMessage: 'Expand details for all fields',
-                })
-              : i18n.translate('xpack.ml.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel', {
-                  defaultMessage: 'Collapse details for all fields',
-                })
-          }
-          iconType={expandAll ? 'arrowUp' : 'arrowDown'}
-        />
-      ),
-      align: RIGHT_ALIGNMENT,
-      width: '40px',
-      isExpander: true,
-      render: (item: DataVisualizerTableItem) => {
-        if (item.fieldName === undefined) return null;
-        const direction = expandedRowItemIds.includes(item.fieldName) ? 'arrowUp' : 'arrowDown';
-        return (
-          <EuiButtonIcon
-            data-test-subj={`mlDataVisualizerDetailsToggle-${item.fieldName}-${direction}`}
-            onClick={() => toggleDetails(item)}
-            aria-label={
-              expandedRowItemIds.includes(item.fieldName)
-                ? i18n.translate('xpack.ml.datavisualizer.dataGrid.rowCollapse', {
-                    defaultMessage: 'Hide details for {fieldName}',
-                    values: { fieldName: item.fieldName },
-                  })
-                : i18n.translate('xpack.ml.datavisualizer.dataGrid.rowExpand', {
-                    defaultMessage: 'Show details for {fieldName}',
-                    values: { fieldName: item.fieldName },
-                  })
-            }
-            iconType={direction}
-          />
-        );
-      },
-      'data-test-subj': 'mlDataVisualizerTableColumnDetailsToggle',
-    };
-
-    const baseColumns = [
-      expanderColumn,
-      {
-        field: 'type',
-        name: i18n.translate('xpack.ml.datavisualizer.dataGrid.typeColumnName', {
-          defaultMessage: 'Type',
-        }),
-        render: (fieldType: MlJobFieldType) => {
-          return <FieldTypeIcon type={fieldType} tooltipEnabled={true} needsAria={true} />;
-        },
-        width: '75px',
-        sortable: true,
-        align: CENTER_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnType',
-      },
-      {
-        field: 'fieldName',
-        name: i18n.translate('xpack.ml.datavisualizer.dataGrid.nameColumnName', {
-          defaultMessage: 'Name',
-        }),
-        sortable: true,
-        truncateText: true,
-        render: (fieldName: string) => (
-          <EuiText size="s">
-            <b>{fieldName}</b>
-          </EuiText>
-        ),
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnName',
-      },
-      {
-        field: 'docCount',
-        name: i18n.translate('xpack.ml.datavisualizer.dataGrid.documentsCountColumnName', {
-          defaultMessage: 'Documents (%)',
-        }),
-        render: (value: number | undefined, item: DataVisualizerTableItem) => (
-          <DocumentStat config={item} />
-        ),
-        sortable: (item: DataVisualizerTableItem) => item?.stats?.count,
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnDocumentsCount',
-      },
-      {
-        field: 'stats.cardinality',
-        name: i18n.translate('xpack.ml.datavisualizer.dataGrid.distinctValuesColumnName', {
-          defaultMessage: 'Distinct values',
-        }),
-        render: (cardinality?: number) => <DistinctValues cardinality={cardinality} />,
-        sortable: true,
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnDistinctValues',
-      },
-      {
-        name: (
-          <div style={{ display: 'flex', alignItems: 'center' }}>
-            <EuiIcon type={'visBarVertical'} style={{ paddingRight: 4 }} />
-            {i18n.translate('xpack.ml.datavisualizer.dataGrid.distributionsColumnName', {
-              defaultMessage: 'Distributions',
-            })}
-            <EuiButtonIcon
-              style={{ marginLeft: 4 }}
-              size={'s'}
-              iconType={showDistributions ? 'eye' : 'eyeClosed'}
-              onClick={() => toggleShowDistribution()}
-              aria-label={i18n.translate(
-                'xpack.ml.datavisualizer.dataGrid.showDistributionsAriaLabel',
-                {
-                  defaultMessage: 'Show distributions',
-                }
-              )}
-            />
-          </div>
-        ),
-        render: (item: DataVisualizerTableItem) => {
-          if (item === undefined || showDistributions === false) return null;
-          if (
-            (item.type === ML_JOB_FIELD_TYPES.KEYWORD || item.type === ML_JOB_FIELD_TYPES.IP) &&
-            item.stats?.topValues !== undefined
-          ) {
-            return <TopValuesPreview config={item} />;
-          }
-
-          if (item.type === ML_JOB_FIELD_TYPES.NUMBER) {
-            if (isIndexBasedFieldVisConfig(item) && item.stats?.distribution !== undefined) {
-              return <IndexBasedNumberContentPreview config={item} />;
-            }
-          }
-
-          if (item.type === ML_JOB_FIELD_TYPES.BOOLEAN) {
-            return <BooleanContentPreview config={item} />;
-          }
-
-          return null;
-        },
-        align: LEFT_ALIGNMENT as HorizontalAlignment,
-        'data-test-subj': 'mlDataVisualizerTableColumnDistribution',
-      },
-    ];
-    return extendedColumns ? [...baseColumns, ...extendedColumns] : baseColumns;
-  }, [expandAll, showDistributions, updatePageState, extendedColumns]);
-
-  const itemIdToExpandedRowMap = useMemo(() => {
-    let itemIds = expandedRowItemIds;
-    if (expandAll) {
-      itemIds = items.map((i) => i[FIELD_NAME]).filter((f) => f !== undefined) as string[];
-    }
-    return getItemIdToExpandedRowMap(itemIds, items);
-  }, [expandAll, items, expandedRowItemIds]);
-
-  return (
-    <EuiFlexItem data-test-subj="mlDataVisualizerTableContainer">
-      <EuiInMemoryTable<T>
-        className={'mlDataVisualizer'}
-        items={items}
-        itemId={FIELD_NAME}
-        columns={columns}
-        pagination={pagination}
-        sorting={sorting}
-        isExpandable={true}
-        itemIdToExpandedRowMap={itemIdToExpandedRowMap}
-        isSelectable={false}
-        onTableChange={onTableChange}
-        data-test-subj={'mlDataVisualizerTable'}
-        rowProps={(item) => ({
-          'data-test-subj': `mlDataVisualizerRow row-${item.fieldName}`,
-        })}
-      />
-    </EuiFlexItem>
-  );
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/index.ts
deleted file mode 100644
index 85d85f51a623f..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { useDataVizChartTheme } from './use_data_viz_chart_theme';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/use_data_viz_chart_theme.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/use_data_viz_chart_theme.ts
deleted file mode 100644
index 0addadf3af0e9..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/hooks/use_data_viz_chart_theme.ts
+++ /dev/null
@@ -1,55 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { PartialTheme } from '@elastic/charts';
-import { useMemo } from 'react';
-import { useCurrentEuiTheme } from '../../../components/color_range_legend';
-export const useDataVizChartTheme = (): PartialTheme => {
-  const { euiTheme } = useCurrentEuiTheme();
-  const chartTheme = useMemo(() => {
-    const AREA_SERIES_COLOR = euiTheme.euiColorVis0;
-    return {
-      axes: {
-        tickLabel: {
-          fontSize: parseInt(euiTheme.euiFontSizeXS, 10),
-          fontFamily: euiTheme.euiFontFamily,
-          fontStyle: 'italic',
-        },
-      },
-      background: { color: 'transparent' },
-      chartMargins: {
-        left: 0,
-        right: 0,
-        top: 0,
-        bottom: 0,
-      },
-      chartPaddings: {
-        left: 0,
-        right: 0,
-        top: 4,
-        bottom: 0,
-      },
-      scales: { barsPadding: 0.1 },
-      colors: {
-        vizColors: [AREA_SERIES_COLOR],
-      },
-      areaSeriesStyle: {
-        line: {
-          strokeWidth: 1,
-          visible: true,
-        },
-        point: {
-          visible: false,
-          radius: 0,
-          opacity: 0,
-        },
-        area: { visible: true, opacity: 1 },
-      },
-    };
-  }, [euiTheme]);
-  return chartTheme;
-};
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/index.ts
deleted file mode 100644
index 3009470af4858..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/index.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { DataVisualizerTable, ItemIdToExpandedRowMap } from './data_visualizer_stats_table';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_data_row.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_data_row.ts
deleted file mode 100644
index 24209af23ceb4..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_data_row.ts
+++ /dev/null
@@ -1,12 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import type { FieldVisConfig, FileBasedFieldVisConfig } from './field_vis_config';
-
-export interface FieldDataRowProps {
-  config: FieldVisConfig | FileBasedFieldVisConfig;
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_vis_config.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_vis_config.ts
deleted file mode 100644
index aa7bd2f5ecf6d..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/field_vis_config.ts
+++ /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 { MlJobFieldType } from '../../../../../common/types/field_types';
-
-export interface Percentile {
-  percent: number;
-  minValue: number;
-  maxValue: number;
-}
-
-export interface MetricFieldVisStats {
-  avg?: number;
-  distribution?: {
-    percentiles: Percentile[];
-    maxPercentile: number;
-    minPercentile: 0;
-  };
-  max?: number;
-  median?: number;
-  min?: number;
-}
-
-interface DocumentCountBuckets {
-  [key: string]: number;
-}
-
-export interface FieldVisStats {
-  cardinality?: number;
-  count?: number;
-  sampleCount?: number;
-  trueCount?: number;
-  falseCount?: number;
-  earliest?: number;
-  latest?: number;
-  documentCounts?: {
-    buckets?: DocumentCountBuckets;
-    interval?: number;
-  };
-  avg?: number;
-  distribution?: {
-    percentiles: Percentile[];
-    maxPercentile: number;
-    minPercentile: 0;
-  };
-  fieldName?: string;
-  isTopValuesSampled?: boolean;
-  max?: number;
-  median?: number;
-  min?: number;
-  topValues?: Array<{ key: number | string; doc_count: number }>;
-  topValuesSampleSize?: number;
-  topValuesSamplerShardSize?: number;
-  examples?: Array<string | object>;
-  timeRangeEarliest?: number;
-  timeRangeLatest?: number;
-}
-
-// The internal representation of the configuration used to build the visuals
-// which display the field information.
-export interface FieldVisConfig {
-  type: MlJobFieldType;
-  fieldName?: string;
-  existsInDocs: boolean;
-  aggregatable: boolean;
-  loading: boolean;
-  stats?: FieldVisStats;
-  fieldFormat?: any;
-  isUnsupportedType?: boolean;
-}
-
-export interface FileBasedFieldVisConfig {
-  type: MlJobFieldType;
-  fieldName?: string;
-  stats?: FieldVisStats;
-  format?: string;
-}
-
-export interface FileBasedUnknownFieldVisConfig {
-  fieldName: string;
-  type: 'text' | 'unknown';
-  stats: { mean: number; count: number; sampleCount: number; cardinality: number };
-}
-
-export function isFileBasedFieldVisConfig(
-  field: FieldVisConfig | FileBasedFieldVisConfig
-): field is FileBasedFieldVisConfig {
-  return !field.hasOwnProperty('existsInDocs');
-}
-
-export function isIndexBasedFieldVisConfig(
-  field: FieldVisConfig | FileBasedFieldVisConfig
-): field is FieldVisConfig {
-  return field.hasOwnProperty('existsInDocs');
-}
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/index.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/index.ts
deleted file mode 100644
index 161829461aa26..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/types/index.ts
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export { FieldDataRowProps } from './field_data_row';
-export {
-  FieldVisConfig,
-  FileBasedFieldVisConfig,
-  FieldVisStats,
-  MetricFieldVisStats,
-  isFileBasedFieldVisConfig,
-  isIndexBasedFieldVisConfig,
-} from './field_vis_config';
diff --git a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/utils.ts b/x-pack/plugins/ml/public/application/datavisualizer/stats_table/utils.ts
deleted file mode 100644
index 27da91153b3ba..0000000000000
--- a/x-pack/plugins/ml/public/application/datavisualizer/stats_table/utils.ts
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { FileBasedFieldVisConfig } from './types';
-
-export const getTFPercentage = (config: FileBasedFieldVisConfig) => {
-  const { stats } = config;
-  if (stats === undefined) return null;
-  const { count } = stats;
-  // use stats from index based config
-  let { trueCount, falseCount } = stats;
-
-  // use stats from file based find structure results
-  if (stats.trueCount === undefined || stats.falseCount === undefined) {
-    if (config?.stats?.topValues) {
-      config.stats.topValues.forEach((doc) => {
-        if (doc.doc_count !== undefined) {
-          if (doc.key.toString().toLowerCase() === 'false') {
-            falseCount = doc.doc_count;
-          }
-          if (doc.key.toString().toLowerCase() === 'true') {
-            trueCount = doc.doc_count;
-          }
-        }
-      });
-    }
-  }
-  if (count === undefined || trueCount === undefined || falseCount === undefined) return null;
-  return {
-    count,
-    trueCount,
-    falseCount,
-  };
-};
diff --git a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx
index 8375b0a0b1dfc..d20042ddd9443 100644
--- a/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx
+++ b/x-pack/plugins/ml/public/application/explorer/anomaly_timeline.tsx
@@ -8,20 +8,21 @@
 import React, { FC, useCallback, useMemo, useState } from 'react';
 import { isEqual } from 'lodash';
 import {
-  EuiPanel,
-  EuiPopover,
-  EuiContextMenuPanel,
+  EuiButtonEmpty,
   EuiButtonIcon,
+  EuiContextMenuItem,
+  EuiContextMenuPanel,
   EuiFlexGroup,
   EuiFlexItem,
+  EuiPanel,
+  EuiPopover,
   EuiSelect,
-  EuiTitle,
   EuiSpacer,
-  EuiContextMenuItem,
-  EuiButtonEmpty,
+  EuiTitle,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
+import useDebounce from 'react-use/lib/useDebounce';
 import { OVERALL_LABEL, SWIMLANE_TYPE, VIEW_BY_JOB_LABEL } from './explorer_constants';
 import { AddSwimlaneToDashboardControl } from './dashboard_controls/add_swimlane_to_dashboard_controls';
 import { useMlKibana } from '../contexts/kibana';
@@ -93,6 +94,18 @@ export const AnomalyTimeline: FC<AnomalyTimelineProps> = React.memo(
       viewBySwimlaneData,
     } = explorerState;
 
+    const [severityUpdate, setSeverityUpdate] = useState(swimLaneSeverity);
+
+    useDebounce(
+      () => {
+        if (severityUpdate === swimLaneSeverity) return;
+
+        explorerService.setSwimLaneSeverity(severityUpdate!);
+      },
+      500,
+      [severityUpdate, swimLaneSeverity]
+    );
+
     const annotations = useMemo(() => overallAnnotations.annotationsData, [overallAnnotations]);
 
     const menuItems = useMemo(() => {
@@ -194,9 +207,9 @@ export const AnomalyTimeline: FC<AnomalyTimelineProps> = React.memo(
 
             <EuiFlexItem grow={true}>
               <SeverityControl
-                value={swimLaneSeverity ?? 0}
+                value={severityUpdate ?? 0}
                 onChange={useCallback((update) => {
-                  explorerService.setSwimLaneSeverity(update);
+                  setSeverityUpdate(update);
                 }, [])}
               />
             </EuiFlexItem>
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 45b26226def8f..35847839b02a0 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
@@ -29,7 +29,7 @@ export interface RichDetector {
   byField: SplitField;
   overField: SplitField;
   partitionField: SplitField;
-  excludeFrequent: estypes.ExcludeFrequent | null;
+  excludeFrequent: estypes.MlExcludeFrequent | null;
   description: string | null;
   customRules: CustomRule[] | null;
   useNull: boolean | null;
@@ -58,7 +58,7 @@ export class AdvancedJobCreator extends JobCreator {
     byField: SplitField,
     overField: SplitField,
     partitionField: SplitField,
-    excludeFrequent: estypes.ExcludeFrequent | null,
+    excludeFrequent: estypes.MlExcludeFrequent | null,
     description: string | null,
     useNull: boolean | null
   ) {
@@ -87,7 +87,7 @@ export class AdvancedJobCreator extends JobCreator {
     byField: SplitField,
     overField: SplitField,
     partitionField: SplitField,
-    excludeFrequent: estypes.ExcludeFrequent | null,
+    excludeFrequent: estypes.MlExcludeFrequent | null,
     description: string | null,
     index: number,
     useNull: boolean | null
@@ -120,7 +120,7 @@ export class AdvancedJobCreator extends JobCreator {
     byField: SplitField,
     overField: SplitField,
     partitionField: SplitField,
-    excludeFrequent: estypes.ExcludeFrequent | null,
+    excludeFrequent: estypes.MlExcludeFrequent | null,
     description: string | null,
     customRules: CustomRule[] | null,
     useNull: boolean | null
@@ -193,7 +193,6 @@ export class AdvancedJobCreator extends JobCreator {
       timeFieldName: this.timeFieldName,
       query: this.query,
       runtimeMappings: this.datafeedConfig.runtime_mappings,
-      // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
       indicesOptions: this.datafeedConfig.indices_options,
     });
     this.setTimeRange(start.epoch, end.epoch);
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 fe0329851758c..d4a410bcda24c 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
@@ -226,6 +226,7 @@ export class JobCreator {
   }
 
   public get groups(): string[] {
+    // @ts-expect-error @elastic-elasticsearch FIXME groups is optional
     return this._job_config.groups;
   }
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts
index 7f1ee2349c2c1..f81362ad83288 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/job_creator/util/filter_runtime_mappings.test.ts
@@ -54,19 +54,19 @@ function getDatafeed(): Datafeed {
     runtime_mappings: {
       responsetime_big: {
         type: 'double',
-        // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
         script: {
           source: "emit(doc['responsetime'].value * 100.0)",
         },
       },
       airline_lower: {
         type: 'keyword',
-        // @ts-expect-error @elastic/elasticsearch StoredScript.language is required
         script: {
           source: "emit(doc['airline'].value.toLowerCase())",
         },
       },
     },
+    chunking_config: { mode: 'auto' },
+    delayed_data_check_config: { enabled: false },
   };
 }
 
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 b51cd9b99792b..641eda3dbf3e8 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
@@ -52,7 +52,6 @@ export class CategorizationExamplesLoader {
       this._jobCreator.end,
       analyzer,
       this._jobCreator.runtimeMappings ?? undefined,
-      // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
       this._jobCreator.datafeedConfig.indices_options
     );
     return resp;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
index 6d5fa26af7024..a01581f7526c5 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/common/results_loader/results_loader.ts
@@ -257,7 +257,6 @@ export class ResultsLoader {
         const fieldValues = await this._chartLoader.loadFieldExampleValues(
           this._jobCreator.splitField,
           this._jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           this._jobCreator.datafeedConfig.indices_options
         );
         if (fieldValues.length > 0) {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
index 28194e2d453ac..855c66e1e1c0d 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/line.tsx
@@ -29,7 +29,6 @@ export const Line: FC<Props> = ({ chartData }) => {
       xAccessor={'time'}
       yAccessors={['value']}
       data={chartData}
-      yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       lineSeriesStyle={lineSeriesStyle}
       color={LINE_COLOR}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
index a2d2bad5a503e..fe07c6800c0e8 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/model_bounds.tsx
@@ -42,7 +42,6 @@ export const ModelBounds: FC<Props> = ({ modelData }) => {
       y0Accessors={['modelLower']}
       data={model}
       stackAccessors={['time']}
-      yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       areaSeriesStyle={areaSeriesStyle}
       color={MODEL_COLOR}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
index cbe3a99512d1e..bc6d0065fec8e 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/anomaly_chart/scatter.tsx
@@ -37,7 +37,6 @@ export const Scatter: FC<Props> = ({ chartData }) => {
       xAccessor={'time'}
       yAccessors={['value']}
       data={chartData}
-      yScaleToDataExtent={false}
       curve={CurveType.CURVE_MONOTONE_X}
       lineSeriesStyle={scatterSeriesStyle}
       color={LINE_COLOR}
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx
index 320faf0bbc615..bbd700a0ef8e1 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/axes.tsx
@@ -22,7 +22,7 @@ function tickFormatter(d: number): string {
 }
 
 export const Axes: FC<Props> = ({ chartData }) => {
-  const yDomain = chartData !== undefined ? getYRange(chartData) : undefined;
+  const yDomain = getYRange(chartData);
 
   return (
     <Fragment>
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts
index 8623133fa7835..c55bb769b6eb9 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/charts/common/utils.ts
@@ -5,9 +5,15 @@
  * 2.0.
  */
 
-export function getYRange(chartData: any[]) {
+export function getYRange(chartData?: any[]) {
+  const fit = false;
+
+  if (chartData === undefined) {
+    return { fit };
+  }
+
   if (chartData.length === 0) {
-    return { min: 0, max: 0 };
+    return { min: 0, max: 0, fit };
   }
 
   let max: number = Number.MIN_VALUE;
@@ -24,6 +30,7 @@ export function getYRange(chartData: any[]) {
   return {
     min,
     max,
+    fit,
   };
 }
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
index 2b1a35bcb8c46..237af335ffa51 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/advanced_detector_modal/advanced_detector_modal.tsx
@@ -173,7 +173,7 @@ export const AdvancedDetectorModal: FC<Props> = ({
       partitionField,
       excludeFrequent:
         excludeFrequentOption.label !== ''
-          ? (excludeFrequentOption.label as estypes.ExcludeFrequent)
+          ? (excludeFrequentOption.label as estypes.MlExcludeFrequent)
           : null,
       description: descriptionOption !== '' ? descriptionOption : null,
       customRules: null,
@@ -349,7 +349,7 @@ function createFieldOption(field: Field | null): EuiComboBoxOptionOption {
 }
 
 function createExcludeFrequentOption(
-  excludeFrequent: estypes.ExcludeFrequent | null
+  excludeFrequent: estypes.MlExcludeFrequent | null
 ): EuiComboBoxOptionOption {
   if (excludeFrequent === null) {
     return emptyOption;
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
index 113bde6fbf93d..85083146c1378 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/bucket_span_estimator/estimate_bucket_span.ts
@@ -42,7 +42,6 @@ export function useEstimateBucketSpan() {
     splitField: undefined,
     timeField: mlContext.currentIndexPattern.timeFieldName,
     runtimeMappings: jobCreator.runtimeMappings ?? undefined,
-    // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
     indicesOptions: jobCreator.datafeedConfig.indices_options,
   };
 
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
index c553da93a4bc0..9d84854245216 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/categorization_view/metric_selection_summary.tsx
@@ -56,7 +56,6 @@ export const CategorizationDetectorsSummary: FC = () => {
         jobCreator.end,
         chartInterval.getInterval().asMilliseconds(),
         jobCreator.runtimeMappings ?? undefined,
-        // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
         jobCreator.datafeedConfig.indices_options
       );
       setEventRateChartData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
index 6cbf96fcb04e8..58252feca4b53 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection.tsx
@@ -114,7 +114,6 @@ export const MultiMetricDetectors: FC<Props> = ({ setIsValid }) => {
         .loadFieldExampleValues(
           splitField,
           jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           jobCreator.datafeedConfig.indices_options
         )
         .then(setFieldValues)
@@ -146,7 +145,6 @@ export const MultiMetricDetectors: FC<Props> = ({ setIsValid }) => {
           fieldValues.length > 0 ? fieldValues[0] : null,
           cs.intervalMs,
           jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           jobCreator.datafeedConfig.indices_options
         );
         setLineChartsData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx
index dc76fc0178112..a4c344d16482b 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/multi_metric_view/metric_selection_summary.tsx
@@ -44,7 +44,6 @@ export const MultiMetricDetectorsSummary: FC = () => {
           const tempFieldValues = await chartLoader.loadFieldExampleValues(
             jobCreator.splitField,
             jobCreator.runtimeMappings,
-            // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
             jobCreator.datafeedConfig.indices_options
           );
           setFieldValues(tempFieldValues);
@@ -79,7 +78,6 @@ export const MultiMetricDetectorsSummary: FC = () => {
           fieldValues.length > 0 ? fieldValues[0] : null,
           cs.intervalMs,
           jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           jobCreator.datafeedConfig.indices_options
         );
         setLineChartsData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
index c5efd4b226d5c..1be487d5b7eec 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection.tsx
@@ -161,7 +161,6 @@ export const PopulationDetectors: FC<Props> = ({ setIsValid }) => {
           jobCreator.splitField,
           cs.intervalMs,
           jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           jobCreator.datafeedConfig.indices_options
         );
 
@@ -185,7 +184,6 @@ export const PopulationDetectors: FC<Props> = ({ setIsValid }) => {
               fields: await chartLoader.loadFieldExampleValues(
                 field,
                 jobCreator.runtimeMappings,
-                // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
                 jobCreator.datafeedConfig.indices_options
               ),
             };
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx
index 31b436944a5b0..55a9d37d1115c 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/population_view/metric_selection_summary.tsx
@@ -79,7 +79,6 @@ export const PopulationDetectorsSummary: FC = () => {
           jobCreator.splitField,
           cs.intervalMs,
           jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           jobCreator.datafeedConfig.indices_options
         );
 
@@ -103,7 +102,6 @@ export const PopulationDetectorsSummary: FC = () => {
               fields: await chartLoader.loadFieldExampleValues(
                 field,
                 jobCreator.runtimeMappings,
-                // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
                 jobCreator.datafeedConfig.indices_options
               ),
             };
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
index b2a97d8e0589a..d41234bbedd81 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection.tsx
@@ -94,7 +94,6 @@ export const SingleMetricDetectors: FC<Props> = ({ setIsValid }) => {
           null,
           cs.intervalMs,
           jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           jobCreator.datafeedConfig.indices_options
         );
         if (resp[DTR_IDX] !== undefined) {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx
index 5e64f4ef18984..ced94b2095f72 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/pick_fields_step/components/single_metric_view/metric_selection_summary.tsx
@@ -60,7 +60,6 @@ export const SingleMetricDetectorsSummary: FC = () => {
           null,
           cs.intervalMs,
           jobCreator.runtimeMappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           jobCreator.datafeedConfig.indices_options
         );
         if (resp[DTR_IDX] !== undefined) {
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx
index 7e7b919f677ab..66c92d5c80851 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/pages/components/time_range_step/time_range.tsx
@@ -49,7 +49,6 @@ export const TimeRangeStep: FC<StepProps> = ({ setCurrentStep, isCurrentStep })
         jobCreator.end,
         chartInterval.getInterval().asMilliseconds(),
         jobCreator.runtimeMappings ?? undefined,
-        // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
         jobCreator.datafeedConfig.indices_options
       );
       setEventRateChartData(resp);
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx
index 6ce808ed36b15..d2780691e551d 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/edit_job.tsx
@@ -51,9 +51,9 @@ export const EditJob: FC<EditJobProps> = ({ job, jobOverride, existingGroupIds,
   );
 
   const handleValidation = () => {
-    const jobGroupsValidationResult = formState.jobGroups
-      .map((group) => groupValidator(group))
-      .filter((result) => result !== null);
+    const jobGroupsValidationResult =
+      formState.jobGroups ??
+      [].map((group) => groupValidator(group)).filter((result) => result !== null);
 
     setValidationResult({
       jobGroups: jobGroupsValidationResult,
@@ -92,7 +92,7 @@ export const EditJob: FC<EditJobProps> = ({ job, jobOverride, existingGroupIds,
           <EuiFormRow fullWidth>
             <JobGroupsInput
               existingGroups={existingGroupIds}
-              selectedGroups={formState.jobGroups}
+              selectedGroups={formState.jobGroups ?? []}
               onChange={(value) => {
                 setFormState({
                   jobGroups: value,
diff --git a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx
index 311e291cf2519..b97c16e02d900 100644
--- a/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx
+++ b/x-pack/plugins/ml/public/application/jobs/new_job/recognize/components/job_item.tsx
@@ -87,11 +87,12 @@ export const JobItem: FC<JobItemProps> = memo(
           </EuiText>
 
           <EuiFlexGroup wrap responsive={false} gutterSize="xs">
-            {jobGroups.map((group) => (
-              <EuiFlexItem grow={false} key={group}>
-                <EuiBadge color={tabColor(group)}>{group}</EuiBadge>
-              </EuiFlexItem>
-            ))}
+            {jobGroups ??
+              [].map((group) => (
+                <EuiFlexItem grow={false} key={group}>
+                  <EuiBadge color={tabColor(group)}>{group}</EuiBadge>
+                </EuiFlexItem>
+              ))}
           </EuiFlexGroup>
 
           {setupResult && setupResult.error && (
diff --git a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx
index 7911014291f15..27676820c0472 100644
--- a/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx
+++ b/x-pack/plugins/ml/public/application/routing/routes/datavisualizer/index_based.tsx
@@ -14,7 +14,7 @@ import { NavigateToPath } from '../../../contexts/kibana';
 
 import { MlRoute, PageLoader, PageProps } from '../../router';
 import { useResolver } from '../../use_resolver';
-import { Page } from '../../../datavisualizer/index_based';
+import { IndexDataVisualizerPage as Page } from '../../../datavisualizer/index_based/index_data_visualizer';
 
 import { checkBasicLicense } from '../../../license';
 import { checkGetJobsCapabilitiesResolver } from '../../../capabilities/check_capabilities';
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 f8ec4b6488316..d66805b4f737f 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
@@ -35,10 +35,7 @@ import {
   ModelSnapshot,
   IndicesOptions,
 } from '../../../../common/types/anomaly_detection_jobs';
-import {
-  FieldHistogramRequestConfig,
-  FieldRequestConfig,
-} from '../../datavisualizer/index_based/common';
+import { FieldHistogramRequestConfig } from '../../datavisualizer/index_based/common/request';
 import { DataRecognizerConfigResponse, Module } from '../../../../common/types/modules';
 import { getHttp } from '../../util/dependency_cache';
 import type { RuntimeMappings } from '../../../../common/types/fields';
@@ -465,48 +462,6 @@ export function mlApiServicesProvider(httpService: HttpService) {
       });
     },
 
-    getVisualizerFieldStats({
-      indexPatternTitle,
-      query,
-      timeFieldName,
-      earliest,
-      latest,
-      samplerShardSize,
-      interval,
-      fields,
-      maxExamples,
-      runtimeMappings,
-    }: {
-      indexPatternTitle: string;
-      query: any;
-      timeFieldName?: string;
-      earliest?: number;
-      latest?: number;
-      samplerShardSize?: number;
-      interval?: number;
-      fields?: FieldRequestConfig[];
-      maxExamples?: number;
-      runtimeMappings?: RuntimeMappings;
-    }) {
-      const body = JSON.stringify({
-        query,
-        timeFieldName,
-        earliest,
-        latest,
-        samplerShardSize,
-        interval,
-        fields,
-        maxExamples,
-        runtimeMappings,
-      });
-
-      return httpService.http<any>({
-        path: `${basePath()}/data_visualizer/get_field_stats/${indexPatternTitle}`,
-        method: 'POST',
-        body,
-      });
-    },
-
     getVisualizerFieldHistograms({
       indexPatternTitle,
       query,
@@ -534,45 +489,6 @@ export function mlApiServicesProvider(httpService: HttpService) {
       });
     },
 
-    getVisualizerOverallStats({
-      indexPatternTitle,
-      query,
-      timeFieldName,
-      earliest,
-      latest,
-      samplerShardSize,
-      aggregatableFields,
-      nonAggregatableFields,
-      runtimeMappings,
-    }: {
-      indexPatternTitle: string;
-      query: any;
-      timeFieldName?: string;
-      earliest?: number;
-      latest?: number;
-      samplerShardSize?: number;
-      aggregatableFields: string[];
-      nonAggregatableFields: string[];
-      runtimeMappings?: RuntimeMappings;
-    }) {
-      const body = JSON.stringify({
-        query,
-        timeFieldName,
-        earliest,
-        latest,
-        samplerShardSize,
-        aggregatableFields,
-        nonAggregatableFields,
-        runtimeMappings,
-      });
-
-      return httpService.http<any>({
-        path: `${basePath()}/data_visualizer/get_overall_stats/${indexPatternTitle}`,
-        method: 'POST',
-        body,
-      });
-    },
-
     /**
      * Gets a list of calendars
      * @param obj
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
index c2b806abcf286..b6b63d7713b85 100644
--- a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer.js
@@ -33,6 +33,7 @@ import {
   EuiBadge,
 } from '@elastic/eui';
 import { ResizeChecker } from '../../../../../../src/plugins/kibana_utils/public';
+import { TimeSeriesExplorerHelpPopover } from './timeseriesexplorer_help_popover';
 
 import { ANOMALIES_TABLE_DEFAULT_QUERY_SIZE } from '../../../common/constants/search';
 import {
@@ -1083,58 +1084,67 @@ export class TimeSeriesExplorer extends React.Component {
           hasResults === true && (
             <div>
               <div className="results-container">
-                <EuiTitle className="panel-title">
-                  <h2 style={{ display: 'inline' }}>
-                    <span>
-                      {i18n.translate('xpack.ml.timeSeriesExplorer.singleTimeSeriesAnalysisTitle', {
-                        defaultMessage: 'Single time series analysis of {functionLabel}',
-                        values: { functionLabel: chartDetails.functionLabel },
-                      })}
-                    </span>
-                    &nbsp;
-                    {chartDetails.entityData.count === 1 && (
-                      <span className="entity-count-text">
-                        {chartDetails.entityData.entities.length > 0 && '('}
-                        {chartDetails.entityData.entities
-                          .map((entity) => {
-                            return `${entity.fieldName}: ${entity.fieldValue}`;
-                          })
-                          .join(', ')}
-                        {chartDetails.entityData.entities.length > 0 && ')'}
-                      </span>
-                    )}
-                    {chartDetails.entityData.count !== 1 && (
-                      <span className="entity-count-text">
-                        {chartDetails.entityData.entities.map((countData, i) => {
-                          return (
-                            <Fragment key={countData.fieldName}>
-                              {i18n.translate(
-                                'xpack.ml.timeSeriesExplorer.countDataInChartDetailsDescription',
-                                {
-                                  defaultMessage:
-                                    '{openBrace}{cardinalityValue} distinct {fieldName} {cardinality, plural, one {} other { values}}{closeBrace}',
-                                  values: {
-                                    openBrace: i === 0 ? '(' : '',
-                                    closeBrace:
-                                      i === chartDetails.entityData.entities.length - 1 ? ')' : '',
-                                    cardinalityValue:
-                                      countData.cardinality === 0
-                                        ? allValuesLabel
-                                        : countData.cardinality,
-                                    cardinality: countData.cardinality,
-                                    fieldName: countData.fieldName,
-                                  },
-                                }
-                              )}
-                              {i !== chartDetails.entityData.entities.length - 1 ? ', ' : ''}
-                            </Fragment>
-                          );
-                        })}
+                <EuiFlexGroup gutterSize="xs" alignItems="center">
+                  <EuiTitle className="panel-title">
+                    <h2 style={{ display: 'inline' }}>
+                      <span>
+                        {i18n.translate(
+                          'xpack.ml.timeSeriesExplorer.singleTimeSeriesAnalysisTitle',
+                          {
+                            defaultMessage: 'Single time series analysis of {functionLabel}',
+                            values: { functionLabel: chartDetails.functionLabel },
+                          }
+                        )}
                       </span>
-                    )}
-                  </h2>
-                </EuiTitle>
-
+                      &nbsp;
+                      {chartDetails.entityData.count === 1 && (
+                        <span className="entity-count-text">
+                          {chartDetails.entityData.entities.length > 0 && '('}
+                          {chartDetails.entityData.entities
+                            .map((entity) => {
+                              return `${entity.fieldName}: ${entity.fieldValue}`;
+                            })
+                            .join(', ')}
+                          {chartDetails.entityData.entities.length > 0 && ')'}
+                        </span>
+                      )}
+                      {chartDetails.entityData.count !== 1 && (
+                        <span className="entity-count-text">
+                          {chartDetails.entityData.entities.map((countData, i) => {
+                            return (
+                              <Fragment key={countData.fieldName}>
+                                {i18n.translate(
+                                  'xpack.ml.timeSeriesExplorer.countDataInChartDetailsDescription',
+                                  {
+                                    defaultMessage:
+                                      '{openBrace}{cardinalityValue} distinct {fieldName} {cardinality, plural, one {} other { values}}{closeBrace}',
+                                    values: {
+                                      openBrace: i === 0 ? '(' : '',
+                                      closeBrace:
+                                        i === chartDetails.entityData.entities.length - 1
+                                          ? ')'
+                                          : '',
+                                      cardinalityValue:
+                                        countData.cardinality === 0
+                                          ? allValuesLabel
+                                          : countData.cardinality,
+                                      cardinality: countData.cardinality,
+                                      fieldName: countData.fieldName,
+                                    },
+                                  }
+                                )}
+                                {i !== chartDetails.entityData.entities.length - 1 ? ', ' : ''}
+                              </Fragment>
+                            );
+                          })}
+                        </span>
+                      )}
+                    </h2>
+                  </EuiTitle>
+                  <EuiFlexItem grow={false}>
+                    <TimeSeriesExplorerHelpPopover />
+                  </EuiFlexItem>
+                </EuiFlexGroup>
                 <EuiFlexGroup style={{ float: 'right' }}>
                   {showModelBoundsCheckbox && (
                     <EuiFlexItem grow={false}>
diff --git a/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_help_popover.tsx b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_help_popover.tsx
new file mode 100644
index 0000000000000..59249791f0078
--- /dev/null
+++ b/x-pack/plugins/ml/public/application/timeseriesexplorer/timeseriesexplorer_help_popover.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, { useState } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { HelpPopover, HelpPopoverButton } from '../components/help_popover/help_popover';
+
+export const TimeSeriesExplorerHelpPopover = () => {
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+
+  return (
+    <HelpPopover
+      anchorPosition="upCenter"
+      button={
+        <HelpPopoverButton
+          onClick={() => {
+            setIsPopoverOpen(!isPopoverOpen);
+          }}
+        />
+      }
+      closePopover={() => setIsPopoverOpen(false)}
+      isOpen={isPopoverOpen}
+      title={i18n.translate('xpack.ml.timeSeriesExplorer.popoverTitle', {
+        defaultMessage: 'Single time series analysis',
+      })}
+    >
+      <p>
+        <FormattedMessage
+          id="xpack.ml.timeSeriesExplorer.popoverBasicExplanation"
+          defaultMessage="This chart illustrates the actual data values over time for a specific detector. You can examine an event by sliding the time selector and changing its length. For the most accurate view, set the zoom size to auto."
+        />
+      </p>
+      <p>
+        <FormattedMessage
+          id="xpack.ml.timeSeriesExplorer.popoverAnomalyExplanation"
+          defaultMessage="An anomaly score is calculated for each bucket time interval, with a value from 0 to 100. Anomalous events are highlighted in colors that indicate their severity. If an anomaly is depicted with a cross symbol instead of a dot, it has a medium or high multi-bucket impact. This extra analysis can catch anomalies even when they fall within the bounds of expected behavior."
+        />
+      </p>
+      <p>
+        <FormattedMessage
+          id="xpack.ml.timeSeriesExplorer.popoverForecastExplanation"
+          defaultMessage="If you create a forecast, predicted data values are added to the chart. A shaded area around these values represents the confidence level; as you forecast further into the future, the confidence level generally decreases."
+        />
+      </p>
+      <p>
+        <FormattedMessage
+          id="xpack.ml.timeSeriesExplorer.popoverAnnotationsExplanation"
+          defaultMessage="You can also optionally annotate your job results by drag-selecting a period of time in the chart and adding a description. Some annotations are generated automatically to indicate noteworthy occurrences."
+        />
+      </p>
+      <p>
+        <FormattedMessage
+          id="xpack.ml.timeSeriesExplorer.popoverModelPlotExplanation"
+          defaultMessage="If model plot is enabled, you can optionally show model bounds, which are represented by a shaded area in the chart. As the job analyzes more data, it learns to more closely predict the expected patterns of behavior."
+        />
+      </p>
+    </HelpPopover>
+  );
+};
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 759d0dcc68741..4a3194ed4113f 100644
--- a/x-pack/plugins/ml/public/application/util/dependency_cache.ts
+++ b/x-pack/plugins/ml/public/application/util/dependency_cache.ts
@@ -23,7 +23,7 @@ import type { IndexPatternsContract, DataPublicPluginStart } from 'src/plugins/d
 import type { SharePluginStart } from 'src/plugins/share/public';
 import type { SecurityPluginSetup } from '../../../../security/public';
 import type { MapsStartApi } from '../../../../maps/public';
-import type { FileDataVisualizerPluginStart } from '../../../../file_data_visualizer/public';
+import type { DataVisualizerPluginStart } from '../../../../data_visualizer/public';
 
 export interface DependencyCache {
   timefilter: DataPublicPluginSetup['query']['timefilter'] | null;
@@ -44,7 +44,7 @@ export interface DependencyCache {
   i18n: I18nStart | null;
   urlGenerators: SharePluginStart['urlGenerators'] | null;
   maps: MapsStartApi | null;
-  fileDataVisualizer: FileDataVisualizerPluginStart | null;
+  dataVisualizer: DataVisualizerPluginStart | null;
 }
 
 const cache: DependencyCache = {
@@ -66,7 +66,7 @@ const cache: DependencyCache = {
   i18n: null,
   urlGenerators: null,
   maps: null,
-  fileDataVisualizer: null,
+  dataVisualizer: null,
 };
 
 export function setDependencyCache(deps: Partial<DependencyCache>) {
@@ -87,7 +87,7 @@ export function setDependencyCache(deps: Partial<DependencyCache>) {
   cache.security = deps.security || null;
   cache.i18n = deps.i18n || null;
   cache.urlGenerators = deps.urlGenerators || null;
-  cache.fileDataVisualizer = deps.fileDataVisualizer || null;
+  cache.dataVisualizer = deps.dataVisualizer || null;
 }
 
 export function getTimefilter() {
@@ -215,8 +215,8 @@ export function clearCache() {
 }
 
 export function getFileDataVisualizer() {
-  if (cache.fileDataVisualizer === null) {
-    throw new Error("fileDataVisualizer hasn't been initialized");
+  if (cache.dataVisualizer === null) {
+    throw new Error("dataVisualizer hasn't been initialized");
   }
-  return cache.fileDataVisualizer;
+  return cache.dataVisualizer;
 }
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 7731d9e822e3a..489f2ad08aeaf 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
@@ -98,9 +98,11 @@ export const EmbeddableAnomalyChartsContainer: FC<EmbeddableAnomalyChartsContain
   );
   const resizeHandler = useCallback(
     throttle((e: { width: number; height: number }) => {
-      setChartWidth(e.width);
+      if (Math.abs(chartWidth - e.width) > 20) {
+        setChartWidth(e.width);
+      }
     }, RESIZE_THROTTLE_TIME_MS),
-    []
+    [chartWidth]
   );
 
   if (error) {
diff --git a/x-pack/plugins/ml/public/plugin.ts b/x-pack/plugins/ml/public/plugin.ts
index 1f41f0a1d25c3..1191f3b253fd7 100644
--- a/x-pack/plugins/ml/public/plugin.ts
+++ b/x-pack/plugins/ml/public/plugin.ts
@@ -24,14 +24,12 @@ import type {
 } from 'src/plugins/share/public';
 import type { DataPublicPluginStart } from 'src/plugins/data/public';
 import type { HomePublicPluginSetup } from 'src/plugins/home/public';
-import type { IndexPatternManagementSetup } from 'src/plugins/index_pattern_management/public';
 import type { EmbeddableSetup, EmbeddableStart } from 'src/plugins/embeddable/public';
 import type { SpacesPluginStart } from '../../spaces/public';
 
 import { AppStatus, AppUpdater, DEFAULT_APP_CATEGORIES } from '../../../../src/core/public';
 import type { UiActionsSetup, UiActionsStart } from '../../../../src/plugins/ui_actions/public';
 import type { KibanaLegacyStart } from '../../../../src/plugins/kibana_legacy/public';
-import { MlCardState } from '../../../../src/plugins/index_pattern_management/public';
 
 import type { LicenseManagementUIPluginSetup } from '../../license_management/public';
 import type { LicensingPluginSetup } from '../../licensing/public';
@@ -51,7 +49,7 @@ import {
   TriggersAndActionsUIPublicPluginSetup,
   TriggersAndActionsUIPublicPluginStart,
 } from '../../triggers_actions_ui/public';
-import { FileDataVisualizerPluginStart } from '../../file_data_visualizer/public';
+import { DataVisualizerPluginStart } from '../../data_visualizer/public';
 import { PluginSetupContract as AlertingSetup } from '../../alerting/public';
 import { registerManagementSection } from './application/management';
 
@@ -65,7 +63,7 @@ export interface MlStartDependencies {
   maps?: MapsStartApi;
   lens?: LensPublicStart;
   triggersActionsUi?: TriggersAndActionsUIPublicPluginStart;
-  fileDataVisualizer: FileDataVisualizerPluginStart;
+  dataVisualizer: DataVisualizerPluginStart;
 }
 
 export interface MlSetupDependencies {
@@ -78,7 +76,6 @@ export interface MlSetupDependencies {
   uiActions: UiActionsSetup;
   kibanaVersion: string;
   share: SharePluginSetup;
-  indexPatternManagement: IndexPatternManagementSetup;
   triggersActionsUi?: TriggersAndActionsUIPublicPluginSetup;
   alerting?: AlertingSetup;
 }
@@ -123,7 +120,7 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
             lens: pluginsStart.lens,
             kibanaVersion,
             triggersActionsUi: pluginsStart.triggersActionsUi,
-            fileDataVisualizer: pluginsStart.fileDataVisualizer,
+            dataVisualizer: pluginsStart.dataVisualizer,
           },
           params
         );
@@ -148,12 +145,6 @@ export class MlPlugin implements Plugin<MlPluginSetup, MlPluginStart> {
         if (pluginsSetup.home) {
           registerFeature(pluginsSetup.home);
         }
-
-        // register ML for the index pattern management no data screen.
-        pluginsSetup.indexPatternManagement.environment.update({
-          ml: () =>
-            capabilities.ml.canFindFileStructure ? MlCardState.ENABLED : MlCardState.HIDDEN,
-        });
       } else {
         // if ml is disabled in elasticsearch, disable ML in kibana
         this.appUpdater$.next(() => ({
diff --git a/x-pack/plugins/ml/public/register_feature.ts b/x-pack/plugins/ml/public/register_feature.ts
index 191e064c85b90..e8d64360df123 100644
--- a/x-pack/plugins/ml/public/register_feature.ts
+++ b/x-pack/plugins/ml/public/register_feature.ts
@@ -13,10 +13,6 @@ import {
 import { PLUGIN_ID } from '../common/constants/app';
 
 export const registerFeature = (home: HomePublicPluginSetup) => {
-  // register ML for the kibana home screen.
-  // so the file data visualizer appears to allow people to import data
-  home.environment.update({ ml: true });
-
   // register ML so it appears on the Kibana home page
   home.featureCatalogue.register({
     id: PLUGIN_ID,
@@ -37,19 +33,4 @@ export const registerFeature = (home: HomePublicPluginSetup) => {
     solutionId: 'kibana',
     order: 500,
   });
-
-  home.featureCatalogue.register({
-    id: `${PLUGIN_ID}_file_data_visualizer`,
-    title: i18n.translate('xpack.ml.fileDataVisualizerTitle', {
-      defaultMessage: 'Upload a file',
-    }),
-    description: i18n.translate('xpack.ml.fileDataVisualizerDescription', {
-      defaultMessage: 'Import your own CSV, NDJSON, or log file.',
-    }),
-    icon: 'document',
-    path: '/app/ml/filedatavisualizer',
-    showOnHomePage: true,
-    category: FeatureCatalogueCategory.DATA,
-    order: 520,
-  });
 };
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 d682a93fa274c..e6ffa3b530858 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
@@ -44,7 +44,7 @@ const DATA_FRAME_ANALYTICS_DEEP_LINK: AppDeepLink = {
 };
 
 const DATA_VISUALIZER_DEEP_LINK: AppDeepLink = {
-  id: 'mlDataVisualizerDeepLink',
+  id: 'dataVisualizerDeepLink',
   title: i18n.translate('xpack.ml.deepLink.dataVisualizer', {
     defaultMessage: 'Data Visualizer',
   }),
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 0d4d117b69bf3..e7d3ef97a301b 100644
--- a/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
+++ b/x-pack/plugins/ml/server/lib/alerts/alerting_service.ts
@@ -41,6 +41,8 @@ type AggResultsResponse = { key?: number } & {
   };
 };
 
+const TIME_RANGE_PADDING = 10;
+
 /**
  * Mapping for result types and corresponding score fields.
  */
@@ -63,43 +65,6 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
     };
   };
 
-  const getCommonScriptedFields = () => {
-    return {
-      start: {
-        script: {
-          lang: 'painless',
-          source: `LocalDateTime.ofEpochSecond((doc["timestamp"].value.getMillis()-((doc["bucket_span"].value * 1000)
- * params.padding)) / 1000, 0, ZoneOffset.UTC).toString()+\":00.000Z\"`,
-          params: {
-            padding: 10,
-          },
-        },
-      },
-      end: {
-        script: {
-          lang: 'painless',
-          source: `LocalDateTime.ofEpochSecond((doc["timestamp"].value.getMillis()+((doc["bucket_span"].value * 1000)
- * params.padding)) / 1000, 0, ZoneOffset.UTC).toString()+\":00.000Z\"`,
-          params: {
-            padding: 10,
-          },
-        },
-      },
-      timestamp_epoch: {
-        script: {
-          lang: 'painless',
-          source: 'doc["timestamp"].value.getMillis()/1000',
-        },
-      },
-      timestamp_iso8601: {
-        script: {
-          lang: 'painless',
-          source: 'doc["timestamp"].value',
-        },
-      },
-    };
-  };
-
   /**
    * Builds an agg query based on the requested result type.
    * @param resultType
@@ -110,9 +75,9 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
     severity: number,
     useInitialScore?: boolean
   ) => {
-    const influencerScoreField = `${useInitialScore ? 'initial_' : ''}influencer_score`;
-    const recordScoreField = `${useInitialScore ? 'initial_' : ''}record_score`;
-    const bucketScoreField = `${useInitialScore ? 'initial_' : ''}anomaly_score`;
+    const influencerScoreField = getScoreFields(ANOMALY_RESULT_TYPE.INFLUENCER, useInitialScore);
+    const recordScoreField = getScoreFields(ANOMALY_RESULT_TYPE.RECORD, useInitialScore);
+    const bucketScoreField = getScoreFields(ANOMALY_RESULT_TYPE.BUCKET, useInitialScore);
 
     return {
       influencer_results: {
@@ -140,27 +105,13 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
                   'influencer_field_name',
                   'influencer_field_value',
                   'influencer_score',
+                  'initial_influencer_score',
                   'is_interim',
                   'job_id',
+                  'bucket_span',
                 ],
               },
               size: 3,
-              script_fields: {
-                ...getCommonScriptedFields(),
-                score: {
-                  script: {
-                    lang: 'painless',
-                    source: `Math.floor(doc["${influencerScoreField}"].value)`,
-                  },
-                },
-                unique_key: {
-                  script: {
-                    lang: 'painless',
-                    source:
-                      'doc["timestamp"].value + "_" + doc["influencer_field_name"].value + "_" + doc["influencer_field_value"].value',
-                  },
-                },
-              },
             },
           },
         },
@@ -188,6 +139,7 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
                   'result_type',
                   'timestamp',
                   'record_score',
+                  'initial_record_score',
                   'is_interim',
                   'function',
                   'field_name',
@@ -199,24 +151,10 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
                   'partition_field_value',
                   'job_id',
                   'detector_index',
+                  'bucket_span',
                 ],
               },
               size: 3,
-              script_fields: {
-                ...getCommonScriptedFields(),
-                score: {
-                  script: {
-                    lang: 'painless',
-                    source: `Math.floor(doc["${recordScoreField}"].value)`,
-                  },
-                },
-                unique_key: {
-                  script: {
-                    lang: 'painless',
-                    source: 'doc["timestamp"].value + "_" + doc["function"].value',
-                  },
-                },
-              },
             },
           },
         },
@@ -247,25 +185,12 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
                         'result_type',
                         'timestamp',
                         'anomaly_score',
+                        'initial_anomaly_score',
                         'is_interim',
+                        'bucket_span',
                       ],
                     },
                     size: 1,
-                    script_fields: {
-                      ...getCommonScriptedFields(),
-                      score: {
-                        script: {
-                          lang: 'painless',
-                          source: `Math.floor(doc["${bucketScoreField}"].value)`,
-                        },
-                      },
-                      unique_key: {
-                        script: {
-                          lang: 'painless',
-                          source: 'doc["timestamp"].value',
-                        },
-                      },
-                    },
                   },
                 },
               },
@@ -282,6 +207,10 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
     return source.job_id;
   };
 
+  const getScoreFields = (resultType: AnomalyResultType, useInitialScore?: boolean) => {
+    return `${useInitialScore ? 'initial_' : ''}${resultTypeScoreMapping[resultType]}`;
+  };
+
   const getRecordKey = (source: AnomalyRecordDoc): string => {
     let alertInstanceKey = `${source.job_id}_${source.timestamp}`;
 
@@ -294,18 +223,23 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
     return alertInstanceKey;
   };
 
-  const getResultsFormatter = (resultType: AnomalyResultType) => {
+  /**
+   * Returns a callback for formatting elasticsearch aggregation response
+   * to the alert context.
+   * @param resultType
+   */
+  const getResultsFormatter = (resultType: AnomalyResultType, useInitialScore: boolean = false) => {
     const resultsLabel = getAggResultsLabel(resultType);
     return (v: AggResultsResponse): AlertExecutionResult | undefined => {
       const aggTypeResults = v[resultsLabel.aggGroupLabel];
       if (aggTypeResults.doc_count === 0) {
         return;
       }
-
       const requestedAnomalies = aggTypeResults[resultsLabel.topHitsLabel].hits.hits;
-
       const topAnomaly = requestedAnomalies[0];
       const alertInstanceKey = getAlertInstanceKey(topAnomaly._source);
+      const timestamp = topAnomaly._source.timestamp;
+      const bucketSpanInSeconds = topAnomaly._source.bucket_span;
 
       return {
         count: aggTypeResults.doc_count,
@@ -315,26 +249,32 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
         alertInstanceKey,
         jobIds: [...new Set(requestedAnomalies.map((h) => h._source.job_id))],
         isInterim: requestedAnomalies.some((h) => h._source.is_interim),
-        timestamp: topAnomaly._source.timestamp,
-        timestampIso8601: topAnomaly.fields.timestamp_iso8601[0],
-        timestampEpoch: topAnomaly.fields.timestamp_epoch[0],
-        score: topAnomaly.fields.score[0],
+        timestamp,
+        timestampIso8601: new Date(timestamp).toISOString(),
+        timestampEpoch: timestamp / 1000,
+        score: Math.floor(topAnomaly._source[getScoreFields(resultType, useInitialScore)]),
         bucketRange: {
-          start: topAnomaly.fields.start[0],
-          end: topAnomaly.fields.end[0],
+          start: new Date(
+            timestamp - bucketSpanInSeconds * 1000 * TIME_RANGE_PADDING
+          ).toISOString(),
+          end: new Date(timestamp + bucketSpanInSeconds * 1000 * TIME_RANGE_PADDING).toISOString(),
         },
         topRecords: v.record_results.top_record_hits.hits.hits.map((h) => {
           return {
             ...h._source,
-            score: h.fields.score[0],
+            score: Math.floor(
+              h._source[getScoreFields(ANOMALY_RESULT_TYPE.RECORD, useInitialScore)]
+            ),
             unique_key: getRecordKey(h._source),
           };
         }) as RecordAnomalyAlertDoc[],
         topInfluencers: v.influencer_results.top_influencer_hits.hits.hits.map((h) => {
           return {
             ...h._source,
-            score: h.fields.score[0],
-            unique_key: h.fields.unique_key[0],
+            score: Math.floor(
+              h._source[getScoreFields(ANOMALY_RESULT_TYPE.INFLUENCER, useInitialScore)]
+            ),
+            unique_key: `${h._source.timestamp}_${h._source.influencer_field_name}_${h._source.influencer_field_value}`,
           };
         }) as InfluencerAnomalyAlertDoc[],
       };
@@ -447,7 +387,7 @@ export function alertingServiceProvider(mlClient: MlClient, datafeedsService: Da
 
     const resultsLabel = getAggResultsLabel(params.resultType);
 
-    const formatter = getResultsFormatter(params.resultType);
+    const formatter = getResultsFormatter(params.resultType, !!previewTimeInterval);
 
     return (previewTimeInterval
       ? (result as {
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 6e76a536feb25..0a9c76893dd0b 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
@@ -242,6 +242,7 @@ export function getMlClient(
         }>(...p);
         const jobs = await jobSavedObjectService.filterJobsForSpace<DataFrameAnalyticsConfig>(
           'data-frame-analytics',
+          // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
           body.data_frame_analytics,
           'id'
         );
@@ -494,12 +495,13 @@ function getDFAJobIdsFromRequest([params]: MlGetDFAParams): string[] {
 }
 
 function getADJobIdsFromRequest([params]: MlGetADParams): string[] {
-  const ids = params?.job_id?.split(',');
+  const ids = typeof params?.job_id === 'string' ? params?.job_id.split(',') : params?.job_id;
   return ids || [];
 }
 
 function getDatafeedIdsFromRequest([params]: MlGetDatafeedParams): string[] {
-  const ids = params?.datafeed_id?.split(',');
+  const ids =
+    typeof params?.datafeed_id === 'string' ? params?.datafeed_id.split(',') : params?.datafeed_id;
   return ids || [];
 }
 
diff --git a/x-pack/plugins/ml/server/lib/query_utils.ts b/x-pack/plugins/ml/server/lib/query_utils.ts
index dd4dc01498dbb..e801130643345 100644
--- a/x-pack/plugins/ml/server/lib/query_utils.ts
+++ b/x-pack/plugins/ml/server/lib/query_utils.ts
@@ -44,7 +44,7 @@ export function buildBaseFilterCriteria(
 export function buildSamplerAggregation(
   aggs: any,
   samplerShardSize: number
-): Record<string, estypes.AggregationContainer> {
+): Record<string, estypes.AggregationsAggregationContainer> {
   if (samplerShardSize < 1) {
     return aggs;
   }
diff --git a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
index 458a34346bed9..791ba6d79ab5a 100644
--- a/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/calendar_manager.ts
@@ -10,7 +10,7 @@ import { difference } from 'lodash';
 import { EventManager } from './event_manager';
 import type { MlClient } from '../../lib/ml_client';
 
-type ScheduledEvent = estypes.ScheduledEvent;
+type ScheduledEvent = estypes.MlCalendarEvent;
 
 interface BasicCalendar {
   job_ids: string[];
diff --git a/x-pack/plugins/ml/server/models/calendar/event_manager.ts b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
index c870d67524135..d30297eab5c15 100644
--- a/x-pack/plugins/ml/server/models/calendar/event_manager.ts
+++ b/x-pack/plugins/ml/server/models/calendar/event_manager.ts
@@ -9,7 +9,7 @@ import { estypes } from '@elastic/elasticsearch';
 import { GLOBAL_CALENDAR } from '../../../common/constants/calendars';
 import type { MlClient } from '../../lib/ml_client';
 
-type ScheduledEvent = estypes.ScheduledEvent;
+type ScheduledEvent = estypes.MlCalendarEvent;
 
 export class EventManager {
   private _mlClient: MlClient;
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 a9c1d95d933a9..41b8e6dfe96c4 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
@@ -67,6 +67,7 @@ export class AnalyticsManager {
   async setInferenceModels() {
     try {
       const models = await this.getAnalyticsModels();
+      // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
       this.inferenceModels = models;
     } catch (error) {
       // eslint-disable-next-line
@@ -77,6 +78,7 @@ export class AnalyticsManager {
   async setJobStats() {
     try {
       const jobStats = await this.getAnalyticsStats();
+      // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
       this.jobStats = jobStats;
     } catch (error) {
       // eslint-disable-next-line
@@ -133,8 +135,10 @@ export class AnalyticsManager {
 
     if (analyticsId !== undefined) {
       const jobStats = this.findJobStats(analyticsId);
+      // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
       jobData = { ...jobData, stats: { ...jobStats } };
     } else {
+      // @ts-expect-error @elastic-elasticsearch Data frame types incompletes
       jobData = jobData.map((job: any) => {
         const jobStats = this.findJobStats(job.id);
         return { ...job, stats: { ...jobStats } };
@@ -270,6 +274,7 @@ export class AnalyticsManager {
     // fetch model data and create model elements
     let data = await this.getAnalyticsModelData(modelId);
     const modelNodeId = `${data.model_id}-${JOB_MAP_NODE_TYPES.TRAINED_MODEL}`;
+    // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
     const sourceJobId = data?.metadata?.analytics_config?.id;
     let nextLinkId: string | undefined;
     let nextType: JobMapNodeTypes | undefined;
@@ -288,17 +293,22 @@ export class AnalyticsManager {
     // fetch source job data and create elements
     if (sourceJobId !== undefined) {
       try {
+        // @ts-expect-error @elastic-elasticsearch Data frame types incompletes
         data = await this.getAnalyticsData(sourceJobId);
+        // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
         nextLinkId = data?.source?.index[0];
         nextType = JOB_MAP_NODE_TYPES.INDEX;
 
+        // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
         previousNodeId = `${data.id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
 
         resultElements.push({
           data: {
             id: previousNodeId,
+            // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
             label: data.id,
             type: JOB_MAP_NODE_TYPES.ANALYTICS,
+            // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
             analysisType: getAnalysisType(data?.analysis),
           },
         });
@@ -332,16 +342,20 @@ export class AnalyticsManager {
     const modelElements = [];
     const details: any = {};
     const data = await this.getAnalyticsData(jobId);
+    // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
     const nextLinkId = data?.source?.index[0];
     const nextType: JobMapNodeTypes = JOB_MAP_NODE_TYPES.INDEX;
 
+    // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
     const previousNodeId = `${data.id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
 
     resultElements.push({
       data: {
         id: previousNodeId,
+        // @ts-expect-error @elastic-elasticsearch Data frame types incompletes
         label: data.id,
         type: JOB_MAP_NODE_TYPES.ANALYTICS,
+        // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
         analysisType: getAnalysisType(data?.analysis),
         isRoot: true,
       },
@@ -530,20 +544,27 @@ export class AnalyticsManager {
           const jobs = await this.getAnalyticsData();
           const comparator = rootTransform !== undefined ? rootTransform : rootIndexPattern;
 
+          // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
           for (let i = 0; i < jobs.length; i++) {
             if (
+              // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
               jobs[i]?.source?.index[0] === comparator &&
+              // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
               this.isDuplicateElement(jobs[i].id, result.elements) === false
             ) {
+              // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
               const nodeId = `${jobs[i].id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
               result.elements.push({
                 data: {
                   id: nodeId,
+                  // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
                   label: jobs[i].id,
                   type: JOB_MAP_NODE_TYPES.ANALYTICS,
+                  // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
                   analysisType: getAnalysisType(jobs[i]?.analysis),
                 },
               });
+              // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
               result.details[nodeId] = jobs[i];
               const source = `${comparator}-${JOB_MAP_NODE_TYPES.INDEX}`;
               result.elements.push({
@@ -555,6 +576,7 @@ export class AnalyticsManager {
               });
               // Get inference model for analytics job and create model node
               ({ modelElement, modelDetails, edgeElement } = this.getAnalyticsModelElements(
+                // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
                 jobs[i].id
               ));
               if (isAnalyticsMapNodeElement(modelElement)) {
@@ -590,10 +612,14 @@ export class AnalyticsManager {
 
       if (analyticsId !== undefined) {
         const jobData = await this.getAnalyticsData(analyticsId);
+        // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
         const currentJobNodeId = `${jobData.id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
+        // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
         rootIndex = Array.isArray(jobData?.dest?.index)
-          ? jobData?.dest?.index[0]
-          : jobData?.dest?.index;
+          ? // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
+            jobData?.dest?.index[0]
+          : // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
+            jobData?.dest?.index;
         rootIndexNodeId = `${rootIndex}-${JOB_MAP_NODE_TYPES.INDEX}`;
 
         // Fetch inference model for incoming job id and add node and edge
@@ -632,21 +658,28 @@ export class AnalyticsManager {
         rootIndexNodeId = `${rootIndex}-${JOB_MAP_NODE_TYPES.INDEX}`;
       }
 
+      // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
       for (let i = 0; i < jobs.length; i++) {
         if (
+          // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
           jobs[i]?.source?.index[0] === rootIndex &&
+          // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
           this.isDuplicateElement(jobs[i].id, result.elements) === false
         ) {
           // Create node for associated job
+          // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
           const nodeId = `${jobs[i].id}-${JOB_MAP_NODE_TYPES.ANALYTICS}`;
           result.elements.push({
             data: {
               id: nodeId,
+              // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
               label: jobs[i].id,
               type: JOB_MAP_NODE_TYPES.ANALYTICS,
+              // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
               analysisType: getAnalysisType(jobs[i]?.analysis),
             },
           });
+          // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
           result.details[nodeId] = jobs[i];
 
           result.elements.push({
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 cfe0bcc532630..e608bfeb622d8 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
@@ -185,7 +185,6 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) {
     } = await asCurrentUser.search({
       index,
       body,
-      // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
       ...(datafeedConfig?.indices_options ?? {}),
     });
 
@@ -407,7 +406,6 @@ export function fieldsServiceProvider({ asCurrentUser }: IScopedClusterClient) {
     } = await asCurrentUser.search({
       index,
       body,
-      // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
       ...(datafeedConfig?.indices_options ?? {}),
     });
 
diff --git a/x-pack/plugins/ml/server/models/filter/filter_manager.ts b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
index 1429324a6d9c8..f48b71dedf3ee 100644
--- a/x-pack/plugins/ml/server/models/filter/filter_manager.ts
+++ b/x-pack/plugins/ml/server/models/filter/filter_manager.ts
@@ -79,16 +79,16 @@ export class FilterManager {
 
       if (
         results[FILTERS] &&
-        (results[FILTERS].body as estypes.GetFiltersResponse).filters.length
+        (results[FILTERS].body as estypes.MlGetFiltersResponse).filters.length
       ) {
         let filtersInUse: FiltersInUse = {};
-        if (results[JOBS] && (results[JOBS].body as estypes.GetJobsResponse).jobs) {
+        if (results[JOBS] && (results[JOBS].body as estypes.MlGetJobsResponse).jobs) {
           filtersInUse = this.buildFiltersInUse(
-            (results[JOBS].body as estypes.GetJobsResponse).jobs
+            (results[JOBS].body as estypes.MlGetJobsResponse).jobs
           );
         }
 
-        const filter = (results[FILTERS].body as estypes.GetFiltersResponse).filters[0];
+        const filter = (results[FILTERS].body as estypes.MlGetFiltersResponse).filters[0];
         return {
           ...filter,
           used_by: filtersInUse[filter.filter_id],
@@ -121,8 +121,10 @@ export class FilterManager {
 
       // Build a map of filter_ids against jobs and detectors using that filter.
       let filtersInUse: FiltersInUse = {};
-      if (results[JOBS] && (results[JOBS].body as estypes.GetJobsResponse).jobs) {
-        filtersInUse = this.buildFiltersInUse((results[JOBS].body as estypes.GetJobsResponse).jobs);
+      if (results[JOBS] && (results[JOBS].body as estypes.MlGetJobsResponse).jobs) {
+        filtersInUse = this.buildFiltersInUse(
+          (results[JOBS].body as estypes.MlGetJobsResponse).jobs
+        );
       }
 
       // For each filter, return just
@@ -131,16 +133,18 @@ export class FilterManager {
       //  item_count
       //  jobs using the filter
       const filterStats: FilterStats[] = [];
-      if (results[FILTERS] && (results[FILTERS].body as estypes.GetFiltersResponse).filters) {
-        (results[FILTERS].body as estypes.GetFiltersResponse).filters.forEach((filter: Filter) => {
-          const stats: FilterStats = {
-            filter_id: filter.filter_id,
-            description: filter.description,
-            item_count: filter.items.length,
-            used_by: filtersInUse[filter.filter_id],
-          };
-          filterStats.push(stats);
-        });
+      if (results[FILTERS] && (results[FILTERS].body as estypes.MlGetFiltersResponse).filters) {
+        (results[FILTERS].body as estypes.MlGetFiltersResponse).filters.forEach(
+          (filter: Filter) => {
+            const stats: FilterStats = {
+              filter_id: filter.filter_id,
+              description: filter.description,
+              item_count: filter.items.length,
+              used_by: filtersInUse[filter.filter_id],
+            };
+            filterStats.push(stats);
+          }
+        );
       }
 
       return filterStats;
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 72255e168249a..5dfe1b5934fe9 100644
--- a/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
+++ b/x-pack/plugins/ml/server/models/job_service/datafeeds.ts
@@ -28,8 +28,8 @@ export interface MlDatafeedsStatsResponse {
 
 interface Results {
   [id: string]: {
-    started?: estypes.StartDatafeedResponse['started'];
-    stopped?: estypes.StopDatafeedResponse['stopped'];
+    started?: estypes.MlStartDatafeedResponse['started'];
+    stopped?: estypes.MlStopDatafeedResponse['stopped'];
     error?: any;
   };
 }
@@ -246,7 +246,6 @@ export function datafeedsProvider(client: IScopedClusterClient, mlClient: MlClie
       job.data_description.time_field,
       query,
       datafeed.runtime_mappings,
-      // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
       datafeed.indices_options
     );
 
@@ -378,7 +377,6 @@ export function datafeedsProvider(client: IScopedClusterClient, mlClient: MlClie
     const data = {
       index: datafeed.indices,
       body,
-      // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
       ...(datafeed.indices_options ?? {}),
     };
 
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 a838db443bebc..b7f8ce569641e 100644
--- a/x-pack/plugins/ml/server/models/job_service/jobs.ts
+++ b/x-pack/plugins/ml/server/models/job_service/jobs.ts
@@ -195,7 +195,6 @@ export function jobsProvider(
         processed_record_count: job.data_counts?.processed_record_count,
         earliestStartTimestampMs: getEarliestDatafeedStartTime(
           dataCounts?.latest_record_timestamp,
-          // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
           dataCounts?.latest_bucket_timestamp,
           parseTimeIntervalForJob(job.analysis_config?.bucket_span)
         ),
@@ -211,7 +210,6 @@ export function jobsProvider(
         earliestTimestampMs: dataCounts?.earliest_record_timestamp,
         latestResultsTimestampMs: getLatestDataOrBucketTimestamp(
           dataCounts?.latest_record_timestamp,
-          // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
           dataCounts?.latest_bucket_timestamp
         ),
         isSingleMetricViewerJob: errorMessage === undefined,
@@ -254,7 +252,6 @@ export function jobsProvider(
       if (dataCounts !== undefined) {
         timeRange.to = getLatestDataOrBucketTimestamp(
           dataCounts.latest_record_timestamp as number,
-          // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
           dataCounts.latest_bucket_timestamp as number
         );
         timeRange.from = dataCounts.earliest_record_timestamp;
@@ -398,7 +395,6 @@ export function jobsProvider(
         if (jobStatsResults && jobStatsResults.jobs) {
           const jobStats = jobStatsResults.jobs.find((js) => js.job_id === tempJob.job_id);
           if (jobStats !== undefined) {
-            // @ts-expect-error @elastic-elasticsearch JobStats type is incomplete
             tempJob = { ...tempJob, ...jobStats };
             if (jobStats.node) {
               tempJob.node = jobStats.node;
@@ -411,7 +407,6 @@ export function jobsProvider(
             const latestBucketTimestamp =
               latestBucketTimestampByJob && latestBucketTimestampByJob[tempJob.job_id];
             if (latestBucketTimestamp) {
-              // @ts-expect-error @elastic/elasticsearch data counts missing is missing latest_bucket_timestamp
               tempJob.data_counts.latest_bucket_timestamp = latestBucketTimestamp;
             }
           }
@@ -467,7 +462,6 @@ export function jobsProvider(
     const jobIds: string[] = [];
     try {
       const { body } = await asInternalUser.tasks.list({
-        // @ts-expect-error @elastic-elasticsearch expects it to be a string
         actions,
         detailed,
       });
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 49c09742985d4..fad388f791f08 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
@@ -114,7 +114,7 @@ class FieldsService {
         this._savedObjectsClient
       );
       const rollupConfigs:
-        | estypes.RollupCapabilitiesJob[]
+        | estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[]
         | null = await rollupService.getRollupJobs();
 
       // if a rollup index has been specified, yet there are no
@@ -137,7 +137,9 @@ class FieldsService {
   }
 }
 
-function combineAllRollupFields(rollupConfigs: estypes.RollupCapabilitiesJob[]): RollupFields {
+function combineAllRollupFields(
+  rollupConfigs: estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[]
+): RollupFields {
   const rollupFields: RollupFields = {};
   rollupConfigs.forEach((conf) => {
     Object.keys(conf.fields).forEach((fieldName) => {
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 d83f7afb4cdf6..5f5ae16ed9733 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
@@ -27,7 +27,9 @@ export async function rollupServiceProvider(
   const rollupIndexPatternObject = await loadRollupIndexPattern(indexPattern, savedObjectsClient);
   let jobIndexPatterns: string[] = [indexPattern];
 
-  async function getRollupJobs(): Promise<estypes.RollupIndexCapabilitiesJob[] | null> {
+  async function getRollupJobs(): Promise<
+    estypes.RollupGetRollupCapabilitiesRollupCapabilitySummary[] | null
+  > {
     if (rollupIndexPatternObject !== null) {
       const parsedTypeMetaData = JSON.parse(rollupIndexPatternObject.attributes.typeMeta);
       const rollUpIndex: string = parsedTypeMetaData.params.rollup_index;
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 00a51d1e4e153..80eba7b864051 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
@@ -69,7 +69,6 @@ export async function validateJob(
           timeField,
           job.datafeed_config.query,
           job.datafeed_config.runtime_mappings,
-          // @ts-expect-error @elastic/elasticsearch Datafeed is missing indices_options
           job.datafeed_config.indices_options
         );
 
diff --git a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
index 5205ea7353ac6..c5be5e1c9ef2d 100644
--- a/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
+++ b/x-pack/plugins/ml/server/routes/anomaly_detectors.ts
@@ -284,7 +284,7 @@ export function jobRoutes({ router, routeGuard }: RouteInitialization) {
     },
     routeGuard.fullLicenseAPIGuard(async ({ mlClient, request, response }) => {
       try {
-        const options: estypes.CloseJobRequest = {
+        const options: estypes.MlCloseJobRequest = {
           job_id: request.params.jobId,
         };
         const force = request.query.force;
@@ -323,7 +323,7 @@ export function jobRoutes({ router, routeGuard }: RouteInitialization) {
     },
     routeGuard.fullLicenseAPIGuard(async ({ mlClient, request, response }) => {
       try {
-        const options: estypes.DeleteJobRequest = {
+        const options: estypes.MlDeleteJobRequest = {
           job_id: request.params.jobId,
           wait_for_completion: false,
         };
@@ -517,13 +517,11 @@ export function jobRoutes({ router, routeGuard }: RouteInitialization) {
       try {
         const { body } = await mlClient.getOverallBuckets({
           job_id: request.params.jobId,
-          body: {
-            top_n: request.body.topN,
-            bucket_span: request.body.bucketSpan,
-            start: request.body.start !== undefined ? String(request.body.start) : undefined,
-            end: request.body.end !== undefined ? String(request.body.end) : undefined,
-            overall_score: request.body.overall_score ?? 0,
-          },
+          top_n: request.body.topN,
+          bucket_span: request.body.bucketSpan,
+          start: request.body.start !== undefined ? String(request.body.start) : undefined,
+          end: request.body.end !== undefined ? String(request.body.end) : undefined,
+          overall_score: request.body.overall_score ?? 0,
         });
         return response.ok({
           body,
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 f6dc21538ffa0..2ed4fd6fcd31a 100644
--- a/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
+++ b/x-pack/plugins/ml/server/routes/data_frame_analytics.ts
@@ -265,6 +265,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
         const { body } = await mlClient.putDataFrameAnalytics(
           {
             id: analyticsId,
+            // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
             body: request.body,
           },
           getAuthorizationHeader(request)
@@ -301,6 +302,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
       try {
         const { body } = await mlClient.evaluateDataFrame(
           {
+            // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
             body: request.body,
           },
           getAuthorizationHeader(request)
@@ -338,6 +340,7 @@ export function dataFrameAnalyticsRoutes({ router, mlLicense, routeGuard }: Rout
       try {
         const { body } = await mlClient.explainDataFrameAnalytics(
           {
+            // @ts-expect-error @elastic-elasticsearch Data frame types incomplete
             body: request.body,
           },
           getAuthorizationHeader(request)
diff --git a/x-pack/plugins/ml/server/routes/data_visualizer.ts b/x-pack/plugins/ml/server/routes/data_visualizer.ts
index 62a93f16d17fc..39cbb3e9d35f6 100644
--- a/x-pack/plugins/ml/server/routes/data_visualizer.ts
+++ b/x-pack/plugins/ml/server/routes/data_visualizer.ts
@@ -8,70 +8,14 @@
 import { IScopedClusterClient } from 'kibana/server';
 import { wrapError } from '../client/error_wrapper';
 import { DataVisualizer } from '../models/data_visualizer';
-import { Field, HistogramField } from '../models/data_visualizer/data_visualizer';
+import { HistogramField } from '../models/data_visualizer/data_visualizer';
 import {
   dataVisualizerFieldHistogramsSchema,
-  dataVisualizerFieldStatsSchema,
-  dataVisualizerOverallStatsSchema,
   indexPatternTitleSchema,
 } from './schemas/data_visualizer_schema';
 import { RouteInitialization } from '../types';
 import { RuntimeMappings } from '../../common/types/fields';
 
-function getOverallStats(
-  client: IScopedClusterClient,
-  indexPatternTitle: string,
-  query: object,
-  aggregatableFields: string[],
-  nonAggregatableFields: string[],
-  samplerShardSize: number,
-  timeFieldName: string | undefined,
-  earliestMs: number | undefined,
-  latestMs: number | undefined,
-  runtimeMappings: RuntimeMappings
-) {
-  const dv = new DataVisualizer(client);
-  return dv.getOverallStats(
-    indexPatternTitle,
-    query,
-    aggregatableFields,
-    nonAggregatableFields,
-    samplerShardSize,
-    timeFieldName,
-    earliestMs,
-    latestMs,
-    runtimeMappings
-  );
-}
-
-function getStatsForFields(
-  client: IScopedClusterClient,
-  indexPatternTitle: string,
-  query: any,
-  fields: Field[],
-  samplerShardSize: number,
-  timeFieldName: string | undefined,
-  earliestMs: number | undefined,
-  latestMs: number | undefined,
-  interval: number | undefined,
-  maxExamples: number,
-  runtimeMappings: RuntimeMappings
-) {
-  const dv = new DataVisualizer(client);
-  return dv.getStatsForFields(
-    indexPatternTitle,
-    query,
-    fields,
-    samplerShardSize,
-    timeFieldName,
-    earliestMs,
-    latestMs,
-    interval,
-    maxExamples,
-    runtimeMappings
-  );
-}
-
 function getHistogramsForFields(
   client: IScopedClusterClient,
   indexPatternTitle: string,
@@ -141,131 +85,4 @@ export function dataVisualizerRoutes({ router, routeGuard }: RouteInitialization
       }
     })
   );
-
-  /**
-   * @apiGroup DataVisualizer
-   *
-   * @api {post} /api/ml/data_visualizer/get_field_stats/:indexPatternTitle Get stats for fields
-   * @apiName GetStatsForFields
-   * @apiDescription Returns the stats on individual fields in the specified index pattern.
-   *
-   * @apiSchema (params) indexPatternTitleSchema
-   * @apiSchema (body) dataVisualizerFieldStatsSchema
-   *
-   * @apiSuccess {Object} fieldName stats by field, keyed on the name of the field.
-   */
-  router.post(
-    {
-      path: '/api/ml/data_visualizer/get_field_stats/{indexPatternTitle}',
-      validate: {
-        params: indexPatternTitleSchema,
-        body: dataVisualizerFieldStatsSchema,
-      },
-      options: {
-        tags: ['access:ml:canAccessML'],
-      },
-    },
-    routeGuard.basicLicenseAPIGuard(async ({ client, request, response }) => {
-      try {
-        const {
-          params: { indexPatternTitle },
-          body: {
-            query,
-            fields,
-            samplerShardSize,
-            timeFieldName,
-            earliest,
-            latest,
-            interval,
-            maxExamples,
-            runtimeMappings,
-          },
-        } = request;
-        const results = await getStatsForFields(
-          client,
-          indexPatternTitle,
-          query,
-          fields,
-          samplerShardSize,
-          timeFieldName,
-          earliest,
-          latest,
-          interval,
-          maxExamples,
-          runtimeMappings
-        );
-
-        return response.ok({
-          body: results,
-        });
-      } catch (e) {
-        return response.customError(wrapError(e));
-      }
-    })
-  );
-
-  /**
-   * @apiGroup DataVisualizer
-   *
-   * @api {post} /api/ml/data_visualizer/get_overall_stats/:indexPatternTitle Get overall stats
-   * @apiName GetOverallStats
-   * @apiDescription Returns the top level overall stats for the specified index pattern.
-   *
-   * @apiSchema (params) indexPatternTitleSchema
-   * @apiSchema (body) dataVisualizerOverallStatsSchema
-   *
-   * @apiSuccess {number} totalCount total count of documents.
-   * @apiSuccess {Object} aggregatableExistsFields stats on aggregatable fields that exist in documents.
-   * @apiSuccess {Object} aggregatableNotExistsFields stats on aggregatable fields that do not exist in documents.
-   * @apiSuccess {Object} nonAggregatableExistsFields stats on non-aggregatable fields that exist in documents.
-   * @apiSuccess {Object} nonAggregatableNotExistsFields stats on non-aggregatable fields that do not exist in documents.
-   */
-  router.post(
-    {
-      path: '/api/ml/data_visualizer/get_overall_stats/{indexPatternTitle}',
-      validate: {
-        params: indexPatternTitleSchema,
-        body: dataVisualizerOverallStatsSchema,
-      },
-      options: {
-        tags: ['access:ml:canAccessML'],
-      },
-    },
-    routeGuard.basicLicenseAPIGuard(async ({ client, request, response }) => {
-      try {
-        const {
-          params: { indexPatternTitle },
-          body: {
-            query,
-            aggregatableFields,
-            nonAggregatableFields,
-            samplerShardSize,
-            timeFieldName,
-            earliest,
-            latest,
-            runtimeMappings,
-          },
-        } = request;
-
-        const results = await getOverallStats(
-          client,
-          indexPatternTitle,
-          query,
-          aggregatableFields,
-          nonAggregatableFields,
-          samplerShardSize,
-          timeFieldName,
-          earliest,
-          latest,
-          runtimeMappings
-        );
-
-        return response.ok({
-          body: results,
-        });
-      } catch (e) {
-        return response.customError(wrapError(e));
-      }
-    })
-  );
 }
diff --git a/x-pack/plugins/ml/server/routes/datafeeds.ts b/x-pack/plugins/ml/server/routes/datafeeds.ts
index 2013af3ee8735..9f908bf61a35d 100644
--- a/x-pack/plugins/ml/server/routes/datafeeds.ts
+++ b/x-pack/plugins/ml/server/routes/datafeeds.ts
@@ -247,7 +247,7 @@ export function dataFeedRoutes({ router, routeGuard }: RouteInitialization) {
     },
     routeGuard.fullLicenseAPIGuard(async ({ mlClient, request, response }) => {
       try {
-        const options: estypes.DeleteDatafeedRequest = {
+        const options: estypes.MlDeleteDatafeedRequest = {
           datafeed_id: request.params.datafeedId,
         };
         const force = request.query.force;
diff --git a/x-pack/plugins/ml/server/routes/trained_models.ts b/x-pack/plugins/ml/server/routes/trained_models.ts
index c4b2d63b05d13..106010d0f7550 100644
--- a/x-pack/plugins/ml/server/routes/trained_models.ts
+++ b/x-pack/plugins/ml/server/routes/trained_models.ts
@@ -39,6 +39,7 @@ export function trainedModelsRoutes({ router, routeGuard }: RouteInitialization)
         const { modelId } = request.params;
         const { with_pipelines: withPipelines, ...query } = request.query;
         const { body } = await mlClient.getTrainedModels({
+          // @ts-expect-error @elastic-elasticsearch not sure why this is an error, size is a number
           size: 1000,
           ...query,
           ...(modelId ? { model_id: modelId } : {}),
diff --git a/x-pack/plugins/ml/tsconfig.json b/x-pack/plugins/ml/tsconfig.json
index d887cfc885253..221718d423383 100644
--- a/x-pack/plugins/ml/tsconfig.json
+++ b/x-pack/plugins/ml/tsconfig.json
@@ -24,7 +24,7 @@
     { "path": "../../../src/plugins/index_pattern_management/tsconfig.json" },
     { "path": "../cloud/tsconfig.json" },
     { "path": "../features/tsconfig.json" },
-    { "path": "../file_data_visualizer/tsconfig.json" },
+    { "path": "../data_visualizer/tsconfig.json"},
     { "path": "../license_management/tsconfig.json" },
     { "path": "../licensing/tsconfig.json" },
     { "path": "../maps/tsconfig.json" },
diff --git a/x-pack/plugins/monitoring/common/es_glob_patterns.test.ts b/x-pack/plugins/monitoring/common/es_glob_patterns.test.ts
new file mode 100644
index 0000000000000..64250d0b3c5ae
--- /dev/null
+++ b/x-pack/plugins/monitoring/common/es_glob_patterns.test.ts
@@ -0,0 +1,120 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { ESGlobPatterns } from './es_glob_patterns';
+
+const testIndices = [
+  '.kibana_task_manager_inifc_1',
+  '.kibana_shahzad_4',
+  '.kibana_shahzad_3',
+  '.kibana_shahzad_2',
+  '.kibana_shahzad_1',
+  '.kibana_task_manager_cmarcondes-24_8.0.0_001',
+  '.kibana_task_manager_custom_kbn-pr93025_8.0.0_001',
+  '.kibana_task_manager_spong_8.0.0_001',
+  '.ds-metrics-system.process.summary-default-2021.05.25-00000',
+  '.kibana_shahzad_9',
+  '.kibana-felix-log-stream_8.0.0_001',
+  '.kibana_smith_alerts-observability-apm-000001',
+  '.ds-logs-endpoint.events.process-default-2021.05.26-000001',
+  '.kibana_dominiqueclarke54_8.0.0_001',
+  '.kibana-cmarcondes-19_8.0.0_001',
+  '.kibana_task_manager_cmarcondes-17_8.0.0_001',
+  '.kibana_task_manager_jrhodes_8.0.0_001',
+  '.kibana_task_manager_dominiqueclarke7_8',
+  'data_prod_0',
+  'data_prod_1',
+  'data_prod_2',
+  'data_prod_3',
+  'filebeat-8.0.0-2021.04.13-000001',
+  '.kibana_dominiqueclarke55-alerts-8.0.0-000001',
+  '.ds-metrics-system.socket_summary-default-2021.05.12-000001',
+  '.kibana_task_manager_dominiqueclarke24_8.0.0_001',
+  '.kibana_custom_kbn-pr94906_8.0.0_001',
+  '.kibana_task_manager_cmarcondes-22_8.0.0_001',
+  '.kibana_dominiqueclarke49-event-log-8.0.0-000001',
+  'data_stage_2',
+  'data_stage_3',
+].sort();
+
+const noSystemIndices = [
+  'data_prod_0',
+  'data_prod_1',
+  'data_prod_2',
+  'data_prod_3',
+  'filebeat-8.0.0-2021.04.13-000001',
+  'data_stage_2',
+  'data_stage_3',
+].sort();
+
+const onlySystemIndices = [
+  '.kibana_task_manager_inifc_1',
+  '.kibana_shahzad_4',
+  '.kibana_shahzad_3',
+  '.kibana_shahzad_2',
+  '.kibana_shahzad_1',
+  '.kibana_task_manager_cmarcondes-24_8.0.0_001',
+  '.kibana_task_manager_custom_kbn-pr93025_8.0.0_001',
+  '.kibana_task_manager_spong_8.0.0_001',
+  '.ds-metrics-system.process.summary-default-2021.05.25-00000',
+  '.kibana_shahzad_9',
+  '.kibana-felix-log-stream_8.0.0_001',
+  '.kibana_smith_alerts-observability-apm-000001',
+  '.ds-logs-endpoint.events.process-default-2021.05.26-000001',
+  '.kibana_dominiqueclarke54_8.0.0_001',
+  '.kibana-cmarcondes-19_8.0.0_001',
+  '.kibana_task_manager_cmarcondes-17_8.0.0_001',
+  '.kibana_task_manager_jrhodes_8.0.0_001',
+  '.kibana_task_manager_dominiqueclarke7_8',
+  '.kibana_dominiqueclarke55-alerts-8.0.0-000001',
+  '.ds-metrics-system.socket_summary-default-2021.05.12-000001',
+  '.kibana_task_manager_dominiqueclarke24_8.0.0_001',
+  '.kibana_custom_kbn-pr94906_8.0.0_001',
+  '.kibana_task_manager_cmarcondes-22_8.0.0_001',
+  '.kibana_dominiqueclarke49-event-log-8.0.0-000001',
+].sort();
+
+const kibanaNoTaskIndices = [
+  '.kibana_shahzad_4',
+  '.kibana_shahzad_3',
+  '.kibana_shahzad_2',
+  '.kibana_shahzad_1',
+  '.kibana_shahzad_9',
+  '.kibana-felix-log-stream_8.0.0_001',
+  '.kibana_smith_alerts-observability-apm-000001',
+  '.kibana_dominiqueclarke54_8.0.0_001',
+  '.kibana-cmarcondes-19_8.0.0_001',
+  '.kibana_dominiqueclarke55-alerts-8.0.0-000001',
+  '.kibana_custom_kbn-pr94906_8.0.0_001',
+  '.kibana_dominiqueclarke49-event-log-8.0.0-000001',
+].sort();
+
+describe('ES glob index patterns', () => {
+  it('should exclude system/internal indices', () => {
+    const validIndexPatterns = ESGlobPatterns.createRegExPatterns('-.*');
+    const validIndices = testIndices.filter((index) =>
+      ESGlobPatterns.isValid(index, validIndexPatterns)
+    );
+    expect(validIndices.sort()).toEqual(noSystemIndices);
+  });
+
+  it('should only show ".index" system indices', () => {
+    const validIndexPatterns = ESGlobPatterns.createRegExPatterns('.*');
+    const validIndices = testIndices.filter((index) =>
+      ESGlobPatterns.isValid(index, validIndexPatterns)
+    );
+    expect(validIndices.sort()).toEqual(onlySystemIndices);
+  });
+
+  it('should only show ".kibana*" indices without _task_', () => {
+    const validIndexPatterns = ESGlobPatterns.createRegExPatterns('.kibana*,-*_task_*');
+    const validIndices = testIndices.filter((index) =>
+      ESGlobPatterns.isValid(index, validIndexPatterns)
+    );
+    expect(validIndices.sort()).toEqual(kibanaNoTaskIndices);
+  });
+});
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 11642f4083d39..3eda13f5bcb38 100644
--- a/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
+++ b/x-pack/plugins/monitoring/public/alerts/alert_form.test.tsx
@@ -94,12 +94,12 @@ describe('alert_form', () => {
     id: 'alert-action-type',
     iconClass: '',
     selectMessage: '',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
     actionParamsFields: mockedActionParamsFields,
diff --git a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap
index 7a18ca31830a2..ce94dd2a61a80 100644
--- a/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap
+++ b/x-pack/plugins/monitoring/public/components/elasticsearch/nodes/__snapshots__/cells.test.js.snap
@@ -41,6 +41,7 @@ exports[`Node Listing Metric Cell should format a non-percentage metric 1`] = `
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="sortDown"
               />
             </button>
@@ -94,6 +95,7 @@ exports[`Node Listing Metric Cell should format a percentage metric 1`] = `
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="sortDown"
               />
             </button>
diff --git a/x-pack/plugins/monitoring/server/alerts/large_shard_size_alert.ts b/x-pack/plugins/monitoring/server/alerts/large_shard_size_alert.ts
index db318d7962beb..a6a101bc42afa 100644
--- a/x-pack/plugins/monitoring/server/alerts/large_shard_size_alert.ts
+++ b/x-pack/plugins/monitoring/server/alerts/large_shard_size_alert.ts
@@ -42,7 +42,7 @@ export class LargeShardSizeAlert extends BaseAlert {
       id: ALERT_LARGE_SHARD_SIZE,
       name: ALERT_DETAILS[ALERT_LARGE_SHARD_SIZE].label,
       throttle: '12h',
-      defaultParams: { indexPattern: '*', threshold: 55 },
+      defaultParams: { indexPattern: '-.*', threshold: 55 },
       actionVariables: [
         {
           name: 'shardIndices',
diff --git a/x-pack/plugins/monitoring/server/deprecations.ts b/x-pack/plugins/monitoring/server/deprecations.ts
index 79b879b3a5f8b..3e4d1627b0ae2 100644
--- a/x-pack/plugins/monitoring/server/deprecations.ts
+++ b/x-pack/plugins/monitoring/server/deprecations.ts
@@ -48,7 +48,12 @@ export const deprecations = ({
       const emailNotificationsEnabled = get(config, 'cluster_alerts.email_notifications.enabled');
       if (emailNotificationsEnabled && !get(config, CLUSTER_ALERTS_ADDRESS_CONFIG_KEY)) {
         addDeprecation({
-          message: `Config key [${fromPath}.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}] will be required for email notifications to work in 7.0."`,
+          message: `Config key [${fromPath}.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}] will be required for email notifications to work in 8.0."`,
+          correctiveActions: {
+            manualSteps: [
+              `Add [${fromPath}.${CLUSTER_ALERTS_ADDRESS_CONFIG_KEY}] to your kibana configs."`,
+            ],
+          },
         });
       }
       return config;
@@ -59,10 +64,16 @@ export const deprecations = ({
         if (es.username === 'elastic') {
           addDeprecation({
             message: `Setting [${fromPath}.username] to "elastic" is deprecated. You should use the "kibana_system" user instead.`,
+            correctiveActions: {
+              manualSteps: [`Replace [${fromPath}.username] from "elastic" to "kibana_system".`],
+            },
           });
         } else if (es.username === 'kibana') {
           addDeprecation({
             message: `Setting [${fromPath}.username] to "kibana" is deprecated. You should use the "kibana_system" user instead.`,
+            correctiveActions: {
+              manualSteps: [`Replace [${fromPath}.username] from "kibana" to "kibana_system".`],
+            },
           });
         }
       }
@@ -74,10 +85,20 @@ export const deprecations = ({
         if (ssl.key !== undefined && ssl.certificate === undefined) {
           addDeprecation({
             message: `Setting [${fromPath}.key] without [${fromPath}.certificate] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+            correctiveActions: {
+              manualSteps: [
+                `Set [${fromPath}.ssl.certificate] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+              ],
+            },
           });
         } else if (ssl.certificate !== undefined && ssl.key === undefined) {
           addDeprecation({
             message: `Setting [${fromPath}.certificate] without [${fromPath}.key] is deprecated. This has no effect, you should use both settings to enable TLS client authentication to Elasticsearch.`,
+            correctiveActions: {
+              manualSteps: [
+                `Set [${fromPath}.ssl.key] in your kibana configs to enable TLS client authentication to Elasticsearch.`,
+              ],
+            },
           });
         }
       }
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 603c66d2d05f2..ca8270590da54 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
@@ -26,7 +26,7 @@ describe('fetchAvailableCcs', () => {
       elasticsearchClientMock.createSuccessTransportRequestPromise({
         [connectedRemote]: {
           connected: true,
-        } as estypes.RemoteInfo,
+        } as estypes.ClusterRemoteInfoClusterRemoteInfo,
       })
     );
 
@@ -41,7 +41,7 @@ describe('fetchAvailableCcs', () => {
       elasticsearchClientMock.createSuccessTransportRequestPromise({
         [disconnectedRemote]: {
           connected: false,
-        } as estypes.RemoteInfo,
+        } as estypes.ClusterRemoteInfoClusterRemoteInfo,
       })
     );
 
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 e1da45ab7d991..aab3f0101ef83 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
@@ -120,11 +120,7 @@ export async function fetchIndexShardSize(
     for (const indexBucket of indexBuckets) {
       const shardIndex = indexBucket.key;
       const topHit = indexBucket.hits?.hits?.hits[0] as TopHitType;
-      if (
-        !topHit ||
-        shardIndex.charAt() === '.' ||
-        !ESGlobPatterns.isValid(shardIndex, validIndexPatterns)
-      ) {
+      if (!topHit || !ESGlobPatterns.isValid(shardIndex, validIndexPatterns)) {
         continue;
       }
       const {
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 220ae197a15bb..e1142a071aab5 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
@@ -12,6 +12,7 @@ import {
   BROWSER_FAMILY_LABEL,
   BROWSER_VERSION_LABEL,
   CLS_LABEL,
+  CORE_WEB_VITALS_LABEL,
   CPU_USAGE_LABEL,
   DEVICE_LABEL,
   ENVIRONMENT_LABEL,
@@ -92,6 +93,7 @@ export const DataViewLabels: Record<ReportViewTypeId, string> = {
   logs: LOGS_FREQUENCY_LABEL,
   mem: MEMORY_USAGE_LABEL,
   nwk: NETWORK_ACTIVITY_LABEL,
+  cwv: CORE_WEB_VITALS_LABEL,
 };
 
 export const ReportToDataTypeMap: Record<ReportViewTypeId, AppDataType> = {
@@ -105,4 +107,9 @@ export const ReportToDataTypeMap: Record<ReportViewTypeId, AppDataType> = {
   mem: 'infra_metrics',
   logs: 'infra_logs',
   cpu: 'infra_metrics',
+  cwv: 'ux',
 };
+
+export const USE_BREAK_DOWN_COLUMN = 'USE_BREAK_DOWN_COLUMN';
+export const FILTER_RECORDS = 'FILTER_RECORDS';
+export const OPERATION_COLUMN = 'operation';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/elasticsearch_fieldnames.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/elasticsearch_fieldnames.ts
index 3faf54fff3140..5ecc5b758de84 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/elasticsearch_fieldnames.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/elasticsearch_fieldnames.ts
@@ -119,6 +119,7 @@ export const TRANSACTION_URL = 'url.full';
 export const CLIENT_GEO = 'client.geo';
 export const USER_AGENT_DEVICE = 'user_agent.device.name';
 export const USER_AGENT_OS = 'user_agent.os.name';
+export const USER_AGENT_OS_VERSION = 'user_agent.os.version';
 
 export const TRANSACTION_TIME_TO_FIRST_BYTE = 'transaction.marks.agent.timeToFirstByte';
 export const TRANSACTION_DOM_INTERACTIVE = 'transaction.marks.agent.domInteractive';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts
index ba820a25f868a..92150a76319f8 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/constants/labels.ts
@@ -200,6 +200,14 @@ export const NETWORK_ACTIVITY_LABEL = i18n.translate(
     defaultMessage: 'Network activity',
   }
 );
+
+export const CORE_WEB_VITALS_LABEL = i18n.translate(
+  'xpack.observability.expView.fieldLabels.coreWebVitals',
+  {
+    defaultMessage: 'Core web vitals',
+  }
+);
+
 export const MEMORY_USAGE_LABEL = i18n.translate(
   'xpack.observability.expView.fieldLabels.memoryUsage',
   {
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 c6089b2316784..797ee0c2e0977 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
@@ -17,6 +17,7 @@ import { getMemoryUsageLensConfig } from './metrics/memory_usage_config';
 import { getNetworkActivityLensConfig } from './metrics/network_activity_config';
 import { getLogsFrequencyLensConfig } from './logs/logs_frequency_config';
 import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns';
+import { getCoreWebVitalsConfig } from './rum/core_web_vitals_config';
 
 interface Props {
   reportType: keyof typeof ReportViewTypes;
@@ -30,6 +31,8 @@ export const getDefaultConfigs = ({ reportType, seriesId, indexPattern }: Props)
       return getPerformanceDistLensConfig({ seriesId, indexPattern });
     case 'kpi-trends':
       return getKPITrendsLensConfig({ seriesId, indexPattern });
+    case 'core-web-vitals':
+      return getCoreWebVitalsConfig({ seriesId, indexPattern });
     case 'uptime-duration':
       return getMonitorDurationConfig({ seriesId, indexPattern });
     case 'uptime-pings':
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts
index a5fdd4971a86f..6976b55921b09 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/lens_attributes.test.ts
@@ -342,7 +342,7 @@ describe('Lens Attribute', () => {
               orderBy: { columnId: 'y-axis-column', type: 'column' },
               orderDirection: 'desc',
               otherBucket: true,
-              size: 3,
+              size: 10,
             },
             scale: 'ordinal',
             sourceField: 'user_agent.name',
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 3e22c4da6115a..89fc9ca5fcc58 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
@@ -24,14 +24,15 @@ import {
   OperationMetadata,
   FieldBasedIndexPatternColumn,
   SumIndexPatternColumn,
+  TermsIndexPatternColumn,
 } from '../../../../../../lens/public';
 import {
   buildPhraseFilter,
   buildPhrasesFilter,
   IndexPattern,
 } from '../../../../../../../../src/plugins/data/common';
-import { FieldLabels } from './constants';
-import { DataSeries, UrlFilter, URLReportDefinition } from '../types';
+import { FieldLabels, FILTER_RECORDS, USE_BREAK_DOWN_COLUMN } from './constants';
+import { ColumnFilter, DataSeries, UrlFilter, URLReportDefinition } from '../types';
 
 function getLayerReferenceName(layerId: string) {
   return `indexpattern-datasource-layer-${layerId}`;
@@ -53,6 +54,7 @@ export const parseCustomFieldName = (
 ) => {
   let fieldName = sourceField;
   let columnType;
+  let columnFilters;
 
   const rdf = reportViewConfig.reportDefinitions ?? [];
 
@@ -61,17 +63,21 @@ export const parseCustomFieldName = (
   if (customField) {
     if (selectedDefinitions[fieldName]) {
       fieldName = selectedDefinitions[fieldName][0];
-      if (customField?.options)
-        columnType = customField?.options?.find(({ field }) => field === fieldName)?.columnType;
-    } else if (customField.defaultValue) {
-      fieldName = customField.defaultValue;
-    } else if (customField.options?.[0].field) {
-      fieldName = customField.options?.[0].field;
+      if (customField?.options) {
+        const currField = customField?.options?.find(
+          ({ field, id }) => field === fieldName || id === fieldName
+        );
+        columnType = currField?.columnType;
+        columnFilters = currField?.columnFilters;
+      }
+    } else if (customField.options?.[0].field || customField.options?.[0].id) {
+      fieldName = customField.options?.[0].field || customField.options?.[0].id;
       columnType = customField.options?.[0].columnType;
+      columnFilters = customField.options?.[0].columnFilters;
     }
   }
 
-  return { fieldName, columnType };
+  return { fieldName, columnType, columnFilters };
 };
 
 export class LensAttributes {
@@ -82,6 +88,7 @@ export class LensAttributes {
   seriesType: SeriesType;
   reportViewConfig: DataSeries;
   reportDefinitions: URLReportDefinition;
+  breakdownSource?: string;
 
   constructor(
     indexPattern: IndexPattern,
@@ -89,12 +96,14 @@ export class LensAttributes {
     seriesType?: SeriesType,
     filters?: UrlFilter[],
     operationType?: OperationType,
-    reportDefinitions?: URLReportDefinition
+    reportDefinitions?: URLReportDefinition,
+    breakdownSource?: string
   ) {
     this.indexPattern = indexPattern;
     this.layers = {};
     this.filters = filters ?? [];
     this.reportDefinitions = reportDefinitions ?? {};
+    this.breakdownSource = breakdownSource;
 
     if (operationType) {
       reportViewConfig.yAxisColumns.forEach((yAxisColumn) => {
@@ -109,10 +118,10 @@ export class LensAttributes {
     this.visualization = this.getXyState();
   }
 
-  addBreakdown(sourceField: string) {
+  getBreakdownColumn(sourceField: string): TermsIndexPatternColumn {
     const fieldMeta = this.indexPattern.getFieldByName(sourceField);
 
-    this.layers.layer1.columns['break-down-column'] = {
+    return {
       sourceField,
       label: `Top values of ${FieldLabels[sourceField]}`,
       dataType: fieldMeta?.type as DataType,
@@ -120,13 +129,22 @@ export class LensAttributes {
       scale: 'ordinal',
       isBucketed: true,
       params: {
-        size: 3,
+        size: 10,
         orderBy: { type: 'column', columnId: 'y-axis-column' },
         orderDirection: 'desc',
         otherBucket: true,
         missingBucket: false,
       },
     };
+  }
+
+  addBreakdown(sourceField: string) {
+    const { xAxisColumn } = this.reportViewConfig;
+    if (xAxisColumn?.sourceField === USE_BREAK_DOWN_COLUMN) {
+      // do nothing since this will be used a x axis source
+      return;
+    }
+    this.layers.layer1.columns['break-down-column'] = this.getBreakdownColumn(sourceField);
 
     this.layers.layer1.columnOrder = [
       'x-axis-column',
@@ -229,15 +247,27 @@ export class LensAttributes {
   getXAxis() {
     const { xAxisColumn } = this.reportViewConfig;
 
+    if (xAxisColumn?.sourceField === USE_BREAK_DOWN_COLUMN) {
+      return this.getBreakdownColumn(this.breakdownSource || this.reportViewConfig.breakdowns[0]);
+    }
+
     return this.getColumnBasedOnType(xAxisColumn.sourceField!, undefined, xAxisColumn.label);
   }
 
-  getColumnBasedOnType(sourceField: string, operationType?: OperationType, label?: string) {
-    const { fieldMeta, columnType, fieldName } = this.getFieldMeta(sourceField);
+  getColumnBasedOnType(
+    sourceField: string,
+    operationType?: OperationType,
+    label?: string,
+    colIndex?: number
+  ) {
+    const { fieldMeta, columnType, fieldName, columnFilters } = this.getFieldMeta(sourceField);
     const { type: fieldType } = fieldMeta ?? {};
 
-    if (fieldName === 'Records') {
-      return this.getRecordsColumn();
+    if (fieldName === 'Records' || columnType === FILTER_RECORDS) {
+      return this.getRecordsColumn(
+        label,
+        colIndex !== undefined ? columnFilters?.[colIndex] : undefined
+      );
     }
 
     if (fieldType === 'date') {
@@ -256,11 +286,11 @@ export class LensAttributes {
   }
 
   getFieldMeta(sourceField: string) {
-    const { fieldName, columnType } = this.getCustomFieldName(sourceField);
+    const { fieldName, columnType, columnFilters } = this.getCustomFieldName(sourceField);
 
     const fieldMeta = this.indexPattern.getFieldByName(fieldName);
 
-    return { fieldMeta, fieldName, columnType };
+    return { fieldMeta, fieldName, columnType, columnFilters };
   }
 
   getMainYAxis() {
@@ -270,7 +300,7 @@ export class LensAttributes {
       return this.getRecordsColumn(label);
     }
 
-    return this.getColumnBasedOnType(sourceField!, operationType, label);
+    return this.getColumnBasedOnType(sourceField!, operationType, label, 0);
   }
 
   getChildYAxises() {
@@ -286,13 +316,14 @@ export class LensAttributes {
       lensColumns[`y-axis-column-${i}`] = this.getColumnBasedOnType(
         sourceField!,
         operationType,
-        label
+        label,
+        i
       );
     }
     return lensColumns;
   }
 
-  getRecordsColumn(label?: string): CountIndexPatternColumn {
+  getRecordsColumn(label?: string, columnFilter?: ColumnFilter): CountIndexPatternColumn {
     return {
       dataType: 'number',
       isBucketed: false,
@@ -300,6 +331,7 @@ export class LensAttributes {
       operationType: 'count',
       scale: 'ratio',
       sourceField: 'Records',
+      filter: columnFilter,
     } as CountIndexPatternColumn;
   }
 
@@ -331,7 +363,9 @@ export class LensAttributes {
           layerId: 'layer1',
           seriesType: this.seriesType ?? 'line',
           palette: this.reportViewConfig.palette,
-          yConfig: [{ forAccessor: 'y-axis-column', color: 'green' }],
+          yConfig: this.reportViewConfig.yConfig || [
+            { forAccessor: 'y-axis-column', color: 'green' },
+          ],
           xAccessor: 'x-axis-column',
         },
       ],
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/core_web_vitals_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/core_web_vitals_config.ts
new file mode 100644
index 0000000000000..de9ea12be20cf
--- /dev/null
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/core_web_vitals_config.ts
@@ -0,0 +1,164 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { euiPaletteForStatus } from '@elastic/eui';
+import { ConfigProps, DataSeries } from '../../types';
+import { FieldLabels, FILTER_RECORDS, USE_BREAK_DOWN_COLUMN } from '../constants';
+import { buildPhraseFilter } from '../utils';
+import {
+  CLIENT_GEO_COUNTRY_NAME,
+  CLS_FIELD,
+  FID_FIELD,
+  LCP_FIELD,
+  PROCESSOR_EVENT,
+  SERVICE_NAME,
+  TRANSACTION_TYPE,
+  USER_AGENT_DEVICE,
+  USER_AGENT_NAME,
+  USER_AGENT_OS,
+  USER_AGENT_VERSION,
+  TRANSACTION_URL,
+  USER_AGENT_OS_VERSION,
+  URL_FULL,
+  SERVICE_ENVIRONMENT,
+} from '../constants/elasticsearch_fieldnames';
+
+export function getCoreWebVitalsConfig({ seriesId, indexPattern }: ConfigProps): DataSeries {
+  const statusPallete = euiPaletteForStatus(3);
+
+  return {
+    id: seriesId,
+    defaultSeriesType: 'bar_horizontal_percentage_stacked',
+    reportType: 'kpi-trends',
+    seriesTypes: ['bar_horizontal_percentage_stacked'],
+    xAxisColumn: {
+      sourceField: USE_BREAK_DOWN_COLUMN,
+    },
+    yAxisColumns: [
+      {
+        sourceField: 'core.web.vitals',
+        label: 'Good',
+      },
+      {
+        sourceField: 'core.web.vitals',
+        label: 'Average',
+      },
+      {
+        sourceField: 'core.web.vitals',
+        label: 'Poor',
+      },
+    ],
+    hasOperationType: false,
+    defaultFilters: [
+      {
+        field: TRANSACTION_URL,
+        isNegated: false,
+      },
+      SERVICE_NAME,
+      {
+        field: USER_AGENT_OS,
+        nested: USER_AGENT_OS_VERSION,
+      },
+      CLIENT_GEO_COUNTRY_NAME,
+      USER_AGENT_DEVICE,
+      {
+        field: USER_AGENT_NAME,
+        nested: USER_AGENT_VERSION,
+      },
+    ],
+    breakdowns: [
+      SERVICE_NAME,
+      USER_AGENT_NAME,
+      USER_AGENT_OS,
+      CLIENT_GEO_COUNTRY_NAME,
+      USER_AGENT_DEVICE,
+      URL_FULL,
+    ],
+    filters: [
+      ...buildPhraseFilter(TRANSACTION_TYPE, 'page-load', indexPattern),
+      ...buildPhraseFilter(PROCESSOR_EVENT, 'transaction', indexPattern),
+    ],
+    labels: { ...FieldLabels, [SERVICE_NAME]: 'Web Application' },
+    reportDefinitions: [
+      {
+        field: SERVICE_NAME,
+        required: true,
+      },
+      {
+        field: SERVICE_ENVIRONMENT,
+      },
+      {
+        field: 'core.web.vitals',
+        custom: true,
+        options: [
+          {
+            id: LCP_FIELD,
+            label: 'Largest contentful paint',
+            columnType: FILTER_RECORDS,
+            columnFilters: [
+              {
+                language: 'kuery',
+                query: `${LCP_FIELD} < 2500`,
+              },
+              {
+                language: 'kuery',
+                query: `${LCP_FIELD} > 2500 and ${LCP_FIELD} < 4000`,
+              },
+              {
+                language: 'kuery',
+                query: `${LCP_FIELD} > 4000`,
+              },
+            ],
+          },
+          {
+            label: 'First input delay',
+            id: FID_FIELD,
+            columnType: FILTER_RECORDS,
+            columnFilters: [
+              {
+                language: 'kuery',
+                query: `${FID_FIELD} < 100`,
+              },
+              {
+                language: 'kuery',
+                query: `${FID_FIELD} > 100 and ${FID_FIELD} < 300`,
+              },
+              {
+                language: 'kuery',
+                query: `${FID_FIELD} > 300`,
+              },
+            ],
+          },
+          {
+            label: 'Cumulative layout shift',
+            id: CLS_FIELD,
+            columnType: FILTER_RECORDS,
+            columnFilters: [
+              {
+                language: 'kuery',
+                query: `${CLS_FIELD} < 0.1`,
+              },
+              {
+                language: 'kuery',
+                query: `${CLS_FIELD} > 0.1 and ${CLS_FIELD} < 0.25`,
+              },
+              {
+                language: 'kuery',
+                query: `${CLS_FIELD} > 0.25`,
+              },
+            ],
+          },
+        ],
+      },
+    ],
+    yConfig: [
+      { color: statusPallete[0], forAccessor: 'y-axis-column' },
+      { color: statusPallete[1], forAccessor: 'y-axis-column-1' },
+      { color: statusPallete[2], forAccessor: 'y-axis-column-2' },
+    ],
+  };
+}
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts
index 029fe5534965e..5e2d3440526b5 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/kpi_trends_config.ts
@@ -6,7 +6,7 @@
  */
 
 import { ConfigProps, DataSeries } from '../../types';
-import { FieldLabels, RECORDS_FIELD } from '../constants';
+import { FieldLabels, OPERATION_COLUMN, RECORDS_FIELD } from '../constants';
 import { buildPhraseFilter } from '../utils';
 import {
   CLIENT_GEO_COUNTRY_NAME,
@@ -85,20 +85,25 @@ export function getKPITrendsLensConfig({ seriesId, indexPattern }: ConfigProps):
       {
         field: 'business.kpi',
         custom: true,
-        defaultValue: RECORDS_FIELD,
         options: [
-          { field: RECORDS_FIELD, label: PAGE_VIEWS_LABEL },
-          { label: PAGE_LOAD_TIME_LABEL, field: TRANSACTION_DURATION, columnType: 'operation' },
+          { field: RECORDS_FIELD, id: RECORDS_FIELD, label: PAGE_VIEWS_LABEL },
+          {
+            label: PAGE_LOAD_TIME_LABEL,
+            field: TRANSACTION_DURATION,
+            id: TRANSACTION_DURATION,
+            columnType: OPERATION_COLUMN,
+          },
           {
             label: BACKEND_TIME_LABEL,
             field: TRANSACTION_TIME_TO_FIRST_BYTE,
-            columnType: 'operation',
+            id: TRANSACTION_TIME_TO_FIRST_BYTE,
+            columnType: OPERATION_COLUMN,
           },
-          { label: FCP_LABEL, field: FCP_FIELD, columnType: 'operation' },
-          { label: TBT_LABEL, field: TBT_FIELD, columnType: 'operation' },
-          { label: LCP_LABEL, field: LCP_FIELD, columnType: 'operation' },
-          { label: FID_LABEL, field: FID_FIELD, columnType: 'operation' },
-          { label: CLS_LABEL, field: CLS_FIELD, columnType: 'operation' },
+          { label: FCP_LABEL, field: FCP_FIELD, id: FCP_FIELD, columnType: OPERATION_COLUMN },
+          { label: TBT_LABEL, field: TBT_FIELD, id: TBT_FIELD, columnType: OPERATION_COLUMN },
+          { label: LCP_LABEL, field: LCP_FIELD, id: LCP_FIELD, columnType: OPERATION_COLUMN },
+          { label: FID_LABEL, field: FID_FIELD, id: FID_FIELD, columnType: OPERATION_COLUMN },
+          { label: CLS_LABEL, field: CLS_FIELD, id: CLS_FIELD, columnType: OPERATION_COLUMN },
         ],
       },
     ],
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts
index af8bd00a69553..0dc582c5683dd 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/configurations/rum/performance_dist_config.ts
@@ -80,15 +80,18 @@ export function getPerformanceDistLensConfig({ seriesId, indexPattern }: ConfigP
       {
         field: 'performance.metric',
         custom: true,
-        defaultValue: TRANSACTION_DURATION,
         options: [
-          { label: PAGE_LOAD_TIME_LABEL, field: TRANSACTION_DURATION },
-          { label: BACKEND_TIME_LABEL, field: TRANSACTION_TIME_TO_FIRST_BYTE },
-          { label: FCP_LABEL, field: FCP_FIELD },
-          { label: TBT_LABEL, field: TBT_FIELD },
-          { label: LCP_LABEL, field: LCP_FIELD },
-          { label: FID_LABEL, field: FID_FIELD },
-          { label: CLS_LABEL, field: CLS_FIELD },
+          { label: PAGE_LOAD_TIME_LABEL, id: TRANSACTION_DURATION, field: TRANSACTION_DURATION },
+          {
+            label: BACKEND_TIME_LABEL,
+            id: TRANSACTION_TIME_TO_FIRST_BYTE,
+            field: TRANSACTION_TIME_TO_FIRST_BYTE,
+          },
+          { label: FCP_LABEL, id: FCP_FIELD, field: FCP_FIELD },
+          { label: TBT_LABEL, id: TBT_FIELD, field: TBT_FIELD },
+          { label: LCP_LABEL, id: LCP_FIELD, field: LCP_FIELD },
+          { label: FID_LABEL, id: FID_FIELD, field: FID_FIELD },
+          { label: CLS_LABEL, id: CLS_FIELD, field: CLS_FIELD },
         ],
       },
     ],
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 0d79f76be341c..fc60800bc4403 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 import rison, { RisonValue } from 'rison-node';
-import type { AllSeries, AllShortSeries } from '../hooks/use_url_storage';
+import type { AllSeries, AllShortSeries } from '../hooks/use_series_storage';
 import type { SeriesUrl } from '../types';
 import { IIndexPattern } from '../../../../../../../../src/plugins/data/common/index_patterns';
 import { esFilters } from '../../../../../../../../src/plugins/data/public';
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 cf51c4614e543..fc0062694e0a3 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
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { screen, waitFor } from '@testing-library/dom';
-import { render, mockUrlStorage, mockCore, mockAppIndexPattern } from './rtl_helpers';
+import { render, mockCore, mockAppIndexPattern } from './rtl_helpers';
 import { ExploratoryView } from './exploratory_view';
 import { getStubIndexPattern } from '../../../../../../../src/plugins/data/public/test_utils';
 import * as obsvInd from './utils/observability_index_patterns';
@@ -41,26 +41,26 @@ describe('ExploratoryView', () => {
   it('renders exploratory view', async () => {
     render(<ExploratoryView />);
 
-    await waitFor(() => {
-      screen.getByText(/open in lens/i);
-      screen.getByRole('heading', { name: /analyze data/i });
-    });
+    expect(await screen.findByText(/open in lens/i)).toBeInTheDocument();
+    expect(
+      await screen.findByRole('heading', { name: /Performance Distribution/i })
+    ).toBeInTheDocument();
   });
 
   it('renders lens component when there is series', async () => {
-    mockUrlStorage({
+    const initSeries = {
       data: {
         'ux-series': {
-          dataType: 'ux',
-          reportType: 'pld',
-          breakdown: 'user_agent.name',
+          dataType: 'ux' as const,
+          reportType: 'pld' as const,
+          breakdown: 'user_agent .name',
           reportDefinitions: { 'service.name': ['elastic-co'] },
           time: { from: 'now-15m', to: 'now' },
         },
       },
-    });
+    };
 
-    render(<ExploratoryView />);
+    render(<ExploratoryView />, { initSeries });
 
     expect(await screen.findByText(/open in lens/i)).toBeInTheDocument();
     expect(await screen.findByText('Performance Distribution')).toBeInTheDocument();
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 19136cda6387c..7958dca6e396e 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
@@ -11,7 +11,7 @@ import styled from 'styled-components';
 import { useKibana } from '../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
 import { ExploratoryViewHeader } from './header/header';
-import { useUrlStorage } from './hooks/use_url_storage';
+import { useSeriesStorage } from './hooks/use_series_storage';
 import { useLensAttributes } from './hooks/use_lens_attributes';
 import { EmptyView } from './components/empty_view';
 import { TypedLensByValueInput } from '../../../../../lens/public';
@@ -19,7 +19,11 @@ import { useAppIndexPatternContext } from './hooks/use_app_index_pattern';
 import { ReportToDataTypeMap } from './configurations/constants';
 import { SeriesBuilder } from './series_builder/series_builder';
 
-export function ExploratoryView() {
+export function ExploratoryView({
+  saveAttributes,
+}: {
+  saveAttributes?: (attr: TypedLensByValueInput['attributes'] | null) => void;
+}) {
   const {
     services: { lens, notifications },
   } = useKibana<ObservabilityPublicPluginsStart>();
@@ -28,6 +32,7 @@ export function ExploratoryView() {
   const wrapperRef = useRef<HTMLDivElement>(null);
 
   const [height, setHeight] = useState<string>('100vh');
+  const [seriesId, setSeriesId] = useState<string>('');
 
   const [lensAttributes, setLensAttributes] = useState<TypedLensByValueInput['attributes'] | null>(
     null
@@ -37,7 +42,11 @@ export function ExploratoryView() {
 
   const LensComponent = lens?.EmbeddableComponent;
 
-  const { firstSeriesId: seriesId, firstSeries: series, setSeries } = useUrlStorage();
+  const { firstSeriesId, firstSeries: series, setSeries, allSeries } = useSeriesStorage();
+
+  useEffect(() => {
+    setSeriesId(firstSeriesId);
+  }, [allSeries, firstSeriesId]);
 
   const lensAttributesT = useLensAttributes({
     seriesId,
@@ -59,6 +68,10 @@ export function ExploratoryView() {
 
   useEffect(() => {
     setLensAttributes(lensAttributesT);
+    if (saveAttributes) {
+      saveAttributes(lensAttributesT);
+    }
+
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [JSON.stringify(lensAttributesT ?? {}), series?.reportType, series?.time?.from]);
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.test.tsx
index dec69dc0a7b33..ca9f2c9e73eb8 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.test.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { mockUrlStorage, render } from '../rtl_helpers';
+import { render } from '../rtl_helpers';
 import { ExploratoryViewHeader } from './header';
 import { fireEvent } from '@testing-library/dom';
 
@@ -22,22 +22,23 @@ describe('ExploratoryViewHeader', function () {
   });
 
   it('should be able to click open in lens', function () {
-    mockUrlStorage({
+    const initSeries = {
       data: {
         'uptime-pings-histogram': {
-          dataType: 'synthetics',
-          reportType: 'upp',
+          dataType: 'synthetics' as const,
+          reportType: 'upp' as const,
           breakdown: 'monitor.status',
           time: { from: 'now-15m', to: 'now' },
         },
       },
-    });
+    };
 
     const { getByText, core } = render(
       <ExploratoryViewHeader
         seriesId={'dummy-series'}
         lensAttributes={{ title: 'Performance distribution' } as any}
-      />
+      />,
+      { initSeries }
     );
     fireEvent.click(getByText('Open in Lens'));
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.tsx
index 8f2f30185d37f..3265287a7f915 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/header/header.tsx
@@ -12,7 +12,7 @@ import { TypedLensByValueInput } from '../../../../../../lens/public';
 import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityPublicPluginsStart } from '../../../../plugin';
 import { DataViewLabels } from '../configurations/constants';
-import { useUrlStorage } from '../hooks/use_url_storage';
+import { useSeriesStorage } from '../hooks/use_series_storage';
 
 interface Props {
   seriesId: string;
@@ -24,7 +24,9 @@ export function ExploratoryViewHeader({ seriesId, lensAttributes }: Props) {
     services: { lens },
   } = useKibana<ObservabilityPublicPluginsStart>();
 
-  const { series } = useUrlStorage(seriesId);
+  const { getSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   return (
     <EuiFlexGroup justifyContent="spaceBetween" alignItems="center">
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 dc6b4bd0ec879..4e9c360745b6b 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
@@ -9,7 +9,7 @@ import { useMemo } from 'react';
 import { isEmpty } from 'lodash';
 import { TypedLensByValueInput } from '../../../../../../lens/public';
 import { LensAttributes } from '../configurations/lens_attributes';
-import { useUrlStorage } from './use_url_storage';
+import { useSeriesStorage } from './use_series_storage';
 import { getDefaultConfigs } from '../configurations/default_configs';
 
 import { DataSeries, SeriesUrl, UrlFilter } from '../types';
@@ -40,8 +40,8 @@ export const getFiltersFromDefs = (
 export const useLensAttributes = ({
   seriesId,
 }: Props): TypedLensByValueInput['attributes'] | null => {
-  const { series } = useUrlStorage(seriesId);
-
+  const { getSeries } = useSeriesStorage();
+  const series = getSeries(seriesId);
   const { breakdown, seriesType, operationType, reportType, reportDefinitions = {} } = series ?? {};
 
   const { indexPattern } = useAppIndexPatternContext();
@@ -67,7 +67,8 @@ export const useLensAttributes = ({
       seriesType,
       filters,
       operationType,
-      reportDefinitions
+      reportDefinitions,
+      breakdown
     );
 
     if (breakdown) {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_filters.ts b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_filters.ts
index 2605818ed7846..2d2618bc46152 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_filters.ts
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_filters.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { useUrlStorage } from './use_url_storage';
+import { useSeriesStorage } from './use_series_storage';
 import { UrlFilter } from '../types';
 
 export interface UpdateFilter {
@@ -15,7 +15,9 @@ export interface UpdateFilter {
 }
 
 export const useSeriesFilters = ({ seriesId }: { seriesId: string }) => {
-  const { series, setSeries } = useUrlStorage(seriesId);
+  const { getSeries, setSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const filters = series.filters ?? [];
 
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
new file mode 100644
index 0000000000000..fac75f910a93f
--- /dev/null
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_series_storage.tsx
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { createContext, useContext, useState, useEffect, useCallback } from 'react';
+import {
+  IKbnUrlStateStorage,
+  ISessionStorageStateStorage,
+} from '../../../../../../../../src/plugins/kibana_utils/public';
+import type {
+  AppDataType,
+  ReportViewTypeId,
+  SeriesUrl,
+  UrlFilter,
+  URLReportDefinition,
+} from '../types';
+import { convertToShortUrl } from '../configurations/utils';
+import { OperationType, SeriesType } from '../../../../../../lens/public';
+import { URL_KEYS } from '../configurations/constants/url_constants';
+
+export interface SeriesContextValue {
+  firstSeries: SeriesUrl;
+  firstSeriesId: string;
+  allSeriesIds: string[];
+  allSeries: AllSeries;
+  setSeries: (seriesIdN: string, newValue: SeriesUrl) => void;
+  getSeries: (seriesId: string) => SeriesUrl;
+  removeSeries: (seriesId: string) => void;
+}
+export const UrlStorageContext = createContext<SeriesContextValue>({} as SeriesContextValue);
+
+interface ProviderProps {
+  storage: IKbnUrlStateStorage | ISessionStorageStateStorage;
+}
+
+export function UrlStorageContextProvider({
+  children,
+  storage,
+}: ProviderProps & { children: JSX.Element }) {
+  const allSeriesKey = 'sr';
+
+  const [allShortSeries, setAllShortSeries] = useState<AllShortSeries>(
+    () => storage.get(allSeriesKey) ?? {}
+  );
+  const [allSeries, setAllSeries] = useState<AllSeries>({});
+  const [firstSeriesId, setFirstSeriesId] = useState('');
+
+  useEffect(() => {
+    const allSeriesIds = Object.keys(allShortSeries);
+    const allSeriesN: AllSeries = {};
+    allSeriesIds.forEach((seriesKey) => {
+      allSeriesN[seriesKey] = convertFromShortUrl(allShortSeries[seriesKey]);
+    });
+
+    setAllSeries(allSeriesN);
+    setFirstSeriesId(allSeriesIds?.[0]);
+    (storage as IKbnUrlStateStorage).set(allSeriesKey, allShortSeries);
+  }, [allShortSeries, storage]);
+
+  const setSeries = (seriesIdN: string, newValue: SeriesUrl) => {
+    setAllShortSeries((prevState) => {
+      prevState[seriesIdN] = convertToShortUrl(newValue);
+      return { ...prevState };
+    });
+  };
+
+  const removeSeries = (seriesIdN: string) => {
+    delete allShortSeries[seriesIdN];
+    delete allSeries[seriesIdN];
+  };
+
+  const allSeriesIds = Object.keys(allShortSeries);
+
+  const getSeries = useCallback(
+    (seriesId?: string) => {
+      return seriesId ? allSeries?.[seriesId] ?? {} : ({} as SeriesUrl);
+    },
+    [allSeries]
+  );
+
+  const value = {
+    storage,
+    getSeries,
+    setSeries,
+    removeSeries,
+    firstSeriesId,
+    allSeries,
+    allSeriesIds,
+    firstSeries: allSeries?.[firstSeriesId],
+  };
+  return <UrlStorageContext.Provider value={value}>{children}</UrlStorageContext.Provider>;
+}
+
+export function useSeriesStorage() {
+  return useContext(UrlStorageContext);
+}
+
+function convertFromShortUrl(newValue: ShortUrlSeries): SeriesUrl {
+  const { dt, op, st, rt, bd, ft, time, rdf, ...restSeries } = newValue;
+  return {
+    operationType: op,
+    reportType: rt!,
+    seriesType: st,
+    breakdown: bd,
+    filters: ft!,
+    time: time!,
+    reportDefinitions: rdf,
+    dataType: dt!,
+    ...restSeries,
+  };
+}
+
+interface ShortUrlSeries {
+  [URL_KEYS.OPERATION_TYPE]?: OperationType;
+  [URL_KEYS.REPORT_TYPE]?: ReportViewTypeId;
+  [URL_KEYS.DATA_TYPE]?: AppDataType;
+  [URL_KEYS.SERIES_TYPE]?: SeriesType;
+  [URL_KEYS.BREAK_DOWN]?: string;
+  [URL_KEYS.FILTERS]?: UrlFilter[];
+  [URL_KEYS.REPORT_DEFINITIONS]?: URLReportDefinition;
+  time?: {
+    to: string;
+    from: string;
+  };
+}
+
+export type AllShortSeries = Record<string, ShortUrlSeries>;
+export type AllSeries = Record<string, SeriesUrl>;
+
+export const NEW_SERIES_KEY = 'new-series-key';
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_url_storage.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_url_storage.tsx
deleted file mode 100644
index 498886cc94410..0000000000000
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/hooks/use_url_storage.tsx
+++ /dev/null
@@ -1,110 +0,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, { createContext, useContext, Context } from 'react';
-import { IKbnUrlStateStorage } from '../../../../../../../../src/plugins/kibana_utils/public';
-import type {
-  AppDataType,
-  ReportViewTypeId,
-  SeriesUrl,
-  UrlFilter,
-  URLReportDefinition,
-} from '../types';
-import { convertToShortUrl } from '../configurations/utils';
-import { OperationType, SeriesType } from '../../../../../../lens/public';
-import { URL_KEYS } from '../configurations/constants/url_constants';
-
-export const UrlStorageContext = createContext<IKbnUrlStateStorage | null>(null);
-
-interface ProviderProps {
-  storage: IKbnUrlStateStorage;
-}
-
-export function UrlStorageContextProvider({
-  children,
-  storage,
-}: ProviderProps & { children: JSX.Element }) {
-  return <UrlStorageContext.Provider value={storage}>{children}</UrlStorageContext.Provider>;
-}
-
-function convertFromShortUrl(newValue: ShortUrlSeries): SeriesUrl {
-  const { dt, op, st, rt, bd, ft, time, rdf, ...restSeries } = newValue;
-  return {
-    operationType: op,
-    reportType: rt!,
-    seriesType: st,
-    breakdown: bd,
-    filters: ft!,
-    time: time!,
-    reportDefinitions: rdf,
-    dataType: dt!,
-    ...restSeries,
-  };
-}
-
-interface ShortUrlSeries {
-  [URL_KEYS.OPERATION_TYPE]?: OperationType;
-  [URL_KEYS.REPORT_TYPE]?: ReportViewTypeId;
-  [URL_KEYS.DATA_TYPE]?: AppDataType;
-  [URL_KEYS.SERIES_TYPE]?: SeriesType;
-  [URL_KEYS.BREAK_DOWN]?: string;
-  [URL_KEYS.FILTERS]?: UrlFilter[];
-  [URL_KEYS.REPORT_DEFINITIONS]?: URLReportDefinition;
-  time?: {
-    to: string;
-    from: string;
-  };
-}
-
-export type AllShortSeries = Record<string, ShortUrlSeries>;
-export type AllSeries = Record<string, SeriesUrl>;
-
-export const NEW_SERIES_KEY = 'new-series-key';
-
-export function useUrlStorage(seriesId?: string) {
-  const allSeriesKey = 'sr';
-  const storage = useContext((UrlStorageContext as unknown) as Context<IKbnUrlStateStorage>);
-  let series: SeriesUrl = {} as SeriesUrl;
-  const allShortSeries = storage.get<AllShortSeries>(allSeriesKey) ?? {};
-
-  const allSeriesIds = Object.keys(allShortSeries);
-
-  const allSeries: AllSeries = {};
-
-  allSeriesIds.forEach((seriesKey) => {
-    allSeries[seriesKey] = convertFromShortUrl(allShortSeries[seriesKey]);
-  });
-
-  if (seriesId) {
-    series = allSeries?.[seriesId] ?? ({} as SeriesUrl);
-  }
-
-  const setSeries = async (seriesIdN: string, newValue: SeriesUrl) => {
-    allShortSeries[seriesIdN] = convertToShortUrl(newValue);
-    allSeries[seriesIdN] = newValue;
-    return storage.set(allSeriesKey, allShortSeries);
-  };
-
-  const removeSeries = (seriesIdN: string) => {
-    delete allShortSeries[seriesIdN];
-    delete allSeries[seriesIdN];
-    storage.set(allSeriesKey, allShortSeries);
-  };
-
-  const firstSeriesId = allSeriesIds?.[0];
-
-  return {
-    storage,
-    setSeries,
-    removeSeries,
-    series,
-    firstSeriesId,
-    allSeries,
-    allSeriesIds,
-    firstSeries: allSeries?.[firstSeriesId],
-  };
-}
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 80b6b29f88303..3de29b02853e8 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
@@ -17,11 +17,19 @@ import { IndexPatternContextProvider } from './hooks/use_app_index_pattern';
 import {
   createKbnUrlStateStorage,
   withNotifyOnErrors,
+  createSessionStorageStateStorage,
 } from '../../../../../../../src/plugins/kibana_utils/public/';
-import { UrlStorageContextProvider } from './hooks/use_url_storage';
+import { UrlStorageContextProvider } from './hooks/use_series_storage';
 import { useTrackPageview } from '../../..';
+import { TypedLensByValueInput } from '../../../../../lens/public';
 
-export function ExploratoryViewPage() {
+export function ExploratoryViewPage({
+  saveAttributes,
+  useSessionStorage = false,
+}: {
+  useSessionStorage?: boolean;
+  saveAttributes?: (attr: TypedLensByValueInput['attributes'] | null) => void;
+}) {
   useTrackPageview({ app: 'observability-overview', path: 'exploratory-view' });
   useTrackPageview({ app: 'observability-overview', path: 'exploratory-view', delay: 15000 });
 
@@ -39,17 +47,19 @@ export function ExploratoryViewPage() {
 
   const history = useHistory();
 
-  const kbnUrlStateStorage = createKbnUrlStateStorage({
-    history,
-    useHash: uiSettings!.get('state:storeInSessionStorage'),
-    ...withNotifyOnErrors(notifications!.toasts),
-  });
+  const kbnUrlStateStorage = useSessionStorage
+    ? createSessionStorageStateStorage()
+    : createKbnUrlStateStorage({
+        history,
+        useHash: uiSettings!.get('state:storeInSessionStorage'),
+        ...withNotifyOnErrors(notifications!.toasts),
+      });
 
   return (
     <Wrapper>
       <IndexPatternContextProvider>
         <UrlStorageContextProvider storage={kbnUrlStateStorage}>
-          <ExploratoryView />
+          <ExploratoryView saveAttributes={saveAttributes} />
         </UrlStorageContextProvider>
       </IndexPatternContextProvider>
     </Wrapper>
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 beb1daafbd55f..9118e49a42dfb 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,29 +16,23 @@ import { CoreStart } from 'kibana/public';
 import { I18nProvider } from '@kbn/i18n/react';
 import { coreMock } from 'src/core/public/mocks';
 import {
-  KibanaServices,
   KibanaContextProvider,
+  KibanaServices,
 } from '../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityPublicPluginsStart } from '../../../plugin';
 import { EuiThemeProvider } from '../../../../../../../src/plugins/kibana_react/common';
 import { lensPluginMock } from '../../../../../lens/public/mocks';
+import * as useAppIndexPatternHook from './hooks/use_app_index_pattern';
 import { IndexPatternContextProvider } from './hooks/use_app_index_pattern';
-import { AllSeries, UrlStorageContextProvider } from './hooks/use_url_storage';
-import {
-  withNotifyOnErrors,
-  createKbnUrlStateStorage,
-} from '../../../../../../../src/plugins/kibana_utils/public';
+import { AllSeries, UrlStorageContext } from './hooks/use_series_storage';
+
 import * as fetcherHook from '../../../hooks/use_fetcher';
-import * as useUrlHook from './hooks/use_url_storage';
 import * as useSeriesFilterHook from './hooks/use_series_filters';
 import * as useHasDataHook from '../../../hooks/use_has_data';
 import * as useValuesListHook from '../../../hooks/use_values_list';
-import * as useAppIndexPatternHook from './hooks/use_app_index_pattern';
-
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { getStubIndexPattern } from '../../../../../../../src/plugins/data/public/index_patterns/index_pattern.stub';
 import indexPatternData from './configurations/test_data/test_index_pattern.json';
-
 // eslint-disable-next-line @kbn/eslint/no-restricted-paths
 import { setIndexPatterns } from '../../../../../../../src/plugins/data/public/services';
 import { IndexPatternsContract } from '../../../../../../../src/plugins/data/common/index_patterns/index_patterns';
@@ -73,6 +67,11 @@ interface RenderRouterOptions<ExtraCore> extends KibanaProviderOptions<ExtraCore
   history?: History;
   renderOptions?: Omit<RenderOptions, 'queries'>;
   url?: Url;
+  initSeries?: {
+    data?: AllSeries;
+    filters?: UrlFilter[];
+    breakdown?: string;
+  };
 }
 
 function getSetting<T = any>(key: string): T {
@@ -127,17 +126,8 @@ export const mockCore: () => Partial<CoreStart & ObservabilityPublicPluginsStart
 export function MockKibanaProvider<ExtraCore extends Partial<CoreStart>>({
   children,
   core,
-  history,
   kibanaProps,
 }: MockKibanaProviderProps<ExtraCore>) {
-  const { notifications } = core!;
-
-  const kbnUrlStateStorage = createKbnUrlStateStorage({
-    history,
-    useHash: false,
-    ...withNotifyOnErrors(notifications!.toasts),
-  });
-
   const indexPattern = mockIndexPattern;
 
   setIndexPatterns(({
@@ -149,11 +139,7 @@ export function MockKibanaProvider<ExtraCore extends Partial<CoreStart>>({
     <KibanaContextProvider services={{ ...core }} {...kibanaProps}>
       <EuiThemeProvider darkMode={false}>
         <I18nProvider>
-          <IndexPatternContextProvider>
-            <UrlStorageContextProvider storage={kbnUrlStateStorage}>
-              {children}
-            </UrlStorageContextProvider>
-          </IndexPatternContextProvider>
+          <IndexPatternContextProvider>{children}</IndexPatternContextProvider>
         </I18nProvider>
       </EuiThemeProvider>
     </KibanaContextProvider>
@@ -184,6 +170,7 @@ export function render<ExtraCore>(
     kibanaProps,
     renderOptions,
     url,
+    initSeries = {},
   }: RenderRouterOptions<ExtraCore> = {}
 ) {
   if (url) {
@@ -195,15 +182,20 @@ export function render<ExtraCore>(
     ...customCore,
   };
 
+  const seriesContextValue = mockSeriesStorageContext(initSeries);
+
   return {
     ...reactTestLibRender(
       <MockRouter history={history} kibanaProps={kibanaProps} core={core}>
-        {ui}
+        <UrlStorageContext.Provider value={{ ...seriesContextValue }}>
+          {ui}
+        </UrlStorageContext.Provider>
       </MockRouter>,
       renderOptions
     ),
     history,
     core,
+    ...seriesContextValue,
   };
 }
 
@@ -256,7 +248,7 @@ export const mockUseValuesList = (values?: string[]) => {
   return { spy, onRefreshTimeRange };
 };
 
-export const mockUrlStorage = ({
+function mockSeriesStorageContext({
   data,
   filters,
   breakdown,
@@ -264,7 +256,7 @@ export const mockUrlStorage = ({
   data?: AllSeries;
   filters?: UrlFilter[];
   breakdown?: string;
-}) => {
+}) {
   const mockDataSeries = data || {
     'performance-distribution': {
       reportType: 'pld',
@@ -282,18 +274,18 @@ export const mockUrlStorage = ({
   const removeSeries = jest.fn();
   const setSeries = jest.fn();
 
-  const spy = jest.spyOn(useUrlHook, 'useUrlStorage').mockReturnValue({
+  const getSeries = jest.fn().mockReturnValue(series);
+
+  return {
     firstSeriesId,
     allSeriesIds,
     removeSeries,
     setSeries,
-    series,
+    getSeries,
     firstSeries: mockDataSeries[firstSeriesId],
     allSeries: mockDataSeries,
-  } as any);
-
-  return { spy, removeSeries, setSeries };
-};
+  };
+}
 
 export function mockUseSeriesFilter() {
   const removeFilter = jest.fn();
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.test.tsx
index bac935dbecbe7..c054853d9c877 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.test.tsx
@@ -7,13 +7,11 @@
 
 import React from 'react';
 import { fireEvent, screen, waitFor } from '@testing-library/react';
-import { mockUrlStorage, render } from '../../rtl_helpers';
+import { render } from '../../rtl_helpers';
 import { SeriesChartTypesSelect, XYChartTypesSelect } from './chart_types';
 
 describe.skip('SeriesChartTypesSelect', function () {
   it('should render properly', async function () {
-    mockUrlStorage({});
-
     render(<SeriesChartTypesSelect seriesId={'series-id'} defaultChartType={'line'} />);
 
     await waitFor(() => {
@@ -22,9 +20,9 @@ describe.skip('SeriesChartTypesSelect', function () {
   });
 
   it('should call set series on change', async function () {
-    const { setSeries } = mockUrlStorage({});
-
-    render(<SeriesChartTypesSelect seriesId={'series-id'} defaultChartType={'line'} />);
+    const { setSeries } = render(
+      <SeriesChartTypesSelect seriesId={'series-id'} defaultChartType={'line'} />
+    );
 
     await waitFor(() => {
       screen.getByText(/chart type/i);
@@ -44,8 +42,6 @@ describe.skip('SeriesChartTypesSelect', function () {
 
   describe('XYChartTypesSelect', function () {
     it('should render properly', async function () {
-      mockUrlStorage({});
-
       render(<XYChartTypesSelect value={'line'} onChange={jest.fn()} label={'Chart type'} />);
 
       await waitFor(() => {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.tsx
index 3943ae3710209..9ae8b68bf3e8c 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/chart_types.tsx
@@ -11,7 +11,7 @@ import { i18n } from '@kbn/i18n';
 import { useKibana } from '../../../../../../../../../src/plugins/kibana_react/public';
 import { ObservabilityPublicPluginsStart } from '../../../../../plugin';
 import { useFetcher } from '../../../../..';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { SeriesType } from '../../../../../../../lens/public';
 
 const CHART_TYPE_LABEL = i18n.translate('xpack.observability.expView.chartTypes.label', {
@@ -20,12 +20,16 @@ const CHART_TYPE_LABEL = i18n.translate('xpack.observability.expView.chartTypes.
 
 export function SeriesChartTypesSelect({
   seriesId,
+  seriesTypes,
   defaultChartType,
 }: {
   seriesId: string;
+  seriesTypes?: SeriesType[];
   defaultChartType: SeriesType;
 }) {
-  const { series, setSeries, allSeries } = useUrlStorage(seriesId);
+  const { getSeries, setSeries, allSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const seriesType = series?.seriesType ?? defaultChartType;
 
@@ -42,8 +46,18 @@ export function SeriesChartTypesSelect({
       onChange={onChange}
       value={seriesType}
       excludeChartTypes={['bar_percentage_stacked']}
+      includeChartTypes={
+        seriesTypes || [
+          'bar',
+          'bar_horizontal',
+          'line',
+          'area',
+          'bar_stacked',
+          'area_stacked',
+          'bar_horizontal_percentage_stacked',
+        ]
+      }
       label={CHART_TYPE_LABEL}
-      includeChartTypes={['bar', 'bar_horizontal', 'line', 'area', 'bar_stacked', 'area_stacked']}
     />
   );
 }
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.test.tsx
index 9348fcbe15f6c..51529a3b1ac17 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { fireEvent, screen } from '@testing-library/react';
-import { mockAppIndexPattern, mockUrlStorage, render } from '../../rtl_helpers';
+import { mockAppIndexPattern, render } from '../../rtl_helpers';
 import { dataTypes, DataTypesCol } from './data_types_col';
 
 describe('DataTypesCol', function () {
@@ -24,9 +24,7 @@ describe('DataTypesCol', function () {
   });
 
   it('should set series on change', function () {
-    const { setSeries } = mockUrlStorage({});
-
-    render(<DataTypesCol seriesId={seriesId} />);
+    const { setSeries } = render(<DataTypesCol seriesId={seriesId} />);
 
     fireEvent.click(screen.getByText(/user experience \(rum\)/i));
 
@@ -35,18 +33,18 @@ describe('DataTypesCol', function () {
   });
 
   it('should set series on change on already selected', function () {
-    mockUrlStorage({
+    const initSeries = {
       data: {
         [seriesId]: {
-          dataType: 'synthetics',
-          reportType: 'upp',
+          dataType: 'synthetics' as const,
+          reportType: 'upp' as const,
           breakdown: 'monitor.status',
           time: { from: 'now-15m', to: 'now' },
         },
       },
-    });
+    };
 
-    render(<DataTypesCol seriesId={seriesId} />);
+    render(<DataTypesCol seriesId={seriesId} />, { initSeries });
 
     const button = screen.getByRole('button', {
       name: /Synthetic Monitoring/i,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.tsx
index b64fad51e9778..08e7f4ddcd3d0 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/data_types_col.tsx
@@ -10,7 +10,7 @@ import { EuiButton, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import styled from 'styled-components';
 import { AppDataType } from '../../types';
 import { useAppIndexPatternContext } from '../../hooks/use_app_index_pattern';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { ReportToDataTypeMap } from '../../configurations/constants';
 
 export const dataTypes: Array<{ id: AppDataType; label: string }> = [
@@ -22,8 +22,9 @@ export const dataTypes: Array<{ id: AppDataType; label: string }> = [
 ];
 
 export function DataTypesCol({ seriesId }: { seriesId: string }) {
-  const { series, setSeries, removeSeries } = useUrlStorage(seriesId);
+  const { getSeries, setSeries, removeSeries } = useSeriesStorage();
 
+  const series = getSeries(seriesId);
   const { loading } = useAppIndexPatternContext();
 
   const onDataTypeChange = (dataType?: AppDataType) => {
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.test.tsx
index 9550b8e98103b..c262a94f968be 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.test.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { fireEvent, screen } from '@testing-library/react';
-import { mockUrlStorage, render } from '../../rtl_helpers';
+import { render } from '../../rtl_helpers';
 import { OperationTypeSelect } from './operation_type_select';
 
 describe('OperationTypeSelect', function () {
@@ -18,35 +18,35 @@ describe('OperationTypeSelect', function () {
   });
 
   it('should display selected value', function () {
-    mockUrlStorage({
+    const initSeries = {
       data: {
         'performance-distribution': {
-          dataType: 'ux',
-          reportType: 'kpi',
-          operationType: 'median',
+          dataType: 'ux' as const,
+          reportType: 'kpi' as const,
+          operationType: 'median' as const,
           time: { from: 'now-15m', to: 'now' },
         },
       },
-    });
+    };
 
-    render(<OperationTypeSelect seriesId={'series-id'} />);
+    render(<OperationTypeSelect seriesId={'series-id'} />, { initSeries });
 
     screen.getByText('Median');
   });
 
   it('should call set series on change', function () {
-    const { setSeries } = mockUrlStorage({
+    const initSeries = {
       data: {
         'series-id': {
-          dataType: 'ux',
-          reportType: 'kpi',
-          operationType: 'median',
+          dataType: 'ux' as const,
+          reportType: 'kpi' as const,
+          operationType: 'median' as const,
           time: { from: 'now-15m', to: 'now' },
         },
       },
-    });
+    };
 
-    render(<OperationTypeSelect seriesId={'series-id'} />);
+    const { setSeries } = render(<OperationTypeSelect seriesId={'series-id'} />, { initSeries });
 
     fireEvent.click(screen.getByTestId('operationTypeSelect'));
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.tsx
index 75203d7bae3a0..fa273f6180935 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/operation_type_select.tsx
@@ -9,7 +9,7 @@ import React, { useEffect } from 'react';
 import { i18n } from '@kbn/i18n';
 import { EuiSuperSelect } from '@elastic/eui';
 
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { OperationType } from '../../../../../../../lens/public';
 
 export function OperationTypeSelect({
@@ -19,7 +19,9 @@ export function OperationTypeSelect({
   seriesId: string;
   defaultOperationType?: OperationType;
 }) {
-  const { series, setSeries } = useUrlStorage(seriesId);
+  const { getSeries, setSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const operationType = series?.operationType;
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.test.tsx
index 3363d17d81eab..f576862f18e76 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.test.tsx
@@ -7,9 +7,8 @@
 
 import React from 'react';
 import { fireEvent, screen } from '@testing-library/react';
-import { render } from '../../../../../utils/test_helper';
 import { getDefaultConfigs } from '../../configurations/default_configs';
-import { mockIndexPattern, mockUrlStorage } from '../../rtl_helpers';
+import { mockIndexPattern, render } from '../../rtl_helpers';
 import { ReportBreakdowns } from './report_breakdowns';
 import { USER_AGENT_OS } from '../../configurations/constants/elasticsearch_fieldnames';
 
@@ -22,8 +21,6 @@ describe('Series Builder ReportBreakdowns', function () {
   });
 
   it('should render properly', function () {
-    mockUrlStorage({});
-
     render(<ReportBreakdowns dataViewSeries={dataViewSeries} seriesId={seriesId} />);
 
     screen.getByText('Select an option: , is selected');
@@ -31,9 +28,9 @@ describe('Series Builder ReportBreakdowns', function () {
   });
 
   it('should set new series breakdown on change', function () {
-    const { setSeries } = mockUrlStorage({});
-
-    render(<ReportBreakdowns dataViewSeries={dataViewSeries} seriesId={seriesId} />);
+    const { setSeries } = render(
+      <ReportBreakdowns dataViewSeries={dataViewSeries} seriesId={seriesId} />
+    );
 
     const btn = screen.getByRole('button', {
       name: /select an option: Browser family , is selected/i,
@@ -53,9 +50,9 @@ describe('Series Builder ReportBreakdowns', function () {
     });
   });
   it('should set undefined on new series on no select breakdown', function () {
-    const { setSeries } = mockUrlStorage({});
-
-    render(<ReportBreakdowns dataViewSeries={dataViewSeries} seriesId={seriesId} />);
+    const { setSeries } = render(
+      <ReportBreakdowns dataViewSeries={dataViewSeries} seriesId={seriesId} />
+    );
 
     const btn = screen.getByRole('button', {
       name: /select an option: Browser family , is selected/i,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.tsx
index 162892071dbff..e95cd894df5f2 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_breakdowns.tsx
@@ -16,5 +16,11 @@ export function ReportBreakdowns({
   dataViewSeries: DataSeries;
   seriesId: string;
 }) {
-  return <Breakdowns breakdowns={dataViewSeries.breakdowns ?? []} seriesId={seriesId} />;
+  return (
+    <Breakdowns
+      reportViewConfig={dataViewSeries}
+      breakdowns={dataViewSeries.breakdowns ?? []}
+      seriesId={seriesId}
+    />
+  );
 }
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.test.tsx
index 27adcf4682c02..fdf6633c0ddb5 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.test.tsx
@@ -11,7 +11,6 @@ import { getDefaultConfigs } from '../../configurations/default_configs';
 import {
   mockAppIndexPattern,
   mockIndexPattern,
-  mockUrlStorage,
   mockUseValuesList,
   render,
 } from '../../rtl_helpers';
@@ -28,21 +27,23 @@ describe('Series Builder ReportDefinitionCol', function () {
     indexPattern: mockIndexPattern,
   });
 
-  const { setSeries } = mockUrlStorage({
+  const initSeries = {
     data: {
       [seriesId]: {
-        dataType: 'ux',
-        reportType: 'pld',
+        dataType: 'ux' as const,
+        reportType: 'pld' as const,
         time: { from: 'now-30d', to: 'now' },
         reportDefinitions: { [SERVICE_NAME]: ['elastic-co'] },
       },
     },
-  });
+  };
 
   mockUseValuesList(['elastic-co']);
 
   it('should render properly', async function () {
-    render(<ReportDefinitionCol dataViewSeries={dataViewSeries} seriesId={seriesId} />);
+    render(<ReportDefinitionCol dataViewSeries={dataViewSeries} seriesId={seriesId} />, {
+      initSeries,
+    });
 
     screen.getByText('Web Application');
     screen.getByText('Environment');
@@ -51,7 +52,9 @@ describe('Series Builder ReportDefinitionCol', function () {
   });
 
   it('should render selected report definitions', async function () {
-    render(<ReportDefinitionCol dataViewSeries={dataViewSeries} seriesId={seriesId} />);
+    render(<ReportDefinitionCol dataViewSeries={dataViewSeries} seriesId={seriesId} />, {
+      initSeries,
+    });
 
     expect(await screen.findByText('elastic-co')).toBeInTheDocument();
 
@@ -59,7 +62,10 @@ describe('Series Builder ReportDefinitionCol', function () {
   });
 
   it('should be able to remove selected definition', async function () {
-    render(<ReportDefinitionCol dataViewSeries={dataViewSeries} seriesId={seriesId} />);
+    const { setSeries } = render(
+      <ReportDefinitionCol dataViewSeries={dataViewSeries} seriesId={seriesId} />,
+      { initSeries }
+    );
 
     expect(
       await screen.findByLabelText('Remove elastic-co from selection in this group')
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx
index 717309e064ba3..338f5d52c26fa 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_col.tsx
@@ -6,10 +6,10 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
+import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule } from '@elastic/eui';
 import styled from 'styled-components';
 import { useAppIndexPatternContext } from '../../hooks/use_app_index_pattern';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { CustomReportField } from '../custom_report_field';
 import { DataSeries, URLReportDefinition } from '../../types';
 import { SeriesChartTypesSelect } from './chart_types';
@@ -38,9 +38,11 @@ export function ReportDefinitionCol({
 }) {
   const { indexPattern } = useAppIndexPatternContext();
 
-  const { series, setSeries } = useUrlStorage(seriesId);
+  const { getSeries, setSeries } = useSeriesStorage();
 
-  const { reportDefinitions: selectedReportDefinitions = {} } = series;
+  const series = getSeries(seriesId);
+
+  const { reportDefinitions: selectedReportDefinitions = {} } = series ?? {};
 
   const { reportDefinitions, defaultSeriesType, hasOperationType, yAxisColumns } = dataViewSeries;
 
@@ -66,8 +68,9 @@ export function ReportDefinitionCol({
       <EuiFlexItem>
         <DatePickerCol seriesId={seriesId} />
       </EuiFlexItem>
+      <EuiHorizontalRule margin="xs" />
       {indexPattern &&
-        reportDefinitions.map(({ field, custom, options, defaultValue }) => (
+        reportDefinitions.map(({ field, custom, options }) => (
           <EuiFlexItem key={field}>
             {!custom ? (
               <ReportDefinitionField
@@ -77,12 +80,7 @@ export function ReportDefinitionCol({
                 onChange={onChange}
               />
             ) : (
-              <CustomReportField
-                field={field}
-                options={options}
-                defaultValue={defaultValue}
-                seriesId={seriesId}
-              />
+              <CustomReportField field={field} options={options} seriesId={seriesId} />
             )}
           </EuiFlexItem>
         ))}
@@ -95,7 +93,11 @@ export function ReportDefinitionCol({
         </EuiFlexItem>
       )}
       <EuiFlexItem>
-        <SeriesChartTypesSelect seriesId={seriesId} defaultChartType={defaultSeriesType} />
+        <SeriesChartTypesSelect
+          seriesId={seriesId}
+          defaultChartType={defaultSeriesType}
+          seriesTypes={dataViewSeries.seriesTypes}
+        />
       </EuiFlexItem>
     </FlexGroup>
   );
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_field.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_field.tsx
index 9f92bec4d1f9c..1a6d2af8f4d40 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_field.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_definition_field.tsx
@@ -9,7 +9,7 @@ import React, { useMemo } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { isEmpty } from 'lodash';
 import FieldValueSuggestions from '../../../field_value_suggestions';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { useAppIndexPatternContext } from '../../hooks/use_app_index_pattern';
 import { ESFilter } from '../../../../../../../../../typings/elasticsearch';
 import { PersistableFilter } from '../../../../../../../lens/common';
@@ -25,7 +25,9 @@ interface Props {
 }
 
 export function ReportDefinitionField({ seriesId, field, dataSeries, onChange }: Props) {
-  const { series } = useUrlStorage(seriesId);
+  const { getSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const { indexPattern } = useAppIndexPatternContext();
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_filters.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_filters.test.tsx
index 1467cb54d648a..dc2dc629cc121 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_filters.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_filters.test.tsx
@@ -7,10 +7,9 @@
 
 import React from 'react';
 import { screen } from '@testing-library/react';
-import { render } from '../../../../../utils/test_helper';
 import { ReportFilters } from './report_filters';
 import { getDefaultConfigs } from '../../configurations/default_configs';
-import { mockIndexPattern, mockUrlStorage } from '../../rtl_helpers';
+import { mockIndexPattern, render } from '../../rtl_helpers';
 
 describe('Series Builder ReportFilters', function () {
   const seriesId = 'test-series-id';
@@ -20,7 +19,7 @@ describe('Series Builder ReportFilters', function () {
     reportType: 'pld',
     indexPattern: mockIndexPattern,
   });
-  mockUrlStorage({});
+
   it('should render properly', function () {
     render(<ReportFilters dataViewSeries={dataViewSeries} seriesId={seriesId} />);
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.test.tsx
index 20c4ea98d482d..c721a2fa2fe77 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.test.tsx
@@ -7,11 +7,11 @@
 
 import React from 'react';
 import { fireEvent, screen } from '@testing-library/react';
-import { mockAppIndexPattern, mockUrlStorage, render } from '../../rtl_helpers';
+import { mockAppIndexPattern, render } from '../../rtl_helpers';
 import { ReportTypesCol, SELECTED_DATA_TYPE_FOR_REPORT } from './report_types_col';
 import { ReportTypes } from '../series_builder';
 import { DEFAULT_TIME } from '../../configurations/constants';
-import { NEW_SERIES_KEY } from '../../hooks/use_url_storage';
+import { NEW_SERIES_KEY } from '../../hooks/use_series_storage';
 
 describe('ReportTypesCol', function () {
   const seriesId = 'test-series-id';
@@ -30,8 +30,9 @@ describe('ReportTypesCol', function () {
   });
 
   it('should set series on change', function () {
-    const { setSeries } = mockUrlStorage({});
-    render(<ReportTypesCol reportTypes={ReportTypes.synthetics} seriesId={seriesId} />);
+    const { setSeries } = render(
+      <ReportTypesCol reportTypes={ReportTypes.synthetics} seriesId={seriesId} />
+    );
 
     fireEvent.click(screen.getByText(/monitor duration/i));
 
@@ -46,18 +47,21 @@ describe('ReportTypesCol', function () {
   });
 
   it('should set selected as filled', function () {
-    const { setSeries } = mockUrlStorage({
+    const initSeries = {
       data: {
         [NEW_SERIES_KEY]: {
-          dataType: 'synthetics',
-          reportType: 'upp',
+          dataType: 'synthetics' as const,
+          reportType: 'upp' as const,
           breakdown: 'monitor.status',
           time: { from: 'now-15m', to: 'now' },
         },
       },
-    });
+    };
 
-    render(<ReportTypesCol reportTypes={ReportTypes.synthetics} seriesId={seriesId} />);
+    const { setSeries } = render(
+      <ReportTypesCol reportTypes={ReportTypes.synthetics} seriesId={seriesId} />,
+      { initSeries }
+    );
 
     const button = screen.getByRole('button', {
       name: /pings histogram/i,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.tsx
index bd82d1d1bd500..9fff8dae14a47 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/columns/report_types_col.tsx
@@ -11,7 +11,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
 import styled from 'styled-components';
 import { ReportViewTypeId, SeriesUrl } from '../../types';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { DEFAULT_TIME } from '../../configurations/constants';
 import { useAppIndexPatternContext } from '../../hooks/use_app_index_pattern';
 
@@ -21,10 +21,9 @@ interface Props {
 }
 
 export function ReportTypesCol({ seriesId, reportTypes }: Props) {
-  const {
-    series: { reportType: selectedReportType, ...restSeries },
-    setSeries,
-  } = useUrlStorage(seriesId);
+  const { setSeries, getSeries } = useSeriesStorage();
+
+  const { reportType: selectedReportType, ...restSeries } = getSeries(seriesId);
 
   const { loading, hasData, selectedApp } = useAppIndexPatternContext();
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/custom_report_field.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/custom_report_field.tsx
index 6b74ad45b2c07..201df9628e135 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/custom_report_field.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/custom_report_field.tsx
@@ -7,7 +7,7 @@
 
 import React from 'react';
 import { EuiSuperSelect } from '@elastic/eui';
-import { useUrlStorage } from '../hooks/use_url_storage';
+import { useSeriesStorage } from '../hooks/use_series_storage';
 import { ReportDefinition } from '../types';
 
 interface Props {
@@ -17,8 +17,10 @@ interface Props {
   options: ReportDefinition['options'];
 }
 
-export function CustomReportField({ field, seriesId, options: opts, defaultValue }: Props) {
-  const { series, setSeries } = useUrlStorage(seriesId);
+export function CustomReportField({ field, seriesId, options: opts }: Props) {
+  const { getSeries, setSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const { reportDefinitions: rtd = {} } = series;
 
@@ -35,11 +37,11 @@ export function CustomReportField({ field, seriesId, options: opts, defaultValue
       fullWidth
       compressed
       prepend={'Metric'}
-      options={options.map(({ label, field: fd }) => ({
-        value: fd,
+      options={options.map(({ label, field: fd, id }) => ({
+        value: fd || id,
         inputDisplay: label,
       }))}
-      valueOfSelected={reportDefinitions?.[field]?.[0] || defaultValue || options?.[0].field}
+      valueOfSelected={reportDefinitions?.[field]?.[0] || options?.[0].field || options?.[0].id}
       onChange={(value) => onChange(value)}
     />
   );
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/series_builder.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/series_builder.tsx
index 5e270524b1880..32f1fb7f7c43b 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/series_builder.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_builder/series_builder.tsx
@@ -15,7 +15,7 @@ import { ReportTypesCol } from './columns/report_types_col';
 import { ReportDefinitionCol } from './columns/report_definition_col';
 import { ReportFilters } from './columns/report_filters';
 import { ReportBreakdowns } from './columns/report_breakdowns';
-import { NEW_SERIES_KEY, useUrlStorage } from '../hooks/use_url_storage';
+import { NEW_SERIES_KEY, useSeriesStorage } from '../hooks/use_series_storage';
 import { useAppIndexPatternContext } from '../hooks/use_app_index_pattern';
 import { getDefaultConfigs } from '../configurations/default_configs';
 
@@ -27,6 +27,7 @@ export const ReportTypes: Record<AppDataType, Array<{ id: ReportViewTypeId; labe
   ux: [
     { id: 'pld', label: 'Performance distribution' },
     { id: 'kpi', label: 'KPI over time' },
+    { id: 'cwv', label: 'Core Web Vitals' },
   ],
   apm: [
     { id: 'svl', label: 'Latency' },
@@ -52,7 +53,9 @@ export function SeriesBuilder({
   seriesId: string;
   seriesBuilderRef: RefObject<HTMLDivElement>;
 }) {
-  const { series, setSeries, removeSeries } = useUrlStorage(seriesId);
+  const { getSeries, setSeries, removeSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const {
     dataType,
@@ -155,9 +158,8 @@ export function SeriesBuilder({
         reportDefinitions,
       };
 
-      setSeries(newSeriesId, newSeriesN).then(() => {
-        removeSeries(NEW_SERIES_KEY);
-      });
+      setSeries(newSeriesId, newSeriesN);
+      removeSeries(NEW_SERIES_KEY);
     }
   };
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/index.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/index.tsx
index 960c2978287bc..d6a70532f4257 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/index.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/index.tsx
@@ -8,7 +8,7 @@
 import { EuiSuperDatePicker } from '@elastic/eui';
 import React, { useEffect } from 'react';
 import { useHasData } from '../../../../hooks/use_has_data';
-import { useUrlStorage } from '../hooks/use_url_storage';
+import { useSeriesStorage } from '../hooks/use_series_storage';
 import { useQuickTimeRanges } from '../../../../hooks/use_quick_time_ranges';
 import { DEFAULT_TIME } from '../configurations/constants';
 
@@ -30,7 +30,9 @@ export function SeriesDatePicker({ seriesId }: Props) {
 
   const commonlyUsedRanges = useQuickTimeRanges();
 
-  const { series, setSeries } = useUrlStorage(seriesId);
+  const { getSeries, setSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   function onTimeChange({ start, end }: { start: string; end: string }) {
     onRefreshTimeRange();
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/series_date_picker.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/series_date_picker.test.tsx
index e99b701f091fe..0edc4330ef97a 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/series_date_picker.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_date_picker/series_date_picker.test.tsx
@@ -6,62 +6,67 @@
  */
 
 import React from 'react';
-import { mockUrlStorage, mockUseHasData, render } from '../rtl_helpers';
+import { mockUseHasData, render } from '../rtl_helpers';
 import { fireEvent, waitFor } from '@testing-library/react';
 import { SeriesDatePicker } from './index';
 import { DEFAULT_TIME } from '../configurations/constants';
 
 describe('SeriesDatePicker', function () {
   it('should render properly', function () {
-    mockUrlStorage({
+    const initSeries = {
       data: {
         'uptime-pings-histogram': {
-          dataType: 'synthetics',
-          reportType: 'upp',
+          dataType: 'synthetics' as const,
+          reportType: 'upp' as const,
           breakdown: 'monitor.status',
           time: { from: 'now-30m', to: 'now' },
         },
       },
-    });
-    const { getByText } = render(<SeriesDatePicker seriesId={'series-id'} />);
+    };
+    const { getByText } = render(<SeriesDatePicker seriesId={'series-id'} />, { initSeries });
 
     getByText('Last 30 minutes');
   });
 
   it('should set defaults', async function () {
-    const { setSeries: setSeries1 } = mockUrlStorage({
+    const initSeries = {
       data: {
         'uptime-pings-histogram': {
-          reportType: 'upp',
-          dataType: 'synthetics',
+          reportType: 'upp' as const,
+          dataType: 'synthetics' as const,
           breakdown: 'monitor.status',
         },
       },
-    } as any);
-    render(<SeriesDatePicker seriesId={'uptime-pings-histogram'} />);
+    };
+    const { setSeries: setSeries1 } = render(
+      <SeriesDatePicker seriesId={'uptime-pings-histogram'} />,
+      { initSeries: initSeries as any }
+    );
     expect(setSeries1).toHaveBeenCalledTimes(1);
     expect(setSeries1).toHaveBeenCalledWith('uptime-pings-histogram', {
       breakdown: 'monitor.status',
-      dataType: 'synthetics',
-      reportType: 'upp',
+      dataType: 'synthetics' as const,
+      reportType: 'upp' as const,
       time: DEFAULT_TIME,
     });
   });
 
   it('should set series data', async function () {
-    const { setSeries } = mockUrlStorage({
+    const initSeries = {
       data: {
         'uptime-pings-histogram': {
-          dataType: 'synthetics',
-          reportType: 'upp',
+          dataType: 'synthetics' as const,
+          reportType: 'upp' as const,
           breakdown: 'monitor.status',
           time: { from: 'now-30m', to: 'now' },
         },
       },
-    });
+    };
 
     const { onRefreshTimeRange } = mockUseHasData();
-    const { getByTestId } = render(<SeriesDatePicker seriesId={'series-id'} />);
+    const { getByTestId, setSeries } = render(<SeriesDatePicker seriesId={'series-id'} />, {
+      initSeries,
+    });
 
     await waitFor(function () {
       fireEvent.click(getByTestId('superDatePickerToggleQuickMenuButton'));
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/chart_edit_options.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/chart_edit_options.tsx
index c95d322748607..4bef3e8f71821 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/chart_edit_options.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/chart_edit_options.tsx
@@ -20,7 +20,7 @@ export function ChartEditOptions({ series, seriesId, breakdowns }: Props) {
   return (
     <EuiFlexGroup wrap>
       <EuiFlexItem>
-        <Breakdowns seriesId={seriesId} breakdowns={breakdowns} />
+        <Breakdowns seriesId={seriesId} breakdowns={breakdowns} reportViewConfig={series} />
       </EuiFlexItem>
       <EuiFlexItem>
         <ChartOptions series={series} />
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.test.tsx
index eff62a60509e3..0ce9db73f92b1 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.test.tsx
@@ -8,8 +8,8 @@
 import React from 'react';
 import { fireEvent, screen } from '@testing-library/react';
 import { Breakdowns } from './breakdowns';
-import { mockIndexPattern, mockUrlStorage, render } from '../../rtl_helpers';
-import { NEW_SERIES_KEY } from '../../hooks/use_url_storage';
+import { mockIndexPattern, render } from '../../rtl_helpers';
+import { NEW_SERIES_KEY } from '../../hooks/use_series_storage';
 import { getDefaultConfigs } from '../../configurations/default_configs';
 import { USER_AGENT_OS } from '../../configurations/constants/elasticsearch_fieldnames';
 
@@ -21,17 +21,28 @@ describe('Breakdowns', function () {
   });
 
   it('should render properly', async function () {
-    mockUrlStorage({});
-
-    render(<Breakdowns seriesId={'series-id'} breakdowns={dataViewSeries.breakdowns} />);
+    render(
+      <Breakdowns
+        seriesId={'series-id'}
+        breakdowns={dataViewSeries.breakdowns}
+        reportViewConfig={dataViewSeries}
+      />
+    );
 
     screen.getAllByText('Browser family');
   });
 
   it('should call set series on change', function () {
-    const { setSeries } = mockUrlStorage({ breakdown: USER_AGENT_OS });
-
-    render(<Breakdowns seriesId={'series-id'} breakdowns={dataViewSeries.breakdowns} />);
+    const initSeries = { breakdown: USER_AGENT_OS };
+
+    const { setSeries } = render(
+      <Breakdowns
+        seriesId={'series-id'}
+        breakdowns={dataViewSeries.breakdowns}
+        reportViewConfig={dataViewSeries}
+      />,
+      { initSeries }
+    );
 
     screen.getAllByText('Operating system');
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.tsx
index 5561779daa8c4..cf24cb31951b1 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/breakdowns.tsx
@@ -8,16 +8,20 @@
 import React from 'react';
 import { EuiSuperSelect } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
-import { FieldLabels } from '../../configurations/constants';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
+import { USE_BREAK_DOWN_COLUMN } from '../../configurations/constants';
+import { DataSeries } from '../../types';
 
 interface Props {
   seriesId: string;
   breakdowns: string[];
+  reportViewConfig: DataSeries;
 }
 
-export function Breakdowns({ seriesId, breakdowns = [] }: Props) {
-  const { setSeries, series } = useUrlStorage(seriesId);
+export function Breakdowns({ reportViewConfig, seriesId, breakdowns = [] }: Props) {
+  const { setSeries, getSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const selectedBreakdown = series.breakdown;
   const NO_BREAKDOWN = 'no_breakdown';
@@ -36,13 +40,21 @@ export function Breakdowns({ seriesId, breakdowns = [] }: Props) {
     }
   };
 
-  const items = breakdowns.map((breakdown) => ({ id: breakdown, label: FieldLabels[breakdown] }));
-  items.push({
-    id: NO_BREAKDOWN,
-    label: i18n.translate('xpack.observability.exp.breakDownFilter.noBreakdown', {
-      defaultMessage: 'No breakdown',
-    }),
-  });
+  const hasUseBreakdownColumn = reportViewConfig.xAxisColumn.sourceField === USE_BREAK_DOWN_COLUMN;
+
+  const items = breakdowns.map((breakdown) => ({
+    id: breakdown,
+    label: reportViewConfig.labels[breakdown],
+  }));
+
+  if (!hasUseBreakdownColumn) {
+    items.push({
+      id: NO_BREAKDOWN,
+      label: i18n.translate('xpack.observability.exp.breakDownFilter.noBreakdown', {
+        defaultMessage: 'No breakdown',
+      }),
+    });
+  }
 
   const options = items.map(({ id, label }) => ({
     inputDisplay: id === NO_BREAKDOWN ? label : <strong>{label}</strong>,
@@ -50,13 +62,16 @@ export function Breakdowns({ seriesId, breakdowns = [] }: Props) {
     dropdownDisplay: label,
   }));
 
+  const valueOfSelected =
+    selectedBreakdown || (hasUseBreakdownColumn ? options[0].value : NO_BREAKDOWN);
+
   return (
     <div style={{ width: 200 }}>
       <EuiSuperSelect
         fullWidth
         compressed
         options={options}
-        valueOfSelected={selectedBreakdown ?? NO_BREAKDOWN}
+        valueOfSelected={valueOfSelected}
         onChange={(value) => onOptionChange(value)}
         data-test-subj={'seriesBreakdown'}
       />
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.test.tsx
index 8d3060792857e..1a8c5b335bc4f 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.test.tsx
@@ -8,12 +8,12 @@
 import React from 'react';
 import { fireEvent, screen } from '@testing-library/react';
 import { FilterExpanded } from './filter_expanded';
-import { mockAppIndexPattern, mockUrlStorage, mockUseValuesList, render } from '../../rtl_helpers';
+import { mockAppIndexPattern, mockUseValuesList, render } from '../../rtl_helpers';
 import { USER_AGENT_NAME } from '../../configurations/constants/elasticsearch_fieldnames';
 
 describe('FilterExpanded', function () {
   it('should render properly', async function () {
-    mockUrlStorage({ filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] });
+    const initSeries = { filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] };
     mockAppIndexPattern();
 
     render(
@@ -22,13 +22,14 @@ describe('FilterExpanded', function () {
         label={'Browser Family'}
         field={USER_AGENT_NAME}
         goBack={jest.fn()}
-      />
+      />,
+      { initSeries }
     );
 
     screen.getByText('Browser Family');
   });
   it('should call go back on click', async function () {
-    mockUrlStorage({ filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] });
+    const initSeries = { filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] };
     const goBack = jest.fn();
 
     render(
@@ -37,7 +38,8 @@ describe('FilterExpanded', function () {
         label={'Browser Family'}
         field={USER_AGENT_NAME}
         goBack={goBack}
-      />
+      />,
+      { initSeries }
     );
 
     fireEvent.click(screen.getByText('Browser Family'));
@@ -47,7 +49,7 @@ describe('FilterExpanded', function () {
   });
 
   it('should call useValuesList on load', async function () {
-    mockUrlStorage({ filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] });
+    const initSeries = { filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] };
 
     const { spy } = mockUseValuesList(['Chrome', 'Firefox']);
 
@@ -59,7 +61,8 @@ describe('FilterExpanded', function () {
         label={'Browser Family'}
         field={USER_AGENT_NAME}
         goBack={goBack}
-      />
+      />,
+      { initSeries }
     );
 
     expect(spy).toHaveBeenCalledTimes(1);
@@ -71,7 +74,7 @@ describe('FilterExpanded', function () {
     );
   });
   it('should filter display values', async function () {
-    mockUrlStorage({ filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] });
+    const initSeries = { filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] };
 
     mockUseValuesList(['Chrome', 'Firefox']);
 
@@ -81,7 +84,8 @@ describe('FilterExpanded', function () {
         label={'Browser Family'}
         field={USER_AGENT_NAME}
         goBack={jest.fn()}
-      />
+      />,
+      { initSeries }
     );
 
     expect(screen.queryByText('Firefox')).toBeTruthy();
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.tsx
index 7a646c9035968..cc1769cfa8c95 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_expanded.tsx
@@ -11,7 +11,7 @@ import styled from 'styled-components';
 import { rgba } from 'polished';
 import { i18n } from '@kbn/i18n';
 import { useAppIndexPatternContext } from '../../hooks/use_app_index_pattern';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { UrlFilter } from '../../types';
 import { FilterValueButton } from './filter_value_btn';
 import { useValuesList } from '../../../../../hooks/use_values_list';
@@ -33,7 +33,9 @@ export function FilterExpanded({ seriesId, field, label, goBack, nestedField, is
 
   const [isOpen, setIsOpen] = useState({ value: '', negate: false });
 
-  const { series } = useUrlStorage(seriesId);
+  const { getSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const { values, loading } = useValuesList({
     query: value,
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.test.tsx
index befbb3b74d6d7..79eb858b7624b 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/filter_value_btn.test.tsx
@@ -8,7 +8,7 @@
 import React from 'react';
 import { fireEvent, screen } from '@testing-library/react';
 import { FilterValueButton } from './filter_value_btn';
-import { mockUrlStorage, mockUseSeriesFilter, mockUseValuesList, render } from '../../rtl_helpers';
+import { mockUseSeriesFilter, mockUseValuesList, render } from '../../rtl_helpers';
 import {
   USER_AGENT_NAME,
   USER_AGENT_VERSION,
@@ -75,7 +75,6 @@ describe('FilterValueButton', function () {
     });
   });
   it('should remove filter on click if already selected', async function () {
-    mockUrlStorage({});
     const { removeFilter } = mockUseSeriesFilter();
 
     render(
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 ccb9c90a884bb..ea84ec6b6c212 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,7 +8,7 @@ import { i18n } from '@kbn/i18n';
 import React, { useMemo } from 'react';
 import { EuiFilterButton, hexToRgb } from '@elastic/eui';
 import { useAppIndexPatternContext } from '../../hooks/use_app_index_pattern';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 import { useSeriesFilters } from '../../hooks/use_series_filters';
 import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
 import FieldValueSuggestions from '../../../field_value_suggestions';
@@ -37,7 +37,9 @@ export function FilterValueButton({
   nestedField,
   allSelectedValues,
 }: Props) {
-  const { series } = useUrlStorage(seriesId);
+  const { getSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const { indexPattern } = useAppIndexPatternContext();
 
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/remove_series.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/remove_series.tsx
index ba2cdc545fbef..dc84352ff3b3d 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/remove_series.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/remove_series.tsx
@@ -8,14 +8,14 @@
 import { i18n } from '@kbn/i18n';
 import React from 'react';
 import { EuiButtonIcon } from '@elastic/eui';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 
 interface Props {
   seriesId: string;
 }
 
 export function RemoveSeries({ seriesId }: Props) {
-  const { removeSeries } = useUrlStorage();
+  const { removeSeries } = useSeriesStorage();
 
   const onClick = () => {
     removeSeries(seriesId);
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_actions.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_actions.tsx
index cdc20e2d9ab6c..5374fc33093a1 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_actions.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_actions.tsx
@@ -9,14 +9,15 @@ import React from 'react';
 import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { RemoveSeries } from './remove_series';
-import { NEW_SERIES_KEY, useUrlStorage } from '../../hooks/use_url_storage';
+import { NEW_SERIES_KEY, useSeriesStorage } from '../../hooks/use_series_storage';
 import { ReportToDataTypeMap } from '../../configurations/constants';
 
 interface Props {
   seriesId: string;
 }
 export function SeriesActions({ seriesId }: Props) {
-  const { series, removeSeries, setSeries } = useUrlStorage(seriesId);
+  const { getSeries, removeSeries, setSeries } = useSeriesStorage();
+  const series = getSeries(seriesId);
 
   const onEdit = () => {
     removeSeries(seriesId);
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_filter.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_filter.tsx
index 926852fda5cbc..9e5770c2de8f9 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_filter.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/columns/series_filter.tsx
@@ -19,7 +19,7 @@ import { FilterExpanded } from './filter_expanded';
 import { DataSeries } from '../../types';
 import { FieldLabels } from '../../configurations/constants/constants';
 import { SelectedFilters } from '../selected_filters';
-import { useUrlStorage } from '../../hooks/use_url_storage';
+import { useSeriesStorage } from '../../hooks/use_series_storage';
 
 interface Props {
   seriesId: string;
@@ -53,7 +53,8 @@ export function SeriesFilter({ series, isNew, seriesId, defaultFilters = [] }: P
     };
   });
 
-  const { setSeries, series: urlSeries } = useUrlStorage(seriesId);
+  const { setSeries, getSeries } = useSeriesStorage();
+  const urlSeries = getSeries(seriesId);
 
   const button = (
     <EuiButtonEmpty
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.test.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.test.tsx
index 30844a3f78a76..2919714ac0cd4 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.test.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.test.tsx
@@ -7,10 +7,10 @@
 
 import React from 'react';
 import { screen, waitFor } from '@testing-library/react';
-import { mockAppIndexPattern, mockIndexPattern, mockUrlStorage, render } from '../rtl_helpers';
+import { mockAppIndexPattern, mockIndexPattern, render } from '../rtl_helpers';
 import { SelectedFilters } from './selected_filters';
 import { getDefaultConfigs } from '../configurations/default_configs';
-import { NEW_SERIES_KEY } from '../hooks/use_url_storage';
+import { NEW_SERIES_KEY } from '../hooks/use_series_storage';
 import { USER_AGENT_NAME } from '../configurations/constants/elasticsearch_fieldnames';
 
 describe('SelectedFilters', function () {
@@ -23,9 +23,9 @@ describe('SelectedFilters', function () {
   });
 
   it('should render properly', async function () {
-    mockUrlStorage({ filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] });
+    const initSeries = { filters: [{ field: USER_AGENT_NAME, values: ['Chrome'] }] };
 
-    render(<SelectedFilters seriesId={'series-id'} series={dataViewSeries} />);
+    render(<SelectedFilters seriesId={'series-id'} series={dataViewSeries} />, { initSeries });
 
     await waitFor(() => {
       screen.getByText('Chrome');
diff --git a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.tsx b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.tsx
index aabb39f88507f..63abb581c9c72 100644
--- a/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.tsx
+++ b/x-pack/plugins/observability/public/components/shared/exploratory_view/series_editor/selected_filters.tsx
@@ -7,7 +7,7 @@
 
 import React, { Fragment } from 'react';
 import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
-import { useUrlStorage } from '../hooks/use_url_storage';
+import { useSeriesStorage } from '../hooks/use_series_storage';
 import { FilterLabel } from '../components/filter_label';
 import { DataSeries, UrlFilter } from '../types';
 import { useAppIndexPatternContext } from '../hooks/use_app_index_pattern';
@@ -20,7 +20,9 @@ interface Props {
   isNew?: boolean;
 }
 export function SelectedFilters({ seriesId, isNew, series: dataSeries }: Props) {
-  const { series } = useUrlStorage(seriesId);
+  const { getSeries } = useSeriesStorage();
+
+  const series = getSeries(seriesId);
 
   const { reportDefinitions = {} } = series;
 
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 d883b854c88cb..6e513fcd2fec9 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
@@ -11,7 +11,7 @@ import { EuiBasicTable, EuiIcon, EuiSpacer, EuiText } from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { SeriesFilter } from './columns/series_filter';
 import { DataSeries } from '../types';
-import { NEW_SERIES_KEY, useUrlStorage } from '../hooks/use_url_storage';
+import { NEW_SERIES_KEY, useSeriesStorage } from '../hooks/use_series_storage';
 import { getDefaultConfigs } from '../configurations/default_configs';
 import { DatePickerCol } from './columns/date_picker_col';
 import { useAppIndexPatternContext } from '../hooks/use_app_index_pattern';
@@ -19,7 +19,7 @@ import { SeriesActions } from './columns/series_actions';
 import { ChartEditOptions } from './chart_edit_options';
 
 export function SeriesEditor() {
-  const { allSeries, firstSeriesId } = useUrlStorage();
+  const { allSeries, firstSeriesId } = useSeriesStorage();
 
   const columns = [
     {
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 7b9278352925e..c3dd824e441a8 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
@@ -12,6 +12,7 @@ import {
   FieldBasedIndexPatternColumn,
   SeriesType,
   OperationType,
+  YConfig,
 } from '../../../../../lens/public';
 
 import { PersistableFilter } from '../../../../../lens/common';
@@ -21,6 +22,7 @@ import { ExistsFilter } from '../../../../../../../src/plugins/data/common/es_qu
 export const ReportViewTypes = {
   pld: 'page-load-dist',
   kpi: 'kpi-trends',
+  cwv: 'core-web-vitals',
   upd: 'uptime-duration',
   upp: 'uptime-pings',
   svl: 'service-latency',
@@ -37,16 +39,22 @@ export type ReportViewTypeId = keyof typeof ReportViewTypes;
 
 export type ReportViewType = ValueOf<typeof ReportViewTypes>;
 
+export interface ColumnFilter {
+  language: 'kuery';
+  query: string;
+}
+
 export interface ReportDefinition {
   field: string;
   required?: boolean;
   custom?: boolean;
-  defaultValue?: string;
   options?: Array<{
-    field: string;
+    id: string;
+    field?: string;
     label: string;
     description?: string;
-    columnType?: 'range' | 'operation';
+    columnType?: 'range' | 'operation' | 'FILTER_RECORDS';
+    columnFilters?: ColumnFilter[];
   }>;
 }
 
@@ -66,6 +74,7 @@ export interface DataSeries {
   hasOperationType: boolean;
   palette?: PaletteOutput;
   yTitle?: string;
+  yConfig?: YConfig[];
 }
 
 export type URLReportDefinition = Record<string, string[]>;
diff --git a/x-pack/plugins/observability/public/components/shared/page_template/README.md b/x-pack/plugins/observability/public/components/shared/page_template/README.md
index fb2a603cc7a7f..104b365e94fe9 100644
--- a/x-pack/plugins/observability/public/components/shared/page_template/README.md
+++ b/x-pack/plugins/observability/public/components/shared/page_template/README.md
@@ -12,7 +12,42 @@ To register a solution's navigation structure you'll first need to ensure your s
 ],
 ```
 
-Now within your solution's **public** plugin `setup` lifecycle method you can call the `registerSections` method, this will register your solution's specific navigation structure with the overall Observability navigation registry. E.g.
+Now within your solution's **public** plugin `setup` lifecycle method you can
+call the `registerSections` method, this will register your solution's specific
+navigation structure with the overall Observability navigation registry.
+
+The `registerSections` function takes an `Observable` of an array of
+`NavigationSection`s. Each section can be defined as
+
+```typescript
+export interface NavigationSection {
+  // the label of the section, should be translated
+  label: string | undefined;
+  // the key to sort by in ascending order relative to other entries
+  sortKey: number;
+  // the entries to render inside the section
+  entries: NavigationEntry[];
+}
+```
+
+Each entry inside of a navigation section is defined as
+
+```typescript
+export interface NavigationEntry {
+  // the label of the menu entry, should be translated
+  label: string;
+  // the kibana app id
+  app: string;
+  // the path after the application prefix corresponding to this entry
+  path: string;
+  // whether to only match when the full path matches, defaults to `false`
+  matchFullPath?: boolean;
+  // whether to ignore trailing slashes, defaults to `true`
+  ignoreTrailingSlash?: boolean;
+}
+```
+
+A registration might therefore look like the following:
 
 ```typescript
 // x-pack/plugins/example_plugin/public/plugin.ts
@@ -29,6 +64,7 @@ export class Plugin implements PluginClass {
           label: 'A solution section',
           sortKey: 200,
           entries: [
+            { label: 'Home Page', app: 'exampleA', path: '/', matchFullPath: true },
             { label: 'Example Page', app: 'exampleA', path: '/example' },
             { label: 'Another Example Page', app: 'exampleA', path: '/another-example' },
           ],
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 8025c6d658692..bebcd53f8ae6c 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
@@ -71,6 +71,8 @@ export function ObservabilityPageTemplate({
             entry.app === currentAppId &&
             matchPath(currentPath, {
               path: entry.path,
+              exact: !!entry.matchFullPath,
+              strict: !entry.ignoreTrailingSlash,
             }) != null;
 
           return {
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 14c4e0a7cb9af..d16fbf6f7cd14 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 { usePluginContext } from './use_plugin_context';
 import { UI_SETTINGS } from '../../../../../src/plugins/data/public';
+import { useKibana } from '../../../../../src/plugins/kibana_react/public';
 
 export { UI_SETTINGS };
 
@@ -14,6 +14,8 @@ type SettingKeys = keyof typeof UI_SETTINGS;
 type SettingValues = typeof UI_SETTINGS[SettingKeys];
 
 export function useKibanaUISettings<T>(key: SettingValues): T {
-  const { core } = usePluginContext();
-  return core.uiSettings.get<T>(key);
+  const {
+    services: { uiSettings },
+  } = useKibana();
+  return uiSettings!.get<T>(key);
 }
diff --git a/x-pack/plugins/observability/public/index.ts b/x-pack/plugins/observability/public/index.ts
index a49d3461529c2..030046ce7bed9 100644
--- a/x-pack/plugins/observability/public/index.ts
+++ b/x-pack/plugins/observability/public/index.ts
@@ -57,6 +57,7 @@ export { useFetcher, FETCH_STATUS } from './hooks/use_fetcher';
 export * from './typings';
 
 export { useChartTheme } from './hooks/use_chart_theme';
+export { useBreadcrumbs } from './hooks/use_breadcrumbs';
 export { useTheme } from './hooks/use_theme';
 export { getApmTraceUrl } from './utils/get_apm_trace_url';
 export { createExploratoryViewUrl } from './components/shared/exploratory_view/configurations/utils';
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 cba9df83c6fe3..35f2dc18c2f22 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,7 +9,7 @@ import { AlertTypeModel, AlertTypeRegistryContract } from '../../../triggers_act
 import { ParsedTechnicalFields } from '../../../rule_registry/common/parse_technical_fields';
 import { AsDuration, AsPercent } from '../../common/utils/formatters';
 
-type Formatter = (options: {
+export type Formatter = (options: {
   fields: ParsedTechnicalFields & Record<string, any>;
   formatters: { asDuration: AsDuration; asPercent: AsPercent };
 }) => { reason: string; link: string };
diff --git a/x-pack/plugins/observability/public/services/navigation_registry.ts b/x-pack/plugins/observability/public/services/navigation_registry.ts
index f42f34fcfe9bb..79a36731f7ed1 100644
--- a/x-pack/plugins/observability/public/services/navigation_registry.ts
+++ b/x-pack/plugins/observability/public/services/navigation_registry.ts
@@ -9,15 +9,25 @@ import { combineLatest, Observable, ReplaySubject } from 'rxjs';
 import { map, scan, shareReplay, switchMap } from 'rxjs/operators';
 
 export interface NavigationSection {
+  // the label of the section, should be translated
   label: string | undefined;
+  // the key to sort by in ascending order relative to other entries
   sortKey: number;
+  // the entries to render inside the section
   entries: NavigationEntry[];
 }
 
 export interface NavigationEntry {
+  // the label of the menu entry, should be translated
   label: string;
+  // the kibana app id
   app: string;
+  // the path after the application prefix corresponding to this entry
   path: string;
+  // whether to only match when the full path matches, defaults to `false`
+  matchFullPath?: boolean;
+  // whether to ignore trailing slashes, defaults to `true`
+  ignoreTrailingSlash?: boolean;
 }
 
 export interface NavigationRegistry {
diff --git a/x-pack/plugins/observability/server/lib/annotations/mappings.ts b/x-pack/plugins/observability/server/lib/annotations/mappings.ts
index da72afdbecb33..3313c411b5889 100644
--- a/x-pack/plugins/observability/server/lib/annotations/mappings.ts
+++ b/x-pack/plugins/observability/server/lib/annotations/mappings.ts
@@ -6,7 +6,7 @@
  */
 
 export const mappings = {
-  dynamic: 'strict' as const,
+  dynamic: 'strict',
   properties: {
     annotation: {
       properties: {
@@ -45,4 +45,4 @@ export const mappings = {
       },
     },
   },
-};
+} as const;
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 19b14ef8b2437..7451314ad248c 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
@@ -4,12 +4,12 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { CreateIndexRequest, PutMappingRequest } from '@elastic/elasticsearch/api/types';
+import { estypes } from '@elastic/elasticsearch';
 import pRetry from 'p-retry';
 import { Logger, ElasticsearchClient } from 'src/core/server';
 
-export type Mappings = Required<CreateIndexRequest>['body']['mappings'] &
-  Required<PutMappingRequest>['body'];
+export type Mappings = Required<estypes.IndicesCreateRequest>['body']['mappings'] &
+  Required<estypes.IndicesPutMappingRequest>['body'];
 
 export async function createOrUpdateIndex({
   index,
@@ -71,7 +71,7 @@ function createNewIndex({
 }: {
   index: string;
   client: ElasticsearchClient;
-  mappings: Required<CreateIndexRequest>['body']['mappings'];
+  mappings: Required<estypes.IndicesCreateRequest>['body']['mappings'];
 }) {
   return client.indices.create({
     index,
@@ -90,7 +90,7 @@ function updateExistingIndex({
 }: {
   index: string;
   client: ElasticsearchClient;
-  mappings: PutMappingRequest['body'];
+  mappings: estypes.IndicesPutMappingRequest['body'];
 }) {
   return client.indices.putMapping({
     index,
diff --git a/x-pack/plugins/observability/server/utils/queries.ts b/x-pack/plugins/observability/server/utils/queries.ts
index b7412120365c6..2ee3291e7fb62 100644
--- a/x-pack/plugins/observability/server/utils/queries.ts
+++ b/x-pack/plugins/observability/server/utils/queries.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { ALERT_STATUS } from '@kbn/rule-data-utils/target/technical_field_names';
 import { esKuery } from '../../../../../src/plugins/data/server';
 import { AlertStatus } from '../../common/typings';
@@ -18,7 +18,11 @@ export function alertStatusQuery(status: AlertStatus) {
   return [{ term: { [ALERT_STATUS]: status } }];
 }
 
-export function rangeQuery(start?: number, end?: number, field = '@timestamp'): QueryContainer[] {
+export function rangeQuery(
+  start?: number,
+  end?: number,
+  field = '@timestamp'
+): estypes.QueryDslQueryContainer[] {
   return [
     {
       range: {
@@ -32,7 +36,7 @@ export function rangeQuery(start?: number, end?: number, field = '@timestamp'):
   ];
 }
 
-export function kqlQuery(kql?: string): QueryContainer[] {
+export function kqlQuery(kql?: string): estypes.QueryDslQueryContainer[] {
   if (!kql) {
     return [];
   }
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 d07af8c878c51..fb3bd92abb4c9 100644
--- a/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
+++ b/x-pack/plugins/osquery/common/search_strategy/osquery/index.ts
@@ -37,7 +37,7 @@ export type FactoryQueryTypes = OsqueryQueries;
 
 export interface RequestBasicOptions extends IEsSearchRequest {
   filterQuery: ESQuery | string | undefined;
-  aggregations?: Record<string, estypes.AggregationContainer>;
+  aggregations?: Record<string, estypes.AggregationsAggregationContainer>;
   docValueFields?: DocValueFields[];
   factoryQueryType?: FactoryQueryTypes;
 }
diff --git a/x-pack/plugins/osquery/public/agents/helpers.ts b/x-pack/plugins/osquery/public/agents/helpers.ts
index a79933db0ceb0..df966a01f1de1 100644
--- a/x-pack/plugins/osquery/public/agents/helpers.ts
+++ b/x-pack/plugins/osquery/public/agents/helpers.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Aggregate, TermsAggregate } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { euiPaletteColorBlindBehindText } from '@elastic/eui';
 import {
   PaginationInputPaginated,
@@ -40,11 +40,11 @@ export const getNumOverlapped = (
   });
   return sum;
 };
-export const processAggregations = (aggs: Record<string, Aggregate>) => {
+export const processAggregations = (aggs: Record<string, estypes.AggregationsAggregate>) => {
   const platforms: Group[] = [];
   const overlap: Overlap = {};
-  const platformTerms = aggs.platforms as TermsAggregate<AggregationDataPoint>;
-  const policyTerms = aggs.policies as TermsAggregate<AggregationDataPoint>;
+  const platformTerms = aggs.platforms as estypes.AggregationsTermsAggregate<AggregationDataPoint>;
+  const policyTerms = aggs.policies as estypes.AggregationsTermsAggregate<AggregationDataPoint>;
 
   const policies =
     policyTerms?.buckets.map((o) => ({ name: o.key, id: o.key, size: o.doc_count })) ?? [];
diff --git a/x-pack/plugins/osquery/public/agents/types.ts b/x-pack/plugins/osquery/public/agents/types.ts
index 302b2686d511e..bfe59c91d007d 100644
--- a/x-pack/plugins/osquery/public/agents/types.ts
+++ b/x-pack/plugins/osquery/public/agents/types.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { TermsAggregate } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { EuiComboBoxOptionOption } from '@elastic/eui';
 import { Agent } from '../../common/shared_imports';
 
@@ -15,7 +15,7 @@ interface BaseDataPoint {
 }
 
 export type AggregationDataPoint = BaseDataPoint & {
-  [key: string]: TermsAggregate<AggregationDataPoint>;
+  [key: string]: estypes.AggregationsTermsAggregate<AggregationDataPoint>;
 };
 
 export interface Group {
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 e8a8fbd63a84d..d74067bff0251 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
@@ -52,7 +52,7 @@ export const buildActionResultsQuery = ({
                       lang: 'painless',
                       source:
                         "if (doc['error.keyword'].size()==0) { return 'success' } else { return 'error' }",
-                    },
+                    } as const,
                   },
                 },
               },
diff --git a/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap b/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
index 670d16ec11548..93df3c8d99935 100644
--- a/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/__snapshots__/report_listing.test.tsx.snap
@@ -220,18 +220,34 @@ Array [
                         }
                       }
                     >
-                      <div
+                      <CellContents
                         className="euiTableCellContent"
+                        showSortMsg={false}
                       >
-                        <EuiInnerText>
-                          <span
-                            className="euiTableCellContent__text"
-                            title="Report"
-                          >
-                            Report
-                          </span>
-                        </EuiInnerText>
-                      </div>
+                        <span
+                          className="euiTableCellContent"
+                        >
+                          <EuiInnerText>
+                            <EuiI18n
+                              default="{innerText}; {description}"
+                              token="euiTableHeaderCell.titleTextWithDesc"
+                              values={
+                                Object {
+                                  "description": undefined,
+                                  "innerText": "Report",
+                                }
+                              }
+                            >
+                              <span
+                                className="euiTableCellContent__text"
+                                title="Report"
+                              >
+                                Report
+                              </span>
+                            </EuiI18n>
+                          </EuiInnerText>
+                        </span>
+                      </CellContents>
                     </th>
                   </EuiTableHeaderCell>
                   <EuiTableHeaderCell
@@ -250,18 +266,34 @@ Array [
                         }
                       }
                     >
-                      <div
+                      <CellContents
                         className="euiTableCellContent"
+                        showSortMsg={false}
                       >
-                        <EuiInnerText>
-                          <span
-                            className="euiTableCellContent__text"
-                            title="Created at"
-                          >
-                            Created at
-                          </span>
-                        </EuiInnerText>
-                      </div>
+                        <span
+                          className="euiTableCellContent"
+                        >
+                          <EuiInnerText>
+                            <EuiI18n
+                              default="{innerText}; {description}"
+                              token="euiTableHeaderCell.titleTextWithDesc"
+                              values={
+                                Object {
+                                  "description": undefined,
+                                  "innerText": "Created at",
+                                }
+                              }
+                            >
+                              <span
+                                className="euiTableCellContent__text"
+                                title="Created at"
+                              >
+                                Created at
+                              </span>
+                            </EuiI18n>
+                          </EuiInnerText>
+                        </span>
+                      </CellContents>
                     </th>
                   </EuiTableHeaderCell>
                   <EuiTableHeaderCell
@@ -280,18 +312,34 @@ Array [
                         }
                       }
                     >
-                      <div
+                      <CellContents
                         className="euiTableCellContent"
+                        showSortMsg={false}
                       >
-                        <EuiInnerText>
-                          <span
-                            className="euiTableCellContent__text"
-                            title="Status"
-                          >
-                            Status
-                          </span>
-                        </EuiInnerText>
-                      </div>
+                        <span
+                          className="euiTableCellContent"
+                        >
+                          <EuiInnerText>
+                            <EuiI18n
+                              default="{innerText}; {description}"
+                              token="euiTableHeaderCell.titleTextWithDesc"
+                              values={
+                                Object {
+                                  "description": undefined,
+                                  "innerText": "Status",
+                                }
+                              }
+                            >
+                              <span
+                                className="euiTableCellContent__text"
+                                title="Status"
+                              >
+                                Status
+                              </span>
+                            </EuiI18n>
+                          </EuiInnerText>
+                        </span>
+                      </CellContents>
                     </th>
                   </EuiTableHeaderCell>
                   <EuiTableHeaderCell
@@ -308,18 +356,34 @@ Array [
                         }
                       }
                     >
-                      <div
+                      <CellContents
                         className="euiTableCellContent euiTableCellContent--alignRight"
+                        showSortMsg={false}
                       >
-                        <EuiInnerText>
-                          <span
-                            className="euiTableCellContent__text"
-                            title="Actions"
-                          >
-                            Actions
-                          </span>
-                        </EuiInnerText>
-                      </div>
+                        <span
+                          className="euiTableCellContent euiTableCellContent--alignRight"
+                        >
+                          <EuiInnerText>
+                            <EuiI18n
+                              default="{innerText}; {description}"
+                              token="euiTableHeaderCell.titleTextWithDesc"
+                              values={
+                                Object {
+                                  "description": undefined,
+                                  "innerText": "Actions",
+                                }
+                              }
+                            >
+                              <span
+                                className="euiTableCellContent__text"
+                                title="Actions"
+                              >
+                                Actions
+                              </span>
+                            </EuiI18n>
+                          </EuiInnerText>
+                        </span>
+                      </CellContents>
                     </th>
                   </EuiTableHeaderCell>
                 </tr>
@@ -530,18 +594,34 @@ Array [
                       }
                     }
                   >
-                    <div
+                    <CellContents
                       className="euiTableCellContent"
+                      showSortMsg={false}
                     >
-                      <EuiInnerText>
-                        <span
-                          className="euiTableCellContent__text"
-                          title="Report"
-                        >
-                          Report
-                        </span>
-                      </EuiInnerText>
-                    </div>
+                      <span
+                        className="euiTableCellContent"
+                      >
+                        <EuiInnerText>
+                          <EuiI18n
+                            default="{innerText}; {description}"
+                            token="euiTableHeaderCell.titleTextWithDesc"
+                            values={
+                              Object {
+                                "description": undefined,
+                                "innerText": "Report",
+                              }
+                            }
+                          >
+                            <span
+                              className="euiTableCellContent__text"
+                              title="Report"
+                            >
+                              Report
+                            </span>
+                          </EuiI18n>
+                        </EuiInnerText>
+                      </span>
+                    </CellContents>
                   </th>
                 </EuiTableHeaderCell>
                 <EuiTableHeaderCell
@@ -560,18 +640,34 @@ Array [
                       }
                     }
                   >
-                    <div
+                    <CellContents
                       className="euiTableCellContent"
+                      showSortMsg={false}
                     >
-                      <EuiInnerText>
-                        <span
-                          className="euiTableCellContent__text"
-                          title="Created at"
-                        >
-                          Created at
-                        </span>
-                      </EuiInnerText>
-                    </div>
+                      <span
+                        className="euiTableCellContent"
+                      >
+                        <EuiInnerText>
+                          <EuiI18n
+                            default="{innerText}; {description}"
+                            token="euiTableHeaderCell.titleTextWithDesc"
+                            values={
+                              Object {
+                                "description": undefined,
+                                "innerText": "Created at",
+                              }
+                            }
+                          >
+                            <span
+                              className="euiTableCellContent__text"
+                              title="Created at"
+                            >
+                              Created at
+                            </span>
+                          </EuiI18n>
+                        </EuiInnerText>
+                      </span>
+                    </CellContents>
                   </th>
                 </EuiTableHeaderCell>
                 <EuiTableHeaderCell
@@ -590,18 +686,34 @@ Array [
                       }
                     }
                   >
-                    <div
+                    <CellContents
                       className="euiTableCellContent"
+                      showSortMsg={false}
                     >
-                      <EuiInnerText>
-                        <span
-                          className="euiTableCellContent__text"
-                          title="Status"
-                        >
-                          Status
-                        </span>
-                      </EuiInnerText>
-                    </div>
+                      <span
+                        className="euiTableCellContent"
+                      >
+                        <EuiInnerText>
+                          <EuiI18n
+                            default="{innerText}; {description}"
+                            token="euiTableHeaderCell.titleTextWithDesc"
+                            values={
+                              Object {
+                                "description": undefined,
+                                "innerText": "Status",
+                              }
+                            }
+                          >
+                            <span
+                              className="euiTableCellContent__text"
+                              title="Status"
+                            >
+                              Status
+                            </span>
+                          </EuiI18n>
+                        </EuiInnerText>
+                      </span>
+                    </CellContents>
                   </th>
                 </EuiTableHeaderCell>
                 <EuiTableHeaderCell
@@ -618,18 +730,34 @@ Array [
                       }
                     }
                   >
-                    <div
+                    <CellContents
                       className="euiTableCellContent euiTableCellContent--alignRight"
+                      showSortMsg={false}
                     >
-                      <EuiInnerText>
-                        <span
-                          className="euiTableCellContent__text"
-                          title="Actions"
-                        >
-                          Actions
-                        </span>
-                      </EuiInnerText>
-                    </div>
+                      <span
+                        className="euiTableCellContent euiTableCellContent--alignRight"
+                      >
+                        <EuiInnerText>
+                          <EuiI18n
+                            default="{innerText}; {description}"
+                            token="euiTableHeaderCell.titleTextWithDesc"
+                            values={
+                              Object {
+                                "description": undefined,
+                                "innerText": "Actions",
+                              }
+                            }
+                          >
+                            <span
+                              className="euiTableCellContent__text"
+                              title="Actions"
+                            >
+                              Actions
+                            </span>
+                          </EuiI18n>
+                        </EuiInnerText>
+                      </span>
+                    </CellContents>
                   </th>
                 </EuiTableHeaderCell>
               </tr>
diff --git a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
index fa8899a22ac74..8c95363a843ec 100644
--- a/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
+++ b/x-pack/plugins/reporting/public/components/buttons/__snapshots__/report_info_button.test.tsx.snap
@@ -12,12 +12,14 @@ exports[`ReportInfoButton handles button click flyout on click 1`] = `
   <EuiIcon
     aria-hidden="true"
     className="euiButtonIcon__icon"
+    color="inherit"
     size="m"
     type="iInCircle"
   >
     <span
       aria-hidden="true"
       className="euiButtonIcon__icon"
+      color="inherit"
       data-euiicon-type="iInCircle"
       size="m"
     />
@@ -86,12 +88,14 @@ Array [
                 <EuiIcon
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
+                  color="inherit"
                   size="m"
                   type="cross"
                 >
                   <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="cross"
                     size="m"
                   />
@@ -172,12 +176,14 @@ Array [
           <EuiIcon
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             size="m"
             type="cross"
           >
             <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="cross"
               size="m"
             />
@@ -289,12 +295,14 @@ Array [
                 <EuiIcon
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
+                  color="inherit"
                   size="m"
                   type="cross"
                 >
                   <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="cross"
                     size="m"
                   />
@@ -373,12 +381,14 @@ Array [
           <EuiIcon
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             size="m"
             type="cross"
           >
             <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="cross"
               size="m"
             />
diff --git a/x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.ts b/x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
index d8a4e1ce56bfa..1141437eae0ef 100644
--- a/x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
+++ b/x-pack/plugins/reporting/server/browsers/chromium/driver_factory/index.ts
@@ -195,10 +195,14 @@ export class HeadlessChromiumDriverFactory {
   getBrowserLogger(page: puppeteer.Page, logger: LevelLogger): Rx.Observable<void> {
     const consoleMessages$ = Rx.fromEvent<puppeteer.ConsoleMessage>(page, 'console').pipe(
       map((line) => {
+        const formatLine = () => `{ text: "${line.text()?.trim()}", url: ${line.location()?.url} }`;
+
         if (line.type() === 'error') {
-          logger.error(line.text(), ['headless-browser-console']);
+          logger.error(`Error in browser console: ${formatLine()}`, ['headless-browser-console']);
         } else {
-          logger.debug(line.text(), [`headless-browser-console:${line.type()}`]);
+          logger.debug(`Message in browser console: ${formatLine()}`, [
+            `headless-browser-console:${line.type()}`,
+          ]);
         }
       })
     );
diff --git a/x-pack/plugins/reporting/server/config/index.test.ts b/x-pack/plugins/reporting/server/config/index.test.ts
index 327b03d679cae..b9665759f9f52 100644
--- a/x-pack/plugins/reporting/server/config/index.test.ts
+++ b/x-pack/plugins/reporting/server/config/index.test.ts
@@ -45,7 +45,7 @@ describe('deprecations', () => {
     const { messages } = applyReportingDeprecations({ roles: { enabled: true } });
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "\\"xpack.reporting.roles\\" is deprecated. Granting reporting privilege through a \\"reporting_user\\" role will not be supported starting in 8.0. Please set 'xpack.reporting.roles.enabled' to 'false' and grant reporting privileges to users using Kibana application privileges **Management > Security > Roles**.",
+        "\\"xpack.reporting.roles\\" is deprecated. Granting reporting privilege through a \\"reporting_user\\" role will not be supported starting in 8.0. Please set \\"xpack.reporting.roles.enabled\\" to \\"false\\" and grant reporting privileges to users using Kibana application privileges **Management > Security > Roles**.",
       ]
     `);
   });
diff --git a/x-pack/plugins/reporting/server/config/index.ts b/x-pack/plugins/reporting/server/config/index.ts
index 8927bd8ee94d5..d0c743f859b3c 100644
--- a/x-pack/plugins/reporting/server/config/index.ts
+++ b/x-pack/plugins/reporting/server/config/index.ts
@@ -28,6 +28,12 @@ export const config: PluginConfigDescriptor<ReportingConfigType> = {
       if (reporting?.index) {
         addDeprecation({
           message: `"${fromPath}.index" is deprecated. Multitenancy by changing "kibana.index" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`,
+          correctiveActions: {
+            manualSteps: [
+              `If you rely on this setting to achieve multitenancy you should use Spaces, cross-cluster replication, or cross-cluster search instead.`,
+              `To migrate to Spaces, we encourage using saved object management to export your saved objects from a tenant into the default tenant in a space.`,
+            ],
+          },
         });
       }
 
@@ -35,8 +41,15 @@ export const config: PluginConfigDescriptor<ReportingConfigType> = {
         addDeprecation({
           message:
             `"${fromPath}.roles" is deprecated. Granting reporting privilege through a "reporting_user" role will not be supported ` +
-            `starting in 8.0. Please set 'xpack.reporting.roles.enabled' to 'false' and grant reporting privileges to users ` +
+            `starting in 8.0. Please set "xpack.reporting.roles.enabled" to "false" and grant reporting privileges to users ` +
             `using Kibana application privileges **Management > Security > Roles**.`,
+          correctiveActions: {
+            manualSteps: [
+              `Set 'xpack.reporting.roles.enabled' to 'false' in your kibana configs.`,
+              `Grant reporting privileges to users using Kibana application privileges` +
+                `under **Management > Security > Roles**.`,
+            ],
+          },
         });
       }
     },
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 7517396961c00..8b20ab1700120 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
@@ -351,7 +351,7 @@ export class CsvGenerator {
 
         // If columns exists in the job params, use it to order the CSV columns
         // otherwise, get the ordering from the searchSource's fields / fieldsFromSource
-        const columns = this.getColumns(searchSource, table);
+        const columns = this.getColumns(searchSource, table) || [];
 
         if (first) {
           first = false;
diff --git a/x-pack/plugins/reporting/server/lib/store/mapping.ts b/x-pack/plugins/reporting/server/lib/store/mapping.ts
index c35540f3869a0..ce8f768ef077f 100644
--- a/x-pack/plugins/reporting/server/lib/store/mapping.ts
+++ b/x-pack/plugins/reporting/server/lib/store/mapping.ts
@@ -63,4 +63,4 @@ export const mapping = {
       content: { type: 'object', enabled: false },
     },
   },
-};
+} as const;
diff --git a/x-pack/plugins/reporting/server/lib/store/report_ilm_policy.ts b/x-pack/plugins/reporting/server/lib/store/report_ilm_policy.ts
deleted file mode 100644
index f4cd69a0331d7..0000000000000
--- a/x-pack/plugins/reporting/server/lib/store/report_ilm_policy.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 { PutLifecycleRequest } from '@elastic/elasticsearch/api/types';
-
-export const reportingIlmPolicy: PutLifecycleRequest['body'] = {
-  policy: {
-    phases: {
-      hot: {
-        actions: {},
-      },
-    },
-  },
-};
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 fa35240dfc8fb..7f96433fcc6ce 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.test.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.test.ts
@@ -7,7 +7,6 @@
 
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 import { ElasticsearchClient } from 'src/core/server';
-import { elasticsearchServiceMock } from 'src/core/server/mocks';
 import { ReportingCore } from '../../';
 import {
   createMockConfigSchema,
@@ -17,8 +16,6 @@ import {
 import { Report, ReportDocument } from './report';
 import { ReportingStore } from './store';
 
-const { createApiResponse } = elasticsearchServiceMock;
-
 describe('ReportingStore', () => {
   const mockLogger = createMockLevelLogger();
   let mockCore: ReportingCore;
@@ -406,40 +403,4 @@ describe('ReportingStore', () => {
       ]
     `);
   });
-
-  describe('start', () => {
-    it('creates an ILM policy for managing reporting indices if there is not already one', async () => {
-      mockEsClient.ilm.getLifecycle.mockRejectedValueOnce(createApiResponse({ statusCode: 404 }));
-      mockEsClient.ilm.putLifecycle.mockResolvedValueOnce(createApiResponse());
-
-      const store = new ReportingStore(mockCore, mockLogger);
-      await store.start();
-
-      expect(mockEsClient.ilm.getLifecycle).toHaveBeenCalledWith({ policy: 'kibana-reporting' });
-      expect(mockEsClient.ilm.putLifecycle.mock.calls[0][0]).toMatchInlineSnapshot(`
-        Object {
-          "body": Object {
-            "policy": Object {
-              "phases": Object {
-                "hot": Object {
-                  "actions": Object {},
-                },
-              },
-            },
-          },
-          "policy": "kibana-reporting",
-        }
-      `);
-    });
-
-    it('does not create an ILM policy for managing reporting indices if one already exists', async () => {
-      mockEsClient.ilm.getLifecycle.mockResolvedValueOnce(createApiResponse());
-
-      const store = new ReportingStore(mockCore, mockLogger);
-      await store.start();
-
-      expect(mockEsClient.ilm.getLifecycle).toHaveBeenCalledWith({ policy: 'kibana-reporting' });
-      expect(mockEsClient.ilm.putLifecycle).not.toHaveBeenCalled();
-    });
-  });
 });
diff --git a/x-pack/plugins/reporting/server/lib/store/store.ts b/x-pack/plugins/reporting/server/lib/store/store.ts
index 9fb203fd5627a..fc7bd9c23d769 100644
--- a/x-pack/plugins/reporting/server/lib/store/store.ts
+++ b/x-pack/plugins/reporting/server/lib/store/store.ts
@@ -14,7 +14,6 @@ import { ReportTaskParams } from '../tasks';
 import { indexTimestamp } from './index_timestamp';
 import { mapping } from './mapping';
 import { Report, ReportDocument, ReportSource } from './report';
-import { reportingIlmPolicy } from './report_ilm_policy';
 
 /*
  * When searching for long-pending reports, we get a subset of fields
@@ -72,22 +71,19 @@ export class ReportingStore {
       return exists;
     }
 
+    const indexSettings = {
+      number_of_shards: 1,
+      auto_expand_replicas: '0-1',
+    };
+    const body = {
+      settings: indexSettings,
+      mappings: {
+        properties: mapping,
+      },
+    };
+
     try {
-      await client.indices.create({
-        index: indexName,
-        body: {
-          settings: {
-            number_of_shards: 1,
-            auto_expand_replicas: '0-1',
-            lifecycle: {
-              name: this.ilmPolicyName,
-            },
-          },
-          mappings: {
-            properties: mapping,
-          },
-        },
-      });
+      await client.indices.create({ index: indexName, body });
 
       return true;
     } catch (error) {
@@ -134,44 +130,6 @@ export class ReportingStore {
     return client.indices.refresh({ index });
   }
 
-  private readonly ilmPolicyName = 'kibana-reporting';
-
-  private async doesIlmPolicyExist(): Promise<boolean> {
-    const client = await this.getClient();
-    try {
-      await client.ilm.getLifecycle({ policy: this.ilmPolicyName });
-      return true;
-    } catch (e) {
-      if (e.statusCode === 404) {
-        return false;
-      }
-      throw e;
-    }
-  }
-
-  /**
-   * Function to be called during plugin start phase. This ensures the environment is correctly
-   * configured for storage of reports.
-   */
-  public async start() {
-    const client = await this.getClient();
-    try {
-      if (await this.doesIlmPolicyExist()) {
-        this.logger.debug(`Found ILM policy ${this.ilmPolicyName}; skipping creation.`);
-        return;
-      }
-      this.logger.info(`Creating ILM policy for managing reporting indices: ${this.ilmPolicyName}`);
-      await client.ilm.putLifecycle({
-        policy: this.ilmPolicyName,
-        body: reportingIlmPolicy,
-      });
-    } catch (e) {
-      this.logger.error('Error in start phase');
-      this.logger.error(e.body.error);
-      throw e;
-    }
-  }
-
   public async addReport(report: Report): Promise<Report> {
     let index = report._index;
     if (!index) {
diff --git a/x-pack/plugins/reporting/server/plugin.ts b/x-pack/plugins/reporting/server/plugin.ts
index dc0ddf27a53b3..4e7328cf18003 100644
--- a/x-pack/plugins/reporting/server/plugin.ts
+++ b/x-pack/plugins/reporting/server/plugin.ts
@@ -108,9 +108,6 @@ export class ReportingPlugin
         logger: this.logger,
       });
 
-      // Note: this must be called after ReportingCore.pluginStart
-      await store.start();
-
       this.logger.debug('Start complete');
     })().catch((e) => {
       this.logger.error(`Error in Reporting start, reporting may not function properly`);
diff --git a/x-pack/plugins/rollup/server/collectors/helpers.ts b/x-pack/plugins/rollup/server/collectors/helpers.ts
index 3ec457bc6191e..1d1a8755aa568 100644
--- a/x-pack/plugins/rollup/server/collectors/helpers.ts
+++ b/x-pack/plugins/rollup/server/collectors/helpers.ts
@@ -81,7 +81,6 @@ const getSavedObjectsList = async ({
     ignore_unavailable: true,
     index: kibanaIndex,
     size: ES_MAX_RESULT_WINDOW_DEFAULT_VALUE,
-    // @ts-expect-error@elastic/elasticsearch _source does not exist in type SearchRequest
     _source: filterPath,
   });
   return esResponse;
diff --git a/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts b/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts
index 17eb5ae8967af..74681a6aad4ee 100644
--- a/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts
+++ b/x-pack/plugins/rule_registry/common/mapping_from_field_map.ts
@@ -5,11 +5,11 @@
  * 2.0.
  */
 
-import { TypeMapping } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { set } from '@elastic/safer-lodash-set';
 import { FieldMap } from './field_map/types';
 
-export function mappingFromFieldMap(fieldMap: FieldMap): TypeMapping {
+export function mappingFromFieldMap(fieldMap: FieldMap): estypes.MappingTypeMapping {
   const mappings = {
     dynamic: 'strict' as const,
     properties: {},
diff --git a/x-pack/plugins/rule_registry/common/types.ts b/x-pack/plugins/rule_registry/common/types.ts
index 299d2c300ab49..858b1a5af431f 100644
--- a/x-pack/plugins/rule_registry/common/types.ts
+++ b/x-pack/plugins/rule_registry/common/types.ts
@@ -7,7 +7,7 @@
 
 import { estypes } from '@elastic/elasticsearch';
 
-export type PutIndexTemplateRequest = estypes.PutIndexTemplateRequest & {
+export type PutIndexTemplateRequest = estypes.IndicesPutIndexTemplateRequest & {
   body?: { composed_of?: string[] };
 };
 
@@ -16,6 +16,6 @@ export interface ClusterPutComponentTemplateBody {
     settings: {
       number_of_shards: number;
     };
-    mappings: estypes.TypeMapping;
+    mappings: estypes.MappingTypeMapping;
   };
 }
diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts
index 96b5860e143ee..cb04a442d0b34 100644
--- a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/index_management_gateway.ts
@@ -93,6 +93,7 @@ export class IndexManagementGateway {
     this.logger.debug(`Updating index template; name="${templateName}"`);
 
     try {
+      // @ts-expect-error settings is optional
       const { settings, ...templateWithoutSettings } = template;
 
       const es = await this.elasticsearch;
diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts
index 00fc9131523ac..7663ea27fb0df 100644
--- a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/ilm_policy.ts
@@ -8,7 +8,7 @@
 import { estypes } from '@elastic/elasticsearch';
 
 export interface IlmPolicy {
-  policy: estypes.Policy;
+  policy: estypes.IlmPolicy;
 }
 
 export const defaultIlmPolicy: IlmPolicy = {
diff --git a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts
index caf71dadf6e1e..0045bce3ed873 100644
--- a/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/elasticsearch/resources/index_template.ts
@@ -9,7 +9,7 @@ import { estypes } from '@elastic/elasticsearch';
 import { IndexNames } from './index_names';
 import { IndexMappings } from './index_mappings';
 
-export type IndexTemplate = estypes.PutIndexTemplateRequest['body'];
+export type IndexTemplate = estypes.IndicesPutTemplateRequest['body'];
 
 export const createIndexTemplate = (
   names: IndexNames,
@@ -39,6 +39,7 @@ export const createIndexTemplate = (
         order: 'desc',
       },
     },
+    // @ts-expect-error IndexMappings is not assignale to estypes.MappingTypeMapping
     mappings: {
       ...mappings,
       _meta: {
diff --git a/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts b/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts
index 48228ce5352b7..bf9aca74f7800 100644
--- a/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/log/event_query_builder.ts
@@ -78,8 +78,8 @@ export class EventQueryBuilder<TEvent> implements IEventQueryBuilder<TEvent> {
     return new EventQuery<TEvent>({ indexReader, request });
   }
 
-  private buildFilter(): estypes.QueryContainer[] {
-    const result: estypes.QueryContainer[] = [];
+  private buildFilter(): estypes.QueryDslQueryContainer[] {
+    const result: estypes.QueryDslQueryContainer[] = [];
 
     if (this.loggerName) {
       result.push({
diff --git a/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts b/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts
index 7807dd9ca6b36..7dcaee9d382b1 100644
--- a/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts
+++ b/x-pack/plugins/rule_registry/server/event_log/log/public_api.ts
@@ -101,7 +101,7 @@ export interface IEventQueryBuilder<TEvent> {
   buildQuery(): IEventQuery<TEvent>;
 }
 
-export type SortingParams = estypes.Sort;
+export type SortingParams = estypes.SearchSort;
 
 export interface PaginationParams {
   page: number;
diff --git a/x-pack/plugins/rule_registry/server/rule_data_client/index.ts b/x-pack/plugins/rule_registry/server/rule_data_client/index.ts
index 43122ba49519a..cd7467c903e52 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_client/index.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_client/index.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { TypeMapping } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { ResponseError } from '@elastic/elasticsearch/lib/errors';
 import { IndexPatternsFetcher } from '../../../../../src/plugins/data/server';
 import {
@@ -125,7 +125,7 @@ export class RuleDataClient implements IRuleDataClient {
       path: `/_index_template/_simulate_index/${concreteIndexName}`,
     });
 
-    const mappings: TypeMapping = simulateResponse.template.mappings;
+    const mappings: estypes.MappingTypeMapping = simulateResponse.template.mappings;
 
     await clusterClient.indices.putMapping({ index: `${alias}*`, body: mappings });
   }
diff --git a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts
index 159e9b8152597..22435ef8c0203 100644
--- a/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts
+++ b/x-pack/plugins/rule_registry/server/rule_data_plugin_service/index.ts
@@ -110,7 +110,7 @@ export class RuleDataPluginService {
     return clusterClient.indices.putIndexTemplate(template);
   }
 
-  private async _createOrUpdateLifecyclePolicy(policy: estypes.PutLifecycleRequest) {
+  private async _createOrUpdateLifecyclePolicy(policy: estypes.IlmPutLifecycleRequest) {
     this.assertWriteEnabled();
     const clusterClient = await this.getClusterClient();
 
@@ -130,7 +130,7 @@ export class RuleDataPluginService {
     return this._createOrUpdateIndexTemplate(template);
   }
 
-  async createOrUpdateLifecyclePolicy(policy: estypes.PutLifecycleRequest) {
+  async createOrUpdateLifecyclePolicy(policy: estypes.IlmPutLifecycleRequest) {
     await this.wait();
     return this._createOrUpdateLifecyclePolicy(policy);
   }
diff --git a/x-pack/plugins/security/common/index.ts b/x-pack/plugins/security/common/index.ts
new file mode 100644
index 0000000000000..034c25758a1f0
--- /dev/null
+++ b/x-pack/plugins/security/common/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export { SecurityLicense } from './licensing';
+export { AuthenticatedUser } from './model';
diff --git a/x-pack/plugins/security/common/model/api_key.ts b/x-pack/plugins/security/common/model/api_key.ts
index f2467468f8069..ed622bf0dc87e 100644
--- a/x-pack/plugins/security/common/model/api_key.ts
+++ b/x-pack/plugins/security/common/model/api_key.ts
@@ -15,6 +15,7 @@ export interface ApiKey {
   creation: number;
   expiration: number;
   invalidated: boolean;
+  metadata: Record<string, any>;
 }
 
 export interface ApiKeyToInvalidate {
diff --git a/x-pack/plugins/security/public/index.ts b/x-pack/plugins/security/public/index.ts
index df074ab616369..e8d5f739821ed 100644
--- a/x-pack/plugins/security/public/index.ts
+++ b/x-pack/plugins/security/public/index.ts
@@ -13,7 +13,9 @@ import { SecurityPlugin, SecurityPluginSetup, SecurityPluginStart } from './plug
 export { SecurityPluginSetup, SecurityPluginStart };
 export { AuthenticatedUser } from '../common/model';
 export { SecurityLicense, SecurityLicenseFeatures } from '../common/licensing';
-export { UserMenuLink } from '../public/nav_control';
+export { UserMenuLink, SecurityNavControlServiceStart } from '../public/nav_control';
+
+export { AuthenticationServiceStart, AuthenticationServiceSetup } from './authentication';
 
 export const plugin: PluginInitializer<
   SecurityPluginSetup,
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 65540fd7ebfc1..96f4506e09b71 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
@@ -28,6 +28,7 @@ export interface CreateApiKeyRequest {
   name: string;
   expiration?: string;
   role_descriptors?: ApiKeyRoleDescriptors;
+  metadata?: Record<string, any>;
 }
 
 export interface CreateApiKeyResponse {
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 442c1d910f814..452b119e83921 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
@@ -34,6 +34,7 @@ import { FormattedMessage } from '@kbn/i18n/react';
 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';
@@ -88,7 +89,7 @@ export class APIKeysGridPage extends Component<Props, State> {
 
   public render() {
     return (
-      <div>
+      <div className={APP_WRAPPER_CLASS}>
         <Route path="/create">
           <Breadcrumb
             text={i18n.translate('xpack.security.management.apiKeys.createBreadcrumb', {
@@ -157,7 +158,7 @@ export class APIKeysGridPage extends Component<Props, State> {
 
       if (!areApiKeysEnabled) {
         return (
-          <EuiPageContent>
+          <EuiPageContent verticalPosition="center" horizontalPosition="center" color="danger">
             <NotEnabled />
           </EuiPageContent>
         );
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 27385e4b29b00..e1ffc3b4b3515 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
@@ -45,7 +45,9 @@ export interface ApiKeyFormValues {
   expiration: string;
   customExpiration: boolean;
   customPrivileges: boolean;
+  includeMetadata: boolean;
   role_descriptors: string;
+  metadata: string;
 }
 
 export interface CreateApiKeyFlyoutProps {
@@ -59,30 +61,9 @@ const defaultDefaultValues: ApiKeyFormValues = {
   expiration: '',
   customExpiration: false,
   customPrivileges: false,
-  role_descriptors: JSON.stringify(
-    {
-      'role-a': {
-        cluster: ['all'],
-        indices: [
-          {
-            names: ['index-a*'],
-            privileges: ['read'],
-          },
-        ],
-      },
-      'role-b': {
-        cluster: ['all'],
-        indices: [
-          {
-            names: ['index-b*'],
-            privileges: ['all'],
-          },
-        ],
-      },
-    },
-    null,
-    2
-  ),
+  includeMetadata: false,
+  role_descriptors: '{}',
+  metadata: '{}',
 };
 
 export const CreateApiKeyFlyout: FunctionComponent<CreateApiKeyFlyoutProps> = ({
@@ -227,7 +208,6 @@ export const CreateApiKeyFlyout: FunctionComponent<CreateApiKeyFlyoutProps> = ({
           <EuiSpacer />
           <EuiFormFieldset>
             <EuiSwitch
-              id="apiKeyCustom"
               label={i18n.translate(
                 'xpack.security.accountManagement.createApiKey.customPrivilegesLabel',
                 {
@@ -270,7 +250,6 @@ export const CreateApiKeyFlyout: FunctionComponent<CreateApiKeyFlyoutProps> = ({
           <EuiSpacer />
           <EuiFormFieldset>
             <EuiSwitch
-              name="customExpiration"
               label={i18n.translate(
                 'xpack.security.accountManagement.createApiKey.customExpirationLabel',
                 {
@@ -312,6 +291,48 @@ export const CreateApiKeyFlyout: FunctionComponent<CreateApiKeyFlyoutProps> = ({
             )}
           </EuiFormFieldset>
 
+          <EuiSpacer />
+          <EuiFormFieldset>
+            <EuiSwitch
+              label={i18n.translate(
+                'xpack.security.accountManagement.createApiKey.includeMetadataLabel',
+                {
+                  defaultMessage: 'Include metadata',
+                }
+              )}
+              checked={!!form.values.includeMetadata}
+              onChange={(e) => form.setValue('includeMetadata', e.target.checked)}
+            />
+            {form.values.includeMetadata && (
+              <>
+                <EuiSpacer size="m" />
+                <EuiFormRow
+                  helpText={
+                    <DocLink
+                      app="elasticsearch"
+                      doc="security-api-create-api-key.html#security-api-create-api-key-request-body"
+                    >
+                      <FormattedMessage
+                        id="xpack.security.accountManagement.createApiKey.metadataHelpText"
+                        defaultMessage="Learn how to structure metadata."
+                      />
+                    </DocLink>
+                  }
+                  error={form.errors.metadata}
+                  isInvalid={form.touched.metadata && !!form.errors.metadata}
+                >
+                  <CodeEditorField
+                    value={form.values.metadata!}
+                    onChange={(value) => form.setValue('metadata', value)}
+                    languageId="xjson"
+                    height={200}
+                  />
+                </EuiFormRow>
+                <EuiSpacer size="s" />
+              </>
+            )}
+          </EuiFormFieldset>
+
           {/* Hidden submit button is required for enter key to trigger form submission */}
           <input type="submit" hidden />
         </EuiForm>
@@ -363,6 +384,28 @@ export function validate(values: ApiKeyFormValues) {
     }
   }
 
+  if (values.includeMetadata) {
+    if (!values.metadata) {
+      errors.metadata = i18n.translate(
+        'xpack.security.management.apiKeys.createApiKey.metadataRequired',
+        {
+          defaultMessage: 'Enter metadata or disable this option.',
+        }
+      );
+    } else {
+      try {
+        JSON.parse(values.metadata);
+      } catch (e) {
+        errors.metadata = i18n.translate(
+          'xpack.security.management.apiKeys.createApiKey.invalidJsonError',
+          {
+            defaultMessage: 'Enter valid JSON.',
+          }
+        );
+      }
+    }
+  }
+
   return errors;
 }
 
@@ -374,5 +417,6 @@ export function mapValues(values: ApiKeyFormValues): CreateApiKeyRequest {
       values.customPrivileges && values.role_descriptors
         ? JSON.parse(values.role_descriptors)
         : undefined,
+    metadata: values.includeMetadata && values.metadata ? JSON.parse(values.metadata) : undefined,
   };
 }
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 cd74c0de4dfcf..70199189ca7bf 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { EuiCallOut, EuiLink } from '@elastic/eui';
+import { EuiEmptyPrompt, EuiLink } from '@elastic/eui';
 import React from 'react';
 
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -15,30 +15,35 @@ import { useKibana } from '../../../../../../../../src/plugins/kibana_react/publ
 export const NotEnabled: React.FunctionComponent = () => {
   const docLinks = useKibana().services.docLinks!;
   return (
-    <EuiCallOut
+    <EuiEmptyPrompt
       title={
-        <FormattedMessage
-          id="xpack.security.management.apiKeys.table.apiKeysDisabledErrorTitle"
-          defaultMessage="API keys not enabled in Elasticsearch"
-        />
+        <h2>
+          <FormattedMessage
+            id="xpack.security.management.apiKeys.table.apiKeysDisabledErrorTitle"
+            defaultMessage="API keys not enabled in Elasticsearch"
+          />
+        </h2>
       }
       color="danger"
       iconType="alert"
-    >
-      <FormattedMessage
-        id="xpack.security.management.apiKeys.table.apiKeysDisabledErrorDescription"
-        defaultMessage="Contact your system administrator and refer to the {link} to enable API keys."
-        values={{
-          link: (
-            <EuiLink href={`${docLinks.links.security.apiKeyServiceSettings}`} target="_blank">
-              <FormattedMessage
-                id="xpack.security.management.apiKeys.table.apiKeysDisabledErrorLinkText"
-                defaultMessage="docs"
-              />
-            </EuiLink>
-          ),
-        }}
-      />
-    </EuiCallOut>
+      body={
+        <p>
+          <FormattedMessage
+            id="xpack.security.management.apiKeys.table.apiKeysDisabledErrorDescription"
+            defaultMessage="Contact your system administrator and refer to the {link} to enable API keys."
+            values={{
+              link: (
+                <EuiLink href={`${docLinks.links.security.apiKeyServiceSettings}`} target="_blank">
+                  <FormattedMessage
+                    id="xpack.security.management.apiKeys.table.apiKeysDisabledErrorLinkText"
+                    defaultMessage="docs"
+                  />
+                </EuiLink>
+              ),
+            }}
+          />
+        </p>
+      }
+    />
   );
 };
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 f5f6d2daf306d..0e8b1c18fdc1c 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
@@ -4,7 +4,6 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-
 import {
   EuiButton,
   EuiButtonIcon,
@@ -14,15 +13,11 @@ import {
   EuiInMemoryTable,
   EuiLink,
   EuiPageContent,
-  EuiPageContentBody,
-  EuiPageContentHeader,
-  EuiPageContentHeaderSection,
+  EuiPageHeader,
   EuiSpacer,
-  EuiText,
-  EuiTitle,
   EuiToolTip,
 } from '@elastic/eui';
-import React, { Component, Fragment } from 'react';
+import React, { Component } from 'react';
 
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -129,49 +124,42 @@ export class RoleMappingsGridPage extends Component<Props, State> {
 
     if (loadState === 'finished' && roleMappings && roleMappings.length === 0) {
       return (
-        <EuiPageContent>
+        <EuiPageContent verticalPosition="center" horizontalPosition="center" color="subdued">
           <EmptyPrompt history={this.props.history} />
         </EuiPageContent>
       );
     }
 
     return (
-      <EuiPageContent>
-        <EuiPageContentHeader>
-          <EuiPageContentHeaderSection>
-            <EuiTitle>
-              <h2>
-                <FormattedMessage
-                  id="xpack.security.management.roleMappings.roleMappingTitle"
-                  defaultMessage="Role Mappings"
-                />
-              </h2>
-            </EuiTitle>
-            <EuiText color="subdued" size="s">
-              <p>
-                <FormattedMessage
-                  id="xpack.security.management.roleMappings.roleMappingDescription"
-                  defaultMessage="Role mappings define which roles are assigned to users from an external identity provider. {learnMoreLink}"
-                  values={{
-                    learnMoreLink: (
-                      <EuiLink
-                        href={this.props.docLinks.links.security.mappingRoles}
-                        external={true}
-                        target="_blank"
-                      >
-                        <FormattedMessage
-                          id="xpack.security.management.roleMappings.learnMoreLinkText"
-                          defaultMessage="Learn more."
-                        />
-                      </EuiLink>
-                    ),
-                  }}
-                />
-              </p>
-            </EuiText>
-          </EuiPageContentHeaderSection>
-          <EuiPageContentHeaderSection>
+      <>
+        <EuiPageHeader
+          bottomBorder
+          pageTitle={
+            <FormattedMessage
+              id="xpack.security.management.roleMappings.roleMappingTitle"
+              defaultMessage="Role Mappings"
+            />
+          }
+          description={
+            <FormattedMessage
+              id="xpack.security.management.roleMappings.roleMappingDescription"
+              defaultMessage="Role mappings define which roles are assigned to users from an external identity provider. {learnMoreLink}"
+              values={{
+                learnMoreLink: (
+                  <EuiLink href={this.props.docLinks.links.security.mappingRoles} external={true}>
+                    <FormattedMessage
+                      id="xpack.security.management.roleMappings.learnMoreLinkText"
+                      defaultMessage="Learn more."
+                    />
+                  </EuiLink>
+                ),
+              }}
+            />
+          }
+          rightSideItems={[
             <EuiButton
+              fill
+              iconType="plusInCircleFilled"
               data-test-subj="createRoleMappingButton"
               {...reactRouterNavigate(this.props.history, EDIT_ROLE_MAPPING_PATH)}
             >
@@ -179,21 +167,20 @@ export class RoleMappingsGridPage extends Component<Props, State> {
                 id="xpack.security.management.roleMappings.createRoleMappingButtonLabel"
                 defaultMessage="Create role mapping"
               />
-            </EuiButton>
-          </EuiPageContentHeaderSection>
-        </EuiPageContentHeader>
-        <EuiPageContentBody>
-          <Fragment>
-            {!this.state.hasCompatibleRealms && (
-              <>
-                <NoCompatibleRealms />
-                <EuiSpacer />
-              </>
-            )}
-            {this.renderTable()}
-          </Fragment>
-        </EuiPageContentBody>
-      </EuiPageContent>
+            </EuiButton>,
+          ]}
+        />
+
+        <EuiSpacer size="l" />
+
+        {!this.state.hasCompatibleRealms && (
+          <>
+            <NoCompatibleRealms />
+            <EuiSpacer />
+          </>
+        )}
+        {this.renderTable()}
+      </>
     );
   }
 
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 7f3d93099704a..c1be6999c6472 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
@@ -31,12 +31,12 @@ interface StartDeps {
 
 export interface SecurityNavControlServiceStart {
   /**
-   * Returns an Observable of the array of user menu links registered by other plugins
+   * Returns an Observable of the array of user menu links (the links that show up under the user's Avatar in the UI) registered by other plugins
    */
   getUserMenuLinks$: () => Observable<UserMenuLink[]>;
 
   /**
-   * Registers the provided user menu links to be displayed in the user menu in the global nav
+   * Registers the provided user menu links to be displayed in the user menu (the links that show up under the user's Avatar in the UI).
    */
   addUserMenuLinks: (newUserMenuLink: UserMenuLink[]) => void;
 }
diff --git a/x-pack/plugins/security/public/plugin.test.tsx b/x-pack/plugins/security/public/plugin.test.tsx
index d3794ddbeb1a6..9c31919bd5d29 100644
--- a/x-pack/plugins/security/public/plugin.test.tsx
+++ b/x-pack/plugins/security/public/plugin.test.tsx
@@ -19,7 +19,6 @@ import { licensingMock } from '../../licensing/public/mocks';
 import { ManagementService } from './management';
 import type { PluginStartDependencies } from './plugin';
 import { SecurityPlugin } from './plugin';
-import { SessionTimeout } from './session';
 
 describe('Security Plugin', () => {
   beforeAll(() => {
@@ -43,7 +42,6 @@ describe('Security Plugin', () => {
           }
         )
       ).toEqual({
-        __legacyCompat: { logoutUrl: '/some-base-path/logout', tenant: '/some-base-path' },
         authc: { getCurrentUser: expect.any(Function), areAPIKeysEnabled: expect.any(Function) },
         license: {
           isLicenseAvailable: expect.any(Function),
@@ -52,7 +50,6 @@ describe('Security Plugin', () => {
           getFeatures: expect.any(Function),
           features$: expect.any(Observable),
         },
-        sessionTimeout: expect.any(SessionTimeout),
       });
     });
 
diff --git a/x-pack/plugins/security/public/plugin.tsx b/x-pack/plugins/security/public/plugin.tsx
index 7d7ab36f1dadb..69533ea534802 100644
--- a/x-pack/plugins/security/public/plugin.tsx
+++ b/x-pack/plugins/security/public/plugin.tsx
@@ -20,11 +20,13 @@ import type { FeaturesPluginStart } from '../../features/public';
 import type { LicensingPluginSetup } from '../../licensing/public';
 import type { SpacesPluginStart } from '../../spaces/public';
 import { SecurityLicenseService } from '../common/licensing';
+import type { SecurityLicense } from '../common/licensing';
 import { accountManagementApp } from './account_management';
 import type { AuthenticationServiceSetup, AuthenticationServiceStart } from './authentication';
 import { AuthenticationService } from './authentication';
 import type { ConfigType } from './config';
 import { ManagementService } from './management';
+import type { SecurityNavControlServiceStart } from './nav_control';
 import { SecurityNavControlService } from './nav_control';
 import { SecurityCheckupService } from './security_checkup';
 import { SessionExpired, SessionTimeout, UnauthorizedResponseHttpInterceptor } from './session';
@@ -68,7 +70,7 @@ export class SecurityPlugin
   public setup(
     core: CoreSetup<PluginStartDependencies>,
     { home, licensing, management, securityOss }: PluginSetupDependencies
-  ) {
+  ): SecurityPluginSetup {
     const { http, notifications } = core;
     const { anonymousPaths } = http;
 
@@ -132,13 +134,14 @@ export class SecurityPlugin
 
     return {
       authc: this.authc,
-      sessionTimeout: this.sessionTimeout,
       license,
-      __legacyCompat: { logoutUrl, tenant },
     };
   }
 
-  public start(core: CoreStart, { management, securityOss }: PluginStartDependencies) {
+  public start(
+    core: CoreStart,
+    { management, securityOss }: PluginStartDependencies
+  ): SecurityPluginStart {
     this.sessionTimeout.start();
     this.securityCheckupService.start({ securityOssStart: securityOss, docLinks: core.docLinks });
 
@@ -161,5 +164,24 @@ export class SecurityPlugin
   }
 }
 
-export type SecurityPluginSetup = ReturnType<SecurityPlugin['setup']>;
-export type SecurityPluginStart = ReturnType<SecurityPlugin['start']>;
+export interface SecurityPluginSetup {
+  /**
+   * Exposes authentication information about the currently logged in user.
+   */
+  authc: AuthenticationServiceSetup;
+  /**
+   * Exposes information about the available security features under the current license.
+   */
+  license: SecurityLicense;
+}
+
+export interface SecurityPluginStart {
+  /**
+   * Exposes the ability to add custom links to the dropdown menu in the top right, where the user's Avatar is.
+   */
+  navControlService: SecurityNavControlServiceStart;
+  /**
+   * Exposes authentication information about the currently logged in user.
+   */
+  authc: AuthenticationServiceStart;
+}
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 c5857b9c75909..4cbca1c70f507 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
@@ -30,15 +30,21 @@ export interface CreateAPIKeyParams {
   name: string;
   role_descriptors: Record<string, any>;
   expiration?: string;
+  metadata?: Record<string, any>;
 }
 
-interface GrantAPIKeyParams {
-  api_key: CreateAPIKeyParams;
-  grant_type: 'password' | 'access_token';
-  username?: string;
-  password?: string;
-  access_token?: string;
-}
+type GrantAPIKeyParams =
+  | {
+      api_key: CreateAPIKeyParams;
+      grant_type: 'password';
+      username: string;
+      password: string;
+    }
+  | {
+      api_key: CreateAPIKeyParams;
+      grant_type: 'access_token';
+      access_token: string;
+    };
 
 /**
  * Represents the params for invalidating multiple API keys
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.mock.ts b/x-pack/plugins/security/server/authentication/authentication_service.mock.ts
index ba3297aeb5493..ba73d3b196d2f 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.mock.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.mock.ts
@@ -8,10 +8,10 @@
 import type { DeeplyMockedKeys } from '@kbn/utility-types/jest';
 
 import { apiKeysMock } from './api_keys/api_keys.mock';
-import type { AuthenticationServiceStart } from './authentication_service';
+import type { AuthenticationServiceStartInternal } from './authentication_service';
 
 export const authenticationServiceMock = {
-  createStart: (): DeeplyMockedKeys<AuthenticationServiceStart> => ({
+  createStart: (): DeeplyMockedKeys<AuthenticationServiceStartInternal> => ({
     apiKeys: apiKeysMock.create(),
     login: jest.fn(),
     logout: jest.fn(),
diff --git a/x-pack/plugins/security/server/authentication/authentication_service.ts b/x-pack/plugins/security/server/authentication/authentication_service.ts
index e5895422e7a74..946fedbeee04f 100644
--- a/x-pack/plugins/security/server/authentication/authentication_service.ts
+++ b/x-pack/plugins/security/server/authentication/authentication_service.ts
@@ -51,7 +51,7 @@ interface AuthenticationServiceStartParams {
   loggers: LoggerFactory;
 }
 
-export interface AuthenticationServiceStart {
+export interface AuthenticationServiceStartInternal extends AuthenticationServiceStart {
   apiKeys: Pick<
     APIKeys,
     | 'areAPIKeysEnabled'
@@ -66,6 +66,21 @@ export interface AuthenticationServiceStart {
   getCurrentUser: (request: KibanaRequest) => AuthenticatedUser | null;
 }
 
+/**
+ * Authentication services available on the security plugin's start contract.
+ */
+export interface AuthenticationServiceStart {
+  apiKeys: Pick<
+    APIKeys,
+    | 'areAPIKeysEnabled'
+    | 'create'
+    | 'invalidate'
+    | 'grantAsInternalUser'
+    | 'invalidateAsInternalUser'
+  >;
+  getCurrentUser: (request: KibanaRequest) => AuthenticatedUser | null;
+}
+
 export class AuthenticationService {
   private license!: SecurityLicense;
   private authenticator?: Authenticator;
@@ -212,7 +227,7 @@ export class AuthenticationService {
     legacyAuditLogger,
     loggers,
     session,
-  }: AuthenticationServiceStartParams): AuthenticationServiceStart {
+  }: AuthenticationServiceStartParams): AuthenticationServiceStartInternal {
     const apiKeys = new APIKeys({
       clusterClient,
       logger: this.logger.get('api-key'),
diff --git a/x-pack/plugins/security/server/authentication/index.ts b/x-pack/plugins/security/server/authentication/index.ts
index f7f5f82d2858b..4f82c5653baa9 100644
--- a/x-pack/plugins/security/server/authentication/index.ts
+++ b/x-pack/plugins/security/server/authentication/index.ts
@@ -6,7 +6,11 @@
  */
 
 export { canRedirectRequest } from './can_redirect_request';
-export { AuthenticationService, AuthenticationServiceStart } from './authentication_service';
+export {
+  AuthenticationService,
+  AuthenticationServiceStart,
+  AuthenticationServiceStartInternal,
+} from './authentication_service';
 export { AuthenticationResult } from './authentication_result';
 export { DeauthenticationResult } from './deauthentication_result';
 export {
diff --git a/x-pack/plugins/security/server/authorization/actions/__snapshots__/cases.test.ts.snap b/x-pack/plugins/security/server/authorization/actions/__snapshots__/cases.test.ts.snap
new file mode 100644
index 0000000000000..33140f180ad0a
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/actions/__snapshots__/cases.test.ts.snap
@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`#get operation of "" 1`] = `"operation is required and must be a string"`;
+
+exports[`#get operation of "{}" 1`] = `"operation is required and must be a string"`;
+
+exports[`#get operation of "1" 1`] = `"operation is required and must be a string"`;
+
+exports[`#get operation of "null" 1`] = `"operation is required and must be a string"`;
+
+exports[`#get operation of "true" 1`] = `"operation is required and must be a string"`;
+
+exports[`#get operation of "undefined" 1`] = `"operation is required and must be a string"`;
+
+exports[`#get owner of "" 1`] = `"owner is required and must be a string"`;
+
+exports[`#get owner of "{}" 1`] = `"owner is required and must be a string"`;
+
+exports[`#get owner of "1" 1`] = `"owner is required and must be a string"`;
+
+exports[`#get owner of "null" 1`] = `"owner is required and must be a string"`;
+
+exports[`#get owner of "true" 1`] = `"owner is required and must be a string"`;
+
+exports[`#get owner of "undefined" 1`] = `"owner is required and must be a string"`;
diff --git a/x-pack/plugins/security/server/authorization/actions/actions.mock.ts b/x-pack/plugins/security/server/authorization/actions/actions.mock.ts
index 97890e21c0eb7..ba627f08c00ca 100644
--- a/x-pack/plugins/security/server/authorization/actions/actions.mock.ts
+++ b/x-pack/plugins/security/server/authorization/actions/actions.mock.ts
@@ -9,6 +9,7 @@ import type { Actions } from './actions';
 import { AlertingActions } from './alerting';
 import { ApiActions } from './api';
 import { AppActions } from './app';
+import { CasesActions } from './cases';
 import { SavedObjectActions } from './saved_object';
 import { SpaceActions } from './space';
 import { UIActions } from './ui';
@@ -19,6 +20,7 @@ jest.mock('./saved_object');
 jest.mock('./space');
 jest.mock('./ui');
 jest.mock('./alerting');
+jest.mock('./cases');
 
 const create = (versionNumber: string) => {
   const t = ({
@@ -27,6 +29,7 @@ const create = (versionNumber: string) => {
     login: 'login:',
     savedObject: new SavedObjectActions(versionNumber),
     alerting: new AlertingActions(versionNumber),
+    cases: new CasesActions(versionNumber),
     space: new SpaceActions(versionNumber),
     ui: new UIActions(versionNumber),
     version: `version:${versionNumber}`,
diff --git a/x-pack/plugins/security/server/authorization/actions/actions.ts b/x-pack/plugins/security/server/authorization/actions/actions.ts
index 23d07f73f04be..d0466645213fa 100644
--- a/x-pack/plugins/security/server/authorization/actions/actions.ts
+++ b/x-pack/plugins/security/server/authorization/actions/actions.ts
@@ -8,6 +8,7 @@
 import { AlertingActions } from './alerting';
 import { ApiActions } from './api';
 import { AppActions } from './app';
+import { CasesActions } from './cases';
 import { SavedObjectActions } from './saved_object';
 import { SpaceActions } from './space';
 import { UIActions } from './ui';
@@ -21,6 +22,8 @@ export class Actions {
 
   public readonly app = new AppActions(this.versionNumber);
 
+  public readonly cases = new CasesActions(this.versionNumber);
+
   public readonly login = 'login:';
 
   public readonly savedObject = new SavedObjectActions(this.versionNumber);
diff --git a/x-pack/plugins/security/server/authorization/actions/cases.test.ts b/x-pack/plugins/security/server/authorization/actions/cases.test.ts
new file mode 100644
index 0000000000000..3981f49a4fe11
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/actions/cases.test.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 { CasesActions } from './cases';
+
+const version = '1.0.0-zeta1';
+
+describe('#get', () => {
+  it.each`
+    operation
+    ${null}
+    ${undefined}
+    ${''}
+    ${1}
+    ${true}
+    ${{}}
+  `(`operation of ${JSON.stringify('$operation')}`, ({ operation }) => {
+    const actions = new CasesActions(version);
+    expect(() => actions.get('owner', operation)).toThrowErrorMatchingSnapshot();
+  });
+
+  it.each`
+    owner
+    ${null}
+    ${undefined}
+    ${''}
+    ${1}
+    ${true}
+    ${{}}
+  `(`owner of ${JSON.stringify('$owner')}`, ({ owner }) => {
+    const actions = new CasesActions(version);
+    expect(() => actions.get(owner, 'operation')).toThrowErrorMatchingSnapshot();
+  });
+
+  it('returns `cases:${owner}/${operation}`', () => {
+    const alertingActions = new CasesActions(version);
+    expect(alertingActions.get('security', 'bar-operation')).toBe(
+      'cases:1.0.0-zeta1:security/bar-operation'
+    );
+  });
+});
diff --git a/x-pack/plugins/security/server/authorization/actions/cases.ts b/x-pack/plugins/security/server/authorization/actions/cases.ts
new file mode 100644
index 0000000000000..63955ea9023ed
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/actions/cases.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { isString } from 'lodash';
+
+export class CasesActions {
+  private readonly prefix: string;
+
+  constructor(versionNumber: string) {
+    this.prefix = `cases:${versionNumber}:`;
+  }
+
+  public get(owner: string, operation: string): string {
+    if (!operation || !isString(operation)) {
+      throw new Error('operation is required and must be a string');
+    }
+
+    if (!owner || !isString(owner)) {
+      throw new Error('owner is required and must be a string');
+    }
+
+    return `${this.prefix}${owner}/${operation}`;
+  }
+}
diff --git a/x-pack/plugins/security/server/authorization/authorization_service.tsx b/x-pack/plugins/security/server/authorization/authorization_service.tsx
index 1e2588dafe233..c5adb3aff670e 100644
--- a/x-pack/plugins/security/server/authorization/authorization_service.tsx
+++ b/x-pack/plugins/security/server/authorization/authorization_service.tsx
@@ -72,7 +72,7 @@ interface AuthorizationServiceStartParams {
   online$: Observable<OnlineStatusRetryScheduler>;
 }
 
-export interface AuthorizationServiceSetup {
+export interface AuthorizationServiceSetupInternal extends AuthorizationServiceSetup {
   actions: Actions;
   checkPrivilegesWithRequest: CheckPrivilegesWithRequest;
   checkPrivilegesDynamicallyWithRequest: CheckPrivilegesDynamicallyWithRequest;
@@ -82,6 +82,21 @@ export interface AuthorizationServiceSetup {
   privileges: PrivilegesService;
 }
 
+/**
+ * Authorization services available on the setup contract of the security plugin.
+ */
+export interface AuthorizationServiceSetup {
+  /**
+   * Actions are used to create the "actions" that are associated with Elasticsearch's
+   * application privileges, and are used to perform the authorization checks implemented
+   * by the various `checkPrivilegesWithRequest` derivatives
+   */
+  actions: Actions;
+  checkPrivilegesWithRequest: CheckPrivilegesWithRequest;
+  checkPrivilegesDynamicallyWithRequest: CheckPrivilegesDynamicallyWithRequest;
+  mode: AuthorizationMode;
+}
+
 export class AuthorizationService {
   private logger!: Logger;
   private applicationName!: string;
@@ -101,7 +116,7 @@ export class AuthorizationService {
     kibanaIndexName,
     getSpacesService,
     getCurrentUser,
-  }: AuthorizationServiceSetupParams): AuthorizationServiceSetup {
+  }: AuthorizationServiceSetupParams): AuthorizationServiceSetupInternal {
     this.logger = loggers.get('authorization');
     this.applicationName = `${APPLICATION_PREFIX}${kibanaIndexName}`;
 
diff --git a/x-pack/plugins/security/server/authorization/index.ts b/x-pack/plugins/security/server/authorization/index.ts
index 16a3c2ae50058..4d67f3435e7da 100644
--- a/x-pack/plugins/security/server/authorization/index.ts
+++ b/x-pack/plugins/security/server/authorization/index.ts
@@ -6,6 +6,10 @@
  */
 
 export { Actions } from './actions';
-export { AuthorizationService, AuthorizationServiceSetup } from './authorization_service';
+export {
+  AuthorizationService,
+  AuthorizationServiceSetup,
+  AuthorizationServiceSetupInternal,
+} from './authorization_service';
 export { CheckSavedObjectsPrivileges } from './check_saved_objects_privileges';
 export { CheckPrivilegesPayload } from './types';
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
new file mode 100644
index 0000000000000..b7550a0717a28
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.test.ts
@@ -0,0 +1,263 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { FeatureKibanaPrivileges } from '../../../../../features/server';
+import { KibanaFeature } from '../../../../../features/server';
+import { Actions } from '../../actions';
+import { FeaturePrivilegeCasesBuilder } from './cases';
+
+const version = '1.0.0-zeta1';
+
+describe(`cases`, () => {
+  describe(`feature_privilege_builder`, () => {
+    it('grants no privileges by default', () => {
+      const actions = new Actions(version);
+      const casesFeaturePrivileges = new FeaturePrivilegeCasesBuilder(actions);
+
+      const privilege: FeatureKibanaPrivileges = {
+        savedObject: {
+          all: [],
+          read: [],
+        },
+        ui: [],
+      };
+
+      const feature = new KibanaFeature({
+        id: 'my-feature',
+        name: 'my-feature',
+        app: [],
+        category: { id: 'foo', label: 'foo' },
+        privileges: {
+          all: privilege,
+          read: privilege,
+        },
+      });
+
+      expect(casesFeaturePrivileges.getActions(privilege, feature)).toEqual([]);
+    });
+
+    describe(`within feature`, () => {
+      it('grants `read` privileges under feature', () => {
+        const actions = new Actions(version);
+        const casesFeaturePrivilege = new FeaturePrivilegeCasesBuilder(actions);
+
+        const privilege: FeatureKibanaPrivileges = {
+          cases: {
+            read: ['observability'],
+          },
+
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        };
+
+        const feature = new KibanaFeature({
+          id: 'my-feature',
+          name: 'my-feature',
+          app: [],
+          category: { id: 'foo', label: 'foo' },
+          privileges: {
+            all: privilege,
+            read: privilege,
+          },
+        });
+
+        expect(casesFeaturePrivilege.getActions(privilege, feature)).toMatchInlineSnapshot(`
+          Array [
+            "cases:1.0.0-zeta1:observability/getCase",
+            "cases:1.0.0-zeta1:observability/getComment",
+            "cases:1.0.0-zeta1:observability/getTags",
+            "cases:1.0.0-zeta1:observability/getReporters",
+            "cases:1.0.0-zeta1:observability/getUserActions",
+            "cases:1.0.0-zeta1:observability/findConfigurations",
+          ]
+        `);
+      });
+
+      it('grants `all` privileges under feature', () => {
+        const actions = new Actions(version);
+        const casesFeaturePrivilege = new FeaturePrivilegeCasesBuilder(actions);
+
+        const privilege: FeatureKibanaPrivileges = {
+          cases: {
+            all: ['security'],
+          },
+
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        };
+
+        const feature = new KibanaFeature({
+          id: 'my-feature',
+          name: 'my-feature',
+          app: [],
+          category: { id: 'foo', label: 'foo' },
+          privileges: {
+            all: privilege,
+            read: privilege,
+          },
+        });
+
+        expect(casesFeaturePrivilege.getActions(privilege, feature)).toMatchInlineSnapshot(`
+          Array [
+            "cases:1.0.0-zeta1:security/getCase",
+            "cases:1.0.0-zeta1:security/getComment",
+            "cases:1.0.0-zeta1:security/getTags",
+            "cases:1.0.0-zeta1:security/getReporters",
+            "cases:1.0.0-zeta1:security/getUserActions",
+            "cases:1.0.0-zeta1:security/findConfigurations",
+            "cases:1.0.0-zeta1:security/createCase",
+            "cases:1.0.0-zeta1:security/deleteCase",
+            "cases:1.0.0-zeta1:security/updateCase",
+            "cases:1.0.0-zeta1:security/pushCase",
+            "cases:1.0.0-zeta1:security/createComment",
+            "cases:1.0.0-zeta1:security/deleteComment",
+            "cases:1.0.0-zeta1:security/updateComment",
+            "cases:1.0.0-zeta1:security/createConfiguration",
+            "cases:1.0.0-zeta1:security/updateConfiguration",
+          ]
+        `);
+      });
+
+      it('grants both `all` and `read` privileges under feature', () => {
+        const actions = new Actions(version);
+        const casesFeaturePrivilege = new FeaturePrivilegeCasesBuilder(actions);
+
+        const privilege: FeatureKibanaPrivileges = {
+          cases: {
+            all: ['security'],
+            read: ['obs'],
+          },
+
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        };
+
+        const feature = new KibanaFeature({
+          id: 'my-feature',
+          name: 'my-feature',
+          app: [],
+          category: { id: 'foo', label: 'foo' },
+          privileges: {
+            all: privilege,
+            read: privilege,
+          },
+        });
+
+        expect(casesFeaturePrivilege.getActions(privilege, feature)).toMatchInlineSnapshot(`
+          Array [
+            "cases:1.0.0-zeta1:security/getCase",
+            "cases:1.0.0-zeta1:security/getComment",
+            "cases:1.0.0-zeta1:security/getTags",
+            "cases:1.0.0-zeta1:security/getReporters",
+            "cases:1.0.0-zeta1:security/getUserActions",
+            "cases:1.0.0-zeta1:security/findConfigurations",
+            "cases:1.0.0-zeta1:security/createCase",
+            "cases:1.0.0-zeta1:security/deleteCase",
+            "cases:1.0.0-zeta1:security/updateCase",
+            "cases:1.0.0-zeta1:security/pushCase",
+            "cases:1.0.0-zeta1:security/createComment",
+            "cases:1.0.0-zeta1:security/deleteComment",
+            "cases:1.0.0-zeta1:security/updateComment",
+            "cases:1.0.0-zeta1:security/createConfiguration",
+            "cases:1.0.0-zeta1:security/updateConfiguration",
+            "cases:1.0.0-zeta1:obs/getCase",
+            "cases:1.0.0-zeta1:obs/getComment",
+            "cases:1.0.0-zeta1:obs/getTags",
+            "cases:1.0.0-zeta1:obs/getReporters",
+            "cases:1.0.0-zeta1:obs/getUserActions",
+            "cases:1.0.0-zeta1:obs/findConfigurations",
+          ]
+        `);
+      });
+
+      it('grants both `all` and `read` privileges under feature with multiple values in cases array', () => {
+        const actions = new Actions(version);
+        const casesFeaturePrivilege = new FeaturePrivilegeCasesBuilder(actions);
+
+        const privilege: FeatureKibanaPrivileges = {
+          cases: {
+            all: ['security', 'other-security'],
+            read: ['obs', 'other-obs'],
+          },
+
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        };
+
+        const feature = new KibanaFeature({
+          id: 'my-feature',
+          name: 'my-feature',
+          app: [],
+          category: { id: 'foo', label: 'foo' },
+          privileges: {
+            all: privilege,
+            read: privilege,
+          },
+        });
+
+        expect(casesFeaturePrivilege.getActions(privilege, feature)).toMatchInlineSnapshot(`
+          Array [
+            "cases:1.0.0-zeta1:security/getCase",
+            "cases:1.0.0-zeta1:security/getComment",
+            "cases:1.0.0-zeta1:security/getTags",
+            "cases:1.0.0-zeta1:security/getReporters",
+            "cases:1.0.0-zeta1:security/getUserActions",
+            "cases:1.0.0-zeta1:security/findConfigurations",
+            "cases:1.0.0-zeta1:security/createCase",
+            "cases:1.0.0-zeta1:security/deleteCase",
+            "cases:1.0.0-zeta1:security/updateCase",
+            "cases:1.0.0-zeta1:security/pushCase",
+            "cases:1.0.0-zeta1:security/createComment",
+            "cases:1.0.0-zeta1:security/deleteComment",
+            "cases:1.0.0-zeta1:security/updateComment",
+            "cases:1.0.0-zeta1:security/createConfiguration",
+            "cases:1.0.0-zeta1:security/updateConfiguration",
+            "cases:1.0.0-zeta1:other-security/getCase",
+            "cases:1.0.0-zeta1:other-security/getComment",
+            "cases:1.0.0-zeta1:other-security/getTags",
+            "cases:1.0.0-zeta1:other-security/getReporters",
+            "cases:1.0.0-zeta1:other-security/getUserActions",
+            "cases:1.0.0-zeta1:other-security/findConfigurations",
+            "cases:1.0.0-zeta1:other-security/createCase",
+            "cases:1.0.0-zeta1:other-security/deleteCase",
+            "cases:1.0.0-zeta1:other-security/updateCase",
+            "cases:1.0.0-zeta1:other-security/pushCase",
+            "cases:1.0.0-zeta1:other-security/createComment",
+            "cases:1.0.0-zeta1:other-security/deleteComment",
+            "cases:1.0.0-zeta1:other-security/updateComment",
+            "cases:1.0.0-zeta1:other-security/createConfiguration",
+            "cases:1.0.0-zeta1:other-security/updateConfiguration",
+            "cases:1.0.0-zeta1:obs/getCase",
+            "cases:1.0.0-zeta1:obs/getComment",
+            "cases:1.0.0-zeta1:obs/getTags",
+            "cases:1.0.0-zeta1:obs/getReporters",
+            "cases:1.0.0-zeta1:obs/getUserActions",
+            "cases:1.0.0-zeta1:obs/findConfigurations",
+            "cases:1.0.0-zeta1:other-obs/getCase",
+            "cases:1.0.0-zeta1:other-obs/getComment",
+            "cases:1.0.0-zeta1:other-obs/getTags",
+            "cases:1.0.0-zeta1:other-obs/getReporters",
+            "cases:1.0.0-zeta1:other-obs/getUserActions",
+            "cases:1.0.0-zeta1:other-obs/findConfigurations",
+          ]
+        `);
+      });
+    });
+  });
+});
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
new file mode 100644
index 0000000000000..4b04f98704c8f
--- /dev/null
+++ b/x-pack/plugins/security/server/authorization/privileges/feature_privilege_builder/cases.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 { uniq } from 'lodash';
+
+import type { FeatureKibanaPrivileges, KibanaFeature } from '../../../../../features/server';
+import { BaseFeaturePrivilegeBuilder } from './feature_privilege_builder';
+
+// if you add a value here you'll likely also need to make changes here:
+// x-pack/plugins/cases/server/authorization/index.ts
+const readOperations: string[] = [
+  'getCase',
+  'getComment',
+  'getTags',
+  'getReporters',
+  'getUserActions',
+  'findConfigurations',
+];
+const writeOperations: string[] = [
+  'createCase',
+  'deleteCase',
+  'updateCase',
+  'pushCase',
+  'createComment',
+  'deleteComment',
+  'updateComment',
+  'createConfiguration',
+  'updateConfiguration',
+];
+const allOperations: string[] = [...readOperations, ...writeOperations];
+
+export class FeaturePrivilegeCasesBuilder extends BaseFeaturePrivilegeBuilder {
+  public getActions(
+    privilegeDefinition: FeatureKibanaPrivileges,
+    feature: KibanaFeature
+  ): string[] {
+    const getCasesPrivilege = (operations: string[], owners: readonly string[]) => {
+      return owners.flatMap((owner) =>
+        operations.map((operation) => this.actions.cases.get(owner, operation))
+      );
+    };
+
+    return uniq([
+      ...getCasesPrivilege(allOperations, privilegeDefinition.cases?.all ?? []),
+      ...getCasesPrivilege(readOperations, privilegeDefinition.cases?.read ?? []),
+    ]);
+  }
+}
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 21cf2421ce1b2..81d1339052301 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
@@ -12,6 +12,7 @@ import type { Actions } from '../../actions';
 import { FeaturePrivilegeAlertingBuilder } from './alerting';
 import { FeaturePrivilegeApiBuilder } from './api';
 import { FeaturePrivilegeAppBuilder } from './app';
+import { FeaturePrivilegeCasesBuilder } from './cases';
 import { FeaturePrivilegeCatalogueBuilder } from './catalogue';
 import { FeaturePrivilegeBuilder } from './feature_privilege_builder';
 import { FeaturePrivilegeManagementBuilder } from './management';
@@ -31,6 +32,7 @@ export const featurePrivilegeBuilderFactory = (actions: Actions): FeaturePrivile
     new FeaturePrivilegeSavedObjectBuilder(actions),
     new FeaturePrivilegeUIBuilder(actions),
     new FeaturePrivilegeAlertingBuilder(actions),
+    new FeaturePrivilegeCasesBuilder(actions),
   ];
 
   return {
diff --git a/x-pack/plugins/security/server/config_deprecations.test.ts b/x-pack/plugins/security/server/config_deprecations.test.ts
index a233d760359e5..d2c75fd2331b9 100644
--- a/x-pack/plugins/security/server/config_deprecations.test.ts
+++ b/x-pack/plugins/security/server/config_deprecations.test.ts
@@ -243,7 +243,7 @@ describe('Config Deprecations', () => {
     expect(migrated).toEqual(config);
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Defining \`xpack.security.authc.providers\` as an array of provider types is deprecated. Use extended \`object\` format instead.",
+        "Defining \\"xpack.security.authc.providers\\" as an array of provider types is deprecated. Use extended \\"object\\" format instead.",
       ]
     `);
   });
@@ -262,7 +262,7 @@ describe('Config Deprecations', () => {
     expect(migrated).toEqual(config);
     expect(messages).toMatchInlineSnapshot(`
       Array [
-        "Defining \`xpack.security.authc.providers\` as an array of provider types is deprecated. Use extended \`object\` format instead.",
+        "Defining \\"xpack.security.authc.providers\\" as an array of provider types is deprecated. Use extended \\"object\\" format instead.",
         "Enabling both \`basic\` and \`token\` authentication providers in \`xpack.security.authc.providers\` is deprecated. Login page will only use \`token\` provider.",
       ]
     `);
diff --git a/x-pack/plugins/security/server/config_deprecations.ts b/x-pack/plugins/security/server/config_deprecations.ts
index fdf8c0990cd4b..7b659ec1c350d 100644
--- a/x-pack/plugins/security/server/config_deprecations.ts
+++ b/x-pack/plugins/security/server/config_deprecations.ts
@@ -26,7 +26,13 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
     if (Array.isArray(settings?.xpack?.security?.authc?.providers)) {
       addDeprecation({
         message:
-          'Defining `xpack.security.authc.providers` as an array of provider types is deprecated. Use extended `object` format instead.',
+          `Defining "xpack.security.authc.providers" as an array of provider types is deprecated. ` +
+          `Use extended "object" format instead.`,
+        correctiveActions: {
+          manualSteps: [
+            `Use the extended object format for "xpack.security.authc.providers" in your Kibana configuration.`,
+          ],
+        },
       });
     }
   },
@@ -46,6 +52,11 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
       addDeprecation({
         message:
           'Enabling both `basic` and `token` authentication providers in `xpack.security.authc.providers` is deprecated. Login page will only use `token` provider.',
+        correctiveActions: {
+          manualSteps: [
+            'Remove either the `basic` or `token` auth provider in "xpack.security.authc.providers" from your Kibana configuration.',
+          ],
+        },
       });
     }
   },
@@ -58,6 +69,11 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
       addDeprecation({
         message:
           '`xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize` is deprecated and is no longer used',
+        correctiveActions: {
+          manualSteps: [
+            `Remove "xpack.security.authc.providers.saml.<provider-name>.maxRedirectURLSize" from your Kibana configuration.`,
+          ],
+        },
       });
     }
   },
@@ -67,6 +83,12 @@ export const securityConfigDeprecationProvider: ConfigDeprecationProvider = ({
         message:
           'Disabling the security plugin (`xpack.security.enabled`) will not be supported in the next major version (8.0). ' +
           'To turn off security features, disable them in Elasticsearch instead.',
+        correctiveActions: {
+          manualSteps: [
+            `Remove "xpack.security.enabled" from your Kibana configuration.`,
+            `To turn off security features, disable them in Elasticsearch instead.`,
+          ],
+        },
       });
     }
   },
diff --git a/x-pack/plugins/security/server/index.ts b/x-pack/plugins/security/server/index.ts
index e50ab66a92547..a48c6833096cc 100644
--- a/x-pack/plugins/security/server/index.ts
+++ b/x-pack/plugins/security/server/index.ts
@@ -25,6 +25,7 @@ export type {
   InvalidateAPIKeysParams,
   InvalidateAPIKeyResult,
   GrantAPIKeyResult,
+  AuthenticationServiceStart,
 } from './authentication';
 export type { CheckPrivilegesPayload } from './authorization';
 export type AuthorizationServiceSetup = SecurityPluginStart['authz'];
@@ -32,6 +33,7 @@ export { LegacyAuditLogger, AuditLogger, AuditEvent } from './audit';
 export type { SecurityPluginSetup, SecurityPluginStart };
 export type { AuthenticatedUser } from '../common/model';
 export { ROUTE_TAG_CAN_REDIRECT } from './routes/tags';
+export { AuditServiceSetup } from './audit';
 
 export const config: PluginConfigDescriptor<TypeOf<typeof ConfigSchema>> = {
   schema: ConfigSchema,
diff --git a/x-pack/plugins/security/server/plugin.test.ts b/x-pack/plugins/security/server/plugin.test.ts
index 0fa6c553c2e80..574e37fdd1841 100644
--- a/x-pack/plugins/security/server/plugin.test.ts
+++ b/x-pack/plugins/security/server/plugin.test.ts
@@ -83,6 +83,9 @@ describe('Security Plugin', () => {
               "app": AppActions {
                 "prefix": "app:version:",
               },
+              "cases": CasesActions {
+                "prefix": "cases:version:",
+              },
               "login": "login:",
               "savedObject": SavedObjectActions {
                 "prefix": "saved_object:version:",
@@ -150,6 +153,9 @@ describe('Security Plugin', () => {
               "app": AppActions {
                 "prefix": "app:version:",
               },
+              "cases": CasesActions {
+                "prefix": "cases:version:",
+              },
               "login": "login:",
               "savedObject": SavedObjectActions {
                 "prefix": "saved_object:version:",
diff --git a/x-pack/plugins/security/server/plugin.ts b/x-pack/plugins/security/server/plugin.ts
index 57be308525fdd..98f1335b53450 100644
--- a/x-pack/plugins/security/server/plugin.ts
+++ b/x-pack/plugins/security/server/plugin.ts
@@ -10,7 +10,6 @@ import { combineLatest } from 'rxjs';
 import { map } from 'rxjs/operators';
 
 import type { TypeOf } from '@kbn/config-schema';
-import type { RecursiveReadonly } from '@kbn/utility-types';
 import type {
   CoreSetup,
   CoreStart,
@@ -36,10 +35,14 @@ import type { AnonymousAccessServiceStart } from './anonymous_access';
 import { AnonymousAccessService } from './anonymous_access';
 import type { AuditServiceSetup } from './audit';
 import { AuditService, SecurityAuditLogger } from './audit';
-import type { AuthenticationServiceStart } from './authentication';
+import type {
+  AuthenticationServiceStart,
+  AuthenticationServiceStartInternal,
+} from './authentication';
 import { AuthenticationService } from './authentication';
 import type { AuthorizationServiceSetup } from './authorization';
 import { AuthorizationService } from './authorization';
+import type { AuthorizationServiceSetupInternal } from './authorization/authorization_service';
 import type { ConfigSchema, ConfigType } from './config';
 import { createConfig } from './config';
 import { ElasticsearchService } from './elasticsearch';
@@ -74,11 +77,14 @@ export interface SecurityPluginSetup {
   /**
    * @deprecated Use `authz` methods from the `SecurityServiceStart` contract instead.
    */
-  authz: Pick<
-    AuthorizationServiceSetup,
-    'actions' | 'checkPrivilegesDynamicallyWithRequest' | 'checkPrivilegesWithRequest' | 'mode'
-  >;
+  authz: AuthorizationServiceSetup;
+  /**
+   * Exposes information about the available security features under the current license.
+   */
   license: SecurityLicense;
+  /**
+   * Exposes services for audit logging.
+   */
   audit: AuditServiceSetup;
 }
 
@@ -86,11 +92,14 @@ export interface SecurityPluginSetup {
  * Describes public Security plugin contract returned at the `start` stage.
  */
 export interface SecurityPluginStart {
-  authc: Pick<AuthenticationServiceStart, 'apiKeys' | 'getCurrentUser'>;
-  authz: Pick<
-    AuthorizationServiceSetup,
-    'actions' | 'checkPrivilegesDynamicallyWithRequest' | 'checkPrivilegesWithRequest' | 'mode'
-  >;
+  /**
+   * Authentication services to confirm the user is who they say they are.
+   */
+  authc: AuthenticationServiceStart;
+  /**
+   * Authorization services to manage and access the permissions a particular user has.
+   */
+  authz: AuthorizationServiceSetup;
 }
 
 export interface PluginSetupDependencies {
@@ -113,14 +122,9 @@ export interface PluginStartDependencies {
  * Represents Security Plugin instance that will be managed by the Kibana plugin system.
  */
 export class SecurityPlugin
-  implements
-    Plugin<
-      RecursiveReadonly<SecurityPluginSetup>,
-      RecursiveReadonly<SecurityPluginStart>,
-      PluginSetupDependencies
-    > {
+  implements Plugin<SecurityPluginSetup, SecurityPluginStart, PluginSetupDependencies> {
   private readonly logger: Logger;
-  private authorizationSetup?: AuthorizationServiceSetup;
+  private authorizationSetup?: AuthorizationServiceSetupInternal;
   private auditSetup?: AuditServiceSetup;
   private anonymousAccessStart?: AnonymousAccessServiceStart;
   private configSubscription?: Subscription;
@@ -152,7 +156,7 @@ export class SecurityPlugin
   private readonly authenticationService = new AuthenticationService(
     this.initializerContext.logger.get('authentication')
   );
-  private authenticationStart?: AuthenticationServiceStart;
+  private authenticationStart?: AuthenticationServiceStartInternal;
   private readonly getAuthentication = () => {
     if (!this.authenticationStart) {
       throw new Error(`authenticationStart is not registered!`);
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 8e34ededdd8fa..ee28681adbd5f 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
@@ -12,7 +12,7 @@ import type { RequestHandler } from 'src/core/server';
 import { kibanaResponseFactory } from 'src/core/server';
 import { httpServerMock } from 'src/core/server/mocks';
 
-import type { AuthenticationServiceStart } from '../../authentication';
+import type { AuthenticationServiceStartInternal } from '../../authentication';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 import type { SecurityRequestHandlerContext } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
@@ -28,7 +28,7 @@ describe('Create API Key route', () => {
   }
 
   let routeHandler: RequestHandler<any, any, any, any>;
-  let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
+  let authc: DeeplyMockedKeys<AuthenticationServiceStartInternal>;
   beforeEach(() => {
     authc = authenticationServiceMock.createStart();
     const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
@@ -85,6 +85,9 @@ describe('Create API Key route', () => {
         role_descriptors: {
           role_1: {},
         },
+        metadata: {
+          foo: 'bar',
+        },
       };
 
       const request = httpServerMock.createKibanaRequest({
diff --git a/x-pack/plugins/security/server/routes/api_keys/create.ts b/x-pack/plugins/security/server/routes/api_keys/create.ts
index a309d3a0e3edb..b9e927592a492 100644
--- a/x-pack/plugins/security/server/routes/api_keys/create.ts
+++ b/x-pack/plugins/security/server/routes/api_keys/create.ts
@@ -29,6 +29,7 @@ export function defineCreateApiKeyRoutes({
               defaultValue: {},
             }
           ),
+          metadata: schema.maybe(schema.object({}, { unknowns: 'allow' })),
         }),
       },
     },
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 da097faf8c6b2..1000e79563b57 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
@@ -12,7 +12,7 @@ import type { RequestHandler } from 'src/core/server';
 import { kibanaResponseFactory } from 'src/core/server';
 import { httpServerMock } from 'src/core/server/mocks';
 
-import type { AuthenticationServiceStart } from '../../authentication';
+import type { AuthenticationServiceStartInternal } from '../../authentication';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 import type { SecurityRequestHandlerContext } from '../../types';
 import { routeDefinitionParamsMock } from '../index.mock';
@@ -28,7 +28,7 @@ describe('API keys enabled', () => {
   }
 
   let routeHandler: RequestHandler<any, any, any, any>;
-  let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
+  let authc: DeeplyMockedKeys<AuthenticationServiceStartInternal>;
   beforeEach(() => {
     authc = authenticationServiceMock.createStart();
     const mockRouteDefinitionParams = routeDefinitionParamsMock.create();
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 1e0b6784a45c8..5acc5817bfb3e 100644
--- a/x-pack/plugins/security/server/routes/authentication/common.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/common.test.ts
@@ -13,7 +13,7 @@ import { httpServerMock } from 'src/core/server/mocks';
 
 import type { SecurityLicense, SecurityLicenseFeatures } from '../../../common/licensing';
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
-import type { AuthenticationServiceStart } from '../../authentication';
+import type { AuthenticationServiceStartInternal } from '../../authentication';
 import {
   AuthenticationResult,
   DeauthenticationResult,
@@ -28,7 +28,7 @@ import { defineCommonRoutes } from './common';
 
 describe('Common authentication routes', () => {
   let router: jest.Mocked<SecurityRouter>;
-  let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
+  let authc: DeeplyMockedKeys<AuthenticationServiceStartInternal>;
   let license: jest.Mocked<SecurityLicense>;
   let mockContext: SecurityRequestHandlerContext;
   beforeEach(() => {
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 3b2497ed9f30b..c28c435217ef3 100644
--- a/x-pack/plugins/security/server/routes/authentication/saml.test.ts
+++ b/x-pack/plugins/security/server/routes/authentication/saml.test.ts
@@ -11,7 +11,7 @@ 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 { AuthenticationServiceStart } from '../../authentication';
+import type { AuthenticationServiceStartInternal } from '../../authentication';
 import { AuthenticationResult, SAMLLogin } from '../../authentication';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 import type { SecurityRouter } from '../../types';
@@ -21,7 +21,7 @@ import { defineSAMLRoutes } from './saml';
 
 describe('SAML authentication routes', () => {
   let router: jest.Mocked<SecurityRouter>;
-  let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
+  let authc: DeeplyMockedKeys<AuthenticationServiceStartInternal>;
   beforeEach(() => {
     const routeParamsMock = routeDefinitionParamsMock.create();
     router = routeParamsMock.router;
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 e3a586062ae4c..29849497e02ec 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
@@ -17,7 +17,10 @@ export function defineGetBuiltinPrivilegesRoutes({ router }: RouteDefinitionPara
 
       // 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');
-      privileges.index = privileges.index.filter((privilege) => privilege !== 'none');
+      const indexPriviledges = Array.isArray(privileges.index)
+        ? privileges.index
+        : [privileges.index];
+      privileges.index = indexPriviledges.filter((privilege) => privilege !== 'none');
 
       return response.ok({ body: privileges });
     }
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 09bcb6b8c505c..5a0934721e20c 100644
--- a/x-pack/plugins/security/server/routes/authorization/roles/put.ts
+++ b/x-pack/plugins/security/server/routes/authorization/roles/put.ts
@@ -72,7 +72,6 @@ export function definePutRolesRoutes({
         const body = transformPutPayloadToElasticsearchRole(
           request.body,
           authz.applicationName,
-          // @ts-expect-error @elastic/elasticsearch `XPackRole` type doesn't define `applications`.
           rawRoles[name] ? rawRoles[name].applications : []
         );
 
diff --git a/x-pack/plugins/security/server/routes/index.ts b/x-pack/plugins/security/server/routes/index.ts
index cdb3a2fa289fd..e36ca1b9ab72e 100644
--- a/x-pack/plugins/security/server/routes/index.ts
+++ b/x-pack/plugins/security/server/routes/index.ts
@@ -10,8 +10,8 @@ import type { HttpResources, IBasePath, Logger } from 'src/core/server';
 
 import type { KibanaFeature } from '../../../features/server';
 import type { SecurityLicense } from '../../common/licensing';
-import type { AuthenticationServiceStart } from '../authentication';
-import type { AuthorizationServiceSetup } from '../authorization';
+import type { AuthenticationServiceStartInternal } from '../authentication';
+import type { AuthorizationServiceSetupInternal } from '../authorization';
 import type { ConfigType } from '../config';
 import type { SecurityFeatureUsageServiceStart } from '../feature_usage';
 import type { Session } from '../session_management';
@@ -34,12 +34,12 @@ export interface RouteDefinitionParams {
   httpResources: HttpResources;
   logger: Logger;
   config: ConfigType;
-  authz: AuthorizationServiceSetup;
+  authz: AuthorizationServiceSetupInternal;
   getSession: () => PublicMethodsOf<Session>;
   license: SecurityLicense;
   getFeatures: () => Promise<KibanaFeature[]>;
   getFeatureUsageService: () => SecurityFeatureUsageServiceStart;
-  getAuthenticationService: () => AuthenticationServiceStart;
+  getAuthenticationService: () => AuthenticationServiceStartInternal;
 }
 
 export function defineRoutes(params: RouteDefinitionParams) {
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 a97fce7ea4b19..e5f4381a20421 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
@@ -15,8 +15,8 @@ import { kibanaResponseFactory } from 'src/core/server';
 import { coreMock, httpServerMock } from 'src/core/server/mocks';
 
 import { mockAuthenticatedUser } from '../../../common/model/authenticated_user.mock';
-import type { AuthenticationServiceStart } from '../../authentication';
 import { AuthenticationResult } from '../../authentication';
+import type { AuthenticationServiceStartInternal } from '../../authentication/authentication_service';
 import { authenticationServiceMock } from '../../authentication/authentication_service.mock';
 import type { Session } from '../../session_management';
 import { sessionMock } from '../../session_management/session.mock';
@@ -26,7 +26,7 @@ import { defineChangeUserPasswordRoutes } from './change_password';
 
 describe('Change password', () => {
   let router: jest.Mocked<SecurityRouter>;
-  let authc: DeeplyMockedKeys<AuthenticationServiceStart>;
+  let authc: DeeplyMockedKeys<AuthenticationServiceStartInternal>;
   let session: jest.Mocked<PublicMethodsOf<Session>>;
   let routeHandler: RequestHandler<any, any, any, SecurityRequestHandlerContext>;
   let routeConfig: RouteConfig<any, any, any, any>;
diff --git a/x-pack/plugins/security/server/saved_objects/index.ts b/x-pack/plugins/security/server/saved_objects/index.ts
index e052fd1c7ab6a..837b3c594d396 100644
--- a/x-pack/plugins/security/server/saved_objects/index.ts
+++ b/x-pack/plugins/security/server/saved_objects/index.ts
@@ -9,7 +9,7 @@ import type { CoreSetup, LegacyRequest } from 'src/core/server';
 
 import { KibanaRequest, SavedObjectsClient } from '../../../../../src/core/server';
 import type { AuditServiceSetup, SecurityAuditLogger } from '../audit';
-import type { AuthorizationServiceSetup } from '../authorization';
+import type { AuthorizationServiceSetupInternal } from '../authorization/authorization_service';
 import type { SpacesService } from '../plugin';
 import { SecureSavedObjectsClientWrapper } from './secure_saved_objects_client_wrapper';
 
@@ -17,7 +17,7 @@ interface SetupSavedObjectsParams {
   legacyAuditLogger: SecurityAuditLogger;
   audit: AuditServiceSetup;
   authz: Pick<
-    AuthorizationServiceSetup,
+    AuthorizationServiceSetupInternal,
     'mode' | 'actions' | 'checkSavedObjectsPrivilegesWithRequest'
   >;
   savedObjects: CoreSetup['savedObjects'];
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 d7a4c3e2520bf..9093d5d2e0db2 100644
--- a/x-pack/plugins/security/server/session_management/session_index.ts
+++ b/x-pack/plugins/security/server/session_management/session_index.ts
@@ -52,7 +52,7 @@ export function getSessionIndexTemplate(indexName: string) {
       },
     },
     mappings: {
-      dynamic: 'strict' as 'strict',
+      dynamic: 'strict',
       properties: {
         usernameHash: { type: 'keyword' },
         provider: { properties: { name: { type: 'keyword' }, type: { type: 'keyword' } } },
@@ -61,7 +61,7 @@ export function getSessionIndexTemplate(indexName: string) {
         accessAgreementAcknowledged: { type: 'boolean' },
         content: { type: 'binary' },
       },
-    },
+    } as const,
   });
 }
 
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 0b8a7abab2382..bc7cb727edd80 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
@@ -15,7 +15,10 @@ import { spacesClientMock } from '../../../spaces/server/mocks';
 import type { AuditEvent, AuditLogger } from '../audit';
 import { SpaceAuditAction } from '../audit';
 import { auditServiceMock } from '../audit/index.mock';
-import type { AuthorizationServiceSetup } from '../authorization';
+import type {
+  AuthorizationServiceSetup,
+  AuthorizationServiceSetupInternal,
+} from '../authorization';
 import { authorizationMock } from '../authorization/index.mock';
 import type { CheckPrivilegesResponse } from '../authorization/types';
 import type { LegacySpacesAuditLogger } from './legacy_audit_logger';
@@ -85,7 +88,9 @@ const setup = ({ securityEnabled = false }: Opts = {}) => {
   };
 };
 
-const expectNoAuthorizationCheck = (authorization: jest.Mocked<AuthorizationServiceSetup>) => {
+const expectNoAuthorizationCheck = (
+  authorization: jest.Mocked<AuthorizationServiceSetupInternal>
+) => {
   expect(authorization.checkPrivilegesDynamicallyWithRequest).not.toHaveBeenCalled();
   expect(authorization.checkPrivilegesWithRequest).not.toHaveBeenCalled();
   expect(authorization.checkSavedObjectsPrivilegesWithRequest).not.toHaveBeenCalled();
diff --git a/x-pack/plugins/security_solution/common/constants.ts b/x-pack/plugins/security_solution/common/constants.ts
index 91b48afdc4ed1..87e99a4b472e7 100644
--- a/x-pack/plugins/security_solution/common/constants.ts
+++ b/x-pack/plugins/security_solution/common/constants.ts
@@ -186,6 +186,7 @@ export const DETECTION_ENGINE_INDEX_URL = `${DETECTION_ENGINE_URL}/index`;
 export const DETECTION_ENGINE_TAGS_URL = `${DETECTION_ENGINE_URL}/tags`;
 export const DETECTION_ENGINE_RULES_STATUS_URL = `${DETECTION_ENGINE_RULES_URL}/_find_statuses`;
 export const DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL = `${DETECTION_ENGINE_RULES_URL}/prepackaged/_status`;
+export const DETECTION_ENGINE_RULES_BULK_ACTION = `${DETECTION_ENGINE_RULES_URL}/_bulk_action`;
 
 export const TIMELINE_URL = '/api/timeline';
 export const TIMELINES_URL = '/api/timelines';
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
index 7b49b68ab79a1..c9a9d3bdcb24c 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/common/schemas.ts
@@ -82,6 +82,8 @@ export const ruleIdOrUndefined = t.union([rule_id, t.undefined]);
 export type RuleIdOrUndefined = t.TypeOf<typeof ruleIdOrUndefined>;
 
 export const id = UUID;
+export type Id = t.TypeOf<typeof id>;
+
 export const idOrUndefined = t.union([id, t.undefined]);
 export type IdOrUndefined = t.TypeOf<typeof idOrUndefined>;
 
@@ -408,3 +410,13 @@ export const privilege = t.type({
 });
 
 export type Privilege = t.TypeOf<typeof privilege>;
+
+export enum BulkAction {
+  'enable' = 'enable',
+  'disable' = 'disable',
+  'export' = 'export',
+  'delete' = 'delete',
+  'duplicate' = 'duplicate',
+}
+
+export const bulkAction = t.keyof(BulkAction);
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/index.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/index.ts
index 1035e9128305c..7722feb5f080d 100644
--- a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/index.ts
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/index.ts
@@ -17,3 +17,4 @@ export * from './query_signals_index_schema';
 export * from './set_signal_status_schema';
 export * from './update_rules_bulk_schema';
 export * from './rule_schemas';
+export * from './perform_bulk_action_schema';
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.mock.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.mock.ts
new file mode 100644
index 0000000000000..cb78168fbec6e
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.mock.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { BulkAction } from '../common/schemas';
+import { PerformBulkActionSchema } from './perform_bulk_action_schema';
+
+export const getPerformBulkActionSchemaMock = (): PerformBulkActionSchema => ({
+  query: '',
+  action: BulkAction.disable,
+});
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.test.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.test.ts
new file mode 100644
index 0000000000000..a9707b88f5240
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.test.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 { performBulkActionSchema, PerformBulkActionSchema } from './perform_bulk_action_schema';
+import { exactCheck, foldLeftRight, getPaths } from '@kbn/securitysolution-io-ts-utils';
+import { left } from 'fp-ts/lib/Either';
+import { BulkAction } from '../common/schemas';
+
+describe('perform_bulk_action_schema', () => {
+  test('query and action is valid', () => {
+    const payload: PerformBulkActionSchema = {
+      query: 'name: test',
+      action: BulkAction.enable,
+    };
+
+    const decoded = performBulkActionSchema.decode(payload);
+    const checked = exactCheck(payload, decoded);
+    const message = foldLeftRight(checked);
+    expect(getPaths(left(message.errors))).toEqual([]);
+    expect(message.schema).toEqual(payload);
+  });
+
+  test('missing query is valid', () => {
+    const payload: PerformBulkActionSchema = {
+      query: undefined,
+      action: BulkAction.enable,
+    };
+
+    const decoded = performBulkActionSchema.decode(payload);
+    const checked = exactCheck(payload, decoded);
+    const message = foldLeftRight(checked);
+    expect(getPaths(left(message.errors))).toEqual([]);
+    expect(message.schema).toEqual(payload);
+  });
+
+  test('missing action is invalid', () => {
+    const payload: Omit<PerformBulkActionSchema, 'action'> = {
+      query: 'name: test',
+    };
+
+    const decoded = performBulkActionSchema.decode(payload);
+    const checked = exactCheck(payload, decoded);
+    const message = foldLeftRight(checked);
+    expect(getPaths(left(message.errors))).toEqual([
+      'Invalid value "undefined" supplied to "action"',
+    ]);
+    expect(message.schema).toEqual({});
+  });
+
+  test('unknown action is invalid', () => {
+    const payload: Omit<PerformBulkActionSchema, 'action'> & { action: 'unknown' } = {
+      query: 'name: test',
+      action: 'unknown',
+    };
+
+    const decoded = performBulkActionSchema.decode(payload);
+    const checked = exactCheck(payload, decoded);
+    const message = foldLeftRight(checked);
+    expect(getPaths(left(message.errors))).toEqual([
+      'Invalid value "unknown" supplied to "action"',
+    ]);
+    expect(message.schema).toEqual({});
+  });
+});
diff --git a/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.ts b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.ts
new file mode 100644
index 0000000000000..adb26f107c8cd
--- /dev/null
+++ b/x-pack/plugins/security_solution/common/detection_engine/schemas/request/perform_bulk_action_schema.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 * as t from 'io-ts';
+import { bulkAction, queryOrUndefined } from '../common/schemas';
+
+export const performBulkActionSchema = t.exact(
+  t.type({
+    query: queryOrUndefined,
+    action: bulkAction,
+  })
+);
+
+export type PerformBulkActionSchema = t.TypeOf<typeof performBulkActionSchema>;
diff --git a/x-pack/plugins/security_solution/common/endpoint/constants.ts b/x-pack/plugins/security_solution/common/endpoint/constants.ts
index 1c0b09a4648e5..f4cf85e025237 100644
--- a/x-pack/plugins/security_solution/common/endpoint/constants.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/constants.ts
@@ -15,20 +15,25 @@ export const telemetryIndexPattern = 'metrics-endpoint.telemetry-*';
 export const LIMITED_CONCURRENCY_ENDPOINT_ROUTE_TAG = 'endpoint:limited-concurrency';
 export const LIMITED_CONCURRENCY_ENDPOINT_COUNT = 100;
 
-export const HOST_METADATA_LIST_API = '/api/endpoint/metadata';
-export const HOST_METADATA_GET_API = '/api/endpoint/metadata/{id}';
+export const BASE_ENDPOINT_ROUTE = '/api/endpoint';
+export const HOST_METADATA_LIST_ROUTE = `${BASE_ENDPOINT_ROUTE}/metadata`;
+export const HOST_METADATA_GET_ROUTE = `${BASE_ENDPOINT_ROUTE}/metadata/{id}`;
 
-export const TRUSTED_APPS_GET_API = '/api/endpoint/trusted_apps/{id}';
-export const TRUSTED_APPS_LIST_API = '/api/endpoint/trusted_apps';
-export const TRUSTED_APPS_CREATE_API = '/api/endpoint/trusted_apps';
-export const TRUSTED_APPS_UPDATE_API = '/api/endpoint/trusted_apps/{id}';
-export const TRUSTED_APPS_DELETE_API = '/api/endpoint/trusted_apps/{id}';
-export const TRUSTED_APPS_SUMMARY_API = '/api/endpoint/trusted_apps/summary';
+export const TRUSTED_APPS_GET_API = `${BASE_ENDPOINT_ROUTE}/trusted_apps/{id}`;
+export const TRUSTED_APPS_LIST_API = `${BASE_ENDPOINT_ROUTE}/trusted_apps`;
+export const TRUSTED_APPS_CREATE_API = `${BASE_ENDPOINT_ROUTE}/trusted_apps`;
+export const TRUSTED_APPS_UPDATE_API = `${BASE_ENDPOINT_ROUTE}/trusted_apps/{id}`;
+export const TRUSTED_APPS_DELETE_API = `${BASE_ENDPOINT_ROUTE}/trusted_apps/{id}`;
+export const TRUSTED_APPS_SUMMARY_API = `${BASE_ENDPOINT_ROUTE}/trusted_apps/summary`;
 
-export const BASE_POLICY_RESPONSE_ROUTE = `/api/endpoint/policy_response`;
-export const BASE_POLICY_ROUTE = `/api/endpoint/policy`;
+export const BASE_POLICY_RESPONSE_ROUTE = `${BASE_ENDPOINT_ROUTE}/policy_response`;
+export const BASE_POLICY_ROUTE = `${BASE_ENDPOINT_ROUTE}/policy`;
 export const AGENT_POLICY_SUMMARY_ROUTE = `${BASE_POLICY_ROUTE}/summaries`;
 
 /** Host Isolation Routes */
-export const ISOLATE_HOST_ROUTE = `/api/endpoint/isolate`;
-export const UNISOLATE_HOST_ROUTE = `/api/endpoint/unisolate`;
+export const ISOLATE_HOST_ROUTE = `${BASE_ENDPOINT_ROUTE}/isolate`;
+export const UNISOLATE_HOST_ROUTE = `${BASE_ENDPOINT_ROUTE}/unisolate`;
+
+/** Endpoint Actions Log Routes */
+export const ENDPOINT_ACTION_LOG_ROUTE = `/api/endpoint/action_log/{agent_id}`;
+export const ACTION_STATUS_ROUTE = `/api/endpoint/action_status`;
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 6e508a099003a..58e7539b1f617 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
@@ -51,13 +51,16 @@ export class FleetAgentGenerator extends BaseDataGenerator<Agent> {
    * @param [overrides] any partial value to the full document
    */
   generateEsHit(
-    overrides: DeepPartial<estypes.Hit<FleetServerAgent>> = {}
-  ): estypes.Hit<FleetServerAgent> {
+    overrides: DeepPartial<estypes.SearchHit<FleetServerAgent>> = {}
+  ): estypes.SearchHit<FleetServerAgent> {
     const hostname = this.randomHostname();
     const now = new Date().toISOString();
     const osFamily = this.randomOSFamily();
 
-    return merge<estypes.Hit<FleetServerAgent>, DeepPartial<estypes.Hit<FleetServerAgent>>>(
+    return merge<
+      estypes.SearchHit<FleetServerAgent>,
+      DeepPartial<estypes.SearchHit<FleetServerAgent>>
+    >(
       {
         _index: AGENTS_INDEX,
         _id: this.randomUUID(),
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 436f1573639c8..7e03d9b61fc10 100644
--- a/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/generate_data.ts
@@ -254,10 +254,10 @@ interface HostInfo {
         version: number;
       };
     };
-    configuration: {
+    configuration?: {
       isolation: boolean;
     };
-    state: {
+    state?: {
       isolation: boolean;
     };
   };
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 021b9bcb1eccc..4996d90288ca9 100644
--- a/x-pack/plugins/security_solution/common/endpoint/index_data.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/index_data.ts
@@ -121,7 +121,7 @@ async function indexHostDocs({
   const kibanaVersion = await fetchKibanaVersion(kbnClient);
   let hostMetadata: HostMetadata;
   let wasAgentEnrolled = false;
-  let enrolledAgent: undefined | estypes.Hit<FleetServerAgent>;
+  let enrolledAgent: undefined | estypes.SearchHit<FleetServerAgent>;
 
   for (let j = 0; j < numDocs; j++) {
     generator.updateHostData();
@@ -373,7 +373,7 @@ const indexFleetAgentForHost = async (
   endpointHost: HostMetadata,
   agentPolicyId: string,
   kibanaVersion: string = '8.0.0'
-): Promise<estypes.Hit<FleetServerAgent>> => {
+): Promise<estypes.SearchHit<FleetServerAgent>> => {
   const agentDoc = fleetAgentGenerator.generateEsHit({
     _source: {
       local_metadata: {
diff --git a/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts b/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts
index e8997158cdfad..09776b57ed8ea 100644
--- a/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/schema/actions.ts
@@ -20,3 +20,20 @@ export const HostIsolationRequestSchema = {
     comment: schema.maybe(schema.string()),
   }),
 };
+
+export const EndpointActionLogRequestSchema = {
+  // TODO improve when using pagination with query params
+  query: schema.object({}),
+  params: schema.object({
+    agent_id: schema.string(),
+  }),
+};
+
+export const ActionStatusRequestSchema = {
+  query: schema.object({
+    agent_ids: schema.oneOf([
+      schema.arrayOf(schema.string({ minLength: 1 }), { minSize: 1, maxSize: 50 }),
+      schema.string({ minLength: 1 }),
+    ]),
+  }),
+};
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
index fcfda9c9a30d9..33072e8df5cec 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/actions.ts
@@ -10,6 +10,11 @@ import { HostIsolationRequestSchema } from '../schema/actions';
 
 export type ISOLATION_ACTIONS = 'isolate' | 'unisolate';
 
+export interface EndpointActionData {
+  command: ISOLATION_ACTIONS;
+  comment?: string;
+}
+
 export interface EndpointAction {
   action_id: string;
   '@timestamp': string;
@@ -18,10 +23,7 @@ export interface EndpointAction {
   input_type: 'endpoint';
   agents: string[];
   user_id: string;
-  data: {
-    command: ISOLATION_ACTIONS;
-    comment?: string;
-  };
+  data: EndpointActionData;
 }
 
 export interface EndpointActionResponse {
@@ -32,11 +34,8 @@ export interface EndpointActionResponse {
   agent_id: string;
   started_at: string;
   completed_at: string;
-  error: string;
-  action_data: {
-    command: ISOLATION_ACTIONS;
-    comment?: string;
-  };
+  error?: string;
+  action_data: EndpointActionData;
 }
 
 export type HostIsolationRequestBody = TypeOf<typeof HostIsolationRequestSchema.body>;
@@ -44,3 +43,11 @@ export type HostIsolationRequestBody = TypeOf<typeof HostIsolationRequestSchema.
 export interface HostIsolationResponse {
   action: string;
 }
+
+export interface PendingActionsResponse {
+  agent_id: string;
+  pending_actions: {
+    /** Number of actions pending for each type. The `key` could be one of the `ISOLATION_ACTIONS` values. */
+    [key: string]: number;
+  };
+}
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 c084dd8ca7668..1e0d798cf7f07 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/index.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/index.ts
@@ -468,14 +468,23 @@ export type HostMetadata = Immutable<{
         id: string;
         status: HostPolicyResponseActionStatus;
         name: string;
+        /** The endpoint integration policy revision number in kibana */
         endpoint_policy_version: number;
         version: number;
       };
     };
-    configuration: {
+    configuration?: {
+      /**
+       * Shows whether the endpoint is set up to be isolated. (e.g. a user has isolated a host,
+       * and the endpoint successfully received that action and applied the setting)
+       */
       isolation?: boolean;
     };
-    state: {
+    state?: {
+      /**
+       * Shows what the current state of the host is. This could differ from `Endpoint.configuration.isolation`
+       * in some cases, but normally they will match
+       */
       isolation?: boolean;
     };
   };
@@ -1105,3 +1114,15 @@ export interface GetExceptionSummaryResponse {
   macos: number;
   linux: number;
 }
+
+/**
+ * Supported React-Router state for the Generic List page
+ */
+export interface ListPageRouteState {
+  /** Where the user should be redirected to when the `Back` button is clicked */
+  onBackButtonNavigateTo: Parameters<ApplicationStart['navigateToApp']>;
+  /** The URL for the `Back` button */
+  backButtonUrl?: string;
+  /** The label for the button */
+  backButtonLabel?: string;
+}
diff --git a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
index 8d66370fea4d3..94a2e7f236beb 100644
--- a/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
+++ b/x-pack/plugins/security_solution/common/endpoint/types/trusted_apps.ts
@@ -6,7 +6,6 @@
  */
 
 import { TypeOf } from '@kbn/config-schema';
-import { ApplicationStart } from 'kibana/public';
 
 import {
   DeleteTrustedAppsRequestSchema,
@@ -133,15 +132,3 @@ export type TrustedApp = NewTrustedApp & {
   updated_at: string;
   updated_by: string;
 };
-
-/**
- * Supported React-Router state for the Trusted Apps List page
- */
-export interface TrustedAppsListPageRouteState {
-  /** Where the user should be redirected to when the `Back` button is clicked */
-  onBackButtonNavigateTo: Parameters<ApplicationStart['navigateToApp']>;
-  /** The URL for the `Back` button */
-  backButtonUrl?: string;
-  /** The label for the button */
-  backButtonLabel?: string;
-}
diff --git a/x-pack/plugins/security_solution/common/experimental_features.ts b/x-pack/plugins/security_solution/common/experimental_features.ts
index 02006fdb29d47..b20b1501eecc5 100644
--- a/x-pack/plugins/security_solution/common/experimental_features.ts
+++ b/x-pack/plugins/security_solution/common/experimental_features.ts
@@ -14,7 +14,6 @@ export type ExperimentalFeatures = typeof allowedExperimentalValues;
 const allowedExperimentalValues = Object.freeze({
   trustedAppsByPolicyEnabled: false,
   metricsEntitiesEnabled: false,
-  hostIsolationEnabled: false,
   ruleRegistryEnabled: false,
 });
 
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 e27e9b5173fd5..4fcfbdac3c1b4 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
@@ -70,7 +70,7 @@ export interface PaginationInputPaginated {
   querySize: number;
 }
 
-export type DocValueFields = estypes.DocValueField;
+export type DocValueFields = estypes.SearchDocValueField;
 
 export interface Explanation {
   value: number;
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 34b32115a089d..e8578b4c07063 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
@@ -25,5 +25,5 @@ export interface HostDetailsRequestOptions extends Partial<RequestOptionsPaginat
 }
 
 export interface AggregationRequest {
-  [aggField: string]: estypes.AggregationContainer;
+  [aggField: string]: estypes.AggregationsAggregationContainer;
 }
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 936d9c360afb0..956b785079d8d 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
@@ -83,7 +83,7 @@ export interface RequestBasicOptions extends IEsSearchRequest {
   timerange: TimerangeInput;
   filterQuery: ESQuery | string | undefined;
   defaultIndex: string[];
-  docValueFields?: estypes.DocValueField[];
+  docValueFields?: estypes.SearchDocValueField[];
   factoryQueryType?: FactoryQueryTypes;
 }
 
diff --git a/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts b/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts
index 996df2a8fe60a..9e55067ce4ed4 100644
--- a/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/cases/connectors.spec.ts
@@ -40,6 +40,8 @@ describe('Cases connectors', () => {
       { source: 'comments', target: 'comments', action_type: 'append' },
     ],
     version: 'WzEwNCwxXQ==',
+    id: '123',
+    owner: 'securitySolution',
   };
   beforeEach(() => {
     cleanKibana();
@@ -53,16 +55,18 @@ describe('Cases connectors', () => {
     cy.intercept('GET', '/api/cases/configure', (req) => {
       req.reply((res) => {
         const resBody =
-          res.body.version != null
-            ? {
-                ...res.body,
-                error: null,
-                mappings: [
-                  { source: 'title', target: 'short_description', action_type: 'overwrite' },
-                  { source: 'description', target: 'description', action_type: 'overwrite' },
-                  { source: 'comments', target: 'comments', action_type: 'append' },
-                ],
-              }
+          res.body.length > 0 && res.body[0].version != null
+            ? [
+                {
+                  ...res.body[0],
+                  error: null,
+                  mappings: [
+                    { source: 'title', target: 'short_description', action_type: 'overwrite' },
+                    { source: 'description', target: 'description', action_type: 'overwrite' },
+                    { source: 'comments', target: 'comments', action_type: 'append' },
+                  ],
+                },
+              ]
             : res.body;
         res.send(200, resBody);
       });
diff --git a/x-pack/plugins/security_solution/cypress/integration/cases/privileges.spec.ts b/x-pack/plugins/security_solution/cypress/integration/cases/privileges.spec.ts
new file mode 100644
index 0000000000000..4d6c60e93ee20
--- /dev/null
+++ b/x-pack/plugins/security_solution/cypress/integration/cases/privileges.spec.ts
@@ -0,0 +1,234 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { TestCaseWithoutTimeline } from '../../objects/case';
+import { ALL_CASES_NAME } from '../../screens/all_cases';
+
+import { goToCreateNewCase } from '../../tasks/all_cases';
+import { cleanKibana, deleteCases } from '../../tasks/common';
+
+import {
+  backToCases,
+  createCase,
+  fillCasesMandatoryfields,
+  filterStatusOpen,
+} from '../../tasks/create_new_case';
+import {
+  constructUrlWithUser,
+  getEnvAuth,
+  loginWithUserAndWaitForPageWithoutDateRange,
+} from '../../tasks/login';
+
+import { CASES_URL } from '../../urls/navigation';
+
+interface User {
+  username: string;
+  password: string;
+  description?: string;
+  roles: string[];
+}
+
+interface UserInfo {
+  username: string;
+  full_name: string;
+  email: string;
+}
+
+interface FeaturesPrivileges {
+  [featureId: string]: string[];
+}
+
+interface ElasticsearchIndices {
+  names: string[];
+  privileges: string[];
+}
+
+interface ElasticSearchPrivilege {
+  cluster?: string[];
+  indices?: ElasticsearchIndices[];
+}
+
+interface KibanaPrivilege {
+  spaces: string[];
+  base?: string[];
+  feature?: FeaturesPrivileges;
+}
+
+interface Role {
+  name: string;
+  privileges: {
+    elasticsearch?: ElasticSearchPrivilege;
+    kibana?: KibanaPrivilege[];
+  };
+}
+
+const secAll: Role = {
+  name: 'sec_all_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secAllUser: User = {
+  username: 'sec_all_user',
+  password: 'password',
+  roles: [secAll.name],
+};
+
+const secReadCasesAll: Role = {
+  name: 'sec_read_cases_all_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['minimal_read', 'cases_all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secReadCasesAllUser: User = {
+  username: 'sec_read_cases_all_user',
+  password: 'password',
+  roles: [secReadCasesAll.name],
+};
+
+const usersToCreate = [secAllUser, secReadCasesAllUser];
+const rolesToCreate = [secAll, secReadCasesAll];
+
+const getUserInfo = (user: User): UserInfo => ({
+  username: user.username,
+  full_name: user.username.replace('_', ' '),
+  email: `${user.username}@elastic.co`,
+});
+
+const createUsersAndRoles = (users: User[], roles: Role[]) => {
+  const envUser = getEnvAuth();
+  for (const role of roles) {
+    cy.log(`Creating role: ${JSON.stringify(role)}`);
+    cy.request({
+      body: role.privileges,
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'PUT',
+      url: constructUrlWithUser(envUser, `/api/security/role/${role.name}`),
+    })
+      .its('status')
+      .should('eql', 204);
+  }
+
+  for (const user of users) {
+    const userInfo = getUserInfo(user);
+    cy.log(`Creating user: ${JSON.stringify(user)}`);
+    cy.request({
+      body: {
+        username: user.username,
+        password: user.password,
+        roles: user.roles,
+        full_name: userInfo.full_name,
+        email: userInfo.email,
+      },
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'POST',
+      url: constructUrlWithUser(envUser, `/internal/security/users/${user.username}`),
+    })
+      .its('status')
+      .should('eql', 200);
+  }
+};
+
+const deleteUsersAndRoles = (users: User[], roles: Role[]) => {
+  const envUser = getEnvAuth();
+  for (const user of users) {
+    cy.log(`Deleting user: ${JSON.stringify(user)}`);
+    cy.request({
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'DELETE',
+      url: constructUrlWithUser(envUser, `/internal/security/users/${user.username}`),
+      failOnStatusCode: false,
+    })
+      .its('status')
+      .should('oneOf', [204, 404]);
+  }
+
+  for (const role of roles) {
+    cy.log(`Deleting role: ${JSON.stringify(role)}`);
+    cy.request({
+      headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+      method: 'DELETE',
+      url: constructUrlWithUser(envUser, `/api/security/role/${role.name}`),
+      failOnStatusCode: false,
+    })
+      .its('status')
+      .should('oneOf', [204, 404]);
+  }
+};
+
+const testCase: TestCaseWithoutTimeline = {
+  name: 'This is the title of the case',
+  tags: ['Tag1', 'Tag2'],
+  description: 'This is the case description',
+  reporter: 'elastic',
+  owner: 'securitySolution',
+};
+
+describe('Cases privileges', () => {
+  before(() => {
+    cleanKibana();
+    createUsersAndRoles(usersToCreate, rolesToCreate);
+  });
+
+  after(() => {
+    deleteUsersAndRoles(usersToCreate, rolesToCreate);
+    cleanKibana();
+  });
+
+  beforeEach(() => {
+    deleteCases();
+  });
+
+  for (const user of [secAllUser, secReadCasesAllUser]) {
+    it(`User ${user.username} with role(s) ${user.roles.join()} can create a case`, () => {
+      loginWithUserAndWaitForPageWithoutDateRange(CASES_URL, user);
+      goToCreateNewCase();
+      fillCasesMandatoryfields(testCase);
+      createCase();
+      backToCases();
+      filterStatusOpen();
+
+      cy.get(ALL_CASES_NAME).should('have.text', testCase.name);
+    });
+  }
+});
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 2f98cb15287d6..8210c7c6d8b20 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
@@ -80,7 +80,7 @@ import {
   waitForAlertsPanelToBeLoaded,
 } from '../../tasks/alerts';
 import {
-  changeRowsPerPageTo300,
+  changeRowsPerPageTo100,
   deleteFirstRule,
   deleteSelectedRules,
   editFirstRule,
@@ -159,7 +159,7 @@ describe('Custom detection rules creation', () => {
 
     cy.get(CUSTOM_RULES_BTN).should('have.text', 'Custom rules (1)');
 
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(RULES_TABLE).then(($table) => {
       cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/event_correlation_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/event_correlation_rule.spec.ts
index 0dbecde3d4d3f..b38796cca373d 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/event_correlation_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/event_correlation_rule.spec.ts
@@ -56,7 +56,7 @@ import {
   waitForAlertsPanelToBeLoaded,
 } from '../../tasks/alerts';
 import {
-  changeRowsPerPageTo300,
+  changeRowsPerPageTo100,
   filterByCustomRules,
   goToCreateNewRule,
   goToRuleDetails,
@@ -113,7 +113,7 @@ describe('Detection rules, EQL', () => {
 
     cy.get(CUSTOM_RULES_BTN).should('have.text', 'Custom rules (1)');
 
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(RULES_TABLE).then(($table) => {
       cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
@@ -208,7 +208,7 @@ describe('Detection rules, sequence EQL', () => {
 
     cy.get(CUSTOM_RULES_BTN).should('have.text', 'Custom rules (1)');
 
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(RULES_TABLE).then(($table) => {
       cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
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 d0f2cd9f45743..bc8cf0137fa83 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
@@ -78,7 +78,7 @@ import {
   scrollJsonViewToBottom,
 } from '../../tasks/alerts_details';
 import {
-  changeRowsPerPageTo300,
+  changeRowsPerPageTo100,
   duplicateFirstRule,
   duplicateSelectedRules,
   duplicateRuleFromMenu,
@@ -424,7 +424,7 @@ describe('indicator match', () => {
 
         cy.get(CUSTOM_RULES_BTN).should('have.text', 'Custom rules (1)');
 
-        changeRowsPerPageTo300();
+        changeRowsPerPageTo100();
 
         cy.get(RULES_TABLE).then(($table) => {
           cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/machine_learning_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/machine_learning_rule.spec.ts
index 0fe1326947a12..65dde40bbd76b 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/machine_learning_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/machine_learning_rule.spec.ts
@@ -46,7 +46,7 @@ import {
   waitForAlertsPanelToBeLoaded,
 } from '../../tasks/alerts';
 import {
-  changeRowsPerPageTo300,
+  changeRowsPerPageTo100,
   filterByCustomRules,
   goToCreateNewRule,
   goToRuleDetails,
@@ -90,7 +90,7 @@ describe('Detection rules, machine learning', () => {
 
     cy.get(CUSTOM_RULES_BTN).should('have.text', 'Custom rules (1)');
 
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(RULES_TABLE).then(($table) => {
       cy.wrap($table.find(RULES_ROW).length).should('eql', expectedNumberOfRules);
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/override.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/override.spec.ts
index eb10f32bb8989..f9f1ca14c8164 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/override.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/override.spec.ts
@@ -68,7 +68,7 @@ import {
   waitForAlertsPanelToBeLoaded,
 } from '../../tasks/alerts';
 import {
-  changeRowsPerPageTo300,
+  changeRowsPerPageTo100,
   filterByCustomRules,
   goToCreateNewRule,
   goToRuleDetails,
@@ -121,7 +121,7 @@ describe('Detection rules, override', () => {
 
     cy.get(CUSTOM_RULES_BTN).should('have.text', 'Custom rules (1)');
 
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     const expectedNumberOfRules = 1;
     cy.get(RULES_TABLE).then(($table) => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/prebuilt_rules.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/prebuilt_rules.spec.ts
index fb0a01bd1c7d3..74e1d082ae410 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/prebuilt_rules.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/prebuilt_rules.spec.ts
@@ -8,23 +8,29 @@
 import {
   COLLAPSED_ACTION_BTN,
   ELASTIC_RULES_BTN,
+  pageSelector,
   RELOAD_PREBUILT_RULES_BTN,
-  RULES_ROW,
-  RULES_TABLE,
+  RULES_EMPTY_PROMPT,
+  RULE_SWITCH,
   SHOWING_RULES_TEXT,
 } from '../../screens/alerts_detection_rules';
 
 import { goToManageAlertsDetectionRules, waitForAlertsIndexToBeCreated } from '../../tasks/alerts';
 import {
-  changeRowsPerPageTo300,
+  changeRowsPerPageTo100,
   deleteFirstRule,
   deleteSelectedRules,
   loadPrebuiltDetectionRules,
-  goToNextPage,
   reloadDeletedRules,
   selectNumberOfRules,
   waitForRulesTableToBeLoaded,
   waitForPrebuiltDetectionRulesToBeLoaded,
+  selectAllRules,
+  confirmRulesDelete,
+  activateSelectedRules,
+  waitForRuleToChangeStatus,
+  deactivateSelectedRules,
+  changeRowsPerPageTo,
 } from '../../tasks/alerts_detection_rules';
 import { loginAndWaitForPageWithoutDateRange } from '../../tasks/login';
 
@@ -39,7 +45,9 @@ describe('Alerts rules, prebuilt rules', () => {
   });
 
   it('Loads prebuilt rules', () => {
+    const rowsPerPage = 100;
     const expectedNumberOfRules = totalNumberOfPrebuiltRules;
+    const expectedNumberOfPages = Math.ceil(totalNumberOfPrebuiltRules / rowsPerPage);
     const expectedElasticRulesBtnText = `Elastic rules (${expectedNumberOfRules})`;
 
     loginAndWaitForPageWithoutDateRange(DETECTIONS_URL);
@@ -51,23 +59,14 @@ describe('Alerts rules, prebuilt rules', () => {
 
     cy.get(ELASTIC_RULES_BTN).should('have.text', expectedElasticRulesBtnText);
 
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo(rowsPerPage);
 
     cy.get(SHOWING_RULES_TEXT).should('have.text', `Showing ${expectedNumberOfRules} rules`);
-    cy.get(RULES_TABLE).then(($table1) => {
-      const firstScreenRules = $table1.find(RULES_ROW).length;
-      goToNextPage();
-      cy.get(RULES_TABLE).then(($table2) => {
-        const secondScreenRules = $table2.find(RULES_ROW).length;
-        const totalNumberOfRules = firstScreenRules + secondScreenRules;
-
-        expect(totalNumberOfRules).to.eql(expectedNumberOfRules);
-      });
-    });
+    cy.get(pageSelector(expectedNumberOfPages)).should('exist');
   });
 });
 
-describe('Deleting prebuilt rules', () => {
+describe('Actions with prebuilt rules', () => {
   beforeEach(() => {
     const expectedNumberOfRules = totalNumberOfPrebuiltRules;
     const expectedElasticRulesBtnText = `Elastic rules (${expectedNumberOfRules})`;
@@ -81,11 +80,30 @@ describe('Deleting prebuilt rules', () => {
     waitForPrebuiltDetectionRulesToBeLoaded();
 
     cy.get(ELASTIC_RULES_BTN).should('have.text', expectedElasticRulesBtnText);
+  });
+
+  it('Allows to activate/deactivate all rules at once', () => {
+    selectAllRules();
+    activateSelectedRules();
+    waitForRuleToChangeStatus();
+    cy.get(RULE_SWITCH).should('have.attr', 'aria-checked', 'true');
 
-    changeRowsPerPageTo300();
+    selectAllRules();
+    deactivateSelectedRules();
+    waitForRuleToChangeStatus();
+    cy.get(RULE_SWITCH).should('have.attr', 'aria-checked', 'false');
+  });
+
+  it('Allows to delete all rules at once', () => {
+    selectAllRules();
+    deleteSelectedRules();
+    confirmRulesDelete();
+    cy.get(RULES_EMPTY_PROMPT).should('be.visible');
   });
 
   it('Does not allow to delete one rule when more than one is selected', () => {
+    changeRowsPerPageTo100();
+
     const numberOfRulesToBeSelected = 2;
     selectNumberOfRules(numberOfRulesToBeSelected);
 
@@ -95,12 +113,14 @@ describe('Deleting prebuilt rules', () => {
   });
 
   it('Deletes and recovers one rule', () => {
+    changeRowsPerPageTo100();
+
     const expectedNumberOfRulesAfterDeletion = totalNumberOfPrebuiltRules - 1;
     const expectedNumberOfRulesAfterRecovering = totalNumberOfPrebuiltRules;
 
     deleteFirstRule();
     cy.reload();
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(ELASTIC_RULES_BTN).should(
       'have.text',
@@ -114,7 +134,7 @@ describe('Deleting prebuilt rules', () => {
     cy.get(RELOAD_PREBUILT_RULES_BTN).should('not.exist');
 
     cy.reload();
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(ELASTIC_RULES_BTN).should(
       'have.text',
@@ -123,6 +143,8 @@ describe('Deleting prebuilt rules', () => {
   });
 
   it('Deletes and recovers more than one rule', () => {
+    changeRowsPerPageTo100();
+
     const numberOfRulesToBeSelected = 2;
     const expectedNumberOfRulesAfterDeletion = totalNumberOfPrebuiltRules - 2;
     const expectedNumberOfRulesAfterRecovering = totalNumberOfPrebuiltRules;
@@ -130,7 +152,7 @@ describe('Deleting prebuilt rules', () => {
     selectNumberOfRules(numberOfRulesToBeSelected);
     deleteSelectedRules();
     cy.reload();
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(RELOAD_PREBUILT_RULES_BTN).should('exist');
     cy.get(RELOAD_PREBUILT_RULES_BTN).should(
@@ -147,7 +169,7 @@ describe('Deleting prebuilt rules', () => {
     cy.get(RELOAD_PREBUILT_RULES_BTN).should('not.exist');
 
     cy.reload();
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     cy.get(ELASTIC_RULES_BTN).should(
       'have.text',
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/sorting.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/sorting.spec.ts
index 0cf3caa09814c..f1ee0d39f545f 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/sorting.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/sorting.spec.ts
@@ -31,7 +31,7 @@ import {
   resetAllRulesIdleModalTimeout,
   sortByActivatedRules,
   waitForRulesTableToBeLoaded,
-  waitForRuleToBeActivated,
+  waitForRuleToChangeStatus,
 } from '../../tasks/alerts_detection_rules';
 import { loginAndWaitForPageWithoutDateRange } from '../../tasks/login';
 import { DEFAULT_RULE_REFRESH_INTERVAL_VALUE } from '../../../common/constants';
@@ -62,13 +62,13 @@ describe('Alerts detection rules', () => {
       .invoke('text')
       .then((secondInitialRuleName) => {
         activateRule(SECOND_RULE);
-        waitForRuleToBeActivated();
+        waitForRuleToChangeStatus();
         cy.get(RULE_NAME)
           .eq(FOURTH_RULE)
           .invoke('text')
           .then((fourthInitialRuleName) => {
             activateRule(FOURTH_RULE);
-            waitForRuleToBeActivated();
+            waitForRuleToChangeStatus();
             sortByActivatedRules();
             cy.get(RULE_NAME)
               .eq(FIRST_RULE)
diff --git a/x-pack/plugins/security_solution/cypress/integration/detection_rules/threshold_rule.spec.ts b/x-pack/plugins/security_solution/cypress/integration/detection_rules/threshold_rule.spec.ts
index 7c09b311807be..0f4095372f92a 100644
--- a/x-pack/plugins/security_solution/cypress/integration/detection_rules/threshold_rule.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/detection_rules/threshold_rule.spec.ts
@@ -59,7 +59,7 @@ import {
   waitForAlertsPanelToBeLoaded,
 } from '../../tasks/alerts';
 import {
-  changeRowsPerPageTo300,
+  changeRowsPerPageTo100,
   filterByCustomRules,
   goToCreateNewRule,
   goToRuleDetails,
@@ -113,7 +113,7 @@ describe('Detection rules, threshold', () => {
 
     cy.get(CUSTOM_RULES_BTN).should('have.text', 'Custom rules (1)');
 
-    changeRowsPerPageTo300();
+    changeRowsPerPageTo100();
 
     const expectedNumberOfRules = 1;
     cy.get(RULES_TABLE).then(($table) => {
diff --git a/x-pack/plugins/security_solution/cypress/integration/timelines/flyout_button.spec.ts b/x-pack/plugins/security_solution/cypress/integration/timelines/flyout_button.spec.ts
index 1fbd9990a76bd..c7ec17d027e80 100644
--- a/x-pack/plugins/security_solution/cypress/integration/timelines/flyout_button.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/timelines/flyout_button.spec.ts
@@ -61,7 +61,7 @@ describe('timeline flyout button', () => {
 
   it('the `(+)` button popover menu owns focus', () => {
     cy.get(TIMELINE_SETTINGS_ICON).filter(':visible').click({ force: true });
-    cy.get(CREATE_NEW_TIMELINE).closest('.euiPanel').should('have.focus');
+    cy.get(CREATE_NEW_TIMELINE).should('have.focus');
     cy.get('body').type('{esc}');
     cy.get(CREATE_NEW_TIMELINE).should('not.be.visible');
   });
diff --git a/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts b/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
index 016197f0c7470..48dc6faf8524e 100644
--- a/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
+++ b/x-pack/plugins/security_solution/cypress/integration/urls/state.spec.ts
@@ -74,6 +74,7 @@ describe('url state', () => {
     waitForIpsTableToBeLoaded();
     setEndDate(ABSOLUTE_DATE.newEndTimeTyped);
     updateDates();
+    cy.wait(300);
 
     let startDate: string;
     let endDate: string;
diff --git a/x-pack/plugins/security_solution/cypress/objects/case.ts b/x-pack/plugins/security_solution/cypress/objects/case.ts
index a0135431c6543..847236688dee7 100644
--- a/x-pack/plugins/security_solution/cypress/objects/case.ts
+++ b/x-pack/plugins/security_solution/cypress/objects/case.ts
@@ -7,12 +7,16 @@
 
 import { CompleteTimeline, timeline } from './timeline';
 
-export interface TestCase {
+export interface TestCase extends TestCaseWithoutTimeline {
+  timeline: CompleteTimeline;
+}
+
+export interface TestCaseWithoutTimeline {
   name: string;
   tags: string[];
   description: string;
-  timeline: CompleteTimeline;
   reporter: string;
+  owner: string;
 }
 
 export interface Connector {
@@ -45,6 +49,7 @@ export const case1: TestCase = {
   description: 'This is the case description',
   timeline,
   reporter: 'elastic',
+  owner: 'securitySolution',
 };
 
 export const serviceNowConnector: Connector = {
diff --git a/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
index 70dde344c88b6..ba071184d98eb 100644
--- a/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
+++ b/x-pack/plugins/security_solution/cypress/screens/alerts_detection_rules.ts
@@ -25,6 +25,12 @@ export const DUPLICATE_RULE_MENU_PANEL_BTN = '[data-test-subj="rules-details-dup
 
 export const REFRESH_BTN = '[data-test-subj="refreshRulesAction"] button';
 
+export const ACTIVATE_RULE_BULK_BTN = '[data-test-subj="activateRuleBulk"]';
+
+export const DEACTIVATE_RULE_BULK_BTN = '[data-test-subj="deactivateRuleBulk"]';
+
+export const EXPORT_RULE_BULK_BTN = '[data-test-subj="exportRuleBulk"]';
+
 export const DELETE_RULE_BULK_BTN = '[data-test-subj="deleteRuleBulk"]';
 
 export const DUPLICATE_RULE_BULK_BTN = '[data-test-subj="duplicateRuleBulk"]';
@@ -87,3 +93,11 @@ export const pageSelector = (pageNumber: number) =>
   `[data-test-subj="pagination-button-${pageNumber - 1}"]`;
 
 export const NEXT_BTN = '[data-test-subj="pagination-button-next"]';
+
+export const SELECT_ALL_RULES_BTN = '[data-test-subj="selectAllRules"]';
+
+export const RULES_EMPTY_PROMPT = '[data-test-subj="rulesEmptyPrompt"]';
+
+export const RULES_DELETE_CONFIRMATION_MODAL = '[data-test-subj="allRulesDeleteConfirmationModal"]';
+
+export const MODAL_CONFIRMATION_BTN = '[data-test-subj="confirmModalConfirmButton"]';
diff --git a/x-pack/plugins/security_solution/cypress/support/commands.js b/x-pack/plugins/security_solution/cypress/support/commands.js
index d9de00be0ea9e..90eb9a38d7509 100644
--- a/x-pack/plugins/security_solution/cypress/support/commands.js
+++ b/x-pack/plugins/security_solution/cypress/support/commands.js
@@ -31,62 +31,17 @@
 // -- This is will overwrite an existing command --
 // Cypress.Commands.overwrite("visit", (originalFn, url, options) => { ... })
 
-import { findIndex } from 'lodash/fp';
-
-const getFindRequestConfig = (searchStrategyName, factoryQueryType) => {
-  if (!factoryQueryType) {
-    return {
-      options: { strategy: searchStrategyName },
-    };
-  }
-
-  return {
-    options: { strategy: searchStrategyName },
-    request: { factoryQueryType },
-  };
-};
-
 Cypress.Commands.add(
   'stubSearchStrategyApi',
   function (stubObject, factoryQueryType, searchStrategyName = 'securitySolutionSearchStrategy') {
     cy.intercept('POST', '/internal/bsearch', (req) => {
-      const findRequestConfig = getFindRequestConfig(searchStrategyName, factoryQueryType);
-      const requestIndex = findIndex(findRequestConfig, req.body.batch);
-
-      if (requestIndex > -1) {
-        return req.reply((res) => {
-          const responseObjectsArray = res.body.split('\n').map((responseString) => {
-            try {
-              return JSON.parse(responseString);
-            } catch {
-              return responseString;
-            }
-          });
-          const responseIndex = findIndex({ id: requestIndex }, responseObjectsArray);
-
-          const stubbedResponseObjectsArray = [...responseObjectsArray];
-          stubbedResponseObjectsArray[responseIndex] = {
-            ...stubbedResponseObjectsArray[responseIndex],
-            result: {
-              ...stubbedResponseObjectsArray[responseIndex].result,
-              ...stubObject,
-            },
-          };
-
-          const stubbedResponse = stubbedResponseObjectsArray
-            .map((object) => {
-              try {
-                return JSON.stringify(object);
-              } catch {
-                return object;
-              }
-            })
-            .join('\n');
-
-          res.send(stubbedResponse);
-        });
+      if (searchStrategyName === 'securitySolutionIndexFields') {
+        req.reply(stubObject.rawResponse);
+      } else if (factoryQueryType === 'overviewHost') {
+        req.reply(stubObject.overviewHost);
+      } else if (factoryQueryType === 'overviewNetwork') {
+        req.reply(stubObject.overviewNetwork);
       }
-
       req.reply();
     });
   }
diff --git a/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
index cc14c54a4d84e..78298c9881077 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/alerts_detection_rules.ts
@@ -36,6 +36,12 @@ import {
   DUPLICATE_RULE_MENU_PANEL_BTN,
   DUPLICATE_RULE_BULK_BTN,
   RULES_ROW,
+  SELECT_ALL_RULES_BTN,
+  MODAL_CONFIRMATION_BTN,
+  RULES_DELETE_CONFIRMATION_MODAL,
+  ACTIVATE_RULE_BULK_BTN,
+  DEACTIVATE_RULE_BULK_BTN,
+  EXPORT_RULE_BULK_BTN,
 } from '../screens/alerts_detection_rules';
 import { ALL_ACTIONS, DELETE_RULE } from '../screens/rule_details';
 
@@ -57,11 +63,6 @@ export const duplicateFirstRule = () => {
   cy.get(DUPLICATE_RULE_ACTION_BTN).click();
 };
 
-export const duplicateSelectedRules = () => {
-  cy.get(BULK_ACTIONS_BTN).click({ force: true });
-  cy.get(DUPLICATE_RULE_BULK_BTN).click();
-};
-
 /**
  * Duplicates the rule from the menu and does additional
  * pipes and checking that the elements are present on the
@@ -106,6 +107,26 @@ export const deleteSelectedRules = () => {
   cy.get(DELETE_RULE_BULK_BTN).click();
 };
 
+export const duplicateSelectedRules = () => {
+  cy.get(BULK_ACTIONS_BTN).click({ force: true });
+  cy.get(DUPLICATE_RULE_BULK_BTN).click();
+};
+
+export const activateSelectedRules = () => {
+  cy.get(BULK_ACTIONS_BTN).click({ force: true });
+  cy.get(ACTIVATE_RULE_BULK_BTN).click();
+};
+
+export const deactivateSelectedRules = () => {
+  cy.get(BULK_ACTIONS_BTN).click({ force: true });
+  cy.get(DEACTIVATE_RULE_BULK_BTN).click();
+};
+
+export const exportSelectedRules = () => {
+  cy.get(BULK_ACTIONS_BTN).click({ force: true });
+  cy.get(EXPORT_RULE_BULK_BTN).click();
+};
+
 export const exportFirstRule = () => {
   cy.get(COLLAPSED_ACTION_BTN).first().click({ force: true });
   cy.get(EXPORT_ACTION_BTN).click();
@@ -149,6 +170,17 @@ export const selectNumberOfRules = (numberOfRules: number) => {
   }
 };
 
+export const selectAllRules = () => {
+  cy.get(SELECT_ALL_RULES_BTN).contains('Select all').click();
+  cy.get(SELECT_ALL_RULES_BTN).contains('Clear');
+};
+
+export const confirmRulesDelete = () => {
+  cy.get(RULES_DELETE_CONFIRMATION_MODAL).should('be.visible');
+  cy.get(MODAL_CONFIRMATION_BTN).click();
+  cy.get(RULES_DELETE_CONFIRMATION_MODAL).should('not.exist');
+};
+
 export const sortByActivatedRules = () => {
   cy.get(SORT_RULES_BTN).contains('Activated').click({ force: true });
   waitForRulesTableToBeRefreshed();
@@ -174,9 +206,10 @@ export const waitForRulesTableToBeAutoRefreshed = () => {
 export const waitForPrebuiltDetectionRulesToBeLoaded = () => {
   cy.get(LOAD_PREBUILT_RULES_BTN).should('not.exist');
   cy.get(RULES_TABLE).should('exist');
+  cy.get(RULES_TABLE_REFRESH_INDICATOR).should('not.exist');
 };
 
-export const waitForRuleToBeActivated = () => {
+export const waitForRuleToChangeStatus = () => {
   cy.get(RULE_SWITCH_LOADER).should('exist');
   cy.get(RULE_SWITCH_LOADER).should('not.exist');
 };
@@ -215,8 +248,8 @@ export const changeRowsPerPageTo = (rowsCount: number) => {
   waitForRulesTableToBeRefreshed();
 };
 
-export const changeRowsPerPageTo300 = () => {
-  changeRowsPerPageTo(300);
+export const changeRowsPerPageTo100 = () => {
+  changeRowsPerPageTo(100);
 };
 
 export const goToPage = (pageNumber: number) => {
diff --git a/x-pack/plugins/security_solution/cypress/tasks/api_calls/cases.ts b/x-pack/plugins/security_solution/cypress/tasks/api_calls/cases.ts
index f73b8e47066d2..798cd184d6012 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/api_calls/cases.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/api_calls/cases.ts
@@ -24,6 +24,7 @@ export const createCase = (newCase: TestCase) =>
       settings: {
         syncAlerts: true,
       },
+      owner: newCase.owner,
     },
     headers: { 'kbn-xsrf': 'cypress-creds' },
   });
diff --git a/x-pack/plugins/security_solution/cypress/tasks/common.ts b/x-pack/plugins/security_solution/cypress/tasks/common.ts
index 468b0e22838dd..d726d5daa5cbc 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/common.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/common.ts
@@ -106,19 +106,7 @@ export const cleanKibana = () => {
     },
   });
 
-  cy.request('POST', `${kibanaIndexUrl}/_delete_by_query?conflicts=proceed`, {
-    query: {
-      bool: {
-        filter: [
-          {
-            match: {
-              type: 'cases',
-            },
-          },
-        ],
-      },
-    },
-  });
+  deleteCases();
 
   cy.request('POST', `${kibanaIndexUrl}/_delete_by_query?conflicts=proceed`, {
     query: {
@@ -149,4 +137,21 @@ export const cleanKibana = () => {
   esArchiverResetKibana();
 };
 
+export const deleteCases = () => {
+  const kibanaIndexUrl = `${Cypress.env('ELASTICSEARCH_URL')}/.kibana_\*`;
+  cy.request('POST', `${kibanaIndexUrl}/_delete_by_query?conflicts=proceed`, {
+    query: {
+      bool: {
+        filter: [
+          {
+            match: {
+              type: 'cases',
+            },
+          },
+        ],
+      },
+    },
+  });
+};
+
 export const scrollToBottom = () => cy.scrollTo('bottom');
diff --git a/x-pack/plugins/security_solution/cypress/tasks/create_new_case.ts b/x-pack/plugins/security_solution/cypress/tasks/create_new_case.ts
index ed9174e2a74bb..6f1868d047c06 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/create_new_case.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/create_new_case.ts
@@ -10,6 +10,7 @@ import {
   JiraConnectorOptions,
   ServiceNowconnectorOptions,
   TestCase,
+  TestCaseWithoutTimeline,
 } from '../objects/case';
 import { ALL_CASES_OPEN_CASES_COUNT, ALL_CASES_OPEN_FILTER } from '../screens/all_cases';
 
@@ -46,7 +47,7 @@ export const filterStatusOpen = () => {
   cy.get(ALL_CASES_OPEN_FILTER).click();
 };
 
-export const fillCasesMandatoryfields = (newCase: TestCase) => {
+export const fillCasesMandatoryfields = (newCase: TestCaseWithoutTimeline) => {
   cy.get(TITLE_INPUT).type(newCase.name, { force: true });
   newCase.tags.forEach((tag) => {
     cy.get(TAGS_INPUT).type(`${tag}{enter}`, { force: true });
diff --git a/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts b/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts
index 2badeb6ffc10e..a0ee5bda82b01 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/es_archiver.ts
@@ -5,27 +5,30 @@
  * 2.0.
  */
 
+import Path from 'path';
+
+const ES_ARCHIVE_DIR = '../../test/security_solution_cypress/es_archives';
+const CONFIG_PATH = '../../test/functional/config.js';
+const ES_URL = Cypress.env('ELASTICSEARCH_URL');
+const KIBANA_URL = Cypress.config().baseUrl;
+
 export const esArchiverLoad = (folder: string) => {
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
-    `node ../../../scripts/es_archiver load ${folder} --dir ../../test/security_solution_cypress/es_archives --config ../../../test/functional/config.js --es-url ${Cypress.env(
-      'ELASTICSEARCH_URL'
-    )} --kibana-url ${Cypress.config().baseUrl}`
+    `node ../../../scripts/es_archiver load "${path}" --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"`
   );
 };
 
 export const esArchiverUnload = (folder: string) => {
+  const path = Path.join(ES_ARCHIVE_DIR, folder);
   cy.exec(
-    `node ../../../scripts/es_archiver unload ${folder} --dir ../../test/security_solution_cypress/es_archives --config ../../../test/functional/config.js --es-url ${Cypress.env(
-      'ELASTICSEARCH_URL'
-    )} --kibana-url ${Cypress.config().baseUrl}`
+    `node ../../../scripts/es_archiver unload "${path}" --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"`
   );
 };
 
 export const esArchiverResetKibana = () => {
   cy.exec(
-    `node ../../../scripts/es_archiver empty-kibana-index --config ../../../test/functional/config.js --es-url ${Cypress.env(
-      'ELASTICSEARCH_URL'
-    )} --kibana-url ${Cypress.config().baseUrl}`,
+    `node ../../../scripts/es_archiver empty-kibana-index --config "${CONFIG_PATH}" --es-url "${ES_URL}" --kibana-url "${KIBANA_URL}"`,
     { failOnNonZeroExit: false }
   );
 };
diff --git a/x-pack/plugins/security_solution/cypress/tasks/login.ts b/x-pack/plugins/security_solution/cypress/tasks/login.ts
index 0a0e578ffd382..be447993273fb 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/login.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/login.ts
@@ -67,6 +67,32 @@ export const getUrlWithRoute = (role: ROLES, route: string) => {
   return theUrl;
 };
 
+interface User {
+  username: string;
+  password: string;
+}
+
+/**
+ * Builds a URL with basic auth using the passed in user.
+ *
+ * @param user the user information to build the basic auth with
+ * @param route string route to visit
+ */
+export const constructUrlWithUser = (user: User, route: string) => {
+  const hostname = Cypress.env('hostname');
+  const username = user.username;
+  const password = user.password;
+  const protocol = Cypress.env('protocol');
+  const port = Cypress.env('configport');
+
+  const path = `${route.startsWith('/') ? '' : '/'}${route}`;
+  const strUrl = `${protocol}://${username}:${password}@${hostname}:${port}${path}`;
+  const builtUrl = new URL(strUrl);
+
+  cy.log(`origin: ${builtUrl.href}`);
+  return builtUrl.href;
+};
+
 export const getCurlScriptEnvVars = () => ({
   ELASTICSEARCH_URL: Cypress.env('ELASTICSEARCH_URL'),
   ELASTICSEARCH_USERNAME: Cypress.env('ELASTICSEARCH_USERNAME'),
@@ -102,6 +128,23 @@ export const deleteRoleAndUser = (role: ROLES) => {
   });
 };
 
+export const loginWithUser = (user: User) => {
+  cy.request({
+    body: {
+      providerType: 'basic',
+      providerName: 'basic',
+      currentURL: '/',
+      params: {
+        username: user.username,
+        password: user.password,
+      },
+    },
+    headers: { 'kbn-xsrf': 'cypress-creds-via-config' },
+    method: 'POST',
+    url: constructUrlWithUser(user, LOGIN_API_ENDPOINT),
+  });
+};
+
 export const loginWithRole = async (role: ROLES) => {
   postRoleAndUser(role);
   const theUrl = Url.format({
@@ -214,6 +257,28 @@ const loginViaConfig = () => {
   });
 };
 
+/**
+ * Get the configured auth details that were used to spawn cypress
+ *
+ * @returns the default Elasticsearch username and password for this environment
+ */
+export const getEnvAuth = (): User => {
+  if (credentialsProvidedByEnvironment()) {
+    return {
+      username: Cypress.env(ELASTICSEARCH_USERNAME),
+      password: Cypress.env(ELASTICSEARCH_PASSWORD),
+    };
+  } else {
+    let user: User = { username: '', password: '' };
+    cy.readFile(KIBANA_DEV_YML_PATH).then((devYml) => {
+      const config = yaml.safeLoad(devYml);
+      user = { username: config.elasticsearch.username, password: config.elasticsearch.password };
+    });
+
+    return user;
+  }
+};
+
 /**
  * Authenticates with Kibana, visits the specified `url`, and waits for the
  * Kibana global nav to be displayed before continuing
@@ -232,6 +297,12 @@ export const loginAndWaitForPageWithoutDateRange = (url: string, role?: ROLES) =
   cy.get('[data-test-subj="headerGlobalNav"]', { timeout: 120000 });
 };
 
+export const loginWithUserAndWaitForPageWithoutDateRange = (url: string, user: User) => {
+  loginWithUser(user);
+  cy.visit(constructUrlWithUser(user, url));
+  cy.get('[data-test-subj="headerGlobalNav"]', { timeout: 120000 });
+};
+
 export const loginAndWaitForTimeline = (timelineId: string, role?: ROLES) => {
   const route = `/app/security/timelines?timeline=(id:'${timelineId}',isOpen:!t)`;
 
diff --git a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
index b1e09c63dc91d..587e4ec45b8c7 100644
--- a/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
+++ b/x-pack/plugins/security_solution/cypress/tasks/timeline.ts
@@ -140,6 +140,7 @@ export const addFilter = (filter: TimelineFilter): Cypress.Chainable<JQuery<HTML
 
 export const addDataProvider = (filter: TimelineFilter): Cypress.Chainable<JQuery<HTMLElement>> => {
   cy.get(TIMELINE_ADD_FIELD_BUTTON).click();
+  cy.wait(300);
   cy.get(TIMELINE_DATA_PROVIDER_FIELD).type(`${filter.field}{downarrow}{enter}`);
   cy.get(TIMELINE_DATA_PROVIDER_OPERATOR).type(filter.operator);
   cy.get(COMBO_BOX).contains(filter.operator).click();
diff --git a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx
index 60fa0e4aafd8e..337c07fa93eab 100644
--- a/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/all_cases/index.tsx
@@ -73,6 +73,7 @@ export const AllCases = React.memo<AllCasesProps>(({ userCanCrud }) => {
       onClick: goToCreateCase,
     },
     userCanCrud,
+    owner: [APP_ID],
   });
 });
 
diff --git a/x-pack/plugins/security_solution/public/cases/components/callout/helpers.tsx b/x-pack/plugins/security_solution/public/cases/components/callout/helpers.tsx
index 2a7804579a57e..3409c5eb94245 100644
--- a/x-pack/plugins/security_solution/public/cases/components/callout/helpers.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/callout/helpers.tsx
@@ -13,8 +13,8 @@ import { ErrorMessage } from './types';
 
 export const savedObjectReadOnlyErrorMessage: ErrorMessage = {
   id: 'read-only-privileges-error',
-  title: i18n.READ_ONLY_SAVED_OBJECT_TITLE,
-  description: <>{i18n.READ_ONLY_SAVED_OBJECT_MSG}</>,
+  title: i18n.READ_ONLY_FEATURE_TITLE,
+  description: <>{i18n.READ_ONLY_FEATURE_MSG}</>,
   errorType: 'warning',
 };
 
diff --git a/x-pack/plugins/security_solution/public/cases/components/callout/translations.ts b/x-pack/plugins/security_solution/public/cases/components/callout/translations.ts
index 4a5f32684ccde..db4809126452f 100644
--- a/x-pack/plugins/security_solution/public/cases/components/callout/translations.ts
+++ b/x-pack/plugins/security_solution/public/cases/components/callout/translations.ts
@@ -7,15 +7,15 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const READ_ONLY_SAVED_OBJECT_TITLE = i18n.translate(
-  'xpack.securitySolution.cases.readOnlySavedObjectTitle',
+export const READ_ONLY_FEATURE_TITLE = i18n.translate(
+  'xpack.securitySolution.cases.readOnlyFeatureTitle',
   {
     defaultMessage: 'You cannot open new or update existing cases',
   }
 );
 
-export const READ_ONLY_SAVED_OBJECT_MSG = i18n.translate(
-  'xpack.securitySolution.cases.readOnlySavedObjectDescription',
+export const READ_ONLY_FEATURE_MSG = i18n.translate(
+  'xpack.securitySolution.cases.readOnlyFeatureDescription',
   {
     defaultMessage:
       'You only have privileges to view cases. If you need to open and update cases, contact your Kibana administrator.',
diff --git a/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx b/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx
index 0f9f64b32bdd0..1023bfc8b0206 100644
--- a/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/create/flyout.tsx
@@ -12,6 +12,7 @@ import { EuiFlyout, EuiFlyoutHeader, EuiTitle, EuiFlyoutBody } from '@elastic/eu
 import * as i18n from '../../translations';
 import { useKibana } from '../../../common/lib/kibana';
 import { Case } from '../../../../../cases/common';
+import { APP_ID } from '../../../../common/constants';
 
 export interface CreateCaseModalProps {
   afterCaseCreated?: (theCase: Case) => Promise<void>;
@@ -65,6 +66,7 @@ const CreateCaseFlyoutComponent: React.FC<CreateCaseModalProps> = ({
             onCancel: onCloseFlyout,
             onSuccess,
             withSteps: false,
+            owner: [APP_ID],
           })}
         </FormWrapper>
       </StyledEuiFlyoutBody>
diff --git a/x-pack/plugins/security_solution/public/cases/components/create/index.test.tsx b/x-pack/plugins/security_solution/public/cases/components/create/index.test.tsx
index 2d5faef8aa009..1a6015d1bbd45 100644
--- a/x-pack/plugins/security_solution/public/cases/components/create/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/create/index.test.tsx
@@ -17,6 +17,7 @@ import { Create } from '.';
 import { useKibana } from '../../../common/lib/kibana';
 import { Case } from '../../../../../cases/public/containers/types';
 import { basicCase } from '../../../../../cases/public/containers/mock';
+import { APP_ID } from '../../../../common/constants';
 
 jest.mock('../use_insert_timeline');
 jest.mock('../../../common/lib/kibana');
@@ -47,6 +48,7 @@ describe('Create case', () => {
     );
 
     expect(mockCreateCase).toHaveBeenCalled();
+    expect(mockCreateCase.mock.calls[0][0].owner).toEqual([APP_ID]);
   });
 
   it('should redirect to all cases on cancel click', async () => {
diff --git a/x-pack/plugins/security_solution/public/cases/components/create/index.tsx b/x-pack/plugins/security_solution/public/cases/components/create/index.tsx
index 4a1a64f5fcb41..f946cefd3494c 100644
--- a/x-pack/plugins/security_solution/public/cases/components/create/index.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/create/index.tsx
@@ -13,6 +13,7 @@ import { getCaseDetailsUrl } from '../../../common/components/link_to';
 import { useKibana } from '../../../common/lib/kibana';
 import * as timelineMarkdownPlugin from '../../../common/components/markdown_editor/plugins/timeline';
 import { useInsertTimeline } from '../use_insert_timeline';
+import { APP_ID } from '../../../../common/constants';
 
 export const Create = React.memo(() => {
   const { cases } = useKibana().services;
@@ -43,6 +44,7 @@ export const Create = React.memo(() => {
             useInsertTimeline,
           },
         },
+        owner: [APP_ID],
       })}
     </EuiPanel>
   );
diff --git a/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.test.tsx b/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.test.tsx
index 09c94b643e8d9..77fa9e8b3cc8c 100644
--- a/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.test.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.test.tsx
@@ -9,12 +9,12 @@ import React from 'react';
 import { mount } from 'enzyme';
 import { EuiGlobalToastList } from '@elastic/eui';
 
-import { useKibana, useGetUserSavedObjectPermissions } from '../../../common/lib/kibana';
+import { useKibana, useGetUserCasesPermissions } from '../../../common/lib/kibana';
 import { useStateToaster } from '../../../common/components/toasters';
 import { TestProviders } from '../../../common/mock';
 import { AddToCaseAction } from './add_to_case_action';
 import { basicCase } from '../../../../../cases/public/containers/mock';
-import { Case } from '../../../../../cases/common';
+import { Case, SECURITY_SOLUTION_OWNER } from '../../../../../cases/common';
 
 jest.mock('../../../common/lib/kibana');
 jest.mock('../../../common/components/link_to', () => {
@@ -62,7 +62,7 @@ describe('AddToCaseAction', () => {
       getAllCasesSelectorModal: mockAllCasesModal.mockImplementation(() => <>{'test'}</>),
     };
     (useStateToaster as jest.Mock).mockReturnValue([jest.fn(), mockDispatchToaster]);
-    (useGetUserSavedObjectPermissions as jest.Mock).mockReturnValue({
+    (useGetUserCasesPermissions as jest.Mock).mockReturnValue({
       crud: true,
       read: true,
     });
@@ -116,6 +116,7 @@ describe('AddToCaseAction', () => {
       alertId: 'test-id',
       index: 'test-index',
       rule: { id: 'rule-id', name: 'rule-name' },
+      owner: SECURITY_SOLUTION_OWNER,
     });
   });
 
@@ -138,7 +139,11 @@ describe('AddToCaseAction', () => {
     expect(mockAllCasesModal.mock.calls[0][0].alertData).toEqual({
       alertId: 'test-id',
       index: 'test-index',
-      rule: { id: 'rule-id', name: null },
+      rule: {
+        id: 'rule-id',
+        name: null,
+      },
+      owner: SECURITY_SOLUTION_OWNER,
     });
   });
 
@@ -196,7 +201,7 @@ describe('AddToCaseAction', () => {
   });
 
   it('disabled when user does not have crud permissions', () => {
-    (useGetUserSavedObjectPermissions as jest.Mock).mockReturnValue({
+    (useGetUserCasesPermissions as jest.Mock).mockReturnValue({
       crud: false,
       read: true,
     });
diff --git a/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.tsx b/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.tsx
index 7379f5d6fd5dc..4435b32e07cc2 100644
--- a/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.tsx
+++ b/x-pack/plugins/security_solution/public/cases/components/timeline_actions/add_to_case_action.tsx
@@ -27,7 +27,7 @@ import {
 } from '../../../common/components/link_to';
 import { useStateToaster } from '../../../common/components/toasters';
 import { useControl } from '../../../common/hooks/use_control';
-import { useGetUserSavedObjectPermissions, useKibana } from '../../../common/lib/kibana';
+import { useGetUserCasesPermissions, useKibana } from '../../../common/lib/kibana';
 import { ActionIconItem } from '../../../timelines/components/timeline/body/actions/action_icon_item';
 import { CreateCaseFlyout } from '../create/flyout';
 import { createUpdateSuccessToaster } from './helpers';
@@ -45,6 +45,7 @@ interface PostCommentArg {
     alertId: string | string[];
     index: string | string[];
     rule: { id: string | null; name: string | null };
+    owner: string;
   };
   updateCase?: (newCase: Case) => void;
   subCaseId?: string;
@@ -66,7 +67,7 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
   const [isPopoverOpen, setIsPopoverOpen] = useState(false);
   const openPopover = useCallback(() => setIsPopoverOpen(true), []);
   const closePopover = useCallback(() => setIsPopoverOpen(false), []);
-  const userPermissions = useGetUserSavedObjectPermissions();
+  const userPermissions = useGetUserCasesPermissions();
 
   const isEventSupported = !isEmpty(ecsRowData.signal?.rule?.id);
   const userCanCrud = userPermissions?.crud ?? false;
@@ -110,6 +111,7 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
               id: rule?.id != null ? rule.id[0] : null,
               name: rule?.name != null ? rule.name[0] : null,
             },
+            owner: APP_ID,
           },
           updateCase,
         });
@@ -235,6 +237,7 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
               id: rule?.id != null ? rule.id[0] : null,
               name: rule?.name != null ? rule.name[0] : null,
             },
+            owner: APP_ID,
           },
           createCaseNavigation: {
             href: formatUrl(getCreateCaseUrl()),
@@ -244,6 +247,7 @@ const AddToCaseActionComponent: React.FC<AddToCaseActionProps> = ({
           onRowClick: onCaseClicked,
           updateCase: onCaseSuccess,
           userCanCrud: userPermissions?.crud ?? false,
+          owner: [APP_ID],
         })}
     </>
   );
diff --git a/x-pack/plugins/security_solution/public/cases/pages/case.tsx b/x-pack/plugins/security_solution/public/cases/pages/case.tsx
index ff7589e9deb2a..4ec29b676afe6 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/case.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/case.tsx
@@ -8,16 +8,16 @@
 import React from 'react';
 
 import { WrapperPage } from '../../common/components/wrapper_page';
-import { useGetUserSavedObjectPermissions } from '../../common/lib/kibana';
+import { useGetUserCasesPermissions } from '../../common/lib/kibana';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { AllCases } from '../components/all_cases';
 
 import { savedObjectReadOnlyErrorMessage, CaseCallOut } from '../components/callout';
-import { CaseSavedObjectNoPermissions } from './saved_object_no_permissions';
+import { CaseFeatureNoPermissions } from './feature_no_permissions';
 import { SecurityPageName } from '../../app/types';
 
 export const CasesPage = React.memo(() => {
-  const userPermissions = useGetUserSavedObjectPermissions();
+  const userPermissions = useGetUserCasesPermissions();
 
   return userPermissions == null || userPermissions?.read ? (
     <>
@@ -33,7 +33,7 @@ export const CasesPage = React.memo(() => {
       <SpyRoute pageName={SecurityPageName.case} />
     </>
   ) : (
-    <CaseSavedObjectNoPermissions />
+    <CaseFeatureNoPermissions />
   );
 });
 
diff --git a/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx b/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx
index 1841ca39ae853..03407c7a5adaa 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/case_details.tsx
@@ -12,7 +12,7 @@ import { SecurityPageName } from '../../app/types';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { WrapperPage } from '../../common/components/wrapper_page';
 import { useGetUrlSearch } from '../../common/components/navigation/use_get_url_search';
-import { useGetUserSavedObjectPermissions } from '../../common/lib/kibana';
+import { useGetUserCasesPermissions } from '../../common/lib/kibana';
 import { getCaseUrl } from '../../common/components/link_to';
 import { navTabs } from '../../app/home/home_navigations';
 import { CaseView } from '../components/case_view';
@@ -20,7 +20,7 @@ import { savedObjectReadOnlyErrorMessage, CaseCallOut } from '../components/call
 
 export const CaseDetailsPage = React.memo(() => {
   const history = useHistory();
-  const userPermissions = useGetUserSavedObjectPermissions();
+  const userPermissions = useGetUserCasesPermissions();
   const { detailName: caseId, subCaseId } = useParams<{
     detailName?: string;
     subCaseId?: string;
diff --git a/x-pack/plugins/security_solution/public/cases/pages/configure_cases.tsx b/x-pack/plugins/security_solution/public/cases/pages/configure_cases.tsx
index 3e838f47e6dc2..905167c232c7d 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/configure_cases.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/configure_cases.tsx
@@ -13,17 +13,18 @@ import { SecurityPageName } from '../../app/types';
 import { getCaseUrl } from '../../common/components/link_to';
 import { useGetUrlSearch } from '../../common/components/navigation/use_get_url_search';
 import { WrapperPage } from '../../common/components/wrapper_page';
-import { useGetUserSavedObjectPermissions, useKibana } from '../../common/lib/kibana';
+import { useGetUserCasesPermissions, useKibana } from '../../common/lib/kibana';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { navTabs } from '../../app/home/home_navigations';
 import { CaseHeaderPage } from '../components/case_header_page';
 import { WhitePageWrapper, SectionWrapper } from '../components/wrappers';
 import * as i18n from './translations';
+import { APP_ID } from '../../../common/constants';
 
 const ConfigureCasesPageComponent: React.FC = () => {
   const { cases } = useKibana().services;
   const history = useHistory();
-  const userPermissions = useGetUserSavedObjectPermissions();
+  const userPermissions = useGetUserCasesPermissions();
   const search = useGetUrlSearch(navTabs.case);
 
   const backOptions = useMemo(
@@ -55,6 +56,7 @@ const ConfigureCasesPageComponent: React.FC = () => {
         <WhitePageWrapper>
           {cases.getConfigureCases({
             userCanCrud: userPermissions?.crud ?? false,
+            owner: [APP_ID],
           })}
         </WhitePageWrapper>
       </WrapperPage>
diff --git a/x-pack/plugins/security_solution/public/cases/pages/create_case.tsx b/x-pack/plugins/security_solution/public/cases/pages/create_case.tsx
index 24b179f4a41bf..41344a8deb3b1 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/create_case.tsx
+++ b/x-pack/plugins/security_solution/public/cases/pages/create_case.tsx
@@ -12,7 +12,7 @@ import { SecurityPageName } from '../../app/types';
 import { getCaseUrl } from '../../common/components/link_to';
 import { useGetUrlSearch } from '../../common/components/navigation/use_get_url_search';
 import { WrapperPage } from '../../common/components/wrapper_page';
-import { useGetUserSavedObjectPermissions } from '../../common/lib/kibana';
+import { useGetUserCasesPermissions } from '../../common/lib/kibana';
 import { SpyRoute } from '../../common/utils/route/spy_routes';
 import { navTabs } from '../../app/home/home_navigations';
 import { CaseHeaderPage } from '../components/case_header_page';
@@ -21,7 +21,7 @@ import * as i18n from './translations';
 
 export const CreateCasePage = React.memo(() => {
   const history = useHistory();
-  const userPermissions = useGetUserSavedObjectPermissions();
+  const userPermissions = useGetUserCasesPermissions();
   const search = useGetUrlSearch(navTabs.case);
 
   const backOptions = useMemo(
diff --git a/x-pack/plugins/security_solution/public/cases/pages/feature_no_permissions.tsx b/x-pack/plugins/security_solution/public/cases/pages/feature_no_permissions.tsx
new file mode 100644
index 0000000000000..9975db3d8b6fb
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/cases/pages/feature_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, { useMemo } from 'react';
+
+import { EmptyPage } from '../../common/components/empty_page';
+import * as i18n from './translations';
+import { useKibana } from '../../common/lib/kibana';
+
+export const CaseFeatureNoPermissions = React.memo(() => {
+  const docLinks = useKibana().services.docLinks;
+  const actions = useMemo(
+    () => ({
+      feature: {
+        icon: 'documents',
+        label: i18n.GO_TO_DOCUMENTATION,
+        url: `${docLinks.links.siem.gettingStarted}`,
+        target: '_blank',
+      },
+    }),
+    [docLinks]
+  );
+
+  return (
+    <EmptyPage
+      actions={actions}
+      message={i18n.CASES_FEATURE_NO_PERMISSIONS_MSG}
+      data-test-subj="no_feature_permissions"
+      title={i18n.CASES_FEATURE_NO_PERMISSIONS_TITLE}
+    />
+  );
+});
+
+CaseFeatureNoPermissions.displayName = 'CaseFeatureNoPermissions';
diff --git a/x-pack/plugins/security_solution/public/cases/pages/saved_object_no_permissions.tsx b/x-pack/plugins/security_solution/public/cases/pages/saved_object_no_permissions.tsx
deleted file mode 100644
index dd173e18ca63e..0000000000000
--- a/x-pack/plugins/security_solution/public/cases/pages/saved_object_no_permissions.tsx
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useMemo } from 'react';
-
-import { EmptyPage } from '../../common/components/empty_page';
-import * as i18n from './translations';
-import { useKibana } from '../../common/lib/kibana';
-
-export const CaseSavedObjectNoPermissions = React.memo(() => {
-  const docLinks = useKibana().services.docLinks;
-  const actions = useMemo(
-    () => ({
-      savedObject: {
-        icon: 'documents',
-        label: i18n.GO_TO_DOCUMENTATION,
-        url: `${docLinks.ELASTIC_WEBSITE_URL}guide/en/security/${docLinks.DOC_LINK_VERSION}s`,
-        target: '_blank',
-      },
-    }),
-    [docLinks]
-  );
-
-  return (
-    <EmptyPage
-      actions={actions}
-      message={i18n.SAVED_OBJECT_NO_PERMISSIONS_MSG}
-      data-test-subj="no_saved_objects_permissions"
-      title={i18n.SAVED_OBJECT_NO_PERMISSIONS_TITLE}
-    />
-  );
-});
-
-CaseSavedObjectNoPermissions.displayName = 'CaseSavedObjectNoPermissions';
diff --git a/x-pack/plugins/security_solution/public/cases/pages/translations.ts b/x-pack/plugins/security_solution/public/cases/pages/translations.ts
index 0abf7461681cf..e45aca87ff1f9 100644
--- a/x-pack/plugins/security_solution/public/cases/pages/translations.ts
+++ b/x-pack/plugins/security_solution/public/cases/pages/translations.ts
@@ -7,18 +7,18 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const SAVED_OBJECT_NO_PERMISSIONS_TITLE = i18n.translate(
-  'xpack.securitySolution.cases.caseSavedObjectNoPermissionsTitle',
+export const CASES_FEATURE_NO_PERMISSIONS_TITLE = i18n.translate(
+  'xpack.securitySolution.cases.caseFeatureNoPermissionsTitle',
   {
     defaultMessage: 'Kibana feature privileges required',
   }
 );
 
-export const SAVED_OBJECT_NO_PERMISSIONS_MSG = i18n.translate(
-  'xpack.securitySolution.cases.caseSavedObjectNoPermissionsMessage',
+export const CASES_FEATURE_NO_PERMISSIONS_MSG = i18n.translate(
+  'xpack.securitySolution.cases.caseFeatureNoPermissionsMessage',
   {
     defaultMessage:
-      'To view cases, you must have privileges for the Saved Object Management feature in the Kibana space. For more information, contact your Kibana administrator.',
+      'To view cases, you must have privileges for the Cases feature in the Kibana space. For more information, contact your Kibana administrator.',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/cases/translations.ts b/x-pack/plugins/security_solution/public/cases/translations.ts
index e8e4f207f2d23..63fc5695ebab1 100644
--- a/x-pack/plugins/security_solution/public/cases/translations.ts
+++ b/x-pack/plugins/security_solution/public/cases/translations.ts
@@ -7,18 +7,18 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const SAVED_OBJECT_NO_PERMISSIONS_TITLE = i18n.translate(
-  'xpack.securitySolution.cases.caseSavedObjectNoPermissionsTitle',
+export const CASES_FEATURE_NO_PERMISSIONS_TITLE = i18n.translate(
+  'xpack.securitySolution.cases.caseFeatureNoPermissionsTitle',
   {
     defaultMessage: 'Kibana feature privileges required',
   }
 );
 
-export const SAVED_OBJECT_NO_PERMISSIONS_MSG = i18n.translate(
-  'xpack.securitySolution.cases.caseSavedObjectNoPermissionsMessage',
+export const CASES_FEATURE_NO_PERMISSIONS_MSG = i18n.translate(
+  'xpack.securitySolution.cases.caseFeatureNoPermissionsMessage',
   {
     defaultMessage:
-      'To view cases, you must have privileges for the Saved Object Management feature in the Kibana space. For more information, contact your Kibana administrator.',
+      'To view cases, you must have privileges for the Cases feature in the Kibana space. For more information, contact your Kibana administrator.',
   }
 );
 
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/formatted_date_time.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/formatted_date_time.tsx
index 2fdb7e99d860e..740437646f61a 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/formatted_date_time.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/formatted_date_time.tsx
@@ -8,10 +8,14 @@
 import React from 'react';
 import { FormattedDate, FormattedTime, FormattedRelative } from '@kbn/i18n/react';
 
-export const FormattedDateAndTime: React.FC<{ date: Date }> = ({ date }) => {
+export const FormattedDateAndTime: React.FC<{ date: Date; showRelativeTime?: boolean }> = ({
+  date,
+  showRelativeTime = false,
+}) => {
   // If date is greater than or equal to 1h (ago), then show it as a date
+  // and if showRelativeTime is false
   // else, show it as relative to "now"
-  return Date.now() - date.getTime() >= 3.6e6 ? (
+  return Date.now() - date.getTime() >= 3.6e6 && !showRelativeTime ? (
     <>
       <FormattedDate value={date} year="numeric" month="short" day="2-digit" />
       {' @'}
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.tsx
new file mode 100644
index 0000000000000..5cde22de69738
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/endpoint_host_isolation_status.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 React, { memo, useMemo } from 'react';
+import { EuiBadge, EuiTextColor } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+export interface EndpointHostIsolationStatusProps {
+  isIsolated: boolean;
+  /** the count of pending isolate actions */
+  pendingIsolate?: number;
+  /** the count of pending unisoalte actions */
+  pendingUnIsolate?: number;
+}
+
+/**
+ * Component will display a host isoaltion status based on whether it is currently isolated or there are
+ * isolate/unisolate actions pending. If none of these are applicable, no UI component will be rendered
+ * (`null` is returned)
+ */
+export const EndpointHostIsolationStatus = memo<EndpointHostIsolationStatusProps>(
+  ({ isIsolated, pendingIsolate = 0, pendingUnIsolate = 0 }) => {
+    return useMemo(() => {
+      // If nothing is pending and host is not currently isolated, then render nothing
+      if (!isIsolated && !pendingIsolate && !pendingUnIsolate) {
+        return null;
+      }
+
+      // If nothing is pending, but host is isolated, then show isolation badge
+      if (!pendingIsolate && !pendingUnIsolate) {
+        return (
+          <EuiBadge color="hollow">
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.hostIsolationStatus.isolated"
+              defaultMessage="Isolated"
+            />
+          </EuiBadge>
+        );
+      }
+
+      // If there are multiple types of pending isolation actions, then show count of actions with tooltip that displays breakdown
+      // TODO:PT implement edge case
+      // if () {
+      //
+      // }
+
+      // Show 'pending [un]isolate' depending on what's pending
+      return (
+        <EuiBadge color="hollow">
+          <EuiTextColor color="subdued">
+            {pendingIsolate ? (
+              <FormattedMessage
+                id="xpack.securitySolution.endpoint.hostIsolationStatus.isIsolating"
+                defaultMessage="Isolating pending"
+              />
+            ) : (
+              <FormattedMessage
+                id="xpack.securitySolution.endpoint.hostIsolationStatus.isUnIsolating"
+                defaultMessage="Unisolating pending"
+              />
+            )}
+          </EuiTextColor>
+        </EuiBadge>
+      );
+    }, [isIsolated, pendingIsolate, pendingUnIsolate]);
+  }
+);
+
+EndpointHostIsolationStatus.displayName = 'EndpointHostIsolationStatus';
diff --git a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts
index f5387a1b1a99c..bd8e23e3a4559 100644
--- a/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts
+++ b/x-pack/plugins/security_solution/public/common/components/endpoint/host_isolation/index.ts
@@ -8,3 +8,4 @@
 export * from './isolate_success';
 export * from './isolate_form';
 export * from './unisolate_form';
+export * from './endpoint_host_isolation_status';
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 f822b3c287a02..3459da068b282 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
@@ -27,25 +27,22 @@ export const EndpointIsolateSuccess = memo<EndpointIsolateSuccessProps>(
   }) => {
     return (
       <>
-        {isolateAction === 'isolateHost' ? (
-          <EuiCallOut
-            iconType="check"
-            color="success"
-            title={GET_ISOLATION_SUCCESS_MESSAGE(hostName)}
-            data-test-subj="hostIsolateSuccessMessage"
-          >
-            {additionalInfo}
-          </EuiCallOut>
-        ) : (
-          <EuiCallOut
-            iconType="check"
-            color="success"
-            title={GET_UNISOLATION_SUCCESS_MESSAGE(hostName)}
-          >
-            {additionalInfo}
-          </EuiCallOut>
-        )}
-
+        <EuiCallOut
+          iconType="check"
+          color="success"
+          title={
+            isolateAction === 'isolateHost'
+              ? GET_ISOLATION_SUCCESS_MESSAGE(hostName)
+              : GET_UNISOLATION_SUCCESS_MESSAGE(hostName)
+          }
+          data-test-subj={
+            isolateAction === 'isolateHost'
+              ? 'hostIsolateSuccessMessage'
+              : 'hostUnisolateSuccessMessage'
+          }
+        >
+          {additionalInfo}
+        </EuiCallOut>
         <EuiFlexGroup gutterSize="none" justifyContent="flexEnd">
           <EuiFlexItem grow={false}>
             <EuiButtonEmpty
diff --git a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx
index d20d28aca6fda..2bb6854739a32 100644
--- a/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/exceptions/viewer/exception_item/exception_details.tsx
@@ -82,7 +82,9 @@ const ExceptionDetailsComponent = ({
             {descriptionListItems.map((item) => (
               <Fragment key={`${item.title}`}>
                 <MyDescriptionListTitle>{item.title}</MyDescriptionListTitle>
-                <MyDescriptionListDescription>{item.description}</MyDescriptionListDescription>
+                <MyDescriptionListDescription className="eui-textBreakWord">
+                  {item.description}
+                </MyDescriptionListDescription>
               </Fragment>
             ))}
           </EuiDescriptionList>
diff --git a/x-pack/plugins/security_solution/public/common/components/generic_downloader/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/generic_downloader/__snapshots__/index.test.tsx.snap
deleted file mode 100644
index 219be8cbda311..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/generic_downloader/__snapshots__/index.test.tsx.snap
+++ /dev/null
@@ -1,3 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`GenericDownloader renders correctly against snapshot 1`] = `<styled.a />`;
diff --git a/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.test.tsx
deleted file mode 100644
index b8066c836de72..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.test.tsx
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { shallow, mount } from 'enzyme';
-import React from 'react';
-import { GenericDownloaderComponent, ExportSelectedData } from './index';
-import { errorToToaster } from '../toasters';
-
-jest.mock('../toasters', () => ({
-  useStateToaster: jest.fn(() => [jest.fn(), jest.fn()]),
-  errorToToaster: jest.fn(),
-}));
-
-describe('GenericDownloader', () => {
-  test('renders correctly against snapshot', () => {
-    const wrapper = shallow(
-      <GenericDownloaderComponent
-        filename={'export_rules.ndjson'}
-        onExportSuccess={jest.fn()}
-        exportSelectedData={jest.fn()}
-      />
-    );
-    expect(wrapper).toMatchSnapshot();
-  });
-
-  test('show toaster with correct error message if error occurrs', () => {
-    mount(
-      <GenericDownloaderComponent
-        filename={'export_rules.ndjson'}
-        onExportSuccess={jest.fn()}
-        exportSelectedData={('some error' as unknown) as ExportSelectedData}
-        ids={['123']}
-      />
-    );
-    expect((errorToToaster as jest.Mock).mock.calls[0][0].title).toEqual('Failed to export data…');
-  });
-});
diff --git a/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.tsx b/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.tsx
deleted file mode 100644
index 2a2e425702755..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/generic_downloader/index.tsx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React, { useEffect, useRef } from 'react';
-import styled from 'styled-components';
-import { isFunction } from 'lodash/fp';
-import * as i18n from './translations';
-
-import { ExportDocumentsProps } from '../../../detections/containers/detection_engine/rules';
-import { useStateToaster, errorToToaster } from '../toasters';
-import { TimelineErrorResponse } from '../../../../common/types/timeline';
-
-const InvisibleAnchor = styled.a`
-  display: none;
-`;
-
-export type ExportSelectedData = ({
-  excludeExportDetails,
-  filename,
-  ids,
-  signal,
-}: ExportDocumentsProps) => Promise<Blob | TimelineErrorResponse>;
-
-export interface GenericDownloaderProps {
-  filename: string;
-  ids?: string[];
-  exportSelectedData: ExportSelectedData;
-  onExportSuccess?: (exportCount: number) => void;
-  onExportFailure?: () => void;
-}
-
-/**
- * Component for downloading Rules as an exported .ndjson file. Download will occur on each update to `rules` param
- *
- * @param filename of file to be downloaded
- * @param payload Rule[]
- *
- */
-
-export const GenericDownloaderComponent = ({
-  exportSelectedData,
-  filename,
-  ids,
-  onExportSuccess,
-  onExportFailure,
-}: GenericDownloaderProps) => {
-  const anchorRef = useRef<HTMLAnchorElement>(null);
-  const [, dispatchToaster] = useStateToaster();
-
-  useEffect(() => {
-    let isSubscribed = true;
-    const abortCtrl = new AbortController();
-
-    const exportData = async () => {
-      if (anchorRef && anchorRef.current && ids != null && ids.length > 0) {
-        try {
-          const exportResponse = await exportSelectedData({
-            ids,
-            signal: abortCtrl.signal,
-          });
-
-          if (isSubscribed) {
-            // this is for supporting IE
-            if (isFunction(window.navigator.msSaveOrOpenBlob)) {
-              window.navigator.msSaveBlob(exportResponse);
-            } else {
-              const objectURL = window.URL.createObjectURL(exportResponse);
-              // These are safe-assignments as writes to anchorRef are isolated to exportData
-              anchorRef.current.href = objectURL; // eslint-disable-line require-atomic-updates
-              anchorRef.current.download = filename; // eslint-disable-line require-atomic-updates
-              anchorRef.current.click();
-
-              if (typeof window.URL.revokeObjectURL === 'function') {
-                window.URL.revokeObjectURL(objectURL);
-              }
-            }
-            if (onExportSuccess != null) {
-              onExportSuccess(ids.length);
-            }
-          }
-        } catch (error) {
-          if (isSubscribed) {
-            if (onExportFailure != null) {
-              onExportFailure();
-            }
-            errorToToaster({ title: i18n.EXPORT_FAILURE, error, dispatchToaster });
-          }
-        }
-      }
-    };
-
-    exportData();
-
-    return () => {
-      isSubscribed = false;
-      abortCtrl.abort();
-    };
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-  }, [ids]);
-
-  return <InvisibleAnchor ref={anchorRef} />;
-};
-
-GenericDownloaderComponent.displayName = 'GenericDownloaderComponent';
-
-export const GenericDownloader = React.memo(GenericDownloaderComponent);
-
-GenericDownloader.displayName = 'GenericDownloader';
diff --git a/x-pack/plugins/security_solution/public/common/components/generic_downloader/translations.ts b/x-pack/plugins/security_solution/public/common/components/generic_downloader/translations.ts
deleted file mode 100644
index 9104d4e7c0b45..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/generic_downloader/translations.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { i18n } from '@kbn/i18n';
-
-export const EXPORT_FAILURE = i18n.translate(
-  'xpack.securitySolution.detectionEngine.rules.components.genericDownloader.exportFailureTitle',
-  {
-    defaultMessage: 'Failed to export data…',
-  }
-);
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap
index a2a36b3fe1d3b..84c8971e3d352 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/index.test.tsx.snap
@@ -6,6 +6,7 @@ exports[`HeaderPage it renders 1`] = `
 >
   <EuiFlexGroup
     alignItems="center"
+    justifyContent="spaceBetween"
   >
     <FlexItem>
       <Memo(TitleComponent)
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap
index 05af2fee2c2a2..ca02d0ac5cb2d 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/__snapshots__/title.test.tsx.snap
@@ -7,7 +7,11 @@ exports[`Title it renders 1`] = `
   <h1
     data-test-subj="header-page-title"
   >
-    Test title
+    <TruncatableText
+      tooltipContent="Test title"
+    >
+      Test title
+    </TruncatableText>
      
     <StyledEuiBetaBadge
       label="Beta"
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx b/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx
index 4b782f434b534..d01869bb6999b 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/index.tsx
@@ -43,7 +43,13 @@ const Header = styled.header.attrs({
 Header.displayName = 'Header';
 
 const FlexItem = styled(EuiFlexItem)`
-  display: block;
+  ${({ theme }) => css`
+    display: block;
+
+    @media only screen and (min-width: ${theme.eui.euiBreakpoints.m}) {
+      max-width: 50%;
+    }
+  `}
 `;
 FlexItem.displayName = 'FlexItem';
 
@@ -112,7 +118,7 @@ const HeaderPageComponent: React.FC<HeaderPageProps> = ({
   );
   return (
     <Header border={border} {...rest}>
-      <EuiFlexGroup alignItems="center">
+      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween">
         <FlexItem>
           {backOptions && (
             <LinkBack>
diff --git a/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx b/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx
index 5ec05273d16f3..471d539ea03f4 100644
--- a/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/header_page/title.tsx
@@ -11,6 +11,7 @@ import styled from 'styled-components';
 
 import { DraggableArguments, BadgeOptions, TitleProp } from './types';
 import { DefaultDraggable } from '../draggables';
+import { TruncatableText } from '../truncatable_text';
 
 const StyledEuiBetaBadge = styled(EuiBetaBadge)`
   vertical-align: middle;
@@ -33,7 +34,7 @@ const TitleComponent: React.FC<Props> = ({ draggableArguments, title, badgeOptio
   <EuiTitle size="l">
     <h1 data-test-subj="header-page-title">
       {!draggableArguments ? (
-        title
+        <TruncatableText tooltipContent={title}>{title}</TruncatableText>
       ) : (
         <DefaultDraggable
           data-test-subj="header-page-draggable"
diff --git a/x-pack/plugins/security_solution/public/common/components/truncatable_text/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/common/components/truncatable_text/__snapshots__/index.test.tsx.snap
index 23b930c7a114b..71e7eb23d930d 100644
--- a/x-pack/plugins/security_solution/public/common/components/truncatable_text/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/common/components/truncatable_text/__snapshots__/index.test.tsx.snap
@@ -11,9 +11,13 @@ exports[`TruncatableText renders correctly against snapshot 1`] = `
   white-space: nowrap;
 }
 
-<span
-  className="c0"
->
-  Hiding in plain sight
-</span>
+<TruncatableText>
+  <EllipsisText>
+    <span
+      className="c0"
+    >
+      Hiding in plain sight
+    </span>
+  </EllipsisText>
+</TruncatableText>
 `;
diff --git a/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.test.tsx b/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.test.tsx
index f54d9e4ed0b88..3bf9cf60afeab 100644
--- a/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.test.tsx
@@ -5,14 +5,14 @@
  * 2.0.
  */
 
-import { mount, shallow } from 'enzyme';
+import { mount } from 'enzyme';
 import React from 'react';
 
 import { TruncatableText } from '.';
 
 describe('TruncatableText', () => {
   test('renders correctly against snapshot', () => {
-    const wrapper = shallow(<TruncatableText>{'Hiding in plain sight'}</TruncatableText>);
+    const wrapper = mount(<TruncatableText>{'Hiding in plain sight'}</TruncatableText>);
     expect(wrapper).toMatchSnapshot();
   });
 
@@ -33,4 +33,11 @@ describe('TruncatableText', () => {
 
     expect(wrapper).toHaveStyleRule('white-space', 'nowrap');
   });
+
+  test('it can add tooltip', () => {
+    const testText = 'Some really really really really really long text.';
+    const wrapper = mount(<TruncatableText tooltipContent={testText}>{testText}</TruncatableText>);
+
+    expect(wrapper.find('EuiToolTip').text()).toEqual(testText);
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.ts b/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.ts
new file mode 100644
index 0000000000000..49ab0ac4defc3
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/truncatable_text/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 * from './truncatable_text';
diff --git a/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.tsx b/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.tsx
deleted file mode 100644
index 2dd3c35f731e9..0000000000000
--- a/x-pack/plugins/security_solution/public/common/components/truncatable_text/index.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 styled from 'styled-components';
-
-/**
- * Applies CSS styling to enable text to be truncated with an ellipsis.
- * Example: "Don't leave me hanging..."
- *
- * Note: Requires a parent container with a defined width or max-width.
- */
-
-export const TruncatableText = styled.span`
-  &,
-  & * {
-    display: inline-block;
-    max-width: 100%;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: top;
-    white-space: nowrap;
-  }
-`;
-TruncatableText.displayName = 'TruncatableText';
diff --git a/x-pack/plugins/security_solution/public/common/components/truncatable_text/truncatable_text.tsx b/x-pack/plugins/security_solution/public/common/components/truncatable_text/truncatable_text.tsx
new file mode 100644
index 0000000000000..4c068675aa5a0
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/components/truncatable_text/truncatable_text.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { EuiToolTip } from '@elastic/eui';
+
+/**
+ * Applies CSS styling to enable text to be truncated with an ellipsis.
+ * Example: "Don't leave me hanging..."
+ *
+ * Note: Requires a parent container with a defined width or max-width.
+ */
+
+const EllipsisText = styled.span`
+  &,
+  & * {
+    display: inline-block;
+    max-width: 100%;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    vertical-align: top;
+    white-space: nowrap;
+  }
+`;
+EllipsisText.displayName = 'EllipsisText';
+
+interface Props {
+  tooltipContent?: React.ReactNode;
+  children: React.ReactNode;
+}
+
+export function TruncatableText({ tooltipContent, children, ...props }: Props) {
+  if (!tooltipContent) return <EllipsisText {...props}>{children}</EllipsisText>;
+
+  return (
+    <EuiToolTip display="block" content={tooltipContent}>
+      <EllipsisText {...props}>{children}</EllipsisText>
+    </EuiToolTip>
+  );
+}
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_bool_state.ts b/x-pack/plugins/security_solution/public/common/hooks/use_bool_state.ts
new file mode 100644
index 0000000000000..f9204de38d680
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_bool_state.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 { useCallback, useState } from 'react';
+
+type UseBoolStateReturn = [
+  state: boolean,
+  setTrue: () => void,
+  setFalse: () => void,
+  toggle: () => void
+];
+
+export const useBoolState = (initial = false): UseBoolStateReturn => {
+  const [state, setState] = useState(initial);
+
+  const setTrue = useCallback(() => {
+    setState(true);
+  }, []);
+
+  const setFalse = useCallback(() => {
+    setState(false);
+  }, []);
+
+  const toggle = useCallback(() => {
+    setState((val) => !val);
+  }, []);
+
+  return [state, setTrue, setFalse, toggle];
+};
diff --git a/x-pack/plugins/security_solution/public/common/hooks/use_value_changed.ts b/x-pack/plugins/security_solution/public/common/hooks/use_value_changed.ts
new file mode 100644
index 0000000000000..ef054d0539757
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/hooks/use_value_changed.ts
@@ -0,0 +1,28 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { useEffect, useRef } from 'react';
+
+/**
+ * Use this method to watch value for changes.
+ *
+ * CAUTION: you probably don't need this hook. Try to use useEffect first.
+ * It is only useful in rare cases when a value differs by reference but not by content between renders.
+ *
+ * @param callback A callback to call when the value changes
+ * @param nextValue A value to observe for changes
+ */
+export const useValueChanged = <T>(callback: (value: T) => void, nextValue: T) => {
+  const prevValue = useRef(nextValue);
+
+  useEffect(() => {
+    if (JSON.stringify(prevValue.current) !== JSON.stringify(nextValue)) {
+      prevValue.current = nextValue;
+      callback(nextValue);
+    }
+  }, [callback, nextValue]);
+};
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 79c7b21158005..eb0ae1ae1dee9 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
@@ -45,4 +45,4 @@ export const useToasts = jest
 export const useCurrentUser = jest.fn();
 export const withKibana = jest.fn(createWithKibanaMock());
 export const KibanaContextProvider = jest.fn(createKibanaContextProviderMock());
-export const useGetUserSavedObjectPermissions = jest.fn();
+export const useGetUserCasesPermissions = jest.fn();
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 6b5599292f6d4..4a2caefba1b97 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
@@ -138,28 +138,25 @@ export const useCurrentUser = (): AuthenticatedElasticUser | null => {
   return user;
 };
 
-export interface UseGetUserSavedObjectPermissions {
+export interface UseGetUserCasesPermissions {
   crud: boolean;
   read: boolean;
 }
 
-export const useGetUserSavedObjectPermissions = () => {
-  const [
-    savedObjectsPermissions,
-    setSavedObjectsPermissions,
-  ] = useState<UseGetUserSavedObjectPermissions | null>(null);
+export const useGetUserCasesPermissions = () => {
+  const [casesPermissions, setCasesPermissions] = useState<UseGetUserCasesPermissions | null>(null);
   const uiCapabilities = useKibana().services.application.capabilities;
 
   useEffect(() => {
     const capabilitiesCanUserCRUD: boolean =
-      typeof uiCapabilities.siem.crud === 'boolean' ? uiCapabilities.siem.crud : false;
+      typeof uiCapabilities.siem.crud_cases === 'boolean' ? uiCapabilities.siem.crud_cases : false;
     const capabilitiesCanUserRead: boolean =
-      typeof uiCapabilities.siem.show === 'boolean' ? uiCapabilities.siem.show : false;
-    setSavedObjectsPermissions({
+      typeof uiCapabilities.siem.read_cases === 'boolean' ? uiCapabilities.siem.read_cases : false;
+    setCasesPermissions({
       crud: capabilitiesCanUserCRUD,
       read: capabilitiesCanUserRead,
     });
   }, [uiCapabilities]);
 
-  return savedObjectsPermissions;
+  return casesPermissions;
 };
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 ae2cc59de6abf..d96929ec183d8 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
@@ -23,6 +23,7 @@ import { ExperimentalFeatures } from '../../../../common/experimental_features';
 import { PLUGIN_ID } from '../../../../../fleet/common';
 import { APP_ID } from '../../../../common/constants';
 import { KibanaContextProvider } from '../../lib/kibana';
+import { MANAGEMENT_APP_ID } from '../../../management/common/constants';
 
 type UiRender = (ui: React.ReactElement, options?: RenderOptions) => RenderResult;
 
@@ -156,6 +157,8 @@ const createCoreStartMock = (): ReturnType<typeof coreMock.createStart> => {
         return '/app/fleet';
       case APP_ID:
         return '/app/security';
+      case MANAGEMENT_APP_ID:
+        return '/app/security/administration';
       default:
         return `${appId} not mocked!`;
     }
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 9d12efca19aed..2df16fc1e21b0 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
@@ -13,7 +13,7 @@ import type {
   HttpHandler,
   HttpStart,
 } from 'kibana/public';
-import { extend } from 'lodash';
+import { merge } from 'lodash';
 import { act } from '@testing-library/react';
 
 class ApiRouteNotMocked extends Error {}
@@ -159,6 +159,11 @@ export const httpHandlerMockFactory = <R extends ResponseProvidersInterface = {}
       }
     };
 
+    // For debugging purposes.
+    // It will provide a stack trace leading back to the location in the test file
+    // where the `core.http` mocks were applied from.
+    const testContextStackTrace = new Error('HTTP MOCK APPLIED FROM:').stack;
+
     const responseProvider: MockedApi<R>['responseProvider'] = mocks.reduce(
       (providers, routeMock) => {
         // FIXME: find a way to remove the ignore below. May need to limit the calling signature of `RouteMock['handler']`
@@ -195,7 +200,7 @@ export const httpHandlerMockFactory = <R extends ResponseProvidersInterface = {}
 
       http[method].mockImplementation(async (...args) => {
         const path = isHttpFetchOptionsWithPath(args[0]) ? args[0].path : args[0];
-        const routeMock = methodMocks.find((handler) => handler.path === path);
+        const routeMock = methodMocks.find((handler) => pathMatchesPattern(handler.path, path));
 
         if (routeMock) {
           markApiCallAsHandled(responseProvider[routeMock.id].mockDelay);
@@ -211,6 +216,9 @@ export const httpHandlerMockFactory = <R extends ResponseProvidersInterface = {}
         }
 
         const err = new ApiRouteNotMocked(`API [${method.toUpperCase()} ${path}] is not MOCKED!`);
+        // Append additional stack calling data from when this API mock was applied
+        err.stack += `\n${testContextStackTrace}`;
+
         // eslint-disable-next-line no-console
         console.error(err);
         throw err;
@@ -221,6 +229,29 @@ export const httpHandlerMockFactory = <R extends ResponseProvidersInterface = {}
   };
 };
 
+const pathMatchesPattern = (pathPattern: string, path: string): boolean => {
+  // No path params - pattern is single path
+  if (pathPattern === path) {
+    return true;
+  }
+
+  // If pathPattern has params (`{value}`), then see if `path` matches it
+  if (/{.*?}/.test(pathPattern)) {
+    const pathParts = path.split(/\//);
+    const patternParts = pathPattern.split(/\//);
+
+    if (pathParts.length !== patternParts.length) {
+      return false;
+    }
+
+    return pathParts.every((part, index) => {
+      return part === patternParts[index] || /{.*?}/.test(patternParts[index]);
+    });
+  }
+
+  return false;
+};
+
 const isHttpFetchOptionsWithPath = (
   opt: string | HttpFetchOptions | HttpFetchOptionsWithPath
 ): opt is HttpFetchOptionsWithPath => {
@@ -235,12 +266,14 @@ const isHttpFetchOptionsWithPath = (
  * @example
  * import { composeApiHandlerMocks } from './http_handler_mock_factory';
  * import {
+ *   FleetSetupApiMockInterface,
  *   fleetSetupApiMock,
+ *   AgentsSetupApiMockInterface,
  *   agentsSetupApiMock,
  * } from './setup';
  *
- * // Create the new interface as an intersection of all other Api Handler Mocks
- * type ComposedApiHandlerMocks = ReturnType<typeof agentsSetupApiMock> & ReturnType<typeof fleetSetupApiMock>
+ * // Create the new interface as an intersection of all other Api Handler Mock's interfaces
+ * type ComposedApiHandlerMocks = AgentsSetupApiMockInterface & FleetSetupApiMockInterface
  *
  * const newComposedHandlerMock = composeApiHandlerMocks<
  *  ComposedApiHandlerMocks
@@ -267,7 +300,7 @@ export const composeHttpHandlerMocks = <
 
     handlerMocks.forEach((handlerMock) => {
       const { waitForApi, ...otherInterfaceProps } = handlerMock(http);
-      extend(mockedApiInterfaces, otherInterfaceProps);
+      merge(mockedApiInterfaces, otherInterfaceProps);
     });
 
     return mockedApiInterfaces;
diff --git a/x-pack/plugins/security_solution/public/common/mock/global_state.ts b/x-pack/plugins/security_solution/public/common/mock/global_state.ts
index 71e33c603b65b..557c04e4e8a47 100644
--- a/x-pack/plugins/security_solution/public/common/mock/global_state.ts
+++ b/x-pack/plugins/security_solution/public/common/mock/global_state.ts
@@ -42,7 +42,6 @@ export const mockGlobalState: State = {
     enableExperimental: {
       trustedAppsByPolicyEnabled: false,
       metricsEntitiesEnabled: false,
-      hostIsolationEnabled: false,
       ruleRegistryEnabled: false,
     },
   },
diff --git a/x-pack/plugins/security_solution/public/common/store/test_utils.ts b/x-pack/plugins/security_solution/public/common/store/test_utils.ts
index 7616dfccddaff..21c8e6c15f826 100644
--- a/x-pack/plugins/security_solution/public/common/store/test_utils.ts
+++ b/x-pack/plugins/security_solution/public/common/store/test_utils.ts
@@ -89,7 +89,9 @@ export const createSpyMiddleware = <
       type ResolvedAction = A extends { type: typeof actionType } ? A : never;
 
       // Error is defined here so that we get a better stack trace that points to the test from where it was used
-      const err = new Error(`action '${actionType}' was not dispatched within the allocated time`);
+      const err = new Error(
+        `Timeout! Action '${actionType}' was not dispatched within the allocated time`
+      );
 
       return new Promise<ResolvedAction>((resolve, reject) => {
         const watch: ActionWatcher = (action) => {
@@ -108,7 +110,10 @@ export const createSpyMiddleware = <
         const timeout = setTimeout(() => {
           watchers.delete(watch);
           reject(err);
+          // TODO: is there a way we can grab the current timeout value from jest?
+          // For now, this is using the default value (5000ms) - 500.
         }, 4500);
+
         watchers.add(watch);
       });
     },
diff --git a/x-pack/plugins/security_solution/public/common/utils/download_blob.ts b/x-pack/plugins/security_solution/public/common/utils/download_blob.ts
new file mode 100644
index 0000000000000..80f32a8bdaa0c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/utils/download_blob.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.
+ */
+
+/**
+ * Method for downloading any file
+ *
+ * @param blob raw data
+ * @param filename of file to be downloaded
+ *
+ */
+export const downloadBlob = (blob: Blob, filename: string) => {
+  const objectURL = window.URL.createObjectURL(blob);
+  const anchor = document.createElement('a');
+  anchor.href = objectURL;
+  anchor.download = filename;
+  anchor.click();
+  window.URL.revokeObjectURL(objectURL);
+  anchor.remove();
+};
diff --git a/x-pack/plugins/security_solution/public/common/utils/resolve_path_variables.test.ts b/x-pack/plugins/security_solution/public/common/utils/resolve_path_variables.test.ts
new file mode 100644
index 0000000000000..c5ff39d228d26
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/utils/resolve_path_variables.test.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 { resolvePathVariables } from './resolve_path_variables';
+
+describe('utils', () => {
+  describe('resolvePathVariables', () => {
+    it('should resolve defined variables', () => {
+      expect(resolvePathVariables('/segment1/{var1}/segment2', { var1: 'value1' })).toBe(
+        '/segment1/value1/segment2'
+      );
+    });
+
+    it('should not resolve undefined variables', () => {
+      expect(resolvePathVariables('/segment1/{var1}/segment2', {})).toBe(
+        '/segment1/{var1}/segment2'
+      );
+    });
+
+    it('should ignore unused variables', () => {
+      expect(resolvePathVariables('/segment1/{var1}/segment2', { var2: 'value2' })).toBe(
+        '/segment1/{var1}/segment2'
+      );
+    });
+
+    it('should replace multiple variable occurences', () => {
+      expect(resolvePathVariables('/{var1}/segment1/{var1}', { var1: 'value1' })).toBe(
+        '/value1/segment1/value1'
+      );
+    });
+
+    it('should replace multiple variables', () => {
+      const path = resolvePathVariables('/{var1}/segment1/{var2}', {
+        var1: 'value1',
+        var2: 'value2',
+      });
+
+      expect(path).toBe('/value1/segment1/value2');
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/utils.ts b/x-pack/plugins/security_solution/public/common/utils/resolve_path_variables.ts
similarity index 100%
rename from x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/utils.ts
rename to x-pack/plugins/security_solution/public/common/utils/resolve_path_variables.ts
diff --git a/x-pack/plugins/security_solution/public/common/utils/validators/index.ts b/x-pack/plugins/security_solution/public/common/utils/validators/index.ts
index 7f470c199d550..178ae3b0f716e 100644
--- a/x-pack/plugins/security_solution/public/common/utils/validators/index.ts
+++ b/x-pack/plugins/security_solution/public/common/utils/validators/index.ts
@@ -7,6 +7,8 @@
 
 import { isEmpty } from 'lodash/fp';
 
+export * from './is_endpoint_host_isolated';
+
 const urlExpression = /(https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|www\.[a-zA-Z0-9][a-zA-Z0-9-]+[a-zA-Z0-9]\.[^\s]{2,}|https?:\/\/(?:www\.|(?!www))[a-zA-Z0-9]+\.[^\s]{2,}|www\.[a-zA-Z0-9]+\.[^\s]{2,})/gi;
 
 export const isUrlInvalid = (url: string | null | undefined) => {
diff --git a/x-pack/plugins/security_solution/public/common/utils/validators/is_endpoint_host_isolated.test.ts b/x-pack/plugins/security_solution/public/common/utils/validators/is_endpoint_host_isolated.test.ts
new file mode 100644
index 0000000000000..2e96d56c3625f
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/utils/validators/is_endpoint_host_isolated.test.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
+import { HostMetadata } from '../../../../common/endpoint/types';
+import { isEndpointHostIsolated } from './is_endpoint_host_isolated';
+
+describe('When using isEndpointHostIsolated()', () => {
+  const generator = new EndpointDocGenerator();
+
+  const generateMetadataDoc = (isolation: boolean = true) => {
+    const metadataDoc = generator.generateHostMetadata() as HostMetadata;
+    return {
+      ...metadataDoc,
+      Endpoint: {
+        ...metadataDoc.Endpoint,
+        state: {
+          ...metadataDoc.Endpoint.state,
+          isolation,
+        },
+      },
+    };
+  };
+
+  it('Returns `true` when endpoint is isolated', () => {
+    expect(isEndpointHostIsolated(generateMetadataDoc())).toBe(true);
+  });
+
+  it('Returns `false` when endpoint is isolated', () => {
+    expect(isEndpointHostIsolated(generateMetadataDoc(false))).toBe(false);
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/common/utils/validators/is_endpoint_host_isolated.ts b/x-pack/plugins/security_solution/public/common/utils/validators/is_endpoint_host_isolated.ts
new file mode 100644
index 0000000000000..c22f33d524029
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/common/utils/validators/is_endpoint_host_isolated.ts
@@ -0,0 +1,17 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { HostMetadata } from '../../../../common/endpoint/types';
+
+/**
+ * Given an endpoint host metadata record (`HostMetadata`), this utility will validate if
+ * that host is isolated
+ * @param endpointMetadata
+ */
+export const isEndpointHostIsolated = (endpointMetadata: HostMetadata): boolean => {
+  return Boolean(endpointMetadata.Endpoint.state?.isolation);
+};
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 3152c08fab323..9f59e3763ffbc 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
@@ -111,7 +111,7 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
     setPopover(false);
   }, []);
   const [exceptionModalType, setOpenAddExceptionModal] = useState<ExceptionListType | null>(null);
-  const [isAddEventExceptionModalOpen, setIsAddEventExceptionModalOpen] = useState<boolean>(false);
+  const [isAddEventFilterModalOpen, setIsAddEventFilterModalOpen] = useState<boolean>(false);
   const [{ canUserCRUD, hasIndexWrite, hasIndexMaintenance, hasIndexUpdateDelete }] = useUserData();
 
   const isEndpointAlert = useMemo((): boolean => {
@@ -129,8 +129,8 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
     setOpenAddExceptionModal(null);
   }, []);
 
-  const closeAddEventExceptionModal = useCallback((): void => {
-    setIsAddEventExceptionModalOpen(false);
+  const closeAddEventFilterModal = useCallback((): void => {
+    setIsAddEventFilterModalOpen(false);
   }, []);
 
   const onAddExceptionCancel = useCallback(() => {
@@ -364,26 +364,26 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
     );
   }, [handleAddExceptionClick, canUserCRUD, hasIndexWrite]);
 
-  const handleAddEventExceptionClick = useCallback((): void => {
+  const handleAddEventFilterClick = useCallback((): void => {
     closePopover();
-    setIsAddEventExceptionModalOpen(true);
+    setIsAddEventFilterModalOpen(true);
   }, [closePopover]);
 
-  const addEventExceptionComponent = useMemo(
+  const addEventFilterComponent = useMemo(
     () => (
       <EuiContextMenuItem
-        key="add-event-exception-menu-item"
-        aria-label="Add Event Exception"
-        data-test-subj="add-event-exception-menu-item"
-        id="addEventException"
-        onClick={handleAddEventExceptionClick}
+        key="add-event-filter-menu-item"
+        aria-label="Add event filter"
+        data-test-subj="add-event-filter-menu-item"
+        id="addEventFilter"
+        onClick={handleAddEventFilterClick}
       >
-        <EuiText data-test-subj="addEventExceptionButton" size="m">
-          {i18n.ACTION_ADD_EVENT_EXCEPTION}
+        <EuiText data-test-subj="addEventFilterButton" size="m">
+          {i18n.ACTION_ADD_EVENT_FILTER}
         </EuiText>
       </EuiContextMenuItem>
     ),
-    [handleAddEventExceptionClick]
+    [handleAddEventFilterClick]
   );
 
   const statusFilters = useMemo(() => {
@@ -412,11 +412,11 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
     () =>
       !isEvent && ruleId
         ? [...statusFilters, addEndpointExceptionComponent, addExceptionComponent]
-        : [addEventExceptionComponent],
+        : [addEventFilterComponent],
     [
       addEndpointExceptionComponent,
       addExceptionComponent,
-      addEventExceptionComponent,
+      addEventFilterComponent,
       statusFilters,
       ruleId,
       isEvent,
@@ -453,8 +453,8 @@ const AlertContextMenuComponent: React.FC<AlertContextMenuProps> = ({
           onRuleChange={onRuleChange}
         />
       )}
-      {isAddEventExceptionModalOpen && ecsRowData != null && (
-        <EventFiltersModal data={ecsRowData} onCancel={closeAddEventExceptionModal} />
+      {isAddEventFilterModalOpen && ecsRowData != null && (
+        <EventFiltersModal data={ecsRowData} onCancel={closeAddEventFilterModal} />
       )}
     </>
   );
diff --git a/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts b/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts
index 2d9f947dcea67..c43c4547a17ec 100644
--- a/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/alerts_table/translations.ts
@@ -165,10 +165,10 @@ export const ACTION_ADD_EXCEPTION = i18n.translate(
   }
 );
 
-export const ACTION_ADD_EVENT_EXCEPTION = i18n.translate(
-  'xpack.securitySolution.detectionEngine.alerts.actions.addEventException',
+export const ACTION_ADD_EVENT_FILTER = i18n.translate(
+  'xpack.securitySolution.detectionEngine.alerts.actions.addEventFilter',
   {
-    defaultMessage: 'Add Endpoint event exception',
+    defaultMessage: 'Add Endpoint event filter',
   }
 );
 
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 bb1585b5392bd..2ca8416841497 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
@@ -36,12 +36,6 @@ export const HostIsolationPanel = React.memo(
       return findHostName ? findHostName[0] : '';
     }, [details]);
 
-    const alertRule = useMemo(() => {
-      const findAlertRule = find({ category: 'signal', field: 'signal.rule.name' }, details)
-        ?.values;
-      return findAlertRule ? findAlertRule[0] : '';
-    }, [details]);
-
     const alertId = useMemo(() => {
       const findAlertId = find({ category: '_id', field: '_id' }, details)?.values;
       return findAlertId ? findAlertId[0] : '';
@@ -95,7 +89,6 @@ export const HostIsolationPanel = React.memo(
       <IsolateHost
         agentId={agentId}
         hostName={hostName}
-        alertRule={alertRule}
         cases={associatedCases}
         caseIds={caseIds}
         cancelCallback={cancelCallback}
@@ -104,7 +97,6 @@ export const HostIsolationPanel = React.memo(
       <UnisolateHost
         agentId={agentId}
         hostName={hostName}
-        alertRule={alertRule}
         cases={associatedCases}
         caseIds={caseIds}
         cancelCallback={cancelCallback}
diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx
index 10c9082976a0e..63eb74d259e42 100644
--- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/isolate.tsx
@@ -20,14 +20,12 @@ export const IsolateHost = React.memo(
   ({
     agentId,
     hostName,
-    alertRule,
     cases,
     caseIds,
     cancelCallback,
   }: {
     agentId: string;
     hostName: string;
-    alertRule: string;
     cases: ReactNode;
     caseIds: string[];
     cancelCallback: () => void;
@@ -80,15 +78,9 @@ export const IsolateHost = React.memo(
             messageAppend={
               <FormattedMessage
                 id="xpack.securitySolution.detections.hostIsolation.impactedCases"
-                defaultMessage="This action will be added to the {cases}."
+                defaultMessage="This action will be added to {cases}."
                 values={{
-                  cases: (
-                    <b>
-                      {caseCount}
-                      {CASES_ASSOCIATED_WITH_ALERT(caseCount)}
-                      {alertRule}
-                    </b>
-                  ),
+                  cases: <b>{CASES_ASSOCIATED_WITH_ALERT(caseCount)}</b>,
                 }}
               />
             }
@@ -103,7 +95,6 @@ export const IsolateHost = React.memo(
       comment,
       loading,
       caseCount,
-      alertRule,
     ]);
 
     return isIsolated ? hostIsolatedSuccess : hostNotIsolated;
diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts b/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts
index 449a09b932cd3..98b74817cabb6 100644
--- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts
+++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/translations.ts
@@ -25,7 +25,8 @@ export const CASES_ASSOCIATED_WITH_ALERT = (caseCount: number): string =>
   i18n.translate(
     'xpack.securitySolution.endpoint.hostIsolation.isolateHost.casesAssociatedWithAlert',
     {
-      defaultMessage: ' {caseCount, plural, one {case} other {cases}} associated with the rule ',
+      defaultMessage:
+        '{caseCount} {caseCount, plural, one {case} other {cases}} associated with this host',
       values: { caseCount },
     }
   );
diff --git a/x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx b/x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx
index 74149f2a692d3..e72a0d2de61bc 100644
--- a/x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/host_isolation/unisolate.tsx
@@ -20,14 +20,12 @@ export const UnisolateHost = React.memo(
   ({
     agentId,
     hostName,
-    alertRule,
     cases,
     caseIds,
     cancelCallback,
   }: {
     agentId: string;
     hostName: string;
-    alertRule: string;
     cases: ReactNode;
     caseIds: string[];
     cancelCallback: () => void;
@@ -80,15 +78,9 @@ export const UnisolateHost = React.memo(
             messageAppend={
               <FormattedMessage
                 id="xpack.securitySolution.detections.hostIsolation.impactedCases"
-                defaultMessage="This action will be added to the {cases}."
+                defaultMessage="This action will be added to {cases}."
                 values={{
-                  cases: (
-                    <b>
-                      {caseCount}
-                      {CASES_ASSOCIATED_WITH_ALERT(caseCount)}
-                      {alertRule}
-                    </b>
-                  ),
+                  cases: <b>{CASES_ASSOCIATED_WITH_ALERT(caseCount)}</b>,
                 }}
               />
             }
@@ -103,7 +95,6 @@ export const UnisolateHost = React.memo(
       comment,
       loading,
       caseCount,
-      alertRule,
     ]);
 
     return isUnIsolated ? hostUnisolatedSuccess : hostNotUnisolated;
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.test.tsx
index 3400a960bbc60..d1dfd6ccfd565 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.test.tsx
@@ -21,7 +21,7 @@ describe('AllRulesTables', () => {
         <AllRulesTables
           selectedTab={AllRulesTabs.rules}
           euiBasicTableSelectionProps={{}}
-          hasNoPermissions={false}
+          hasPermissions
           monitoringColumns={[]}
           rules={[]}
           rulesColumns={[]}
@@ -56,7 +56,7 @@ describe('AllRulesTables', () => {
         <AllRulesTables
           selectedTab={AllRulesTabs.rules}
           euiBasicTableSelectionProps={{}}
-          hasNoPermissions={false}
+          hasPermissions
           monitoringColumns={[]}
           rules={[]}
           rulesColumns={[]}
@@ -92,7 +92,7 @@ describe('AllRulesTables', () => {
         <AllRulesTables
           selectedTab={AllRulesTabs.monitoring}
           euiBasicTableSelectionProps={{}}
-          hasNoPermissions={false}
+          hasPermissions
           monitoringColumns={[]}
           rules={[]}
           rulesColumns={[]}
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.tsx
index dc513f9581db6..82e54b5b86072 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/all_rules_tables/index.tsx
@@ -32,7 +32,7 @@ export interface SortingType {
 
 interface AllRulesTablesProps {
   euiBasicTableSelectionProps: EuiTableSelectionType<Rule>;
-  hasNoPermissions: boolean;
+  hasPermissions: boolean;
   monitoringColumns: Array<EuiBasicTableColumn<RuleStatusRowItemType>>;
   pagination: {
     pageIndex: number;
@@ -55,7 +55,7 @@ const emptyPrompt = (
 
 export const AllRulesTablesComponent: React.FC<AllRulesTablesProps> = ({
   euiBasicTableSelectionProps,
-  hasNoPermissions,
+  hasPermissions,
   monitoringColumns,
   pagination,
   rules,
@@ -72,7 +72,7 @@ export const AllRulesTablesComponent: React.FC<AllRulesTablesProps> = ({
         <EuiBasicTable
           data-test-subj="rules-table"
           columns={rulesColumns}
-          isSelectable={!hasNoPermissions ?? false}
+          isSelectable={hasPermissions}
           itemId="id"
           items={rules ?? []}
           noItemsMessage={emptyPrompt}
@@ -80,14 +80,14 @@ export const AllRulesTablesComponent: React.FC<AllRulesTablesProps> = ({
           pagination={pagination}
           ref={tableRef}
           sorting={sorting}
-          selection={hasNoPermissions ? undefined : euiBasicTableSelectionProps}
+          selection={hasPermissions ? euiBasicTableSelectionProps : undefined}
         />
       )}
       {selectedTab === AllRulesTabs.monitoring && (
         <EuiBasicTable
           data-test-subj="monitoring-table"
           columns={monitoringColumns}
-          isSelectable={!hasNoPermissions ?? false}
+          isSelectable={hasPermissions}
           itemId="id"
           items={rulesStatuses}
           noItemsMessage={emptyPrompt}
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx
index 004a904828ecf..9e482b228018e 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.test.tsx
@@ -44,7 +44,7 @@ jest.mock('../../../../common/hooks/use_app_toasts');
 const props = {
   createPrePackagedRules: jest.fn(),
   loading: false,
-  userHasNoPermissions: false,
+  userHasPermissions: true,
   'data-test-subj': 'load-prebuilt-rules',
 };
 
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.tsx
index 519aa8d22d4e0..9a011da9aff05 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/pre_packaged_rules/load_empty_prompt.tsx
@@ -27,13 +27,13 @@ EmptyPrompt.displayName = 'EmptyPrompt';
 interface PrePackagedRulesPromptProps {
   createPrePackagedRules: () => void;
   loading: boolean;
-  userHasNoPermissions: boolean;
+  userHasPermissions: boolean;
 }
 
 const PrePackagedRulesPromptComponent: React.FC<PrePackagedRulesPromptProps> = ({
   createPrePackagedRules,
   loading = false,
-  userHasNoPermissions = true,
+  userHasPermissions = false,
 }) => {
   const history = useHistory();
   const handlePreBuiltCreation = useCallback(() => {
@@ -64,16 +64,17 @@ const PrePackagedRulesPromptComponent: React.FC<PrePackagedRulesPromptProps> = (
   const loadPrebuiltRulesAndTemplatesButton = useMemo(
     () =>
       getLoadPrebuiltRulesAndTemplatesButton({
-        isDisabled: userHasNoPermissions,
+        isDisabled: !userHasPermissions,
         onClick: handlePreBuiltCreation,
         fill: true,
         'data-test-subj': 'load-prebuilt-rules',
       }),
-    [getLoadPrebuiltRulesAndTemplatesButton, handlePreBuiltCreation, userHasNoPermissions]
+    [getLoadPrebuiltRulesAndTemplatesButton, handlePreBuiltCreation, userHasPermissions]
   );
 
   return (
     <EmptyPrompt
+      data-test-subj="rulesEmptyPrompt"
       title={<h2>{i18n.PRE_BUILT_TITLE}</h2>}
       body={<p>{i18n.PRE_BUILT_MSG}</p>}
       actions={
@@ -81,7 +82,7 @@ const PrePackagedRulesPromptComponent: React.FC<PrePackagedRulesPromptProps> = (
           <EuiFlexItem grow={false}>{loadPrebuiltRulesAndTemplatesButton}</EuiFlexItem>
           <EuiFlexItem grow={false}>
             <LinkButton
-              isDisabled={userHasNoPermissions}
+              isDisabled={!userHasPermissions}
               onClick={goToCreateRule}
               href={formatUrl(getCreateRuleUrl())}
               iconType="plusInCircle"
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap
index 621650e6ae69d..97cd1408416a1 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/__snapshots__/index.test.tsx.snap
@@ -69,12 +69,5 @@ exports[`RuleActionsOverflow snapshots renders correctly against snapshot 1`] =
       }
     />
   </EuiPopover>
-  <GenericDownloader
-    data-test-subj="rules-details-generic-downloader"
-    exportSelectedData={[Function]}
-    filename="rules_export.ndjson"
-    ids={Array []}
-    onExportSuccess={[Function]}
-  />
 </Fragment>
 `;
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 53f478da28055..3a27469ba2539 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
@@ -28,6 +28,16 @@ jest.mock('../../../pages/detection_engine/rules/all/actions', () => ({
   editRuleAction: jest.fn(),
 }));
 
+jest.mock('../../../../common/lib/kibana', () => {
+  return {
+    KibanaServices: {
+      get: () => ({
+        http: { fetch: jest.fn() },
+      }),
+    },
+  };
+});
+
 const duplicateRulesActionMock = duplicateRulesAction as jest.Mock;
 const flushPromises = () => new Promise(setImmediate);
 
@@ -41,7 +51,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = shallow(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -54,7 +64,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -70,11 +80,7 @@ describe('RuleActionsOverflow', () => {
 
     test('items are empty when there is a null rule within the rules-details-menu-panel', () => {
       const wrapper = mount(
-        <RuleActionsOverflow
-          rule={null}
-          userHasNoPermissions={false}
-          canDuplicateRuleWithActions={true}
-        />
+        <RuleActionsOverflow rule={null} userHasPermissions canDuplicateRuleWithActions={true} />
       );
       wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
       wrapper.update();
@@ -85,11 +91,7 @@ describe('RuleActionsOverflow', () => {
 
     test('items are empty when there is an undefined rule within the rules-details-menu-panel', () => {
       const wrapper = mount(
-        <RuleActionsOverflow
-          rule={null}
-          userHasNoPermissions={false}
-          canDuplicateRuleWithActions={true}
-        />
+        <RuleActionsOverflow rule={null} userHasPermissions canDuplicateRuleWithActions={true} />
       );
       wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
       wrapper.update();
@@ -102,7 +104,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -119,7 +121,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={true}
+          userHasPermissions={false}
           canDuplicateRuleWithActions={true}
         />
       );
@@ -137,7 +139,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={rule}
-          userHasNoPermissions={true}
+          userHasPermissions={false}
           canDuplicateRuleWithActions={true}
         />
       );
@@ -152,7 +154,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -167,7 +169,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -184,7 +186,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -198,11 +200,7 @@ describe('RuleActionsOverflow', () => {
     test('it calls duplicateRulesAction with the rule and rule.id when rules-details-duplicate-rule is clicked', () => {
       const rule = mockRule('id');
       const wrapper = mount(
-        <RuleActionsOverflow
-          rule={rule}
-          userHasNoPermissions={false}
-          canDuplicateRuleWithActions={true}
-        />
+        <RuleActionsOverflow rule={rule} userHasPermissions canDuplicateRuleWithActions={true} />
       );
       wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
       wrapper.update();
@@ -222,11 +220,7 @@ describe('RuleActionsOverflow', () => {
     const ruleDuplicate = mockRule('newRule');
     duplicateRulesActionMock.mockImplementation(() => Promise.resolve([ruleDuplicate]));
     const wrapper = mount(
-      <RuleActionsOverflow
-        rule={rule}
-        userHasNoPermissions={false}
-        canDuplicateRuleWithActions={true}
-      />
+      <RuleActionsOverflow rule={rule} userHasPermissions canDuplicateRuleWithActions={true} />
     );
     wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
     wrapper.update();
@@ -244,7 +238,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={rule}
-          userHasNoPermissions={true}
+          userHasPermissions={false}
           canDuplicateRuleWithActions={true}
         />
       );
@@ -259,7 +253,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -272,33 +266,11 @@ describe('RuleActionsOverflow', () => {
       ).toEqual(false);
     });
 
-    test('it sets the rule.rule_id on the generic downloader when rules-details-export-rule is clicked', () => {
-      const rule = mockRule('id');
-      const wrapper = mount(
-        <RuleActionsOverflow
-          rule={rule}
-          userHasNoPermissions={false}
-          canDuplicateRuleWithActions={true}
-        />
-      );
-      wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
-      wrapper.update();
-      wrapper.find('[data-test-subj="rules-details-export-rule"] button').simulate('click');
-      wrapper.update();
-      expect(
-        wrapper.find('[data-test-subj="rules-details-generic-downloader"]').prop('ids')
-      ).toEqual([rule.rule_id]);
-    });
-
     test('it does not close the pop over on rules-details-export-rule when the rule is an immutable rule and the user does a click', () => {
       const rule = mockRule('id');
       rule.immutable = true;
       const wrapper = mount(
-        <RuleActionsOverflow
-          rule={rule}
-          userHasNoPermissions={false}
-          canDuplicateRuleWithActions={true}
-        />
+        <RuleActionsOverflow rule={rule} userHasPermissions canDuplicateRuleWithActions={true} />
       );
       wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
       wrapper.update();
@@ -308,25 +280,6 @@ describe('RuleActionsOverflow', () => {
         wrapper.find('[data-test-subj="rules-details-popover"]').first().prop('isOpen')
       ).toEqual(true);
     });
-
-    test('it does not set the rule.rule_id on rules-details-export-rule when the rule is an immutable rule', () => {
-      const rule = mockRule('id');
-      rule.immutable = true;
-      const wrapper = mount(
-        <RuleActionsOverflow
-          rule={rule}
-          userHasNoPermissions={false}
-          canDuplicateRuleWithActions={true}
-        />
-      );
-      wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
-      wrapper.update();
-      wrapper.find('[data-test-subj="rules-details-export-rule"] button').simulate('click');
-      wrapper.update();
-      expect(
-        wrapper.find('[data-test-subj="rules-details-generic-downloader"]').prop('ids')
-      ).toEqual([]);
-    });
   });
 
   describe('rules details delete rule', () => {
@@ -335,7 +288,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={rule}
-          userHasNoPermissions={true}
+          userHasPermissions={false}
           canDuplicateRuleWithActions={true}
         />
       );
@@ -350,7 +303,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -367,7 +320,7 @@ describe('RuleActionsOverflow', () => {
       const wrapper = mount(
         <RuleActionsOverflow
           rule={mockRule('id')}
-          userHasNoPermissions={false}
+          userHasPermissions
           canDuplicateRuleWithActions={true}
         />
       );
@@ -381,11 +334,7 @@ describe('RuleActionsOverflow', () => {
     test('it calls deleteRulesAction with the rule.id when rules-details-delete-rule is clicked', () => {
       const rule = mockRule('id');
       const wrapper = mount(
-        <RuleActionsOverflow
-          rule={rule}
-          userHasNoPermissions={false}
-          canDuplicateRuleWithActions={true}
-        />
+        <RuleActionsOverflow rule={rule} userHasPermissions canDuplicateRuleWithActions={true} />
       );
       wrapper.find('[data-test-subj="rules-details-popover-button-icon"] button').simulate('click');
       wrapper.update();
diff --git a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.tsx b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.tsx
index 0482e1997c9d1..e0841824d512f 100644
--- a/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/components/rules/rule_actions_overflow/index.tsx
@@ -12,23 +12,24 @@ import {
   EuiPopover,
   EuiToolTip,
 } from '@elastic/eui';
-import React, { useCallback, useMemo, useState } from 'react';
+import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 
 import { noop } from 'lodash/fp';
 import { useHistory } from 'react-router-dom';
-import { Rule, exportRules } from '../../../containers/detection_engine/rules';
+import { Rule } from '../../../containers/detection_engine/rules';
 import * as i18n from './translations';
 import * as i18nActions from '../../../pages/detection_engine/rules/translations';
-import { displaySuccessToast, useStateToaster } from '../../../../common/components/toasters';
+import { useStateToaster } from '../../../../common/components/toasters';
 import {
   deleteRulesAction,
   duplicateRulesAction,
   editRuleAction,
+  exportRulesAction,
 } from '../../../pages/detection_engine/rules/all/actions';
-import { GenericDownloader } from '../../../../common/components/generic_downloader';
 import { getRulesUrl } from '../../../../common/components/link_to/redirect_to_detection_engine';
 import { getToolTipContent } from '../../../../common/utils/privileges';
+import { useBoolState } from '../../../../common/hooks/use_bool_state';
 
 const MyEuiButtonIcon = styled(EuiButtonIcon)`
   &.euiButtonIcon {
@@ -43,7 +44,7 @@ const MyEuiButtonIcon = styled(EuiButtonIcon)`
 
 interface RuleActionsOverflowComponentProps {
   rule: Rule | null;
-  userHasNoPermissions: boolean;
+  userHasPermissions: boolean;
   canDuplicateRuleWithActions: boolean;
 }
 
@@ -52,11 +53,10 @@ interface RuleActionsOverflowComponentProps {
  */
 const RuleActionsOverflowComponent = ({
   rule,
-  userHasNoPermissions,
+  userHasPermissions,
   canDuplicateRuleWithActions,
 }: RuleActionsOverflowComponentProps) => {
-  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
-  const [rulesToExport, setRulesToExport] = useState<string[]>([]);
+  const [isPopoverOpen, , closePopover, togglePopover] = useBoolState();
   const history = useHistory();
   const [, dispatchToaster] = useStateToaster();
 
@@ -71,10 +71,10 @@ const RuleActionsOverflowComponent = ({
             <EuiContextMenuItem
               key={i18nActions.DUPLICATE_RULE}
               icon="copy"
-              disabled={!canDuplicateRuleWithActions || userHasNoPermissions}
+              disabled={!canDuplicateRuleWithActions || !userHasPermissions}
               data-test-subj="rules-details-duplicate-rule"
               onClick={async () => {
-                setIsPopoverOpen(false);
+                closePopover();
                 const createdRules = await duplicateRulesAction(
                   [rule],
                   [rule.id],
@@ -96,11 +96,11 @@ const RuleActionsOverflowComponent = ({
             <EuiContextMenuItem
               key={i18nActions.EXPORT_RULE}
               icon="exportAction"
-              disabled={userHasNoPermissions || rule.immutable}
+              disabled={!userHasPermissions || rule.immutable}
               data-test-subj="rules-details-export-rule"
-              onClick={() => {
-                setIsPopoverOpen(false);
-                setRulesToExport([rule.rule_id]);
+              onClick={async () => {
+                closePopover();
+                await exportRulesAction([rule.rule_id], noop, dispatchToaster);
               }}
             >
               {i18nActions.EXPORT_RULE}
@@ -108,10 +108,10 @@ const RuleActionsOverflowComponent = ({
             <EuiContextMenuItem
               key={i18nActions.DELETE_RULE}
               icon="trash"
-              disabled={userHasNoPermissions}
+              disabled={!userHasPermissions}
               data-test-subj="rules-details-delete-rule"
               onClick={async () => {
-                setIsPopoverOpen(false);
+                closePopover();
                 await deleteRulesAction([rule.id], noop, dispatchToaster, onRuleDeletedCallback);
               }}
             >
@@ -119,27 +119,30 @@ const RuleActionsOverflowComponent = ({
             </EuiContextMenuItem>,
           ]
         : [],
-    // eslint-disable-next-line react-hooks/exhaustive-deps
-    [rule, userHasNoPermissions]
+    [
+      canDuplicateRuleWithActions,
+      closePopover,
+      dispatchToaster,
+      history,
+      onRuleDeletedCallback,
+      rule,
+      userHasPermissions,
+    ]
   );
 
-  const handlePopoverOpen = useCallback(() => {
-    setIsPopoverOpen(!isPopoverOpen);
-  }, [setIsPopoverOpen, isPopoverOpen]);
-
   const button = useMemo(
     () => (
       <EuiToolTip position="top" content={i18n.ALL_ACTIONS}>
         <MyEuiButtonIcon
           iconType="boxesHorizontal"
           aria-label={i18n.ALL_ACTIONS}
-          isDisabled={userHasNoPermissions}
+          isDisabled={!userHasPermissions}
           data-test-subj="rules-details-popover-button-icon"
-          onClick={handlePopoverOpen}
+          onClick={togglePopover}
         />
       </EuiToolTip>
     ),
-    [handlePopoverOpen, userHasNoPermissions]
+    [togglePopover, userHasPermissions]
   );
 
   return (
@@ -147,7 +150,7 @@ const RuleActionsOverflowComponent = ({
       <EuiPopover
         anchorPosition="leftCenter"
         button={button}
-        closePopover={() => setIsPopoverOpen(false)}
+        closePopover={closePopover}
         id="ruleActionsOverflow"
         isOpen={isPopoverOpen}
         data-test-subj="rules-details-popover"
@@ -157,18 +160,6 @@ const RuleActionsOverflowComponent = ({
       >
         <EuiContextMenuPanel data-test-subj="rules-details-menu-panel" items={actions} />
       </EuiPopover>
-      <GenericDownloader
-        filename={`${i18nActions.EXPORT_FILENAME}.ndjson`}
-        ids={rulesToExport}
-        exportSelectedData={exportRules}
-        data-test-subj="rules-details-generic-downloader"
-        onExportSuccess={(exportCount) => {
-          displaySuccessToast(
-            i18nActions.SUCCESSFULLY_EXPORTED_RULES(exportCount),
-            dispatchToaster
-          );
-        }}
-      />
     </>
   );
 };
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 a31371c31cbbb..8a85d35d77fac 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
@@ -89,6 +89,7 @@ const StepRuleActionsComponent: FC<StepRuleActionsProps> = ({
     ...(defaultValues ?? stepActionsDefaultValue),
     kibanaSiemAppUrl: kibanaAbsoluteUrl,
   };
+
   const schema = useMemo(() => getSchema({ actionTypeRegistry }), [actionTypeRegistry]);
   const { form } = useForm<ActionsStepRule>({
     defaultValue: initialState,
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 992f30e795bbf..3266d6f61eeed 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
@@ -15,13 +15,13 @@ describe('stepRuleActions schema', () => {
   const actionTypeRegistry = actionTypeRegistryMock.create();
 
   describe('validateSingleAction', () => {
-    it('should validate single action', () => {
+    it('should validate single action', async () => {
       (isUuid as jest.Mock).mockReturnValue(true);
       (validateActionParams as jest.Mock).mockReturnValue([]);
       (validateMustache as jest.Mock).mockReturnValue([]);
 
       expect(
-        validateSingleAction(
+        await validateSingleAction(
           {
             id: '817b8bca-91d1-4729-8ee1-3a83aaafd9d4',
             group: 'default',
@@ -33,12 +33,12 @@ describe('stepRuleActions schema', () => {
       ).toHaveLength(0);
     });
 
-    it('should validate single action with invalid mustache template', () => {
+    it('should validate single action with invalid mustache template', async () => {
       (isUuid as jest.Mock).mockReturnValue(true);
       (validateActionParams as jest.Mock).mockReturnValue([]);
       (validateMustache as jest.Mock).mockReturnValue(['Message is not valid mustache template']);
 
-      const errors = validateSingleAction(
+      const errors = await validateSingleAction(
         {
           id: '817b8bca-91d1-4729-8ee1-3a83aaafd9d4',
           group: 'default',
@@ -54,12 +54,12 @@ describe('stepRuleActions schema', () => {
       expect(errors[0]).toEqual('Message is not valid mustache template');
     });
 
-    it('should validate single action with incorrect id', () => {
+    it('should validate single action with incorrect id', async () => {
       (isUuid as jest.Mock).mockReturnValue(false);
       (validateMustache as jest.Mock).mockReturnValue([]);
       (validateActionParams as jest.Mock).mockReturnValue([]);
 
-      const errors = validateSingleAction(
+      const errors = await validateSingleAction(
         {
           id: '823d4',
           group: 'default',
@@ -74,10 +74,10 @@ describe('stepRuleActions schema', () => {
   });
 
   describe('validateRuleActionsField', () => {
-    it('should validate rule actions field', () => {
+    it('should validate rule actions field', async () => {
       const validator = validateRuleActionsField(actionTypeRegistry);
 
-      const result = validator({
+      const result = await validator({
         path: '',
         value: [],
         form: {} as FormHook,
@@ -88,11 +88,11 @@ describe('stepRuleActions schema', () => {
       expect(result).toEqual(undefined);
     });
 
-    it('should validate incorrect rule actions field', () => {
+    it('should validate incorrect rule actions field', async () => {
       (getActionTypeName as jest.Mock).mockReturnValue('Slack');
       const validator = validateRuleActionsField(actionTypeRegistry);
 
-      const result = validator({
+      const result = await validator({
         path: '',
         value: [
           {
@@ -117,7 +117,7 @@ describe('stepRuleActions schema', () => {
       });
     });
 
-    it('should validate multiple incorrect rule actions field', () => {
+    it('should validate multiple incorrect rule actions field', async () => {
       (isUuid as jest.Mock).mockReturnValueOnce(false);
       (getActionTypeName as jest.Mock).mockReturnValueOnce('Slack');
       (isUuid as jest.Mock).mockReturnValueOnce(true);
@@ -126,7 +126,7 @@ describe('stepRuleActions schema', () => {
       (validateMustache as jest.Mock).mockReturnValue(['Component is not valid mustache template']);
       const validator = validateRuleActionsField(actionTypeRegistry);
 
-      const result = validator({
+      const result = await validator({
         path: '',
         value: [
           {
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 bc32bdc387cd2..a697d922eda97 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
@@ -13,42 +13,46 @@ import {
   AlertAction,
   ActionTypeRegistryContract,
 } from '../../../../../../triggers_actions_ui/public';
-import { FormSchema, ValidationFunc, ERROR_CODE } from '../../../../shared_imports';
+import {
+  FormSchema,
+  ValidationFunc,
+  ERROR_CODE,
+  ValidationError,
+} from '../../../../shared_imports';
 import { ActionsStepRule } from '../../../pages/detection_engine/rules/types';
 import * as I18n from './translations';
 import { isUuid, getActionTypeName, validateMustache, validateActionParams } from './utils';
 
-export const validateSingleAction = (
+export const validateSingleAction = async (
   actionItem: AlertAction,
   actionTypeRegistry: ActionTypeRegistryContract
-): string[] => {
+): Promise<string[]> => {
   if (!isUuid(actionItem.id)) {
     return [I18n.NO_CONNECTOR_SELECTED];
   }
 
-  const actionParamsErrors = validateActionParams(actionItem, actionTypeRegistry);
+  const actionParamsErrors = await validateActionParams(actionItem, actionTypeRegistry);
   const mustacheErrors = validateMustache(actionItem.params);
 
   return [...actionParamsErrors, ...mustacheErrors];
 };
 
-export const validateRuleActionsField = (actionTypeRegistry: ActionTypeRegistryContract) => (
+export const validateRuleActionsField = (actionTypeRegistry: ActionTypeRegistryContract) => async (
   ...data: Parameters<ValidationFunc>
-): ReturnType<ValidationFunc<{}, ERROR_CODE>> | undefined => {
+): Promise<ValidationError<ERROR_CODE> | void | undefined> => {
   const [{ value, path }] = data as [{ value: AlertAction[]; path: string }];
 
-  const errors = value.reduce((acc, actionItem) => {
-    const errorsArray = validateSingleAction(actionItem, actionTypeRegistry);
+  const errors = [];
+  for (const actionItem of value) {
+    const errorsArray = await validateSingleAction(actionItem, actionTypeRegistry);
 
     if (errorsArray.length) {
       const actionTypeName = getActionTypeName(actionItem.actionTypeId);
       const errorsListItems = errorsArray.map((error) => `*   ${error}\n`);
 
-      return [...acc, `\n**${actionTypeName}:**\n${errorsListItems.join('')}`];
+      errors.push(`\n**${actionTypeName}:**\n${errorsListItems.join('')}`);
     }
-
-    return acc;
-  }, [] as string[]);
+  }
 
   if (errors.length) {
     return {
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 3d7299c1673b1..7c4ea71c983c8 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
@@ -61,11 +61,11 @@ describe('stepRuleActions utils', () => {
       actionTypeRegistry.get.mockReturnValue(actionMock);
     });
 
-    it('should validate action params', () => {
+    it('should validate action params', async () => {
       validateParamsMock.mockReturnValue({ errors: [] });
 
       expect(
-        validateActionParams(
+        await validateActionParams(
           {
             id: '817b8bca-91d1-4729-8ee1-3a83aaafd9d4',
             group: 'default',
@@ -79,13 +79,13 @@ describe('stepRuleActions utils', () => {
       ).toHaveLength(0);
     });
 
-    it('should validate incorrect action params', () => {
+    it('should validate incorrect action params', async () => {
       validateParamsMock.mockReturnValue({
         errors: ['Message is required'],
       });
 
       expect(
-        validateActionParams(
+        await validateActionParams(
           {
             id: '817b8bca-91d1-4729-8ee1-3a83aaafd9d4',
             group: 'default',
@@ -97,7 +97,7 @@ describe('stepRuleActions utils', () => {
       ).toHaveLength(1);
     });
 
-    it('should validate incorrect action params and filter error objects', () => {
+    it('should validate incorrect action params and filter error objects', async () => {
       validateParamsMock.mockReturnValue({
         errors: [
           {
@@ -107,7 +107,7 @@ describe('stepRuleActions utils', () => {
       });
 
       expect(
-        validateActionParams(
+        await validateActionParams(
           {
             id: '817b8bca-91d1-4729-8ee1-3a83aaafd9d4',
             group: 'default',
@@ -119,13 +119,13 @@ describe('stepRuleActions utils', () => {
       ).toHaveLength(0);
     });
 
-    it('should validate incorrect action params and filter duplicated errors', () => {
+    it('should validate incorrect action params and filter duplicated errors', async () => {
       validateParamsMock.mockReturnValue({
         errors: ['Message is required', 'Message is required', 'Message is required'],
       });
 
       expect(
-        validateActionParams(
+        await validateActionParams(
           {
             id: '817b8bca-91d1-4729-8ee1-3a83aaafd9d4',
             group: 'default',
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 d241d4283fc77..22363df5164a6 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
@@ -41,11 +41,11 @@ export const validateMustache = (params: AlertAction['params']) => {
   return errors;
 };
 
-export const validateActionParams = (
+export const validateActionParams = async (
   actionItem: AlertAction,
   actionTypeRegistry: ActionTypeRegistryContract
-): string[] => {
-  const actionErrors = actionTypeRegistry
+): Promise<string[]> => {
+  const actionErrors = await actionTypeRegistry
     .get(actionItem.actionTypeId)
     ?.validateParams(actionItem.params);
 
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 65185b4d05135..4edbd5ab7e180 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
@@ -14,7 +14,7 @@ import {
   DETECTION_ENGINE_INDEX_URL,
   DETECTION_ENGINE_PRIVILEGES_URL,
 } from '../../../../../common/constants';
-import { HOST_METADATA_GET_API } from '../../../../../common/endpoint/constants';
+import { HOST_METADATA_GET_ROUTE } from '../../../../../common/endpoint/constants';
 import { KibanaServices } from '../../../../common/lib/kibana';
 import {
   BasicSignals,
@@ -25,8 +25,8 @@ import {
   UpdateAlertStatusProps,
   CasesFromAlertsResponse,
 } from './types';
-import { resolvePathVariables } from '../../../../management/pages/trusted_apps/service/utils';
 import { isolateHost, unIsolateHost } from '../../../../common/lib/host_isolation';
+import { resolvePathVariables } from '../../../../common/utils/resolve_path_variables';
 
 /**
  * Fetch Alerts by providing a query
@@ -163,11 +163,14 @@ export const createHostUnIsolation = async ({
  */
 export const getCaseIdsFromAlertId = async ({
   alertId,
+  owner,
 }: {
   alertId: string;
+  owner: string[];
 }): Promise<CasesFromAlertsResponse> =>
   KibanaServices.get().http.fetch<CasesFromAlertsResponse>(getCasesFromAlertsUrl(alertId), {
     method: 'get',
+    query: { ...(owner.length > 0 ? { owner } : {}) },
   });
 
 /**
@@ -181,6 +184,6 @@ export const getHostMetadata = async ({
   agentId: string;
 }): Promise<HostMetadataInfo> =>
   KibanaServices.get().http.fetch<HostMetadataInfo>(
-    resolvePathVariables(HOST_METADATA_GET_API, { id: agentId }),
+    resolvePathVariables(HOST_METADATA_GET_ROUTE, { id: agentId }),
     { method: 'get' }
   );
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_cases_from_alerts.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_cases_from_alerts.tsx
index fb130eb744700..85b80a588e88d 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_cases_from_alerts.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_cases_from_alerts.tsx
@@ -7,6 +7,7 @@
 
 import { isEmpty } from 'lodash';
 import { useEffect, useState } from 'react';
+import { APP_ID } from '../../../../../common/constants';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { getCaseIdsFromAlertId } from './api';
 import { CASES_FROM_ALERTS_FAILURE } from './translations';
@@ -28,7 +29,7 @@ export const useCasesFromAlerts = ({ alertId }: { alertId: string }): CasesFromA
     setLoading(true);
     const fetchData = async () => {
       try {
-        const casesResponse = await getCaseIdsFromAlertId({ alertId });
+        const casesResponse = await getCaseIdsFromAlertId({ alertId, owner: [APP_ID] });
         if (isMounted) {
           setCases(casesResponse);
         }
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx
index adc6d3a6b054b..f7894d4764275 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/alerts/use_host_isolation_status.tsx
@@ -11,6 +11,7 @@ import { Maybe } from '../../../../../../observability/common/typings';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
 import { getHostMetadata } from './api';
 import { ISOLATION_STATUS_FAILURE } from './translations';
+import { isEndpointHostIsolated } from '../../../../common/utils/validators';
 
 interface HostIsolationStatusResponse {
   loading: boolean;
@@ -36,7 +37,7 @@ export const useHostIsolationStatus = ({
       try {
         const metadataResponse = await getHostMetadata({ agentId });
         if (isMounted) {
-          setIsIsolated(Boolean(metadataResponse.metadata.Endpoint.state.isolation));
+          setIsIsolated(isEndpointHostIsolated(metadataResponse.metadata));
         }
       } catch (error) {
         addError(error.message, { title: ISOLATION_STATUS_FAILURE });
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 d4c4e10813172..7de91a07a68a0 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
@@ -13,6 +13,7 @@ import {
   DETECTION_ENGINE_RULES_STATUS_URL,
   DETECTION_ENGINE_PREPACKAGED_RULES_STATUS_URL,
   DETECTION_ENGINE_TAGS_URL,
+  DETECTION_ENGINE_RULES_BULK_ACTION,
 } from '../../../../../common/constants';
 import {
   UpdateRulesProps,
@@ -32,10 +33,14 @@ import {
   PrePackagedRulesStatusResponse,
   BulkRuleResponse,
   PatchRuleProps,
+  BulkActionProps,
+  BulkActionResponse,
 } from './types';
 import { KibanaServices } from '../../../../common/lib/kibana';
 import * as i18n from '../../../pages/detection_engine/rules/translations';
 import { RulesSchema } from '../../../../../common/detection_engine/schemas/response';
+import { convertRulesFilterToKQL } from './utils';
+import { BulkAction } from '../../../../../common/detection_engine/schemas/common/schemas';
 
 /**
  * Create provided Rule
@@ -110,26 +115,7 @@ export const fetchRules = async ({
   },
   signal,
 }: FetchRulesProps): Promise<FetchRulesResponse> => {
-  const showCustomRuleFilter = filterOptions.showCustomRules
-    ? [`alert.attributes.tags: "__internal_immutable:false"`]
-    : [];
-  const showElasticRuleFilter = filterOptions.showElasticRules
-    ? [`alert.attributes.tags: "__internal_immutable:true"`]
-    : [];
-  const filtersWithoutTags = [
-    ...(filterOptions.filter.length ? [`alert.attributes.name: ${filterOptions.filter}`] : []),
-    ...showCustomRuleFilter,
-    ...showElasticRuleFilter,
-  ].join(' AND ');
-
-  const tags = filterOptions.tags
-    .map((t) => `alert.attributes.tags: "${t.replace(/"/g, '\\"')}"`)
-    .join(' AND ');
-
-  const filterString =
-    filtersWithoutTags !== '' && tags !== ''
-      ? `${filtersWithoutTags} AND (${tags})`
-      : filtersWithoutTags + tags;
+  const filterString = convertRulesFilterToKQL(filterOptions);
 
   const getFieldNameForSortField = (field: string) => {
     return field === 'name' ? `${field}.keyword` : field;
@@ -243,6 +229,23 @@ export const duplicateRules = async ({ rules }: DuplicateRulesProps): Promise<Bu
     ),
   });
 
+/**
+ * Perform bulk action with rules selected by a filter query
+ *
+ * @param query filter query to select rules to perform bulk action with
+ * @param action bulk action to perform
+ *
+ * @throws An error if response is not OK
+ */
+export const performBulkAction = async <Action extends BulkAction>({
+  action,
+  query,
+}: BulkActionProps<Action>): Promise<BulkActionResponse<Action>> =>
+  KibanaServices.get().http.fetch<BulkActionResponse<Action>>(DETECTION_ENGINE_RULES_BULK_ACTION, {
+    method: 'POST',
+    body: JSON.stringify({ action, query }),
+  });
+
 /**
  * Create Prepackaged Rules
  *
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.test.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.test.ts
index 60edeaf0de983..2a983117db524 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.test.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.test.ts
@@ -7,7 +7,7 @@
 
 import { mockRule } from '../../../../pages/detection_engine/rules/all/__mocks__/mock';
 import { FilterOptions, PaginationOptions } from '../types';
-import { RulesTableAction, RulesTableState, createRulesTableReducer } from './rules_table_reducer';
+import { RulesTableState, rulesTableReducer } from './rules_table_reducer';
 
 const initialState: RulesTableState = {
   rules: [],
@@ -24,10 +24,10 @@ const initialState: RulesTableState = {
     showCustomRules: false,
     showElasticRules: false,
   },
+  isAllSelected: false,
   loadingRulesAction: null,
   loadingRuleIds: [],
   selectedRuleIds: [],
-  exportRuleIds: [],
   lastUpdated: 0,
   isRefreshOn: false,
   isRefreshing: false,
@@ -35,36 +35,20 @@ const initialState: RulesTableState = {
 };
 
 describe('allRulesReducer', () => {
-  let reducer: (state: RulesTableState, action: RulesTableAction) => RulesTableState;
-
   beforeEach(() => {
     jest.useFakeTimers();
     jest
       .spyOn(global.Date, 'now')
       .mockImplementationOnce(() => new Date('2020-10-31T11:01:58.135Z').valueOf());
-    reducer = createRulesTableReducer({ current: null });
   });
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
-  describe('#exportRuleIds', () => {
-    test('should update state with rules to be exported', () => {
-      const { loadingRuleIds, loadingRulesAction, exportRuleIds } = reducer(initialState, {
-        type: 'exportRuleIds',
-        ids: ['123', '456'],
-      });
-
-      expect(loadingRuleIds).toEqual(['123', '456']);
-      expect(exportRuleIds).toEqual(['123', '456']);
-      expect(loadingRulesAction).toEqual('export');
-    });
-  });
-
   describe('#loadingRuleIds', () => {
-    test('should update state with rule ids with a pending action', () => {
-      const { loadingRuleIds, loadingRulesAction } = reducer(initialState, {
+    it('should update state with rule ids with a pending action', () => {
+      const { loadingRuleIds, loadingRulesAction } = rulesTableReducer(initialState, {
         type: 'loadingRuleIds',
         ids: ['123', '456'],
         actionType: 'enable',
@@ -74,8 +58,8 @@ describe('allRulesReducer', () => {
       expect(loadingRulesAction).toEqual('enable');
     });
 
-    test('should update loadingIds to empty array if action is null', () => {
-      const { loadingRuleIds, loadingRulesAction } = reducer(initialState, {
+    it('should update loadingIds to empty array if action is null', () => {
+      const { loadingRuleIds, loadingRulesAction } = rulesTableReducer(initialState, {
         type: 'loadingRuleIds',
         ids: ['123', '456'],
         actionType: null,
@@ -85,8 +69,8 @@ describe('allRulesReducer', () => {
       expect(loadingRulesAction).toBeNull();
     });
 
-    test('should append rule ids to any existing loading ids', () => {
-      const { loadingRuleIds, loadingRulesAction } = reducer(
+    it('should append rule ids to any existing loading ids', () => {
+      const { loadingRuleIds, loadingRulesAction } = rulesTableReducer(
         { ...initialState, loadingRuleIds: ['abc'] },
         {
           type: 'loadingRuleIds',
@@ -101,8 +85,8 @@ describe('allRulesReducer', () => {
   });
 
   describe('#selectedRuleIds', () => {
-    test('should update state with selected rule ids', () => {
-      const { selectedRuleIds } = reducer(initialState, {
+    it('should update state with selected rule ids', () => {
+      const { selectedRuleIds } = rulesTableReducer(initialState, {
         type: 'selectedRuleIds',
         ids: ['123', '456'],
       });
@@ -112,19 +96,22 @@ describe('allRulesReducer', () => {
   });
 
   describe('#setRules', () => {
-    test('should update rules and reset loading/selected rule ids', () => {
-      const { selectedRuleIds, loadingRuleIds, loadingRulesAction, pagination, rules } = reducer(
-        initialState,
-        {
-          type: 'setRules',
-          rules: [mockRule('someRuleId')],
-          pagination: {
-            page: 1,
-            perPage: 20,
-            total: 0,
-          },
-        }
-      );
+    it('should update rules and reset loading/selected rule ids', () => {
+      const {
+        selectedRuleIds,
+        loadingRuleIds,
+        loadingRulesAction,
+        pagination,
+        rules,
+      } = rulesTableReducer(initialState, {
+        type: 'setRules',
+        rules: [mockRule('someRuleId')],
+        pagination: {
+          page: 1,
+          perPage: 20,
+          total: 0,
+        },
+      });
 
       expect(rules).toEqual([mockRule('someRuleId')]);
       expect(selectedRuleIds).toEqual([]);
@@ -139,9 +126,9 @@ describe('allRulesReducer', () => {
   });
 
   describe('#updateRules', () => {
-    test('should return existing and new rules', () => {
+    it('should return existing and new rules', () => {
       const existingRule = { ...mockRule('123'), rule_id: 'rule-123' };
-      const { rules, loadingRulesAction } = reducer(
+      const { rules, loadingRulesAction } = rulesTableReducer(
         { ...initialState, rules: [existingRule] },
         {
           type: 'updateRules',
@@ -153,9 +140,9 @@ describe('allRulesReducer', () => {
       expect(loadingRulesAction).toBeNull();
     });
 
-    test('should return updated rule', () => {
+    it('should return updated rule', () => {
       const updatedRule = { ...mockRule('someRuleId'), description: 'updated rule' };
-      const { rules, loadingRulesAction } = reducer(
+      const { rules, loadingRulesAction } = rulesTableReducer(
         { ...initialState, rules: [mockRule('someRuleId')] },
         {
           type: 'updateRules',
@@ -167,9 +154,9 @@ describe('allRulesReducer', () => {
       expect(loadingRulesAction).toBeNull();
     });
 
-    test('should return updated existing loading rule ids', () => {
+    it('should return updated existing loading rule ids', () => {
       const existingRule = { ...mockRule('someRuleId'), id: '123', rule_id: 'rule-123' };
-      const { loadingRuleIds, loadingRulesAction } = reducer(
+      const { loadingRuleIds, loadingRulesAction } = rulesTableReducer(
         {
           ...initialState,
           rules: [existingRule],
@@ -188,7 +175,7 @@ describe('allRulesReducer', () => {
   });
 
   describe('#updateFilterOptions', () => {
-    test('should return existing and new rules', () => {
+    it('should return existing and new rules', () => {
       const paginationMock: PaginationOptions = {
         page: 1,
         perPage: 20,
@@ -202,7 +189,7 @@ describe('allRulesReducer', () => {
         showCustomRules: false,
         showElasticRules: false,
       };
-      const { filterOptions, pagination } = reducer(initialState, {
+      const { filterOptions, pagination } = rulesTableReducer(initialState, {
         type: 'updateFilterOptions',
         filterOptions: filterMock,
         pagination: paginationMock,
@@ -214,8 +201,8 @@ describe('allRulesReducer', () => {
   });
 
   describe('#failure', () => {
-    test('should reset rules value to empty array', () => {
-      const { rules } = reducer(initialState, {
+    it('should reset rules value to empty array', () => {
+      const { rules } = rulesTableReducer(initialState, {
         type: 'failure',
       });
 
@@ -224,8 +211,8 @@ describe('allRulesReducer', () => {
   });
 
   describe('#setLastRefreshDate', () => {
-    test('should update last refresh date with current date', () => {
-      const { lastUpdated } = reducer(initialState, {
+    it('should update last refresh date with current date', () => {
+      const { lastUpdated } = rulesTableReducer(initialState, {
         type: 'setLastRefreshDate',
       });
 
@@ -234,8 +221,8 @@ describe('allRulesReducer', () => {
   });
 
   describe('#setShowIdleModal', () => {
-    test('should hide idle modal and restart refresh if "show" is false', () => {
-      const { showIdleModal, isRefreshOn } = reducer(initialState, {
+    it('should hide idle modal and restart refresh if "show" is false', () => {
+      const { showIdleModal, isRefreshOn } = rulesTableReducer(initialState, {
         type: 'setShowIdleModal',
         show: false,
       });
@@ -244,8 +231,8 @@ describe('allRulesReducer', () => {
       expect(isRefreshOn).toBeTruthy();
     });
 
-    test('should show idle modal and pause refresh if "show" is true', () => {
-      const { showIdleModal, isRefreshOn } = reducer(initialState, {
+    it('should show idle modal and pause refresh if "show" is true', () => {
+      const { showIdleModal, isRefreshOn } = rulesTableReducer(initialState, {
         type: 'setShowIdleModal',
         show: true,
       });
@@ -256,8 +243,8 @@ describe('allRulesReducer', () => {
   });
 
   describe('#setAutoRefreshOn', () => {
-    test('should pause auto refresh if "paused" is true', () => {
-      const { isRefreshOn } = reducer(initialState, {
+    it('should pause auto refresh if "paused" is true', () => {
+      const { isRefreshOn } = rulesTableReducer(initialState, {
         type: 'setAutoRefreshOn',
         on: true,
       });
@@ -265,8 +252,8 @@ describe('allRulesReducer', () => {
       expect(isRefreshOn).toBeTruthy();
     });
 
-    test('should resume auto refresh if "paused" is false', () => {
-      const { isRefreshOn } = reducer(initialState, {
+    it('should resume auto refresh if "paused" is false', () => {
+      const { isRefreshOn } = rulesTableReducer(initialState, {
         type: 'setAutoRefreshOn',
         on: false,
       });
@@ -274,4 +261,58 @@ describe('allRulesReducer', () => {
       expect(isRefreshOn).toBeFalsy();
     });
   });
+
+  describe('#selectAllRules', () => {
+    it('should select all rules', () => {
+      const state = rulesTableReducer(
+        {
+          ...initialState,
+          rules: [mockRule('1'), mockRule('2'), mockRule('3')],
+        },
+        {
+          type: 'setIsAllSelected',
+          isAllSelected: true,
+        }
+      );
+
+      expect(state.isAllSelected).toBe(true);
+      expect(state.selectedRuleIds).toEqual(['1', '2', '3']);
+    });
+
+    it('should deselect all rules', () => {
+      const state = rulesTableReducer(
+        {
+          ...initialState,
+          rules: [mockRule('1'), mockRule('2'), mockRule('3')],
+          isAllSelected: true,
+          selectedRuleIds: ['1', '2', '3'],
+        },
+        {
+          type: 'setIsAllSelected',
+          isAllSelected: false,
+        }
+      );
+
+      expect(state.isAllSelected).toBe(false);
+      expect(state.selectedRuleIds).toEqual([]);
+    });
+
+    it('should unset "isAllSelected" on selected rules modification', () => {
+      const state = rulesTableReducer(
+        {
+          ...initialState,
+          rules: [mockRule('1'), mockRule('2'), mockRule('3')],
+          isAllSelected: true,
+          selectedRuleIds: ['1', '2', '3'],
+        },
+        {
+          type: 'selectedRuleIds',
+          ids: ['1', '2'],
+        }
+      );
+
+      expect(state.isAllSelected).toBe(false);
+      expect(state.selectedRuleIds).toEqual(['1', '2']);
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.ts
index 01a87fef2b723..7d32785222fed 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/rules_table_reducer.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import type React from 'react';
-import { EuiBasicTable } from '@elastic/eui';
 import { FilterOptions, PaginationOptions, Rule } from '../types';
 
 export type LoadingRuleAction =
@@ -25,11 +23,11 @@ export interface RulesTableState {
   loadingRulesAction: LoadingRuleAction;
   loadingRuleIds: string[];
   selectedRuleIds: string[];
-  exportRuleIds: string[];
   lastUpdated: number;
   isRefreshOn: boolean;
   isRefreshing: boolean;
   showIdleModal: boolean;
+  isAllSelected: boolean;
 }
 
 export type RulesTableAction =
@@ -42,128 +40,119 @@ export type RulesTableAction =
     }
   | { type: 'loadingRuleIds'; ids: string[]; actionType: LoadingRuleAction }
   | { type: 'selectedRuleIds'; ids: string[] }
-  | { type: 'exportRuleIds'; ids: string[] }
   | { type: 'setLastRefreshDate' }
   | { type: 'setAutoRefreshOn'; on: boolean }
   | { type: 'setIsRefreshing'; isRefreshing: boolean }
+  | { type: 'setIsAllSelected'; isAllSelected: boolean }
   | { type: 'setShowIdleModal'; show: boolean }
   | { type: 'failure' };
 
-export const createRulesTableReducer = (
-  tableRef: React.MutableRefObject<EuiBasicTable<unknown> | null>
-) => {
-  const rulesTableReducer = (state: RulesTableState, action: RulesTableAction): RulesTableState => {
-    switch (action.type) {
-      case 'setRules': {
-        if (tableRef?.current?.changeSelection != null) {
-          // for future devs: eui basic table is not giving us a prop to set the value, so
-          // we are using the ref in setTimeout to reset on the next loop so that we
-          // do not get a warning telling us we are trying to update during a render
-          window.setTimeout(() => tableRef?.current?.changeSelection([]), 0);
+export const rulesTableReducer = (
+  state: RulesTableState,
+  action: RulesTableAction
+): RulesTableState => {
+  switch (action.type) {
+    case 'setRules': {
+      return {
+        ...state,
+        rules: action.rules,
+        selectedRuleIds: state.isAllSelected ? action.rules.map(({ id }) => id) : [],
+        loadingRuleIds: [],
+        loadingRulesAction: null,
+        pagination: {
+          ...state.pagination,
+          ...action.pagination,
+        },
+      };
+    }
+    case 'updateRules': {
+      const ruleIds = state.rules.map((r) => r.id);
+      const updatedRules = action.rules.reduce((rules, updatedRule) => {
+        let newRules = rules;
+        if (ruleIds.includes(updatedRule.id)) {
+          newRules = newRules.map((r) => (updatedRule.id === r.id ? updatedRule : r));
+        } else {
+          newRules = [...newRules, updatedRule];
         }
-
-        return {
-          ...state,
-          rules: action.rules,
-          selectedRuleIds: [],
-          loadingRuleIds: [],
-          loadingRulesAction: null,
-          pagination: {
-            ...state.pagination,
-            ...action.pagination,
-          },
-        };
-      }
-      case 'updateRules': {
-        const ruleIds = state.rules.map((r) => r.id);
-        const updatedRules = action.rules.reduce((rules, updatedRule) => {
-          let newRules = rules;
-          if (ruleIds.includes(updatedRule.id)) {
-            newRules = newRules.map((r) => (updatedRule.id === r.id ? updatedRule : r));
-          } else {
-            newRules = [...newRules, updatedRule];
-          }
-          return newRules;
-        }, state.rules);
-        const updatedRuleIds = action.rules.map((r) => r.id);
-        const newLoadingRuleIds = state.loadingRuleIds.filter((id) => !updatedRuleIds.includes(id));
-        return {
-          ...state,
-          rules: updatedRules,
-          loadingRuleIds: newLoadingRuleIds,
-          loadingRulesAction: newLoadingRuleIds.length === 0 ? null : state.loadingRulesAction,
-        };
-      }
-      case 'updateFilterOptions': {
-        return {
-          ...state,
-          filterOptions: {
-            ...state.filterOptions,
-            ...action.filterOptions,
-          },
-          pagination: {
-            ...state.pagination,
-            ...action.pagination,
-          },
-        };
-      }
-      case 'loadingRuleIds': {
-        return {
-          ...state,
-          loadingRuleIds: action.actionType == null ? [] : [...state.loadingRuleIds, ...action.ids],
-          loadingRulesAction: action.actionType,
-        };
-      }
-      case 'selectedRuleIds': {
-        return {
-          ...state,
-          selectedRuleIds: action.ids,
-        };
-      }
-      case 'exportRuleIds': {
-        return {
-          ...state,
-          loadingRuleIds: action.ids,
-          loadingRulesAction: 'export',
-          exportRuleIds: action.ids,
-        };
-      }
-      case 'setLastRefreshDate': {
-        return {
-          ...state,
-          lastUpdated: Date.now(),
-        };
-      }
-      case 'setAutoRefreshOn': {
-        return {
-          ...state,
-          isRefreshOn: action.on,
-        };
-      }
-      case 'setIsRefreshing': {
-        return {
-          ...state,
-          isRefreshing: action.isRefreshing,
-        };
-      }
-      case 'setShowIdleModal': {
-        return {
-          ...state,
-          showIdleModal: action.show,
-          isRefreshOn: !action.show,
-        };
-      }
-      case 'failure': {
-        return {
-          ...state,
-          rules: [],
-        };
-      }
-      default: {
-        return state;
-      }
+        return newRules;
+      }, state.rules);
+      const updatedRuleIds = action.rules.map((r) => r.id);
+      const newLoadingRuleIds = state.loadingRuleIds.filter((id) => !updatedRuleIds.includes(id));
+      return {
+        ...state,
+        rules: updatedRules,
+        loadingRuleIds: newLoadingRuleIds,
+        loadingRulesAction: newLoadingRuleIds.length === 0 ? null : state.loadingRulesAction,
+      };
     }
-  };
-
-  return rulesTableReducer;
+    case 'updateFilterOptions': {
+      return {
+        ...state,
+        filterOptions: {
+          ...state.filterOptions,
+          ...action.filterOptions,
+        },
+        pagination: {
+          ...state.pagination,
+          ...action.pagination,
+        },
+      };
+    }
+    case 'loadingRuleIds': {
+      return {
+        ...state,
+        loadingRuleIds: action.actionType == null ? [] : [...state.loadingRuleIds, ...action.ids],
+        loadingRulesAction: action.actionType,
+      };
+    }
+    case 'selectedRuleIds': {
+      return {
+        ...state,
+        isAllSelected: false,
+        selectedRuleIds: action.ids,
+      };
+    }
+    case 'setLastRefreshDate': {
+      return {
+        ...state,
+        lastUpdated: Date.now(),
+      };
+    }
+    case 'setAutoRefreshOn': {
+      return {
+        ...state,
+        isRefreshOn: action.on,
+      };
+    }
+    case 'setIsRefreshing': {
+      return {
+        ...state,
+        isRefreshing: action.isRefreshing,
+      };
+    }
+    case 'setIsAllSelected': {
+      const { isAllSelected } = action;
+      return {
+        ...state,
+        isAllSelected,
+        selectedRuleIds: isAllSelected ? state.rules.map(({ id }) => id) : [],
+      };
+    }
+    case 'setShowIdleModal': {
+      return {
+        ...state,
+        showIdleModal: action.show,
+        isRefreshOn: !action.show,
+      };
+    }
+    case 'failure': {
+      return {
+        ...state,
+        rules: [],
+      };
+    }
+    default: {
+      return state;
+    }
+  }
 };
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/use_async_confirmation.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/use_async_confirmation.ts
new file mode 100644
index 0000000000000..cce45f87d8ce3
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/use_async_confirmation.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 { useCallback, useRef } from 'react';
+
+type UseAsyncConfirmationReturn = [
+  initConfirmation: () => Promise<boolean>,
+  confirm: () => void,
+  cancel: () => void
+];
+
+interface UseAsyncConfirmationArgs {
+  onInit: () => void;
+  onFinish: () => void;
+}
+
+export const useAsyncConfirmation = ({
+  onInit,
+  onFinish,
+}: UseAsyncConfirmationArgs): UseAsyncConfirmationReturn => {
+  const confirmationPromiseRef = useRef<(result: boolean) => void>();
+
+  const confirm = useCallback(() => {
+    confirmationPromiseRef.current?.(true);
+  }, []);
+
+  const cancel = useCallback(() => {
+    confirmationPromiseRef.current?.(false);
+  }, []);
+
+  const initConfirmation = useCallback(() => {
+    onInit();
+
+    return new Promise<boolean>((resolve) => {
+      confirmationPromiseRef.current = resolve;
+    }).finally(() => {
+      onFinish();
+    });
+  }, [onInit, onFinish]);
+
+  return [initConfirmation, confirm, cancel];
+};
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/use_rules_table.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/use_rules_table.ts
index 8969843f61a1c..cb41401ee2f40 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/use_rules_table.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/rules_table/use_rules_table.ts
@@ -5,14 +5,11 @@
  * 2.0.
  */
 
-import { Dispatch, useMemo, useReducer, useEffect, useRef } from 'react';
-import { EuiBasicTable } from '@elastic/eui';
-
+import { Dispatch, useReducer, useEffect, useRef } from 'react';
 import { useAppToasts } from '../../../../../common/hooks/use_app_toasts';
 import * as i18n from '../translations';
-
 import { fetchRules } from '../api';
-import { createRulesTableReducer, RulesTableState, RulesTableAction } from './rules_table_reducer';
+import { rulesTableReducer, RulesTableState, RulesTableAction } from './rules_table_reducer';
 import { createRulesTableFacade, RulesTableFacade } from './rules_table_facade';
 
 const INITIAL_SORT_FIELD = 'enabled';
@@ -35,15 +32,14 @@ const initialStateDefaults: RulesTableState = {
   loadingRulesAction: null,
   loadingRuleIds: [],
   selectedRuleIds: [],
-  exportRuleIds: [],
   lastUpdated: 0,
   isRefreshOn: true,
   isRefreshing: false,
+  isAllSelected: false,
   showIdleModal: false,
 };
 
 export interface UseRulesTableParams {
-  tableRef: React.MutableRefObject<EuiBasicTable<unknown> | null>;
   initialStateOverride?: Partial<RulesTableState>;
 }
 
@@ -54,7 +50,7 @@ export interface UseRulesTableReturn extends RulesTableFacade {
 }
 
 export const useRulesTable = (params: UseRulesTableParams): UseRulesTableReturn => {
-  const { tableRef, initialStateOverride } = params;
+  const { initialStateOverride } = params;
 
   const initialState: RulesTableState = {
     ...initialStateDefaults,
@@ -62,8 +58,7 @@ export const useRulesTable = (params: UseRulesTableParams): UseRulesTableReturn
     ...initialStateOverride,
   };
 
-  const reducer = useMemo(() => createRulesTableReducer(tableRef), [tableRef]);
-  const [state, dispatch] = useReducer(reducer, initialState);
+  const [state, dispatch] = useReducer(rulesTableReducer, initialState);
   const facade = useRef(createRulesTableFacade(dispatch));
   const { addError } = useAppToasts();
 
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
index 85ff0f9ac1457..20bdeaf7e6378 100644
--- a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/types.ts
@@ -28,6 +28,7 @@ import {
   rule_name_override,
   timestamp_override,
   threshold,
+  BulkAction,
 } from '../../../../../common/detection_engine/schemas/common/schemas';
 import {
   CreateRulesSchema,
@@ -212,6 +213,24 @@ export interface DuplicateRulesProps {
   rules: Rule[];
 }
 
+export interface BulkActionProps<Action extends BulkAction> {
+  action: Action;
+  query: string;
+}
+
+export interface BulkActionResult {
+  success: boolean;
+  rules_count: number;
+}
+
+export type BulkActionResponse<Action extends BulkAction> = {
+  [BulkAction.delete]: BulkActionResult;
+  [BulkAction.disable]: BulkActionResult;
+  [BulkAction.enable]: BulkActionResult;
+  [BulkAction.duplicate]: BulkActionResult;
+  [BulkAction.export]: Blob;
+}[Action];
+
 export interface BasicFetchProps {
   signal: AbortSignal;
 }
@@ -248,7 +267,7 @@ export interface ExportDocumentsProps {
   ids: string[];
   filename?: string;
   excludeExportDetails?: boolean;
-  signal: AbortSignal;
+  signal?: AbortSignal;
 }
 
 export interface RuleStatus {
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/utils.test.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/utils.test.ts
new file mode 100644
index 0000000000000..c293e26f1740c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/utils.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { INTERNAL_IMMUTABLE_KEY } from '../../../../../common/constants';
+import { FilterOptions } from './types';
+import { convertRulesFilterToKQL } from './utils';
+
+describe('convertRulesFilterToKQL', () => {
+  const filterOptions: FilterOptions = {
+    filter: '',
+    sortField: 'name',
+    sortOrder: 'asc',
+    showCustomRules: false,
+    showElasticRules: false,
+    tags: [],
+  };
+
+  it('returns empty string if filter options are empty', () => {
+    const kql = convertRulesFilterToKQL(filterOptions);
+
+    expect(kql).toBe('');
+  });
+
+  it('handles presence of "filter" properly', () => {
+    const kql = convertRulesFilterToKQL({ ...filterOptions, filter: 'foo' });
+
+    expect(kql).toBe('alert.attributes.name: foo');
+  });
+
+  it('handles presence of "showCustomRules" properly', () => {
+    const kql = convertRulesFilterToKQL({ ...filterOptions, showCustomRules: true });
+
+    expect(kql).toBe(`alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:false"`);
+  });
+
+  it('handles presence of "showElasticRules" properly', () => {
+    const kql = convertRulesFilterToKQL({ ...filterOptions, showElasticRules: true });
+
+    expect(kql).toBe(`alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true"`);
+  });
+
+  it('handles presence of "tags" properly', () => {
+    const kql = convertRulesFilterToKQL({ ...filterOptions, tags: ['tag1', 'tag2'] });
+
+    expect(kql).toBe('alert.attributes.tags: "tag1" AND alert.attributes.tags: "tag2"');
+  });
+
+  it('handles combination of different properties properly', () => {
+    const kql = convertRulesFilterToKQL({
+      ...filterOptions,
+      filter: 'foo',
+      showElasticRules: true,
+      tags: ['tag1', 'tag2'],
+    });
+
+    expect(kql).toBe(
+      `alert.attributes.name: foo AND alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true" AND (alert.attributes.tags: "tag1" AND alert.attributes.tags: "tag2")`
+    );
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/utils.ts b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/utils.ts
new file mode 100644
index 0000000000000..841b2adca09e0
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/detections/containers/detection_engine/rules/utils.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 { INTERNAL_IMMUTABLE_KEY } from '../../../../../common/constants';
+import { FilterOptions } from './types';
+
+/**
+ * Convert rules filter options object to KQL query
+ *
+ * @param filterOptions desired filters (e.g. filter/sortField/sortOrder)
+ *
+ * @returns KQL string
+ */
+export const convertRulesFilterToKQL = (filterOptions: FilterOptions): string => {
+  const showCustomRuleFilter = filterOptions.showCustomRules
+    ? [`alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:false"`]
+    : [];
+  const showElasticRuleFilter = filterOptions.showElasticRules
+    ? [`alert.attributes.tags: "${INTERNAL_IMMUTABLE_KEY}:true"`]
+    : [];
+  const filtersWithoutTags = [
+    ...(filterOptions.filter.length ? [`alert.attributes.name: ${filterOptions.filter}`] : []),
+    ...showCustomRuleFilter,
+    ...showElasticRuleFilter,
+  ].join(' AND ');
+
+  const tags = filterOptions.tags
+    .map((t) => `alert.attributes.tags: "${t.replace(/"/g, '\\"')}"`)
+    .join(' AND ');
+
+  const filterString =
+    filtersWithoutTags !== '' && tags !== ''
+      ? `${filtersWithoutTags} AND (${tags})`
+      : filtersWithoutTags + tags;
+
+  return filterString;
+};
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.tsx
index de33d414398a8..78fac10815d45 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/actions.tsx
@@ -7,29 +7,29 @@
 
 import * as H from 'history';
 import React, { Dispatch } from 'react';
-
+import { BulkAction } from '../../../../../../common/detection_engine/schemas/common/schemas';
 import { CreateRulesSchema } from '../../../../../../common/detection_engine/schemas/request';
-import {
-  deleteRules,
-  duplicateRules,
-  enableRules,
-  Rule,
-  RulesTableAction,
-} from '../../../../containers/detection_engine/rules';
-
 import { getEditRuleUrl } from '../../../../../common/components/link_to/redirect_to_detection_engine';
-
 import {
   ActionToaster,
   displayErrorToast,
   displaySuccessToast,
   errorToToaster,
 } from '../../../../../common/components/toasters';
-import { track, METRIC_TYPE, TELEMETRY_EVENT } from '../../../../../common/lib/telemetry';
-
-import * as i18n from '../translations';
-import { bucketRulesResponse } from './helpers';
+import { METRIC_TYPE, TELEMETRY_EVENT, track } from '../../../../../common/lib/telemetry';
+import { downloadBlob } from '../../../../../common/utils/download_blob';
+import {
+  deleteRules,
+  duplicateRules,
+  enableRules,
+  exportRules,
+  performBulkAction,
+  Rule,
+  RulesTableAction,
+} from '../../../../containers/detection_engine/rules';
 import { transformOutput } from '../../../../containers/detection_engine/rules/transforms';
+import * as i18n from '../translations';
+import { bucketRulesResponse, getExportedRulesCount } from './helpers';
 
 export const editRuleAction = (rule: Rule, history: H.History) => {
   history.push(getEditRuleUrl(rule.id));
@@ -58,20 +58,34 @@ export const duplicateRulesAction = async (
     } else {
       displaySuccessToast(i18n.SUCCESSFULLY_DUPLICATED_RULES(ruleIds.length), dispatchToaster);
     }
-    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
-
     return createdRules;
   } catch (error) {
-    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
     errorToToaster({ title: i18n.DUPLICATE_RULE_ERROR, error, dispatchToaster });
+  } finally {
+    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
   }
 };
 
-export const exportRulesAction = (
+export const exportRulesAction = async (
   exportRuleId: string[],
-  dispatch: React.Dispatch<RulesTableAction>
+  dispatch: React.Dispatch<RulesTableAction>,
+  dispatchToaster: Dispatch<ActionToaster>
 ) => {
-  dispatch({ type: 'exportRuleIds', ids: exportRuleId });
+  try {
+    dispatch({ type: 'loadingRuleIds', ids: exportRuleId, actionType: 'export' });
+    const blob = await exportRules({ ids: exportRuleId });
+    downloadBlob(blob, `${i18n.EXPORT_FILENAME}.ndjson`);
+
+    const exportedRulesCount = await getExportedRulesCount(blob);
+    displaySuccessToast(
+      i18n.SUCCESSFULLY_EXPORTED_RULES(exportedRulesCount, exportRuleId.length),
+      dispatchToaster
+    );
+  } catch (e) {
+    displayErrorToast(i18n.BULK_ACTION_FAILED, [e.message], dispatchToaster);
+  } finally {
+    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
+  }
 };
 
 export const deleteRulesAction = async (
@@ -84,7 +98,6 @@ export const deleteRulesAction = async (
     dispatch({ type: 'loadingRuleIds', ids: ruleIds, actionType: 'delete' });
     const response = await deleteRules({ ids: ruleIds });
     const { errors } = bucketRulesResponse(response);
-    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
     if (errors.length > 0) {
       displayErrorToast(
         i18n.BATCH_ACTION_DELETE_SELECTED_ERROR(ruleIds.length),
@@ -95,12 +108,13 @@ export const deleteRulesAction = async (
       onRuleDeleted();
     }
   } catch (error) {
-    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
     errorToToaster({
       title: i18n.BATCH_ACTION_DELETE_SELECTED_ERROR(ruleIds.length),
       error,
       dispatchToaster,
     });
+  } finally {
+    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
   }
 };
 
@@ -144,6 +158,37 @@ export const enableRulesAction = async (
     }
   } catch (e) {
     displayErrorToast(errorTitle, [e.message], dispatchToaster);
+  } finally {
+    dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
+  }
+};
+
+export const rulesBulkActionByQuery = async (
+  visibleRuleIds: string[],
+  selectedItemsCount: number,
+  query: string,
+  action: BulkAction,
+  dispatch: React.Dispatch<RulesTableAction>,
+  dispatchToaster: Dispatch<ActionToaster>
+) => {
+  try {
+    dispatch({ type: 'loadingRuleIds', ids: visibleRuleIds, actionType: action });
+
+    if (action === BulkAction.export) {
+      const blob = await performBulkAction({ query, action });
+      downloadBlob(blob, `${i18n.EXPORT_FILENAME}.ndjson`);
+
+      const exportedRulesCount = await getExportedRulesCount(blob);
+      displaySuccessToast(
+        i18n.SUCCESSFULLY_EXPORTED_RULES(exportedRulesCount, selectedItemsCount),
+        dispatchToaster
+      );
+    } else {
+      await performBulkAction({ query, action });
+    }
+  } catch (e) {
+    displayErrorToast(i18n.BULK_ACTION_FAILED, [e.message], dispatchToaster);
+  } finally {
     dispatch({ type: 'loadingRuleIds', ids: [], actionType: null });
   }
 };
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/batch_actions.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/batch_actions.tsx
index 648d653d6a3c8..5b558824b4659 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/batch_actions.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/batch_actions.tsx
@@ -10,6 +10,7 @@ import React, { Dispatch } from 'react';
 import * as i18n from '../translations';
 import { RulesTableAction } from '../../../../containers/detection_engine/rules/rules_table';
 import {
+  rulesBulkActionByQuery,
   deleteRulesAction,
   duplicateRulesAction,
   enableRulesAction,
@@ -20,6 +21,7 @@ import { Rule } from '../../../../containers/detection_engine/rules';
 import * as detectionI18n from '../../translations';
 import { isMlRule } from '../../../../../../common/machine_learning/helpers';
 import { canEditRuleWithActions } from '../../../../../common/utils/privileges';
+import { BulkAction } from '../../../../../../common/detection_engine/schemas/common/schemas';
 
 interface GetBatchItems {
   closePopover: () => void;
@@ -32,6 +34,10 @@ interface GetBatchItems {
   refetchPrePackagedRulesStatus: () => Promise<void>;
   rules: Rule[];
   selectedRuleIds: string[];
+  isAllSelected: boolean;
+  filterQuery: string;
+  confirmDeletion: () => Promise<boolean>;
+  selectedItemsCount: number;
 }
 
 export const getBatchItems = ({
@@ -45,51 +51,138 @@ export const getBatchItems = ({
   rules,
   selectedRuleIds,
   hasActionsPrivileges,
+  isAllSelected,
+  filterQuery,
+  confirmDeletion,
+  selectedItemsCount,
 }: GetBatchItems) => {
-  const selectedRules = selectedRuleIds.reduce<Record<string, Rule>>((acc, id) => {
-    const found = rules.find((r) => r.id === id);
-    if (found != null) {
-      return { [id]: found, ...acc };
-    }
-    return acc;
-  }, {});
+  const selectedRules = rules.filter(({ id }) => selectedRuleIds.includes(id));
 
-  const containsEnabled = selectedRuleIds.some((id) => selectedRules[id]?.enabled ?? false);
-  const containsDisabled = selectedRuleIds.some((id) => !selectedRules[id]?.enabled ?? false);
+  const containsEnabled = selectedRules.some(({ enabled }) => enabled);
+  const containsDisabled = selectedRules.some(({ enabled }) => !enabled);
   const containsLoading = selectedRuleIds.some((id) => loadingRuleIds.includes(id));
-  const containsImmutable = selectedRuleIds.some((id) => selectedRules[id]?.immutable ?? false);
+  const containsImmutable = selectedRules.some(({ immutable }) => immutable);
 
   const missingActionPrivileges =
     !hasActionsPrivileges &&
-    selectedRuleIds.some((id) => {
-      return !canEditRuleWithActions(selectedRules[id], hasActionsPrivileges);
-    });
+    selectedRules.some((rule) => !canEditRuleWithActions(rule, hasActionsPrivileges));
+
+  const handleActivateAction = async () => {
+    closePopover();
+    const deactivatedRules = selectedRules.filter(({ enabled }) => !enabled);
+    const deactivatedRulesNoML = deactivatedRules.filter(({ type }) => !isMlRule(type));
+
+    const mlRuleCount = deactivatedRules.length - deactivatedRulesNoML.length;
+    if (!hasMlPermissions && mlRuleCount > 0) {
+      displayWarningToast(detectionI18n.ML_RULES_UNAVAILABLE(mlRuleCount), dispatchToaster);
+    }
+
+    const ruleIds = hasMlPermissions
+      ? deactivatedRules.map(({ id }) => id)
+      : deactivatedRulesNoML.map(({ id }) => id);
+
+    if (isAllSelected) {
+      await rulesBulkActionByQuery(
+        ruleIds,
+        selectedItemsCount,
+        filterQuery,
+        BulkAction.enable,
+        dispatch,
+        dispatchToaster
+      );
+      await reFetchRules();
+    } else {
+      await enableRulesAction(ruleIds, true, dispatch, dispatchToaster);
+    }
+  };
+
+  const handleDeactivateActions = async () => {
+    closePopover();
+    const activatedIds = selectedRules.filter(({ enabled }) => enabled).map(({ id }) => id);
+    if (isAllSelected) {
+      await rulesBulkActionByQuery(
+        activatedIds,
+        selectedItemsCount,
+        filterQuery,
+        BulkAction.disable,
+        dispatch,
+        dispatchToaster
+      );
+      await reFetchRules();
+    } else {
+      await enableRulesAction(activatedIds, false, dispatch, dispatchToaster);
+    }
+  };
+
+  const handleDuplicateAction = async () => {
+    closePopover();
+    if (isAllSelected) {
+      await rulesBulkActionByQuery(
+        selectedRuleIds,
+        selectedItemsCount,
+        filterQuery,
+        BulkAction.duplicate,
+        dispatch,
+        dispatchToaster
+      );
+      await reFetchRules();
+    } else {
+      await duplicateRulesAction(selectedRules, selectedRuleIds, dispatch, dispatchToaster);
+    }
+    await reFetchRules();
+    await refetchPrePackagedRulesStatus();
+  };
+
+  const handleDeleteAction = async () => {
+    closePopover();
+    if (isAllSelected) {
+      if ((await confirmDeletion()) === false) {
+        // User has cancelled deletion
+        return;
+      }
+
+      await rulesBulkActionByQuery(
+        selectedRuleIds,
+        selectedItemsCount,
+        filterQuery,
+        BulkAction.delete,
+        dispatch,
+        dispatchToaster
+      );
+    } else {
+      await deleteRulesAction(selectedRuleIds, dispatch, dispatchToaster);
+    }
+    await reFetchRules();
+    await refetchPrePackagedRulesStatus();
+  };
+
+  const handleExportAction = async () => {
+    closePopover();
+    if (isAllSelected) {
+      await rulesBulkActionByQuery(
+        selectedRuleIds,
+        selectedItemsCount,
+        filterQuery,
+        BulkAction.export,
+        dispatch,
+        dispatchToaster
+      );
+    } else {
+      await exportRulesAction(
+        selectedRules.map((r) => r.rule_id),
+        dispatch,
+        dispatchToaster
+      );
+    }
+  };
 
   return [
     <EuiContextMenuItem
       key={i18n.BATCH_ACTION_ACTIVATE_SELECTED}
+      data-test-subj="activateRuleBulk"
       icon="checkInCircleFilled"
-      disabled={missingActionPrivileges || containsLoading || !containsDisabled}
-      onClick={async () => {
-        closePopover();
-        const deactivatedIds = selectedRuleIds.filter((id) => !selectedRules[id]?.enabled ?? false);
-
-        const deactivatedIdsNoML = deactivatedIds.filter(
-          (id) => !isMlRule(selectedRules[id]?.type)
-        );
-
-        const mlRuleCount = deactivatedIds.length - deactivatedIdsNoML.length;
-        if (!hasMlPermissions && mlRuleCount > 0) {
-          displayWarningToast(detectionI18n.ML_RULES_UNAVAILABLE(mlRuleCount), dispatchToaster);
-        }
-
-        await enableRulesAction(
-          hasMlPermissions ? deactivatedIds : deactivatedIdsNoML,
-          true,
-          dispatch,
-          dispatchToaster
-        );
-      }}
+      disabled={missingActionPrivileges || containsLoading || (!containsDisabled && !isAllSelected)}
+      onClick={handleActivateAction}
     >
       <EuiToolTip
         position="right"
@@ -100,13 +193,10 @@ export const getBatchItems = ({
     </EuiContextMenuItem>,
     <EuiContextMenuItem
       key={i18n.BATCH_ACTION_DEACTIVATE_SELECTED}
+      data-test-subj="deactivateRuleBulk"
       icon="crossInACircleFilled"
-      disabled={missingActionPrivileges || containsLoading || !containsEnabled}
-      onClick={async () => {
-        closePopover();
-        const activatedIds = selectedRuleIds.filter((id) => selectedRules[id]?.enabled ?? false);
-        await enableRulesAction(activatedIds, false, dispatch, dispatchToaster);
-      }}
+      disabled={missingActionPrivileges || containsLoading || (!containsEnabled && !isAllSelected)}
+      onClick={handleDeactivateActions}
     >
       <EuiToolTip
         position="right"
@@ -117,15 +207,12 @@ export const getBatchItems = ({
     </EuiContextMenuItem>,
     <EuiContextMenuItem
       key={i18n.BATCH_ACTION_EXPORT_SELECTED}
+      data-test-subj="exportRuleBulk"
       icon="exportAction"
-      disabled={containsImmutable || containsLoading || selectedRuleIds.length === 0}
-      onClick={() => {
-        closePopover();
-        exportRulesAction(
-          rules.filter((r) => selectedRuleIds.includes(r.id)).map((r) => r.rule_id),
-          dispatch
-        );
-      }}
+      disabled={
+        (containsImmutable && !isAllSelected) || containsLoading || selectedRuleIds.length === 0
+      }
+      onClick={handleExportAction}
     >
       {i18n.BATCH_ACTION_EXPORT_SELECTED}
     </EuiContextMenuItem>,
@@ -135,17 +222,7 @@ export const getBatchItems = ({
       data-test-subj="duplicateRuleBulk"
       icon="copy"
       disabled={missingActionPrivileges || containsLoading || selectedRuleIds.length === 0}
-      onClick={async () => {
-        closePopover();
-        await duplicateRulesAction(
-          rules.filter((r) => selectedRuleIds.includes(r.id)),
-          selectedRuleIds,
-          dispatch,
-          dispatchToaster
-        );
-        await reFetchRules();
-        await refetchPrePackagedRulesStatus();
-      }}
+      onClick={handleDuplicateAction}
     >
       <EuiToolTip
         position="right"
@@ -160,12 +237,7 @@ export const getBatchItems = ({
       icon="trash"
       title={containsImmutable ? i18n.BATCH_ACTION_DELETE_SELECTED_IMMUTABLE : undefined}
       disabled={containsLoading || selectedRuleIds.length === 0}
-      onClick={async () => {
-        closePopover();
-        await deleteRulesAction(selectedRuleIds, dispatch, dispatchToaster);
-        await reFetchRules();
-        await refetchPrePackagedRulesStatus();
-      }}
+      onClick={handleDeleteAction}
     >
       {i18n.BATCH_ACTION_DELETE_SELECTED}
     </EuiContextMenuItem>,
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
index 83bb530827fa2..28a65c3e64e1f 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/columns.tsx
@@ -96,7 +96,7 @@ export const getActions = (
     description: i18n.EXPORT_RULE,
     icon: 'exportAction',
     name: i18n.EXPORT_RULE,
-    onClick: (rowItem: Rule) => exportRulesAction([rowItem.rule_id], dispatch),
+    onClick: (rowItem: Rule) => exportRulesAction([rowItem.rule_id], dispatch, dispatchToaster),
     enabled: (rowItem: Rule) => !rowItem.immutable,
   },
   {
@@ -125,7 +125,7 @@ interface GetColumns {
   formatUrl: FormatUrl;
   history: H.History;
   hasMlPermissions: boolean;
-  hasNoPermissions: boolean;
+  hasPermissions: boolean;
   loadingRuleIds: string[];
   reFetchRules: () => Promise<void>;
   refetchPrePackagedRulesStatus: () => Promise<void>;
@@ -142,7 +142,7 @@ export const getColumns = ({
   formatUrl,
   history,
   hasMlPermissions,
-  hasNoPermissions,
+  hasPermissions,
   loadingRuleIds,
   reFetchRules,
   refetchPrePackagedRulesStatus,
@@ -275,7 +275,7 @@ export const getColumns = ({
             enabled={item.enabled}
             isDisabled={
               !canEditRuleWithActions(item, hasReadActionsPrivileges) ||
-              hasNoPermissions ||
+              !hasPermissions ||
               (isMlRule(item.type) && !hasMlPermissions && !item.enabled)
             }
             isLoading={loadingRuleIds.includes(item.id)}
@@ -300,7 +300,7 @@ export const getColumns = ({
     } as EuiTableActionsColumnType<Rule>,
   ];
 
-  return hasNoPermissions ? cols : [...cols, ...actions];
+  return hasPermissions ? [...cols, ...actions] : cols;
 };
 
 export const getMonitoringColumns = (
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 6a0f4dc4e2dea..dd3549ea20d36 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
@@ -79,7 +79,7 @@ describe('ExceptionListsTable', () => {
       <TestProviders>
         <ExceptionListsTable
           history={mockHistory}
-          hasNoPermissions={false}
+          hasPermissions
           loading={false}
           formatUrl={jest.fn()}
         />
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.tsx
index 1dfa83da1637a..7f734b10fd020 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/exceptions/exceptions_table.tsx
@@ -38,7 +38,7 @@ export type Func = () => Promise<void>;
 
 interface ExceptionListsTableProps {
   history: History;
-  hasNoPermissions: boolean;
+  hasPermissions: boolean;
   loading: boolean;
   formatUrl: FormatUrl;
 }
@@ -60,7 +60,7 @@ const exceptionReferenceModalInitialState: ReferenceModalState = {
 };
 
 export const ExceptionListsTable = React.memo<ExceptionListsTableProps>(
-  ({ formatUrl, history, hasNoPermissions, loading }) => {
+  ({ formatUrl, history, hasPermissions, loading }) => {
     const {
       services: { http, notifications },
     } = useKibana();
@@ -359,7 +359,7 @@ export const ExceptionListsTable = React.memo<ExceptionListsTableProps>(
               <>
                 <AllRulesUtilityBar
                   showBulkActions={false}
-                  userHasNoPermissions={hasNoPermissions}
+                  canBulkEdit={hasPermissions}
                   paginationTotal={exceptionListsWithRuleRefs.length ?? 0}
                   numberSelectedItems={0}
                   onRefresh={handleRefresh}
@@ -367,7 +367,7 @@ export const ExceptionListsTable = React.memo<ExceptionListsTableProps>(
                 <EuiBasicTable
                   data-test-subj="exceptions-table"
                   columns={exceptionsColumns}
-                  isSelectable={!hasNoPermissions ?? false}
+                  isSelectable={hasPermissions}
                   itemId="id"
                   items={tableItems}
                   noItemsMessage={emptyPrompt}
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.ts b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.ts
index 7ae4be08ef0ac..b03c5ebc84688 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.ts
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/helpers.ts
@@ -68,3 +68,19 @@ export const getSearchFilters = ({
 
   return { [defaultSearchTerm]: searchValue };
 };
+
+/**
+ * This function helps to parse NDJSON with exported rules
+ * and retrieve the number of successfully exported rules.
+ *
+ * @param blob a Blob received from an _export endpoint
+ * @returns Number of exported rules
+ */
+export const getExportedRulesCount = async (blob: Blob): Promise<number> => {
+  const blobContent = await blob.text();
+  // The Blob content is an NDJSON file, the last line of which contains export details.
+  const exportDetailsJson = blobContent.split('\n').filter(Boolean).slice(-1)[0];
+  const exportDetails = JSON.parse(exportDetailsJson);
+
+  return exportDetails.exported_count;
+};
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 1f4586754cb33..9597c221843be 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
@@ -124,10 +124,10 @@ describe('AllRules', () => {
         loadingRulesAction: null,
         loadingRuleIds: [],
         selectedRuleIds: [],
-        exportRuleIds: [],
         lastUpdated: 0,
         isRefreshOn: true,
         isRefreshing: false,
+        isAllSelected: false,
         showIdleModal: false,
       };
 
@@ -189,7 +189,7 @@ describe('AllRules', () => {
     const wrapper = shallow(
       <AllRules
         createPrePackagedRules={jest.fn()}
-        hasNoPermissions={false}
+        hasPermissions
         loading={false}
         loadingCreatePrePackagedRules={false}
         refetchPrePackagedRulesStatus={jest.fn()}
@@ -209,7 +209,7 @@ describe('AllRules', () => {
       <TestProviders>
         <AllRules
           createPrePackagedRules={jest.fn()}
-          hasNoPermissions={false}
+          hasPermissions
           loading={false}
           loadingCreatePrePackagedRules={false}
           refetchPrePackagedRulesStatus={jest.fn()}
@@ -245,7 +245,7 @@ describe('AllRules', () => {
       <TestProviders>
         <AllRules
           createPrePackagedRules={jest.fn()}
-          hasNoPermissions={false}
+          hasPermissions
           loading={false}
           loadingCreatePrePackagedRules={false}
           refetchPrePackagedRulesStatus={jest.fn()}
@@ -279,7 +279,7 @@ describe('AllRules', () => {
         <TestProviders>
           <AllRules
             createPrePackagedRules={jest.fn()}
-            hasNoPermissions={false}
+            hasPermissions
             loading={false}
             loadingCreatePrePackagedRules={false}
             refetchPrePackagedRulesStatus={jest.fn()}
@@ -304,7 +304,7 @@ describe('AllRules', () => {
       <TestProviders>
         <AllRules
           createPrePackagedRules={jest.fn()}
-          hasNoPermissions={false}
+          hasPermissions
           loading={false}
           loadingCreatePrePackagedRules={false}
           refetchPrePackagedRulesStatus={jest.fn()}
@@ -332,7 +332,7 @@ describe('AllRules', () => {
       <TestProviders>
         <AllRules
           createPrePackagedRules={jest.fn()}
-          hasNoPermissions={false}
+          hasPermissions
           loading={false}
           loadingCreatePrePackagedRules={false}
           refetchPrePackagedRulesStatus={jest.fn()}
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.tsx
index c90956f81f4c7..144aa05cb3b07 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/index.tsx
@@ -18,7 +18,7 @@ import { ExceptionListsTable } from './exceptions/exceptions_table';
 
 interface AllRulesProps {
   createPrePackagedRules: CreatePreBuiltRules | null;
-  hasNoPermissions: boolean;
+  hasPermissions: boolean;
   loading: boolean;
   loadingCreatePrePackagedRules: boolean;
   refetchPrePackagedRulesStatus: () => Promise<void>;
@@ -64,7 +64,7 @@ const allRulesTabs = [
 export const AllRules = React.memo<AllRulesProps>(
   ({
     createPrePackagedRules,
-    hasNoPermissions,
+    hasPermissions,
     loading,
     loadingCreatePrePackagedRules,
     refetchPrePackagedRulesStatus,
@@ -110,7 +110,7 @@ export const AllRules = React.memo<AllRulesProps>(
             formatUrl={formatUrl}
             selectedTab={allRulesTab}
             createPrePackagedRules={createPrePackagedRules}
-            hasNoPermissions={hasNoPermissions}
+            hasPermissions={hasPermissions}
             loading={loading}
             loadingCreatePrePackagedRules={loadingCreatePrePackagedRules}
             refetchPrePackagedRulesStatus={refetchPrePackagedRulesStatus}
@@ -125,7 +125,7 @@ export const AllRules = React.memo<AllRulesProps>(
           <ExceptionListsTable
             formatUrl={formatUrl}
             history={history}
-            hasNoPermissions={hasNoPermissions}
+            hasPermissions={hasPermissions}
             loading={loading}
           />
         )}
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_tables.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_tables.tsx
index 353cc657f2116..8fd82a495e52f 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_tables.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/rules_tables.tsx
@@ -15,7 +15,6 @@ import {
   EuiWindowEvent,
 } from '@elastic/eui';
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
-import uuid from 'uuid';
 import { debounce } from 'lodash/fp';
 import { History } from 'history';
 
@@ -25,7 +24,6 @@ import {
   CreatePreBuiltRules,
   FilterOptions,
   Rule,
-  exportRules,
   RulesSortingFields,
 } from '../../../../containers/detection_engine/rules';
 
@@ -36,7 +34,6 @@ import { useStateToaster } from '../../../../../common/components/toasters';
 import { Loader } from '../../../../../common/components/loader';
 import { Panel } from '../../../../../common/components/panel';
 import { PrePackagedRulesPrompt } from '../../../../components/rules/pre_packaged_rules/load_empty_prompt';
-import { GenericDownloader } from '../../../../../common/components/generic_downloader';
 import { AllRulesTables, SortingType } from '../../../../components/rules/all_rules_tables';
 import { getPrePackagedRuleStatus } from '../helpers';
 import * as i18n from '../translations';
@@ -53,6 +50,10 @@ import { AllRulesUtilityBar } from './utility_bar';
 import { LastUpdatedAt } from '../../../../../common/components/last_updated';
 import { DEFAULT_RULES_TABLE_REFRESH_SETTING } from '../../../../../../common/constants';
 import { AllRulesTabs } from '.';
+import { useValueChanged } from '../../../../../common/hooks/use_value_changed';
+import { convertRulesFilterToKQL } from '../../../../containers/detection_engine/rules/utils';
+import { useBoolState } from '../../../../../common/hooks/use_bool_state';
+import { useAsyncConfirmation } from '../../../../containers/detection_engine/rules/rules_table/use_async_confirmation';
 
 const INITIAL_SORT_FIELD = 'enabled';
 
@@ -60,7 +61,7 @@ interface RulesTableProps {
   history: History;
   formatUrl: FormatUrl;
   createPrePackagedRules: CreatePreBuiltRules | null;
-  hasNoPermissions: boolean;
+  hasPermissions: boolean;
   loading: boolean;
   loadingCreatePrePackagedRules: boolean;
   refetchPrePackagedRulesStatus: () => Promise<void>;
@@ -85,7 +86,7 @@ export const RulesTables = React.memo<RulesTableProps>(
     history,
     formatUrl,
     createPrePackagedRules,
-    hasNoPermissions,
+    hasPermissions,
     loading,
     loadingCreatePrePackagedRules,
     refetchPrePackagedRulesStatus,
@@ -115,14 +116,12 @@ export const RulesTables = React.memo<RulesTableProps>(
     }>(DEFAULT_RULES_TABLE_REFRESH_SETTING);
 
     const rulesTable = useRulesTable({
-      tableRef,
       initialStateOverride: {
         isRefreshOn: defaultAutoRefreshSetting.on,
       },
     });
 
     const {
-      exportRuleIds,
       filterOptions,
       loadingRuleIds,
       loadingRulesAction,
@@ -133,12 +132,12 @@ export const RulesTables = React.memo<RulesTableProps>(
       showIdleModal,
       isRefreshOn,
       isRefreshing,
+      isAllSelected,
     } = rulesTable.state;
 
     const {
       dispatch,
       updateOptions,
-      actionStopped,
       setShowIdleModal,
       setLastRefreshDate,
       setAutoRefreshOn,
@@ -186,9 +185,24 @@ export const RulesTables = React.memo<RulesTableProps>(
       actions,
     ]);
 
+    const [
+      isDeleteConfirmationVisible,
+      showDeleteConfirmation,
+      hideDeleteConfirmation,
+    ] = useBoolState();
+
+    const [confirmDeletion, handleDeletionConfirm, handleDeletionCancel] = useAsyncConfirmation({
+      onInit: showDeleteConfirmation,
+      onFinish: hideDeleteConfirmation,
+    });
+
+    const selectedItemsCount = isAllSelected ? pagination.total : selectedRuleIds.length;
+    const hasPagination = pagination.total > pagination.perPage;
+
     const getBatchItemsPopoverContent = useCallback(
       (closePopover: () => void): JSX.Element[] => {
         return getBatchItems({
+          isAllSelected,
           closePopover,
           dispatch,
           dispatchToaster,
@@ -199,9 +213,13 @@ export const RulesTables = React.memo<RulesTableProps>(
           reFetchRules,
           refetchPrePackagedRulesStatus,
           rules,
+          filterQuery: convertRulesFilterToKQL(filterOptions),
+          confirmDeletion,
+          selectedItemsCount,
         });
       },
       [
+        isAllSelected,
         dispatch,
         dispatchToaster,
         hasMlPermissions,
@@ -211,6 +229,9 @@ export const RulesTables = React.memo<RulesTableProps>(
         rules,
         selectedRuleIds,
         hasActionsPrivileges,
+        filterOptions,
+        confirmDeletion,
+        selectedItemsCount,
       ]
     );
 
@@ -219,7 +240,7 @@ export const RulesTables = React.memo<RulesTableProps>(
         pageIndex: pagination.page - 1,
         pageSize: pagination.perPage,
         totalItemCount: pagination.total,
-        pageSizeOptions: [5, 10, 20, 50, 100, 200, 300, 400, 500, 600],
+        pageSizeOptions: [5, 10, 20, 50, 100],
       }),
       [pagination]
     );
@@ -252,7 +273,7 @@ export const RulesTables = React.memo<RulesTableProps>(
         formatUrl,
         history,
         hasMlPermissions,
-        hasNoPermissions,
+        hasPermissions,
         loadingRuleIds:
           loadingRulesAction != null &&
           (loadingRulesAction === 'enable' || loadingRulesAction === 'disable')
@@ -268,7 +289,7 @@ export const RulesTables = React.memo<RulesTableProps>(
       formatUrl,
       refetchPrePackagedRulesStatus,
       hasActionsPrivileges,
-      hasNoPermissions,
+      hasPermissions,
       hasMlPermissions,
       history,
       loadingRuleIds,
@@ -299,15 +320,43 @@ export const RulesTables = React.memo<RulesTableProps>(
       }
     }, [createPrePackagedRules, reFetchRules, refetchPrePackagedRulesStatus]);
 
+    const isSelectAllCalled = useRef(false);
+
+    // Synchronize selectedRuleIds with EuiBasicTable's selected rows
+    useValueChanged((ruleIds) => {
+      if (tableRef.current?.changeSelection != null) {
+        tableRef.current.setSelection(rules.filter((rule) => ruleIds.includes(rule.id)));
+      }
+    }, selectedRuleIds);
+
     const euiBasicTableSelectionProps = useMemo(
       () => ({
         selectable: (item: Rule) => !loadingRuleIds.includes(item.id),
-        onSelectionChange: (selected: Rule[]) =>
-          dispatch({ type: 'selectedRuleIds', ids: selected.map((r) => r.id) }),
+        onSelectionChange: (selected: Rule[]) => {
+          /**
+           * EuiBasicTable doesn't provide declarative API to control selected rows.
+           * This limitation requires us to synchronize selection state manually using setSelection().
+           * But it creates a chain reaction when the user clicks Select All:
+           * selectAll() -> setSelection() -> onSelectionChange() -> setSelection().
+           * To break the chain we should check whether the onSelectionChange was triggered
+           * by the Select All action or not.
+           *
+           */
+          if (isSelectAllCalled.current) {
+            isSelectAllCalled.current = false;
+          } else {
+            dispatch({ type: 'selectedRuleIds', ids: selected.map(({ id }) => id) });
+          }
+        },
       }),
       [loadingRuleIds, dispatch]
     );
 
+    const toggleSelectAll = useCallback(() => {
+      isSelectAllCalled.current = true;
+      dispatch({ type: 'setIsAllSelected', isAllSelected: !isAllSelected });
+    }, [dispatch, isAllSelected]);
+
     const refreshTable = useCallback(
       async (mode: 'auto' | 'manual' = 'manual'): Promise<void> => {
         if (isLoadingAnActionOnRule) {
@@ -397,22 +446,6 @@ export const RulesTables = React.memo<RulesTableProps>(
       [initLoading, prePackagedRuleStatus, rulesCustomInstalled]
     );
 
-    const handleGenericDownloaderSuccess = useCallback(
-      (exportCount) => {
-        actionStopped();
-        dispatchToaster({
-          type: 'addToaster',
-          toast: {
-            id: uuid.v4(),
-            title: i18n.SUCCESSFULLY_EXPORTED_RULES(exportCount),
-            color: 'success',
-            iconType: 'check',
-          },
-        });
-      },
-      [actionStopped, dispatchToaster]
-    );
-
     return (
       <>
         <EuiWindowEvent event="mousemove" handler={debounceResetIdleTimer} />
@@ -421,13 +454,6 @@ export const RulesTables = React.memo<RulesTableProps>(
         <EuiWindowEvent event="keydown" handler={debounceResetIdleTimer} />
         <EuiWindowEvent event="scroll" handler={debounceResetIdleTimer} />
         <EuiWindowEvent event="load" handler={debounceResetIdleTimer} />
-        <GenericDownloader
-          filename={`${i18n.EXPORT_FILENAME}.ndjson`}
-          ids={exportRuleIds}
-          onExportSuccess={handleGenericDownloaderSuccess}
-          exportSelectedData={exportRules}
-        />
-
         <Panel
           loading={loading || isLoadingRules || isLoadingRulesStatuses}
           data-test-subj="allRulesPanel"
@@ -474,7 +500,7 @@ export const RulesTables = React.memo<RulesTableProps>(
               <PrePackagedRulesPrompt
                 createPrePackagedRules={handleCreatePrePackagedRules}
                 loading={loadingCreatePrePackagedRules}
-                userHasNoPermissions={hasNoPermissions}
+                userHasPermissions={hasPermissions}
               />
             )}
             {initLoading && (
@@ -492,22 +518,39 @@ export const RulesTables = React.memo<RulesTableProps>(
                 <p>{i18n.REFRESH_PROMPT_BODY}</p>
               </EuiConfirmModal>
             )}
+            {isDeleteConfirmationVisible && (
+              <EuiConfirmModal
+                title={i18n.DELETE_CONFIRMATION_TITLE}
+                onCancel={handleDeletionCancel}
+                onConfirm={handleDeletionConfirm}
+                confirmButtonText={i18n.DELETE_CONFIRMATION_CONFIRM}
+                cancelButtonText={i18n.DELETE_CONFIRMATION_CANCEL}
+                buttonColor="danger"
+                defaultFocusedButton="confirm"
+                data-test-subj="allRulesDeleteConfirmationModal"
+              >
+                <p>{i18n.DELETE_CONFIRMATION_BODY}</p>
+              </EuiConfirmModal>
+            )}
             {shouldShowRulesTable && (
               <>
                 <AllRulesUtilityBar
-                  userHasNoPermissions={hasNoPermissions}
+                  canBulkEdit={hasPermissions}
+                  hasPagination={hasPagination}
                   paginationTotal={pagination.total ?? 0}
-                  numberSelectedItems={selectedRuleIds.length}
+                  numberSelectedItems={selectedItemsCount}
                   onGetBatchItemsPopoverContent={getBatchItemsPopoverContent}
                   onRefresh={handleManualRefresh}
                   isAutoRefreshOn={isRefreshOn}
                   onRefreshSwitch={handleAutoRefreshSwitch}
+                  isAllSelected={isAllSelected}
+                  onToggleSelectAll={toggleSelectAll}
                   showBulkActions
                 />
                 <AllRulesTables
                   selectedTab={selectedTab}
                   euiBasicTableSelectionProps={euiBasicTableSelectionProps}
-                  hasNoPermissions={hasNoPermissions}
+                  hasPermissions={hasPermissions}
                   monitoringColumns={monitoringColumns}
                   pagination={paginationMemo}
                   rules={rules}
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.test.tsx
index 049a1a9b9da14..2ceb168f17a89 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.test.tsx
@@ -22,7 +22,7 @@ describe('AllRules', () => {
     const wrapper = mount(
       <ThemeProvider theme={mockTheme}>
         <AllRulesUtilityBar
-          userHasNoPermissions={false}
+          canBulkEdit
           onRefresh={jest.fn()}
           paginationTotal={4}
           numberSelectedItems={1}
@@ -44,7 +44,7 @@ describe('AllRules', () => {
     const wrapper = mount(
       <ThemeProvider theme={mockTheme}>
         <AllRulesUtilityBar
-          userHasNoPermissions={false}
+          canBulkEdit
           onRefresh={jest.fn()}
           paginationTotal={4}
           numberSelectedItems={1}
@@ -67,7 +67,7 @@ describe('AllRules', () => {
     const wrapper = mount(
       <ThemeProvider theme={mockTheme}>
         <AllRulesUtilityBar
-          userHasNoPermissions={false}
+          canBulkEdit
           onRefresh={jest.fn()}
           paginationTotal={4}
           numberSelectedItems={1}
@@ -86,7 +86,7 @@ describe('AllRules', () => {
     const wrapper = mount(
       <ThemeProvider theme={mockTheme}>
         <AllRulesUtilityBar
-          userHasNoPermissions
+          canBulkEdit={false}
           onRefresh={jest.fn()}
           paginationTotal={4}
           numberSelectedItems={1}
@@ -106,7 +106,7 @@ describe('AllRules', () => {
     const wrapper = mount(
       <ThemeProvider theme={mockTheme}>
         <AllRulesUtilityBar
-          userHasNoPermissions={false}
+          canBulkEdit
           onRefresh={mockRefresh}
           paginationTotal={4}
           numberSelectedItems={1}
@@ -128,7 +128,7 @@ describe('AllRules', () => {
     const wrapper = mount(
       <ThemeProvider theme={mockTheme}>
         <AllRulesUtilityBar
-          userHasNoPermissions={false}
+          canBulkEdit
           onRefresh={jest.fn()}
           paginationTotal={4}
           numberSelectedItems={1}
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.tsx
index 33c7630f4920a..2e22037ce35b8 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/all/utility_bar.tsx
@@ -18,26 +18,32 @@ import {
 import * as i18n from '../translations';
 
 interface AllRulesUtilityBarProps {
-  userHasNoPermissions: boolean;
-  numberSelectedItems: number;
-  paginationTotal: number;
+  canBulkEdit: boolean;
+  isAllSelected?: boolean;
   isAutoRefreshOn?: boolean;
-  showBulkActions: boolean;
-  onRefresh?: (refreshRule: boolean) => void;
+  numberSelectedItems: number;
   onGetBatchItemsPopoverContent?: (closePopover: () => void) => JSX.Element[];
+  onRefresh?: (refreshRule: boolean) => void;
   onRefreshSwitch?: (checked: boolean) => void;
+  onToggleSelectAll?: () => void;
+  paginationTotal: number;
+  showBulkActions: boolean;
+  hasPagination?: boolean;
 }
 
 export const AllRulesUtilityBar = React.memo<AllRulesUtilityBarProps>(
   ({
-    userHasNoPermissions,
-    onRefresh,
-    paginationTotal,
+    canBulkEdit,
+    isAllSelected,
+    isAutoRefreshOn,
     numberSelectedItems,
     onGetBatchItemsPopoverContent,
-    isAutoRefreshOn,
-    showBulkActions = true,
+    onRefresh,
     onRefreshSwitch,
+    onToggleSelectAll,
+    paginationTotal,
+    showBulkActions = true,
+    hasPagination,
   }) => {
     const handleGetBatchItemsPopoverContent = useCallback(
       (closePopover: () => void): JSX.Element | null => {
@@ -99,7 +105,19 @@ export const AllRulesUtilityBar = React.memo<AllRulesUtilityBarProps>(
                 <UtilityBarText dataTestSubj="selectedRules">
                   {i18n.SELECTED_RULES(numberSelectedItems)}
                 </UtilityBarText>
-                {!userHasNoPermissions && (
+
+                {canBulkEdit && onToggleSelectAll && hasPagination && (
+                  <UtilityBarAction
+                    dataTestSubj="selectAllRules"
+                    iconType={isAllSelected ? 'cross' : 'pagesSelect'}
+                    iconSide="left"
+                    onClick={onToggleSelectAll}
+                  >
+                    {isAllSelected ? i18n.CLEAR_SELECTION : i18n.SELECT_ALL_RULES(paginationTotal)}
+                  </UtilityBarAction>
+                )}
+
+                {canBulkEdit && (
                   <UtilityBarAction
                     dataTestSubj="bulkActions"
                     iconSide="right"
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx
index deebe26fe4a51..90247d19e0503 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/create/index.tsx
@@ -40,7 +40,7 @@ import * as RuleI18n from '../translations';
 import {
   redirectToDetections,
   getActionMessageParams,
-  userHasNoPermissions,
+  userHasPermissions,
   MaxWidthEuiFlexItem,
 } from '../helpers';
 import { RuleStep, RuleStepsFormData, RuleStepsFormHooks } from '../types';
@@ -280,7 +280,7 @@ const CreateRulePageComponent: React.FC = () => {
   ) {
     history.replace(getDetectionEngineUrl());
     return null;
-  } else if (userHasNoPermissions(canUserCRUD)) {
+  } else if (!userHasPermissions(canUserCRUD)) {
     history.replace(getRulesUrl());
     return null;
   }
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 8dac9e03514d1..6727db8aba3b4 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
@@ -70,7 +70,7 @@ import {
 } from '../../../../components/alerts_table/default_config';
 import { RuleSwitch } from '../../../../components/rules/rule_switch';
 import { StepPanel } from '../../../../components/rules/step_panel';
-import { getStepsData, redirectToDetections, userHasNoPermissions } from '../helpers';
+import { getStepsData, redirectToDetections, userHasPermissions } from '../helpers';
 import { useGlobalTime } from '../../../../../common/containers/use_global_time';
 import { alertsHistogramOptions } from '../../../../components/alerts_histogram_panel/config';
 import { inputsSelectors } from '../../../../../common/store/inputs';
@@ -461,7 +461,7 @@ const RuleDetailsPageComponent = () => {
       <LinkButton
         onClick={goToEditRule}
         iconType="controlsHorizontal"
-        isDisabled={!isExistingRule || (userHasNoPermissions(canUserCRUD) ?? true)}
+        isDisabled={!isExistingRule || !userHasPermissions(canUserCRUD)}
         href={formatUrl(getEditRuleUrl(ruleId ?? ''))}
       >
         {ruleI18n.EDIT_RULE_SETTINGS}
@@ -608,7 +608,7 @@ const RuleDetailsPageComponent = () => {
                           isDisabled={
                             !isExistingRule ||
                             !canEditRuleWithActions(rule, hasActionsPrivileges) ||
-                            userHasNoPermissions(canUserCRUD) ||
+                            !userHasPermissions(canUserCRUD) ||
                             (!hasMlPermissions && !rule?.enabled)
                           }
                           enabled={isExistingRule && (rule?.enabled ?? false)}
@@ -625,9 +625,7 @@ const RuleDetailsPageComponent = () => {
                       <EuiFlexItem grow={false}>
                         <RuleActionsOverflow
                           rule={rule}
-                          userHasNoPermissions={
-                            !isExistingRule || userHasNoPermissions(canUserCRUD)
-                          }
+                          userHasPermissions={isExistingRule && userHasPermissions(canUserCRUD)}
                           canDuplicateRuleWithActions={canEditRuleWithActions(
                             rule,
                             hasActionsPrivileges
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx
index 355aa2e4620b8..2d751459eb12f 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/edit/index.tsx
@@ -47,7 +47,7 @@ import {
   getStepsData,
   redirectToDetections,
   getActionMessageParams,
-  userHasNoPermissions,
+  userHasPermissions,
   MaxWidthEuiFlexItem,
 } from '../helpers';
 import * as ruleI18n from '../translations';
@@ -328,7 +328,7 @@ const EditRulePageComponent: FC = () => {
   ) {
     history.replace(getDetectionEngineUrl());
     return null;
-  } else if (userHasNoPermissions(canUserCRUD)) {
+  } else if (!userHasPermissions(canUserCRUD)) {
     history.replace(getRuleDetailsUrl(ruleId ?? ''));
     return null;
   }
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
index 4c3e5b18d4c1b..fa600d9ce4a0e 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/helpers.test.tsx
@@ -18,7 +18,7 @@ import {
   getPrePackagedRuleStatus,
   getPrePackagedTimelineStatus,
   determineDetailsValue,
-  userHasNoPermissions,
+  userHasPermissions,
   fillEmptySeverityMappings,
 } from './helpers';
 import { mockRuleWithEverything, mockRule } from './all/__mocks__/mock';
@@ -403,26 +403,26 @@ describe('rule helpers', () => {
     });
   });
 
-  describe('userHasNoPermissions', () => {
-    test("returns false when user's CRUD operations are null", () => {
-      const result: boolean = userHasNoPermissions(null);
-      const userHasNoPermissionsExpectedResult = false;
+  describe('userHasPermissions', () => {
+    test("returns true when user's CRUD operations are null", () => {
+      const result: boolean = userHasPermissions(null);
+      const userHasPermissionsExpectedResult = true;
 
-      expect(result).toEqual(userHasNoPermissionsExpectedResult);
+      expect(result).toEqual(userHasPermissionsExpectedResult);
     });
 
-    test('returns true when user cannot CRUD', () => {
-      const result: boolean = userHasNoPermissions(false);
-      const userHasNoPermissionsExpectedResult = true;
+    test('returns false when user cannot CRUD', () => {
+      const result: boolean = userHasPermissions(false);
+      const userHasPermissionsExpectedResult = false;
 
-      expect(result).toEqual(userHasNoPermissionsExpectedResult);
+      expect(result).toEqual(userHasPermissionsExpectedResult);
     });
 
-    test('returns false when user can CRUD', () => {
-      const result: boolean = userHasNoPermissions(true);
-      const userHasNoPermissionsExpectedResult = false;
+    test('returns true when user can CRUD', () => {
+      const result: boolean = userHasPermissions(true);
+      const userHasPermissionsExpectedResult = true;
 
-      expect(result).toEqual(userHasNoPermissionsExpectedResult);
+      expect(result).toEqual(userHasPermissionsExpectedResult);
     });
   });
 
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 a88ff9bb2c921..f20ace09ed2b6 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
@@ -405,8 +405,8 @@ export const getActionMessageParams = memoizeOne(
 );
 
 // typed as null not undefined as the initial state for this value is null.
-export const userHasNoPermissions = (canUserCRUD: boolean | null): boolean =>
-  canUserCRUD != null ? !canUserCRUD : false;
+export const userHasPermissions = (canUserCRUD: boolean | null): boolean =>
+  canUserCRUD != null ? canUserCRUD : true;
 
 export const MaxWidthEuiFlexItem = styled(EuiFlexItem)`
   max-width: 1000px;
diff --git a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
index 8aca1cb960c1d..8bacb10444a7d 100644
--- a/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
+++ b/x-pack/plugins/security_solution/public/detections/pages/detection_engine/rules/index.tsx
@@ -28,7 +28,7 @@ import {
   getPrePackagedRuleStatus,
   getPrePackagedTimelineStatus,
   redirectToDetections,
-  userHasNoPermissions,
+  userHasPermissions,
 } from './helpers';
 import * as i18n from './translations';
 import { SecurityPageName } from '../../../../app/types';
@@ -131,7 +131,7 @@ const RulesPageComponent: React.FC = () => {
   const loadPrebuiltRulesAndTemplatesButton = useMemo(
     () =>
       getLoadPrebuiltRulesAndTemplatesButton({
-        isDisabled: userHasNoPermissions(canUserCRUD) || loading,
+        isDisabled: !userHasPermissions(canUserCRUD) || loading,
         onClick: handleCreatePrePackagedRules,
       }),
     [canUserCRUD, getLoadPrebuiltRulesAndTemplatesButton, handleCreatePrePackagedRules, loading]
@@ -140,7 +140,7 @@ const RulesPageComponent: React.FC = () => {
   const reloadPrebuiltRulesAndTemplatesButton = useMemo(
     () =>
       getReloadPrebuiltRulesAndTemplatesButton({
-        isDisabled: userHasNoPermissions(canUserCRUD) || loading,
+        isDisabled: !userHasPermissions(canUserCRUD) || loading,
         onClick: handleCreatePrePackagedRules,
       }),
     [canUserCRUD, getReloadPrebuiltRulesAndTemplatesButton, handleCreatePrePackagedRules, loading]
@@ -213,7 +213,7 @@ const RulesPageComponent: React.FC = () => {
             <EuiFlexItem grow={false}>
               <EuiButton
                 iconType="importAction"
-                isDisabled={userHasNoPermissions(canUserCRUD) || loading}
+                isDisabled={!userHasPermissions(canUserCRUD) || loading}
                 onClick={() => {
                   setShowImportModal(true);
                 }}
@@ -228,7 +228,7 @@ const RulesPageComponent: React.FC = () => {
                 onClick={goToNewRule}
                 href={formatUrl(getCreateRuleUrl())}
                 iconType="plusInCircle"
-                isDisabled={userHasNoPermissions(canUserCRUD) || loading}
+                isDisabled={!userHasPermissions(canUserCRUD) || loading}
               >
                 {i18n.ADD_NEW_RULE}
               </LinkButton>
@@ -250,7 +250,7 @@ const RulesPageComponent: React.FC = () => {
           data-test-subj="all-rules"
           loading={loading || prePackagedRuleLoading}
           loadingCreatePrePackagedRules={loadingCreatePrePackagedRules}
-          hasNoPermissions={userHasNoPermissions(canUserCRUD)}
+          hasPermissions={userHasPermissions(canUserCRUD)}
           refetchPrePackagedRulesStatus={handleRefetchPrePackagedRulesStatus}
           rulesCustomInstalled={rulesCustomInstalled}
           rulesInstalled={rulesInstalled}
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 1bfa62e9b77c0..defd976a04c4b 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
@@ -165,13 +165,13 @@ export const EXPORT_FILENAME = i18n.translate(
   }
 );
 
-export const SUCCESSFULLY_EXPORTED_RULES = (totalRules: number) =>
+export const SUCCESSFULLY_EXPORTED_RULES = (exportedRules: number, totalRules: number) =>
   i18n.translate(
-    'xpack.securitySolution.detectionEngine.rules.allRules.successfullyExportedRulesTitle',
+    'xpack.securitySolution.detectionEngine.rules.allRules.successfullyExportedXofYRulesTitle',
     {
-      values: { totalRules },
+      values: { totalRules, exportedRules },
       defaultMessage:
-        'Successfully exported {totalRules, plural, =0 {all rules} =1 {{totalRules} rule} other {{totalRules} rules}}',
+        'Successfully exported {exportedRules} of {totalRules} {totalRules, plural, =1 {rule} other {rules}}. Prebuilt rules were excluded from the resulting file.',
     }
   );
 
@@ -202,6 +202,19 @@ export const SHOWING_RULES = (totalRules: number) =>
     defaultMessage: 'Showing {totalRules} {totalRules, plural, =1 {rule} other {rules}}',
   });
 
+export const SELECT_ALL_RULES = (totalRules: number) =>
+  i18n.translate('xpack.securitySolution.detectionEngine.rules.allRules.selectAllRulesTitle', {
+    values: { totalRules },
+    defaultMessage: 'Select all {totalRules} {totalRules, plural, =1 {rule} other {rules}}',
+  });
+
+export const CLEAR_SELECTION = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.allRules.clearSelectionTitle',
+  {
+    defaultMessage: 'Clear selection',
+  }
+);
+
 export const SELECTED_RULES = (selectedRules: number) =>
   i18n.translate('xpack.securitySolution.detectionEngine.rules.allRules.selectedRulesTitle', {
     values: { selectedRules },
@@ -253,6 +266,13 @@ export const DUPLICATE_RULE_ERROR = i18n.translate(
   }
 );
 
+export const BULK_ACTION_FAILED = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.allRules.actions.bulkActionFailedDescription',
+  {
+    defaultMessage: 'Failed to execte bulk action',
+  }
+);
+
 export const EXPORT_RULE = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.allRules.actions.exportRuleDescription',
   {
@@ -577,6 +597,35 @@ export const REFRESH_PROMPT_BODY = i18n.translate(
   }
 );
 
+export const DELETE_CONFIRMATION_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionEngine.components.allRules.deleteConfirmationTitle',
+  {
+    defaultMessage: 'Confirm bulk deletion',
+  }
+);
+
+export const DELETE_CONFIRMATION_CONFIRM = i18n.translate(
+  'xpack.securitySolution.detectionEngine.components.allRules.deleteConfirmationConfirm',
+  {
+    defaultMessage: 'Confirm',
+  }
+);
+
+export const DELETE_CONFIRMATION_CANCEL = i18n.translate(
+  'xpack.securitySolution.detectionEngine.components.allRules.deleteConfirmationCancel',
+  {
+    defaultMessage: 'Cancel',
+  }
+);
+
+export const DELETE_CONFIRMATION_BODY = i18n.translate(
+  'xpack.securitySolution.detectionEngine.components.allRules.deleteConfirmationBody',
+  {
+    defaultMessage:
+      'This action will delete all rules that match current filter query. Click "Confirm" to continue.',
+  }
+);
+
 export const REFRESH_RULE_POPOVER_DESCRIPTION = i18n.translate(
   'xpack.securitySolution.detectionEngine.rules.refreshRulePopoverDescription',
   {
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 0808238151e03..b1a0d13ed554b 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
@@ -94,9 +94,7 @@ describe('Hosts Table', () => {
           sortField: 'lastSeen',
           limit: 10,
         });
-        expect(wrapper.find('.euiTable thead tr th button').at(1).text()).toEqual(
-          'Last seen Click to sort in ascending order'
-        );
+        expect(wrapper.find('.euiTable thead tr th button').at(1).text()).toEqual('Last seen ');
         expect(wrapper.find('.euiTable thead tr th button').at(1).find('svg')).toBeTruthy();
       });
 
@@ -111,9 +109,7 @@ describe('Hosts Table', () => {
           sortField: 'hostName',
           limit: 10,
         });
-        expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual(
-          'Host nameClick to sort in descending order'
-        );
+        expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual('Host name');
       });
     });
   });
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 5bafecb8c4ff5..93d0642c6b3b6 100644
--- a/x-pack/plugins/security_solution/public/management/common/routing.ts
+++ b/x-pack/plugins/security_solution/public/management/common/routing.ts
@@ -66,7 +66,7 @@ export const getEndpointListPath = (
 
 export const getEndpointDetailsPath = (
   props: {
-    name: 'endpointDetails' | 'endpointPolicyResponse' | 'endpointIsolate';
+    name: 'endpointDetails' | 'endpointPolicyResponse' | 'endpointIsolate' | 'endpointUnIsolate';
   } & EndpointIndexUIQueryParams &
     EndpointDetailsUrlProps,
   search?: string
@@ -79,6 +79,9 @@ export const getEndpointDetailsPath = (
     case 'endpointIsolate':
       queryParams.show = 'isolate';
       break;
+    case 'endpointUnIsolate':
+      queryParams.show = 'unisolate';
+      break;
     case 'endpointPolicyResponse':
       queryParams.show = 'policy_response';
       break;
diff --git a/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/back_to_external_app_button.tsx b/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/back_to_external_app_button.tsx
new file mode 100644
index 0000000000000..78c854d933584
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/back_to_external_app_button.tsx
@@ -0,0 +1,52 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+import React, { memo } from 'react';
+
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiButtonEmpty } from '@elastic/eui';
+import styled from 'styled-components';
+
+import { ListPageRouteState } from '../../../../common/endpoint/types';
+
+import { useNavigateToAppEventHandler } from '../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
+
+const EuiButtonEmptyStyled = styled(EuiButtonEmpty)`
+  margin-bottom: ${({ theme }) => theme.eui.euiSizeS};
+
+  .euiIcon {
+    width: ${({ theme }) => theme.eui.euiIconSizes.small};
+    height: ${({ theme }) => theme.eui.euiIconSizes.small};
+  }
+
+  .text {
+    font-size: ${({ theme }) => theme.eui.euiFontSizeXS};
+  }
+`;
+
+export const BackToExternalAppButton = memo<ListPageRouteState>(
+  ({ backButtonLabel, backButtonUrl, onBackButtonNavigateTo }) => {
+    const handleBackOnClick = useNavigateToAppEventHandler(...onBackButtonNavigateTo!);
+
+    return (
+      <EuiButtonEmptyStyled
+        flush="left"
+        size="xs"
+        iconType="arrowLeft"
+        href={backButtonUrl!}
+        onClick={handleBackOnClick}
+        textProps={{ className: 'text' }}
+        data-test-subj="backToOrigin"
+      >
+        {backButtonLabel || (
+          <FormattedMessage id="xpack.securitySolution.list.backButton" defaultMessage="Back" />
+        )}
+      </EuiButtonEmptyStyled>
+    );
+  }
+);
+
+BackToExternalAppButton.displayName = 'BackToExternalAppButton';
diff --git a/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/index.ts b/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/index.ts
new file mode 100644
index 0000000000000..d4a2f8de13546
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/components/back_to_external_app_button/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 { BackToExternalAppButton } from './back_to_external_app_button';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
new file mode 100644
index 0000000000000..3a3ad47f9f575
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/mocks.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  composeHttpHandlerMocks,
+  httpHandlerMockFactory,
+  ResponseProvidersInterface,
+} from '../../../common/mock/endpoint/http_handler_mock_factory';
+import {
+  HostInfo,
+  HostPolicyResponse,
+  HostResultList,
+  HostStatus,
+  MetadataQueryStrategyVersions,
+} from '../../../../common/endpoint/types';
+import { EndpointDocGenerator } from '../../../../common/endpoint/generate_data';
+import {
+  BASE_POLICY_RESPONSE_ROUTE,
+  HOST_METADATA_GET_ROUTE,
+  HOST_METADATA_LIST_ROUTE,
+} from '../../../../common/endpoint/constants';
+import { AGENT_POLICY_API_ROUTES, GetAgentPoliciesResponse } from '../../../../../fleet/common';
+
+type EndpointMetadataHttpMocksInterface = ResponseProvidersInterface<{
+  metadataList: () => HostResultList;
+  metadataDetails: () => HostInfo;
+}>;
+export const endpointMetadataHttpMocks = httpHandlerMockFactory<EndpointMetadataHttpMocksInterface>(
+  [
+    {
+      id: 'metadataList',
+      path: HOST_METADATA_LIST_ROUTE,
+      method: 'post',
+      handler: () => {
+        const generator = new EndpointDocGenerator('seed');
+
+        return {
+          hosts: Array.from({ length: 10 }, () => {
+            return {
+              metadata: generator.generateHostMetadata(),
+              host_status: HostStatus.UNHEALTHY,
+              query_strategy_version: MetadataQueryStrategyVersions.VERSION_2,
+            };
+          }),
+          total: 10,
+          request_page_size: 10,
+          request_page_index: 0,
+          query_strategy_version: MetadataQueryStrategyVersions.VERSION_2,
+        };
+      },
+    },
+    {
+      id: 'metadataDetails',
+      path: HOST_METADATA_GET_ROUTE,
+      method: 'get',
+      handler: () => {
+        const generator = new EndpointDocGenerator('seed');
+
+        return {
+          metadata: generator.generateHostMetadata(),
+          host_status: HostStatus.UNHEALTHY,
+          query_strategy_version: MetadataQueryStrategyVersions.VERSION_2,
+        };
+      },
+    },
+  ]
+);
+
+type EndpointPolicyResponseHttpMockInterface = ResponseProvidersInterface<{
+  policyResponse: () => HostPolicyResponse;
+}>;
+export const endpointPolicyResponseHttpMock = httpHandlerMockFactory<EndpointPolicyResponseHttpMockInterface>(
+  [
+    {
+      id: 'policyResponse',
+      path: BASE_POLICY_RESPONSE_ROUTE,
+      method: 'get',
+      handler: () => {
+        return new EndpointDocGenerator('seed').generatePolicyResponse();
+      },
+    },
+  ]
+);
+
+type FleetApisHttpMockInterface = ResponseProvidersInterface<{
+  agentPolicy: () => GetAgentPoliciesResponse;
+}>;
+export const fleetApisHttpMock = httpHandlerMockFactory<FleetApisHttpMockInterface>([
+  {
+    id: 'agentPolicy',
+    path: AGENT_POLICY_API_ROUTES.LIST_PATTERN,
+    method: 'get',
+    handler: () => {
+      const generator = new EndpointDocGenerator('seed');
+      const endpointMetadata = generator.generateHostMetadata();
+      const agentPolicy = generator.generateAgentPolicy();
+
+      // Make sure that the Agent policy returned from the API has the Integration Policy ID that
+      // the endpoint metadata is using. This is needed especially when testing the Endpoint Details
+      // flyout where certain actions might be disabled if we know the endpoint integration policy no
+      // longer exists.
+      (agentPolicy.package_policies as string[]).push(endpointMetadata.Endpoint.policy.applied.id);
+
+      return {
+        items: [agentPolicy],
+        perPage: 10,
+        total: 1,
+        page: 1,
+      };
+    },
+  },
+]);
+
+type EndpointPageHttpMockInterface = EndpointMetadataHttpMocksInterface &
+  EndpointPolicyResponseHttpMockInterface &
+  FleetApisHttpMockInterface;
+/**
+ * HTTP Mocks that support the Endpoint List and Details page
+ */
+export const endpointPageHttpMock = composeHttpHandlerMocks<EndpointPageHttpMockInterface>([
+  endpointMetadataHttpMocks,
+  endpointPolicyResponseHttpMock,
+  fleetApisHttpMock,
+]);
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
index d80a7d03903ac..178f27caa1085 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/action.ts
@@ -11,6 +11,7 @@ import {
   HostInfo,
   GetHostPolicyResponse,
   HostIsolationRequestBody,
+  ISOLATION_ACTIONS,
 } from '../../../../../common/endpoint/types';
 import { ServerApiError } from '../../../../common/types';
 import { GetPolicyListResponse } from '../../policy/types';
@@ -37,7 +38,6 @@ export interface ServerFailedToReturnEndpointDetails {
   type: 'serverFailedToReturnEndpointDetails';
   payload: ServerApiError;
 }
-
 export interface ServerReturnedEndpointPolicyResponse {
   type: 'serverReturnedEndpointPolicyResponse';
   payload: GetHostPolicyResponse;
@@ -137,19 +137,27 @@ export interface ServerFailedToReturnEndpointsTotal {
   payload: ServerApiError;
 }
 
-type EndpointIsolationRequest = Action<'endpointIsolationRequest'> & {
-  payload: HostIsolationRequestBody;
+export type EndpointIsolationRequest = Action<'endpointIsolationRequest'> & {
+  payload: {
+    type: ISOLATION_ACTIONS;
+    data: HostIsolationRequestBody;
+  };
 };
 
-type EndpointIsolationRequestStateChange = Action<'endpointIsolationRequestStateChange'> & {
+export type EndpointIsolationRequestStateChange = Action<'endpointIsolationRequestStateChange'> & {
   payload: EndpointState['isolationRequestState'];
 };
 
+export type EndpointDetailsActivityLogChanged = Action<'endpointDetailsActivityLogChanged'> & {
+  payload: EndpointState['endpointDetails']['activityLog'];
+};
+
 export type EndpointAction =
   | ServerReturnedEndpointList
   | ServerFailedToReturnEndpointList
   | ServerReturnedEndpointDetails
   | ServerFailedToReturnEndpointDetails
+  | EndpointDetailsActivityLogChanged
   | ServerReturnedEndpointPolicyResponse
   | ServerFailedToReturnEndpointPolicyResponse
   | ServerReturnedPoliciesForOnboarding
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.ts
new file mode 100644
index 0000000000000..d5416d9f8ec96
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/builders.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 { Immutable } from '../../../../../common/endpoint/types';
+import { DEFAULT_POLL_INTERVAL } from '../../../common/constants';
+import { createUninitialisedResourceState } from '../../../state';
+import { EndpointState } from '../types';
+
+export const initialEndpointPageState = (): Immutable<EndpointState> => {
+  return {
+    hosts: [],
+    pageSize: 10,
+    pageIndex: 0,
+    total: 0,
+    loading: false,
+    error: undefined,
+    endpointDetails: {
+      activityLog: createUninitialisedResourceState(),
+      hostDetails: {
+        details: undefined,
+        detailsLoading: false,
+        detailsError: undefined,
+      },
+    },
+    policyResponse: undefined,
+    policyResponseLoading: false,
+    policyResponseError: undefined,
+    location: undefined,
+    policyItems: [],
+    selectedPolicyId: undefined,
+    policyItemsLoading: false,
+    endpointPackageInfo: undefined,
+    nonExistingPolicies: {},
+    agentPolicies: {},
+    endpointsExist: true,
+    patterns: [],
+    patternsError: undefined,
+    isAutoRefreshEnabled: true,
+    autoRefreshInterval: DEFAULT_POLL_INTERVAL,
+    agentsWithEndpointsTotal: 0,
+    agentsWithEndpointsTotalError: undefined,
+    endpointsTotal: 0,
+    endpointsTotalError: undefined,
+    queryStrategyVersion: undefined,
+    policyVersionInfo: undefined,
+    hostStatus: undefined,
+    isolationRequestState: createUninitialisedResourceState(),
+  };
+};
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
index 79f0c5af9bbe3..5be67a3581c9e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/index.test.ts
@@ -41,9 +41,16 @@ describe('EndpointList store concerns', () => {
         total: 0,
         loading: false,
         error: undefined,
-        details: undefined,
-        detailsLoading: false,
-        detailsError: undefined,
+        endpointDetails: {
+          activityLog: {
+            type: 'UninitialisedResourceState',
+          },
+          hostDetails: {
+            details: undefined,
+            detailsLoading: false,
+            detailsError: undefined,
+          },
+        },
         policyResponse: undefined,
         policyResponseLoading: false,
         policyResponseError: undefined,
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 c52d922001887..6548d8a10ce97 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
@@ -18,6 +18,8 @@ import {
   Immutable,
   HostResultList,
   HostIsolationResponse,
+  EndpointAction,
+  ISOLATION_ACTIONS,
 } from '../../../../../common/endpoint/types';
 import { AppAction } from '../../../../common/store/actions';
 import { mockEndpointResultList } from './mock_endpoint_result_list';
@@ -25,8 +27,9 @@ import { listData } from './selectors';
 import { EndpointState } from '../types';
 import { endpointListReducer } from './reducer';
 import { endpointMiddlewareFactory } from './middleware';
-import { getEndpointListPath } from '../../../common/routing';
+import { getEndpointListPath, getEndpointDetailsPath } from '../../../common/routing';
 import {
+  createLoadedResourceState,
   FailedResourceState,
   isFailedResourceState,
   isLoadedResourceState,
@@ -39,6 +42,7 @@ import {
   hostIsolationRequestBodyMock,
   hostIsolationResponseMock,
 } from '../../../../common/lib/host_isolation/mocks';
+import { FleetActionGenerator } from '../../../../../common/endpoint/data_generators/fleet_action_generator';
 
 jest.mock('../../policy/store/services/ingest', () => ({
   sendGetAgentConfigList: () => Promise.resolve({ items: [] }),
@@ -132,10 +136,13 @@ describe('endpoint list middleware', () => {
 
   describe('handling of IsolateEndpointHost action', () => {
     const getKibanaServicesMock = KibanaServices.get as jest.Mock;
-    const dispatchIsolateEndpointHost = () => {
+    const dispatchIsolateEndpointHost = (action: ISOLATION_ACTIONS = 'isolate') => {
       dispatch({
         type: 'endpointIsolationRequest',
-        payload: hostIsolationRequestBodyMock(),
+        payload: {
+          type: action,
+          data: hostIsolationRequestBodyMock(),
+        },
       });
     };
     let isolateApiResponseHandlers: ReturnType<typeof hostIsolationHttpMocks>;
@@ -158,7 +165,24 @@ describe('endpoint list middleware', () => {
 
     it('should call isolate api', async () => {
       dispatchIsolateEndpointHost();
-      expect(fakeHttpServices.post).toHaveBeenCalled();
+      await waitForAction('endpointIsolationRequestStateChange', {
+        validate(action) {
+          return isLoadedResourceState(action.payload);
+        },
+      });
+
+      expect(isolateApiResponseHandlers.responseProvider.isolateHost).toHaveBeenCalled();
+    });
+
+    it('should call unisolate api', async () => {
+      dispatchIsolateEndpointHost('unisolate');
+      await waitForAction('endpointIsolationRequestStateChange', {
+        validate(action) {
+          return isLoadedResourceState(action.payload);
+        },
+      });
+
+      expect(isolateApiResponseHandlers.responseProvider.unIsolateHost).toHaveBeenCalled();
     });
 
     it('should set Isolation state to loaded if api is successful', async () => {
@@ -192,4 +216,65 @@ describe('endpoint list middleware', () => {
       expect(failedAction.error).toBe(apiError);
     });
   });
+
+  describe('handle ActivityLog State Change actions', () => {
+    const endpointList = getEndpointListApiResponse();
+    const search = getEndpointDetailsPath({
+      name: 'endpointDetails',
+      selected_endpoint: endpointList.hosts[0].metadata.agent.id,
+    });
+    const dispatchUserChangedUrl = () => {
+      dispatch({
+        type: 'userChangedUrl',
+        payload: {
+          ...history.location,
+          pathname: '/endpoints',
+          search: `?${search.split('?').pop()}`,
+        },
+      });
+    };
+    const fleetActionGenerator = new FleetActionGenerator(Math.random().toString());
+    const activityLog = [
+      fleetActionGenerator.generate({
+        agents: [endpointList.hosts[0].metadata.agent.id],
+      }),
+    ];
+    const dispatchGetActivityLog = () => {
+      dispatch({
+        type: 'endpointDetailsActivityLogChanged',
+        payload: createLoadedResourceState(activityLog),
+      });
+    };
+
+    it('should set ActivityLog state to loading', async () => {
+      dispatchUserChangedUrl();
+
+      const loadingDispatched = waitForAction('endpointDetailsActivityLogChanged', {
+        validate(action) {
+          return isLoadingResourceState(action.payload);
+        },
+      });
+
+      const loadingDispatchedResponse = await loadingDispatched;
+      expect(loadingDispatchedResponse.payload.type).toEqual('LoadingResourceState');
+    });
+
+    it('should set ActivityLog state to loaded when fetching activity log is successful', async () => {
+      dispatchUserChangedUrl();
+
+      const loadedDispatched = waitForAction('endpointDetailsActivityLogChanged', {
+        validate(action) {
+          return isLoadedResourceState(action.payload);
+        },
+      });
+
+      dispatchGetActivityLog();
+      const loadedDispatchedResponse = await loadedDispatched;
+      const activityLogData = (loadedDispatchedResponse.payload as LoadedResourceState<
+        EndpointAction[]
+      >).data;
+
+      expect(activityLogData).toEqual(activityLog);
+    });
+  });
 });
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 9db9932dd4387..b62663bd78750 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
@@ -7,6 +7,7 @@
 
 import { HttpStart } from 'kibana/public';
 import {
+  EndpointAction,
   HostInfo,
   HostIsolationRequestBody,
   HostIsolationResponse,
@@ -18,6 +19,7 @@ import { ImmutableMiddlewareAPI, ImmutableMiddlewareFactory } from '../../../../
 import {
   isOnEndpointPage,
   hasSelectedEndpoint,
+  selectedAgent,
   uiQueryParams,
   listData,
   endpointPackageInfo,
@@ -27,6 +29,7 @@ import {
   isTransformEnabled,
   getIsIsolationRequestPending,
   getCurrentIsolationRequestState,
+  getActivityLogData,
 } from './selectors';
 import { EndpointState, PolicyIds } from '../types';
 import {
@@ -37,19 +40,20 @@ import {
 } from '../../policy/store/services/ingest';
 import { AGENT_POLICY_SAVED_OBJECT_TYPE } from '../../../../../../fleet/common';
 import {
-  HOST_METADATA_GET_API,
-  HOST_METADATA_LIST_API,
+  ENDPOINT_ACTION_LOG_ROUTE,
+  HOST_METADATA_GET_ROUTE,
+  HOST_METADATA_LIST_ROUTE,
   metadataCurrentIndexPattern,
 } from '../../../../../common/endpoint/constants';
 import { IIndexPattern, Query } from '../../../../../../../../src/plugins/data/public';
-import { resolvePathVariables } from '../../trusted_apps/service/utils';
 import {
   createFailedResourceState,
   createLoadedResourceState,
   createLoadingResourceState,
 } from '../../../state';
-import { isolateHost } from '../../../../common/lib/host_isolation';
+import { isolateHost, unIsolateHost } from '../../../../common/lib/host_isolation';
 import { AppAction } from '../../../../common/store/actions';
+import { resolvePathVariables } from '../../../../common/utils/resolve_path_variables';
 
 type EndpointPageStore = ImmutableMiddlewareAPI<EndpointState, AppAction>;
 
@@ -100,7 +104,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
       try {
         const decodedQuery: Query = searchBarQuery(getState());
 
-        endpointResponse = await coreStart.http.post<HostResultList>(HOST_METADATA_LIST_API, {
+        endpointResponse = await coreStart.http.post<HostResultList>(HOST_METADATA_LIST_ROUTE, {
           body: JSON.stringify({
             paging_properties: [{ page_index: pageIndex }, { page_size: pageSize }],
             filters: { kql: decodedQuery.query },
@@ -249,7 +253,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
       if (listData(getState()).length === 0) {
         const { page_index: pageIndex, page_size: pageSize } = uiQueryParams(getState());
         try {
-          const response = await coreStart.http.post(HOST_METADATA_LIST_API, {
+          const response = await coreStart.http.post(HOST_METADATA_LIST_ROUTE, {
             body: JSON.stringify({
               paging_properties: [{ page_index: pageIndex }, { page_size: pageSize }],
             }),
@@ -299,7 +303,7 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
       const { selected_endpoint: selectedEndpoint } = uiQueryParams(getState());
       try {
         const response = await coreStart.http.get<HostInfo>(
-          resolvePathVariables(HOST_METADATA_GET_API, { id: selectedEndpoint as string })
+          resolvePathVariables(HOST_METADATA_GET_ROUTE, { id: selectedEndpoint as string })
         );
         dispatch({
           type: 'serverReturnedEndpointDetails',
@@ -336,6 +340,29 @@ export const endpointMiddlewareFactory: ImmutableMiddlewareFactory<EndpointState
         });
       }
 
+      // call the activity log api
+      dispatch({
+        type: 'endpointDetailsActivityLogChanged',
+        // ts error to be fixed when AsyncResourceState is refactored (#830)
+        // @ts-expect-error
+        payload: createLoadingResourceState<EndpointAction[]>(getActivityLogData(getState())),
+      });
+
+      try {
+        const activityLog = await coreStart.http.get<EndpointAction[]>(
+          resolvePathVariables(ENDPOINT_ACTION_LOG_ROUTE, { agent_id: selectedAgent(getState()) })
+        );
+        dispatch({
+          type: 'endpointDetailsActivityLogChanged',
+          payload: createLoadedResourceState<EndpointAction[]>(activityLog),
+        });
+      } catch (error) {
+        dispatch({
+          type: 'endpointDetailsActivityLogChanged',
+          payload: createFailedResourceState<EndpointAction[]>(error.body ?? error),
+        });
+      }
+
       // call the policy response api
       try {
         const policyResponse = await coreStart.http.get(`/api/endpoint/policy_response`, {
@@ -431,7 +458,7 @@ const getAgentAndPoliciesForEndpointsList = async (
 const endpointsTotal = async (http: HttpStart): Promise<number> => {
   try {
     return (
-      await http.post<HostResultList>(HOST_METADATA_LIST_API, {
+      await http.post<HostResultList>(HOST_METADATA_LIST_ROUTE, {
         body: JSON.stringify({
           paging_properties: [{ page_index: 0 }, { page_size: 1 }],
         }),
@@ -477,7 +504,13 @@ const handleIsolateEndpointHost = async (
 
   try {
     // Cast needed below due to the value of payload being `Immutable<>`
-    const response = await isolateHost(action.payload as HostIsolationRequestBody);
+    let response: HostIsolationResponse;
+
+    if (action.payload.type === 'unisolate') {
+      response = await unIsolateHost(action.payload.data as HostIsolationRequestBody);
+    } else {
+      response = await isolateHost(action.payload.data as HostIsolationRequestBody);
+    }
 
     dispatch({
       type: 'endpointIsolationRequestStateChange',
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
index b2b46e6de9842..19235b792b270 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/reducer.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { EndpointDetailsActivityLogChanged } from './action';
 import {
   isOnEndpointPage,
   hasSelectedEndpoint,
@@ -12,52 +13,33 @@ import {
   getCurrentIsolationRequestState,
 } from './selectors';
 import { EndpointState } from '../types';
+import { initialEndpointPageState } from './builders';
 import { AppAction } from '../../../../common/store/actions';
 import { ImmutableReducer } from '../../../../common/store';
 import { Immutable } from '../../../../../common/endpoint/types';
-import { DEFAULT_POLL_INTERVAL } from '../../../common/constants';
 import { createUninitialisedResourceState, isUninitialisedResourceState } from '../../../state';
 
-export const initialEndpointListState: Immutable<EndpointState> = {
-  hosts: [],
-  pageSize: 10,
-  pageIndex: 0,
-  total: 0,
-  loading: false,
-  error: undefined,
-  details: undefined,
-  detailsLoading: false,
-  detailsError: undefined,
-  policyResponse: undefined,
-  policyResponseLoading: false,
-  policyResponseError: undefined,
-  location: undefined,
-  policyItems: [],
-  selectedPolicyId: undefined,
-  policyItemsLoading: false,
-  endpointPackageInfo: undefined,
-  nonExistingPolicies: {},
-  agentPolicies: {},
-  endpointsExist: true,
-  patterns: [],
-  patternsError: undefined,
-  isAutoRefreshEnabled: true,
-  autoRefreshInterval: DEFAULT_POLL_INTERVAL,
-  agentsWithEndpointsTotal: 0,
-  agentsWithEndpointsTotalError: undefined,
-  endpointsTotal: 0,
-  endpointsTotalError: undefined,
-  queryStrategyVersion: undefined,
-  policyVersionInfo: undefined,
-  hostStatus: undefined,
-  isolationRequestState: createUninitialisedResourceState(),
-};
+type StateReducer = ImmutableReducer<EndpointState, AppAction>;
+type CaseReducer<T extends AppAction> = (
+  state: Immutable<EndpointState>,
+  action: Immutable<T>
+) => Immutable<EndpointState>;
 
-/* eslint-disable-next-line complexity */
-export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
-  state = initialEndpointListState,
+const handleEndpointDetailsActivityLogChanged: CaseReducer<EndpointDetailsActivityLogChanged> = (
+  state,
   action
 ) => {
+  return {
+    ...state!,
+    endpointDetails: {
+      ...state.endpointDetails!,
+      activityLog: action.payload,
+    },
+  };
+};
+
+/* eslint-disable-next-line complexity */
+export const endpointListReducer: StateReducer = (state = initialEndpointPageState(), action) => {
   if (action.type === 'serverReturnedEndpointList') {
     const {
       hosts,
@@ -115,18 +97,32 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
   } else if (action.type === 'serverReturnedEndpointDetails') {
     return {
       ...state,
-      details: action.payload.metadata,
+      endpointDetails: {
+        ...state.endpointDetails,
+        hostDetails: {
+          ...state.endpointDetails.hostDetails,
+          details: action.payload.metadata,
+          detailsLoading: false,
+          detailsError: undefined,
+        },
+      },
       policyVersionInfo: action.payload.policy_info,
       hostStatus: action.payload.host_status,
-      detailsLoading: false,
-      detailsError: undefined,
     };
   } else if (action.type === 'serverFailedToReturnEndpointDetails') {
     return {
       ...state,
-      detailsError: action.payload,
-      detailsLoading: false,
+      endpointDetails: {
+        ...state.endpointDetails,
+        hostDetails: {
+          ...state.endpointDetails.hostDetails,
+          detailsError: action.payload,
+          detailsLoading: false,
+        },
+      },
     };
+  } else if (action.type === 'endpointDetailsActivityLogChanged') {
+    return handleEndpointDetailsActivityLogChanged(state, action);
   } else if (action.type === 'serverReturnedPoliciesForOnboarding') {
     return {
       ...state,
@@ -221,7 +217,6 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
     const stateUpdates: Partial<EndpointState> = {
       location: action.payload,
       error: undefined,
-      detailsError: undefined,
       policyResponseError: undefined,
     };
 
@@ -239,6 +234,13 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
         return {
           ...state,
           ...stateUpdates,
+          endpointDetails: {
+            ...state.endpointDetails,
+            hostDetails: {
+              ...state.endpointDetails.hostDetails,
+              detailsError: undefined,
+            },
+          },
           loading: true,
           policyItemsLoading: true,
         };
@@ -249,6 +251,14 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
         return {
           ...state,
           ...stateUpdates,
+          endpointDetails: {
+            ...state.endpointDetails,
+            hostDetails: {
+              ...state.endpointDetails.hostDetails,
+              detailsLoading: true,
+              detailsError: undefined,
+            },
+          },
           detailsLoading: true,
           policyResponseLoading: true,
         };
@@ -257,8 +267,15 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
         return {
           ...state,
           ...stateUpdates,
+          endpointDetails: {
+            ...state.endpointDetails,
+            hostDetails: {
+              ...state.endpointDetails.hostDetails,
+              detailsLoading: true,
+              detailsError: undefined,
+            },
+          },
           loading: true,
-          detailsLoading: true,
           policyResponseLoading: true,
           policyItemsLoading: true,
         };
@@ -268,6 +285,13 @@ export const endpointListReducer: ImmutableReducer<EndpointState, AppAction> = (
     return {
       ...state,
       ...stateUpdates,
+      endpointDetails: {
+        ...state.endpointDetails,
+        hostDetails: {
+          ...state.endpointDetails.hostDetails,
+          detailsError: undefined,
+        },
+      },
       endpointsExist: true,
     };
   }
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
index af95d89fdc10b..f3848557567ec 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/store/selectors.ts
@@ -32,6 +32,7 @@ import {
   isLoadingResourceState,
 } from '../../../state';
 import { ServerApiError } from '../../../../common/types';
+import { isEndpointHostIsolated } from '../../../../common/utils/validators';
 
 export const listData = (state: Immutable<EndpointState>) => state.hosts;
 
@@ -45,11 +46,16 @@ export const listLoading = (state: Immutable<EndpointState>): boolean => state.l
 
 export const listError = (state: Immutable<EndpointState>) => state.error;
 
-export const detailsData = (state: Immutable<EndpointState>) => state.details;
+export const detailsData = (state: Immutable<EndpointState>) =>
+  state.endpointDetails.hostDetails.details;
 
-export const detailsLoading = (state: Immutable<EndpointState>): boolean => state.detailsLoading;
+export const detailsLoading = (state: Immutable<EndpointState>): boolean =>
+  state.endpointDetails.hostDetails.detailsLoading;
 
-export const detailsError = (state: Immutable<EndpointState>) => state.detailsError;
+export const detailsError = (
+  state: Immutable<EndpointState>
+): EndpointState['endpointDetails']['hostDetails']['detailsError'] =>
+  state.endpointDetails.hostDetails.detailsError;
 
 export const policyItems = (state: Immutable<EndpointState>) => state.policyItems;
 
@@ -199,6 +205,14 @@ export const uiQueryParams: (
         'admin_query',
       ];
 
+      const allowedShowValues: Array<EndpointIndexUIQueryParams['show']> = [
+        'policy_response',
+        'details',
+        'isolate',
+        'unisolate',
+        'activity_log',
+      ];
+
       for (const key of keys) {
         const value: string | undefined =
           typeof query[key] === 'string'
@@ -209,8 +223,8 @@ export const uiQueryParams: (
 
         if (value !== undefined) {
           if (key === 'show') {
-            if (value === 'policy_response' || value === 'details' || value === 'isolate') {
-              data[key] = value;
+            if (allowedShowValues.includes(value as EndpointIndexUIQueryParams['show'])) {
+              data[key] = value as EndpointIndexUIQueryParams['show'];
             }
           } else {
             data[key] = value;
@@ -240,6 +254,19 @@ export const showView: (
   return searchParams.show ?? 'details';
 });
 
+/**
+ * Returns the selected endpoint's elastic agent Id
+ * used for fetching endpoint actions log
+ */
+export const selectedAgent = (state: Immutable<EndpointState>): string => {
+  const hostList = state.hosts;
+  const { selected_endpoint: selectedEndpoint } = uiQueryParams(state);
+  return (
+    hostList.find((host) => host.metadata.agent.id === selectedEndpoint)?.metadata.elastic.agent
+      .id || ''
+  );
+};
+
 /**
  * Returns the Host Status which is connected the fleet agent
  */
@@ -331,3 +358,31 @@ export const getIsolationRequestError: (
     return isolateHost.error;
   }
 });
+
+export const getActivityLogData = (
+  state: Immutable<EndpointState>
+): Immutable<EndpointState['endpointDetails']['activityLog']> => state.endpointDetails.activityLog;
+
+export const getActivityLogRequestLoading: (
+  state: Immutable<EndpointState>
+) => boolean = createSelector(getActivityLogData, (activityLog) =>
+  isLoadingResourceState(activityLog)
+);
+
+export const getActivityLogRequestLoaded: (
+  state: Immutable<EndpointState>
+) => boolean = createSelector(getActivityLogData, (activityLog) =>
+  isLoadedResourceState(activityLog)
+);
+
+export const getActivityLogError: (
+  state: Immutable<EndpointState>
+) => ServerApiError | undefined = createSelector(getActivityLogData, (activityLog) => {
+  if (isFailedResourceState(activityLog)) {
+    return activityLog.error;
+  }
+});
+
+export const getIsEndpointHostIsolated = createSelector(detailsData, (details) => {
+  return (details && isEndpointHostIsolated(details)) || false;
+});
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 74eee0602722b..53ddfaee7aa05 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
@@ -14,6 +14,7 @@ import {
   PolicyData,
   MetadataQueryStrategyVersions,
   HostStatus,
+  EndpointAction,
   HostIsolationResponse,
 } from '../../../../common/endpoint/types';
 import { ServerApiError } from '../../../common/types';
@@ -34,12 +35,17 @@ export interface EndpointState {
   loading: boolean;
   /** api error from retrieving host list */
   error?: ServerApiError;
-  /** details data for a specific host */
-  details?: Immutable<HostMetadata>;
-  /** details page is retrieving data */
-  detailsLoading: boolean;
-  /** api error from retrieving host details */
-  detailsError?: ServerApiError;
+  endpointDetails: {
+    activityLog: AsyncResourceState<EndpointAction[]>;
+    hostDetails: {
+      /** details data for a specific host */
+      details?: Immutable<HostMetadata>;
+      /** details page is retrieving data */
+      detailsLoading: boolean;
+      /** api error from retrieving host details */
+      detailsError?: ServerApiError;
+    };
+  };
   /** Holds the Policy Response for the Host currently being displayed in the details */
   policyResponse?: HostPolicyResponse;
   /** policyResponse is being retrieved */
@@ -108,7 +114,7 @@ export interface EndpointIndexUIQueryParams {
   /** Which page to show */
   page_index?: string;
   /** show the policy response or host details */
-  show?: 'policy_response' | 'details' | 'isolate';
+  show?: 'policy_response' | 'activity_log' | 'details' | 'isolate' | 'unisolate';
   /** Query text from search bar*/
   admin_query?: string;
 }
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/context_menu_item_nav_by_rotuer.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/context_menu_item_nav_by_rotuer.tsx
new file mode 100644
index 0000000000000..ac1b83bdc493b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/context_menu_item_nav_by_rotuer.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 } from 'react';
+import { EuiContextMenuItem, EuiContextMenuItemProps } from '@elastic/eui';
+import { NavigateToAppOptions } from 'kibana/public';
+import { useNavigateToAppEventHandler } from '../../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
+
+export interface ContextMenuItemNavByRouterProps extends EuiContextMenuItemProps {
+  navigateAppId: string;
+  navigateOptions: NavigateToAppOptions;
+  children: React.ReactNode;
+}
+
+/**
+ * Just like `EuiContextMenuItem`, but allows for additional props to be defined which will
+ * allow navigation to a URL path via React Router
+ */
+export const ContextMenuItemNavByRouter = memo<ContextMenuItemNavByRouterProps>(
+  ({ navigateAppId, navigateOptions, onClick, children, ...otherMenuItemProps }) => {
+    const handleOnClick = useNavigateToAppEventHandler(navigateAppId, {
+      ...navigateOptions,
+      onClick,
+    });
+
+    return (
+      <EuiContextMenuItem {...otherMenuItemProps} onClick={handleOnClick}>
+        {children}
+      </EuiContextMenuItem>
+    );
+  }
+);
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/table_row_actions.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/table_row_actions.tsx
index 8110c5f16a892..94303c43cd4da 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/table_row_actions.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/components/table_row_actions.tsx
@@ -9,37 +9,31 @@ import React, { memo, useCallback, useMemo, useState } from 'react';
 import {
   EuiButtonIcon,
   EuiContextMenuPanel,
-  EuiPopover,
-  EuiContextMenuItemProps,
   EuiContextMenuPanelProps,
-  EuiContextMenuItem,
+  EuiPopover,
   EuiPopoverProps,
 } from '@elastic/eui';
-import { NavigateToAppOptions } from 'kibana/public';
 import { i18n } from '@kbn/i18n';
-import { useNavigateToAppEventHandler } from '../../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
+import { ContextMenuItemNavByRouter } from './context_menu_item_nav_by_rotuer';
+import { HostMetadata } from '../../../../../../common/endpoint/types';
+import { useEndpointActionItems } from '../hooks';
 
 export interface TableRowActionProps {
-  items: Array<
-    Omit<EuiContextMenuItemProps, 'onClick'> & {
-      navigateAppId: string;
-      navigateOptions: NavigateToAppOptions;
-      children: React.ReactNode;
-      key: string;
-    }
-  >;
+  endpointMetadata: HostMetadata;
 }
 
-export const TableRowActions = memo<TableRowActionProps>(({ items }) => {
+export const TableRowActions = memo<TableRowActionProps>(({ endpointMetadata }) => {
   const [isOpen, setIsOpen] = useState(false);
+  const endpointActions = useEndpointActionItems(endpointMetadata);
+
   const handleCloseMenu = useCallback(() => setIsOpen(false), [setIsOpen]);
   const handleToggleMenu = useCallback(() => setIsOpen(!isOpen), [isOpen]);
 
   const menuItems: EuiContextMenuPanelProps['items'] = useMemo(() => {
-    return items.map((itemProps) => {
-      return <EuiContextMenuItemNavByRouter {...itemProps} onClick={handleCloseMenu} />;
+    return endpointActions.map((itemProps) => {
+      return <ContextMenuItemNavByRouter {...itemProps} onClick={handleCloseMenu} />;
     });
-  }, [handleCloseMenu, items]);
+  }, [handleCloseMenu, endpointActions]);
 
   const panelProps: EuiPopoverProps['panelProps'] = useMemo(() => {
     return { 'data-test-subj': 'tableRowActionsMenuPanel' };
@@ -69,22 +63,4 @@ export const TableRowActions = memo<TableRowActionProps>(({ items }) => {
 });
 TableRowActions.displayName = 'EndpointTableRowActions';
 
-const EuiContextMenuItemNavByRouter = memo<
-  EuiContextMenuItemProps & {
-    navigateAppId: string;
-    navigateOptions: NavigateToAppOptions;
-    children: React.ReactNode;
-  }
->(({ navigateAppId, navigateOptions, onClick, children, ...otherMenuItemProps }) => {
-  const handleOnClick = useNavigateToAppEventHandler(navigateAppId, {
-    ...navigateOptions,
-    onClick,
-  });
-
-  return (
-    <EuiContextMenuItem {...otherMenuItemProps} onClick={handleOnClick}>
-      {children}
-    </EuiContextMenuItem>
-  );
-});
-EuiContextMenuItemNavByRouter.displayName = 'EuiContextMenuItemNavByRouter';
+ContextMenuItemNavByRouter.displayName = 'EuiContextMenuItemNavByRouter';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.test.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.test.tsx
new file mode 100644
index 0000000000000..7ecbad54dbbec
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.test.tsx
@@ -0,0 +1,113 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { useKibana } from '../../../../../../common/lib/kibana';
+import { ActionsMenu } from './actions_menu';
+import React from 'react';
+import { act } from '@testing-library/react';
+import { endpointPageHttpMock } from '../../../mocks';
+import { fireEvent } from '@testing-library/dom';
+
+jest.mock('../../../../../../common/lib/kibana');
+
+describe('When using the Endpoint Details Actions Menu', () => {
+  let render: () => Promise<ReturnType<AppContextTestRender['render']>>;
+  let coreStart: AppContextTestRender['coreStart'];
+  let waitForAction: AppContextTestRender['middlewareSpy']['waitForAction'];
+  let renderResult: ReturnType<AppContextTestRender['render']>;
+  let httpMocks: ReturnType<typeof endpointPageHttpMock>;
+
+  const setEndpointMetadataResponse = (isolation: boolean = false) => {
+    const endpointHost = httpMocks.responseProvider.metadataDetails();
+    // Safe to mutate this mocked data
+    // @ts-ignore
+    endpointHost.metadata.Endpoint.state.isolation = isolation;
+    httpMocks.responseProvider.metadataDetails.mockReturnValue(endpointHost);
+  };
+
+  beforeEach(() => {
+    const mockedContext = createAppRootMockRenderer();
+
+    (useKibana as jest.Mock).mockReturnValue({ services: mockedContext.startServices });
+    coreStart = mockedContext.coreStart;
+    waitForAction = mockedContext.middlewareSpy.waitForAction;
+    httpMocks = endpointPageHttpMock(mockedContext.coreStart.http);
+
+    act(() => {
+      mockedContext.history.push(
+        '/endpoints?selected_endpoint=5fe11314-678c-413e-87a2-b4a3461878ee'
+      );
+    });
+
+    render = async () => {
+      renderResult = mockedContext.render(<ActionsMenu />);
+
+      await act(async () => {
+        await waitForAction('serverReturnedEndpointDetails');
+      });
+
+      act(() => {
+        fireEvent.click(renderResult.getByTestId('endpointDetailsActionsButton'));
+      });
+
+      return renderResult;
+    };
+  });
+
+  describe('and endpoint host is NOT isolated', () => {
+    beforeEach(() => setEndpointMetadataResponse());
+
+    it.each([
+      ['Isolate host', 'isolateLink'],
+      ['View host details', 'hostLink'],
+      ['View agent policy', 'agentPolicyLink'],
+      ['View agent details', 'agentDetailsLink'],
+    ])('should display %s action', async (_, dataTestSubj) => {
+      await render();
+      expect(renderResult.getByTestId(dataTestSubj)).not.toBeNull();
+    });
+
+    it.each([
+      ['Isolate host', 'isolateLink'],
+      ['View host details', 'hostLink'],
+      ['View agent policy', 'agentPolicyLink'],
+      ['View agent details', 'agentDetailsLink'],
+    ])(
+      'should navigate via kibana `navigateToApp()` when %s is clicked',
+      async (_, dataTestSubj) => {
+        await render();
+        act(() => {
+          fireEvent.click(renderResult.getByTestId(dataTestSubj));
+        });
+
+        expect(coreStart.application.navigateToApp).toHaveBeenCalled();
+      }
+    );
+  });
+
+  describe('and endpoint host is isolated', () => {
+    beforeEach(() => setEndpointMetadataResponse(true));
+
+    it('should display Unisolate action', async () => {
+      await render();
+      expect(renderResult.getByTestId('unIsolateLink')).not.toBeNull();
+    });
+
+    it('should navigate via router when unisolate is clicked', async () => {
+      await render();
+      act(() => {
+        fireEvent.click(renderResult.getByTestId('unIsolateLink'));
+      });
+
+      expect(coreStart.application.navigateToApp).toHaveBeenCalled();
+    });
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.tsx
new file mode 100644
index 0000000000000..c778f4f2a08ec
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/actions_menu.tsx
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useState, useCallback, useMemo } from 'react';
+import { EuiContextMenuPanel, EuiButton, EuiPopover } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useEndpointActionItems, useEndpointSelector } from '../../hooks';
+import { detailsData } from '../../../store/selectors';
+import { ContextMenuItemNavByRouter } from '../../components/context_menu_item_nav_by_rotuer';
+
+export const ActionsMenu = React.memo<{}>(() => {
+  const endpointDetails = useEndpointSelector(detailsData);
+  const menuOptions = useEndpointActionItems(endpointDetails);
+  const [isPopoverOpen, setIsPopoverOpen] = useState(false);
+
+  const closePopoverHandler = useCallback(() => {
+    setIsPopoverOpen(false);
+  }, []);
+
+  const takeActionItems = useMemo(() => {
+    return menuOptions.map((item) => {
+      return <ContextMenuItemNavByRouter {...item} onClick={closePopoverHandler} />;
+    });
+  }, [closePopoverHandler, menuOptions]);
+
+  const takeActionButton = useMemo(() => {
+    return (
+      <EuiButton
+        iconSide="right"
+        fill
+        iconType="arrowDown"
+        data-test-subj="endpointDetailsActionsButton"
+        onClick={() => {
+          setIsPopoverOpen(!isPopoverOpen);
+        }}
+      >
+        <FormattedMessage
+          id="xpack.securitySolution.endpoint.detailsActions.buttonLabel"
+          defaultMessage="Take action"
+        />
+      </EuiButton>
+    );
+  }, [isPopoverOpen]);
+
+  return (
+    <EuiPopover
+      id="endpointDetailsActionsPanel"
+      button={takeActionButton}
+      isOpen={isPopoverOpen}
+      closePopover={closePopoverHandler}
+      panelPaddingSize="none"
+      anchorPosition="downLeft"
+    >
+      <EuiContextMenuPanel size="s" items={takeActionItems} />
+    </EuiPopover>
+  );
+});
+
+ActionsMenu.displayName = 'ActionMenu';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_details_tabs.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_details_tabs.tsx
new file mode 100644
index 0000000000000..3e228be4565b1
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_details_tabs.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, { memo, useCallback, useMemo, useState } from 'react';
+import styled from 'styled-components';
+import { EuiTabbedContent, EuiTabbedContentTab } from '@elastic/eui';
+import { EndpointIndexUIQueryParams } from '../../../types';
+export enum EndpointDetailsTabsTypes {
+  overview = 'overview',
+  activityLog = 'activity_log',
+}
+
+export type EndpointDetailsTabsId =
+  | EndpointDetailsTabsTypes.overview
+  | EndpointDetailsTabsTypes.activityLog;
+
+interface EndpointDetailsTabs {
+  id: string;
+  name: string;
+  content: JSX.Element;
+}
+
+const StyledEuiTabbedContent = styled(EuiTabbedContent)`
+  overflow: hidden;
+  padding-bottom: ${(props) => props.theme.eui.paddingSizes.xl};
+
+  > [role='tabpanel'] {
+    height: 100%;
+    padding-right: 12px;
+    overflow: hidden;
+    overflow-y: auto;
+    ::-webkit-scrollbar {
+      -webkit-appearance: none;
+      width: 4px;
+    }
+    ::-webkit-scrollbar-thumb {
+      border-radius: 2px;
+      background-color: rgba(0, 0, 0, 0.5);
+      -webkit-box-shadow: 0 0 1px rgba(255, 255, 255, 0.5);
+    }
+  }
+`;
+
+export const EndpointDetailsFlyoutTabs = memo(
+  ({ show, tabs }: { show: EndpointIndexUIQueryParams['show']; tabs: EndpointDetailsTabs[] }) => {
+    const [selectedTabId, setSelectedTabId] = useState<EndpointDetailsTabsId>(() => {
+      return show === 'details'
+        ? EndpointDetailsTabsTypes.overview
+        : EndpointDetailsTabsTypes.activityLog;
+    });
+
+    const handleTabClick = useCallback(
+      (tab: EuiTabbedContentTab) => setSelectedTabId(tab.id as EndpointDetailsTabsId),
+      [setSelectedTabId]
+    );
+
+    const selectedTab = useMemo(() => tabs.find((tab) => tab.id === selectedTabId), [
+      tabs,
+      selectedTabId,
+    ]);
+
+    return (
+      <StyledEuiTabbedContent
+        data-test-subj="endpointDetailsTabs"
+        tabs={tabs}
+        selectedTab={selectedTab}
+        onTabClick={handleTabClick}
+        key="endpoint-details-tabs"
+      />
+    );
+  }
+);
+
+EndpointDetailsFlyoutTabs.displayName = 'EndpointDetailsFlyoutTabs';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_isolate_flyout_panel.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_isolate_flyout_panel.tsx
index e299a7ec5f973..289c1efeab041 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_isolate_flyout_panel.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/endpoint_isolate_flyout_panel.tsx
@@ -5,17 +5,19 @@
  * 2.0.
  */
 
-import React, { memo, useCallback, useEffect, useState } from 'react';
+import React, { memo, useCallback, useState } from 'react';
 import { useHistory } from 'react-router-dom';
 import { useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 import { i18n } from '@kbn/i18n';
+import { EuiForm } from '@elastic/eui';
 import { HostMetadata } from '../../../../../../../common/endpoint/types';
 import { BackToEndpointDetailsFlyoutSubHeader } from './back_to_endpoint_details_flyout_subheader';
 import {
   EndpointIsolatedFormProps,
   EndpointIsolateForm,
   EndpointIsolateSuccess,
+  EndpointUnisolateForm,
 } from '../../../../../../common/components/endpoint/host_isolation';
 import { FlyoutBodyNoTopPadding } from './flyout_body_no_top_padding';
 import { getEndpointDetailsPath } from '../../../../../common/routing';
@@ -25,18 +27,21 @@ import {
   getIsIsolationRequestPending,
   getWasIsolationRequestSuccessful,
   uiQueryParams,
+  getIsEndpointHostIsolated,
 } from '../../../store/selectors';
 import { AppAction } from '../../../../../../common/store/actions';
-import { useToasts } from '../../../../../../common/lib/kibana';
 
-export const EndpointIsolateFlyoutPanel = memo<{
+/**
+ * Component handles both isolate and un-isolate for a given endpoint
+ */
+export const EndpointIsolationFlyoutPanel = memo<{
   hostMeta: HostMetadata;
 }>(({ hostMeta }) => {
   const history = useHistory();
   const dispatch = useDispatch<Dispatch<AppAction>>();
-  const toast = useToasts();
 
   const { show, ...queryParams } = useEndpointSelector(uiQueryParams);
+  const isCurrentlyIsolated = useEndpointSelector(getIsEndpointHostIsolated);
   const isPending = useEndpointSelector(getIsIsolationRequestPending);
   const wasSuccessful = useEndpointSelector(getWasIsolationRequestSuccessful);
   const isolateError = useEndpointSelector(getIsolationRequestError);
@@ -45,6 +50,8 @@ export const EndpointIsolateFlyoutPanel = memo<{
     Parameters<EndpointIsolatedFormProps['onChange']>[0]
   >({ comment: '' });
 
+  const IsolationForm = isCurrentlyIsolated ? EndpointUnisolateForm : EndpointIsolateForm;
+
   const handleCancel: EndpointIsolatedFormProps['onCancel'] = useCallback(() => {
     history.push(
       getEndpointDetailsPath({
@@ -59,11 +66,14 @@ export const EndpointIsolateFlyoutPanel = memo<{
     dispatch({
       type: 'endpointIsolationRequest',
       payload: {
-        endpoint_ids: [hostMeta.agent.id],
-        comment: formValues.comment,
+        type: isCurrentlyIsolated ? 'unisolate' : 'isolate',
+        data: {
+          endpoint_ids: [hostMeta.agent.id],
+          comment: formValues.comment,
+        },
       },
     });
-  }, [dispatch, formValues.comment, hostMeta.agent.id]);
+  }, [dispatch, formValues.comment, hostMeta.agent.id, isCurrentlyIsolated]);
 
   const handleChange: EndpointIsolatedFormProps['onChange'] = useCallback((changes) => {
     setFormValues((prevState) => {
@@ -74,12 +84,6 @@ export const EndpointIsolateFlyoutPanel = memo<{
     });
   }, []);
 
-  useEffect(() => {
-    if (isolateError) {
-      toast.addDanger(isolateError.message);
-    }
-  }, [isolateError, toast]);
-
   return (
     <>
       <BackToEndpointDetailsFlyoutSubHeader endpointId={hostMeta.agent.id} />
@@ -88,6 +92,7 @@ export const EndpointIsolateFlyoutPanel = memo<{
         {wasSuccessful ? (
           <EndpointIsolateSuccess
             hostName={hostMeta.host.name}
+            isolateAction={isCurrentlyIsolated ? 'unisolateHost' : 'isolateHost'}
             completeButtonLabel={i18n.translate(
               'xpack.securitySolution.endpoint.hostIsolation.successProceedButton',
               { defaultMessage: 'Return to endpoint details' }
@@ -95,17 +100,23 @@ export const EndpointIsolateFlyoutPanel = memo<{
             onComplete={handleCancel}
           />
         ) : (
-          <EndpointIsolateForm
-            comment={formValues.comment}
-            isLoading={isPending}
-            hostName={hostMeta.host.name}
-            onCancel={handleCancel}
-            onConfirm={handleConfirm}
-            onChange={handleChange}
-          />
+          <EuiForm
+            isInvalid={!!isolateError}
+            error={isolateError?.message}
+            data-test-subj="endpointIsolationForm"
+          >
+            <IsolationForm
+              comment={formValues.comment}
+              isLoading={isPending}
+              hostName={hostMeta.host.name}
+              onCancel={handleCancel}
+              onConfirm={handleConfirm}
+              onChange={handleChange}
+            />
+          </EuiForm>
         )}
       </FlyoutBodyNoTopPadding>
     </>
   );
 });
-EndpointIsolateFlyoutPanel.displayName = 'EndpointIsolateFlyoutPanel';
+EndpointIsolationFlyoutPanel.displayName = 'EndpointIsolateFlyoutPanel';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/log_entry.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/log_entry.tsx
new file mode 100644
index 0000000000000..de6d2ecf36ecc
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/components/log_entry.tsx
@@ -0,0 +1,57 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo } from 'react';
+
+import { EuiAvatar, EuiComment, EuiText } from '@elastic/eui';
+import { Immutable, EndpointAction } from '../../../../../../../common/endpoint/types';
+import { FormattedDateAndTime } from '../../../../../../common/components/endpoint/formatted_date_time';
+import { useEuiTheme } from '../../../../../../common/lib/theme/use_eui_theme';
+
+export const LogEntry = memo(
+  ({ endpointAction }: { endpointAction: Immutable<EndpointAction> }) => {
+    const euiTheme = useEuiTheme();
+    const isIsolated = endpointAction?.data.command === 'isolate';
+
+    // do this better when we can distinguish between endpoint events vs user events
+    const iconType = endpointAction.user_id === 'sys' ? 'dot' : isIsolated ? 'lock' : 'lockOpen';
+    const commentType = endpointAction.user_id === 'sys' ? 'update' : 'regular';
+    const timelineIcon = (
+      <EuiAvatar
+        name="Timeline Icon"
+        size={endpointAction.user_id === 'sys' ? 's' : 'm'}
+        color={euiTheme.euiColorLightestShade}
+        iconColor="subdued"
+        iconType={iconType}
+      />
+    );
+    const event = `${isIsolated ? 'isolated' : 'unisolated'} host`;
+    const hasComment = !!endpointAction.data.comment;
+
+    return (
+      <EuiComment
+        type={commentType}
+        username={endpointAction.user_id}
+        timestamp={FormattedDateAndTime({
+          date: new Date(endpointAction['@timestamp']),
+          showRelativeTime: true,
+        })}
+        event={event}
+        timelineIcon={timelineIcon}
+        data-test-subj="timelineEntry"
+      >
+        {hasComment ? (
+          <EuiText size="s">
+            <p>{endpointAction.data.comment}</p>
+          </EuiText>
+        ) : undefined}
+      </EuiComment>
+    );
+  }
+);
+
+LogEntry.displayName = 'LogEntry';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_activity_log.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_activity_log.tsx
new file mode 100644
index 0000000000000..50c91730e332c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_activity_log.tsx
@@ -0,0 +1,45 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { memo, useCallback } from 'react';
+
+import { EuiEmptyPrompt, EuiSpacer } from '@elastic/eui';
+import { LogEntry } from './components/log_entry';
+import * as i18 from '../translations';
+import { SearchBar } from '../../../../components/search_bar';
+import { Immutable, EndpointAction } from '../../../../../../common/endpoint/types';
+import { AsyncResourceState } from '../../../../state';
+
+export const EndpointActivityLog = memo(
+  ({ endpointActions }: { endpointActions: AsyncResourceState<Immutable<EndpointAction[]>> }) => {
+    // TODO
+    const onSearch = useCallback(() => {}, []);
+    return (
+      <>
+        <EuiSpacer size="l" />
+        {endpointActions.type !== 'LoadedResourceState' || !endpointActions.data.length ? (
+          <EuiEmptyPrompt
+            iconType="editorUnorderedList"
+            titleSize="s"
+            title={<h2>{'No logged actions'}</h2>}
+            body={<p>{'No actions have been logged for this endpoint.'}</p>}
+          />
+        ) : (
+          <>
+            <SearchBar onSearch={onSearch} placeholder={i18.SEARCH_ACTIVITY_LOG} />
+            <EuiSpacer size="l" />
+            {endpointActions.data.map((endpointAction) => (
+              <LogEntry key={endpointAction.action_id} endpointAction={endpointAction} />
+            ))}
+          </>
+        )}
+      </>
+    );
+  }
+);
+
+EndpointActivityLog.displayName = 'EndpointActivityLog';
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
index c9db78f425afa..16cae79d42c0f 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoint_details.tsx
@@ -258,6 +258,7 @@ export const EndpointDetails = memo(
 
     return (
       <>
+        <EuiSpacer size="l" />
         <EuiDescriptionList
           type="column"
           listItems={detailsResultsUpper}
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
new file mode 100644
index 0000000000000..fccd48cbde67c
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/endpoints.stories.tsx
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { ComponentType } from 'react';
+import moment from 'moment';
+
+import { EndpointAction, Immutable } from '../../../../../../common/endpoint/types';
+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 = (
+  selectedEndpoint: string = ''
+): AsyncResourceState<Immutable<EndpointAction[]>> => ({
+  type: 'LoadedResourceState',
+  data: [
+    {
+      action_id: '1',
+      '@timestamp': moment().subtract(1, 'hours').fromNow().toString(),
+      expiration: moment().add(3, 'day').fromNow().toString(),
+      type: 'INPUT_ACTION',
+      input_type: 'endpoint',
+      agents: [`${selectedEndpoint}`],
+      user_id: 'sys',
+      data: {
+        command: 'isolate',
+      },
+    },
+    {
+      action_id: '2',
+      '@timestamp': moment().subtract(2, 'hours').fromNow().toString(),
+      expiration: moment().add(1, 'day').fromNow().toString(),
+      type: 'INPUT_ACTION',
+      input_type: 'endpoint',
+      agents: [`${selectedEndpoint}`],
+      user_id: 'ash',
+      data: {
+        command: 'isolate',
+        comment: 'Sem et tortor consequat id porta nibh venenatis cras sed.',
+      },
+    },
+    {
+      action_id: '3',
+      '@timestamp': moment().subtract(4, 'hours').fromNow().toString(),
+      expiration: moment().add(1, 'day').fromNow().toString(),
+      type: 'INPUT_ACTION',
+      input_type: 'endpoint',
+      agents: [`${selectedEndpoint}`],
+      user_id: 'someone',
+      data: {
+        command: 'unisolate',
+        comment: 'Turpis egestas pretium aenean pharetra.',
+      },
+    },
+    {
+      action_id: '4',
+      '@timestamp': moment().subtract(1, 'day').fromNow().toString(),
+      expiration: moment().add(3, 'day').fromNow().toString(),
+      type: 'INPUT_ACTION',
+      input_type: 'endpoint',
+      agents: [`${selectedEndpoint}`],
+      user_id: 'ash',
+      data: {
+        command: 'isolate',
+        comment:
+          'Lorem ipsum dolor sit amet, consectetur adipiscing elit, \
+        sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.',
+      },
+    },
+  ],
+});
+
+export default {
+  title: 'Endpoints/Endpoint Details',
+  component: EndpointDetailsFlyout,
+  decorators: [
+    (Story: ComponentType) => (
+      <EuiThemeProvider>
+        <Story />
+      </EuiThemeProvider>
+    ),
+  ],
+};
+
+export const Tabs = () => (
+  <EndpointDetailsFlyoutTabs
+    show="details"
+    tabs={[
+      {
+        id: 'overview',
+        name: 'Overview',
+        content: <>{'Endpoint Details'}</>,
+      },
+      {
+        id: 'activity_log',
+        name: 'Activity Log',
+        content: ActivityLog(),
+      },
+    ]}
+  />
+);
+
+export const ActivityLog = () => (
+  <EndpointActivityLog endpointActions={dummyEndpointActivityLog()} />
+);
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx
index 09b1bbceef21d..89c0e3e6a3e06 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/details/index.tsx
@@ -5,17 +5,21 @@
  * 2.0.
  */
 
-import React, { useCallback, useEffect, memo } from 'react';
+import React, { useCallback, useEffect, useMemo, memo } from 'react';
+import styled from 'styled-components';
 import {
   EuiFlyout,
   EuiFlyoutBody,
   EuiFlyoutHeader,
+  EuiFlyoutFooter,
   EuiLoadingContent,
   EuiTitle,
   EuiText,
   EuiSpacer,
   EuiEmptyPrompt,
   EuiToolTip,
+  EuiFlexGroup,
+  EuiFlexItem,
 } from '@elastic/eui';
 import { useHistory } from 'react-router-dom';
 import { FormattedMessage } from '@kbn/i18n/react';
@@ -26,8 +30,11 @@ import {
   uiQueryParams,
   detailsData,
   detailsError,
-  showView,
   detailsLoading,
+  getActivityLogData,
+  getActivityLogError,
+  getActivityLogRequestLoading,
+  showView,
   policyResponseConfigurations,
   policyResponseActions,
   policyResponseFailedOrWarningActionCount,
@@ -39,13 +46,36 @@ import {
   policyResponseAppliedRevision,
 } from '../../store/selectors';
 import { EndpointDetails } from './endpoint_details';
+import { EndpointActivityLog } from './endpoint_activity_log';
 import { PolicyResponse } from './policy_response';
+import * as i18 from '../translations';
 import { HostMetadata } from '../../../../../../common/endpoint/types';
+import {
+  EndpointDetailsFlyoutTabs,
+  EndpointDetailsTabsTypes,
+} from './components/endpoint_details_tabs';
+
 import { PreferenceFormattedDateFromPrimitive } from '../../../../../common/components/formatted_date';
-import { EndpointIsolateFlyoutPanel } from './components/endpoint_isolate_flyout_panel';
+import { EndpointIsolationFlyoutPanel } from './components/endpoint_isolate_flyout_panel';
 import { BackToEndpointDetailsFlyoutSubHeader } from './components/back_to_endpoint_details_flyout_subheader';
 import { FlyoutBodyNoTopPadding } from './components/flyout_body_no_top_padding';
 import { getEndpointListPath } from '../../../../common/routing';
+import { ActionsMenu } from './components/actions_menu';
+
+const DetailsFlyoutBody = styled(EuiFlyoutBody)`
+  overflow-y: hidden;
+  flex: 1;
+
+  .euiFlyoutBody__overflow {
+    overflow: hidden;
+    mask-image: none;
+  }
+
+  .euiFlyoutBody__overflowContent {
+    height: 100%;
+    display: flex;
+  }
+`;
 
 export const EndpointDetailsFlyout = memo(() => {
   const history = useHistory();
@@ -55,13 +85,54 @@ export const EndpointDetailsFlyout = memo(() => {
     selected_endpoint: selectedEndpoint,
     ...queryParamsWithoutSelectedEndpoint
   } = queryParams;
-  const details = useEndpointSelector(detailsData);
+
+  const activityLog = useEndpointSelector(getActivityLogData);
+  const activityLoading = useEndpointSelector(getActivityLogRequestLoading);
+  const activityError = useEndpointSelector(getActivityLogError);
+  const hostDetails = useEndpointSelector(detailsData);
+  const hostDetailsLoading = useEndpointSelector(detailsLoading);
+  const hostDetailsError = useEndpointSelector(detailsError);
+
   const policyInfo = useEndpointSelector(policyVersionInfo);
   const hostStatus = useEndpointSelector(hostStatusInfo);
-  const loading = useEndpointSelector(detailsLoading);
-  const error = useEndpointSelector(detailsError);
   const show = useEndpointSelector(showView);
 
+  const ContentLoadingMarkup = useMemo(
+    () => (
+      <>
+        <EuiLoadingContent lines={3} />
+        <EuiSpacer size="l" />
+        <EuiLoadingContent lines={3} />
+      </>
+    ),
+    []
+  );
+
+  const tabs = [
+    {
+      id: EndpointDetailsTabsTypes.overview,
+      name: i18.OVERVIEW,
+      content:
+        hostDetails === undefined ? (
+          ContentLoadingMarkup
+        ) : (
+          <EndpointDetails details={hostDetails} policyInfo={policyInfo} hostStatus={hostStatus} />
+        ),
+    },
+    {
+      id: EndpointDetailsTabsTypes.activityLog,
+      name: i18.ACTIVITY_LOG,
+      content: activityLoading ? (
+        ContentLoadingMarkup
+      ) : (
+        <EndpointActivityLog endpointActions={activityLog} />
+      ),
+    },
+  ];
+
+  const showFlyoutFooter =
+    show === 'details' || show === 'policy_response' || show === 'activity_log';
+
   const handleFlyoutClose = useCallback(() => {
     const { show: _show, ...urlSearchParams } = queryParamsWithoutSelectedEndpoint;
     history.push(
@@ -73,7 +144,7 @@ export const EndpointDetailsFlyout = memo(() => {
   }, [history, queryParamsWithoutSelectedEndpoint]);
 
   useEffect(() => {
-    if (error !== undefined) {
+    if (hostDetailsError !== undefined) {
       toasts.addDanger({
         title: i18n.translate('xpack.securitySolution.endpoint.details.errorTitle', {
           defaultMessage: 'Could not find host',
@@ -83,7 +154,17 @@ export const EndpointDetailsFlyout = memo(() => {
         }),
       });
     }
-  }, [error, toasts]);
+    if (activityError !== undefined) {
+      toasts.addDanger({
+        title: i18n.translate('xpack.securitySolution.endpoint.activityLog.errorTitle', {
+          defaultMessage: 'Could not find activity log for host',
+        }),
+        text: i18n.translate('xpack.securitySolution.endpoint.activityLog.errorBody', {
+          defaultMessage: 'Please exit the flyout and select another host with actions.',
+        }),
+      });
+    }
+  }, [hostDetailsError, activityError, toasts]);
 
   return (
     <EuiFlyout
@@ -91,38 +172,51 @@ export const EndpointDetailsFlyout = memo(() => {
       style={{ zIndex: 4001 }}
       data-test-subj="endpointDetailsFlyout"
       size="m"
+      paddingSize="m"
     >
       <EuiFlyoutHeader hasBorder>
-        {loading ? (
+        {hostDetailsLoading || activityLoading ? (
           <EuiLoadingContent lines={1} />
         ) : (
-          <EuiToolTip content={details?.host?.hostname} anchorClassName="eui-textTruncate">
+          <EuiToolTip content={hostDetails?.host?.hostname} anchorClassName="eui-textTruncate">
             <EuiTitle size="s">
               <h2
                 style={{ overflow: 'hidden', textOverflow: 'ellipsis' }}
                 data-test-subj="endpointDetailsFlyoutTitle"
               >
-                {details?.host?.hostname}
+                {hostDetails?.host?.hostname}
               </h2>
             </EuiTitle>
           </EuiToolTip>
         )}
       </EuiFlyoutHeader>
-      {details === undefined ? (
+      {hostDetails === undefined ? (
         <EuiFlyoutBody>
           <EuiLoadingContent lines={3} /> <EuiSpacer size="l" /> <EuiLoadingContent lines={3} />
         </EuiFlyoutBody>
       ) : (
         <>
-          {show === 'details' && (
-            <EuiFlyoutBody data-test-subj="endpointDetailsFlyoutBody">
-              <EndpointDetails details={details} policyInfo={policyInfo} hostStatus={hostStatus} />
-            </EuiFlyoutBody>
+          {(show === 'details' || show === 'activity_log') && (
+            <DetailsFlyoutBody data-test-subj="endpointDetailsFlyoutBody">
+              <EuiFlexGroup>
+                <EuiFlexItem>
+                  <EndpointDetailsFlyoutTabs show={show} tabs={tabs} />
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </DetailsFlyoutBody>
           )}
 
-          {show === 'policy_response' && <PolicyResponseFlyoutPanel hostMeta={details} />}
+          {show === 'policy_response' && <PolicyResponseFlyoutPanel hostMeta={hostDetails} />}
 
-          {show === 'isolate' && <EndpointIsolateFlyoutPanel hostMeta={details} />}
+          {(show === 'isolate' || show === 'unisolate') && (
+            <EndpointIsolationFlyoutPanel hostMeta={hostDetails} />
+          )}
+
+          {showFlyoutFooter && (
+            <EuiFlyoutFooter className="eui-textRight" data-test-subj="endpointDetailsFlyoutFooter">
+              <ActionsMenu />
+            </EuiFlyoutFooter>
+          )}
         </>
       )}
     </EuiFlyout>
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
similarity index 89%
rename from x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks.ts
rename to x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
index 5c8de0c4e0f3b..4c00c00e50dbc 100644
--- a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/hooks.ts
@@ -7,13 +7,14 @@
 
 import { useSelector } from 'react-redux';
 import { useMemo } from 'react';
-import { useKibana } from '../../../../common/lib/kibana';
-import { EndpointState } from '../types';
+import { EndpointState } from '../../types';
+import { State } from '../../../../../common/store';
 import {
   MANAGEMENT_STORE_ENDPOINTS_NAMESPACE,
   MANAGEMENT_STORE_GLOBAL_NAMESPACE,
-} from '../../../common/constants';
-import { State } from '../../../../common/store';
+} from '../../../../common/constants';
+import { useKibana } from '../../../../../common/lib/kibana';
+
 export function useEndpointSelector<TSelected>(selector: (state: EndpointState) => TSelected) {
   return useSelector(function (state: State) {
     return selector(
@@ -38,7 +39,6 @@ export const useIngestUrl = (subpath: string): { url: string; appId: string; app
     };
   }, [services.application, subpath]);
 };
-
 /**
  * Returns an object that contains Fleet app and URL information
  */
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/index.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/index.ts
new file mode 100644
index 0000000000000..a5a22b43e63d1
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export * from './hooks';
+export * from './use_endpoint_action_items';
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
new file mode 100644
index 0000000000000..1b2d9ff555ac2
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/hooks/use_endpoint_action_items.tsx
@@ -0,0 +1,163 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useMemo } from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { MANAGEMENT_APP_ID } from '../../../../common/constants';
+import { APP_ID, SecurityPageName } from '../../../../../../common/constants';
+import { pagePathGetters } from '../../../../../../../fleet/public';
+import { getEndpointDetailsPath } from '../../../../common/routing';
+import { HostMetadata, MaybeImmutable } from '../../../../../../common/endpoint/types';
+import { useFormatUrl } from '../../../../../common/components/link_to';
+import { useEndpointSelector } from './hooks';
+import { agentPolicies, uiQueryParams } from '../../store/selectors';
+import { useKibana } from '../../../../../common/lib/kibana';
+import { ContextMenuItemNavByRouterProps } from '../components/context_menu_item_nav_by_rotuer';
+import { isEndpointHostIsolated } from '../../../../../common/utils/validators/is_endpoint_host_isolated';
+
+/**
+ * Returns a list (array) of actions for an individual endpoint
+ * @param endpointMetadata
+ */
+export const useEndpointActionItems = (
+  endpointMetadata: MaybeImmutable<HostMetadata> | undefined
+): ContextMenuItemNavByRouterProps[] => {
+  const { formatUrl } = useFormatUrl(SecurityPageName.administration);
+  const fleetAgentPolicies = useEndpointSelector(agentPolicies);
+  const allCurrentUrlParams = useEndpointSelector(uiQueryParams);
+  const {
+    services: {
+      application: { getUrlForApp },
+    },
+  } = useKibana();
+
+  return useMemo<ContextMenuItemNavByRouterProps[]>(() => {
+    if (endpointMetadata) {
+      const isIsolated = isEndpointHostIsolated(endpointMetadata);
+      const endpointId = endpointMetadata.agent.id;
+      const endpointPolicyId = endpointMetadata.Endpoint.policy.applied.id;
+      const endpointHostName = endpointMetadata.host.hostname;
+      const fleetAgentId = endpointMetadata.elastic.agent.id;
+      const {
+        show,
+        selected_endpoint: _selectedEndpoint,
+        ...currentUrlParams
+      } = allCurrentUrlParams;
+      const endpointIsolatePath = getEndpointDetailsPath({
+        name: 'endpointIsolate',
+        ...currentUrlParams,
+        selected_endpoint: endpointId,
+      });
+      const endpointUnIsolatePath = getEndpointDetailsPath({
+        name: 'endpointUnIsolate',
+        ...currentUrlParams,
+        selected_endpoint: endpointId,
+      });
+
+      return [
+        isIsolated
+          ? {
+              'data-test-subj': 'unIsolateLink',
+              icon: 'logoSecurity',
+              key: 'unIsolateHost',
+              navigateAppId: MANAGEMENT_APP_ID,
+              navigateOptions: {
+                path: endpointUnIsolatePath,
+              },
+              href: formatUrl(endpointUnIsolatePath),
+              children: (
+                <FormattedMessage
+                  id="xpack.securitySolution.endpoint.actions.unIsolateHost"
+                  defaultMessage="Unisolate host"
+                />
+              ),
+            }
+          : {
+              'data-test-subj': 'isolateLink',
+              icon: 'logoSecurity',
+              key: 'isolateHost',
+              navigateAppId: MANAGEMENT_APP_ID,
+              navigateOptions: {
+                path: endpointIsolatePath,
+              },
+              href: formatUrl(endpointIsolatePath),
+              children: (
+                <FormattedMessage
+                  id="xpack.securitySolution.endpoint.actions.isolateHost"
+                  defaultMessage="Isolate host"
+                />
+              ),
+            },
+        {
+          'data-test-subj': 'hostLink',
+          icon: 'logoSecurity',
+          key: 'hostDetailsLink',
+          navigateAppId: APP_ID,
+          navigateOptions: { path: `hosts/${endpointHostName}` },
+          href: `${getUrlForApp('securitySolution')}/hosts/${endpointHostName}`,
+          children: (
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.actions.hostDetails"
+              defaultMessage="View host details"
+            />
+          ),
+        },
+        {
+          icon: 'gear',
+          key: 'agentConfigLink',
+          'data-test-subj': 'agentPolicyLink',
+          navigateAppId: 'fleet',
+          navigateOptions: {
+            path: `#${
+              pagePathGetters.policy_details({
+                policyId: fleetAgentPolicies[endpointPolicyId],
+              })[1]
+            }`,
+          },
+          href: `${getUrlForApp('fleet')}#${
+            pagePathGetters.policy_details({
+              policyId: fleetAgentPolicies[endpointPolicyId],
+            })[1]
+          }`,
+          disabled: fleetAgentPolicies[endpointPolicyId] === undefined,
+          children: (
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.actions.agentPolicy"
+              defaultMessage="View agent policy"
+            />
+          ),
+        },
+        {
+          icon: 'gear',
+          key: 'agentDetailsLink',
+          'data-test-subj': 'agentDetailsLink',
+          navigateAppId: 'fleet',
+          navigateOptions: {
+            path: `#${
+              pagePathGetters.fleet_agent_details({
+                agentId: fleetAgentId,
+              })[1]
+            }`,
+          },
+          href: `${getUrlForApp('fleet')}#${
+            pagePathGetters.fleet_agent_details({
+              agentId: fleetAgentId,
+            })[1]
+          }`,
+          children: (
+            <FormattedMessage
+              id="xpack.securitySolution.endpoint.actions.agentDetails"
+              defaultMessage="View agent details"
+            />
+          ),
+        },
+      ];
+    }
+
+    return [];
+  }, [allCurrentUrlParams, endpointMetadata, fleetAgentPolicies, formatUrl, getUrlForApp]);
+};
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 d963682ff005d..509bb7b4cf711 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
@@ -522,7 +522,7 @@ describe('when on the endpoint list page', () => {
       const {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         host_status,
-        metadata: { agent, ...details },
+        metadata: { agent, Endpoint, ...details },
         // eslint-disable-next-line @typescript-eslint/naming-convention
         query_strategy_version,
       } = mockEndpointDetailsApiResult();
@@ -531,6 +531,13 @@ describe('when on the endpoint list page', () => {
         host_status,
         metadata: {
           ...details,
+          Endpoint: {
+            ...Endpoint,
+            state: {
+              ...Endpoint.state,
+              isolation: false,
+            },
+          },
           agent: {
             ...agent,
             id: '1',
@@ -633,11 +640,10 @@ describe('when on the endpoint list page', () => {
       jest.clearAllMocks();
     });
 
-    it('should show the flyout', async () => {
+    it('should show the flyout and footer', async () => {
       const renderResult = await renderAndWaitForData();
-      return renderResult.findByTestId('endpointDetailsFlyout').then((flyout) => {
-        expect(flyout).not.toBeNull();
-      });
+      await expect(renderResult.findByTestId('endpointDetailsFlyout')).not.toBeNull();
+      await expect(renderResult.queryByTestId('endpointDetailsFlyoutFooter')).not.toBeNull();
     });
 
     it('should display policy name value as a link', async () => {
@@ -743,6 +749,11 @@ describe('when on the endpoint list page', () => {
       );
     });
 
+    it('should show the Take Action button', async () => {
+      const renderResult = await renderAndWaitForData();
+      expect(renderResult.getByTestId('endpointDetailsActionsButton')).not.toBeNull();
+    });
+
     describe('when link to reassignment in Ingest is clicked', () => {
       beforeEach(async () => {
         coreStart.application.getUrlForApp.mockReturnValue('/app/fleet');
@@ -993,18 +1004,13 @@ describe('when on the endpoint list page', () => {
         });
       });
 
-      it('should show error toast if isolate fails', async () => {
+      it('should show error if isolate fails', async () => {
         isolateApiMock.responseProvider.isolateHost.mockImplementation(() => {
           throw new Error('oh oh. something went wrong');
         });
-
-        // coreStart.http.post.mockReset();
-        // coreStart.http.post.mockRejectedValue(new Error('oh oh. something went wrong'));
         await confirmIsolateAndWaitForApiResponse('failure');
 
-        expect(coreStart.notifications.toasts.addDanger).toHaveBeenCalledWith(
-          'oh oh. something went wrong'
-        );
+        expect(renderResult.getByText('oh oh. something went wrong')).not.toBeNull();
       });
 
       it('should reset isolation state and show form again', async () => {
@@ -1031,6 +1037,10 @@ describe('when on the endpoint list page', () => {
           )
         ).toBe(true);
       });
+
+      it('should NOT show the flyout footer', async () => {
+        await expect(renderResult.queryByTestId('endpointDetailsFlyoutFooter')).toBeNull();
+      });
     });
   });
 
@@ -1045,9 +1055,19 @@ describe('when on the endpoint list page', () => {
       const { hosts, query_strategy_version: queryStrategyVersion } = mockEndpointResultList();
       hostInfo = {
         host_status: hosts[0].host_status,
-        metadata: hosts[0].metadata,
+        metadata: {
+          ...hosts[0].metadata,
+          Endpoint: {
+            ...hosts[0].metadata.Endpoint,
+            state: {
+              ...hosts[0].metadata.Endpoint.state,
+              isolation: false,
+            },
+          },
+        },
         query_strategy_version: queryStrategyVersion,
       };
+
       const packagePolicy = docGenerator.generatePolicyPackagePolicy();
       packagePolicy.id = hosts[0].metadata.Endpoint.policy.applied.id;
       const agentPolicy = generator.generateAgentPolicy();
@@ -1098,6 +1118,8 @@ describe('when on the endpoint list page', () => {
       expect(isolateLink.getAttribute('href')).toEqual(
         getEndpointDetailsPath({
           name: 'endpointIsolate',
+          page_index: '0',
+          page_size: '10',
           selected_endpoint: hostInfo.metadata.agent.id,
         })
       );
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 7e5658f7b0cba..06b42145a6d48 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
@@ -39,11 +39,7 @@ import {
 import { useNavigateByRouterEventHandler } from '../../../../common/hooks/endpoint/use_navigate_by_router_event_handler';
 import { CreateStructuredSelector } from '../../../../common/store';
 import { Immutable, HostInfo } from '../../../../../common/endpoint/types';
-import {
-  DEFAULT_POLL_INTERVAL,
-  MANAGEMENT_APP_ID,
-  MANAGEMENT_PAGE_SIZE_OPTIONS,
-} from '../../../common/constants';
+import { DEFAULT_POLL_INTERVAL, MANAGEMENT_PAGE_SIZE_OPTIONS } from '../../../common/constants';
 import { PolicyEmptyState, HostsEmptyState } from '../../../components/management_empty_state';
 import { FormattedDate } from '../../../../common/components/formatted_date';
 import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
@@ -61,7 +57,6 @@ 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 { APP_ID } from '../../../../../common/constants';
 import { LinkToApp } from '../../../../common/components/endpoint/link_to_app';
 import { TableRowActions } from './components/table_row_actions';
 
@@ -120,7 +115,6 @@ export const EndpointList = () => {
     policyItemsLoading,
     endpointPackageVersion,
     endpointsExist,
-    agentPolicies,
     autoRefreshInterval,
     isAutoRefreshEnabled,
     patternsError,
@@ -130,7 +124,6 @@ export const EndpointList = () => {
     isTransformEnabled,
   } = useEndpointSelector(selector);
   const { formatUrl, search } = useFormatUrl(SecurityPageName.administration);
-
   const dispatch = useDispatch<(a: EndpointAction) => void>();
   // cap ability to page at 10k records. (max_result_window)
   const maxPageCount = totalItemCount > MAX_PAGINATED_ITEM ? MAX_PAGINATED_ITEM : totalItemCount;
@@ -164,8 +157,8 @@ export const EndpointList = () => {
   const handleCreatePolicyClick = useNavigateToAppEventHandler<CreatePackagePolicyRouteState>(
     'fleet',
     {
-      path: `#/integrations${
-        endpointPackageVersion ? `/endpoint-${endpointPackageVersion}/add-integration` : ''
+      path: `#/policies/add-integration${
+        endpointPackageVersion ? `/endpoint-${endpointPackageVersion}` : ''
       }`,
       state: {
         onCancelNavigateTo: [
@@ -427,102 +420,15 @@ export const EndpointList = () => {
         }),
         actions: [
           {
+            // eslint-disable-next-line react/display-name
             render: (item: HostInfo) => {
-              const endpointIsolatePath = getEndpointDetailsPath({
-                name: 'endpointIsolate',
-                selected_endpoint: item.metadata.agent.id,
-              });
-
-              return (
-                <TableRowActions
-                  items={[
-                    {
-                      'data-test-subj': 'isolateLink',
-                      icon: 'logoSecurity',
-                      key: 'isolateHost',
-                      navigateAppId: MANAGEMENT_APP_ID,
-                      navigateOptions: {
-                        path: endpointIsolatePath,
-                      },
-                      href: formatUrl(endpointIsolatePath),
-                      children: (
-                        <FormattedMessage
-                          id="xpack.securitySolution.endpoint.list.actions.isolateHost"
-                          defaultMessage="Isolate Host"
-                        />
-                      ),
-                    },
-                    {
-                      'data-test-subj': 'hostLink',
-                      icon: 'logoSecurity',
-                      key: 'hostDetailsLink',
-                      navigateAppId: APP_ID,
-                      navigateOptions: { path: `hosts/${item.metadata.host.hostname}` },
-                      href: `${services?.application?.getUrlForApp('securitySolution')}/hosts/${
-                        item.metadata.host.hostname
-                      }`,
-                      children: (
-                        <FormattedMessage
-                          id="xpack.securitySolution.endpoint.list.actions.hostDetails"
-                          defaultMessage="View Host Details"
-                        />
-                      ),
-                    },
-                    {
-                      icon: 'logoObservability',
-                      key: 'agentConfigLink',
-                      'data-test-subj': 'agentPolicyLink',
-                      navigateAppId: 'fleet',
-                      navigateOptions: {
-                        path: `#${pagePathGetters.policy_details({
-                          policyId: agentPolicies[item.metadata.Endpoint.policy.applied.id],
-                        })}`,
-                      },
-                      href: `${services?.application?.getUrlForApp(
-                        'fleet'
-                      )}#${pagePathGetters.policy_details({
-                        policyId: agentPolicies[item.metadata.Endpoint.policy.applied.id],
-                      })}`,
-                      disabled:
-                        agentPolicies[item.metadata.Endpoint.policy.applied.id] === undefined,
-                      children: (
-                        <FormattedMessage
-                          id="xpack.securitySolution.endpoint.list.actions.agentPolicy"
-                          defaultMessage="View Agent Policy"
-                        />
-                      ),
-                    },
-                    {
-                      icon: 'logoObservability',
-                      key: 'agentDetailsLink',
-                      'data-test-subj': 'agentDetailsLink',
-                      navigateAppId: 'fleet',
-                      navigateOptions: {
-                        path: `#${pagePathGetters.fleet_agent_details({
-                          agentId: item.metadata.elastic.agent.id,
-                        })}`,
-                      },
-                      href: `${services?.application?.getUrlForApp(
-                        'fleet'
-                      )}#${pagePathGetters.fleet_agent_details({
-                        agentId: item.metadata.elastic.agent.id,
-                      })}`,
-                      children: (
-                        <FormattedMessage
-                          id="xpack.securitySolution.endpoint.list.actions.agentDetails"
-                          defaultMessage="View Agent Details"
-                        />
-                      ),
-                    },
-                  ]}
-                />
-              );
+              return <TableRowActions endpointMetadata={item.metadata} />;
             },
           },
         ],
       },
     ];
-  }, [queryParams, search, formatUrl, PAD_LEFT, services?.application, agentPolicies]);
+  }, [queryParams, search, formatUrl, PAD_LEFT]);
 
   const renderTableOrEmptyState = useMemo(() => {
     if (endpointsExist || areEndpointsEnrolling) {
diff --git a/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/translations.ts b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/translations.ts
new file mode 100644
index 0000000000000..fd2806713183b
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/endpoint_hosts/view/translations.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 { i18n } from '@kbn/i18n';
+
+export const OVERVIEW = i18n.translate('xpack.securitySolution.endpointDetails.overview', {
+  defaultMessage: 'Overview',
+});
+
+export const ACTIVITY_LOG = i18n.translate('xpack.securitySolution.endpointDetails.activityLog', {
+  defaultMessage: 'Activity Log',
+});
+
+export const SEARCH_ACTIVITY_LOG = i18n.translate(
+  'xpack.securitySolution.endpointDetails.activityLog.search',
+  {
+    defaultMessage: 'Search activity log',
+  }
+);
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 5ee4c4eb0aacb..6a106b1488677 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
@@ -70,7 +70,7 @@ describe('Event filter flyout', () => {
   it('should renders correctly', () => {
     const component = render();
     expect(component.getAllByText('Add Endpoint Event Filter')).not.toBeNull();
-    expect(component.getByText('cancel')).not.toBeNull();
+    expect(component.getByText('Cancel')).not.toBeNull();
     expect(component.getByText('Endpoint Security')).not.toBeNull();
   });
 
@@ -136,7 +136,7 @@ describe('Event filter flyout', () => {
 
   it('should close when click on cancel button', () => {
     const component = render();
-    const cancelButton = component.getByText('cancel');
+    const cancelButton = component.getByText('Cancel');
     expect(onCancelMock).toHaveBeenCalledTimes(0);
 
     act(() => {
@@ -170,7 +170,7 @@ describe('Event filter flyout', () => {
       });
     });
 
-    const cancelButton = component.getByText('cancel');
+    const cancelButton = component.getByText('Cancel');
     expect(onCancelMock).toHaveBeenCalledTimes(0);
 
     act(() => {
@@ -184,7 +184,7 @@ describe('Event filter flyout', () => {
     const component = render({ id: 'fakeId', type: 'edit' });
 
     expect(component.getAllByText('Update Endpoint Event Filter')).not.toBeNull();
-    expect(component.getByText('cancel')).not.toBeNull();
+    expect(component.getByText('Cancel')).not.toBeNull();
     expect(component.getByText('Endpoint Security')).not.toBeNull();
   });
 
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx
index c36e711879b8e..1217488a75ea6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/flyout/index.tsx
@@ -141,7 +141,7 @@ export const EventFiltersFlyout: React.FC<EventFiltersFlyoutProps> = memo(
               <EuiButtonEmpty data-test-subj="cancelExceptionAddButton" onClick={handleOnCancel}>
                 <FormattedMessage
                   id="xpack.securitySolution.eventFilters.eventFiltersFlyout.actions.cancel"
-                  defaultMessage="cancel"
+                  defaultMessage="Cancel"
                 />
               </EuiButtonEmpty>
             </EuiFlexItem>
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 0867d0542e4c1..4171441e7de25 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
@@ -82,7 +82,16 @@ describe('Event filter form', () => {
     component = renderComponentWithdata();
 
     expect(component.getByTestId('alert-exception-builder')).not.toBeNull();
-    expect(component.getByText(NAME_ERROR)).not.toBeNull();
+  });
+
+  it('should display name error only when on blur and empty name', () => {
+    component = renderComponentWithdata();
+    expect(component.queryByText(NAME_ERROR)).toBeNull();
+    const nameInput = component.getByPlaceholderText(NAME_PLACEHOLDER);
+    act(() => {
+      fireEvent.blur(nameInput);
+    });
+    expect(component.queryByText(NAME_ERROR)).not.toBeNull();
   });
 
   it('should change name', async () => {
@@ -102,6 +111,23 @@ describe('Event filter form', () => {
     expect(store.getState()!.management!.eventFilters!.form!.hasNameError).toBeFalsy();
   });
 
+  it('should change name with a white space still shows an error', async () => {
+    component = renderComponentWithdata();
+
+    const nameInput = component.getByPlaceholderText(NAME_PLACEHOLDER);
+
+    act(() => {
+      fireEvent.change(nameInput, {
+        target: {
+          value: ' ',
+        },
+      });
+    });
+
+    expect(store.getState()!.management!.eventFilters!.form!.entry!.name).toBe('');
+    expect(store.getState()!.management!.eventFilters!.form!.hasNameError).toBeTruthy();
+  });
+
   it('should change comments', async () => {
     component = renderComponentWithdata();
 
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 83fd6ff1a366d..121808b62f570 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { memo, useMemo, useCallback } from 'react';
+import React, { memo, useMemo, useCallback, useState } from 'react';
 import { useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
 import {
@@ -58,6 +58,7 @@ export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
     const exception = useEventFiltersSelector(getFormEntryStateMutable);
     const hasNameError = useEventFiltersSelector(getHasNameError);
     const newComment = useEventFiltersSelector(getNewComment);
+    const [hasBeenInputNameVisited, setHasBeenInputNameVisited] = useState(false);
 
     // This value has to be memoized to avoid infinite useEffect loop on useFetchIndex
     const indexNames = useMemo(() => ['logs-endpoint.events.*'], []);
@@ -90,11 +91,12 @@ export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
     const handleOnChangeName = useCallback(
       (e: React.ChangeEvent<HTMLInputElement>) => {
         if (!exception) return;
+        const name = e.target.value.toString().trim();
         dispatch({
           type: 'eventFiltersChangeForm',
           payload: {
-            entry: { ...exception, name: e.target.value.toString() },
-            hasNameError: !e.target.value,
+            entry: { ...exception, name },
+            hasNameError: !name,
           },
         });
       },
@@ -140,7 +142,12 @@ export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
 
     const nameInputMemo = useMemo(
       () => (
-        <EuiFormRow label={NAME_LABEL} fullWidth isInvalid={hasNameError} error={NAME_ERROR}>
+        <EuiFormRow
+          label={NAME_LABEL}
+          fullWidth
+          isInvalid={hasNameError && hasBeenInputNameVisited}
+          error={NAME_ERROR}
+        >
           <EuiFieldText
             id="eventFiltersFormInputName"
             placeholder={NAME_PLACEHOLDER}
@@ -148,12 +155,13 @@ export const EventFiltersForm: React.FC<EventFiltersFormProps> = memo(
             onChange={handleOnChangeName}
             fullWidth
             aria-label={NAME_PLACEHOLDER}
-            required
+            required={hasBeenInputNameVisited}
             maxLength={256}
+            onBlur={() => !hasBeenInputNameVisited && setHasBeenInputNameVisited(true)}
           />
         </EuiFormRow>
       ),
-      [hasNameError, exception?.name, handleOnChangeName]
+      [hasNameError, exception?.name, handleOnChangeName, hasBeenInputNameVisited]
     );
 
     const osInputMemo = useMemo(
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/translations.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/translations.ts
index 086f2298d2c1a..7391251a936e6 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/form/translations.ts
@@ -17,12 +17,12 @@ export const FORM_DESCRIPTION = i18n.translate(
 export const NAME_PLACEHOLDER = i18n.translate(
   'xpack.securitySolution.eventFilter.form.name.placeholder',
   {
-    defaultMessage: 'Event exception name',
+    defaultMessage: 'Event filter name',
   }
 );
 
 export const NAME_LABEL = i18n.translate('xpack.securitySolution.eventFilter.form.name.label', {
-  defaultMessage: 'Name your event exception',
+  defaultMessage: 'Name your event filter',
 });
 
 export const NAME_ERROR = i18n.translate('xpack.securitySolution.eventFilter.form.name.error', {
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/translations.ts b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/translations.ts
index 982d9b3bb12b3..66e0dfde298b8 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/translations.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/components/modal/translations.ts
@@ -25,6 +25,6 @@ export const ACTIONS_CONFIRM = i18n.translate(
 export const ACTIONS_CANCEL = i18n.translate(
   'xpack.securitySolution.eventFilter.modal.actions.cancel',
   {
-    defaultMessage: 'cancel',
+    defaultMessage: 'Cancel',
   }
 );
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx
index 465f92dfda767..59d409874c561 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.test.tsx
@@ -175,4 +175,30 @@ describe('When on the Event Filters List Page', () => {
       });
     });
   });
+
+  describe('and the back button is present', () => {
+    beforeEach(async () => {
+      renderResult = render();
+      act(() => {
+        history.push('/event_filters', {
+          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 not present', () => {
+      act(() => {
+        history.push('/event_filters');
+      });
+      expect(renderResult.queryByTestId('backToOrigin')).toBeNull();
+    });
+  });
 });
diff --git a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx
index 32fc018210418..00ee80c5d7022 100644
--- a/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/event_filters/view/event_filters_list_page.tsx
@@ -5,10 +5,10 @@
  * 2.0.
  */
 
-import React, { memo, useCallback, useEffect } from 'react';
+import React, { memo, useCallback, useMemo, useEffect } from 'react';
 import { useDispatch } from 'react-redux';
 import { Dispatch } from 'redux';
-import { useHistory } from 'react-router-dom';
+import { useHistory, useLocation } from 'react-router-dom';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import { EuiButton, EuiSpacer, EuiHorizontalRule, EuiText } from '@elastic/eui';
@@ -34,7 +34,7 @@ import {
   showDeleteModal,
 } from '../store/selector';
 import { PaginatedContent, PaginatedContentProps } from '../../../components/paginated_content';
-import { Immutable } from '../../../../../common/endpoint/types';
+import { Immutable, ListPageRouteState } from '../../../../../common/endpoint/types';
 import {
   ExceptionItem,
   ExceptionItemProps,
@@ -42,6 +42,7 @@ import {
 import { EventFilterDeleteModal } from './components/event_filter_delete_modal';
 
 import { SearchBar } from '../../../components/search_bar';
+import { BackToExternalAppButton } from '../../../components/back_to_external_app_button';
 
 type EventListPaginatedContent = PaginatedContentProps<
   Immutable<ExceptionListItemSchema>,
@@ -59,6 +60,7 @@ const AdministrationListPage = styled(_AdministrationListPage)`
 `;
 
 export const EventFiltersListPage = memo(() => {
+  const { state: routeState } = useLocation<ListPageRouteState | undefined>();
   const history = useHistory();
   const dispatch = useDispatch<Dispatch<AppAction>>();
   const isActionError = useEventFiltersSelector(getActionError);
@@ -103,6 +105,13 @@ export const EventFiltersListPage = memo(() => {
     }
   }, [dispatch, formEntry, history, isActionError, location, navigateCallback]);
 
+  const backButton = useMemo(() => {
+    if (routeState && routeState.onBackButtonNavigateTo) {
+      return <BackToExternalAppButton {...routeState} />;
+    }
+    return null;
+  }, [routeState]);
+
   const handleAddButtonClick = useCallback(
     () =>
       navigateCallback({
@@ -173,6 +182,7 @@ export const EventFiltersListPage = memo(() => {
   return (
     <AdministrationListPage
       beta={false}
+      headerBackComponent={backButton}
       title={
         <FormattedMessage
           id="xpack.securitySolution.eventFilters.list.pageTitle"
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts b/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
index 3c760545539c1..166d3f3b98a85 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/models/advanced_policy_schema.ts
@@ -648,4 +648,14 @@ export const AdvancedPolicySchema: AdvancedPolicySchemaType[] = [
       }
     ),
   },
+  {
+    key: 'windows.advanced.ransomware.canary',
+    first_supported_version: '7.14',
+    documentation: i18n.translate(
+      'xpack.securitySolution.endpoint.policy.advanced.windows.advanced.ransomware.canary',
+      {
+        defaultMessage: "A value of 'false' disables Ransomware canary protection. Default: true.",
+      }
+    ),
+  },
 ];
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
new file mode 100644
index 0000000000000..f4ee33446d504
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.test.tsx
@@ -0,0 +1,80 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+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 { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';
+
+const mockTheme = getMockTheme({
+  eui: {
+    paddingSizes: { m: '2' },
+  },
+});
+
+const getStatValue = (el: reactTestingLibrary.RenderResult, stat: string) => {
+  return el.getByText(stat)!.nextSibling?.lastChild?.textContent;
+};
+
+describe('Fleet event filters card', () => {
+  const renderComponent: (
+    stats: GetExceptionSummaryResponse
+  ) => reactTestingLibrary.RenderResult = (stats) => {
+    const Wrapper: React.FC = ({ children }) => (
+      <I18nProvider>
+        <ThemeProvider theme={mockTheme}>{children}</ThemeProvider>
+      </I18nProvider>
+    );
+    const component = reactTestingLibrary.render(<ExceptionItemsSummary stats={stats} />, {
+      wrapper: Wrapper,
+    });
+    return component;
+  };
+  it('should renders correctly', () => {
+    const summary: GetExceptionSummaryResponse = {
+      windows: 3,
+      linux: 2,
+      macos: 2,
+      total: 7,
+    };
+    const component = renderComponent(summary);
+
+    expect(component.getByText('Windows')).not.toBeNull();
+    expect(getStatValue(component, 'Windows')).toEqual(summary.windows.toString());
+
+    expect(component.getByText('Linux')).not.toBeNull();
+    expect(getStatValue(component, 'Linux')).toEqual(summary.linux.toString());
+
+    expect(component.getByText('Mac')).not.toBeNull();
+    expect(getStatValue(component, 'Mac')).toEqual(summary.macos.toString());
+
+    expect(component.getByText('Total')).not.toBeNull();
+    expect(getStatValue(component, 'Total')).toEqual(summary.total.toString());
+  });
+  it('should renders correctly when missing some stats', () => {
+    const summary: Partial<GetExceptionSummaryResponse> = {
+      windows: 3,
+      total: 3,
+    };
+    const component = renderComponent(summary as GetExceptionSummaryResponse);
+
+    expect(component.getByText('Windows')).not.toBeNull();
+    expect(getStatValue(component, 'Windows')).toEqual('3');
+
+    expect(component.getByText('Linux')).not.toBeNull();
+    expect(getStatValue(component, 'Linux')).toEqual('0');
+
+    expect(component.getByText('Mac')).not.toBeNull();
+    expect(getStatValue(component, 'Mac')).toEqual('0');
+
+    expect(component.getByText('Total')).not.toBeNull();
+    expect(getStatValue(component, 'Total')).toEqual('3');
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx
index f42304ffb89ae..ed3d9967f318e 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/exception_items_summary.tsx
@@ -47,7 +47,7 @@ export const ExceptionItemsSummary = memo<ExceptionItemsSummaryProps>(({ stats }
     <EuiFlexGroup alignItems="center" justifyContent="spaceAround">
       {SUMMARY_KEYS.map((stat) => {
         return (
-          <EuiFlexItem>
+          <EuiFlexItem key={stat}>
             <SummaryStat
               value={stats?.[stat] ?? 0}
               color={stat === 'total' ? 'primary' : 'default'}
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.test.tsx
new file mode 100644
index 0000000000000..55e844df2afae
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.test.tsx
@@ -0,0 +1,116 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { ThemeProvider } from 'styled-components';
+import { I18nProvider } from '@kbn/i18n/react';
+import { FleetEventFiltersCard } from './fleet_event_filters_card';
+import * as reactTestingLibrary from '@testing-library/react';
+import { EventFiltersHttpService } from '../../../../../event_filters/service';
+import { useToasts } from '../../../../../../../common/lib/kibana';
+import { getMockTheme } from '../../../../../../../../public/common/lib/kibana/kibana_react.mock';
+import { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';
+
+jest.mock('./exception_items_summary');
+jest.mock('../../../../../event_filters/service');
+
+jest.mock('../../../../../../../../../../../src/plugins/kibana_react/public', () => {
+  const originalModule = jest.requireActual(
+    '../../../../../../../../../../../src/plugins/kibana_react/public'
+  );
+  const useKibana = jest.fn().mockImplementation(() => ({
+    services: {
+      http: {},
+      data: {},
+      notifications: {},
+      application: {
+        getUrlForApp: jest.fn(),
+      },
+    },
+  }));
+
+  return {
+    ...originalModule,
+    useKibana,
+  };
+});
+
+jest.mock('../../../../../../../common/lib/kibana');
+
+const mockTheme = getMockTheme({
+  eui: {
+    paddingSizes: { m: '2' },
+  },
+});
+
+const EventFiltersHttpServiceMock = EventFiltersHttpService as jest.Mock;
+const useToastsMock = useToasts as jest.Mock;
+
+const summary: GetExceptionSummaryResponse = {
+  windows: 3,
+  linux: 2,
+  macos: 2,
+  total: 7,
+};
+
+describe('Fleet event filters card', () => {
+  let promise: Promise<GetExceptionSummaryResponse>;
+  let addDanger: jest.Mock = jest.fn();
+  const renderComponent: () => Promise<reactTestingLibrary.RenderResult> = async () => {
+    const Wrapper: React.FC = ({ children }) => (
+      <I18nProvider>
+        <ThemeProvider theme={mockTheme}>{children}</ThemeProvider>
+      </I18nProvider>
+    );
+    // @ts-ignore
+    const component = reactTestingLibrary.render(<FleetEventFiltersCard />, { wrapper: Wrapper });
+    try {
+      // @ts-ignore
+      await reactTestingLibrary.act(() => promise);
+    } catch (err) {
+      return component;
+    }
+    return component;
+  };
+  beforeAll(() => {
+    useToastsMock.mockImplementation(() => {
+      return {
+        addDanger,
+      };
+    });
+  });
+  beforeEach(() => {
+    promise = Promise.resolve(summary);
+    addDanger = jest.fn();
+  });
+  afterEach(() => {
+    EventFiltersHttpServiceMock.mockReset();
+  });
+  it('should render correctly', async () => {
+    EventFiltersHttpServiceMock.mockImplementationOnce(() => {
+      return {
+        getSummary: () => jest.fn(() => promise),
+      };
+    });
+    const component = await renderComponent();
+    expect(component.getByText('Event Filters')).not.toBeNull();
+    expect(component.getByText('Manage event filters')).not.toBeNull();
+  });
+  it('should render an error toast when api call fails', async () => {
+    expect(addDanger).toBeCalledTimes(0);
+    promise = Promise.reject(new Error('error test'));
+    EventFiltersHttpServiceMock.mockImplementationOnce(() => {
+      return {
+        getSummary: () => promise,
+      };
+    });
+    const component = await renderComponent();
+    expect(component.getByText('Event Filters')).not.toBeNull();
+    expect(component.getByText('Manage event filters')).not.toBeNull();
+    await reactTestingLibrary.waitFor(() => expect(addDanger).toBeCalledTimes(1));
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx
index 6f368a89eb5f9..be3cba5eb4318 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_event_filters_card.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { memo, useMemo, useState, useEffect } from 'react';
+import React, { memo, useMemo, useState, useEffect, useRef } from 'react';
 import { ApplicationStart, CoreStart } from 'kibana/public';
 import { EuiPanel, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -16,7 +16,10 @@ import {
 } from '../../../../../../../../../fleet/public';
 import { useKibana } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 import { getEventFiltersListPath } from '../../../../../../common/routing';
-import { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';
+import {
+  GetExceptionSummaryResponse,
+  ListPageRouteState,
+} from '../../../../../../../../common/endpoint/types';
 import { PLUGIN_ID as FLEET_PLUGIN_ID } from '../../../../../../../../../fleet/common';
 import { MANAGEMENT_APP_ID } from '../../../../../../common/constants';
 import { useToasts } from '../../../../../../../common/lib/kibana';
@@ -36,12 +39,16 @@ export const FleetEventFiltersCard = memo<PackageCustomExtensionComponentProps>(
   const [stats, setStats] = useState<GetExceptionSummaryResponse | undefined>();
   const eventFiltersListUrlPath = getEventFiltersListPath();
   const eventFiltersApi = useMemo(() => new EventFiltersHttpService(http), [http]);
+  const isMounted = useRef<boolean>();
 
   useEffect(() => {
+    isMounted.current = true;
     const fetchStats = async () => {
       try {
         const summary = await eventFiltersApi.getSummary();
-        setStats(summary);
+        if (isMounted.current) {
+          setStats(summary);
+        }
       } catch (error) {
         toasts.addDanger(
           i18n.translate(
@@ -55,9 +62,12 @@ export const FleetEventFiltersCard = memo<PackageCustomExtensionComponentProps>(
       }
     };
     fetchStats();
+    return () => {
+      isMounted.current = false;
+    };
   }, [eventFiltersApi, toasts]);
 
-  const eventFiltersRouteState = useMemo(() => {
+  const eventFiltersRouteState = useMemo<ListPageRouteState>(() => {
     const fleetPackageCustomUrlPath = `#${pagePathGetters.integration_details_custom({ pkgkey })}`;
     return {
       backButtonLabel: i18n.translate(
@@ -79,7 +89,7 @@ export const FleetEventFiltersCard = memo<PackageCustomExtensionComponentProps>(
   return (
     <EuiPanel paddingSize="l">
       <StyledEuiFlexGridGroup alignItems="baseline" justifyContent="center">
-        <StyledEuiFlexGridItem gridArea="title" alignItems="flex-start">
+        <StyledEuiFlexGridItem gridarea="title" alignitems="flex-start">
           <EuiText>
             <h4>
               <FormattedMessage
@@ -89,10 +99,10 @@ export const FleetEventFiltersCard = memo<PackageCustomExtensionComponentProps>(
             </h4>
           </EuiText>
         </StyledEuiFlexGridItem>
-        <StyledEuiFlexGridItem gridArea="summary">
+        <StyledEuiFlexGridItem gridarea="summary">
           <ExceptionItemsSummary stats={stats} />
         </StyledEuiFlexGridItem>
-        <StyledEuiFlexGridItem gridArea="link" alignItems="flex-end">
+        <StyledEuiFlexGridItem gridarea="link" alignitems="flex-end">
           <>
             <LinkWithIcon
               appId={MANAGEMENT_APP_ID}
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.test.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.test.tsx
new file mode 100644
index 0000000000000..22a7072caea02
--- /dev/null
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.test.tsx
@@ -0,0 +1,117 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { ThemeProvider } from 'styled-components';
+import { I18nProvider } from '@kbn/i18n/react';
+import { FleetTrustedAppsCard } from './fleet_trusted_apps_card';
+import * as reactTestingLibrary from '@testing-library/react';
+import { TrustedAppsHttpService } from '../../../../../trusted_apps/service';
+import { useToasts } from '../../../../../../../common/lib/kibana';
+import { getMockTheme } from '../../../../../../../../public/common/lib/kibana/kibana_react.mock';
+import { GetExceptionSummaryResponse } from '../../../../../../../../common/endpoint/types';
+
+jest.mock('./exception_items_summary');
+jest.mock('../../../../../trusted_apps/service');
+
+jest.mock('../../../../../../../../../../../src/plugins/kibana_react/public', () => {
+  const originalModule = jest.requireActual(
+    '../../../../../../../../../../../src/plugins/kibana_react/public'
+  );
+  const useKibana = jest.fn().mockImplementation(() => ({
+    services: {
+      http: {},
+      data: {},
+      notifications: {},
+      application: {
+        getUrlForApp: jest.fn(),
+      },
+    },
+  }));
+
+  return {
+    ...originalModule,
+    useKibana,
+  };
+});
+
+jest.mock('../../../../../../../common/lib/kibana');
+
+const mockTheme = getMockTheme({
+  eui: {
+    paddingSizes: { m: '2' },
+  },
+});
+
+const TrustedAppsHttpServiceMock = TrustedAppsHttpService as jest.Mock;
+const useToastsMock = useToasts as jest.Mock;
+
+const summary: GetExceptionSummaryResponse = {
+  windows: 3,
+  linux: 2,
+  macos: 2,
+  total: 7,
+};
+
+describe('Fleet trusted apps card', () => {
+  let promise: Promise<GetExceptionSummaryResponse>;
+  let addDanger: jest.Mock = jest.fn();
+  const renderComponent: () => Promise<reactTestingLibrary.RenderResult> = async () => {
+    const Wrapper: React.FC = ({ children }) => (
+      <I18nProvider>
+        <ThemeProvider theme={mockTheme}>{children}</ThemeProvider>
+      </I18nProvider>
+    );
+    // @ts-ignore
+    const component = reactTestingLibrary.render(<FleetTrustedAppsCard />, { wrapper: Wrapper });
+    try {
+      // @ts-ignore
+      await reactTestingLibrary.act(() => promise);
+    } catch (err) {
+      return component;
+    }
+    return component;
+  };
+
+  beforeAll(() => {
+    useToastsMock.mockImplementation(() => {
+      return {
+        addDanger,
+      };
+    });
+  });
+  beforeEach(() => {
+    promise = Promise.resolve(summary);
+    addDanger = jest.fn();
+  });
+  afterEach(() => {
+    TrustedAppsHttpServiceMock.mockReset();
+  });
+  it('should render correctly', async () => {
+    TrustedAppsHttpServiceMock.mockImplementationOnce(() => {
+      return {
+        getTrustedAppsSummary: () => jest.fn(() => promise),
+      };
+    });
+    const component = await renderComponent();
+    expect(component.getByText('Trusted Applications')).not.toBeNull();
+    expect(component.getByText('Manage trusted applications')).not.toBeNull();
+  });
+  it('should render an error toast when api call fails', async () => {
+    expect(addDanger).toBeCalledTimes(0);
+    promise = Promise.reject(new Error('error test'));
+    TrustedAppsHttpServiceMock.mockImplementationOnce(() => {
+      return {
+        getTrustedAppsSummary: () => promise,
+      };
+    });
+    const component = await renderComponent();
+    expect(component.getByText('Trusted Applications')).not.toBeNull();
+    expect(component.getByText('Manage trusted applications')).not.toBeNull();
+    await reactTestingLibrary.waitFor(() => expect(addDanger).toBeCalledTimes(1));
+  });
+});
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx
index ec1479643999a..ed3ba10c1e62b 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/fleet_trusted_apps_card.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { memo, useMemo, useState, useEffect } from 'react';
+import React, { memo, useMemo, useState, useEffect, useRef } from 'react';
 import { ApplicationStart, CoreStart } from 'kibana/public';
 import { EuiPanel, EuiText } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
@@ -17,7 +17,7 @@ import {
 import { useKibana } from '../../../../../../../../../../../src/plugins/kibana_react/public';
 import { getTrustedAppsListPath } from '../../../../../../common/routing';
 import {
-  TrustedAppsListPageRouteState,
+  ListPageRouteState,
   GetExceptionSummaryResponse,
 } from '../../../../../../../../common/endpoint/types';
 import { PLUGIN_ID as FLEET_PLUGIN_ID } from '../../../../../../../../../fleet/common';
@@ -38,12 +38,16 @@ export const FleetTrustedAppsCard = memo<PackageCustomExtensionComponentProps>((
   const toasts = useToasts();
   const [stats, setStats] = useState<GetExceptionSummaryResponse | undefined>();
   const trustedAppsApi = useMemo(() => new TrustedAppsHttpService(http), [http]);
+  const isMounted = useRef<boolean>();
 
   useEffect(() => {
+    isMounted.current = true;
     const fetchStats = async () => {
       try {
         const response = await trustedAppsApi.getTrustedAppsSummary();
-        setStats(response);
+        if (isMounted) {
+          setStats(response);
+        }
       } catch (error) {
         toasts.addDanger(
           i18n.translate(
@@ -57,10 +61,13 @@ export const FleetTrustedAppsCard = memo<PackageCustomExtensionComponentProps>((
       }
     };
     fetchStats();
+    return () => {
+      isMounted.current = false;
+    };
   }, [toasts, trustedAppsApi]);
   const trustedAppsListUrlPath = getTrustedAppsListPath();
 
-  const trustedAppRouteState = useMemo<TrustedAppsListPageRouteState>(() => {
+  const trustedAppRouteState = useMemo<ListPageRouteState>(() => {
     const fleetPackageCustomUrlPath = `#${pagePathGetters.integration_details_custom({ pkgkey })}`;
     return {
       backButtonLabel: i18n.translate(
@@ -82,7 +89,7 @@ export const FleetTrustedAppsCard = memo<PackageCustomExtensionComponentProps>((
   return (
     <EuiPanel paddingSize="l">
       <StyledEuiFlexGridGroup alignItems="baseline" justifyContent="center">
-        <StyledEuiFlexGridItem gridArea="title" alignItems="flex-start">
+        <StyledEuiFlexGridItem gridarea="title" alignitems="flex-start">
           <EuiText>
             <h4>
               <FormattedMessage
@@ -92,10 +99,10 @@ export const FleetTrustedAppsCard = memo<PackageCustomExtensionComponentProps>((
             </h4>
           </EuiText>
         </StyledEuiFlexGridItem>
-        <StyledEuiFlexGridItem gridArea="summary">
+        <StyledEuiFlexGridItem gridarea="summary">
           <ExceptionItemsSummary stats={stats} />
         </StyledEuiFlexGridItem>
-        <StyledEuiFlexGridItem gridArea="link" alignItems="flex-end">
+        <StyledEuiFlexGridItem gridarea="link" alignitems="flex-end">
           <>
             <LinkWithIcon
               appId={MANAGEMENT_APP_ID}
diff --git a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx
index 8791f7fa87283..cb128946d8efa 100644
--- a/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx
+++ b/x-pack/plugins/security_solution/public/management/pages/policy/view/ingest_manager_integration/endpoint_package_custom_extension/components/styled_components.tsx
@@ -14,11 +14,11 @@ export const StyledEuiFlexGridGroup = styled(EuiFlexGroup)`
 `;
 
 export const StyledEuiFlexGridItem = styled(EuiFlexItem)<{
-  gridArea: string;
-  alignItems?: string;
+  gridarea: string;
+  alignitems?: string;
 }>`
-  grid-area: ${({ gridArea }) => gridArea};
-  align-items: ${({ alignItems }) => alignItems ?? 'center'};
+  grid-area: ${({ gridarea }) => gridarea};
+  align-items: ${({ alignitems }) => alignitems ?? 'center'};
   margin: 0px;
   padding: 12px;
 `;
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 5f572251daeda..9d39ecd05ad8a 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
@@ -29,8 +29,8 @@ import {
   GetOneTrustedAppRequestParams,
   GetOneTrustedAppResponse,
 } from '../../../../../common/endpoint/types/trusted_apps';
+import { resolvePathVariables } from '../../../../common/utils/resolve_path_variables';
 
-import { resolvePathVariables } from './utils';
 import { sendGetEndpointSpecificPackagePolicies } from '../../policy/store/services/ingest';
 
 export interface TrustedAppsService {
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/utils.test.ts b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/utils.test.ts
deleted file mode 100644
index c2067f9d0848f..0000000000000
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/service/utils.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 { resolvePathVariables } from './utils';
-
-describe('utils', () => {
-  describe('resolvePathVariables', () => {
-    it('should resolve defined variables', () => {
-      expect(resolvePathVariables('/segment1/{var1}/segment2', { var1: 'value1' })).toBe(
-        '/segment1/value1/segment2'
-      );
-    });
-
-    it('should not resolve undefined variables', () => {
-      expect(resolvePathVariables('/segment1/{var1}/segment2', {})).toBe(
-        '/segment1/{var1}/segment2'
-      );
-    });
-
-    it('should ignore unused variables', () => {
-      expect(resolvePathVariables('/segment1/{var1}/segment2', { var2: 'value2' })).toBe(
-        '/segment1/{var1}/segment2'
-      );
-    });
-
-    it('should replace multiple variable occurences', () => {
-      expect(resolvePathVariables('/{var1}/segment1/{var1}', { var1: 'value1' })).toBe(
-        '/value1/segment1/value1'
-      );
-    });
-
-    it('should replace multiple variables', () => {
-      const path = resolvePathVariables('/{var1}/segment1/{var2}', {
-        var1: 'value1',
-        var2: 'value2',
-      });
-
-      expect(path).toBe('/value1/segment1/value2');
-    });
-  });
-});
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
index 0a1b1d2552302..5ab58914ff8b1 100644
--- 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
@@ -29,6 +29,7 @@ exports[`TrustedAppDeletionDialog renders correctly when deletion failed 1`] = `
           <span
             aria-hidden="true"
             class="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="cross"
           />
         </button>
@@ -130,6 +131,7 @@ exports[`TrustedAppDeletionDialog renders correctly when deletion is in progress
           <span
             aria-hidden="true"
             class="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="cross"
           />
         </button>
@@ -236,6 +238,7 @@ exports[`TrustedAppDeletionDialog renders correctly when dialog started 1`] = `
           <span
             aria-hidden="true"
             class="euiButtonIcon__icon"
+            color="inherit"
             data-euiicon-type="cross"
           />
         </button>
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
index 8d9623c720488..7e89c9723c9dd 100644
--- 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
@@ -189,6 +189,7 @@ exports[`TrustedAppsGrid renders correctly when failed loading data for the seco
                   >
                     <span
                       class="euiButtonContent__icon"
+                      color="inherit"
                       data-euiicon-type="arrowDown"
                     />
                     <span
@@ -219,6 +220,7 @@ exports[`TrustedAppsGrid renders correctly when failed loading data for the seco
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowLeft"
                 />
               </button>
@@ -363,6 +365,7 @@ exports[`TrustedAppsGrid renders correctly when failed loading data for the seco
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowRight"
                 />
               </button>
@@ -582,7 +585,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -591,7 +594,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -600,7 +603,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -609,7 +612,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -618,7 +621,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -627,7 +630,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -871,7 +874,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -880,7 +883,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -889,7 +892,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -898,7 +901,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -907,7 +910,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -916,7 +919,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -1160,7 +1163,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1169,7 +1172,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -1178,7 +1181,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1187,7 +1190,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -1196,7 +1199,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1205,7 +1208,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -1449,7 +1452,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1458,7 +1461,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -1467,7 +1470,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1476,7 +1479,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -1485,7 +1488,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1494,7 +1497,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -1738,7 +1741,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1747,7 +1750,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -1756,7 +1759,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1765,7 +1768,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -1774,7 +1777,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -1783,7 +1786,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -2027,7 +2030,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2036,7 +2039,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2045,7 +2048,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2054,7 +2057,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2063,7 +2066,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2072,7 +2075,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -2316,7 +2319,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2325,7 +2328,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2334,7 +2337,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2343,7 +2346,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2352,7 +2355,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2361,7 +2364,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -2605,7 +2608,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2614,7 +2617,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2623,7 +2626,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2632,7 +2635,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2641,7 +2644,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2650,7 +2653,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -2894,7 +2897,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2903,7 +2906,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2912,7 +2915,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2921,7 +2924,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -2930,7 +2933,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -2939,7 +2942,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -3183,7 +3186,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -3192,7 +3195,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -3201,7 +3204,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -3210,7 +3213,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -3219,7 +3222,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -3228,7 +3231,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -3341,6 +3344,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                   >
                     <span
                       class="euiButtonContent__icon"
+                      color="inherit"
                       data-euiicon-type="arrowDown"
                     />
                     <span
@@ -3371,6 +3375,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowLeft"
                 />
               </button>
@@ -3515,6 +3520,7 @@ exports[`TrustedAppsGrid renders correctly when loaded data 1`] = `
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowRight"
                 />
               </button>
@@ -3777,7 +3783,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -3786,7 +3792,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -3795,7 +3801,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -3804,7 +3810,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -3813,7 +3819,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -3822,7 +3828,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -4066,7 +4072,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4075,7 +4081,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4084,7 +4090,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4093,7 +4099,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4102,7 +4108,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4111,7 +4117,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -4355,7 +4361,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4364,7 +4370,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4373,7 +4379,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4382,7 +4388,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4391,7 +4397,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4400,7 +4406,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -4644,7 +4650,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4653,7 +4659,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4662,7 +4668,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4671,7 +4677,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4680,7 +4686,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4689,7 +4695,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -4933,7 +4939,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4942,7 +4948,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4951,7 +4957,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4960,7 +4966,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -4969,7 +4975,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -4978,7 +4984,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -5222,7 +5228,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5231,7 +5237,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -5240,7 +5246,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5249,7 +5255,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -5258,7 +5264,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5267,7 +5273,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -5511,7 +5517,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5520,7 +5526,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -5529,7 +5535,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5538,7 +5544,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -5547,7 +5553,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5556,7 +5562,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -5800,7 +5806,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5809,7 +5815,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -5818,7 +5824,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5827,7 +5833,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -5836,7 +5842,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -5845,7 +5851,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -6089,7 +6095,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6098,7 +6104,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -6107,7 +6113,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6116,7 +6122,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -6125,7 +6131,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6134,7 +6140,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -6378,7 +6384,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6387,7 +6393,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -6396,7 +6402,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6405,7 +6411,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -6414,7 +6420,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6423,7 +6429,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -6536,6 +6542,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                   >
                     <span
                       class="euiButtonContent__icon"
+                      color="inherit"
                       data-euiicon-type="arrowDown"
                     />
                     <span
@@ -6566,6 +6573,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowLeft"
                 />
               </button>
@@ -6710,6 +6718,7 @@ exports[`TrustedAppsGrid renders correctly when loading data for the second time
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowRight"
                 />
               </button>
@@ -6929,7 +6938,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6938,7 +6947,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -6947,7 +6956,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6956,7 +6965,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -6965,7 +6974,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -6974,7 +6983,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -7218,7 +7227,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7227,7 +7236,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -7236,7 +7245,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7245,7 +7254,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -7254,7 +7263,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7263,7 +7272,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -7507,7 +7516,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7516,7 +7525,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -7525,7 +7534,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7534,7 +7543,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -7543,7 +7552,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7552,7 +7561,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -7796,7 +7805,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7805,7 +7814,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -7814,7 +7823,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7823,7 +7832,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -7832,7 +7841,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -7841,7 +7850,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -8085,7 +8094,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8094,7 +8103,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8103,7 +8112,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8112,7 +8121,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8121,7 +8130,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8130,7 +8139,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -8374,7 +8383,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8383,7 +8392,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8392,7 +8401,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8401,7 +8410,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8410,7 +8419,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8419,7 +8428,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -8663,7 +8672,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8672,7 +8681,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8681,7 +8690,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8690,7 +8699,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8699,7 +8708,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8708,7 +8717,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -8952,7 +8961,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8961,7 +8970,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8970,7 +8979,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8979,7 +8988,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -8988,7 +8997,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -8997,7 +9006,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -9241,7 +9250,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -9250,7 +9259,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -9259,7 +9268,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -9268,7 +9277,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -9277,7 +9286,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -9286,7 +9295,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -9530,7 +9539,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 30%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -9539,7 +9548,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Field
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -9548,7 +9557,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 20%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -9557,7 +9566,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Operator
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                     <th
                                       class="euiTableHeaderCell"
@@ -9566,7 +9575,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                       scope="col"
                                       style="width: 60%;"
                                     >
-                                      <div
+                                      <span
                                         class="euiTableCellContent"
                                       >
                                         <span
@@ -9575,7 +9584,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                                         >
                                           Value
                                         </span>
-                                      </div>
+                                      </span>
                                     </th>
                                   </tr>
                                 </thead>
@@ -9688,6 +9697,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                   >
                     <span
                       class="euiButtonContent__icon"
+                      color="inherit"
                       data-euiicon-type="arrowDown"
                     />
                     <span
@@ -9717,6 +9727,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowLeft"
                 />
               </button>
@@ -9815,6 +9826,7 @@ exports[`TrustedAppsGrid renders correctly when new page and page size set (not
                 <span
                   aria-hidden="true"
                   class="euiButtonIcon__icon"
+                  color="inherit"
                   data-euiicon-type="arrowRight"
                 />
               </button>
diff --git a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
index c4f2a74ea173d..2bb498ee2d463 100644
--- a/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/management/pages/trusted_apps/view/components/trusted_apps_list/__snapshots__/index.test.tsx.snap
@@ -37,7 +37,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -46,7 +46,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -54,7 +54,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -63,7 +63,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -71,7 +71,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -80,7 +80,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -88,7 +88,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -97,14 +97,14 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -113,7 +113,7 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -122,13 +122,13 @@ exports[`TrustedAppsList renders correctly initially 1`] = `
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -195,7 +195,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -204,7 +204,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -212,7 +212,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -221,7 +221,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -229,7 +229,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -238,7 +238,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -246,7 +246,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -255,14 +255,14 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -271,7 +271,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -280,13 +280,13 @@ exports[`TrustedAppsList renders correctly when failed loading data for the firs
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -358,7 +358,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -367,7 +367,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -375,7 +375,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -384,7 +384,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -392,7 +392,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -401,7 +401,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -409,7 +409,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -418,14 +418,14 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -434,7 +434,7 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -443,13 +443,13 @@ exports[`TrustedAppsList renders correctly when failed loading data for the seco
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -533,7 +533,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -542,7 +542,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -550,7 +550,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -559,7 +559,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -567,7 +567,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -576,7 +576,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -584,7 +584,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -593,14 +593,14 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -609,7 +609,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -618,13 +618,13 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -726,6 +726,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -754,6 +755,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowUp"
                   />
                 </button>
@@ -931,7 +933,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                                             scope="col"
                                             style="width: 30%;"
                                           >
-                                            <div
+                                            <span
                                               class="euiTableCellContent"
                                             >
                                               <span
@@ -939,7 +941,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                                               >
                                                 Field
                                               </span>
-                                            </div>
+                                            </span>
                                           </th>
                                           <th
                                             class="euiTableHeaderCell"
@@ -948,7 +950,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                                             scope="col"
                                             style="width: 20%;"
                                           >
-                                            <div
+                                            <span
                                               class="euiTableCellContent"
                                             >
                                               <span
@@ -956,7 +958,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                                               >
                                                 Operator
                                               </span>
-                                            </div>
+                                            </span>
                                           </th>
                                           <th
                                             class="euiTableHeaderCell"
@@ -965,7 +967,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                                             scope="col"
                                             style="width: 60%;"
                                           >
-                                            <div
+                                            <span
                                               class="euiTableCellContent"
                                             >
                                               <span
@@ -973,7 +975,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                                               >
                                                 Value
                                               </span>
-                                            </div>
+                                            </span>
                                           </th>
                                         </tr>
                                       </thead>
@@ -1157,6 +1159,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -1185,6 +1188,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1287,6 +1291,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -1315,6 +1320,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1417,6 +1423,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -1445,6 +1452,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1547,6 +1555,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -1575,6 +1584,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1677,6 +1687,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -1705,6 +1716,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1807,6 +1819,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -1835,6 +1848,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1937,6 +1951,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -1965,6 +1980,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2067,6 +2083,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -2095,6 +2112,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2197,6 +2215,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -2225,6 +2244,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2327,6 +2347,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -2355,6 +2376,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2457,6 +2479,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -2485,6 +2508,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2587,6 +2611,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -2615,6 +2640,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2717,6 +2743,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -2745,6 +2772,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2847,6 +2875,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -2875,6 +2904,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -2977,6 +3007,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -3005,6 +3036,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -3107,6 +3139,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -3135,6 +3168,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -3237,6 +3271,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -3265,6 +3300,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -3367,6 +3403,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -3395,6 +3432,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -3497,6 +3535,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -3525,6 +3564,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -3560,6 +3600,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
                 >
                   <span
                     class="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                   <span
@@ -3590,6 +3631,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowLeft"
               />
             </button>
@@ -3747,6 +3789,7 @@ exports[`TrustedAppsList renders correctly when item details expanded 1`] = `
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowRight"
               />
             </a>
@@ -3795,7 +3838,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -3804,7 +3847,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -3812,7 +3855,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -3821,7 +3864,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -3829,7 +3872,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -3838,7 +3881,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -3846,7 +3889,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -3855,14 +3898,14 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -3871,7 +3914,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -3880,13 +3923,13 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -3987,6 +4030,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4015,6 +4059,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -4117,6 +4162,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4145,6 +4191,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -4247,6 +4294,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4275,6 +4323,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -4377,6 +4426,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4405,6 +4455,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -4507,6 +4558,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4535,6 +4587,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -4637,6 +4690,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4665,6 +4719,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -4767,6 +4822,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4795,6 +4851,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -4897,6 +4954,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -4925,6 +4983,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5027,6 +5086,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5055,6 +5115,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5157,6 +5218,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5185,6 +5247,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5287,6 +5350,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5315,6 +5379,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5417,6 +5482,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5445,6 +5511,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5547,6 +5614,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5575,6 +5643,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5677,6 +5746,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5705,6 +5775,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5807,6 +5878,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5835,6 +5907,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -5937,6 +6010,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -5965,6 +6039,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -6067,6 +6142,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -6095,6 +6171,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -6197,6 +6274,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -6225,6 +6303,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -6327,6 +6406,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -6355,6 +6435,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -6457,6 +6538,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -6485,6 +6567,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -6520,6 +6603,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
                 >
                   <span
                     class="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                   <span
@@ -6550,6 +6634,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowLeft"
               />
             </button>
@@ -6707,6 +6792,7 @@ exports[`TrustedAppsList renders correctly when loaded data 1`] = `
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowRight"
               />
             </a>
@@ -6755,7 +6841,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6764,7 +6850,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -6772,7 +6858,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6781,7 +6867,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -6789,7 +6875,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6798,7 +6884,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -6806,7 +6892,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6815,14 +6901,14 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -6831,7 +6917,7 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -6840,13 +6926,13 @@ exports[`TrustedAppsList renders correctly when loading data for the first time
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -6913,7 +6999,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6922,7 +7008,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -6930,7 +7016,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6939,7 +7025,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -6947,7 +7033,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6956,7 +7042,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -6964,7 +7050,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -6973,14 +7059,14 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -6989,7 +7075,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -6998,13 +7084,13 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -7105,6 +7191,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -7133,6 +7220,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -7235,6 +7323,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -7263,6 +7352,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -7365,6 +7455,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -7393,6 +7484,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -7495,6 +7587,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -7523,6 +7616,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -7625,6 +7719,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -7653,6 +7748,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -7755,6 +7851,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -7783,6 +7880,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -7885,6 +7983,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -7913,6 +8012,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8015,6 +8115,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8043,6 +8144,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8145,6 +8247,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8173,6 +8276,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8275,6 +8379,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8303,6 +8408,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8405,6 +8511,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8433,6 +8540,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8535,6 +8643,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8563,6 +8672,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8665,6 +8775,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8693,6 +8804,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8795,6 +8907,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8823,6 +8936,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -8925,6 +9039,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -8953,6 +9068,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -9055,6 +9171,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -9083,6 +9200,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -9185,6 +9303,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -9213,6 +9332,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -9315,6 +9435,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -9343,6 +9464,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -9445,6 +9567,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -9473,6 +9596,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -9575,6 +9699,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -9603,6 +9728,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -9638,6 +9764,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
                 >
                   <span
                     class="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                   <span
@@ -9668,6 +9795,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowLeft"
               />
             </button>
@@ -9825,6 +9953,7 @@ exports[`TrustedAppsList renders correctly when loading data for the second time
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowRight"
               />
             </a>
@@ -9873,7 +10002,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -9882,7 +10011,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -9890,7 +10019,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -9899,7 +10028,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                 >
                   OS
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -9907,7 +10036,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -9916,7 +10045,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                 >
                   Date Created
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -9924,7 +10053,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -9933,14 +10062,14 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                 >
                   Created By
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -9949,7 +10078,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                 >
                   Actions
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -9958,13 +10087,13 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               scope="col"
               style="width: 40px;"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -10065,6 +10194,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -10093,6 +10223,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -10195,6 +10326,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -10223,6 +10355,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -10325,6 +10458,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -10353,6 +10487,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -10455,6 +10590,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -10483,6 +10619,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -10585,6 +10722,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -10613,6 +10751,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -10715,6 +10854,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -10743,6 +10883,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -10845,6 +10986,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -10873,6 +11015,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -10975,6 +11118,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11003,6 +11147,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -11105,6 +11250,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11133,6 +11279,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -11235,6 +11382,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11263,6 +11411,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -11365,6 +11514,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11393,6 +11543,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -11495,6 +11646,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11523,6 +11675,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -11625,6 +11778,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11653,6 +11807,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -11755,6 +11910,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11783,6 +11939,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -11885,6 +12042,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -11913,6 +12071,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -12015,6 +12174,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -12043,6 +12203,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -12145,6 +12306,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -12173,6 +12335,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -12275,6 +12438,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -12303,6 +12467,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -12405,6 +12570,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -12433,6 +12599,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -12535,6 +12702,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                     <span
                       aria-hidden="true"
                       class="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="trash"
                     />
                   </button>
@@ -12563,6 +12731,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -12598,6 +12767,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
                 >
                   <span
                     class="euiButtonContent__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                   <span
@@ -12629,6 +12799,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowLeft"
               />
             </a>
@@ -12736,6 +12907,7 @@ exports[`TrustedAppsList renders correctly when new page and page size set (not
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowRight"
               />
             </a>
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
index 3f02d505daea1..691601b69e3cd 100644
--- 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
@@ -31,9 +31,9 @@ import {
 import { EndpointDocGenerator } from '../../../../../common/endpoint/generate_data';
 import { isFailedResourceState, isLoadedResourceState } from '../state';
 import { forceHTMLElementOffsetWidth } from './components/effected_policy_select/test_utils';
-import { resolvePathVariables } from '../service/utils';
 import { toUpdateTrustedApp } from '../../../../../common/endpoint/service/trusted_apps/to_update_trusted_app';
 import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
+import { resolvePathVariables } from '../../../../common/utils/resolve_path_variables';
 
 jest.mock('@elastic/eui/lib/services/accessibility/html_id_generator', () => ({
   htmlIdGenerator: () => () => 'mockId',
@@ -900,4 +900,34 @@ describe('When on the Trusted Apps Page', () => {
       });
     });
   });
+
+  describe('and the back button is present', () => {
+    let renderResult: ReturnType<AppContextTestRender['render']>;
+    beforeEach(async () => {
+      renderResult = render();
+      await act(async () => {
+        await waitForAction('trustedAppsListResourceStateChanged');
+      });
+      reactTestingLibrary.act(() => {
+        history.push('/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 not present', () => {
+      reactTestingLibrary.act(() => {
+        history.push('/trusted_apps');
+      });
+      expect(renderResult.queryByTestId('backToOrigin')).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
index 5603b8e2d61c9..4cd6ad62f3a35 100644
--- 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
@@ -7,11 +7,9 @@
 
 import React, { memo, useMemo } from 'react';
 import { useLocation } from 'react-router-dom';
-import styled from 'styled-components';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiButton,
-  EuiButtonEmpty,
   EuiEmptyPrompt,
   EuiFlexGroup,
   EuiFlexItem,
@@ -35,14 +33,14 @@ import { TrustedAppsGrid } from './components/trusted_apps_grid';
 import { TrustedAppsList } from './components/trusted_apps_list';
 import { TrustedAppDeletionDialog } from './trusted_app_deletion_dialog';
 import { TrustedAppsNotifications } from './trusted_apps_notifications';
-import { TrustedAppsListPageRouteState } from '../../../../../common/endpoint/types';
-import { useNavigateToAppEventHandler } from '../../../../common/hooks/endpoint/use_navigate_to_app_event_handler';
 import { ABOUT_TRUSTED_APPS, SEARCH_TRUSTED_APP_PLACEHOLDER } from './translations';
 import { EmptyState } from './components/empty_state';
 import { SearchBar } from '../../../components/search_bar';
+import { BackToExternalAppButton } from '../../../components/back_to_external_app_button';
+import { ListPageRouteState } from '../../../../../common/endpoint/types';
 
 export const TrustedAppsPage = memo(() => {
-  const { state: routeState } = useLocation<TrustedAppsListPageRouteState | undefined>();
+  const { state: routeState } = useLocation<ListPageRouteState | undefined>();
   const location = useTrustedAppsSelector(getCurrentLocation);
   const totalItemsCount = useTrustedAppsSelector(getListTotalItemsCount);
   const isCheckingIfEntriesExists = useTrustedAppsSelector(checkingIfEntriesExist);
@@ -161,43 +159,3 @@ export const TrustedAppsPage = memo(() => {
 });
 
 TrustedAppsPage.displayName = 'TrustedAppsPage';
-
-const EuiButtonEmptyStyled = styled(EuiButtonEmpty)`
-  margin-bottom: ${({ theme }) => theme.eui.euiSizeS};
-
-  .euiIcon {
-    width: ${({ theme }) => theme.eui.euiIconSizes.small};
-    height: ${({ theme }) => theme.eui.euiIconSizes.small};
-  }
-
-  .text {
-    font-size: ${({ theme }) => theme.eui.euiFontSizeXS};
-  }
-`;
-
-const BackToExternalAppButton = memo<TrustedAppsListPageRouteState>(
-  ({ backButtonLabel, backButtonUrl, onBackButtonNavigateTo }) => {
-    const handleBackOnClick = useNavigateToAppEventHandler(...onBackButtonNavigateTo!);
-
-    return (
-      <EuiButtonEmptyStyled
-        flush="left"
-        size="xs"
-        iconType="arrowLeft"
-        href={backButtonUrl!}
-        onClick={handleBackOnClick}
-        textProps={{ className: 'text' }}
-        data-test-subj="backToOrigin"
-      >
-        {backButtonLabel || (
-          <FormattedMessage
-            id="xpack.securitySolution.trustedapps.list.backButton"
-            defaultMessage="Back"
-          />
-        )}
-      </EuiButtonEmptyStyled>
-    );
-  }
-);
-
-BackToExternalAppButton.displayName = 'BackToExternalAppButton';
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 bf8cd416a3e39..25c7c87c6f5c9 100644
--- a/x-pack/plugins/security_solution/public/management/store/reducer.ts
+++ b/x-pack/plugins/security_solution/public/management/store/reducer.ts
@@ -19,14 +19,12 @@ import {
 import { ImmutableCombineReducers } from '../../common/store';
 import { Immutable } from '../../../common/endpoint/types';
 import { ManagementState } from '../types';
-import {
-  endpointListReducer,
-  initialEndpointListState,
-} from '../pages/endpoint_hosts/store/reducer';
+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';
 
 const immutableCombineReducers: ImmutableCombineReducers = combineReducers;
 
@@ -35,7 +33,7 @@ const immutableCombineReducers: ImmutableCombineReducers = combineReducers;
  */
 export const mockManagementState: Immutable<ManagementState> = {
   [MANAGEMENT_STORE_POLICY_DETAILS_NAMESPACE]: initialPolicyDetailsState(),
-  [MANAGEMENT_STORE_ENDPOINTS_NAMESPACE]: initialEndpointListState,
+  [MANAGEMENT_STORE_ENDPOINTS_NAMESPACE]: initialEndpointPageState(),
   [MANAGEMENT_STORE_TRUSTED_APPS_NAMESPACE]: initialTrustedAppsPageState(),
   [MANAGEMENT_STORE_EVENT_FILTERS_NAMESPACE]: initialEventFiltersPageState(),
 };
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 297746fd23632..b02e6513d9b43 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
@@ -70,7 +70,6 @@ export const createEmbeddable = async (
     filters,
     hidePanelTitles: true,
     query,
-    refreshConfig: { value: 0, pause: true },
     timeRange: {
       from: new Date(startDate).toISOString(),
       to: new Date(endDate).toISOString(),
diff --git a/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx
index c9ce204a52538..1501f56882290 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_top_countries_table/index.test.tsx
@@ -128,12 +128,8 @@ describe('NetworkTopCountries Table Component', () => {
         direction: 'asc',
         field: 'bytes_out',
       });
-      expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual(
-        'Bytes inClick to sort in ascending order'
-      );
-      expect(wrapper.find('.euiTable thead tr th button').at(1).text()).toEqual(
-        'Bytes outClick to sort in descending order'
-      );
+      expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual('Bytes in');
+      expect(wrapper.find('.euiTable thead tr th button').at(1).text()).toEqual('Bytes out');
       expect(wrapper.find('.euiTable thead tr th button').at(1).find('svg')).toBeTruthy();
     });
   });
diff --git a/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx
index a05277cd0513d..cd8c8c6543299 100644
--- a/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/network_top_n_flow_table/index.test.tsx
@@ -114,12 +114,8 @@ describe('NetworkTopNFlow Table Component', () => {
         direction: 'asc',
         field: 'bytes_out',
       });
-      expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual(
-        'Bytes inClick to sort in ascending order'
-      );
-      expect(wrapper.find('.euiTable thead tr th button').at(1).text()).toEqual(
-        'Bytes outClick to sort in descending order'
-      );
+      expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual('Bytes in');
+      expect(wrapper.find('.euiTable thead tr th button').at(1).text()).toEqual('Bytes out');
       expect(wrapper.find('.euiTable thead tr th button').at(1).find('svg')).toBeTruthy();
     });
   });
diff --git a/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
index 09b1afc5611b0..4b6c31f5b6176 100644
--- a/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/tls_table/index.test.tsx
@@ -90,7 +90,7 @@ describe('Tls Table Component', () => {
       });
 
       expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual(
-        'SHA1 fingerprintClick to sort in descending order'
+        'SHA1 fingerprint'
       );
     });
   });
diff --git a/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx b/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
index e551dbb640751..4b613e79a1d1a 100644
--- a/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
+++ b/x-pack/plugins/security_solution/public/network/components/users_table/index.test.tsx
@@ -92,9 +92,7 @@ describe('Users Table Component', () => {
         direction: 'desc',
         field: 'name',
       });
-      expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual(
-        'UserClick to sort in ascending order'
-      );
+      expect(wrapper.find('.euiTable thead tr th button').first().text()).toEqual('User');
     });
   });
 });
diff --git a/x-pack/plugins/security_solution/public/overview/components/recent_cases/index.tsx b/x-pack/plugins/security_solution/public/overview/components/recent_cases/index.tsx
index bcf9953d70d83..fc2e2e87ffc5f 100644
--- a/x-pack/plugins/security_solution/public/overview/components/recent_cases/index.tsx
+++ b/x-pack/plugins/security_solution/public/overview/components/recent_cases/index.tsx
@@ -58,6 +58,7 @@ const RecentCasesComponent = () => {
       },
     },
     maxCasesToShow: MAX_CASES_TO_SHOW,
+    owner: [APP_ID],
   });
 };
 
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 a4c6fe1e344b3..dd21b33afa5b4 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
@@ -15,7 +15,7 @@ import { APP_ID } from '../../../../../common/constants';
 import { timelineSelectors } from '../../../../timelines/store/timeline';
 import { setInsertTimeline, showTimeline } from '../../../store/timeline/actions';
 import { useDeepEqualSelector } from '../../../../common/hooks/use_selector';
-import { useGetUserSavedObjectPermissions, useKibana } from '../../../../common/lib/kibana';
+import { useGetUserCasesPermissions, useKibana } from '../../../../common/lib/kibana';
 import { TimelineStatus, TimelineId, TimelineType } from '../../../../../common/types/timeline';
 import {
   getCreateCaseUrl,
@@ -71,7 +71,7 @@ const AddToCaseButtonComponent: React.FC<Props> = ({ timelineId }) => {
   );
 
   const { formatUrl } = useFormatUrl(SecurityPageName.case);
-  const userPermissions = useGetUserSavedObjectPermissions();
+  const userPermissions = useGetUserCasesPermissions();
   const goToCreateCase = useCallback(
     (ev) => {
       ev.preventDefault();
@@ -177,6 +177,7 @@ const AddToCaseButtonComponent: React.FC<Props> = ({ timelineId }) => {
           },
           onRowClick,
           userCanCrud: userPermissions?.crud ?? false,
+          owner: [APP_ID],
         })}
     </>
   );
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
index a273ef1df9788..738d166fcb9a4 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.test.tsx
@@ -10,14 +10,20 @@ import React from 'react';
 import { TimelineDownloader } from './export_timeline';
 import { mockSelectedTimeline } from './mocks';
 import * as i18n from '../translations';
+import { downloadBlob } from '../../../../common/utils/download_blob';
 
 import { ReactWrapper, mount } from 'enzyme';
 import { waitFor } from '@testing-library/react';
 import { useParams } from 'react-router-dom';
 
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
+import { exportSelectedTimeline } from '../../../containers/api';
 
 jest.mock('../../../../common/hooks/use_app_toasts');
+jest.mock('../../../../common/utils/download_blob');
+jest.mock('../../../containers/api', () => ({
+  exportSelectedTimeline: jest.fn(),
+}));
 
 jest.mock('.', () => {
   return {
@@ -37,6 +43,7 @@ jest.mock('react-router-dom', () => {
 describe('TimelineDownloader', () => {
   const mockAddSuccess = jest.fn();
   (useAppToasts as jest.Mock).mockReturnValue({ addSuccess: mockAddSuccess });
+  (exportSelectedTimeline as jest.Mock).mockReturnValue(new Blob());
 
   let wrapper: ReactWrapper;
   const exportedIds = ['baa20980-6301-11ea-9223-95b6d4dd806c'];
@@ -56,14 +63,14 @@ describe('TimelineDownloader', () => {
     mockAddSuccess.mockClear();
   });
 
-  describe('should not render a downloader', () => {
-    test('Without exportedIds', () => {
+  describe('ExportTimeline', () => {
+    it('should not start download without exportedIds', () => {
       const testProps = {
         ...defaultTestProps,
         exportedIds: undefined,
       };
       wrapper = mount(<TimelineDownloader {...testProps} />);
-      expect(wrapper.find('[data-test-subj="export-timeline-downloader"]').exists()).toBeFalsy();
+      expect(downloadBlob).toHaveBeenCalledTimes(0);
     });
 
     test('With isEnableDownloader is false', () => {
@@ -72,18 +79,23 @@ describe('TimelineDownloader', () => {
         isEnableDownloader: false,
       };
       wrapper = mount(<TimelineDownloader {...testProps} />);
-      expect(wrapper.find('[data-test-subj="export-timeline-downloader"]').exists()).toBeFalsy();
+      expect(downloadBlob).toHaveBeenCalledTimes(0);
     });
   });
 
-  describe('should render a downloader', () => {
-    test('With selectedItems and exportedIds is given and isEnableDownloader is true', () => {
+  describe('should start download', () => {
+    test('With selectedItems and exportedIds is given and isEnableDownloader is true', async () => {
       const testProps = {
         ...defaultTestProps,
         selectedItems: mockSelectedTimeline,
       };
       wrapper = mount(<TimelineDownloader {...testProps} />);
-      expect(wrapper.find('[data-test-subj="export-timeline-downloader"]').exists()).toBeTruthy();
+
+      await waitFor(() => {
+        wrapper.update();
+
+        expect(downloadBlob).toHaveBeenCalledTimes(1);
+      });
     });
 
     test('With correct toast message on success for exported timelines', async () => {
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.tsx
index b8b1c76ffd6d7..10e6ea9ee085c 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/export_timeline.tsx
@@ -5,23 +5,20 @@
  * 2.0.
  */
 
-import React, { useCallback } from 'react';
+import React, { useCallback, useEffect } from 'react';
 import { useParams } from 'react-router-dom';
 
-import {
-  GenericDownloader,
-  ExportSelectedData,
-} from '../../../../common/components/generic_downloader';
 import * as i18n from '../translations';
 import { TimelineType } from '../../../../../common/types/timeline';
 import { useAppToasts } from '../../../../common/hooks/use_app_toasts';
+import { exportSelectedTimeline } from '../../../containers/api';
+import { downloadBlob } from '../../../../common/utils/download_blob';
 
 const ExportTimeline: React.FC<{
   exportedIds: string[] | undefined;
-  getExportedData: ExportSelectedData;
   isEnableDownloader: boolean;
   onComplete?: () => void;
-}> = ({ onComplete, isEnableDownloader, exportedIds, getExportedData }) => {
+}> = ({ onComplete, isEnableDownloader, exportedIds }) => {
   const { tabName: timelineType } = useParams<{ tabName: TimelineType }>();
   const { addSuccess } = useAppToasts();
 
@@ -47,20 +44,28 @@ const ExportTimeline: React.FC<{
     }
   }, [onComplete]);
 
-  return (
-    <>
-      {exportedIds != null && isEnableDownloader && (
-        <GenericDownloader
-          data-test-subj="export-timeline-downloader"
-          exportSelectedData={getExportedData}
-          filename={`${i18n.EXPORT_FILENAME}.ndjson`}
-          ids={exportedIds}
-          onExportSuccess={onExportSuccess}
-          onExportFailure={onExportFailure}
-        />
-      )}
-    </>
-  );
+  useEffect(() => {
+    const downloadTimeline = async () => {
+      if (exportedIds?.length && isEnableDownloader) {
+        const result = await exportSelectedTimeline({ ids: exportedIds });
+        if (result instanceof Blob) {
+          downloadBlob(result, `${i18n.EXPORT_FILENAME}.ndjson`);
+          onExportSuccess(exportedIds.length);
+        } else {
+          onExportFailure();
+        }
+      }
+    };
+
+    downloadTimeline();
+    // We probably don't need to have ExportTimeline in the form of a React component.
+    // See https://github.com/elastic/kibana/issues/101571 for more detail.
+    // But for now, it uses isEnableDownloader as a signal to start downloading.
+    // Other variables are excluded from the deps array to avoid false positives
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [exportedIds, isEnableDownloader]);
+
+  return null;
 };
 ExportTimeline.displayName = 'ExportTimeline';
 export const TimelineDownloader = React.memo(ExportTimeline);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx
index 250e7847edb5c..aa447c9e84f97 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/export_timeline/index.tsx
@@ -10,7 +10,6 @@ import { DeleteTimelines } from '../types';
 
 import { TimelineDownloader } from './export_timeline';
 import { DeleteTimelineModalOverlay } from '../delete_timeline_modal';
-import { exportSelectedTimeline } from '../../../containers/api';
 
 export interface ExportTimeline {
   disableExportTimelineDownloader: () => void;
@@ -37,7 +36,6 @@ export const EditTimelineActionsComponent: React.FC<{
     <TimelineDownloader
       data-test-subj="TimelineDownloader"
       exportedIds={ids}
-      getExportedData={exportSelectedTimeline}
       isEnableDownloader={isEnableDownloader}
       onComplete={onComplete}
     />
@@ -55,4 +53,3 @@ export const EditTimelineActionsComponent: React.FC<{
 );
 
 export const EditTimelineActions = React.memo(EditTimelineActionsComponent);
-export const EditOneTimelineAction = React.memo(EditTimelineActionsComponent);
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
index 5dbb3def9f577..922e40d6d860e 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/open_timeline.tsx
@@ -9,6 +9,7 @@ import { EuiPanel, EuiBasicTable } from '@elastic/eui';
 import React, { useCallback, useMemo, useRef } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 
+import styled from 'styled-components';
 import { TimelineType, TimelineStatus } from '../../../../common/types/timeline';
 import { ImportDataModal } from '../../../common/components/import_data_modal';
 import {
@@ -23,13 +24,18 @@ import { importTimelines } from '../../containers/api';
 
 import { useEditTimelineBatchActions } from './edit_timeline_batch_actions';
 import { useEditTimelineActions } from './edit_timeline_actions';
-import { EditOneTimelineAction } from './export_timeline';
+import { EditTimelineActions } from './export_timeline';
 import { SearchRow } from './search_row';
 import { TimelinesTable } from './timelines_table';
 import * as i18n from './translations';
 import { OPEN_TIMELINE_CLASS_NAME } from './helpers';
 import { OpenTimelineProps, OpenTimelineResult, ActionTimelineToShow } from './types';
 
+const QueryText = styled.span`
+  white-space: normal;
+  word-break: break-word;
+`;
+
 export const OpenTimeline = React.memo<OpenTimelineProps>(
   ({
     deleteTimelines,
@@ -86,9 +92,9 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
           values={{
             totalSearchResultsCount,
             with: (
-              <span data-test-subj="selectable-query-text">
+              <QueryText data-test-subj="selectable-query-text">
                 {query.trim().length ? `${i18n.WITH} "${query.trim()}"` : ''}
-              </span>
+              </QueryText>
             ),
           }}
         />
@@ -104,9 +110,9 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
           values={{
             totalSearchResultsCount,
             with: (
-              <span data-test-subj="selectable-query-text">
+              <QueryText data-test-subj="selectable-query-text">
                 {query.trim().length ? `${i18n.WITH} "${query.trim()}"` : ''}
-              </span>
+              </QueryText>
             ),
           }}
         />
@@ -164,7 +170,7 @@ export const OpenTimeline = React.memo<OpenTimelineProps>(
 
     return (
       <>
-        <EditOneTimelineAction
+        <EditTimelineActions
           deleteTimelines={deleteTimelines}
           ids={actionItemId}
           isDeleteTimelineModalOpen={isDeleteTimelineModalOpen}
diff --git a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
index 40af4514e26a3..ebb927259535b 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
+++ b/x-pack/plugins/security_solution/public/timelines/components/open_timeline/translations.ts
@@ -369,7 +369,7 @@ export const SUCCESSFULLY_IMPORTED_TIMELINES = (totalCount: number) =>
     {
       values: { totalCount },
       defaultMessage:
-        'Successfully imported {totalCount} {totalCount, plural, =1 {timeline} other {timelines}}',
+        'Successfully imported {totalCount} {totalCount, plural, =1 {item} other {items}}',
     }
   );
 
diff --git a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
index 50970304953ca..b74a3e1860b17 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
+++ b/x-pack/plugins/security_solution/public/timelines/components/side_panel/__snapshots__/index.test.tsx.snap
@@ -103,12 +103,14 @@ exports[`Details Panel Component DetailsPanel:EventDetails: rendering it should
                     <EuiIcon
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       size="m"
                       type="cross"
                     >
                       <span
                         aria-hidden="true"
                         className="euiButtonIcon__icon"
+                        color="inherit"
                         data-euiicon-type="cross"
                         size="m"
                       />
@@ -319,12 +321,14 @@ Array [
                   <EuiIcon
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     size="m"
                     type="cross"
                   >
                     <span
                       aria-hidden="true"
                       className="euiButtonIcon__icon"
+                      color="inherit"
                       data-euiicon-type="cross"
                       size="m"
                     />
@@ -589,12 +593,14 @@ Array [
                 <EuiIcon
                   aria-hidden="true"
                   className="euiButtonIcon__icon"
+                  color="inherit"
                   size="m"
                   type="cross"
                 >
                   <span
                     aria-hidden="true"
                     className="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="cross"
                     size="m"
                   />
@@ -842,12 +848,14 @@ Array [
           <EuiIcon
             aria-hidden="true"
             className="euiButtonIcon__icon"
+            color="inherit"
             size="m"
             type="cross"
           >
             <span
               aria-hidden="true"
               className="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="cross"
               size="m"
             />
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 341397da09e1d..76341055f28ef 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
@@ -31,7 +31,6 @@ import {
   UNISOLATE_HOST,
 } from '../../../../detections/components/host_isolation/translations';
 import { ALERT_DETAILS } from './translations';
-import { useIsExperimentalFeatureEnabled } from '../../../../common/hooks/use_experimental_features';
 import { useIsolationPrivileges } from '../../../../common/hooks/endpoint/use_isolate_privileges';
 
 const StyledEuiFlyoutBody = styled(EuiFlyoutBody)`
@@ -74,8 +73,6 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
     skip: !expandedEvent.eventId,
   });
 
-  const isHostIsolationEnabled = useIsExperimentalFeatureEnabled('hostIsolationEnabled');
-
   const [isHostIsolationPanelOpen, setIsHostIsolationPanel] = useState(false);
 
   const [isolateAction, setIsolateAction] = useState('isolateHost');
@@ -156,20 +153,17 @@ const EventDetailsPanelComponent: React.FC<EventDetailsPanelProps> = ({
           />
         )}
       </StyledEuiFlyoutBody>
-      {isIsolationAllowed &&
-        isHostIsolationEnabled &&
-        isEndpointAlert &&
-        isHostIsolationPanelOpen === false && (
-          <EuiFlyoutFooter>
-            <EuiFlexGroup justifyContent="flexEnd">
-              <EuiFlexItem grow={false}>
-                <TakeActionDropdown onChange={showHostIsolationPanel} agentId={agentId} />
-              </EuiFlexItem>
-            </EuiFlexGroup>
-            <EuiSpacer size="l" />
-            <EuiSpacer size="l" />
-          </EuiFlyoutFooter>
-        )}
+      {isIsolationAllowed && isEndpointAlert && isHostIsolationPanelOpen === false && (
+        <EuiFlyoutFooter>
+          <EuiFlexGroup justifyContent="flexEnd">
+            <EuiFlexItem grow={false}>
+              <TakeActionDropdown onChange={showHostIsolationPanel} agentId={agentId} />
+            </EuiFlexItem>
+          </EuiFlexGroup>
+          <EuiSpacer size="l" />
+          <EuiSpacer size="l" />
+        </EuiFlyoutFooter>
+      )}
     </>
   ) : (
     <>
diff --git a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
index abc750fd4b42a..77b776e3a801d 100644
--- a/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
+++ b/x-pack/plugins/security_solution/public/timelines/components/timeline/data_providers/add_data_provider_popover.tsx
@@ -201,7 +201,6 @@ const AddDataProviderPopoverComponent: React.FC<AddDataProviderPopoverProps> = (
       closePopover={handleClosePopover}
       anchorPosition="downLeft"
       panelPaddingSize="none"
-      ownFocus={true}
       repositionOnScroll
     >
       {content}
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 7c9de3bb231f0..296e4c85be88a 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
@@ -8,10 +8,17 @@
 import React from 'react';
 import { mount } from 'enzyme';
 
-import { NewTimeline, NewTimelineProps } from './helpers';
+import { AddToFavoritesButton, NewTimeline, NewTimelineProps } from './helpers';
 import { useCreateTimelineButton } from './use_create_timeline';
-
-jest.mock('../../../../common/hooks/use_selector');
+import { kibanaObservable, TestProviders } from '../../../../common/mock/test_providers';
+import { timelineActions } from '../../../../timelines/store/timeline';
+import { TimelineStatus, TimelineType } from '../../../../../common/types/timeline';
+import {
+  createSecuritySolutionStorageMock,
+  mockGlobalState,
+  SUB_PLUGINS_REDUCER,
+} from '../../../../common/mock';
+import { createStore } from '../../../../common/store';
 
 jest.mock('./use_create_timeline');
 
@@ -84,3 +91,143 @@ describe('NewTimeline', () => {
     });
   });
 });
+
+describe('Favorite Button', () => {
+  describe('Non Elastic prebuilt templates', () => {
+    test('should render favorite button', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <AddToFavoritesButton timelineId="test" />
+        </TestProviders>
+      );
+
+      expect(wrapper.find('[data-test-subj="timeline-favorite-empty-star"]').exists()).toBeTruthy();
+    });
+
+    test('Favorite button should be enabled ', () => {
+      const wrapper = mount(
+        <TestProviders>
+          <AddToFavoritesButton timelineId="test" />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find('[data-test-subj="timeline-favorite-empty-star"]').first().prop('disabled')
+      ).toEqual(false);
+    });
+
+    test('Should update isFavorite after clicking on favorite button', async () => {
+      const spy = jest.spyOn(timelineActions, 'updateIsFavorite');
+      const wrapper = mount(
+        <TestProviders>
+          <AddToFavoritesButton timelineId="test" />
+        </TestProviders>
+      );
+
+      wrapper.simulate('click');
+
+      expect(spy).toHaveBeenCalled();
+    });
+
+    test('should disable favorite button with filled star', () => {
+      const { storage } = createSecuritySolutionStorageMock();
+
+      const store = createStore(
+        {
+          ...mockGlobalState,
+          timeline: {
+            ...mockGlobalState.timeline,
+            timelineById: {
+              test: {
+                ...mockGlobalState.timeline.timelineById.test,
+                isFavorite: true,
+              },
+            },
+          },
+        },
+        SUB_PLUGINS_REDUCER,
+        kibanaObservable,
+        storage
+      );
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <AddToFavoritesButton timelineId="test" />
+        </TestProviders>
+      );
+
+      expect(
+        wrapper.find('[data-test-subj="timeline-favorite-filled-star"]').exists()
+      ).toBeTruthy();
+    });
+  });
+
+  describe('Elast prebuilt templates', () => {
+    test('should disable favorite button', () => {
+      const { storage } = createSecuritySolutionStorageMock();
+
+      const store = createStore(
+        {
+          ...mockGlobalState,
+          timeline: {
+            ...mockGlobalState.timeline,
+            timelineById: {
+              test: {
+                ...mockGlobalState.timeline.timelineById.test,
+                status: TimelineStatus.immutable,
+                timelineType: TimelineType.template,
+                templateTimelineId: 'mock-template-timeline-id',
+                templateTimelineVersion: 1,
+              },
+            },
+          },
+        },
+        SUB_PLUGINS_REDUCER,
+        kibanaObservable,
+        storage
+      );
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <AddToFavoritesButton timelineId="test" />
+        </TestProviders>
+      );
+      expect(
+        wrapper.find('[data-test-subj="timeline-favorite-empty-star"]').first().prop('disabled')
+      ).toEqual(true);
+    });
+  });
+
+  describe('Custom templates', () => {
+    test('should enable favorite button', () => {
+      const { storage } = createSecuritySolutionStorageMock();
+
+      const store = createStore(
+        {
+          ...mockGlobalState,
+          timeline: {
+            ...mockGlobalState.timeline,
+            timelineById: {
+              test: {
+                ...mockGlobalState.timeline.timelineById.test,
+                status: TimelineStatus.active,
+                timelineType: TimelineType.template,
+                templateTimelineId: 'mock-template-timeline-id',
+                templateTimelineVersion: 1,
+              },
+            },
+          },
+        },
+        SUB_PLUGINS_REDUCER,
+        kibanaObservable,
+        storage
+      );
+      const wrapper = mount(
+        <TestProviders store={store}>
+          <AddToFavoritesButton timelineId="test" />
+        </TestProviders>
+      );
+      expect(
+        wrapper.find('[data-test-subj="timeline-favorite-empty-star"]').first().prop('disabled')
+      ).toEqual(false);
+    });
+  });
+});
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 165de178768f2..5f5cab00fcbbe 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
@@ -10,7 +10,11 @@ import React, { useCallback, useMemo } from 'react';
 import styled from 'styled-components';
 import { useDispatch } from 'react-redux';
 
-import { TimelineTypeLiteral, TimelineType } from '../../../../../common/types/timeline';
+import {
+  TimelineTypeLiteral,
+  TimelineType,
+  TimelineStatus,
+} from '../../../../../common/types/timeline';
 import { timelineActions, timelineSelectors } from '../../../../timelines/store/timeline';
 import { useShallowEqualSelector } from '../../../../common/hooks/use_selector';
 
@@ -36,6 +40,12 @@ const AddToFavoritesButtonComponent: React.FC<AddToFavoritesButtonProps> = ({ ti
     (state) => (getTimeline(state, timelineId) ?? timelineDefaults).isFavorite
   );
 
+  const status = useShallowEqualSelector(
+    (state) => (getTimeline(state, timelineId) ?? timelineDefaults).status
+  );
+
+  const disableFavoriteButton = status === TimelineStatus.immutable;
+
   const handleClick = useCallback(
     () => dispatch(timelineActions.updateIsFavorite({ id: timelineId, isFavorite: !isFavorite })),
     [dispatch, timelineId, isFavorite]
@@ -48,6 +58,7 @@ const AddToFavoritesButtonComponent: React.FC<AddToFavoritesButtonProps> = ({ ti
       iconType={isFavorite ? 'starFilled' : 'starEmpty'}
       onClick={handleClick}
       data-test-subj={`timeline-favorite-${isFavorite ? 'filled' : 'empty'}-star`}
+      disabled={disableFavoriteButton}
     >
       {isFavorite ? i18n.REMOVE_FROM_FAVORITES : i18n.ADD_TO_FAVORITES}
     </EuiButton>
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 e591685a31829..171b3fedd0e64 100644
--- a/x-pack/plugins/security_solution/public/timelines/containers/api.ts
+++ b/x-pack/plugins/security_solution/public/timelines/containers/api.ts
@@ -39,9 +39,9 @@ import {
 } from '../../../common/constants';
 
 import { KibanaServices } from '../../common/lib/kibana';
-import { ExportSelectedData } from '../../common/components/generic_downloader';
 import { ToasterError } from '../../common/components/toasters';
 import {
+  ExportDocumentsProps,
   ImportDataProps,
   ImportDataResponse,
 } from '../../detections/containers/detection_engine/rules';
@@ -219,11 +219,11 @@ export const importTimelines = async ({
   });
 };
 
-export const exportSelectedTimeline: ExportSelectedData = ({
+export const exportSelectedTimeline = ({
   filename = `timelines_export.ndjson`,
   ids = [],
   signal,
-}): Promise<Blob | TimelineErrorResponse> => {
+}: ExportDocumentsProps): Promise<Blob | TimelineErrorResponse> => {
   let requestBody;
   try {
     requestBody = ids.length > 0 ? JSON.stringify({ ids }) : undefined;
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 2a64e533efad4..926b300a66796 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
@@ -45,7 +45,6 @@ import {
   ExperimentalFeatures,
   parseExperimentalConfigValue,
 } from '../../common/experimental_features';
-import { SecuritySolutionRequestHandlerContext } from '../types';
 
 export interface MetadataService {
   queryStrategy(
@@ -200,13 +199,10 @@ export class EndpointAppContextService {
     return this.license;
   }
 
-  public async getCasesClient(
-    req: KibanaRequest,
-    context: SecuritySolutionRequestHandlerContext
-  ): Promise<CasesClient> {
+  public async getCasesClient(req: KibanaRequest): Promise<CasesClient> {
     if (!this.cases) {
       throw new Error(`must call start on ${EndpointAppContextService.name} to call getter`);
     }
-    return this.cases.getCasesClientWithRequestAndContext(context, req);
+    return this.cases.getCasesClientWithRequest(req);
   }
 }
diff --git a/x-pack/plugins/security_solution/server/endpoint/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
index 060ae5a2b9d96..b2439efc63567 100644
--- a/x-pack/plugins/security_solution/server/endpoint/mocks.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/mocks.ts
@@ -88,7 +88,7 @@ export const createMockEndpointAppContextServiceStartContract = (): jest.Mocked<
     exceptionListsClient: listMock.getExceptionListClient(),
     packagePolicyService: createPackagePolicyServiceMock(),
     cases: {
-      getCasesClientWithRequestAndContext: jest.fn(),
+      getCasesClientWithRequest: jest.fn(),
     },
   };
 };
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.ts
new file mode 100644
index 0000000000000..487ee16558fec
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log.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 { ENDPOINT_ACTION_LOG_ROUTE } from '../../../../common/endpoint/constants';
+import { EndpointActionLogRequestSchema } from '../../../../common/endpoint/schema/actions';
+import { actionsLogRequestHandler } from './audit_log_handler';
+
+import { SecuritySolutionPluginRouter } from '../../../types';
+import { EndpointAppContext } from '../../types';
+
+/**
+ * Registers the endpoint activity_log route
+ */
+export function registerActionAuditLogRoutes(
+  router: SecuritySolutionPluginRouter,
+  endpointContext: EndpointAppContext
+) {
+  router.get(
+    {
+      path: ENDPOINT_ACTION_LOG_ROUTE,
+      validate: EndpointActionLogRequestSchema,
+      options: { authRequired: true, tags: ['access:securitySolution'] },
+    },
+    actionsLogRequestHandler(endpointContext)
+  );
+}
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
new file mode 100644
index 0000000000000..fdbb9608463e9
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/audit_log_handler.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { TypeOf } from '@kbn/config-schema';
+import { RequestHandler } from 'kibana/server';
+import { AGENT_ACTIONS_INDEX } from '../../../../../fleet/common';
+import { EndpointActionLogRequestSchema } from '../../../../common/endpoint/schema/actions';
+
+import { SecuritySolutionRequestHandlerContext } from '../../../types';
+import { EndpointAppContext } from '../../types';
+
+export const actionsLogRequestHandler = (
+  endpointContext: EndpointAppContext
+): RequestHandler<
+  TypeOf<typeof EndpointActionLogRequestSchema.params>,
+  unknown,
+  unknown,
+  SecuritySolutionRequestHandlerContext
+> => {
+  const logger = endpointContext.logFactory.get('audit_log');
+  return async (context, req, res) => {
+    const esClient = context.core.elasticsearch.client.asCurrentUser;
+    let result;
+    try {
+      result = await esClient.search({
+        index: AGENT_ACTIONS_INDEX,
+        body: {
+          query: {
+            match: {
+              agents: req.params.agent_id,
+            },
+          },
+          sort: [
+            {
+              '@timestamp': {
+                order: 'desc',
+              },
+            },
+          ],
+        },
+      });
+    } catch (error) {
+      logger.error(error);
+      throw error;
+    }
+    if (result?.statusCode !== 200) {
+      logger.error(`Error fetching actions log for agent_id ${req.params.agent_id}`);
+      throw new Error(`Error fetching actions log for agent_id ${req.params.agent_id}`);
+    }
+
+    return res.ok({
+      body: result.body.hits.hits.map((e) => e._source),
+    });
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/index.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/index.ts
index 9dec4fb2cbb79..3245369b56e40 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/actions/index.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/index.ts
@@ -5,4 +5,21 @@
  * 2.0.
  */
 
+import { SecuritySolutionPluginRouter } from '../../../types';
+import { EndpointAppContext } from '../../types';
+import { registerHostIsolationRoutes } from './isolation';
+import { registerActionStatusRoutes } from './status';
+import { registerActionAuditLogRoutes } from './audit_log';
+
 export * from './isolation';
+
+// wrap route registration
+
+export function registerActionRoutes(
+  router: SecuritySolutionPluginRouter,
+  endpointContext: EndpointAppContext
+) {
+  registerHostIsolationRoutes(router, endpointContext);
+  registerActionStatusRoutes(router, endpointContext);
+  registerActionAuditLogRoutes(router, endpointContext);
+}
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 ad41f1678fbf6..5ce27164dc878 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
@@ -94,7 +94,6 @@ describe('Host Isolation', () => {
         },
       ])
     );
-    endpointAppContextService.start({ ...startContract, packageService: mockPackageService });
     licenseEmitter = new Subject();
     licenseService = new LicenseService();
     licenseService.start(licenseEmitter);
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 6842041128465..8c1eb611cb5a1 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
@@ -20,6 +20,7 @@ import {
 } from '../../../types';
 import { getAgentIDsForEndpoints } from '../../services';
 import { EndpointAppContext } from '../../types';
+import { APP_ID } from '../../../../common/constants';
 import { userCanIsolate } from '../../../../common/endpoint/actions';
 
 /**
@@ -103,8 +104,9 @@ export const isolationRequestHandler = function (
     if (req.body.alert_ids && req.body.alert_ids.length > 0) {
       const newIDs: string[][] = await Promise.all(
         req.body.alert_ids.map(async (a: string) =>
-          (await endpointContext.service.getCasesClient(req, context)).getCaseIdsByAlertId({
-            alertId: a,
+          (await endpointContext.service.getCasesClient(req)).cases.getCaseIDsByAlertID({
+            alertID: a,
+            options: { owner: APP_ID },
           })
         )
       );
@@ -117,7 +119,7 @@ export const isolationRequestHandler = function (
     const actionID = uuid.v4();
     let result;
     try {
-      result = await esClient.index({
+      result = await esClient.index<EndpointAction>({
         index: AGENT_ACTIONS_INDEX,
         body: {
           action_id: actionID,
@@ -126,12 +128,12 @@ export const isolationRequestHandler = function (
           type: 'INPUT_ACTION',
           input_type: 'endpoint',
           agents: agentIDs,
-          user_id: user?.username,
+          user_id: user!.username,
           data: {
             command: isolate ? 'isolate' : 'unisolate',
-            comment: req.body.comment,
+            comment: req.body.comment ?? undefined,
           },
-        } as EndpointAction,
+        },
       });
     } catch (e) {
       return res.customError({
@@ -162,11 +164,12 @@ export const isolationRequestHandler = function (
     }
 
     caseIDs.forEach(async (caseId) => {
-      (await endpointContext.service.getCasesClient(req, context)).addComment({
+      (await endpointContext.service.getCasesClient(req)).attachments.add({
         caseId,
         comment: {
           comment: commentLines.join('\n'),
           type: CommentType.user,
+          owner: APP_ID,
         },
       });
     });
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/actions/mocks.ts b/x-pack/plugins/security_solution/server/endpoint/routes/actions/mocks.ts
new file mode 100644
index 0000000000000..34f7d140a78de
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/mocks.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable max-classes-per-file */
+/* eslint-disable @typescript-eslint/no-useless-constructor */
+
+import { ApiResponse } from '@elastic/elasticsearch';
+import moment from 'moment';
+import uuid from 'uuid';
+import {
+  EndpointAction,
+  EndpointActionResponse,
+  ISOLATION_ACTIONS,
+} from '../../../../common/endpoint/types';
+
+export const mockSearchResult = (results: any = []): ApiResponse<any> => {
+  return {
+    body: {
+      hits: {
+        hits: results.map((a: any) => ({
+          _source: a,
+        })),
+      },
+    },
+    statusCode: 200,
+    headers: {},
+    warnings: [],
+    meta: {} as any,
+  };
+};
+
+export class MockAction {
+  private actionID: string = uuid.v4();
+  private ts: moment.Moment = moment();
+  private user: string = '';
+  private agents: string[] = [];
+  private command: ISOLATION_ACTIONS = 'isolate';
+  private comment?: string;
+
+  constructor() {}
+
+  public build(): EndpointAction {
+    return {
+      action_id: this.actionID,
+      '@timestamp': this.ts.toISOString(),
+      expiration: this.ts.add(2, 'weeks').toISOString(),
+      type: 'INPUT_ACTION',
+      input_type: 'endpoint',
+      agents: this.agents,
+      user_id: this.user,
+      data: {
+        command: this.command,
+        comment: this.comment,
+      },
+    };
+  }
+
+  public fromUser(u: string) {
+    this.user = u;
+    return this;
+  }
+  public withAgents(a: string[]) {
+    this.agents = a;
+    return this;
+  }
+  public withAgent(a: string) {
+    this.agents = [a];
+    return this;
+  }
+  public withComment(c: string) {
+    this.comment = c;
+    return this;
+  }
+  public withAction(a: ISOLATION_ACTIONS) {
+    this.command = a;
+    return this;
+  }
+  public atTime(m: moment.Moment | Date) {
+    if (m instanceof Date) {
+      this.ts = moment(m);
+    } else {
+      this.ts = m;
+    }
+    return this;
+  }
+  public withID(id: string) {
+    this.actionID = id;
+    return this;
+  }
+}
+
+export const aMockAction = (): MockAction => {
+  return new MockAction();
+};
+
+export class MockResponse {
+  private actionID: string = uuid.v4();
+  private ts: moment.Moment = moment();
+  private started: moment.Moment = moment();
+  private completed: moment.Moment = moment();
+  private agent: string = '';
+  private command: ISOLATION_ACTIONS = 'isolate';
+  private comment?: string;
+  private error?: string;
+
+  constructor() {}
+
+  public build(): EndpointActionResponse {
+    return {
+      '@timestamp': this.ts.toISOString(),
+      action_id: this.actionID,
+      agent_id: this.agent,
+      started_at: this.started.toISOString(),
+      completed_at: this.completed.toISOString(),
+      error: this.error,
+      action_data: {
+        command: this.command,
+        comment: this.comment,
+      },
+    };
+  }
+
+  public forAction(id: string) {
+    this.actionID = id;
+    return this;
+  }
+  public forAgent(id: string) {
+    this.agent = id;
+    return this;
+  }
+}
+
+export const aMockResponse = (actionID: string, agentID: string): MockResponse => {
+  return new MockResponse().forAction(actionID).forAgent(agentID);
+};
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
new file mode 100644
index 0000000000000..62e138ead7f81
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.test.ts
@@ -0,0 +1,276 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 @typescript-eslint/no-explicit-any */
+
+import { KibanaResponseFactory, RequestHandler, RouteConfig } from 'kibana/server';
+import {
+  elasticsearchServiceMock,
+  httpServerMock,
+  httpServiceMock,
+  loggingSystemMock,
+  savedObjectsClientMock,
+} from 'src/core/server/mocks';
+import { ActionStatusRequestSchema } from '../../../../common/endpoint/schema/actions';
+import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
+import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
+import { createMockConfig } from '../../../lib/detection_engine/routes/__mocks__';
+import { EndpointAppContextService } from '../../endpoint_app_context_services';
+import {
+  createMockEndpointAppContextServiceStartContract,
+  createRouteHandlerContext,
+} from '../../mocks';
+import { registerActionStatusRoutes } from './status';
+import uuid from 'uuid';
+import { aMockAction, aMockResponse, MockAction, mockSearchResult, MockResponse } from './mocks';
+
+describe('Endpoint Action Status', () => {
+  describe('schema', () => {
+    it('should require at least 1 agent ID', () => {
+      expect(() => {
+        ActionStatusRequestSchema.query.validate({}); // no agent_ids provided
+      }).toThrow();
+    });
+
+    it('should accept a single agent ID', () => {
+      expect(() => {
+        ActionStatusRequestSchema.query.validate({ agent_ids: uuid.v4() });
+      }).not.toThrow();
+    });
+
+    it('should accept multiple agent IDs', () => {
+      expect(() => {
+        ActionStatusRequestSchema.query.validate({ agent_ids: [uuid.v4(), uuid.v4()] });
+      }).not.toThrow();
+    });
+    it('should limit the maximum number of agent IDs', () => {
+      const tooManyCooks = new Array(200).fill(uuid.v4()); // all the same ID string
+      expect(() => {
+        ActionStatusRequestSchema.query.validate({ agent_ids: tooManyCooks });
+      }).toThrow();
+    });
+  });
+
+  describe('response', () => {
+    let endpointAppContextService: EndpointAppContextService;
+
+    // convenience for calling the route and handler for action status
+    let getPendingStatus: (reqParams?: any) => Promise<jest.Mocked<KibanaResponseFactory>>;
+    // convenience for injecting mock responses for actions index and responses
+    let havingActionsAndResponses: (actions: MockAction[], responses: any[]) => void;
+
+    beforeEach(() => {
+      const esClientMock = elasticsearchServiceMock.createScopedClusterClient();
+      const routerMock = httpServiceMock.createRouter();
+      endpointAppContextService = new EndpointAppContextService();
+      endpointAppContextService.start(createMockEndpointAppContextServiceStartContract());
+
+      registerActionStatusRoutes(routerMock, {
+        logFactory: loggingSystemMock.create(),
+        service: endpointAppContextService,
+        config: () => Promise.resolve(createMockConfig()),
+        experimentalFeatures: parseExperimentalConfigValue(createMockConfig().enableExperimental),
+      });
+
+      getPendingStatus = async (reqParams?: any): Promise<jest.Mocked<KibanaResponseFactory>> => {
+        const req = httpServerMock.createKibanaRequest(reqParams);
+        const mockResponse = httpServerMock.createResponseFactory();
+        const [, routeHandler]: [
+          RouteConfig<any, any, any, any>,
+          RequestHandler<any, any, any, any>
+        ] = routerMock.get.mock.calls.find(([{ path }]) => path.startsWith(ACTION_STATUS_ROUTE))!;
+        await routeHandler(
+          createRouteHandlerContext(esClientMock, savedObjectsClientMock.create()),
+          req,
+          mockResponse
+        );
+
+        return mockResponse;
+      };
+
+      havingActionsAndResponses = (actions: MockAction[], responses: MockResponse[]) => {
+        esClientMock.asCurrentUser.search = jest
+          .fn()
+          .mockImplementationOnce(() =>
+            Promise.resolve(mockSearchResult(actions.map((a) => a.build())))
+          )
+          .mockImplementationOnce(() =>
+            Promise.resolve(mockSearchResult(responses.map((r) => r.build())))
+          );
+      };
+    });
+
+    afterEach(() => {
+      endpointAppContextService.stop();
+    });
+
+    it('should include agent IDs in the output, even if they have no actions', async () => {
+      const mockID = 'XYZABC-000';
+      havingActionsAndResponses([], []);
+      const response = await getPendingStatus({
+        query: {
+          agent_ids: [mockID],
+        },
+      });
+      expect(response.ok).toBeCalled();
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toHaveLength(1);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].agent_id).toEqual(mockID);
+    });
+
+    it('should respond with a valid pending action', async () => {
+      const mockID = 'XYZABC-000';
+      havingActionsAndResponses([aMockAction().withAgent(mockID)], []);
+      const response = await getPendingStatus({
+        query: {
+          agent_ids: [mockID],
+        },
+      });
+      expect(response.ok).toBeCalled();
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toHaveLength(1);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].agent_id).toEqual(mockID);
+    });
+    it('should include a total count of a pending action', async () => {
+      const mockID = 'XYZABC-000';
+      havingActionsAndResponses(
+        [
+          aMockAction().withAgent(mockID).withAction('isolate'),
+          aMockAction().withAgent(mockID).withAction('isolate'),
+        ],
+        []
+      );
+      const response = await getPendingStatus({
+        query: {
+          agent_ids: [mockID],
+        },
+      });
+      expect(response.ok).toBeCalled();
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toHaveLength(1);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].agent_id).toEqual(mockID);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].pending_actions.isolate).toEqual(
+        2
+      );
+    });
+    it('should show multiple pending actions, and their counts', async () => {
+      const mockID = 'XYZABC-000';
+      havingActionsAndResponses(
+        [
+          aMockAction().withAgent(mockID).withAction('isolate'),
+          aMockAction().withAgent(mockID).withAction('isolate'),
+          aMockAction().withAgent(mockID).withAction('isolate'),
+          aMockAction().withAgent(mockID).withAction('unisolate'),
+          aMockAction().withAgent(mockID).withAction('unisolate'),
+        ],
+        []
+      );
+      const response = await getPendingStatus({
+        query: {
+          agent_ids: [mockID],
+        },
+      });
+      expect(response.ok).toBeCalled();
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toHaveLength(1);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].agent_id).toEqual(mockID);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].pending_actions.isolate).toEqual(
+        3
+      );
+      expect(
+        (response.ok.mock.calls[0][0]?.body as any)?.data[0].pending_actions.unisolate
+      ).toEqual(2);
+    });
+    it('should calculate correct pending counts from grouped/bulked actions', async () => {
+      const mockID = 'XYZABC-000';
+      havingActionsAndResponses(
+        [
+          aMockAction()
+            .withAgents([mockID, 'IRRELEVANT-OTHER-AGENT', 'ANOTHER-POSSIBLE-AGENT'])
+            .withAction('isolate'),
+          aMockAction().withAgents([mockID, 'YET-ANOTHER-AGENT-ID']).withAction('isolate'),
+          aMockAction().withAgents(['YET-ANOTHER-AGENT-ID']).withAction('isolate'), // one WITHOUT our agent-under-test
+        ],
+        []
+      );
+      const response = await getPendingStatus({
+        query: {
+          agent_ids: [mockID],
+        },
+      });
+      expect(response.ok).toBeCalled();
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toHaveLength(1);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].agent_id).toEqual(mockID);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].pending_actions.isolate).toEqual(
+        2
+      );
+    });
+
+    it('should exclude actions that have responses from the pending count', async () => {
+      const mockAgentID = 'XYZABC-000';
+      const actionID = 'some-known-actionid';
+      havingActionsAndResponses(
+        [
+          aMockAction().withAgent(mockAgentID).withAction('isolate'),
+          aMockAction().withAgent(mockAgentID).withAction('isolate').withID(actionID),
+        ],
+        [aMockResponse(actionID, mockAgentID)]
+      );
+      const response = await getPendingStatus({
+        query: {
+          agent_ids: [mockAgentID],
+        },
+      });
+      expect(response.ok).toBeCalled();
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toHaveLength(1);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].agent_id).toEqual(mockAgentID);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data[0].pending_actions.isolate).toEqual(
+        1
+      );
+    });
+
+    it('should have accurate counts for multiple agents, bulk actions, and responses', async () => {
+      const agentOne = 'XYZABC-000';
+      const agentTwo = 'DEADBEEF';
+      const agentThree = 'IDIDIDID';
+
+      const actionTwoID = 'ID-TWO';
+      havingActionsAndResponses(
+        [
+          aMockAction().withAgents([agentOne, agentTwo, agentThree]).withAction('isolate'),
+          aMockAction()
+            .withAgents([agentTwo, agentThree])
+            .withAction('isolate')
+            .withID(actionTwoID),
+          aMockAction().withAgents([agentThree]).withAction('isolate'),
+        ],
+        [aMockResponse(actionTwoID, agentThree)]
+      );
+      const response = await getPendingStatus({
+        query: {
+          agent_ids: [agentOne, agentTwo, agentThree],
+        },
+      });
+      expect(response.ok).toBeCalled();
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toHaveLength(3);
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toContainEqual({
+        agent_id: agentOne,
+        pending_actions: {
+          isolate: 1,
+        },
+      });
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toContainEqual({
+        agent_id: agentTwo,
+        pending_actions: {
+          isolate: 2,
+        },
+      });
+      expect((response.ok.mock.calls[0][0]?.body as any)?.data).toContainEqual({
+        agent_id: agentThree,
+        pending_actions: {
+          isolate: 2, // present in all three actions, but second one has a response, therefore not pending
+        },
+      });
+    });
+  });
+});
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
new file mode 100644
index 0000000000000..faaf41962a96c
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/actions/status.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { RequestHandler } from 'kibana/server';
+import { TypeOf } from '@kbn/config-schema';
+import {
+  EndpointAction,
+  EndpointActionResponse,
+  PendingActionsResponse,
+} from '../../../../common/endpoint/types';
+import { AGENT_ACTIONS_INDEX } from '../../../../../fleet/common';
+import { ActionStatusRequestSchema } from '../../../../common/endpoint/schema/actions';
+import { ACTION_STATUS_ROUTE } from '../../../../common/endpoint/constants';
+import {
+  SecuritySolutionPluginRouter,
+  SecuritySolutionRequestHandlerContext,
+} from '../../../types';
+import { EndpointAppContext } from '../../types';
+
+/**
+ * Registers routes for checking status of endpoints based on pending actions
+ */
+export function registerActionStatusRoutes(
+  router: SecuritySolutionPluginRouter,
+  endpointContext: EndpointAppContext
+) {
+  router.get(
+    {
+      path: ACTION_STATUS_ROUTE,
+      validate: ActionStatusRequestSchema,
+      options: { authRequired: true, tags: ['access:securitySolution'] },
+    },
+    actionStatusRequestHandler(endpointContext)
+  );
+}
+
+export const actionStatusRequestHandler = function (
+  endpointContext: EndpointAppContext
+): RequestHandler<
+  unknown,
+  TypeOf<typeof ActionStatusRequestSchema.query>,
+  unknown,
+  SecuritySolutionRequestHandlerContext
+> {
+  return async (context, req, res) => {
+    const esClient = context.core.elasticsearch.client.asCurrentUser;
+    const agentIDs: string[] = Array.isArray(req.query.agent_ids)
+      ? [...new Set(req.query.agent_ids)]
+      : [req.query.agent_ids];
+
+    // retrieve the unexpired actions for the given hosts
+    const recentActionResults = await esClient.search<EndpointAction>(
+      {
+        index: AGENT_ACTIONS_INDEX,
+        body: {
+          query: {
+            bool: {
+              filter: [
+                { term: { type: 'INPUT_ACTION' } }, // actions that are directed at agent children
+                { term: { input_type: 'endpoint' } }, // filter for agent->endpoint actions
+                { range: { expiration: { gte: 'now' } } }, // that have not expired yet
+                { terms: { agents: agentIDs } }, // for the requested agent IDs
+              ],
+            },
+          },
+        },
+      },
+      {
+        ignore: [404],
+      }
+    );
+    const pendingActions =
+      recentActionResults.body?.hits?.hits?.map((a): EndpointAction => a._source!) || [];
+
+    // retrieve any responses to those action IDs from these agents
+    const actionIDs = pendingActions.map((a) => a.action_id);
+    const responseResults = await esClient.search<EndpointActionResponse>(
+      {
+        index: '.fleet-actions-results',
+        body: {
+          query: {
+            bool: {
+              filter: [
+                { terms: { action_id: actionIDs } }, // get results for these actions
+                { terms: { agent_id: agentIDs } }, // ignoring responses from agents we're not looking for
+              ],
+            },
+          },
+        },
+      },
+      {
+        ignore: [404],
+      }
+    );
+    const actionResponses = responseResults.body?.hits?.hits?.map((a) => a._source!) || [];
+
+    // respond with action-count per agent
+    const response = agentIDs.map((aid) => {
+      const responseIDsFromAgent = actionResponses
+        .filter((r) => r.agent_id === aid)
+        .map((r) => r.action_id);
+      return {
+        agent_id: aid,
+        pending_actions: pendingActions
+          .filter((a) => a.agents.includes(aid) && !responseIDsFromAgent.includes(a.action_id))
+          .map((a) => a.data.command)
+          .reduce((acc, cur) => {
+            if (cur in acc) {
+              acc[cur] += 1;
+            } else {
+              acc[cur] = 1;
+            }
+            return acc;
+          }, {} as PendingActionsResponse['pending_actions']),
+      } as PendingActionsResponse;
+    });
+
+    return res.ok({
+      body: {
+        data: response,
+      },
+    });
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/index.ts b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/index.ts
index 44db86f85cf5f..b4784c1ff5ed4 100644
--- a/x-pack/plugins/security_solution/server/endpoint/routes/metadata/index.ts
+++ b/x-pack/plugins/security_solution/server/endpoint/routes/metadata/index.ts
@@ -11,12 +11,14 @@ import { HostStatus, MetadataQueryStrategyVersions } from '../../../../common/en
 import { EndpointAppContext } from '../../types';
 import { getLogger, getMetadataListRequestHandler, getMetadataRequestHandler } from './handlers';
 import type { SecuritySolutionPluginRouter } from '../../../types';
+import {
+  BASE_ENDPOINT_ROUTE,
+  HOST_METADATA_GET_ROUTE,
+  HOST_METADATA_LIST_ROUTE,
+} from '../../../../common/endpoint/constants';
 
-export const BASE_ENDPOINT_ROUTE = '/api/endpoint';
 export const METADATA_REQUEST_V1_ROUTE = `${BASE_ENDPOINT_ROUTE}/v1/metadata`;
 export const GET_METADATA_REQUEST_V1_ROUTE = `${METADATA_REQUEST_V1_ROUTE}/{id}`;
-export const METADATA_REQUEST_ROUTE = `${BASE_ENDPOINT_ROUTE}/metadata`;
-export const GET_METADATA_REQUEST_ROUTE = `${METADATA_REQUEST_ROUTE}/{id}`;
 
 /* Filters that can be applied to the endpoint fetch route */
 export const endpointFilters = schema.object({
@@ -82,7 +84,7 @@ export function registerEndpointRoutes(
 
   router.post(
     {
-      path: `${METADATA_REQUEST_ROUTE}`,
+      path: `${HOST_METADATA_LIST_ROUTE}`,
       validate: GetMetadataListRequestSchema,
       options: { authRequired: true, tags: ['access:securitySolution'] },
     },
@@ -100,7 +102,7 @@ export function registerEndpointRoutes(
 
   router.get(
     {
-      path: `${GET_METADATA_REQUEST_ROUTE}`,
+      path: `${HOST_METADATA_GET_ROUTE}`,
       validate: GetMetadataRequestSchema,
       options: { authRequired: true, tags: ['access:securitySolution'] },
     },
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 b916ec19da17f..e6d6879ba1845 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
@@ -26,7 +26,7 @@ import {
   MetadataQueryStrategyVersions,
 } from '../../../../common/endpoint/types';
 import { parseExperimentalConfigValue } from '../../../../common/experimental_features';
-import { registerEndpointRoutes, METADATA_REQUEST_ROUTE } from './index';
+import { registerEndpointRoutes } from './index';
 import {
   createMockEndpointAppContextServiceStartContract,
   createMockPackageService,
@@ -45,7 +45,10 @@ import {
 } from '../../../../../fleet/common/types/models';
 import { createV1SearchResponse, createV2SearchResponse } from './support/test_support';
 import { PackageService } from '../../../../../fleet/server/services';
-import { metadataTransformPrefix } from '../../../../common/endpoint/constants';
+import {
+  HOST_METADATA_LIST_ROUTE,
+  metadataTransformPrefix,
+} from '../../../../common/endpoint/constants';
 import type { SecuritySolutionPluginRouter } from '../../../types';
 import { PackagePolicyServiceInterface } from '../../../../../fleet/server';
 import {
@@ -126,7 +129,7 @@ describe('test endpoint route', () => {
         Promise.resolve({ body: response })
       );
       [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
-        path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+        path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
       )!;
       mockAgentService.getAgentStatusById = jest.fn().mockReturnValue('error');
       mockAgentService.listAgents = jest.fn().mockReturnValue(noUnenrolledAgent);
@@ -167,7 +170,7 @@ describe('test endpoint route', () => {
       );
 
       [routeConfig, routeHandler] = routerMock.get.mock.calls.find(([{ path }]) =>
-        path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+        path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
       )!;
 
       await routeHandler(
@@ -225,7 +228,7 @@ describe('test endpoint route', () => {
         Promise.resolve({ body: response })
       );
       [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
-        path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+        path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
       )!;
       mockAgentService.getAgentStatusById = jest.fn().mockReturnValue('error');
       mockAgentService.listAgents = jest.fn().mockReturnValue(noUnenrolledAgent);
@@ -273,7 +276,7 @@ describe('test endpoint route', () => {
         })
       );
       [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
-        path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+        path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
       )!;
 
       await routeHandler(
@@ -332,7 +335,7 @@ describe('test endpoint route', () => {
         })
       );
       [routeConfig, routeHandler] = routerMock.post.mock.calls.find(([{ path }]) =>
-        path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+        path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
       )!;
 
       await routeHandler(
@@ -416,7 +419,7 @@ describe('test endpoint route', () => {
         } as unknown) as Agent);
 
         [routeConfig, routeHandler] = routerMock.get.mock.calls.find(([{ path }]) =>
-          path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+          path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
         )!;
         await routeHandler(
           createRouteHandlerContext(mockScopedClient, mockSavedObjectClient),
@@ -449,7 +452,7 @@ describe('test endpoint route', () => {
         );
 
         [routeConfig, routeHandler] = routerMock.get.mock.calls.find(([{ path }]) =>
-          path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+          path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
         )!;
 
         await routeHandler(
@@ -490,7 +493,7 @@ describe('test endpoint route', () => {
         );
 
         [routeConfig, routeHandler] = routerMock.get.mock.calls.find(([{ path }]) =>
-          path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+          path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
         )!;
 
         await routeHandler(
@@ -525,7 +528,7 @@ describe('test endpoint route', () => {
         );
 
         [routeConfig, routeHandler] = routerMock.get.mock.calls.find(([{ path }]) =>
-          path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+          path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
         )!;
 
         await routeHandler(
@@ -558,7 +561,7 @@ describe('test endpoint route', () => {
         } as unknown) as Agent);
 
         [routeConfig, routeHandler] = routerMock.get.mock.calls.find(([{ path }]) =>
-          path.startsWith(`${METADATA_REQUEST_ROUTE}`)
+          path.startsWith(`${HOST_METADATA_LIST_ROUTE}`)
         )!;
 
         await routeHandler(
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 51e3495938606..f0950e5fb79ba 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { SearchRequest, SortContainer } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { KibanaRequest } from '../../../../../../../src/core/server';
 import { esKuery } from '../../../../../../../src/plugins/data/server';
 import { EndpointAppContext, MetadataQueryStrategy } from '../../types';
@@ -20,7 +20,7 @@ export interface QueryBuilderOptions {
 // using unmapped_type avoids errors when the given field doesn't exist, and sets to the 0-value for that type
 // effectively ignoring it
 // https://www.elastic.co/guide/en/elasticsearch/reference/current/sort-search-results.html#_ignoring_unmapped_fields
-const MetadataSortMethod: SortContainer[] = [
+const MetadataSortMethod: estypes.SearchSortContainer[] = [
   {
     'event.created': {
       order: 'desc',
@@ -147,7 +147,7 @@ function buildQueryBody(
 export function getESQueryHostMetadataByID(
   agentID: string,
   metadataQueryStrategy: MetadataQueryStrategy
-): SearchRequest {
+): estypes.SearchRequest {
   return {
     body: {
       query: {
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 8e99cb32390e1..32b3ccbf17b57 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
@@ -43,9 +43,9 @@ describe('getIndexVersionsByIndex', () => {
   });
 
   it('properly transforms the response', async () => {
+    // @ts-expect-error mocking only what we need
     esClient.indices.getMapping.mockResolvedValue({
       body: {
-        // @ts-expect-error mocking only what we need
         index1: { mappings: { _meta: { version: 3 } } },
       },
     });
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 9c40778d46704..00446a204ca89 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
@@ -86,7 +86,7 @@ export const applyMigrationCleanupPolicy = async ({
   await esClient.indices.putSettings({
     index,
     body: {
-      index: {
+      settings: {
         lifecycle: {
           name: getMigrationCleanupPolicyName(alias),
         },
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts
index 3911dcabc34de..04bfa78f883f0 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/reference_rules/query.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { schema } from '@kbn/config-schema';
 import { Logger } from '@kbn/logging';
 import { ESSearchRequest } from 'typings/elasticsearch';
@@ -60,7 +60,7 @@ export const createQueryAlertType = (ruleDataClient: RuleDataClient, logger: Log
           indexPattern,
           { query: customQuery, language: 'kuery' },
           []
-        ) as QueryContainer;
+        ) as estypes.QueryDslQueryContainer;
         const query: ESSearchRequest = {
           body: {
             query: esQuery,
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 857762dec45e9..3942d1637fedd 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
@@ -18,6 +18,7 @@ import {
   DETECTION_ENGINE_PREPACKAGED_URL,
   DETECTION_ENGINE_SIGNALS_FINALIZE_MIGRATION_URL,
   DETECTION_ENGINE_SIGNALS_MIGRATION_STATUS_URL,
+  DETECTION_ENGINE_RULES_BULK_ACTION,
 } from '../../../../../common/constants';
 import { ShardsResponse } from '../../../types';
 import {
@@ -36,6 +37,7 @@ import { getSignalsMigrationStatusSchemaMock } from '../../../../../common/detec
 import { RuleParams } from '../../schemas/rule_schemas';
 import { Alert } from '../../../../../../alerting/common';
 import { getQueryRuleParams } from '../../schemas/rule_schemas.mock';
+import { getPerformBulkActionSchemaMock } from '../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema.mock';
 
 export const typicalSetStatusSignalByIdsPayload = (): SetSignalsStatusSchemaDecoded => ({
   signal_ids: ['somefakeid1', 'somefakeid2'],
@@ -107,6 +109,13 @@ export const getPatchBulkRequest = () =>
     body: [getCreateRulesSchemaMock()],
   });
 
+export const getBulkActionRequest = () =>
+  requestMock.create({
+    method: 'patch',
+    path: DETECTION_ENGINE_RULES_BULK_ACTION,
+    body: getPerformBulkActionSchemaMock(),
+  });
+
 export const getDeleteBulkRequest = () =>
   requestMock.create({
     method: 'delete',
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 1e7ba976d6915..3068521682f8f 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
@@ -23,9 +23,8 @@ import { getIdBulkError } from './utils';
 import { transformValidateBulkError } from './validate';
 import { transformBulkError, buildSiemResponse, createBulkErrorObject } from '../utils';
 import { deleteRules } from '../../rules/delete_rules';
-import { deleteNotifications } from '../../notifications/delete_notifications';
-import { deleteRuleActionsSavedObject } from '../../rule_actions/delete_rule_actions_saved_object';
 import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client';
+import { readRules } from '../../rules/read_rules';
 
 type Config = RouteConfig<unknown, unknown, QueryRulesBulkSchemaDecoded, 'delete' | 'post'>;
 type Handler = RequestHandler<
@@ -74,27 +73,24 @@ export const deleteRulesBulkRoute = (router: SecuritySolutionPluginRouter) => {
         }
 
         try {
-          const rule = await deleteRules({
-            alertsClient,
-            id,
-            ruleId,
-          });
-          if (rule != null) {
-            await deleteNotifications({ alertsClient, ruleAlertId: rule.id });
-            await deleteRuleActionsSavedObject({
-              ruleAlertId: rule.id,
-              savedObjectsClient,
-            });
-            const ruleStatuses = await ruleStatusClient.find({
-              perPage: 6,
-              search: rule.id,
-              searchFields: ['alertId'],
-            });
-            ruleStatuses.saved_objects.forEach(async (obj) => ruleStatusClient.delete(obj.id));
-            return transformValidateBulkError(idOrRuleIdOrUnknown, rule, undefined, ruleStatuses);
-          } else {
+          const rule = await readRules({ alertsClient, id, ruleId });
+          if (!rule) {
             return getIdBulkError({ id, ruleId });
           }
+
+          const ruleStatuses = await ruleStatusClient.find({
+            perPage: 6,
+            search: rule.id,
+            searchFields: ['alertId'],
+          });
+          await deleteRules({
+            alertsClient,
+            savedObjectsClient,
+            ruleStatusClient,
+            ruleStatuses,
+            id: rule.id,
+          });
+          return transformValidateBulkError(idOrRuleIdOrUnknown, rule, undefined, ruleStatuses);
         } catch (err) {
           return transformBulkError(idOrRuleIdOrUnknown, err);
         }
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 4b05f603b85b7..4a6b41230f799 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
@@ -19,9 +19,8 @@ import { deleteRules } from '../../rules/delete_rules';
 import { getIdError, transform } from './utils';
 import { buildSiemResponse } from '../utils';
 
-import { deleteNotifications } from '../../notifications/delete_notifications';
-import { deleteRuleActionsSavedObject } from '../../rule_actions/delete_rule_actions_saved_object';
 import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client';
+import { readRules } from '../../rules/read_rules';
 
 export const deleteRulesRoute = (
   router: SecuritySolutionPluginRouter,
@@ -57,36 +56,33 @@ export const deleteRulesRoute = (
         }
 
         const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient);
-        const rule = await deleteRules({
-          alertsClient,
-          id,
-          ruleId,
-        });
-        if (rule != null) {
-          await deleteNotifications({ alertsClient, ruleAlertId: rule.id });
-          await deleteRuleActionsSavedObject({
-            ruleAlertId: rule.id,
-            savedObjectsClient,
-          });
-          const ruleStatuses = await ruleStatusClient.find({
-            perPage: 6,
-            search: rule.id,
-            searchFields: ['alertId'],
-          });
-          ruleStatuses.saved_objects.forEach(async (obj) => ruleStatusClient.delete(obj.id));
-          const transformed = transform(rule, undefined, ruleStatuses.saved_objects[0]);
-          if (transformed == null) {
-            return siemResponse.error({ statusCode: 500, body: 'failed to transform alert' });
-          } else {
-            return response.ok({ body: transformed ?? {} });
-          }
-        } else {
+        const rule = await readRules({ alertsClient, id, ruleId });
+        if (!rule) {
           const error = getIdError({ id, ruleId });
           return siemResponse.error({
             body: error.message,
             statusCode: error.statusCode,
           });
         }
+
+        const ruleStatuses = await ruleStatusClient.find({
+          perPage: 6,
+          search: rule.id,
+          searchFields: ['alertId'],
+        });
+        await deleteRules({
+          alertsClient,
+          savedObjectsClient,
+          ruleStatusClient,
+          ruleStatuses,
+          id: rule.id,
+        });
+        const transformed = transform(rule, undefined, ruleStatuses.saved_objects[0]);
+        if (transformed == null) {
+          return siemResponse.error({ statusCode: 500, body: 'failed to transform alert' });
+        } else {
+          return response.ok({ body: transformed ?? {} });
+        }
       } catch (err) {
         const error = transformError(err);
         return siemResponse.error({
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
new file mode 100644
index 0000000000000..60677fd8eda90
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.test.ts
@@ -0,0 +1,148 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { DETECTION_ENGINE_RULES_BULK_ACTION } from '../../../../../common/constants';
+import { mlServicesMock, mlAuthzMock as mockMlAuthzFactory } from '../../../machine_learning/mocks';
+import { buildMlAuthz } from '../../../machine_learning/authz';
+import {
+  getEmptyFindResult,
+  getFindResultStatus,
+  getBulkActionRequest,
+  getFindResultWithSingleHit,
+  getFindResultWithMultiHits,
+} from '../__mocks__/request_responses';
+import { requestContextMock, serverMock, requestMock } from '../__mocks__';
+import { performBulkActionRoute } from './perform_bulk_action_route';
+import { getPerformBulkActionSchemaMock } from '../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema.mock';
+
+jest.mock('../../../machine_learning/authz', () => mockMlAuthzFactory.create());
+
+describe('perform_bulk_action', () => {
+  let server: ReturnType<typeof serverMock.create>;
+  let { clients, context } = requestContextMock.createTools();
+  let ml: ReturnType<typeof mlServicesMock.createSetupContract>;
+
+  beforeEach(() => {
+    server = serverMock.create();
+    ({ clients, context } = requestContextMock.createTools());
+    ml = mlServicesMock.createSetupContract();
+
+    clients.alertsClient.find.mockResolvedValue(getFindResultWithSingleHit());
+    clients.savedObjectsClient.find.mockResolvedValue(getFindResultStatus());
+
+    performBulkActionRoute(server.router, ml);
+  });
+
+  describe('status codes', () => {
+    it('returns 200 when performing bulk action with all dependencies present', async () => {
+      const response = await server.inject(getBulkActionRequest(), context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual({ success: true, rules_count: 1 });
+    });
+
+    it("returns 200 when provided filter query doesn't match any rules", async () => {
+      clients.alertsClient.find.mockResolvedValue(getEmptyFindResult());
+      const response = await server.inject(getBulkActionRequest(), context);
+      expect(response.status).toEqual(200);
+      expect(response.body).toEqual({ success: true, rules_count: 0 });
+    });
+
+    it('returns 400 when provided filter query matches too many rules', async () => {
+      clients.alertsClient.find.mockResolvedValue(
+        getFindResultWithMultiHits({ data: [], total: Infinity })
+      );
+      const response = await server.inject(getBulkActionRequest(), context);
+      expect(response.status).toEqual(400);
+      expect(response.body).toEqual({
+        message: 'More than 10000 rules matched the filter query. Try to narrow it down.',
+        status_code: 400,
+      });
+    });
+
+    it('returns 404 if alertClient is not available on the route', async () => {
+      context.alerting!.getAlertsClient = jest.fn();
+      const response = await server.inject(getBulkActionRequest(), context);
+      expect(response.status).toEqual(404);
+      expect(response.body).toEqual({ message: 'Not Found', status_code: 404 });
+    });
+
+    it('catches error if disable throws error', async () => {
+      clients.alertsClient.disable.mockImplementation(async () => {
+        throw new Error('Test error');
+      });
+      const response = await server.inject(getBulkActionRequest(), context);
+      expect(response.status).toEqual(500);
+      expect(response.body).toEqual({
+        message: 'Test error',
+        status_code: 500,
+      });
+    });
+
+    it('rejects patching a rule if mlAuthz fails', async () => {
+      (buildMlAuthz as jest.Mock).mockReturnValueOnce({
+        validateRuleType: jest
+          .fn()
+          .mockResolvedValue({ valid: false, message: 'mocked validation message' }),
+      });
+      const response = await server.inject(getBulkActionRequest(), context);
+
+      expect(response.status).toEqual(403);
+      expect(response.body).toEqual({
+        message: 'mocked validation message',
+        status_code: 403,
+      });
+    });
+  });
+
+  describe('request validation', () => {
+    it('rejects payloads with no action', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: DETECTION_ENGINE_RULES_BULK_ACTION,
+        body: { ...getPerformBulkActionSchemaMock(), action: undefined },
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith(
+        'Invalid value "undefined" supplied to "action"'
+      );
+    });
+
+    it('rejects payloads with unknown action', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: DETECTION_ENGINE_RULES_BULK_ACTION,
+        body: { ...getPerformBulkActionSchemaMock(), action: 'unknown' },
+      });
+      const result = server.validate(request);
+      expect(result.badRequest).toHaveBeenCalledWith(
+        'Invalid value "unknown" supplied to "action"'
+      );
+    });
+
+    it('accepts payloads with no query', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: DETECTION_ENGINE_RULES_BULK_ACTION,
+        body: { ...getPerformBulkActionSchemaMock(), query: undefined },
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+
+    it('accepts payloads with query and action', async () => {
+      const request = requestMock.create({
+        method: 'patch',
+        path: DETECTION_ENGINE_RULES_BULK_ACTION,
+        body: getPerformBulkActionSchemaMock(),
+      });
+      const result = server.validate(request);
+
+      expect(result.ok).toHaveBeenCalled();
+    });
+  });
+});
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
new file mode 100644
index 0000000000000..9d569acf3782a
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/routes/rules/perform_bulk_action_route.ts
@@ -0,0 +1,172 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 { DETECTION_ENGINE_RULES_BULK_ACTION } from '../../../../../common/constants';
+import { BulkAction } from '../../../../../common/detection_engine/schemas/common/schemas';
+import { performBulkActionSchema } from '../../../../../common/detection_engine/schemas/request/perform_bulk_action_schema';
+import { SetupPlugins } from '../../../../plugin';
+import type { SecuritySolutionPluginRouter } from '../../../../types';
+import { buildRouteValidation } from '../../../../utils/build_validation/route_validation';
+import { buildMlAuthz } from '../../../machine_learning/authz';
+import { throwHttpError } from '../../../machine_learning/validation';
+import { deleteRules } from '../../rules/delete_rules';
+import { duplicateRule } from '../../rules/duplicate_rule';
+import { enableRule } from '../../rules/enable_rule';
+import { findRules } from '../../rules/find_rules';
+import { getExportByObjectIds } from '../../rules/get_export_by_object_ids';
+import { updateRulesNotifications } from '../../rules/update_rules_notifications';
+import { getRuleActionsSavedObject } from '../../rule_actions/get_rule_actions_saved_object';
+import { ruleStatusSavedObjectsClientFactory } from '../../signals/rule_status_saved_objects_client';
+import { buildSiemResponse } from '../utils';
+
+const BULK_ACTION_RULES_LIMIT = 10000;
+
+export const performBulkActionRoute = (
+  router: SecuritySolutionPluginRouter,
+  ml: SetupPlugins['ml']
+) => {
+  router.post(
+    {
+      path: DETECTION_ENGINE_RULES_BULK_ACTION,
+      validate: {
+        body: buildRouteValidation<typeof performBulkActionSchema>(performBulkActionSchema),
+      },
+      options: {
+        tags: ['access:securitySolution'],
+      },
+    },
+    async (context, request, response) => {
+      const { body } = request;
+      const siemResponse = buildSiemResponse(response);
+
+      try {
+        const alertsClient = context.alerting?.getAlertsClient();
+        const savedObjectsClient = context.core.savedObjects.client;
+        const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient);
+
+        const mlAuthz = buildMlAuthz({
+          license: context.licensing.license,
+          ml,
+          request,
+          savedObjectsClient,
+        });
+
+        if (!alertsClient) {
+          return siemResponse.error({ statusCode: 404 });
+        }
+
+        const rules = await findRules({
+          alertsClient,
+          perPage: BULK_ACTION_RULES_LIMIT,
+          filter: body.query !== '' ? body.query : undefined,
+          page: undefined,
+          sortField: undefined,
+          sortOrder: undefined,
+          fields: undefined,
+        });
+
+        if (rules.total > BULK_ACTION_RULES_LIMIT) {
+          return siemResponse.error({
+            body: `More than ${BULK_ACTION_RULES_LIMIT} rules matched the filter query. Try to narrow it down.`,
+            statusCode: 400,
+          });
+        }
+
+        switch (body.action) {
+          case BulkAction.enable:
+            await Promise.all(
+              rules.data.map(async (rule) => {
+                if (!rule.enabled) {
+                  throwHttpError(await mlAuthz.validateRuleType(rule.params.type));
+                  await enableRule({ rule, alertsClient, savedObjectsClient });
+                }
+              })
+            );
+            break;
+          case BulkAction.disable:
+            await Promise.all(
+              rules.data.map(async (rule) => {
+                if (rule.enabled) {
+                  throwHttpError(await mlAuthz.validateRuleType(rule.params.type));
+                  await alertsClient.disable({ id: rule.id });
+                }
+              })
+            );
+            break;
+          case BulkAction.delete:
+            await Promise.all(
+              rules.data.map(async (rule) => {
+                const ruleStatuses = await ruleStatusClient.find({
+                  perPage: 6,
+                  search: rule.id,
+                  searchFields: ['alertId'],
+                });
+                await deleteRules({
+                  alertsClient,
+                  savedObjectsClient,
+                  ruleStatusClient,
+                  ruleStatuses,
+                  id: rule.id,
+                });
+              })
+            );
+            break;
+          case BulkAction.duplicate:
+            await Promise.all(
+              rules.data.map(async (rule) => {
+                throwHttpError(await mlAuthz.validateRuleType(rule.params.type));
+
+                const createdRule = await alertsClient.create({
+                  data: duplicateRule(rule),
+                });
+
+                const ruleActions = await getRuleActionsSavedObject({
+                  savedObjectsClient,
+                  ruleAlertId: rule.id,
+                });
+
+                await updateRulesNotifications({
+                  ruleAlertId: createdRule.id,
+                  alertsClient,
+                  savedObjectsClient,
+                  enabled: createdRule.enabled,
+                  actions: ruleActions?.actions || [],
+                  throttle: ruleActions?.alertThrottle,
+                  name: createdRule.name,
+                });
+              })
+            );
+            break;
+          case BulkAction.export:
+            const exported = await getExportByObjectIds(
+              alertsClient,
+              rules.data.map(({ params }) => ({ rule_id: params.ruleId }))
+            );
+
+            const responseBody = `${exported.rulesNdjson}${exported.exportDetails}`;
+
+            return response.ok({
+              headers: {
+                'Content-Disposition': `attachment; filename="rules_export.ndjson"`,
+                'Content-Type': 'application/ndjson',
+              },
+              body: responseBody,
+            });
+        }
+
+        return response.ok({ body: { success: true, rules_count: rules.data.length } });
+      } catch (err) {
+        const error = transformError(err);
+        return siemResponse.error({
+          body: error.message,
+          statusCode: error.statusCode,
+        });
+      }
+    }
+  );
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.test.ts
index 972e44c718f94..a871c7157d5e8 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.test.ts
@@ -33,8 +33,8 @@ describe('add_tags', () => {
     const tags2 = addTags(tags1, 'rule-1', false);
     expect(tags2).toEqual([
       'tag-1',
-      `${INTERNAL_RULE_ID_KEY}:rule-1`,
       `${INTERNAL_IMMUTABLE_KEY}:false`,
+      `${INTERNAL_RULE_ID_KEY}:rule-1`,
     ]);
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.ts
index 84a2483938421..6ff4a54ad8e54 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/add_tags.ts
@@ -10,7 +10,7 @@ import { INTERNAL_RULE_ID_KEY, INTERNAL_IMMUTABLE_KEY } from '../../../../common
 export const addTags = (tags: string[], ruleId: string, immutable: boolean): string[] => {
   return Array.from(
     new Set([
-      ...tags,
+      ...tags.filter((tag) => !tag.startsWith(INTERNAL_RULE_ID_KEY)),
       `${INTERNAL_RULE_ID_KEY}:${ruleId}`,
       `${INTERNAL_IMMUTABLE_KEY}:${immutable}`,
     ])
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 e7a4df790d62d..f581be9e1f62b 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,138 +5,74 @@
  * 2.0.
  */
 
+import { savedObjectsClientMock } from '../../../../../../../src/core/server/mocks';
 import { alertsClientMock } from '../../../../../alerting/server/mocks';
+import { ruleStatusSavedObjectsClientMock } from '../signals/__mocks__/rule_status_saved_objects_client.mock';
 import { deleteRules } from './delete_rules';
-import { readRules } from './read_rules';
-jest.mock('./read_rules');
+import { deleteNotifications } from '../notifications/delete_notifications';
+import { deleteRuleActionsSavedObject } from '../rule_actions/delete_rule_actions_saved_object';
+import { SavedObjectsFindResult } from '../../../../../../../src/core/server';
+import { IRuleStatusSOAttributes } from './types';
+
+jest.mock('../notifications/delete_notifications');
+jest.mock('../rule_actions/delete_rule_actions_saved_object');
 
 describe('deleteRules', () => {
   let alertsClient: ReturnType<typeof alertsClientMock.create>;
-  const notificationId = 'notification-52128c15-0d1b-4716-a4c5-46997ac7f3bd';
-  const ruleId = 'rule-04128c15-0d1b-4716-a4c5-46997ac7f3bd';
+  let ruleStatusClient: ReturnType<typeof ruleStatusSavedObjectsClientMock.create>;
+  let savedObjectsClient: ReturnType<typeof savedObjectsClientMock.create>;
 
   beforeEach(() => {
     alertsClient = alertsClientMock.create();
+    savedObjectsClient = savedObjectsClientMock.create();
+    ruleStatusClient = ruleStatusSavedObjectsClientMock.create();
   });
 
-  it('should return null if notification was not found', async () => {
-    (readRules as jest.Mock).mockResolvedValue(null);
-
-    const result = await deleteRules({
-      alertsClient,
-      id: notificationId,
-      ruleId,
-    });
-
-    expect(result).toBe(null);
-  });
-
-  it('should call alertsClient.delete if notification was found', async () => {
-    (readRules as jest.Mock).mockResolvedValue({
-      id: notificationId,
-    });
-
-    const result = await deleteRules({
-      alertsClient,
-      id: notificationId,
-      ruleId,
-    });
-
-    expect(alertsClient.delete).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: notificationId,
-      })
-    );
-    expect(result).toEqual({ id: notificationId });
-  });
-
-  it('should call alertsClient.delete if ruleId was undefined', async () => {
-    (readRules as jest.Mock).mockResolvedValue({
-      id: null,
-    });
-
-    const result = await deleteRules({
-      alertsClient,
-      id: notificationId,
-      ruleId: undefined,
-    });
-
-    expect(alertsClient.delete).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: notificationId,
-      })
-    );
-    expect(result).toEqual({ id: null });
-  });
-
-  it('should return null if alertsClient.delete rejects with 404 if ruleId was undefined', async () => {
-    (readRules as jest.Mock).mockResolvedValue({
-      id: null,
-    });
-
-    alertsClient.delete.mockRejectedValue({
-      output: {
-        statusCode: 404,
+  it('should delete the rule along with its notifications, actions, and statuses', async () => {
+    const ruleStatus: SavedObjectsFindResult<IRuleStatusSOAttributes> = {
+      id: 'statusId',
+      type: '',
+      references: [],
+      attributes: {
+        alertId: 'alertId',
+        statusDate: '',
+        lastFailureAt: null,
+        lastFailureMessage: null,
+        lastSuccessAt: null,
+        lastSuccessMessage: null,
+        status: null,
+        lastLookBackDate: null,
+        gap: null,
+        bulkCreateTimeDurations: null,
+        searchAfterTimeDurations: null,
       },
-    });
+      score: 0,
+    };
 
-    const result = await deleteRules({
+    const rule = {
       alertsClient,
-      id: notificationId,
-      ruleId: undefined,
-    });
-
-    expect(alertsClient.delete).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: notificationId,
-      })
-    );
-    expect(result).toEqual(null);
-  });
-
-  it('should return error object if alertsClient.delete rejects with status different than 404 and if ruleId was undefined', async () => {
-    (readRules as jest.Mock).mockResolvedValue({
-      id: null,
-    });
-
-    const errorObject = {
-      output: {
-        statusCode: 500,
+      savedObjectsClient,
+      ruleStatusClient,
+      id: 'ruleId',
+      ruleStatuses: {
+        total: 0,
+        per_page: 0,
+        page: 0,
+        saved_objects: [ruleStatus],
       },
     };
 
-    alertsClient.delete.mockRejectedValue(errorObject);
+    await deleteRules(rule);
 
-    let errorResult;
-    try {
-      await deleteRules({
-        alertsClient,
-        id: notificationId,
-        ruleId: undefined,
-      });
-    } catch (error) {
-      errorResult = error;
-    }
-
-    expect(alertsClient.delete).toHaveBeenCalledWith(
-      expect.objectContaining({
-        id: notificationId,
-      })
-    );
-    expect(errorResult).toEqual(errorObject);
-  });
-
-  it('should return null if ruleId and id was undefined', async () => {
-    (readRules as jest.Mock).mockResolvedValue({
-      id: null,
+    expect(alertsClient.delete).toHaveBeenCalledWith({ id: rule.id });
+    expect(deleteNotifications).toHaveBeenCalledWith({
+      ruleAlertId: rule.id,
+      alertsClient: expect.any(Object),
     });
-
-    const result = await deleteRules({
-      alertsClient,
-      id: undefined,
-      ruleId: undefined,
+    expect(deleteRuleActionsSavedObject).toHaveBeenCalledWith({
+      ruleAlertId: rule.id,
+      savedObjectsClient: expect.any(Object),
     });
-
-    expect(result).toEqual(null);
+    expect(ruleStatusClient.delete).toHaveBeenCalledWith(ruleStatus.id);
   });
 });
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.ts
index 3947103e7625d..ed5477599253b 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/delete_rules.ts
@@ -5,30 +5,19 @@
  * 2.0.
  */
 
-import { readRules } from './read_rules';
+import { deleteNotifications } from '../notifications/delete_notifications';
+import { deleteRuleActionsSavedObject } from '../rule_actions/delete_rule_actions_saved_object';
 import { DeleteRuleOptions } from './types';
 
-export const deleteRules = async ({ alertsClient, id, ruleId }: DeleteRuleOptions) => {
-  const rule = await readRules({ alertsClient, id, ruleId });
-  if (rule == null) {
-    return null;
-  }
-
-  if (ruleId != null) {
-    await alertsClient.delete({ id: rule.id });
-    return rule;
-  } else if (id != null) {
-    try {
-      await alertsClient.delete({ id });
-      return rule;
-    } catch (err) {
-      if (err.output.statusCode === 404) {
-        return null;
-      } else {
-        throw err;
-      }
-    }
-  } else {
-    return null;
-  }
+export const deleteRules = async ({
+  alertsClient,
+  savedObjectsClient,
+  ruleStatusClient,
+  ruleStatuses,
+  id,
+}: DeleteRuleOptions) => {
+  await alertsClient.delete({ id });
+  await deleteNotifications({ alertsClient, ruleAlertId: id });
+  await deleteRuleActionsSavedObject({ ruleAlertId: id, savedObjectsClient });
+  ruleStatuses.saved_objects.forEach(async (obj) => ruleStatusClient.delete(obj.id));
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.test.ts
new file mode 100644
index 0000000000000..3046999a632c6
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_rule.test.ts
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import uuid from 'uuid';
+import { INTERNAL_IMMUTABLE_KEY } from '../../../../common/constants';
+import { duplicateRule } from './duplicate_rule';
+
+jest.mock('uuid', () => ({
+  v4: jest.fn(),
+}));
+
+describe('duplicateRule', () => {
+  it('should return a copy of rule with new ruleId', () => {
+    (uuid.v4 as jest.Mock).mockReturnValue('newId');
+
+    expect(
+      duplicateRule({
+        id: 'oldTestRuleId',
+        notifyWhen: 'onActiveAlert',
+        name: 'test',
+        tags: ['test', '__internal_rule_id:oldTestRuleId', `${INTERNAL_IMMUTABLE_KEY}:false`],
+        alertTypeId: 'siem.signals',
+        consumer: 'siem',
+        params: {
+          savedId: undefined,
+          author: [],
+          description: 'test',
+          ruleId: 'oldTestRuleId',
+          falsePositives: [],
+          from: 'now-360s',
+          immutable: false,
+          license: '',
+          outputIndex: '.siem-signals-default',
+          meta: undefined,
+          maxSignals: 100,
+          riskScore: 42,
+          riskScoreMapping: [],
+          severity: 'low',
+          severityMapping: [],
+          threat: [],
+          to: 'now',
+          references: [],
+          version: 1,
+          exceptionsList: [],
+          type: 'query',
+          language: 'kuery',
+          index: [],
+          query: 'process.args : "chmod"',
+          filters: [],
+          buildingBlockType: undefined,
+          note: undefined,
+          timelineId: undefined,
+          timelineTitle: undefined,
+          ruleNameOverride: undefined,
+          timestampOverride: undefined,
+        },
+        schedule: {
+          interval: '5m',
+        },
+        enabled: false,
+        actions: [],
+        throttle: null,
+        apiKeyOwner: 'kibana',
+        createdBy: 'kibana',
+        updatedBy: 'kibana',
+        muteAll: false,
+        mutedInstanceIds: [],
+        updatedAt: new Date(2021, 0),
+        createdAt: new Date(2021, 0),
+        scheduledTaskId: undefined,
+        executionStatus: {
+          lastExecutionDate: new Date(2021, 0),
+          status: 'ok',
+        },
+      })
+    ).toMatchInlineSnapshot(`
+      Object {
+        "actions": Array [],
+        "alertTypeId": "siem.signals",
+        "consumer": "siem",
+        "enabled": false,
+        "name": "test [Duplicate]",
+        "notifyWhen": null,
+        "params": Object {
+          "author": Array [],
+          "buildingBlockType": undefined,
+          "description": "test",
+          "exceptionsList": Array [],
+          "falsePositives": Array [],
+          "filters": Array [],
+          "from": "now-360s",
+          "immutable": false,
+          "index": Array [],
+          "language": "kuery",
+          "license": "",
+          "maxSignals": 100,
+          "meta": undefined,
+          "note": undefined,
+          "outputIndex": ".siem-signals-default",
+          "query": "process.args : \\"chmod\\"",
+          "references": Array [],
+          "riskScore": 42,
+          "riskScoreMapping": Array [],
+          "ruleId": "newId",
+          "ruleNameOverride": undefined,
+          "savedId": undefined,
+          "severity": "low",
+          "severityMapping": Array [],
+          "threat": Array [],
+          "timelineId": undefined,
+          "timelineTitle": undefined,
+          "timestampOverride": undefined,
+          "to": "now",
+          "type": "query",
+          "version": 1,
+        },
+        "schedule": Object {
+          "interval": "5m",
+        },
+        "tags": Array [
+          "test",
+          "__internal_immutable:false",
+          "__internal_rule_id:newId",
+        ],
+        "throttle": null,
+      }
+    `);
+  });
+});
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
new file mode 100644
index 0000000000000..2f12e33507422
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/duplicate_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 uuid from 'uuid';
+import { i18n } from '@kbn/i18n';
+import { SanitizedAlert } from '../../../../../alerting/common';
+import { SERVER_APP_ID, SIGNALS_ID } from '../../../../common/constants';
+import { InternalRuleCreate, RuleParams } from '../schemas/rule_schemas';
+import { addTags } from './add_tags';
+
+const DUPLICATE_TITLE = i18n.translate(
+  'xpack.securitySolution.detectionEngine.rules.cloneRule.duplicateTitle',
+  {
+    defaultMessage: 'Duplicate',
+  }
+);
+
+export const duplicateRule = (rule: SanitizedAlert<RuleParams>): InternalRuleCreate => {
+  const newRuleId = uuid.v4();
+  return {
+    name: `${rule.name} [${DUPLICATE_TITLE}]`,
+    tags: addTags(rule.tags, newRuleId, false),
+    alertTypeId: SIGNALS_ID,
+    consumer: SERVER_APP_ID,
+    params: {
+      ...rule.params,
+      immutable: false,
+      ruleId: newRuleId,
+    },
+    schedule: rule.schedule,
+    enabled: false,
+    actions: rule.actions,
+    throttle: null,
+    notifyWhen: null,
+  };
+};
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/rules/enable_rule.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/enable_rule.ts
new file mode 100644
index 0000000000000..dc4cca2059b3e
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/rules/enable_rule.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 { SavedObjectsClientContract } from 'kibana/server';
+import { SanitizedAlert } from '../../../../../alerting/common';
+import { AlertsClient } from '../../../../../alerting/server';
+import { RuleParams } from '../schemas/rule_schemas';
+import { ruleStatusSavedObjectsClientFactory } from '../signals/rule_status_saved_objects_client';
+
+interface EnableRuleArgs {
+  rule: SanitizedAlert<RuleParams>;
+  alertsClient: AlertsClient;
+  savedObjectsClient: SavedObjectsClientContract;
+}
+
+/**
+ * Enables the rule and updates its status to 'going to run'
+ *
+ * @param rule - rule to enable
+ * @param alertsClient - Alerts client
+ * @param savedObjectsClient - Saved Objects client
+ */
+export const enableRule = async ({ rule, alertsClient, savedObjectsClient }: EnableRuleArgs) => {
+  await alertsClient.enable({ id: rule.id });
+
+  const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient);
+  const ruleCurrentStatus = await ruleStatusClient.find({
+    perPage: 1,
+    sortField: 'statusDate',
+    sortOrder: 'desc',
+    search: rule.id,
+    searchFields: ['alertId'],
+  });
+
+  // set current status for this rule to be 'going to run'
+  if (ruleCurrentStatus && ruleCurrentStatus.saved_objects.length > 0) {
+    const currentStatusToDisable = ruleCurrentStatus.saved_objects[0];
+    await ruleStatusClient.update(currentStatusToDisable.id, {
+      ...currentStatusToDisable.attributes,
+      status: 'going to run',
+    });
+  }
+};
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 754aaf67c3224..eae5ccd2f6ffd 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
@@ -18,7 +18,7 @@ export const getFilter = (filter: string | null | undefined) => {
   }
 };
 
-export const findRules = async ({
+export const findRules = ({
   alertsClient,
   perPage,
   page,
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 b9a88bc36a812..72af7ebc340cd 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
@@ -5,19 +5,19 @@
  * 2.0.
  */
 
-import { defaults } from 'lodash/fp';
 import { validate } from '@kbn/securitysolution-io-ts-utils';
+import { defaults } from 'lodash/fp';
 import { PartialAlert } from '../../../../../alerting/server';
 import { transformRuleToAlertAction } from '../../../../common/detection_engine/transform_actions';
-import { PatchRulesOptions } from './types';
-import { addTags } from './add_tags';
-import { calculateVersion, calculateName, calculateInterval, removeUndefined } from './utils';
-import { ruleStatusSavedObjectsClientFactory } from '../signals/rule_status_saved_objects_client';
-import { internalRuleUpdate, RuleParams } from '../schemas/rule_schemas';
 import {
   normalizeMachineLearningJobIds,
   normalizeThresholdObject,
 } from '../../../../common/detection_engine/utils';
+import { internalRuleUpdate, RuleParams } from '../schemas/rule_schemas';
+import { addTags } from './add_tags';
+import { enableRule } from './enable_rule';
+import { PatchRulesOptions } from './types';
+import { calculateInterval, calculateName, calculateVersion, removeUndefined } from './utils';
 
 class PatchError extends Error {
   public readonly statusCode: number;
@@ -200,25 +200,7 @@ export const patchRules = async ({
   if (rule.enabled && enabled === false) {
     await alertsClient.disable({ id: rule.id });
   } else if (!rule.enabled && enabled === true) {
-    await alertsClient.enable({ id: rule.id });
-
-    const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient);
-    const ruleCurrentStatus = await ruleStatusClient.find({
-      perPage: 1,
-      sortField: 'statusDate',
-      sortOrder: 'desc',
-      search: rule.id,
-      searchFields: ['alertId'],
-    });
-
-    // set current status for this rule to be 'going to run'
-    if (ruleCurrentStatus && ruleCurrentStatus.saved_objects.length > 0) {
-      const currentStatusToDisable = ruleCurrentStatus.saved_objects[0];
-      await ruleStatusClient.update(currentStatusToDisable.id, {
-        ...currentStatusToDisable.attributes,
-        status: 'going to run',
-      });
-    }
+    await enableRule({ rule, alertsClient, savedObjectsClient });
   } else {
     // enabled is null or undefined and we do not touch the rule
   }
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 601f3ebaa0f9e..d029393ce781e 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
@@ -68,6 +68,7 @@ import {
   MetaOrUndefined,
   Description,
   Enabled,
+  Id,
   IdOrUndefined,
   RuleIdOrUndefined,
   EnabledOrUndefined,
@@ -105,6 +106,7 @@ import { Alert, SanitizedAlert } from '../../../../../alerting/common';
 import { SIGNALS_ID } from '../../../../common/constants';
 import { PartialFilter } from '../types';
 import { RuleParams } from '../schemas/rule_schemas';
+import { RuleStatusSavedObjectsClient } from '../signals/rule_status_saved_objects_client';
 
 export type RuleAlertType = Alert<RuleParams>;
 
@@ -329,8 +331,10 @@ export interface ReadRuleOptions {
 
 export interface DeleteRuleOptions {
   alertsClient: AlertsClient;
-  id: IdOrUndefined;
-  ruleId: RuleIdOrUndefined;
+  savedObjectsClient: SavedObjectsClientContract;
+  ruleStatusClient: RuleStatusSavedObjectsClient;
+  ruleStatuses: SavedObjectsFindResponse<IRuleStatusSOAttributes, unknown>;
+  id: Id;
 }
 
 export interface FindRuleOptions {
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 38cae8d1cf50f..0fac804163afa 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
@@ -13,9 +13,9 @@ import { PartialAlert } from '../../../../../alerting/server';
 import { readRules } from './read_rules';
 import { UpdateRulesOptions } from './types';
 import { addTags } from './add_tags';
-import { ruleStatusSavedObjectsClientFactory } from '../signals/rule_status_saved_objects_client';
 import { typeSpecificSnakeToCamel } from '../schemas/rule_converters';
 import { InternalRuleUpdate, RuleParams } from '../schemas/rule_schemas';
+import { enableRule } from './enable_rule';
 
 export const updateRules = async ({
   alertsClient,
@@ -88,25 +88,7 @@ export const updateRules = async ({
   if (existingRule.enabled && enabled === false) {
     await alertsClient.disable({ id: existingRule.id });
   } else if (!existingRule.enabled && enabled === true) {
-    await alertsClient.enable({ id: existingRule.id });
-
-    const ruleStatusClient = ruleStatusSavedObjectsClientFactory(savedObjectsClient);
-    const ruleCurrentStatus = await ruleStatusClient.find({
-      perPage: 1,
-      sortField: 'statusDate',
-      sortOrder: 'desc',
-      search: existingRule.id,
-      searchFields: ['alertId'],
-    });
-
-    // set current status for this rule to be 'going to run'
-    if (ruleCurrentStatus && ruleCurrentStatus.saved_objects.length > 0) {
-      const currentStatusToDisable = ruleCurrentStatus.saved_objects[0];
-      await ruleStatusClient.update(currentStatusToDisable.id, {
-        ...currentStatusToDisable.attributes,
-        status: 'going to run',
-      });
-    }
+    await enableRule({ rule: existingRule, alertsClient, savedObjectsClient });
   }
   return { ...update, enabled };
 };
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/delete_rules_by_query.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/delete_rules_by_query.sh
new file mode 100755
index 0000000000000..d78726f9e23b5
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/delete_rules_by_query.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+#
+
+set -e
+./check_env_variables.sh
+
+QUERY=${1}
+
+# Example delete all rules
+# ./delete_rules_by_query.sh
+
+# Example delete rules with tag "test"
+# ./delete_rules_by_query.sh 'alert.attributes.tags: \"test\"'
+
+curl -s -k \
+ -H 'Content-Type: application/json' \
+ -H 'kbn-xsrf: 123' \
+ -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+ -X POST ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_action \
+ --data "{
+  \"query\": \"$QUERY\",
+  \"action\": \"delete\"
+}" | jq .
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/disable_rules_by_query.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/disable_rules_by_query.sh
new file mode 100755
index 0000000000000..1c7f05f4057cf
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/disable_rules_by_query.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+#
+
+set -e
+./check_env_variables.sh
+
+QUERY=${1}
+
+# Example disable all rules
+# ./disable_rules_by_query.sh
+
+# Example disable rules with tag "test"
+# ./disable_rules_by_query.sh 'alert.attributes.tags: \"test\"'
+
+curl -s -k \
+ -H 'Content-Type: application/json' \
+ -H 'kbn-xsrf: 123' \
+ -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+ -X POST ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_action \
+ --data "{
+  \"query\": \"$QUERY\",
+  \"action\": \"disable\"
+}" | jq .
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/duplicate_rules_by_query.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/duplicate_rules_by_query.sh
new file mode 100755
index 0000000000000..13da480d74f83
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/duplicate_rules_by_query.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+#
+
+set -e
+./check_env_variables.sh
+
+QUERY=${1}
+
+# Example duplicate all rules
+# ./duplicate_rules_by_query.sh
+
+# Example duplicate rules with tag "test"
+# ./duplicate_rules_by_query.sh 'alert.attributes.tags: \"test\"'
+
+curl -s -k \
+ -H 'Content-Type: application/json' \
+ -H 'kbn-xsrf: 123' \
+ -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+ -X POST ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_action \
+ --data "{
+  \"query\": \"$QUERY\",
+  \"action\": \"duplicate\"
+}" | jq .
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/enable_rules_by_query.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/enable_rules_by_query.sh
new file mode 100755
index 0000000000000..52bb51b6dd6df
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/enable_rules_by_query.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+#
+
+set -e
+./check_env_variables.sh
+
+QUERY=${1}
+
+# Example enable all rules
+# ./enable_rules_by_query.sh
+
+# Example enable rules with tag "test"
+# ./enable_rules_by_query.sh 'alert.attributes.tags: \"test\"'
+
+curl -s -k \
+ -H 'Content-Type: application/json' \
+ -H 'kbn-xsrf: 123' \
+ -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+ -X POST ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_action \
+ --data "{
+  \"query\": \"$QUERY\",
+  \"action\": \"enable\"
+}" | jq .
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/export_rules_by_query.sh b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/export_rules_by_query.sh
new file mode 100755
index 0000000000000..954fc2104262b
--- /dev/null
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/scripts/export_rules_by_query.sh
@@ -0,0 +1,29 @@
+#!/bin/sh
+
+#
+# Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+# or more contributor license agreements. Licensed under the Elastic License
+# 2.0; you may not use this file except in compliance with the Elastic License
+# 2.0.
+#
+
+set -e
+./check_env_variables.sh
+
+QUERY=${1}
+
+# Example export all rules
+# ./export_rules_by_query.sh
+
+# Example export rules with tag "test"
+# ./export_rules_by_query.sh 'alert.attributes.tags: \"test\"'
+
+curl -s -k \
+ -H 'Content-Type: application/json' \
+ -H 'kbn-xsrf: 123' \
+ -u ${ELASTICSEARCH_USERNAME}:${ELASTICSEARCH_PASSWORD} \
+ -X POST ${KIBANA_URL}${SPACE_URL}/api/detection_engine/rules/_bulk_action \
+ --data "{
+  \"query\": \"$QUERY\",
+  \"action\": \"export\"
+}"
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 1590a4f0fbb04..0fed141ca4dbc 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
@@ -146,7 +146,7 @@ export const sampleDocWithSortId = (
 export const sampleDocNoSortId = (
   someUuid: string = sampleIdGuid,
   ip?: string
-): SignalSourceHit => ({
+): SignalSourceHit & { _source: Required<SignalSourceHit>['_source'] } => ({
   _index: 'myFakeSignalIndex',
   _type: 'doc',
   _score: 100,
@@ -225,12 +225,12 @@ export const sampleWrappedSignalHit = (): WrappedSignalHit => {
   };
 };
 
-export const sampleDocWithAncestors = (): SignalSearchResponse => {
+export const sampleDocWithAncestors = (): SignalSearchResponse & {
+  hits: { hits: Array<ReturnType<typeof sampleDocNoSortId>> };
+} => {
   const sampleDoc = sampleDocNoSortId();
   delete sampleDoc.sort;
-  // @ts-expect-error @elastic/elasticsearch _source is optional
   delete sampleDoc._source.source;
-  // @ts-expect-error @elastic/elasticsearch _source is optional
   sampleDoc._source.signal = {
     parent: {
       id: 'd5e8eb51-a6a0-456d-8a15-4b79bfec3d71',
@@ -562,7 +562,9 @@ export const sampleBulkCreateErrorResult = {
 
 export const sampleDocSearchResultsNoSortId = (
   someUuid: string = sampleIdGuid
-): SignalSearchResponse => ({
+): SignalSearchResponse & {
+  hits: { hits: Array<ReturnType<typeof sampleDocNoSortId>> };
+} => ({
   took: 10,
   timed_out: false,
   _shards: {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
index 743d9580218a3..4d3ca26f5a71e 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_bulk_body.test.ts
@@ -24,6 +24,11 @@ import { SignalHit, SignalSourceHit } from './types';
 import { SIGNALS_TEMPLATE_VERSION } from '../routes/index/get_signals_template';
 import { getQueryRuleParams, getThresholdRuleParams } from '../schemas/rule_schemas.mock';
 
+// This allows us to not have to use ts-expect-error with delete in the code.
+type SignalHitOptionalTimestamp = Omit<SignalHit, '@timestamp'> & {
+  '@timestamp'?: SignalHit['@timestamp'];
+};
+
 describe('buildBulkBody', () => {
   beforeEach(() => {
     jest.clearAllMocks();
@@ -32,11 +37,9 @@ describe('buildBulkBody', () => {
   test('bulk body builds well-defined body', () => {
     const ruleSO = sampleRuleSO(getQueryRuleParams());
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete doc._source.source;
-    const fakeSignalSourceHit = buildBulkBody(ruleSO, doc);
+    const fakeSignalSourceHit: SignalHitOptionalTimestamp = buildBulkBody(ruleSO, doc);
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -69,7 +72,7 @@ describe('buildBulkBody', () => {
             depth: 0,
           },
         ],
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         status: 'open',
         rule: expectedRule(),
         depth: 1,
@@ -81,9 +84,8 @@ describe('buildBulkBody', () => {
   test('bulk body builds well-defined body with threshold results', () => {
     const ruleSO = sampleRuleSO(getThresholdRuleParams());
     const baseDoc = sampleDocNoSortId();
-    const doc: SignalSourceHit = {
+    const doc: SignalSourceHit & { _source: Required<SignalSourceHit>['_source'] } = {
       ...baseDoc,
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       _source: {
         ...baseDoc._source,
         threshold_result: {
@@ -96,11 +98,9 @@ describe('buildBulkBody', () => {
         },
       },
     };
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete doc._source.source;
-    const fakeSignalSourceHit = buildBulkBody(ruleSO, doc);
+    const fakeSignalSourceHit: SignalHitOptionalTimestamp = buildBulkBody(ruleSO, doc);
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -133,7 +133,7 @@ describe('buildBulkBody', () => {
             depth: 0,
           },
         ],
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         status: 'open',
         rule: {
           ...expectedRule(),
@@ -167,18 +167,15 @@ describe('buildBulkBody', () => {
   test('bulk body builds original_event if it exists on the event to begin with', () => {
     const ruleSO = sampleRuleSO(getQueryRuleParams());
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete doc._source.source;
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       module: 'system',
       dataset: 'socket',
       kind: 'event',
     };
-    const fakeSignalSourceHit = buildBulkBody(ruleSO, doc);
+    const fakeSignalSourceHit: SignalHitOptionalTimestamp = buildBulkBody(ruleSO, doc);
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -220,7 +217,7 @@ describe('buildBulkBody', () => {
             depth: 0,
           },
         ],
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         status: 'open',
         rule: expectedRule(),
         depth: 1,
@@ -232,17 +229,14 @@ describe('buildBulkBody', () => {
   test('bulk body builds original_event if it exists on the event to begin with but no kind information', () => {
     const ruleSO = sampleRuleSO(getQueryRuleParams());
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete doc._source.source;
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       module: 'system',
       dataset: 'socket',
     };
-    const fakeSignalSourceHit = buildBulkBody(ruleSO, doc);
+    const fakeSignalSourceHit: SignalHitOptionalTimestamp = buildBulkBody(ruleSO, doc);
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -283,7 +277,7 @@ describe('buildBulkBody', () => {
             depth: 0,
           },
         ],
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         status: 'open',
         rule: expectedRule(),
         depth: 1,
@@ -295,15 +289,12 @@ describe('buildBulkBody', () => {
   test('bulk body builds original_event if it exists on the event to begin with with only kind information', () => {
     const ruleSO = sampleRuleSO(getQueryRuleParams());
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete doc._source.source;
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       kind: 'event',
     };
-    const fakeSignalSourceHit = buildBulkBody(ruleSO, doc);
+    const fakeSignalSourceHit: SignalHitOptionalTimestamp = buildBulkBody(ruleSO, doc);
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete fakeSignalSourceHit['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -339,7 +330,7 @@ describe('buildBulkBody', () => {
             depth: 0,
           },
         ],
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         status: 'open',
         rule: expectedRule(),
         depth: 1,
@@ -351,7 +342,6 @@ describe('buildBulkBody', () => {
   test('bulk body builds "original_signal" if it exists already as a numeric', () => {
     const ruleSO = sampleRuleSO(getQueryRuleParams());
     const sampleDoc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete sampleDoc._source.source;
     const doc = ({
       ...sampleDoc,
@@ -393,7 +383,7 @@ describe('buildBulkBody', () => {
             depth: 0,
           },
         ],
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         status: 'open',
         rule: expectedRule(),
         depth: 1,
@@ -405,7 +395,6 @@ describe('buildBulkBody', () => {
   test('bulk body builds "original_signal" if it exists already as an object', () => {
     const ruleSO = sampleRuleSO(getQueryRuleParams());
     const sampleDoc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete sampleDoc._source.source;
     const doc = ({
       ...sampleDoc,
@@ -447,7 +436,7 @@ describe('buildBulkBody', () => {
             depth: 0,
           },
         ],
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         status: 'open',
         rule: expectedRule(),
         depth: 1,
@@ -466,9 +455,8 @@ describe('buildSignalFromSequence', () => {
     block2._source.new_key = 'new_key_value';
     const blocks = [block1, block2];
     const ruleSO = sampleRuleSO(getQueryRuleParams());
-    const signal = buildSignalFromSequence(blocks, ruleSO);
+    const signal: SignalHitOptionalTimestamp = buildSignalFromSequence(blocks, ruleSO);
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete signal['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { new_key: string } = {
       new_key: 'new_key_value',
@@ -552,9 +540,8 @@ describe('buildSignalFromSequence', () => {
     block2._source['@timestamp'] = '2021-05-20T22:28:46+0000';
     block2._source.someKey = 'someOtherValue';
     const ruleSO = sampleRuleSO(getQueryRuleParams());
-    const signal = buildSignalFromSequence([block1, block2], ruleSO);
+    const signal: SignalHitOptionalTimestamp = buildSignalFromSequence([block1, block2], ruleSO);
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete signal['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> = {
       event: {
@@ -635,12 +622,11 @@ describe('buildSignalFromSequence', () => {
 describe('buildSignalFromEvent', () => {
   test('builds a basic signal from a single event', () => {
     const ancestor = sampleDocWithAncestors().hits.hits[0];
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete ancestor._source.source;
     const ruleSO = sampleRuleSO(getQueryRuleParams());
-    const signal = buildSignalFromEvent(ancestor, ruleSO, true);
+    const signal: SignalHitOptionalTimestamp = buildSignalFromEvent(ancestor, ruleSO, true);
+
     // Timestamp will potentially always be different so remove it for the test
-    // @ts-expect-error
     delete signal['@timestamp'];
     const expected: Omit<SignalHit, '@timestamp'> & { someKey: 'someValue' } = {
       someKey: 'someValue',
@@ -651,7 +637,7 @@ describe('buildSignalFromEvent', () => {
         _meta: {
           version: SIGNALS_TEMPLATE_VERSION,
         },
-        original_time: '2020-04-20T21:27:45+0000',
+        original_time: '2020-04-20T21:27:45.000Z',
         parent: {
           id: sampleIdGuid,
           rule: '04128c15-0d1b-4716-a4c5-46997ac7f3bd',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.test.ts
index 185c165442921..0ae81770e83c2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_event_type_signal.test.ts
@@ -16,7 +16,6 @@ describe('buildEventTypeSignal', () => {
 
   test('it returns the event appended of kind signal if it does not exist', () => {
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete doc._source.event;
     const eventType = buildEventTypeSignal(doc);
     const expected: object = { kind: 'signal' };
@@ -25,7 +24,6 @@ describe('buildEventTypeSignal', () => {
 
   test('it returns the event appended of kind signal if it is an empty object', () => {
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {};
     const eventType = buildEventTypeSignal(doc);
     const expected: object = { kind: 'signal' };
@@ -34,7 +32,6 @@ describe('buildEventTypeSignal', () => {
 
   test('it returns the event with kind signal and other properties if they exist', () => {
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       module: 'system',
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 3f4a17dc091ab..28cea9ea22b0d 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
@@ -24,12 +24,6 @@ describe('create_signals', () => {
       size: 100,
       ignore_unavailable: true,
       body: {
-        docvalue_fields: [
-          {
-            field: '@timestamp',
-            format: 'strict_date_optional_time',
-          },
-        ],
         query: {
           bool: {
             filter: [
@@ -67,6 +61,10 @@ describe('create_signals', () => {
             field: '*',
             include_unmapped: true,
           },
+          {
+            field: '@timestamp',
+            format: 'strict_date_optional_time',
+          },
         ],
         sort: [
           {
@@ -96,16 +94,6 @@ describe('create_signals', () => {
       size: 100,
       ignore_unavailable: true,
       body: {
-        docvalue_fields: [
-          {
-            field: 'event.ingested',
-            format: 'strict_date_optional_time',
-          },
-          {
-            field: '@timestamp',
-            format: 'strict_date_optional_time',
-          },
-        ],
         query: {
           bool: {
             filter: [
@@ -167,6 +155,14 @@ describe('create_signals', () => {
             field: '*',
             include_unmapped: true,
           },
+          {
+            field: 'event.ingested',
+            format: 'strict_date_optional_time',
+          },
+          {
+            field: '@timestamp',
+            format: 'strict_date_optional_time',
+          },
         ],
         sort: [
           {
@@ -203,12 +199,6 @@ describe('create_signals', () => {
       size: 100,
       ignore_unavailable: true,
       body: {
-        docvalue_fields: [
-          {
-            field: '@timestamp',
-            format: 'strict_date_optional_time',
-          },
-        ],
         query: {
           bool: {
             filter: [
@@ -246,6 +236,10 @@ describe('create_signals', () => {
             field: '*',
             include_unmapped: true,
           },
+          {
+            field: '@timestamp',
+            format: 'strict_date_optional_time',
+          },
         ],
         search_after: [fakeSortId],
         sort: [
@@ -276,12 +270,6 @@ describe('create_signals', () => {
       size: 100,
       ignore_unavailable: true,
       body: {
-        docvalue_fields: [
-          {
-            field: '@timestamp',
-            format: 'strict_date_optional_time',
-          },
-        ],
         query: {
           bool: {
             filter: [
@@ -319,6 +307,10 @@ describe('create_signals', () => {
             field: '*',
             include_unmapped: true,
           },
+          {
+            field: '@timestamp',
+            format: 'strict_date_optional_time',
+          },
         ],
         search_after: [fakeSortIdNumber],
         sort: [
@@ -348,12 +340,6 @@ describe('create_signals', () => {
       size: 100,
       ignore_unavailable: true,
       body: {
-        docvalue_fields: [
-          {
-            field: '@timestamp',
-            format: 'strict_date_optional_time',
-          },
-        ],
         query: {
           bool: {
             filter: [
@@ -391,6 +377,10 @@ describe('create_signals', () => {
             field: '*',
             include_unmapped: true,
           },
+          {
+            field: '@timestamp',
+            format: 'strict_date_optional_time',
+          },
         ],
         sort: [
           {
@@ -427,7 +417,6 @@ describe('create_signals', () => {
       size: 100,
       ignore_unavailable: true,
       body: {
-        docvalue_fields: [{ field: '@timestamp', format: 'strict_date_optional_time' }],
         query: {
           bool: {
             filter: [
@@ -465,6 +454,10 @@ describe('create_signals', () => {
             field: '*',
             include_unmapped: true,
           },
+          {
+            field: '@timestamp',
+            format: 'strict_date_optional_time',
+          },
         ],
         aggregations: {
           tags: {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
index 86fb51e4785ad..7b27d22d9b387 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_events_query.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 import type { estypes } from '@elastic/elasticsearch';
-import { SortResults } from '@elastic/elasticsearch/api/types';
 import { isEmpty } from 'lodash';
 import {
   SortOrderOrUndefined,
@@ -13,14 +12,14 @@ import {
 } from '../../../../common/detection_engine/schemas/common/schemas';
 
 interface BuildEventsSearchQuery {
-  aggregations?: Record<string, estypes.AggregationContainer>;
+  aggregations?: Record<string, estypes.AggregationsAggregationContainer>;
   index: string[];
   from: string;
   to: string;
-  filter?: estypes.QueryContainer;
+  filter: estypes.QueryDslQueryContainer;
   size: number;
   sortOrder?: SortOrderOrUndefined;
-  searchAfterSortIds: SortResults | undefined;
+  searchAfterSortIds: estypes.SearchSortResults | undefined;
   timestampOverride: TimestampOverrideOrUndefined;
 }
 
@@ -43,7 +42,7 @@ export const buildEventsSearchQuery = ({
     format: 'strict_date_optional_time',
   }));
 
-  const rangeFilter: estypes.QueryContainer[] =
+  const rangeFilter: estypes.QueryDslQueryContainer[] =
     timestampOverride != null
       ? [
           {
@@ -93,9 +92,7 @@ export const buildEventsSearchQuery = ({
           },
         ];
 
-  const filterWithTime: estypes.QueryContainer[] = [
-    // but tests contain undefined, so I suppose it's desired behaviour
-    // @ts-expect-error undefined in not assignable to QueryContainer
+  const filterWithTime: estypes.QueryDslQueryContainer[] = [
     filter,
     { bool: { filter: [{ bool: { should: [...rangeFilter], minimum_should_match: 1 } }] } },
   ];
@@ -106,7 +103,6 @@ export const buildEventsSearchQuery = ({
     size,
     ignore_unavailable: true,
     body: {
-      docvalue_fields: docFields,
       query: {
         bool: {
           filter: [
@@ -122,6 +118,7 @@ export const buildEventsSearchQuery = ({
           field: '*',
           include_unmapped: true,
         },
+        ...docFields,
       ],
       ...(aggregations ? { aggregations } : {}),
       sort: [
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts
index 412ccf7a40e33..bd5444a325128 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_rule.test.ts
@@ -134,7 +134,6 @@ describe('buildRuleWithOverrides', () => {
       },
     ];
     const doc = sampleDocNoSortId();
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.new_risk_score = newRiskScore;
     const rule = buildRuleWithOverrides(ruleSO, doc._source!);
     const expected = {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.test.ts
index 6408b5fe9de10..3a30da170d3f2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.test.ts
@@ -28,7 +28,6 @@ describe('buildSignal', () => {
 
   test('it builds a signal as expected without original_event if event does not exist', () => {
     const doc = sampleDocNoSortId('d5e8eb51-a6a0-456d-8a15-4b79bfec3d71');
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     delete doc._source.event;
     const rule = getRulesSchemaMock();
     const signal = {
@@ -61,7 +60,7 @@ describe('buildSignal', () => {
           depth: 0,
         },
       ],
-      original_time: '2020-04-20T21:27:45+0000',
+      original_time: '2020-04-20T21:27:45.000Z',
       status: 'open',
       rule: {
         author: [],
@@ -105,7 +104,6 @@ describe('buildSignal', () => {
 
   test('it builds a signal as expected with original_event if is present', () => {
     const doc = sampleDocNoSortId('d5e8eb51-a6a0-456d-8a15-4b79bfec3d71');
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       dataset: 'socket',
@@ -143,7 +141,7 @@ describe('buildSignal', () => {
           depth: 0,
         },
       ],
-      original_time: '2020-04-20T21:27:45+0000',
+      original_time: '2020-04-20T21:27:45.000Z',
       original_event: {
         action: 'socket_opened',
         dataset: 'socket',
@@ -193,7 +191,6 @@ describe('buildSignal', () => {
 
   test('it builds a ancestor correctly if the parent does not exist', () => {
     const doc = sampleDocNoSortId('d5e8eb51-a6a0-456d-8a15-4b79bfec3d71');
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       dataset: 'socket',
@@ -212,14 +209,12 @@ describe('buildSignal', () => {
 
   test('it builds a ancestor correctly if the parent does exist', () => {
     const doc = sampleDocNoSortId('d5e8eb51-a6a0-456d-8a15-4b79bfec3d71');
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       dataset: 'socket',
       kind: 'event',
       module: 'system',
     };
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.signal = {
       parents: [
         {
@@ -255,7 +250,6 @@ describe('buildSignal', () => {
 
   test('it builds a signal ancestor correctly if the parent does not exist', () => {
     const doc = sampleDocNoSortId('d5e8eb51-a6a0-456d-8a15-4b79bfec3d71');
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       dataset: 'socket',
@@ -276,14 +270,12 @@ describe('buildSignal', () => {
 
   test('it builds a signal ancestor correctly if the parent does exist', () => {
     const doc = sampleDocNoSortId('d5e8eb51-a6a0-456d-8a15-4b79bfec3d71');
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.event = {
       action: 'socket_opened',
       dataset: 'socket',
       kind: 'event',
       module: 'system',
     };
-    // @ts-expect-error @elastic/elasticsearch _source is optional
     doc._source.signal = {
       parents: [
         {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.ts
index 237536a99c0f0..a415c83e857c2 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/build_signal.ts
@@ -10,6 +10,7 @@ import { RulesSchema } from '../../../../common/detection_engine/schemas/respons
 import { SIGNALS_TEMPLATE_VERSION } from '../routes/index/get_signals_template';
 import { isEventTypeSignal } from './build_event_type_signal';
 import { Signal, Ancestor, BaseSignalHit, ThresholdResult } from './types';
+import { getValidDateFromDoc } from './utils';
 
 /**
  * Takes a parent signal or event document and extracts the information needed for the corresponding entry in the child
@@ -103,6 +104,7 @@ const isThresholdResult = (thresholdResult: SearchTypes): thresholdResult is Thr
 
 /**
  * Creates signal fields that are only available in the special case where a signal has only 1 parent signal/event.
+ * We copy the original time from the document as "original_time" since we override the timestamp with the current date time.
  * @param doc The parent signal/event of the new signal to be built.
  */
 export const additionalSignalFields = (doc: BaseSignalHit) => {
@@ -110,10 +112,13 @@ export const additionalSignalFields = (doc: BaseSignalHit) => {
   if (thresholdResult != null && !isThresholdResult(thresholdResult)) {
     throw new Error(`threshold_result failed to validate: ${thresholdResult}`);
   }
+  const originalTime = getValidDateFromDoc({
+    doc,
+    timestampOverride: undefined,
+  });
   return {
     parent: buildParent(removeClashes(doc)),
-    // @ts-expect-error @elastic/elasticsearch _source is optional
-    original_time: doc._source['@timestamp'], // This field has already been replaced with timestampOverride, if provided.
+    original_time: originalTime != null ? originalTime.toISOString() : undefined,
     original_event: doc._source?.event ?? undefined,
     threshold_result: thresholdResult,
     original_signal:
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts
index a50d40e33a717..da664f65c2d50 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events.ts
@@ -16,7 +16,7 @@ import { FilterEventsOptions } from './types';
 export const filterEvents = <T>({
   events,
   fieldAndSetTuples,
-}: FilterEventsOptions<T>): Array<estypes.Hit<T>> => {
+}: FilterEventsOptions<T>): Array<estypes.SearchHit<T>> => {
   return events.filter((item) => {
     return fieldAndSetTuples
       .map((tuple) => {
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts
index 5907cbdfb7fdd..fffe971753f87 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/filters/filter_events_against_list.ts
@@ -58,9 +58,9 @@ export const filterEventsAgainstList = async <T>({
       return listItem.entries.every((entry) => entriesList.is(entry));
     });
 
-    const res = await valueListExceptionItems.reduce<Promise<Array<estypes.Hit<T>>>>(
+    const res = await valueListExceptionItems.reduce<Promise<Array<estypes.SearchHit<T>>>>(
       async (
-        filteredAccum: Promise<Array<estypes.Hit<T>>>,
+        filteredAccum: Promise<Array<estypes.SearchHit<T>>>,
         exceptionItem: ExceptionListItemSchema
       ) => {
         const events = await filteredAccum;
@@ -78,7 +78,7 @@ export const filterEventsAgainstList = async <T>({
         );
         return filteredEvents;
       },
-      Promise.resolve<Array<estypes.Hit<T>>>(eventSearchResult.hits.hits)
+      Promise.resolve<Array<estypes.SearchHit<T>>>(eventSearchResult.hits.hits)
     );
 
     return {
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 1252ca3f5faa5..160506b965bf0 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
@@ -20,7 +20,7 @@ export interface FilterEventsAgainstListOptions<T> {
 }
 
 export interface CreateSetToFilterAgainstOptions<T> {
-  events: Array<estypes.Hit<T>>;
+  events: Array<estypes.SearchHit<T>>;
   field: string;
   listId: string;
   listType: Type;
@@ -30,12 +30,12 @@ export interface CreateSetToFilterAgainstOptions<T> {
 }
 
 export interface FilterEventsOptions<T> {
-  events: Array<estypes.Hit<T>>;
+  events: Array<estypes.SearchHit<T>>;
   fieldAndSetTuples: FieldSet[];
 }
 
 export interface CreateFieldAndSetTuplesOptions<T> {
-  events: Array<estypes.Hit<T>>;
+  events: Array<estypes.SearchHit<T>>;
   exceptionItem: ExceptionListItemSchema;
   listClient: ListClient;
   logger: Logger;
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/mappings/build_rule_name_from_mapping.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/mappings/build_rule_name_from_mapping.test.ts
index b6281b637d434..23e5aecc5c553 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/mappings/build_rule_name_from_mapping.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/mappings/build_rule_name_from_mapping.test.ts
@@ -15,7 +15,6 @@ describe('buildRuleNameFromMapping', () => {
 
   test('rule name defaults to provided if mapping is incomplete', () => {
     const ruleName = buildRuleNameFromMapping({
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       eventSource: sampleDocNoSortId()._source,
       ruleName: 'rule-name',
       ruleNameMapping: 'message',
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts
index 08f8abe384d0f..b0dcc1810a639 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/search_after_bulk_create.ts
@@ -6,7 +6,7 @@
  */
 
 import { identity } from 'lodash';
-import { SortResults } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { singleSearchAfter } from './single_search_after';
 import { singleBulkCreate } from './single_bulk_create';
 import { filterEventsAgainstList } from './filters/filter_events_against_list';
@@ -44,7 +44,7 @@ export const searchAfterAndBulkCreate = async ({
   let toReturn = createSearchAfterReturnType();
 
   // sortId tells us where to start our next consecutive search_after query
-  let sortIds: SortResults | undefined;
+  let sortIds: estypes.SearchSortResults | undefined;
   let hasSortId = true; // default to true so we execute the search on initial run
 
   // signalsCreatedCount keeps track of how many signals we have created,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
index 66f7d41df94ab..823d694f36514 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/signal_rule_alert_type.test.ts
@@ -157,7 +157,7 @@ describe('signal_rule_alert_type', () => {
     (mlExecutor as jest.Mock).mockClear();
     (mlExecutor as jest.Mock).mockResolvedValue(executorReturnValue);
     (parseScheduleDates as jest.Mock).mockReturnValue(moment(100));
-    const value: Partial<ApiResponse<estypes.FieldCapabilitiesResponse>> = {
+    const value: Partial<ApiResponse<estypes.FieldCapsResponse>> = {
       statusCode: 200,
       body: {
         indices: ['index1', 'index2', 'index3', 'index4'],
@@ -174,7 +174,7 @@ describe('signal_rule_alert_type', () => {
       },
     };
     alertServices.scopedClusterClient.asCurrentUser.fieldCaps.mockResolvedValue(
-      value as ApiResponse<estypes.FieldCapabilitiesResponse>
+      value as ApiResponse<estypes.FieldCapsResponse>
     );
     const ruleAlert = getAlertMock(getQueryRuleParams());
     alertServices.savedObjectsClient.get.mockResolvedValue({
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 a40459d312b9f..a67016491aaef 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
@@ -41,7 +41,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -59,7 +59,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -109,7 +109,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -132,7 +132,7 @@ describe('singleSearchAfter', () => {
       services: mockService,
       logger: mockLogger,
       pageSize: 1,
-      filter: undefined,
+      filter: {},
       timestampOverride: undefined,
       buildRuleMessage,
     });
@@ -152,7 +152,7 @@ describe('singleSearchAfter', () => {
         services: mockService,
         logger: mockLogger,
         pageSize: 1,
-        filter: undefined,
+        filter: {},
         timestampOverride: undefined,
         buildRuleMessage,
       })
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 57ed05bcb27cf..6436da40088b3 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
@@ -6,7 +6,6 @@
  */
 import type { estypes } from '@elastic/elasticsearch';
 import { performance } from 'perf_hooks';
-import { SearchRequest, SortResults } from '@elastic/elasticsearch/api/types';
 import {
   AlertInstanceContext,
   AlertInstanceState,
@@ -23,8 +22,8 @@ import {
 } from '../../../../common/detection_engine/schemas/common/schemas';
 
 interface SingleSearchAfterParams {
-  aggregations?: Record<string, estypes.AggregationContainer>;
-  searchAfterSortIds: SortResults | undefined;
+  aggregations?: Record<string, estypes.AggregationsAggregationContainer>;
+  searchAfterSortIds: estypes.SearchSortResults | undefined;
   index: string[];
   from: string;
   to: string;
@@ -32,7 +31,7 @@ interface SingleSearchAfterParams {
   logger: Logger;
   pageSize: number;
   sortOrder?: SortOrderOrUndefined;
-  filter?: estypes.QueryContainer;
+  filter: estypes.QueryDslQueryContainer;
   timestampOverride: TimestampOverrideOrUndefined;
   buildRuleMessage: BuildRuleMessage;
 }
@@ -73,7 +72,7 @@ export const singleSearchAfter = async ({
     const {
       body: nextSearchAfterResult,
     } = await services.scopedClusterClient.asCurrentUser.search<SignalSource>(
-      searchAfterQuery as SearchRequest
+      searchAfterQuery as estypes.SearchRequest
     );
     const end = performance.now();
     const searchErrors = createErrorsFromShard({
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts
index ade85db0e4ba6..b3e0e376c7794 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/create_threat_signals.ts
@@ -154,7 +154,7 @@ export const createThreatSignals = async ({
       language: threatLanguage,
       threatFilters,
       index: threatIndex,
-      // @ts-expect-error@elastic/elasticsearch SortResults might contain null
+      // @ts-expect-error@elastic/elasticsearch SearchSortResults might contain null
       searchAfter: threatList.hits.hits[threatList.hits.hits.length - 1].sort,
       sortField: undefined,
       sortOrder: undefined,
diff --git a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts
index c3d3d6c6a99e1..3ff23e27547b4 100644
--- a/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts
+++ b/x-pack/plugins/security_solution/server/lib/detection_engine/signals/threat_mapping/get_threat_list.ts
@@ -54,7 +54,7 @@ export const getThreatList = async ({
   );
   const { body: response } = await esClient.search<ThreatListDoc>({
     body: {
-      // @ts-expect-error ESBoolQuery is not assignale to QueryContainer
+      // @ts-expect-error ESBoolQuery is not assignale to QueryDslQueryContainer
       query: queryFilter,
       fields: [
         {
@@ -125,7 +125,7 @@ export const getThreatListCount = async ({
   );
   const { body: response } = await esClient.count({
     body: {
-      // @ts-expect-error ESBoolQuery is not assignale to QueryContainer
+      // @ts-expect-error ESBoolQuery is not assignale to QueryDslQueryContainer
       query: queryFilter,
     },
     ignore_unavailable: true,
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 094c4d74d8ac7..acb64f826f3f2 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
@@ -167,7 +167,7 @@ export interface ThreatListDoc {
  * This is an ECS document being returned, but the user could return or use non-ecs based
  * documents potentially.
  */
-export type ThreatListItem = estypes.Hit<ThreatListDoc>;
+export type ThreatListItem = estypes.SearchHit<ThreatListDoc>;
 
 export interface ThreatIndicator {
   [key: string]: unknown;
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 8f34e58ebc85b..4205c2d6d8b2c 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
@@ -153,9 +153,9 @@ export interface GetResponse {
 }
 
 export type SignalSearchResponse = estypes.SearchResponse<SignalSource>;
-export type SignalSourceHit = estypes.Hit<SignalSource>;
+export type SignalSourceHit = estypes.SearchHit<SignalSource>;
 export type WrappedSignalHit = BaseHit<SignalHit>;
-export type BaseSignalHit = estypes.Hit<SignalSource>;
+export type BaseSignalHit = estypes.SearchHit<SignalSource>;
 
 export type EqlSignalSearchResponse = EqlSearchResponse<SignalSource>;
 
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 f49492939eeb1..60bf0ec337f3d 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
@@ -40,6 +40,7 @@ import {
   lastValidDate,
   calculateThresholdSignalUuid,
   buildChunkedOrFilter,
+  getValidDateFromDoc,
 } from './utils';
 import { BulkResponseErrorAggregation, SearchAfterAndBulkCreateReturnType } from './types';
 import {
@@ -54,6 +55,7 @@ import {
   sampleDocSearchResultsNoSortIdNoHits,
   repeatedSearchResultsWithSortId,
   sampleDocSearchResultsNoSortId,
+  sampleDocNoSortId,
 } from './__mocks__/es_results';
 import { ShardError } from '../../types';
 
@@ -1172,7 +1174,6 @@ describe('utils', () => {
 
     test('It will not set an invalid date time stamp from a non-existent @timestamp when the index is not 100% ECS compliant', () => {
       const searchResult = sampleDocSearchResultsNoSortId();
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = undefined;
       if (searchResult.hits.hits[0].fields != null) {
         (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = undefined;
@@ -1186,7 +1187,6 @@ describe('utils', () => {
 
     test('It will not set an invalid date time stamp from a null @timestamp when the index is not 100% ECS compliant', () => {
       const searchResult = sampleDocSearchResultsNoSortId();
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = null;
       if (searchResult.hits.hits[0].fields != null) {
         (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = null;
@@ -1200,7 +1200,6 @@ describe('utils', () => {
 
     test('It will not set an invalid date time stamp from an invalid @timestamp string', () => {
       const searchResult = sampleDocSearchResultsNoSortId();
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = 'invalid';
       if (searchResult.hits.hits[0].fields != null) {
         (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = ['invalid'];
@@ -1216,7 +1215,6 @@ describe('utils', () => {
   describe('lastValidDate', () => {
     test('It returns undefined if the search result contains a null timestamp', () => {
       const searchResult = sampleDocSearchResultsNoSortId();
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = null;
       if (searchResult.hits.hits[0].fields != null) {
         (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = null;
@@ -1227,7 +1225,6 @@ describe('utils', () => {
 
     test('It returns undefined if the search result contains a undefined timestamp', () => {
       const searchResult = sampleDocSearchResultsNoSortId();
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = undefined;
       if (searchResult.hits.hits[0].fields != null) {
         (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = undefined;
@@ -1238,7 +1235,6 @@ describe('utils', () => {
 
     test('It returns undefined if the search result contains an invalid string value', () => {
       const searchResult = sampleDocSearchResultsNoSortId();
-      // @ts-expect-error @elastic/elasticsearch _source is optional
       (searchResult.hits.hits[0]._source['@timestamp'] as unknown) = 'invalid value';
       if (searchResult.hits.hits[0].fields != null) {
         (searchResult.hits.hits[0].fields['@timestamp'] as unknown) = ['invalid value'];
@@ -1294,6 +1290,84 @@ describe('utils', () => {
     });
   });
 
+  describe('getValidDateFromDoc', () => {
+    test('It returns undefined if the search result contains a null timestamp', () => {
+      const doc = sampleDocNoSortId();
+      (doc._source['@timestamp'] as unknown) = null;
+      if (doc.fields != null) {
+        (doc.fields['@timestamp'] as unknown) = null;
+      }
+      const date = getValidDateFromDoc({ doc, timestampOverride: undefined });
+      expect(date).toEqual(undefined);
+    });
+
+    test('It returns undefined if the search result contains a undefined timestamp', () => {
+      const doc = sampleDocNoSortId();
+      (doc._source['@timestamp'] as unknown) = undefined;
+      if (doc.fields != null) {
+        (doc.fields['@timestamp'] as unknown) = undefined;
+      }
+      const date = getValidDateFromDoc({ doc, timestampOverride: undefined });
+      expect(date).toEqual(undefined);
+    });
+
+    test('It returns undefined if the search result contains an invalid string value', () => {
+      const doc = sampleDocNoSortId();
+      (doc._source['@timestamp'] as unknown) = 'invalid value';
+      if (doc.fields != null) {
+        (doc.fields['@timestamp'] as unknown) = ['invalid value'];
+      }
+      const date = getValidDateFromDoc({ doc, timestampOverride: undefined });
+      expect(date).toEqual(undefined);
+    });
+
+    test('It returns normal date time if set', () => {
+      const doc = sampleDocNoSortId();
+      const date = getValidDateFromDoc({ doc, timestampOverride: undefined });
+      expect(date?.toISOString()).toEqual('2020-04-20T21:27:45.000Z');
+    });
+
+    test('It returns date time from field if set there', () => {
+      const timestamp = '2020-10-07T19:27:19.136Z';
+      let doc = sampleDocNoSortId();
+      if (doc == null) {
+        throw new TypeError('Test requires one element');
+      }
+      doc = {
+        ...doc,
+        fields: {
+          '@timestamp': [timestamp],
+        },
+      };
+      const date = getValidDateFromDoc({ doc, timestampOverride: undefined });
+      expect(date?.toISOString()).toEqual(timestamp);
+    });
+
+    test('It returns timestampOverride date time if set', () => {
+      const override = '2020-10-07T19:20:28.049Z';
+      const doc = sampleDocNoSortId();
+      doc._source.different_timestamp = new Date(override).toISOString();
+      const date = getValidDateFromDoc({ doc, timestampOverride: 'different_timestamp' });
+      expect(date?.toISOString()).toEqual(override);
+    });
+
+    test('It returns timestampOverride date time from fields if set on it', () => {
+      const override = '2020-10-07T19:36:31.110Z';
+      let doc = sampleDocNoSortId();
+      if (doc == null) {
+        throw new TypeError('Test requires one element');
+      }
+      doc = {
+        ...doc,
+        fields: {
+          different_timestamp: [override],
+        },
+      };
+      const date = getValidDateFromDoc({ doc, timestampOverride: 'different_timestamp' });
+      expect(date?.toISOString()).toEqual(override);
+    });
+  });
+
   describe('createSearchAfterReturnType', () => {
     test('createSearchAfterReturnType will return full object when nothing is passed', () => {
       const searchAfterReturnType = createSearchAfterReturnType();
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 cc4ed6a45807b..1de76f64fabec 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
@@ -13,7 +13,6 @@ import type { estypes } from '@elastic/elasticsearch';
 import { chunk, isEmpty, partition } from 'lodash';
 import { ApiResponse, Context } from '@elastic/elasticsearch/lib/Transport';
 
-import { SortResults } from '@elastic/elasticsearch/api/types';
 import type { ListArray, ExceptionListItemSchema } from '@kbn/securitysolution-io-ts-list-types';
 import { MAX_EXCEPTION_LIST_SIZE } from '@kbn/securitysolution-list-constants';
 import { hasLargeValueList } from '@kbn/securitysolution-list-utils';
@@ -38,6 +37,7 @@ import {
   Signal,
   WrappedSignalHit,
   RuleRangeTuple,
+  BaseSignalHit,
 } from './types';
 import { BuildRuleMessage } from './rule_messages';
 import { ShardError } from '../../types';
@@ -577,30 +577,49 @@ export const lastValidDate = ({
   searchResult,
   timestampOverride,
 }: {
-  searchResult: estypes.SearchResponse;
+  searchResult: SignalSearchResponse;
   timestampOverride: TimestampOverrideOrUndefined;
 }): Date | undefined => {
   if (searchResult.hits.hits.length === 0) {
     return undefined;
   } else {
     const lastRecord = searchResult.hits.hits[searchResult.hits.hits.length - 1];
-    const timestamp = timestampOverride ?? '@timestamp';
-    const timestampValue =
-      lastRecord.fields != null && lastRecord.fields[timestamp] != null
-        ? lastRecord.fields[timestamp][0]
-        : // @ts-expect-error @elastic/elasticsearch _source is optional
-          lastRecord._source[timestamp];
-    const lastTimestamp =
-      typeof timestampValue === 'string' || typeof timestampValue === 'number'
-        ? timestampValue
-        : undefined;
-    if (lastTimestamp != null) {
-      const tempMoment = moment(lastTimestamp);
-      if (tempMoment.isValid()) {
-        return tempMoment.toDate();
-      } else {
-        return undefined;
-      }
+    return getValidDateFromDoc({ doc: lastRecord, timestampOverride });
+  }
+};
+
+/**
+ * Given a search hit this will return a valid last date if it can find one, otherwise it
+ * will return undefined. This tries the "fields" first to get a formatted date time if it can, but if
+ * it cannot it will resort to using the "_source" fields second which can be problematic if the date time
+ * is not correctly ISO8601 or epoch milliseconds formatted.
+ * @param searchResult The result to try and parse out the timestamp.
+ * @param timestampOverride The timestamp override to use its values if we have it.
+ */
+export const getValidDateFromDoc = ({
+  doc,
+  timestampOverride,
+}: {
+  doc: BaseSignalHit;
+  timestampOverride: TimestampOverrideOrUndefined;
+}): Date | undefined => {
+  const timestamp = timestampOverride ?? '@timestamp';
+  const timestampValue =
+    doc.fields != null && doc.fields[timestamp] != null
+      ? doc.fields[timestamp][0]
+      : doc._source != null
+      ? doc._source[timestamp]
+      : undefined;
+  const lastTimestamp =
+    typeof timestampValue === 'string' || typeof timestampValue === 'number'
+      ? timestampValue
+      : undefined;
+  if (lastTimestamp != null) {
+    const tempMoment = moment(lastTimestamp);
+    if (tempMoment.isValid()) {
+      return tempMoment.toDate();
+    } else {
+      return undefined;
     }
   }
 };
@@ -609,7 +628,7 @@ export const createSearchAfterReturnTypeFromResponse = ({
   searchResult,
   timestampOverride,
 }: {
-  searchResult: estypes.SearchResponse;
+  searchResult: SignalSearchResponse;
   timestampOverride: TimestampOverrideOrUndefined;
 }): SearchAfterAndBulkCreateReturnType => {
   return createSearchAfterReturnType({
@@ -855,10 +874,10 @@ export const isMachineLearningParams = (params: RuleParams): params is MachineLe
  * Ref: https://github.com/elastic/elasticsearch/issues/28806#issuecomment-369303620
  *
  * return stringified Long.MAX_VALUE if we receive Number.MAX_SAFE_INTEGER
- * @param sortIds SortResults | undefined
+ * @param sortIds estypes.SearchSortResults | undefined
  * @returns SortResults
  */
-export const getSafeSortIds = (sortIds: SortResults | undefined) => {
+export const getSafeSortIds = (sortIds: estypes.SearchSortResults | undefined) => {
   return sortIds?.map((sortId) => {
     // haven't determined when we would receive a null value for a sort id
     // but in case we do, default to sending the stringified Java max_int
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 b47edbb21d178..baf4fb2d2cfd0 100644
--- a/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
+++ b/x-pack/plugins/security_solution/server/lib/telemetry/sender.ts
@@ -293,6 +293,9 @@ const allowlistProcessFields: AllowlistFields = {
   command_line: true,
   hash: true,
   pid: true,
+  pe: {
+    original_file_name: true,
+  },
   uptime: true,
   Ext: {
     architecture: true,
@@ -313,6 +316,9 @@ const allowlistBaseEventFields: AllowlistFields = {
     path: true,
     code_signature: true,
     malware_signature: true,
+    pe: {
+      original_file_name: true,
+    },
   },
   event: true,
   file: {
@@ -326,6 +332,7 @@ const allowlistBaseEventFields: AllowlistFields = {
     hash: true,
     Ext: {
       code_signature: true,
+      header_data: true,
       malware_classification: true,
       malware_signature: true,
       quarantine_result: true,
@@ -351,6 +358,9 @@ const allowlistBaseEventFields: AllowlistFields = {
       ...allowlistProcessFields,
     },
   },
+  user: {
+    id: true,
+  },
 };
 
 // Allow list for the data we include in the events. True means that it is deep-cloned
diff --git a/x-pack/plugins/security_solution/server/plugin.ts b/x-pack/plugins/security_solution/server/plugin.ts
index 2507475592e88..609ee88c319f9 100644
--- a/x-pack/plugins/security_solution/server/plugin.ts
+++ b/x-pack/plugins/security_solution/server/plugin.ts
@@ -75,7 +75,7 @@ import { registerEndpointRoutes } from './endpoint/routes/metadata';
 import { registerLimitedConcurrencyRoutes } from './endpoint/routes/limited_concurrency';
 import { registerResolverRoutes } from './endpoint/routes/resolver';
 import { registerPolicyRoutes } from './endpoint/routes/policy';
-import { registerHostIsolationRoutes } from './endpoint/routes/actions';
+import { registerActionRoutes } from './endpoint/routes/actions';
 import { EndpointArtifactClient, ManifestManager } from './endpoint/services';
 import { EndpointAppContextService } from './endpoint/endpoint_app_context_services';
 import { EndpointAppContext } from './endpoint/types';
@@ -140,14 +140,6 @@ const securitySubPlugins = [
   `${APP_ID}:${SecurityPageName.administration}`,
 ];
 
-const caseSavedObjects = [
-  'cases',
-  'cases-comments',
-  'cases-sub-case',
-  'cases-configure',
-  'cases-user-actions',
-];
-
 export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, StartPlugins> {
   private readonly logger: Logger;
   private readonly config: ConfigType;
@@ -290,7 +282,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
     registerResolverRoutes(router);
     registerPolicyRoutes(router, endpointContext);
     registerTrustedAppsRoutes(router, endpointContext);
-    registerHostIsolationRoutes(router, endpointContext);
+    registerActionRoutes(router, endpointContext);
 
     const referenceRuleTypes = [
       REFERENCE_RULE_ALERT_TYPE_ID,
@@ -315,20 +307,57 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
         insightsAndAlerting: ['triggersActions'],
       },
       alerting: ruleTypes,
+      cases: [APP_ID],
+      subFeatures: [
+        {
+          name: 'Cases',
+          privilegeGroups: [
+            {
+              groupType: 'mutually_exclusive',
+              privileges: [
+                {
+                  id: 'cases_all',
+                  includeIn: 'all',
+                  name: 'All',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  // using variables with underscores here otherwise when we retrieve them from the kibana
+                  // capabilities in a hook I get type errors regarding boolean | ReadOnly<{[x: string]: boolean}>
+                  ui: ['crud_cases', 'read_cases'], // uiCapabilities.siem.crud_cases
+                  cases: {
+                    all: [APP_ID],
+                  },
+                },
+                {
+                  id: 'cases_read',
+                  includeIn: 'read',
+                  name: 'Read',
+                  savedObject: {
+                    all: [],
+                    read: [],
+                  },
+                  // using variables with underscores here otherwise when we retrieve them from the kibana
+                  // capabilities in a hook I get type errors regarding boolean | ReadOnly<{[x: string]: boolean}>
+                  ui: ['read_cases'], // uiCapabilities.siem.read_cases
+                  cases: {
+                    read: [APP_ID],
+                  },
+                },
+              ],
+            },
+          ],
+        },
+      ],
       privileges: {
         all: {
           app: [...securitySubPlugins, 'kibana'],
           catalogue: ['securitySolution'],
           api: ['securitySolution', 'lists-all', 'lists-read'],
           savedObject: {
-            all: [
-              'alert',
-              ...caseSavedObjects,
-              'exception-list',
-              'exception-list-agnostic',
-              ...savedObjectTypes,
-            ],
-            read: ['config'],
+            all: ['alert', 'exception-list', 'exception-list-agnostic', ...savedObjectTypes],
+            read: [],
           },
           alerting: {
             rule: {
@@ -349,13 +378,7 @@ export class Plugin implements IPlugin<PluginSetup, PluginStart, SetupPlugins, S
           api: ['securitySolution', 'lists-read'],
           savedObject: {
             all: [],
-            read: [
-              'config',
-              ...caseSavedObjects,
-              'exception-list',
-              'exception-list-agnostic',
-              ...savedObjectTypes,
-            ],
+            read: ['exception-list', 'exception-list-agnostic', ...savedObjectTypes],
           },
           alerting: {
             rule: {
diff --git a/x-pack/plugins/security_solution/server/routes/index.ts b/x-pack/plugins/security_solution/server/routes/index.ts
index 0245d4cb99cc0..00de66c0dec28 100644
--- a/x-pack/plugins/security_solution/server/routes/index.ts
+++ b/x-pack/plugins/security_solution/server/routes/index.ts
@@ -31,6 +31,7 @@ import { createRulesBulkRoute } from '../lib/detection_engine/routes/rules/creat
 import { updateRulesBulkRoute } from '../lib/detection_engine/routes/rules/update_rules_bulk_route';
 import { patchRulesBulkRoute } from '../lib/detection_engine/routes/rules/patch_rules_bulk_route';
 import { deleteRulesBulkRoute } from '../lib/detection_engine/routes/rules/delete_rules_bulk_route';
+import { performBulkActionRoute } from '../lib/detection_engine/routes/rules/perform_bulk_action_route';
 import { importRulesRoute } from '../lib/detection_engine/routes/rules/import_rules_route';
 import { exportRulesRoute } from '../lib/detection_engine/routes/rules/export_rules_route';
 import { findRulesStatusesRoute } from '../lib/detection_engine/routes/rules/find_rules_status_route';
@@ -81,6 +82,7 @@ export const initRoutes = (
   updateRulesBulkRoute(router, ml);
   patchRulesBulkRoute(router, ml);
   deleteRulesBulkRoute(router);
+  performBulkActionRoute(router, ml);
 
   createTimelinesRoute(router, config, security);
   patchTimelinesRoute(router, config, security);
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.ts
index e960067713bda..325d45e04b2b0 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query.dsl.ts
@@ -75,7 +75,7 @@ export const buildQuery = ({
             order: [
               { 'successes.doc_count': 'desc' as const },
               { 'failures.doc_count': 'desc' as const },
-            ] as estypes.TermsAggregationOrder,
+            ] as estypes.AggregationsTermsAggregationOrder,
           },
           aggs: {
             failures: {
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query_entities.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query_entities.dsl.ts
index 51d80152d65c0..d320130115588 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query_entities.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/authentications/dsl/query_entities.dsl.ts
@@ -52,7 +52,10 @@ export const buildQueryEntities = ({
           terms: {
             size: querySize,
             field: 'user.name',
-            order: [{ successes: 'desc' }, { failures: 'desc' }] as estypes.TermsAggregationOrder,
+            order: [
+              { successes: 'desc' },
+              { failures: 'desc' },
+            ] as estypes.AggregationsTermsAggregationOrder,
           },
           aggs: {
             failures: {
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 f489fd0c16455..b50623bf9090a 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
@@ -32,7 +32,6 @@ const mockDeps = {
     experimentalFeatures: {
       trustedAppsByPolicyEnabled: false,
       metricsEntitiesEnabled: false,
-      hostIsolationEnabled: false,
       ruleRegistryEnabled: false,
     },
     service: {} as EndpointAppContextService,
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 897ae633076a2..a0ae368ac0fe2 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
@@ -293,6 +293,6 @@ export const buildOverviewHostQuery = ({
     },
   } as const;
 
-  // @ts-expect-error @elastic-elasticsearch readonly [] is not assignable to mutable QueryContainer[]
+  // @ts-expect-error @elastic-elasticsearch readonly [] is not assignable to mutable QueryDslQueryContainer[]
   return dslQuery;
 };
diff --git a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.ts b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.ts
index 1df0d60d54a88..5d4f45c68160a 100644
--- a/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.ts
+++ b/x-pack/plugins/security_solution/server/search_strategy/security_solution/factory/hosts/uncommon_processes/dsl/query.dsl.ts
@@ -68,7 +68,7 @@ export const buildQuery = ({
               {
                 _key: 'asc' as const,
               },
-            ] as estypes.TermsAggregationOrder,
+            ] as estypes.AggregationsTermsAggregationOrder,
           },
           aggregations: {
             process: {
@@ -120,7 +120,7 @@ export const buildQuery = ({
                       'event.action': 'executed',
                     },
                   },
-                ] as estypes.QueryContainer[],
+                ] as estypes.QueryDslQueryContainer[],
               },
             },
             {
@@ -146,7 +146,7 @@ export const buildQuery = ({
                       'event.action': 'process_started',
                     },
                   },
-                ] as estypes.QueryContainer[],
+                ] as estypes.QueryDslQueryContainer[],
               },
             },
             {
diff --git a/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts b/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
index 6e884069f1373..1e8546bef50e5 100644
--- a/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
+++ b/x-pack/plugins/snapshot_restore/__jest__/client_integration/policy_add.test.ts
@@ -140,7 +140,7 @@ describe('<PolicyAdd />', () => {
 
           await act(async () => {
             // Toggle "All indices" switch
-            form.toggleEuiSwitch('allIndicesToggle', false);
+            form.toggleEuiSwitch('allIndicesToggle');
             await nextTick();
             component.update();
           });
@@ -158,7 +158,7 @@ describe('<PolicyAdd />', () => {
 
           await act(async () => {
             // Toggle "All indices" switch
-            form.toggleEuiSwitch('allIndicesToggle', false);
+            form.toggleEuiSwitch('allIndicesToggle');
             await nextTick();
           });
           component.update();
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 77264c4bffc9a..52e4e7011f0d4 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/policy.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/policy.ts
@@ -4,7 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import { PutSnapshotLifecycleRequest } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { schema, TypeOf } from '@kbn/config-schema';
 
 import { SlmPolicyEs, PolicyIndicesResponse } from '../../../common/types';
@@ -103,7 +103,7 @@ export function registerPolicyRoutes({
         const response = await clusterClient.asCurrentUser.slm.putLifecycle({
           policy_id: name,
           // TODO: bring {@link SlmPolicyEs['policy']} in line with {@link PutSnapshotLifecycleRequest['body']}
-          body: (serializePolicy(policy) as unknown) as PutSnapshotLifecycleRequest['body'],
+          body: (serializePolicy(policy) as unknown) as estypes.SlmPutLifecycleRequest['body'],
         });
 
         return res.ok({ body: response.body });
@@ -133,7 +133,7 @@ export function registerPolicyRoutes({
         const response = await clusterClient.asCurrentUser.slm.putLifecycle({
           policy_id: name,
           // TODO: bring {@link SlmPolicyEs['policy']} in line with {@link PutSnapshotLifecycleRequest['body']}
-          body: (serializePolicy(policy) as unknown) as PutSnapshotLifecycleRequest['body'],
+          body: (serializePolicy(policy) as unknown) as estypes.SlmPutLifecycleRequest['body'],
         });
 
         return res.ok({ body: response.body });
@@ -205,6 +205,7 @@ export function registerPolicyRoutes({
           name: '*',
           expand_wildcards: 'all',
         });
+        // @ts-expect-error Type 'ResolveIndexAliasItem[]' is not comparable to type 'IndexAndAliasFromEs[]'.
         const resolvedIndicesResponse = response.body as ResolveIndexResponseFromES;
 
         const body: PolicyIndicesResponse = {
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 96099e3fbb1eb..4254562a0a886 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/repositories.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/repositories.ts
@@ -116,7 +116,6 @@ export function registerRepositoriesRoutes({
         snapshot: '_all',
       });
 
-      // @ts-expect-error @elastic/elasticsearch remove this "as unknown" workaround when the types for this endpoint are correct. Track progress at https://github.com/elastic/elastic-client-generator/issues/250.
       const { responses: snapshotResponses } = response.body;
 
       if (repositoryByName[name]) {
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 b7281fee04c53..eb77c5e2d833f 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/restore.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/restore.ts
@@ -6,7 +6,7 @@
  */
 
 import { schema, TypeOf } from '@kbn/config-schema';
-import { RestoreRequest } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 
 import { SnapshotRestore, SnapshotRestoreShardEs } from '../../../common/types';
 import { serializeRestoreSettings } from '../../../common/lib';
@@ -108,7 +108,7 @@ export function registerRestoreRoutes({
           repository,
           snapshot,
           // TODO: Bring {@link RestoreSettingsEs} in line with {@link RestoreRequest['body']}
-          body: serializeRestoreSettings(restoreSettings) as RestoreRequest['body'],
+          body: serializeRestoreSettings(restoreSettings) as estypes.SnapshotRestoreRequest['body'],
         });
 
         return res.ok({ body: response.body });
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 8f6f44f63a556..8ce33cb8cd05b 100644
--- a/x-pack/plugins/snapshot_restore/server/routes/api/snapshots.ts
+++ b/x-pack/plugins/snapshot_restore/server/routes/api/snapshots.ts
@@ -73,7 +73,6 @@ export function registerSnapshotsRoutes({
             ignore_unavailable: true, // Allow request to succeed even if some snapshots are unavailable.
           });
 
-          // @ts-expect-error @elastic/elasticsearch remove this "as unknown" workaround when the types for this endpoint are correct. Track progress at https://github.com/elastic/elastic-client-generator/issues/250.
           const { responses: fetchedResponses } = response.body;
 
           // Decorate each snapshot with the repository with which it's associated.
@@ -135,7 +134,6 @@ export function registerSnapshotsRoutes({
           ignore_unavailable: true,
         });
 
-        // @ts-expect-error @elastic/elasticsearch remove this "as unknown" workaround when the types for this endpoint are correct. Track progress at https://github.com/elastic/elastic-client-generator/issues/250.
         const { responses: snapshotsResponse } = response.body;
 
         const snapshotsList =
@@ -144,7 +142,6 @@ export function registerSnapshotsRoutes({
           return res.notFound({ body: 'Snapshot not found' });
         }
         const selectedSnapshot = snapshotsList.find(
-          // @ts-expect-error @elastic/elasticsearch related to above incorrect type from client
           ({ snapshot: snapshotName }) => snapshot === snapshotName
         ) as SnapshotDetailsEs;
 
@@ -154,9 +151,7 @@ export function registerSnapshotsRoutes({
         }
 
         const successfulSnapshots = snapshotsList
-          // @ts-expect-error @elastic/elasticsearch related to above incorrect type from client
           .filter(({ state }) => state === 'SUCCESS')
-          // @ts-expect-error @elastic/elasticsearch related to above incorrect type from client
           .sort((a, b) => {
             return +new Date(b.end_time!) - +new Date(a.end_time!);
           }) as SnapshotDetailsEs[];
diff --git a/x-pack/plugins/spaces/server/config.ts b/x-pack/plugins/spaces/server/config.ts
index 2ad8ed654ebb6..2a2f363d769f7 100644
--- a/x-pack/plugins/spaces/server/config.ts
+++ b/x-pack/plugins/spaces/server/config.ts
@@ -28,6 +28,9 @@ const disabledDeprecation: ConfigDeprecation = (config, fromPath, addDeprecation
   if (config.xpack?.spaces?.enabled === false) {
     addDeprecation({
       message: `Disabling the Spaces plugin (xpack.spaces.enabled) will not be supported in the next major version (8.0)`,
+      correctiveActions: {
+        manualSteps: [`Remove "xpack.spaces.enabled: false" from your Kibana configuration`],
+      },
     });
   }
 };
diff --git a/x-pack/plugins/spaces/server/saved_objects/mappings.ts b/x-pack/plugins/spaces/server/saved_objects/mappings.ts
index 2b1763f1de583..82a134bfdbf62 100644
--- a/x-pack/plugins/spaces/server/saved_objects/mappings.ts
+++ b/x-pack/plugins/spaces/server/saved_objects/mappings.ts
@@ -38,7 +38,7 @@ export const SpacesSavedObjectMappings = deepFreeze({
       type: 'boolean',
     },
   },
-});
+} as const);
 
 export const UsageStatsMappings = deepFreeze({
   dynamic: false as false, // we aren't querying or aggregating over this data, so we don't need to specify any fields
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 34851073bd8a2..455307cb73a09 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
@@ -8,7 +8,7 @@ import { estypes } from '@elastic/elasticsearch';
 import type { ESSearchRequest } from '../../../../typings/elasticsearch';
 
 interface BuildSortedEventsQueryOpts {
-  aggs?: Record<string, estypes.AggregationContainer>;
+  aggs?: Record<string, estypes.AggregationsAggregationContainer>;
   track_total_hits: boolean | number;
   index: estypes.Indices;
   size: number;
diff --git a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression.tsx b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression.tsx
index f89f1133d0248..5111f427cd0d8 100644
--- a/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression.tsx
+++ b/x-pack/plugins/stack_alerts/public/alert_types/es_query/expression.tsx
@@ -41,7 +41,7 @@ import { buildSortedEventsQuery } from '../../../common/build_sorted_events_quer
 import { EsQueryAlertParams } from './types';
 import { IndexSelectPopover } from '../components/index_select_popover';
 
-function totalHitsToNumber(total: estypes.HitsMetadata['total']): number {
+function totalHitsToNumber(total: estypes.SearchHitsMetadata['total']): number {
   return typeof total === 'number' ? total : total.value;
 }
 
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 bc5d5c41c5cce..84a4569d9b860 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
@@ -29,7 +29,7 @@ export interface EsQueryAlertActionContext extends AlertInstanceContext {
   // threshold conditions
   conditions: string;
   // query matches
-  hits: estypes.Hit[];
+  hits: estypes.SearchHit[];
 }
 
 export function addMessages(
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 ece193e07d776..b81bc19d5c731 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
@@ -220,7 +220,7 @@ export function getAlertType(
       `alert ${ES_QUERY_ID}:${alertId} "${name}" result - ${JSON.stringify(searchResult)}`
     );
 
-    const numMatches = (searchResult.hits.total as estypes.TotalHits).value;
+    const numMatches = (searchResult.hits.total as estypes.SearchTotalHits).value;
 
     // apply the alert condition
     const conditionMet = compareFn(numMatches, params.threshold);
diff --git a/x-pack/plugins/task_manager/server/index.ts b/x-pack/plugins/task_manager/server/index.ts
index 155b8246905d1..80f0e298a8ac3 100644
--- a/x-pack/plugins/task_manager/server/index.ts
+++ b/x-pack/plugins/task_manager/server/index.ts
@@ -38,11 +38,23 @@ export const config: PluginConfigDescriptor<TaskManagerConfig> = {
         addDeprecation({
           documentationUrl: 'https://ela.st/kbn-remove-legacy-multitenancy',
           message: `"${fromPath}.index" is deprecated. Multitenancy by changing "kibana.index" will not be supported starting in 8.0. See https://ela.st/kbn-remove-legacy-multitenancy for more details`,
+          correctiveActions: {
+            manualSteps: [
+              `If you rely on this setting to achieve multitenancy you should use Spaces, cross-cluster replication, or cross-cluster search instead.`,
+              `To migrate to Spaces, we encourage using saved object management to export your saved objects from a tenant into the default tenant in a space.`,
+            ],
+          },
         });
       }
       if (taskManager?.max_workers > MAX_WORKERS_LIMIT) {
         addDeprecation({
           message: `setting "${fromPath}.max_workers" (${taskManager?.max_workers}) greater than ${MAX_WORKERS_LIMIT} is deprecated. Values greater than ${MAX_WORKERS_LIMIT} will not be supported starting in 8.0.`,
+          correctiveActions: {
+            manualSteps: [
+              `Maximum allowed value of "${fromPath}.max_workers" is ${MAX_WORKERS_LIMIT}.` +
+                `Replace "${fromPath}.max_workers: ${taskManager?.max_workers}" with (${MAX_WORKERS_LIMIT}).`,
+            ],
+          },
         });
       }
     },
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 a4913fca19ee8..f3ee21bc7d770 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
@@ -61,7 +61,7 @@ describe('Workload Statistics Aggregator', () => {
             doc_count_error_upper_bound: 0,
             sum_other_doc_count: 0,
           },
-          // The `FiltersAggregate` doesn't cover the case of a nested `AggregationContainer`, in which `FiltersAggregate`
+          // The `FiltersAggregate` doesn't cover the case of a nested `AggregationsAggregationContainer`, in which `FiltersAggregate`
           // would not have a `buckets` property, but rather a keyed property that's inferred from the request.
           // @ts-expect-error
           idleTasks: {
@@ -238,7 +238,7 @@ describe('Workload Statistics Aggregator', () => {
             },
           ],
         },
-        // The `FiltersAggregate` doesn't cover the case of a nested `AggregationContainer`, in which `FiltersAggregate`
+        // The `FiltersAggregate` doesn't cover the case of a nested `AggregationsAggregationContainer`, in which `FiltersAggregate`
         // would not have a `buckets` property, but rather a keyed property that's inferred from the request.
         // @ts-expect-error
         idleTasks: {
@@ -944,7 +944,7 @@ function setTaskTypeCount(
       ...rest.hits,
       total: {
         value: buckets.reduce((sum, bucket) => sum + bucket.doc_count, 0),
-        relation: 'eq' as estypes.TotalHitsRelation,
+        relation: 'eq' as estypes.SearchTotalHitsRelation,
       },
     },
     aggregations: {
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 548539b0db329..e251ce07679ff 100644
--- a/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
+++ b/x-pack/plugins/task_manager/server/monitoring/workload_statistics.ts
@@ -86,7 +86,6 @@ export interface WorkloadAggregation {
 
 // The type of a bucket in the scheduleDensity range aggregation
 type ScheduleDensityResult = AggregationResultOf<
-  // @ts-expect-error AggregationRange reqires from: number
   WorkloadAggregation['aggs']['idleTasks']['aggs']['scheduleDensity'],
   {}
 >['buckets'][0];
@@ -137,9 +136,7 @@ export function createWorkloadAggregator(
                   field: 'task.runAt',
                   ranges: [
                     {
-                      // @ts-expect-error @elastic/elasticsearch The `AggregationRange` type only supports `double` for `from` and `to` but it can be a string too for time based ranges
                       from: `now`,
-                      // @ts-expect-error @elastic/elasticsearch The `AggregationRange` type only supports `double` for `from` and `to` but it can be a string too for time based ranges
                       to: `now+${asInterval(scheduleDensityBuckets * pollInterval)}`,
                     },
                   ],
@@ -355,7 +352,7 @@ export function summarizeWorkloadStat(
 }
 
 function hasAggregations(
-  aggregations?: Record<string, estypes.Aggregate>
+  aggregations?: Record<string, estypes.AggregationsAggregate>
 ): aggregations is WorkloadAggregationResponse {
   return !!(
     aggregations?.taskType &&
@@ -368,9 +365,9 @@ export interface WorkloadAggregationResponse {
   taskType: TaskTypeAggregation;
   schedule: ScheduleAggregation;
   idleTasks: IdleTasksAggregation;
-  [otherAggs: string]: estypes.Aggregate;
+  [otherAggs: string]: estypes.AggregationsAggregate;
 }
-export interface TaskTypeAggregation extends estypes.FiltersAggregate {
+export interface TaskTypeAggregation extends estypes.AggregationsFiltersAggregate {
   buckets: Array<{
     doc_count: number;
     key: string | number;
@@ -386,7 +383,7 @@ export interface TaskTypeAggregation extends estypes.FiltersAggregate {
   doc_count_error_upper_bound?: number | undefined;
   sum_other_doc_count?: number | undefined;
 }
-export interface ScheduleAggregation extends estypes.FiltersAggregate {
+export interface ScheduleAggregation extends estypes.AggregationsFiltersAggregate {
   buckets: Array<{
     doc_count: number;
     key: string | number;
@@ -411,7 +408,7 @@ export type ScheduleDensityHistogram = DateRangeBucket & {
     >;
   };
 };
-export interface IdleTasksAggregation extends estypes.FiltersAggregate {
+export interface IdleTasksAggregation extends estypes.AggregationsFiltersAggregate {
   doc_count: number;
   scheduleDensity: {
     buckets: ScheduleDensityHistogram[];
diff --git a/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts b/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
index 2437e893abf37..1793ede8161df 100644
--- a/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
+++ b/x-pack/plugins/task_manager/server/queries/mark_available_tasks_as_claimed.ts
@@ -30,7 +30,7 @@ export function taskWithLessThanMaxAttempts(type: string, maxAttempts: number):
   };
 }
 
-export function tasksOfType(taskTypes: string[]): estypes.QueryContainer {
+export function tasksOfType(taskTypes: string[]): estypes.QueryDslQueryContainer {
   return {
     bool: {
       should: [...taskTypes].map((type) => ({ term: { 'task.taskType': type } })),
@@ -40,7 +40,7 @@ export function tasksOfType(taskTypes: string[]): estypes.QueryContainer {
 
 export function tasksClaimedByOwner(
   taskManagerId: string,
-  ...taskFilters: estypes.QueryContainer[]
+  ...taskFilters: estypes.QueryDslQueryContainer[]
 ) {
   return mustBeAllOf(
     {
@@ -104,7 +104,7 @@ if (doc['task.runAt'].size()!=0) {
 };
 export const SortByRunAtAndRetryAt = (SortByRunAtAndRetryAtScript as unknown) as Record<
   string,
-  estypes.Sort
+  estypes.SearchSort
 >;
 
 export const updateFieldsAndMarkAsFailed = (
diff --git a/x-pack/plugins/task_manager/server/queries/query_clauses.ts b/x-pack/plugins/task_manager/server/queries/query_clauses.ts
index 97c41295eece3..5f7cc8ed2bdb3 100644
--- a/x-pack/plugins/task_manager/server/queries/query_clauses.ts
+++ b/x-pack/plugins/task_manager/server/queries/query_clauses.ts
@@ -8,10 +8,10 @@
 import { estypes } from '@elastic/elasticsearch';
 
 export interface MustCondition {
-  bool: Pick<estypes.BoolQuery, 'must'>;
+  bool: Pick<estypes.QueryDslBoolQuery, 'must'>;
 }
 export interface MustNotCondition {
-  bool: Pick<estypes.BoolQuery, 'must_not'>;
+  bool: Pick<estypes.QueryDslBoolQuery, 'must_not'>;
 }
 
 export interface ScriptBasedSortClause {
@@ -24,7 +24,7 @@ export interface ScriptBasedSortClause {
 
 export interface ScriptClause {
   source: string;
-  lang: string;
+  lang: estypes.ScriptLanguage;
   params?: {
     [field: string]:
       | string
@@ -35,16 +35,16 @@ export interface ScriptClause {
   };
 }
 
-export type PinnedQuery = Pick<estypes.QueryContainer, 'pinned'>;
+export type PinnedQuery = Pick<estypes.QueryDslQueryContainer, 'pinned'>;
 
-type BoolClause = Pick<estypes.QueryContainer, 'bool'>;
+type BoolClause = Pick<estypes.QueryDslQueryContainer, 'bool'>;
 export function matchesClauses(...clauses: BoolClause[]): BoolClause {
   return {
     bool: Object.assign({}, ...clauses.map((clause) => clause.bool)),
   };
 }
 
-export function shouldBeOneOf(...should: estypes.QueryContainer[]) {
+export function shouldBeOneOf(...should: estypes.QueryDslQueryContainer[]) {
   return {
     bool: {
       should,
@@ -52,7 +52,7 @@ export function shouldBeOneOf(...should: estypes.QueryContainer[]) {
   };
 }
 
-export function mustBeAllOf(...must: estypes.QueryContainer[]) {
+export function mustBeAllOf(...must: estypes.QueryDslQueryContainer[]) {
   return {
     bool: {
       must,
@@ -60,7 +60,7 @@ export function mustBeAllOf(...must: estypes.QueryContainer[]) {
   };
 }
 
-export function filterDownBy(...filter: estypes.QueryContainer[]) {
+export function filterDownBy(...filter: estypes.QueryDslQueryContainer[]) {
   return {
     bool: {
       filter,
@@ -69,9 +69,9 @@ export function filterDownBy(...filter: estypes.QueryContainer[]) {
 }
 
 export function asPinnedQuery(
-  ids: estypes.PinnedQuery['ids'],
-  organic: estypes.PinnedQuery['organic']
-): Pick<estypes.QueryContainer, 'pinned'> {
+  ids: estypes.QueryDslPinnedQuery['ids'],
+  organic: estypes.QueryDslPinnedQuery['organic']
+): Pick<estypes.QueryDslQueryContainer, 'pinned'> {
   return {
     pinned: {
       ids,
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 8f1332ccd1f9f..ee185ac6ce6bb 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
@@ -20,10 +20,11 @@ import { mockLogger } from '../test_utils';
 import { TaskClaiming, OwnershipClaimingOpts, TaskClaimingOpts } from './task_claiming';
 import { Observable } from 'rxjs';
 import { taskStoreMock } from '../task_store.mock';
+import apm from 'elastic-apm-node';
 
 const taskManagerLogger = mockLogger();
 
-beforeEach(() => jest.resetAllMocks());
+beforeEach(() => jest.clearAllMocks());
 
 const mockedDate = new Date('2019-02-12T21:01:22.479Z');
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
@@ -52,7 +53,19 @@ taskDefinitions.registerTaskDefinitions({
   },
 });
 
+const mockApmTrans = {
+  end: jest.fn(),
+};
+
 describe('TaskClaiming', () => {
+  beforeEach(() => {
+    jest.clearAllMocks();
+    jest
+      .spyOn(apm, 'startTransaction')
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      .mockImplementation(() => mockApmTrans as any);
+  });
+
   test(`should log when a certain task type is skipped due to having a zero concurency configuration`, () => {
     const definitions = new TaskTypeDictionary(mockLogger());
     definitions.registerTaskDefinitions({
@@ -169,6 +182,12 @@ describe('TaskClaiming', () => {
 
       const results = await getAllAsPromise(taskClaiming.claimAvailableTasks(claimingOpts));
 
+      expect(apm.startTransaction).toHaveBeenCalledWith(
+        'markAvailableTasksAsClaimed',
+        'taskManager markAvailableTasksAsClaimed'
+      );
+      expect(mockApmTrans.end).toHaveBeenCalledWith('success');
+
       expect(store.updateByQuery.mock.calls[0][1]).toMatchObject({
         max_docs: getCapacity(),
       });
@@ -187,6 +206,49 @@ describe('TaskClaiming', () => {
       }));
     }
 
+    test('makes calls to APM as expected when markAvailableTasksAsClaimed throws error', async () => {
+      const maxAttempts = _.random(2, 43);
+      const customMaxAttempts = _.random(44, 100);
+
+      const definitions = new TaskTypeDictionary(mockLogger());
+      definitions.registerTaskDefinitions({
+        foo: {
+          title: 'foo',
+          createTaskRunner: jest.fn(),
+        },
+        bar: {
+          title: 'bar',
+          maxAttempts: customMaxAttempts,
+          createTaskRunner: jest.fn(),
+        },
+      });
+
+      const { taskClaiming, store } = initialiseTestClaiming({
+        storeOpts: {
+          definitions,
+        },
+        taskClaimingOpts: {
+          maxAttempts,
+        },
+      });
+
+      store.updateByQuery.mockRejectedValue(new Error('Oh no'));
+
+      await expect(
+        getAllAsPromise(
+          taskClaiming.claimAvailableTasks({
+            claimOwnershipUntil: new Date(),
+          })
+        )
+      ).rejects.toMatchInlineSnapshot(`[Error: Oh no]`);
+
+      expect(apm.startTransaction).toHaveBeenCalledWith(
+        'markAvailableTasksAsClaimed',
+        'taskManager markAvailableTasksAsClaimed'
+      );
+      expect(mockApmTrans.end).toHaveBeenCalledWith('failure');
+    });
+
     test('it filters claimed tasks down by supported types, maxAttempts, status, and runAt', async () => {
       const maxAttempts = _.random(2, 43);
       const customMaxAttempts = _.random(44, 100);
@@ -1105,6 +1167,7 @@ if (doc['task.runAt'].size()!=0) {
           startedAt: null,
           retryAt: null,
           scheduledAt: new Date(),
+          traceparent: 'parent',
         },
         {
           id: 'claimed-by-schedule',
@@ -1121,6 +1184,7 @@ if (doc['task.runAt'].size()!=0) {
           startedAt: null,
           retryAt: null,
           scheduledAt: new Date(),
+          traceparent: 'newParent',
         },
         {
           id: 'already-running',
@@ -1137,6 +1201,7 @@ if (doc['task.runAt'].size()!=0) {
           startedAt: null,
           retryAt: null,
           scheduledAt: new Date(),
+          traceparent: '',
         },
       ];
 
@@ -1222,6 +1287,7 @@ if (doc['task.runAt'].size()!=0) {
             startedAt: null,
             retryAt: null,
             scheduledAt: new Date(),
+            traceparent: 'parent',
           })
         )
       );
@@ -1277,6 +1343,7 @@ if (doc['task.runAt'].size()!=0) {
               startedAt: null,
               retryAt: null,
               scheduledAt: new Date(),
+              traceparent: '',
             },
           ],
           // second cycle
@@ -1296,6 +1363,7 @@ if (doc['task.runAt'].size()!=0) {
               startedAt: null,
               retryAt: null,
               scheduledAt: new Date(),
+              traceparent: '',
             },
           ],
         ],
@@ -1347,6 +1415,7 @@ if (doc['task.runAt'].size()!=0) {
               startedAt: null,
               retryAt: null,
               scheduledAt: new Date(),
+              traceparent: '',
             }),
             errorType: TaskClaimErrorType.CLAIMED_BY_ID_OUT_OF_CAPACITY,
           })
@@ -1393,6 +1462,7 @@ if (doc['task.runAt'].size()!=0) {
             startedAt: null,
             retryAt: null,
             scheduledAt: new Date(),
+            traceparent: 'newParent',
           })
         )
       );
@@ -1437,6 +1507,7 @@ if (doc['task.runAt'].size()!=0) {
               startedAt: null,
               retryAt: null,
               scheduledAt: new Date(),
+              traceparent: '',
             }),
             errorType: TaskClaimErrorType.CLAIMED_BY_ID_NOT_IN_CLAIMING_STATUS,
           })
@@ -1499,6 +1570,7 @@ function mockInstance(instance: Partial<ConcreteTaskInstance> = {}) {
       status: 'idle',
       user: 'example',
       ownerId: null,
+      traceparent: '',
     },
     instance
   );
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 dce7824281658..7f15707a14b30 100644
--- a/x-pack/plugins/task_manager/server/queries/task_claiming.ts
+++ b/x-pack/plugins/task_manager/server/queries/task_claiming.ts
@@ -379,34 +379,41 @@ export class TaskClaiming {
       sort.unshift('_score');
     }
 
-    const apmTrans = apm.startTransaction(`taskManager markAvailableTasksAsClaimed`, 'taskManager');
-    const result = await this.taskStore.updateByQuery(
-      {
-        query: matchesClauses(
-          claimTasksById && claimTasksById.length
-            ? mustBeAllOf(asPinnedQuery(claimTasksById, queryForScheduledTasks))
-            : queryForScheduledTasks,
-          filterDownBy(InactiveTasks)
-        ),
-        script: updateFieldsAndMarkAsFailed(
-          {
-            ownerId: this.taskStore.taskManagerId,
-            retryAt: claimOwnershipUntil,
-          },
-          claimTasksById || [],
-          taskTypesToClaim,
-          taskTypesToSkip,
-          pick(this.taskMaxAttempts, taskTypesToClaim)
-        ),
-        sort,
-      },
-      {
-        max_docs: size,
-      }
+    const apmTrans = apm.startTransaction(
+      'markAvailableTasksAsClaimed',
+      `taskManager markAvailableTasksAsClaimed`
     );
-
-    if (apmTrans) apmTrans.end();
-    return result;
+    try {
+      const result = await this.taskStore.updateByQuery(
+        {
+          query: matchesClauses(
+            claimTasksById && claimTasksById.length
+              ? mustBeAllOf(asPinnedQuery(claimTasksById, queryForScheduledTasks))
+              : queryForScheduledTasks,
+            filterDownBy(InactiveTasks)
+          ),
+          script: updateFieldsAndMarkAsFailed(
+            {
+              ownerId: this.taskStore.taskManagerId,
+              retryAt: claimOwnershipUntil,
+            },
+            claimTasksById || [],
+            taskTypesToClaim,
+            taskTypesToSkip,
+            pick(this.taskMaxAttempts, taskTypesToClaim)
+          ),
+          sort,
+        },
+        {
+          max_docs: size,
+        }
+      );
+      apmTrans?.end('success');
+      return result;
+    } catch (err) {
+      apmTrans?.end('failure');
+      throw err;
+    }
   }
 
   /**
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 33b57b62b31aa..c032e8d658a40 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 { SavedObjectsServiceSetup } from 'kibana/server';
+import type { SavedObjectsServiceSetup, SavedObjectsTypeMappingDefinition } from 'kibana/server';
 import mappings from './mappings.json';
 import { migrations } from './migrations';
 import { TaskManagerConfig } from '../config.js';
@@ -19,7 +19,7 @@ export function setupSavedObjects(
     namespaceType: 'agnostic',
     hidden: true,
     convertToAliasScript: `ctx._id = ctx._source.type + ':' + ctx._id; ctx._source.remove("kibana")`,
-    mappings: mappings.task,
+    mappings: mappings.task as SavedObjectsTypeMappingDefinition,
     migrations,
     indexPattern: config.index,
   });
diff --git a/x-pack/plugins/task_manager/server/saved_objects/mappings.json b/x-pack/plugins/task_manager/server/saved_objects/mappings.json
index 1728c8f1c552b..d046a9266cce5 100644
--- a/x-pack/plugins/task_manager/server/saved_objects/mappings.json
+++ b/x-pack/plugins/task_manager/server/saved_objects/mappings.json
@@ -29,6 +29,9 @@
       "status": {
         "type": "keyword"
       },
+      "traceparent": {
+        "type": "text"
+      },
       "params": {
         "type": "text"
       },
diff --git a/x-pack/plugins/task_manager/server/task.ts b/x-pack/plugins/task_manager/server/task.ts
index 4b86943ff8eca..8f515e1951ef5 100644
--- a/x-pack/plugins/task_manager/server/task.ts
+++ b/x-pack/plugins/task_manager/server/task.ts
@@ -257,6 +257,11 @@ export interface TaskInstance {
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   state: Record<string, any>;
 
+  /**
+   * The serialized traceparent string of the current APM transaction or span.
+   */
+  traceparent?: string;
+
   /**
    * The id of the user who scheduled this task.
    */
@@ -364,6 +369,7 @@ export type SerializedConcreteTaskInstance = Omit<
 > & {
   state: string;
   params: string;
+  traceparent: string;
   scheduledAt: string;
   startedAt: string | null;
   retryAt: string | null;
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 5a36d6affe686..d5a86b532b0ae 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
@@ -18,6 +18,7 @@ import { TaskDefinitionRegistry, TaskTypeDictionary } from '../task_type_diction
 import { mockLogger } from '../test_utils';
 import { throwUnrecoverableError } from './errors';
 import { taskStoreMock } from '../task_store.mock';
+import apm from 'elastic-apm-node';
 
 const minutesFromNow = (mins: number): Date => secondsFromNow(mins * 60);
 
@@ -32,8 +33,70 @@ afterAll(() => fakeTimer.restore());
 describe('TaskManagerRunner', () => {
   const pendingStageSetup = (opts: TestOpts) => testOpts(TaskRunningStage.PENDING, opts);
   const readyToRunStageSetup = (opts: TestOpts) => testOpts(TaskRunningStage.READY_TO_RUN, opts);
+  const mockApmTrans = {
+    end: jest.fn(),
+  };
 
   describe('Pending Stage', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+      jest
+        .spyOn(apm, 'startTransaction')
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        .mockImplementation(() => mockApmTrans as any);
+    });
+    test('makes calls to APM as expected when task markedAsRunning is success', async () => {
+      const { runner } = await pendingStageSetup({
+        instance: {
+          schedule: {
+            interval: '10m',
+          },
+        },
+        definitions: {
+          bar: {
+            title: 'Bar!',
+            createTaskRunner: () => ({
+              run: async () => undefined,
+            }),
+          },
+        },
+      });
+      await runner.markTaskAsRunning();
+      expect(apm.startTransaction).toHaveBeenCalledWith(
+        'taskManager',
+        'taskManager markTaskAsRunning'
+      );
+      expect(mockApmTrans.end).toHaveBeenCalledWith('success');
+    });
+    test('makes calls to APM as expected when task markedAsRunning fails', async () => {
+      const { runner, store } = await pendingStageSetup({
+        instance: {
+          schedule: {
+            interval: '10m',
+          },
+        },
+        definitions: {
+          bar: {
+            title: 'Bar!',
+            createTaskRunner: () => ({
+              run: async () => undefined,
+            }),
+          },
+        },
+      });
+      store.update.mockRejectedValue(
+        SavedObjectsErrorHelpers.createGenericNotFoundError('type', 'id')
+      );
+      await expect(runner.markTaskAsRunning()).rejects.toMatchInlineSnapshot(
+        `[Error: Saved object [type/id] not found]`
+      );
+      // await runner.markTaskAsRunning();
+      expect(apm.startTransaction).toHaveBeenCalledWith(
+        'taskManager',
+        'taskManager markTaskAsRunning'
+      );
+      expect(mockApmTrans.end).toHaveBeenCalledWith('failure');
+    });
     test('provides details about the task that is running', async () => {
       const { runner } = await pendingStageSetup({
         instance: {
@@ -572,6 +635,55 @@ describe('TaskManagerRunner', () => {
   });
 
   describe('Ready To Run Stage', () => {
+    beforeEach(() => {
+      jest.clearAllMocks();
+    });
+    test('makes calls to APM as expected when task runs successfully', async () => {
+      const { runner } = await readyToRunStageSetup({
+        instance: {
+          params: { a: 'b' },
+          state: { hey: 'there' },
+        },
+        definitions: {
+          bar: {
+            title: 'Bar!',
+            createTaskRunner: () => ({
+              async run() {
+                return { state: {} };
+              },
+            }),
+          },
+        },
+      });
+      await runner.run();
+      expect(apm.startTransaction).toHaveBeenCalledWith('bar', 'taskManager run', {
+        childOf: 'apmTraceparent',
+      });
+      expect(mockApmTrans.end).toHaveBeenCalledWith('success');
+    });
+    test('makes calls to APM as expected when task fails', async () => {
+      const { runner } = await readyToRunStageSetup({
+        instance: {
+          params: { a: 'b' },
+          state: { hey: 'there' },
+        },
+        definitions: {
+          bar: {
+            title: 'Bar!',
+            createTaskRunner: () => ({
+              async run() {
+                throw new Error('rar');
+              },
+            }),
+          },
+        },
+      });
+      await runner.run();
+      expect(apm.startTransaction).toHaveBeenCalledWith('bar', 'taskManager run', {
+        childOf: 'apmTraceparent',
+      });
+      expect(mockApmTrans.end).toHaveBeenCalledWith('failure');
+    });
     test('queues a reattempt if the task fails', async () => {
       const initialAttempts = _.random(0, 2);
       const id = Date.now().toString();
@@ -1275,6 +1387,7 @@ describe('TaskManagerRunner', () => {
         status: 'idle',
         user: 'example',
         ownerId: null,
+        traceparent: 'apmTraceparent',
       },
       instance
     );
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 8e061eae46028..fc88a66329170 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
@@ -12,6 +12,7 @@
  */
 
 import apm from 'elastic-apm-node';
+import { withSpan } from '@kbn/apm-utils';
 import { performance } from 'perf_hooks';
 import { identity, defaults, flow } from 'lodash';
 import { Logger, SavedObjectsErrorHelpers } from '../../../../../src/core/server';
@@ -242,30 +243,38 @@ export class TaskManagerRunner implements TaskRunner {
       );
     }
     this.logger.debug(`Running task ${this}`);
+
+    const apmTrans = apm.startTransaction(this.taskType, 'taskManager run', {
+      childOf: this.instance.task.traceparent,
+    });
+
     const modifiedContext = await this.beforeRun({
       taskInstance: this.instance.task,
     });
 
     const stopTaskTimer = startTaskTimer();
-    const apmTrans = apm.startTransaction(`taskManager run`, 'taskManager');
-    apmTrans?.addLabels({
-      taskType: this.taskType,
-    });
+
     try {
       this.task = this.definition.createTaskRunner(modifiedContext);
-      const result = await this.task.run();
+      const result = await withSpan({ name: 'run', type: 'task manager' }, () => this.task!.run());
       const validatedResult = this.validateResult(result);
+      const processedResult = await withSpan({ name: 'process result', type: 'task manager' }, () =>
+        this.processResult(validatedResult, stopTaskTimer())
+      );
       if (apmTrans) apmTrans.end('success');
-      return this.processResult(validatedResult, stopTaskTimer());
+      return processedResult;
     } catch (err) {
       this.logger.error(`Task ${this} failed: ${err}`);
       // in error scenario, we can not get the RunResult
       // re-use modifiedContext's state, which is correct as of beforeRun
-      if (apmTrans) apmTrans.end('error');
-      return this.processResult(
-        asErr({ error: err, state: modifiedContext.taskInstance.state }),
-        stopTaskTimer()
+      const processedResult = await withSpan({ name: 'process result', type: 'task manager' }, () =>
+        this.processResult(
+          asErr({ error: err, state: modifiedContext.taskInstance.state }),
+          stopTaskTimer()
+        )
       );
+      if (apmTrans) apmTrans.end('failure');
+      return processedResult;
     }
   }
 
@@ -285,10 +294,7 @@ export class TaskManagerRunner implements TaskRunner {
     }
     performance.mark('markTaskAsRunning_start');
 
-    const apmTrans = apm.startTransaction(`taskManager markTaskAsRunning`, 'taskManager');
-    apmTrans?.addLabels({
-      taskType: this.taskType,
-    });
+    const apmTrans = apm.startTransaction('taskManager', 'taskManager markTaskAsRunning');
 
     const now = new Date();
     try {
diff --git a/x-pack/plugins/task_manager/server/task_scheduling.test.ts b/x-pack/plugins/task_manager/server/task_scheduling.test.ts
index b142f2091291e..3445bd18de102 100644
--- a/x-pack/plugins/task_manager/server/task_scheduling.test.ts
+++ b/x-pack/plugins/task_manager/server/task_scheduling.test.ts
@@ -27,6 +27,10 @@ import { TaskRunResult } from './task_running';
 import { mockLogger } from './test_utils';
 import { TaskTypeDictionary } from './task_type_dictionary';
 
+jest.mock('elastic-apm-node', () => ({
+  currentTraceparent: 'parent',
+}));
+
 describe('TaskScheduling', () => {
   const mockTaskStore = taskStoreMock.create({});
   const mockTaskManager = taskPollingLifecycleMock.create({});
@@ -60,6 +64,12 @@ describe('TaskScheduling', () => {
     };
     await taskScheduling.schedule(task);
     expect(mockTaskStore.schedule).toHaveBeenCalled();
+    expect(mockTaskStore.schedule).toHaveBeenCalledWith({
+      ...task,
+      id: undefined,
+      schedule: undefined,
+      traceparent: 'parent',
+    });
   });
 
   test('allows scheduling existing tasks that may have already been scheduled', async () => {
@@ -420,6 +430,7 @@ function mockTask(overrides: Partial<ConcreteTaskInstance> = {}): ConcreteTaskIn
     startedAt: null,
     retryAt: null,
     scheduledAt: new Date(),
+    traceparent: 'taskTraceparent',
     ...overrides,
   };
 }
diff --git a/x-pack/plugins/task_manager/server/task_scheduling.ts b/x-pack/plugins/task_manager/server/task_scheduling.ts
index 29e83ec911b79..153c16f5c4bf7 100644
--- a/x-pack/plugins/task_manager/server/task_scheduling.ts
+++ b/x-pack/plugins/task_manager/server/task_scheduling.ts
@@ -10,6 +10,7 @@ import { filter } from 'rxjs/operators';
 import { pipe } from 'fp-ts/lib/pipeable';
 import { Option, map as mapOptional, getOrElse, isSome } from 'fp-ts/lib/Option';
 
+import agent from 'elastic-apm-node';
 import { Logger } from '../../../../src/core/server';
 import { asOk, either, map, mapErr, promiseResult } from './lib/result_type';
 import {
@@ -85,7 +86,10 @@ export class TaskScheduling {
       ...options,
       taskInstance: ensureDeprecatedFieldsAreCorrected(taskInstance, this.logger),
     });
-    return await this.store.schedule(modifiedTask);
+    return await this.store.schedule({
+      ...modifiedTask,
+      traceparent: agent.currentTraceparent ?? '',
+    });
   }
 
   /**
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 a44bddcdb8201..f3b4014c9c919 100644
--- a/x-pack/plugins/task_manager/server/task_store.test.ts
+++ b/x-pack/plugins/task_manager/server/task_store.test.ts
@@ -94,6 +94,7 @@ describe('TaskStore', () => {
         params: { hello: 'world' },
         state: { foo: 'bar' },
         taskType: 'report',
+        traceparent: 'apmTraceparent',
       };
       const result = await testSchedule(task);
 
@@ -112,6 +113,7 @@ describe('TaskStore', () => {
           status: 'idle',
           taskType: 'report',
           user: undefined,
+          traceparent: 'apmTraceparent',
         },
         {
           id: 'id',
@@ -134,6 +136,7 @@ describe('TaskStore', () => {
         taskType: 'report',
         user: undefined,
         version: '123',
+        traceparent: 'apmTraceparent',
       });
     });
 
@@ -205,7 +208,7 @@ describe('TaskStore', () => {
       });
     });
 
-    async function testFetch(opts?: SearchOpts, hits: Array<estypes.Hit<unknown>> = []) {
+    async function testFetch(opts?: SearchOpts, hits: Array<estypes.SearchHit<unknown>> = []) {
       esClient.search.mockResolvedValue(asApiResponse({ hits: { hits, total: hits.length } }));
 
       const result = await store.fetch(opts);
@@ -285,6 +288,7 @@ describe('TaskStore', () => {
         status: 'idle' as TaskStatus,
         version: '123',
         ownerId: null,
+        traceparent: 'myTraceparent',
       };
 
       savedObjectsClient.update.mockImplementation(
@@ -318,6 +322,7 @@ describe('TaskStore', () => {
           taskType: task.taskType,
           user: undefined,
           ownerId: null,
+          traceparent: 'myTraceparent',
         },
         { version: '123', refresh: false }
       );
@@ -347,6 +352,7 @@ describe('TaskStore', () => {
         status: 'idle' as TaskStatus,
         version: '123',
         ownerId: null,
+        traceparent: '',
       };
 
       const firstErrorPromise = store.errors$.pipe(first()).toPromise();
@@ -384,6 +390,7 @@ describe('TaskStore', () => {
         status: 'idle' as TaskStatus,
         version: '123',
         ownerId: null,
+        traceparent: '',
       };
 
       const firstErrorPromise = store.errors$.pipe(first()).toPromise();
@@ -500,6 +507,7 @@ describe('TaskStore', () => {
             status: status as TaskStatus,
             version: '123',
             ownerId: null,
+            traceparent: 'myTraceparent',
           };
 
           savedObjectsClient.get.mockImplementation(async (type: string, objectId: string) => ({
diff --git a/x-pack/plugins/task_manager/server/task_store.ts b/x-pack/plugins/task_manager/server/task_store.ts
index 0eeccd0af75f7..ce01660134683 100644
--- a/x-pack/plugins/task_manager/server/task_store.ts
+++ b/x-pack/plugins/task_manager/server/task_store.ts
@@ -46,14 +46,14 @@ export interface StoreOpts {
 export interface SearchOpts {
   search_after?: Array<number | string>;
   size?: number;
-  sort?: estypes.Sort;
-  query?: estypes.QueryContainer;
+  sort?: estypes.SearchSort;
+  query?: estypes.QueryDslQueryContainer;
   seq_no_primary_term?: boolean;
 }
 
 export interface AggregationOpts {
-  aggs: Record<string, estypes.AggregationContainer>;
-  query?: estypes.QueryContainer;
+  aggs: Record<string, estypes.AggregationsAggregationContainer>;
+  query?: estypes.QueryDslQueryContainer;
   size?: number;
 }
 
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 12e83008b2e5a..7c96dce3fac7f 100644
--- a/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
+++ b/x-pack/plugins/telemetry_collection_xpack/schema/xpack_plugins.json
@@ -2041,6 +2041,12 @@
                 "description": "The total number of enrolled agents in an unhealthy state"
               }
             },
+            "updating": {
+              "type": "long",
+              "_meta": {
+                "description": "The total number of enrolled agents in an updating state"
+              }
+            },
             "offline": {
               "type": "long",
               "_meta": {
@@ -2055,6 +2061,52 @@
             }
           }
         },
+        "fleet_server": {
+          "properties": {
+            "total_enrolled": {
+              "type": "long",
+              "_meta": {
+                "description": "The total number of enrolled Fleet Server agents, in any state"
+              }
+            },
+            "total_all_statuses": {
+              "type": "long",
+              "_meta": {
+                "description": "The total number of Fleet Server agents in any state, both enrolled and inactive."
+              }
+            },
+            "healthy": {
+              "type": "long",
+              "_meta": {
+                "description": "The total number of enrolled Fleet Server agents in a healthy state."
+              }
+            },
+            "unhealthy": {
+              "type": "long",
+              "_meta": {
+                "description": "The total number of enrolled Fleet Server agents in an unhealthy state"
+              }
+            },
+            "updating": {
+              "type": "long",
+              "_meta": {
+                "description": "The total number of enrolled Fleet Server agents in an updating state"
+              }
+            },
+            "offline": {
+              "type": "long",
+              "_meta": {
+                "description": "The total number of enrolled Fleet Server agents currently offline"
+              }
+            },
+            "num_host_urls": {
+              "type": "long",
+              "_meta": {
+                "description": "The number of Fleet Server hosts configured in Fleet settings."
+              }
+            }
+          }
+        },
         "packages": {
           "type": "array",
           "items": {
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 3db9f06bd8bf6..ad7d5439f8765 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
@@ -7,7 +7,7 @@
 import type { estypes } from '@elastic/elasticsearch';
 import { ElasticsearchClient } from 'src/core/server';
 
-export type ESLicense = estypes.LicenseInformation;
+export type ESLicense = estypes.LicenseGetLicenseInformation;
 
 let cachedLicense: ESLicense | undefined;
 
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 86d1554a4fd57..75b9c736de901 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
@@ -91,7 +91,7 @@ function mockEsClient() {
         cluster_uuid: 'test',
         cluster_name: 'test',
         version: { number: '8.0.0' } as estypes.ElasticsearchVersionInfo,
-      } as estypes.RootNodeInfoResponse,
+      } as estypes.InfoResponse,
     }
   );
 
diff --git a/x-pack/plugins/telemetry_collection_xpack/tsconfig.json b/x-pack/plugins/telemetry_collection_xpack/tsconfig.json
index 1221200c7548c..f4c17c4317a9f 100644
--- a/x-pack/plugins/telemetry_collection_xpack/tsconfig.json
+++ b/x-pack/plugins/telemetry_collection_xpack/tsconfig.json
@@ -11,7 +11,10 @@
   "include": [
     "common/**/*",
     "server/**/*",
-    "../../../typings/*"
+    "../../../typings/*",
+    "schema/xpack_monitoring.json",
+    "schema/xpack_plugins.json",
+    "schema/xpack_root.json",
   ],
   "references": [
     { "path": "../../../src/core/tsconfig.json" },
diff --git a/x-pack/plugins/transform/common/api_schemas/type_guards.ts b/x-pack/plugins/transform/common/api_schemas/type_guards.ts
index 4b66de9be20d2..1f27f1798c8e7 100644
--- a/x-pack/plugins/transform/common/api_schemas/type_guards.ts
+++ b/x-pack/plugins/transform/common/api_schemas/type_guards.ts
@@ -74,7 +74,7 @@ export const isEsSearchResponseWithAggregations = (
 
 export const isMultiBucketAggregate = <TBucket = unknown>(
   arg: unknown
-): arg is estypes.MultiBucketAggregate<TBucket> => {
+): arg is estypes.AggregationsMultiBucketAggregate<TBucket> => {
   return isPopulatedObject(arg, ['buckets']);
 };
 
diff --git a/x-pack/plugins/transform/common/types/pivot_aggs.ts b/x-pack/plugins/transform/common/types/pivot_aggs.ts
index c50852e53254a..ced4d0a9bce0c 100644
--- a/x-pack/plugins/transform/common/types/pivot_aggs.ts
+++ b/x-pack/plugins/transform/common/types/pivot_aggs.ts
@@ -17,6 +17,7 @@ export const PIVOT_SUPPORTED_AGGS = {
   SUM: 'sum',
   VALUE_COUNT: 'value_count',
   FILTER: 'filter',
+  TOP_METRICS: 'top_metrics',
 } as const;
 
 export type PivotSupportedAggs = typeof PIVOT_SUPPORTED_AGGS[keyof typeof PIVOT_SUPPORTED_AGGS];
diff --git a/x-pack/plugins/transform/public/app/common/pivot_aggs.test.ts b/x-pack/plugins/transform/public/app/common/pivot_aggs.test.ts
index dba9fa5dd83ba..f92bf1cdf59d9 100644
--- a/x-pack/plugins/transform/public/app/common/pivot_aggs.test.ts
+++ b/x-pack/plugins/transform/public/app/common/pivot_aggs.test.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { getAggConfigFromEsAgg } from './pivot_aggs';
+import { getAggConfigFromEsAgg, isSpecialSortField } from './pivot_aggs';
 import {
   FilterAggForm,
   FilterTermForm,
@@ -67,3 +67,12 @@ describe('getAggConfigFromEsAgg', () => {
     });
   });
 });
+
+describe('isSpecialSortField', () => {
+  test('detects special sort field', () => {
+    expect(isSpecialSortField('_score')).toBe(true);
+  });
+  test('rejects special fields that not supported yet', () => {
+    expect(isSpecialSortField('_doc')).toBe(false);
+  });
+});
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 03e06d36f9319..97685096a5d22 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 { KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
+import { ES_FIELD_TYPES, KBN_FIELD_TYPES } from '../../../../../../src/plugins/data/common';
 
 import type { AggName } from '../../../common/types/aggregations';
 import type { Dictionary } from '../../../common/types/common';
@@ -43,6 +43,7 @@ export const pivotAggsFieldSupport = {
     PIVOT_SUPPORTED_AGGS.CARDINALITY,
     PIVOT_SUPPORTED_AGGS.VALUE_COUNT,
     PIVOT_SUPPORTED_AGGS.FILTER,
+    PIVOT_SUPPORTED_AGGS.TOP_METRICS,
   ],
   [KBN_FIELD_TYPES.MURMUR3]: [PIVOT_SUPPORTED_AGGS.VALUE_COUNT, PIVOT_SUPPORTED_AGGS.FILTER],
   [KBN_FIELD_TYPES.NUMBER]: [
@@ -54,17 +55,78 @@ export const pivotAggsFieldSupport = {
     PIVOT_SUPPORTED_AGGS.SUM,
     PIVOT_SUPPORTED_AGGS.VALUE_COUNT,
     PIVOT_SUPPORTED_AGGS.FILTER,
+    PIVOT_SUPPORTED_AGGS.TOP_METRICS,
   ],
   [KBN_FIELD_TYPES.STRING]: [
     PIVOT_SUPPORTED_AGGS.CARDINALITY,
     PIVOT_SUPPORTED_AGGS.VALUE_COUNT,
     PIVOT_SUPPORTED_AGGS.FILTER,
+    PIVOT_SUPPORTED_AGGS.TOP_METRICS,
   ],
   [KBN_FIELD_TYPES._SOURCE]: [PIVOT_SUPPORTED_AGGS.VALUE_COUNT, PIVOT_SUPPORTED_AGGS.FILTER],
   [KBN_FIELD_TYPES.UNKNOWN]: [PIVOT_SUPPORTED_AGGS.VALUE_COUNT, PIVOT_SUPPORTED_AGGS.FILTER],
   [KBN_FIELD_TYPES.CONFLICT]: [PIVOT_SUPPORTED_AGGS.VALUE_COUNT, PIVOT_SUPPORTED_AGGS.FILTER],
 };
 
+export const TOP_METRICS_SORT_FIELD_TYPES = [
+  KBN_FIELD_TYPES.NUMBER,
+  KBN_FIELD_TYPES.DATE,
+  KBN_FIELD_TYPES.GEO_POINT,
+];
+
+export const SORT_DIRECTION = {
+  ASC: 'asc',
+  DESC: 'desc',
+} as const;
+
+export type SortDirection = typeof SORT_DIRECTION[keyof typeof SORT_DIRECTION];
+
+export const SORT_MODE = {
+  MIN: 'min',
+  MAX: 'max',
+  AVG: 'avg',
+  SUM: 'sum',
+  MEDIAN: 'median',
+} as const;
+
+export const NUMERIC_TYPES_OPTIONS = {
+  [KBN_FIELD_TYPES.NUMBER]: [ES_FIELD_TYPES.DOUBLE, ES_FIELD_TYPES.LONG],
+  [KBN_FIELD_TYPES.DATE]: [ES_FIELD_TYPES.DATE, ES_FIELD_TYPES.DATE_NANOS],
+};
+
+export type KbnNumericType = typeof KBN_FIELD_TYPES.NUMBER | typeof KBN_FIELD_TYPES.DATE;
+
+const SORT_NUMERIC_FIELD_TYPES = [
+  ES_FIELD_TYPES.DOUBLE,
+  ES_FIELD_TYPES.LONG,
+  ES_FIELD_TYPES.DATE,
+  ES_FIELD_TYPES.DATE_NANOS,
+] as const;
+
+export type SortNumericFieldType = typeof SORT_NUMERIC_FIELD_TYPES[number];
+
+export type SortMode = typeof SORT_MODE[keyof typeof SORT_MODE];
+
+export const TOP_METRICS_SPECIAL_SORT_FIELDS = {
+  _SCORE: '_score',
+} as const;
+
+export const isSpecialSortField = (sortField: unknown) => {
+  return Object.values(TOP_METRICS_SPECIAL_SORT_FIELDS).some((v) => v === sortField);
+};
+
+export const isValidSortDirection = (arg: unknown): arg is SortDirection => {
+  return Object.values(SORT_DIRECTION).some((v) => v === arg);
+};
+
+export const isValidSortMode = (arg: unknown): arg is SortMode => {
+  return Object.values(SORT_MODE).some((v) => v === arg);
+};
+
+export const isValidSortNumericType = (arg: unknown): arg is SortNumericFieldType => {
+  return SORT_NUMERIC_FIELD_TYPES.some((v) => v === arg);
+};
+
 /**
  * The maximum level of sub-aggregations
  */
@@ -75,6 +137,10 @@ export interface PivotAggsConfigBase {
   agg: PivotSupportedAggs;
   aggName: AggName;
   dropDownName: string;
+  /**
+   * Indicates if aggregation supports multiple fields
+   */
+  isMultiField?: boolean;
   /** Indicates if aggregation supports sub-aggregations */
   isSubAggsSupported?: boolean;
   /** Dictionary of the sub-aggregations */
@@ -130,7 +196,7 @@ export function getAggConfigFromEsAgg(
 }
 
 export interface PivotAggsConfigWithUiBase extends PivotAggsConfigBase {
-  field: EsFieldName;
+  field: EsFieldName | EsFieldName[];
 }
 
 export interface PivotAggsConfigWithExtra<T> extends PivotAggsConfigWithUiBase {
diff --git a/x-pack/plugins/transform/public/app/hooks/use_index_data.ts b/x-pack/plugins/transform/public/app/hooks/use_index_data.ts
index bd1ecd79f4d12..55a304207a1c7 100644
--- a/x-pack/plugins/transform/public/app/hooks/use_index_data.ts
+++ b/x-pack/plugins/transform/public/app/hooks/use_index_data.ts
@@ -206,7 +206,7 @@ export const useIndexData = (
     setRowCount(typeof resp.hits.total === 'number' ? resp.hits.total : resp.hits.total.value);
     setRowCountRelation(
       typeof resp.hits.total === 'number'
-        ? ('eq' as estypes.TotalHitsRelation)
+        ? ('eq' as estypes.SearchTotalHitsRelation)
         : resp.hits.total.relation
     );
     setTableItems(docs);
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_settings/advanced_runtime_mappings_settings.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_settings/advanced_runtime_mappings_settings.tsx
index 29e341fdaeaea..4e70b7d7fe9b7 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_settings/advanced_runtime_mappings_settings.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/advanced_runtime_mappings_settings/advanced_runtime_mappings_settings.tsx
@@ -46,7 +46,7 @@ export const AdvancedRuntimeMappingsSettings: FC<StepDefineFormHook> = (props) =
     },
   } = props.runtimeMappingsEditor;
   const {
-    actions: { deleteAggregation, deleteGroupBy },
+    actions: { deleteAggregation, deleteGroupBy, updateAggregation },
     state: { groupByList, aggList },
   } = props.pivotConfig;
 
@@ -55,6 +55,9 @@ export const AdvancedRuntimeMappingsSettings: FC<StepDefineFormHook> = (props) =
       advancedRuntimeMappingsConfig === '' ? {} : JSON.parse(advancedRuntimeMappingsConfig);
     const previousConfig = runtimeMappings;
 
+    const isFieldDeleted = (field: string) =>
+      previousConfig?.hasOwnProperty(field) && !nextConfig.hasOwnProperty(field);
+
     applyRuntimeMappingsEditorChanges();
 
     // If the user updates the name of the runtime mapping fields
@@ -71,13 +74,16 @@ export const AdvancedRuntimeMappingsSettings: FC<StepDefineFormHook> = (props) =
     });
     Object.keys(aggList).forEach((aggName) => {
       const agg = aggList[aggName] as PivotAggsConfigWithUiSupport;
-      if (
-        isPivotAggConfigWithUiSupport(agg) &&
-        agg.field !== undefined &&
-        previousConfig?.hasOwnProperty(agg.field) &&
-        !nextConfig.hasOwnProperty(agg.field)
-      ) {
-        deleteAggregation(aggName);
+
+      if (isPivotAggConfigWithUiSupport(agg)) {
+        if (Array.isArray(agg.field)) {
+          const newFields = agg.field.filter((f) => !isFieldDeleted(f));
+          updateAggregation(aggName, { ...agg, field: newFields });
+        } else {
+          if (agg.field !== undefined && isFieldDeleted(agg.field)) {
+            deleteAggregation(aggName);
+          }
+        }
       }
     });
   };
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
index 553581f58d55e..fd11255374a51 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/aggregation_list/popover_form.tsx
@@ -12,6 +12,7 @@ import { i18n } from '@kbn/i18n';
 import {
   EuiButton,
   EuiCodeEditor,
+  EuiComboBox,
   EuiFieldText,
   EuiForm,
   EuiFormRow,
@@ -79,7 +80,7 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
 
   const [aggName, setAggName] = useState(defaultData.aggName);
   const [agg, setAgg] = useState(defaultData.agg);
-  const [field, setField] = useState(
+  const [field, setField] = useState<string | string[]>(
     isPivotAggsConfigWithUiSupport(defaultData) ? defaultData.field : ''
   );
 
@@ -148,13 +149,21 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
 
   if (!isUnsupportedAgg) {
     const optionsArr = dictionaryToArray(options);
+
     optionsArr
       .filter((o) => o.agg === defaultData.agg)
       .forEach((o) => {
         availableFields.push({ text: o.field });
       });
+
     optionsArr
-      .filter((o) => isPivotAggsConfigWithUiSupport(defaultData) && o.field === defaultData.field)
+      .filter(
+        (o) =>
+          isPivotAggsConfigWithUiSupport(defaultData) &&
+          (Array.isArray(defaultData.field)
+            ? defaultData.field.includes(o.field as string)
+            : o.field === defaultData.field)
+      )
       .forEach((o) => {
         availableAggs.push({ text: o.agg });
       });
@@ -217,20 +226,48 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
           data-test-subj="transformAggName"
         />
       </EuiFormRow>
-      {availableFields.length > 0 && (
-        <EuiFormRow
-          label={i18n.translate('xpack.transform.agg.popoverForm.fieldLabel', {
-            defaultMessage: 'Field',
-          })}
-        >
-          <EuiSelect
-            options={availableFields}
-            value={field}
-            onChange={(e) => setField(e.target.value)}
-            data-test-subj="transformAggField"
-          />
-        </EuiFormRow>
-      )}
+      {availableFields.length > 0 ? (
+        aggConfigDef.isMultiField ? (
+          <EuiFormRow
+            label={i18n.translate('xpack.transform.agg.popoverForm.fieldsLabel', {
+              defaultMessage: 'Fields',
+            })}
+          >
+            <EuiComboBox
+              fullWidth
+              options={availableFields.map((v) => {
+                return {
+                  value: v.text,
+                  label: v.text as string,
+                };
+              })}
+              selectedOptions={(typeof field === 'string' ? [field] : field).map((v) => ({
+                value: v,
+                label: v,
+              }))}
+              onChange={(e) => {
+                const res = e.map((v) => v.value as string);
+                setField(res);
+              }}
+              isClearable={false}
+              data-test-subj="transformAggFields"
+            />
+          </EuiFormRow>
+        ) : (
+          <EuiFormRow
+            label={i18n.translate('xpack.transform.agg.popoverForm.fieldLabel', {
+              defaultMessage: 'Field',
+            })}
+          >
+            <EuiSelect
+              options={availableFields}
+              value={field as string}
+              onChange={(e) => setField(e.target.value)}
+              data-test-subj="transformAggField"
+            />
+          </EuiFormRow>
+        )
+      ) : null}
       {availableAggs.length > 0 && (
         <EuiFormRow
           label={i18n.translate('xpack.transform.agg.popoverForm.aggLabel', {
@@ -248,7 +285,7 @@ export const PopoverForm: React.FC<Props> = ({ defaultData, otherAggNames, onCha
       {isPivotAggsWithExtendedForm(aggConfigDef) && (
         <aggConfigDef.AggFormComponent
           aggConfig={aggConfigDef.aggConfig}
-          selectedField={field}
+          selectedField={field as string}
           onChange={(update) => {
             setAggConfigDef({
               ...aggConfigDef,
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 fcdbac8c7ff39..5891e8b330b94 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
@@ -44,6 +44,7 @@ describe('Transform: Define Pivot Common', () => {
             { label: 'sum( the-f[i]e>ld )' },
             { label: 'value_count( the-f[i]e>ld )' },
             { label: 'filter( the-f[i]e>ld )' },
+            { label: 'top_metrics( the-f[i]e>ld )' },
           ],
         },
       ],
@@ -133,6 +134,7 @@ describe('Transform: Define Pivot Common', () => {
             { label: 'sum( the-f[i]e>ld )' },
             { label: 'value_count( the-f[i]e>ld )' },
             { label: 'filter( the-f[i]e>ld )' },
+            { label: 'top_metrics( the-f[i]e>ld )' },
           ],
         },
         {
@@ -146,6 +148,7 @@ describe('Transform: Define Pivot Common', () => {
             { label: 'sum(rt_bytes_bigger)' },
             { label: 'value_count(rt_bytes_bigger)' },
             { label: 'filter(rt_bytes_bigger)' },
+            { label: 'top_metrics(rt_bytes_bigger)' },
           ],
         },
       ],
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_term_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_term_form.tsx
index 358bb9dcafa96..da7100a31167a 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_term_form.tsx
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/filter_agg/components/filter_term_form.tsx
@@ -69,7 +69,9 @@ export const FilterTermForm: FilterAggConfigTerm['aggTypeConfig']['FilterAggForm
       if (
         !(
           isEsSearchResponseWithAggregations(response) &&
-          isMultiBucketAggregate<estypes.KeyedBucketKeys>(response.aggregations.field_values)
+          isMultiBucketAggregate<estypes.AggregationsKeyedBucketKeys>(
+            response.aggregations.field_values
+          )
         )
       ) {
         toastNotifications.addWarning(
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_agg_form_config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_agg_form_config.ts
index ab69d22b1f3d7..5d8d7cb967b65 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_agg_form_config.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_agg_form_config.ts
@@ -12,6 +12,7 @@ import {
 
 import { PivotAggsConfigBase, PivotAggsConfigWithUiBase } from '../../../../../common/pivot_aggs';
 import { getFilterAggConfig } from './filter_agg/config';
+import { getTopMetricsAggConfig } from './top_metrics_agg/config';
 
 /**
  * Gets form configuration for provided aggregation type.
@@ -23,6 +24,8 @@ export function getAggFormConfig(
   switch (agg) {
     case PIVOT_SUPPORTED_AGGS.FILTER:
       return getFilterAggConfig(commonConfig);
+    case PIVOT_SUPPORTED_AGGS.TOP_METRICS:
+      return getTopMetricsAggConfig(commonConfig);
     default:
       return commonConfig;
   }
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_default_aggregation_config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_default_aggregation_config.ts
index 53350f0238bf0..39594dcbff9ae 100644
--- a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_default_aggregation_config.ts
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/get_default_aggregation_config.ts
@@ -15,6 +15,7 @@ import {
   PivotAggsConfigWithUiSupport,
 } from '../../../../../common';
 import { getFilterAggConfig } from './filter_agg/config';
+import { getTopMetricsAggConfig } from './top_metrics_agg/config';
 
 /**
  * Provides a configuration based on the aggregation type.
@@ -41,6 +42,8 @@ export function getDefaultAggregationConfig(
       };
     case PIVOT_SUPPORTED_AGGS.FILTER:
       return getFilterAggConfig(commonConfig);
+    case PIVOT_SUPPORTED_AGGS.TOP_METRICS:
+      return getTopMetricsAggConfig(commonConfig);
     default:
       return commonConfig;
   }
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 300626e0570ae..b17f30d115f4a 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
@@ -141,6 +141,7 @@ export function getPivotDropdownOptions(
   });
 
   return {
+    fields: combinedFields,
     groupByOptions,
     groupByOptionsData,
     aggOptions,
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/components/top_metrics_agg_form.tsx b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/components/top_metrics_agg_form.tsx
new file mode 100644
index 0000000000000..0ec66a3d59a11
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/components/top_metrics_agg_form.tsx
@@ -0,0 +1,195 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React, { useCallback, useContext } from 'react';
+import { i18n } from '@kbn/i18n';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { EuiFormRow, EuiSelect, EuiButtonGroup, EuiAccordion, EuiSpacer } from '@elastic/eui';
+import { PivotAggsConfigTopMetrics, TopMetricsAggConfig } from '../types';
+import { PivotConfigurationContext } from '../../../../pivot_configuration/pivot_configuration';
+import {
+  isSpecialSortField,
+  KbnNumericType,
+  NUMERIC_TYPES_OPTIONS,
+  SORT_DIRECTION,
+  SORT_MODE,
+  SortDirection,
+  SortMode,
+  SortNumericFieldType,
+  TOP_METRICS_SORT_FIELD_TYPES,
+  TOP_METRICS_SPECIAL_SORT_FIELDS,
+} from '../../../../../../../common/pivot_aggs';
+
+export const TopMetricsAggForm: PivotAggsConfigTopMetrics['AggFormComponent'] = ({
+  onChange,
+  aggConfig,
+}) => {
+  const {
+    state: { fields },
+  } = useContext(PivotConfigurationContext)!;
+
+  const sortFieldOptions = fields
+    .filter((v) => TOP_METRICS_SORT_FIELD_TYPES.includes(v.type))
+    .map(({ name }) => ({ text: name, value: name }));
+
+  Object.values(TOP_METRICS_SPECIAL_SORT_FIELDS).forEach((v) => {
+    sortFieldOptions.unshift({ text: v, value: v });
+  });
+  sortFieldOptions.unshift({ text: '', value: '' });
+
+  const isSpecialFieldSelected = isSpecialSortField(aggConfig.sortField);
+
+  const sortDirectionOptions = Object.values(SORT_DIRECTION).map((v) => ({
+    id: v,
+    label: v,
+  }));
+
+  const sortModeOptions = Object.values(SORT_MODE).map((v) => ({
+    id: v,
+    label: v,
+  }));
+
+  const sortFieldType = fields.find((f) => f.name === aggConfig.sortField)?.type;
+
+  const sortSettings = aggConfig.sortSettings ?? {};
+
+  const updateSortSettings = useCallback(
+    (update: Partial<TopMetricsAggConfig['sortSettings']>) => {
+      onChange({
+        ...aggConfig,
+        sortSettings: {
+          ...(aggConfig.sortSettings ?? {}),
+          ...update,
+        },
+      });
+    },
+    [aggConfig, onChange]
+  );
+
+  return (
+    <>
+      <EuiFormRow
+        label={
+          <FormattedMessage
+            id="xpack.transform.agg.popoverForm.sortFieldTopMetricsLabel"
+            defaultMessage="Sort field"
+          />
+        }
+      >
+        <EuiSelect
+          options={sortFieldOptions}
+          value={aggConfig.sortField}
+          onChange={(e) => {
+            onChange({ ...aggConfig, sortField: e.target.value });
+          }}
+          data-test-subj="transformSortFieldTopMetricsLabel"
+        />
+      </EuiFormRow>
+
+      {aggConfig.sortField ? (
+        <>
+          {isSpecialFieldSelected ? null : (
+            <>
+              <EuiFormRow
+                label={
+                  <FormattedMessage
+                    id="xpack.transform.agg.popoverForm.sortDirectionTopMetricsLabel"
+                    defaultMessage="Sort direction"
+                  />
+                }
+              >
+                <EuiButtonGroup
+                  type="single"
+                  legend={i18n.translate(
+                    'xpack.transform.agg.popoverForm.sortDirectionTopMetricsLabel',
+                    {
+                      defaultMessage: 'Sort direction',
+                    }
+                  )}
+                  options={sortDirectionOptions}
+                  idSelected={sortSettings.order ?? ''}
+                  onChange={(id: string) => {
+                    updateSortSettings({ order: id as SortDirection });
+                  }}
+                  color="text"
+                />
+              </EuiFormRow>
+
+              <EuiSpacer size="s" />
+
+              <EuiAccordion
+                id="sortAdvancedSettings"
+                buttonContent={
+                  <FormattedMessage
+                    id="xpack.transform.agg.popoverForm.advancedSortingSettingsLabel"
+                    defaultMessage="Advanced sorting settings"
+                  />
+                }
+              >
+                <EuiFormRow
+                  label={
+                    <FormattedMessage
+                      id="xpack.transform.agg.popoverForm.sortModeTopMetricsLabel"
+                      defaultMessage="Sort mode"
+                    />
+                  }
+                  helpText={
+                    <FormattedMessage
+                      id="xpack.transform.agg.popoverForm.sortModeTopMetricsHelpText"
+                      defaultMessage="Only relevant if the sorting field is an array."
+                    />
+                  }
+                >
+                  <EuiButtonGroup
+                    type="single"
+                    legend={i18n.translate(
+                      'xpack.transform.agg.popoverForm.sortModeTopMetricsLabel',
+                      {
+                        defaultMessage: 'Sort mode',
+                      }
+                    )}
+                    options={sortModeOptions}
+                    idSelected={sortSettings.mode ?? ''}
+                    onChange={(id: string) => {
+                      updateSortSettings({ mode: id as SortMode });
+                    }}
+                    color="text"
+                  />
+                </EuiFormRow>
+
+                {sortFieldType && NUMERIC_TYPES_OPTIONS.hasOwnProperty(sortFieldType) ? (
+                  <EuiFormRow
+                    label={
+                      <FormattedMessage
+                        id="xpack.transform.agg.popoverForm.numericSortFieldTopMetricsLabel"
+                        defaultMessage="Numeric field"
+                      />
+                    }
+                  >
+                    <EuiSelect
+                      options={NUMERIC_TYPES_OPTIONS[sortFieldType as KbnNumericType].map((v) => ({
+                        text: v,
+                        name: v,
+                      }))}
+                      value={sortSettings.numericType}
+                      onChange={(e) => {
+                        updateSortSettings({
+                          numericType: e.target.value as SortNumericFieldType,
+                        });
+                      }}
+                      data-test-subj="transformSortNumericTypeTopMetricsLabel"
+                    />
+                  </EuiFormRow>
+                ) : null}
+              </EuiAccordion>
+            </>
+          )}
+        </>
+      ) : null}
+    </>
+  );
+};
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/config.test.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/config.test.ts
new file mode 100644
index 0000000000000..ef57e6d1295c1
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/config.test.ts
@@ -0,0 +1,196 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { getTopMetricsAggConfig } from './config';
+import { PivotAggsConfigTopMetrics } from './types';
+
+describe('top metrics agg config', () => {
+  let config: PivotAggsConfigTopMetrics;
+
+  beforeEach(() => {
+    config = getTopMetricsAggConfig({
+      agg: 'top_metrics',
+      aggName: 'test-agg',
+      field: ['test-field'],
+      dropDownName: 'test-agg',
+    });
+  });
+
+  describe('#setUiConfigFromEs', () => {
+    test('sets config with a special field', () => {
+      // act
+      config.setUiConfigFromEs({
+        metrics: {
+          field: 'test-field-01',
+        },
+        sort: '_score',
+      });
+
+      // assert
+      expect(config.field).toEqual(['test-field-01']);
+      expect(config.aggConfig).toEqual({
+        sortField: '_score',
+      });
+    });
+
+    test('sets config with a simple sort direction definition', () => {
+      // act
+      config.setUiConfigFromEs({
+        metrics: [
+          {
+            field: 'test-field-01',
+          },
+          {
+            field: 'test-field-02',
+          },
+        ],
+        sort: {
+          'sort-field': 'asc',
+        },
+      });
+
+      // assert
+      expect(config.field).toEqual(['test-field-01', 'test-field-02']);
+      expect(config.aggConfig).toEqual({
+        sortField: 'sort-field',
+        sortSettings: {
+          order: 'asc',
+        },
+      });
+    });
+
+    test('sets config with a sort definition params not supported by the UI', () => {
+      // act
+      config.setUiConfigFromEs({
+        metrics: [
+          {
+            field: 'test-field-01',
+          },
+        ],
+        sort: {
+          'offer.price': {
+            order: 'desc',
+            mode: 'avg',
+            nested: {
+              path: 'offer',
+              filter: {
+                term: { 'offer.color': 'blue' },
+              },
+            },
+          },
+        },
+      });
+
+      // assert
+      expect(config.field).toEqual(['test-field-01']);
+      expect(config.aggConfig).toEqual({
+        sortField: 'offer.price',
+        sortSettings: {
+          order: 'desc',
+          mode: 'avg',
+          nested: {
+            path: 'offer',
+            filter: {
+              term: { 'offer.color': 'blue' },
+            },
+          },
+        },
+      });
+    });
+  });
+
+  describe('#getEsAggConfig', () => {
+    test('rejects invalid config', () => {
+      // arrange
+      config.field = ['field-01', 'field-02'];
+      config.aggConfig = {
+        sortSettings: {
+          order: 'asc',
+        },
+      };
+
+      // act and assert
+      expect(config.getEsAggConfig()).toEqual(null);
+    });
+
+    test('rejects invalid config with missing sort direction', () => {
+      // arrange
+      config.field = ['field-01', 'field-02'];
+      config.aggConfig = {
+        sortField: 'sort-field',
+      };
+
+      // act and assert
+      expect(config.getEsAggConfig()).toEqual(null);
+    });
+
+    test('converts valid config', () => {
+      // arrange
+      config.field = ['field-01', 'field-02'];
+      config.aggConfig = {
+        sortField: 'sort-field',
+        sortSettings: {
+          order: 'asc',
+        },
+      };
+
+      // act and assert
+      expect(config.getEsAggConfig()).toEqual({
+        metrics: [{ field: 'field-01' }, { field: 'field-02' }],
+        sort: {
+          'sort-field': 'asc',
+        },
+      });
+    });
+
+    test('preserves unsupported config', () => {
+      // arrange
+      config.field = ['field-01', 'field-02'];
+
+      config.aggConfig = {
+        sortField: 'sort-field',
+        sortSettings: {
+          order: 'asc',
+          // @ts-ignore
+          nested: {
+            path: 'order',
+          },
+        },
+        // @ts-ignore
+        size: 2,
+      };
+
+      // act and assert
+      expect(config.getEsAggConfig()).toEqual({
+        metrics: [{ field: 'field-01' }, { field: 'field-02' }],
+        sort: {
+          'sort-field': {
+            order: 'asc',
+            nested: {
+              path: 'order',
+            },
+          },
+        },
+        size: 2,
+      });
+    });
+
+    test('converts configs with a special sorting field', () => {
+      // arrange
+      config.field = ['field-01', 'field-02'];
+      config.aggConfig = {
+        sortField: '_score',
+      };
+
+      // act and assert
+      expect(config.getEsAggConfig()).toEqual({
+        metrics: [{ field: 'field-01' }, { field: 'field-02' }],
+        sort: '_score',
+      });
+    });
+  });
+});
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/config.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/config.ts
new file mode 100644
index 0000000000000..56d17e7973e16
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/config.ts
@@ -0,0 +1,118 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  isPivotAggsConfigWithUiSupport,
+  isSpecialSortField,
+  isValidSortDirection,
+  isValidSortMode,
+  isValidSortNumericType,
+  PivotAggsConfigBase,
+  PivotAggsConfigWithUiBase,
+} from '../../../../../../common/pivot_aggs';
+import { PivotAggsConfigTopMetrics } from './types';
+import { TopMetricsAggForm } from './components/top_metrics_agg_form';
+import { isPopulatedObject } from '../../../../../../../../common/shared_imports';
+
+/**
+ * Gets initial basic configuration of the top_metrics aggregation.
+ */
+export function getTopMetricsAggConfig(
+  commonConfig: PivotAggsConfigWithUiBase | PivotAggsConfigBase
+): PivotAggsConfigTopMetrics {
+  return {
+    ...commonConfig,
+    isSubAggsSupported: false,
+    isMultiField: true,
+    field: isPivotAggsConfigWithUiSupport(commonConfig) ? commonConfig.field : '',
+    AggFormComponent: TopMetricsAggForm,
+    aggConfig: {},
+    getEsAggConfig() {
+      // ensure the configuration has been completed
+      if (!this.isValid()) {
+        return null;
+      }
+
+      const { sortField, sortSettings = {}, ...unsupportedConfig } = this.aggConfig;
+
+      let sort = null;
+
+      if (isSpecialSortField(sortField)) {
+        sort = sortField;
+      } else {
+        const { mode, numericType, order, ...rest } = sortSettings;
+
+        if (mode || numericType || isPopulatedObject(rest)) {
+          sort = {
+            [sortField!]: {
+              ...rest,
+              order,
+              ...(mode ? { mode } : {}),
+              ...(numericType ? { numeric_type: numericType } : {}),
+            },
+          };
+        } else {
+          sort = { [sortField!]: sortSettings.order };
+        }
+      }
+
+      return {
+        metrics: (Array.isArray(this.field) ? this.field : [this.field]).map((f) => ({ field: f })),
+        sort,
+        ...(unsupportedConfig ?? {}),
+      };
+    },
+    setUiConfigFromEs(esAggDefinition) {
+      const { metrics, sort, ...unsupportedConfig } = esAggDefinition;
+
+      this.field = (Array.isArray(metrics) ? metrics : [metrics]).map((v) => v.field);
+
+      if (isSpecialSortField(sort)) {
+        this.aggConfig.sortField = sort;
+        return;
+      }
+
+      const sortField = Object.keys(sort)[0];
+
+      this.aggConfig.sortField = sortField;
+
+      const sortDefinition = sort[sortField];
+
+      this.aggConfig.sortSettings = this.aggConfig.sortSettings ?? {};
+
+      if (isValidSortDirection(sortDefinition)) {
+        this.aggConfig.sortSettings.order = sortDefinition;
+      }
+
+      if (isPopulatedObject(sortDefinition)) {
+        const { order, mode, numeric_type: numType, ...rest } = sortDefinition;
+        this.aggConfig.sortSettings = rest;
+
+        if (isValidSortDirection(order)) {
+          this.aggConfig.sortSettings.order = order;
+        }
+        if (isValidSortMode(mode)) {
+          this.aggConfig.sortSettings.mode = mode;
+        }
+        if (isValidSortNumericType(numType)) {
+          this.aggConfig.sortSettings.numericType = numType;
+        }
+      }
+
+      this.aggConfig = {
+        ...this.aggConfig,
+        ...(unsupportedConfig ?? {}),
+      };
+    },
+    isValid() {
+      return (
+        !!this.aggConfig.sortField &&
+        (isSpecialSortField(this.aggConfig.sortField) ? true : !!this.aggConfig.sortSettings?.order)
+      );
+    },
+  };
+}
diff --git a/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/types.ts b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/types.ts
new file mode 100644
index 0000000000000..a90ee5307a18e
--- /dev/null
+++ b/x-pack/plugins/transform/public/app/sections/create_transform/components/step_define/common/top_metrics_agg/types.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 {
+  PivotAggsConfigWithExtra,
+  SortDirection,
+  SortMode,
+  SortNumericFieldType,
+} from '../../../../../../common/pivot_aggs';
+
+export interface TopMetricsAggConfig {
+  sortField: string;
+  sortSettings?: {
+    order?: SortDirection;
+    mode?: SortMode;
+    numericType?: SortNumericFieldType;
+  };
+}
+
+export type PivotAggsConfigTopMetrics = PivotAggsConfigWithExtra<TopMetricsAggConfig>;
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 4bd8f5cea6092..0c31b4fe2da81 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
@@ -97,7 +97,7 @@ export const usePivotConfig = (
 ) => {
   const toastNotifications = useToastNotifications();
 
-  const { aggOptions, aggOptionsData, groupByOptions, groupByOptionsData } = useMemo(
+  const { aggOptions, aggOptionsData, groupByOptions, groupByOptionsData, fields } = useMemo(
     () => getPivotDropdownOptions(indexPattern, defaults.runtimeMappings),
     [defaults.runtimeMappings, indexPattern]
   );
@@ -347,6 +347,7 @@ export const usePivotConfig = (
         pivotGroupByArr,
         validationStatus,
         requestPayload,
+        fields,
       },
     };
   }, [
@@ -361,6 +362,7 @@ export const usePivotConfig = (
     pivotGroupByArr,
     validationStatus,
     requestPayload,
+    fields,
   ]);
 };
 
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 bb2a1b278a5c2..bfe2f47078569 100644
--- a/x-pack/plugins/transform/server/routes/api/field_histograms.ts
+++ b/x-pack/plugins/transform/server/routes/api/field_histograms.ts
@@ -41,7 +41,6 @@ export function registerFieldHistogramsRoutes({ router, license }: RouteDependen
             query,
             fields,
             samplerShardSize,
-            // @ts-expect-error script is not compatible with StoredScript from @elastic/elasticsearch: string is not supported
             runtimeMappings
           );
 
diff --git a/x-pack/plugins/transform/server/routes/api/transforms.ts b/x-pack/plugins/transform/server/routes/api/transforms.ts
index 80f80d6f1d71b..ea2bb28776ac2 100644
--- a/x-pack/plugins/transform/server/routes/api/transforms.ts
+++ b/x-pack/plugins/transform/server/routes/api/transforms.ts
@@ -6,6 +6,7 @@
  */
 
 import { schema } from '@kbn/config-schema';
+import type { estypes } from '@elastic/elasticsearch';
 
 import {
   ElasticsearchClient,
@@ -252,7 +253,7 @@ export function registerTransformsRoutes(routeDependencies: RouteDependencies) {
           const {
             body,
           } = await ctx.core.elasticsearch.client.asCurrentUser.transform.updateTransform({
-            // @ts-expect-error query doesn't satisfy QueryContainer from @elastic/elasticsearch
+            // @ts-expect-error query doesn't satisfy QueryDslQueryContainer from @elastic/elasticsearch
             body: req.body,
             transform_id: transformId,
           });
@@ -570,7 +571,10 @@ const previewTransformHandler: RequestHandler<
         return acc;
       }, {} as Record<string, { type: string }>);
 
-      body.generated_dest_index.mappings.properties = fields;
+      body.generated_dest_index.mappings!.properties = fields as Record<
+        string,
+        estypes.MappingProperty
+      >;
     }
     return res.ok({ body });
   } catch (e) {
diff --git a/x-pack/plugins/translations/translations/ja-JP.json b/x-pack/plugins/translations/translations/ja-JP.json
index 8473a663084f5..4bc03b4ba6e2a 100644
--- a/x-pack/plugins/translations/translations/ja-JP.json
+++ b/x-pack/plugins/translations/translations/ja-JP.json
@@ -114,7 +114,6 @@
     "advancedSettings.form.cancelButtonLabel": "変更をキャンセル",
     "advancedSettings.form.clearNoSearchResultText": " (検索結果を消去) ",
     "advancedSettings.form.clearSearchResultText": " (検索結果を消去) ",
-    "advancedSettings.form.noSearchResultText": "設定が見つかりませんでした {clearSearch}",
     "advancedSettings.form.requiresPageReloadToastButtonLabel": "ページを再読み込み",
     "advancedSettings.form.requiresPageReloadToastDescription": "設定を有効にするためにページの再読み込みが必要です。",
     "advancedSettings.form.saveButtonLabel": "変更を保存",
@@ -619,10 +618,7 @@
     "dashboard.featureCatalogue.dashboardTitle": "ダッシュボード",
     "dashboard.fillDashboardTitle": "このダッシュボードは空です。コンテンツを追加しましょう！",
     "dashboard.helpMenu.appName": "ダッシュボード",
-    "dashboard.howToStartWorkingOnNewDashboardDescription1": "上記のメニューバーの",
-    "dashboard.howToStartWorkingOnNewDashboardDescription2": "をクリックするとパネルの追加を開始できます。",
     "dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel": "ダッシュボードを編集",
-    "dashboard.howToStartWorkingOnNewDashboardEditLinkText": "編集",
     "dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "あらゆるKibanaアプリからダッシュボードにデータビューを組み合わせて、すべてを1か所に表示できます。",
     "dashboard.listing.createNewDashboard.createButtonLabel": "新規ダッシュボードを作成",
     "dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibanaは初心者ですか？{sampleDataInstallLink}してお試しください。",
@@ -667,9 +663,6 @@
     "dashboard.panelStorageError.setError": "保存されていない変更の設定中にエラーが発生しました。{message}",
     "dashboard.placeholder.factory.displayName": "プレースホルダー",
     "dashboard.savedDashboard.newDashboardTitle": "新規ダッシュボード",
-    "dashboard.solutionToolbar.addPanelButtonLabel": "ビジュアライゼーションを作成",
-    "dashboard.solutionToolbar.editorMenuButtonLabel": "すべてのタイプ",
-    "dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "このダッシュボードに時刻が保存されていないため、同期できません。",
     "dashboard.strings.dashboardEditTitle": "{title}を編集中",
     "dashboard.topNav.cloneModal.cancelButtonLabel": "キャンセル",
     "dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "ダッシュボードのクローンを作成",
@@ -820,7 +813,6 @@
     "data.fieldFormats.duration.outputFormats.asSeconds": "秒",
     "data.fieldFormats.duration.outputFormats.asWeeks": "週間",
     "data.fieldFormats.duration.outputFormats.asYears": "年",
-    "data.fieldFormats.duration.outputFormats.humanize": "人間に読解可能",
     "data.fieldFormats.duration.title": "期間",
     "data.fieldFormats.histogram.title": "ヒストグラム",
     "data.fieldFormats.ip.title": "IP アドレス",
@@ -1553,7 +1545,6 @@
     "discover.bucketIntervalTooltip.tooLargeBucketsText": "大きすぎるバケット",
     "discover.bucketIntervalTooltip.tooManyBucketsText": "バケットが多すぎます",
     "discover.clearSelection": "選択した項目をクリア",
-    "discover.context.breadcrumb": "{indexPatternTitle}#{docId} のコンテキスト",
     "discover.context.failedToLoadAnchorDocumentDescription": "アンカードキュメントの読み込みに失敗しました",
     "discover.context.failedToLoadAnchorDocumentErrorDescription": "アンカードキュメントの読み込みに失敗しました。",
     "discover.context.loadButtonLabel": "読み込み",
@@ -1700,8 +1691,6 @@
     "discover.howToChangeTheTimeTooltip": "時刻を変更するには、グローバル時刻フィルターを使用します。",
     "discover.howToSeeOtherMatchingDocumentsDescription": "これらは検索条件に一致した初めの {sampleSize} 件のドキュメントです。他の結果を表示するには検索条件を絞ってください。",
     "discover.howToSeeOtherMatchingDocumentsDescriptionGrid": "これらは検索条件に一致した初めの {sampleSize} 件のドキュメントです。他の結果を表示するには検索条件を絞ってください。",
-    "discover.inspectorRequestDataTitle": "データ",
-    "discover.inspectorRequestDescription": "このリクエストはElasticsearchにクエリをかけ、検索データを取得します。",
     "discover.json.codeEditorAriaLabel": "Elasticsearch ドキュメントの JSON ビューのみを読み込む",
     "discover.json.copyToClipboardLabel": "クリップボードにコピー",
     "discover.localMenu.inspectTitle": "検査",
@@ -1893,8 +1882,6 @@
     "expressions.functions.fontHelpText": "フォントスタイルを作成します。",
     "expressions.functions.mapColumn.args.copyMetaFromHelpText": "設定されている場合、指定した列IDのメタオブジェクトが指定したターゲット列にコピーされます。列が存在しない場合は失敗し、エラーは表示されません。",
     "expressions.functions.mapColumn.args.expressionHelpText": "すべての行で実行される式。単一行の{DATATABLE}と一緒に指定され、セル値を返します。",
-    "expressions.functions.mapColumn.args.idHelpText": "結果列の任意のID。「null」の場合、name/column引数がIDとして使用されます。",
-    "expressions.functions.mapColumn.args.nameHelpText": "結果の列の名前です。",
     "expressions.functions.mapColumnHelpText": "他の列の結果として計算された列を追加します。引数が指定された場合のみ変更が加えられます。{alterColumnFn}と{staticColumnFn}もご参照ください。",
     "expressions.functions.math.args.expressionHelpText": "評価された {TINYMATH} 表現です。{TINYMATH_URL} をご覧ください。",
     "expressions.functions.math.args.onErrorHelpText": "{TINYMATH}評価が失敗するか、NaNが返される場合、戻り値はonErrorで指定されます。「'throw'」の場合、例外が発生し、式の実行が終了します (デフォルト) 。",
@@ -2892,8 +2879,6 @@
     "indexPatternManagement.createIndexPattern.betaLabel": "ベータ",
     "indexPatternManagement.createIndexPattern.description": "インデックスパターンは、{single}または{multiple}データソース、{star}と一致します。",
     "indexPatternManagement.createIndexPattern.documentation": "ドキュメンテーションを表示",
-    "indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription": "この機能にはベーシックライセンスが必要です。",
-    "indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel": "基本",
     "indexPatternManagement.createIndexPattern.emptyState.checkDataButton": "新規データを確認",
     "indexPatternManagement.createIndexPattern.emptyState.createAnyway": "一部のインデックスは表示されない場合があります。{link}してください。",
     "indexPatternManagement.createIndexPattern.emptyState.createAnywayLink": "インデックスパターンを作成します",
@@ -3260,7 +3245,6 @@
     "management.landing.subhead": "インデックス、インデックスパターン、保存されたオブジェクト、Kibanaの設定、その他を管理します。",
     "management.landing.text": "アプリの一覧は左側のメニューにあります。",
     "management.nav.label": "管理",
-    "management.nav.menu": "管理メニュー",
     "management.sections.dataTip": "クラスターデータとバックアップを管理します",
     "management.sections.dataTitle": "データ",
     "management.sections.ingestTip": "データを変換し、クラスターに読み込む方法を管理します",
@@ -4906,12 +4890,6 @@
     "visTypeVislib.editors.heatmap.heatmapSettingsTitle": "ヒートマップ設定",
     "visTypeVislib.editors.heatmap.highlightLabel": "ハイライト範囲",
     "visTypeVislib.editors.heatmap.highlightLabelTooltip": "チャートのカーソルを当てた部分と凡例の対応するラベルをハイライトします。",
-    "visTypeVislib.editors.pie.donutLabel": "ドーナッツ",
-    "visTypeVislib.editors.pie.labelsSettingsTitle": "ラベル設定",
-    "visTypeVislib.editors.pie.pieSettingsTitle": "パイ設定",
-    "visTypeVislib.editors.pie.showLabelsLabel": "ラベルを表示",
-    "visTypeVislib.editors.pie.showTopLevelOnlyLabel": "トップレベルのみ表示",
-    "visTypeVislib.editors.pie.showValuesLabel": "値を表示",
     "visTypeVislib.functions.pie.help": "パイビジュアライゼーション",
     "visTypeVislib.functions.vislib.help": "Vislib ビジュアライゼーション",
     "visTypeVislib.gauge.alignmentAutomaticTitle": "自動",
@@ -4933,11 +4911,6 @@
     "visTypeVislib.heatmap.metricTitle": "値",
     "visTypeVislib.heatmap.segmentTitle": "X 軸",
     "visTypeVislib.heatmap.splitTitle": "チャートを分割",
-    "visTypeVislib.pie.metricTitle": "スライスサイズ",
-    "visTypeVislib.pie.pieDescription": "全体に対する比率でデータを比較します。",
-    "visTypeVislib.pie.pieTitle": "円",
-    "visTypeVislib.pie.segmentTitle": "スライスの分割",
-    "visTypeVislib.pie.splitTitle": "チャートを分割",
     "visTypeVislib.vislib.errors.noResultsFoundTitle": "結果が見つかりませんでした",
     "visTypeVislib.vislib.heatmap.maxBucketsText": "定義された数列が多すぎます ({nr}) 。構成されている最大値は {max} です。",
     "visTypeVislib.vislib.legend.filterForValueButtonAriaLabel": "値 {legendDataLabel} でフィルタリング",
@@ -4949,8 +4922,56 @@
     "visTypeVislib.vislib.legend.toggleOptionsButtonAriaLabel": "{legendDataLabel}、トグルオプション",
     "visTypeVislib.vislib.tooltip.fieldLabel": "フィールド",
     "visTypeVislib.vislib.tooltip.valueLabel": "値",
-    "visTypeXy.advancedSettings.visualization.legacyChartsLibrary.description": "Visualizeでエリア、折れ線、棒グラフのレガシーグラフライブラリを有効にします。",
-    "visTypeXy.advancedSettings.visualization.legacyChartsLibrary.name": "レガシーグラフライブラリ",
+    "visTypePie.pie.metricTitle": "スライスサイズ",
+    "visTypePie.pie.pieDescription": "全体に対する比率でデータを比較します。",
+    "visTypePie.pie.pieTitle": "円",
+    "visTypePie.pie.segmentTitle": "スライスの分割",
+    "visTypePie.pie.splitTitle": "チャートを分割",
+    "visTypePie.editors.pie.donutLabel": "ドーナッツ",
+    "visTypePie.editors.pie.labelsSettingsTitle": "ラベル設定",
+    "visTypePie.editors.pie.pieSettingsTitle": "パイ設定",
+    "visTypePie.editors.pie.showLabelsLabel": "ラベルを表示",
+    "visTypePie.editors.pie.showTopLevelOnlyLabel": "トップレベルのみ表示",
+    "visTypePie.editors.pie.showValuesLabel": "値を表示",
+    "visualizations.advancedSettings.visualization.legacyChartsLibrary.description": "Visualizeでエリア、折れ線、棒グラフのレガシーグラフライブラリを有効にします。",
+    "visualizations.advancedSettings.visualization.legacyChartsLibrary.name": "レガシーグラフライブラリ",
+    "visualizations.advancedSettings.visualizeEnableLabsText": "ユーザーが実験的なビジュアライゼーションを作成、表示、編集できるようになります。無効の場合、\n            ユーザーは本番準備が整ったビジュアライゼーションのみを利用できます。",
+    "visualizations.advancedSettings.visualizeEnableLabsTitle": "実験的なビジュアライゼーションを有効にする",
+    "visualizations.disabledLabVisualizationLink": "ドキュメンテーションを表示",
+    "visualizations.disabledLabVisualizationMessage": "ラボビジュアライゼーションを表示するには、高度な設定でラボモードをオンにしてください。",
+    "visualizations.disabledLabVisualizationTitle": "{title} はラボビジュアライゼーションです。",
+    "visualizations.displayName": "ビジュアライゼーション",
+    "visualizations.embeddable.placeholderTitle": "プレースホルダータイトル",
+    "visualizations.function.range.from.help": "範囲の開始",
+    "visualizations.function.range.help": "範囲オブジェクトを生成します",
+    "visualizations.function.range.to.help": "範囲の終了",
+    "visualizations.function.visDimension.accessor.help": "使用するデータセット内の列 (列インデックスまたは列名) ",
+    "visualizations.function.visDimension.error.accessor": "入力された列名は無効です。",
+    "visualizations.function.visDimension.format.help": "フォーマット",
+    "visualizations.function.visDimension.formatParams.help": "フォーマットパラメーター",
+    "visualizations.function.visDimension.help": "visConfig ディメンションオブジェクトを生成します",
+    "visualizations.initializeWithoutIndexPatternErrorMessage": "インデックスパターンなしで集約を初期化しようとしています",
+    "visualizations.newVisWizard.aggBasedGroupDescription": "クラシック Visualize ライブラリを使用して、アグリゲーションに基づいてグラフを作成します。",
+    "visualizations.newVisWizard.aggBasedGroupTitle": "アグリゲーションに基づく",
+    "visualizations.newVisWizard.chooseSourceTitle": "ソースの選択",
+    "visualizations.newVisWizard.experimentalTitle": "実験的",
+    "visualizations.newVisWizard.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLA のサポート対象になりません。",
+    "visualizations.newVisWizard.exploreOptionLinkText": "探索オプション",
+    "visualizations.newVisWizard.filterVisTypeAriaLabel": "ビジュアライゼーションのタイプでフィルタリング",
+    "visualizations.newVisWizard.goBackLink": "別のビジュアライゼーションを選択",
+    "visualizations.newVisWizard.helpTextAriaLabel": "タイプを選択してビジュアライゼーションの作成を始めましょう。ESC を押してこのモーダルを閉じます。Tab キーを押して次に進みます。",
+    "visualizations.newVisWizard.learnMoreText": "詳細について",
+    "visualizations.newVisWizard.newVisTypeTitle": "新規 {visTypeName}",
+    "visualizations.newVisWizard.readDocumentationLink": "ドキュメンテーションを表示",
+    "visualizations.newVisWizard.searchSelection.notFoundLabel": "一致インデックスまたは保存した検索が見つかりません。",
+    "visualizations.newVisWizard.searchSelection.savedObjectType.indexPattern": "インデックスパターン",
+    "visualizations.newVisWizard.searchSelection.savedObjectType.search": "保存検索",
+    "visualizations.newVisWizard.title": "新規ビジュアライゼーション",
+    "visualizations.newVisWizard.toolsGroupTitle": "ツール",
+    "visualizations.noResultsFoundTitle": "結果が見つかりませんでした",
+    "visualizations.savedObjectName": "ビジュアライゼーション",
+    "visualizations.savingVisualizationFailed.errorMsg": "ビジュアライゼーションの保存が失敗しました",
+    "visualizations.visualizationTypeInvalidMessage": "無効なビジュアライゼーションタイプ \"{visType}\"",
     "visTypeXy.aggResponse.allDocsTitle": "すべてのドキュメント",
     "visTypeXy.area.areaDescription": "軸と線の間のデータを強調します。",
     "visTypeXy.area.areaTitle": "エリア",
@@ -5072,43 +5093,6 @@
     "visTypeXy.thresholdLine.style.dashedText": "鎖線",
     "visTypeXy.thresholdLine.style.dotdashedText": "点線",
     "visTypeXy.thresholdLine.style.fullText": "完全",
-    "visualizations.advancedSettings.visualizeEnableLabsText": "ユーザーが実験的なビジュアライゼーションを作成、表示、編集できるようになります。無効の場合、\n            ユーザーは本番準備が整ったビジュアライゼーションのみを利用できます。",
-    "visualizations.advancedSettings.visualizeEnableLabsTitle": "実験的なビジュアライゼーションを有効にする",
-    "visualizations.disabledLabVisualizationLink": "ドキュメンテーションを表示",
-    "visualizations.disabledLabVisualizationMessage": "ラボビジュアライゼーションを表示するには、高度な設定でラボモードをオンにしてください。",
-    "visualizations.disabledLabVisualizationTitle": "{title} はラボビジュアライゼーションです。",
-    "visualizations.displayName": "ビジュアライゼーション",
-    "visualizations.embeddable.placeholderTitle": "プレースホルダータイトル",
-    "visualizations.function.range.from.help": "範囲の開始",
-    "visualizations.function.range.help": "範囲オブジェクトを生成します",
-    "visualizations.function.range.to.help": "範囲の終了",
-    "visualizations.function.visDimension.accessor.help": "使用するデータセット内の列 (列インデックスまたは列名) ",
-    "visualizations.function.visDimension.error.accessor": "入力された列名は無効です。",
-    "visualizations.function.visDimension.format.help": "フォーマット",
-    "visualizations.function.visDimension.formatParams.help": "フォーマットパラメーター",
-    "visualizations.function.visDimension.help": "visConfig ディメンションオブジェクトを生成します",
-    "visualizations.initializeWithoutIndexPatternErrorMessage": "インデックスパターンなしで集約を初期化しようとしています",
-    "visualizations.newVisWizard.aggBasedGroupDescription": "クラシック Visualize ライブラリを使用して、アグリゲーションに基づいてグラフを作成します。",
-    "visualizations.newVisWizard.aggBasedGroupTitle": "アグリゲーションに基づく",
-    "visualizations.newVisWizard.chooseSourceTitle": "ソースの選択",
-    "visualizations.newVisWizard.experimentalTitle": "実験的",
-    "visualizations.newVisWizard.experimentalTooltip": "このビジュアライゼーションは今後のリリースで変更または削除される可能性があり、SLA のサポート対象になりません。",
-    "visualizations.newVisWizard.exploreOptionLinkText": "探索オプション",
-    "visualizations.newVisWizard.filterVisTypeAriaLabel": "ビジュアライゼーションのタイプでフィルタリング",
-    "visualizations.newVisWizard.goBackLink": "別のビジュアライゼーションを選択",
-    "visualizations.newVisWizard.helpTextAriaLabel": "タイプを選択してビジュアライゼーションの作成を始めましょう。ESC を押してこのモーダルを閉じます。Tab キーを押して次に進みます。",
-    "visualizations.newVisWizard.learnMoreText": "詳細について",
-    "visualizations.newVisWizard.newVisTypeTitle": "新規 {visTypeName}",
-    "visualizations.newVisWizard.readDocumentationLink": "ドキュメンテーションを表示",
-    "visualizations.newVisWizard.searchSelection.notFoundLabel": "一致インデックスまたは保存した検索が見つかりません。",
-    "visualizations.newVisWizard.searchSelection.savedObjectType.indexPattern": "インデックスパターン",
-    "visualizations.newVisWizard.searchSelection.savedObjectType.search": "保存検索",
-    "visualizations.newVisWizard.title": "新規ビジュアライゼーション",
-    "visualizations.newVisWizard.toolsGroupTitle": "ツール",
-    "visualizations.noResultsFoundTitle": "結果が見つかりませんでした",
-    "visualizations.savedObjectName": "ビジュアライゼーション",
-    "visualizations.savingVisualizationFailed.errorMsg": "ビジュアライゼーションの保存が失敗しました",
-    "visualizations.visualizationTypeInvalidMessage": "無効なビジュアライゼーションタイプ \"{visType}\"",
     "visualize.badge.readOnly.text": "読み取り専用",
     "visualize.badge.readOnly.tooltip": "ビジュアライゼーションをライブラリに保存できません",
     "visualize.byValue_pageHeading": "{originatingApp}アプリに埋め込まれた{chartType}タイプのビジュアライゼーション",
@@ -5259,7 +5243,6 @@
     "xpack.apm.agentConfig.chooseService.editButton": "編集",
     "xpack.apm.agentConfig.chooseService.service.environment.label": "環境",
     "xpack.apm.agentConfig.chooseService.service.name.label": "サービス名",
-    "xpack.apm.agentConfig.chooseService.title": "サービスを選択",
     "xpack.apm.agentConfig.circuitBreakerEnabled.description": "Circuit Breaker を有効にすべきかどうかを指定するブール値。 有効にすると、エージェントは定期的にストレス監視をポーリングして、システム/プロセス/JVMのストレス状態を検出します。監視のいずれかがストレスの兆候を検出した場合、`recording`構成オプションの設定が「false」であるかのようにエージェントは一時停止し、リソース消費を最小限に抑えられます。一時停止した場合、エージェントはストレス状態が緩和されたかどうかを検出するために同じ監視のポーリングを継続します。すべての監視でシステム/プロセス/JVMにストレスがないことが認められると、エージェントは再開して完全に機能します。",
     "xpack.apm.agentConfig.circuitBreakerEnabled.label": "Cirtcuit Breaker が有効",
     "xpack.apm.agentConfig.configTable.appliedTooltipMessage": "1 つ以上のエージェントにより適用されました",
@@ -5318,8 +5301,6 @@
     "xpack.apm.agentConfig.servicePage.service.description": "構成するサービスを選択してください。",
     "xpack.apm.agentConfig.servicePage.service.fieldLabel": "サービス名",
     "xpack.apm.agentConfig.servicePage.service.title": "サービス",
-    "xpack.apm.agentConfig.servicePage.title": "サービスを選択",
-    "xpack.apm.agentConfig.settings.title": "構成オプション",
     "xpack.apm.agentConfig.settingsPage.discardChangesButton": "変更を破棄",
     "xpack.apm.agentConfig.settingsPage.notFound.message": "リクエストされた構成が存在しません",
     "xpack.apm.agentConfig.settingsPage.notFound.title": "申し訳ございません、エラーが発生しました",
@@ -5338,7 +5319,6 @@
     "xpack.apm.agentConfig.stressMonitorSystemCpuReliefThreshold.label": "ストレス監視システム CPU 緩和しきい値",
     "xpack.apm.agentConfig.stressMonitorSystemCpuStressThreshold.description": "システムCPU監視でシステムCPUストレスの検出に使用するしきい値。システムCPUが少なくとも「stress_monitor_cpu_duration_threshold」と同じ長さ以上の期間にわたってこのしきい値を超えると、監視機能はこれをストレス状態と見なします。",
     "xpack.apm.agentConfig.stressMonitorSystemCpuStressThreshold.label": "ストレス監視システム CPU ストレスしきい値",
-    "xpack.apm.agentConfig.titleText": "エージェント中央構成",
     "xpack.apm.agentConfig.transactionIgnoreUrl.description": "特定の URL への要求が命令されないように制限するために使用します。この構成では、無視される URL パスのワイルドカードパターンのカンマ区切りのリストを使用できます。受信 HTTP 要求が検出されると、要求パスが、リストの各要素に対してテストされます。たとえば、このリストに「/home/index」を追加すると、一致して、「http://localhost/home/index」と「http://whatever.com/home/index?value1=123」から命令が削除されます。",
     "xpack.apm.agentConfig.transactionIgnoreUrl.label": "URL に基づくトランザクションを無視",
     "xpack.apm.agentConfig.transactionMaxSpans.description": "トランザクションごとに記録される範囲を制限します。",
@@ -5404,22 +5384,6 @@
     "xpack.apm.apply.label": "適用",
     "xpack.apm.applyFilter": "{title} フィルターを適用",
     "xpack.apm.applyOptions": "オプションを適用",
-    "xpack.apm.breadcrumb.errorsTitle": "エラー",
-    "xpack.apm.breadcrumb.listSettingsTitle": "設定",
-    "xpack.apm.breadcrumb.metricsTitle": "メトリック",
-    "xpack.apm.breadcrumb.nodesTitle": "JVM",
-    "xpack.apm.breadcrumb.overviewTitle": "概要",
-    "xpack.apm.breadcrumb.serviceMapTitle": "サービスマップ",
-    "xpack.apm.breadcrumb.serviceProfilingTitle": "プロファイリング",
-    "xpack.apm.breadcrumb.servicesTitle": "サービス",
-    "xpack.apm.breadcrumb.settings.agentConfigurationTitle": "エージェントの編集",
-    "xpack.apm.breadcrumb.settings.anomalyDetection": "異常検知",
-    "xpack.apm.breadcrumb.settings.createAgentConfigurationTitle": "エージェント構成の作成",
-    "xpack.apm.breadcrumb.settings.customizeUI": "UI をカスタマイズ",
-    "xpack.apm.breadcrumb.settings.editAgentConfigurationTitle": "エージェント構成の編集",
-    "xpack.apm.breadcrumb.settings.indicesTitle": "インデックス",
-    "xpack.apm.breadcrumb.tracesTitle": "トレース",
-    "xpack.apm.breadcrumb.transactionsTitle": "トランザクション",
     "xpack.apm.chart.annotation.version": "バージョン",
     "xpack.apm.chart.cpuSeries.processAverageLabel": "プロセス平均",
     "xpack.apm.chart.cpuSeries.processMaxLabel": "プロセス最大",
@@ -5528,8 +5492,6 @@
     "xpack.apm.home.alertsMenu.transactionErrorRate": "トランザクションエラー率",
     "xpack.apm.home.alertsMenu.viewActiveAlerts": "アクティブアラートを表示",
     "xpack.apm.home.serviceMapTabLabel": "サービスマップ",
-    "xpack.apm.home.servicesTabLabel": "サービス",
-    "xpack.apm.home.tracesTabLabel": "トレース",
     "xpack.apm.instancesLatencyDistributionChartLegend": "インスタンス",
     "xpack.apm.instancesLatencyDistributionChartLegend.previousPeriod": "前の期間",
     "xpack.apm.instancesLatencyDistributionChartTitle": "インスタンスのレイテンシ分布",
@@ -5593,7 +5555,6 @@
     "xpack.apm.profiling.highlightFrames": "検索",
     "xpack.apm.profiling.table.name": "名前",
     "xpack.apm.profiling.table.value": "自己",
-    "xpack.apm.profilingOverviewTitle": "プロファイリング",
     "xpack.apm.propertiesTable.agentFeature.noDataAvailableLabel": "利用可能なデータがありません",
     "xpack.apm.propertiesTable.agentFeature.noResultFound": "\"{value}\"に対する結果が見つかりませんでした。",
     "xpack.apm.propertiesTable.tabs.exceptionStacktraceLabel": "例外のスタックトレース",
@@ -5658,7 +5619,6 @@
     "xpack.apm.selectPlaceholder": "オプションを選択：",
     "xpack.apm.serviceDetails.errorsTabLabel": "エラー",
     "xpack.apm.serviceDetails.metrics.cpuUsageChartTitle": "CPU 使用状況",
-    "xpack.apm.serviceDetails.metrics.errorOccurrencesChartTitle": "エラーのオカレンス",
     "xpack.apm.serviceDetails.metrics.memoryUsageChartTitle": "システムメモリー使用状況",
     "xpack.apm.serviceDetails.metricsTabLabel": "メトリック",
     "xpack.apm.serviceDetails.nodesTabLabel": "JVM",
@@ -5816,7 +5776,6 @@
     "xpack.apm.settings.anomalyDetection.addEnvironments.selectorLabel": "環境",
     "xpack.apm.settings.anomalyDetection.addEnvironments.selectorPlaceholder": "環境を選択または追加",
     "xpack.apm.settings.anomalyDetection.addEnvironments.titleText": "環境を選択",
-    "xpack.apm.settings.anomalyDetection.descriptionText": "機械学習異常検知統合により、レイテンシの異常を特定することで、各構成された環境で、サービスのアプリケーション正常性ステータスインジケーターが有効になります。",
     "xpack.apm.settings.anomalyDetection.jobList.actionColumnLabel": "アクション",
     "xpack.apm.settings.anomalyDetection.jobList.addEnvironments": "MLジョブを作成",
     "xpack.apm.settings.anomalyDetection.jobList.emptyListText": "異常検知ジョブがありません。",
@@ -5826,7 +5785,6 @@
     "xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText": "異常検知を新しい環境に追加するには、機械学習ジョブを作成します。既存の機械学習ジョブは、{mlJobsLink}で管理できます。",
     "xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText.mlJobsLinkText": "機械学習",
     "xpack.apm.settings.anomalyDetection.jobList.mlJobLinkText": "MLでジョブを表示",
-    "xpack.apm.settings.anomalyDetection.titleText": "異常検知",
     "xpack.apm.settings.apmIndices.applyButton": "変更を適用",
     "xpack.apm.settings.apmIndices.applyChanges.failed.text": "インデックスの適用時に何か問題が発生しました。エラー：{errorMessage}",
     "xpack.apm.settings.apmIndices.applyChanges.failed.title": "インデックスが適用できませんでした。",
@@ -5844,8 +5802,6 @@
     "xpack.apm.settings.apmIndices.title": "インデックス",
     "xpack.apm.settings.apmIndices.transactionIndicesLabel": "トランザクションインデックス",
     "xpack.apm.settings.customizeApp": "アプリをカスタマイズ",
-    "xpack.apm.settings.customizeApp.description": "次の設定でAPMアプリ経験を拡張します。",
-    "xpack.apm.settings.customizeApp.title": "アプリをカスタマイズ",
     "xpack.apm.settings.customizeUI.customLink": "カスタムリンク",
     "xpack.apm.settings.customizeUI.customLink.create.failed": "リンクを保存できませんでした！",
     "xpack.apm.settings.customizeUI.customLink.create.failed.message": "リンクを保存するときに問題が発生しました。エラー：「{errorMessage}」",
@@ -5894,8 +5850,6 @@
     "xpack.apm.settings.customizeUI.customLink.table.noResultFound": "\"{value}\"に対する結果が見つかりませんでした。",
     "xpack.apm.settings.customizeUI.customLink.table.url": "URL",
     "xpack.apm.settings.indices": "インデックス",
-    "xpack.apm.settings.pageTitle": "設定",
-    "xpack.apm.settings.returnLinkLabel": "インベントリに戻る",
     "xpack.apm.settingsLinkLabel": "設定",
     "xpack.apm.setupInstructionsButtonLabel": "セットアップの手順",
     "xpack.apm.significanTerms.license.text": "相関関係APIを使用するには、Elastic Platinumライセンスのサブスクリプションが必要です。",
@@ -7554,7 +7508,6 @@
     "xpack.enterpriseSearch.actions.updateButtonLabel": "更新",
     "xpack.enterpriseSearch.appSearch.actions.restoreDefaultsButonLabel": "デフォルトを復元",
     "xpack.enterpriseSearch.appSearch.adminRoleTypeDescription": "アカウント設定の管理を除き、管理者はすべての操作を実行できます。",
-    "xpack.enterpriseSearch.appSearch.advancedRoleSelectorsTitle": "完全または限定エンジンアクセス",
     "xpack.enterpriseSearch.appSearch.analystRoleTypeDescription": "アナリストは、ドキュメント、クエリテスト、分析のみを表示できます。",
     "xpack.enterpriseSearch.appSearch.credentials.apiEndpoint": "エンドポイント",
     "xpack.enterpriseSearch.appSearch.credentials.apiKeys": "API キー",
@@ -7853,7 +7806,6 @@
     "xpack.enterpriseSearch.appSearch.engine.searchUI.title": "Search UI",
     "xpack.enterpriseSearch.appSearch.engine.synonyms.title": "同義語",
     "xpack.enterpriseSearch.appSearch.engine.universalLanguage": "ユニバーサル",
-    "xpack.enterpriseSearch.appSearch.engineAccessTitle": "エンジンアクセス",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineLanguage.label": "エンジン言語",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineName.allowedCharactersHelpText": "エンジン名には、小文字、数字、ハイフンのみを使用できます。",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineName.label": "エンジン名",
@@ -7895,10 +7847,6 @@
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.language": "言語",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.name": "名前",
     "xpack.enterpriseSearch.appSearch.enginesOverview.title": "エンジン概要",
-    "xpack.enterpriseSearch.appSearch.fullEngineAccessDescription": "すべての現在のエンジンと将来のエンジンにアクセスします。",
-    "xpack.enterpriseSearch.appSearch.fullEngineAccessTitle": "完全エンジンアクセス",
-    "xpack.enterpriseSearch.appSearch.limitedEngineAccessDescription": "ユーザーアクセスを特定のエンジンに制限します。",
-    "xpack.enterpriseSearch.appSearch.limitedEngineAccessTitle": "限定エンジンアクセス",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.description.manageSettingsDetail": "分析とログを管理するには、{visitSettingsLink}してください。",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.description.manageSettingsLinkText": "設定を表示",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.disabledSinceTitle": "{logsTitle}は、{disabledDate}以降に無効にされました。",
@@ -7938,9 +7886,6 @@
     "xpack.enterpriseSearch.appSearch.result.documentDetailLink": "ドキュメントの詳細を表示",
     "xpack.enterpriseSearch.appSearch.result.hideAdditionalFields": "追加フィールドを非表示",
     "xpack.enterpriseSearch.appSearch.result.title": "ドキュメント{id}",
-    "xpack.enterpriseSearch.appSearch.roleMapping.emptyRoleMappingsBody": "認証が成功したすべてのユーザーには所有者ロールが割り当てられ、すべてのエンジンにアクセスできます。デフォルト設定を無効にするには、新しいロールを追加します。",
-    "xpack.enterpriseSearch.appSearch.roleMapping.saveRoleMappingButtonLabel": "ロールマッピングの保存",
-    "xpack.enterpriseSearch.appSearch.roleMapping.updateRoleMappingButtonLabel": "ロールマッピングを更新",
     "xpack.enterpriseSearch.appSearch.roleMappingCreatedMessage": "ロールマッピングが正常に作成されました。",
     "xpack.enterpriseSearch.appSearch.roleMappingDeletedMessage": "ロールマッピングが正常に削除されました",
     "xpack.enterpriseSearch.appSearch.roleMappingsEngineAccessHeading": "エンジンアクセス",
@@ -7949,7 +7894,6 @@
     "xpack.enterpriseSearch.appSearch.roleMappingsResetConfirmButton": "ロールマッピングをリセット",
     "xpack.enterpriseSearch.appSearch.roleMappingsResetConfirmTitle": "ロールマッピングをリセットしますか？",
     "xpack.enterpriseSearch.appSearch.roleMappingUpdatedMessage": "ロールマッピングが正常に更新されました。",
-    "xpack.enterpriseSearch.appSearch.roleTitle": "ロール",
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.buttonLabel": "サンプルエンジンを試す",
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.description": "サンプルデータでエンジンをテストします。",
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.title": "確認している場合",
@@ -8031,7 +7975,6 @@
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingButton": "マッピングを削除",
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingDescription": "マッピングの削除は永久的であり、元に戻すことはできません",
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingTitle": "このロールマッピングを削除",
-    "xpack.enterpriseSearch.roleMapping.emptyRoleMappingsTitle": "ロールマッピングがありません",
     "xpack.enterpriseSearch.roleMapping.externalAttributeLabel": "外部属性",
     "xpack.enterpriseSearch.roleMapping.filterRoleMappingsPlaceholder": "ロールをフィルタリング...",
     "xpack.enterpriseSearch.roleMapping.individualAuthProviderLabel": "個別の認証プロバイダーを選択",
@@ -8039,8 +7982,9 @@
     "xpack.enterpriseSearch.roleMapping.moResults.message": "'{filterValue}'の結果が見つかりません。",
     "xpack.enterpriseSearch.roleMapping.newRoleMappingTitle": "ロールマッピングを追加",
     "xpack.enterpriseSearch.roleMapping.roleLabel": "ロール",
-    "xpack.enterpriseSearch.roleMapping.roleMappingsDescription": "elasticsearch-nativeおよびelasticsearch-saml認証のロールマッピングを定義します。",
     "xpack.enterpriseSearch.roleMapping.roleMappingsTitle": "ユーザーとロール",
+    "xpack.enterpriseSearch.roleMapping.saveRoleMappingButtonLabel": "ロールマッピングの保存",
+    "xpack.enterpriseSearch.roleMapping.updateRoleMappingButtonLabel": "ロールマッピングを更新",
     "xpack.enterpriseSearch.schema.addFieldModal.fieldNameNote.correct": "フィールド名には、小文字、数字、アンダースコアのみを使用できます。",
     "xpack.enterpriseSearch.schema.errorsTable.control.review": "見直し",
     "xpack.enterpriseSearch.schema.errorsTable.heading.error": "エラー",
@@ -8345,12 +8289,8 @@
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.adminRoleTypeDescription": "管理者は、コンテンツソース、グループ、ユーザー管理機能など、すべての組織レベルの設定に無制限にアクセスできます。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.defaultGroupName": "デフォルト",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.deleteRoleMappingButtonMessage": "このマッピングを完全に削除しますか？このアクションは元に戻せません。一部のユーザーがアクセスを失う可能性があります。",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.emptyRoleMappingsBody": "新しいチームメンバーにはデフォルトで管理者ロールが割り当てられます。管理者はすべてにアクセスできます。デフォルト設定を無効にするには、新しいロールを作成します。",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentAllGroupsLabel": "将来のグループを含むすべてのグループにあります。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentInvalidError": "1つ以上の割り当てられたグループが必要です。",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentTitle": "グループ割り当て",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.roleMappingsTableHeader": "グループアクセス",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.saveRoleMappingButtonMessage": "{operation}ロールマッピング",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.userRoleTypeDescription": "ユーザーの機能アクセスは検索インターフェースと個人設定管理に制限されます。",
     "xpack.enterpriseSearch.workplaceSearch.roleMappingCreatedMessage": "ロールマッピングが正常に作成されました。",
     "xpack.enterpriseSearch.workplaceSearch.roleMappingDeletedMessage": "ロールマッピングが正常に削除されました",
@@ -8556,224 +8496,247 @@
     "xpack.features.ossFeatures.visualizeShortUrlSubFeatureName": "短い URL",
     "xpack.features.savedObjectsManagementFeatureName": "保存されたオブジェクトの管理",
     "xpack.features.visualizeFeatureName": "Visualizeライブラリ",
-    "xpack.fileDataVisualizer.aboutPanel.analyzingDataTitle": "データを分析中",
-    "xpack.fileDataVisualizer.aboutPanel.selectOrDragAndDropFileDescription": "ファイルを選択するかドラッグ &amp;amp; ドロップしてください",
-    "xpack.fileDataVisualizer.addCombinedFieldsLabel": "結合されたフィールドを追加",
-    "xpack.fileDataVisualizer.advancedImportSettings.createIndexPatternLabel": "インデックスパターンを作成",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexNameLabel": "インデックス名",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexNamePlaceholder": "インデックス名",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexPatternNameLabel": "インデックスパターン名",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexSettingsLabel": "インデックス設定",
-    "xpack.fileDataVisualizer.advancedImportSettings.ingestPipelineLabel": "パイプラインを投入",
-    "xpack.fileDataVisualizer.advancedImportSettings.mappingsLabel": "マッピング",
-    "xpack.fileDataVisualizer.analysisSummary.analyzedLinesNumberTitle": "分析した行数",
-    "xpack.fileDataVisualizer.analysisSummary.delimiterTitle": "区切り記号",
-    "xpack.fileDataVisualizer.analysisSummary.formatTitle": "フォーマット",
-    "xpack.fileDataVisualizer.analysisSummary.grokPatternTitle": "Grok パターン",
-    "xpack.fileDataVisualizer.analysisSummary.hasHeaderRowTitle": "ヘッダー行があります",
-    "xpack.fileDataVisualizer.analysisSummary.summaryTitle": "まとめ",
-    "xpack.fileDataVisualizer.analysisSummary.timeFieldTitle": "時間フィールド",
-    "xpack.fileDataVisualizer.bottomBar.backButtonLabel": "戻る",
-    "xpack.fileDataVisualizer.bottomBar.cancelButtonLabel": "キャンセル",
-    "xpack.fileDataVisualizer.bottomBar.missingImportPrivilegesMessage": "データインポートを有効にするには、ingest_adminロールが必要です",
-    "xpack.fileDataVisualizer.bottomBar.readMode.cancelButtonLabel": "キャンセル",
-    "xpack.fileDataVisualizer.bottomBar.readMode.importButtonLabel": "インポート",
-    "xpack.fileDataVisualizer.combinedFieldsForm.mappingsParseError": "マッピングのパース中にエラーが発生しました：{error}",
-    "xpack.fileDataVisualizer.combinedFieldsForm.pipelineParseError": "パイプラインのパース中にエラーが発生しました：{error}",
-    "xpack.fileDataVisualizer.combinedFieldsLabel": "結合されたフィールド",
-    "xpack.fileDataVisualizer.combinedFieldsReadOnlyHelpTextLabel": "詳細タグで結合されたフィールドを編集",
-    "xpack.fileDataVisualizer.combinedFieldsReadOnlyLabel": "結合されたフィールド",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.blueColorRangeLabel": "青",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel": "緑 - 赤",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.influencerScaleLabel": "影響因子カスタムスケール",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.linearScaleLabel": "線形",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.redColorRangeLabel": "赤",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel": "赤 - 緑",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.sqrtScaleLabel": "Sqrt",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel": "黄 - 緑 - 青",
-    "xpack.fileDataVisualizer.dataGridChart.histogramNotAvailable": "グラフはサポートされていません。",
-    "xpack.fileDataVisualizer.dataGridChart.notEnoughData": "0個のドキュメントにフィールドが含まれます。",
-    "xpack.fileDataVisualizer.dataGridChart.topCategoriesLegend": "上位 {maxChartColumns}/{cardinality} カテゴリ",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel": "すべてのフィールドの詳細を折りたたむ",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.distinctValuesColumnName": "固有の値",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.distributionsColumnName": "分布",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.documentsCountColumnName": "ドキュメント (%) ",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.expandDetailsForAllAriaLabel": "すべてのフィールドの詳細を展開",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.nameColumnName": "名前",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.rowCollapse": "{fieldName} の詳細を非表示",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.rowExpand": "{fieldName} の詳細を表示",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.showDistributionsAriaLabel": "分布を表示",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.typeColumnName": "型",
-    "xpack.fileDataVisualizer.editFlyout.applyOverrideSettingsButtonLabel": "適用",
-    "xpack.fileDataVisualizer.editFlyout.closeOverrideSettingsButtonLabel": "閉じる",
-    "xpack.fileDataVisualizer.editFlyout.overrides.customDelimiterFormRowLabel": "カスタム区切り記号",
-    "xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatErrorMessage": "タイムスタンプのフォーマットは、これらの Java 日付/時刻フォーマットの組み合わせでなければなりません：\n      yy, yyyy, M, MM, MMM, MMMM, d, dd, EEE, EEEE, H, HH, h, mm, ss, S-SSSSSSSSS, a, XX, XXX, zzz",
-    "xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatFormRowLabel": "カスタムタイムスタンプフォーマット",
-    "xpack.fileDataVisualizer.editFlyout.overrides.dataFormatFormRowLabel": "データフォーマット",
-    "xpack.fileDataVisualizer.editFlyout.overrides.delimiterFormRowLabel": "区切り記号",
-    "xpack.fileDataVisualizer.editFlyout.overrides.editFieldNamesTitle": "フィールド名の編集",
-    "xpack.fileDataVisualizer.editFlyout.overrides.grokPatternFormRowLabel": "Grok パターン",
-    "xpack.fileDataVisualizer.editFlyout.overrides.hasHeaderRowLabel": "ヘッダー行があります",
-    "xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleErrorMessage": "値は {min} よりも大きく {max} 以下でなければなりません",
-    "xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleFormRowLabel": "サンプルする行数",
-    "xpack.fileDataVisualizer.editFlyout.overrides.quoteCharacterFormRowLabel": "引用符",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timeFieldFormRowLabel": "時間フィールド",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage": "タイムスタンプフォーマットにタイムフォーマット文字グループがありません {timestampFormat}",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatFormRowLabel": "タイムスタンプフォーマット",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatHelpText": "対応フォーマットの詳細をご覧ください",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage": "{format} の文字 { length, plural, one { {lg} } other { グループ {lg} } } は、ss と {sep} からの区切りで始まっていないため、サポートされていません",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage": "{format} の文字 { length, plural, one { {lg} } other { グループ {lg} } } はサポートされていません",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage": "タイムスタンプフォーマット {timestampFormat} は、疑問符 ({fieldPlaceholder}) が含まれているためサポートされていません",
-    "xpack.fileDataVisualizer.editFlyout.overrides.trimFieldsLabel": "フィールドを切り抜く",
-    "xpack.fileDataVisualizer.editFlyout.overrideSettingsTitle": "上書き設定",
-    "xpack.fileDataVisualizer.experimentalBadge.experimentalLabel": "実験的",
-    "xpack.fileDataVisualizer.explanationFlyout.closeButton": "閉じる",
-    "xpack.fileDataVisualizer.explanationFlyout.content": "分析結果を生成した論理ステップ。",
-    "xpack.fileDataVisualizer.explanationFlyout.title": "分析説明",
-    "xpack.fileDataVisualizer.fieldDataCard.cardBoolean.valuesLabel": "値",
-    "xpack.fileDataVisualizer.fieldDataCard.cardDate.earliestLabel": "最も古い",
-    "xpack.fileDataVisualizer.fieldDataCard.cardDate.latestLabel": "最新",
-    "xpack.fileDataVisualizer.fieldDataCard.cardDate.summaryTableTitle": "まとめ",
-    "xpack.fileDataVisualizer.fieldDataCard.cardText.fieldMayBePopulatedDescription": "たとえば、ドキュメントマッピングで {copyToParam} パラメーターを使ったり、{includesParam} と {excludesParam} パラメーターを使用してインデックスした後に {sourceParam} フィールドから切り取ったりして入力される場合があります。",
-    "xpack.fileDataVisualizer.fieldDataCard.cardText.fieldNotPresentDescription": "このフィールドはクエリが実行されたドキュメントの {sourceParam} フィールドにありませんでした。",
-    "xpack.fileDataVisualizer.fieldDataCard.cardText.noExamplesForFieldsTitle": "このフィールドの例が取得されませんでした",
-    "xpack.fileDataVisualizer.fieldDataCard.examplesList.noExamplesMessage": "このフィールドの例が取得されませんでした",
-    "xpack.fileDataVisualizer.fieldDataCard.examplesList.title": "{numExamples, plural, one {値} other {例}}",
-    "xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.seriesName": "分布",
-    "xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.tooltipValueBetweenLabel": "{percent}% のドキュメントに {minValFormatted} から {maxValFormatted} の間の値があります",
-    "xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.tooltipValueEqualLabel": "{percent}% のドキュメントに {valFormatted} の値があります",
-    "xpack.fileDataVisualizer.fieldDataCard.topValues.calculatedFromSampleDescription": "1 つのシャードにつき {topValuesSamplerShardSize} のドキュメントのサンプルで計算されています",
-    "xpack.fileDataVisualizer.fieldDataCard.topValuesLabel": "トップの値",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.falseCountLabel": "False",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.summaryTableTitle": "まとめ",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.trueCountLabel": "True",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.countLabel": "カウント",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.distinctValueLabel": "固有の値",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle": "ドキュメント統計情報",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.percentageLabel": "割合",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.displayingPercentilesLabel": "{minPercent} - {maxPercent} パーセンタイルを表示中",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.distributionTitle": "分布",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.maxLabel": "最高",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.medianLabel": "中間",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.minLabel": "分",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.summaryTableTitle": "まとめ",
-    "xpack.fileDataVisualizer.fieldNameSelect": "フィールド名",
-    "xpack.fileDataVisualizer.fieldStatsCard.maxTitle": "最高",
-    "xpack.fileDataVisualizer.fieldStatsCard.medianTitle": "中間",
-    "xpack.fileDataVisualizer.fieldStatsCard.minTitle": "分",
-    "xpack.fileDataVisualizer.fieldTypeIcon.booleanTypeAriaLabel": "ブールタイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.dateTypeAriaLabel": "日付タイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.fieldTypeTooltip": "{type} タイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.geoPointTypeAriaLabel": "{geoPointParam} タイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.ipTypeAriaLabel": "IP タイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.keywordTypeAriaLabel": "キーワードタイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.numberTypeAriaLabel": "数字タイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.textTypeAriaLabel": "テキストタイプ",
-    "xpack.fileDataVisualizer.fieldTypeIcon.unknownTypeAriaLabel": "不明なタイプ",
-    "xpack.fileDataVisualizer.fieldTypeSelect": "フィールド型",
-    "xpack.fileDataVisualizer.fileBeatConfig.paths": "ファイルのパスをここに追加してください",
-    "xpack.fileDataVisualizer.fileBeatConfigFlyout.closeButton": "閉じる",
-    "xpack.fileDataVisualizer.fileBeatConfigFlyout.copyButton": "クリップボードにコピー",
-    "xpack.fileDataVisualizer.fileContents.fileContentsTitle": "ファイルコンテンツ",
-    "xpack.fileDataVisualizer.fileDatavisualizerView.xmlNotCurrentlySupportedErrorMessage": "XML は現在サポートされていません",
-    "xpack.fileDataVisualizer.fileErrorCallouts.applyOverridesDescription": "ファイル形式やタイムスタンプ形式などこのデータに関する何らかの情報がある場合は、初期オーバーライドを追加すると、残りの構造を推論するのに役立つことがあります。",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileCouldNotBeReadTitle": "ファイル構造を決定できません",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage": "アップロードするよう選択されたファイルのサイズが {diffFormatted} に許可された最大サイズの {maxFileSizeFormatted} を超えています",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage": "アップロードするよう選択されたファイルのサイズは {fileSizeFormatted} で、許可された最大サイズの {maxFileSizeFormatted} を超えています。",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileSizeTooLargeTitle": "ファイルサイズが大きすぎます。",
-    "xpack.fileDataVisualizer.fileErrorCallouts.overrideButton": "上書き設定を適用",
-    "xpack.fileDataVisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription": "以前の設定に戻しています。",
-    "xpack.fileDataVisualizer.geoPointCombinedFieldLabel": "地理ポイントフィールドを追加",
-    "xpack.fileDataVisualizer.geoPointForm.geoPointFieldAriaLabel": "地理ポイントフィールド、必須フィールド",
-    "xpack.fileDataVisualizer.geoPointForm.geoPointFieldLabel": "地理ポイントフィールド",
-    "xpack.fileDataVisualizer.geoPointForm.latFieldLabel": "緯度フィールド",
-    "xpack.fileDataVisualizer.geoPointForm.lonFieldLabel": "経度フィールド",
-    "xpack.fileDataVisualizer.geoPointForm.submitButtonLabel": "追加",
-    "xpack.fileDataVisualizer.importErrors.checkingPermissionErrorMessage": "パーミッションエラーをインポートします",
-    "xpack.fileDataVisualizer.importErrors.creatingIndexErrorMessage": "インデックスの作成中にエラーが発生しました",
-    "xpack.fileDataVisualizer.importErrors.creatingIndexPatternErrorMessage": "インデックスパターンの作成中にエラーが発生しました",
-    "xpack.fileDataVisualizer.importErrors.creatingIngestPipelineErrorMessage": "投入パイプラインの作成中にエラーが発生しました",
-    "xpack.fileDataVisualizer.importErrors.defaultErrorMessage": "エラー",
-    "xpack.fileDataVisualizer.importErrors.moreButtonLabel": "詳細",
-    "xpack.fileDataVisualizer.importErrors.parsingJSONErrorMessage": "JSON のパース中にエラーが発生しました",
-    "xpack.fileDataVisualizer.importErrors.readingFileErrorMessage": "ファイルの読み込み中にエラーが発生しました",
-    "xpack.fileDataVisualizer.importErrors.unknownErrorMessage": "不明なエラー",
-    "xpack.fileDataVisualizer.importErrors.uploadingDataErrorMessage": "データのアップロード中にエラーが発生しました",
-    "xpack.fileDataVisualizer.importProgress.createIndexPatternTitle": "インデックスパターンを作成",
-    "xpack.fileDataVisualizer.importProgress.createIndexTitle": "インデックスの作成",
-    "xpack.fileDataVisualizer.importProgress.createIngestPipelineTitle": "投入パイプラインの作成",
-    "xpack.fileDataVisualizer.importProgress.creatingIndexPatternDescription": "インデックスパターンを作成中です",
-    "xpack.fileDataVisualizer.importProgress.creatingIndexPatternTitle": "インデックスパターンを作成中です",
-    "xpack.fileDataVisualizer.importProgress.creatingIndexTitle": "インデックスを作成中です",
-    "xpack.fileDataVisualizer.importProgress.creatingIngestPipelineTitle": "投入パイプラインを作成中",
-    "xpack.fileDataVisualizer.importProgress.dataUploadedTitle": "データがアップロードされました",
-    "xpack.fileDataVisualizer.importProgress.fileProcessedTitle": "ファイルが処理されました",
-    "xpack.fileDataVisualizer.importProgress.indexCreatedTitle": "インデックスが作成されました",
-    "xpack.fileDataVisualizer.importProgress.indexPatternCreatedTitle": "インデックスパターンが作成されました",
-    "xpack.fileDataVisualizer.importProgress.ingestPipelineCreatedTitle": "投入パイプラインが作成されました",
-    "xpack.fileDataVisualizer.importProgress.processFileTitle": "ファイルの処理",
-    "xpack.fileDataVisualizer.importProgress.processingFileTitle": "ファイルを処理中",
-    "xpack.fileDataVisualizer.importProgress.processingImportedFileDescription": "インポートするファイルを処理中",
-    "xpack.fileDataVisualizer.importProgress.stepTwoCreatingIndexDescription": "インデックスを作成中です",
-    "xpack.fileDataVisualizer.importProgress.stepTwoCreatingIndexIngestPipelineDescription": "インデックスと投入パイプラインを作成中です",
-    "xpack.fileDataVisualizer.importProgress.uploadDataTitle": "データのアップロード",
-    "xpack.fileDataVisualizer.importProgress.uploadingDataDescription": "データをアップロード中です",
-    "xpack.fileDataVisualizer.importProgress.uploadingDataTitle": "データをアップロード中です",
-    "xpack.fileDataVisualizer.importSettings.advancedTabName": "高度な設定",
-    "xpack.fileDataVisualizer.importSettings.simpleTabName": "シンプル",
-    "xpack.fileDataVisualizer.importSummary.documentsCouldNotBeImportedDescription": "{importFailuresLength}/{docCount} 個のドキュメントをインポートできませんでした。行が Grok パターンと一致していないことが原因の可能性があります。",
-    "xpack.fileDataVisualizer.importSummary.documentsCouldNotBeImportedTitle": "ドキュメントの一部をインポートできませんでした。",
-    "xpack.fileDataVisualizer.importSummary.documentsIngestedTitle": "ドキュメントが投入されました",
-    "xpack.fileDataVisualizer.importSummary.failedDocumentsButtonLabel": "失敗したドキュメント",
-    "xpack.fileDataVisualizer.importSummary.failedDocumentsTitle": "失敗したドキュメント",
-    "xpack.fileDataVisualizer.importSummary.importCompleteTitle": "インポート完了",
-    "xpack.fileDataVisualizer.importSummary.indexPatternTitle": "インデックスパターン",
-    "xpack.fileDataVisualizer.importSummary.indexTitle": "インデックス",
-    "xpack.fileDataVisualizer.importSummary.ingestPipelineTitle": "パイプラインを投入",
-    "xpack.fileDataVisualizer.importView.experimentalFeatureTooltip": "実験的機能。フィードバックをお待ちしています。",
-    "xpack.fileDataVisualizer.importView.importButtonLabel": "インポート",
-    "xpack.fileDataVisualizer.importView.importDataTitle": "データのインポート",
-    "xpack.fileDataVisualizer.importView.importPermissionError": "インデックス {index} にデータを作成またはインポートするパーミッションがありません。",
-    "xpack.fileDataVisualizer.importView.indexNameAlreadyExistsErrorMessage": "インデックス名がすでに存在します",
-    "xpack.fileDataVisualizer.importView.indexNameContainsIllegalCharactersErrorMessage": "インデックス名に許可されていない文字が含まれています。",
-    "xpack.fileDataVisualizer.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "インデックスパターンがインデックス名と一致しません",
-    "xpack.fileDataVisualizer.importView.indexPatternNameAlreadyExistsErrorMessage": "インデックスパターン名がすでに存在します",
-    "xpack.fileDataVisualizer.importView.parseMappingsError": "マッピングのパース中にエラーが発生しました：",
-    "xpack.fileDataVisualizer.importView.parsePipelineError": "投入パイプラインのパース中にエラーが発生しました：",
-    "xpack.fileDataVisualizer.importView.parseSettingsError": "設定のパース中にエラーが発生しました：",
-    "xpack.fileDataVisualizer.importView.resetButtonLabel": "リセット",
-    "xpack.fileDataVisualizer.multiSelectPicker.NoFiltersFoundMessage": "フィルターが見つかりません",
-    "xpack.fileDataVisualizer.nameCollisionMsg": "「{name}」はすでに存在します。一意の名前を入力してください。",
-    "xpack.fileDataVisualizer.removeCombinedFieldsLabel": "結合されたフィールドを削除",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfig": "Filebeat 構成を作成",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigBottomText": "{password} が {user} ユーザーのパスワードである場合、{esUrl} は Elasticsearch の URL です。",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigBottomTextNoUsername": "{esUrl} が Elasticsearch の URL である場合",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTitle": "Filebeat 構成",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTopText1": "Filebeat を使用して {index} インデックスに追加データをアップロードできます。",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTopText2": "{filebeatYml} を修正して接続情報を設定します。",
-    "xpack.fileDataVisualizer.resultsLinks.indexManagementTitle": "インデックス管理",
-    "xpack.fileDataVisualizer.resultsLinks.indexPatternManagementTitle": "インデックスパターン管理",
-    "xpack.fileDataVisualizer.resultsLinks.viewIndexInDiscoverTitle": "インデックスを Discover で表示",
-    "xpack.fileDataVisualizer.resultsView.analysisExplanationButtonLabel": "分析説明",
-    "xpack.fileDataVisualizer.resultsView.fileStatsName": "ファイル統計",
-    "xpack.fileDataVisualizer.resultsView.overrideSettingsButtonLabel": "上書き設定",
-    "xpack.fileDataVisualizer.searchPanel.allFieldsLabel": "すべてのフィールド",
-    "xpack.fileDataVisualizer.searchPanel.numberFieldsLabel": "数値フィールド",
-    "xpack.fileDataVisualizer.searchPanel.ofFieldsTotal": "合計 {totalCount}",
-    "xpack.fileDataVisualizer.simpleImportSettings.createIndexPatternLabel": "インデックスパターンを作成",
-    "xpack.fileDataVisualizer.simpleImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド",
-    "xpack.fileDataVisualizer.simpleImportSettings.indexNameFormRowLabel": "インデックス名",
-    "xpack.fileDataVisualizer.simpleImportSettings.indexNamePlaceholder": "インデックス名",
-    "xpack.fileDataVisualizer.welcomeContent.delimitedTextFilesDescription": "CSV や TSV などの区切られたテキストファイル",
-    "xpack.fileDataVisualizer.welcomeContent.experimentalFeatureDescription": "これは実験的な機能です。フィードバックがありますか？{githubLink}で問題を報告してください。",
-    "xpack.fileDataVisualizer.welcomeContent.experimentalFeatureTooltip": "実験的機能。フィードバックをお待ちしています。",
-    "xpack.fileDataVisualizer.welcomeContent.logFilesWithCommonFormatDescription": "タイムスタンプの一般的フォーマットのログファイル",
-    "xpack.fileDataVisualizer.welcomeContent.newlineDelimitedJsonDescription": "改行区切りの JSON",
-    "xpack.fileDataVisualizer.welcomeContent.supportedFileFormatDescription": "ファイルデータビジュアライザーはこれらのファイル形式をサポートしています：",
-    "xpack.fileDataVisualizer.welcomeContent.uploadedFilesAllowedSizeDescription": "最大{maxFileSize}のファイルをアップロードできます。",
-    "xpack.fileDataVisualizer.welcomeContent.visualizeDataFromLogFileDescription": "ファイルデータビジュアライザーは、ログファイルのフィールドとメトリックの理解に役立ちます。ファイルをアップロードして、データを分析し、 Elasticsearch インデックスにインポートするか選択できます。",
-    "xpack.fileDataVisualizer.welcomeContent.visualizeDataFromLogFileTitle": "ログファイルのデータを可視化 {experimentalBadge}",
+    "xpack.dataVisualizer.file.aboutPanel.analyzingDataTitle": "データを分析中",
+    "xpack.dataVisualizer.file.aboutPanel.selectOrDragAndDropFileDescription": "ファイルを選択するかドラッグ &amp;amp; ドロップしてください",
+    "xpack.dataVisualizer.addCombinedFieldsLabel": "結合されたフィールドを追加",
+    "xpack.dataVisualizer.file.advancedImportSettings.createIndexPatternLabel": "インデックスパターンを作成",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexNameLabel": "インデックス名",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexNamePlaceholder": "インデックス名",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexPatternNameLabel": "インデックスパターン名",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexSettingsLabel": "インデックス設定",
+    "xpack.dataVisualizer.file.advancedImportSettings.ingestPipelineLabel": "パイプラインを投入",
+    "xpack.dataVisualizer.file.advancedImportSettings.mappingsLabel": "マッピング",
+    "xpack.dataVisualizer.file.analysisSummary.analyzedLinesNumberTitle": "分析した行数",
+    "xpack.dataVisualizer.file.analysisSummary.delimiterTitle": "区切り記号",
+    "xpack.dataVisualizer.file.analysisSummary.formatTitle": "フォーマット",
+    "xpack.dataVisualizer.file.analysisSummary.grokPatternTitle": "Grok パターン",
+    "xpack.dataVisualizer.file.analysisSummary.hasHeaderRowTitle": "ヘッダー行があります",
+    "xpack.dataVisualizer.file.analysisSummary.summaryTitle": "まとめ",
+    "xpack.dataVisualizer.file.analysisSummary.timeFieldTitle": "時間フィールド",
+    "xpack.dataVisualizer.file.bottomBar.backButtonLabel": "戻る",
+    "xpack.dataVisualizer.file.bottomBar.cancelButtonLabel": "キャンセル",
+    "xpack.dataVisualizer.file.bottomBar.missingImportPrivilegesMessage": "データインポートを有効にするには、ingest_adminロールが必要です",
+    "xpack.dataVisualizer.file.bottomBar.readMode.cancelButtonLabel": "キャンセル",
+    "xpack.dataVisualizer.file.bottomBar.readMode.importButtonLabel": "インポート",
+    "xpack.dataVisualizer.combinedFieldsForm.mappingsParseError": "マッピングのパース中にエラーが発生しました：{error}",
+    "xpack.dataVisualizer.combinedFieldsForm.pipelineParseError": "パイプラインのパース中にエラーが発生しました：{error}",
+    "xpack.dataVisualizer.combinedFieldsLabel": "結合されたフィールド",
+    "xpack.dataVisualizer.combinedFieldsReadOnlyHelpTextLabel": "詳細タグで結合されたフィールドを編集",
+    "xpack.dataVisualizer.combinedFieldsReadOnlyLabel": "結合されたフィールド",
+    "xpack.dataVisualizer.components.colorRangeLegend.blueColorRangeLabel": "青",
+    "xpack.dataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel": "緑 - 赤",
+    "xpack.dataVisualizer.components.colorRangeLegend.influencerScaleLabel": "影響因子カスタムスケール",
+    "xpack.dataVisualizer.components.colorRangeLegend.linearScaleLabel": "線形",
+    "xpack.dataVisualizer.components.colorRangeLegend.redColorRangeLabel": "赤",
+    "xpack.dataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel": "赤 - 緑",
+    "xpack.dataVisualizer.components.colorRangeLegend.sqrtScaleLabel": "Sqrt",
+    "xpack.dataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel": "黄 - 緑 - 青",
+    "xpack.dataVisualizer.dataGridChart.histogramNotAvailable": "グラフはサポートされていません。",
+    "xpack.dataVisualizer.dataGridChart.notEnoughData": "0個のドキュメントにフィールドが含まれます。",
+    "xpack.dataVisualizer.dataGridChart.topCategoriesLegend": "上位 {maxChartColumns}/{cardinality} カテゴリ",
+    "xpack.dataVisualizer.dataGrid.collapseDetailsForAllAriaLabel": "すべてのフィールドの詳細を折りたたむ",
+    "xpack.dataVisualizer.dataGrid.distinctValuesColumnName": "固有の値",
+    "xpack.dataVisualizer.dataGrid.distributionsColumnName": "分布",
+    "xpack.dataVisualizer.dataGrid.documentsCountColumnName": "ドキュメント (%) ",
+    "xpack.dataVisualizer.dataGrid.expandDetailsForAllAriaLabel": "すべてのフィールドの詳細を展開",
+    "xpack.dataVisualizer.dataGrid.nameColumnName": "名前",
+    "xpack.dataVisualizer.dataGrid.rowCollapse": "{fieldName} の詳細を非表示",
+    "xpack.dataVisualizer.dataGrid.rowExpand": "{fieldName} の詳細を表示",
+    "xpack.dataVisualizer.dataGrid.showDistributionsAriaLabel": "分布を表示",
+    "xpack.dataVisualizer.dataGrid.typeColumnName": "型",
+    "xpack.dataVisualizer.file.editFlyout.applyOverrideSettingsButtonLabel": "適用",
+    "xpack.dataVisualizer.file.editFlyout.closeOverrideSettingsButtonLabel": "閉じる",
+    "xpack.dataVisualizer.file.editFlyout.overrides.customDelimiterFormRowLabel": "カスタム区切り記号",
+    "xpack.dataVisualizer.file.editFlyout.overrides.customTimestampFormatErrorMessage": "タイムスタンプのフォーマットは、これらの Java 日付/時刻フォーマットの組み合わせでなければなりません：\n      yy, yyyy, M, MM, MMM, MMMM, d, dd, EEE, EEEE, H, HH, h, mm, ss, S-SSSSSSSSS, a, XX, XXX, zzz",
+    "xpack.dataVisualizer.file.editFlyout.overrides.customTimestampFormatFormRowLabel": "カスタムタイムスタンプフォーマット",
+    "xpack.dataVisualizer.file.editFlyout.overrides.dataFormatFormRowLabel": "データフォーマット",
+    "xpack.dataVisualizer.file.editFlyout.overrides.delimiterFormRowLabel": "区切り記号",
+    "xpack.dataVisualizer.file.editFlyout.overrides.editFieldNamesTitle": "フィールド名の編集",
+    "xpack.dataVisualizer.file.editFlyout.overrides.grokPatternFormRowLabel": "Grok パターン",
+    "xpack.dataVisualizer.file.editFlyout.overrides.hasHeaderRowLabel": "ヘッダー行があります",
+    "xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleErrorMessage": "値は {min} よりも大きく {max} 以下でなければなりません",
+    "xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleFormRowLabel": "サンプルする行数",
+    "xpack.dataVisualizer.file.editFlyout.overrides.quoteCharacterFormRowLabel": "引用符",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timeFieldFormRowLabel": "時間フィールド",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampEmptyValidationErrorMessage": "タイムスタンプフォーマットにタイムフォーマット文字グループがありません {timestampFormat}",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatFormRowLabel": "タイムスタンプフォーマット",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatHelpText": "対応フォーマットの詳細をご覧ください",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterSValidationErrorMessage": "{format} の文字 { length, plural, one { {lg} } other { グループ {lg} } } は、ss と {sep} からの区切りで始まっていないため、サポートされていません",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterValidationErrorMessage": "{format} の文字 { length, plural, one { {lg} } other { グループ {lg} } } はサポートされていません",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage": "タイムスタンプフォーマット {timestampFormat} は、疑問符 ({fieldPlaceholder}) が含まれているためサポートされていません",
+    "xpack.dataVisualizer.file.editFlyout.overrides.trimFieldsLabel": "フィールドを切り抜く",
+    "xpack.dataVisualizer.file.editFlyout.overrideSettingsTitle": "上書き設定",
+    "xpack.dataVisualizer.experimentalBadge.experimentalLabel": "実験的",
+    "xpack.dataVisualizer.file.explanationFlyout.closeButton": "閉じる",
+    "xpack.dataVisualizer.file.explanationFlyout.content": "分析結果を生成した論理ステップ。",
+    "xpack.dataVisualizer.file.explanationFlyout.title": "分析説明",
+    "xpack.dataVisualizer.dataGrid.field.cardBoolean.valuesLabel": "値",
+    "xpack.dataVisualizer.dataGrid.field.cardDate.earliestLabel": "最も古い",
+    "xpack.dataVisualizer.dataGrid.field.cardDate.latestLabel": "最新",
+    "xpack.dataVisualizer.dataGrid.field.cardDate.summaryTableTitle": "まとめ",
+    "xpack.dataVisualizer.dataGrid.fieldText.fieldMayBePopulatedDescription": "たとえば、ドキュメントマッピングで {copyToParam} パラメーターを使ったり、{includesParam} と {excludesParam} パラメーターを使用してインデックスした後に {sourceParam} フィールドから切り取ったりして入力される場合があります。",
+    "xpack.dataVisualizer.dataGrid.fieldText.fieldNotPresentDescription": "このフィールドはクエリが実行されたドキュメントの {sourceParam} フィールドにありませんでした。",
+    "xpack.dataVisualizer.dataGrid.fieldText.noExamplesForFieldsTitle": "このフィールドの例が取得されませんでした",
+    "xpack.dataVisualizer.dataGrid.field.examplesList.noExamplesMessage": "このフィールドの例が取得されませんでした",
+    "xpack.dataVisualizer.dataGrid.field.examplesList.title": "{numExamples, plural, one {値} other {例}}",
+    "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.seriesName": "分布",
+    "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueBetweenLabel": "{percent}% のドキュメントに {minValFormatted} から {maxValFormatted} の間の値があります",
+    "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueEqualLabel": "{percent}% のドキュメントに {valFormatted} の値があります",
+    "xpack.dataVisualizer.dataGrid.field.topValues.calculatedFromSampleDescription": "1 つのシャードにつき {topValuesSamplerShardSize} のドキュメントのサンプルで計算されています",
+    "xpack.dataVisualizer.dataGrid.field.topValuesLabel": "トップの値",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.falseCountLabel": "False",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.summaryTableTitle": "まとめ",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.trueCountLabel": "True",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.countLabel": "カウント",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.distinctValueLabel": "固有の値",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.metaTableTitle": "ドキュメント統計情報",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.percentageLabel": "割合",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.displayingPercentilesLabel": "{minPercent} - {maxPercent} パーセンタイルを表示中",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.distributionTitle": "分布",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.maxLabel": "最高",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.medianLabel": "中間",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.minLabel": "分",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.summaryTableTitle": "まとめ",
+    "xpack.dataVisualizer.fieldNameSelect": "フィールド名",
+    "xpack.dataVisualizer.fieldStats.maxTitle": "最高",
+    "xpack.dataVisualizer.fieldStats.medianTitle": "中間",
+    "xpack.dataVisualizer.fieldStats.minTitle": "分",
+    "xpack.dataVisualizer.fieldTypeIcon.booleanTypeAriaLabel": "ブールタイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.dateTypeAriaLabel": "日付タイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.fieldTypeTooltip": "{type} タイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.geoPointTypeAriaLabel": "{geoPointParam} タイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.ipTypeAriaLabel": "IP タイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.keywordTypeAriaLabel": "キーワードタイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.numberTypeAriaLabel": "数字タイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.textTypeAriaLabel": "テキストタイプ",
+    "xpack.dataVisualizer.fieldTypeIcon.unknownTypeAriaLabel": "不明なタイプ",
+    "xpack.dataVisualizer.fieldTypeSelect": "フィールド型",
+    "xpack.dataVisualizer.fileBeatConfig.paths": "ファイルのパスをここに追加してください",
+    "xpack.dataVisualizer.fileBeatConfigFlyout.closeButton": "閉じる",
+    "xpack.dataVisualizer.fileBeatConfigFlyout.copyButton": "クリップボードにコピー",
+    "xpack.dataVisualizer.file.fileContents.fileContentsTitle": "ファイルコンテンツ",
+    "xpack.dataVisualizer.file.xmlNotCurrentlySupportedErrorMessage": "XML は現在サポートされていません",
+    "xpack.dataVisualizer.file.fileErrorCallouts.applyOverridesDescription": "ファイル形式やタイムスタンプ形式などこのデータに関する何らかの情報がある場合は、初期オーバーライドを追加すると、残りの構造を推論するのに役立つことがあります。",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileCouldNotBeReadTitle": "ファイル構造を決定できません",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage": "アップロードするよう選択されたファイルのサイズが {diffFormatted} に許可された最大サイズの {maxFileSizeFormatted} を超えています",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage": "アップロードするよう選択されたファイルのサイズは {fileSizeFormatted} で、許可された最大サイズの {maxFileSizeFormatted} を超えています。",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileSizeTooLargeTitle": "ファイルサイズが大きすぎます。",
+    "xpack.dataVisualizer.file.fileErrorCallouts.overrideButton": "上書き設定を適用",
+    "xpack.dataVisualizer.file.fileErrorCallouts.revertingToPreviousSettingsDescription": "以前の設定に戻しています。",
+    "xpack.dataVisualizer.file.geoPointForm.combinedFieldLabel": "地理ポイントフィールドを追加",
+    "xpack.dataVisualizer.file.geoPointForm.geoPointFieldAriaLabel": "地理ポイントフィールド、必須フィールド",
+    "xpack.dataVisualizer.file.geoPointForm.geoPointFieldLabel": "地理ポイントフィールド",
+    "xpack.dataVisualizer.file.geoPointForm.latFieldLabel": "緯度フィールド",
+    "xpack.dataVisualizer.file.geoPointForm.lonFieldLabel": "経度フィールド",
+    "xpack.dataVisualizer.file.geoPointForm.submitButtonLabel": "追加",
+    "xpack.dataVisualizer.file.importErrors.checkingPermissionErrorMessage": "パーミッションエラーをインポートします",
+    "xpack.dataVisualizer.file.importErrors.creatingIndexErrorMessage": "インデックスの作成中にエラーが発生しました",
+    "xpack.dataVisualizer.file.importErrors.creatingIndexPatternErrorMessage": "インデックスパターンの作成中にエラーが発生しました",
+    "xpack.dataVisualizer.file.importErrors.creatingIngestPipelineErrorMessage": "投入パイプラインの作成中にエラーが発生しました",
+    "xpack.dataVisualizer.file.importErrors.defaultErrorMessage": "エラー",
+    "xpack.dataVisualizer.file.importErrors.moreButtonLabel": "詳細",
+    "xpack.dataVisualizer.file.importErrors.parsingJSONErrorMessage": "JSON のパース中にエラーが発生しました",
+    "xpack.dataVisualizer.file.importErrors.readingFileErrorMessage": "ファイルの読み込み中にエラーが発生しました",
+    "xpack.dataVisualizer.file.importErrors.unknownErrorMessage": "不明なエラー",
+    "xpack.dataVisualizer.file.importErrors.uploadingDataErrorMessage": "データのアップロード中にエラーが発生しました",
+    "xpack.dataVisualizer.file.importProgress.createIndexPatternTitle": "インデックスパターンを作成",
+    "xpack.dataVisualizer.file.importProgress.createIndexTitle": "インデックスの作成",
+    "xpack.dataVisualizer.file.importProgress.createIngestPipelineTitle": "投入パイプラインの作成",
+    "xpack.dataVisualizer.file.importProgress.creatingIndexPatternDescription": "インデックスパターンを作成中です",
+    "xpack.dataVisualizer.file.importProgress.creatingIndexPatternTitle": "インデックスパターンを作成中です",
+    "xpack.dataVisualizer.file.importProgress.creatingIndexTitle": "インデックスを作成中です",
+    "xpack.dataVisualizer.file.importProgress.creatingIngestPipelineTitle": "投入パイプラインを作成中",
+    "xpack.dataVisualizer.file.importProgress.dataUploadedTitle": "データがアップロードされました",
+    "xpack.dataVisualizer.file.importProgress.fileProcessedTitle": "ファイルが処理されました",
+    "xpack.dataVisualizer.file.importProgress.indexCreatedTitle": "インデックスが作成されました",
+    "xpack.dataVisualizer.file.importProgress.indexPatternCreatedTitle": "インデックスパターンが作成されました",
+    "xpack.dataVisualizer.file.importProgress.ingestPipelineCreatedTitle": "投入パイプラインが作成されました",
+    "xpack.dataVisualizer.file.importProgress.processFileTitle": "ファイルの処理",
+    "xpack.dataVisualizer.file.importProgress.processingFileTitle": "ファイルを処理中",
+    "xpack.dataVisualizer.file.importProgress.processingImportedFileDescription": "インポートするファイルを処理中",
+    "xpack.dataVisualizer.file.importProgress.stepTwoCreatingIndexDescription": "インデックスを作成中です",
+    "xpack.dataVisualizer.file.importProgress.stepTwoCreatingIndexIngestPipelineDescription": "インデックスと投入パイプラインを作成中です",
+    "xpack.dataVisualizer.file.importProgress.uploadDataTitle": "データのアップロード",
+    "xpack.dataVisualizer.file.importProgress.uploadingDataDescription": "データをアップロード中です",
+    "xpack.dataVisualizer.file.importProgress.uploadingDataTitle": "データをアップロード中です",
+    "xpack.dataVisualizer.file.importSettings.advancedTabName": "高度な設定",
+    "xpack.dataVisualizer.file.importSettings.simpleTabName": "シンプル",
+    "xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedDescription": "{importFailuresLength}/{docCount} 個のドキュメントをインポートできませんでした。行が Grok パターンと一致していないことが原因の可能性があります。",
+    "xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedTitle": "ドキュメントの一部をインポートできませんでした。",
+    "xpack.dataVisualizer.file.importSummary.documentsIngestedTitle": "ドキュメントが投入されました",
+    "xpack.dataVisualizer.file.importSummary.failedDocumentsButtonLabel": "失敗したドキュメント",
+    "xpack.dataVisualizer.file.importSummary.failedDocumentsTitle": "失敗したドキュメント",
+    "xpack.dataVisualizer.file.importSummary.importCompleteTitle": "インポート完了",
+    "xpack.dataVisualizer.file.importSummary.indexPatternTitle": "インデックスパターン",
+    "xpack.dataVisualizer.file.importSummary.indexTitle": "インデックス",
+    "xpack.dataVisualizer.file.importSummary.ingestPipelineTitle": "パイプラインを投入",
+    "xpack.dataVisualizer.file.importView.experimentalFeatureTooltip": "実験的機能。フィードバックをお待ちしています。",
+    "xpack.dataVisualizer.file.importView.importButtonLabel": "インポート",
+    "xpack.dataVisualizer.file.importView.importDataTitle": "データのインポート",
+    "xpack.dataVisualizer.file.importView.importPermissionError": "インデックス {index} にデータを作成またはインポートするパーミッションがありません。",
+    "xpack.dataVisualizer.file.importView.indexNameAlreadyExistsErrorMessage": "インデックス名がすでに存在します",
+    "xpack.dataVisualizer.file.importView.indexNameContainsIllegalCharactersErrorMessage": "インデックス名に許可されていない文字が含まれています。",
+    "xpack.dataVisualizer.file.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "インデックスパターンがインデックス名と一致しません",
+    "xpack.dataVisualizer.file.importView.indexPatternNameAlreadyExistsErrorMessage": "インデックスパターン名がすでに存在します",
+    "xpack.dataVisualizer.file.importView.parseMappingsError": "マッピングのパース中にエラーが発生しました：",
+    "xpack.dataVisualizer.file.importView.parsePipelineError": "投入パイプラインのパース中にエラーが発生しました：",
+    "xpack.dataVisualizer.file.importView.parseSettingsError": "設定のパース中にエラーが発生しました：",
+    "xpack.dataVisualizer.file.importView.resetButtonLabel": "リセット",
+    "xpack.dataVisualizer.multiSelectPicker.NoFiltersFoundMessage": "フィルターが見つかりません",
+    "xpack.dataVisualizer.nameCollisionMsg": "「{name}」はすでに存在します。一意の名前を入力してください。",
+    "xpack.dataVisualizer.removeCombinedFieldsLabel": "結合されたフィールドを削除",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfig": "Filebeat 構成を作成",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomText": "{password} が {user} ユーザーのパスワードである場合、{esUrl} は Elasticsearch の URL です。",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomTextNoUsername": "{esUrl} が Elasticsearch の URL である場合",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTitle": "Filebeat 構成",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText1": "Filebeat を使用して {index} インデックスに追加データをアップロードできます。",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText2": "{filebeatYml} を修正して接続情報を設定します。",
+    "xpack.dataVisualizer.file.resultsLinks.indexManagementTitle": "インデックス管理",
+    "xpack.dataVisualizer.file.resultsLinks.indexPatternManagementTitle": "インデックスパターン管理",
+    "xpack.dataVisualizer.file.resultsLinks.viewIndexInDiscoverTitle": "インデックスを Discover で表示",
+    "xpack.dataVisualizer.file.resultsView.analysisExplanationButtonLabel": "分析説明",
+    "xpack.dataVisualizer.file.resultsView.fileStatsName": "ファイル統計",
+    "xpack.dataVisualizer.file.resultsView.overrideSettingsButtonLabel": "上書き設定",
+    "xpack.dataVisualizer.searchPanel.allFieldsLabel": "すべてのフィールド",
+    "xpack.dataVisualizer.searchPanel.numberFieldsLabel": "数値フィールド",
+    "xpack.dataVisualizer.searchPanel.ofFieldsTotal": "合計 {totalCount}",
+    "xpack.dataVisualizer.file.simpleImportSettings.createIndexPatternLabel": "インデックスパターンを作成",
+    "xpack.dataVisualizer.file.simpleImportSettings.indexNameAriaLabel": "インデックス名、必須フィールド",
+    "xpack.dataVisualizer.file.simpleImportSettings.indexNameFormRowLabel": "インデックス名",
+    "xpack.dataVisualizer.file.simpleImportSettings.indexNamePlaceholder": "インデックス名",
+    "xpack.dataVisualizer.file.welcomeContent.delimitedTextFilesDescription": "CSV や TSV などの区切られたテキストファイル",
+    "xpack.dataVisualizer.file.welcomeContent.experimentalFeatureDescription": "これは実験的な機能です。フィードバックがありますか？{githubLink}で問題を報告してください。",
+    "xpack.dataVisualizer.file.welcomeContent.experimentalFeatureTooltip": "実験的機能。フィードバックをお待ちしています。",
+    "xpack.dataVisualizer.file.welcomeContent.logFilesWithCommonFormatDescription": "タイムスタンプの一般的フォーマットのログファイル",
+    "xpack.dataVisualizer.file.welcomeContent.newlineDelimitedJsonDescription": "改行区切りの JSON",
+    "xpack.dataVisualizer.file.welcomeContent.supportedFileFormatDescription": "ファイルデータビジュアライザーはこれらのファイル形式をサポートしています：",
+    "xpack.dataVisualizer.file.welcomeContent.uploadedFilesAllowedSizeDescription": "最大{maxFileSize}のファイルをアップロードできます。",
+    "xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileDescription": "ファイルデータビジュアライザーは、ログファイルのフィールドとメトリックの理解に役立ちます。ファイルをアップロードして、データを分析し、 Elasticsearch インデックスにインポートするか選択できます。",
+    "xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileTitle": "ログファイルのデータを可視化 {experimentalBadge}",
+    "xpack.dataVisualizer.index.actionsPanel.discoverAppTitle": "Discover",
+    "xpack.dataVisualizer.index.actionsPanel.exploreTitle": "データの調査",
+    "xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription": "インデックスのドキュメントを調査します。",
+    "xpack.dataVisualizer.index.fieldNameSelect": "フィールド名",
+    "xpack.dataVisualizer.index.fieldTypeSelect": "フィールド型",
+    "xpack.dataVisualizer.index.dataGrid.actionsColumnLabel": "アクション",
+    "xpack.dataVisualizer.index.dataGrid.exploreInLensDescription": "Lensで検索",
+    "xpack.dataVisualizer.index.dataGrid.exploreInLensTitle": "Lensで検索",
+    "xpack.dataVisualizer.index.lensChart.averageOfLabel": "{fieldName}の平均",
+    "xpack.dataVisualizer.index.lensChart.chartTitle": "{fieldName}のLens",
+    "xpack.dataVisualizer.index.lensChart.countLabel": "カウント",
+    "xpack.dataVisualizer.index.lensChart.topValuesLabel": "トップの値",
+    "xpack.dataVisualizer.searchPanel.allOptionLabel": "すべて検索",
+    "xpack.dataVisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar": "無効なクエリ",
+    "xpack.dataVisualizer.searchPanel.queryBarPlaceholder": "小さいサンプルサイズを選択することで、クエリの実行時間を短縮しクラスターへの負荷を軽減できます。",
+    "xpack.dataVisualizer.searchPanel.sampleSizeAriaLabel": "サンプリングするドキュメント数を選択してください",
+    "xpack.dataVisualizer.searchPanel.sampleSizeOptionLabel": "サンプルサイズ (シャード単位) ：{wrappedValue}",
+    "xpack.dataVisualizer.searchPanel.showEmptyFields": "空のフィールドを表示",
+    "xpack.dataVisualizer.searchPanel.totalDocCountLabel": "合計ドキュメント数：{strongTotalCount}",
+    "xpack.dataVisualizer.dataGrid.field.documentCountChart.seriesLabel": "ドキュメントカウント",
+    "xpack.dataVisualizer.dataGrid.field.fieldNotInDocsLabel": "このフィールドは選択された時間範囲のドキュメントにありません",
+    "xpack.dataVisualizer.dataGrid.field.loadingLabel": "読み込み中",
+    "xpack.dataVisualizer.index.dataLoader.internalServerErrorMessage": "インデックス {index} のデータの読み込み中にエラーが発生。{message}。リクエストがタイムアウトした可能性があります。小さなサンプルサイズを使うか、時間範囲を狭めてみてください。",
     "xpack.fileUpload.fileSizeError": "ファイルサイズ{fileSize}は最大ファイルサイズの{maxFileSize}を超えています",
     "xpack.fileUpload.fileTypeError": "ファイルは使用可能なタイプのいずれかではありません。{types}",
     "xpack.fileUpload.geojsonFilePicker.acceptedCoordinateSystem": "座標は EPSG:4326 座標参照系でなければなりません。",
@@ -8987,7 +8950,6 @@
     "xpack.fleet.alphaMessging.closeFlyoutLabel": "閉じる",
     "xpack.fleet.appNavigation.agentsLinkText": "エージェント",
     "xpack.fleet.appNavigation.dataStreamsLinkText": "データストリーム",
-    "xpack.fleet.appNavigation.epmLinkText": "統合",
     "xpack.fleet.appNavigation.overviewLinkText": "概要",
     "xpack.fleet.appNavigation.policiesLinkText": "ポリシー",
     "xpack.fleet.appNavigation.sendFeedbackButton": "フィードバックを送信",
@@ -9003,7 +8965,6 @@
     "xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "統合の編集",
     "xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "登録トークン",
     "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "インストール済み",
-    "xpack.fleet.breadcrumbs.integrationPageTitle": "統合",
     "xpack.fleet.breadcrumbs.integrationsPageTitle": "統合",
     "xpack.fleet.breadcrumbs.overviewPageTitle": "概要",
     "xpack.fleet.breadcrumbs.policiesPageTitle": "ポリシー",
@@ -9176,9 +9137,7 @@
     "xpack.fleet.epm.versionLabel": "バージョン",
     "xpack.fleet.epmList.allFilterLinkText": "すべて",
     "xpack.fleet.epmList.allPackagesFilterLinkText": "すべて",
-    "xpack.fleet.epmList.allTabText": "すべての統合",
     "xpack.fleet.epmList.allTitle": "カテゴリで参照",
-    "xpack.fleet.epmList.installedTabText": "インストールされている統合",
     "xpack.fleet.epmList.installedTitle": "インストールされている統合",
     "xpack.fleet.epmList.noPackagesFoundPlaceholder": "パッケージが見つかりません",
     "xpack.fleet.epmList.searchPackagesPlaceholder": "統合を検索",
@@ -9268,7 +9227,6 @@
     "xpack.fleet.namespaceValidation.requiredErrorMessage": "名前空間は必須です",
     "xpack.fleet.namespaceValidation.tooLongErrorMessage": "名前空間は100バイト以下でなければなりません",
     "xpack.fleet.newEnrollmentKey.cancelButtonLabel": "キャンセル",
-    "xpack.fleet.newEnrollmentKey.flyoutTitle": "登録トークンを作成",
     "xpack.fleet.newEnrollmentKey.keyCreatedToasts": "登録トークンが作成されました。",
     "xpack.fleet.newEnrollmentKey.nameLabel": "名前",
     "xpack.fleet.newEnrollmentKey.policyLabel": "ポリシー",
@@ -13304,7 +13262,6 @@
     "xpack.maps.emsSource.tooltipsTitle": "ツールチップフィールド",
     "xpack.maps.es_geo_utils.convert.invalidGeometryCollectionErrorMessage": "GeometryCollectionを convertESShapeToGeojsonGeometryに渡さないでください",
     "xpack.maps.es_geo_utils.convert.unsupportedGeometryTypeErrorMessage": "{geometryType} ジオメトリから Geojson に変換できません。サポートされていません",
-    "xpack.maps.es_geo_utils.distanceFilterAlias": "{pointLabel} の {distanceKm}km 以内にある {geoFieldName}",
     "xpack.maps.es_geo_utils.unsupportedFieldTypeErrorMessage": "サポートされていないフィールドタイプ、期待値：{expectedTypes}、提供された値：{fieldType}",
     "xpack.maps.es_geo_utils.unsupportedGeometryTypeErrorMessage": "サポートされていないジオメトリタイプ、期待値：{expectedTypes}、提供された値：{geometryType}",
     "xpack.maps.es_geo_utils.wkt.invalidWKTErrorMessage": "{wkt} を Geojson に変換できません。有効な WKT が必要です。",
@@ -13484,7 +13441,6 @@
     "xpack.maps.metricSelect.selectAggregationPlaceholder": "集約を選択",
     "xpack.maps.metricSelect.sumDropDownOptionLabel": "合計",
     "xpack.maps.metricSelect.termsDropDownOptionLabel": "トップ用語",
-    "xpack.maps.multiIndexFieldSelect.fieldLabel": "フィールドのフィルタリング",
     "xpack.maps.mvtSource.addFieldLabel": "追加",
     "xpack.maps.mvtSource.fieldPlaceholderText": "フィールド名",
     "xpack.maps.mvtSource.numberFieldLabel": "数字",
@@ -14565,46 +14521,7 @@
     "xpack.ml.dataGridChart.histogramNotAvailable": "グラフはサポートされていません。",
     "xpack.ml.dataGridChart.notEnoughData": "0個のドキュメントにフィールドが含まれます。",
     "xpack.ml.dataGridChart.topCategoriesLegend": "上位 {maxChartColumns}/{cardinality} カテゴリ",
-    "xpack.ml.datavisualizer.actionsPanel.advancedDescription": "より高度なユースケースでは、すべてのオプションを使用してジョブを作成します。",
-    "xpack.ml.datavisualizer.actionsPanel.advancedTitle": "高度な異常検知",
-    "xpack.ml.datavisualizer.actionsPanel.createJobTitle": "ジョブを作成",
-    "xpack.ml.datavisualizer.actionsPanel.dataframeAnalyticsTitle": "データフレーム分析",
-    "xpack.ml.datavisualizer.actionsPanel.dataframeTypesDescription": "異常値検出、回帰分析、分類分析を作成します。",
-    "xpack.ml.datavisualizer.actionsPanel.discoverAppTitle": "Discover",
-    "xpack.ml.datavisualizer.actionsPanel.exploreTitle": "データの調査",
-    "xpack.ml.datavisualizer.actionsPanel.viewIndexInDiscoverDescription": "インデックスのドキュメントを調査します。",
-    "xpack.ml.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel": "すべてのフィールドの詳細を折りたたむ",
-    "xpack.ml.datavisualizer.dataGrid.distinctValuesColumnName": "固有の値",
-    "xpack.ml.datavisualizer.dataGrid.distributionsColumnName": "分布",
-    "xpack.ml.datavisualizer.dataGrid.documentsCountColumnName": "ドキュメント (%) ",
-    "xpack.ml.datavisualizer.dataGrid.expandDetailsForAllAriaLabel": "すべてのフィールドの詳細を展開",
-    "xpack.ml.datavisualizer.dataGrid.nameColumnName": "名前",
-    "xpack.ml.datavisualizer.dataGrid.rowCollapse": "{fieldName} の詳細を非表示",
-    "xpack.ml.datavisualizer.dataGrid.rowExpand": "{fieldName} の詳細を表示",
-    "xpack.ml.datavisualizer.dataGrid.showDistributionsAriaLabel": "分布を表示",
-    "xpack.ml.datavisualizer.dataGrid.typeColumnName": "型",
-    "xpack.ml.datavisualizer.dataLoader.internalServerErrorMessage": "インデックス {index} のデータの読み込み中にエラーが発生。{message}。リクエストがタイムアウトした可能性があります。小さなサンプルサイズを使うか、時間範囲を狭めてみてください。",
     "xpack.ml.dataVisualizer.fileBasedLabel": "ファイル",
-    "xpack.ml.dataVisualizer.indexBased.fieldNameSelect": "フィールド名",
-    "xpack.ml.dataVisualizer.indexBased.fieldTypeSelect": "フィールド型",
-    "xpack.ml.dataVisualizer.indexBasedDataGrid.actionsColumnLabel": "アクション",
-    "xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensDescription": "Lensで検索",
-    "xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensTitle": "Lensで検索",
-    "xpack.ml.dataVisualizer.lensChart.averageOfLabel": "{fieldName}の平均",
-    "xpack.ml.dataVisualizer.lensChart.chartTitle": "{fieldName}のLens",
-    "xpack.ml.dataVisualizer.lensChart.countLabel": "カウント",
-    "xpack.ml.dataVisualizer.lensChart.topValuesLabel": "トップの値",
-    "xpack.ml.datavisualizer.page.errorLoadingDataMessage": "インデックス {index} のデータの読み込み中にエラーが発生。{message}。",
-    "xpack.ml.dataVisualizer.searchPanel.allFieldsLabel": "すべてのフィールド",
-    "xpack.ml.datavisualizer.searchPanel.allOptionLabel": "すべて検索",
-    "xpack.ml.datavisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar": "無効なクエリ",
-    "xpack.ml.dataVisualizer.searchPanel.numberFieldsLabel": "数値フィールド",
-    "xpack.ml.dataVisualizer.searchPanel.ofFieldsTotal": "合計 {totalCount}",
-    "xpack.ml.datavisualizer.searchPanel.queryBarPlaceholder": "小さいサンプルサイズを選択することで、クエリの実行時間を短縮しクラスターへの負荷を軽減できます。",
-    "xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel": "サンプリングするドキュメント数を選択してください",
-    "xpack.ml.datavisualizer.searchPanel.sampleSizeOptionLabel": "サンプルサイズ (シャード単位) ：{wrappedValue}",
-    "xpack.ml.dataVisualizer.searchPanel.showEmptyFields": "空のフィールドを表示",
-    "xpack.ml.datavisualizer.searchPanel.totalDocCountLabel": "合計ドキュメント数：{strongTotalCount}",
     "xpack.ml.datavisualizer.selector.dataVisualizerDescription": "機械学習データビジュアライザーツールは、ログファイルのメトリックとフィールド、または既存の Elasticsearch インデックスを分析し、データの理解を助けます。",
     "xpack.ml.datavisualizer.selector.dataVisualizerTitle": "データビジュアライザー",
     "xpack.ml.datavisualizer.selector.experimentalBadgeLabel": "実験的",
@@ -14731,48 +14648,14 @@
     "xpack.ml.explorerCharts.errorCallOutMessage": "{reason}ため、{jobs} の異常値グラフを表示できません。",
     "xpack.ml.feature.reserved.description": "ユーザーアクセスを許可するには、machine_learning_user か machine_learning_admin ロールのどちらかを割り当てる必要があります。",
     "xpack.ml.featureRegistry.mlFeatureName": "機械学習",
-    "xpack.ml.fieldDataCard.cardBoolean.valuesLabel": "値",
-    "xpack.ml.fieldDataCard.cardDate.earliestLabel": "最も古い",
-    "xpack.ml.fieldDataCard.cardDate.latestLabel": "最新",
-    "xpack.ml.fieldDataCard.cardDate.summaryTableTitle": "まとめ",
-    "xpack.ml.fieldDataCard.cardText.fieldMayBePopulatedDescription": "たとえば、ドキュメントマッピングで {copyToParam} パラメーターを使ったり、{includesParam} と {excludesParam} パラメーターを使用してインデックスした後に {sourceParam} フィールドから切り取ったりして入力される場合があります。",
-    "xpack.ml.fieldDataCard.cardText.fieldNotPresentDescription": "このフィールドはクエリが実行されたドキュメントの {sourceParam} フィールドにありませんでした。",
-    "xpack.ml.fieldDataCard.cardText.noExamplesForFieldsTitle": "このフィールドの例が取得されませんでした",
-    "xpack.ml.fieldDataCard.documentCountChart.seriesLabel": "ドキュメントカウント",
-    "xpack.ml.fieldDataCard.examplesList.noExamplesMessage": "このフィールドの例が取得されませんでした",
-    "xpack.ml.fieldDataCard.examplesList.title": "{numExamples, plural, one {値} other {例}}",
-    "xpack.ml.fieldDataCard.fieldNotInDocsLabel": "このフィールドは選択された時間範囲のドキュメントにありません",
-    "xpack.ml.fieldDataCard.loadingLabel": "読み込み中",
-    "xpack.ml.fieldDataCard.metricDistributionChart.seriesName": "分布",
-    "xpack.ml.fieldDataCard.metricDistributionChart.tooltipValueBetweenLabel": "{percent}% のドキュメントに {minValFormatted} から {maxValFormatted} の間の値があります",
-    "xpack.ml.fieldDataCard.metricDistributionChart.tooltipValueEqualLabel": "{percent}% のドキュメントに {valFormatted} の値があります",
-    "xpack.ml.fieldDataCard.topValues.calculatedFromSampleDescription": "1 つのシャードにつき {topValuesSamplerShardSize} のドキュメントのサンプルで計算されています",
-    "xpack.ml.fieldDataCard.topValuesLabel": "トップの値",
-    "xpack.ml.fieldDataCardExpandedRow.booleanContent.falseCountLabel": "False",
-    "xpack.ml.fieldDataCardExpandedRow.booleanContent.summaryTableTitle": "まとめ",
-    "xpack.ml.fieldDataCardExpandedRow.booleanContent.trueCountLabel": "True",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.countLabel": "カウント",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.distinctValueLabel": "固有の値",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle": "ドキュメント統計情報",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.percentageLabel": "割合",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.displayingPercentilesLabel": "{minPercent} - {maxPercent} パーセンタイルを表示中",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.distributionTitle": "分布",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.maxLabel": "最高",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.medianLabel": "中間",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.minLabel": "分",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.summaryTableTitle": "まとめ",
-    "xpack.ml.fieldTitleBar.documentCountLabel": "ドキュメントカウント",
     "xpack.ml.fieldTypeIcon.booleanTypeAriaLabel": "ブールタイプ",
     "xpack.ml.fieldTypeIcon.dateTypeAriaLabel": "日付タイプ",
-    "xpack.ml.fieldTypeIcon.fieldTypeTooltip": "{type} タイプ",
     "xpack.ml.fieldTypeIcon.geoPointTypeAriaLabel": "{geoPointParam} タイプ",
     "xpack.ml.fieldTypeIcon.ipTypeAriaLabel": "IP タイプ",
     "xpack.ml.fieldTypeIcon.keywordTypeAriaLabel": "キーワードタイプ",
     "xpack.ml.fieldTypeIcon.numberTypeAriaLabel": "数字タイプ",
     "xpack.ml.fieldTypeIcon.textTypeAriaLabel": "テキストタイプ",
     "xpack.ml.fieldTypeIcon.unknownTypeAriaLabel": "不明なタイプ",
-    "xpack.ml.fileDataVisualizerDescription": "CSV、NDJSON、またはログファイルをインポートします。",
-    "xpack.ml.fileDataVisualizerTitle": "ファイルをアップロード",
     "xpack.ml.formatters.metricChangeDescription.actualSameAsTypicalDescription": "実際値が通常値と同じ",
     "xpack.ml.formatters.metricChangeDescription.moreThan100xHigherDescription": "100x よりも高い",
     "xpack.ml.formatters.metricChangeDescription.moreThan100xLowerDescription": "100x よりも低い",
@@ -19128,8 +19011,6 @@
     "xpack.securitySolution.cases.allCases.actions": "アクション",
     "xpack.securitySolution.cases.allCases.comments": "コメント",
     "xpack.securitySolution.cases.allCases.noTagsAvailable": "利用可能なタグがありません",
-    "xpack.securitySolution.cases.caseSavedObjectNoPermissionsMessage": "ケースを表示するには、Kibana スペースで保存されたオブジェクト管理機能の権限が必要です。詳細については、Kibana管理者に連絡してください。",
-    "xpack.securitySolution.cases.caseSavedObjectNoPermissionsTitle": "Kibana機能権限が必要です",
     "xpack.securitySolution.cases.caseTable.caseDetailsLinkAria": "クリックすると、タイトル{detailName}のケースを表示します",
     "xpack.securitySolution.cases.caseTable.closedCases": "終了したケース",
     "xpack.securitySolution.cases.caseTable.inProgressCases": "進行中のケース",
@@ -19177,8 +19058,6 @@
     "xpack.securitySolution.cases.createCase.titleFieldRequiredError": "タイトルが必要です。",
     "xpack.securitySolution.cases.dismissErrorsPushServiceCallOutTitle": "閉じる",
     "xpack.securitySolution.cases.pageTitle": "ケース",
-    "xpack.securitySolution.cases.readOnlySavedObjectDescription": "ケースを表示する権限のみが付与されています。ケースを開いて更新する必要がある場合は、Kibana管理者に連絡してください。",
-    "xpack.securitySolution.cases.readOnlySavedObjectTitle": "新しいケースを開いたり、既存のケースを更新したりすることはできません",
     "xpack.securitySolution.cases.settings.syncAlertsSwitchLabelOff": "オフ",
     "xpack.securitySolution.cases.settings.syncAlertsSwitchLabelOn": "オン",
     "xpack.securitySolution.cases.timeline.actions.addCase": "ケースに追加",
@@ -20208,7 +20087,6 @@
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.monitoring": "ルール監視",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.rules": "ルール",
     "xpack.securitySolution.detectionEngine.rules.backOptionsHeader": "検出に戻る",
-    "xpack.securitySolution.detectionEngine.rules.components.genericDownloader.exportFailureTitle": "データをエクスポートできませんでした…",
     "xpack.securitySolution.detectionEngine.rules.components.ruleActionsOverflow.allActionsTitle": "すべてのアクション",
     "xpack.securitySolution.detectionEngine.rules.continueButtonTitle": "続行",
     "xpack.securitySolution.detectionEngine.rules.create.successfullyCreatedRuleTitle": "{ruleName}が作成されました",
@@ -20337,9 +20215,6 @@
     "xpack.securitySolution.endpoint.ingestToastTitle": "アプリを初期化できませんでした",
     "xpack.securitySolution.endpoint.list.actionmenu": "開く",
     "xpack.securitySolution.endpoint.list.actions": "アクション",
-    "xpack.securitySolution.endpoint.list.actions.agentDetails": "エージェント詳細を表示",
-    "xpack.securitySolution.endpoint.list.actions.agentPolicy": "エージェントポリシーを表示",
-    "xpack.securitySolution.endpoint.list.actions.hostDetails": "ホスト詳細を表示",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling": "エンドポイントを登録しています。進行状況を追跡するには、{agentsLink}してください。",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling.viewAgentsLink": "エージェントを表示",
     "xpack.securitySolution.endpoint.list.endpointVersion": "バージョン",
@@ -21502,7 +21377,6 @@
     "xpack.securitySolution.trustedapps.list.actions.delete": "削除",
     "xpack.securitySolution.trustedapps.list.actions.delete.description": "このエントリを削除",
     "xpack.securitySolution.trustedapps.list.addButton": "信頼できるアプリケーションを追加",
-    "xpack.securitySolution.trustedapps.list.backButton": "戻る",
     "xpack.securitySolution.trustedapps.list.columns.actions": "アクション",
     "xpack.securitySolution.trustedapps.list.pageTitle": "信頼できるアプリケーション",
     "xpack.securitySolution.trustedapps.listEmptyState.message": "現在、エンドポイントには信頼できるアプリケーションがありません。",
diff --git a/x-pack/plugins/translations/translations/zh-CN.json b/x-pack/plugins/translations/translations/zh-CN.json
index 826c9cf493e62..46bdb83c42528 100644
--- a/x-pack/plugins/translations/translations/zh-CN.json
+++ b/x-pack/plugins/translations/translations/zh-CN.json
@@ -115,7 +115,6 @@
     "advancedSettings.form.clearNoSearchResultText": " (清除搜索) ",
     "advancedSettings.form.clearSearchResultText": " (清除搜索) ",
     "advancedSettings.form.countOfSettingsChanged": "{unsavedCount} 个未保存{unsavedCount, plural, other {设置} }{hiddenCount, plural, =0 {} other {，# 个已隐藏} }",
-    "advancedSettings.form.noSearchResultText": "未找到设置{clearSearch}",
     "advancedSettings.form.requiresPageReloadToastButtonLabel": "重新加载页面",
     "advancedSettings.form.requiresPageReloadToastDescription": "一个或多个设置需要您重新加载页面才能生效。",
     "advancedSettings.form.saveButtonLabel": "保存更改",
@@ -622,10 +621,7 @@
     "dashboard.featureCatalogue.dashboardTitle": "仪表板",
     "dashboard.fillDashboardTitle": "此仪表板是空的。让我们来填充它！",
     "dashboard.helpMenu.appName": "仪表板",
-    "dashboard.howToStartWorkingOnNewDashboardDescription1": "单击",
-    "dashboard.howToStartWorkingOnNewDashboardDescription2": "上面菜单栏以开始添加面板。",
     "dashboard.howToStartWorkingOnNewDashboardEditLinkAriaLabel": "编辑仪表板",
-    "dashboard.howToStartWorkingOnNewDashboardEditLinkText": "编辑",
     "dashboard.listing.createNewDashboard.combineDataViewFromKibanaAppDescription": "您可以将任何 Kibana 应用的数据视图组合到一个仪表板中，从而在一个位置查看所有内容。",
     "dashboard.listing.createNewDashboard.createButtonLabel": "创建新的仪表板",
     "dashboard.listing.createNewDashboard.newToKibanaDescription": "Kibana 新手？{sampleDataInstallLink}来试用一下。",
@@ -670,9 +666,6 @@
     "dashboard.panelStorageError.setError": "设置未保存更改时遇到错误：{message}",
     "dashboard.placeholder.factory.displayName": "占位符",
     "dashboard.savedDashboard.newDashboardTitle": "新建仪表板",
-    "dashboard.solutionToolbar.addPanelButtonLabel": "创建可视化",
-    "dashboard.solutionToolbar.editorMenuButtonLabel": "所有类型",
-    "dashboard.stateManager.timeNotSavedWithDashboardErrorMessage": "时间未随此仪表板保存，因此无法同步。",
     "dashboard.strings.dashboardEditTitle": "正在编辑 {title}",
     "dashboard.topNav.cloneModal.cancelButtonLabel": "取消",
     "dashboard.topNav.cloneModal.cloneDashboardModalHeaderTitle": "克隆仪表板",
@@ -823,7 +816,6 @@
     "data.fieldFormats.duration.outputFormats.asSeconds": "秒",
     "data.fieldFormats.duration.outputFormats.asWeeks": "周",
     "data.fieldFormats.duration.outputFormats.asYears": "年",
-    "data.fieldFormats.duration.outputFormats.humanize": "可人工读取",
     "data.fieldFormats.duration.title": "持续时间",
     "data.fieldFormats.histogram.title": "直方图",
     "data.fieldFormats.ip.title": "IP 地址",
@@ -1562,7 +1554,6 @@
     "discover.bucketIntervalTooltip.tooLargeBucketsText": "存储桶过大",
     "discover.bucketIntervalTooltip.tooManyBucketsText": "存储桶过多",
     "discover.clearSelection": "清除所选内容",
-    "discover.context.breadcrumb": "{indexPatternTitle}#{docId} 的上下文",
     "discover.context.failedToLoadAnchorDocumentDescription": "无法加载定位点文档",
     "discover.context.failedToLoadAnchorDocumentErrorDescription": "无法加载定位点文档。",
     "discover.context.loadButtonLabel": "加载",
@@ -1710,8 +1701,6 @@
     "discover.howToChangeTheTimeTooltip": "要更改时间，请使用全局时间筛选。",
     "discover.howToSeeOtherMatchingDocumentsDescription": "下面是与您的搜索匹配的前 {sampleSize} 个文档，请优化您的搜索以查看其他文档。",
     "discover.howToSeeOtherMatchingDocumentsDescriptionGrid": "下面是与您的搜索匹配的前 {sampleSize} 个文档，请优化您的搜索以查看其他文档。",
-    "discover.inspectorRequestDataTitle": "数据",
-    "discover.inspectorRequestDescription": "此请求将查询 Elasticsearch 以获取搜索的数据。",
     "discover.json.codeEditorAriaLabel": "Elasticsearch 文档的只读 JSON 视图",
     "discover.json.copyToClipboardLabel": "复制到剪贴板",
     "discover.localMenu.inspectTitle": "检查",
@@ -1905,8 +1894,6 @@
     "expressions.functions.fontHelpText": "创建字体样式。",
     "expressions.functions.mapColumn.args.copyMetaFromHelpText": "如果设置，指定列 ID 的元对象将复制到指定目标列。如果列不存在，复制将无提示失败。",
     "expressions.functions.mapColumn.args.expressionHelpText": "在每行上执行的表达式，为其提供了单行 {DATATABLE} 上下文，其将返回单元格值。",
-    "expressions.functions.mapColumn.args.idHelpText": "结果列的可选 ID。如果为 `null`，名称/列参数将用作 ID。",
-    "expressions.functions.mapColumn.args.nameHelpText": "结果列的名称。",
     "expressions.functions.mapColumnHelpText": "添加计算为其他列的结果的列。只有提供参数时，才会执行更改。另请参见 {alterColumnFn} 和 {staticColumnFn}。",
     "expressions.functions.math.args.expressionHelpText": "已计算的 {TINYMATH} 表达式。请参阅 {TINYMATH_URL}。",
     "expressions.functions.math.args.onErrorHelpText": "如果 {TINYMATH} 评估失败或返回 NaN，返回值将由 onError 指定。为 `'throw'` 时，其将引发异常，从而终止表达式执行 (默认) 。",
@@ -2906,8 +2893,6 @@
     "indexPatternManagement.createIndexPattern.betaLabel": "公测版",
     "indexPatternManagement.createIndexPattern.description": "索引模式可以匹配单个源，例如 {single} 或 {multiple} 个数据源、{star}。",
     "indexPatternManagement.createIndexPattern.documentation": "阅读文档",
-    "indexPatternManagement.createIndexPattern.emptyState.basicLicenseDescription": "此功能需要基本级许可证。",
-    "indexPatternManagement.createIndexPattern.emptyState.basicLicenseLabel": "基本级",
     "indexPatternManagement.createIndexPattern.emptyState.checkDataButton": "检查新数据",
     "indexPatternManagement.createIndexPattern.emptyState.createAnyway": "部分索引可能已隐藏。仍然尝试{link}。",
     "indexPatternManagement.createIndexPattern.emptyState.createAnywayLink": "创建索引模式",
@@ -3282,7 +3267,6 @@
     "management.landing.subhead": "管理您的索引、索引模式、已保存对象、Kibana 设置等等。",
     "management.landing.text": "应用的完整列表位于左侧菜单中。",
     "management.nav.label": "管理",
-    "management.nav.menu": "管理菜单",
     "management.sections.dataTip": "管理您的集群数据和备份",
     "management.sections.dataTitle": "数据",
     "management.sections.ingestTip": "管理如何转换数据并将其加载到集群中",
@@ -4933,12 +4917,6 @@
     "visTypeVislib.editors.heatmap.heatmapSettingsTitle": "热图设置",
     "visTypeVislib.editors.heatmap.highlightLabel": "高亮范围",
     "visTypeVislib.editors.heatmap.highlightLabelTooltip": "高亮显示图表中鼠标悬停的范围以及图例中对应的标签。",
-    "visTypeVislib.editors.pie.donutLabel": "圆环图",
-    "visTypeVislib.editors.pie.labelsSettingsTitle": "标签设置",
-    "visTypeVislib.editors.pie.pieSettingsTitle": "饼图设置",
-    "visTypeVislib.editors.pie.showLabelsLabel": "显示标签",
-    "visTypeVislib.editors.pie.showTopLevelOnlyLabel": "仅显示顶级",
-    "visTypeVislib.editors.pie.showValuesLabel": "显示值",
     "visTypeVislib.functions.pie.help": "饼图可视化",
     "visTypeVislib.functions.vislib.help": "Vislib 可视化",
     "visTypeVislib.gauge.alignmentAutomaticTitle": "自动",
@@ -4960,11 +4938,6 @@
     "visTypeVislib.heatmap.metricTitle": "值",
     "visTypeVislib.heatmap.segmentTitle": "X 轴",
     "visTypeVislib.heatmap.splitTitle": "拆分图表",
-    "visTypeVislib.pie.metricTitle": "切片大小",
-    "visTypeVislib.pie.pieDescription": "以整体的比例比较数据。",
-    "visTypeVislib.pie.pieTitle": "饼图",
-    "visTypeVislib.pie.segmentTitle": "拆分切片",
-    "visTypeVislib.pie.splitTitle": "拆分图表",
     "visTypeVislib.vislib.errors.noResultsFoundTitle": "找不到结果",
     "visTypeVislib.vislib.heatmap.maxBucketsText": "定义了过多的序列 ({nr})。配置的最大值为 {max}。",
     "visTypeVislib.vislib.legend.filterForValueButtonAriaLabel": "筛留值 {legendDataLabel}",
@@ -4976,8 +4949,57 @@
     "visTypeVislib.vislib.legend.toggleOptionsButtonAriaLabel": "{legendDataLabel}, 切换选项",
     "visTypeVislib.vislib.tooltip.fieldLabel": "字段",
     "visTypeVislib.vislib.tooltip.valueLabel": "值",
-    "visTypeXy.advancedSettings.visualization.legacyChartsLibrary.description": "在 Visualize 中启用面积图、折线图和条形图的旧版图表库。",
-    "visTypeXy.advancedSettings.visualization.legacyChartsLibrary.name": "旧版图表库",
+    "visTypePie.pie.metricTitle": "切片大小",
+    "visTypePie.pie.pieDescription": "以整体的比例比较数据。",
+    "visTypePie.pie.pieTitle": "饼图",
+    "visTypePie.pie.segmentTitle": "拆分切片",
+    "visTypePie.pie.splitTitle": "拆分图表",
+    "visTypePie.editors.pie.donutLabel": "圆环图",
+    "visTypePie.editors.pie.labelsSettingsTitle": "标签设置",
+    "visTypePie.editors.pie.pieSettingsTitle": "饼图设置",
+    "visTypePie.editors.pie.showLabelsLabel": "显示标签",
+    "visTypePie.editors.pie.showTopLevelOnlyLabel": "仅显示顶级",
+    "visTypePie.editors.pie.showValuesLabel": "显示值",
+    "visualizations.advancedSettings.visualization.legacyChartsLibrary.description": "在 Visualize 中启用面积图、折线图和条形图的旧版图表库。",
+    "visualizations.advancedSettings.visualization.legacyChartsLibrary.name": "旧版图表库",
+    "visualizations.advancedSettings.visualizeEnableLabsText": "允许用户创建、查看和编辑实验性可视化。如果禁用，\n            仅被视为生产就绪的可视化可供用户使用。",
+    "visualizations.advancedSettings.visualizeEnableLabsTitle": "启用实验性可视化",
+    "visualizations.disabledLabVisualizationLink": "阅读文档",
+    "visualizations.disabledLabVisualizationMessage": "请在高级设置中打开实验模式，以查看实验性可视化。",
+    "visualizations.disabledLabVisualizationTitle": "{title} 为实验室可视化。",
+    "visualizations.displayName": "可视化",
+    "visualizations.embeddable.placeholderTitle": "占位符标题",
+    "visualizations.function.range.from.help": "范围起始",
+    "visualizations.function.range.help": "生成范围对象",
+    "visualizations.function.range.to.help": "范围结束",
+    "visualizations.function.visDimension.accessor.help": "要使用的数据集列 (列索引或列名称) ",
+    "visualizations.function.visDimension.error.accessor": "提供的列名称无效",
+    "visualizations.function.visDimension.format.help": "格式",
+    "visualizations.function.visDimension.formatParams.help": "格式参数",
+    "visualizations.function.visDimension.help": "生成 visConfig 维度对象",
+    "visualizations.initializeWithoutIndexPatternErrorMessage": "正在尝试在不使用索引模式的情况下初始化聚合",
+    "visualizations.newVisWizard.aggBasedGroupDescription": "使用我们的经典可视化库，基于聚合创建图表。",
+    "visualizations.newVisWizard.aggBasedGroupTitle": "基于聚合",
+    "visualizations.newVisWizard.chooseSourceTitle": "选择源",
+    "visualizations.newVisWizard.experimentalTitle": "实验性",
+    "visualizations.newVisWizard.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
+    "visualizations.newVisWizard.exploreOptionLinkText": "浏览选项",
+    "visualizations.newVisWizard.filterVisTypeAriaLabel": "筛留可视化类型",
+    "visualizations.newVisWizard.goBackLink": "选择不同的可视化",
+    "visualizations.newVisWizard.helpTextAriaLabel": "通过为该可视化选择类型，开始创建您的可视化。按 Esc 键关闭此模式。按 Tab 键继续。",
+    "visualizations.newVisWizard.learnMoreText": "希望了解详情？",
+    "visualizations.newVisWizard.newVisTypeTitle": "新建{visTypeName}",
+    "visualizations.newVisWizard.readDocumentationLink": "阅读文档",
+    "visualizations.newVisWizard.resultsFound": "{resultCount, plural, other {类型}}已找到",
+    "visualizations.newVisWizard.searchSelection.notFoundLabel": "未找到匹配的索引或已保存搜索。",
+    "visualizations.newVisWizard.searchSelection.savedObjectType.indexPattern": "索引模式",
+    "visualizations.newVisWizard.searchSelection.savedObjectType.search": "已保存搜索",
+    "visualizations.newVisWizard.title": "新建可视化",
+    "visualizations.newVisWizard.toolsGroupTitle": "工具",
+    "visualizations.noResultsFoundTitle": "找不到结果",
+    "visualizations.savedObjectName": "可视化",
+    "visualizations.savingVisualizationFailed.errorMsg": "保存可视化失败",
+    "visualizations.visualizationTypeInvalidMessage": "无效的可视化类型“{visType}”",
     "visTypeXy.aggResponse.allDocsTitle": "所有文档",
     "visTypeXy.area.areaDescription": "突出轴与线之间的数据。",
     "visTypeXy.area.areaTitle": "面积图",
@@ -5099,44 +5121,6 @@
     "visTypeXy.thresholdLine.style.dashedText": "虚线",
     "visTypeXy.thresholdLine.style.dotdashedText": "点虚线",
     "visTypeXy.thresholdLine.style.fullText": "实线",
-    "visualizations.advancedSettings.visualizeEnableLabsText": "允许用户创建、查看和编辑实验性可视化。如果禁用，\n            仅被视为生产就绪的可视化可供用户使用。",
-    "visualizations.advancedSettings.visualizeEnableLabsTitle": "启用实验性可视化",
-    "visualizations.disabledLabVisualizationLink": "阅读文档",
-    "visualizations.disabledLabVisualizationMessage": "请在高级设置中打开实验模式，以查看实验性可视化。",
-    "visualizations.disabledLabVisualizationTitle": "{title} 为实验室可视化。",
-    "visualizations.displayName": "可视化",
-    "visualizations.embeddable.placeholderTitle": "占位符标题",
-    "visualizations.function.range.from.help": "范围起始",
-    "visualizations.function.range.help": "生成范围对象",
-    "visualizations.function.range.to.help": "范围结束",
-    "visualizations.function.visDimension.accessor.help": "要使用的数据集列 (列索引或列名称) ",
-    "visualizations.function.visDimension.error.accessor": "提供的列名称无效",
-    "visualizations.function.visDimension.format.help": "格式",
-    "visualizations.function.visDimension.formatParams.help": "格式参数",
-    "visualizations.function.visDimension.help": "生成 visConfig 维度对象",
-    "visualizations.initializeWithoutIndexPatternErrorMessage": "正在尝试在不使用索引模式的情况下初始化聚合",
-    "visualizations.newVisWizard.aggBasedGroupDescription": "使用我们的经典可视化库，基于聚合创建图表。",
-    "visualizations.newVisWizard.aggBasedGroupTitle": "基于聚合",
-    "visualizations.newVisWizard.chooseSourceTitle": "选择源",
-    "visualizations.newVisWizard.experimentalTitle": "实验性",
-    "visualizations.newVisWizard.experimentalTooltip": "未来版本可能会更改或删除此可视化，其不受支持 SLA 的约束。",
-    "visualizations.newVisWizard.exploreOptionLinkText": "浏览选项",
-    "visualizations.newVisWizard.filterVisTypeAriaLabel": "筛留可视化类型",
-    "visualizations.newVisWizard.goBackLink": "选择不同的可视化",
-    "visualizations.newVisWizard.helpTextAriaLabel": "通过为该可视化选择类型，开始创建您的可视化。按 Esc 键关闭此模式。按 Tab 键继续。",
-    "visualizations.newVisWizard.learnMoreText": "希望了解详情？",
-    "visualizations.newVisWizard.newVisTypeTitle": "新建{visTypeName}",
-    "visualizations.newVisWizard.readDocumentationLink": "阅读文档",
-    "visualizations.newVisWizard.resultsFound": "{resultCount, plural, other {类型}}已找到",
-    "visualizations.newVisWizard.searchSelection.notFoundLabel": "未找到匹配的索引或已保存搜索。",
-    "visualizations.newVisWizard.searchSelection.savedObjectType.indexPattern": "索引模式",
-    "visualizations.newVisWizard.searchSelection.savedObjectType.search": "已保存搜索",
-    "visualizations.newVisWizard.title": "新建可视化",
-    "visualizations.newVisWizard.toolsGroupTitle": "工具",
-    "visualizations.noResultsFoundTitle": "找不到结果",
-    "visualizations.savedObjectName": "可视化",
-    "visualizations.savingVisualizationFailed.errorMsg": "保存可视化失败",
-    "visualizations.visualizationTypeInvalidMessage": "无效的可视化类型“{visType}”",
     "visualize.badge.readOnly.text": "只读",
     "visualize.badge.readOnly.tooltip": "无法将可视化保存到库",
     "visualize.byValue_pageHeading": "已嵌入到 {originatingApp} 应用中的 {chartType} 类型可视化",
@@ -5288,7 +5272,6 @@
     "xpack.apm.agentConfig.chooseService.editButton": "编辑",
     "xpack.apm.agentConfig.chooseService.service.environment.label": "环境",
     "xpack.apm.agentConfig.chooseService.service.name.label": "服务名称",
-    "xpack.apm.agentConfig.chooseService.title": "选择服务",
     "xpack.apm.agentConfig.circuitBreakerEnabled.description": "指定是否应启用断路器的布尔值。 启用时，代理定期轮询压力监测以检测系统/进程/JVM 压力状态。如果任意监测检测到压力迹象，代理将会暂停，就如 `recording` 配置选项已设置为 `false` 一样，从而使资源消耗降低至最小程度。暂停时，代理继续轮询相同的监测，以便检测压力状态是否已缓解。如果所有监测认为系统/进程/JVM 不再承受压力时，代理将完全恢复正常运行。",
     "xpack.apm.agentConfig.circuitBreakerEnabled.label": "断路器已启用",
     "xpack.apm.agentConfig.configTable.appliedTooltipMessage": "已至少由一个代理应用",
@@ -5347,8 +5330,6 @@
     "xpack.apm.agentConfig.servicePage.service.description": "选择要配置的服务。",
     "xpack.apm.agentConfig.servicePage.service.fieldLabel": "服务名称",
     "xpack.apm.agentConfig.servicePage.service.title": "服务",
-    "xpack.apm.agentConfig.servicePage.title": "选择服务",
-    "xpack.apm.agentConfig.settings.title": "配置选项",
     "xpack.apm.agentConfig.settingsPage.discardChangesButton": "放弃更改",
     "xpack.apm.agentConfig.settingsPage.notFound.message": "请求的配置不存在",
     "xpack.apm.agentConfig.settingsPage.notFound.title": "抱歉，有错误",
@@ -5367,7 +5348,6 @@
     "xpack.apm.agentConfig.stressMonitorSystemCpuReliefThreshold.label": "压力监测系统 cpu 缓解阈值",
     "xpack.apm.agentConfig.stressMonitorSystemCpuStressThreshold.description": "系统 CPU 监测用于检测系统 CPU 压力的阈值。如果系统 CPU 超过此阈值的持续时间至少有 `stress_monitor_cpu_duration_threshold`，监测会将其视为压力状态。",
     "xpack.apm.agentConfig.stressMonitorSystemCpuStressThreshold.label": "压力监测系统 cpu 压力阈值",
-    "xpack.apm.agentConfig.titleText": "代理中央配置",
     "xpack.apm.agentConfig.transactionIgnoreUrl.description": "用于限制对某些 URL 的请求不被检测。此配置接受应忽略的 URL 路径的通配符模式逗号分隔列表。当监测到传入 HTTP 请求时，会根据此列表中的每个元素测试其请求路径。例如，将 `/home/index` 添加到此列表中后，该元素将匹配并删除 `http://localhost/home/index` 和 `http://whatever.com/home/index?value1=123` 的检测",
     "xpack.apm.agentConfig.transactionIgnoreUrl.label": "基于 URL 忽略事务",
     "xpack.apm.agentConfig.transactionMaxSpans.description": "限制每个事务记录的跨度数量。",
@@ -5433,22 +5413,6 @@
     "xpack.apm.apply.label": "应用",
     "xpack.apm.applyFilter": "应用 {title} 筛选",
     "xpack.apm.applyOptions": "应用选项",
-    "xpack.apm.breadcrumb.errorsTitle": "错误",
-    "xpack.apm.breadcrumb.listSettingsTitle": "设置",
-    "xpack.apm.breadcrumb.metricsTitle": "指标",
-    "xpack.apm.breadcrumb.nodesTitle": "JVM",
-    "xpack.apm.breadcrumb.overviewTitle": "概览",
-    "xpack.apm.breadcrumb.serviceMapTitle": "服务地图",
-    "xpack.apm.breadcrumb.serviceProfilingTitle": "分析",
-    "xpack.apm.breadcrumb.servicesTitle": "服务",
-    "xpack.apm.breadcrumb.settings.agentConfigurationTitle": "代理配置",
-    "xpack.apm.breadcrumb.settings.anomalyDetection": "异常检测",
-    "xpack.apm.breadcrumb.settings.createAgentConfigurationTitle": "创建代理配置",
-    "xpack.apm.breadcrumb.settings.customizeUI": "定制 UI",
-    "xpack.apm.breadcrumb.settings.editAgentConfigurationTitle": "编辑代理配置",
-    "xpack.apm.breadcrumb.settings.indicesTitle": "索引",
-    "xpack.apm.breadcrumb.tracesTitle": "追溯",
-    "xpack.apm.breadcrumb.transactionsTitle": "事务",
     "xpack.apm.chart.annotation.version": "版本",
     "xpack.apm.chart.cpuSeries.processAverageLabel": "进程平均值",
     "xpack.apm.chart.cpuSeries.processMaxLabel": "进程最大值",
@@ -5558,8 +5522,6 @@
     "xpack.apm.home.alertsMenu.transactionErrorRate": "事务错误率",
     "xpack.apm.home.alertsMenu.viewActiveAlerts": "查看活动告警",
     "xpack.apm.home.serviceMapTabLabel": "服务地图",
-    "xpack.apm.home.servicesTabLabel": "服务",
-    "xpack.apm.home.tracesTabLabel": "追溯",
     "xpack.apm.instancesLatencyDistributionChartLegend": "实例",
     "xpack.apm.instancesLatencyDistributionChartLegend.previousPeriod": "上一时段",
     "xpack.apm.instancesLatencyDistributionChartTitle": "实例延迟分布",
@@ -5626,7 +5588,6 @@
     "xpack.apm.profiling.highlightFrames": "搜索",
     "xpack.apm.profiling.table.name": "名称",
     "xpack.apm.profiling.table.value": "自我",
-    "xpack.apm.profilingOverviewTitle": "分析",
     "xpack.apm.propertiesTable.agentFeature.noDataAvailableLabel": "没有可用数据",
     "xpack.apm.propertiesTable.agentFeature.noResultFound": "没有“{value}”的结果。",
     "xpack.apm.propertiesTable.tabs.exceptionStacktraceLabel": "异常堆栈跟踪",
@@ -5691,7 +5652,6 @@
     "xpack.apm.selectPlaceholder": "选择选项：",
     "xpack.apm.serviceDetails.errorsTabLabel": "错误",
     "xpack.apm.serviceDetails.metrics.cpuUsageChartTitle": "CPU 使用",
-    "xpack.apm.serviceDetails.metrics.errorOccurrencesChartTitle": "错误发生次数",
     "xpack.apm.serviceDetails.metrics.memoryUsageChartTitle": "系统内存使用",
     "xpack.apm.serviceDetails.metricsTabLabel": "指标",
     "xpack.apm.serviceDetails.nodesTabLabel": "JVM",
@@ -5850,7 +5810,6 @@
     "xpack.apm.settings.anomalyDetection.addEnvironments.selectorLabel": "环境",
     "xpack.apm.settings.anomalyDetection.addEnvironments.selectorPlaceholder": "选择或添加环境",
     "xpack.apm.settings.anomalyDetection.addEnvironments.titleText": "选择环境",
-    "xpack.apm.settings.anomalyDetection.descriptionText": "Machine Learning 异常检测集成通过识别延迟异常来为每个已配置环境中的服务启用应用程序运行状态指标。",
     "xpack.apm.settings.anomalyDetection.jobList.actionColumnLabel": "操作",
     "xpack.apm.settings.anomalyDetection.jobList.addEnvironments": "创建 ML 作业",
     "xpack.apm.settings.anomalyDetection.jobList.emptyListText": "无异常检测作业。",
@@ -5860,7 +5819,6 @@
     "xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText": "要将异常检测添加到新环境，请创建 Machine Learning 作业。现有 Machine Learning 作业可在 {mlJobsLink} 中进行管理。",
     "xpack.apm.settings.anomalyDetection.jobList.mlDescriptionText.mlJobsLinkText": "Machine Learning",
     "xpack.apm.settings.anomalyDetection.jobList.mlJobLinkText": "在 ML 中查看作业",
-    "xpack.apm.settings.anomalyDetection.titleText": "异常检测",
     "xpack.apm.settings.apmIndices.applyButton": "应用更改",
     "xpack.apm.settings.apmIndices.applyChanges.failed.text": "应用索引时出现问题。错误：{errorMessage}",
     "xpack.apm.settings.apmIndices.applyChanges.failed.title": "无法应用索引。",
@@ -5878,8 +5836,6 @@
     "xpack.apm.settings.apmIndices.title": "索引",
     "xpack.apm.settings.apmIndices.transactionIndicesLabel": "事务索引",
     "xpack.apm.settings.customizeApp": "定制应用",
-    "xpack.apm.settings.customizeApp.description": "使用以下设置扩展 APM 应用体验。",
-    "xpack.apm.settings.customizeApp.title": "定制应用",
     "xpack.apm.settings.customizeUI.customLink": "定制链接",
     "xpack.apm.settings.customizeUI.customLink.create.failed": "链接无法保存！",
     "xpack.apm.settings.customizeUI.customLink.create.failed.message": "保存链接时出现了问题。错误：“{errorMessage}”",
@@ -5928,8 +5884,6 @@
     "xpack.apm.settings.customizeUI.customLink.table.noResultFound": "没有“{value}”的结果。",
     "xpack.apm.settings.customizeUI.customLink.table.url": "URL",
     "xpack.apm.settings.indices": "索引",
-    "xpack.apm.settings.pageTitle": "设置",
-    "xpack.apm.settings.returnLinkLabel": "返回库存",
     "xpack.apm.settingsLinkLabel": "设置",
     "xpack.apm.setupInstructionsButtonLabel": "设置说明",
     "xpack.apm.significanTerms.license.text": "要使用相关性 API，必须订阅 Elastic 白金级许可证。",
@@ -7613,7 +7567,6 @@
     "xpack.enterpriseSearch.actions.updateButtonLabel": "更新",
     "xpack.enterpriseSearch.appSearch.actions.restoreDefaultsButonLabel": "还原默认值",
     "xpack.enterpriseSearch.appSearch.adminRoleTypeDescription": "管理员可以执行任何操作，但不包括管理帐户设置。",
-    "xpack.enterpriseSearch.appSearch.advancedRoleSelectorsTitle": "完全或有限的引擎访问",
     "xpack.enterpriseSearch.appSearch.analystRoleTypeDescription": "分析人员仅可以查看文档、查询测试器和分析。",
     "xpack.enterpriseSearch.appSearch.credentials.apiEndpoint": "终端",
     "xpack.enterpriseSearch.appSearch.credentials.apiKeys": "API 密钥",
@@ -7918,7 +7871,6 @@
     "xpack.enterpriseSearch.appSearch.engine.searchUI.title": "搜索 UI",
     "xpack.enterpriseSearch.appSearch.engine.synonyms.title": "同义词",
     "xpack.enterpriseSearch.appSearch.engine.universalLanguage": "通用",
-    "xpack.enterpriseSearch.appSearch.engineAccessTitle": "引擎访问",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineLanguage.label": "引擎语言",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineName.allowedCharactersHelpText": "引擎名称只能包含小写字母、数字和连字符",
     "xpack.enterpriseSearch.appSearch.engineCreation.form.engineName.label": "引擎名称",
@@ -7961,10 +7913,6 @@
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.language": "语言",
     "xpack.enterpriseSearch.appSearch.enginesOverview.table.column.name": "名称",
     "xpack.enterpriseSearch.appSearch.enginesOverview.title": "引擎概览",
-    "xpack.enterpriseSearch.appSearch.fullEngineAccessDescription": "对所有当前和未来引擎的访问权限。",
-    "xpack.enterpriseSearch.appSearch.fullEngineAccessTitle": "完全的引擎访问权限",
-    "xpack.enterpriseSearch.appSearch.limitedEngineAccessDescription": "将用户访问限定于特定引擎：",
-    "xpack.enterpriseSearch.appSearch.limitedEngineAccessTitle": "有限的引擎访问权限",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.description.manageSettingsDetail": "要管理分析和日志记录，请{visitSettingsLink}。",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.description.manageSettingsLinkText": "访问您的设置",
     "xpack.enterpriseSearch.appSearch.logRetention.callout.disabledSinceTitle": "自 {disabledDate}后，{logsTitle} 已禁用。",
@@ -8006,9 +7954,6 @@
     "xpack.enterpriseSearch.appSearch.result.hideAdditionalFields": "隐藏其他字段",
     "xpack.enterpriseSearch.appSearch.result.showAdditionalFields": "显示其他 {numberOfAdditionalFields, number} 个{numberOfAdditionalFields, plural, other {字段}}",
     "xpack.enterpriseSearch.appSearch.result.title": "文档 {id}",
-    "xpack.enterpriseSearch.appSearch.roleMapping.emptyRoleMappingsBody": "成功验证的所有用户将被分配所有者角色，可访问所有引擎。添加新角色以覆盖默认值。",
-    "xpack.enterpriseSearch.appSearch.roleMapping.saveRoleMappingButtonLabel": "保存角色映射",
-    "xpack.enterpriseSearch.appSearch.roleMapping.updateRoleMappingButtonLabel": "更新角色映射",
     "xpack.enterpriseSearch.appSearch.roleMappingCreatedMessage": "角色映射已成功创建。",
     "xpack.enterpriseSearch.appSearch.roleMappingDeletedMessage": "已成功删除角色映射",
     "xpack.enterpriseSearch.appSearch.roleMappingsEngineAccessHeading": "引擎访问",
@@ -8017,7 +7962,6 @@
     "xpack.enterpriseSearch.appSearch.roleMappingsResetConfirmButton": "重置角色映射",
     "xpack.enterpriseSearch.appSearch.roleMappingsResetConfirmTitle": "确定要重置角色映射？",
     "xpack.enterpriseSearch.appSearch.roleMappingUpdatedMessage": "角色映射已成功更新。",
-    "xpack.enterpriseSearch.appSearch.roleTitle": "角色",
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.buttonLabel": "试用示例引擎",
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.description": "使用示例数据测试引擎。",
     "xpack.enterpriseSearch.appSearch.sampleEngineCreationCta.title": "刚做过测试？",
@@ -8099,7 +8043,6 @@
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingButton": "删除映射",
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingDescription": "请注意，删除映射是永久性的，无法撤消",
     "xpack.enterpriseSearch.roleMapping.deleteRoleMappingTitle": "移除此角色映射",
-    "xpack.enterpriseSearch.roleMapping.emptyRoleMappingsTitle": "尚未有角色映射",
     "xpack.enterpriseSearch.roleMapping.externalAttributeLabel": "外部属性",
     "xpack.enterpriseSearch.roleMapping.filterRoleMappingsPlaceholder": "筛选角色......",
     "xpack.enterpriseSearch.roleMapping.individualAuthProviderLabel": "选择单个身份验证提供程序",
@@ -8107,8 +8050,9 @@
     "xpack.enterpriseSearch.roleMapping.moResults.message": "找不到“{filterValue}”的结果",
     "xpack.enterpriseSearch.roleMapping.newRoleMappingTitle": "添加角色映射",
     "xpack.enterpriseSearch.roleMapping.roleLabel": "角色",
-    "xpack.enterpriseSearch.roleMapping.roleMappingsDescription": "为 elasticsearch-native 和 elasticsearch-saml 身份验证定义角色映射。",
     "xpack.enterpriseSearch.roleMapping.roleMappingsTitle": "用户和角色",
+    "xpack.enterpriseSearch.roleMapping.saveRoleMappingButtonLabel": "保存角色映射",
+    "xpack.enterpriseSearch.roleMapping.updateRoleMappingButtonLabel": "更新角色映射",
     "xpack.enterpriseSearch.schema.addFieldModal.fieldNameNote.correct": "字段名称只能包含小写字母、数字和下划线",
     "xpack.enterpriseSearch.schema.errorsTable.control.review": "复查",
     "xpack.enterpriseSearch.schema.errorsTable.heading.error": "错误",
@@ -8413,12 +8357,8 @@
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.adminRoleTypeDescription": "管理员对所有组织范围设置 (包括内容源、组和用户管理功能) 具有完全权限。",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.defaultGroupName": "默认",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.deleteRoleMappingButtonMessage": "确定要永久删除此映射？此操作不可逆转，且某些用户可能会失去访问权限。",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.emptyRoleMappingsBody": "默认情况下，会为新团队成员分配管理员角色。管理员可以访问任何内容。超级新角色以覆盖默认值。",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentAllGroupsLabel": "加入所有组，包括未来组",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentInvalidError": "至少需要一个分配的组。",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.groupAssignmentTitle": "组分配",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.roleMappingsTableHeader": "组访问权限",
-    "xpack.enterpriseSearch.workplaceSearch.roleMapping.saveRoleMappingButtonMessage": "{operation}角色映射",
     "xpack.enterpriseSearch.workplaceSearch.roleMapping.userRoleTypeDescription": "用户的功能访问权限仅限于搜索界面和个人设置管理。",
     "xpack.enterpriseSearch.workplaceSearch.roleMappingCreatedMessage": "角色映射已成功创建。",
     "xpack.enterpriseSearch.workplaceSearch.roleMappingDeletedMessage": "已成功删除角色映射",
@@ -8626,227 +8566,252 @@
     "xpack.features.ossFeatures.visualizeShortUrlSubFeatureName": "短 URL",
     "xpack.features.savedObjectsManagementFeatureName": "已保存对象管理",
     "xpack.features.visualizeFeatureName": "Visualize 库",
-    "xpack.fileDataVisualizer.aboutPanel.analyzingDataTitle": "正在分析数据",
-    "xpack.fileDataVisualizer.aboutPanel.selectOrDragAndDropFileDescription": "选择或拖放文件",
-    "xpack.fileDataVisualizer.addCombinedFieldsLabel": "添加组合字段",
-    "xpack.fileDataVisualizer.advancedImportSettings.createIndexPatternLabel": "创建索引模式",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexNameAriaLabel": "索引名称，必填字段",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexNameLabel": "索引名称",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexNamePlaceholder": "索引名称",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexPatternNameLabel": "索引模式名称",
-    "xpack.fileDataVisualizer.advancedImportSettings.indexSettingsLabel": "索引设置",
-    "xpack.fileDataVisualizer.advancedImportSettings.ingestPipelineLabel": "采集管道",
-    "xpack.fileDataVisualizer.advancedImportSettings.mappingsLabel": "映射",
-    "xpack.fileDataVisualizer.analysisSummary.analyzedLinesNumberTitle": "已分析的行数",
-    "xpack.fileDataVisualizer.analysisSummary.delimiterTitle": "分隔符",
-    "xpack.fileDataVisualizer.analysisSummary.formatTitle": "格式",
-    "xpack.fileDataVisualizer.analysisSummary.grokPatternTitle": "Grok 模式",
-    "xpack.fileDataVisualizer.analysisSummary.hasHeaderRowTitle": "包含标题行",
-    "xpack.fileDataVisualizer.analysisSummary.summaryTitle": "摘要",
-    "xpack.fileDataVisualizer.analysisSummary.timeFieldTitle": "时间字段",
-    "xpack.fileDataVisualizer.analysisSummary.timeFormatTitle": "时间{timestampFormats, plural, other {格式}}",
-    "xpack.fileDataVisualizer.bottomBar.backButtonLabel": "返回",
-    "xpack.fileDataVisualizer.bottomBar.cancelButtonLabel": "取消",
-    "xpack.fileDataVisualizer.bottomBar.missingImportPrivilegesMessage": "您需要具有 ingest_admin 角色才能启用数据导入",
-    "xpack.fileDataVisualizer.bottomBar.readMode.cancelButtonLabel": "取消",
-    "xpack.fileDataVisualizer.bottomBar.readMode.importButtonLabel": "导入",
-    "xpack.fileDataVisualizer.combinedFieldsForm.mappingsParseError": "解析映射时出错：{error}",
-    "xpack.fileDataVisualizer.combinedFieldsForm.pipelineParseError": "解析管道时出错：{error}",
-    "xpack.fileDataVisualizer.combinedFieldsLabel": "组合字段",
-    "xpack.fileDataVisualizer.combinedFieldsReadOnlyHelpTextLabel": "在高级选项卡中编辑组合字段",
-    "xpack.fileDataVisualizer.combinedFieldsReadOnlyLabel": "组合字段",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.blueColorRangeLabel": "蓝",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel": "绿 - 红",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.influencerScaleLabel": "影响因素定制比例",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.linearScaleLabel": "线性",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.redColorRangeLabel": "红",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel": "红 - 绿",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.sqrtScaleLabel": "平方根",
-    "xpack.fileDataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel": "黄 - 绿 - 蓝",
-    "xpack.fileDataVisualizer.dataGridChart.histogramNotAvailable": "不支持图表。",
-    "xpack.fileDataVisualizer.dataGridChart.notEnoughData": "0 个文档包含字段。",
-    "xpack.fileDataVisualizer.dataGridChart.singleCategoryLegend": "{cardinality, plural, other {# 个类别}}",
-    "xpack.fileDataVisualizer.dataGridChart.topCategoriesLegend": "{cardinality} 个类别中的排名前 {maxChartColumns} 个",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel": "收起所有字段的详细信息",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.distinctValuesColumnName": "不同值",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.distributionsColumnName": "分布",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.documentsCountColumnName": "文档 (%)",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.expandDetailsForAllAriaLabel": "展开所有字段的详细信息",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.nameColumnName": "名称",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.rowCollapse": "隐藏 {fieldName} 的详细信息",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.rowExpand": "显示 {fieldName} 的详细信息",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.showDistributionsAriaLabel": "显示分布",
-    "xpack.fileDataVisualizer.datavisualizer.dataGrid.typeColumnName": "类型",
-    "xpack.fileDataVisualizer.editFlyout.applyOverrideSettingsButtonLabel": "应用",
-    "xpack.fileDataVisualizer.editFlyout.closeOverrideSettingsButtonLabel": "关闭",
-    "xpack.fileDataVisualizer.editFlyout.overrides.customDelimiterFormRowLabel": "定制分隔符",
-    "xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatErrorMessage": "时间戳格式必须为以下 Java 日期/时间格式的组合：\n      yy、yyyy、M、MM、MMM、MMMM、d、dd、EEE、EEEE、H、HH、h、mm、ss、S 至 SSSSSSSSS、a、XX、XXX、zzz",
-    "xpack.fileDataVisualizer.editFlyout.overrides.customTimestampFormatFormRowLabel": "定制时间戳格式",
-    "xpack.fileDataVisualizer.editFlyout.overrides.dataFormatFormRowLabel": "数据格式",
-    "xpack.fileDataVisualizer.editFlyout.overrides.delimiterFormRowLabel": "分隔符",
-    "xpack.fileDataVisualizer.editFlyout.overrides.editFieldNamesTitle": "编辑字段名称",
-    "xpack.fileDataVisualizer.editFlyout.overrides.grokPatternFormRowLabel": "Grok 模式",
-    "xpack.fileDataVisualizer.editFlyout.overrides.hasHeaderRowLabel": "包含标题行",
-    "xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleErrorMessage": "值必须大于 {min} 并小于或等于 {max}",
-    "xpack.fileDataVisualizer.editFlyout.overrides.linesToSampleFormRowLabel": "要采样的行数",
-    "xpack.fileDataVisualizer.editFlyout.overrides.quoteCharacterFormRowLabel": "引用字符",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timeFieldFormRowLabel": "时间字段",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampEmptyValidationErrorMessage": "时间戳格式 {timestampFormat} 中没有时间格式字母组",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatFormRowLabel": "时间戳格式",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampFormatHelpText": "请参阅有关接受格式的更多内容。",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterSValidationErrorMessage": "{format}的字母 { length, plural, one { {lg} } other { 组 {lg} } } 不受支持，因为其未前置 ss 和 {sep} 中的分隔符",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampLetterValidationErrorMessage": "{format}的字母 { length, plural, one { {lg} } other { 组 {lg} } } 不受支持",
-    "xpack.fileDataVisualizer.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage": "时间戳格式 {timestampFormat} 不受支持，因为其包含问号字符 ({fieldPlaceholder})",
-    "xpack.fileDataVisualizer.editFlyout.overrides.trimFieldsLabel": "应剪裁字段",
-    "xpack.fileDataVisualizer.editFlyout.overrideSettingsTitle": "替代设置",
-    "xpack.fileDataVisualizer.experimentalBadge.experimentalLabel": "实验性",
-    "xpack.fileDataVisualizer.explanationFlyout.closeButton": "关闭",
-    "xpack.fileDataVisualizer.explanationFlyout.content": "产生分析结果的逻辑步骤。",
-    "xpack.fileDataVisualizer.explanationFlyout.title": "分析说明",
-    "xpack.fileDataVisualizer.fieldDataCard.cardBoolean.valuesLabel": "值",
-    "xpack.fileDataVisualizer.fieldDataCard.cardDate.earliestLabel": "最早",
-    "xpack.fileDataVisualizer.fieldDataCard.cardDate.latestLabel": "最新",
-    "xpack.fileDataVisualizer.fieldDataCard.cardDate.summaryTableTitle": "摘要",
-    "xpack.fileDataVisualizer.fieldDataCard.cardText.fieldMayBePopulatedDescription": "例如，可以使用文档映射中的 {copyToParam} 参数进行填充，也可以在索引后通过使用 {includesParam} 和 {excludesParam} 参数从 {sourceParam} 字段中修剪。",
-    "xpack.fileDataVisualizer.fieldDataCard.cardText.fieldNotPresentDescription": "查询的文档的 {sourceParam} 字段中不存在此字段。",
-    "xpack.fileDataVisualizer.fieldDataCard.cardText.noExamplesForFieldsTitle": "没有获取此字段的示例",
-    "xpack.fileDataVisualizer.fieldDataCard.examplesList.noExamplesMessage": "没有获取此字段的示例",
-    "xpack.fileDataVisualizer.fieldDataCard.examplesList.title": "{numExamples, plural, one {值} other {示例}}",
-    "xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.seriesName": "分布",
-    "xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.tooltipValueBetweenLabel": "{percent}% 的文档具有介于 {minValFormatted} 和 {maxValFormatted} 之间的值",
-    "xpack.fileDataVisualizer.fieldDataCard.metricDistributionChart.tooltipValueEqualLabel": "{percent}% 的文档的值为 {valFormatted}",
-    "xpack.fileDataVisualizer.fieldDataCard.topValues.calculatedFromSampleDescription": "基于每个分片的 {topValuesSamplerShardSize} 文档样例计算",
-    "xpack.fileDataVisualizer.fieldDataCard.topValuesLabel": "排名最前值",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.falseCountLabel": "false",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.summaryTableTitle": "摘要",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.booleanContent.trueCountLabel": "true",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.countLabel": "计数",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.distinctValueLabel": "不同值",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle": "文档统计",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.documentStatsTable.percentageLabel": "百分比",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.displayingPercentilesLabel": "正在显示 {minPercent} - {maxPercent} 百分位数",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.distributionTitle": "分布",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.maxLabel": "最大值",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.medianLabel": "中值",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.minLabel": "最小值",
-    "xpack.fileDataVisualizer.fieldDataCardExpandedRow.numberContent.summaryTableTitle": "摘要",
-    "xpack.fileDataVisualizer.fieldNameSelect": "字段名称",
-    "xpack.fileDataVisualizer.fieldStatsCard.maxTitle": "最大值",
-    "xpack.fileDataVisualizer.fieldStatsCard.medianTitle": "中值",
-    "xpack.fileDataVisualizer.fieldStatsCard.minTitle": "最小值",
-    "xpack.fileDataVisualizer.fieldTypeIcon.booleanTypeAriaLabel": "布尔类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.dateTypeAriaLabel": "日期类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.fieldTypeTooltip": "{type} 类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.geoPointTypeAriaLabel": "{geoPointParam} 类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.ipTypeAriaLabel": "IP 类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.keywordTypeAriaLabel": "关键字类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.numberTypeAriaLabel": "数字类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.textTypeAriaLabel": "文本类型",
-    "xpack.fileDataVisualizer.fieldTypeIcon.unknownTypeAriaLabel": "未知类型",
-    "xpack.fileDataVisualizer.fieldTypeSelect": "字段类型",
-    "xpack.fileDataVisualizer.fileBeatConfig.paths": "在此处将路径添加您的文件中",
-    "xpack.fileDataVisualizer.fileBeatConfigFlyout.closeButton": "关闭",
-    "xpack.fileDataVisualizer.fileBeatConfigFlyout.copyButton": "复制到剪贴板",
-    "xpack.fileDataVisualizer.fileContents.fileContentsTitle": "文件内容",
-    "xpack.fileDataVisualizer.fileContents.firstLinesDescription": "前 {numberOfLines, plural, other {# 行}}",
-    "xpack.fileDataVisualizer.fileDatavisualizerView.xmlNotCurrentlySupportedErrorMessage": "当前不支持 XML",
-    "xpack.fileDataVisualizer.fileErrorCallouts.applyOverridesDescription": "如果您对此数据有所了解，例如文件格式或时间戳格式，则添加初始覆盖可以帮助我们推理结构的其余部分。",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileCouldNotBeReadTitle": "无法确定文件结构",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage": "您选择用于上传的文件大小超过上限值 {maxFileSizeFormatted} 的 {diffFormatted}",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage": "您选择用于上传的文件大小为 {fileSizeFormatted}，超过上限值 {maxFileSizeFormatted}",
-    "xpack.fileDataVisualizer.fileErrorCallouts.fileSizeTooLargeTitle": "文件太大",
-    "xpack.fileDataVisualizer.fileErrorCallouts.overrideButton": "应用覆盖设置",
-    "xpack.fileDataVisualizer.fileErrorCallouts.revertingToPreviousSettingsDescription": "恢复到以前的设置",
-    "xpack.fileDataVisualizer.geoPointCombinedFieldLabel": "添加地理点字段",
-    "xpack.fileDataVisualizer.geoPointForm.geoPointFieldAriaLabel": "地理点字段，必填字段",
-    "xpack.fileDataVisualizer.geoPointForm.geoPointFieldLabel": "地理点字段",
-    "xpack.fileDataVisualizer.geoPointForm.latFieldLabel": "纬度字段",
-    "xpack.fileDataVisualizer.geoPointForm.lonFieldLabel": "经度字段",
-    "xpack.fileDataVisualizer.geoPointForm.submitButtonLabel": "添加",
-    "xpack.fileDataVisualizer.importErrors.checkingPermissionErrorMessage": "导入权限错误",
-    "xpack.fileDataVisualizer.importErrors.creatingIndexErrorMessage": "创建索引时出错",
-    "xpack.fileDataVisualizer.importErrors.creatingIndexPatternErrorMessage": "创建索引模式时出错",
-    "xpack.fileDataVisualizer.importErrors.creatingIngestPipelineErrorMessage": "创建采集管道时出错",
-    "xpack.fileDataVisualizer.importErrors.defaultErrorMessage": "错误",
-    "xpack.fileDataVisualizer.importErrors.moreButtonLabel": "更多",
-    "xpack.fileDataVisualizer.importErrors.parsingJSONErrorMessage": "解析 JSON 出错",
-    "xpack.fileDataVisualizer.importErrors.readingFileErrorMessage": "读取文件时出错",
-    "xpack.fileDataVisualizer.importErrors.unknownErrorMessage": "未知错误",
-    "xpack.fileDataVisualizer.importErrors.uploadingDataErrorMessage": "上传数据时出错",
-    "xpack.fileDataVisualizer.importProgress.createIndexPatternTitle": "创建索引模式",
-    "xpack.fileDataVisualizer.importProgress.createIndexTitle": "创建索引",
-    "xpack.fileDataVisualizer.importProgress.createIngestPipelineTitle": "创建采集管道",
-    "xpack.fileDataVisualizer.importProgress.creatingIndexPatternDescription": "正在创建索引模式",
-    "xpack.fileDataVisualizer.importProgress.creatingIndexPatternTitle": "正在创建索引模式",
-    "xpack.fileDataVisualizer.importProgress.creatingIndexTitle": "正在创建索引",
-    "xpack.fileDataVisualizer.importProgress.creatingIngestPipelineTitle": "正在创建采集管道",
-    "xpack.fileDataVisualizer.importProgress.dataUploadedTitle": "数据已上传",
-    "xpack.fileDataVisualizer.importProgress.fileProcessedTitle": "文件已处理",
-    "xpack.fileDataVisualizer.importProgress.indexCreatedTitle": "索引已创建",
-    "xpack.fileDataVisualizer.importProgress.indexPatternCreatedTitle": "索引模式已创建",
-    "xpack.fileDataVisualizer.importProgress.ingestPipelineCreatedTitle": "采集管道已创建",
-    "xpack.fileDataVisualizer.importProgress.processFileTitle": "处理文件",
-    "xpack.fileDataVisualizer.importProgress.processingFileTitle": "正在处理文件",
-    "xpack.fileDataVisualizer.importProgress.processingImportedFileDescription": "正在处理要导入的文件",
-    "xpack.fileDataVisualizer.importProgress.stepTwoCreatingIndexDescription": "正在创建索引",
-    "xpack.fileDataVisualizer.importProgress.stepTwoCreatingIndexIngestPipelineDescription": "正在创建索引和采集管道",
-    "xpack.fileDataVisualizer.importProgress.uploadDataTitle": "上传数据",
-    "xpack.fileDataVisualizer.importProgress.uploadingDataDescription": "正在上传数据",
-    "xpack.fileDataVisualizer.importProgress.uploadingDataTitle": "正在上传数据",
-    "xpack.fileDataVisualizer.importSettings.advancedTabName": "高级",
-    "xpack.fileDataVisualizer.importSettings.simpleTabName": "简单",
-    "xpack.fileDataVisualizer.importSummary.documentsCouldNotBeImportedDescription": "无法导入 {importFailuresLength} 个文档，共 {docCount} 个。这可能是由于行与 Grok 模式不匹配。",
-    "xpack.fileDataVisualizer.importSummary.documentsCouldNotBeImportedTitle": "部分文档无法导入",
-    "xpack.fileDataVisualizer.importSummary.documentsIngestedTitle": "已采集的文档",
-    "xpack.fileDataVisualizer.importSummary.failedDocumentsButtonLabel": "失败的文档",
-    "xpack.fileDataVisualizer.importSummary.failedDocumentsTitle": "失败的文档",
-    "xpack.fileDataVisualizer.importSummary.importCompleteTitle": "导入完成",
-    "xpack.fileDataVisualizer.importSummary.indexPatternTitle": "索引模式",
-    "xpack.fileDataVisualizer.importSummary.indexTitle": "索引",
-    "xpack.fileDataVisualizer.importSummary.ingestPipelineTitle": "采集管道",
-    "xpack.fileDataVisualizer.importView.experimentalFeatureTooltip": "实验性功能。我们很乐意听取您的反馈意见。",
-    "xpack.fileDataVisualizer.importView.importButtonLabel": "导入",
-    "xpack.fileDataVisualizer.importView.importDataTitle": "导入数据",
-    "xpack.fileDataVisualizer.importView.importPermissionError": "您无权创建或将数据导入索引 {index}",
-    "xpack.fileDataVisualizer.importView.indexNameAlreadyExistsErrorMessage": "索引名称已存在",
-    "xpack.fileDataVisualizer.importView.indexNameContainsIllegalCharactersErrorMessage": "索引名称包含非法字符",
-    "xpack.fileDataVisualizer.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "索引模式与索引名称不匹配",
-    "xpack.fileDataVisualizer.importView.indexPatternNameAlreadyExistsErrorMessage": "索引模式名称已存在",
-    "xpack.fileDataVisualizer.importView.parseMappingsError": "解析映射时出错：",
-    "xpack.fileDataVisualizer.importView.parsePipelineError": "解析采集管道时出错：",
-    "xpack.fileDataVisualizer.importView.parseSettingsError": "解析设置时出错：",
-    "xpack.fileDataVisualizer.importView.resetButtonLabel": "重置",
-    "xpack.fileDataVisualizer.multiSelectPicker.NoFiltersFoundMessage": "未找到任何筛选",
-    "xpack.fileDataVisualizer.nameCollisionMsg": "“{name}”已存在，请提供唯一名称",
-    "xpack.fileDataVisualizer.removeCombinedFieldsLabel": "移除组合字段",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfig": "创建 Filebeat 配置",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigBottomText": "其中 {password} 是 {user} 用户的密码，{esUrl} 是 Elasticsearch 的 URL。",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigBottomTextNoUsername": "其中 {esUrl} 是 Elasticsearch 的 URL。",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTitle": "Filebeat 配置",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTopText1": "可以使用 Filebeat 将其他数据上传到 {index} 索引。",
-    "xpack.fileDataVisualizer.resultsLinks.fileBeatConfigTopText2": "修改 {filebeatYml} 以设置连接信息：",
-    "xpack.fileDataVisualizer.resultsLinks.indexManagementTitle": "索引管理",
-    "xpack.fileDataVisualizer.resultsLinks.indexPatternManagementTitle": "索引模式管理",
-    "xpack.fileDataVisualizer.resultsLinks.viewIndexInDiscoverTitle": "在 Discover 中查看索引",
-    "xpack.fileDataVisualizer.resultsView.analysisExplanationButtonLabel": "分析说明",
-    "xpack.fileDataVisualizer.resultsView.fileStatsName": "文件统计",
-    "xpack.fileDataVisualizer.resultsView.overrideSettingsButtonLabel": "替代设置",
-    "xpack.fileDataVisualizer.searchPanel.allFieldsLabel": "所有字段",
-    "xpack.fileDataVisualizer.searchPanel.numberFieldsLabel": "字段数目",
-    "xpack.fileDataVisualizer.searchPanel.ofFieldsTotal": "，共 {totalCount} 个",
-    "xpack.fileDataVisualizer.simpleImportSettings.createIndexPatternLabel": "创建索引模式",
-    "xpack.fileDataVisualizer.simpleImportSettings.indexNameAriaLabel": "索引名称，必填字段",
-    "xpack.fileDataVisualizer.simpleImportSettings.indexNameFormRowLabel": "索引名称",
-    "xpack.fileDataVisualizer.simpleImportSettings.indexNamePlaceholder": "索引名称",
-    "xpack.fileDataVisualizer.welcomeContent.delimitedTextFilesDescription": "分隔的文本文件，例如 CSV 和 TSV",
-    "xpack.fileDataVisualizer.welcomeContent.experimentalFeatureDescription": "此功能为实验性功能。有反馈？如欲提供反馈，请在 {githubLink} 中创建问题。",
-    "xpack.fileDataVisualizer.welcomeContent.experimentalFeatureTooltip": "实验性功能。我们很乐意听取您的反馈意见。",
-    "xpack.fileDataVisualizer.welcomeContent.logFilesWithCommonFormatDescription": "具有时间戳通用格式的日志文件",
-    "xpack.fileDataVisualizer.welcomeContent.newlineDelimitedJsonDescription": "换行符分隔的 JSON",
-    "xpack.fileDataVisualizer.welcomeContent.supportedFileFormatDescription": "File Data Visualizer 支持以下文件格式：",
-    "xpack.fileDataVisualizer.welcomeContent.uploadedFilesAllowedSizeDescription": "您可以上传不超过 {maxFileSize} 的文件。",
-    "xpack.fileDataVisualizer.welcomeContent.visualizeDataFromLogFileDescription": "File Data Visualizer 可帮助您理解日志文件中的字段和指标。上传文件、分析文件数据，然后选择是否将数据导入 Elasticsearch 索引。",
-    "xpack.fileDataVisualizer.welcomeContent.visualizeDataFromLogFileTitle": "可视化来自日志文件的数据 {experimentalBadge}",
+    "xpack.dataVisualizer.file.aboutPanel.analyzingDataTitle": "正在分析数据",
+    "xpack.dataVisualizer.file.aboutPanel.selectOrDragAndDropFileDescription": "选择或拖放文件",
+    "xpack.dataVisualizer.addCombinedFieldsLabel": "添加组合字段",
+    "xpack.dataVisualizer.file.advancedImportSettings.createIndexPatternLabel": "创建索引模式",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexNameAriaLabel": "索引名称，必填字段",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexNameLabel": "索引名称",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexNamePlaceholder": "索引名称",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexPatternNameLabel": "索引模式名称",
+    "xpack.dataVisualizer.file.advancedImportSettings.indexSettingsLabel": "索引设置",
+    "xpack.dataVisualizer.file.advancedImportSettings.ingestPipelineLabel": "采集管道",
+    "xpack.dataVisualizer.file.advancedImportSettings.mappingsLabel": "映射",
+    "xpack.dataVisualizer.file.analysisSummary.analyzedLinesNumberTitle": "已分析的行数",
+    "xpack.dataVisualizer.file.analysisSummary.delimiterTitle": "分隔符",
+    "xpack.dataVisualizer.file.analysisSummary.formatTitle": "格式",
+    "xpack.dataVisualizer.file.analysisSummary.grokPatternTitle": "Grok 模式",
+    "xpack.dataVisualizer.file.analysisSummary.hasHeaderRowTitle": "包含标题行",
+    "xpack.dataVisualizer.file.analysisSummary.summaryTitle": "摘要",
+    "xpack.dataVisualizer.file.analysisSummary.timeFieldTitle": "时间字段",
+    "xpack.dataVisualizer.file.analysisSummary.timeFormatTitle": "时间{timestampFormats, plural, other {格式}}",
+    "xpack.dataVisualizer.file.bottomBar.backButtonLabel": "返回",
+    "xpack.dataVisualizer.file.bottomBar.cancelButtonLabel": "取消",
+    "xpack.dataVisualizer.file.bottomBar.missingImportPrivilegesMessage": "您需要具有 ingest_admin 角色才能启用数据导入",
+    "xpack.dataVisualizer.file.bottomBar.readMode.cancelButtonLabel": "取消",
+    "xpack.dataVisualizer.file.bottomBar.readMode.importButtonLabel": "导入",
+    "xpack.dataVisualizer.combinedFieldsForm.mappingsParseError": "解析映射时出错：{error}",
+    "xpack.dataVisualizer.combinedFieldsForm.pipelineParseError": "解析管道时出错：{error}",
+    "xpack.dataVisualizer.combinedFieldsLabel": "组合字段",
+    "xpack.dataVisualizer.combinedFieldsReadOnlyHelpTextLabel": "在高级选项卡中编辑组合字段",
+    "xpack.dataVisualizer.combinedFieldsReadOnlyLabel": "组合字段",
+    "xpack.dataVisualizer.components.colorRangeLegend.blueColorRangeLabel": "蓝",
+    "xpack.dataVisualizer.components.colorRangeLegend.greenRedColorRangeLabel": "绿 - 红",
+    "xpack.dataVisualizer.components.colorRangeLegend.influencerScaleLabel": "影响因素定制比例",
+    "xpack.dataVisualizer.components.colorRangeLegend.linearScaleLabel": "线性",
+    "xpack.dataVisualizer.components.colorRangeLegend.redColorRangeLabel": "红",
+    "xpack.dataVisualizer.components.colorRangeLegend.redGreenColorRangeLabel": "红 - 绿",
+    "xpack.dataVisualizer.components.colorRangeLegend.sqrtScaleLabel": "平方根",
+    "xpack.dataVisualizer.components.colorRangeLegend.yellowGreenBlueColorRangeLabel": "黄 - 绿 - 蓝",
+    "xpack.dataVisualizer.dataGridChart.histogramNotAvailable": "不支持图表。",
+    "xpack.dataVisualizer.dataGridChart.notEnoughData": "0 个文档包含字段。",
+    "xpack.dataVisualizer.dataGridChart.singleCategoryLegend": "{cardinality, plural, other {# 个类别}}",
+    "xpack.dataVisualizer.dataGridChart.topCategoriesLegend": "{cardinality} 个类别中的排名前 {maxChartColumns} 个",
+    "xpack.dataVisualizer.dataGrid.collapseDetailsForAllAriaLabel": "收起所有字段的详细信息",
+    "xpack.dataVisualizer.dataGrid.distinctValuesColumnName": "不同值",
+    "xpack.dataVisualizer.dataGrid.distributionsColumnName": "分布",
+    "xpack.dataVisualizer.dataGrid.documentsCountColumnName": "文档 (%)",
+    "xpack.dataVisualizer.dataGrid.expandDetailsForAllAriaLabel": "展开所有字段的详细信息",
+    "xpack.dataVisualizer.dataGrid.nameColumnName": "名称",
+    "xpack.dataVisualizer.dataGrid.rowCollapse": "隐藏 {fieldName} 的详细信息",
+    "xpack.dataVisualizer.dataGrid.rowExpand": "显示 {fieldName} 的详细信息",
+    "xpack.dataVisualizer.dataGrid.showDistributionsAriaLabel": "显示分布",
+    "xpack.dataVisualizer.dataGrid.typeColumnName": "类型",
+    "xpack.dataVisualizer.file.editFlyout.applyOverrideSettingsButtonLabel": "应用",
+    "xpack.dataVisualizer.file.editFlyout.closeOverrideSettingsButtonLabel": "关闭",
+    "xpack.dataVisualizer.file.editFlyout.overrides.customDelimiterFormRowLabel": "定制分隔符",
+    "xpack.dataVisualizer.file.editFlyout.overrides.customTimestampFormatErrorMessage": "时间戳格式必须为以下 Java 日期/时间格式的组合：\n      yy、yyyy、M、MM、MMM、MMMM、d、dd、EEE、EEEE、H、HH、h、mm、ss、S 至 SSSSSSSSS、a、XX、XXX、zzz",
+    "xpack.dataVisualizer.file.editFlyout.overrides.customTimestampFormatFormRowLabel": "定制时间戳格式",
+    "xpack.dataVisualizer.file.editFlyout.overrides.dataFormatFormRowLabel": "数据格式",
+    "xpack.dataVisualizer.file.editFlyout.overrides.delimiterFormRowLabel": "分隔符",
+    "xpack.dataVisualizer.file.editFlyout.overrides.editFieldNamesTitle": "编辑字段名称",
+    "xpack.dataVisualizer.file.editFlyout.overrides.grokPatternFormRowLabel": "Grok 模式",
+    "xpack.dataVisualizer.file.editFlyout.overrides.hasHeaderRowLabel": "包含标题行",
+    "xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleErrorMessage": "值必须大于 {min} 并小于或等于 {max}",
+    "xpack.dataVisualizer.file.editFlyout.overrides.linesToSampleFormRowLabel": "要采样的行数",
+    "xpack.dataVisualizer.file.editFlyout.overrides.quoteCharacterFormRowLabel": "引用字符",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timeFieldFormRowLabel": "时间字段",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampEmptyValidationErrorMessage": "时间戳格式 {timestampFormat} 中没有时间格式字母组",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatFormRowLabel": "时间戳格式",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampFormatHelpText": "请参阅有关接受格式的更多内容。",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterSValidationErrorMessage": "{format}的字母 { length, plural, one { {lg} } other { 组 {lg} } } 不受支持，因为其未前置 ss 和 {sep} 中的分隔符",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampLetterValidationErrorMessage": "{format}的字母 { length, plural, one { {lg} } other { 组 {lg} } } 不受支持",
+    "xpack.dataVisualizer.file.editFlyout.overrides.timestampQuestionMarkValidationErrorMessage": "时间戳格式 {timestampFormat} 不受支持，因为其包含问号字符 ({fieldPlaceholder})",
+    "xpack.dataVisualizer.file.editFlyout.overrides.trimFieldsLabel": "应剪裁字段",
+    "xpack.dataVisualizer.file.editFlyout.overrideSettingsTitle": "替代设置",
+    "xpack.dataVisualizer.experimentalBadge.experimentalLabel": "实验性",
+    "xpack.dataVisualizer.file.explanationFlyout.closeButton": "关闭",
+    "xpack.dataVisualizer.file.explanationFlyout.content": "产生分析结果的逻辑步骤。",
+    "xpack.dataVisualizer.file.explanationFlyout.title": "分析说明",
+    "xpack.dataVisualizer.dataGrid.field.cardBoolean.valuesLabel": "值",
+    "xpack.dataVisualizer.dataGrid.field.cardDate.earliestLabel": "最早",
+    "xpack.dataVisualizer.dataGrid.field.cardDate.latestLabel": "最新",
+    "xpack.dataVisualizer.dataGrid.field.cardDate.summaryTableTitle": "摘要",
+    "xpack.dataVisualizer.dataGrid.fieldText.fieldMayBePopulatedDescription": "例如，可以使用文档映射中的 {copyToParam} 参数进行填充，也可以在索引后通过使用 {includesParam} 和 {excludesParam} 参数从 {sourceParam} 字段中修剪。",
+    "xpack.dataVisualizer.dataGrid.fieldText.fieldNotPresentDescription": "查询的文档的 {sourceParam} 字段中不存在此字段。",
+    "xpack.dataVisualizer.dataGrid.fieldText.noExamplesForFieldsTitle": "没有获取此字段的示例",
+    "xpack.dataVisualizer.dataGrid.field.examplesList.noExamplesMessage": "没有获取此字段的示例",
+    "xpack.dataVisualizer.dataGrid.field.examplesList.title": "{numExamples, plural, one {值} other {示例}}",
+    "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.seriesName": "分布",
+    "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueBetweenLabel": "{percent}% 的文档具有介于 {minValFormatted} 和 {maxValFormatted} 之间的值",
+    "xpack.dataVisualizer.dataGrid.field.metricDistributionChart.tooltipValueEqualLabel": "{percent}% 的文档的值为 {valFormatted}",
+    "xpack.dataVisualizer.dataGrid.field.topValues.calculatedFromSampleDescription": "基于每个分片的 {topValuesSamplerShardSize} 文档样例计算",
+    "xpack.dataVisualizer.dataGrid.field.topValuesLabel": "排名最前值",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.falseCountLabel": "false",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.summaryTableTitle": "摘要",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.booleanContent.trueCountLabel": "true",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.countLabel": "计数",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.distinctValueLabel": "不同值",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.metaTableTitle": "文档统计",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.documentStatsTable.percentageLabel": "百分比",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.displayingPercentilesLabel": "正在显示 {minPercent} - {maxPercent} 百分位数",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.distributionTitle": "分布",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.maxLabel": "最大值",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.medianLabel": "中值",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.minLabel": "最小值",
+    "xpack.dataVisualizer.dataGrid.fieldExpandedRow.numberContent.summaryTableTitle": "摘要",
+    "xpack.dataVisualizer.fieldNameSelect": "字段名称",
+    "xpack.dataVisualizer.fieldStats.maxTitle": "最大值",
+    "xpack.dataVisualizer.fieldStats.medianTitle": "中值",
+    "xpack.dataVisualizer.fieldStats.minTitle": "最小值",
+    "xpack.dataVisualizer.fieldTypeIcon.booleanTypeAriaLabel": "布尔类型",
+    "xpack.dataVisualizer.fieldTypeIcon.dateTypeAriaLabel": "日期类型",
+    "xpack.dataVisualizer.fieldTypeIcon.fieldTypeTooltip": "{type} 类型",
+    "xpack.dataVisualizer.fieldTypeIcon.geoPointTypeAriaLabel": "{geoPointParam} 类型",
+    "xpack.dataVisualizer.fieldTypeIcon.ipTypeAriaLabel": "IP 类型",
+    "xpack.dataVisualizer.fieldTypeIcon.keywordTypeAriaLabel": "关键字类型",
+    "xpack.dataVisualizer.fieldTypeIcon.numberTypeAriaLabel": "数字类型",
+    "xpack.dataVisualizer.fieldTypeIcon.textTypeAriaLabel": "文本类型",
+    "xpack.dataVisualizer.fieldTypeIcon.unknownTypeAriaLabel": "未知类型",
+    "xpack.dataVisualizer.fieldTypeSelect": "字段类型",
+    "xpack.dataVisualizer.fileBeatConfig.paths": "在此处将路径添加您的文件中",
+    "xpack.dataVisualizer.fileBeatConfigFlyout.closeButton": "关闭",
+    "xpack.dataVisualizer.fileBeatConfigFlyout.copyButton": "复制到剪贴板",
+    "xpack.dataVisualizer.file.fileContents.fileContentsTitle": "文件内容",
+    "xpack.dataVisualizer.file.fileContents.firstLinesDescription": "前 {numberOfLines, plural, other {# 行}}",
+    "xpack.dataVisualizer.file.xmlNotCurrentlySupportedErrorMessage": "当前不支持 XML",
+    "xpack.dataVisualizer.file.fileErrorCallouts.applyOverridesDescription": "如果您对此数据有所了解，例如文件格式或时间戳格式，则添加初始覆盖可以帮助我们推理结构的其余部分。",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileCouldNotBeReadTitle": "无法确定文件结构",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileSizeExceedsAllowedSizeByDiffFormatErrorMessage": "您选择用于上传的文件大小超过上限值 {maxFileSizeFormatted} 的 {diffFormatted}",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileSizeExceedsAllowedSizeErrorMessage": "您选择用于上传的文件大小为 {fileSizeFormatted}，超过上限值 {maxFileSizeFormatted}",
+    "xpack.dataVisualizer.file.fileErrorCallouts.fileSizeTooLargeTitle": "文件太大",
+    "xpack.dataVisualizer.file.fileErrorCallouts.overrideButton": "应用覆盖设置",
+    "xpack.dataVisualizer.file.fileErrorCallouts.revertingToPreviousSettingsDescription": "恢复到以前的设置",
+    "xpack.dataVisualizer.file.geoPointForm.combinedFieldLabel": "添加地理点字段",
+    "xpack.dataVisualizer.file.geoPointForm.geoPointFieldAriaLabel": "地理点字段，必填字段",
+    "xpack.dataVisualizer.file.geoPointForm.geoPointFieldLabel": "地理点字段",
+    "xpack.dataVisualizer.file.geoPointForm.latFieldLabel": "纬度字段",
+    "xpack.dataVisualizer.file.geoPointForm.lonFieldLabel": "经度字段",
+    "xpack.dataVisualizer.file.geoPointForm.submitButtonLabel": "添加",
+    "xpack.dataVisualizer.file.importErrors.checkingPermissionErrorMessage": "导入权限错误",
+    "xpack.dataVisualizer.file.importErrors.creatingIndexErrorMessage": "创建索引时出错",
+    "xpack.dataVisualizer.file.importErrors.creatingIndexPatternErrorMessage": "创建索引模式时出错",
+    "xpack.dataVisualizer.file.importErrors.creatingIngestPipelineErrorMessage": "创建采集管道时出错",
+    "xpack.dataVisualizer.file.importErrors.defaultErrorMessage": "错误",
+    "xpack.dataVisualizer.file.importErrors.moreButtonLabel": "更多",
+    "xpack.dataVisualizer.file.importErrors.parsingJSONErrorMessage": "解析 JSON 出错",
+    "xpack.dataVisualizer.file.importErrors.readingFileErrorMessage": "读取文件时出错",
+    "xpack.dataVisualizer.file.importErrors.unknownErrorMessage": "未知错误",
+    "xpack.dataVisualizer.file.importErrors.uploadingDataErrorMessage": "上传数据时出错",
+    "xpack.dataVisualizer.file.importProgress.createIndexPatternTitle": "创建索引模式",
+    "xpack.dataVisualizer.file.importProgress.createIndexTitle": "创建索引",
+    "xpack.dataVisualizer.file.importProgress.createIngestPipelineTitle": "创建采集管道",
+    "xpack.dataVisualizer.file.importProgress.creatingIndexPatternDescription": "正在创建索引模式",
+    "xpack.dataVisualizer.file.importProgress.creatingIndexPatternTitle": "正在创建索引模式",
+    "xpack.dataVisualizer.file.importProgress.creatingIndexTitle": "正在创建索引",
+    "xpack.dataVisualizer.file.importProgress.creatingIngestPipelineTitle": "正在创建采集管道",
+    "xpack.dataVisualizer.file.importProgress.dataUploadedTitle": "数据已上传",
+    "xpack.dataVisualizer.file.importProgress.fileProcessedTitle": "文件已处理",
+    "xpack.dataVisualizer.file.importProgress.indexCreatedTitle": "索引已创建",
+    "xpack.dataVisualizer.file.importProgress.indexPatternCreatedTitle": "索引模式已创建",
+    "xpack.dataVisualizer.file.importProgress.ingestPipelineCreatedTitle": "采集管道已创建",
+    "xpack.dataVisualizer.file.importProgress.processFileTitle": "处理文件",
+    "xpack.dataVisualizer.file.importProgress.processingFileTitle": "正在处理文件",
+    "xpack.dataVisualizer.file.importProgress.processingImportedFileDescription": "正在处理要导入的文件",
+    "xpack.dataVisualizer.file.importProgress.stepTwoCreatingIndexDescription": "正在创建索引",
+    "xpack.dataVisualizer.file.importProgress.stepTwoCreatingIndexIngestPipelineDescription": "正在创建索引和采集管道",
+    "xpack.dataVisualizer.file.importProgress.uploadDataTitle": "上传数据",
+    "xpack.dataVisualizer.file.importProgress.uploadingDataDescription": "正在上传数据",
+    "xpack.dataVisualizer.file.importProgress.uploadingDataTitle": "正在上传数据",
+    "xpack.dataVisualizer.file.importSettings.advancedTabName": "高级",
+    "xpack.dataVisualizer.file.importSettings.simpleTabName": "简单",
+    "xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedDescription": "无法导入 {importFailuresLength} 个文档，共 {docCount} 个。这可能是由于行与 Grok 模式不匹配。",
+    "xpack.dataVisualizer.file.importSummary.documentsCouldNotBeImportedTitle": "部分文档无法导入",
+    "xpack.dataVisualizer.file.importSummary.documentsIngestedTitle": "已采集的文档",
+    "xpack.dataVisualizer.file.importSummary.failedDocumentsButtonLabel": "失败的文档",
+    "xpack.dataVisualizer.file.importSummary.failedDocumentsTitle": "失败的文档",
+    "xpack.dataVisualizer.file.importSummary.importCompleteTitle": "导入完成",
+    "xpack.dataVisualizer.file.importSummary.indexPatternTitle": "索引模式",
+    "xpack.dataVisualizer.file.importSummary.indexTitle": "索引",
+    "xpack.dataVisualizer.file.importSummary.ingestPipelineTitle": "采集管道",
+    "xpack.dataVisualizer.file.importView.experimentalFeatureTooltip": "实验性功能。我们很乐意听取您的反馈意见。",
+    "xpack.dataVisualizer.file.importView.importButtonLabel": "导入",
+    "xpack.dataVisualizer.file.importView.importDataTitle": "导入数据",
+    "xpack.dataVisualizer.file.importView.importPermissionError": "您无权创建或将数据导入索引 {index}",
+    "xpack.dataVisualizer.file.importView.indexNameAlreadyExistsErrorMessage": "索引名称已存在",
+    "xpack.dataVisualizer.file.importView.indexNameContainsIllegalCharactersErrorMessage": "索引名称包含非法字符",
+    "xpack.dataVisualizer.file.importView.indexPatternDoesNotMatchIndexNameErrorMessage": "索引模式与索引名称不匹配",
+    "xpack.dataVisualizer.file.importView.indexPatternNameAlreadyExistsErrorMessage": "索引模式名称已存在",
+    "xpack.dataVisualizer.file.importView.parseMappingsError": "解析映射时出错：",
+    "xpack.dataVisualizer.file.importView.parsePipelineError": "解析采集管道时出错：",
+    "xpack.dataVisualizer.file.importView.parseSettingsError": "解析设置时出错：",
+    "xpack.dataVisualizer.file.importView.resetButtonLabel": "重置",
+    "xpack.dataVisualizer.multiSelectPicker.NoFiltersFoundMessage": "未找到任何筛选",
+    "xpack.dataVisualizer.nameCollisionMsg": "“{name}”已存在，请提供唯一名称",
+    "xpack.dataVisualizer.removeCombinedFieldsLabel": "移除组合字段",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfig": "创建 Filebeat 配置",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomText": "其中 {password} 是 {user} 用户的密码，{esUrl} 是 Elasticsearch 的 URL。",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigBottomTextNoUsername": "其中 {esUrl} 是 Elasticsearch 的 URL。",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTitle": "Filebeat 配置",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText1": "可以使用 Filebeat 将其他数据上传到 {index} 索引。",
+    "xpack.dataVisualizer.file.resultsLinks.fileBeatConfigTopText2": "修改 {filebeatYml} 以设置连接信息：",
+    "xpack.dataVisualizer.file.resultsLinks.indexManagementTitle": "索引管理",
+    "xpack.dataVisualizer.file.resultsLinks.indexPatternManagementTitle": "索引模式管理",
+    "xpack.dataVisualizer.file.resultsLinks.viewIndexInDiscoverTitle": "在 Discover 中查看索引",
+    "xpack.dataVisualizer.file.resultsView.analysisExplanationButtonLabel": "分析说明",
+    "xpack.dataVisualizer.file.resultsView.fileStatsName": "文件统计",
+    "xpack.dataVisualizer.file.resultsView.overrideSettingsButtonLabel": "替代设置",
+    "xpack.dataVisualizer.searchPanel.allFieldsLabel": "所有字段",
+    "xpack.dataVisualizer.searchPanel.numberFieldsLabel": "字段数目",
+    "xpack.dataVisualizer.searchPanel.ofFieldsTotal": "，共 {totalCount} 个",
+    "xpack.dataVisualizer.file.simpleImportSettings.createIndexPatternLabel": "创建索引模式",
+    "xpack.dataVisualizer.file.simpleImportSettings.indexNameAriaLabel": "索引名称，必填字段",
+    "xpack.dataVisualizer.file.simpleImportSettings.indexNameFormRowLabel": "索引名称",
+    "xpack.dataVisualizer.file.simpleImportSettings.indexNamePlaceholder": "索引名称",
+    "xpack.dataVisualizer.file.welcomeContent.delimitedTextFilesDescription": "分隔的文本文件，例如 CSV 和 TSV",
+    "xpack.dataVisualizer.file.welcomeContent.experimentalFeatureDescription": "此功能为实验性功能。有反馈？如欲提供反馈，请在 {githubLink} 中创建问题。",
+    "xpack.dataVisualizer.file.welcomeContent.experimentalFeatureTooltip": "实验性功能。我们很乐意听取您的反馈意见。",
+    "xpack.dataVisualizer.file.welcomeContent.logFilesWithCommonFormatDescription": "具有时间戳通用格式的日志文件",
+    "xpack.dataVisualizer.file.welcomeContent.newlineDelimitedJsonDescription": "换行符分隔的 JSON",
+    "xpack.dataVisualizer.file.welcomeContent.supportedFileFormatDescription": "File Data Visualizer 支持以下文件格式：",
+    "xpack.dataVisualizer.file.welcomeContent.uploadedFilesAllowedSizeDescription": "您可以上传不超过 {maxFileSize} 的文件。",
+    "xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileDescription": "File Data Visualizer 可帮助您理解日志文件中的字段和指标。上传文件、分析文件数据，然后选择是否将数据导入 Elasticsearch 索引。",
+    "xpack.dataVisualizer.file.welcomeContent.visualizeDataFromLogFileTitle": "可视化来自日志文件的数据 {experimentalBadge}",
+    "xpack.dataVisualizer.index.actionsPanel.discoverAppTitle": "Discover",
+    "xpack.dataVisualizer.index.actionsPanel.exploreTitle": "浏览您的数据",
+    "xpack.dataVisualizer.index.actionsPanel.viewIndexInDiscoverDescription": "浏览您的索引中的文档。",
+    "xpack.dataVisualizer.index.fieldNameSelect": "字段名称",
+    "xpack.dataVisualizer.index.fieldTypeSelect": "字段类型",
+    "xpack.dataVisualizer.index.dataGrid.actionsColumnLabel": "操作",
+    "xpack.dataVisualizer.index.dataGrid.exploreInLensDescription": "在 Lens 中浏览",
+    "xpack.dataVisualizer.index.dataGrid.exploreInLensTitle": "在 Lens 中浏览",
+    "xpack.dataVisualizer.index.lensChart.averageOfLabel": "{fieldName} 的平均值",
+    "xpack.dataVisualizer.index.lensChart.chartTitle": "{fieldName} 的 Lens",
+    "xpack.dataVisualizer.index.lensChart.countLabel": "计数",
+    "xpack.dataVisualizer.index.lensChart.topValuesLabel": "排名最前值",
+    "xpack.dataVisualizer.searchPanel.allOptionLabel": "搜索全部",
+    "xpack.dataVisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar": "无效查询",
+    "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": "显示空字段",
+    "xpack.dataVisualizer.searchPanel.totalDocCountLabel": "文档总数：{strongTotalCount}",
+    "xpack.dataVisualizer.searchPanel.totalDocCountNumber": "{totalCount, plural, other {#}}",
+    "xpack.dataVisualizer.dataGrid.field.documentCountChart.seriesLabel": "文档计数",
+    "xpack.dataVisualizer.dataGrid.field.fieldNotInDocsLabel": "此字段不会出现在所选时间范围的任何文档中",
+    "xpack.dataVisualizer.dataGrid.field.loadingLabel": "正在加载",
+    "xpack.dataVisualizer.index.dataLoader.internalServerErrorMessage": "加载索引 {index} 中的数据时出错。{message}。请求可能已超时。请尝试使用较小的样例大小或缩小时间范围。",
     "xpack.fileUpload.fileSizeError": "文件大小 {fileSize} 超过最大文件大小 {maxFileSize}",
     "xpack.fileUpload.fileTypeError": "文件不是可接受类型之一：{types}",
     "xpack.fileUpload.geojsonFilePicker.acceptedCoordinateSystem": "坐标必须在 EPSG:4326 坐标参考系中。",
@@ -9065,7 +9030,6 @@
     "xpack.fleet.alphaMessging.closeFlyoutLabel": "关闭",
     "xpack.fleet.appNavigation.agentsLinkText": "代理",
     "xpack.fleet.appNavigation.dataStreamsLinkText": "数据流",
-    "xpack.fleet.appNavigation.epmLinkText": "集成",
     "xpack.fleet.appNavigation.overviewLinkText": "概览",
     "xpack.fleet.appNavigation.policiesLinkText": "策略",
     "xpack.fleet.appNavigation.sendFeedbackButton": "发送反馈",
@@ -9081,7 +9045,6 @@
     "xpack.fleet.breadcrumbs.editPackagePolicyPageTitle": "编辑集成",
     "xpack.fleet.breadcrumbs.enrollmentTokensPageTitle": "注册令牌",
     "xpack.fleet.breadcrumbs.installedIntegrationsPageTitle": "已安装",
-    "xpack.fleet.breadcrumbs.integrationPageTitle": "集成",
     "xpack.fleet.breadcrumbs.integrationsPageTitle": "集成",
     "xpack.fleet.breadcrumbs.overviewPageTitle": "概览",
     "xpack.fleet.breadcrumbs.policiesPageTitle": "策略",
@@ -9261,9 +9224,7 @@
     "xpack.fleet.epm.versionLabel": "版本",
     "xpack.fleet.epmList.allFilterLinkText": "全部",
     "xpack.fleet.epmList.allPackagesFilterLinkText": "全部",
-    "xpack.fleet.epmList.allTabText": "所有集成",
     "xpack.fleet.epmList.allTitle": "按类别浏览",
-    "xpack.fleet.epmList.installedTabText": "已安装集成",
     "xpack.fleet.epmList.installedTitle": "已安装集成",
     "xpack.fleet.epmList.noPackagesFoundPlaceholder": "未找到任何软件包",
     "xpack.fleet.epmList.searchPackagesPlaceholder": "搜索集成",
@@ -9353,7 +9314,6 @@
     "xpack.fleet.namespaceValidation.requiredErrorMessage": "“命名空间”必填",
     "xpack.fleet.namespaceValidation.tooLongErrorMessage": "命名空间不能超过 100 个字节",
     "xpack.fleet.newEnrollmentKey.cancelButtonLabel": "取消",
-    "xpack.fleet.newEnrollmentKey.flyoutTitle": "创建注册令牌",
     "xpack.fleet.newEnrollmentKey.keyCreatedToasts": "注册令牌已创建。",
     "xpack.fleet.newEnrollmentKey.nameLabel": "名称",
     "xpack.fleet.newEnrollmentKey.policyLabel": "策略",
@@ -13480,7 +13440,6 @@
     "xpack.maps.emsSource.tooltipsTitle": "工具提示字段",
     "xpack.maps.es_geo_utils.convert.invalidGeometryCollectionErrorMessage": "不应将 GeometryCollection 传递给 convertESShapeToGeojsonGeometry",
     "xpack.maps.es_geo_utils.convert.unsupportedGeometryTypeErrorMessage": "无法将 {geometryType} 几何图形转换成 geojson，不支持",
-    "xpack.maps.es_geo_utils.distanceFilterAlias": "{pointLabel} {distanceKm}km 内的 {geoFieldName}",
     "xpack.maps.es_geo_utils.unsupportedFieldTypeErrorMessage": "字段类型不受支持，应为 {expectedTypes}，而提供的是 {fieldType}",
     "xpack.maps.es_geo_utils.unsupportedGeometryTypeErrorMessage": "几何类型不受支持，应为 {expectedTypes}，而提供的是 {geometryType}",
     "xpack.maps.es_geo_utils.wkt.invalidWKTErrorMessage": "无法将 {wkt} 转换成 geojson。需要有效的 WKT。",
@@ -13661,7 +13620,6 @@
     "xpack.maps.metricSelect.selectAggregationPlaceholder": "选择聚合",
     "xpack.maps.metricSelect.sumDropDownOptionLabel": "求和",
     "xpack.maps.metricSelect.termsDropDownOptionLabel": "热门词",
-    "xpack.maps.multiIndexFieldSelect.fieldLabel": "筛选字段",
     "xpack.maps.mvtSource.addFieldLabel": "添加",
     "xpack.maps.mvtSource.fieldPlaceholderText": "字段名称",
     "xpack.maps.mvtSource.numberFieldLabel": "数字",
@@ -14752,48 +14710,7 @@
     "xpack.ml.dataGridChart.notEnoughData": "0 个文档包含字段。",
     "xpack.ml.dataGridChart.singleCategoryLegend": "{cardinality, plural, other {# 个类别}}",
     "xpack.ml.dataGridChart.topCategoriesLegend": "{cardinality} 个类别中的排名前 {maxChartColumns} 个",
-    "xpack.ml.datavisualizer.actionsPanel.advancedDescription": "为更高级的用例创建具有全部选项的作业。",
-    "xpack.ml.datavisualizer.actionsPanel.advancedTitle": "高级异常检测",
-    "xpack.ml.datavisualizer.actionsPanel.createJobTitle": "创建作业",
-    "xpack.ml.datavisualizer.actionsPanel.dataframeAnalyticsTitle": "数据帧分析",
-    "xpack.ml.datavisualizer.actionsPanel.dataframeTypesDescription": "创建离群值检测、回归或分类分析。",
-    "xpack.ml.datavisualizer.actionsPanel.discoverAppTitle": "Discover",
-    "xpack.ml.datavisualizer.actionsPanel.exploreTitle": "浏览您的数据",
-    "xpack.ml.datavisualizer.actionsPanel.viewIndexInDiscoverDescription": "浏览您的索引中的文档。",
-    "xpack.ml.datavisualizer.dataGrid.collapseDetailsForAllAriaLabel": "收起所有字段的详细信息",
-    "xpack.ml.datavisualizer.dataGrid.distinctValuesColumnName": "不同值",
-    "xpack.ml.datavisualizer.dataGrid.distributionsColumnName": "分布",
-    "xpack.ml.datavisualizer.dataGrid.documentsCountColumnName": "文档 (%)",
-    "xpack.ml.datavisualizer.dataGrid.expandDetailsForAllAriaLabel": "展开所有字段的详细信息",
-    "xpack.ml.datavisualizer.dataGrid.nameColumnName": "名称",
-    "xpack.ml.datavisualizer.dataGrid.rowCollapse": "隐藏 {fieldName} 的详细信息",
-    "xpack.ml.datavisualizer.dataGrid.rowExpand": "显示 {fieldName} 的详细信息",
-    "xpack.ml.datavisualizer.dataGrid.showDistributionsAriaLabel": "显示分布",
-    "xpack.ml.datavisualizer.dataGrid.typeColumnName": "类型",
-    "xpack.ml.datavisualizer.dataLoader.internalServerErrorMessage": "加载索引 {index} 中的数据时出错。{message}。请求可能已超时。请尝试使用较小的样例大小或缩小时间范围。",
     "xpack.ml.dataVisualizer.fileBasedLabel": "文件",
-    "xpack.ml.dataVisualizer.indexBased.fieldNameSelect": "字段名称",
-    "xpack.ml.dataVisualizer.indexBased.fieldTypeSelect": "字段类型",
-    "xpack.ml.dataVisualizer.indexBasedDataGrid.actionsColumnLabel": "操作",
-    "xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensDescription": "在 Lens 中浏览",
-    "xpack.ml.dataVisualizer.indexBasedDataGrid.exploreInLensTitle": "在 Lens 中浏览",
-    "xpack.ml.dataVisualizer.lensChart.averageOfLabel": "{fieldName} 的平均值",
-    "xpack.ml.dataVisualizer.lensChart.chartTitle": "{fieldName} 的 Lens",
-    "xpack.ml.dataVisualizer.lensChart.countLabel": "计数",
-    "xpack.ml.dataVisualizer.lensChart.topValuesLabel": "排名最前值",
-    "xpack.ml.datavisualizer.page.errorLoadingDataMessage": "加载索引 {index} 中的数据时出错。{message}",
-    "xpack.ml.dataVisualizer.searchPanel.allFieldsLabel": "所有字段",
-    "xpack.ml.datavisualizer.searchPanel.allOptionLabel": "搜索全部",
-    "xpack.ml.datavisualizer.searchPanel.invalidKuerySyntaxErrorMessageQueryBar": "无效查询",
-    "xpack.ml.dataVisualizer.searchPanel.numberFieldsLabel": "字段数目",
-    "xpack.ml.dataVisualizer.searchPanel.ofFieldsTotal": "，共 {totalCount} 个",
-    "xpack.ml.datavisualizer.searchPanel.queryBarPlaceholder": "选择较小的样例大小将减少查询运行时间和集群上的负载。",
-    "xpack.ml.datavisualizer.searchPanel.queryBarPlaceholderText": "搜索…… (例如，status:200 AND extension:\"PHP\") ",
-    "xpack.ml.datavisualizer.searchPanel.sampleSizeAriaLabel": "选择要采样的文档数目",
-    "xpack.ml.datavisualizer.searchPanel.sampleSizeOptionLabel": "样本大小 (每分片) ：{wrappedValue}",
-    "xpack.ml.dataVisualizer.searchPanel.showEmptyFields": "显示空字段",
-    "xpack.ml.datavisualizer.searchPanel.totalDocCountLabel": "文档总数：{strongTotalCount}",
-    "xpack.ml.datavisualizer.searchPanel.totalDocCountNumber": "{totalCount, plural, other {#}}",
     "xpack.ml.datavisualizer.selector.dataVisualizerDescription": "Machine Learning 数据可视化工具通过分析日志文件或现有 Elasticsearch 索引中的指标和字段，帮助您理解数据。",
     "xpack.ml.datavisualizer.selector.dataVisualizerTitle": "数据可视化工具",
     "xpack.ml.datavisualizer.selector.experimentalBadgeLabel": "实验性",
@@ -14924,48 +14841,14 @@
     "xpack.ml.explorerCharts.errorCallOutMessage": "由于{reason}，您无法查看 {jobs} 的异常图表。",
     "xpack.ml.feature.reserved.description": "要向用户授予访问权限，还应分配 machine_learning_user 或 machine_learning_admin 角色。",
     "xpack.ml.featureRegistry.mlFeatureName": "Machine Learning",
-    "xpack.ml.fieldDataCard.cardBoolean.valuesLabel": "值",
-    "xpack.ml.fieldDataCard.cardDate.earliestLabel": "最早",
-    "xpack.ml.fieldDataCard.cardDate.latestLabel": "最新",
-    "xpack.ml.fieldDataCard.cardDate.summaryTableTitle": "摘要",
-    "xpack.ml.fieldDataCard.cardText.fieldMayBePopulatedDescription": "例如，可以使用文档映射中的 {copyToParam} 参数进行填充，也可以在索引后通过使用 {includesParam} 和 {excludesParam} 参数从 {sourceParam} 字段中修剪。",
-    "xpack.ml.fieldDataCard.cardText.fieldNotPresentDescription": "查询的文档的 {sourceParam} 字段中不存在此字段。",
-    "xpack.ml.fieldDataCard.cardText.noExamplesForFieldsTitle": "没有获取此字段的示例",
-    "xpack.ml.fieldDataCard.documentCountChart.seriesLabel": "文档计数",
-    "xpack.ml.fieldDataCard.examplesList.noExamplesMessage": "没有获取此字段的示例",
-    "xpack.ml.fieldDataCard.examplesList.title": "{numExamples, plural, one {值} other {示例}}",
-    "xpack.ml.fieldDataCard.fieldNotInDocsLabel": "此字段不会出现在所选时间范围的任何文档中",
-    "xpack.ml.fieldDataCard.loadingLabel": "正在加载",
-    "xpack.ml.fieldDataCard.metricDistributionChart.seriesName": "分布",
-    "xpack.ml.fieldDataCard.metricDistributionChart.tooltipValueBetweenLabel": "{percent}% 的文档具有介于 {minValFormatted} 和 {maxValFormatted} 之间的值",
-    "xpack.ml.fieldDataCard.metricDistributionChart.tooltipValueEqualLabel": "{percent}% 的文档的值为 {valFormatted}",
-    "xpack.ml.fieldDataCard.topValues.calculatedFromSampleDescription": "基于每个分片的 {topValuesSamplerShardSize} 文档样例计算",
-    "xpack.ml.fieldDataCard.topValuesLabel": "排名最前值",
-    "xpack.ml.fieldDataCardExpandedRow.booleanContent.falseCountLabel": "false",
-    "xpack.ml.fieldDataCardExpandedRow.booleanContent.summaryTableTitle": "摘要",
-    "xpack.ml.fieldDataCardExpandedRow.booleanContent.trueCountLabel": "true",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.countLabel": "计数",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.distinctValueLabel": "不同值",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.metaTableTitle": "文档统计",
-    "xpack.ml.fieldDataCardExpandedRow.documentStatsTable.percentageLabel": "百分比",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.displayingPercentilesLabel": "正在显示 {minPercent} - {maxPercent} 百分位数",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.distributionTitle": "分布",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.maxLabel": "最大值",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.medianLabel": "中值",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.minLabel": "最小值",
-    "xpack.ml.fieldDataCardExpandedRow.numberContent.summaryTableTitle": "摘要",
-    "xpack.ml.fieldTitleBar.documentCountLabel": "文档计数",
     "xpack.ml.fieldTypeIcon.booleanTypeAriaLabel": "布尔类型",
     "xpack.ml.fieldTypeIcon.dateTypeAriaLabel": "日期类型",
-    "xpack.ml.fieldTypeIcon.fieldTypeTooltip": "{type} 类型",
     "xpack.ml.fieldTypeIcon.geoPointTypeAriaLabel": "{geoPointParam} 类型",
     "xpack.ml.fieldTypeIcon.ipTypeAriaLabel": "IP 类型",
     "xpack.ml.fieldTypeIcon.keywordTypeAriaLabel": "关键字类型",
     "xpack.ml.fieldTypeIcon.numberTypeAriaLabel": "数字类型",
     "xpack.ml.fieldTypeIcon.textTypeAriaLabel": "文本类型",
     "xpack.ml.fieldTypeIcon.unknownTypeAriaLabel": "未知类型",
-    "xpack.ml.fileDataVisualizerDescription": "导入您自己的 CSV、NDJSON 或日志文件。",
-    "xpack.ml.fileDataVisualizerTitle": "上传文件",
     "xpack.ml.formatters.metricChangeDescription.actualSameAsTypicalDescription": "实际上与典型模式相同",
     "xpack.ml.formatters.metricChangeDescription.moreThan100xHigherDescription": "高 100 多倍",
     "xpack.ml.formatters.metricChangeDescription.moreThan100xLowerDescription": "低 100 多倍",
@@ -19397,8 +19280,6 @@
     "xpack.securitySolution.cases.allCases.actions": "操作",
     "xpack.securitySolution.cases.allCases.comments": "注释",
     "xpack.securitySolution.cases.allCases.noTagsAvailable": "没有可用标签",
-    "xpack.securitySolution.cases.caseSavedObjectNoPermissionsMessage": "要查看案例，必须对 Kibana 工作区中的已保存对象管理功能有权限。有关详细信息，请联系您的 Kibana 管理员。",
-    "xpack.securitySolution.cases.caseSavedObjectNoPermissionsTitle": "需要 Kibana 功能权限",
     "xpack.securitySolution.cases.caseTable.caseDetailsLinkAria": "单击以访问标题为 {detailName} 的案例",
     "xpack.securitySolution.cases.caseTable.closedCases": "已关闭案例",
     "xpack.securitySolution.cases.caseTable.inProgressCases": "进行中的案例",
@@ -19446,8 +19327,6 @@
     "xpack.securitySolution.cases.createCase.titleFieldRequiredError": "标题必填。",
     "xpack.securitySolution.cases.dismissErrorsPushServiceCallOutTitle": "关闭",
     "xpack.securitySolution.cases.pageTitle": "案例",
-    "xpack.securitySolution.cases.readOnlySavedObjectDescription": "您仅有权查看案例。如果需要创建和更新案例，请联系您的 Kibana 管理员。",
-    "xpack.securitySolution.cases.readOnlySavedObjectTitle": "您无法创建新案例或更新现有案例",
     "xpack.securitySolution.cases.settings.syncAlertsSwitchLabelOff": "关闭",
     "xpack.securitySolution.cases.settings.syncAlertsSwitchLabelOn": "开启",
     "xpack.securitySolution.cases.timeline.actions.addCase": "添加到案例",
@@ -20493,13 +20372,11 @@
     "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.successfullyDuplicatedRulesTitle": "已成功复制 {totalRules, plural, other {{totalRules} 个规则}}",
-    "xpack.securitySolution.detectionEngine.rules.allRules.successfullyExportedRulesTitle": "已成功导出{totalRules, plural, =0 {所有规则} other { {totalRules} 个规则}}",
     "xpack.securitySolution.detectionEngine.rules.allRules.tableTitle": "所有规则",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.exceptions": "例外列表",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.monitoring": "规则监测",
     "xpack.securitySolution.detectionEngine.rules.allRules.tabs.rules": "规则",
     "xpack.securitySolution.detectionEngine.rules.backOptionsHeader": "返回到检测",
-    "xpack.securitySolution.detectionEngine.rules.components.genericDownloader.exportFailureTitle": "无法导出数据……",
     "xpack.securitySolution.detectionEngine.rules.components.ruleActionsOverflow.allActionsTitle": "所有操作",
     "xpack.securitySolution.detectionEngine.rules.continueButtonTitle": "继续",
     "xpack.securitySolution.detectionEngine.rules.create.successfullyCreatedRuleTitle": "{ruleName} 已创建",
@@ -20637,9 +20514,6 @@
     "xpack.securitySolution.endpoint.ingestToastTitle": "应用无法初始化",
     "xpack.securitySolution.endpoint.list.actionmenu": "未结",
     "xpack.securitySolution.endpoint.list.actions": "操作",
-    "xpack.securitySolution.endpoint.list.actions.agentDetails": "查看代理详情",
-    "xpack.securitySolution.endpoint.list.actions.agentPolicy": "查看代理策略",
-    "xpack.securitySolution.endpoint.list.actions.hostDetails": "查看主机详情",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling": "正在注册终端。{agentsLink}以跟踪进度。",
     "xpack.securitySolution.endpoint.list.endpointsEnrolling.viewAgentsLink": "查看代理",
     "xpack.securitySolution.endpoint.list.endpointVersion": "版本",
@@ -21838,7 +21712,6 @@
     "xpack.securitySolution.trustedapps.list.actions.delete": "移除",
     "xpack.securitySolution.trustedapps.list.actions.delete.description": "移除此条目",
     "xpack.securitySolution.trustedapps.list.addButton": "添加受信任的应用程序",
-    "xpack.securitySolution.trustedapps.list.backButton": "返回",
     "xpack.securitySolution.trustedapps.list.columns.actions": "操作",
     "xpack.securitySolution.trustedapps.list.pageTitle": "受信任的应用程序",
     "xpack.securitySolution.trustedapps.list.totalCount": "{totalItemCount, plural, other {# 个受信任的应用程序}}",
diff --git a/x-pack/plugins/triggers_actions_ui/README.md b/x-pack/plugins/triggers_actions_ui/README.md
index 7d736218af2d9..cd83be0138faf 100644
--- a/x-pack/plugins/triggers_actions_ui/README.md
+++ b/x-pack/plugins/triggers_actions_ui/README.md
@@ -888,10 +888,10 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Send to Server log',
       }
     ),
-    validateConnector: (): ValidationResult => {
+    validateConnector: (): Promise<ValidationResult> => {
       return { errors: {} };
     },
-    validateParams: (actionParams: ServerLogActionParams): ValidationResult => {
+    validateParams: (actionParams: ServerLogActionParams): Promise<ValidationResult> => {
       // validation of action params implementation
     },
     actionConnectorFields: null,
@@ -929,10 +929,10 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Send to email',
       }
     ),
-    validateConnector: (action: EmailActionConnector): ValidationResult => {
+    validateConnector: (action: EmailActionConnector): Promise<ValidationResult> => {
       // validation of connector properties implementation
     },
-    validateParams: (actionParams: EmailActionParams): ValidationResult => {
+    validateParams: (actionParams: EmailActionParams): Promise<ValidationResult> => {
       // validation of action params implementation
     },
     actionConnectorFields: EmailActionConnectorFields,
@@ -967,10 +967,10 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Send to Slack',
       }
     ),
-    validateConnector: (action: SlackActionConnector): ValidationResult => {
+    validateConnector: (action: SlackActionConnector): Promise<ValidationResult> => {
       // validation of connector properties implementation
     },
-    validateParams: (actionParams: SlackActionParams): ValidationResult => {
+    validateParams: (actionParams: SlackActionParams): Promise<ValidationResult> => {
       // validation of action params implementation 
     },
     actionConnectorFields: SlackActionFields,
@@ -1000,12 +1000,12 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Index data into Elasticsearch.',
       }
     ),
-    validateConnector: (): ValidationResult => {
+    validateConnector: (): Promise<ValidationResult> => {
       return { errors: {} };
     },
     actionConnectorFields: IndexActionConnectorFields,
     actionParamsFields: IndexParamsFields,
-    validateParams: (): ValidationResult => {
+    validateParams: (): Promise<ValidationResult> => {
       return { errors: {} };
     },
   };
@@ -1046,10 +1046,10 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Send a request to a web service.',
       }
     ),
-    validateConnector: (action: WebhookActionConnector): ValidationResult => {
+    validateConnector: (action: WebhookActionConnector): Promise<ValidationResult> => {
       // validation of connector properties implementation
     },
-    validateParams: (actionParams: WebhookActionParams): ValidationResult => {
+    validateParams: (actionParams: WebhookActionParams): Promise<ValidationResult> => {
       // validation of action params implementation
     },
     actionConnectorFields: WebhookActionConnectorFields,
@@ -1086,10 +1086,10 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Send to PagerDuty',
       }
     ),
-    validateConnector: (action: PagerDutyActionConnector): ValidationResult => {
+    validateConnector: (action: PagerDutyActionConnector): Promise<ValidationResult> => {
       // validation of connector properties implementation
     },
-    validateParams: (actionParams: PagerDutyActionParams): ValidationResult => {
+    validateParams: (actionParams: PagerDutyActionParams): Promise<ValidationResult> => {
       // validation of action params implementation
     },
     actionConnectorFields: PagerDutyActionConnectorFields,
@@ -1113,8 +1113,8 @@ Each action type should be defined as an `ActionTypeModel` object with the follo
   iconClass: IconType;
   selectMessage: string;
   actionTypeTitle?: string;
-  validateConnector: (connector: any) => ValidationResult;
-  validateParams: (actionParams: any) => ValidationResult;
+  validateConnector: (connector: any) => Promise<ValidationResult>;
+  validateParams: (actionParams: any) => Promise<ValidationResult>;
   actionConnectorFields: React.FunctionComponent<any> | null;
   actionParamsFields: React.LazyExoticComponent<ComponentType<ActionParamsProps<ActionParams>>>;
 ```
@@ -1186,7 +1186,7 @@ export function getActionType(): ActionTypeModel {
         defaultMessage: 'Example Action',
       }
     ),
-    validateConnector: (action: ExampleActionConnector): ValidationResult => {
+    validateConnector: (action: ExampleActionConnector): Promise<ValidationResult> => {
       const validationResult = { errors: {} };
       const errors = {
         someConnectorField: new Array<string>(),
@@ -1204,7 +1204,7 @@ export function getActionType(): ActionTypeModel {
       }
       return validationResult;
     },
-    validateParams: (actionParams: ExampleActionParams): ValidationResult => {
+    validateParams: (actionParams: ExampleActionParams): Promise<ValidationResult> => {
       const validationResult = { errors: {} };
       const errors = {
         message: new Array<string>(),
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 bebddba0c1110..4d669ab4c76a1 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
@@ -30,7 +30,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         user: 'user',
@@ -49,7 +49,7 @@ describe('connector validation', () => {
       },
     } as EmailActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           from: [],
@@ -66,7 +66,7 @@ describe('connector validation', () => {
     });
   });
 
-  test('connector validation succeeds when connector config is valid with empty user/password', () => {
+  test('connector validation succeeds when connector config is valid with empty user/password', async () => {
     const actionConnector = {
       secrets: {
         user: null,
@@ -85,7 +85,7 @@ describe('connector validation', () => {
       },
     } as EmailActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           from: [],
@@ -101,7 +101,7 @@ describe('connector validation', () => {
       },
     });
   });
-  test('connector validation fails when connector config is not valid', () => {
+  test('connector validation fails when connector config is not valid', async () => {
     const actionConnector = {
       secrets: {
         user: 'user',
@@ -116,7 +116,7 @@ describe('connector validation', () => {
       },
     } as EmailActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           from: [],
@@ -132,7 +132,7 @@ describe('connector validation', () => {
       },
     });
   });
-  test('connector validation fails when user specified but not password', () => {
+  test('connector validation fails when user specified but not password', async () => {
     const actionConnector = {
       secrets: {
         user: 'user',
@@ -151,7 +151,7 @@ describe('connector validation', () => {
       },
     } as EmailActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           from: [],
@@ -167,7 +167,7 @@ describe('connector validation', () => {
       },
     });
   });
-  test('connector validation fails when password specified but not user', () => {
+  test('connector validation fails when password specified but not user', async () => {
     const actionConnector = {
       secrets: {
         user: null,
@@ -186,7 +186,7 @@ describe('connector validation', () => {
       },
     } as EmailActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           from: [],
@@ -205,7 +205,7 @@ describe('connector validation', () => {
 });
 
 describe('action params validation', () => {
-  test('action params validation succeeds when action params is valid', () => {
+  test('action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       to: [],
       cc: ['test1@test.com'],
@@ -213,7 +213,7 @@ describe('action params validation', () => {
       subject: 'test',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         to: [],
         cc: [],
@@ -224,13 +224,13 @@ describe('action params validation', () => {
     });
   });
 
-  test('action params validation fails when action params is not valid', () => {
+  test('action params validation fails when action params is not valid', async () => {
     const actionParams = {
       to: ['test@test.com'],
       subject: 'test',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         to: [],
         cc: [],
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 81eadda4fc278..5e23754621430 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
@@ -31,9 +31,12 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         defaultMessage: 'Send to email',
       }
     ),
-    validateConnector: (
+    validateConnector: async (
       action: EmailActionConnector
-    ): ConnectorValidationResult<Omit<EmailConfig, 'secure' | 'hasAuth'>, EmailSecrets> => {
+    ): Promise<
+      ConnectorValidationResult<Omit<EmailConfig, 'secure' | 'hasAuth'>, EmailSecrets>
+    > => {
+      const translations = await import('./translations');
       const configErrors = {
         from: new Array<string>(),
         port: new Array<string>(),
@@ -49,74 +52,25 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         secrets: { errors: secretsErrors },
       };
       if (!action.config.from) {
-        configErrors.from.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredFromText',
-            {
-              defaultMessage: 'Sender is required.',
-            }
-          )
-        );
+        configErrors.from.push(translations.SENDER_REQUIRED);
       }
       if (action.config.from && !action.config.from.trim().match(mailformat)) {
-        configErrors.from.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.formatFromText',
-            {
-              defaultMessage: 'Sender is not a valid email address.',
-            }
-          )
-        );
+        configErrors.from.push(translations.SENDER_NOT_VALID);
       }
       if (!action.config.port) {
-        configErrors.port.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPortText',
-            {
-              defaultMessage: 'Port is required.',
-            }
-          )
-        );
+        configErrors.port.push(translations.PORT_REQUIRED);
       }
       if (!action.config.host) {
-        configErrors.host.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredHostText',
-            {
-              defaultMessage: 'Host is required.',
-            }
-          )
-        );
+        configErrors.host.push(translations.HOST_REQUIRED);
       }
       if (action.config.hasAuth && !action.secrets.user && !action.secrets.password) {
-        secretsErrors.user.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthUserNameText',
-            {
-              defaultMessage: 'Username is required.',
-            }
-          )
-        );
+        secretsErrors.user.push(translations.USERNAME_REQUIRED);
       }
       if (action.config.hasAuth && !action.secrets.user && !action.secrets.password) {
-        secretsErrors.password.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthPasswordText',
-            {
-              defaultMessage: 'Password is required.',
-            }
-          )
-        );
+        secretsErrors.password.push(translations.PASSWORD_REQUIRED);
       }
       if (action.secrets.user && !action.secrets.password) {
-        secretsErrors.password.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPasswordText',
-            {
-              defaultMessage: 'Password is required when username is used.',
-            }
-          )
-        );
+        secretsErrors.password.push(translations.PASSWORD_REQUIRED_FOR_USER_USED);
       }
       if (!action.secrets.user && action.secrets.password) {
         secretsErrors.user.push(
@@ -130,9 +84,10 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
       }
       return validationResult;
     },
-    validateParams: (
+    validateParams: async (
       actionParams: EmailActionParams
-    ): GenericValidationResult<EmailActionParams> => {
+    ): Promise<GenericValidationResult<EmailActionParams>> => {
+      const translations = await import('./translations');
       const errors = {
         to: new Array<string>(),
         cc: new Array<string>(),
@@ -146,35 +101,16 @@ export function getActionType(): ActionTypeModel<EmailConfig, EmailSecrets, Emai
         (!(actionParams.cc instanceof Array) || actionParams.cc.length === 0) &&
         (!(actionParams.bcc instanceof Array) || actionParams.bcc.length === 0)
       ) {
-        const errorText = i18n.translate(
-          'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredEntryText',
-          {
-            defaultMessage: 'No To, Cc, or Bcc entry.  At least one entry is required.',
-          }
-        );
+        const errorText = translations.TO_CC_REQUIRED;
         errors.to.push(errorText);
         errors.cc.push(errorText);
         errors.bcc.push(errorText);
       }
       if (!actionParams.message?.length) {
-        errors.message.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredMessageText',
-            {
-              defaultMessage: 'Message is required.',
-            }
-          )
-        );
+        errors.message.push(translations.MESSAGE_REQUIRED);
       }
       if (!actionParams.subject?.length) {
-        errors.subject.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredSubjectText',
-            {
-              defaultMessage: 'Subject is required.',
-            }
-          )
-        );
+        errors.subject.push(translations.SUBJECT_REQUIRED);
       }
       return validationResult;
     },
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 55c7932b37d4e..e4d73ced1eb59 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
@@ -38,6 +38,17 @@ export const EmailActionConnectorFields: React.FunctionComponent<
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
 
+  const isFromInvalid: boolean =
+    from !== undefined && errors.from !== undefined && errors.from.length > 0;
+  const isHostInvalid: boolean =
+    host !== undefined && errors.host !== undefined && errors.host.length > 0;
+  const isPortInvalid: boolean =
+    port !== undefined && errors.port !== undefined && errors.port.length > 0;
+
+  const isPasswordInvalid: boolean =
+    password !== undefined && errors.password !== undefined && errors.password.length > 0;
+  const isUserInvalid: boolean =
+    user !== undefined && errors.user !== undefined && errors.user.length > 0;
   return (
     <>
       <EuiFlexGroup>
@@ -46,7 +57,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
             id="from"
             fullWidth
             error={errors.from}
-            isInvalid={errors.from.length > 0 && from !== undefined}
+            isInvalid={isFromInvalid}
             label={i18n.translate(
               'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.fromTextFieldLabel',
               {
@@ -65,7 +76,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
             <EuiFieldText
               fullWidth
               readOnly={readOnly}
-              isInvalid={errors.from.length > 0 && from !== undefined}
+              isInvalid={isFromInvalid}
               name="from"
               value={from || ''}
               data-test-subj="emailFromInput"
@@ -87,7 +98,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
             id="emailHost"
             fullWidth
             error={errors.host}
-            isInvalid={errors.host.length > 0 && host !== undefined}
+            isInvalid={isHostInvalid}
             label={i18n.translate(
               'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.hostTextFieldLabel',
               {
@@ -98,7 +109,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
             <EuiFieldText
               fullWidth
               readOnly={readOnly}
-              isInvalid={errors.host.length > 0 && host !== undefined}
+              isInvalid={isHostInvalid}
               name="host"
               value={host || ''}
               data-test-subj="emailHostInput"
@@ -121,7 +132,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
                 fullWidth
                 placeholder="587"
                 error={errors.port}
-                isInvalid={errors.port.length > 0 && port !== undefined}
+                isInvalid={isPortInvalid}
                 label={i18n.translate(
                   'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.portTextFieldLabel',
                   {
@@ -131,7 +142,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
               >
                 <EuiFieldNumber
                   prepend=":"
-                  isInvalid={errors.port.length > 0 && port !== undefined}
+                  isInvalid={isPortInvalid}
                   fullWidth
                   readOnly={readOnly}
                   name="port"
@@ -221,7 +232,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
                 id="emailUser"
                 fullWidth
                 error={errors.user}
-                isInvalid={errors.user.length > 0 && user !== undefined}
+                isInvalid={isUserInvalid}
                 label={i18n.translate(
                   'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.userTextFieldLabel',
                   {
@@ -231,7 +242,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
               >
                 <EuiFieldText
                   fullWidth
-                  isInvalid={errors.user.length > 0 && user !== undefined}
+                  isInvalid={isUserInvalid}
                   name="user"
                   readOnly={readOnly}
                   value={user || ''}
@@ -252,7 +263,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
                 id="emailPassword"
                 fullWidth
                 error={errors.password}
-                isInvalid={errors.password.length > 0 && password !== undefined}
+                isInvalid={isPasswordInvalid}
                 label={i18n.translate(
                   'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.passwordFieldLabel',
                   {
@@ -263,7 +274,7 @@ export const EmailActionConnectorFields: React.FunctionComponent<
                 <EuiFieldPassword
                   fullWidth
                   readOnly={readOnly}
-                  isInvalid={errors.password.length > 0 && password !== undefined}
+                  isInvalid={isPasswordInvalid}
                   name="password"
                   value={password || ''}
                   data-test-subj="emailPasswordInput"
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx
index e2d6237af85da..5d19a1958c1c6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/email_params.tsx
@@ -44,13 +44,18 @@ export const EmailParamsFields = ({
     }
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [defaultMessage]);
-
+  const isToInvalid: boolean = to !== undefined && errors.to !== undefined && errors.to.length > 0;
+  const isSubjectInvalid: boolean =
+    subject !== undefined && errors.subject !== undefined && errors.subject.length > 0;
+  const isCCInvalid: boolean = errors.cc !== undefined && errors.cc.length > 0 && cc !== undefined;
+  const isBCCInvalid: boolean =
+    errors.bcc !== undefined && errors.bcc.length > 0 && bcc !== undefined;
   return (
     <>
       <EuiFormRow
         fullWidth
         error={errors.to}
-        isInvalid={errors.to.length > 0 && to !== undefined}
+        isInvalid={isToInvalid}
         label={i18n.translate(
           'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientTextFieldLabel',
           {
@@ -82,7 +87,7 @@ export const EmailParamsFields = ({
       >
         <EuiComboBox
           noSuggestions
-          isInvalid={errors.to.length > 0 && to !== undefined}
+          isInvalid={isToInvalid}
           fullWidth
           data-test-subj="toEmailAddressInput"
           selectedOptions={toOptions}
@@ -112,7 +117,7 @@ export const EmailParamsFields = ({
         <EuiFormRow
           fullWidth
           error={errors.cc}
-          isInvalid={errors.cc.length > 0 && cc !== undefined}
+          isInvalid={isCCInvalid}
           label={i18n.translate(
             'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientCopyTextFieldLabel',
             {
@@ -122,7 +127,7 @@ export const EmailParamsFields = ({
         >
           <EuiComboBox
             noSuggestions
-            isInvalid={errors.cc.length > 0 && cc !== undefined}
+            isInvalid={isCCInvalid}
             fullWidth
             data-test-subj="ccEmailAddressInput"
             selectedOptions={ccOptions}
@@ -153,7 +158,7 @@ export const EmailParamsFields = ({
         <EuiFormRow
           fullWidth
           error={errors.bcc}
-          isInvalid={errors.bcc.length > 0 && bcc !== undefined}
+          isInvalid={isBCCInvalid}
           label={i18n.translate(
             'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.recipientBccTextFieldLabel',
             {
@@ -163,7 +168,7 @@ export const EmailParamsFields = ({
         >
           <EuiComboBox
             noSuggestions
-            isInvalid={errors.bcc.length > 0 && bcc !== undefined}
+            isInvalid={isBCCInvalid}
             fullWidth
             data-test-subj="bccEmailAddressInput"
             selectedOptions={bccOptions}
@@ -193,7 +198,7 @@ export const EmailParamsFields = ({
       <EuiFormRow
         fullWidth
         error={errors.subject}
-        isInvalid={errors.subject.length > 0 && subject !== undefined}
+        isInvalid={isSubjectInvalid}
         label={i18n.translate(
           'xpack.triggersActionsUI.sections.builtinActionTypes.emailAction.subjectTextFieldLabel',
           {
@@ -207,7 +212,7 @@ export const EmailParamsFields = ({
           messageVariables={messageVariables}
           paramsProperty={'subject'}
           inputTargetValue={subject}
-          errors={errors.subject as string[]}
+          errors={(errors.subject ?? []) as string[]}
         />
       </EuiFormRow>
       <TextAreaWithMessageVariables
@@ -222,7 +227,7 @@ export const EmailParamsFields = ({
             defaultMessage: 'Message',
           }
         )}
-        errors={errors.message as string[]}
+        errors={(errors.message ?? []) as string[]}
       />
     </>
   );
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/translations.ts
new file mode 100644
index 0000000000000..5da9145ecec0b
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/email/translations.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 { i18n } from '@kbn/i18n';
+
+export const SENDER_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredFromText',
+  {
+    defaultMessage: 'Sender is required.',
+  }
+);
+
+export const SENDER_NOT_VALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.formatFromText',
+  {
+    defaultMessage: 'Sender is not a valid email address.',
+  }
+);
+
+export const PORT_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPortText',
+  {
+    defaultMessage: 'Port is required.',
+  }
+);
+
+export const HOST_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredHostText',
+  {
+    defaultMessage: 'Host is required.',
+  }
+);
+
+export const USERNAME_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthUserNameText',
+  {
+    defaultMessage: 'Username is required.',
+  }
+);
+
+export const PASSWORD_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredAuthPasswordText',
+  {
+    defaultMessage: 'Password is required.',
+  }
+);
+
+export const PASSWORD_REQUIRED_FOR_USER_USED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredPasswordText',
+  {
+    defaultMessage: 'Password is required when username is used.',
+  }
+);
+
+export const TO_CC_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredEntryText',
+  {
+    defaultMessage: 'No To, Cc, or Bcc entry.  At least one entry is required.',
+  }
+);
+
+export const MESSAGE_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredMessageText',
+  {
+    defaultMessage: 'Message is required.',
+  }
+);
+
+export const SUBJECT_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredSubjectText',
+  {
+    defaultMessage: 'Subject is required.',
+  }
+);
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 9757653043175..f43d883be7add 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
@@ -30,7 +30,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('index connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {},
       id: 'test',
@@ -43,7 +43,7 @@ describe('index connector validation', () => {
       },
     } as EsIndexActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           index: [],
@@ -57,7 +57,7 @@ describe('index connector validation', () => {
 });
 
 describe('index connector validation with minimal config', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {},
       id: 'test',
@@ -68,7 +68,7 @@ describe('index connector validation with minimal config', () => {
       },
     } as EsIndexActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           index: [],
@@ -82,9 +82,9 @@ describe('index connector validation with minimal config', () => {
 });
 
 describe('action params validation', () => {
-  test('action params validation succeeds when action params are valid', () => {
+  test('action params validation succeeds when action params are valid', async () => {
     expect(
-      actionTypeModel.validateParams({
+      await actionTypeModel.validateParams({
         documents: [{ test: 1234 }],
       })
     ).toEqual({
@@ -95,7 +95,7 @@ describe('action params validation', () => {
     });
 
     expect(
-      actionTypeModel.validateParams({
+      await actionTypeModel.validateParams({
         documents: [{ test: 1234 }],
         indexOverride: 'kibana-alert-history-anything',
       })
@@ -107,8 +107,8 @@ describe('action params validation', () => {
     });
   });
 
-  test('action params validation fails when action params are invalid', () => {
-    expect(actionTypeModel.validateParams({})).toEqual({
+  test('action params validation fails when action params are invalid', async () => {
+    expect(await actionTypeModel.validateParams({})).toEqual({
       errors: {
         documents: ['Document is required and should be a valid JSON object.'],
         indexOverride: [],
@@ -116,7 +116,7 @@ describe('action params validation', () => {
     });
 
     expect(
-      actionTypeModel.validateParams({
+      await actionTypeModel.validateParams({
         documents: [{}],
       })
     ).toEqual({
@@ -127,7 +127,7 @@ describe('action params validation', () => {
     });
 
     expect(
-      actionTypeModel.validateParams({
+      await actionTypeModel.validateParams({
         documents: [{}],
         indexOverride: 'kibana-alert-history-',
       })
@@ -139,7 +139,7 @@ describe('action params validation', () => {
     });
 
     expect(
-      actionTypeModel.validateParams({
+      await actionTypeModel.validateParams({
         documents: [{}],
         indexOverride: 'this.is-a_string',
       })
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx
index f4b8284c8cfa6..80d38bda22ab3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/es_index.tsx
@@ -31,44 +31,32 @@ export function getActionType(): ActionTypeModel<EsIndexConfig, unknown, IndexAc
         defaultMessage: 'Index data',
       }
     ),
-    validateConnector: (
+    validateConnector: async (
       action: EsIndexActionConnector
-    ): ConnectorValidationResult<Pick<EsIndexConfig, 'index'>, unknown> => {
+    ): Promise<ConnectorValidationResult<Pick<EsIndexConfig, 'index'>, unknown>> => {
+      const translations = await import('./translations');
       const configErrors = {
         index: new Array<string>(),
       };
       const validationResult = { config: { errors: configErrors }, secrets: { errors: {} } };
       if (!action.config.index) {
-        configErrors.index.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.indexAction.error.requiredIndexText',
-            {
-              defaultMessage: 'Index is required.',
-            }
-          )
-        );
+        configErrors.index.push(translations.INDEX_REQUIRED);
       }
       return validationResult;
     },
     actionConnectorFields: lazy(() => import('./es_index_connector')),
     actionParamsFields: lazy(() => import('./es_index_params')),
-    validateParams: (
+    validateParams: async (
       actionParams: IndexActionParams
-    ): GenericValidationResult<IndexActionParams> => {
+    ): Promise<GenericValidationResult<IndexActionParams>> => {
+      const translations = await import('./translations');
       const errors = {
         documents: new Array<string>(),
         indexOverride: new Array<string>(),
       };
       const validationResult = { errors };
       if (!actionParams.documents?.length || Object.keys(actionParams.documents[0]).length === 0) {
-        errors.documents.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredDocumentJson',
-            {
-              defaultMessage: 'Document is required and should be a valid JSON object.',
-            }
-          )
-        );
+        errors.documents.push(translations.DOCUMENT_NOT_VALID);
       }
       if (actionParams.indexOverride) {
         if (!actionParams.indexOverride.startsWith(ALERT_HISTORY_PREFIX)) {
@@ -85,14 +73,7 @@ export function getActionType(): ActionTypeModel<EsIndexConfig, unknown, IndexAc
 
         const indexSuffix = actionParams.indexOverride.replace(ALERT_HISTORY_PREFIX, '');
         if (indexSuffix.length === 0) {
-          errors.indexOverride.push(
-            i18n.translate(
-              'xpack.triggersActionsUI.components.builtinActionTypes.error.badIndexOverrideSuffix',
-              {
-                defaultMessage: 'Alert history index must contain valid suffix.',
-              }
-            )
-          );
+          errors.indexOverride.push(translations.HISTORY_NOT_VALID);
         }
       }
 
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 72af41277c29c..81cc88dd7e569 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
@@ -74,6 +74,8 @@ const IndexActionConnectorFields: React.FunctionComponent<
     indexPatternsFunction();
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, []);
+  const isIndexInvalid: boolean =
+    errors.index !== undefined && errors.index.length > 0 && index !== undefined;
 
   return (
     <>
@@ -95,7 +97,7 @@ const IndexActionConnectorFields: React.FunctionComponent<
             defaultMessage="Index"
           />
         }
-        isInvalid={errors.index.length > 0 && index !== undefined}
+        isInvalid={isIndexInvalid}
         error={errors.index}
         helpText={
           <>
@@ -118,7 +120,7 @@ const IndexActionConnectorFields: React.FunctionComponent<
           singleSelection={{ asPlainText: true }}
           async
           isLoading={isIndiciesLoading}
-          isInvalid={errors.index.length > 0 && index !== undefined}
+          isInvalid={isIndexInvalid}
           noSuggestions={!indexOptions.length}
           options={indexOptions}
           data-test-subj="connectorIndexesComboBox"
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 6973cdcc7a088..5d526e74564c5 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
@@ -57,6 +57,9 @@ export const IndexParamsFields = ({
 
   useEffect(() => {
     setDocumentToIndex(getDocumentToIndex(documents));
+    if (documents === null) {
+      setDocumentToIndex('{}');
+    }
   }, [documents]);
 
   useEffect(() => {
@@ -117,7 +120,11 @@ export const IndexParamsFields = ({
       <EuiFormRow
         fullWidth
         error={errors.indexOverride as string[]}
-        isInvalid={(errors.indexOverride as string[]) && errors.indexOverride.length > 0}
+        isInvalid={
+          errors.indexOverride !== undefined &&
+          (errors.indexOverride as string[]) &&
+          errors.indexOverride.length > 0
+        }
         label={i18n.translate(
           'xpack.triggersActionsUI.components.builtinActionTypes.indexAction.preconfiguredIndex',
           {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/translations.ts
new file mode 100644
index 0000000000000..b7dd6ac749909
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/es_index/translations.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 { i18n } from '@kbn/i18n';
+
+export const INDEX_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.indexAction.error.requiredIndexText',
+  {
+    defaultMessage: 'Index is required.',
+  }
+);
+
+export const DOCUMENT_NOT_VALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredDocumentJson',
+  {
+    defaultMessage: 'Document is required and should be a valid JSON object.',
+  }
+);
+
+export const HISTORY_NOT_VALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.badIndexOverrideSuffix',
+  {
+    defaultMessage: 'Alert history index must contain valid suffix.',
+  }
+);
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 ea1bcf82c314c..857582fa7cdaf 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
@@ -29,7 +29,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('jira connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         email: 'email',
@@ -45,7 +45,7 @@ describe('jira connector validation', () => {
       },
     } as JiraActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           apiUrl: [],
@@ -61,7 +61,7 @@ describe('jira connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid', () => {
+  test('connector validation fails when connector config is not valid', async () => {
     const actionConnector = ({
       secrets: {
         email: 'user',
@@ -72,7 +72,7 @@ describe('jira connector validation', () => {
       config: {},
     } as unknown) as JiraActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           apiUrl: ['URL is required.'],
@@ -90,22 +90,22 @@ describe('jira connector validation', () => {
 });
 
 describe('jira action params validation', () => {
-  test('action params validation succeeds when action params is valid', () => {
+  test('action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       subActionParams: { incident: { summary: 'some title {{test}}' }, comments: [] },
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: { 'subActionParams.incident.summary': [], 'subActionParams.incident.labels': [] },
     });
   });
 
-  test('params validation fails when body is not valid', () => {
+  test('params validation fails when body is not valid', async () => {
     const actionParams = {
       subActionParams: { incident: { summary: '' }, comments: [] },
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         'subActionParams.incident.summary': ['Summary is required.'],
         'subActionParams.incident.labels': [],
@@ -113,7 +113,7 @@ describe('jira action params validation', () => {
     });
   });
 
-  test('params validation fails when labels contain spaces', () => {
+  test('params validation fails when labels contain spaces', async () => {
     const actionParams = {
       subActionParams: {
         incident: { summary: 'some title', labels: ['label with spaces'] },
@@ -121,7 +121,7 @@ describe('jira action params validation', () => {
       },
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         'subActionParams.incident.summary': [],
         'subActionParams.incident.labels': ['Labels cannot contain spaces.'],
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx
index ff7fd026f8e31..8e3424a16c295 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira.tsx
@@ -6,18 +6,19 @@
  */
 
 import { lazy } from 'react';
+import { i18n } from '@kbn/i18n';
 import {
   GenericValidationResult,
   ActionTypeModel,
   ConnectorValidationResult,
 } from '../../../../types';
 import { JiraActionConnector, JiraConfig, JiraSecrets, JiraActionParams } from './types';
-import * as i18n from './translations';
 import { isValidUrl } from '../../../lib/value_validators';
 
-const validateConnector = (
+const validateConnector = async (
   action: JiraActionConnector
-): ConnectorValidationResult<JiraConfig, JiraSecrets> => {
+): Promise<ConnectorValidationResult<JiraConfig, JiraSecrets>> => {
+  const translations = await import('./translations');
   const configErrors = {
     apiUrl: new Array<string>(),
     projectKey: new Array<string>(),
@@ -33,41 +34,58 @@ const validateConnector = (
   };
 
   if (!action.config.apiUrl) {
-    configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_REQUIRED];
+    configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_REQUIRED];
   }
 
   if (action.config.apiUrl) {
     if (!isValidUrl(action.config.apiUrl)) {
-      configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_INVALID];
+      configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_INVALID];
     } else if (!isValidUrl(action.config.apiUrl, 'https:')) {
-      configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_REQUIRE_HTTPS];
+      configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_REQUIRE_HTTPS];
     }
   }
 
   if (!action.config.projectKey) {
-    configErrors.projectKey = [...configErrors.projectKey, i18n.JIRA_PROJECT_KEY_REQUIRED];
+    configErrors.projectKey = [...configErrors.projectKey, translations.JIRA_PROJECT_KEY_REQUIRED];
   }
 
   if (!action.secrets.email) {
-    secretsErrors.email = [...secretsErrors.email, i18n.JIRA_EMAIL_REQUIRED];
+    secretsErrors.email = [...secretsErrors.email, translations.JIRA_EMAIL_REQUIRED];
   }
 
   if (!action.secrets.apiToken) {
-    secretsErrors.apiToken = [...secretsErrors.apiToken, i18n.JIRA_API_TOKEN_REQUIRED];
+    secretsErrors.apiToken = [...secretsErrors.apiToken, translations.JIRA_API_TOKEN_REQUIRED];
   }
 
   return validationResult;
 };
 
+export const JIRA_DESC = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.jira.selectMessageText',
+  {
+    defaultMessage: 'Create an incident in Jira.',
+  }
+);
+
+export const JIRA_TITLE = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.jira.actionTypeTitle',
+  {
+    defaultMessage: 'Jira',
+  }
+);
+
 export function getActionType(): ActionTypeModel<JiraConfig, JiraSecrets, JiraActionParams> {
   return {
     id: '.jira',
     iconClass: lazy(() => import('./logo')),
-    selectMessage: i18n.JIRA_DESC,
-    actionTypeTitle: i18n.JIRA_TITLE,
+    selectMessage: JIRA_DESC,
+    actionTypeTitle: JIRA_TITLE,
     validateConnector,
     actionConnectorFields: lazy(() => import('./jira_connectors')),
-    validateParams: (actionParams: JiraActionParams): GenericValidationResult<unknown> => {
+    validateParams: async (
+      actionParams: JiraActionParams
+    ): Promise<GenericValidationResult<unknown>> => {
+      const translations = await import('./translations');
       const errors = {
         'subActionParams.incident.summary': new Array<string>(),
         'subActionParams.incident.labels': new Array<string>(),
@@ -80,13 +98,13 @@ export function getActionType(): ActionTypeModel<JiraConfig, JiraSecrets, JiraAc
         actionParams.subActionParams.incident &&
         !actionParams.subActionParams.incident.summary?.length
       ) {
-        errors['subActionParams.incident.summary'].push(i18n.SUMMARY_REQUIRED);
+        errors['subActionParams.incident.summary'].push(translations.SUMMARY_REQUIRED);
       }
 
       if (actionParams.subActionParams?.incident?.labels?.length) {
         // Jira do not allows empty spaces on labels. If the label includes a whitespace show an error.
         if (actionParams.subActionParams.incident.labels.some((label) => label.match(/\s/g)))
-          errors['subActionParams.incident.labels'].push(i18n.LABELS_WHITE_SPACES);
+          errors['subActionParams.incident.labels'].push(translations.LABELS_WHITE_SPACES);
       }
       return validationResult;
     },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.tsx
index f2753310d73ae..7aec0a405d0d5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_connectors.tsx
@@ -32,13 +32,17 @@ const JiraConnectorFields: React.FC<ActionConnectorFieldsProps<JiraActionConnect
 }) => {
   const { apiUrl, projectKey } = action.config;
 
-  const isApiUrlInvalid: boolean = errors.apiUrl.length > 0 && apiUrl !== undefined;
+  const isApiUrlInvalid: boolean =
+    apiUrl !== undefined && errors.apiUrl !== undefined && errors.apiUrl.length > 0;
 
   const { email, apiToken } = action.secrets;
 
-  const isProjectKeyInvalid: boolean = errors.projectKey.length > 0 && projectKey !== undefined;
-  const isEmailInvalid: boolean = errors.email.length > 0 && email !== undefined;
-  const isApiTokenInvalid: boolean = errors.apiToken.length > 0 && apiToken !== undefined;
+  const isProjectKeyInvalid: boolean =
+    projectKey !== undefined && errors.projectKey !== undefined && errors.projectKey.length > 0;
+  const isEmailInvalid: boolean =
+    email !== undefined && errors.email !== undefined && errors.email.length > 0;
+  const isApiTokenInvalid: boolean =
+    apiToken !== undefined && errors.apiToken !== undefined && errors.apiToken.length > 0;
 
   const handleOnChangeActionConfig = useCallback(
     (key: string, value: string) => editActionConfig(key, value),
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
index 11123a81440bb..5897de46f94df 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/jira_params.tsx
@@ -186,6 +186,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
 
   const areLabelsInvalid =
     errors['subActionParams.incident.labels'] != null &&
+    errors['subActionParams.incident.labels'] !== undefined &&
     errors['subActionParams.incident.labels'].length > 0 &&
     incident.labels !== undefined;
 
@@ -277,6 +278,7 @@ const JiraParamsFields: React.FunctionComponent<ActionParamsProps<JiraActionPara
             fullWidth
             error={errors['subActionParams.incident.summary']}
             isInvalid={
+              errors['subActionParams.incident.summary'] !== undefined &&
               errors['subActionParams.incident.summary'].length > 0 &&
               incident.summary !== undefined
             }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts
index 4577e55260d9d..5904eb05c31b6 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/jira/translations.ts
@@ -7,20 +7,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const JIRA_DESC = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.jira.selectMessageText',
-  {
-    defaultMessage: 'Create an incident in Jira.',
-  }
-);
-
-export const JIRA_TITLE = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.jira.actionTypeTitle',
-  {
-    defaultMessage: 'Jira',
-  }
-);
-
 export const API_URL_LABEL = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.jira.apiUrlTextFieldLabel',
   {
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 eae8690dbdd98..d96ca76aea3be 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
@@ -30,7 +30,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('pagerduty connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         routingKey: 'test',
@@ -43,7 +43,7 @@ describe('pagerduty connector validation', () => {
       },
     } as PagerDutyActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       secrets: {
         errors: {
           routingKey: [],
@@ -53,7 +53,7 @@ describe('pagerduty connector validation', () => {
 
     delete actionConnector.config.apiUrl;
     actionConnector.secrets.routingKey = 'test1';
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       secrets: {
         errors: {
           routingKey: [],
@@ -62,7 +62,7 @@ describe('pagerduty connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid', () => {
+  test('connector validation fails when connector config is not valid', async () => {
     const actionConnector = {
       secrets: {},
       id: 'test',
@@ -73,7 +73,7 @@ describe('pagerduty connector validation', () => {
       },
     } as PagerDutyActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       secrets: {
         errors: {
           routingKey: ['An integration key / routing key is required.'],
@@ -84,7 +84,7 @@ describe('pagerduty connector validation', () => {
 });
 
 describe('pagerduty action params validation', () => {
-  test('action params validation succeeds when action params is valid', () => {
+  test('action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       eventAction: 'trigger',
       dedupKey: 'test',
@@ -97,7 +97,7 @@ describe('pagerduty action params validation', () => {
       class: 'test class',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         dedupKey: [],
         summary: [],
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 310c5cae24566..80dd360d620b2 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
@@ -42,9 +42,10 @@ export function getActionType(): ActionTypeModel<
         defaultMessage: 'Send to PagerDuty',
       }
     ),
-    validateConnector: (
+    validateConnector: async (
       action: PagerDutyActionConnector
-    ): ConnectorValidationResult<PagerDutyConfig, PagerDutySecrets> => {
+    ): Promise<ConnectorValidationResult<PagerDutyConfig, PagerDutySecrets>> => {
+      const translations = await import('./translations');
       const secretsErrors = {
         routingKey: new Array<string>(),
       };
@@ -53,22 +54,16 @@ export function getActionType(): ActionTypeModel<
       };
 
       if (!action.secrets.routingKey) {
-        secretsErrors.routingKey.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredRoutingKeyText',
-            {
-              defaultMessage: 'An integration key / routing key is required.',
-            }
-          )
-        );
+        secretsErrors.routingKey.push(translations.INTEGRATION_KEY_REQUIRED);
       }
       return validationResult;
     },
-    validateParams: (
+    validateParams: async (
       actionParams: PagerDutyActionParams
-    ): GenericValidationResult<
-      Pick<PagerDutyActionParams, 'summary' | 'timestamp' | 'dedupKey'>
+    ): Promise<
+      GenericValidationResult<Pick<PagerDutyActionParams, 'summary' | 'timestamp' | 'dedupKey'>>
     > => {
+      const translations = await import('./translations');
       const errors = {
         summary: new Array<string>(),
         timestamp: new Array<string>(),
@@ -79,27 +74,13 @@ export function getActionType(): ActionTypeModel<
         !actionParams.dedupKey?.length &&
         (actionParams.eventAction === 'resolve' || actionParams.eventAction === 'acknowledge')
       ) {
-        errors.dedupKey.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredDedupKeyText',
-            {
-              defaultMessage: 'DedupKey is required when resolving or acknowledging an incident.',
-            }
-          )
-        );
+        errors.dedupKey.push(translations.DEDUP_KEY_REQUIRED);
       }
       if (
         actionParams.eventAction === EventActionOptions.TRIGGER &&
         !actionParams.summary?.length
       ) {
-        errors.summary.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredSummaryText',
-            {
-              defaultMessage: 'Summary is required.',
-            }
-          )
-        );
+        errors.summary.push(translations.SUMMARY_REQUIRED);
       }
       if (actionParams.timestamp && !hasMustacheTokens(actionParams.timestamp)) {
         if (isNaN(Date.parse(actionParams.timestamp))) {
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 7e9a5770c2158..3ac7832d0462e 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
@@ -20,6 +20,9 @@ const PagerDutyActionConnectorFields: React.FunctionComponent<
   const { docLinks } = useKibana().services;
   const { apiUrl } = action.config;
   const { routingKey } = action.secrets;
+  const isRoutingKeyInvalid: boolean =
+    routingKey !== undefined && errors.routingKey !== undefined && errors.routingKey.length > 0;
+
   return (
     <>
       <EuiFormRow
@@ -60,7 +63,7 @@ const PagerDutyActionConnectorFields: React.FunctionComponent<
           </EuiLink>
         }
         error={errors.routingKey}
-        isInvalid={errors.routingKey.length > 0 && routingKey !== undefined}
+        isInvalid={isRoutingKeyInvalid}
         label={i18n.translate(
           'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.routingKeyTextFieldLabel',
           {
@@ -80,7 +83,7 @@ const PagerDutyActionConnectorFields: React.FunctionComponent<
           )}
           <EuiFieldText
             fullWidth
-            isInvalid={errors.routingKey.length > 0 && routingKey !== undefined}
+            isInvalid={isRoutingKeyInvalid}
             name="routingKey"
             readOnly={readOnly}
             value={routingKey || ''}
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 4961a27fd0ac1..8605832b92ea5 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
@@ -101,6 +101,12 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
   const isDedupeKeyRequired = eventAction !== 'trigger';
   const isTriggerPagerDutyEvent = eventAction === 'trigger';
 
+  const isDedupKeyInvalid: boolean = errors.dedupKey !== undefined && errors.dedupKey.length > 0;
+  const isSummaryInvalid: boolean =
+    errors.summary !== undefined && errors.summary.length > 0 && summary !== undefined;
+  const isTimestampInvalid: boolean =
+    errors.timestamp !== undefined && errors.timestamp.length > 0 && timestamp !== undefined;
+
   return (
     <>
       <EuiFlexGroup>
@@ -132,7 +138,7 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
           <EuiFormRow
             fullWidth
             error={errors.dedupKey}
-            isInvalid={errors.dedupKey.length > 0}
+            isInvalid={isDedupKeyInvalid}
             label={
               isDedupeKeyRequired
                 ? i18n.translate(
@@ -166,7 +172,7 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
             id="pagerDutySummary"
             fullWidth
             error={errors.summary}
-            isInvalid={errors.summary.length > 0 && summary !== undefined}
+            isInvalid={isSummaryInvalid}
             label={i18n.translate(
               'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.summaryFieldLabel',
               {
@@ -180,7 +186,7 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
               messageVariables={messageVariables}
               paramsProperty={'summary'}
               inputTargetValue={summary}
-              errors={errors.summary as string[]}
+              errors={(errors.summary ?? []) as string[]}
             />
           </EuiFormRow>
           <EuiSpacer size="m" />
@@ -211,7 +217,7 @@ const PagerDutyParamsFields: React.FunctionComponent<ActionParamsProps<PagerDuty
               <EuiFormRow
                 fullWidth
                 error={errors.timestamp}
-                isInvalid={errors.timestamp.length > 0 && timestamp !== undefined}
+                isInvalid={isTimestampInvalid}
                 label={i18n.translate(
                   'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.timestampTextFieldLabel',
                   {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/translations.ts
new file mode 100644
index 0000000000000..a907b19a1d733
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/pagerduty/translations.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 { i18n } from '@kbn/i18n';
+
+export const SUMMARY_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredSummaryText',
+  {
+    defaultMessage: 'Summary is required.',
+  }
+);
+
+export const DEDUP_KEY_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredDedupKeyText',
+  {
+    defaultMessage: 'DedupKey is required when resolving or acknowledging an incident.',
+  }
+);
+
+export const INTEGRATION_KEY_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.pagerDutyAction.error.requiredRoutingKeyText',
+  {
+    defaultMessage: 'An integration key / routing key is required.',
+  }
+);
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 892ab97b8627f..93fb419f509bc 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
@@ -29,7 +29,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('resilient connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         apiKeyId: 'email',
@@ -45,7 +45,7 @@ describe('resilient connector validation', () => {
       },
     } as ResilientActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           apiUrl: [],
@@ -61,7 +61,7 @@ describe('resilient connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid', () => {
+  test('connector validation fails when connector config is not valid', async () => {
     const actionConnector = ({
       secrets: {
         apiKeyId: 'user',
@@ -72,7 +72,7 @@ describe('resilient connector validation', () => {
       config: {},
     } as unknown) as ResilientActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           apiUrl: ['URL is required.'],
@@ -90,22 +90,22 @@ describe('resilient connector validation', () => {
 });
 
 describe('resilient action params validation', () => {
-  test('action params validation succeeds when action params is valid', () => {
+  test('action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       subActionParams: { incident: { name: 'some title {{test}}' }, comments: [] },
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: { 'subActionParams.incident.name': [] },
     });
   });
 
-  test('params validation fails when body is not valid', () => {
+  test('params validation fails when body is not valid', async () => {
     const actionParams = {
       subActionParams: { incident: { name: '' }, comments: [] },
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         'subActionParams.incident.name': ['Name is required.'],
       },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx
index e7074b7506e7a..f20204af17697 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient.tsx
@@ -6,6 +6,7 @@
  */
 
 import { lazy } from 'react';
+import { i18n } from '@kbn/i18n';
 import {
   GenericValidationResult,
   ActionTypeModel,
@@ -17,12 +18,12 @@ import {
   ResilientSecrets,
   ResilientActionParams,
 } from './types';
-import * as i18n from './translations';
 import { isValidUrl } from '../../../lib/value_validators';
 
-const validateConnector = (
+const validateConnector = async (
   action: ResilientActionConnector
-): ConnectorValidationResult<ResilientConfig, ResilientSecrets> => {
+): Promise<ConnectorValidationResult<ResilientConfig, ResilientSecrets>> => {
+  const translations = await import('./translations');
   const configErrors = {
     apiUrl: new Array<string>(),
     orgId: new Array<string>(),
@@ -38,32 +39,49 @@ const validateConnector = (
   };
 
   if (!action.config.apiUrl) {
-    configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_REQUIRED];
+    configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_REQUIRED];
   }
 
   if (action.config.apiUrl) {
     if (!isValidUrl(action.config.apiUrl)) {
-      configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_INVALID];
+      configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_INVALID];
     } else if (!isValidUrl(action.config.apiUrl, 'https:')) {
-      configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_REQUIRE_HTTPS];
+      configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_REQUIRE_HTTPS];
     }
   }
 
   if (!action.config.orgId) {
-    configErrors.orgId = [...configErrors.orgId, i18n.ORG_ID_REQUIRED];
+    configErrors.orgId = [...configErrors.orgId, translations.ORG_ID_REQUIRED];
   }
 
   if (!action.secrets.apiKeyId) {
-    secretsErrors.apiKeyId = [...secretsErrors.apiKeyId, i18n.API_KEY_ID_REQUIRED];
+    secretsErrors.apiKeyId = [...secretsErrors.apiKeyId, translations.API_KEY_ID_REQUIRED];
   }
 
   if (!action.secrets.apiKeySecret) {
-    secretsErrors.apiKeySecret = [...secretsErrors.apiKeySecret, i18n.API_KEY_SECRET_REQUIRED];
+    secretsErrors.apiKeySecret = [
+      ...secretsErrors.apiKeySecret,
+      translations.API_KEY_SECRET_REQUIRED,
+    ];
   }
 
   return validationResult;
 };
 
+export const DESC = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.resilient.selectMessageText',
+  {
+    defaultMessage: 'Create an incident in IBM Resilient.',
+  }
+);
+
+export const TITLE = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.resilient.actionTypeTitle',
+  {
+    defaultMessage: 'Resilient',
+  }
+);
+
 export function getActionType(): ActionTypeModel<
   ResilientConfig,
   ResilientSecrets,
@@ -72,11 +90,14 @@ export function getActionType(): ActionTypeModel<
   return {
     id: '.resilient',
     iconClass: lazy(() => import('./logo')),
-    selectMessage: i18n.DESC,
-    actionTypeTitle: i18n.TITLE,
+    selectMessage: DESC,
+    actionTypeTitle: TITLE,
     validateConnector,
     actionConnectorFields: lazy(() => import('./resilient_connectors')),
-    validateParams: (actionParams: ResilientActionParams): GenericValidationResult<unknown> => {
+    validateParams: async (
+      actionParams: ResilientActionParams
+    ): Promise<GenericValidationResult<unknown>> => {
+      const translations = await import('./translations');
       const errors = {
         'subActionParams.incident.name': new Array<string>(),
       };
@@ -88,7 +109,7 @@ export function getActionType(): ActionTypeModel<
         actionParams.subActionParams.incident &&
         !actionParams.subActionParams.incident.name?.length
       ) {
-        errors['subActionParams.incident.name'].push(i18n.NAME_REQUIRED);
+        errors['subActionParams.incident.name'].push(translations.NAME_REQUIRED);
       }
       return validationResult;
     },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.tsx
index 6996062899c39..1270f19820f4c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_connectors.tsx
@@ -30,14 +30,19 @@ const ResilientConnectorFields: React.FC<ActionConnectorFieldsProps<ResilientAct
   readOnly,
 }) => {
   const { apiUrl, orgId } = action.config;
-  const isApiUrlInvalid: boolean = errors.apiUrl.length > 0 && apiUrl !== undefined;
+  const isApiUrlInvalid: boolean =
+    apiUrl !== undefined && errors.apiUrl !== undefined && errors.apiUrl.length > 0;
 
   const { apiKeyId, apiKeySecret } = action.secrets;
 
-  const isOrgIdInvalid: boolean = errors.orgId.length > 0 && orgId !== undefined;
-  const isApiKeyInvalid: boolean = errors.apiKeyId.length > 0 && apiKeyId !== undefined;
+  const isOrgIdInvalid: boolean =
+    orgId !== undefined && errors.orgId !== undefined && errors.orgId.length > 0;
+  const isApiKeyInvalid: boolean =
+    apiKeyId !== undefined && errors.apiKeyId !== undefined && errors.apiKeyId.length > 0;
   const isApiKeySecretInvalid: boolean =
-    errors.apiKeySecret.length > 0 && apiKeySecret !== undefined;
+    apiKeySecret !== undefined &&
+    errors.apiKeySecret !== undefined &&
+    errors.apiKeySecret.length > 0;
 
   const handleOnChangeActionConfig = useCallback(
     (key: string, value: string) => editActionConfig(key, value),
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
index 4642226d40222..54a138a2bc7cf 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/resilient_params.tsx
@@ -213,7 +213,9 @@ const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<Resilient
         fullWidth
         error={errors['subActionParams.incident.name']}
         isInvalid={
-          errors['subActionParams.incident.name'].length > 0 && incident.name !== undefined
+          errors['subActionParams.incident.name'] !== undefined &&
+          errors['subActionParams.incident.name'].length > 0 &&
+          incident.name !== undefined
         }
         label={i18n.translate(
           'xpack.triggersActionsUI.components.builtinActionTypes.resilient.nameFieldLabel',
@@ -226,7 +228,7 @@ const ResilientParamsFields: React.FunctionComponent<ActionParamsProps<Resilient
           messageVariables={messageVariables}
           paramsProperty={'name'}
           inputTargetValue={incident.name ?? undefined}
-          errors={errors['subActionParams.incident.name'] as string[]}
+          errors={(errors['subActionParams.incident.name'] ?? []) as string[]}
         />
       </EuiFormRow>
       <TextAreaWithMessageVariables
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts
index 310677da95bf0..6821c73b259f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/resilient/translations.ts
@@ -7,20 +7,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const DESC = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.resilient.selectMessageText',
-  {
-    defaultMessage: 'Create an incident in IBM Resilient.',
-  }
-);
-
-export const TITLE = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.resilient.actionTypeTitle',
-  {
-    defaultMessage: 'Resilient',
-  }
-);
-
 export const API_URL_LABEL = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.resilient.apiUrlTextFieldLabel',
   {
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 216287dcce22b..d2da049f7de6c 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
@@ -29,7 +29,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('server-log connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector: UserConfiguredActionConnector<{}, {}> = {
       secrets: {},
       id: 'test',
@@ -39,7 +39,7 @@ describe('server-log connector validation', () => {
       isPreconfigured: false,
     };
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -51,23 +51,23 @@ describe('server-log connector validation', () => {
 });
 
 describe('action params validation', () => {
-  test('action params validation succeeds when action params is valid', () => {
+  test('action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       message: 'test message',
       level: 'trace',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: { message: [] },
     });
   });
 
-  test('params validation fails when message is not valid', () => {
+  test('params validation fails when message is not valid', async () => {
     const actionParams = {
       message: '',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         message: ['Message is required.'],
       },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.tsx
index 4550d2d65b9df..066c5c0a2f385 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/server_log/server_log.tsx
@@ -30,12 +30,12 @@ export function getActionType(): ActionTypeModel<unknown, unknown, ServerLogActi
         defaultMessage: 'Send to Server log',
       }
     ),
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return { config: { errors: {} }, secrets: { errors: {} } };
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({ config: { errors: {} }, secrets: { errors: {} } });
     },
     validateParams: (
       actionParams: ServerLogActionParams
-    ): GenericValidationResult<Pick<ServerLogActionParams, 'message'>> => {
+    ): Promise<GenericValidationResult<Pick<ServerLogActionParams, 'message'>>> => {
       const errors = {
         message: new Array<string>(),
       };
@@ -50,7 +50,7 @@ export function getActionType(): ActionTypeModel<unknown, unknown, ServerLogActi
           )
         );
       }
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
     actionParamsFields: lazy(() => import('./server_log_params')),
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 02ecab47ae49a..e25e8120b1650 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
@@ -30,7 +30,7 @@ describe('actionTypeRegistry.get() works', () => {
 
 describe('servicenow connector validation', () => {
   [SERVICENOW_ITSM_ACTION_TYPE_ID, SERVICENOW_SIR_ACTION_TYPE_ID].forEach((id) => {
-    test(`${id}: connector validation succeeds when connector config is valid`, () => {
+    test(`${id}: connector validation succeeds when connector config is valid`, async () => {
       const actionTypeModel = actionTypeRegistry.get(id);
       const actionConnector = {
         secrets: {
@@ -46,7 +46,7 @@ describe('servicenow connector validation', () => {
         },
       } as ServiceNowActionConnector;
 
-      expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+      expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
         config: {
           errors: {
             apiUrl: [],
@@ -61,7 +61,7 @@ describe('servicenow connector validation', () => {
       });
     });
 
-    test(`${id}: connector validation fails when connector config is not valid`, () => {
+    test(`${id}: connector validation fails when connector config is not valid`, async () => {
       const actionTypeModel = actionTypeRegistry.get(id);
       const actionConnector = ({
         secrets: {
@@ -73,7 +73,7 @@ describe('servicenow connector validation', () => {
         config: {},
       } as unknown) as ServiceNowActionConnector;
 
-      expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+      expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
         config: {
           errors: {
             apiUrl: ['URL is required.'],
@@ -92,24 +92,24 @@ describe('servicenow connector validation', () => {
 
 describe('servicenow action params validation', () => {
   [SERVICENOW_ITSM_ACTION_TYPE_ID, SERVICENOW_SIR_ACTION_TYPE_ID].forEach((id) => {
-    test(`${id}: action params validation succeeds when action params is valid`, () => {
+    test(`${id}: action params validation succeeds when action params is valid`, async () => {
       const actionTypeModel = actionTypeRegistry.get(id);
       const actionParams = {
         subActionParams: { incident: { short_description: 'some title {{test}}' }, comments: [] },
       };
 
-      expect(actionTypeModel.validateParams(actionParams)).toEqual({
+      expect(await actionTypeModel.validateParams(actionParams)).toEqual({
         errors: { ['subActionParams.incident.short_description']: [] },
       });
     });
 
-    test(`${id}: params validation fails when body is not valid`, () => {
+    test(`${id}: params validation fails when body is not valid`, async () => {
       const actionTypeModel = actionTypeRegistry.get(id);
       const actionParams = {
         subActionParams: { incident: { short_description: '' }, comments: [] },
       };
 
-      expect(actionTypeModel.validateParams(actionParams)).toEqual({
+      expect(await actionTypeModel.validateParams(actionParams)).toEqual({
         errors: {
           ['subActionParams.incident.short_description']: ['Short description is required.'],
         },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
index a6cc116d3d7b4..24e2a87d42357 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow.tsx
@@ -6,6 +6,7 @@
  */
 
 import { lazy } from 'react';
+import { i18n } from '@kbn/i18n';
 import {
   GenericValidationResult,
   ActionTypeModel,
@@ -18,12 +19,12 @@ import {
   ServiceNowITSMActionParams,
   ServiceNowSIRActionParams,
 } from './types';
-import * as i18n from './translations';
 import { isValidUrl } from '../../../lib/value_validators';
 
-const validateConnector = (
+const validateConnector = async (
   action: ServiceNowActionConnector
-): ConnectorValidationResult<ServiceNowConfig, ServiceNowSecrets> => {
+): Promise<ConnectorValidationResult<ServiceNowConfig, ServiceNowSecrets>> => {
+  const translations = await import('./translations');
   const configErrors = {
     apiUrl: new Array<string>(),
   };
@@ -38,28 +39,56 @@ const validateConnector = (
   };
 
   if (!action.config.apiUrl) {
-    configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_REQUIRED];
+    configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_REQUIRED];
   }
 
   if (action.config.apiUrl) {
     if (!isValidUrl(action.config.apiUrl)) {
-      configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_INVALID];
+      configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_INVALID];
     } else if (!isValidUrl(action.config.apiUrl, 'https:')) {
-      configErrors.apiUrl = [...configErrors.apiUrl, i18n.API_URL_REQUIRE_HTTPS];
+      configErrors.apiUrl = [...configErrors.apiUrl, translations.API_URL_REQUIRE_HTTPS];
     }
   }
 
   if (!action.secrets.username) {
-    secretsErrors.username = [...secretsErrors.username, i18n.USERNAME_REQUIRED];
+    secretsErrors.username = [...secretsErrors.username, translations.USERNAME_REQUIRED];
   }
 
   if (!action.secrets.password) {
-    secretsErrors.password = [...secretsErrors.password, i18n.PASSWORD_REQUIRED];
+    secretsErrors.password = [...secretsErrors.password, translations.PASSWORD_REQUIRED];
   }
 
   return validationResult;
 };
 
+export const SERVICENOW_ITSM_DESC = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITSM.selectMessageText',
+  {
+    defaultMessage: 'Create an incident in ServiceNow ITSM.',
+  }
+);
+
+export const SERVICENOW_SIR_DESC = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowSIR.selectMessageText',
+  {
+    defaultMessage: 'Create an incident in ServiceNow SecOps.',
+  }
+);
+
+export const SERVICENOW_ITSM_TITLE = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITSM.actionTypeTitle',
+  {
+    defaultMessage: 'ServiceNow ITSM',
+  }
+);
+
+export const SERVICENOW_SIR_TITLE = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowSIR.actionTypeTitle',
+  {
+    defaultMessage: 'ServiceNow SecOps',
+  }
+);
+
 export function getServiceNowITSMActionType(): ActionTypeModel<
   ServiceNowConfig,
   ServiceNowSecrets,
@@ -68,13 +97,14 @@ export function getServiceNowITSMActionType(): ActionTypeModel<
   return {
     id: '.servicenow',
     iconClass: lazy(() => import('./logo')),
-    selectMessage: i18n.SERVICENOW_ITSM_DESC,
-    actionTypeTitle: i18n.SERVICENOW_ITSM_TITLE,
+    selectMessage: SERVICENOW_ITSM_DESC,
+    actionTypeTitle: SERVICENOW_ITSM_TITLE,
     validateConnector,
     actionConnectorFields: lazy(() => import('./servicenow_connectors')),
-    validateParams: (
+    validateParams: async (
       actionParams: ServiceNowITSMActionParams
-    ): GenericValidationResult<unknown> => {
+    ): Promise<GenericValidationResult<unknown>> => {
+      const translations = await import('./translations');
       const errors = {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         'subActionParams.incident.short_description': new Array<string>(),
@@ -87,7 +117,7 @@ export function getServiceNowITSMActionType(): ActionTypeModel<
         actionParams.subActionParams.incident &&
         !actionParams.subActionParams.incident.short_description?.length
       ) {
-        errors['subActionParams.incident.short_description'].push(i18n.TITLE_REQUIRED);
+        errors['subActionParams.incident.short_description'].push(translations.TITLE_REQUIRED);
       }
       return validationResult;
     },
@@ -103,11 +133,14 @@ export function getServiceNowSIRActionType(): ActionTypeModel<
   return {
     id: '.servicenow-sir',
     iconClass: lazy(() => import('./logo')),
-    selectMessage: i18n.SERVICENOW_SIR_DESC,
-    actionTypeTitle: i18n.SERVICENOW_SIR_TITLE,
+    selectMessage: SERVICENOW_SIR_DESC,
+    actionTypeTitle: SERVICENOW_SIR_TITLE,
     validateConnector,
     actionConnectorFields: lazy(() => import('./servicenow_connectors')),
-    validateParams: (actionParams: ServiceNowSIRActionParams): GenericValidationResult<unknown> => {
+    validateParams: async (
+      actionParams: ServiceNowSIRActionParams
+    ): Promise<GenericValidationResult<unknown>> => {
+      const translations = await import('./translations');
       const errors = {
         // eslint-disable-next-line @typescript-eslint/naming-convention
         'subActionParams.incident.short_description': new Array<string>(),
@@ -120,7 +153,7 @@ export function getServiceNowSIRActionType(): ActionTypeModel<
         actionParams.subActionParams.incident &&
         !actionParams.subActionParams.incident.short_description?.length
       ) {
-        errors['subActionParams.incident.short_description'].push(i18n.TITLE_REQUIRED);
+        errors['subActionParams.incident.short_description'].push(translations.TITLE_REQUIRED);
       }
       return validationResult;
     },
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 e7b2c4bac5914..c9aafc58f3ede 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
@@ -32,12 +32,15 @@ const ServiceNowConnectorFields: React.FC<
   const { docLinks } = useKibana().services;
   const { apiUrl } = action.config;
 
-  const isApiUrlInvalid: boolean = errors.apiUrl.length > 0 && apiUrl !== undefined;
+  const isApiUrlInvalid: boolean =
+    errors.apiUrl !== undefined && errors.apiUrl.length > 0 && apiUrl !== undefined;
 
   const { username, password } = action.secrets;
 
-  const isUsernameInvalid: boolean = errors.username.length > 0 && username !== undefined;
-  const isPasswordInvalid: boolean = errors.password.length > 0 && password !== undefined;
+  const isUsernameInvalid: boolean =
+    errors.username !== undefined && errors.username.length > 0 && username !== undefined;
+  const isPasswordInvalid: boolean =
+    errors.password !== undefined && errors.password.length > 0 && password !== undefined;
 
   const handleOnChangeActionConfig = useCallback(
     (key: string, value: string) => editActionConfig(key, value),
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx
index dbd6fec3dad19..f0fc5ed42d24c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_itsm_params.tsx
@@ -240,6 +240,7 @@ const ServiceNowParamsFields: React.FunctionComponent<
         fullWidth
         error={errors['subActionParams.incident.short_description']}
         isInvalid={
+          errors['subActionParams.incident.short_description'] !== undefined &&
           errors['subActionParams.incident.short_description'].length > 0 &&
           incident.short_description !== undefined
         }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx
index be6756b1c1049..a991ee29c85f8 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/servicenow_sir_params.tsx
@@ -151,6 +151,7 @@ const ServiceNowSIRParamsFields: React.FunctionComponent<
         fullWidth
         error={errors['subActionParams.incident.short_description']}
         isInvalid={
+          errors['subActionParams.incident.short_description'] !== undefined &&
           errors['subActionParams.incident.short_description'].length > 0 &&
           incident.short_description !== undefined
         }
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts
index 288b6e629112d..ea646b896f5e9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/servicenow/translations.ts
@@ -7,34 +7,6 @@
 
 import { i18n } from '@kbn/i18n';
 
-export const SERVICENOW_ITSM_DESC = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITSM.selectMessageText',
-  {
-    defaultMessage: 'Create an incident in ServiceNow ITSM.',
-  }
-);
-
-export const SERVICENOW_SIR_DESC = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowSIR.selectMessageText',
-  {
-    defaultMessage: 'Create an incident in ServiceNow SecOps.',
-  }
-);
-
-export const SERVICENOW_ITSM_TITLE = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowITSM.actionTypeTitle',
-  {
-    defaultMessage: 'ServiceNow ITSM',
-  }
-);
-
-export const SERVICENOW_SIR_TITLE = i18n.translate(
-  'xpack.triggersActionsUI.components.builtinActionTypes.serviceNowSIR.actionTypeTitle',
-  {
-    defaultMessage: 'ServiceNow SecOps',
-  }
-);
-
 export const API_URL_LABEL = i18n.translate(
   'xpack.triggersActionsUI.components.builtinActionTypes.servicenow.apiUrlTextFieldLabel',
   {
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 eabb63567ea86..dbdc123e0098f 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
@@ -30,7 +30,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('slack connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         webhookUrl: 'https:\\test',
@@ -41,7 +41,7 @@ describe('slack connector validation', () => {
       config: {},
     } as SlackActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -53,7 +53,7 @@ describe('slack connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid - no webhook url', () => {
+  test('connector validation fails when connector config is not valid - no webhook url', async () => {
     const actionConnector = {
       secrets: {},
       id: 'test',
@@ -62,7 +62,7 @@ describe('slack connector validation', () => {
       config: {},
     } as SlackActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -74,7 +74,7 @@ describe('slack connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid - invalid webhook protocol', () => {
+  test('connector validation fails when connector config is not valid - invalid webhook protocol', async () => {
     const actionConnector = {
       secrets: {
         webhookUrl: 'http:\\test',
@@ -85,7 +85,7 @@ describe('slack connector validation', () => {
       config: {},
     } as SlackActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -97,7 +97,7 @@ describe('slack connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid - invalid webhook url', () => {
+  test('connector validation fails when connector config is not valid - invalid webhook url', async () => {
     const actionConnector = {
       secrets: {
         webhookUrl: 'h',
@@ -108,7 +108,7 @@ describe('slack connector validation', () => {
       config: {},
     } as SlackActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -122,22 +122,22 @@ describe('slack connector validation', () => {
 });
 
 describe('slack action params validation', () => {
-  test('if action params validation succeeds when action params is valid', () => {
+  test('if action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       message: 'message {test}',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: { message: [] },
     });
   });
 
-  test('params validation fails when message is not valid', () => {
+  test('params validation fails when message is not valid', async () => {
     const actionParams = {
       message: '',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         message: ['Message is required.'],
       },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.tsx
index 30e60a6ac0156..d3df034a90bf2 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack.tsx
@@ -31,61 +31,35 @@ export function getActionType(): ActionTypeModel<unknown, SlackSecrets, SlackAct
         defaultMessage: 'Send to Slack',
       }
     ),
-    validateConnector: (
+    validateConnector: async (
       action: SlackActionConnector
-    ): ConnectorValidationResult<unknown, SlackSecrets> => {
+    ): Promise<ConnectorValidationResult<unknown, SlackSecrets>> => {
+      const translations = await import('./translations');
       const secretsErrors = {
         webhookUrl: new Array<string>(),
       };
       const validationResult = { config: { errors: {} }, secrets: { errors: secretsErrors } };
       if (!action.secrets.webhookUrl) {
-        secretsErrors.webhookUrl.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.requiredWebhookUrlText',
-            {
-              defaultMessage: 'Webhook URL is required.',
-            }
-          )
-        );
+        secretsErrors.webhookUrl.push(translations.WEBHOOK_URL_REQUIRED);
       } else if (action.secrets.webhookUrl) {
         if (!isValidUrl(action.secrets.webhookUrl)) {
-          secretsErrors.webhookUrl.push(
-            i18n.translate(
-              'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.invalidWebhookUrlText',
-              {
-                defaultMessage: 'Webhook URL is invalid.',
-              }
-            )
-          );
+          secretsErrors.webhookUrl.push(translations.WEBHOOK_URL_INVALID);
         } else if (!isValidUrl(action.secrets.webhookUrl, 'https:')) {
-          secretsErrors.webhookUrl.push(
-            i18n.translate(
-              'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.requireHttpsWebhookUrlText',
-              {
-                defaultMessage: 'Webhook URL must start with https://.',
-              }
-            )
-          );
+          secretsErrors.webhookUrl.push(translations.WEBHOOK_URL_HTTP_INVALID);
         }
       }
       return validationResult;
     },
-    validateParams: (
+    validateParams: async (
       actionParams: SlackActionParams
-    ): GenericValidationResult<SlackActionParams> => {
+    ): Promise<GenericValidationResult<SlackActionParams>> => {
+      const translations = await import('./translations');
       const errors = {
         message: new Array<string>(),
       };
       const validationResult = { errors };
       if (!actionParams.message?.length) {
-        errors.message.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredSlackMessageText',
-            {
-              defaultMessage: 'Message is required.',
-            }
-          )
-        );
+        errors.message.push(translations.MESSAGE_REQUIRED);
       }
       return validationResult;
     },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_connectors.tsx
index ce6cda1294adc..e87b00dca9343 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_connectors.tsx
@@ -19,6 +19,8 @@ const SlackActionFields: React.FunctionComponent<
 > = ({ action, editActionSecrets, errors, readOnly }) => {
   const { docLinks } = useKibana().services;
   const { webhookUrl } = action.secrets;
+  const isWebhookUrlInvalid: boolean =
+    errors.webhookUrl !== undefined && errors.webhookUrl.length > 0 && webhookUrl !== undefined;
 
   return (
     <>
@@ -34,7 +36,7 @@ const SlackActionFields: React.FunctionComponent<
           </EuiLink>
         }
         error={errors.webhookUrl}
-        isInvalid={errors.webhookUrl.length > 0 && webhookUrl !== undefined}
+        isInvalid={isWebhookUrlInvalid}
         label={i18n.translate(
           'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.webhookUrlTextFieldLabel',
           {
@@ -54,7 +56,7 @@ const SlackActionFields: React.FunctionComponent<
           )}
           <EuiFieldText
             fullWidth
-            isInvalid={errors.webhookUrl.length > 0 && webhookUrl !== undefined}
+            isInvalid={isWebhookUrlInvalid}
             name="webhookUrl"
             readOnly={readOnly}
             value={webhookUrl || ''}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx
index 3aa7fd8227496..59e10277cfe08 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/slack_params.tsx
@@ -49,7 +49,7 @@ const SlackParamsFields: React.FunctionComponent<ActionParamsProps<SlackActionPa
           defaultMessage: 'Message',
         }
       )}
-      errors={errors.message as string[]}
+      errors={(errors.message ?? []) as string[]}
     />
   );
 };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/translations.ts
new file mode 100644
index 0000000000000..bd1fd8ea194f6
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/slack/translations.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const WEBHOOK_URL_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.requiredWebhookUrlText',
+  {
+    defaultMessage: 'Webhook URL is required.',
+  }
+);
+
+export const WEBHOOK_URL_INVALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.invalidWebhookUrlText',
+  {
+    defaultMessage: 'Webhook URL is invalid.',
+  }
+);
+
+export const WEBHOOK_URL_HTTP_INVALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.slackAction.error.requireHttpsWebhookUrlText',
+  {
+    defaultMessage: 'Webhook URL must start with https://.',
+  }
+);
+
+export const MESSAGE_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredSlackMessageText',
+  {
+    defaultMessage: 'Message is required.',
+  }
+);
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 62be20a9bad90..641c46af6bfc1 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
@@ -29,7 +29,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('teams connector validation', () => {
-  test('connector validation succeeds when connector config is valid', () => {
+  test('connector validation succeeds when connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         webhookUrl: 'https:\\test',
@@ -40,7 +40,7 @@ describe('teams connector validation', () => {
       config: {},
     } as TeamsActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -52,7 +52,7 @@ describe('teams connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid - empty webhook url', () => {
+  test('connector validation fails when connector config is not valid - empty webhook url', async () => {
     const actionConnector = {
       secrets: {},
       id: 'test',
@@ -61,7 +61,7 @@ describe('teams connector validation', () => {
       config: {},
     } as TeamsActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -73,7 +73,7 @@ describe('teams connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid - invalid webhook url', () => {
+  test('connector validation fails when connector config is not valid - invalid webhook url', async () => {
     const actionConnector = {
       secrets: {
         webhookUrl: 'h',
@@ -84,7 +84,7 @@ describe('teams connector validation', () => {
       config: {},
     } as TeamsActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -96,7 +96,7 @@ describe('teams connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid - invalid webhook url protocol', () => {
+  test('connector validation fails when connector config is not valid - invalid webhook url protocol', async () => {
     const actionConnector = {
       secrets: {
         webhookUrl: 'http://insecure',
@@ -107,7 +107,7 @@ describe('teams connector validation', () => {
       config: {},
     } as TeamsActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {},
       },
@@ -121,22 +121,22 @@ describe('teams connector validation', () => {
 });
 
 describe('teams action params validation', () => {
-  test('if action params validation succeeds when action params is valid', () => {
+  test('if action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       message: 'message {test}',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: { message: [] },
     });
   });
 
-  test('params validation fails when message is not valid', () => {
+  test('params validation fails when message is not valid', async () => {
     const actionParams = {
       message: '',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         message: ['Message is required.'],
       },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.tsx
index e8c7be7311c1c..c48b4f950855d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams.tsx
@@ -31,61 +31,35 @@ export function getActionType(): ActionTypeModel<unknown, TeamsSecrets, TeamsAct
         defaultMessage: 'Send a message to a Microsoft Teams channel.',
       }
     ),
-    validateConnector: (
+    validateConnector: async (
       action: TeamsActionConnector
-    ): ConnectorValidationResult<unknown, TeamsSecrets> => {
+    ): Promise<ConnectorValidationResult<unknown, TeamsSecrets>> => {
+      const translations = await import('./translations');
       const secretsErrors = {
         webhookUrl: new Array<string>(),
       };
       const validationResult = { config: { errors: {} }, secrets: { errors: secretsErrors } };
       if (!action.secrets.webhookUrl) {
-        secretsErrors.webhookUrl.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.requiredWebhookUrlText',
-            {
-              defaultMessage: 'Webhook URL is required.',
-            }
-          )
-        );
+        secretsErrors.webhookUrl.push(translations.WEBHOOK_URL_REQUIRED);
       } else if (action.secrets.webhookUrl) {
         if (!isValidUrl(action.secrets.webhookUrl)) {
-          secretsErrors.webhookUrl.push(
-            i18n.translate(
-              'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.invalidWebhookUrlText',
-              {
-                defaultMessage: 'Webhook URL is invalid.',
-              }
-            )
-          );
+          secretsErrors.webhookUrl.push(translations.WEBHOOK_URL_INVALID);
         } else if (!isValidUrl(action.secrets.webhookUrl, 'https:')) {
-          secretsErrors.webhookUrl.push(
-            i18n.translate(
-              'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.requireHttpsWebhookUrlText',
-              {
-                defaultMessage: 'Webhook URL must start with https://.',
-              }
-            )
-          );
+          secretsErrors.webhookUrl.push(translations.WEBHOOK_URL_HTTP_INVALID);
         }
       }
       return validationResult;
     },
-    validateParams: (
+    validateParams: async (
       actionParams: TeamsActionParams
-    ): GenericValidationResult<TeamsActionParams> => {
+    ): Promise<GenericValidationResult<TeamsActionParams>> => {
+      const translations = await import('./translations');
       const errors = {
         message: new Array<string>(),
       };
       const validationResult = { errors };
       if (!actionParams.message?.length) {
-        errors.message.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.requiredMessageText',
-            {
-              defaultMessage: 'Message is required.',
-            }
-          )
-        );
+        errors.message.push(translations.MESSAGE_REQUIRED);
       }
       return validationResult;
     },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_connectors.tsx
index 454b938692225..8de1c68926f14 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_connectors.tsx
@@ -20,6 +20,9 @@ const TeamsActionFields: React.FunctionComponent<
   const { webhookUrl } = action.secrets;
   const { docLinks } = useKibana().services;
 
+  const isWebhookUrlInvalid: boolean =
+    errors.webhookUrl !== undefined && errors.webhookUrl.length > 0 && webhookUrl !== undefined;
+
   return (
     <>
       <EuiFormRow
@@ -34,7 +37,7 @@ const TeamsActionFields: React.FunctionComponent<
           </EuiLink>
         }
         error={errors.webhookUrl}
-        isInvalid={errors.webhookUrl.length > 0 && webhookUrl !== undefined}
+        isInvalid={isWebhookUrlInvalid}
         label={i18n.translate(
           'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.webhookUrlTextFieldLabel',
           {
@@ -54,7 +57,7 @@ const TeamsActionFields: React.FunctionComponent<
           )}
           <EuiFieldText
             fullWidth
-            isInvalid={errors.webhookUrl.length > 0 && webhookUrl !== undefined}
+            isInvalid={isWebhookUrlInvalid}
             name="webhookUrl"
             readOnly={readOnly}
             value={webhookUrl || ''}
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_params.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_params.tsx
index c0a20e214b4e1..0aea576c10b31 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_params.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/teams_params.tsx
@@ -40,7 +40,7 @@ const TeamsParamsFields: React.FunctionComponent<ActionParamsProps<TeamsActionPa
           defaultMessage: 'Message',
         }
       )}
-      errors={errors.message as string[]}
+      errors={(errors.message ?? []) as string[]}
     />
   );
 };
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/translations.ts
new file mode 100644
index 0000000000000..790a3b3bac32f
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/teams/translations.ts
@@ -0,0 +1,36 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { i18n } from '@kbn/i18n';
+
+export const WEBHOOK_URL_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.requiredWebhookUrlText',
+  {
+    defaultMessage: 'Webhook URL is required.',
+  }
+);
+
+export const WEBHOOK_URL_INVALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.invalidWebhookUrlText',
+  {
+    defaultMessage: 'Webhook URL is invalid.',
+  }
+);
+
+export const WEBHOOK_URL_HTTP_INVALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.requireHttpsWebhookUrlText',
+  {
+    defaultMessage: 'Webhook URL must start with https://.',
+  }
+);
+
+export const MESSAGE_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.teamsAction.error.requiredMessageText',
+  {
+    defaultMessage: 'Message is required.',
+  }
+);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/translations.ts b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/translations.ts
new file mode 100644
index 0000000000000..3550121e81694
--- /dev/null
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/translations.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 { i18n } from '@kbn/i18n';
+
+export const URL_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.error.requiredUrlText',
+  {
+    defaultMessage: 'URL is required.',
+  }
+);
+
+export const URL_INVALID = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.error.invalidUrlTextField',
+  {
+    defaultMessage: 'URL is invalid.',
+  }
+);
+
+export const METHOD_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredMethodText',
+  {
+    defaultMessage: 'Method is required.',
+  }
+);
+
+export const USERNAME_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredAuthUserNameText',
+  {
+    defaultMessage: 'Username is required.',
+  }
+);
+
+export const PASSWORD_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredAuthPasswordText',
+  {
+    defaultMessage: 'Password is required.',
+  }
+);
+
+export const PASSWORD_REQUIRED_FOR_USER = i18n.translate(
+  'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredPasswordText',
+  {
+    defaultMessage: 'Password is required when username is used.',
+  }
+);
+
+export const USERNAME_REQUIRED_FOR_PASSWORD = i18n.translate(
+  'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredUserText',
+  {
+    defaultMessage: 'Username is required when password is used.',
+  }
+);
+
+export const BODY_REQUIRED = i18n.translate(
+  'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredWebhookBodyText',
+  {
+    defaultMessage: 'Body is required.',
+  }
+);
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 8399316044f33..3e42e7965c5bd 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
@@ -30,7 +30,7 @@ describe('actionTypeRegistry.get() works', () => {
 });
 
 describe('webhook connector validation', () => {
-  test('connector validation succeeds when hasAuth is true and connector config is valid', () => {
+  test('connector validation succeeds when hasAuth is true and connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         user: 'user',
@@ -48,7 +48,7 @@ describe('webhook connector validation', () => {
       },
     } as WebhookActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           url: [],
@@ -64,7 +64,7 @@ describe('webhook connector validation', () => {
     });
   });
 
-  test('connector validation succeeds when hasAuth is false and connector config is valid', () => {
+  test('connector validation succeeds when hasAuth is false and connector config is valid', async () => {
     const actionConnector = {
       secrets: {
         user: '',
@@ -82,7 +82,7 @@ describe('webhook connector validation', () => {
       },
     } as WebhookActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           url: [],
@@ -98,7 +98,7 @@ describe('webhook connector validation', () => {
     });
   });
 
-  test('connector validation fails when connector config is not valid', () => {
+  test('connector validation fails when connector config is not valid', async () => {
     const actionConnector = {
       secrets: {
         user: 'user',
@@ -112,7 +112,7 @@ describe('webhook connector validation', () => {
       },
     } as WebhookActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           url: ['URL is required.'],
@@ -128,7 +128,7 @@ describe('webhook connector validation', () => {
     });
   });
 
-  test('connector validation fails when url in config is not valid', () => {
+  test('connector validation fails when url in config is not valid', async () => {
     const actionConnector = {
       secrets: {
         user: 'user',
@@ -144,7 +144,7 @@ describe('webhook connector validation', () => {
       },
     } as WebhookActionConnector;
 
-    expect(actionTypeModel.validateConnector(actionConnector)).toEqual({
+    expect(await actionTypeModel.validateConnector(actionConnector)).toEqual({
       config: {
         errors: {
           url: ['URL is invalid.'],
@@ -162,22 +162,22 @@ describe('webhook connector validation', () => {
 });
 
 describe('webhook action params validation', () => {
-  test('action params validation succeeds when action params is valid', () => {
+  test('action params validation succeeds when action params is valid', async () => {
     const actionParams = {
       body: 'message {test}',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: { body: [] },
     });
   });
 
-  test('params validation fails when body is not valid', () => {
+  test('params validation fails when body is not valid', async () => {
     const actionParams = {
       body: '',
     };
 
-    expect(actionTypeModel.validateParams(actionParams)).toEqual({
+    expect(await actionTypeModel.validateParams(actionParams)).toEqual({
       errors: {
         body: ['Body is required.'],
       },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx
index 3ba801b83c46c..a668f531a6d4c 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook.tsx
@@ -40,9 +40,12 @@ export function getActionType(): ActionTypeModel<
         defaultMessage: 'Webhook data',
       }
     ),
-    validateConnector: (
+    validateConnector: async (
       action: WebhookActionConnector
-    ): ConnectorValidationResult<Pick<WebhookConfig, 'url' | 'method'>, WebhookSecrets> => {
+    ): Promise<
+      ConnectorValidationResult<Pick<WebhookConfig, 'url' | 'method'>, WebhookSecrets>
+    > => {
+      const translations = await import('./translations');
       const configErrors = {
         url: new Array<string>(),
         method: new Array<string>(),
@@ -56,95 +59,39 @@ export function getActionType(): ActionTypeModel<
         secrets: { errors: secretsErrors },
       };
       if (!action.config.url) {
-        configErrors.url.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.error.requiredUrlText',
-            {
-              defaultMessage: 'URL is required.',
-            }
-          )
-        );
+        configErrors.url.push(translations.URL_REQUIRED);
       }
       if (action.config.url && !isValidUrl(action.config.url)) {
-        configErrors.url = [
-          ...configErrors.url,
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.error.invalidUrlTextField',
-            {
-              defaultMessage: 'URL is invalid.',
-            }
-          ),
-        ];
+        configErrors.url = [...configErrors.url, translations.URL_INVALID];
       }
       if (!action.config.method) {
-        configErrors.method.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredMethodText',
-            {
-              defaultMessage: 'Method is required.',
-            }
-          )
-        );
+        configErrors.method.push(translations.METHOD_REQUIRED);
       }
       if (action.config.hasAuth && !action.secrets.user && !action.secrets.password) {
-        secretsErrors.user.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredAuthUserNameText',
-            {
-              defaultMessage: 'Username is required.',
-            }
-          )
-        );
+        secretsErrors.user.push(translations.USERNAME_REQUIRED);
       }
       if (action.config.hasAuth && !action.secrets.user && !action.secrets.password) {
-        secretsErrors.password.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredAuthPasswordText',
-            {
-              defaultMessage: 'Password is required.',
-            }
-          )
-        );
+        secretsErrors.password.push(translations.PASSWORD_REQUIRED);
       }
       if (action.secrets.user && !action.secrets.password) {
-        secretsErrors.password.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredPasswordText',
-            {
-              defaultMessage: 'Password is required when username is used.',
-            }
-          )
-        );
+        secretsErrors.password.push(translations.PASSWORD_REQUIRED_FOR_USER);
       }
       if (!action.secrets.user && action.secrets.password) {
-        secretsErrors.user.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.sections.addAction.webhookAction.error.requiredUserText',
-            {
-              defaultMessage: 'Username is required when password is used.',
-            }
-          )
-        );
+        secretsErrors.user.push(translations.USERNAME_REQUIRED_FOR_PASSWORD);
       }
       return validationResult;
     },
-    validateParams: (
+    validateParams: async (
       actionParams: WebhookActionParams
-    ): GenericValidationResult<WebhookActionParams> => {
+    ): Promise<GenericValidationResult<WebhookActionParams>> => {
+      const translations = await import('./translations');
       const errors = {
         body: new Array<string>(),
       };
       const validationResult = { errors };
       validationResult.errors = errors;
       if (!actionParams.body?.length) {
-        errors.body.push(
-          i18n.translate(
-            'xpack.triggersActionsUI.components.builtinActionTypes.error.requiredWebhookBodyText',
-            {
-              defaultMessage: 'Body is required.',
-            }
-          )
-        );
+        errors.body.push(translations.BODY_REQUIRED);
       }
       return validationResult;
     },
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_connectors.tsx b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_connectors.tsx
index d3231f52b4d7b..ba0e7016caa76 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_connectors.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/components/builtin_action_types/webhook/webhook_connectors.tsx
@@ -76,7 +76,11 @@ const WebhookActionConnectorFields: React.FunctionComponent<
       )
     );
   }
-  const hasHeaderErrors = headerErrors.keyHeader.length > 0 || headerErrors.valueHeader.length > 0;
+  const hasHeaderErrors: boolean =
+    (headerErrors.keyHeader !== undefined &&
+      headerErrors.valueHeader !== undefined &&
+      headerErrors.keyHeader.length > 0) ||
+    headerErrors.valueHeader.length > 0;
 
   function addHeader() {
     if (headers && !!Object.keys(headers).find((key) => key === httpHeaderKey)) {
@@ -219,6 +223,13 @@ const WebhookActionConnectorFields: React.FunctionComponent<
     );
   });
 
+  const isUrlInvalid: boolean =
+    errors.url !== undefined && errors.url.length > 0 && url !== undefined;
+  const isPasswordInvalid: boolean =
+    password !== undefined && errors.password !== undefined && errors.password.length > 0;
+  const isUserInvalid: boolean =
+    user !== undefined && errors.user !== undefined && errors.user.length > 0;
+
   return (
     <>
       <EuiFlexGroup justifyContent="spaceBetween">
@@ -248,7 +259,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<
             id="url"
             fullWidth
             error={errors.url}
-            isInvalid={errors.url.length > 0 && url !== undefined}
+            isInvalid={isUrlInvalid}
             label={i18n.translate(
               'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.urlTextFieldLabel',
               {
@@ -258,7 +269,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<
           >
             <EuiFieldText
               name="url"
-              isInvalid={errors.url.length > 0 && url !== undefined}
+              isInvalid={isUrlInvalid}
               fullWidth
               readOnly={readOnly}
               value={url || ''}
@@ -326,7 +337,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<
                 id="webhookUser"
                 fullWidth
                 error={errors.user}
-                isInvalid={errors.user.length > 0 && user !== undefined}
+                isInvalid={isUserInvalid}
                 label={i18n.translate(
                   'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.userTextFieldLabel',
                   {
@@ -336,7 +347,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<
               >
                 <EuiFieldText
                   fullWidth
-                  isInvalid={errors.user.length > 0 && user !== undefined}
+                  isInvalid={isUserInvalid}
                   name="user"
                   readOnly={readOnly}
                   value={user || ''}
@@ -357,7 +368,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<
                 id="webhookPassword"
                 fullWidth
                 error={errors.password}
-                isInvalid={errors.password.length > 0 && password !== undefined}
+                isInvalid={isPasswordInvalid}
                 label={i18n.translate(
                   'xpack.triggersActionsUI.components.builtinActionTypes.webhookAction.passwordTextFieldLabel',
                   {
@@ -369,7 +380,7 @@ const WebhookActionConnectorFields: React.FunctionComponent<
                   fullWidth
                   name="password"
                   readOnly={readOnly}
-                  isInvalid={errors.password.length > 0 && password !== undefined}
+                  isInvalid={isPasswordInvalid}
                   value={password || ''}
                   data-test-subj="webhookPasswordInput"
                   onChange={(e) => {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.test.tsx
index 964f538d54971..091ea1e305e35 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.test.tsx
@@ -23,12 +23,12 @@ describe('action_connector_form', () => {
       id: 'my-action-type',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
     });
     actionTypeRegistry.get.mockReturnValue(actionType);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx
index 0790dce9ca3d4..29232940da5c3 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_connector_form.tsx
@@ -51,11 +51,11 @@ export function validateBaseProperties<ConnectorConfig, ConnectorSecrets>(
   return validationResult;
 }
 
-export function getConnectorErrors<ConnectorConfig, ConnectorSecrets>(
+export async function getConnectorErrors<ConnectorConfig, ConnectorSecrets>(
   connector: UserConfiguredActionConnector<ConnectorConfig, ConnectorSecrets>,
   actionTypeModel: ActionTypeModel
 ) {
-  const connectorValidationResult = actionTypeModel?.validateConnector(connector);
+  const connectorValidationResult = await actionTypeModel?.validateConnector(connector);
   const configErrors = (connectorValidationResult.config
     ? connectorValidationResult.config.errors
     : {}) as IErrorObject;
@@ -173,7 +173,8 @@ export const ActionConnectorForm = ({
     );
 
   const FieldsComponent = actionTypeRegistered.actionConnectorFields;
-
+  const isNameInvalid: boolean =
+    connector.name !== undefined && errors.name !== undefined && errors.name.length > 0;
   return (
     <EuiForm isInvalid={!!serverError} error={serverError?.body.message}>
       <EuiFormRow
@@ -185,13 +186,13 @@ export const ActionConnectorForm = ({
             defaultMessage="Connector name"
           />
         }
-        isInvalid={errors.name.length > 0 && connector.name !== undefined}
+        isInvalid={isNameInvalid}
         error={errors.name}
       >
         <EuiFieldText
           fullWidth
           readOnly={!canSave}
-          isInvalid={errors.name.length > 0 && connector.name !== undefined}
+          isInvalid={isNameInvalid}
           name="name"
           placeholder="Untitled"
           data-test-subj="nameInput"
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 ad727be58280f..bedde696e51c0 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
@@ -53,12 +53,12 @@ describe('action_form', () => {
     id: 'my-action-type',
     iconClass: 'test',
     selectMessage: 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
     actionParamsFields: mockedActionParamsFields,
@@ -68,12 +68,12 @@ describe('action_form', () => {
     id: 'disabled-by-config',
     iconClass: 'test',
     selectMessage: 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
     actionParamsFields: mockedActionParamsFields,
@@ -83,12 +83,12 @@ describe('action_form', () => {
     id: '.jira',
     iconClass: 'test',
     selectMessage: 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): ValidationResult => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
     actionParamsFields: mockedActionParamsFields,
@@ -98,12 +98,12 @@ describe('action_form', () => {
     id: 'disabled-by-license',
     iconClass: 'test',
     selectMessage: 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
     actionParamsFields: mockedActionParamsFields,
@@ -113,12 +113,12 @@ describe('action_form', () => {
     id: 'preconfigured',
     iconClass: 'test',
     selectMessage: 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
     actionParamsFields: mockedActionParamsFields,
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 e9f79633ef520..f12ce25abc492 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { Fragment, useState, useEffect, useCallback } from 'react';
+import React, { useState, useEffect, useCallback } from 'react';
 import { i18n } from '@kbn/i18n';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
@@ -30,7 +30,7 @@ import {
   ActionTypeRegistryContract,
 } from '../../../types';
 import { SectionLoading } from '../../components/section_loading';
-import { ActionTypeForm, ActionTypeFormProps } from './action_type_form';
+import { ActionTypeForm } from './action_type_form';
 import { AddConnectorInline } from './connector_add_inline';
 import { actionTypeCompare } from '../../lib/action_type_compare';
 import { checkActionFormActionTypeEnabled } from '../../lib/check_action_type_enabled';
@@ -357,49 +357,42 @@ export const ActionForm = ({
             );
           }
 
-          const actionParamsErrors: ActionTypeFormProps['actionParamsErrors'] = actionTypeRegistry
-            .get(actionItem.actionTypeId)
-            ?.validateParams(actionItem.params);
-
           return (
-            <Fragment key={`action-form-action-at-${index}`}>
-              <ActionTypeForm
-                actionItem={actionItem}
-                actionConnector={actionConnector}
-                actionParamsErrors={actionParamsErrors}
-                index={index}
-                setActionParamsProperty={setActionParamsProperty}
-                actionTypesIndex={actionTypesIndex}
-                connectors={connectors}
-                defaultActionGroupId={defaultActionGroupId}
-                messageVariables={messageVariables}
-                actionGroups={actionGroups}
-                defaultActionMessage={defaultActionMessage}
-                defaultParams={getDefaultActionParams?.(actionItem.actionTypeId, actionItem.group)}
-                isActionGroupDisabledForActionType={isActionGroupDisabledForActionType}
-                setActionGroupIdByIndex={setActionGroupIdByIndex}
-                onAddConnector={() => {
-                  setActiveActionItem({ actionTypeId: actionItem.actionTypeId, indices: [index] });
-                  setAddModalVisibility(true);
-                }}
-                onConnectorSelected={(id: string) => {
-                  setActionIdByIndex(id, index);
-                }}
-                actionTypeRegistry={actionTypeRegistry}
-                onDeleteAction={() => {
-                  const updatedActions = actions.filter(
-                    (_item: AlertAction, i: number) => i !== index
-                  );
-                  setActions(updatedActions);
-                  setIsAddActionPanelOpen(
-                    updatedActions.filter((item: AlertAction) => item.id !== actionItem.id)
-                      .length === 0
-                  );
-                  setActiveActionItem(undefined);
-                }}
-              />
-              <EuiSpacer size="m" />
-            </Fragment>
+            <ActionTypeForm
+              actionItem={actionItem}
+              actionConnector={actionConnector}
+              index={index}
+              key={`action-form-action-at-${index}`}
+              setActionParamsProperty={setActionParamsProperty}
+              actionTypesIndex={actionTypesIndex}
+              connectors={connectors}
+              defaultActionGroupId={defaultActionGroupId}
+              messageVariables={messageVariables}
+              actionGroups={actionGroups}
+              defaultActionMessage={defaultActionMessage}
+              defaultParams={getDefaultActionParams?.(actionItem.actionTypeId, actionItem.group)}
+              isActionGroupDisabledForActionType={isActionGroupDisabledForActionType}
+              setActionGroupIdByIndex={setActionGroupIdByIndex}
+              onAddConnector={() => {
+                setActiveActionItem({ actionTypeId: actionItem.actionTypeId, indices: [index] });
+                setAddModalVisibility(true);
+              }}
+              onConnectorSelected={(id: string) => {
+                setActionIdByIndex(id, index);
+              }}
+              actionTypeRegistry={actionTypeRegistry}
+              onDeleteAction={() => {
+                const updatedActions = actions.filter(
+                  (_item: AlertAction, i: number) => i !== index
+                );
+                setActions(updatedActions);
+                setIsAddActionPanelOpen(
+                  updatedActions.filter((item: AlertAction) => item.id !== actionItem.id).length ===
+                    0
+                );
+                setActiveActionItem(undefined);
+              }}
+            />
           );
         })}
       <EuiSpacer size="m" />
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.test.tsx
index 38f1e8f52254c..e8590595b9d61 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/action_type_form.test.tsx
@@ -43,12 +43,12 @@ describe('action_type_form', () => {
       id: '.pagerduty',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
       actionParamsFields: mockedActionParamsFields,
@@ -92,12 +92,12 @@ describe('action_type_form', () => {
       id: '.pagerduty',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
       actionParamsFields: mockedActionParamsFields,
@@ -220,7 +220,6 @@ function getActionTypeForm(
       onAddConnector={onAddConnector ?? jest.fn()}
       onDeleteAction={onDeleteAction ?? jest.fn()}
       onConnectorSelected={onConnectorSelected ?? jest.fn()}
-      actionParamsErrors={{ errors: { summary: [], timestamp: [], dedupKey: [] } }}
       defaultActionGroupId={defaultActionGroupId ?? 'default'}
       setActionParamsProperty={jest.fn()}
       index={index ?? 1}
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 2690aeaffad32..526d899b7efb1 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
@@ -47,9 +47,6 @@ import { DefaultActionParams } from '../../lib/get_defaults_for_action_params';
 export type ActionTypeFormProps = {
   actionItem: AlertAction;
   actionConnector: ActionConnector;
-  actionParamsErrors: {
-    errors: IErrorObject;
-  };
   index: number;
   onAddConnector: () => void;
   onConnectorSelected: (id: string) => void;
@@ -80,7 +77,6 @@ const preconfiguredMessage = i18n.translate(
 export const ActionTypeForm = ({
   actionItem,
   actionConnector,
-  actionParamsErrors,
   index,
   onAddConnector,
   onConnectorSelected,
@@ -106,6 +102,9 @@ export const ActionTypeForm = ({
   const selectedActionGroup =
     actionGroups?.find(({ id }) => id === actionItem.group) ?? defaultActionGroup;
   const [actionGroup, setActionGroup] = useState<string>();
+  const [actionParamsErrors, setActionParamsErrors] = useState<{ errors: IErrorObject }>({
+    errors: {},
+  });
 
   useEffect(() => {
     setAvailableActionVariables(
@@ -130,6 +129,16 @@ export const ActionTypeForm = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [actionGroup]);
 
+  useEffect(() => {
+    (async () => {
+      const res: { errors: IErrorObject } = await actionTypeRegistry
+        .get(actionItem.actionTypeId)
+        ?.validateParams(actionItem.params);
+      setActionParamsErrors(res);
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [actionItem]);
+
   const canSave = hasSaveActionsCapability(capabilities);
   const getSelectedOptions = (actionItemId: string) => {
     const selectedConnector = connectors.find((connector) => connector.id === actionItemId);
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 9a011823612c4..e15916138af71 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
@@ -40,12 +40,12 @@ describe('connector_add_flyout', () => {
       id: 'my-action-type',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
@@ -77,12 +77,12 @@ describe('connector_add_flyout', () => {
       id: 'my-action-type',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
@@ -114,12 +114,12 @@ describe('connector_add_flyout', () => {
       id: 'my-action-type',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
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 fedb2ed382994..8dbe5f105a0f7 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
@@ -198,12 +198,12 @@ function createActionType() {
     id: `my-action-type-${++count}`,
     iconClass: 'test',
     selectMessage: 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
   });
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 d3a6d662720ca..1a3a186d891cc 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback, useState, useReducer } from 'react';
+import React, { useCallback, useState, useReducer, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiTitle,
@@ -30,7 +30,9 @@ import {
   ActionType,
   ActionConnector,
   UserConfiguredActionConnector,
+  IErrorObject,
   ConnectorAddFlyoutProps,
+  ActionTypeModel,
 } from '../../../types';
 import { hasSaveActionsCapability } from '../../lib/capabilities';
 import { createActionConnector } from '../../lib/action_connector_api';
@@ -38,6 +40,7 @@ import { VIEW_LICENSE_OPTIONS_LINK } from '../../../common/constants';
 import { useKibana } from '../../../common/lib/kibana';
 import { createConnectorReducer, InitialConnector, ConnectorReducer } from './connector_reducer';
 import { getConnectorWithInvalidatedFields } from '../../lib/value_validators';
+import { CenterJustifiedSpinner } from '../../components/center_justified_spinner';
 
 const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
   onClose,
@@ -47,7 +50,9 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
   consumer,
   actionTypeRegistry,
 }) => {
-  let hasErrors = false;
+  const [hasErrors, setHasErrors] = useState<boolean>(true);
+  let actionTypeModel: ActionTypeModel | undefined;
+
   const {
     http,
     notifications: { toasts },
@@ -55,7 +60,17 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
   } = useKibana().services;
   const [actionType, setActionType] = useState<ActionType | undefined>(undefined);
   const [hasActionsUpgradeableByTrial, setHasActionsUpgradeableByTrial] = useState<boolean>(false);
-
+  const [errors, setErrors] = useState<{
+    configErrors: IErrorObject;
+    connectorBaseErrors: IErrorObject;
+    connectorErrors: IErrorObject;
+    secretsErrors: IErrorObject;
+  }>({
+    configErrors: {},
+    connectorBaseErrors: {},
+    connectorErrors: {},
+    secretsErrors: {},
+  });
   // hooks
   const initialConnector: InitialConnector<Record<string, unknown>, Record<string, unknown>> = {
     actionTypeId: actionType?.id ?? '',
@@ -73,6 +88,24 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
       Record<string, unknown>
     >,
   });
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    (async () => {
+      if (actionTypeModel) {
+        setIsLoading(true);
+        const res = await getConnectorErrors(connector, actionTypeModel);
+        setHasErrors(
+          !!Object.keys(res.connectorErrors).find(
+            (errorKey) => (res.connectorErrors as IErrorObject)[errorKey].length >= 1
+          )
+        );
+        setIsLoading(false);
+        setErrors({ ...res });
+      }
+    })();
+    // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [connector, actionType]);
 
   const setActionProperty = <Key extends keyof ActionConnector>(
     key: Key,
@@ -101,7 +134,6 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
   }
 
   let currentForm;
-  let actionTypeModel;
   let saveButton;
   if (!actionType) {
     currentForm = (
@@ -115,22 +147,12 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
   } else {
     actionTypeModel = actionTypeRegistry.get(actionType.id);
 
-    const {
-      configErrors,
-      connectorBaseErrors,
-      connectorErrors,
-      secretsErrors,
-    } = getConnectorErrors(connector, actionTypeModel);
-    hasErrors = !!Object.keys(connectorErrors).find(
-      (errorKey) => connectorErrors[errorKey].length >= 1
-    );
-
     currentForm = (
       <ActionConnectorForm
         actionTypeName={actionType.name}
         connector={connector}
         dispatch={dispatch}
-        errors={connectorErrors}
+        errors={errors.connectorErrors}
         actionTypeRegistry={actionTypeRegistry}
         consumer={consumer}
       />
@@ -170,9 +192,9 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
         setConnector(
           getConnectorWithInvalidatedFields(
             connector,
-            configErrors,
-            secretsErrors,
-            connectorBaseErrors
+            errors.configErrors,
+            errors.secretsErrors,
+            errors.connectorBaseErrors
           )
         );
         return;
@@ -235,13 +257,13 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
     <EuiFlyout onClose={closeFlyout} aria-labelledby="flyoutActionAddTitle" size="m">
       <EuiFlyoutHeader hasBorder>
         <EuiFlexGroup gutterSize="m" alignItems="center">
-          {actionTypeModel && actionTypeModel.iconClass ? (
+          {!!actionTypeModel && actionTypeModel.iconClass ? (
             <EuiFlexItem grow={false}>
               <EuiIcon type={actionTypeModel.iconClass} size="xl" />
             </EuiFlexItem>
           ) : null}
           <EuiFlexItem>
-            {actionTypeModel && actionType ? (
+            {!!actionTypeModel && actionType ? (
               <>
                 <EuiTitle size="s">
                   <h3 id="flyoutTitle">
@@ -280,7 +302,17 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
           )
         }
       >
-        {currentForm}
+        <>
+          {currentForm}
+          {isLoading ? (
+            <>
+              <EuiSpacer size="m" />
+              <CenterJustifiedSpinner size="l" />{' '}
+            </>
+          ) : (
+            <></>
+          )}
+        </>
       </EuiFlyoutBody>
 
       <EuiFlyoutFooter>
@@ -314,7 +346,7 @@ const ConnectorAddFlyout: React.FunctionComponent<ConnectorAddFlyoutProps> = ({
           </EuiFlexItem>
           <EuiFlexItem grow={false}>
             <EuiFlexGroup justifyContent="spaceBetween">
-              {canSave && actionTypeModel && actionType ? saveButton : null}
+              {canSave && !!actionTypeModel && actionType ? saveButton : null}
             </EuiFlexGroup>
           </EuiFlexItem>
         </EuiFlexGroup>
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 c18f6955d1217..1ae37cf96cd3e 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
@@ -39,12 +39,12 @@ describe('connector_add_modal', () => {
       id: 'my-action-type',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx
index d01ee08df2394..1e9669d1995dd 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/connector_add_modal.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback, useMemo, useReducer, useState } from 'react';
+import React, { useCallback, useEffect, useMemo, useReducer, useState } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiModal,
@@ -19,6 +19,7 @@ import {
   EuiFlexItem,
   EuiIcon,
   EuiFlexGroup,
+  EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { ActionConnectorForm, getConnectorErrors } from './action_connector_form';
@@ -31,9 +32,11 @@ import {
   ActionConnector,
   ActionTypeRegistryContract,
   UserConfiguredActionConnector,
+  IErrorObject,
 } from '../../../types';
 import { useKibana } from '../../../common/lib/kibana';
 import { getConnectorWithInvalidatedFields } from '../../lib/value_validators';
+import { CenterJustifiedSpinner } from '../../components/center_justified_spinner';
 
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 type ConnectorAddModalProps = {
@@ -56,7 +59,7 @@ const ConnectorAddModal = ({
     notifications: { toasts },
     application: { capabilities },
   } = useKibana().services;
-  let hasErrors = false;
+  const [hasErrors, setHasErrors] = useState<boolean>(true);
   const initialConnector: InitialConnector<
     Record<string, unknown>,
     Record<string, unknown>
@@ -69,6 +72,7 @@ const ConnectorAddModal = ({
     [actionType.id]
   );
   const [isSaving, setIsSaving] = useState<boolean>(false);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
   const canSave = hasSaveActionsCapability(capabilities);
 
   const reducer: ConnectorReducer<
@@ -81,6 +85,34 @@ const ConnectorAddModal = ({
       Record<string, unknown>
     >,
   });
+  const [errors, setErrors] = useState<{
+    configErrors: IErrorObject;
+    connectorBaseErrors: IErrorObject;
+    connectorErrors: IErrorObject;
+    secretsErrors: IErrorObject;
+  }>({
+    configErrors: {},
+    connectorBaseErrors: {},
+    connectorErrors: {},
+    secretsErrors: {},
+  });
+
+  const actionTypeModel = actionTypeRegistry.get(actionType.id);
+
+  useEffect(() => {
+    (async () => {
+      setIsLoading(true);
+      const res = await getConnectorErrors(connector, actionTypeModel);
+      setHasErrors(
+        !!Object.keys(res.connectorErrors).find(
+          (errorKey) => (res.connectorErrors as IErrorObject)[errorKey].length >= 1
+        )
+      );
+      setIsLoading(false);
+      setErrors({ ...res });
+    })();
+  }, [connector, actionTypeModel]);
+
   const setConnector = (value: any) => {
     dispatch({ command: { type: 'setConnector' }, payload: { key: 'connector', value } });
   };
@@ -97,15 +129,6 @@ const ConnectorAddModal = ({
     onClose();
   }, [initialConnector, onClose]);
 
-  const actionTypeModel = actionTypeRegistry.get(actionType.id);
-  const { configErrors, connectorBaseErrors, connectorErrors, secretsErrors } = getConnectorErrors(
-    connector,
-    actionTypeModel
-  );
-  hasErrors = !!Object.keys(connectorErrors).find(
-    (errorKey) => connectorErrors[errorKey].length >= 1
-  );
-
   const onActionConnectorSave = async (): Promise<ActionConnector | undefined> =>
     await createActionConnector({ http, connector })
       .then((savedConnector) => {
@@ -157,15 +180,25 @@ const ConnectorAddModal = ({
       </EuiModalHeader>
 
       <EuiModalBody>
-        <ActionConnectorForm
-          connector={connector}
-          actionTypeName={actionType.name}
-          dispatch={dispatch}
-          serverError={serverError}
-          errors={connectorErrors}
-          actionTypeRegistry={actionTypeRegistry}
-          consumer={consumer}
-        />
+        <>
+          <ActionConnectorForm
+            connector={connector}
+            actionTypeName={actionType.name}
+            dispatch={dispatch}
+            serverError={serverError}
+            errors={errors.connectorErrors}
+            actionTypeRegistry={actionTypeRegistry}
+            consumer={consumer}
+          />
+          {isLoading ? (
+            <>
+              <EuiSpacer size="m" />
+              <CenterJustifiedSpinner size="l" />{' '}
+            </>
+          ) : (
+            <></>
+          )}
+        </>
       </EuiModalBody>
       <EuiModalFooter>
         <EuiButtonEmpty onClick={closeModal}>
@@ -189,9 +222,9 @@ const ConnectorAddModal = ({
                 setConnector(
                   getConnectorWithInvalidatedFields(
                     connector,
-                    configErrors,
-                    secretsErrors,
-                    connectorBaseErrors
+                    errors.configErrors,
+                    errors.secretsErrors,
+                    errors.connectorBaseErrors
                   )
                 );
                 return;
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 56bf57cb45095..e6d3c0bde8113 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
@@ -51,12 +51,12 @@ describe('connector_edit_flyout', () => {
       id: 'test-action-type-id',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
@@ -95,12 +95,12 @@ describe('connector_edit_flyout', () => {
       id: 'test-action-type-id',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
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 66a4dcc452c51..ca729f9a61662 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useCallback, useReducer, useState } from 'react';
+import React, { useCallback, useReducer, useState, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiTitle,
@@ -23,6 +23,7 @@ import {
   EuiLink,
   EuiTabs,
   EuiTab,
+  EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { Option, none, some } from 'fp-ts/lib/Option';
@@ -31,6 +32,7 @@ import { TestConnectorForm } from './test_connector_form';
 import {
   ActionConnector,
   ConnectorEditFlyoutProps,
+  IErrorObject,
   EditConectorTabs,
   UserConfiguredActionConnector,
 } from '../../../types';
@@ -44,6 +46,7 @@ import {
 import './connector_edit_flyout.scss';
 import { useKibana } from '../../../common/lib/kibana';
 import { getConnectorWithInvalidatedFields } from '../../lib/value_validators';
+import { CenterJustifiedSpinner } from '../../components/center_justified_spinner';
 
 const ConnectorEditFlyout = ({
   initialConnector,
@@ -53,12 +56,14 @@ const ConnectorEditFlyout = ({
   consumer,
   actionTypeRegistry,
 }: ConnectorEditFlyoutProps) => {
+  const [hasErrors, setHasErrors] = useState<boolean>(true);
   const {
     http,
     notifications: { toasts },
     docLinks,
     application: { capabilities },
   } = useKibana().services;
+
   const getConnectorWithoutSecrets = () => ({
     ...(initialConnector as UserConfiguredActionConnector<
       Record<string, unknown>,
@@ -75,6 +80,35 @@ const ConnectorEditFlyout = ({
   const [{ connector }, dispatch] = useReducer(reducer, {
     connector: getConnectorWithoutSecrets(),
   });
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+  const [errors, setErrors] = useState<{
+    configErrors: IErrorObject;
+    connectorBaseErrors: IErrorObject;
+    connectorErrors: IErrorObject;
+    secretsErrors: IErrorObject;
+  }>({
+    configErrors: {},
+    connectorBaseErrors: {},
+    connectorErrors: {},
+    secretsErrors: {},
+  });
+
+  const actionTypeModel = actionTypeRegistry.get(connector.actionTypeId);
+
+  useEffect(() => {
+    (async () => {
+      setIsLoading(true);
+      const res = await getConnectorErrors(connector, actionTypeModel);
+      setHasErrors(
+        !!Object.keys(res.connectorErrors).find(
+          (errorKey) => (res.connectorErrors as IErrorObject)[errorKey].length >= 1
+        )
+      );
+      setIsLoading(false);
+      setErrors({ ...res });
+    })();
+  }, [connector, actionTypeModel]);
+
   const [isSaving, setIsSaving] = useState<boolean>(false);
   const [selectedTab, setTab] = useState<EditConectorTabs>(tab);
 
@@ -113,25 +147,6 @@ const ConnectorEditFlyout = ({
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [onClose]);
 
-  const actionTypeModel = actionTypeRegistry.get(connector.actionTypeId);
-  const {
-    configErrors,
-    connectorBaseErrors,
-    connectorErrors,
-    secretsErrors,
-  } = !connector.isPreconfigured
-    ? getConnectorErrors(connector, actionTypeModel)
-    : {
-        configErrors: {},
-        connectorBaseErrors: {},
-        connectorErrors: {},
-        secretsErrors: {},
-      };
-
-  const hasErrors = !!Object.keys(connectorErrors).find(
-    (errorKey) => connectorErrors[errorKey].length >= 1
-  );
-
   const onActionConnectorSave = async (): Promise<ActionConnector | undefined> =>
     await updateActionConnector({ http, connector, id: connector.id })
       .then((savedConnector) => {
@@ -227,9 +242,9 @@ const ConnectorEditFlyout = ({
       setConnector(
         getConnectorWithInvalidatedFields(
           connector,
-          configErrors,
-          secretsErrors,
-          connectorBaseErrors
+          errors.configErrors,
+          errors.secretsErrors,
+          errors.connectorBaseErrors
         )
       );
       return;
@@ -286,19 +301,29 @@ const ConnectorEditFlyout = ({
       <EuiFlyoutBody>
         {selectedTab === EditConectorTabs.Configuration ? (
           !connector.isPreconfigured ? (
-            <ActionConnectorForm
-              connector={connector}
-              errors={connectorErrors}
-              dispatch={(changes) => {
-                setHasChanges(true);
-                // if the user changes the connector, "forget" the last execution
-                // so the user comes back to a clean form ready to run a fresh test
-                setTestExecutionResult(none);
-                dispatch(changes);
-              }}
-              actionTypeRegistry={actionTypeRegistry}
-              consumer={consumer}
-            />
+            <>
+              <ActionConnectorForm
+                connector={connector}
+                errors={errors.connectorErrors}
+                dispatch={(changes) => {
+                  setHasChanges(true);
+                  // if the user changes the connector, "forget" the last execution
+                  // so the user comes back to a clean form ready to run a fresh test
+                  setTestExecutionResult(none);
+                  dispatch(changes);
+                }}
+                actionTypeRegistry={actionTypeRegistry}
+                consumer={consumer}
+              />
+              {isLoading ? (
+                <>
+                  <EuiSpacer size="m" />
+                  <CenterJustifiedSpinner size="l" />{' '}
+                </>
+              ) : (
+                <></>
+              )}
+            </>
           ) : (
             <>
               <EuiText>
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.test.tsx
index 5cdc15ab0375d..ae15670ce8ab9 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/action_connector_form/test_connector_form.test.tsx
@@ -53,12 +53,12 @@ const actionType = {
   id: 'my-action-type',
   iconClass: 'test',
   selectMessage: 'test',
-  validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-    return {};
+  validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+    return Promise.resolve({});
   },
-  validateParams: (): GenericValidationResult<unknown> => {
+  validateParams: (): Promise<GenericValidationResult<unknown>> => {
     const validationResult = { errors: {} };
-    return validationResult;
+    return Promise.resolve(validationResult);
   },
   actionConnectorFields: null,
   actionParamsFields: mockedActionParamsFields,
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 92a17a2e4cfae..242c1c33d8d79 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { Suspense } from 'react';
+import React, { Suspense, useEffect, useState } from 'react';
 import {
   EuiFlexGroup,
   EuiFlexItem,
@@ -46,11 +46,18 @@ export const TestConnectorForm = ({
   isExecutingAction,
   actionTypeRegistry,
 }: ConnectorAddFlyoutProps) => {
+  const [actionErrors, setActionErrors] = useState<IErrorObject>({});
+  const [hasErrors, setHasErrors] = useState<boolean>(false);
   const actionTypeModel = actionTypeRegistry.get(connector.actionTypeId);
   const ParamsFieldsComponent = actionTypeModel.actionParamsFields;
 
-  const actionErrors = actionTypeModel?.validateParams(actionParams).errors as IErrorObject;
-  const hasErrors = !!Object.values(actionErrors).find((errors) => errors.length > 0);
+  useEffect(() => {
+    (async () => {
+      const res = (await actionTypeModel?.validateParams(actionParams)).errors as IErrorObject;
+      setActionErrors({ ...res });
+      setHasErrors(!!Object.values(res).find((errors) => errors.length > 0));
+    })();
+  }, [actionTypeModel, actionParams]);
 
   const steps = [
     {
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 7b6453e705ec3..90eadaf5f9b8b 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
@@ -162,12 +162,12 @@ describe('actions_connectors_list component with items', () => {
       id: 'test',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
       actionParamsFields: mockedActionParamsFields,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
index cb43c168aa999..b40b7cbc1a387 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.test.tsx
@@ -135,12 +135,12 @@ describe('alert_add', () => {
       id: 'my-action-type',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
index a40f77998d6ee..2d111d5405230 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add.tsx
@@ -15,9 +15,10 @@ import {
   AlertTypeParams,
   AlertUpdates,
   AlertFlyoutCloseReason,
+  IErrorObject,
   AlertAddProps,
 } from '../../../types';
-import { AlertForm, getAlertErrors, isValidAlert } from './alert_form';
+import { AlertForm, getAlertActionErrors, getAlertErrors, isValidAlert } from './alert_form';
 import { alertReducer, InitialAlert, InitialAlertReducer } from './alert_reducer';
 import { createAlert } from '../../lib/alert_api';
 import { HealthCheck } from '../../components/health_check';
@@ -102,6 +103,18 @@ const AlertAdd = ({
     }
   }, [alert.params, initialAlertParams, setInitialAlertParams]);
 
+  const [alertActionsErrors, setAlertActionsErrors] = useState<IErrorObject[]>([]);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
+
+  useEffect(() => {
+    (async () => {
+      setIsLoading(true);
+      const res = await getAlertActionErrors(alert as Alert, actionTypeRegistry);
+      setIsLoading(false);
+      setAlertActionsErrors([...res]);
+    })();
+  }, [alert, actionTypeRegistry]);
+
   const checkForChangesAndCloseFlyout = () => {
     if (
       hasAlertChanged(alert, initialAlert, false) ||
@@ -125,9 +138,8 @@ const AlertAdd = ({
   };
 
   const alertType = alert.alertTypeId ? alertTypeRegistry.get(alert.alertTypeId) : null;
-  const { alertActionsErrors, alertBaseErrors, alertErrors, alertParamsErrors } = getAlertErrors(
+  const { alertBaseErrors, alertErrors, alertParamsErrors } = getAlertErrors(
     alert as Alert,
-    actionTypeRegistry,
     alertType
   );
 
@@ -195,9 +207,10 @@ const AlertAdd = ({
             </EuiFlyoutBody>
             <AlertAddFooter
               isSaving={isSaving}
+              isFormLoading={isLoading}
               onSave={async () => {
                 setIsSaving(true);
-                if (!isValidAlert(alert, alertErrors, alertActionsErrors)) {
+                if (isLoading || !isValidAlert(alert, alertErrors, alertActionsErrors)) {
                   setAlert(
                     getAlertWithInvalidatedFields(
                       alert as Alert,
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add_footer.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add_footer.tsx
index fe4b9d066429d..ee36257dedf0b 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add_footer.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_add_footer.tsx
@@ -13,17 +13,25 @@ import {
   EuiFlexItem,
   EuiButtonEmpty,
   EuiButton,
+  EuiLoadingSpinner,
+  EuiSpacer,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { useHealthContext } from '../../context/health_context';
 
 interface AlertAddFooterProps {
   isSaving: boolean;
+  isFormLoading: boolean;
   onSave: () => void;
   onCancel: () => void;
 }
 
-export const AlertAddFooter = ({ isSaving, onSave, onCancel }: AlertAddFooterProps) => {
+export const AlertAddFooter = ({
+  isSaving,
+  onSave,
+  onCancel,
+  isFormLoading,
+}: AlertAddFooterProps) => {
   const { loadingHealthCheck } = useHealthContext();
 
   return (
@@ -36,6 +44,14 @@ export const AlertAddFooter = ({ isSaving, onSave, onCancel }: AlertAddFooterPro
             })}
           </EuiButtonEmpty>
         </EuiFlexItem>
+        {isFormLoading ? (
+          <EuiFlexItem grow={false}>
+            <EuiSpacer size="s" />
+            <EuiLoadingSpinner size="l" />
+          </EuiFlexItem>
+        ) : (
+          <></>
+        )}
         <EuiFlexItem grow={false}>
           <EuiButton
             fill
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
index 49dd92b67ee41..4894cf165e271 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.test.tsx
@@ -106,12 +106,12 @@ describe('alert_edit', () => {
       id: 'my-action-type',
       iconClass: 'test',
       selectMessage: 'test',
-      validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-        return {};
+      validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+        return Promise.resolve({});
       },
-      validateParams: (): GenericValidationResult<unknown> => {
+      validateParams: (): Promise<GenericValidationResult<unknown>> => {
         const validationResult = { errors: {} };
-        return validationResult;
+        return Promise.resolve(validationResult);
       },
       actionConnectorFields: null,
     });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
index f6569f32088ee..bf6f0ef43b820 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_edit.tsx
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import React, { useReducer, useState } from 'react';
+import React, { useReducer, useState, useEffect } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
   EuiTitle,
@@ -20,11 +20,12 @@ import {
   EuiPortal,
   EuiCallOut,
   EuiSpacer,
+  EuiLoadingSpinner,
 } from '@elastic/eui';
 import { cloneDeep } from 'lodash';
 import { i18n } from '@kbn/i18n';
-import { Alert, AlertEditProps, AlertFlyoutCloseReason } from '../../../types';
-import { AlertForm, getAlertErrors, isValidAlert } from './alert_form';
+import { Alert, AlertFlyoutCloseReason, AlertEditProps, IErrorObject } from '../../../types';
+import { AlertForm, getAlertActionErrors, getAlertErrors, isValidAlert } from './alert_form';
 import { alertReducer, ConcreteAlertReducer } from './alert_reducer';
 import { updateAlert } from '../../lib/alert_api';
 import { HealthCheck } from '../../components/health_check';
@@ -53,6 +54,8 @@ export const AlertEdit = ({
     false
   );
   const [isConfirmAlertCloseModalOpen, setIsConfirmAlertCloseModalOpen] = useState<boolean>(false);
+  const [alertActionsErrors, setAlertActionsErrors] = useState<IErrorObject[]>([]);
+  const [isLoading, setIsLoading] = useState<boolean>(false);
 
   const {
     http,
@@ -64,9 +67,17 @@ export const AlertEdit = ({
 
   const alertType = alertTypeRegistry.get(alert.alertTypeId);
 
-  const { alertActionsErrors, alertBaseErrors, alertErrors, alertParamsErrors } = getAlertErrors(
+  useEffect(() => {
+    (async () => {
+      setIsLoading(true);
+      const res = await getAlertActionErrors(alert as Alert, actionTypeRegistry);
+      setAlertActionsErrors([...res]);
+      setIsLoading(false);
+    })();
+  }, [alert, actionTypeRegistry]);
+
+  const { alertBaseErrors, alertErrors, alertParamsErrors } = getAlertErrors(
     alert as Alert,
-    actionTypeRegistry,
     alertType
   );
 
@@ -80,7 +91,11 @@ export const AlertEdit = ({
 
   async function onSaveAlert(): Promise<Alert | undefined> {
     try {
-      if (isValidAlert(alert, alertErrors, alertActionsErrors) && !hasActionsWithBrokenConnector) {
+      if (
+        !isLoading &&
+        isValidAlert(alert, alertErrors, alertActionsErrors) &&
+        !hasActionsWithBrokenConnector
+      ) {
         const newAlert = await updateAlert({ http, alert, id: alert.id });
         toasts.addSuccess(
           i18n.translate('xpack.triggersActionsUI.sections.alertEdit.saveSuccessNotificationText', {
@@ -177,6 +192,14 @@ export const AlertEdit = ({
                     )}
                   </EuiButtonEmpty>
                 </EuiFlexItem>
+                {isLoading ? (
+                  <EuiFlexItem grow={false}>
+                    <EuiSpacer size="s" />
+                    <EuiLoadingSpinner size="l" />
+                  </EuiFlexItem>
+                ) : (
+                  <></>
+                )}
                 <EuiFlexItem grow={false}>
                   <EuiButton
                     fill
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx
index 574a60e4bc709..1bfb897c73996 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.test.tsx
@@ -47,19 +47,19 @@ describe('alert_form', () => {
     id: 'my-action-type',
     iconClass: 'test',
     selectMessage: 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({
         config: {
           errors: {},
         },
         secrets: {
           errors: {},
         },
-      };
+      });
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
   });
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
index b4b6477fd5947..16878abc362d0 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_form.tsx
@@ -121,11 +121,7 @@ export function validateBaseProperties(alertObject: InitialAlert): ValidationRes
   return validationResult;
 }
 
-export function getAlertErrors(
-  alert: Alert,
-  actionTypeRegistry: ActionTypeRegistryContract,
-  alertTypeModel: AlertTypeModel | null
-) {
+export function getAlertErrors(alert: Alert, alertTypeModel: AlertTypeModel | null) {
   const alertParamsErrors: IErrorObject = alertTypeModel
     ? alertTypeModel.validate(alert.params).errors
     : [];
@@ -135,18 +131,26 @@ export function getAlertErrors(
     ...alertBaseErrors,
   } as IErrorObject;
 
-  const alertActionsErrors = alert.actions.map((alertAction: AlertAction) => {
-    return actionTypeRegistry.get(alertAction.actionTypeId)?.validateParams(alertAction.params)
-      .errors;
-  });
   return {
     alertParamsErrors,
     alertBaseErrors,
-    alertActionsErrors,
     alertErrors,
   };
 }
 
+export async function getAlertActionErrors(
+  alert: Alert,
+  actionTypeRegistry: ActionTypeRegistryContract
+): Promise<IErrorObject[]> {
+  return await Promise.all(
+    alert.actions.map(
+      async (alertAction: AlertAction) =>
+        (await actionTypeRegistry.get(alertAction.actionTypeId)?.validateParams(alertAction.params))
+          .errors
+    )
+  );
+}
+
 export const hasObjectErrors: (errors: IErrorObject) => boolean = (errors) =>
   !!Object.values(errors).find((errorList) => {
     if (isObject(errorList)) return hasObjectErrors(errorList as IErrorObject);
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.test.ts
index f7f36c68d97be..1b28733cc46c1 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.test.ts
@@ -143,6 +143,29 @@ describe('alert reducer', () => {
     );
   });
 
+  test('if the existing alert action params property was set to undefined (when other connector was selected)', () => {
+    initialAlert.actions.push({
+      id: '',
+      actionTypeId: 'testId',
+      group: 'Alert',
+      params: {
+        testActionParam: 'some value',
+      },
+    });
+    const updatedAlert = alertReducer(
+      { alert: initialAlert },
+      {
+        command: { type: 'setAlertActionParams' },
+        payload: {
+          key: 'testActionParam',
+          value: undefined,
+          index: 0,
+        },
+      }
+    );
+    expect(updatedAlert.alert.actions[0].params.testActionParam).toBe(undefined);
+  });
+
   test('if alert action property was updated', () => {
     initialAlert.actions.push({
       id: '',
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.ts b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.ts
index 4f32a5013cbbe..a274e09a6fb7d 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/sections/alert_form/alert_reducer.ts
@@ -157,7 +157,7 @@ export const alertReducer = <AlertPhase extends InitialAlert | Alert>(
       if (
         index === undefined ||
         alert.actions[index] == null ||
-        isEqual(alert.actions[index][key], value)
+        (!!alert.actions[index][key] && isEqual(alert.actions[index][key], value))
       ) {
         return state;
       } else {
diff --git a/x-pack/plugins/triggers_actions_ui/public/application/type_registry.test.ts b/x-pack/plugins/triggers_actions_ui/public/application/type_registry.test.ts
index 8c7876c3f7255..ee561a65069e5 100644
--- a/x-pack/plugins/triggers_actions_ui/public/application/type_registry.test.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/application/type_registry.test.ts
@@ -42,12 +42,12 @@ const getTestActionType = (
     id: id || 'my-action-type',
     iconClass: iconClass || 'test',
     selectMessage: selectedMessage || 'test',
-    validateConnector: (): ConnectorValidationResult<unknown, unknown> => {
-      return {};
+    validateConnector: (): Promise<ConnectorValidationResult<unknown, unknown>> => {
+      return Promise.resolve({});
     },
-    validateParams: (): GenericValidationResult<unknown> => {
+    validateParams: (): Promise<GenericValidationResult<unknown>> => {
       const validationResult = { errors: {} };
-      return validationResult;
+      return Promise.resolve(validationResult);
     },
     actionConnectorFields: null,
   });
diff --git a/x-pack/plugins/triggers_actions_ui/public/common/index.ts b/x-pack/plugins/triggers_actions_ui/public/common/index.ts
index 01470bdddf4d7..67f4cc603ad92 100644
--- a/x-pack/plugins/triggers_actions_ui/public/common/index.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/common/index.ts
@@ -10,10 +10,3 @@ export * from './constants';
 export * from './index_controls';
 export * from './lib';
 export * from './types';
-
-export {
-  getServiceNowITSMActionType,
-  getServiceNowSIRActionType,
-} from '../application/components/builtin_action_types/servicenow';
-export { getJiraActionType } from '../application/components/builtin_action_types/jira';
-export { getResilientActionType } from '../application/components/builtin_action_types/resilient';
diff --git a/x-pack/plugins/triggers_actions_ui/public/types.ts b/x-pack/plugins/triggers_actions_ui/public/types.ts
index 0f2b961b1f2da..5ddddcb73a843 100644
--- a/x-pack/plugins/triggers_actions_ui/public/types.ts
+++ b/x-pack/plugins/triggers_actions_ui/public/types.ts
@@ -109,10 +109,10 @@ export interface ActionTypeModel<ActionConfig = any, ActionSecrets = any, Action
   actionTypeTitle?: string;
   validateConnector: (
     connector: UserConfiguredActionConnector<ActionConfig, ActionSecrets>
-  ) => ConnectorValidationResult<Partial<ActionConfig>, Partial<ActionSecrets>>;
+  ) => Promise<ConnectorValidationResult<Partial<ActionConfig>, Partial<ActionSecrets>>>;
   validateParams: (
     actionParams: ActionParams
-  ) => GenericValidationResult<Partial<ActionParams> | unknown>;
+  ) => Promise<GenericValidationResult<Partial<ActionParams> | unknown>>;
   actionConnectorFields: React.LazyExoticComponent<
     ComponentType<
       ActionConnectorFieldsProps<UserConfiguredActionConnector<ActionConfig, ActionSecrets>>
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 bd5dc5794cb59..93c1b33268bf4 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
@@ -123,7 +123,7 @@ export class ActionFactory<
   }
 
   public telemetry(state: SerializedEvent, telemetryData: Record<string, any>) {
-    return this.def.telemetry ? this.def.telemetry(state, telemetryData) : {};
+    return this.def.telemetry ? this.def.telemetry(state, telemetryData) : telemetryData;
   }
 
   public extract(state: SerializedEvent) {
diff --git a/x-pack/plugins/ui_actions_enhanced/server/plugin.ts b/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
index 245892e854df2..3faa5ce6aa3ef 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/plugin.ts
@@ -52,7 +52,7 @@ export class AdvancedUiActionsServerPlugin
 
     this.actionFactories.set(definition.id, {
       id: definition.id,
-      telemetry: definition.telemetry || (() => ({})),
+      telemetry: definition.telemetry || ((state, stats) => stats),
       inject: definition.inject || identity,
       extract:
         definition.extract ||
diff --git a/x-pack/plugins/ui_actions_enhanced/server/telemetry/dynamic_actions_collector.ts b/x-pack/plugins/ui_actions_enhanced/server/telemetry/dynamic_actions_collector.ts
index 15cb40ee62068..c89d93f5f5e28 100644
--- a/x-pack/plugins/ui_actions_enhanced/server/telemetry/dynamic_actions_collector.ts
+++ b/x-pack/plugins/ui_actions_enhanced/server/telemetry/dynamic_actions_collector.ts
@@ -10,8 +10,9 @@ import { getMetricKey } from './get_metric_key';
 
 export const dynamicActionsCollector = (
   state: DynamicActionsState,
-  stats: Record<string, any>
+  currentStats: Record<string, any>
 ): Record<string, any> => {
+  const stats: Record<string, any> = { ...currentStats };
   const countMetricKey = getMetricKey('count');
 
   stats[countMetricKey] = state.events.length + (stats[countMetricKey] || 0);
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 31189428fda18..faeb0e4a40abd 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
@@ -17,7 +17,7 @@ import {
 } from 'src/core/public/mocks';
 import { HttpSetup } from 'src/core/public';
 
-import { mockKibanaSemverVersion, UA_READONLY_MODE } from '../../../common/constants';
+import { mockKibanaSemverVersion } from '../../../common/constants';
 import { AppContextProvider } from '../../../public/application/app_context';
 import { apiService } from '../../../public/application/lib/api';
 import { breadcrumbService } from '../../../public/application/lib/breadcrumbs';
@@ -40,7 +40,7 @@ export const WithAppDependencies = (Comp: any, overrides: Record<string, unknown
       prevMajor: mockKibanaSemverVersion.major - 1,
       nextMajor: mockKibanaSemverVersion.major + 1,
     },
-    isReadOnlyMode: UA_READONLY_MODE,
+    isReadOnlyMode: false,
     notifications: notificationServiceMock.createStartContract(),
     api: apiService,
     breadcrumbs: breadcrumbService,
diff --git a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview.test.ts b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview.test.ts
index f3f76c3a6688e..85efaf38f32a7 100644
--- a/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview.test.ts
+++ b/x-pack/plugins/upgrade_assistant/__jest__/client_integration/overview.test.ts
@@ -45,7 +45,7 @@ describe('Overview page', () => {
 
     const kibanaDeprecationsMockResponse: DomainDeprecationDetails[] = [
       {
-        correctiveActions: {},
+        correctiveActions: { manualSteps: ['test-step'] },
         domainId: 'xpack.spaces',
         level: 'critical',
         message:
diff --git a/x-pack/plugins/upgrade_assistant/common/config.ts b/x-pack/plugins/upgrade_assistant/common/config.ts
index ebc12ee563350..e74fe5cc1bf16 100644
--- a/x-pack/plugins/upgrade_assistant/common/config.ts
+++ b/x-pack/plugins/upgrade_assistant/common/config.ts
@@ -9,6 +9,12 @@ import { schema, TypeOf } from '@kbn/config-schema';
 
 export const configSchema = schema.object({
   enabled: schema.boolean({ defaultValue: true }),
+  /*
+   * This will default to true up until the last minor before the next major.
+   * In readonly mode, the user will not be able to perform any actions in the UI
+   * and will be presented with a message indicating as such.
+   */
+  readonly: schema.boolean({ defaultValue: true }),
 });
 
 export type Config = TypeOf<typeof configSchema>;
diff --git a/x-pack/plugins/upgrade_assistant/common/constants.ts b/x-pack/plugins/upgrade_assistant/common/constants.ts
index 29253d3c373d6..bab3d8c3fda86 100644
--- a/x-pack/plugins/upgrade_assistant/common/constants.ts
+++ b/x-pack/plugins/upgrade_assistant/common/constants.ts
@@ -14,13 +14,6 @@ import SemVer from 'semver/classes/semver';
 export const mockKibanaVersion = '8.0.0';
 export const mockKibanaSemverVersion = new SemVer(mockKibanaVersion);
 
-/*
- * This will be set to true up until the last minor before the next major.
- * In readonly mode, the user will not be able to perform any actions in the UI
- * and will be presented with a message indicating as such.
- */
-export const UA_READONLY_MODE = true;
-
 /*
  * Map of 7.0 --> 8.0 index setting deprecation log messages and associated settings
  * We currently only support one setting deprecation (translog retention), but the code is written
diff --git a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts
index b17c1301f83f3..73e5d33e6c968 100644
--- a/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts
+++ b/x-pack/plugins/upgrade_assistant/public/application/mount_management_section.ts
@@ -7,7 +7,6 @@
 
 import { CoreSetup } from 'src/core/public';
 import { ManagementAppMountParams } from '../../../../../src/plugins/management/public';
-import { UA_READONLY_MODE } from '../../common/constants';
 import { renderApp } from './render_app';
 import { KibanaVersionContext } from './app_context';
 import { apiService } from './lib/api';
@@ -17,7 +16,8 @@ export async function mountManagementSection(
   coreSetup: CoreSetup,
   isCloudEnabled: boolean,
   params: ManagementAppMountParams,
-  kibanaVersionInfo: KibanaVersionContext
+  kibanaVersionInfo: KibanaVersionContext,
+  readonly: boolean
 ) {
   const [
     { i18n, docLinks, notifications, application, deprecations },
@@ -37,7 +37,7 @@ export async function mountManagementSection(
     docLinks,
     kibanaVersionInfo,
     notifications,
-    isReadOnlyMode: UA_READONLY_MODE,
+    isReadOnlyMode: readonly,
     history,
     api: apiService,
     breadcrumbs: breadcrumbService,
diff --git a/x-pack/plugins/upgrade_assistant/public/plugin.ts b/x-pack/plugins/upgrade_assistant/public/plugin.ts
index e33f146dd47fc..4f5429201f304 100644
--- a/x-pack/plugins/upgrade_assistant/public/plugin.ts
+++ b/x-pack/plugins/upgrade_assistant/public/plugin.ts
@@ -22,7 +22,7 @@ interface Dependencies {
 export class UpgradeAssistantUIPlugin implements Plugin {
   constructor(private ctx: PluginInitializerContext) {}
   setup(coreSetup: CoreSetup, { cloud, management }: Dependencies) {
-    const { enabled } = this.ctx.config.get<Config>();
+    const { enabled, readonly } = this.ctx.config.get<Config>();
 
     if (!enabled) {
       return;
@@ -61,7 +61,8 @@ export class UpgradeAssistantUIPlugin implements Plugin {
           coreSetup,
           isCloudEnabled,
           params,
-          kibanaVersionInfo
+          kibanaVersionInfo,
+          readonly
         );
 
         return () => {
diff --git a/x-pack/plugins/upgrade_assistant/server/index.ts b/x-pack/plugins/upgrade_assistant/server/index.ts
index 15e1435672407..035a6515de152 100644
--- a/x-pack/plugins/upgrade_assistant/server/index.ts
+++ b/x-pack/plugins/upgrade_assistant/server/index.ts
@@ -7,15 +7,16 @@
 
 import { PluginInitializerContext, PluginConfigDescriptor } from 'src/core/server';
 import { UpgradeAssistantServerPlugin } from './plugin';
-import { configSchema } from '../common/config';
+import { configSchema, Config } from '../common/config';
 
 export const plugin = (ctx: PluginInitializerContext) => {
   return new UpgradeAssistantServerPlugin(ctx);
 };
 
-export const config: PluginConfigDescriptor = {
+export const config: PluginConfigDescriptor<Config> = {
   schema: configSchema,
   exposeToBrowser: {
     enabled: true,
+    readonly: true,
   },
 };
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts
index 2620fe31d6277..d78af9162e924 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/es_migration_apis.test.ts
@@ -35,6 +35,7 @@ describe('getUpgradeAssistantStatus', () => {
     asApiResponse(deprecationsResponse)
   );
 
+  // @ts-expect-error not full interface of response
   esClient.asCurrentUser.indices.resolveIndex.mockResolvedValue(asApiResponse(resolvedIndices));
 
   it('calls /_migration/deprecations', async () => {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts
index 5e994f76f927c..30093a9fb6e50 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.test.ts
@@ -40,6 +40,7 @@ describe('transformFlatSettings', () => {
           'index.number_of_shards': '5',
 
           // Blacklisted settings
+          // @ts-expect-error @elastic/elasticsearch doesn't declare it
           'index.allocation.existing_shards_allocator': 'gateway_allocator',
           'index.blocks.write': 'true',
           'index.creation_date': '1547052614626',
@@ -89,6 +90,7 @@ describe('transformFlatSettings', () => {
           'index.number_of_shards': '5',
 
           // Deprecated settings
+          // @ts-expect-error @elastic/elasticsearch doesn't declare it
           'index.soft_deletes.enabled': 'true',
           'index.translog.retention.size': '5b',
         },
@@ -112,6 +114,7 @@ describe('transformFlatSettings', () => {
           'index.number_of_shards': '5',
 
           // Deprecated settings
+          // @ts-expect-error @elastic/elasticsearch doesn't declare it
           'index.soft_deletes.enabled': 'true',
           'index.translog.retention.age': '5d',
         },
@@ -216,6 +219,7 @@ describe('transformFlatSettings', () => {
             getReindexWarnings({
               settings: {
                 // Deprecated settings
+                // @ts-expect-error @elastic/elasticsearch doesn't declare it
                 'index.force_memory_term_dictionary': '1024',
                 'index.max_adjacency_matrix_filters': 'true',
                 'index.soft_deletes.enabled': 'true',
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts
index 5ee067f3640f3..0fb531b286854 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/index_settings.ts
@@ -104,11 +104,14 @@ export const getDeprecatedSettingWarning = (
   });
 
   // Translog settings are only marked as deprecated if soft deletes is enabled
+  // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
   if (settings['index.soft_deletes.enabled'] === 'true') {
+    // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
     if (settings['index.translog.retention.size']) {
       deprecatedSettingsInUse.push('index.translog.retention.size');
     }
 
+    // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
     if (settings['index.translog.retention.age']) {
       deprecatedSettingsInUse.push('index.translog.retention.age');
     }
@@ -183,12 +186,17 @@ const removeDeprecatedSettings = (settings: FlatSettings['settings']) => {
   const updatedSettings = { ...settings };
 
   // Translog settings are only marked as deprecated if soft deletes is enabled
+  // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
   if (updatedSettings['index.soft_deletes.enabled'] === 'true') {
+    // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
     if (updatedSettings['index.translog.retention.size']) {
+      // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
       delete updatedSettings['index.translog.retention.size'];
     }
 
+    // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
     if (settings['index.translog.retention.age']) {
+      // @ts-expect-error @elastic/elasticsearch doesn't declare such a setting
       delete updatedSettings['index.translog.retention.age'];
     }
   }
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 ae0a6f97e29d5..7a5bf1c187698 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
@@ -793,7 +793,7 @@ describe('reindexService', () => {
         expect(updatedOp.attributes.lastCompletedStep).toEqual(ReindexStep.readonly);
         expect(clusterClient.asCurrentUser.indices.putSettings).toHaveBeenCalledWith({
           index: 'myIndex',
-          body: { index: { blocks: { write: true } } },
+          body: { settings: { blocks: { write: true } } },
         });
       });
 
@@ -885,7 +885,7 @@ describe('reindexService', () => {
         // Original index should have been set back to allow reads.
         expect(clusterClient.asCurrentUser.indices.putSettings).toHaveBeenCalledWith({
           index: 'myIndex',
-          body: { index: { blocks: { write: false } } },
+          body: { settings: { blocks: { write: false } } },
         });
       });
     });
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 b9d5b42a65250..1bf45e3a4a038 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
@@ -226,7 +226,7 @@ export const reindexServiceFactory = (
     if (reindexOp.attributes.lastCompletedStep >= ReindexStep.readonly) {
       await esClient.indices.putSettings({
         index: reindexOp.attributes.indexName,
-        body: { index: { blocks: { write: false } } },
+        body: { settings: { blocks: { write: false } } },
       });
     }
 
@@ -290,7 +290,7 @@ export const reindexServiceFactory = (
     const { indexName } = reindexOp.attributes;
     const { body: putReadonly } = await esClient.indices.putSettings({
       index: indexName,
-      body: { index: { blocks: { write: true } } },
+      body: { settings: { blocks: { write: true } } },
     });
 
     if (!putReadonly.acknowledged) {
diff --git a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/types.ts b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/types.ts
index 569316e276e43..ddff137772ae8 100644
--- a/x-pack/plugins/upgrade_assistant/server/lib/reindexing/types.ts
+++ b/x-pack/plugins/upgrade_assistant/server/lib/reindexing/types.ts
@@ -4,6 +4,7 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
+import type { estypes } from '@elastic/elasticsearch';
 
 interface Mapping {
   type?: string;
@@ -19,10 +20,8 @@ interface MetaProperties {
 }
 
 export interface FlatSettings {
-  settings: {
-    [key: string]: string;
-  };
-  mappings: {
+  settings: estypes.IndicesIndexState['settings'];
+  mappings?: {
     properties?: MappingProperties;
     _meta?: MetaProperties;
   };
@@ -30,10 +29,8 @@ export interface FlatSettings {
 
 // Specific to 7.x-8 upgrade
 export interface FlatSettingsWithTypeName {
-  settings: {
-    [key: string]: string;
-  };
-  mappings: {
+  settings: estypes.IndicesIndexState['settings'];
+  mappings?: {
     [typeName: string]: {
       properties?: MappingProperties;
       _meta?: MetaProperties;
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 4bdf3c7f56cac..b90ff4281644b 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
@@ -45,7 +45,7 @@ export function registerUpdateSettingsRoute({ router }: RouteDependencies) {
           const { body: settingsResponse } = await client.asCurrentUser.indices.putSettings({
             index: indexName,
             body: {
-              index: settingsToDelete,
+              settings: settingsToDelete,
             },
           });
 
diff --git a/x-pack/plugins/uptime/kibana.json b/x-pack/plugins/uptime/kibana.json
index 0d2346f59b0a1..4d5ab531af7c4 100644
--- a/x-pack/plugins/uptime/kibana.json
+++ b/x-pack/plugins/uptime/kibana.json
@@ -8,7 +8,6 @@
   "optionalPlugins": [
     "data",
     "home",
-    "observability",
     "ml",
     "fleet"
   ],
@@ -18,7 +17,8 @@
     "features",
     "licensing",
     "triggersActionsUi",
-    "usageCollection"
+    "usageCollection",
+    "observability"
   ],
   "server": true,
   "ui": true,
@@ -31,4 +31,4 @@
     "data",
     "ml"
   ]
-}
\ No newline at end of file
+}
diff --git a/x-pack/plugins/uptime/public/apps/plugin.ts b/x-pack/plugins/uptime/public/apps/plugin.ts
index 80a131676951e..c34da1bc097bc 100644
--- a/x-pack/plugins/uptime/public/apps/plugin.ts
+++ b/x-pack/plugins/uptime/public/apps/plugin.ts
@@ -12,6 +12,9 @@ import {
   PluginInitializerContext,
   AppMountParameters,
 } from 'kibana/public';
+import { from } from 'rxjs';
+import { map } from 'rxjs/operators';
+import { i18n } from '@kbn/i18n';
 import { DEFAULT_APP_CATEGORIES } from '../../../../../src/core/public';
 import {
   FeatureCatalogueCategory,
@@ -28,7 +31,11 @@ import {
 } from '../../../../../src/plugins/data/public';
 import { alertTypeInitializers } from '../lib/alert_types';
 import { FleetStart } from '../../../fleet/public';
-import { FetchDataParams, ObservabilityPublicSetup } from '../../../observability/public';
+import {
+  FetchDataParams,
+  ObservabilityPublicSetup,
+  ObservabilityPublicStart,
+} from '../../../observability/public';
 import { PLUGIN } from '../../common/constants/plugin';
 import { IStorageWrapper } from '../../../../../src/plugins/kibana_utils/public';
 import {
@@ -48,6 +55,7 @@ export interface ClientPluginsStart {
   data: DataPublicPluginStart;
   triggersActionsUi: TriggersAndActionsUIPublicPluginStart;
   fleet?: FleetStart;
+  observability: ObservabilityPublicStart;
 }
 
 export interface UptimePluginServices extends Partial<CoreStart> {
@@ -83,20 +91,54 @@ export class UptimePlugin
       return UptimeDataHelper(coreStart);
     };
 
-    if (plugins.observability) {
-      plugins.observability.dashboard.register({
-        appName: 'synthetics',
-        hasData: async () => {
-          const dataHelper = await getUptimeDataHelper();
-          const status = await dataHelper.indexStatus();
-          return { hasData: status.docCount > 0, indices: status.indices };
-        },
-        fetchData: async (params: FetchDataParams) => {
-          const dataHelper = await getUptimeDataHelper();
-          return await dataHelper.overviewData(params);
-        },
-      });
-    }
+    plugins.observability.dashboard.register({
+      appName: 'synthetics',
+      hasData: async () => {
+        const dataHelper = await getUptimeDataHelper();
+        const status = await dataHelper.indexStatus();
+        return { hasData: status.docCount > 0, indices: status.indices };
+      },
+      fetchData: async (params: FetchDataParams) => {
+        const dataHelper = await getUptimeDataHelper();
+        return await dataHelper.overviewData(params);
+      },
+    });
+
+    plugins.observability.navigation.registerSections(
+      from(core.getStartServices()).pipe(
+        map(([coreStart]) => {
+          if (coreStart.application.capabilities.uptime.show) {
+            return [
+              {
+                label: 'Uptime',
+                sortKey: 200,
+                entries: [
+                  {
+                    label: i18n.translate('xpack.uptime.overview.heading', {
+                      defaultMessage: 'Monitoring overview',
+                    }),
+                    app: 'uptime',
+                    path: '/',
+                    matchFullPath: true,
+                    ignoreTrailingSlash: true,
+                  },
+                  {
+                    label: i18n.translate('xpack.uptime.certificatesPage.heading', {
+                      defaultMessage: 'TLS Certificates',
+                    }),
+                    app: 'uptime',
+                    path: '/certificates',
+                    matchFullPath: true,
+                  },
+                ],
+              },
+            ];
+          }
+
+          return [];
+        })
+      )
+    );
 
     core.application.register({
       id: PLUGIN.ID,
diff --git a/x-pack/plugins/uptime/public/apps/uptime_app.tsx b/x-pack/plugins/uptime/public/apps/uptime_app.tsx
index 758d40a95a86a..60717db8af27d 100644
--- a/x-pack/plugins/uptime/public/apps/uptime_app.tsx
+++ b/x-pack/plugins/uptime/public/apps/uptime_app.tsx
@@ -7,8 +7,7 @@
 import React, { useEffect } from 'react';
 import { Provider as ReduxProvider } from 'react-redux';
 import { Router } from 'react-router-dom';
-import styled from 'styled-components';
-import { EuiPage, EuiErrorBoundary } from '@elastic/eui';
+import { EuiErrorBoundary } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
 import { I18nStart, ChromeBreadcrumb, CoreStart, AppMountParameters } from 'kibana/public';
 import {
@@ -62,18 +61,6 @@ export interface UptimeAppProps {
   appMountParameters: AppMountParameters;
 }
 
-const StyledPage = styled(EuiPage)`
-  display: flex;
-  flex-grow: 1;
-  flex-shrink: 0;
-  flex-basis: auto;
-  flex-direction: column;
-
-  > * {
-    flex-shrink: 0;
-  }
-`;
-
 const Application = (props: UptimeAppProps) => {
   const {
     basePath,
@@ -122,6 +109,7 @@ const Application = (props: UptimeAppProps) => {
               storage,
               data: startPlugins.data,
               triggersActionsUi: startPlugins.triggersActionsUi,
+              observability: startPlugins.observability,
             }}
           >
             <Router history={appMountParameters.history}>
@@ -130,7 +118,7 @@ const Application = (props: UptimeAppProps) => {
                   <UptimeSettingsContextProvider {...props}>
                     <UptimeThemeContextProvider darkMode={darkMode}>
                       <UptimeStartupPluginsContextProvider {...startPlugins}>
-                        <StyledPage data-test-subj="uptimeApp">
+                        <div data-test-subj="uptimeApp">
                           <RedirectAppLinks application={core.application}>
                             <main>
                               <UptimeAlertsFlyoutWrapper />
@@ -138,7 +126,7 @@ const Application = (props: UptimeAppProps) => {
                               <ActionMenu appMountParameters={appMountParameters} />
                             </main>
                           </RedirectAppLinks>
-                        </StyledPage>
+                        </div>
                       </UptimeStartupPluginsContextProvider>
                     </UptimeThemeContextProvider>
                   </UptimeSettingsContextProvider>
diff --git a/x-pack/plugins/uptime/public/components/certificates/__snapshots__/fingerprint_col.test.tsx.snap b/x-pack/plugins/uptime/public/components/certificates/__snapshots__/fingerprint_col.test.tsx.snap
index ebcced7a6cffb..33969b3d83bcb 100644
--- a/x-pack/plugins/uptime/public/components/certificates/__snapshots__/fingerprint_col.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/certificates/__snapshots__/fingerprint_col.test.tsx.snap
@@ -44,6 +44,7 @@ exports[`FingerprintCol renders expected elements for valid props 1`] = `
         <span
           aria-hidden="true"
           class="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="copy"
         />
       </button>
@@ -83,6 +84,7 @@ exports[`FingerprintCol renders expected elements for valid props 1`] = `
         <span
           aria-hidden="true"
           class="euiButtonIcon__icon"
+          color="inherit"
           data-euiicon-type="copy"
         />
       </button>
diff --git a/x-pack/plugins/uptime/public/components/certificates/certificate_title.tsx b/x-pack/plugins/uptime/public/components/certificates/certificate_title.tsx
new file mode 100644
index 0000000000000..5056a3d1c1957
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/certificates/certificate_title.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { useSelector } from 'react-redux';
+import { certificatesSelector } from '../../state/certificates/certificates';
+
+export const CertificateTitle = () => {
+  const { data: certificates } = useSelector(certificatesSelector);
+
+  return (
+    <FormattedMessage
+      id="xpack.uptime.certificates.heading"
+      defaultMessage="TLS Certificates ({total})"
+      values={{
+        total: <span data-test-subj="uptimeCertTotal">{certificates?.total ?? 0}</span>,
+      }}
+    />
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/common/__snapshots__/uptime_date_picker.test.tsx.snap b/x-pack/plugins/uptime/public/components/common/__snapshots__/uptime_date_picker.test.tsx.snap
index bfe83cfc13347..d513c0212da75 100644
--- a/x-pack/plugins/uptime/public/components/common/__snapshots__/uptime_date_picker.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/common/__snapshots__/uptime_date_picker.test.tsx.snap
@@ -27,6 +27,7 @@ exports[`UptimeDatePicker component renders properly with mock data 1`] = `
             >
               <span
                 class="euiButtonContent__icon"
+                color="inherit"
                 data-euiicon-type="arrowDown"
               />
               <span
@@ -77,6 +78,7 @@ exports[`UptimeDatePicker component renders properly with mock data 1`] = `
         >
           <span
             class="euiButtonContent__icon"
+            color="inherit"
             data-euiicon-type="refresh"
           />
           <span
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx b/x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx
index 1f1e80838b658..c7884683e1aed 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx
+++ b/x-pack/plugins/uptime/public/components/common/charts/duration_chart.tsx
@@ -113,7 +113,7 @@ export const DurationChartComponent = ({
             tickFormat={timeFormatter(getChartDateLabel(min, max))}
           />
           <Axis
-            domain={{ min: 0 }}
+            domain={{ min: 0, fit: false }}
             id="left"
             position={Position.Left}
             tickFormat={(d) => getTickFormat(d)}
diff --git a/x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx b/x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx
index a13696a6379b3..4ccbbd37b041b 100644
--- a/x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx
+++ b/x-pack/plugins/uptime/public/components/common/charts/duration_line_series_list.tsx
@@ -29,7 +29,6 @@ export const DurationLineSeriesList = ({ monitorType, lines }: Props) => (
         xAccessor={0}
         xScaleType="time"
         yAccessors={[1]}
-        yScaleToDataExtent={false}
         yScaleType="linear"
         fit={Fit.Linear}
         tickFormat={(d) =>
diff --git a/x-pack/plugins/uptime/public/components/common/header/action_menu_content.test.tsx b/x-pack/plugins/uptime/public/components/common/header/action_menu_content.test.tsx
index bc5eab6f92111..89d8f38b1e3b3 100644
--- a/x-pack/plugins/uptime/public/components/common/header/action_menu_content.test.tsx
+++ b/x-pack/plugins/uptime/public/components/common/header/action_menu_content.test.tsx
@@ -49,7 +49,7 @@ describe('ActionMenuContent', () => {
 
     // this href value is mocked, so it doesn't correspond to the real link
     // that Kibana core services will provide
-    expect(addDataAnchor.getAttribute('href')).toBe('/app/uptime');
+    expect(addDataAnchor.getAttribute('href')).toBe('/home#/tutorial/uptimeMonitors');
     expect(getByText('Add data'));
   });
 });
diff --git a/x-pack/plugins/uptime/public/components/common/header/page_header.test.tsx b/x-pack/plugins/uptime/public/components/common/header/page_header.test.tsx
deleted file mode 100644
index 6e04648a817f0..0000000000000
--- a/x-pack/plugins/uptime/public/components/common/header/page_header.test.tsx
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import moment from 'moment';
-import { PageHeader } from './page_header';
-import { Ping } from '../../../../common/runtime_types';
-import { renderWithRouter } from '../../../lib';
-import { mockReduxHooks } from '../../../lib/helper/test_helpers';
-
-describe('PageHeader', () => {
-  const monitorName = 'sample monitor';
-  const defaultMonitorId = 'always-down';
-
-  const defaultMonitorStatus: Ping = {
-    docId: 'few213kl',
-    timestamp: moment(new Date()).subtract(15, 'm').toString(),
-    monitor: {
-      duration: {
-        us: 1234567,
-      },
-      id: defaultMonitorId,
-      status: 'up',
-      type: 'http',
-      name: monitorName,
-    },
-    url: {
-      full: 'https://www.elastic.co/',
-    },
-  };
-
-  beforeEach(() => {
-    mockReduxHooks(defaultMonitorStatus);
-  });
-
-  it('does not render dynamic elements by default', () => {
-    const component = renderWithRouter(<PageHeader />);
-
-    expect(component.find('[data-test-subj="superDatePickerShowDatesButton"]').length).toBe(0);
-    expect(component.find('[data-test-subj="certificatesRefreshButton"]').length).toBe(0);
-    expect(component.find('[data-test-subj="monitorTitle"]').length).toBe(0);
-    expect(component.find('[data-test-subj="uptimeTabs"]').length).toBe(0);
-  });
-
-  it('shallow renders with the date picker', () => {
-    const component = renderWithRouter(<PageHeader showDatePicker />);
-    expect(component.find('[data-test-subj="superDatePickerShowDatesButton"]').length).toBe(1);
-  });
-
-  it('shallow renders with certificate refresh button', () => {
-    const component = renderWithRouter(<PageHeader showCertificateRefreshBtn />);
-    expect(component.find('[data-test-subj="certificatesRefreshButton"]').length).toBe(1);
-  });
-
-  it('renders monitor title when showMonitorTitle', () => {
-    const component = renderWithRouter(<PageHeader showMonitorTitle />);
-    expect(component.find('[data-test-subj="monitorTitle"]').length).toBe(1);
-    expect(component.find('h1').text()).toBe(monitorName);
-  });
-
-  it('renders tabs when showTabs is true', () => {
-    const component = renderWithRouter(<PageHeader showTabs />);
-    expect(component.find('[data-test-subj="uptimeTabs"]').length).toBe(1);
-  });
-});
diff --git a/x-pack/plugins/uptime/public/components/common/header/page_header.tsx b/x-pack/plugins/uptime/public/components/common/header/page_header.tsx
deleted file mode 100644
index 28a133698ae8b..0000000000000
--- a/x-pack/plugins/uptime/public/components/common/header/page_header.tsx
+++ /dev/null
@@ -1,64 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiSpacer } from '@elastic/eui';
-import styled from 'styled-components';
-import { UptimeDatePicker } from '../uptime_date_picker';
-import { SyntheticsCallout } from '../../overview/synthetics_callout';
-import { PageTabs } from './page_tabs';
-import { CertRefreshBtn } from '../../certificates/cert_refresh_btn';
-import { MonitorPageTitle } from '../../monitor/monitor_title';
-
-export interface Props {
-  showCertificateRefreshBtn?: boolean;
-  showDatePicker?: boolean;
-  showMonitorTitle?: boolean;
-  showTabs?: boolean;
-}
-
-const StyledPicker = styled(EuiFlexItem)`
-  &&& {
-    @media only screen and (max-width: 1024px) and (min-width: 868px) {
-      .euiSuperDatePicker__flexWrapper {
-        width: 500px;
-      }
-    }
-    @media only screen and (max-width: 880px) {
-      flex-grow: 1;
-      .euiSuperDatePicker__flexWrapper {
-        width: calc(100% + 8px);
-      }
-    }
-  }
-`;
-
-export const PageHeader = ({
-  showCertificateRefreshBtn = false,
-  showDatePicker = false,
-  showMonitorTitle = false,
-  showTabs = false,
-}: Props) => {
-  return (
-    <>
-      <SyntheticsCallout />
-      <EuiFlexGroup alignItems="center" justifyContent="spaceBetween" wrap responsive={false}>
-        <EuiFlexItem>
-          {showMonitorTitle && <MonitorPageTitle />}
-          {showTabs && <PageTabs />}
-        </EuiFlexItem>
-        {showCertificateRefreshBtn && <CertRefreshBtn />}
-        {showDatePicker && (
-          <StyledPicker grow={false} style={{ flexBasis: 485 }}>
-            <UptimeDatePicker />
-          </StyledPicker>
-        )}
-      </EuiFlexGroup>
-      <EuiSpacer size="m" />
-    </>
-  );
-};
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap
index edf89caaff557..b1d2e53997e36 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/license_info.test.tsx.snap
@@ -12,6 +12,7 @@ Array [
       <span
         aria-hidden="true"
         class="euiCallOutHeader__icon"
+        color="inherit"
         data-euiicon-type="help"
       />
       <span
diff --git a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap
index 39987678a5343..e41366fadef84 100644
--- a/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/ml/__snapshots__/ml_flyout.test.tsx.snap
@@ -98,6 +98,7 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
       <span
         aria-hidden="true"
         class="euiButtonIcon__icon"
+        color="inherit"
         data-euiicon-type="cross"
       />
     </button>
@@ -132,6 +133,7 @@ exports[`ML Flyout component shows license info if no ml available 1`] = `
               <span
                 aria-hidden="true"
                 class="euiCallOutHeader__icon"
+                color="inherit"
                 data-euiicon-type="help"
               />
               <span
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx
index 5e77e68720c52..4fd6335c3d3ca 100644
--- a/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/monitor_title.test.tsx
@@ -48,38 +48,6 @@ describe('MonitorTitle component', () => {
     },
   };
 
-  const defaultTCPMonitorStatus: Ping = {
-    docId: 'few213kl',
-    timestamp: moment(new Date()).subtract(15, 'm').toString(),
-    monitor: {
-      duration: {
-        us: 1234567,
-      },
-      id: 'tcp',
-      status: 'up',
-      type: 'tcp',
-    },
-    url: {
-      full: 'https://www.elastic.co/',
-    },
-  };
-
-  const defaultICMPMonitorStatus: Ping = {
-    docId: 'few213kl',
-    timestamp: moment(new Date()).subtract(15, 'm').toString(),
-    monitor: {
-      duration: {
-        us: 1234567,
-      },
-      id: 'icmp',
-      status: 'up',
-      type: 'icmp',
-    },
-    url: {
-      full: 'https://www.elastic.co/',
-    },
-  };
-
   const defaultBrowserMonitorStatus: Ping = {
     docId: 'few213kl',
     timestamp: moment(new Date()).subtract(15, 'm').toString(),
@@ -145,37 +113,4 @@ describe('MonitorTitle component', () => {
     expect(betaLink.href).toBe('https://www.elastic.co/what-is/synthetic-monitoring');
     expect(screen.getByText('Browser (BETA)')).toBeInTheDocument();
   });
-
-  it('does not render beta disclaimer for http', () => {
-    render(<MonitorPageTitle />, {
-      state: { monitorStatus: { status: defaultMonitorStatus, loading: false } },
-    });
-    expect(screen.getByText('HTTP ping')).toBeInTheDocument();
-    expect(screen.queryByText(/BETA/)).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('link', { name: 'See more External link (opens in a new tab or window)' })
-    ).not.toBeInTheDocument();
-  });
-
-  it('does not render beta disclaimer for tcp', () => {
-    render(<MonitorPageTitle />, {
-      state: { monitorStatus: { status: defaultTCPMonitorStatus, loading: false } },
-    });
-    expect(screen.getByText('TCP ping')).toBeInTheDocument();
-    expect(screen.queryByText(/BETA/)).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('link', { name: 'See more External link (opens in a new tab or window)' })
-    ).not.toBeInTheDocument();
-  });
-
-  it('renders badge and does not render beta disclaimer for icmp', () => {
-    render(<MonitorPageTitle />, {
-      state: { monitorStatus: { status: defaultICMPMonitorStatus, loading: false } },
-    });
-    expect(screen.getByText('ICMP ping')).toBeInTheDocument();
-    expect(screen.queryByText(/BETA/)).not.toBeInTheDocument();
-    expect(
-      screen.queryByRole('link', { name: 'See more External link (opens in a new tab or window)' })
-    ).not.toBeInTheDocument();
-  });
 });
diff --git a/x-pack/plugins/uptime/public/components/monitor/monitor_title.tsx b/x-pack/plugins/uptime/public/components/monitor/monitor_title.tsx
index eebd3d8aeb14d..8cb1c49cbd974 100644
--- a/x-pack/plugins/uptime/public/components/monitor/monitor_title.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/monitor_title.tsx
@@ -5,7 +5,15 @@
  * 2.0.
  */
 
-import { EuiBadge, EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle, EuiLink } from '@elastic/eui';
+import {
+  EuiBadge,
+  EuiFlexGroup,
+  EuiFlexItem,
+  EuiSpacer,
+  EuiTitle,
+  EuiLink,
+  EuiText,
+} from '@elastic/eui';
 import { FormattedMessage } from '@kbn/i18n/react';
 import React from 'react';
 import { useSelector } from 'react-redux';
@@ -95,26 +103,26 @@ export const MonitorPageTitle: React.FC = () => {
       <EuiSpacer size="s" />
       <EuiFlexGroup wrap={false} gutterSize="s" alignItems="center">
         <EuiFlexItem grow={false}>
-          {type && (
+          {isBrowser && type && (
             <EuiBadge color="hollow">
               {renderMonitorType(type)}{' '}
-              {isBrowser && (
-                <FormattedMessage
-                  id="xpack.uptime.monitorDetails.title.disclaimer.description"
-                  defaultMessage="(BETA)"
-                />
-              )}
+              <FormattedMessage
+                id="xpack.uptime.monitorDetails.title.disclaimer.description"
+                defaultMessage="(BETA)"
+              />
             </EuiBadge>
           )}
         </EuiFlexItem>
         {isBrowser && (
           <EuiFlexItem grow={false}>
-            <EuiLink href="https://www.elastic.co/what-is/synthetic-monitoring" target="_blank">
-              <FormattedMessage
-                id="xpack.uptime.monitorDetails.title.disclaimer.link"
-                defaultMessage="See more"
-              />
-            </EuiLink>
+            <EuiText>
+              <EuiLink href="https://www.elastic.co/what-is/synthetic-monitoring" target="_blank">
+                <FormattedMessage
+                  id="xpack.uptime.monitorDetails.title.disclaimer.link"
+                  defaultMessage="See more"
+                />
+              </EuiLink>
+            </EuiText>
           </EuiFlexItem>
         )}
       </EuiFlexGroup>
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/availability_reporting.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/availability_reporting.test.tsx.snap
index f76f37a6e7fa7..5a660c7cb764f 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/availability_reporting.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/availability_reporting.test.tsx.snap
@@ -41,7 +41,7 @@ Array [
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -49,7 +49,7 @@ Array [
                 >
                   Location
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -57,7 +57,7 @@ Array [
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -65,7 +65,7 @@ Array [
                 >
                   Availability
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -73,7 +73,7 @@ Array [
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -81,7 +81,7 @@ Array [
                 >
                   Last check
                 </span>
-              </div>
+              </span>
             </th>
           </tr>
         </thead>
diff --git a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/location_status_tags.test.tsx.snap b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/location_status_tags.test.tsx.snap
index 44a2021cce611..fefcb2d3c84e1 100644
--- a/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/location_status_tags.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/monitor/status_details/availability_reporting/__snapshots__/location_status_tags.test.tsx.snap
@@ -78,7 +78,7 @@ exports[`LocationStatusTags component renders when all locations are down 1`] =
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -86,7 +86,7 @@ exports[`LocationStatusTags component renders when all locations are down 1`] =
                 >
                   Location
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -94,7 +94,7 @@ exports[`LocationStatusTags component renders when all locations are down 1`] =
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -102,7 +102,7 @@ exports[`LocationStatusTags component renders when all locations are down 1`] =
                 >
                   Availability
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -110,7 +110,7 @@ exports[`LocationStatusTags component renders when all locations are down 1`] =
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -118,7 +118,7 @@ exports[`LocationStatusTags component renders when all locations are down 1`] =
                 >
                   Last check
                 </span>
-              </div>
+              </span>
             </th>
           </tr>
         </thead>
@@ -316,7 +316,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -324,7 +324,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
                 >
                   Location
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -332,7 +332,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -340,7 +340,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
                 >
                   Availability
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -348,7 +348,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -356,7 +356,7 @@ exports[`LocationStatusTags component renders when all locations are up 1`] = `
                 >
                   Last check
                 </span>
-              </div>
+              </span>
             </th>
           </tr>
         </thead>
@@ -554,7 +554,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -562,7 +562,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
                 >
                   Location
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -570,7 +570,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -578,7 +578,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
                 >
                   Availability
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -586,7 +586,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
@@ -594,7 +594,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
                 >
                   Last check
                 </span>
-              </div>
+              </span>
             </th>
           </tr>
         </thead>
@@ -983,6 +983,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowLeft"
               />
             </button>
@@ -1046,6 +1047,7 @@ exports[`LocationStatusTags component renders when there are many location 1`] =
               <span
                 aria-hidden="true"
                 class="euiButtonIcon__icon"
+                color="inherit"
                 data-euiicon-type="arrowRight"
               />
             </a>
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail.tsx
deleted file mode 100644
index befe53219a449..0000000000000
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail.tsx
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import {
-  EuiFlexGroup,
-  EuiFlexItem,
-  EuiSpacer,
-  EuiTitle,
-  EuiButtonEmpty,
-  EuiText,
-} from '@elastic/eui';
-import { i18n } from '@kbn/i18n';
-import { FormattedMessage } from '@kbn/i18n/react';
-import React from 'react';
-import moment from 'moment';
-import { WaterfallChartContainer } from './waterfall/waterfall_chart_container';
-
-export const PREVIOUS_CHECK_BUTTON_TEXT = i18n.translate(
-  'xpack.uptime.synthetics.stepDetail.previousCheckButtonText',
-  {
-    defaultMessage: 'Previous check',
-  }
-);
-
-export const NEXT_CHECK_BUTTON_TEXT = i18n.translate(
-  'xpack.uptime.synthetics.stepDetail.nextCheckButtonText',
-  {
-    defaultMessage: 'Next check',
-  }
-);
-
-interface Props {
-  checkGroup: string;
-  stepName?: string;
-  stepIndex: number;
-  totalSteps: number;
-  hasPreviousStep: boolean;
-  hasNextStep: boolean;
-  handlePreviousStep: () => void;
-  handleNextStep: () => void;
-  handleNextRun: () => void;
-  handlePreviousRun: () => void;
-  previousCheckGroup?: string;
-  nextCheckGroup?: string;
-  checkTimestamp?: string;
-  dateFormat: string;
-}
-
-export const StepDetail: React.FC<Props> = ({
-  dateFormat,
-  stepName,
-  checkGroup,
-  stepIndex,
-  totalSteps,
-  hasPreviousStep,
-  hasNextStep,
-  handlePreviousStep,
-  handleNextStep,
-  handlePreviousRun,
-  handleNextRun,
-  previousCheckGroup,
-  nextCheckGroup,
-  checkTimestamp,
-}) => {
-  return (
-    <>
-      <EuiFlexGroup justifyContent="spaceBetween" responsive={false} wrap>
-        <EuiFlexItem>
-          <EuiFlexGroup alignItems="center" responsive={false}>
-            <EuiFlexItem grow={false}>
-              <EuiTitle size="s">
-                <h1>{stepName}</h1>
-              </EuiTitle>
-            </EuiFlexItem>
-            <EuiFlexItem>
-              <EuiFlexGroup alignItems="center" responsive={false}>
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty
-                    onClick={handlePreviousStep}
-                    disabled={!hasPreviousStep}
-                    iconType="arrowLeft"
-                  />
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiText size="s">
-                    <FormattedMessage
-                      id="xpack.uptime.synthetics.stepDetail.totalSteps"
-                      defaultMessage="Step {stepIndex} of {totalSteps}"
-                      values={{
-                        stepIndex,
-                        totalSteps,
-                      }}
-                    />
-                  </EuiText>
-                </EuiFlexItem>
-                <EuiFlexItem grow={false}>
-                  <EuiButtonEmpty
-                    onClick={handleNextStep}
-                    disabled={!hasNextStep}
-                    iconType="arrowRight"
-                  />
-                </EuiFlexItem>
-              </EuiFlexGroup>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-        <EuiFlexItem>
-          <EuiFlexGroup alignItems="center" justifyContent="flexEnd" responsive={false}>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                onClick={handlePreviousRun}
-                disabled={!previousCheckGroup}
-                iconType="arrowLeft"
-                aria-label={PREVIOUS_CHECK_BUTTON_TEXT}
-              >
-                {PREVIOUS_CHECK_BUTTON_TEXT}
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiText size="s">{moment(checkTimestamp).format(dateFormat)}</EuiText>
-            </EuiFlexItem>
-            <EuiFlexItem grow={false}>
-              <EuiButtonEmpty
-                onClick={handleNextRun}
-                disabled={!nextCheckGroup}
-                iconType="arrowRight"
-                iconSide="right"
-                aria-label={NEXT_CHECK_BUTTON_TEXT}
-              >
-                {NEXT_CHECK_BUTTON_TEXT}
-              </EuiButtonEmpty>
-            </EuiFlexItem>
-          </EuiFlexGroup>
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer size="l" />
-      <WaterfallChartContainer checkGroup={checkGroup} stepIndex={stepIndex} />
-    </>
-  );
-};
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx
index ef0d001ac905e..df8f5dff59dc2 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_detail_container.tsx
@@ -13,8 +13,12 @@ import { useHistory } from 'react-router-dom';
 import { getJourneySteps } from '../../../../state/actions/journey';
 import { journeySelector } from '../../../../state/selectors';
 import { useUiSetting$ } from '../../../../../../../../src/plugins/kibana_react/public';
-import { StepDetail } from './step_detail';
 import { useMonitorBreadcrumb } from './use_monitor_breadcrumb';
+import { ClientPluginsStart } from '../../../../apps/plugin';
+import { useKibana } from '../../../../../../../../src/plugins/kibana_react/public';
+import { StepPageTitle } from './step_page_title';
+import { StepPageNavigation } from './step_page_nav';
+import { WaterfallChartContainer } from './waterfall/waterfall_chart_container';
 
 export const NO_STEP_DATA = i18n.translate('xpack.uptime.synthetics.stepDetail.noData', {
   defaultMessage: 'No data could be found for this step',
@@ -66,8 +70,40 @@ export const StepDetailContainer: React.FC<Props> = ({ checkGroup, stepIndex })
     history.push(`/journey/${journey?.details?.previous?.checkGroup}/step/1`);
   }, [history, journey?.details?.previous?.checkGroup]);
 
+  const {
+    services: { observability },
+  } = useKibana<ClientPluginsStart>();
+  const PageTemplateComponent = observability.navigation.PageTemplate;
+
   return (
-    <>
+    <PageTemplateComponent
+      pageHeader={{
+        pageTitle:
+          journey && activeStep ? (
+            <StepPageTitle
+              stepName={activeStep.synthetics?.step?.name}
+              stepIndex={stepIndex}
+              totalSteps={journey.steps.length}
+              hasPreviousStep={hasPreviousStep}
+              hasNextStep={hasNextStep}
+              handlePreviousStep={handlePreviousStep}
+              handleNextStep={handleNextStep}
+            />
+          ) : null,
+        rightSideItems: journey
+          ? [
+              <StepPageNavigation
+                dateFormat={dateFormat}
+                handleNextRun={handleNextRun}
+                handlePreviousRun={handlePreviousRun}
+                nextCheckGroup={journey.details?.next?.checkGroup}
+                previousCheckGroup={journey.details?.previous?.checkGroup}
+                checkTimestamp={journey.details?.timestamp}
+              />,
+            ]
+          : [],
+      }}
+    >
       <EuiPanel>
         {(!journey || journey.loading) && (
           <EuiFlexGroup justifyContent="center">
@@ -86,24 +122,9 @@ export const StepDetailContainer: React.FC<Props> = ({ checkGroup, stepIndex })
           </EuiFlexGroup>
         )}
         {journey && activeStep && !journey.loading && (
-          <StepDetail
-            checkGroup={checkGroup}
-            stepName={activeStep.synthetics?.step?.name}
-            stepIndex={stepIndex}
-            totalSteps={journey.steps.length}
-            hasPreviousStep={hasPreviousStep}
-            hasNextStep={hasNextStep}
-            handlePreviousStep={handlePreviousStep}
-            handleNextStep={handleNextStep}
-            handleNextRun={handleNextRun}
-            handlePreviousRun={handlePreviousRun}
-            previousCheckGroup={journey.details?.previous?.checkGroup}
-            nextCheckGroup={journey.details?.next?.checkGroup}
-            checkTimestamp={journey.details?.timestamp}
-            dateFormat={dateFormat}
-          />
+          <WaterfallChartContainer checkGroup={checkGroup} stepIndex={stepIndex} />
         )}
       </EuiPanel>
-    </>
+    </PageTemplateComponent>
   );
 };
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_nav.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_nav.tsx
new file mode 100644
index 0000000000000..81c72b74c18e8
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_nav.tsx
@@ -0,0 +1,71 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText } from '@elastic/eui';
+import moment from 'moment';
+import { i18n } from '@kbn/i18n';
+
+export const PREVIOUS_CHECK_BUTTON_TEXT = i18n.translate(
+  'xpack.uptime.synthetics.stepDetail.previousCheckButtonText',
+  {
+    defaultMessage: 'Previous check',
+  }
+);
+
+export const NEXT_CHECK_BUTTON_TEXT = i18n.translate(
+  'xpack.uptime.synthetics.stepDetail.nextCheckButtonText',
+  {
+    defaultMessage: 'Next check',
+  }
+);
+
+interface Props {
+  previousCheckGroup?: string;
+  dateFormat: string;
+  checkTimestamp?: string;
+  nextCheckGroup?: string;
+  handlePreviousRun: () => void;
+  handleNextRun: () => void;
+}
+export const StepPageNavigation = ({
+  previousCheckGroup,
+  dateFormat,
+  handleNextRun,
+  handlePreviousRun,
+  checkTimestamp,
+  nextCheckGroup,
+}: Props) => {
+  return (
+    <EuiFlexGroup alignItems="center" justifyContent="flexEnd" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty
+          onClick={handlePreviousRun}
+          disabled={!previousCheckGroup}
+          iconType="arrowLeft"
+          aria-label={PREVIOUS_CHECK_BUTTON_TEXT}
+        >
+          {PREVIOUS_CHECK_BUTTON_TEXT}
+        </EuiButtonEmpty>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiText size="s">{moment(checkTimestamp).format(dateFormat)}</EuiText>
+      </EuiFlexItem>
+      <EuiFlexItem grow={false}>
+        <EuiButtonEmpty
+          onClick={handleNextRun}
+          disabled={!nextCheckGroup}
+          iconType="arrowRight"
+          iconSide="right"
+          aria-label={NEXT_CHECK_BUTTON_TEXT}
+        >
+          {NEXT_CHECK_BUTTON_TEXT}
+        </EuiButtonEmpty>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_title.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_title.tsx
new file mode 100644
index 0000000000000..083f2f1533e2e
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/step_page_title.tsx
@@ -0,0 +1,69 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiButtonEmpty, EuiFlexGroup, EuiFlexItem, EuiText, EuiTitle } from '@elastic/eui';
+import { FormattedMessage } from '@kbn/i18n/react';
+
+interface Props {
+  stepName?: string;
+  stepIndex: number;
+  totalSteps: number;
+  hasPreviousStep: boolean;
+  hasNextStep: boolean;
+  handlePreviousStep: () => void;
+  handleNextStep: () => void;
+}
+export const StepPageTitle = ({
+  stepName,
+  stepIndex,
+  totalSteps,
+  handleNextStep,
+  handlePreviousStep,
+  hasNextStep,
+  hasPreviousStep,
+}: Props) => {
+  return (
+    <EuiFlexGroup alignItems="center" responsive={false}>
+      <EuiFlexItem grow={false}>
+        <EuiTitle size="s">
+          <h1>{stepName}</h1>
+        </EuiTitle>
+      </EuiFlexItem>
+      <EuiFlexItem>
+        <EuiFlexGroup alignItems="center" responsive={false}>
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              onClick={handlePreviousStep}
+              disabled={!hasPreviousStep}
+              iconType="arrowLeft"
+            />
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiText size="s">
+              <FormattedMessage
+                id="xpack.uptime.synthetics.stepDetail.totalSteps"
+                defaultMessage="Step {stepIndex} of {totalSteps}"
+                values={{
+                  stepIndex,
+                  totalSteps,
+                }}
+              />
+            </EuiText>
+          </EuiFlexItem>
+          <EuiFlexItem grow={false}>
+            <EuiButtonEmpty
+              onClick={handleNextStep}
+              disabled={!hasNextStep}
+              iconType="arrowRight"
+            />
+          </EuiFlexItem>
+        </EuiFlexGroup>
+      </EuiFlexItem>
+    </EuiFlexGroup>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
index 4aed073424788..4521d9f82f92e 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/use_monitor_breadcrumbs.test.tsx
@@ -63,6 +63,10 @@ describe('useMonitorBreadcrumbs', () => {
 
     expect(getBreadcrumbs()).toMatchInlineSnapshot(`
       Array [
+        Object {
+          "href": "",
+          "text": "Observability",
+        },
         Object {
           "href": "/app/uptime",
           "onClick": [Function],
@@ -129,6 +133,10 @@ describe('useMonitorBreadcrumbs', () => {
 
     expect(getBreadcrumbs()).toMatchInlineSnapshot(`
       Array [
+        Object {
+          "href": "",
+          "text": "Observability",
+        },
         Object {
           "href": "/app/uptime",
           "onClick": [Function],
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts
index ebb6eb6bdc989..229933c2f0642 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.test.ts
@@ -7,6 +7,7 @@
 import moment from 'moment';
 import {
   colourPalette,
+  formatTooltipHeading,
   getConnectingTime,
   getSeriesAndDomain,
   getSidebarItems,
@@ -729,3 +730,13 @@ describe('getSidebarItems', () => {
     expect(actual[0].offsetIndex).toBe(1);
   });
 });
+
+describe('formatTooltipHeading', () => {
+  it('puts index and URL text together', () => {
+    expect(formatTooltipHeading(1, 'http://www.elastic.co/')).toEqual('1. http://www.elastic.co/');
+  });
+
+  it('returns only the text if `index` is NaN', () => {
+    expect(formatTooltipHeading(NaN, 'http://www.elastic.co/')).toEqual('http://www.elastic.co/');
+  });
+});
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts
index f497bf1ea7b35..0f0ce01d25099 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/step_detail/waterfall/data_formatting.ts
@@ -450,3 +450,6 @@ const MIME_TYPE_PALETTE = buildMimeTypePalette();
 type ColourPalette = TimingColourPalette & MimeTypeColourPalette;
 
 export const colourPalette: ColourPalette = { ...TIMING_PALETTE, ...MIME_TYPE_PALETTE };
+
+export const formatTooltipHeading = (index: number, fullText: string): string =>
+  isNaN(index) ? fullText : `${index}. ${fullText}`;
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
index cb7159485856c..956f4b19c6626 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/middle_truncated_text.tsx
@@ -8,16 +8,19 @@
 import React, { useMemo } from 'react';
 import { FormattedMessage } from '@kbn/i18n/react';
 import {
+  EuiButtonEmpty,
   EuiScreenReaderOnly,
   EuiToolTip,
-  EuiButtonEmpty,
   EuiLink,
   EuiText,
   EuiIcon,
 } from '@elastic/eui';
 import { i18n } from '@kbn/i18n';
+import { WaterfallTooltipContent } from './waterfall_tooltip_content';
+import { WaterfallTooltipResponsiveMaxWidth } 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 {
   index: number;
@@ -113,7 +116,15 @@ export const MiddleTruncatedText = ({
       <EuiScreenReaderOnly>
         <span data-test-subj="middleTruncatedTextSROnly">{fullText}</span>
       </EuiScreenReaderOnly>
-      <EuiToolTip content={fullText} position="top" data-test-subj="middleTruncatedTextToolTip">
+      <WaterfallTooltipResponsiveMaxWidth
+        as={EuiToolTip}
+        content={
+          <WaterfallTooltipContent {...{ text: formatTooltipHeading(index, fullText), url }} />
+        }
+        data-test-subj="middleTruncatedTextToolTip"
+        delay="long"
+        position="top"
+      >
         <>
           {onClick ? (
             <StyledButton
@@ -153,7 +164,7 @@ export const MiddleTruncatedText = ({
             </InnerContainer>
           )}
         </>
-      </EuiToolTip>
+      </WaterfallTooltipResponsiveMaxWidth>
       <span>
         <EuiLink href={url} external target="_blank">
           <EuiScreenReaderOnly>
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
index 9a884c6824284..f8de61f9d8690 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/styles.ts
@@ -143,11 +143,19 @@ export const WaterfallChartLegendContainer = euiStyled.div`
   box-shadow: 0px -1px 4px 0px ${(props) => props.theme.eui.euiColorLightShade};
 `; // NOTE: EuiShadowColor is a little too dark to work with the background-color
 
-export const WaterfallChartTooltip = euiStyled.div`
+export const WaterfallTooltipResponsiveMaxWidth = euiStyled.div`
+  margin-top: 16px;
+  max-width: 90vw;
+`;
+
+export const WaterfallChartTooltip = euiStyled(WaterfallTooltipResponsiveMaxWidth)`
   background-color: ${(props) => props.theme.eui.euiColorDarkestShade};
   border-radius: ${(props) => props.theme.eui.euiBorderRadius};
   color: ${(props) => props.theme.eui.euiColorLightestShade};
   padding: ${(props) => props.theme.eui.paddingSizes.s};
+  .euiToolTip__arrow {
+    background-color: ${(props) => props.theme.eui.euiColorDarkestShade};
+  }
 `;
 
 export const NetworkRequestsTotalStyle = euiStyled(EuiText)`
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx
index 19a828aa097b6..8723dd744132a 100644
--- a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_bar_chart.tsx
@@ -18,11 +18,12 @@ import {
   TickFormatter,
   TooltipInfo,
 } from '@elastic/charts';
-import { EuiFlexGroup, EuiFlexItem } from '@elastic/eui';
 import { BAR_HEIGHT } from './constants';
 import { useChartTheme } from '../../../../../hooks/use_chart_theme';
 import { WaterfallChartChartContainer, WaterfallChartTooltip } from './styles';
 import { useWaterfallContext, WaterfallData } from '..';
+import { WaterfallTooltipContent } from './waterfall_tooltip_content';
+import { formatTooltipHeading } from '../../step_detail/waterfall/data_formatting';
 
 const getChartHeight = (data: WaterfallData): number => {
   // We get the last item x(number of bars) and adds 1 to cater for 0 index
@@ -32,23 +33,25 @@ const getChartHeight = (data: WaterfallData): number => {
 };
 
 const Tooltip = (tooltipInfo: TooltipInfo) => {
-  const { data, renderTooltipItem } = useWaterfallContext();
-  const relevantItems = data.filter((item) => {
-    return (
-      item.x === tooltipInfo.header?.value && item.config.showTooltip && item.config.tooltipProps
-    );
-  });
-  return relevantItems.length ? (
-    <WaterfallChartTooltip>
-      <EuiFlexGroup direction="column" gutterSize="none">
-        {relevantItems.map((item, index) => {
-          return (
-            <EuiFlexItem key={index}>{renderTooltipItem(item.config.tooltipProps)}</EuiFlexItem>
-          );
-        })}
-      </EuiFlexGroup>
-    </WaterfallChartTooltip>
-  ) : null;
+  const { data, sidebarItems } = useWaterfallContext();
+  return useMemo(() => {
+    const sidebarItem = sidebarItems?.find((item) => item.index === tooltipInfo.header?.value);
+    const relevantItems = data.filter((item) => {
+      return (
+        item.x === tooltipInfo.header?.value && item.config.showTooltip && item.config.tooltipProps
+      );
+    });
+    return relevantItems.length ? (
+      <WaterfallChartTooltip>
+        {sidebarItem && (
+          <WaterfallTooltipContent
+            text={formatTooltipHeading(sidebarItem.index + 1, sidebarItem.url)}
+            url={sidebarItem.url}
+          />
+        )}
+      </WaterfallChartTooltip>
+    ) : null;
+  }, [data, sidebarItems, tooltipInfo.header?.value]);
 };
 
 interface Props {
@@ -82,7 +85,12 @@ export const WaterfallBarChart = ({
         <Settings
           showLegend={false}
           rotation={90}
-          tooltip={{ customTooltip: Tooltip }}
+          tooltip={{
+            // this is done to prevent the waterfall tooltip from rendering behind Kibana's
+            // stacked header when the user highlights an item at the top of the chart
+            boundary: document.getElementById('app-fixed-viewport') ?? undefined,
+            customTooltip: Tooltip,
+          }}
           theme={theme}
           onProjectionClick={handleProjectionClick}
           onElementClick={handleElementClick}
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.test.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.test.tsx
new file mode 100644
index 0000000000000..fd5de14656a14
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.test.tsx
@@ -0,0 +1,84 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { render } from '../../../../../lib/helper/rtl_helpers';
+import { WaterfallTooltipContent } from './waterfall_tooltip_content';
+
+jest.mock('../context/waterfall_chart', () => ({
+  useWaterfallContext: jest.fn().mockReturnValue({
+    data: [
+      {
+        x: 0,
+        config: {
+          url: 'https://www.elastic.co',
+          tooltipProps: {
+            colour: '#000000',
+            value: 'test-val',
+          },
+          showTooltip: true,
+        },
+      },
+      {
+        x: 0,
+        config: {
+          url: 'https://www.elastic.co/with/missing/tooltip.props',
+          showTooltip: true,
+        },
+      },
+      {
+        x: 1,
+        config: {
+          url: 'https://www.elastic.co/someresource.path',
+          tooltipProps: {
+            colour: '#010000',
+            value: 'test-val-missing',
+          },
+          showTooltip: true,
+        },
+      },
+    ],
+    renderTooltipItem: (props: any) => (
+      <div aria-label="tooltip item">
+        <div>{props.colour}</div>
+        <div>{props.value}</div>
+      </div>
+    ),
+    sidebarItems: [
+      {
+        isHighlighted: true,
+        index: 0,
+        offsetIndex: 1,
+        url: 'https://www.elastic.co',
+        status: 200,
+        method: 'GET',
+      },
+    ],
+  }),
+}));
+
+describe('WaterfallTooltipContent', () => {
+  it('renders tooltip', () => {
+    const { getByText, queryByText } = render(
+      <WaterfallTooltipContent text="1. https://www.elastic.co" url="https://www.elastic.co" />
+    );
+    expect(getByText('#000000')).toBeInTheDocument();
+    expect(getByText('test-val')).toBeInTheDocument();
+    expect(getByText('1. https://www.elastic.co')).toBeInTheDocument();
+    expect(queryByText('#010000')).toBeNull();
+    expect(queryByText('test-val-missing')).toBeNull();
+  });
+
+  it(`doesn't render metric if tooltip props missing`, () => {
+    const { getAllByLabelText, getByText } = render(
+      <WaterfallTooltipContent text="1. https://www.elastic.co" url="https://www.elastic.co" />
+    );
+    const metricElements = getAllByLabelText('tooltip item');
+    expect(metricElements).toHaveLength(1);
+    expect(getByText('test-val')).toBeInTheDocument();
+  });
+});
diff --git a/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
new file mode 100644
index 0000000000000..21b3bf72d2217
--- /dev/null
+++ b/x-pack/plugins/uptime/public/components/monitor/synthetics/waterfall/components/waterfall_tooltip_content.tsx
@@ -0,0 +1,46 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import React from 'react';
+import { EuiFlexGroup, EuiFlexItem, EuiHorizontalRule, EuiText } from '@elastic/eui';
+import { useWaterfallContext } from '../context/waterfall_chart';
+import { euiStyled } from '../../../../../../../../../src/plugins/kibana_react/common';
+
+interface Props {
+  text: string;
+  url: string;
+}
+
+const StyledText = euiStyled(EuiText)`
+  font-weight: bold;
+`;
+
+const StyledHorizontalRule = euiStyled(EuiHorizontalRule)`
+  background-color: ${(props) => props.theme.eui.euiColorDarkShade};
+`;
+
+export const WaterfallTooltipContent: React.FC<Props> = ({ text, url }) => {
+  const { data, renderTooltipItem, sidebarItems } = useWaterfallContext();
+
+  const tooltipMetrics = data.filter(
+    (datum) =>
+      datum.x === sidebarItems?.find((sidebarItem) => sidebarItem.url === url)?.index &&
+      datum.config.tooltipProps &&
+      datum.config.showTooltip
+  );
+  return (
+    <>
+      <StyledText>{text}</StyledText>
+      <StyledHorizontalRule margin="none" />
+      <EuiFlexGroup direction="column" gutterSize="none">
+        {tooltipMetrics.map((item, idx) => (
+          <EuiFlexItem key={idx}>{renderTooltipItem(item.config.tooltipProps)}</EuiFlexItem>
+        ))}
+      </EuiFlexGroup>
+    </>
+  );
+};
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/__snapshots__/data_or_index_missing.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/empty_state/__snapshots__/data_or_index_missing.test.tsx.snap
index 41e46259715ee..45e40f71c0fde 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/__snapshots__/data_or_index_missing.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/__snapshots__/data_or_index_missing.test.tsx.snap
@@ -51,14 +51,14 @@ exports[`DataOrIndexMissing component renders headingMessage 1`] = `
           <React.Fragment>
             <p>
               <FormattedMessage
-                defaultMessage="If you have not setup heartbeat yet, you can setup heartbeat to start monitoring your services."
+                defaultMessage="Set up Heartbeat to start monitoring your services."
                 id="xpack.uptime.emptyState.configureHeartbeatToGetStartedMessage"
                 values={Object {}}
               />
             </p>
             <p>
               <FormattedMessage
-                defaultMessage="If you have setup heartbeat and confirmed data is being sent to Elasticsearch, update your index pattern settings and insure they are aligned with your Heartbeat config."
+                defaultMessage="If Heartbeat is already set up, confirm it's sending data to Elasticsearch, then update the index pattern settings to match the Heartbeat config."
                 id="xpack.uptime.emptyState.configureHeartbeatIndexSettings"
                 values={Object {}}
               />
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx
index 77927b5750ff3..7f9839ff94dbe 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/data_or_index_missing.tsx
@@ -43,14 +43,14 @@ export const DataOrIndexMissing = ({ headingMessage, settings }: DataMissingProp
                 <p>
                   <FormattedMessage
                     id="xpack.uptime.emptyState.configureHeartbeatToGetStartedMessage"
-                    defaultMessage="If you have not setup heartbeat yet, you can setup heartbeat to start monitoring your services."
+                    defaultMessage="Set up Heartbeat to start monitoring your services."
                   />
                 </p>
                 <p>
                   <FormattedMessage
                     id="xpack.uptime.emptyState.configureHeartbeatIndexSettings"
-                    defaultMessage="If you have setup heartbeat and confirmed data is being sent to Elasticsearch,
-                    update your index pattern settings and insure they are aligned with your Heartbeat config."
+                    defaultMessage="If Heartbeat is already set up, confirm it's sending data to Elasticsearch,
+                    then update the index pattern settings to match the Heartbeat config."
                   />
                 </p>
               </>
diff --git a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.tsx b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
index 5a28c7c2592d7..a6fd6579c49fa 100644
--- a/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
+++ b/x-pack/plugins/uptime/public/components/overview/empty_state/empty_state.tsx
@@ -38,7 +38,7 @@ export const EmptyStateComponent = ({
   const noIndicesMessage = (
     <FormattedMessage
       id="xpack.uptime.emptyState.noIndexTitle"
-      defaultMessage="No indices found matching pattern {indexName}"
+      defaultMessage="No indices found for the pattern {indexName}"
       values={{ indexName: <em>{settings?.heartbeatIndices}</em> }}
     />
   );
diff --git a/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap b/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap
index dc125ec4b8466..115dab1095dc1 100644
--- a/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap
+++ b/x-pack/plugins/uptime/public/components/overview/monitor_list/__snapshots__/monitor_list.test.tsx.snap
@@ -969,7 +969,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -977,7 +977,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 >
                   Status
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell euiTableHeaderCell--hideForMobile"
@@ -985,7 +985,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -993,7 +993,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 >
                   Name
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -1002,7 +1002,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
               scope="col"
               style="width:30%"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -1010,7 +1010,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 >
                   Url
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -1019,7 +1019,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
               scope="col"
               style="width:12%"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -1027,7 +1027,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 >
                   Tags
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -1035,7 +1035,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent"
               >
                 <span
@@ -1043,7 +1043,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 >
                   TLS Certificate
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell euiTableHeaderCell--hideForMobile"
@@ -1051,7 +1051,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
               role="columnheader"
               scope="col"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignCenter"
               >
                 <span
@@ -1059,7 +1059,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 >
                   Downtime history
                 </span>
-              </div>
+              </span>
             </th>
             <th
               class="euiTableHeaderCell"
@@ -1068,7 +1068,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
               scope="col"
               style="width:100px"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignCenter"
               >
                 <span
@@ -1076,7 +1076,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                 >
                   Status alert
                 </span>
-              </div>
+              </span>
             </th>
             <td
               class="euiTableHeaderCell"
@@ -1085,13 +1085,13 @@ exports[`MonitorList component renders the monitor list 1`] = `
               scope="col"
               style="width:40px"
             >
-              <div
+              <span
                 class="euiTableCellContent euiTableCellContent--alignRight"
               >
                 <span
                   class="euiTableCellContent__text"
                 />
-              </div>
+              </span>
             </td>
           </tr>
         </thead>
@@ -1342,6 +1342,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1594,6 +1595,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
                   <span
                     aria-hidden="true"
                     class="euiButtonIcon__icon"
+                    color="inherit"
                     data-euiicon-type="arrowDown"
                   />
                 </button>
@@ -1629,6 +1631,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             >
               <span
                 class="euiButtonContent__icon"
+                color="inherit"
                 data-euiicon-type="arrowDown"
               />
               <span
@@ -1660,6 +1663,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             <span
               aria-hidden="true"
               class="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="arrowLeft"
             />
           </button>
@@ -1677,6 +1681,7 @@ exports[`MonitorList component renders the monitor list 1`] = `
             <span
               aria-hidden="true"
               class="euiButtonIcon__icon"
+              color="inherit"
               data-euiicon-type="arrowRight"
             />
           </button>
diff --git a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
index 6fc98fbaf1f5b..9d7318a45f76e 100644
--- a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
+++ b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.test.tsx
@@ -19,14 +19,8 @@ describe('useBreadcrumbs', () => {
     const [getBreadcrumbs, core] = mockCore();
 
     const expectedCrumbs: ChromeBreadcrumb[] = [
-      {
-        text: 'Crumb: ',
-        href: 'http://href.example.net',
-      },
-      {
-        text: 'Crumb II: Son of Crumb',
-        href: 'http://href2.example.net',
-      },
+      { text: 'Crumb: ', href: 'http://href.example.net' },
+      { text: 'Crumb II: Son of Crumb', href: 'http://href2.example.net' },
     ];
 
     const Component = () => {
@@ -46,7 +40,9 @@ describe('useBreadcrumbs', () => {
 
     const urlParams: UptimeUrlParams = getSupportedUrlParams({});
     expect(JSON.stringify(getBreadcrumbs())).toEqual(
-      JSON.stringify([makeBaseBreadcrumb('/app/uptime', urlParams)].concat(expectedCrumbs))
+      JSON.stringify(
+        makeBaseBreadcrumb('/app/uptime', '/app/observability', urlParams).concat(expectedCrumbs)
+      )
     );
   });
 });
@@ -58,7 +54,7 @@ const mockCore: () => [() => ChromeBreadcrumb[], any] = () => {
   };
   const core = {
     application: {
-      getUrlForApp: () => '/app/uptime',
+      getUrlForApp: (app: string) => (app === 'uptime' ? '/app/uptime' : '/app/observability'),
       navigateToUrl: jest.fn(),
     },
     chrome: {
diff --git a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
index f2ec25b50332b..5ea81e579ff92 100644
--- a/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
+++ b/x-pack/plugins/uptime/public/hooks/use_breadcrumbs.ts
@@ -36,34 +36,52 @@ function handleBreadcrumbClick(
   }));
 }
 
-export const makeBaseBreadcrumb = (href: string, params?: UptimeUrlParams): EuiBreadcrumb => {
+export const makeBaseBreadcrumb = (
+  uptimePath: string,
+  observabilityPath: string,
+  params?: UptimeUrlParams
+): [EuiBreadcrumb, EuiBreadcrumb] => {
   if (params) {
     const crumbParams: Partial<UptimeUrlParams> = { ...params };
 
     delete crumbParams.statusFilter;
     const query = stringifyUrlParams(crumbParams, true);
-    href += query === EMPTY_QUERY ? '' : query;
+    uptimePath += query === EMPTY_QUERY ? '' : query;
   }
-  return {
-    text: i18n.translate('xpack.uptime.breadcrumbs.overviewBreadcrumbText', {
-      defaultMessage: 'Uptime',
-    }),
-    href,
-  };
+
+  return [
+    {
+      text: i18n.translate('xpack.uptime.breadcrumbs.observabilityText', {
+        defaultMessage: 'Observability',
+      }),
+      href: observabilityPath,
+    },
+    {
+      text: i18n.translate('xpack.uptime.breadcrumbs.overviewBreadcrumbText', {
+        defaultMessage: 'Uptime',
+      }),
+      href: uptimePath,
+    },
+  ];
 };
 
 export const useBreadcrumbs = (extraCrumbs: ChromeBreadcrumb[]) => {
   const params = useUrlParams()[0]();
   const kibana = useKibana();
   const setBreadcrumbs = kibana.services.chrome?.setBreadcrumbs;
-  const appPath = kibana.services.application?.getUrlForApp(PLUGIN.ID) ?? '';
+  const uptimePath = kibana.services.application?.getUrlForApp(PLUGIN.ID) ?? '';
+  const observabilityPath =
+    kibana.services.application?.getUrlForApp('observability-overview') ?? '';
   const navigate = kibana.services.application?.navigateToUrl;
 
   useEffect(() => {
     if (setBreadcrumbs) {
       setBreadcrumbs(
-        handleBreadcrumbClick([makeBaseBreadcrumb(appPath, params)].concat(extraCrumbs), navigate)
+        handleBreadcrumbClick(
+          makeBaseBreadcrumb(uptimePath, observabilityPath, params).concat(extraCrumbs),
+          navigate
+        )
       );
     }
-  }, [appPath, extraCrumbs, navigate, params, setBreadcrumbs]);
+  }, [uptimePath, observabilityPath, extraCrumbs, navigate, params, setBreadcrumbs]);
 };
diff --git a/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx b/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
index a84209a23449a..0c2e31589bb10 100644
--- a/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
+++ b/x-pack/plugins/uptime/public/lib/helper/rtl_helpers.tsx
@@ -79,6 +79,12 @@ const createMockStore = () => {
   };
 };
 
+const mockAppUrls: Record<string, string> = {
+  uptime: '/app/uptime',
+  observability: '/app/observability',
+  '/home#/tutorial/uptimeMonitors': '/home#/tutorial/uptimeMonitors',
+};
+
 /* default mock core */
 const defaultCore = coreMock.createStart();
 const mockCore: () => Partial<CoreStart> = () => {
@@ -86,7 +92,7 @@ const mockCore: () => Partial<CoreStart> = () => {
     ...defaultCore,
     application: {
       ...defaultCore.application,
-      getUrlForApp: () => '/app/uptime',
+      getUrlForApp: (app: string) => mockAppUrls[app],
       navigateToUrl: jest.fn(),
       capabilities: {
         ...defaultCore.application.capabilities,
diff --git a/x-pack/plugins/uptime/public/pages/certificates.tsx b/x-pack/plugins/uptime/public/pages/certificates.tsx
index 7c21493dbde06..4b8617d594547 100644
--- a/x-pack/plugins/uptime/public/pages/certificates.tsx
+++ b/x-pack/plugins/uptime/public/pages/certificates.tsx
@@ -5,15 +5,14 @@
  * 2.0.
  */
 
-import { useDispatch, useSelector } from 'react-redux';
-import { EuiPanel, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { useDispatch } from 'react-redux';
+import { EuiSpacer } from '@elastic/eui';
 import React, { useContext, useEffect, useState } from 'react';
-import { FormattedMessage } from '@kbn/i18n/react';
 import { useTrackPageview } from '../../../observability/public';
 import { useBreadcrumbs } from '../hooks/use_breadcrumbs';
 import { getDynamicSettings } from '../state/actions/dynamic_settings';
 import { UptimeRefreshContext } from '../contexts';
-import { certificatesSelector, getCertificatesAction } from '../state/certificates/certificates';
+import { getCertificatesAction } from '../state/certificates/certificates';
 import { CertificateList, CertificateSearch, CertSort } from '../components/certificates';
 
 const DEFAULT_PAGE_SIZE = 10;
@@ -58,22 +57,8 @@ export const CertificatesPage: React.FC = () => {
     );
   }, [dispatch, page, search, sort.direction, sort.field, lastRefresh]);
 
-  const { data: certificates } = useSelector(certificatesSelector);
-
   return (
-    <EuiPanel>
-      <EuiTitle>
-        <h1 className="eui-textNoWrap">
-          <FormattedMessage
-            id="xpack.uptime.certificates.heading"
-            defaultMessage="TLS Certificates ({total})"
-            values={{
-              total: <span data-test-subj="uptimeCertTotal">{certificates?.total ?? 0}</span>,
-            }}
-          />
-        </h1>
-      </EuiTitle>
-
+    <>
       <EuiSpacer size="m" />
       <CertificateSearch setSearch={setSearch} />
       <EuiSpacer size="m" />
@@ -86,6 +71,6 @@ export const CertificatesPage: React.FC = () => {
         }}
         sort={sort}
       />
-    </EuiPanel>
+    </>
   );
 };
diff --git a/x-pack/plugins/uptime/public/pages/overview.tsx b/x-pack/plugins/uptime/public/pages/overview.tsx
index 846698bc390db..626e797bd9fd1 100644
--- a/x-pack/plugins/uptime/public/pages/overview.tsx
+++ b/x-pack/plugins/uptime/public/pages/overview.tsx
@@ -15,6 +15,7 @@ import { MonitorList } from '../components/overview/monitor_list/monitor_list_co
 import { EmptyState, FilterGroup } from '../components/overview';
 import { StatusPanel } from '../components/overview/status_panel';
 import { QueryBar } from '../components/overview/query_bar/query_bar';
+import { MONITORING_OVERVIEW_LABEL } from '../routes';
 
 const EuiFlexItemStyled = styled(EuiFlexItem)`
   && {
@@ -32,7 +33,7 @@ export const OverviewPageComponent = () => {
   useTrackPageview({ app: 'uptime', path: 'overview' });
   useTrackPageview({ app: 'uptime', path: 'overview', delay: 15000 });
 
-  useBreadcrumbs([]); // No extra breadcrumbs on overview
+  useBreadcrumbs([{ text: MONITORING_OVERVIEW_LABEL }]); // No extra breadcrumbs on overview
 
   return (
     <EmptyState>
diff --git a/x-pack/plugins/uptime/public/pages/settings.tsx b/x-pack/plugins/uptime/public/pages/settings.tsx
index f806ebbd09cc3..5f2699240425a 100644
--- a/x-pack/plugins/uptime/public/pages/settings.tsx
+++ b/x-pack/plugins/uptime/public/pages/settings.tsx
@@ -148,73 +148,71 @@ export const SettingsPage: React.FC = () => {
   );
 
   return (
-    <>
-      <EuiPanel style={{ maxWidth: 1000, margin: 'auto' }}>
-        <EuiFlexGroup>
-          <EuiFlexItem grow={false}>{cannotEditNotice}</EuiFlexItem>
-        </EuiFlexGroup>
-        <EuiFlexGroup>
-          <EuiFlexItem grow={false}>
-            <div id="settings-form">
-              <EuiForm>
-                <IndicesForm
-                  loading={dss.loading}
-                  onChange={onChangeFormField}
-                  formFields={formFields}
-                  fieldErrors={fieldErrors}
-                  isDisabled={isFormDisabled}
-                />
-                <AlertDefaultsForm
-                  loading={dss.loading}
-                  formFields={formFields}
-                  onChange={onChangeFormField}
-                  fieldErrors={fieldErrors}
-                  isDisabled={isFormDisabled}
-                />
-                <CertificateExpirationForm
-                  loading={dss.loading}
-                  onChange={onChangeFormField}
-                  formFields={formFields}
-                  fieldErrors={fieldErrors}
-                  isDisabled={isFormDisabled}
-                />
-
-                <EuiSpacer size="m" />
-                <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
-                  <EuiFlexItem grow={false}>
-                    <EuiButtonEmpty
-                      data-test-subj="discardSettingsButton"
-                      isDisabled={!isFormDirty || isFormDisabled}
-                      onClick={() => {
-                        resetForm();
-                      }}
-                    >
-                      <FormattedMessage
-                        id="xpack.uptime.sourceConfiguration.discardSettingsButtonLabel"
-                        defaultMessage="Cancel"
-                      />
-                    </EuiButtonEmpty>
-                  </EuiFlexItem>
-                  <EuiFlexItem grow={false}>
-                    <EuiButton
-                      data-test-subj="apply-settings-button"
-                      onClick={onApply}
-                      color="primary"
-                      isDisabled={!isFormDirty || !isFormValid || isFormDisabled}
-                      fill
-                    >
-                      <FormattedMessage
-                        id="xpack.uptime.sourceConfiguration.applySettingsButtonLabel"
-                        defaultMessage="Apply changes"
-                      />
-                    </EuiButton>
-                  </EuiFlexItem>
-                </EuiFlexGroup>
-              </EuiForm>
-            </div>
-          </EuiFlexItem>
-        </EuiFlexGroup>
-      </EuiPanel>
-    </>
+    <EuiPanel style={{ maxWidth: 1000, margin: 'auto' }}>
+      <EuiFlexGroup>
+        <EuiFlexItem grow={false}>{cannotEditNotice}</EuiFlexItem>
+      </EuiFlexGroup>
+      <EuiFlexGroup>
+        <EuiFlexItem grow={false}>
+          <div id="settings-form">
+            <EuiForm>
+              <IndicesForm
+                loading={dss.loading}
+                onChange={onChangeFormField}
+                formFields={formFields}
+                fieldErrors={fieldErrors}
+                isDisabled={isFormDisabled}
+              />
+              <AlertDefaultsForm
+                loading={dss.loading}
+                formFields={formFields}
+                onChange={onChangeFormField}
+                fieldErrors={fieldErrors}
+                isDisabled={isFormDisabled}
+              />
+              <CertificateExpirationForm
+                loading={dss.loading}
+                onChange={onChangeFormField}
+                formFields={formFields}
+                fieldErrors={fieldErrors}
+                isDisabled={isFormDisabled}
+              />
+
+              <EuiSpacer size="m" />
+              <EuiFlexGroup justifyContent="flexEnd" gutterSize="s">
+                <EuiFlexItem grow={false}>
+                  <EuiButtonEmpty
+                    data-test-subj="discardSettingsButton"
+                    isDisabled={!isFormDirty || isFormDisabled}
+                    onClick={() => {
+                      resetForm();
+                    }}
+                  >
+                    <FormattedMessage
+                      id="xpack.uptime.sourceConfiguration.discardSettingsButtonLabel"
+                      defaultMessage="Cancel"
+                    />
+                  </EuiButtonEmpty>
+                </EuiFlexItem>
+                <EuiFlexItem grow={false}>
+                  <EuiButton
+                    data-test-subj="apply-settings-button"
+                    onClick={onApply}
+                    color="primary"
+                    isDisabled={!isFormDirty || !isFormValid || isFormDisabled}
+                    fill
+                  >
+                    <FormattedMessage
+                      id="xpack.uptime.sourceConfiguration.applySettingsButtonLabel"
+                      defaultMessage="Apply changes"
+                    />
+                  </EuiButton>
+                </EuiFlexItem>
+              </EuiFlexGroup>
+            </EuiForm>
+          </div>
+        </EuiFlexItem>
+      </EuiFlexGroup>
+    </EuiPanel>
   );
 };
diff --git a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
index edfd7ae24f91b..fe41e72fa4c48 100644
--- a/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
+++ b/x-pack/plugins/uptime/public/pages/synthetics/synthetics_checks.tsx
@@ -6,7 +6,7 @@
  */
 
 import React from 'react';
-import { EuiFlexGroup, EuiFlexItem, EuiSpacer, EuiTitle } from '@elastic/eui';
+import { useKibana } from '../../../../../../src/plugins/kibana_react/public';
 import { useTrackPageview } from '../../../../observability/public';
 import { useInitApp } from '../../hooks/use_init_app';
 import { StepsList } from '../../components/synthetics/check_steps/steps_list';
@@ -14,6 +14,7 @@ import { useCheckSteps } from '../../components/synthetics/check_steps/use_check
 import { ChecksNavigation } from './checks_navigation';
 import { useMonitorBreadcrumb } from '../../components/monitor/synthetics/step_detail/use_monitor_breadcrumb';
 import { EmptyJourney } from '../../components/synthetics/empty_journey';
+import { ClientPluginsStart } from '../../apps/plugin';
 
 export const SyntheticsCheckSteps: React.FC = () => {
   useInitApp();
@@ -24,21 +25,22 @@ export const SyntheticsCheckSteps: React.FC = () => {
 
   useMonitorBreadcrumb({ details, activeStep: details?.journey });
 
+  const {
+    services: { observability },
+  } = useKibana<ClientPluginsStart>();
+  const PageTemplateComponent = observability.navigation.PageTemplate;
+
   return (
-    <>
-      <EuiFlexGroup>
-        <EuiFlexItem>
-          <EuiTitle>
-            <h1>{details?.journey?.monitor.name || details?.journey?.monitor.id}</h1>
-          </EuiTitle>
-        </EuiFlexItem>
-        <EuiFlexItem grow={false}>
-          {details && <ChecksNavigation timestamp={details.timestamp} details={details} />}
-        </EuiFlexItem>
-      </EuiFlexGroup>
-      <EuiSpacer />
+    <PageTemplateComponent
+      pageHeader={{
+        pageTitle: details?.journey?.monitor.name || details?.journey?.monitor.id,
+        rightSideItems: [
+          details ? <ChecksNavigation timestamp={details.timestamp} details={details} /> : null,
+        ],
+      }}
+    >
       <StepsList data={steps} loading={loading} error={error} />
       {(!steps || steps.length === 0) && !loading && <EmptyJourney checkGroup={checkGroup} />}
-    </>
+    </PageTemplateComponent>
   );
 };
diff --git a/x-pack/plugins/uptime/public/routes.tsx b/x-pack/plugins/uptime/public/routes.tsx
index 1c025edd0a73d..192b5552fea40 100644
--- a/x-pack/plugins/uptime/public/routes.tsx
+++ b/x-pack/plugins/uptime/public/routes.tsx
@@ -6,8 +6,9 @@
  */
 
 import React, { FC, useEffect } from 'react';
-import { Route, RouteComponentProps, Switch } from 'react-router-dom';
-import { Props as PageHeaderProps, PageHeader } from './components/common/header/page_header';
+import { Route, Switch } from 'react-router-dom';
+import { FormattedMessage } from '@kbn/i18n/react';
+import { i18n } from '@kbn/i18n';
 import {
   CERTIFICATES_ROUTE,
   MONITOR_ROUTE,
@@ -21,6 +22,13 @@ import { CertificatesPage } from './pages/certificates';
 import { UptimePage, useUptimeTelemetry } from './hooks';
 import { OverviewPageComponent } from './pages/overview';
 import { SyntheticsCheckSteps } from './pages/synthetics/synthetics_checks';
+import { ClientPluginsStart } from './apps/plugin';
+import { MonitorPageTitle } from './components/monitor/monitor_title';
+import { UptimeDatePicker } from './components/common/uptime_date_picker';
+import { useKibana } from '../../../../src/plugins/kibana_react/public';
+import { CertRefreshBtn } from './components/certificates/cert_refresh_btn';
+import { CertificateTitle } from './components/certificates/certificate_title';
+import { SyntheticsCallout } from './components/overview/synthetics_callout';
 
 interface RouteProps {
   path: string;
@@ -28,11 +36,15 @@ interface RouteProps {
   dataTestSubj: string;
   title: string;
   telemetryId: UptimePage;
-  headerProps?: PageHeaderProps;
+  pageHeader?: { pageTitle: string | JSX.Element; rightSideItems?: JSX.Element[] };
 }
 
 const baseTitle = 'Uptime - Kibana';
 
+export const MONITORING_OVERVIEW_LABEL = i18n.translate('xpack.uptime.overview.heading', {
+  defaultMessage: 'Monitoring overview',
+});
+
 const Routes: RouteProps[] = [
   {
     title: `Monitor | ${baseTitle}`,
@@ -40,9 +52,9 @@ const Routes: RouteProps[] = [
     component: MonitorPage,
     dataTestSubj: 'uptimeMonitorPage',
     telemetryId: UptimePage.Monitor,
-    headerProps: {
-      showDatePicker: true,
-      showMonitorTitle: true,
+    pageHeader: {
+      pageTitle: <MonitorPageTitle />,
+      rightSideItems: [<UptimeDatePicker />],
     },
   },
   {
@@ -51,8 +63,10 @@ const Routes: RouteProps[] = [
     component: SettingsPage,
     dataTestSubj: 'uptimeSettingsPage',
     telemetryId: UptimePage.Settings,
-    headerProps: {
-      showTabs: true,
+    pageHeader: {
+      pageTitle: (
+        <FormattedMessage id="xpack.uptime.settings.heading" defaultMessage="Uptime settings" />
+      ),
     },
   },
   {
@@ -61,9 +75,9 @@ const Routes: RouteProps[] = [
     component: CertificatesPage,
     dataTestSubj: 'uptimeCertificatesPage',
     telemetryId: UptimePage.Certificates,
-    headerProps: {
-      showCertificateRefreshBtn: true,
-      showTabs: true,
+    pageHeader: {
+      pageTitle: <CertificateTitle />,
+      rightSideItems: [<CertRefreshBtn />],
     },
   },
   {
@@ -86,9 +100,9 @@ const Routes: RouteProps[] = [
     component: OverviewPageComponent,
     dataTestSubj: 'uptimeOverviewPage',
     telemetryId: UptimePage.Overview,
-    headerProps: {
-      showDatePicker: true,
-      showTabs: true,
+    pageHeader: {
+      pageTitle: MONITORING_OVERVIEW_LABEL,
+      rightSideItems: [<UptimeDatePicker />],
     },
   },
 ];
@@ -106,31 +120,31 @@ const RouteInit: React.FC<Pick<RouteProps, 'path' | 'title' | 'telemetryId'>> =
 };
 
 export const PageRouter: FC = () => {
+  const {
+    services: { observability },
+  } = useKibana<ClientPluginsStart>();
+  const PageTemplateComponent = observability.navigation.PageTemplate;
+
   return (
-    <>
-      {/* Independent page header route that matches all paths and passes appropriate header props */}
-      {/* Prevents the header from being remounted on route changes */}
-      <Route
-        path={[...Routes.map((route) => route.path)]}
-        exact={true}
-        render={({ match }: RouteComponentProps) => {
-          const routeProps: RouteProps | undefined = Routes.find(
-            (route: RouteProps) => route?.path === match?.path
-          );
-          return routeProps?.headerProps && <PageHeader {...routeProps?.headerProps} />;
-        }}
-      />
-      <Switch>
-        {Routes.map(({ title, path, component: RouteComponent, dataTestSubj, telemetryId }) => (
+    <Switch>
+      {Routes.map(
+        ({ title, path, component: RouteComponent, dataTestSubj, telemetryId, pageHeader }) => (
           <Route path={path} key={telemetryId} exact={true}>
             <div data-test-subj={dataTestSubj}>
+              <SyntheticsCallout />
               <RouteInit title={title} path={path} telemetryId={telemetryId} />
-              <RouteComponent />
+              {pageHeader ? (
+                <PageTemplateComponent pageHeader={pageHeader}>
+                  <RouteComponent />
+                </PageTemplateComponent>
+              ) : (
+                <RouteComponent />
+              )}
             </div>
           </Route>
-        ))}
-        <Route component={NotFoundPage} />
-      </Switch>
-    </>
+        )
+      )}
+      <Route component={NotFoundPage} />
+    </Switch>
   );
 };
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts
index 560653950c6f8..6081cc3a7b7c8 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_details.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { UMElasticsearchQueryFn } from '../adapters/framework';
 import { SyntheticsJourneyApiResponse } from '../../../common/runtime_types';
 
@@ -31,7 +31,7 @@ export const getJourneyDetails: UMElasticsearchQueryFn<
               'synthetics.type': 'journey/start',
             },
           },
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
       },
     },
     size: 1,
@@ -56,7 +56,7 @@ export const getJourneyDetails: UMElasticsearchQueryFn<
                 'synthetics.type': 'journey/start',
               },
             },
-          ] as QueryContainer[],
+          ] as QueryDslQueryContainer[],
         },
       },
       _source: ['@timestamp', 'monitor.check_group'],
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.ts
index 5c4e263468947..d14a723d27628 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_failed_steps.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { SearchHit } from '../../../../../../typings/elasticsearch';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import { UMElasticsearchQueryFn } from '../adapters/framework';
@@ -38,7 +38,7 @@ export const getJourneyFailedSteps: UMElasticsearchQueryFn<GetJourneyStepsParams
               'monitor.check_group': checkGroups,
             },
           },
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
       },
     },
     sort: asMutableArray([
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts
index b5ff1de44000c..2c56d41507165 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_screenshot.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { UMElasticsearchQueryFn } from '../adapters/framework';
 import { Ping } from '../../../common/runtime_types/ping';
 
@@ -45,7 +45,7 @@ export const getJourneyScreenshot: UMElasticsearchQueryFn<
               'synthetics.type': 'step/screenshot',
             },
           },
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
       },
     },
     aggs: {
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts b/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts
index bfb8f4d881c3d..2e32670aea276 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_journey_steps.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { SearchHit } from 'typings/elasticsearch/search';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import { UMElasticsearchQueryFn } from '../adapters/framework';
@@ -45,7 +45,7 @@ export const getJourneySteps: UMElasticsearchQueryFn<GetJourneyStepsParams, Ping
               'monitor.check_group': checkGroup,
             },
           },
-        ] as QueryContainer,
+        ] as QueryDslQueryContainer,
       },
     },
     sort: asMutableArray([
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
index ad8b345d7b276..36968fa97fda4 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_latest_monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { Ping } from '../../../common/runtime_types';
 
@@ -45,7 +45,7 @@ export const getLatestMonitor: UMElasticsearchQueryFn<GetLatestMonitorParams, Pi
           },
           ...(monitorId ? [{ term: { 'monitor.id': monitorId } }] : []),
           ...(observerLocation ? [{ term: { 'observer.geo.name': observerLocation } }] : []),
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
       },
     },
     size: 1,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
index 611bca8bfbcec..be134a311af66 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_duration.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { LocationDurationLine, MonitorDurationResult } from '../../../common/types';
 import { QUERY, UNNAMED_LOCATION } from '../../../common/constants';
@@ -33,7 +33,7 @@ export const getMonitorDurationChart: UMElasticsearchQueryFn<
           { range: { '@timestamp': { gte: dateStart, lte: dateEnd } } },
           { term: { 'monitor.id': monitorId } },
           { range: { 'monitor.duration.us': { gt: 0 } } },
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
       },
     },
     size: 0,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
index 8b46070f701f2..c126de27158cc 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_monitor_status.ts
@@ -6,7 +6,7 @@
  */
 
 import { JsonObject } from 'src/plugins/kibana_utils/public';
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { asMutableArray } from '../../../common/utils/as_mutable_array';
 import { UMElasticsearchQueryFn } from '../adapters';
 import { Ping } from '../../../common/runtime_types/ping';
@@ -70,7 +70,7 @@ export const getMonitorStatus: UMElasticsearchQueryFn<
             },
             // append user filters, if defined
             ...(filters?.bool ? [filters] : []),
-          ] as QueryContainer[],
+          ] as QueryDslQueryContainer[],
         },
       },
       size: 0,
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts b/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts
index 2f45f633ba971..b27b1a4c736d5 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_network_events.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { UMElasticsearchQueryFn } from '../adapters/framework';
 import { NetworkEvent } from '../../../common/runtime_types';
 
@@ -30,7 +30,7 @@ export const getNetworkEvents: UMElasticsearchQueryFn<
           { term: { 'synthetics.type': 'journey/network_info' } },
           { term: { 'monitor.check_group': checkGroup } },
           { term: { 'synthetics.step.index': Number(stepIndex) } },
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
       },
     },
     // NOTE: This limit may need tweaking in the future. Users can technically perform multiple
diff --git a/x-pack/plugins/uptime/server/lib/requests/get_pings.ts b/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
index cf7a85e60f753..27f4c314a818c 100644
--- a/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
+++ b/x-pack/plugins/uptime/server/lib/requests/get_pings.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { QueryContainer } from '@elastic/elasticsearch/api/types';
+import { QueryDslQueryContainer } from '@elastic/elasticsearch/api/types';
 import { UMElasticsearchQueryFn } from '../adapters/framework';
 import {
   GetPingsParams,
@@ -74,7 +74,7 @@ export const getPings: UMElasticsearchQueryFn<GetPingsParams, PingsResponse> = a
           { range: { '@timestamp': { gte: from, lte: to } } },
           ...(monitorId ? [{ term: { 'monitor.id': monitorId } }] : []),
           ...(status ? [{ term: { 'monitor.status': status } }] : []),
-        ] as QueryContainer[],
+        ] as QueryDslQueryContainer[],
         ...REMOVE_NON_SUMMARY_BROWSER_CHECKS,
       },
     },
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 f686d978ec710..621fdf0d15861 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
@@ -5,16 +5,16 @@
  * 2.0.
  */
 
-import { ScrollResponse, Hit } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { IScopedClusterClient } from 'kibana/server';
 import { get } from 'lodash';
 import { ES_SCROLL_SETTINGS } from '../../../common/constants';
 
 export function fetchAllFromScroll(
-  searchResults: ScrollResponse<unknown>,
+  searchResults: estypes.ScrollResponse<unknown>,
   dataClient: IScopedClusterClient,
-  hits: Hit[] = []
-): Promise<ScrollResponse['hits']['hits']> {
+  hits: estypes.SearchHit[] = []
+): Promise<estypes.ScrollResponse['hits']['hits']> {
   const newHits = get(searchResults, 'hits.hits', []);
   const scrollId = get(searchResults, '_scroll_id');
 
@@ -25,7 +25,7 @@ export function fetchAllFromScroll(
       .scroll({
         body: {
           scroll: ES_SCROLL_SETTINGS.KEEPALIVE,
-          scroll_id: scrollId,
+          scroll_id: scrollId!,
         },
       })
       .then(({ body: innerResponse }) => {
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 915871185af85..f69ee60f9cd73 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { MultiBucketAggregate } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
 import { reduce, size } from 'lodash';
@@ -64,7 +64,9 @@ async function getIndices(dataClient: IScopedClusterClient, pattern: string, lim
   if (response.statusCode === 404 || !response.body.aggregations) {
     return [];
   }
-  const indices = response.body.aggregations.indices as MultiBucketAggregate<{ key: unknown }>;
+  const indices = response.body.aggregations.indices as estypes.AggregationsMultiBucketAggregate<{
+    key: unknown;
+  }>;
 
   return indices.buckets ? indices.buckets.map((bucket) => bucket.key) : [];
 }
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 e47d451c227e5..b7c09361774ab 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { DeleteWatchResponse } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { schema } from '@kbn/config-schema';
 import { IScopedClusterClient } from 'kibana/server';
 import { RouteDependencies } from '../../../types';
@@ -14,7 +14,10 @@ const bodySchema = schema.object({
   watchIds: schema.arrayOf(schema.string()),
 });
 
-type DeleteWatchPromiseArray = Promise<{ success?: DeleteWatchResponse; error?: any }>;
+type DeleteWatchPromiseArray = Promise<{
+  success?: estypes.WatcherDeleteWatchResponse;
+  error?: any;
+}>;
 
 function deleteWatches(dataClient: IScopedClusterClient, watchIds: string[]) {
   const deletePromises = watchIds.map<DeleteWatchPromiseArray>((watchId) => {
diff --git a/x-pack/scripts/functional_tests.js b/x-pack/scripts/functional_tests.js
index f845f31a39c58..1a7f9acc9f1a3 100644
--- a/x-pack/scripts/functional_tests.js
+++ b/x-pack/scripts/functional_tests.js
@@ -34,7 +34,10 @@ const onlyNotInCoverageTests = [
   require.resolve('../test/alerting_api_integration/basic/config.ts'),
   require.resolve('../test/alerting_api_integration/spaces_only/config.ts'),
   require.resolve('../test/alerting_api_integration/security_and_spaces/config.ts'),
-  require.resolve('../test/case_api_integration/basic/config.ts'),
+  require.resolve('../test/case_api_integration/security_and_spaces/config_basic.ts'),
+  require.resolve('../test/case_api_integration/security_and_spaces/config_trial.ts'),
+  require.resolve('../test/case_api_integration/spaces_only/config.ts'),
+  require.resolve('../test/case_api_integration/security_only/config.ts'),
   require.resolve('../test/apm_api_integration/basic/config.ts'),
   require.resolve('../test/apm_api_integration/trial/config.ts'),
   require.resolve('../test/apm_api_integration/rules/config.ts'),
diff --git a/x-pack/tasks/helpers/git_info.ts b/x-pack/tasks/helpers/git_info.ts
index 03d509e71b0d4..17d2b02286419 100644
--- a/x-pack/tasks/helpers/git_info.ts
+++ b/x-pack/tasks/helpers/git_info.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import fs from 'fs';
 import path from 'path';
 // @ts-ignore barely used, untyped module
 import simpleGit from 'simple-git';
@@ -12,6 +13,14 @@ import simpleGit from 'simple-git';
 const gitDir = path.resolve(__dirname, '..', '..');
 
 export async function gitInfo() {
+  if (!fs.existsSync(path.join(gitDir, '.git'))) {
+    // This info is only used for debugging purposes in the log
+    // So if .git is not available for some reason, it's fine to output this
+    return {
+      number: 1,
+      sha: process.env.GIT_COMMIT || process.env.BUILDKITE_COMMIT || 'none',
+    };
+  }
   const git = simpleGit(gitDir);
 
   return new Promise<{ number: number; sha: string }>((resolve, reject) => {
diff --git a/x-pack/test/accessibility/apps/advanced_settings.ts b/x-pack/test/accessibility/apps/advanced_settings.ts
index 7382577c7ebe6..6f2dc78a7b35b 100644
--- a/x-pack/test/accessibility/apps/advanced_settings.ts
+++ b/x-pack/test/accessibility/apps/advanced_settings.ts
@@ -11,45 +11,51 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'settings', 'header']);
   const a11y = getService('a11y');
   const testSubjects = getService('testSubjects');
+  const toasts = getService('toasts');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/99006
-  describe.skip('Stack Management -Advanced Settings', () => {
+  describe('Stack Management -Advanced Settings', () => {
     // click on Management > Advanced settings
     it('click on advanced settings ', async () => {
       await PageObjects.common.navigateToUrl('management', 'kibana/settings', {
         shouldUseHashForSubUrl: false,
       });
       await testSubjects.click('settings');
+      await toasts.dismissAllToasts();
       await a11y.testAppSnapshot();
     });
 
     // clicking on the top search bar
     it('adv settings - search ', async () => {
       await testSubjects.click('settingsSearchBar');
+      await toasts.dismissAllToasts();
       await a11y.testAppSnapshot();
     });
 
     // clicking on the category dropdown
     it('adv settings - category -dropdown ', async () => {
       await testSubjects.click('settingsSearchBar');
+      await toasts.dismissAllToasts();
       await a11y.testAppSnapshot();
     });
 
     // clicking on the toggle button
     it('adv settings - toggle ', async () => {
       await testSubjects.click('advancedSetting-editField-csv:quoteValues');
+      await toasts.dismissAllToasts();
       await a11y.testAppSnapshot();
     });
 
     // clicking on editor panel
     it('adv settings - edit ', async () => {
       await testSubjects.click('advancedSetting-editField-csv:separator');
+      await toasts.dismissAllToasts();
       await a11y.testAppSnapshot();
     });
 
     // clicking on save button
     it('adv settings - save', async () => {
       await testSubjects.click('advancedSetting-saveButton');
+      await toasts.dismissAllToasts();
       await a11y.testAppSnapshot();
     });
   });
diff --git a/x-pack/test/accessibility/apps/canvas.ts b/x-pack/test/accessibility/apps/canvas.ts
index c802d62b05bf9..a79fb7b60e76a 100644
--- a/x-pack/test/accessibility/apps/canvas.ts
+++ b/x-pack/test/accessibility/apps/canvas.ts
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Canvas', () => {
     before(async () => {
-      await esArchiver.load('canvas/default');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
       await common.navigateToApp('canvas');
     });
 
diff --git a/x-pack/test/accessibility/apps/dashboard_edit_panel.ts b/x-pack/test/accessibility/apps/dashboard_edit_panel.ts
index c318c2d1c26a0..5624a5f25db2f 100644
--- a/x-pack/test/accessibility/apps/dashboard_edit_panel.ts
+++ b/x-pack/test/accessibility/apps/dashboard_edit_panel.ts
@@ -22,8 +22,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Dashboard Edit Panel', () => {
     before(async () => {
-      await esArchiver.load('dashboard/drilldowns');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.common.navigateToApp('dashboard');
       await dashboard.loadSavedDashboard(drilldowns.DASHBOARD_WITH_PIE_CHART_NAME);
@@ -31,7 +31,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('dashboard/drilldowns');
+      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns');
     });
 
     it('can open menu', async () => {
diff --git a/x-pack/test/accessibility/apps/kibana_overview.ts b/x-pack/test/accessibility/apps/kibana_overview.ts
index fe255a3413bd0..9d21f08a900cc 100644
--- a/x-pack/test/accessibility/apps/kibana_overview.ts
+++ b/x-pack/test/accessibility/apps/kibana_overview.ts
@@ -15,12 +15,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     const esArchiver = getService('esArchiver');
 
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('kibanaOverview');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     it('Kibana overview', async () => {
diff --git a/x-pack/test/accessibility/apps/lens.ts b/x-pack/test/accessibility/apps/lens.ts
index 682aa5a576f9e..4157f31525acf 100644
--- a/x-pack/test/accessibility/apps/lens.ts
+++ b/x-pack/test/accessibility/apps/lens.ts
@@ -17,8 +17,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('Lens', () => {
     const lensChartName = 'MyLensChart';
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
     });
 
     after(async () => {
@@ -27,8 +27,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await listingTable.checkListingSelectAllCheckbox();
       await listingTable.clickDeleteSelected();
       await PageObjects.common.clickConfirmOnModal();
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.unload('lens/basic');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
 
     it('lens', async () => {
diff --git a/x-pack/test/accessibility/apps/login_page.ts b/x-pack/test/accessibility/apps/login_page.ts
index 02d817612671c..580df3e4ccc88 100644
--- a/x-pack/test/accessibility/apps/login_page.ts
+++ b/x-pack/test/accessibility/apps/login_page.ts
@@ -17,12 +17,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('Security', () => {
     describe('Login Page', () => {
       before(async () => {
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await PageObjects.security.forceLogout();
       });
 
       after(async () => {
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       afterEach(async () => {
diff --git a/x-pack/test/accessibility/apps/ml.ts b/x-pack/test/accessibility/apps/ml.ts
index 41f8d5e56f8e6..4babe0bd6ff88 100644
--- a/x-pack/test/accessibility/apps/ml.ts
+++ b/x-pack/test/accessibility/apps/ml.ts
@@ -91,9 +91,11 @@ export default function ({ getService }: FtrProviderContext) {
         );
 
         before(async () => {
-          await esArchiver.loadIfNeeded('ml/farequote');
-          await esArchiver.loadIfNeeded('ml/ihp_outlier');
-          await esArchiver.loadIfNeeded('ml/module_sample_ecommerce');
+          await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+          await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
+          await esArchiver.loadIfNeeded(
+            'x-pack/test/functional/es_archives/ml/module_sample_ecommerce'
+          );
           await ml.testResources.createIndexPatternIfNeeded(fqIndexPattern, '@timestamp');
           await ml.testResources.createIndexPatternIfNeeded(ihpIndexPattern, '@timestamp');
           await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date');
@@ -114,7 +116,6 @@ export default function ({ getService }: FtrProviderContext) {
             description: 'Test calendar',
           });
           await ml.api.createCalendarEvents(calendarId, [
-            // @ts-expect-error not full interface
             {
               description: eventDescription,
               start_time: '1513641600000',
@@ -137,9 +138,9 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.testResources.deleteIndexPatternByTitle(fqIndexPattern);
           await ml.testResources.deleteIndexPatternByTitle(ihpIndexPattern);
           await ml.testResources.deleteIndexPatternByTitle(ecIndexPattern);
-          await esArchiver.unload('ml/farequote');
-          await esArchiver.unload('ml/ihp_outlier');
-          await esArchiver.unload('ml/module_sample_ecommerce');
+          await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
+          await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier');
+          await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce');
           await ml.testResources.resetKibanaTimeZone();
         });
 
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 de44984a50c5b..48224ebcf7353 100644
--- a/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
+++ b/x-pack/test/accessibility/apps/ml_embeddables_in_dashboard.ts
@@ -65,7 +65,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await ml.securityCommon.createMlRoles();
       await ml.securityCommon.createMlUsers();
 
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
       await ml.securityUI.loginAsMlPowerUser();
@@ -74,7 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     after(async () => {
       await ml.securityCommon.cleanMlUsers();
       await ml.securityCommon.cleanMlRoles();
-      await esArchiver.unload('ml/farequote');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
       await ml.securityUI.logout();
     });
 
diff --git a/x-pack/test/accessibility/apps/roles.ts b/x-pack/test/accessibility/apps/roles.ts
index 4979f572e739a..3c40e664d7da2 100644
--- a/x-pack/test/accessibility/apps/roles.ts
+++ b/x-pack/test/accessibility/apps/roles.ts
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Kibana roles page a11y tests', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       await kibanaServer.uiSettings.update({
         defaultIndex: 'logstash-*',
       });
@@ -27,7 +27,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     it('a11y test for Roles main page', async () => {
diff --git a/x-pack/test/accessibility/apps/spaces.ts b/x-pack/test/accessibility/apps/spaces.ts
index 6242896c263ba..f2e79336e02ba 100644
--- a/x-pack/test/accessibility/apps/spaces.ts
+++ b/x-pack/test/accessibility/apps/spaces.ts
@@ -20,7 +20,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Kibana spaces page meets a11y validations', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
diff --git a/x-pack/test/accessibility/apps/transform.ts b/x-pack/test/accessibility/apps/transform.ts
index 38cd8d98e8c32..4c58887f003b2 100644
--- a/x-pack/test/accessibility/apps/transform.ts
+++ b/x-pack/test/accessibility/apps/transform.ts
@@ -83,7 +83,7 @@ export default function ({ getService }: FtrProviderContext) {
         const latestTransformDestinationIndex = `user-${latestTransformId}`;
 
         before(async () => {
-          await esArchiver.loadIfNeeded('ml/ecommerce');
+          await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
           await transform.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date');
           await transform.testResources.setKibanaTimeZoneToUTC();
         });
@@ -95,7 +95,7 @@ export default function ({ getService }: FtrProviderContext) {
           await transform.testResources.deleteIndexPatternByTitle(pivotTransformDestinationIndex);
           await transform.testResources.deleteIndexPatternByTitle(latestTransformDestinationIndex);
           await transform.testResources.deleteIndexPatternByTitle(ecIndexPattern);
-          await esArchiver.unload('ml/ecommerce');
+          await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce');
           await transform.testResources.resetKibanaTimeZone();
         });
 
diff --git a/x-pack/test/accessibility/apps/uptime.ts b/x-pack/test/accessibility/apps/uptime.ts
index 9c48e7d82788f..41664c5920b82 100644
--- a/x-pack/test/accessibility/apps/uptime.ts
+++ b/x-pack/test/accessibility/apps/uptime.ts
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('uptime', () => {
     before(async () => {
-      await esArchiver.load('uptime/blank');
+      await esArchiver.load('x-pack/test/functional/es_archives/uptime/blank');
       await makeChecks(es, A11Y_TEST_MONITOR_ID, 150, 1, 1000, {
         tls: {
           certificate_not_valid_after: moment().add(30, 'days').toISOString(),
@@ -45,7 +45,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('uptime/blank');
+      await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
     });
 
     it('overview page', async () => {
diff --git a/x-pack/test/accessibility/apps/users.ts b/x-pack/test/accessibility/apps/users.ts
index 8927a6167598e..bafd608aa8dee 100644
--- a/x-pack/test/accessibility/apps/users.ts
+++ b/x-pack/test/accessibility/apps/users.ts
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Kibana users page a11y tests', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.security.clickElasticsearchUsers();
     });
 
diff --git a/x-pack/test/alerting_api_integration/common/config.ts b/x-pack/test/alerting_api_integration/common/config.ts
index c56e8adfbe34f..7ee6e146b2a50 100644
--- a/x-pack/test/alerting_api_integration/common/config.ts
+++ b/x-pack/test/alerting_api_integration/common/config.ts
@@ -131,7 +131,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       junit: {
         reportName: 'X-Pack Alerting API Integration Tests',
       },
-      esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'),
       esTestCluster: {
         ...xPackApiIntegrationTestsConfig.get('esTestCluster'),
         license,
@@ -151,6 +150,7 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           `--xpack.actions.allowedHosts=${JSON.stringify(['localhost', 'some.non.existent.com'])}`,
           '--xpack.encryptedSavedObjects.encryptionKey="wuGNaIhoMpk5sO4UBxgr3NyW1sFcLgIf"',
           '--xpack.alerting.invalidateApiKeysTask.interval="15s"',
+          '--xpack.alerting.healthCheck.interval="1s"',
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           `--xpack.actions.rejectUnauthorized=${rejectUnauthorized}`,
           `--xpack.actions.tls.verificationMode=${verificationMode}`,
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 03ae0e6daf933..f7d7c1df8fd46 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
@@ -119,6 +119,7 @@ export default function ({ getService }: FtrProviderContext) {
                 spaceId: space.id,
                 connectorId: createdAction.id,
                 outcome: 'success',
+                actionTypeId: 'test.index-record',
                 message: `action executed: test.index-record:${createdAction.id}: My action`,
               });
               break;
@@ -502,13 +503,14 @@ export default function ({ getService }: FtrProviderContext) {
   interface ValidateEventLogParams {
     spaceId: string;
     connectorId: string;
+    actionTypeId: string;
     outcome: string;
     message: string;
     errorMessage?: string;
   }
 
   async function validateEventLog(params: ValidateEventLogParams): Promise<void> {
-    const { spaceId, connectorId, outcome, message, errorMessage } = params;
+    const { spaceId, connectorId, actionTypeId, outcome, message, errorMessage } = params;
 
     const events: IValidatedEvent[] = await retry.try(async () => {
       return await getEventLog({
@@ -549,6 +551,7 @@ export default function ({ getService }: FtrProviderContext) {
         rel: 'primary',
         type: 'action',
         id: connectorId,
+        type_id: actionTypeId,
         namespace: spaceId,
       },
     ]);
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 24799888ac5b2..4aa6ed830059e 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
@@ -214,6 +214,7 @@ instanceStateValue: true
               await validateEventLog({
                 spaceId: space.id,
                 alertId,
+                ruleTypeId: 'test.always-firing',
                 outcome: 'success',
                 message: `alert executed: test.always-firing:${alertId}: 'abc'`,
               });
@@ -1244,13 +1245,14 @@ instanceStateValue: true
   interface ValidateEventLogParams {
     spaceId: string;
     alertId: string;
+    ruleTypeId: string;
     outcome: string;
     message: string;
     errorMessage?: string;
   }
 
   async function validateEventLog(params: ValidateEventLogParams): Promise<void> {
-    const { spaceId, alertId, outcome, message, errorMessage } = params;
+    const { spaceId, alertId, ruleTypeId, outcome, message, errorMessage } = params;
 
     const events: IValidatedEvent[] = await retry.try(async () => {
       return await getEventLog({
@@ -1291,6 +1293,7 @@ instanceStateValue: true
         type: 'alert',
         id: alertId,
         namespace: spaceId,
+        type_id: ruleTypeId,
       },
     ]);
 
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts
index 825ade55cb4b0..d5e55a66ecf08 100644
--- a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/event_log.ts
@@ -75,7 +75,7 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
 
       validateEvent(event, {
         spaceId,
-        savedObjects: [{ type: 'alert', id: alertId, rel: 'primary' }],
+        savedObjects: [{ type: 'alert', id: alertId, rel: 'primary', type_id: 'test.noop' }],
         outcome: 'failure',
         message: `test.noop:${alertId}: execution failed`,
         errorMessage: 'Unable to decrypt attribute "apiKey"',
diff --git a/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/health.ts b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/health.ts
new file mode 100644
index 0000000000000..668de3eb4fb9e
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/security_and_spaces/tests/alerting/health.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { UserAtSpaceScenarios } from '../../scenarios';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  getUrlPrefix,
+  getTestAlertData,
+  ObjectRemover,
+  AlertUtils,
+  ESTestIndexTool,
+  ES_TEST_INDEX_NAME,
+} from '../../../common/lib';
+
+// eslint-disable-next-line import/no-default-export
+export default function createFindTests({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const es = getService('legacyEs');
+  const retry = getService('retry');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const esTestIndexTool = new ESTestIndexTool(es, retry);
+
+  describe('health', () => {
+    const objectRemover = new ObjectRemover(supertest);
+
+    before(async () => {
+      await esTestIndexTool.destroy();
+      await esTestIndexTool.setup();
+    });
+
+    after(async () => {
+      await esTestIndexTool.destroy();
+    });
+
+    for (const scenario of UserAtSpaceScenarios) {
+      const { user, space } = scenario;
+
+      describe(scenario.id, () => {
+        let alertUtils: AlertUtils;
+        let indexRecordActionId: string;
+
+        before(async () => {
+          const { body: createdAction } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/actions/connector`)
+            .set('kbn-xsrf', 'foo')
+            .send({
+              name: 'My action',
+              connector_type_id: 'test.index-record',
+              config: {
+                unencrypted: `This value shouldn't get encrypted`,
+              },
+              secrets: {
+                encrypted: 'This value should be encrypted',
+              },
+            })
+            .expect(200);
+          indexRecordActionId = createdAction.id;
+          objectRemover.add(space.id, indexRecordActionId, 'connector', 'actions');
+
+          alertUtils = new AlertUtils({
+            user,
+            space,
+            supertestWithoutAuth,
+            indexRecordActionId,
+            objectRemover,
+          });
+        });
+
+        after(() => objectRemover.removeAll());
+
+        it('should return healthy status by default', async () => {
+          const { body: health } = await supertestWithoutAuth
+            .get(`${getUrlPrefix(space.id)}/api/alerting/_health`)
+            .auth(user.username, user.password);
+          expect(health.is_sufficiently_secure).to.eql(true);
+          expect(health.has_permanent_encryption_key).to.eql(true);
+          expect(health.alerting_framework_heath.decryption_health.status).to.eql('ok');
+          expect(health.alerting_framework_heath.execution_health.status).to.eql('ok');
+          expect(health.alerting_framework_heath.read_health.status).to.eql('ok');
+        });
+
+        it('should return error when a rule in the default space is failing', async () => {
+          const reference = alertUtils.generateReference();
+          const { body: createdRule } = await supertest
+            .post(`${getUrlPrefix(space.id)}/api/alerting/rule`)
+            .set('kbn-xsrf', 'foo')
+            .send(
+              getTestAlertData({
+                schedule: {
+                  interval: '5m',
+                },
+                rule_type_id: 'test.failing',
+                params: {
+                  index: ES_TEST_INDEX_NAME,
+                  reference,
+                },
+              })
+            )
+            .expect(200);
+          objectRemover.add(space.id, createdRule.id, 'rule', 'alerting');
+
+          const ruleInErrorStatus = await retry.tryForTime(30000, async () => {
+            const { body: rule } = await supertest
+              .get(`${getUrlPrefix(space.id)}/api/alerting/rule/${createdRule.id}`)
+              .expect(200);
+            expect(rule.execution_status.status).to.eql('error');
+            return rule;
+          });
+
+          await retry.tryForTime(30000, async () => {
+            const { body: health } = await supertestWithoutAuth
+              .get(`${getUrlPrefix(space.id)}/api/alerting/_health`)
+              .auth(user.username, user.password);
+            expect(health.alerting_framework_heath.execution_health.status).to.eql('warn');
+            expect(health.alerting_framework_heath.execution_health.timestamp).to.eql(
+              ruleInErrorStatus.execution_status.last_execution_date
+            );
+          });
+        });
+      });
+    }
+  });
+}
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 b1b52d89997cd..6ca68bd188124 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
@@ -51,6 +51,7 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
       loadTestFile(require.resolve('./alerts'));
       loadTestFile(require.resolve('./event_log'));
       loadTestFile(require.resolve('./mustache_templates'));
+      loadTestFile(require.resolve('./health'));
     });
   });
 }
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 539e7eb059107..2294cbcc95aa4 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
@@ -35,7 +35,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
 
     before(async () => {
       await esTestIndexTool.destroy();
-      await esArchiver.load('alerts_legacy');
+      await esArchiver.load('x-pack/test/functional/es_archives/alerts_legacy');
       await esTestIndexTool.setup();
       await es.indices.create({ index: authorizationIndex });
       await setupSpacesAndUsers(getService);
@@ -44,7 +44,7 @@ export default function alertTests({ getService }: FtrProviderContext) {
     after(async () => {
       await esTestIndexTool.destroy();
       await es.indices.delete({ index: authorizationIndex });
-      await esArchiver.unload('alerts_legacy');
+      await esArchiver.unload('x-pack/test/functional/es_archives/alerts_legacy');
     });
 
     for (const scenario of UserAtSpaceScenarios) {
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 6de8cb97ae211..a1f15c0db75fd 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
@@ -52,7 +52,7 @@ export async function tearDown(getService: FtrProviderContext['getService']) {
     }
   }
 
-  await esArchiver.unload('empty_kibana');
+  await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
 }
 
 // eslint-disable-next-line import/no-default-export
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 fbdde2104dd61..147b6abfb88d1 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
@@ -97,6 +97,7 @@ export default function ({ getService }: FtrProviderContext) {
       await validateEventLog({
         spaceId: Spaces.space1.id,
         actionId: createdAction.id,
+        actionTypeId: 'test.index-record',
         outcome: 'success',
         message: `action executed: test.index-record:${createdAction.id}: My action`,
       });
@@ -138,6 +139,7 @@ export default function ({ getService }: FtrProviderContext) {
       await validateEventLog({
         spaceId: Spaces.space1.id,
         actionId: createdAction.id,
+        actionTypeId: 'test.failing',
         outcome: 'failure',
         message: `action execution failure: test.failing:${createdAction.id}: failing action`,
         errorMessage: `an error occurred while running the action executor: expected failure for .kibana-alerting-test-data actions-failure-1:space1`,
@@ -330,13 +332,14 @@ export default function ({ getService }: FtrProviderContext) {
   interface ValidateEventLogParams {
     spaceId: string;
     actionId: string;
+    actionTypeId: string;
     outcome: string;
     message: string;
     errorMessage?: string;
   }
 
   async function validateEventLog(params: ValidateEventLogParams): Promise<void> {
-    const { spaceId, actionId, outcome, message, errorMessage } = params;
+    const { spaceId, actionId, actionTypeId, outcome, message, errorMessage } = params;
 
     const events: IValidatedEvent[] = await retry.try(async () => {
       return await getEventLog({
@@ -377,6 +380,7 @@ export default function ({ getService }: FtrProviderContext) {
         type: 'action',
         id: actionId,
         namespace: 'space1',
+        type_id: actionTypeId,
       },
     ]);
 
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts
index 13426d14960f3..811a9470611eb 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/migrations.ts
@@ -16,11 +16,11 @@ export default function createGetTests({ getService }: FtrProviderContext) {
 
   describe('migrations', () => {
     before(async () => {
-      await esArchiver.load('actions');
+      await esArchiver.load('x-pack/test/functional/es_archives/actions');
     });
 
     after(async () => {
-      await esArchiver.unload('actions');
+      await esArchiver.unload('x-pack/test/functional/es_archives/actions');
     });
 
     it('7.10.0 migrates the `casesConfiguration` to be the `incidentConfiguration` in `config`, then 7.11.0 removes `incidentConfiguration`', async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
index 6969a7fb181e2..eafe4f487773f 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/actions/type_not_enabled.ts
@@ -18,8 +18,8 @@ export default function typeNotEnabledTests({ getService }: FtrProviderContext)
 
   describe('actionType not enabled', () => {
     // loads action PREWRITTEN_ACTION_ID with actionType DISABLED_ACTION_TYPE
-    before(() => esArchiver.load('actions'));
-    after(() => esArchiver.unload('actions'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/actions'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/actions'));
 
     it('should handle create action with disabled actionType request appropriately', async () => {
       const response = await supertest.post(`/api/actions/action`).set('kbn-xsrf', 'foo').send({
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 5d54fe3d2b1f7..c1f6bcb9e1510 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
@@ -128,7 +128,9 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
           case 'execute':
             validateEvent(event, {
               spaceId: Spaces.space1.id,
-              savedObjects: [{ type: 'alert', id: alertId, rel: 'primary' }],
+              savedObjects: [
+                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+              ],
               outcome: 'success',
               message: `alert executed: test.patternFiring:${alertId}: 'abc'`,
               status: executeStatuses[executeCount++],
@@ -138,8 +140,8 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
             validateEvent(event, {
               spaceId: Spaces.space1.id,
               savedObjects: [
-                { type: 'alert', id: alertId, rel: 'primary' },
-                { type: 'action', id: createdAction.id },
+                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                { type: 'action', id: createdAction.id, type_id: 'test.noop' },
               ],
               message: `alert: test.patternFiring:${alertId}: 'abc' instanceId: 'instance' scheduled actionGroup: 'default' action: test.noop:${createdAction.id}`,
               instanceId: 'instance',
@@ -147,13 +149,17 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
             });
             break;
           case 'new-instance':
-            validateInstanceEvent(event, `created new instance: 'instance'`);
+            validateInstanceEvent(event, `created new instance: 'instance'`, false);
             break;
           case 'recovered-instance':
-            validateInstanceEvent(event, `instance 'instance' has recovered`);
+            validateInstanceEvent(event, `instance 'instance' has recovered`, true);
             break;
           case 'active-instance':
-            validateInstanceEvent(event, `active instance: 'instance' in actionGroup: 'default'`);
+            validateInstanceEvent(
+              event,
+              `active instance: 'instance' in actionGroup: 'default'`,
+              false
+            );
             break;
           // this will get triggered as we add new event actions
           default:
@@ -161,13 +167,20 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
         }
       }
 
-      function validateInstanceEvent(event: IValidatedEvent, subMessage: string) {
+      function validateInstanceEvent(
+        event: IValidatedEvent,
+        subMessage: string,
+        shouldHaveEventEnd: boolean
+      ) {
         validateEvent(event, {
           spaceId: Spaces.space1.id,
-          savedObjects: [{ type: 'alert', id: alertId, rel: 'primary' }],
+          savedObjects: [
+            { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+          ],
           message: `test.patternFiring:${alertId}: 'abc' ${subMessage}`,
           instanceId: 'instance',
           actionGroupId: 'default',
+          shouldHaveEventEnd,
         });
       }
     });
@@ -260,7 +273,9 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
           case 'execute':
             validateEvent(event, {
               spaceId: Spaces.space1.id,
-              savedObjects: [{ type: 'alert', id: alertId, rel: 'primary' }],
+              savedObjects: [
+                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+              ],
               outcome: 'success',
               message: `alert executed: test.patternFiring:${alertId}: 'abc'`,
               status: executeStatuses[executeCount++],
@@ -273,8 +288,8 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
             validateEvent(event, {
               spaceId: Spaces.space1.id,
               savedObjects: [
-                { type: 'alert', id: alertId, rel: 'primary' },
-                { type: 'action', id: createdAction.id },
+                { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+                { type: 'action', id: createdAction.id, type_id: 'test.noop' },
               ],
               message: `alert: test.patternFiring:${alertId}: 'abc' instanceId: 'instance' scheduled actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})' action: test.noop:${createdAction.id}`,
               instanceId: 'instance',
@@ -282,10 +297,10 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
             });
             break;
           case 'new-instance':
-            validateInstanceEvent(event, `created new instance: 'instance'`);
+            validateInstanceEvent(event, `created new instance: 'instance'`, false);
             break;
           case 'recovered-instance':
-            validateInstanceEvent(event, `instance 'instance' has recovered`);
+            validateInstanceEvent(event, `instance 'instance' has recovered`, true);
             break;
           case 'active-instance':
             expect(
@@ -293,7 +308,8 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
             ).to.be(true);
             validateInstanceEvent(
               event,
-              `active instance: 'instance' in actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})'`
+              `active instance: 'instance' in actionGroup(subgroup): 'default(${event?.kibana?.alerting?.action_subgroup})'`,
+              false
             );
             break;
           // this will get triggered as we add new event actions
@@ -302,13 +318,20 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
         }
       }
 
-      function validateInstanceEvent(event: IValidatedEvent, subMessage: string) {
+      function validateInstanceEvent(
+        event: IValidatedEvent,
+        subMessage: string,
+        shouldHaveEventEnd: boolean
+      ) {
         validateEvent(event, {
           spaceId: Spaces.space1.id,
-          savedObjects: [{ type: 'alert', id: alertId, rel: 'primary' }],
+          savedObjects: [
+            { type: 'alert', id: alertId, rel: 'primary', type_id: 'test.patternFiring' },
+          ],
           message: `test.patternFiring:${alertId}: 'abc' ${subMessage}`,
           instanceId: 'instance',
           actionGroupId: 'default',
+          shouldHaveEventEnd,
         });
       }
     });
@@ -345,7 +368,7 @@ export default function eventLogTests({ getService }: FtrProviderContext) {
 
       validateEvent(event, {
         spaceId: Spaces.space1.id,
-        savedObjects: [{ type: 'alert', id: alertId, rel: 'primary' }],
+        savedObjects: [{ type: 'alert', id: alertId, rel: 'primary', type_id: 'test.throw' }],
         outcome: 'failure',
         message: `alert execution failure: test.throw:${alertId}: 'abc'`,
         errorMessage: 'this alert is intended to fail',
@@ -360,6 +383,7 @@ interface SavedObject {
   type: string;
   id: string;
   rel?: string;
+  type_id: string;
 }
 
 interface ValidateEventLogParams {
@@ -367,6 +391,7 @@ interface ValidateEventLogParams {
   savedObjects: SavedObject[];
   outcome?: string;
   message: string;
+  shouldHaveEventEnd?: boolean;
   errorMessage?: string;
   status?: string;
   actionGroupId?: string;
@@ -376,7 +401,7 @@ interface ValidateEventLogParams {
 
 export function validateEvent(event: IValidatedEvent, params: ValidateEventLogParams): void {
   const { spaceId, savedObjects, outcome, message, errorMessage } = params;
-  const { status, actionGroupId, instanceId, reason } = params;
+  const { status, actionGroupId, instanceId, reason, shouldHaveEventEnd } = params;
 
   if (status) {
     expect(event?.kibana?.alerting?.status).to.be(status);
@@ -402,16 +427,23 @@ export function validateEvent(event: IValidatedEvent, params: ValidateEventLogPa
   if (duration !== undefined) {
     expect(typeof duration).to.be('number');
     expect(eventStart).to.be.ok();
-    expect(eventEnd).to.be.ok();
 
-    const durationDiff = Math.abs(
-      Math.round(duration! / NANOS_IN_MILLIS) - (eventEnd - eventStart)
-    );
+    if (shouldHaveEventEnd !== false) {
+      expect(eventEnd).to.be.ok();
+
+      const durationDiff = Math.abs(
+        Math.round(duration! / NANOS_IN_MILLIS) - (eventEnd - eventStart)
+      );
 
-    // account for rounding errors
-    expect(durationDiff < 1).to.equal(true);
-    expect(eventStart <= eventEnd).to.equal(true);
-    expect(eventEnd <= dateNow).to.equal(true);
+      // account for rounding errors
+      expect(durationDiff < 1).to.equal(true);
+      expect(eventStart <= eventEnd).to.equal(true);
+      expect(eventEnd <= dateNow).to.equal(true);
+    }
+
+    if (shouldHaveEventEnd === false) {
+      expect(eventEnd).not.to.be.ok();
+    }
   }
 
   expect(event?.event?.outcome).to.equal(outcome);
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
new file mode 100644
index 0000000000000..2b92562b9bde5
--- /dev/null
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/event_log_alerts.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { Spaces } from '../../scenarios';
+import { getUrlPrefix, getTestAlertData, 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) {
+  const supertest = getService('supertest');
+  const retry = getService('retry');
+
+  describe('eventLog alerts', () => {
+    const objectRemover = new ObjectRemover(supertest);
+
+    after(() => objectRemover.removeAll());
+
+    it('should generate expected alert events for normal operation', async () => {
+      // pattern of when the alert should fire
+      const pattern = {
+        instance: [false, true, true, false, false, true, true, true],
+      };
+
+      const response = await supertest
+        .post(`${getUrlPrefix(Spaces.space1.id)}/api/alerting/rule`)
+        .set('kbn-xsrf', 'foo')
+        .send(
+          getTestAlertData({
+            rule_type_id: 'test.patternFiring',
+            schedule: { interval: '1s' },
+            throttle: null,
+            params: {
+              pattern,
+            },
+            actions: [],
+          })
+        );
+
+      expect(response.status).to.eql(200);
+      const ruleId = response.body.id;
+      objectRemover.add(Spaces.space1.id, ruleId, 'rule', 'alerting');
+
+      // wait for the events we're expecting
+      const events = await retry.try(async () => {
+        return await getEventLog({
+          getService,
+          spaceId: Spaces.space1.id,
+          type: 'alert',
+          id: ruleId,
+          provider: 'alerting',
+          actions: new Map([
+            // make sure the counts of the # of events per type are as expected
+            ['execute', { gte: 9 }],
+            ['new-instance', { equal: 2 }],
+            ['active-instance', { gte: 4 }],
+            ['recovered-instance', { equal: 2 }],
+          ]),
+        });
+      });
+
+      // filter out the execute event actions
+      const instanceEvents = events.filter(
+        (event: IValidatedEvent) => event?.event?.action !== 'execute'
+      );
+
+      const currentAlertSpan: {
+        alertId?: string;
+        start?: string;
+        durationToDate?: number;
+      } = {};
+      for (let i = 0; i < instanceEvents.length; ++i) {
+        switch (instanceEvents[i]?.event?.action) {
+          case 'new-instance':
+            expect(instanceEvents[i]?.kibana?.alerting?.instance_id).to.equal('instance');
+            // a new alert should generate a unique UUID for the duration of its activeness
+            expect(instanceEvents[i]?.event?.end).to.be(undefined);
+
+            currentAlertSpan.alertId = instanceEvents[i]?.kibana?.alerting?.instance_id;
+            currentAlertSpan.start = instanceEvents[i]?.event?.start;
+            currentAlertSpan.durationToDate = instanceEvents[i]?.event?.duration;
+            break;
+
+          case 'active-instance':
+            expect(instanceEvents[i]?.kibana?.alerting?.instance_id).to.equal('instance');
+            expect(instanceEvents[i]?.event?.start).to.equal(currentAlertSpan.start);
+            expect(instanceEvents[i]?.event?.end).to.be(undefined);
+
+            if (instanceEvents[i]?.event?.duration! !== 0) {
+              expect(instanceEvents[i]?.event?.duration! > currentAlertSpan.durationToDate!).to.be(
+                true
+              );
+            }
+            currentAlertSpan.durationToDate = instanceEvents[i]?.event?.duration;
+            break;
+
+          case 'recovered-instance':
+            expect(instanceEvents[i]?.kibana?.alerting?.instance_id).to.equal('instance');
+            expect(instanceEvents[i]?.event?.start).to.equal(currentAlertSpan.start);
+            expect(instanceEvents[i]?.event?.end).not.to.be(undefined);
+            expect(
+              new Date(instanceEvents[i]?.event?.end!).valueOf() -
+                new Date(instanceEvents[i]?.event?.start!).valueOf()
+            ).to.equal(instanceEvents[i]?.event?.duration! / 1000 / 1000);
+            break;
+        }
+      }
+    });
+  });
+}
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_state.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_state.ts
index 9154c85af1bc7..318dfdfe065df 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_state.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/get_alert_state.ts
@@ -76,7 +76,9 @@ export default function createGetAlertStateTests({ getService }: FtrProviderCont
       expect(alertInstances.length).to.eql(response.body.rule_type_state.runCount);
       alertInstances.forEach(([key, value], index) => {
         expect(key).to.eql(`instance-${index}`);
-        expect(value.state).to.eql({ instanceStateValue: true });
+        expect(value.state.instanceStateValue).to.be(true);
+        expect(value.state.start).not.to.be(undefined);
+        expect(value.state.duration).not.to.be(undefined);
       });
     });
 
@@ -131,7 +133,9 @@ export default function createGetAlertStateTests({ getService }: FtrProviderCont
         expect(alertInstances.length).to.eql(response.body.rule_type_state.runCount);
         alertInstances.forEach(([key, value], index) => {
           expect(key).to.eql(`instance-${index}`);
-          expect(value.state).to.eql({ instanceStateValue: true });
+          expect(value.state.instanceStateValue).to.be(true);
+          expect(value.state.start).not.to.be(undefined);
+          expect(value.state.duration).not.to.be(undefined);
         });
       });
     });
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts
index e9aeec1717c96..5c3374a4d9c70 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/index.ts
@@ -37,6 +37,7 @@ export default function alertingTests({ loadTestFile, getService }: FtrProviderC
     loadTestFile(require.resolve('./builtin_alert_types'));
     loadTestFile(require.resolve('./mustache_templates.ts'));
     loadTestFile(require.resolve('./notify_when'));
+    loadTestFile(require.resolve('./event_log_alerts'));
 
     // note that this test will destroy existing spaces
     loadTestFile(require.resolve('./migrations'));
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 30e69d62933e0..0eaeaf9a4b7e7 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
@@ -16,11 +16,11 @@ export default function createGetTests({ getService }: FtrProviderContext) {
 
   describe('migrations', () => {
     before(async () => {
-      await esArchiver.load('alerts');
+      await esArchiver.load('x-pack/test/functional/es_archives/alerts');
     });
 
     after(async () => {
-      await esArchiver.unload('alerts');
+      await esArchiver.unload('x-pack/test/functional/es_archives/alerts');
     });
 
     it('7.10.0 migrates the `alerting` consumer to be the `alerts`', async () => {
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts
index 318da3e114097..326fb0bfac465 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/alerting/update.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { Spaces } from '../../scenarios';
 import { checkAAD, getUrlPrefix, getTestAlertData, ObjectRemover } from '../../../common/lib';
 import { FtrProviderContext } from '../../../common/ftr_provider_context';
diff --git a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts
index 711910c13023d..8b0addcba26e9 100644
--- a/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only/tests/index.ts
@@ -30,5 +30,5 @@ export async function buildUp(getService: FtrProviderContext['getService']) {
 
 export async function tearDown(getService: FtrProviderContext['getService']) {
   const esArchiver = getService('esArchiver');
-  await esArchiver.unload('empty_kibana');
+  await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
 }
diff --git a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts
index a5a046dcbbe86..bb581a7f61cdb 100644
--- a/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts
+++ b/x-pack/test/alerting_api_integration/spaces_only_legacy/tests/index.ts
@@ -29,5 +29,5 @@ export async function buildUp(getService: FtrProviderContext['getService']) {
 
 export async function tearDown(getService: FtrProviderContext['getService']) {
   const esArchiver = getService('esArchiver');
-  await esArchiver.unload('empty_kibana');
+  await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
 }
diff --git a/x-pack/test/api_integration/apis/file_upload/index_exists.ts b/x-pack/test/api_integration/apis/file_upload/index_exists.ts
index 4e014105ab7a8..a9688a542dc1e 100644
--- a/x-pack/test/api_integration/apis/file_upload/index_exists.ts
+++ b/x-pack/test/api_integration/apis/file_upload/index_exists.ts
@@ -14,11 +14,11 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST /internal/file_upload/index_exists', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     after(async () => {
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     it('should return true when index exists', async () => {
diff --git a/x-pack/test/api_integration/apis/kibana/kql_telemetry/kql_telemetry.js b/x-pack/test/api_integration/apis/kibana/kql_telemetry/kql_telemetry.js
index 8c67f3a42721f..95a65de81e85b 100644
--- a/x-pack/test/api_integration/apis/kibana/kql_telemetry/kql_telemetry.js
+++ b/x-pack/test/api_integration/apis/kibana/kql_telemetry/kql_telemetry.js
@@ -10,12 +10,8 @@ import expect from '@kbn/expect';
 export default function ({ getService }) {
   const supertestNoAuth = getService('supertestWithoutAuth');
   const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
 
   describe('telemetry API', () => {
-    before(() => esArchiver.load('empty_kibana'));
-    after(() => esArchiver.unload('empty_kibana'));
-
     describe('no auth', () => {
       it('should return 401', async () => {
         return supertestNoAuth
diff --git a/x-pack/test/api_integration/apis/lens/existing_fields.ts b/x-pack/test/api_integration/apis/lens/existing_fields.ts
index 88949401f102a..952659c2960d4 100644
--- a/x-pack/test/api_integration/apis/lens/existing_fields.ts
+++ b/x-pack/test/api_integration/apis/lens/existing_fields.ts
@@ -162,12 +162,12 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('existing_fields apis', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('visualize/default');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/visualize/default');
     });
     after(async () => {
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.unload('visualize/default');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default');
     });
 
     describe('existence', () => {
diff --git a/x-pack/test/api_integration/apis/lens/field_stats.ts b/x-pack/test/api_integration/apis/lens/field_stats.ts
index 94960b9859121..5dcb749f54b31 100644
--- a/x-pack/test/api_integration/apis/lens/field_stats.ts
+++ b/x-pack/test/api_integration/apis/lens/field_stats.ts
@@ -21,18 +21,18 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('index stats apis', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
     after(async () => {
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     describe('field distribution', () => {
       before(async () => {
-        await esArchiver.loadIfNeeded('visualize/default');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/visualize/default');
       });
       after(async () => {
-        await esArchiver.unload('visualize/default');
+        await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default');
       });
 
       it('should return a 404 for missing index patterns', async () => {
@@ -431,10 +431,12 @@ export default ({ getService }: FtrProviderContext) => {
 
     describe('histogram', () => {
       before(async () => {
-        await esArchiver.loadIfNeeded('pre_calculated_histogram');
+        await esArchiver.loadIfNeeded(
+          'x-pack/test/functional/es_archives/pre_calculated_histogram'
+        );
       });
       after(async () => {
-        await esArchiver.unload('pre_calculated_histogram');
+        await esArchiver.unload('x-pack/test/functional/es_archives/pre_calculated_histogram');
       });
 
       it('should return an auto histogram for precalculated histograms', async () => {
diff --git a/x-pack/test/api_integration/apis/lens/telemetry.ts b/x-pack/test/api_integration/apis/lens/telemetry.ts
index 32b6a446a57b2..9f691115232ae 100644
--- a/x-pack/test/api_integration/apis/lens/telemetry.ts
+++ b/x-pack/test/api_integration/apis/lens/telemetry.ts
@@ -41,7 +41,6 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await es.deleteByQuery({
         index: '.kibana',
-        // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
         q: 'type:lens-ui-telemetry',
         wait_for_completion: true,
         refresh: true,
@@ -52,7 +51,6 @@ export default ({ getService }: FtrProviderContext) => {
     afterEach(async () => {
       await es.deleteByQuery({
         index: '.kibana',
-        // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
         q: 'type:lens-ui-telemetry',
         wait_for_completion: true,
         refresh: true,
@@ -177,7 +175,7 @@ export default ({ getService }: FtrProviderContext) => {
     it('should collect telemetry on saved visualization types with a painless script', async () => {
       const esArchiver = getService('esArchiver');
 
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
 
       const results = await getVisualizationCounts(() => Promise.resolve(es), '.kibana');
 
@@ -197,7 +195,7 @@ export default ({ getService }: FtrProviderContext) => {
       });
       expect(results.saved_overall_total).to.eql(3);
 
-      await esArchiver.unload('lens/basic');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
   });
 };
diff --git a/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts b/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts
index db3cdd17a89dc..b24cc7d14fef7 100644
--- a/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts
+++ b/x-pack/test/api_integration/apis/lists/create_exception_list_item.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { ENDPOINT_LIST_ID } from '@kbn/securitysolution-list-constants';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -13,9 +13,9 @@ export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
   describe('Lists API', () => {
-    before(async () => await esArchiver.load('lists'));
+    before(async () => await esArchiver.load('x-pack/test/functional/es_archives/lists'));
 
-    after(async () => await esArchiver.unload('lists'));
+    after(async () => await esArchiver.unload('x-pack/test/functional/es_archives/lists'));
 
     it('should return a 400 if an endpoint exception item with a list-based entry is provided', async () => {
       const badItem = {
diff --git a/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts b/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts
index dc24f864250b9..dc626beb1ba44 100644
--- a/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts
+++ b/x-pack/test/api_integration/apis/logstash/pipeline/delete.ts
@@ -11,7 +11,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   describe('delete', () => {
-    const archive = 'logstash/empty';
+    const archive = 'x-pack/test/functional/es_archives/logstash/empty';
 
     before('load pipelines archive', async () => {
       await esArchiver.load(archive);
diff --git a/x-pack/test/api_integration/apis/logstash/pipeline/load.ts b/x-pack/test/api_integration/apis/logstash/pipeline/load.ts
index 7fbc603054111..c08acb3d9cf21 100644
--- a/x-pack/test/api_integration/apis/logstash/pipeline/load.ts
+++ b/x-pack/test/api_integration/apis/logstash/pipeline/load.ts
@@ -14,7 +14,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   describe('list', () => {
-    const archive = 'logstash/example_pipelines';
+    const archive = 'x-pack/test/functional/es_archives/logstash/example_pipelines';
 
     before('load pipelines archive', () => {
       return esArchiver.load(archive);
diff --git a/x-pack/test/api_integration/apis/logstash/pipeline/save.ts b/x-pack/test/api_integration/apis/logstash/pipeline/save.ts
index 445916c76325b..84f6943845b64 100644
--- a/x-pack/test/api_integration/apis/logstash/pipeline/save.ts
+++ b/x-pack/test/api_integration/apis/logstash/pipeline/save.ts
@@ -12,7 +12,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   describe('save', () => {
-    const archive = 'logstash/empty';
+    const archive = 'x-pack/test/functional/es_archives/logstash/empty';
 
     before('load pipelines archive', () => {
       return esArchiver.load(archive);
diff --git a/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts b/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts
index 00650ed43486d..9a18f197c13f3 100644
--- a/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts
+++ b/x-pack/test/api_integration/apis/logstash/pipelines/delete.ts
@@ -11,7 +11,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   describe('delete', () => {
-    const archive = 'logstash/example_pipelines';
+    const archive = 'x-pack/test/functional/es_archives/logstash/example_pipelines';
 
     before('load pipelines archive', async () => {
       await esArchiver.load(archive);
diff --git a/x-pack/test/api_integration/apis/logstash/pipelines/list.ts b/x-pack/test/api_integration/apis/logstash/pipelines/list.ts
index 41514cfca93d4..6833bd8131cd6 100644
--- a/x-pack/test/api_integration/apis/logstash/pipelines/list.ts
+++ b/x-pack/test/api_integration/apis/logstash/pipelines/list.ts
@@ -13,7 +13,7 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   const esArchiver = getService('esArchiver');
   describe('list', () => {
-    const archive = 'logstash/example_pipelines';
+    const archive = 'x-pack/test/functional/es_archives/logstash/example_pipelines';
 
     before('load pipelines archive', () => {
       return esArchiver.load(archive);
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/auto_follow_pattern.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/auto_follow_pattern.js
index be15b9586bb58..111aa43d95f91 100644
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/auto_follow_pattern.js
+++ b/x-pack/test/api_integration/apis/management/cross_cluster_replication/auto_follow_pattern.js
@@ -45,7 +45,7 @@ export default function ({ getService }) {
         });
 
         expect(body.statusCode).to.be(404);
-        expect(body.attributes.cause[0]).to.contain('no such remote cluster');
+        expect(body.attributes.error.reason).to.contain('no such remote cluster');
       });
     });
 
@@ -70,7 +70,7 @@ export default function ({ getService }) {
         it('should return a 404 when the auto-follow pattern is not found', async () => {
           const { body } = await getAutoFollowPattern('missing-pattern');
           expect(body.statusCode).to.be(404);
-          expect(body.attributes.cause).not.to.be(undefined);
+          expect(body.attributes.error.reason).not.to.be(undefined);
         });
 
         it('should return an auto-follow pattern that was created', async () => {
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/fixtures.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/fixtures.js
index a2ea349ae7afa..69485b479f259 100644
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/fixtures.js
+++ b/x-pack/test/api_integration/apis/management/cross_cluster_replication/fixtures.js
@@ -6,10 +6,9 @@
  */
 
 import { REMOTE_CLUSTER_NAME } from './constants';
-import { getRandomString } from './lib';
 
 export const getFollowerIndexPayload = (
-  leaderIndexName = getRandomString(),
+  leaderIndexName = 'test-leader-index',
   remoteCluster = REMOTE_CLUSTER_NAME,
   advancedSettings = {}
 ) => ({
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.helpers.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.helpers.js
index fe8f260aef94c..7890679d59c27 100644
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.helpers.js
+++ b/x-pack/test/api_integration/apis/management/cross_cluster_replication/follower_indices.helpers.js
@@ -6,7 +6,6 @@
  */
 
 import { API_BASE_PATH } from './constants';
-import { getRandomString } from './lib';
 import { getFollowerIndexPayload } from './fixtures';
 
 export const registerHelpers = (supertest) => {
@@ -51,7 +50,7 @@ export const registerHelpers = (supertest) => {
     };
   };
 
-  const createFollowerIndex = (name = getRandomString(), payload = getFollowerIndexPayload()) => {
+  const createFollowerIndex = (name, payload = getFollowerIndexPayload()) => {
     followerIndicesCreated.push(name);
 
     return supertest
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 e313400214489..7f5df1e4632fa 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
@@ -9,7 +9,7 @@ import expect from '@kbn/expect';
 
 import { FOLLOWER_INDEX_ADVANCED_SETTINGS } from '../../../../../plugins/cross_cluster_replication/common/constants';
 import { getFollowerIndexPayload } from './fixtures';
-import { registerHelpers as registerElasticSearchHelpers, getRandomString } from './lib';
+import { registerHelpers as registerElasticSearchHelpers } from './lib';
 import { registerHelpers as registerRemoteClustersHelpers } from './remote_clusters.helpers';
 import { registerHelpers as registerFollowerIndicesnHelpers } from './follower_indices.helpers';
 
@@ -47,23 +47,23 @@ export default function ({ getService }) {
         const payload = getFollowerIndexPayload();
         payload.remoteCluster = 'unknown-cluster';
 
-        const { body } = await createFollowerIndex(undefined, payload).expect(404);
-        expect(body.attributes.cause[0]).to.contain('no such remote cluster');
+        const { body } = await createFollowerIndex('test', payload).expect(404);
+        expect(body.attributes.error.reason).to.contain('no such remote cluster');
       });
 
       it('should throw a 404 error trying to follow an unknown index', async () => {
         const payload = getFollowerIndexPayload();
-        const { body } = await createFollowerIndex(undefined, payload).expect(404);
-        expect(body.attributes.cause[0]).to.contain('no such index');
+        const { body } = await createFollowerIndex('test', payload).expect(404);
+        expect(body.attributes.error.reason).to.contain('no such index');
       });
 
       // NOTE: If this test fails locally it's probably because you have another cluster running.
       it('should create a follower index that follows an existing leader index', async () => {
         // First let's create an index to follow
-        const leaderIndex = await createIndex();
+        const leaderIndex = await createIndex('leader1');
 
         const payload = getFollowerIndexPayload(leaderIndex);
-        const { body } = await createFollowerIndex(undefined, payload).expect(200);
+        const { body } = await createFollowerIndex('index1', payload).expect(200);
 
         // There is a race condition in which Elasticsearch can respond without acknowledging,
         // i.e. `body.follow_index_shards_acked` is sometimes true and sometimes false.
@@ -74,17 +74,17 @@ export default function ({ getService }) {
 
     describe('get()', () => {
       it('should return a 404 when the follower index does not exist', async () => {
-        const name = getRandomString();
+        const name = 'test';
         const { body } = await getFollowerIndex(name).expect(404);
 
-        expect(body.attributes.cause[0]).to.contain('no such index');
+        expect(body.attributes.error.reason).to.contain('no such index');
       });
 
       // NOTE: If this test fails locally it's probably because you have another cluster running.
       it('should return a follower index that was created', async () => {
-        const leaderIndex = await createIndex();
+        const leaderIndex = await createIndex('leader2');
 
-        const name = getRandomString();
+        const name = 'index2';
         const payload = getFollowerIndexPayload(leaderIndex);
         await createFollowerIndex(name, payload);
 
@@ -98,8 +98,8 @@ export default function ({ getService }) {
     describe('update()', () => {
       it('should update a follower index advanced settings', async () => {
         // Create a follower index
-        const leaderIndex = await createIndex();
-        const followerIndex = getRandomString();
+        const leaderIndex = await createIndex('leader3');
+        const followerIndex = 'index3';
         const initialValue = 1234;
         const payload = getFollowerIndexPayload(leaderIndex, undefined, {
           maxReadRequestOperationCount: initialValue,
@@ -128,9 +128,8 @@ export default function ({ getService }) {
          * When we then retrieve the follower index it will have all the advanced settings
          * coming from ES. We can then compare those settings with our hard-coded values.
          */
-        const leaderIndex = await createIndex();
-
-        const name = getRandomString();
+        const leaderIndex = await createIndex('leader4');
+        const name = 'index4';
         const payload = getFollowerIndexPayload(leaderIndex);
         await createFollowerIndex(name, payload);
 
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/elasticsearch.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/elasticsearch.js
index 326dbf1ef1857..37d6ade2a7d4a 100644
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/elasticsearch.js
+++ b/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/elasticsearch.js
@@ -5,20 +5,18 @@
  * 2.0.
  */
 
-import { getRandomString } from './random';
-
 /**
  * Helpers to create and delete indices on the Elasticsearch instance
  * during our tests.
  * @param {ElasticsearchClient} es The Elasticsearch client instance
  */
 export const registerHelpers = (getService) => {
-  const es = getService('legacyEs');
+  const es = getService('es');
   const esDeleteAllIndices = getService('esDeleteAllIndices');
 
   let indicesCreated = [];
 
-  const createIndex = (index = getRandomString()) => {
+  const createIndex = (index) => {
     indicesCreated.push(index);
     return es.indices.create({ index }).then(() => index);
   };
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/index.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/index.js
index 38eb2016cdb62..40fc2e37ed4ea 100644
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/index.js
+++ b/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/index.js
@@ -6,5 +6,3 @@
  */
 
 export { registerHelpers } from './elasticsearch';
-
-export { getRandomString } from './random';
diff --git a/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/random.js b/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/random.js
deleted file mode 100644
index 9c8a4cc5ff9d3..0000000000000
--- a/x-pack/test/api_integration/apis/management/cross_cluster_replication/lib/random.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import Chance from 'chance';
-
-const chance = new Chance();
-const CHARS_POOL = 'abcdefghijklmnopqrstuvwxyz';
-
-export const getRandomString = () => `${chance.string({ pool: CHARS_POOL })}-${Date.now()}`;
diff --git a/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js b/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js
index 55b4da8b11ec2..756fda7566843 100644
--- a/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js
+++ b/x-pack/test/api_integration/apis/management/index_lifecycle_management/policies.js
@@ -44,6 +44,9 @@ export default function ({ getService }) {
         const modifiedDate = '2019-04-30T14:30:00.000Z';
         policy.modified_date = modifiedDate;
 
+        // We don't want to match `_meta` field since it can change between Elasticsearch versions
+        delete policy.policy._meta;
+
         expect(policy).to.eql({
           version: 1,
           modified_date: modifiedDate,
diff --git a/x-pack/test/api_integration/apis/management/index_management/indices.js b/x-pack/test/api_integration/apis/management/index_management/indices.js
index cef1bdbba754b..d0e17476530b7 100644
--- a/x-pack/test/api_integration/apis/management/index_management/indices.js
+++ b/x-pack/test/api_integration/apis/management/index_management/indices.js
@@ -177,7 +177,8 @@ export default function ({ getService }) {
       });
     });
 
-    describe('list', function () {
+    // FLAKY: https://github.com/elastic/kibana/issues/64473
+    describe.skip('list', function () {
       this.tags(['skipCloud']);
 
       it('should list all the indices with the expected properties and data enrichers', async function () {
@@ -208,7 +209,8 @@ export default function ({ getService }) {
     });
 
     describe('reload', function () {
-      describe('(not on Cloud)', function () {
+      // FLAKY: https://github.com/elastic/kibana/issues/90565
+      describe.skip('(not on Cloud)', function () {
         this.tags(['skipCloud']);
 
         it('should list all the indices with the expected properties and data enrichers', async function () {
diff --git a/x-pack/test/api_integration/apis/maps/index.js b/x-pack/test/api_integration/apis/maps/index.js
index db954a3dc0396..dc39d7ce36931 100644
--- a/x-pack/test/api_integration/apis/maps/index.js
+++ b/x-pack/test/api_integration/apis/maps/index.js
@@ -10,8 +10,8 @@ export default function ({ loadTestFile, getService }) {
 
   describe('Maps endpoints', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('maps/data');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/maps/data');
     });
 
     describe('', () => {
diff --git a/x-pack/test/api_integration/apis/maps/migrations.js b/x-pack/test/api_integration/apis/maps/migrations.js
index 109579e867cb0..728f26636f970 100644
--- a/x-pack/test/api_integration/apis/maps/migrations.js
+++ b/x-pack/test/api_integration/apis/maps/migrations.js
@@ -9,41 +9,71 @@ import expect from '@kbn/expect';
 
 export default function ({ getService }) {
   const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
 
   describe('migrations', () => {
-    it('should apply saved object reference migration when importing map saved objects prior to 7.2.0', async () => {
-      const resp = await supertest
-        .post(`/api/saved_objects/map`)
-        .set('kbn-xsrf', 'kibana')
-        .send({
-          attributes: {
-            title: '[Logs] Total Requests and Bytes',
-            layerListJSON:
-              '[{"id":"edh66","label":"Total Requests by Country","minZoom":0,"maxZoom":24,"alpha":0.5,"sourceDescriptor":{"type":"EMS_FILE","id":"world_countries"},"visible":true,"style":{"type":"VECTOR","properties":{"fillColor":{"type":"DYNAMIC","options":{"field":{"label":"count of kibana_sample_data_logs:geo.src","name":"__kbnjoin__count_groupby_kibana_sample_data_logs.geo.src","origin":"join"},"color":"Greys"}},"lineColor":{"type":"STATIC","options":{"color":"#FFFFFF"}},"lineWidth":{"type":"STATIC","options":{"size":1}},"iconSize":{"type":"STATIC","options":{"size":10}}}},"type":"VECTOR","joins":[{"leftField":"iso2","right":{"id":"673ff994-fc75-4c67-909b-69fcb0e1060e","indexPatternId":"90943e30-9a47-11e8-b64d-95841ca0b247","indexPatternTitle":"kibana_sample_data_logs","term":"geo.src"}}]},{"id":"gaxya","label":"Actual Requests","minZoom":9,"maxZoom":24,"alpha":1,"sourceDescriptor":{"id":"b7486535-171b-4d3b-bb2e-33c1a0a2854c","type":"ES_SEARCH","indexPatternId":"90943e30-9a47-11e8-b64d-95841ca0b247","geoField":"geo.coordinates","limit":2048,"filterByMapBounds":true,"tooltipProperties":["clientip","timestamp","host","request","response","machine.os","agent","bytes"]},"visible":true,"style":{"type":"VECTOR","properties":{"fillColor":{"type":"STATIC","options":{"color":"#2200ff"}},"lineColor":{"type":"STATIC","options":{"color":"#FFFFFF"}},"lineWidth":{"type":"STATIC","options":{"size":2}},"iconSize":{"type":"DYNAMIC","options":{"field":{"label":"bytes","name":"bytes","origin":"source"},"minSize":1,"maxSize":23}}}},"type":"VECTOR"},{"id":"tfi3f","label":"Total Requests and Bytes","minZoom":0,"maxZoom":9,"alpha":1,"sourceDescriptor":{"type":"ES_GEO_GRID","resolution":"COARSE","id":"8aaa65b5-a4e9-448b-9560-c98cb1c5ac5b","indexPatternId":"90943e30-9a47-11e8-b64d-95841ca0b247","geoField":"geo.coordinates","requestType":"point","metrics":[{"type":"count"},{"type":"sum","field":"bytes"}]},"visible":true,"style":{"type":"VECTOR","properties":{"fillColor":{"type":"DYNAMIC","options":{"field":{"label":"Count","name":"doc_count","origin":"source"},"color":"Blues"}},"lineColor":{"type":"STATIC","options":{"color":"#cccccc"}},"lineWidth":{"type":"STATIC","options":{"size":1}},"iconSize":{"type":"DYNAMIC","options":{"field":{"label":"sum of bytes","name":"sum_of_bytes","origin":"source"},"minSize":1,"maxSize":25}}}},"type":"VECTOR"}]',
+    describe('saved object migrations', () => {
+      it('should apply saved object reference migration when importing map saved objects prior to 7.2.0', async () => {
+        const resp = await supertest
+          .post(`/api/saved_objects/map`)
+          .set('kbn-xsrf', 'kibana')
+          .send({
+            attributes: {
+              title: '[Logs] Total Requests and Bytes',
+              layerListJSON:
+                '[{"id":"edh66","label":"Total Requests by Country","minZoom":0,"maxZoom":24,"alpha":0.5,"sourceDescriptor":{"type":"EMS_FILE","id":"world_countries"},"visible":true,"style":{"type":"VECTOR","properties":{"fillColor":{"type":"DYNAMIC","options":{"field":{"label":"count of kibana_sample_data_logs:geo.src","name":"__kbnjoin__count_groupby_kibana_sample_data_logs.geo.src","origin":"join"},"color":"Greys"}},"lineColor":{"type":"STATIC","options":{"color":"#FFFFFF"}},"lineWidth":{"type":"STATIC","options":{"size":1}},"iconSize":{"type":"STATIC","options":{"size":10}}}},"type":"VECTOR","joins":[{"leftField":"iso2","right":{"id":"673ff994-fc75-4c67-909b-69fcb0e1060e","indexPatternId":"90943e30-9a47-11e8-b64d-95841ca0b247","indexPatternTitle":"kibana_sample_data_logs","term":"geo.src"}}]},{"id":"gaxya","label":"Actual Requests","minZoom":9,"maxZoom":24,"alpha":1,"sourceDescriptor":{"id":"b7486535-171b-4d3b-bb2e-33c1a0a2854c","type":"ES_SEARCH","indexPatternId":"90943e30-9a47-11e8-b64d-95841ca0b247","geoField":"geo.coordinates","limit":2048,"filterByMapBounds":true,"tooltipProperties":["clientip","timestamp","host","request","response","machine.os","agent","bytes"]},"visible":true,"style":{"type":"VECTOR","properties":{"fillColor":{"type":"STATIC","options":{"color":"#2200ff"}},"lineColor":{"type":"STATIC","options":{"color":"#FFFFFF"}},"lineWidth":{"type":"STATIC","options":{"size":2}},"iconSize":{"type":"DYNAMIC","options":{"field":{"label":"bytes","name":"bytes","origin":"source"},"minSize":1,"maxSize":23}}}},"type":"VECTOR"},{"id":"tfi3f","label":"Total Requests and Bytes","minZoom":0,"maxZoom":9,"alpha":1,"sourceDescriptor":{"type":"ES_GEO_GRID","resolution":"COARSE","id":"8aaa65b5-a4e9-448b-9560-c98cb1c5ac5b","indexPatternId":"90943e30-9a47-11e8-b64d-95841ca0b247","geoField":"geo.coordinates","requestType":"point","metrics":[{"type":"count"},{"type":"sum","field":"bytes"}]},"visible":true,"style":{"type":"VECTOR","properties":{"fillColor":{"type":"DYNAMIC","options":{"field":{"label":"Count","name":"doc_count","origin":"source"},"color":"Blues"}},"lineColor":{"type":"STATIC","options":{"color":"#cccccc"}},"lineWidth":{"type":"STATIC","options":{"size":1}},"iconSize":{"type":"DYNAMIC","options":{"field":{"label":"sum of bytes","name":"sum_of_bytes","origin":"source"},"minSize":1,"maxSize":25}}}},"type":"VECTOR"}]',
+            },
+            migrationVersion: {},
+          })
+          .expect(200);
+
+        expect(resp.body.references).to.eql([
+          {
+            id: '90943e30-9a47-11e8-b64d-95841ca0b247',
+            name: 'layer_0_join_0_index_pattern',
+            type: 'index-pattern',
+          },
+          {
+            id: '90943e30-9a47-11e8-b64d-95841ca0b247',
+            name: 'layer_1_source_index_pattern',
+            type: 'index-pattern',
           },
-          migrationVersion: {},
-        })
-        .expect(200);
-
-      expect(resp.body.references).to.eql([
-        {
-          id: '90943e30-9a47-11e8-b64d-95841ca0b247',
-          name: 'layer_0_join_0_index_pattern',
-          type: 'index-pattern',
-        },
-        {
-          id: '90943e30-9a47-11e8-b64d-95841ca0b247',
-          name: 'layer_1_source_index_pattern',
-          type: 'index-pattern',
-        },
-        {
-          id: '90943e30-9a47-11e8-b64d-95841ca0b247',
-          name: 'layer_2_source_index_pattern',
-          type: 'index-pattern',
-        },
-      ]);
-      expect(resp.body.migrationVersion).to.eql({ map: '7.14.0' });
-      expect(resp.body.attributes.layerListJSON.includes('indexPatternRefName')).to.be(true);
+          {
+            id: '90943e30-9a47-11e8-b64d-95841ca0b247',
+            name: 'layer_2_source_index_pattern',
+            type: 'index-pattern',
+          },
+        ]);
+        expect(resp.body.migrationVersion).to.eql({ map: '7.14.0' });
+        expect(resp.body.attributes.layerListJSON.includes('indexPatternRefName')).to.be(true);
+      });
+    });
+
+    describe('embeddable migrations', () => {
+      before(async () => {
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/maps/kibana');
+      });
+
+      after(async () => {
+        await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana');
+      });
+
+      it('should apply embeddable migrations', async () => {
+        const resp = await supertest
+          .get(`/api/saved_objects/dashboard/4beb0d80-c2ef-11eb-b0cb-bd162d969e6b`)
+          .set('kbn-xsrf', 'kibana')
+          .expect(200);
+
+        let panels;
+        try {
+          panels = JSON.parse(resp.body.attributes.panelsJSON);
+        } catch (error) {
+          throw 'Unable to parse panelsJSON from dashboard saved object';
+        }
+        expect(panels.length).to.be(1);
+        expect(panels[0].type).to.be('map');
+        expect(panels[0].version).to.be('7.14.0');
+      });
     });
   });
 }
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 912266bf87e42..65a350c523ee3 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
@@ -30,8 +30,12 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Source API via HTTP', () => {
     describe('8.0.0', () => {
-      before(() => esArchiver.load('infra/8.0.0/logs_and_metrics'));
-      after(() => esArchiver.unload('infra/8.0.0/logs_and_metrics'));
+      before(() =>
+        esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+      );
+      after(() =>
+        esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+      );
       describe('/api/metrics/source/default', () => {
         it('should just work', async () => {
           const resp = fetchSource();
diff --git a/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts b/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts
index 4d09ce2814f88..3a3e6172cdfcc 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/ip_to_hostname.ts
@@ -13,8 +13,8 @@ export default function ipToHostNameTest({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('Ip to Host API', () => {
-    before(() => esArchiver.load('infra/metrics_and_logs'));
-    after(() => esArchiver.unload('infra/metrics_and_logs'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
 
     it('should basically work', async () => {
       const postBody = {
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 ca04e1c87c2f1..a6292769fc5a4 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
@@ -39,13 +39,13 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('log highlight apis', () => {
-    before(() => esArchiver.load('infra/simple_logs'));
-    after(() => esArchiver.unload('infra/simple_logs'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/simple_logs'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/simple_logs'));
 
     describe('/log_entries/highlights', () => {
       describe('with the default source', () => {
-        before(() => esArchiver.load('empty_kibana'));
-        after(() => esArchiver.unload('empty_kibana'));
+        before(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
+        after(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'));
 
         it('Handles empty responses', async () => {
           const { body } = await supertest
diff --git a/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts b/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts
index 0cde7263a2454..5b615c4b18916 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/log_sources.ts
@@ -19,10 +19,10 @@ export default function ({ getService }: FtrProviderContext) {
   const logSourceConfiguration = getService('infraLogSourceConfiguration');
 
   describe('log sources api', () => {
-    before(() => esArchiver.load('infra/metrics_and_logs'));
-    after(() => esArchiver.unload('infra/metrics_and_logs'));
-    beforeEach(() => esArchiver.load('empty_kibana'));
-    afterEach(() => esArchiver.unload('empty_kibana'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
+    afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'));
 
     describe('source configuration get method for non-existant source', () => {
       it('returns the default source configuration', async () => {
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 cab7809a83080..3588bedc807be 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
@@ -35,8 +35,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('logSummaryBetween', () => {
-    before(() => esArchiver.load('infra/metrics_and_logs'));
-    after(() => esArchiver.unload('infra/metrics_and_logs'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
 
     it('should return empty and non-empty consecutive buckets', async () => {
       const startTimestamp = EARLIEST_TIME_WITH_DATA;
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 3cc0f9d33f31e..5c57046db030b 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metadata.ts
@@ -43,8 +43,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('metadata', () => {
     describe('7.0.0', () => {
-      before(() => esArchiver.load('infra/7.0.0/hosts'));
-      after(() => esArchiver.unload('infra/7.0.0/hosts'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
 
       it('hosts', async () => {
         const metadata = await fetchMetadata({
@@ -63,8 +63,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('6.6.0', () => {
-      before(() => esArchiver.load('infra/6.6.0/docker'));
-      after(() => esArchiver.unload('infra/6.6.0/docker'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
 
       it('docker', async () => {
         const metadata = await fetchMetadata({
@@ -84,7 +84,8 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('8.0.0', () => {
       describe('cloud and host information', () => {
-        const archiveName = 'infra/8.0.0/logs_and_metrics_with_aws';
+        const archiveName =
+          'x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics_with_aws';
         before(() => esArchiver.load(archiveName));
         after(() => esArchiver.unload(archiveName));
 
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 5204d7c499aa5..1011a9ee95dba 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/metrics.ts
@@ -31,8 +31,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('metrics', () => {
-    before(() => esArchiver.load('infra/7.0.0/hosts'));
-    after(() => esArchiver.unload('infra/7.0.0/hosts'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
 
     const fetchNodeDetails = async (
       body: NodeDetailsRequest
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 6288c1e5a3a3d..8d5c677f56ea2 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
@@ -21,8 +21,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Metrics Explorer API', () => {
     describe('with data', () => {
-      before(() => esArchiver.load('infra/7.0.0/hosts'));
-      after(() => esArchiver.unload('infra/7.0.0/hosts'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
 
       it('should work for multiple metrics', async () => {
         const postBody = {
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 8d73537ddff66..8fd8a5a6d3ec8 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/snapshot.ts
@@ -33,8 +33,8 @@ export default function ({ getService }: FtrProviderContext) {
   describe('waffle nodes', () => {
     describe('6.6.0', () => {
       const { min, max } = DATES['6.6.0'].docker;
-      before(() => esArchiver.load('infra/6.6.0/docker'));
-      after(() => esArchiver.unload('infra/6.6.0/docker'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/6.6.0/docker'));
 
       it('should basically work', async () => {
         const resp = fetchSnapshot({
@@ -80,8 +80,12 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('8.0.0', () => {
       const { min, max } = DATES['8.0.0'].logs_and_metrics;
-      before(() => esArchiver.load('infra/8.0.0/logs_and_metrics'));
-      after(() => esArchiver.unload('infra/8.0.0/logs_and_metrics'));
+      before(() =>
+        esArchiver.load('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+      );
+      after(() =>
+        esArchiver.unload('x-pack/test/functional/es_archives/infra/8.0.0/logs_and_metrics')
+      );
 
       it("should use the id for the label when the name doesn't exist", async () => {
         const resp = fetchSnapshot({
@@ -151,8 +155,8 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('7.0.0', () => {
       const { min, max } = DATES['7.0.0'].hosts;
-      before(() => esArchiver.load('infra/7.0.0/hosts'));
-      after(() => esArchiver.unload('infra/7.0.0/hosts'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/7.0.0/hosts'));
 
       it('should basically work', async () => {
         const resp = fetchSnapshot({
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 d55530a501366..8c43a05f5eeb6 100644
--- a/x-pack/test/api_integration/apis/metrics_ui/sources.ts
+++ b/x-pack/test/api_integration/apis/metrics_ui/sources.ts
@@ -30,10 +30,10 @@ export default function ({ getService }: FtrProviderContext) {
   };
 
   describe('sources', () => {
-    before(() => esArchiver.load('infra/metrics_and_logs'));
-    after(() => esArchiver.unload('infra/metrics_and_logs'));
-    beforeEach(() => esArchiver.load('empty_kibana'));
-    afterEach(() => esArchiver.unload('empty_kibana'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
+    afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'));
 
     describe('patch request', () => {
       it('applies all top-level field updates to an existing source', async () => {
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 21c1c1efbf9e8..c2a204c1d1881 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
@@ -23,7 +23,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('create_annotations', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
       // @ts-expect-error not full interface
       await ml.api.createAnomalyDetectionJob(testJobConfig);
diff --git a/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts
index f6c4c98e1f7ea..77b6103a6e22a 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/delete_annotations.ts
@@ -18,7 +18,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('delete_annotations', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
       // generate one annotation for each job
diff --git a/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts b/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts
index c0e81955ad595..bff9f3157c69d 100644
--- a/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts
+++ b/x-pack/test/api_integration/apis/ml/annotations/get_annotations.ts
@@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('get_annotations', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
       // generate one annotation for each job
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 346f4562b77bb..0beb5e7fde6c5 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
@@ -31,7 +31,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('update_annotations', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
       // generate one annotation for each job
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
index 29ba454ba9f66..c04a368a63e9b 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/create.ts
@@ -100,7 +100,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('create', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts
index 03ee82eed27d0..3acefac817d48 100644
--- a/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts
+++ b/x-pack/test/api_integration/apis/ml/anomaly_detectors/get.ts
@@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('GET anomaly_detectors', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
       await createJobs();
diff --git a/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts
index 01b87e6059a29..fac62237aa74e 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/create_calendars.ts
@@ -52,11 +52,7 @@ export default ({ getService }: FtrProviderContext) => {
       expect(createdCalendar.description).to.eql(requestBody.description);
       expect(createdCalendar.job_ids).to.eql(requestBody.job_ids);
 
-      await ml.api.waitForEventsToExistInCalendar(
-        calendarId,
-        // @ts-expect-error not full interface
-        requestBody.events
-      );
+      await ml.api.waitForEventsToExistInCalendar(calendarId, requestBody.events);
     });
 
     it('should not create new calendar for user without required permission', async () => {
diff --git a/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts
index dfbffad9dafdd..a2e1709731aa7 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/delete_calendars.ts
@@ -34,7 +34,6 @@ export default ({ getService }: FtrProviderContext) => {
 
     beforeEach(async () => {
       await ml.api.createCalendar(calendarId, testCalendar);
-      // @ts-expect-error not full interface
       await ml.api.createCalendarEvents(calendarId, testEvents);
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts
index 175c678317e6c..243a40abe97a4 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/get_calendars.ts
@@ -35,7 +35,6 @@ export default ({ getService }: FtrProviderContext) => {
       beforeEach(async () => {
         for (const testCalendar of testCalendars) {
           await ml.api.createCalendar(testCalendar.calendar_id, testCalendar);
-          // @ts-expect-error not full interface
           await ml.api.createCalendarEvents(testCalendar.calendar_id, testEvents);
         }
       });
@@ -55,7 +54,6 @@ export default ({ getService }: FtrProviderContext) => {
 
         expect(body).to.have.length(testCalendars.length);
         expect(body[0].events).to.have.length(testEvents.length);
-        // @ts-expect-error not full interface
         ml.api.assertAllEventsExistInCalendar(testEvents, body[0]);
       });
 
@@ -68,7 +66,6 @@ export default ({ getService }: FtrProviderContext) => {
 
         expect(body).to.have.length(testCalendars.length);
         expect(body[0].events).to.have.length(testEvents.length);
-        // @ts-expect-error not full interface
         ml.api.assertAllEventsExistInCalendar(testEvents, body[0]);
       });
 
@@ -92,7 +89,6 @@ export default ({ getService }: FtrProviderContext) => {
 
       beforeEach(async () => {
         await ml.api.createCalendar(calendarId, testCalendar);
-        // @ts-expect-error not full interface
         await ml.api.createCalendarEvents(calendarId, testEvents);
       });
 
@@ -110,7 +106,6 @@ export default ({ getService }: FtrProviderContext) => {
         expect(body.job_ids).to.eql(testCalendar.job_ids);
         expect(body.description).to.eql(testCalendar.description);
         expect(body.events).to.have.length(testEvents.length);
-        // @ts-expect-error not full interface
         ml.api.assertAllEventsExistInCalendar(testEvents, body);
       });
 
@@ -124,7 +119,6 @@ export default ({ getService }: FtrProviderContext) => {
         expect(body.job_ids).to.eql(testCalendar.job_ids);
         expect(body.description).to.eql(testCalendar.description);
         expect(body.events).to.have.length(testEvents.length);
-        // @ts-expect-error not full interface
         ml.api.assertAllEventsExistInCalendar(testEvents, body);
       });
 
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 f80c985c2676e..4667eb25437b1 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/helpers.ts
@@ -8,7 +8,7 @@
 import { estypes } from '@elastic/elasticsearch';
 import { Calendar } from '../../../../../plugins/ml/server/models/calendar';
 
-type ScheduledEvent = estypes.ScheduledEvent;
+type ScheduledEvent = estypes.MlCalendarEvent;
 
 export const assertAllEventsExistInCalendar = (
   eventsToCheck: ScheduledEvent[],
diff --git a/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts b/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts
index 4798a3407be11..1ca9a66319943 100644
--- a/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts
+++ b/x-pack/test/api_integration/apis/ml/calendars/update_calendars.ts
@@ -42,7 +42,6 @@ export default ({ getService }: FtrProviderContext) => {
 
     beforeEach(async () => {
       await ml.api.createCalendar(calendarId, originalCalendar);
-      // @ts-expect-error not full interface
       await ml.api.createCalendarEvents(calendarId, originalEvents);
     });
 
@@ -71,7 +70,6 @@ export default ({ getService }: FtrProviderContext) => {
       expect(updatedEvents).to.have.length(updateCalendarRequestBody.events.length);
       await ml.api.waitForEventsToExistInCalendar(
         updatedCalendar.calendar_id,
-        // @ts-expect-error not full interface
         updateCalendarRequestBody.events
       );
     });
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 4a4f5c1e555b4..e1e391add4897 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
@@ -77,7 +77,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('PUT data_frame/analytics/{analyticsId}', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
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 dd2e7dd57cb6d..055b4b69ab7a6 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
@@ -65,7 +65,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('DELETE data_frame/analytics', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.setKibanaTimeZoneToUTC();
       await createJobs(testJobConfigs);
     });
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts
index 21fed47d7faca..9492358d09000 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/delete_spaces.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('DELETE data_frame/analytics with spaces', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      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: [] });
 
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 e1fa889d20daf..e2a9d123aafc9 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
@@ -113,8 +113,8 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/_evaluate', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
-      await esArchiver.loadIfNeeded('ml/egs_regression');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression');
       await ml.testResources.setKibanaTimeZoneToUTC();
       await createJobs(testJobConfigs);
     });
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 3e9ad9afb8004..b3219c60c1aab 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
@@ -77,9 +77,9 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/analytics/_explain', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
-      await esArchiver.loadIfNeeded('ml/egs_regression');
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
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 a374567c449f0..f8c7009e39db6 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
@@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('GET data_frame/analytics', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
       await createJobs();
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts
index dacf199daf90e..33dcec6264501 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/get_spaces.ts
@@ -47,7 +47,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('GET data_frame/analytics with spaces', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      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: [] });
 
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 6960dc37bf0f8..d19569407dfcd 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
@@ -63,7 +63,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/analytics/{analyticsId}/_start', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.setKibanaTimeZoneToUTC();
       await createJobs(testJobConfigs);
     });
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 de8cc7ffb1c41..636097a81c4f6 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
@@ -43,7 +43,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/analytics/{analyticsId}/_start with spaces', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      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: [] });
 
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 e1f479b0d2fc7..09663947f61c0 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
@@ -22,7 +22,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/analytics/{analyticsId}/_stop', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.setKibanaTimeZoneToUTC();
       // job config with high training percent so it takes longer to run
       const slowRunningConfig = ml.commonConfig.getDFABmClassificationJobConfig(analyticsId);
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 19ce61d840d93..71eff1f00aa00 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
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/analytics/{analyticsId}/_stop with spaces', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await spacesService.create({ id: idSpace3, name: 'space_three', disabledFeatures: [] });
       await spacesService.create({ id: idSpace4, name: 'space_four', disabledFeatures: [] });
       // job config with high training percent so it takes longer to run
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 c8e52c5852a2f..c39cd72ac80e6 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
@@ -79,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('UPDATE data_frame/analytics', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.setKibanaTimeZoneToUTC();
       await createJobs(testJobConfigs);
     });
diff --git a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts
index 1278e4f703726..22286628beb35 100644
--- a/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/data_frame_analytics/update_spaces.ts
@@ -46,7 +46,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/analytics _update with spaces', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      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: [] });
 
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 2dae0d911a994..24cc23c21cff3 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
@@ -77,7 +77,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST data_frame/analytics/validate', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
index 63d4e2c4a874f..488df74b46968 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_histograms.ts
@@ -84,7 +84,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('get_field_histograms', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
index 6e7231065c377..65fd1c1ff0c85 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_field_stats.ts
@@ -167,7 +167,7 @@ export default ({ getService }: FtrProviderContext) => {
     expectedResponsecode: number
   ): Promise<any> {
     const { body } = await supertest
-      .post(`/api/ml/data_visualizer/get_field_stats/${index}`)
+      .post(`/internal/data_visualizer/get_field_stats/${index}`)
       .auth(user, ml.securityCommon.getPasswordForUser(user))
       .set(COMMON_REQUEST_HEADERS)
       .send(requestBody)
@@ -176,9 +176,10 @@ export default ({ getService }: FtrProviderContext) => {
     return body;
   }
 
+  // Move these tests to file_data_visualizer plugin
   describe('get_field_stats', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
index 601a4a04eb0c6..4ce9d4871246c 100644
--- a/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
+++ b/x-pack/test/api_integration/apis/ml/data_visualizer/get_overall_stats.ts
@@ -123,16 +123,17 @@ export default ({ getService }: FtrProviderContext) => {
     },
   ];
 
+  // Move these tests to file_data_visualizer plugin
   describe('get_overall_stats', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
     for (const testData of testDataList) {
       it(`${testData.testTitle}`, async () => {
         const { body } = await supertest
-          .post(`/api/ml/data_visualizer/get_overall_stats/${testData.index}`)
+          .post(`/internal/data_visualizer/get_overall_stats/${testData.index}`)
           .auth(testData.user, ml.securityCommon.getPasswordForUser(testData.user))
           .set(COMMON_REQUEST_HEADERS)
           .send(testData.requestBody)
diff --git a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
index 13941f0c1e145..9e233b7d0f7a2 100644
--- a/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
+++ b/x-pack/test/api_integration/apis/ml/fields_service/field_cardinality.ts
@@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('field_cardinality', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
index c95cf4e4f9ce4..7cc285f0cece5 100644
--- a/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
+++ b/x-pack/test/api_integration/apis/ml/fields_service/time_field_range.ts
@@ -90,7 +90,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('time_field_range', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/index.ts b/x-pack/test/api_integration/apis/ml/index.ts
index 2206355003a75..9ed654c5b9f6b 100644
--- a/x-pack/test/api_integration/apis/ml/index.ts
+++ b/x-pack/test/api_integration/apis/ml/index.ts
@@ -42,28 +42,28 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await ml.testResources.deleteIndexPatternByTitle('ft_module_apache_data_stream');
       await ml.testResources.deleteIndexPatternByTitle('ft_module_nginx_data_stream');
 
-      await esArchiver.unload('ml/ecommerce');
-      await esArchiver.unload('ml/categorization');
-      await esArchiver.unload('ml/module_apache');
-      await esArchiver.unload('ml/module_auditbeat');
-      await esArchiver.unload('ml/module_apm');
-      await esArchiver.unload('ml/module_heartbeat');
-      await esArchiver.unload('ml/module_logs');
-      await esArchiver.unload('ml/module_nginx');
-      await esArchiver.unload('ml/module_sample_ecommerce');
-      await esArchiver.unload('ml/module_sample_logs');
-      await esArchiver.unload('ml/module_security_endpoint');
-      await esArchiver.unload('ml/module_siem_auditbeat');
-      await esArchiver.unload('ml/module_siem_packetbeat');
-      await esArchiver.unload('ml/module_siem_winlogbeat');
-      await esArchiver.unload('ml/farequote');
-      await esArchiver.unload('ml/bm_classification');
-      await esArchiver.unload('ml/ihp_outlier');
-      await esArchiver.unload('ml/module_metricbeat');
-      await esArchiver.unload('ml/module_siem_cloudtrail');
-      await esArchiver.unload('ml/module_metrics_ui');
-      await esArchiver.unload('ml/module_apache_data_stream');
-      await esArchiver.unload('ml/module_nginx_data_stream');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/categorization');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_apache');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_auditbeat');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_apm');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_heartbeat');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_logs');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_nginx');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_logs');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_security_endpoint');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_auditbeat');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_packetbeat');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_winlogbeat');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/bm_classification');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_metricbeat');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_siem_cloudtrail');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_metrics_ui');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_apache_data_stream');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_nginx_data_stream');
 
       await ml.testResources.resetKibanaTimeZone();
     });
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts b/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts
index c3857c5f3d28d..c55e6e2628c18 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/bucket_span_estimator.ts
@@ -88,7 +88,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('bucket span estimator', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts b/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts
index a0f0a97d36d92..c2cc9480fee3b 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/calculate_model_memory_limit.ts
@@ -145,7 +145,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('calculate model memory limit', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts
index 9b6b9305f8b95..e287537b0ca34 100644
--- a/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts
+++ b/x-pack/test/api_integration/apis/ml/job_validation/cardinality.ts
@@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('ValidateCardinality', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
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 752aae546565a..06d966851abfd 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
@@ -22,7 +22,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('Validate job', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts b/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts
index c9adc85b40c1b..4686787ae9b16 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/categorization_field_examples.ts
@@ -286,7 +286,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('Categorization example endpoint - ', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/categorization');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/categorization');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
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 96db9d20cbabe..0d64008a49688 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
@@ -99,7 +99,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('close_jobs', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
diff --git a/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts b/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts
index 2fcf75f99ff17..d299795826c26 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/datafeed_preview.ts
@@ -40,7 +40,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('Datafeed preview', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts b/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts
index c05fe0d71de2e..f785a35feafac 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/delete_jobs.ts
@@ -80,7 +80,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('delete_jobs', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts
index a6c762bceedcb..8c4a79bc0ce5f 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/jobs_exist.ts
@@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('jobs_exist', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
diff --git a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
index a0c00770f84dc..a57167590c1f1 100644
--- a/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
+++ b/x-pack/test/api_integration/apis/ml/jobs/jobs_summary.ts
@@ -183,10 +183,10 @@ export default ({ getService }: FtrProviderContext) => {
     return body;
   }
 
-  function getGroups(jobs: Array<{ groups: string[] }>) {
+  function getGroups(jobs: Array<{ groups?: string[] }>) {
     const groupIds: string[] = [];
     jobs.forEach((job) => {
-      const groups = job.groups;
+      const groups = job.groups || [];
       groups.forEach((group) => {
         if (groupIds.indexOf(group) === -1) {
           groupIds.push(group);
@@ -198,7 +198,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('jobs_summary', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
index 8cdc7168ac62b..2181bea8b4040 100644
--- a/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
+++ b/x-pack/test/api_integration/apis/ml/modules/recognize_module.ts
@@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => {
   const testDataList = [
     {
       testTitleSuffix: 'for sample logs dataset',
-      sourceDataArchive: 'ml/module_sample_logs',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs',
       indexPattern: 'ft_module_sample_logs',
       user: USER.ML_POWERUSER,
       expected: {
@@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for apache dataset',
-      sourceDataArchive: 'ml/module_apache',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache',
       indexPattern: 'ft_module_apache',
       user: USER.ML_POWERUSER,
       expected: {
@@ -39,7 +39,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for apm dataset',
-      sourceDataArchive: 'ml/module_apm',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apm',
       indexPattern: 'ft_module_apm',
       user: USER.ML_POWERUSER,
       expected: {
@@ -49,7 +49,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for logs dataset',
-      sourceDataArchive: 'ml/module_logs',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_logs',
       indexPattern: 'ft_module_logs',
       user: USER.ML_POWERUSER,
       expected: {
@@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for nginx dataset',
-      sourceDataArchive: 'ml/module_nginx',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx',
       indexPattern: 'ft_module_nginx',
       user: USER.ML_POWERUSER,
       expected: {
@@ -69,7 +69,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for sample ecommerce dataset',
-      sourceDataArchive: 'ml/module_sample_ecommerce',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce',
       indexPattern: 'ft_module_sample_ecommerce',
       user: USER.ML_POWERUSER,
       expected: {
@@ -79,7 +79,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for siem auditbeat dataset',
-      sourceDataArchive: 'ml/module_siem_auditbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_auditbeat',
       indexPattern: 'ft_module_siem_auditbeat',
       user: USER.ML_POWERUSER,
       expected: {
@@ -89,7 +89,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for siem packetbeat dataset',
-      sourceDataArchive: 'ml/module_siem_packetbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_packetbeat',
       indexPattern: 'ft_module_siem_packetbeat',
       user: USER.ML_POWERUSER,
       expected: {
@@ -99,7 +99,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for siem winlogbeat dataset',
-      sourceDataArchive: 'ml/module_siem_winlogbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_winlogbeat',
       indexPattern: 'ft_module_siem_winlogbeat',
       user: USER.ML_POWERUSER,
       expected: {
@@ -123,7 +123,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for heartbeat dataset',
-      sourceDataArchive: 'ml/module_heartbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_heartbeat',
       indexPattern: 'ft_module_heartbeat',
       user: USER.ML_POWERUSER,
       expected: {
@@ -133,7 +133,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for auditbeat dataset',
-      sourceDataArchive: 'ml/module_auditbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_auditbeat',
       indexPattern: 'ft_module_auditbeat',
       user: USER.ML_POWERUSER,
       expected: {
@@ -143,7 +143,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for security endpoint dataset',
-      sourceDataArchive: 'ml/module_security_endpoint',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_security_endpoint',
       indexPattern: 'ft_logs-endpoint.events.*',
       user: USER.ML_POWERUSER,
       expected: {
@@ -153,7 +153,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for metricbeat dataset',
-      sourceDataArchive: 'ml/module_metricbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metricbeat',
       indexPattern: 'ft_module_metricbeat',
       user: USER.ML_POWERUSER,
       expected: {
@@ -163,7 +163,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for siem clodutrail dataset',
-      sourceDataArchive: 'ml/module_siem_cloudtrail',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_cloudtrail',
       indexPattern: 'ft_module_siem_cloudtrail',
       user: USER.ML_POWERUSER,
       expected: {
@@ -173,7 +173,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for metrics ui dataset',
-      sourceDataArchive: 'ml/module_metrics_ui',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metrics_ui',
       indexPattern: 'ft_module_metrics_ui',
       user: USER.ML_POWERUSER,
       expected: {
@@ -183,7 +183,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for apache data stream dataset',
-      sourceDataArchive: 'ml/module_apache_data_stream',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache_data_stream',
       indexPattern: 'ft_module_apache_data_stream',
       user: USER.ML_POWERUSER,
       expected: {
@@ -193,7 +193,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for nginx data stream dataset',
-      sourceDataArchive: 'ml/module_nginx_data_stream',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx_data_stream',
       indexPattern: 'ft_module_nginx_data_stream',
       user: USER.ML_POWERUSER,
       expected: {
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 186a87e547382..30dc31ef460c6 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
@@ -24,7 +24,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for sample_data_weblogs with prefix, startDatafeed false and estimateModelMemory false',
-      sourceDataArchive: 'ml/module_sample_logs',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs',
       indexPattern: { name: 'ft_module_sample_logs', timeField: '@timestamp' },
       module: 'sample_data_weblogs',
       user: USER.ML_POWERUSER,
@@ -61,7 +61,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for sample_data_weblogs with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_sample_logs',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs',
       indexPattern: { name: 'ft_module_sample_logs', timeField: '@timestamp' },
       module: 'sample_data_weblogs',
       user: USER.ML_POWERUSER,
@@ -98,7 +98,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for apache_ecs with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_apache',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache',
       indexPattern: { name: 'ft_module_apache', timeField: '@timestamp' },
       module: 'apache_ecs',
       user: USER.ML_POWERUSER,
@@ -153,7 +153,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for apm_nodejs with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_apm',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apm',
       indexPattern: { name: 'ft_module_apm', timeField: '@timestamp' },
       module: 'apm_nodejs',
       user: USER.ML_POWERUSER,
@@ -190,7 +190,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for apm_transaction with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_apm',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apm',
       indexPattern: { name: 'ft_module_apm', timeField: '@timestamp' },
       module: 'apm_transaction',
       user: USER.ML_POWERUSER,
@@ -217,7 +217,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for logs_ui_analysis with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_logs',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_logs',
       indexPattern: { name: 'ft_module_logs', timeField: '@timestamp' },
       module: 'logs_ui_analysis',
       user: USER.ML_POWERUSER,
@@ -244,7 +244,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for logs_ui_categories with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_logs',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_logs',
       indexPattern: { name: 'ft_module_logs', timeField: '@timestamp' },
       module: 'logs_ui_categories',
       user: USER.ML_POWERUSER,
@@ -270,7 +270,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for nginx_ecs with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_nginx',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx',
       indexPattern: { name: 'ft_module_nginx', timeField: '@timestamp' },
       module: 'nginx_ecs',
       user: USER.ML_POWERUSER,
@@ -325,7 +325,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for sample_data_ecommerce with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_sample_ecommerce',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_ecommerce',
       indexPattern: { name: 'ft_module_sample_ecommerce', timeField: 'order_date' },
       module: 'sample_data_ecommerce',
       user: USER.ML_POWERUSER,
@@ -352,7 +352,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for siem_auditbeat_auth with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_siem_auditbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_auditbeat',
       indexPattern: { name: 'ft_module_siem_auditbeat', timeField: '@timestamp' },
       module: 'siem_auditbeat_auth',
       user: USER.ML_POWERUSER,
@@ -379,7 +379,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for siem_packetbeat with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_siem_packetbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_packetbeat',
       indexPattern: { name: 'ft_module_siem_packetbeat', timeField: '@timestamp' },
       module: 'siem_packetbeat',
       user: USER.ML_POWERUSER,
@@ -426,7 +426,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for uptime_heartbeat with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_heartbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_heartbeat',
       indexPattern: { name: 'ft_module_heartbeat', timeField: '@timestamp' },
       module: 'uptime_heartbeat',
       user: USER.ML_POWERUSER,
@@ -453,7 +453,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for auditbeat_process_hosts_ecs with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_auditbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_auditbeat',
       indexPattern: { name: 'ft_module_auditbeat', timeField: '@timestamp' },
       module: 'auditbeat_process_hosts_ecs',
       user: USER.ML_POWERUSER,
@@ -492,7 +492,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for security_linux with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_security_endpoint',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_security_endpoint',
       indexPattern: { name: 'ft_logs-endpoint.events.*', timeField: '@timestamp' },
       module: 'security_linux',
       user: USER.ML_POWERUSER,
@@ -544,7 +544,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for security_windows with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_security_endpoint',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_security_endpoint',
       indexPattern: { name: 'ft_logs-endpoint.events.*', timeField: '@timestamp' },
       module: 'security_windows',
       user: USER.ML_POWERUSER,
@@ -606,7 +606,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for metricbeat_system_ecs with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_metricbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metricbeat',
       indexPattern: { name: 'ft_module_metricbeat', timeField: '@timestamp' },
       module: 'metricbeat_system_ecs',
       user: USER.ML_POWERUSER,
@@ -643,7 +643,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for metrics_ui_hosts with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_metrics_ui',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metrics_ui',
       indexPattern: { name: 'ft_module_metrics_ui', timeField: '@timestamp' },
       module: 'metrics_ui_hosts',
       user: USER.ML_POWERUSER,
@@ -680,7 +680,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for metrics_ui_k8s with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_metrics_ui',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_metrics_ui',
       indexPattern: { name: 'ft_module_metrics_ui', timeField: '@timestamp' },
       module: 'metrics_ui_k8s',
       user: USER.ML_POWERUSER,
@@ -717,7 +717,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for siem_cloudtrail with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_siem_cloudtrail',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_cloudtrail',
       indexPattern: { name: 'ft_module_siem_cloudtrail', timeField: '@timestamp' },
       module: 'siem_cloudtrail',
       user: USER.ML_POWERUSER,
@@ -764,7 +764,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for siem_winlogbeat with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_siem_winlogbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_winlogbeat',
       indexPattern: { name: 'ft_module_siem_winlogbeat', timeField: '@timestamp' },
       module: 'siem_winlogbeat',
       user: USER.ML_POWERUSER,
@@ -841,7 +841,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for siem_winlogbeat_auth with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_siem_winlogbeat',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_siem_winlogbeat',
       indexPattern: { name: 'ft_module_siem_winlogbeat', timeField: '@timestamp' },
       module: 'siem_winlogbeat_auth',
       user: USER.ML_POWERUSER,
@@ -868,7 +868,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for apache_data_stream with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_apache_data_stream',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_apache_data_stream',
       indexPattern: { name: 'ft_module_apache_data_stream', timeField: '@timestamp' },
       module: 'apache_data_stream',
       user: USER.ML_POWERUSER,
@@ -915,7 +915,7 @@ export default ({ getService }: FtrProviderContext) => {
     {
       testTitleSuffix:
         'for nginx_data_stream with prefix, startDatafeed true and estimateModelMemory true',
-      sourceDataArchive: 'ml/module_nginx_data_stream',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_nginx_data_stream',
       indexPattern: { name: 'ft_module_nginx_data_stream', timeField: '@timestamp' },
       module: 'nginx_data_stream',
       user: USER.ML_POWERUSER,
@@ -979,7 +979,7 @@ export default ({ getService }: FtrProviderContext) => {
     },
     {
       testTitleSuffix: 'for unauthorized user',
-      sourceDataArchive: 'ml/module_sample_logs',
+      sourceDataArchive: 'x-pack/test/functional/es_archives/ml/module_sample_logs',
       indexPattern: { name: 'ft_module_sample_logs', timeField: '@timestamp' },
       module: 'sample_data_weblogs',
       user: USER.ML_UNAUTHORIZED,
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 2aaee3ad2bf71..9596cf7ab7d9b 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
@@ -50,7 +50,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('GetAnomaliesTableData', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.setKibanaTimeZoneToUTC();
       await createMockJobs();
     });
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 ef677969d006f..5555d4a91cd1a 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
@@ -53,7 +53,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('get categorizer_stats', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/module_sample_logs');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs');
       await ml.testResources.setKibanaTimeZoneToUTC();
       // @ts-expect-error not full interface
       await ml.api.createAndRunAnomalyDetectionLookbackJob(testJobConfig, testDatafeedConfig);
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 d00999b06b588..d33062af07b68 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
@@ -87,7 +87,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('get stopped_partitions', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/module_sample_logs');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs');
       await ml.testResources.setKibanaTimeZoneToUTC();
       for (const testData of testSetUps) {
         const { jobConfig, datafeedConfig } = testData;
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.ts
index 626b685b56d44..8859b7ed2b106 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/initialize.ts
@@ -32,7 +32,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('GET saved_objects/initialize', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
 
       await ml.api.createAnomalyDetectionJobES(
         ml.commonConfig.getADFqSingleMetricJobConfig(adJobId)
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts b/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts
index 9f369a14a6276..9dbf6657cd593 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/jobs_spaces.ts
@@ -35,7 +35,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('GET saved_objects/jobs_spaces', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      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: [] });
 
diff --git a/x-pack/test/api_integration/apis/ml/saved_objects/status.ts b/x-pack/test/api_integration/apis/ml/saved_objects/status.ts
index 93d82dd59a644..41c94e3b46683 100644
--- a/x-pack/test/api_integration/apis/ml/saved_objects/status.ts
+++ b/x-pack/test/api_integration/apis/ml/saved_objects/status.ts
@@ -40,7 +40,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('GET saved_objects/status', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      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: [] });
 
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 89233fe11dbc6..f326a3049e921 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
@@ -45,7 +45,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('POST saved_objects/update_jobs_spaces', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      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: [] });
 
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 5f603d25b7d69..229cc05a58a1b 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/instance.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/instance.js
@@ -15,7 +15,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('instance detail', () => {
-    const archive = 'monitoring/apm';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/apm';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
       max: '2018-08-31T13:59:49.104Z',
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 b47b44c395efa..38179368a8764 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('instance detail mb', () => {
-    const archive = 'monitoring/apm_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
       max: '2018-08-31T13:59:49.104Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instances.js b/x-pack/test/api_integration/apis/monitoring/apm/instances.js
index 9d0be53cff97f..d915923991353 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/instances.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/instances.js
@@ -12,7 +12,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('list', () => {
-    const archive = 'monitoring/apm';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/apm';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
       max: '2018-08-31T13:59:49.104Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js b/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js
index 879549659936b..9248ba32350cb 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/instances_mb.js
@@ -12,7 +12,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('list mb', () => {
-    const archive = 'monitoring/apm_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
       max: '2018-08-31T13:59:49.104Z',
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 900a87394f106..b58e8f151b795 100644
--- a/x-pack/test/api_integration/apis/monitoring/apm/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/apm/overview.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview', () => {
-    const archive = 'monitoring/apm';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/apm';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
       max: '2018-08-31T13:59:49.104Z',
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 58e257430235a..18cf7e17b760e 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview mb', () => {
-    const archive = 'monitoring/apm_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/apm_mb';
     const timeRange = {
       min: '2018-08-31T12:59:49.104Z',
       max: '2018-08-31T13:59:49.104Z',
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 d1b4c277ef039..2a347f448f188 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/detail.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/detail.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('instance detail', () => {
-    const archive = 'monitoring/beats_with_restarted_instance';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance';
     const timeRange = {
       min: '2018-02-09T20:49:00Z',
       max: '2018-02-09T21:50:00Z',
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 c43050d054fa7..745b317612b53 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('instance detail mb', () => {
-    const archive = 'monitoring/beats_with_restarted_instance_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance_mb';
     const timeRange = {
       min: '2018-02-09T20:49:00Z',
       max: '2018-02-09T21:50:00Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/list.js b/x-pack/test/api_integration/apis/monitoring/beats/list.js
index 6c8fa8368c6a2..af01ae26c17da 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/list.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/list.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
 
   describe('list', () => {
     describe('with restarted beat instance', () => {
-      const archive = 'monitoring/beats_with_restarted_instance';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance';
       const timeRange = {
         min: '2018-02-09T20:49:00Z',
         max: '2018-02-09T21:50:00Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js b/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js
index 3896bac794b0f..767ba107d0822 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/list_mb.js
@@ -13,7 +13,8 @@ export default function ({ getService }) {
 
   describe('list mb', () => {
     describe('with restarted beat instance', () => {
-      const archive = 'monitoring/beats_with_restarted_instance_mb';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/beats_with_restarted_instance_mb';
       const timeRange = {
         min: '2018-02-09T20:49:00Z',
         max: '2018-02-09T21:50:00Z',
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 ee5b7545ccb5a..ce8b6cb317768 100644
--- a/x-pack/test/api_integration/apis/monitoring/beats/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/beats/overview.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview', () => {
-    const archive = 'monitoring/beats';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/beats';
     const timeRange = {
       min: '2017-12-19T18:11:32.000Z',
       max: '2017-12-19T18:14:38.000Z',
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 1e4c678539e26..6a20309e226a0 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview mb', () => {
-    const archive = 'monitoring/beats_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/beats_mb';
     const timeRange = {
       min: '2017-12-19T18:11:32.000Z',
       max: '2017-12-19T18:14:38.000Z',
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 69f867b532f2f..686b63b6e7562 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/list.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/list.js
@@ -14,7 +14,7 @@ export default function ({ getService }) {
 
   describe('list', () => {
     describe('with trial license clusters', () => {
-      const archive = 'monitoring/multicluster';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster';
       const timeRange = {
         min: '2017-08-15T21:00:00Z',
         max: '2017-08-16T00:00:00Z',
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 fadc81f298c1d..380f4c2a07148 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
@@ -14,7 +14,7 @@ export default function ({ getService }) {
 
   describe('list mb', () => {
     describe('with trial license clusters', () => {
-      const archive = 'monitoring/multicluster_mb';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster_mb';
       const timeRange = {
         min: '2017-08-15T21:00:00Z',
         max: '2017-08-16T00:00:00Z',
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 7484bbb644a9d..02bf91357ed4b 100644
--- a/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/cluster/overview.js
@@ -17,7 +17,7 @@ export default function ({ getService }) {
     this.tags(['skipCloud']);
 
     describe('with trial license clusters', () => {
-      const archive = 'monitoring/singlecluster_green_gold';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_gold';
       const timeRange = {
         min: '2017-08-23T21:29:35Z',
         max: '2017-08-23T21:47:25Z',
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 3f291e22c1112..d84ad494e8f41 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
@@ -17,7 +17,7 @@ export default function ({ getService }) {
     this.tags(['skipCloud']);
 
     describe('with trial license clusters', () => {
-      const archive = 'monitoring/singlecluster_green_gold_mb';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_gold_mb';
       const timeRange = {
         min: '2017-08-23T21:29:35Z',
         max: '2017-08-23T21:47:25Z',
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 cd4b0cbd8e0bf..870bfb31a50e5 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/ccr.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('ccr', () => {
-    const archive = 'monitoring/ccr';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/ccr';
     const timeRange = {
       min: '2018-09-19T00:00:00.000Z',
       max: '2018-09-19T23:59:59.000Z',
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 2af3ae5af78ff..9a8dd2e2197d8 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('ccr mb', () => {
-    const archive = 'monitoring/ccr_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/ccr_mb';
     const timeRange = {
       min: '2018-09-19T00:00:00.000Z',
       max: '2018-09-19T23:59:59.000Z',
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 5e983cd13d704..a4bca9798b178 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('ccr shard', () => {
-    const archive = 'monitoring/ccr';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/ccr';
     const timeRange = {
       min: '2018-09-19T00:00:00.000Z',
       max: '2018-09-19T23:59:59.000Z',
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 516f66ba6f19e..769bff80c0df1 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
@@ -14,7 +14,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('ccr shard mb', () => {
-    const archive = 'monitoring/ccr_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/ccr_mb';
     const timeRange = {
       min: '2018-09-19T00:00:00.000Z',
       max: '2018-09-19T23:59:59.000Z',
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 87610feb38f13..e243c3a372f7b 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
@@ -14,7 +14,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('index detail', () => {
-    const archive = 'monitoring/singlecluster_three_nodes_shard_relocation';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation';
     const timeRange = {
       min: '2017-10-05T20:31:48.000Z',
       max: '2017-10-05T20:35:12.000Z',
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 cd7cd02e13ce1..1858bcf21ba93 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
@@ -14,7 +14,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('index detail mb', () => {
-    const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb';
     const timeRange = {
       min: '2017-10-05T20:31:48.000Z',
       max: '2017-10-05T20:35:12.000Z',
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 ba84a5b711154..0b94aaa9f27da 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/indices.js
@@ -17,7 +17,8 @@ export default function ({ getService }) {
 
   describe('indices', () => {
     describe('shard-relocation', () => {
-      const archive = 'monitoring/singlecluster_three_nodes_shard_relocation';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation';
       const timeRange = {
         min: '2017-10-05T20:31:48.000Z',
         max: '2017-10-05T20:35:12.000Z',
@@ -57,7 +58,7 @@ export default function ({ getService }) {
     });
 
     describe('health-red', () => {
-      const archive = 'monitoring/singlecluster_red_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum';
       const timeRange = {
         min: '2017-10-06T19:53:06.000Z',
         max: '2017-10-06T20:15:30.000Z',
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 083e38b73251b..f353f757062de 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
@@ -17,7 +17,8 @@ export default function ({ getService }) {
 
   describe('indices mb', () => {
     describe('shard-relocation', () => {
-      const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb';
       const timeRange = {
         min: '2017-10-05T20:31:48.000Z',
         max: '2017-10-05T20:35:12.000Z',
@@ -56,7 +57,7 @@ export default function ({ getService }) {
     });
 
     describe('health-red', () => {
-      const archive = 'monitoring/singlecluster_red_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum';
       const timeRange = {
         min: '2017-10-06T19:53:06.000Z',
         max: '2017-10-06T20:15:30.000Z',
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 4022f45ba4003..266b805a258e7 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
@@ -16,7 +16,8 @@ export default function ({ getService }) {
     // TODO: https://github.com/elastic/stack-monitoring/issues/31
     this.tags(['skipCloud']);
 
-    const archive = 'monitoring/singlecluster_three_nodes_shard_relocation';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation';
     const timeRange = {
       min: '2017-10-05T20:31:48.000Z',
       max: '2017-10-05T20:35:12.000Z',
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 d19fa00c7e805..90c6b6b25f4b0 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('node detail advanced', () => {
-    const archive = 'monitoring/singlecluster_three_nodes_shard_relocation';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation';
     const timeRange = {
       min: '2017-10-05T20:31:48.000Z',
       max: '2017-10-05T20:35:12.000Z',
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 127af8e2367c8..40eff260225c3 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('node detail advanced mb', () => {
-    const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb';
     const timeRange = {
       min: '2017-10-05T20:31:48.000Z',
       max: '2017-10-05T20:35:12.000Z',
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 50df0dc2c972e..b82eb3dcb6ded 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
@@ -16,7 +16,8 @@ export default function ({ getService }) {
     // TODO: https://github.com/elastic/stack-monitoring/issues/31
     this.tags(['skipCloud']);
 
-    const archive = 'monitoring/singlecluster_three_nodes_shard_relocation_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb';
     const timeRange = {
       min: '2017-10-05T20:31:48.000Z',
       max: '2017-10-05T20:35:12.000Z',
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 c22c30370b22b..e437fd707e763 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/nodes.js
@@ -17,7 +17,7 @@ export default function ({ getService }) {
 
   describe('nodes', () => {
     describe('with green platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_green_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum';
       const timeRange = {
         min: '2018-02-13T17:04:50.000Z',
         max: '2018-02-13T17:51:55.000Z',
@@ -46,7 +46,7 @@ export default function ({ getService }) {
     });
 
     describe('with red platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_red_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum';
       const timeRange = {
         min: '2017-10-06T19:53:06.000Z',
         max: '2017-10-06T20:15:30.000Z',
@@ -75,7 +75,8 @@ export default function ({ getService }) {
     });
 
     describe('with green trial cluster and node in cpu group', () => {
-      const archive = 'monitoring/singlecluster_green_trial_two_nodes_one_cgrouped';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_green_trial_two_nodes_one_cgrouped';
       const timeRange = {
         min: '2018-02-13T19:18:02.000Z',
         max: '2018-02-13T19:26:14.000Z',
@@ -104,7 +105,7 @@ export default function ({ getService }) {
     });
 
     describe('with pagination', () => {
-      const archive = 'monitoring/singlecluster_lots_of_nodes';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes';
       const timeRange = {
         min: '2019-10-03T19:41:01.402Z',
         max: '2019-10-03T19:41:13.132Z',
@@ -164,7 +165,7 @@ export default function ({ getService }) {
     });
 
     describe('with sorting', () => {
-      const archive = 'monitoring/singlecluster_lots_of_nodes';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes';
       const timeRange = {
         min: '2019-10-03T19:41:01.402Z',
         max: '2019-10-03T19:41:13.132Z',
@@ -309,7 +310,7 @@ export default function ({ getService }) {
     });
 
     describe('with filtering', () => {
-      const archive = 'monitoring/singlecluster_lots_of_nodes';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes';
       const timeRange = {
         min: '2019-10-03T19:41:01.402Z',
         max: '2019-10-03T19:41:13.132Z',
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 c31a5d225004d..7878470e070a6 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
@@ -17,7 +17,8 @@ export default function ({ getService }) {
 
   describe('nodes mb', () => {
     describe('with green platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_green_platinum_mb';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum_mb';
       const timeRange = {
         min: '2018-02-13T17:04:50.000Z',
         max: '2018-02-13T17:51:55.000Z',
@@ -46,7 +47,7 @@ export default function ({ getService }) {
     });
 
     describe('with red platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_red_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum';
       const timeRange = {
         min: '2017-10-06T19:53:06.000Z',
         max: '2017-10-06T20:15:30.000Z',
@@ -75,7 +76,8 @@ export default function ({ getService }) {
     });
 
     describe('with green trial cluster and node in cpu group', () => {
-      const archive = 'monitoring/singlecluster_green_trial_two_nodes_one_cgrouped';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_green_trial_two_nodes_one_cgrouped';
       const timeRange = {
         min: '2018-02-13T19:18:02.000Z',
         max: '2018-02-13T19:26:14.000Z',
@@ -104,7 +106,7 @@ export default function ({ getService }) {
     });
 
     describe('with pagination', () => {
-      const archive = 'monitoring/singlecluster_lots_of_nodes';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes';
       const timeRange = {
         min: '2019-10-03T19:41:01.402Z',
         max: '2019-10-03T19:41:13.132Z',
@@ -164,7 +166,7 @@ export default function ({ getService }) {
     });
 
     describe('with sorting', () => {
-      const archive = 'monitoring/singlecluster_lots_of_nodes';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes';
       const timeRange = {
         min: '2019-10-03T19:41:01.402Z',
         max: '2019-10-03T19:41:13.132Z',
@@ -309,7 +311,7 @@ export default function ({ getService }) {
     });
 
     describe('with filtering', () => {
-      const archive = 'monitoring/singlecluster_lots_of_nodes';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_lots_of_nodes';
       const timeRange = {
         min: '2019-10-03T19:41:01.402Z',
         max: '2019-10-03T19:41:13.132Z',
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 ea63023fa634b..1f023401fbe2e 100644
--- a/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/elasticsearch/overview.js
@@ -17,7 +17,7 @@ export default function ({ getService }) {
 
   describe('overview', () => {
     describe('with green platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_green_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum';
       const timeRange = {
         min: '2018-02-13T17:04:50.000Z',
         max: '2018-02-13T17:51:55.000Z',
@@ -42,7 +42,7 @@ export default function ({ getService }) {
     });
 
     describe('with red platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_red_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum';
       const timeRange = {
         min: '2017-10-06T19:53:06.000Z',
         max: '2017-10-06T20:15:30.000Z',
@@ -67,7 +67,8 @@ export default function ({ getService }) {
     });
 
     describe('with shards relocating', () => {
-      const archive = 'monitoring/singlecluster_three_nodes_shard_relocation';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation';
       const timeRange = {
         min: '2017-10-05T20:31:17.081Z',
         max: '2017-10-05T20:35:39.428Z',
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 a6e26708fbfcb..7cf3d56a04988 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
@@ -17,7 +17,8 @@ export default function ({ getService }) {
 
   describe('overview mb', () => {
     describe('with green platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_green_platinum_mb';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_green_platinum_mb';
       const timeRange = {
         min: '2018-02-13T17:04:50.000Z',
         max: '2018-02-13T17:51:55.000Z',
@@ -42,7 +43,7 @@ export default function ({ getService }) {
     });
 
     describe('with red platinum cluster', () => {
-      const archive = 'monitoring/singlecluster_red_platinum';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum';
       const timeRange = {
         min: '2017-10-06T19:53:06.000Z',
         max: '2017-10-06T20:15:30.000Z',
@@ -67,7 +68,8 @@ export default function ({ getService }) {
     });
 
     describe('with shards relocating', () => {
-      const archive = 'monitoring/singlecluster_three_nodes_shard_relocation';
+      const archive =
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation';
       const timeRange = {
         min: '2017-10-05T20:31:17.081Z',
         max: '2017-10-05T20:35:39.428Z',
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 904302975f071..9827c1d888a7e 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/instance.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('instance detail', () => {
-    const archive = 'monitoring/singlecluster_yellow_platinum';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum';
     const timeRange = {
       min: '2017-08-29T17:24:17.000Z',
       max: '2017-08-29T17:26:08.000Z',
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 b888f34751209..266165410133c 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
@@ -14,7 +14,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('instance detail mb', () => {
-    const archive = 'monitoring/singlecluster_yellow_platinum_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb';
     const timeRange = {
       min: '2017-08-29T17:24:17.000Z',
       max: '2017-08-29T17:26:08.000Z',
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 a86ad9169d5e2..1a5f71150b1d8 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/listing.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('listing', () => {
-    const archive = 'monitoring/singlecluster_yellow_platinum';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum';
     const timeRange = {
       min: '2017-08-29T17:24:17.000Z',
       max: '2017-08-29T17:26:08.000Z',
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 5e226f56122ae..655baecc3c1ad 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('listing mb', () => {
-    const archive = 'monitoring/singlecluster_yellow_platinum_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb';
     const timeRange = {
       min: '2017-08-29T17:24:17.000Z',
       max: '2017-08-29T17:26:08.000Z',
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 4f2daa90fc54c..23a783d58d2d8 100644
--- a/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/kibana/overview.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview', () => {
-    const archive = 'monitoring/singlecluster_yellow_platinum';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum';
     const timeRange = {
       min: '2017-08-29T17:24:17.000Z',
       max: '2017-08-29T17:26:08.000Z',
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 afdba071b9439..87f10d367ae65 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
@@ -14,7 +14,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview mb', () => {
-    const archive = 'monitoring/singlecluster_yellow_platinum_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb';
     const timeRange = {
       min: '2017-08-29T17:24:17.000Z',
       max: '2017-08-29T17:26:08.000Z',
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 dbe4cbb43e82e..507448a73bdf9 100644
--- a/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
+++ b/x-pack/test/api_integration/apis/monitoring/logs/cluster.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('cluster', () => {
-    const archive = 'monitoring/logs';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logs';
     const timeRange = {
       min: '2019-03-15T16:19:22.161Z',
       max: '2019-03-15T17:19:22.161Z',
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 adba23668250c..cd0dac1cb5f0c 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('cluster', () => {
-    const archive = 'monitoring/logs';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logs';
     const timeRange = {
       min: '2019-03-15T16:19:22.161Z',
       max: '2019-03-15T17:19:22.161Z',
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 69ea749fbdd7d..e2d8db4d587ba 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('multiple cluster', () => {
-    const archive = 'monitoring/logs_multiple_clusters';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logs_multiple_clusters';
     const timeRange = {
       min: '2019-08-23T14:14:31.686Z',
       max: '2019-08-23T15:14:31.686Z',
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 20ac7b9394ec5..3888f3995df36 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('cluster', () => {
-    const archive = 'monitoring/logs';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logs';
     const timeRange = {
       min: '2019-03-15T16:19:22.161Z',
       max: '2019-03-15T17:19:22.161Z',
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 5cfb7d173aeb5..801cc55ffbcad 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('pipelines listing multicluster', () => {
-    const archive = 'monitoring/logstash_pipelines_multicluster';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster';
     const timeRange = {
       min: '2019-11-11T15:13:45.266Z',
       max: '2019-11-11T15:17:05.399Z',
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 24b0d9a099e1b..58851ea31e7e5 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('pipelines listing multicluster mb', () => {
-    const archive = 'monitoring/logstash_pipelines_multicluster_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_multicluster_mb';
     const timeRange = {
       min: '2019-11-11T15:13:45.266Z',
       max: '2019-11-11T15:17:05.399Z',
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 f1d837a427396..a9a12d2f2c853 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
@@ -14,7 +14,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('node detail', () => {
-    const archive = 'monitoring/logstash_pipelines';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines';
     const timeRange = {
       min: '2018-01-22T09:33:13.000Z',
       max: '2018-01-22T09:41:04.000Z',
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 f7b33c7bf46b9..872e176408d0f 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
@@ -15,7 +15,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('node detail mb', () => {
-    const archive = 'monitoring/logstash_pipelines_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb';
     const timeRange = {
       min: '2018-01-22T09:33:13.000Z',
       max: '2018-01-22T09:41:04.000Z',
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 0423c4ed98496..8911f5f77c3a8 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/nodes.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('node listing', () => {
-    const archive = 'monitoring/logstash_pipelines';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines';
     const timeRange = {
       min: '2018-01-22T09:33:13.000Z',
       max: '2018-01-22T09:41:04.000Z',
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 217f1c84ddbdb..f04a059495527 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('node listing mb', () => {
-    const archive = 'monitoring/logstash_pipelines_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb';
     const timeRange = {
       min: '2018-01-22T09:33:13.000Z',
       max: '2018-01-22T09:41:04.000Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/overview.js b/x-pack/test/api_integration/apis/monitoring/logstash/overview.js
index 6476b09d372dc..9b83e60d10439 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/overview.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/overview.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview', () => {
-    const archive = 'monitoring/logstash_pipelines';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines';
     const timeRange = {
       min: '2018-01-22T09:33:13.000Z',
       max: '2018-01-22T09:41:04.000Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js b/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js
index 5c42ae3f87be6..0cc8deb5efa5d 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/overview_mb.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('overview mb', () => {
-    const archive = 'monitoring/logstash_pipelines_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb';
     const timeRange = {
       min: '2018-01-22T09:33:13.000Z',
       max: '2018-01-22T09:41:04.000Z',
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 a26fd7b091e75..7378c37a97357 100644
--- a/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
+++ b/x-pack/test/api_integration/apis/monitoring/logstash/pipelines.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('pipelines', () => {
-    const archive = 'monitoring/logstash/changing_pipelines';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines';
     const timeRange = {
       min: '2019-11-04T15:40:44.855Z',
       max: '2019-11-04T15:50:38.667Z',
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 bd576eaa9e09e..e17d31043a245 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('pipelines mb', () => {
-    const archive = 'monitoring/logstash/changing_pipelines_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/logstash/changing_pipelines_mb';
     const timeRange = {
       min: '2019-11-04T15:40:44.855Z',
       max: '2019-11-04T15:50:38.667Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js
index 0faa2b599b78a..2bf9d919d82be 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/ccs.js
@@ -10,7 +10,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('ccs', () => {
-    const archive = 'monitoring/setup/collection/detect_apm';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_apm';
     const timeRange = {
       min: '2019-04-16T00:00:00.741Z',
       max: '2019-04-16T23:59:59.741Z',
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 31daa37e2ae63..744934c1b315f 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('detect_apm', () => {
-    const archive = 'monitoring/setup/collection/detect_apm';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_apm';
     const timeRange = {
       min: '2019-04-16T00:00:00.741Z',
       max: '2019-04-16T23:59:59.741Z',
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 c2d63fc9ec975..542ee98f3d23d 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('detect_beats', () => {
-    const archive = 'monitoring/setup/collection/detect_beats';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 d8fcc60c32aa9..de805a05af13f 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('detect_beats_management', () => {
-    const archive = 'monitoring/setup/collection/detect_beats_management';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_beats_management';
     const timeRange = {
       min: '2019-04-16T00:00:00.741Z',
       max: '2019-04-16T23:59:59.741Z',
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 b00831da5836a..c7f33061c41c1 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('detect_logstash', () => {
-    const archive = 'monitoring/setup/collection/detect_logstash';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_logstash';
     const timeRange = {
       min: '2019-04-16T00:00:00.741Z',
       max: '2019-04-16T23:59:59.741Z',
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 e56ee7fad5a42..f85636b01dfa3 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('detect_logstash_management', () => {
-    const archive = 'monitoring/setup/collection/detect_logstash_management';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/detect_logstash_management';
     const timeRange = {
       min: '2019-04-16T00:00:00.741Z',
       max: '2019-04-16T23:59:59.741Z',
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 eb13f264028ce..c6b00d77199ea 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('es_and_kibana', () => {
-    const archive = 'monitoring/setup/collection/es_and_kibana';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 6b2ac002c5e57..68f5c4884d587 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('es_and_kibana_exclusive', () => {
-    const archive = 'monitoring/setup/collection/es_and_kibana_exclusive';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 7080e7ebeb503..1945688c8eadf 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('es_and_kibana_exclusive mb', () => {
-    const archive = 'monitoring/setup/collection/es_and_kibana_exclusive_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_exclusive_mb';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 532ef3c9de173..4f8f2148da84f 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('es_and_kibana mb', () => {
-    const archive = 'monitoring/setup/collection/es_and_kibana_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 d48ac98521af8..bb4a66e274886 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('kibana', () => {
-    const archive = 'monitoring/setup/collection/kibana';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 65cf74490088e..7fa2a76ae5567 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('kibana_exclusive', () => {
-    const archive = 'monitoring/setup/collection/kibana_exclusive';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 c86a2a4f4e7c8..37d8148a82fed 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
@@ -13,7 +13,8 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('kibana_exclusive mb', () => {
-    const archive = 'monitoring/setup/collection/kibana_exclusive_mb';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive_mb';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 bf4d27366c139..c36d77f9cbb6d 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('kibana mb', () => {
-    const archive = 'monitoring/setup/collection/kibana_mb';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_mb';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
diff --git a/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js b/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js
index 99bbcb421ba23..20f40b3a10cbe 100644
--- a/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js
+++ b/x-pack/test/api_integration/apis/monitoring/setup/collection/security.js
@@ -14,7 +14,8 @@ export default function ({ getService }) {
   const supertestWithoutAuth = getService('supertestWithoutAuth');
 
   describe('security', () => {
-    const archive = 'monitoring/setup/collection/kibana_exclusive';
+    const archive =
+      'x-pack/test/functional/es_archives/monitoring/setup/collection/kibana_exclusive';
     const timeRange = {
       min: '2019-04-09T00:00:00.741Z',
       max: '2019-04-09T23:59:59.741Z',
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 43bdfa6aeb9c7..14497675ddef0 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
@@ -13,7 +13,7 @@ export default function ({ getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('cluster', () => {
-    const archive = 'monitoring/standalone_cluster';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/standalone_cluster';
     const timeRange = {
       min: '2019-02-04T16:52:11.741Z',
       max: '2019-02-04T17:52:11.741Z',
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 71ebe70a69e50..3b6ccffe63998 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
@@ -16,7 +16,7 @@ export default function ({ getService }) {
     // TODO: https://github.com/elastic/stack-monitoring/issues/31
     this.tags(['skipCloud']);
 
-    const archive = 'monitoring/standalone_cluster';
+    const archive = 'x-pack/test/functional/es_archives/monitoring/standalone_cluster';
     const timeRange = {
       min: '2019-02-04T16:52:11.741Z',
       max: '2019-02-04T17:52:11.741Z',
diff --git a/x-pack/test/api_integration/apis/search/search.ts b/x-pack/test/api_integration/apis/search/search.ts
index 05743862c9b6e..82b62a61a932d 100644
--- a/x-pack/test/api_integration/apis/search/search.ts
+++ b/x-pack/test/api_integration/apis/search/search.ts
@@ -185,10 +185,10 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('rollup', () => {
       before(async () => {
-        await esArchiver.load('hybrid/rollup');
+        await esArchiver.load('x-pack/test/functional/es_archives/hybrid/rollup');
       });
       after(async () => {
-        await esArchiver.unload('hybrid/rollup');
+        await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/rollup');
       });
 
       it('should return 400 if rollup search is called without index', async () => {
diff --git a/x-pack/test/api_integration/apis/security/api_keys.ts b/x-pack/test/api_integration/apis/security/api_keys.ts
index c6513fa800c1c..98ef83c437863 100644
--- a/x-pack/test/api_integration/apis/security/api_keys.ts
+++ b/x-pack/test/api_integration/apis/security/api_keys.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
@@ -46,6 +46,23 @@ export default function ({ getService }: FtrProviderContext) {
             expect(name).to.eql('test_api_key');
           });
       });
+
+      it('should allow an API Key to be created with metadata', async () => {
+        await supertest
+          .post('/internal/security/api_key')
+          .set('kbn-xsrf', 'xxx')
+          .send({
+            name: 'test_api_key_with_metadata',
+            metadata: {
+              foo: 'bar',
+            },
+          })
+          .expect(200)
+          .then((response: Record<string, any>) => {
+            const { name } = response.body;
+            expect(name).to.eql('test_api_key_with_metadata');
+          });
+      });
     });
   });
 }
diff --git a/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts b/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts
index 9e4f5c8af8b05..89587fe259683 100644
--- a/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts
+++ b/x-pack/test/api_integration/apis/security/builtin_es_privileges.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security/index_fields.ts b/x-pack/test/api_integration/apis/security/index_fields.ts
index 442740c7666df..c21f65eb488ba 100644
--- a/x-pack/test/api_integration/apis/security/index_fields.ts
+++ b/x-pack/test/api_integration/apis/security/index_fields.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
@@ -15,10 +15,10 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Index Fields', () => {
     before(async () => {
-      await esArchiver.load('security/flstest/data');
+      await esArchiver.load('x-pack/test/functional/es_archives/security/flstest/data');
     });
     after(async () => {
-      await esArchiver.unload('security/flstest/data');
+      await esArchiver.unload('x-pack/test/functional/es_archives/security/flstest/data');
     });
 
     describe('GET /internal/security/fields/{query}', () => {
diff --git a/x-pack/test/api_integration/apis/security/license_downgrade.ts b/x-pack/test/api_integration/apis/security/license_downgrade.ts
index 583df6ea5ed07..dcdcc039bc9d6 100644
--- a/x-pack/test/api_integration/apis/security/license_downgrade.ts
+++ b/x-pack/test/api_integration/apis/security/license_downgrade.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/api_integration/apis/security/privileges.ts b/x-pack/test/api_integration/apis/security/privileges.ts
index f08712e015656..45b19ae3fe6fe 100644
--- a/x-pack/test/api_integration/apis/security/privileges.ts
+++ b/x-pack/test/api_integration/apis/security/privileges.ts
@@ -7,7 +7,7 @@
 
 import util from 'util';
 import { isEqual, isEqualWith } from 'lodash';
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { RawKibanaPrivileges } from '../../../../plugins/security/common/model';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
@@ -63,7 +63,7 @@ export default function ({ getService }: FtrProviderContext) {
             uptime: ['all', 'read'],
             apm: ['all', 'read'],
             ml: ['all', 'read'],
-            siem: ['all', 'read'],
+            siem: ['all', 'read', 'minimal_all', 'minimal_read', 'cases_all', 'cases_read'],
             fleet: ['all', 'read'],
             stackAlerts: ['all', 'read'],
             actions: ['all', 'read'],
diff --git a/x-pack/test/api_integration/apis/security/roles.ts b/x-pack/test/api_integration/apis/security/roles.ts
index 09b2d2eef9fbe..440bb4ca32f18 100644
--- a/x-pack/test/api_integration/apis/security/roles.ts
+++ b/x-pack/test/api_integration/apis/security/roles.ts
@@ -312,7 +312,6 @@ export default function ({ getService }: FtrProviderContext) {
             metadata: {
               foo: 'test-metadata',
             },
-            // @ts-expect-error @elastic/elasticsearch PutRoleRequest.body doesn't declare `transient_metadata` property
             transient_metadata: {
               enabled: true,
             },
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 a2e4318d93713..4ea8b8ab82e16 100644
--- a/x-pack/test/api_integration/apis/security_solution/authentications.ts
+++ b/x-pack/test/api_integration/apis/security_solution/authentications.ts
@@ -24,8 +24,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('authentications', () => {
-    before(() => esArchiver.load('auditbeat/hosts'));
-    after(() => esArchiver.unload('auditbeat/hosts'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'));
 
     it('Make sure that we get Authentication data', async () => {
       const { body: authentications } = await supertest
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
new file mode 100644
index 0000000000000..b5e8f13232880
--- /dev/null
+++ b/x-pack/test/api_integration/apis/security_solution/cases_privileges.ts
@@ -0,0 +1,331 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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';
+import {
+  createUsersAndRoles,
+  deleteUsersAndRoles,
+} from '../../../case_api_integration/common/lib/authentication';
+
+import { Role, User } from '../../../case_api_integration/common/lib/authentication/types';
+import {
+  createCase,
+  deleteAllCaseItems,
+  getCase,
+} from '../../../case_api_integration/common/lib/utils';
+import { getPostCaseRequest } from '../../../case_api_integration/common/lib/mock';
+import { APP_ID } from '../../../../plugins/security_solution/common/constants';
+
+const secAll: Role = {
+  name: 'sec_all_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secAllUser: User = {
+  username: 'sec_all_user',
+  password: 'password',
+  roles: [secAll.name],
+};
+
+const secAllCasesRead: Role = {
+  name: 'sec_all_cases_read_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['minimal_all', 'cases_read'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secAllCasesReadUser: User = {
+  username: 'sec_all_cases_read_user',
+  password: 'password',
+  roles: [secAllCasesRead.name],
+};
+
+const secAllCasesNone: Role = {
+  name: 'sec_all_cases_none_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['minimal_all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secAllCasesNoneUser: User = {
+  username: 'sec_all_cases_none_user',
+  password: 'password',
+  roles: [secAllCasesNone.name],
+};
+
+const secReadCasesAll: Role = {
+  name: 'sec_read_cases_all_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['minimal_read', 'cases_all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secReadCasesAllUser: User = {
+  username: 'sec_read_cases_all_user',
+  password: 'password',
+  roles: [secReadCasesAll.name],
+};
+
+const secReadCasesRead: Role = {
+  name: 'sec_read_cases_read_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['minimal_read', 'cases_read'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secReadCasesReadUser: User = {
+  username: 'sec_read_cases_read_user',
+  password: 'password',
+  roles: [secReadCasesRead.name],
+};
+
+const secRead: Role = {
+  name: 'sec_read_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['read'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secReadUser: User = {
+  username: 'sec_read_user',
+  password: 'password',
+  roles: [secRead.name],
+};
+
+const secReadCasesNone: Role = {
+  name: 'sec_read_cases_none_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['minimal_read'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secReadCasesNoneUser: User = {
+  username: 'sec_read_cases_none_user',
+  password: 'password',
+  roles: [secReadCasesNone.name],
+};
+
+const roles = [
+  secAll,
+  secAllCasesRead,
+  secAllCasesNone,
+  secReadCasesAll,
+  secReadCasesRead,
+  secRead,
+  secReadCasesNone,
+];
+
+const users = [
+  secAllUser,
+  secAllCasesReadUser,
+  secAllCasesNoneUser,
+  secReadCasesAllUser,
+  secReadCasesReadUser,
+  secReadUser,
+  secReadCasesNoneUser,
+];
+
+export default ({ getService }: FtrProviderContext): void => {
+  describe('security solution cases sub feature privilege', () => {
+    const es = getService('es');
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+    const supertest = getService('supertest');
+
+    before(async () => {
+      await createUsersAndRoles(getService, users, roles);
+    });
+
+    after(async () => {
+      await deleteUsersAndRoles(getService, users, roles);
+    });
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    for (const user of [secAllUser, secReadCasesAllUser]) {
+      it(`User ${user.username} with role(s) ${user.roles.join()} can create a case`, async () => {
+        await createCase(supertestWithoutAuth, getPostCaseRequest({ owner: APP_ID }), 200, {
+          user,
+          space: null,
+        });
+      });
+    }
+
+    for (const user of [
+      secAllCasesReadUser,
+      secReadCasesAllUser,
+      secReadCasesReadUser,
+      secReadUser,
+    ]) {
+      it(`User ${user.username} with role(s) ${user.roles.join()} can get a case`, async () => {
+        const caseInfo = await createCase(supertest, getPostCaseRequest({ owner: APP_ID }));
+        const retrievedCase = await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          expectedHttpCode: 200,
+          auth: { user, space: null },
+        });
+
+        expect(caseInfo.owner).to.eql(retrievedCase.owner);
+      });
+    }
+
+    for (const user of [
+      secAllCasesReadUser,
+      secAllCasesNoneUser,
+      secReadCasesReadUser,
+      secReadUser,
+      secReadCasesNoneUser,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} cannot create a case`, async () => {
+        await createCase(supertestWithoutAuth, getPostCaseRequest({ owner: APP_ID }), 403, {
+          user,
+          space: null,
+        });
+      });
+    }
+
+    for (const user of [secAllCasesNoneUser, secReadCasesNoneUser]) {
+      it(`User ${user.username} with role(s) ${user.roles.join()} cannot get a case`, async () => {
+        const caseInfo = await createCase(supertest, getPostCaseRequest({ owner: APP_ID }));
+
+        await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          expectedHttpCode: 403,
+          auth: { user, space: null },
+        });
+      });
+    }
+  });
+};
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 e5363ec57de06..2135bdafd70ec 100644
--- a/x-pack/test/api_integration/apis/security_solution/events.ts
+++ b/x-pack/test/api_integration/apis/security_solution/events.ts
@@ -409,8 +409,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('Timeline', () => {
-    before(() => esArchiver.load('auditbeat/hosts'));
-    after(() => esArchiver.unload('auditbeat/hosts'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'));
 
     it('Make sure that we get Timeline data', async () => {
       await retry.try(async () => {
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 ed542a24752a8..114f60a21c4e3 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
@@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Host Details', () => {
     describe('With filebeat', () => {
-      before(() => esArchiver.load('filebeat/default'));
-      after(() => esArchiver.unload('filebeat/default'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
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 7ff0e54af7fbf..12b9ce138d175 100644
--- a/x-pack/test/api_integration/apis/security_solution/hosts.ts
+++ b/x-pack/test/api_integration/apis/security_solution/hosts.ts
@@ -28,8 +28,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('hosts', () => {
-    before(() => esArchiver.load('auditbeat/hosts'));
-    after(() => esArchiver.unload('auditbeat/hosts'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts'));
 
     it('Make sure that we get Hosts Table data', async () => {
       const { body: hosts } = await supertest
diff --git a/x-pack/test/api_integration/apis/security_solution/index.js b/x-pack/test/api_integration/apis/security_solution/index.js
index 3f9afba18b9ef..996f2e74e87f7 100644
--- a/x-pack/test/api_integration/apis/security_solution/index.js
+++ b/x-pack/test/api_integration/apis/security_solution/index.js
@@ -8,6 +8,7 @@
 export default function ({ loadTestFile }) {
   describe('SecuritySolution Endpoints', () => {
     loadTestFile(require.resolve('./authentications'));
+    loadTestFile(require.resolve('./cases_privileges'));
     loadTestFile(require.resolve('./events'));
     loadTestFile(require.resolve('./hosts'));
     loadTestFile(require.resolve('./host_details'));
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 ff395f056354e..632f738d85f36 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
@@ -16,8 +16,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Kpi Hosts', () => {
     describe('With filebeat', () => {
-      before(() => esArchiver.load('filebeat/kpi_hosts'));
-      after(() => esArchiver.unload('filebeat/kpi_hosts'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/kpi_hosts'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/kpi_hosts'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
@@ -130,8 +130,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('With auditbeat', () => {
-      before(() => esArchiver.load('auditbeat/kpi_hosts'));
-      after(() => esArchiver.unload('auditbeat/kpi_hosts'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/kpi_hosts'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/kpi_hosts'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
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 69582ecc6e7c8..53b099bbe18d3 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
@@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Kpi Network', () => {
     describe('With filebeat', () => {
-      before(() => esArchiver.load('filebeat/default'));
-      after(() => esArchiver.unload('filebeat/default'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
@@ -202,8 +202,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('With packetbeat', () => {
-      before(() => esArchiver.load('packetbeat/default'));
-      after(() => esArchiver.unload('packetbeat/default'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/default'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/default'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
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 0fc4e5ba55988..6040ecd1001d9 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
@@ -35,8 +35,16 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Matrix DNS Histogram', () => {
     describe('Large data set', () => {
-      before(() => esArchiver.load('security_solution/matrix_dns_histogram/large_dns_query'));
-      after(() => esArchiver.unload('security_solution/matrix_dns_histogram/large_dns_query'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/matrix_dns_histogram/large_dns_query'
+        )
+      );
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
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 9c53d80862edb..0397e7550c935 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
@@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   describe('Network details', () => {
     describe('With filebeat', () => {
-      before(() => esArchiver.load('filebeat/default'));
-      after(() => esArchiver.unload('filebeat/default'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default'));
 
       it('Make sure that we get Network details data', async () => {
         const { body } = await supertest
@@ -39,8 +39,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('With packetbeat', () => {
-      before(() => esArchiver.load('packetbeat/default'));
-      after(() => esArchiver.unload('packetbeat/default'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/default'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/default'));
 
       it('Make sure that we get Network details data', async () => {
         const { body } = await supertest
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 7f482d678be12..80660860a164b 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
@@ -21,8 +21,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Network DNS', () => {
     describe('With packetbeat', () => {
-      before(() => esArchiver.load('packetbeat/dns'));
-      after(() => esArchiver.unload('packetbeat/dns'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/dns'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/dns'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
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 69a5221be52ea..af8e543907492 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
@@ -24,8 +24,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Network Top N Flow', () => {
     describe('With filebeat', () => {
-      before(() => esArchiver.load('filebeat/default'));
-      after(() => esArchiver.unload('filebeat/default'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default'));
 
       const FROM = '2019-02-09T01:57:24.870Z';
       const TO = '2019-02-12T01:57:24.870Z';
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 ddaa2d41588b7..09bd09782d2f2 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
@@ -16,8 +16,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Overview Host', () => {
     describe('With auditbeat', () => {
-      before(() => esArchiver.load('auditbeat/overview'));
-      after(() => esArchiver.unload('auditbeat/overview'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/overview'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/overview'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
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 e8173eb327da9..00adc903d5733 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
@@ -15,8 +15,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Overview Network', () => {
     describe('With filebeat', () => {
-      before(() => esArchiver.load('filebeat/default'));
-      after(() => esArchiver.unload('filebeat/default'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
@@ -57,8 +57,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('With packetbeat', () => {
-      before(() => esArchiver.load('packetbeat/overview'));
-      after(() => esArchiver.unload('packetbeat/overview'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/overview'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/overview'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
@@ -99,8 +99,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('With auditbeat', () => {
-      before(() => esArchiver.load('auditbeat/overview'));
-      after(() => esArchiver.unload('auditbeat/overview'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/overview'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/overview'));
 
       const FROM = '2000-01-01T00:00:00.000Z';
       const TO = '3000-01-01T00:00:00.000Z';
diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts
index 0d4f3a4fb9ea9..03ea91775d1bf 100644
--- a/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts
+++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/notes.ts
@@ -14,8 +14,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('Note - Saved Objects', () => {
-    beforeEach(() => esArchiver.load('empty_kibana'));
-    afterEach(() => esArchiver.unload('empty_kibana'));
+    beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
+    afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'));
 
     describe('create a note', () => {
       it('should return a timelineId, timelineVersion, noteId and version', async () => {
diff --git a/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts b/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts
index b77c654b038c2..8391f2f9ab18a 100644
--- a/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts
+++ b/x-pack/test/api_integration/apis/security_solution/saved_objects/pinned_events.ts
@@ -14,8 +14,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('Pinned Events - Saved Objects', () => {
-    beforeEach(() => esArchiver.load('empty_kibana'));
-    afterEach(() => esArchiver.unload('empty_kibana'));
+    beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
+    afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'));
 
     describe('Pinned an event', () => {
       it('return a timelineId, timelineVersion, pinnedEventId and version', async () => {
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 ed1d4719b9073..5bdbb76d53908 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
@@ -20,8 +20,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('Timeline - Saved Objects', () => {
-    beforeEach(() => esArchiver.load('empty_kibana'));
-    afterEach(() => esArchiver.unload('empty_kibana'));
+    beforeEach(() => esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
+    afterEach(() => esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'));
 
     describe('Persist a timeline', () => {
       it('Create a timeline just with a title', async () => {
diff --git a/x-pack/test/api_integration/apis/security_solution/sources.ts b/x-pack/test/api_integration/apis/security_solution/sources.ts
index d9ae88cdc7b4e..db9156a53048b 100644
--- a/x-pack/test/api_integration/apis/security_solution/sources.ts
+++ b/x-pack/test/api_integration/apis/security_solution/sources.ts
@@ -14,8 +14,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('sources', () => {
-    before(() => esArchiver.load('auditbeat/default'));
-    after(() => esArchiver.unload('auditbeat/default'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/default'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/default'));
 
     it('Make sure that we get source information when auditbeat indices is there', async () => {
       const { body: sourceStatus } = await supertest
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 61b75931c3c14..e1eaef823d2e0 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
@@ -673,8 +673,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('Timeline Details', () => {
-    before(() => esArchiver.load('filebeat/default'));
-    after(() => esArchiver.unload('filebeat/default'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/filebeat/default'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/filebeat/default'));
 
     it('Make sure that we get Event Details data', async () => {
       await retry.try(async () => {
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 eadf7d2aac7ae..2308ad7a0bf34 100644
--- a/x-pack/test/api_integration/apis/security_solution/tls.ts
+++ b/x-pack/test/api_integration/apis/security_solution/tls.ts
@@ -86,8 +86,8 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Tls Test with Packetbeat', () => {
     describe('Tls Test', () => {
-      before(() => esArchiver.load('packetbeat/tls'));
-      after(() => esArchiver.unload('packetbeat/tls'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/tls'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/tls'));
 
       it('Ensure data is returned for FlowTarget.Source', async () => {
         const { body: tls } = await supertest
@@ -153,8 +153,8 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('Tls Overview Test', () => {
-      before(() => esArchiver.load('packetbeat/tls'));
-      after(() => esArchiver.unload('packetbeat/tls'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/packetbeat/tls'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/packetbeat/tls'));
 
       it('Ensure data is returned for FlowTarget.Source', async () => {
         const { body: tls } = await supertest
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 1b3cd8fc34a57..d39cc0afb6461 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
@@ -29,8 +29,12 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('uncommon_processes', () => {
-    before(() => esArchiver.load('auditbeat/uncommon_processes'));
-    after(() => esArchiver.unload('auditbeat/uncommon_processes'));
+    before(() =>
+      esArchiver.load('x-pack/test/functional/es_archives/auditbeat/uncommon_processes')
+    );
+    after(() =>
+      esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/uncommon_processes')
+    );
 
     it('should return an edge of length 1 when given a pagination of length 1', async () => {
       await retry.try(async () => {
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 5afb2bba745a9..84335cc2695ce 100644
--- a/x-pack/test/api_integration/apis/security_solution/users.ts
+++ b/x-pack/test/api_integration/apis/security_solution/users.ts
@@ -25,8 +25,8 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   describe('Users', () => {
     describe('With auditbeat', () => {
-      before(() => esArchiver.load('auditbeat/users'));
-      after(() => esArchiver.unload('auditbeat/users'));
+      before(() => esArchiver.load('x-pack/test/functional/es_archives/auditbeat/users'));
+      after(() => esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/users'));
 
       it('Ensure data is returned from auditbeat', async () => {
         await retry.try(async () => {
diff --git a/x-pack/test/api_integration/apis/spaces/saved_objects.ts b/x-pack/test/api_integration/apis/spaces/saved_objects.ts
index b520c374d4f90..806929e67ebbc 100644
--- a/x-pack/test/api_integration/apis/spaces/saved_objects.ts
+++ b/x-pack/test/api_integration/apis/spaces/saved_objects.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ 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 fdf55fd6f4670..484eb3683a307 100644
--- a/x-pack/test/api_integration/apis/telemetry/telemetry.ts
+++ b/x-pack/test/api_integration/apis/telemetry/telemetry.ts
@@ -85,7 +85,7 @@ export default function ({ getService }: FtrProviderContext) {
       let localXPack: Record<string, unknown>;
       let monitoring: Array<Record<string, unknown>>;
 
-      const archive = 'monitoring/multicluster';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster';
       const fromTimestamp = '2017-08-15T21:00:00.000Z';
       const toTimestamp = '2017-08-16T00:00:00.000Z';
 
@@ -134,7 +134,7 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     describe('with basic cluster and reporting and canvas usage info', () => {
-      const archive = 'monitoring/basic_6.3.x';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/basic_6.3.x';
       const fromTimestamp = '2018-07-23T22:54:59.087Z';
       const toTimestamp = '2018-07-23T22:55:05.933Z';
       before(async () => {
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 e528fc62b76dc..5dfc318571e9a 100644
--- a/x-pack/test/api_integration/apis/transform/delete_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/delete_transforms.ts
@@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/delete_transforms', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/transform/index.ts b/x-pack/test/api_integration/apis/transform/index.ts
index d0aa9533c3860..351008f3f735e 100644
--- a/x-pack/test/api_integration/apis/transform/index.ts
+++ b/x-pack/test/api_integration/apis/transform/index.ts
@@ -23,7 +23,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await transform.securityCommon.cleanTransformUsers();
       await transform.securityCommon.cleanTransformRoles();
 
-      await esArchiver.unload('ml/farequote');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
 
       await transform.testResources.resetKibanaTimeZone();
     });
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 386d20bdc7ead..5abfa92bd5d9b 100644
--- a/x-pack/test/api_integration/apis/transform/start_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/start_transforms.ts
@@ -29,7 +29,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/start_transforms', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
     });
 
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 25e54b2e74a37..295c6cea7f595 100644
--- a/x-pack/test/api_integration/apis/transform/stop_transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/stop_transforms.ts
@@ -45,7 +45,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/stop_transforms', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
     });
 
diff --git a/x-pack/test/api_integration/apis/transform/transforms.ts b/x-pack/test/api_integration/apis/transform/transforms.ts
index d4fb613c55f3d..9993cbe0328ff 100644
--- a/x-pack/test/api_integration/apis/transform/transforms.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms.ts
@@ -82,7 +82,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/transforms', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
       await createTransform('transform-test-get-1');
       await createTransform('transform-test-get-2');
diff --git a/x-pack/test/api_integration/apis/transform/transforms_create.ts b/x-pack/test/api_integration/apis/transform/transforms_create.ts
index 44a6d658bf748..46112ced0619e 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_create.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_create.ts
@@ -19,7 +19,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/transforms/{transformId}/ create', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
     });
 
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 1acac929ef359..5fd75a6bb98ab 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_preview.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_preview.ts
@@ -37,7 +37,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/transforms/_preview', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
       await transform.api.waitForIndicesToExist('ft_farequote');
     });
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 03edfe5d09a74..82a7d7efcc270 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_stats.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_stats.ts
@@ -62,7 +62,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/transforms/_stats', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
       await createTransform('transform-test-stats-1');
       await createTransform('transform-test-stats-2');
diff --git a/x-pack/test/api_integration/apis/transform/transforms_update.ts b/x-pack/test/api_integration/apis/transform/transforms_update.ts
index d9ab7cb8f9430..e5f1ce76a997b 100644
--- a/x-pack/test/api_integration/apis/transform/transforms_update.ts
+++ b/x-pack/test/api_integration/apis/transform/transforms_update.ts
@@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext) => {
 
   describe('/api/transform/transforms/{transformId}/_update', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.setKibanaTimeZoneToUTC();
       await createTransform('transform-test-update-1');
     });
diff --git a/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts b/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts
index 7041427fb74d7..0eb0b98e29ffe 100644
--- a/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts
+++ b/x-pack/test/api_integration/apis/upgrade_assistant/upgrade_assistant.ts
@@ -93,6 +93,7 @@ export default function ({ getService }: FtrProviderContext) {
             index: indexName,
           });
 
+          // @ts-expect-error @elastic/elasticsearch supports flatten 'index.*' keys only
           const updatedIndexSettings = indexSettingsResponse[indexName].settings.index;
 
           // Verify number_of_shards and number_of_replicas are unchanged
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 18aa80bf61a9f..cf52d72823095 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
@@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
 
   describe('get_all_pings', () => {
-    const archive = 'uptime/pings';
+    const archive = 'x-pack/test/functional/es_archives/uptime/pings';
 
     before('load heartbeat data', async () => await esArchiver.load(archive));
     after('unload heartbeat data', async () => await esArchiver.unload(archive));
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 d7c0a4eed4a72..c9c8efe3f3a11 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/certs.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/certs.ts
@@ -63,7 +63,7 @@ export default function ({ getService }: FtrProviderContext) {
         );
       });
       after('unload test docs', () => {
-        esArchiver.unload('uptime/blank');
+        esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
       });
 
       it('retrieves expected cert data', async () => {
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 9f90d3739797b..ded9d1392231a 100644
--- a/x-pack/test/api_integration/apis/uptime/rest/index.ts
+++ b/x-pack/test/api_integration/apis/uptime/rest/index.ts
@@ -39,12 +39,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
     describe('with generated data', () => {
       beforeEach('load heartbeat data', async () => {
-        await esArchiver.loadIfNeeded('uptime/blank');
-        await esArchiver.loadIfNeeded('uptime/blank_data_stream');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/uptime/blank');
+        await esArchiver.loadIfNeeded(
+          'x-pack/test/functional/es_archives/uptime/blank_data_stream'
+        );
       });
       after('unload', async () => {
-        await esArchiver.unload('uptime/blank');
-        await esArchiver.unload('uptime/blank_data_stream');
+        await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
+        await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank_data_stream');
       });
 
       loadTestFile(require.resolve('./certs'));
@@ -56,8 +58,16 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     });
 
     describe('with real-world data', () => {
-      beforeEach('load heartbeat data', async () => await esArchiver.load('uptime/full_heartbeat'));
-      afterEach('unload', async () => await esArchiver.unload('uptime/full_heartbeat'));
+      beforeEach(
+        'load heartbeat data',
+        async () =>
+          await esArchiver.load('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+      );
+      afterEach(
+        'unload',
+        async () =>
+          await esArchiver.unload('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+      );
       loadTestFile(require.resolve('./monitor_latest_status'));
       loadTestFile(require.resolve('./ping_histogram'));
       loadTestFile(require.resolve('./ping_list'));
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 5268a2146d123..05e79d91ddc3a 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
@@ -24,8 +24,12 @@ export default function ({ getService }: FtrProviderContext) {
     const getBaseUrl = (from: string, to: string) =>
       `${API_URLS.MONITOR_LIST}?dateRangeStart=${from}&dateRangeEnd=${to}&pageSize=10`;
 
-    before('load heartbeat data', () => getService('esArchiver').load('uptime/blank'));
-    after('unload heartbeat index', () => getService('esArchiver').unload('uptime/blank'));
+    before('load heartbeat data', () =>
+      getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank')
+    );
+    after('unload heartbeat index', () =>
+      getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank')
+    );
 
     // In this case we don't actually have any monitors to display
     // but the query should still return successfully. This has
@@ -139,7 +143,7 @@ export default function ({ getService }: FtrProviderContext) {
       const downMonitorId = 'down-test-id';
       const mixMonitorId = 'mix-test-id';
       before('generate three monitors with up, down, mix state', async () => {
-        await getService('esArchiver').load('uptime/blank');
+        await getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank');
 
         const es = getService('es');
 
@@ -169,7 +173,9 @@ export default function ({ getService }: FtrProviderContext) {
         dateRangeEnd = new Date().toISOString();
       });
 
-      after('unload heartbeat index', () => getService('esArchiver').unload('uptime/blank'));
+      after('unload heartbeat index', () =>
+        getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank')
+      );
 
       it('should return all monitor when no status filter', async () => {
         const apiResponse = await supertest.get(getBaseUrl(dateRangeStart, dateRangeEnd));
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 e7f60ed8e522b..860aae81703f4 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
@@ -22,8 +22,12 @@ function decodePingsResponseData(response: any) {
 export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   describe('pingList query', () => {
-    before('load heartbeat data', () => getService('esArchiver').load('uptime/full_heartbeat'));
-    after('unload heartbeat index', () => getService('esArchiver').unload('uptime/full_heartbeat'));
+    before('load heartbeat data', () =>
+      getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+    );
+    after('unload heartbeat index', () =>
+      getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/full_heartbeat')
+    );
 
     it('returns a list of pings for the given date range and default size', async () => {
       const from = '2019-01-28T17:40:08.078Z';
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 fd8894d7e9164..8e80208b3d805 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
@@ -16,7 +16,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('telemetry collectors heartbeat', () => {
     before('generating data', async () => {
-      await getService('esArchiver').load('uptime/blank');
+      await getService('esArchiver').load('x-pack/test/functional/es_archives/uptime/blank');
 
       const observer = {
         geo: {
@@ -83,7 +83,7 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     after('unload heartbeat index', () => {
-      getService('esArchiver').unload('uptime/blank');
+      getService('esArchiver').unload('x-pack/test/functional/es_archives/uptime/blank');
     });
 
     beforeEach(async () => {
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 8c462f1db431b..df741fe56381e 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
@@ -17,7 +17,9 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('telemetry collectors fleet', () => {
     before('generating data', async () => {
-      await getService('esArchiver').load('uptime/blank_data_stream');
+      await getService('esArchiver').load(
+        'x-pack/test/functional/es_archives/uptime/blank_data_stream'
+      );
 
       const observer = {
         geo: {
@@ -123,7 +125,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     after('unload heartbeat index', () => {
-      getService('esArchiver').unload('uptime/blank_data_stream');
+      getService('esArchiver').unload(
+        'x-pack/test/functional/es_archives/uptime/blank_data_stream'
+      );
       /**
        * Data streams aren't included in the javascript elasticsearch client in kibana yet so we
        * need to do raw requests here. Delete a data stream is slightly different than that of a regular index which
diff --git a/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js b/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js
index c1c686e891a09..6a82c5468a2c4 100644
--- a/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js
+++ b/x-pack/test/api_integration/apis/xpack_legacy/settings/settings.js
@@ -13,7 +13,7 @@ export default function ({ getService }) {
 
   describe('/api/settings', () => {
     describe('with trial license clusters', () => {
-      const archive = 'monitoring/multicluster';
+      const archive = 'x-pack/test/functional/es_archives/monitoring/multicluster';
 
       before('load clusters archive', () => {
         return esArchiver.load(archive);
diff --git a/x-pack/test/api_integration/config.ts b/x-pack/test/api_integration/config.ts
index 5c998a4322480..6708a6d55f402 100644
--- a/x-pack/test/api_integration/config.ts
+++ b/x-pack/test/api_integration/config.ts
@@ -18,7 +18,6 @@ export async function getApiIntegrationConfig({ readConfigFile }: FtrConfigProvi
     services,
     servers: xPackFunctionalTestsConfig.get('servers'),
     security: xPackFunctionalTestsConfig.get('security'),
-    esArchiver: xPackFunctionalTestsConfig.get('esArchiver'),
     junit: {
       reportName: 'X-Pack API Integration Tests',
     },
diff --git a/x-pack/test/api_integration_basic/apis/index.ts b/x-pack/test/api_integration_basic/apis/index.ts
index 323a8e95c4b2b..27869095bd792 100644
--- a/x-pack/test/api_integration_basic/apis/index.ts
+++ b/x-pack/test/api_integration_basic/apis/index.ts
@@ -13,5 +13,6 @@ export default function ({ loadTestFile }: FtrProviderContext) {
 
     loadTestFile(require.resolve('./ml'));
     loadTestFile(require.resolve('./transform'));
+    loadTestFile(require.resolve('./security_solution'));
   });
 }
diff --git a/x-pack/test/api_integration_basic/apis/ml/index.ts b/x-pack/test/api_integration_basic/apis/ml/index.ts
index 73322b21ec3a6..5ca70103f41eb 100644
--- a/x-pack/test/api_integration_basic/apis/ml/index.ts
+++ b/x-pack/test/api_integration_basic/apis/ml/index.ts
@@ -25,7 +25,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
 
       await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
 
-      await esArchiver.unload('ml/farequote');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
 
       await ml.testResources.resetKibanaTimeZone();
     });
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
new file mode 100644
index 0000000000000..532249a049b47
--- /dev/null
+++ b/x-pack/test/api_integration_basic/apis/security_solution/cases_privileges.ts
@@ -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; 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';
+import {
+  createUsersAndRoles,
+  deleteUsersAndRoles,
+} from '../../../case_api_integration/common/lib/authentication';
+
+import { Role, User } from '../../../case_api_integration/common/lib/authentication/types';
+import {
+  createCase,
+  deleteAllCaseItems,
+  getCase,
+} from '../../../case_api_integration/common/lib/utils';
+import { getPostCaseRequest } from '../../../case_api_integration/common/lib/mock';
+import { APP_ID } from '../../../../plugins/security_solution/common/constants';
+
+const secAll: Role = {
+  name: 'sec_all_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secAllUser: User = {
+  username: 'sec_all_user',
+  password: 'password',
+  roles: [secAll.name],
+};
+
+const secRead: Role = {
+  name: 'sec_read_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          siem: ['read'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secReadUser: User = {
+  username: 'sec_read_user',
+  password: 'password',
+  roles: [secRead.name],
+};
+
+const secNone: Role = {
+  name: 'sec_none_role',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+const secNoneUser: User = {
+  username: 'sec_none_user',
+  password: 'password',
+  roles: [secNone.name],
+};
+
+const roles = [secAll, secRead, secNone];
+
+const users = [secAllUser, secReadUser, secNoneUser];
+
+export default ({ getService }: FtrProviderContext): void => {
+  describe('cases feature privilege', () => {
+    const es = getService('es');
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+    const supertest = getService('supertest');
+
+    before(async () => {
+      await createUsersAndRoles(getService, users, roles);
+    });
+
+    after(async () => {
+      await deleteUsersAndRoles(getService, users, roles);
+    });
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it(`User ${
+      secAllUser.username
+    } with role(s) ${secAllUser.roles.join()} can create a case`, async () => {
+      await createCase(supertestWithoutAuth, getPostCaseRequest({ owner: APP_ID }), 200, {
+        user: secAllUser,
+        space: null,
+      });
+    });
+
+    it(`User ${
+      secReadUser.username
+    } with role(s) ${secReadUser.roles.join()} can get a case`, async () => {
+      const caseInfo = await createCase(supertest, getPostCaseRequest({ owner: APP_ID }));
+      const retrievedCase = await getCase({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        expectedHttpCode: 200,
+        auth: { user: secReadUser, space: null },
+      });
+
+      expect(caseInfo.owner).to.eql(retrievedCase.owner);
+    });
+
+    for (const user of [secReadUser, secNoneUser]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} cannot create a case`, async () => {
+        await createCase(supertestWithoutAuth, getPostCaseRequest({ owner: APP_ID }), 403, {
+          user,
+          space: null,
+        });
+      });
+    }
+
+    it(`User ${
+      secNoneUser.username
+    } with role(s) ${secNoneUser.roles.join()} cannot get a case`, async () => {
+      const caseInfo = await createCase(supertest, getPostCaseRequest({ owner: APP_ID }));
+
+      await getCase({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        expectedHttpCode: 403,
+        auth: { user: secNoneUser, space: null },
+      });
+    });
+  });
+};
diff --git a/x-pack/test/api_integration_basic/apis/security_solution/index.ts b/x-pack/test/api_integration_basic/apis/security_solution/index.ts
new file mode 100644
index 0000000000000..90560c6c677d4
--- /dev/null
+++ b/x-pack/test/api_integration_basic/apis/security_solution/index.ts
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ loadTestFile }: FtrProviderContext) {
+  describe('SecuritySolution Endpoints basic licsense', () => {
+    loadTestFile(require.resolve('./cases_privileges'));
+  });
+}
diff --git a/x-pack/test/apm_api_integration/common/config.ts b/x-pack/test/apm_api_integration/common/config.ts
index 68a0c6b4e9f1c..ef8d4097f21c1 100644
--- a/x-pack/test/apm_api_integration/common/config.ts
+++ b/x-pack/test/apm_api_integration/common/config.ts
@@ -8,7 +8,6 @@
 import { FtrConfigProviderContext } from '@kbn/test';
 import supertest from 'supertest';
 import { format, UrlObject } from 'url';
-import path from 'path';
 import { InheritedFtrProviderContext, InheritedServices } from './ftr_provider_context';
 import { PromiseReturnType } from '../../../plugins/observability/typings/common';
 import { createApmUser, APM_TEST_PASSWORD, ApmUser } from './authentication';
@@ -55,9 +54,6 @@ export function createTestConfig(config: Config) {
     return {
       testFiles: [require.resolve('../tests')],
       servers,
-      esArchiver: {
-        directory: path.resolve(__dirname, './fixtures/es_archiver'),
-      },
       services: {
         ...services,
         supertest: supertestAsApmReadUser,
diff --git a/x-pack/test/apm_api_integration/common/registry.ts b/x-pack/test/apm_api_integration/common/registry.ts
index f27b40903efea..ae55328d63bd2 100644
--- a/x-pack/test/apm_api_integration/common/registry.ts
+++ b/x-pack/test/apm_api_integration/common/registry.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import Path from 'path';
 import { castArray, groupBy } from 'lodash';
 import callsites from 'callsites';
 import { maybe } from '../../../plugins/apm/common/utils/maybe';
@@ -140,7 +141,12 @@ export const registry = {
             const log = logWithTimer();
             for (const archiveName of condition.archives) {
               log(`Loading ${archiveName}`);
-              await esArchiver.load(archiveName);
+              await esArchiver.load(
+                Path.join(
+                  'x-pack/test/apm_api_integration/common/fixtures/es_archiver',
+                  archiveName
+                )
+              );
             }
             if (condition.archives.length) {
               log('Loaded all archives');
@@ -151,7 +157,12 @@ export const registry = {
             const log = logWithTimer();
             for (const archiveName of condition.archives) {
               log(`Unloading ${archiveName}`);
-              await esArchiver.unload(archiveName);
+              await esArchiver.unload(
+                Path.join(
+                  'x-pack/test/apm_api_integration/common/fixtures/es_archiver',
+                  archiveName
+                )
+              );
             }
             if (condition.archives.length) {
               log('Unloaded all archives');
diff --git a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
index e9392a611b5b7..1f8d1144349dd 100644
--- a/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
+++ b/x-pack/test/apm_api_integration/tests/alerts/rule_registry.ts
@@ -603,7 +603,7 @@ export default function ApiTest({ getService }: FtrProviderContext) {
 
       expect(errorOrUndefined).not.to.be(undefined);
 
-      expect(errorOrUndefined).to.be(`ResponseError: index_not_found_exception`);
+      expect(errorOrUndefined).to.contain('index_not_found_exception');
     });
   });
 }
diff --git a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/es_utils.ts b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/es_utils.ts
index dbbc8ebc87958..b1663ea714056 100644
--- a/x-pack/test/apm_api_integration/tests/service_overview/dependencies/es_utils.ts
+++ b/x-pack/test/apm_api_integration/tests/service_overview/dependencies/es_utils.ts
@@ -5,6 +5,7 @@
  * 2.0.
  */
 
+import { MappingTypeMapping } from '@elastic/elasticsearch/api/types';
 import uuid from 'uuid';
 
 export function createServiceDependencyDocs({
@@ -125,7 +126,7 @@ export function createServiceDependencyDocs({
   ];
 }
 
-export const apmDependenciesMapping = {
+export const apmDependenciesMapping: MappingTypeMapping = {
   properties: {
     '@timestamp': {
       type: 'date',
diff --git a/x-pack/test/banners_functional/config.ts b/x-pack/test/banners_functional/config.ts
index a4b2867b8d7ce..c9acff91aecd1 100644
--- a/x-pack/test/banners_functional/config.ts
+++ b/x-pack/test/banners_functional/config.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import path from 'path';
 import { FtrConfigProviderContext } from '@kbn/test';
 import { services, pageObjects } from './ftr_provider_context';
 
@@ -29,10 +28,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       ...kibanaFunctionalConfig.get('apps'),
     },
 
-    esArchiver: {
-      directory: path.resolve(__dirname, '..', 'functional', 'es_archives'),
-    },
-
     kbnTestServer: {
       ...kibanaFunctionalConfig.get('kbnTestServer'),
       serverArgs: [
diff --git a/x-pack/test/banners_functional/tests/spaces.ts b/x-pack/test/banners_functional/tests/spaces.ts
index f8c412c0df0e3..f6e2fbf544557 100644
--- a/x-pack/test/banners_functional/tests/spaces.ts
+++ b/x-pack/test/banners_functional/tests/spaces.ts
@@ -20,11 +20,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('per-spaces banners', () => {
     before(async () => {
-      await esArchiver.load('banners/multispace');
+      await esArchiver.load('x-pack/test/functional/es_archives/banners/multispace');
     });
 
     after(async () => {
-      await esArchiver.unload('banners/multispace');
+      await esArchiver.unload('x-pack/test/functional/es_archives/banners/multispace');
     });
 
     before(async () => {
diff --git a/x-pack/test/case_api_integration/basic/config.ts b/x-pack/test/case_api_integration/basic/config.ts
deleted file mode 100644
index ca4622c16ac92..0000000000000
--- a/x-pack/test/case_api_integration/basic/config.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { createTestConfig } from '../common/config';
-
-// eslint-disable-next-line import/no-default-export
-export default createTestConfig('basic', {
-  disabledPlugins: [],
-  license: 'trial',
-  ssl: true,
-});
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/alerts/get_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/alerts/get_cases.ts
deleted file mode 100644
index 140fb80949a24..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/alerts/get_cases.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { postCaseReq, postCommentAlertReq } from '../../../../common/lib/mock';
-import { deleteAllCaseItems } from '../../../../common/lib/utils';
-import { CaseResponse } from '../../../../../../plugins/cases/common';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_cases using alertID', () => {
-    const createCase = async () => {
-      const { body } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-      return body;
-    };
-
-    const createComment = async (caseID: string) => {
-      await supertest
-        .post(`${CASES_URL}/${caseID}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentAlertReq)
-        .expect(200);
-    };
-
-    afterEach(async () => {
-      await deleteAllCaseItems(es);
-    });
-
-    it('should return all cases with the same alert ID attached to them', async () => {
-      const [case1, case2, case3] = await Promise.all([createCase(), createCase(), createCase()]);
-
-      await Promise.all([
-        createComment(case1.id),
-        createComment(case2.id),
-        createComment(case3.id),
-      ]);
-
-      const { body: caseIDsWithAlert } = await supertest
-        .get(`${CASES_URL}/alerts/test-id`)
-        .expect(200);
-
-      expect(caseIDsWithAlert.length).to.eql(3);
-      expect(caseIDsWithAlert).to.contain(case1.id);
-      expect(caseIDsWithAlert).to.contain(case2.id);
-      expect(caseIDsWithAlert).to.contain(case3.id);
-    });
-
-    it('should return all cases with the same alert ID when more than 100 cases', async () => {
-      // if there are more than 100 responses, the implementation sets the aggregation size to the
-      // specific value
-      const numCases = 102;
-      const createCasePromises: Array<Promise<CaseResponse>> = [];
-      for (let i = 0; i < numCases; i++) {
-        createCasePromises.push(createCase());
-      }
-
-      const cases = await Promise.all(createCasePromises);
-
-      const commentPromises: Array<Promise<void>> = [];
-      for (const caseInfo of cases) {
-        commentPromises.push(createComment(caseInfo.id));
-      }
-
-      await Promise.all(commentPromises);
-
-      const { body: caseIDsWithAlert } = await supertest
-        .get(`${CASES_URL}/alerts/test-id`)
-        .expect(200);
-
-      expect(caseIDsWithAlert.length).to.eql(numCases);
-
-      for (const caseInfo of cases) {
-        expect(caseIDsWithAlert).to.contain(caseInfo.id);
-      }
-    });
-
-    it('should return no cases when the alert ID is not found', async () => {
-      const [case1, case2, case3] = await Promise.all([createCase(), createCase(), createCase()]);
-
-      await Promise.all([
-        createComment(case1.id),
-        createComment(case2.id),
-        createComment(case3.id),
-      ]);
-
-      const { body: caseIDsWithAlert } = await supertest
-        .get(`${CASES_URL}/alerts/test-id100`)
-        .expect(200);
-
-      expect(caseIDsWithAlert.length).to.eql(0);
-    });
-
-    it('should return a 302 when passing an empty alertID', async () => {
-      // kibana returns a 302 instead of a 400 when a url param is missing
-      await supertest.get(`${CASES_URL}/alerts/`).expect(302);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/delete_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/delete_comment.ts
deleted file mode 100644
index fece9abd5fa35..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/comments/delete_comment.ts
+++ /dev/null
@@ -1,171 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-  deleteCases,
-  deleteCasesUserActions,
-  deleteComments,
-} from '../../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('delete_comment', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-      await deleteComments(es);
-      await deleteCasesUserActions(es);
-    });
-
-    it('should delete a comment', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body: comment } = await supertest
-        .delete(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`)
-        .set('kbn-xsrf', 'true')
-        .expect(204)
-        .send();
-      expect(comment).to.eql({});
-    });
-
-    it('unhappy path - 404s when comment belongs to different case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body } = await supertest
-        .delete(`${CASES_URL}/fake-id/comments/${patchedCase.comments[0].id}`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(404);
-
-      expect(body.message).to.eql(
-        `This comment ${patchedCase.comments[0].id} does not exist in fake-id).`
-      );
-    });
-
-    it('unhappy path - 404s when comment is not there', async () => {
-      await supertest
-        .delete(`${CASES_URL}/fake-id/comments/fake-id`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(404);
-    });
-
-    it('should return a 400 when attempting to delete all comments when passing the `subCaseId` parameter', async () => {
-      const { body } = await supertest
-        .delete(`${CASES_URL}/case-id/comments?subCaseId=value`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(400);
-      // make sure the failure is because of the subCaseId
-      expect(body.message).to.contain('subCaseId');
-    });
-
-    it('should return a 400 when attempting to delete a single comment when passing the `subCaseId` parameter', async () => {
-      const { body } = await supertest
-        .delete(`${CASES_URL}/case-id/comments/comment-id?subCaseId=value`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(400);
-      // make sure the failure is because of the subCaseId
-      expect(body.message).to.contain('subCaseId');
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('sub case comments', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('deletes a comment from a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        await supertest
-          .delete(
-            `${CASES_URL}/${caseInfo.id}/comments/${caseInfo.comments![0].id}?subCaseId=${
-              caseInfo.subCases![0].id
-            }`
-          )
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(204);
-        const { body } = await supertest.get(
-          `${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`
-        );
-        expect(body.length).to.eql(0);
-      });
-
-      it('deletes all comments from a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        await supertest
-          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        let { body: allComments } = await supertest.get(
-          `${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`
-        );
-        expect(allComments.length).to.eql(2);
-
-        await supertest
-          .delete(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(204);
-
-        ({ body: allComments } = await supertest.get(
-          `${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`
-        ));
-
-        // no comments for the sub case
-        expect(allComments.length).to.eql(0);
-
-        ({ body: allComments } = await supertest.get(`${CASES_URL}/${caseInfo.id}/comments`));
-
-        // no comments for the collection
-        expect(allComments.length).to.eql(0);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/find_comments.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/find_comments.ts
deleted file mode 100644
index 44ff1c7ebffe1..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/comments/find_comments.ts
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { CommentsResponse, CommentType } from '../../../../../../plugins/cases/common/api';
-import { postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-  deleteCases,
-  deleteCasesUserActions,
-  deleteComments,
-} from '../../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('find_comments', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-      await deleteComments(es);
-      await deleteCasesUserActions(es);
-    });
-
-    it('should find all case comment', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      // post 2 comments
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body: caseComments } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/comments/_find`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(caseComments.comments).to.eql(patchedCase.comments);
-    });
-
-    it('should filter case comments', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      // post 2 comments
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({ comment: 'unique', type: CommentType.user })
-        .expect(200);
-
-      const { body: caseComments } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/comments/_find?search=unique`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(caseComments.comments).to.eql([patchedCase.comments[1]]);
-    });
-
-    it('unhappy path - 400s when query is bad', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      await supertest
-        .get(`${CASES_URL}/${postedCase.id}/comments/_find?perPage=true`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(400);
-    });
-
-    it('should return a 400 when passing the subCaseId parameter', async () => {
-      const { body } = await supertest
-        .get(`${CASES_URL}/case-id/comments/_find?search=unique&subCaseId=value`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(400);
-
-      expect(body.message).to.contain('subCaseId');
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('sub case comments', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('finds comments for a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        await supertest
-          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const { body: subCaseComments }: { body: CommentsResponse } = await supertest
-          .get(`${CASES_URL}/${caseInfo.id}/comments/_find?subCaseId=${caseInfo.subCases![0].id}`)
-          .send()
-          .expect(200);
-        expect(subCaseComments.total).to.be(2);
-        expect(subCaseComments.comments[0].type).to.be(CommentType.generatedAlert);
-        expect(subCaseComments.comments[1].type).to.be(CommentType.user);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/get_all_comments.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/get_all_comments.ts
deleted file mode 100644
index e73614d88ca95..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/comments/get_all_comments.ts
+++ /dev/null
@@ -1,133 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-} from '../../../../common/lib/utils';
-import { CommentType } from '../../../../../../plugins/cases/common/api';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_all_comments', () => {
-    afterEach(async () => {
-      await deleteAllCaseItems(es);
-    });
-
-    it('should get multiple comments for a single case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body: comments } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(comments.length).to.eql(2);
-    });
-
-    it('should return a 400 when passing the subCaseId parameter', async () => {
-      const { body } = await supertest
-        .get(`${CASES_URL}/case-id/comments?subCaseId=value`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(400);
-
-      expect(body.message).to.contain('subCaseId');
-    });
-
-    it('should return a 400 when passing the includeSubCaseComments parameter', async () => {
-      const { body } = await supertest
-        .get(`${CASES_URL}/case-id/comments?includeSubCaseComments=true`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(400);
-
-      expect(body.message).to.contain('includeSubCaseComments');
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('sub cases', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-
-      it('should get comments from a case and its sub cases', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        await supertest
-          .post(`${CASES_URL}/${caseInfo.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const { body: comments } = await supertest
-          .get(`${CASES_URL}/${caseInfo.id}/comments?includeSubCaseComments=true`)
-          .expect(200);
-
-        expect(comments.length).to.eql(2);
-        expect(comments[0].type).to.eql(CommentType.generatedAlert);
-        expect(comments[1].type).to.eql(CommentType.user);
-      });
-
-      it('should get comments from a sub cases', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        await supertest
-          .post(`${CASES_URL}/${caseInfo.subCases![0].id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const { body: comments } = await supertest
-          .get(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .expect(200);
-
-        expect(comments.length).to.eql(2);
-        expect(comments[0].type).to.eql(CommentType.generatedAlert);
-        expect(comments[1].type).to.eql(CommentType.user);
-      });
-
-      it('should not find any comments for an invalid case id', async () => {
-        const { body } = await supertest
-          .get(`${CASES_URL}/fake-id/comments`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-        expect(body.length).to.eql(0);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/get_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/get_comment.ts
deleted file mode 100644
index a74d8f86d225b..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/comments/get_comment.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; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-} from '../../../../common/lib/utils';
-import { CommentResponse, CommentType } from '../../../../../../plugins/cases/common/api';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_comment', () => {
-    afterEach(async () => {
-      await deleteAllCaseItems(es);
-    });
-
-    it('should get a comment', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body: comment } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(comment).to.eql(patchedCase.comments[0]);
-    });
-
-    it('unhappy path - 404s when comment is not there', async () => {
-      await supertest
-        .get(`${CASES_URL}/fake-id/comments/fake-comment`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(404);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('sub cases', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      it('should get a sub case comment', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        const { body: comment }: { body: CommentResponse } = await supertest
-          .get(`${CASES_URL}/${caseInfo.id}/comments/${caseInfo.comments![0].id}`)
-          .expect(200);
-        expect(comment.type).to.be(CommentType.generatedAlert);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/migrations.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/migrations.ts
deleted file mode 100644
index 264ac2a0898e0..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/comments/migrations.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-
-// eslint-disable-next-line import/no-default-export
-export default function createGetTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-
-  describe('migrations', () => {
-    before(async () => {
-      await esArchiver.load('cases/migrations/7.10.0');
-    });
-
-    after(async () => {
-      await esArchiver.unload('cases/migrations/7.10.0');
-    });
-
-    it('7.11.0 migrates cases comments', async () => {
-      const { body: comment } = await supertest
-        .get(
-          `${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509/comments/da677740-1ac7-11eb-b5a3-25ee88122510`
-        )
-        .set('kbn-xsrf', 'true')
-        .send();
-
-      expect(comment.type).to.eql('user');
-    });
-  });
-}
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/patch_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/patch_comment.ts
deleted file mode 100644
index b59a248ee07e4..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/comments/patch_comment.ts
+++ /dev/null
@@ -1,414 +0,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 { omit } from 'lodash/fp';
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { CaseResponse, CommentType } from '../../../../../../plugins/cases/common/api';
-import {
-  defaultUser,
-  postCaseReq,
-  postCommentUserReq,
-  postCommentAlertReq,
-} from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-  deleteCases,
-  deleteCasesUserActions,
-  deleteComments,
-} from '../../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('patch_comment', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-      await deleteComments(es);
-      await deleteCasesUserActions(es);
-    });
-
-    it('should return a 400 when the subCaseId parameter is passed', async () => {
-      const { body } = await supertest
-        .patch(`${CASES_URL}/case-id}/comments?subCaseId=value`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: 'id',
-          version: 'version',
-          type: CommentType.alert,
-          alertId: 'test-id',
-          index: 'test-index',
-          rule: {
-            id: 'id',
-            name: 'name',
-          },
-        })
-        .expect(400);
-
-      expect(body.message).to.contain('subCaseId');
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('sub case comments', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('patches a comment for a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        const { body: patchedSubCase }: { body: CaseResponse } = await supertest
-          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const newComment = 'Well I decided to update my comment. So what? Deal with it.';
-        const { body: patchedSubCaseUpdatedComment } = await supertest
-          .patch(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            id: patchedSubCase.comments![1].id,
-            version: patchedSubCase.comments![1].version,
-            comment: newComment,
-            type: CommentType.user,
-          })
-          .expect(200);
-
-        expect(patchedSubCaseUpdatedComment.comments.length).to.be(2);
-        expect(patchedSubCaseUpdatedComment.comments[0].type).to.be(CommentType.generatedAlert);
-        expect(patchedSubCaseUpdatedComment.comments[1].type).to.be(CommentType.user);
-        expect(patchedSubCaseUpdatedComment.comments[1].comment).to.be(newComment);
-      });
-
-      it('fails to update the generated alert comment type', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        await supertest
-          .patch(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            id: caseInfo.comments![0].id,
-            version: caseInfo.comments![0].version,
-            type: CommentType.alert,
-            alertId: 'test-id',
-            index: 'test-index',
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-          })
-          .expect(400);
-      });
-
-      it('fails to update the generated alert comment by using another generated alert comment', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        await supertest
-          .patch(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            id: caseInfo.comments![0].id,
-            version: caseInfo.comments![0].version,
-            type: CommentType.generatedAlert,
-            alerts: [{ _id: 'id1' }],
-            index: 'test-index',
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-          })
-          .expect(400);
-      });
-    });
-
-    it('should patch a comment', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
-      const { body } = await supertest
-        .patch(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: patchedCase.comments[0].id,
-          version: patchedCase.comments[0].version,
-          comment: newComment,
-          type: CommentType.user,
-        })
-        .expect(200);
-
-      expect(body.comments[0].comment).to.eql(newComment);
-      expect(body.comments[0].type).to.eql('user');
-      expect(body.updated_by).to.eql(defaultUser);
-    });
-
-    it('should patch an alert', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentAlertReq)
-        .expect(200);
-
-      const { body } = await supertest
-        .patch(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: patchedCase.comments[0].id,
-          version: patchedCase.comments[0].version,
-          type: CommentType.alert,
-          alertId: 'new-id',
-          index: postCommentAlertReq.index,
-          rule: {
-            id: 'id',
-            name: 'name',
-          },
-        })
-        .expect(200);
-
-      expect(body.comments[0].alertId).to.eql('new-id');
-      expect(body.comments[0].index).to.eql(postCommentAlertReq.index);
-      expect(body.comments[0].type).to.eql('alert');
-      expect(body.updated_by).to.eql(defaultUser);
-    });
-
-    it('unhappy path - 404s when comment is not there', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: 'id',
-          version: 'version',
-          type: CommentType.user,
-          comment: 'comment',
-        })
-        .expect(404);
-    });
-
-    it('unhappy path - 404s when case is not there', async () => {
-      await supertest
-        .patch(`${CASES_URL}/fake-id/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: 'id',
-          version: 'version',
-          type: CommentType.user,
-          comment: 'comment',
-        })
-        .expect(404);
-    });
-
-    it('unhappy path - 400s when trying to change comment type', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      await supertest
-        .patch(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: patchedCase.comments[0].id,
-          version: patchedCase.comments[0].version,
-          type: CommentType.alert,
-          alertId: 'test-id',
-          index: 'test-index',
-          rule: {
-            id: 'id',
-            name: 'name',
-          },
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when missing attributes for type user', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      await supertest
-        .patch(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: patchedCase.comments[0].id,
-          version: patchedCase.comments[0].version,
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when adding excess attributes for type user', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      for (const attribute of ['alertId', 'index']) {
-        await supertest
-          .patch(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            id: patchedCase.comments[0].id,
-            version: patchedCase.comments[0].version,
-            comment: 'a comment',
-            type: CommentType.user,
-            [attribute]: attribute,
-          })
-          .expect(400);
-      }
-    });
-
-    it('unhappy path - 400s when missing attributes for type alert', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const allRequestAttributes = {
-        type: CommentType.alert,
-        index: 'test-index',
-        alertId: 'test-id',
-        rule: {
-          id: 'id',
-          name: 'name',
-        },
-      };
-
-      for (const attribute of ['alertId', 'index']) {
-        const requestAttributes = omit(attribute, allRequestAttributes);
-        await supertest
-          .patch(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            id: patchedCase.comments[0].id,
-            version: patchedCase.comments[0].version,
-            ...requestAttributes,
-          })
-          .expect(400);
-      }
-    });
-
-    it('unhappy path - 400s when adding excess attributes for type alert', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      for (const attribute of ['comment']) {
-        await supertest
-          .patch(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            id: patchedCase.comments[0].id,
-            version: patchedCase.comments[0].version,
-            type: CommentType.alert,
-            index: 'test-index',
-            alertId: 'test-id',
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-            [attribute]: attribute,
-          })
-          .expect(400);
-      }
-    });
-
-    it('unhappy path - 409s when conflict', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
-      await supertest
-        .patch(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          id: patchedCase.comments[0].id,
-          version: 'version-mismatch',
-          type: CommentType.user,
-          comment: newComment,
-        })
-        .expect(409);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/comments/post_comment.ts b/x-pack/test/case_api_integration/basic/tests/cases/comments/post_comment.ts
deleted file mode 100644
index c46698a0905b4..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/comments/post_comment.ts
+++ /dev/null
@@ -1,422 +0,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 { omit } from 'lodash/fp';
-import expect from '@kbn/expect';
-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 { CommentsResponse, CommentType } from '../../../../../../plugins/cases/common/api';
-import {
-  defaultUser,
-  postCaseReq,
-  postCommentUserReq,
-  postCommentAlertReq,
-  postCollectionReq,
-  postCommentGenAlertReq,
-} from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-  deleteCases,
-  deleteCasesUserActions,
-  deleteComments,
-} from '../../../../common/lib/utils';
-import {
-  createSignalsIndex,
-  deleteSignalsIndex,
-  deleteAllAlerts,
-  getRuleForSignalTesting,
-  waitForRuleSuccessOrStatus,
-  waitForSignalsToBePresent,
-  getSignalsByIds,
-  createRule,
-  getQuerySignalIds,
-} from '../../../../../detection_engine_api_integration/utils';
-
-// 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');
-
-  describe('post_comment', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-      await deleteComments(es);
-      await deleteCasesUserActions(es);
-    });
-
-    it('should post a comment', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      expect(patchedCase.comments[0].type).to.eql(postCommentUserReq.type);
-      expect(patchedCase.comments[0].comment).to.eql(postCommentUserReq.comment);
-      expect(patchedCase.updated_by).to.eql(defaultUser);
-    });
-
-    it('should post an alert', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentAlertReq)
-        .expect(200);
-
-      expect(patchedCase.comments[0].type).to.eql(postCommentAlertReq.type);
-      expect(patchedCase.comments[0].alertId).to.eql(postCommentAlertReq.alertId);
-      expect(patchedCase.comments[0].index).to.eql(postCommentAlertReq.index);
-      expect(patchedCase.updated_by).to.eql(defaultUser);
-    });
-
-    it('unhappy path - 400s when type is missing', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          bad: 'comment',
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when missing attributes for type user', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({ type: CommentType.user })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when adding excess attributes for type user', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      for (const attribute of ['alertId', 'index']) {
-        await supertest
-          .post(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({ type: CommentType.user, [attribute]: attribute, comment: 'a comment' })
-          .expect(400);
-      }
-    });
-
-    it('unhappy path - 400s when missing attributes for type alert', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const allRequestAttributes = {
-        type: CommentType.alert,
-        index: 'test-index',
-        alertId: 'test-id',
-        rule: {
-          id: 'id',
-          name: 'name',
-        },
-      };
-
-      for (const attribute of ['alertId', 'index']) {
-        const requestAttributes = omit(attribute, allRequestAttributes);
-        await supertest
-          .post(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send(requestAttributes)
-          .expect(400);
-      }
-    });
-
-    it('unhappy path - 400s when adding excess attributes for type alert', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      for (const attribute of ['comment']) {
-        await supertest
-          .post(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            type: CommentType.alert,
-            [attribute]: attribute,
-            alertId: 'test-id',
-            index: 'test-index',
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-          })
-          .expect(400);
-      }
-    });
-
-    it('unhappy path - 400s when case is missing', async () => {
-      await supertest
-        .post(`${CASES_URL}/not-exists/comments`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          bad: 'comment',
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when adding an alert to a closed case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentAlertReq)
-        .expect(400);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    it.skip('400s when adding an alert to a collection case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCollectionReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentAlertReq)
-        .expect(400);
-    });
-
-    it('400s when adding a generated alert to an individual case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentGenAlertReq)
-        .expect(400);
-    });
-
-    describe('alerts', () => {
-      beforeEach(async () => {
-        await esArchiver.load('auditbeat/hosts');
-        await createSignalsIndex(supertest);
-      });
-
-      afterEach(async () => {
-        await deleteSignalsIndex(supertest);
-        await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
-      });
-
-      it('should change the status of the alert if sync alert is on', async () => {
-        const rule = getRuleForSignalTesting(['auditbeat-*']);
-
-        const { body: postedCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq)
-          .expect(200);
-
-        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, rule);
-        await waitForRuleSuccessOrStatus(supertest, id);
-        await waitForSignalsToBePresent(supertest, 1, [id]);
-        const signals = await getSignalsByIds(supertest, [id]);
-
-        const alert = signals.hits.hits[0];
-        expect(alert._source.signal.status).eql('open');
-
-        await supertest
-          .post(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            alertId: alert._id,
-            index: alert._index,
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-            type: CommentType.alert,
-          })
-          .expect(200);
-
-        const { body: updatedAlert } = await supertest
-          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-          .set('kbn-xsrf', 'true')
-          .send(getQuerySignalIds([alert._id]))
-          .expect(200);
-
-        expect(updatedAlert.hits.hits[0]._source.signal.status).eql('in-progress');
-      });
-
-      it('should NOT change the status of the alert if sync alert is off', async () => {
-        const rule = getRuleForSignalTesting(['auditbeat-*']);
-
-        const { body: postedCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({ ...postCaseReq, settings: { syncAlerts: false } })
-          .expect(200);
-
-        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, rule);
-        await waitForRuleSuccessOrStatus(supertest, id);
-        await waitForSignalsToBePresent(supertest, 1, [id]);
-        const signals = await getSignalsByIds(supertest, [id]);
-
-        const alert = signals.hits.hits[0];
-        expect(alert._source.signal.status).eql('open');
-
-        await supertest
-          .post(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            alertId: alert._id,
-            index: alert._index,
-            rule: {
-              id: 'id',
-              name: 'name',
-            },
-            type: CommentType.alert,
-          })
-          .expect(200);
-
-        const { body: updatedAlert } = await supertest
-          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-          .set('kbn-xsrf', 'true')
-          .send(getQuerySignalIds([alert._id]))
-          .expect(200);
-
-        expect(updatedAlert.hits.hits[0]._source.signal.status).eql('open');
-      });
-    });
-
-    it('should return a 400 when passing the subCaseId', async () => {
-      const { body } = await supertest
-        .post(`${CASES_URL}/case-id/comments?subCaseId=value`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(400);
-      expect(body.message).to.contain('subCaseId');
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('sub case comments', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('posts a new comment for a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        // create another sub case just to make sure we get the right comments
-        await createSubCase({ supertest, actionID });
-        await supertest
-          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const { body: subCaseComments }: { body: CommentsResponse } = await supertest
-          .get(`${CASES_URL}/${caseInfo.id}/comments/_find?subCaseId=${caseInfo.subCases![0].id}`)
-          .send()
-          .expect(200);
-        expect(subCaseComments.total).to.be(2);
-        expect(subCaseComments.comments[0].type).to.be(CommentType.generatedAlert);
-        expect(subCaseComments.comments[1].type).to.be(CommentType.user);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/delete_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/delete_cases.ts
deleted file mode 100644
index 706fded263282..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/delete_cases.ts
+++ /dev/null
@@ -1,151 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../plugins/cases/common/constants';
-import { postCaseReq, postCommentUserReq } from '../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-  deleteCases,
-  deleteCasesUserActions,
-  deleteComments,
-} from '../../../common/lib/utils';
-import { getSubCaseDetailsUrl } from '../../../../../plugins/cases/common/api/helpers';
-import { CaseResponse } from '../../../../../plugins/cases/common/api';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('delete_cases', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-      await deleteComments(es);
-      await deleteCasesUserActions(es);
-    });
-
-    it('should delete a case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body } = await supertest
-        .delete(`${CASES_URL}?ids=["${postedCase.id}"]`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(204);
-
-      expect(body).to.eql({});
-    });
-
-    it(`should delete a case's comments when that case gets deleted`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      await supertest
-        .get(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      await supertest
-        .delete(`${CASES_URL}?ids=["${postedCase.id}"]`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(204);
-
-      await supertest
-        .get(`${CASES_URL}/${postedCase.id}/comments/${patchedCase.comments[0].id}`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(404);
-    });
-
-    it('unhappy path - 404s when case is not there', async () => {
-      await supertest
-        .delete(`${CASES_URL}?ids=["fake-id"]`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(404);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('sub cases', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('should delete the sub cases when deleting a collection', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
-
-        const { body } = await supertest
-          .delete(`${CASES_URL}?ids=["${caseInfo.id}"]`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(204);
-
-        expect(body).to.eql({});
-        await supertest
-          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
-          .send()
-          .expect(404);
-      });
-
-      it(`should delete a sub case's comments when that case gets deleted`, async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
-
-        // there should be two comments on the sub case now
-        const { body: patchedCaseWithSubCase }: { body: CaseResponse } = await supertest
-          .post(`${CASES_URL}/${caseInfo.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .query({ subCaseId: caseInfo.subCases![0].id })
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const subCaseCommentUrl = `${CASES_URL}/${patchedCaseWithSubCase.id}/comments/${
-          patchedCaseWithSubCase.comments![1].id
-        }`;
-        // make sure we can get the second comment
-        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(200);
-
-        await supertest
-          .delete(`${CASES_URL}?ids=["${caseInfo.id}"]`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(204);
-
-        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(404);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/find_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/find_cases.ts
deleted file mode 100644
index 0166ad2e8ee7f..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/find_cases.ts
+++ /dev/null
@@ -1,667 +0,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 expect from '@kbn/expect';
-import supertestAsPromised from 'supertest-as-promised';
-import type { ApiResponse, estypes } from '@elastic/elasticsearch';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-import { CASES_URL, SUB_CASES_PATCH_DEL_URL } from '../../../../../plugins/cases/common/constants';
-import { postCaseReq, postCommentUserReq, findCasesResp } from '../../../common/lib/mock';
-import {
-  deleteAllCaseItems,
-  createSubCase,
-  setStatus,
-  CreateSubCaseResp,
-  createCaseAction,
-  deleteCaseAction,
-} from '../../../common/lib/utils';
-import { CasesFindResponse, CaseStatuses, CaseType } from '../../../../../plugins/cases/common/api';
-
-interface CaseAttributes {
-  cases: {
-    title: string;
-  };
-}
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-  describe('find_cases', () => {
-    describe('basic tests', () => {
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('should return empty response', async () => {
-        const { body } = await supertest
-          .get(`${CASES_URL}/_find`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).to.eql(findCasesResp);
-      });
-
-      it('should return cases', async () => {
-        const { body: a } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq)
-          .expect(200);
-
-        const { body: b } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq)
-          .expect(200);
-
-        const { body: c } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq)
-          .expect(200);
-
-        const { body } = await supertest
-          .get(`${CASES_URL}/_find?sortOrder=asc`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).to.eql({
-          ...findCasesResp,
-          total: 3,
-          cases: [a, b, c],
-          count_open_cases: 3,
-        });
-      });
-
-      it('filters by tags', async () => {
-        await supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq);
-        const { body: postedCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({ ...postCaseReq, tags: ['unique'] })
-          .expect(200);
-
-        const { body } = await supertest
-          .get(`${CASES_URL}/_find?sortOrder=asc&tags=unique`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).to.eql({
-          ...findCasesResp,
-          total: 1,
-          cases: [postedCase],
-          count_open_cases: 1,
-        });
-      });
-
-      it('filters by status', async () => {
-        const { body: openCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq);
-
-        const { body: toCloseCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq);
-
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: toCloseCase.id,
-                version: toCloseCase.version,
-                status: 'closed',
-              },
-            ],
-          })
-          .expect(200);
-
-        const { body } = await supertest
-          .get(`${CASES_URL}/_find?sortOrder=asc&status=open`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).to.eql({
-          ...findCasesResp,
-          total: 1,
-          cases: [openCase],
-          count_open_cases: 1,
-          count_closed_cases: 1,
-          count_in_progress_cases: 0,
-        });
-      });
-
-      it('filters by reporters', async () => {
-        const { body: postedCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq);
-
-        const { body } = await supertest
-          .get(`${CASES_URL}/_find?sortOrder=asc&reporters=elastic`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).to.eql({
-          ...findCasesResp,
-          total: 1,
-          cases: [postedCase],
-          count_open_cases: 1,
-        });
-      });
-
-      it('correctly counts comments', async () => {
-        const { body: postedCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq)
-          .expect(200);
-
-        // post 2 comments
-        await supertest
-          .post(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const { body: patchedCase } = await supertest
-          .post(`${CASES_URL}/${postedCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const { body } = await supertest
-          .get(`${CASES_URL}/_find?sortOrder=asc`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).to.eql({
-          ...findCasesResp,
-          total: 1,
-          cases: [
-            {
-              ...patchedCase,
-              comments: [],
-              totalComment: 2,
-            },
-          ],
-          count_open_cases: 1,
-        });
-      });
-
-      it('correctly counts open/closed/in-progress', async () => {
-        await supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq);
-
-        const { body: inProgreeCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq);
-
-        const { body: postedCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send(postCaseReq)
-          .expect(200);
-
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: postedCase.id,
-                version: postedCase.version,
-                status: 'closed',
-              },
-            ],
-          })
-          .expect(200);
-
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: inProgreeCase.id,
-                version: inProgreeCase.version,
-                status: 'in-progress',
-              },
-            ],
-          })
-          .expect(200);
-
-        const { body } = await supertest
-          .get(`${CASES_URL}/_find?sortOrder=asc`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body.count_open_cases).to.eql(1);
-        expect(body.count_closed_cases).to.eql(1);
-        expect(body.count_in_progress_cases).to.eql(1);
-      });
-
-      it('unhappy path - 400s when bad query supplied', async () => {
-        await supertest
-          .get(`${CASES_URL}/_find?perPage=true`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(400);
-      });
-
-      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-      describe.skip('stats with sub cases', () => {
-        let collection: CreateSubCaseResp;
-        let actionID: string;
-        before(async () => {
-          actionID = await createCaseAction(supertest);
-        });
-        after(async () => {
-          await deleteCaseAction(supertest, actionID);
-        });
-        beforeEach(async () => {
-          // create a collection with a sub case that is marked as open
-          collection = await createSubCase({ supertest, actionID });
-
-          const [, , { body: toCloseCase }] = await Promise.all([
-            // set the sub case to in-progress
-            setStatus({
-              supertest,
-              cases: [
-                {
-                  id: collection.newSubCaseInfo.subCases![0].id,
-                  version: collection.newSubCaseInfo.subCases![0].version,
-                  status: CaseStatuses['in-progress'],
-                },
-              ],
-              type: 'sub_case',
-            }),
-            // create two cases that are both open
-            supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq),
-            supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq),
-          ]);
-
-          // set the third case to closed
-          await setStatus({
-            supertest,
-            cases: [
-              {
-                id: toCloseCase.id,
-                version: toCloseCase.version,
-                status: CaseStatuses.closed,
-              },
-            ],
-            type: 'case',
-          });
-        });
-        it('correctly counts stats without using a filter', async () => {
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc`)
-            .expect(200);
-
-          expect(body.total).to.eql(3);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(1);
-        });
-
-        it('correctly counts stats with a filter for open cases', async () => {
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc&status=open`)
-            .expect(200);
-
-          expect(body.cases.length).to.eql(1);
-
-          // since we're filtering on status and the collection only has an in-progress case, it should only return the
-          // individual case that has the open status and no collections
-          // ENABLE_CASE_CONNECTOR: this value is not correct because it includes a collection
-          // that does not have an open case. This is a known issue and will need to be resolved
-          // when this issue is addressed: https://github.com/elastic/kibana/issues/94115
-          expect(body.total).to.eql(2);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(1);
-        });
-
-        it('correctly counts stats with a filter for individual cases', async () => {
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc&type=${CaseType.individual}`)
-            .expect(200);
-
-          expect(body.total).to.eql(2);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('correctly counts stats with a filter for collection cases with multiple sub cases', async () => {
-          // this will force the first sub case attached to the collection to be closed
-          // so we'll have one closed sub case and one open sub case
-          await createSubCase({ supertest, caseID: collection.newSubCaseInfo.id, actionID });
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc&type=${CaseType.collection}`)
-            .expect(200);
-
-          expect(body.total).to.eql(1);
-          expect(body.cases[0].subCases?.length).to.eql(2);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('correctly counts stats with a filter for collection and open cases with multiple sub cases', async () => {
-          // this will force the first sub case attached to the collection to be closed
-          // so we'll have one closed sub case and one open sub case
-          await createSubCase({ supertest, caseID: collection.newSubCaseInfo.id, actionID });
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(
-              `${CASES_URL}/_find?sortOrder=asc&type=${CaseType.collection}&status=${CaseStatuses.open}`
-            )
-            .expect(200);
-
-          expect(body.total).to.eql(1);
-          expect(body.cases[0].subCases?.length).to.eql(1);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('correctly counts stats including a collection without sub cases when not filtering on status', async () => {
-          // delete the sub case on the collection so that it doesn't have any sub cases
-          await supertest
-            .delete(
-              `${SUB_CASES_PATCH_DEL_URL}?ids=["${collection.newSubCaseInfo.subCases![0].id}"]`
-            )
-            .set('kbn-xsrf', 'true')
-            .send()
-            .expect(204);
-
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc`)
-            .expect(200);
-
-          // it should include the collection without sub cases because we did not pass in a filter on status
-          expect(body.total).to.eql(3);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('correctly counts stats including a collection without sub cases when filtering on tags', async () => {
-          // delete the sub case on the collection so that it doesn't have any sub cases
-          await supertest
-            .delete(
-              `${SUB_CASES_PATCH_DEL_URL}?ids=["${collection.newSubCaseInfo.subCases![0].id}"]`
-            )
-            .set('kbn-xsrf', 'true')
-            .send()
-            .expect(204);
-
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc&tags=defacement`)
-            .expect(200);
-
-          // it should include the collection without sub cases because we did not pass in a filter on status
-          expect(body.total).to.eql(3);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('does not return collections without sub cases matching the requested status', async () => {
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc&status=closed`)
-            .expect(200);
-
-          expect(body.cases.length).to.eql(1);
-          // it should not include the collection that has a sub case as in-progress
-          // ENABLE_CASE_CONNECTOR: this value is not correct because it includes collections. This short term
-          // fix for when sub cases are not enabled. When the feature is completed the _find API
-          // will need to be fixed as explained in this ticket: https://github.com/elastic/kibana/issues/94115
-          expect(body.total).to.eql(2);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(1);
-        });
-
-        it('does not return empty collections when filtering on status', async () => {
-          // delete the sub case on the collection so that it doesn't have any sub cases
-          await supertest
-            .delete(
-              `${SUB_CASES_PATCH_DEL_URL}?ids=["${collection.newSubCaseInfo.subCases![0].id}"]`
-            )
-            .set('kbn-xsrf', 'true')
-            .send()
-            .expect(204);
-
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find?sortOrder=asc&status=closed`)
-            .expect(200);
-
-          expect(body.cases.length).to.eql(1);
-
-          // ENABLE_CASE_CONNECTOR: this value is not correct because it includes collections. This short term
-          // fix for when sub cases are not enabled. When the feature is completed the _find API
-          // will need to be fixed as explained in this ticket: https://github.com/elastic/kibana/issues/94115
-          expect(body.total).to.eql(2);
-          expect(body.count_closed_cases).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-      });
-    });
-
-    describe('find_cases pagination', () => {
-      const numCases = 10;
-      before(async () => {
-        await createCasesWithTitleAsNumber(numCases);
-      });
-
-      after(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      const createCasesWithTitleAsNumber = async (total: number) => {
-        const responsePromises: supertestAsPromised.Test[] = [];
-        for (let i = 0; i < total; i++) {
-          // this doesn't guarantee that the cases will be created in order that the for-loop executes,
-          // for example case with title '2', could be created before the case with title '1' since we're doing a promise all here
-          // A promise all is just much faster than doing it one by one which would have guaranteed that the cases are
-          // created in the order that the for-loop executes
-          responsePromises.push(
-            supertest
-              .post(CASES_URL)
-              .set('kbn-xsrf', 'true')
-              .send({ ...postCaseReq, title: `${i}` })
-          );
-        }
-        const responses = await Promise.all(responsePromises);
-        return responses.map((response) => response.body);
-      };
-
-      /**
-       * This is used to retrieve all the cases in the same sorted order that we're expecting them to come back via the
-       * _find API so that we have a more true comparison instead of using the _find API to get all the cases which
-       * could mangle the results if the implementation had a bug.
-       *
-       * Ideally we could enforce how the cases are created in reasonable time, waiting for each api call to finish takes
-       * around 30 seconds which seemed too slow
-       */
-      const getAllCasesSortedByCreatedAtAsc = async () => {
-        const cases: ApiResponse<estypes.SearchResponse<CaseAttributes>> = await es.search({
-          index: '.kibana',
-          body: {
-            size: 10000,
-            sort: [{ 'cases.created_at': { unmapped_type: 'date', order: 'asc' } }],
-            query: {
-              term: { type: 'cases' },
-            },
-          },
-        });
-        return cases.body.hits.hits.map((hit) => hit._source);
-      };
-
-      it('returns the correct total when perPage is less than the total', async () => {
-        const { body }: { body: CasesFindResponse } = await supertest
-          .get(`${CASES_URL}/_find`)
-          .query({
-            sortOrder: 'asc',
-            page: 1,
-            perPage: 5,
-          })
-          .set('kbn-xsrf', 'true')
-          .expect(200);
-
-        expect(body.cases.length).to.eql(5);
-        expect(body.total).to.eql(10);
-        expect(body.page).to.eql(1);
-        expect(body.per_page).to.eql(5);
-        expect(body.count_open_cases).to.eql(10);
-        expect(body.count_closed_cases).to.eql(0);
-        expect(body.count_in_progress_cases).to.eql(0);
-      });
-
-      it('returns the correct total when perPage is greater than the total', async () => {
-        const { body }: { body: CasesFindResponse } = await supertest
-          .get(`${CASES_URL}/_find`)
-          .query({
-            sortOrder: 'asc',
-            page: 1,
-            perPage: 11,
-          })
-          .set('kbn-xsrf', 'true')
-          .expect(200);
-
-        expect(body.total).to.eql(10);
-        expect(body.page).to.eql(1);
-        expect(body.per_page).to.eql(11);
-        expect(body.cases.length).to.eql(10);
-        expect(body.count_open_cases).to.eql(10);
-        expect(body.count_closed_cases).to.eql(0);
-        expect(body.count_in_progress_cases).to.eql(0);
-      });
-
-      it('returns the correct total when perPage is equal to the total', async () => {
-        const { body }: { body: CasesFindResponse } = await supertest
-          .get(`${CASES_URL}/_find`)
-          .query({
-            sortOrder: 'asc',
-            page: 1,
-            perPage: 10,
-          })
-          .set('kbn-xsrf', 'true')
-          .expect(200);
-
-        expect(body.total).to.eql(10);
-        expect(body.page).to.eql(1);
-        expect(body.per_page).to.eql(10);
-        expect(body.cases.length).to.eql(10);
-        expect(body.count_open_cases).to.eql(10);
-        expect(body.count_closed_cases).to.eql(0);
-        expect(body.count_in_progress_cases).to.eql(0);
-      });
-
-      it('returns the second page of results', async () => {
-        const perPage = 5;
-        const { body }: { body: CasesFindResponse } = await supertest
-          .get(`${CASES_URL}/_find`)
-          .query({
-            sortOrder: 'asc',
-            page: 2,
-            perPage,
-          })
-          .set('kbn-xsrf', 'true')
-          .expect(200);
-
-        expect(body.total).to.eql(10);
-        expect(body.page).to.eql(2);
-        expect(body.per_page).to.eql(5);
-        expect(body.cases.length).to.eql(5);
-        expect(body.count_open_cases).to.eql(10);
-        expect(body.count_closed_cases).to.eql(0);
-        expect(body.count_in_progress_cases).to.eql(0);
-
-        const allCases = await getAllCasesSortedByCreatedAtAsc();
-
-        body.cases.map((caseInfo, index) => {
-          // we started on the second page of 10 cases with a perPage of 5, so the first case should 0 + 5 (index + perPage)
-          expect(caseInfo.title).to.eql(allCases[index + perPage]?.cases.title);
-        });
-      });
-
-      it('paginates with perPage of 2 through 10 total cases', async () => {
-        const total = 10;
-        const perPage = 2;
-
-        // it's less than or equal here because the page starts at 1, so page 5 is a valid page number
-        // and should have case titles 9, and 10
-        for (let currentPage = 1; currentPage <= total / perPage; currentPage++) {
-          const { body }: { body: CasesFindResponse } = await supertest
-            .get(`${CASES_URL}/_find`)
-            .query({
-              sortOrder: 'asc',
-              page: currentPage,
-              perPage,
-            })
-            .set('kbn-xsrf', 'true')
-            .expect(200);
-
-          expect(body.total).to.eql(total);
-          expect(body.page).to.eql(currentPage);
-          expect(body.per_page).to.eql(perPage);
-          expect(body.cases.length).to.eql(perPage);
-          expect(body.count_open_cases).to.eql(total);
-          expect(body.count_closed_cases).to.eql(0);
-          expect(body.count_in_progress_cases).to.eql(0);
-
-          const allCases = await getAllCasesSortedByCreatedAtAsc();
-
-          body.cases.map((caseInfo, index) => {
-            // for page 1, the cases tiles should be 0,1,2 for page 2: 3,4,5 etc (assuming the titles were sorted
-            // correctly)
-            expect(caseInfo.title).to.eql(
-              allCases[index + perPage * (currentPage - 1)]?.cases.title
-            );
-          });
-        }
-      });
-
-      it('retrieves the last three cases', async () => {
-        const { body }: { body: CasesFindResponse } = await supertest
-          .get(`${CASES_URL}/_find`)
-          .query({
-            sortOrder: 'asc',
-            // this should skip the first 7 cases and only return the last 3
-            page: 2,
-            perPage: 7,
-          })
-          .set('kbn-xsrf', 'true')
-          .expect(200);
-
-        expect(body.total).to.eql(10);
-        expect(body.page).to.eql(2);
-        expect(body.per_page).to.eql(7);
-        expect(body.cases.length).to.eql(3);
-        expect(body.count_open_cases).to.eql(10);
-        expect(body.count_closed_cases).to.eql(0);
-        expect(body.count_in_progress_cases).to.eql(0);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/get_case.ts b/x-pack/test/case_api_integration/basic/tests/cases/get_case.ts
deleted file mode 100644
index 43bd7a616e729..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/get_case.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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../plugins/cases/common/constants';
-import {
-  postCaseReq,
-  postCaseResp,
-  removeServerGeneratedPropertiesFromCase,
-} from '../../../common/lib/mock';
-import { deleteCases } from '../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_case', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-    });
-
-    it('should return a case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromCase(body);
-      expect(data).to.eql(postCaseResp(postedCase.id));
-    });
-
-    it('should return a 400 when passing the includeSubCaseComments', async () => {
-      const { body } = await supertest
-        .get(`${CASES_URL}/case-id?includeSubCaseComments=true`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(400);
-
-      expect(body.message).to.contain('subCaseId');
-    });
-
-    it('unhappy path - 404s when case is not there', async () => {
-      await supertest.get(`${CASES_URL}/fake-id`).set('kbn-xsrf', 'true').send().expect(404);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/migrations.ts b/x-pack/test/case_api_integration/basic/tests/cases/migrations.ts
deleted file mode 100644
index abbb749a2aaca..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/migrations.ts
+++ /dev/null
@@ -1,111 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../common/ftr_provider_context';
-import { CASES_URL } from '../../../../../plugins/cases/common/constants';
-
-// eslint-disable-next-line import/no-default-export
-export default function createGetTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-
-  describe('migrations', () => {
-    // tests upgrading a 7.10.0 saved object to the latest version
-    describe('7.10.0 -> latest stack version', () => {
-      before(async () => {
-        await esArchiver.load('cases/migrations/7.10.0');
-      });
-
-      after(async () => {
-        await esArchiver.unload('cases/migrations/7.10.0');
-      });
-
-      it('migrates cases connector', async () => {
-        const { body } = await supertest
-          .get(`${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).key('connector');
-        expect(body).not.key('connector_id');
-        expect(body.connector).to.eql({
-          id: 'connector-1',
-          name: 'none',
-          type: '.none',
-          fields: null,
-        });
-      });
-
-      it('migrates cases settings', async () => {
-        const { body } = await supertest
-          .get(`${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).key('settings');
-        expect(body.settings).to.eql({
-          syncAlerts: true,
-        });
-      });
-    });
-
-    // tests upgrading a 7.11.1 saved object to the latest version
-    describe('7.11.1 -> latest stack version', () => {
-      before(async () => {
-        await esArchiver.load('cases/migrations/7.11.1');
-      });
-
-      after(async () => {
-        await esArchiver.unload('cases/migrations/7.11.1');
-      });
-
-      it('adds rule info to only alert comments for 7.12', async () => {
-        const caseID = '2ea28c10-7855-11eb-9ca6-83ec5acb735f';
-        // user comment
-        let { body } = await supertest
-          .get(`${CASES_URL}/${caseID}/comments/34a20a00-7855-11eb-9ca6-83ec5acb735f`)
-          .expect(200);
-
-        expect(body).not.key('rule');
-        expect(body.rule).to.eql(undefined);
-
-        // alert comment
-        ({ body } = await supertest
-          .get(`${CASES_URL}/${caseID}/comments/3178f2b0-7857-11eb-9ca6-83ec5acb735f`)
-          .expect(200));
-
-        expect(body).key('rule');
-        expect(body.rule).to.eql({ id: null, name: null });
-      });
-
-      it('adds category and subcategory to the ITSM connector', async () => {
-        const { body } = await supertest
-          .get(`${CASES_URL}/6f973440-7abd-11eb-9ca6-83ec5acb735f`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(body).key('connector');
-        expect(body.connector).to.eql({
-          id: '444ebab0-7abd-11eb-9ca6-83ec5acb735f',
-          name: 'SN',
-          type: '.servicenow',
-          fields: {
-            impact: '2',
-            severity: '2',
-            urgency: '2',
-            category: null,
-            subcategory: null,
-          },
-        });
-      });
-    });
-  });
-}
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/patch_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/patch_cases.ts
deleted file mode 100644
index f43b47da19ade..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/patch_cases.ts
+++ /dev/null
@@ -1,935 +0,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 expect from '@kbn/expect';
-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 {
-  CasesResponse,
-  CaseStatuses,
-  CaseType,
-  CommentType,
-} from '../../../../../plugins/cases/common/api';
-import {
-  defaultUser,
-  postCaseReq,
-  postCaseResp,
-  postCollectionReq,
-  postCommentAlertReq,
-  postCommentUserReq,
-  removeServerGeneratedPropertiesFromCase,
-} from '../../../common/lib/mock';
-import { deleteAllCaseItems, getSignalsWithES, setStatus } from '../../../common/lib/utils';
-import {
-  createSignalsIndex,
-  deleteSignalsIndex,
-  deleteAllAlerts,
-  getRuleForSignalTesting,
-  waitForRuleSuccessOrStatus,
-  waitForSignalsToBePresent,
-  getSignalsByIds,
-  createRule,
-  getQuerySignalIds,
-} from '../../../../detection_engine_api_integration/utils';
-
-// 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');
-
-  describe('patch_cases', () => {
-    afterEach(async () => {
-      await deleteAllCaseItems(es);
-    });
-
-    it('should patch a case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCases } = await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
-      expect(data).to.eql({
-        ...postCaseResp(postedCase.id),
-        closed_by: defaultUser,
-        status: 'closed',
-        updated_by: defaultUser,
-      });
-    });
-
-    it('should patch a case with new connector', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCases } = await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              connector: {
-                id: 'jira',
-                name: 'Jira',
-                type: '.jira',
-                fields: { issueType: 'Task', priority: null, parent: null },
-              },
-            },
-          ],
-        })
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
-      expect(data).to.eql({
-        ...postCaseResp(postedCase.id),
-        connector: {
-          id: 'jira',
-          name: 'Jira',
-          type: '.jira',
-          fields: { issueType: 'Task', priority: null, parent: null },
-        },
-        updated_by: defaultUser,
-      });
-    });
-
-    it('unhappy path - 404s when case is not there', async () => {
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: 'not-real',
-              version: 'version',
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(404);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    it.skip('should 400 and not allow converting a collection back to an individual case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCollectionReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              type: CaseType.individual,
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    it.skip('should allow converting an individual case to a collection when it does not have alerts', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: patchedCase.id,
-              version: patchedCase.version,
-              type: CaseType.collection,
-            },
-          ],
-        })
-        .expect(200);
-    });
-
-    it('should 400 when attempting to update an individual case to a collection when it has alerts attached to it', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentAlertReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: patchedCase.id,
-              version: patchedCase.version,
-              type: CaseType.collection,
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    it('should 400 when attempting to update the case type when the case connector feature is disabled', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              type: CaseType.collection,
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    it.skip("should 400 when attempting to update a collection case's status", async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCollectionReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 406s when excess data sent', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              badKey: 'closed',
-            },
-          ],
-        })
-        .expect(406);
-    });
-
-    it('unhappy path - 400s when bad data sent', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: true,
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when unsupported status sent', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: 'not-supported',
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when bad connector type sent', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              connector: { id: 'none', name: 'none', type: '.not-exists', fields: null },
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when bad connector sent', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              connector: {
-                id: 'none',
-                name: 'none',
-                type: '.jira',
-                fields: { unsupported: 'value' },
-              },
-            },
-          ],
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 409s when conflict', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(`${CASES_URL}`)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: 'version',
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(409);
-    });
-
-    describe('alerts', () => {
-      describe('esArchiver', () => {
-        const defaultSignalsIndex = '.siem-signals-default-000001';
-
-        beforeEach(async () => {
-          await esArchiver.load('cases/signals/default');
-        });
-        afterEach(async () => {
-          await esArchiver.unload('cases/signals/default');
-          await deleteAllCaseItems(es);
-        });
-
-        it('should update the status of multiple alerts attached to multiple cases', async () => {
-          const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
-          const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
-
-          const { body: individualCase1 } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              ...postCaseReq,
-              settings: {
-                syncAlerts: false,
-              },
-            });
-
-          const { body: updatedInd1WithComment } = await supertest
-            .post(`${CASES_URL}/${individualCase1.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: signalID,
-              index: defaultSignalsIndex,
-              rule: { id: 'test-rule-id', name: 'test-index-id' },
-              type: CommentType.alert,
-            })
-            .expect(200);
-
-          const { body: individualCase2 } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              ...postCaseReq,
-              settings: {
-                syncAlerts: false,
-              },
-            });
-
-          const { body: updatedInd2WithComment } = await supertest
-            .post(`${CASES_URL}/${individualCase2.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: signalID2,
-              index: defaultSignalsIndex,
-              rule: { id: 'test-rule-id', name: 'test-index-id' },
-              type: CommentType.alert,
-            })
-            .expect(200);
-
-          await es.indices.refresh({ index: defaultSignalsIndex });
-
-          let signals = await getSignalsWithES({
-            es,
-            indices: defaultSignalsIndex,
-            ids: [signalID, signalID2],
-          });
-
-          // There should be no change in their status since syncing is disabled
-          expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-            CaseStatuses.open
-          );
-          expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-            CaseStatuses.open
-          );
-
-          const updatedIndWithStatus: CasesResponse = (await setStatus({
-            supertest,
-            cases: [
-              {
-                id: updatedInd1WithComment.id,
-                version: updatedInd1WithComment.version,
-                status: CaseStatuses.closed,
-              },
-              {
-                id: updatedInd2WithComment.id,
-                version: updatedInd2WithComment.version,
-                status: CaseStatuses['in-progress'],
-              },
-            ],
-            type: 'case',
-          })) as CasesResponse;
-
-          await es.indices.refresh({ index: defaultSignalsIndex });
-
-          signals = await getSignalsWithES({
-            es,
-            indices: defaultSignalsIndex,
-            ids: [signalID, signalID2],
-          });
-
-          // There should still be no change in their status since syncing is disabled
-          expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-            CaseStatuses.open
-          );
-          expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-            CaseStatuses.open
-          );
-
-          // turn on the sync settings
-          await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: updatedIndWithStatus.map((caseInfo) => ({
-                id: caseInfo.id,
-                version: caseInfo.version,
-                settings: { syncAlerts: true },
-              })),
-            })
-            .expect(200);
-
-          await es.indices.refresh({ index: defaultSignalsIndex });
-
-          signals = await getSignalsWithES({
-            es,
-            indices: defaultSignalsIndex,
-            ids: [signalID, signalID2],
-          });
-
-          // alerts should be updated now that the
-          expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-            CaseStatuses.closed
-          );
-          expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-            CaseStatuses['in-progress']
-          );
-        });
-      });
-
-      describe('esArchiver', () => {
-        const defaultSignalsIndex = '.siem-signals-default-000001';
-
-        beforeEach(async () => {
-          await esArchiver.load('cases/signals/duplicate_ids');
-        });
-        afterEach(async () => {
-          await esArchiver.unload('cases/signals/duplicate_ids');
-          await deleteAllCaseItems(es);
-        });
-
-        it('should not update the status of duplicate alert ids in separate indices', async () => {
-          const getSignals = async () => {
-            return getSignalsWithES({
-              es,
-              indices: [defaultSignalsIndex, signalsIndex2],
-              ids: [signalIDInFirstIndex, signalIDInSecondIndex],
-            });
-          };
-
-          // this id exists only in .siem-signals-default-000001
-          const signalIDInFirstIndex =
-            'cae78067e65582a3b277c1ad46ba3cb29044242fe0d24bbf3fcde757fdd31d1c';
-          // This id exists in both .siem-signals-default-000001 and .siem-signals-default-000002
-          const signalIDInSecondIndex = 'duplicate-signal-id';
-          const signalsIndex2 = '.siem-signals-default-000002';
-
-          const { body: individualCase } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              ...postCaseReq,
-              settings: {
-                syncAlerts: false,
-              },
-            });
-
-          const { body: updatedIndWithComment } = await supertest
-            .post(`${CASES_URL}/${individualCase.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: signalIDInFirstIndex,
-              index: defaultSignalsIndex,
-              rule: { id: 'test-rule-id', name: 'test-index-id' },
-              type: CommentType.alert,
-            })
-            .expect(200);
-
-          const { body: updatedIndWithComment2 } = await supertest
-            .post(`${CASES_URL}/${updatedIndWithComment.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: signalIDInSecondIndex,
-              index: signalsIndex2,
-              rule: { id: 'test-rule-id', name: 'test-index-id' },
-              type: CommentType.alert,
-            })
-            .expect(200);
-
-          await es.indices.refresh({ index: defaultSignalsIndex });
-
-          let signals = await getSignals();
-          // There should be no change in their status since syncing is disabled
-          expect(
-            signals.get(defaultSignalsIndex)?.get(signalIDInFirstIndex)?._source?.signal.status
-          ).to.be(CaseStatuses.open);
-          expect(
-            signals.get(signalsIndex2)?.get(signalIDInSecondIndex)?._source?.signal.status
-          ).to.be(CaseStatuses.open);
-
-          const updatedIndWithStatus: CasesResponse = (await setStatus({
-            supertest,
-            cases: [
-              {
-                id: updatedIndWithComment2.id,
-                version: updatedIndWithComment2.version,
-                status: CaseStatuses.closed,
-              },
-            ],
-            type: 'case',
-          })) as CasesResponse;
-
-          await es.indices.refresh({ index: defaultSignalsIndex });
-
-          signals = await getSignals();
-
-          // There should still be no change in their status since syncing is disabled
-          expect(
-            signals.get(defaultSignalsIndex)?.get(signalIDInFirstIndex)?._source?.signal.status
-          ).to.be(CaseStatuses.open);
-          expect(
-            signals.get(signalsIndex2)?.get(signalIDInSecondIndex)?._source?.signal.status
-          ).to.be(CaseStatuses.open);
-
-          // turn on the sync settings
-          await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: [
-                {
-                  id: updatedIndWithStatus[0].id,
-                  version: updatedIndWithStatus[0].version,
-                  settings: { syncAlerts: true },
-                },
-              ],
-            })
-            .expect(200);
-          await es.indices.refresh({ index: defaultSignalsIndex });
-
-          signals = await getSignals();
-
-          // alerts should be updated now that the
-          expect(
-            signals.get(defaultSignalsIndex)?.get(signalIDInFirstIndex)?._source?.signal.status
-          ).to.be(CaseStatuses.closed);
-          expect(
-            signals.get(signalsIndex2)?.get(signalIDInSecondIndex)?._source?.signal.status
-          ).to.be(CaseStatuses.closed);
-
-          // the duplicate signal id in the other index should not be affect (so its status should be open)
-          expect(
-            signals.get(defaultSignalsIndex)?.get(signalIDInSecondIndex)?._source?.signal.status
-          ).to.be(CaseStatuses.open);
-        });
-      });
-
-      describe('detections rule', () => {
-        beforeEach(async () => {
-          await esArchiver.load('auditbeat/hosts');
-          await createSignalsIndex(supertest);
-        });
-
-        afterEach(async () => {
-          await deleteSignalsIndex(supertest);
-          await deleteAllAlerts(supertest);
-          await esArchiver.unload('auditbeat/hosts');
-        });
-
-        it('updates alert status when the status is updated and syncAlerts=true', async () => {
-          const rule = getRuleForSignalTesting(['auditbeat-*']);
-
-          const { body: postedCase } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send(postCaseReq)
-            .expect(200);
-
-          const { id } = await createRule(supertest, rule);
-          await waitForRuleSuccessOrStatus(supertest, id);
-          await waitForSignalsToBePresent(supertest, 1, [id]);
-          const signals = await getSignalsByIds(supertest, [id]);
-
-          const alert = signals.hits.hits[0];
-          expect(alert._source.signal.status).eql('open');
-
-          const { body: caseUpdated } = await supertest
-            .post(`${CASES_URL}/${postedCase.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: alert._id,
-              index: alert._index,
-              rule: {
-                id: 'id',
-                name: 'name',
-              },
-              type: CommentType.alert,
-            })
-            .expect(200);
-
-          await es.indices.refresh({ index: alert._index });
-
-          await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: [
-                {
-                  id: caseUpdated.id,
-                  version: caseUpdated.version,
-                  status: 'in-progress',
-                },
-              ],
-            })
-            .expect(200);
-
-          // force a refresh on the index that the signal is stored in so that we can search for it and get the correct
-          // status
-          await es.indices.refresh({ index: alert._index });
-
-          const { body: updatedAlert } = await supertest
-            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-            .set('kbn-xsrf', 'true')
-            .send(getQuerySignalIds([alert._id]))
-            .expect(200);
-
-          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('in-progress');
-        });
-
-        it('does NOT updates alert status when the status is updated and syncAlerts=false', async () => {
-          const rule = getRuleForSignalTesting(['auditbeat-*']);
-
-          const { body: postedCase } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({ ...postCaseReq, settings: { syncAlerts: false } })
-            .expect(200);
-
-          const { id } = await createRule(supertest, rule);
-          await waitForRuleSuccessOrStatus(supertest, id);
-          await waitForSignalsToBePresent(supertest, 1, [id]);
-          const signals = await getSignalsByIds(supertest, [id]);
-
-          const alert = signals.hits.hits[0];
-          expect(alert._source.signal.status).eql('open');
-
-          const { body: caseUpdated } = await supertest
-            .post(`${CASES_URL}/${postedCase.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: alert._id,
-              index: alert._index,
-              type: CommentType.alert,
-              rule: {
-                id: 'id',
-                name: 'name',
-              },
-            })
-            .expect(200);
-
-          await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: [
-                {
-                  id: caseUpdated.id,
-                  version: caseUpdated.version,
-                  status: 'in-progress',
-                },
-              ],
-            })
-            .expect(200);
-
-          const { body: updatedAlert } = await supertest
-            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-            .set('kbn-xsrf', 'true')
-            .send(getQuerySignalIds([alert._id]))
-            .expect(200);
-
-          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('open');
-        });
-
-        it('it updates alert status when syncAlerts is turned on', async () => {
-          const rule = getRuleForSignalTesting(['auditbeat-*']);
-
-          const { body: postedCase } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({ ...postCaseReq, settings: { syncAlerts: false } })
-            .expect(200);
-
-          const { id } = await createRule(supertest, rule);
-          await waitForRuleSuccessOrStatus(supertest, id);
-          await waitForSignalsToBePresent(supertest, 1, [id]);
-          const signals = await getSignalsByIds(supertest, [id]);
-
-          const alert = signals.hits.hits[0];
-          expect(alert._source.signal.status).eql('open');
-
-          const { body: caseUpdated } = await supertest
-            .post(`${CASES_URL}/${postedCase.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: alert._id,
-              index: alert._index,
-              rule: {
-                id: 'id',
-                name: 'name',
-              },
-              type: CommentType.alert,
-            })
-            .expect(200);
-
-          // Update the status of the case with sync alerts off
-          const { body: caseStatusUpdated } = await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: [
-                {
-                  id: caseUpdated.id,
-                  version: caseUpdated.version,
-                  status: 'in-progress',
-                },
-              ],
-            })
-            .expect(200);
-
-          // Turn sync alerts on
-          await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: [
-                {
-                  id: caseStatusUpdated[0].id,
-                  version: caseStatusUpdated[0].version,
-                  settings: { syncAlerts: true },
-                },
-              ],
-            })
-            .expect(200);
-
-          // refresh the index because syncAlerts was set to true so the alert's status should have been updated
-          await es.indices.refresh({ index: alert._index });
-
-          const { body: updatedAlert } = await supertest
-            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-            .set('kbn-xsrf', 'true')
-            .send(getQuerySignalIds([alert._id]))
-            .expect(200);
-
-          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('in-progress');
-        });
-
-        it('it does NOT updates alert status when syncAlerts is turned off', async () => {
-          const rule = getRuleForSignalTesting(['auditbeat-*']);
-
-          const { body: postedCase } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send(postCaseReq)
-            .expect(200);
-
-          const { id } = await createRule(supertest, rule);
-          await waitForRuleSuccessOrStatus(supertest, id);
-          await waitForSignalsToBePresent(supertest, 1, [id]);
-          const signals = await getSignalsByIds(supertest, [id]);
-
-          const alert = signals.hits.hits[0];
-          expect(alert._source.signal.status).eql('open');
-
-          const { body: caseUpdated } = await supertest
-            .post(`${CASES_URL}/${postedCase.id}/comments`)
-            .set('kbn-xsrf', 'true')
-            .send({
-              alertId: alert._id,
-              index: alert._index,
-              type: CommentType.alert,
-              rule: {
-                id: 'id',
-                name: 'name',
-              },
-            })
-            .expect(200);
-
-          // Turn sync alerts off
-          const { body: caseSettingsUpdated } = await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: [
-                {
-                  id: caseUpdated.id,
-                  version: caseUpdated.version,
-                  settings: { syncAlerts: false },
-                },
-              ],
-            })
-            .expect(200);
-
-          // Update the status of the case with sync alerts off
-          await supertest
-            .patch(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send({
-              cases: [
-                {
-                  id: caseSettingsUpdated[0].id,
-                  version: caseSettingsUpdated[0].version,
-                  status: 'in-progress',
-                },
-              ],
-            })
-            .expect(200);
-
-          const { body: updatedAlert } = await supertest
-            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
-            .set('kbn-xsrf', 'true')
-            .send(getQuerySignalIds([alert._id]))
-            .expect(200);
-
-          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('open');
-        });
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/post_case.ts b/x-pack/test/case_api_integration/basic/tests/cases/post_case.ts
deleted file mode 100644
index 5de5644ccf68a..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/post_case.ts
+++ /dev/null
@@ -1,85 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../common/ftr_provider_context';
-
-import { CASES_URL } from '../../../../../plugins/cases/common/constants';
-import {
-  postCaseReq,
-  postCaseResp,
-  removeServerGeneratedPropertiesFromCase,
-} from '../../../common/lib/mock';
-import { deleteCases } from '../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('post_case', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-    });
-
-    it('should post a case', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromCase(postedCase);
-      expect(data).to.eql(postCaseResp(postedCase.id));
-    });
-
-    it('unhappy path - 400s when bad query supplied', async () => {
-      await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({ ...postCaseReq, badKey: true })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when connector is not supplied', async () => {
-      const { connector, ...caseWithoutConnector } = postCaseReq;
-
-      await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(caseWithoutConnector)
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when connector has wrong type', async () => {
-      await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: { id: 'wrong', name: 'wrong', type: '.not-exists', fields: null },
-        })
-        .expect(400);
-    });
-
-    it('unhappy path - 400s when connector has wrong fields', async () => {
-      await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: {
-            id: 'wrong',
-            name: 'wrong',
-            type: '.jira',
-            fields: { unsupported: 'value' },
-          },
-        })
-        .expect(400);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/push_case.ts b/x-pack/test/case_api_integration/basic/tests/cases/push_case.ts
deleted file mode 100644
index 47842eeca6f1c..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/push_case.ts
+++ /dev/null
@@ -1,381 +0,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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { ObjectRemover as ActionsRemover } from '../../../../alerting_api_integration/common/lib';
-
-import { CASE_CONFIGURE_URL, CASES_URL } from '../../../../../plugins/cases/common/constants';
-import {
-  postCaseReq,
-  defaultUser,
-  postCommentUserReq,
-  postCollectionReq,
-} from '../../../common/lib/mock';
-import {
-  deleteCases,
-  deleteCasesUserActions,
-  deleteComments,
-  deleteConfiguration,
-  getConfiguration,
-  getServiceNowConnector,
-} from '../../../common/lib/utils';
-import {
-  ExternalServiceSimulator,
-  getExternalServiceSimulatorPath,
-} from '../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
-import { CaseStatuses } from '../../../../../plugins/cases/common/api';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const kibanaServer = getService('kibanaServer');
-  const es = getService('es');
-
-  describe('push_case', () => {
-    const actionsRemover = new ActionsRemover(supertest);
-
-    let servicenowSimulatorURL: string = '<could not determine kibana url>';
-    before(() => {
-      servicenowSimulatorURL = kibanaServer.resolveUrl(
-        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
-      );
-    });
-
-    afterEach(async () => {
-      await deleteCases(es);
-      await deleteComments(es);
-      await deleteConfiguration(es);
-      await deleteCasesUserActions(es);
-      await actionsRemover.removeAll();
-    });
-
-    it('should push a case', async () => {
-      const { body: connector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getServiceNowConnector(),
-          config: { apiUrl: servicenowSimulatorURL },
-        })
-        .expect(200);
-
-      actionsRemover.add('default', connector.id, 'action', 'actions');
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(
-          getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-          })
-        )
-        .expect(200);
-
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-            fields: {
-              urgency: '2',
-              impact: '2',
-              severity: '2',
-              category: 'software',
-              subcategory: 'os',
-            },
-          }).connector,
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/connector/${connector.id}/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(200);
-
-      // eslint-disable-next-line @typescript-eslint/naming-convention
-      const { pushed_at, external_url, ...rest } = body.external_service;
-
-      expect(rest).to.eql({
-        pushed_by: defaultUser,
-        connector_id: connector.id,
-        connector_name: connector.name,
-        external_id: '123',
-        external_title: 'INC01',
-      });
-
-      // external_url is of the form http://elastic:changeme@localhost:5620 which is different between various environments like Jekins
-      expect(
-        external_url.includes(
-          'api/_actions-FTS-external-service-simulators/servicenow/nav_to.do?uri=incident.do?sys_id=123'
-        )
-      ).to.equal(true);
-    });
-
-    it('pushes a comment appropriately', async () => {
-      const { body: connector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getServiceNowConnector(),
-          config: { apiUrl: servicenowSimulatorURL },
-        })
-        .expect(200);
-
-      actionsRemover.add('default', connector.id, 'action', 'actions');
-
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(
-          getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-          })
-        )
-        .expect(200);
-
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-            fields: {
-              urgency: '2',
-              impact: '2',
-              severity: '2',
-              category: 'software',
-              subcategory: 'os',
-            },
-          }).connector,
-        })
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/connector/${connector.id}/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(200);
-
-      expect(body.comments[0].pushed_by).to.eql(defaultUser);
-    });
-
-    it('should pushes a case and closes when closure_type: close-by-pushing', async () => {
-      const { body: connector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getServiceNowConnector(),
-          config: { apiUrl: servicenowSimulatorURL },
-        })
-        .expect(200);
-
-      actionsRemover.add('default', connector.id, 'action', 'actions');
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-          }),
-          closure_type: 'close-by-pushing',
-        })
-        .expect(200);
-
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-            fields: {
-              urgency: '2',
-              impact: '2',
-              severity: '2',
-              category: 'software',
-              subcategory: 'os',
-            },
-          }).connector,
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/connector/${connector.id}/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(200);
-
-      expect(body.status).to.eql('closed');
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    it.skip('should push a collection case but not close it when closure_type: close-by-pushing', async () => {
-      const { body: connector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getServiceNowConnector(),
-          config: { apiUrl: servicenowSimulatorURL },
-        })
-        .expect(200);
-
-      actionsRemover.add('default', connector.id, 'action', 'actions');
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-          }),
-          closure_type: 'close-by-pushing',
-        })
-        .expect(200);
-
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCollectionReq,
-          connector: getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-            fields: {
-              urgency: '2',
-              impact: '2',
-              severity: '2',
-              category: 'software',
-              subcategory: 'os',
-            },
-          }).connector,
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/connector/${connector.id}/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(200);
-
-      expect(body.status).to.eql(CaseStatuses.open);
-    });
-
-    it('unhappy path - 404s when case does not exist', async () => {
-      await supertest
-        .post(`${CASES_URL}/fake-id/connector/fake-connector/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(404);
-    });
-
-    it('unhappy path - 404s when connector does not exist', async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: getConfiguration().connector,
-        })
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/connector/fake-connector/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(404);
-    });
-
-    it('unhappy path = 409s when case is closed', async () => {
-      const { body: connector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getServiceNowConnector(),
-          config: { apiUrl: servicenowSimulatorURL },
-        })
-        .expect(200);
-
-      actionsRemover.add('default', connector.id, 'action', 'actions');
-
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(
-          getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-          })
-        )
-        .expect(200);
-
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-            fields: {
-              urgency: '2',
-              impact: '2',
-              severity: '2',
-              category: 'software',
-              subcategory: 'os',
-            },
-          }).connector,
-        })
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/connector/${connector.id}/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(409);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/reporters/get_reporters.ts b/x-pack/test/case_api_integration/basic/tests/cases/reporters/get_reporters.ts
deleted file mode 100644
index c51bfda5bd8b0..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/reporters/get_reporters.ts
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import { CASES_URL, CASE_REPORTERS_URL } from '../../../../../../plugins/cases/common/constants';
-import { defaultUser, postCaseReq } from '../../../../common/lib/mock';
-import { deleteCases } from '../../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_reporters', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-    });
-
-    it('should return reporters', async () => {
-      await supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq).expect(200);
-
-      const { body } = await supertest
-        .get(CASE_REPORTERS_URL)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body).to.eql([defaultUser]);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/status/get_status.ts b/x-pack/test/case_api_integration/basic/tests/cases/status/get_status.ts
deleted file mode 100644
index 1657293953246..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/status/get_status.ts
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import { CASES_URL, CASE_STATUS_URL } from '../../../../../../plugins/cases/common/constants';
-import { postCaseReq } from '../../../../common/lib/mock';
-import { deleteCases } from '../../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_status', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-    });
-
-    it('should return case statuses', async () => {
-      await supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq);
-
-      const { body: inProgressCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq);
-
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: inProgressCase.id,
-              version: inProgressCase.version,
-              status: 'in-progress',
-            },
-          ],
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .get(CASE_STATUS_URL)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body).to.eql({
-        count_open_cases: 1,
-        count_closed_cases: 1,
-        count_in_progress_cases: 1,
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/delete_sub_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/delete_sub_cases.ts
deleted file mode 100644
index 15b3b9311e3c3..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/delete_sub_cases.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import {
-  CASES_URL,
-  SUB_CASES_PATCH_DEL_URL,
-} from '../../../../../../plugins/cases/common/constants';
-import { postCommentUserReq } from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-} from '../../../../common/lib/utils';
-import { getSubCaseDetailsUrl } from '../../../../../../plugins/cases/common/api/helpers';
-import { CaseResponse } from '../../../../../../plugins/cases/common/api';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  // ENABLE_CASE_CONNECTOR: remove this outer describe once the case connector feature is completed
-  describe('delete_sub_cases disabled routes', () => {
-    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
-      await supertest
-        .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["sub-case-id"]`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(404);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('delete_sub_cases', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('should delete a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
-
-        const { body: subCase } = await supertest
-          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
-          .send()
-          .expect(200);
-
-        expect(subCase.id).to.not.eql(undefined);
-
-        const { body } = await supertest
-          .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["${subCase.id}"]`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(204);
-
-        expect(body).to.eql({});
-        await supertest
-          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
-          .send()
-          .expect(404);
-      });
-
-      it(`should delete a sub case's comments when that case gets deleted`, async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
-
-        // there should be two comments on the sub case now
-        const { body: patchedCaseWithSubCase }: { body: CaseResponse } = await supertest
-          .post(`${CASES_URL}/${caseInfo.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .query({ subCaseId: caseInfo.subCases![0].id })
-          .send(postCommentUserReq)
-          .expect(200);
-
-        const subCaseCommentUrl = `${CASES_URL}/${patchedCaseWithSubCase.id}/comments/${
-          patchedCaseWithSubCase.comments![1].id
-        }`;
-        // make sure we can get the second comment
-        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(200);
-
-        await supertest
-          .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["${patchedCaseWithSubCase.subCases![0].id}"]`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(204);
-
-        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(404);
-      });
-
-      it('unhappy path - 404s when sub case id is invalid', async () => {
-        await supertest
-          .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["fake-id"]`)
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(404);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/find_sub_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/find_sub_cases.ts
deleted file mode 100644
index 14c0460c7583b..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/find_sub_cases.ts
+++ /dev/null
@@ -1,479 +0,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 expect from '@kbn/expect';
-import type { ApiResponse, estypes } from '@elastic/elasticsearch';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import { findSubCasesResp, postCollectionReq } from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  CreateSubCaseResp,
-  deleteAllCaseItems,
-  deleteCaseAction,
-  setStatus,
-} from '../../../../common/lib/utils';
-import { getSubCasesUrl } from '../../../../../../plugins/cases/common/api/helpers';
-import {
-  CaseResponse,
-  CaseStatuses,
-  CommentType,
-  SubCasesFindResponse,
-} from '../../../../../../plugins/cases/common/api';
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import {
-  ContextTypeGeneratedAlertType,
-  createAlertsString,
-} from '../../../../../../plugins/cases/server/connectors';
-
-interface SubCaseAttributes {
-  'cases-sub-case': {
-    created_at: string;
-  };
-}
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  // ENABLE_CASE_CONNECTOR: remove this outer describe once the case connector feature is completed
-  describe('find_sub_cases disabled route', () => {
-    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
-      await supertest.get(`${getSubCasesUrl('case-id')}/_find`).expect(404);
-    });
-
-    // ENABLE_CASE_CONNECTOR: enable these tests once the case connector feature is completed
-    describe.skip('create case connector', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-
-      describe('basic find tests', () => {
-        afterEach(async () => {
-          await deleteAllCaseItems(es);
-        });
-        it('should not find any sub cases when none exist', async () => {
-          const { body: caseResp }: { body: CaseResponse } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send(postCollectionReq)
-            .expect(200);
-
-          const { body: findSubCases } = await supertest
-            .get(`${getSubCasesUrl(caseResp.id)}/_find`)
-            .expect(200);
-
-          expect(findSubCases).to.eql({
-            page: 1,
-            per_page: 20,
-            total: 0,
-            subCases: [],
-            count_open_cases: 0,
-            count_closed_cases: 0,
-            count_in_progress_cases: 0,
-          });
-        });
-
-        it('should return a sub cases with comment stats', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find`)
-            .expect(200);
-
-          expect(body).to.eql({
-            ...findSubCasesResp,
-            total: 1,
-            // find should not return the comments themselves only the stats
-            subCases: [{ ...caseInfo.subCases![0], comments: [], totalComment: 1, totalAlerts: 2 }],
-            count_open_cases: 1,
-          });
-        });
-
-        it('should return multiple sub cases', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-          const subCase2Resp = await createSubCase({ supertest, caseID: caseInfo.id, actionID });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find`)
-            .expect(200);
-
-          expect(body).to.eql({
-            ...findSubCasesResp,
-            total: 2,
-            // find should not return the comments themselves only the stats
-            subCases: [
-              {
-                // there should only be 1 closed sub case
-                ...subCase2Resp.modifiedSubCases![0],
-                comments: [],
-                totalComment: 1,
-                totalAlerts: 2,
-                status: CaseStatuses.closed,
-              },
-              {
-                ...subCase2Resp.newSubCaseInfo.subCases![0],
-                comments: [],
-                totalComment: 1,
-                totalAlerts: 2,
-              },
-            ],
-            count_open_cases: 1,
-            count_closed_cases: 1,
-          });
-        });
-
-        it('should only return open when filtering for open', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-          // this will result in one closed case and one open
-          await createSubCase({ supertest, caseID: caseInfo.id, actionID });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find?status=${CaseStatuses.open}`)
-            .expect(200);
-
-          expect(body.total).to.be(1);
-          expect(body.subCases[0].status).to.be(CaseStatuses.open);
-          expect(body.count_closed_cases).to.be(1);
-          expect(body.count_open_cases).to.be(1);
-          expect(body.count_in_progress_cases).to.be(0);
-        });
-
-        it('should only return closed when filtering for closed', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-          // this will result in one closed case and one open
-          await createSubCase({ supertest, caseID: caseInfo.id, actionID });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find?status=${CaseStatuses.closed}`)
-            .expect(200);
-
-          expect(body.total).to.be(1);
-          expect(body.subCases[0].status).to.be(CaseStatuses.closed);
-          expect(body.count_closed_cases).to.be(1);
-          expect(body.count_open_cases).to.be(1);
-          expect(body.count_in_progress_cases).to.be(0);
-        });
-
-        it('should only return in progress when filtering for in progress', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-          // this will result in one closed case and one open
-          const { newSubCaseInfo: secondSub } = await createSubCase({
-            supertest,
-            caseID: caseInfo.id,
-            actionID,
-          });
-
-          await setStatus({
-            supertest,
-            cases: [
-              {
-                id: secondSub.subCases![0].id,
-                version: secondSub.subCases![0].version,
-                status: CaseStatuses['in-progress'],
-              },
-            ],
-            type: 'sub_case',
-          });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find?status=${CaseStatuses['in-progress']}`)
-            .expect(200);
-
-          expect(body.total).to.be(1);
-          expect(body.subCases[0].status).to.be(CaseStatuses['in-progress']);
-          expect(body.count_closed_cases).to.be(1);
-          expect(body.count_open_cases).to.be(0);
-          expect(body.count_in_progress_cases).to.be(1);
-        });
-
-        it('should sort on createdAt field in descending order', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-          // this will result in one closed case and one open
-          await createSubCase({
-            supertest,
-            caseID: caseInfo.id,
-            actionID,
-          });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find?sortField=createdAt&sortOrder=desc`)
-            .expect(200);
-
-          expect(body.total).to.be(2);
-          expect(body.subCases[0].status).to.be(CaseStatuses.open);
-          expect(body.subCases[1].status).to.be(CaseStatuses.closed);
-          expect(body.count_closed_cases).to.be(1);
-          expect(body.count_open_cases).to.be(1);
-          expect(body.count_in_progress_cases).to.be(0);
-        });
-
-        it('should sort on createdAt field in ascending order', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-          // this will result in one closed case and one open
-          await createSubCase({
-            supertest,
-            caseID: caseInfo.id,
-            actionID,
-          });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find?sortField=createdAt&sortOrder=asc`)
-            .expect(200);
-
-          expect(body.total).to.be(2);
-          expect(body.subCases[0].status).to.be(CaseStatuses.closed);
-          expect(body.subCases[1].status).to.be(CaseStatuses.open);
-          expect(body.count_closed_cases).to.be(1);
-          expect(body.count_open_cases).to.be(1);
-          expect(body.count_in_progress_cases).to.be(0);
-        });
-
-        it('should sort on updatedAt field in ascending order', async () => {
-          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-          // this will result in one closed case and one open
-          const { newSubCaseInfo: secondSub } = await createSubCase({
-            supertest,
-            caseID: caseInfo.id,
-            actionID,
-          });
-
-          await setStatus({
-            supertest,
-            cases: [
-              {
-                id: secondSub.subCases![0].id,
-                version: secondSub.subCases![0].version,
-                status: CaseStatuses['in-progress'],
-              },
-            ],
-            type: 'sub_case',
-          });
-
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(caseInfo.id)}/_find?sortField=updatedAt&sortOrder=asc`)
-            .expect(200);
-
-          expect(body.total).to.be(2);
-          expect(body.subCases[0].status).to.be(CaseStatuses.closed);
-          expect(body.subCases[1].status).to.be(CaseStatuses['in-progress']);
-          expect(body.count_closed_cases).to.be(1);
-          expect(body.count_open_cases).to.be(0);
-          expect(body.count_in_progress_cases).to.be(1);
-        });
-      });
-
-      describe('pagination', () => {
-        const numCases = 4;
-        let collection: CaseResponse;
-        before(async () => {
-          ({ body: collection } = await supertest
-            .post(CASES_URL)
-            .set('kbn-xsrf', 'true')
-            .send(postCollectionReq)
-            .expect(200));
-
-          await createSubCases(numCases, collection.id);
-        });
-
-        after(async () => {
-          await deleteAllCaseItems(es);
-        });
-
-        const createSubCases = async (total: number, caseID: string) => {
-          const responses: CreateSubCaseResp[] = [];
-          for (let i = 0; i < total; i++) {
-            const postCommentGenAlertReq: ContextTypeGeneratedAlertType = {
-              alerts: createAlertsString([
-                { _id: `${i}`, _index: 'test-index', ruleId: 'rule-id', ruleName: 'rule name' },
-              ]),
-              type: CommentType.generatedAlert,
-            };
-            responses.push(
-              await createSubCase({
-                supertest,
-                actionID,
-                caseID,
-                comment: postCommentGenAlertReq,
-              })
-            );
-          }
-          return responses;
-        };
-
-        const getAllCasesSortedByCreatedAtAsc = async () => {
-          const cases: ApiResponse<estypes.SearchResponse<SubCaseAttributes>> = await es.search({
-            index: '.kibana',
-            body: {
-              size: 10000,
-              sort: [{ 'cases-sub-case.created_at': { unmapped_type: 'date', order: 'asc' } }],
-              query: {
-                term: { type: 'cases-sub-case' },
-              },
-            },
-          });
-          return cases.body.hits.hits.map((hit) => hit._source);
-        };
-
-        it('returns the correct total when perPage is less than the total', async () => {
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(collection.id)}/_find`)
-            .query({
-              sortOrder: 'asc',
-              page: 1,
-              perPage: 3,
-            })
-            .set('kbn-xsrf', 'true')
-            .expect(200);
-
-          expect(body.subCases.length).to.eql(3);
-          expect(body.total).to.eql(4);
-          expect(body.page).to.eql(1);
-          expect(body.per_page).to.eql(3);
-          // there will only be 1 open sub case, all the rest will be closed
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_closed_cases).to.eql(3);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('returns the correct total when perPage is greater than the total', async () => {
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(collection.id)}/_find`)
-            .query({
-              sortOrder: 'asc',
-              page: 1,
-              perPage: 11,
-            })
-            .set('kbn-xsrf', 'true')
-            .expect(200);
-
-          expect(body.total).to.eql(4);
-          expect(body.page).to.eql(1);
-          expect(body.per_page).to.eql(11);
-          expect(body.subCases.length).to.eql(4);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_closed_cases).to.eql(3);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('returns the correct total when perPage is equal to the total', async () => {
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(collection.id)}/_find`)
-            .query({
-              sortOrder: 'asc',
-              page: 1,
-              perPage: 4,
-            })
-            .set('kbn-xsrf', 'true')
-            .expect(200);
-
-          expect(body.total).to.eql(4);
-          expect(body.page).to.eql(1);
-          expect(body.per_page).to.eql(4);
-          expect(body.subCases.length).to.eql(4);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_closed_cases).to.eql(3);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-
-        it('returns the second page of results', async () => {
-          const perPage = 2;
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(collection.id)}/_find`)
-            .query({
-              sortOrder: 'asc',
-              page: 2,
-              perPage,
-            })
-            .set('kbn-xsrf', 'true')
-            .expect(200);
-
-          expect(body.total).to.eql(4);
-          expect(body.page).to.eql(2);
-          expect(body.per_page).to.eql(2);
-          expect(body.subCases.length).to.eql(2);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_closed_cases).to.eql(3);
-          expect(body.count_in_progress_cases).to.eql(0);
-
-          const allCases = await getAllCasesSortedByCreatedAtAsc();
-
-          body.subCases.map((subCaseInfo, index) => {
-            // we started on the second page of 10 cases with a perPage of 5, so the first case should 0 + 5 (index + perPage)
-            expect(subCaseInfo.created_at).to.eql(
-              allCases[index + perPage]?.['cases-sub-case'].created_at
-            );
-          });
-        });
-
-        it('paginates with perPage of 2 through 4 total sub cases', async () => {
-          const total = 4;
-          const perPage = 2;
-
-          // it's less than or equal here because the page starts at 1, so page 2 is a valid page number
-          // and should have sub cases titles 3, and 4
-          for (let currentPage = 1; currentPage <= total / perPage; currentPage++) {
-            const { body }: { body: SubCasesFindResponse } = await supertest
-              .get(`${getSubCasesUrl(collection.id)}/_find`)
-              .query({
-                sortOrder: 'asc',
-                page: currentPage,
-                perPage,
-              })
-              .set('kbn-xsrf', 'true')
-              .expect(200);
-
-            expect(body.total).to.eql(total);
-            expect(body.page).to.eql(currentPage);
-            expect(body.per_page).to.eql(perPage);
-            expect(body.subCases.length).to.eql(perPage);
-            expect(body.count_open_cases).to.eql(1);
-            expect(body.count_closed_cases).to.eql(total - 1);
-            expect(body.count_in_progress_cases).to.eql(0);
-
-            const allCases = await getAllCasesSortedByCreatedAtAsc();
-
-            body.subCases.map((subCaseInfo, index) => {
-              // for page 1, the cases tiles should be 0,1,2 for page 2: 3,4,5 etc (assuming the titles were sorted
-              // correctly)
-              expect(subCaseInfo.created_at).to.eql(
-                allCases[index + perPage * (currentPage - 1)]?.['cases-sub-case'].created_at
-              );
-            });
-          }
-        });
-
-        it('retrieves the last sub case', async () => {
-          const { body }: { body: SubCasesFindResponse } = await supertest
-            .get(`${getSubCasesUrl(collection.id)}/_find`)
-            .query({
-              sortOrder: 'asc',
-              // this should skip the first 3 sub cases and only return the last one
-              page: 2,
-              perPage: 3,
-            })
-            .set('kbn-xsrf', 'true')
-            .expect(200);
-
-          expect(body.total).to.eql(4);
-          expect(body.page).to.eql(2);
-          expect(body.per_page).to.eql(3);
-          expect(body.subCases.length).to.eql(1);
-          expect(body.count_open_cases).to.eql(1);
-          expect(body.count_closed_cases).to.eql(3);
-          expect(body.count_in_progress_cases).to.eql(0);
-        });
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/get_sub_case.ts b/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/get_sub_case.ts
deleted file mode 100644
index 8d4ffafbf763a..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/get_sub_case.ts
+++ /dev/null
@@ -1,123 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../../common/ftr_provider_context';
-
-import {
-  commentsResp,
-  postCommentAlertReq,
-  removeServerGeneratedPropertiesFromComments,
-  removeServerGeneratedPropertiesFromSubCase,
-  subCaseResp,
-} from '../../../../common/lib/mock';
-import {
-  createCaseAction,
-  createSubCase,
-  defaultCreateSubComment,
-  deleteAllCaseItems,
-  deleteCaseAction,
-} from '../../../../common/lib/utils';
-import {
-  getCaseCommentsUrl,
-  getSubCaseDetailsUrl,
-} from '../../../../../../plugins/cases/common/api/helpers';
-import {
-  AssociationType,
-  CaseResponse,
-  SubCaseResponse,
-} from '../../../../../../plugins/cases/common/api';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  // ENABLE_CASE_CONNECTOR: remove the outer describe once the case connector feature is completed
-  describe('get_sub_case disabled route', () => {
-    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
-      await supertest.get(getSubCaseDetailsUrl('case-id', 'sub-case-id')).expect(404);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('get_sub_case', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      afterEach(async () => {
-        await deleteAllCaseItems(es);
-      });
-
-      it('should return a case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-
-        const { body }: { body: SubCaseResponse } = await supertest
-          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(removeServerGeneratedPropertiesFromComments(body.comments)).to.eql(
-          commentsResp({
-            comments: [{ comment: defaultCreateSubComment, id: caseInfo.comments![0].id }],
-            associationType: AssociationType.subCase,
-          })
-        );
-
-        expect(removeServerGeneratedPropertiesFromSubCase(body)).to.eql(
-          subCaseResp({ id: body.id, totalComment: 1, totalAlerts: 2 })
-        );
-      });
-
-      it('should return the correct number of alerts with multiple types of alerts', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-
-        const { body: singleAlert }: { body: CaseResponse } = await supertest
-          .post(getCaseCommentsUrl(caseInfo.id))
-          .query({ subCaseId: caseInfo.subCases![0].id })
-          .set('kbn-xsrf', 'true')
-          .send(postCommentAlertReq)
-          .expect(200);
-
-        const { body }: { body: SubCaseResponse } = await supertest
-          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(200);
-
-        expect(removeServerGeneratedPropertiesFromComments(body.comments)).to.eql(
-          commentsResp({
-            comments: [
-              { comment: defaultCreateSubComment, id: caseInfo.comments![0].id },
-              {
-                comment: postCommentAlertReq,
-                id: singleAlert.comments![1].id,
-              },
-            ],
-            associationType: AssociationType.subCase,
-          })
-        );
-
-        expect(removeServerGeneratedPropertiesFromSubCase(body)).to.eql(
-          subCaseResp({ id: body.id, totalComment: 2, totalAlerts: 3 })
-        );
-      });
-
-      it('unhappy path - 404s when case is not there', async () => {
-        await supertest
-          .get(getSubCaseDetailsUrl('fake-case-id', 'fake-sub-case-id'))
-          .set('kbn-xsrf', 'true')
-          .send()
-          .expect(404);
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/patch_sub_cases.ts b/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/patch_sub_cases.ts
deleted file mode 100644
index d993a627d186b..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/sub_cases/patch_sub_cases.ts
+++ /dev/null
@@ -1,510 +0,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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import {
-  CASES_URL,
-  SUB_CASES_PATCH_DEL_URL,
-} from '../../../../../../plugins/cases/common/constants';
-import {
-  createCaseAction,
-  createSubCase,
-  deleteAllCaseItems,
-  deleteCaseAction,
-  getSignalsWithES,
-  setStatus,
-} from '../../../../common/lib/utils';
-import { getSubCaseDetailsUrl } from '../../../../../../plugins/cases/common/api/helpers';
-import {
-  CaseStatuses,
-  CommentType,
-  SubCaseResponse,
-} from '../../../../../../plugins/cases/common/api';
-import { createAlertsString } from '../../../../../../plugins/cases/server/connectors';
-import { postCaseReq, postCollectionReq } from '../../../../common/lib/mock';
-
-const defaultSignalsIndex = '.siem-signals-default-000001';
-
-// eslint-disable-next-line import/no-default-export
-export default function ({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const es = getService('es');
-  const esArchiver = getService('esArchiver');
-
-  // ENABLE_CASE_CONNECTOR: remove the outer describe once the case connector feature is completed
-  describe('patch_sub_cases disabled route', () => {
-    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
-      await supertest
-        .patch(SUB_CASES_PATCH_DEL_URL)
-        .set('kbn-xsrf', 'true')
-        .send({ subCases: [] })
-        .expect(404);
-    });
-
-    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
-    describe.skip('patch_sub_cases', () => {
-      let actionID: string;
-      before(async () => {
-        actionID = await createCaseAction(supertest);
-      });
-      after(async () => {
-        await deleteCaseAction(supertest, actionID);
-      });
-      beforeEach(async () => {
-        await esArchiver.load('cases/signals/default');
-      });
-      afterEach(async () => {
-        await esArchiver.unload('cases/signals/default');
-        await deleteAllCaseItems(es);
-      });
-
-      it('should update the status of a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-
-        await setStatus({
-          supertest,
-          cases: [
-            {
-              id: caseInfo.subCases![0].id,
-              version: caseInfo.subCases![0].version,
-              status: CaseStatuses['in-progress'],
-            },
-          ],
-          type: 'sub_case',
-        });
-        const { body: subCase }: { body: SubCaseResponse } = await supertest
-          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
-          .expect(200);
-
-        expect(subCase.status).to.eql(CaseStatuses['in-progress']);
-      });
-
-      it('should update the status of one alert attached to a sub case', async () => {
-        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
-
-        const { newSubCaseInfo: caseInfo } = await createSubCase({
-          supertest,
-          actionID,
-          comment: {
-            alerts: createAlertsString([
-              {
-                _id: signalID,
-                _index: defaultSignalsIndex,
-                ruleId: 'id',
-                ruleName: 'name',
-              },
-            ]),
-            type: CommentType.generatedAlert,
-          },
-        });
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        let signals = await getSignalsWithES({ es, indices: defaultSignalsIndex, ids: signalID });
-
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-
-        await setStatus({
-          supertest,
-          cases: [
-            {
-              id: caseInfo.subCases![0].id,
-              version: caseInfo.subCases![0].version,
-              status: CaseStatuses['in-progress'],
-            },
-          ],
-          type: 'sub_case',
-        });
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        signals = await getSignalsWithES({ es, indices: defaultSignalsIndex, ids: signalID });
-
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses['in-progress']
-        );
-      });
-
-      it('should update the status of multiple alerts attached to a sub case', async () => {
-        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
-
-        const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
-
-        const { newSubCaseInfo: caseInfo } = await createSubCase({
-          supertest,
-          actionID,
-          comment: {
-            alerts: createAlertsString([
-              {
-                _id: signalID,
-                _index: defaultSignalsIndex,
-                ruleId: 'id',
-                ruleName: 'name',
-              },
-              {
-                _id: signalID2,
-                _index: defaultSignalsIndex,
-                ruleId: 'id',
-                ruleName: 'name',
-              },
-            ]),
-            type: CommentType.generatedAlert,
-          },
-        });
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        let signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-
-        await setStatus({
-          supertest,
-          cases: [
-            {
-              id: caseInfo.subCases![0].id,
-              version: caseInfo.subCases![0].version,
-              status: CaseStatuses['in-progress'],
-            },
-          ],
-          type: 'sub_case',
-        });
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses['in-progress']
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses['in-progress']
-        );
-      });
-
-      it('should update the status of multiple alerts attached to multiple sub cases in one collection', async () => {
-        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
-        const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
-
-        const { newSubCaseInfo: initialCaseInfo } = await createSubCase({
-          supertest,
-          actionID,
-          caseInfo: {
-            ...postCollectionReq,
-            settings: {
-              syncAlerts: false,
-            },
-          },
-          comment: {
-            alerts: createAlertsString([
-              {
-                _id: signalID,
-                _index: defaultSignalsIndex,
-                ruleId: 'id',
-                ruleName: 'name',
-              },
-            ]),
-            type: CommentType.generatedAlert,
-          },
-        });
-
-        // This will close the first sub case and create a new one
-        const { newSubCaseInfo: collectionWithSecondSub } = await createSubCase({
-          supertest,
-          actionID,
-          caseID: initialCaseInfo.id,
-          comment: {
-            alerts: createAlertsString([
-              {
-                _id: signalID2,
-                _index: defaultSignalsIndex,
-                ruleId: 'id',
-                ruleName: 'name',
-              },
-            ]),
-            type: CommentType.generatedAlert,
-          },
-        });
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        let signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        // There should be no change in their status since syncing is disabled
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-
-        await setStatus({
-          supertest,
-          cases: [
-            {
-              id: collectionWithSecondSub.subCases![0].id,
-              version: collectionWithSecondSub.subCases![0].version,
-              status: CaseStatuses['in-progress'],
-            },
-          ],
-          type: 'sub_case',
-        });
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        // There still should be no change in their status since syncing is disabled
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-
-        // Turn sync alerts on
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: collectionWithSecondSub.id,
-                version: collectionWithSecondSub.version,
-                settings: { syncAlerts: true },
-              },
-            ],
-          })
-          .expect(200);
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses.closed
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses['in-progress']
-        );
-      });
-
-      it('should update the status of alerts attached to a case and sub case when sync settings is turned on', async () => {
-        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
-        const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
-
-        const { body: individualCase } = await supertest
-          .post(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            ...postCaseReq,
-            settings: {
-              syncAlerts: false,
-            },
-          });
-
-        const { newSubCaseInfo: caseInfo } = await createSubCase({
-          supertest,
-          actionID,
-          caseInfo: {
-            ...postCollectionReq,
-            settings: {
-              syncAlerts: false,
-            },
-          },
-          comment: {
-            alerts: createAlertsString([
-              {
-                _id: signalID,
-                _index: defaultSignalsIndex,
-                ruleId: 'id',
-                ruleName: 'name',
-              },
-            ]),
-            type: CommentType.generatedAlert,
-          },
-        });
-
-        const { body: updatedIndWithComment } = await supertest
-          .post(`${CASES_URL}/${individualCase.id}/comments`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            alertId: signalID2,
-            index: defaultSignalsIndex,
-            rule: { id: 'test-rule-id', name: 'test-index-id' },
-            type: CommentType.alert,
-          })
-          .expect(200);
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        let signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        // There should be no change in their status since syncing is disabled
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-
-        await setStatus({
-          supertest,
-          cases: [
-            {
-              id: caseInfo.subCases![0].id,
-              version: caseInfo.subCases![0].version,
-              status: CaseStatuses['in-progress'],
-            },
-          ],
-          type: 'sub_case',
-        });
-
-        const updatedIndWithStatus = (
-          await setStatus({
-            supertest,
-            cases: [
-              {
-                id: updatedIndWithComment.id,
-                version: updatedIndWithComment.version,
-                status: CaseStatuses.closed,
-              },
-            ],
-            type: 'case',
-          })
-        )[0]; // there should only be a single entry in the response
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        // There should still be no change in their status since syncing is disabled
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses.open
-        );
-
-        // Turn sync alerts on
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: caseInfo.id,
-                version: caseInfo.version,
-                settings: { syncAlerts: true },
-              },
-            ],
-          })
-          .expect(200);
-
-        await supertest
-          .patch(CASES_URL)
-          .set('kbn-xsrf', 'true')
-          .send({
-            cases: [
-              {
-                id: updatedIndWithStatus.id,
-                version: updatedIndWithStatus.version,
-                settings: { syncAlerts: true },
-              },
-            ],
-          })
-          .expect(200);
-
-        await es.indices.refresh({ index: defaultSignalsIndex });
-
-        signals = await getSignalsWithES({
-          es,
-          indices: defaultSignalsIndex,
-          ids: [signalID, signalID2],
-        });
-
-        // alerts should be updated now that the
-        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
-          CaseStatuses['in-progress']
-        );
-        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
-          CaseStatuses.closed
-        );
-      });
-
-      it('404s when sub case id is invalid', async () => {
-        await supertest
-          .patch(`${SUB_CASES_PATCH_DEL_URL}`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            subCases: [
-              {
-                id: 'fake-id',
-                version: 'blah',
-                status: CaseStatuses.open,
-              },
-            ],
-          })
-          .expect(404);
-      });
-
-      it('406s when updating invalid fields for a sub case', async () => {
-        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
-
-        await supertest
-          .patch(`${SUB_CASES_PATCH_DEL_URL}`)
-          .set('kbn-xsrf', 'true')
-          .send({
-            subCases: [
-              {
-                id: caseInfo.subCases![0].id,
-                version: caseInfo.subCases![0].version,
-                type: 'blah',
-              },
-            ],
-          })
-          .expect(406);
-      });
-    });
-  });
-}
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/tags/get_tags.ts b/x-pack/test/case_api_integration/basic/tests/cases/tags/get_tags.ts
deleted file mode 100644
index f5cbb7c7f0eb0..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/tags/get_tags.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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import { CASES_URL, CASE_TAGS_URL } from '../../../../../../plugins/cases/common/constants';
-import { postCaseReq } from '../../../../common/lib/mock';
-import { deleteCases } from '../../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_tags', () => {
-    afterEach(async () => {
-      await deleteCases(es);
-    });
-
-    it('should return case tags', async () => {
-      await supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq);
-      await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({ ...postCaseReq, tags: ['unique'] })
-        .expect(200);
-
-      const { body } = await supertest
-        .get(CASE_TAGS_URL)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body).to.eql(['defacement', 'unique']);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/user_actions/get_all_user_actions.ts b/x-pack/test/case_api_integration/basic/tests/cases/user_actions/get_all_user_actions.ts
deleted file mode 100644
index a3bc2a4399db2..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/user_actions/get_all_user_actions.ts
+++ /dev/null
@@ -1,405 +0,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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-
-import { CASE_CONFIGURE_URL, CASES_URL } from '../../../../../../plugins/cases/common/constants';
-import { CommentType } from '../../../../../../plugins/cases/common/api';
-import {
-  userActionPostResp,
-  defaultUser,
-  postCaseReq,
-  postCommentUserReq,
-} from '../../../../common/lib/mock';
-import {
-  deleteCases,
-  deleteCasesUserActions,
-  deleteComments,
-  deleteConfiguration,
-  getConfiguration,
-  getServiceNowConnector,
-} from '../../../../common/lib/utils';
-
-import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
-import {
-  ExternalServiceSimulator,
-  getExternalServiceSimulatorPath,
-} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-  const actionsRemover = new ActionsRemover(supertest);
-  const kibanaServer = getService('kibanaServer');
-
-  describe('get_all_user_actions', () => {
-    let servicenowSimulatorURL: string = '<could not determine kibana url>';
-    before(() => {
-      servicenowSimulatorURL = kibanaServer.resolveUrl(
-        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
-      );
-    });
-    afterEach(async () => {
-      await deleteCases(es);
-      await deleteComments(es);
-      await deleteConfiguration(es);
-      await deleteCasesUserActions(es);
-      await actionsRemover.removeAll();
-    });
-
-    it(`on new case, user action: 'create' should be called with actionFields: ['description', 'status', 'tags', 'title', 'connector', 'settings]`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(1);
-
-      expect(body[0].action_field).to.eql([
-        'description',
-        'status',
-        'tags',
-        'title',
-        'connector',
-        'settings',
-      ]);
-      expect(body[0].action).to.eql('create');
-      expect(body[0].old_value).to.eql(null);
-      expect(JSON.parse(body[0].new_value)).to.eql(userActionPostResp);
-    });
-
-    it(`on close case, user action: 'update' should be called with actionFields: ['status']`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              status: 'closed',
-            },
-          ],
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(2);
-      expect(body[1].action_field).to.eql(['status']);
-      expect(body[1].action).to.eql('update');
-      expect(body[1].old_value).to.eql('open');
-      expect(body[1].new_value).to.eql('closed');
-    });
-
-    it(`on update case connector, user action: 'update' should be called with actionFields: ['connector']`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const newConnector = {
-        id: '123',
-        name: 'Connector',
-        type: '.jira',
-        fields: { issueType: 'Task', priority: 'High', parent: null },
-      };
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              connector: newConnector,
-            },
-          ],
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(2);
-      expect(body[1].action_field).to.eql(['connector']);
-      expect(body[1].action).to.eql('update');
-      expect(JSON.parse(body[1].old_value)).to.eql({
-        id: 'none',
-        name: 'none',
-        type: '.none',
-        fields: null,
-      });
-      expect(JSON.parse(body[1].new_value)).to.eql({
-        id: '123',
-        name: 'Connector',
-        type: '.jira',
-        fields: { issueType: 'Task', priority: 'High', parent: null },
-      });
-    });
-
-    it(`on update tags, user action: 'add' and 'delete' should be called with actionFields: ['tags']`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              tags: ['cool', 'neat'],
-            },
-          ],
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(3);
-      expect(body[1].action_field).to.eql(['tags']);
-      expect(body[1].action).to.eql('add');
-      expect(body[1].old_value).to.eql(null);
-      expect(body[1].new_value).to.eql('cool, neat');
-      expect(body[2].action_field).to.eql(['tags']);
-      expect(body[2].action).to.eql('delete');
-      expect(body[2].old_value).to.eql(null);
-      expect(body[2].new_value).to.eql('defacement');
-    });
-
-    it(`on update title, user action: 'update' should be called with actionFields: ['title']`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const newTitle = 'Such a great title';
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              title: newTitle,
-            },
-          ],
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(2);
-      expect(body[1].action_field).to.eql(['title']);
-      expect(body[1].action).to.eql('update');
-      expect(body[1].old_value).to.eql(postCaseReq.title);
-      expect(body[1].new_value).to.eql(newTitle);
-    });
-
-    it(`on update description, user action: 'update' should be called with actionFields: ['description']`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const newDesc = 'Such a great description';
-      await supertest
-        .patch(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          cases: [
-            {
-              id: postedCase.id,
-              version: postedCase.version,
-              description: newDesc,
-            },
-          ],
-        })
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(2);
-      expect(body[1].action_field).to.eql(['description']);
-      expect(body[1].action).to.eql('update');
-      expect(body[1].old_value).to.eql(postCaseReq.description);
-      expect(body[1].new_value).to.eql(newDesc);
-    });
-
-    it(`on new comment, user action: 'create' should be called with actionFields: ['comments']`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(2);
-      expect(body[1].action_field).to.eql(['comment']);
-      expect(body[1].action).to.eql('create');
-      expect(body[1].old_value).to.eql(null);
-      expect(JSON.parse(body[1].new_value)).to.eql(postCommentUserReq);
-    });
-
-    it(`on update comment, user action: 'update' should be called with actionFields: ['comments']`, async () => {
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send(postCaseReq)
-        .expect(200);
-
-      const { body: patchedCase } = await supertest
-        .post(`${CASES_URL}/${postedCase.id}/comments`)
-        .set('kbn-xsrf', 'true')
-        .send(postCommentUserReq)
-        .expect(200);
-
-      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
-      await supertest.patch(`${CASES_URL}/${postedCase.id}/comments`).set('kbn-xsrf', 'true').send({
-        id: patchedCase.comments[0].id,
-        version: patchedCase.comments[0].version,
-        comment: newComment,
-        type: CommentType.user,
-      });
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(3);
-      expect(body[2].action_field).to.eql(['comment']);
-      expect(body[2].action).to.eql('update');
-      expect(JSON.parse(body[2].old_value)).to.eql(postCommentUserReq);
-      expect(JSON.parse(body[2].new_value)).to.eql({
-        comment: newComment,
-        type: CommentType.user,
-      });
-    });
-
-    it(`on new push to service, user action: 'push-to-service' should be called with actionFields: ['pushed']`, async () => {
-      const { body: connector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...getServiceNowConnector(),
-          config: { apiUrl: servicenowSimulatorURL },
-        })
-        .expect(200);
-
-      actionsRemover.add('default', connector.id, 'action', 'actions');
-
-      const { body: configure } = await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(
-          getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-          })
-        )
-        .expect(200);
-
-      const { body: postedCase } = await supertest
-        .post(CASES_URL)
-        .set('kbn-xsrf', 'true')
-        .send({
-          ...postCaseReq,
-          connector: getConfiguration({
-            id: connector.id,
-            name: connector.name,
-            type: connector.actionTypeId,
-            fields: {
-              urgency: '2',
-              impact: '2',
-              severity: '2',
-              category: 'software',
-              subcategory: 'os',
-            },
-          }).connector,
-        })
-        .expect(200);
-
-      await supertest
-        .post(`${CASES_URL}/${postedCase.id}/connector/${connector.id}/_push`)
-        .set('kbn-xsrf', 'true')
-        .send({})
-        .expect(200);
-
-      const { body } = await supertest
-        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body.length).to.eql(2);
-      expect(body[1].action_field).to.eql(['pushed']);
-      expect(body[1].action).to.eql('push-to-service');
-      expect(body[1].old_value).to.eql(null);
-      const newValue = JSON.parse(body[1].new_value);
-      expect(newValue.connector_id).to.eql(configure.connector.id);
-      expect(newValue.pushed_by).to.eql(defaultUser);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/cases/user_actions/migrations.ts b/x-pack/test/case_api_integration/basic/tests/cases/user_actions/migrations.ts
deleted file mode 100644
index d0f852b3f57e7..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/cases/user_actions/migrations.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 expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../../common/ftr_provider_context';
-import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
-
-// eslint-disable-next-line import/no-default-export
-export default function createGetTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-
-  describe('migrations', () => {
-    before(async () => {
-      await esArchiver.load('cases/migrations/7.10.0');
-    });
-
-    after(async () => {
-      await esArchiver.unload('cases/migrations/7.10.0');
-    });
-
-    it('7.10.0 migrates user actions connector', async () => {
-      const { body } = await supertest
-        .get(`${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509/user_actions`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      const connectorUserAction = body[1];
-      const oldValue = JSON.parse(connectorUserAction.old_value);
-      const newValue = JSON.parse(connectorUserAction.new_value);
-
-      expect(connectorUserAction.action_field.length).eql(1);
-      expect(connectorUserAction.action_field[0]).eql('connector');
-      expect(oldValue).to.eql({
-        id: 'c1900ac0-017f-11eb-93f8-d161651bf509',
-        name: 'none',
-        type: '.none',
-        fields: null,
-      });
-      expect(newValue).to.eql({
-        id: 'b1900ac0-017f-11eb-93f8-d161651bf509',
-        name: 'none',
-        type: '.none',
-        fields: null,
-      });
-    });
-  });
-}
diff --git a/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts
deleted file mode 100644
index c892edff2d458..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/configure/get_configure.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../common/ftr_provider_context';
-
-import { CASE_CONFIGURE_URL } from '../../../../../plugins/cases/common/constants';
-import {
-  getConfiguration,
-  removeServerGeneratedPropertiesFromConfigure,
-  getConfigurationOutput,
-  deleteConfiguration,
-} from '../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('get_configure', () => {
-    afterEach(async () => {
-      await deleteConfiguration(es);
-    });
-
-    it('should return an empty find body correctly if no configuration is loaded', async () => {
-      const { body } = await supertest
-        .get(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body).to.eql({});
-    });
-
-    it('should return a configuration', async () => {
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration())
-        .expect(200);
-
-      const { body } = await supertest
-        .get(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromConfigure(body);
-      expect(data).to.eql(getConfigurationOutput());
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/configure/get_connectors.ts b/x-pack/test/case_api_integration/basic/tests/configure/get_connectors.ts
deleted file mode 100644
index 7eaa5ca609cf8..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/configure/get_connectors.ts
+++ /dev/null
@@ -1,124 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../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,
-  getJiraConnector,
-  getResilientConnector,
-} from '../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const actionsRemover = new ActionsRemover(supertest);
-
-  describe('get_connectors', () => {
-    afterEach(async () => {
-      await actionsRemover.removeAll();
-    });
-
-    it('should return an empty find body correctly if no connectors are loaded', async () => {
-      const { body } = await supertest
-        .get(`${CASE_CONFIGURE_CONNECTORS_URL}/_find`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body).to.eql([]);
-    });
-
-    it('should return the correct connectors', async () => {
-      const { body: snConnector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send(getServiceNowConnector())
-        .expect(200);
-
-      const { body: emailConnector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send({
-          name: 'An email action',
-          actionTypeId: '.email',
-          config: {
-            service: '__json',
-            from: 'bob@example.com',
-          },
-          secrets: {
-            user: 'bob',
-            password: 'supersecret',
-          },
-        })
-        .expect(200);
-
-      const { body: jiraConnector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send(getJiraConnector())
-        .expect(200);
-
-      const { body: resilientConnector } = await supertest
-        .post('/api/actions/action')
-        .set('kbn-xsrf', 'true')
-        .send(getResilientConnector())
-        .expect(200);
-
-      actionsRemover.add('default', snConnector.id, 'action', 'actions');
-      actionsRemover.add('default', emailConnector.id, 'action', 'actions');
-      actionsRemover.add('default', jiraConnector.id, 'action', 'actions');
-      actionsRemover.add('default', resilientConnector.id, 'action', 'actions');
-
-      const { body: connectors } = await supertest
-        .get(`${CASE_CONFIGURE_CONNECTORS_URL}/_find`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-      expect(connectors).to.eql([
-        {
-          id: jiraConnector.id,
-          actionTypeId: '.jira',
-          name: 'Jira Connector',
-          config: {
-            apiUrl: 'http://some.non.existent.com',
-            projectKey: 'pkey',
-          },
-          isPreconfigured: false,
-          isMissingSecrets: false,
-          referencedByCount: 0,
-        },
-        {
-          id: resilientConnector.id,
-          actionTypeId: '.resilient',
-          name: 'Resilient Connector',
-          config: {
-            apiUrl: 'http://some.non.existent.com',
-            orgId: 'pkey',
-          },
-          isPreconfigured: false,
-          isMissingSecrets: false,
-          referencedByCount: 0,
-        },
-        {
-          id: snConnector.id,
-          actionTypeId: '.servicenow',
-          name: 'ServiceNow Connector',
-          config: {
-            apiUrl: 'http://some.non.existent.com',
-          },
-          isPreconfigured: false,
-          isMissingSecrets: false,
-          referencedByCount: 0,
-        },
-      ]);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/configure/migrations.ts b/x-pack/test/case_api_integration/basic/tests/configure/migrations.ts
deleted file mode 100644
index 4ee2021399fae..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/configure/migrations.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.
- */
-
-import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
-import { CASE_CONFIGURE_URL } from '../../../../../plugins/cases/common/constants';
-
-// eslint-disable-next-line import/no-default-export
-export default function createGetTests({ getService }: FtrProviderContext) {
-  const supertest = getService('supertest');
-  const esArchiver = getService('esArchiver');
-
-  describe('migrations', () => {
-    before(async () => {
-      await esArchiver.load('cases/migrations/7.10.0');
-    });
-
-    after(async () => {
-      await esArchiver.unload('cases/migrations/7.10.0');
-    });
-
-    it('7.10.0 migrates configure cases connector', async () => {
-      const { body } = await supertest
-        .get(`${CASE_CONFIGURE_URL}`)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      expect(body).key('connector');
-      expect(body).not.key('connector_id');
-      expect(body.connector).to.eql({
-        id: 'connector-1',
-        name: 'Connector 1',
-        type: '.none',
-        fields: null,
-      });
-    });
-  });
-}
diff --git a/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts
deleted file mode 100644
index ea4982a8f04ad..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/configure/patch_configure.ts
+++ /dev/null
@@ -1,112 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../common/ftr_provider_context';
-
-import { CASE_CONFIGURE_URL } from '../../../../../plugins/cases/common/constants';
-import {
-  getConfiguration,
-  removeServerGeneratedPropertiesFromConfigure,
-  getConfigurationOutput,
-  deleteConfiguration,
-} from '../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('patch_configure', () => {
-    afterEach(async () => {
-      await deleteConfiguration(es);
-    });
-
-    it('should patch a configuration', async () => {
-      const res = await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration())
-        .expect(200);
-
-      const { body } = await supertest
-        .patch(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send({ closure_type: 'close-by-pushing', version: res.body.version })
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromConfigure(body);
-      expect(data).to.eql({ ...getConfigurationOutput(true), closure_type: 'close-by-pushing' });
-    });
-
-    it('should not patch a configuration with unsupported connector type', async () => {
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration())
-        .expect(200);
-
-      await supertest
-        .patch(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        // @ts-ignore We need it to test unsupported types
-        .send(getConfiguration({ type: '.unsupported' }))
-        .expect(400);
-    });
-
-    it('should not patch a configuration with unsupported connector fields', async () => {
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration())
-        .expect(200);
-
-      await supertest
-        .patch(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        // @ts-ignore We need it to test unsupported fields
-        .send(getConfiguration({ type: '.jira', fields: { unsupported: 'value' } }))
-        .expect(400);
-    });
-
-    it('should handle patch request when there is no configuration', async () => {
-      const { body } = await supertest
-        .patch(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send({ closure_type: 'close-by-pushing', version: 'no-version' })
-        .expect(409);
-
-      expect(body).to.eql({
-        error: 'Conflict',
-        message:
-          'You can not patch this configuration since you did not created first with a post.',
-        statusCode: 409,
-      });
-    });
-
-    it('should handle patch request when versions are different', async () => {
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration())
-        .expect(200);
-
-      const { body } = await supertest
-        .patch(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send({ closure_type: 'close-by-pushing', version: 'no-version' })
-        .expect(409);
-
-      expect(body).to.eql({
-        error: 'Conflict',
-        message:
-          'This configuration has been updated. Please refresh before saving additional updates.',
-        statusCode: 409,
-      });
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts b/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts
deleted file mode 100644
index 7ab98a07cf046..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/configure/post_configure.ts
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 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 '../../../common/ftr_provider_context';
-
-import { CASE_CONFIGURE_URL } from '../../../../../plugins/cases/common/constants';
-import {
-  getConfiguration,
-  removeServerGeneratedPropertiesFromConfigure,
-  getConfigurationOutput,
-  deleteConfiguration,
-} from '../../../common/lib/utils';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ getService }: FtrProviderContext): void => {
-  const supertest = getService('supertest');
-  const es = getService('es');
-
-  describe('post_configure', () => {
-    afterEach(async () => {
-      await deleteConfiguration(es);
-    });
-
-    it('should create a configuration', async () => {
-      const { body } = await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration())
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromConfigure(body);
-      expect(data).to.eql(getConfigurationOutput());
-    });
-
-    it('should keep only the latest configuration', async () => {
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration({ id: 'connector-2' }))
-        .expect(200);
-
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send(getConfiguration())
-        .expect(200);
-
-      const { body } = await supertest
-        .get(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        .send()
-        .expect(200);
-
-      const data = removeServerGeneratedPropertiesFromConfigure(body);
-      expect(data).to.eql(getConfigurationOutput());
-    });
-
-    it('should not create a configuration with unsupported connector type', async () => {
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        // @ts-ignore We need it to test unsupported types
-        .send(getConfiguration({ type: '.unsupported' }))
-        .expect(400);
-    });
-
-    it('should not create a configuration with unsupported connector fields', async () => {
-      await supertest
-        .post(CASE_CONFIGURE_URL)
-        .set('kbn-xsrf', 'true')
-        // @ts-ignore We need it to test unsupported types
-        .send(getConfiguration({ type: '.jira', fields: { unsupported: 'value' } }))
-        .expect(400);
-    });
-  });
-};
diff --git a/x-pack/test/case_api_integration/basic/tests/index.ts b/x-pack/test/case_api_integration/basic/tests/index.ts
deleted file mode 100644
index 24e6b12138895..0000000000000
--- a/x-pack/test/case_api_integration/basic/tests/index.ts
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-import { FtrProviderContext } from '../../common/ftr_provider_context';
-
-// eslint-disable-next-line import/no-default-export
-export default ({ loadTestFile }: FtrProviderContext): void => {
-  describe('case api basic', function () {
-    // Fastest ciGroup for the moment.
-    this.tags('ciGroup5');
-
-    loadTestFile(require.resolve('./cases/alerts/get_cases'));
-    loadTestFile(require.resolve('./cases/comments/delete_comment'));
-    loadTestFile(require.resolve('./cases/comments/find_comments'));
-    loadTestFile(require.resolve('./cases/comments/get_comment'));
-    loadTestFile(require.resolve('./cases/comments/get_all_comments'));
-    loadTestFile(require.resolve('./cases/comments/patch_comment'));
-    loadTestFile(require.resolve('./cases/comments/post_comment'));
-    loadTestFile(require.resolve('./cases/delete_cases'));
-    loadTestFile(require.resolve('./cases/find_cases'));
-    loadTestFile(require.resolve('./cases/get_case'));
-    loadTestFile(require.resolve('./cases/patch_cases'));
-    loadTestFile(require.resolve('./cases/post_case'));
-    loadTestFile(require.resolve('./cases/push_case'));
-    loadTestFile(require.resolve('./cases/reporters/get_reporters'));
-    loadTestFile(require.resolve('./cases/status/get_status'));
-    loadTestFile(require.resolve('./cases/tags/get_tags'));
-    loadTestFile(require.resolve('./cases/user_actions/get_all_user_actions'));
-    loadTestFile(require.resolve('./configure/get_configure'));
-    loadTestFile(require.resolve('./configure/get_connectors'));
-    loadTestFile(require.resolve('./configure/patch_configure'));
-    loadTestFile(require.resolve('./configure/post_configure'));
-    loadTestFile(require.resolve('./connectors/case'));
-    loadTestFile(require.resolve('./cases/sub_cases/patch_sub_cases'));
-    loadTestFile(require.resolve('./cases/sub_cases/delete_sub_cases'));
-    loadTestFile(require.resolve('./cases/sub_cases/get_sub_case'));
-    loadTestFile(require.resolve('./cases/sub_cases/find_sub_cases'));
-
-    // Migrations
-    loadTestFile(require.resolve('./cases/migrations'));
-    loadTestFile(require.resolve('./configure/migrations'));
-    loadTestFile(require.resolve('./cases/user_actions/migrations'));
-  });
-};
diff --git a/x-pack/test/case_api_integration/common/config.ts b/x-pack/test/case_api_integration/common/config.ts
index 8beabe450f66e..6c81f1fcfa264 100644
--- a/x-pack/test/case_api_integration/common/config.ts
+++ b/x-pack/test/case_api_integration/common/config.ts
@@ -17,6 +17,7 @@ interface CreateTestConfigOptions {
   license: string;
   disabledPlugins?: string[];
   ssl?: boolean;
+  testFiles?: string[];
 }
 
 // test.not-enabled is specifically not enabled
@@ -28,6 +29,7 @@ const enabledActionTypes = [
   '.resilient',
   '.server-log',
   '.servicenow',
+  '.servicenow-sir',
   '.slack',
   '.webhook',
   '.case',
@@ -39,7 +41,7 @@ const enabledActionTypes = [
 ];
 
 export function createTestConfig(name: string, options: CreateTestConfigOptions) {
-  const { license = 'trial', disabledPlugins = [], ssl = false } = options;
+  const { license = 'trial', disabledPlugins = [], ssl = false, testFiles = [] } = options;
 
   return async ({ readConfigFile }: FtrConfigProviderContext) => {
     const xPackApiIntegrationTestsConfig = await readConfigFile(
@@ -54,7 +56,14 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       },
     };
 
-    const allFiles = fs.readdirSync(
+    // Find all folders in ./fixtures/plugins
+    const allFiles = fs.readdirSync(path.resolve(__dirname, 'fixtures', 'plugins'));
+    const plugins = allFiles.filter((file) =>
+      fs.statSync(path.resolve(__dirname, 'fixtures', 'plugins', file)).isDirectory()
+    );
+
+    // This is needed so that we can correctly use the alerting test frameworks mock implementation for the connectors.
+    const alertingAllFiles = fs.readdirSync(
       path.resolve(
         __dirname,
         '..',
@@ -65,7 +74,8 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         'plugins'
       )
     );
-    const plugins = allFiles.filter((file) =>
+
+    const alertingPlugins = alertingAllFiles.filter((file) =>
       fs
         .statSync(
           path.resolve(
@@ -83,13 +93,12 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
     );
 
     return {
-      testFiles: [require.resolve(`../${name}/tests/`)],
+      testFiles: testFiles ? testFiles : [require.resolve('../tests/common')],
       servers,
       services,
       junit: {
         reportName: 'X-Pack Case API Integration Tests',
       },
-      esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'),
       esTestCluster: {
         ...xPackApiIntegrationTestsConfig.get('esTestCluster'),
         license,
@@ -109,7 +118,8 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
           `--xpack.actions.enabledActionTypes=${JSON.stringify(enabledActionTypes)}`,
           '--xpack.eventLog.logEntries=true',
           ...disabledPlugins.map((key) => `--xpack.${key}.enabled=false`),
-          ...plugins.map(
+          // Actions simulators plugin. Needed for testing push to external services.
+          ...alertingPlugins.map(
             (pluginDir) =>
               `--plugin-path=${path.resolve(
                 __dirname,
@@ -122,6 +132,10 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
                 pluginDir
               )}`
           ),
+          ...plugins.map(
+            (pluginDir) =>
+              `--plugin-path=${path.resolve(__dirname, 'fixtures', 'plugins', pluginDir)}`
+          ),
           `--server.xsrf.whitelist=${JSON.stringify(getAllExternalServiceSimulatorPaths())}`,
           ...(ssl
             ? [
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/kibana.json b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/kibana.json
new file mode 100644
index 0000000000000..21dd9a58ffaad
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "casesClientUserFixture",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "configPath": ["xpack"],
+  "requiredPlugins": ["features", "cases"],
+  "optionalPlugins": ["security",  "spaces"],
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/package.json b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/package.json
new file mode 100644
index 0000000000000..d396141fb0059
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "cases-client-user-fixture",
+  "version": "1.0.0",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "main": "target/test/plugin_api_integration/plugins/cases_client_user_fixture",
+  "scripts": {
+    "kbn": "node ../../../../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && ../../../../../../../node_modules/.bin/tsc"
+  },
+  "license": "Elastic License 2.0"
+}
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/server/index.ts
new file mode 100644
index 0000000000000..d39c2f2e714df
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/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 { PluginInitializerContext } from 'kibana/server';
+import { FixturePlugin } from './plugin';
+
+export const plugin = (initializerContext: PluginInitializerContext) =>
+  new FixturePlugin(initializerContext);
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.ts
new file mode 100644
index 0000000000000..d26da34579dff
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/cases_client_user/server/plugin.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 { Plugin, CoreSetup, CoreStart, PluginInitializerContext, Logger } from 'kibana/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';
+
+export interface FixtureSetupDeps {
+  features: FeaturesPluginSetup;
+}
+
+export interface FixtureStartDeps {
+  security?: SecurityPluginStart;
+  spaces?: SpacesPluginStart;
+  cases?: CasesPluginStart;
+}
+
+export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps, FixtureStartDeps> {
+  private readonly log: Logger;
+  private casesPluginStart?: CasesPluginStart;
+  constructor(initContext: PluginInitializerContext) {
+    this.log = initContext.logger.get();
+  }
+
+  public setup(core: CoreSetup<FixtureStartDeps>, deps: FixtureSetupDeps) {
+    const router = core.http.createRouter();
+    /**
+     * This simply wraps the cases patch case api so that we can test updating the status of an alert using
+     * the cases client interface instead of going through the case plugin's RESTful interface
+     */
+    router.patch(
+      {
+        path: '/api/cases_user/cases',
+        validate: {
+          body: schema.object({}, { unknowns: 'allow' }),
+        },
+      },
+      async (context, request, response) => {
+        try {
+          const client = await this.casesPluginStart?.getCasesClientWithRequest(request);
+          if (!client) {
+            throw new Error('Cases client was undefined');
+          }
+
+          return response.ok({
+            body: await client.cases.update(request.body as CasesPatchRequest),
+          });
+        } catch (error) {
+          this.log.error(`CasesClientUser failure: ${error}`);
+          throw error;
+        }
+      }
+    );
+  }
+  public start(core: CoreStart, plugins: FixtureStartDeps) {
+    this.casesPluginStart = plugins.cases;
+  }
+  public stop() {}
+}
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/observability/kibana.json b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/kibana.json
new file mode 100644
index 0000000000000..5115f4e3a0d3b
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "observabilityFixtures",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "configPath": ["xpack"],
+  "requiredPlugins": ["features", "cases"],
+  "optionalPlugins": ["security",  "spaces"],
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/observability/package.json b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/package.json
new file mode 100644
index 0000000000000..4d199ccd1badc
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "observability-fixtures",
+  "version": "1.0.0",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "main": "target/test/plugin_api_integration/plugins/observability_fixtures",
+  "scripts": {
+    "kbn": "node ../../../../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && ../../../../../../../node_modules/.bin/tsc"
+  },
+  "license": "Elastic License 2.0"
+}
\ No newline at end of file
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/observability/server/index.ts b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/server/index.ts
new file mode 100644
index 0000000000000..700aee6bfd49d
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/server/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.
+ */
+
+import { FixturePlugin } from './plugin';
+
+export const plugin = () => new FixturePlugin();
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/observability/server/plugin.ts b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/server/plugin.ts
new file mode 100644
index 0000000000000..f94358be2bc19
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/observability/server/plugin.ts
@@ -0,0 +1,60 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { Plugin, CoreSetup } from 'kibana/server';
+
+import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
+import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
+import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
+
+export interface FixtureSetupDeps {
+  features: FeaturesPluginSetup;
+}
+
+export interface FixtureStartDeps {
+  security?: SecurityPluginStart;
+  spaces?: SpacesPluginStart;
+}
+
+export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps, FixtureStartDeps> {
+  public setup(core: CoreSetup<FixtureStartDeps>, deps: FixtureSetupDeps) {
+    const { features } = deps;
+    features.registerKibanaFeature({
+      id: 'observabilityFixture',
+      name: 'ObservabilityFixture',
+      app: ['kibana'],
+      category: { id: 'cases-fixtures', label: 'Cases Fixtures' },
+      cases: ['observabilityFixture'],
+      privileges: {
+        all: {
+          app: ['kibana'],
+          cases: {
+            all: ['observabilityFixture'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+        read: {
+          app: ['kibana'],
+          cases: {
+            read: ['observabilityFixture'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+      },
+    });
+  }
+  public start() {}
+  public stop() {}
+}
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/kibana.json b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/kibana.json
new file mode 100644
index 0000000000000..cdef22263b01e
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/kibana.json
@@ -0,0 +1,10 @@
+{
+  "id": "securitySolutionFixtures",
+  "version": "1.0.0",
+  "kibanaVersion": "kibana",
+  "configPath": ["xpack"],
+  "requiredPlugins": ["features", "cases"],
+  "optionalPlugins": ["security",  "spaces"],
+  "server": true,
+  "ui": false
+}
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/package.json b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/package.json
new file mode 100644
index 0000000000000..9a852dc1f0c49
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/package.json
@@ -0,0 +1,14 @@
+{
+  "name": "security-solution-fixtures",
+  "version": "1.0.0",
+  "kibana": {
+    "version": "kibana",
+    "templateVersion": "1.0.0"
+  },
+  "main": "target/test/plugin_api_integration/plugins/security_solution_fixtures",
+  "scripts": {
+    "kbn": "node ../../../../../../../scripts/kbn.js",
+    "build": "rm -rf './target' && ../../../../../../../node_modules/.bin/tsc"
+  },
+  "license": "Elastic License 2.0"
+}
\ No newline at end of file
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/server/index.ts b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/server/index.ts
new file mode 100644
index 0000000000000..700aee6bfd49d
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/server/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.
+ */
+
+import { FixturePlugin } from './plugin';
+
+export const plugin = () => new FixturePlugin();
diff --git a/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/server/plugin.ts
new file mode 100644
index 0000000000000..bd3569ef52816
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/fixtures/plugins/security_solution/server/plugin.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 { Plugin, CoreSetup } from 'kibana/server';
+
+import { PluginSetupContract as FeaturesPluginSetup } from '../../../../../../../plugins/features/server';
+import { SpacesPluginStart } from '../../../../../../../plugins/spaces/server';
+import { SecurityPluginStart } from '../../../../../../../plugins/security/server';
+
+export interface FixtureSetupDeps {
+  features: FeaturesPluginSetup;
+}
+
+export interface FixtureStartDeps {
+  security?: SecurityPluginStart;
+  spaces?: SpacesPluginStart;
+}
+
+export class FixturePlugin implements Plugin<void, void, FixtureSetupDeps, FixtureStartDeps> {
+  public setup(core: CoreSetup<FixtureStartDeps>, deps: FixtureSetupDeps) {
+    const { features } = deps;
+    features.registerKibanaFeature({
+      id: 'securitySolutionFixture',
+      name: 'SecuritySolutionFixture',
+      app: ['kibana'],
+      category: { id: 'cases-fixtures', label: 'Cases Fixtures' },
+      cases: ['securitySolutionFixture'],
+      privileges: {
+        all: {
+          app: ['kibana'],
+          cases: {
+            all: ['securitySolutionFixture'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+        read: {
+          app: ['kibana'],
+          cases: {
+            read: ['securitySolutionFixture'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+      },
+    });
+
+    features.registerKibanaFeature({
+      id: 'testDisabledFixtureID',
+      name: 'TestDisabledFixture',
+      app: ['kibana'],
+      category: { id: 'cases-fixtures', label: 'Cases Fixtures' },
+      // testDisabledFixture is disabled in space1
+      cases: ['testDisabledFixture'],
+      privileges: {
+        all: {
+          app: ['kibana'],
+          cases: {
+            all: ['testDisabledFixture'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+        read: {
+          app: ['kibana'],
+          cases: {
+            read: ['testDisabledFixture'],
+          },
+          savedObject: {
+            all: [],
+            read: [],
+          },
+          ui: [],
+        },
+      },
+    });
+  }
+  public start() {}
+  public stop() {}
+}
diff --git a/x-pack/test/case_api_integration/common/lib/authentication/index.ts b/x-pack/test/case_api_integration/common/lib/authentication/index.ts
new file mode 100644
index 0000000000000..86016b273ea44
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/lib/authentication/index.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 { FtrProviderContext as CommonFtrProviderContext } from '../../../common/ftr_provider_context';
+import { Role, User, UserInfo } from './types';
+import { users } from './users';
+import { roles } from './roles';
+import { spaces } from './spaces';
+
+export const getUserInfo = (user: User): UserInfo => ({
+  username: user.username,
+  full_name: user.username.replace('_', ' '),
+  email: `${user.username}@elastic.co`,
+});
+
+export const createSpaces = async (getService: CommonFtrProviderContext['getService']) => {
+  const spacesService = getService('spaces');
+  for (const space of spaces) {
+    await spacesService.create(space);
+  }
+};
+
+/**
+ * Creates the users and roles for use in the tests. Defaults to specific users and roles used by the security_and_spaces
+ * scenarios but can be passed specific ones as well.
+ */
+export const createUsersAndRoles = async (
+  getService: CommonFtrProviderContext['getService'],
+  usersToCreate: User[] = users,
+  rolesToCreate: Role[] = roles
+) => {
+  const security = getService('security');
+
+  const createRole = async ({ name, privileges }: Role) => {
+    return await security.role.create(name, privileges);
+  };
+
+  const createUser = async (user: User) => {
+    const userInfo = getUserInfo(user);
+
+    return await security.user.create(user.username, {
+      password: user.password,
+      roles: user.roles,
+      full_name: userInfo.full_name,
+      email: userInfo.email,
+    });
+  };
+
+  for (const role of rolesToCreate) {
+    await createRole(role);
+  }
+
+  for (const user of usersToCreate) {
+    await createUser(user);
+  }
+};
+
+export const deleteSpaces = async (getService: CommonFtrProviderContext['getService']) => {
+  const spacesService = getService('spaces');
+  for (const space of spaces) {
+    try {
+      await spacesService.delete(space.id);
+    } catch (error) {
+      // ignore errors because if a migration is run it will delete the .kibana index which remove the spaces and users
+    }
+  }
+};
+
+export const deleteUsersAndRoles = async (
+  getService: CommonFtrProviderContext['getService'],
+  usersToDelete: User[] = users,
+  rolesToDelete: Role[] = roles
+) => {
+  const security = getService('security');
+
+  for (const user of usersToDelete) {
+    try {
+      await security.user.delete(user.username);
+    } catch (error) {
+      // ignore errors because if a migration is run it will delete the .kibana index which remove the spaces and users
+    }
+  }
+
+  for (const role of rolesToDelete) {
+    try {
+      await security.role.delete(role.name);
+    } catch (error) {
+      // ignore errors because if a migration is run it will delete the .kibana index which remove the spaces and users
+    }
+  }
+};
+
+export const createSpacesAndUsers = async (getService: CommonFtrProviderContext['getService']) => {
+  await createSpaces(getService);
+  await createUsersAndRoles(getService);
+};
+
+export const deleteSpacesAndUsers = async (getService: CommonFtrProviderContext['getService']) => {
+  await deleteSpaces(getService);
+  await deleteUsersAndRoles(getService);
+};
diff --git a/x-pack/test/case_api_integration/common/lib/authentication/roles.ts b/x-pack/test/case_api_integration/common/lib/authentication/roles.ts
new file mode 100644
index 0000000000000..9ded86ef6524f
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/lib/authentication/roles.ts
@@ -0,0 +1,292 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { Role } from './types';
+
+export const noKibanaPrivileges: Role = {
+  name: 'no_kibana_privileges',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+  },
+};
+
+export const globalRead: Role = {
+  name: 'global_read',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          securitySolutionFixture: ['read'],
+          observabilityFixture: ['read'],
+          actions: ['read'],
+          actionsSimulators: ['read'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+export const testDisabledPluginAll: Role = {
+  name: 'test_disabled_plugin_all',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          testDisabledFixtureID: ['all'],
+          securitySolutionFixture: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['space1'],
+      },
+    ],
+  },
+};
+
+export const securitySolutionOnlyAll: Role = {
+  name: 'sec_only_all',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          securitySolutionFixture: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['space1'],
+      },
+    ],
+  },
+};
+
+export const securitySolutionOnlyRead: Role = {
+  name: 'sec_only_read',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          securitySolutionFixture: ['read'],
+          actions: ['read'],
+          actionsSimulators: ['read'],
+        },
+        spaces: ['space1'],
+      },
+    ],
+  },
+};
+
+export const observabilityOnlyAll: Role = {
+  name: 'obs_only_all',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          observabilityFixture: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['space1'],
+      },
+    ],
+  },
+};
+
+export const observabilityOnlyRead: Role = {
+  name: 'obs_only_read',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          observabilityFixture: ['read'],
+          actions: ['read'],
+          actionsSimulators: ['read'],
+        },
+        spaces: ['space1'],
+      },
+    ],
+  },
+};
+
+export const roles = [
+  noKibanaPrivileges,
+  globalRead,
+  securitySolutionOnlyAll,
+  securitySolutionOnlyRead,
+  observabilityOnlyAll,
+  observabilityOnlyRead,
+  testDisabledPluginAll,
+];
+
+/**
+ * These roles have access to all spaces.
+ */
+
+export const securitySolutionOnlyAllSpacesAll: Role = {
+  name: 'sec_only_all',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          securitySolutionFixture: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+export const securitySolutionOnlyReadSpacesAll: Role = {
+  name: 'sec_only_read',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          securitySolutionFixture: ['read'],
+          actions: ['read'],
+          actionsSimulators: ['read'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+export const observabilityOnlyAllSpacesAll: Role = {
+  name: 'obs_only_all',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          observabilityFixture: ['all'],
+          actions: ['all'],
+          actionsSimulators: ['all'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+export const observabilityOnlyReadSpacesAll: Role = {
+  name: 'obs_only_read',
+  privileges: {
+    elasticsearch: {
+      indices: [
+        {
+          names: ['*'],
+          privileges: ['all'],
+        },
+      ],
+    },
+    kibana: [
+      {
+        feature: {
+          observabilityFixture: ['read'],
+          actions: ['read'],
+          actionsSimulators: ['read'],
+        },
+        spaces: ['*'],
+      },
+    ],
+  },
+};
+
+/**
+ * These roles are specifically for the security_only tests where the spaces plugin is disabled. Most of the roles (except
+ * for noKibanaPrivileges) have spaces: ['*'] effectively giving it access to the default space since no other spaces
+ * will exist when the spaces plugin is disabled.
+ */
+export const rolesDefaultSpace = [
+  noKibanaPrivileges,
+  globalRead,
+  securitySolutionOnlyAllSpacesAll,
+  securitySolutionOnlyReadSpacesAll,
+  observabilityOnlyAllSpacesAll,
+  observabilityOnlyReadSpacesAll,
+];
diff --git a/x-pack/test/case_api_integration/common/lib/authentication/spaces.ts b/x-pack/test/case_api_integration/common/lib/authentication/spaces.ts
new file mode 100644
index 0000000000000..32b67397306f7
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/lib/authentication/spaces.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 { Space } from './types';
+
+const space1: Space = {
+  id: 'space1',
+  name: 'Space 1',
+  disabledFeatures: ['testDisabledFixtureID'],
+};
+
+const space2: Space = {
+  id: 'space2',
+  name: 'Space 2',
+  disabledFeatures: [],
+};
+
+export const spaces: Space[] = [space1, space2];
diff --git a/x-pack/test/case_api_integration/common/lib/authentication/types.ts b/x-pack/test/case_api_integration/common/lib/authentication/types.ts
new file mode 100644
index 0000000000000..3bf3629441f93
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/lib/authentication/types.ts
@@ -0,0 +1,54 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+export interface Space {
+  id: string;
+  namespace?: string;
+  name: string;
+  disabledFeatures: string[];
+}
+
+export interface User {
+  username: string;
+  password: string;
+  description?: string;
+  roles: string[];
+}
+
+export interface UserInfo {
+  username: string;
+  full_name: string;
+  email: string;
+}
+
+interface FeaturesPrivileges {
+  [featureId: string]: string[];
+}
+
+interface ElasticsearchIndices {
+  names: string[];
+  privileges: string[];
+}
+
+export interface ElasticSearchPrivilege {
+  cluster?: string[];
+  indices?: ElasticsearchIndices[];
+}
+
+export interface KibanaPrivilege {
+  spaces: string[];
+  base?: string[];
+  feature?: FeaturesPrivileges;
+}
+
+export interface Role {
+  name: string;
+  privileges: {
+    elasticsearch?: ElasticSearchPrivilege;
+    kibana?: KibanaPrivilege[];
+  };
+}
diff --git a/x-pack/test/case_api_integration/common/lib/authentication/users.ts b/x-pack/test/case_api_integration/common/lib/authentication/users.ts
new file mode 100644
index 0000000000000..d10e932f92405
--- /dev/null
+++ b/x-pack/test/case_api_integration/common/lib/authentication/users.ts
@@ -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 {
+  securitySolutionOnlyAll,
+  observabilityOnlyAll,
+  securitySolutionOnlyRead,
+  observabilityOnlyRead,
+  globalRead as globalReadRole,
+  noKibanaPrivileges as noKibanaPrivilegesRole,
+  securitySolutionOnlyAllSpacesAll,
+  securitySolutionOnlyReadSpacesAll,
+  observabilityOnlyAllSpacesAll,
+  observabilityOnlyReadSpacesAll,
+  testDisabledPluginAll,
+} from './roles';
+import { User } from './types';
+
+export const superUser: User = {
+  username: 'superuser',
+  password: 'superuser',
+  roles: ['superuser'],
+};
+
+export const testDisabled: User = {
+  username: 'test_disabled',
+  password: 'test_disabled',
+  roles: [testDisabledPluginAll.name],
+};
+
+export const secOnly: User = {
+  username: 'sec_only',
+  password: 'sec_only',
+  roles: [securitySolutionOnlyAll.name],
+};
+
+export const secOnlyRead: User = {
+  username: 'sec_only_read',
+  password: 'sec_only_read',
+  roles: [securitySolutionOnlyRead.name],
+};
+
+export const obsOnly: User = {
+  username: 'obs_only',
+  password: 'obs_only',
+  roles: [observabilityOnlyAll.name],
+};
+
+export const obsOnlyRead: User = {
+  username: 'obs_only_read',
+  password: 'obs_only_read',
+  roles: [observabilityOnlyRead.name],
+};
+
+export const obsSec: User = {
+  username: 'obs_sec',
+  password: 'obs_sec',
+  roles: [securitySolutionOnlyAll.name, observabilityOnlyAll.name],
+};
+
+export const obsSecRead: User = {
+  username: 'obs_sec_read',
+  password: 'obs_sec_read',
+  roles: [securitySolutionOnlyRead.name, observabilityOnlyRead.name],
+};
+
+export const globalRead: User = {
+  username: 'global_read',
+  password: 'global_read',
+  roles: [globalReadRole.name],
+};
+
+export const noKibanaPrivileges: User = {
+  username: 'no_kibana_privileges',
+  password: 'no_kibana_privileges',
+  roles: [noKibanaPrivilegesRole.name],
+};
+
+export const users = [
+  superUser,
+  secOnly,
+  secOnlyRead,
+  obsOnly,
+  obsOnlyRead,
+  obsSec,
+  obsSecRead,
+  globalRead,
+  noKibanaPrivileges,
+  testDisabled,
+];
+
+/**
+ * These users will have access to all spaces.
+ */
+
+export const secOnlySpacesAll: User = {
+  username: 'sec_only',
+  password: 'sec_only',
+  roles: [securitySolutionOnlyAllSpacesAll.name],
+};
+
+export const secOnlyReadSpacesAll: User = {
+  username: 'sec_only_read',
+  password: 'sec_only_read',
+  roles: [securitySolutionOnlyReadSpacesAll.name],
+};
+
+export const obsOnlySpacesAll: User = {
+  username: 'obs_only',
+  password: 'obs_only',
+  roles: [observabilityOnlyAllSpacesAll.name],
+};
+
+export const obsOnlyReadSpacesAll: User = {
+  username: 'obs_only_read',
+  password: 'obs_only_read',
+  roles: [observabilityOnlyReadSpacesAll.name],
+};
+
+export const obsSecSpacesAll: User = {
+  username: 'obs_sec',
+  password: 'obs_sec',
+  roles: [securitySolutionOnlyAllSpacesAll.name, observabilityOnlyAllSpacesAll.name],
+};
+
+export const obsSecReadSpacesAll: User = {
+  username: 'obs_sec_read',
+  password: 'obs_sec_read',
+  roles: [securitySolutionOnlyReadSpacesAll.name, observabilityOnlyReadSpacesAll.name],
+};
+
+/**
+ * These users are for the security_only tests because most of them have access to the default space instead of 'space1'
+ */
+export const usersDefaultSpace = [
+  superUser,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  obsOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  obsSecSpacesAll,
+  obsSecReadSpacesAll,
+  globalRead,
+  noKibanaPrivileges,
+];
diff --git a/x-pack/test/case_api_integration/common/lib/mock.ts b/x-pack/test/case_api_integration/common/lib/mock.ts
index 53dd6440a47df..015661b0158a1 100644
--- a/x-pack/test/case_api_integration/common/lib/mock.ts
+++ b/x-pack/test/case_api_integration/common/lib/mock.ts
@@ -31,6 +31,11 @@ import {
 } from '../../../../plugins/cases/common/api';
 
 export const defaultUser = { email: null, full_name: null, username: 'elastic' };
+/**
+ * A null filled user will occur when the security plugin is disabled
+ */
+export const nullUser = { email: null, full_name: null, username: null };
+
 export const postCaseReq: CasePostRequest = {
   description: 'This is a brand new case of a bad meanie defacing data',
   title: 'Super Bad Security Issue',
@@ -44,8 +49,17 @@ export const postCaseReq: CasePostRequest = {
   settings: {
     syncAlerts: true,
   },
+  owner: 'securitySolutionFixture',
 };
 
+/**
+ * Return a request for creating a case.
+ */
+export const getPostCaseRequest = (req?: Partial<CasePostRequest>): CasePostRequest => ({
+  ...postCaseReq,
+  ...req,
+});
+
 /**
  * The fields for creating a collection style case.
  */
@@ -65,6 +79,7 @@ export const userActionPostResp: CasesClientPostRequest = {
 export const postCommentUserReq: CommentRequestUserType = {
   comment: 'This is a cool comment',
   type: CommentType.user,
+  owner: 'securitySolutionFixture',
 };
 
 export const postCommentAlertReq: CommentRequestAlertType = {
@@ -72,6 +87,7 @@ export const postCommentAlertReq: CommentRequestAlertType = {
   index: 'test-index',
   rule: { id: 'test-rule-id', name: 'test-index-id' },
   type: CommentType.alert,
+  owner: 'securitySolutionFixture',
 };
 
 export const postCommentGenAlertReq: ContextTypeGeneratedAlertType = {
@@ -80,14 +96,15 @@ export const postCommentGenAlertReq: ContextTypeGeneratedAlertType = {
     { _id: 'test-id2', _index: 'test-index', ruleId: 'rule-id', ruleName: 'rule name' },
   ]),
   type: CommentType.generatedAlert,
+  owner: 'securitySolutionFixture',
 };
 
 export const postCaseResp = (
-  id: string,
+  id?: string | null,
   req: CasePostRequest = postCaseReq
 ): Partial<CaseResponse> => ({
   ...req,
-  id,
+  ...(id != null ? { id } : {}),
   comments: [],
   totalAlerts: 0,
   totalComment: 0,
@@ -156,60 +173,6 @@ export const subCaseResp = ({
   updated_by: defaultUser,
 });
 
-interface FormattedCollectionResponse {
-  caseInfo: Partial<CaseResponse>;
-  subCases?: Array<Partial<SubCaseResponse>>;
-  comments?: Array<Partial<CommentResponse>>;
-}
-
-export const formatCollectionResponse = (caseInfo: CaseResponse): FormattedCollectionResponse => {
-  const subCase = removeServerGeneratedPropertiesFromSubCase(caseInfo.subCases?.[0]);
-  return {
-    caseInfo: removeServerGeneratedPropertiesFromCaseCollection(caseInfo),
-    subCases: subCase ? [subCase] : undefined,
-    comments: removeServerGeneratedPropertiesFromComments(
-      caseInfo.subCases?.[0].comments ?? caseInfo.comments
-    ),
-  };
-};
-
-export const removeServerGeneratedPropertiesFromSubCase = (
-  subCase: Partial<SubCaseResponse> | undefined
-): Partial<SubCaseResponse> | undefined => {
-  if (!subCase) {
-    return;
-  }
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { closed_at, created_at, updated_at, version, comments, ...rest } = subCase;
-  return rest;
-};
-
-export const removeServerGeneratedPropertiesFromCaseCollection = (
-  config: Partial<CaseResponse>
-): Partial<CaseResponse> => {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { closed_at, created_at, updated_at, version, subCases, ...rest } = config;
-  return rest;
-};
-
-export const removeServerGeneratedPropertiesFromCase = (
-  config: Partial<CaseResponse>
-): Partial<CaseResponse> => {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { closed_at, created_at, updated_at, version, ...rest } = config;
-  return rest;
-};
-
-export const removeServerGeneratedPropertiesFromComments = (
-  comments: CommentResponse[] | undefined
-): Array<Partial<CommentResponse>> | undefined => {
-  return comments?.map((comment) => {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
-    const { created_at, updated_at, version, ...rest } = comment;
-    return rest;
-  });
-};
-
 const findCommon = {
   page: 1,
   per_page: 20,
diff --git a/x-pack/test/case_api_integration/common/lib/utils.ts b/x-pack/test/case_api_integration/common/lib/utils.ts
index f7ff49727df33..9ed5d84e54621 100644
--- a/x-pack/test/case_api_integration/common/lib/utils.ts
+++ b/x-pack/test/case_api_integration/common/lib/utils.ts
@@ -4,14 +4,24 @@
  * 2.0; you may not use this file except in compliance with the Elastic License
  * 2.0.
  */
-import expect from '@kbn/expect';
 
+import { omit } from 'lodash';
+import expect from '@kbn/expect';
 import type { ApiResponse, estypes } from '@elastic/elasticsearch';
 import type { KibanaClient } from '@elastic/elasticsearch/api/kibana';
 
 import * as st from 'supertest';
 import supertestAsPromised from 'supertest-as-promised';
-import { CASES_URL, SUB_CASES_PATCH_DEL_URL } from '../../../../plugins/cases/common/constants';
+import { ObjectRemover as ActionsRemover } from '../../../alerting_api_integration/common/lib';
+import {
+  CASES_URL,
+  CASE_CONFIGURE_CONNECTORS_URL,
+  CASE_CONFIGURE_URL,
+  CASE_REPORTERS_URL,
+  CASE_STATUS_URL,
+  CASE_TAGS_URL,
+  SUB_CASES_PATCH_DEL_URL,
+} from '../../../../plugins/cases/common/constants';
 import {
   CasesConfigureRequest,
   CasesConfigureResponse,
@@ -23,11 +33,26 @@ import {
   CaseStatuses,
   SubCasesResponse,
   CasesResponse,
+  CasesFindResponse,
+  CommentRequest,
+  CaseUserActionResponse,
+  SubCaseResponse,
+  CommentResponse,
+  CasesPatchRequest,
+  AllCommentsResponse,
+  CommentPatchRequest,
+  CasesConfigurePatch,
+  CasesStatusResponse,
+  CasesConfigurationsResponse,
+  CaseUserActionsResponse,
 } from '../../../../plugins/cases/common/api';
-import { postCollectionReq, postCommentGenAlertReq } from './mock';
-import { getSubCasesUrl } from '../../../../plugins/cases/common/api/helpers';
+import { getPostCaseRequest, postCollectionReq, postCommentGenAlertReq } from './mock';
+import { getCaseUserActionUrl, getSubCasesUrl } from '../../../../plugins/cases/common/api/helpers';
 import { ContextTypeGeneratedAlertType } from '../../../../plugins/cases/server/connectors';
 import { SignalHit } from '../../../../plugins/security_solution/server/lib/detection_engine/signals/types';
+import { ActionResult, FindActionResult } from '../../../../plugins/actions/server/types';
+import { User } from './authentication/types';
+import { superUser } from './authentication/users';
 
 function toArray<T>(input: T | T[]): T[] {
   if (Array.isArray(input)) {
@@ -47,7 +72,7 @@ export const getSignalsWithES = async ({
   es: KibanaClient;
   indices: string | string[];
   ids: string | string[];
-}): Promise<Map<string, Map<string, estypes.Hit<SignalHit>>>> => {
+}): Promise<Map<string, Map<string, estypes.SearchHit<SignalHit>>>> => {
   const signals: ApiResponse<estypes.SearchResponse<SignalHit>> = await es.search({
     index: indices,
     body: {
@@ -69,13 +94,13 @@ export const getSignalsWithES = async ({
   return signals.body.hits.hits.reduce((acc, hit) => {
     let indexMap = acc.get(hit._index);
     if (indexMap === undefined) {
-      indexMap = new Map<string, estypes.Hit<SignalHit>>([[hit._id, hit]]);
+      indexMap = new Map<string, estypes.SearchHit<SignalHit>>([[hit._id, hit]]);
     } else {
       indexMap.set(hit._id, hit);
     }
     acc.set(hit._index, indexMap);
     return acc;
-  }, new Map<string, Map<string, estypes.Hit<SignalHit>>>());
+  }, new Map<string, Map<string, estypes.SearchHit<SignalHit>>>());
 };
 
 interface SetStatusCasesParams {
@@ -144,11 +169,11 @@ export const createSubCase = async (args: {
  */
 export const createCaseAction = async (supertest: st.SuperTest<supertestAsPromised.Test>) => {
   const { body: createdAction } = await supertest
-    .post('/api/actions/action')
+    .post('/api/actions/connector')
     .set('kbn-xsrf', 'foo')
     .send({
       name: 'A case connector',
-      actionTypeId: '.case',
+      connector_type_id: '.case',
       config: {},
     })
     .expect(200);
@@ -162,7 +187,7 @@ export const deleteCaseAction = async (
   supertest: st.SuperTest<supertestAsPromised.Test>,
   id: string
 ) => {
-  await supertest.delete(`/api/actions/action/${id}`).set('kbn-xsrf', 'foo');
+  await supertest.delete(`/api/actions/connector/${id}`).set('kbn-xsrf', 'foo');
 };
 
 /**
@@ -231,7 +256,7 @@ export const createSubCaseComment = async ({
   }
 
   const caseConnector = await supertest
-    .post(`/api/actions/action/${actionIDToUse}/_execute`)
+    .post(`/api/actions/connector/${actionIDToUse}/_execute`)
     .set('kbn-xsrf', 'foo')
     .send({
       params: {
@@ -248,12 +273,17 @@ export const createSubCaseComment = async ({
   return { newSubCaseInfo: caseConnector.body.data, modifiedSubCases: closedSubCases };
 };
 
-export const getConfiguration = ({
+type ConfigRequestParams = Partial<CaseConnector> & {
+  overrides?: Record<string, unknown>;
+};
+
+export const getConfigurationRequest = ({
   id = 'none',
   name = 'none',
   type = ConnectorTypes.none,
   fields = null,
-}: Partial<CaseConnector> = {}): CasesConfigureRequest => {
+  overrides,
+}: ConfigRequestParams = {}): CasesConfigureRequest => {
   return {
     connector: {
       id,
@@ -262,22 +292,28 @@ export const getConfiguration = ({
       fields,
     } as CaseConnector,
     closure_type: 'close-by-user',
+    owner: 'securitySolutionFixture',
+    ...overrides,
   };
 };
 
-export const getConfigurationOutput = (update = false): Partial<CasesConfigureResponse> => {
+export const getConfigurationOutput = (
+  update = false,
+  overwrite = {}
+): Partial<CasesConfigureResponse> => {
   return {
-    ...getConfiguration(),
+    ...getConfigurationRequest(),
     error: null,
     mappings: [],
     created_by: { email: null, full_name: null, username: 'elastic' },
     updated_by: update ? { email: null, full_name: null, username: 'elastic' } : null,
+    ...overwrite,
   };
 };
 
 export const getServiceNowConnector = () => ({
   name: 'ServiceNow Connector',
-  actionTypeId: '.servicenow',
+  connector_type_id: '.servicenow',
   secrets: {
     username: 'admin',
     password: 'password',
@@ -289,7 +325,7 @@ export const getServiceNowConnector = () => ({
 
 export const getJiraConnector = () => ({
   name: 'Jira Connector',
-  actionTypeId: '.jira',
+  connector_type_id: '.jira',
   secrets: {
     email: 'elastic@elastic.co',
     apiToken: 'token',
@@ -320,7 +356,7 @@ export const getMappings = () => [
 
 export const getResilientConnector = () => ({
   name: 'Resilient Connector',
-  actionTypeId: '.resilient',
+  connector_type_id: '.resilient',
   secrets: {
     apiKeyId: 'id',
     apiKeySecret: 'secret',
@@ -331,43 +367,128 @@ export const getResilientConnector = () => ({
   },
 });
 
-export const removeServerGeneratedPropertiesFromConfigure = (
-  config: Partial<CasesConfigureResponse>
-): Partial<CasesConfigureResponse> => {
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  const { created_at, updated_at, version, ...rest } = config;
-  return rest;
+export const getServiceNowSIRConnector = () => ({
+  name: 'ServiceNow Connector',
+  connector_type_id: '.servicenow-sir',
+  secrets: {
+    username: 'admin',
+    password: 'password',
+  },
+  config: {
+    apiUrl: 'http://some.non.existent.com',
+  },
+});
+
+export const getWebhookConnector = () => ({
+  name: 'A generic Webhook action',
+  connector_type_id: '.webhook',
+  secrets: {
+    user: 'user',
+    password: 'password',
+  },
+  config: {
+    headers: {
+      'Content-Type': 'text/plain',
+    },
+    url: 'http://some.non.existent.com',
+  },
+});
+
+interface CommonSavedObjectAttributes {
+  id?: string | null;
+  created_at?: string | null;
+  updated_at?: string | null;
+  version?: string | null;
+  [key: string]: unknown;
+}
+
+const savedObjectCommonAttributes = ['created_at', 'updated_at', 'version', 'id'];
+
+const removeServerGeneratedPropertiesFromObject = <T extends object, K extends keyof T>(
+  object: T,
+  keys: K[]
+): Omit<T, K> => {
+  return omit<T, K>(object, keys);
+};
+export const removeServerGeneratedPropertiesFromSavedObject = <
+  T extends CommonSavedObjectAttributes
+>(
+  attributes: T,
+  keys: Array<keyof T> = []
+): Omit<T, typeof savedObjectCommonAttributes[number] | typeof keys[number]> => {
+  return removeServerGeneratedPropertiesFromObject(attributes, [
+    ...savedObjectCommonAttributes,
+    ...keys,
+  ]);
+};
+
+export const removeServerGeneratedPropertiesFromUserAction = (
+  attributes: CaseUserActionResponse
+) => {
+  const keysToRemove: Array<keyof CaseUserActionResponse> = ['action_id', 'action_at'];
+  return removeServerGeneratedPropertiesFromObject<
+    CaseUserActionResponse,
+    typeof keysToRemove[number]
+  >(attributes, keysToRemove);
+};
+
+export const removeServerGeneratedPropertiesFromSubCase = (
+  subCase: SubCaseResponse | undefined
+) => {
+  if (!subCase) {
+    return;
+  }
+
+  return removeServerGeneratedPropertiesFromSavedObject<SubCaseResponse>(subCase, [
+    'closed_at',
+    'comments',
+  ]);
+};
+
+export const removeServerGeneratedPropertiesFromCase = (
+  theCase: CaseResponse
+): Partial<CaseResponse> => {
+  return removeServerGeneratedPropertiesFromSavedObject<CaseResponse>(theCase, ['closed_at']);
+};
+
+export const removeServerGeneratedPropertiesFromComments = (
+  comments: CommentResponse[] | undefined
+): Array<Partial<CommentResponse>> | undefined => {
+  return comments?.map((comment) => {
+    return removeServerGeneratedPropertiesFromSavedObject<CommentResponse>(comment, []);
+  });
 };
 
 export const deleteAllCaseItems = async (es: KibanaClient) => {
   await Promise.all([
-    deleteCases(es),
+    deleteCasesByESQuery(es),
     deleteSubCases(es),
     deleteCasesUserActions(es),
     deleteComments(es),
     deleteConfiguration(es),
+    deleteMappings(es),
   ]);
 };
 
 export const deleteCasesUserActions = async (es: KibanaClient): Promise<void> => {
   await es.deleteByQuery({
     index: '.kibana',
-    // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
     q: 'type:cases-user-actions',
     wait_for_completion: true,
     refresh: true,
     body: {},
+    conflicts: 'proceed',
   });
 };
 
-export const deleteCases = async (es: KibanaClient): Promise<void> => {
+export const deleteCasesByESQuery = async (es: KibanaClient): Promise<void> => {
   await es.deleteByQuery({
     index: '.kibana',
-    // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
     q: 'type:cases',
     wait_for_completion: true,
     refresh: true,
     body: {},
+    conflicts: 'proceed',
   });
 };
 
@@ -378,32 +499,606 @@ export const deleteCases = async (es: KibanaClient): Promise<void> => {
 export const deleteSubCases = async (es: KibanaClient): Promise<void> => {
   await es.deleteByQuery({
     index: '.kibana',
-    // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
     q: 'type:cases-sub-case',
     wait_for_completion: true,
     refresh: true,
     body: {},
+    conflicts: 'proceed',
   });
 };
 
 export const deleteComments = async (es: KibanaClient): Promise<void> => {
   await es.deleteByQuery({
     index: '.kibana',
-    // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
     q: 'type:cases-comments',
     wait_for_completion: true,
     refresh: true,
     body: {},
+    conflicts: 'proceed',
   });
 };
 
 export const deleteConfiguration = async (es: KibanaClient): Promise<void> => {
   await es.deleteByQuery({
     index: '.kibana',
-    // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
     q: 'type:cases-configure',
     wait_for_completion: true,
     refresh: true,
     body: {},
+    conflicts: 'proceed',
+  });
+};
+
+export const deleteMappings = async (es: KibanaClient): Promise<void> => {
+  await es.deleteByQuery({
+    index: '.kibana',
+    q: 'type:cases-connector-mappings',
+    wait_for_completion: true,
+    refresh: true,
+    body: {},
+    conflicts: 'proceed',
+  });
+};
+
+export const superUserSpace1Auth = getAuthWithSuperUser();
+
+/**
+ * Returns an auth object with the specified space and user set as super user. The result can be passed to other utility
+ * functions.
+ */
+export function getAuthWithSuperUser(
+  space: string | null = 'space1'
+): { user: User; space: string | null } {
+  return { user: superUser, space };
+}
+
+/**
+ * Converts the space into the appropriate string for use by the actions remover utility object.
+ */
+export function getActionsSpace(space: string | null) {
+  return space ?? 'default';
+}
+
+export const getSpaceUrlPrefix = (spaceId: string | undefined | null) => {
+  return spaceId && spaceId !== 'default' ? `/s/${spaceId}` : ``;
+};
+
+interface OwnerEntity {
+  owner: string;
+}
+
+export const ensureSavedObjectIsAuthorized = (
+  entities: OwnerEntity[],
+  numberOfExpectedCases: number,
+  owners: string[]
+) => {
+  expect(entities.length).to.eql(numberOfExpectedCases);
+  entities.forEach((entity) => expect(owners.includes(entity.owner)).to.be(true));
+};
+
+export const createCaseWithConnector = async ({
+  supertest,
+  configureReq = {},
+  servicenowSimulatorURL,
+  actionsRemover,
+  auth = { user: superUser, space: null },
+  createCaseReq = getPostCaseRequest(),
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  servicenowSimulatorURL: string;
+  actionsRemover: ActionsRemover;
+  configureReq?: Record<string, unknown>;
+  auth?: { user: User; space: string | null };
+  createCaseReq?: CasePostRequest;
+}): Promise<{
+  postedCase: CaseResponse;
+  connector: CreateConnectorResponse;
+}> => {
+  const connector = await createConnector({
+    supertest,
+    req: {
+      ...getServiceNowConnector(),
+      config: { apiUrl: servicenowSimulatorURL },
+    },
+    auth,
   });
+
+  actionsRemover.add(auth.space ?? 'default', connector.id, 'action', 'actions');
+  await createConfiguration(
+    supertest,
+    {
+      ...getConfigurationRequest({
+        id: connector.id,
+        name: connector.name,
+        type: connector.connector_type_id as ConnectorTypes,
+      }),
+      ...configureReq,
+    },
+    200,
+    auth
+  );
+
+  const postedCase = await createCase(
+    supertest,
+    {
+      ...createCaseReq,
+      connector: {
+        id: connector.id,
+        name: connector.name,
+        type: connector.connector_type_id,
+        fields: {
+          urgency: '2',
+          impact: '2',
+          severity: '2',
+          category: 'software',
+          subcategory: 'os',
+        },
+      } as CaseConnector,
+    },
+    200,
+    auth
+  );
+
+  return { postedCase, connector };
+};
+
+export const createCase = async (
+  supertest: st.SuperTest<supertestAsPromised.Test>,
+  params: CasePostRequest,
+  expectedHttpCode: number = 200,
+  auth: { user: User; space: string | null } = { user: superUser, space: null }
+): Promise<CaseResponse> => {
+  const { body: theCase } = await supertest
+    .post(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(params)
+    .expect(expectedHttpCode);
+
+  return theCase;
+};
+
+/**
+ * Sends a delete request for the specified case IDs.
+ */
+export const deleteCases = async ({
+  supertest,
+  caseIDs,
+  expectedHttpCode = 204,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseIDs: string[];
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}) => {
+  const { body } = await supertest
+    .delete(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    // we need to json stringify here because just passing in the array of case IDs will cause a 400 with Kibana
+    // not being able to parse the array correctly. The format ids=["1", "2"] seems to work, which stringify outputs.
+    .query({ ids: JSON.stringify(caseIDs) })
+    .set('kbn-xsrf', 'true')
+    .send()
+    .expect(expectedHttpCode);
+
+  return body;
+};
+
+export const createComment = async ({
+  supertest,
+  caseId,
+  params,
+  auth = { user: superUser, space: null },
+  expectedHttpCode = 200,
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  params: CommentRequest;
+  auth?: { user: User; space: string | null };
+  expectedHttpCode?: number;
+}): Promise<CaseResponse> => {
+  const { body: theCase } = await supertest
+    .post(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(params)
+    .expect(expectedHttpCode);
+
+  return theCase;
+};
+
+export const updateCase = async ({
+  supertest,
+  params,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  params: CasesPatchRequest;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CaseResponse[]> => {
+  const { body: cases } = await supertest
+    .patch(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(params)
+    .expect(expectedHttpCode);
+
+  return cases;
+};
+
+export const getCaseUserActions = async ({
+  supertest,
+  caseID,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseID: string;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CaseUserActionsResponse> => {
+  const { body: userActions } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${getCaseUserActionUrl(caseID)}`)
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode);
+  return userActions;
+};
+
+export const deleteComment = async ({
+  supertest,
+  caseId,
+  commentId,
+  expectedHttpCode = 204,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  commentId: string;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<{} | Error> => {
+  const { body: comment } = await supertest
+    .delete(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments/${commentId}`)
+    .set('kbn-xsrf', 'true')
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode)
+    .send();
+
+  return comment;
+};
+
+export const deleteAllComments = async ({
+  supertest,
+  caseId,
+  expectedHttpCode = 204,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<{} | Error> => {
+  const { body: comment } = await supertest
+    .delete(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments`)
+    .set('kbn-xsrf', 'true')
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode)
+    .send();
+
+  return comment;
+};
+
+export const getAllComments = async ({
+  supertest,
+  caseId,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  auth?: { user: User; space: string | null };
+  expectedHttpCode?: number;
+}): Promise<AllCommentsResponse> => {
+  const { body: comments } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments`)
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode);
+
+  return comments;
+};
+
+export const getComment = async ({
+  supertest,
+  caseId,
+  commentId,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  commentId: string;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CommentResponse> => {
+  const { body: comment } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments/${commentId}`)
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode);
+
+  return comment;
+};
+
+export const updateComment = async ({
+  supertest,
+  caseId,
+  req,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  req: CommentPatchRequest;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CaseResponse> => {
+  const { body: res } = await supertest
+    .patch(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/comments`)
+    .set('kbn-xsrf', 'true')
+    .send(req)
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode);
+
+  return res;
+};
+
+export const getConfiguration = async ({
+  supertest,
+  query = { owner: 'securitySolutionFixture' },
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  query?: Record<string, unknown>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CasesConfigurationsResponse> => {
+  const { body: configuration } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASE_CONFIGURE_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .query(query)
+    .expect(expectedHttpCode);
+
+  return configuration;
+};
+
+export const createConfiguration = async (
+  supertest: st.SuperTest<supertestAsPromised.Test>,
+  req: CasesConfigureRequest = getConfigurationRequest(),
+  expectedHttpCode: number = 200,
+  auth: { user: User; space: string | null } = { user: superUser, space: null }
+): Promise<CasesConfigureResponse> => {
+  const { body: configuration } = await supertest
+    .post(`${getSpaceUrlPrefix(auth.space)}${CASE_CONFIGURE_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(req)
+    .expect(expectedHttpCode);
+
+  return configuration;
+};
+
+export type CreateConnectorResponse = Omit<ActionResult, 'actionTypeId'> & {
+  connector_type_id: string;
+};
+
+export const createConnector = async ({
+  supertest,
+  req,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  req: Record<string, unknown>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CreateConnectorResponse> => {
+  const { body: connector } = await supertest
+    .post(`${getSpaceUrlPrefix(auth.space)}/api/actions/connector`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(req)
+    .expect(expectedHttpCode);
+
+  return connector;
+};
+
+export const getCaseConnectors = async ({
+  supertest,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<FindActionResult[]> => {
+  const { body: connectors } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASE_CONFIGURE_CONNECTORS_URL}/_find`)
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode);
+
+  return connectors;
+};
+
+export const updateConfiguration = async (
+  supertest: st.SuperTest<supertestAsPromised.Test>,
+  id: string,
+  req: CasesConfigurePatch,
+  expectedHttpCode: number = 200,
+  auth: { user: User; space: string | null } = { user: superUser, space: null }
+): Promise<CasesConfigureResponse> => {
+  const { body: configuration } = await supertest
+    .patch(`${getSpaceUrlPrefix(auth.space)}${CASE_CONFIGURE_URL}/${id}`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send(req)
+    .expect(expectedHttpCode);
+
+  return configuration;
+};
+
+export const getAllCasesStatuses = async ({
+  supertest,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+  query = {},
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+  query?: Record<string, unknown>;
+}): Promise<CasesStatusResponse> => {
+  const { body: statuses } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASE_STATUS_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    .query({ ...query })
+    .expect(expectedHttpCode);
+
+  return statuses;
+};
+
+export const getCase = async ({
+  supertest,
+  caseId,
+  includeComments = false,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  includeComments?: boolean;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CaseResponse> => {
+  const { body: theCase } = await supertest
+    .get(
+      `${getSpaceUrlPrefix(auth?.space)}${CASES_URL}/${caseId}?includeComments=${includeComments}`
+    )
+    .set('kbn-xsrf', 'true')
+    .auth(auth.user.username, auth.user.password)
+    .expect(expectedHttpCode);
+
+  return theCase;
+};
+
+export const findCases = async ({
+  supertest,
+  query = {},
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  query?: Record<string, unknown>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CasesFindResponse> => {
+  const { body: res } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/_find`)
+    .auth(auth.user.username, auth.user.password)
+    .query({ sortOrder: 'asc', ...query })
+    .set('kbn-xsrf', 'true')
+    .send()
+    .expect(expectedHttpCode);
+
+  return res;
+};
+
+export const getCaseIDsByAlert = async ({
+  supertest,
+  alertID,
+  query = {},
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  alertID: string;
+  query?: Record<string, unknown>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<string[]> => {
+  const { body: res } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/alerts/${alertID}`)
+    .auth(auth.user.username, auth.user.password)
+    .query(query)
+    .expect(expectedHttpCode);
+
+  return res;
+};
+
+export const getTags = async ({
+  supertest,
+  query = {},
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  query?: Record<string, unknown>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CasesFindResponse> => {
+  const { body: res } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASE_TAGS_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .query({ ...query })
+    .expect(expectedHttpCode);
+
+  return res;
+};
+
+export const getReporters = async ({
+  supertest,
+  query = {},
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  query?: Record<string, unknown>;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CasesFindResponse> => {
+  const { body: res } = await supertest
+    .get(`${getSpaceUrlPrefix(auth.space)}${CASE_REPORTERS_URL}`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .query({ ...query })
+    .expect(expectedHttpCode);
+
+  return res;
+};
+
+export const pushCase = async ({
+  supertest,
+  caseId,
+  connectorId,
+  expectedHttpCode = 200,
+  auth = { user: superUser, space: null },
+}: {
+  supertest: st.SuperTest<supertestAsPromised.Test>;
+  caseId: string;
+  connectorId: string;
+  expectedHttpCode?: number;
+  auth?: { user: User; space: string | null };
+}): Promise<CaseResponse> => {
+  const { body: res } = await supertest
+    .post(`${getSpaceUrlPrefix(auth.space)}${CASES_URL}/${caseId}/connector/${connectorId}/_push`)
+    .auth(auth.user.username, auth.user.password)
+    .set('kbn-xsrf', 'true')
+    .send({})
+    .expect(expectedHttpCode);
+
+  return res;
 };
diff --git a/x-pack/test/case_api_integration/security_and_spaces/config_basic.ts b/x-pack/test/case_api_integration/security_and_spaces/config_basic.ts
new file mode 100644
index 0000000000000..98b7b1abe98e7
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/config_basic.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 { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('security_and_spaces', {
+  license: 'basic',
+  ssl: true,
+  testFiles: [require.resolve('./tests/basic')],
+});
diff --git a/x-pack/test/case_api_integration/security_and_spaces/config_trial.ts b/x-pack/test/case_api_integration/security_and_spaces/config_trial.ts
new file mode 100644
index 0000000000000..b5328fd83c2cb
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/config_trial.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 { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('security_and_spaces', {
+  license: 'trial',
+  ssl: true,
+  testFiles: [require.resolve('./tests/trial')],
+});
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/basic/cases/push_case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/cases/push_case.ts
new file mode 100644
index 0000000000000..5285b57f3be72
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/cases/push_case.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 { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+
+import { postCaseReq } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  deleteConfiguration,
+  getConfigurationRequest,
+  getServiceNowConnector,
+  createConnector,
+  createConfiguration,
+  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 => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('push_case', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteConfiguration(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should get 403 when trying to create a connector', async () => {
+      await createConnector({ supertest, req: getServiceNowConnector(), expectedHttpCode: 403 });
+    });
+
+    it('should get 404 when trying to push to a case without a valid connector id', async () => {
+      await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: 'not-exist',
+          name: 'Not exist',
+          type: ConnectorTypes.serviceNowITSM,
+        })
+      );
+
+      const postedCase = await createCase(supertest, {
+        ...postCaseReq,
+        connector: {
+          id: 'not-exist',
+          name: 'Not exist',
+          type: ConnectorTypes.serviceNowITSM,
+          fields: {
+            urgency: '2',
+            impact: '2',
+            severity: '2',
+            category: 'software',
+            subcategory: 'os',
+          },
+        },
+      });
+
+      await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: 'not-exist',
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/basic/configure/create_connector.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/configure/create_connector.ts
new file mode 100644
index 0000000000000..fe8e311b5e4f6
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/configure/create_connector.ts
@@ -0,0 +1,20 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { createConnector, getServiceNowConnector } from '../../../../common/lib/utils';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default function serviceNow({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+
+  describe('create service now action', () => {
+    it('should return 403 when creating a service now action', async () => {
+      await createConnector({ supertest, req: getServiceNowConnector(), expectedHttpCode: 403 });
+    });
+  });
+}
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.ts
new file mode 100644
index 0000000000000..90fbb10637434
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/basic/index.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 { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { createSpacesAndUsers, deleteSpacesAndUsers } from '../../../common/lib/authentication';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile, getService }: FtrProviderContext): void => {
+  describe('cases security and spaces enabled: basic', function () {
+    // Fastest ciGroup for the moment.
+    this.tags('ciGroup5');
+
+    before(async () => {
+      await createSpacesAndUsers(getService);
+    });
+
+    after(async () => {
+      await deleteSpacesAndUsers(getService);
+    });
+
+    // Basic
+    loadTestFile(require.resolve('./cases/push_case'));
+
+    // Common
+    loadTestFile(require.resolve('../common'));
+
+    // NOTE: These need to be at the end because they could delete the .kibana index and inadvertently remove the users and spaces
+    loadTestFile(require.resolve('../common/migrations'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
new file mode 100644
index 0000000000000..e34f879e3aff8
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/alerts/get_cases.ts
@@ -0,0 +1,312 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { getPostCaseRequest, postCommentAlertReq } from '../../../../common/lib/mock';
+import {
+  createCase,
+  createComment,
+  getCaseIDsByAlert,
+  deleteAllCaseItems,
+} from '../../../../common/lib/utils';
+import { CaseResponse } from '../../../../../../plugins/cases/common';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnly,
+  obsOnlyRead,
+  obsSec,
+  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 es = getService('es');
+
+  describe('get_cases using alertID', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should return all cases with the same alert ID attached to them', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(supertest, getPostCaseRequest()),
+        createCase(supertest, getPostCaseRequest()),
+        createCase(supertest, getPostCaseRequest()),
+      ]);
+
+      await Promise.all([
+        createComment({ supertest, caseId: case1.id, params: postCommentAlertReq }),
+        createComment({ supertest, caseId: case2.id, params: postCommentAlertReq }),
+        createComment({ supertest, caseId: case3.id, params: postCommentAlertReq }),
+      ]);
+
+      const caseIDsWithAlert = await getCaseIDsByAlert({ supertest, alertID: 'test-id' });
+
+      expect(caseIDsWithAlert.length).to.eql(3);
+      expect(caseIDsWithAlert).to.contain(case1.id);
+      expect(caseIDsWithAlert).to.contain(case2.id);
+      expect(caseIDsWithAlert).to.contain(case3.id);
+    });
+
+    it('should return all cases with the same alert ID when more than 100 cases', async () => {
+      // if there are more than 100 responses, the implementation sets the aggregation size to the
+      // specific value
+      const numCases = 102;
+      const createCasePromises: Array<Promise<CaseResponse>> = [];
+      for (let i = 0; i < numCases; i++) {
+        createCasePromises.push(createCase(supertest, getPostCaseRequest()));
+      }
+
+      const cases = await Promise.all(createCasePromises);
+
+      const commentPromises: Array<Promise<CaseResponse>> = [];
+      for (const caseInfo of cases) {
+        commentPromises.push(
+          createComment({ supertest, caseId: caseInfo.id, params: postCommentAlertReq })
+        );
+      }
+
+      await Promise.all(commentPromises);
+
+      const caseIDsWithAlert = await getCaseIDsByAlert({ supertest, alertID: 'test-id' });
+
+      expect(caseIDsWithAlert.length).to.eql(numCases);
+
+      for (const caseInfo of cases) {
+        expect(caseIDsWithAlert).to.contain(caseInfo.id);
+      }
+    });
+
+    it('should return no cases when the alert ID is not found', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(supertest, getPostCaseRequest()),
+        createCase(supertest, getPostCaseRequest()),
+        createCase(supertest, getPostCaseRequest()),
+      ]);
+
+      await Promise.all([
+        createComment({ supertest, caseId: case1.id, params: postCommentAlertReq }),
+        createComment({ supertest, caseId: case2.id, params: postCommentAlertReq }),
+        createComment({ supertest, caseId: case3.id, params: postCommentAlertReq }),
+      ]);
+
+      const caseIDsWithAlert = await getCaseIDsByAlert({ supertest, alertID: 'test-id100' });
+
+      expect(caseIDsWithAlert.length).to.eql(0);
+    });
+
+    it('should return no cases when the owner filters them out', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(supertest, getPostCaseRequest()),
+        createCase(supertest, getPostCaseRequest()),
+        createCase(supertest, getPostCaseRequest()),
+      ]);
+
+      await Promise.all([
+        createComment({ supertest, caseId: case1.id, params: postCommentAlertReq }),
+        createComment({ supertest, caseId: case2.id, params: postCommentAlertReq }),
+        createComment({ supertest, caseId: case3.id, params: postCommentAlertReq }),
+      ]);
+
+      const caseIDsWithAlert = await getCaseIDsByAlert({
+        supertest,
+        alertID: 'test-id',
+        query: { owner: 'not-real' },
+      });
+
+      expect(caseIDsWithAlert.length).to.eql(0);
+    });
+
+    it('should return a 302 when passing an empty alertID', async () => {
+      // kibana returns a 302 instead of a 400 when a url param is missing
+      await supertest.get(`${CASES_URL}/alerts/`).expect(302);
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      it('should return the correct case IDs', async () => {
+        const secOnlyAuth = { user: secOnly, space: 'space1' };
+        const obsOnlyAuth = { user: obsOnly, space: 'space1' };
+
+        const [case1, case2, case3] = await Promise.all([
+          createCase(supertestWithoutAuth, getPostCaseRequest(), 200, secOnlyAuth),
+          createCase(supertestWithoutAuth, getPostCaseRequest(), 200, secOnlyAuth),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            obsOnlyAuth
+          ),
+        ]);
+
+        await Promise.all([
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case1.id,
+            params: postCommentAlertReq,
+            auth: secOnlyAuth,
+          }),
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case2.id,
+            params: postCommentAlertReq,
+            auth: secOnlyAuth,
+          }),
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case3.id,
+            params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+            auth: obsOnlyAuth,
+          }),
+        ]);
+
+        for (const scenario of [
+          {
+            user: globalRead,
+            caseIDs: [case1.id, case2.id, case3.id],
+          },
+          {
+            user: superUser,
+            caseIDs: [case1.id, case2.id, case3.id],
+          },
+          { user: secOnlyRead, caseIDs: [case1.id, case2.id] },
+          { user: obsOnlyRead, caseIDs: [case3.id] },
+          {
+            user: obsSecRead,
+            caseIDs: [case1.id, case2.id, case3.id],
+          },
+        ]) {
+          const res = await getCaseIDsByAlert({
+            supertest: supertestWithoutAuth,
+            // cast because the official type is string | string[] but the ids will always be a single value in the tests
+            alertID: postCommentAlertReq.alertId as string,
+            auth: {
+              user: scenario.user,
+              space: 'space1',
+            },
+          });
+          expect(res.length).to.eql(scenario.caseIDs.length);
+          for (const caseID of scenario.caseIDs) {
+            expect(res).to.contain(caseID);
+          }
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`User ${scenario.user.username} with role(s) ${scenario.user.roles.join()} and space ${
+          scenario.space
+        } - should not get cases`, async () => {
+          const caseInfo = await createCase(supertest, getPostCaseRequest(), 200, {
+            user: superUser,
+            space: scenario.space,
+          });
+
+          await createComment({
+            supertest: supertestWithoutAuth,
+            caseId: caseInfo.id,
+            params: postCommentAlertReq,
+            auth: { user: superUser, space: scenario.space },
+          });
+
+          await getCaseIDsByAlert({
+            supertest: supertestWithoutAuth,
+            alertID: postCommentAlertReq.alertId as string,
+            auth: { user: scenario.user, space: scenario.space },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should respect the owner filter when have permissions', async () => {
+        const auth = { user: obsSec, space: 'space1' };
+        const [case1, case2] = await Promise.all([
+          createCase(supertestWithoutAuth, getPostCaseRequest(), 200, auth),
+          createCase(
+            supertestWithoutAuth,
+            { ...getPostCaseRequest(), owner: 'observabilityFixture' },
+            200,
+            auth
+          ),
+        ]);
+
+        await Promise.all([
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case1.id,
+            params: postCommentAlertReq,
+            auth,
+          }),
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case2.id,
+            params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+            auth,
+          }),
+        ]);
+
+        const res = await getCaseIDsByAlert({
+          supertest: supertestWithoutAuth,
+          alertID: postCommentAlertReq.alertId as string,
+          auth,
+          query: { owner: 'securitySolutionFixture' },
+        });
+
+        expect(res).to.eql([case1.id]);
+      });
+
+      it('should return the correct case IDs when the owner query parameter contains unprivileged values', async () => {
+        const auth = { user: obsSec, space: 'space1' };
+        const [case1, case2] = await Promise.all([
+          createCase(supertestWithoutAuth, getPostCaseRequest(), 200, auth),
+          createCase(
+            supertestWithoutAuth,
+            { ...getPostCaseRequest(), owner: 'observabilityFixture' },
+            200,
+            auth
+          ),
+        ]);
+
+        await Promise.all([
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case1.id,
+            params: postCommentAlertReq,
+            auth,
+          }),
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: case2.id,
+            params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+            auth,
+          }),
+        ]);
+
+        const res = await getCaseIDsByAlert({
+          supertest: supertestWithoutAuth,
+          alertID: postCommentAlertReq.alertId as string,
+          auth: { user: secOnly, space: 'space1' },
+          // The secOnly user does not have permissions for observability cases, so it should only return the security solution one
+          query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+        });
+
+        expect(res).to.eql([case1.id]);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/delete_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/delete_cases.ts
new file mode 100644
index 0000000000000..964e9135aba7b
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/delete_cases.ts
@@ -0,0 +1,318 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { defaultUser, getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  deleteCases,
+  createComment,
+  getComment,
+  removeServerGeneratedPropertiesFromUserAction,
+  getCase,
+  superUserSpace1Auth,
+  getCaseUserActions,
+} from '../../../../common/lib/utils';
+import { getSubCaseDetailsUrl } from '../../../../../../plugins/cases/common/api/helpers';
+import { CaseResponse } from '../../../../../../plugins/cases/common/api';
+import {
+  secOnly,
+  secOnlyRead,
+  globalRead,
+  obsOnlyRead,
+  obsSecRead,
+  noKibanaPrivileges,
+  obsOnly,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('delete_cases', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should delete a case', async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest());
+      const body = await deleteCases({ supertest, caseIDs: [postedCase.id] });
+
+      expect(body).to.eql({});
+    });
+
+    it(`should delete a case's comments when that case gets deleted`, async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest());
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+      // ensure that we can get the comment before deleting the case
+      await getComment({
+        supertest,
+        caseId: postedCase.id,
+        commentId: patchedCase.comments![0].id,
+      });
+
+      await deleteCases({ supertest, caseIDs: [postedCase.id] });
+
+      // make sure the comment is now gone
+      await getComment({
+        supertest,
+        caseId: postedCase.id,
+        commentId: patchedCase.comments![0].id,
+        expectedHttpCode: 404,
+      });
+    });
+
+    it('should create a user action when creating a case', async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest());
+      await deleteCases({ supertest, caseIDs: [postedCase.id] });
+      const userActions = await getCaseUserActions({ supertest, caseID: postedCase.id });
+      const creationUserAction = removeServerGeneratedPropertiesFromUserAction(userActions[1]);
+
+      expect(creationUserAction).to.eql({
+        action_field: [
+          'description',
+          'status',
+          'tags',
+          'title',
+          'connector',
+          'settings',
+          'owner',
+          'comment',
+        ],
+        action: 'delete',
+        action_by: defaultUser,
+        old_value: null,
+        new_value: null,
+        case_id: `${postedCase.id}`,
+        comment_id: null,
+        sub_case_id: '',
+        owner: 'securitySolutionFixture',
+      });
+    });
+
+    it('unhappy path - 404s when case is not there', async () => {
+      await deleteCases({ supertest, caseIDs: ['fake-id'], expectedHttpCode: 404 });
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('sub cases', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should delete the sub cases when deleting a collection', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
+
+        const body = await deleteCases({ supertest, caseIDs: [caseInfo.id] });
+
+        expect(body).to.eql({});
+        await supertest
+          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
+          .send()
+          .expect(404);
+      });
+
+      it(`should delete a sub case's comments when that case gets deleted`, async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
+
+        // there should be two comments on the sub case now
+        const { body: patchedCaseWithSubCase }: { body: CaseResponse } = await supertest
+          .post(`${CASES_URL}/${caseInfo.id}/comments`)
+          .set('kbn-xsrf', 'true')
+          .query({ subCaseId: caseInfo.subCases![0].id })
+          .send(postCommentUserReq)
+          .expect(200);
+
+        const subCaseCommentUrl = `${CASES_URL}/${patchedCaseWithSubCase.id}/comments/${
+          patchedCaseWithSubCase.comments![1].id
+        }`;
+        // make sure we can get the second comment
+        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(200);
+
+        await deleteCases({ supertest, caseIDs: [caseInfo.id] });
+
+        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(404);
+      });
+    });
+
+    describe('rbac', () => {
+      it('User: security solution only - should delete a case', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        await deleteCases({
+          supertest: supertestWithoutAuth,
+          caseIDs: [postedCase.id],
+          expectedHttpCode: 204,
+          auth: { user: secOnly, space: 'space1' },
+        });
+      });
+
+      it('User: security solution only - should NOT delete a case of different owner', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        await deleteCases({
+          supertest: supertestWithoutAuth,
+          caseIDs: [postedCase.id],
+          expectedHttpCode: 403,
+          auth: { user: obsOnly, space: 'space1' },
+        });
+      });
+
+      it('should get an error if the user has not permissions to all requested cases', async () => {
+        const caseSec = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        const caseObs = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          {
+            user: obsOnly,
+            space: 'space1',
+          }
+        );
+
+        await deleteCases({
+          supertest: supertestWithoutAuth,
+          caseIDs: [caseSec.id, caseObs.id],
+          expectedHttpCode: 403,
+          auth: { user: obsOnly, space: 'space1' },
+        });
+
+        // Cases should have not been deleted.
+        await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: caseSec.id,
+          expectedHttpCode: 200,
+          auth: superUserSpace1Auth,
+        });
+
+        await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: caseObs.id,
+          expectedHttpCode: 200,
+          auth: superUserSpace1Auth,
+        });
+      });
+
+      for (const user of [globalRead, secOnlyRead, obsOnlyRead, obsSecRead, noKibanaPrivileges]) {
+        it(`User ${
+          user.username
+        } with role(s) ${user.roles.join()} - should NOT delete a case`, async () => {
+          const postedCase = await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          );
+
+          await deleteCases({
+            supertest: supertestWithoutAuth,
+            caseIDs: [postedCase.id],
+            expectedHttpCode: 403,
+            auth: { user, space: 'space1' },
+          });
+        });
+      }
+
+      it('should NOT delete a case in a space with no permissions', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space2',
+          }
+        );
+
+        /**
+         * secOnly does not have access to space2 so it should 403
+         */
+        await deleteCases({
+          supertest: supertestWithoutAuth,
+          caseIDs: [postedCase.id],
+          expectedHttpCode: 403,
+          auth: { user: secOnly, space: 'space2' },
+        });
+      });
+
+      it('should NOT delete a case created in space2 by making a request to space1', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space2',
+          }
+        );
+
+        await deleteCases({
+          supertest: supertestWithoutAuth,
+          caseIDs: [postedCase.id],
+          expectedHttpCode: 404,
+          auth: { user: secOnly, space: 'space1' },
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/find_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
new file mode 100644
index 0000000000000..b7838dd9299bc
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/find_cases.ts
@@ -0,0 +1,815 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 type { ApiResponse, estypes } from '@elastic/elasticsearch';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+  CASES_URL,
+  SUB_CASES_PATCH_DEL_URL,
+} from '../../../../../../plugins/cases/common/constants';
+import {
+  postCaseReq,
+  postCommentUserReq,
+  findCasesResp,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createSubCase,
+  setStatus,
+  CreateSubCaseResp,
+  createCaseAction,
+  deleteCaseAction,
+  ensureSavedObjectIsAuthorized,
+  findCases,
+  createCase,
+  updateCase,
+  createComment,
+} from '../../../../common/lib/utils';
+import { CaseResponse, CaseStatuses, CaseType } from '../../../../../../plugins/cases/common/api';
+import {
+  obsOnly,
+  secOnly,
+  obsOnlyRead,
+  secOnlyRead,
+  noKibanaPrivileges,
+  superUser,
+  globalRead,
+  obsSecRead,
+  obsSec,
+} from '../../../../common/lib/authentication/users';
+
+interface CaseAttributes {
+  cases: {
+    title: string;
+  };
+}
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  describe('find_cases', () => {
+    describe('basic tests', () => {
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should return empty response', async () => {
+        const cases = await findCases({ supertest });
+        expect(cases).to.eql(findCasesResp);
+      });
+
+      it('should return cases', async () => {
+        const a = await createCase(supertest, postCaseReq);
+        const b = await createCase(supertest, postCaseReq);
+        const c = await createCase(supertest, postCaseReq);
+
+        const cases = await findCases({ supertest });
+
+        expect(cases).to.eql({
+          ...findCasesResp,
+          total: 3,
+          cases: [a, b, c],
+          count_open_cases: 3,
+        });
+      });
+
+      it('filters by tags', async () => {
+        await createCase(supertest, postCaseReq);
+        const postedCase = await createCase(supertest, { ...postCaseReq, tags: ['unique'] });
+        const cases = await findCases({ supertest, query: { tags: ['unique'] } });
+
+        expect(cases).to.eql({
+          ...findCasesResp,
+          total: 1,
+          cases: [postedCase],
+          count_open_cases: 1,
+        });
+      });
+
+      it('filters by status', async () => {
+        await createCase(supertest, postCaseReq);
+        const toCloseCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: toCloseCase.id,
+                version: toCloseCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+        });
+
+        const cases = await findCases({ supertest, query: { status: CaseStatuses.closed } });
+
+        expect(cases).to.eql({
+          ...findCasesResp,
+          total: 1,
+          cases: [patchedCase[0]],
+          count_open_cases: 1,
+          count_closed_cases: 1,
+          count_in_progress_cases: 0,
+        });
+      });
+
+      it('filters by reporters', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const cases = await findCases({ supertest, query: { reporters: 'elastic' } });
+
+        expect(cases).to.eql({
+          ...findCasesResp,
+          total: 1,
+          cases: [postedCase],
+          count_open_cases: 1,
+        });
+      });
+
+      it('correctly counts comments', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        // post 2 comments
+        await createComment({ supertest, caseId: postedCase.id, params: postCommentUserReq });
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+        });
+
+        const cases = await findCases({ supertest });
+        expect(cases).to.eql({
+          ...findCasesResp,
+          total: 1,
+          cases: [
+            {
+              ...patchedCase,
+              comments: [],
+              totalComment: 2,
+            },
+          ],
+          count_open_cases: 1,
+        });
+      });
+
+      it('correctly counts open/closed/in-progress', async () => {
+        await createCase(supertest, postCaseReq);
+        const inProgressCase = await createCase(supertest, postCaseReq);
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+        });
+
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: inProgressCase.id,
+                version: inProgressCase.version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+          },
+        });
+
+        const cases = await findCases({ supertest });
+        expect(cases.count_open_cases).to.eql(1);
+        expect(cases.count_closed_cases).to.eql(1);
+        expect(cases.count_in_progress_cases).to.eql(1);
+      });
+
+      it('unhappy path - 400s when bad query supplied', async () => {
+        await findCases({ supertest, query: { perPage: true }, expectedHttpCode: 400 });
+      });
+
+      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+      describe.skip('stats with sub cases', () => {
+        let collection: CreateSubCaseResp;
+        let actionID: string;
+        before(async () => {
+          actionID = await createCaseAction(supertest);
+        });
+        after(async () => {
+          await deleteCaseAction(supertest, actionID);
+        });
+        beforeEach(async () => {
+          // create a collection with a sub case that is marked as open
+          collection = await createSubCase({ supertest, actionID });
+
+          const [, , { body: toCloseCase }] = await Promise.all([
+            // set the sub case to in-progress
+            setStatus({
+              supertest,
+              cases: [
+                {
+                  id: collection.newSubCaseInfo.subCases![0].id,
+                  version: collection.newSubCaseInfo.subCases![0].version,
+                  status: CaseStatuses['in-progress'],
+                },
+              ],
+              type: 'sub_case',
+            }),
+            // create two cases that are both open
+            supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq),
+            supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(postCaseReq),
+          ]);
+
+          // set the third case to closed
+          await setStatus({
+            supertest,
+            cases: [
+              {
+                id: toCloseCase.id,
+                version: toCloseCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+            type: 'case',
+          });
+        });
+        it('correctly counts stats without using a filter', async () => {
+          const cases = await findCases({ supertest });
+
+          expect(cases.total).to.eql(3);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(1);
+        });
+
+        it('correctly counts stats with a filter for open cases', async () => {
+          const cases = await findCases({ supertest, query: { status: CaseStatuses.open } });
+
+          expect(cases.cases.length).to.eql(1);
+
+          // since we're filtering on status and the collection only has an in-progress case, it should only return the
+          // individual case that has the open status and no collections
+          // ENABLE_CASE_CONNECTOR: this value is not correct because it includes a collection
+          // that does not have an open case. This is a known issue and will need to be resolved
+          // when this issue is addressed: https://github.com/elastic/kibana/issues/94115
+          expect(cases.total).to.eql(2);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(1);
+        });
+
+        it('correctly counts stats with a filter for individual cases', async () => {
+          const cases = await findCases({ supertest, query: { type: CaseType.individual } });
+
+          expect(cases.total).to.eql(2);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(0);
+        });
+
+        it('correctly counts stats with a filter for collection cases with multiple sub cases', async () => {
+          // this will force the first sub case attached to the collection to be closed
+          // so we'll have one closed sub case and one open sub case
+          await createSubCase({ supertest, caseID: collection.newSubCaseInfo.id, actionID });
+          const cases = await findCases({ supertest, query: { type: CaseType.collection } });
+
+          expect(cases.total).to.eql(1);
+          expect(cases.cases[0].subCases?.length).to.eql(2);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(0);
+        });
+
+        it('correctly counts stats with a filter for collection and open cases with multiple sub cases', async () => {
+          // this will force the first sub case attached to the collection to be closed
+          // so we'll have one closed sub case and one open sub case
+          await createSubCase({ supertest, caseID: collection.newSubCaseInfo.id, actionID });
+          const cases = await findCases({
+            supertest,
+            query: {
+              type: CaseType.collection,
+              status: CaseStatuses.open,
+            },
+          });
+
+          expect(cases.total).to.eql(1);
+          expect(cases.cases[0].subCases?.length).to.eql(1);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(0);
+        });
+
+        it('correctly counts stats including a collection without sub cases when not filtering on status', async () => {
+          // delete the sub case on the collection so that it doesn't have any sub cases
+          await supertest
+            .delete(
+              `${SUB_CASES_PATCH_DEL_URL}?ids=["${collection.newSubCaseInfo.subCases![0].id}"]`
+            )
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(204);
+
+          const cases = await findCases({ supertest, query: { type: CaseType.collection } });
+
+          // it should include the collection without sub cases because we did not pass in a filter on status
+          expect(cases.total).to.eql(3);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(0);
+        });
+
+        it('correctly counts stats including a collection without sub cases when filtering on tags', async () => {
+          // delete the sub case on the collection so that it doesn't have any sub cases
+          await supertest
+            .delete(
+              `${SUB_CASES_PATCH_DEL_URL}?ids=["${collection.newSubCaseInfo.subCases![0].id}"]`
+            )
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(204);
+
+          const cases = await findCases({ supertest, query: { tags: ['defacement'] } });
+
+          // it should include the collection without sub cases because we did not pass in a filter on status
+          expect(cases.total).to.eql(3);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(0);
+        });
+
+        it('does not return collections without sub cases matching the requested status', async () => {
+          const cases = await findCases({ supertest, query: { status: CaseStatuses.closed } });
+
+          expect(cases.cases.length).to.eql(1);
+          // it should not include the collection that has a sub case as in-progress
+          // ENABLE_CASE_CONNECTOR: this value is not correct because it includes collections. This short term
+          // fix for when sub cases are not enabled. When the feature is completed the _find API
+          // will need to be fixed as explained in this ticket: https://github.com/elastic/kibana/issues/94115
+          expect(cases.total).to.eql(2);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(1);
+        });
+
+        it('does not return empty collections when filtering on status', async () => {
+          // delete the sub case on the collection so that it doesn't have any sub cases
+          await supertest
+            .delete(
+              `${SUB_CASES_PATCH_DEL_URL}?ids=["${collection.newSubCaseInfo.subCases![0].id}"]`
+            )
+            .set('kbn-xsrf', 'true')
+            .send()
+            .expect(204);
+
+          const cases = await findCases({ supertest, query: { status: CaseStatuses.closed } });
+
+          expect(cases.cases.length).to.eql(1);
+
+          // ENABLE_CASE_CONNECTOR: this value is not correct because it includes collections. This short term
+          // fix for when sub cases are not enabled. When the feature is completed the _find API
+          // will need to be fixed as explained in this ticket: https://github.com/elastic/kibana/issues/94115
+          expect(cases.total).to.eql(2);
+          expect(cases.count_closed_cases).to.eql(1);
+          expect(cases.count_open_cases).to.eql(1);
+          expect(cases.count_in_progress_cases).to.eql(0);
+        });
+      });
+    });
+
+    describe('find_cases pagination', () => {
+      const numCases = 10;
+      before(async () => {
+        await createCasesWithTitleAsNumber(numCases);
+      });
+
+      after(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      const createCasesWithTitleAsNumber = async (total: number): Promise<CaseResponse[]> => {
+        const responsePromises = [];
+        for (let i = 0; i < total; i++) {
+          // this doesn't guarantee that the cases will be created in order that the for-loop executes,
+          // for example case with title '2', could be created before the case with title '1' since we're doing a promise all here
+          // A promise all is just much faster than doing it one by one which would have guaranteed that the cases are
+          // created in the order that the for-loop executes
+          responsePromises.push(createCase(supertest, { ...postCaseReq, title: `${i}` }));
+        }
+        const responses = await Promise.all(responsePromises);
+        return responses;
+      };
+
+      /**
+       * This is used to retrieve all the cases in the same sorted order that we're expecting them to come back via the
+       * _find API so that we have a more true comparison instead of using the _find API to get all the cases which
+       * could mangle the results if the implementation had a bug.
+       *
+       * Ideally we could enforce how the cases are created in reasonable time, waiting for each api call to finish takes
+       * around 30 seconds which seemed too slow
+       */
+      const getAllCasesSortedByCreatedAtAsc = async () => {
+        const cases: ApiResponse<estypes.SearchResponse<CaseAttributes>> = await es.search({
+          index: '.kibana',
+          body: {
+            size: 10000,
+            sort: [{ 'cases.created_at': { unmapped_type: 'date', order: 'asc' } }],
+            query: {
+              term: { type: 'cases' },
+            },
+          },
+        });
+        return cases.body.hits.hits.map((hit) => hit._source);
+      };
+
+      it('returns the correct total when perPage is less than the total', async () => {
+        const cases = await findCases({
+          supertest,
+          query: {
+            page: 1,
+            perPage: 5,
+          },
+        });
+
+        expect(cases.cases.length).to.eql(5);
+        expect(cases.total).to.eql(10);
+        expect(cases.page).to.eql(1);
+        expect(cases.per_page).to.eql(5);
+        expect(cases.count_open_cases).to.eql(10);
+        expect(cases.count_closed_cases).to.eql(0);
+        expect(cases.count_in_progress_cases).to.eql(0);
+      });
+
+      it('returns the correct total when perPage is greater than the total', async () => {
+        const cases = await findCases({
+          supertest,
+          query: {
+            page: 1,
+            perPage: 11,
+          },
+        });
+
+        expect(cases.total).to.eql(10);
+        expect(cases.page).to.eql(1);
+        expect(cases.per_page).to.eql(11);
+        expect(cases.cases.length).to.eql(10);
+        expect(cases.count_open_cases).to.eql(10);
+        expect(cases.count_closed_cases).to.eql(0);
+        expect(cases.count_in_progress_cases).to.eql(0);
+      });
+
+      it('returns the correct total when perPage is equal to the total', async () => {
+        const cases = await findCases({
+          supertest,
+          query: {
+            page: 1,
+            perPage: 10,
+          },
+        });
+
+        expect(cases.total).to.eql(10);
+        expect(cases.page).to.eql(1);
+        expect(cases.per_page).to.eql(10);
+        expect(cases.cases.length).to.eql(10);
+        expect(cases.count_open_cases).to.eql(10);
+        expect(cases.count_closed_cases).to.eql(0);
+        expect(cases.count_in_progress_cases).to.eql(0);
+      });
+
+      it('returns the second page of results', async () => {
+        const perPage = 5;
+        const cases = await findCases({
+          supertest,
+          query: {
+            page: 2,
+            perPage,
+          },
+        });
+
+        expect(cases.total).to.eql(10);
+        expect(cases.page).to.eql(2);
+        expect(cases.per_page).to.eql(5);
+        expect(cases.cases.length).to.eql(5);
+        expect(cases.count_open_cases).to.eql(10);
+        expect(cases.count_closed_cases).to.eql(0);
+        expect(cases.count_in_progress_cases).to.eql(0);
+
+        const allCases = await getAllCasesSortedByCreatedAtAsc();
+
+        cases.cases.map((caseInfo, index) => {
+          // we started on the second page of 10 cases with a perPage of 5, so the first case should 0 + 5 (index + perPage)
+          expect(caseInfo.title).to.eql(allCases[index + perPage]?.cases.title);
+        });
+      });
+
+      it('paginates with perPage of 2 through 10 total cases', async () => {
+        const total = 10;
+        const perPage = 2;
+
+        // it's less than or equal here because the page starts at 1, so page 5 is a valid page number
+        // and should have case titles 9, and 10
+        for (let currentPage = 1; currentPage <= total / perPage; currentPage++) {
+          const cases = await findCases({
+            supertest,
+            query: {
+              page: currentPage,
+              perPage,
+            },
+          });
+
+          expect(cases.total).to.eql(total);
+          expect(cases.page).to.eql(currentPage);
+          expect(cases.per_page).to.eql(perPage);
+          expect(cases.cases.length).to.eql(perPage);
+          expect(cases.count_open_cases).to.eql(total);
+          expect(cases.count_closed_cases).to.eql(0);
+          expect(cases.count_in_progress_cases).to.eql(0);
+
+          const allCases = await getAllCasesSortedByCreatedAtAsc();
+
+          cases.cases.map((caseInfo, index) => {
+            // for page 1, the cases tiles should be 0,1,2 for page 2: 3,4,5 etc (assuming the titles were sorted
+            // correctly)
+            expect(caseInfo.title).to.eql(
+              allCases[index + perPage * (currentPage - 1)]?.cases.title
+            );
+          });
+        }
+      });
+
+      it('retrieves the last three cases', async () => {
+        const cases = await findCases({
+          supertest,
+          query: {
+            // this should skip the first 7 cases and only return the last 3
+            page: 2,
+            perPage: 7,
+          },
+        });
+
+        expect(cases.total).to.eql(10);
+        expect(cases.page).to.eql(2);
+        expect(cases.per_page).to.eql(7);
+        expect(cases.cases.length).to.eql(3);
+        expect(cases.count_open_cases).to.eql(10);
+        expect(cases.count_closed_cases).to.eql(0);
+        expect(cases.count_in_progress_cases).to.eql(0);
+      });
+    });
+
+    describe('rbac', () => {
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should return the correct cases', async () => {
+        await Promise.all([
+          // Create case owned by the security solution user
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: secOnly,
+              space: 'space1',
+            }
+          ),
+          // Create case owned by the observability user
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: obsOnly,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        for (const scenario of [
+          {
+            user: globalRead,
+            numberOfExpectedCases: 2,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+          },
+          {
+            user: superUser,
+            numberOfExpectedCases: 2,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+          },
+          { user: secOnlyRead, numberOfExpectedCases: 1, owners: ['securitySolutionFixture'] },
+          { user: obsOnlyRead, numberOfExpectedCases: 1, owners: ['observabilityFixture'] },
+          {
+            user: obsSecRead,
+            numberOfExpectedCases: 2,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+          },
+        ]) {
+          const res = await findCases({
+            supertest: supertestWithoutAuth,
+            auth: {
+              user: scenario.user,
+              space: 'space1',
+            },
+          });
+
+          ensureSavedObjectIsAuthorized(res.cases, scenario.numberOfExpectedCases, scenario.owners);
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`User ${scenario.user.username} with role(s) ${scenario.user.roles.join()} and space ${
+          scenario.space
+        } - should NOT read a case`, async () => {
+          // super user creates a case at the appropriate space
+          await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: superUser,
+              space: scenario.space,
+            }
+          );
+
+          // user should not be able to read cases at the appropriate space
+          await findCases({
+            supertest: supertestWithoutAuth,
+            auth: {
+              user: scenario.user,
+              space: scenario.space,
+            },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should return the correct cases when trying to exploit RBAC through the search query parameter', async () => {
+        await Promise.all([
+          // super user creates a case with owner securitySolutionFixture
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          ),
+          // super user creates a case with owner observabilityFixture
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        const res = await findCases({
+          supertest: supertestWithoutAuth,
+          query: {
+            search: 'securitySolutionFixture observabilityFixture',
+            searchFields: 'owner',
+          },
+          auth: {
+            user: secOnly,
+            space: 'space1',
+          },
+        });
+
+        ensureSavedObjectIsAuthorized(res.cases, 1, ['securitySolutionFixture']);
+      });
+
+      // This test is to prevent a future developer to add the filter attribute without taking into consideration
+      // the authorizationFilter produced by the cases authorization class
+      it('should NOT allow to pass a filter query parameter', async () => {
+        await supertest
+          .get(
+            `${CASES_URL}/_find?sortOrder=asc&filter=cases.attributes.owner:"observabilityFixture"`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(400);
+      });
+
+      // This test ensures that the user is not allowed to define the namespaces query param
+      // so she cannot search across spaces
+      it('should NOT allow to pass a namespaces query parameter', async () => {
+        await supertest
+          .get(`${CASES_URL}/_find?sortOrder=asc&namespaces[0]=*`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(400);
+
+        await supertest
+          .get(`${CASES_URL}/_find?sortOrder=asc&namespaces=*`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(400);
+      });
+
+      it('should NOT allow to pass a non supported query parameter', async () => {
+        await supertest
+          .get(`${CASES_URL}/_find?notExists=papa`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(400);
+      });
+
+      it('should respect the owner filter when having permissions', async () => {
+        await Promise.all([
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        const res = await findCases({
+          supertest: supertestWithoutAuth,
+          query: {
+            owner: 'securitySolutionFixture',
+            searchFields: 'owner',
+          },
+          auth: {
+            user: obsSec,
+            space: 'space1',
+          },
+        });
+
+        ensureSavedObjectIsAuthorized(res.cases, 1, ['securitySolutionFixture']);
+      });
+
+      it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+        await Promise.all([
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        // User with permissions only to security solution request cases from observability
+        const res = await findCases({
+          supertest: supertestWithoutAuth,
+          query: {
+            owner: ['securitySolutionFixture', 'observabilityFixture'],
+          },
+          auth: {
+            user: secOnly,
+            space: 'space1',
+          },
+        });
+
+        // Only security solution cases are being returned
+        ensureSavedObjectIsAuthorized(res.cases, 1, ['securitySolutionFixture']);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/get_case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/get_case.ts
new file mode 100644
index 0000000000000..222632b41c297
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/get_case.ts
@@ -0,0 +1,207 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import {
+  defaultUser,
+  postCaseReq,
+  postCaseResp,
+  postCommentUserReq,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  createCase,
+  getCase,
+  createComment,
+  removeServerGeneratedPropertiesFromCase,
+  removeServerGeneratedPropertiesFromSavedObject,
+} from '../../../../common/lib/utils';
+import {
+  secOnly,
+  obsOnly,
+  globalRead,
+  superUser,
+  secOnlyRead,
+  obsOnlyRead,
+  obsSecRead,
+  noKibanaPrivileges,
+  obsSec,
+} from '../../../../common/lib/authentication/users';
+import { getUserInfo } from '../../../../common/lib/authentication';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_case', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should return a case with no comments', async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest());
+      const theCase = await getCase({ supertest, caseId: postedCase.id, includeComments: true });
+
+      const data = removeServerGeneratedPropertiesFromCase(theCase);
+      expect(data).to.eql(postCaseResp());
+      expect(data.comments?.length).to.eql(0);
+    });
+
+    it('should return a case with comments', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      await createComment({ supertest, caseId: postedCase.id, params: postCommentUserReq });
+      const theCase = await getCase({ supertest, caseId: postedCase.id, includeComments: true });
+
+      const comment = removeServerGeneratedPropertiesFromSavedObject(
+        theCase.comments![0] as AttributesTypeUser
+      );
+
+      expect(theCase.comments?.length).to.eql(1);
+      expect(comment).to.eql({
+        type: postCommentUserReq.type,
+        comment: postCommentUserReq.comment,
+        associationType: 'case',
+        created_by: defaultUser,
+        pushed_at: null,
+        pushed_by: null,
+        updated_by: null,
+        owner: 'securitySolutionFixture',
+      });
+    });
+
+    it('should return a 400 when passing the includeSubCaseComments', async () => {
+      const { body } = await supertest
+        .get(`${CASES_URL}/case-id?includeSubCaseComments=true`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+
+      expect(body.message).to.contain('disabled');
+    });
+
+    it('unhappy path - 404s when case is not there', async () => {
+      await supertest.get(`${CASES_URL}/fake-id`).set('kbn-xsrf', 'true').send().expect(404);
+    });
+
+    describe('rbac', () => {
+      it('should get a case', async () => {
+        const newCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space1',
+          }
+        );
+
+        for (const user of [globalRead, superUser, secOnly, secOnlyRead, obsSec, obsSecRead]) {
+          const theCase = await getCase({
+            supertest: supertestWithoutAuth,
+            caseId: newCase.id,
+            auth: { user, space: 'space1' },
+          });
+
+          expect(theCase.owner).to.eql('securitySolutionFixture');
+        }
+      });
+
+      it('should get a case with comments', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          expectedHttpCode: 200,
+          auth: {
+            user: secOnly,
+            space: 'space1',
+          },
+        });
+
+        const theCase = await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          includeComments: true,
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        const comment = removeServerGeneratedPropertiesFromSavedObject(
+          theCase.comments![0] as AttributesTypeUser
+        );
+
+        expect(theCase.comments?.length).to.eql(1);
+        expect(comment).to.eql({
+          type: postCommentUserReq.type,
+          comment: postCommentUserReq.comment,
+          associationType: 'case',
+          created_by: getUserInfo(secOnly),
+          pushed_at: null,
+          pushed_by: null,
+          updated_by: null,
+          owner: 'securitySolutionFixture',
+        });
+      });
+
+      it('should not get a case when the user does not have access to owner', async () => {
+        const newCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space1',
+          }
+        );
+
+        for (const user of [noKibanaPrivileges, obsOnly, obsOnlyRead]) {
+          await getCase({
+            supertest: supertestWithoutAuth,
+            caseId: newCase.id,
+            expectedHttpCode: 403,
+            auth: { user, space: 'space1' },
+          });
+        }
+      });
+
+      it('should NOT get a case in a space with no permissions', async () => {
+        const newCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space2',
+          }
+        );
+
+        await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: newCase.id,
+          expectedHttpCode: 403,
+          auth: { user: secOnly, space: 'space2' },
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/migrations.ts
new file mode 100644
index 0000000000000..8d158cc1c4f70
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/migrations.ts
@@ -0,0 +1,111 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+
+// eslint-disable-next-line import/no-default-export
+export default function createGetTests({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('migrations', () => {
+    // tests upgrading a 7.10.0 saved object to the latest version
+    describe('7.10.0 -> latest stack version', () => {
+      before(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+      });
+
+      after(async () => {
+        await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+      });
+
+      it('migrates cases connector', async () => {
+        const { body } = await supertest
+          .get(`${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body).key('connector');
+        expect(body).not.key('connector_id');
+        expect(body.connector).to.eql({
+          id: 'connector-1',
+          name: 'none',
+          type: '.none',
+          fields: null,
+        });
+      });
+
+      it('migrates cases settings', async () => {
+        const { body } = await supertest
+          .get(`${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body).key('settings');
+        expect(body.settings).to.eql({
+          syncAlerts: true,
+        });
+      });
+    });
+
+    // tests upgrading a 7.11.1 saved object to the latest version
+    describe('7.11.1 -> latest stack version', () => {
+      before(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.11.1');
+      });
+
+      after(async () => {
+        await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.11.1');
+      });
+
+      it('adds rule info to only alert comments for 7.12', async () => {
+        const caseID = '2ea28c10-7855-11eb-9ca6-83ec5acb735f';
+        // user comment
+        let { body } = await supertest
+          .get(`${CASES_URL}/${caseID}/comments/34a20a00-7855-11eb-9ca6-83ec5acb735f`)
+          .expect(200);
+
+        expect(body).not.key('rule');
+        expect(body.rule).to.eql(undefined);
+
+        // alert comment
+        ({ body } = await supertest
+          .get(`${CASES_URL}/${caseID}/comments/3178f2b0-7857-11eb-9ca6-83ec5acb735f`)
+          .expect(200));
+
+        expect(body).key('rule');
+        expect(body.rule).to.eql({ id: null, name: null });
+      });
+
+      it('adds category and subcategory to the ITSM connector', async () => {
+        const { body } = await supertest
+          .get(`${CASES_URL}/6f973440-7abd-11eb-9ca6-83ec5acb735f`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(body).key('connector');
+        expect(body.connector).to.eql({
+          id: '444ebab0-7abd-11eb-9ca6-83ec5acb735f',
+          name: 'SN',
+          type: '.servicenow',
+          fields: {
+            impact: '2',
+            severity: '2',
+            urgency: '2',
+            category: null,
+            subcategory: null,
+          },
+        });
+      });
+    });
+  });
+}
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
new file mode 100644
index 0000000000000..80432f15f70a9
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/patch_cases.ts
@@ -0,0 +1,1240 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { DETECTION_ENGINE_QUERY_SIGNALS_URL } from '../../../../../../plugins/security_solution/common/constants';
+import {
+  CasesResponse,
+  CaseStatuses,
+  CaseType,
+  CommentType,
+  ConnectorTypes,
+} from '../../../../../../plugins/cases/common/api';
+import {
+  defaultUser,
+  getPostCaseRequest,
+  postCaseReq,
+  postCaseResp,
+  postCollectionReq,
+  postCommentAlertReq,
+  postCommentUserReq,
+} from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  getSignalsWithES,
+  setStatus,
+  createCase,
+  createComment,
+  updateCase,
+  getCaseUserActions,
+  removeServerGeneratedPropertiesFromCase,
+  removeServerGeneratedPropertiesFromUserAction,
+  findCases,
+  superUserSpace1Auth,
+} 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');
+
+  describe('patch_cases', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    describe('happy path', () => {
+      it('should patch a case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCases = await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                title: 'new title',
+              },
+            ],
+          },
+        });
+
+        const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
+        expect(data).to.eql({
+          ...postCaseResp(),
+          title: 'new title',
+          updated_by: defaultUser,
+        });
+      });
+
+      it('should closes the case correctly', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCases = await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+        });
+
+        const userActions = await getCaseUserActions({ supertest, caseID: postedCase.id });
+        const statusUserAction = removeServerGeneratedPropertiesFromUserAction(userActions[1]);
+        const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
+
+        expect(data).to.eql({
+          ...postCaseResp(),
+          status: CaseStatuses.closed,
+          closed_by: defaultUser,
+          updated_by: defaultUser,
+        });
+
+        expect(statusUserAction).to.eql({
+          action_field: ['status'],
+          action: 'update',
+          action_by: defaultUser,
+          new_value: CaseStatuses.closed,
+          old_value: CaseStatuses.open,
+          case_id: `${postedCase.id}`,
+          comment_id: null,
+          sub_case_id: '',
+          owner: 'securitySolutionFixture',
+        });
+      });
+
+      it('should change the status of case to in-progress correctly', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCases = await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+          },
+        });
+
+        const userActions = await getCaseUserActions({ supertest, caseID: postedCase.id });
+        const statusUserAction = removeServerGeneratedPropertiesFromUserAction(userActions[1]);
+        const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
+
+        expect(data).to.eql({
+          ...postCaseResp(),
+          status: CaseStatuses['in-progress'],
+          updated_by: defaultUser,
+        });
+
+        expect(statusUserAction).to.eql({
+          action_field: ['status'],
+          action: 'update',
+          action_by: defaultUser,
+          new_value: CaseStatuses['in-progress'],
+          old_value: CaseStatuses.open,
+          case_id: `${postedCase.id}`,
+          comment_id: null,
+          sub_case_id: '',
+          owner: 'securitySolutionFixture',
+        });
+      });
+
+      it('should patch a case with new connector', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCases = await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                connector: {
+                  id: 'jira',
+                  name: 'Jira',
+                  type: ConnectorTypes.jira,
+                  fields: { issueType: 'Task', priority: null, parent: null },
+                },
+              },
+            ],
+          },
+        });
+
+        const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
+        expect(data).to.eql({
+          ...postCaseResp(),
+          connector: {
+            id: 'jira',
+            name: 'Jira',
+            type: '.jira',
+            fields: { issueType: 'Task', priority: null, parent: null },
+          },
+          updated_by: defaultUser,
+        });
+      });
+
+      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+      it.skip('should allow converting an individual case to a collection when it does not have alerts', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+        });
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: patchedCase.id,
+                version: patchedCase.version,
+                type: CaseType.collection,
+              },
+            ],
+          },
+        });
+      });
+    });
+
+    describe('unhappy path', () => {
+      it('400s when attempting to change the owner of a case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                owner: 'observabilityFixture',
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('404s when case is not there', async () => {
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: 'not-real',
+                version: 'version',
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+          expectedHttpCode: 404,
+        });
+      });
+
+      it('400s when id is missing', async () => {
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              // @ts-expect-error
+              {
+                version: 'version',
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('406s when fields are identical', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.open,
+              },
+            ],
+          },
+          expectedHttpCode: 406,
+        });
+      });
+
+      it('400s when version is missing', async () => {
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              // @ts-expect-error
+              {
+                id: 'not-real',
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+      it.skip('should 400 and not allow converting a collection back to an individual case', async () => {
+        const postedCase = await createCase(supertest, postCollectionReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                type: CaseType.individual,
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('406s when excess data sent', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                // @ts-expect-error
+                badKey: 'closed',
+              },
+            ],
+          },
+          expectedHttpCode: 406,
+        });
+      });
+
+      it('400s when bad data sent', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                // @ts-expect-error
+                status: true,
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when unsupported status sent', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                // @ts-expect-error
+                status: 'not-supported',
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when bad connector type sent', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                // @ts-expect-error
+                connector: { id: 'none', name: 'none', type: '.not-exists', fields: null },
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when bad connector sent', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                connector: {
+                  id: 'jira',
+                  name: 'Jira',
+                  // @ts-expect-error
+                  type: ConnectorTypes.jira,
+                  // @ts-expect-error
+                  fields: { unsupported: 'value' },
+                },
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('409s when version does not match', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: 'version',
+                // @ts-expect-error
+                status: 'closed',
+              },
+            ],
+          },
+          expectedHttpCode: 409,
+        });
+      });
+
+      it('should 400 when attempting to update an individual case to a collection when it has alerts attached to it', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentAlertReq,
+        });
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: patchedCase.id,
+                version: patchedCase.version,
+                type: CaseType.collection,
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed delete these tests
+      it('should 400 when attempting to update the case type when the case connector feature is disabled', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                type: CaseType.collection,
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+      it.skip("should 400 when attempting to update a collection case's status", async () => {
+        const postedCase = await createCase(supertest, postCollectionReq);
+        await updateCase({
+          supertest,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+          expectedHttpCode: 400,
+        });
+      });
+    });
+
+    describe('alerts', () => {
+      describe('esArchiver', () => {
+        const defaultSignalsIndex = '.siem-signals-default-000001';
+
+        beforeEach(async () => {
+          await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/default');
+        });
+        afterEach(async () => {
+          await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/default');
+          await deleteAllCaseItems(es);
+        });
+
+        it('should update the status of multiple alerts attached to multiple cases', async () => {
+          const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
+          const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
+
+          // does NOT updates alert status when adding comments and syncAlerts=false
+          const individualCase1 = await createCase(supertest, {
+            ...postCaseReq,
+            settings: {
+              syncAlerts: false,
+            },
+          });
+
+          const updatedInd1WithComment = await createComment({
+            supertest,
+            caseId: individualCase1.id,
+            params: {
+              alertId: signalID,
+              index: defaultSignalsIndex,
+              rule: { id: 'test-rule-id', name: 'test-index-id' },
+              type: CommentType.alert,
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          const individualCase2 = await createCase(supertest, {
+            ...postCaseReq,
+            settings: {
+              syncAlerts: false,
+            },
+          });
+
+          const updatedInd2WithComment = await createComment({
+            supertest,
+            caseId: individualCase2.id,
+            params: {
+              alertId: signalID2,
+              index: defaultSignalsIndex,
+              rule: { id: 'test-rule-id', name: 'test-index-id' },
+              type: CommentType.alert,
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          await es.indices.refresh({ index: defaultSignalsIndex });
+
+          let signals = await getSignalsWithES({
+            es,
+            indices: defaultSignalsIndex,
+            ids: [signalID, signalID2],
+          });
+
+          // There should be no change in their status since syncing is disabled
+          expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+            CaseStatuses.open
+          );
+          expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+            CaseStatuses.open
+          );
+
+          // does NOT updates alert status when the status is updated and syncAlerts=false
+          const updatedIndWithStatus: CasesResponse = (await setStatus({
+            supertest,
+            cases: [
+              {
+                id: updatedInd1WithComment.id,
+                version: updatedInd1WithComment.version,
+                status: CaseStatuses.closed,
+              },
+              {
+                id: updatedInd2WithComment.id,
+                version: updatedInd2WithComment.version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+            type: 'case',
+          })) as CasesResponse;
+
+          await es.indices.refresh({ index: defaultSignalsIndex });
+
+          signals = await getSignalsWithES({
+            es,
+            indices: defaultSignalsIndex,
+            ids: [signalID, signalID2],
+          });
+
+          // There should still be no change in their status since syncing is disabled
+          expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+            CaseStatuses.open
+          );
+          expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+            CaseStatuses.open
+          );
+
+          // it updates alert status when syncAlerts is turned on
+          // turn on the sync settings
+          await updateCase({
+            supertest,
+            params: {
+              cases: updatedIndWithStatus.map((caseInfo) => ({
+                id: caseInfo.id,
+                version: caseInfo.version,
+                settings: { syncAlerts: true },
+              })),
+            },
+          });
+
+          await es.indices.refresh({ index: defaultSignalsIndex });
+
+          signals = await getSignalsWithES({
+            es,
+            indices: defaultSignalsIndex,
+            ids: [signalID, signalID2],
+          });
+
+          // alerts should be updated now that the
+          expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+            CaseStatuses.closed
+          );
+          expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+            CaseStatuses['in-progress']
+          );
+        });
+      });
+
+      describe('esArchiver', () => {
+        const defaultSignalsIndex = '.siem-signals-default-000001';
+
+        beforeEach(async () => {
+          await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/duplicate_ids');
+        });
+        afterEach(async () => {
+          await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/duplicate_ids');
+          await deleteAllCaseItems(es);
+        });
+
+        it('should not update the status of duplicate alert ids in separate indices', async () => {
+          const getSignals = async () => {
+            return getSignalsWithES({
+              es,
+              indices: [defaultSignalsIndex, signalsIndex2],
+              ids: [signalIDInFirstIndex, signalIDInSecondIndex],
+            });
+          };
+
+          // this id exists only in .siem-signals-default-000001
+          const signalIDInFirstIndex =
+            'cae78067e65582a3b277c1ad46ba3cb29044242fe0d24bbf3fcde757fdd31d1c';
+          // This id exists in both .siem-signals-default-000001 and .siem-signals-default-000002
+          const signalIDInSecondIndex = 'duplicate-signal-id';
+          const signalsIndex2 = '.siem-signals-default-000002';
+
+          const individualCase = await createCase(supertest, {
+            ...postCaseReq,
+            settings: {
+              syncAlerts: false,
+            },
+          });
+
+          const updatedIndWithComment = await createComment({
+            supertest,
+            caseId: individualCase.id,
+            params: {
+              alertId: signalIDInFirstIndex,
+              index: defaultSignalsIndex,
+              rule: { id: 'test-rule-id', name: 'test-index-id' },
+              type: CommentType.alert,
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          const updatedIndWithComment2 = await createComment({
+            supertest,
+            caseId: updatedIndWithComment.id,
+            params: {
+              alertId: signalIDInSecondIndex,
+              index: signalsIndex2,
+              rule: { id: 'test-rule-id', name: 'test-index-id' },
+              type: CommentType.alert,
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          await es.indices.refresh({ index: defaultSignalsIndex });
+
+          let signals = await getSignals();
+          // There should be no change in their status since syncing is disabled
+          expect(
+            signals.get(defaultSignalsIndex)?.get(signalIDInFirstIndex)?._source?.signal.status
+          ).to.be(CaseStatuses.open);
+          expect(
+            signals.get(signalsIndex2)?.get(signalIDInSecondIndex)?._source?.signal.status
+          ).to.be(CaseStatuses.open);
+
+          const updatedIndWithStatus: CasesResponse = (await setStatus({
+            supertest,
+            cases: [
+              {
+                id: updatedIndWithComment2.id,
+                version: updatedIndWithComment2.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+            type: 'case',
+          })) as CasesResponse;
+
+          await es.indices.refresh({ index: defaultSignalsIndex });
+
+          signals = await getSignals();
+
+          // There should still be no change in their status since syncing is disabled
+          expect(
+            signals.get(defaultSignalsIndex)?.get(signalIDInFirstIndex)?._source?.signal.status
+          ).to.be(CaseStatuses.open);
+          expect(
+            signals.get(signalsIndex2)?.get(signalIDInSecondIndex)?._source?.signal.status
+          ).to.be(CaseStatuses.open);
+
+          // turn on the sync settings
+          await updateCase({
+            supertest,
+            params: {
+              cases: [
+                {
+                  id: updatedIndWithStatus[0].id,
+                  version: updatedIndWithStatus[0].version,
+                  settings: { syncAlerts: true },
+                },
+              ],
+            },
+          });
+          await es.indices.refresh({ index: defaultSignalsIndex });
+
+          signals = await getSignals();
+
+          // alerts should be updated now that the
+          expect(
+            signals.get(defaultSignalsIndex)?.get(signalIDInFirstIndex)?._source?.signal.status
+          ).to.be(CaseStatuses.closed);
+          expect(
+            signals.get(signalsIndex2)?.get(signalIDInSecondIndex)?._source?.signal.status
+          ).to.be(CaseStatuses.closed);
+
+          // the duplicate signal id in the other index should not be affect (so its status should be open)
+          expect(
+            signals.get(defaultSignalsIndex)?.get(signalIDInSecondIndex)?._source?.signal.status
+          ).to.be(CaseStatuses.open);
+        });
+      });
+
+      describe('detections rule', () => {
+        beforeEach(async () => {
+          await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+          await createSignalsIndex(supertest);
+        });
+
+        afterEach(async () => {
+          await deleteSignalsIndex(supertest);
+          await deleteAllAlerts(supertest);
+          await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+        });
+
+        it('updates alert status when the status is updated and syncAlerts=true', async () => {
+          const rule = getRuleForSignalTesting(['auditbeat-*']);
+          const postedCase = await createCase(supertest, postCaseReq);
+
+          const { id } = await createRule(supertest, rule);
+          await waitForRuleSuccessOrStatus(supertest, id);
+          await waitForSignalsToBePresent(supertest, 1, [id]);
+          const signals = await getSignalsByIds(supertest, [id]);
+
+          const alert = signals.hits.hits[0];
+          expect(alert._source.signal.status).eql('open');
+
+          const caseUpdated = await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              alertId: alert._id,
+              index: alert._index,
+              rule: {
+                id: 'id',
+                name: 'name',
+              },
+              type: CommentType.alert,
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          await es.indices.refresh({ index: alert._index });
+          await updateCase({
+            supertest,
+            params: {
+              cases: [
+                {
+                  id: caseUpdated.id,
+                  version: caseUpdated.version,
+                  status: CaseStatuses['in-progress'],
+                },
+              ],
+            },
+          });
+
+          // force a refresh on the index that the signal is stored in so that we can search for it and get the correct
+          // status
+          await es.indices.refresh({ index: alert._index });
+
+          const { body: updatedAlert } = await supertest
+            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+            .set('kbn-xsrf', 'true')
+            .send(getQuerySignalIds([alert._id]))
+            .expect(200);
+
+          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('in-progress');
+        });
+
+        it('does NOT updates alert status when the status is updated and syncAlerts=false', async () => {
+          const rule = getRuleForSignalTesting(['auditbeat-*']);
+
+          const postedCase = await createCase(supertest, {
+            ...postCaseReq,
+            settings: { syncAlerts: false },
+          });
+
+          const { id } = await createRule(supertest, rule);
+          await waitForRuleSuccessOrStatus(supertest, id);
+          await waitForSignalsToBePresent(supertest, 1, [id]);
+          const signals = await getSignalsByIds(supertest, [id]);
+
+          const alert = signals.hits.hits[0];
+          expect(alert._source.signal.status).eql('open');
+
+          const caseUpdated = await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              alertId: alert._id,
+              index: alert._index,
+              type: CommentType.alert,
+              rule: {
+                id: 'id',
+                name: 'name',
+              },
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          await updateCase({
+            supertest,
+            params: {
+              cases: [
+                {
+                  id: caseUpdated.id,
+                  version: caseUpdated.version,
+                  status: CaseStatuses['in-progress'],
+                },
+              ],
+            },
+          });
+
+          const { body: updatedAlert } = await supertest
+            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+            .set('kbn-xsrf', 'true')
+            .send(getQuerySignalIds([alert._id]))
+            .expect(200);
+
+          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('open');
+        });
+
+        it('it updates alert status when syncAlerts is turned on', async () => {
+          const rule = getRuleForSignalTesting(['auditbeat-*']);
+
+          const postedCase = await createCase(supertest, {
+            ...postCaseReq,
+            settings: { syncAlerts: false },
+          });
+
+          const { id } = await createRule(supertest, rule);
+          await waitForRuleSuccessOrStatus(supertest, id);
+          await waitForSignalsToBePresent(supertest, 1, [id]);
+          const signals = await getSignalsByIds(supertest, [id]);
+
+          const alert = signals.hits.hits[0];
+          expect(alert._source.signal.status).eql('open');
+
+          const caseUpdated = await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              alertId: alert._id,
+              index: alert._index,
+              rule: {
+                id: 'id',
+                name: 'name',
+              },
+              type: CommentType.alert,
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          // Update the status of the case with sync alerts off
+          const caseStatusUpdated = await updateCase({
+            supertest,
+            params: {
+              cases: [
+                {
+                  id: caseUpdated.id,
+                  version: caseUpdated.version,
+                  status: CaseStatuses['in-progress'],
+                },
+              ],
+            },
+          });
+
+          // Turn sync alerts on
+          await updateCase({
+            supertest,
+            params: {
+              cases: [
+                {
+                  id: caseStatusUpdated[0].id,
+                  version: caseStatusUpdated[0].version,
+                  settings: { syncAlerts: true },
+                },
+              ],
+            },
+          });
+
+          // refresh the index because syncAlerts was set to true so the alert's status should have been updated
+          await es.indices.refresh({ index: alert._index });
+
+          const { body: updatedAlert } = await supertest
+            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+            .set('kbn-xsrf', 'true')
+            .send(getQuerySignalIds([alert._id]))
+            .expect(200);
+
+          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('in-progress');
+        });
+
+        it('it does NOT updates alert status when syncAlerts is turned off', async () => {
+          const rule = getRuleForSignalTesting(['auditbeat-*']);
+
+          const postedCase = await createCase(supertest, postCaseReq);
+          const { id } = await createRule(supertest, rule);
+          await waitForRuleSuccessOrStatus(supertest, id);
+          await waitForSignalsToBePresent(supertest, 1, [id]);
+          const signals = await getSignalsByIds(supertest, [id]);
+
+          const alert = signals.hits.hits[0];
+          expect(alert._source.signal.status).eql('open');
+
+          const caseUpdated = await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              alertId: alert._id,
+              index: alert._index,
+              type: CommentType.alert,
+              rule: {
+                id: 'id',
+                name: 'name',
+              },
+              owner: 'securitySolutionFixture',
+            },
+          });
+
+          // Turn sync alerts off
+          const caseSettingsUpdated = await updateCase({
+            supertest,
+            params: {
+              cases: [
+                {
+                  id: caseUpdated.id,
+                  version: caseUpdated.version,
+                  settings: { syncAlerts: false },
+                },
+              ],
+            },
+          });
+
+          // Update the status of the case with sync alerts off
+          await updateCase({
+            supertest,
+            params: {
+              cases: [
+                {
+                  id: caseSettingsUpdated[0].id,
+                  version: caseSettingsUpdated[0].version,
+                  status: CaseStatuses['in-progress'],
+                },
+              ],
+            },
+          });
+
+          const { body: updatedAlert } = await supertest
+            .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+            .set('kbn-xsrf', 'true')
+            .send(getQuerySignalIds([alert._id]))
+            .expect(200);
+
+          expect(updatedAlert.hits.hits[0]._source.signal.status).eql('open');
+        });
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      it('should update a case when the user has the correct permissions', async () => {
+        const postedCase = await createCase(supertestWithoutAuth, postCaseReq, 200, {
+          user: secOnly,
+          space: 'space1',
+        });
+
+        const patchedCases = await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                title: 'new title',
+              },
+            ],
+          },
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        expect(patchedCases[0].owner).to.eql('securitySolutionFixture');
+      });
+
+      it('should update multiple cases when the user has the correct permissions', async () => {
+        const [case1, case2, case3] = await Promise.all([
+          createCase(supertestWithoutAuth, postCaseReq, 200, {
+            user: superUser,
+            space: 'space1',
+          }),
+          createCase(supertestWithoutAuth, postCaseReq, 200, {
+            user: superUser,
+            space: 'space1',
+          }),
+          createCase(supertestWithoutAuth, postCaseReq, 200, {
+            user: superUser,
+            space: 'space1',
+          }),
+        ]);
+
+        const patchedCases = await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: case1.id,
+                version: case1.version,
+                title: 'new title',
+              },
+              {
+                id: case2.id,
+                version: case2.version,
+                title: 'new title',
+              },
+              {
+                id: case3.id,
+                version: case3.version,
+                title: 'new title',
+              },
+            ],
+          },
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        expect(patchedCases[0].owner).to.eql('securitySolutionFixture');
+        expect(patchedCases[1].owner).to.eql('securitySolutionFixture');
+        expect(patchedCases[2].owner).to.eql('securitySolutionFixture');
+      });
+
+      it('should not update a case when the user does not have the correct ownership', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          { user: obsOnly, space: 'space1' }
+        );
+
+        await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                title: 'new title',
+              },
+            ],
+          },
+          auth: { user: secOnly, space: 'space1' },
+          expectedHttpCode: 403,
+        });
+      });
+
+      it('should not update any cases when the user does not have the correct ownership', async () => {
+        const [case1, case2, case3] = await Promise.all([
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: case1.id,
+                version: case1.version,
+                title: 'new title',
+              },
+              {
+                id: case2.id,
+                version: case2.version,
+                title: 'new title',
+              },
+              {
+                id: case3.id,
+                version: case3.version,
+                title: 'new title',
+              },
+            ],
+          },
+          auth: { user: secOnly, space: 'space1' },
+          expectedHttpCode: 403,
+        });
+
+        const resp = await findCases({ supertest, auth: superUserSpace1Auth });
+        expect(resp.cases.length).to.eql(3);
+        // the update should have failed and none of the title should have been changed
+        expect(resp.cases[0].title).to.eql(postCaseReq.title);
+        expect(resp.cases[1].title).to.eql(postCaseReq.title);
+        expect(resp.cases[2].title).to.eql(postCaseReq.title);
+      });
+
+      for (const user of [globalRead, secOnlyRead, obsOnlyRead, obsSecRead, noKibanaPrivileges]) {
+        it(`User ${
+          user.username
+        } with role(s) ${user.roles.join()} - should NOT update a case`, async () => {
+          const postedCase = await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          );
+
+          await updateCase({
+            supertest: supertestWithoutAuth,
+            params: {
+              cases: [
+                {
+                  id: postedCase.id,
+                  version: postedCase.version,
+                  title: 'new title',
+                },
+              ],
+            },
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should NOT create a case in a space with no permissions', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: superUser,
+            space: 'space2',
+          }
+        );
+
+        await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                title: 'new title',
+              },
+            ],
+          },
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/post_case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/post_case.ts
new file mode 100644
index 0000000000000..e8337fa9db502
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/post_case.ts
@@ -0,0 +1,314 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 @typescript-eslint/naming-convention */
+
+import expect from '@kbn/expect';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import {
+  ConnectorTypes,
+  ConnectorJiraTypeFields,
+  CaseStatuses,
+  CaseUserActionResponse,
+  CaseType,
+} from '../../../../../../plugins/cases/common/api';
+import { getPostCaseRequest, postCaseResp, defaultUser } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  createCase,
+  removeServerGeneratedPropertiesFromCase,
+  removeServerGeneratedPropertiesFromUserAction,
+  getCaseUserActions,
+} from '../../../../common/lib/utils';
+import {
+  secOnly,
+  secOnlyRead,
+  globalRead,
+  obsOnlyRead,
+  obsSecRead,
+  noKibanaPrivileges,
+  testDisabled,
+} from '../../../../common/lib/authentication/users';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  describe('post_case', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    describe('happy path', () => {
+      it('should post a case', async () => {
+        const postedCase = await createCase(
+          supertest,
+          getPostCaseRequest({
+            connector: {
+              id: '123',
+              name: 'Jira',
+              type: ConnectorTypes.jira,
+              fields: { issueType: 'Task', priority: 'High', parent: null },
+            },
+          })
+        );
+        const data = removeServerGeneratedPropertiesFromCase(postedCase);
+
+        expect(data).to.eql(
+          postCaseResp(
+            null,
+            getPostCaseRequest({
+              connector: {
+                id: '123',
+                name: 'Jira',
+                type: ConnectorTypes.jira,
+                fields: { issueType: 'Task', priority: 'High', parent: null },
+              },
+            })
+          )
+        );
+      });
+
+      it('should post a case: none connector', async () => {
+        const postedCase = await createCase(
+          supertest,
+          getPostCaseRequest({
+            connector: {
+              id: 'none',
+              name: 'none',
+              type: ConnectorTypes.none,
+              fields: null,
+            },
+          })
+        );
+        const data = removeServerGeneratedPropertiesFromCase(postedCase);
+
+        expect(data).to.eql(
+          postCaseResp(
+            null,
+            getPostCaseRequest({
+              connector: {
+                id: 'none',
+                name: 'none',
+                type: ConnectorTypes.none,
+                fields: null,
+              },
+            })
+          )
+        );
+      });
+
+      it('should create a user action when creating a case', async () => {
+        const postedCase = await createCase(supertest, getPostCaseRequest());
+        const userActions = await getCaseUserActions({ supertest, caseID: postedCase.id });
+        const creationUserAction = removeServerGeneratedPropertiesFromUserAction(userActions[0]);
+
+        const { new_value, ...rest } = creationUserAction as CaseUserActionResponse;
+        const parsedNewValue = JSON.parse(new_value!);
+
+        expect(rest).to.eql({
+          action_field: [
+            'description',
+            'status',
+            'tags',
+            'title',
+            'connector',
+            'settings',
+            'owner',
+          ],
+          action: 'create',
+          action_by: defaultUser,
+          old_value: null,
+          case_id: `${postedCase.id}`,
+          comment_id: null,
+          sub_case_id: '',
+          owner: 'securitySolutionFixture',
+        });
+
+        expect(parsedNewValue).to.eql({
+          type: postedCase.type,
+          description: postedCase.description,
+          title: postedCase.title,
+          tags: postedCase.tags,
+          connector: postedCase.connector,
+          settings: postedCase.settings,
+          owner: postedCase.owner,
+        });
+      });
+
+      it('creates the case without connector in the configuration', async () => {
+        const postedCase = await createCase(supertest, getPostCaseRequest());
+        const data = removeServerGeneratedPropertiesFromCase(postedCase);
+
+        expect(data).to.eql(postCaseResp());
+      });
+    });
+
+    describe('unhappy path', () => {
+      it('should not allow creating a collection style case', async () => {
+        await createCase(supertest, getPostCaseRequest({ type: CaseType.collection }), 400);
+      });
+
+      it('400s when bad query supplied', async () => {
+        await supertest
+          .post(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          // @ts-expect-error
+          .send({ ...getPostCaseRequest({ badKey: true }) })
+          .expect(400);
+      });
+
+      it('400s when connector is not supplied', async () => {
+        const { connector, ...caseWithoutConnector } = getPostCaseRequest();
+
+        await supertest
+          .post(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send(caseWithoutConnector)
+          .expect(400);
+      });
+
+      it('400s when connector has wrong type', async () => {
+        await supertest
+          .post(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getPostCaseRequest({
+              // @ts-expect-error
+              connector: { id: 'wrong', name: 'wrong', type: '.not-exists', fields: null },
+            }),
+          })
+          .expect(400);
+      });
+
+      it('400s when connector has wrong fields', async () => {
+        await supertest
+          .post(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...getPostCaseRequest({
+              // @ts-expect-error
+              connector: {
+                id: 'wrong',
+                name: 'wrong',
+                type: ConnectorTypes.jira,
+                fields: { unsupported: 'value' },
+              } as ConnectorJiraTypeFields,
+            }),
+          })
+          .expect(400);
+      });
+
+      it('400s when missing title', async () => {
+        const { title, ...caseWithoutTitle } = getPostCaseRequest();
+
+        await supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(caseWithoutTitle).expect(400);
+      });
+
+      it('400s when missing description', async () => {
+        const { description, ...caseWithoutDescription } = getPostCaseRequest();
+
+        await supertest
+          .post(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send(caseWithoutDescription)
+          .expect(400);
+      });
+
+      it('400s when missing tags', async () => {
+        const { tags, ...caseWithoutTags } = getPostCaseRequest();
+
+        await supertest.post(CASES_URL).set('kbn-xsrf', 'true').send(caseWithoutTags).expect(400);
+      });
+
+      it('400s if you passing status for a new case', async () => {
+        const req = getPostCaseRequest();
+
+        await supertest
+          .post(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({ ...req, status: CaseStatuses.open })
+          .expect(400);
+      });
+    });
+
+    describe('rbac', () => {
+      it('returns a 403 when attempting to create a case with an owner that was from a disabled feature in the space', async () => {
+        const theCase = ((await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'testDisabledFixture' }),
+          403,
+          {
+            user: testDisabled,
+            space: 'space1',
+          }
+        )) as unknown) as { message: string };
+
+        expect(theCase.message).to.eql(
+          'Unauthorized to create case with owners: "testDisabledFixture"'
+        );
+      });
+
+      it('User: security solution only - should create a case', async () => {
+        const theCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+        expect(theCase.owner).to.eql('securitySolutionFixture');
+      });
+
+      it('User: security solution only - should NOT create a case of different owner', async () => {
+        await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          403,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+      });
+
+      for (const user of [globalRead, secOnlyRead, obsOnlyRead, obsSecRead, noKibanaPrivileges]) {
+        it(`User ${
+          user.username
+        } with role(s) ${user.roles.join()} - should NOT create a case`, async () => {
+          await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            403,
+            {
+              user,
+              space: 'space1',
+            }
+          );
+        });
+      }
+
+      it('should NOT create a case in a space with no permissions', async () => {
+        await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          403,
+          {
+            user: secOnly,
+            space: 'space2',
+          }
+        );
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/reporters/get_reporters.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/reporters/get_reporters.ts
new file mode 100644
index 0000000000000..e34d9ccad39ac
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/reporters/get_reporters.ts
@@ -0,0 +1,201 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../../common/ftr_provider_context';
+
+import { defaultUser, getPostCaseRequest } from '../../../../../common/lib/mock';
+import { createCase, deleteCasesByESQuery, getReporters } from '../../../../../common/lib/utils';
+import {
+  secOnly,
+  obsOnly,
+  globalRead,
+  superUser,
+  secOnlyRead,
+  obsOnlyRead,
+  obsSecRead,
+  noKibanaPrivileges,
+  obsSec,
+} from '../../../../../common/lib/authentication/users';
+import { getUserInfo } from '../../../../../common/lib/authentication';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_reporters', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should return reporters', async () => {
+      await createCase(supertest, getPostCaseRequest());
+      const reporters = await getReporters({ supertest: supertestWithoutAuth });
+
+      expect(reporters).to.eql([defaultUser]);
+    });
+
+    it('should return unique reporters', async () => {
+      await createCase(supertest, getPostCaseRequest());
+      await createCase(supertest, getPostCaseRequest());
+      const reporters = await getReporters({ supertest: supertestWithoutAuth });
+
+      expect(reporters).to.eql([defaultUser]);
+    });
+
+    describe('rbac', () => {
+      it('User: security solution only - should read the correct reporters', async () => {
+        await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          {
+            user: obsOnly,
+            space: 'space1',
+          }
+        );
+
+        for (const scenario of [
+          {
+            user: globalRead,
+            expectedReporters: [getUserInfo(secOnly), getUserInfo(obsOnly)],
+          },
+          {
+            user: superUser,
+            expectedReporters: [getUserInfo(secOnly), getUserInfo(obsOnly)],
+          },
+          { user: secOnlyRead, expectedReporters: [getUserInfo(secOnly)] },
+          { user: obsOnlyRead, expectedReporters: [getUserInfo(obsOnly)] },
+          {
+            user: obsSecRead,
+            expectedReporters: [getUserInfo(secOnly), getUserInfo(obsOnly)],
+          },
+        ]) {
+          const reporters = await getReporters({
+            supertest: supertestWithoutAuth,
+            expectedHttpCode: 200,
+            auth: {
+              user: scenario.user,
+              space: 'space1',
+            },
+          });
+
+          expect(reporters).to.eql(scenario.expectedReporters);
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`User ${scenario.user.username} with role(s) ${scenario.user.roles.join()} and space ${
+          scenario.space
+        } - should NOT get all reporters`, async () => {
+          // super user creates a case at the appropriate space
+          await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: superUser,
+              space: scenario.space,
+            }
+          );
+
+          // user should not be able to get all reporters at the appropriate space
+          await getReporters({
+            supertest: supertestWithoutAuth,
+            expectedHttpCode: 403,
+            auth: { user: scenario.user, space: scenario.space },
+          });
+        });
+      }
+
+      it('should respect the owner filter when having permissions', async () => {
+        await Promise.all([
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: secOnly,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: obsOnly,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        const reporters = await getReporters({
+          supertest: supertestWithoutAuth,
+          auth: {
+            user: obsSec,
+            space: 'space1',
+          },
+          query: { owner: 'securitySolutionFixture' },
+        });
+
+        expect(reporters).to.eql([getUserInfo(secOnly)]);
+      });
+
+      it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+        await Promise.all([
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            {
+              user: secOnly,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            {
+              user: obsOnly,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        // User with permissions only to security solution request reporters from observability
+        const reporters = await getReporters({
+          supertest: supertestWithoutAuth,
+          auth: {
+            user: secOnly,
+            space: 'space1',
+          },
+          query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+        });
+
+        // Only security solution reporters are being returned
+        expect(reporters).to.eql([getUserInfo(secOnly)]);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
new file mode 100644
index 0000000000000..02ace7077a20a
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/status/get_status.ts
@@ -0,0 +1,185 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+
+import { CaseStatuses } from '../../../../../../../plugins/cases/common/api';
+import { getPostCaseRequest, postCaseReq } from '../../../../../common/lib/mock';
+import {
+  createCase,
+  updateCase,
+  getAllCasesStatuses,
+  deleteAllCaseItems,
+  superUserSpace1Auth,
+} from '../../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  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 es = getService('es');
+
+  describe('get_status', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should return case statuses', async () => {
+      const [, inProgressCase, postedCase] = await Promise.all([
+        createCase(supertest, postCaseReq),
+        createCase(supertest, postCaseReq),
+        createCase(supertest, postCaseReq),
+      ]);
+
+      await updateCase({
+        supertest,
+        params: {
+          cases: [
+            {
+              id: inProgressCase.id,
+              version: inProgressCase.version,
+              status: CaseStatuses['in-progress'],
+            },
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              status: CaseStatuses.closed,
+            },
+          ],
+        },
+      });
+
+      const statuses = await getAllCasesStatuses({ supertest });
+
+      expect(statuses).to.eql({
+        count_open_cases: 1,
+        count_closed_cases: 1,
+        count_in_progress_cases: 1,
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      it('should return the correct status stats', async () => {
+        /**
+         * Owner: Sec
+         *  open: 0, in-prog: 1, closed: 1
+         * Owner: Obs
+         *  open: 1, in-prog: 1
+         */
+        const [inProgressSec, closedSec, , inProgressObs] = await Promise.all([
+          createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
+            user: superUser,
+            space: 'space1',
+          }),
+          createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
+            user: superUser,
+            space: 'space1',
+          }),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            superUserSpace1Auth
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            superUserSpace1Auth
+          ),
+        ]);
+
+        await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: inProgressSec.id,
+                version: inProgressSec.version,
+                status: CaseStatuses['in-progress'],
+              },
+              {
+                id: closedSec.id,
+                version: closedSec.version,
+                status: CaseStatuses.closed,
+              },
+              {
+                id: inProgressObs.id,
+                version: inProgressObs.version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+          },
+          auth: superUserSpace1Auth,
+        });
+
+        for (const scenario of [
+          { user: globalRead, stats: { open: 1, inProgress: 2, closed: 1 } },
+          { user: superUser, stats: { open: 1, inProgress: 2, closed: 1 } },
+          { user: secOnlyRead, stats: { open: 0, inProgress: 1, closed: 1 } },
+          { user: obsOnlyRead, stats: { open: 1, inProgress: 1, closed: 0 } },
+          { user: obsSecRead, stats: { open: 1, inProgress: 2, closed: 1 } },
+          {
+            user: obsSecRead,
+            stats: { open: 1, inProgress: 1, closed: 0 },
+            owner: 'observabilityFixture',
+          },
+          {
+            user: obsSecRead,
+            stats: { open: 1, inProgress: 2, closed: 1 },
+            owner: ['observabilityFixture', 'securitySolutionFixture'],
+          },
+        ]) {
+          const statuses = await getAllCasesStatuses({
+            supertest: supertestWithoutAuth,
+            auth: { user: scenario.user, space: 'space1' },
+            query: {
+              owner: scenario.owner,
+            },
+          });
+
+          expect(statuses).to.eql({
+            count_open_cases: scenario.stats.open,
+            count_closed_cases: scenario.stats.closed,
+            count_in_progress_cases: scenario.stats.inProgress,
+          });
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`should return a 403 when retrieving the statuses when the user ${
+          scenario.user.username
+        } with role(s) ${scenario.user.roles.join()} and space ${scenario.space}`, async () => {
+          await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
+            user: superUser,
+            space: scenario.space,
+          });
+
+          await getAllCasesStatuses({
+            supertest: supertestWithoutAuth,
+            auth: { user: scenario.user, space: scenario.space },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/tags/get_tags.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/tags/get_tags.ts
new file mode 100644
index 0000000000000..0c7237683666f
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/cases/tags/get_tags.ts
@@ -0,0 +1,201 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../../common/ftr_provider_context';
+
+import { deleteCasesByESQuery, createCase, getTags } from '../../../../../common/lib/utils';
+import { getPostCaseRequest } from '../../../../../common/lib/mock';
+import {
+  secOnly,
+  obsOnly,
+  globalRead,
+  superUser,
+  secOnlyRead,
+  obsOnlyRead,
+  obsSecRead,
+  noKibanaPrivileges,
+  obsSec,
+} from '../../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_tags', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should return case tags', async () => {
+      await createCase(supertest, getPostCaseRequest());
+      await createCase(supertest, getPostCaseRequest({ tags: ['unique'] }));
+
+      const tags = await getTags({ supertest });
+      expect(tags).to.eql(['defacement', 'unique']);
+    });
+
+    it('should return unique tags', async () => {
+      await createCase(supertest, getPostCaseRequest());
+      await createCase(supertest, getPostCaseRequest());
+
+      const tags = await getTags({ supertest });
+      expect(tags).to.eql(['defacement']);
+    });
+
+    describe('rbac', () => {
+      it('should read the correct tags', async () => {
+        await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture', tags: ['obs'] }),
+          200,
+          {
+            user: obsOnly,
+            space: 'space1',
+          }
+        );
+
+        for (const scenario of [
+          {
+            user: globalRead,
+            expectedTags: ['sec', 'obs'],
+          },
+          {
+            user: superUser,
+            expectedTags: ['sec', 'obs'],
+          },
+          { user: secOnlyRead, expectedTags: ['sec'] },
+          { user: obsOnlyRead, expectedTags: ['obs'] },
+          {
+            user: obsSecRead,
+            expectedTags: ['sec', 'obs'],
+          },
+        ]) {
+          const tags = await getTags({
+            supertest: supertestWithoutAuth,
+            expectedHttpCode: 200,
+            auth: {
+              user: scenario.user,
+              space: 'space1',
+            },
+          });
+
+          expect(tags).to.eql(scenario.expectedTags);
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`User ${scenario.user.username} with role(s) ${scenario.user.roles.join()} and space ${
+          scenario.space
+        } - should NOT get all tags`, async () => {
+          // super user creates a case at the appropriate space
+          await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+            200,
+            {
+              user: superUser,
+              space: scenario.space,
+            }
+          );
+
+          // user should not be able to get all tags at the appropriate space
+          await getTags({
+            supertest: supertestWithoutAuth,
+            expectedHttpCode: 403,
+            auth: { user: scenario.user, space: scenario.space },
+          });
+        });
+      }
+
+      it('should respect the owner filter when having permissions', async () => {
+        await Promise.all([
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture', tags: ['obs'] }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        const tags = await getTags({
+          supertest: supertestWithoutAuth,
+          auth: {
+            user: obsSec,
+            space: 'space1',
+          },
+          query: { owner: 'securitySolutionFixture' },
+        });
+
+        expect(tags).to.eql(['sec']);
+      });
+
+      it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+        await Promise.all([
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture', tags: ['obs'] }),
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        // User with permissions only to security solution request tags from observability
+        const tags = await getTags({
+          supertest: supertestWithoutAuth,
+          auth: {
+            user: secOnly,
+            space: 'space1',
+          },
+          query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+        });
+
+        // Only security solution tags are being returned
+        expect(tags).to.eql(['sec']);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
new file mode 100644
index 0000000000000..15df0f0b40d0f
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/client/update_alert_status.ts
@@ -0,0 +1,167 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { postCaseReq } from '../../../../common/lib/mock';
+import {
+  createCase,
+  createComment,
+  deleteAllCaseItems,
+  getSignalsWithES,
+} from '../../../../common/lib/utils';
+import { CasesResponse, CaseStatuses, CommentType } from '../../../../../../plugins/cases/common';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const esArchiver = getService('esArchiver');
+
+  describe('update_alert_status', () => {
+    const defaultSignalsIndex = '.siem-signals-default-000001';
+
+    beforeEach(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/default');
+    });
+    afterEach(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/default');
+      await deleteAllCaseItems(es);
+    });
+
+    it('should update the status of multiple alerts attached to multiple cases using the cases client', async () => {
+      const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
+      const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
+
+      // does NOT updates alert status when adding comments and syncAlerts=false
+      const individualCase1 = await createCase(supertest, {
+        ...postCaseReq,
+        settings: {
+          syncAlerts: false,
+        },
+      });
+
+      const updatedInd1WithComment = await createComment({
+        supertest,
+        caseId: individualCase1.id,
+        params: {
+          alertId: signalID,
+          index: defaultSignalsIndex,
+          rule: { id: 'test-rule-id', name: 'test-index-id' },
+          type: CommentType.alert,
+          owner: 'securitySolutionFixture',
+        },
+      });
+
+      const individualCase2 = await createCase(supertest, {
+        ...postCaseReq,
+        settings: {
+          syncAlerts: false,
+        },
+      });
+
+      const updatedInd2WithComment = await createComment({
+        supertest,
+        caseId: individualCase2.id,
+        params: {
+          alertId: signalID2,
+          index: defaultSignalsIndex,
+          rule: { id: 'test-rule-id', name: 'test-index-id' },
+          type: CommentType.alert,
+          owner: 'securitySolutionFixture',
+        },
+      });
+
+      await es.indices.refresh({ index: defaultSignalsIndex });
+
+      let signals = await getSignalsWithES({
+        es,
+        indices: defaultSignalsIndex,
+        ids: [signalID, signalID2],
+      });
+
+      // There should be no change in their status since syncing is disabled
+      expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+        CaseStatuses.open
+      );
+      expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+        CaseStatuses.open
+      );
+
+      // does NOT updates alert status when the status is updated and syncAlerts=false
+      // this performs the cases update through the test plugin that leverages the cases client instead
+      // of going through RESTful API of the cases plugin
+      const { body: updatedIndWithStatus }: { body: CasesResponse } = await supertest
+        .patch('/api/cases_user/cases')
+        .set('kbn-xsrf', 'true')
+        .send({
+          cases: [
+            {
+              id: updatedInd1WithComment.id,
+              version: updatedInd1WithComment.version,
+              status: CaseStatuses.closed,
+            },
+            {
+              id: updatedInd2WithComment.id,
+              version: updatedInd2WithComment.version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+        })
+        .expect(200);
+
+      await es.indices.refresh({ index: defaultSignalsIndex });
+
+      signals = await getSignalsWithES({
+        es,
+        indices: defaultSignalsIndex,
+        ids: [signalID, signalID2],
+      });
+
+      // There should still be no change in their status since syncing is disabled
+      expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+        CaseStatuses.open
+      );
+      expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+        CaseStatuses.open
+      );
+
+      // it updates alert status when syncAlerts is turned on
+      // turn on the sync settings
+      // this performs the cases update through the test plugin that leverages the cases client instead
+      // of going through RESTful API of the cases plugin
+      await supertest
+        .patch('/api/cases_user/cases')
+        .set('kbn-xsrf', 'true')
+        .send({
+          cases: updatedIndWithStatus.map((caseInfo) => ({
+            id: caseInfo.id,
+            version: caseInfo.version,
+            settings: { syncAlerts: true },
+          })),
+        })
+        .expect(200);
+
+      await es.indices.refresh({ index: defaultSignalsIndex });
+
+      signals = await getSignalsWithES({
+        es,
+        indices: defaultSignalsIndex,
+        ids: [signalID, signalID2],
+      });
+
+      // alerts should be updated now that the
+      expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+        CaseStatuses.closed
+      );
+      expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+        CaseStatuses['in-progress']
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/delete_comment.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/delete_comment.ts
new file mode 100644
index 0000000000000..fc0b62ff924b5
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/delete_comment.ts
@@ -0,0 +1,371 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { getPostCaseRequest, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+  deleteComment,
+  deleteAllComments,
+  superUserSpace1Auth,
+} from '../../../../common/lib/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 es = getService('es');
+
+  describe('delete_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    describe('happy path', () => {
+      it('should delete a comment', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+        });
+        const comment = await deleteComment({
+          supertest,
+          caseId: postedCase.id,
+          commentId: patchedCase.comments![0].id,
+        });
+
+        expect(comment).to.eql({});
+      });
+    });
+
+    describe('unhappy path', () => {
+      it('404s when comment belongs to different case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+        });
+        const error = (await deleteComment({
+          supertest,
+          caseId: 'fake-id',
+          commentId: patchedCase.comments![0].id,
+          expectedHttpCode: 404,
+        })) as Error;
+
+        expect(error.message).to.be(
+          `This comment ${patchedCase.comments![0].id} does not exist in fake-id.`
+        );
+      });
+
+      it('404s when comment is not there', async () => {
+        await deleteComment({
+          supertest,
+          caseId: 'fake-id',
+          commentId: 'fake-id',
+          expectedHttpCode: 404,
+        });
+      });
+
+      it('should return a 400 when attempting to delete all comments when passing the `subCaseId` parameter', async () => {
+        const { body } = await supertest
+          .delete(`${CASES_URL}/case-id/comments?subCaseId=value`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(400);
+        // make sure the failure is because of the subCaseId
+        expect(body.message).to.contain('disabled');
+      });
+
+      it('should return a 400 when attempting to delete a single comment when passing the `subCaseId` parameter', async () => {
+        const { body } = await supertest
+          .delete(`${CASES_URL}/case-id/comments/comment-id?subCaseId=value`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(400);
+        // make sure the failure is because of the subCaseId
+        expect(body.message).to.contain('disabled');
+      });
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('sub case comments', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('deletes a comment from a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        await supertest
+          .delete(
+            `${CASES_URL}/${caseInfo.id}/comments/${caseInfo.comments![0].id}?subCaseId=${
+              caseInfo.subCases![0].id
+            }`
+          )
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(204);
+
+        const { body } = await supertest.get(
+          `${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`
+        );
+
+        expect(body.length).to.eql(0);
+      });
+
+      it('deletes all comments from a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        await supertest
+          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentUserReq)
+          .expect(200);
+
+        let { body: allComments } = await supertest.get(
+          `${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`
+        );
+        expect(allComments.length).to.eql(2);
+
+        await supertest
+          .delete(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(204);
+
+        ({ body: allComments } = await supertest.get(
+          `${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`
+        ));
+
+        // no comments for the sub case
+        expect(allComments.length).to.eql(0);
+
+        ({ body: allComments } = await supertest.get(`${CASES_URL}/${caseInfo.id}/comments`));
+
+        // no comments for the collection
+        expect(allComments.length).to.eql(0);
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should delete a comment from the appropriate owner', async () => {
+        const secCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: secOnly, space: 'space1' }
+        );
+
+        const commentResp = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          params: postCommentUserReq,
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        await deleteComment({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          commentId: commentResp.comments![0].id,
+          auth: { user: secOnly, space: 'space1' },
+        });
+      });
+
+      it('should delete multiple comments from the appropriate owner', async () => {
+        const secCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: secOnly, space: 'space1' }
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          params: postCommentUserReq,
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          params: postCommentUserReq,
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        await deleteAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          auth: { user: secOnly, space: 'space1' },
+        });
+      });
+
+      it('should not delete a comment from a different owner', async () => {
+        const secCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: secOnly, space: 'space1' }
+        );
+
+        const commentResp = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          params: postCommentUserReq,
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        await deleteComment({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          commentId: commentResp.comments![0].id,
+          auth: { user: obsOnly, space: 'space1' },
+          expectedHttpCode: 403,
+        });
+
+        await deleteAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          auth: { user: obsOnly, 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 delete a comment`, async () => {
+          const postedCase = await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            superUserSpace1Auth
+          );
+
+          const commentResp = await createComment({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            params: postCommentUserReq,
+            auth: superUserSpace1Auth,
+          });
+
+          await deleteComment({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            commentId: commentResp.comments![0].id,
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+
+          await deleteAllComments({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should NOT delete a comment in a space with where the user does not have permissions', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: superUser, space: 'space2' }
+        );
+
+        const commentResp = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: { user: superUser, space: 'space2' },
+        });
+
+        await deleteComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          commentId: commentResp.comments![0].id,
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+
+        await deleteAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+
+      it('should NOT delete a comment created in space2 by making a request to space1', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: superUser, space: 'space2' }
+        );
+
+        const commentResp = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: { user: superUser, space: 'space2' },
+        });
+
+        await deleteComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          commentId: commentResp.comments![0].id,
+          auth: { user: secOnly, space: 'space1' },
+          expectedHttpCode: 404,
+        });
+
+        await deleteAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          auth: { user: secOnly, space: 'space1' },
+          expectedHttpCode: 404,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/find_comments.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
new file mode 100644
index 0000000000000..2ec99d039dd00
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/find_comments.ts
@@ -0,0 +1,393 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { CommentsResponse, CommentType } from '../../../../../../plugins/cases/common/api';
+import {
+  getPostCaseRequest,
+  postCaseReq,
+  postCommentAlertReq,
+  postCommentUserReq,
+} from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createComment,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  ensureSavedObjectIsAuthorized,
+  getSpaceUrlPrefix,
+  createCase,
+  superUserSpace1Auth,
+} from '../../../../common/lib/utils';
+
+import {
+  obsOnly,
+  secOnly,
+  obsOnlyRead,
+  secOnlyRead,
+  noKibanaPrivileges,
+  superUser,
+  globalRead,
+  obsSecRead,
+} from '../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('find_comments', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should find all case comment', async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      // post 2 comments
+      await supertest
+        .post(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send(postCommentUserReq)
+        .expect(200);
+
+      const { body: patchedCase } = await supertest
+        .post(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send(postCommentUserReq)
+        .expect(200);
+
+      const { body: caseComments } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/comments/_find`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(caseComments.comments).to.eql(patchedCase.comments);
+    });
+
+    it('should filter case comments', async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      // post 2 comments
+      await supertest
+        .post(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send(postCommentUserReq)
+        .expect(200);
+
+      const { body: patchedCase } = await supertest
+        .post(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send({ ...postCommentUserReq, comment: 'unique' })
+        .expect(200);
+
+      const { body: caseComments } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/comments/_find?search=unique`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(caseComments.comments).to.eql([patchedCase.comments[1]]);
+    });
+
+    it('unhappy path - 400s when query is bad', async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      await supertest
+        .post(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send(postCommentUserReq)
+        .expect(200);
+
+      await supertest
+        .get(`${CASES_URL}/${postedCase.id}/comments/_find?perPage=true`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+    });
+
+    it('should return a 400 when passing the subCaseId parameter', async () => {
+      const { body } = await supertest
+        .get(`${CASES_URL}/case-id/comments/_find?search=unique&subCaseId=value`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+
+      expect(body.message).to.contain('disabled');
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('sub case comments', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('finds comments for a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        await supertest
+          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentUserReq)
+          .expect(200);
+
+        const { body: subCaseComments }: { body: CommentsResponse } = await supertest
+          .get(`${CASES_URL}/${caseInfo.id}/comments/_find?subCaseId=${caseInfo.subCases![0].id}`)
+          .send()
+          .expect(200);
+        expect(subCaseComments.total).to.be(2);
+        expect(subCaseComments.comments[0].type).to.be(CommentType.generatedAlert);
+        expect(subCaseComments.comments[1].type).to.be(CommentType.user);
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should return the correct comments', async () => {
+        const space1 = 'space1';
+
+        const [secCase, obsCase] = await Promise.all([
+          // Create case owned by the security solution user
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            { user: secOnly, space: space1 }
+          ),
+          createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'observabilityFixture' }),
+            200,
+            { user: obsOnly, space: space1 }
+          ),
+          // Create case owned by the observability user
+        ]);
+
+        await Promise.all([
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: secCase.id,
+            params: postCommentUserReq,
+            auth: { user: secOnly, space: space1 },
+          }),
+          createComment({
+            supertest: supertestWithoutAuth,
+            caseId: obsCase.id,
+            params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+            auth: { user: obsOnly, space: space1 },
+          }),
+        ]);
+
+        for (const scenario of [
+          {
+            user: globalRead,
+            numExpectedEntites: 1,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+            caseID: secCase.id,
+          },
+          {
+            user: globalRead,
+            numExpectedEntites: 1,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+            caseID: obsCase.id,
+          },
+          {
+            user: superUser,
+            numExpectedEntites: 1,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+            caseID: secCase.id,
+          },
+          {
+            user: superUser,
+            numExpectedEntites: 1,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+            caseID: obsCase.id,
+          },
+          {
+            user: secOnlyRead,
+            numExpectedEntites: 1,
+            owners: ['securitySolutionFixture'],
+            caseID: secCase.id,
+          },
+          {
+            user: obsOnlyRead,
+            numExpectedEntites: 1,
+            owners: ['observabilityFixture'],
+            caseID: obsCase.id,
+          },
+          {
+            user: obsSecRead,
+            numExpectedEntites: 1,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+            caseID: secCase.id,
+          },
+          {
+            user: obsSecRead,
+            numExpectedEntites: 1,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+            caseID: obsCase.id,
+          },
+        ]) {
+          const { body: caseComments }: { body: CommentsResponse } = await supertestWithoutAuth
+            .get(`${getSpaceUrlPrefix(space1)}${CASES_URL}/${scenario.caseID}/comments/_find`)
+            .auth(scenario.user.username, scenario.user.password)
+            .expect(200);
+
+          ensureSavedObjectIsAuthorized(
+            caseComments.comments,
+            scenario.numExpectedEntites,
+            scenario.owners
+          );
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`User ${scenario.user.username} with role(s) ${scenario.user.roles.join()} and space ${
+          scenario.space
+        } - should NOT read a comment`, async () => {
+          // super user creates a case and comment in the appropriate space
+          const caseInfo = await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            { user: superUser, space: scenario.space }
+          );
+
+          await createComment({
+            supertest: supertestWithoutAuth,
+            auth: { user: superUser, space: scenario.space },
+            params: { ...postCommentUserReq, owner: 'securitySolutionFixture' },
+            caseId: caseInfo.id,
+          });
+
+          // user should not be able to read comments
+          await supertestWithoutAuth
+            .get(`${getSpaceUrlPrefix(scenario.space)}${CASES_URL}/${caseInfo.id}/comments/_find`)
+            .auth(scenario.user.username, scenario.user.password)
+            .expect(403);
+        });
+      }
+
+      it('should not return any comments when trying to exploit RBAC through the search query parameter', async () => {
+        const obsCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          auth: superUserSpace1Auth,
+          params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+          caseId: obsCase.id,
+        });
+
+        const { body: res }: { body: CommentsResponse } = await supertestWithoutAuth
+          .get(
+            `${getSpaceUrlPrefix('space1')}${CASES_URL}/${
+              obsCase.id
+            }/comments/_find?search=securitySolutionFixture+observabilityFixture`
+          )
+          .auth(secOnly.username, secOnly.password)
+          .expect(200);
+
+        // shouldn't find any comments since they were created under the observability ownership
+        ensureSavedObjectIsAuthorized(res.comments, 0, ['securitySolutionFixture']);
+      });
+
+      it('should not allow retrieving unauthorized comments using the filter field', async () => {
+        const obsCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          auth: superUserSpace1Auth,
+          params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+          caseId: obsCase.id,
+        });
+
+        const { body: res } = await supertestWithoutAuth
+          .get(
+            `${getSpaceUrlPrefix('space1')}${CASES_URL}/${
+              obsCase.id
+            }/comments/_find?filter=cases-comments.attributes.owner:"observabilityFixture"`
+          )
+          .auth(secOnly.username, secOnly.password)
+          .expect(200);
+        expect(res.comments.length).to.be(0);
+      });
+
+      // This test ensures that the user is not allowed to define the namespaces query param
+      // so she cannot search across spaces
+      it('should NOT allow to pass a namespaces query parameter', async () => {
+        const obsCase = await createCase(
+          supertest,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200
+        );
+
+        await createComment({
+          supertest,
+          params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+          caseId: obsCase.id,
+        });
+
+        await supertest
+          .get(`${CASES_URL}/${obsCase.id}/comments/_find?namespaces[0]=*`)
+          .expect(400);
+
+        await supertest.get(`${CASES_URL}/${obsCase.id}/comments/_find?namespaces=*`).expect(400);
+      });
+
+      it('should NOT allow to pass a non supported query parameter', async () => {
+        await supertest.get(`${CASES_URL}/id/comments/_find?notExists=papa`).expect(400);
+        await supertest.get(`${CASES_URL}/id/comments/_find?owner=papa`).expect(400);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
new file mode 100644
index 0000000000000..25df715b43e9a
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/get_all_comments.ts
@@ -0,0 +1,231 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { postCaseReq, getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  createCase,
+  createComment,
+  getAllComments,
+  superUserSpace1Auth,
+} from '../../../../common/lib/utils';
+import { CommentType } from '../../../../../../plugins/cases/common/api';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnly,
+  obsOnlyRead,
+  obsSec,
+  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 es = getService('es');
+
+  describe('get_all_comments', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should get multiple comments for a single case', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+      await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+      const comments = await getAllComments({ supertest, caseId: postedCase.id });
+
+      expect(comments.length).to.eql(2);
+    });
+
+    it('should return a 400 when passing the subCaseId parameter', async () => {
+      const { body } = await supertest
+        .get(`${CASES_URL}/case-id/comments?subCaseId=value`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+
+      expect(body.message).to.contain('disabled');
+    });
+
+    it('should return a 400 when passing the includeSubCaseComments parameter', async () => {
+      const { body } = await supertest
+        .get(`${CASES_URL}/case-id/comments?includeSubCaseComments=true`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+
+      expect(body.message).to.contain('disabled');
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('sub cases', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+
+      it('should get comments from a case and its sub cases', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        await supertest
+          .post(`${CASES_URL}/${caseInfo.id}/comments`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentUserReq)
+          .expect(200);
+
+        const { body: comments } = await supertest
+          .get(`${CASES_URL}/${caseInfo.id}/comments?includeSubCaseComments=true`)
+          .expect(200);
+
+        expect(comments.length).to.eql(2);
+        expect(comments[0].type).to.eql(CommentType.generatedAlert);
+        expect(comments[1].type).to.eql(CommentType.user);
+      });
+
+      it('should get comments from a sub cases', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        await supertest
+          .post(`${CASES_URL}/${caseInfo.subCases![0].id}/comments`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentUserReq)
+          .expect(200);
+
+        const { body: comments } = await supertest
+          .get(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .expect(200);
+
+        expect(comments.length).to.eql(2);
+        expect(comments[0].type).to.eql(CommentType.generatedAlert);
+        expect(comments[1].type).to.eql(CommentType.user);
+      });
+
+      it('should not find any comments for an invalid case id', async () => {
+        const { body } = await supertest
+          .get(`${CASES_URL}/fake-id/comments`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+        expect(body.length).to.eql(0);
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      it('should get all comments when the user has the correct permissions', async () => {
+        const caseInfo = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          params: postCommentUserReq,
+          auth: superUserSpace1Auth,
+        });
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          params: postCommentUserReq,
+          auth: superUserSpace1Auth,
+        });
+
+        for (const user of [globalRead, superUser, secOnly, secOnlyRead, obsSec, obsSecRead]) {
+          const comments = await getAllComments({
+            supertest: supertestWithoutAuth,
+            caseId: caseInfo.id,
+            auth: { user, space: 'space1' },
+          });
+
+          expect(comments.length).to.eql(2);
+        }
+      });
+
+      it('should not get comments when the user does not have correct permission', async () => {
+        const caseInfo = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          params: postCommentUserReq,
+          auth: superUserSpace1Auth,
+        });
+
+        for (const scenario of [
+          { user: noKibanaPrivileges, returnCode: 403 },
+          { user: obsOnly, returnCode: 200 },
+          { user: obsOnlyRead, returnCode: 200 },
+        ]) {
+          const comments = await getAllComments({
+            supertest: supertestWithoutAuth,
+            caseId: caseInfo.id,
+            auth: { user: scenario.user, space: 'space1' },
+            expectedHttpCode: scenario.returnCode,
+          });
+
+          // only check the length if we get a 200 in response
+          if (scenario.returnCode === 200) {
+            expect(comments.length).to.be(0);
+          }
+        }
+      });
+
+      it('should NOT get a comment in a space with no permissions', async () => {
+        const caseInfo = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: superUser, space: 'space2' }
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          params: postCommentUserReq,
+          auth: { user: superUser, space: 'space2' },
+        });
+
+        await getAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/get_comment.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/get_comment.ts
new file mode 100644
index 0000000000000..5b606e06e84df
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/get_comment.ts
@@ -0,0 +1,169 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { postCaseReq, postCommentUserReq, getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  createCase,
+  createComment,
+  getComment,
+  superUserSpace1Auth,
+} from '../../../../common/lib/utils';
+import { CommentType } from '../../../../../../plugins/cases/common/api';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnly,
+  obsOnlyRead,
+  obsSec,
+  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 es = getService('es');
+
+  describe('get_comment', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should get a comment', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+      const comment = await getComment({
+        supertest,
+        caseId: postedCase.id,
+        commentId: patchedCase.comments![0].id,
+      });
+
+      expect(comment).to.eql(patchedCase.comments![0]);
+    });
+
+    it('unhappy path - 404s when comment is not there', async () => {
+      await getComment({
+        supertest,
+        caseId: 'fake-id',
+        commentId: 'fake-id',
+        expectedHttpCode: 404,
+      });
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('sub cases', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      it('should get a sub case comment', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        const comment = await getComment({
+          supertest,
+          caseId: caseInfo.id,
+          commentId: caseInfo.comments![0].id,
+        });
+        expect(comment.type).to.be(CommentType.generatedAlert);
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      it('should get a comment when the user has the correct permissions', async () => {
+        const caseInfo = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        const caseWithComment = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          params: postCommentUserReq,
+          auth: superUserSpace1Auth,
+        });
+
+        for (const user of [globalRead, superUser, secOnly, secOnlyRead, obsSec, obsSecRead]) {
+          await getComment({
+            supertest: supertestWithoutAuth,
+            caseId: caseInfo.id,
+            commentId: caseWithComment.comments![0].id,
+            auth: { user, space: 'space1' },
+          });
+        }
+      });
+
+      it('should not get comment when the user does not have correct permissions', async () => {
+        const caseInfo = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        const caseWithComment = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          params: postCommentUserReq,
+          auth: superUserSpace1Auth,
+        });
+
+        for (const user of [noKibanaPrivileges, obsOnly, obsOnlyRead]) {
+          await getComment({
+            supertest: supertestWithoutAuth,
+            caseId: caseInfo.id,
+            commentId: caseWithComment.comments![0].id,
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+        }
+      });
+
+      it('should NOT get a case in a space with no permissions', async () => {
+        const caseInfo = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: superUser, space: 'space2' }
+        );
+
+        const caseWithComment = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          params: postCommentUserReq,
+          auth: { user: superUser, space: 'space2' },
+        });
+
+        await getComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          commentId: caseWithComment.comments![0].id,
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/migrations.ts
new file mode 100644
index 0000000000000..357373e7805ee
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/migrations.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+
+// eslint-disable-next-line import/no-default-export
+export default function createGetTests({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('migrations', () => {
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+    });
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+    });
+
+    it('7.11.0 migrates cases comments', async () => {
+      const { body: comment } = await supertest
+        .get(
+          `${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509/comments/da677740-1ac7-11eb-b5a3-25ee88122510`
+        )
+        .set('kbn-xsrf', 'true')
+        .send();
+
+      expect(comment.type).to.eql('user');
+    });
+  });
+}
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
new file mode 100644
index 0000000000000..b00a0382bc712
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/patch_comment.ts
@@ -0,0 +1,641 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import {
+  AttributesTypeAlerts,
+  AttributesTypeUser,
+  CaseResponse,
+  CommentType,
+} from '../../../../../../plugins/cases/common/api';
+import {
+  defaultUser,
+  postCaseReq,
+  postCommentUserReq,
+  postCommentAlertReq,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+  updateComment,
+  superUserSpace1Auth,
+} from '../../../../common/lib/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 es = getService('es');
+
+  describe('patch_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should return a 400 when the subCaseId parameter is passed', async () => {
+      const { body } = await supertest
+        .patch(`${CASES_URL}/case-id}/comments?subCaseId=value`)
+        .set('kbn-xsrf', 'true')
+        .send({
+          id: 'id',
+          version: 'version',
+          type: CommentType.alert,
+          alertId: 'test-id',
+          index: 'test-index',
+          rule: {
+            id: 'id',
+            name: 'name',
+          },
+          owner: 'securitySolutionFixture',
+        })
+        .expect(400);
+
+      expect(body.message).to.contain('disabled');
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('sub case comments', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('patches a comment for a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        const { body: patchedSubCase }: { body: CaseResponse } = await supertest
+          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentUserReq)
+          .expect(200);
+
+        const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+        const { body: patchedSubCaseUpdatedComment } = await supertest
+          .patch(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send({
+            id: patchedSubCase.comments![1].id,
+            version: patchedSubCase.comments![1].version,
+            comment: newComment,
+            type: CommentType.user,
+          })
+          .expect(200);
+
+        expect(patchedSubCaseUpdatedComment.comments.length).to.be(2);
+        expect(patchedSubCaseUpdatedComment.comments[0].type).to.be(CommentType.generatedAlert);
+        expect(patchedSubCaseUpdatedComment.comments[1].type).to.be(CommentType.user);
+        expect(patchedSubCaseUpdatedComment.comments[1].comment).to.be(newComment);
+      });
+
+      it('fails to update the generated alert comment type', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        await supertest
+          .patch(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send({
+            id: caseInfo.comments![0].id,
+            version: caseInfo.comments![0].version,
+            type: CommentType.alert,
+            alertId: 'test-id',
+            index: 'test-index',
+            rule: {
+              id: 'id',
+              name: 'name',
+            },
+          })
+          .expect(400);
+      });
+
+      it('fails to update the generated alert comment by using another generated alert comment', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        await supertest
+          .patch(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send({
+            id: caseInfo.comments![0].id,
+            version: caseInfo.comments![0].version,
+            type: CommentType.generatedAlert,
+            alerts: [{ _id: 'id1' }],
+            index: 'test-index',
+            rule: {
+              id: 'id',
+              name: 'name',
+            },
+          })
+          .expect(400);
+      });
+    });
+
+    it('should patch a comment', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      const updatedCase = await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          comment: newComment,
+          type: CommentType.user,
+          owner: 'securitySolutionFixture',
+        },
+      });
+
+      const userComment = updatedCase.comments![0] as AttributesTypeUser;
+      expect(userComment.comment).to.eql(newComment);
+      expect(userComment.type).to.eql(CommentType.user);
+      expect(updatedCase.updated_by).to.eql(defaultUser);
+    });
+
+    it('should patch an alert', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentAlertReq,
+      });
+      const updatedCase = await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          type: CommentType.alert,
+          alertId: 'new-id',
+          index: postCommentAlertReq.index,
+          rule: {
+            id: 'id',
+            name: 'name',
+          },
+          owner: 'securitySolutionFixture',
+        },
+      });
+
+      const alertComment = updatedCase.comments![0] as AttributesTypeAlerts;
+      expect(alertComment.alertId).to.eql('new-id');
+      expect(alertComment.index).to.eql(postCommentAlertReq.index);
+      expect(alertComment.type).to.eql(CommentType.alert);
+      expect(alertComment.rule).to.eql({
+        id: 'id',
+        name: 'name',
+      });
+      expect(alertComment.updated_by).to.eql(defaultUser);
+    });
+
+    it('should not allow updating the owner of a comment', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+
+      await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          type: CommentType.user,
+          comment: postCommentUserReq.comment,
+          owner: 'changedOwner',
+        },
+        expectedHttpCode: 400,
+      });
+    });
+
+    it('unhappy path - 404s when comment is not there', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: 'id',
+          version: 'version',
+          type: CommentType.user,
+          comment: 'comment',
+          owner: 'securitySolutionFixture',
+        },
+        expectedHttpCode: 404,
+      });
+    });
+
+    it('unhappy path - 404s when case is not there', async () => {
+      await updateComment({
+        supertest,
+        caseId: 'fake-id',
+        req: {
+          id: 'id',
+          version: 'version',
+          type: CommentType.user,
+          comment: 'comment',
+          owner: 'securitySolutionFixture',
+        },
+        expectedHttpCode: 404,
+      });
+    });
+
+    it('unhappy path - 400s when trying to change comment type', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+
+      await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          type: CommentType.alert,
+          alertId: 'test-id',
+          index: 'test-index',
+          rule: {
+            id: 'id',
+            name: 'name',
+          },
+          owner: 'securitySolutionFixture',
+        },
+        expectedHttpCode: 400,
+      });
+    });
+
+    it('unhappy path - 400s when missing attributes for type user', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+
+      await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        // @ts-expect-error
+        req: {
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+        },
+        expectedHttpCode: 400,
+      });
+    });
+
+    it('unhappy path - 400s when adding excess attributes for type user', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+
+      for (const attribute of ['alertId', 'index']) {
+        await updateComment({
+          supertest,
+          caseId: postedCase.id,
+          req: {
+            id: patchedCase.comments![0].id,
+            version: patchedCase.comments![0].version,
+            comment: 'a comment',
+            type: CommentType.user,
+            [attribute]: attribute,
+            owner: 'securitySolutionFixture',
+          },
+          expectedHttpCode: 400,
+        });
+      }
+    });
+
+    it('unhappy path - 400s when missing attributes for type alert', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentAlertReq,
+      });
+
+      const allRequestAttributes = {
+        type: CommentType.alert,
+        index: 'test-index',
+        alertId: 'test-id',
+        rule: {
+          id: 'id',
+          name: 'name',
+        },
+      };
+
+      for (const attribute of ['alertId', 'index']) {
+        const requestAttributes = omit(attribute, allRequestAttributes);
+        await updateComment({
+          supertest,
+          caseId: postedCase.id,
+          // @ts-expect-error
+          req: {
+            id: patchedCase.comments![0].id,
+            version: patchedCase.comments![0].version,
+            ...requestAttributes,
+          },
+          expectedHttpCode: 400,
+        });
+      }
+    });
+
+    it('unhappy path - 400s when adding excess attributes for type alert', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentAlertReq,
+      });
+
+      for (const attribute of ['comment']) {
+        await updateComment({
+          supertest,
+          caseId: postedCase.id,
+          req: {
+            id: patchedCase.comments![0].id,
+            version: patchedCase.comments![0].version,
+            type: CommentType.alert,
+            index: 'test-index',
+            alertId: 'test-id',
+            rule: {
+              id: 'id',
+              name: 'name',
+            },
+            owner: 'securitySolutionFixture',
+            [attribute]: attribute,
+          },
+          expectedHttpCode: 400,
+        });
+      }
+    });
+
+    it('unhappy path - 409s when conflict', async () => {
+      const postedCase = await createCase(supertest, postCaseReq);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+      });
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: patchedCase.comments![0].id,
+          version: 'version-mismatch',
+          type: CommentType.user,
+          comment: newComment,
+          owner: 'securitySolutionFixture',
+        },
+        expectedHttpCode: 409,
+      });
+    });
+
+    describe('alert format', () => {
+      type AlertComment = CommentType.alert | CommentType.generatedAlert;
+
+      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed create a test case for generated alerts here
+      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);
+          const patchedCase = await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: postCommentAlertReq,
+          });
+
+          await updateComment({
+            supertest,
+            caseId: patchedCase.id,
+            req: {
+              id: patchedCase.comments![0].id,
+              version: patchedCase.comments![0].version,
+              type: type as AlertComment,
+              alertId,
+              index,
+              owner: 'securitySolutionFixture',
+              rule: postCommentAlertReq.rule,
+            },
+            expectedHttpCode: 400,
+          });
+        });
+      }
+
+      for (const [alertId, index, type] of [
+        ['1', ['index1'], CommentType.alert],
+        [['1', '2'], ['index', 'other-index'], CommentType.alert],
+      ]) {
+        it(`does not throw an error with an alert comment with contents id: ${alertId} indices: ${index} type: ${type}`, async () => {
+          const postedCase = await createCase(supertest, postCaseReq);
+          const patchedCase = await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              ...postCommentAlertReq,
+              alertId,
+              index,
+              owner: 'securitySolutionFixture',
+              type: type as AlertComment,
+            },
+          });
+
+          await updateComment({
+            supertest,
+            caseId: postedCase.id,
+            req: {
+              id: patchedCase.comments![0].id,
+              version: patchedCase.comments![0].version,
+              type: type as AlertComment,
+              alertId,
+              index,
+              owner: 'securitySolutionFixture',
+              rule: postCommentAlertReq.rule,
+            },
+          });
+        });
+      }
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should update a comment that the user has permissions for', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: superUserSpace1Auth,
+        });
+
+        const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+        const updatedCase = await updateComment({
+          supertest,
+          caseId: postedCase.id,
+          req: {
+            ...postCommentUserReq,
+            id: patchedCase.comments![0].id,
+            version: patchedCase.comments![0].version,
+            comment: newComment,
+          },
+          auth: { user: secOnly, space: 'space1' },
+        });
+
+        const userComment = updatedCase.comments![0] as AttributesTypeUser;
+        expect(userComment.comment).to.eql(newComment);
+        expect(userComment.type).to.eql(CommentType.user);
+        expect(updatedCase.updated_by).to.eql(defaultUser);
+        expect(userComment.owner).to.eql('securitySolutionFixture');
+      });
+
+      it('should not update a comment that has a different owner thant he user has access to', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        const patchedCase = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: superUserSpace1Auth,
+        });
+
+        const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+        await updateComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          req: {
+            ...postCommentUserReq,
+            id: patchedCase.comments![0].id,
+            version: patchedCase.comments![0].version,
+            comment: newComment,
+          },
+          auth: { user: obsOnly, 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 update a comment`, async () => {
+          const postedCase = await createCase(
+            supertestWithoutAuth,
+            getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+            200,
+            superUserSpace1Auth
+          );
+
+          const patchedCase = await createComment({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            params: postCommentUserReq,
+            auth: superUserSpace1Auth,
+          });
+
+          const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+          await updateComment({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            req: {
+              ...postCommentUserReq,
+              id: patchedCase.comments![0].id,
+              version: patchedCase.comments![0].version,
+              comment: newComment,
+            },
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should not update a comment in a space the user does not have permissions', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          { user: superUser, space: 'space2' }
+        );
+
+        const patchedCase = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: { user: superUser, space: 'space2' },
+        });
+
+        const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+        await updateComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          req: {
+            ...postCommentUserReq,
+            id: patchedCase.comments![0].id,
+            version: patchedCase.comments![0].version,
+            comment: newComment,
+          },
+          auth: { user: secOnly, space: 'space2' },
+          // getting the case will fail in the saved object layer with a 403
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/post_comment.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
new file mode 100644
index 0000000000000..e30e276c7b717
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/comments/post_comment.ts
@@ -0,0 +1,605 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 { 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 {
+  CommentsResponse,
+  CommentType,
+  AttributesTypeUser,
+  AttributesTypeAlerts,
+} from '../../../../../../plugins/cases/common/api';
+import {
+  defaultUser,
+  postCaseReq,
+  postCommentUserReq,
+  postCommentAlertReq,
+  postCollectionReq,
+  postCommentGenAlertReq,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+  getCaseUserActions,
+  removeServerGeneratedPropertiesFromUserAction,
+  removeServerGeneratedPropertiesFromSavedObject,
+  superUserSpace1Auth,
+} 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');
+
+  describe('post_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    describe('happy path', () => {
+      it('should post a comment', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+        });
+        const comment = removeServerGeneratedPropertiesFromSavedObject(
+          patchedCase.comments![0] as AttributesTypeUser
+        );
+
+        expect(comment).to.eql({
+          type: postCommentUserReq.type,
+          comment: postCommentUserReq.comment,
+          associationType: 'case',
+          created_by: defaultUser,
+          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(defaultUser);
+      });
+
+      it('should post an alert', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentAlertReq,
+        });
+        const comment = removeServerGeneratedPropertiesFromSavedObject(
+          patchedCase.comments![0] as AttributesTypeAlerts
+        );
+
+        expect(comment).to.eql({
+          type: postCommentAlertReq.type,
+          alertId: postCommentAlertReq.alertId,
+          index: postCommentAlertReq.index,
+          rule: postCommentAlertReq.rule,
+          associationType: 'case',
+          created_by: defaultUser,
+          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(defaultUser);
+      });
+
+      it('creates a user action', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        const patchedCase = await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+        });
+        const userActions = await getCaseUserActions({ supertest, caseID: postedCase.id });
+        const commentUserAction = removeServerGeneratedPropertiesFromUserAction(userActions[1]);
+
+        expect(commentUserAction).to.eql({
+          action_field: ['comment'],
+          action: 'create',
+          action_by: defaultUser,
+          new_value: `{"comment":"${postCommentUserReq.comment}","type":"${postCommentUserReq.type}","owner":"securitySolutionFixture"}`,
+          old_value: null,
+          case_id: `${postedCase.id}`,
+          comment_id: `${patchedCase.comments![0].id}`,
+          sub_case_id: '',
+          owner: 'securitySolutionFixture',
+        });
+      });
+    });
+
+    describe('unhappy path', () => {
+      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 createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when type is missing', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: {
+            // @ts-expect-error
+            bad: 'comment',
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when missing attributes for type user', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          // @ts-expect-error
+          params: {
+            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 createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              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 createComment({
+            supertest,
+            caseId: postedCase.id,
+            // @ts-expect-error
+            params: 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 createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              type: CommentType.alert,
+              [attribute]: attribute,
+              alertId: 'test-id',
+              index: 'test-index',
+              rule: {
+                id: 'id',
+                name: 'name',
+              },
+              owner: 'securitySolutionFixture',
+            },
+            expectedHttpCode: 400,
+          });
+        }
+      });
+
+      it('400s when case is missing', async () => {
+        await createComment({
+          supertest,
+          caseId: 'not-exists',
+          params: {
+            // @ts-expect-error
+            bad: 'comment',
+          },
+          expectedHttpCode: 400,
+        });
+      });
+
+      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({
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                status: 'closed',
+              },
+            ],
+          })
+          .expect(200);
+
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentAlertReq,
+          expectedHttpCode: 400,
+        });
+      });
+
+      // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+      it.skip('400s when adding an alert to a collection case', async () => {
+        const postedCase = await createCase(supertest, postCollectionReq);
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: postCommentAlertReq,
+          expectedHttpCode: 400,
+        });
+      });
+
+      it('400s when adding a generated alert to an individual case', async () => {
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        await supertest
+          .post(`${CASES_URL}/${postedCase.id}/comments`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentGenAlertReq)
+          .expect(400);
+      });
+
+      it('should return a 400 when passing the subCaseId', async () => {
+        const { body } = await supertest
+          .post(`${CASES_URL}/case-id/comments?subCaseId=value`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentUserReq)
+          .expect(400);
+        expect(body.message).to.contain('subCaseId');
+      });
+    });
+
+    describe('alerts', () => {
+      beforeEach(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+        await createSignalsIndex(supertest);
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(supertest);
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+      });
+
+      it('should change the status of the alert if sync alert is on', async () => {
+        const rule = getRuleForSignalTesting(['auditbeat-*']);
+        const postedCase = await createCase(supertest, postCaseReq);
+
+        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, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signals = await getSignalsByIds(supertest, [id]);
+
+        const alert = signals.hits.hits[0];
+        expect(alert._source.signal.status).eql('open');
+
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: {
+            alertId: alert._id,
+            index: alert._index,
+            rule: {
+              id: 'id',
+              name: 'name',
+            },
+            owner: 'securitySolutionFixture',
+            type: CommentType.alert,
+          },
+        });
+
+        const { body: updatedAlert } = await supertest
+          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getQuerySignalIds([alert._id]))
+          .expect(200);
+
+        expect(updatedAlert.hits.hits[0]._source.signal.status).eql('in-progress');
+      });
+
+      it('should NOT change the status of the alert if sync alert is off', async () => {
+        const rule = getRuleForSignalTesting(['auditbeat-*']);
+        const postedCase = await createCase(supertest, {
+          ...postCaseReq,
+          settings: { syncAlerts: false },
+        });
+
+        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, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signals = await getSignalsByIds(supertest, [id]);
+
+        const alert = signals.hits.hits[0];
+        expect(alert._source.signal.status).eql('open');
+
+        await createComment({
+          supertest,
+          caseId: postedCase.id,
+          params: {
+            alertId: alert._id,
+            index: alert._index,
+            rule: {
+              id: 'id',
+              name: 'name',
+            },
+            owner: 'securitySolutionFixture',
+            type: CommentType.alert,
+          },
+        });
+
+        const { body: updatedAlert } = await supertest
+          .post(DETECTION_ENGINE_QUERY_SIGNALS_URL)
+          .set('kbn-xsrf', 'true')
+          .send(getQuerySignalIds([alert._id]))
+          .expect(200);
+
+        expect(updatedAlert.hits.hits[0]._source.signal.status).eql('open');
+      });
+    });
+
+    describe('alert format', () => {
+      type AlertComment = CommentType.alert | CommentType.generatedAlert;
+
+      for (const [alertId, index, type] of [
+        ['1', ['index1', 'index2'], CommentType.alert],
+        [['1', '2'], 'index', CommentType.alert],
+        ['1', ['index1', 'index2'], CommentType.generatedAlert],
+        [['1', '2'], 'index', CommentType.generatedAlert],
+      ]) {
+        it(`throws an error with an alert comment with contents id: ${alertId} indices: ${index} type: ${type}`, async () => {
+          const postedCase = await createCase(supertest, postCaseReq);
+          await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: { ...postCommentAlertReq, alertId, index, type: type as AlertComment },
+            expectedHttpCode: 400,
+          });
+        });
+      }
+
+      for (const [alertId, index, type] of [
+        ['1', ['index1'], CommentType.alert],
+        [['1', '2'], ['index', 'other-index'], CommentType.alert],
+      ]) {
+        it(`does not throw an error with an alert comment with contents id: ${alertId} indices: ${index} type: ${type}`, async () => {
+          const postedCase = await createCase(supertest, postCaseReq);
+          await createComment({
+            supertest,
+            caseId: postedCase.id,
+            params: {
+              ...postCommentAlertReq,
+              alertId,
+              index,
+              type: type as AlertComment,
+            },
+            expectedHttpCode: 200,
+          });
+        });
+      }
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('sub case comments', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('posts a new comment for a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        // create another sub case just to make sure we get the right comments
+        await createSubCase({ supertest, actionID });
+        await supertest
+          .post(`${CASES_URL}/${caseInfo.id}/comments?subCaseId=${caseInfo.subCases![0].id}`)
+          .set('kbn-xsrf', 'true')
+          .send(postCommentUserReq)
+          .expect(200);
+
+        const { body: subCaseComments }: { body: CommentsResponse } = await supertest
+          .get(`${CASES_URL}/${caseInfo.id}/comments/_find?subCaseId=${caseInfo.subCases![0].id}`)
+          .send()
+          .expect(200);
+        expect(subCaseComments.total).to.be(2);
+        expect(subCaseComments.comments[0].type).to.be(CommentType.generatedAlert);
+        expect(subCaseComments.comments[1].type).to.be(CommentType.user);
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should create a comment when the user has the correct permissions for that owner', async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          superUserSpace1Auth
+        );
+
+        await createComment({
+          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 createComment({
+          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 createComment({
+            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 createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/get_configure.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/get_configure.ts
new file mode 100644
index 0000000000000..279936ebbef46
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/get_configure.ts
@@ -0,0 +1,215 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import {
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  getConfiguration,
+  createConfiguration,
+  getConfigurationRequest,
+  ensureSavedObjectIsAuthorized,
+} from '../../../../common/lib/utils';
+import {
+  obsOnly,
+  secOnly,
+  obsOnlyRead,
+  secOnlyRead,
+  noKibanaPrivileges,
+  superUser,
+  globalRead,
+  obsSecRead,
+  obsSec,
+} from '../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_configure', () => {
+    afterEach(async () => {
+      await deleteConfiguration(es);
+    });
+
+    it('should return an empty find body correctly if no configuration is loaded', async () => {
+      const configuration = await getConfiguration({ supertest });
+      expect(configuration).to.eql([]);
+    });
+
+    it('should return a configuration', async () => {
+      await createConfiguration(supertest);
+      const configuration = await getConfiguration({ supertest });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(configuration[0]);
+      expect(data).to.eql(getConfigurationOutput());
+    });
+
+    it('should get a single configuration', async () => {
+      await createConfiguration(supertest, getConfigurationRequest({ id: 'connector-2' }));
+      await createConfiguration(supertest);
+      const res = await getConfiguration({ supertest });
+
+      expect(res.length).to.eql(1);
+      const data = removeServerGeneratedPropertiesFromSavedObject(res[0]);
+      expect(data).to.eql(getConfigurationOutput());
+    });
+
+    it('should return by descending order', async () => {
+      await createConfiguration(supertest, getConfigurationRequest({ id: 'connector-2' }));
+      await createConfiguration(supertest);
+      const res = await getConfiguration({ supertest });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(res[0]);
+      expect(data).to.eql(getConfigurationOutput());
+    });
+
+    describe('rbac', () => {
+      it('should return the correct configuration', async () => {
+        await createConfiguration(supertestWithoutAuth, getConfigurationRequest(), 200, {
+          user: secOnly,
+          space: 'space1',
+        });
+
+        await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+          200,
+          {
+            user: obsOnly,
+            space: 'space1',
+          }
+        );
+
+        for (const scenario of [
+          {
+            user: globalRead,
+            numberOfExpectedCases: 2,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+          },
+          {
+            user: superUser,
+            numberOfExpectedCases: 2,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+          },
+          { user: secOnlyRead, numberOfExpectedCases: 1, owners: ['securitySolutionFixture'] },
+          { user: obsOnlyRead, numberOfExpectedCases: 1, owners: ['observabilityFixture'] },
+          {
+            user: obsSecRead,
+            numberOfExpectedCases: 2,
+            owners: ['securitySolutionFixture', 'observabilityFixture'],
+          },
+        ]) {
+          const configuration = await getConfiguration({
+            supertest: supertestWithoutAuth,
+            query: { owner: scenario.owners },
+            expectedHttpCode: 200,
+            auth: {
+              user: scenario.user,
+              space: 'space1',
+            },
+          });
+
+          ensureSavedObjectIsAuthorized(
+            configuration,
+            scenario.numberOfExpectedCases,
+            scenario.owners
+          );
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`User ${scenario.user.username} with role(s) ${scenario.user.roles.join()} and space ${
+          scenario.space
+        } - should NOT read a case configuration`, async () => {
+          // super user creates a configuration at the appropriate space
+          await createConfiguration(supertestWithoutAuth, getConfigurationRequest(), 200, {
+            user: superUser,
+            space: scenario.space,
+          });
+
+          // user should not be able to read configurations at the appropriate space
+          await getConfiguration({
+            supertest: supertestWithoutAuth,
+            expectedHttpCode: 403,
+            auth: {
+              user: scenario.user,
+              space: scenario.space,
+            },
+          });
+        });
+      }
+
+      it('should respect the owner filter when having permissions', async () => {
+        await Promise.all([
+          createConfiguration(supertestWithoutAuth, getConfigurationRequest(), 200, {
+            user: obsSec,
+            space: 'space1',
+          }),
+          createConfiguration(
+            supertestWithoutAuth,
+            { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        const res = await getConfiguration({
+          supertest: supertestWithoutAuth,
+          query: { owner: 'securitySolutionFixture' },
+          auth: {
+            user: obsSec,
+            space: 'space1',
+          },
+        });
+
+        ensureSavedObjectIsAuthorized(res, 1, ['securitySolutionFixture']);
+      });
+
+      it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+        await Promise.all([
+          createConfiguration(supertestWithoutAuth, getConfigurationRequest(), 200, {
+            user: obsSec,
+            space: 'space1',
+          }),
+          createConfiguration(
+            supertestWithoutAuth,
+            { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+            200,
+            {
+              user: obsSec,
+              space: 'space1',
+            }
+          ),
+        ]);
+
+        // User with permissions only to security solution request cases from observability
+        const res = await getConfiguration({
+          supertest: supertestWithoutAuth,
+          query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+          auth: {
+            user: secOnly,
+            space: 'space1',
+          },
+        });
+
+        // Only security solution cases are being returned
+        ensureSavedObjectIsAuthorized(res, 1, ['securitySolutionFixture']);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/get_connectors.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/get_connectors.ts
new file mode 100644
index 0000000000000..46f712ff84aa3
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/get_connectors.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+
+import { getCaseConnectors } from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+
+  describe('get_connectors', () => {
+    it('should return an empty find body correctly if no connectors are loaded', async () => {
+      const connectors = await getCaseConnectors({ supertest });
+      expect(connectors).to.eql([]);
+    });
+
+    it.skip('filters out connectors that are not enabled in license', async () => {
+      // TODO: Should find a way to downgrade license to gold and upgrade back to trial
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/migrations.ts
new file mode 100644
index 0000000000000..c6d892e3435f1
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/migrations.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+import { CASE_CONFIGURE_URL } from '../../../../../../plugins/cases/common/constants';
+
+// eslint-disable-next-line import/no-default-export
+export default function createGetTests({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('migrations', () => {
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+    });
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+    });
+
+    it('7.10.0 migrates configure cases connector', async () => {
+      const { body } = await supertest
+        .get(`${CASE_CONFIGURE_URL}`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.be(1);
+      expect(body[0]).key('connector');
+      expect(body[0]).not.key('connector_id');
+      expect(body[0].connector).to.eql({
+        id: 'connector-1',
+        name: 'Connector 1',
+        type: '.none',
+        fields: null,
+      });
+    });
+  });
+}
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
new file mode 100644
index 0000000000000..323b1b377e555
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/patch_configure.ts
@@ -0,0 +1,269 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  updateConfiguration,
+} from '../../../../common/lib/utils';
+import {
+  secOnly,
+  obsOnlyRead,
+  secOnlyRead,
+  noKibanaPrivileges,
+  globalRead,
+  obsSecRead,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('patch_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should patch a configuration', async () => {
+      const configuration = await createConfiguration(supertest);
+      const newConfiguration = await updateConfiguration(supertest, configuration.id, {
+        closure_type: 'close-by-pushing',
+        version: configuration.version,
+      });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(newConfiguration);
+      expect(data).to.eql({ ...getConfigurationOutput(true), closure_type: 'close-by-pushing' });
+    });
+
+    it('should not patch a configuration with unsupported connector type', async () => {
+      const configuration = await createConfiguration(supertest);
+      await updateConfiguration(
+        supertest,
+        configuration.id,
+        // @ts-expect-error
+        getConfigurationRequest({ type: '.unsupported' }),
+        400
+      );
+    });
+
+    it('should not patch a configuration with unsupported connector fields', async () => {
+      const configuration = await createConfiguration(supertest);
+      await updateConfiguration(
+        supertest,
+        configuration.id,
+        // @ts-expect-error
+        getConfigurationRequest({ type: '.jira', fields: { unsupported: 'value' } }),
+        400
+      );
+    });
+
+    it('should handle patch request when there is no configuration', async () => {
+      const error = await updateConfiguration(
+        supertest,
+        'not-exist',
+        { closure_type: 'close-by-pushing', version: 'no-version' },
+        404
+      );
+
+      expect(error).to.eql({
+        error: 'Not Found',
+        message: 'Saved object [cases-configure/not-exist] not found',
+        statusCode: 404,
+      });
+    });
+
+    it('should handle patch request when versions are different', async () => {
+      const configuration = await createConfiguration(supertest);
+      const error = await updateConfiguration(
+        supertest,
+        configuration.id,
+        { closure_type: 'close-by-pushing', version: 'no-version' },
+        409
+      );
+
+      expect(error).to.eql({
+        error: 'Conflict',
+        message:
+          'This configuration has been updated. Please refresh before saving additional updates.',
+        statusCode: 409,
+      });
+    });
+
+    it('should not allow to change the owner of the configuration', async () => {
+      const configuration = await createConfiguration(supertest);
+      await updateConfiguration(
+        supertest,
+        configuration.id,
+        // @ts-expect-error
+        { owner: 'observabilityFixture', version: configuration.version },
+        400
+      );
+    });
+
+    it('should not allow excess attributes', async () => {
+      const configuration = await createConfiguration(supertest);
+      await updateConfiguration(
+        supertest,
+        configuration.id,
+        // @ts-expect-error
+        { notExist: 'not-exist', version: configuration.version },
+        400
+      );
+    });
+
+    describe('rbac', () => {
+      it('User: security solution only - should update a configuration', async () => {
+        const configuration = await createConfiguration(
+          supertestWithoutAuth,
+          getConfigurationRequest(),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        const newConfiguration = await updateConfiguration(
+          supertestWithoutAuth,
+          configuration.id,
+          {
+            closure_type: 'close-by-pushing',
+            version: configuration.version,
+          },
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        expect(newConfiguration.owner).to.eql('securitySolutionFixture');
+      });
+
+      it('User: security solution only - should NOT update a configuration of different owner', async () => {
+        const configuration = await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+          200,
+          {
+            user: superUser,
+            space: 'space1',
+          }
+        );
+
+        await updateConfiguration(
+          supertestWithoutAuth,
+          configuration.id,
+          {
+            closure_type: 'close-by-pushing',
+            version: configuration.version,
+          },
+          403,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+      });
+
+      for (const user of [globalRead, secOnlyRead, obsOnlyRead, obsSecRead, noKibanaPrivileges]) {
+        it(`User ${
+          user.username
+        } with role(s) ${user.roles.join()} - should NOT update a configuration`, async () => {
+          const configuration = await createConfiguration(
+            supertestWithoutAuth,
+            getConfigurationRequest(),
+            200,
+            {
+              user: superUser,
+              space: 'space1',
+            }
+          );
+
+          await updateConfiguration(
+            supertestWithoutAuth,
+            configuration.id,
+            {
+              closure_type: 'close-by-pushing',
+              version: configuration.version,
+            },
+            403,
+            {
+              user,
+              space: 'space1',
+            }
+          );
+        });
+      }
+
+      it('should NOT update a configuration in a space with no permissions', async () => {
+        const configuration = await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+          200,
+          {
+            user: superUser,
+            space: 'space2',
+          }
+        );
+
+        await updateConfiguration(
+          supertestWithoutAuth,
+          configuration.id,
+          {
+            closure_type: 'close-by-pushing',
+            version: configuration.version,
+          },
+          403,
+          {
+            user: secOnly,
+            space: 'space2',
+          }
+        );
+      });
+
+      it('should NOT update a configuration created in space2 by making a request to space1', async () => {
+        const configuration = await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+          200,
+          {
+            user: superUser,
+            space: 'space2',
+          }
+        );
+
+        await updateConfiguration(
+          supertestWithoutAuth,
+          configuration.id,
+          {
+            closure_type: 'close-by-pushing',
+            version: configuration.version,
+          },
+          404,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/post_configure.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
new file mode 100644
index 0000000000000..44ec24f688f20
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/configure/post_configure.ts
@@ -0,0 +1,315 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  getConfiguration,
+  ensureSavedObjectIsAuthorized,
+} from '../../../../common/lib/utils';
+
+import {
+  secOnly,
+  obsOnlyRead,
+  secOnlyRead,
+  noKibanaPrivileges,
+  globalRead,
+  obsSecRead,
+  superUser,
+  testDisabled,
+} from '../../../../common/lib/authentication/users';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('post_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should create a configuration', async () => {
+      const configuration = await createConfiguration(supertest);
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(configuration);
+      expect(data).to.eql(getConfigurationOutput());
+    });
+
+    it('should keep only the latest configuration', async () => {
+      await createConfiguration(supertest, getConfigurationRequest({ id: 'connector-2' }));
+      await createConfiguration(supertest);
+      const configuration = await getConfiguration({ supertest });
+
+      expect(configuration.length).to.be(1);
+    });
+
+    it('should return an error when failing to get mapping', async () => {
+      const postRes = await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: 'not-exists',
+          name: 'not-exists',
+          type: ConnectorTypes.jira,
+        })
+      );
+
+      expect(postRes.error).to.not.be(null);
+      expect(postRes.mappings).to.eql([]);
+    });
+
+    it('should not create a configuration when missing connector.id', async () => {
+      await createConfiguration(
+        supertest,
+        {
+          // @ts-expect-error
+          connector: {
+            name: 'Connector',
+            type: ConnectorTypes.none,
+            fields: null,
+          },
+          closure_type: 'close-by-user',
+        },
+        400
+      );
+    });
+
+    it('should not create a configuration when missing connector.name', async () => {
+      await createConfiguration(
+        supertest,
+        {
+          // @ts-expect-error
+          connector: {
+            id: 'test-id',
+            type: ConnectorTypes.none,
+            fields: null,
+          },
+          closure_type: 'close-by-user',
+        },
+        400
+      );
+    });
+
+    it('should not create a configuration when missing connector.type', async () => {
+      await createConfiguration(
+        supertest,
+        {
+          // @ts-expect-error
+          connector: {
+            id: 'test-id',
+            name: 'Connector',
+            fields: null,
+          },
+          closure_type: 'close-by-user',
+        },
+        400
+      );
+    });
+
+    it('should not create a configuration when missing connector.fields', async () => {
+      await createConfiguration(
+        supertest,
+        {
+          // @ts-expect-error
+          connector: {
+            id: 'test-id',
+            type: ConnectorTypes.none,
+            name: 'Connector',
+          },
+          closure_type: 'close-by-user',
+        },
+        400
+      );
+    });
+
+    it('should not create a configuration when when missing closure_type', async () => {
+      await createConfiguration(
+        supertest,
+        // @ts-expect-error
+        {
+          connector: {
+            id: 'test-id',
+            type: ConnectorTypes.none,
+            name: 'Connector',
+            fields: null,
+          },
+        },
+        400
+      );
+    });
+
+    it('should not create a configuration when missing connector', async () => {
+      await createConfiguration(
+        supertest,
+        // @ts-expect-error
+        {
+          closure_type: 'close-by-user',
+        },
+        400
+      );
+    });
+
+    it('should not create a configuration when fields are not null', async () => {
+      await createConfiguration(
+        supertest,
+        {
+          connector: {
+            id: 'test-id',
+            type: ConnectorTypes.none,
+            name: 'Connector',
+            // @ts-expect-error
+            fields: {},
+          },
+          closure_type: 'close-by-user',
+        },
+        400
+      );
+    });
+
+    it('should not create a configuration with unsupported connector type', async () => {
+      // @ts-expect-error
+      await createConfiguration(supertest, getConfigurationRequest({ type: '.unsupported' }), 400);
+    });
+
+    it('should not create a configuration with unsupported connector fields', async () => {
+      await createConfiguration(
+        supertest,
+        // @ts-expect-error
+        getConfigurationRequest({ type: '.jira', fields: { unsupported: 'value' } }),
+        400
+      );
+    });
+
+    describe('rbac', () => {
+      it('returns a 403 when attempting to create a configuration with an owner that was from a disabled feature in the space', async () => {
+        const configuration = ((await createConfiguration(
+          supertestWithoutAuth,
+          getConfigurationRequest({ overrides: { owner: 'testDisabledFixture' } }),
+          403,
+          {
+            user: testDisabled,
+            space: 'space1',
+          }
+        )) as unknown) as { message: string };
+
+        expect(configuration.message).to.eql(
+          'Unauthorized to create case configuration with owners: "testDisabledFixture"'
+        );
+      });
+
+      it('User: security solution only - should create a configuration', async () => {
+        const configuration = await createConfiguration(
+          supertestWithoutAuth,
+          getConfigurationRequest(),
+          200,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+
+        expect(configuration.owner).to.eql('securitySolutionFixture');
+      });
+
+      it('User: security solution only - should NOT create a configuration of different owner', async () => {
+        await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+          403,
+          {
+            user: secOnly,
+            space: 'space1',
+          }
+        );
+      });
+
+      for (const user of [globalRead, secOnlyRead, obsOnlyRead, obsSecRead, noKibanaPrivileges]) {
+        it(`User ${
+          user.username
+        } with role(s) ${user.roles.join()} - should NOT create a configuration`, async () => {
+          await createConfiguration(
+            supertestWithoutAuth,
+            { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+            403,
+            {
+              user,
+              space: 'space1',
+            }
+          );
+        });
+      }
+
+      it('should NOT create a configuration in a space with no permissions', async () => {
+        await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+          403,
+          {
+            user: secOnly,
+            space: 'space2',
+          }
+        );
+      });
+
+      it('it deletes the correct configurations', async () => {
+        await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+          200,
+          {
+            user: superUser,
+            space: 'space1',
+          }
+        );
+
+        /**
+         * This API call should not delete the previously created configuration
+         * as it belongs to a different owner
+         */
+        await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+          200,
+          {
+            user: superUser,
+            space: 'space1',
+          }
+        );
+
+        const configuration = await getConfiguration({
+          supertest: supertestWithoutAuth,
+          query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+          auth: {
+            user: superUser,
+            space: 'space1',
+          },
+        });
+
+        /**
+         * This ensures that both configuration are returned as expected
+         * and neither of has been deleted
+         */
+        ensureSavedObjectIsAuthorized(configuration, 2, [
+          'securitySolutionFixture',
+          'observabilityFixture',
+        ]);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/basic/tests/connectors/case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/connectors/case.ts
similarity index 91%
rename from x-pack/test/case_api_integration/basic/tests/connectors/case.ts
rename to x-pack/test/case_api_integration/security_and_spaces/tests/common/connectors/case.ts
index 0f9cba4b51f75..41d8cc12aaaab 100644
--- a/x-pack/test/case_api_integration/basic/tests/connectors/case.ts
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/connectors/case.ts
@@ -7,16 +7,15 @@
 
 import { omit } from 'lodash/fp';
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
 
-import { CASES_URL } from '../../../../../plugins/cases/common/constants';
-import { CommentType } from '../../../../../plugins/cases/common/api';
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { CommentType } from '../../../../../../plugins/cases/common/api';
+import { postCaseReq, postCaseResp } from '../../../../common/lib/mock';
 import {
-  postCaseReq,
-  postCaseResp,
   removeServerGeneratedPropertiesFromCase,
   removeServerGeneratedPropertiesFromComments,
-} from '../../../common/lib/mock';
+} from '../../../../common/lib/utils';
 import {
   createRule,
   createSignalsIndex,
@@ -26,7 +25,7 @@ import {
   getSignalsByIds,
   waitForRuleSuccessOrStatus,
   waitForSignalsToBePresent,
-} from '../../../../detection_engine_api_integration/utils';
+} from '../../../../../detection_engine_api_integration/utils';
 
 // eslint-disable-next-line import/no-default-export
 export default ({ getService }: FtrProviderContext): void => {
@@ -38,7 +37,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
     it('should return 400 when creating a case action', async () => {
       await supertest
-        .post('/api/actions/action')
+        .post('/api/actions/connector')
         .set('kbn-xsrf', 'foo')
         .send({
           name: 'A case connector',
@@ -51,7 +50,7 @@ export default ({ getService }: FtrProviderContext): void => {
     // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
     it.skip('should return 200 when creating a case action successfully', async () => {
       const { body: createdAction } = await supertest
-        .post('/api/actions/action')
+        .post('/api/actions/connector')
         .set('kbn-xsrf', 'foo')
         .send({
           name: 'A case connector',
@@ -71,7 +70,7 @@ export default ({ getService }: FtrProviderContext): void => {
       });
 
       const { body: fetchedAction } = await supertest
-        .get(`/api/actions/action/${createdActionId}`)
+        .get(`/api/actions/connector/${createdActionId}`)
         .expect(200);
 
       expect(fetchedAction).to.eql({
@@ -86,7 +85,7 @@ export default ({ getService }: FtrProviderContext): void => {
     describe.skip('create', () => {
       it('should respond with a 400 Bad Request when creating a case without title', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -115,7 +114,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -131,7 +130,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when creating a case without description', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -160,7 +159,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -176,7 +175,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when creating a case without tags', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -205,7 +204,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -221,7 +220,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when creating a case without connector', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -241,7 +240,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -257,7 +256,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when creating jira without issueType', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -286,7 +285,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -302,7 +301,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when creating a connector with wrong fields', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -332,7 +331,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -348,7 +347,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when creating a none without fields as null', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -374,7 +373,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -390,7 +389,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should create a case', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -423,7 +422,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -448,7 +447,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should create a case with connector with field as null if not provided', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -477,7 +476,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -516,7 +515,7 @@ export default ({ getService }: FtrProviderContext): void => {
     describe.skip('update', () => {
       it('should respond with a 400 Bad Request when updating a case without id', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -535,7 +534,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -551,7 +550,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when updating a case without version', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -570,7 +569,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -586,7 +585,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should update a case', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -613,7 +612,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -640,7 +639,7 @@ export default ({ getService }: FtrProviderContext): void => {
     describe.skip('addComment', () => {
       it('should respond with a 400 Bad Request when adding a comment to a case without caseId', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -658,7 +657,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -674,7 +673,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when missing attributes of type user', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -692,7 +691,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -708,18 +707,17 @@ export default ({ getService }: FtrProviderContext): void => {
 
       describe('adding alerts using a connector', () => {
         beforeEach(async () => {
-          await esArchiver.load('auditbeat/hosts');
+          await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
           await createSignalsIndex(supertest);
         });
 
         afterEach(async () => {
           await deleteSignalsIndex(supertest);
           await deleteAllAlerts(supertest);
-          await esArchiver.unload('auditbeat/hosts');
+          await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
         });
 
         it('should add a comment of type alert', async () => {
-          // TODO: don't do all this stuff
           const rule = getRuleForSignalTesting(['auditbeat-*']);
           const { id } = await createRule(supertest, rule);
           await waitForRuleSuccessOrStatus(supertest, id);
@@ -728,7 +726,7 @@ export default ({ getService }: FtrProviderContext): void => {
           const alert = signals.hits.hits[0];
 
           const { body: createdAction } = await supertest
-            .post('/api/actions/action')
+            .post('/api/actions/connector')
             .set('kbn-xsrf', 'foo')
             .send({
               name: 'A case connector',
@@ -759,7 +757,7 @@ export default ({ getService }: FtrProviderContext): void => {
           };
 
           const caseConnector = await supertest
-            .post(`/api/actions/action/${createdActionId}/_execute`)
+            .post(`/api/actions/connector/${createdActionId}/_execute`)
             .set('kbn-xsrf', 'foo')
             .send({ params })
             .expect(200);
@@ -790,7 +788,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when missing attributes of type alert', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -818,7 +816,7 @@ export default ({ getService }: FtrProviderContext): void => {
         for (const attribute of ['alertId']) {
           const requestAttributes = omit(attribute, comment);
           const caseConnector = await supertest
-            .post(`/api/actions/action/${createdActionId}/_execute`)
+            .post(`/api/actions/connector/${createdActionId}/_execute`)
             .set('kbn-xsrf', 'foo')
             .send({
               params: {
@@ -839,7 +837,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when adding excess attributes for type user', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -859,7 +857,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         for (const attribute of ['blah', 'bogus']) {
           const caseConnector = await supertest
-            .post(`/api/actions/action/${createdActionId}/_execute`)
+            .post(`/api/actions/connector/${createdActionId}/_execute`)
             .set('kbn-xsrf', 'foo')
             .send({
               params: {
@@ -882,7 +880,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when adding excess attributes for type alert', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -907,7 +905,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
         for (const attribute of ['comment']) {
           const caseConnector = await supertest
-            .post(`/api/actions/action/${createdActionId}/_execute`)
+            .post(`/api/actions/connector/${createdActionId}/_execute`)
             .set('kbn-xsrf', 'foo')
             .send({
               params: {
@@ -931,7 +929,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should respond with a 400 Bad Request when adding a comment to a case without type', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -950,7 +948,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         const caseConnector = await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -966,7 +964,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should add a comment of type user', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -992,7 +990,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
@@ -1019,7 +1017,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
       it('should add a comment of type alert', async () => {
         const { body: createdAction } = await supertest
-          .post('/api/actions/action')
+          .post('/api/actions/connector')
           .set('kbn-xsrf', 'foo')
           .send({
             name: 'A case connector',
@@ -1050,7 +1048,7 @@ export default ({ getService }: FtrProviderContext): void => {
         };
 
         await supertest
-          .post(`/api/actions/action/${createdActionId}/_execute`)
+          .post(`/api/actions/connector/${createdActionId}/_execute`)
           .set('kbn-xsrf', 'foo')
           .send({ params })
           .expect(200);
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/index.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/index.ts
new file mode 100644
index 0000000000000..9d35d5ec82fc5
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/index.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 { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('Common', function () {
+    loadTestFile(require.resolve('./client/update_alert_status'));
+    loadTestFile(require.resolve('./comments/delete_comment'));
+    loadTestFile(require.resolve('./comments/find_comments'));
+    loadTestFile(require.resolve('./comments/get_comment'));
+    loadTestFile(require.resolve('./comments/get_all_comments'));
+    loadTestFile(require.resolve('./comments/patch_comment'));
+    loadTestFile(require.resolve('./comments/post_comment'));
+    loadTestFile(require.resolve('./alerts/get_cases'));
+    loadTestFile(require.resolve('./cases/delete_cases'));
+    loadTestFile(require.resolve('./cases/find_cases'));
+    loadTestFile(require.resolve('./cases/get_case'));
+    loadTestFile(require.resolve('./cases/patch_cases'));
+    loadTestFile(require.resolve('./cases/post_case'));
+    loadTestFile(require.resolve('./cases/reporters/get_reporters'));
+    loadTestFile(require.resolve('./cases/status/get_status'));
+    loadTestFile(require.resolve('./cases/tags/get_tags'));
+    loadTestFile(require.resolve('./user_actions/get_all_user_actions'));
+    loadTestFile(require.resolve('./configure/get_configure'));
+    loadTestFile(require.resolve('./configure/get_connectors'));
+    loadTestFile(require.resolve('./configure/patch_configure'));
+    loadTestFile(require.resolve('./configure/post_configure'));
+    loadTestFile(require.resolve('./connectors/case'));
+    loadTestFile(require.resolve('./sub_cases/patch_sub_cases'));
+    loadTestFile(require.resolve('./sub_cases/delete_sub_cases'));
+    loadTestFile(require.resolve('./sub_cases/get_sub_case'));
+    loadTestFile(require.resolve('./sub_cases/find_sub_cases'));
+
+    // 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/case_api_integration/security_and_spaces/tests/common/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/migrations.ts
new file mode 100644
index 0000000000000..17d93e76bbdda
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/migrations.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 { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('Common migrations', function () {
+    // Migrations
+    loadTestFile(require.resolve('./cases/migrations'));
+    loadTestFile(require.resolve('./configure/migrations'));
+    loadTestFile(require.resolve('./user_actions/migrations'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/delete_sub_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/delete_sub_cases.ts
new file mode 100644
index 0000000000000..951db263a6c78
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/delete_sub_cases.ts
@@ -0,0 +1,112 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+
+import {
+  CASES_URL,
+  SUB_CASES_PATCH_DEL_URL,
+} from '../../../../../../plugins/cases/common/constants';
+import { postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+} from '../../../../common/lib/utils';
+import { getSubCaseDetailsUrl } from '../../../../../../plugins/cases/common/api/helpers';
+import { CaseResponse } from '../../../../../../plugins/cases/common/api';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  // ENABLE_CASE_CONNECTOR: remove this outer describe once the case connector feature is completed
+  describe('delete_sub_cases disabled routes', () => {
+    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
+      await supertest
+        .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["sub-case-id"]`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(404);
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('delete_sub_cases', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should delete a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
+
+        const { body: subCase } = await supertest
+          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
+          .send()
+          .expect(200);
+
+        expect(subCase.id).to.not.eql(undefined);
+
+        const { body } = await supertest
+          .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["${subCase.id}"]`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(204);
+
+        expect(body).to.eql({});
+        await supertest
+          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
+          .send()
+          .expect(404);
+      });
+
+      it(`should delete a sub case's comments when that case gets deleted`, async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+        expect(caseInfo.subCases![0].id).to.not.eql(undefined);
+
+        // there should be two comments on the sub case now
+        const { body: patchedCaseWithSubCase }: { body: CaseResponse } = await supertest
+          .post(`${CASES_URL}/${caseInfo.id}/comments`)
+          .set('kbn-xsrf', 'true')
+          .query({ subCaseId: caseInfo.subCases![0].id })
+          .send(postCommentUserReq)
+          .expect(200);
+
+        const subCaseCommentUrl = `${CASES_URL}/${patchedCaseWithSubCase.id}/comments/${
+          patchedCaseWithSubCase.comments![1].id
+        }`;
+        // make sure we can get the second comment
+        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(200);
+
+        await supertest
+          .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["${patchedCaseWithSubCase.subCases![0].id}"]`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(204);
+
+        await supertest.get(subCaseCommentUrl).set('kbn-xsrf', 'true').send().expect(404);
+      });
+
+      it('unhappy path - 404s when sub case id is invalid', async () => {
+        await supertest
+          .delete(`${SUB_CASES_PATCH_DEL_URL}?ids=["fake-id"]`)
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(404);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/find_sub_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/find_sub_cases.ts
new file mode 100644
index 0000000000000..d54523bec0c4d
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/find_sub_cases.ts
@@ -0,0 +1,480 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 type { ApiResponse, estypes } from '@elastic/elasticsearch';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { findSubCasesResp, postCollectionReq } from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  CreateSubCaseResp,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  setStatus,
+} from '../../../../common/lib/utils';
+import { getSubCasesUrl } from '../../../../../../plugins/cases/common/api/helpers';
+import {
+  CaseResponse,
+  CaseStatuses,
+  CommentType,
+  SubCasesFindResponse,
+} from '../../../../../../plugins/cases/common/api';
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import {
+  ContextTypeGeneratedAlertType,
+  createAlertsString,
+} from '../../../../../../plugins/cases/server/connectors';
+
+interface SubCaseAttributes {
+  'cases-sub-case': {
+    created_at: string;
+  };
+}
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  // ENABLE_CASE_CONNECTOR: remove this outer describe once the case connector feature is completed
+  describe('find_sub_cases disabled route', () => {
+    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
+      await supertest.get(`${getSubCasesUrl('case-id')}/_find`).expect(404);
+    });
+
+    // ENABLE_CASE_CONNECTOR: enable these tests once the case connector feature is completed
+    describe.skip('create case connector', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+
+      describe('basic find tests', () => {
+        afterEach(async () => {
+          await deleteAllCaseItems(es);
+        });
+        it('should not find any sub cases when none exist', async () => {
+          const { body: caseResp }: { body: CaseResponse } = await supertest
+            .post(CASES_URL)
+            .set('kbn-xsrf', 'true')
+            .send(postCollectionReq)
+            .expect(200);
+
+          const { body: findSubCases } = await supertest
+            .get(`${getSubCasesUrl(caseResp.id)}/_find`)
+            .expect(200);
+
+          expect(findSubCases).to.eql({
+            page: 1,
+            per_page: 20,
+            total: 0,
+            subCases: [],
+            count_open_cases: 0,
+            count_closed_cases: 0,
+            count_in_progress_cases: 0,
+          });
+        });
+
+        it('should return a sub cases with comment stats', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find`)
+            .expect(200);
+
+          expect(body).to.eql({
+            ...findSubCasesResp,
+            total: 1,
+            // find should not return the comments themselves only the stats
+            subCases: [{ ...caseInfo.subCases![0], comments: [], totalComment: 1, totalAlerts: 2 }],
+            count_open_cases: 1,
+          });
+        });
+
+        it('should return multiple sub cases', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+          const subCase2Resp = await createSubCase({ supertest, caseID: caseInfo.id, actionID });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find`)
+            .expect(200);
+
+          expect(body).to.eql({
+            ...findSubCasesResp,
+            total: 2,
+            // find should not return the comments themselves only the stats
+            subCases: [
+              {
+                // there should only be 1 closed sub case
+                ...subCase2Resp.modifiedSubCases![0],
+                comments: [],
+                totalComment: 1,
+                totalAlerts: 2,
+                status: CaseStatuses.closed,
+              },
+              {
+                ...subCase2Resp.newSubCaseInfo.subCases![0],
+                comments: [],
+                totalComment: 1,
+                totalAlerts: 2,
+              },
+            ],
+            count_open_cases: 1,
+            count_closed_cases: 1,
+          });
+        });
+
+        it('should only return open when filtering for open', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+          // this will result in one closed case and one open
+          await createSubCase({ supertest, caseID: caseInfo.id, actionID });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find?status=${CaseStatuses.open}`)
+            .expect(200);
+
+          expect(body.total).to.be(1);
+          expect(body.subCases[0].status).to.be(CaseStatuses.open);
+          expect(body.count_closed_cases).to.be(1);
+          expect(body.count_open_cases).to.be(1);
+          expect(body.count_in_progress_cases).to.be(0);
+        });
+
+        it('should only return closed when filtering for closed', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+          // this will result in one closed case and one open
+          await createSubCase({ supertest, caseID: caseInfo.id, actionID });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find?status=${CaseStatuses.closed}`)
+            .expect(200);
+
+          expect(body.total).to.be(1);
+          expect(body.subCases[0].status).to.be(CaseStatuses.closed);
+          expect(body.count_closed_cases).to.be(1);
+          expect(body.count_open_cases).to.be(1);
+          expect(body.count_in_progress_cases).to.be(0);
+        });
+
+        it('should only return in progress when filtering for in progress', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+          // this will result in one closed case and one open
+          const { newSubCaseInfo: secondSub } = await createSubCase({
+            supertest,
+            caseID: caseInfo.id,
+            actionID,
+          });
+
+          await setStatus({
+            supertest,
+            cases: [
+              {
+                id: secondSub.subCases![0].id,
+                version: secondSub.subCases![0].version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+            type: 'sub_case',
+          });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find?status=${CaseStatuses['in-progress']}`)
+            .expect(200);
+
+          expect(body.total).to.be(1);
+          expect(body.subCases[0].status).to.be(CaseStatuses['in-progress']);
+          expect(body.count_closed_cases).to.be(1);
+          expect(body.count_open_cases).to.be(0);
+          expect(body.count_in_progress_cases).to.be(1);
+        });
+
+        it('should sort on createdAt field in descending order', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+          // this will result in one closed case and one open
+          await createSubCase({
+            supertest,
+            caseID: caseInfo.id,
+            actionID,
+          });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find?sortField=createdAt&sortOrder=desc`)
+            .expect(200);
+
+          expect(body.total).to.be(2);
+          expect(body.subCases[0].status).to.be(CaseStatuses.open);
+          expect(body.subCases[1].status).to.be(CaseStatuses.closed);
+          expect(body.count_closed_cases).to.be(1);
+          expect(body.count_open_cases).to.be(1);
+          expect(body.count_in_progress_cases).to.be(0);
+        });
+
+        it('should sort on createdAt field in ascending order', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+          // this will result in one closed case and one open
+          await createSubCase({
+            supertest,
+            caseID: caseInfo.id,
+            actionID,
+          });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find?sortField=createdAt&sortOrder=asc`)
+            .expect(200);
+
+          expect(body.total).to.be(2);
+          expect(body.subCases[0].status).to.be(CaseStatuses.closed);
+          expect(body.subCases[1].status).to.be(CaseStatuses.open);
+          expect(body.count_closed_cases).to.be(1);
+          expect(body.count_open_cases).to.be(1);
+          expect(body.count_in_progress_cases).to.be(0);
+        });
+
+        it('should sort on updatedAt field in ascending order', async () => {
+          const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+          // this will result in one closed case and one open
+          const { newSubCaseInfo: secondSub } = await createSubCase({
+            supertest,
+            caseID: caseInfo.id,
+            actionID,
+          });
+
+          await setStatus({
+            supertest,
+            cases: [
+              {
+                id: secondSub.subCases![0].id,
+                version: secondSub.subCases![0].version,
+                status: CaseStatuses['in-progress'],
+              },
+            ],
+            type: 'sub_case',
+          });
+
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(caseInfo.id)}/_find?sortField=updatedAt&sortOrder=asc`)
+            .expect(200);
+
+          expect(body.total).to.be(2);
+          expect(body.subCases[0].status).to.be(CaseStatuses.closed);
+          expect(body.subCases[1].status).to.be(CaseStatuses['in-progress']);
+          expect(body.count_closed_cases).to.be(1);
+          expect(body.count_open_cases).to.be(0);
+          expect(body.count_in_progress_cases).to.be(1);
+        });
+      });
+
+      describe('pagination', () => {
+        const numCases = 4;
+        let collection: CaseResponse;
+        before(async () => {
+          ({ body: collection } = await supertest
+            .post(CASES_URL)
+            .set('kbn-xsrf', 'true')
+            .send(postCollectionReq)
+            .expect(200));
+
+          await createSubCases(numCases, collection.id);
+        });
+
+        after(async () => {
+          await deleteAllCaseItems(es);
+        });
+
+        const createSubCases = async (total: number, caseID: string) => {
+          const responses: CreateSubCaseResp[] = [];
+          for (let i = 0; i < total; i++) {
+            const postCommentGenAlertReq: ContextTypeGeneratedAlertType = {
+              alerts: createAlertsString([
+                { _id: `${i}`, _index: 'test-index', ruleId: 'rule-id', ruleName: 'rule name' },
+              ]),
+              type: CommentType.generatedAlert,
+              owner: 'securitySolutionFixture',
+            };
+            responses.push(
+              await createSubCase({
+                supertest,
+                actionID,
+                caseID,
+                comment: postCommentGenAlertReq,
+              })
+            );
+          }
+          return responses;
+        };
+
+        const getAllCasesSortedByCreatedAtAsc = async () => {
+          const cases: ApiResponse<estypes.SearchResponse<SubCaseAttributes>> = await es.search({
+            index: '.kibana',
+            body: {
+              size: 10000,
+              sort: [{ 'cases-sub-case.created_at': { unmapped_type: 'date', order: 'asc' } }],
+              query: {
+                term: { type: 'cases-sub-case' },
+              },
+            },
+          });
+          return cases.body.hits.hits.map((hit) => hit._source);
+        };
+
+        it('returns the correct total when perPage is less than the total', async () => {
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(collection.id)}/_find`)
+            .query({
+              sortOrder: 'asc',
+              page: 1,
+              perPage: 3,
+            })
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(body.subCases.length).to.eql(3);
+          expect(body.total).to.eql(4);
+          expect(body.page).to.eql(1);
+          expect(body.per_page).to.eql(3);
+          // there will only be 1 open sub case, all the rest will be closed
+          expect(body.count_open_cases).to.eql(1);
+          expect(body.count_closed_cases).to.eql(3);
+          expect(body.count_in_progress_cases).to.eql(0);
+        });
+
+        it('returns the correct total when perPage is greater than the total', async () => {
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(collection.id)}/_find`)
+            .query({
+              sortOrder: 'asc',
+              page: 1,
+              perPage: 11,
+            })
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(body.total).to.eql(4);
+          expect(body.page).to.eql(1);
+          expect(body.per_page).to.eql(11);
+          expect(body.subCases.length).to.eql(4);
+          expect(body.count_open_cases).to.eql(1);
+          expect(body.count_closed_cases).to.eql(3);
+          expect(body.count_in_progress_cases).to.eql(0);
+        });
+
+        it('returns the correct total when perPage is equal to the total', async () => {
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(collection.id)}/_find`)
+            .query({
+              sortOrder: 'asc',
+              page: 1,
+              perPage: 4,
+            })
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(body.total).to.eql(4);
+          expect(body.page).to.eql(1);
+          expect(body.per_page).to.eql(4);
+          expect(body.subCases.length).to.eql(4);
+          expect(body.count_open_cases).to.eql(1);
+          expect(body.count_closed_cases).to.eql(3);
+          expect(body.count_in_progress_cases).to.eql(0);
+        });
+
+        it('returns the second page of results', async () => {
+          const perPage = 2;
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(collection.id)}/_find`)
+            .query({
+              sortOrder: 'asc',
+              page: 2,
+              perPage,
+            })
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(body.total).to.eql(4);
+          expect(body.page).to.eql(2);
+          expect(body.per_page).to.eql(2);
+          expect(body.subCases.length).to.eql(2);
+          expect(body.count_open_cases).to.eql(1);
+          expect(body.count_closed_cases).to.eql(3);
+          expect(body.count_in_progress_cases).to.eql(0);
+
+          const allCases = await getAllCasesSortedByCreatedAtAsc();
+
+          body.subCases.map((subCaseInfo, index) => {
+            // we started on the second page of 10 cases with a perPage of 5, so the first case should 0 + 5 (index + perPage)
+            expect(subCaseInfo.created_at).to.eql(
+              allCases[index + perPage]?.['cases-sub-case'].created_at
+            );
+          });
+        });
+
+        it('paginates with perPage of 2 through 4 total sub cases', async () => {
+          const total = 4;
+          const perPage = 2;
+
+          // it's less than or equal here because the page starts at 1, so page 2 is a valid page number
+          // and should have sub cases titles 3, and 4
+          for (let currentPage = 1; currentPage <= total / perPage; currentPage++) {
+            const { body }: { body: SubCasesFindResponse } = await supertest
+              .get(`${getSubCasesUrl(collection.id)}/_find`)
+              .query({
+                sortOrder: 'asc',
+                page: currentPage,
+                perPage,
+              })
+              .set('kbn-xsrf', 'true')
+              .expect(200);
+
+            expect(body.total).to.eql(total);
+            expect(body.page).to.eql(currentPage);
+            expect(body.per_page).to.eql(perPage);
+            expect(body.subCases.length).to.eql(perPage);
+            expect(body.count_open_cases).to.eql(1);
+            expect(body.count_closed_cases).to.eql(total - 1);
+            expect(body.count_in_progress_cases).to.eql(0);
+
+            const allCases = await getAllCasesSortedByCreatedAtAsc();
+
+            body.subCases.map((subCaseInfo, index) => {
+              // for page 1, the cases tiles should be 0,1,2 for page 2: 3,4,5 etc (assuming the titles were sorted
+              // correctly)
+              expect(subCaseInfo.created_at).to.eql(
+                allCases[index + perPage * (currentPage - 1)]?.['cases-sub-case'].created_at
+              );
+            });
+          }
+        });
+
+        it('retrieves the last sub case', async () => {
+          const { body }: { body: SubCasesFindResponse } = await supertest
+            .get(`${getSubCasesUrl(collection.id)}/_find`)
+            .query({
+              sortOrder: 'asc',
+              // this should skip the first 3 sub cases and only return the last one
+              page: 2,
+              perPage: 3,
+            })
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+
+          expect(body.total).to.eql(4);
+          expect(body.page).to.eql(2);
+          expect(body.per_page).to.eql(3);
+          expect(body.subCases.length).to.eql(1);
+          expect(body.count_open_cases).to.eql(1);
+          expect(body.count_closed_cases).to.eql(3);
+          expect(body.count_in_progress_cases).to.eql(0);
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/get_sub_case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/get_sub_case.ts
new file mode 100644
index 0000000000000..35ed4ba5c3c71
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/get_sub_case.ts
@@ -0,0 +1,119 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+
+import { commentsResp, postCommentAlertReq, subCaseResp } from '../../../../common/lib/mock';
+import {
+  createCaseAction,
+  createSubCase,
+  defaultCreateSubComment,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  removeServerGeneratedPropertiesFromComments,
+  removeServerGeneratedPropertiesFromSubCase,
+} from '../../../../common/lib/utils';
+import {
+  getCaseCommentsUrl,
+  getSubCaseDetailsUrl,
+} from '../../../../../../plugins/cases/common/api/helpers';
+import {
+  AssociationType,
+  CaseResponse,
+  SubCaseResponse,
+} from '../../../../../../plugins/cases/common/api';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  // ENABLE_CASE_CONNECTOR: remove the outer describe once the case connector feature is completed
+  describe('get_sub_case disabled route', () => {
+    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
+      await supertest.get(getSubCaseDetailsUrl('case-id', 'sub-case-id')).expect(404);
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('get_sub_case', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      afterEach(async () => {
+        await deleteAllCaseItems(es);
+      });
+
+      it('should return a case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+
+        const { body }: { body: SubCaseResponse } = await supertest
+          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(removeServerGeneratedPropertiesFromComments(body.comments)).to.eql(
+          commentsResp({
+            comments: [{ comment: defaultCreateSubComment, id: caseInfo.comments![0].id }],
+            associationType: AssociationType.subCase,
+          })
+        );
+
+        expect(removeServerGeneratedPropertiesFromSubCase(body)).to.eql(
+          subCaseResp({ id: body.id, totalComment: 1, totalAlerts: 2 })
+        );
+      });
+
+      it('should return the correct number of alerts with multiple types of alerts', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+
+        const { body: singleAlert }: { body: CaseResponse } = await supertest
+          .post(getCaseCommentsUrl(caseInfo.id))
+          .query({ subCaseId: caseInfo.subCases![0].id })
+          .set('kbn-xsrf', 'true')
+          .send(postCommentAlertReq)
+          .expect(200);
+
+        const { body }: { body: SubCaseResponse } = await supertest
+          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(200);
+
+        expect(removeServerGeneratedPropertiesFromComments(body.comments)).to.eql(
+          commentsResp({
+            comments: [
+              { comment: defaultCreateSubComment, id: caseInfo.comments![0].id },
+              {
+                comment: postCommentAlertReq,
+                id: singleAlert.comments![1].id,
+              },
+            ],
+            associationType: AssociationType.subCase,
+          })
+        );
+
+        expect(removeServerGeneratedPropertiesFromSubCase(body)).to.eql(
+          subCaseResp({ id: body.id, totalComment: 2, totalAlerts: 3 })
+        );
+      });
+
+      it('unhappy path - 404s when case is not there', async () => {
+        await supertest
+          .get(getSubCaseDetailsUrl('fake-case-id', 'fake-sub-case-id'))
+          .set('kbn-xsrf', 'true')
+          .send()
+          .expect(404);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/patch_sub_cases.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/patch_sub_cases.ts
new file mode 100644
index 0000000000000..45fada30ab567
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/sub_cases/patch_sub_cases.ts
@@ -0,0 +1,515 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../../common/ftr_provider_context';
+
+import {
+  CASES_URL,
+  SUB_CASES_PATCH_DEL_URL,
+} from '../../../../../../plugins/cases/common/constants';
+import {
+  createCaseAction,
+  createSubCase,
+  deleteAllCaseItems,
+  deleteCaseAction,
+  getSignalsWithES,
+  setStatus,
+} from '../../../../common/lib/utils';
+import { getSubCaseDetailsUrl } from '../../../../../../plugins/cases/common/api/helpers';
+import {
+  CaseStatuses,
+  CommentType,
+  SubCaseResponse,
+} from '../../../../../../plugins/cases/common/api';
+import { createAlertsString } from '../../../../../../plugins/cases/server/connectors';
+import { postCaseReq, postCollectionReq } from '../../../../common/lib/mock';
+
+const defaultSignalsIndex = '.siem-signals-default-000001';
+
+// eslint-disable-next-line import/no-default-export
+export default function ({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const esArchiver = getService('esArchiver');
+
+  // ENABLE_CASE_CONNECTOR: remove the outer describe once the case connector feature is completed
+  describe('patch_sub_cases disabled route', () => {
+    it('should return a 404 when attempting to access the route and the case connector feature is disabled', async () => {
+      await supertest
+        .patch(SUB_CASES_PATCH_DEL_URL)
+        .set('kbn-xsrf', 'true')
+        .send({ subCases: [] })
+        .expect(404);
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    describe.skip('patch_sub_cases', () => {
+      let actionID: string;
+      before(async () => {
+        actionID = await createCaseAction(supertest);
+      });
+      after(async () => {
+        await deleteCaseAction(supertest, actionID);
+      });
+      beforeEach(async () => {
+        await esArchiver.load('x-pack/test/functional/es_archives/cases/signals/default');
+      });
+      afterEach(async () => {
+        await esArchiver.unload('x-pack/test/functional/es_archives/cases/signals/default');
+        await deleteAllCaseItems(es);
+      });
+
+      it('should update the status of a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+
+        await setStatus({
+          supertest,
+          cases: [
+            {
+              id: caseInfo.subCases![0].id,
+              version: caseInfo.subCases![0].version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+          type: 'sub_case',
+        });
+        const { body: subCase }: { body: SubCaseResponse } = await supertest
+          .get(getSubCaseDetailsUrl(caseInfo.id, caseInfo.subCases![0].id))
+          .expect(200);
+
+        expect(subCase.status).to.eql(CaseStatuses['in-progress']);
+      });
+
+      it('should update the status of one alert attached to a sub case', async () => {
+        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
+
+        const { newSubCaseInfo: caseInfo } = await createSubCase({
+          supertest,
+          actionID,
+          comment: {
+            alerts: createAlertsString([
+              {
+                _id: signalID,
+                _index: defaultSignalsIndex,
+                ruleId: 'id',
+                ruleName: 'name',
+              },
+            ]),
+            type: CommentType.generatedAlert,
+            owner: 'securitySolutionFixture',
+          },
+        });
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        let signals = await getSignalsWithES({ es, indices: defaultSignalsIndex, ids: signalID });
+
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+
+        await setStatus({
+          supertest,
+          cases: [
+            {
+              id: caseInfo.subCases![0].id,
+              version: caseInfo.subCases![0].version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+          type: 'sub_case',
+        });
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        signals = await getSignalsWithES({ es, indices: defaultSignalsIndex, ids: signalID });
+
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses['in-progress']
+        );
+      });
+
+      it('should update the status of multiple alerts attached to a sub case', async () => {
+        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
+
+        const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
+
+        const { newSubCaseInfo: caseInfo } = await createSubCase({
+          supertest,
+          actionID,
+          comment: {
+            alerts: createAlertsString([
+              {
+                _id: signalID,
+                _index: defaultSignalsIndex,
+                ruleId: 'id',
+                ruleName: 'name',
+              },
+              {
+                _id: signalID2,
+                _index: defaultSignalsIndex,
+                ruleId: 'id',
+                ruleName: 'name',
+              },
+            ]),
+            type: CommentType.generatedAlert,
+            owner: 'securitySolutionFixture',
+          },
+        });
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        let signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+
+        await setStatus({
+          supertest,
+          cases: [
+            {
+              id: caseInfo.subCases![0].id,
+              version: caseInfo.subCases![0].version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+          type: 'sub_case',
+        });
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses['in-progress']
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses['in-progress']
+        );
+      });
+
+      it('should update the status of multiple alerts attached to multiple sub cases in one collection', async () => {
+        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
+        const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
+
+        const { newSubCaseInfo: initialCaseInfo } = await createSubCase({
+          supertest,
+          actionID,
+          caseInfo: {
+            ...postCollectionReq,
+            settings: {
+              syncAlerts: false,
+            },
+          },
+          comment: {
+            alerts: createAlertsString([
+              {
+                _id: signalID,
+                _index: defaultSignalsIndex,
+                ruleId: 'id',
+                ruleName: 'name',
+              },
+            ]),
+            type: CommentType.generatedAlert,
+            owner: 'securitySolutionFixture',
+          },
+        });
+
+        // This will close the first sub case and create a new one
+        const { newSubCaseInfo: collectionWithSecondSub } = await createSubCase({
+          supertest,
+          actionID,
+          caseID: initialCaseInfo.id,
+          comment: {
+            alerts: createAlertsString([
+              {
+                _id: signalID2,
+                _index: defaultSignalsIndex,
+                ruleId: 'id',
+                ruleName: 'name',
+              },
+            ]),
+            type: CommentType.generatedAlert,
+            owner: 'securitySolutionFixture',
+          },
+        });
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        let signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        // There should be no change in their status since syncing is disabled
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+
+        await setStatus({
+          supertest,
+          cases: [
+            {
+              id: collectionWithSecondSub.subCases![0].id,
+              version: collectionWithSecondSub.subCases![0].version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+          type: 'sub_case',
+        });
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        // There still should be no change in their status since syncing is disabled
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+
+        // Turn sync alerts on
+        await supertest
+          .patch(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            cases: [
+              {
+                id: collectionWithSecondSub.id,
+                version: collectionWithSecondSub.version,
+                settings: { syncAlerts: true },
+              },
+            ],
+          })
+          .expect(200);
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses.closed
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses['in-progress']
+        );
+      });
+
+      it('should update the status of alerts attached to a case and sub case when sync settings is turned on', async () => {
+        const signalID = '5f2b9ec41f8febb1c06b5d1045aeabb9874733b7617e88a370510f2fb3a41a5d';
+        const signalID2 = '4d0f4b1533e46b66b43bdd0330d23f39f2cf42a7253153270e38d30cce9ff0c6';
+
+        const { body: individualCase } = await supertest
+          .post(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            ...postCaseReq,
+            settings: {
+              syncAlerts: false,
+            },
+          });
+
+        const { newSubCaseInfo: caseInfo } = await createSubCase({
+          supertest,
+          actionID,
+          caseInfo: {
+            ...postCollectionReq,
+            settings: {
+              syncAlerts: false,
+            },
+          },
+          comment: {
+            alerts: createAlertsString([
+              {
+                _id: signalID,
+                _index: defaultSignalsIndex,
+                ruleId: 'id',
+                ruleName: 'name',
+              },
+            ]),
+            type: CommentType.generatedAlert,
+            owner: 'securitySolutionFixture',
+          },
+        });
+
+        const { body: updatedIndWithComment } = await supertest
+          .post(`${CASES_URL}/${individualCase.id}/comments`)
+          .set('kbn-xsrf', 'true')
+          .send({
+            alertId: signalID2,
+            index: defaultSignalsIndex,
+            rule: { id: 'test-rule-id', name: 'test-index-id' },
+            type: CommentType.alert,
+          })
+          .expect(200);
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        let signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        // There should be no change in their status since syncing is disabled
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+
+        await setStatus({
+          supertest,
+          cases: [
+            {
+              id: caseInfo.subCases![0].id,
+              version: caseInfo.subCases![0].version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+          type: 'sub_case',
+        });
+
+        const updatedIndWithStatus = (
+          await setStatus({
+            supertest,
+            cases: [
+              {
+                id: updatedIndWithComment.id,
+                version: updatedIndWithComment.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+            type: 'case',
+          })
+        )[0]; // there should only be a single entry in the response
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        // There should still be no change in their status since syncing is disabled
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses.open
+        );
+
+        // Turn sync alerts on
+        await supertest
+          .patch(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            cases: [
+              {
+                id: caseInfo.id,
+                version: caseInfo.version,
+                settings: { syncAlerts: true },
+              },
+            ],
+          })
+          .expect(200);
+
+        await supertest
+          .patch(CASES_URL)
+          .set('kbn-xsrf', 'true')
+          .send({
+            cases: [
+              {
+                id: updatedIndWithStatus.id,
+                version: updatedIndWithStatus.version,
+                settings: { syncAlerts: true },
+              },
+            ],
+          })
+          .expect(200);
+
+        await es.indices.refresh({ index: defaultSignalsIndex });
+
+        signals = await getSignalsWithES({
+          es,
+          indices: defaultSignalsIndex,
+          ids: [signalID, signalID2],
+        });
+
+        // alerts should be updated now that the
+        expect(signals.get(defaultSignalsIndex)?.get(signalID)?._source?.signal.status).to.be(
+          CaseStatuses['in-progress']
+        );
+        expect(signals.get(defaultSignalsIndex)?.get(signalID2)?._source?.signal.status).to.be(
+          CaseStatuses.closed
+        );
+      });
+
+      it('404s when sub case id is invalid', async () => {
+        await supertest
+          .patch(`${SUB_CASES_PATCH_DEL_URL}`)
+          .set('kbn-xsrf', 'true')
+          .send({
+            subCases: [
+              {
+                id: 'fake-id',
+                version: 'blah',
+                status: CaseStatuses.open,
+              },
+            ],
+          })
+          .expect(404);
+      });
+
+      it('406s when updating invalid fields for a sub case', async () => {
+        const { newSubCaseInfo: caseInfo } = await createSubCase({ supertest, actionID });
+
+        await supertest
+          .patch(`${SUB_CASES_PATCH_DEL_URL}`)
+          .set('kbn-xsrf', 'true')
+          .send({
+            subCases: [
+              {
+                id: caseInfo.subCases![0].id,
+                version: caseInfo.subCases![0].version,
+                type: 'blah',
+              },
+            ],
+          })
+          .expect(406);
+      });
+    });
+  });
+}
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
new file mode 100644
index 0000000000000..35ebb1a4bf7b1
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/get_all_user_actions.ts
@@ -0,0 +1,395 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import {
+  CaseResponse,
+  CaseStatuses,
+  CommentType,
+} from '../../../../../../plugins/cases/common/api';
+import {
+  userActionPostResp,
+  postCaseReq,
+  postCommentUserReq,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  updateCase,
+  getCaseUserActions,
+  superUserSpace1Auth,
+} from '../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsSec,
+  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 es = getService('es');
+
+  describe('get_all_user_actions', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it(`on new case, user action: 'create' should be called with actionFields: ['description', 'status', 'tags', 'title', 'connector', 'settings, owner]`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(1);
+
+      expect(body[0].action_field).to.eql([
+        'description',
+        'status',
+        'tags',
+        'title',
+        'connector',
+        'settings',
+        'owner',
+      ]);
+      expect(body[0].action).to.eql('create');
+      expect(body[0].old_value).to.eql(null);
+      expect(JSON.parse(body[0].new_value)).to.eql(userActionPostResp);
+    });
+
+    it(`on close case, user action: 'update' should be called with actionFields: ['status']`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      await supertest
+        .patch(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send({
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              status: 'closed',
+            },
+          ],
+        })
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(2);
+      expect(body[1].action_field).to.eql(['status']);
+      expect(body[1].action).to.eql('update');
+      expect(body[1].old_value).to.eql('open');
+      expect(body[1].new_value).to.eql('closed');
+    });
+
+    it(`on update case connector, user action: 'update' should be called with actionFields: ['connector']`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      const newConnector = {
+        id: '123',
+        name: 'Connector',
+        type: '.jira',
+        fields: { issueType: 'Task', priority: 'High', parent: null },
+      };
+
+      await supertest
+        .patch(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send({
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              connector: newConnector,
+            },
+          ],
+        })
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(2);
+      expect(body[1].action_field).to.eql(['connector']);
+      expect(body[1].action).to.eql('update');
+      expect(JSON.parse(body[1].old_value)).to.eql({
+        id: 'none',
+        name: 'none',
+        type: '.none',
+        fields: null,
+      });
+      expect(JSON.parse(body[1].new_value)).to.eql({
+        id: '123',
+        name: 'Connector',
+        type: '.jira',
+        fields: { issueType: 'Task', priority: 'High', parent: null },
+      });
+    });
+
+    it(`on update tags, user action: 'add' and 'delete' should be called with actionFields: ['tags']`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      await supertest
+        .patch(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send({
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              tags: ['cool', 'neat'],
+            },
+          ],
+        })
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(3);
+      expect(body[1].action_field).to.eql(['tags']);
+      expect(body[1].action).to.eql('add');
+      expect(body[1].old_value).to.eql(null);
+      expect(body[1].new_value).to.eql('cool, neat');
+      expect(body[2].action_field).to.eql(['tags']);
+      expect(body[2].action).to.eql('delete');
+      expect(body[2].old_value).to.eql(null);
+      expect(body[2].new_value).to.eql('defacement');
+    });
+
+    it(`on update title, user action: 'update' should be called with actionFields: ['title']`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      const newTitle = 'Such a great title';
+      await supertest
+        .patch(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send({
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              title: newTitle,
+            },
+          ],
+        })
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(2);
+      expect(body[1].action_field).to.eql(['title']);
+      expect(body[1].action).to.eql('update');
+      expect(body[1].old_value).to.eql(postCaseReq.title);
+      expect(body[1].new_value).to.eql(newTitle);
+    });
+
+    it(`on update description, user action: 'update' should be called with actionFields: ['description']`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      const newDesc = 'Such a great description';
+      await supertest
+        .patch(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send({
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              description: newDesc,
+            },
+          ],
+        })
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(2);
+      expect(body[1].action_field).to.eql(['description']);
+      expect(body[1].action).to.eql('update');
+      expect(body[1].old_value).to.eql(postCaseReq.description);
+      expect(body[1].new_value).to.eql(newDesc);
+    });
+
+    it(`on new comment, user action: 'create' should be called with actionFields: ['comments']`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      await supertest
+        .post(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send(postCommentUserReq)
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(2);
+      expect(body[1].action_field).to.eql(['comment']);
+      expect(body[1].action).to.eql('create');
+      expect(body[1].old_value).to.eql(null);
+      expect(JSON.parse(body[1].new_value)).to.eql(postCommentUserReq);
+    });
+
+    it(`on update comment, user action: 'update' should be called with actionFields: ['comments']`, async () => {
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send(postCaseReq)
+        .expect(200);
+
+      const { body: patchedCase } = await supertest
+        .post(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send(postCommentUserReq)
+        .expect(200);
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      await supertest
+        .patch(`${CASES_URL}/${postedCase.id}/comments`)
+        .set('kbn-xsrf', 'true')
+        .send({
+          id: patchedCase.comments[0].id,
+          version: patchedCase.comments[0].version,
+          comment: newComment,
+          type: CommentType.user,
+          owner: 'securitySolutionFixture',
+        })
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(3);
+      expect(body[2].action_field).to.eql(['comment']);
+      expect(body[2].action).to.eql('update');
+      expect(JSON.parse(body[2].old_value)).to.eql(postCommentUserReq);
+      expect(JSON.parse(body[2].new_value)).to.eql({
+        comment: newComment,
+        type: CommentType.user,
+        owner: 'securitySolutionFixture',
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      let caseInfo: CaseResponse;
+      beforeEach(async () => {
+        caseInfo = await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
+          user: superUser,
+          space: 'space1',
+        });
+
+        await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: caseInfo.id,
+                version: caseInfo.version,
+                status: CaseStatuses.closed,
+              },
+            ],
+          },
+          auth: superUserSpace1Auth,
+        });
+      });
+
+      it('should get the user actions for a case when the user has the correct permissions', async () => {
+        for (const user of [globalRead, superUser, secOnly, secOnlyRead, obsSec, obsSecRead]) {
+          const userActions = await getCaseUserActions({
+            supertest: supertestWithoutAuth,
+            caseID: caseInfo.id,
+            auth: { user, space: 'space1' },
+          });
+
+          expect(userActions.length).to.eql(2);
+        }
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, space: 'space1' },
+        { user: secOnly, space: 'space2' },
+      ]) {
+        it(`should 403 when requesting the user actions of a case with user ${
+          scenario.user.username
+        } with role(s) ${scenario.user.roles.join()} and space ${scenario.space}`, async () => {
+          await getCaseUserActions({
+            supertest: supertestWithoutAuth,
+            caseID: caseInfo.id,
+            auth: { user: scenario.user, space: scenario.space },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/migrations.ts
new file mode 100644
index 0000000000000..030441028c502
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/common/user_actions/migrations.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+
+// eslint-disable-next-line import/no-default-export
+export default function createGetTests({ getService }: FtrProviderContext) {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  describe('migrations', () => {
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+    });
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/cases/migrations/7.10.0');
+    });
+
+    it('7.10.0 migrates user actions connector', async () => {
+      const { body } = await supertest
+        .get(`${CASES_URL}/e1900ac0-017f-11eb-93f8-d161651bf509/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      const connectorUserAction = body[1];
+      const oldValue = JSON.parse(connectorUserAction.old_value);
+      const newValue = JSON.parse(connectorUserAction.new_value);
+
+      expect(connectorUserAction.action_field.length).eql(1);
+      expect(connectorUserAction.action_field[0]).eql('connector');
+      expect(oldValue).to.eql({
+        id: 'c1900ac0-017f-11eb-93f8-d161651bf509',
+        name: 'none',
+        type: '.none',
+        fields: null,
+      });
+      expect(newValue).to.eql({
+        id: 'b1900ac0-017f-11eb-93f8-d161651bf509',
+        name: 'none',
+        type: '.none',
+        fields: null,
+      });
+    });
+  });
+}
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/push_case.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
new file mode 100644
index 0000000000000..8a58c59718feb
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/push_case.ts
@@ -0,0 +1,315 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+
+import {
+  postCaseReq,
+  defaultUser,
+  postCommentUserReq,
+  getPostCaseRequest,
+} from '../../../../common/lib/mock';
+import {
+  getConfigurationRequest,
+  createCase,
+  pushCase,
+  createComment,
+  updateCase,
+  getCaseUserActions,
+  removeServerGeneratedPropertiesFromUserAction,
+  deleteAllCaseItems,
+  superUserSpace1Auth,
+  createCaseWithConnector,
+} from '../../../../common/lib/utils';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+import { CaseStatuses, CaseUserActionResponse } from '../../../../../../plugins/cases/common/api';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  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 kibanaServer = getService('kibanaServer');
+  const es = getService('es');
+
+  describe('push_case', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should push a case', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+      });
+      const theCase = await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+      });
+
+      const { pushed_at, external_url, ...rest } = theCase.external_service!;
+
+      expect(rest).to.eql({
+        pushed_by: defaultUser,
+        connector_id: connector.id,
+        connector_name: connector.name,
+        external_id: '123',
+        external_title: 'INC01',
+      });
+
+      // external_url is of the form http://elastic:changeme@localhost:5620 which is different between various environments like Jekins
+      expect(
+        external_url.includes(
+          'api/_actions-FTS-external-service-simulators/servicenow/nav_to.do?uri=incident.do?sys_id=123'
+        )
+      ).to.equal(true);
+    });
+
+    it('pushes a comment appropriately', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+      });
+      await createComment({ supertest, caseId: postedCase.id, params: postCommentUserReq });
+      const theCase = await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+      });
+
+      expect(theCase.comments![0].pushed_by).to.eql(defaultUser);
+    });
+
+    it('should pushes a case and closes when closure_type: close-by-pushing', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        configureReq: {
+          closure_type: 'close-by-pushing',
+        },
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+      });
+      const theCase = await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+      });
+
+      expect(theCase.status).to.eql('closed');
+    });
+
+    it('should create the correct user action', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+      });
+      const pushedCase = await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+      });
+      const userActions = await getCaseUserActions({ supertest, caseID: pushedCase.id });
+      const pushUserAction = removeServerGeneratedPropertiesFromUserAction(userActions[1]);
+
+      const { new_value, ...rest } = pushUserAction as CaseUserActionResponse;
+      const parsedNewValue = JSON.parse(new_value!);
+
+      expect(rest).to.eql({
+        action_field: ['pushed'],
+        action: 'push-to-service',
+        action_by: defaultUser,
+        old_value: null,
+        case_id: `${postedCase.id}`,
+        comment_id: null,
+        sub_case_id: '',
+        owner: 'securitySolutionFixture',
+      });
+
+      expect(parsedNewValue).to.eql({
+        pushed_at: pushedCase.external_service!.pushed_at,
+        pushed_by: defaultUser,
+        connector_id: connector.id,
+        connector_name: connector.name,
+        external_id: '123',
+        external_title: 'INC01',
+        external_url: `${servicenowSimulatorURL}/nav_to.do?uri=incident.do?sys_id=123`,
+      });
+    });
+
+    // ENABLE_CASE_CONNECTOR: once the case connector feature is completed unskip these tests
+    it.skip('should push a collection case but not close it when closure_type: close-by-pushing', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+        configureReq: {
+          closure_type: 'close-by-pushing',
+        },
+      });
+
+      const theCase = await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+      });
+      expect(theCase.status).to.eql(CaseStatuses.open);
+    });
+
+    it('unhappy path - 404s when case does not exist', async () => {
+      await pushCase({
+        supertest,
+        caseId: 'fake-id',
+        connectorId: 'fake-connector',
+        expectedHttpCode: 404,
+      });
+    });
+
+    it('unhappy path - 404s when connector does not exist', async () => {
+      const postedCase = await createCase(supertest, {
+        ...postCaseReq,
+        connector: getConfigurationRequest().connector,
+      });
+      await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: 'fake-connector',
+        expectedHttpCode: 404,
+      });
+    });
+
+    it('unhappy path = 409s when case is closed', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+      });
+      await updateCase({
+        supertest,
+        params: {
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              status: CaseStatuses.closed,
+            },
+          ],
+        },
+      });
+
+      await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+        expectedHttpCode: 409,
+      });
+    });
+
+    describe('rbac', () => {
+      const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+      it('should push a case that the user has permissions for', async () => {
+        const { postedCase, connector } = await createCaseWithConnector({
+          supertest,
+          servicenowSimulatorURL,
+          actionsRemover,
+          auth: superUserSpace1Auth,
+        });
+
+        await pushCase({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          connectorId: connector.id,
+          auth: { user: secOnly, space: 'space1' },
+        });
+      });
+
+      it('should not push a case that the user does not have permissions for', async () => {
+        const { postedCase, connector } = await createCaseWithConnector({
+          supertest,
+          servicenowSimulatorURL,
+          actionsRemover,
+          auth: superUserSpace1Auth,
+          createCaseReq: getPostCaseRequest({ owner: 'observabilityFixture' }),
+        });
+
+        await pushCase({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          connectorId: connector.id,
+          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 push a case`, async () => {
+          const { postedCase, connector } = await createCaseWithConnector({
+            supertest,
+            servicenowSimulatorURL,
+            actionsRemover,
+            auth: superUserSpace1Auth,
+          });
+
+          await pushCase({
+            supertest: supertestWithoutAuth,
+            caseId: postedCase.id,
+            connectorId: connector.id,
+            auth: { user, space: 'space1' },
+            expectedHttpCode: 403,
+          });
+        });
+      }
+
+      it('should not push a case in a space that the user does not have permissions for', async () => {
+        const { postedCase, connector } = await createCaseWithConnector({
+          supertest,
+          servicenowSimulatorURL,
+          actionsRemover,
+          auth: { user: superUser, space: 'space2' },
+        });
+
+        await pushCase({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          connectorId: connector.id,
+          auth: { user: secOnly, space: 'space2' },
+          expectedHttpCode: 403,
+        });
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
new file mode 100644
index 0000000000000..3729b20f82b30
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/cases/user_actions/get_all_user_actions.ts
@@ -0,0 +1,115 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../../common/ftr_provider_context';
+
+import { CASE_CONFIGURE_URL, CASES_URL } from '../../../../../../../plugins/cases/common/constants';
+import { defaultUser, postCaseReq } from '../../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  deleteConfiguration,
+  getConfigurationRequest,
+  getServiceNowConnector,
+} from '../../../../../common/lib/utils';
+
+import { ObjectRemover as ActionsRemover } from '../../../../../../alerting_api_integration/common/lib';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const actionsRemover = new ActionsRemover(supertest);
+  const kibanaServer = getService('kibanaServer');
+
+  describe('get_all_user_actions', () => {
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteConfiguration(es);
+      await deleteCasesUserActions(es);
+      await actionsRemover.removeAll();
+    });
+
+    it(`on new push to service, user action: 'push-to-service' should be called with actionFields: ['pushed']`, async () => {
+      const { body: connector } = await supertest
+        .post('/api/actions/connector')
+        .set('kbn-xsrf', 'true')
+        .send({
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        })
+        .expect(200);
+
+      actionsRemover.add('default', connector.id, 'action', 'actions');
+
+      const { body: configure } = await supertest
+        .post(CASE_CONFIGURE_URL)
+        .set('kbn-xsrf', 'true')
+        .send(
+          getConfigurationRequest({
+            id: connector.id,
+            name: connector.name,
+            type: connector.connector_type_id,
+          })
+        )
+        .expect(200);
+
+      const { body: postedCase } = await supertest
+        .post(CASES_URL)
+        .set('kbn-xsrf', 'true')
+        .send({
+          ...postCaseReq,
+          connector: getConfigurationRequest({
+            id: connector.id,
+            name: connector.name,
+            type: connector.connector_type_id,
+            fields: {
+              urgency: '2',
+              impact: '2',
+              severity: '2',
+              category: 'software',
+              subcategory: 'os',
+            },
+          }).connector,
+        })
+        .expect(200);
+
+      await supertest
+        .post(`${CASES_URL}/${postedCase.id}/connector/${connector.id}/_push`)
+        .set('kbn-xsrf', 'true')
+        .send({})
+        .expect(200);
+
+      const { body } = await supertest
+        .get(`${CASES_URL}/${postedCase.id}/user_actions`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(body.length).to.eql(2);
+      expect(body[1].action_field).to.eql(['pushed']);
+      expect(body[1].action).to.eql('push-to-service');
+      expect(body[1].old_value).to.eql(null);
+      const newValue = JSON.parse(body[1].new_value);
+      expect(newValue.connector_id).to.eql(configure.connector.id);
+      expect(newValue.pushed_by).to.eql(defaultUser);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
new file mode 100644
index 0000000000000..ff8f1cff884af
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_configure.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  getServiceNowConnector,
+  createConnector,
+  createConfiguration,
+  getConfiguration,
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+} from '../../../../common/lib/utils';
+import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const actionsRemover = new ActionsRemover(supertest);
+  const kibanaServer = getService('kibanaServer');
+
+  describe('get_configure', () => {
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await actionsRemover.removeAll();
+    });
+
+    it('should return a configuration with mapping', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+      });
+      actionsRemover.add('default', connector.id, 'action', 'actions');
+
+      await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+        })
+      );
+
+      const configuration = await getConfiguration({ supertest });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(configuration[0]);
+      expect(data).to.eql(
+        getConfigurationOutput(false, {
+          mappings: [
+            {
+              action_type: 'overwrite',
+              source: 'title',
+              target: 'short_description',
+            },
+            {
+              action_type: 'overwrite',
+              source: 'description',
+              target: 'description',
+            },
+            {
+              action_type: 'append',
+              source: 'comments',
+              target: 'work_notes',
+            },
+          ],
+          connector: {
+            id: connector.id,
+            name: connector.name,
+            type: connector.connector_type_id,
+            fields: null,
+          },
+        })
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_connectors.ts
new file mode 100644
index 0000000000000..fb922f8d10243
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/get_connectors.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 expect from '@kbn/expect';
+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,
+  getJiraConnector,
+  getResilientConnector,
+  createConnector,
+  getServiceNowSIRConnector,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const actionsRemover = new ActionsRemover(supertest);
+
+  describe('get_connectors', () => {
+    afterEach(async () => {
+      await actionsRemover.removeAll();
+    });
+
+    it('should return the correct connectors', async () => {
+      const { body: snConnector } = await supertest
+        .post('/api/actions/connector')
+        .set('kbn-xsrf', 'true')
+        .send(getServiceNowConnector())
+        .expect(200);
+
+      const { body: emailConnector } = await supertest
+        .post('/api/actions/connector')
+        .set('kbn-xsrf', 'true')
+        .send({
+          name: 'An email action',
+          connector_type_id: '.email',
+          config: {
+            service: '__json',
+            from: 'bob@example.com',
+          },
+          secrets: {
+            user: 'bob',
+            password: 'supersecret',
+          },
+        })
+        .expect(200);
+
+      const { body: jiraConnector } = await supertest
+        .post('/api/actions/connector')
+        .set('kbn-xsrf', 'true')
+        .send(getJiraConnector())
+        .expect(200);
+
+      const { body: resilientConnector } = await supertest
+        .post('/api/actions/connector')
+        .set('kbn-xsrf', 'true')
+        .send(getResilientConnector())
+        .expect(200);
+
+      const sir = await createConnector({ supertest, req: getServiceNowSIRConnector() });
+
+      actionsRemover.add('default', sir.id, 'action', 'actions');
+      actionsRemover.add('default', snConnector.id, 'action', 'actions');
+      actionsRemover.add('default', emailConnector.id, 'action', 'actions');
+      actionsRemover.add('default', jiraConnector.id, 'action', 'actions');
+      actionsRemover.add('default', resilientConnector.id, 'action', 'actions');
+
+      const { body: connectors } = await supertest
+        .get(`${CASE_CONFIGURE_CONNECTORS_URL}/_find`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(200);
+
+      expect(connectors).to.eql([
+        {
+          id: jiraConnector.id,
+          actionTypeId: '.jira',
+          name: 'Jira Connector',
+          config: {
+            apiUrl: 'http://some.non.existent.com',
+            projectKey: 'pkey',
+          },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+        {
+          id: resilientConnector.id,
+          actionTypeId: '.resilient',
+          name: 'Resilient Connector',
+          config: {
+            apiUrl: 'http://some.non.existent.com',
+            orgId: 'pkey',
+          },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+        {
+          id: snConnector.id,
+          actionTypeId: '.servicenow',
+          name: 'ServiceNow Connector',
+          config: {
+            apiUrl: 'http://some.non.existent.com',
+          },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+        {
+          id: sir.id,
+          actionTypeId: '.servicenow-sir',
+          name: 'ServiceNow Connector',
+          config: { apiUrl: 'http://some.non.existent.com' },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+      ]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/index.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/index.ts
new file mode 100644
index 0000000000000..0c8c3931d1577
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/index.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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('configuration tests', function () {
+    loadTestFile(require.resolve('./get_configure'));
+    loadTestFile(require.resolve('./get_connectors'));
+    loadTestFile(require.resolve('./patch_configure'));
+    loadTestFile(require.resolve('./post_configure'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
new file mode 100644
index 0000000000000..789b68b19beb6
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/patch_configure.ts
@@ -0,0 +1,168 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  updateConfiguration,
+  getServiceNowConnector,
+  createConnector,
+} from '../../../../common/lib/utils';
+import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const kibanaServer = getService('kibanaServer');
+
+  describe('patch_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should patch a configuration connector and create mappings', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+      });
+
+      actionsRemover.add('default', connector.id, 'action', 'actions');
+
+      // Configuration is created with no connector so the mappings are empty
+      const configuration = await createConfiguration(supertest);
+
+      // the update request doesn't accept the owner field
+      const { owner, ...reqWithoutOwner } = getConfigurationRequest({
+        id: connector.id,
+        name: connector.name,
+        type: connector.connector_type_id as ConnectorTypes,
+        fields: null,
+      });
+
+      const newConfiguration = await updateConfiguration(supertest, configuration.id, {
+        ...reqWithoutOwner,
+        version: configuration.version,
+      });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(newConfiguration);
+      expect(data).to.eql({
+        ...getConfigurationOutput(true),
+        connector: {
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+          fields: null,
+        },
+        mappings: [
+          {
+            action_type: 'overwrite',
+            source: 'title',
+            target: 'short_description',
+          },
+          {
+            action_type: 'overwrite',
+            source: 'description',
+            target: 'description',
+          },
+          {
+            action_type: 'append',
+            source: 'comments',
+            target: 'work_notes',
+          },
+        ],
+      });
+    });
+
+    it('should mappings when updating the connector', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+      });
+
+      actionsRemover.add('default', connector.id, 'action', 'actions');
+
+      // Configuration is created with connector so the mappings are created
+      const configuration = await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+        })
+      );
+
+      // the update request doesn't accept the owner field
+      const { owner, ...rest } = getConfigurationRequest({
+        id: connector.id,
+        name: 'New name',
+        type: connector.connector_type_id as ConnectorTypes,
+        fields: null,
+      });
+
+      const newConfiguration = await updateConfiguration(supertest, configuration.id, {
+        ...rest,
+        version: configuration.version,
+      });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(newConfiguration);
+      expect(data).to.eql({
+        ...getConfigurationOutput(true),
+        connector: {
+          id: connector.id,
+          name: 'New name',
+          type: connector.connector_type_id as ConnectorTypes,
+          fields: null,
+        },
+        mappings: [
+          {
+            action_type: 'overwrite',
+            source: 'title',
+            target: 'short_description',
+          },
+          {
+            action_type: 'overwrite',
+            source: 'description',
+            target: 'description',
+          },
+          {
+            action_type: 'append',
+            source: 'comments',
+            target: 'work_notes',
+          },
+        ],
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
new file mode 100644
index 0000000000000..96ffcf4bc3f5c
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/configure/post_configure.ts
@@ -0,0 +1,98 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  createConnector,
+  getServiceNowConnector,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const kibanaServer = getService('kibanaServer');
+
+  describe('post_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should create a configuration with mapping', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+      });
+
+      actionsRemover.add('default', connector.id, 'action', 'actions');
+
+      const postRes = await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+        })
+      );
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(postRes);
+      expect(data).to.eql(
+        getConfigurationOutput(false, {
+          mappings: [
+            {
+              action_type: 'overwrite',
+              source: 'title',
+              target: 'short_description',
+            },
+            {
+              action_type: 'overwrite',
+              source: 'description',
+              target: 'description',
+            },
+            {
+              action_type: 'append',
+              source: 'comments',
+              target: 'work_notes',
+            },
+          ],
+          connector: {
+            id: connector.id,
+            name: connector.name,
+            type: connector.connector_type_id,
+            fields: null,
+          },
+        })
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.ts
new file mode 100644
index 0000000000000..26bc6a072450d
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_and_spaces/tests/trial/index.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 { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { createSpacesAndUsers, deleteSpacesAndUsers } from '../../../common/lib/authentication';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile, getService }: FtrProviderContext): void => {
+  describe('cases security and spaces enabled: trial', function () {
+    // Fastest ciGroup for the moment.
+    this.tags('ciGroup5');
+
+    before(async () => {
+      await createSpacesAndUsers(getService);
+    });
+
+    after(async () => {
+      await deleteSpacesAndUsers(getService);
+    });
+
+    // Trial
+    loadTestFile(require.resolve('./cases/push_case'));
+    loadTestFile(require.resolve('./cases/user_actions/get_all_user_actions'));
+    loadTestFile(require.resolve('./configure/index'));
+
+    // Common
+    loadTestFile(require.resolve('../common'));
+
+    // NOTE: These need to be at the end because they could delete the .kibana index and inadvertently remove the users and spaces
+    loadTestFile(require.resolve('../common/migrations'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/config.ts b/x-pack/test/case_api_integration/security_only/config.ts
new file mode 100644
index 0000000000000..5946b8d25b464
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/config.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 { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('security_only', {
+  disabledPlugins: ['spaces'],
+  license: 'trial',
+  ssl: true,
+  testFiles: [require.resolve('./tests/trial')],
+});
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/alerts/get_cases.ts b/x-pack/test/case_api_integration/security_only/tests/common/alerts/get_cases.ts
new file mode 100644
index 0000000000000..9575bd99112f6
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/alerts/get_cases.ts
@@ -0,0 +1,242 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest, postCommentAlertReq } from '../../../../common/lib/mock';
+import {
+  createCase,
+  createComment,
+  getCaseIDsByAlert,
+  deleteAllCaseItems,
+} from '../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlyReadSpacesAll,
+  obsSecSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlyReadSpacesAll,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+  obsSecDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('get_cases using alertID', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    it('should return the correct case IDs', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, secOnlyDefaultSpaceAuth),
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, secOnlyDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          obsOnlyDefaultSpaceAuth
+        ),
+      ]);
+
+      await Promise.all([
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case1.id,
+          params: postCommentAlertReq,
+          auth: secOnlyDefaultSpaceAuth,
+        }),
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case2.id,
+          params: postCommentAlertReq,
+          auth: secOnlyDefaultSpaceAuth,
+        }),
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case3.id,
+          params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+          auth: obsOnlyDefaultSpaceAuth,
+        }),
+      ]);
+
+      for (const scenario of [
+        {
+          user: globalRead,
+          caseIDs: [case1.id, case2.id, case3.id],
+        },
+        {
+          user: superUser,
+          caseIDs: [case1.id, case2.id, case3.id],
+        },
+        { user: secOnlyReadSpacesAll, caseIDs: [case1.id, case2.id] },
+        { user: obsOnlyReadSpacesAll, caseIDs: [case3.id] },
+        {
+          user: obsSecReadSpacesAll,
+          caseIDs: [case1.id, case2.id, case3.id],
+        },
+      ]) {
+        const res = await getCaseIDsByAlert({
+          supertest: supertestWithoutAuth,
+          // cast because the official type is string | string[] but the ids will always be a single value in the tests
+          alertID: postCommentAlertReq.alertId as string,
+          auth: {
+            user: scenario.user,
+            space: null,
+          },
+        });
+        expect(res.length).to.eql(scenario.caseIDs.length);
+        for (const caseID of scenario.caseIDs) {
+          expect(res).to.contain(caseID);
+        }
+      }
+    });
+
+    it(`User ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()} - should not get cases`, async () => {
+      const caseInfo = await createCase(supertest, getPostCaseRequest(), 200, {
+        user: superUser,
+        space: null,
+      });
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentAlertReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      await getCaseIDsByAlert({
+        supertest: supertestWithoutAuth,
+        alertID: postCommentAlertReq.alertId as string,
+        auth: { user: noKibanaPrivileges, space: null },
+        expectedHttpCode: 403,
+      });
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const [case1, case2] = await Promise.all([
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, obsSecDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          { ...getPostCaseRequest(), owner: 'observabilityFixture' },
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      await Promise.all([
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case1.id,
+          params: postCommentAlertReq,
+          auth: obsSecDefaultSpaceAuth,
+        }),
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case2.id,
+          params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+          auth: obsSecDefaultSpaceAuth,
+        }),
+      ]);
+
+      await getCaseIDsByAlert({
+        supertest: supertestWithoutAuth,
+        alertID: postCommentAlertReq.alertId as string,
+        auth: { user: obsSecSpacesAll, space: 'space1' },
+        query: { owner: 'securitySolutionFixture' },
+        expectedHttpCode: 404,
+      });
+    });
+
+    it('should respect the owner filter when have permissions', async () => {
+      const [case1, case2] = await Promise.all([
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, obsSecDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          { ...getPostCaseRequest(), owner: 'observabilityFixture' },
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      await Promise.all([
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case1.id,
+          params: postCommentAlertReq,
+          auth: obsSecDefaultSpaceAuth,
+        }),
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case2.id,
+          params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+          auth: obsSecDefaultSpaceAuth,
+        }),
+      ]);
+
+      const res = await getCaseIDsByAlert({
+        supertest: supertestWithoutAuth,
+        alertID: postCommentAlertReq.alertId as string,
+        auth: obsSecDefaultSpaceAuth,
+        query: { owner: 'securitySolutionFixture' },
+      });
+
+      expect(res).to.eql([case1.id]);
+    });
+
+    it('should return the correct case IDs when the owner query parameter contains unprivileged values', async () => {
+      const [case1, case2] = await Promise.all([
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, obsSecDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          { ...getPostCaseRequest(), owner: 'observabilityFixture' },
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      await Promise.all([
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case1.id,
+          params: postCommentAlertReq,
+          auth: obsSecDefaultSpaceAuth,
+        }),
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: case2.id,
+          params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+          auth: obsSecDefaultSpaceAuth,
+        }),
+      ]);
+
+      const res = await getCaseIDsByAlert({
+        supertest: supertestWithoutAuth,
+        alertID: postCommentAlertReq.alertId as string,
+        auth: secOnlyDefaultSpaceAuth,
+        // The secOnlyDefaultSpace user does not have permissions for observability cases, so it should only return the security solution one
+        query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+      });
+
+      expect(res).to.eql([case1.id]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/delete_cases.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/delete_cases.ts
new file mode 100644
index 0000000000000..9ece177b21491
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/delete_cases.ts
@@ -0,0 +1,157 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  deleteCases,
+  getCase,
+} from '../../../../common/lib/utils';
+import {
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  globalRead,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  noKibanaPrivileges,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('delete_cases', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('User: security solution only - should delete a case', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      await deleteCases({
+        supertest: supertestWithoutAuth,
+        caseIDs: [postedCase.id],
+        expectedHttpCode: 204,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+    });
+
+    it('User: security solution only - should NOT delete a case of different owner', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      await deleteCases({
+        supertest: supertestWithoutAuth,
+        caseIDs: [postedCase.id],
+        expectedHttpCode: 403,
+        auth: obsOnlyDefaultSpaceAuth,
+      });
+    });
+
+    it('should get an error if the user has not permissions to all requested cases', async () => {
+      const caseSec = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      const caseObs = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'observabilityFixture' }),
+        200,
+        obsOnlyDefaultSpaceAuth
+      );
+
+      await deleteCases({
+        supertest: supertestWithoutAuth,
+        caseIDs: [caseSec.id, caseObs.id],
+        expectedHttpCode: 403,
+        auth: obsOnlyDefaultSpaceAuth,
+      });
+
+      // Cases should have not been deleted.
+      await getCase({
+        supertest: supertestWithoutAuth,
+        caseId: caseSec.id,
+        expectedHttpCode: 200,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      await getCase({
+        supertest: supertestWithoutAuth,
+        caseId: caseObs.id,
+        expectedHttpCode: 200,
+        auth: superUserDefaultSpaceAuth,
+      });
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT delete a case`, async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest(),
+          200,
+          superUserDefaultSpaceAuth
+        );
+
+        await deleteCases({
+          supertest: supertestWithoutAuth,
+          caseIDs: [postedCase.id],
+          expectedHttpCode: 403,
+          auth: { user, space: null },
+        });
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await deleteCases({
+        supertest: supertestWithoutAuth,
+        caseIDs: [postedCase.id],
+        expectedHttpCode: 404,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/find_cases.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/find_cases.ts
new file mode 100644
index 0000000000000..711eccbe16278
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/find_cases.ts
@@ -0,0 +1,245 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  ensureSavedObjectIsAuthorized,
+  findCases,
+  createCase,
+} from '../../../../common/lib/utils';
+import {
+  secOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  secOnlyReadSpacesAll,
+  noKibanaPrivileges,
+  superUser,
+  globalRead,
+  obsSecReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  obsSecDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  describe('find_cases', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should return the correct cases', async () => {
+      await Promise.all([
+        // Create case owned by the security solution user
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          secOnlyDefaultSpaceAuth
+        ),
+        // Create case owned by the observability user
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          obsOnlyDefaultSpaceAuth
+        ),
+      ]);
+
+      for (const scenario of [
+        {
+          user: globalRead,
+          numberOfExpectedCases: 2,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+        },
+        {
+          user: superUser,
+          numberOfExpectedCases: 2,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+        },
+        {
+          user: secOnlyReadSpacesAll,
+          numberOfExpectedCases: 1,
+          owners: ['securitySolutionFixture'],
+        },
+        {
+          user: obsOnlyReadSpacesAll,
+          numberOfExpectedCases: 1,
+          owners: ['observabilityFixture'],
+        },
+        {
+          user: obsSecReadSpacesAll,
+          numberOfExpectedCases: 2,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+        },
+      ]) {
+        const res = await findCases({
+          supertest: supertestWithoutAuth,
+          auth: {
+            user: scenario.user,
+            space: null,
+          },
+        });
+
+        ensureSavedObjectIsAuthorized(res.cases, scenario.numberOfExpectedCases, scenario.owners);
+      }
+    });
+
+    it(`User ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()} - should NOT read a case`, async () => {
+      await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth);
+
+      await findCases({
+        supertest: supertestWithoutAuth,
+        auth: {
+          user: noKibanaPrivileges,
+          space: null,
+        },
+        expectedHttpCode: 403,
+      });
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth);
+
+      await findCases({
+        supertest: supertestWithoutAuth,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+
+    it('should return the correct cases when trying to exploit RBAC through the search query parameter', async () => {
+      await Promise.all([
+        // super user creates a case with owner securitySolutionFixture
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth),
+        // super user creates a case with owner observabilityFixture
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserDefaultSpaceAuth
+        ),
+      ]);
+
+      const res = await findCases({
+        supertest: supertestWithoutAuth,
+        query: {
+          search: 'securitySolutionFixture observabilityFixture',
+          searchFields: 'owner',
+        },
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      ensureSavedObjectIsAuthorized(res.cases, 1, ['securitySolutionFixture']);
+    });
+
+    // This test is to prevent a future developer to add the filter attribute without taking into consideration
+    // the authorizationFilter produced by the cases authorization class
+    it('should NOT allow to pass a filter query parameter', async () => {
+      await supertest
+        .get(
+          `${CASES_URL}/_find?sortOrder=asc&filter=cases.attributes.owner:"observabilityFixture"`
+        )
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+    });
+
+    // This test ensures that the user is not allowed to define the namespaces query param
+    // so she cannot search across spaces
+    it('should NOT allow to pass a namespaces query parameter', async () => {
+      await supertest
+        .get(`${CASES_URL}/_find?sortOrder=asc&namespaces[0]=*`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+
+      await supertest
+        .get(`${CASES_URL}/_find?sortOrder=asc&namespaces=*`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+    });
+
+    it('should NOT allow to pass a non supported query parameter', async () => {
+      await supertest
+        .get(`${CASES_URL}/_find?notExists=papa`)
+        .set('kbn-xsrf', 'true')
+        .send()
+        .expect(400);
+    });
+
+    it('should respect the owner filter when having permissions', async () => {
+      await Promise.all([
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          obsOnlyDefaultSpaceAuth
+        ),
+      ]);
+
+      const res = await findCases({
+        supertest: supertestWithoutAuth,
+        query: {
+          owner: 'securitySolutionFixture',
+          searchFields: 'owner',
+        },
+        auth: obsSecDefaultSpaceAuth,
+      });
+
+      ensureSavedObjectIsAuthorized(res.cases, 1, ['securitySolutionFixture']);
+    });
+
+    it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+      await Promise.all([
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      // User with permissions only to security solution request cases from observability
+      const res = await findCases({
+        supertest: supertestWithoutAuth,
+        query: {
+          owner: ['securitySolutionFixture', 'observabilityFixture'],
+        },
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      // Only security solution cases are being returned
+      ensureSavedObjectIsAuthorized(res.cases, 1, ['securitySolutionFixture']);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/get_case.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/get_case.ts
new file mode 100644
index 0000000000000..3bdb4c5ed310e
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/get_case.ts
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { AttributesTypeUser } from '../../../../../../plugins/cases/common/api';
+import { postCommentUserReq, getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  createCase,
+  getCase,
+  createComment,
+  removeServerGeneratedPropertiesFromSavedObject,
+} from '../../../../common/lib/utils';
+import {
+  secOnlySpacesAll,
+  obsOnlySpacesAll,
+  globalRead,
+  superUser,
+  secOnlyReadSpacesAll,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  noKibanaPrivileges,
+  obsSecSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import { getUserInfo } from '../../../../common/lib/authentication';
+import { secOnlyDefaultSpaceAuth, superUserDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_case', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should get a case', async () => {
+      const newCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      for (const user of [
+        globalRead,
+        superUser,
+        secOnlySpacesAll,
+        secOnlyReadSpacesAll,
+        obsSecSpacesAll,
+        obsSecReadSpacesAll,
+      ]) {
+        const theCase = await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: newCase.id,
+          auth: { user, space: null },
+        });
+
+        expect(theCase.owner).to.eql('securitySolutionFixture');
+      }
+    });
+
+    it('should get a case with comments', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        expectedHttpCode: 200,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      const theCase = await getCase({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        includeComments: true,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      const comment = removeServerGeneratedPropertiesFromSavedObject(
+        theCase.comments![0] as AttributesTypeUser
+      );
+
+      expect(theCase.comments?.length).to.eql(1);
+      expect(comment).to.eql({
+        type: postCommentUserReq.type,
+        comment: postCommentUserReq.comment,
+        associationType: 'case',
+        created_by: getUserInfo(secOnlySpacesAll),
+        pushed_at: null,
+        pushed_by: null,
+        updated_by: null,
+        owner: 'securitySolutionFixture',
+      });
+    });
+
+    it('should not get a case when the user does not have access to owner', async () => {
+      const newCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      for (const user of [noKibanaPrivileges, obsOnlySpacesAll, obsOnlyReadSpacesAll]) {
+        await getCase({
+          supertest: supertestWithoutAuth,
+          caseId: newCase.id,
+          expectedHttpCode: 403,
+          auth: { user, space: null },
+        });
+      }
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const newCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await getCase({
+        supertest: supertestWithoutAuth,
+        caseId: newCase.id,
+        expectedHttpCode: 404,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/patch_cases.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/patch_cases.ts
new file mode 100644
index 0000000000000..bfab3fce7adbe
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/patch_cases.ts
@@ -0,0 +1,243 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest, postCaseReq } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  updateCase,
+  findCases,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('patch_cases', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    it('should update a case when the user has the correct permissions', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        postCaseReq,
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      const patchedCases = await updateCase({
+        supertest: supertestWithoutAuth,
+        params: {
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              title: 'new title',
+            },
+          ],
+        },
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      expect(patchedCases[0].owner).to.eql('securitySolutionFixture');
+    });
+
+    it('should update multiple cases when the user has the correct permissions', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(supertestWithoutAuth, postCaseReq, 200, superUserDefaultSpaceAuth),
+        createCase(supertestWithoutAuth, postCaseReq, 200, superUserDefaultSpaceAuth),
+        createCase(supertestWithoutAuth, postCaseReq, 200, superUserDefaultSpaceAuth),
+      ]);
+
+      const patchedCases = await updateCase({
+        supertest: supertestWithoutAuth,
+        params: {
+          cases: [
+            {
+              id: case1.id,
+              version: case1.version,
+              title: 'new title',
+            },
+            {
+              id: case2.id,
+              version: case2.version,
+              title: 'new title',
+            },
+            {
+              id: case3.id,
+              version: case3.version,
+              title: 'new title',
+            },
+          ],
+        },
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      expect(patchedCases[0].owner).to.eql('securitySolutionFixture');
+      expect(patchedCases[1].owner).to.eql('securitySolutionFixture');
+      expect(patchedCases[2].owner).to.eql('securitySolutionFixture');
+    });
+
+    it('should not update a case when the user does not have the correct ownership', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'observabilityFixture' }),
+        200,
+        obsOnlyDefaultSpaceAuth
+      );
+
+      await updateCase({
+        supertest: supertestWithoutAuth,
+        params: {
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              title: 'new title',
+            },
+          ],
+        },
+        auth: secOnlyDefaultSpaceAuth,
+        expectedHttpCode: 403,
+      });
+    });
+
+    it('should not update any cases when the user does not have the correct ownership', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserDefaultSpaceAuth
+        ),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserDefaultSpaceAuth
+        ),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserDefaultSpaceAuth
+        ),
+      ]);
+
+      await updateCase({
+        supertest: supertestWithoutAuth,
+        params: {
+          cases: [
+            {
+              id: case1.id,
+              version: case1.version,
+              title: 'new title',
+            },
+            {
+              id: case2.id,
+              version: case2.version,
+              title: 'new title',
+            },
+            {
+              id: case3.id,
+              version: case3.version,
+              title: 'new title',
+            },
+          ],
+        },
+        auth: secOnlyDefaultSpaceAuth,
+        expectedHttpCode: 403,
+      });
+
+      const resp = await findCases({ supertest, auth: getAuthWithSuperUser(null) });
+      expect(resp.cases.length).to.eql(3);
+      // the update should have failed and none of the title should have been changed
+      expect(resp.cases[0].title).to.eql(postCaseReq.title);
+      expect(resp.cases[1].title).to.eql(postCaseReq.title);
+      expect(resp.cases[2].title).to.eql(postCaseReq.title);
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT update a case`, async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest(),
+          200,
+          superUserDefaultSpaceAuth
+        );
+
+        await updateCase({
+          supertest: supertestWithoutAuth,
+          params: {
+            cases: [
+              {
+                id: postedCase.id,
+                version: postedCase.version,
+                title: 'new title',
+              },
+            ],
+          },
+          auth: { user, space: null },
+          expectedHttpCode: 403,
+        });
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const postedCase = await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
+        user: superUser,
+        space: null,
+      });
+
+      await updateCase({
+        supertest: supertestWithoutAuth,
+        params: {
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              title: 'new title',
+            },
+          ],
+        },
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/post_case.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/post_case.ts
new file mode 100644
index 0000000000000..28043d7155e4a
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/post_case.ts
@@ -0,0 +1,83 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+
+import { getPostCaseRequest } from '../../../../common/lib/mock';
+import { deleteCasesByESQuery, createCase } from '../../../../common/lib/utils';
+import {
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  globalRead,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  noKibanaPrivileges,
+} from '../../../../common/lib/authentication/users';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { secOnlyDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+  describe('post_case', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('User: security solution only - should create a case', async () => {
+      const theCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+      expect(theCase.owner).to.eql('securitySolutionFixture');
+    });
+
+    it('User: security solution only - should NOT create a case of different owner', async () => {
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'observabilityFixture' }),
+        403,
+        secOnlyDefaultSpaceAuth
+      );
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT create a case`, async () => {
+        await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+          403,
+          { user, space: null }
+        );
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+        404,
+        {
+          user: secOnlySpacesAll,
+          space: 'space1',
+        }
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/reporters/get_reporters.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/reporters/get_reporters.ts
new file mode 100644
index 0000000000000..4c72dafed053b
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/reporters/get_reporters.ts
@@ -0,0 +1,155 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest } from '../../../../../common/lib/mock';
+import { createCase, deleteCasesByESQuery, getReporters } from '../../../../../common/lib/utils';
+import {
+  secOnlySpacesAll,
+  obsOnlySpacesAll,
+  globalRead,
+  superUser,
+  secOnlyReadSpacesAll,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  noKibanaPrivileges,
+  obsSecSpacesAll,
+} from '../../../../../common/lib/authentication/users';
+import { getUserInfo } from '../../../../../common/lib/authentication';
+import {
+  secOnlyDefaultSpaceAuth,
+  obsOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+  obsSecDefaultSpaceAuth,
+} from '../../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_reporters', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('User: security solution only - should read the correct reporters', async () => {
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'observabilityFixture' }),
+        200,
+        obsOnlyDefaultSpaceAuth
+      );
+
+      for (const scenario of [
+        {
+          user: globalRead,
+          expectedReporters: [getUserInfo(secOnlySpacesAll), getUserInfo(obsOnlySpacesAll)],
+        },
+        {
+          user: superUser,
+          expectedReporters: [getUserInfo(secOnlySpacesAll), getUserInfo(obsOnlySpacesAll)],
+        },
+        { user: secOnlyReadSpacesAll, expectedReporters: [getUserInfo(secOnlySpacesAll)] },
+        { user: obsOnlyReadSpacesAll, expectedReporters: [getUserInfo(obsOnlySpacesAll)] },
+        {
+          user: obsSecReadSpacesAll,
+          expectedReporters: [getUserInfo(secOnlySpacesAll), getUserInfo(obsOnlySpacesAll)],
+        },
+      ]) {
+        const reporters = await getReporters({
+          supertest: supertestWithoutAuth,
+          expectedHttpCode: 200,
+          auth: {
+            user: scenario.user,
+            space: null,
+          },
+        });
+
+        expect(reporters).to.eql(scenario.expectedReporters);
+      }
+    });
+
+    it(`User ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()} - should NOT get all reporters`, async () => {
+      // super user creates a case at the appropriate space
+      await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth);
+
+      // user should not be able to get all reporters at the appropriate space
+      await getReporters({
+        supertest: supertestWithoutAuth,
+        expectedHttpCode: 403,
+        auth: { user: noKibanaPrivileges, space: null },
+      });
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, {
+        user: superUser,
+        space: null,
+      });
+
+      await getReporters({
+        supertest: supertestWithoutAuth,
+        expectedHttpCode: 404,
+        auth: { user: obsSecSpacesAll, space: 'space1' },
+      });
+    });
+
+    it('should respect the owner filter when having permissions', async () => {
+      await Promise.all([
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, secOnlyDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          obsOnlyDefaultSpaceAuth
+        ),
+      ]);
+
+      const reporters = await getReporters({
+        supertest: supertestWithoutAuth,
+        auth: obsSecDefaultSpaceAuth,
+        query: { owner: 'securitySolutionFixture' },
+      });
+
+      expect(reporters).to.eql([getUserInfo(secOnlySpacesAll)]);
+    });
+
+    it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+      await Promise.all([
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, secOnlyDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          obsOnlyDefaultSpaceAuth
+        ),
+      ]);
+
+      // User with permissions only to security solution request reporters from observability
+      const reporters = await getReporters({
+        supertest: supertestWithoutAuth,
+        auth: secOnlyDefaultSpaceAuth,
+        query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+      });
+
+      // Only security solution reporters are being returned
+      expect(reporters).to.eql([getUserInfo(secOnlySpacesAll)]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/status/get_status.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/status/get_status.ts
new file mode 100644
index 0000000000000..245c7d1fdbfc5
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/status/get_status.ts
@@ -0,0 +1,144 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+
+import { CaseStatuses } from '../../../../../../../plugins/cases/common/api';
+import { getPostCaseRequest } from '../../../../../common/lib/mock';
+import {
+  createCase,
+  updateCase,
+  getAllCasesStatuses,
+  deleteAllCaseItems,
+} from '../../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  superUser,
+} from '../../../../../common/lib/authentication/users';
+import { superUserDefaultSpaceAuth } from '../../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+
+  describe('get_status', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    it('should return the correct status stats', async () => {
+      /**
+       * Owner: Sec
+       *  open: 0, in-prog: 1, closed: 1
+       * Owner: Obs
+       *  open: 1, in-prog: 1
+       */
+      const [inProgressSec, closedSec, , inProgressObs] = await Promise.all([
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth),
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserDefaultSpaceAuth
+        ),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          superUserDefaultSpaceAuth
+        ),
+      ]);
+
+      await updateCase({
+        supertest: supertestWithoutAuth,
+        params: {
+          cases: [
+            {
+              id: inProgressSec.id,
+              version: inProgressSec.version,
+              status: CaseStatuses['in-progress'],
+            },
+            {
+              id: closedSec.id,
+              version: closedSec.version,
+              status: CaseStatuses.closed,
+            },
+            {
+              id: inProgressObs.id,
+              version: inProgressObs.version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+        },
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      for (const scenario of [
+        { user: globalRead, stats: { open: 1, inProgress: 2, closed: 1 } },
+        { user: superUser, stats: { open: 1, inProgress: 2, closed: 1 } },
+        { user: secOnlyReadSpacesAll, stats: { open: 0, inProgress: 1, closed: 1 } },
+        { user: obsOnlyReadSpacesAll, stats: { open: 1, inProgress: 1, closed: 0 } },
+        { user: obsSecReadSpacesAll, stats: { open: 1, inProgress: 2, closed: 1 } },
+        {
+          user: obsSecReadSpacesAll,
+          stats: { open: 1, inProgress: 1, closed: 0 },
+          owner: 'observabilityFixture',
+        },
+        {
+          user: obsSecReadSpacesAll,
+          stats: { open: 1, inProgress: 2, closed: 1 },
+          owner: ['observabilityFixture', 'securitySolutionFixture'],
+        },
+      ]) {
+        const statuses = await getAllCasesStatuses({
+          supertest: supertestWithoutAuth,
+          auth: { user: scenario.user, space: null },
+          query: {
+            owner: scenario.owner,
+          },
+        });
+
+        expect(statuses).to.eql({
+          count_open_cases: scenario.stats.open,
+          count_closed_cases: scenario.stats.closed,
+          count_in_progress_cases: scenario.stats.inProgress,
+        });
+      }
+    });
+
+    it(`should return a 403 when retrieving the statuses when the user ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()}`, async () => {
+      await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth);
+
+      await getAllCasesStatuses({
+        supertest: supertestWithoutAuth,
+        auth: { user: noKibanaPrivileges, space: null },
+        expectedHttpCode: 403,
+      });
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      await createCase(supertestWithoutAuth, getPostCaseRequest(), 200, superUserDefaultSpaceAuth);
+
+      await getAllCasesStatuses({
+        supertest: supertestWithoutAuth,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/cases/tags/get_tags.ts b/x-pack/test/case_api_integration/security_only/tests/common/cases/tags/get_tags.ts
new file mode 100644
index 0000000000000..c05d956028752
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/cases/tags/get_tags.ts
@@ -0,0 +1,170 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../../common/ftr_provider_context';
+
+import { deleteCasesByESQuery, createCase, getTags } from '../../../../../common/lib/utils';
+import { getPostCaseRequest } from '../../../../../common/lib/mock';
+import {
+  secOnlySpacesAll,
+  globalRead,
+  superUser,
+  secOnlyReadSpacesAll,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  noKibanaPrivileges,
+} from '../../../../../common/lib/authentication/users';
+import {
+  secOnlyDefaultSpaceAuth,
+  obsOnlyDefaultSpaceAuth,
+  obsSecDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_tags', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should read the correct tags', async () => {
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'observabilityFixture', tags: ['obs'] }),
+        200,
+        obsOnlyDefaultSpaceAuth
+      );
+
+      for (const scenario of [
+        {
+          user: globalRead,
+          expectedTags: ['sec', 'obs'],
+        },
+        {
+          user: superUser,
+          expectedTags: ['sec', 'obs'],
+        },
+        { user: secOnlyReadSpacesAll, expectedTags: ['sec'] },
+        { user: obsOnlyReadSpacesAll, expectedTags: ['obs'] },
+        {
+          user: obsSecReadSpacesAll,
+          expectedTags: ['sec', 'obs'],
+        },
+      ]) {
+        const tags = await getTags({
+          supertest: supertestWithoutAuth,
+          expectedHttpCode: 200,
+          auth: {
+            user: scenario.user,
+            space: null,
+          },
+        });
+
+        expect(tags).to.eql(scenario.expectedTags);
+      }
+    });
+
+    it(`User ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()} - should NOT get all tags`, async () => {
+      // super user creates a case at the appropriate space
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      // user should not be able to get all tags at the appropriate space
+      await getTags({
+        supertest: supertestWithoutAuth,
+        expectedHttpCode: 403,
+        auth: { user: noKibanaPrivileges, space: null },
+      });
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      // super user creates a case at the appropriate space
+      await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await getTags({
+        supertest: supertestWithoutAuth,
+        expectedHttpCode: 404,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+      });
+    });
+
+    it('should respect the owner filter when having permissions', async () => {
+      await Promise.all([
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture', tags: ['obs'] }),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      const tags = await getTags({
+        supertest: supertestWithoutAuth,
+        auth: obsSecDefaultSpaceAuth,
+        query: { owner: 'securitySolutionFixture' },
+      });
+
+      expect(tags).to.eql(['sec']);
+    });
+
+    it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+      await Promise.all([
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'securitySolutionFixture', tags: ['sec'] }),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture', tags: ['obs'] }),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      // User with permissions only to security solution request tags from observability
+      const tags = await getTags({
+        supertest: supertestWithoutAuth,
+        auth: secOnlyDefaultSpaceAuth,
+        query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+      });
+
+      // Only security solution tags are being returned
+      expect(tags).to.eql(['sec']);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/comments/delete_comment.ts b/x-pack/test/case_api_integration/security_only/tests/common/comments/delete_comment.ts
new file mode 100644
index 0000000000000..6a2ddeecdb272
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/comments/delete_comment.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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+  deleteComment,
+  deleteAllComments,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import { obsOnlyDefaultSpaceAuth, secOnlyDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+  const superUserNoSpaceAuth = getAuthWithSuperUser(null);
+
+  describe('delete_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should delete a comment from the appropriate owner', async () => {
+      const secCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      const commentResp = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        params: postCommentUserReq,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      await deleteComment({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        commentId: commentResp.comments![0].id,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+    });
+
+    it('should delete multiple comments from the appropriate owner', async () => {
+      const secCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        params: postCommentUserReq,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        params: postCommentUserReq,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      await deleteAllComments({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+    });
+
+    it('should not delete a comment from a different owner', async () => {
+      const secCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      const commentResp = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        params: postCommentUserReq,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      await deleteComment({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        commentId: commentResp.comments![0].id,
+        auth: obsOnlyDefaultSpaceAuth,
+        expectedHttpCode: 403,
+      });
+
+      await deleteAllComments({
+        supertest: supertestWithoutAuth,
+        caseId: secCase.id,
+        auth: obsOnlyDefaultSpaceAuth,
+        expectedHttpCode: 403,
+      });
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT delete a comment`, async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest(),
+          200,
+          superUserNoSpaceAuth
+        );
+
+        const commentResp = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: superUserNoSpaceAuth,
+        });
+
+        await deleteComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          commentId: commentResp.comments![0].id,
+          auth: { user, space: null },
+          expectedHttpCode: 403,
+        });
+
+        await deleteAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          auth: { user, space: null },
+          expectedHttpCode: 403,
+        });
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserNoSpaceAuth
+      );
+
+      const commentResp = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: superUserNoSpaceAuth,
+      });
+
+      await deleteComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        commentId: commentResp.comments![0].id,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+
+      await deleteAllComments({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/comments/find_comments.ts b/x-pack/test/case_api_integration/security_only/tests/common/comments/find_comments.ts
new file mode 100644
index 0000000000000..5239c616603a8
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/comments/find_comments.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 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 {
+  getPostCaseRequest,
+  postCommentAlertReq,
+  postCommentUserReq,
+} from '../../../../common/lib/mock';
+import {
+  createComment,
+  deleteAllCaseItems,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  ensureSavedObjectIsAuthorized,
+  getSpaceUrlPrefix,
+  createCase,
+} from '../../../../common/lib/utils';
+
+import {
+  secOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  secOnlyReadSpacesAll,
+  noKibanaPrivileges,
+  superUser,
+  globalRead,
+  obsSecReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('find_comments', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should return the correct comments', async () => {
+      const [secCase, obsCase] = await Promise.all([
+        // Create case owned by the security solution user
+        createCase(supertestWithoutAuth, getPostCaseRequest(), 200, secOnlyDefaultSpaceAuth),
+        createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest({ owner: 'observabilityFixture' }),
+          200,
+          obsOnlyDefaultSpaceAuth
+        ),
+        // Create case owned by the observability user
+      ]);
+
+      await Promise.all([
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: secCase.id,
+          params: postCommentUserReq,
+          auth: secOnlyDefaultSpaceAuth,
+        }),
+        createComment({
+          supertest: supertestWithoutAuth,
+          caseId: obsCase.id,
+          params: { ...postCommentAlertReq, owner: 'observabilityFixture' },
+          auth: obsOnlyDefaultSpaceAuth,
+        }),
+      ]);
+
+      for (const scenario of [
+        {
+          user: globalRead,
+          numExpectedEntites: 1,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+          caseID: secCase.id,
+        },
+        {
+          user: globalRead,
+          numExpectedEntites: 1,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+          caseID: obsCase.id,
+        },
+        {
+          user: superUser,
+          numExpectedEntites: 1,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+          caseID: secCase.id,
+        },
+        {
+          user: superUser,
+          numExpectedEntites: 1,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+          caseID: obsCase.id,
+        },
+        {
+          user: secOnlyReadSpacesAll,
+          numExpectedEntites: 1,
+          owners: ['securitySolutionFixture'],
+          caseID: secCase.id,
+        },
+        {
+          user: obsOnlyReadSpacesAll,
+          numExpectedEntites: 1,
+          owners: ['observabilityFixture'],
+          caseID: obsCase.id,
+        },
+        {
+          user: obsSecReadSpacesAll,
+          numExpectedEntites: 1,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+          caseID: secCase.id,
+        },
+        {
+          user: obsSecReadSpacesAll,
+          numExpectedEntites: 1,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+          caseID: obsCase.id,
+        },
+      ]) {
+        const { body: caseComments }: { body: CommentsResponse } = await supertestWithoutAuth
+          .get(`${getSpaceUrlPrefix(null)}${CASES_URL}/${scenario.caseID}/comments/_find`)
+          .auth(scenario.user.username, scenario.user.password)
+          .expect(200);
+
+        ensureSavedObjectIsAuthorized(
+          caseComments.comments,
+          scenario.numExpectedEntites,
+          scenario.owners
+        );
+      }
+    });
+
+    it(`User ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()} - should NOT read a comment`, async () => {
+      // super user creates a case and comment in the appropriate space
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        auth: { user: superUser, space: null },
+        params: { ...postCommentUserReq, owner: 'securitySolutionFixture' },
+        caseId: caseInfo.id,
+      });
+
+      // user should not be able to read comments
+      await supertestWithoutAuth
+        .get(`${getSpaceUrlPrefix(null)}${CASES_URL}/${caseInfo.id}/comments/_find`)
+        .auth(noKibanaPrivileges.username, noKibanaPrivileges.password)
+        .expect(403);
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        auth: superUserDefaultSpaceAuth,
+        params: { ...postCommentUserReq, owner: 'securitySolutionFixture' },
+        caseId: caseInfo.id,
+      });
+
+      await supertestWithoutAuth
+        .get(`${getSpaceUrlPrefix('space1')}${CASES_URL}/${caseInfo.id}/comments/_find`)
+        .auth(secOnlySpacesAll.username, secOnlySpacesAll.password)
+        .expect(404);
+    });
+
+    it('should not return any comments when trying to exploit RBAC through the search query parameter', async () => {
+      const obsCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'observabilityFixture' }),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        auth: superUserDefaultSpaceAuth,
+        params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+        caseId: obsCase.id,
+      });
+
+      const { body: res }: { body: CommentsResponse } = await supertestWithoutAuth
+        .get(
+          `${getSpaceUrlPrefix(null)}${CASES_URL}/${
+            obsCase.id
+          }/comments/_find?search=securitySolutionFixture+observabilityFixture`
+        )
+        .auth(secOnlySpacesAll.username, secOnlySpacesAll.password)
+        .expect(200);
+
+      // shouldn't find any comments since they were created under the observability ownership
+      ensureSavedObjectIsAuthorized(res.comments, 0, ['securitySolutionFixture']);
+    });
+
+    it('should not allow retrieving unauthorized comments using the filter field', async () => {
+      const obsCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'observabilityFixture' }),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        auth: superUserDefaultSpaceAuth,
+        params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+        caseId: obsCase.id,
+      });
+
+      const { body: res } = await supertestWithoutAuth
+        .get(
+          `${getSpaceUrlPrefix(null)}${CASES_URL}/${
+            obsCase.id
+          }/comments/_find?filter=cases-comments.attributes.owner:"observabilityFixture"`
+        )
+        .auth(secOnlySpacesAll.username, secOnlySpacesAll.password)
+        .expect(200);
+      expect(res.comments.length).to.be(0);
+    });
+
+    // This test ensures that the user is not allowed to define the namespaces query param
+    // so she cannot search across spaces
+    it('should NOT allow to pass a namespaces query parameter', async () => {
+      const obsCase = await createCase(
+        supertest,
+        getPostCaseRequest({ owner: 'observabilityFixture' }),
+        200
+      );
+
+      await createComment({
+        supertest,
+        params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+        caseId: obsCase.id,
+      });
+
+      await supertest.get(`${CASES_URL}/${obsCase.id}/comments/_find?namespaces[0]=*`).expect(400);
+
+      await supertest.get(`${CASES_URL}/${obsCase.id}/comments/_find?namespaces=*`).expect(400);
+    });
+
+    it('should NOT allow to pass a non supported query parameter', async () => {
+      await supertest.get(`${CASES_URL}/id/comments/_find?notExists=papa`).expect(400);
+      await supertest.get(`${CASES_URL}/id/comments/_find?owner=papa`).expect(400);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/comments/get_all_comments.ts b/x-pack/test/case_api_integration/security_only/tests/common/comments/get_all_comments.ts
new file mode 100644
index 0000000000000..a0010ef19499f
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/comments/get_all_comments.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  createComment,
+  getAllComments,
+} from '../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  obsSecSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+import { superUserDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+
+  describe('get_all_comments', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    it('should get all comments when the user has the correct permissions', async () => {
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      for (const user of [
+        globalRead,
+        superUser,
+        secOnlySpacesAll,
+        secOnlyReadSpacesAll,
+        obsSecSpacesAll,
+        obsSecReadSpacesAll,
+      ]) {
+        const comments = await getAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          auth: { user, space: null },
+        });
+
+        expect(comments.length).to.eql(2);
+      }
+    });
+
+    it('should not get comments when the user does not have correct permission', async () => {
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      for (const scenario of [
+        { user: noKibanaPrivileges, returnCode: 403 },
+        { user: obsOnlySpacesAll, returnCode: 200 },
+        { user: obsOnlyReadSpacesAll, returnCode: 200 },
+      ]) {
+        const comments = await getAllComments({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          auth: { user: scenario.user, space: null },
+          expectedHttpCode: scenario.returnCode,
+        });
+
+        // only check the length if we get a 200 in response
+        if (scenario.returnCode === 200) {
+          expect(comments.length).to.be(0);
+        }
+      }
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      await getAllComments({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/comments/get_comment.ts b/x-pack/test/case_api_integration/security_only/tests/common/comments/get_comment.ts
new file mode 100644
index 0000000000000..79693d3e0a574
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/comments/get_comment.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { postCommentUserReq, getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  createComment,
+  getComment,
+} from '../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  obsSecSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+import { superUserDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+
+  describe('get_comment', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    it('should get a comment when the user has the correct permissions', async () => {
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      const caseWithComment = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      for (const user of [
+        globalRead,
+        superUser,
+        secOnlySpacesAll,
+        secOnlyReadSpacesAll,
+        obsSecSpacesAll,
+        obsSecReadSpacesAll,
+      ]) {
+        await getComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          commentId: caseWithComment.comments![0].id,
+          auth: { user, space: null },
+        });
+      }
+    });
+
+    it('should not get comment when the user does not have correct permissions', async () => {
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      const caseWithComment = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      for (const user of [noKibanaPrivileges, obsOnlySpacesAll, obsOnlyReadSpacesAll]) {
+        await getComment({
+          supertest: supertestWithoutAuth,
+          caseId: caseInfo.id,
+          commentId: caseWithComment.comments![0].id,
+          auth: { user, space: null },
+          expectedHttpCode: 403,
+        });
+      }
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      const caseWithComment = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      await getComment({
+        supertest: supertestWithoutAuth,
+        caseId: caseInfo.id,
+        commentId: caseWithComment.comments![0].id,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/comments/patch_comment.ts b/x-pack/test/case_api_integration/security_only/tests/common/comments/patch_comment.ts
new file mode 100644
index 0000000000000..7a25ec4ec3981
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/comments/patch_comment.ts
@@ -0,0 +1,189 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+
+import { AttributesTypeUser, CommentType } from '../../../../../../plugins/cases/common/api';
+import { defaultUser, postCommentUserReq, getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+  updateComment,
+} from '../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+
+  describe('patch_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should update a comment that the user has permissions for', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      const updatedCase = await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          ...postCommentUserReq,
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          comment: newComment,
+        },
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      const userComment = updatedCase.comments![0] as AttributesTypeUser;
+      expect(userComment.comment).to.eql(newComment);
+      expect(userComment.type).to.eql(CommentType.user);
+      expect(updatedCase.updated_by).to.eql(defaultUser);
+      expect(userComment.owner).to.eql('securitySolutionFixture');
+    });
+
+    it('should not update a comment that has a different owner thant he user has access to', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      const patchedCase = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      await updateComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        req: {
+          ...postCommentUserReq,
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          comment: newComment,
+        },
+        auth: obsOnlyDefaultSpaceAuth,
+        expectedHttpCode: 403,
+      });
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT update a comment`, async () => {
+        const postedCase = await createCase(
+          supertestWithoutAuth,
+          getPostCaseRequest(),
+          200,
+          superUserDefaultSpaceAuth
+        );
+
+        const patchedCase = await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: superUserDefaultSpaceAuth,
+        });
+
+        const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+        await updateComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          req: {
+            ...postCommentUserReq,
+            id: patchedCase.comments![0].id,
+            version: patchedCase.comments![0].version,
+            comment: newComment,
+          },
+          auth: { user, space: null },
+          expectedHttpCode: 403,
+        });
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      const patchedCase = await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      await updateComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        req: {
+          ...postCommentUserReq,
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          comment: newComment,
+        },
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/comments/post_comment.ts b/x-pack/test/case_api_integration/security_only/tests/common/comments/post_comment.ts
new file mode 100644
index 0000000000000..500308305d131
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/comments/post_comment.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { postCommentUserReq, getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+} from '../../../../common/lib/utils';
+
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+
+  describe('post_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should create a comment when the user has the correct permissions for that owner', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+    });
+
+    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,
+        obsOnlyDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: { ...postCommentUserReq, owner: 'observabilityFixture' },
+        auth: secOnlyDefaultSpaceAuth,
+        expectedHttpCode: 403,
+      });
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      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,
+          superUserDefaultSpaceAuth
+        );
+
+        await createComment({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          params: postCommentUserReq,
+          auth: { user, space: null },
+          expectedHttpCode: 403,
+        });
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const postedCase = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest({ owner: 'securitySolutionFixture' }),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await createComment({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/configure/get_configure.ts b/x-pack/test/case_api_integration/security_only/tests/common/configure/get_configure.ts
new file mode 100644
index 0000000000000..0a8b3ebd8981e
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/configure/get_configure.ts
@@ -0,0 +1,195 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+  deleteConfiguration,
+  getConfiguration,
+  createConfiguration,
+  getConfigurationRequest,
+  ensureSavedObjectIsAuthorized,
+} from '../../../../common/lib/utils';
+import {
+  secOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  secOnlyReadSpacesAll,
+  noKibanaPrivileges,
+  superUser,
+  globalRead,
+  obsSecReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import {
+  obsOnlyDefaultSpaceAuth,
+  obsSecDefaultSpaceAuth,
+  secOnlyDefaultSpaceAuth,
+  superUserDefaultSpaceAuth,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('get_configure', () => {
+    afterEach(async () => {
+      await deleteConfiguration(es);
+    });
+
+    it('should return the correct configuration', async () => {
+      await createConfiguration(
+        supertestWithoutAuth,
+        getConfigurationRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      await createConfiguration(
+        supertestWithoutAuth,
+        { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+        200,
+        obsOnlyDefaultSpaceAuth
+      );
+
+      for (const scenario of [
+        {
+          user: globalRead,
+          numberOfExpectedCases: 2,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+        },
+        {
+          user: superUser,
+          numberOfExpectedCases: 2,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+        },
+        {
+          user: secOnlyReadSpacesAll,
+          numberOfExpectedCases: 1,
+          owners: ['securitySolutionFixture'],
+        },
+        {
+          user: obsOnlyReadSpacesAll,
+          numberOfExpectedCases: 1,
+          owners: ['observabilityFixture'],
+        },
+        {
+          user: obsSecReadSpacesAll,
+          numberOfExpectedCases: 2,
+          owners: ['securitySolutionFixture', 'observabilityFixture'],
+        },
+      ]) {
+        const configuration = await getConfiguration({
+          supertest: supertestWithoutAuth,
+          query: { owner: scenario.owners },
+          expectedHttpCode: 200,
+          auth: {
+            user: scenario.user,
+            space: null,
+          },
+        });
+
+        ensureSavedObjectIsAuthorized(
+          configuration,
+          scenario.numberOfExpectedCases,
+          scenario.owners
+        );
+      }
+    });
+
+    it(`User ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()} - should NOT read a case configuration`, async () => {
+      // super user creates a configuration at the appropriate space
+      await createConfiguration(
+        supertestWithoutAuth,
+        getConfigurationRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      // user should not be able to read configurations at the appropriate space
+      await getConfiguration({
+        supertest: supertestWithoutAuth,
+        expectedHttpCode: 403,
+        auth: {
+          user: noKibanaPrivileges,
+          space: null,
+        },
+      });
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      await createConfiguration(
+        supertestWithoutAuth,
+        getConfigurationRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await getConfiguration({
+        supertest: supertestWithoutAuth,
+        expectedHttpCode: 404,
+        auth: {
+          user: secOnlySpacesAll,
+          space: 'space1',
+        },
+      });
+    });
+
+    it('should respect the owner filter when having permissions', async () => {
+      await Promise.all([
+        createConfiguration(
+          supertestWithoutAuth,
+          getConfigurationRequest(),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+        createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      const res = await getConfiguration({
+        supertest: supertestWithoutAuth,
+        query: { owner: 'securitySolutionFixture' },
+        auth: obsSecDefaultSpaceAuth,
+      });
+
+      ensureSavedObjectIsAuthorized(res, 1, ['securitySolutionFixture']);
+    });
+
+    it('should return the correct cases when trying to exploit RBAC through the owner query parameter', async () => {
+      await Promise.all([
+        createConfiguration(
+          supertestWithoutAuth,
+          getConfigurationRequest(),
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+        createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+          200,
+          obsSecDefaultSpaceAuth
+        ),
+      ]);
+
+      // User with permissions only to security solution request cases from observability
+      const res = await getConfiguration({
+        supertest: supertestWithoutAuth,
+        query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+        auth: secOnlyDefaultSpaceAuth,
+      });
+
+      // Only security solution cases are being returned
+      ensureSavedObjectIsAuthorized(res, 1, ['securitySolutionFixture']);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/configure/patch_configure.ts b/x-pack/test/case_api_integration/security_only/tests/common/configure/patch_configure.ts
new file mode 100644
index 0000000000000..eb1fa01221ae8
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/configure/patch_configure.ts
@@ -0,0 +1,140 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+
+import {
+  getConfigurationRequest,
+  deleteConfiguration,
+  createConfiguration,
+  updateConfiguration,
+} from '../../../../common/lib/utils';
+import {
+  secOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  secOnlyReadSpacesAll,
+  noKibanaPrivileges,
+  globalRead,
+  obsSecReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import { secOnlyDefaultSpaceAuth, superUserDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('patch_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('User: security solution only - should update a configuration', async () => {
+      const configuration = await createConfiguration(
+        supertestWithoutAuth,
+        getConfigurationRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      const newConfiguration = await updateConfiguration(
+        supertestWithoutAuth,
+        configuration.id,
+        {
+          closure_type: 'close-by-pushing',
+          version: configuration.version,
+        },
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      expect(newConfiguration.owner).to.eql('securitySolutionFixture');
+    });
+
+    it('User: security solution only - should NOT update a configuration of different owner', async () => {
+      const configuration = await createConfiguration(
+        supertestWithoutAuth,
+        { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await updateConfiguration(
+        supertestWithoutAuth,
+        configuration.id,
+        {
+          closure_type: 'close-by-pushing',
+          version: configuration.version,
+        },
+        403,
+        secOnlyDefaultSpaceAuth
+      );
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT update a configuration`, async () => {
+        const configuration = await createConfiguration(
+          supertestWithoutAuth,
+          getConfigurationRequest(),
+          200,
+          superUserDefaultSpaceAuth
+        );
+
+        await updateConfiguration(
+          supertestWithoutAuth,
+          configuration.id,
+          {
+            closure_type: 'close-by-pushing',
+            version: configuration.version,
+          },
+          403,
+          {
+            user,
+            space: null,
+          }
+        );
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const configuration = await createConfiguration(
+        supertestWithoutAuth,
+        { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await updateConfiguration(
+        supertestWithoutAuth,
+        configuration.id,
+        {
+          closure_type: 'close-by-pushing',
+          version: configuration.version,
+        },
+        404,
+        {
+          user: secOnlySpacesAll,
+          space: 'space1',
+        }
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/configure/post_configure.ts b/x-pack/test/case_api_integration/security_only/tests/common/configure/post_configure.ts
new file mode 100644
index 0000000000000..b3de6ec0487bb
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/configure/post_configure.ts
@@ -0,0 +1,133 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+
+import {
+  getConfigurationRequest,
+  deleteConfiguration,
+  createConfiguration,
+  getConfiguration,
+  ensureSavedObjectIsAuthorized,
+} from '../../../../common/lib/utils';
+
+import {
+  secOnlySpacesAll,
+  obsOnlyReadSpacesAll,
+  secOnlyReadSpacesAll,
+  noKibanaPrivileges,
+  globalRead,
+  obsSecReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import { secOnlyDefaultSpaceAuth, superUserDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const supertestWithoutAuth = getService('supertestWithoutAuth');
+  const es = getService('es');
+
+  describe('post_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('User: security solution only - should create a configuration', async () => {
+      const configuration = await createConfiguration(
+        supertestWithoutAuth,
+        getConfigurationRequest(),
+        200,
+        secOnlyDefaultSpaceAuth
+      );
+
+      expect(configuration.owner).to.eql('securitySolutionFixture');
+    });
+
+    it('User: security solution only - should NOT create a configuration of different owner', async () => {
+      await createConfiguration(
+        supertestWithoutAuth,
+        { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+        403,
+        secOnlyDefaultSpaceAuth
+      );
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT create a configuration`, async () => {
+        await createConfiguration(
+          supertestWithoutAuth,
+          { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+          403,
+          {
+            user,
+            space: null,
+          }
+        );
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      await createConfiguration(
+        supertestWithoutAuth,
+        { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+        404,
+        {
+          user: secOnlySpacesAll,
+          space: 'space1',
+        }
+      );
+    });
+
+    it('it deletes the correct configurations', async () => {
+      await createConfiguration(
+        supertestWithoutAuth,
+        { ...getConfigurationRequest(), owner: 'securitySolutionFixture' },
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      /**
+       * This API call should not delete the previously created configuration
+       * as it belongs to a different owner
+       */
+      await createConfiguration(
+        supertestWithoutAuth,
+        { ...getConfigurationRequest(), owner: 'observabilityFixture' },
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      const configuration = await getConfiguration({
+        supertest: supertestWithoutAuth,
+        query: { owner: ['securitySolutionFixture', 'observabilityFixture'] },
+        auth: superUserDefaultSpaceAuth,
+      });
+
+      /**
+       * This ensures that both configuration are returned as expected
+       * and neither of has been deleted
+       */
+      ensureSavedObjectIsAuthorized(configuration, 2, [
+        'securitySolutionFixture',
+        'observabilityFixture',
+      ]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/index.ts b/x-pack/test/case_api_integration/security_only/tests/common/index.ts
new file mode 100644
index 0000000000000..7dd6dd4e22711
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/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 { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('Common', function () {
+    loadTestFile(require.resolve('./comments/delete_comment'));
+    loadTestFile(require.resolve('./comments/find_comments'));
+    loadTestFile(require.resolve('./comments/get_comment'));
+    loadTestFile(require.resolve('./comments/get_all_comments'));
+    loadTestFile(require.resolve('./comments/patch_comment'));
+    loadTestFile(require.resolve('./comments/post_comment'));
+    loadTestFile(require.resolve('./alerts/get_cases'));
+    loadTestFile(require.resolve('./cases/delete_cases'));
+    loadTestFile(require.resolve('./cases/find_cases'));
+    loadTestFile(require.resolve('./cases/get_case'));
+    loadTestFile(require.resolve('./cases/patch_cases'));
+    loadTestFile(require.resolve('./cases/post_case'));
+    loadTestFile(require.resolve('./cases/reporters/get_reporters'));
+    loadTestFile(require.resolve('./cases/status/get_status'));
+    loadTestFile(require.resolve('./cases/tags/get_tags'));
+    loadTestFile(require.resolve('./user_actions/get_all_user_actions'));
+    loadTestFile(require.resolve('./configure/get_configure'));
+    loadTestFile(require.resolve('./configure/patch_configure'));
+    loadTestFile(require.resolve('./configure/post_configure'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/common/user_actions/get_all_user_actions.ts b/x-pack/test/case_api_integration/security_only/tests/common/user_actions/get_all_user_actions.ts
new file mode 100644
index 0000000000000..bd36ce1b0d9d6
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/common/user_actions/get_all_user_actions.ts
@@ -0,0 +1,104 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { CaseResponse, CaseStatuses } from '../../../../../../plugins/cases/common/api';
+import { getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  updateCase,
+  getCaseUserActions,
+} from '../../../../common/lib/utils';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsSecSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+  superUser,
+} from '../../../../common/lib/authentication/users';
+import { superUserDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const es = getService('es');
+
+  describe('get_all_user_actions', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    let caseInfo: CaseResponse;
+    beforeEach(async () => {
+      caseInfo = await createCase(
+        supertestWithoutAuth,
+        getPostCaseRequest(),
+        200,
+        superUserDefaultSpaceAuth
+      );
+
+      await updateCase({
+        supertest: supertestWithoutAuth,
+        params: {
+          cases: [
+            {
+              id: caseInfo.id,
+              version: caseInfo.version,
+              status: CaseStatuses.closed,
+            },
+          ],
+        },
+        auth: superUserDefaultSpaceAuth,
+      });
+    });
+
+    it('should get the user actions for a case when the user has the correct permissions', async () => {
+      for (const user of [
+        globalRead,
+        superUser,
+        secOnlySpacesAll,
+        secOnlyReadSpacesAll,
+        obsSecSpacesAll,
+        obsSecReadSpacesAll,
+      ]) {
+        const userActions = await getCaseUserActions({
+          supertest: supertestWithoutAuth,
+          caseID: caseInfo.id,
+          auth: { user, space: null },
+        });
+
+        expect(userActions.length).to.eql(2);
+      }
+    });
+
+    it(`should 403 when requesting the user actions of a case with user ${
+      noKibanaPrivileges.username
+    } with role(s) ${noKibanaPrivileges.roles.join()}`, async () => {
+      await getCaseUserActions({
+        supertest: supertestWithoutAuth,
+        caseID: caseInfo.id,
+        auth: { user: noKibanaPrivileges, space: null },
+        expectedHttpCode: 403,
+      });
+    });
+
+    it('should return a 404 when attempting to access a space', async () => {
+      await getCaseUserActions({
+        supertest: supertestWithoutAuth,
+        caseID: caseInfo.id,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/trial/cases/push_case.ts b/x-pack/test/case_api_integration/security_only/tests/trial/cases/push_case.ts
new file mode 100644
index 0000000000000..6294400281b92
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/trial/cases/push_case.ts
@@ -0,0 +1,128 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+
+import { getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  pushCase,
+  deleteAllCaseItems,
+  createCaseWithConnector,
+} from '../../../../common/lib/utils';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+import {
+  globalRead,
+  noKibanaPrivileges,
+  obsOnlyReadSpacesAll,
+  obsSecReadSpacesAll,
+  secOnlySpacesAll,
+  secOnlyReadSpacesAll,
+} from '../../../../common/lib/authentication/users';
+import { secOnlyDefaultSpaceAuth } from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+  const es = getService('es');
+
+  describe('push_case', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+      await actionsRemover.removeAll();
+    });
+
+    const supertestWithoutAuth = getService('supertestWithoutAuth');
+
+    it('should push a case that the user has permissions for', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+      });
+
+      await pushCase({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+        auth: secOnlyDefaultSpaceAuth,
+      });
+    });
+
+    it('should not push a case that the user does not have permissions for', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+        createCaseReq: getPostCaseRequest({ owner: 'observabilityFixture' }),
+      });
+
+      await pushCase({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+        auth: secOnlyDefaultSpaceAuth,
+        expectedHttpCode: 403,
+      });
+    });
+
+    for (const user of [
+      globalRead,
+      secOnlyReadSpacesAll,
+      obsOnlyReadSpacesAll,
+      obsSecReadSpacesAll,
+      noKibanaPrivileges,
+    ]) {
+      it(`User ${
+        user.username
+      } with role(s) ${user.roles.join()} - should NOT push a case`, async () => {
+        const { postedCase, connector } = await createCaseWithConnector({
+          supertest,
+          servicenowSimulatorURL,
+          actionsRemover,
+        });
+
+        await pushCase({
+          supertest: supertestWithoutAuth,
+          caseId: postedCase.id,
+          connectorId: connector.id,
+          auth: { user, space: null },
+          expectedHttpCode: 403,
+        });
+      });
+    }
+
+    it('should return a 404 when attempting to access a space', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+      });
+
+      await pushCase({
+        supertest: supertestWithoutAuth,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+        auth: { user: secOnlySpacesAll, space: 'space1' },
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/tests/trial/index.ts b/x-pack/test/case_api_integration/security_only/tests/trial/index.ts
new file mode 100644
index 0000000000000..86a44459a5837
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/tests/trial/index.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 { rolesDefaultSpace } from '../../../common/lib/authentication/roles';
+import { usersDefaultSpace } from '../../../common/lib/authentication/users';
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import { createUsersAndRoles, deleteUsersAndRoles } from '../../../common/lib/authentication';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile, getService }: FtrProviderContext): void => {
+  describe('cases security only enabled: trial', function () {
+    // Fastest ciGroup for the moment.
+    this.tags('ciGroup5');
+
+    before(async () => {
+      // since spaces are disabled this changes each role to have access to all available spaces (it'll just be the default one)
+      await createUsersAndRoles(getService, usersDefaultSpace, rolesDefaultSpace);
+    });
+
+    after(async () => {
+      await deleteUsersAndRoles(getService, usersDefaultSpace, rolesDefaultSpace);
+    });
+
+    // Trial
+    loadTestFile(require.resolve('./cases/push_case'));
+
+    // Common
+    loadTestFile(require.resolve('../common'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/security_only/utils.ts b/x-pack/test/case_api_integration/security_only/utils.ts
new file mode 100644
index 0000000000000..7c5764c558bbe
--- /dev/null
+++ b/x-pack/test/case_api_integration/security_only/utils.ts
@@ -0,0 +1,18 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import {
+  obsOnlySpacesAll,
+  obsSecSpacesAll,
+  secOnlySpacesAll,
+} from '../common/lib/authentication/users';
+import { getAuthWithSuperUser } from '../common/lib/utils';
+
+export const secOnlyDefaultSpaceAuth = { user: secOnlySpacesAll, space: null };
+export const obsOnlyDefaultSpaceAuth = { user: obsOnlySpacesAll, space: null };
+export const obsSecDefaultSpaceAuth = { user: obsSecSpacesAll, space: null };
+export const superUserDefaultSpaceAuth = getAuthWithSuperUser(null);
diff --git a/x-pack/test/case_api_integration/spaces_only/config.ts b/x-pack/test/case_api_integration/spaces_only/config.ts
new file mode 100644
index 0000000000000..53cfdb6f9285d
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/config.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 { createTestConfig } from '../common/config';
+
+// eslint-disable-next-line import/no-default-export
+export default createTestConfig('spaces_only', {
+  disabledPlugins: ['security'],
+  license: 'trial',
+  ssl: false,
+  testFiles: [require.resolve('./tests/trial')],
+});
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/alerts/get_cases.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/alerts/get_cases.ts
new file mode 100644
index 0000000000000..9587502fb642c
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/alerts/get_cases.ts
@@ -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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest, postCommentAlertReq } from '../../../../common/lib/mock';
+import {
+  createCase,
+  createComment,
+  getCaseIDsByAlert,
+  deleteAllCaseItems,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+  const authSpace2 = getAuthWithSuperUser('space2');
+
+  describe('get_cases using alertID', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should return all cases with the same alert ID attached to them in space1', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(supertest, getPostCaseRequest(), 200, authSpace1),
+        createCase(supertest, getPostCaseRequest(), 200, authSpace1),
+        createCase(supertest, getPostCaseRequest(), 200, authSpace1),
+      ]);
+
+      await Promise.all([
+        createComment({
+          supertest,
+          caseId: case1.id,
+          params: postCommentAlertReq,
+          auth: authSpace1,
+        }),
+        createComment({
+          supertest,
+          caseId: case2.id,
+          params: postCommentAlertReq,
+          auth: authSpace1,
+        }),
+        createComment({
+          supertest,
+          caseId: case3.id,
+          params: postCommentAlertReq,
+          auth: authSpace1,
+        }),
+      ]);
+
+      const caseIDsWithAlert = await getCaseIDsByAlert({
+        supertest,
+        alertID: 'test-id',
+        auth: authSpace1,
+      });
+
+      expect(caseIDsWithAlert.length).to.eql(3);
+      expect(caseIDsWithAlert).to.contain(case1.id);
+      expect(caseIDsWithAlert).to.contain(case2.id);
+      expect(caseIDsWithAlert).to.contain(case3.id);
+    });
+
+    it('should return 1 case in space2 when 2 cases were created in space1 and 1 in space2', async () => {
+      const [case1, case2, case3] = await Promise.all([
+        createCase(supertest, getPostCaseRequest(), 200, authSpace1),
+        createCase(supertest, getPostCaseRequest(), 200, authSpace1),
+        createCase(supertest, getPostCaseRequest(), 200, authSpace2),
+      ]);
+
+      await Promise.all([
+        createComment({
+          supertest,
+          caseId: case1.id,
+          params: postCommentAlertReq,
+          auth: authSpace1,
+        }),
+        createComment({
+          supertest,
+          caseId: case2.id,
+          params: postCommentAlertReq,
+          auth: authSpace1,
+        }),
+        createComment({
+          supertest,
+          caseId: case3.id,
+          params: postCommentAlertReq,
+          auth: authSpace2,
+        }),
+      ]);
+
+      const caseIDsWithAlert = await getCaseIDsByAlert({
+        supertest,
+        alertID: 'test-id',
+        auth: authSpace2,
+      });
+
+      expect(caseIDsWithAlert.length).to.eql(1);
+      expect(caseIDsWithAlert).to.eql([case3.id]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/delete_cases.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/delete_cases.ts
new file mode 100644
index 0000000000000..9de57a1b7abe2
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/delete_cases.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  deleteCases,
+  getCase,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('delete_cases', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should delete a case in space1', async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      const body = await deleteCases({ supertest, caseIDs: [postedCase.id], auth: authSpace1 });
+
+      await getCase({ supertest, caseId: postedCase.id, expectedHttpCode: 404, auth: authSpace1 });
+      expect(body).to.eql({});
+    });
+
+    it('should not delete a case in a different space', async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      await deleteCases({
+        supertest,
+        caseIDs: [postedCase.id],
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+
+      // the case should still be there
+      const caseInfo = await getCase({ supertest, caseId: postedCase.id, auth: authSpace1 });
+      expect(caseInfo.id).to.eql(postedCase.id);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/find_cases.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/find_cases.ts
new file mode 100644
index 0000000000000..6513fe25b28e9
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/find_cases.ts
@@ -0,0 +1,63 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { postCaseReq, findCasesResp } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  findCases,
+  createCase,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('find_cases', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should return 3 cases in space1', async () => {
+      const a = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const b = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const c = await createCase(supertest, postCaseReq, 200, authSpace1);
+
+      const cases = await findCases({ supertest, auth: authSpace1 });
+
+      expect(cases).to.eql({
+        ...findCasesResp,
+        total: 3,
+        cases: [a, b, c],
+        count_open_cases: 3,
+      });
+    });
+
+    it('should return 1 case in space2 when 2 cases were created in space1 and 1 in space2', async () => {
+      const authSpace2 = getAuthWithSuperUser('space2');
+      const [, , space2Case] = await Promise.all([
+        createCase(supertest, postCaseReq, 200, authSpace1),
+        createCase(supertest, postCaseReq, 200, authSpace1),
+        createCase(supertest, postCaseReq, 200, authSpace2),
+      ]);
+
+      const cases = await findCases({ supertest, auth: authSpace2 });
+
+      expect(cases).to.eql({
+        ...findCasesResp,
+        total: 1,
+        cases: [space2Case],
+        count_open_cases: 1,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/get_case.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/get_case.ts
new file mode 100644
index 0000000000000..3ea6fac3772ed
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/get_case.ts
@@ -0,0 +1,49 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { postCaseResp, getPostCaseRequest, nullUser } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  createCase,
+  getCase,
+  removeServerGeneratedPropertiesFromCase,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('get_case', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should return a case in space1', async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      const theCase = await getCase({ supertest, caseId: postedCase.id, auth: authSpace1 });
+
+      const data = removeServerGeneratedPropertiesFromCase(theCase);
+      expect(data).to.eql({ ...postCaseResp(), created_by: nullUser });
+    });
+
+    it('should not return a case in the wrong space', async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      await getCase({
+        supertest,
+        caseId: postedCase.id,
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/patch_cases.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/patch_cases.ts
new file mode 100644
index 0000000000000..361358dc40604
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/patch_cases.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { nullUser, postCaseReq, postCaseResp } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  updateCase,
+  removeServerGeneratedPropertiesFromCase,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('patch_cases', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should patch a case in space1', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCases = await updateCase({
+        supertest,
+        params: {
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              title: 'new title',
+            },
+          ],
+        },
+        auth: authSpace1,
+      });
+
+      const data = removeServerGeneratedPropertiesFromCase(patchedCases[0]);
+      expect(data).to.eql({
+        ...postCaseResp(),
+        title: 'new title',
+        updated_by: nullUser,
+        created_by: nullUser,
+      });
+    });
+
+    it('should not patch a case in a different space', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      await updateCase({
+        supertest,
+        params: {
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              title: 'new title',
+            },
+          ],
+        },
+        expectedHttpCode: 404,
+        auth: getAuthWithSuperUser('space2'),
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/post_case.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/post_case.ts
new file mode 100644
index 0000000000000..1fc70b0f97f5d
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/post_case.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 expect from '@kbn/expect';
+
+import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { getPostCaseRequest, nullUser, postCaseResp } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  createCase,
+  removeServerGeneratedPropertiesFromCase,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('post_case', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should post a case in space1', async () => {
+      const postedCase = await createCase(
+        supertest,
+        getPostCaseRequest({
+          connector: {
+            id: '123',
+            name: 'Jira',
+            type: ConnectorTypes.jira,
+            fields: { issueType: 'Task', priority: 'High', parent: null },
+          },
+        }),
+        200,
+        authSpace1
+      );
+      const data = removeServerGeneratedPropertiesFromCase(postedCase);
+
+      expect(data).to.eql({
+        ...postCaseResp(
+          null,
+          getPostCaseRequest({
+            connector: {
+              id: '123',
+              name: 'Jira',
+              type: ConnectorTypes.jira,
+              fields: { issueType: 'Task', priority: 'High', parent: null },
+            },
+          })
+        ),
+        created_by: nullUser,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/reporters/get_reporters.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/reporters/get_reporters.ts
new file mode 100644
index 0000000000000..d3c3176f4649f
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/reporters/get_reporters.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest } from '../../../../../common/lib/mock';
+import {
+  createCase,
+  deleteCasesByESQuery,
+  getAuthWithSuperUser,
+  getReporters,
+} from '../../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+  const authSpace2 = getAuthWithSuperUser('space2');
+
+  describe('get_reporters', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should not return reporters when security is disabled', async () => {
+      await Promise.all([
+        createCase(supertest, getPostCaseRequest(), 200, authSpace2),
+        createCase(supertest, getPostCaseRequest(), 200, authSpace1),
+      ]);
+
+      const reportersSpace1 = await getReporters({ supertest, auth: authSpace1 });
+      const reportersSpace2 = await getReporters({
+        supertest,
+        auth: authSpace2,
+      });
+
+      expect(reportersSpace1).to.eql([]);
+      expect(reportersSpace2).to.eql([]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/status/get_status.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/status/get_status.ts
new file mode 100644
index 0000000000000..7f2a774c28f39
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/status/get_status.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+
+import { CaseStatuses } from '../../../../../../../plugins/cases/common/api';
+import { postCaseReq } from '../../../../../common/lib/mock';
+import {
+  createCase,
+  updateCase,
+  getAllCasesStatuses,
+  deleteAllCaseItems,
+  getAuthWithSuperUser,
+} from '../../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+  const authSpace2 = getAuthWithSuperUser('space2');
+
+  describe('get_status', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should return case statuses in space1', async () => {
+      /**
+       * space1:
+       *  open: 1
+       *  in progress: 1
+       *  closed: 0
+       * space2:
+       *  closed: 1
+       */
+      const [, inProgressCase, postedCase] = await Promise.all([
+        createCase(supertest, postCaseReq, 200, authSpace1),
+        createCase(supertest, postCaseReq, 200, authSpace1),
+        createCase(supertest, postCaseReq, 200, authSpace2),
+      ]);
+
+      await updateCase({
+        supertest,
+        params: {
+          cases: [
+            {
+              id: inProgressCase.id,
+              version: inProgressCase.version,
+              status: CaseStatuses['in-progress'],
+            },
+          ],
+        },
+        auth: authSpace1,
+      });
+
+      await updateCase({
+        supertest,
+        params: {
+          cases: [
+            {
+              id: postedCase.id,
+              version: postedCase.version,
+              status: CaseStatuses.closed,
+            },
+          ],
+        },
+        auth: authSpace2,
+      });
+
+      const statusesSpace1 = await getAllCasesStatuses({ supertest, auth: authSpace1 });
+      const statusesSpace2 = await getAllCasesStatuses({ supertest, auth: authSpace2 });
+
+      expect(statusesSpace1).to.eql({
+        count_open_cases: 1,
+        count_closed_cases: 0,
+        count_in_progress_cases: 1,
+      });
+
+      expect(statusesSpace2).to.eql({
+        count_open_cases: 0,
+        count_closed_cases: 1,
+        count_in_progress_cases: 0,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/cases/tags/get_tags.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/tags/get_tags.ts
new file mode 100644
index 0000000000000..630628a13b6b9
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/cases/tags/get_tags.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+
+import {
+  deleteCasesByESQuery,
+  createCase,
+  getTags,
+  getAuthWithSuperUser,
+} from '../../../../../common/lib/utils';
+import { getPostCaseRequest } from '../../../../../common/lib/mock';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+  const authSpace2 = getAuthWithSuperUser('space2');
+
+  describe('get_tags', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+    });
+
+    it('should return case tags in space1', async () => {
+      await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      await createCase(supertest, getPostCaseRequest({ tags: ['unique'] }), 200, authSpace2);
+
+      const tagsSpace1 = await getTags({ supertest, auth: authSpace1 });
+      const tagsSpace2 = await getTags({ supertest, auth: authSpace2 });
+
+      expect(tagsSpace1).to.eql(['defacement']);
+      expect(tagsSpace2).to.eql(['unique']);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/comments/delete_comment.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/delete_comment.ts
new file mode 100644
index 0000000000000..7e5abeb7edc2f
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/delete_comment.ts
@@ -0,0 +1,72 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+  deleteComment,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('delete_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should delete a comment from space1', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      const comment = await deleteComment({
+        supertest,
+        caseId: postedCase.id,
+        commentId: patchedCase.comments![0].id,
+        auth: authSpace1,
+      });
+
+      expect(comment).to.eql({});
+    });
+
+    it('should not delete a comment from a different space', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      await deleteComment({
+        supertest,
+        caseId: postedCase.id,
+        commentId: patchedCase.comments![0].id,
+        expectedHttpCode: 404,
+        auth: getAuthWithSuperUser('space2'),
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/comments/find_comments.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/find_comments.ts
new file mode 100644
index 0000000000000..4df4c560413e8
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/find_comments.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { CASES_URL } from '../../../../../../plugins/cases/common/constants';
+import { getPostCaseRequest, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  createComment,
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  getSpaceUrlPrefix,
+  createCase,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('find_comments', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should find all case comments in space1', async () => {
+      const caseInfo = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      await createComment({
+        supertest,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      const patchedCase = await createComment({
+        supertest,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      const { body: caseComments } = await supertest
+        .get(`${getSpaceUrlPrefix(authSpace1.space)}${CASES_URL}/${caseInfo.id}/comments/_find`)
+        .expect(200);
+
+      expect(caseComments.comments).to.eql(patchedCase.comments);
+    });
+
+    it('should not find any case comments in space2', async () => {
+      const caseInfo = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      await createComment({
+        supertest,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      await createComment({
+        supertest,
+        caseId: caseInfo.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      const { body: caseComments } = await supertest
+        .get(`${getSpaceUrlPrefix('space2')}${CASES_URL}/${caseInfo.id}/comments/_find`)
+        .expect(200);
+
+      expect(caseComments.comments.length).to.eql(0);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/comments/get_all_comments.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/get_all_comments.ts
new file mode 100644
index 0000000000000..ea3766b733cdc
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/get_all_comments.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  createComment,
+  getAllComments,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('get_all_comments', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should get multiple comments for a single case in space1', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+      await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+      const comments = await getAllComments({ supertest, caseId: postedCase.id, auth: authSpace1 });
+
+      expect(comments.length).to.eql(2);
+    });
+
+    it('should not find any comments in space2', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+      await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+      const comments = await getAllComments({
+        supertest,
+        caseId: postedCase.id,
+        auth: getAuthWithSuperUser('space2'),
+      });
+
+      expect(comments.length).to.eql(0);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/comments/get_comment.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/get_comment.ts
new file mode 100644
index 0000000000000..048700993087d
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/get_comment.ts
@@ -0,0 +1,66 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  createComment,
+  getComment,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('get_comment', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it('should get a comment in space1', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+      const comment = await getComment({
+        supertest,
+        caseId: postedCase.id,
+        commentId: patchedCase.comments![0].id,
+        auth: authSpace1,
+      });
+
+      expect(comment).to.eql(patchedCase.comments![0]);
+    });
+
+    it('should not get a comment in space2 when it was created in space1', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+      await getComment({
+        supertest,
+        caseId: postedCase.id,
+        commentId: patchedCase.comments![0].id,
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/comments/patch_comment.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/patch_comment.ts
new file mode 100644
index 0000000000000..452d05c9c2362
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/patch_comment.ts
@@ -0,0 +1,90 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../common/ftr_provider_context';
+
+import { AttributesTypeUser, CommentType } from '../../../../../../plugins/cases/common/api';
+import { nullUser, postCaseReq, postCommentUserReq } from '../../../../common/lib/mock';
+import {
+  deleteCasesByESQuery,
+  deleteCasesUserActions,
+  deleteComments,
+  createCase,
+  createComment,
+  updateComment,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('patch_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should patch a comment in space1', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      const updatedCase = await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          comment: newComment,
+          type: CommentType.user,
+          owner: 'securitySolutionFixture',
+        },
+        auth: authSpace1,
+      });
+
+      const userComment = updatedCase.comments![0] as AttributesTypeUser;
+      expect(userComment.comment).to.eql(newComment);
+      expect(userComment.type).to.eql(CommentType.user);
+      expect(updatedCase.updated_by).to.eql(nullUser);
+    });
+
+    it('should not patch a comment in a different space', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCase = await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: authSpace1,
+      });
+
+      const newComment = 'Well I decided to update my comment. So what? Deal with it.';
+      await updateComment({
+        supertest,
+        caseId: postedCase.id,
+        req: {
+          id: patchedCase.comments![0].id,
+          version: patchedCase.comments![0].version,
+          comment: newComment,
+          type: CommentType.user,
+          owner: 'securitySolutionFixture',
+        },
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/comments/post_comment.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/post_comment.ts
new file mode 100644
index 0000000000000..45175e8dafb04
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/comments/post_comment.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+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,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('post_comment', () => {
+    afterEach(async () => {
+      await deleteCasesByESQuery(es);
+      await deleteComments(es);
+      await deleteCasesUserActions(es);
+    });
+
+    it('should post a comment in space1', async () => {
+      const postedCase = await createCase(supertest, postCaseReq, 200, authSpace1);
+      const patchedCase = await createComment({
+        supertest,
+        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,
+        associationType: 'case',
+        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(supertest, postCaseReq, 200, authSpace1);
+      await createComment({
+        supertest,
+        caseId: postedCase.id,
+        params: postCommentUserReq,
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/configure/get_configure.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/configure/get_configure.ts
new file mode 100644
index 0000000000000..573b96d71af4a
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/configure/get_configure.ts
@@ -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 expect from '@kbn/expect';
+import { nullUser } from '../../../../common/lib/mock';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  getConfiguration,
+  createConfiguration,
+  getConfigurationRequest,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('get_configure', () => {
+    afterEach(async () => {
+      await deleteConfiguration(es);
+    });
+
+    it('should return a configuration in space1', async () => {
+      await createConfiguration(supertest, getConfigurationRequest(), 200, authSpace1);
+      const configuration = await getConfiguration({ supertest, auth: authSpace1 });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(configuration[0]);
+      expect(data).to.eql(getConfigurationOutput(false, { created_by: nullUser }));
+    });
+
+    it('should not find a configuration when looking in a different space', async () => {
+      await createConfiguration(supertest, getConfigurationRequest(), 200, authSpace1);
+      const configuration = await getConfiguration({
+        supertest,
+        auth: getAuthWithSuperUser('space2'),
+      });
+
+      expect(configuration).to.eql([]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/configure/patch_configure.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/configure/patch_configure.ts
new file mode 100644
index 0000000000000..f61e8698c1191
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/configure/patch_configure.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  updateConfiguration,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+import { nullUser } from '../../../../common/lib/mock';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('patch_configure', () => {
+    afterEach(async () => {
+      await deleteConfiguration(es);
+    });
+
+    it('should patch a configuration in space1', async () => {
+      const configuration = await createConfiguration(
+        supertest,
+        getConfigurationRequest(),
+        200,
+        authSpace1
+      );
+      const newConfiguration = await updateConfiguration(
+        supertest,
+        configuration.id,
+        {
+          closure_type: 'close-by-pushing',
+          version: configuration.version,
+        },
+        200,
+        authSpace1
+      );
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(newConfiguration);
+      expect(data).to.eql({
+        ...getConfigurationOutput(false, { created_by: nullUser, updated_by: nullUser }),
+        closure_type: 'close-by-pushing',
+      });
+    });
+
+    it('should not patch a configuration in a different space', async () => {
+      const configuration = await createConfiguration(
+        supertest,
+        getConfigurationRequest(),
+        200,
+        authSpace1
+      );
+      await updateConfiguration(
+        supertest,
+        configuration.id,
+        {
+          closure_type: 'close-by-pushing',
+          version: configuration.version,
+        },
+        404,
+        getAuthWithSuperUser('space2')
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/configure/post_configure.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/configure/post_configure.ts
new file mode 100644
index 0000000000000..161075616925c
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/configure/post_configure.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+import { nullUser } from '../../../../common/lib/mock';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('post_configure', () => {
+    afterEach(async () => {
+      await deleteConfiguration(es);
+    });
+
+    it('should create a configuration in space1', async () => {
+      const configuration = await createConfiguration(
+        supertest,
+        getConfigurationRequest(),
+        200,
+        authSpace1
+      );
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(configuration);
+      expect(data).to.eql(getConfigurationOutput(false, { created_by: nullUser }));
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/index.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/index.ts
new file mode 100644
index 0000000000000..251a545f10681
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/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 { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('Common', function () {
+    loadTestFile(require.resolve('./alerts/get_cases'));
+    loadTestFile(require.resolve('./comments/delete_comment'));
+    loadTestFile(require.resolve('./comments/find_comments'));
+    loadTestFile(require.resolve('./comments/get_comment'));
+    loadTestFile(require.resolve('./comments/get_all_comments'));
+    loadTestFile(require.resolve('./comments/patch_comment'));
+    loadTestFile(require.resolve('./comments/post_comment'));
+    loadTestFile(require.resolve('./cases/delete_cases'));
+    loadTestFile(require.resolve('./cases/find_cases'));
+    loadTestFile(require.resolve('./cases/get_case'));
+    loadTestFile(require.resolve('./cases/patch_cases'));
+    loadTestFile(require.resolve('./cases/post_case'));
+    loadTestFile(require.resolve('./cases/reporters/get_reporters'));
+    loadTestFile(require.resolve('./cases/status/get_status'));
+    loadTestFile(require.resolve('./cases/tags/get_tags'));
+    loadTestFile(require.resolve('./user_actions/get_all_user_actions'));
+    loadTestFile(require.resolve('./configure/get_configure'));
+    loadTestFile(require.resolve('./configure/patch_configure'));
+    loadTestFile(require.resolve('./configure/post_configure'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/common/user_actions/get_all_user_actions.ts b/x-pack/test/case_api_integration/spaces_only/tests/common/user_actions/get_all_user_actions.ts
new file mode 100644
index 0000000000000..199e53ebd1bb5
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/common/user_actions/get_all_user_actions.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; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+import { getPostCaseRequest } from '../../../../common/lib/mock';
+import {
+  deleteAllCaseItems,
+  createCase,
+  getCaseUserActions,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('get_all_user_actions', () => {
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+    });
+
+    it(`should get user actions in space1`, async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      const body = await getCaseUserActions({ supertest, caseID: postedCase.id, auth: authSpace1 });
+
+      expect(body.length).to.eql(1);
+    });
+
+    it(`should not get user actions in the wrong space`, async () => {
+      const postedCase = await createCase(supertest, getPostCaseRequest(), 200, authSpace1);
+      const body = await getCaseUserActions({
+        supertest,
+        caseID: postedCase.id,
+        auth: getAuthWithSuperUser('space2'),
+      });
+
+      expect(body.length).to.eql(0);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/cases/push_case.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/cases/push_case.ts
new file mode 100644
index 0000000000000..28b7fe6095507
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/cases/push_case.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.
+ */
+
+/* eslint-disable @typescript-eslint/naming-convention */
+
+import expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+
+import { nullUser } from '../../../../common/lib/mock';
+import {
+  pushCase,
+  deleteAllCaseItems,
+  createCaseWithConnector,
+  getAuthWithSuperUser,
+} from '../../../../common/lib/utils';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const kibanaServer = getService('kibanaServer');
+  const es = getService('es');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('push_case', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await deleteAllCaseItems(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should push a case in space1', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+        auth: authSpace1,
+      });
+      const theCase = await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+        auth: authSpace1,
+      });
+
+      const { pushed_at, external_url, ...rest } = theCase.external_service!;
+
+      expect(rest).to.eql({
+        pushed_by: nullUser,
+        connector_id: connector.id,
+        connector_name: connector.name,
+        external_id: '123',
+        external_title: 'INC01',
+      });
+
+      // external_url is of the form http://elastic:changeme@localhost:5620 which is different between various environments like Jekins
+      expect(
+        external_url.includes(
+          'api/_actions-FTS-external-service-simulators/servicenow/nav_to.do?uri=incident.do?sys_id=123'
+        )
+      ).to.equal(true);
+    });
+
+    it('should not push a case in a different space', async () => {
+      const { postedCase, connector } = await createCaseWithConnector({
+        supertest,
+        servicenowSimulatorURL,
+        actionsRemover,
+        auth: authSpace1,
+      });
+      await pushCase({
+        supertest,
+        caseId: postedCase.id,
+        connectorId: connector.id,
+        auth: getAuthWithSuperUser('space2'),
+        expectedHttpCode: 404,
+      });
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_configure.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_configure.ts
new file mode 100644
index 0000000000000..a142e6470ae93
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_configure.ts
@@ -0,0 +1,135 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../../../common/ftr_provider_context';
+
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  getServiceNowConnector,
+  createConnector,
+  createConfiguration,
+  getConfiguration,
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  getAuthWithSuperUser,
+} 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
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const actionsRemover = new ActionsRemover(supertest);
+  const kibanaServer = getService('kibanaServer');
+  const authSpace1 = getAuthWithSuperUser();
+
+  describe('get_configure', () => {
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await actionsRemover.removeAll();
+    });
+
+    it('should return a configuration with a mapping from space1', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+        auth: authSpace1,
+      });
+      actionsRemover.add('space1', connector.id, 'action', 'actions');
+
+      await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+        }),
+        200,
+        authSpace1
+      );
+
+      const configuration = await getConfiguration({ supertest, auth: authSpace1 });
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(configuration[0]);
+      expect(data).to.eql(
+        getConfigurationOutput(false, {
+          mappings: [
+            {
+              action_type: 'overwrite',
+              source: 'title',
+              target: 'short_description',
+            },
+            {
+              action_type: 'overwrite',
+              source: 'description',
+              target: 'description',
+            },
+            {
+              action_type: 'append',
+              source: 'comments',
+              target: 'work_notes',
+            },
+          ],
+          connector: {
+            id: connector.id,
+            name: connector.name,
+            type: connector.connector_type_id,
+            fields: null,
+          },
+          created_by: nullUser,
+        })
+      );
+    });
+
+    it('should not return a configuration with a mapping from a different space', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+        auth: authSpace1,
+      });
+      actionsRemover.add('space1', connector.id, 'action', 'actions');
+
+      await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+        }),
+        200,
+        authSpace1
+      );
+
+      const configuration = await getConfiguration({
+        supertest,
+        auth: getAuthWithSuperUser('space2'),
+      });
+
+      expect(configuration).to.eql([]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_connectors.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_connectors.ts
new file mode 100644
index 0000000000000..0301fa3a930cb
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/get_connectors.ts
@@ -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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../../../../common/ftr_provider_context';
+
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  getServiceNowConnector,
+  getJiraConnector,
+  getResilientConnector,
+  createConnector,
+  getServiceNowSIRConnector,
+  getAuthWithSuperUser,
+  getCaseConnectors,
+  getActionsSpace,
+} from '../../../../common/lib/utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const actionsRemover = new ActionsRemover(supertest);
+  const authSpace1 = getAuthWithSuperUser();
+  const space = getActionsSpace(authSpace1.space);
+
+  describe('get_connectors', () => {
+    afterEach(async () => {
+      await actionsRemover.removeAll();
+    });
+
+    it('should return the correct connectors in space1', async () => {
+      const snConnector = await createConnector({
+        supertest,
+        req: getServiceNowConnector(),
+        auth: authSpace1,
+      });
+      const emailConnector = await createConnector({
+        supertest,
+        req: {
+          name: 'An email action',
+          connector_type_id: '.email',
+          config: {
+            service: '__json',
+            from: 'bob@example.com',
+          },
+          secrets: {
+            user: 'bob',
+            password: 'supersecret',
+          },
+        },
+        auth: authSpace1,
+      });
+      const jiraConnector = await createConnector({
+        supertest,
+        req: getJiraConnector(),
+        auth: authSpace1,
+      });
+      const resilientConnector = await createConnector({
+        supertest,
+        req: getResilientConnector(),
+        auth: authSpace1,
+      });
+      const sir = await createConnector({
+        supertest,
+        req: getServiceNowSIRConnector(),
+        auth: authSpace1,
+      });
+
+      actionsRemover.add(space, sir.id, 'action', 'actions');
+      actionsRemover.add(space, snConnector.id, 'action', 'actions');
+      actionsRemover.add(space, emailConnector.id, 'action', 'actions');
+      actionsRemover.add(space, jiraConnector.id, 'action', 'actions');
+      actionsRemover.add(space, resilientConnector.id, 'action', 'actions');
+
+      const connectors = await getCaseConnectors({ supertest, auth: authSpace1 });
+
+      expect(connectors).to.eql([
+        {
+          id: jiraConnector.id,
+          actionTypeId: '.jira',
+          name: 'Jira Connector',
+          config: {
+            apiUrl: 'http://some.non.existent.com',
+            projectKey: 'pkey',
+          },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+        {
+          id: resilientConnector.id,
+          actionTypeId: '.resilient',
+          name: 'Resilient Connector',
+          config: {
+            apiUrl: 'http://some.non.existent.com',
+            orgId: 'pkey',
+          },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+        {
+          id: snConnector.id,
+          actionTypeId: '.servicenow',
+          name: 'ServiceNow Connector',
+          config: {
+            apiUrl: 'http://some.non.existent.com',
+          },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+        {
+          id: sir.id,
+          actionTypeId: '.servicenow-sir',
+          name: 'ServiceNow Connector',
+          config: { apiUrl: 'http://some.non.existent.com' },
+          isPreconfigured: false,
+          isMissingSecrets: false,
+          referencedByCount: 0,
+        },
+      ]);
+    });
+
+    it('should not return any connectors when looking in the wrong space', async () => {
+      const snConnector = await createConnector({
+        supertest,
+        req: getServiceNowConnector(),
+        auth: authSpace1,
+      });
+      const emailConnector = await createConnector({
+        supertest,
+        req: {
+          name: 'An email action',
+          connector_type_id: '.email',
+          config: {
+            service: '__json',
+            from: 'bob@example.com',
+          },
+          secrets: {
+            user: 'bob',
+            password: 'supersecret',
+          },
+        },
+        auth: authSpace1,
+      });
+      const jiraConnector = await createConnector({
+        supertest,
+        req: getJiraConnector(),
+        auth: authSpace1,
+      });
+      const resilientConnector = await createConnector({
+        supertest,
+        req: getResilientConnector(),
+        auth: authSpace1,
+      });
+      const sir = await createConnector({
+        supertest,
+        req: getServiceNowSIRConnector(),
+        auth: authSpace1,
+      });
+
+      actionsRemover.add(space, sir.id, 'action', 'actions');
+      actionsRemover.add(space, snConnector.id, 'action', 'actions');
+      actionsRemover.add(space, emailConnector.id, 'action', 'actions');
+      actionsRemover.add(space, jiraConnector.id, 'action', 'actions');
+      actionsRemover.add(space, resilientConnector.id, 'action', 'actions');
+
+      const connectors = await getCaseConnectors({
+        supertest,
+        auth: getAuthWithSuperUser('space2'),
+      });
+
+      expect(connectors).to.eql([]);
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/index.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/index.ts
new file mode 100644
index 0000000000000..0c8c3931d1577
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/index.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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('configuration tests', function () {
+    loadTestFile(require.resolve('./get_configure'));
+    loadTestFile(require.resolve('./get_connectors'));
+    loadTestFile(require.resolve('./patch_configure'));
+    loadTestFile(require.resolve('./post_configure'));
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/patch_configure.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
new file mode 100644
index 0000000000000..14d0debe2ac17
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/patch_configure.ts
@@ -0,0 +1,164 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  updateConfiguration,
+  getServiceNowConnector,
+  createConnector,
+  getAuthWithSuperUser,
+  getActionsSpace,
+} 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
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const kibanaServer = getService('kibanaServer');
+  const authSpace1 = getAuthWithSuperUser();
+  const space = getActionsSpace(authSpace1.space);
+
+  describe('patch_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should patch a configuration connector and create mappings in space1', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+        auth: authSpace1,
+      });
+
+      actionsRemover.add(space, connector.id, 'action', 'actions');
+
+      // Configuration is created with no connector so the mappings are empty
+      const configuration = await createConfiguration(
+        supertest,
+        getConfigurationRequest(),
+        200,
+        authSpace1
+      );
+
+      // the update request doesn't accept the owner field
+      const { owner, ...reqWithoutOwner } = getConfigurationRequest({
+        id: connector.id,
+        name: connector.name,
+        type: connector.connector_type_id as ConnectorTypes,
+        fields: null,
+      });
+
+      const newConfiguration = await updateConfiguration(
+        supertest,
+        configuration.id,
+        {
+          ...reqWithoutOwner,
+          version: configuration.version,
+        },
+        200,
+        authSpace1
+      );
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(newConfiguration);
+      expect(data).to.eql({
+        ...getConfigurationOutput(true),
+        created_by: nullUser,
+        updated_by: nullUser,
+        connector: {
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+          fields: null,
+        },
+        mappings: [
+          {
+            action_type: 'overwrite',
+            source: 'title',
+            target: 'short_description',
+          },
+          {
+            action_type: 'overwrite',
+            source: 'description',
+            target: 'description',
+          },
+          {
+            action_type: 'append',
+            source: 'comments',
+            target: 'work_notes',
+          },
+        ],
+      });
+    });
+
+    it('should not patch a configuration connector when it is in a different space', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+        auth: authSpace1,
+      });
+
+      actionsRemover.add(space, connector.id, 'action', 'actions');
+
+      // Configuration is created with no connector so the mappings are empty
+      const configuration = await createConfiguration(
+        supertest,
+        getConfigurationRequest(),
+        200,
+        authSpace1
+      );
+
+      // the update request doesn't accept the owner field
+      const { owner, ...reqWithoutOwner } = getConfigurationRequest({
+        id: connector.id,
+        name: connector.name,
+        type: connector.connector_type_id as ConnectorTypes,
+        fields: null,
+      });
+
+      await updateConfiguration(
+        supertest,
+        configuration.id,
+        {
+          ...reqWithoutOwner,
+          version: configuration.version,
+        },
+        404,
+        getAuthWithSuperUser('space2')
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/post_configure.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/post_configure.ts
new file mode 100644
index 0000000000000..7c5035193d465
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/configure/post_configure.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 expect from '@kbn/expect';
+import { ConnectorTypes } from '../../../../../../plugins/cases/common/api';
+import { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { ObjectRemover as ActionsRemover } from '../../../../../alerting_api_integration/common/lib';
+import {
+  ExternalServiceSimulator,
+  getExternalServiceSimulatorPath,
+} from '../../../../../alerting_api_integration/common/fixtures/plugins/actions_simulators/server/plugin';
+
+import {
+  getConfigurationRequest,
+  removeServerGeneratedPropertiesFromSavedObject,
+  getConfigurationOutput,
+  deleteConfiguration,
+  createConfiguration,
+  createConnector,
+  getServiceNowConnector,
+  getAuthWithSuperUser,
+  getActionsSpace,
+} from '../../../../common/lib/utils';
+import { nullUser } from '../../../../common/lib/mock';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const kibanaServer = getService('kibanaServer');
+  const authSpace1 = getAuthWithSuperUser();
+  const space = getActionsSpace(authSpace1.space);
+
+  describe('post_configure', () => {
+    const actionsRemover = new ActionsRemover(supertest);
+    let servicenowSimulatorURL: string = '<could not determine kibana url>';
+
+    before(() => {
+      servicenowSimulatorURL = kibanaServer.resolveUrl(
+        getExternalServiceSimulatorPath(ExternalServiceSimulator.SERVICENOW)
+      );
+    });
+
+    afterEach(async () => {
+      await deleteConfiguration(es);
+      await actionsRemover.removeAll();
+    });
+
+    it('should create a configuration with a mapping in space1', async () => {
+      const connector = await createConnector({
+        supertest,
+        req: {
+          ...getServiceNowConnector(),
+          config: { apiUrl: servicenowSimulatorURL },
+        },
+        auth: authSpace1,
+      });
+
+      actionsRemover.add(space, connector.id, 'action', 'actions');
+
+      const postRes = await createConfiguration(
+        supertest,
+        getConfigurationRequest({
+          id: connector.id,
+          name: connector.name,
+          type: connector.connector_type_id as ConnectorTypes,
+        }),
+        200,
+        authSpace1
+      );
+
+      const data = removeServerGeneratedPropertiesFromSavedObject(postRes);
+      expect(data).to.eql(
+        getConfigurationOutput(false, {
+          created_by: nullUser,
+          mappings: [
+            {
+              action_type: 'overwrite',
+              source: 'title',
+              target: 'short_description',
+            },
+            {
+              action_type: 'overwrite',
+              source: 'description',
+              target: 'description',
+            },
+            {
+              action_type: 'append',
+              source: 'comments',
+              target: 'work_notes',
+            },
+          ],
+          connector: {
+            id: connector.id,
+            name: connector.name,
+            type: connector.connector_type_id,
+            fields: null,
+          },
+        })
+      );
+    });
+  });
+};
diff --git a/x-pack/test/case_api_integration/spaces_only/tests/trial/index.ts b/x-pack/test/case_api_integration/spaces_only/tests/trial/index.ts
new file mode 100644
index 0000000000000..346640aa6b9de
--- /dev/null
+++ b/x-pack/test/case_api_integration/spaces_only/tests/trial/index.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 { FtrProviderContext } from '../../../../common/ftr_provider_context';
+import { createSpaces, deleteSpaces } from '../../../common/lib/authentication';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile, getService }: FtrProviderContext): void => {
+  describe('cases spaces only enabled: trial', function () {
+    // Fastest ciGroup for the moment.
+    this.tags('ciGroup5');
+
+    before(async () => {
+      await createSpaces(getService);
+    });
+
+    after(async () => {
+      await deleteSpaces(getService);
+    });
+
+    loadTestFile(require.resolve('../common'));
+
+    loadTestFile(require.resolve('./cases/push_case'));
+    loadTestFile(require.resolve('./configure'));
+  });
+};
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 59366c4d5e477..9c79c19b6ad70 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
@@ -48,13 +48,13 @@ export default ({ getService }: FtrProviderContext) => {
     describe('creating rules', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should create a single rule with a rule_id', async () => {
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 7add76b97ed0b..759c9b25dc1e8 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
@@ -51,13 +51,13 @@ export default ({ getService }: FtrProviderContext): void => {
     describe('creating rules in bulk', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should create a single rule with a rule_id', async () => {
diff --git a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
index 1a64b21d869c5..a5e96271d923f 100644
--- a/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
+++ b/x-pack/test/detection_engine_api_integration/basic/tests/find_statuses.ts
@@ -28,14 +28,14 @@ export default ({ getService }: FtrProviderContext): void => {
   describe('find_statuses', () => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
-      await esArchiver.load('auditbeat/hosts');
+      await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
     });
 
     afterEach(async () => {
       await deleteSignalsIndex(supertest);
       await deleteAllAlerts(supertest);
       await deleteAllRulesStatuses(es);
-      await esArchiver.unload('auditbeat/hosts');
+      await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
     });
 
     it('should return an empty find statuses body correctly if no statuses are loaded', async () => {
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 3c52e779666f6..8c6a698f88109 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
@@ -69,12 +69,12 @@ export default ({ getService }: FtrProviderContext) => {
       beforeEach(async () => {
         await deleteAllAlerts(supertest);
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should be able to execute and get 10 signals', async () => {
diff --git a/x-pack/test/detection_engine_api_integration/common/config.ts b/x-pack/test/detection_engine_api_integration/common/config.ts
index 659c836eb9207..5cbf9598dc4a1 100644
--- a/x-pack/test/detection_engine_api_integration/common/config.ts
+++ b/x-pack/test/detection_engine_api_integration/common/config.ts
@@ -53,7 +53,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       junit: {
         reportName: 'X-Pack Detection Engine API Integration Tests',
       },
-      esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'),
       esTestCluster: {
         ...xPackApiIntegrationTestsConfig.get('esTestCluster'),
         license,
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 9d086717f4753..8b31877e11bbe 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
@@ -30,14 +30,14 @@ export default ({ getService }: FtrProviderContext) => {
   describe('add_actions', () => {
     describe('adding actions', () => {
       beforeEach(async () => {
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
         await createSignalsIndex(supertest);
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should be able to create a new webhook action and attach it to a rule', async () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/aliases.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/aliases.ts
new file mode 100644
index 0000000000000..ca1281e0d2da9
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/aliases.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 expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import {
+  createRule,
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  getRuleForSignalTesting,
+  getSignalsById,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+} from '../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+  interface HostAlias {
+    name: string;
+  }
+
+  describe('Tests involving aliases of source indexes and the signals index', () => {
+    beforeEach(async () => {
+      await createSignalsIndex(supertest);
+      await esArchiver.load('x-pack/test/functional/es_archives/security_solution/alias');
+    });
+
+    afterEach(async () => {
+      await deleteSignalsIndex(supertest);
+      await deleteAllAlerts(supertest);
+      await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/alias');
+    });
+
+    it('should keep the original alias value such as "host_alias" from a source index when the value is indexed', async () => {
+      const rule = getRuleForSignalTesting(['alias']);
+      const { id } = await createRule(supertest, rule);
+      await waitForRuleSuccessOrStatus(supertest, id);
+      await waitForSignalsToBePresent(supertest, 4, [id]);
+      const signalsOpen = await getSignalsById(supertest, id);
+      const hits = signalsOpen.hits.hits.map(
+        (signal) => (signal._source.host_alias as HostAlias).name
+      );
+      expect(hits).to.eql(['host name 1', 'host name 2', 'host name 3', 'host name 4']);
+    });
+
+    // TODO: Make aliases work to where we can have ECS fields such as host.name filled out
+    it.skip('should copy alias data from a source index into the signals index in the same position when the target is ECS compatible', async () => {
+      const rule = getRuleForSignalTesting(['alias']);
+      const { id } = await createRule(supertest, rule);
+      await waitForRuleSuccessOrStatus(supertest, id);
+      await waitForSignalsToBePresent(supertest, 4, [id]);
+      const signalsOpen = await getSignalsById(supertest, id);
+      const hits = signalsOpen.hits.hits.map((signal) => (signal._source.host as HostAlias).name);
+      expect(hits).to.eql(['host name 1', 'host name 2', 'host name 3', 'host name 4']);
+    });
+  });
+};
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 6a14de3c47608..05b097cc87b61 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
@@ -65,14 +65,14 @@ export default ({ getService }: FtrProviderContext) => {
     describe('creating rules with exceptions', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
         await deleteAllExceptions(es);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       describe('elastic admin', () => {
@@ -530,14 +530,14 @@ export default ({ getService }: FtrProviderContext) => {
       describe('tests with auditbeat data', () => {
         beforeEach(async () => {
           await createSignalsIndex(supertest);
-          await esArchiver.load('auditbeat/hosts');
+          await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
         });
 
         afterEach(async () => {
           await deleteSignalsIndex(supertest);
           await deleteAllAlerts(supertest);
           await deleteAllExceptions(es);
-          await esArchiver.unload('auditbeat/hosts');
+          await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
         });
 
         it('should be able to execute against an exception list that does not include valid entries and get back 10 signals', async () => {
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 9e7fb0ea7c84b..491f7bb9c417e 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
@@ -76,14 +76,14 @@ export default ({ getService }: FtrProviderContext) => {
     before(async () => {
       // Order is critical here: auditbeat data must be loaded before attempting to start the ML job,
       // as the job looks for certain indices on start
-      await esArchiver.load('auditbeat/hosts');
+      await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       await executeSetupModuleRequest(siemModule, 200);
       await forceStartDatafeeds(mlJobId, 200);
-      await esArchiver.load('security_solution/anomalies');
+      await esArchiver.load('x-pack/test/functional/es_archives/security_solution/anomalies');
     });
     after(async () => {
-      await esArchiver.unload('auditbeat/hosts');
-      await esArchiver.unload('security_solution/anomalies');
+      await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+      await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/anomalies');
     });
 
     beforeEach(async () => {
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 5ec3374598776..cd63ee36da801 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
@@ -61,13 +61,13 @@ export default ({ getService }: FtrProviderContext) => {
     describe('creating rules', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       describe('elastic admin', () => {
@@ -297,12 +297,16 @@ export default ({ getService }: FtrProviderContext) => {
         await createSignalsIndex(supertest);
         // to edit these files run the following script
         // cd $HOME/kibana/x-pack && nvm use && node ../scripts/es_archiver edit security_solution/timestamp_override
-        await esArchiver.load('security_solution/timestamp_override');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override'
+        );
       });
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('security_solution/timestamp_override');
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override'
+        );
       });
 
       it('should create a single rule which has a timestamp override for an index pattern that does not exist and write a partial failure status', async () => {
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 378edd5b2503d..e1fea9afa9ed5 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
@@ -56,13 +56,13 @@ export default ({ getService }: FtrProviderContext): void => {
     describe('creating rules in bulk', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should create a single rule with a rule_id', async () => {
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 8f7d2a0c01771..1d33c4c3047cd 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
@@ -47,16 +47,16 @@ export default ({ getService }: FtrProviderContext): void => {
       await createSignalsIndex(supertest);
 
       legacySignalsIndexName = getIndexNameFromLoad(
-        await esArchiver.load('signals/legacy_signals_index')
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index')
       );
       outdatedSignalsIndexName = getIndexNameFromLoad(
-        await esArchiver.load('signals/outdated_signals_index')
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
       );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('signals/outdated_signals_index');
-      await esArchiver.unload('signals/legacy_signals_index');
+      await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
+      await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index');
       await deleteMigrations({
         kbnClient,
         ids: createdMigrations.filter((m) => m?.migration_id).map((m) => m.migration_id),
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 43576b80b3738..755847e8b645d 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
@@ -68,13 +68,13 @@ export default ({ getService }: FtrProviderContext) => {
     describe('creating threat match rule', () => {
       beforeEach(async () => {
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should create a single rule with a rule_id', async () => {
@@ -107,13 +107,13 @@ export default ({ getService }: FtrProviderContext) => {
       beforeEach(async () => {
         await deleteAllAlerts(supertest);
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should be able to execute and get 10 signals when doing a specific query', async () => {
@@ -358,11 +358,11 @@ export default ({ getService }: FtrProviderContext) => {
 
       describe('indicator enrichment', () => {
         beforeEach(async () => {
-          await esArchiver.load('filebeat/threat_intel');
+          await esArchiver.load('x-pack/test/functional/es_archives/filebeat/threat_intel');
         });
 
         afterEach(async () => {
-          await esArchiver.unload('filebeat/threat_intel');
+          await esArchiver.unload('x-pack/test/functional/es_archives/filebeat/threat_intel');
         });
 
         it('enriches signals with the single indicator that matched', async () => {
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 9bb3e776f4553..4539b8de8e6dc 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
@@ -43,7 +43,7 @@ export default ({ getService }: FtrProviderContext): void => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       outdatedSignalsIndexName = getIndexNameFromLoad(
-        await esArchiver.load('signals/outdated_signals_index')
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
       );
 
       ({
@@ -72,7 +72,7 @@ export default ({ getService }: FtrProviderContext): void => {
     });
 
     afterEach(async () => {
-      await esArchiver.unload('signals/outdated_signals_index');
+      await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
       await deleteSignalsIndex(supertest);
     });
 
@@ -96,6 +96,7 @@ export default ({ getService }: FtrProviderContext): void => {
         .expect(200);
 
       const { body } = await es.indices.getSettings({ index: createdMigration.index });
+      // @ts-expect-error @elastic/elasticsearch supports flatten 'index.*' keys only
       const indexSettings = body[createdMigration.index].settings.index;
       expect(indexSettings.lifecycle.name).to.eql(
         `${DEFAULT_SIGNALS_INDEX}-default-migration-cleanup`
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts
index a5ea14b9c1f13..ebbf91fed451a 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/date.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/date');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/date');
     });
 
     afterEach(async () => {
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/date');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/date');
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts
index eabc6f6469c93..0ae52b86e3d77 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/double.ts
@@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/double');
-      await esArchiver.load('rule_exceptions/double_as_string');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/double_as_string');
     });
 
     afterEach(async () => {
@@ -45,8 +45,10 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/double');
-      await esArchiver.unload('rule_exceptions/double_as_string');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/double');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/rule_exceptions/double_as_string'
+      );
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts
index 995692189d710..7d5d8a215a982 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/float.ts
@@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/float');
-      await esArchiver.load('rule_exceptions/float_as_string');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/float_as_string');
     });
 
     afterEach(async () => {
@@ -45,8 +45,8 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/float');
-      await esArchiver.unload('rule_exceptions/float_as_string');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/float');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/float_as_string');
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts
index 3e347239f6951..8d73262147287 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/integer.ts
@@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/integer');
-      await esArchiver.load('rule_exceptions/integer_as_string');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/integer_as_string');
     });
 
     afterEach(async () => {
@@ -45,8 +45,10 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/integer');
-      await esArchiver.unload('rule_exceptions/integer_as_string');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/integer');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/rule_exceptions/integer_as_string'
+      );
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts
index 521a5c01a1203..9acbe0da6f27c 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/ip');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip');
     });
 
     afterEach(async () => {
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/ip');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/ip');
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts
index cc17f608eeaed..16b3ab2958c9f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/ip_array.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/ip_as_array');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/ip_as_array');
     });
 
     afterEach(async () => {
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/ip_as_array');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/ip_as_array');
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts
index 38c86c4b84135..29fbd2423956f 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/keyword');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword');
     });
 
     afterEach(async () => {
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/keyword');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/keyword');
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts
index c1e1aaabcc36a..f3b49558bb99d 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/keyword_array.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/keyword_as_array');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array');
     });
 
     afterEach(async () => {
@@ -44,7 +44,9 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/keyword_as_array');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/rule_exceptions/keyword_as_array'
+      );
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts
index d526dae0747f1..55896212c2fd8 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/long.ts
@@ -36,8 +36,8 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/long');
-      await esArchiver.load('rule_exceptions/long_as_string');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/long_as_string');
     });
 
     afterEach(async () => {
@@ -45,8 +45,8 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/long');
-      await esArchiver.unload('rule_exceptions/long_as_string');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/long');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/long_as_string');
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts
index 34d4b467f1c4f..046d4100b1ee4 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text.ts
@@ -37,8 +37,8 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/text');
-      await esArchiver.load('rule_exceptions/text_no_spaces');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces');
     });
 
     afterEach(async () => {
@@ -46,8 +46,8 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/text');
-      await esArchiver.unload('rule_exceptions/text_no_spaces');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text_no_spaces');
     });
 
     describe('"is" operator', () => {
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts
index 0c9e9b6ed59c2..377019e4e40e6 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/exception_operators_data_types/text_array.ts
@@ -36,7 +36,7 @@ export default ({ getService }: FtrProviderContext) => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       await createListsIndex(supertest);
-      await esArchiver.load('rule_exceptions/text_as_array');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_exceptions/text_as_array');
     });
 
     afterEach(async () => {
@@ -44,7 +44,7 @@ export default ({ getService }: FtrProviderContext) => {
       await deleteAllAlerts(supertest);
       await deleteAllExceptions(es);
       await deleteListsIndex(supertest);
-      await esArchiver.unload('rule_exceptions/text_as_array');
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_exceptions/text_as_array');
     });
 
     describe('"is" operator', () => {
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 6ab23edae9b3b..0c274a8f4678b 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
@@ -58,10 +58,10 @@ export default ({ getService }: FtrProviderContext): void => {
       createdMigrations = [];
       await createSignalsIndex(supertest);
       legacySignalsIndexName = getIndexNameFromLoad(
-        await esArchiver.load('signals/legacy_signals_index')
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index')
       );
       outdatedSignalsIndexName = getIndexNameFromLoad(
-        await esArchiver.load('signals/outdated_signals_index')
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
       );
 
       ({
@@ -76,8 +76,8 @@ export default ({ getService }: FtrProviderContext): void => {
     });
 
     afterEach(async () => {
-      await esArchiver.unload('signals/outdated_signals_index');
-      await esArchiver.unload('signals/legacy_signals_index');
+      await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
+      await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index');
       await deleteMigrations({
         kbnClient,
         ids: createdMigrations.filter((m) => m?.migration_id).map((m) => m.migration_id),
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts
index 29a5433d86c36..b423fb80609c1 100644
--- a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/find_statuses.ts
@@ -28,14 +28,14 @@ export default ({ getService }: FtrProviderContext): void => {
   describe('find_statuses', () => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
-      await esArchiver.load('auditbeat/hosts');
+      await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
     });
 
     afterEach(async () => {
       await deleteSignalsIndex(supertest);
       await deleteAllAlerts(supertest);
       await deleteAllRulesStatuses(es);
-      await esArchiver.unload('auditbeat/hosts');
+      await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
     });
 
     it('should return an empty find statuses body correctly if no statuses are loaded', async () => {
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 f9f378bc4bfa8..0ba0749e75b08 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
@@ -55,11 +55,11 @@ export default ({ getService }: FtrProviderContext) => {
 
     describe('Signals from audit beat are of the expected structure', () => {
       beforeEach(async () => {
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should have the specific audit record for _id or none of these tests below will pass', async () => {
@@ -1160,11 +1160,11 @@ export default ({ getService }: FtrProviderContext) => {
      */
     describe('Signals generated from name clashes', () => {
       beforeEach(async () => {
-        await esArchiver.load('signals/numeric_name_clash');
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/numeric_name_clash');
       });
 
       afterEach(async () => {
-        await esArchiver.unload('signals/numeric_name_clash');
+        await esArchiver.unload('x-pack/test/functional/es_archives/signals/numeric_name_clash');
       });
 
       it('should have the specific audit record for _id or none of these tests below will pass', async () => {
@@ -1314,11 +1314,11 @@ export default ({ getService }: FtrProviderContext) => {
      */
     describe('Signals generated from object clashes', () => {
       beforeEach(async () => {
-        await esArchiver.load('signals/object_clash');
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/object_clash');
       });
 
       afterEach(async () => {
-        await esArchiver.unload('signals/object_clash');
+        await esArchiver.unload('x-pack/test/functional/es_archives/signals/object_clash');
       });
 
       it('should have the specific audit record for _id or none of these tests below will pass', async () => {
@@ -1471,11 +1471,13 @@ export default ({ getService }: FtrProviderContext) => {
      */
     describe('Signals generated from events with custom severity and risk score fields', () => {
       beforeEach(async () => {
-        await esArchiver.load('signals/severity_risk_overrides');
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/severity_risk_overrides');
       });
 
       afterEach(async () => {
-        await esArchiver.unload('signals/severity_risk_overrides');
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/signals/severity_risk_overrides'
+        );
       });
 
       const executeRuleAndGetSignals = async (rule: QueryCreateSchema) => {
@@ -1616,130 +1618,17 @@ export default ({ getService }: FtrProviderContext) => {
       });
     });
 
-    describe('Signals generated from events with timestamp override field and ensures search_after continues to work when documents are missing timestamp override field', () => {
-      beforeEach(async () => {
-        await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
-      });
-
-      afterEach(async () => {
-        await deleteSignalsIndex(supertest);
-        await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
-      });
-
-      /**
-       * This represents our worst case scenario where this field is not mapped on any index
-       * We want to check that our logic continues to function within the constraints of search after
-       * Elasticsearch returns java's long.MAX_VALUE for unmapped date fields
-       * Javascript does not support numbers this large, but without passing in a number of this size
-       * The search_after will continue to return the same results and not iterate to the next set
-       * So to circumvent this limitation of javascript we return the stringified version of Java's
-       * Long.MAX_VALUE so that search_after does not enter into an infinite loop.
-       *
-       * ref: https://github.com/elastic/elasticsearch/issues/28806#issuecomment-369303620
-       */
-      it('should generate 200 signals when timestamp override does not exist', async () => {
-        const rule: QueryCreateSchema = {
-          ...getRuleForSignalTesting(['auditbeat-*']),
-          timestamp_override: 'event.fakeingested',
-          max_signals: 200,
-        };
-
-        const { id } = await createRule(supertest, rule);
-        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
-        await waitForSignalsToBePresent(supertest, 200, [id]);
-        const signalsResponse = await getSignalsByIds(supertest, [id], 200);
-        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
-
-        expect(signals.length).equal(200);
-      });
-    });
-
-    /**
-     * Here we test the functionality of timestamp overrides. If the rule specifies a timestamp override,
-     * then the documents will be queried and sorted using the timestamp override field.
-     * If no timestamp override field exists in the indices but one was provided to the rule,
-     * the rule's query will additionally search for events using the `@timestamp` field
-     */
-    describe('Signals generated from events with timestamp override field', async () => {
-      beforeEach(async () => {
-        await deleteSignalsIndex(supertest);
-        await createSignalsIndex(supertest);
-        await esArchiver.load('security_solution/timestamp_override_1');
-        await esArchiver.load('security_solution/timestamp_override_2');
-        await esArchiver.load('security_solution/timestamp_override_3');
-        await esArchiver.load('security_solution/timestamp_override_4');
-      });
-
-      afterEach(async () => {
-        await deleteSignalsIndex(supertest);
-        await deleteAllAlerts(supertest);
-        await esArchiver.unload('security_solution/timestamp_override_1');
-        await esArchiver.unload('security_solution/timestamp_override_2');
-        await esArchiver.unload('security_solution/timestamp_override_3');
-        await esArchiver.unload('security_solution/timestamp_override_4');
-      });
-
-      it('should generate signals with event.ingested, @timestamp and (event.ingested + timestamp)', async () => {
-        const rule: QueryCreateSchema = {
-          ...getRuleForSignalTesting(['myfa*']),
-          timestamp_override: 'event.ingested',
-        };
-
-        const { id } = await createRule(supertest, rule);
-
-        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
-        await waitForSignalsToBePresent(supertest, 3, [id]);
-        const signalsResponse = await getSignalsByIds(supertest, [id], 3);
-        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
-        const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc');
-
-        expect(signalsOrderedByEventId.length).equal(3);
-      });
-
-      it('should generate 2 signals with @timestamp', async () => {
-        const rule: QueryCreateSchema = getRuleForSignalTesting(['myfa*']);
-
-        const { id } = await createRule(supertest, rule);
-
-        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
-        await waitForSignalsToBePresent(supertest, 2, [id]);
-        const signalsResponse = await getSignalsByIds(supertest, [id]);
-        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
-        const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc');
-
-        expect(signalsOrderedByEventId.length).equal(2);
-      });
-
-      it('should generate 2 signals when timestamp override does not exist', async () => {
-        const rule: QueryCreateSchema = {
-          ...getRuleForSignalTesting(['myfa*']),
-          timestamp_override: 'event.fakeingestfield',
-        };
-        const { id } = await createRule(supertest, rule);
-
-        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
-        await waitForSignalsToBePresent(supertest, 2, [id]);
-        const signalsResponse = await getSignalsByIds(supertest, [id, id]);
-        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
-        const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc');
-
-        expect(signalsOrderedByEventId.length).equal(2);
-      });
-    });
-
     describe('Signals generated from events with name override field', async () => {
       beforeEach(async () => {
         await deleteSignalsIndex(supertest);
         await createSignalsIndex(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should generate signals with name_override field', async () => {
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 869d1672150cc..6bb00c55f690e 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
@@ -25,12 +25,12 @@ export default ({ getService }: FtrProviderContext): void => {
     beforeEach(async () => {
       await createSignalsIndex(supertest);
       legacySignalsIndexName = getIndexNameFromLoad(
-        await esArchiver.load('signals/legacy_signals_index')
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/legacy_signals_index')
       );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('signals/legacy_signals_index');
+      await esArchiver.unload('x-pack/test/functional/es_archives/signals/legacy_signals_index');
       await deleteSignalsIndex(supertest);
     });
 
@@ -59,7 +59,7 @@ export default ({ getService }: FtrProviderContext): void => {
 
     it("returns the mappings version and a breakdown of signals' version", async () => {
       const outdatedIndexName = getIndexNameFromLoad(
-        await esArchiver.load('signals/outdated_signals_index')
+        await esArchiver.load('x-pack/test/functional/es_archives/signals/outdated_signals_index')
       );
 
       const { body } = await supertest
@@ -95,7 +95,7 @@ export default ({ getService }: FtrProviderContext): void => {
         },
       ]);
 
-      await esArchiver.unload('signals/outdated_signals_index');
+      await esArchiver.unload('x-pack/test/functional/es_archives/signals/outdated_signals_index');
     });
 
     it('rejects the request if the user does not have sufficient privileges', async () => {
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 57b24f6de2a48..3c5e04ee1f64e 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
@@ -13,6 +13,7 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     describe('', function () {
       this.tags('ciGroup11');
 
+      loadTestFile(require.resolve('./aliases'));
       loadTestFile(require.resolve('./add_actions'));
       loadTestFile(require.resolve('./update_actions'));
       loadTestFile(require.resolve('./add_prepackaged_rules'));
@@ -34,6 +35,7 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
       loadTestFile(require.resolve('./update_rules'));
       loadTestFile(require.resolve('./update_rules_bulk'));
       loadTestFile(require.resolve('./patch_rules_bulk'));
+      loadTestFile(require.resolve('./perform_bulk_action'));
       loadTestFile(require.resolve('./patch_rules'));
       loadTestFile(require.resolve('./read_privileges'));
       loadTestFile(require.resolve('./query_signals'));
@@ -42,6 +44,8 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
       loadTestFile(require.resolve('./create_signals_migrations'));
       loadTestFile(require.resolve('./finalize_signals_migrations'));
       loadTestFile(require.resolve('./delete_signals_migrations'));
+      loadTestFile(require.resolve('./timestamps'));
+      loadTestFile(require.resolve('./runtime'));
     });
 
     // That split here enable us on using a different ciGroup to run the tests
@@ -49,5 +53,11 @@ export default ({ loadTestFile }: FtrProviderContext): void => {
     describe('', function () {
       loadTestFile(require.resolve('./exception_operators_data_types/index'));
     });
+
+    // 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'));
+    });
   });
 };
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/README.md b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/README.md
new file mode 100644
index 0000000000000..ab7f2ec862b0d
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/README.md
@@ -0,0 +1,11 @@
+These are tests for the [keyword](https://www.elastic.co/guide/en/elasticsearch/reference/7.12/keyword.html) family where we test 
+* keyword
+* const keyword 
+* alias fields against each one
+
+Against mock rules which contain the ECS values of:
+* event.module
+* even.dataset
+
+This is to ensure that if you have field aliases we will still correctly have detections occur. This also ensures that if you have
+`keyword` mixed with `const keyword` across multiple indexes we will still have detections occur.
\ No newline at end of file
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
new file mode 100644
index 0000000000000..fccfe4d74e241
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/const_keyword.ts
@@ -0,0 +1,163 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import expect from '@kbn/expect';
+import {
+  EqlCreateSchema,
+  ThresholdCreateSchema,
+} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  createRule,
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  getRuleForSignalTesting,
+  getSignalsById,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  interface EventModule {
+    module: string;
+    dataset: string;
+  }
+
+  describe('Rule detects against a keyword of event.dataset', () => {
+    beforeEach(async () => {
+      await createSignalsIndex(supertest);
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword');
+    });
+
+    afterEach(async () => {
+      await deleteSignalsIndex(supertest);
+      await deleteAllAlerts(supertest);
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/rule_keyword_family/const_keyword'
+      );
+    });
+
+    describe('"kql" rule type', () => {
+      it('should detect the "dataset_name_1" from "event.dataset" and have 4 signals', async () => {
+        const rule = {
+          ...getRuleForSignalTesting(['const_keyword']),
+          query: 'event.dataset: "dataset_name_1"',
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        expect(signalsOpen.hits.hits.length).to.eql(4);
+      });
+
+      // TODO: Fix this bug and make this work. We currently do not write out the dataset name when it is not in _source
+      it.skip('should copy the dataset_name_1 from the index into the signal', async () => {
+        const rule = {
+          ...getRuleForSignalTesting(['const_keyword']),
+          query: 'event.dataset: "dataset_name_1"',
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => (hit._source.event as EventModule).dataset)
+          .sort();
+        expect(hits).to.eql([
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+        ]);
+      });
+    });
+
+    describe('"eql" rule type', () => {
+      it('should detect the "dataset_name_1" from "event.dataset" and have 4 signals', async () => {
+        const rule: EqlCreateSchema = {
+          ...getRuleForSignalTesting(['const_keyword']),
+          rule_id: 'eql-rule',
+          type: 'eql',
+          language: 'eql',
+          query: 'any where event.dataset=="dataset_name_1"',
+        };
+
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        expect(signalsOpen.hits.hits.length).to.eql(4);
+      });
+
+      // TODO: Fix this bug and make this work. We currently do not write out the dataset name when it is not in _source
+      it.skip('should copy the "dataset_name_1" from "event.dataset"', async () => {
+        const rule: EqlCreateSchema = {
+          ...getRuleForSignalTesting(['const_keyword']),
+          rule_id: 'eql-rule',
+          type: 'eql',
+          language: 'eql',
+          query: 'any where event.dataset=="dataset_name_1"',
+        };
+
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => (hit._source.event as EventModule).dataset)
+          .sort();
+        expect(hits).to.eql([
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+        ]);
+      });
+    });
+
+    describe('"threshold" rule type', async () => {
+      it('should detect the "dataset_name_1" from "event.dataset"', async () => {
+        const rule: ThresholdCreateSchema = {
+          ...getRuleForSignalTesting(['const_keyword']),
+          rule_id: 'threshold-rule',
+          type: 'threshold',
+          language: 'kuery',
+          query: '*:*',
+          threshold: {
+            field: 'event.dataset',
+            value: 1,
+          },
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => hit._source.signal.threshold_result ?? null)
+          .sort();
+        expect(hits).to.eql([
+          {
+            count: 4,
+            from: '1900-01-01T00:00:00.000Z',
+            terms: [
+              {
+                field: 'event.dataset',
+                value: 'dataset_name_1',
+              },
+            ],
+          },
+        ]);
+      });
+    });
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/index.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/index.ts
new file mode 100644
index 0000000000000..4855524d650ef
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/index.ts
@@ -0,0 +1,21 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ loadTestFile }: FtrProviderContext): void => {
+  describe('Detection keyword family data types', function () {
+    describe('', function () {
+      this.tags('ciGroup11');
+
+      loadTestFile(require.resolve('./keyword'));
+      loadTestFile(require.resolve('./const_keyword'));
+      loadTestFile(require.resolve('./keyword_mixed_with_const'));
+    });
+  });
+};
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
new file mode 100644
index 0000000000000..d2d2898587ee2
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword.ts
@@ -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 expect from '@kbn/expect';
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  createRule,
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  getRuleForSignalTesting,
+  getSignalsById,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+} from '../../../utils';
+import {
+  EqlCreateSchema,
+  ThresholdCreateSchema,
+} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  interface EventModule {
+    module: string;
+    dataset: string;
+  }
+
+  describe('Rule detects against a keyword of event.dataset', () => {
+    beforeEach(async () => {
+      await createSignalsIndex(supertest);
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
+    });
+
+    afterEach(async () => {
+      await deleteSignalsIndex(supertest);
+      await deleteAllAlerts(supertest);
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
+    });
+
+    describe('"kql" rule type', () => {
+      it('should detect the "dataset_name_1" from "event.dataset"', async () => {
+        const rule = {
+          ...getRuleForSignalTesting(['keyword']),
+          query: 'event.dataset: "dataset_name_1"',
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => (hit._source.event as EventModule).dataset)
+          .sort();
+        expect(hits).to.eql([
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+        ]);
+      });
+    });
+
+    describe('"eql" rule type', () => {
+      it('should detect the "dataset_name_1" from "event.dataset"', async () => {
+        const rule: EqlCreateSchema = {
+          ...getRuleForSignalTesting(['keyword']),
+          rule_id: 'eql-rule',
+          type: 'eql',
+          language: 'eql',
+          query: 'any where event.dataset=="dataset_name_1"',
+        };
+
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => (hit._source.event as EventModule).dataset)
+          .sort();
+        expect(hits).to.eql([
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+        ]);
+      });
+    });
+
+    describe('"threshold" rule type', async () => {
+      it('should detect the "dataset_name_1" from "event.dataset"', async () => {
+        const rule: ThresholdCreateSchema = {
+          ...getRuleForSignalTesting(['keyword']),
+          rule_id: 'threshold-rule',
+          type: 'threshold',
+          language: 'kuery',
+          query: '*:*',
+          threshold: {
+            field: 'event.dataset',
+            value: 1,
+          },
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => hit._source.signal.threshold_result ?? null)
+          .sort();
+        expect(hits).to.eql([
+          {
+            count: 4,
+            from: '1900-01-01T00:00:00.000Z',
+            terms: [
+              {
+                field: 'event.dataset',
+                value: 'dataset_name_1',
+              },
+            ],
+          },
+        ]);
+      });
+    });
+  });
+};
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
new file mode 100644
index 0000000000000..3802d1f7a7bef
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family/keyword_mixed_with_const.ts
@@ -0,0 +1,173 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 {
+  EqlCreateSchema,
+  ThresholdCreateSchema,
+} from '../../../../../plugins/security_solution/common/detection_engine/schemas/request';
+
+import { FtrProviderContext } from '../../../common/ftr_provider_context';
+import {
+  createRule,
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  getRuleForSignalTesting,
+  getSignalsById,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+} from '../../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  interface EventModule {
+    module: string;
+    dataset: string;
+  }
+
+  describe('Rule detects against a keyword and constant_keyword of event.dataset', () => {
+    beforeEach(async () => {
+      await createSignalsIndex(supertest);
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/const_keyword');
+      await esArchiver.load('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
+    });
+
+    afterEach(async () => {
+      await deleteSignalsIndex(supertest);
+      await deleteAllAlerts(supertest);
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/rule_keyword_family/const_keyword'
+      );
+      await esArchiver.unload('x-pack/test/functional/es_archives/rule_keyword_family/keyword');
+    });
+
+    describe('"kql" rule type', () => {
+      it('should detect the "dataset_name_1" from "event.dataset" and have 8 signals, 4 from each index', async () => {
+        const rule = {
+          ...getRuleForSignalTesting(['keyword', 'const_keyword']),
+          query: 'event.dataset: "dataset_name_1"',
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 8, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        expect(signalsOpen.hits.hits.length).to.eql(8);
+      });
+
+      // TODO: Fix this bug and make this work. We currently do not write out the dataset name when it is not in _source
+      it.skip('should copy the dataset_name_1 from the index into the signal', async () => {
+        const rule = {
+          ...getRuleForSignalTesting(['keyword', 'const_keyword']),
+          query: 'event.dataset: "dataset_name_1"',
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 8, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => (hit._source.event as EventModule).dataset)
+          .sort();
+        expect(hits).to.eql([
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+        ]);
+      });
+    });
+
+    describe('"eql" rule type', () => {
+      it('should detect the "dataset_name_1" from "event.dataset" and have 8 signals, 4 from each index', async () => {
+        const rule: EqlCreateSchema = {
+          ...getRuleForSignalTesting(['keyword', 'const_keyword']),
+          rule_id: 'eql-rule',
+          type: 'eql',
+          language: 'eql',
+          query: 'any where event.dataset=="dataset_name_1"',
+        };
+
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 8, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        expect(signalsOpen.hits.hits.length).to.eql(8);
+      });
+
+      // TODO: Fix this bug and make this work. We currently do not write out the dataset name when it is not in _source
+      it.skip('should copy the "dataset_name_1" from "event.dataset"', async () => {
+        const rule: EqlCreateSchema = {
+          ...getRuleForSignalTesting(['keyword', 'const_keyword']),
+          rule_id: 'eql-rule',
+          type: 'eql',
+          language: 'eql',
+          query: 'any where event.dataset=="dataset_name_1"',
+        };
+
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 8, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => (hit._source.event as EventModule).dataset)
+          .sort();
+        expect(hits).to.eql([
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+          'dataset_name_1',
+        ]);
+      });
+    });
+
+    describe('"threshold" rule type', async () => {
+      it('should detect the "dataset_name_1" from "event.dataset"', async () => {
+        const rule: ThresholdCreateSchema = {
+          ...getRuleForSignalTesting(['keyword', 'const_keyword']),
+          rule_id: 'threshold-rule',
+          type: 'threshold',
+          language: 'kuery',
+          query: '*:*',
+          threshold: {
+            field: 'event.dataset',
+            value: 1,
+          },
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits
+          .map((hit) => hit._source.signal.threshold_result ?? null)
+          .sort();
+        expect(hits).to.eql([
+          {
+            count: 8,
+            from: '1900-01-01T00:00:00.000Z',
+            terms: [
+              {
+                field: 'event.dataset',
+                value: 'dataset_name_1',
+              },
+            ],
+          },
+        ]);
+      });
+    });
+  });
+};
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 36a05f0ae8c0e..d56463770e84f 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
@@ -71,12 +71,12 @@ export default ({ getService }: FtrProviderContext) => {
         beforeEach(async () => {
           await deleteAllAlerts(supertest);
           await createSignalsIndex(supertest);
-          await esArchiver.load('auditbeat/hosts');
+          await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
         });
         afterEach(async () => {
           await deleteSignalsIndex(supertest);
           await deleteAllAlerts(supertest);
-          await esArchiver.unload('auditbeat/hosts');
+          await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
         });
 
         it('should be able to execute and get 10 signals', async () => {
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
new file mode 100644
index 0000000000000..53613624067e1
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/perform_bulk_action.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 {
+  DETECTION_ENGINE_RULES_BULK_ACTION,
+  DETECTION_ENGINE_RULES_URL,
+} from '../../../../plugins/security_solution/common/constants';
+import { BulkAction } from '../../../../plugins/security_solution/common/detection_engine/schemas/common/schemas';
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import {
+  binaryToString,
+  createRule,
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  getSimpleRule,
+  getSimpleRuleOutput,
+  removeServerGeneratedProperties,
+} from '../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext): void => {
+  const supertest = getService('supertest');
+
+  describe('perform_bulk_action', () => {
+    beforeEach(async () => {
+      await createSignalsIndex(supertest);
+    });
+
+    afterEach(async () => {
+      await deleteSignalsIndex(supertest);
+      await deleteAllAlerts(supertest);
+    });
+
+    it('should export rules', async () => {
+      await createRule(supertest, getSimpleRule());
+
+      const { body } = await supertest
+        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
+        .set('kbn-xsrf', 'true')
+        .send({ query: '', action: BulkAction.export })
+        .expect(200)
+        .expect('Content-Type', 'application/ndjson')
+        .expect('Content-Disposition', 'attachment; filename="rules_export.ndjson"')
+        .parse(binaryToString);
+
+      const [ruleJson, exportDetailsJson] = body.toString().split(/\n/);
+
+      const rule = removeServerGeneratedProperties(JSON.parse(ruleJson));
+      expect(rule).to.eql(getSimpleRuleOutput());
+
+      const exportDetails = JSON.parse(exportDetailsJson);
+      expect(exportDetails).to.eql({
+        exported_count: 1,
+        missing_rules: [],
+        missing_rules_count: 0,
+      });
+    });
+
+    it('should delete rules', async () => {
+      const ruleId = 'ruleId';
+      await createRule(supertest, getSimpleRule(ruleId));
+
+      const { body } = await supertest
+        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
+        .set('kbn-xsrf', 'true')
+        .send({ query: '', action: BulkAction.delete })
+        .expect(200);
+
+      expect(body).to.eql({ success: true, rules_count: 1 });
+
+      await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
+        .set('kbn-xsrf', 'true')
+        .expect(404);
+    });
+
+    it('should enable rules', async () => {
+      const ruleId = 'ruleId';
+      await createRule(supertest, getSimpleRule(ruleId));
+
+      const { body } = await supertest
+        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
+        .set('kbn-xsrf', 'true')
+        .send({ query: '', action: BulkAction.enable })
+        .expect(200);
+
+      expect(body).to.eql({ success: true, rules_count: 1 });
+
+      const { body: ruleBody } = await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
+        .set('kbn-xsrf', 'true')
+        .expect(200);
+
+      const referenceRule = getSimpleRuleOutput(ruleId);
+      referenceRule.enabled = true;
+
+      const storedRule = removeServerGeneratedProperties(ruleBody);
+
+      expect(storedRule).to.eql(referenceRule);
+    });
+
+    it('should disable rules', async () => {
+      const ruleId = 'ruleId';
+      await createRule(supertest, getSimpleRule(ruleId, true));
+
+      const { body } = await supertest
+        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
+        .set('kbn-xsrf', 'true')
+        .send({ query: '', action: BulkAction.disable })
+        .expect(200);
+
+      expect(body).to.eql({ success: true, rules_count: 1 });
+
+      const { body: ruleBody } = await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}?rule_id=${ruleId}`)
+        .set('kbn-xsrf', 'true')
+        .expect(200);
+
+      const referenceRule = getSimpleRuleOutput(ruleId);
+      const storedRule = removeServerGeneratedProperties(ruleBody);
+
+      expect(storedRule).to.eql(referenceRule);
+    });
+
+    it('should duplicate rules', async () => {
+      const ruleId = 'ruleId';
+      await createRule(supertest, getSimpleRule(ruleId));
+
+      const { body } = await supertest
+        .post(DETECTION_ENGINE_RULES_BULK_ACTION)
+        .set('kbn-xsrf', 'true')
+        .send({ query: '', action: BulkAction.duplicate })
+        .expect(200);
+
+      expect(body).to.eql({ success: true, rules_count: 1 });
+
+      const { body: rulesResponse } = await supertest
+        .get(`${DETECTION_ENGINE_RULES_URL}/_find`)
+        .set('kbn-xsrf', 'true')
+        .expect(200);
+
+      expect(rulesResponse.total).to.eql(2);
+    });
+  });
+};
diff --git a/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/runtime.ts b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/runtime.ts
new file mode 100644
index 0000000000000..94cc390e0e6ef
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/runtime.ts
@@ -0,0 +1,114 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../common/ftr_provider_context';
+import {
+  createRule,
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  getRuleForSignalTesting,
+  getSignalsById,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+} from '../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+  interface HostAlias {
+    name: string;
+    hostname: string;
+  }
+
+  describe('Tests involving runtime fields of source indexes and the signals index', () => {
+    describe('Regular runtime field mappings', () => {
+      beforeEach(async () => {
+        await createSignalsIndex(supertest);
+        await esArchiver.load('x-pack/test/functional/es_archives/security_solution/runtime');
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(supertest);
+        await esArchiver.unload('x-pack/test/functional/es_archives/security_solution/runtime');
+      });
+
+      it('should copy normal non-runtime data set from the source index into the signals index in the same position when the target is ECS compatible', async () => {
+        const rule = getRuleForSignalTesting(['runtime']);
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits.map((signal) => (signal._source.host as HostAlias).name);
+        expect(hits).to.eql(['host name 1', 'host name 2', 'host name 3', 'host name 4']);
+      });
+
+      // TODO: Make runtime fields able to be copied to where we can have ECS fields such as host.name filled out by them within the mapping directly
+      it.skip('should copy "runtime mapping" data from a source index into the signals index in the same position when the target is ECS compatible', async () => {
+        const rule = getRuleForSignalTesting(['runtime']);
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits.map(
+          (signal) => (signal._source.host_alias as HostAlias).hostname
+        );
+        expect(hits).to.eql(['host name 1', 'host name 2', 'host name 3', 'host name 4']);
+      });
+    });
+
+    describe('Runtime field mappings that have conflicts within them', () => {
+      beforeEach(async () => {
+        await createSignalsIndex(supertest);
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields'
+        );
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(supertest);
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields'
+        );
+      });
+
+      // TODO: Make the overrides of runtime fields override the host.name in this use case.
+      it.skip('should copy normal non-runtime data set from the source index into the signals index in the same position when the target is ECS compatible', async () => {
+        const rule = getRuleForSignalTesting(['runtime_conflicting_fields']);
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits.map((signal) => (signal._source.host as HostAlias).name);
+        expect(hits).to.eql([
+          'I am the [host.name] field value which shadows the original host.name value',
+          'I am the [host.name] field value which shadows the original host.name value',
+          'I am the [host.name] field value which shadows the original host.name value',
+          'I am the [host.name] field value which shadows the original host.name value',
+        ]);
+      });
+
+      // TODO: Make runtime fields able to be copied to where we can have ECS fields such as host.name filled out by them within the mapping directly
+      it.skip('should copy "runtime mapping" data from a source index into the signals index in the same position when the target is ECS compatible', async () => {
+        const rule = getRuleForSignalTesting(['runtime_conflicting_fields']);
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 4, [id]);
+        const signalsOpen = await getSignalsById(supertest, id);
+        const hits = signalsOpen.hits.hits.map(
+          (signal) => (signal._source.host_alias as HostAlias).hostname
+        );
+        expect(hits).to.eql(['host name 1', 'host name 2', 'host name 3', 'host name 4']);
+      });
+    });
+  });
+};
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
new file mode 100644
index 0000000000000..8645fec287b07
--- /dev/null
+++ b/x-pack/test/detection_engine_api_integration/security_and_spaces/tests/timestamps.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 expect from '@kbn/expect';
+import { orderBy } from 'lodash';
+import { QueryCreateSchema } from '../../../../plugins/security_solution/common/detection_engine/schemas/request';
+
+import { FtrProviderContext } from '../../common/ftr_provider_context';
+import {
+  createSignalsIndex,
+  deleteAllAlerts,
+  deleteSignalsIndex,
+  createRule,
+  waitForRuleSuccessOrStatus,
+  waitForSignalsToBePresent,
+  getRuleForSignalTesting,
+  getSignalsByIds,
+} from '../../utils';
+
+// eslint-disable-next-line import/no-default-export
+export default ({ getService }: FtrProviderContext) => {
+  const supertest = getService('supertest');
+  const esArchiver = getService('esArchiver');
+
+  /**
+   * Tests around timestamps within signals such as the copying of timestamps correctly into
+   * the "signal.original_time" field, ensuring that timestamp overrides operate, and ensuring that
+   * partial errors happen correctly
+   */
+  describe('timestamp tests', () => {
+    describe('Signals generated from events with a timestamp in seconds is converted correctly into the forced ISO8601 format when copying', () => {
+      beforeEach(async () => {
+        await createSignalsIndex(supertest);
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds'
+        );
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_5'
+        );
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(supertest);
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds'
+        );
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_5'
+        );
+      });
+
+      it('should convert the @timestamp which is epoch_seconds into the correct ISO format', async () => {
+        const rule = getRuleForSignalTesting(['timestamp_in_seconds']);
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signalsOpen = await getSignalsByIds(supertest, [id]);
+        const hits = signalsOpen.hits.hits.map((hit) => hit._source.signal.original_time).sort();
+        expect(hits).to.eql(['2021-06-02T23:33:15.000Z']);
+      });
+
+      it('should still use the @timestamp field even with an override field. It should never use the override field', async () => {
+        const rule: QueryCreateSchema = {
+          ...getRuleForSignalTesting(['myfakeindex-5']),
+          timestamp_override: 'event.ingested',
+        };
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signalsOpen = await getSignalsByIds(supertest, [id]);
+        const hits = signalsOpen.hits.hits.map((hit) => hit._source.signal.original_time).sort();
+        expect(hits).to.eql(['2020-12-16T15:16:18.000Z']);
+      });
+    });
+
+    /**
+     * Here we test the functionality of timestamp overrides. If the rule specifies a timestamp override,
+     * then the documents will be queried and sorted using the timestamp override field.
+     * If no timestamp override field exists in the indices but one was provided to the rule,
+     * the rule's query will additionally search for events using the `@timestamp` field
+     */
+    describe('Signals generated from events with timestamp override field', async () => {
+      beforeEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await createSignalsIndex(supertest);
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_1'
+        );
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_2'
+        );
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_3'
+        );
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_4'
+        );
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(supertest);
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_1'
+        );
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_2'
+        );
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_3'
+        );
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/security_solution/timestamp_override_4'
+        );
+      });
+
+      it('should generate signals with event.ingested, @timestamp and (event.ingested + timestamp)', async () => {
+        const rule: QueryCreateSchema = {
+          ...getRuleForSignalTesting(['myfa*']),
+          timestamp_override: 'event.ingested',
+        };
+
+        const { id } = await createRule(supertest, rule);
+
+        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
+        await waitForSignalsToBePresent(supertest, 3, [id]);
+        const signalsResponse = await getSignalsByIds(supertest, [id], 3);
+        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
+        const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc');
+
+        expect(signalsOrderedByEventId.length).equal(3);
+      });
+
+      it('should generate 2 signals with @timestamp', async () => {
+        const rule: QueryCreateSchema = getRuleForSignalTesting(['myfa*']);
+
+        const { id } = await createRule(supertest, rule);
+
+        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
+        await waitForSignalsToBePresent(supertest, 2, [id]);
+        const signalsResponse = await getSignalsByIds(supertest, [id]);
+        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
+        const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc');
+
+        expect(signalsOrderedByEventId.length).equal(2);
+      });
+
+      it('should generate 2 signals when timestamp override does not exist', async () => {
+        const rule: QueryCreateSchema = {
+          ...getRuleForSignalTesting(['myfa*']),
+          timestamp_override: 'event.fakeingestfield',
+        };
+        const { id } = await createRule(supertest, rule);
+
+        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
+        await waitForSignalsToBePresent(supertest, 2, [id]);
+        const signalsResponse = await getSignalsByIds(supertest, [id, id]);
+        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
+        const signalsOrderedByEventId = orderBy(signals, 'signal.parent.id', 'asc');
+
+        expect(signalsOrderedByEventId.length).equal(2);
+      });
+
+      /**
+       * We should not use the timestamp override as the "original_time" as that can cause
+       * confusion if you have both a timestamp and an override in the source event. Instead the "original_time"
+       * field should only be overridden by the "timestamp" since when we generate a signal
+       * and we add a new timestamp to the signal.
+       */
+      it('should NOT use the timestamp override as the "original_time"', async () => {
+        const rule: QueryCreateSchema = {
+          ...getRuleForSignalTesting(['myfakeindex-2']),
+          timestamp_override: 'event.ingested',
+        };
+        const { id } = await createRule(supertest, rule);
+
+        await waitForRuleSuccessOrStatus(supertest, id);
+        await waitForSignalsToBePresent(supertest, 1, [id]);
+        const signalsResponse = await getSignalsByIds(supertest, [id, id]);
+        const hits = signalsResponse.hits.hits
+          .map((hit) => hit._source.signal.original_time)
+          .sort();
+        expect(hits).to.eql([undefined]);
+      });
+    });
+
+    describe('Signals generated from events with timestamp override field and ensures search_after continues to work when documents are missing timestamp override field', () => {
+      beforeEach(async () => {
+        await createSignalsIndex(supertest);
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
+      });
+
+      afterEach(async () => {
+        await deleteSignalsIndex(supertest);
+        await deleteAllAlerts(supertest);
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
+      });
+
+      /**
+       * This represents our worst case scenario where this field is not mapped on any index
+       * We want to check that our logic continues to function within the constraints of search after
+       * Elasticsearch returns java's long.MAX_VALUE for unmapped date fields
+       * Javascript does not support numbers this large, but without passing in a number of this size
+       * The search_after will continue to return the same results and not iterate to the next set
+       * So to circumvent this limitation of javascript we return the stringified version of Java's
+       * Long.MAX_VALUE so that search_after does not enter into an infinite loop.
+       *
+       * ref: https://github.com/elastic/elasticsearch/issues/28806#issuecomment-369303620
+       */
+      it('should generate 200 signals when timestamp override does not exist', async () => {
+        const rule: QueryCreateSchema = {
+          ...getRuleForSignalTesting(['auditbeat-*']),
+          timestamp_override: 'event.fakeingested',
+          max_signals: 200,
+        };
+
+        const { id } = await createRule(supertest, rule);
+        await waitForRuleSuccessOrStatus(supertest, id, 'partial failure');
+        await waitForSignalsToBePresent(supertest, 200, [id]);
+        const signalsResponse = await getSignalsByIds(supertest, [id], 200);
+        const signals = signalsResponse.hits.hits.map((hit) => hit._source);
+
+        expect(signals.length).equal(200);
+      });
+    });
+  });
+};
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 12841b9072624..59a99495c14c6 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
@@ -37,14 +37,14 @@ export default ({ getService }: FtrProviderContext) => {
   describe('update_actions', () => {
     describe('updating actions', () => {
       beforeEach(async () => {
-        await esArchiver.load('auditbeat/hosts');
+        await esArchiver.load('x-pack/test/functional/es_archives/auditbeat/hosts');
         await createSignalsIndex(supertest);
       });
 
       afterEach(async () => {
         await deleteSignalsIndex(supertest);
         await deleteAllAlerts(supertest);
-        await esArchiver.unload('auditbeat/hosts');
+        await esArchiver.unload('x-pack/test/functional/es_archives/auditbeat/hosts');
       });
 
       it('should be able to create a new webhook action and update a rule with the webhook action', async () => {
diff --git a/x-pack/test/detection_engine_api_integration/utils.ts b/x-pack/test/detection_engine_api_integration/utils.ts
index 9c5beebd64b3d..54252b19fc940 100644
--- a/x-pack/test/detection_engine_api_integration/utils.ts
+++ b/x-pack/test/detection_engine_api_integration/utils.ts
@@ -412,7 +412,6 @@ export const downgradeImmutableRule = async (es: KibanaClient, ruleId: string):
 export const deleteAllTimelines = async (es: KibanaClient): Promise<void> => {
   await es.deleteByQuery({
     index: '.kibana',
-    // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
     q: 'type:siem-ui-timeline',
     wait_for_completion: true,
     refresh: true,
@@ -429,7 +428,6 @@ export const deleteAllRulesStatuses = async (es: KibanaClient): Promise<void> =>
   return countDownES(async () => {
     return es.deleteByQuery({
       index: '.kibana',
-      // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
       q: 'type:siem-detection-engine-rule-status',
       wait_for_completion: true,
       refresh: true,
@@ -1009,7 +1007,7 @@ export const waitForRuleSuccessOrStatus = async (
       .send({ ids: [id] })
       .expect(200);
     return body[id]?.current_status?.status === status;
-  }, 'waitForRuleSuccess');
+  }, 'waitForRuleSuccessOrStatus');
 };
 
 /**
diff --git a/x-pack/test/encrypted_saved_objects_api_integration/config.ts b/x-pack/test/encrypted_saved_objects_api_integration/config.ts
index 9305431711de6..1eed95568b3fc 100644
--- a/x-pack/test/encrypted_saved_objects_api_integration/config.ts
+++ b/x-pack/test/encrypted_saved_objects_api_integration/config.ts
@@ -19,9 +19,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     junit: {
       reportName: 'X-Pack Encrypted Saved Objects API Integration Tests',
     },
-    esArchiver: {
-      directory: path.join(__dirname, 'fixtures', 'es_archiver'),
-    },
     esTestCluster: xPackAPITestsConfig.get('esTestCluster'),
     kbnTestServer: {
       ...xPackAPITestsConfig.get('kbnTestServer'),
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 f6b0f4e825097..0b01f4f385da6 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
@@ -442,7 +442,6 @@ export default function ({ getService }: FtrProviderContext) {
       afterEach(async () => {
         await es.deleteByQuery({
           index: '.kibana',
-          // @ts-expect-error @elastic/elasticsearch `DeleteByQueryRequest` type doesn't define `q`.
           q: `type:${SAVED_OBJECT_WITH_SECRET_TYPE} OR type:${HIDDEN_SAVED_OBJECT_WITH_SECRET_TYPE} OR type:${SAVED_OBJECT_WITH_SECRET_AND_MULTIPLE_SPACES_TYPE} OR type:${SAVED_OBJECT_WITHOUT_SECRET_TYPE}`,
           refresh: true,
           body: {},
@@ -492,7 +491,6 @@ export default function ({ getService }: FtrProviderContext) {
       afterEach(async () => {
         await es.deleteByQuery({
           index: '.kibana',
-          // @ts-expect-error @elastic/elasticsearch `DeleteByQueryRequest` type doesn't define `q`.
           q: `type:${SAVED_OBJECT_WITH_SECRET_TYPE} OR type:${HIDDEN_SAVED_OBJECT_WITH_SECRET_TYPE} OR type:${SAVED_OBJECT_WITH_SECRET_AND_MULTIPLE_SPACES_TYPE} OR type:${SAVED_OBJECT_WITHOUT_SECRET_TYPE}`,
           refresh: true,
           body: {},
@@ -518,11 +516,15 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('migrations', () => {
       before(async () => {
-        await esArchiver.load('encrypted_saved_objects');
+        await esArchiver.load(
+          'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects'
+        );
       });
 
       after(async () => {
-        await esArchiver.unload('encrypted_saved_objects');
+        await esArchiver.unload(
+          'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/encrypted_saved_objects'
+        );
       });
 
       it('migrates unencrypted fields on saved objects', async () => {
@@ -582,11 +584,15 @@ export default function ({ getService }: FtrProviderContext) {
           roles: ['kibana_admin'],
           full_name: 'a kibana admin',
         });
-        await esArchiver.load('key_rotation');
+        await esArchiver.load(
+          'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation'
+        );
       });
 
       after(async () => {
-        await esArchiver.unload('key_rotation');
+        await esArchiver.unload(
+          'x-pack/test/encrypted_saved_objects_api_integration/fixtures/es_archiver/key_rotation'
+        );
         await security.user.delete('admin');
       });
 
diff --git a/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts b/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts
index d56310709f9f2..d7468bde4c603 100644
--- a/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts
+++ b/x-pack/test/endpoint_api_integration_no_ingest/apis/metadata.ts
@@ -11,8 +11,14 @@ export default function ({ getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const supertest = getService('supertest');
   describe('test metadata api when ingest manager is not initialized', () => {
-    before(async () => await esArchiver.load('endpoint/metadata/api_feature'));
-    after(async () => await esArchiver.unload('endpoint/metadata/api_feature'));
+    before(
+      async () =>
+        await esArchiver.load('x-pack/test/functional/es_archives/endpoint/metadata/api_feature')
+    );
+    after(
+      async () =>
+        await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/metadata/api_feature')
+    );
     it('metadata api should not return results', async () => {
       await supertest.post('/api/endpoint/metadata').set('kbn-xsrf', 'xxx').send().expect(500);
     });
diff --git a/x-pack/test/examples/search_examples/index.ts b/x-pack/test/examples/search_examples/index.ts
index eaaeb22410183..41c4945ca4569 100644
--- a/x-pack/test/examples/search_examples/index.ts
+++ b/x-pack/test/examples/search_examples/index.ts
@@ -15,12 +15,12 @@ export default function ({ getService, loadTestFile }: PluginFunctionalProviderC
     this.tags('ciGroup13');
     before(async () => {
       await esArchiver.emptyKibanaIndex();
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic'); // need at least one index pattern
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic'); // need at least one index pattern
     });
 
     after(async () => {
-      await esArchiver.unload('lens/basic');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
 
     loadTestFile(require.resolve('./search_session_example'));
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 33a4e40482781..a40d445f45ecb 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
@@ -15,10 +15,10 @@ export default function ({ getService }: FtrProviderContext) {
   describe('fleet_agent_policies', () => {
     describe('POST /api/fleet/agent_policies', () => {
       before(async () => {
-        await esArchiver.load('fleet/empty_fleet_server');
+        await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
       });
       after(async () => {
-        await esArchiver.unload('fleet/empty_fleet_server');
+        await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
       });
       it('should work with valid minimum required values', async () => {
         const {
@@ -117,10 +117,10 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('POST /api/fleet/agent_policies/{agentPolicyId}/copy', () => {
       before(async () => {
-        await esArchiver.loadIfNeeded('fleet/agents');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents');
       });
       after(async () => {
-        await esArchiver.unload('fleet/agents');
+        await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
       });
 
       const TEST_POLICY_ID = 'policy1';
@@ -198,7 +198,7 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('PUT /api/fleet/agent_policies/{agentPolicyId}', () => {
       before(async () => {
-        await esArchiver.load('fleet/empty_fleet_server');
+        await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
       });
       const createdPolicyIds: string[] = [];
       after(async () => {
@@ -212,7 +212,7 @@ export default function ({ getService }: FtrProviderContext) {
         await Promise.all(deletedPromises);
       });
       after(async () => {
-        await esArchiver.unload('fleet/empty_fleet_server');
+        await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
       });
       let agentPolicyId: undefined | string;
       it('should work with valid values', async () => {
@@ -325,10 +325,10 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('POST /api/fleet/agent_policies/delete', () => {
       before(async () => {
-        await esArchiver.load('fleet/empty_fleet_server');
+        await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
       });
       after(async () => {
-        await esArchiver.unload('fleet/empty_fleet_server');
+        await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
       });
       let hostedPolicy: any | undefined;
       it('should prevent hosted policies being deleted', async () => {
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 48b7513c87da2..a4f67cd58d935 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
@@ -58,14 +58,14 @@ export default function (providerContext: FtrProviderContext) {
     skipIfNoDockerRegistry(providerContext);
 
     before(async () => {
-      await esArchiver.loadIfNeeded('fleet/agents');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents');
     });
     after(async () => {
       // Wait before agent status is updated
       return new Promise((resolve) => setTimeout(resolve, AGENT_UPDATE_LAST_CHECKIN_INTERVAL_MS));
     });
     after(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     setupFleetAndAgents(providerContext);
diff --git a/x-pack/test/fleet_api_integration/apis/agents/actions.ts b/x-pack/test/fleet_api_integration/apis/agents/actions.ts
index dc951ab4055c2..a701d44319a95 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/actions.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/actions.ts
@@ -15,10 +15,10 @@ export default function (providerContext: FtrProviderContext) {
 
   describe('fleet_agents_actions', () => {
     before(async () => {
-      await esArchiver.load('fleet/agents');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents');
     });
     after(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     it('should return a 200 if this a valid actions request', async () => {
diff --git a/x-pack/test/fleet_api_integration/apis/agents/delete.ts b/x-pack/test/fleet_api_integration/apis/agents/delete.ts
index 15afb34f76ea6..45c468e095e70 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/delete.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/delete.ts
@@ -58,10 +58,10 @@ export default function ({ getService }: FtrProviderContext) {
         }
       }
 
-      await esArchiver.load('fleet/agents');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents');
     });
     after(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     it('should return a 403 if user lacks fleet-write permissions', async () => {
diff --git a/x-pack/test/fleet_api_integration/apis/agents/list.ts b/x-pack/test/fleet_api_integration/apis/agents/list.ts
index 7fa88be708077..a11f4d49fe0f1 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/list.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/list.ts
@@ -68,10 +68,10 @@ export default function ({ getService }: FtrProviderContext) {
         }
       }
 
-      await esArchiver.loadIfNeeded('fleet/agents');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents');
     });
     after(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     it('should return a 403 if a user without the superuser role try to access the APU', async () => {
diff --git a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts
index ac5aabc5c5084..6d2132577da97 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/reassign.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/reassign.ts
@@ -16,20 +16,20 @@ export default function (providerContext: FtrProviderContext) {
 
   describe('reassign agent(s)', () => {
     before(async () => {
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     beforeEach(async () => {
-      await esArchiver.unload('fleet/empty_fleet_server');
-      await esArchiver.load('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents');
       await getService('supertest').post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
     });
     setupFleetAndAgents(providerContext);
     afterEach(async () => {
-      await esArchiver.unload('fleet/agents');
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     after(async () => {
-      await esArchiver.unload('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
 
     describe('reassign single agent', () => {
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 f79ff15b64d33..a20007cee1f6a 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/status.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/status.ts
@@ -17,7 +17,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('fleet_agents_status', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('fleet/agents');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents');
       // 2 agents online
       await es.update({
         id: 'agent1',
@@ -64,7 +64,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
     after(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     it('should return the status of agents', async () => {
diff --git a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts
index df213e82bac7c..05ada4cc6a388 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/unenroll.ts
@@ -23,12 +23,12 @@ export default function (providerContext: FtrProviderContext) {
     let accessAPIKeyId: string;
     let outputAPIKeyId: string;
     before(async () => {
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     setupFleetAndAgents(providerContext);
     beforeEach(async () => {
-      await esArchiver.unload('fleet/empty_fleet_server');
-      await esArchiver.load('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents');
       await getService('supertest').post(`/api/fleet/setup`).set('kbn-xsrf', 'xxx').send();
       const { body: accessAPIKeyBody } = await esClient.security.createApiKey({
         body: {
@@ -67,11 +67,11 @@ export default function (providerContext: FtrProviderContext) {
       });
     });
     afterEach(async () => {
-      await esArchiver.unload('fleet/agents');
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     after(async () => {
-      await esArchiver.unload('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
 
     it('/agents/{agent_id}/unenroll should fail for hosted agent policy', async () => {
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 b692699182cac..8708b035050cc 100644
--- a/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
+++ b/x-pack/test/fleet_api_integration/apis/agents/upgrade.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import semver from 'semver';
 import { FtrProviderContext } from '../../../api_integration/ftr_provider_context';
 import { setupFleetAndAgents } from './services';
@@ -26,17 +26,17 @@ export default function (providerContext: FtrProviderContext) {
   describe('fleet upgrade', () => {
     skipIfNoDockerRegistry(providerContext);
     before(async () => {
-      await esArchiver.load('fleet/agents');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents');
     });
     setupFleetAndAgents(providerContext);
     beforeEach(async () => {
-      await esArchiver.load('fleet/agents');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/agents');
     });
     afterEach(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
     after(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     describe('one agent', () => {
diff --git a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
index 25fb71ae42807..429bc3b80a54f 100644
--- a/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
+++ b/x-pack/test/fleet_api_integration/apis/enrollment_api_keys/crud.ts
@@ -21,11 +21,11 @@ export default function (providerContext: FtrProviderContext) {
 
   describe('fleet_enrollment_api_keys_crud', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('fleet/agents');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     after(async () => {
-      await esArchiver.unload('fleet/agents');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/agents');
     });
 
     skipIfNoDockerRegistry(providerContext);
@@ -177,7 +177,6 @@ export default function (providerContext: FtrProviderContext) {
           id: apiResponse.item.api_key_id,
         });
 
-        // @ts-expect-error Metadata not yet in the client type
         expect(apiKeyRes.api_keys[0].metadata).eql({
           policy_id: 'policy1',
           managed_by: 'fleet',
diff --git a/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts b/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts
new file mode 100644
index 0000000000000..a800546a27a3e
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/epm/final_pipeline.ts
@@ -0,0 +1,187 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 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 '../../../api_integration/ftr_provider_context';
+import { setupFleetAndAgents } from '../agents/services';
+import { skipIfNoDockerRegistry } from '../../helpers';
+
+const TEST_INDEX = 'logs-log.log-test';
+
+const FINAL_PIPELINE_ID = '.fleet_final_pipeline';
+
+let pkgKey: string;
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const esArchiver = getService('esArchiver');
+
+  function indexUsingApiKey(body: any, apiKey: string): Promise<{ body: Record<string, unknown> }> {
+    const supertestWithoutAuth = getService('esSupertestWithoutAuth');
+    return supertestWithoutAuth
+      .post(`/${TEST_INDEX}/_doc`)
+      .set('Authorization', `ApiKey ${apiKey}`)
+      .send(body)
+      .expect(201);
+  }
+
+  describe('fleet_final_pipeline', () => {
+    skipIfNoDockerRegistry(providerContext);
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+    });
+    setupFleetAndAgents(providerContext);
+
+    // Use the custom log package to test the fleet final pipeline
+    before(async () => {
+      const { body: getPackagesRes } = await supertest.get(
+        `/api/fleet/epm/packages?experimental=true`
+      );
+
+      const logPackage = getPackagesRes.response.find((p: any) => p.name === 'log');
+      if (!logPackage) {
+        throw new Error('No log package');
+      }
+
+      pkgKey = `log-${logPackage.version}`;
+
+      await supertest
+        .post(`/api/fleet/epm/packages/${pkgKey}`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ force: true })
+        .expect(200);
+    });
+    after(async () => {
+      await supertest
+        .delete(`/api/fleet/epm/packages/${pkgKey}`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ force: true })
+        .expect(200);
+    });
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+    });
+
+    after(async () => {
+      const res = await es.search({
+        index: TEST_INDEX,
+      });
+
+      for (const hit of res.body.hits.hits) {
+        await es.delete({
+          id: hit._id,
+          index: hit._index,
+        });
+      }
+    });
+
+    it('should correctly setup the final pipeline and apply to fleet managed index template', async () => {
+      const pipelineRes = await es.ingest.getPipeline({ id: FINAL_PIPELINE_ID });
+      expect(pipelineRes.body).to.have.property(FINAL_PIPELINE_ID);
+
+      const res = await es.indices.getIndexTemplate({ name: 'logs-log.log' });
+      expect(res.body.index_templates.length).to.be(1);
+      expect(
+        res.body.index_templates[0]?.index_template?.template?.settings?.index?.final_pipeline
+      ).to.be(FINAL_PIPELINE_ID);
+    });
+
+    it('For a doc written without api key should write the correct api key status', async () => {
+      const res = await es.index({
+        index: 'logs-log.log-test',
+        body: {
+          message: 'message-test-1',
+          '@timestamp': '2020-01-01T09:09:00',
+          agent: {
+            id: 'agent1',
+          },
+        },
+      });
+
+      const { body: doc } = await es.get({
+        id: res.body._id,
+        index: res.body._index,
+      });
+      // @ts-expect-error
+      const event = doc._source.event;
+
+      expect(event.agent_id_status).to.be('no_api_key');
+      expect(event).to.have.property('ingested');
+    });
+
+    const scenarios = [
+      {
+        name: 'API key without metadata',
+        expectedStatus: 'missing_metadata',
+        event: { agent: { id: 'agent1' } },
+      },
+      {
+        name: 'API key with agent id metadata',
+        expectedStatus: 'verified',
+        apiKey: {
+          metadata: {
+            agent_id: 'agent1',
+          },
+        },
+        event: { agent: { id: 'agent1' } },
+      },
+      {
+        name: 'API key with agent id metadata and no agent id in event',
+        expectedStatus: 'missing_metadata',
+        apiKey: {
+          metadata: {
+            agent_id: 'agent1',
+          },
+        },
+      },
+      {
+        name: 'API key with agent id metadata and tampered agent id in event',
+        expectedStatus: 'agent_id_mismatch',
+        apiKey: {
+          metadata: {
+            agent_id: 'agent2',
+          },
+        },
+        event: { agent: { id: 'agent1' } },
+      },
+    ];
+
+    for (const scenario of scenarios) {
+      it(`Should write the correct event.agent_id_status for ${scenario.name}`, async () => {
+        // Create an API key
+        const { body: apiKeyRes } = await es.security.createApiKey({
+          body: {
+            name: `test api key`,
+            ...(scenario.apiKey || {}),
+          },
+        });
+
+        const res = await indexUsingApiKey(
+          {
+            message: 'message-test-1',
+            '@timestamp': '2020-01-01T09:09:00',
+            ...(scenario.event || {}),
+          },
+          Buffer.from(`${apiKeyRes.id}:${apiKeyRes.api_key}`).toString('base64')
+        );
+
+        const { body: doc } = await es.get({
+          id: res.body._id as string,
+          index: res.body._index as string,
+        });
+        // @ts-expect-error
+        const event = doc._source.event;
+
+        expect(event.agent_id_status).to.be(scenario.expectedStatus);
+        expect(event).to.have.property('ingested');
+      });
+    }
+  });
+}
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 445d9706bb9a9..b6a1fd5d7346d 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/index.js
+++ b/x-pack/test/fleet_api_integration/apis/epm/index.js
@@ -25,5 +25,6 @@ export default function loadTests({ loadTestFile }) {
     loadTestFile(require.resolve('./data_stream'));
     loadTestFile(require.resolve('./package_install_complete'));
     loadTestFile(require.resolve('./install_error_rollback'));
+    loadTestFile(require.resolve('./final_pipeline'));
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts
index 6e2ea3b96aa58..faf95c79d6fe2 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/install_error_rollback.ts
@@ -30,10 +30,10 @@ export default function (providerContext: FtrProviderContext) {
   describe('package installation error handling and rollback', async () => {
     skipIfNoDockerRegistry(providerContext);
     beforeEach(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
     afterEach(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     it('on a fresh install, it should uninstall a broken package during rollback', async function () {
diff --git a/x-pack/test/fleet_api_integration/apis/epm/list.ts b/x-pack/test/fleet_api_integration/apis/epm/list.ts
index c482f4012d2e5..931e494798220 100644
--- a/x-pack/test/fleet_api_integration/apis/epm/list.ts
+++ b/x-pack/test/fleet_api_integration/apis/epm/list.ts
@@ -22,11 +22,11 @@ export default function (providerContext: FtrProviderContext) {
   describe('EPM - list', async function () {
     skipIfNoDockerRegistry(providerContext);
     before(async () => {
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     setupFleetAndAgents(providerContext);
     after(async () => {
-      await esArchiver.unload('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
 
     describe('list api tests', async () => {
diff --git a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
index 762a9f5302cef..c399f53fe8366 100644
--- a/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
+++ b/x-pack/test/fleet_api_integration/apis/fleet_setup.ts
@@ -18,13 +18,13 @@ export default function (providerContext: FtrProviderContext) {
   describe('fleet_setup', () => {
     skipIfNoDockerRegistry(providerContext);
     before(async () => {
-      await esArchiver.load('empty_kibana');
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
-      await esArchiver.unload('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     beforeEach(async () => {
       try {
diff --git a/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
new file mode 100644
index 0000000000000..5e4a580473dd1
--- /dev/null
+++ b/x-pack/test/fleet_api_integration/apis/fleet_telemetry.ts
@@ -0,0 +1,127 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor 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 '../../api_integration/ftr_provider_context';
+import { skipIfNoDockerRegistry } from '../helpers';
+import { setupFleetAndAgents } from './agents/services';
+
+export default function (providerContext: FtrProviderContext) {
+  const { getService } = providerContext;
+  const supertest = getService('supertest');
+  const es = getService('es');
+  const esArchiver = getService('esArchiver');
+
+  let agentCount = 0;
+  async function generateAgent(status: string, policyId: string) {
+    let data: any = {};
+
+    switch (status) {
+      case 'unhealthy':
+        data = { last_checkin_status: 'error' };
+        break;
+      case 'offline':
+        data = { last_checkin: '2017-06-07T18:59:04.498Z' };
+        break;
+      default:
+        data = { last_checkin: new Date().toISOString() };
+    }
+
+    await es.index({
+      index: '.fleet-agents',
+      body: {
+        id: `agent-${++agentCount}`,
+        active: true,
+        last_checkin: new Date().toISOString(),
+        policy_id: policyId,
+        policy_revision: 1,
+        ...data,
+      },
+      refresh: 'wait_for',
+    });
+  }
+
+  describe('fleet_telemetry', () => {
+    skipIfNoDockerRegistry(providerContext);
+    before(async () => {
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+    });
+
+    setupFleetAndAgents(providerContext);
+
+    after(async () => {
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
+    });
+
+    before(async () => {
+      // Get FleetServer policy id
+      const { body: apiResponse } = await supertest.get(`/api/fleet/agent_policies`).expect(200);
+      const defaultFleetServerPolicy = apiResponse.items.find(
+        (item: any) => item.is_default_fleet_server
+      );
+
+      const defaultServerPolicy = apiResponse.items.find((item: any) => item.is_default);
+
+      if (!defaultFleetServerPolicy) {
+        throw new Error('No default Fleet server policy');
+      }
+
+      if (!defaultServerPolicy) {
+        throw new Error('No default policy');
+      }
+
+      await supertest
+        .put(`/api/fleet/settings`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({ fleet_server_hosts: ['https://test1.fr', 'https://test2.fr'] })
+        .expect(200);
+
+      // Default Fleet Server
+      await generateAgent('healthy', defaultFleetServerPolicy.id);
+      await generateAgent('healthy', defaultFleetServerPolicy.id);
+      await generateAgent('unhealthy', defaultFleetServerPolicy.id);
+
+      // Default policy
+      await generateAgent('healthy', defaultServerPolicy.id);
+      await generateAgent('offline', defaultServerPolicy.id);
+      await generateAgent('unhealthy', defaultServerPolicy.id);
+    });
+
+    it('should return the correct telemetry values for fleet', async () => {
+      const {
+        body: [apiResponse],
+      } = await supertest
+        .post(`/api/telemetry/v2/clusters/_stats`)
+        .set('kbn-xsrf', 'xxxx')
+        .send({
+          unencrypted: true,
+        })
+        .expect(200);
+
+      expect(apiResponse.stack_stats.kibana.plugins.fleet.agents).eql({
+        total_enrolled: 6,
+        healthy: 3,
+        unhealthy: 2,
+        offline: 1,
+        updating: 0,
+        total_all_statuses: 6,
+      });
+
+      expect(apiResponse.stack_stats.kibana.plugins.fleet.fleet_server).eql({
+        total_all_statuses: 3,
+        total_enrolled: 3,
+        healthy: 2,
+        unhealthy: 1,
+        offline: 0,
+        updating: 0,
+        num_host_urls: 2,
+      });
+    });
+  });
+}
diff --git a/x-pack/test/fleet_api_integration/apis/index.js b/x-pack/test/fleet_api_integration/apis/index.js
index 2357f549c101c..ca6315e1934ab 100644
--- a/x-pack/test/fleet_api_integration/apis/index.js
+++ b/x-pack/test/fleet_api_integration/apis/index.js
@@ -48,5 +48,8 @@ export default function ({ loadTestFile }) {
 
     // Outputs
     loadTestFile(require.resolve('./outputs'));
+
+    // Telemetry
+    loadTestFile(require.resolve('./fleet_telemetry'));
   });
 }
diff --git a/x-pack/test/fleet_api_integration/apis/outputs/crud.ts b/x-pack/test/fleet_api_integration/apis/outputs/crud.ts
index 4238832fb32f0..521675b87fb11 100644
--- a/x-pack/test/fleet_api_integration/apis/outputs/crud.ts
+++ b/x-pack/test/fleet_api_integration/apis/outputs/crud.ts
@@ -18,7 +18,7 @@ export default function (providerContext: FtrProviderContext) {
   describe('fleet_output_crud', async function () {
     skipIfNoDockerRegistry(providerContext);
     before(async () => {
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     setupFleetAndAgents(providerContext);
 
@@ -36,7 +36,7 @@ export default function (providerContext: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
 
     it('GET /outputs should list the default output', async () => {
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts
index 27c5328b3ab08..6a0d46a605386 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/create.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/create.ts
@@ -20,12 +20,16 @@ export default function (providerContext: FtrProviderContext) {
     skipIfNoDockerRegistry(providerContext);
     let agentPolicyId: string;
     before(async () => {
-      await getService('esArchiver').load('empty_kibana');
-      await getService('esArchiver').load('fleet/empty_fleet_server');
+      await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana');
+      await getService('esArchiver').load(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
     });
     after(async () => {
-      await getService('esArchiver').unload('empty_kibana');
-      await getService('esArchiver').unload('fleet/empty_fleet_server');
+      await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana');
+      await getService('esArchiver').unload(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
     });
 
     before(async function () {
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts
index 5889349f57fa0..5a5fb68a1dbc7 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/delete.ts
@@ -21,8 +21,10 @@ export default function (providerContext: FtrProviderContext) {
     let agentPolicy: any;
     let packagePolicy: any;
     before(async () => {
-      await getService('esArchiver').load('empty_kibana');
-      await getService('esArchiver').load('fleet/empty_fleet_server');
+      await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana');
+      await getService('esArchiver').load(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
     });
     before(async function () {
       let agentPolicyResponse = await supertest
@@ -83,8 +85,10 @@ export default function (providerContext: FtrProviderContext) {
         .send({ force: true, packagePolicyIds: [packagePolicy.id] });
     });
     after(async () => {
-      await getService('esArchiver').unload('empty_kibana');
-      await getService('esArchiver').unload('fleet/empty_fleet_server');
+      await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana');
+      await getService('esArchiver').unload(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
     });
 
     it('should fail on hosted agent policies', async function () {
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/get.ts b/x-pack/test/fleet_api_integration/apis/package_policy/get.ts
index b2d51cca75d4d..1e90ab76666fe 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/get.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/get.ts
@@ -23,8 +23,10 @@ export default function (providerContext: FtrProviderContext) {
     let agentPolicyId: string;
     let packagePolicyId: string;
     before(async () => {
-      await getService('esArchiver').load('empty_kibana');
-      await getService('esArchiver').load('fleet/empty_fleet_server');
+      await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana');
+      await getService('esArchiver').load(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
     });
 
     before(async function () {
@@ -78,8 +80,10 @@ export default function (providerContext: FtrProviderContext) {
         .expect(200);
     });
     after(async () => {
-      await getService('esArchiver').unload('fleet/empty_fleet_server');
-      await getService('esArchiver').unload('empty_kibana');
+      await getService('esArchiver').unload(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
+      await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana');
     });
     it('should succeed with a valid id', async function () {
       await supertest.get(`/api/fleet/package_policies/${packagePolicyId}`).expect(200);
diff --git a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts
index 0956b6b0f515f..315ca276c393f 100644
--- a/x-pack/test/fleet_api_integration/apis/package_policy/update.ts
+++ b/x-pack/test/fleet_api_integration/apis/package_policy/update.ts
@@ -24,8 +24,10 @@ export default function (providerContext: FtrProviderContext) {
     let packagePolicyId: string;
     let packagePolicyId2: string;
     before(async () => {
-      await getService('esArchiver').load('empty_kibana');
-      await getService('esArchiver').load('fleet/empty_fleet_server');
+      await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana');
+      await getService('esArchiver').load(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
     });
 
     before(async function () {
@@ -110,8 +112,10 @@ export default function (providerContext: FtrProviderContext) {
     });
 
     after(async () => {
-      await getService('esArchiver').unload('fleet/empty_fleet_server');
-      await getService('esArchiver').unload('empty_kibana');
+      await getService('esArchiver').unload(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
+      await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     it('should work with valid values on "regular" policies', async function () {
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 7d9534cae364a..7fc784ee11af1 100644
--- a/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
+++ b/x-pack/test/fleet_api_integration/apis/preconfiguration/preconfiguration.ts
@@ -21,13 +21,17 @@ export default function (providerContext: FtrProviderContext) {
   describe('Preconfiguration', async () => {
     skipIfNoDockerRegistry(providerContext);
     before(async () => {
-      await getService('esArchiver').load('empty_kibana');
-      await getService('esArchiver').load('fleet/empty_fleet_server');
+      await getService('esArchiver').load('x-pack/test/functional/es_archives/empty_kibana');
+      await getService('esArchiver').load(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
     });
 
     after(async () => {
-      await getService('esArchiver').unload('fleet/empty_fleet_server');
-      await getService('esArchiver').unload('empty_kibana');
+      await getService('esArchiver').unload(
+        'x-pack/test/functional/es_archives/fleet/empty_fleet_server'
+      );
+      await getService('esArchiver').unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     // Basic health check for the API; functionality is covered by the unit tests
diff --git a/x-pack/test/fleet_api_integration/apis/service_tokens.ts b/x-pack/test/fleet_api_integration/apis/service_tokens.ts
index ddd4aed30f76b..0399778b2e13c 100644
--- a/x-pack/test/fleet_api_integration/apis/service_tokens.ts
+++ b/x-pack/test/fleet_api_integration/apis/service_tokens.ts
@@ -16,11 +16,11 @@ export default function (providerContext: FtrProviderContext) {
 
   describe('fleet_service_tokens', async () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('POST /api/fleet/service-tokens', () => {
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 31fcb74627915..1db0fc7e39441 100644
--- a/x-pack/test/fleet_api_integration/apis/settings/update.ts
+++ b/x-pack/test/fleet_api_integration/apis/settings/update.ts
@@ -21,7 +21,7 @@ export default function (providerContext: FtrProviderContext) {
   describe('Settings - update', async function () {
     skipIfNoDockerRegistry(providerContext);
     before(async () => {
-      await esArchiver.load('fleet/empty_fleet_server');
+      await esArchiver.load('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
     setupFleetAndAgents(providerContext);
 
@@ -36,7 +36,7 @@ export default function (providerContext: FtrProviderContext) {
       await Promise.all(deletedPromises);
     });
     after(async () => {
-      await esArchiver.unload('fleet/empty_fleet_server');
+      await esArchiver.unload('x-pack/test/functional/es_archives/fleet/empty_fleet_server');
     });
 
     it('should explicitly set port on fleet_server_hosts', async function () {
diff --git a/x-pack/test/fleet_api_integration/config.ts b/x-pack/test/fleet_api_integration/config.ts
index cd47da8ef5fc3..e17c5cbee9a46 100644
--- a/x-pack/test/fleet_api_integration/config.ts
+++ b/x-pack/test/fleet_api_integration/config.ts
@@ -50,7 +50,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
         waitForLogLine: 'package manifests loaded',
       },
     }),
-    esArchiver: xPackAPITestsConfig.get('esArchiver'),
     services: {
       ...xPackAPITestsConfig.get('services'),
     },
diff --git a/x-pack/test/fleet_functional/page_objects/overview_page.ts b/x-pack/test/fleet_functional/page_objects/overview_page.ts
index ca58acd0a7b6a..2fd351184c7fe 100644
--- a/x-pack/test/fleet_functional/page_objects/overview_page.ts
+++ b/x-pack/test/fleet_functional/page_objects/overview_page.ts
@@ -9,7 +9,7 @@ import { FtrProviderContext } from '../ftr_provider_context';
 import { PLUGIN_ID } from '../../../plugins/fleet/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/applications/fleet/constants/page_paths';
+import { pagePathGetters } from '../../../plugins/fleet/public/constants/page_paths';
 
 export function OverviewPage({ getService, getPageObjects }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
@@ -18,7 +18,7 @@ export function OverviewPage({ getService, getPageObjects }: FtrProviderContext)
   return {
     async navigateToOverview() {
       await pageObjects.common.navigateToApp(PLUGIN_ID, {
-        hash: pagePathGetters.overview(),
+        hash: pagePathGetters.overview()[1],
       });
     },
 
diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
index b93e20ffeed6e..ebe76ee52499b 100644
--- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
+++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_security.ts
@@ -19,11 +19,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security feature controls', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global advanced_settings all privileges', () => {
diff --git a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
index dae03df74f26a..41a03b36d3c43 100644
--- a/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
+++ b/x-pack/test/functional/apps/advanced_settings/feature_controls/advanced_settings_spaces.ts
@@ -18,14 +18,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces feature controls', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     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
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
 
         await spacesService.create({
           id: 'custom_space',
@@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it('shows Management navlink', async () => {
@@ -64,7 +64,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -74,7 +74,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it(`redirects to management home`, async () => {
diff --git a/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts b/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts
index aed7fc63c7b1b..9e25ca1d79f9b 100644
--- a/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts
+++ b/x-pack/test/functional/apps/api_keys/feature_controls/api_keys_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
index 5952c4641344c..7cfdf87aaf9ea 100644
--- a/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
+++ b/x-pack/test/functional/apps/apm/feature_controls/apm_security.ts
@@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
     });
diff --git a/x-pack/test/functional/apps/canvas/custom_elements.ts b/x-pack/test/functional/apps/canvas/custom_elements.ts
index c5b74f1be2b45..026cfbb2f037c 100644
--- a/x-pack/test/functional/apps/canvas/custom_elements.ts
+++ b/x-pack/test/functional/apps/canvas/custom_elements.ts
@@ -24,7 +24,7 @@ export default function canvasCustomElementTest({
     this.tags('skipFirefox');
 
     before(async () => {
-      await esArchiver.load('canvas/default');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
       // open canvas home
       await PageObjects.common.navigateToApp('canvas');
       // load test workpad
diff --git a/x-pack/test/functional/apps/canvas/expression.ts b/x-pack/test/functional/apps/canvas/expression.ts
index b2d2da0553ac5..3e2c20d4dc7da 100644
--- a/x-pack/test/functional/apps/canvas/expression.ts
+++ b/x-pack/test/functional/apps/canvas/expression.ts
@@ -21,7 +21,7 @@ export default function canvasExpressionTest({ getService, getPageObjects }: Ftr
     this.tags('skipFirefox');
 
     before(async () => {
-      await esArchiver.load('canvas/default');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
       // load test workpad
       await PageObjects.common.navigateToApp('canvas', {
         hash: '/workpad/workpad-1705f884-6224-47de-ba49-ca224fe6ec31/page/1',
diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts
index 7f5f5d09f28db..cc6d1b8720462 100644
--- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts
+++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_security.ts
@@ -14,15 +14,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const PageObjects = getPageObjects(['common', 'canvas', 'error', 'security', 'spaceSelector']);
   const appsMenu = getService('appsMenu');
   const globalNav = getService('globalNav');
+  const testSubjects = getService('testSubjects');
 
   describe('security feature controls', function () {
     this.tags(['skipFirefox']);
     before(async () => {
-      await esArchiver.load('canvas/default');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
     });
 
     after(async () => {
-      await esArchiver.unload('canvas/default');
+      await esArchiver.unload('x-pack/test/functional/es_archives/canvas/default');
     });
 
     describe('global canvas all privileges', () => {
@@ -84,10 +85,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       it(`allows a workpad to be created`, async () => {
-        await PageObjects.common.navigateToActualUrl('canvas', 'workpad/create', {
-          ensureCurrentUrl: true,
-          shouldLoginIfPrompted: false,
-        });
+        await PageObjects.common.navigateToActualUrl('canvas');
+
+        await testSubjects.click('create-workpad-button');
 
         await PageObjects.canvas.expectAddElementButton();
       });
diff --git a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts
index 3a0c2f3fcbfaa..3e6c7b9b3080a 100644
--- a/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts
+++ b/x-pack/test/functional/apps/canvas/feature_controls/canvas_spaces.ts
@@ -13,18 +13,19 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const spacesService = getService('spaces');
   const PageObjects = getPageObjects(['common', 'canvas', 'security', 'spaceSelector']);
   const appsMenu = getService('appsMenu');
+  const testSubjects = getService('testSubjects');
 
   describe('spaces feature controls', function () {
     this.tags(['skipFirefox']);
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     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
-        await esArchiver.load('canvas/default');
+        await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
 
         await spacesService.create({
           id: 'custom_space',
@@ -35,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('canvas/default');
+        await esArchiver.unload('x-pack/test/functional/es_archives/canvas/default');
       });
 
       it('shows canvas navlink', async () => {
@@ -55,11 +56,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       it(`allows a workpad to be created`, async () => {
-        await PageObjects.common.navigateToActualUrl('canvas', 'workpad/create', {
+        await PageObjects.common.navigateToActualUrl('canvas', '', {
           ensureCurrentUrl: true,
           shouldLoginIfPrompted: false,
         });
 
+        await testSubjects.click('create-workpad-button');
+
         await PageObjects.canvas.expectAddElementButton();
       });
 
@@ -81,7 +84,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('spaces/disabled_features');
+        await esArchiver.load('x-pack/test/functional/es_archives/spaces/disabled_features');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -91,7 +94,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('spaces/disabled_features');
+        await esArchiver.unload('x-pack/test/functional/es_archives/spaces/disabled_features');
       });
 
       it(`doesn't show canvas navlink`, async () => {
@@ -103,7 +106,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       });
 
       it(`create new workpad returns a 404`, async () => {
-        await PageObjects.common.navigateToActualUrl('canvas', 'workpad/create', {
+        await PageObjects.common.navigateToActualUrl('canvas', '', {
           basePath: '/s/custom_space',
           ensureCurrentUrl: false,
           shouldLoginIfPrompted: false,
diff --git a/x-pack/test/functional/apps/canvas/filters.ts b/x-pack/test/functional/apps/canvas/filters.ts
index 26d9817a8108c..5a82aaa24d64b 100644
--- a/x-pack/test/functional/apps/canvas/filters.ts
+++ b/x-pack/test/functional/apps/canvas/filters.ts
@@ -21,7 +21,7 @@ export default function canvasFiltersTest({ getService, getPageObjects }: FtrPro
     this.tags('skipFirefox');
 
     before(async () => {
-      await esArchiver.load('canvas/filter');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/filter');
       // load test workpad
       await PageObjects.common.navigateToApp('canvas', {
         hash: '/workpad/workpad-b5618217-56d2-47fa-b756-1be2306cda68/page/1',
diff --git a/x-pack/test/functional/apps/canvas/index.js b/x-pack/test/functional/apps/canvas/index.js
index 6796e439ce24f..bf51a326d460d 100644
--- a/x-pack/test/functional/apps/canvas/index.js
+++ b/x-pack/test/functional/apps/canvas/index.js
@@ -13,7 +13,7 @@ export default function canvasApp({ loadTestFile, getService }) {
     before(async () => {
       // init data
       await security.testUser.setRoles(['test_logstash_reader', 'global_canvas_all']);
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     after(async () => {
diff --git a/x-pack/test/functional/apps/canvas/lens.ts b/x-pack/test/functional/apps/canvas/lens.ts
index 3e5db81a6cae5..ed1bf246fae65 100644
--- a/x-pack/test/functional/apps/canvas/lens.ts
+++ b/x-pack/test/functional/apps/canvas/lens.ts
@@ -13,7 +13,7 @@ export default function canvasLensTest({ getService, getPageObjects }: FtrProvid
 
   describe('lens in canvas', function () {
     before(async () => {
-      await esArchiver.load('canvas/lens');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/lens');
       // open canvas home
       await PageObjects.common.navigateToApp('canvas');
       // load test workpad
diff --git a/x-pack/test/functional/apps/canvas/reports.ts b/x-pack/test/functional/apps/canvas/reports.ts
index 7edbca783d928..2c5a027df21aa 100644
--- a/x-pack/test/functional/apps/canvas/reports.ts
+++ b/x-pack/test/functional/apps/canvas/reports.ts
@@ -31,11 +31,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         ],
       });
       await security.testUser.setRoles(['kibana_admin', 'test_reporting_user']);
-      await esArchiver.load('canvas/reports');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/reports');
       await browser.setWindowSize(1600, 850);
     });
     after('clean up archives', async () => {
-      await esArchiver.unload('canvas/reports');
+      await esArchiver.unload('x-pack/test/functional/es_archives/canvas/reports');
       await es.deleteByQuery({
         index: '.reporting-*',
         refresh: true,
diff --git a/x-pack/test/functional/apps/canvas/smoke_test.js b/x-pack/test/functional/apps/canvas/smoke_test.js
index 58f811c0812a4..5280ad0118fba 100644
--- a/x-pack/test/functional/apps/canvas/smoke_test.js
+++ b/x-pack/test/functional/apps/canvas/smoke_test.js
@@ -21,7 +21,7 @@ export default function canvasSmokeTest({ getService, getPageObjects }) {
     const testWorkpadId = 'workpad-1705f884-6224-47de-ba49-ca224fe6ec31';
 
     before(async () => {
-      await esArchiver.load('canvas/default');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
       await PageObjects.common.navigateToApp('canvas');
     });
 
diff --git a/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts b/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts
index 421814f550e68..9c5b20b3f2f0f 100644
--- a/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts
+++ b/x-pack/test/functional/apps/cross_cluster_replication/feature_controls/ccr_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts b/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts
index 865f4c64f0f1a..b1d7c1194e7bc 100644
--- a/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts
+++ b/x-pack/test/functional/apps/dashboard/dashboard_lens_by_value.ts
@@ -18,8 +18,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('dashboard lens by value', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
       await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.preserveCrossAppState();
       await PageObjects.dashboard.clickNewDashboard();
diff --git a/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts b/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts
index 487dc90e1877e..043acf90bb893 100644
--- a/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts
+++ b/x-pack/test/functional/apps/dashboard/dashboard_maps_by_value.ts
@@ -76,8 +76,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('dashboard maps by value', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
     });
 
     describe('adding a map by value', () => {
diff --git a/x-pack/test/functional/apps/dashboard/drilldowns/dashboard_to_dashboard_drilldown.ts b/x-pack/test/functional/apps/dashboard/drilldowns/dashboard_to_dashboard_drilldown.ts
index b891d3cce3ba0..1660bbff10d37 100644
--- a/x-pack/test/functional/apps/dashboard/drilldowns/dashboard_to_dashboard_drilldown.ts
+++ b/x-pack/test/functional/apps/dashboard/drilldowns/dashboard_to_dashboard_drilldown.ts
@@ -24,6 +24,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     'settings',
     'copySavedObjectsToSpace',
   ]);
+  const queryBar = getService('queryBar');
   const pieChart = getService('pieChart');
   const log = getService('log');
   const browser = getService('browser');
@@ -31,6 +32,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   const filterBar = getService('filterBar');
   const security = getService('security');
   const spaces = getService('spaces');
+  const elasticChart = getService('elasticChart');
 
   describe('Dashboard to dashboard drilldown', function () {
     describe('Create & use drilldowns', () => {
@@ -211,7 +213,9 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await navigateWithinDashboard(async () => {
           await dashboardDrilldownPanelActions.clickActionByText(DRILLDOWN_TO_PIE_CHART_NAME);
         });
-        await pieChart.expectPieSliceCount(10);
+        await elasticChart.setNewChartUiDebugFlag();
+        await queryBar.submitQuery();
+        await pieChart.expectPieSliceCountEsCharts(10);
       });
     });
   });
diff --git a/x-pack/test/functional/apps/dashboard/drilldowns/index.ts b/x-pack/test/functional/apps/dashboard/drilldowns/index.ts
index fa24a4ba6a19e..fac0c355ce4d0 100644
--- a/x-pack/test/functional/apps/dashboard/drilldowns/index.ts
+++ b/x-pack/test/functional/apps/dashboard/drilldowns/index.ts
@@ -15,13 +15,13 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
     this.tags(['skipFirefox']);
 
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('dashboard/drilldowns');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
     });
 
     after(async () => {
-      await esArchiver.unload('dashboard/drilldowns');
+      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns');
     });
 
     loadTestFile(require.resolve('./dashboard_to_dashboard_drilldown'));
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 bdbfb5050a32f..70f6fc49f0063 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
@@ -31,18 +31,21 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const queryBar = getService('queryBar');
   const savedQueryManagementComponent = getService('savedQueryManagementComponent');
 
-  // FLAKY: https://github.com/elastic/kibana/issues/86950
-  describe.skip('dashboard feature controls security', () => {
+  describe('dashboard feature controls security', () => {
     before(async () => {
-      await esArchiver.load('dashboard/feature_controls/security');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load(
+        'x-pack/test/functional/es_archives/dashboard/feature_controls/security'
+      );
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
 
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
     });
 
     after(async () => {
-      await esArchiver.unload('dashboard/feature_controls/security');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/dashboard/feature_controls/security'
+      );
 
       // logout, so the other tests don't accidentally run as the custom users we're testing below
       await PageObjects.security.forceLogout();
@@ -86,7 +89,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       it('only shows the dashboard navlink', async () => {
         const navLinks = await appsMenu.readLinks();
-        expect(navLinks.map((link) => link.text)).to.eql(['Overview', 'Dashboard']);
+        expect(navLinks.map((link) => link.text)).to.eql([
+          'Overview',
+          'Dashboard',
+          'Stack Management',
+        ]);
       });
 
       it(`landing page shows "Create new Dashboard" button`, async () => {
@@ -108,8 +115,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await globalNav.badgeMissingOrFail();
       });
 
-      // Can't figure out how to get this test to pass
-      it.skip(`create new dashboard shows addNew button`, async () => {
+      it(`create new dashboard shows addNew button`, async () => {
         await PageObjects.common.navigateToActualUrl(
           'dashboard',
           DashboardConstants.CREATE_NEW_DASHBOARD_URL,
@@ -320,8 +326,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await globalNav.badgeExistsOrFail('Read only');
       });
 
-      // Has this behavior changed?
-      it.skip(`create new dashboard redirects to the home page`, async () => {
+      it(`create new dashboard shows the read only warning`, async () => {
         await PageObjects.common.navigateToActualUrl(
           'dashboard',
           DashboardConstants.CREATE_NEW_DASHBOARD_URL,
@@ -330,7 +335,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', { timeout: 20000 });
+        await testSubjects.existOrFail('dashboardEmptyReadOnly', { timeout: 20000 });
       });
 
       it(`can view existing Dashboard`, async () => {
@@ -347,6 +352,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         });
       });
 
+      it('does not allow copy to dashboard behaviour', async () => {
+        await panelActions.expectMissingPanelAction('embeddablePanelAction-copyToDashboard');
+      });
+
       it(`Permalinks doesn't show create short-url button`, async () => {
         await PageObjects.share.openShareMenuItem('Permalinks');
         await PageObjects.share.createShortUrlMissingOrFail();
@@ -438,8 +447,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
         await globalNav.badgeExistsOrFail('Read only');
       });
 
-      // Has this behavior changed?
-      it.skip(`create new dashboard redirects to the home page`, async () => {
+      it(`create new dashboard shows the read only warning`, async () => {
         await PageObjects.common.navigateToActualUrl(
           'dashboard',
           DashboardConstants.CREATE_NEW_DASHBOARD_URL,
@@ -448,7 +456,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
             shouldLoginIfPrompted: false,
           }
         );
-        await testSubjects.existOrFail('homeApp', { timeout: 20000 });
+        await testSubjects.existOrFail('dashboardEmptyReadOnly', { timeout: 20000 });
       });
 
       it(`can view existing Dashboard`, async () => {
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts b/x-pack/test/functional/apps/dashboard/feature_controls/dashboard_spaces.ts
index eb92db32abd73..2cab9263b5f49 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
@@ -22,14 +22,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     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
-        await esArchiver.load('dashboard/feature_controls/spaces');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces'
+        );
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -39,7 +41,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('dashboard/feature_controls/spaces');
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces'
+        );
       });
 
       it('shows dashboard navlink', async () => {
@@ -101,7 +105,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('dashboard/feature_controls/spaces');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces'
+        );
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -111,7 +117,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('dashboard/feature_controls/spaces');
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/dashboard/feature_controls/spaces'
+        );
       });
 
       it(`doesn't show dashboard navlink`, async () => {
diff --git a/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts b/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts
index 2c151235518e0..1a5f8c34a183c 100644
--- a/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts
+++ b/x-pack/test/functional/apps/dashboard/feature_controls/time_to_visualize_security.ts
@@ -29,11 +29,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const security = getService('security');
   const find = getService('find');
 
-  // flaky https://github.com/elastic/kibana/issues/98249
-  describe.skip('dashboard time to visualize security', () => {
+  describe('dashboard time to visualize security', () => {
     before(async () => {
-      await esArchiver.load('dashboard/feature_controls/security');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load(
+        'x-pack/test/functional/es_archives/dashboard/feature_controls/security'
+      );
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
 
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
@@ -72,7 +73,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       await security.role.delete('dashboard_write_vis_read');
       await security.user.delete('dashboard_write_vis_read_user');
 
-      await esArchiver.unload('dashboard/feature_controls/security');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/dashboard/feature_controls/security'
+      );
 
       // logout, so the other tests don't accidentally run as the custom users we're testing below
       await PageObjects.security.forceLogout();
diff --git a/x-pack/test/functional/apps/dashboard/preserve_url.ts b/x-pack/test/functional/apps/dashboard/preserve_url.ts
index 2eb51a07c5d69..e391a8b346f6f 100644
--- a/x-pack/test/functional/apps/dashboard/preserve_url.ts
+++ b/x-pack/test/functional/apps/dashboard/preserve_url.ts
@@ -16,11 +16,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('preserve url', function () {
     before(async function () {
-      await esArchiver.load('spaces/multi_space');
+      await esArchiver.load('x-pack/test/functional/es_archives/spaces/multi_space');
     });
 
     after(function () {
-      return esArchiver.unload('spaces/multi_space');
+      return esArchiver.unload('x-pack/test/functional/es_archives/spaces/multi_space');
     });
 
     it('goes back to last opened url', async function () {
diff --git a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
index d4a909f6a0474..e736fe08eba99 100644
--- a/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
+++ b/x-pack/test/functional/apps/dashboard/reporting/download_csv.ts
@@ -66,12 +66,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('E-Commerce Data', () => {
       before(async () => {
-        await esArchiver.load('reporting/ecommerce');
-        await esArchiver.load('reporting/ecommerce_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       });
       after(async () => {
-        await esArchiver.unload('reporting/ecommerce');
-        await esArchiver.unload('reporting/ecommerce_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       });
 
       it('Download CSV export of a saved search panel', async function () {
@@ -116,10 +116,10 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('Field Formatters and Scripted Fields', () => {
       before(async () => {
-        await esArchiver.load('reporting/hugedata');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/hugedata');
       });
       after(async () => {
-        await esArchiver.unload('reporting/hugedata');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/hugedata');
       });
 
       it('Download CSV export of a saved search panel', async () => {
diff --git a/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts b/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts
index 94de5999a6a07..7c5e4b2d12baa 100644
--- a/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts
+++ b/x-pack/test/functional/apps/dashboard/reporting/screenshots.ts
@@ -30,8 +30,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('Dashboard Reporting Screenshots', () => {
     before('initialize tests', async () => {
-      await esArchiver.loadIfNeeded('reporting/ecommerce');
-      await esArchiver.loadIfNeeded('reporting/ecommerce_kibana');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.loadIfNeeded(
+        'x-pack/test/functional/es_archives/reporting/ecommerce_kibana'
+      );
       await browser.setWindowSize(1600, 850);
 
       await security.role.create('test_reporting_user', {
@@ -58,8 +60,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       await security.testUser.setRoles(['test_reporting_user']);
     });
     after('clean up archives', async () => {
-      await esArchiver.unload('reporting/ecommerce');
-      await esArchiver.unload('reporting/ecommerce_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       await es.deleteByQuery({
         index: '.reporting-*',
         refresh: true,
diff --git a/x-pack/test/functional/apps/dashboard/sync_colors.ts b/x-pack/test/functional/apps/dashboard/sync_colors.ts
index 3a135fb41a58d..2fcc1cf5614fb 100644
--- a/x-pack/test/functional/apps/dashboard/sync_colors.ts
+++ b/x-pack/test/functional/apps/dashboard/sync_colors.ts
@@ -36,13 +36,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   // FLAKY: https://github.com/elastic/kibana/issues/97403
   describe.skip('sync colors', function () {
     before(async function () {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
     });
 
     after(async function () {
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.unload('lens/basic');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
 
     it('should sync colors on dashboard by default', async function () {
diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
index 37311de534195..96c40bc4cf409 100644
--- a/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
+++ b/x-pack/test/functional/apps/dashboard_mode/dashboard_empty_screen.js
@@ -15,8 +15,8 @@ export default function ({ getPageObjects, getService }) {
 
   describe('empty dashboard', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
       await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.preserveCrossAppState();
       await PageObjects.dashboard.clickNewDashboard();
diff --git a/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js b/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
index 51e41fe760ddd..b3f15e2dffa0b 100644
--- a/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
+++ b/x-pack/test/functional/apps/dashboard_mode/dashboard_view_mode.js
@@ -37,8 +37,8 @@ export default function ({ getService, getPageObjects }) {
 
     before('initialize tests', async () => {
       log.debug('Dashboard View Mode:initTests');
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('dashboard_view_mode');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/dashboard_view_mode');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await browser.setWindowSize(1600, 1000);
 
diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
index 9f081983a2965..5b80f6589281a 100644
--- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
+++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_security.ts
@@ -19,7 +19,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
 
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
diff --git a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts
index 58bf5d12c19a5..2aa9a4de922f0 100644
--- a/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts
+++ b/x-pack/test/functional/apps/dev_tools/feature_controls/dev_tools_spaces.ts
@@ -18,11 +18,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('space with no features disabled', () => {
diff --git a/x-pack/test/functional/apps/discover/async_scripted_fields.js b/x-pack/test/functional/apps/discover/async_scripted_fields.js
index 7364f2883bd1a..2c18051405964 100644
--- a/x-pack/test/functional/apps/discover/async_scripted_fields.js
+++ b/x-pack/test/functional/apps/discover/async_scripted_fields.js
@@ -23,8 +23,10 @@ export default function ({ getService, getPageObjects }) {
     this.tags(['skipFirefox']);
 
     before(async function () {
-      await esArchiver.load('kibana_scripted_fields_on_logstash');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load(
+        'x-pack/test/functional/es_archives/kibana_scripted_fields_on_logstash'
+      );
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       await security.testUser.setRoles(['test_logstash_reader', 'global_discover_read']);
       // changing the timepicker default here saves us from having to set it in Discover (~8s)
       await kibanaServer.uiSettings.update({
@@ -36,8 +38,8 @@ export default function ({ getService, getPageObjects }) {
     after(async function afterAll() {
       await kibanaServer.uiSettings.replace({});
       await kibanaServer.uiSettings.update({});
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.load('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await security.testUser.restoreDefaults();
     });
 
diff --git a/x-pack/test/functional/apps/discover/error_handling.ts b/x-pack/test/functional/apps/discover/error_handling.ts
index 751b6b1032950..19cedc8ecb555 100644
--- a/x-pack/test/functional/apps/discover/error_handling.ts
+++ b/x-pack/test/functional/apps/discover/error_handling.ts
@@ -15,14 +15,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('errors', function describeIndexTests() {
     before(async function () {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('invalid_scripted_field');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/invalid_scripted_field');
       await PageObjects.timePicker.setDefaultAbsoluteRangeViaUiSettings();
       await PageObjects.common.navigateToApp('discover');
     });
 
     after(async function () {
-      await esArchiver.unload('invalid_scripted_field');
+      await esArchiver.unload('x-pack/test/functional/es_archives/invalid_scripted_field');
     });
 
     // this is the same test as in OSS but it catches different error message issue in different licences
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 f44d7c42a23c1..6c3e5b8f01102 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
@@ -32,15 +32,19 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('discover feature controls security', () => {
     before(async () => {
-      await esArchiver.load('discover/feature_controls/security');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load(
+        'x-pack/test/functional/es_archives/discover/feature_controls/security'
+      );
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
 
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
     });
 
     after(async () => {
-      await esArchiver.unload('discover/feature_controls/security');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/discover/feature_controls/security'
+      );
 
       // logout, so the other tests don't accidentally run as the custom users we're testing below
       await PageObjects.security.forceLogout();
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 3c77ff0527827..c05b15905b932 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
@@ -29,14 +29,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     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
-        await esArchiver.load('discover/feature_controls/spaces');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/discover/feature_controls/spaces'
+        );
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -46,7 +48,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('discover/feature_controls/spaces');
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/discover/feature_controls/spaces'
+        );
       });
 
       it('shows discover navlink', async () => {
@@ -80,7 +84,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('discover/feature_controls/spaces');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/discover/feature_controls/spaces'
+        );
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -90,7 +96,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('discover/feature_controls/spaces');
+        await esArchiver.unload(
+          'x-pack/test/functional/es_archives/discover/feature_controls/spaces'
+        );
       });
 
       it(`doesn't show discover navlink`, async () => {
@@ -116,7 +124,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('spaces/disabled_features');
+        await esArchiver.load('x-pack/test/functional/es_archives/spaces/disabled_features');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -126,7 +134,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('spaces/disabled_features');
+        await esArchiver.unload('x-pack/test/functional/es_archives/spaces/disabled_features');
       });
 
       it('Does not show the "visualize" field button', async () => {
diff --git a/x-pack/test/functional/apps/discover/preserve_url.ts b/x-pack/test/functional/apps/discover/preserve_url.ts
index 649b8a0996106..aa11b99867371 100644
--- a/x-pack/test/functional/apps/discover/preserve_url.ts
+++ b/x-pack/test/functional/apps/discover/preserve_url.ts
@@ -15,11 +15,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('preserve url', function () {
     before(async function () {
-      await esArchiver.load('spaces/multi_space');
+      await esArchiver.load('x-pack/test/functional/es_archives/spaces/multi_space');
     });
 
     after(function () {
-      return esArchiver.unload('spaces/multi_space');
+      return esArchiver.unload('x-pack/test/functional/es_archives/spaces/multi_space');
     });
 
     it('goes back to last opened url', async function () {
diff --git a/x-pack/test/functional/apps/discover/reporting.ts b/x-pack/test/functional/apps/discover/reporting.ts
index 25a7674e47e84..2b424b94b7236 100644
--- a/x-pack/test/functional/apps/discover/reporting.ts
+++ b/x-pack/test/functional/apps/discover/reporting.ts
@@ -24,13 +24,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('Discover CSV Export', () => {
     before('initialize tests', async () => {
       log.debug('ReportingPage:initTests');
-      await esArchiver.load('reporting/ecommerce');
-      await esArchiver.load('reporting/ecommerce_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       await browser.setWindowSize(1600, 850);
     });
     after('clean up archives', async () => {
-      await esArchiver.unload('reporting/ecommerce');
-      await esArchiver.unload('reporting/ecommerce_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       await es.deleteByQuery({
         index: '.reporting-*',
         refresh: true,
@@ -74,7 +74,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('Generate CSV: new search', () => {
       beforeEach(async () => {
-        await esArchiver.load('reporting/ecommerce_kibana'); // reload the archive to wipe out changes made by each test
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana'); // reload the archive to wipe out changes made by each test
         await PageObjects.common.navigateToApp('discover');
       });
 
@@ -150,13 +150,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       };
 
       before(async () => {
-        await esArchiver.load('reporting/ecommerce');
-        await esArchiver.load('reporting/ecommerce_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       });
 
       after(async () => {
-        await esArchiver.unload('reporting/ecommerce');
-        await esArchiver.unload('reporting/ecommerce_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       });
 
       beforeEach(() => PageObjects.common.navigateToApp('discover'));
diff --git a/x-pack/test/functional/apps/discover/saved_searches.ts b/x-pack/test/functional/apps/discover/saved_searches.ts
index f811e705e1967..5df9bf9949128 100644
--- a/x-pack/test/functional/apps/discover/saved_searches.ts
+++ b/x-pack/test/functional/apps/discover/saved_searches.ts
@@ -19,13 +19,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Discover Saved Searches', () => {
     before('initialize tests', async () => {
-      await esArchiver.load('reporting/ecommerce');
-      await esArchiver.load('reporting/ecommerce_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       await kibanaServer.uiSettings.update({ 'doc_table:legacy': false });
     });
     after('clean up archives', async () => {
-      await esArchiver.unload('reporting/ecommerce');
-      await esArchiver.unload('reporting/ecommerce_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       await kibanaServer.uiSettings.unset('doc_table:legacy');
     });
 
diff --git a/x-pack/test/functional/apps/discover/value_suggestions.ts b/x-pack/test/functional/apps/discover/value_suggestions.ts
index 087c952040cbf..7d5f500992eb7 100644
--- a/x-pack/test/functional/apps/discover/value_suggestions.ts
+++ b/x-pack/test/functional/apps/discover/value_suggestions.ts
@@ -15,14 +15,14 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('value suggestions', function describeIndexTests() {
     before(async function () {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('dashboard/drilldowns');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns');
       await PageObjects.common.navigateToApp('discover');
       await PageObjects.timePicker.setDefaultAbsoluteRange();
     });
 
     after(async () => {
-      await esArchiver.unload('dashboard/drilldowns');
+      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns');
     });
 
     it('show up', async () => {
diff --git a/x-pack/test/functional/apps/discover/visualize_field.ts b/x-pack/test/functional/apps/discover/visualize_field.ts
index d0d7c25c205e5..650d67f05129c 100644
--- a/x-pack/test/functional/apps/discover/visualize_field.ts
+++ b/x-pack/test/functional/apps/discover/visualize_field.ts
@@ -30,14 +30,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('discover field visualize button', () => {
     beforeEach(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
       await PageObjects.common.navigateToApp('discover');
       await setDiscoverTimeRange();
     });
 
     after(async () => {
-      await esArchiver.unload('lens/basic');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
 
     it('shows "visualize" field button', async () => {
diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts
index 206d0f2dd0f99..cc121dccfb13e 100644
--- a/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts
+++ b/x-pack/test/functional/apps/graph/feature_controls/graph_security.ts
@@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
     });
diff --git a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts
index 9ef9929a08c33..a1911bf5f02be 100644
--- a/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts
+++ b/x-pack/test/functional/apps/graph/feature_controls/graph_spaces.ts
@@ -17,7 +17,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
     describe('space with no features disabled', () => {
       before(async () => {
diff --git a/x-pack/test/functional/apps/graph/graph.ts b/x-pack/test/functional/apps/graph/graph.ts
index 172120e2a9e7a..172686692110e 100644
--- a/x-pack/test/functional/apps/graph/graph.ts
+++ b/x-pack/test/functional/apps/graph/graph.ts
@@ -18,8 +18,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     before(async () => {
       await browser.setWindowSize(1600, 1000);
       log.debug('load graph/secrepo data');
-      await esArchiver.loadIfNeeded('graph/secrepo');
-      await esArchiver.load('empty_kibana');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/graph/secrepo');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('settings');
       log.debug('create secrepo index pattern');
       await PageObjects.settings.createIndexPattern('secrepo', '@timestamp');
diff --git a/x-pack/test/functional/apps/grok_debugger/grok_debugger.js b/x-pack/test/functional/apps/grok_debugger/grok_debugger.js
index 77753641916f6..68cd5820e2a32 100644
--- a/x-pack/test/functional/apps/grok_debugger/grok_debugger.js
+++ b/x-pack/test/functional/apps/grok_debugger/grok_debugger.js
@@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }) {
   describe.skip('grok debugger app', function () {
     this.tags('includeFirefox');
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       // Increase window height to ensure "Simulate" button is shown above the
       // fold. Otherwise it can't be clicked by the browser driver.
       await browser.setWindowSize(1600, 1000);
diff --git a/x-pack/test/functional/apps/home/feature_controls/home_security.ts b/x-pack/test/functional/apps/home/feature_controls/home_security.ts
index 9bd6e1f5da094..92d477a92f270 100644
--- a/x-pack/test/functional/apps/home/feature_controls/home_security.ts
+++ b/x-pack/test/functional/apps/home/feature_controls/home_security.ts
@@ -16,15 +16,19 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('dashboard/feature_controls/security');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load(
+        'x-pack/test/functional/es_archives/dashboard/feature_controls/security'
+      );
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
 
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
     });
 
     after(async () => {
-      await esArchiver.unload('dashboard/feature_controls/security');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/dashboard/feature_controls/security'
+      );
 
       // logout, so the other tests don't accidentally run as the custom users we're testing below
       await PageObjects.security.forceLogout();
diff --git a/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts b/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts
index f71f7e827980c..a392df276a34c 100644
--- a/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts
+++ b/x-pack/test/functional/apps/index_lifecycle_management/feature_controls/ilm_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts b/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts
index 4b453c519fa07..cb590fe4c3812 100644
--- a/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts
+++ b/x-pack/test/functional/apps/index_management/feature_controls/index_management_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
index 8da6871842b15..04f251d247d1b 100644
--- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
+++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_security.ts
@@ -19,11 +19,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global index_patterns all privileges', () => {
diff --git a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts
index cc3dadb69b103..10a25da4ef0fa 100644
--- a/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts
+++ b/x-pack/test/functional/apps/index_patterns/feature_controls/index_patterns_spaces.ts
@@ -18,14 +18,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     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
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
 
         await spacesService.create({
           id: 'custom_space',
@@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it('shows Management navlink', async () => {
@@ -58,7 +58,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -68,7 +68,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it(`redirects to management home`, async () => {
diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
index 2d4f3040ecdc9..0118cfdafc2b3 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_security.ts
@@ -82,11 +82,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       describe('infrastructure landing page with data', () => {
         before(async () => {
-          await esArchiver.load('infra/metrics_and_logs');
+          await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
 
         after(async () => {
-          await esArchiver.unload('infra/metrics_and_logs');
+          await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
 
         it(`shows Wafflemap`, async () => {
@@ -180,11 +180,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       describe('infrastructure landing page with data', () => {
         before(async () => {
-          await esArchiver.load('infra/metrics_and_logs');
+          await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
 
         after(async () => {
-          await esArchiver.unload('infra/metrics_and_logs');
+          await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
 
         it(`shows Wafflemap`, async () => {
@@ -259,11 +259,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       describe('infrastructure landing page with data', () => {
         before(async () => {
-          await esArchiver.load('infra/metrics_and_logs');
+          await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
 
         after(async () => {
-          await esArchiver.unload('infra/metrics_and_logs');
+          await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
       });
     });
@@ -312,11 +312,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       describe('infrastructure landing page with data', () => {
         before(async () => {
-          await esArchiver.load('infra/metrics_and_logs');
+          await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
 
         after(async () => {
-          await esArchiver.unload('infra/metrics_and_logs');
+          await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         });
       });
     });
diff --git a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts
index 7059d26f6c977..94886a89002b2 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/infrastructure_spaces.ts
@@ -17,11 +17,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('infrastructure spaces', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('space with no features disabled', () => {
@@ -59,7 +59,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -69,7 +69,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it(`doesn't show metrics navlink`, async () => {
@@ -101,7 +101,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -111,7 +111,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it(`Metrics app is accessible`, async () => {
@@ -126,7 +126,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -136,7 +136,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it(`Metrics app is accessible`, async () => {
diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
index d231bd77e8dfa..d5e22af657d6a 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/logs_security.ts
@@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('logs security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
     describe('global logs all privileges', () => {
       before(async () => {
diff --git a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts
index 2a8bbc75d0db9..a67d7d1858af3 100644
--- a/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts
+++ b/x-pack/test/functional/apps/infra/feature_controls/logs_spaces.ts
@@ -20,7 +20,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
 
         await spacesService.create({
           id: 'custom_space',
@@ -31,7 +31,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it('shows Logs navlink', async () => {
@@ -60,7 +60,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -70,7 +70,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it(`doesn't show Logs navlink`, async () => {
diff --git a/x-pack/test/functional/apps/infra/home_page.ts b/x-pack/test/functional/apps/infra/home_page.ts
index 7578abbad33e7..3e2d356edc69f 100644
--- a/x-pack/test/functional/apps/infra/home_page.ts
+++ b/x-pack/test/functional/apps/infra/home_page.ts
@@ -18,11 +18,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   describe('Home page', function () {
     this.tags('includeFirefox');
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('without metrics present', () => {
-      before(async () => await esArchiver.unload('infra/metrics_and_logs'));
+      before(
+        async () =>
+          await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')
+      );
 
       it('renders an empty data prompt', async () => {
         await pageObjects.common.navigateToApp('infraOps');
@@ -32,11 +35,14 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
     describe('with metrics present', () => {
       before(async () => {
-        await esArchiver.load('infra/metrics_and_logs');
+        await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
         await pageObjects.common.navigateToApp('infraOps');
         await pageObjects.infraHome.waitForLoading();
       });
-      after(async () => await esArchiver.unload('infra/metrics_and_logs'));
+      after(
+        async () =>
+          await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs')
+      );
 
       it('renders the waffle map and tooltips for dates with data', async () => {
         await pageObjects.infraHome.goToTime(DATE_WITH_DATA);
diff --git a/x-pack/test/functional/apps/infra/logs_source_configuration.ts b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
index 737fea2adedb9..b84109637885c 100644
--- a/x-pack/test/functional/apps/infra/logs_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/logs_source_configuration.ts
@@ -24,18 +24,18 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
   describe('Logs Source Configuration', function () {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('Allows indices configuration', () => {
       before(async () => {
-        await esArchiver.load('infra/metrics_and_logs');
+        await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
       });
       after(async () => {
-        await esArchiver.unload('infra/metrics_and_logs');
+        await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
       });
 
       it('can change the log indices to a pattern that matches nothing', async () => {
diff --git a/x-pack/test/functional/apps/infra/metrics_anomalies.ts b/x-pack/test/functional/apps/infra/metrics_anomalies.ts
index a3160c023d4a7..5b481abae48d7 100644
--- a/x-pack/test/functional/apps/infra/metrics_anomalies.ts
+++ b/x-pack/test/functional/apps/infra/metrics_anomalies.ts
@@ -18,10 +18,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   // Failing: See https://github.com/elastic/kibana/issues/100445
   describe('Metrics UI Anomaly Flyout', function () {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('with no anomalies present', () => {
@@ -41,7 +41,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
     describe('with anomalies present', () => {
       before(async () => {
-        await esArchiver.load('infra/metrics_anomalies');
+        await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_anomalies');
         // create the ml jobs saved objects
         await Promise.all(
           ML_JOB_IDS.map((id) =>
@@ -59,7 +59,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         );
       });
       after(async () => {
-        await esArchiver.unload('infra/metrics_anomalies');
+        await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_anomalies');
       });
       it('renders the anomaly table with anomalies', async () => {
         // default threshold should already be 50 but trying to prevent unknown flakiness by setting it
diff --git a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
index 7b7e1e5618256..5d2f7b09ab167 100644
--- a/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
+++ b/x-pack/test/functional/apps/infra/metrics_source_configuration.ts
@@ -17,18 +17,18 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
   describe('Infrastructure Source Configuration', function () {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('with metrics present', () => {
       before(async () => {
-        await esArchiver.load('infra/metrics_and_logs');
+        await esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs');
       });
       after(async () => {
-        await esArchiver.unload('infra/metrics_and_logs');
+        await esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs');
       });
 
       it('renders the waffle map', async () => {
diff --git a/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts b/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts
index 6c22ccaa76245..ea3781de58f15 100644
--- a/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts
+++ b/x-pack/test/functional/apps/ingest_pipelines/feature_controls/ingest_pipelines_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/lens/chart_data.ts b/x-pack/test/functional/apps/lens/chart_data.ts
index b87d4e999d597..498c722f33c2e 100644
--- a/x-pack/test/functional/apps/lens/chart_data.ts
+++ b/x-pack/test/functional/apps/lens/chart_data.ts
@@ -76,12 +76,47 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     it.skip('should render treemap chart', async () => {
-      await PageObjects.lens.switchToVisualization('treemap');
+      await PageObjects.lens.switchToVisualization('treemap', 'treemap');
       await PageObjects.lens.waitForVisualization();
       const data = await PageObjects.lens.getCurrentChartDebugState();
       assertMatchesExpectedData(data!);
     });
 
+    it('should render heatmap chart', async () => {
+      await PageObjects.lens.switchToVisualization('heatmap', 'heatmap');
+      await PageObjects.lens.waitForVisualization();
+      const debugState = await PageObjects.lens.getCurrentChartDebugState();
+
+      if (!debugState) {
+        throw new Error('Debug state is not available');
+      }
+
+      // assert axes
+      expect(debugState.axes!.x[0].labels).to.eql([
+        '97.220.3.248',
+        '169.228.188.120',
+        '78.83.247.30',
+        '226.82.228.233',
+        '93.28.27.24',
+        'Other',
+      ]);
+      expect(debugState.axes!.y[0].labels).to.eql(['']);
+
+      // assert cells
+      expect(debugState.heatmap!.cells.length).to.eql(6);
+
+      // assert legend
+      expect(debugState.legend!.items).to.eql([
+        { key: '6000', name: '> 6,000', color: '#6092c0' },
+        { key: '8000', name: '> 8,000', color: '#6092c0' },
+        { key: '10000', name: '> 10,000', color: '#a8bfda' },
+        { key: '12000', name: '> 12,000', color: '#ebeff5' },
+        { key: '14000', name: '> 14,000', color: '#ebeff5' },
+        { key: '16000', name: '> 16,000', color: '#ecb385' },
+        { key: '18000', name: '> 18,000', color: '#e7664c' },
+      ]);
+    });
+
     it('should render datatable', async () => {
       await PageObjects.lens.switchToVisualization('lnsDatatable');
       await PageObjects.lens.waitForVisualization();
diff --git a/x-pack/test/functional/apps/lens/drag_and_drop.ts b/x-pack/test/functional/apps/lens/drag_and_drop.ts
index 1ab107becfb0e..21c0b30a92be3 100644
--- a/x-pack/test/functional/apps/lens/drag_and_drop.ts
+++ b/x-pack/test/functional/apps/lens/drag_and_drop.ts
@@ -119,7 +119,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           'Unique count of @message.raw [2]',
         ]);
       });
-      it('should duplicate the column when dragging to empty dimension in the same group', async () => {
+      it('should move duplicated column to non-compatible dimension group', async () => {
         await PageObjects.lens.dragDimensionToDimension(
           'lnsXY_yDimensionPanel > lns-dimensionTrigger',
           'lnsXY_xDimensionPanel > lns-empty-dimension'
diff --git a/x-pack/test/functional/apps/lens/index.ts b/x-pack/test/functional/apps/lens/index.ts
index d0466b8814fec..1efceace8b167 100644
--- a/x-pack/test/functional/apps/lens/index.ts
+++ b/x-pack/test/functional/apps/lens/index.ts
@@ -16,13 +16,13 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
     before(async () => {
       log.debug('Starting lens before method');
       await browser.setWindowSize(1280, 800);
-      await esArchiver.load('logstash_functional');
-      await esArchiver.load('lens/basic');
+      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/lens/basic');
     });
 
     after(async () => {
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.unload('lens/basic');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
 
     describe('', function () {
@@ -36,6 +36,7 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       loadTestFile(require.resolve('./persistent_context'));
       loadTestFile(require.resolve('./colors'));
       loadTestFile(require.resolve('./chart_data'));
+      loadTestFile(require.resolve('./time_shift'));
       loadTestFile(require.resolve('./drag_and_drop'));
       loadTestFile(require.resolve('./geo_field'));
       loadTestFile(require.resolve('./lens_reporting'));
diff --git a/x-pack/test/functional/apps/lens/lens_reporting.ts b/x-pack/test/functional/apps/lens/lens_reporting.ts
index 658a9dbcac822..fb4c501baaf80 100644
--- a/x-pack/test/functional/apps/lens/lens_reporting.ts
+++ b/x-pack/test/functional/apps/lens/lens_reporting.ts
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('lens reporting', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('lens/reporting');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/reporting');
       await security.role.create('test_reporting_user', {
         elasticsearch: { cluster: [], indices: [], run_as: [] },
         kibana: [
@@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('lens/reporting');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/reporting');
       await es.deleteByQuery({
         index: '.reporting-*',
         refresh: true,
diff --git a/x-pack/test/functional/apps/lens/lens_tagging.ts b/x-pack/test/functional/apps/lens/lens_tagging.ts
index 6fff2baa2d0cc..b659515a6031c 100644
--- a/x-pack/test/functional/apps/lens/lens_tagging.ts
+++ b/x-pack/test/functional/apps/lens/lens_tagging.ts
@@ -30,8 +30,8 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('lens tagging', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
       await PageObjects.common.navigateToApp('dashboard');
       await PageObjects.dashboard.preserveCrossAppState();
       await PageObjects.dashboard.clickNewDashboard();
diff --git a/x-pack/test/functional/apps/lens/rollup.ts b/x-pack/test/functional/apps/lens/rollup.ts
index 86b34e893e7b1..34620a734cfd7 100644
--- a/x-pack/test/functional/apps/lens/rollup.ts
+++ b/x-pack/test/functional/apps/lens/rollup.ts
@@ -16,13 +16,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('lens rollup tests', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('lens/rollup/data');
-      await esArchiver.loadIfNeeded('lens/rollup/config');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/rollup/data');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/rollup/config');
     });
 
     after(async () => {
-      await esArchiver.unload('lens/rollup/data');
-      await esArchiver.unload('lens/rollup/config');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/rollup/data');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/rollup/config');
     });
 
     it('should allow creation of lens xy chart', async () => {
diff --git a/x-pack/test/functional/apps/lens/smokescreen.ts b/x-pack/test/functional/apps/lens/smokescreen.ts
index acc783ad36bf1..2a4d56bbea791 100644
--- a/x-pack/test/functional/apps/lens/smokescreen.ts
+++ b/x-pack/test/functional/apps/lens/smokescreen.ts
@@ -407,6 +407,38 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(await PageObjects.lens.getDatatableCellText(0, 1)).to.eql('6,011.351');
     });
 
+    it('should create a heatmap chart and transition to barchart', async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      await PageObjects.visualize.clickVisType('lens');
+      await PageObjects.lens.goToTimeRange();
+      await PageObjects.lens.switchToVisualization('heatmap', 'heatmap');
+
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsHeatmap_xDimensionPanel > lns-empty-dimension',
+        operation: 'date_histogram',
+        field: '@timestamp',
+      });
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsHeatmap_yDimensionPanel > lns-empty-dimension',
+        operation: 'terms',
+        field: 'geo.dest',
+      });
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsHeatmap_cellPanel > lns-empty-dimension',
+        operation: 'average',
+        field: 'bytes',
+      });
+
+      expect(await PageObjects.lens.hasChartSwitchWarning('bar')).to.eql(false);
+      await PageObjects.lens.switchToVisualization('bar');
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_xDimensionPanel')).to.eql(
+        '@timestamp'
+      );
+      expect(await PageObjects.lens.getDimensionTriggerText('lnsXY_yDimensionPanel')).to.eql(
+        'Average of bytes'
+      );
+    });
+
     it('should create a valid XY chart with references', async () => {
       await PageObjects.visualize.navigateToNewVisualization();
       await PageObjects.visualize.clickVisType('lens');
diff --git a/x-pack/test/functional/apps/lens/table.ts b/x-pack/test/functional/apps/lens/table.ts
index f048bf47991f2..f499c5bf0cfe8 100644
--- a/x-pack/test/functional/apps/lens/table.ts
+++ b/x-pack/test/functional/apps/lens/table.ts
@@ -143,6 +143,16 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       expect(styleObj['background-color']).to.be('rgb(168, 191, 218)');
       // should also set text color when in cell mode
       expect(styleObj.color).to.be('rgb(0, 0, 0)');
+      await PageObjects.lens.closeTablePalettePanel();
+    });
+
+    it('should allow to show a summary table for metric columns', async () => {
+      await PageObjects.lens.setTableSummaryRowFunction('sum');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await PageObjects.lens.assertExactText(
+        '[data-test-subj="lnsDataTable-footer-169.228.188.120-›-Average-of-bytes"]',
+        'Sum: 18,994'
+      );
     });
   });
 }
diff --git a/x-pack/test/functional/apps/lens/time_shift.ts b/x-pack/test/functional/apps/lens/time_shift.ts
new file mode 100644
index 0000000000000..57c2fc194d0c0
--- /dev/null
+++ b/x-pack/test/functional/apps/lens/time_shift.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 expect from '@kbn/expect';
+import { FtrProviderContext } from '../../ftr_provider_context';
+
+export default function ({ getService, getPageObjects }: FtrProviderContext) {
+  const PageObjects = getPageObjects(['visualize', 'lens', 'common', 'header']);
+
+  describe('time shift', () => {
+    it('should able to configure a shifted metric', async () => {
+      await PageObjects.visualize.navigateToNewVisualization();
+      await PageObjects.visualize.clickVisType('lens');
+      await PageObjects.lens.goToTimeRange();
+      await PageObjects.lens.switchToVisualization('lnsDatatable');
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsDatatable_rows > lns-empty-dimension',
+        operation: 'date_histogram',
+        field: '@timestamp',
+      });
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsDatatable_metrics > lns-empty-dimension',
+        operation: 'median',
+        field: 'bytes',
+      });
+      await PageObjects.lens.openDimensionEditor('lnsDatatable_metrics > lns-dimensionTrigger');
+      await PageObjects.lens.enableTimeShift();
+      await PageObjects.lens.setTimeShift('6h');
+
+      await PageObjects.lens.waitForVisualization();
+      expect(await PageObjects.lens.getDatatableCellText(0, 1)).to.eql('5,994');
+    });
+
+    it('should able to configure a regular metric next to a shifted metric', async () => {
+      await PageObjects.lens.closeDimensionEditor();
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsDatatable_metrics > lns-empty-dimension',
+        operation: 'average',
+        field: 'bytes',
+      });
+
+      await PageObjects.lens.waitForVisualization();
+
+      expect(await PageObjects.lens.getDatatableCellText(2, 1)).to.eql('5,994');
+      expect(await PageObjects.lens.getDatatableCellText(2, 2)).to.eql('5,722.622');
+    });
+
+    it('should show an error if terms is used and provide a fix action', async () => {
+      await PageObjects.lens.configureDimension({
+        dimension: 'lnsDatatable_rows > lns-empty-dimension',
+        operation: 'terms',
+        field: 'ip',
+      });
+
+      expect(await PageObjects.lens.hasFixAction()).to.be(true);
+      await PageObjects.lens.useFixAction();
+
+      expect(await PageObjects.lens.getDatatableCellText(2, 2)).to.eql('5,541.5');
+      expect(await PageObjects.lens.getDatatableCellText(2, 3)).to.eql('3,628');
+
+      expect(await PageObjects.lens.getDatatableHeaderText(0)).to.eql('Filters of ip');
+    });
+  });
+}
diff --git a/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts b/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts
index f46cb7100902e..9608bffb302d1 100644
--- a/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts
+++ b/x-pack/test/functional/apps/license_management/feature_controls/license_management_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts b/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts
index 587b62547ad8b..ad570f5cf82d6 100644
--- a/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts
+++ b/x-pack/test/functional/apps/logstash/feature_controls/logstash_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/logstash/pipeline_create.js b/x-pack/test/functional/apps/logstash/pipeline_create.js
index c4715eba19a0b..f576182eb8f21 100644
--- a/x-pack/test/functional/apps/logstash/pipeline_create.js
+++ b/x-pack/test/functional/apps/logstash/pipeline_create.js
@@ -23,11 +23,11 @@ export default function ({ getService, getPageObjects }) {
     before(async () => {
       originalWindowSize = await browser.getWindowSize();
       await browser.setWindowSize(1600, 1000);
-      await esArchiver.load('logstash/empty');
+      await esArchiver.load('x-pack/test/functional/es_archives/logstash/empty');
     });
 
     after(async () => {
-      await esArchiver.unload('logstash/empty');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash/empty');
       await browser.setWindowSize(originalWindowSize.width, originalWindowSize.height);
     });
 
diff --git a/x-pack/test/functional/apps/logstash/pipeline_list.js b/x-pack/test/functional/apps/logstash/pipeline_list.js
index 8235297f213ec..cf0a6dd42c85e 100644
--- a/x-pack/test/functional/apps/logstash/pipeline_list.js
+++ b/x-pack/test/functional/apps/logstash/pipeline_list.js
@@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) {
     before(async () => {
       originalWindowSize = await browser.getWindowSize();
       await browser.setWindowSize(1600, 1000);
-      await esArchiver.load('logstash/example_pipelines');
+      await esArchiver.load('x-pack/test/functional/es_archives/logstash/example_pipelines');
     });
 
     beforeEach(async () => {
@@ -30,7 +30,7 @@ export default function ({ getService, getPageObjects }) {
     });
 
     after(async () => {
-      await esArchiver.unload('logstash/example_pipelines');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash/example_pipelines');
       await browser.setWindowSize(originalWindowSize.width, originalWindowSize.height);
     });
 
diff --git a/x-pack/test/functional/apps/management/feature_controls/management_security.ts b/x-pack/test/functional/apps/management/feature_controls/management_security.ts
index 24d3455219fe5..edca9b64d4fca 100644
--- a/x-pack/test/functional/apps/management/feature_controls/management_security.ts
+++ b/x-pack/test/functional/apps/management/feature_controls/management_security.ts
@@ -18,12 +18,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('no management privileges', () => {
diff --git a/x-pack/test/functional/apps/maps/embeddable/save_and_return.js b/x-pack/test/functional/apps/maps/embeddable/save_and_return.js
index a7e649548306b..636810d59d7e8 100644
--- a/x-pack/test/functional/apps/maps/embeddable/save_and_return.js
+++ b/x-pack/test/functional/apps/maps/embeddable/save_and_return.js
@@ -99,7 +99,7 @@ export default function ({ getPageObjects, getService }) {
       describe('save as', () => {
         it('should return to dashboard and add new panel', async () => {
           await PageObjects.maps.saveMap('Clone of map embeddable example');
-          await PageObjects.dashboard.waitForRenderComplete();
+          await PageObjects.header.waitUntilLoadingHasFinished();
           const panelCount = await PageObjects.dashboard.getPanelCount();
           expect(panelCount).to.equal(3);
         });
diff --git a/x-pack/test/functional/apps/maps/index.js b/x-pack/test/functional/apps/maps/index.js
index dd20ed58afbc6..4a9262f97ee36 100644
--- a/x-pack/test/functional/apps/maps/index.js
+++ b/x-pack/test/functional/apps/maps/index.js
@@ -14,9 +14,9 @@ export default function ({ loadTestFile, getService }) {
     this.tags(['skipFirefox']);
 
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('maps/data');
-      await esArchiver.load('maps/kibana');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/maps/data');
+      await esArchiver.load('x-pack/test/functional/es_archives/maps/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'c698b940-e149-11e8-a35a-370a8516603a',
       });
@@ -24,8 +24,8 @@ export default function ({ loadTestFile, getService }) {
     });
 
     after(async () => {
-      await esArchiver.unload('maps/data');
-      await esArchiver.unload('maps/kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/maps/data');
+      await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana');
     });
 
     describe('', async function () {
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts
index bc2f327720690..e6bff43383de6 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/advanced_job.ts
@@ -222,7 +222,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('advanced job', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
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 980060fea1c47..b96e029caa49f 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
@@ -366,8 +366,8 @@ export default function ({ getService }: FtrProviderContext) {
   describe('aggregated or scripted job', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
       await ml.testResources.setKibanaTimeZoneToUTC();
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 97cc6be95ed93..b6d23f1c1a3ea 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/annotations.ts
@@ -43,7 +43,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('annotations', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
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 693b8b5a403f1..4373da71512e4 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
@@ -66,7 +66,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('anomaly explorer', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.createMLTestDashboardIfNeeded();
       await ml.testResources.setKibanaTimeZoneToUTC();
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 85eeacc58514e..15f082dda4337 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
@@ -77,7 +77,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('categorization', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/categorization');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/categorization');
       await ml.testResources.createIndexPatternIfNeeded('ft_categorization', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
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 a743e00b64add..0dcb767309608 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
@@ -84,7 +84,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('custom urls', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.createMLTestDashboardIfNeeded();
       await ml.testResources.setKibanaTimeZoneToUTC();
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts
index 4ba3f612c4cf5..024735e939024 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/date_nanos_job.ts
@@ -117,14 +117,14 @@ export default function ({ getService }: FtrProviderContext) {
   describe('job on data set with date_nanos time field', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/event_rate_nanos');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/event_rate_nanos');
       await ml.testResources.createIndexPatternIfNeeded(
         'ft_event_rate_gen_trend_nanos',
         '@timestamp'
       );
       await ml.testResources.setKibanaTimeZoneToUTC();
 
-      await esArchiver.loadIfNeeded('ml/event_rate_nanos');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/event_rate_nanos');
       await ml.securityUI.loginAsMlPowerUser();
     });
 
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts
index 256f9da313e4e..0c1b1620eb413 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/multi_metric_job.ts
@@ -74,7 +74,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('multi metric', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts
index 2bdda2c81c71d..9f86c9d508f80 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/population_job.ts
@@ -88,7 +88,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('population', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts
index 3415cd2016f9e..fb10414d2d9ef 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/saved_search_job.ts
@@ -268,7 +268,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('saved search', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.createSavedSearchFarequoteFilterIfNeeded();
       await ml.testResources.createSavedSearchFarequoteLuceneIfNeeded();
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts
index eedb130215f7f..97b340c081958 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job.ts
@@ -73,7 +73,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('single metric', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
diff --git a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts
index 1e7d8f184a64c..889c1b6c59931 100644
--- a/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts
+++ b/x-pack/test/functional/apps/ml/anomaly_detection/single_metric_job_without_datafeed_start.ts
@@ -59,7 +59,7 @@ export default function ({ getService }: FtrProviderContext) {
   describe('single metric without datafeed start', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
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 950ad2a702b06..1cf499d2625d8 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
@@ -45,7 +45,7 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('with single metric job', function () {
       before(async () => {
-        await esArchiver.loadIfNeeded('ml/farequote');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
         await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
         await ml.testResources.setKibanaTimeZoneToUTC();
 
@@ -133,7 +133,7 @@ export default function ({ getService }: FtrProviderContext) {
       };
 
       before(async () => {
-        await esArchiver.loadIfNeeded('ml/ecommerce');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
         await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
         await ml.testResources.setKibanaTimeZoneToUTC();
         await ml.api.createAndRunAnomalyDetectionLookbackJob(jobConfig, datafeedConfig);
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
index 1c1c5d956aae8..9a440f758ea26 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/classification_creation.ts
@@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('classification creation', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/bm_classification');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/bm_classification');
       await ml.testResources.createIndexPatternIfNeeded('ft_bank_marketing', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
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 cbd840f7a2c56..84409498fc3f0 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
@@ -27,7 +27,7 @@ export default function ({ getService }: FtrProviderContext) {
       return [
         {
           suiteTitle: 'classification job supported by the form',
-          archive: 'ml/bm_classification',
+          archive: 'x-pack/test/functional/es_archives/ml/bm_classification',
           indexPattern: { name: 'ft_bank_marketing', timeField: '@timestamp' },
           job: {
             id: `bm_1_${timestamp}`,
@@ -62,7 +62,7 @@ export default function ({ getService }: FtrProviderContext) {
         },
         {
           suiteTitle: 'outlier detection job supported by the form',
-          archive: 'ml/ihp_outlier',
+          archive: 'x-pack/test/functional/es_archives/ml/ihp_outlier',
           indexPattern: { name: 'ft_ihp_outlier', timeField: '@timestamp' },
           job: {
             id: `ihp_1_${timestamp}`,
@@ -91,7 +91,7 @@ export default function ({ getService }: FtrProviderContext) {
         },
         {
           suiteTitle: 'regression job supported by the form',
-          archive: 'ml/egs_regression',
+          archive: 'x-pack/test/functional/es_archives/ml/egs_regression',
           indexPattern: { name: 'ft_egs_regression', timeField: '@timestamp' },
           job: {
             id: `egs_1_${timestamp}`,
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts
index 3c6a3fec01879..fbd6cc70418d3 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/feature_importance.ts
@@ -26,7 +26,7 @@ export default function ({ getService }: FtrProviderContext) {
       return [
         {
           suiteTitle: 'binary classification job',
-          archive: 'ml/ihp_outlier',
+          archive: 'x-pack/test/functional/es_archives/ml/ihp_outlier',
           indexPattern: { name: 'ft_ihp_outlier', timeField: '@timestamp' },
           job: {
             id: `ihp_fi_binary_${timestamp}`,
@@ -71,7 +71,7 @@ export default function ({ getService }: FtrProviderContext) {
         },
         {
           suiteTitle: 'multi class classification job',
-          archive: 'ml/ihp_outlier',
+          archive: 'x-pack/test/functional/es_archives/ml/ihp_outlier',
           indexPattern: { name: 'ft_ihp_outlier', timeField: '@timestamp' },
           job: {
             id: `ihp_fi_multi_${timestamp}`,
@@ -116,7 +116,7 @@ export default function ({ getService }: FtrProviderContext) {
         },
         {
           suiteTitle: 'regression job',
-          archive: 'ml/egs_regression',
+          archive: 'x-pack/test/functional/es_archives/ml/egs_regression',
           indexPattern: { name: 'ft_egs_regression', timeField: '@timestamp' },
           job: {
             id: `egs_fi_reg_${timestamp}`,
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
index 62c506e06d7e6..ef86de29febc7 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/outlier_detection_creation.ts
@@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('outlier detection creation', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ihp_outlier');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
       await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
diff --git a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
index 692de607c7d36..b2bd54ae639ae 100644
--- a/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
+++ b/x-pack/test/functional/apps/ml/data_frame_analytics/regression_creation.ts
@@ -15,7 +15,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('regression creation', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/egs_regression');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/egs_regression');
       await ml.testResources.createIndexPatternIfNeeded('ft_egs_regression', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
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 609cf05dad541..031074876f39c 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
@@ -7,7 +7,7 @@
 
 import { FtrProviderContext } from '../../../ftr_provider_context';
 import { ML_JOB_FIELD_TYPES } from '../../../../../plugins/ml/common/constants/field_types';
-import { FieldVisConfig } from '../../../../../plugins/ml/public/application/datavisualizer/stats_table/types';
+import { FieldVisConfig } from '../../../../../plugins/data_visualizer/public/application/common/components/stats_table/types';
 
 interface MetricFieldVisConfig extends FieldVisConfig {
   statsMaxDecimalPlaces: number;
@@ -499,8 +499,8 @@ export default function ({ getService }: FtrProviderContext) {
   describe('index based', function () {
     this.tags(['mlqa']);
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
-      await esArchiver.loadIfNeeded('ml/module_sample_logs');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/module_sample_logs');
 
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.createIndexPatternIfNeeded('ft_module_sample_logs', '@timestamp');
diff --git a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts
index bc80d8850032b..93e3b67ca1565 100644
--- a/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts
+++ b/x-pack/test/functional/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts
@@ -15,18 +15,19 @@ export default function ({ getService }: FtrProviderContext) {
     this.tags(['mlqa']);
 
     const indexPatternName = 'ft_farequote';
-    const advancedJobWizardDatafeedQuery = `{
-  "bool": {
-    "must": [
-      {
-        "match_all": {}
-      }
-    ]
-  }
-}`; // Note query is not currently passed to the wizard
+    // @TODO: Re-enable in follow up
+    //     const advancedJobWizardDatafeedQuery = `{
+    //   "bool": {
+    //     "must": [
+    //       {
+    //         "match_all": {}
+    //       }
+    //     ]
+    //   }
+    // }`; // Note query is not currently passed to the wizard
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded(indexPatternName, '@timestamp');
       await ml.testResources.createSavedSearchFarequoteKueryIfNeeded();
       await ml.testResources.setKibanaTimeZoneToUTC();
@@ -47,19 +48,20 @@ export default function ({ getService }: FtrProviderContext) {
         await ml.jobSourceSelection.selectSourceForIndexBasedDataVisualizer(indexPatternName);
       });
 
-      it('opens the advanced job wizard', async () => {
-        await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
-        await ml.dataVisualizerIndexBased.assertActionsPanelExists();
-        await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
-        await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
-
-        // Note the search is not currently passed to the wizard, just the index.
-        await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
-        await ml.dataVisualizerIndexBased.clickCreateAdvancedJobButton();
-        await ml.jobTypeSelection.assertAdvancedJobWizardOpen();
-        await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
-        await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(advancedJobWizardDatafeedQuery);
-      });
+      // @TODO: Re-enable in follow up
+      // it('opens the advanced job wizard', async () => {
+      // await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
+      // await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+      // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
+      // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
+      //
+      // // Note the search is not currently passed to the wizard, just the index.
+      // await ml.testExecution.logTestStep('displays the actions panel with advanced job card');
+      // await ml.dataVisualizerIndexBased.clickCreateAdvancedJobButton();
+      // await ml.jobTypeSelection.assertAdvancedJobWizardOpen();
+      // await ml.jobWizardAdvanced.assertDatafeedQueryEditorExists();
+      // await ml.jobWizardAdvanced.assertDatafeedQueryEditorValue(advancedJobWizardDatafeedQuery);
+      // });
     });
 
     describe('view in discover page action', function () {
diff --git a/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts b/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts
index d4eb45619b7f7..1c47893dbafd0 100644
--- a/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts
+++ b/x-pack/test/functional/apps/ml/embeddables/anomaly_charts_dashboard_embeddables.ts
@@ -63,7 +63,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     this.tags(['mlqa']);
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await ml.testResources.setKibanaTimeZoneToUTC();
       await ml.securityUI.loginAsMlPowerUser();
diff --git a/x-pack/test/functional/apps/ml/index.ts b/x-pack/test/functional/apps/ml/index.ts
index 73207bc91e8d3..abaa387336c88 100644
--- a/x-pack/test/functional/apps/ml/index.ts
+++ b/x-pack/test/functional/apps/ml/index.ts
@@ -33,14 +33,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
         await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier');
         await ml.testResources.deleteIndexPatternByTitle('ft_egs_regression');
         await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce');
-        await esArchiver.unload('ml/farequote');
-        await esArchiver.unload('ml/ecommerce');
-        await esArchiver.unload('ml/categorization');
-        await esArchiver.unload('ml/event_rate_nanos');
-        await esArchiver.unload('ml/bm_classification');
-        await esArchiver.unload('ml/ihp_outlier');
-        await esArchiver.unload('ml/egs_regression');
-        await esArchiver.unload('ml/module_sample_ecommerce');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/categorization');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/event_rate_nanos');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/bm_classification');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/egs_regression');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce');
         await ml.testResources.resetKibanaTimeZone();
         await ml.securityUI.logout();
       });
@@ -73,14 +73,14 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
         await ml.testResources.deleteIndexPatternByTitle('ft_ihp_outlier');
         await ml.testResources.deleteIndexPatternByTitle('ft_egs_regression');
         await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce');
-        await esArchiver.unload('ml/farequote');
-        await esArchiver.unload('ml/ecommerce');
-        await esArchiver.unload('ml/categorization');
-        await esArchiver.unload('ml/event_rate_nanos');
-        await esArchiver.unload('ml/bm_classification');
-        await esArchiver.unload('ml/ihp_outlier');
-        await esArchiver.unload('ml/egs_regression');
-        await esArchiver.unload('ml/module_sample_ecommerce');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/categorization');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/event_rate_nanos');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/bm_classification');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/ihp_outlier');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/egs_regression');
+        await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce');
         await ml.testResources.resetKibanaTimeZone();
         await ml.securityUI.logout();
       });
diff --git a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts
index a203b078774c7..18f4f6a38a7b1 100644
--- a/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts
+++ b/x-pack/test/functional/apps/ml/permissions/full_ml_access.ts
@@ -35,14 +35,6 @@ export default function ({ getService }: FtrProviderContext) {
             await ml.securityUI.logout();
           });
 
-          it('should display the ML file data vis link on the Kibana home page', async () => {
-            await ml.testExecution.logTestStep('should load the Kibana home page');
-            await ml.navigation.navigateToKibanaHome();
-
-            await ml.testExecution.logTestStep('should display the ML file data vis link');
-            await ml.commonUI.assertKibanaHomeFileDataVisLinkExists();
-          });
-
           it('should display the ML entry in Kibana app menu', async () => {
             await ml.testExecution.logTestStep('should open the Kibana app menu');
             await ml.navigation.openKibanaNav();
@@ -101,7 +93,8 @@ export default function ({ getService }: FtrProviderContext) {
 
       const ecIndexPattern = 'ft_module_sample_ecommerce';
       const ecExpectedTotalCount = '287';
-      const ecExpectedModuleId = 'sample_data_ecommerce';
+      // @TODO: Re-enable in follow up
+      // const ecExpectedModuleId = 'sample_data_ecommerce';
 
       const uploadFilePath = path.join(
         __dirname,
@@ -113,9 +106,11 @@ export default function ({ getService }: FtrProviderContext) {
       const expectedUploadFileTitle = 'artificial_server_log';
 
       before(async () => {
-        await esArchiver.loadIfNeeded('ml/farequote');
-        await esArchiver.loadIfNeeded('ml/ihp_outlier');
-        await esArchiver.loadIfNeeded('ml/module_sample_ecommerce');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
+        await esArchiver.loadIfNeeded(
+          'x-pack/test/functional/es_archives/ml/module_sample_ecommerce'
+        );
         await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
         await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp');
         await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date');
@@ -136,7 +131,6 @@ export default function ({ getService }: FtrProviderContext) {
           description: 'Test calendar',
         });
         await ml.api.createCalendarEvents(calendarId, [
-          // @ts-expect-error not full interface
           {
             description: eventDescription,
             start_time: '1513641600000',
@@ -366,13 +360,16 @@ export default function ({ getService }: FtrProviderContext) {
                 testUser.discoverAvailable ? 'with' : 'without'
               } Discover card`
             );
-            await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+            if (testUser.discoverAvailable) {
+              await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+            }
             await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable);
 
-            await ml.testExecution.logTestStep('should display job cards');
-            await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
-            await ml.dataVisualizerIndexBased.assertRecognizerCardExists(ecExpectedModuleId);
-            await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
+            // @TODO: Re-enable in follow up
+            // await ml.testExecution.logTestStep('should display job cards');
+            // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardExists();
+            // await ml.dataVisualizerIndexBased.assertRecognizerCardExists(ecExpectedModuleId);
+            // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardExists();
           });
 
           it('should display elements on File Data Visualizer page correctly', async () => {
diff --git a/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts
index 280801d1becb5..431c0550b9271 100644
--- a/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts
+++ b/x-pack/test/functional/apps/ml/permissions/no_ml_access.ts
@@ -41,16 +41,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           await PageObjects.error.expectForbidden();
         });
 
-        it('should not display the ML file data vis link on the Kibana home page', async () => {
-          await ml.testExecution.logTestStep('should load the Kibana home page');
-          await ml.navigation.navigateToKibanaHome();
-
-          await ml.testExecution.logTestStep('should not display the ML file data vis link');
-          await ml.commonUI.assertKibanaHomeFileDataVisLinkNotExists();
-        });
-
         it('should not display the ML entry in Kibana app menu', async () => {
           await ml.testExecution.logTestStep('should open the Kibana app menu');
+          await ml.navigation.navigateToKibanaHome();
           await ml.navigation.openKibanaNav();
 
           await ml.testExecution.logTestStep('should not display the ML nav link');
diff --git a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts
index 55cfb035d0cfe..a53ed2fafe30c 100644
--- a/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts
+++ b/x-pack/test/functional/apps/ml/permissions/read_ml_access.ts
@@ -35,14 +35,6 @@ export default function ({ getService }: FtrProviderContext) {
             await ml.securityUI.logout();
           });
 
-          it('should not display the ML file data vis link on the Kibana home page', async () => {
-            await ml.testExecution.logTestStep('should load the Kibana home page');
-            await ml.navigation.navigateToKibanaHome();
-
-            await ml.testExecution.logTestStep('should not display the ML file data vis link');
-            await ml.commonUI.assertKibanaHomeFileDataVisLinkNotExists();
-          });
-
           it('should display the ML entry in Kibana app menu', async () => {
             await ml.testExecution.logTestStep('should open the Kibana app menu');
             await ml.navigation.openKibanaNav();
@@ -102,7 +94,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       const ecIndexPattern = 'ft_module_sample_ecommerce';
       const ecExpectedTotalCount = '287';
-      const ecExpectedModuleId = 'sample_data_ecommerce';
+      // const ecExpectedModuleId = 'sample_data_ecommerce';
 
       const uploadFilePath = path.join(
         __dirname,
@@ -114,9 +106,11 @@ export default function ({ getService }: FtrProviderContext) {
       const expectedUploadFileTitle = 'artificial_server_log';
 
       before(async () => {
-        await esArchiver.loadIfNeeded('ml/farequote');
-        await esArchiver.loadIfNeeded('ml/ihp_outlier');
-        await esArchiver.loadIfNeeded('ml/module_sample_ecommerce');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
+        await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ihp_outlier');
+        await esArchiver.loadIfNeeded(
+          'x-pack/test/functional/es_archives/ml/module_sample_ecommerce'
+        );
         await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
         await ml.testResources.createIndexPatternIfNeeded('ft_ihp_outlier', '@timestamp');
         await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date');
@@ -137,7 +131,6 @@ export default function ({ getService }: FtrProviderContext) {
           description: 'Test calendar',
         });
         await ml.api.createCalendarEvents(calendarId, [
-          // @ts-expect-error not full interface
           {
             description: eventDescription,
             start_time: '1513641600000',
@@ -359,13 +352,16 @@ export default function ({ getService }: FtrProviderContext) {
                 testUser.discoverAvailable ? 'with' : 'without'
               } Discover card`
             );
-            await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+            if (testUser.discoverAvailable) {
+              await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+            }
             await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable);
 
-            await ml.testExecution.logTestStep('should not display job cards');
-            await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
-            await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
-            await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
+            // @TODO: Re-enable in follow up
+            // await ml.testExecution.logTestStep('should not display job cards');
+            // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
+            // await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
+            // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
           });
 
           it('should display elements on File Data Visualizer page correctly', async () => {
diff --git a/x-pack/test/functional/apps/ml/settings/calendar_creation.ts b/x-pack/test/functional/apps/ml/settings/calendar_creation.ts
index 2beae2ad007b5..242163d83c456 100644
--- a/x-pack/test/functional/apps/ml/settings/calendar_creation.ts
+++ b/x-pack/test/functional/apps/ml/settings/calendar_creation.ts
@@ -17,7 +17,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('calendar creation', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
 
       await asyncForEach(jobConfigs, async (jobConfig) => {
diff --git a/x-pack/test/functional/apps/ml/settings/calendar_edit.ts b/x-pack/test/functional/apps/ml/settings/calendar_edit.ts
index 1237cd8d71b8c..8bbddc74a5c44 100644
--- a/x-pack/test/functional/apps/ml/settings/calendar_edit.ts
+++ b/x-pack/test/functional/apps/ml/settings/calendar_edit.ts
@@ -23,7 +23,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('calendar edit', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
 
       await asyncForEach(jobConfigs, async (jobConfig) => {
@@ -35,7 +35,6 @@ export default function ({ getService }: FtrProviderContext) {
         job_ids: jobConfigs.map((c) => c.job_id),
         description: 'Test calendar',
       });
-      // @ts-expect-error not full interface
       await ml.api.createCalendarEvents(calendarId, testEvents);
 
       await ml.testResources.setKibanaTimeZoneToUTC();
diff --git a/x-pack/test/functional/apps/monitoring/_get_lifecycle_methods.js b/x-pack/test/functional/apps/monitoring/_get_lifecycle_methods.js
index ae33d275a96b6..fce6fcfff7772 100644
--- a/x-pack/test/functional/apps/monitoring/_get_lifecycle_methods.js
+++ b/x-pack/test/functional/apps/monitoring/_get_lifecycle_methods.js
@@ -8,12 +8,15 @@
 export const getLifecycleMethods = (getService, getPageObjects) => {
   const esArchiver = getService('esArchiver');
   const security = getService('security');
-  const PageObjects = getPageObjects(['monitoring', 'timePicker', 'security']);
+  const PageObjects = getPageObjects(['monitoring', 'timePicker', 'security', 'common']);
   let _archive;
 
   return {
     async setup(archive, { from, to, useSuperUser = false }) {
       _archive = archive;
+      if (!useSuperUser) {
+        await security.testUser.setRoles(['monitoring_user', 'kibana_admin']);
+      }
 
       const kibanaServer = getService('kibanaServer');
       const browser = getService('browser');
@@ -24,7 +27,7 @@ export const getLifecycleMethods = (getService, getPageObjects) => {
       await esArchiver.load(archive);
       await kibanaServer.uiSettings.replace({});
 
-      await PageObjects.monitoring.navigateTo(useSuperUser);
+      await PageObjects.common.navigateToApp('monitoring');
 
       // pause autorefresh in the time filter because we don't wait any ticks,
       // and we don't want ES to log a warning when data gets wiped out
@@ -34,8 +37,7 @@ export const getLifecycleMethods = (getService, getPageObjects) => {
     },
 
     async tearDown() {
-      await PageObjects.security.forceLogout();
-      await security.user.delete('basic_monitoring_user');
+      await security.testUser.restoreDefaults();
       return esArchiver.unload(_archive);
     },
   };
diff --git a/x-pack/test/functional/apps/monitoring/beats/beat_detail.js b/x-pack/test/functional/apps/monitoring/beats/beat_detail.js
index af9a7374ec164..f3d89ebdeddbd 100644
--- a/x-pack/test/functional/apps/monitoring/beats/beat_detail.js
+++ b/x-pack/test/functional/apps/monitoring/beats/beat_detail.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/beats', {
+      await setup('x-pack/test/functional/es_archives/monitoring/beats', {
         from: 'Dec 19, 2017 @ 17:14:09.000',
         to: 'Dec 19, 2017 @ 18:15:09.000',
       });
diff --git a/x-pack/test/functional/apps/monitoring/beats/cluster.js b/x-pack/test/functional/apps/monitoring/beats/cluster.js
index 83074ffe6be65..7f8f1b181b724 100644
--- a/x-pack/test/functional/apps/monitoring/beats/cluster.js
+++ b/x-pack/test/functional/apps/monitoring/beats/cluster.js
@@ -15,7 +15,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/beats', {
+      await setup('x-pack/test/functional/es_archives/monitoring/beats', {
         from: 'Dec 19, 2017 @ 17:14:09.000',
         to: 'Dec 19, 2017 @ 18:15:09.000',
       });
diff --git a/x-pack/test/functional/apps/monitoring/beats/listing.js b/x-pack/test/functional/apps/monitoring/beats/listing.js
index 9a461d93a405f..4030f80f5b8b9 100644
--- a/x-pack/test/functional/apps/monitoring/beats/listing.js
+++ b/x-pack/test/functional/apps/monitoring/beats/listing.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/beats', {
+      await setup('x-pack/test/functional/es_archives/monitoring/beats', {
         from: 'Dec 19, 2017 @ 17:14:09.000',
         to: 'Dec 19, 2017 @ 18:15:09.000',
       });
diff --git a/x-pack/test/functional/apps/monitoring/beats/overview.js b/x-pack/test/functional/apps/monitoring/beats/overview.js
index c0c3abf11b164..cf544f5e659fd 100644
--- a/x-pack/test/functional/apps/monitoring/beats/overview.js
+++ b/x-pack/test/functional/apps/monitoring/beats/overview.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/beats', {
+      await setup('x-pack/test/functional/es_archives/monitoring/beats', {
         from: 'Dec 19, 2017 @ 17:14:09.000',
         to: 'Dec 19, 2017 @ 18:15:09.000',
       });
diff --git a/x-pack/test/functional/apps/monitoring/cluster/list.js b/x-pack/test/functional/apps/monitoring/cluster/list.js
index 0b5b3a196beb0..98ea3959d6b29 100644
--- a/x-pack/test/functional/apps/monitoring/cluster/list.js
+++ b/x-pack/test/functional/apps/monitoring/cluster/list.js
@@ -21,7 +21,7 @@ export default function ({ getService, getPageObjects }) {
       const UNSUPPORTED_CLUSTER_UUID = '6d-9tDFTRe-qT5GoBytdlQ';
 
       before(async () => {
-        await setup('monitoring/multicluster', {
+        await setup('x-pack/test/functional/es_archives/monitoring/multicluster', {
           from: 'Aug 15, 2017 @ 21:00:00.000',
           to: 'Aug 16, 2017 @ 00:00:00.000',
         });
@@ -78,7 +78,7 @@ export default function ({ getService, getPageObjects }) {
       const SUPPORTED_CLUSTER_UUID = 'NDKg6VXAT6-TaGzEK2Zy7g';
 
       before(async () => {
-        await setup('monitoring/multi_basic', {
+        await setup('x-pack/test/functional/es_archives/monitoring/multi_basic', {
           from: 'Sep 7, 2017 @ 20:12:04.011',
           to: 'Sep 7, 2017 @ 20:18:55.733',
         });
diff --git a/x-pack/test/functional/apps/monitoring/cluster/overview.js b/x-pack/test/functional/apps/monitoring/cluster/overview.js
index dbdb8edc153b4..389c3313d2954 100644
--- a/x-pack/test/functional/apps/monitoring/cluster/overview.js
+++ b/x-pack/test/functional/apps/monitoring/cluster/overview.js
@@ -16,7 +16,7 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_green_gold', {
+        await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_green_gold', {
           from: 'Aug 23, 2017 @ 21:29:35.267',
           to: 'Aug 23, 2017 @ 21:47:25.556',
         });
@@ -67,7 +67,7 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_yellow_platinum', {
+        await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', {
           from: 'Aug 29, 2017 @ 17:23:47.528',
           to: 'Aug 29, 2017 @ 17:25:50.701',
         });
@@ -113,7 +113,7 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_yellow_basic', {
+        await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_basic', {
           from: 'Aug 29, 2017 @ 17:55:43.879',
           to: 'Aug 29, 2017 @ 18:01:34.958',
         });
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js
index 9ac24313c9b7f..5ea7904e039a1 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail.js
@@ -24,10 +24,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-          from: 'Oct 5, 2017 @ 20:31:48.354',
-          to: 'Oct 5, 2017 @ 20:35:12.176',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+          {
+            from: 'Oct 5, 2017 @ 20:31:48.354',
+            to: 'Oct 5, 2017 @ 20:35:12.176',
+          }
+        );
 
         // go to indices listing
         await overview.clickEsIndices();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js
index 2ee2b7bcbe5ca..9d6938fb09c53 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/index_detail_mb.js
@@ -24,10 +24,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', {
-          from: 'Oct 5, 2017 @ 20:31:48.354',
-          to: 'Oct 5, 2017 @ 20:35:12.176',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb',
+          {
+            from: 'Oct 5, 2017 @ 20:31:48.354',
+            to: 'Oct 5, 2017 @ 20:35:12.176',
+          }
+        );
 
         // go to indices listing
         await overview.clickEsIndices();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js b/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js
index a39b08f00c91f..44ded151f0713 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/indices.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_red_platinum', {
+      await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum', {
         from: 'Oct 6, 2017 @ 19:53:06.748',
         to: 'Oct 6, 2017 @ 20:15:30.212',
       });
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js
index f12e6b5f80c8a..551afbc71b725 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/indices_mb.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_red_platinum_mb', {
+      await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum_mb', {
         from: 'Oct 6, 2017 @ 19:53:06.748',
         to: 'Oct 6, 2017 @ 20:15:30.212',
       });
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
index 6627f8b37c6ff..79fb399db8a4e 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail.js
@@ -19,10 +19,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-          from: 'Oct 5, 2017 @ 20:31:48.354',
-          to: 'Oct 5, 2017 @ 20:35:12.176',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+          {
+            from: 'Oct 5, 2017 @ 20:31:48.354',
+            to: 'Oct 5, 2017 @ 20:35:12.176',
+          }
+        );
 
         // go to nodes listing
         await overview.clickEsNodes();
@@ -74,7 +77,7 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_red_platinum', {
+        await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum', {
           from: 'Oct 6, 2017 @ 19:53:06.748',
           to: 'Oct 6, 2017 @ 20:15:30.212',
         });
@@ -110,10 +113,13 @@ export default function ({ getService, getPageObjects }) {
         const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
         before(async () => {
-          await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-            from: 'Oct 5, 2017 @ 20:31:48.354',
-            to: 'Oct 5, 2017 @ 20:35:12.176',
-          });
+          await setup(
+            'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+            {
+              from: 'Oct 5, 2017 @ 20:31:48.354',
+              to: 'Oct 5, 2017 @ 20:35:12.176',
+            }
+          );
 
           // go to nodes listing
           await overview.clickEsNodes();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js
index 360849916e0dd..342668533e963 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/node_detail_mb.js
@@ -19,10 +19,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', {
-          from: 'Oct 5, 2017 @ 20:31:48.354',
-          to: 'Oct 5, 2017 @ 20:35:12.176',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb',
+          {
+            from: 'Oct 5, 2017 @ 20:31:48.354',
+            to: 'Oct 5, 2017 @ 20:35:12.176',
+          }
+        );
 
         // go to nodes listing
         await overview.clickEsNodes();
@@ -74,7 +77,7 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_red_platinum', {
+        await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_red_platinum', {
           from: 'Oct 6, 2017 @ 19:53:06.748',
           to: 'Oct 6, 2017 @ 20:15:30.212',
         });
@@ -110,10 +113,13 @@ export default function ({ getService, getPageObjects }) {
         const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
         before(async () => {
-          await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-            from: 'Oct 5, 2017 @ 20:31:48.354',
-            to: 'Oct 5, 2017 @ 20:35:12.176',
-          });
+          await setup(
+            'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+            {
+              from: 'Oct 5, 2017 @ 20:31:48.354',
+              to: 'Oct 5, 2017 @ 20:35:12.176',
+            }
+          );
 
           // go to nodes listing
           await overview.clickEsNodes();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
index eb2075f017175..02f65fd5579da 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes.js
@@ -21,10 +21,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-          from: 'Oct 5, 2017 @ 20:28:28.475',
-          to: 'Oct 5, 2017 @ 20:34:38.341',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+          {
+            from: 'Oct 5, 2017 @ 20:28:28.475',
+            to: 'Oct 5, 2017 @ 20:34:38.341',
+          }
+        );
 
         // go to nodes listing
         await overview.clickEsNodes();
@@ -250,10 +253,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-          from: 'Oct 5, 2017 @ 20:31:48.354',
-          to: 'Oct 5, 2017 @ 20:35:12.176',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+          {
+            from: 'Oct 5, 2017 @ 20:31:48.354',
+            to: 'Oct 5, 2017 @ 20:35:12.176',
+          }
+        );
 
         // go to nodes listing
         await overview.clickEsNodes();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js
index 3727a841ba917..78462e0d5ec3d 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/nodes_mb.js
@@ -21,10 +21,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', {
-          from: 'Oct 5, 2017 @ 20:28:28.475',
-          to: 'Oct 5, 2017 @ 20:34:38.341',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb',
+          {
+            from: 'Oct 5, 2017 @ 20:28:28.475',
+            to: 'Oct 5, 2017 @ 20:34:38.341',
+          }
+        );
 
         // go to nodes listing
         await overview.clickEsNodes();
@@ -250,10 +253,13 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-          from: 'Oct 5, 2017 @ 20:31:48.354',
-          to: 'Oct 5, 2017 @ 20:35:12.176',
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+          {
+            from: 'Oct 5, 2017 @ 20:31:48.354',
+            to: 'Oct 5, 2017 @ 20:35:12.176',
+          }
+        );
 
         // go to nodes listing
         await overview.clickEsNodes();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js b/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js
index 57d354cebbfe0..61c8c6b266b0d 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/overview.js
@@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-        from: 'Oct 5, 2017 @ 20:31:48.354',
-        to: 'Oct 5, 2017 @ 20:35:12.176',
-      });
+      await setup(
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+        {
+          from: 'Oct 5, 2017 @ 20:31:48.354',
+          to: 'Oct 5, 2017 @ 20:35:12.176',
+        }
+      );
 
       // go to overview
       await clusterOverview.clickEsOverview();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js b/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js
index 65e77be0e27b9..7c279119e65d7 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/overview_mb.js
@@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_three_nodes_shard_relocation_mb', {
-        from: 'Oct 5, 2017 @ 20:31:48.354',
-        to: 'Oct 5, 2017 @ 20:35:12.176',
-      });
+      await setup(
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation_mb',
+        {
+          from: 'Oct 5, 2017 @ 20:31:48.354',
+          to: 'Oct 5, 2017 @ 20:35:12.176',
+        }
+      );
 
       // go to overview
       await clusterOverview.clickEsOverview();
diff --git a/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js b/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js
index 36b2aa46e7abb..b4b2ba521cb1e 100644
--- a/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js
+++ b/x-pack/test/functional/apps/monitoring/elasticsearch/shards.js
@@ -21,10 +21,13 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_three_nodes_shard_relocation', {
-        from: 'Oct 5, 2017 @ 19:34:48.000',
-        to: 'Oct 5, 2017 @ 20:35:12.000',
-      });
+      await setup(
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_three_nodes_shard_relocation',
+        {
+          from: 'Oct 5, 2017 @ 19:34:48.000',
+          to: 'Oct 5, 2017 @ 20:35:12.000',
+        }
+      );
     });
 
     after(async () => {
diff --git a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
index cada5ce882760..dca81fd6fc07e 100644
--- a/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/enable_monitoring/index.js
@@ -22,7 +22,7 @@ export default function ({ getService, getPageObjects }) {
     before(async () => {
       const browser = getService('browser');
       await browser.setWindowSize(1600, 1000);
-      await PageObjects.monitoring.navigateTo(true);
+      await PageObjects.common.navigateToApp('monitoring');
       await noData.isOnNoDataPage();
     });
 
diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts
index f56ab612dc33d..988bbdc621f5f 100644
--- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts
+++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_security.ts
@@ -16,7 +16,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
 
       await security.role.create('global_all_role', {
         elasticsearch: {
@@ -35,7 +35,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       await security.role.delete('global_all_role');
 
       // logout, so the other tests don't accidentally run as the custom users we're testing below
diff --git a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
index 5b6bd8b254c37..f2b872bccbaa7 100644
--- a/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
+++ b/x-pack/test/functional/apps/monitoring/feature_controls/monitoring_spaces.ts
@@ -17,11 +17,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
       await PageObjects.security.forceLogout();
     });
diff --git a/x-pack/test/functional/apps/monitoring/index.js b/x-pack/test/functional/apps/monitoring/index.js
index 37d5d2083c4b1..24ace88f334f0 100644
--- a/x-pack/test/functional/apps/monitoring/index.js
+++ b/x-pack/test/functional/apps/monitoring/index.js
@@ -8,41 +8,38 @@
 export default function ({ loadTestFile }) {
   describe('Monitoring app', function () {
     this.tags('ciGroup1');
-
     loadTestFile(require.resolve('./feature_controls'));
 
     loadTestFile(require.resolve('./cluster/list'));
     loadTestFile(require.resolve('./cluster/overview'));
     // loadTestFile(require.resolve('./cluster/license'));
 
-    // NOTE: All _mb tests skipped because of various failures: https://github.com/elastic/kibana/issues/98239
-
     loadTestFile(require.resolve('./elasticsearch/overview'));
-    // loadTestFile(require.resolve('./elasticsearch/overview_mb'));
+    loadTestFile(require.resolve('./elasticsearch/overview_mb'));
     loadTestFile(require.resolve('./elasticsearch/nodes'));
-    // loadTestFile(require.resolve('./elasticsearch/nodes_mb'));
+    loadTestFile(require.resolve('./elasticsearch/nodes_mb'));
     loadTestFile(require.resolve('./elasticsearch/node_detail'));
-    // loadTestFile(require.resolve('./elasticsearch/node_detail_mb'));
+    loadTestFile(require.resolve('./elasticsearch/node_detail_mb'));
     loadTestFile(require.resolve('./elasticsearch/indices'));
-    // loadTestFile(require.resolve('./elasticsearch/indices_mb'));
+    loadTestFile(require.resolve('./elasticsearch/indices_mb'));
     loadTestFile(require.resolve('./elasticsearch/index_detail'));
-    // loadTestFile(require.resolve('./elasticsearch/index_detail_mb'));
+    loadTestFile(require.resolve('./elasticsearch/index_detail_mb'));
     loadTestFile(require.resolve('./elasticsearch/shards'));
     // loadTestFile(require.resolve('./elasticsearch/shard_activity'));
 
     loadTestFile(require.resolve('./kibana/overview'));
-    // loadTestFile(require.resolve('./kibana/overview_mb'));
+    loadTestFile(require.resolve('./kibana/overview_mb'));
     loadTestFile(require.resolve('./kibana/instances'));
-    // loadTestFile(require.resolve('./kibana/instances_mb'));
+    loadTestFile(require.resolve('./kibana/instances_mb'));
     loadTestFile(require.resolve('./kibana/instance'));
-    // loadTestFile(require.resolve('./kibana/instance_mb'));
+    loadTestFile(require.resolve('./kibana/instance_mb'));
 
     // loadTestFile(require.resolve('./logstash/overview'));
     // loadTestFile(require.resolve('./logstash/nodes'));
     // loadTestFile(require.resolve('./logstash/node'));
 
     loadTestFile(require.resolve('./logstash/pipelines'));
-    // loadTestFile(require.resolve('./logstash/pipelines_mb'));
+    loadTestFile(require.resolve('./logstash/pipelines_mb'));
 
     loadTestFile(require.resolve('./beats/cluster'));
     loadTestFile(require.resolve('./beats/overview'));
@@ -53,6 +50,6 @@ export default function ({ loadTestFile }) {
     loadTestFile(require.resolve('./enable_monitoring'));
 
     loadTestFile(require.resolve('./setup/metricbeat_migration'));
-    // loadTestFile(require.resolve('./setup/metricbeat_migration_mb'));
+    loadTestFile(require.resolve('./setup/metricbeat_migration_mb'));
   });
 }
diff --git a/x-pack/test/functional/apps/monitoring/kibana/instance.js b/x-pack/test/functional/apps/monitoring/kibana/instance.js
index e96c4639ee58a..97f73795e44e0 100644
--- a/x-pack/test/functional/apps/monitoring/kibana/instance.js
+++ b/x-pack/test/functional/apps/monitoring/kibana/instance.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_yellow_platinum', {
+      await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', {
         from: 'Aug 29, 2017 @ 17:24:14.254',
         to: 'Aug 29, 2017 @ 17:25:44.142',
       });
diff --git a/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js b/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js
index c0164b3e0796c..a615ed0cf9d59 100644
--- a/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js
+++ b/x-pack/test/functional/apps/monitoring/kibana/instance_mb.js
@@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_yellow_platinum_mb', {
-        from: 'Aug 29, 2017 @ 17:24:14.254',
-        to: 'Aug 29, 2017 @ 17:25:44.142',
-      });
+      await setup(
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb',
+        {
+          from: 'Aug 29, 2017 @ 17:24:14.254',
+          to: 'Aug 29, 2017 @ 17:25:44.142',
+        }
+      );
 
       // go to kibana instance
       await clusterOverview.clickKibanaInstances();
diff --git a/x-pack/test/functional/apps/monitoring/kibana/instances.js b/x-pack/test/functional/apps/monitoring/kibana/instances.js
index 2b6a9a3f35f69..554c3c3ece0e1 100644
--- a/x-pack/test/functional/apps/monitoring/kibana/instances.js
+++ b/x-pack/test/functional/apps/monitoring/kibana/instances.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_yellow_platinum', {
+      await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', {
         from: 'Aug 29, 2017 @ 17:24:14.254',
         to: 'Aug 29, 2017 @ 17:25:44.142',
       });
diff --git a/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js b/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js
index 3317513f8157d..695ef81bf71fb 100644
--- a/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js
+++ b/x-pack/test/functional/apps/monitoring/kibana/instances_mb.js
@@ -18,10 +18,13 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_yellow_platinum_mb', {
-        from: 'Aug 29, 2017 @ 17:24:14.254',
-        to: 'Aug 29, 2017 @ 17:25:44.142',
-      });
+      await setup(
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb',
+        {
+          from: 'Aug 29, 2017 @ 17:24:14.254',
+          to: 'Aug 29, 2017 @ 17:25:44.142',
+        }
+      );
 
       // go to kibana instances
       await clusterOverview.clickKibanaInstances();
diff --git a/x-pack/test/functional/apps/monitoring/kibana/overview.js b/x-pack/test/functional/apps/monitoring/kibana/overview.js
index 9fc33fd1aa4da..060c368563a95 100644
--- a/x-pack/test/functional/apps/monitoring/kibana/overview.js
+++ b/x-pack/test/functional/apps/monitoring/kibana/overview.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_yellow_platinum', {
+      await setup('x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum', {
         from: 'Aug 29, 2017 @ 17:24:14.254',
         to: 'Aug 29, 2017 @ 17:25:44.142',
       });
diff --git a/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js b/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js
index 581c321e98c94..5f8b926e5d17c 100644
--- a/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js
+++ b/x-pack/test/functional/apps/monitoring/kibana/overview_mb.js
@@ -17,10 +17,13 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/singlecluster_yellow_platinum_mb', {
-        from: 'Aug 29, 2017 @ 17:24:14.254',
-        to: 'Aug 29, 2017 @ 17:25:44.142',
-      });
+      await setup(
+        'x-pack/test/functional/es_archives/monitoring/singlecluster_yellow_platinum_mb',
+        {
+          from: 'Aug 29, 2017 @ 17:24:14.254',
+          to: 'Aug 29, 2017 @ 17:25:44.142',
+        }
+      );
 
       // go to kibana overview
       await clusterOverview.clickKibanaOverview();
diff --git a/x-pack/test/functional/apps/monitoring/logstash/pipelines.js b/x-pack/test/functional/apps/monitoring/logstash/pipelines.js
index 07b9702ac432f..2f698f83912c1 100644
--- a/x-pack/test/functional/apps/monitoring/logstash/pipelines.js
+++ b/x-pack/test/functional/apps/monitoring/logstash/pipelines.js
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/logstash_pipelines', {
+      await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines', {
         from: 'Jan 22, 2018 @ 09:10:00.000',
         to: 'Jan 22, 2018 @ 09:41:00.000',
       });
diff --git a/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js b/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js
index 5f47d3832caa1..508f919d97efd 100644
--- a/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js
+++ b/x-pack/test/functional/apps/monitoring/logstash/pipelines_mb.js
@@ -19,7 +19,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/logstash_pipelines_mb', {
+      await setup('x-pack/test/functional/es_archives/monitoring/logstash_pipelines_mb', {
         from: 'Jan 22, 2018 @ 09:10:00.000',
         to: 'Jan 22, 2018 @ 09:41:00.000',
       });
diff --git a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js
index a0986fa1c68b8..a9a58f8b373ff 100644
--- a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js
+++ b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration.js
@@ -19,11 +19,14 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/setup/collection/es_and_kibana', {
-          from: 'Apr 9, 2019 @ 00:00:00.741',
-          to: 'Apr 9, 2019 @ 23:59:59.741',
-          useSuperUser: true,
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana',
+          {
+            from: 'Apr 9, 2019 @ 00:00:00.741',
+            to: 'Apr 9, 2019 @ 23:59:59.741',
+            useSuperUser: true,
+          }
+        );
       });
 
       after(async () => {
diff --git a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js
index 04bee66dfb03b..d5402dda790e5 100644
--- a/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js
+++ b/x-pack/test/functional/apps/monitoring/setup/metricbeat_migration_mb.js
@@ -19,11 +19,14 @@ export default function ({ getService, getPageObjects }) {
       const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
       before(async () => {
-        await setup('monitoring/setup/collection/es_and_kibana_mb', {
-          from: 'Apr 9, 2019 @ 00:00:00.741',
-          to: 'Apr 9, 2019 @ 23:59:59.741',
-          useSuperUser: true,
-        });
+        await setup(
+          'x-pack/test/functional/es_archives/monitoring/setup/collection/es_and_kibana_mb',
+          {
+            from: 'Apr 9, 2019 @ 00:00:00.741',
+            to: 'Apr 9, 2019 @ 23:59:59.741',
+            useSuperUser: true,
+          }
+        );
       });
 
       after(async () => {
diff --git a/x-pack/test/functional/apps/monitoring/time_filter.js b/x-pack/test/functional/apps/monitoring/time_filter.js
index 21f0aaf5a60c9..910b91d07039d 100644
--- a/x-pack/test/functional/apps/monitoring/time_filter.js
+++ b/x-pack/test/functional/apps/monitoring/time_filter.js
@@ -17,7 +17,7 @@ export default function ({ getService, getPageObjects }) {
     const { setup, tearDown } = getLifecycleMethods(getService, getPageObjects);
 
     before(async () => {
-      await setup('monitoring/multicluster', {
+      await setup('x-pack/test/functional/es_archives/monitoring/multicluster', {
         from: 'Aug 15, 2017 @ 21:00:00.000',
         to: 'Aug 16, 2017 @ 00:00:00.000',
       });
diff --git a/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts b/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts
index 0406419098168..dee8433f37037 100644
--- a/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts
+++ b/x-pack/test/functional/apps/remote_clusters/feature_controls/remote_clusters_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/reporting/reporting.ts b/x-pack/test/functional/apps/reporting/reporting.ts
index a9d089e9fd397..bd1626ec32380 100644
--- a/x-pack/test/functional/apps/reporting/reporting.ts
+++ b/x-pack/test/functional/apps/reporting/reporting.ts
@@ -16,11 +16,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('Reporting', function () {
     this.tags(['smoke', 'ciGroup2']);
     before(async () => {
-      await esArchiver.loadIfNeeded('packaging');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/packaging');
     });
 
     after(async () => {
-      await esArchiver.unload('packaging');
+      await esArchiver.unload('x-pack/test/functional/es_archives/packaging');
       await es.deleteByQuery({
         index: '.reporting-*',
         refresh: true,
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 e6503b1550001..0b1fce3700986 100644
--- a/x-pack/test/functional/apps/reporting_management/report_listing.ts
+++ b/x-pack/test/functional/apps/reporting_management/report_listing.ts
@@ -30,23 +30,23 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
         ],
       });
       await security.testUser.setRoles(['kibana_admin', 'test_reporting_user']);
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     beforeEach(async () => {
       // to reset the data after deletion testing
-      await esArchiver.load('reporting/archived_reports');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/archived_reports');
       await pageObjects.common.navigateToApp('reporting');
       await testSubjects.existOrFail('reportJobListing', { timeout: 200000 });
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       await security.testUser.restoreDefaults();
     });
 
     afterEach(async () => {
-      await esArchiver.unload('reporting/archived_reports');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/archived_reports');
     });
 
     it('Confirm single report deletion works', async () => {
diff --git a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js
index 1eb2862901277..1986efe202224 100644
--- a/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js
+++ b/x-pack/test/functional/apps/rollup_job/hybrid_index_pattern.js
@@ -111,7 +111,7 @@ export default function ({ getService, getPageObjects }) {
         `${rollupSourceIndexPrefix}*`,
       ]);
 
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
   });
 }
diff --git a/x-pack/test/functional/apps/rollup_job/rollup_jobs.js b/x-pack/test/functional/apps/rollup_job/rollup_jobs.js
index a0684a77748b7..4f535ae3e3ef0 100644
--- a/x-pack/test/functional/apps/rollup_job/rollup_jobs.js
+++ b/x-pack/test/functional/apps/rollup_job/rollup_jobs.js
@@ -71,7 +71,7 @@ export default function ({ getService, getPageObjects }) {
 
       //Delete all data indices that were created.
       await esDeleteAllIndices([targetIndexName, rollupSourceIndexPattern]);
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await security.testUser.restoreDefaults();
     });
   });
diff --git a/x-pack/test/functional/apps/rollup_job/tsvb.js b/x-pack/test/functional/apps/rollup_job/tsvb.js
index 891805acb3256..ba39a8aaa436b 100644
--- a/x-pack/test/functional/apps/rollup_job/tsvb.js
+++ b/x-pack/test/functional/apps/rollup_job/tsvb.js
@@ -35,7 +35,7 @@ export default function ({ getService, getPageObjects }) {
 
     before(async () => {
       // load visualize to have an index pattern ready, otherwise visualize will redirect
-      await esArchiver.load('visualize/default');
+      await esArchiver.load('x-pack/test/functional/es_archives/visualize/default');
     });
 
     it('create rollup tsvb', async () => {
@@ -100,7 +100,7 @@ export default function ({ getService, getPageObjects }) {
       });
 
       await esDeleteAllIndices([rollupTargetIndexName, rollupSourceIndexName]);
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
   });
 }
diff --git a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts
index d9ba3a78eff13..c25c81b9a38b3 100644
--- a/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts
+++ b/x-pack/test/functional/apps/saved_objects_management/feature_controls/saved_objects_management_security.ts
@@ -17,13 +17,17 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('feature controls saved objects management', () => {
     before(async () => {
-      await esArchiver.load('saved_objects_management/feature_controls/security');
+      await esArchiver.load(
+        'x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security'
+      );
       const versionService = getService('kibanaServer').version;
       version = await versionService.get();
     });
 
     after(async () => {
-      await esArchiver.unload('saved_objects_management/feature_controls/security');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security'
+      );
     });
 
     describe('global all privileges', () => {
diff --git a/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts b/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts
index 919ba205a0762..b83263eafd9d9 100644
--- a/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts
+++ b/x-pack/test/functional/apps/saved_objects_management/import_saved_objects_between_versions.ts
@@ -22,17 +22,17 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('Export import saved objects between versions', function () {
     beforeEach(async function () {
-      await esArchiver.load('logstash_functional');
-      await esArchiver.load('getting_started/shakespeare');
+      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/getting_started/shakespeare');
       await kibanaServer.uiSettings.replace({});
       await PageObjects.settings.navigateTo();
       await PageObjects.settings.clickKibanaSavedObjects();
     });
 
     after(async () => {
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.unload('getting_started/shakespeare');
-      await esArchiver.load('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/getting_started/shakespeare');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     it('should be able to import 7.13 saved objects into 8.0.0', async function () {
diff --git a/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts b/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts
index 602a8c01a0525..28d04c1f9c54c 100644
--- a/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts
+++ b/x-pack/test/functional/apps/saved_objects_management/spaces_integration.ts
@@ -27,11 +27,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('spaces integration', () => {
     before(async () => {
-      await esArchiver.load('saved_objects_management/spaces_integration');
+      await esArchiver.load(
+        'x-pack/test/functional/es_archives/saved_objects_management/spaces_integration'
+      );
     });
 
     after(async () => {
-      await esArchiver.unload('saved_objects_management/spaces_integration');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/saved_objects_management/spaces_integration'
+      );
     });
 
     beforeEach(async () => {
diff --git a/x-pack/test/functional/apps/security/doc_level_security_roles.js b/x-pack/test/functional/apps/security/doc_level_security_roles.js
index 4fbb120e13785..2cbaae144d722 100644
--- a/x-pack/test/functional/apps/security/doc_level_security_roles.js
+++ b/x-pack/test/functional/apps/security/doc_level_security_roles.js
@@ -18,8 +18,8 @@ export default function ({ getService, getPageObjects }) {
 
   describe('dls', function () {
     before('initialize tests', async () => {
-      await esArchiver.load('empty_kibana');
-      await esArchiver.loadIfNeeded('security/dlstest');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/security/dlstest');
       await browser.setWindowSize(1600, 1000);
 
       await PageObjects.common.navigateToApp('settings');
diff --git a/x-pack/test/functional/apps/security/field_level_security.js b/x-pack/test/functional/apps/security/field_level_security.js
index 220a70b2ae9f0..f58e6837b9441 100644
--- a/x-pack/test/functional/apps/security/field_level_security.js
+++ b/x-pack/test/functional/apps/security/field_level_security.js
@@ -17,8 +17,8 @@ export default function ({ getService, getPageObjects }) {
 
   describe('field_level_security', () => {
     before('initialize tests', async () => {
-      await esArchiver.loadIfNeeded('security/flstest/data'); //( data)
-      await esArchiver.load('security/flstest/kibana'); //(savedobject)
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/security/flstest/data'); //( data)
+      await esArchiver.load('x-pack/test/functional/es_archives/security/flstest/kibana'); //(savedobject)
       await browser.setWindowSize(1600, 1000);
     });
 
diff --git a/x-pack/test/functional/apps/security/secure_roles_perm.js b/x-pack/test/functional/apps/security/secure_roles_perm.js
index 33913bcbbf7f0..027d7027d46ee 100644
--- a/x-pack/test/functional/apps/security/secure_roles_perm.js
+++ b/x-pack/test/functional/apps/security/secure_roles_perm.js
@@ -27,9 +27,9 @@ export default function ({ getService, getPageObjects }) {
     before(async () => {
       await browser.setWindowSize(1600, 1000);
       log.debug('users');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       log.debug('load kibana index with default index pattern');
-      await esArchiver.load('security/discover');
+      await esArchiver.load('x-pack/test/functional/es_archives/security/discover');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.settings.navigateTo();
     });
diff --git a/x-pack/test/functional/apps/security/security.ts b/x-pack/test/functional/apps/security/security.ts
index 70db20d6d0c48..8cee43d0f3c11 100644
--- a/x-pack/test/functional/apps/security/security.ts
+++ b/x-pack/test/functional/apps/security/security.ts
@@ -20,12 +20,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     this.tags('includeFirefox');
     describe('Login Page', () => {
       before(async () => {
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await PageObjects.security.forceLogout();
       });
 
       after(async () => {
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       afterEach(async () => {
diff --git a/x-pack/test/functional/apps/security/user_email.js b/x-pack/test/functional/apps/security/user_email.js
index ba97be40b2a49..bb9b0a865ee6b 100644
--- a/x-pack/test/functional/apps/security/user_email.js
+++ b/x-pack/test/functional/apps/security/user_email.js
@@ -14,7 +14,7 @@ export default function ({ getService, getPageObjects }) {
 
   describe('useremail', function () {
     before(async () => {
-      await esArchiver.load('security/discover');
+      await esArchiver.load('x-pack/test/functional/es_archives/security/discover');
       await PageObjects.settings.navigateTo();
       await PageObjects.security.clickElasticsearchUsers();
     });
diff --git a/x-pack/test/functional/apps/spaces/copy_saved_objects.ts b/x-pack/test/functional/apps/spaces/copy_saved_objects.ts
index 742546a53258a..2d2fdf61a94b6 100644
--- a/x-pack/test/functional/apps/spaces/copy_saved_objects.ts
+++ b/x-pack/test/functional/apps/spaces/copy_saved_objects.ts
@@ -19,7 +19,7 @@ export default function spaceSelectorFunctonalTests({
 
   describe('Copy Saved Objects to Space', function () {
     before(async () => {
-      await esArchiver.load('spaces/copy_saved_objects');
+      await esArchiver.load('x-pack/test/functional/es_archives/spaces/copy_saved_objects');
 
       await spaces.create({
         id: 'marketing',
@@ -45,7 +45,7 @@ export default function spaceSelectorFunctonalTests({
     after(async () => {
       await spaces.delete('sales');
       await spaces.delete('marketing');
-      await esArchiver.unload('spaces/copy_saved_objects');
+      await esArchiver.unload('x-pack/test/functional/es_archives/spaces/copy_saved_objects');
     });
 
     it('allows a dashboard to be copied to the marketing space, with all references', async () => {
diff --git a/x-pack/test/functional/apps/spaces/enter_space.ts b/x-pack/test/functional/apps/spaces/enter_space.ts
index b2619ab0385ea..f708282393d83 100644
--- a/x-pack/test/functional/apps/spaces/enter_space.ts
+++ b/x-pack/test/functional/apps/spaces/enter_space.ts
@@ -18,10 +18,12 @@ export default function enterSpaceFunctonalTests({
   describe.skip('Enter Space', function () {
     this.tags('includeFirefox');
     before(async () => {
-      await esArchiver.load('spaces/enter_space');
+      await esArchiver.load('x-pack/test/functional/es_archives/spaces/enter_space');
       await PageObjects.security.forceLogout();
     });
-    after(async () => await esArchiver.unload('spaces/enter_space'));
+    after(
+      async () => await esArchiver.unload('x-pack/test/functional/es_archives/spaces/enter_space')
+    );
 
     afterEach(async () => {
       await PageObjects.security.forceLogout();
diff --git a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts
index 8a5e9495d5378..a91166810b626 100644
--- a/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts
+++ b/x-pack/test/functional/apps/spaces/feature_controls/spaces_security.ts
@@ -17,11 +17,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security feature controls', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all base privilege', () => {
diff --git a/x-pack/test/functional/apps/spaces/spaces_selection.ts b/x-pack/test/functional/apps/spaces/spaces_selection.ts
index 99efdf29eecb9..0b9d1f420c663 100644
--- a/x-pack/test/functional/apps/spaces/spaces_selection.ts
+++ b/x-pack/test/functional/apps/spaces/spaces_selection.ts
@@ -22,14 +22,17 @@ export default function spaceSelectorFunctionalTests({
     'spaceSelector',
   ]);
 
-  describe('Spaces', function () {
+  // FLAKY: https://github.com/elastic/kibana/issues/99581
+  describe.skip('Spaces', function () {
     this.tags('includeFirefox');
     describe('Space Selector', () => {
       before(async () => {
-        await esArchiver.load('spaces/selector');
+        await esArchiver.load('x-pack/test/functional/es_archives/spaces/selector');
         await PageObjects.security.forceLogout();
       });
-      after(async () => await esArchiver.unload('spaces/selector'));
+      after(
+        async () => await esArchiver.unload('x-pack/test/functional/es_archives/spaces/selector')
+      );
 
       afterEach(async () => {
         await PageObjects.security.forceLogout();
@@ -68,7 +71,7 @@ export default function spaceSelectorFunctionalTests({
       };
 
       before(async () => {
-        await esArchiver.load('spaces/selector');
+        await esArchiver.load('x-pack/test/functional/es_archives/spaces/selector');
         await PageObjects.security.login(undefined, undefined, {
           expectSpaceSelector: true,
         });
@@ -88,13 +91,13 @@ export default function spaceSelectorFunctionalTests({
         // No need to remove the same sample data in both spaces, the index
         // data will be removed in the first call. By feature limitation,
         // the created saved objects in the second space will be broken but removed
-        // when we call esArchiver.unload('spaces').
+        // when we call esArchiver.unload('x-pack/test/functional/es_archives/spaces').
         await PageObjects.common.navigateToApp('home', {
           hash: sampleDataHash,
         });
         await PageObjects.home.removeSampleDataSet('logs');
         await PageObjects.security.forceLogout();
-        await esArchiver.unload('spaces/selector');
+        await esArchiver.unload('x-pack/test/functional/es_archives/spaces/selector');
       });
 
       describe('displays separate data for each space', () => {
diff --git a/x-pack/test/functional/apps/status_page/status_page.ts b/x-pack/test/functional/apps/status_page/status_page.ts
index ecef6225632e9..f69ef94095098 100644
--- a/x-pack/test/functional/apps/status_page/status_page.ts
+++ b/x-pack/test/functional/apps/status_page/status_page.ts
@@ -16,8 +16,8 @@ export default function statusPageFunctonalTests({
 
   describe('Status Page', function () {
     this.tags(['skipCloud', 'includeFirefox']);
-    before(async () => await esArchiver.load('empty_kibana'));
-    after(async () => await esArchiver.unload('empty_kibana'));
+    before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
+    after(async () => await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana'));
 
     it('allows user to navigate without authentication', async () => {
       await PageObjects.security.forceLogout();
diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts
index bba81b81311d6..e83eabfb05f44 100644
--- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts
+++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_security.ts
@@ -24,8 +24,8 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('feature controls security', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('timelion/feature_controls');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/timelion/feature_controls');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     describe('global timelion all privileges', () => {
diff --git a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts
index 8b9eefddb3323..91c357f37085e 100644
--- a/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts
+++ b/x-pack/test/functional/apps/timelion/feature_controls/timelion_spaces.ts
@@ -16,14 +16,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('timelion', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     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
-        await esArchiver.load('timelion/feature_controls');
+        await esArchiver.load('x-pack/test/functional/es_archives/timelion/feature_controls');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -33,7 +33,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('timelion/feature_controls');
+        await esArchiver.unload('x-pack/test/functional/es_archives/timelion/feature_controls');
       });
 
       it('shows timelion navlink', async () => {
@@ -54,7 +54,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('timelion/feature_controls');
+        await esArchiver.load('x-pack/test/functional/es_archives/timelion/feature_controls');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -64,7 +64,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('timelion/feature_controls');
+        await esArchiver.unload('x-pack/test/functional/es_archives/timelion/feature_controls');
       });
 
       it(`doesn't show timelion navlink`, async () => {
diff --git a/x-pack/test/functional/apps/transform/cloning.ts b/x-pack/test/functional/apps/transform/cloning.ts
index 3084871befe37..6bf3c9afb3547 100644
--- a/x-pack/test/functional/apps/transform/cloning.ts
+++ b/x-pack/test/functional/apps/transform/cloning.ts
@@ -89,7 +89,7 @@ export default function ({ getService }: FtrProviderContext) {
     const transformConfigWithLatest = getLatestTransformConfig('cloning');
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
       await transform.api.createAndRunTransform(
         transformConfigWithPivot.id,
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 b01d5d8f66863..8b5a8c93b00b8 100644
--- a/x-pack/test/functional/apps/transform/creation_index_pattern.ts
+++ b/x-pack/test/functional/apps/transform/creation_index_pattern.ts
@@ -23,7 +23,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('creation_index_pattern', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
       await transform.testResources.setKibanaTimeZoneToUTC();
 
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 6add0a3ca5408..5fe9d02c58dc7 100644
--- a/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
+++ b/x-pack/test/functional/apps/transform/creation_runtime_mappings.ts
@@ -35,7 +35,7 @@ export default function ({ getService }: FtrProviderContext) {
   };
   describe('creation with runtime mappings', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await transform.testResources.setKibanaTimeZoneToUTC();
 
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 673f5b3217fb5..e5944c7f12578 100644
--- a/x-pack/test/functional/apps/transform/creation_saved_search.ts
+++ b/x-pack/test/functional/apps/transform/creation_saved_search.ts
@@ -22,7 +22,7 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('creation_saved_search', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await transform.testResources.createIndexPatternIfNeeded('ft_farequote', '@timestamp');
       await transform.testResources.createSavedSearchFarequoteFilterIfNeeded();
       await transform.testResources.setKibanaTimeZoneToUTC();
diff --git a/x-pack/test/functional/apps/transform/deleting.ts b/x-pack/test/functional/apps/transform/deleting.ts
index 575058f8147b5..ce75c4c8b27c2 100644
--- a/x-pack/test/functional/apps/transform/deleting.ts
+++ b/x-pack/test/functional/apps/transform/deleting.ts
@@ -58,7 +58,7 @@ export default function ({ getService }: FtrProviderContext) {
     ];
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
 
       for (const testData of testDataList) {
diff --git a/x-pack/test/functional/apps/transform/editing.ts b/x-pack/test/functional/apps/transform/editing.ts
index c1e08e3a4cdd7..b1e24eeb3de95 100644
--- a/x-pack/test/functional/apps/transform/editing.ts
+++ b/x-pack/test/functional/apps/transform/editing.ts
@@ -35,7 +35,7 @@ export default function ({ getService }: FtrProviderContext) {
     const transformConfigWithLatest = getLatestTransformConfig('editing');
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
 
       await transform.api.createAndRunTransform(
diff --git a/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts b/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts
index 04c94e0a3e381..caaa37e9fdeab 100644
--- a/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts
+++ b/x-pack/test/functional/apps/transform/feature_controls/transform_security.ts
@@ -17,13 +17,13 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.security.forceLogout();
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/transform/index.ts b/x-pack/test/functional/apps/transform/index.ts
index ca82459c47f2f..2e8fd69e8580b 100644
--- a/x-pack/test/functional/apps/transform/index.ts
+++ b/x-pack/test/functional/apps/transform/index.ts
@@ -32,8 +32,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await transform.testResources.deleteIndexPatternByTitle('ft_farequote');
       await transform.testResources.deleteIndexPatternByTitle('ft_ecommerce');
 
-      await esArchiver.unload('ml/farequote');
-      await esArchiver.unload('ml/ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce');
 
       await transform.testResources.resetKibanaTimeZone();
       await transform.securityUI.logout();
diff --git a/x-pack/test/functional/apps/transform/starting.ts b/x-pack/test/functional/apps/transform/starting.ts
index e37d6e4dcd5f3..2de0bd2eea257 100644
--- a/x-pack/test/functional/apps/transform/starting.ts
+++ b/x-pack/test/functional/apps/transform/starting.ts
@@ -39,7 +39,7 @@ export default function ({ getService }: FtrProviderContext) {
     ];
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await transform.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
 
       for (const testData of testDataList) {
diff --git a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts b/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts
index e30ac06abc7ca..3de9e252e032a 100644
--- a/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts
+++ b/x-pack/test/functional/apps/upgrade_assistant/feature_controls/upgrade_assistant_security.ts
@@ -17,12 +17,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', function () {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('global all privileges (aka kibana_admin)', () => {
diff --git a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts
index 693b898f46636..09900b6ababef 100644
--- a/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts
+++ b/x-pack/test/functional/apps/upgrade_assistant/upgrade_assistant.ts
@@ -24,13 +24,13 @@ export default function upgradeAssistantFunctionalTests({
     this.tags('skipFirefox');
 
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await security.testUser.setRoles(['global_upgrade_assistant_role']);
     });
 
     after(async () => {
       await PageObjects.upgradeAssistant.waitForTelemetryHidden();
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       await security.testUser.restoreDefaults();
     });
 
diff --git a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
index aacdb18a402c1..7867170c1801c 100644
--- a/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
+++ b/x-pack/test/functional/apps/uptime/feature_controls/uptime_security.ts
@@ -18,7 +18,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('security', () => {
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       // ensure we're logged out so we can login as the appropriate users
       await PageObjects.security.forceLogout();
     });
diff --git a/x-pack/test/functional/apps/uptime/index.ts b/x-pack/test/functional/apps/uptime/index.ts
index 0b02fd2bf322b..501fec5002666 100644
--- a/x-pack/test/functional/apps/uptime/index.ts
+++ b/x-pack/test/functional/apps/uptime/index.ts
@@ -11,7 +11,7 @@ import {
   settingsObjectType,
 } from '../../../../plugins/uptime/server/lib/saved_objects';
 
-const ARCHIVE = 'uptime/full_heartbeat';
+const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
 
 export const deleteUptimeSettingsObject = async (server: any) => {
   // delete the saved object
@@ -50,10 +50,10 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
 
     describe('with generated data', () => {
       beforeEach('load heartbeat data', async () => {
-        await esArchiver.load('uptime/blank');
+        await esArchiver.load('x-pack/test/functional/es_archives/uptime/blank');
       });
       afterEach('unload', async () => {
-        await esArchiver.unload('uptime/blank');
+        await esArchiver.unload('x-pack/test/functional/es_archives/uptime/blank');
       });
 
       loadTestFile(require.resolve('./locations'));
diff --git a/x-pack/test/functional/apps/uptime/ml_anomaly.ts b/x-pack/test/functional/apps/uptime/ml_anomaly.ts
index 83f4c8081a06c..38b5f47011409 100644
--- a/x-pack/test/functional/apps/uptime/ml_anomaly.ts
+++ b/x-pack/test/functional/apps/uptime/ml_anomaly.ts
@@ -12,7 +12,7 @@ export default ({ getService }: FtrProviderContext) => {
   const uptime = getService('uptime');
   const log = getService('log');
   const esArchiver = getService('esArchiver');
-  const archive = 'uptime/full_heartbeat';
+  const archive = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
 
   describe('uptime ml anomaly', function () {
     this.tags(['skipFirefox']);
diff --git a/x-pack/test/functional/apps/uptime/monitor.ts b/x-pack/test/functional/apps/uptime/monitor.ts
index 918fa45b603f1..0ddff37eb14fc 100644
--- a/x-pack/test/functional/apps/uptime/monitor.ts
+++ b/x-pack/test/functional/apps/uptime/monitor.ts
@@ -11,7 +11,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
   const uptimeService = getService('uptime');
   const { uptime } = getPageObjects(['uptime']);
-  const archive = 'uptime/full_heartbeat';
+  const archive = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
 
   describe('monitor page', function () {
     this.tags(['skipFirefox']);
diff --git a/x-pack/test/functional/apps/uptime/overview.ts b/x-pack/test/functional/apps/uptime/overview.ts
index 1e52accfde1a3..2d2c3a8d5faa7 100644
--- a/x-pack/test/functional/apps/uptime/overview.ts
+++ b/x-pack/test/functional/apps/uptime/overview.ts
@@ -20,7 +20,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     const DEFAULT_DATE_END = 'Sep 11, 2019 @ 19:40:08.078';
 
     before(async () => {
-      await esArchiver.loadIfNeeded('uptime/full_heartbeat');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/uptime/full_heartbeat');
     });
 
     beforeEach(async () => {
diff --git a/x-pack/test/functional/apps/uptime/ping_redirects.ts b/x-pack/test/functional/apps/uptime/ping_redirects.ts
index 39d9292dbbbb8..03185ac9f1466 100644
--- a/x-pack/test/functional/apps/uptime/ping_redirects.ts
+++ b/x-pack/test/functional/apps/uptime/ping_redirects.ts
@@ -15,7 +15,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
   const uptime = getService('uptime');
   const esArchiver = getService('esArchiver');
 
-  const archive = 'uptime/blank';
+  const archive = 'x-pack/test/functional/es_archives/uptime/blank';
 
   const monitor = () => uptime.monitor;
 
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
index f650ac08de166..2994e18fa9ab7 100644
--- a/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
+++ b/x-pack/test/functional/apps/visualize/feature_controls/visualize_security.ts
@@ -30,12 +30,12 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('visualize feature controls security', () => {
     before(async () => {
-      await esArchiver.load('visualize/default');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/visualize/default');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     after(async () => {
-      await esArchiver.unload('visualize/default');
+      await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default');
       // logout, so the other tests don't accidentally run as the custom users we're testing below
       await PageObjects.security.forceLogout();
     });
diff --git a/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts b/x-pack/test/functional/apps/visualize/feature_controls/visualize_spaces.ts
index 469a337177065..cad437bbadc3e 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
@@ -19,14 +19,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('visualize', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     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
-        await esArchiver.load('visualize/default');
+        await esArchiver.load('x-pack/test/functional/es_archives/visualize/default');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -36,7 +36,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('visualize/default');
+        await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default');
       });
 
       it('shows visualize navlink', async () => {
@@ -67,7 +67,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       before(async () => {
         // we need to load the following in every situation as deleting
         // a space deletes all of the associated saved objects
-        await esArchiver.load('visualize/default');
+        await esArchiver.load('x-pack/test/functional/es_archives/visualize/default');
         await spacesService.create({
           id: 'custom_space',
           name: 'custom_space',
@@ -77,7 +77,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
       after(async () => {
         await spacesService.delete('custom_space');
-        await esArchiver.unload('visualize/default');
+        await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default');
       });
 
       it(`doesn't show visualize navlink`, async () => {
diff --git a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
index 0bde8e2816c84..41c393398b256 100644
--- a/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
+++ b/x-pack/test/functional/apps/visualize/hybrid_visualization.ts
@@ -14,15 +14,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('hybrid index pattern', () => {
     before(async () => {
-      await esArchiver.load('hybrid/kibana');
-      await esArchiver.load('hybrid/logstash');
-      await esArchiver.load('hybrid/rollup');
+      await esArchiver.load('x-pack/test/functional/es_archives/hybrid/kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/hybrid/logstash');
+      await esArchiver.load('x-pack/test/functional/es_archives/hybrid/rollup');
     });
 
     after(async () => {
-      await esArchiver.unload('hybrid/kibana');
-      await esArchiver.unload('hybrid/logstash');
-      await esArchiver.unload('hybrid/rollup');
+      await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/logstash');
+      await esArchiver.unload('x-pack/test/functional/es_archives/hybrid/rollup');
     });
 
     it('should render histogram line chart', async () => {
diff --git a/x-pack/test/functional/apps/visualize/precalculated_histogram.ts b/x-pack/test/functional/apps/visualize/precalculated_histogram.ts
index 20111b8f4f1e0..bee6b3e8ddd20 100644
--- a/x-pack/test/functional/apps/visualize/precalculated_histogram.ts
+++ b/x-pack/test/functional/apps/visualize/precalculated_histogram.ts
@@ -17,12 +17,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('pre_calculated_histogram', function () {
     before(async function () {
       log.debug('Starting pre_calculated_histogram before method');
-      await esArchiver.load('pre_calculated_histogram');
+      await esArchiver.load('x-pack/test/functional/es_archives/pre_calculated_histogram');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'test-histogram' });
     });
 
     after(function () {
-      return esArchiver.unload('pre_calculated_histogram');
+      return esArchiver.unload('x-pack/test/functional/es_archives/pre_calculated_histogram');
     });
 
     it('appears correctly in discover', async function () {
diff --git a/x-pack/test/functional/apps/visualize/preserve_url.ts b/x-pack/test/functional/apps/visualize/preserve_url.ts
index 16267a544275c..58e4d2ffcd4b2 100644
--- a/x-pack/test/functional/apps/visualize/preserve_url.ts
+++ b/x-pack/test/functional/apps/visualize/preserve_url.ts
@@ -16,11 +16,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('preserve url', function () {
     before(async function () {
-      await esArchiver.load('spaces/multi_space');
+      await esArchiver.load('x-pack/test/functional/es_archives/spaces/multi_space');
     });
 
     after(function () {
-      return esArchiver.unload('spaces/multi_space');
+      return esArchiver.unload('x-pack/test/functional/es_archives/spaces/multi_space');
     });
 
     it('goes back to last opened url', async function () {
diff --git a/x-pack/test/functional/apps/visualize/reporting.ts b/x-pack/test/functional/apps/visualize/reporting.ts
index 8add80996e270..799006337300f 100644
--- a/x-pack/test/functional/apps/visualize/reporting.ts
+++ b/x-pack/test/functional/apps/visualize/reporting.ts
@@ -24,13 +24,15 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('Visualize Reporting Screenshots', () => {
     before('initialize tests', async () => {
       log.debug('ReportingPage:initTests');
-      await esArchiver.loadIfNeeded('reporting/ecommerce');
-      await esArchiver.loadIfNeeded('reporting/ecommerce_kibana');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.loadIfNeeded(
+        'x-pack/test/functional/es_archives/reporting/ecommerce_kibana'
+      );
       await browser.setWindowSize(1600, 850);
     });
     after('clean up archives', async () => {
-      await esArchiver.unload('reporting/ecommerce');
-      await esArchiver.unload('reporting/ecommerce_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       await es.deleteByQuery({
         index: '.reporting-*',
         refresh: true,
diff --git a/x-pack/test/functional/config.js b/x-pack/test/functional/config.js
index ee5be48a07663..20487047a3a56 100644
--- a/x-pack/test/functional/config.js
+++ b/x-pack/test/functional/config.js
@@ -208,11 +208,6 @@ export default async function ({ readConfigFile }) {
       },
     },
 
-    // choose where esArchiver should load archives from
-    esArchiver: {
-      directory: resolve(__dirname, 'es_archives'),
-    },
-
     // choose where screenshots should be saved
     screenshots: {
       directory: resolve(__dirname, 'screenshots'),
diff --git a/x-pack/test/functional/config_security_basic.ts b/x-pack/test/functional/config_security_basic.ts
index 4deb598fe8769..dc4bfc437347e 100644
--- a/x-pack/test/functional/config_security_basic.ts
+++ b/x-pack/test/functional/config_security_basic.ts
@@ -60,11 +60,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       ...kibanaFunctionalConfig.get('apps'),
     },
 
-    // choose where esArchiver should load archives from
-    esArchiver: {
-      directory: resolve(__dirname, 'es_archives'),
-    },
-
     // choose where screenshots should be saved
     screenshots: {
       directory: resolve(__dirname, 'screenshots'),
diff --git a/x-pack/test/functional/es_archives/banners/multispace/mappings.json b/x-pack/test/functional/es_archives/banners/multispace/mappings.json
index f3793c7ca6780..9f3201d73abc1 100644
--- a/x-pack/test/functional/es_archives/banners/multispace/mappings.json
+++ b/x-pack/test/functional/es_archives/banners/multispace/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/dashboard/async_search/mappings.json b/x-pack/test/functional/es_archives/dashboard/async_search/mappings.json
index ee860fe973f60..5001bb053e01b 100644
--- a/x-pack/test/functional/es_archives/dashboard/async_search/mappings.json
+++ b/x-pack/test/functional/es_archives/dashboard/async_search/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/dashboard/drilldowns/mappings.json b/x-pack/test/functional/es_archives/dashboard/drilldowns/mappings.json
index 210fade40c648..a842c20b6965e 100644
--- a/x-pack/test/functional/es_archives/dashboard/drilldowns/mappings.json
+++ b/x-pack/test/functional/es_archives/dashboard/drilldowns/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/dashboard/feature_controls/security/mappings.json b/x-pack/test/functional/es_archives/dashboard/feature_controls/security/mappings.json
index c66a45084441f..29c56a751c038 100644
--- a/x-pack/test/functional/es_archives/dashboard/feature_controls/security/mappings.json
+++ b/x-pack/test/functional/es_archives/dashboard/feature_controls/security/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/functional/es_archives/dashboard/feature_controls/spaces/mappings.json b/x-pack/test/functional/es_archives/dashboard/feature_controls/spaces/mappings.json
index dafef0fa9c2c7..0cd1a29f92241 100644
--- a/x-pack/test/functional/es_archives/dashboard/feature_controls/spaces/mappings.json
+++ b/x-pack/test/functional/es_archives/dashboard/feature_controls/spaces/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/functional/es_archives/dashboard/session_in_space/mappings.json b/x-pack/test/functional/es_archives/dashboard/session_in_space/mappings.json
index 210fade40c648..a842c20b6965e 100644
--- a/x-pack/test/functional/es_archives/dashboard/session_in_space/mappings.json
+++ b/x-pack/test/functional/es_archives/dashboard/session_in_space/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/dashboard_view_mode/mappings.json b/x-pack/test/functional/es_archives/dashboard_view_mode/mappings.json
index 3558e89558a56..0f58add932b0c 100644
--- a/x-pack/test/functional/es_archives/dashboard_view_mode/mappings.json
+++ b/x-pack/test/functional/es_archives/dashboard_view_mode/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/data/search_sessions/mappings.json b/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
index 61305d640fe3e..9c27bc1458c7f 100644
--- a/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
+++ b/x-pack/test/functional/es_archives/data/search_sessions/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/functional/es_archives/discover/default/mappings.json b/x-pack/test/functional/es_archives/discover/default/mappings.json
index 53bbe8a5baa5b..519af2dd75b9e 100644
--- a/x-pack/test/functional/es_archives/discover/default/mappings.json
+++ b/x-pack/test/functional/es_archives/discover/default/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/discover/feature_controls/security/mappings.json b/x-pack/test/functional/es_archives/discover/feature_controls/security/mappings.json
index 5e01af673ef2f..69fceb7c9d209 100644
--- a/x-pack/test/functional/es_archives/discover/feature_controls/security/mappings.json
+++ b/x-pack/test/functional/es_archives/discover/feature_controls/security/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/functional/es_archives/discover/feature_controls/spaces/mappings.json b/x-pack/test/functional/es_archives/discover/feature_controls/spaces/mappings.json
index dafef0fa9c2c7..0cd1a29f92241 100644
--- a/x-pack/test/functional/es_archives/discover/feature_controls/spaces/mappings.json
+++ b/x-pack/test/functional/es_archives/discover/feature_controls/spaces/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/functional/es_archives/empty_kibana/mappings.json b/x-pack/test/functional/es_archives/empty_kibana/mappings.json
index 77eac534850a5..499c994780285 100644
--- a/x-pack/test/functional/es_archives/empty_kibana/mappings.json
+++ b/x-pack/test/functional/es_archives/empty_kibana/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/endpoint/metadata/destination_index/data.json b/x-pack/test/functional/es_archives/endpoint/metadata/destination_index/data.json
index b70a9d5df0eb8..22f4afcf99d4d 100644
--- a/x-pack/test/functional/es_archives/endpoint/metadata/destination_index/data.json
+++ b/x-pack/test/functional/es_archives/endpoint/metadata/destination_index/data.json
@@ -13,7 +13,13 @@
             "status": "failure"
           }
         },
-        "status": "enrolled"
+        "status": "enrolled",
+        "configuration": {
+          "isolation": false
+        },
+        "state": {
+          "isolation": false
+        }
       },
       "agent": {
         "id": "3838df35-a095-4af4-8fce-0b6d78793f2e",
@@ -81,7 +87,13 @@
             "status": "failure"
           }
         },
-        "status": "enrolled"
+        "status": "enrolled",
+        "configuration": {
+          "isolation": false
+        },
+        "state": {
+          "isolation": false
+        }
       },
       "agent": {
         "id": "963b081e-60d1-482c-befd-a5815fa8290f",
@@ -152,7 +164,13 @@
             "status": "success"
           }
         },
-        "status": "enrolled"
+        "status": "enrolled",
+        "configuration": {
+          "isolation": false
+        },
+        "state": {
+          "isolation": false
+        }
       },
       "agent": {
         "id": "b3412d6f-b022-4448-8fee-21cc936ea86b",
diff --git a/x-pack/test/functional/es_archives/invalid_scripted_field/mappings.json b/x-pack/test/functional/es_archives/invalid_scripted_field/mappings.json
index 0024c6943ed1c..63cc283f96d32 100644
--- a/x-pack/test/functional/es_archives/invalid_scripted_field/mappings.json
+++ b/x-pack/test/functional/es_archives/invalid_scripted_field/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/functional/es_archives/logstash/empty/mappings.json b/x-pack/test/functional/es_archives/logstash/empty/mappings.json
index 096c68aefcc3c..98fb761389a24 100644
--- a/x-pack/test/functional/es_archives/logstash/empty/mappings.json
+++ b/x-pack/test/functional/es_archives/logstash/empty/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/logstash/example_pipelines/mappings.json b/x-pack/test/functional/es_archives/logstash/example_pipelines/mappings.json
index 9e56ff8a7a43a..56a2e144ff89c 100644
--- a/x-pack/test/functional/es_archives/logstash/example_pipelines/mappings.json
+++ b/x-pack/test/functional/es_archives/logstash/example_pipelines/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/maps/kibana/data.json b/x-pack/test/functional/es_archives/maps/kibana/data.json
index 4a879c20f19ab..d0c4559d0a0a9 100644
--- a/x-pack/test/functional/es_archives/maps/kibana/data.json
+++ b/x-pack/test/functional/es_archives/maps/kibana/data.json
@@ -1199,6 +1199,34 @@
   }
 }
 
+{
+  "type": "doc",
+  "value": {
+    "id": "dashboard:4beb0d80-c2ef-11eb-b0cb-bd162d969e6b",
+    "index": ".kibana",
+    "source": {
+      "dashboard": {
+        "title" : "by value map",
+        "hits" : 0,
+        "description" : "",
+        "panelsJSON" : "[{\"version\":\"7.12.1-SNAPSHOT\",\"type\":\"map\",\"gridData\":{\"x\":0,\"y\":0,\"w\":24,\"h\":15,\"i\":\"cb82a9e3-2eb0-487f-9ade-0ffb921eb536\"},\"panelIndex\":\"cb82a9e3-2eb0-487f-9ade-0ffb921eb536\",\"embeddableConfig\":{\"attributes\":{\"title\":\"\",\"description\":\"\",\"layerListJSON\":\"[]\",\"mapStateJSON\":\"{\\\"zoom\\\":1.75,\\\"center\\\":{\\\"lon\\\":0,\\\"lat\\\":19.94277},\\\"timeFilters\\\":{\\\"from\\\":\\\"now-15m\\\",\\\"to\\\":\\\"now\\\"},\\\"refreshConfig\\\":{\\\"isPaused\\\":true,\\\"interval\\\":0},\\\"query\\\":{\\\"query\\\":\\\"\\\",\\\"language\\\":\\\"kuery\\\"},\\\"filters\\\":[],\\\"settings\\\":{\\\"autoFitToDataBounds\\\":false,\\\"backgroundColor\\\":\\\"#ffffff\\\",\\\"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,\\\"spatialFiltersAlpa\\\":0.3,\\\"spatialFiltersFillColor\\\":\\\"#DA8B45\\\",\\\"spatialFiltersLineColor\\\":\\\"#DA8B45\\\"}}\",\"uiStateJSON\":\"{\\\"isLayerTOCOpen\\\":true,\\\"openTOCDetails\\\":[]}\"},\"mapCenter\":{\"lat\":19.94277,\"lon\":0,\"zoom\":1.75},\"mapBuffer\":{\"minLon\":-211.13072,\"minLat\":-55.27145,\"maxLon\":211.13072,\"maxLat\":87.44135},\"isLayerTOCOpen\":true,\"openTOCDetails\":[],\"hiddenLayers\":[],\"enhancements\":{}}}]",
+        "optionsJSON" : "{\"hidePanelTitles\":false,\"useMargins\":true}",
+        "version" : 1,
+        "timeRestore" : false,
+        "kibanaSavedObjectMeta" : {
+          "searchSourceJSON" : "{\"query\":{\"language\":\"kuery\",\"query\":\"\"},\"filter\":[]}"
+        }
+      },
+      "type" : "dashboard",
+      "references" : [ ],
+      "migrationVersion" : {
+        "dashboard" : "7.11.0"
+      },
+      "updated_at" : "2021-06-01T15:37:39.198Z"
+    }
+  }
+}
+
 {
   "type": "doc",
   "value": {
diff --git a/x-pack/test/functional/es_archives/maps/kibana/mappings.json b/x-pack/test/functional/es_archives/maps/kibana/mappings.json
index 4786fb1f30f43..d9a4ed16b51bd 100644
--- a/x-pack/test/functional/es_archives/maps/kibana/mappings.json
+++ b/x-pack/test/functional/es_archives/maps/kibana/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/functional/es_archives/reporting/logs/mappings.json b/x-pack/test/functional/es_archives/reporting/logs/mappings.json
index adf4050bb88c4..ffb8c85e8fd8b 100644
--- a/x-pack/test/functional/es_archives/reporting/logs/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/logs/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/reporting/sales/mappings.json b/x-pack/test/functional/es_archives/reporting/sales/mappings.json
index 3249708537b73..dbb8d396eb496 100644
--- a/x-pack/test/functional/es_archives/reporting/sales/mappings.json
+++ b/x-pack/test/functional/es_archives/reporting/sales/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/README.md b/x-pack/test/functional/es_archives/rule_keyword_family/README.md
new file mode 100644
index 0000000000000..b6849e7ea5915
--- /dev/null
+++ b/x-pack/test/functional/es_archives/rule_keyword_family/README.md
@@ -0,0 +1,20 @@
+Within this folder is input test data for tests within the folder:
+
+```ts
+x-pack/test/detection_engine_api_integration/security_and_spaces/tests/keyword_family
+```
+
+where these are small ECS compliant input indexes that try to express tests that exercise different parts of
+the detection engine around creating and validating that the keyword family and field aliases all will work 
+with the detection engine. These indexes might contain extra fields or different fields but should not directly
+clash with ECS or minimally clash. Nothing is stopping anyone from being ECS strict and not having additional
+extra fields but the extra fields and mappings are to just try and keep these tests simple and small.
+
+Most of these tests center around the two fields of:
+* event.module
+* event.dataset
+
+To ensure that if mix and match between `keyword`, `const keyword` and field aliases within them, everything should
+still be ok. It is alright if other use cases are added here if they fit within the `keyword` family as described here:
+https://www.elastic.co/guide/en/elasticsearch/reference/7.12/keyword.html
+ 
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/data.json b/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/data.json
new file mode 100644
index 0000000000000..2d0359c6ff828
--- /dev/null
+++ b/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/data.json
@@ -0,0 +1,47 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "1",
+    "index": "const_keyword",
+    "source": {
+      "@timestamp": "2020-10-27T05:00:53.000Z"
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "2",
+    "index": "const_keyword",
+    "source": {
+      "@timestamp": "2020-10-27T05:01:53.000Z"
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "3",
+    "index": "const_keyword",
+    "source": {
+      "@timestamp": "2020-10-27T05:02:53.000Z"
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "4",
+    "index": "const_keyword",
+    "source": {
+      "@timestamp": "2020-10-27T05:03:53.000Z"
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/mappings.json b/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/mappings.json
new file mode 100644
index 0000000000000..7e3d74f840142
--- /dev/null
+++ b/x-pack/test/functional/es_archives/rule_keyword_family/const_keyword/mappings.json
@@ -0,0 +1,48 @@
+{
+  "type": "index",
+  "value": {
+    "index": "const_keyword",
+    "mappings": {
+      "dynamic": "strict",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "data_stream": {
+          "properties": {
+            "dataset": {
+              "type": "constant_keyword",
+              "value": "dataset_name_1"
+            },
+            "module": {
+              "type": "constant_keyword",
+              "value": "module_name_1"
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "category": {
+              "type": "keyword"
+            },
+            "dataset": {
+              "type": "alias",
+              "path": "data_stream.dataset"
+            },
+            "module": {
+              "type": "alias",
+              "path": "data_stream.module"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "1s",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/keyword/data.json b/x-pack/test/functional/es_archives/rule_keyword_family/keyword/data.json
new file mode 100644
index 0000000000000..40118aa0e2ba8
--- /dev/null
+++ b/x-pack/test/functional/es_archives/rule_keyword_family/keyword/data.json
@@ -0,0 +1,63 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "1",
+    "index": "keyword",
+    "source": {
+      "@timestamp": "2020-10-28T05:00:53.000Z",
+      "event": {
+        "module": "module_name_1",
+        "dataset": "dataset_name_1"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "2",
+    "index": "keyword",
+    "source": {
+      "@timestamp": "2020-10-28T05:01:53.000Z",
+      "event": {
+        "module": "module_name_1",
+        "dataset": "dataset_name_1"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "3",
+    "index": "keyword",
+    "source": {
+      "@timestamp": "2020-10-28T05:02:53.000Z",
+      "event": {
+        "module": "module_name_1",
+        "dataset": "dataset_name_1"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "4",
+    "index": "keyword",
+    "source": {
+      "@timestamp": "2020-10-28T05:03:53.000Z",
+      "event": {
+        "module": "module_name_1",
+        "dataset": "dataset_name_1"
+      }
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/rule_keyword_family/keyword/mappings.json b/x-pack/test/functional/es_archives/rule_keyword_family/keyword/mappings.json
new file mode 100644
index 0000000000000..9d5274a002279
--- /dev/null
+++ b/x-pack/test/functional/es_archives/rule_keyword_family/keyword/mappings.json
@@ -0,0 +1,34 @@
+{
+  "type": "index",
+  "value": {
+    "index": "keyword",
+    "mappings": {
+      "dynamic": "strict",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "event": {
+          "properties": {
+            "category": {
+              "type": "keyword"
+            },
+            "module": {
+              "type": "keyword"
+            },
+            "dataset": {
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "1s",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security/mappings.json b/x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security/mappings.json
index 6a416126d7f26..05ca4d8e8307e 100644
--- a/x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security/mappings.json
+++ b/x-pack/test/functional/es_archives/saved_objects_management/feature_controls/security/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/functional/es_archives/security/discover/mappings.json b/x-pack/test/functional/es_archives/security/discover/mappings.json
index 3558e89558a56..0f58add932b0c 100644
--- a/x-pack/test/functional/es_archives/security/discover/mappings.json
+++ b/x-pack/test/functional/es_archives/security/discover/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/security/flstest/kibana/mappings.json b/x-pack/test/functional/es_archives/security/flstest/kibana/mappings.json
index fb2ed91f3ce14..ca97d0505f5b1 100644
--- a/x-pack/test/functional/es_archives/security/flstest/kibana/mappings.json
+++ b/x-pack/test/functional/es_archives/security/flstest/kibana/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/functional/es_archives/security_solution/README.md b/x-pack/test/functional/es_archives/security_solution/README.md
new file mode 100644
index 0000000000000..c832e0835bbbc
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/README.md
@@ -0,0 +1,11 @@
+Collection of data sets for use within various tests. Most of the tests to these live in either:
+
+```
+x-pack/test/detection_engine_api_integrations/security_and_spaces/tests
+```
+
+or
+
+```
+x-pack/test/api_integration/apis/security_solution
+```
diff --git a/x-pack/test/functional/es_archives/security_solution/alias/data.json b/x-pack/test/functional/es_archives/security_solution/alias/data.json
new file mode 100644
index 0000000000000..a8bd64cb044eb
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/alias/data.json
@@ -0,0 +1,59 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "1",
+    "index": "alias",
+    "source": {
+      "@timestamp": "2020-10-28T05:00:53.000Z",
+      "host_alias": {
+        "name": "host name 1"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "2",
+    "index": "alias",
+    "source": {
+      "@timestamp": "2020-10-28T05:01:53.000Z",
+      "host_alias": {
+        "name": "host name 2"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "3",
+    "index": "alias",
+    "source": {
+      "@timestamp": "2020-10-28T05:02:53.000Z",
+      "host_alias": {
+        "name": "host name 3"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "4",
+    "index": "alias",
+    "source": {
+      "@timestamp": "2020-10-28T05:03:53.000Z",
+      "host_alias": {
+        "name": "host name 4"
+      }
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/alias/mappings.json b/x-pack/test/functional/es_archives/security_solution/alias/mappings.json
new file mode 100644
index 0000000000000..280ec9377df64
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/alias/mappings.json
@@ -0,0 +1,36 @@
+{
+  "type": "index",
+  "value": {
+    "index": "host_alias",
+    "mappings": {
+      "dynamic": "strict",
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "host": {
+          "properties": {
+            "name": {
+              "type": "alias",
+              "path": "host_alias.name"
+            }
+          }
+        },
+        "host_alias": {
+          "properties": {
+            "name": {
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "1s",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime/data.json b/x-pack/test/functional/es_archives/security_solution/runtime/data.json
new file mode 100644
index 0000000000000..799d59e6fb1ee
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/runtime/data.json
@@ -0,0 +1,59 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "1",
+    "index": "runtime",
+    "source": {
+      "@timestamp": "2020-10-28T05:00:53.000Z",
+      "host": {
+        "name": "host name 1"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "2",
+    "index": "runtime",
+    "source": {
+      "@timestamp": "2020-10-28T05:01:53.000Z",
+      "host": {
+        "name": "host name 2"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "3",
+    "index": "runtime",
+    "source": {
+      "@timestamp": "2020-10-28T05:02:53.000Z",
+      "host": {
+        "name": "host name 3"
+      }
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "4",
+    "index": "runtime",
+    "source": {
+      "@timestamp": "2020-10-28T05:03:53.000Z",
+      "host": {
+        "name": "host name 4"
+      }
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime/mappings.json b/x-pack/test/functional/es_archives/security_solution/runtime/mappings.json
new file mode 100644
index 0000000000000..33235d0171837
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/runtime/mappings.json
@@ -0,0 +1,36 @@
+{
+  "type": "index",
+  "value": {
+    "index": "runtime",
+    "mappings": {
+      "dynamic": "strict",
+      "runtime": {
+        "host.hostname": {
+          "type": "keyword",
+          "script": {
+            "source": "emit(doc['host.name'].value)"
+          }
+        }
+      },
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "host": {
+          "properties": {
+            "name": {
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "1s",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/data.json b/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/data.json
new file mode 100644
index 0000000000000..ea64cd215f478
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/data.json
@@ -0,0 +1,67 @@
+{
+  "type": "doc",
+  "value": {
+    "id": "1",
+    "index": "runtime_conflicting_fields",
+    "source": {
+      "@timestamp": "2020-10-28T05:00:53.000Z",
+      "host": [{
+        "name": "host name 1_1"
+      }, {
+        "name": "host name 1_2"
+      }]
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "2",
+    "index": "runtime_conflicting_fields",
+    "source": {
+      "@timestamp": "2020-10-28T05:01:53.000Z",
+      "host": [{
+        "name": "host name 2_1"
+      }, {
+        "name": "host name 2_2"
+      }]
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "3",
+    "index": "runtime_conflicting_fields",
+    "source": {
+      "@timestamp": "2020-10-28T05:02:53.000Z",
+      "host": [{
+        "name": "host name 3_1"
+      }, {
+        "name": "host name 3_2"
+      }]
+    },
+    "type": "_doc"
+  }
+}
+
+{
+  "type": "doc",
+  "value": {
+    "id": "4",
+    "index": "runtime_conflicting_fields",
+    "source": {
+      "@timestamp": "2020-10-28T05:03:53.000Z",
+      "host": [{
+        "name": "host name 4_1"
+      }, {
+        "name": "host name 4_2"
+      }]
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/mappings.json b/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/mappings.json
new file mode 100644
index 0000000000000..04a538a332953
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/runtime_conflicting_fields/mappings.json
@@ -0,0 +1,114 @@
+{
+  "type": "index",
+  "value": {
+    "index": "runtime_conflicting_fields",
+    "mappings": {
+      "dynamic": "strict",
+      "runtime": {
+        "host_alias": {
+          "type": "keyword",
+          "script": {
+            "source": "emit(doc['host.name'].value)"
+          }
+        },
+        ".": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [.] field that runtime exposes')"
+          }
+        },
+        "..": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [..] field that runtime exposes')"
+          }
+        },
+        "host.name.": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [host.name] field that runtime exposes')"
+          }
+        },
+        ".host.name": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [.host.name] field that runtime exposes')"
+          }
+        },
+        ".host.name.": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [.host.name.] field that runtime exposes')"
+          }
+        },
+        "..host.name.": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [..host.name.] field that runtime exposes')"
+          }
+        },
+        "..host.name": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [..host.name] field that runtime exposes')"
+          }
+        },
+        ".host.name..": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [.host.name..] field that runtime exposes')"
+          }
+        },
+        "host.name..": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [host.name..] field that runtime exposes')"
+          }
+        },
+        "host": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [host] field which is now a keyword instead of object runtime exposes')"
+          }
+        },
+        "host.name": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [host.name] field value which shadows the original host.name value')"
+          }
+        },
+        "host.field_1": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [host.name.field_1] field value which now confuses which array element I should be in and am ambiguous')"
+          }
+        },
+        "host.name.subobject": {
+          "type": "keyword",
+          "script": {
+            "source": "emit('I am the [host.name.subobject] field value which is now an object instead of keyword runtime exposes')"
+          }
+        }
+      },
+      "properties": {
+        "@timestamp": {
+          "type": "date"
+        },
+        "host": {
+          "properties": {
+            "name": {
+              "type": "keyword"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "1s",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/data.json b/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/data.json
new file mode 100644
index 0000000000000..46b30b239bbc7
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/data.json
@@ -0,0 +1,10 @@
+{
+  "type": "doc",
+  "value": {
+    "index": "timestamp_in_seconds",
+    "source": {
+      "@timestamp": 1622676795
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/mappings.json
new file mode 100644
index 0000000000000..fd8880fe0bc49
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_in_seconds/mappings.json
@@ -0,0 +1,22 @@
+{
+  "type": "index",
+  "value": {
+    "index": "timestamp_in_seconds",
+    "mappings": {
+      "dynamic": "strict",
+      "properties": {
+        "@timestamp": {
+          "type": "date",
+          "format": "epoch_second"
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "1s",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json
index 085ab34a3d58a..092519a792863 100644
--- a/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override/mappings.json
@@ -3,6 +3,7 @@
   "value": {
     "index": "myfakeindex-1",
     "mappings": {
+      "dynamic": "strict",
       "properties": {
         "message": {
           "type": "text",
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json
index 085ab34a3d58a..092519a792863 100644
--- a/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_1/mappings.json
@@ -3,6 +3,7 @@
   "value": {
     "index": "myfakeindex-1",
     "mappings": {
+      "dynamic": "strict",
       "properties": {
         "message": {
           "type": "text",
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json
index 49a27a423cdaa..1f1c1673fe1a2 100644
--- a/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_2/mappings.json
@@ -3,6 +3,7 @@
   "value": {
     "index": "myfakeindex-2",
     "mappings": {
+      "dynamic": "strict",
       "properties": {
         "message": {
           "type": "text",
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json
index 736584386a705..a0409280c34eb 100644
--- a/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_3/mappings.json
@@ -3,6 +3,7 @@
   "value": {
     "index": "myfakeindex-3",
     "mappings": {
+      "dynamic": "strict",
       "properties": {
         "message": {
           "type": "text",
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json
index ca7025b36154c..ad0e7cbab7d2b 100644
--- a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/data.json
@@ -6,7 +6,7 @@
       "message": "hello world 4",
       "@timestamp": "2020-12-16T15:16:18.570Z",
       "event": {
-        "ingested": "2020-12-16T15:16:18.570Z"
+        "ingested": "2020-12-16T16:16:18.570Z"
       }
     },
     "type": "_doc"
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json
index ab4edc9f300e1..a4e021e45ff9e 100644
--- a/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_4/mappings.json
@@ -3,6 +3,7 @@
   "value": {
     "index": "myfakeindex-4",
     "mappings": {
+      "dynamic": "strict",
       "properties": {
         "@timestamp": {
           "type": "date"
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/data.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/data.json
new file mode 100644
index 0000000000000..f2c81e9b5e45e
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/data.json
@@ -0,0 +1,14 @@
+{
+  "type": "doc",
+  "value": {
+    "index": "myfakeindex-5",
+    "source": {
+      "@timestamp": 1608131778,
+      "message": "hello world 4",
+      "event": {
+        "ingested": 1622676795
+      }
+    },
+    "type": "_doc"
+  }
+}
diff --git a/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/mappings.json b/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/mappings.json
new file mode 100644
index 0000000000000..a9735aaeca8ef
--- /dev/null
+++ b/x-pack/test/functional/es_archives/security_solution/timestamp_override_5/mappings.json
@@ -0,0 +1,39 @@
+{
+  "type": "index",
+  "value": {
+    "index": "myfakeindex-5",
+    "mappings": {
+      "dynamic": "strict",
+      "properties": {
+        "@timestamp": {
+          "type": "date",
+          "format": "epoch_second"
+        },
+        "message": {
+          "type": "text",
+          "fields": {
+            "keyword": {
+              "type": "keyword",
+              "ignore_above": 256
+            }
+          }
+        },
+        "event": {
+          "properties": {
+            "ingested": {
+              "type": "date",
+              "format": "epoch_second"
+            }
+          }
+        }
+      }
+    },
+    "settings": {
+      "index": {
+        "refresh_interval": "1s",
+        "number_of_replicas": "1",
+        "number_of_shards": "1"
+      }
+    }
+  }
+}
diff --git a/x-pack/test/functional/es_archives/spaces/copy_saved_objects/mappings.json b/x-pack/test/functional/es_archives/spaces/copy_saved_objects/mappings.json
index 0d54500e83eb7..d860c19ceb64c 100644
--- a/x-pack/test/functional/es_archives/spaces/copy_saved_objects/mappings.json
+++ b/x-pack/test/functional/es_archives/spaces/copy_saved_objects/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/functional/es_archives/spaces/disabled_features/mappings.json b/x-pack/test/functional/es_archives/spaces/disabled_features/mappings.json
index d0ad5570373c4..23a63e372a855 100644
--- a/x-pack/test/functional/es_archives/spaces/disabled_features/mappings.json
+++ b/x-pack/test/functional/es_archives/spaces/disabled_features/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/functional/es_archives/spaces/enter_space/mappings.json b/x-pack/test/functional/es_archives/spaces/enter_space/mappings.json
index f3793c7ca6780..9f3201d73abc1 100644
--- a/x-pack/test/functional/es_archives/spaces/enter_space/mappings.json
+++ b/x-pack/test/functional/es_archives/spaces/enter_space/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/spaces/multi_space/mappings.json b/x-pack/test/functional/es_archives/spaces/multi_space/mappings.json
index 77eac534850a5..499c994780285 100644
--- a/x-pack/test/functional/es_archives/spaces/multi_space/mappings.json
+++ b/x-pack/test/functional/es_archives/spaces/multi_space/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/spaces/selector/mappings.json b/x-pack/test/functional/es_archives/spaces/selector/mappings.json
index 77eac534850a5..499c994780285 100644
--- a/x-pack/test/functional/es_archives/spaces/selector/mappings.json
+++ b/x-pack/test/functional/es_archives/spaces/selector/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/functional/es_archives/timelion/feature_controls/mappings.json b/x-pack/test/functional/es_archives/timelion/feature_controls/mappings.json
index d0ad5570373c4..23a63e372a855 100644
--- a/x-pack/test/functional/es_archives/timelion/feature_controls/mappings.json
+++ b/x-pack/test/functional/es_archives/timelion/feature_controls/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/functional/page_objects/account_settings_page.ts b/x-pack/test/functional/page_objects/account_settings_page.ts
index 2aeb255ad7eb7..5bf5be9030b75 100644
--- a/x-pack/test/functional/page_objects/account_settings_page.ts
+++ b/x-pack/test/functional/page_objects/account_settings_page.ts
@@ -6,33 +6,30 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function AccountSettingProvider({ getService }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const userMenu = getService('userMenu');
+export class AccountSettingsPageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly userMenu = this.ctx.getService('userMenu');
 
-  class AccountSettingsPage {
-    async verifyAccountSettings(expectedEmail: string, expectedUserName: string) {
-      await userMenu.clickProvileLink();
+  async verifyAccountSettings(expectedEmail: string, expectedUserName: string) {
+    await this.userMenu.clickProvileLink();
 
-      const usernameField = await testSubjects.find('username');
-      const userName = await usernameField.getVisibleText();
-      expect(userName).to.be(expectedUserName);
+    const usernameField = await this.testSubjects.find('username');
+    const userName = await usernameField.getVisibleText();
+    expect(userName).to.be(expectedUserName);
 
-      const emailIdField = await testSubjects.find('email');
-      const emailField = await emailIdField.getVisibleText();
-      expect(emailField).to.be(expectedEmail);
-      await userMenu.closeMenu();
-    }
+    const emailIdField = await this.testSubjects.find('email');
+    const emailField = await emailIdField.getVisibleText();
+    expect(emailField).to.be(expectedEmail);
+    await this.userMenu.closeMenu();
+  }
 
-    async changePassword(currentPassword: string, newPassword: string) {
-      await testSubjects.setValue('currentPassword', currentPassword);
-      await testSubjects.setValue('newPassword', newPassword);
-      await testSubjects.setValue('confirmNewPassword', newPassword);
-      await testSubjects.click('changePasswordButton');
-      await testSubjects.existOrFail('passwordUpdateSuccess');
-    }
+  async changePassword(currentPassword: string, newPassword: string) {
+    await this.testSubjects.setValue('currentPassword', currentPassword);
+    await this.testSubjects.setValue('newPassword', newPassword);
+    await this.testSubjects.setValue('confirmNewPassword', newPassword);
+    await this.testSubjects.click('changePasswordButton');
+    await this.testSubjects.existOrFail('passwordUpdateSuccess');
   }
-  return new AccountSettingsPage();
 }
diff --git a/x-pack/test/functional/page_objects/banners_page.ts b/x-pack/test/functional/page_objects/banners_page.ts
index d2e4e43cec117..b9e9b29b4eeb2 100644
--- a/x-pack/test/functional/page_objects/banners_page.ts
+++ b/x-pack/test/functional/page_objects/banners_page.ts
@@ -5,26 +5,22 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function BannersPageProvider({ getService }: FtrProviderContext) {
-  const find = getService('find');
+export class BannersPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
 
-  class BannersPage {
-    isTopBannerVisible() {
-      return find.existsByCssSelector('.header__topBanner .kbnUserBanner__container');
-    }
+  isTopBannerVisible() {
+    return this.find.existsByCssSelector('.header__topBanner .kbnUserBanner__container');
+  }
 
-    async getTopBannerText() {
-      if (!(await this.isTopBannerVisible())) {
-        return '';
-      }
-      const bannerContainer = await find.byCssSelector(
-        '.header__topBanner .kbnUserBanner__container'
-      );
-      return bannerContainer.getVisibleText();
+  async getTopBannerText() {
+    if (!(await this.isTopBannerVisible())) {
+      return '';
     }
+    const bannerContainer = await this.find.byCssSelector(
+      '.header__topBanner .kbnUserBanner__container'
+    );
+    return bannerContainer.getVisibleText();
   }
-
-  return new BannersPage();
 }
diff --git a/x-pack/test/functional/page_objects/gis_page.ts b/x-pack/test/functional/page_objects/gis_page.ts
index 99d7172651a4d..c2c92b2370381 100644
--- a/x-pack/test/functional/page_objects/gis_page.ts
+++ b/x-pack/test/functional/page_objects/gis_page.ts
@@ -7,717 +7,718 @@
 
 import _ from 'lodash';
 import { APP_ID } from '../../../plugins/maps/common/constants';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function GisPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const PageObjects = getPageObjects(['common', 'header', 'timePicker', 'visualize']);
-
-  const log = getService('log');
-  const testSubjects = getService('testSubjects');
-  const retry = getService('retry');
-  const inspector = getService('inspector');
-  const find = getService('find');
-  const queryBar = getService('queryBar');
-  const comboBox = getService('comboBox');
-  const renderable = getService('renderable');
-  const browser = getService('browser');
-  const menuToggle = getService('menuToggle');
-  const listingTable = getService('listingTable');
-  const monacoEditor = getService('monacoEditor');
-  const dashboardPanelActions = getService('dashboardPanelActions');
-
-  const setViewPopoverToggle = menuToggle.create({
+import { FtrService } from '../ftr_provider_context';
+
+function escapeLayerName(layerName: string) {
+  return layerName.split(' ').join('_');
+}
+
+export class GisPageObject extends FtrService {
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly timePicker = this.ctx.getPageObject('timePicker');
+  private readonly visualize = this.ctx.getPageObject('visualize');
+
+  private readonly log = this.ctx.getService('log');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly inspector = this.ctx.getService('inspector');
+  private readonly find = this.ctx.getService('find');
+  private readonly queryBar = this.ctx.getService('queryBar');
+  private readonly comboBox = this.ctx.getService('comboBox');
+  private readonly renderable = this.ctx.getService('renderable');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly listingTable = this.ctx.getService('listingTable');
+  private readonly monacoEditor = this.ctx.getService('monacoEditor');
+  private readonly dashboardPanelActions = this.ctx.getService('dashboardPanelActions');
+
+  private readonly setViewPopoverToggle = this.ctx.getService('menuToggle').create({
     name: 'SetView Popover',
     menuTestSubject: 'mapSetViewForm',
     toggleButtonTestSubject: 'toggleSetViewVisibilityButton',
   });
 
-  function escapeLayerName(layerName: string) {
-    return layerName.split(' ').join('_');
-  }
+  basePath = '';
 
-  class GisPage {
-    basePath;
-
-    constructor() {
-      this.basePath = '';
-    }
+  setBasePath(basePath: string) {
+    this.basePath = basePath;
+  }
 
-    setBasePath(basePath: string) {
-      this.basePath = basePath;
-    }
+  async setAbsoluteRange(start: string, end: string) {
+    await this.timePicker.setAbsoluteRange(start, end);
+    await this.waitForLayersToLoad();
+  }
 
-    async setAbsoluteRange(start: string, end: string) {
-      await PageObjects.timePicker.setAbsoluteRange(start, end);
-      await this.waitForLayersToLoad();
-    }
+  async setAndSubmitQuery(query: string) {
+    await this.queryBar.setQuery(query);
+    await this.queryBar.submitQuery();
+    await this.waitForLayersToLoad();
+  }
 
-    async setAndSubmitQuery(query: string) {
-      await queryBar.setQuery(query);
-      await queryBar.submitQuery();
-      await this.waitForLayersToLoad();
-    }
+  async refreshQuery() {
+    await this.queryBar.submitQuery();
+    await this.waitForLayersToLoad();
+  }
 
-    async refreshQuery() {
-      await queryBar.submitQuery();
-      await this.waitForLayersToLoad();
-    }
+  async enterFullScreen() {
+    this.log.debug(`enterFullScreen`);
+    await this.testSubjects.click('mapsFullScreenMode');
+    await this.retry.try(async () => {
+      await this.testSubjects.exists('exitFullScreenModeLogo');
+    });
+    await this.waitForLayersToLoad();
+  }
 
-    async enterFullScreen() {
-      log.debug(`enterFullScreen`);
-      await testSubjects.click('mapsFullScreenMode');
-      await retry.try(async () => {
-        await testSubjects.exists('exitFullScreenModeLogo');
-      });
-      await this.waitForLayersToLoad();
+  // TODO combine with dashboard full screen into a service
+  async existFullScreen() {
+    this.log.debug(`existFullScreen`);
+    const isFullScreen = await this.testSubjects.exists('exitFullScreenModeLogo');
+    if (isFullScreen) {
+      await this.testSubjects.click('exitFullScreenModeLogo');
     }
+  }
 
-    // TODO combine with dashboard full screen into a service
-    async existFullScreen() {
-      log.debug(`existFullScreen`);
-      const isFullScreen = await testSubjects.exists('exitFullScreenModeLogo');
-      if (isFullScreen) {
-        await testSubjects.click('exitFullScreenModeLogo');
+  // Since there are no DOM indicators that signal when map pan and zoom actions are complete,
+  // this method waits until the map view has stabilized, signaling that the panning/zooming is complete.
+  // Pass origView parameter when the new map view determinition is async
+  // so method knows when panning/zooming has started.
+  async waitForMapPanAndZoom(origView?: { lon: number; lat: number; zoom: number }) {
+    await this.retry.try(async () => {
+      this.log.debug('Waiting for map pan and zoom to complete');
+      const prevView = await this.getView();
+      await this.common.sleep(1000);
+      const currentView = await this.getView();
+      if (origView && _.isEqual(origView, currentView)) {
+        throw new Error('Map pan and zoom has not started yet');
       }
-    }
+      if (!_.isEqual(prevView, currentView)) {
+        throw new Error('Map is still panning and zooming');
+      }
+    });
+    await this.waitForLayersToLoad();
+  }
 
-    // Since there are no DOM indicators that signal when map pan and zoom actions are complete,
-    // this method waits until the map view has stabilized, signaling that the panning/zooming is complete.
-    // Pass origView parameter when the new map view determinition is async
-    // so method knows when panning/zooming has started.
-    async waitForMapPanAndZoom(origView?: { lon: number; lat: number; zoom: number }) {
-      await retry.try(async () => {
-        log.debug('Waiting for map pan and zoom to complete');
-        const prevView = await this.getView();
-        await PageObjects.common.sleep(1000);
-        const currentView = await this.getView();
-        if (origView && _.isEqual(origView, currentView)) {
-          throw new Error('Map pan and zoom has not started yet');
-        }
-        if (!_.isEqual(prevView, currentView)) {
-          throw new Error('Map is still panning and zooming');
-        }
-      });
-      await this.waitForLayersToLoad();
-    }
+  async waitForLayersToLoad() {
+    this.log.debug('Wait for layers to load');
+    await this.retry.try(async () => {
+      const tableOfContents = await this.testSubjects.find('mapLayerTOC');
+      await tableOfContents.waitForDeletedByCssSelector('.euiLoadingSpinner');
+    });
+  }
 
-    async waitForLayersToLoad() {
-      log.debug('Wait for layers to load');
-      await retry.try(async () => {
-        const tableOfContents = await testSubjects.find('mapLayerTOC');
-        await tableOfContents.waitForDeletedByCssSelector('.euiLoadingSpinner');
-      });
-    }
+  async waitForLayerDeleted(layerName: string) {
+    this.log.debug('Wait for layer deleted');
+    await this.retry.waitFor('Layer to be deleted', async () => {
+      const doesLayerExist = await this.doesLayerExist(layerName);
+      return !doesLayerExist;
+    });
+  }
 
-    async waitForLayerDeleted(layerName: string) {
-      log.debug('Wait for layer deleted');
-      await retry.waitFor('Layer to be deleted', async () => {
-        const doesLayerExist = await this.doesLayerExist(layerName);
-        return !doesLayerExist;
-      });
-    }
+  // use the search filter box to narrow the results down to a single
+  // entry, or at least to a single page of results
+  async loadSavedMap(name: string) {
+    this.log.debug(`Load Saved Map ${name}`);
 
-    // use the search filter box to narrow the results down to a single
-    // entry, or at least to a single page of results
-    async loadSavedMap(name: string) {
-      log.debug(`Load Saved Map ${name}`);
-
-      await retry.try(async () => {
-        await this.searchForMapWithName(name);
-        await listingTable.clickItemLink('map', name);
-        await PageObjects.header.waitUntilLoadingHasFinished();
-        // check Map landing page is not present
-        await testSubjects.missingOrFail('mapLandingPage', { timeout: 10000 });
-      });
+    await this.retry.try(async () => {
+      await this.searchForMapWithName(name);
+      await this.listingTable.clickItemLink('map', name);
+      await this.header.waitUntilLoadingHasFinished();
+      // check Map landing page is not present
+      await this.testSubjects.missingOrFail('mapLandingPage', { timeout: 10000 });
+    });
 
-      await this.waitForLayersToLoad();
-    }
+    await this.waitForLayersToLoad();
+  }
 
-    async deleteSavedMaps(search: string) {
-      await this.searchForMapWithName(search);
-      await listingTable.checkListingSelectAllCheckbox();
-      await listingTable.clickDeleteSelected();
-      await PageObjects.common.clickConfirmOnModal();
+  async deleteSavedMaps(search: string) {
+    await this.searchForMapWithName(search);
+    await this.listingTable.checkListingSelectAllCheckbox();
+    await this.listingTable.clickDeleteSelected();
+    await this.common.clickConfirmOnModal();
 
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async openNewMap() {
-      log.debug(`Open new Map`);
+  async openNewMap() {
+    this.log.debug(`Open new Map`);
 
-      // Navigate directly because we don't need to go through the map listing
-      // page. The listing page is skipped if there are no saved objects
-      await PageObjects.common.navigateToUrlWithBrowserHistory(APP_ID, '/map');
-      await renderable.waitForRender();
-    }
+    // Navigate directly because we don't need to go through the map listing
+    // page. The listing page is skipped if there are no saved objects
+    await this.common.navigateToUrlWithBrowserHistory(APP_ID, '/map');
+    await this.renderable.waitForRender();
+  }
 
-    async saveMap(name: string, redirectToOrigin = true, tags?: string[]) {
-      await testSubjects.click('mapSaveButton');
-      await testSubjects.setValue('savedObjectTitle', name);
-      await PageObjects.visualize.setSaveModalValues(name, {
-        addToDashboard: false,
-        redirectToOrigin,
-        saveAsNew: true,
-      });
-      if (tags) {
-        await testSubjects.click('savedObjectTagSelector');
-        for (const tagName of tags) {
-          await testSubjects.click(`tagSelectorOption-${tagName.replace(' ', '_')}`);
-        }
-        await testSubjects.click('savedObjectTitle');
+  async saveMap(name: string, redirectToOrigin = true, tags?: string[]) {
+    await this.testSubjects.click('mapSaveButton');
+    await this.testSubjects.setValue('savedObjectTitle', name);
+    await this.visualize.setSaveModalValues(name, {
+      addToDashboard: false,
+      redirectToOrigin,
+      saveAsNew: true,
+    });
+    if (tags) {
+      await this.testSubjects.click('savedObjectTagSelector');
+      for (const tagName of tags) {
+        await this.testSubjects.click(`tagSelectorOption-${tagName.replace(' ', '_')}`);
       }
-      await testSubjects.clickWhenNotDisabled('confirmSaveSavedObjectButton');
-    }
-
-    async clickSaveAndReturnButton() {
-      await testSubjects.click('mapSaveAndReturnButton');
-    }
-
-    async expectMissingSaveAndReturnButton() {
-      await testSubjects.missingOrFail('mapSaveAndReturnButton');
+      await this.testSubjects.click('savedObjectTitle');
     }
+    await this.testSubjects.clickWhenNotDisabled('confirmSaveSavedObjectButton');
+  }
 
-    async expectMissingSaveButton() {
-      await testSubjects.missingOrFail('mapSaveButton');
-    }
+  async clickSaveAndReturnButton() {
+    await this.testSubjects.click('mapSaveAndReturnButton');
+  }
 
-    async expectMissingCreateNewButton() {
-      await testSubjects.missingOrFail('newItemButton');
-    }
+  async expectMissingSaveAndReturnButton() {
+    await this.testSubjects.missingOrFail('mapSaveAndReturnButton');
+  }
 
-    async expectMissingAddLayerButton() {
-      await testSubjects.missingOrFail('addLayerButton');
-    }
+  async expectMissingSaveButton() {
+    await this.testSubjects.missingOrFail('mapSaveButton');
+  }
 
-    async expectExistAddLayerButton() {
-      await testSubjects.existOrFail('addLayerButton');
-    }
+  async expectMissingCreateNewButton() {
+    await this.testSubjects.missingOrFail('newItemButton');
+  }
 
-    async onMapListingPage() {
-      log.debug(`onMapListingPage`);
-      return await listingTable.onListingPage('map');
-    }
+  async expectMissingAddLayerButton() {
+    await this.testSubjects.missingOrFail('addLayerButton');
+  }
 
-    async onMapPage() {
-      log.debug(`onMapPage`);
-      return await testSubjects.exists('mapLayerTOC', {
-        timeout: 5000,
-      });
-    }
+  async expectExistAddLayerButton() {
+    await this.testSubjects.existOrFail('addLayerButton');
+  }
 
-    async searchForMapWithName(name: string) {
-      log.debug(`searchForMapWithName: ${name}`);
+  async onMapListingPage() {
+    this.log.debug(`onMapListingPage`);
+    return await this.listingTable.onListingPage('map');
+  }
 
-      await this.gotoMapListingPage();
+  async onMapPage() {
+    this.log.debug(`onMapPage`);
+    return await this.testSubjects.exists('mapLayerTOC', {
+      timeout: 5000,
+    });
+  }
 
-      await listingTable.searchForItemWithName(name);
+  async searchForMapWithName(name: string) {
+    this.log.debug(`searchForMapWithName: ${name}`);
 
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+    await this.gotoMapListingPage();
 
-    async getHits() {
-      await inspector.open();
-      await inspector.openInspectorRequestsView();
-      const requestStats = await inspector.getTableData();
-      const hits = this.getInspectorStatRowHit(requestStats, 'Hits');
-      await inspector.close();
-      return hits;
-    }
+    await this.listingTable.searchForItemWithName(name);
 
-    async gotoMapListingPage() {
-      log.debug('gotoMapListingPage');
-      const onPage = await this.onMapListingPage();
-      if (!onPage) {
-        await retry.try(async () => {
-          await PageObjects.common.navigateToUrlWithBrowserHistory(APP_ID, '/');
-          const onMapListingPage = await this.onMapListingPage();
-          if (!onMapListingPage) throw new Error('Not on map listing page.');
-        });
-      }
-    }
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async searchAndExpectItemsCount(name: string, count: number) {
-      await this.gotoMapListingPage();
+  async getHits() {
+    await this.inspector.open();
+    await this.inspector.openInspectorRequestsView();
+    const requestStats = await this.inspector.getTableData();
+    const hits = this.getInspectorStatRowHit(requestStats, 'Hits');
+    await this.inspector.close();
+    return hits;
+  }
 
-      log.debug(`searchAndExpectItemsCount: ${name}`);
-      await listingTable.searchAndExpectItemsCount('map', name, count);
+  async gotoMapListingPage() {
+    this.log.debug('gotoMapListingPage');
+    const onPage = await this.onMapListingPage();
+    if (!onPage) {
+      await this.retry.try(async () => {
+        await this.common.navigateToUrlWithBrowserHistory(APP_ID, '/');
+        const onMapListingPage = await this.onMapListingPage();
+        if (!onMapListingPage) throw new Error('Not on map listing page.');
+      });
     }
+  }
 
-    async setView(lat: number, lon: number, zoom: number) {
-      log.debug(
-        `Set view lat: ${lat.toString()}, lon: ${lon.toString()}, zoom: ${zoom.toString()}`
-      );
-      await setViewPopoverToggle.open();
-      await testSubjects.setValue('latitudeInput', lat.toString());
-      await testSubjects.setValue('longitudeInput', lon.toString());
-      await testSubjects.setValue('zoomInput', zoom.toString());
-      await testSubjects.click('submitViewButton');
-      await this.waitForMapPanAndZoom();
-    }
+  async searchAndExpectItemsCount(name: string, count: number) {
+    await this.gotoMapListingPage();
 
-    async getView() {
-      log.debug('Get view');
-      await setViewPopoverToggle.open();
-      // this method is regularly called within a retry, so we need to reduce the timeouts
-      // of the retries done within the getAttribute method in order to ensure that they fail
-      // early enough to retry getView()
-      const getAttributeOptions = {
-        tryTimeout: 5000,
-        findTimeout: 1000,
-      };
-
-      const lat = await testSubjects.getAttribute('latitudeInput', 'value', getAttributeOptions);
-      const lon = await testSubjects.getAttribute('longitudeInput', 'value', getAttributeOptions);
-      const zoom = await testSubjects.getAttribute('zoomInput', 'value', getAttributeOptions);
-
-      await setViewPopoverToggle.close();
-      return {
-        lat: parseFloat(lat),
-        lon: parseFloat(lon),
-        zoom: parseFloat(zoom),
-      };
-    }
+    this.log.debug(`searchAndExpectItemsCount: ${name}`);
+    await this.listingTable.searchAndExpectItemsCount('map', name, count);
+  }
 
-    async toggleLayerVisibility(layerName: string) {
-      log.debug(`Toggle layer visibility, layer: ${layerName}`);
-      await this.openLayerTocActionsPanel(layerName);
-      await testSubjects.click('layerVisibilityToggleButton');
-    }
+  async setView(lat: number, lon: number, zoom: number) {
+    this.log.debug(
+      `Set view lat: ${lat.toString()}, lon: ${lon.toString()}, zoom: ${zoom.toString()}`
+    );
+    await this.setViewPopoverToggle.open();
+    await this.testSubjects.setValue('latitudeInput', lat.toString());
+    await this.testSubjects.setValue('longitudeInput', lon.toString());
+    await this.testSubjects.setValue('zoomInput', zoom.toString());
+    await this.testSubjects.click('submitViewButton');
+    await this.waitForMapPanAndZoom();
+  }
 
-    async closeLegend() {
-      const isOpen = await testSubjects.exists('mapLayerTOC');
-      if (isOpen) {
-        await testSubjects.click('mapToggleLegendButton');
-        await testSubjects.waitForDeleted('mapLayerTOC');
-      }
-    }
+  async getView() {
+    this.log.debug('Get view');
+    await this.setViewPopoverToggle.open();
+    // this method is regularly called within a retry, so we need to reduce the timeouts
+    // of the retries done within the getAttribute method in order to ensure that they fail
+    // early enough to retry getView()
+    const getAttributeOptions = {
+      tryTimeout: 5000,
+      findTimeout: 1000,
+    };
+
+    const lat = await this.testSubjects.getAttribute('latitudeInput', 'value', getAttributeOptions);
+    const lon = await this.testSubjects.getAttribute(
+      'longitudeInput',
+      'value',
+      getAttributeOptions
+    );
+    const zoom = await this.testSubjects.getAttribute('zoomInput', 'value', getAttributeOptions);
+
+    await this.setViewPopoverToggle.close();
+    return {
+      lat: parseFloat(lat),
+      lon: parseFloat(lon),
+      zoom: parseFloat(zoom),
+    };
+  }
 
-    async clickFitToBounds(layerName: string) {
-      log.debug(`Fit to bounds, layer: ${layerName}`);
-      const origView = await this.getView();
-      await this.openLayerTocActionsPanel(layerName);
-      await testSubjects.click('fitToBoundsButton');
-      await this.waitForMapPanAndZoom(origView);
-    }
+  async toggleLayerVisibility(layerName: string) {
+    this.log.debug(`Toggle layer visibility, layer: ${layerName}`);
+    await this.openLayerTocActionsPanel(layerName);
+    await this.testSubjects.click('layerVisibilityToggleButton');
+  }
 
-    async openLayerTocActionsPanel(layerName: string) {
-      const escapedDisplayName = escapeLayerName(layerName);
-      const isOpen = await testSubjects.exists(`layerTocActionsPanel${escapedDisplayName}`);
-      if (!isOpen) {
-        await testSubjects.click(`layerTocActionsPanelToggleButton${escapedDisplayName}`);
-      }
+  async closeLegend() {
+    const isOpen = await this.testSubjects.exists('mapLayerTOC');
+    if (isOpen) {
+      await this.testSubjects.click('mapToggleLegendButton');
+      await this.testSubjects.waitForDeleted('mapLayerTOC');
     }
+  }
 
-    async openLayerPanel(layerName: string) {
-      log.debug(`Open layer panel, layer: ${layerName}`);
-      await this.openLayerTocActionsPanel(layerName);
-      await testSubjects.click('editLayerButton');
-    }
+  async clickFitToBounds(layerName: string) {
+    this.log.debug(`Fit to bounds, layer: ${layerName}`);
+    const origView = await this.getView();
+    await this.openLayerTocActionsPanel(layerName);
+    await this.testSubjects.click('fitToBoundsButton');
+    await this.waitForMapPanAndZoom(origView);
+  }
 
-    async closeLayerPanel() {
-      await testSubjects.click('layerPanelCancelButton');
-      await this.waitForLayersToLoad();
+  async openLayerTocActionsPanel(layerName: string) {
+    const escapedDisplayName = escapeLayerName(layerName);
+    const isOpen = await this.testSubjects.exists(`layerTocActionsPanel${escapedDisplayName}`);
+    if (!isOpen) {
+      await this.testSubjects.click(`layerTocActionsPanelToggleButton${escapedDisplayName}`);
     }
+  }
 
-    async getLayerTOCDetails(layerName: string) {
-      return await testSubjects.getVisibleText(`mapLayerTOCDetails${escapeLayerName(layerName)}`);
-    }
+  async openLayerPanel(layerName: string) {
+    this.log.debug(`Open layer panel, layer: ${layerName}`);
+    await this.openLayerTocActionsPanel(layerName);
+    await this.testSubjects.click('editLayerButton');
+  }
 
-    async disableApplyGlobalQuery() {
-      const isSelected = await testSubjects.getAttribute(
-        'mapLayerPanelApplyGlobalQueryCheckbox',
-        'aria-checked'
-      );
-      if (isSelected === 'true') {
-        await retry.try(async () => {
-          log.debug(`disabling applyGlobalQuery`);
-          await testSubjects.click('mapLayerPanelApplyGlobalQueryCheckbox');
-          const isStillSelected = await testSubjects.getAttribute(
-            'mapLayerPanelApplyGlobalQueryCheckbox',
-            'aria-checked'
-          );
-          if (isStillSelected === 'true') {
-            throw new Error('applyGlobalQuery not disabled');
-          }
-        });
-        await this.waitForLayersToLoad();
-      }
-    }
+  async closeLayerPanel() {
+    await this.testSubjects.click('layerPanelCancelButton');
+    await this.waitForLayersToLoad();
+  }
 
-    async getNumberOfLayers() {
-      const tocEntries = await find.allByCssSelector('.mapTocEntry');
-      return tocEntries.length;
-    }
+  async getLayerTOCDetails(layerName: string) {
+    return await this.testSubjects.getVisibleText(
+      `mapLayerTOCDetails${escapeLayerName(layerName)}`
+    );
+  }
 
-    async doesLayerExist(layerName: string) {
-      return await testSubjects.exists(
-        `layerTocActionsPanelToggleButton${escapeLayerName(layerName)}`
-      );
+  async disableApplyGlobalQuery() {
+    const isSelected = await this.testSubjects.getAttribute(
+      'mapLayerPanelApplyGlobalQueryCheckbox',
+      'aria-checked'
+    );
+    if (isSelected === 'true') {
+      await this.retry.try(async () => {
+        this.log.debug(`disabling applyGlobalQuery`);
+        await this.testSubjects.click('mapLayerPanelApplyGlobalQueryCheckbox');
+        const isStillSelected = await this.testSubjects.getAttribute(
+          'mapLayerPanelApplyGlobalQueryCheckbox',
+          'aria-checked'
+        );
+        if (isStillSelected === 'true') {
+          throw new Error('applyGlobalQuery not disabled');
+        }
+      });
+      await this.waitForLayersToLoad();
     }
+  }
 
-    async hasFilePickerLoadedFile(fileName: string) {
-      log.debug(`Has file picker loaded file ${fileName}`);
-      const filePickerText = await find.byCssSelector('.euiFilePicker__promptText');
-      const filePickerTextContent = await filePickerText.getVisibleText();
+  async getNumberOfLayers() {
+    const tocEntries = await this.find.allByCssSelector('.mapTocEntry');
+    return tocEntries.length;
+  }
 
-      return fileName === filePickerTextContent;
-    }
+  async doesLayerExist(layerName: string) {
+    return await this.testSubjects.exists(
+      `layerTocActionsPanelToggleButton${escapeLayerName(layerName)}`
+    );
+  }
 
-    /*
-     * Layer panel utility functions
-     */
-    async isLayerAddPanelOpen() {
-      log.debug(`Is layer add panel open`);
-      return await testSubjects.exists('layerAddForm');
-    }
+  async hasFilePickerLoadedFile(fileName: string) {
+    this.log.debug(`Has file picker loaded file ${fileName}`);
+    const filePickerText = await this.find.byCssSelector('.euiFilePicker__promptText');
+    const filePickerTextContent = await filePickerText.getVisibleText();
 
-    async waitForLayerAddPanelClosed() {
-      let layerAddPanelOpen = false;
-      await retry.waitForWithTimeout('Layer add panel closed', 1000, async () => {
-        layerAddPanelOpen = await this.isLayerAddPanelOpen();
-        return !layerAddPanelOpen;
-      });
-    }
+    return fileName === filePickerTextContent;
+  }
 
-    async clickAddLayer() {
-      log.debug('Click add layer');
-      await retry.try(async () => {
-        await testSubjects.click('addLayerButton');
-        const isOpen = await this.isLayerAddPanelOpen();
-        if (!isOpen) {
-          throw new Error('Add layer panel still not open, trying again.');
-        }
-      });
-    }
+  /*
+   * Layer panel utility functions
+   */
+  async isLayerAddPanelOpen() {
+    this.log.debug(`Is layer add panel open`);
+    return await this.testSubjects.exists('layerAddForm');
+  }
 
-    async cancelLayerAdd(layerName: string) {
-      log.debug(`Cancel layer add`);
-      const cancelExists = await testSubjects.exists('layerAddCancelButton');
-      if (cancelExists) {
-        await testSubjects.click('layerAddCancelButton');
-        await this.waitForLayerAddPanelClosed();
-        if (layerName) {
-          await this.waitForLayerDeleted(layerName);
-        }
-      }
-    }
+  async waitForLayerAddPanelClosed() {
+    let layerAddPanelOpen = false;
+    await this.retry.waitForWithTimeout('Layer add panel closed', 1000, async () => {
+      layerAddPanelOpen = await this.isLayerAddPanelOpen();
+      return !layerAddPanelOpen;
+    });
+  }
 
-    async closeOrCancelLayer(layerName: string) {
-      log.debug(`Close or cancel layer add`);
-      const cancelExists = await testSubjects.exists('layerAddCancelButton');
-      const closeExists = await testSubjects.exists('layerPanelCancelButton');
-      if (cancelExists) {
-        log.debug(`Cancel layer add.`);
-        await testSubjects.click('layerAddCancelButton');
-      } else if (closeExists) {
-        log.debug(`Close layer add.`);
-        await testSubjects.click('layerPanelCancelButton');
-      } else {
-        log.debug(`No need to close or cancel.`);
-        return;
+  async clickAddLayer() {
+    this.log.debug('Click add layer');
+    await this.retry.try(async () => {
+      await this.testSubjects.click('addLayerButton');
+      const isOpen = await this.isLayerAddPanelOpen();
+      if (!isOpen) {
+        throw new Error('Add layer panel still not open, trying again.');
       }
+    });
+  }
 
+  async cancelLayerAdd(layerName: string) {
+    this.log.debug(`Cancel layer add`);
+    const cancelExists = await this.testSubjects.exists('layerAddCancelButton');
+    if (cancelExists) {
+      await this.testSubjects.click('layerAddCancelButton');
       await this.waitForLayerAddPanelClosed();
       if (layerName) {
         await this.waitForLayerDeleted(layerName);
       }
     }
+  }
 
-    async importFileButtonEnabled() {
-      log.debug(`Check "Import file" button enabled`);
-      const importFileButton = await testSubjects.find('importFileButton');
-      const isDisabled = await importFileButton.getAttribute('disabled');
-      return !isDisabled;
+  async closeOrCancelLayer(layerName: string) {
+    this.log.debug(`Close or cancel layer add`);
+    const cancelExists = await this.testSubjects.exists('layerAddCancelButton');
+    const closeExists = await this.testSubjects.exists('layerPanelCancelButton');
+    if (cancelExists) {
+      this.log.debug(`Cancel layer add.`);
+      await this.testSubjects.click('layerAddCancelButton');
+    } else if (closeExists) {
+      this.log.debug(`Close layer add.`);
+      await this.testSubjects.click('layerPanelCancelButton');
+    } else {
+      this.log.debug(`No need to close or cancel.`);
+      return;
+    }
+
+    await this.waitForLayerAddPanelClosed();
+    if (layerName) {
+      await this.waitForLayerDeleted(layerName);
     }
+  }
 
-    async importLayerReadyForAdd() {
-      log.debug(`Wait until import complete`);
-      await testSubjects.find('indexRespCopyButton', 5000);
-      let layerAddReady = false;
-      await retry.waitForWithTimeout('Add layer button ready', 2000, async () => {
-        layerAddReady = await this.importFileButtonEnabled();
-        return layerAddReady;
-      });
-      return layerAddReady;
-    }
+  async importFileButtonEnabled() {
+    this.log.debug(`Check "Import file" button enabled`);
+    const importFileButton = await this.testSubjects.find('importFileButton');
+    const isDisabled = await importFileButton.getAttribute('disabled');
+    return !isDisabled;
+  }
 
-    async clickImportFileButton() {
-      log.debug(`Click "Import file" button`);
-      await testSubjects.click('importFileButton');
-    }
+  async importLayerReadyForAdd() {
+    this.log.debug(`Wait until import complete`);
+    await this.testSubjects.find('indexRespCopyButton', 5000);
+    let layerAddReady = false;
+    await this.retry.waitForWithTimeout('Add layer button ready', 2000, async () => {
+      layerAddReady = await this.importFileButtonEnabled();
+      return layerAddReady;
+    });
+    return layerAddReady;
+  }
 
-    async setIndexName(indexName: string) {
-      log.debug(`Set index name to: ${indexName}`);
-      await testSubjects.setValue('fileUploadIndexNameInput', indexName);
-    }
+  async clickImportFileButton() {
+    this.log.debug(`Click "Import file" button`);
+    await this.testSubjects.click('importFileButton');
+  }
 
-    async setIndexType(indexType: string) {
-      log.debug(`Set index type to: ${indexType}`);
-      await testSubjects.selectValue('fileImportIndexSelect', indexType);
-    }
+  async setIndexName(indexName: string) {
+    this.log.debug(`Set index name to: ${indexName}`);
+    await this.testSubjects.setValue('fileUploadIndexNameInput', indexName);
+  }
 
-    async indexTypeOptionExists(indexType: string) {
-      log.debug(`Check index type "${indexType}" available`);
-      return await find.existsByCssSelector(
-        `select[data-test-subj="fileImportIndexSelect"] > option[value="${indexType}"]`
-      );
-    }
+  async setIndexType(indexType: string) {
+    this.log.debug(`Set index type to: ${indexType}`);
+    await this.testSubjects.selectValue('fileImportIndexSelect', indexType);
+  }
 
-    async clickCopyButton(dataTestSubj: string): Promise<string> {
-      log.debug(`Click ${dataTestSubj} copy button`);
+  async indexTypeOptionExists(indexType: string) {
+    this.log.debug(`Check index type "${indexType}" available`);
+    return await this.find.existsByCssSelector(
+      `select[data-test-subj="fileImportIndexSelect"] > option[value="${indexType}"]`
+    );
+  }
 
-      await testSubjects.click(dataTestSubj);
+  async clickCopyButton(dataTestSubj: string): Promise<string> {
+    this.log.debug(`Click ${dataTestSubj} copy button`);
 
-      return await browser.getClipboardValue();
-    }
+    await this.testSubjects.click(dataTestSubj);
 
-    async getIndexResults() {
-      return JSON.parse(await this.clickCopyButton('indexRespCopyButton'));
-    }
+    return await this.browser.getClipboardValue();
+  }
 
-    async getIndexPatternResults() {
-      return JSON.parse(await this.clickCopyButton('indexPatternRespCopyButton'));
-    }
+  async getIndexResults() {
+    return JSON.parse(await this.clickCopyButton('indexRespCopyButton'));
+  }
 
-    async setLayerQuery(layerName: string, query: string) {
-      await this.openLayerPanel(layerName);
-      await testSubjects.click('mapLayerPanelOpenFilterEditorButton');
-      const filterEditorContainer = await testSubjects.find('mapFilterEditor');
-      const queryBarInFilterEditor = await testSubjects.findDescendant(
-        'queryInput',
-        filterEditorContainer
-      );
-      await queryBarInFilterEditor.click();
-      const input = await find.activeElement();
-      await retry.try(async () => {
-        await input.clearValue();
-        await input.type(query);
-        const value = await input.getAttribute('value');
-        if (value !== query) {
-          throw new Error(`Layer query set to ${value} instead of ${query}`);
-        }
-      });
-      await testSubjects.click('mapFilterEditorSubmitButton');
-      await this.waitForLayersToLoad();
-    }
+  async getIndexPatternResults() {
+    return JSON.parse(await this.clickCopyButton('indexPatternRespCopyButton'));
+  }
 
-    async setJoinWhereQuery(layerName: string, query: string) {
-      await this.openLayerPanel(layerName);
-      await testSubjects.click('mapJoinWhereExpressionButton');
-      const filterEditorContainer = await testSubjects.find('mapJoinWhereFilterEditor');
-      const queryBarInFilterEditor = await testSubjects.findDescendant(
-        'queryInput',
-        filterEditorContainer
-      );
-      await queryBarInFilterEditor.click();
-      const input = await find.activeElement();
+  async setLayerQuery(layerName: string, query: string) {
+    await this.openLayerPanel(layerName);
+    await this.testSubjects.click('mapLayerPanelOpenFilterEditorButton');
+    const filterEditorContainer = await this.testSubjects.find('mapFilterEditor');
+    const queryBarInFilterEditor = await this.testSubjects.findDescendant(
+      'queryInput',
+      filterEditorContainer
+    );
+    await queryBarInFilterEditor.click();
+    const input = await this.find.activeElement();
+    await this.retry.try(async () => {
       await input.clearValue();
       await input.type(query);
-      await testSubjects.click('mapWhereFilterEditorSubmitButton');
-      await this.waitForLayersToLoad();
-    }
+      const value = await input.getAttribute('value');
+      if (value !== query) {
+        throw new Error(`Layer query set to ${value} instead of ${query}`);
+      }
+    });
+    await this.testSubjects.click('mapFilterEditorSubmitButton');
+    await this.waitForLayersToLoad();
+  }
 
-    async selectEMSBoundariesSource() {
-      log.debug(`Select EMS boundaries source`);
-      await testSubjects.click('emsBoundaries');
-    }
+  async setJoinWhereQuery(layerName: string, query: string) {
+    await this.openLayerPanel(layerName);
+    await this.testSubjects.click('mapJoinWhereExpressionButton');
+    const filterEditorContainer = await this.testSubjects.find('mapJoinWhereFilterEditor');
+    const queryBarInFilterEditor = await this.testSubjects.findDescendant(
+      'queryInput',
+      filterEditorContainer
+    );
+    await queryBarInFilterEditor.click();
+    const input = await this.find.activeElement();
+    await input.clearValue();
+    await input.type(query);
+    await this.testSubjects.click('mapWhereFilterEditorSubmitButton');
+    await this.waitForLayersToLoad();
+  }
 
-    async selectGeoJsonUploadSource() {
-      log.debug(`Select upload geojson source`);
-      await testSubjects.click('uploadGeoJson');
-    }
+  async selectEMSBoundariesSource() {
+    this.log.debug(`Select EMS boundaries source`);
+    await this.testSubjects.click('emsBoundaries');
+  }
 
-    async uploadJsonFileForIndexing(path: string) {
-      await PageObjects.common.setFileInputPath(path);
-      log.debug(`File selected`);
+  async selectGeoJsonUploadSource() {
+    this.log.debug(`Select upload geojson source`);
+    await this.testSubjects.click('uploadGeoJson');
+  }
 
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await this.waitForLayersToLoad();
-    }
+  async uploadJsonFileForIndexing(path: string) {
+    await this.common.setFileInputPath(path);
+    this.log.debug(`File selected`);
 
-    // Returns first layer by default
-    async selectVectorLayer(vectorLayerName: string) {
-      log.debug(`Select EMS vector layer ${vectorLayerName}`);
-      if (!vectorLayerName) {
-        throw new Error(`You did not provide the EMS layer to select`);
-      }
-      await comboBox.set('emsVectorComboBox', vectorLayerName);
-      await this.waitForLayersToLoad();
-    }
+    await this.header.waitUntilLoadingHasFinished();
+    await this.waitForLayersToLoad();
+  }
 
-    async removeLayer(layerName: string) {
-      log.debug(`Remove layer ${layerName}`);
-      await this.openLayerPanel(layerName);
-      await testSubjects.click(`mapRemoveLayerButton`);
-      await this.waitForLayerDeleted(layerName);
+  // Returns first layer by default
+  async selectVectorLayer(vectorLayerName: string) {
+    this.log.debug(`Select EMS vector layer ${vectorLayerName}`);
+    if (!vectorLayerName) {
+      throw new Error(`You did not provide the EMS layer to select`);
     }
+    await this.comboBox.set('emsVectorComboBox', vectorLayerName);
+    await this.waitForLayersToLoad();
+  }
 
-    async getLayerErrorText(layerName: string) {
-      log.debug(`Remove layer ${layerName}`);
-      await this.openLayerPanel(layerName);
-      return await testSubjects.getVisibleText(`layerErrorMessage`);
-    }
+  async removeLayer(layerName: string) {
+    this.log.debug(`Remove layer ${layerName}`);
+    await this.openLayerPanel(layerName);
+    await this.testSubjects.click(`mapRemoveLayerButton`);
+    await this.waitForLayerDeleted(layerName);
+  }
 
-    async fullScreenModeMenuItemExists() {
-      return await testSubjects.exists('mapsFullScreenMode');
-    }
+  async getLayerErrorText(layerName: string) {
+    this.log.debug(`Remove layer ${layerName}`);
+    await this.openLayerPanel(layerName);
+    return await this.testSubjects.getVisibleText(`layerErrorMessage`);
+  }
 
-    async clickFullScreenMode() {
-      log.debug(`clickFullScreenMode`);
-      await testSubjects.click('mapsFullScreenMode');
-    }
+  async fullScreenModeMenuItemExists() {
+    return await this.testSubjects.exists('mapsFullScreenMode');
+  }
 
-    async exitFullScreenLogoButtonExists() {
-      return await testSubjects.exists('exitFullScreenModeLogo');
-    }
+  async clickFullScreenMode() {
+    this.log.debug(`clickFullScreenMode`);
+    await this.testSubjects.click('mapsFullScreenMode');
+  }
 
-    async getExitFullScreenLogoButton() {
-      return await testSubjects.find('exitFullScreenModeLogo');
-    }
+  async exitFullScreenLogoButtonExists() {
+    return await this.testSubjects.exists('exitFullScreenModeLogo');
+  }
 
-    async clickExitFullScreenTextButton() {
-      await testSubjects.click('exitFullScreenModeText');
-    }
+  async getExitFullScreenLogoButton() {
+    return await this.testSubjects.find('exitFullScreenModeLogo');
+  }
 
-    async openInspectorMapView() {
-      await inspector.openInspectorView('~inspectorViewChooserMap');
-    }
+  async clickExitFullScreenTextButton() {
+    await this.testSubjects.click('exitFullScreenModeText');
+  }
 
-    // Method should only be used when multiple requests are expected
-    // RequestSelector will only display inspectorRequestChooser when there is more than one request
-    async openInspectorRequest(requestName: string) {
-      await inspector.open();
-      await inspector.openInspectorRequestsView();
-      log.debug(`Open Inspector request ${requestName}`);
-      await testSubjects.click('inspectorRequestChooser');
-      await testSubjects.click(`inspectorRequestChooser${requestName}`);
-    }
+  async openInspectorMapView() {
+    await this.inspector.openInspectorView('~inspectorViewChooserMap');
+  }
 
-    async doesInspectorHaveRequests() {
-      await inspector.open();
-      await inspector.openInspectorRequestsView();
-      return await testSubjects.exists('inspectorNoRequestsMessage');
-    }
+  // Method should only be used when multiple requests are expected
+  // RequestSelector will only display inspectorRequestChooser when there is more than one request
+  async openInspectorRequest(requestName: string) {
+    await this.inspector.open();
+    await this.inspector.openInspectorRequestsView();
+    this.log.debug(`Open Inspector request ${requestName}`);
+    await this.testSubjects.click('inspectorRequestChooser');
+    await this.testSubjects.click(`inspectorRequestChooser${requestName}`);
+  }
 
-    async getMapboxStyle() {
-      log.debug('getMapboxStyle');
-      await inspector.open();
-      await this.openInspectorMapView();
-      await testSubjects.click('mapboxStyleTab');
-      const mapboxStyleContainer = await testSubjects.find('mapboxStyleContainer');
-      const mapboxStyleJson = await mapboxStyleContainer.getVisibleText();
-      await inspector.close();
-      let mapboxStyle;
-      try {
-        mapboxStyle = JSON.parse(mapboxStyleJson);
-      } catch (err) {
-        throw new Error(`Unable to parse mapbox style, error: ${err.message}`);
-      }
-      return mapboxStyle;
-    }
+  async doesInspectorHaveRequests() {
+    await this.inspector.open();
+    await this.inspector.openInspectorRequestsView();
+    return await this.testSubjects.exists('inspectorNoRequestsMessage');
+  }
 
-    async getResponse(requestName: string) {
-      await inspector.open();
-      const response = await this._getResponse(requestName);
-      await inspector.close();
-      return response;
-    }
+  async getMapboxStyle() {
+    this.log.debug('getMapboxStyle');
+    await this.inspector.open();
+    await this.openInspectorMapView();
+    await this.testSubjects.click('mapboxStyleTab');
+    const mapboxStyleContainer = await this.testSubjects.find('mapboxStyleContainer');
+    const mapboxStyleJson = await mapboxStyleContainer.getVisibleText();
+    await this.inspector.close();
+    let mapboxStyle;
+    try {
+      mapboxStyle = JSON.parse(mapboxStyleJson);
+    } catch (err) {
+      throw new Error(`Unable to parse mapbox style, error: ${err.message}`);
+    }
+    return mapboxStyle;
+  }
 
-    async _getResponse(requestName: string) {
-      if (requestName) {
-        await testSubjects.click('inspectorRequestChooser');
-        await testSubjects.click(`inspectorRequestChooser${requestName}`);
-      }
-      await inspector.openInspectorRequestsView();
-      await testSubjects.click('inspectorRequestDetailResponse');
-      await find.byCssSelector('.react-monaco-editor-container');
-      const responseBody = await monacoEditor.getCodeEditorValue();
-      return JSON.parse(responseBody);
-    }
+  async getResponse(requestName: string) {
+    await this.inspector.open();
+    const response = await this._getResponse(requestName);
+    await this.inspector.close();
+    return response;
+  }
 
-    async getResponseFromDashboardPanel(panelTitle: string, requestName: string) {
-      await dashboardPanelActions.openInspectorByTitle(panelTitle);
-      const response = await this._getResponse(requestName);
-      await inspector.close();
-      return response;
+  async _getResponse(requestName: string) {
+    if (requestName) {
+      await this.testSubjects.click('inspectorRequestChooser');
+      await this.testSubjects.click(`inspectorRequestChooser${requestName}`);
     }
+    await this.inspector.openInspectorRequestsView();
+    await this.testSubjects.click('inspectorRequestDetailResponse');
+    await this.find.byCssSelector('.react-monaco-editor-container');
+    const responseBody = await this.monacoEditor.getCodeEditorValue();
+    return JSON.parse(responseBody);
+  }
 
-    getInspectorStatRowHit(stats: string[][], rowName: string) {
-      const STATS_ROW_NAME_INDEX = 0;
-      const STATS_ROW_VALUE_INDEX = 1;
+  async getResponseFromDashboardPanel(panelTitle: string, requestName: string) {
+    await this.dashboardPanelActions.openInspectorByTitle(panelTitle);
+    const response = await this._getResponse(requestName);
+    await this.inspector.close();
+    return response;
+  }
 
-      const statsRow = stats.find((row) => {
-        return row[STATS_ROW_NAME_INDEX] === rowName;
-      });
-      if (!statsRow) {
-        throw new Error(`Unable to find value for row ${rowName} in ${stats}`);
-      }
+  getInspectorStatRowHit(stats: string[][], rowName: string) {
+    const STATS_ROW_NAME_INDEX = 0;
+    const STATS_ROW_VALUE_INDEX = 1;
 
-      return statsRow[STATS_ROW_VALUE_INDEX];
+    const statsRow = stats.find((row) => {
+      return row[STATS_ROW_NAME_INDEX] === rowName;
+    });
+    if (!statsRow) {
+      throw new Error(`Unable to find value for row ${rowName} in ${stats}`);
     }
 
-    async triggerSingleRefresh(refreshInterval: number) {
-      log.debug(`triggerSingleRefresh, refreshInterval: ${refreshInterval}`);
-      await PageObjects.timePicker.resumeAutoRefresh();
-      log.debug('waiting to give time for refresh timer to fire');
-      await PageObjects.common.sleep(refreshInterval + refreshInterval / 2);
-      await PageObjects.timePicker.pauseAutoRefresh();
-      await this.waitForLayersToLoad();
-    }
+    return statsRow[STATS_ROW_VALUE_INDEX];
+  }
 
-    async lockTooltipAtPosition(xOffset: number, yOffset: number) {
-      await retry.try(async () => {
-        const mapContainerElement = await testSubjects.find('mapContainer');
-        await mapContainerElement.moveMouseTo({ xOffset, yOffset });
-        await mapContainerElement.clickMouseButton({ xOffset, yOffset });
-        // Close button is only displayed with tooltip is locked
-        const hasCloseButton = await testSubjects.exists('mapTooltipCloseButton');
-        if (!hasCloseButton) {
-          throw new Error('Tooltip is not locked at position');
-        }
-      });
-    }
+  async triggerSingleRefresh(refreshInterval: number) {
+    this.log.debug(`triggerSingleRefresh, refreshInterval: ${refreshInterval}`);
+    await this.timePicker.resumeAutoRefresh();
+    this.log.debug('waiting to give time for refresh timer to fire');
+    await this.common.sleep(refreshInterval + refreshInterval / 2);
+    await this.timePicker.pauseAutoRefresh();
+    await this.waitForLayersToLoad();
+  }
 
-    async setStyleByValue(styleName: string, fieldName: string) {
-      await testSubjects.selectValue(`staticDynamicSelect_${styleName}`, 'DYNAMIC');
-      await comboBox.set(`styleFieldSelect_${styleName}`, fieldName);
-    }
+  async lockTooltipAtPosition(xOffset: number, yOffset: number) {
+    await this.retry.try(async () => {
+      const mapContainerElement = await this.testSubjects.find('mapContainer');
+      await mapContainerElement.moveMouseTo({ xOffset, yOffset });
+      await mapContainerElement.clickMouseButton({ xOffset, yOffset });
+      // Close button is only displayed with tooltip is locked
+      const hasCloseButton = await this.testSubjects.exists('mapTooltipCloseButton');
+      if (!hasCloseButton) {
+        throw new Error('Tooltip is not locked at position');
+      }
+    });
+  }
 
-    async selectCustomColorRamp(styleName: string) {
-      // open super select menu
-      await testSubjects.click(`colorMapSelect_${styleName}`);
-      // Click option
-      await testSubjects.click(`colorMapSelectOption_CUSTOM_COLOR_MAP`);
-    }
+  async setStyleByValue(styleName: string, fieldName: string) {
+    await this.testSubjects.selectValue(`staticDynamicSelect_${styleName}`, 'DYNAMIC');
+    await this.comboBox.set(`styleFieldSelect_${styleName}`, fieldName);
+  }
 
-    async getCategorySuggestions() {
-      return await comboBox.getOptionsList(`colorStopInput1`);
-    }
+  async selectCustomColorRamp(styleName: string) {
+    // open super select menu
+    await this.testSubjects.click(`colorMapSelect_${styleName}`);
+    // Click option
+    await this.testSubjects.click(`colorMapSelectOption_CUSTOM_COLOR_MAP`);
+  }
 
-    async enableAutoFitToBounds() {
-      await testSubjects.click('openSettingsButton');
-      const isEnabled = await testSubjects.getAttribute('autoFitToDataBoundsSwitch', 'checked');
-      if (!isEnabled) {
-        await retry.try(async () => {
-          await testSubjects.click('autoFitToDataBoundsSwitch');
-          const ensureEnabled = await testSubjects.getAttribute(
-            'autoFitToDataBoundsSwitch',
-            'checked'
-          );
-          if (!ensureEnabled) {
-            throw new Error('autoFitToDataBoundsSwitch is not enabled');
-          }
-        });
-      }
-      await testSubjects.click('mapSettingSubmitButton');
-    }
+  async getCategorySuggestions() {
+    return await this.comboBox.getOptionsList(`colorStopInput1`);
+  }
 
-    async refreshAndClearUnsavedChangesWarning() {
-      await browser.refresh();
-      // accept alert if it pops up
-      const alert = await browser.getAlert();
-      await alert?.accept();
+  async enableAutoFitToBounds() {
+    await this.testSubjects.click('openSettingsButton');
+    const isEnabled = await this.testSubjects.getAttribute('autoFitToDataBoundsSwitch', 'checked');
+    if (!isEnabled) {
+      await this.retry.try(async () => {
+        await this.testSubjects.click('autoFitToDataBoundsSwitch');
+        const ensureEnabled = await this.testSubjects.getAttribute(
+          'autoFitToDataBoundsSwitch',
+          'checked'
+        );
+        if (!ensureEnabled) {
+          throw new Error('autoFitToDataBoundsSwitch is not enabled');
+        }
+      });
     }
+    await this.testSubjects.click('mapSettingSubmitButton');
+  }
+
+  async refreshAndClearUnsavedChangesWarning() {
+    await this.browser.refresh();
+    // accept alert if it pops up
+    const alert = await this.browser.getAlert();
+    await alert?.accept();
   }
-  return new GisPage();
 }
diff --git a/x-pack/test/functional/page_objects/graph_page.ts b/x-pack/test/functional/page_objects/graph_page.ts
index 28d72ef844615..bd9e5100e0c57 100644
--- a/x-pack/test/functional/page_objects/graph_page.ts
+++ b/x-pack/test/functional/page_objects/graph_page.ts
@@ -6,7 +6,7 @@
  */
 
 import { WebElementWrapper } from 'test/functional/services/lib/web_element_wrapper';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 interface Node {
   circle: WebElementWrapper;
@@ -20,264 +20,263 @@ interface Edge {
   element: WebElementWrapper;
 }
 
-export function GraphPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const find = getService('find');
-  const log = getService('log');
-  const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['common', 'header']);
-  const retry = getService('retry');
-  const browser = getService('browser');
-
-  class GraphPage {
-    async selectIndexPattern(pattern: string) {
-      await testSubjects.click('graphDatasourceButton');
-      await testSubjects.click(`savedObjectTitle${pattern.split(' ').join('-')}`);
-      // wait till add fields button becomes available, then the index pattern is loaded completely
-      await testSubjects.waitForAttributeToChange(
-        'graph-add-field-button',
-        'aria-disabled',
-        'false'
-      );
-      // Need document focus to not be on `graphDatasourceButton` so its tooltip does not
-      // obscure the next intended click area. Focus the adjaecnt input instead.
-      await testSubjects.click('queryInput');
-    }
+export class GraphPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly log = this.ctx.getService('log');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly browser = this.ctx.getService('browser');
+
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+
+  async selectIndexPattern(pattern: string) {
+    await this.testSubjects.click('graphDatasourceButton');
+    await this.testSubjects.click(`savedObjectTitle${pattern.split(' ').join('-')}`);
+    // wait till add fields button becomes available, then the index pattern is loaded completely
+    await this.testSubjects.waitForAttributeToChange(
+      'graph-add-field-button',
+      'aria-disabled',
+      'false'
+    );
+    // Need document focus to not be on `graphDatasourceButton` so its tooltip does not
+    // obscure the next intended click area. Focus the adjaecnt input instead.
+    await this.testSubjects.click('queryInput');
+  }
 
-    async clickAddField() {
-      await retry.try(async () => {
-        await testSubjects.click('graph-add-field-button');
-        await testSubjects.existOrFail('graph-field-search', { timeout: 3000 });
-      });
-    }
+  async clickAddField() {
+    await this.retry.try(async () => {
+      await this.testSubjects.click('graph-add-field-button');
+      await this.testSubjects.existOrFail('graph-field-search', { timeout: 3000 });
+    });
+  }
 
-    async selectField(field: string) {
-      await testSubjects.setValue('graph-field-search', field);
-      await find.clickDisplayedByCssSelector(`[title="${field}"]`);
-    }
+  async selectField(field: string) {
+    await this.testSubjects.setValue('graph-field-search', field);
+    await this.find.clickDisplayedByCssSelector(`[title="${field}"]`);
+  }
 
-    async addFields(fields: string[]) {
-      log.debug('click Add Field icon');
-      await this.clickAddField();
-      for (const field of fields) {
-        log.debug('select field ' + field);
-        await this.selectField(field);
-      }
+  async addFields(fields: string[]) {
+    this.log.debug('click Add Field icon');
+    await this.clickAddField();
+    for (const field of fields) {
+      this.log.debug('select field ' + field);
+      await this.selectField(field);
     }
+  }
 
-    async query(str: string) {
-      await testSubjects.click('queryInput');
-      await testSubjects.setValue('queryInput', str);
-      await testSubjects.click('graph-explore-button');
-    }
+  async query(str: string) {
+    await this.testSubjects.click('queryInput');
+    await this.testSubjects.setValue('queryInput', str);
+    await this.testSubjects.click('graph-explore-button');
+  }
 
-    private getPositionAsString(x: string, y: string) {
-      return `${x}-${y}`;
-    }
+  private getPositionAsString(x: string, y: string) {
+    return `${x}-${y}`;
+  }
 
-    private async getCirclePosition(element: WebElementWrapper) {
-      const x = await element.getAttribute('cx');
-      const y = await element.getAttribute('cy');
-      return this.getPositionAsString(x, y);
-    }
+  private async getCirclePosition(element: WebElementWrapper) {
+    const x = await element.getAttribute('cx');
+    const y = await element.getAttribute('cy');
+    return this.getPositionAsString(x, y);
+  }
 
-    private async getLinePositions(element: WebElementWrapper) {
-      const x1 = await element.getAttribute('x1');
-      const y1 = await element.getAttribute('y1');
-      const x2 = await element.getAttribute('x2');
-      const y2 = await element.getAttribute('y2');
-      return [this.getPositionAsString(x1, y1), this.getPositionAsString(x2, y2)];
-    }
+  private async getLinePositions(element: WebElementWrapper) {
+    const x1 = await element.getAttribute('x1');
+    const y1 = await element.getAttribute('y1');
+    const x2 = await element.getAttribute('x2');
+    const y2 = await element.getAttribute('y2');
+    return [this.getPositionAsString(x1, y1), this.getPositionAsString(x2, y2)];
+  }
 
-    async isolateEdge(from: string, to: string) {
-      // select all nodes
-      await testSubjects.click('graphSelectAll');
-
-      // go through all nodes and remove every node not source or target
-      const selections = await find.allByCssSelector('.gphSelectionList__field');
-      for (const selection of selections) {
-        const labelElement = await selection.findByTagName('span');
-        const selectionLabel = await labelElement.getVisibleText();
-        log.debug('Looking at selection ' + selectionLabel);
-        if (selectionLabel !== from && selectionLabel !== to) {
-          (await selection.findByClassName('gphNode__text')).click();
-          await PageObjects.common.sleep(200);
-        }
+  async isolateEdge(from: string, to: string) {
+    // select all nodes
+    await this.testSubjects.click('graphSelectAll');
+
+    // go through all nodes and remove every node not source or target
+    const selections = await this.find.allByCssSelector('.gphSelectionList__field');
+    for (const selection of selections) {
+      const labelElement = await selection.findByTagName('span');
+      const selectionLabel = await labelElement.getVisibleText();
+      this.log.debug('Looking at selection ' + selectionLabel);
+      if (selectionLabel !== from && selectionLabel !== to) {
+        (await selection.findByClassName('gphNode__text')).click();
+        await this.common.sleep(200);
       }
+    }
 
-      // invert selection to select all nodes not source or target
-      await testSubjects.click('graphInvertSelection');
+    // invert selection to select all nodes not source or target
+    await this.testSubjects.click('graphInvertSelection');
 
-      // remove all other nodes
-      await testSubjects.click('graphRemoveSelection');
-    }
+    // remove all other nodes
+    await this.testSubjects.click('graphRemoveSelection');
+  }
 
-    async stopLayout() {
-      if (await testSubjects.exists('graphPauseLayout')) {
-        await testSubjects.click('graphPauseLayout');
-      }
+  async stopLayout() {
+    if (await this.testSubjects.exists('graphPauseLayout')) {
+      await this.testSubjects.click('graphPauseLayout');
     }
+  }
 
-    async startLayout() {
-      if (await testSubjects.exists('graphResumeLayout')) {
-        await testSubjects.click('graphResumeLayout');
-      }
+  async startLayout() {
+    if (await this.testSubjects.exists('graphResumeLayout')) {
+      await this.testSubjects.click('graphResumeLayout');
     }
+  }
 
-    async getGraphObjects() {
-      await this.stopLayout();
-      // read node labels directly from DOM because getVisibleText is not reliable for the way the graph is rendered
-      const nodeNames: string[] = await browser.execute(`
-        const elements = document.querySelectorAll('#graphSvg text.gphNode__label');
-        return [...elements].map(element => element.innerHTML);
-      `);
-      const graphElements = await find.allByCssSelector('#graphSvg line, #graphSvg circle');
-      const nodes: Node[] = [];
-      const nodePositionMap: Record<string, number> = {};
-      const edges: Edge[] = [];
-
-      // find all nodes and save their positions
-      for (const element of graphElements) {
-        const tagName: string = await element.getTagName();
-        // check the position of the circle element
-        if (tagName === 'circle') {
-          nodes.push({ circle: element, label: nodeNames[nodes.length] });
-          const position = await this.getCirclePosition(element);
-          nodePositionMap[position] = nodes.length - 1;
-        }
+  async getGraphObjects() {
+    await this.stopLayout();
+    // read node labels directly from DOM because getVisibleText is not reliable for the way the graph is rendered
+    const nodeNames: string[] = await this.browser.execute(`
+      const elements = document.querySelectorAll('#graphSvg text.gphNode__label');
+      return [...elements].map(element => element.innerHTML);
+    `);
+    const graphElements = await this.find.allByCssSelector('#graphSvg line, #graphSvg circle');
+    const nodes: Node[] = [];
+    const nodePositionMap: Record<string, number> = {};
+    const edges: Edge[] = [];
+
+    // find all nodes and save their positions
+    for (const element of graphElements) {
+      const tagName: string = await element.getTagName();
+      // check the position of the circle element
+      if (tagName === 'circle') {
+        nodes.push({ circle: element, label: nodeNames[nodes.length] });
+        const position = await this.getCirclePosition(element);
+        nodePositionMap[position] = nodes.length - 1;
       }
+    }
 
-      // find all edges
-      for (const element of graphElements) {
-        const tagName: string = await element.getTagName();
-        if (tagName === 'line') {
-          const [sourcePosition, targetPosition] = await this.getLinePositions(element);
-          const lineStyle = await element.getAttribute('style');
-          // grep out the width of the connection from the style attribute
-          const strokeWidth = Number(/stroke-width: ?(\d+(\.\d+)?)/.exec(lineStyle)![1]);
-          edges.push({
-            element,
-            width: strokeWidth,
-            // look up source and target node by matching start and end coordinates
-            // of the edges and the nodes
-            sourceNode: nodes[nodePositionMap[sourcePosition]],
-            targetNode: nodes[nodePositionMap[targetPosition]],
-          });
-        }
+    // find all edges
+    for (const element of graphElements) {
+      const tagName: string = await element.getTagName();
+      if (tagName === 'line') {
+        const [sourcePosition, targetPosition] = await this.getLinePositions(element);
+        const lineStyle = await element.getAttribute('style');
+        // grep out the width of the connection from the style attribute
+        const strokeWidth = Number(/stroke-width: ?(\d+(\.\d+)?)/.exec(lineStyle)![1]);
+        edges.push({
+          element,
+          width: strokeWidth,
+          // look up source and target node by matching start and end coordinates
+          // of the edges and the nodes
+          sourceNode: nodes[nodePositionMap[sourcePosition]],
+          targetNode: nodes[nodePositionMap[targetPosition]],
+        });
       }
+    }
 
-      await this.startLayout();
+    await this.startLayout();
 
-      return {
-        nodes,
-        edges,
-      };
-    }
+    return {
+      nodes,
+      edges,
+    };
+  }
 
-    async createWorkspace() {
-      await testSubjects.click('graphCreateGraphPromptButton');
-    }
+  async createWorkspace() {
+    await this.testSubjects.click('graphCreateGraphPromptButton');
+  }
 
-    async newGraph() {
-      log.debug('Click New Workspace');
-      await retry.try(async () => {
-        await testSubjects.click('graphNewButton');
-        await testSubjects.existOrFail('confirmModal', { timeout: 3000 });
-      });
-      await PageObjects.common.clickConfirmOnModal();
-      await testSubjects.existOrFail('graphGuidancePanel');
-    }
+  async newGraph() {
+    this.log.debug('Click New Workspace');
+    await this.retry.try(async () => {
+      await this.testSubjects.click('graphNewButton');
+      await this.testSubjects.existOrFail('confirmModal', { timeout: 3000 });
+    });
+    await this.common.clickConfirmOnModal();
+    await this.testSubjects.existOrFail('graphGuidancePanel');
+  }
 
-    async saveGraph(name: string) {
-      await retry.try(async () => {
-        await testSubjects.click('graphSaveButton');
-        await testSubjects.existOrFail('savedObjectTitle', { timeout: 3000 });
-      });
-      await testSubjects.setValue('savedObjectTitle', name);
-      await testSubjects.click('confirmSaveSavedObjectButton');
+  async saveGraph(name: string) {
+    await this.retry.try(async () => {
+      await this.testSubjects.click('graphSaveButton');
+      await this.testSubjects.existOrFail('savedObjectTitle', { timeout: 3000 });
+    });
+    await this.testSubjects.setValue('savedObjectTitle', name);
+    await this.testSubjects.click('confirmSaveSavedObjectButton');
 
-      // Confirm that the Graph has been saved.
-      return await testSubjects.exists('saveGraphSuccess', { timeout: 10000 });
-    }
+    // Confirm that the Graph has been saved.
+    return await this.testSubjects.exists('saveGraphSuccess', { timeout: 10000 });
+  }
 
-    async getSearchFilter() {
-      const searchFilter = await find.allByCssSelector('main .euiFieldSearch');
-      return searchFilter[0];
-    }
+  async getSearchFilter() {
+    const searchFilter = await this.find.allByCssSelector('main .euiFieldSearch');
+    return searchFilter[0];
+  }
 
-    async searchForWorkspaceWithName(name: string) {
-      await retry.try(async () => {
-        const searchFilter = await this.getSearchFilter();
-        await searchFilter.clearValue();
-        await searchFilter.click();
-        await searchFilter.type(name);
-        await PageObjects.common.pressEnterKey();
-        await find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000);
-      });
-
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async searchForWorkspaceWithName(name: string) {
+    await this.retry.try(async () => {
+      const searchFilter = await this.getSearchFilter();
+      await searchFilter.clearValue();
+      await searchFilter.click();
+      await searchFilter.type(name);
+      await this.common.pressEnterKey();
+      await this.find.waitForDeletedByCssSelector('.euiBasicTable-loading', 5000);
+    });
+
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async goToListingPage() {
-      await retry.try(async () => {
-        await testSubjects.click('breadcrumb graphHomeBreadcrumb first');
-        await testSubjects.existOrFail('graphLandingPage', { timeout: 3000 });
-      });
-    }
+  async goToListingPage() {
+    await this.retry.try(async () => {
+      await this.testSubjects.click('breadcrumb graphHomeBreadcrumb first');
+      await this.testSubjects.existOrFail('graphLandingPage', { timeout: 3000 });
+    });
+  }
 
-    async openGraph(name: string) {
-      await this.goToListingPage();
-      await this.searchForWorkspaceWithName(name);
-      await find.clickByLinkText(name);
-      // wait for nodes to show up
-      if (!(await find.existsByCssSelector('.gphNode', 10000))) {
-        throw new Error('nodes did not show up');
-      }
-      // let force simulation settle down before continuing
-      await PageObjects.common.sleep(5000);
+  async openGraph(name: string) {
+    await this.goToListingPage();
+    await this.searchForWorkspaceWithName(name);
+    await this.find.clickByLinkText(name);
+    // wait for nodes to show up
+    if (!(await this.find.existsByCssSelector('.gphNode', 10000))) {
+      throw new Error('nodes did not show up');
     }
+    // let force simulation settle down before continuing
+    await this.common.sleep(5000);
+  }
 
-    async deleteGraph(name: string) {
-      await testSubjects.click('checkboxSelectAll');
-      await this.clickDeleteSelectedWorkspaces();
-      await PageObjects.common.clickConfirmOnModal();
-      await testSubjects.find('graphCreateGraphPromptButton');
-    }
+  async deleteGraph(name: string) {
+    await this.testSubjects.click('checkboxSelectAll');
+    await this.clickDeleteSelectedWorkspaces();
+    await this.common.clickConfirmOnModal();
+    await this.testSubjects.find('graphCreateGraphPromptButton');
+  }
 
-    async getWorkspaceCount() {
-      const workspaceTitles = await find.allByCssSelector(
-        '[data-test-subj^="graphListingTitleLink"]'
-      );
-      return workspaceTitles.length;
-    }
+  async getWorkspaceCount() {
+    const workspaceTitles = await this.find.allByCssSelector(
+      '[data-test-subj^="graphListingTitleLink"]'
+    );
+    return workspaceTitles.length;
+  }
 
-    async clickDeleteSelectedWorkspaces() {
-      await testSubjects.click('deleteSelectedItems');
-    }
+  async clickDeleteSelectedWorkspaces() {
+    await this.testSubjects.click('deleteSelectedItems');
+  }
 
-    async getVennTerm1() {
-      const el = await find.byCssSelector('span.gphLinkSummary__term--1');
-      return await el.getVisibleText();
-    }
+  async getVennTerm1() {
+    const el = await this.find.byCssSelector('span.gphLinkSummary__term--1');
+    return await el.getVisibleText();
+  }
 
-    async getVennTerm2() {
-      const el = await find.byCssSelector('span.gphLinkSummary__term--2');
-      return await el.getVisibleText();
-    }
+  async getVennTerm2() {
+    const el = await this.find.byCssSelector('span.gphLinkSummary__term--2');
+    return await el.getVisibleText();
+  }
 
-    async getSmallVennTerm1() {
-      const el = await find.byCssSelector('small.gphLinkSummary__term--1');
-      return await el.getVisibleText();
-    }
+  async getSmallVennTerm1() {
+    const el = await this.find.byCssSelector('small.gphLinkSummary__term--1');
+    return await el.getVisibleText();
+  }
 
-    async getSmallVennTerm12() {
-      const el = await find.byCssSelector('small.gphLinkSummary__term--1-2');
-      return await el.getVisibleText();
-    }
+  async getSmallVennTerm12() {
+    const el = await this.find.byCssSelector('small.gphLinkSummary__term--1-2');
+    return await el.getVisibleText();
+  }
 
-    async getSmallVennTerm2() {
-      const el = await find.byCssSelector('small.gphLinkSummary__term--2');
-      return await el.getVisibleText();
-    }
+  async getSmallVennTerm2() {
+    const el = await this.find.byCssSelector('small.gphLinkSummary__term--2');
+    return await el.getVisibleText();
   }
-  return new GraphPage();
 }
diff --git a/x-pack/test/functional/page_objects/grok_debugger_page.ts b/x-pack/test/functional/page_objects/grok_debugger_page.ts
index dc875588f381e..89017683f632f 100644
--- a/x-pack/test/functional/page_objects/grok_debugger_page.ts
+++ b/x-pack/test/functional/page_objects/grok_debugger_page.ts
@@ -5,16 +5,14 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function GrokDebuggerPageProvider({ getPageObjects, getService }: FtrProviderContext) {
-  const PageObjects = getPageObjects(['common']);
-  const grokDebugger = getService('grokDebugger');
+export class GrokDebuggerPageObject extends FtrService {
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly grokDebugger = this.ctx.getService('grokDebugger');
 
-  return new (class LogstashPage {
-    async gotoGrokDebugger() {
-      await PageObjects.common.navigateToApp('grokDebugger');
-      await grokDebugger.assertExists();
-    }
-  })();
+  async gotoGrokDebugger() {
+    await this.common.navigateToApp('grokDebugger');
+    await this.grokDebugger.assertExists();
+  }
 }
diff --git a/x-pack/test/functional/page_objects/index.ts b/x-pack/test/functional/page_objects/index.ts
index e83420a9cea1d..a362fd7e4b7c2 100644
--- a/x-pack/test/functional/page_objects/index.ts
+++ b/x-pack/test/functional/page_objects/index.ts
@@ -8,22 +8,21 @@
 import { pageObjects as kibanaFunctionalPageObjects } from '../../../../test/functional/page_objects';
 
 import { CanvasPageProvider } from './canvas_page';
-import { SecurityPageProvider } from './security_page';
-import { MonitoringPageProvider } from './monitoring_page';
-// @ts-ignore not ts yet
-import { LogstashPageProvider } from './logstash_page';
-import { GraphPageProvider } from './graph_page';
-import { GrokDebuggerPageProvider } from './grok_debugger_page';
-import { WatcherPageProvider } from './watcher_page';
-import { ReportingPageProvider } from './reporting_page';
-import { AccountSettingProvider } from './account_settings_page';
+import { SecurityPageObject } from './security_page';
+import { MonitoringPageObject } from './monitoring_page';
+import { LogstashPageObject } from './logstash_page';
+import { GraphPageObject } from './graph_page';
+import { GrokDebuggerPageObject } from './grok_debugger_page';
+import { WatcherPageObject } from './watcher_page';
+import { ReportingPageObject } from './reporting_page';
+import { AccountSettingsPageObject } from './account_settings_page';
 import { InfraHomePageProvider } from './infra_home_page';
 import { InfraLogsPageProvider } from './infra_logs_page';
-import { GisPageProvider } from './gis_page';
-import { StatusPagePageProvider } from './status_page';
-import { UpgradeAssistantPageProvider } from './upgrade_assistant_page';
-import { RollupPageProvider } from './rollup_page';
-import { UptimePageProvider } from './uptime_page';
+import { GisPageObject } from './gis_page';
+import { StatusPageObject } from './status_page';
+import { UpgradeAssistantPageObject } from './upgrade_assistant_page';
+import { RollupPageObject } from './rollup_page';
+import { UptimePageObject } from './uptime_page';
 import { SyntheticsIntegrationPageProvider } from './synthetics_integration_page';
 import { ApiKeysPageProvider } from './api_keys_page';
 import { LicenseManagementPageProvider } from './license_management_page';
@@ -36,43 +35,43 @@ import { CopySavedObjectsToSpacePageProvider } from './copy_saved_objects_to_spa
 import { LensPageProvider } from './lens_page';
 import { InfraMetricExplorerProvider } from './infra_metric_explorer';
 import { RoleMappingsPageProvider } from './role_mappings_page';
-import { SpaceSelectorPageProvider } from './space_selector_page';
+import { SpaceSelectorPageObject } from './space_selector_page';
 import { IngestPipelinesPageProvider } from './ingest_pipelines_page';
-import { TagManagementPageProvider } from './tag_management_page';
-import { NavigationalSearchProvider } from './navigational_search';
+import { TagManagementPageObject } from './tag_management_page';
+import { NavigationalSearchPageObject } from './navigational_search';
 import { SearchSessionsPageProvider } from './search_sessions_management_page';
-import { DetectionsPageProvider } from '../../security_solution_ftr/page_objects/detections';
-import { BannersPageProvider } from './banners_page';
+import { DetectionsPageObject } from '../../security_solution_ftr/page_objects/detections';
+import { BannersPageObject } from './banners_page';
 
 // just like services, PageObjects are defined as a map of
 // names to Providers. Merge in Kibana's or pick specific ones
 export const pageObjects = {
   ...kibanaFunctionalPageObjects,
   canvas: CanvasPageProvider,
-  security: SecurityPageProvider,
-  accountSetting: AccountSettingProvider,
-  monitoring: MonitoringPageProvider,
-  logstash: LogstashPageProvider,
-  graph: GraphPageProvider,
-  grokDebugger: GrokDebuggerPageProvider,
-  watcher: WatcherPageProvider,
-  reporting: ReportingPageProvider,
-  spaceSelector: SpaceSelectorPageProvider,
+  security: SecurityPageObject,
+  accountSetting: AccountSettingsPageObject,
+  monitoring: MonitoringPageObject,
+  logstash: LogstashPageObject,
+  graph: GraphPageObject,
+  grokDebugger: GrokDebuggerPageObject,
+  watcher: WatcherPageObject,
+  reporting: ReportingPageObject,
+  spaceSelector: SpaceSelectorPageObject,
   infraHome: InfraHomePageProvider,
   infraMetricExplorer: InfraMetricExplorerProvider,
   infraLogs: InfraLogsPageProvider,
-  maps: GisPageProvider,
-  statusPage: StatusPagePageProvider,
-  upgradeAssistant: UpgradeAssistantPageProvider,
-  uptime: UptimePageProvider,
+  maps: GisPageObject,
+  statusPage: StatusPageObject,
+  upgradeAssistant: UpgradeAssistantPageObject,
+  uptime: UptimePageObject,
   syntheticsIntegration: SyntheticsIntegrationPageProvider,
-  rollup: RollupPageProvider,
+  rollup: RollupPageObject,
   apiKeys: ApiKeysPageProvider,
   licenseManagement: LicenseManagementPageProvider,
   indexManagement: IndexManagementPageProvider,
   searchSessionsManagement: SearchSessionsPageProvider,
   indexLifecycleManagement: IndexLifecycleManagementPageProvider,
-  tagManagement: TagManagementPageProvider,
+  tagManagement: TagManagementPageObject,
   snapshotRestore: SnapshotRestorePageProvider,
   crossClusterReplication: CrossClusterReplicationPageProvider,
   remoteClusters: RemoteClustersPageProvider,
@@ -80,7 +79,7 @@ export const pageObjects = {
   lens: LensPageProvider,
   roleMappings: RoleMappingsPageProvider,
   ingestPipelines: IngestPipelinesPageProvider,
-  navigationalSearch: NavigationalSearchProvider,
-  banners: BannersPageProvider,
-  detections: DetectionsPageProvider,
+  navigationalSearch: NavigationalSearchPageObject,
+  banners: BannersPageObject,
+  detections: DetectionsPageObject,
 };
diff --git a/x-pack/test/functional/page_objects/infra_home_page.ts b/x-pack/test/functional/page_objects/infra_home_page.ts
index 2f4575d45cc20..8dfef36c3a1c1 100644
--- a/x-pack/test/functional/page_objects/infra_home_page.ts
+++ b/x-pack/test/functional/page_objects/infra_home_page.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import testSubjSelector from '@kbn/test-subj-selector';
 
 import { FtrProviderContext } from '../ftr_provider_context';
diff --git a/x-pack/test/functional/page_objects/lens_page.ts b/x-pack/test/functional/page_objects/lens_page.ts
index b16944cd73060..c0111afad2893 100644
--- a/x-pack/test/functional/page_objects/lens_page.ts
+++ b/x-pack/test/functional/page_objects/lens_page.ts
@@ -170,6 +170,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
         testSubjects.getCssSelector(`lnsFieldListPanelField-${field}`),
         testSubjects.getCssSelector('lnsWorkspace')
       );
+      await this.waitForLensDragDropToFinish();
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
 
@@ -183,6 +184,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
         testSubjects.getCssSelector(`lnsFieldListPanelField-${field}`),
         testSubjects.getCssSelector('lnsGeoFieldWorkspace')
       );
+      await this.waitForLensDragDropToFinish();
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
 
@@ -246,6 +248,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
         await browser.pressKeys(reverse ? browser.keys.LEFT : browser.keys.RIGHT);
       }
       await browser.pressKeys(browser.keys.ENTER);
+      await this.waitForLensDragDropToFinish();
 
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
@@ -270,6 +273,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       }
       await browser.pressKeys(browser.keys.ENTER);
 
+      await this.waitForLensDragDropToFinish();
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
     /**
@@ -292,9 +296,19 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       }
       await browser.pressKeys(browser.keys.ENTER);
 
+      await this.waitForLensDragDropToFinish();
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
 
+    async waitForLensDragDropToFinish() {
+      await retry.try(async () => {
+        const exists = await find.existsByCssSelector('.lnsDragDrop-isActiveGroup');
+        if (exists) {
+          throw new Error('UI still in drag/drop mode');
+        }
+      });
+    },
+
     /**
      * Drags field to dimension trigger
      *
@@ -306,6 +320,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
         testSubjects.getCssSelector(`lnsFieldListPanelField-${field}`),
         testSubjects.getCssSelector(dimension)
       );
+      await this.waitForLensDragDropToFinish();
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
 
@@ -320,6 +335,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
         testSubjects.getCssSelector(from),
         testSubjects.getCssSelector(to)
       );
+      await this.waitForLensDragDropToFinish();
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
 
@@ -333,6 +349,7 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       const dragging = `[data-test-subj='${dimension}']:nth-of-type(${startIndex}) .lnsDragDrop`;
       const dropping = `[data-test-subj='${dimension}']:nth-of-type(${endIndex}) [data-test-subj='lnsDragDrop-reorderableDropLayer'`;
       await browser.html5DragAndDrop(dragging, dropping);
+      await this.waitForLensDragDropToFinish();
       await PageObjects.header.waitUntilLoadingHasFinished();
     },
 
@@ -362,6 +379,25 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       });
     },
 
+    async enableTimeShift() {
+      await testSubjects.click('indexPattern-advanced-popover');
+      await retry.try(async () => {
+        await testSubjects.click('indexPattern-time-shift-enable');
+      });
+    },
+
+    async setTimeShift(shift: string) {
+      await comboBox.setCustom('indexPattern-dimension-time-shift', shift);
+    },
+
+    async hasFixAction() {
+      return await testSubjects.exists('errorFixAction');
+    },
+
+    async useFixAction() {
+      await testSubjects.click('errorFixAction');
+    },
+
     // closes the dimension editor flyout
     async closeDimensionEditor() {
       await retry.try(async () => {
@@ -725,6 +761,20 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       return buttonEl.click();
     },
 
+    async setTableSummaryRowFunction(
+      summaryFunction: 'none' | 'sum' | 'avg' | 'count' | 'min' | 'max'
+    ) {
+      await testSubjects.click('lnsDatatable_summaryrow_function');
+      await testSubjects.click('lns-datatable-summary-' + summaryFunction);
+    },
+
+    async setTableSummaryRowLabel(newLabel: string) {
+      await testSubjects.setValue('lnsDatatable_summaryrow_label', newLabel, {
+        clearWithKeyboard: true,
+        typeCharByChar: true,
+      });
+    },
+
     async setTableDynamicColoring(coloringType: 'none' | 'cell' | 'text') {
       await testSubjects.click('lnsDatatable_dynamicColoring_groups_' + coloringType);
     },
@@ -733,6 +783,10 @@ export function LensPageProvider({ getService, getPageObjects }: FtrProviderCont
       await testSubjects.click('lnsDatatable_dynamicColoring_trigger');
     },
 
+    async closeTablePalettePanel() {
+      await testSubjects.click('lns-indexPattern-PalettePanelContainerBack');
+    },
+
     // different picker from the next one
     async changePaletteTo(paletteName: string) {
       await testSubjects.click('lnsDatatable_dynamicColoring_palette_picker');
diff --git a/x-pack/test/functional/page_objects/logstash_page.js b/x-pack/test/functional/page_objects/logstash_page.js
deleted file mode 100644
index 3b12728d29610..0000000000000
--- a/x-pack/test/functional/page_objects/logstash_page.js
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
- * or more contributor license agreements. Licensed under the Elastic License
- * 2.0; you may not use this file except in compliance with the Elastic License
- * 2.0.
- */
-
-export function LogstashPageProvider({ getPageObjects, getService }) {
-  const PageObjects = getPageObjects(['common']);
-  const pipelineList = getService('pipelineList');
-  const pipelineEditor = getService('pipelineEditor');
-
-  return new (class LogstashPage {
-    async gotoPipelineList() {
-      await PageObjects.common.navigateToApp('logstashPipelines');
-      await pipelineList.assertExists();
-    }
-
-    async gotoNewPipelineEditor() {
-      await this.gotoPipelineList();
-      await pipelineList.clickAdd();
-      await pipelineEditor.assertExists();
-    }
-  })();
-}
diff --git a/x-pack/test/functional/page_objects/logstash_page.ts b/x-pack/test/functional/page_objects/logstash_page.ts
new file mode 100644
index 0000000000000..37b907b34fa32
--- /dev/null
+++ b/x-pack/test/functional/page_objects/logstash_page.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 { FtrService } from '../ftr_provider_context';
+
+export class LogstashPageObject extends FtrService {
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly pipelineList = this.ctx.getService('pipelineList');
+  private readonly pipelineEditor = this.ctx.getService('pipelineEditor');
+
+  async gotoPipelineList() {
+    await this.common.navigateToApp('logstashPipelines');
+    await this.pipelineList.assertExists();
+  }
+
+  async gotoNewPipelineEditor() {
+    await this.gotoPipelineList();
+    await this.pipelineList.clickAdd();
+    await this.pipelineEditor.assertExists();
+  }
+}
diff --git a/x-pack/test/functional/page_objects/monitoring_page.ts b/x-pack/test/functional/page_objects/monitoring_page.ts
index a499b53c22606..151b6733509e6 100644
--- a/x-pack/test/functional/page_objects/monitoring_page.ts
+++ b/x-pack/test/functional/page_objects/monitoring_page.ts
@@ -5,62 +5,45 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function MonitoringPageProvider({ getPageObjects, getService }: FtrProviderContext) {
-  const PageObjects = getPageObjects(['common', 'header', 'security', 'login']);
-  const testSubjects = getService('testSubjects');
-  const security = getService('security');
-
-  return new (class MonitoringPage {
-    async navigateTo(useSuperUser = false) {
-      // always create this because our tear down tries to delete it
-      await security.user.create('basic_monitoring_user', {
-        password: 'monitoring_user_password',
-        roles: ['monitoring_user', 'kibana_admin'],
-        full_name: 'basic monitoring',
-      });
-
-      if (!useSuperUser) {
-        await PageObjects.security.forceLogout();
-        await PageObjects.login.login('basic_monitoring_user', 'monitoring_user_password');
-      }
-      await PageObjects.common.navigateToApp('monitoring');
-    }
-
-    async getAccessDeniedMessage() {
-      return testSubjects.getVisibleText('accessDeniedTitle');
-    }
-
-    async clickBreadcrumb(subj: string) {
-      return testSubjects.click(subj);
-    }
-
-    async assertTableNoData(subj: string) {
-      if (!(await testSubjects.exists(subj))) {
-        throw new Error('Expected to find the no data message');
-      }
-    }
-
-    async tableGetRows(subj: string) {
-      const table = await testSubjects.find(subj);
-      return table.findAllByTagName('tr');
-    }
-
-    async tableGetRowsFromContainer(subj: string) {
-      const table = await testSubjects.find(subj);
-      const tbody = await table.findByTagName('tbody');
-      return tbody.findAllByTagName('tr');
-    }
-
-    async tableSetFilter(subj: string, text: string) {
-      await testSubjects.setValue(subj, text);
-      await PageObjects.common.pressEnterKey();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    async tableClearFilter(subj: string) {
-      return await testSubjects.setValue(subj, ' \uE003'); // space and backspace to trigger onChange event
-    }
-  })();
+import { FtrService } from '../ftr_provider_context';
+
+export class MonitoringPageObject extends FtrService {
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+
+  async getAccessDeniedMessage() {
+    return this.testSubjects.getVisibleText('accessDeniedTitle');
+  }
+
+  async clickBreadcrumb(subj: string) {
+    return this.testSubjects.click(subj);
+  }
+
+  async assertTableNoData(subj: string) {
+    if (!(await this.testSubjects.exists(subj))) {
+      throw new Error('Expected to find the no data message');
+    }
+  }
+
+  async tableGetRows(subj: string) {
+    const table = await this.testSubjects.find(subj);
+    return table.findAllByTagName('tr');
+  }
+
+  async tableGetRowsFromContainer(subj: string) {
+    const table = await this.testSubjects.find(subj);
+    const tbody = await table.findByTagName('tbody');
+    return tbody.findAllByTagName('tr');
+  }
+
+  async tableSetFilter(subj: string, text: string) {
+    await this.testSubjects.setValue(subj, text);
+    await this.common.pressEnterKey();
+    await this.header.waitUntilLoadingHasFinished();
+  }
+
+  async tableClearFilter(subj: string) {
+    return await this.testSubjects.setValue(subj, ' \uE003'); // space and backspace to trigger onChange event
+  }
 }
diff --git a/x-pack/test/functional/page_objects/navigational_search.ts b/x-pack/test/functional/page_objects/navigational_search.ts
index a3f91e7921cc4..46fed2814c0df 100644
--- a/x-pack/test/functional/page_objects/navigational_search.ts
+++ b/x-pack/test/functional/page_objects/navigational_search.ts
@@ -6,7 +6,7 @@
  */
 
 import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 interface SearchResult {
   label: string;
@@ -14,88 +14,84 @@ interface SearchResult {
 
 const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
 
-export function NavigationalSearchProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const find = getService('find');
-  const testSubjects = getService('testSubjects');
+export class NavigationalSearchPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
 
-  class NavigationalSearch {
-    async focus() {
-      const field = await testSubjects.find('nav-search-input');
-      await field.click();
-    }
+  async focus() {
+    const field = await this.testSubjects.find('nav-search-input');
+    await field.click();
+  }
 
-    async blur() {
-      await testSubjects.click('helpMenuButton');
-      await testSubjects.click('helpMenuButton');
-      await find.waitForDeletedByCssSelector('.navSearch__panel');
-    }
+  async blur() {
+    await this.testSubjects.click('helpMenuButton');
+    await this.testSubjects.click('helpMenuButton');
+    await this.find.waitForDeletedByCssSelector('.navSearch__panel');
+  }
 
-    async searchFor(
-      term: string,
-      { clear = true, wait = true }: { clear?: boolean; wait?: boolean } = {}
-    ) {
-      if (clear) {
-        await this.clearField();
-      }
-      const field = await testSubjects.find('nav-search-input');
-      await field.type(term);
-      if (wait) {
-        await this.waitForResultsLoaded();
-      }
+  async searchFor(
+    term: string,
+    { clear = true, wait = true }: { clear?: boolean; wait?: boolean } = {}
+  ) {
+    if (clear) {
+      await this.clearField();
     }
-
-    async getFieldValue() {
-      const field = await testSubjects.find('nav-search-input');
-      return field.getAttribute('value');
-    }
-
-    async clearField() {
-      const field = await testSubjects.find('nav-search-input');
-      await field.clearValueWithKeyboard();
+    const field = await this.testSubjects.find('nav-search-input');
+    await field.type(term);
+    if (wait) {
+      await this.waitForResultsLoaded();
     }
+  }
 
-    async isPopoverDisplayed() {
-      return await find.existsByCssSelector('.navSearch__panel');
-    }
+  async getFieldValue() {
+    const field = await this.testSubjects.find('nav-search-input');
+    return field.getAttribute('value');
+  }
 
-    async clickOnOption(index: number) {
-      const options = await testSubjects.findAll('nav-search-option');
-      await options[index].click();
-    }
+  async clearField() {
+    const field = await this.testSubjects.find('nav-search-input');
+    await field.clearValueWithKeyboard();
+  }
 
-    async waitForResultsLoaded(waitUntil: number = 3000) {
-      await testSubjects.exists('nav-search-option');
-      // results are emitted in multiple batches. Each individual batch causes a re-render of
-      // the component, causing the current elements to become stale. We can't perform DOM access
-      // without heavy flakiness in this situation.
-      // there is NO ui indication of any kind to detect when all the emissions are done,
-      // so we are forced to fallback to awaiting a given amount of time once the first options are displayed.
-      await delay(waitUntil);
-    }
+  async isPopoverDisplayed() {
+    return await this.find.existsByCssSelector('.navSearch__panel');
+  }
 
-    async getDisplayedResults() {
-      const resultElements = await testSubjects.findAll('nav-search-option');
-      return Promise.all(resultElements.map((el) => this.convertResultElement(el)));
-    }
+  async clickOnOption(index: number) {
+    const options = await this.testSubjects.findAll('nav-search-option');
+    await options[index].click();
+  }
 
-    async isNoResultsPlaceholderDisplayed(checkAfter: number = 3000) {
-      // see comment in `waitForResultsLoaded`
-      await delay(checkAfter);
-      return testSubjects.exists('nav-search-no-results');
-    }
+  async waitForResultsLoaded(waitUntil: number = 3000) {
+    await this.testSubjects.exists('nav-search-option');
+    // results are emitted in multiple batches. Each individual batch causes a re-render of
+    // the component, causing the current elements to become stale. We can't perform DOM access
+    // without heavy flakiness in this situation.
+    // there is NO ui indication of any kind to detect when all the emissions are done,
+    // so we are forced to fallback to awaiting a given amount of time once the first options are displayed.
+    await delay(waitUntil);
+  }
 
-    private async convertResultElement(resultEl: WebElementWrapper): Promise<SearchResult> {
-      const labelEl = await find.allDescendantDisplayedByCssSelector(
-        '.euiSelectableTemplateSitewide__listItemTitle',
-        resultEl
-      );
-      const label = await labelEl[0].getVisibleText();
+  async getDisplayedResults() {
+    const resultElements = await this.testSubjects.findAll('nav-search-option');
+    return Promise.all(resultElements.map((el) => this.convertResultElement(el)));
+  }
 
-      return {
-        label,
-      };
-    }
+  async isNoResultsPlaceholderDisplayed(checkAfter: number = 3000) {
+    // see comment in `waitForResultsLoaded`
+    await delay(checkAfter);
+    return this.testSubjects.exists('nav-search-no-results');
   }
 
-  return new NavigationalSearch();
+  private async convertResultElement(resultEl: WebElementWrapper): Promise<SearchResult> {
+    const labelEl = await this.find.allDescendantDisplayedByCssSelector(
+      '.euiSelectableTemplateSitewide__listItemTitle',
+      resultEl
+    );
+    const label = await labelEl[0].getVisibleText();
+
+    return {
+      label,
+    };
+  }
 }
diff --git a/x-pack/test/functional/page_objects/reporting_page.ts b/x-pack/test/functional/page_objects/reporting_page.ts
index 746df14d31ac4..e8999999ce50b 100644
--- a/x-pack/test/functional/page_objects/reporting_page.ts
+++ b/x-pack/test/functional/page_objects/reporting_page.ts
@@ -9,148 +9,152 @@ import expect from '@kbn/expect';
 import { format as formatUrl } from 'url';
 import supertestAsPromised from 'supertest-as-promised';
 
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function ReportingPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const browser = getService('browser');
-  const config = getService('config');
-  const log = getService('log');
-  const retry = getService('retry');
-  const security = getService('security');
-  const testSubjects = getService('testSubjects');
-  const PageObjects = getPageObjects(['security', 'share', 'timePicker']);
-
-  class ReportingPage {
-    async forceSharedItemsContainerSize({ width }: { width: number }) {
-      await browser.execute(`
-        var el = document.querySelector('[data-shared-items-container]');
-        el.style.flex="none";
-        el.style.width="${width}px";
-      `);
-    }
+import { FtrService } from '../ftr_provider_context';
+
+export class ReportingPageObject extends FtrService {
+  private readonly browser = this.ctx.getService('browser');
+  private readonly config = this.ctx.getService('config');
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly security = this.ctx.getService('security');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly share = this.ctx.getPageObject('share');
+  private readonly timePicker = this.ctx.getPageObject('timePicker');
+
+  async forceSharedItemsContainerSize({ width }: { width: number }) {
+    await this.browser.execute(`
+      var el = document.querySelector('[data-shared-items-container]');
+      el.style.flex="none";
+      el.style.width="${width}px";
+    `);
+  }
 
-    async getReportURL(timeout: number) {
-      log.debug('getReportURL');
+  async getReportURL(timeout: number) {
+    this.log.debug('getReportURL');
 
-      const url = await testSubjects.getAttribute('downloadCompletedReportButton', 'href', timeout);
+    const url = await this.testSubjects.getAttribute(
+      'downloadCompletedReportButton',
+      'href',
+      timeout
+    );
 
-      log.debug(`getReportURL got url: ${url}`);
+    this.log.debug(`getReportURL got url: ${url}`);
 
-      return url;
-    }
+    return url;
+  }
 
-    async removeForceSharedItemsContainerSize() {
-      await browser.execute(`
-        var el = document.querySelector('[data-shared-items-container]');
-        el.style.flex = null;
-        el.style.width = null;
-      `);
-    }
+  async removeForceSharedItemsContainerSize() {
+    await this.browser.execute(`
+      var el = document.querySelector('[data-shared-items-container]');
+      el.style.flex = null;
+      el.style.width = null;
+    `);
+  }
 
-    async getResponse(fullUrl: string): Promise<supertestAsPromised.Response> {
-      log.debug(`getResponse for ${fullUrl}`);
-      const kibanaServerConfig = config.get('servers.kibana');
-      const baseURL = formatUrl({
-        ...kibanaServerConfig,
-        auth: false,
-      });
-      const urlWithoutBase = fullUrl.replace(baseURL, '');
-      const res = await security.testUserSupertest.get(urlWithoutBase);
-      return res;
-    }
+  async getResponse(fullUrl: string): Promise<supertestAsPromised.Response> {
+    this.log.debug(`getResponse for ${fullUrl}`);
+    const kibanaServerConfig = this.config.get('servers.kibana');
+    const baseURL = formatUrl({
+      ...kibanaServerConfig,
+      auth: false,
+    });
+    const urlWithoutBase = fullUrl.replace(baseURL, '');
+    const res = await this.security.testUserSupertest.get(urlWithoutBase);
+    return res;
+  }
 
-    async getRawPdfReportData(url: string): Promise<Buffer> {
-      log.debug(`getRawPdfReportData for ${url}`);
-      const response = await this.getResponse(url);
-      expect(response.body).to.be.a(Buffer);
-      return response.body as Buffer;
-    }
+  async getRawPdfReportData(url: string): Promise<Buffer> {
+    this.log.debug(`getRawPdfReportData for ${url}`);
+    const response = await this.getResponse(url);
+    expect(response.body).to.be.a(Buffer);
+    return response.body as Buffer;
+  }
 
-    async openCsvReportingPanel() {
-      log.debug('openCsvReportingPanel');
-      await PageObjects.share.openShareMenuItem('CSV Reports');
-    }
+  async openCsvReportingPanel() {
+    this.log.debug('openCsvReportingPanel');
+    await this.share.openShareMenuItem('CSV Reports');
+  }
 
-    async openPdfReportingPanel() {
-      log.debug('openPdfReportingPanel');
-      await PageObjects.share.openShareMenuItem('PDF Reports');
-    }
+  async openPdfReportingPanel() {
+    this.log.debug('openPdfReportingPanel');
+    await this.share.openShareMenuItem('PDF Reports');
+  }
 
-    async openPngReportingPanel() {
-      log.debug('openPngReportingPanel');
-      await PageObjects.share.openShareMenuItem('PNG Reports');
-    }
+  async openPngReportingPanel() {
+    this.log.debug('openPngReportingPanel');
+    await this.share.openShareMenuItem('PNG Reports');
+  }
 
-    async clearToastNotifications() {
-      const toasts = await testSubjects.findAll('toastCloseButton');
-      await Promise.all(toasts.map(async (t) => await t.click()));
-    }
+  async clearToastNotifications() {
+    const toasts = await this.testSubjects.findAll('toastCloseButton');
+    await Promise.all(toasts.map(async (t) => await t.click()));
+  }
 
-    async getQueueReportError() {
-      return await testSubjects.exists('queueReportError');
-    }
+  async getQueueReportError() {
+    return await this.testSubjects.exists('queueReportError');
+  }
 
-    async getGenerateReportButton() {
-      return await retry.try(async () => await testSubjects.find('generateReportButton'));
-    }
+  async getGenerateReportButton() {
+    return await this.retry.try(async () => await this.testSubjects.find('generateReportButton'));
+  }
 
-    async isGenerateReportButtonDisabled() {
-      const generateReportButton = await this.getGenerateReportButton();
-      return await retry.try(async () => {
-        const isDisabled = await generateReportButton.getAttribute('disabled');
-        return isDisabled;
-      });
-    }
+  async isGenerateReportButtonDisabled() {
+    const generateReportButton = await this.getGenerateReportButton();
+    return await this.retry.try(async () => {
+      const isDisabled = await generateReportButton.getAttribute('disabled');
+      return isDisabled;
+    });
+  }
 
-    async canReportBeCreated() {
-      await this.clickGenerateReportButton();
-      const success = await this.checkForReportingToasts();
-      return success;
-    }
+  async canReportBeCreated() {
+    await this.clickGenerateReportButton();
+    const success = await this.checkForReportingToasts();
+    return success;
+  }
 
-    async checkUsePrintLayout() {
-      // The print layout checkbox slides in as part of an animation, and tests can
-      // attempt to click it too quickly, leading to flaky tests. The 500ms wait allows
-      // the animation to complete before we attempt a click.
-      const menuAnimationDelay = 500;
-      await retry.tryForTime(menuAnimationDelay, () => testSubjects.click('usePrintLayout'));
-    }
+  async checkUsePrintLayout() {
+    // The print layout checkbox slides in as part of an animation, and tests can
+    // attempt to click it too quickly, leading to flaky tests. The 500ms wait allows
+    // the animation to complete before we attempt a click.
+    const menuAnimationDelay = 500;
+    await this.retry.tryForTime(menuAnimationDelay, () =>
+      this.testSubjects.click('usePrintLayout')
+    );
+  }
 
-    async clickGenerateReportButton() {
-      await testSubjects.click('generateReportButton');
-    }
+  async clickGenerateReportButton() {
+    await this.testSubjects.click('generateReportButton');
+  }
 
-    async toggleReportMode() {
-      await testSubjects.click('reportModeToggle');
-    }
+  async toggleReportMode() {
+    await this.testSubjects.click('reportModeToggle');
+  }
 
-    async checkForReportingToasts() {
-      log.debug('Reporting:checkForReportingToasts');
-      const isToastPresent = await testSubjects.exists('completeReportSuccess', {
-        allowHidden: true,
-        timeout: 90000,
-      });
-      // Close toast so it doesn't obscure the UI.
-      if (isToastPresent) {
-        await testSubjects.click('completeReportSuccess > toastCloseButton');
-      }
-
-      return isToastPresent;
+  async checkForReportingToasts() {
+    this.log.debug('Reporting:checkForReportingToasts');
+    const isToastPresent = await this.testSubjects.exists('completeReportSuccess', {
+      allowHidden: true,
+      timeout: 90000,
+    });
+    // Close toast so it doesn't obscure the UI.
+    if (isToastPresent) {
+      await this.testSubjects.click('completeReportSuccess > toastCloseButton');
     }
 
-    async setTimepickerInDataRange() {
-      log.debug('Reporting:setTimepickerInDataRange');
-      const fromTime = 'Apr 27, 2019 @ 23:56:51.374';
-      const toTime = 'Aug 23, 2019 @ 16:18:51.821';
-      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-    }
+    return isToastPresent;
+  }
 
-    async setTimepickerInNoDataRange() {
-      log.debug('Reporting:setTimepickerInNoDataRange');
-      const fromTime = 'Sep 19, 1999 @ 06:31:44.000';
-      const toTime = 'Sep 23, 1999 @ 18:31:44.000';
-      await PageObjects.timePicker.setAbsoluteRange(fromTime, toTime);
-    }
+  async setTimepickerInDataRange() {
+    this.log.debug('Reporting:setTimepickerInDataRange');
+    const fromTime = 'Apr 27, 2019 @ 23:56:51.374';
+    const toTime = 'Aug 23, 2019 @ 16:18:51.821';
+    await this.timePicker.setAbsoluteRange(fromTime, toTime);
+  }
+
+  async setTimepickerInNoDataRange() {
+    this.log.debug('Reporting:setTimepickerInNoDataRange');
+    const fromTime = 'Sep 19, 1999 @ 06:31:44.000';
+    const toTime = 'Sep 23, 1999 @ 18:31:44.000';
+    await this.timePicker.setAbsoluteRange(fromTime, toTime);
   }
-  return new ReportingPage();
 }
diff --git a/x-pack/test/functional/page_objects/rollup_page.ts b/x-pack/test/functional/page_objects/rollup_page.ts
index dbdfa4e19c555..0740a8f015da1 100644
--- a/x-pack/test/functional/page_objects/rollup_page.ts
+++ b/x-pack/test/functional/page_objects/rollup_page.ts
@@ -7,137 +7,130 @@
 
 import expect from '@kbn/expect';
 import { map as mapAsync } from 'bluebird';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function RollupPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const log = getService('log');
-  const find = getService('find');
-  const PageObjects = getPageObjects(['header', 'common']);
-
-  class RollupJobPage {
-    async createNewRollUpJob(
-      jobName: string,
-      indexPattern: string,
-      indexName: string,
-      interval: string,
-      delay = '1d',
-      startImmediately = false,
-      scheduledTime = { time: 'minute', cron: true }
-    ) {
-      let stepNum = 1;
-      // Step 1
-      await testSubjects.click('createRollupJobButton');
-      await this.verifyStepIsActive(stepNum);
-      await this.addRollupNameandIndexPattern(jobName, indexPattern);
-      await this.verifyIndexPatternAccepted();
-      await this.setIndexName(indexName);
-      await this.setScheduleTime(scheduledTime.time, scheduledTime.cron);
-      await this.setRollupDelay(delay);
-      stepNum = await this.moveToNextStep(stepNum);
-
-      // Step 2: Histogram
-      await this.verifyStepIsActive(stepNum);
-      await this.setJobInterval(interval);
-      stepNum = await this.moveToNextStep(stepNum);
-
-      // Step 3: Terms (optional)
-      await this.verifyStepIsActive(stepNum);
-      stepNum = await this.moveToNextStep();
-
-      // Step 4: Histogram(optional)
-      await this.verifyStepIsActive(stepNum);
-      stepNum = await this.moveToNextStep();
-
-      // Step 5: Metrics(optional)
-      await this.verifyStepIsActive(stepNum);
-      stepNum = await this.moveToNextStep();
-
-      // Step 6: saveJob and verify the name in the list
-      await this.verifyStepIsActive(stepNum);
-      await this.saveJob(startImmediately);
-    }
+import { FtrService } from '../ftr_provider_context';
+
+export class RollupPageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly log = this.ctx.getService('log');
+  private readonly find = this.ctx.getService('find');
+  private readonly header = this.ctx.getPageObject('header');
+
+  async createNewRollUpJob(
+    jobName: string,
+    indexPattern: string,
+    indexName: string,
+    interval: string,
+    delay = '1d',
+    startImmediately = false,
+    scheduledTime = { time: 'minute', cron: true }
+  ) {
+    let stepNum = 1;
+    // Step 1
+    await this.testSubjects.click('createRollupJobButton');
+    await this.verifyStepIsActive(stepNum);
+    await this.addRollupNameandIndexPattern(jobName, indexPattern);
+    await this.verifyIndexPatternAccepted();
+    await this.setIndexName(indexName);
+    await this.setScheduleTime(scheduledTime.time, scheduledTime.cron);
+    await this.setRollupDelay(delay);
+    stepNum = await this.moveToNextStep(stepNum);
+
+    // Step 2: Histogram
+    await this.verifyStepIsActive(stepNum);
+    await this.setJobInterval(interval);
+    stepNum = await this.moveToNextStep(stepNum);
+
+    // Step 3: Terms (optional)
+    await this.verifyStepIsActive(stepNum);
+    stepNum = await this.moveToNextStep();
+
+    // Step 4: Histogram(optional)
+    await this.verifyStepIsActive(stepNum);
+    stepNum = await this.moveToNextStep();
+
+    // Step 5: Metrics(optional)
+    await this.verifyStepIsActive(stepNum);
+    stepNum = await this.moveToNextStep();
+
+    // Step 6: saveJob and verify the name in the list
+    await this.verifyStepIsActive(stepNum);
+    await this.saveJob(startImmediately);
+  }
 
-    async verifyStepIsActive(stepNumber = 0) {
-      await testSubjects.exists(`createRollupStep${stepNumber}--active`);
-    }
+  async verifyStepIsActive(stepNumber = 0) {
+    await this.testSubjects.exists(`createRollupStep${stepNumber}--active`);
+  }
 
-    async setScheduleTime(time: string, isCron: boolean) {
-      if (isCron) {
-        await testSubjects.click('rollupShowAdvancedCronLink');
-        await testSubjects.setValue('rollupAdvancedCron', time);
-      }
-      // TODO: Add handling for if Cron is false to go through clicking options.
+  async setScheduleTime(time: string, isCron: boolean) {
+    if (isCron) {
+      await this.testSubjects.click('rollupShowAdvancedCronLink');
+      await this.testSubjects.setValue('rollupAdvancedCron', time);
     }
+    // TODO: Add handling for if Cron is false to go through clicking options.
+  }
 
-    async addRollupNameandIndexPattern(name: string, indexPattern: string) {
-      log.debug(`Adding name ${name} to form`);
-      await testSubjects.setValue('rollupJobName', name);
-      await testSubjects.setValue('rollupIndexPattern', indexPattern);
-    }
+  async addRollupNameandIndexPattern(name: string, indexPattern: string) {
+    this.log.debug(`Adding name ${name} to form`);
+    await this.testSubjects.setValue('rollupJobName', name);
+    await this.testSubjects.setValue('rollupIndexPattern', indexPattern);
+  }
 
-    async setRollupDelay(time: string) {
-      log.debug(`Setting rollup delay to "${time}"`);
-      await testSubjects.setValue('rollupDelay', time);
-    }
+  async setRollupDelay(time: string) {
+    this.log.debug(`Setting rollup delay to "${time}"`);
+    await this.testSubjects.setValue('rollupDelay', time);
+  }
 
-    async verifyIndexPatternAccepted() {
-      const span = await testSubjects.find('fieldIndexPatternSuccessMessage');
-      const message = await span.findByCssSelector('p');
-      const text = await message.getVisibleText();
-      expect(text).to.be.equal('Success! Index pattern has matching indices.');
-    }
+  async verifyIndexPatternAccepted() {
+    const span = await this.testSubjects.find('fieldIndexPatternSuccessMessage');
+    const message = await span.findByCssSelector('p');
+    const text = await message.getVisibleText();
+    expect(text).to.be.equal('Success! Index pattern has matching indices.');
+  }
 
-    async setIndexName(name: string) {
-      await testSubjects.setValue('rollupIndexName', name);
-    }
+  async setIndexName(name: string) {
+    await this.testSubjects.setValue('rollupIndexName', name);
+  }
 
-    async moveToNextStep(stepNum = 0) {
-      await testSubjects.click('rollupJobNextButton');
-      return stepNum + 1;
-    }
+  async moveToNextStep(stepNum = 0) {
+    await this.testSubjects.click('rollupJobNextButton');
+    return stepNum + 1;
+  }
 
-    async setJobInterval(time: string) {
-      await testSubjects.setValue('rollupJobInterval', time);
-    }
+  async setJobInterval(time: string) {
+    await this.testSubjects.setValue('rollupJobInterval', time);
+  }
 
-    async saveJob(startImmediately: boolean) {
-      if (startImmediately) {
-        const checkbox = await find.byCssSelector('.euiCheckbox');
-        await checkbox.click();
-      }
-      await testSubjects.click('rollupJobSaveButton');
-      await PageObjects.header.waitUntilLoadingHasFinished();
+  async saveJob(startImmediately: boolean) {
+    if (startImmediately) {
+      const checkbox = await this.find.byCssSelector('.euiCheckbox');
+      await checkbox.click();
     }
+    await this.testSubjects.click('rollupJobSaveButton');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async getJobList() {
-      const jobs = await testSubjects.findAll('jobTableRow');
-      return mapAsync(jobs, async (job) => {
-        const jobNameElement = await job.findByTestSubject('jobTableCell-id');
-        const jobStatusElement = await job.findByTestSubject('jobTableCell-status');
-        const jobIndexPatternElement = await job.findByTestSubject('jobTableCell-indexPattern');
-        const jobRollUpIndexPatternElement = await job.findByTestSubject(
-          'jobTableCell-rollupIndex'
-        );
-        const jobDelayElement = await job.findByTestSubject('jobTableCell-rollupDelay');
-        const jobIntervalElement = await job.findByTestSubject(
-          'jobTableCell-dateHistogramInterval'
-        );
-        const jobGroupElement = await job.findByTestSubject('jobTableCell-groups');
-        const jobMetricsElement = await job.findByTestSubject('jobTableCell-metrics');
-
-        return {
-          jobName: await jobNameElement.getVisibleText(),
-          jobStatus: await jobStatusElement.getVisibleText(),
-          jobIndexPattern: await jobIndexPatternElement.getVisibleText(),
-          jobRollUpIndexPattern: await jobRollUpIndexPatternElement.getVisibleText(),
-          jobDelayElement: await jobDelayElement.getVisibleText(),
-          jobInterval: await jobIntervalElement.getVisibleText(),
-          jobGroup: await jobGroupElement.getVisibleText(),
-          jobMetrics: await jobMetricsElement.getVisibleText(),
-        };
-      });
-    }
+  async getJobList() {
+    const jobs = await this.testSubjects.findAll('jobTableRow');
+    return mapAsync(jobs, async (job) => {
+      const jobNameElement = await job.findByTestSubject('jobTableCell-id');
+      const jobStatusElement = await job.findByTestSubject('jobTableCell-status');
+      const jobIndexPatternElement = await job.findByTestSubject('jobTableCell-indexPattern');
+      const jobRollUpIndexPatternElement = await job.findByTestSubject('jobTableCell-rollupIndex');
+      const jobDelayElement = await job.findByTestSubject('jobTableCell-rollupDelay');
+      const jobIntervalElement = await job.findByTestSubject('jobTableCell-dateHistogramInterval');
+      const jobGroupElement = await job.findByTestSubject('jobTableCell-groups');
+      const jobMetricsElement = await job.findByTestSubject('jobTableCell-metrics');
+
+      return {
+        jobName: await jobNameElement.getVisibleText(),
+        jobStatus: await jobStatusElement.getVisibleText(),
+        jobIndexPattern: await jobIndexPatternElement.getVisibleText(),
+        jobRollUpIndexPattern: await jobRollUpIndexPatternElement.getVisibleText(),
+        jobDelayElement: await jobDelayElement.getVisibleText(),
+        jobInterval: await jobIntervalElement.getVisibleText(),
+        jobGroup: await jobGroupElement.getVisibleText(),
+        jobMetrics: await jobMetricsElement.getVisibleText(),
+      };
+    });
   }
-  return new RollupJobPage();
 }
diff --git a/x-pack/test/functional/page_objects/security_page.ts b/x-pack/test/functional/page_objects/security_page.ts
index 2ce14fa7a2515..437749d31c15e 100644
--- a/x-pack/test/functional/page_objects/security_page.ts
+++ b/x-pack/test/functional/page_objects/security_page.ts
@@ -6,130 +6,49 @@
  */
 
 import { adminTestUser } from '@kbn/test';
-import { FtrProviderContext } from '../ftr_provider_context';
+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';
 
-export function SecurityPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const browser = getService('browser');
-  const config = getService('config');
-  const retry = getService('retry');
-  const find = getService('find');
-  const log = getService('log');
-  const testSubjects = getService('testSubjects');
-  const esArchiver = getService('esArchiver');
-  const userMenu = getService('userMenu');
-  const comboBox = getService('comboBox');
-  const supertest = getService('supertestWithoutAuth');
-  const deployment = getService('deployment');
-  const PageObjects = getPageObjects(['common', 'header', 'error']);
-
-  interface LoginOptions {
-    expectSpaceSelector?: boolean;
-    expectSuccess?: boolean;
-    expectForbidden?: boolean;
-  }
-
-  type LoginExpectedResult = 'spaceSelector' | 'error' | 'chrome';
-
-  async function waitForLoginPage() {
-    log.debug('Waiting for Login Page to appear.');
-    await retry.waitForWithTimeout('login page', config.get('timeouts.waitFor') * 5, async () => {
-      // As a part of the cleanup flow tests usually try to log users out, but there are cases when
-      // browser/Kibana would like users to confirm that they want to navigate away from the current
-      // page and lose the state (e.g. unsaved changes) via native alert dialog.
-      const alert = await browser.getAlert();
-      if (alert && alert.accept) {
-        await alert.accept();
-      }
-      return await find.existsByDisplayedByCssSelector('.login-form');
-    });
-  }
-
-  async function isLoginFormVisible() {
-    return await testSubjects.exists('loginForm');
-  }
-
-  async function waitForLoginForm() {
-    log.debug('Waiting for Login Form to appear.');
-    await retry.waitForWithTimeout('login form', config.get('timeouts.waitFor') * 5, async () => {
-      return await isLoginFormVisible();
-    });
-  }
-
-  async function waitForLoginSelector() {
-    log.debug('Waiting for Login Selector to appear.');
-    await retry.waitForWithTimeout(
-      'login selector',
-      config.get('timeouts.waitFor') * 5,
-      async () => {
-        return await testSubjects.exists('loginSelector');
-      }
-    );
-  }
-
-  async function waitForLoginHelp(helpText: string) {
-    log.debug(`Waiting for Login Help to appear with text: ${helpText}.`);
-    await retry.waitForWithTimeout('login help', config.get('timeouts.waitFor') * 5, async () => {
-      return (await testSubjects.getVisibleText('loginHelp')) === helpText;
-    });
-  }
-
-  async function waitForLoginResult(expectedResult?: LoginExpectedResult) {
-    log.debug(`Waiting for login result, expected: ${expectedResult}.`);
-
-    // wait for either space selector, kibanaChrome or loginErrorMessage
-    if (expectedResult === 'spaceSelector') {
-      await retry.try(() => testSubjects.find('kibanaSpaceSelector'));
-      log.debug(
-        `Finished login process, landed on space selector. currentUrl = ${await browser.getCurrentUrl()}`
-      );
-      return;
-    }
-
-    if (expectedResult === 'error') {
-      const rawDataTabLocator = 'a[id=rawdata-tab]';
-      if (await find.existsByCssSelector(rawDataTabLocator)) {
-        // Firefox has 3 tabs and requires navigation to see Raw output
-        await find.clickByCssSelector(rawDataTabLocator);
-      }
-      await retry.try(async () => {
-        if (await find.existsByCssSelector(rawDataTabLocator)) {
-          await find.clickByCssSelector(rawDataTabLocator);
-        }
-        await testSubjects.existOrFail('ResetSessionButton');
-      });
-      log.debug(
-        `Finished login process, found reset session button message. currentUrl = ${await browser.getCurrentUrl()}`
-      );
-      return;
-    }
-
-    if (expectedResult === 'chrome') {
-      await find.byCssSelector(
-        '[data-test-subj="kibanaChrome"] .kbnAppWrapper:not(.kbnAppWrapper--hiddenChrome)',
-        20000
-      );
-      log.debug(`Finished login process currentUrl = ${await browser.getCurrentUrl()}`);
-    }
-  }
+interface LoginOptions {
+  expectSpaceSelector?: boolean;
+  expectSuccess?: boolean;
+  expectForbidden?: boolean;
+}
 
-  const loginPage = Object.freeze({
-    async login(username?: string, password?: string, options: LoginOptions = {}) {
-      if (!(await isLoginFormVisible())) {
-        await PageObjects.common.navigateToApp('login');
+type LoginExpectedResult = 'spaceSelector' | 'error' | 'chrome';
+
+export class SecurityPageObject extends FtrService {
+  private readonly browser = this.ctx.getService('browser');
+  private readonly config = this.ctx.getService('config');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly find = this.ctx.getService('find');
+  private readonly log = this.ctx.getService('log');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly esArchiver = this.ctx.getService('esArchiver');
+  private readonly userMenu = this.ctx.getService('userMenu');
+  private readonly comboBox = this.ctx.getService('comboBox');
+  private readonly supertest = this.ctx.getService('supertestWithoutAuth');
+  private readonly deployment = this.ctx.getService('deployment');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly header = this.ctx.getPageObject('header');
+
+  public loginPage = Object.freeze({
+    login: async (username?: string, password?: string, options: LoginOptions = {}) => {
+      if (!(await this.isLoginFormVisible())) {
+        await this.common.navigateToApp('login');
       }
 
       // ensure welcome screen won't be shown. This is relevant for environments which don't allow
       // to use the yml setting, e.g. cloud
-      await browser.setLocalStorageItem('home:welcome:show', 'false');
-      await waitForLoginForm();
+      await this.browser.setLocalStorageItem('home:welcome:show', 'false');
+      await this.waitForLoginForm();
 
-      await testSubjects.setValue('loginUsername', username || adminTestUser.username);
-      await testSubjects.setValue('loginPassword', password || adminTestUser.password);
-      await testSubjects.click('loginSubmit');
+      await this.testSubjects.setValue('loginUsername', username || adminTestUser.username);
+      await this.testSubjects.setValue('loginPassword', password || adminTestUser.password);
+      await this.testSubjects.click('loginSubmit');
 
-      await waitForLoginResult(
+      await this.waitForLoginResult(
         options.expectSpaceSelector
           ? 'spaceSelector'
           : options.expectForbidden
@@ -140,9 +59,11 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
       );
     },
 
-    async getErrorMessage() {
-      return await retry.try(async () => {
-        const errorMessageContainer = await retry.try(() => testSubjects.find('loginErrorMessage'));
+    getErrorMessage: async () => {
+      return await this.retry.try(async () => {
+        const errorMessageContainer = await this.retry.try(() =>
+          this.testSubjects.find('loginErrorMessage')
+        );
         const errorMessageText = await errorMessageContainer.getVisibleText();
 
         if (!errorMessageText) {
@@ -154,380 +75,477 @@ export function SecurityPageProvider({ getService, getPageObjects }: FtrProvider
     },
   });
 
-  const loginSelector = Object.freeze({
-    async login(providerType: string, providerName: string, options?: Record<string, any>) {
-      log.debug(`Starting login flow for ${providerType}/${providerName}`);
+  public loginSelector = Object.freeze({
+    login: async (providerType: string, providerName: string, options?: Record<string, any>) => {
+      this.log.debug(`Starting login flow for ${providerType}/${providerName}`);
 
-      await this.verifyLoginSelectorIsVisible();
-      await this.selectLoginMethod(providerType, providerName);
+      await this.loginSelector.verifyLoginSelectorIsVisible();
+      await this.loginSelector.selectLoginMethod(providerType, providerName);
 
       if (providerType === 'basic' || providerType === 'token') {
-        await waitForLoginForm();
+        await this.waitForLoginForm();
 
-        await testSubjects.setValue('loginUsername', options?.username ?? adminTestUser.username);
-        await testSubjects.setValue('loginPassword', options?.password ?? adminTestUser.password);
-        await testSubjects.click('loginSubmit');
+        await this.testSubjects.setValue(
+          'loginUsername',
+          options?.username ?? adminTestUser.username
+        );
+        await this.testSubjects.setValue(
+          'loginPassword',
+          options?.password ?? adminTestUser.password
+        );
+        await this.testSubjects.click('loginSubmit');
       }
 
-      await waitForLoginResult('chrome');
+      await this.waitForLoginResult('chrome');
 
-      log.debug(`Finished login process currentUrl = ${await browser.getCurrentUrl()}`);
+      this.log.debug(`Finished login process currentUrl = ${await this.browser.getCurrentUrl()}`);
     },
 
-    async selectLoginMethod(providerType: string, providerName: string) {
+    selectLoginMethod: async (providerType: string, providerName: string) => {
       // Ensure welcome screen won't be shown. This is relevant for environments which don't allow
       // to use the yml setting, e.g. cloud.
-      await browser.setLocalStorageItem('home:welcome:show', 'false');
-      await testSubjects.click(`loginCard-${providerType}/${providerName}`);
+      await this.browser.setLocalStorageItem('home:welcome:show', 'false');
+      await this.testSubjects.click(`loginCard-${providerType}/${providerName}`);
     },
 
-    async verifyLoginFormIsVisible() {
-      await waitForLoginForm();
+    verifyLoginFormIsVisible: async () => {
+      await this.waitForLoginForm();
     },
 
-    async verifyLoginSelectorIsVisible() {
-      await waitForLoginSelector();
+    verifyLoginSelectorIsVisible: async () => {
+      await this.waitForLoginSelector();
     },
 
-    async verifyLoginHelpIsVisible(helpText: string) {
-      await waitForLoginHelp(helpText);
+    verifyLoginHelpIsVisible: async (helpText: string) => {
+      await this.waitForLoginHelp(helpText);
     },
   });
 
-  class SecurityPage {
-    public loginPage = loginPage;
-    public loginSelector = loginSelector;
-
-    async initTests() {
-      log.debug('SecurityPage:initTests');
-      await esArchiver.load('empty_kibana');
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await browser.setWindowSize(1600, 1000);
-    }
+  private async waitForLoginPage() {
+    this.log.debug('Waiting for Login Page to appear.');
+    await this.retry.waitForWithTimeout(
+      'login page',
+      this.config.get('timeouts.waitFor') * 5,
+      async () => {
+        // As a part of the cleanup flow tests usually try to log users out, but there are cases when
+        // browser/Kibana would like users to confirm that they want to navigate away from the current
+        // page and lose the state (e.g. unsaved changes) via native alert dialog.
+        const alert = await this.browser.getAlert();
+        if (alert && alert.accept) {
+          await alert.accept();
+        }
+        return await this.find.existsByDisplayedByCssSelector('.login-form');
+      }
+    );
+  }
 
-    async login(username?: string, password?: string, options: LoginOptions = {}) {
-      await this.loginPage.login(username, password, options);
+  private async isLoginFormVisible() {
+    return await this.testSubjects.exists('loginForm');
+  }
 
-      if (options.expectSpaceSelector || options.expectForbidden) {
-        return;
+  private async waitForLoginForm() {
+    this.log.debug('Waiting for Login Form to appear.');
+    await this.retry.waitForWithTimeout(
+      'login form',
+      this.config.get('timeouts.waitFor') * 5,
+      async () => {
+        return await this.isLoginFormVisible();
       }
+    );
+  }
 
-      await retry.waitFor('logout button visible', async () => await userMenu.logoutLinkExists());
-    }
-
-    async logout() {
-      log.debug('SecurityPage.logout');
+  private async waitForLoginSelector() {
+    this.log.debug('Waiting for Login Selector to appear.');
+    await this.retry.waitForWithTimeout(
+      'login selector',
+      this.config.get('timeouts.waitFor') * 5,
+      async () => {
+        return await this.testSubjects.exists('loginSelector');
+      }
+    );
+  }
 
-      if (!(await userMenu.logoutLinkExists())) {
-        log.debug('Logout not found');
-        return;
+  private async waitForLoginHelp(helpText: string) {
+    this.log.debug(`Waiting for Login Help to appear with text: ${helpText}.`);
+    await this.retry.waitForWithTimeout(
+      'login help',
+      this.config.get('timeouts.waitFor') * 5,
+      async () => {
+        return (await this.testSubjects.getVisibleText('loginHelp')) === helpText;
       }
+    );
+  }
+
+  private async waitForLoginResult(expectedResult?: LoginExpectedResult) {
+    this.log.debug(`Waiting for login result, expected: ${expectedResult}.`);
 
-      await userMenu.clickLogoutButton();
-      await waitForLoginPage();
+    // wait for either space selector, kibanaChrome or loginErrorMessage
+    if (expectedResult === 'spaceSelector') {
+      await this.retry.try(() => this.testSubjects.find('kibanaSpaceSelector'));
+      this.log.debug(
+        `Finished login process, landed on space selector. currentUrl = ${await this.browser.getCurrentUrl()}`
+      );
+      return;
     }
 
-    async getCurrentUser() {
-      const sidCookie = await browser.getCookie('sid');
-      if (!sidCookie?.value) {
-        log.debug('User is not authenticated yet.');
-        return null;
+    if (expectedResult === 'error') {
+      const rawDataTabLocator = 'a[id=rawdata-tab]';
+      if (await this.find.existsByCssSelector(rawDataTabLocator)) {
+        // Firefox has 3 tabs and requires navigation to see Raw output
+        await this.find.clickByCssSelector(rawDataTabLocator);
       }
+      await this.retry.try(async () => {
+        if (await this.find.existsByCssSelector(rawDataTabLocator)) {
+          await this.find.clickByCssSelector(rawDataTabLocator);
+        }
+        await this.testSubjects.existOrFail('ResetSessionButton');
+      });
+      this.log.debug(
+        `Finished login process, found reset session button message. currentUrl = ${await this.browser.getCurrentUrl()}`
+      );
+      return;
+    }
 
-      const { body: user } = await supertest
-        .get('/internal/security/me')
-        .set('kbn-xsrf', 'xxx')
-        .set('Cookie', `sid=${sidCookie.value}`)
-        .expect(200);
-      return user as AuthenticatedUser;
+    if (expectedResult === 'chrome') {
+      await this.find.byCssSelector(
+        '[data-test-subj="kibanaChrome"] .kbnAppWrapper:not(.kbnAppWrapper--hiddenChrome)',
+        20000
+      );
+      this.log.debug(`Finished login process currentUrl = ${await this.browser.getCurrentUrl()}`);
     }
+  }
 
-    async forceLogout() {
-      log.debug('SecurityPage.forceLogout');
-      if (await find.existsByDisplayedByCssSelector('.login-form', 100)) {
-        log.debug('Already on the login page, not forcing anything');
-        return;
-      }
+  async initTests() {
+    this.log.debug('SecurityPage:initTests');
+    await this.esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
+    await this.esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+    await this.browser.setWindowSize(1600, 1000);
+  }
 
-      log.debug('Redirecting to /logout to force the logout');
-      const url = deployment.getHostPort() + '/logout';
-      await browser.get(url);
-      log.debug('Waiting on the login form to appear');
-      await waitForLoginPage();
-    }
+  async login(username?: string, password?: string, options: LoginOptions = {}) {
+    await this.loginPage.login(username, password, options);
 
-    async clickRolesSection() {
-      await testSubjects.click('roles');
+    if (options.expectSpaceSelector || options.expectForbidden) {
+      return;
     }
 
-    async clickUsersSection() {
-      await testSubjects.click('users');
-    }
+    await this.retry.waitFor(
+      'logout button visible',
+      async () => await this.userMenu.logoutLinkExists()
+    );
+  }
 
-    async clickCreateNewUser() {
-      await retry.try(() => testSubjects.click('createUserButton'));
-    }
+  async logout() {
+    this.log.debug('SecurityPage.logout');
 
-    async clickCreateNewRole() {
-      await retry.try(() => testSubjects.click('createRoleButton'));
+    if (!(await this.userMenu.logoutLinkExists())) {
+      this.log.debug('Logout not found');
+      return;
     }
 
-    async clickCloneRole(roleName: string) {
-      await retry.try(() => testSubjects.click(`clone-role-action-${roleName}`));
-    }
+    await this.userMenu.clickLogoutButton();
+    await this.waitForLoginPage();
+  }
 
-    async clickCancelEditUser() {
-      await find.clickByButtonText('Cancel');
+  async getCurrentUser() {
+    const sidCookie = await this.browser.getCookie('sid');
+    if (!sidCookie?.value) {
+      this.log.debug('User is not authenticated yet.');
+      return null;
     }
 
-    async clickCancelEditRole() {
-      await testSubjects.click('roleFormCancelButton');
-    }
+    const { body: user } = await this.supertest
+      .get('/internal/security/me')
+      .set('kbn-xsrf', 'xxx')
+      .set('Cookie', `sid=${sidCookie.value}`)
+      .expect(200);
+    return user as AuthenticatedUser;
+  }
 
-    async clickSaveEditUser() {
-      await find.clickByButtonText('Update user');
-      await PageObjects.header.waitUntilLoadingHasFinished();
+  async forceLogout() {
+    this.log.debug('SecurityPage.forceLogout');
+    if (await this.find.existsByDisplayedByCssSelector('.login-form', 100)) {
+      this.log.debug('Already on the login page, not forcing anything');
+      return;
     }
 
-    async clickSaveCreateUser() {
-      await find.clickByButtonText('Create user');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+    this.log.debug('Redirecting to /logout to force the logout');
+    const url = this.deployment.getHostPort() + '/logout';
+    await this.browser.get(url);
+    this.log.debug('Waiting on the login form to appear');
+    await this.waitForLoginPage();
+  }
 
-    async clickSaveEditRole() {
-      const saveButton = await retry.try(() => testSubjects.find('roleFormSaveButton'));
-      await saveButton.moveMouseTo();
-      await saveButton.click();
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async clickRolesSection() {
+    await this.testSubjects.click('roles');
+  }
 
-    async addIndexToRole(index: string) {
-      log.debug(`Adding index ${index} to role`);
-      await comboBox.setCustom('indicesInput0', index);
-    }
+  async clickUsersSection() {
+    await this.testSubjects.click('users');
+  }
 
-    async addPrivilegeToRole(privilege: string) {
-      log.debug(`Adding privilege ${privilege} to role`);
-      const privilegeInput = await retry.try(() =>
-        find.byCssSelector('[data-test-subj="privilegesInput0"] input')
-      );
-      await privilegeInput.type(privilege);
+  async clickCreateNewUser() {
+    await this.retry.try(() => this.testSubjects.click('createUserButton'));
+  }
 
-      const btn = await find.byButtonText(privilege);
-      await btn.click();
+  async clickCreateNewRole() {
+    await this.retry.try(() => this.testSubjects.click('createRoleButton'));
+  }
 
-      // const options = await find.byCssSelector(`.euiFilterSelectItem`);
-      // Object.entries(options).forEach(([key, prop]) => {
-      //   console.log({ key, proto: prop.__proto__ });
-      // });
+  async clickCloneRole(roleName: string) {
+    await this.retry.try(() => this.testSubjects.click(`clone-role-action-${roleName}`));
+  }
 
-      // await options.click();
-    }
+  async clickCancelEditUser() {
+    await this.find.clickByButtonText('Cancel');
+  }
 
-    async assignRoleToUser(role: string) {
-      await this.selectRole(role);
-    }
+  async clickCancelEditRole() {
+    await this.testSubjects.click('roleFormCancelButton');
+  }
 
-    async navigateTo() {
-      await PageObjects.common.navigateToApp('settings');
-    }
+  async clickSaveEditUser() {
+    await this.find.clickByButtonText('Update user');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async clickElasticsearchUsers() {
-      await this.navigateTo();
-      await this.clickUsersSection();
-    }
+  async clickSaveCreateUser() {
+    await this.find.clickByButtonText('Create user');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async clickElasticsearchRoles() {
-      await this.navigateTo();
-      await this.clickRolesSection();
-    }
+  async clickSaveEditRole() {
+    const saveButton = await this.retry.try(() => this.testSubjects.find('roleFormSaveButton'));
+    await saveButton.moveMouseTo();
+    await saveButton.click();
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async getElasticsearchUsers() {
-      const users = [];
-      await testSubjects.click('tablePaginationPopoverButton');
-      await testSubjects.click('tablePagination-100-rows');
-      for (const user of await testSubjects.findAll('userRow')) {
-        const fullnameElement = await user.findByTestSubject('userRowFullName');
-        const usernameElement = await user.findByTestSubject('userRowUserName');
-        const emailElement = await user.findByTestSubject('userRowEmail');
-        const rolesElement = await user.findByTestSubject('userRowRoles');
-        // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
-        const isUserReserved = (await user.findAllByTestSubject('userReserved', 1)).length > 0;
-        const isUserDeprecated = (await user.findAllByTestSubject('userDeprecated', 1)).length > 0;
-
-        users.push({
-          username: await usernameElement.getVisibleText(),
-          fullname: await fullnameElement.getVisibleText(),
-          email: await emailElement.getVisibleText(),
-          roles: (await rolesElement.getVisibleText()).split('\n').map((role) => role.trim()),
-          reserved: isUserReserved,
-          deprecated: isUserDeprecated,
-        });
-      }
+  async addIndexToRole(index: string) {
+    this.log.debug(`Adding index ${index} to role`);
+    await this.comboBox.setCustom('indicesInput0', index);
+  }
 
-      return users;
-    }
+  async addPrivilegeToRole(privilege: string) {
+    this.log.debug(`Adding privilege ${privilege} to role`);
+    const privilegeInput = await this.retry.try(() =>
+      this.find.byCssSelector('[data-test-subj="privilegesInput0"] input')
+    );
+    await privilegeInput.type(privilege);
 
-    async getElasticsearchRoles() {
-      const roles = [];
-      await testSubjects.click('tablePaginationPopoverButton');
-      await testSubjects.click('tablePagination-100-rows');
-      for (const role of await testSubjects.findAll('roleRow')) {
-        const [rolename, reserved, deprecated] = await Promise.all([
-          role.findByTestSubject('roleRowName').then((el) => el.getVisibleText()),
-          // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
-          role.findAllByTestSubject('roleReserved', 1).then((el) => el.length > 0),
-          // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
-          role.findAllByTestSubject('roleDeprecated', 1).then((el) => el.length > 0),
-        ]);
-
-        roles.push({ rolename, reserved, deprecated });
-      }
+    const btn = await this.find.byButtonText(privilege);
+    await btn.click();
 
-      return roles;
-    }
+    // const options = await this.find.byCssSelector(`.euiFilterSelectItem`);
+    // Object.entries(options).forEach(([key, prop]) => {
+    //   console.log({ key, proto: prop.__proto__ });
+    // });
 
-    /**
-     * @deprecated Use `PageObjects.security.clickCreateNewUser` instead
-     */
-    async clickNewUser() {
-      return await testSubjects.click('createUserButton');
-    }
+    // await options.click();
+  }
 
-    /**
-     * @deprecated Use `PageObjects.security.clickCreateNewUser` instead
-     */
-    async clickNewRole() {
-      return await testSubjects.click('createRoleButton');
-    }
+  async assignRoleToUser(role: string) {
+    await this.selectRole(role);
+  }
 
-    async fillUserForm(user: UserFormValues) {
-      if (user.username) {
-        await find.setValue('[name=username]', user.username);
-      }
-      if (user.password) {
-        await find.setValue('[name=password]', user.password);
-      }
-      if (user.confirm_password) {
-        await find.setValue('[name=confirm_password]', user.confirm_password);
-      }
-      if (user.full_name) {
-        await find.setValue('[name=full_name]', user.full_name);
-      }
-      if (user.email) {
-        await find.setValue('[name=email]', user.email);
-      }
+  async navigateTo() {
+    await this.common.navigateToApp('settings');
+  }
 
-      const rolesToAdd = user.roles || [];
-      for (let i = 0; i < rolesToAdd.length; i++) {
-        await this.selectRole(rolesToAdd[i]);
-      }
+  async clickElasticsearchUsers() {
+    await this.navigateTo();
+    await this.clickUsersSection();
+  }
+
+  async clickElasticsearchRoles() {
+    await this.navigateTo();
+    await this.clickRolesSection();
+  }
+
+  async getElasticsearchUsers() {
+    const users = [];
+    await this.testSubjects.click('tablePaginationPopoverButton');
+    await this.testSubjects.click('tablePagination-100-rows');
+    for (const user of await this.testSubjects.findAll('userRow')) {
+      const fullnameElement = await user.findByTestSubject('userRowFullName');
+      const usernameElement = await user.findByTestSubject('userRowUserName');
+      const emailElement = await user.findByTestSubject('userRowEmail');
+      const rolesElement = await user.findByTestSubject('userRowRoles');
+      // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
+      const isUserReserved = (await user.findAllByTestSubject('userReserved', 1)).length > 0;
+      const isUserDeprecated = (await user.findAllByTestSubject('userDeprecated', 1)).length > 0;
+
+      users.push({
+        username: await usernameElement.getVisibleText(),
+        fullname: await fullnameElement.getVisibleText(),
+        email: await emailElement.getVisibleText(),
+        roles: (await rolesElement.getVisibleText()).split('\n').map((role) => role.trim()),
+        reserved: isUserReserved,
+        deprecated: isUserDeprecated,
+      });
     }
 
-    async submitCreateUserForm() {
-      await find.clickByButtonText('Create user');
+    return users;
+  }
+
+  async getElasticsearchRoles() {
+    const roles = [];
+    await this.testSubjects.click('tablePaginationPopoverButton');
+    await this.testSubjects.click('tablePagination-100-rows');
+    for (const role of await this.testSubjects.findAll('roleRow')) {
+      const [rolename, reserved, deprecated] = await Promise.all([
+        role.findByTestSubject('roleRowName').then((el) => el.getVisibleText()),
+        // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
+        role.findAllByTestSubject('roleReserved', 1).then((el) => el.length > 0),
+        // findAll is substantially faster than `find.descendantExistsByCssSelector for negative cases
+        role.findAllByTestSubject('roleDeprecated', 1).then((el) => el.length > 0),
+      ]);
+
+      roles.push({ rolename, reserved, deprecated });
     }
 
-    async createUser(user: UserFormValues) {
-      await this.clickElasticsearchUsers();
-      await this.clickCreateNewUser();
-      await this.fillUserForm(user);
-      await this.submitCreateUserForm();
+    return roles;
+  }
+
+  /**
+   * @deprecated Use `this.security.clickCreateNewUser` instead
+   */
+  async clickNewUser() {
+    return await this.testSubjects.click('createUserButton');
+  }
+
+  /**
+   * @deprecated Use `this.security.clickCreateNewUser` instead
+   */
+  async clickNewRole() {
+    return await this.testSubjects.click('createRoleButton');
+  }
+
+  async fillUserForm(user: UserFormValues) {
+    if (user.username) {
+      await this.find.setValue('[name=username]', user.username);
+    }
+    if (user.password) {
+      await this.find.setValue('[name=password]', user.password);
+    }
+    if (user.confirm_password) {
+      await this.find.setValue('[name=confirm_password]', user.confirm_password);
+    }
+    if (user.full_name) {
+      await this.find.setValue('[name=full_name]', user.full_name);
+    }
+    if (user.email) {
+      await this.find.setValue('[name=email]', user.email);
     }
 
-    async addRole(roleName: string, roleObj: Role) {
-      const self = this;
+    const rolesToAdd = user.roles || [];
+    for (let i = 0; i < rolesToAdd.length; i++) {
+      await this.selectRole(rolesToAdd[i]);
+    }
+  }
 
-      await this.clickCreateNewRole();
+  async submitCreateUserForm() {
+    await this.find.clickByButtonText('Create user');
+  }
 
-      // We have to use non-test-subject selectors because this markup is generated by ui-select.
-      log.debug('roleObj.indices[0].names = ' + roleObj.elasticsearch.indices[0].names);
-      await testSubjects.append('roleFormNameInput', roleName);
+  async createUser(user: UserFormValues) {
+    await this.clickElasticsearchUsers();
+    await this.clickCreateNewUser();
+    await this.fillUserForm(user);
+    await this.submitCreateUserForm();
+  }
 
-      for (const indexName of roleObj.elasticsearch.indices[0].names) {
-        await comboBox.setCustom('indicesInput0', indexName);
-      }
+  async addRole(roleName: string, roleObj: Role) {
+    const self = this;
 
-      if (roleObj.elasticsearch.indices[0].query) {
-        await testSubjects.click('restrictDocumentsQuery0');
-        await testSubjects.setValue('queryInput0', roleObj.elasticsearch.indices[0].query);
-      }
+    await this.clickCreateNewRole();
 
-      const globalPrivileges = (roleObj.kibana as any).global;
-      if (globalPrivileges) {
-        for (const privilegeName of globalPrivileges) {
-          await testSubjects.click('addSpacePrivilegeButton');
+    // We have to use non-test-subject selectors because this markup is generated by ui-select.
+    this.log.debug('roleObj.indices[0].names = ' + roleObj.elasticsearch.indices[0].names);
+    await this.testSubjects.append('roleFormNameInput', roleName);
 
-          await testSubjects.click('spaceSelectorComboBox');
+    for (const indexName of roleObj.elasticsearch.indices[0].names) {
+      await this.comboBox.setCustom('indicesInput0', indexName);
+    }
 
-          const globalSpaceOption = await find.byCssSelector(`#spaceOption_\\*`);
-          await globalSpaceOption.click();
+    if (roleObj.elasticsearch.indices[0].query) {
+      await this.testSubjects.click('restrictDocumentsQuery0');
+      await this.testSubjects.setValue('queryInput0', roleObj.elasticsearch.indices[0].query);
+    }
 
-          await testSubjects.click(`basePrivilege_${privilegeName}`);
+    const globalPrivileges = (roleObj.kibana as any).global;
+    if (globalPrivileges) {
+      for (const privilegeName of globalPrivileges) {
+        await this.testSubjects.click('addSpacePrivilegeButton');
 
-          await testSubjects.click('createSpacePrivilegeButton');
-        }
-      }
+        await this.testSubjects.click('spaceSelectorComboBox');
 
-      function addPrivilege(privileges: string[]) {
-        return privileges.reduce(function (promise: Promise<any>, privilegeName: string) {
-          return promise
-            .then(() => self.addPrivilegeToRole(privilegeName))
-            .then(() => PageObjects.common.sleep(250));
-        }, Promise.resolve());
-      }
+        const globalSpaceOption = await this.find.byCssSelector(`#spaceOption_\\*`);
+        await globalSpaceOption.click();
 
-      await addPrivilege(roleObj.elasticsearch.indices[0].privileges);
+        await this.testSubjects.click(`basePrivilege_${privilegeName}`);
 
-      async function addGrantedField(fields: string[]) {
-        for (const entry of fields) {
-          await comboBox.setCustom('fieldInput0', entry);
-        }
+        await this.testSubjects.click('createSpacePrivilegeButton');
       }
+    }
 
-      // clicking the Granted fields and removing the asterix
-      if (roleObj.elasticsearch.indices[0].field_security) {
-        // Toggle FLS switch
-        await testSubjects.click('restrictFieldsQuery0');
+    const addPrivilege = (privileges: string[]) => {
+      return privileges.reduce((promise: Promise<any>, privilegeName: string) => {
+        return promise
+          .then(() => self.addPrivilegeToRole(privilegeName))
+          .then(() => this.common.sleep(250));
+      }, Promise.resolve());
+    };
 
-        // have to remove the '*'
-        await find.clickByCssSelector(
-          'div[data-test-subj="fieldInput0"] [title="Remove * from selection in this group"] svg.euiIcon'
-        );
+    await addPrivilege(roleObj.elasticsearch.indices[0].privileges);
 
-        await addGrantedField(roleObj.elasticsearch.indices[0].field_security!.grant!);
+    const addGrantedField = async (fields: string[]) => {
+      for (const entry of fields) {
+        await this.comboBox.setCustom('fieldInput0', entry);
       }
+    };
 
-      log.debug('click save button');
-      await testSubjects.click('roleFormSaveButton');
+    // clicking the Granted fields and removing the asterix
+    if (roleObj.elasticsearch.indices[0].field_security) {
+      // Toggle FLS switch
+      await this.testSubjects.click('restrictFieldsQuery0');
 
-      // Signifies that the role management page redirected back to the role grid page,
-      // and successfully refreshed the grid
-      await testSubjects.existOrFail('roleRow');
-    }
+      // have to remove the '*'
+      await this.find.clickByCssSelector(
+        'div[data-test-subj="fieldInput0"] [title="Remove * from selection in this group"] svg.euiIcon'
+      );
 
-    async selectRole(role: string) {
-      const dropdown = await testSubjects.find('rolesDropdown');
-      const input = await dropdown.findByCssSelector('input');
-      await input.type(role);
-      await find.clickByCssSelector(`[role=option][title="${role}"]`);
-      await testSubjects.click('comboBoxToggleListButton');
+      await addGrantedField(roleObj.elasticsearch.indices[0].field_security!.grant!);
     }
 
-    async deleteUser(username: string) {
-      log.debug('Delete user ' + username);
-      await find.clickByDisplayedLinkText(username);
-      await PageObjects.header.awaitGlobalLoadingIndicatorHidden();
+    this.log.debug('click save button');
+    await this.testSubjects.click('roleFormSaveButton');
+
+    // Signifies that the role management page redirected back to the role grid page,
+    // and successfully refreshed the grid
+    await this.testSubjects.existOrFail('roleRow');
+  }
 
-      log.debug('Find delete button and click');
-      await find.clickByButtonText('Delete user');
-      await PageObjects.common.sleep(2000);
+  async selectRole(role: string) {
+    const dropdown = await this.testSubjects.find('rolesDropdown');
+    const input = await dropdown.findByCssSelector('input');
+    await input.type(role);
+    await this.find.clickByCssSelector(`[role=option][title="${role}"]`);
+    await this.testSubjects.click('comboBoxToggleListButton');
+  }
 
-      const confirmText = await testSubjects.getVisibleText('confirmModalBodyText');
-      log.debug('Delete user alert text = ' + confirmText);
-      await testSubjects.click('confirmModalConfirmButton');
-      return confirmText;
-    }
+  async deleteUser(username: string) {
+    this.log.debug('Delete user ' + username);
+    await this.find.clickByDisplayedLinkText(username);
+    await this.header.awaitGlobalLoadingIndicatorHidden();
+
+    this.log.debug('Find delete button and click');
+    await this.find.clickByButtonText('Delete user');
+    await this.common.sleep(2000);
+
+    const confirmText = await this.testSubjects.getVisibleText('confirmModalBodyText');
+    this.log.debug('Delete user alert text = ' + confirmText);
+    await this.testSubjects.click('confirmModalConfirmButton');
+    return confirmText;
   }
-  return new SecurityPage();
 }
diff --git a/x-pack/test/functional/page_objects/space_selector_page.ts b/x-pack/test/functional/page_objects/space_selector_page.ts
index 0a41e4b90287f..9e05ae1f2c42b 100644
--- a/x-pack/test/functional/page_objects/space_selector_page.ts
+++ b/x-pack/test/functional/page_objects/space_selector_page.ts
@@ -6,191 +6,187 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function SpaceSelectorPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const retry = getService('retry');
-  const log = getService('log');
-  const testSubjects = getService('testSubjects');
-  const browser = getService('browser');
-  const find = getService('find');
-  const PageObjects = getPageObjects(['common']);
-
-  class SpaceSelectorPage {
-    async initTests() {
-      log.debug('SpaceSelectorPage:initTests');
-    }
-
-    async clickSpaceCard(spaceId: string) {
-      return await retry.try(async () => {
-        log.info(`SpaceSelectorPage:clickSpaceCard(${spaceId})`);
-        await testSubjects.click(`space-card-${spaceId}`);
-        await PageObjects.common.sleep(1000);
-      });
-    }
+import { FtrService } from '../ftr_provider_context';
+
+export class SpaceSelectorPageObject extends FtrService {
+  private readonly retry = this.ctx.getService('retry');
+  private readonly log = this.ctx.getService('log');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly find = this.ctx.getService('find');
+  private readonly common = this.ctx.getPageObject('common');
+
+  async initTests() {
+    this.log.debug('SpaceSelectorPage:initTests');
+  }
 
-    async expectHomePage(spaceId: string) {
-      return await this.expectRoute(spaceId, `/app/home#/`);
-    }
+  async clickSpaceCard(spaceId: string) {
+    return await this.retry.try(async () => {
+      this.log.info(`SpaceSelectorPage:clickSpaceCard(${spaceId})`);
+      await this.testSubjects.click(`space-card-${spaceId}`);
+      await this.common.sleep(1000);
+    });
+  }
 
-    async expectRoute(spaceId: string, route: string) {
-      return await retry.try(async () => {
-        log.debug(`expectRoute(${spaceId}, ${route})`);
-        await find.byCssSelector('[data-test-subj="kibanaChrome"] nav:not(.ng-hide) ', 20000);
-        const url = await browser.getCurrentUrl();
-        if (spaceId === 'default') {
-          expect(url).to.contain(route);
-        } else {
-          expect(url).to.contain(`/s/${spaceId}${route}`);
-        }
-      });
-    }
+  async expectHomePage(spaceId: string) {
+    return await this.expectRoute(spaceId, `/app/home#/`);
+  }
 
-    async openSpacesNav() {
-      log.debug('openSpacesNav()');
-      return await testSubjects.click('spacesNavSelector');
-    }
+  async expectRoute(spaceId: string, route: string) {
+    return await this.retry.try(async () => {
+      this.log.debug(`expectRoute(${spaceId}, ${route})`);
+      await this.find.byCssSelector('[data-test-subj="kibanaChrome"] nav:not(.ng-hide) ', 20000);
+      const url = await this.browser.getCurrentUrl();
+      if (spaceId === 'default') {
+        expect(url).to.contain(route);
+      } else {
+        expect(url).to.contain(`/s/${spaceId}${route}`);
+      }
+    });
+  }
 
-    async clickManageSpaces() {
-      await testSubjects.click('manageSpaces');
-    }
+  async openSpacesNav() {
+    this.log.debug('openSpacesNav()');
+    return await this.testSubjects.click('spacesNavSelector');
+  }
 
-    async clickCreateSpace() {
-      await testSubjects.click('createSpace');
-    }
+  async clickManageSpaces() {
+    await this.testSubjects.click('manageSpaces');
+  }
 
-    async clickEnterSpaceName() {
-      await testSubjects.click('addSpaceName');
-    }
+  async clickCreateSpace() {
+    await this.testSubjects.click('createSpace');
+  }
 
-    async addSpaceName(spaceName: string) {
-      await testSubjects.setValue('addSpaceName', spaceName);
-    }
+  async clickEnterSpaceName() {
+    await this.testSubjects.click('addSpaceName');
+  }
 
-    async clickCustomizeSpaceAvatar(spaceId: string) {
-      await testSubjects.click(`space-avatar-${spaceId}`);
-    }
+  async addSpaceName(spaceName: string) {
+    await this.testSubjects.setValue('addSpaceName', spaceName);
+  }
 
-    async clickSpaceInitials() {
-      await testSubjects.click('spaceLetterInitial');
-    }
+  async clickCustomizeSpaceAvatar(spaceId: string) {
+    await this.testSubjects.click(`space-avatar-${spaceId}`);
+  }
 
-    async addSpaceInitials(spaceInitials: string) {
-      await testSubjects.setValue('spaceLetterInitial', spaceInitials);
-    }
+  async clickSpaceInitials() {
+    await this.testSubjects.click('spaceLetterInitial');
+  }
 
-    async clickColorPicker() {
-      await testSubjects.click('colorPickerAnchor');
-    }
+  async addSpaceInitials(spaceInitials: string) {
+    await this.testSubjects.setValue('spaceLetterInitial', spaceInitials);
+  }
 
-    async setColorinPicker(hexValue: string) {
-      await testSubjects.setValue('colorPickerAnchor', hexValue);
-    }
+  async clickColorPicker() {
+    await this.testSubjects.click('colorPickerAnchor');
+  }
 
-    async clickShowFeatures() {
-      await testSubjects.click('show-hide-section-link');
-    }
+  async setColorinPicker(hexValue: string) {
+    await this.testSubjects.setValue('colorPickerAnchor', hexValue);
+  }
 
-    async clickChangeAllPriv() {
-      await testSubjects.click('changeAllPrivilegesButton');
-    }
+  async clickShowFeatures() {
+    await this.testSubjects.click('show-hide-section-link');
+  }
 
-    async clickSaveSpaceCreation() {
-      await testSubjects.click('save-space-button');
-    }
+  async clickChangeAllPriv() {
+    await this.testSubjects.click('changeAllPrivilegesButton');
+  }
 
-    async clickSpaceEditButton(spaceName: string) {
-      await testSubjects.click(`${spaceName}-editSpace`);
-    }
+  async clickSaveSpaceCreation() {
+    await this.testSubjects.click('save-space-button');
+  }
 
-    async clickGoToRolesPage() {
-      await testSubjects.click('rolesManagementPage');
-    }
+  async clickSpaceEditButton(spaceName: string) {
+    await this.testSubjects.click(`${spaceName}-editSpace`);
+  }
 
-    async clickCancelSpaceCreation() {
-      await testSubjects.click('cancel-space-button');
-    }
+  async clickGoToRolesPage() {
+    await this.testSubjects.click('rolesManagementPage');
+  }
 
-    async clickOnCustomizeURL() {
-      await testSubjects.click('CustomizeOrReset');
-    }
+  async clickCancelSpaceCreation() {
+    await this.testSubjects.click('cancel-space-button');
+  }
 
-    async clickOnSpaceURLDisplay() {
-      await testSubjects.click('spaceURLDisplay');
-    }
+  async clickOnCustomizeURL() {
+    await this.testSubjects.click('CustomizeOrReset');
+  }
 
-    async setSpaceURL(spaceURL: string) {
-      await testSubjects.setValue('spaceURLDisplay', spaceURL);
-    }
+  async clickOnSpaceURLDisplay() {
+    await this.testSubjects.click('spaceURLDisplay');
+  }
 
-    async clickHideAllFeatures() {
-      await testSubjects.click('spc-toggle-all-features-hide');
-    }
+  async setSpaceURL(spaceURL: string) {
+    await this.testSubjects.setValue('spaceURLDisplay', spaceURL);
+  }
 
-    async clickShowAllFeatures() {
-      await testSubjects.click('spc-toggle-all-features-show');
-    }
+  async clickHideAllFeatures() {
+    await this.testSubjects.click('spc-toggle-all-features-hide');
+  }
 
-    async openFeatureCategory(categoryName: string) {
-      const category = await find.byCssSelector(
-        `button[aria-controls=featureCategory_${categoryName}]`
-      );
-      const isCategoryExpanded = (await category.getAttribute('aria-expanded')) === 'true';
-      if (!isCategoryExpanded) {
-        await category.click();
-      }
-    }
+  async clickShowAllFeatures() {
+    await this.testSubjects.click('spc-toggle-all-features-show');
+  }
 
-    async closeFeatureCategory(categoryName: string) {
-      const category = await find.byCssSelector(
-        `button[aria-controls=featureCategory_${categoryName}]`
-      );
-      const isCategoryExpanded = (await category.getAttribute('aria-expanded')) === 'true';
-      if (isCategoryExpanded) {
-        await category.click();
-      }
+  async openFeatureCategory(categoryName: string) {
+    const category = await this.find.byCssSelector(
+      `button[aria-controls=featureCategory_${categoryName}]`
+    );
+    const isCategoryExpanded = (await category.getAttribute('aria-expanded')) === 'true';
+    if (!isCategoryExpanded) {
+      await category.click();
     }
+  }
 
-    async toggleFeatureCategoryVisibility(categoryName: string) {
-      await testSubjects.click(`featureCategoryButton_${categoryName}`);
+  async closeFeatureCategory(categoryName: string) {
+    const category = await this.find.byCssSelector(
+      `button[aria-controls=featureCategory_${categoryName}]`
+    );
+    const isCategoryExpanded = (await category.getAttribute('aria-expanded')) === 'true';
+    if (isCategoryExpanded) {
+      await category.click();
     }
+  }
 
-    async clickOnDescriptionOfSpace() {
-      await testSubjects.click('descriptionSpaceText');
-    }
+  async toggleFeatureCategoryVisibility(categoryName: string) {
+    await this.testSubjects.click(`featureCategoryButton_${categoryName}`);
+  }
 
-    async setOnDescriptionOfSpace(descriptionSpace: string) {
-      await testSubjects.setValue('descriptionSpaceText', descriptionSpace);
-    }
+  async clickOnDescriptionOfSpace() {
+    await this.testSubjects.click('descriptionSpaceText');
+  }
 
-    async clickOnDeleteSpaceButton(spaceName: string) {
-      await testSubjects.click(`${spaceName}-deleteSpace`);
-    }
+  async setOnDescriptionOfSpace(descriptionSpace: string) {
+    await this.testSubjects.setValue('descriptionSpaceText', descriptionSpace);
+  }
 
-    async cancelDeletingSpace() {
-      await testSubjects.click('confirmModalCancelButton');
-    }
+  async clickOnDeleteSpaceButton(spaceName: string) {
+    await this.testSubjects.click(`${spaceName}-deleteSpace`);
+  }
 
-    async confirmDeletingSpace() {
-      await testSubjects.click('confirmModalConfirmButton');
-    }
+  async cancelDeletingSpace() {
+    await this.testSubjects.click('confirmModalCancelButton');
+  }
 
-    async clickOnSpaceb() {
-      await testSubjects.click('space-avatar-space_b');
-    }
+  async confirmDeletingSpace() {
+    await this.testSubjects.click('confirmModalConfirmButton');
+  }
 
-    async goToSpecificSpace(spaceName: string) {
-      await testSubjects.click(`${spaceName}-gotoSpace`);
-    }
+  async clickOnSpaceb() {
+    await this.testSubjects.click('space-avatar-space_b');
+  }
 
-    async clickSpaceAvatar(spaceId: string) {
-      return await retry.try(async () => {
-        log.info(`SpaceSelectorPage:clickSpaceAvatar(${spaceId})`);
-        await testSubjects.click(`space-avatar-${spaceId}`);
-        await PageObjects.common.sleep(1000);
-      });
-    }
+  async goToSpecificSpace(spaceName: string) {
+    await this.testSubjects.click(`${spaceName}-gotoSpace`);
   }
 
-  return new SpaceSelectorPage();
+  async clickSpaceAvatar(spaceId: string) {
+    return await this.retry.try(async () => {
+      this.log.info(`SpaceSelectorPage:clickSpaceAvatar(${spaceId})`);
+      await this.testSubjects.click(`space-avatar-${spaceId}`);
+      await this.common.sleep(1000);
+    });
+  }
 }
diff --git a/x-pack/test/functional/page_objects/status_page.ts b/x-pack/test/functional/page_objects/status_page.ts
index ed90aef954770..fa9ff392f0aa1 100644
--- a/x-pack/test/functional/page_objects/status_page.ts
+++ b/x-pack/test/functional/page_objects/status_page.ts
@@ -5,20 +5,17 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function StatusPagePageProvider({ getService }: FtrProviderContext) {
-  const log = getService('log');
-  const find = getService('find');
-  class StatusPage {
-    async initTests() {
-      log.debug('StatusPage:initTests');
-    }
+export class StatusPageObject extends FtrService {
+  private readonly log = this.ctx.getService('log');
+  private readonly find = this.ctx.getService('find');
 
-    async expectStatusPage(): Promise<void> {
-      await find.byCssSelector('[data-test-subj="statusPageRoot"]', 20000);
-    }
+  async initTests() {
+    this.log.debug('StatusPage:initTests');
   }
 
-  return new StatusPage();
+  async expectStatusPage(): Promise<void> {
+    await this.find.byCssSelector('[data-test-subj="statusPageRoot"]', 20000);
+  }
 }
diff --git a/x-pack/test/functional/page_objects/tag_management_page.ts b/x-pack/test/functional/page_objects/tag_management_page.ts
index c503d2282cf6c..b3f6622b04a57 100644
--- a/x-pack/test/functional/page_objects/tag_management_page.ts
+++ b/x-pack/test/functional/page_objects/tag_management_page.ts
@@ -5,9 +5,10 @@
  * 2.0.
  */
 
-// eslint-disable-next-line max-classes-per-file
+/* eslint-disable max-classes-per-file */
+
 import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService, FtrProviderContext } from '../ftr_provider_context';
 
 interface FillTagFormFields {
   name?: string;
@@ -17,463 +18,467 @@ interface FillTagFormFields {
 
 type TagFormValidation = FillTagFormFields;
 
-export function TagManagementPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const find = getService('find');
-  const browser = getService('browser');
-  const PageObjects = getPageObjects(['header', 'common', 'savedObjects', 'settings']);
-  const retry = getService('retry');
+/**
+ * Sub page object to manipulate the create/edit tag modal.
+ */
+class TagModal extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly header = this.ctx.getPageObject('header');
+
+  constructor(ctx: FtrProviderContext, private readonly page: TagManagementPageObject) {
+    super(ctx);
+  }
 
   /**
-   * Sub page object to manipulate the create/edit tag modal.
+   * Open the create tag modal, by clicking on the associated button.
    */
-  class TagModal {
-    constructor(private readonly page: TagManagementPage) {}
-    /**
-     * Open the create tag modal, by clicking on the associated button.
-     */
-    async openCreate() {
-      return await testSubjects.click('createTagButton');
-    }
-
-    /**
-     * Open the edit tag modal for given tag name. The tag must be in the currently displayed tags.
-     */
-    async openEdit(tagName: string) {
-      await this.page.clickEdit(tagName);
-    }
+  async openCreate() {
+    return await this.testSubjects.click('createTagButton');
+  }
 
-    /**
-     * Fills the given fields in the form.
-     *
-     * If a field is undefined, will not set the value (use a empty string for that)
-     * If `submit` is true, will call `clickConfirm` once the fields have been filled.
-     */
-    async fillForm(fields: FillTagFormFields, { submit = false }: { submit?: boolean } = {}) {
-      if (fields.name !== undefined) {
-        await testSubjects.click('createModalField-name');
-        await testSubjects.setValue('createModalField-name', fields.name);
-      }
-      if (fields.color !== undefined) {
-        // EuiColorPicker does not allow to specify data-test-subj for the colorpicker input
-        await testSubjects.setValue('colorPickerAnchor', fields.color);
-      }
-      if (fields.description !== undefined) {
-        await testSubjects.click('createModalField-description');
-        await testSubjects.setValue('createModalField-description', fields.description);
-      }
+  /**
+   * Open the edit tag modal for given tag name. The tag must be in the currently displayed tags.
+   */
+  async openEdit(tagName: string) {
+    await this.page.clickEdit(tagName);
+  }
 
-      if (submit) {
-        await this.clickConfirm();
-      }
+  /**
+   * Fills the given fields in the form.
+   *
+   * If a field is undefined, will not set the value (use a empty string for that)
+   * If `submit` is true, will call `clickConfirm` once the fields have been filled.
+   */
+  async fillForm(fields: FillTagFormFields, { submit = false }: { submit?: boolean } = {}) {
+    if (fields.name !== undefined) {
+      await this.testSubjects.click('createModalField-name');
+      await this.testSubjects.setValue('createModalField-name', fields.name);
+    }
+    if (fields.color !== undefined) {
+      // EuiColorPicker does not allow to specify data-test-subj for the colorpicker input
+      await this.testSubjects.setValue('colorPickerAnchor', fields.color);
+    }
+    if (fields.description !== undefined) {
+      await this.testSubjects.click('createModalField-description');
+      await this.testSubjects.setValue('createModalField-description', fields.description);
     }
 
-    /**
-     * Return the values currently displayed in the form.
-     */
-    async getFormValues(): Promise<Required<FillTagFormFields>> {
-      return {
-        name: await testSubjects.getAttribute('createModalField-name', 'value'),
-        color: await testSubjects.getAttribute('colorPickerAnchor', 'value'),
-        description: await testSubjects.getAttribute('createModalField-description', 'value'),
-      };
+    if (submit) {
+      await this.clickConfirm();
     }
+  }
 
-    /**
-     * Return the validation errors currently displayed for each field.
-     */
-    async getValidationErrors(): Promise<TagFormValidation> {
-      const errors: TagFormValidation = {};
+  /**
+   * Return the values currently displayed in the form.
+   */
+  async getFormValues(): Promise<Required<FillTagFormFields>> {
+    return {
+      name: await this.testSubjects.getAttribute('createModalField-name', 'value'),
+      color: await this.testSubjects.getAttribute('colorPickerAnchor', 'value'),
+      description: await this.testSubjects.getAttribute('createModalField-description', 'value'),
+    };
+  }
 
-      const getError = async (rowDataTestSubj: string) => {
-        const row = await testSubjects.find(rowDataTestSubj);
-        const errorElements = await row.findAllByClassName('euiFormErrorText');
-        return errorElements.length ? await errorElements[0].getVisibleText() : undefined;
-      };
+  /**
+   * Return the validation errors currently displayed for each field.
+   */
+  async getValidationErrors(): Promise<TagFormValidation> {
+    const errors: TagFormValidation = {};
 
-      errors.name = await getError('createModalRow-name');
-      errors.color = await getError('createModalRow-color');
-      errors.description = await getError('createModalRow-description');
+    const getError = async (rowDataTestSubj: string) => {
+      const row = await this.testSubjects.find(rowDataTestSubj);
+      const errorElements = await row.findAllByClassName('euiFormErrorText');
+      return errorElements.length ? await errorElements[0].getVisibleText() : undefined;
+    };
 
-      return errors;
-    }
+    errors.name = await getError('createModalRow-name');
+    errors.color = await getError('createModalRow-color');
+    errors.description = await getError('createModalRow-description');
 
-    /**
-     * Returns true if the form as at least one error displayed, false otherwise
-     */
-    async hasError() {
-      const errors = await this.getValidationErrors();
-      return Boolean(errors.name || errors.color || errors.description);
-    }
+    return errors;
+  }
 
-    /**
-     * Click on the 'cancel' button in the create/edit modal.
-     */
-    async clickCancel() {
-      await testSubjects.click('createModalCancelButton');
-    }
+  /**
+   * Returns true if the form as at least one error displayed, false otherwise
+   */
+  async hasError() {
+    const errors = await this.getValidationErrors();
+    return Boolean(errors.name || errors.color || errors.description);
+  }
 
-    /**
-     * Click on the 'confirm' button in the create/edit modal if not disabled.
-     */
-    async clickConfirm() {
-      await testSubjects.click('createModalConfirmButton');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  /**
+   * Click on the 'cancel' button in the create/edit modal.
+   */
+  async clickCancel() {
+    await this.testSubjects.click('createModalCancelButton');
+  }
 
-    /**
-     * Return true if the confirm button is disabled, false otherwise.
-     */
-    async isConfirmDisabled() {
-      const disabled = await testSubjects.getAttribute('createModalConfirmButton', 'disabled');
-      return disabled === 'true';
-    }
+  /**
+   * Click on the 'confirm' button in the create/edit modal if not disabled.
+   */
+  async clickConfirm() {
+    await this.testSubjects.click('createModalConfirmButton');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    /**
-     * Return true if the modal is currently opened.
-     */
-    async isOpened() {
-      return await testSubjects.exists('tagModalForm');
-    }
+  /**
+   * Return true if the confirm button is disabled, false otherwise.
+   */
+  async isConfirmDisabled() {
+    const disabled = await this.testSubjects.getAttribute('createModalConfirmButton', 'disabled');
+    return disabled === 'true';
+  }
 
-    /**
-     * Wait until the modal is closed.
-     */
-    async waitUntilClosed() {
-      await retry.try(async () => {
-        if (await this.isOpened()) {
-          throw new Error('save modal still open');
-        }
-      });
-    }
+  /**
+   * Return true if the modal is currently opened.
+   */
+  async isOpened() {
+    return await this.testSubjects.exists('tagModalForm');
+  }
 
-    /**
-     * Close the modal if currently opened.
-     */
-    async closeIfOpened() {
+  /**
+   * Wait until the modal is closed.
+   */
+  async waitUntilClosed() {
+    await this.retry.try(async () => {
       if (await this.isOpened()) {
-        await this.clickCancel();
+        throw new Error('save modal still open');
       }
-    }
+    });
   }
 
   /**
-   * Sub page object to manipulate the assign flyout.
+   * Close the modal if currently opened.
    */
-  class TagAssignmentFlyout {
-    constructor(private readonly page: TagManagementPage) {}
-
-    /**
-     * Open the tag assignment flyout, by selected given `tagNames` in the table, then clicking on the `assign`
-     * action in the bulk action menu.
-     */
-    async open(tagNames: string[]) {
-      for (const tagName of tagNames) {
-        await this.page.selectTagByName(tagName);
-      }
-      await this.page.clickOnBulkAction('assign');
-      await this.waitUntilResultsAreLoaded();
+  async closeIfOpened() {
+    if (await this.isOpened()) {
+      await this.clickCancel();
     }
+  }
+}
 
-    /**
-     * Click on the 'cancel' button in the assign flyout.
-     */
-    async clickCancel() {
-      await testSubjects.click('assignFlyoutCancelButton');
-      await this.page.waitUntilTableIsLoaded();
-    }
+/**
+ * Sub page object to manipulate the assign flyout.
+ */
+class TagAssignmentFlyout extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly find = this.ctx.getService('find');
 
-    /**
-     * Click on the 'confirm' button in the assign flyout.
-     */
-    async clickConfirm() {
-      await testSubjects.click('assignFlyoutConfirmButton');
-      await this.waitForFlyoutToClose();
-      await this.page.waitUntilTableIsLoaded();
-    }
+  constructor(ctx: FtrProviderContext, private readonly page: TagManagementPageObject) {
+    super(ctx);
+  }
 
-    /**
-     * Click on an assignable object result line in the flyout result list.
-     */
-    async clickOnResult(type: string, id: string) {
-      await testSubjects.click(`assign-result-${type}-${id}`);
+  /**
+   * Open the tag assignment flyout, by selected given `tagNames` in the table, then clicking on the `assign`
+   * action in the bulk action menu.
+   */
+  async open(tagNames: string[]) {
+    for (const tagName of tagNames) {
+      await this.page.selectTagByName(tagName);
     }
+    await this.page.clickOnBulkAction('assign');
+    await this.waitUntilResultsAreLoaded();
+  }
 
-    /**
-     * Wait until the assignable object results are displayed in the flyout.
-     */
-    async waitUntilResultsAreLoaded() {
-      return find.waitForDeletedByCssSelector(
-        '*[data-test-subj="assignFlyoutResultList"] .euiLoadingSpinner'
-      );
-    }
+  /**
+   * Click on the 'cancel' button in the assign flyout.
+   */
+  async clickCancel() {
+    await this.testSubjects.click('assignFlyoutCancelButton');
+    await this.page.waitUntilTableIsLoaded();
+  }
 
-    /**
-     * Wait until the flyout is closed.
-     */
-    async waitForFlyoutToClose() {
-      return testSubjects.waitForDeleted('assignFlyoutResultList');
-    }
+  /**
+   * Click on the 'confirm' button in the assign flyout.
+   */
+  async clickConfirm() {
+    await this.testSubjects.click('assignFlyoutConfirmButton');
+    await this.waitForFlyoutToClose();
+    await this.page.waitUntilTableIsLoaded();
   }
 
   /**
-   * Tag management page object.
-   *
-   * @remarks All the table manipulation helpers makes the assumption
-   *          that all tags are displayed on a single page. Pagination
-   *          and finding / interacting with a tag on another page is not supported.
-   */
-  class TagManagementPage {
-    public readonly tagModal = new TagModal(this);
-    public readonly assignFlyout = new TagAssignmentFlyout(this);
-
-    /**
-     * Navigate to the tag management section, by accessing the management app, then clicking
-     * on the `tags` link.
-     */
-    async navigateTo() {
-      await PageObjects.settings.navigateTo();
-      await testSubjects.click('tags');
-      await this.waitUntilTableIsLoaded();
-    }
+   * Click on an assignable object result line in the flyout result list.
+   */
+  async clickOnResult(type: string, id: string) {
+    await this.testSubjects.click(`assign-result-${type}-${id}`);
+  }
 
-    /**
-     * Wait until the tags table is displayed and is not in a the loading state
-     */
-    async waitUntilTableIsLoaded() {
-      return retry.try(async () => {
-        const isLoaded = await find.existsByDisplayedByCssSelector(
-          '*[data-test-subj="tagsManagementTable"]:not(.euiBasicTable-loading)'
-        );
-
-        if (isLoaded) {
-          return true;
-        } else {
-          throw new Error('Waiting');
-        }
-      });
-    }
+  /**
+   * Wait until the assignable object results are displayed in the flyout.
+   */
+  async waitUntilResultsAreLoaded() {
+    return this.find.waitForDeletedByCssSelector(
+      '*[data-test-subj="assignFlyoutResultList"] .euiLoadingSpinner'
+    );
+  }
 
-    /**
-     * Type given `term` in the table's search bar
-     */
-    async searchForTerm(term: string) {
-      const searchBox = await testSubjects.find('tagsManagementSearchBar');
-      await searchBox.clearValue();
-      await searchBox.type(term);
-      await searchBox.pressKeys(browser.keys.ENTER);
-      await PageObjects.header.waitUntilLoadingHasFinished();
-      await this.waitUntilTableIsLoaded();
-    }
+  /**
+   * Wait until the flyout is closed.
+   */
+  async waitForFlyoutToClose() {
+    return this.testSubjects.waitForDeleted('assignFlyoutResultList');
+  }
+}
 
-    /**
-     * Return true if the `Create new tag` button is visible, false otherwise.
-     */
-    async isCreateButtonVisible() {
-      return await testSubjects.exists('createTagButton');
-    }
+/**
+ * Tag management page object.
+ *
+ * @remarks All the table manipulation helpers makes the assumption
+ *          that all tags are displayed on a single page. Pagination
+ *          and finding / interacting with a tag on another page is not supported.
+ */
+export class TagManagementPageObject extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly find = this.ctx.getService('find');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly settings = this.ctx.getPageObject('settings');
 
-    /**
-     * Returns true if given action is available from the table action column
-     */
-    async isActionAvailable(action: string) {
-      const rows = await testSubjects.findAll('tagsTableRow');
-      const firstRow = rows[0];
-      // if there is more than 2 actions, they are wrapped in a popover that opens from a new action.
-      const menuActionPresent = await testSubjects.descendantExists(
-        'euiCollapsedItemActionsButton',
-        firstRow
-      );
-      if (menuActionPresent) {
-        const actionButton = await testSubjects.findDescendant(
-          'euiCollapsedItemActionsButton',
-          firstRow
-        );
-        await actionButton.click();
-        const actionPresent = await testSubjects.exists(`tagsTableAction-${action}`);
-        await actionButton.click();
-        return actionPresent;
-      } else {
-        return await testSubjects.exists(`tagsTableAction-${action}`);
-      }
-    }
+  public readonly tagModal = new TagModal(this.ctx, this);
+  public readonly assignFlyout = new TagAssignmentFlyout(this.ctx, this);
 
-    /**
-     * Return the (table ordered) name of the tags currently displayed in the table.
-     */
-    async getDisplayedTagNames() {
-      const tags = await this.getDisplayedTagsInfo();
-      return tags.map((tag) => tag.name);
-    }
+  /**
+   * Navigate to the tag management section, by accessing the management app, then clicking
+   * on the `tags` link.
+   */
+  async navigateTo() {
+    await this.settings.navigateTo();
+    await this.testSubjects.click('tags');
+    await this.waitUntilTableIsLoaded();
+  }
 
-    /**
-     * Return true if the 'connections' link is displayed for given tag name.
-     *
-     * Having the link not displayed can either mean that the user don't have the view
-     * permission to see the connections, or that the tag don't have any.
-     */
-    async isConnectionLinkDisplayed(tagName: string) {
-      const tags = await this.getDisplayedTagsInfo();
-      const tag = tags.find((t) => t.name === tagName);
-      return tag ? tag.connectionCount !== undefined : false;
-    }
+  /**
+   * Wait until the tags table is displayed and is not in a the loading state
+   */
+  async waitUntilTableIsLoaded() {
+    return this.retry.try(async () => {
+      const isLoaded = await this.find.existsByDisplayedByCssSelector(
+        '*[data-test-subj="tagsManagementTable"]:not(.euiBasicTable-loading)'
+      );
 
-    /**
-     * Click the 'edit' action button in the table for given tag name.
-     */
-    async clickEdit(tagName: string) {
-      const tagRow = await this.getRowByName(tagName);
-      if (tagRow) {
-        const editButton = await testSubjects.findDescendant('tagsTableAction-edit', tagRow);
-        await editButton?.click();
+      if (isLoaded) {
+        return true;
+      } else {
+        throw new Error('Waiting');
       }
-    }
+    });
+  }
 
-    /**
-     * Return the raw `WebElementWrapper` of the table's row for given tag name.
-     */
-    async getRowByName(tagName: string) {
-      const tagNames = await this.getDisplayedTagNames();
-      const tagIndex = tagNames.indexOf(tagName);
-      const rows = await testSubjects.findAll('tagsTableRow');
-      return rows[tagIndex];
-    }
+  /**
+   * Type given `term` in the table's search bar
+   */
+  async searchForTerm(term: string) {
+    const searchBox = await this.testSubjects.find('tagsManagementSearchBar');
+    await searchBox.clearValue();
+    await searchBox.type(term);
+    await searchBox.pressKeys(this.browser.keys.ENTER);
+    await this.header.waitUntilLoadingHasFinished();
+    await this.waitUntilTableIsLoaded();
+  }
 
-    /**
-     * Click on the 'connections' link in the table for given tag name.
-     */
-    async clickOnConnectionsLink(tagName: string) {
-      const tagRow = await this.getRowByName(tagName);
-      const connectionLink = await testSubjects.findDescendant(
-        'tagsTableRowConnectionsLink',
-        tagRow
-      );
-      await connectionLink.click();
-    }
+  /**
+   * Return true if the `Create new tag` button is visible, false otherwise.
+   */
+  async isCreateButtonVisible() {
+    return await this.testSubjects.exists('createTagButton');
+  }
 
-    /**
-     * Return true if the selection column is displayed on the table, false otherwise.
-     */
-    async isSelectionColumnDisplayed() {
-      const firstRow = await testSubjects.find('tagsTableRow');
-      const checkbox = await firstRow.findAllByCssSelector(
-        '.euiTableRowCellCheckbox .euiCheckbox__input'
+  /**
+   * Returns true if given action is available from the table action column
+   */
+  async isActionAvailable(action: string) {
+    const rows = await this.testSubjects.findAll('tagsTableRow');
+    const firstRow = rows[0];
+    // if there is more than 2 actions, they are wrapped in a popover that opens from a new action.
+    const menuActionPresent = await this.testSubjects.descendantExists(
+      'euiCollapsedItemActionsButton',
+      firstRow
+    );
+    if (menuActionPresent) {
+      const actionButton = await this.testSubjects.findDescendant(
+        'euiCollapsedItemActionsButton',
+        firstRow
       );
-      return Boolean(checkbox.length);
+      await actionButton.click();
+      const actionPresent = await this.testSubjects.exists(`tagsTableAction-${action}`);
+      await actionButton.click();
+      return actionPresent;
+    } else {
+      return await this.testSubjects.exists(`tagsTableAction-${action}`);
     }
+  }
 
-    /**
-     * Click on the selection checkbox of the tag matching given tag name.
-     */
-    async selectTagByName(tagName: string) {
-      const tagRow = await this.getRowByName(tagName);
-      const checkbox = await tagRow.findByCssSelector(
-        '.euiTableRowCellCheckbox .euiCheckbox__input'
-      );
-      await checkbox.click();
-    }
+  /**
+   * Return the (table ordered) name of the tags currently displayed in the table.
+   */
+  async getDisplayedTagNames() {
+    const tags = await this.getDisplayedTagsInfo();
+    return tags.map((tag) => tag.name);
+  }
 
-    /**
-     * Returns true if the tag bulk action menu is displayed, false otherwise.
-     */
-    async isActionMenuButtonDisplayed() {
-      return testSubjects.exists('actionBar-contextMenuButton');
-    }
+  /**
+   * Return true if the 'connections' link is displayed for given tag name.
+   *
+   * Having the link not displayed can either mean that the user don't have the view
+   * permission to see the connections, or that the tag don't have any.
+   */
+  async isConnectionLinkDisplayed(tagName: string) {
+    const tags = await this.getDisplayedTagsInfo();
+    const tag = tags.find((t) => t.name === tagName);
+    return tag ? tag.connectionCount !== undefined : false;
+  }
 
-    /**
-     * Open the bulk action menu if not already opened.
-     */
-    async openActionMenu() {
-      if (!(await this.isActionMenuOpened())) {
-        await this.toggleActionMenu();
-      }
+  /**
+   * Click the 'edit' action button in the table for given tag name.
+   */
+  async clickEdit(tagName: string) {
+    const tagRow = await this.getRowByName(tagName);
+    if (tagRow) {
+      const editButton = await this.testSubjects.findDescendant('tagsTableAction-edit', tagRow);
+      await editButton?.click();
     }
+  }
 
-    /**
-     * Check if the action for given `actionId` is present in the bulk action menu.
-     *
-     * The menu will automatically be opened if not already, but the test must still
-     * select tags to make the action menu button appear.
-     */
-    async isBulkActionPresent(actionId: string) {
-      if (!(await this.isActionMenuButtonDisplayed())) {
-        return false;
-      }
-      const menuWasOpened = await this.isActionMenuOpened();
-      if (!menuWasOpened) {
-        await this.openActionMenu();
-      }
+  /**
+   * Return the raw `WebElementWrapper` of the table's row for given tag name.
+   */
+  async getRowByName(tagName: string) {
+    const tagNames = await this.getDisplayedTagNames();
+    const tagIndex = tagNames.indexOf(tagName);
+    const rows = await this.testSubjects.findAll('tagsTableRow');
+    return rows[tagIndex];
+  }
+
+  /**
+   * Click on the 'connections' link in the table for given tag name.
+   */
+  async clickOnConnectionsLink(tagName: string) {
+    const tagRow = await this.getRowByName(tagName);
+    const connectionLink = await this.testSubjects.findDescendant(
+      'tagsTableRowConnectionsLink',
+      tagRow
+    );
+    await connectionLink.click();
+  }
 
-      const actionExists = await testSubjects.exists(`actionBar-button-${actionId}`);
+  /**
+   * Return true if the selection column is displayed on the table, false otherwise.
+   */
+  async isSelectionColumnDisplayed() {
+    const firstRow = await this.testSubjects.find('tagsTableRow');
+    const checkbox = await firstRow.findAllByCssSelector(
+      '.euiTableRowCellCheckbox .euiCheckbox__input'
+    );
+    return Boolean(checkbox.length);
+  }
 
-      if (!menuWasOpened) {
-        await this.toggleActionMenu();
-      }
+  /**
+   * Click on the selection checkbox of the tag matching given tag name.
+   */
+  async selectTagByName(tagName: string) {
+    const tagRow = await this.getRowByName(tagName);
+    const checkbox = await tagRow.findByCssSelector('.euiTableRowCellCheckbox .euiCheckbox__input');
+    await checkbox.click();
+  }
+
+  /**
+   * Returns true if the tag bulk action menu is displayed, false otherwise.
+   */
+  async isActionMenuButtonDisplayed() {
+    return this.testSubjects.exists('actionBar-contextMenuButton');
+  }
 
-      return actionExists;
+  /**
+   * Open the bulk action menu if not already opened.
+   */
+  async openActionMenu() {
+    if (!(await this.isActionMenuOpened())) {
+      await this.toggleActionMenu();
     }
+  }
 
-    /**
-     * Click on given bulk action button
-     */
-    async clickOnBulkAction(actionId: string) {
+  /**
+   * Check if the action for given `actionId` is present in the bulk action menu.
+   *
+   * The menu will automatically be opened if not already, but the test must still
+   * select tags to make the action menu button appear.
+   */
+  async isBulkActionPresent(actionId: string) {
+    if (!(await this.isActionMenuButtonDisplayed())) {
+      return false;
+    }
+    const menuWasOpened = await this.isActionMenuOpened();
+    if (!menuWasOpened) {
       await this.openActionMenu();
-      await testSubjects.click(`actionBar-button-${actionId}`);
     }
 
-    /**
-     * Toggle (close if opened, open if closed) the bulk action menu.
-     */
-    async toggleActionMenu() {
-      await testSubjects.click('actionBar-contextMenuButton');
-    }
+    const actionExists = await this.testSubjects.exists(`actionBar-button-${actionId}`);
 
-    /**
-     * Return true if the bulk action menu is opened, false otherwise.
-     */
-    async isActionMenuOpened() {
-      return testSubjects.exists('actionBar-contextMenuPopover');
+    if (!menuWasOpened) {
+      await this.toggleActionMenu();
     }
 
-    /**
-     * Return the info of all the tags currently displayed in the table (in table's order)
-     */
-    async getDisplayedTagsInfo() {
-      const rows = await testSubjects.findAll('tagsTableRow');
-      return Promise.all([...rows.map(parseTableRow)]);
-    }
+    return actionExists;
+  }
 
-    async getDisplayedTagInfo(tagName: string) {
-      const rows = await this.getDisplayedTagsInfo();
-      return rows.find((row) => row.name === tagName);
-    }
+  /**
+   * Click on given bulk action button
+   */
+  async clickOnBulkAction(actionId: string) {
+    await this.openActionMenu();
+    await this.testSubjects.click(`actionBar-button-${actionId}`);
+  }
 
-    /**
-     * Converts the tagName to the format used in test subjects
-     * @param tagName
-     */
-    testSubjFriendly(tagName: string) {
-      return tagName.replace(' ', '_');
-    }
+  /**
+   * Toggle (close if opened, open if closed) the bulk action menu.
+   */
+  async toggleActionMenu() {
+    await this.testSubjects.click('actionBar-contextMenuButton');
   }
 
-  const parseTableRow = async (row: WebElementWrapper) => {
-    const dom = await row.parseDomContent();
+  /**
+   * Return true if the bulk action menu is opened, false otherwise.
+   */
+  async isActionMenuOpened() {
+    return this.testSubjects.exists('actionBar-contextMenuPopover');
+  }
 
-    const connectionsText = dom.findTestSubject('tagsTableRowConnectionsLink').text();
-    const rawConnectionCount = connectionsText.replace(/[^0-9]/g, '');
-    const connectionCount = rawConnectionCount ? parseInt(rawConnectionCount, 10) : undefined;
+  /**
+   * Return the info of all the tags currently displayed in the table (in table's order)
+   */
+  async getDisplayedTagsInfo() {
+    const rows = await this.testSubjects.findAll('tagsTableRow');
+    return Promise.all([...rows.map(parseTableRow)]);
+  }
 
-    // ideally we would also return the color, but it can't be easily retrieved from the DOM
-    return {
-      name: dom.findTestSubject('tagsTableRowName').find('.euiTableCellContent').text(),
-      description: dom
-        .findTestSubject('tagsTableRowDescription')
-        .find('.euiTableCellContent')
-        .text(),
-      connectionCount,
-    };
-  };
+  async getDisplayedTagInfo(tagName: string) {
+    const rows = await this.getDisplayedTagsInfo();
+    return rows.find((row) => row.name === tagName);
+  }
 
-  return new TagManagementPage();
+  /**
+   * Converts the tagName to the format used in test subjects
+   * @param tagName
+   */
+  testSubjFriendly(tagName: string) {
+    return tagName.replace(' ', '_');
+  }
 }
+
+const parseTableRow = async (row: WebElementWrapper) => {
+  const dom = await row.parseDomContent();
+
+  const connectionsText = dom.findTestSubject('tagsTableRowConnectionsLink').text();
+  const rawConnectionCount = connectionsText.replace(/[^0-9]/g, '');
+  const connectionCount = rawConnectionCount ? parseInt(rawConnectionCount, 10) : undefined;
+
+  // ideally we would also return the color, but it can't be easily retrieved from the DOM
+  return {
+    name: dom.findTestSubject('tagsTableRowName').find('.euiTableCellContent').text(),
+    description: dom.findTestSubject('tagsTableRowDescription').find('.euiTableCellContent').text(),
+    connectionCount,
+  };
+};
diff --git a/x-pack/test/functional/page_objects/upgrade_assistant_page.ts b/x-pack/test/functional/page_objects/upgrade_assistant_page.ts
index 1c4a85450a8da..211bcbbd59219 100644
--- a/x-pack/test/functional/page_objects/upgrade_assistant_page.ts
+++ b/x-pack/test/functional/page_objects/upgrade_assistant_page.ts
@@ -5,76 +5,72 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function UpgradeAssistantPageProvider({ getPageObjects, getService }: FtrProviderContext) {
-  const retry = getService('retry');
-  const log = getService('log');
-  const browser = getService('browser');
-  const find = getService('find');
-  const testSubjects = getService('testSubjects');
-  const { common } = getPageObjects(['common']);
+export class UpgradeAssistantPageObject extends FtrService {
+  private readonly retry = this.ctx.getService('retry');
+  private readonly log = this.ctx.getService('log');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly find = this.ctx.getService('find');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly common = this.ctx.getPageObject('common');
 
-  class UpgradeAssistant {
-    async initTests() {
-      log.debug('UpgradeAssistant:initTests');
-    }
+  async initTests() {
+    this.log.debug('UpgradeAssistant:initTests');
+  }
 
-    async navigateToPage() {
-      return await retry.try(async () => {
-        await common.navigateToApp('settings');
-        await testSubjects.click('upgrade_assistant');
-        await retry.waitFor('url to contain /upgrade_assistant', async () => {
-          const url = await browser.getCurrentUrl();
-          return url.includes('/upgrade_assistant');
-        });
+  async navigateToPage() {
+    return await this.retry.try(async () => {
+      await this.common.navigateToApp('settings');
+      await this.testSubjects.click('upgrade_assistant');
+      await this.retry.waitFor('url to contain /upgrade_assistant', async () => {
+        const url = await this.browser.getCurrentUrl();
+        return url.includes('/upgrade_assistant');
       });
-    }
-
-    async toggleDeprecationLogging() {
-      log.debug('toggleDeprecationLogging()');
-      await testSubjects.click('upgradeAssistantDeprecationToggle');
-    }
+    });
+  }
 
-    async isDeprecationLoggingEnabled() {
-      const isDeprecationEnabled = await testSubjects.getAttribute(
-        'upgradeAssistantDeprecationToggle',
-        'aria-checked'
-      );
-      log.debug(`Deprecation enabled == ${isDeprecationEnabled}`);
-      return isDeprecationEnabled === 'true';
-    }
+  async toggleDeprecationLogging() {
+    this.log.debug('toggleDeprecationLogging()');
+    await this.testSubjects.click('upgradeAssistantDeprecationToggle');
+  }
 
-    async deprecationLoggingEnabledLabel() {
-      const loggingEnabledLabel = await find.byCssSelector(
-        '[data-test-subj="upgradeAssistantDeprecationToggle"] ~ span'
-      );
-      return await loggingEnabledLabel.getVisibleText();
-    }
+  async isDeprecationLoggingEnabled() {
+    const isDeprecationEnabled = await this.testSubjects.getAttribute(
+      'upgradeAssistantDeprecationToggle',
+      'aria-checked'
+    );
+    this.log.debug(`Deprecation enabled == ${isDeprecationEnabled}`);
+    return isDeprecationEnabled === 'true';
+  }
 
-    async clickTab(tabId: string) {
-      return await retry.try(async () => {
-        log.debug('clickTab()');
-        await find.clickByCssSelector(`.euiTabs .euiTab#${tabId}`);
-      });
-    }
+  async deprecationLoggingEnabledLabel() {
+    const loggingEnabledLabel = await this.find.byCssSelector(
+      '[data-test-subj="upgradeAssistantDeprecationToggle"] ~ span'
+    );
+    return await loggingEnabledLabel.getVisibleText();
+  }
 
-    async waitForTelemetryHidden() {
-      const self = this;
-      await retry.waitFor('Telemetry to disappear.', async () => {
-        return (await self.isTelemetryExists()) === false;
-      });
-    }
+  async clickTab(tabId: string) {
+    return await this.retry.try(async () => {
+      this.log.debug('clickTab()');
+      await this.find.clickByCssSelector(`.euiTabs .euiTab#${tabId}`);
+    });
+  }
 
-    async issueSummaryText() {
-      log.debug('expectIssueSummary()');
-      return await testSubjects.getVisibleText('upgradeAssistantIssueSummary');
-    }
+  async waitForTelemetryHidden() {
+    const self = this;
+    await this.retry.waitFor('Telemetry to disappear.', async () => {
+      return (await self.isTelemetryExists()) === false;
+    });
+  }
 
-    async isTelemetryExists() {
-      return await testSubjects.exists('upgradeAssistantTelemetryRunning');
-    }
+  async issueSummaryText() {
+    this.log.debug('expectIssueSummary()');
+    return await this.testSubjects.getVisibleText('upgradeAssistantIssueSummary');
   }
 
-  return new UpgradeAssistant();
+  async isTelemetryExists() {
+    return await this.testSubjects.exists('upgradeAssistantTelemetryRunning');
+  }
 }
diff --git a/x-pack/test/functional/page_objects/uptime_page.ts b/x-pack/test/functional/page_objects/uptime_page.ts
index 03e1513eac043..366511f7f43c5 100644
--- a/x-pack/test/functional/page_objects/uptime_page.ts
+++ b/x-pack/test/functional/page_objects/uptime_page.ts
@@ -6,117 +6,121 @@
  */
 
 import expect from '@kbn/expect';
-import { FtrProviderContext } from '../ftr_provider_context';
-
-export function UptimePageProvider({ getPageObjects, getService }: FtrProviderContext) {
-  const pageObjects = getPageObjects(['timePicker', 'header']);
-  const { common: commonService, monitor, navigation } = getService('uptime');
-  const retry = getService('retry');
-
-  return new (class UptimePage {
-    public async goToRoot(refresh?: boolean) {
-      await navigation.goToUptime();
-      if (refresh) {
-        await navigation.refreshApp();
-      }
-    }
-
-    public async setDateRange(start: string, end: string) {
-      const { start: prevStart, end: prevEnd } = await pageObjects.timePicker.getTimeConfig();
-      if (start !== prevStart || prevEnd !== end) {
-        await pageObjects.timePicker.setAbsoluteRange(start, end);
-      } else {
-        await navigation.refreshApp();
-      }
-    }
-
-    public async goToUptimeOverviewAndLoadData(
-      dateStart: string,
-      dateEnd: string,
-      monitorIdToCheck?: string
-    ) {
-      await navigation.goToUptime();
-      await this.setDateRange(dateStart, dateEnd);
-      if (monitorIdToCheck) {
-        await commonService.monitorIdExists(monitorIdToCheck);
-      }
-      await pageObjects.header.waitUntilLoadingHasFinished();
-    }
-
-    public async loadDataAndGoToMonitorPage(dateStart: string, dateEnd: string, monitorId: string) {
-      await pageObjects.header.waitUntilLoadingHasFinished();
-      await this.setDateRange(dateStart, dateEnd);
-      await navigation.goToMonitor(monitorId);
-    }
-
-    public async inputFilterQuery(filterQuery: string) {
-      await commonService.setFilterText(filterQuery);
-    }
-
-    public async pageHasDataMissing() {
-      return await commonService.pageHasDataMissing();
-    }
-
-    public async pageHasExpectedIds(monitorIdsToCheck: string[]): Promise<void> {
-      return retry.tryForTime(15000, async () => {
-        await Promise.all(monitorIdsToCheck.map((id) => commonService.monitorPageLinkExists(id)));
-      });
-    }
-
-    public async pageUrlContains(value: string, expected: boolean = true): Promise<void> {
-      return retry.tryForTime(12000, async () => {
-        expect(await commonService.urlContains(value)).to.eql(expected);
-      });
-    }
-
-    public async changePage(direction: 'next' | 'prev') {
-      if (direction === 'next') {
-        await commonService.goToNextPage();
-      } else if (direction === 'prev') {
-        await commonService.goToPreviousPage();
-      }
-    }
-
-    public async setStatusFilter(value: 'up' | 'down') {
-      if (value === 'up') {
-        await commonService.setStatusFilterUp();
-      } else if (value === 'down') {
-        await commonService.setStatusFilterDown();
-      }
-    }
-
-    public async selectFilterItems(filters: Record<string, string[]>) {
-      for (const key in filters) {
-        if (filters.hasOwnProperty(key)) {
-          const values = filters[key];
-          for (let i = 0; i < values.length; i++) {
-            await commonService.selectFilterItem(key, values[i]);
-          }
+import { FtrService } from '../ftr_provider_context';
+
+export class UptimePageObject extends FtrService {
+  private readonly timePicker = this.ctx.getPageObject('timePicker');
+  private readonly header = this.ctx.getPageObject('header');
+
+  private readonly commonService = this.ctx.getService('uptime').common;
+  private readonly monitor = this.ctx.getService('uptime').monitor;
+  private readonly navigation = this.ctx.getService('uptime').navigation;
+  private readonly retry = this.ctx.getService('retry');
+
+  public async goToRoot(refresh?: boolean) {
+    await this.navigation.goToUptime();
+    if (refresh) {
+      await this.navigation.refreshApp();
+    }
+  }
+
+  public async setDateRange(start: string, end: string) {
+    const { start: prevStart, end: prevEnd } = await this.timePicker.getTimeConfig();
+    if (start !== prevStart || prevEnd !== end) {
+      await this.timePicker.setAbsoluteRange(start, end);
+    } else {
+      await this.navigation.refreshApp();
+    }
+  }
+
+  public async goToUptimeOverviewAndLoadData(
+    dateStart: string,
+    dateEnd: string,
+    monitorIdToCheck?: string
+  ) {
+    await this.navigation.goToUptime();
+    await this.setDateRange(dateStart, dateEnd);
+    if (monitorIdToCheck) {
+      await this.commonService.monitorIdExists(monitorIdToCheck);
+    }
+    await this.header.waitUntilLoadingHasFinished();
+  }
+
+  public async loadDataAndGoToMonitorPage(dateStart: string, dateEnd: string, monitorId: string) {
+    await this.header.waitUntilLoadingHasFinished();
+    await this.setDateRange(dateStart, dateEnd);
+    await this.navigation.goToMonitor(monitorId);
+  }
+
+  public async inputFilterQuery(filterQuery: string) {
+    await this.commonService.setFilterText(filterQuery);
+  }
+
+  public async pageHasDataMissing() {
+    return await this.commonService.pageHasDataMissing();
+  }
+
+  public async pageHasExpectedIds(monitorIdsToCheck: string[]): Promise<void> {
+    return this.retry.tryForTime(15000, async () => {
+      await Promise.all(
+        monitorIdsToCheck.map((id) => this.commonService.monitorPageLinkExists(id))
+      );
+    });
+  }
+
+  public async pageUrlContains(value: string, expected: boolean = true): Promise<void> {
+    return this.retry.tryForTime(12000, async () => {
+      expect(await this.commonService.urlContains(value)).to.eql(expected);
+    });
+  }
+
+  public async changePage(direction: 'next' | 'prev') {
+    if (direction === 'next') {
+      await this.commonService.goToNextPage();
+    } else if (direction === 'prev') {
+      await this.commonService.goToPreviousPage();
+    }
+  }
+
+  public async setStatusFilter(value: 'up' | 'down') {
+    if (value === 'up') {
+      await this.commonService.setStatusFilterUp();
+    } else if (value === 'down') {
+      await this.commonService.setStatusFilterDown();
+    }
+  }
+
+  public async selectFilterItems(filters: Record<string, string[]>) {
+    for (const key in filters) {
+      if (filters.hasOwnProperty(key)) {
+        const values = filters[key];
+        for (let i = 0; i < values.length; i++) {
+          await this.commonService.selectFilterItem(key, values[i]);
         }
       }
     }
+  }
 
-    public async getSnapshotCount() {
-      return await commonService.getSnapshotCount();
-    }
+  public async getSnapshotCount() {
+    return await this.commonService.getSnapshotCount();
+  }
 
-    public async setAlertKueryBarText(filters: string) {
-      const { setKueryBarText } = commonService;
-      await setKueryBarText('xpack.uptime.alerts.monitorStatus.filterBar', filters);
-    }
+  public async setAlertKueryBarText(filters: string) {
+    const { setKueryBarText } = this.commonService;
+    await setKueryBarText('xpack.uptime.alerts.monitorStatus.filterBar', filters);
+  }
 
-    public async setMonitorListPageSize(size: number): Promise<void> {
-      await commonService.openPageSizeSelectPopover();
-      return commonService.clickPageSizeSelectPopoverItem(size);
-    }
+  public async setMonitorListPageSize(size: number): Promise<void> {
+    await this.commonService.openPageSizeSelectPopover();
+    return this.commonService.clickPageSizeSelectPopoverItem(size);
+  }
 
-    public async checkPingListInteractions(timestamps: string[]): Promise<void> {
-      return monitor.checkForPingListTimestamps(timestamps);
-    }
+  public async checkPingListInteractions(timestamps: string[]): Promise<void> {
+    return this.monitor.checkForPingListTimestamps(timestamps);
+  }
 
-    public async resetFilters() {
-      await this.inputFilterQuery('');
-      await commonService.resetStatusFilter();
-    }
-  })();
+  public async resetFilters() {
+    await this.inputFilterQuery('');
+    await this.commonService.resetStatusFilter();
+  }
 }
diff --git a/x-pack/test/functional/page_objects/watcher_page.ts b/x-pack/test/functional/page_objects/watcher_page.ts
index d0db5c8c3b267..5aeaddffff581 100644
--- a/x-pack/test/functional/page_objects/watcher_page.ts
+++ b/x-pack/test/functional/page_objects/watcher_page.ts
@@ -6,64 +6,61 @@
  */
 
 import { map as mapAsync } from 'bluebird';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
-export function WatcherPageProvider({ getPageObjects, getService }: FtrProviderContext) {
-  const PageObjects = getPageObjects(['header']);
-  const find = getService('find');
-  const testSubjects = getService('testSubjects');
+export class WatcherPageObject extends FtrService {
+  private readonly header = this.ctx.getPageObject('header');
+  private readonly find = this.ctx.getService('find');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
 
-  class WatcherPage {
-    async clearAllWatches() {
-      const checkBoxExists = await testSubjects.exists('checkboxSelectAll');
-      if (checkBoxExists) {
-        await testSubjects.click('checkboxSelectAll');
-        await testSubjects.click('btnDeleteWatches');
-        await testSubjects.click('confirmModalConfirmButton');
-        await PageObjects.header.waitUntilLoadingHasFinished();
-      }
+  async clearAllWatches() {
+    const checkBoxExists = await this.testSubjects.exists('checkboxSelectAll');
+    if (checkBoxExists) {
+      await this.testSubjects.click('checkboxSelectAll');
+      await this.testSubjects.click('btnDeleteWatches');
+      await this.testSubjects.click('confirmModalConfirmButton');
+      await this.header.waitUntilLoadingHasFinished();
     }
+  }
 
-    async createWatch(watchName: string, name: string) {
-      await testSubjects.click('createWatchButton');
-      await testSubjects.click('jsonWatchCreateLink');
-      await find.setValue('#id', watchName);
-      await find.setValue('#watchName', name);
-      await find.clickByCssSelector('[type="submit"]');
-      await PageObjects.header.waitUntilLoadingHasFinished();
-    }
+  async createWatch(watchName: string, name: string) {
+    await this.testSubjects.click('createWatchButton');
+    await this.testSubjects.click('jsonWatchCreateLink');
+    await this.find.setValue('#id', watchName);
+    await this.find.setValue('#watchName', name);
+    await this.find.clickByCssSelector('[type="submit"]');
+    await this.header.waitUntilLoadingHasFinished();
+  }
 
-    async getWatch(watchID: string) {
-      const watchIdColumn = await testSubjects.find(`watchIdColumn-${watchID}`);
-      const watchNameColumn = await testSubjects.find(`watchNameColumn-${watchID}`);
-      const id = await watchIdColumn.getVisibleText();
-      const name = await watchNameColumn.getVisibleText();
-      return {
-        id,
-        name,
-      };
-    }
+  async getWatch(watchID: string) {
+    const watchIdColumn = await this.testSubjects.find(`watchIdColumn-${watchID}`);
+    const watchNameColumn = await this.testSubjects.find(`watchNameColumn-${watchID}`);
+    const id = await watchIdColumn.getVisibleText();
+    const name = await watchNameColumn.getVisibleText();
+    return {
+      id,
+      name,
+    };
+  }
 
-    async deleteWatch() {
-      await testSubjects.click('checkboxSelectAll');
-      await testSubjects.click('btnDeleteWatches');
-    }
+  async deleteWatch() {
+    await this.testSubjects.click('checkboxSelectAll');
+    await this.testSubjects.click('btnDeleteWatches');
+  }
 
-    // get all the watches in the list
-    async getWatches() {
-      const watches = await find.allByCssSelector('.euiTableRow');
-      return mapAsync(watches, async (watch) => {
-        const checkBox = await watch.findByCssSelector('td:nth-child(1)');
-        const id = await watch.findByCssSelector('td:nth-child(2)');
-        const name = await watch.findByCssSelector('td:nth-child(3)');
+  // get all the watches in the list
+  async getWatches() {
+    const watches = await this.find.allByCssSelector('.euiTableRow');
+    return mapAsync(watches, async (watch) => {
+      const checkBox = await watch.findByCssSelector('td:nth-child(1)');
+      const id = await watch.findByCssSelector('td:nth-child(2)');
+      const name = await watch.findByCssSelector('td:nth-child(3)');
 
-        return {
-          checkBox: (await checkBox.getAttribute('innerHTML')).includes('input'),
-          id: await id.getVisibleText(),
-          name: (await name.getVisibleText()).split(',').map((role) => role.trim()),
-        };
-      });
-    }
+      return {
+        checkBox: (await checkBox.getAttribute('innerHTML')).includes('input'),
+        id: await id.getVisibleText(),
+        name: (await name.getVisibleText()).split(',').map((role) => role.trim()),
+      };
+    });
   }
-  return new WatcherPage();
 }
diff --git a/x-pack/test/functional/services/dashboard/drilldowns_manage.ts b/x-pack/test/functional/services/dashboard/drilldowns_manage.ts
index 34212262aedba..10634ab371345 100644
--- a/x-pack/test/functional/services/dashboard/drilldowns_manage.ts
+++ b/x-pack/test/functional/services/dashboard/drilldowns_manage.ts
@@ -27,12 +27,12 @@ export function DashboardDrilldownsManageProvider({ getService }: FtrProviderCon
 
     async loadData() {
       log.debug('loadData');
-      await esArchiver.load('dashboard/drilldowns');
+      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/drilldowns');
     }
 
     async unloadData() {
       log.debug('unloadData');
-      await esArchiver.unload('dashboard/drilldowns');
+      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/drilldowns');
     }
 
     async expectsCreateDrilldownFlyoutOpen() {
diff --git a/x-pack/test/functional/services/index.ts b/x-pack/test/functional/services/index.ts
index 0da518a5e8967..99293c71676b4 100644
--- a/x-pack/test/functional/services/index.ts
+++ b/x-pack/test/functional/services/index.ts
@@ -58,7 +58,7 @@ import {
   DashboardDrilldownsManageProvider,
   DashboardPanelTimeRangeProvider,
 } from './dashboard';
-import { SearchSessionsProvider } from './search_sessions';
+import { SearchSessionsService } from './search_sessions';
 
 // define the name and providers for services that should be
 // available to your tests. If you don't specify anything here
@@ -107,5 +107,5 @@ export const services = {
   dashboardDrilldownPanelActions: DashboardDrilldownPanelActionsProvider,
   dashboardDrilldownsManage: DashboardDrilldownsManageProvider,
   dashboardPanelTimeRange: DashboardPanelTimeRangeProvider,
-  searchSessions: SearchSessionsProvider,
+  searchSessions: SearchSessionsService,
 };
diff --git a/x-pack/test/functional/services/ml/api.ts b/x-pack/test/functional/services/ml/api.ts
index 4623b4f4e41ae..9a96b1ec372dc 100644
--- a/x-pack/test/functional/services/ml/api.ts
+++ b/x-pack/test/functional/services/ml/api.ts
@@ -384,7 +384,7 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
       });
     },
 
-    async createCalendarEvents(calendarId: string, events: estypes.ScheduledEvent[]) {
+    async createCalendarEvents(calendarId: string, events: estypes.MlCalendarEvent[]) {
       log.debug(`Creating events for calendar with id '${calendarId}'...`);
       await esSupertest.post(`/_ml/calendars/${calendarId}/events`).send({ events }).expect(200);
       await this.waitForEventsToExistInCalendar(calendarId, events);
@@ -396,7 +396,7 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
     },
 
     assertAllEventsExistInCalendar: (
-      eventsToCheck: estypes.ScheduledEvent[],
+      eventsToCheck: estypes.MlCalendarEvent[],
       calendar: Calendar
     ): boolean => {
       const updatedCalendarEvents = calendar.events;
@@ -409,7 +409,7 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
             (updatedEvent) =>
               updatedEvent.description === eventToCheck.description &&
               // updatedEvent are fetched with suptertest which converts start_time and end_time to number
-              // sometimes eventToCheck declared manually with types incompatible with estypes.ScheduledEvent
+              // sometimes eventToCheck declared manually with types incompatible with estypes.MlCalendarEvent
               String(updatedEvent.start_time) === String(eventToCheck.start_time) &&
               String(updatedEvent.end_time) === String(eventToCheck.end_time)
           ) < 0
@@ -429,7 +429,7 @@ export function MachineLearningAPIProvider({ getService }: FtrProviderContext) {
 
     async waitForEventsToExistInCalendar(
       calendarId: string,
-      eventsToCheck: estypes.ScheduledEvent[],
+      eventsToCheck: estypes.MlCalendarEvent[],
       errorMsg?: string
     ) {
       await retry.waitForWithTimeout(`'${calendarId}' events to exist`, 5 * 1000, async () => {
diff --git a/x-pack/test/functional/services/ml/common_ui.ts b/x-pack/test/functional/services/ml/common_ui.ts
index b61bc8871482f..2de5d83714aee 100644
--- a/x-pack/test/functional/services/ml/common_ui.ts
+++ b/x-pack/test/functional/services/ml/common_ui.ts
@@ -12,7 +12,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 
 import type { CanvasElementColorStats } from '../canvas_element';
 
-interface SetValueOptions {
+export interface SetValueOptions {
   clearWithKeyboard?: boolean;
   typeCharByChar?: boolean;
 }
@@ -98,14 +98,6 @@ export function MachineLearningCommonUIProvider({ getService }: FtrProviderConte
       });
     },
 
-    async assertKibanaHomeFileDataVisLinkExists() {
-      await testSubjects.existOrFail('homeSynopsisLinkml_file_data_visualizer');
-    },
-
-    async assertKibanaHomeFileDataVisLinkNotExists() {
-      await testSubjects.missingOrFail('homeSynopsisLinkml_file_data_visualizer');
-    },
-
     async assertRadioGroupValue(testSubject: string, expectedValue: string) {
       const assertRadioGroupValue = await testSubjects.find(testSubject);
       const input = await assertRadioGroupValue.findByCssSelector(':checked');
diff --git a/x-pack/test/functional/services/ml/dashboard_embeddables.ts b/x-pack/test/functional/services/ml/dashboard_embeddables.ts
index 03b69854744d4..c4fa9f643e69e 100644
--- a/x-pack/test/functional/services/ml/dashboard_embeddables.ts
+++ b/x-pack/test/functional/services/ml/dashboard_embeddables.ts
@@ -78,7 +78,7 @@ export function MachineLearningDashboardEmbeddablesProvider(
     },
 
     async assertAnomalyChartsSeverityThresholdControlExists() {
-      await retry.tryForTime(60 * 1000, async () => {
+      await retry.tryForTime(3 * 60 * 1000, async () => {
         await testSubjects.existOrFail(`mlAnomalySeverityThresholdControls`);
       });
     },
diff --git a/x-pack/test/functional/services/ml/data_visualizer.ts b/x-pack/test/functional/services/ml/data_visualizer.ts
index 2ebc1e1ad3017..3571f9193e6b3 100644
--- a/x-pack/test/functional/services/ml/data_visualizer.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer.ts
@@ -62,7 +62,7 @@ export function MachineLearningDataVisualizerProvider({ getService }: FtrProvide
 
     async navigateToFileUpload() {
       await testSubjects.click('mlDataVisualizerUploadFileButton');
-      await testSubjects.existOrFail('mlPageFileDataVisualizerUpload');
+      await testSubjects.existOrFail('dataVisualizerPageFileUpload');
     },
   };
 }
diff --git a/x-pack/test/functional/services/ml/data_visualizer_file_based.ts b/x-pack/test/functional/services/ml/data_visualizer_file_based.ts
index e32c04f82804c..5eece4057ac0c 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_file_based.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_file_based.ts
@@ -25,18 +25,18 @@ export function MachineLearningDataVisualizerFileBasedProvider(
       log.debug(`Importing file '${path}' ...`);
       await PageObjects.common.setFileInputPath(path);
 
-      await testSubjects.waitForDeleted('mlPageFileDataVisLoading');
+      await testSubjects.waitForDeleted('dataVisualizerPageFileLoading');
 
       if (expectError) {
-        await testSubjects.existOrFail('~mlFileUploadErrorCallout');
+        await testSubjects.existOrFail('~dataVisualizerFileUploadErrorCallout');
       } else {
-        await testSubjects.missingOrFail('~mlFileUploadErrorCallout');
-        await testSubjects.existOrFail('mlPageFileDataVisResults');
+        await testSubjects.missingOrFail('~dataVisualizerFileUploadErrorCallout');
+        await testSubjects.existOrFail('dataVisualizerPageFileResults');
       }
     },
 
     async assertFileTitle(expectedTitle: string) {
-      const actualTitle = await testSubjects.getVisibleText('mlFileDataVisResultsTitle');
+      const actualTitle = await testSubjects.getVisibleText('dataVisualizerFileResultsTitle');
       expect(actualTitle).to.eql(
         expectedTitle,
         `Expected file title to be '${expectedTitle}' (got '${actualTitle}')`
@@ -44,15 +44,15 @@ export function MachineLearningDataVisualizerFileBasedProvider(
     },
 
     async assertFileContentPanelExists() {
-      await testSubjects.existOrFail('mlFileDataVisFileContentPanel');
+      await testSubjects.existOrFail('dataVisualizerFileFileContentPanel');
     },
 
     async assertSummaryPanelExists() {
-      await testSubjects.existOrFail('mlFileDataVisSummaryPanel');
+      await testSubjects.existOrFail('dataVisualizerFileSummaryPanel');
     },
 
     async assertFileStatsPanelExists() {
-      await testSubjects.existOrFail('mlFileDataVisFileStatsPanel');
+      await testSubjects.existOrFail('dataVisualizerFileFileStatsPanel');
     },
 
     async assertNumberOfFieldCards(number: number) {
@@ -64,7 +64,7 @@ export function MachineLearningDataVisualizerFileBasedProvider(
     },
 
     async assertImportButtonEnabled(expectedValue: boolean) {
-      const isEnabled = await testSubjects.isEnabled('mlFileDataVisOpenImportPageButton');
+      const isEnabled = await testSubjects.isEnabled('dataVisualizerFileOpenImportPageButton');
       expect(isEnabled).to.eql(
         expectedValue,
         `Expected "import" button to be '${expectedValue ? 'enabled' : 'disabled'}' (got '${
@@ -74,17 +74,17 @@ export function MachineLearningDataVisualizerFileBasedProvider(
     },
 
     async navigateToFileImport() {
-      await testSubjects.click('mlFileDataVisOpenImportPageButton');
-      await testSubjects.existOrFail('mlPageFileDataVisImport');
+      await testSubjects.click('dataVisualizerFileOpenImportPageButton');
+      await testSubjects.existOrFail('dataVisualizerPageFileImport');
     },
 
     async assertImportSettingsPanelExists() {
-      await testSubjects.existOrFail('mlFileDataVisImportSettingsPanel');
+      await testSubjects.existOrFail('dataVisualizerFileImportSettingsPanel');
     },
 
     async assertIndexNameValue(expectedValue: string) {
       const actualIndexName = await testSubjects.getAttribute(
-        'mlFileDataVisIndexNameInput',
+        'dataVisualizerFileIndexNameInput',
         'value'
       );
       expect(actualIndexName).to.eql(
@@ -94,14 +94,16 @@ export function MachineLearningDataVisualizerFileBasedProvider(
     },
 
     async setIndexName(indexName: string) {
-      await mlCommonUI.setValueWithChecks('mlFileDataVisIndexNameInput', indexName, {
+      await mlCommonUI.setValueWithChecks('dataVisualizerFileIndexNameInput', indexName, {
         clearWithKeyboard: true,
       });
       await this.assertIndexNameValue(indexName);
     },
 
     async assertCreateIndexPatternCheckboxValue(expectedValue: boolean) {
-      const isChecked = await testSubjects.isChecked('mlFileDataVisCreateIndexPatternCheckbox');
+      const isChecked = await testSubjects.isChecked(
+        'dataVisualizerFileCreateIndexPatternCheckbox'
+      );
       expect(isChecked).to.eql(
         expectedValue,
         `Expected create index pattern checkbox to be ${expectedValue ? 'checked' : 'unchecked'}`
@@ -109,10 +111,12 @@ export function MachineLearningDataVisualizerFileBasedProvider(
     },
 
     async setCreateIndexPatternCheckboxState(newState: boolean) {
-      const isChecked = await testSubjects.isChecked('mlFileDataVisCreateIndexPatternCheckbox');
+      const isChecked = await testSubjects.isChecked(
+        'dataVisualizerFileCreateIndexPatternCheckbox'
+      );
       if (isChecked !== newState) {
         // this checkbox can't be clicked directly, instead click the corresponding label
-        const panel = await testSubjects.find('mlFileDataVisImportSettingsPanel');
+        const panel = await testSubjects.find('dataVisualizerFileImportSettingsPanel');
         const label = await panel.findByCssSelector('[for="createIndexPattern"]');
         await label.click();
       }
@@ -120,9 +124,9 @@ export function MachineLearningDataVisualizerFileBasedProvider(
     },
 
     async startImportAndWaitForProcessing() {
-      await testSubjects.clickWhenNotDisabled('mlFileDataVisImportButton');
+      await testSubjects.clickWhenNotDisabled('dataVisualizerFileImportButton');
       await retry.tryForTime(60 * 1000, async () => {
-        await testSubjects.existOrFail('mlFileImportSuccessCallout');
+        await testSubjects.existOrFail('dataVisualizerFileImportSuccessCallout');
       });
     },
 
diff --git a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts
index 4beaa78d0189b..7f32968ec4326 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_index_based.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_index_based.ts
@@ -19,12 +19,12 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
 
   return {
     async assertTimeRangeSelectorSectionExists() {
-      await testSubjects.existOrFail('mlDataVisualizerTimeRangeSelectorSection');
+      await testSubjects.existOrFail('dataVisualizerTimeRangeSelectorSection');
     },
 
     async assertTotalDocumentCount(expectedFormattedTotalDocCount: string) {
       await retry.tryForTime(5000, async () => {
-        const docCount = await testSubjects.getVisibleText('mlDataVisualizerTotalDocCount');
+        const docCount = await testSubjects.getVisibleText('dataVisualizerTotalDocCount');
         expect(docCount).to.eql(
           expectedFormattedTotalDocCount,
           `Expected total document count to be '${expectedFormattedTotalDocCount}' (got '${docCount}')`
@@ -33,40 +33,40 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
     },
 
     async clickUseFullDataButton(expectedFormattedTotalDocCount: string) {
-      await testSubjects.clickWhenNotDisabled('mlButtonUseFullData');
+      await testSubjects.clickWhenNotDisabled('dataVisualizerButtonUseFullData');
       await this.assertTotalDocumentCount(expectedFormattedTotalDocCount);
     },
 
     async assertTotalDocCountHeaderExist() {
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail(`mlDataVisualizerTotalDocCountHeader`);
+        await testSubjects.existOrFail(`dataVisualizerTotalDocCountHeader`);
       });
     },
 
     async assertTotalDocCountChartExist() {
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail(`mlFieldDataDocumentCountChart`);
+        await testSubjects.existOrFail(`dataVisualizerDocumentCountChart`);
       });
     },
 
     async assertFieldCountPanelExist() {
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail(`mlDataVisualizerFieldCountPanel`);
+        await testSubjects.existOrFail(`dataVisualizerFieldCountPanel`);
       });
     },
 
     async assertMetricFieldsSummaryExist() {
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail(`mlDataVisualizerMetricFieldsSummary`);
+        await testSubjects.existOrFail(`dataVisualizerMetricFieldsSummary`);
       });
     },
 
     async assertVisibleMetricFieldsCount(count: number) {
       const expectedCount = count.toString();
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail('mlDataVisualizerVisibleMetricFieldsCount');
+        await testSubjects.existOrFail('dataVisualizerVisibleMetricFieldsCount');
         const actualCount = await testSubjects.getVisibleText(
-          'mlDataVisualizerVisibleMetricFieldsCount'
+          'dataVisualizerVisibleMetricFieldsCount'
         );
         expect(expectedCount).to.eql(
           expectedCount,
@@ -78,9 +78,9 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
     async assertTotalMetricFieldsCount(count: number) {
       const expectedCount = count.toString();
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail('mlDataVisualizerMetricFieldsCount');
+        await testSubjects.existOrFail('dataVisualizerMetricFieldsCount');
         const actualCount = await testSubjects.getVisibleText(
-          'mlDataVisualizerVisibleMetricFieldsCount'
+          'dataVisualizerVisibleMetricFieldsCount'
         );
         expect(expectedCount).to.contain(
           expectedCount,
@@ -92,8 +92,8 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
     async assertVisibleFieldsCount(count: number) {
       const expectedCount = count.toString();
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail('mlDataVisualizerVisibleFieldsCount');
-        const actualCount = await testSubjects.getVisibleText('mlDataVisualizerVisibleFieldsCount');
+        await testSubjects.existOrFail('dataVisualizerVisibleFieldsCount');
+        const actualCount = await testSubjects.getVisibleText('dataVisualizerVisibleFieldsCount');
         expect(expectedCount).to.eql(
           expectedCount,
           `Expected fields count to be '${expectedCount}' (got '${actualCount}')`
@@ -104,8 +104,8 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
     async assertTotalFieldsCount(count: number) {
       const expectedCount = count.toString();
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail('mlDataVisualizerTotalFieldsCount');
-        const actualCount = await testSubjects.getVisibleText('mlDataVisualizerTotalFieldsCount');
+        await testSubjects.existOrFail('dataVisualizerTotalFieldsCount');
+        const actualCount = await testSubjects.getVisibleText('dataVisualizerTotalFieldsCount');
         expect(expectedCount).to.contain(
           expectedCount,
           `Expected total fields count to be '${expectedCount}' (got '${actualCount}')`
@@ -115,30 +115,30 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
 
     async assertFieldsSummaryExist() {
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail(`mlDataVisualizerFieldsSummary`);
+        await testSubjects.existOrFail(`dataVisualizerFieldsSummary`);
       });
     },
 
     async assertDataVisualizerTableExist() {
       await retry.tryForTime(5000, async () => {
-        await testSubjects.existOrFail(`mlDataVisualizerTable`);
+        await testSubjects.existOrFail(`dataVisualizerTable`);
       });
     },
 
     async assertActionsPanelExists() {
-      await testSubjects.existOrFail('mlDataVisualizerActionsPanel');
+      await testSubjects.existOrFail('dataVisualizerActionsPanel');
     },
 
     async assertActionsPanelNotExists() {
-      await testSubjects.missingOrFail('mlDataVisualizerActionsPanel');
+      await testSubjects.missingOrFail('dataVisualizerActionsPanel');
     },
 
     async assertCreateAdvancedJobCardExists() {
-      await testSubjects.existOrFail('mlDataVisualizerCreateAdvancedJobCard');
+      await testSubjects.existOrFail('dataVisualizerCreateAdvancedJobCard');
     },
 
     async assertCreateAdvancedJobCardNotExists() {
-      await testSubjects.missingOrFail('mlDataVisualizerCreateAdvancedJobCard');
+      await testSubjects.missingOrFail('dataVisualizerCreateAdvancedJobCard');
     },
 
     async assertRecognizerCardExists(moduleId: string) {
@@ -150,15 +150,15 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
     },
 
     async clickCreateAdvancedJobButton() {
-      await testSubjects.clickWhenNotDisabled('mlDataVisualizerCreateAdvancedJobCard');
+      await testSubjects.clickWhenNotDisabled('dataVisualizerCreateAdvancedJobCard');
     },
 
     async assertCreateDataFrameAnalyticsCardExists() {
-      await testSubjects.existOrFail('mlDataVisualizerCreateDataFrameAnalyticsCard');
+      await testSubjects.existOrFail('dataVisualizerCreateDataFrameAnalyticsCard');
     },
 
     async assertCreateDataFrameAnalyticsCardNotExists() {
-      await testSubjects.missingOrFail('mlDataVisualizerCreateDataFrameAnalyticsCard');
+      await testSubjects.missingOrFail('dataVisualizerCreateDataFrameAnalyticsCard');
     },
 
     async assertViewInDiscoverCard(shouldExist: boolean) {
@@ -170,16 +170,16 @@ export function MachineLearningDataVisualizerIndexBasedProvider({
     },
 
     async assertViewInDiscoverCardExists() {
-      await testSubjects.existOrFail('mlDataVisualizerViewInDiscoverCard');
+      await testSubjects.existOrFail('dataVisualizerViewInDiscoverCard');
     },
 
     async assertViewInDiscoverCardNotExists() {
-      await testSubjects.missingOrFail('mlDataVisualizerViewInDiscoverCard');
+      await testSubjects.missingOrFail('dataVisualizerViewInDiscoverCard');
     },
 
     async clickViewInDiscoverButton() {
       await retry.tryForTime(5000, async () => {
-        await testSubjects.clickWhenNotDisabled('mlDataVisualizerViewInDiscoverCard');
+        await testSubjects.clickWhenNotDisabled('dataVisualizerViewInDiscoverCard');
         await PageObjects.discover.waitForDiscoverAppOnScreen();
       });
     },
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 cdd91da8ff9e6..1eb0edbe01c8e 100644
--- a/x-pack/test/functional/services/ml/data_visualizer_table.ts
+++ b/x-pack/test/functional/services/ml/data_visualizer_table.ts
@@ -21,36 +21,36 @@ export function MachineLearningDataVisualizerTableProvider(
 
   return new (class DataVisualizerTable {
     public async parseDataVisualizerTable() {
-      const table = await testSubjects.find('~mlDataVisualizerTable');
+      const table = await testSubjects.find('~dataVisualizerTable');
       const $ = await table.parseDomContent();
       const rows = [];
 
-      for (const tr of $.findTestSubjects('~mlDataVisualizerRow').toArray()) {
+      for (const tr of $.findTestSubjects('~dataVisualizerRow').toArray()) {
         const $tr = $(tr);
 
         rows.push({
           type: $tr
-            .findTestSubject('mlDataVisualizerTableColumnType')
+            .findTestSubject('dataVisualizerTableColumnType')
             .find('.euiTableCellContent')
             .text()
             .trim(),
           fieldName: $tr
-            .findTestSubject('mlDataVisualizerTableColumnName')
+            .findTestSubject('dataVisualizerTableColumnName')
             .find('.euiTableCellContent')
             .text()
             .trim(),
           documentsCount: $tr
-            .findTestSubject('mlDataVisualizerTableColumnDocumentsCount')
+            .findTestSubject('dataVisualizerTableColumnDocumentsCount')
             .find('.euiTableCellContent')
             .text()
             .trim(),
           distinctValues: $tr
-            .findTestSubject('mlDataVisualizerTableColumnDistinctValues')
+            .findTestSubject('dataVisualizerTableColumnDistinctValues')
             .find('.euiTableCellContent')
             .text()
             .trim(),
           distribution: $tr
-            .findTestSubject('mlDataVisualizerTableColumnDistribution')
+            .findTestSubject('dataVisualizerTableColumnDistribution')
             .find('.euiTableCellContent')
             .text()
             .trim(),
@@ -71,7 +71,7 @@ export function MachineLearningDataVisualizerTableProvider(
     }
 
     public rowSelector(fieldName: string, subSelector?: string) {
-      const row = `~mlDataVisualizerTable > ~row-${fieldName}`;
+      const row = `~dataVisualizerTable > ~row-${fieldName}`;
       return !subSelector ? row : `${row} > ${subSelector}`;
     }
 
@@ -80,7 +80,7 @@ export function MachineLearningDataVisualizerTableProvider(
     }
 
     public detailsSelector(fieldName: string, subSelector?: string) {
-      const row = `~mlDataVisualizerTable > ~mlDataVisualizerFieldExpandedRow-${fieldName}`;
+      const row = `~dataVisualizerTable > ~dataVisualizerFieldExpandedRow-${fieldName}`;
       return !subSelector ? row : `${row} > ${subSelector}`;
     }
 
@@ -89,11 +89,11 @@ export function MachineLearningDataVisualizerTableProvider(
         if (!(await testSubjects.exists(this.detailsSelector(fieldName)))) {
           const selector = this.rowSelector(
             fieldName,
-            `mlDataVisualizerDetailsToggle-${fieldName}-arrowDown`
+            `dataVisualizerDetailsToggle-${fieldName}-arrowDown`
           );
           await testSubjects.click(selector);
           await testSubjects.existOrFail(
-            this.rowSelector(fieldName, `mlDataVisualizerDetailsToggle-${fieldName}-arrowUp`),
+            this.rowSelector(fieldName, `dataVisualizerDetailsToggle-${fieldName}-arrowUp`),
             {
               timeout: 1000,
             }
@@ -107,10 +107,10 @@ export function MachineLearningDataVisualizerTableProvider(
       await retry.tryForTime(10000, async () => {
         if (await testSubjects.exists(this.detailsSelector(fieldName))) {
           await testSubjects.click(
-            this.rowSelector(fieldName, `mlDataVisualizerDetailsToggle-${fieldName}-arrowUp`)
+            this.rowSelector(fieldName, `dataVisualizerDetailsToggle-${fieldName}-arrowUp`)
           );
           await testSubjects.existOrFail(
-            this.rowSelector(fieldName, `mlDataVisualizerDetailsToggle-${fieldName}-arrowDown`),
+            this.rowSelector(fieldName, `dataVisualizerDetailsToggle-${fieldName}-arrowDown`),
             {
               timeout: 1000,
             }
@@ -123,7 +123,7 @@ export function MachineLearningDataVisualizerTableProvider(
     public async assertFieldDocCount(fieldName: string, docCountFormatted: string) {
       const docCountFormattedSelector = this.rowSelector(
         fieldName,
-        'mlDataVisualizerTableColumnDocumentsCount'
+        'dataVisualizerTableColumnDocumentsCount'
       );
       await testSubjects.existOrFail(docCountFormattedSelector);
       const docCount = await testSubjects.getVisibleText(docCountFormattedSelector);
@@ -134,40 +134,40 @@ export function MachineLearningDataVisualizerTableProvider(
     }
 
     public async assertViewInLensActionEnabled(fieldName: string) {
-      const actionButton = this.rowSelector(fieldName, 'mlActionButtonViewInLens');
+      const actionButton = this.rowSelector(fieldName, 'dataVisualizerActionViewInLensButton');
       await testSubjects.existOrFail(actionButton);
       await testSubjects.isEnabled(actionButton);
     }
 
     public async assertViewInLensActionNotExists(fieldName: string) {
-      const actionButton = this.rowSelector(fieldName, 'mlActionButtonViewInLens');
+      const actionButton = this.rowSelector(fieldName, 'dataVisualizerActionViewInLensButton');
       await testSubjects.missingOrFail(actionButton);
     }
 
     public async assertFieldDistinctValuesExist(fieldName: string) {
-      const selector = this.rowSelector(fieldName, 'mlDataVisualizerTableColumnDistinctValues');
+      const selector = this.rowSelector(fieldName, 'dataVisualizerTableColumnDistinctValues');
       await testSubjects.existOrFail(selector);
     }
 
     public async assertFieldDistributionExist(fieldName: string) {
-      const selector = this.rowSelector(fieldName, 'mlDataVisualizerTableColumnDistribution');
+      const selector = this.rowSelector(fieldName, 'dataVisualizerTableColumnDistribution');
       await testSubjects.existOrFail(selector);
     }
 
     public async assertSearchPanelExist() {
-      await testSubjects.existOrFail(`mlDataVisualizerSearchPanel`);
+      await testSubjects.existOrFail(`dataVisualizerSearchPanel`);
     }
 
     public async assertFieldNameInputExists() {
-      await testSubjects.existOrFail('mlDataVisualizerFieldNameSelect');
+      await testSubjects.existOrFail('dataVisualizerFieldNameSelect');
     }
 
     public async assertFieldTypeInputExists() {
-      await testSubjects.existOrFail('mlDataVisualizerFieldTypeSelect');
+      await testSubjects.existOrFail('dataVisualizerFieldTypeSelect');
     }
 
     public async assertSampleSizeInputExists() {
-      await testSubjects.existOrFail('mlDataVisualizerShardSizeSelect');
+      await testSubjects.existOrFail('dataVisualizerShardSizeSelect');
     }
 
     public async setSampleSizeInputValue(
@@ -176,9 +176,9 @@ export function MachineLearningDataVisualizerTableProvider(
       docCountFormatted: string
     ) {
       await this.assertSampleSizeInputExists();
-      await testSubjects.clickWhenNotDisabled('mlDataVisualizerShardSizeSelect');
-      await testSubjects.existOrFail(`mlDataVisualizerShardSizeOption ${sampleSize}`);
-      await testSubjects.click(`mlDataVisualizerShardSizeOption ${sampleSize}`);
+      await testSubjects.clickWhenNotDisabled('dataVisualizerShardSizeSelect');
+      await testSubjects.existOrFail(`dataVisualizerShardSizeOption ${sampleSize}`);
+      await testSubjects.click(`dataVisualizerShardSizeOption ${sampleSize}`);
 
       await retry.tryForTime(5000, async () => {
         await this.assertFieldDocCount(fieldName, docCountFormatted);
@@ -187,38 +187,36 @@ export function MachineLearningDataVisualizerTableProvider(
 
     public async setFieldTypeFilter(fieldTypes: string[], expectedRowCount = 1) {
       await this.assertFieldTypeInputExists();
-      await mlCommonUI.setMultiSelectFilter('mlDataVisualizerFieldTypeSelect', fieldTypes);
+      await mlCommonUI.setMultiSelectFilter('dataVisualizerFieldTypeSelect', fieldTypes);
       await this.assertTableRowCount(expectedRowCount);
     }
 
     async removeFieldTypeFilter(fieldTypes: string[], expectedRowCount = 1) {
       await this.assertFieldTypeInputExists();
-      await mlCommonUI.removeMultiSelectFilter('mlDataVisualizerFieldTypeSelect', fieldTypes);
+      await mlCommonUI.removeMultiSelectFilter('dataVisualizerFieldTypeSelect', fieldTypes);
       await this.assertTableRowCount(expectedRowCount);
     }
 
     public async setFieldNameFilter(fieldNames: string[], expectedRowCount = 1) {
       await this.assertFieldNameInputExists();
-      await mlCommonUI.setMultiSelectFilter('mlDataVisualizerFieldNameSelect', fieldNames);
+      await mlCommonUI.setMultiSelectFilter('dataVisualizerFieldNameSelect', fieldNames);
       await this.assertTableRowCount(expectedRowCount);
     }
 
     public async removeFieldNameFilter(fieldNames: string[], expectedRowCount: number) {
       await this.assertFieldNameInputExists();
-      await mlCommonUI.removeMultiSelectFilter('mlDataVisualizerFieldNameSelect', fieldNames);
+      await mlCommonUI.removeMultiSelectFilter('dataVisualizerFieldNameSelect', fieldNames);
       await this.assertTableRowCount(expectedRowCount);
     }
 
     public async assertShowEmptyFieldsSwitchExists() {
-      await testSubjects.existOrFail('mlDataVisualizerShowEmptyFieldsSwitch');
+      await testSubjects.existOrFail('dataVisualizerShowEmptyFieldsSwitch');
     }
 
     public async assertShowEmptyFieldsCheckState(expectedCheckState: boolean) {
       const actualCheckState =
-        (await testSubjects.getAttribute(
-          'mlDataVisualizerShowEmptyFieldsSwitch',
-          'aria-checked'
-        )) === 'true';
+        (await testSubjects.getAttribute('dataVisualizerShowEmptyFieldsSwitch', 'aria-checked')) ===
+        'true';
       expect(actualCheckState).to.eql(
         expectedCheckState,
         `Show empty fields check state should be '${expectedCheckState}' (got '${actualCheckState}')`
@@ -230,7 +228,7 @@ export function MachineLearningDataVisualizerTableProvider(
       await this.assertShowEmptyFieldsSwitchExists();
       await retry.tryForTime(5000, async () => {
         if (await this.assertShowEmptyFieldsCheckState(!checkState)) {
-          await testSubjects.click('mlDataVisualizerShowEmptyFieldsSwitch');
+          await testSubjects.click('dataVisualizerShowEmptyFieldsSwitch');
         }
         await this.assertShowEmptyFieldsCheckState(checkState);
         for (const field of expectedEmptyFields) {
@@ -240,9 +238,11 @@ export function MachineLearningDataVisualizerTableProvider(
     }
 
     public async assertTopValuesContents(fieldName: string, expectedTopValuesCount: number) {
-      const selector = this.detailsSelector(fieldName, 'mlFieldDataTopValues');
+      const selector = this.detailsSelector(fieldName, 'dataVisualizerFieldDataTopValuesContent');
       const topValuesElement = await testSubjects.find(selector);
-      const topValuesBars = await topValuesElement.findAllByTestSubject('mlFieldDataTopValueBar');
+      const topValuesBars = await topValuesElement.findAllByTestSubject(
+        'dataVisualizerFieldDataTopValueBar'
+      );
       expect(topValuesBars).to.have.length(
         expectedTopValuesCount,
         `Expected top values count for field '${fieldName}' to be '${expectedTopValuesCount}' (got '${topValuesBars.length}')`
@@ -250,9 +250,11 @@ export function MachineLearningDataVisualizerTableProvider(
     }
 
     public async assertDistributionPreviewExist(fieldName: string) {
-      await testSubjects.existOrFail(this.rowSelector(fieldName, `mlDataGridChart-${fieldName}`));
       await testSubjects.existOrFail(
-        this.rowSelector(fieldName, `mlDataGridChart-${fieldName}-histogram`)
+        this.rowSelector(fieldName, `dataVisualizerDataGridChart-${fieldName}`)
+      );
+      await testSubjects.existOrFail(
+        this.rowSelector(fieldName, `dataVisualizerDataGridChart-${fieldName}-histogram`)
       );
     }
 
@@ -267,9 +269,13 @@ export function MachineLearningDataVisualizerTableProvider(
       await this.assertFieldDocCount(fieldName, docCountFormatted);
       await this.ensureDetailsOpen(fieldName);
 
-      await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlNumberSummaryTable'));
+      await testSubjects.existOrFail(
+        this.detailsSelector(fieldName, 'dataVisualizerNumberSummaryTable')
+      );
 
-      await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlTopValues'));
+      await testSubjects.existOrFail(
+        this.detailsSelector(fieldName, 'dataVisualizerFieldDataTopValues')
+      );
       await this.assertTopValuesContents(fieldName, topValuesCount);
 
       if (checkDistributionPreviewExist) {
@@ -289,7 +295,9 @@ export function MachineLearningDataVisualizerTableProvider(
       await this.assertFieldDocCount(fieldName, docCountFormatted);
       await this.ensureDetailsOpen(fieldName);
 
-      await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlDateSummaryTable'));
+      await testSubjects.existOrFail(
+        this.detailsSelector(fieldName, 'dataVisualizerDateSummaryTable')
+      );
       await this.ensureDetailsClosed(fieldName);
     }
 
@@ -302,14 +310,16 @@ export function MachineLearningDataVisualizerTableProvider(
       await this.assertFieldDocCount(fieldName, docCountFormatted);
       await this.ensureDetailsOpen(fieldName);
 
-      await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlFieldDataTopValues'));
+      await testSubjects.existOrFail(
+        this.detailsSelector(fieldName, 'dataVisualizerFieldDataTopValuesContent')
+      );
       await this.assertTopValuesContents(fieldName, topValuesCount);
       await this.ensureDetailsClosed(fieldName);
     }
 
     public async assertExamplesList(fieldName: string, expectedExamplesCount: number) {
       const examplesList = await testSubjects.find(
-        this.detailsSelector(fieldName, 'mlFieldDataExamplesList')
+        this.detailsSelector(fieldName, 'dataVisualizerFieldDataExamplesList')
       );
       const examplesListItems = await examplesList.findAllByTagName('li');
       expect(examplesListItems).to.have.length(
@@ -343,7 +353,9 @@ export function MachineLearningDataVisualizerTableProvider(
 
       await this.assertExamplesList(fieldName, expectedExamplesCount);
 
-      await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlEmbeddedMapContent'));
+      await testSubjects.existOrFail(
+        this.detailsSelector(fieldName, 'dataVisualizerEmbeddedMapContent')
+      );
 
       await this.ensureDetailsClosed(fieldName);
     }
@@ -354,7 +366,9 @@ export function MachineLearningDataVisualizerTableProvider(
 
       await this.ensureDetailsOpen(fieldName);
 
-      await testSubjects.existOrFail(this.detailsSelector(fieldName, 'mlDVDocumentStatsContent'));
+      await testSubjects.existOrFail(
+        this.detailsSelector(fieldName, 'dataVisualizerDocumentStatsContent')
+      );
 
       await this.ensureDetailsClosed(fieldName);
     }
@@ -387,7 +401,7 @@ export function MachineLearningDataVisualizerTableProvider(
     }
 
     public async ensureNumRowsPerPage(n: 10 | 25 | 50) {
-      const paginationButton = 'mlDataVisualizerTable > tablePaginationPopoverButton';
+      const paginationButton = 'dataVisualizerTable > tablePaginationPopoverButton';
       await retry.tryForTime(10000, async () => {
         await testSubjects.existOrFail(paginationButton);
         await testSubjects.click(paginationButton);
diff --git a/x-pack/test/functional/services/ml/job_source_selection.ts b/x-pack/test/functional/services/ml/job_source_selection.ts
index e5e9a68b95f8e..e215f9b857435 100644
--- a/x-pack/test/functional/services/ml/job_source_selection.ts
+++ b/x-pack/test/functional/services/ml/job_source_selection.ts
@@ -40,7 +40,7 @@ export function MachineLearningJobSourceSelectionProvider({ getService }: FtrPro
     },
 
     async selectSourceForIndexBasedDataVisualizer(sourceName: string) {
-      await this.selectSource(sourceName, 'mlPageIndexDataVisualizer');
+      await this.selectSource(sourceName, 'dataVisualizerIndexPage');
     },
   };
 }
diff --git a/x-pack/test/functional/services/ml/job_wizard_common.ts b/x-pack/test/functional/services/ml/job_wizard_common.ts
index 2990f70059767..7df09652f8953 100644
--- a/x-pack/test/functional/services/ml/job_wizard_common.ts
+++ b/x-pack/test/functional/services/ml/job_wizard_common.ts
@@ -11,6 +11,10 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 import { MlCommonUI } from './common_ui';
 import { MlCustomUrls } from './custom_urls';
 
+export interface SectionOptions {
+  withAdvancedSection: boolean;
+}
+
 export function MachineLearningJobWizardCommonProvider(
   { getService }: FtrProviderContext,
   mlCommonUI: MlCommonUI,
@@ -20,10 +24,6 @@ export function MachineLearningJobWizardCommonProvider(
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
 
-  interface SectionOptions {
-    withAdvancedSection: boolean;
-  }
-
   function advancedSectionSelector(subSelector?: string) {
     const subj = 'mlJobWizardAdvancedSection';
     return !subSelector ? subj : `${subj} > ${subSelector}`;
diff --git a/x-pack/test/functional/services/ml/test_resources.ts b/x-pack/test/functional/services/ml/test_resources.ts
index a8db7ccb7a764..a857809a3079f 100644
--- a/x-pack/test/functional/services/ml/test_resources.ts
+++ b/x-pack/test/functional/services/ml/test_resources.ts
@@ -534,7 +534,7 @@ export function MachineLearningTestResourcesProvider({ getService }: FtrProvider
     },
 
     async installFleetPackage(packageIdentifier: string) {
-      log.debug(`Installing Fleet package'${packageIdentifier}'`);
+      log.debug(`Installing Fleet package '${packageIdentifier}'`);
 
       await supertest
         .post(`/api/fleet/epm/packages/${packageIdentifier}`)
@@ -545,7 +545,7 @@ export function MachineLearningTestResourcesProvider({ getService }: FtrProvider
     },
 
     async removeFleetPackage(packageIdentifier: string) {
-      log.debug(`Removing Fleet package'${packageIdentifier}'`);
+      log.debug(`Removing Fleet package '${packageIdentifier}'`);
 
       await supertest
         .delete(`/api/fleet/epm/packages/${packageIdentifier}`)
diff --git a/x-pack/test/functional/services/search_sessions.ts b/x-pack/test/functional/services/search_sessions.ts
index c1702742b28ac..4490b87006833 100644
--- a/x-pack/test/functional/services/search_sessions.ts
+++ b/x-pack/test/functional/services/search_sessions.ts
@@ -8,7 +8,7 @@
 import expect from '@kbn/expect';
 import { SavedObjectsFindResponse } from 'src/core/server';
 import { WebElementWrapper } from '../../../../test/functional/services/lib/web_element_wrapper';
-import { FtrProviderContext } from '../ftr_provider_context';
+import { FtrService } from '../ftr_provider_context';
 
 const SEARCH_SESSION_INDICATOR_TEST_SUBJ = 'searchSessionIndicator';
 const SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ = 'searchSessionIndicatorPopoverContainer';
@@ -25,154 +25,153 @@ type SessionStateType =
   | 'restored'
   | 'canceled';
 
-export function SearchSessionsProvider({ getService }: FtrProviderContext) {
-  const testSubjects = getService('testSubjects');
-  const log = getService('log');
-  const retry = getService('retry');
-  const browser = getService('browser');
-  const supertest = getService('supertest');
-
-  return new (class SearchSessionsService {
-    public async find(): Promise<WebElementWrapper> {
-      return testSubjects.find(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
-    }
-
-    public async exists(): Promise<boolean> {
-      return testSubjects.exists(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
-    }
-
-    public async missingOrFail(): Promise<void> {
-      return testSubjects.missingOrFail(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
-    }
-
-    public async disabledOrFail() {
-      await this.exists();
-      await expect(await (await this.find()).getAttribute('data-save-disabled')).to.be('true');
-    }
-
-    public async expectState(state: SessionStateType) {
-      return retry.waitFor(`searchSessions indicator to get into state = ${state}`, async () => {
-        const currentState = await (
-          await testSubjects.find(SEARCH_SESSION_INDICATOR_TEST_SUBJ)
-        ).getAttribute('data-state');
-        return currentState === state;
+export class SearchSessionsService extends FtrService {
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+  private readonly log = this.ctx.getService('log');
+  private readonly retry = this.ctx.getService('retry');
+  private readonly browser = this.ctx.getService('browser');
+  private readonly supertest = this.ctx.getService('supertest');
+
+  public async find(): Promise<WebElementWrapper> {
+    return this.testSubjects.find(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
+  }
+
+  public async exists(): Promise<boolean> {
+    return this.testSubjects.exists(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
+  }
+
+  public async missingOrFail(): Promise<void> {
+    return this.testSubjects.missingOrFail(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
+  }
+
+  public async disabledOrFail() {
+    await this.exists();
+    await expect(await (await this.find()).getAttribute('data-save-disabled')).to.be('true');
+  }
+
+  public async expectState(state: SessionStateType) {
+    return this.retry.waitFor(`searchSessions indicator to get into state = ${state}`, async () => {
+      const currentState = await (
+        await this.testSubjects.find(SEARCH_SESSION_INDICATOR_TEST_SUBJ)
+      ).getAttribute('data-state');
+      this.log.info(`searchSessions state current: ${currentState} expected: ${state}`);
+      return currentState === state;
+    });
+  }
+
+  public async viewSearchSessions() {
+    this.log.debug('viewSearchSessions');
+    await this.ensurePopoverOpened();
+    await this.testSubjects.click('searchSessionIndicatorViewSearchSessionsLink');
+  }
+
+  public async save({ searchSessionName }: { searchSessionName?: string } = {}) {
+    this.log.debug('save the search session');
+    await this.ensurePopoverOpened();
+    await this.testSubjects.click('searchSessionIndicatorSaveBtn');
+
+    if (searchSessionName) {
+      await this.testSubjects.click('searchSessionNameEdit');
+      await this.testSubjects.setValue('searchSessionNameInput', searchSessionName, {
+        clearWithKeyboard: true,
       });
-    }
-
-    public async viewSearchSessions() {
-      log.debug('viewSearchSessions');
-      await this.ensurePopoverOpened();
-      await testSubjects.click('searchSessionIndicatorViewSearchSessionsLink');
-    }
-
-    public async save({ searchSessionName }: { searchSessionName?: string } = {}) {
-      log.debug('save the search session');
-      await this.ensurePopoverOpened();
-      await testSubjects.click('searchSessionIndicatorSaveBtn');
-
-      if (searchSessionName) {
-        await testSubjects.click('searchSessionNameEdit');
-        await testSubjects.setValue('searchSessionNameInput', searchSessionName, {
-          clearWithKeyboard: true,
-        });
-        await testSubjects.click('searchSessionNameSave');
+      await this.testSubjects.click('searchSessionNameSave');
+    }
+
+    await this.ensurePopoverClosed();
+  }
+
+  public async cancel() {
+    this.log.debug('cancel the search session');
+    await this.ensurePopoverOpened();
+    await this.testSubjects.click('searchSessionIndicatorCancelBtn');
+    await this.ensurePopoverClosed();
+  }
+
+  public async openPopover() {
+    await this.ensurePopoverOpened();
+  }
+
+  public async openedOrFail() {
+    return this.testSubjects.existOrFail(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ, {
+      timeout: 15000, // because popover auto opens after search takes 10s
+    });
+  }
+
+  public async closedOrFail() {
+    return this.testSubjects.missingOrFail(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ, {
+      timeout: 15000, // because popover auto opens after search takes 10s
+    });
+  }
+
+  private async ensurePopoverOpened() {
+    this.log.debug('ensurePopoverOpened');
+    const isAlreadyOpen = await this.testSubjects.exists(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ);
+    if (isAlreadyOpen) {
+      this.log.debug('Popover is already open');
+      return;
+    }
+    return this.retry.waitFor(`searchSessions popover opened`, async () => {
+      await this.testSubjects.click(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
+      return await this.testSubjects.exists(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ);
+    });
+  }
+
+  private async ensurePopoverClosed() {
+    this.log.debug('ensurePopoverClosed');
+    const isAlreadyClosed = !(await this.testSubjects.exists(
+      SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ
+    ));
+    if (isAlreadyClosed) return;
+    return this.retry.waitFor(`searchSessions popover closed`, async () => {
+      await this.browser.pressKeys(this.browser.keys.ESCAPE);
+      return !(await this.testSubjects.exists(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ));
+    });
+  }
+
+  /*
+   * This cleanup function should be used by tests that create new search sessions.
+   * Tests should not end with new search sessions remaining in storage since that interferes with functional tests that check the _find API.
+   * Alternatively, a test can navigate to `Management > Search Sessions` and use the UI to delete any created tests.
+   */
+  public async deleteAllSearchSessions() {
+    this.log.debug('Deleting created search sessions');
+    // ignores 409 errs and keeps retrying
+    await this.retry.tryForTime(10000, async () => {
+      const { body } = await this.supertest
+        .post('/internal/session/_find')
+        .set('kbn-xsrf', 'anything')
+        .set('kbn-system-request', 'true')
+        .send({ page: 1, perPage: 10000, sortField: 'created', sortOrder: 'asc' })
+        .expect(200);
+
+      const { saved_objects: savedObjects } = body as SavedObjectsFindResponse;
+      if (savedObjects.length) {
+        this.log.debug(`Found created search sessions: ${savedObjects.map(({ id }) => id)}`);
       }
-
-      await this.ensurePopoverClosed();
-    }
-
-    public async cancel() {
-      log.debug('cancel the search session');
-      await this.ensurePopoverOpened();
-      await testSubjects.click('searchSessionIndicatorCancelBtn');
-      await this.ensurePopoverClosed();
-    }
-
-    public async openPopover() {
-      await this.ensurePopoverOpened();
-    }
-
-    public async openedOrFail() {
-      return testSubjects.existOrFail(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ, {
-        timeout: 15000, // because popover auto opens after search takes 10s
-      });
-    }
-
-    public async closedOrFail() {
-      return testSubjects.missingOrFail(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ, {
-        timeout: 15000, // because popover auto opens after search takes 10s
-      });
-    }
-
-    private async ensurePopoverOpened() {
-      log.debug('ensurePopoverOpened');
-      const isAlreadyOpen = await testSubjects.exists(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ);
-      if (isAlreadyOpen) {
-        log.debug('Popover is already open');
-        return;
-      }
-      return retry.waitFor(`searchSessions popover opened`, async () => {
-        await testSubjects.click(SEARCH_SESSION_INDICATOR_TEST_SUBJ);
-        return await testSubjects.exists(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ);
-      });
-    }
-
-    private async ensurePopoverClosed() {
-      log.debug('ensurePopoverClosed');
-      const isAlreadyClosed = !(await testSubjects.exists(
-        SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ
-      ));
-      if (isAlreadyClosed) return;
-      return retry.waitFor(`searchSessions popover closed`, async () => {
-        await browser.pressKeys(browser.keys.ESCAPE);
-        return !(await testSubjects.exists(SEARCH_SESSIONS_POPOVER_CONTENT_TEST_SUBJ));
-      });
-    }
-
-    /*
-     * This cleanup function should be used by tests that create new search sessions.
-     * Tests should not end with new search sessions remaining in storage since that interferes with functional tests that check the _find API.
-     * Alternatively, a test can navigate to `Management > Search Sessions` and use the UI to delete any created tests.
-     */
-    public async deleteAllSearchSessions() {
-      log.debug('Deleting created search sessions');
-      // ignores 409 errs and keeps retrying
-      await retry.tryForTime(10000, async () => {
-        const { body } = await supertest
-          .post('/internal/session/_find')
-          .set('kbn-xsrf', 'anything')
-          .set('kbn-system-request', 'true')
-          .send({ page: 1, perPage: 10000, sortField: 'created', sortOrder: 'asc' })
-          .expect(200);
-
-        const { saved_objects: savedObjects } = body as SavedObjectsFindResponse;
-        if (savedObjects.length) {
-          log.debug(`Found created search sessions: ${savedObjects.map(({ id }) => id)}`);
-        }
-        await Promise.all(
-          savedObjects.map(async (so) => {
-            log.debug(`Deleting search session: ${so.id}`);
-            await supertest
-              .delete(`/internal/session/${so.id}`)
-              .set(`kbn-xsrf`, `anything`)
-              .expect(200);
-          })
-        );
-      });
-    }
-
-    public async markTourDone() {
-      await Promise.all([
-        browser.setLocalStorageItem(TOUR_TAKING_TOO_LONG_STEP_KEY, 'true'),
-        browser.setLocalStorageItem(TOUR_RESTORE_STEP_KEY, 'true'),
-      ]);
-    }
-
-    public async markTourUndone() {
-      await Promise.all([
-        browser.removeLocalStorageItem(TOUR_TAKING_TOO_LONG_STEP_KEY),
-        browser.removeLocalStorageItem(TOUR_RESTORE_STEP_KEY),
-      ]);
-    }
-  })();
+      await Promise.all(
+        savedObjects.map(async (so) => {
+          this.log.debug(`Deleting search session: ${so.id}`);
+          await this.supertest
+            .delete(`/internal/session/${so.id}`)
+            .set(`kbn-xsrf`, `anything`)
+            .expect(200);
+        })
+      );
+    });
+  }
+
+  public async markTourDone() {
+    await Promise.all([
+      this.browser.setLocalStorageItem(TOUR_TAKING_TOO_LONG_STEP_KEY, 'true'),
+      this.browser.setLocalStorageItem(TOUR_RESTORE_STEP_KEY, 'true'),
+    ]);
+  }
+
+  public async markTourUndone() {
+    await Promise.all([
+      this.browser.removeLocalStorageItem(TOUR_TAKING_TOO_LONG_STEP_KEY),
+      this.browser.removeLocalStorageItem(TOUR_RESTORE_STEP_KEY),
+    ]);
+  }
 }
diff --git a/x-pack/test/functional/services/uptime/certificates.ts b/x-pack/test/functional/services/uptime/certificates.ts
index 498e18de8e281..3a560acee52d8 100644
--- a/x-pack/test/functional/services/uptime/certificates.ts
+++ b/x-pack/test/functional/services/uptime/certificates.ts
@@ -11,6 +11,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export function UptimeCertProvider({ getService, getPageObjects }: FtrProviderContext) {
   const testSubjects = getService('testSubjects');
   const retry = getService('retry');
+  const find = getService('find');
 
   const PageObjects = getPageObjects(['common', 'timePicker', 'header']);
 
@@ -27,7 +28,7 @@ export function UptimeCertProvider({ getService, getPageObjects }: FtrProviderCo
   return {
     async hasViewCertButton() {
       return retry.tryForTime(15000, async () => {
-        await testSubjects.existOrFail('uptimeCertificatesLink');
+        await find.existsByCssSelector('[href="/app/uptime/certificates"]');
       });
     },
     async certificateExists(cert: { certId: string; monitorId: string }) {
diff --git a/x-pack/test/functional/services/uptime/monitor.ts b/x-pack/test/functional/services/uptime/monitor.ts
index 417c9bb20f9b7..583a37d7f4ef9 100644
--- a/x-pack/test/functional/services/uptime/monitor.ts
+++ b/x-pack/test/functional/services/uptime/monitor.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export function UptimeMonitorProvider({ getService, getPageObjects }: FtrProviderContext) {
diff --git a/x-pack/test/functional/services/uptime/navigation.ts b/x-pack/test/functional/services/uptime/navigation.ts
index b76d68e1eb454..51806d1006ab4 100644
--- a/x-pack/test/functional/services/uptime/navigation.ts
+++ b/x-pack/test/functional/services/uptime/navigation.ts
@@ -10,6 +10,7 @@ import { FtrProviderContext } from '../../ftr_provider_context';
 export function UptimeNavigationProvider({ getService, getPageObjects }: FtrProviderContext) {
   const retry = getService('retry');
   const testSubjects = getService('testSubjects');
+  const find = getService('find');
   const PageObjects = getPageObjects(['common', 'timePicker', 'header']);
 
   const goToUptimeRoot = async () => {
@@ -70,8 +71,8 @@ export function UptimeNavigationProvider({ getService, getPageObjects }: FtrProv
     goToCertificates: async () => {
       if (!(await testSubjects.exists('uptimeCertificatesPage', { timeout: 0 }))) {
         return retry.try(async () => {
-          if (await testSubjects.exists('uptimeCertificatesLink', { timeout: 0 })) {
-            await testSubjects.click('uptimeCertificatesLink', 10000);
+          if (await find.existsByCssSelector('[href="/app/uptime/certificates"]', 0)) {
+            await find.clickByCssSelector('[href="/app/uptime/certificates"]');
           }
           await testSubjects.existOrFail('uptimeCertificatesPage');
         });
diff --git a/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts b/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts
index 642cc60e90441..a2a135b8cef0c 100644
--- a/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts
+++ b/x-pack/test/functional_basic/apps/ml/data_visualizer/index_data_visualizer_actions_panel.ts
@@ -19,7 +19,7 @@ export default function ({ getService }: FtrProviderContext) {
     const expectedQuery = 'airline: A* and responsetime > 5';
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/farequote');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/farequote');
       await ml.testResources.createIndexPatternIfNeeded(indexPatternName, '@timestamp');
       await ml.testResources.createSavedSearchFarequoteKueryIfNeeded();
       await ml.testResources.setKibanaTimeZoneToUTC();
diff --git a/x-pack/test/functional_basic/apps/ml/index.ts b/x-pack/test/functional_basic/apps/ml/index.ts
index 4d426967158ec..ed1ab4f417584 100644
--- a/x-pack/test/functional_basic/apps/ml/index.ts
+++ b/x-pack/test/functional_basic/apps/ml/index.ts
@@ -28,8 +28,8 @@ export default function ({ getService, loadTestFile }: FtrProviderContext) {
       await ml.testResources.deleteIndexPatternByTitle('ft_farequote');
       await ml.testResources.deleteIndexPatternByTitle('ft_module_sample_ecommerce');
 
-      await esArchiver.unload('ml/farequote');
-      await esArchiver.unload('ml/module_sample_ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/farequote');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/module_sample_ecommerce');
 
       await ml.testResources.resetKibanaTimeZone();
     });
diff --git a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts
index 6a80fe18404fb..aff1402f5567e 100644
--- a/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts
+++ b/x-pack/test/functional_basic/apps/ml/permissions/full_ml_access.ts
@@ -25,7 +25,7 @@ export default function ({ getService }: FtrProviderContext) {
       describe(`(${testUser.user})`, function () {
         const ecIndexPattern = 'ft_module_sample_ecommerce';
         const ecExpectedTotalCount = '287';
-        const ecExpectedModuleId = 'sample_data_ecommerce';
+        // const ecExpectedModuleId = 'sample_data_ecommerce';
 
         const uploadFilePath = path.join(
           __dirname,
@@ -45,7 +45,9 @@ export default function ({ getService }: FtrProviderContext) {
         before(async () => {
           await ml.api.cleanMlIndices();
 
-          await esArchiver.loadIfNeeded('ml/module_sample_ecommerce');
+          await esArchiver.loadIfNeeded(
+            'x-pack/test/functional/es_archives/ml/module_sample_ecommerce'
+          );
           await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date');
 
           await ml.securityUI.loginAs(testUser.user);
@@ -55,14 +57,6 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.securityUI.logout();
         });
 
-        it('should display the ML file data vis link on the Kibana home page', async () => {
-          await ml.testExecution.logTestStep('should load the Kibana home page');
-          await ml.navigation.navigateToKibanaHome();
-
-          await ml.testExecution.logTestStep('should display the ML file data vis link');
-          await ml.commonUI.assertKibanaHomeFileDataVisLinkExists();
-        });
-
         it('should display the ML entry in Kibana app menu', async () => {
           await ml.testExecution.logTestStep('should open the Kibana app menu');
           await ml.navigation.openKibanaNav();
@@ -135,13 +129,16 @@ export default function ({ getService }: FtrProviderContext) {
               testUser.discoverAvailable ? 'with' : 'without'
             } Discover card`
           );
-          await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+          if (testUser.discoverAvailable) {
+            await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+          }
           await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable);
 
-          await ml.testExecution.logTestStep('should not display job cards');
-          await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
-          await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
-          await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
+          // @TODO: Re-enable in follow up
+          // await ml.testExecution.logTestStep('should not display job cards');
+          // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
+          // await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
+          // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
         });
 
         it('should display elements on File Data Visualizer page correctly', async () => {
diff --git a/x-pack/test/functional_basic/apps/ml/permissions/no_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/no_ml_access.ts
index 91a37d0d98cda..8d3aa3c6b6ada 100644
--- a/x-pack/test/functional_basic/apps/ml/permissions/no_ml_access.ts
+++ b/x-pack/test/functional_basic/apps/ml/permissions/no_ml_access.ts
@@ -39,16 +39,9 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
           await PageObjects.error.expectForbidden();
         });
 
-        it('should not display the ML file data vis link on the Kibana home page', async () => {
-          await ml.testExecution.logTestStep('should load the Kibana home page');
-          await ml.navigation.navigateToKibanaHome();
-
-          await ml.testExecution.logTestStep('should not display the ML file data vis link');
-          await ml.commonUI.assertKibanaHomeFileDataVisLinkNotExists();
-        });
-
         it('should not display the ML entry in Kibana app menu', async () => {
           await ml.testExecution.logTestStep('should open the Kibana app menu');
+          await ml.navigation.navigateToKibanaHome();
           await ml.navigation.openKibanaNav();
 
           await ml.testExecution.logTestStep('should not display the ML nav link');
diff --git a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts
index f207b79582004..2e5216d722518 100644
--- a/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts
+++ b/x-pack/test/functional_basic/apps/ml/permissions/read_ml_access.ts
@@ -25,7 +25,8 @@ export default function ({ getService }: FtrProviderContext) {
       describe(`(${testUser.user})`, function () {
         const ecIndexPattern = 'ft_module_sample_ecommerce';
         const ecExpectedTotalCount = '287';
-        const ecExpectedModuleId = 'sample_data_ecommerce';
+        // @TODO: Re-enable in follow up
+        // const ecExpectedModuleId = 'sample_data_ecommerce';
 
         const uploadFilePath = path.join(
           __dirname,
@@ -45,7 +46,9 @@ export default function ({ getService }: FtrProviderContext) {
         before(async () => {
           await ml.api.cleanMlIndices();
 
-          await esArchiver.loadIfNeeded('ml/module_sample_ecommerce');
+          await esArchiver.loadIfNeeded(
+            'x-pack/test/functional/es_archives/ml/module_sample_ecommerce'
+          );
           await ml.testResources.createIndexPatternIfNeeded(ecIndexPattern, 'order_date');
 
           await ml.securityUI.loginAs(testUser.user);
@@ -55,14 +58,6 @@ export default function ({ getService }: FtrProviderContext) {
           await ml.securityUI.logout();
         });
 
-        it('should not display the ML file data vis link on the Kibana home page', async () => {
-          await ml.testExecution.logTestStep('should load the Kibana home page');
-          await ml.navigation.navigateToKibanaHome();
-
-          await ml.testExecution.logTestStep('should not display the ML file data vis link');
-          await ml.commonUI.assertKibanaHomeFileDataVisLinkNotExists();
-        });
-
         it('should display the ML entry in Kibana app menu', async () => {
           await ml.testExecution.logTestStep('should open the Kibana app menu');
           await ml.navigation.openKibanaNav();
@@ -135,13 +130,16 @@ export default function ({ getService }: FtrProviderContext) {
               testUser.discoverAvailable ? 'with' : 'without'
             } Discover card`
           );
-          await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+          if (testUser.discoverAvailable) {
+            await ml.dataVisualizerIndexBased.assertActionsPanelExists();
+          }
           await ml.dataVisualizerIndexBased.assertViewInDiscoverCard(testUser.discoverAvailable);
 
-          await ml.testExecution.logTestStep('should not display job cards');
-          await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
-          await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
-          await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
+          // @TODO: Re-enable in follow up
+          // await ml.testExecution.logTestStep('should not display job cards');
+          // await ml.dataVisualizerIndexBased.assertCreateAdvancedJobCardNotExists();
+          // await ml.dataVisualizerIndexBased.assertRecognizerCardNotExists(ecExpectedModuleId);
+          // await ml.dataVisualizerIndexBased.assertCreateDataFrameAnalyticsCardNotExists();
         });
 
         it('should display elements on File Data Visualizer page correctly', async () => {
diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts
index 68787859127af..142f6af984994 100644
--- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts
+++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/with_host_configured/app_search/engines.ts
@@ -28,14 +28,14 @@ export default function enterpriseSearchSetupEnginesTests({
     let metaEngine: IEngine;
 
     before(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       engine1 = await appSearch.createEngine();
       engine2 = await appSearch.createEngine();
       metaEngine = await appSearch.createMetaEngine([engine1.name, engine2.name]);
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       appSearch.destroyEngine(engine1.name);
       appSearch.destroyEngine(engine2.name);
       appSearch.destroyEngine(metaEngine.name);
diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts
index c0fa72680d861..e7bec22936d12 100644
--- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts
+++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/app_search/setup_guide.ts
@@ -19,9 +19,9 @@ export default function enterpriseSearchSetupGuideTests({
   const PageObjects = getPageObjects(['appSearch']);
 
   describe('Setup Guide', function () {
-    before(async () => await esArchiver.load('empty_kibana'));
+    before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('when no enterpriseSearch.host is configured', () => {
diff --git a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts
index ad1d207c4acc5..e1e78885e6401 100644
--- a/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts
+++ b/x-pack/test/functional_enterprise_search/apps/enterprise_search/without_host_configured/workplace_search/setup_guide.ts
@@ -19,9 +19,9 @@ export default function enterpriseSearchSetupGuideTests({
   const PageObjects = getPageObjects(['workplaceSearch']);
 
   describe('Setup Guide', function () {
-    before(async () => await esArchiver.load('empty_kibana'));
+    before(async () => await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana'));
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('when no enterpriseSearch.host is configured', () => {
diff --git a/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts b/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts
index 7e113528de691..2dc7533468db4 100644
--- a/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts
+++ b/x-pack/test/functional_vis_wizard/apps/visualization_wizard.ts
@@ -14,13 +14,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
   describe('lens and maps disabled', function () {
     before(async function () {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('visualize/default');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/visualize/default');
     });
 
     after(async function () {
-      await esArchiver.unload('logstash_functional');
-      await esArchiver.unload('visualize/default');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/visualize/default');
     });
 
     it('should not display lens and maps cards', async function () {
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 1a8395a1b49df..0f5e12f226c0e 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
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import { Datafeed } from '@elastic/elasticsearch/api/types';
+import type { estypes } from '@elastic/elasticsearch';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { DATAFEED_STATE } from '../../../../plugins/ml/common/constants/states';
 
@@ -56,7 +56,7 @@ function createTestJobAndDatafeed() {
       },
       query_delay: '120s',
       indices: ['ft_ecommerce'],
-    } as unknown) as Datafeed,
+    } as unknown) as estypes.MlDatafeed,
   };
 }
 
@@ -71,7 +71,7 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
     this.tags('ciGroup13');
 
     before(async () => {
-      await esArchiver.loadIfNeeded('ml/ecommerce');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.testResources.createIndexPatternIfNeeded('ft_ecommerce', 'order_date');
       await ml.testResources.setKibanaTimeZoneToUTC();
 
diff --git a/x-pack/test/functional_with_es_ssl/apps/ml/index.ts b/x-pack/test/functional_with_es_ssl/apps/ml/index.ts
index 3d0a1c0e4cc75..e3a390a5c5486 100644
--- a/x-pack/test/functional_with_es_ssl/apps/ml/index.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/ml/index.ts
@@ -21,7 +21,7 @@ export default ({ loadTestFile, getService }: FtrProviderContext) => {
 
     after(async () => {
       await ml.testResources.deleteIndexPatternByTitle('ft_ecommerce');
-      await esArchiver.unload('ml/ecommerce');
+      await esArchiver.unload('x-pack/test/functional/es_archives/ml/ecommerce');
       await ml.securityCommon.cleanMlUsers();
       await ml.securityCommon.cleanMlRoles();
       await ml.testResources.resetKibanaTimeZone();
diff --git a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
index be22a53b141b4..222dcd22d6f86 100644
--- a/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
+++ b/x-pack/test/functional_with_es_ssl/apps/uptime/index.ts
@@ -7,7 +7,7 @@
 
 import { FtrProviderContext } from '../../ftr_provider_context';
 
-const ARCHIVE = 'uptime/full_heartbeat';
+const ARCHIVE = 'x-pack/test/functional/es_archives/uptime/full_heartbeat';
 
 export default ({ getService, loadTestFile }: FtrProviderContext) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/lists_api_integration/common/config.ts b/x-pack/test/lists_api_integration/common/config.ts
index 24b47472d7945..4983f00cce044 100644
--- a/x-pack/test/lists_api_integration/common/config.ts
+++ b/x-pack/test/lists_api_integration/common/config.ts
@@ -38,7 +38,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       junit: {
         reportName: 'X-Pack Lists Integration Tests',
       },
-      esArchiver: xPackApiIntegrationTestsConfig.get('esArchiver'),
       esTestCluster: {
         ...xPackApiIntegrationTestsConfig.get('esTestCluster'),
         license,
diff --git a/x-pack/test/lists_api_integration/utils.ts b/x-pack/test/lists_api_integration/utils.ts
index 2467e613ca2f5..90103ec8b856c 100644
--- a/x-pack/test/lists_api_integration/utils.ts
+++ b/x-pack/test/lists_api_integration/utils.ts
@@ -161,7 +161,6 @@ export const deleteAllExceptions = async (es: KibanaClient): Promise<void> => {
   return countDownES(async () => {
     return es.deleteByQuery({
       index: '.kibana',
-      // @ts-expect-error @elastic/elasticsearch DeleteByQueryRequest doesn't accept q parameter
       q: 'type:exception-list or type:exception-list-agnostic',
       wait_for_completion: true,
       refresh: true,
diff --git a/x-pack/test/load/config.ts b/x-pack/test/load/config.ts
index 54789b56d9912..514440fd73f46 100644
--- a/x-pack/test/load/config.ts
+++ b/x-pack/test/load/config.ts
@@ -23,10 +23,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
 
     testRunner: GatlingTestRunner,
 
-    esArchiver: {
-      directory: resolve(__dirname, 'es_archives'),
-    },
-
     screenshots: {
       directory: resolve(__dirname, 'screenshots'),
     },
diff --git a/x-pack/test/plugin_api_integration/config.ts b/x-pack/test/plugin_api_integration/config.ts
index 09bec3330c390..0b4369d199c33 100644
--- a/x-pack/test/plugin_api_integration/config.ts
+++ b/x-pack/test/plugin_api_integration/config.ts
@@ -30,9 +30,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     servers: integrationConfig.get('servers'),
     esTestCluster: integrationConfig.get('esTestCluster'),
     apps: integrationConfig.get('apps'),
-    esArchiver: {
-      directory: path.resolve(__dirname, '../functional/es_archives'),
-    },
     screenshots: integrationConfig.get('screenshots'),
     junit: {
       reportName: 'Plugin Functional Tests',
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 58bac6fe45417..184b418f5cc63 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
@@ -7,7 +7,7 @@
 
 import { merge, omit, chunk, isEmpty } from 'lodash';
 import uuid from 'uuid';
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import moment from 'moment';
 import { FtrProviderContext } from '../../ftr_provider_context';
 import { IEvent } from '../../../../plugins/event_log/server';
@@ -32,7 +32,7 @@ export default function ({ getService }: FtrProviderContext) {
     });
 
     after(async () => {
-      await esArchiver.unload('empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     for (const namespace of [undefined, 'namespace-a']) {
@@ -161,7 +161,7 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe(`Index Lifecycle`, () => {
       it('should query across indicies matching the Event Log index pattern', async () => {
-        await esArchiver.load('event_log_multiple_indicies');
+        await esArchiver.load('x-pack/test/functional/es_archives/event_log_multiple_indicies');
 
         const id = `421f2511-5cd1-44fd-95df-e0df83e354d5`;
 
@@ -181,7 +181,7 @@ export default function ({ getService }: FtrProviderContext) {
           'test 2020-10-28T15:19:55.962Z',
         ]);
 
-        await esArchiver.unload('event_log_multiple_indicies');
+        await esArchiver.unload('x-pack/test/functional/es_archives/event_log_multiple_indicies');
       });
     });
   });
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 f9f518091847d..960deb692ac8d 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
@@ -7,7 +7,7 @@
 
 import _ from 'lodash';
 import uuid from 'uuid';
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { IEvent } from '../../../../plugins/event_log/server';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
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 26333ecabd505..b8ba9c93fe8b0 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
@@ -7,6 +7,7 @@
 
 import _ from 'lodash';
 import expect from '@kbn/expect';
+import type { estypes } from '@elastic/elasticsearch';
 import url from 'url';
 import supertestAsPromised from 'supertest-as-promised';
 import { FtrProviderContext } from '../../ftr_provider_context';
@@ -87,7 +88,7 @@ export default function ({ getService }: FtrProviderContext) {
                 params: taskManagerIndexMapping.params,
                 state: taskManagerIndexMapping.state,
                 runAt: taskManagerIndexMapping.runAt,
-              },
+              } as Record<string, estypes.MappingProperty>,
             },
           },
         });
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 7e73bd3b560d1..4941bddbda53c 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
@@ -49,11 +49,11 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('removed task types', () => {
     before(async () => {
-      await esArchiver.load('task_manager_removed_types');
+      await esArchiver.load('x-pack/test/functional/es_archives/task_manager_removed_types');
     });
 
     after(async () => {
-      await esArchiver.unload('task_manager_removed_types');
+      await esArchiver.unload('x-pack/test/functional/es_archives/task_manager_removed_types');
     });
 
     function scheduleTask(
diff --git a/x-pack/test/plugin_api_perf/config.js b/x-pack/test/plugin_api_perf/config.js
index 04f1c26b52125..272af91dcf865 100644
--- a/x-pack/test/plugin_api_perf/config.js
+++ b/x-pack/test/plugin_api_perf/config.js
@@ -24,9 +24,6 @@ export default async function ({ readConfigFile }) {
     servers: integrationConfig.get('servers'),
     esTestCluster: integrationConfig.get('esTestCluster'),
     apps: integrationConfig.get('apps'),
-    esArchiver: {
-      directory: path.resolve(__dirname, '../functional/es_archives'),
-    },
     screenshots: integrationConfig.get('screenshots'),
     junit: {
       reportName: 'Plugin Functional Tests',
diff --git a/x-pack/test/plugin_functional/config.ts b/x-pack/test/plugin_functional/config.ts
index 8b0ad12891dc3..7033836285e3c 100644
--- a/x-pack/test/plugin_functional/config.ts
+++ b/x-pack/test/plugin_functional/config.ts
@@ -67,11 +67,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       },
     },
 
-    // choose where esArchiver should load archives from
-    esArchiver: {
-      directory: resolve(__dirname, 'es_archives'),
-    },
-
     // choose where screenshots should be saved
     screenshots: {
       directory: resolve(__dirname, 'screenshots'),
diff --git a/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json b/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json
index c66a45084441f..29c56a751c038 100644
--- a/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json
+++ b/x-pack/test/plugin_functional/es_archives/global_search/basic/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "settings": {
       "index": {
         "number_of_shards": "1",
diff --git a/x-pack/test/plugin_functional/es_archives/global_search/search_syntax/mappings.json b/x-pack/test/plugin_functional/es_archives/global_search/search_syntax/mappings.json
index ec28b51de1d10..35537a9755510 100644
--- a/x-pack/test/plugin_functional/es_archives/global_search/search_syntax/mappings.json
+++ b/x-pack/test/plugin_functional/es_archives/global_search/search_syntax/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts b/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts
index a44ded43a0bfe..f22a20dcdee9f 100644
--- a/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts
+++ b/x-pack/test/plugin_functional/test_suites/global_search/global_search_bar.ts
@@ -15,12 +15,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
     const browser = getService('browser');
 
     before(async () => {
-      await esArchiver.load('global_search/search_syntax');
+      await esArchiver.load(
+        'x-pack/test/plugin_functional/es_archives/global_search/search_syntax'
+      );
       await common.navigateToApp('home');
     });
 
     after(async () => {
-      await esArchiver.unload('global_search/search_syntax');
+      await esArchiver.unload(
+        'x-pack/test/plugin_functional/es_archives/global_search/search_syntax'
+      );
     });
 
     afterEach(async () => {
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 74d1ae48fc86f..24bd4e09a4ea3 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
@@ -30,11 +30,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
     describe('SavedObject provider', function () {
       before(async () => {
-        await esArchiver.load('global_search/basic');
+        await esArchiver.load('x-pack/test/plugin_functional/es_archives/global_search/basic');
       });
 
       after(async () => {
-        await esArchiver.unload('global_search/basic');
+        await esArchiver.unload('x-pack/test/plugin_functional/es_archives/global_search/basic');
       });
 
       it('can search for index patterns', async () => {
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 626cd217bde5f..2a29d6c45dbe1 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
@@ -227,12 +227,12 @@ export default function ({ getService }: FtrProviderContext) {
     describe('date formatting', () => {
       before(async () => {
         // load test data that contains a saved search and documents
-        await esArchiver.load('reporting/logs');
-        await esArchiver.load('logstash_functional');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
+        await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
       });
       after(async () => {
-        await esArchiver.unload('reporting/logs');
-        await esArchiver.unload('logstash_functional');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
+        await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
       });
 
       it('With filters and timebased data, default to UTC', async () => {
@@ -311,7 +311,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
 
       it('Formatted date_nanos data, UTC timezone', async () => {
-        await esArchiver.load('reporting/nanos');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos');
 
         const res = await generateAPI.getCSVFromSearchSource(
           getMockJobParams({
@@ -331,11 +331,11 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
 
-        await esArchiver.unload('reporting/nanos');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos');
       });
 
       it('Formatted date_nanos data, custom timezone (New York)', async () => {
-        await esArchiver.load('reporting/nanos');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos');
 
         const res = await generateAPI.getCSVFromSearchSource(
           getMockJobParams({
@@ -356,13 +356,13 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
 
-        await esArchiver.unload('reporting/nanos');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos');
       });
     });
 
     describe('non-timebased', () => {
       it('Handle _id and _index columns', async () => {
-        await esArchiver.load('reporting/nanos');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/nanos');
 
         const res = await generateAPI.getCSVFromSearchSource(
           getMockJobParams({
@@ -382,12 +382,12 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
 
-        await esArchiver.unload('reporting/nanos');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/nanos');
       });
 
       it('With filters and non-timebased data', async () => {
         // load test data that contains a saved search and documents
-        await esArchiver.load('reporting/sales');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/sales');
 
         const {
           status: resStatus,
@@ -414,7 +414,7 @@ export default function ({ getService }: FtrProviderContext) {
         expect(resType).to.eql('text/csv');
         expectSnapshot(resText).toMatch();
 
-        await esArchiver.unload('reporting/sales');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/sales');
       });
     });
 
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 3370eb0bb398b..75226901afd64 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
@@ -32,13 +32,13 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Generation from Job Params', () => {
     before(async () => {
-      await esArchiver.load('reporting/logs');
-      await esArchiver.load('logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
+      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     after(async () => {
-      await esArchiver.unload('reporting/logs');
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
       await reportingAPI.deleteAllReports();
     });
 
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts b/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
index e6ac75be9d48a..f097208658467 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/network_policy.ts
@@ -14,7 +14,7 @@ export default function ({ getService }: FtrProviderContext) {
   const reportingAPI = getService('reportingAPI');
   const retry = getService('retry');
   const supertest = getService('supertest');
-  const archive = 'reporting/canvas_disallowed_url';
+  const archive = 'x-pack/test/functional/es_archives/reporting/canvas_disallowed_url';
 
   /*
    * The Reporting API Functional Test config implements a network policy that
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
index 4fdcc2692387a..e61195e2f95c8 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/spaces.ts
@@ -40,13 +40,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Exports and Spaces', () => {
     before(async () => {
-      await esArchiver.load('reporting/ecommerce');
-      await esArchiver.load('reporting/ecommerce_kibana_spaces'); // multiple spaces with different config settings
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces'); // multiple spaces with different config settings
     });
 
     after(async () => {
-      await esArchiver.unload('reporting/ecommerce');
-      await esArchiver.unload('reporting/ecommerce_kibana_spaces');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+      await esArchiver.unload(
+        'x-pack/test/functional/es_archives/reporting/ecommerce_kibana_spaces'
+      );
       await reportingAPI.deleteAllReports();
     });
 
diff --git a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
index a69534cfc4df7..221d345ac2d5b 100644
--- a/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
+++ b/x-pack/test/reporting_api_integration/reporting_and_security/usage.ts
@@ -6,20 +6,12 @@
  */
 
 import expect from '@kbn/expect';
-import { REPO_ROOT } from '@kbn/utils';
-import path from 'path';
 import { FtrProviderContext } from '../ftr_provider_context';
 import * as GenerationUrls from '../services/generation_urls';
 import { ReportingUsageStats } from '../services/usage';
 
-const OSS_KIBANA_ARCHIVE_PATH = path.resolve(
-  REPO_ROOT,
-  'test/functional/fixtures/es_archiver/dashboard/current/kibana'
-);
-const OSS_DATA_ARCHIVE_PATH = path.resolve(
-  REPO_ROOT,
-  'test/functional/fixtures/es_archiver/dashboard/current/data'
-);
+const OSS_KIBANA_ARCHIVE_PATH = 'test/functional/fixtures/es_archiver/dashboard/current/kibana';
+const OSS_DATA_ARCHIVE_PATH = 'test/functional/fixtures/es_archiver/dashboard/current/data';
 
 interface UsageStats {
   reporting: ReportingUsageStats;
@@ -86,7 +78,7 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('from archive data', () => {
       it('generated from 6.2', async () => {
-        await esArchiver.load('reporting/bwc/6_2');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/bwc/6_2');
         const usage = await usageAPI.getUsageStats();
 
         reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0);
@@ -105,11 +97,11 @@ export default function ({ getService }: FtrProviderContext) {
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 0);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 0);
 
-        await esArchiver.unload('reporting/bwc/6_2');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/bwc/6_2');
       });
 
       it('generated from 6.3', async () => {
-        await esArchiver.load('reporting/bwc/6_3');
+        await esArchiver.load('x-pack/test/functional/es_archives/reporting/bwc/6_3');
         const usage = await usageAPI.getUsageStats();
 
         reportingAPI.expectRecentJobTypeTotalStats(usage, 'csv', 0);
@@ -126,7 +118,7 @@ export default function ({ getService }: FtrProviderContext) {
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'preserve_layout', 3);
         reportingAPI.expectAllTimePdfLayoutStats(usage, 'print', 3);
 
-        await esArchiver.unload('reporting/bwc/6_3');
+        await esArchiver.unload('x-pack/test/functional/es_archives/reporting/bwc/6_3');
       });
     });
 
diff --git a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
index 194a3d6d1f5bc..3b34e17cd3cb1 100644
--- a/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
+++ b/x-pack/test/reporting_api_integration/reporting_without_security/job_apis.ts
@@ -18,13 +18,13 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('Job Listing APIs', () => {
     before(async () => {
-      await esArchiver.load('reporting/logs');
-      await esArchiver.load('logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/logs');
+      await esArchiver.load('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     after(async () => {
-      await esArchiver.unload('reporting/logs');
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/logs');
+      await esArchiver.unload('x-pack/test/functional/es_archives/logstash_functional');
     });
 
     afterEach(async () => {
diff --git a/x-pack/test/reporting_api_integration/services/scenarios.ts b/x-pack/test/reporting_api_integration/services/scenarios.ts
index eee13b0bf07a2..bfbf030b0887a 100644
--- a/x-pack/test/reporting_api_integration/services/scenarios.ts
+++ b/x-pack/test/reporting_api_integration/services/scenarios.ts
@@ -31,12 +31,12 @@ export function createScenarios({ getService }: Pick<FtrProviderContext, 'getSer
   const REPORTING_USER_PASSWORD = 'reporting_user-password';
 
   const initEcommerce = async () => {
-    await esArchiver.load('reporting/ecommerce');
-    await esArchiver.load('reporting/ecommerce_kibana');
+    await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce');
+    await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
   };
   const teardownEcommerce = async () => {
-    await esArchiver.unload('reporting/ecommerce');
-    await esArchiver.unload('reporting/ecommerce_kibana');
+    await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce');
+    await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
     await deleteAllReports();
   };
 
diff --git a/x-pack/test/reporting_api_integration/services/usage.ts b/x-pack/test/reporting_api_integration/services/usage.ts
index ababbbf03e4c1..4e8d464467191 100644
--- a/x-pack/test/reporting_api_integration/services/usage.ts
+++ b/x-pack/test/reporting_api_integration/services/usage.ts
@@ -31,7 +31,7 @@ export interface ReportingUsageStats {
   [jobType: string]: any;
 }
 
-interface UsageStats {
+export interface UsageStats {
   reporting: ReportingUsageStats;
 }
 
diff --git a/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts b/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts
index 76ccb01477856..bd13e65ed8a25 100644
--- a/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts
+++ b/x-pack/test/reporting_functional/reporting_and_deprecated_security/security_roles_privileges.ts
@@ -70,11 +70,11 @@ export default function ({ getService }: FtrProviderContext) {
       const esArchiver = getService('esArchiver');
       const reportingApi = getService('reportingAPI');
       before('initialize tests', async () => {
-        await esArchiver.load('canvas/reports');
+        await esArchiver.load('x-pack/test/functional/es_archives/canvas/reports');
       });
 
       after('teardown tests', async () => {
-        await esArchiver.unload('canvas/reports');
+        await esArchiver.unload('x-pack/test/functional/es_archives/canvas/reports');
         await reportingApi.deleteAllReports();
         await reportingFunctional.initEcommerce();
       });
diff --git a/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts b/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts
index 20b88b22b542c..c2146e8c9dc5f 100644
--- a/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts
+++ b/x-pack/test/reporting_functional/reporting_and_security/security_roles_privileges.ts
@@ -76,11 +76,11 @@ export default function ({ getService }: FtrProviderContext) {
       const esArchiver = getService('esArchiver');
       const reportingApi = getService('reportingAPI');
       before('initialize tests', async () => {
-        await esArchiver.load('canvas/reports');
+        await esArchiver.load('x-pack/test/functional/es_archives/canvas/reports');
       });
 
       after('teardown tests', async () => {
-        await esArchiver.unload('canvas/reports');
+        await esArchiver.unload('x-pack/test/functional/es_archives/canvas/reports');
         await reportingApi.deleteAllReports();
         await reportingFunctional.initEcommerce();
       });
diff --git a/x-pack/test/reporting_functional/reporting_without_security/management.ts b/x-pack/test/reporting_functional/reporting_without_security/management.ts
index b116bb5fe201c..030c890c963b1 100644
--- a/x-pack/test/reporting_functional/reporting_without_security/management.ts
+++ b/x-pack/test/reporting_functional/reporting_without_security/management.ts
@@ -30,13 +30,13 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
   describe('Polling for jobs', () => {
     beforeEach(async () => {
-      await esArchiver.load('empty_kibana');
-      await esArchiver.load('reporting/ecommerce_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
     });
 
     afterEach(async () => {
-      await esArchiver.unload('empty_kibana');
-      await esArchiver.unload('reporting/ecommerce_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/reporting/ecommerce_kibana');
       await reportingApi.deleteAllReports();
     });
 
diff --git a/x-pack/test/saved_object_api_integration/common/config.ts b/x-pack/test/saved_object_api_integration/common/config.ts
index f83afb4db2412..9b9e46efa6d5d 100644
--- a/x-pack/test/saved_object_api_integration/common/config.ts
+++ b/x-pack/test/saved_object_api_integration/common/config.ts
@@ -39,10 +39,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         reportName: 'X-Pack Saved Object API Integration Tests -- ' + name,
       },
 
-      esArchiver: {
-        directory: path.join(__dirname, 'fixtures', 'es_archiver'),
-      },
-
       esTestCluster: {
         ...config.xpack.api.get('esTestCluster'),
         license,
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 e29bbc0db56b6..36bbbb4bb8755 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
@@ -22,7 +22,7 @@ export class Plugin {
       properties: {
         title: { type: 'text' },
       },
-    };
+    } as const;
 
     core.savedObjects.registerType({
       name: 'isolatedtype',
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 088e594a41b88..b712c2882ee0f 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
@@ -191,6 +191,64 @@ export const expectResponses = {
   },
 };
 
+const commonUsers = {
+  noAccess: {
+    ...NOT_A_KIBANA_USER,
+    description: 'user with no access',
+    authorizedAtSpaces: [],
+  },
+  superuser: {
+    ...SUPERUSER,
+    description: 'superuser',
+    authorizedAtSpaces: ['*'],
+  },
+  legacyAll: { ...KIBANA_LEGACY_USER, description: 'legacy user', authorizedAtSpaces: [] },
+  allGlobally: {
+    ...KIBANA_RBAC_USER,
+    description: 'rbac user with all globally',
+    authorizedAtSpaces: ['*'],
+  },
+  readGlobally: {
+    ...KIBANA_RBAC_DASHBOARD_ONLY_USER,
+    description: 'rbac user with read globally',
+    authorizedAtSpaces: ['*'],
+  },
+  dualAll: {
+    ...KIBANA_DUAL_PRIVILEGES_USER,
+    description: 'dual-privileges user',
+    authorizedAtSpaces: ['*'],
+  },
+  dualRead: {
+    ...KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
+    description: 'dual-privileges readonly user',
+    authorizedAtSpaces: ['*'],
+  },
+};
+
+interface Security<T> {
+  modifier?: T;
+  users: Record<
+    | keyof typeof commonUsers
+    | 'allAtDefaultSpace'
+    | 'readAtDefaultSpace'
+    | 'allAtSpace1'
+    | 'readAtSpace1',
+    TestUser
+  >;
+}
+interface SecurityAndSpaces<T> {
+  modifier?: T;
+  users: Record<
+    keyof typeof commonUsers | 'allAtSpace' | 'readAtSpace' | 'allAtOtherSpace',
+    TestUser
+  >;
+  spaceId: string;
+}
+interface Spaces<T> {
+  modifier?: T;
+  spaceId: string;
+}
+
 /**
  * Get test scenarios for each type of suite.
  * @param modifier Use this to generate additional permutations of test scenarios.
@@ -203,66 +261,10 @@ export const expectResponses = {
  *  ]
  */
 export const getTestScenarios = <T>(modifiers?: T[]) => {
-  const commonUsers = {
-    noAccess: {
-      ...NOT_A_KIBANA_USER,
-      description: 'user with no access',
-      authorizedAtSpaces: [],
-    },
-    superuser: {
-      ...SUPERUSER,
-      description: 'superuser',
-      authorizedAtSpaces: ['*'],
-    },
-    legacyAll: { ...KIBANA_LEGACY_USER, description: 'legacy user', authorizedAtSpaces: [] },
-    allGlobally: {
-      ...KIBANA_RBAC_USER,
-      description: 'rbac user with all globally',
-      authorizedAtSpaces: ['*'],
-    },
-    readGlobally: {
-      ...KIBANA_RBAC_DASHBOARD_ONLY_USER,
-      description: 'rbac user with read globally',
-      authorizedAtSpaces: ['*'],
-    },
-    dualAll: {
-      ...KIBANA_DUAL_PRIVILEGES_USER,
-      description: 'dual-privileges user',
-      authorizedAtSpaces: ['*'],
-    },
-    dualRead: {
-      ...KIBANA_DUAL_PRIVILEGES_DASHBOARD_ONLY_USER,
-      description: 'dual-privileges readonly user',
-      authorizedAtSpaces: ['*'],
-    },
-  };
-
-  interface Security {
-    modifier?: T;
-    users: Record<
-      | keyof typeof commonUsers
-      | 'allAtDefaultSpace'
-      | 'readAtDefaultSpace'
-      | 'allAtSpace1'
-      | 'readAtSpace1',
-      TestUser
-    >;
-  }
-  interface SecurityAndSpaces {
-    modifier?: T;
-    users: Record<
-      keyof typeof commonUsers | 'allAtSpace' | 'readAtSpace' | 'allAtOtherSpace',
-      TestUser
-    >;
-    spaceId: string;
-  }
-  interface Spaces {
-    modifier?: T;
-    spaceId: string;
-  }
-
-  let spaces: Spaces[] = [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID].map((x) => ({ spaceId: x }));
-  let security: Security[] = [
+  let spaces: Array<Spaces<T>> = [DEFAULT_SPACE_ID, SPACE_1_ID, SPACE_2_ID].map((x) => ({
+    spaceId: x,
+  }));
+  let security: Array<Security<T>> = [
     {
       users: {
         ...commonUsers,
@@ -289,7 +291,7 @@ export const getTestScenarios = <T>(modifiers?: T[]) => {
       },
     },
   ];
-  let securityAndSpaces: SecurityAndSpaces[] = [
+  let securityAndSpaces: Array<SecurityAndSpaces<T>> = [
     {
       spaceId: DEFAULT_SPACE_ID,
       users: {
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 d85cfd4d7e12f..5860ec1f193b2 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
@@ -151,8 +151,16 @@ export function bulkCreateTestSuiteFactory(esArchiver: any, supertest: SuperTest
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts
index ef942972be0ff..26a693349496d 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_get.ts
@@ -91,8 +91,16 @@ export function bulkGetTestSuiteFactory(esArchiver: any, supertest: SuperTest<an
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts b/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts
index 246f84538c1a7..7ac83b3be8d04 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/bulk_update.ts
@@ -99,8 +99,16 @@ export function bulkUpdateTestSuiteFactory(esArchiver: any, supertest: SuperTest
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
diff --git a/x-pack/test/saved_object_api_integration/common/suites/create.ts b/x-pack/test/saved_object_api_integration/common/suites/create.ts
index 190eed0edaef2..ff2bfdefb4c08 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/create.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/create.ts
@@ -119,8 +119,16 @@ export function createTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/delete.ts b/x-pack/test/saved_object_api_integration/common/suites/delete.ts
index 37aff5a8cdadd..8c861f9debbc1 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/delete.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/delete.ts
@@ -6,7 +6,7 @@
  */
 
 import { SuperTest } from 'supertest';
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 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';
@@ -78,8 +78,16 @@ export function deleteTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/export.ts b/x-pack/test/saved_object_api_integration/common/suites/export.ts
index 94b75f1fd536d..d9ebbac810231 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/export.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/export.ts
@@ -219,8 +219,16 @@ export function exportTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     const { user, spaceId = DEFAULT_SPACE_ID, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/find.ts b/x-pack/test/saved_object_api_integration/common/suites/find.ts
index 27905459c29b7..7b5175b906ebe 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/find.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/find.ts
@@ -278,8 +278,16 @@ export function findTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>)
     const { user, spaceId = DEFAULT_SPACE_ID, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
diff --git a/x-pack/test/saved_object_api_integration/common/suites/get.ts b/x-pack/test/saved_object_api_integration/common/suites/get.ts
index b7d0723348513..a4d167276cc71 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/get.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/get.ts
@@ -66,8 +66,16 @@ export function getTestSuiteFactory(esArchiver: any, supertest: SuperTest<any>)
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
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 f2794d1685a23..34c53fc577094 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
@@ -237,8 +237,16 @@ export function importTestSuiteFactory(
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
diff --git a/x-pack/test/saved_object_api_integration/common/suites/resolve.ts b/x-pack/test/saved_object_api_integration/common/suites/resolve.ts
index 80a4a805224bf..47aafc400ce76 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/resolve.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/resolve.ts
@@ -120,8 +120,16 @@ export function resolveTestSuiteFactory(esArchiver: any, supertest: SuperTest<an
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
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 8079c74c76322..d3792f7649cc7 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
@@ -245,8 +245,16 @@ export function resolveImportErrorsTestSuiteFactory(
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       const attrs = { attributes: { [NEW_ATTRIBUTE_KEY]: NEW_ATTRIBUTE_VAL } };
 
diff --git a/x-pack/test/saved_object_api_integration/common/suites/update.ts b/x-pack/test/saved_object_api_integration/common/suites/update.ts
index 7292e4dce5c3b..90dbb366b4e4e 100644
--- a/x-pack/test/saved_object_api_integration/common/suites/update.ts
+++ b/x-pack/test/saved_object_api_integration/common/suites/update.ts
@@ -77,8 +77,16 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/saved_object_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts
index 296c92cac75d7..18a87c702ba34 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_bulk_delete.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('POST /internal/saved_objects_tagging/tags/_bulk_delete', () => {
     beforeEach(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const responses: Record<string, ExpectedResponse> = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts
index 3b845fe2e115c..6d8e72c0b9070 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_find.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('GET /internal/saved_objects_tagging/tags/_find', () => {
     before(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     after(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const responses: Record<string, ExpectedResponse> = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts
index 7398f28210c09..a20679ac6002b 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/_get_assignable_types.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('GET /internal/saved_objects_tagging/assignments/_assignable_types', () => {
     before(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     after(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const assignablePerUser = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts
index 441d4ef0c406d..cf1b7356f94cf 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/bulk_assign.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => {
     beforeEach(async () => {
-      await esArchiver.load('bulk_assign');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('bulk_assign');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      );
     });
 
     const authorized: ExpectedResponse = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts
index 15a0a2bffc457..fecba696ce623 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/create.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('POST /api/saved_objects_tagging/tags/create', () => {
     beforeEach(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const responses: Record<string, ExpectedResponse> = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts
index 998fddafe6a3f..edb430767135a 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/delete.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('DELETE /api/saved_objects_tagging/tags/{id}', () => {
     beforeEach(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const responses: Record<string, ExpectedResponse> = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts
index 03fecaec21c90..73b553f912add 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('GET /api/saved_objects_tagging/tags/{id}', () => {
     before(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     after(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const responses: Record<string, ExpectedResponse> = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts
index 87e7eda12f3ab..06f693de631e5 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/get_all.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('GET /api/saved_objects_tagging/tags', () => {
     before(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     after(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const responses: Record<string, ExpectedResponse> = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts
index d333392aa326f..c9bed41de2d36 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/apis/update.ts
@@ -16,11 +16,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('POST /api/saved_objects_tagging/tags/{id}', () => {
     beforeEach(async () => {
-      await esArchiver.load('rbac_tags');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('rbac_tags');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags'
+      );
     });
 
     const responses: Record<string, ExpectedResponse> = {
diff --git a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
index 08ba10b64e579..0e2ecc8c48ebf 100644
--- a/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/security_and_spaces/config.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import path from 'path';
 import { FtrConfigProviderContext } from '@kbn/test';
 import { services } from './services';
 
@@ -23,9 +22,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       reportName:
         'X-Pack Saved Object Tagging API Integration Tests - Security and Spaces integration',
     },
-    esArchiver: {
-      directory: path.resolve(__dirname, '..', '..', 'common', 'fixtures', 'es_archiver'),
-    },
     esTestCluster: {
       ...apiIntegrationConfig.get('esTestCluster'),
       license: 'trial',
diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts
index 0a4480bb74a99..75471900201d3 100644
--- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/bulk_assign.ts
@@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('POST /api/saved_objects_tagging/assignments/update_by_tags', () => {
     beforeEach(async () => {
-      await esArchiver.load('bulk_assign');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('bulk_assign');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      );
     });
 
     it('allows to update tag assignments', async () => {
diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts
index cdbe249bd5f3e..b324a6138838b 100644
--- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/create.ts
@@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('POST /api/saved_objects_tagging/tags/create', () => {
     beforeEach(async () => {
-      await esArchiver.load('functional_base');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('functional_base');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     it('should create the tag when validation succeed', async () => {
diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts
index c0cf77c7d2b8c..55c88b212fd1c 100644
--- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/delete.ts
@@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('DELETE /api/saved_objects_tagging/tags/{id}', () => {
     beforeEach(async () => {
-      await esArchiver.load('delete_with_references');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('delete_with_references');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references'
+      );
     });
 
     it('should delete the tag', async () => {
diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts
index 2c9daddc01ec5..899d96a7bd061 100644
--- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/update.ts
@@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('POST /api/saved_objects_tagging/tags/{id}', () => {
     beforeEach(async () => {
-      await esArchiver.load('functional_base');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('functional_base');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     it('should update the tag when validation succeed', async () => {
diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts
index cd834cb034b6d..b6ec4aa8dcfa5 100644
--- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/apis/usage_collection.ts
@@ -15,11 +15,15 @@ export default function ({ getService }: FtrProviderContext) {
 
   describe('saved_object_tagging usage collector data', () => {
     beforeEach(async () => {
-      await esArchiver.load('usage_collection');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection'
+      );
     });
 
     afterEach(async () => {
-      await esArchiver.unload('usage_collection');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection'
+      );
     });
 
     /*
diff --git a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
index ebdb055bd5e89..4d2b2a4313357 100644
--- a/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
+++ b/x-pack/test/saved_object_tagging/api_integration/tagging_api/config.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import path from 'path';
 import { FtrConfigProviderContext } from '@kbn/test';
 import { services } from './services';
 
@@ -22,9 +21,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     junit: {
       reportName: 'X-Pack Saved Object Tagging API Integration Tests',
     },
-    esArchiver: {
-      directory: path.resolve(__dirname, '..', '..', 'common', 'fixtures', 'es_archiver'),
-    },
     esTestCluster: {
       ...apiIntegrationConfig.get('esTestCluster'),
       license: 'trial',
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/mappings.json
index 9cf628bef4767..2e465869f9ae5 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard/mappings.json
index 4156cc9e2373d..47f23dc57e361 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "_meta": {
         "migrationMappingPropertyHashes": {
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references/mappings.json
index 4ea82eb30e06a..5ccad08bc21fa 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/delete_with_references/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/mappings.json
index 4ea82eb30e06a..5ccad08bc21fa 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/mappings.json
index cd0d076258721..cd57c26dfc337 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/rbac_tags/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management/mappings.json
index 4ea82eb30e06a..5ccad08bc21fa 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection/mappings.json
index 9cf628bef4767..2e465869f9ae5 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/usage_collection/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize/mappings.json b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize/mappings.json
index 4ea82eb30e06a..5ccad08bc21fa 100644
--- a/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize/mappings.json
+++ b/x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize/mappings.json
@@ -1,8 +1,10 @@
 {
   "type": "index",
   "value": {
-    "aliases": {},
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "dynamic": "strict",
       "properties": {
diff --git a/x-pack/test/saved_object_tagging/functional/config.ts b/x-pack/test/saved_object_tagging/functional/config.ts
index 0044063e18c69..6ad1f05e2be5b 100644
--- a/x-pack/test/saved_object_tagging/functional/config.ts
+++ b/x-pack/test/saved_object_tagging/functional/config.ts
@@ -5,7 +5,6 @@
  * 2.0.
  */
 
-import path from 'path';
 import { FtrConfigProviderContext } from '@kbn/test';
 import { services, pageObjects } from './ftr_provider_context';
 
@@ -23,10 +22,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
     services,
     pageObjects,
 
-    esArchiver: {
-      directory: path.resolve(__dirname, '..', 'common', 'fixtures', 'es_archiver'),
-    },
-
     junit: {
       reportName: 'X-Pack Saved Object Tagging Functional Tests',
     },
diff --git a/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts b/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts
index 5beea64490f24..3c7a24b281f6f 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/bulk_actions.ts
@@ -16,11 +16,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('table bulk actions', () => {
     beforeEach(async () => {
-      await esArchiver.load('functional_base');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
       await tagManagementPage.navigateTo();
     });
     afterEach(async () => {
-      await esArchiver.unload('functional_base');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     describe('bulk delete', () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts b/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts
index b01698573e3c8..1da08acbc7e01 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/bulk_assign.ts
@@ -19,12 +19,16 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
     beforeEach(async () => {
       assignFlyout = tagManagementPage.assignFlyout;
-      await esArchiver.load('bulk_assign');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      );
       await tagManagementPage.navigateTo();
     });
 
     afterEach(async () => {
-      await esArchiver.unload('bulk_assign');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/bulk_assign'
+      );
     });
 
     it('can bulk assign tags to objects', async () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/create.ts b/x-pack/test/saved_object_tagging/functional/tests/create.ts
index 7848664b56ff8..ea2697bf37b75 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/create.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/create.ts
@@ -20,11 +20,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
     before(async () => {
       tagModal = tagManagementPage.tagModal;
-      await esArchiver.load('functional_base');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
       await tagManagementPage.navigateTo();
     });
     after(async () => {
-      await esArchiver.unload('functional_base');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     afterEach(async () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts
index f5b81e49f8c2f..ffaa595c16bec 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/dashboard_integration.ts
@@ -38,12 +38,20 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('dashboard integration', () => {
     before(async () => {
-      await esArchiver.load('dashboard');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard'
+      );
+      await esArchiver.loadIfNeeded(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
+      );
     });
     after(async () => {
-      await esArchiver.unload('dashboard');
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/dashboard'
+      );
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
+      );
     });
 
     describe('listing', () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/edit.ts b/x-pack/test/saved_object_tagging/functional/tests/edit.ts
index d2cb2ac24b605..f5d3f11e25b6e 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/edit.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/edit.ts
@@ -20,11 +20,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
     before(async () => {
       tagModal = tagManagementPage.tagModal;
-      await esArchiver.load('functional_base');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
       await tagManagementPage.navigateTo();
     });
     after(async () => {
-      await esArchiver.unload('functional_base');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     afterEach(async () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts b/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts
index 02e3a84d7af64..1f6197b02afa3 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/feature_control.ts
@@ -88,10 +88,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('feature controls', () => {
     before(async () => {
-      await esArchiver.load('functional_base');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
     after(async () => {
-      await esArchiver.unload('functional_base');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     addFeatureControlSuite({
diff --git a/x-pack/test/saved_object_tagging/functional/tests/listing.ts b/x-pack/test/saved_object_tagging/functional/tests/listing.ts
index 95b2ba13473f7..d1ab68e57ef63 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/listing.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/listing.ts
@@ -16,11 +16,15 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('table listing', () => {
     before(async () => {
-      await esArchiver.load('functional_base');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
       await tagManagementPage.navigateTo();
     });
     after(async () => {
-      await esArchiver.unload('functional_base');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/functional_base'
+      );
     });
 
     describe('searching', () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts
index f1aac575f430d..632610fee0f53 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/maps_integration.ts
@@ -37,10 +37,10 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   // Failing: See https://github.com/elastic/kibana/issues/89073
   describe.skip('maps integration', () => {
     before(async () => {
-      await esArchiver.load('maps');
+      await esArchiver.load('x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps');
     });
     after(async () => {
-      await esArchiver.unload('maps');
+      await esArchiver.unload('x-pack/test/saved_object_tagging/common/fixtures/es_archiver/maps');
     });
 
     describe('listing', () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts
index 549aea36f5b60..4688cfba4b864 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/som_integration.ts
@@ -39,10 +39,14 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('saved objects management integration', () => {
     before(async () => {
-      await esArchiver.load('so_management');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management'
+      );
     });
     after(async () => {
-      await esArchiver.unload('so_management');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/so_management'
+      );
     });
 
     describe('navigating from the tag section', () => {
diff --git a/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts b/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts
index 4877b0d5d8540..9789b4146c05d 100644
--- a/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts
+++ b/x-pack/test/saved_object_tagging/functional/tests/visualize_integration.ts
@@ -49,12 +49,20 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
   // Failing: See https://github.com/elastic/kibana/issues/89958
   describe.skip('visualize integration', () => {
     before(async () => {
-      await esArchiver.load('visualize');
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.load(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize'
+      );
+      await esArchiver.loadIfNeeded(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
+      );
     });
     after(async () => {
-      await esArchiver.unload('visualize');
-      await esArchiver.unload('logstash_functional');
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/visualize'
+      );
+      await esArchiver.unload(
+        'x-pack/test/saved_object_tagging/common/fixtures/es_archiver/logstash_functional'
+      );
     });
 
     describe('listing', () => {
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 6992469a31a7c..a534da5b2572b 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
@@ -17,8 +17,8 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
     this.tags('ciGroup3');
 
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('dashboard/async_search');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/async_search');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await kibanaServer.uiSettings.replace({ 'search:timeout': 10000 });
       await PageObjects.common.navigateToApp('dashboard');
@@ -29,7 +29,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
     });
 
     after(async () => {
-      await esArchiver.unload('dashboard/async_search');
+      await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/async_search');
     });
 
     loadTestFile(require.resolve('./async_search'));
diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts
index dc107040ecd2e..bd5f0896d96c5 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/save_search_session_relative_time.ts
@@ -61,6 +61,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       await PageObjects.header.waitUntilLoadingHasFinished();
       await PageObjects.dashboard.waitForRenderComplete();
 
+      // saving dashboard to populate map buffer. See https://github.com/elastic/kibana/pull/91148 for more info
+      // This can be removed after a fix to https://github.com/elastic/kibana/issues/98180 is completed
+      await PageObjects.dashboard.switchToEditMode();
+      await PageObjects.dashboard.clickQuickSave();
+      await PageObjects.dashboard.clickCancelOutOfEditMode();
+
       await searchSessions.expectState('completed');
       await searchSessions.save();
       await searchSessions.expectState('backgroundCompleted');
diff --git a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts
index 9a7a060e57c81..d05ac46d5b88f 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/dashboard/async_search/sessions_in_space.ts
@@ -26,7 +26,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('dashboard in space', () => {
     describe('Storing search sessions in space', () => {
       before(async () => {
-        await esArchiver.load('dashboard/session_in_space');
+        await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space');
 
         await security.role.create('data_analyst', {
           elasticsearch: {
@@ -59,7 +59,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await security.role.delete('data_analyst');
         await security.user.delete('analyst');
 
-        await esArchiver.unload('dashboard/session_in_space');
+        await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space');
         await PageObjects.security.forceLogout();
       });
 
@@ -96,7 +96,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
 
     describe('Disabled storing search sessions', () => {
       before(async () => {
-        await esArchiver.load('dashboard/session_in_space');
+        await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space');
 
         await security.role.create('data_analyst', {
           elasticsearch: {
@@ -129,7 +129,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await security.role.delete('data_analyst');
         await security.user.delete('analyst');
 
-        await esArchiver.unload('dashboard/session_in_space');
+        await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space');
         await PageObjects.security.forceLogout();
       });
 
diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts b/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts
index 0f73ce1a3bf58..93dca78b34a82 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/discover/async_search.ts
@@ -11,17 +11,25 @@ import { FtrProviderContext } from '../../../ftr_provider_context';
 export default function ({ getPageObjects, getService }: FtrProviderContext) {
   const esArchiver = getService('esArchiver');
   const queryBar = getService('queryBar');
+  const log = getService('log');
   const testSubjects = getService('testSubjects');
   const browser = getService('browser');
   const inspector = getService('inspector');
-  const PageObjects = getPageObjects(['discover', 'common', 'timePicker', 'header', 'context']);
+  const PageObjects = getPageObjects([
+    'discover',
+    'common',
+    'timePicker',
+    'header',
+    'context',
+    'searchSessionsManagement',
+  ]);
   const searchSessions = getService('searchSessions');
   const retry = getService('retry');
 
   describe('discover async search', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('discover/default');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/discover/default');
       await PageObjects.common.navigateToApp('discover');
       await PageObjects.timePicker.setDefaultAbsoluteRange();
       await PageObjects.header.waitUntilLoadingHasFinished();
@@ -43,6 +51,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       await PageObjects.header.waitUntilLoadingHasFinished();
       await searchSessions.expectState('restored');
       await testSubjects.existOrFail('discoverNoResultsError'); // expect error because of fake searchSessionId
+      await PageObjects.common.clearAllToasts();
       const searchSessionId1 = await getSearchSessionId();
       expect(searchSessionId1).to.be(fakeSearchSessionId);
       await queryBar.clickQuerySubmitButton();
@@ -60,6 +69,7 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       url = await browser.getCurrentUrl();
       expect(url).to.contain('searchSessionId');
       await PageObjects.header.waitUntilLoadingHasFinished();
+      // Note this currently fails, for some reason the fakeSearchSessionId is not restored
       await searchSessions.expectState('restored');
       expect(await getSearchSessionId()).to.be(fakeSearchSessionId);
     });
@@ -82,6 +92,25 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
       await PageObjects.context.waitUntilContextLoadingHasFinished();
       await searchSessions.missingOrFail();
     });
+
+    it('relative timerange works', async () => {
+      await PageObjects.common.navigateToApp('discover');
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await searchSessions.save();
+      await searchSessions.expectState('backgroundCompleted');
+      const searchSessionId = await getSearchSessionId();
+      expect(await PageObjects.discover.hasNoResults()).to.be(true);
+      log.info('searchSessionId', searchSessionId);
+
+      // load URL to restore a saved session
+      await PageObjects.searchSessionsManagement.goTo();
+      const searchSessionList = await PageObjects.searchSessionsManagement.getList();
+      // navigate to Discover
+      await searchSessionList[0].view();
+      await PageObjects.header.waitUntilLoadingHasFinished();
+      await searchSessions.expectState('restored');
+      expect(await PageObjects.discover.hasNoResults()).to.be(true);
+    });
   });
 
   async function getSearchSessionId(): Promise<string> {
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 f2bbdf9c9287b..31fcb61cf2278 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
@@ -17,7 +17,7 @@ export default function ({ loadTestFile, getService, getPageObjects }: FtrProvid
     this.tags('ciGroup3');
 
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await PageObjects.common.navigateToApp('discover');
     });
diff --git a/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts b/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts
index 24543ea14fab4..728ad056f4e6b 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/discover/sessions_in_space.ts
@@ -26,7 +26,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe('discover in space', () => {
     describe('Storing search sessions in space', () => {
       before(async () => {
-        await esArchiver.load('dashboard/session_in_space');
+        await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space');
 
         await security.role.create('data_analyst', {
           elasticsearch: {
@@ -59,7 +59,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await security.role.delete('data_analyst');
         await security.user.delete('analyst');
 
-        await esArchiver.unload('dashboard/session_in_space');
+        await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space');
         await PageObjects.security.forceLogout();
       });
 
@@ -99,7 +99,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
     });
     describe('Disabled storing search sessions in space', () => {
       before(async () => {
-        await esArchiver.load('dashboard/session_in_space');
+        await esArchiver.load('x-pack/test/functional/es_archives/dashboard/session_in_space');
 
         await security.role.create('data_analyst', {
           elasticsearch: {
@@ -132,7 +132,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         await security.role.delete('data_analyst');
         await security.user.delete('analyst');
 
-        await esArchiver.unload('dashboard/session_in_space');
+        await esArchiver.unload('x-pack/test/functional/es_archives/dashboard/session_in_space');
         await PageObjects.security.forceLogout();
       });
 
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 04ada51cac0d6..c559af88fd9d9 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
@@ -15,7 +15,7 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
     this.tags('ciGroup3');
 
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
     });
 
diff --git a/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts b/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts
index 7a3ae0ebb1c66..d95e117d1b033 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/lens/search_sessions.ts
@@ -16,11 +16,11 @@ export default function ({ getPageObjects, getService }: FtrProviderContext) {
 
   describe('lens search sessions', () => {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.loadIfNeeded('lens/basic');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/lens/basic');
     });
     after(async () => {
-      await esArchiver.unload('lens/basic');
+      await esArchiver.unload('x-pack/test/functional/es_archives/lens/basic');
     });
 
     it("doesn't shows search sessions indicator UI", async () => {
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 0798a25a2e982..d1e3d9408c0ca 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
@@ -15,8 +15,8 @@ export default function ({ loadTestFile, getService }: FtrProviderContext) {
     this.tags('ciGroup3');
 
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('dashboard/async_search');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/dashboard/async_search');
       await kibanaServer.uiSettings.replace({ defaultIndex: 'logstash-*' });
       await kibanaServer.uiSettings.replace({ 'search:timeout': 10000 });
     });
diff --git a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts
index 27b4a887075fb..78e4a4be9a0e3 100644
--- a/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts
+++ b/x-pack/test/search_sessions_integration/tests/apps/management/search_sessions/sessions_management.ts
@@ -109,7 +109,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
       });
 
       it('autorefreshes and shows items on the server', async () => {
-        await esArchiver.load('data/search_sessions');
+        await esArchiver.load('x-pack/test/functional/es_archives/data/search_sessions');
 
         const searchSessionList = await PageObjects.searchSessionsManagement.getList();
         expect(searchSessionList.length).to.be(10);
@@ -190,11 +190,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           ]
         `);
 
-        await esArchiver.unload('data/search_sessions');
+        await esArchiver.unload('x-pack/test/functional/es_archives/data/search_sessions');
       });
 
       it('has working pagination controls', async () => {
-        await esArchiver.load('data/search_sessions');
+        await esArchiver.load('x-pack/test/functional/es_archives/data/search_sessions');
 
         log.debug(`loading first page of sessions`);
         const sessionListFirst = await PageObjects.searchSessionsManagement.getList();
@@ -223,7 +223,7 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
           ]
         `);
 
-        await esArchiver.unload('data/search_sessions');
+        await esArchiver.unload('x-pack/test/functional/es_archives/data/search_sessions');
       });
     });
   });
diff --git a/x-pack/test/security_api_integration/tests/anonymous/login.ts b/x-pack/test/security_api_integration/tests/anonymous/login.ts
index 30d5d3ea33120..05f3adf2b8cb6 100644
--- a/x-pack/test/security_api_integration/tests/anonymous/login.ts
+++ b/x-pack/test/security_api_integration/tests/anonymous/login.ts
@@ -162,12 +162,13 @@ export default function ({ getService }: FtrProviderContext) {
           .set('kbn-xsrf', 'xxx')
           .set('Authorization', 'Basic ZHVtbXlfaGFja2VyOnBhc3M=')
           .set('Cookie', sessionCookie.cookieString())
-          .expect(401, {
-            statusCode: 401,
-            error: 'Unauthorized',
-            message:
-              '[security_exception]: unable to authenticate user [dummy_hacker] for REST request [/_security/_authenticate]',
-          });
+          .expect(401);
+
+        expect(apiResponse.body.statusCode).to.be(401);
+        expect(apiResponse.body.error).to.be('Unauthorized');
+        expect(apiResponse.body.message).to.include.string(
+          '[security_exception] Reason: unable to authenticate user [dummy_hacker] for REST request [/_security/_authenticate]'
+        );
 
         expect(apiResponse.headers['set-cookie']).to.be(undefined);
       });
diff --git a/x-pack/test/security_api_integration/tests/session_idle/extension.ts b/x-pack/test/security_api_integration/tests/session_idle/extension.ts
index 71621f4e3db8a..84ab8ce42c13e 100644
--- a/x-pack/test/security_api_integration/tests/session_idle/extension.ts
+++ b/x-pack/test/security_api_integration/tests/session_idle/extension.ts
@@ -6,7 +6,7 @@
  */
 
 import { Cookie, cookie } from 'request';
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../../ftr_provider_context';
 
 export default function ({ getService }: FtrProviderContext) {
diff --git a/x-pack/test/security_functional/login_selector.config.ts b/x-pack/test/security_functional/login_selector.config.ts
index e2ddf8dacb79c..e30775af7e784 100644
--- a/x-pack/test/security_functional/login_selector.config.ts
+++ b/x-pack/test/security_functional/login_selector.config.ts
@@ -97,7 +97,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       },
     },
     apps: kibanaFunctionalConfig.get('apps'),
-    esArchiver: { directory: resolve(__dirname, 'es_archives') },
     screenshots: { directory: resolve(__dirname, 'screenshots') },
 
     junit: {
diff --git a/x-pack/test/security_functional/oidc.config.ts b/x-pack/test/security_functional/oidc.config.ts
index db8799ba1acf7..9c00960671e03 100644
--- a/x-pack/test/security_functional/oidc.config.ts
+++ b/x-pack/test/security_functional/oidc.config.ts
@@ -79,7 +79,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       },
     },
     apps: kibanaFunctionalConfig.get('apps'),
-    esArchiver: { directory: resolve(__dirname, 'es_archives') },
     screenshots: { directory: resolve(__dirname, 'screenshots') },
 
     junit: {
diff --git a/x-pack/test/security_functional/saml.config.ts b/x-pack/test/security_functional/saml.config.ts
index a983e2747239c..264197c961123 100644
--- a/x-pack/test/security_functional/saml.config.ts
+++ b/x-pack/test/security_functional/saml.config.ts
@@ -76,7 +76,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
       },
     },
     apps: kibanaFunctionalConfig.get('apps'),
-    esArchiver: { directory: resolve(__dirname, 'es_archives') },
     screenshots: { directory: resolve(__dirname, 'screenshots') },
 
     junit: {
diff --git a/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts b/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts
index 780edd38f4121..b94b93d920da4 100644
--- a/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts
+++ b/x-pack/test/security_functional/tests/login_selector/auth_provider_hint.ts
@@ -31,13 +31,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         full_name: 'Guest',
       });
 
-      await esArchiver.load('../../functional/es_archives/empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.security.forceLogout();
     });
 
     after(async () => {
       await security.user.delete('anonymous_user');
-      await esArchiver.unload('../../functional/es_archives/empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     beforeEach(async () => {
diff --git a/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts b/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts
index e1b4396696acd..b535522d2955f 100644
--- a/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts
+++ b/x-pack/test/security_functional/tests/login_selector/basic_functionality.ts
@@ -34,13 +34,13 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         full_name: 'Admin',
       });
 
-      await esArchiver.load('../../functional/es_archives/empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       await PageObjects.security.forceLogout();
     });
 
     after(async () => {
       await security.user.delete(testCredentials.username);
-      await esArchiver.unload('../../functional/es_archives/empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     beforeEach(async () => {
diff --git a/x-pack/test/security_functional/tests/oidc/url_capture.ts b/x-pack/test/security_functional/tests/oidc/url_capture.ts
index b72aab33034c5..4c6b68cc3757c 100644
--- a/x-pack/test/security_functional/tests/oidc/url_capture.ts
+++ b/x-pack/test/security_functional/tests/oidc/url_capture.ts
@@ -26,11 +26,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         .send({ roles: ['superuser'], enabled: true, rules: { field: { 'realm.name': 'oidc1' } } })
         .expect(200);
 
-      await esArchiver.load('../../functional/es_archives/empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('../../functional/es_archives/empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     afterEach(async () => {
diff --git a/x-pack/test/security_functional/tests/saml/url_capture.ts b/x-pack/test/security_functional/tests/saml/url_capture.ts
index 09eee12813601..65d7688472539 100644
--- a/x-pack/test/security_functional/tests/saml/url_capture.ts
+++ b/x-pack/test/security_functional/tests/saml/url_capture.ts
@@ -26,11 +26,11 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
         .send({ roles: ['superuser'], enabled: true, rules: { field: { 'realm.name': 'saml1' } } })
         .expect(200);
 
-      await esArchiver.load('../../functional/es_archives/empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     after(async () => {
-      await esArchiver.unload('../../functional/es_archives/empty_kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     afterEach(async () => {
diff --git a/x-pack/test/security_solution_cypress/config.firefox.ts b/x-pack/test/security_solution_cypress/config.firefox.ts
index 9c9f2c2314a31..2a2ce410850ff 100644
--- a/x-pack/test/security_solution_cypress/config.firefox.ts
+++ b/x-pack/test/security_solution_cypress/config.firefox.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import { resolve } from 'path';
-
 import { FtrConfigProviderContext } from '@kbn/test';
 
 import { CA_CERT_PATH } from '@kbn/dev-utils';
@@ -24,10 +22,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   return {
     ...kibanaCommonTestsConfig.getAll(),
 
-    esArchiver: {
-      directory: resolve(__dirname, 'es_archives'),
-    },
-
     browser: {
       type: 'firefox',
       acceptInsecureCerts: true,
diff --git a/x-pack/test/security_solution_cypress/config.ts b/x-pack/test/security_solution_cypress/config.ts
index 95743369de0d7..18b4605fb9d8b 100644
--- a/x-pack/test/security_solution_cypress/config.ts
+++ b/x-pack/test/security_solution_cypress/config.ts
@@ -5,8 +5,6 @@
  * 2.0.
  */
 
-import { resolve } from 'path';
-
 import { FtrConfigProviderContext } from '@kbn/test';
 
 import { CA_CERT_PATH } from '@kbn/dev-utils';
@@ -22,10 +20,6 @@ export default async function ({ readConfigFile }: FtrConfigProviderContext) {
   return {
     ...kibanaCommonTestsConfig.getAll(),
 
-    esArchiver: {
-      directory: resolve(__dirname, 'es_archives'),
-    },
-
     esTestCluster: {
       ...xpackFunctionalTestsConfig.get('esTestCluster'),
       serverArgs: [
diff --git a/x-pack/test/security_solution_cypress/es_archives/empty_kibana/mappings.json b/x-pack/test/security_solution_cypress/es_archives/empty_kibana/mappings.json
index 77eac534850a5..499c994780285 100644
--- a/x-pack/test/security_solution_cypress/es_archives/empty_kibana/mappings.json
+++ b/x-pack/test/security_solution_cypress/es_archives/empty_kibana/mappings.json
@@ -1,7 +1,10 @@
 {
   "type": "index",
   "value": {
-    "index": ".kibana",
+    "aliases": {
+      ".kibana": {}
+    },
+    "index": ".kibana_1",
     "mappings": {
       "properties": {
         "config": {
diff --git a/x-pack/test/security_solution_cypress/runner.ts b/x-pack/test/security_solution_cypress/runner.ts
index 0144228fd8d9d..b219c491ddf77 100644
--- a/x-pack/test/security_solution_cypress/runner.ts
+++ b/x-pack/test/security_solution_cypress/runner.ts
@@ -17,7 +17,7 @@ export async function SecuritySolutionCypressCliTestRunner({ getService }: FtrPr
   const config = getService('config');
   const esArchiver = getService('esArchiver');
 
-  await esArchiver.load('auditbeat');
+  await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/auditbeat');
 
   await withProcRunner(log, async (procs) => {
     await procs.run('cypress', {
@@ -56,7 +56,7 @@ export async function SecuritySolutionCypressCliFirefoxTestRunner({
   const config = getService('config');
   const esArchiver = getService('esArchiver');
 
-  await esArchiver.load('auditbeat');
+  await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/auditbeat');
 
   await withProcRunner(log, async (procs) => {
     await procs.run('cypress', {
@@ -93,8 +93,8 @@ export async function SecuritySolutionCypressVisualTestRunner({ getService }: Ft
   const config = getService('config');
   const esArchiver = getService('esArchiver');
 
-  await esArchiver.load('empty_kibana');
-  await esArchiver.load('auditbeat');
+  await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/empty_kibana');
+  await esArchiver.load('x-pack/test/security_solution_cypress/es_archives/auditbeat');
 
   await withProcRunner(log, async (procs) => {
     await procs.run('cypress', {
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 8b07d6c0530cd..e55307ed5ef66 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
@@ -84,7 +84,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
       });
 
       it('finds data after load and polling', async () => {
-        await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true });
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/endpoint/metadata/destination_index',
+          { useCreate: true }
+        );
         await pageObjects.endpoint.waitForTableToHaveData('endpointListTable', 1100);
         const tableData = await pageObjects.endpointPageUtils.tableData('endpointListTable');
         expect(tableData).to.eql(expectedData);
@@ -93,7 +96,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
     describe('when there is data,', () => {
       before(async () => {
-        await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true });
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/endpoint/metadata/destination_index',
+          { useCreate: true }
+        );
         await pageObjects.endpoint.navigateToEndpointList();
       });
       after(async () => {
@@ -210,7 +216,10 @@ export default ({ getPageObjects, getService }: FtrProviderContext) => {
 
     describe('displays the correct table data for the kql queries', () => {
       before(async () => {
-        await esArchiver.load('endpoint/metadata/destination_index', { useCreate: true });
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/endpoint/metadata/destination_index',
+          { useCreate: true }
+        );
         await pageObjects.endpoint.navigateToEndpointList();
       });
       after(async () => {
diff --git a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
index 57f03a197b389..efc87330eb822 100644
--- a/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
+++ b/x-pack/test/security_solution_endpoint/apps/endpoint/endpoint_telemetry.ts
@@ -16,12 +16,12 @@ export default function ({ getService }: FtrProviderContext) {
   // There are currently tests in the security_solution application being maintained
   describe.skip('security solution endpoint telemetry', () => {
     after(async () => {
-      await esArchiver.load('empty_kibana');
+      await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
     });
 
     describe('when no agents are connected', () => {
       before(async () => {
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       it('reports no endpoints or policies', async () => {
@@ -42,7 +42,7 @@ export default function ({ getService }: FtrProviderContext) {
     });
     describe('when agents are connected with endpoint integration disabled', () => {
       before(async () => {
-        await esArchiver.load('endpoint/telemetry/agent_only');
+        await esArchiver.load('x-pack/test/functional/es_archives/endpoint/telemetry/agent_only');
       });
 
       it('reports no endpoints or policies', async () => {
@@ -68,7 +68,7 @@ export default function ({ getService }: FtrProviderContext) {
           'checkin_now',
           0
         );
-        await esArchiver.load('endpoint/telemetry/checkin_now');
+        await esArchiver.load('x-pack/test/functional/es_archives/endpoint/telemetry/checkin_now');
         await telemetryTestResources.deleteArchive('checkin_now');
       });
 
@@ -97,7 +97,9 @@ export default function ({ getService }: FtrProviderContext) {
           'checkin_2_days_ago',
           2
         );
-        await esArchiver.load('endpoint/telemetry/checkin_2_days_ago');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/endpoint/telemetry/checkin_2_days_ago'
+        );
         await telemetryTestResources.deleteArchive('checkin_2_days_ago');
       });
 
@@ -121,7 +123,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
     describe('when agents are connected with endpoints integration malware enabled', () => {
       before(async () => {
-        await esArchiver.load('endpoint/telemetry/endpoint_malware_enabled');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_enabled'
+        );
       });
 
       it('reports the correct number of windows and macos endpoints under policies malware', async () => {
@@ -132,7 +136,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
     describe('when agents are connected with endpoints integration malware disabled', () => {
       before(async () => {
-        await esArchiver.load('endpoint/telemetry/endpoint_malware_disabled');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_malware_disabled'
+        );
       });
       it('reports the correct number of windows and macos endpoints under policies malware', async () => {
         const endpointTelemetry = await telemetryTestResources.getEndpointTelemetry();
@@ -142,7 +148,9 @@ export default function ({ getService }: FtrProviderContext) {
     });
     describe('when agents are connected with endpoints integration uninstalled', () => {
       before(async () => {
-        await esArchiver.load('endpoint/telemetry/endpoint_uninstalled');
+        await esArchiver.load(
+          'x-pack/test/functional/es_archives/endpoint/telemetry/endpoint_uninstalled'
+        );
       });
       it('reports no endpoints or policies', async () => {
         const endpointTelemetry = await telemetryTestResources.getEndpointTelemetry();
@@ -168,7 +176,9 @@ export default function ({ getService }: FtrProviderContext) {
             'cloned_endpoint_test',
             0
           );
-          await esArchiver.load('endpoint/telemetry/cloned_endpoint_test');
+          await esArchiver.load(
+            'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test'
+          );
           await telemetryTestResources.deleteArchive('cloned_endpoint_test');
         });
         it('reports all endpoints and policies', async () => {
@@ -213,7 +223,9 @@ export default function ({ getService }: FtrProviderContext) {
             'cloned_endpoint_test',
             0
           );
-          await esArchiver.load('endpoint/telemetry/cloned_endpoint_test');
+          await esArchiver.load(
+            'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test'
+          );
           await telemetryTestResources.deleteArchive('cloned_endpoint_test');
         });
         it('reports all endpoints and policies', async () => {
@@ -258,7 +270,9 @@ export default function ({ getService }: FtrProviderContext) {
             'cloned_endpoint_test',
             0
           );
-          await esArchiver.load('endpoint/telemetry/cloned_endpoint_test');
+          await esArchiver.load(
+            'x-pack/test/functional/es_archives/endpoint/telemetry/cloned_endpoint_test'
+          );
           await telemetryTestResources.deleteArchive('cloned_endpoint_test');
         });
         it('reports all endpoints and policies', async () => {
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 791fed9424966..5abc842ddc9c9 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
@@ -6,10 +6,10 @@
  */
 
 import { FtrProviderContext } from '../ftr_provider_context';
-import { PLUGIN_ID } from '../../../plugins/fleet/common';
+import { INTEGRATIONS_PLUGIN_ID } from '../../../plugins/fleet/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/applications/fleet/constants/page_paths';
+import { pagePathGetters } from '../../../plugins/fleet/public/constants/page_paths';
 
 export function FleetIntegrations({ getService, getPageObjects }: FtrProviderContext) {
   const pageObjects = getPageObjects(['common']);
@@ -17,8 +17,8 @@ export function FleetIntegrations({ getService, getPageObjects }: FtrProviderCon
 
   return {
     async navigateToIntegrationDetails(pkgkey: string) {
-      await pageObjects.common.navigateToApp(PLUGIN_ID, {
-        hash: pagePathGetters.integration_details_overview({ pkgkey }),
+      await pageObjects.common.navigateToApp(INTEGRATIONS_PLUGIN_ID, {
+        hash: pagePathGetters.integration_details_overview({ pkgkey })[1],
       });
     },
 
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 ec1cde2193dfd..2b7702b399f17 100644
--- a/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
+++ b/x-pack/test/security_solution_endpoint/services/endpoint_policy.ts
@@ -22,7 +22,7 @@ import { policyFactory } from '../../../plugins/security_solution/common/endpoin
 import { Immutable } from '../../../plugins/security_solution/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/applications/fleet/services/pkg_key_from_package_info';
+import { pkgKeyFromPackageInfo } from '../../../plugins/fleet/public/services/pkg_key_from_package_info';
 
 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/metadata.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata.ts
index 8dd5adba43edb..b5d98c115d194 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
@@ -5,15 +5,15 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../ftr_provider_context';
 import {
   deleteAllDocsFromMetadataCurrentIndex,
   deleteAllDocsFromMetadataIndex,
   deleteMetadataStream,
 } from './data_stream_helper';
-import { METADATA_REQUEST_ROUTE } from '../../../plugins/security_solution/server/endpoint/routes/metadata';
 import { MetadataQueryStrategyVersions } from '../../../plugins/security_solution/common/endpoint/types';
+import { HOST_METADATA_LIST_ROUTE } from '../../../plugins/security_solution/common/endpoint/constants';
 
 /**
  * The number of host documents in the es archive.
@@ -25,13 +25,13 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
 
   describe('test metadata api', () => {
-    describe(`POST ${METADATA_REQUEST_ROUTE} when index is empty`, () => {
+    describe(`POST ${HOST_METADATA_LIST_ROUTE} when index is empty`, () => {
       it('metadata api should return empty result when index is empty', async () => {
         await deleteMetadataStream(getService);
         await deleteAllDocsFromMetadataIndex(getService);
         await deleteAllDocsFromMetadataCurrentIndex(getService);
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send()
           .expect(200);
@@ -42,9 +42,11 @@ export default function ({ getService }: FtrProviderContext) {
       });
     });
 
-    describe(`POST ${METADATA_REQUEST_ROUTE} when index is not empty`, () => {
+    describe(`POST ${HOST_METADATA_LIST_ROUTE} when index is not empty`, () => {
       before(async () => {
-        await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true });
+        await esArchiver.load('x-pack/test/functional/es_archives/endpoint/metadata/api_feature', {
+          useCreate: true,
+        });
         // wait for transform
         await new Promise((r) => setTimeout(r, 120000));
       });
@@ -57,7 +59,7 @@ export default function ({ getService }: FtrProviderContext) {
       });
       it('metadata api should return one entry for each host with default paging', async () => {
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send()
           .expect(200);
@@ -69,7 +71,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('metadata api should return page based on paging properties passed.', async () => {
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             paging_properties: [
@@ -94,7 +96,7 @@ export default function ({ getService }: FtrProviderContext) {
        */
       it('metadata api should return accurate total metadata if page index produces no result', async () => {
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             paging_properties: [
@@ -116,7 +118,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('metadata api should return 400 when pagingProperties is below boundaries.', async () => {
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             paging_properties: [
@@ -134,7 +136,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('metadata api should return page based on filters passed.', async () => {
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             filters: {
@@ -152,7 +154,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('metadata api should return page based on filters and paging passed.', async () => {
         const notIncludedIp = '10.46.229.234';
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             paging_properties: [
@@ -190,7 +192,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('metadata api should return page based on host.os.Ext.variant filter.', async () => {
         const variantValue = 'Windows Pro';
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             filters: {
@@ -212,7 +214,7 @@ export default function ({ getService }: FtrProviderContext) {
       it('metadata api should return the latest event for all the events for an endpoint', async () => {
         const targetEndpointIp = '10.46.229.234';
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             filters: {
@@ -234,7 +236,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('metadata api should return the latest event for all the events where policy status is not success', async () => {
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             filters: {
@@ -255,7 +257,7 @@ export default function ({ getService }: FtrProviderContext) {
         const targetEndpointId = 'fc0ff548-feba-41b6-8367-65e8790d0eaf';
         const targetElasticAgentId = '023fa40c-411d-4188-a941-4147bfadd095';
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             filters: {
@@ -278,7 +280,7 @@ export default function ({ getService }: FtrProviderContext) {
 
       it('metadata api should return all hosts when filter is empty string', async () => {
         const { body } = await supertest
-          .post(`${METADATA_REQUEST_ROUTE}`)
+          .post(`${HOST_METADATA_LIST_ROUTE}`)
           .set('kbn-xsrf', 'xxx')
           .send({
             filters: {
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts b/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts
index f3f86d4610d2b..d8cf1a11fac0a 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/metadata_v1.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { deleteMetadataStream } from './data_stream_helper';
 import { METADATA_REQUEST_V1_ROUTE } from '../../../plugins/security_solution/server/endpoint/routes/metadata';
@@ -40,7 +40,11 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe(`POST ${METADATA_REQUEST_V1_ROUTE} when index is not empty`, () => {
       before(
-        async () => await esArchiver.load('endpoint/metadata/api_feature', { useCreate: true })
+        async () =>
+          await esArchiver.load(
+            'x-pack/test/functional/es_archives/endpoint/metadata/api_feature',
+            { useCreate: true }
+          )
       );
       // the endpoint uses data streams and es archiver does not support deleting them at the moment so we need
       // to do it manually
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 d46b7723fcafe..a8fd5a612b306 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
@@ -96,7 +96,9 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('dns processor', () => {
       before(async () => {
-        await esArchiver.load('endpoint/pipeline/dns', { useCreate: true });
+        await esArchiver.load('x-pack/test/functional/es_archives/endpoint/pipeline/dns', {
+          useCreate: true,
+        });
       });
 
       after(async () => {
diff --git a/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts b/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts
index 79ea93da8a5b0..8b72a6c21bfe5 100644
--- a/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts
+++ b/x-pack/test/security_solution_endpoint_api_int/apis/policy.ts
@@ -5,7 +5,7 @@
  * 2.0.
  */
 
-import expect from '@kbn/expect/expect.js';
+import expect from '@kbn/expect';
 import { FtrProviderContext } from '../ftr_provider_context';
 import { deletePolicyStream } from './data_stream_helper';
 
@@ -14,7 +14,12 @@ export default function ({ getService }: FtrProviderContext) {
   const supertest = getService('supertest');
   describe('Endpoint policy api', () => {
     describe('GET /api/endpoint/policy_response', () => {
-      before(async () => await esArchiver.load('endpoint/policy', { useCreate: true }));
+      before(
+        async () =>
+          await esArchiver.load('x-pack/test/functional/es_archives/endpoint/policy', {
+            useCreate: true,
+          })
+      );
 
       // the endpoint uses data streams and es archiver does not support deleting them at the moment so we need
       // to do it manually
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 3cca9213b4554..6a9f4caa84676 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
@@ -17,11 +17,11 @@ export default function ({ getService }: FtrProviderContext) {
   describe('Resolver tests for the entity route', () => {
     describe('winlogbeat tests', () => {
       before(async () => {
-        await esArchiver.load('endpoint/resolver/winlogbeat');
+        await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat');
       });
 
       after(async () => {
-        await esArchiver.unload('endpoint/resolver/winlogbeat');
+        await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/winlogbeat');
       });
 
       it('returns a winlogbeat sysmon event when the event matches the schema correctly', async () => {
@@ -56,11 +56,11 @@ export default function ({ getService }: FtrProviderContext) {
 
     describe('signals index mapping tests', () => {
       before(async () => {
-        await esArchiver.load('endpoint/resolver/signals');
+        await esArchiver.load('x-pack/test/functional/es_archives/endpoint/resolver/signals');
       });
 
       after(async () => {
-        await esArchiver.unload('endpoint/resolver/signals');
+        await esArchiver.unload('x-pack/test/functional/es_archives/endpoint/resolver/signals');
       });
 
       it('returns an event even if it does not have a mapping for entity_id', async () => {
diff --git a/x-pack/test/security_solution_ftr/page_objects/detections/index.ts b/x-pack/test/security_solution_ftr/page_objects/detections/index.ts
index dd17548df6e3f..6f26e0b3ad364 100644
--- a/x-pack/test/security_solution_ftr/page_objects/detections/index.ts
+++ b/x-pack/test/security_solution_ftr/page_objects/detections/index.ts
@@ -5,145 +5,144 @@
  * 2.0.
  */
 
-import { FtrProviderContext } from '../../../functional/ftr_provider_context';
+import { FtrService } from '../../../functional/ftr_provider_context';
 import { WebElementWrapper } from '../../../../../test/functional/services/lib/web_element_wrapper';
 
-export function DetectionsPageProvider({ getService, getPageObjects }: FtrProviderContext) {
-  const find = getService('find');
-  const { common } = getPageObjects(['common']);
-  const testSubjects = getService('testSubjects');
-
-  class DetectionsPage {
-    async navigateHome(): Promise<void> {
-      await this.navigateToDetectionsPage();
-    }
-
-    async navigateToRules(): Promise<void> {
-      await this.navigateToDetectionsPage('rules');
-    }
-
-    async navigateToRuleMonitoring(): Promise<void> {
-      await common.clickAndValidate('allRulesTableTab-monitoring', 'monitoring-table');
-    }
-
-    async navigateToExceptionList(): Promise<void> {
-      await common.clickAndValidate('allRulesTableTab-exceptions', 'exceptions-table');
-    }
-
-    async navigateToCreateRule(): Promise<void> {
-      await this.navigateToDetectionsPage('rules/create');
-    }
-
-    async replaceIndexPattern(): Promise<void> {
-      const buttons = await find.allByCssSelector('[data-test-subj="comboBoxInput"] button');
-      await buttons.map(async (button: WebElementWrapper) => await button.click());
-      await testSubjects.setValue('comboBoxSearchInput', '*');
-    }
-
-    async openImportQueryModal(): Promise<void> {
-      const element = await testSubjects.find('importQueryFromSavedTimeline');
-      await element.click(500);
-      await testSubjects.exists('open-timeline-modal-body-filter-default');
-    }
-
-    async viewTemplatesInImportQueryModal(): Promise<void> {
-      await common.clickAndValidate('open-timeline-modal-body-filter-template', 'timelines-table');
-    }
-
-    async closeImportQueryModal(): Promise<void> {
-      await find.clickByCssSelector('.euiButtonIcon.euiButtonIcon--text.euiModal__closeIcon');
-    }
-
-    async selectMachineLearningJob(): Promise<void> {
-      await find.clickByCssSelector('[data-test-subj="mlJobSelect"] button');
-      await find.clickByCssSelector('#high_distinct_count_error_message');
-    }
-
-    async openAddFilterPopover(): Promise<void> {
-      const addButtons = await testSubjects.findAll('addFilter');
-      await addButtons[1].click();
-      await testSubjects.exists('saveFilter');
-    }
-
-    async closeAddFilterPopover(): Promise<void> {
-      await testSubjects.click('cancelSaveFilter');
-    }
-
-    async toggleFilterActions(): Promise<void> {
-      const filterActions = await testSubjects.findAll('addFilter');
-      await filterActions[1].click();
-    }
-
-    async toggleSavedQueries(): Promise<void> {
-      const filterActions = await find.allByCssSelector(
-        '[data-test-subj="saved-query-management-popover-button"]'
-      );
-      await filterActions[1].click();
-    }
-
-    async addNameAndDescription(
-      name: string = 'test rule name',
-      description: string = 'test rule description'
-    ): Promise<void> {
-      await find.setValue(`[aria-describedby="detectionEngineStepAboutRuleName"]`, name, 500);
-      await find.setValue(
-        `[aria-describedby="detectionEngineStepAboutRuleDescription"]`,
-        description,
-        500
-      );
-    }
-
-    async goBackToAllRules(): Promise<void> {
-      await common.clickAndValidate('ruleDetailsBackToAllRules', 'create-new-rule');
-    }
-
-    async revealAdvancedSettings(): Promise<void> {
-      await common.clickAndValidate(
-        'advancedSettings',
-        'detectionEngineStepAboutRuleReferenceUrls'
-      );
-    }
-
-    async preview(): Promise<void> {
-      await common.clickAndValidate(
-        'queryPreviewButton',
-        'queryPreviewCustomHistogram',
-        undefined,
-        500
-      );
-    }
-
-    async continue(prefix: string): Promise<void> {
-      await testSubjects.click(`${prefix}-continue`);
-    }
-
-    async addCustomQuery(query: string): Promise<void> {
-      await testSubjects.setValue('queryInput', query, undefined, 500);
-    }
-
-    async selectMLRule(): Promise<void> {
-      await common.clickAndValidate('machineLearningRuleType', 'mlJobSelect');
-    }
-
-    async selectEQLRule(): Promise<void> {
-      await common.clickAndValidate('eqlRuleType', 'eqlQueryBarTextInput');
-    }
-
-    async selectIndicatorMatchRule(): Promise<void> {
-      await common.clickAndValidate('threatMatchRuleType', 'comboBoxInput');
-    }
-
-    async selectThresholdRule(): Promise<void> {
-      await common.clickAndValidate('thresholdRuleType', 'input');
-    }
-
-    private async navigateToDetectionsPage(path: string = ''): Promise<void> {
-      const subUrl = `detections${path ? `/${path}` : ''}`;
-      await common.navigateToUrl('securitySolution', subUrl, {
-        shouldUseHashForSubUrl: false,
-      });
-    }
-  }
-
-  return new DetectionsPage();
+export class DetectionsPageObject extends FtrService {
+  private readonly find = this.ctx.getService('find');
+  private readonly common = this.ctx.getPageObject('common');
+  private readonly testSubjects = this.ctx.getService('testSubjects');
+
+  async navigateHome(): Promise<void> {
+    await this.navigateToDetectionsPage();
+  }
+
+  async navigateToRules(): Promise<void> {
+    await this.navigateToDetectionsPage('rules');
+  }
+
+  async navigateToRuleMonitoring(): Promise<void> {
+    await this.common.clickAndValidate('allRulesTableTab-monitoring', 'monitoring-table');
+  }
+
+  async navigateToExceptionList(): Promise<void> {
+    await this.common.clickAndValidate('allRulesTableTab-exceptions', 'exceptions-table');
+  }
+
+  async navigateToCreateRule(): Promise<void> {
+    await this.navigateToDetectionsPage('rules/create');
+  }
+
+  async replaceIndexPattern(): Promise<void> {
+    const buttons = await this.find.allByCssSelector('[data-test-subj="comboBoxInput"] button');
+    await buttons.map(async (button: WebElementWrapper) => await button.click());
+    await this.testSubjects.setValue('comboBoxSearchInput', '*');
+  }
+
+  async openImportQueryModal(): Promise<void> {
+    const element = await this.testSubjects.find('importQueryFromSavedTimeline');
+    await element.click(500);
+    await this.testSubjects.exists('open-timeline-modal-body-filter-default');
+  }
+
+  async viewTemplatesInImportQueryModal(): Promise<void> {
+    await this.common.clickAndValidate(
+      'open-timeline-modal-body-filter-template',
+      'timelines-table'
+    );
+  }
+
+  async closeImportQueryModal(): Promise<void> {
+    await this.find.clickByCssSelector('.euiButtonIcon.euiButtonIcon--text.euiModal__closeIcon');
+  }
+
+  async selectMachineLearningJob(): Promise<void> {
+    await this.find.clickByCssSelector('[data-test-subj="mlJobSelect"] button');
+    await this.find.clickByCssSelector('#high_distinct_count_error_message');
+  }
+
+  async openAddFilterPopover(): Promise<void> {
+    const addButtons = await this.testSubjects.findAll('addFilter');
+    await addButtons[1].click();
+    await this.testSubjects.exists('saveFilter');
+  }
+
+  async closeAddFilterPopover(): Promise<void> {
+    await this.testSubjects.click('cancelSaveFilter');
+  }
+
+  async toggleFilterActions(): Promise<void> {
+    const filterActions = await this.testSubjects.findAll('addFilter');
+    await filterActions[1].click();
+  }
+
+  async toggleSavedQueries(): Promise<void> {
+    const filterActions = await this.find.allByCssSelector(
+      '[data-test-subj="saved-query-management-popover-button"]'
+    );
+    await filterActions[1].click();
+  }
+
+  async addNameAndDescription(
+    name: string = 'test rule name',
+    description: string = 'test rule description'
+  ): Promise<void> {
+    await this.find.setValue(`[aria-describedby="detectionEngineStepAboutRuleName"]`, name, 500);
+    await this.find.setValue(
+      `[aria-describedby="detectionEngineStepAboutRuleDescription"]`,
+      description,
+      500
+    );
+  }
+
+  async goBackToAllRules(): Promise<void> {
+    await this.common.clickAndValidate('ruleDetailsBackToAllRules', 'create-new-rule');
+  }
+
+  async revealAdvancedSettings(): Promise<void> {
+    await this.common.clickAndValidate(
+      'advancedSettings',
+      'detectionEngineStepAboutRuleReferenceUrls'
+    );
+  }
+
+  async preview(): Promise<void> {
+    await this.common.clickAndValidate(
+      'queryPreviewButton',
+      'queryPreviewCustomHistogram',
+      undefined,
+      500
+    );
+  }
+
+  async continue(prefix: string): Promise<void> {
+    await this.testSubjects.click(`${prefix}-continue`);
+  }
+
+  async addCustomQuery(query: string): Promise<void> {
+    await this.testSubjects.setValue('queryInput', query, undefined, 500);
+  }
+
+  async selectMLRule(): Promise<void> {
+    await this.common.clickAndValidate('machineLearningRuleType', 'mlJobSelect');
+  }
+
+  async selectEQLRule(): Promise<void> {
+    await this.common.clickAndValidate('eqlRuleType', 'eqlQueryBarTextInput');
+  }
+
+  async selectIndicatorMatchRule(): Promise<void> {
+    await this.common.clickAndValidate('threatMatchRuleType', 'comboBoxInput');
+  }
+
+  async selectThresholdRule(): Promise<void> {
+    await this.common.clickAndValidate('thresholdRuleType', 'input');
+  }
+
+  private async navigateToDetectionsPage(path: string = ''): Promise<void> {
+    const subUrl = `detections${path ? `/${path}` : ''}`;
+    await this.common.navigateToUrl('securitySolution', subUrl, {
+      shouldUseHashForSubUrl: false,
+    });
+  }
 }
diff --git a/x-pack/test/spaces_api_integration/common/config.ts b/x-pack/test/spaces_api_integration/common/config.ts
index d1e4dae76b636..7cceb945790d5 100644
--- a/x-pack/test/spaces_api_integration/common/config.ts
+++ b/x-pack/test/spaces_api_integration/common/config.ts
@@ -44,10 +44,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
         reportName: 'X-Pack Spaces API Integration Tests -- ' + name,
       },
 
-      esArchiver: {
-        directory: path.join(__dirname, 'fixtures', 'es_archiver'),
-      },
-
       esTestCluster: {
         ...config.xpack.api.get('esTestCluster'),
         license,
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 e264e574a3cea..ead34f6be8850 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
@@ -613,8 +613,16 @@ export function copyToSpaceTestSuiteFactory(
       });
 
       describe('single-namespace types', () => {
-        beforeEach(() => esArchiver.load('saved_objects/spaces'));
-        afterEach(() => esArchiver.unload('saved_objects/spaces'));
+        beforeEach(() =>
+          esArchiver.load(
+            'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+          )
+        );
+        afterEach(() =>
+          esArchiver.unload(
+            'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+          )
+        );
 
         const dashboardObject = { type: 'dashboard', id: 'cts_dashboard' };
 
@@ -755,8 +763,16 @@ export function copyToSpaceTestSuiteFactory(
         const spaces = ['space_2'];
         const includeReferences = false;
         describe(`multi-namespace types with overwrite=${overwrite} and createNewCopies=${createNewCopies}`, () => {
-          before(() => esArchiver.load('saved_objects/spaces'));
-          after(() => esArchiver.unload('saved_objects/spaces'));
+          before(() =>
+            esArchiver.load(
+              'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+            )
+          );
+          after(() =>
+            esArchiver.unload(
+              'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+            )
+          );
 
           const testCases = tests.multiNamespaceTestCases(overwrite, createNewCopies);
           testCases.forEach(({ testTitle, objects, statusCode, response }) => {
diff --git a/x-pack/test/spaces_api_integration/common/suites/create.ts b/x-pack/test/spaces_api_integration/common/suites/create.ts
index 6839caf86e210..acc4524b38c36 100644
--- a/x-pack/test/spaces_api_integration/common/suites/create.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/create.ts
@@ -68,8 +68,16 @@ export function createTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     { user = {}, spaceId, tests }: CreateTestDefinition
   ) => {
     describeFn(description, () => {
-      beforeEach(() => esArchiver.load('saved_objects/spaces'));
-      afterEach(() => esArchiver.unload('saved_objects/spaces'));
+      beforeEach(() =>
+        esArchiver.load(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      afterEach(() =>
+        esArchiver.unload(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       getTestScenariosForSpace(spaceId).forEach(({ urlPrefix, scenario }) => {
         it(`should return ${tests.newSpace.statusCode} ${scenario}`, async () => {
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 b4624d36a8192..ccd08fb2d93e9 100644
--- a/x-pack/test/spaces_api_integration/common/suites/delete.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/delete.ts
@@ -187,7 +187,9 @@ export function deleteTestSuiteFactory(
   ) => {
     describeFn(description, () => {
       beforeEach(async () => {
-        await esArchiver.load('saved_objects/spaces');
+        await esArchiver.load(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        );
 
         // since we want to verify that we only delete the right things
         // and can't include a config document with the correct id in the
@@ -199,7 +201,11 @@ export function deleteTestSuiteFactory(
           .auth(user.username, user.password)
           .expect(200);
       });
-      afterEach(() => esArchiver.unload('saved_objects/spaces'));
+      afterEach(() =>
+        esArchiver.unload(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       getTestScenariosForSpace(spaceId).forEach(({ urlPrefix, scenario }) => {
         it(`should return ${tests.exists.statusCode} ${scenario}`, async () => {
diff --git a/x-pack/test/spaces_api_integration/common/suites/get.ts b/x-pack/test/spaces_api_integration/common/suites/get.ts
index c471c98fa75e6..0fc4334daa184 100644
--- a/x-pack/test/spaces_api_integration/common/suites/get.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/get.ts
@@ -79,8 +79,16 @@ export function getTestSuiteFactory(esArchiver: any, supertest: SuperAgent<any>)
     { user = {}, currentSpaceId, spaceId, tests }: GetTestDefinition
   ) => {
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       getTestScenariosForSpace(currentSpaceId).forEach(({ urlPrefix, scenario }) => {
         it(`should return ${tests.default.statusCode} ${scenario}`, async () => {
diff --git a/x-pack/test/spaces_api_integration/common/suites/get_all.ts b/x-pack/test/spaces_api_integration/common/suites/get_all.ts
index e32bd6e8cd91d..63284fac1151b 100644
--- a/x-pack/test/spaces_api_integration/common/suites/get_all.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/get_all.ts
@@ -90,8 +90,16 @@ export function getAllTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     { user = {}, spaceId, tests }: GetAllTestDefinition
   ) => {
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       getTestScenariosForSpace(spaceId).forEach(({ scenario, urlPrefix }) => {
         describe('undefined purpose', () => {
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 a10e28d52924e..05d92c8ef33eb 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
@@ -242,8 +242,16 @@ export function getShareableReferencesTestSuiteFactory(esArchiver: any, supertes
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
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 66ec1febd7372..84ec05d043740 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
@@ -428,8 +428,16 @@ export function resolveCopyToSpaceConflictsSuite(
       });
 
       describe('single-namespace types', () => {
-        beforeEach(() => esArchiver.load('saved_objects/spaces'));
-        afterEach(() => esArchiver.unload('saved_objects/spaces'));
+        beforeEach(() =>
+          esArchiver.load(
+            'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+          )
+        );
+        afterEach(() =>
+          esArchiver.unload(
+            'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+          )
+        );
 
         const dashboardObject = { type: 'dashboard', id: 'cts_dashboard' };
         const visualizationObject = { type: 'visualization', id: 'cts_vis_3' };
@@ -518,8 +526,16 @@ export function resolveCopyToSpaceConflictsSuite(
       const includeReferences = false;
       const createNewCopies = false;
       describe(`multi-namespace types with "overwrite" retry`, () => {
-        before(() => esArchiver.load('saved_objects/spaces'));
-        after(() => esArchiver.unload('saved_objects/spaces'));
+        before(() =>
+          esArchiver.load(
+            'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+          )
+        );
+        after(() =>
+          esArchiver.unload(
+            'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+          )
+        );
 
         const testCases = tests.multiNamespaceTestCases();
         testCases.forEach(({ testTitle, objects, retries, statusCode, response }) => {
diff --git a/x-pack/test/spaces_api_integration/common/suites/update.ts b/x-pack/test/spaces_api_integration/common/suites/update.ts
index 71606cccb3fd5..b3dfeb9f548de 100644
--- a/x-pack/test/spaces_api_integration/common/suites/update.ts
+++ b/x-pack/test/spaces_api_integration/common/suites/update.ts
@@ -70,8 +70,16 @@ export function updateTestSuiteFactory(esArchiver: any, supertest: SuperTest<any
     { user = {}, spaceId, tests }: UpdateTestDefinition
   ) => {
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       describe('space_1', () => {
         it(`should return ${tests.alreadyExists.statusCode}`, async () => {
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 7664deb6b0bdf..27bf8db5e042f 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
@@ -114,8 +114,16 @@ export function updateObjectsSpacesTestSuiteFactory(esArchiver: any, supertest:
     const { user, spaceId = SPACES.DEFAULT.spaceId, tests } = definition;
 
     describeFn(description, () => {
-      before(() => esArchiver.load('saved_objects/spaces'));
-      after(() => esArchiver.unload('saved_objects/spaces'));
+      before(() =>
+        esArchiver.load(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
+      after(() =>
+        esArchiver.unload(
+          'x-pack/test/spaces_api_integration/common/fixtures/es_archiver/saved_objects/spaces'
+        )
+      );
 
       for (const test of tests) {
         it(`should return ${test.responseStatusCode} ${test.title}`, async () => {
diff --git a/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js b/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js
index 208d768f5b218..f11aa7e09635b 100644
--- a/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js
+++ b/x-pack/test/stack_functional_integration/apps/alerts/alerts_encryption_keys.js
@@ -7,7 +7,7 @@
 
 import expect from '@kbn/expect';
 
-const ARCHIVE = 'email_connectors_with_encryption_rotation';
+const ARCHIVE = '../integration-test/test/es_archives/email_connectors_with_encryption_rotation';
 
 export default ({ getPageObjects, getService }) => {
   const esArchiver = getService('esArchiver');
diff --git a/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js b/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js
index 7de23c2899b67..83a759abe337d 100644
--- a/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js
+++ b/x-pack/test/stack_functional_integration/apps/ccs/ccs_discover.js
@@ -5,7 +5,12 @@
  * 2.0.
  */
 
+import fs from 'fs';
 import expect from '@kbn/expect';
+import { Client as EsClient } from '@elastic/elasticsearch';
+import { KbnClient } from '@kbn/test';
+import { EsArchiver } from '@kbn/es-archiver';
+import { CA_CERT_PATH } from '@kbn/dev-utils';
 
 export default ({ getService, getPageObjects }) => {
   describe('Cross cluster search test in discover', async () => {
@@ -24,7 +29,6 @@ export default ({ getService, getPageObjects }) => {
     const kibanaServer = getService('kibanaServer');
     const queryBar = getService('queryBar');
     const filterBar = getService('filterBar');
-    const supertest = getService('supertest');
 
     before(async () => {
       await browser.setWindowSize(1200, 800);
@@ -98,8 +102,6 @@ export default ({ getService, getPageObjects }) => {
         );
         await PageObjects.security.logout();
       }
-      // visit app/security so to create .siem-signals-* as side effect
-      await PageObjects.common.navigateToApp('security', { insertTimestamp: false });
       const url = await browser.getCurrentUrl();
       log.debug(url);
       if (!url.includes('kibana')) {
@@ -138,35 +140,6 @@ export default ({ getService, getPageObjects }) => {
       expect(patternName).to.be('*:makelogs工程-*');
     });
 
-    it('create local siem signals index pattern', async () => {
-      log.debug('Add index pattern: .siem-signals-*');
-      await supertest
-        .post('/api/index_patterns/index_pattern')
-        .set('kbn-xsrf', 'true')
-        .send({
-          index_pattern: {
-            title: '.siem-signals-*',
-          },
-          override: true,
-        })
-        .expect(200);
-    });
-
-    it('create remote monitoring ES index pattern', async () => {
-      log.debug('Add index pattern: data:.monitoring-es-*');
-      await supertest
-        .post('/api/index_patterns/index_pattern')
-        .set('kbn-xsrf', 'true')
-        .send({
-          index_pattern: {
-            title: 'data:.monitoring-es-*',
-            timeFieldName: 'timestamp',
-          },
-          override: true,
-        })
-        .expect(200);
-    });
-
     it('local:makelogs(star) should discover data from the local cluster', async () => {
       await PageObjects.common.navigateToApp('discover', { insertTimestamp: false });
 
@@ -236,34 +209,150 @@ export default ({ getService, getPageObjects }) => {
       });
     });
 
-    it('should generate alerts based on remote events', async () => {
-      log.debug('Add detection rule type:shards on data:.monitoring-es-*');
-      await supertest
-        .post('/api/detection_engine/rules')
-        .set('kbn-xsrf', 'true')
-        .send({
-          description: 'This is the description of the rule',
-          risk_score: 17,
-          severity: 'low',
-          interval: '10s',
-          name: 'CCS_Detection_test',
-          type: 'query',
-          from: 'now-1d',
-          index: ['data:.monitoring-es-*'],
-          timestamp_override: 'timestamp',
-          query: 'type:shards',
-          language: 'kuery',
-          enabled: true,
-        })
-        .expect(200);
-
-      log.debug('Check if any alert got to .siem-signals-*');
-      await PageObjects.common.navigateToApp('discover', { insertTimestamp: false });
-      await PageObjects.discover.selectIndexPattern('.siem-signals-*');
-      await retry.tryForTime(40000, async () => {
-        const hitCount = await PageObjects.discover.getHitCount();
-        log.debug('### hit count = ' + hitCount);
-        expect(hitCount).to.be.greaterThan('0');
+    describe('Detection engine', async function () {
+      const supertest = getService('supertest');
+      const esSupertest = getService('esSupertest');
+      const config = getService('config');
+
+      const esClient = new EsClient({
+        ssl: {
+          ca: fs.readFileSync(CA_CERT_PATH, 'utf-8'),
+        },
+        nodes: [process.env.TEST_ES_URLDATA],
+        requestTimeout: config.get('timeouts.esRequestTimeout'),
+      });
+
+      const kbnClient = new KbnClient({
+        log,
+        url: process.env.TEST_KIBANA_URLDATA,
+        certificateAuthorities: config.get('servers.kibana.certificateAuthorities'),
+        uiSettingDefaults: kibanaServer.uiSettings,
+        importExportDir: config.get('kbnArchiver.directory'),
+      });
+
+      const esArchiver = new EsArchiver({
+        log,
+        client: esClient,
+        kbnClient,
+      });
+
+      let signalsId;
+      let dataId;
+      let ruleId;
+
+      before('Prepare .siem-signal-*', async function () {
+        log.info('Create index');
+        // visit app/security so to create .siem-signals-* as side effect
+        await PageObjects.common.navigateToApp('security', { insertTimestamp: false });
+
+        log.info('Create index pattern');
+        signalsId = await supertest
+          .post('/api/index_patterns/index_pattern')
+          .set('kbn-xsrf', 'true')
+          .send({
+            index_pattern: {
+              title: '.siem-signals-*',
+            },
+            override: true,
+          })
+          .expect(200)
+          .then((res) => JSON.parse(res.text).index_pattern.id);
+        log.debug('id: ' + signalsId);
+      });
+
+      before('Prepare data:metricbeat-*', async function () {
+        log.info('Create index');
+        await esArchiver.load('../integration-test/test/es_archives/metricbeat');
+
+        log.info('Create index pattern');
+        dataId = await supertest
+          .post('/api/index_patterns/index_pattern')
+          .set('kbn-xsrf', 'true')
+          .send({
+            index_pattern: {
+              title: 'data:metricbeat-*',
+            },
+            override: true,
+          })
+          .expect(200)
+          .then((res) => JSON.parse(res.text).index_pattern.id);
+        log.debug('id: ' + dataId);
+      });
+
+      before('Add detection rule', async function () {
+        ruleId = await supertest
+          .post('/api/detection_engine/rules')
+          .set('kbn-xsrf', 'true')
+          .send({
+            description: 'This is the description of the rule',
+            risk_score: 17,
+            severity: 'low',
+            interval: '10s',
+            name: 'CCS_Detection_test',
+            type: 'query',
+            from: 'now-1y',
+            index: ['data:metricbeat-*'],
+            query: '*:*',
+            language: 'kuery',
+            enabled: true,
+          })
+          .expect(200)
+          .then((res) => JSON.parse(res.text).id);
+        log.debug('id: ' + ruleId);
+      });
+
+      after('Clean up detection rule', async function () {
+        if (ruleId !== undefined) {
+          log.debug('id: ' + ruleId);
+          await supertest
+            .delete('/api/detection_engine/rules?id=' + ruleId)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+        }
+      });
+
+      after('Clean up data:metricbeat-*', async function () {
+        if (dataId !== undefined) {
+          log.info('Delete index pattern');
+          log.debug('id: ' + dataId);
+          await supertest
+            .delete('/api/index_patterns/index_pattern/' + dataId)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+        }
+
+        log.info('Delete index');
+        await esArchiver.unload('../integration-test/test/es_archives/metricbeat');
+      });
+
+      after('Clean up .siem-signal-*', async function () {
+        if (signalsId !== undefined) {
+          log.info('Delete index pattern: .siem-signals-*');
+          log.debug('id: ' + signalsId);
+          await supertest
+            .delete('/api/index_patterns/index_pattern/' + signalsId)
+            .set('kbn-xsrf', 'true')
+            .expect(200);
+        }
+
+        log.info('Delete index alias: .siem-signals-default');
+        await esSupertest
+          .delete('/.siem-signals-default-000001/_alias/.siem-signals-default')
+          .expect(200);
+
+        log.info('Delete index: .siem-signals-default-000001');
+        await esSupertest.delete('/.siem-signals-default-000001').expect(200);
+      });
+
+      it('Should generate alerts based on remote events', async function () {
+        log.info('Check if any alert got to .siem-signals-*');
+        await PageObjects.common.navigateToApp('discover', { insertTimestamp: false });
+        await PageObjects.discover.selectIndexPattern('.siem-signals-*');
+        await retry.tryForTime(30000, async () => {
+          const hitCount = await PageObjects.discover.getHitCount();
+          log.debug('### hit count = ' + hitCount);
+          expect(hitCount).to.be('100');
+        });
       });
     });
   });
diff --git a/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher.js b/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher.js
index 31eb6d65ce7ac..fb881162f51e8 100644
--- a/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher.js
+++ b/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher.js
@@ -85,7 +85,7 @@ export default function ({ getService, getPageObjects }) {
         await putWatcher(watch, id, body, client, log);
       });
       it('should be successful and increment revision', async () => {
-        await getWatcher(watch, id, client, log, PageObjects.common, retry.tryForTime);
+        await getWatcher(watch, id, client, log, PageObjects.common, retry.tryForTime.bind(retry));
       });
       it('should delete watch and update revision', async () => {
         await deleteWatcher(watch, id, client, log);
diff --git a/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher_png.js b/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher_png.js
index 7e9ced57fdc0b..db913f563ebb0 100644
--- a/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher_png.js
+++ b/x-pack/test/stack_functional_integration/apps/reporting/reporting_watcher_png.js
@@ -79,7 +79,7 @@ export default ({ getService, getPageObjects }) => {
         await putWatcher(watch, id, body, client, log);
       });
       it('should be successful and increment revision', async () => {
-        await getWatcher(watch, id, client, log, PageObjects.common, retry.tryForTime);
+        await getWatcher(watch, id, client, log, PageObjects.common, retry.tryForTime.bind(retry));
       });
       it('should delete watch and update revision', async () => {
         await deleteWatcher(watch, id, client, log);
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 745b8b7e5da0a..7a65d01ba287a 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
@@ -11,6 +11,7 @@ import { ToolingLog, REPO_ROOT } from '@kbn/dev-utils';
 import chalk from 'chalk';
 import { esTestConfig, kbnTestConfig } from '@kbn/test';
 import { TriggersActionsPageProvider } from '../../functional_with_es_ssl/page_objects/triggers_actions_ui_page';
+import { services } from '../services';
 
 const log = new ToolingLog({
   level: 'info',
@@ -30,6 +31,7 @@ export default async ({ readConfigFile }) => {
 
   const settings = {
     ...xpackFunctionalConfig.getAll(),
+    services,
     pageObjects: {
       triggersActionsUI: TriggersActionsPageProvider,
       ...xpackFunctionalConfig.get('pageObjects'),
@@ -57,10 +59,6 @@ export default async ({ readConfigFile }) => {
     screenshots: {
       directory: resolve(INTEGRATION_TEST_ROOT, 'test/screenshots'),
     },
-    // choose where esArchiver should load archives from
-    esArchiver: {
-      directory: resolve(INTEGRATION_TEST_ROOT, 'test/es_archives'),
-    },
   };
   return settings;
 };
diff --git a/x-pack/test/stack_functional_integration/services/es_archiver.js b/x-pack/test/stack_functional_integration/services/es_archiver.js
new file mode 100644
index 0000000000000..6da55f77ec776
--- /dev/null
+++ b/x-pack/test/stack_functional_integration/services/es_archiver.js
@@ -0,0 +1,40 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import Path from 'path';
+
+import { EsArchiver } from '@kbn/es-archiver';
+import { REPO_ROOT } from '@kbn/dev-utils';
+
+import * as KibanaServer from '../../../../test/common/services/kibana_server';
+
+const INTEGRATION_TEST_ROOT =
+  process.env.WORKSPACE || Path.resolve(REPO_ROOT, '../integration-test');
+
+export function EsArchiverProvider({ getService }) {
+  const config = getService('config');
+  const client = getService('es');
+  const log = getService('log');
+  const kibanaServer = getService('kibanaServer');
+  const retry = getService('retry');
+
+  const esArchiver = new EsArchiver({
+    baseDir: INTEGRATION_TEST_ROOT,
+    client,
+    log,
+    kbnClient: kibanaServer,
+  });
+
+  KibanaServer.extendEsArchiver({
+    esArchiver,
+    kibanaServer,
+    retry,
+    defaults: config.get('uiSettings.defaults'),
+  });
+
+  return esArchiver;
+}
diff --git a/x-pack/test/stack_functional_integration/services/index.js b/x-pack/test/stack_functional_integration/services/index.js
new file mode 100644
index 0000000000000..e311dd8b38f7e
--- /dev/null
+++ b/x-pack/test/stack_functional_integration/services/index.js
@@ -0,0 +1,14 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+import { services as xpackFunctionalServices } from '../../functional/services';
+import { EsArchiverProvider } from './es_archiver';
+
+export const services = {
+  ...xpackFunctionalServices,
+  esArchiver: EsArchiverProvider,
+};
diff --git a/x-pack/test/tsconfig.json b/x-pack/test/tsconfig.json
index 7c95a53b75ee7..0424891064cd3 100644
--- a/x-pack/test/tsconfig.json
+++ b/x-pack/test/tsconfig.json
@@ -1,12 +1,24 @@
 {
   "extends": "../../tsconfig.base.json",
   "compilerOptions": {
-    // overhead is too significant
-    "incremental": false,
+    "composite": true,
+    "outDir": "./target/types",
+    "emitDeclarationOnly": true,
+    "declaration": true,
+    "declarationMap": true,
     "types": ["node"]
   },
-  "include": ["**/*", "../../typings/**/*", "../../packages/kbn-test/types/ftr_globals/**/*"],
+  "include": [
+    "**/*",
+    "./api_integration/apis/logstash/pipeline/fixtures/*.json",
+    "./api_integration/apis/logstash/pipelines/fixtures/*.json",
+    "./api_integration/apis/telemetry/fixtures/*.json",
+    "../../typings/**/*",
+    "../../packages/kbn-test/types/ftr_globals/**/*",
+  ],
+  "exclude": ["target/**/*"],
   "references": [
+    { "path": "../../test/tsconfig.json" },
     { "path": "../../src/core/tsconfig.json" },
     { "path": "../../src/plugins/bfetch/tsconfig.json" },
     { "path": "../../src/plugins/charts/tsconfig.json" },
@@ -84,6 +96,7 @@
     { "path": "../plugins/stack_alerts/tsconfig.json" },
     { "path": "../plugins/task_manager/tsconfig.json" },
     { "path": "../plugins/telemetry_collection_xpack/tsconfig.json" },
+    { "path": "../plugins/timelines/tsconfig.json" },
     { "path": "../plugins/transform/tsconfig.json" },
     { "path": "../plugins/triggers_actions_ui/tsconfig.json" },
     { "path": "../plugins/ui_actions_enhanced/tsconfig.json" },
diff --git a/x-pack/test/ui_capabilities/common/config.ts b/x-pack/test/ui_capabilities/common/config.ts
index 9c0ce92755e8e..1f695e562da05 100644
--- a/x-pack/test/ui_capabilities/common/config.ts
+++ b/x-pack/test/ui_capabilities/common/config.ts
@@ -30,7 +30,6 @@ export function createTestConfig(name: string, options: CreateTestConfigOptions)
       junit: {
         reportName: 'X-Pack UI Capabilities Functional Tests',
       },
-      esArchiver: {},
       esTestCluster: {
         ...xPackFunctionalTestsConfig.get('esTestCluster'),
         license,
diff --git a/x-pack/test/upgrade_assistant_integration/config.js b/x-pack/test/upgrade_assistant_integration/config.js
index e8424db699d12..1505697d771ca 100644
--- a/x-pack/test/upgrade_assistant_integration/config.js
+++ b/x-pack/test/upgrade_assistant_integration/config.js
@@ -26,7 +26,6 @@ export default async function ({ readConfigFile }) {
       ...kibanaCommonConfig.get('services'),
       supertest: kibanaAPITestsConfig.get('services.supertest'),
     },
-    esArchiver: xPackFunctionalTestsConfig.get('esArchiver'),
     junit: {
       reportName: 'X-Pack Upgrade Assistant Integration Tests',
     },
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 052c72a46cc7b..2fe7254def272 100644
--- a/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
+++ b/x-pack/test/upgrade_assistant_integration/upgrade_assistant/reindexing.js
@@ -52,7 +52,7 @@ export default function ({ getService }) {
     });
 
     it('should create a new index with the same documents', async () => {
-      await esArchiver.load('upgrade_assistant/reindex');
+      await esArchiver.load('x-pack/test/functional/es_archives/upgrade_assistant/reindex');
       const { body } = await supertest
         .post(`/api/upgrade_assistant/reindex/dummydata`)
         .set('kbn-xsrf', 'xxx')
@@ -84,7 +84,7 @@ export default function ({ getService }) {
     });
 
     it('should update any aliases', async () => {
-      await esArchiver.load('upgrade_assistant/reindex');
+      await esArchiver.load('x-pack/test/functional/es_archives/upgrade_assistant/reindex');
 
       // Add aliases and ensure each returns the right number of docs
       await es.indices.updateAliases({
diff --git a/x-pack/test/visual_regression/tests/canvas/index.js b/x-pack/test/visual_regression/tests/canvas/index.js
index 41f382bff284a..099c96e6eaf01 100644
--- a/x-pack/test/visual_regression/tests/canvas/index.js
+++ b/x-pack/test/visual_regression/tests/canvas/index.js
@@ -15,14 +15,14 @@ export default function ({ loadTestFile, getService }) {
 
   describe('canvas app visual regression', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('canvas/default');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/canvas/default');
 
       await browser.setWindowSize(SCREEN_WIDTH, 1000);
     });
 
     after(async () => {
-      await esArchiver.unload('canvas/default');
+      await esArchiver.unload('x-pack/test/functional/es_archives/canvas/default');
     });
 
     this.tags('ciGroup10');
diff --git a/x-pack/test/visual_regression/tests/infra/saved_views.js b/x-pack/test/visual_regression/tests/infra/saved_views.js
index e251cf255c59e..a9e020b797df1 100644
--- a/x-pack/test/visual_regression/tests/infra/saved_views.js
+++ b/x-pack/test/visual_regression/tests/infra/saved_views.js
@@ -14,8 +14,8 @@ export default function ({ getPageObjects, getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('saved views', () => {
-    before(() => esArchiver.load('infra/metrics_and_logs'));
-    after(() => esArchiver.unload('infra/metrics_and_logs'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
     describe('Inverntory Test save functionality', () => {
       it('should have save and load controls', async () => {
         await PageObjects.common.navigateToApp('infraOps');
diff --git a/x-pack/test/visual_regression/tests/infra/waffle_map.js b/x-pack/test/visual_regression/tests/infra/waffle_map.js
index b691272ecf13d..70aaf89a059eb 100644
--- a/x-pack/test/visual_regression/tests/infra/waffle_map.js
+++ b/x-pack/test/visual_regression/tests/infra/waffle_map.js
@@ -14,8 +14,8 @@ export default function ({ getPageObjects, getService }) {
   const esArchiver = getService('esArchiver');
 
   describe('waffle map', () => {
-    before(() => esArchiver.load('infra/metrics_and_logs'));
-    after(() => esArchiver.unload('infra/metrics_and_logs'));
+    before(() => esArchiver.load('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
+    after(() => esArchiver.unload('x-pack/test/functional/es_archives/infra/metrics_and_logs'));
 
     it('should just work', async () => {
       await PageObjects.common.navigateToApp('infraOps');
diff --git a/x-pack/test/visual_regression/tests/login_page.ts b/x-pack/test/visual_regression/tests/login_page.ts
index 3ee160cb3139f..65effd45d65df 100644
--- a/x-pack/test/visual_regression/tests/login_page.ts
+++ b/x-pack/test/visual_regression/tests/login_page.ts
@@ -17,12 +17,12 @@ export default function ({ getService, getPageObjects }: FtrProviderContext) {
   describe.skip('Security', () => {
     describe('Login Page', () => {
       before(async () => {
-        await esArchiver.load('empty_kibana');
+        await esArchiver.load('x-pack/test/functional/es_archives/empty_kibana');
         await PageObjects.security.forceLogout();
       });
 
       after(async () => {
-        await esArchiver.unload('empty_kibana');
+        await esArchiver.unload('x-pack/test/functional/es_archives/empty_kibana');
       });
 
       afterEach(async () => {
diff --git a/x-pack/test/visual_regression/tests/maps/index.js b/x-pack/test/visual_regression/tests/maps/index.js
index b96fc71250427..f4bf0e046f17a 100644
--- a/x-pack/test/visual_regression/tests/maps/index.js
+++ b/x-pack/test/visual_regression/tests/maps/index.js
@@ -12,9 +12,9 @@ export default function ({ loadTestFile, getService }) {
 
   describe('maps app visual regression', function () {
     before(async () => {
-      await esArchiver.loadIfNeeded('logstash_functional');
-      await esArchiver.load('maps/data');
-      await esArchiver.load('maps/kibana');
+      await esArchiver.loadIfNeeded('x-pack/test/functional/es_archives/logstash_functional');
+      await esArchiver.load('x-pack/test/functional/es_archives/maps/data');
+      await esArchiver.load('x-pack/test/functional/es_archives/maps/kibana');
       await kibanaServer.uiSettings.replace({
         defaultIndex: 'logstash-*',
       });
@@ -22,8 +22,8 @@ export default function ({ loadTestFile, getService }) {
     });
 
     after(async () => {
-      await esArchiver.unload('maps/data');
-      await esArchiver.unload('maps/kibana');
+      await esArchiver.unload('x-pack/test/functional/es_archives/maps/data');
+      await esArchiver.unload('x-pack/test/functional/es_archives/maps/kibana');
     });
 
     this.tags('ciGroup10');
diff --git a/yarn.lock b/yarn.lock
index ee4fadac018bc..167a8500a26ea 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1204,10 +1204,10 @@
   resolved "https://registry.yarnpkg.com/@bazel/ibazel/-/ibazel-0.15.10.tgz#cf0cff1aec6d8e7bb23e1fc618d09fbd39b7a13f"
   integrity sha512-0v+OwCQ6fsGFa50r6MXWbUkSGuWOoZ22K4pMSdtWiL5LKFIE4kfmMmtQS+M7/ICNwk2EIYob+NRreyi/DGUz5A==
 
-"@bazel/typescript@^3.5.0":
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.5.0.tgz#605493f4f0a5297df8a7fcccb86a1a80ea2090bb"
-  integrity sha512-BtGFp4nYFkQTmnONCzomk7dkmOwaINBL3piq+lykBlcc6UxLe9iCAnZpOyPypB1ReN3k3SRNAa53x6oGScQxMg==
+"@bazel/typescript@^3.5.1":
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.5.1.tgz#c6027d683adeefa2c3cebfa3ed5efa17c405a63b"
+  integrity sha512-dU5sGgaGdFWV1dJ1B+9iFbttgcKtmob+BvlM8mY7Nxq4j7/wVbgPjiVLOBeOD7kpzYep8JHXfhAokHt486IG+Q==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"
@@ -1366,10 +1366,10 @@
   dependencies:
     object-hash "^1.3.0"
 
-"@elastic/charts@29.2.0":
-  version "29.2.0"
-  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-29.2.0.tgz#cd65887c0ca1d420493aee1b570c862ca0df5311"
-  integrity sha512-gj3Gew9zy8XPNEkAAznOjncO5AF63jy/X1k1VIcNPqdqMi07YYCZwCQjMzUVoS4RN6X4GSzxhrYfGAeyZP8gqg==
+"@elastic/charts@30.0.0":
+  version "30.0.0"
+  resolved "https://registry.yarnpkg.com/@elastic/charts/-/charts-30.0.0.tgz#e19ad8b94928aa9bac5d7facc488fa69b683ff1e"
+  integrity sha512-r22T2dlW3drEmrIx6JNlOOzSp0JCkI/qbIfmvzdMBu8E8hITkJTaXJaLsNN4mz9EvR9jEM8XQQPQXOFKJhWixw==
   dependencies:
     "@popperjs/core" "^2.4.0"
     chroma-js "^2.1.0"
@@ -1392,7 +1392,7 @@
     utility-types "^3.10.0"
     uuid "^3.3.2"
 
-"@elastic/datemath@link:bazel-bin/packages/elastic-datemath/npm_module":
+"@elastic/datemath@link:bazel-bin/packages/elastic-datemath":
   version "0.0.0"
   uid ""
 
@@ -1410,16 +1410,15 @@
   dependencies:
     "@elastic/ecs-helpers" "^1.1.0"
 
-"@elastic/elasticsearch@npm:@elastic/elasticsearch-canary@^8.0.0-canary.4":
-  version "8.0.0-canary.4"
-  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch-canary/-/elasticsearch-canary-8.0.0-canary.4.tgz#6f1a592974941baae347eb8c66a2006848349717"
-  integrity sha512-UexFloloyvGOhvMc1ePRHCy89sjQL6rPTTZkXAB/GcC8rCvA3mgSnIY2+Ylvctdv9o4l+M4Bkw8azICulyhwMg==
+"@elastic/elasticsearch@npm:@elastic/elasticsearch-canary@^8.0.0-canary.13":
+  version "8.0.0-canary.13"
+  resolved "https://registry.yarnpkg.com/@elastic/elasticsearch-canary/-/elasticsearch-canary-8.0.0-canary.13.tgz#bb5c71440411703364701eabae7960c8899d2012"
+  integrity sha512-QbwwpOqnarG469fIJw9VL+PTs4WLHl5M6OsEZA3IqQOlMfjtXEMdC0dRQoVz8UCcDW1rp+r87QPDkMneCFxFKg==
   dependencies:
     debug "^4.3.1"
     hpagent "^0.1.1"
     ms "^2.1.3"
-    pump "^3.0.0"
-    secure-json-parse "^2.3.1"
+    secure-json-parse "^2.4.0"
 
 "@elastic/ems-client@7.13.0":
   version "7.13.0"
@@ -1435,7 +1434,7 @@
     semver "7.3.2"
     topojson-client "^3.1.0"
 
-"@elastic/eslint-config-kibana@link:bazel-bin/packages/elastic-eslint-config-kibana/npm_module":
+"@elastic/eslint-config-kibana@link:bazel-bin/packages/elastic-eslint-config-kibana":
   version "0.0.0"
   uid ""
 
@@ -1444,10 +1443,10 @@
   resolved "https://registry.yarnpkg.com/@elastic/eslint-plugin-eui/-/eslint-plugin-eui-0.0.2.tgz#56b9ef03984a05cc213772ae3713ea8ef47b0314"
   integrity sha512-IoxURM5zraoQ7C8f+mJb9HYSENiZGgRVcG4tLQxE61yHNNRDXtGDWTZh8N1KIHcsqN1CEPETjuzBXkJYF/fDiQ==
 
-"@elastic/eui@32.1.0":
-  version "32.1.0"
-  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-32.1.0.tgz#065a91162962e187f42365557684db8b54b37407"
-  integrity sha512-a1Q70lwFO2MrFTITRWmApZUbQKhkUrKeXrvCdQoUCP4+ZiFsdk80R6ruXVW3kgrULCOtDKJQS1Bt9pfl+13sJw==
+"@elastic/eui@33.0.0":
+  version "33.0.0"
+  resolved "https://registry.yarnpkg.com/@elastic/eui/-/eui-33.0.0.tgz#525cf5ea6e6ab16c32bb09766e9c23806640240f"
+  integrity sha512-BQ6GJxKVaOF7Fm+IvH2iFeeGnepzygDr4xmmZ8PH2BEfrtkxzGP9YDpqmr/Drg5beVynJ3+72k1AEQT/JE6NTw==
   dependencies:
     "@types/chroma-js" "^2.0.0"
     "@types/lodash" "^4.14.160"
@@ -1456,10 +1455,11 @@
     "@types/react-input-autosize" "^2.2.0"
     "@types/react-virtualized-auto-sizer" "^1.0.0"
     "@types/react-window" "^1.8.2"
+    "@types/refractor" "^3.0.0"
+    "@types/resize-observer-browser" "^0.1.5"
     "@types/vfile-message" "^2.0.0"
     chroma-js "^2.1.0"
     classnames "^2.2.6"
-    highlight.js "^9.18.5"
     lodash "^4.17.21"
     numeral "^2.0.6"
     prop-types "^15.6.0"
@@ -1471,11 +1471,11 @@
     react-is "~16.3.0"
     react-virtualized-auto-sizer "^1.0.2"
     react-window "^1.8.5"
+    refractor "^3.3.1"
     rehype-raw "^5.0.0"
     rehype-react "^6.0.0"
     rehype-stringify "^8.0.0"
     remark-emoji "^2.1.0"
-    remark-highlight.js "^6.0.0"
     remark-parse "^8.0.3"
     remark-rehype "^8.0.0"
     tabbable "^3.0.0"
@@ -1571,7 +1571,7 @@
     "@types/node-jose" "1.1.0"
     node-jose "1.1.0"
 
-"@elastic/safer-lodash-set@link:bazel-bin/packages/elastic-safer-lodash-set/npm_module":
+"@elastic/safer-lodash-set@link:bazel-bin/packages/elastic-safer-lodash-set":
   version "0.0.0"
   uid ""
 
@@ -1871,10 +1871,10 @@
     "@hapi/hoek" "9.x.x"
     fast-safe-stringify "2.x.x"
 
-"@hapi/h2o2@^9.0.2":
-  version "9.0.2"
-  resolved "https://registry.yarnpkg.com/@hapi/h2o2/-/h2o2-9.0.2.tgz#e9f1dfe789257c80d6ee37ec9fe358f8c69f855a"
-  integrity sha512-V7RsmVyl7uyWeuEko4uaSZbFpBHKcSFSui6PXNRaRLJHFX+iPbqWmeH6m1pW/WJ8DuaCVJFKhluDCDI9l4+1cw==
+"@hapi/h2o2@^9.1.0":
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/@hapi/h2o2/-/h2o2-9.1.0.tgz#b223f4978b6f2b0d7d9db10a84a567606c4c3551"
+  integrity sha512-B7E58bMhxmpiDI22clxTexoAaVShNBk1Ez6S8SQjQZu5FxxD6Tqa44sXeZQBtWrdJF7ZRbsY60/C8AHLRxagNA==
   dependencies:
     "@hapi/boom" "9.x.x"
     "@hapi/hoek" "9.x.x"
@@ -2148,6 +2148,15 @@
     "@types/node" "*"
     jest-mock "^26.6.2"
 
+"@jest/fake-timers@^24.9.0":
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-24.9.0.tgz#ba3e6bf0eecd09a636049896434d306636540c93"
+  integrity sha512-eWQcNa2YSwzXWIMC5KufBh3oWRIijrQFROsIqt6v/NS9Io/gknw1jsAC9c+ih/RQX4A3O7SeWAhQeN0goKhT9A==
+  dependencies:
+    "@jest/types" "^24.9.0"
+    jest-message-util "^24.9.0"
+    jest-mock "^24.9.0"
+
 "@jest/fake-timers@^26.6.2":
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad"
@@ -2590,27 +2599,27 @@
     "@babel/runtime" "^7.7.2"
     regenerator-runtime "^0.13.3"
 
-"@kbn/ace@link:bazel-bin/packages/kbn-ace/npm_module":
+"@kbn/ace@link:bazel-bin/packages/kbn-ace":
   version "0.0.0"
   uid ""
 
-"@kbn/analytics@link:bazel-bin/packages/kbn-analytics/npm_module":
+"@kbn/analytics@link:bazel-bin/packages/kbn-analytics":
   version "0.0.0"
   uid ""
 
-"@kbn/apm-config-loader@link:bazel-bin/packages/kbn-apm-config-loader/npm_module":
+"@kbn/apm-config-loader@link:bazel-bin/packages/kbn-apm-config-loader":
   version "0.0.0"
   uid ""
 
-"@kbn/apm-utils@link:bazel-bin/packages/kbn-apm-utils/npm_module":
+"@kbn/apm-utils@link:bazel-bin/packages/kbn-apm-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/babel-code-parser@link:bazel-bin/packages/kbn-babel-code-parser/npm_module":
+"@kbn/babel-code-parser@link:bazel-bin/packages/kbn-babel-code-parser":
   version "0.0.0"
   uid ""
 
-"@kbn/babel-preset@link:bazel-bin/packages/kbn-babel-preset/npm_module":
+"@kbn/babel-preset@link:bazel-bin/packages/kbn-babel-preset":
   version "0.0.0"
   uid ""
 
@@ -2618,23 +2627,23 @@
   version "0.0.0"
   uid ""
 
-"@kbn/config-schema@link:bazel-bin/packages/kbn-config-schema/npm_module":
+"@kbn/config-schema@link:bazel-bin/packages/kbn-config-schema":
   version "0.0.0"
   uid ""
 
-"@kbn/config@link:bazel-bin/packages/kbn-config/npm_module":
+"@kbn/config@link:bazel-bin/packages/kbn-config":
   version "0.0.0"
   uid ""
 
-"@kbn/crypto@link:bazel-bin/packages/kbn-crypto/npm_module":
+"@kbn/crypto@link:bazel-bin/packages/kbn-crypto":
   version "0.0.0"
   uid ""
 
-"@kbn/dev-utils@link:bazel-bin/packages/kbn-dev-utils/npm_module":
+"@kbn/dev-utils@link:bazel-bin/packages/kbn-dev-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/docs-utils@link:bazel-bin/packages/kbn-docs-utils/npm_module":
+"@kbn/docs-utils@link:bazel-bin/packages/kbn-docs-utils":
   version "0.0.0"
   uid ""
 
@@ -2642,23 +2651,23 @@
   version "0.0.0"
   uid ""
 
-"@kbn/es@link:bazel-bin/packages/kbn-es/npm_module":
+"@kbn/es@link:bazel-bin/packages/kbn-es":
   version "0.0.0"
   uid ""
 
-"@kbn/eslint-import-resolver-kibana@link:bazel-bin/packages/kbn-eslint-import-resolver-kibana/npm_module":
+"@kbn/eslint-import-resolver-kibana@link:bazel-bin/packages/kbn-eslint-import-resolver-kibana":
   version "0.0.0"
   uid ""
 
-"@kbn/eslint-plugin-eslint@link:bazel-bin/packages/kbn-eslint-plugin-eslint/npm_module":
+"@kbn/eslint-plugin-eslint@link:bazel-bin/packages/kbn-eslint-plugin-eslint":
   version "0.0.0"
   uid ""
 
-"@kbn/expect@link:bazel-bin/packages/kbn-expect/npm_module":
+"@kbn/expect@link:bazel-bin/packages/kbn-expect":
   version "0.0.0"
   uid ""
 
-"@kbn/i18n@link:bazel-bin/packages/kbn-i18n/npm_module":
+"@kbn/i18n@link:bazel-bin/packages/kbn-i18n":
   version "0.0.0"
   uid ""
 
@@ -2666,23 +2675,23 @@
   version "0.0.0"
   uid ""
 
-"@kbn/io-ts-utils@link:bazel-bin/packages/kbn-io-ts-utils/npm_module":
+"@kbn/io-ts-utils@link:bazel-bin/packages/kbn-io-ts-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/legacy-logging@link:bazel-bin/packages/kbn-legacy-logging/npm_module":
+"@kbn/legacy-logging@link:bazel-bin/packages/kbn-legacy-logging":
   version "0.0.0"
   uid ""
 
-"@kbn/logging@link:bazel-bin/packages/kbn-logging/npm_module":
+"@kbn/logging@link:bazel-bin/packages/kbn-logging":
   version "0.0.0"
   uid ""
 
-"@kbn/mapbox-gl@link:bazel-bin/packages/kbn-mapbox-gl/npm_module":
+"@kbn/mapbox-gl@link:bazel-bin/packages/kbn-mapbox-gl":
   version "0.0.0"
   uid ""
 
-"@kbn/monaco@link:bazel-bin/packages/kbn-monaco/npm_module":
+"@kbn/monaco@link:bazel-bin/packages/kbn-monaco":
   version "0.0.0"
   uid ""
 
@@ -2690,7 +2699,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/plugin-generator@link:bazel-bin/packages/kbn-plugin-generator/npm_module":
+"@kbn/plugin-generator@link:bazel-bin/packages/kbn-plugin-generator":
   version "0.0.0"
   uid ""
 
@@ -2702,51 +2711,51 @@
   version "0.0.0"
   uid ""
 
-"@kbn/rule-data-utils@link:packages/kbn-rule-data-utils":
+"@kbn/rule-data-utils@link:bazel-bin/packages/kbn-rule-data-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-es-utils@link:bazel-bin/packages/kbn-securitysolution-es-utils/npm_module":
+"@kbn/securitysolution-es-utils@link:bazel-bin/packages/kbn-securitysolution-es-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-io-ts-alerting-types@link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types/npm_module":
+"@kbn/securitysolution-io-ts-alerting-types@link:bazel-bin/packages/kbn-securitysolution-io-ts-alerting-types":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-io-ts-list-types@link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types/npm_module":
+"@kbn/securitysolution-io-ts-list-types@link:bazel-bin/packages/kbn-securitysolution-io-ts-list-types":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-io-ts-types@link:bazel-bin/packages/kbn-securitysolution-io-ts-types/npm_module":
+"@kbn/securitysolution-io-ts-types@link:bazel-bin/packages/kbn-securitysolution-io-ts-types":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-io-ts-utils@link:bazel-bin/packages/kbn-securitysolution-io-ts-utils/npm_module":
+"@kbn/securitysolution-io-ts-utils@link:bazel-bin/packages/kbn-securitysolution-io-ts-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-list-api@link:bazel-bin/packages/kbn-securitysolution-list-api/npm_module":
+"@kbn/securitysolution-list-api@link:bazel-bin/packages/kbn-securitysolution-list-api":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-list-constants@link:bazel-bin/packages/kbn-securitysolution-list-constants/npm_module":
+"@kbn/securitysolution-list-constants@link:bazel-bin/packages/kbn-securitysolution-list-constants":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-list-hooks@link:bazel-bin/packages/kbn-securitysolution-list-hooks/npm_module":
+"@kbn/securitysolution-list-hooks@link:bazel-bin/packages/kbn-securitysolution-list-hooks":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-list-utils@link:bazel-bin/packages/kbn-securitysolution-list-utils/npm_module":
+"@kbn/securitysolution-list-utils@link:bazel-bin/packages/kbn-securitysolution-list-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/securitysolution-utils@link:bazel-bin/packages/kbn-securitysolution-utils/npm_module":
+"@kbn/securitysolution-utils@link:bazel-bin/packages/kbn-securitysolution-utils":
   version "0.0.0"
   uid ""
 
-"@kbn/server-http-tools@link:bazel-bin/packages/kbn-server-http-tools/npm_module":
+"@kbn/server-http-tools@link:bazel-bin/packages/kbn-server-http-tools":
   version "0.0.0"
   uid ""
 
@@ -2754,7 +2763,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/std@link:bazel-bin/packages/kbn-std/npm_module":
+"@kbn/std@link:bazel-bin/packages/kbn-std":
   version "0.0.0"
   uid ""
 
@@ -2762,7 +2771,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/telemetry-tools@link:bazel-bin/packages/kbn-telemetry-tools/npm_module":
+"@kbn/telemetry-tools@link:bazel-bin/packages/kbn-telemetry-tools":
   version "0.0.0"
   uid ""
 
@@ -2774,7 +2783,7 @@
   version "0.0.0"
   uid ""
 
-"@kbn/tinymath@link:bazel-bin/packages/kbn-tinymath/npm_module":
+"@kbn/tinymath@link:bazel-bin/packages/kbn-tinymath":
   version "0.0.0"
   uid ""
 
@@ -2786,11 +2795,11 @@
   version "0.0.0"
   uid ""
 
-"@kbn/utility-types@link:bazel-bin/packages/kbn-utility-types/npm_module":
+"@kbn/utility-types@link:bazel-bin/packages/kbn-utility-types":
   version "0.0.0"
   uid ""
 
-"@kbn/utils@link:bazel-bin/packages/kbn-utils/npm_module":
+"@kbn/utils@link:bazel-bin/packages/kbn-utils":
   version "0.0.0"
   uid ""
 
@@ -3604,13 +3613,6 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@scant/router@^0.1.1":
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/@scant/router/-/router-0.1.1.tgz#df3c9ae1796efce02f41c95c35166d708d88ef4a"
-  integrity sha512-9MiMXmEVFLm7jalyyVOtCvUN5dsIF9UgZW62BRw74vxEauLmeI0BTtJBmFdD4hMDL/QfHJc8egBPm2+f4s58wg==
-  dependencies:
-    url-pattern "^1.0.3"
-
 "@sideway/address@^4.1.0":
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/@sideway/address/-/address-4.1.0.tgz#0b301ada10ac4e0e3fa525c90615e0b61a72b78d"
@@ -4730,7 +4732,7 @@
   resolved "https://registry.yarnpkg.com/@types/chance/-/chance-1.0.1.tgz#c10703020369602c40dd9428cc6e1437027116df"
   integrity sha512-jtV6Bv/j+xk4gcXeLlESwNc/m/I/dIZA0xrt29g0uKcjyPob8iisj/5z0ARE+Ldfx4MxjNFNECG0z++J7zJgqg==
 
-"@types/cheerio@*", "@types/cheerio@^0.22.22", "@types/cheerio@^0.22.28":
+"@types/cheerio@*", "@types/cheerio@^0.22.22":
   version "0.22.28"
   resolved "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.28.tgz#90808aabb44fec40fa2950f4c72351e3e4eb065b"
   integrity sha512-ehUMGSW5IeDxJjbru4awKYMlKGmo1wSSGUVqXtYwlgmUM8X1a0PZttEIm6yEY7vHsY/hh6iPnklF213G0UColw==
@@ -4959,11 +4961,6 @@
   resolved "https://registry.yarnpkg.com/@types/getos/-/getos-3.0.0.tgz#582c758e99e9d634f31f471faf7ce59cf1c39a71"
   integrity sha512-g5O9kykBPMaK5USwU+zM5AyXaztqbvHjSQ7HaBjqgO3f5lKGChkRhLP58Z/Nrr4RBGNNPrBcJkWZwnmbmi9YjQ==
 
-"@types/git-url-parse@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/@types/git-url-parse/-/git-url-parse-9.0.0.tgz#aac1315a44fa4ed5a52c3820f6c3c2fb79cbd12d"
-  integrity sha512-kA2RxBT/r/ZuDDKwMl+vFWn1Z0lfm1/Ik6Qb91wnSzyzCDa/fkM8gIOq6ruB7xfr37n6Mj5dyivileUVKsidlg==
-
 "@types/glob-base@^0.3.0":
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/@types/glob-base/-/glob-base-0.3.0.tgz#a581d688347e10e50dd7c17d6f2880a10354319d"
@@ -5614,6 +5611,11 @@
   dependencies:
     pretty-ms "*"
 
+"@types/prismjs@*":
+  version "1.16.3"
+  resolved "https://registry.yarnpkg.com/@types/prismjs/-/prismjs-1.16.3.tgz#73ae78b3e339777a1a1b7a8df89dcd6b8fe750c5"
+  integrity sha512-7lbX0Odbg9rnzXRdYdgPQZFkjd38QHpD6tvWxbLi6VXGQbXr054doixIS+TwftHP6afffA1zxCZrIcJRS/MkYQ==
+
 "@types/prop-types@*":
   version "15.7.1"
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
@@ -5810,6 +5812,13 @@
   dependencies:
     redux "^4.0.0"
 
+"@types/refractor@^3.0.0":
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/@types/refractor/-/refractor-3.0.0.tgz#c535cfad1c54cf377ae2984f6cf6e9627a36ea66"
+  integrity sha512-jkCqkTpxMXXfN03Xpzj+mBMxo9IxG616SV2U42iwHkBGq/f8RrX3DCzLayIqUV+MAIBCUvl5xPnjqpUtZRnMqA==
+  dependencies:
+    "@types/prismjs" "*"
+
 "@types/request@^2.48.2":
   version "2.48.2"
   resolved "https://registry.yarnpkg.com/@types/request/-/request-2.48.2.tgz#936374cbe1179d7ed529fc02543deb4597450fed"
@@ -5820,6 +5829,11 @@
     "@types/tough-cookie" "*"
     form-data "^2.5.0"
 
+"@types/resize-observer-browser@^0.1.5":
+  version "0.1.5"
+  resolved "https://registry.yarnpkg.com/@types/resize-observer-browser/-/resize-observer-browser-0.1.5.tgz#36d897708172ac2380cd486da7a3daf1161c1e23"
+  integrity sha512-8k/67Z95Goa6Lznuykxkfhq9YU3l1Qe6LNZmwde1u7802a3x8v44oq0j91DICclxatTr0rNnhXx7+VTIetSrSQ==
+
 "@types/responselike@*", "@types/responselike@^1.0.0":
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/@types/responselike/-/responselike-1.0.0.tgz#251f4fe7d154d2bad125abe1b429b23afd262e29"
@@ -9206,27 +9220,16 @@ check-more-types@2.24.0, check-more-types@^2.24.0:
   resolved "https://registry.yarnpkg.com/check-more-types/-/check-more-types-2.24.0.tgz#1420ffb10fd444dcfc79b43891bbfffd32a84600"
   integrity sha1-FCD/sQ/URNz8ebQ4kbv//TKoRgA=
 
-cheerio@0.22.0:
-  version "0.22.0"
-  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-0.22.0.tgz#a9baa860a3f9b595a6b81b1a86873121ed3a269e"
-  integrity sha1-qbqoYKP5tZWmuBsahocxIe06Jp4=
+cheerio-select@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/cheerio-select/-/cheerio-select-1.4.0.tgz#3a16f21e37a2ef0f211d6d1aa4eff054bb22cdc9"
+  integrity sha512-sobR3Yqz27L553Qa7cK6rtJlMDbiKPdNywtR95Sj/YgfpLfy0u6CGJuaBKe5YE/vTc23SCRKxWSdlon/w6I/Ew==
   dependencies:
-    css-select "~1.2.0"
-    dom-serializer "~0.1.0"
-    entities "~1.1.1"
-    htmlparser2 "^3.9.1"
-    lodash.assignin "^4.0.9"
-    lodash.bind "^4.1.4"
-    lodash.defaults "^4.0.1"
-    lodash.filter "^4.4.0"
-    lodash.flatten "^4.2.0"
-    lodash.foreach "^4.3.0"
-    lodash.map "^4.4.0"
-    lodash.merge "^4.4.0"
-    lodash.pick "^4.2.1"
-    lodash.reduce "^4.4.0"
-    lodash.reject "^4.4.0"
-    lodash.some "^4.4.0"
+    css-select "^4.1.2"
+    css-what "^5.0.0"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+    domutils "^2.6.0"
 
 cheerio@^1.0.0-rc.3:
   version "1.0.0-rc.3"
@@ -9240,6 +9243,19 @@ cheerio@^1.0.0-rc.3:
     lodash "^4.15.0"
     parse5 "^3.0.1"
 
+cheerio@^1.0.0-rc.9:
+  version "1.0.0-rc.9"
+  resolved "https://registry.yarnpkg.com/cheerio/-/cheerio-1.0.0-rc.9.tgz#a3ae6b7ce7af80675302ff836f628e7cb786a67f"
+  integrity sha512-QF6XVdrLONO6DXRF5iaolY+odmhj2CLj+xzNod7INPWMi/x9X4SOylH0S/vaPpX+AUU6t04s34SQNh7DbkuCng==
+  dependencies:
+    cheerio-select "^1.4.0"
+    dom-serializer "^1.3.1"
+    domhandler "^4.2.0"
+    htmlparser2 "^6.1.0"
+    parse5 "^6.0.1"
+    parse5-htmlparser2-tree-adapter "^6.0.1"
+    tslib "^2.2.0"
+
 chokidar@3.4.3, chokidar@^2.0.0, chokidar@^2.0.4, chokidar@^2.1.1, chokidar@^2.1.2, chokidar@^2.1.8, chokidar@^3.2.2, chokidar@^3.4.0, chokidar@^3.4.1, chokidar@^3.4.3:
   version "3.4.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b"
@@ -10477,6 +10493,17 @@ css-select@^2.0.0:
     domutils "^1.7.0"
     nth-check "^1.0.2"
 
+css-select@^4.1.2:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.2.tgz#8b52b6714ed3a80d8221ec971c543f3b12653286"
+  integrity sha512-nu5ye2Hg/4ISq4XqdLY2bEatAcLIdt3OYGFc9Tm9n7VSlFBcfRv0gBNksHRgSdUDQGtN3XrZ94ztW+NfzkFSUw==
+  dependencies:
+    boolbase "^1.0.0"
+    css-what "^5.0.0"
+    domhandler "^4.2.0"
+    domutils "^2.6.0"
+    nth-check "^2.0.0"
+
 css-to-react-native@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/css-to-react-native/-/css-to-react-native-3.0.0.tgz#62dbe678072a824a689bcfee011fc96e02a7d756"
@@ -10512,6 +10539,11 @@ css-what@^3.2.1:
   resolved "https://registry.yarnpkg.com/css-what/-/css-what-3.4.2.tgz#ea7026fcb01777edbde52124e21f327e7ae950e4"
   integrity sha512-ACUm3L0/jiZTqfzRM3Hi9Q8eZqd6IK37mMWPLz9PJxkLWllYeRf+EHUSHYEtFop2Eqytaq1FizFVh7XfBnXCDQ==
 
+css-what@^5.0.0:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
+  integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
+
 css.escape@^1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/css.escape/-/css.escape-1.5.1.tgz#42e27d4fa04ae32f931a4b4d4191fa9cddee97cb"
@@ -11823,7 +11855,7 @@ dom-helpers@^5.0.0, dom-helpers@^5.0.1:
     "@babel/runtime" "^7.8.7"
     csstype "^2.6.7"
 
-dom-serializer@0, dom-serializer@~0.1.0, dom-serializer@~0.1.1:
+dom-serializer@0, dom-serializer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
   integrity sha512-l0IU0pPzLWSHBcieZbpOKgkIn3ts3vAh7ZuFyXNwJxJXk/c4Gwj9xaTJwIDVQCXawWD0qb3IzMGH5rglQaO0XA==
@@ -11831,6 +11863,15 @@ dom-serializer@0, dom-serializer@~0.1.0, dom-serializer@~0.1.1:
     domelementtype "^1.3.0"
     entities "^1.1.1"
 
+dom-serializer@^1.0.1, dom-serializer@^1.3.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
 dom-walk@^0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-walk/-/dom-walk-0.1.1.tgz#672226dc74c8f799ad35307df936aba11acd6018"
@@ -11846,6 +11887,11 @@ domelementtype@1, domelementtype@^1.3.0, domelementtype@^1.3.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
   integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
 
+domelementtype@^2.0.1, domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -11874,6 +11920,13 @@ domhandler@^2.3.0, domhandler@^2.4.2:
   dependencies:
     domelementtype "1"
 
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+  dependencies:
+    domelementtype "^2.2.0"
+
 domutils@1.1:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.1.6.tgz#bddc3de099b9a2efacc51c623f28f416ecc57485"
@@ -11897,6 +11950,15 @@ domutils@^1.5.1, domutils@^1.7.0:
     dom-serializer "0"
     domelementtype "1"
 
+domutils@^2.5.2, domutils@^2.6.0:
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.6.0.tgz#2e15c04185d43fb16ae7057cb76433c6edb938b7"
+  integrity sha512-y0BezHuy4MDYxh6OvolXYsH+1EMGmFbwv5FKW7ovwMG6zTPWqNPq3WF9ayZssFq+UlKdffGLbOEaghNdaOm1WA==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dot-case@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.3.tgz#21d3b52efaaba2ea5fda875bb1aa8124521cf4aa"
@@ -12295,6 +12357,11 @@ entities@^1.1.1, entities@^1.1.2, entities@~1.1.1:
   resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56"
   integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==
 
+entities@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55"
+  integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
+
 entities@~2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz#68d6084cab1b079767540d80e56a39b423e4abf4"
@@ -13483,6 +13550,11 @@ fetch-mock@^7.3.9:
     path-to-regexp "^2.2.1"
     whatwg-url "^6.5.0"
 
+fflate@^0.6.9:
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/fflate/-/fflate-0.6.9.tgz#fb369b30792a03ff7274e174f3b36e51292d3f99"
+  integrity sha512-hmAdxNHub7fw36hX7BHiuAO0uekp6ufY2sjxBXWxIf0sw5p7tnS9GVrdM4D12SDYQUHVpiC50fPBYPTjOzRU2Q==
+
 figgy-pudding@^3.5.1:
   version "3.5.1"
   resolved "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz#862470112901c727a0e495a80744bd5baa1d6790"
@@ -14356,21 +14428,6 @@ gifwrap@^0.9.2:
     image-q "^1.1.1"
     omggif "^1.0.10"
 
-git-up@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/git-up/-/git-up-4.0.1.tgz#cb2ef086653640e721d2042fe3104857d89007c0"
-  integrity sha512-LFTZZrBlrCrGCG07/dm1aCjjpL1z9L3+5aEeI9SBhAqSc+kiA9Or1bgZhQFNppJX6h/f5McrvJt1mQXTFm6Qrw==
-  dependencies:
-    is-ssh "^1.3.0"
-    parse-url "^5.0.0"
-
-git-url-parse@11.1.2:
-  version "11.1.2"
-  resolved "https://registry.yarnpkg.com/git-url-parse/-/git-url-parse-11.1.2.tgz#aff1a897c36cc93699270587bea3dbcbbb95de67"
-  integrity sha512-gZeLVGY8QVKMIkckncX+iCq2/L8PlwncvDFKiWkBn9EtCfYDbliRTTp6qzyQ1VMdITUfq7293zDzfpjdiGASSQ==
-  dependencies:
-    git-up "^4.0.0"
-
 github-markdown-css@^2.10.0:
   version "2.10.0"
   resolved "https://registry.yarnpkg.com/github-markdown-css/-/github-markdown-css-2.10.0.tgz#0612fed22816b33b282f37ef8def7a4ecabfe993"
@@ -15281,11 +15338,6 @@ highlight.js@^10.1.1, highlight.js@^10.4.1, highlight.js@~10.4.0:
   resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-10.4.1.tgz#d48fbcf4a9971c4361b3f95f302747afe19dbad0"
   integrity sha512-yR5lWvNz7c85OhVAEAeFhVCc/GV4C30Fjzc/rCP0aCWzc1UUOPUk55dK/qdwTZHBvMZo+eZ2jpk62ndX/xMFlg==
 
-highlight.js@^9.18.5:
-  version "9.18.5"
-  resolved "https://registry.yarnpkg.com/highlight.js/-/highlight.js-9.18.5.tgz#d18a359867f378c138d6819edfc2a8acd5f29825"
-  integrity sha512-a5bFyofd/BHCX52/8i8uJkjr9DYwXIPnM/plwI6W7ezItLGqzt7X2G2nXuYSfsIJdkwwj/g9DG1LkcGJI/dDoA==
-
 history-extra@^5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/history-extra/-/history-extra-5.0.1.tgz#95a2e59dda526c4241d0ae1b124a77a5e4675ce8"
@@ -15501,6 +15553,16 @@ htmlparser2@^3.10.0, htmlparser2@^3.9.1:
     inherits "^2.0.1"
     readable-stream "^3.1.1"
 
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
+
 htmlparser2@~3.3.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.3.0.tgz#cc70d05a59f6542e43f0e685c982e14c924a9efe"
@@ -16535,13 +16597,6 @@ is-set@^2.0.1:
   resolved "https://registry.yarnpkg.com/is-set/-/is-set-2.0.1.tgz#d1604afdab1724986d30091575f54945da7e5f43"
   integrity sha512-eJEzOtVyenDs1TMzSQ3kU3K+E0GUS9sno+F0OBT97xsgcJsF9nXMBtkT9/kut5JEpM7oL7X/0qxR17K3mcwIAA==
 
-is-ssh@^1.3.0:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/is-ssh/-/is-ssh-1.3.1.tgz#f349a8cadd24e65298037a522cf7520f2e81a0f3"
-  integrity sha512-0eRIASHZt1E68/ixClI8bp2YK2wmBPVWEismTs6M+M099jKgrzl/3E976zIbImSIob48N2/XGe9y7ZiYdImSlg==
-  dependencies:
-    protocols "^1.1.0"
-
 is-stream@^1.0.0, is-stream@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
@@ -16974,6 +17029,15 @@ jest-each@^26.6.2:
     jest-util "^26.6.2"
     pretty-format "^26.6.2"
 
+jest-environment-jsdom-thirteen@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/jest-environment-jsdom-thirteen/-/jest-environment-jsdom-thirteen-1.0.1.tgz#113e3c8aed945dadbc826636fa21139c69567bb5"
+  integrity sha512-Zi7OuKF7HMLlBvomitd5eKp5Ykc4Wvw0d+i+cpbCaE+7kmvL24SO4ssDmKrT++aANXR4T8+pmoJIlav5gr2peQ==
+  dependencies:
+    jest-mock "^24.0.0"
+    jest-util "^24.0.0"
+    jsdom "^13.0.0"
+
 jest-environment-jsdom@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e"
@@ -17116,6 +17180,13 @@ jest-message-util@^26.6.2:
     slash "^3.0.0"
     stack-utils "^2.0.2"
 
+jest-mock@^24.0.0, jest-mock@^24.9.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-24.9.0.tgz#c22835541ee379b908673ad51087a2185c13f1c6"
+  integrity sha512-3BEYN5WbSq9wd+SyLDES7AHnjH9A/ROBwmz7l2y+ol+NtSFO8DYiEBzoO1CeFc9a8DYy10EO4dDFVv/wN3zl1w==
+  dependencies:
+    "@jest/types" "^24.9.0"
+
 jest-mock@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302"
@@ -17315,6 +17386,24 @@ jest-styled-components@^7.0.3:
   dependencies:
     css "^2.2.4"
 
+jest-util@^24.0.0:
+  version "24.9.0"
+  resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-24.9.0.tgz#7396814e48536d2e85a37de3e4c431d7cb140162"
+  integrity sha512-x+cZU8VRmOJxbA1K5oDBdxQmdq0OIdADarLxk0Mq+3XS4jgvhG/oKGWcIDCtPG0HgjxOYvF+ilPJQsAyXfbNOg==
+  dependencies:
+    "@jest/console" "^24.9.0"
+    "@jest/fake-timers" "^24.9.0"
+    "@jest/source-map" "^24.9.0"
+    "@jest/test-result" "^24.9.0"
+    "@jest/types" "^24.9.0"
+    callsites "^3.0.0"
+    chalk "^2.0.1"
+    graceful-fs "^4.1.15"
+    is-ci "^2.0.0"
+    mkdirp "^0.5.1"
+    slash "^2.0.0"
+    source-map "^0.6.0"
+
 jest-util@^26.0.0, jest-util@^26.6.2:
   version "26.6.2"
   resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1"
@@ -17521,7 +17610,7 @@ jsbn@~0.1.0:
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"
   integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM=
 
-jsdom@13.1.0:
+jsdom@13.1.0, jsdom@^13.0.0:
   version "13.1.0"
   resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-13.1.0.tgz#fa7356f0cc8111d0f1077cb7800d06f22f1d66c7"
   integrity sha512-C2Kp0qNuopw0smXFaHeayvharqF3kkcNqlcIlSX71+3XrsOFwkEPLt/9f5JksMmaul2JZYIQuY+WTpqHpQQcLg==
@@ -18316,16 +18405,6 @@ lodash.assign@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.assign/-/lodash.assign-4.2.0.tgz#0d99f3ccd7a6d261d19bdaeb9245005d285808e7"
   integrity sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=
 
-lodash.assignin@^4.0.9:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.assignin/-/lodash.assignin-4.2.0.tgz#ba8df5fb841eb0a3e8044232b0e263a8dc6a28a2"
-  integrity sha1-uo31+4QesKPoBEIysOJjqNxqKKI=
-
-lodash.bind@^4.1.4:
-  version "4.2.1"
-  resolved "https://registry.yarnpkg.com/lodash.bind/-/lodash.bind-4.2.1.tgz#7ae3017e939622ac31b7d7d7dcb1b34db1690d35"
-  integrity sha1-euMBfpOWIqwxt9fX3LGzTbFpDTU=
-
 lodash.camelcase@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6"
@@ -18346,7 +18425,7 @@ lodash.debounce@^4.0.8:
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.defaults@^4.0.1, lodash.defaults@^4.2.0:
+lodash.defaults@^4.2.0:
   version "4.2.0"
   resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
   integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
@@ -18366,17 +18445,12 @@ lodash.fill@^3.4.0:
   resolved "https://registry.yarnpkg.com/lodash.fill/-/lodash.fill-3.4.0.tgz#a3c74ae640d053adf0dc2079f8720788e8bfef85"
   integrity sha1-o8dK5kDQU63w3CB5+HIHiOi/74U=
 
-lodash.filter@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.filter/-/lodash.filter-4.6.0.tgz#668b1d4981603ae1cc5a6fa760143e480b4c4ace"
-  integrity sha1-ZosdSYFgOuHMWm+nYBQ+SAtMSs4=
-
 lodash.flatmap@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.flatmap/-/lodash.flatmap-4.5.0.tgz#ef8cbf408f6e48268663345305c6acc0b778702e"
   integrity sha1-74y/QI9uSCaGYzRTBcaswLd4cC4=
 
-lodash.flatten@^4.2.0, lodash.flatten@^4.4.0:
+lodash.flatten@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.flatten/-/lodash.flatten-4.4.0.tgz#f31c22225a9632d2bbf8e4addbef240aa765a61f"
   integrity sha1-8xwiIlqWMtK7+OSt2+8kCqdlph8=
@@ -18386,11 +18460,6 @@ lodash.flattendeep@^4.4.0:
   resolved "https://registry.yarnpkg.com/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz#fb030917f86a3134e5bc9bec0d69e0013ddfedb2"
   integrity sha1-+wMJF/hqMTTlvJvsDWngAT3f7bI=
 
-lodash.foreach@^4.3.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.foreach/-/lodash.foreach-4.5.0.tgz#1a6a35eace401280c7f06dddec35165ab27e3e53"
-  integrity sha1-Gmo16s5AEoDH8G3d7DUWWrJ+PlM=
-
 lodash.get@^4.0.0, lodash.get@^4.4.2:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
@@ -18451,11 +18520,6 @@ lodash.isstring@^4.0.1:
   resolved "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz#d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"
   integrity sha1-1SfftUVuynzJu5XV2ur4i6VKVFE=
 
-lodash.map@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
-  integrity sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=
-
 lodash.memoize@^4.1.2:
   version "4.1.2"
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
@@ -18466,7 +18530,7 @@ lodash.memoize@~3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-3.0.4.tgz#2dcbd2c287cbc0a55cc42328bd0c736150d53e3f"
   integrity sha1-LcvSwofLwKVcxCMovQxzYVDVPj8=
 
-lodash.merge@^4.4.0, lodash.merge@^4.6.1:
+lodash.merge@^4.6.1:
   version "4.6.2"
   resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
   integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
@@ -18486,27 +18550,17 @@ lodash.partialright@^4.2.1:
   resolved "https://registry.yarnpkg.com/lodash.partialright/-/lodash.partialright-4.2.1.tgz#0130d80e83363264d40074f329b8a3e7a8a1cc4b"
   integrity sha1-ATDYDoM2MmTUAHTzKbij56ihzEs=
 
-lodash.pick@^4.2.1, lodash.pick@^4.4.0:
+lodash.pick@^4.4.0:
   version "4.4.0"
   resolved "https://registry.yarnpkg.com/lodash.pick/-/lodash.pick-4.4.0.tgz#52f05610fff9ded422611441ed1fc123a03001b3"
   integrity sha1-UvBWEP/53tQiYRRB7R/BI6AwAbM=
 
-lodash.reduce@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reduce/-/lodash.reduce-4.6.0.tgz#f1ab6b839299ad48f784abbf476596f03b914d3b"
-  integrity sha1-8atrg5KZrUj3hKu/R2WW8DuRTTs=
-
-lodash.reject@^4.4.0:
-  version "4.6.0"
-  resolved "https://registry.yarnpkg.com/lodash.reject/-/lodash.reject-4.6.0.tgz#80d6492dc1470864bbf583533b651f42a9f52415"
-  integrity sha1-gNZJLcFHCGS79YNTO2UfQqn1JBU=
-
 lodash.set@^4.3.2:
   version "4.3.2"
   resolved "https://registry.yarnpkg.com/lodash.set/-/lodash.set-4.3.2.tgz#d8757b1da807dde24816b0d6a84bea1a76230b23"
   integrity sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=
 
-lodash.some@^4.4.0, lodash.some@^4.6.0:
+lodash.some@^4.6.0:
   version "4.6.0"
   resolved "https://registry.yarnpkg.com/lodash.some/-/lodash.some-4.6.0.tgz#1bb9f314ef6b8baded13b549169b2a945eb68e4d"
   integrity sha1-G7nzFO9ri63tE7VJFpsqlF62jk0=
@@ -18669,7 +18723,7 @@ lowercase-keys@^2.0.0:
   resolved "https://registry.yarnpkg.com/lowercase-keys/-/lowercase-keys-2.0.0.tgz#2603e78b7b4b0006cbca2fbcc8a3202558ac9479"
   integrity sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==
 
-lowlight@^1.14.0, lowlight@^1.2.0:
+lowlight@^1.14.0:
   version "1.17.0"
   resolved "https://registry.yarnpkg.com/lowlight/-/lowlight-1.17.0.tgz#a1143b2fba8239df8cd5893f9fe97aaf8465af4a"
   integrity sha512-vmtBgYKD+QVNy7tIa7ulz5d//Il9R4MooOVh4nkOf9R9Cb/Dk5TXMSTieg/vDulkBkIWj59/BIlyFQxT9X1oAQ==
@@ -19295,14 +19349,13 @@ mini-create-react-context@^0.4.0:
     "@babel/runtime" "^7.5.5"
     tiny-warning "^1.0.3"
 
-mini-css-extract-plugin@0.8.0:
-  version "0.8.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.8.0.tgz#81d41ec4fe58c713a96ad7c723cdb2d0bd4d70e1"
-  integrity sha512-MNpRGbNA52q6U92i0qbVpQNsgk7LExy41MdAlG84FeytfDOtRIf/mCHdEgG8rpTKOaNKiqUnZdlptF469hxqOw==
+mini-css-extract-plugin@1.1.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.1.0.tgz#dcc2f0bfbec660c0bd1200ff7c8f82deec2cc8a6"
+  integrity sha512-0bTS+Fg2tGe3dFAgfiN7+YRO37oyQM7/vjFvZF1nXSCJ/sy0tGpeme8MbT4BCpUuUphKwTh9LH/uuTcWRr9DPA==
   dependencies:
-    loader-utils "^1.1.0"
-    normalize-url "1.9.1"
-    schema-utils "^1.0.0"
+    loader-utils "^2.0.0"
+    schema-utils "^3.0.0"
     webpack-sources "^1.1.0"
 
 minimalistic-assert@^1.0.0, minimalistic-assert@^1.0.1:
@@ -20249,17 +20302,7 @@ normalize-selector@^0.2.0:
   resolved "https://registry.yarnpkg.com/normalize-selector/-/normalize-selector-0.2.0.tgz#d0b145eb691189c63a78d201dc4fdb1293ef0c03"
   integrity sha1-0LFF62kRicY6eNIB3E/bEpPvDAM=
 
-normalize-url@1.9.1:
-  version "1.9.1"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-1.9.1.tgz#2cc0d66b31ea23036458436e3620d85954c66c3c"
-  integrity sha1-LMDWazHqIwNkWENuNiDYWVTGbDw=
-  dependencies:
-    object-assign "^4.0.1"
-    prepend-http "^1.0.0"
-    query-string "^4.1.0"
-    sort-keys "^1.0.0"
-
-normalize-url@^3.0.0, normalize-url@^3.3.0:
+normalize-url@^3.0.0:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-3.3.0.tgz#b2e1c4dc4f7c6d57743df733a4f5978d18650559"
   integrity sha512-U+JJi7duF1o+u2pynbp2zXDW2/PADgC30f0GsHZtRh+HOcXHnw137TrNlyxxRvWW5fjKd3bcLHPxofWuCjaeZg==
@@ -20312,6 +20355,13 @@ nth-check@^1.0.2, nth-check@~1.0.1:
   dependencies:
     boolbase "~1.0.0"
 
+nth-check@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-2.0.0.tgz#1bb4f6dac70072fc313e8c9cd1417b5074c0a125"
+  integrity sha512-i4sc/Kj8htBrAiH1viZ0TgU8Y5XqCaV/FziYK6TBczxmeKm3AEFWqqF3195yKudrarqy7Zu80Ra5dobFjn9X/Q==
+  dependencies:
+    boolbase "^1.0.0"
+
 null-loader@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/null-loader/-/null-loader-3.0.0.tgz#3e2b6c663c5bda8c73a54357d8fa0708dc61b245"
@@ -21106,23 +21156,12 @@ parse-passwd@^1.0.0:
   resolved "https://registry.yarnpkg.com/parse-passwd/-/parse-passwd-1.0.0.tgz#6d5b934a456993b23d37f40a382d6f1666a8e5c6"
   integrity sha1-bVuTSkVpk7I9N/QKOC1vFmao5cY=
 
-parse-path@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/parse-path/-/parse-path-4.0.1.tgz#0ec769704949778cb3b8eda5e994c32073a1adff"
-  integrity sha512-d7yhga0Oc+PwNXDvQ0Jv1BuWkLVPXcAoQ/WREgd6vNNoKYaW52KI+RdOFjI63wjkmps9yUE8VS4veP+AgpQ/hA==
-  dependencies:
-    is-ssh "^1.3.0"
-    protocols "^1.4.0"
-
-parse-url@^5.0.0:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/parse-url/-/parse-url-5.0.1.tgz#99c4084fc11be14141efa41b3d117a96fcb9527f"
-  integrity sha512-flNUPP27r3vJpROi0/R3/2efgKkyXqnXwyP1KQ2U0SfFRgdizOdWfvrrvJg1LuOoxs7GQhmxJlq23IpQ/BkByg==
+parse5-htmlparser2-tree-adapter@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-6.0.1.tgz#2cdf9ad823321140370d4dbf5d3e92c7c8ddc6e6"
+  integrity sha512-qPuWvbLgvDGilKc5BoicRovlT4MtYT6JfJyBOMDsKoiT+GiuP5qyrPCnR9HcPECIJJmZh5jRndyNThnhhb/vlA==
   dependencies:
-    is-ssh "^1.3.0"
-    normalize-url "^3.3.0"
-    parse-path "^4.0.0"
-    protocols "^1.4.0"
+    parse5 "^6.0.1"
 
 parse5@5.1.0:
   version "5.1.0"
@@ -21141,7 +21180,7 @@ parse5@^3.0.1:
   dependencies:
     "@types/node" "*"
 
-parse5@^6.0.0:
+parse5@^6.0.0, parse5@^6.0.1:
   version "6.0.1"
   resolved "https://registry.yarnpkg.com/parse5/-/parse5-6.0.1.tgz#e1a1c085c569b3dc08321184f19a39cc27f7c30b"
   integrity sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==
@@ -22104,7 +22143,7 @@ printj@~1.1.0:
   resolved "https://registry.yarnpkg.com/printj/-/printj-1.1.2.tgz#d90deb2975a8b9f600fb3a1c94e3f4c53c78a222"
   integrity sha512-zA2SmoLaxZyArQTOPj5LXecR+RagfPSU5Kw1qP+jkWeNlrq+eJZyY2oS68SU1Z/7/myXM4lo9716laOFAVStCQ==
 
-prismjs@1.23.0, prismjs@^1.22.0, prismjs@~1.22.0:
+prismjs@1.23.0, prismjs@^1.22.0, prismjs@~1.23.0:
   version "1.23.0"
   resolved "https://registry.yarnpkg.com/prismjs/-/prismjs-1.23.0.tgz#d3b3967f7d72440690497652a9d40ff046067f33"
   integrity sha512-c29LVsqOaLbBHuIbsTxaKENh1N2EQBOHaWv7gkHN4dgRbxSREqDnDbtFJYdpPauS4YCplMSNCABQ6Eeor69bAA==
@@ -22266,11 +22305,6 @@ protocol-buffers-schema@^3.3.1:
   resolved "https://registry.yarnpkg.com/protocol-buffers-schema/-/protocol-buffers-schema-3.3.2.tgz#00434f608b4e8df54c59e070efeefc37fb4bb859"
   integrity sha512-Xdayp8sB/mU+sUV4G7ws8xtYMGdQnxbeIfLjyO9TZZRJdztBGhlmbI5x1qcY4TG5hBkIKGnc28i7nXxaugu88w==
 
-protocols@^1.1.0, protocols@^1.4.0:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/protocols/-/protocols-1.4.7.tgz#95f788a4f0e979b291ffefcf5636ad113d037d32"
-  integrity sha512-Fx65lf9/YDn3hUX08XUc0J8rSux36rEsyiv21ZGUC1mOyeM3lTRpZLcrm8aAolzS4itwVfm7TAPyxC2E5zd6xg==
-
 proxy-addr@~2.0.5:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.5.tgz#34cbd64a2d81f4b1fd21e76f9f06c8a45299ee34"
@@ -22444,14 +22478,6 @@ qs@~6.5.2:
   resolved "https://registry.yarnpkg.com/qs/-/qs-6.5.2.tgz#cb3ae806e8740444584ef154ce8ee98d403f3e36"
   integrity sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==
 
-query-string@^4.1.0:
-  version "4.3.4"
-  resolved "https://registry.yarnpkg.com/query-string/-/query-string-4.3.4.tgz#bbb693b9ca915c232515b228b1a02b609043dbeb"
-  integrity sha1-u7aTucqRXCMlFbIosaArYJBD2+s=
-  dependencies:
-    object-assign "^4.1.0"
-    strict-uri-encode "^1.0.0"
-
 query-string@^6.13.2:
   version "6.13.2"
   resolved "https://registry.yarnpkg.com/query-string/-/query-string-6.13.2.tgz#3585aa9412c957cbd358fd5eaca7466f05586dda"
@@ -23705,14 +23731,14 @@ reflect.ownkeys@^0.2.0:
   resolved "https://registry.yarnpkg.com/reflect.ownkeys/-/reflect.ownkeys-0.2.0.tgz#749aceec7f3fdf8b63f927a04809e90c5c0b3460"
   integrity sha1-dJrO7H8/34tj+SegSAnpDFwLNGA=
 
-refractor@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.2.0.tgz#bc46f7cfbb6adbf45cd304e8e299b7fa854804e0"
-  integrity sha512-hSo+EyMIZTLBvNNgIU5lW4yjCzNYMZ4dcEhBq/3nReGfqzd2JfVhdlPDfU9rEsgcAyWx+OimIIUoL4ZU7NtYHQ==
+refractor@^3.2.0, refractor@^3.3.1:
+  version "3.3.1"
+  resolved "https://registry.yarnpkg.com/refractor/-/refractor-3.3.1.tgz#ebbc04b427ea81dc25ad333f7f67a0b5f4f0be3a"
+  integrity sha512-vaN6R56kLMuBszHSWlwTpcZ8KTMG6aUCok4GrxYDT20UIOXxOc5o6oDc8tNTzSlH3m2sI+Eu9Jo2kVdDcUTWYw==
   dependencies:
     hastscript "^6.0.0"
     parse-entities "^2.0.0"
-    prismjs "~1.22.0"
+    prismjs "~1.23.0"
 
 regedit@^3.0.3:
   version "3.0.3"
@@ -23906,14 +23932,6 @@ remark-footnotes@2.0.0:
   resolved "https://registry.yarnpkg.com/remark-footnotes/-/remark-footnotes-2.0.0.tgz#9001c4c2ffebba55695d2dd80ffb8b82f7e6303f"
   integrity sha512-3Clt8ZMH75Ayjp9q4CorNeyjwIxHFcTkaektplKGl2A1jNGEUey8cKL0ZC5vJwfcD5GFGsNLImLG/NGzWIzoMQ==
 
-remark-highlight.js@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/remark-highlight.js/-/remark-highlight.js-6.0.0.tgz#cb05387ddddeb078f0b61ce6299f6323f05098fc"
-  integrity sha512-eNHP/ezuDKoeh3KV+rWLeBVzU3SYVt0uu1tHdsCB6TUJYHwTNMJWZ5+nU+2fJHQXb+7PtpfGXVtFS9zk/W6qdw==
-  dependencies:
-    lowlight "^1.2.0"
-    unist-util-visit "^2.0.0"
-
 remark-mdx@1.6.22:
   version "1.6.22"
   resolved "https://registry.yarnpkg.com/remark-mdx/-/remark-mdx-1.6.22.tgz#06a8dab07dcfdd57f3373af7f86bd0e992108bbd"
@@ -24728,10 +24746,10 @@ scss-tokenizer@^0.2.3:
     js-base64 "^2.1.8"
     source-map "^0.4.2"
 
-secure-json-parse@^2.3.1:
-  version "2.3.1"
-  resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.3.1.tgz#908aa5e806e223ff8d179d37ad95c2433f5f147d"
-  integrity sha512-5uGhQLHSC9tVa7RGPkSwxbZVsJCZvIODOadAimCXkU1aCa1fWdszj2DktcutK8A7dD58PoRdxTYiy0jFl6qjnw==
+secure-json-parse@^2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/secure-json-parse/-/secure-json-parse-2.4.0.tgz#5aaeaaef85c7a417f76271a4f5b0cc3315ddca85"
+  integrity sha512-Q5Z/97nbON5t/L/sH6mY2EacfjVGwrCcSi5D3btRO2GZ8pf1K1UN7Z9H5J57hjVU2Qzxr1xO+FmBhOvEkzCMmg==
 
 seed-random@~2.2.0:
   version "2.2.0"
@@ -25239,13 +25257,6 @@ sonic-boom@^1.0.2:
     atomic-sleep "^1.0.0"
     flatstr "^1.0.12"
 
-sort-keys@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-1.1.2.tgz#441b6d4d346798f1b4e49e8920adfba0e543f9ad"
-  integrity sha1-RBttTTRnmPG05J6JIK37oOVD+a0=
-  dependencies:
-    is-plain-obj "^1.0.0"
-
 sort-keys@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/sort-keys/-/sort-keys-2.0.0.tgz#658535584861ec97d730d6cf41822e1f56684128"
@@ -25790,11 +25801,6 @@ stream-to-async-iterator@^0.2.0:
   resolved "https://registry.yarnpkg.com/stream-to-async-iterator/-/stream-to-async-iterator-0.2.0.tgz#bef5c885e9524f98b2fa5effecc357bd58483780"
   integrity sha1-vvXIhelST5iy+l7/7MNXvVhIN4A=
 
-strict-uri-encode@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz#279b225df1d582b1f54e65addd4352e18faa0713"
-  integrity sha1-J5siXfHVgrH1TmWt3UNS4Y+qBxM=
-
 strict-uri-encode@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz#b9c7330c7042862f6b142dc274bbcc5866ce3546"
@@ -27171,15 +27177,10 @@ tslib@^1, tslib@^1.0.0, tslib@^1.10.0, tslib@^1.8.1, tslib@^1.9.0, tslib@^1.9.3:
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.13.0.tgz#c881e13cc7015894ed914862d276436fa9a47043"
   integrity sha512-i/6DQjL8Xf3be4K/E6Wgpekn5Qasl1usyw++dAA35Ue5orEn65VIxOA+YvNNl9HV3qv70T7CNwjODHZrLwvd1Q==
 
-tslib@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.1.tgz#410eb0d113e5b6356490eec749603725b021b43e"
-  integrity sha512-SgIkNheinmEBgx1IUNirK0TUD4X9yjjBRTqqjggWCU3pUEqIk3/Uwl3yRixYKT6WjQuGiwDv4NomL3wqRCj+CQ==
-
-tslib@^2.0.1:
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.0.3.tgz#8e0741ac45fc0c226e58a17bfc3e64b9bc6ca61c"
-  integrity sha512-uZtkfKblCEQtZKBF6EBXVZeQNl82yqtDQdv+eck8u7tdPxjLu2/lp5/uPW+um2tpuxINHWy3GhiccY7QgEaVHQ==
+tslib@^2.0.0, tslib@^2.0.1, tslib@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
+  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
 
 tslib@~2.1.0:
   version "2.1.0"
@@ -27936,11 +27937,6 @@ url-parse@^1.4.3, url-parse@^1.5.0:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-url-pattern@^1.0.3:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/url-pattern/-/url-pattern-1.0.3.tgz#0409292471b24f23c50d65a47931793d2b5acfc1"
-  integrity sha1-BAkpJHGyTyPFDWWkeTF5PStaz8E=
-
 url-template@^2.0.8:
   version "2.0.8"
   resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
@@ -29277,16 +29273,16 @@ write@1.0.3:
     mkdirp "^0.5.1"
 
 ws@^6.1.2, ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 
 ws@^7.2.3:
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz#d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"
-  integrity sha512-D3RuNkynyHmEJIpD2qrgVkc9DQ23OrN/moAwZX4L8DfvszsJxpjQuUq3LMx6HoYji9fbIOBY18XWBsAux1ZZUA==
+  version "7.4.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.2.tgz#782100048e54eb36fe9843363ab1c68672b261dd"
+  integrity sha512-T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA==
 
 x-is-function@^1.0.4:
   version "1.0.4"